934 files changed, 190724 insertions, 212543 deletions

diff --git a/.gitattributes b/.gitattributes
index f664a8e0e7b..6240630cab8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -170,18 +170,9 @@ frontends/php/images/sysmaps/old/Printer.png -text svneol=unset#unset
 frontends/php/images/sysmaps/old/Router.png -text svneol=unset#unset
 frontends/php/images/sysmaps/old/Server.png -text svneol=unset#unset
 frontends/php/images/sysmaps/old/Workstation.png -text svneol=unset#unset
-frontends/php/include/classes/api/CApiClientResponse.php -text
-frontends/php/include/classes/api/clients/CApiClient.php -text
-frontends/php/include/classes/api/clients/CLocalApiClient.php -text
-frontends/php/include/classes/api/wrappers/CApiWrapper.php -text
-frontends/php/include/classes/api/wrappers/CFrontendApiWrapper.php -text
-frontends/php/include/classes/helpers/CConditionHelper.php -text
-frontends/php/include/classes/helpers/CMenuPopupHelper.php -text
-frontends/php/include/classes/validators/CDecimalValidator.php -text
-frontends/php/include/views/configuration.host.discovery.edit.php -text
-frontends/php/include/views/js/common.init.js.php -text
-frontends/php/include/views/js/monitoring.slides.js.php -text
-frontends/php/include/views/js/monitoring.triggers.js.php -text
+frontends/php/include/classes/screens/CScreenLldGraph.php -text
+frontends/php/include/classes/screens/CScreenLldGraphBase.php -text
+frontends/php/include/classes/screens/CScreenLldSimpleGraph.php -text
 frontends/php/js/flickerfreescreen.js -text svneol=unset#text/plain
 frontends/php/js/menupopup.js -text svneol=unset#text/plain
 frontends/php/js/multiselect.js -text svneol=unset#text/plain
@@ -213,6 +204,7 @@ frontends/php/locale/sk/LC_MESSAGES/frontend.po -text
 frontends/php/locale/sv/LC_MESSAGES/frontend.po -text
 frontends/php/locale/tr/LC_MESSAGES/frontend.po -text
 frontends/php/locale/uk/LC_MESSAGES/frontend.po -text
+frontends/php/locale/vi/LC_MESSAGES/frontend.po -text
 frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po -text
 frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po -text
 frontends/php/robots.txt svneol=native#text/plain
@@ -275,15 +267,8 @@ frontends/php/styles/themes/originalblue/images/icons_d40000.png -text
 frontends/php/styles/themes/originalblue/images/icons_ffffff.png -text
 frontends/php/styles/themes/originalblue/images/preloader.gif -text
 frontends/php/tests/bootstrap.php.template -text
-frontends/php/tests/unit/bootstrap.php -text
-frontends/php/tests/unit/include/classes/api/APITest.php -text
-frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php -text
-frontends/php/tests/unit/include/classes/core/CRegistryFactoryTest.php -text
-frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php -text
-frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php -text
-frontends/php/tests/unit/include/classes/validators/CValidatorTest.php -text
-frontends/php/tests/unit/include/classes/validators/string/CStringValidatorTest.php -text
-frontends/php/tests/unit/phpunit.xml -text
+frontends/php/tests/unit/include/classes/html/CRowTest.php -text
+frontends/php/tests/unit/include/classes/html/CTagTest.php -text
 man/zabbix_agentd.man -text
 man/zabbix_get.man -text
 man/zabbix_proxy.man -text
@@ -554,15 +539,13 @@ misc/init.d/fedora/core5/zabbix_agentd -text
 misc/init.d/freebsd/zabbix_agentd -text
 misc/init.d/freebsd/zabbix_server -text
 misc/init.d/tru64/zabbix_server -text
-src/libs/zbxdbhigh/itservices.c -text
-src/libs/zbxdbhigh/template.h -text
-src/libs/zbxdbhigh/template_item.c -text
 src/libs/zbxnix/control.c -text
 src/libs/zbxnix/control.h -text
 src/libs/zbxsysinfo/win32/wmi.cpp -text
+src/zabbix_java/lib/README svneol=native#text/plain
+src/zabbix_java/lib/android-json-4.3_r3.1.jar -text
 src/zabbix_java/lib/logback-classic-0.9.27.jar -text
 src/zabbix_java/lib/logback-core-0.9.27.jar -text
-src/zabbix_java/lib/org-json-2010-12-28.jar -text
 src/zabbix_java/lib/slf4j-api-1.6.1.jar -text
 src/zabbix_java/tests/junit-4.8.2.jar -text
 tests/data/README -text
diff --git a/.gitignore b/.gitignore
index d9ffceb4220..acff8342acf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,7 @@ frontends/php/locale/sk/LC_MESSAGES/frontend.mo
 frontends/php/locale/sv/LC_MESSAGES/frontend.mo
 frontends/php/locale/tr/LC_MESSAGES/frontend.mo
 frontends/php/locale/uk/LC_MESSAGES/frontend.mo
+frontends/php/locale/vi/LC_MESSAGES/frontend.mo
 frontends/php/locale/zh_CN/LC_MESSAGES/frontend.mo
 frontends/php/locale/zh_TW/LC_MESSAGES/frontend.mo
 frontends/php/tests/bootstrap.php
diff --git a/ChangeLog b/ChangeLog
index 58330d02431..c86520ab142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,204 @@
+Changes for 2.3.4
+
+New features:
+..F....... [ZBXNEXT-570] implemented the ability to quickly display items on a graph from the latest data page (Ivo, Pavels)
+.......PS. [ZBX-8367] added recalculating of unsupported items queue when changed "Refresh unsupported items" parameter (Juris, Sasha)
+A.F....... [ZBXNEXT-1583] implemented new screen element types - "Graph prototype" and "Simple graph prototype" (Krists)
+A.F....... [ZBX-1357] updated Brazilian Portuguese, Japanese, Italian, Polish and Slovak translations; thanks to Zabbix translators (Richlv)
+....I..PS. [ZBXNEXT-2359] made server and proxy refuse to start if StartPollersUnreachable=0, but other pollers are started (asaveljevs)
+....I..PS. [ZBX-8557] implemented housekeeper 30 minutes startup delay (Arturs)
+A.F.I..PS. [ZBX-7720] increased size of "Host name", "Visible host name" and "Proxy name" fields to 128 characters (Sasha)
+
+Bug fixes:
+A......... [ZBX-8568] fixed item.delete and itemprototype.delete to also remove trigger prototypes using them (Krists)
+A......... [ZBX-8636] fixed user accounts not being disabled after exceeding number of unsuccessful login attempts (Krists)
+........S. [ZBX-7721] added support for discovering more than 100 hypervisors on large vcenter installations to vmware collector (wiper, dimir)
+...G....S. [ZBX-8564] added standard error output while running remote script (Arturs)
+...G...PS. [ZBX-8629] fixed crash in get_string() function when checking "Database monitor" items (asaveljevs)
+....IJ.... [ZBX-4800] replaced JSON.org library with Android JSON library; thanks to Volker Fröhlich for legal research (asaveljevs)
+.........T [ZBX-4800] fixed typo in item name in "Template JMX Generic": "mpTenured" -> "mp Tenured" (asaveljevs)
+..F....... [ZBX-8509] fixed value of field "Use custom multiplier" to correctly default to "1" if checkbox is unchecked (Krists)
+A......... [ZBX-8530] fixed host update to work when doing template unlink and interface remove in same request (Krists)
+.......PS. [ZBX-8488] fixed items being shown in queue with a delay of more than 44 years (asaveljevs)
+A......... [ZBX-8627] fixed problem with some of code not working on PHP 5.3 (Krists)
+...G...PS. [ZBX-8599] fixed incorrect error message in Telnet based checks (Arturs)
+....I..PS. [ZBX-8389] fixed compilation error due to undeclared CURLOPT_KEYPASSWD with versions of libcurl up to 7.16.4 (asaveljevs, dimir)
+A.F....... [ZBX-8582] added use of escaping to variables in SQL queries to prevent possible injections in places where it was missing; thanks to Leann for the report (Krists)
+........S. [ZBX-8444] database queries for enabled items, triggers and hosts replaced with queries from configuration cache to improve performance for processing sleeping escalations (igors)
+..F....PS. [ZBX-8608] added support of IP masks for action conditions (Sasha)
+........S. [ZBX-8608] fixed clearing of discovered services with using CIDR notation in ip lists (Sasha)
+........S. [ZBX-8415] fixed possible server crash on LLD host or host group update (dimir, Sasha)
+...G...... [ZBX-8455] improved synchronization between perfromance collector and agent threads (wiper)
+...G...... [ZBX-8236] fixed few memory leaks in Windows agent (wiper)
+...G...PS. [ZBX-8601] fixed bad performance of the proxy configuration synchronization (Sasha)
+.......PS. [ZBX-8600] fixed SQL errors in proxy configuration synchronization (Sasha)
+A......... [ZBX-8563] added field "logtimefmt" to exported items (Krists)
+..F....... [ZBX-8484] fixed "Plain text" screen elements with "Show text as HTML" enabled trying to display the text as preformatted (Andrejs)
+.......PS. [ZBX-7621] changed virtual machine disk and network discovery to use device name instead of instance id in discovered item name (wiper)
+.......PS. [ZBX-8338] fixed SNMP walking code so that it intelligently chooses either a string or numeric representation for an OID index (asaveljevs)
+..F....... [ZBX-8577] added wmi.get[] to the list of suggested items (asaveljevs)
+A......... [ZBX-8430] fixed SQL errors in drule.delete API method (Andrejs)
+A.F....... [ZBX-8510] fixed possible deadlocks when updating IT services (Pavels, Sasha)
+
+--------------------------------------------------------------------------------
+Changes for 2.3.3
+
+New features:
+A.F....... [ZBXNEXT-219] added ability to remove resources missing in XML file (Ivo)
+A.F....... [ZBX-1357] updated Polish and Slovak translations; thanks to Zabbix translators (Richlv)
+A.......S. [ZBX-8473] improved performance of deleting triggers by API and server - events will be deleted only by the housekeeper (Krists, Sasha)
+..F....... [ZBXNEXT-1826] added proxy name as host prefix in item queue details page (Ivo)
+..F.....S. [ZBXNEXT-1848] added support for internal item zabbix[host,,maintenance] (Sasha)
+........S. [ZBXNEXT-1848] added processing of internal items in maintenance without data collection (Sasha)
+........S. [ZBXNEXT-2279] zabbix[proxy,,lastaccess] will be always performed by server (Sasha)
+A.F.....S. [ZBXNEXT-1133] added support for custom expressions in action conditions (Krists)
+...G...... [ZBXNEXT-1300] added low-level discovery support for enumerating CPUs on all supported platforms (Juris)
+A......... [ZBX-8459] made possible CORS AJAX requests for JSON API (Andrejs)
+
+Bug fixes:
+...G...... [ZBX-8512] fixed processing of web.page.regexp without a newline character in the end of http GET response (Arturs)
+..F....... [ZBX-8471] fixed removing slides from slideshows in cases when some slides have been deleted (Krists)
+..F....... [ZBX-8509] fixed item custom multiplier formula default value to be "1" and not become unset in some cases (Krists)
+A.F....... [ZBX-8430] fixed cascade removal of action conditions when deleting related discovery rule and checks (Andrejs)
+..F....... [ZBX-8432] fixed multiselect resize and IE11 visual issues (Oleg)
+..F....... [ZBX-8478] fixed slideshow handling in monitoring for slideshows without slides (Krists)
+A......... [ZBX-8493] fixed usergroup.massadd API call to not create duplicate entries in "rights" table (Krists)
+..F....... [ZBX-8492] fixed maintenance periods without hosts/hostgroups to be accessible by both admins and superadmins (Krists)
+..F....... [ZBX-2570] fixed dashboard widgets showing error messages about expired/broken session (Krists)
+A......... [ZBX-8428] fixed item.get API call to return values for "lastvalue", "lastclock", "lastns", "prevvalue" only for last 24 hours (Krists)
+..F....... [ZBX-8468] removed unnecessary "empty" buttons in map element popups (Andrejs)
+..F....... [ZBX-8431] added context for text string 'Name' (Oleg)
+..F....... [ZBX-8467] removed "make_latest_issues" function extra argument (Oleg)
+..F....... [ZBX-8436] fixed page layout being broken with IE8 in cases when item rows are added or removed (Krists)
+..F....... [ZBX-8286] fixed undefined index when enabling or disabling hosts in a host group (Krists)
+.......PS. [ZBX-8037] added informative log message about Zabbix not upgrading SQLite3 databases (Juris)
+..F....... [ZBX-8425] fixed "Host status" widget displaying problematic host if one of its groups is set to hidden in dashboard filter (Ivo)
+
+--------------------------------------------------------------------------------
+Changes for 2.3.2
+
+New features:
+A.F....PS. [ZBXNEXT-2301] added a way to disable SNMP bulk operations per interface (asaveljevs, Oleg)
+..F....... [ZBX-2603] added validation while working with regular expressions (Andrejs)
+..F....... [ZBX-8278] prepared frontend for mbstring.internal_encoding ini option deprecation in PHP 5.6+ (Andrejs)
+..F....... [ZBXNEXT-2222] added trigger status filter to the trigger overview page (Sasha)
+..F....... [ZBX-8339] removed auto login/logout controls while editing guest user (Andrejs)
+...G...... [ZBXNEXT-2203] added information on the reason log[] and logrt[] items became not supported (Andris, asaveljevs)
+..F....... [ZBXNEXT-2254] added support for custom PostgreSQL schema to frontend and updated setup wizard (Krists)
+..F....... [ZBX-8329] added styling for disabled buttons and inputs (Andrejs)
+..F....... [ZBXNEXT-2344] added links on group names in "Web monitoring" widget (Ivo)
+A.F....... [ZBX-1357] updated Brazilian Portuguese, Japanese, Polish, Russian and Slovak translations; thanks to Zabbix translators (Richlv)
+..F....... [ZBX-7399] improved multiselect by adding popup select window (Oleg)
+..F....... [ZBX-8113] changed frontend configuration wizard to store info in session instead of cookies (Andrejs)
+
+Bug fixes:
+..F....... [ZBX-7941] changed page footer to show debug in fullscreen mode again (sasha)
+........S. [ZBX-8011] fixed escalator giving false 'no media defined' errors (wiper)
+.......PS. [ZBX-8450] removed carriage return stripping from text values when inserting data into the database (Juris)
+..F....... [ZBX-8439] fixed layout problems in host and template configuration, host inventory in Safari (Krists)
+..F....... [ZBX-8443] fixed host mass update form to be displayed correctly in Opera (Krists)
+..F....... [ZBX-8437] fixed JS errors after show/hide frontend filter (Oleg)
+..F....... [ZBX-8411] fixed item selection by click-and-drag and element form hiding in sysmap configuration with IE8 (Krists)
+A.F.I..... [ZBX-8406] fixed typos "overriden" to "overridden", "occurence" to "occurrance", changed "WEB" to "web" in translations and database patch files (Krists)
+A.F....... [ZBX-8397] removed outdated queue related code from frontend and API (Krists)
+........S. [ZBX-8359] changed servers timer processes title line to display amount of hosts that have changed maintenance status; active maintenance period count is no longer displayed (Juris)
+..F....... [ZBX-8375] fixed multiple issues in various forms: removed duplicate hidden fields, added missing field translations, added JS confirmation message encoding and fixed displaying submitted values on failure (Ivo)
+..F....... [ZBX-8240] fixed multiselect input placeholder behaviour on IE8, input cursor issue and removed "clear field" button for multiselect in IE10+ (Oleg, Krists)
+..F....... [ZBXNEXT-1782] fixed trigger expression testing not working incorrectly for some expressions that contain nested parentheses (Pavels)
+...G...... [ZBX-8270] fixed disk space reporting for large AIX file systems (>= 16 TB) (Andris)
+.......PS. [ZBX-8422] removed PHP mutex locking from server code because of not being used and incompatible licensing issues (wiper)
+..F....... [ZBX-8377] fixed dark orange theme input fields being displayed light blue, submit button hover not displaying as disabled and made readonly and disabled input fields more readable on all browsers (Ivo)
+A......... [ZBX-8332] removed redundant screen import code from 1.8 importer (Krists)
+..F....... [ZBX-1215] changed captions of items and periods to be autogenerated by default in barreports (Andrejs)
+..F....... [ZBX-8378] fixed bar graphs to automatically resize vertically thus preventing broken charts when captions are very long (Krists)
+..F....... [ZBX-8380] fixed disabled confirmation text label in "Administration/Scripts" for IE8 (Krists)
+..F....... [ZBX-8370] fixed misc. bugs in barreports (input validation, default captions, caption escaping) (Andrejs)
+..F....... [ZBX-8382] fixed trigger severity sound not stopping in user profile form on "Stop" button press (Ivo)
+A......... [ZBX-8315] fixed host interface import (from 1.8 and up) to correctly create new or reuse existing interfaces (Krists)
+...G...... [ZBX-8248] fixed vfs.file.regexp, vfs.file.regmatch and web.page.regexp to handle carriage returns properly (Juris)
+..F....... [ZBX-7459] fixed saving and editing of regular expression having trailing, leading, or repeating spaces (Andrejs)
+..F....... [ZBX-1268] fixed log trigger expression editor to show only usable sorting arrows (Andrejs)
+..F....... [ZBX-8285] fixed widget "History of events" and frontend messaging to use visible host names (Krists)
+A.F....... [ZBX-8151] fixed XXE vulnerability on XML import using obsolete libxml versions; thanks to pnig0s@Freebuf for the report (Andrejs)
+..F....... [ZBX-8354] removed period in caption for "Distribution of values for multiple periods" bar report (Andrejs)
+.......PS. [ZBX-8092] fixed items being polled at the same time after host becomes enabled (asaveljevs)
+.......PS. [ZBX-8324] fixed there being too many expressions in a list in a SQL query (asaveljevs)
+..F....... [ZBX-8355] changed confusing context for date format translations (Andrejs)
+..F.I..... [ZBX-7921] fixed default values for screen item colspan/rowspan to 1 in frontend and database (Krists, wiper)
+..F....... [ZBX-8288] fixed problems with vertical table headers sometimes being offset (Krists)
+...G...... [ZBX-8213] fixed possible crash when processing eventlog on Windows 2000,2003,XP (wiper)
+.......PS. [ZBX-8040] wait for proper SMTP response before sending first command (wiper)
+..F....... [ZBX-8358] fixed overview screen elements being displayed incorrectly after refreshing (Pavels)
+..F....... [ZBX-8196] added validation for sorting parameters (Andrejs)
+A.F....... [ZBX-8334] fixed selecting group prototypes in HostPrototype::get() using Oracle backend (Andrejs)
+..F....... [ZBX-8320] corrected help item strings by removing double spaces in sentences and "IP" used in uppercase letters (Ivo)
+.......PS. [ZBX-8061] fixed VMware cluster functions returning notsupported despite clusters being discovered normally (wiper)
+........S. [ZBX-8348] fixed processing of LLD triggers; function references in the trigger expression could be out of order (Sasha)
+..F....... [ZBX-8053] changed label "Latest data" to "Monitoring" in host inventory view (Ivo)
+..F....... [ZBX-8333] renamed screen item adding, updating and deleting messages (Ivo)
+..F....... [ZBX-8197] fixed all data not being shown on a graph if the period is set to or more than 2 years (Krists)
+..F....... [ZBX-8330] fixed a bug with grouped buttons in discovery rules for SNMP checks (Andrejs)
+..F....... [ZBX-8318] added "d. m. Y" date format to recognized formats in frontend and set "Y-m-d H:i:s" as fallback (Krists)
+..F....... [ZBXNEXT-2124] fixed submap problem count calculation in Monitoring -> Maps when application filters are active (Krists)
+..F....... [ZBX-8301] restricted "unique" attribute to Zabbix agent & SNMP checks in discovery rule creation (Andrejs)
+.......PS. [ZBX-8095] fixed a bug in item queue that updated item's nextcheck but not its position in the queue (asaveljevs)
+...G...PS. [ZBX-8343] fixed a bug in binary heap that could cause a slightly inconsistent ordering of elements in the queue (asaveljevs)
+.......PS. [ZBX-8325] fixed a crash with Oracle when inserting a large number of records (wiper)
+........S. [ZBX-8336] fixed server crash when value cache is working in low memory mode (wiper)
+...G...... [ZBX-8327] fixed possible crash when processing Windows eventlog (wiper)
+....I..... [ZBX-8306] added Percona database support when compiling with --with-mysql configuration option (wiper)
+.......PS. [ZBX-8287] added truncating of long text values to maximum field length before inserting them into database (Andris)
+........S. [ZBX-3163] fixed trigger evaluation order so that it takes dependencies into account (asaveljevs)
+A.F....... [ZBX-7373] improved performance of latest data and item overview pages by taking data for a limited period only (Pavels)
+..F....... [ZBX-8200] improved performance of Monitoring -> Events page (Krists)
+..F....... [ZBX-7536] changed popups to display host visible name instead of hostname (Andrejs)
+..F....... [ZBX-8292] fixed host prototype creation (Krists)
+..F.....S. [ZBX-8092] changed the way the number of active triggers is calculated in the dashboard and zabbix[triggers] item (Andrejs, igors)
+........S. [ZBX-8092] added disabled triggers to the configuration cache for correct macro expansion in notifications (igors)
+........S. [ZBX-7901] improved value cache database operations when caching count based requests (wiper)
+...G...PS. [ZBX-8172] fixed null JSON value decoding (wiper)
+.......PS. [ZBX-8188] fixed IPMI items staying supported when sensor data becomes unavailable (asaveljevs, dimir)
+..F....... [ZBX-8216] fixed screen import error (Andrejs)
+..F....... [ZBX-8245] fixed repeating of actions while sorting / paging (Andrejs)
+A.F....... [ZBX-5567] removed parameter "not_proxy_hosts" from hostgroup.get API method and frontend code (Krists)
+..F....... [ZBX-8271] fixed importing of maps with LLD discovered hosts (Andrejs)
+
+--------------------------------------------------------------------------------
+Changes for 2.3.1
+
+New features:
+A.F....PS. [ZBXNEXT-282] implemented additional options and HTTP header support for web scenarios (dimir, Krists)
+.......PS. [ZBXNEXT-2254] DBSchema configuration parameter now applies to PostgreSQL as well as IBM DB2 (Juris)
+A.F....... [ZBX-1357] updated Japanese, Slovak and Spanish translations; thanks to Zabbix translators (Richlv)
+
+Bug fixes:
+..F....... [ZBX-8276] fixed latest data filtering by name (Ivo)
+A......... [ZBX-8195] fixed web scenario step validation for httptest.create and httptest.update API methods (Krists)
+...G...PS. [ZBX-8172] fixed translation of \uxxxx sequences in JSON string values (wiper)
+..F....... [ZBX-8241] fixed duplicate display of actions in media type list (Andrejs)
+A.F....... [ZBX-8194] improved validation for web scenarios and web steps (Ivo, Krists)
+...G...... [ZBX-8269] fixed processing of active checks in agent (Andris)
+...G...... [ZBX-8238] fixed updating agent 'mtime' for logrt[] items; thanks to Yoshinori Komuro for patch (Andris)
+..F....... [ZBX-7535] trivial change from 'Link' to 'URL' in error messages (Andrejs)
+..F....... [ZBX-8259] fixed padding for widgets in screen (Andrejs)
+........S. [ZBX-8143] triggers are now committed to the database individually when setting to an unknown state to avoid potential locking between the poller and history syncer (Juris)
+.......P.. [ZBX-7968] fixed bug when proxy stopped sending history data if it had more than 1000 unmonitored item values in history table; thanks to Corey Shaw for identifying the issue and providing a patch (wiper)
+..F....... [ZBX-8221] corrected labels while copying items (Andrejs)
+........S. [ZBX-8092] added disabled hosts and disabled items to the configuration cache for correct macro expansion in notifications (igors)
+
 --------------------------------------------------------------------------------
 Changes for 2.3.0
 
 New features:
-..F....... [ZBXNEXT-2270] changed "Status" dropdown in hosts, host prototypes and host mass update forms to "Enabled" checkbox (Krists)
+A.F.I..PS. [ZBXNEXT-1782] added support of new trigger expression operators ">=", "<=", "<>", "and", "or" and "not"; removed existing "#", "|" and "&" (asaveljevs, Pavels)
+...GI..PS. [ZBXNEXT-2203] added information on the reason items become not supported (Alexei, asaveljevs)
+..F....... [ZBXNEXT-734] implemented support for URL as dynamic screen element and added macro support (Ivo)
+...GI..PS. [ZBXNEXT-497] added support for patterns in "Include" configuration directive (asaveljevs)
+...G...... [ZBXNEXT-1506] added support for vfs.dev.read[] and vfs.dev.write[] on AIX; thanks to Jairo Lopez and Boris Manojlovic for patches (asaveljevs)
+..F....... [ZBX-5430] implemented ISO 8601 standard date format "YYYY-MM-DD hh:mm:ss" as default (Ivo)
+A......... [ZBX-7981] deprecated "exists" API methods (Ivo)
+A.F....... [ZBX-7949] improved multibyte string support (Ivo)
+..F....... [ZBXNEXT-2270] changed "Status" dropdown in host and host prototype forms to "Enabled" checkbox (Krists)
 ..F....... [ZBX-7941] changed page footer to not show debug in fullscreen mode (Krists)
 A.F.I...S. [ZBXNEXT-1343] removed support of old style node-based distributed monitoring (Eduard, Sasha)
 ........S. [ZBXNEXT-2256] added support of host level macros like {HOST.*} along with user macros in LLD filter regexps (Sasha)
@@ -17,7 +213,7 @@ A.F.I...S. [ZBXNEXT-1343] removed support of old style node-based distributed mo
 A.F....... [ZBXNEXT-2123] implemented the application and host inventory filters on the trigger monitoring page (Pavels)
 A.F.I...S. [ZBXNEXT-2117] added "Description" field for templates, hosts and proxies (Eduard, Sasha)
 ..F.I..... [ZBXNEXT-1533] added "Action name" in "History of actions" screen and added a patch to change screen item sort order (Oleg, Pavels)
-..F....... [ZBX-7850] unified the "Go to" section of host pop-up menus displayed in maps and other other places (Ivo)
+..F....... [ZBX-7850] unified the "Go to" section of host pop-up menus displayed in maps and other other places and made menu links disabled instead of hidden (Ivo)
 ..F....... [ZBXNEXT-421] implemented user name in action audit page (Eduard)
 ..F....... [ZBXNEXT-2167] improved info column in latest data monitoring and item, trigger, discovery host configuration (Eduard)
 ..F....... [ZBX-6374] added pagination in availability reports (Oleg)
@@ -31,7 +227,7 @@ A.F.I...S. [ZBXNEXT-581] implemented the ability to filter by multiple LLD macro
 ..F....... [ZBX-7095] added 'Cancel' button in dashboard configuration (Ivo)
 ..F....... [ZBXNEXT-2140] enabled Monitoring -> Latest data filter option "Show items without data" by default (Richlv)
 ..F....... [ZBX-7713] changed the event details page to display all hosts used in a trigger (Ivo)
-........S. [ZBXNEXT-1700] added informative messages about database connection restoration (Juris)
+.......PS. [ZBXNEXT-1700] added informative messages about database connection restoration (Juris)
 ..F....... [ZBX-7609] improved frontend messages mute/unmute (Eduard)
 ..F....... [ZBXNEXT-1291] added clickable links for template names in host, template, host prototype and discovered host property templates tab (Oleg)
 ..F....... [ZBXNEXT-2073] improved dashboard refresh time menu (Eduard)
@@ -46,6 +242,35 @@ A.F.I...S. [ZBXNEXT-581] implemented the ability to filter by multiple LLD macro
 A......... [ZBX-7345] removed deprecated API features (Pavels)
 
 Bug fixes:
+........S. [ZBX-8014] fixed evaluation of calculated item and trigger expressions not being precise enough (asaveljevs)
+..F....... [ZBX-8212] it is not possible to add triggers from templates to maps anymore (Andrejs)
+A......... [ZBX-8227] fixed the "applicationids" parameter in trigger.get overriding the "groupids" parameter (Pavels)
+A......... [ZBX-8169] fixed SLA period calculation to account for DST changes (Krists)
+...G...PS. [ZBX-8172] fixed numeric value extraction from json data to ensure compatibility with third party tools that sends data as numeric values instead of strings (wiper).
+.......P.. [ZBX-8048] fixed bug where proxy would truncate execute scripts of telnet, ssh and database monitoring items to 2kB (Juris)
+A......... [ZBX-8193] changed web scenario default timeout to 15 (Nikolaj)
+........S. [ZBX-6190] added a more informative message to return when an item does not have enough information to perform nodata() calculations (Juris)
+..F....... [ZBX-8157] fixed size and style of custom user agent in web scenario edit form and fixed IE displaying input field on second click (Ivo)
+A......... [ZBX-6834] fixed trigger.get not returning any results when using the "host" parameter (Pavels)
+A.F....... [ZBX-8190] fixed validation in API to prevent SQL errors with Oracle database when string with excessive length is stored (Krists)
+..F....... [ZBX-8160] removed justification in warning message (Ivo)
+..F....... [ZBX-8141] corrected 'URL' abbreviation string to uppercase (Ivo)
+..F....... [ZBX-7839] fixed cloning of graphs and hosts to use changed form values (Krists)
+..F....... [ZBX-8165] fixed issue when maintenance items with its hosts/host groups removed are not accessible in configuration (Krists)
+...G...PS. [ZBX-2196] changed status codes of various exit calls to library macros for consistency (Juris)
+........S. [ZBX-1274] fixed negative values, received from SNMP agent, being displayed as large unsigned integers (igors)
+...G...... [ZBX-8031] removed pre-processor aliases for Windows string functions; converted all references of Windows types to standard C types (Juris)
+..F....... [ZBX-8158] fixed disabled hosts not shown in trigger selection popup when in configuration (Krists)
+A.F....... [ZBX-8118] changed image update so that image type can not be changed after create (Krists)
+..F....... [ZBX-7553] fixed graph not getting period when coming from screen (Krists)
+....I..... [ZBX-7890] fixed broken make distclean (Nikolaj)
+A......... [ZBX-7981] fixed validation when renaming host to an existing template in host.massupdate; fixed validation when renaming template to an existing host in template.massupdate (Ivo)
+..F....... [ZBX-7436] changed string "comment" to "description" in trigger list and trigger comments (Krists)
+..F....... [ZBX-8159] fixed missing history bar when viewing or editing trigger descriptions (Krists)
+A......... [ZBX-7949] fixed inherited graph and graph prototype case insensitive name comparison (Ivo)
+.......PS. [ZBX-7534] removed the limit of dservice value and removed the limit of authorization string (Nikolaj)
+A......... [ZBX-8132] fixed image.get not properly returning all images for sysmaps (Krists)
+...G...... [ZBX-8108] fixed reading /proc virtual files without rewinding the file position (Juris)
 ...G...... [ZBX-5243] increased the length of program name and command line that proc.mem[] and proc.num[] can match on AIX; thanks to Boris Manojlovic for patch (asaveljevs)
 ...G...... [ZBX-7448] fixed Windows agents limit check (Nikolaj, wiper)
 ..F....... [ZBX-7335] improved element copy dialog by having hosts, templates and host group in separate target types and empty groups are not shown (Krists)
@@ -92,14 +317,163 @@ A......... [ZBX-4772] fixed possibility to pass incorrect host status value (Ivo
 ........S. [ZBX-7204] fixed timestamp order of events generated during network discovery (igors)
 
 --------------------------------------------------------------------------------
+Changes for 2.2.6
+
+New features:
+A.F....... [ZBX-1357] updated Chinese (Taiwan) and Polish translations; thanks to Zabbix translators (Richlv)
+
+Changes for 2.2.6rc1
+
+New features:
+..F....... [ZBX-8275] added a feature to automatically clone web scenarios when cloning a host or template (Ivo)
+A.......S. [ZBX-8473] improved performance of deleting triggers by API and server - events will be deleted only by the housekeeper (Krists, Sasha)
+A.F....... [ZBX-1357] updated Brazilian Portuguese, Japanese, Polish, Slovak and Spanish translations; thanks to Zabbix translators (Richlv)
+
+Bug fixes:
+........S. [ZBX-7721] added support for discovering more than 100 hypervisors on large vcenter installations to vmware collector (wiper, dimir)
+...G...PS. [ZBX-8629] fixed crash in get_string() function when checking "Database monitor" items (asaveljevs)
+....IJ.... [ZBX-4800] replaced JSON.org library with Android JSON library; thanks to Volker Fröhlich for legal research (asaveljevs)
+.........T [ZBX-4800] fixed typo in item name in "Template JMX Generic": "mpTenured" -> "mp Tenured" (asaveljevs)
+.......PS. [ZBX-8488] fixed items being shown in queue with a delay of more than 44 years (asaveljevs)
+........S. [ZBX-8444] increased the interval for checking sleeping escalations to improve performance (igors)
+..F....PS. [ZBX-8608] added support of IP masks for action conditions (Sasha)
+A......... [ZBX-8603] fixed web scenario fields "http_proxy" and "retries" not updating properly when linking template to host (Ivo)
+........S. [ZBX-8415] fixed possible server crash on lld hosts or host groups update (dimir, Sasha)
+...G...... [ZBX-8236] fixed few memory leaks in Windows agent (wiper)
+A......... [ZBX-8563] added field "logtimefmt" to exported items (Krists)
+.......PS. [ZBX-7621] changed virtual machine disk and network discovery to use device name instead of instance id in discovered item name (wiper)
+.......PS. [ZBX-8338] fixed SNMP walking code so that it intelligently chooses either a string or numeric representation for an OID index (asaveljevs)
+..F....... [ZBX-8577] added wmi.get[] to the list of suggested items (asaveljevs)
+..F....... [ZBX-8216] fixed screen import error (Andrejs)
+A.F....... [ZBX-8510] fixed possible deadlocks when updating IT services (Pavels, Sasha)
+...G...... [ZBX-8512] fixed processing of web.page.regexp without a newline character in the end of http GET response (Arturs)
+A......... [ZBX-8424] fixed finding last event for triggers (Ivo)
+.......PS. [ZBX-8424] changed range limit when looking up eventids to the upper bound of a 64bit integer (Juris)
+A......... [ZBX-8493] fixed usergroup.massadd API call to not create duplicate entries in "rights" table (Krists)
+..F....... [ZBX-8492] fixed maintenance periods without hosts/hostgroups to be accessible by both admins and superadmins (Krists)
+A.F....... [ZBX-8428] fixed item.get API call to return values for "lastvalue", "lastclock", "lastns", "prevvalue" only for last 24 hours (Krists)
+..F....... [ZBX-8371] fixed issue when maintenance items with their hosts/host groups removed are not accessible in configuration (Krists)
+..F....... [ZBX-8366] fixed table header display in Monitoring -> Overview for IE11 (Andrejs)
+
+--------------------------------------------------------------------------------
+Changes for 2.2.5
+
+2.2.5rc1 was released as 2.2.5 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 2.2.5rc1
+
+New features:
+..F....... [ZBX-8278] prepared frontend for mbstring.internal_encoding ini option deprecation in php 5.6+ (Andrejs)
+
+Bug fixes:
+.........T [ZBX-8405] fixed typos in item descriptions for JMX Tomcat, FreeBSD, HP-UX, Linux and OpenBSD templates (Richlv)
+........S. [ZBX-8011] fixed escalator giving false 'no media defined' errors (wiper)
+........S. [ZBX-8359] changed servers timer processes title line to display amount of hosts that have changed maintenance status; active maintenance period count is no longer displayed (Juris)
+...G...... [ZBX-8270] fixed disk space reporting for large AIX file systems (>= 16 TB) (Andris)
+.......PS. [ZBX-8422] removed php mutex locking from server code because of not being used and incompatible licensing issues (wiper)
+A......... [ZBX-8394] corrected misspelled "template" variables in API (Ivo)
+...G...... [ZBX-8248] fixed vfs.file.regexp, vfs.file.regmatch and web.page.regexp to handle carriage returns properly (Juris)
+..F....... [ZBX-8285] fixed widget "History of events" and frontend messaging to use visible host names (Krists)
+A.F....... [ZBX-8151] fixed XXE vulnerability on XML import using obsolete libxml versions; thanks to pnig0s@Freebuf for the report (Andrejs)
+..F....... [ZBX-8354] removed period in caption for "Distribution of values for multiple periods" bar report (Andrejs)
+.......PS. [ZBX-8092] fixed items being polled at the same time after host becomes enabled (asaveljevs)
+.......PS. [ZBX-8324] fixed there being too many expressions in a list in a SQL query (asaveljevs)
+...G...... [ZBX-8373] fixed the argument to system.cpu.num[] being ignored on HP-UX (asaveljevs)
+
+--------------------------------------------------------------------------------
+Changes for 2.2.4
+
+2.2.4rc4 was released as 2.2.4 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 2.2.4rc4
+
+New features:
+A.F....... [ZBX-1357] updated Japanese translation; thanks to Zabbix translators (Richlv)
+
+Bug fixes:
+...G...... [ZBX-8213] fixed possible crash when processing eventlog on Windows 2000,2003,XP (wiper)
+
+--------------------------------------------------------------------------------
+Changes for 2.2.4rc3
+
+Bug fixes:
+..F....... [ZBX-8358] fixed overview screen elements being displayed incorrectly after refreshing (Pavels)
+A.F....... [ZBX-8334] fixed selecting group prototypes in HostPrototype::get() using Oracle backend (Andrejs)
+.......PS. [ZBX-8061] fixed vmware cluster functions returning notsupported despite clusters being discovered normally (wiper)
+........S. [ZBX-8348] fixed processing of LLD triggers; functions in a trigger expression could have incorrect ordering (Sasha)
+
+--------------------------------------------------------------------------------
+Changes for 2.2.4rc2
+
+New features:
+A.F....... [ZBX-1357] updated Italian, German and Spanish translations; thanks to Zabbix translators (Richlv)
+
+Bug fixes:
+.......PS. [ZBX-8095] fixed a bug in item queue that updated item's nextcheck but not its position in the queue (asaveljevs)
+...G...PS. [ZBX-8343] fixed a bug in binary heap that could cause a slightly inconsistent ordering of elements in the queue (asaveljevs)
+.......PS. [ZBX-8325] fixed crash with Oracle when inserting large number of records (wiper)
+........S. [ZBX-8336] fixed server crash with value cache is working in low memory mode (wiper)
+
+--------------------------------------------------------------------------------
 Changes for 2.2.4rc1
 
 New features:
+..F....... [ZBX-7399] improved multiselect, added popup select window (Oleg)
 .......... [ZBX-7811] added example robots.txt file (Richlv)
-A.F....... [ZBX-1357] updated Brazilian Portuguese translation; thanks to Zabbix translators (Richlv)
+A.F....... [ZBX-1357] updated Brazilian Portuguese, Italian, Japanese, Polish, Romanian, Russian, Slovak and Spanish translations; thanks to Zabbix translators (Richlv)
 ........S. [ZBX-7555] removed "select" statement from the history cache; increased the cache performance (Sasha)
 
 Bug fixes:
+...G...... [ZBX-8327] fixed possible crash when processing Windows eventlog (wiper)
+..F....... [ZBX-8302] fixed ordering of discovery rules (Andrejs)
+..F....... [ZBX-8209] improved host and item name column widths on Monitoring / Latest data page (Krists)
+.......PS. [ZBX-8287] added truncating of long text values to maximum field length before inserting into database (Andris)
+........S. [ZBX-3163] fixed trigger evaluation order so that it takes dependencies into account (asaveljevs)
+A.F....... [ZBX-7373] improved performance of latest data and item overview pages by taking data for limited period only (Pavels)
+..F....... [ZBX-8200] improved performance of Monitoring / Events page (Krists)
+A.F....... [ZBX-7983] improved performance of "System status" widget (Eduard, Ivo)
+........S. [ZBX-7901] improved value cache database operations when caching count based requests (wiper)
+.......PS. [ZBX-8188] fixed IPMI items staying supported when sensor data becomes unavailable (asaveljevs, dimir)
+........S. [ZBX-8243] added log message when the reason for an item being in an unsupported state changes (Juris)
+A......... [ZBX-8195] fixed web scenario step validation for httptest.create and httptest.update API methods (Krists)
+...G...... [ZBX-6531] fixed memory leak in filesystem discovery on AIX systems (Juris)
+..F....... [ZBX-8241] fixed duplicate display of actions in media type list (Andrejs)
+...G...... [ZBX-8269] fixed processing of active checks in agent (Andris)
+...G...... [ZBX-8238] fixed updating agent 'mtime' for logrt[] items; thanks to Yoshinori Komuro for patch (Andris)
+........S. [ZBX-8143] triggers are now committed to the database individually when setting to an unknown state to avoid potential locking between the poller and history syncer (Juris)
+.......P.. [ZBX-7968] fixed bug when proxy stopped sending history data if it had more than 1000 unmonitored item values in history table; thanks to Corey Shaw for identifying the issue and providing a patch (wiper)
+.......PS. [ZBX-8251] fixed possible crash when trying to get item value from a failed vmware service with log level set to debug (wiper)
+..F.....S. [ZBX-8092] changed the way the number of active triggers is calculated in the dashboard and zabbix[triggers] item (Andrejs, igors)
+........S. [ZBX-8092] added disabled triggers to the configuration cache for correct macro expansion in notifications (igors)
+........S. [ZBX-8092] added disabled hosts and disabled items to the configuration cache for correct macro expansion in notifications (igors)
+........S. [ZBX-8230] changed maintenance status log messages from warning to debug level (Juris)
+...G...... [ZBX-7098] improved handling of log file rotation/truncation for logrt[] and log[] items (Andris)
+........S. [ZBX-8210] fixed crash when attempting to evaluate an eventlog key for items obtained from the value cache (Juris)
+........S. [ZBX-8219] fixed regression in ipmi checks to support on/off values for sent commands (Juris)
+...G...... [ZBX-8213] fixed library loading code on Windows to prevent potential crash condition (Juris)
+...G...... [ZBX-8223] fixed compilation of dummy module on 64-bit platforms by adding "-fPIC" (asaveljevs)
+.........T [ZBX-7387] changed default memory usage graph display method for operating system templates (Juris)
+A.F....... [ZBX-8101] fixed exporting maps from Oracle database (Eduard, Ivo)
+...G...... [ZBX-8198] decreased verbosity of Windows agent with DebugLevel=4 (Nikolaj)
+...G...PS. [ZBX-7729] added data alignment to prevent crash on non x86 processors; thanks to Pablo Ruiz for patch (Nikolaj)
+.......PS. [ZBX-8202] fixed queue calculation for unavailable hosts which are monitored through a proxy (Nikolaj)
+.......PS. [ZBX-8152] added informative log message about optional database patches (Juris)
+...G...PS. [ZBX-8138] fixed ssh infostring searching and validation for ssh related items to allow information messages as per RFC4253 Section 4.2 (Juris)
+...G...... [ZBX-7875] fixed wrongly reported system version for Windows 8.1 and Server 2012 R2 (Nikolaj, wiper)
+A.F....... [ZBX-7766] fixed webscenario status code field validation to accept user macros (Krists)
+...GI..... [ZBX-8127] fixed truncation of hostname on HP-UX machines (igors)
+........S. [ZBX-8181] fixed possible entering of "history syncer" process in an eternal loop when processing IT services (dimir)
+..F....... [ZBX-8176] fixed SQL errors while mass operations when using Oracle database (Krists)
+..F....... [ZBX-8158] fixed disabled hosts not shown in trigger selection popup when in configuration (Krists)
+..F....... [ZBX-7553] fixed graph not getting period when coming from screen (Krists)
+..F....... [ZBX-8075] fixed triggers/data without application not showing in overview (Krists)
+..F....... [ZBX-8111] fixed possible XSS in tables with vertical header row cells (Krists)
+........S. [ZBX-7887] fixed calculated item becoming not found if referenced item becomes not supported (igors)
+..F....... [ZBX-8100] fixed map mass deletion using Oracle (Eduard)
+..F....... [ZBX-8148] fixed maintenance warning message on php < 5.4 versions (Eduard)
+...G...... [ZBX-8108] fixed reading /proc virtual files without rewinding the file position (Juris)
 .......PS. [ZBX-8115] added workaround for 64 bit integer binding not working with Oracle versions less than 11.2 (wiper)
 ..F....... [ZBX-8140] added net.udp.listen key to item popup (Eduard)
 ..F....... [ZBX-8123] fixed form fields show/hide switching in IE9 (Eduard)
@@ -157,6 +531,7 @@ New features:
 A.F....... [ZBX-1357] updated Brazilian Portuguese, Italian, Japanese, Slovak and Turkish translations; thanks to Zabbix translators (Richlv)
 
 Bug fixes:
+...G...... [ZBX-7301] do not put logrt[] item into unsupported state if log files do not exist (fixed as part of ZBX-6731 solution) (Andris)
 ..F....... [ZBX-7896] fixed translated error messages not being rendered correctly in images (Pavels)
 .......PS. [ZBX-7777] increased maximum data transfer limit per connection to remain consistent with 2.0 (Juris)
 A......... [ZBX-7972] fixed not being able to full clone a template with an application if a destination host is specified (Ivo)
@@ -623,7 +998,7 @@ A.F....... [ZBX-6952] fixed XSS vulnerability in user themes, thanks to Lincoln
 ...G...... [ZBX-6902] reverting Solaris system.swap.size calculation from "swap -s" (used in 2.0.7, 2.0.8) to "swap -l"-like algorithm (as in 2.0.6) (Andris)
 ...GI..PS. [ZBX-6955] fixed library order in linking, fixed compiler warnings, improved performance of zbx_snprintf_alloc() function (Andris)
 ........S. [ZBX-6981] fixed SQL error during lld trigger creation (wiper)
-A......... [ZBX-6866] fixed beeing able to add graph items from other hosts for templated graphs (Ivo)
+A......... [ZBX-6866] fixed being able to add graph items from other hosts for templated graphs (Ivo)
 ..F....... [ZBX-6854] fixed javascript error on pages with checkboxes, but without main checkbox (Vitalij)
 ..F....... [ZBX-6873] fixed errors in page switching after executing an action (Ivo)
 
@@ -656,7 +1031,7 @@ A.F.I..... [ZBXNEXT-1569] implemented user name and surname displaying in acknow
 Bug fixes:
 ...G...PS. [ZBX-6916] added space delimeter support in configuration file (igors)
 ..F....... [ZBX-6930] 'Unlink and clear' link bug fix, now it displayed (Vitalij)
-..F....... [ZBX-6878] fixed history screen log bug for two items, parametr itemid renamed to itemids (Vitalij)
+..F....... [ZBX-6878] fixed history screen log bug for two items, parameter itemid renamed to itemids (Vitalij)
 ..F....... [ZBX-6903] fixed template name trim (Eduard, Sasha)
 A.F....... [ZBX-6899] specified source parameter in SQL from events table (Vitalij)
 ..F....... [ZBX-6893] fixed prototype name error ($1 -> {#FSNAME}) on adding new prototype in the graph prototype form in the item prototype selection template (Vitalij)
@@ -1012,15 +1387,62 @@ A......... [ZBX-5498] applications API refactoring (Vedmak)
 ..F....... [ZBX-1845] added tabs to host massupdate form (Vedmak)
 
 --------------------------------------------------------------------------------
+Changes for 2.0.13rc1
+
+New features:
+A.F....... [ZBX-1357] updated Slovak and Ukrainian translations; thanks to Zabbix translators (Richlv)
+
+Bug fixes:
+...G...PS. [ZBX-8629] fixed crash in get_string() function when checking "Database monitor" items (asaveljevs)
+....IJ.... [ZBX-4800] replaced JSON.org library with Android JSON library; thanks to Volker Fröhlich for legal research (asaveljevs)
+.....J.... [ZBX-6229] removed pretty formatting from Java gateway JSON responses (asaveljevs)
+.........T [ZBX-4800] fixed typo in item name in "Template JMX Generic": "mpTenured" -> "mp Tenured" (asaveljevs)
+..F....PS. [ZBX-8608] added support of IP masks for action conditions (Sasha)
+A.F....... [ZBX-8151] fixed XXE vulnerability on XML import using obsolete libxml versions; thanks to pnig0s@Freebuf for the report (Andrejs)
+..F....... [ZBX-8358] fixed overview screen elements being displayed incorrectly after refreshing (Pavels)
+........S. [ZBX-8348] fixed processing of LLD triggers; functions in a trigger expression could have incorrect ordering (Sasha)
+...G...PS. [ZBX-8343] fixed a bug in binary heap that could cause a slightly inconsistent ordering of elements in the queue (asaveljevs)
+...G...... [ZBX-8327] fixed possible crash when processing Windows eventlog (wiper)
+.......PS. [ZBX-8188] fixed IPMI items staying supported when sensor data becomes unavailable (asaveljevs, dimir)
+.......PS. [ZBX-7576] when pinging a broadcast address ignore responses from other addresses (wiper)
+...G...... [ZBX-6531] fixed memory leak in filesystem discovery on AIX systems (Juris)
+..F....... [ZBX-8241] fixed duplicate display of actions in media type list (Andrejs)
+...G...... [ZBX-8269] fixed processing of active checks in agent (Andris)
+...G...... [ZBX-8238] fixed updating agent 'mtime' for logrt[] items; thanks to Yoshinori Komuro for patch (Andris)
+...G...PS. [ZBX-7098] improved handling of log file rotation/truncation for logrt[] and log[] items (Andris)
+...G...... [ZBX-8198] decreased verbosity of Windows agent with DebugLevel=4 (Nikolaj)
+...G...... [ZBX-7875] fixed wrongly reported system version for Windows 8.1 and Server 2012 R2 (Nikolaj, wiper)
+
+--------------------------------------------------------------------------------
+Changes for 2.0.12
+
+2.0.12rc3 was released as 2.0.12 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 2.0.12rc3
+
+Bug fixes:
+........S. [ZBX-8181] fixed possible entering of "history syncer" process in an eternal loop when processing IT services (dimir)
+
+--------------------------------------------------------------------------------
+Changes for 2.0.12rc2
+
+Bug fixes:
+...G...... [ZBX-7856] fixed zbx_stat() not working with directories in Windows (wiper)
+
+--------------------------------------------------------------------------------
 Changes for 2.0.12rc1
 
 New features:
 .......... [ZBX-7811] added example robots.txt file (Richlv)
 ....IJ.... [ZBXNEXT-1889] made startup.sh and shutdown.sh scripts for Java gateway work in /bin/sh (asaveljevs)
 .D........ [ZBX-7597] added description of the returned value types to the agentd manpage (Richlv)
-A.F....... [ZBX-1357] updated Brazilian Portuguese, Italian, Japanese, Persian, Slovak and Ukrainian translations; thanks to Zabbix translators (Richlv)
+A.F....... [ZBX-1357] updated Brazilian Portuguese, Italian, Japanese, Persian, Russian, Slovak and Ukrainian translations; thanks to Zabbix translators (Richlv)
 
 Bug fixes:
+...G...... [ZBX-7301] do not put logrt[] item into unsupported state if log files do not exist (fixed as part of ZBX-6731 solution) (Andris)
+..F....... [ZBX-8111] fixed possible XSS in tables with vertical header row cells (Krists)
+...G...... [ZBX-8108] fixed reading /proc virtual files without rewinding the file position (Juris)
 .......P.. [ZBX-7825] fixed saving of the history data in sequential time order on proxy side (Sasha)
 .......PS. [ZBX-4675] added error checks to avoid partial configuration loading (dimir)
 .D........ [ZBX-6542] added additional information in the default server configuration file about HousekeepingFrequency parameter (Sasha)
@@ -1396,6 +1818,7 @@ Changes for 2.0.4rc1
 
 New features:
 A.F....... [ZBX-1357] added initial Portuguese (Portugal) translation (Richlv)
+..F....... [ZBXNEXT-1398] changed vertical labels in Monitoring -> Overview from PNG images to text (Eduard)
 ..F....... [ZBXNEXT-1398] implemented flickerfree screen shadowing for old screen data (Eduard)
 A.F....... [ZBX-1357] added initial Indonesian translation (Richlv)
 ..F....... [ZBXNEXT-1393] fixed global scripts font (Eduard)
@@ -2000,7 +2423,7 @@ A......... [ZBX-4784] fixed inherited triggers being updated on any host update
 A.F....... [ZBX-4790] fixed *ERROR*s in trigger expressions in items.php; fixed undefined variables when filtering without host (Toms)
 ..F....... [ZBX-3725] added check for xml file size exceeds upload_max_filesize php setting (Vedmak)
 A.F....... [ZBX-3991] forbid passive proxy interfaces with ip 0.0.0.0 (Vedmak)
-..F....... [ZBX-3152] fixed messages are shown even if all severities are unchecked (Vedmak)
+..F....... [ZBX-3152] fixed global messages being shown even if all severities are unchecked (Vedmak)
 ....I..... [ZBXNEXT-397] removed records from "ids" table to prevent SQL errors while adding a new item (Sasha)
 ..F....... [ZBX-4811] added 'filter' and 'lifetime' fields to discovery rules export (Vedmak)
 ...G...... [ZBX-4801] fixed processing of proc.num[] and proc.mem[] checks with name of processes more than 15 characters (Sasha)
@@ -2538,6 +2961,10 @@ New features:
 --------------------------------------------------------------------------------
 Changes for 1.8.21rc1
 
+..F....PS. [ZBX-8608] added support of IP masks for action conditions (Sasha)
+A.F....... [ZBX-8151] fixed XXE vulnerability on XML import using obsolete libxml versions; thanks to pnig0s@Freebuf for the report (Andrejs)
+...G...PS. [ZBX-8343] fixed a bug in binary heap that could cause a slightly inconsistent ordering of elements in the queue (asaveljevs)
+...G...... [ZBX-8198] decreased verbosity of Windows agent with DebugLevel=4 (Nikolaj)
 A.F....... [ZBX-7930] improved SQL performance and execution time in Maintenance page (Ivo)
 
 Changes for 1.8.20
@@ -2980,7 +3407,7 @@ Changes for 1.8.6rc1
  - [ZBX-3973] added logging of proxy mode (active/passive) at startup (rudolfs)
  - [ZBX-3902] fixed possible zombie states in UNIX, moved watchdog (server) and heartbeats (proxy) to separate processes (main process just waits), added more logging to exiting Windows agent (rudolfs)
  - [ZBX-3166] fixed application updating in Template linking event. Changed linked Template color in application page. Added param NOEMPTY for popup page witch allows hide Empty button in application and item pages (Eduard)
- - [ZBX-3565] reformating media types in notifications page, adding links to media types (Eduard)
+ - [ZBX-3565] reformatting media types in notifications page, adding links to media types (Eduard)
  - [ZBX-3784] added validation on duplicate discovery rule name (Eduard)
  - [ZBX-3733] make possible to save Device uniqueness criteria status (discovery rule) in cloning event (Eduard)
  - [ZBX-3845] check, if this user group is used in the config, if so it cannot be deleted (Eduard)
diff --git a/bin/win32/dev/zabbix_sender.dll b/bin/win32/dev/zabbix_sender.dll
index 30477fe6ed4..885936f6148 100644
--- a/bin/win32/dev/zabbix_sender.dll
+++ b/bin/win32/dev/zabbix_sender.dll
diff --git a/bin/win32/dev/zabbix_sender.lib b/bin/win32/dev/zabbix_sender.lib
index 01efd96db0d..0378f58ac4d 100644
--- a/bin/win32/dev/zabbix_sender.lib
+++ b/bin/win32/dev/zabbix_sender.lib
diff --git a/bin/win32/zabbix_agentd.exe b/bin/win32/zabbix_agentd.exe
index 7c3eb10adbd..84e4168d40b 100755
--- a/bin/win32/zabbix_agentd.exe
+++ b/bin/win32/zabbix_agentd.exe
diff --git a/bin/win32/zabbix_get.exe b/bin/win32/zabbix_get.exe
index ee891b0e244..1fab28bc3ae 100755
--- a/bin/win32/zabbix_get.exe
+++ b/bin/win32/zabbix_get.exe
diff --git a/bin/win32/zabbix_sender.exe b/bin/win32/zabbix_sender.exe
index caeda6f1c00..bde52b8e943 100755
--- a/bin/win32/zabbix_sender.exe
+++ b/bin/win32/zabbix_sender.exe
diff --git a/bin/win64/dev/zabbix_sender.dll b/bin/win64/dev/zabbix_sender.dll
index 0e5376d3a66..d500e02a34a 100644
--- a/bin/win64/dev/zabbix_sender.dll
+++ b/bin/win64/dev/zabbix_sender.dll
diff --git a/bin/win64/dev/zabbix_sender.lib b/bin/win64/dev/zabbix_sender.lib
index 49466951d81..72e730140a9 100644
--- a/bin/win64/dev/zabbix_sender.lib
+++ b/bin/win64/dev/zabbix_sender.lib
diff --git a/bin/win64/zabbix_agentd.exe b/bin/win64/zabbix_agentd.exe
index b624ac2bd81..eb5949f0bb6 100755
--- a/bin/win64/zabbix_agentd.exe
+++ b/bin/win64/zabbix_agentd.exe
diff --git a/bin/win64/zabbix_get.exe b/bin/win64/zabbix_get.exe
index 55efbb77118..42b1bb4f3d9 100755
--- a/bin/win64/zabbix_get.exe
+++ b/bin/win64/zabbix_get.exe
diff --git a/bin/win64/zabbix_sender.exe b/bin/win64/zabbix_sender.exe
index 1de73a81076..f5b8a7ca306 100755
--- a/bin/win64/zabbix_sender.exe
+++ b/bin/win64/zabbix_sender.exe
diff --git a/conf/zabbix_agent.conf b/conf/zabbix_agent.conf
index 28da0767935..2dada70bf43 100644
--- a/conf/zabbix_agent.conf
+++ b/conf/zabbix_agent.conf
@@ -44,6 +44,7 @@ Server=127.0.0.1
 
 # Include=/usr/local/etc/zabbix_agent.userparams.conf
 # Include=/usr/local/etc/zabbix_agent.conf.d/
+# Include=/usr/local/etc/zabbix_agent.conf.d/*.conf
 
 ####### USER-DEFINED MONITORED PARAMETERS #######
 
diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
index 846cf236b13..1a76d61e253 100644
--- a/conf/zabbix_agentd.conf
+++ b/conf/zabbix_agentd.conf
@@ -250,6 +250,7 @@ Hostname=Zabbix server
 
 # Include=/usr/local/etc/zabbix_agentd.userparams.conf
 # Include=/usr/local/etc/zabbix_agentd.conf.d/
+# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
 
 ####### USER-DEFINED MONITORED PARAMETERS #######
 
diff --git a/conf/zabbix_agentd.win.conf b/conf/zabbix_agentd.win.conf
index cd4720c6601..a32d328a2d9 100644
--- a/conf/zabbix_agentd.win.conf
+++ b/conf/zabbix_agentd.win.conf
@@ -235,6 +235,8 @@ Hostname=Windows host
 # Include=
 
 # Include=c:\zabbix\zabbix_agentd.userparams.conf
+# Include=c:\zabbix\zabbix_agentd.conf.d\
+# Include=c:\zabbix\zabbix_agentd.conf.d\*.conf
 
 ####### USER-DEFINED MONITORED PARAMETERS #######
 
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
index 6ca35e7e5f2..964db481ac6 100644
--- a/conf/zabbix_proxy.conf
+++ b/conf/zabbix_proxy.conf
@@ -126,7 +126,7 @@ LogFile=/tmp/zabbix_proxy.log
 DBName=zabbix_proxy
 
 ### Option: DBSchema
-#	Schema name. Used for IBM DB2.
+#	Schema name. Used for IBM DB2 and PostgreSQL.
 #
 # Mandatory: no
 # Default:
@@ -230,7 +230,9 @@ DBUser=root
 # StartIPMIPollers=0
 
 ### Option: StartPollersUnreachable
-#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI).
+#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java).
+#	At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers
+#	are started.
 #
 # Mandatory: no
 # Range: 0-1000
@@ -346,7 +348,10 @@ DBUser=root
 
 ### Option: HousekeepingFrequency
 #	How often Zabbix will perform housekeeping procedure (in hours).
-#	Housekeeping is removing unnecessary information from history, alert, and alarms tables.
+#	Housekeeping is removing unnecessary information from proxy history tables.
+#	To prevent housekeeper from being overloaded, no more than 4xHousekeepingFrequency hours
+#	of outdated history are deleted in one housekeeping cycle.
+#	To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start.
 #
 # Mandatory: no
 # Range: 1-24
@@ -506,6 +511,32 @@ DBUser=root
 
 # Include=/usr/local/etc/zabbix_proxy.general.conf
 # Include=/usr/local/etc/zabbix_proxy.conf.d/
+# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf
+
+### Option: SSLCertLocation
+#	Location of SSL client certificates.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCertLocation=${datadir}/zabbix/ssl/certs
+
+### Option: SSLKeyLocation
+#	Location of private keys for SSL client certificates.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLKeyLocation=${datadir}/zabbix/ssl/keys
+
+### Option: SSLCALocation
+#	Location of certificate authority (CA) files for SSL server certificate verification.
+#	If not set, system-wide directory will be used.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCALocation=
 
 ####### LOADABLE MODULES #######
 
diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
index e55e6209d82..6a3e0f391b9 100644
--- a/conf/zabbix_server.conf
+++ b/conf/zabbix_server.conf
@@ -78,7 +78,7 @@ LogFile=/tmp/zabbix_server.log
 DBName=zabbix
 
 ### Option: DBSchema
-#	Schema name. Used for IBM DB2.
+#	Schema name. Used for IBM DB2 and PostgreSQL.
 #
 # Mandatory: no
 # Default:
@@ -135,7 +135,9 @@ DBUser=root
 # StartIPMIPollers=0
 
 ### Option: StartPollersUnreachable
-#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI).
+#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java).
+#	At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers
+#	are started.
 #
 # Mandatory: no
 # Range: 0-1000
@@ -265,10 +267,11 @@ DBUser=root
 
 ### Option: HousekeepingFrequency
 #	How often Zabbix will perform housekeeping procedure (in hours).
-#	Housekeeping is removing unnecessary information from history, alert, and alarms tables.
-#	To prevent Housekeeper from being overloaded (for example, when history and trend periods
+#	Housekeeping is removing unnecessary information from history, alert, alarm, and other tables.
+#	To prevent housekeeper from being overloaded (for example, when history and trend periods
 #	are greatly reduced), no more than 4xHousekeepingFrequency hours of outdated history are
 #	deleted in one housekeeping cycle, for each item.
+#	To lower load on server startup housekeeping is postponed for 30 minutes after server start.
 #
 # Mandatory: no
 # Range: 1-24
@@ -350,7 +353,7 @@ DBUser=root
 
 ### Option: ValueCacheSize
 #	Size of history value cache, in bytes.
-#	Shared memory size for caching item history data requests
+#	Shared memory size for caching item history data requests.
 #	Setting to 0 disables value cache.
 #
 # Mandatory: no
@@ -510,6 +513,32 @@ DBUser=root
 
 # Include=/usr/local/etc/zabbix_server.general.conf
 # Include=/usr/local/etc/zabbix_server.conf.d/
+# Include=/usr/local/etc/zabbix_server.conf.d/*.conf
+
+### Option: SSLCertLocation
+#	Location of SSL client certificates.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCertLocation=${datadir}/zabbix/ssl/certs
+
+### Option: SSLKeyLocation
+#	Location of private keys for SSL client certificates.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLKeyLocation=${datadir}/zabbix/ssl/keys
+
+### Option: SSLCALocation
+#	Location of certificate authority (CA) files for SSL server certificate verification.
+#	If not set, system-wide directory will be used.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCALocation=
 
 ####### LOADABLE MODULES #######
 
diff --git a/configure.ac b/configure.ac
index ef28494fb47..56576a8f09a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([Zabbix],[2.3.0])
+AC_INIT([Zabbix],[2.3.4])
 AC_CONFIG_SRCDIR(src/zabbix_server/server.c)
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE
 
 AC_MSG_NOTICE([Configuring $PACKAGE_NAME $PACKAGE_VERSION])
 
@@ -51,7 +51,7 @@ AC_CHECK_HEADERS(stdio.h stdlib.h string.h unistd.h netdb.h signal.h \
   syslog.h time.h errno.h sys/types.h sys/stat.h netinet/in.h \
   math.h sys/socket.h dirent.h ctype.h \
   mtent.h fcntl.h sys/param.h arpa/inet.h \
-  sys/vfs.h sys/pstat.h sys/sysinfo.h sys/statvfs.h \
+  sys/vfs.h sys/pstat.h sys/sysinfo.h sys/statvfs.h sys/statfs.h \
   sys/socket.h sys/loadavg.h arpa/inet.h \
   sys/vmmeter.h strings.h vm/vm_param.h \
   sys/time.h kstat.h sys/syscall.h sys/sysmacros.h \
@@ -347,6 +347,25 @@ AC_DEFINE(HAVE_SYS_STATVFS64, 1, [Define to 1 if struct 'statvfs64' exists.])
 AC_MSG_RESULT(yes),
 AC_MSG_RESULT(no))
 
+AC_MSG_CHECKING(for struct statfs64 in sys/statfs.h)
+AC_TRY_COMPILE(
+[
+#ifdef HAVE_SYS_TYPES_H
+#	include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#	include <sys/statfs.h>
+#endif
+],
+[
+	struct statfs64	s;
+	s.f_bsize = s.f_blocks = s.f_bfree = s.f_bavail = 0;
+	statfs64("/", &s);
+],
+AC_DEFINE(HAVE_SYS_STATFS64, 1, [Define to 1 if struct 'statfs64' exists.])
+AC_MSG_RESULT(yes),
+AC_MSG_RESULT(no))
+
 AC_MSG_CHECKING(for field ss_family in struct sockaddr_storage)
 AC_TRY_COMPILE([#include <sys/socket.h>],
 [struct sockaddr_storage ss;
@@ -877,18 +896,6 @@ darwin*|rhapsody*)
 	;;
 *solaris*)
 	ARCH="solaris"
-	dnl Forcing a 64-bit application for a 64-bit Solaris
-	dnl A 32-bit program that uses /proc is able to look at 32-bit processes,
-	dnl but is not able to understand all attributes of a 64-bit process.
-	AC_MSG_CHECKING(for -m64 compilation flag)
-	saved_CFLAGS="$CFLAGS"
-	CFLAGS="-m64"
-	AC_TRY_RUN(
-	[int main(void) {return 0;}],
-	CFLAGS="-m64 $saved_CFLAGS"
-	AC_MSG_RESULT(yes),
-	CFLAGS="$saved_CFLAGS"
-	AC_MSG_RESULT(no))
 	;;
 hpux*)
 	ARCH="hpux"
@@ -933,20 +940,48 @@ if test "x$ARCH" = "xlinux"; then
 	esac
 fi
 
-dnl Low Level Discovery needs a way to get the list of network
-dnl interfaces available on the monitored system. On HP-UX systems
-dnl that way depends on the OS version.
+if test "x$ARCH" = "xsolaris"; then
+	dnl Forcing a 64-bit application for a 64-bit Solaris
+	dnl A 32-bit program that uses /proc is able to look at 32-bit processes,
+	dnl but is not able to understand all attributes of a 64-bit process.
+	AC_MSG_CHECKING(for -m64 compilation flag)
+	saved_CFLAGS="$CFLAGS"
+	CFLAGS="-m64"
+	AC_TRY_RUN(
+	[int main(void) {return 0;}],
+	CFLAGS="-m64 $saved_CFLAGS"
+	AC_MSG_RESULT(yes),
+	CFLAGS="$saved_CFLAGS"
+	AC_MSG_RESULT(no))
+fi
+
 if test "x$ARCH" = "xhpux"; then
+	dnl Low Level Discovery needs a way to get the list of network
+	dnl interfaces available on the monitored system. On HP-UX systems
+	dnl that way depends on the OS version.
 	hpux_version=${host_os#hpux}
 	hpux_major=${hpux_version%.*}
 	hpux_minor=${hpux_version#*.}
 
 	AC_DEFINE_UNQUOTED([HPUX_VERSION], $hpux_major$hpux_minor, [Define to HP-UX version])
+
+	dnl This API level is needed so that "utsname.nodename" is not truncated.
+	AC_MSG_CHECKING(for -D_HPUX_API_LEVEL=20040821 compilation flag)
+	saved_CFLAGS="$CFLAGS"
+	CFLAGS="-D_HPUX_API_LEVEL=20040821"
+	AC_TRY_RUN(
+	[int main(void) {return 0;}],
+	CFLAGS="-D_HPUX_API_LEVEL=20040821 $saved_CFLAGS"
+	AC_MSG_RESULT(yes),
+	CFLAGS="$saved_CFLAGS"
+	AC_MSG_RESULT(no))
 fi
 
 AC_DEFINE_UNQUOTED([ARCH], "${ARCH}", [Define to OS name for code managing])
 AC_SUBST(ARCH)
 
+AC_CHECK_SIZEOF([void *])
+
 dnl *****************************************************************
 dnl *                                                               *
 dnl *         Checks for options given on the command line          *
diff --git a/create/bin/gen_schema.pl b/create/bin/gen_schema.pl
index 4b1007b83b1..497a56e4a89 100755
--- a/create/bin/gen_schema.pl
+++ b/create/bin/gen_schema.pl
@@ -23,12 +23,12 @@ my $file = dirname($0)."/../src/schema.tmpl";	# name the file
 
 my ($state, %output, $eol, $fk_bol, $fk_eol, $ltab, $pkey, $table_name);
 my ($szcol1, $szcol2, $szcol3, $szcol4, $sequences, $sql_suffix);
-my ($fkeys, $fkeys_prefix, $fkeys_suffix, $fkeys_drop, $uniq);
+my ($fkeys, $fkeys_prefix, $fkeys_suffix, $uniq);
 
 my %c = (
 	"type"		=>	"code",
 	"database"	=>	"",
-	"after"		=>	"\t{0}\n\n#undef ZBX_TYPE_SHORTTEXT_LEN\n\n};\n",
+	"after"		=>	"\t{0}\n\n#undef ZBX_TYPE_LONGTEXT_LEN\n#undef ZBX_TYPE_SHORTTEXT_LEN\n\n};\n",
 	"t_bigint"	=>	"ZBX_TYPE_UINT",
 	"t_char"	=>	"ZBX_TYPE_CHAR",
 	"t_text"	=>	"ZBX_TYPE_TEXT",
@@ -74,6 +74,12 @@ const ZBX_TABLE\ttables[] = {
 #	define ZBX_TYPE_SHORTTEXT_LEN	65535
 #endif
 
+#if defined(HAVE_IBM_DB2)
+#	define ZBX_TYPE_LONGTEXT_LEN	2048
+#else
+#	define ZBX_TYPE_LONGTEXT_LEN	0
+#endif
+
 ";
 
 my %ibm_db2 = (
@@ -305,6 +311,10 @@ sub process_field
 		{
 			$length = "ZBX_TYPE_SHORTTEXT_LEN";
 		}
+		elsif ($type eq "ZBX_TYPE_LONGTEXT")
+		{
+			$length = "ZBX_TYPE_LONGTEXT_LEN";
+		}
 		else
 		{
 			$length = 0;
@@ -461,12 +471,10 @@ sub process_field
 				if ($output{"database"} eq "mysql")
 				{
 					$fkeys = "${fkeys}${fk_bol}ALTER TABLE${only} `${table_name}` ADD CONSTRAINT `${cname}` FOREIGN KEY (`${name}`) REFERENCES `${fk_table}` (`${fk_field}`)${fk_flags}${fk_eol}\n";
-					$fkeys_drop = "${fkeys_drop}${fk_bol}ALTER TABLE${only} `${table_name}` DROP FOREIGN KEY `${cname}`${fk_eol}\n";
 				}
 				else
 				{
 					$fkeys = "${fkeys}${fk_bol}ALTER TABLE${only} ${table_name} ADD CONSTRAINT ${cname} FOREIGN KEY (${name}) REFERENCES ${fk_table} (${fk_field})${fk_flags}${fk_eol}\n";
-					$fkeys_drop = "${fkeys_drop}${fk_bol}ALTER TABLE${only} ${table_name} DROP CONSTRAINT ${cname}${fk_eol}\n";
 				}
 			}
 		}
@@ -631,7 +639,6 @@ sub process
 
 	$state = "bof";
 	$fkeys = "";
-	$fkeys_drop = "";
 	$sequences = "";
 	$uniq = "";
 	my ($type, $line);
@@ -683,7 +690,6 @@ sub main
 	$sql_suffix="";
 	$fkeys_prefix = "";
 	$fkeys_suffix = "";
-	my $fkeys_drop_prefix = "";
 
 	if ($format eq 'c')		{ %output = %c; }
 	elsif ($format eq 'ibm_db2')	{ %output = %ibm_db2; }
@@ -708,29 +714,13 @@ sub main
 		$sql_suffix="\";\n";
 		$fkeys_prefix = "const char\t*const db_schema_fkeys[] = {\n";
 		$fkeys_suffix = "\tNULL\n};\n";
-		$fkeys_drop_prefix = "const char\t*const db_schema_fkeys_drop[] = {\n";
 
-		print "\n#if defined(HAVE_IBM_DB2)\nconst char\t*const db_schema = \"\\\n";
-		%output = %ibm_db2;
-		process();
-		print $fkeys_drop_prefix.$fkeys_drop.$fkeys_suffix;
-		print "#elif defined(HAVE_MYSQL)\nconst char\t*const db_schema = \"\\\n";
-		%output = %mysql;
-		process();
-		print $fkeys_drop_prefix.$fkeys_drop.$fkeys_suffix;
-		print "#elif defined(HAVE_ORACLE)\nconst char\t*const db_schema = \"\\\n";
-		%output = %oracle;
-		process();
-		print $fkeys_drop_prefix.$fkeys_drop.$fkeys_suffix;
-		print "#elif defined(HAVE_POSTGRESQL)\nconst char\t*const db_schema = \"\\\n";
-		%output = %postgresql;
-		process();
-		print $fkeys_drop_prefix.$fkeys_drop.$fkeys_suffix;
-		print "#elif defined(HAVE_SQLITE3)\nconst char\t*const db_schema = \"\\\n";
+		print "#if defined(HAVE_SQLITE3)\nconst char\t*const db_schema = \"\\\n";
 		%output = %sqlite3;
 		process();
-		print $fkeys_drop_prefix.$fkeys_drop.$fkeys_suffix;
-		print "#endif\t/* HAVE_SQLITE3 */\n";
+		print "#else\t/* HAVE_SQLITE3 */\n";
+		print "const char\t*const db_schema = NULL;\n";
+		print "#endif\t/* not HAVE_SQLITE3 */\n";
 	}
 }
 
diff --git a/create/src/data.tmpl b/create/src/data.tmpl
index 255699cd2d5..94d46636cb6 100644
--- a/create/src/data.tmpl
+++ b/create/src/data.tmpl
@@ -94,57 +94,56 @@ ROW   |18      |System performance  |1    |2    |10079     |
 ROW   |19      |System performance  |2    |2    |10081     |
 
 TABLE |screens_items
-FIELDS|screenitemid|screenid|resourcetype|resourceid|width|height|x|y|colspan|rowspan|elements|valign|halign|style|url|dynamic|sort_triggers|application|
-ROW   |20          |3       |0           |433       |500  |120   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |22          |3       |0           |387       |500  |148   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |24          |4       |0           |392       |500  |212   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |25          |4       |0           |404       |500  |100   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |26          |4       |0           |406       |555  |114   |0|1|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |27          |4       |0           |410       |500  |128   |1|1|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |28          |5       |0           |469       |500  |148   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |30          |6       |0           |475       |500  |114   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |31          |6       |0           |474       |500  |100   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |32          |7       |0           |463       |500  |120   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |33          |7       |0           |462       |500  |106   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |36          |9       |0           |457       |500  |120   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |37          |9       |0           |456       |500  |106   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |40          |10      |0           |481       |500  |114   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |41          |10      |0           |480       |500  |100   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |42          |15      |0           |454       |500  |200   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |43          |15      |0           |455       |500  |270   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |44          |16      |2           |1         |500  |100   |0|0|2      |0      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |45          |16      |0           |524       |400  |156   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |46          |16      |0           |525       |400  |100   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |47          |4       |0           |527       |500  |160   |0|2|2      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |48          |17      |0           |532       |500  |212   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |49          |17      |0           |530       |500  |100   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |50          |17      |0           |531       |500  |100   |0|1|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |51          |17      |0           |529       |500  |128   |1|1|1      |1      |0       |1     |0     |0    |   |0      |0            |           |
-ROW   |52          |9       |0           |544       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |53          |5       |0           |471       |500  |100   |1|0|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |54          |5       |0           |498       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |55          |5       |0           |540       |500  |100   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |56          |7       |0           |541       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |57          |7       |0           |464       |500  |300   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |58          |6       |0           |542       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |59          |3       |0           |533       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |60          |3       |0           |436       |500  |300   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |61          |3       |1           |10009     |500  |100   |0|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |62          |3       |1           |10013     |500  |100   |1|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |63          |18      |0           |487       |500  |100   |0|0|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |64          |18      |0           |543       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |65          |9       |0           |458       |500  |300   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |66          |9       |1           |22838     |500  |100   |0|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |67          |9       |1           |22837     |500  |100   |1|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |68          |10      |0           |545       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |69          |10      |0           |482       |500  |300   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |70          |10      |1           |22998     |500  |100   |0|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |71          |10      |1           |22997     |500  |100   |1|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |72          |19      |0           |495       |500  |100   |0|0|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |73          |19      |0           |546       |500  |100   |1|0|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |74          |19      |1           |23140     |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-ROW   |75          |19      |1           |23138     |500  |100   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |
-
+FIELDS|screenitemid|screenid|resourcetype|resourceid|width|height|x|y|colspan|rowspan|elements|valign|halign|style|url|dynamic|sort_triggers|application|max_columns|
+ROW   |20          |3       |0           |433       |500  |120   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |22          |3       |0           |387       |500  |148   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |24          |4       |0           |392       |500  |212   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |25          |4       |0           |404       |500  |100   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |26          |4       |0           |406       |555  |114   |0|1|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |27          |4       |0           |410       |500  |128   |1|1|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |28          |5       |0           |469       |500  |148   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |30          |6       |0           |475       |500  |114   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |31          |6       |0           |474       |500  |100   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |32          |7       |0           |463       |500  |120   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |33          |7       |0           |462       |500  |106   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |36          |9       |0           |457       |500  |120   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |37          |9       |0           |456       |500  |106   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |40          |10      |0           |481       |500  |114   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |41          |10      |0           |480       |500  |100   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |42          |15      |0           |454       |500  |200   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |43          |15      |0           |455       |500  |270   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |44          |16      |2           |1         |500  |100   |0|0|2      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |45          |16      |0           |524       |400  |156   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |46          |16      |0           |525       |400  |100   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |47          |4       |0           |527       |500  |160   |0|2|2      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |48          |17      |0           |532       |500  |212   |0|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |49          |17      |0           |530       |500  |100   |1|0|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |50          |17      |0           |531       |500  |100   |0|1|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |51          |17      |0           |529       |500  |128   |1|1|1      |1      |0       |1     |0     |0    |   |0      |0            |           |3          |
+ROW   |52          |9       |0           |544       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |53          |5       |0           |471       |500  |100   |1|0|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |54          |5       |0           |498       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |55          |5       |0           |540       |500  |100   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |56          |7       |0           |541       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |57          |7       |0           |464       |500  |300   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |58          |6       |0           |542       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |59          |3       |0           |533       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |60          |3       |0           |436       |500  |300   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |61          |3       |1           |10009     |500  |100   |0|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |62          |3       |1           |10013     |500  |100   |1|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |63          |18      |0           |487       |500  |100   |0|0|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |64          |18      |0           |543       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |65          |9       |0           |458       |500  |300   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |66          |9       |1           |22838     |500  |100   |0|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |67          |9       |1           |22837     |500  |100   |1|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |68          |10      |0           |545       |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |69          |10      |0           |482       |500  |300   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |70          |10      |1           |22998     |500  |100   |0|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |71          |10      |1           |22997     |500  |100   |1|2|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |72          |19      |0           |495       |500  |100   |0|0|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |73          |19      |0           |546       |500  |100   |1|0|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |74          |19      |1           |23140     |500  |100   |0|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
+ROW   |75          |19      |1           |23138     |500  |100   |1|1|1      |1      |0       |0     |0     |0    |   |0      |0            |           |3          |
 TABLE |drules
 FIELDS|druleid|proxy_hostid|name         |iprange        |delay|status|
 ROW   |2      |NULL        |Local network|192.168.0.1-254|3600 |1     |
@@ -267,11 +266,11 @@ ROW   |336          |10082 |Memory Pool       |
 ROW   |337          |10082 |Operating System  |
 ROW   |338          |10082 |Runtime           |
 ROW   |339          |10082 |Threads           |
-ROW   |343          |10083 |Sessions          |
-ROW   |344          |10083 |Tomcat            |
 ROW   |340          |10083 |http-8080         |
 ROW   |341          |10083 |http-8443         |
 ROW   |342          |10083 |jk-8009           |
+ROW   |343          |10083 |Sessions          |
+ROW   |344          |10083 |Tomcat            |
 ROW   |346          |10084 |CPU               |
 ROW   |347          |10084 |Filesystems       |
 ROW   |348          |10084 |General           |
@@ -322,16 +321,17 @@ FIELDS|valuemapid|name                                 |
 ROW   |4         |APC Battery Replacement Status       |
 ROW   |5         |APC Battery Status                   |
 ROW   |7         |Dell Open Manage System Status       |
-ROW   |6         |HP Insight System Status             |
 ROW   |2         |Host status                          |
+ROW   |6         |HP Insight System Status             |
+ROW   |1         |Service state                        |
 ROW   |9         |SNMP device status (hrDeviceStatus)  |
 ROW   |11        |SNMP interface status (ifAdminStatus)|
 ROW   |8         |SNMP interface status (ifOperStatus) |
-ROW   |1         |Service state                        |
-ROW   |12        |VMware VirtualMachinePowerState      |
 ROW   |13        |VMware status                        |
+ROW   |12        |VMware VirtualMachinePowerState      |
 ROW   |3         |Windows service state                |
 ROW   |10        |Zabbix agent ping status             |
+ROW   |14        |Maintenance status                   |
 
 TABLE |items
 FIELDS|itemid|type|snmp_community   |snmp_oid                                                 |hostid|name                                                             |key_                                                                           |delay|history|trends|status|value_type|trapper_hosts|units   |multiplier|delta|snmpv3_securityname|snmpv3_securitylevel|snmpv3_authpassphrase|snmpv3_privpassphrase|formula|logtimefmt|templateid|valuemapid|delay_flex|params                                                                              |ipmi_sensor     |data_type|authtype|username   |password   |publickey|privatekey|flags|interfaceid|port|description                                                                                                                                                                                                                                                                                                                                                                                                                               |inventory_link|lifetime|snmpv3_authprotocol|snmpv3_privprotocol|snmpv3_contextname|evaltype|
@@ -353,7 +353,7 @@ ROW   |17350 |0   |                 |
 ROW   |17352 |0   |                 |                                                         |10001 |Host local time                                                  |system.localtime                                                               |60   |7      |365   |0     |3         |             |unixtime|0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |0       |0                  |0                  |                  |0       |
 ROW   |17354 |0   |                 |                                                         |10001 |CPU $2 time                                                      |system.cpu.util[,idle]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent doing nothing.                                                                                                                                                                                                                                                                                                                                                                                                 |0             |0       |0                  |0                  |                  |0       |
 ROW   |17356 |0   |                 |                                                         |10001 |CPU $2 time                                                      |system.cpu.util[,user]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' processes that are not niced.                                                                                                                                                                                                                                                                                                                                                                   |0             |0       |0                  |0                  |                  |0       |
-ROW   |17358 |0   |                 |                                                         |10001 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' proccess that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |0       |0                  |0                  |                  |0       |
+ROW   |17358 |0   |                 |                                                         |10001 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' processes that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |0       |0                  |0                  |                  |0       |
 ROW   |17360 |0   |                 |                                                         |10001 |CPU $2 time                                                      |system.cpu.util[,system]                                                       |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running the kernel and its processes.                                                                                                                                                                                                                                                                                                                                                                          |0             |0       |0                  |0                  |                  |0       |
 ROW   |17362 |0   |                 |                                                         |10001 |CPU $2 time                                                      |system.cpu.util[,iowait]                                                       |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |Amount of time the CPU has been waiting for I/O to complete.                                                                                                                                                                                                                                                                                                                                                                              |0             |0       |0                  |0                  |                  |0       |
 ROW   |22181 |0   |                 |                                                         |10001 |Available memory                                                 |vm.memory.size[available]                                                      |60   |7      |365   |0     |3         |             |B       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |Available memory is defined as free+cached+buffers memory.                                                                                                                                                                                                                                                                                                                                                                                |0             |0       |0                  |0                  |                  |0       |
@@ -471,7 +471,7 @@ ROW   |22843 |0   |                 |
 ROW   |22844 |0   |                 |                                                         |10074 |Context switches per second                                      |system.cpu.switches                                                            |60   |7      |365   |0     |3         |             |sps     |0         |1    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |22845 |0   |                 |                                                         |10074 |CPU $2 time                                                      |system.cpu.util[,idle]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent doing nothing.                                                                                                                                                                                                                                                                                                                                                                                                 |0             |30      |0                  |0                  |                  |0       |
 ROW   |22846 |0   |                 |                                                         |10074 |CPU $2 time                                                      |system.cpu.util[,interrupt]                                                    |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The amount of time the CPU has been servicing hardware interrupts.                                                                                                                                                                                                                                                                                                                                                                        |0             |30      |0                  |0                  |                  |0       |
-ROW   |22848 |0   |                 |                                                         |10074 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' proccess that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |30      |0                  |0                  |                  |0       |
+ROW   |22848 |0   |                 |                                                         |10074 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' processes that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |30      |0                  |0                  |                  |0       |
 ROW   |22851 |0   |                 |                                                         |10074 |CPU $2 time                                                      |system.cpu.util[,system]                                                       |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running the kernel and its processes.                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |22852 |0   |                 |                                                         |10074 |CPU $2 time                                                      |system.cpu.util[,user]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' processes that are not niced.                                                                                                                                                                                                                                                                                                                                                                   |0             |30      |0                  |0                  |                  |0       |
 ROW   |22853 |0   |                 |                                                         |10074 |Host name                                                        |system.hostname                                                                |3600 |7      |365   |0     |1         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |System host name.                                                                                                                                                                                                                                                                                                                                                                                                                         |3             |30      |0                  |0                  |                  |0       |
@@ -503,7 +503,7 @@ ROW   |22883 |0   |                 |
 ROW   |22884 |0   |                 |                                                         |10075 |Context switches per second                                      |system.cpu.switches                                                            |60   |7      |365   |0     |3         |             |sps     |0         |1    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |22885 |0   |                 |                                                         |10075 |CPU $2 time                                                      |system.cpu.util[,idle]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent doing nothing.                                                                                                                                                                                                                                                                                                                                                                                                 |0             |30      |0                  |0                  |                  |0       |
 ROW   |22886 |0   |                 |                                                         |10075 |CPU $2 time                                                      |system.cpu.util[,interrupt]                                                    |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The amount of time the CPU has been servicing hardware interrupts.                                                                                                                                                                                                                                                                                                                                                                        |0             |30      |0                  |0                  |                  |0       |
-ROW   |22888 |0   |                 |                                                         |10075 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' proccess that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |30      |0                  |0                  |                  |0       |
+ROW   |22888 |0   |                 |                                                         |10075 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' processes that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |30      |0                  |0                  |                  |0       |
 ROW   |22891 |0   |                 |                                                         |10075 |CPU $2 time                                                      |system.cpu.util[,system]                                                       |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running the kernel and its processes.                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |22892 |0   |                 |                                                         |10075 |CPU $2 time                                                      |system.cpu.util[,user]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' processes that are not niced.                                                                                                                                                                                                                                                                                                                                                                   |0             |30      |0                  |0                  |                  |0       |
 ROW   |22893 |0   |                 |                                                         |10075 |Host name                                                        |system.hostname                                                                |3600 |7      |365   |0     |1         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |System host name.                                                                                                                                                                                                                                                                                                                                                                                                                         |3             |30      |0                  |0                  |                  |0       |
@@ -551,7 +551,7 @@ ROW   |22961 |0   |                 |
 ROW   |22962 |0   |                 |                                                         |10077 |Processor load (1 min average per core)                          |system.cpu.load[percpu,avg1]                                                   |60   |7      |365   |0     |0         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The processor load is calculated as system CPU load divided by number of CPU cores.                                                                                                                                                                                                                                                                                                                                                       |0             |30      |0                  |0                  |                  |0       |
 ROW   |22963 |0   |                 |                                                         |10077 |Processor load (5 min average per core)                          |system.cpu.load[percpu,avg5]                                                   |60   |7      |365   |0     |0         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The processor load is calculated as system CPU load divided by number of CPU cores.                                                                                                                                                                                                                                                                                                                                                       |0             |30      |0                  |0                  |                  |0       |
 ROW   |22965 |0   |                 |                                                         |10077 |CPU $2 time                                                      |system.cpu.util[,idle]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent doing nothing.                                                                                                                                                                                                                                                                                                                                                                                                 |0             |30      |0                  |0                  |                  |0       |
-ROW   |22968 |0   |                 |                                                         |10077 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' proccess that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |30      |0                  |0                  |                  |0       |
+ROW   |22968 |0   |                 |                                                         |10077 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' processes that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |30      |0                  |0                  |                  |0       |
 ROW   |22971 |0   |                 |                                                         |10077 |CPU $2 time                                                      |system.cpu.util[,system]                                                       |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running the kernel and its processes.                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |22972 |0   |                 |                                                         |10077 |CPU $2 time                                                      |system.cpu.util[,user]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |The time the CPU has spent running users' processes that are not niced.                                                                                                                                                                                                                                                                                                                                                                   |0             |30      |0                  |0                  |                  |0       |
 ROW   |22973 |0   |                 |                                                         |10077 |Host name                                                        |system.hostname                                                                |3600 |7      |365   |0     |1         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |System host name.                                                                                                                                                                                                                                                                                                                                                                                                                         |3             |30      |0                  |0                  |                  |0       |
@@ -716,7 +716,7 @@ ROW   |23207 |16  |                 |
 ROW   |23208 |16  |                 |                                                         |10082 |mp PS Perm Gen used                                              |jmx["java.lang:type=MemoryPool,name=PS Perm Gen",Usage.used]                   |60   |7      |365   |0     |3         |             |B       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23209 |16  |                 |                                                         |10082 |mp Tenured Gen committed                                         |jmx["java.lang:type=MemoryPool,name=Tenured Gen",Usage.committed]              |60   |7      |365   |0     |3         |             |B       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23210 |16  |                 |                                                         |10082 |mp Tenured Gen max                                               |jmx["java.lang:type=MemoryPool,name=Tenured Gen",Usage.max]                    |3600 |7      |365   |0     |3         |             |B       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23211 |16  |                 |                                                         |10082 |mpTenured Gen used                                               |jmx["java.lang:type=MemoryPool,name=Tenured Gen",Usage.used]                   |60   |7      |365   |0     |3         |             |B       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23211 |16  |                 |                                                         |10082 |mp Tenured Gen used                                              |jmx["java.lang:type=MemoryPool,name=Tenured Gen",Usage.used]                   |60   |7      |365   |0     |3         |             |B       |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23212 |16  |                 |                                                         |10082 |comp Name of the current JIT compiler                            |jmx["java.lang:type=Compilation",Name]                                         |3600 |7      |365   |0     |1         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23213 |16  |                 |                                                         |10082 |os Max File Descriptor Count                                     |jmx["java.lang:type=OperatingSystem",MaxFileDescriptorCount]                   |3600 |7      |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23214 |16  |                 |                                                         |10082 |os Open File Descriptor Count                                    |jmx["java.lang:type=OperatingSystem",OpenFileDescriptorCount]                  |60   |7      |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
@@ -753,7 +753,7 @@ ROW   |23244 |16  |                 |
 ROW   |23245 |16  |                 |                                                         |10083 |Maximum number of active sessions so far                         |jmx["Catalina:type=Manager,path=/,host=localhost",maxActive]                   |60   |7      |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23246 |16  |                 |                                                         |10083 |Number of active sessions at this moment                         |jmx["Catalina:type=Manager,path=/,host=localhost",activeSessions]              |60   |7      |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23247 |16  |                 |                                                         |10083 |Number of sessions created by this manager per second            |jmx["Catalina:type=Manager,path=/,host=localhost",sessionCounter]              |60   |7      |365   |0     |0         |             |        |0         |1    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23248 |16  |                 |                                                         |10083 |Number of sessions we rejected due to maxActive beeing reached   |jmx["Catalina:type=Manager,path=/,host=localhost",rejectedSessions]            |60   |7      |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23248 |16  |                 |                                                         |10083 |Number of sessions we rejected due to maxActive being reached   |jmx["Catalina:type=Manager,path=/,host=localhost",rejectedSessions]            |60   |7      |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23249 |16  |                 |                                                         |10083 |The maximum number of active Sessions allowed, or -1 for no limit|jmx["Catalina:type=Manager,path=/,host=localhost",maxActiveSessions]           |3600 |7      |365   |0     |0         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23250 |16  |                 |                                                         |10083 |Tomcat version                                                   |jmx["Catalina:type=Server",serverInfo]                                         |3600 |7      |365   |0     |1         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23251 |5   |                 |                                                         |10047 |Zabbix queue                                                     |zabbix[queue]                                                                  |600  |7      |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
@@ -827,14 +827,14 @@ ROW   |23597 |3   |                 |
 ROW   |23598 |3   |                 |                                                         |10091 |Cluster name                                                     |vmware.hv.cluster.name[{$URL},{HOST.HOST}]                                     |3600 |90     |365   |0     |1         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |0    |NULL       |    |Cluster name of the guest VM.                                                                                                                                                                                                                                                                                                                                                                                                             |0             |30      |0                  |0                  |                  |0       |
 ROW   |23599 |3   |                 |                                                         |10089 |Disk device discovery                                            |vmware.vm.vfs.dev.discovery[{$URL},{HOST.HOST}]                                |3600 |90     |365   |0     |4         |             |        |0         |0    |                   |0                   |                     |                     |       |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |1    |NULL       |    |Discovery of all disk devices.                                                                                                                                                                                                                                                                                                                                                                                                            |0             |30      |0                  |0                  |                  |0       |
 ROW   |23600 |3   |                 |                                                         |10089 |Network device discovery                                         |vmware.vm.net.if.discovery[{$URL},{HOST.HOST}]                                 |3600 |90     |365   |0     |4         |             |        |0         |0    |                   |0                   |                     |                     |       |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |1    |NULL       |    |Discovery of all network devices.                                                                                                                                                                                                                                                                                                                                                                                                         |0             |30      |0                  |0                  |                  |0       |
-ROW   |23601 |3   |                 |                                                         |10089 |Average number of kilobytes read from the disk $3                |vmware.vm.vfs.dev.read[{$URL},{HOST.HOST},{#DISKNAME},bps]                     |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23602 |3   |                 |                                                         |10089 |Average number of kilobytes written to the disk $3               |vmware.vm.vfs.dev.write[{$URL},{HOST.HOST},{#DISKNAME},bps]                    |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23603 |3   |                 |                                                         |10089 |Average number of reads from the disk $3                         |vmware.vm.vfs.dev.read[{$URL},{HOST.HOST},{#DISKNAME},ops]                     |60   |90     |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23604 |3   |                 |                                                         |10089 |Average number of writes to the disk $3                          |vmware.vm.vfs.dev.write[{$URL},{HOST.HOST},{#DISKNAME},ops]                    |60   |90     |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23605 |3   |                 |                                                         |10089 |Number of packets received on interface $3                       |vmware.vm.net.if.in[{$URL},{HOST.HOST},{#IFNAME},pps]                          |60   |90     |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23606 |3   |                 |                                                         |10089 |Number of packets transmitted on interface $3                    |vmware.vm.net.if.out[{$URL},{HOST.HOST},{#IFNAME},pps]                         |60   |90     |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23607 |3   |                 |                                                         |10089 |Number of bytes received on interface $3                         |vmware.vm.net.if.in[{$URL},{HOST.HOST},{#IFNAME},bps]                          |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
-ROW   |23608 |3   |                 |                                                         |10089 |Number of bytes transmitted on interface $3                      |vmware.vm.net.if.out[{$URL},{HOST.HOST},{#IFNAME},bps]                         |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23601 |3   |                 |                                                         |10089 |Average number of kilobytes read from the disk {#DISKDESC}       |vmware.vm.vfs.dev.read[{$URL},{HOST.HOST},{#DISKNAME},bps]                     |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23602 |3   |                 |                                                         |10089 |Average number of kilobytes written to the disk {#DISKDESC}      |vmware.vm.vfs.dev.write[{$URL},{HOST.HOST},{#DISKNAME},bps]                    |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23603 |3   |                 |                                                         |10089 |Average number of reads from the disk {#DISKDESC}                |vmware.vm.vfs.dev.read[{$URL},{HOST.HOST},{#DISKNAME},ops]                     |60   |90     |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23604 |3   |                 |                                                         |10089 |Average number of writes to the disk {#DISKDESC}                 |vmware.vm.vfs.dev.write[{$URL},{HOST.HOST},{#DISKNAME},ops]                    |60   |90     |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23605 |3   |                 |                                                         |10089 |Number of packets received on interface {#IFDESC}                |vmware.vm.net.if.in[{$URL},{HOST.HOST},{#IFNAME},pps]                          |60   |90     |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23606 |3   |                 |                                                         |10089 |Number of packets transmitted on interface {#IFDESC}             |vmware.vm.net.if.out[{$URL},{HOST.HOST},{#IFNAME},pps]                         |60   |90     |365   |0     |3         |             |        |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23607 |3   |                 |                                                         |10089 |Number of bytes received on interface {#IFDESC}                  |vmware.vm.net.if.in[{$URL},{HOST.HOST},{#IFNAME},bps]                          |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
+ROW   |23608 |3   |                 |                                                         |10089 |Number of bytes transmitted on interface {#IFDESC}               |vmware.vm.net.if.out[{$URL},{HOST.HOST},{#IFNAME},bps]                         |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |2    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23629 |3   |                 |                                                         |10091 |Number of bytes received                                         |vmware.hv.network.in[{$URL},{HOST.HOST},bps]                                   |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23630 |3   |                 |                                                         |10091 |Number of bytes transmitted                                      |vmware.hv.network.out[{$URL},{HOST.HOST},bps]                                  |60   |90     |365   |0     |3         |             |Bps     |0         |0    |                   |0                   |                     |                     |1      |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |0    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
 ROW   |23631 |3   |                 |                                                         |10091 |Datastore discovery                                              |vmware.hv.datastore.discovery[{$URL},{HOST.HOST}]                              |3600 |90     |365   |0     |4         |             |        |0         |0    |                   |0                   |                     |                     |       |          |NULL      |NULL      |          |                                                                                    |                |0        |0       |{$USERNAME}|{$PASSWORD}|         |          |1    |NULL       |    |                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30      |0                  |0                  |                  |0       |
@@ -993,7 +993,7 @@ ROW   |23298 |0   |                 |
 ROW   |23299 |0   |                 |                                                         |10084 |CPU $2 time                                                      |system.cpu.util[,idle]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |17354     |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |1          |    |The time the CPU has spent doing nothing.                                                                                                                                                                                                                                                                                                                                                                                                 |0             |0       |0                  |0                  |                  |0       |
 ROW   |23300 |0   |                 |                                                         |10084 |CPU $2 time                                                      |system.cpu.util[,interrupt]                                                    |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |22671     |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |1          |    |The amount of time the CPU has been servicing hardware interrupts.                                                                                                                                                                                                                                                                                                                                                                        |0             |0       |0                  |0                  |                  |0       |
 ROW   |23301 |0   |                 |                                                         |10084 |CPU $2 time                                                      |system.cpu.util[,iowait]                                                       |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |17362     |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |1          |    |Amount of time the CPU has been waiting for I/O to complete.                                                                                                                                                                                                                                                                                                                                                                              |0             |0       |0                  |0                  |                  |0       |
-ROW   |23302 |0   |                 |                                                         |10084 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |17358     |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |1          |    |The time the CPU has spent running users' proccess that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |0       |0                  |0                  |                  |0       |
+ROW   |23302 |0   |                 |                                                         |10084 |CPU $2 time                                                      |system.cpu.util[,nice]                                                         |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |17358     |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |1          |    |The time the CPU has spent running users' processes that have been niced.                                                                                                                                                                                                                                                                                                                                                                  |0             |0       |0                  |0                  |                  |0       |
 ROW   |23303 |0   |                 |                                                         |10084 |CPU $2 time                                                      |system.cpu.util[,softirq]                                                      |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |22668     |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |1          |    |The amount of time the CPU has been servicing software interrupts.                                                                                                                                                                                                                                                                                                                                                                        |0             |0       |0                  |0                  |                  |0       |
 ROW   |23304 |0   |                 |                                                         |10084 |CPU $2 time                                                      |system.cpu.util[,steal]                                                        |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |22665     |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |1          |    |The amount of CPU 'stolen' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).                                                                                                                                                                                                                                                                                                         |0             |0       |0                  |0                  |                  |0       |
 ROW   |23305 |0   |                 |                                                         |10084 |CPU $2 time                                                      |system.cpu.util[,system]                                                       |60   |7      |365   |0     |0         |             |%       |0         |0    |                   |0                   |                     |                     |1      |          |17360     |NULL      |          |                                                                                    |                |0        |0       |           |           |         |          |0    |1          |    |The time the CPU has spent running the kernel and its processes.                                                                                                                                                                                                                                                                                                                                                                          |0             |0       |0                  |0                  |                  |0       |
@@ -1109,295 +1109,295 @@ FIELDS|configid|refresh_unsupported|work_period     |alert_usrgrpid|discovery_gr
 ROW   |1       |600                |1-5,09:00-18:00;|7             |5                |
 
 TABLE |triggers
-FIELDS|triggerid|expression                                                        |description                                                         |url|status|priority|comments                                                                                                                              |templateid|type|flags|
-ROW   |10010    |{13078}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10011    |{13084}>30                                                        |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10012    |{12580}<50                                                        |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |NULL      |0   |0    |
-ROW   |10016    |{10199}>0                                                         |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10021    |{12583}<0                                                         |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10041    |{10204}<256                                                       |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10042    |{12553}<1024                                                      |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10043    |{10208}>0                                                         |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10044    |{10207}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10190    |{13082}>300                                                       |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13000    |{12144}<20M                                                       |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13015    |{12641}<25                                                        |Less than 25% free in the configuration cache                       |   |0     |3       |Consider increasing CacheSize in the zabbix_server.conf configuration file                                                            |NULL      |0   |0    |
-ROW   |13017    |{12651}<25                                                        |Less than 25% free in the text history cache                        |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13019    |{12649}<25                                                        |Less than 25% free in the trends cache                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13023    |{12653}>100                                                       |More than 100 items having missing data for more than 10 minutes    |   |0     |2       |zabbix[queue,10m] item is collecting data about how many items are missing data for more than 10 minutes (next parameter)             |NULL      |0   |0    |
-ROW   |13025    |{12549}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13026    |{12926}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13073    |{12645}<25                                                        |Less than 25% free in the history cache                             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13074    |{12646}<5                                                         |Less than 5% free in the value cache                                |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13080    |({TRIGGER.VALUE}=0&{13099}>75)&pipe;({TRIGGER.VALUE}=1&{13099}>65)|Zabbix alerter processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13081    |({TRIGGER.VALUE}=0&{13101}>75)&pipe;({TRIGGER.VALUE}=1&{13101}>65)|Zabbix configuration syncer processes more than 75% busy            |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13082    |({TRIGGER.VALUE}=0&{13103}>75)&pipe;({TRIGGER.VALUE}=1&{13103}>65)|Zabbix db watchdog processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13083    |({TRIGGER.VALUE}=0&{13105}>75)&pipe;({TRIGGER.VALUE}=1&{13105}>65)|Zabbix discoverer processes more than 75% busy                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13084    |({TRIGGER.VALUE}=0&{13107}>75)&pipe;({TRIGGER.VALUE}=1&{13107}>65)|Zabbix escalator processes more than 75% busy                       |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13085    |({TRIGGER.VALUE}=0&{13109}>75)&pipe;({TRIGGER.VALUE}=1&{13109}>65)|Zabbix history syncer processes more than 75% busy                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13086    |({TRIGGER.VALUE}=0&{13111}>75)&pipe;({TRIGGER.VALUE}=1&{13111}>65)|Zabbix housekeeper processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13087    |({TRIGGER.VALUE}=0&{13113}>75)&pipe;({TRIGGER.VALUE}=1&{13113}>65)|Zabbix http poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13088    |({TRIGGER.VALUE}=0&{13115}>75)&pipe;({TRIGGER.VALUE}=1&{13115}>65)|Zabbix icmp pinger processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13089    |({TRIGGER.VALUE}=0&{13117}>75)&pipe;({TRIGGER.VALUE}=1&{13117}>65)|Zabbix ipmi poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13091    |({TRIGGER.VALUE}=0&{13123}>75)&pipe;({TRIGGER.VALUE}=1&{13123}>65)|Zabbix poller processes more than 75% busy                          |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13092    |({TRIGGER.VALUE}=0&{13125}>75)&pipe;({TRIGGER.VALUE}=1&{13125}>65)|Zabbix proxy poller processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13093    |({TRIGGER.VALUE}=0&{13029}>75)&pipe;({TRIGGER.VALUE}=1&{13029}>65)|Zabbix self-monitoring processes more than 75% busy                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13094    |({TRIGGER.VALUE}=0&{13129}>75)&pipe;({TRIGGER.VALUE}=1&{13129}>65)|Zabbix timer processes more than 75% busy                           |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13095    |({TRIGGER.VALUE}=0&{13131}>75)&pipe;({TRIGGER.VALUE}=1&{13131}>65)|Zabbix trapper processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13096    |({TRIGGER.VALUE}=0&{13133}>75)&pipe;({TRIGGER.VALUE}=1&{13133}>65)|Zabbix unreachable poller processes more than 75% busy              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13097    |({TRIGGER.VALUE}=0&{13135}>75)&pipe;({TRIGGER.VALUE}=1&{13135}>65)|Zabbix vmware collector processes more than 75% busy                |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13243    |{13080}>20                                                        |Disk I/O is overloaded on {HOST.NAME}                               |   |0     |2       |OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.|NULL      |0   |0    |
-ROW   |13266    |{12592}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13272    |{12598}<20                                                        |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13275    |({TRIGGER.VALUE}=0&{13119}>75)&pipe;({TRIGGER.VALUE}=1&{13119}>65)|Zabbix java poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13285    |{13159}=0                                                         |Telnet service is down on {HOST.NAME}                               |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13287    |{12671}=1                                                         |Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}|   |0     |1       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13291    |{12675} / {12676} > 0.8                                           |Free disk space is less than 20% on volume {#SNMPVALUE}             |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13295    |{12682}<5 &pipe; {12682}>90                                       |Baseboard Temp Critical [{ITEM.VALUE}]                              |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13296    |{12683}<10 &pipe; {12683}>83                                      |Baseboard Temp Non-Critical [{ITEM.VALUE}]                          |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13297    |{12684}<0.953 &pipe; {12684}>1.149                                |BB +1.05V PCH Critical [{ITEM.VALUE}]                               |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13298    |{12685}<0.985 &pipe; {12685}>1.117                                |BB +1.05V PCH Non-Critical [{ITEM.VALUE}]                           |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13299    |{12686}<0.683 &pipe; {12686}>1.543                                |BB +1.1V P1 Vccp Critical [{ITEM.VALUE}]                            |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13300    |{12687}<0.708 &pipe; {12687}>1.501                                |BB +1.1V P1 Vccp Non-Critical [{ITEM.VALUE}]                        |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13301    |{12688}<1.362 &pipe; {12688}>1.635                                |BB +1.5V P1 DDR3 Critical [{ITEM.VALUE}]                            |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13302    |{12689}<1.401 &pipe; {12689}>1.589                                |BB +1.5V P1 DDR3 Non-Critical [{ITEM.VALUE}]                        |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13303    |{12690}<1.597 &pipe; {12690}>2.019                                |BB +1.8V SM Critical [{ITEM.VALUE}]                                 |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13304    |{12691}<1.646 &pipe; {12691}>1.960                                |BB +1.8V SM Non-Critical [{ITEM.VALUE}]                             |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13305    |{12692}<2.876 &pipe; {12692}>3.729                                |BB +3.3V Critical [{ITEM.VALUE}]                                    |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13306    |{12693}<2.982 &pipe; {12693}>3.625                                |BB +3.3V Critical [{ITEM.VALUE}]                                    |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13307    |{12694}<2.970 &pipe; {12694}>3.618                                |BB +3.3V Non-Critical [{ITEM.VALUE}]                                |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13308    |{12695}<3.067 &pipe; {12695}>3.525                                |BB +3.3V Non-Critical [{ITEM.VALUE}]                                |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13309    |{12696}<2.876 &pipe; {12696}>3.729                                |BB +3.3V STBY Critical [{ITEM.VALUE}]                               |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13310    |{12697}<2.982 &pipe; {12697}>3.625                                |BB +3.3V STBY Critical [{ITEM.VALUE}]                               |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13311    |{12698}<2.970 &pipe; {12698}>3.618                                |BB +3.3V STBY Non-Critical [{ITEM.VALUE}]                           |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13312    |{12699}<3.067 &pipe; {12699}>3.525                                |BB +3.3V STBY Non-Critical [{ITEM.VALUE}]                           |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13313    |{12700}<4.471 &pipe; {12700}>5.538                                |BB +5.0V Critical [{ITEM.VALUE}]                                    |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13314    |{12701}<4.362 &pipe; {12701}>5.663                                |BB +5.0V Critical [{ITEM.VALUE}]                                    |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13315    |{12702}<4.630 &pipe; {12702}>5.380                                |BB +5.0V Non-Critical [{ITEM.VALUE}]                                |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13316    |{12703}<4.483 &pipe; {12703}>5.495                                |BB +5.0V Non-Critical [{ITEM.VALUE}]                                |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13317    |{12704}<5 &pipe; {12704}>66                                       |BB Ambient Temp Critical [{ITEM.VALUE}]                             |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13318    |{12705}<10 &pipe; {12705}>61                                      |BB Ambient Temp Non-Critical [{ITEM.VALUE}]                         |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13319    |{12706}<0 &pipe; {12706}>48                                       |Front Panel Temp Critical [{ITEM.VALUE}]                            |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13320    |{12707}<5 &pipe; {12707}>44                                       |Front Panel Temp Non-Critical [{ITEM.VALUE}]                        |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13321    |{12708}=0                                                         |Power                                                               |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13322    |{12709}=0                                                         |Power                                                               |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13323    |{12710}<324                                                       |System Fan 2 Critical [{ITEM.VALUE}]                                |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13324    |{12711}<378                                                       |System Fan 2 Non-Critical [{ITEM.VALUE}]                            |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13325    |{12712}<324                                                       |System Fan 3 Critical [{ITEM.VALUE}]                                |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13326    |{12713}<378                                                       |System Fan 3 Non-Critical [{ITEM.VALUE}]                            |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13327    |{13155}=0                                                         |MySQL is down                                                       |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13330    |{12717}<1024                                                      |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13331    |{12718}<256                                                       |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13332    |{13089}>30                                                        |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13333    |{13088}>300                                                       |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13334    |{13087}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13336    |{12723}>0                                                         |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13337    |{12724}<50                                                        |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |NULL      |0   |0    |
-ROW   |13338    |{12725}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13339    |{12726}<0                                                         |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13340    |{12727}>0                                                         |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13341    |{12728}<20M                                                       |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13342    |{12729}<20                                                        |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13343    |{12730}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13346    |{12733}<1024                                                      |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13347    |{12734}<256                                                       |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13348    |{13074}>30                                                        |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13349    |{13073}>300                                                       |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13350    |{13072}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13352    |{12739}>0                                                         |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13353    |{12740}<50                                                        |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |NULL      |0   |0    |
-ROW   |13354    |{12741}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13355    |{12742}<0                                                         |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13356    |{12743}>0                                                         |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13357    |{12744}<20M                                                       |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13358    |{12745}<20                                                        |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13359    |{12746}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13364    |{13071}>30                                                        |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13365    |{13070}>300                                                       |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13366    |{13069}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13367    |{13068}>20                                                        |Disk I/O is overloaded on {HOST.NAME}                               |   |0     |2       |OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.|NULL      |0   |0    |
-ROW   |13368    |{12755}>0                                                         |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13370    |{12757}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13371    |{12758}<0                                                         |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13372    |{12759}>0                                                         |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13373    |{12760}<20M                                                       |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13374    |{12761}<20                                                        |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13375    |{12762}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13382    |{13075}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13384    |{12771}>0                                                         |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13386    |{12773}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13388    |{12775}>0                                                         |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13389    |{12776}<20M                                                       |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13390    |{12777}<20                                                        |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13391    |{12778}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13395    |{12782}<256                                                       |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13396    |{13093}>30                                                        |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13397    |{13092}>300                                                       |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13398    |{13091}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13399    |{13090}>20                                                        |Disk I/O is overloaded on {HOST.NAME}                               |   |0     |2       |OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.|NULL      |0   |0    |
-ROW   |13400    |{12787}>0                                                         |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13401    |{12788}<50                                                        |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |NULL      |0   |0    |
-ROW   |13402    |{12789}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13403    |{12790}<0                                                         |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13404    |{12791}>0                                                         |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13405    |{12792}<20M                                                       |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13406    |{12793}<20                                                        |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13407    |{12794}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13410    |{12797}<1024                                                      |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13411    |{12798}<256                                                       |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13414    |{13086}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13416    |{12803}>0                                                         |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13418    |{12805}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13419    |{12806}<0                                                         |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13420    |{12807}>0                                                         |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13421    |{12808}<20M                                                       |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13422    |{12809}<20                                                        |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13423    |{12810}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13425    |{12812}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13428    |{12815}<0                                                         |{HOST.NAME} has just been restarted                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13430    |{13095}>300                                                       |Too many processes on {HOST.NAME}                                   |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13431    |{12818}<100000                                                    |Lack of free swap space on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13433    |{12820}<10000                                                     |Lack of free memory on server {HOST.NAME}                           |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13435    |{13094}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13439    |{12826}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
-ROW   |13441    |({TRIGGER.VALUE}=0&{13127}>75)&pipe;({TRIGGER.VALUE}=1&{13127}>65)|Zabbix snmp trapper processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13442    |{12830} > ({12831} * 0.7)                                         |70% http-8080 worker threads busy on {HOST.NAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13443    |{12832} > ({12833} * 0.7)                                         |70% http-8443 worker threads busy on {HOST.NAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13444    |{12834} > ({12835}  *0.7)                                         |70% jk-8009 worker threads busy on {HOST.NAME}                      |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13445    |{12836}>({12837}*0.7)                                             |70% mp CMS Old Gen used on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13446    |{12838}>({12839}*0.7)                                             |70% mp CMS Perm Gen used on {HOST.NAME}                             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13447    |{12840}>({12841}*0.7)                                             |70% mp Code Cache used on {HOST.NAME}                               |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13448    |{12842}>({12843}*0.7)                                             |70% mp Perm Gen used on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13449    |{12844}>({12845}*0.7)                                             |70% mp PS Old Gen used on {HOST.NAME}                               |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13450    |{12846}>({12847}*0.7)                                             |70% mp PS Perm Gen used on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13451    |{12848}>({12849}*0.7)                                             |70% mp Tenured Gen used on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13452    |{12850}>({12851}*0.7)                                             |70% os Opened File Descriptor Count used on {HOST.NAME}             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13453    |{12852}<{12853}                                                   |gc Concurrent Mark Sweep in fire fighting mode on {HOST.NAME}       |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13454    |{12854}<{12855}                                                   |gc Mark Sweep Compact in fire fighting mode on {HOST.NAME}          |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13455    |{12856}<{12857}                                                   |gc PS Mark Sweep in fire fighting mode on {HOST.NAME}               |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13456    |{12858} = 1                                                       |gzip compression is off for connector http-8080 on {HOST.NAME}      |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13457    |{12859} = 1                                                       |gzip compression is off for connector http-8443 on {HOST.NAME}      |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13458    |{12860}={12861}                                                   |mp CMS Old Gen fully committed on {HOST.NAME}                       |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13459    |{12862}={12863}                                                   |mp CMS Perm Gen fully committed on {HOST.NAME}                      |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13460    |{12864}={12865}                                                   |mp Code Cache fully committed on {HOST.NAME}                        |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13461    |{12866}={12867}                                                   |mp Perm Gen fully committed on {HOST.NAME}                          |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13462    |{12868}={12869}                                                   |mp PS Old Gen fully committed on {HOST.NAME}                        |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13463    |{12870}={12871}                                                   |mp PS Perm Gen fully committed on {HOST.NAME}                       |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13464    |{12872}={12873}                                                   |mp Tenured Gen fully committed on {HOST.NAME}                       |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13465    |{12874}=1                                                         |{HOST.NAME} is not reachable                                        |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13466    |{12967}=1                                                         |{HOST.NAME} uses suboptimal JIT compiler                            |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13507    |{12936}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13517    |{12946}<25                                                        |Less than 25% free in the configuration cache                       |   |0     |3       |Consider increasing CacheSize in the zabbix_server.conf configuration file                                                            |NULL      |0   |0    |
-ROW   |13518    |{12947}<25                                                        |Less than 25% free in the history cache                             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13519    |{12948}<25                                                        |Less than 25% free in the text history cache                        |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13520    |{12949}>100                                                       |More than 100 items having missing data for more than 10 minutes    |   |0     |2       |zabbix[queue,10m] item is collecting data about how many items are missing data for more than 10 minutes (next parameter)             |NULL      |0   |0    |
-ROW   |13521    |({TRIGGER.VALUE}=0&{13137}>75)&pipe;({TRIGGER.VALUE}=1&{13137}>65)|Zabbix configuration syncer processes more than 75% busy            |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13522    |({TRIGGER.VALUE}=0&{13139}>75)&pipe;({TRIGGER.VALUE}=1&{13139}>65)|Zabbix discoverer processes more than 75% busy                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13523    |({TRIGGER.VALUE}=0&{13141}>75)&pipe;({TRIGGER.VALUE}=1&{13141}>65)|Zabbix history syncer processes more than 75% busy                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13524    |({TRIGGER.VALUE}=0&{13142}>75)&pipe;({TRIGGER.VALUE}=1&{13142}>65)|Zabbix housekeeper processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13525    |({TRIGGER.VALUE}=0&{13143}>75)&pipe;({TRIGGER.VALUE}=1&{13143}>65)|Zabbix http poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13526    |({TRIGGER.VALUE}=0&{13144}>75)&pipe;({TRIGGER.VALUE}=1&{13144}>65)|Zabbix icmp pinger processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13527    |({TRIGGER.VALUE}=0&{13145}>75)&pipe;({TRIGGER.VALUE}=1&{13145}>65)|Zabbix ipmi poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13528    |({TRIGGER.VALUE}=0&{13146}>75)&pipe;({TRIGGER.VALUE}=1&{13146}>65)|Zabbix java poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13529    |({TRIGGER.VALUE}=0&{13147}>75)&pipe;({TRIGGER.VALUE}=1&{13147}>65)|Zabbix poller processes more than 75% busy                          |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13530    |({TRIGGER.VALUE}=0&{13148}>75)&pipe;({TRIGGER.VALUE}=1&{13148}>65)|Zabbix self-monitoring processes more than 75% busy                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13531    |({TRIGGER.VALUE}=0&{13149}>75)&pipe;({TRIGGER.VALUE}=1&{13149}>65)|Zabbix snmp trapper processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13532    |({TRIGGER.VALUE}=0&{13150}>75)&pipe;({TRIGGER.VALUE}=1&{13150}>65)|Zabbix trapper processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13533    |({TRIGGER.VALUE}=0&{13151}>75)&pipe;({TRIGGER.VALUE}=1&{13151}>65)|Zabbix unreachable poller processes more than 75% busy              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13534    |({TRIGGER.VALUE}=0&{13138}>75)&pipe;({TRIGGER.VALUE}=1&{13138}>65)|Zabbix data sender processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13535    |({TRIGGER.VALUE}=0&{13140}>75)&pipe;({TRIGGER.VALUE}=1&{13140}>65)|Zabbix heartbeat sender processes more than 75% busy                |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13536    |{12965}<25                                                        |Less than 25% free in the vmware cache                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13538    |{12968}>0.7                                                       |70% os Process CPU Load on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13539    |{12969}>({12970}*0.7)                                             |70% mem Heap Memory used on {HOST.NAME}                             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13540    |{12971}>({12972}*0.7)                                             |70% mem Non-Heap Memory used on {HOST.NAME}                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13541    |{12973}={12974}                                                   |mem Heap Memory fully committed on {HOST.NAME}                      |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13542    |{12975}={12976}                                                   |mem Non-Heap Memory fully committed on {HOST.NAME}                  |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13543    |{12977}#1                                                         |{HOST.NAME} runs suboptimal VM type                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13544    |{12994}=0                                                         |FTP service is down on {HOST.NAME}                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13545    |{12995}=0                                                         |HTTP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13546    |{12996}=0                                                         |HTTPS service is down on {HOST.NAME}                                |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13547    |{12997}=0                                                         |IMAP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13548    |{12998}=0                                                         |LDAP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13549    |{13154}=0                                                         |NNTP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13550    |{13156}=0                                                         |NTP service is down on {HOST.NAME}                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13551    |{13152}=0                                                         |POP service is down on {HOST.NAME}                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13552    |{13157}=0                                                         |SMTP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13553    |{13158}=0                                                         |SSH service is down on {HOST.NAME}                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13554    |{13096}=0                                                         |{HOST.NAME} is unavailable by ICMP                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13555    |{13097}>0.15                                                      |Response time is too high on {HOST.NAME}                            |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |13556    |{13098}>20                                                        |Ping loss is too high on {HOST.NAME}                                |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
-ROW   |10045    |{12927}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
-ROW   |10047    |{12550}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
-ROW   |13075    |{12648}<5                                                         |Less than 5% free in the value cache                                |   |0     |3       |                                                                                                                                      |13074     |0   |0    |
-ROW   |13288    |{12672}=1                                                         |Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}|   |0     |1       |                                                                                                                                      |13287     |0   |2    |
-ROW   |13289    |{12673}=1                                                         |Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}|   |0     |1       |                                                                                                                                      |13287     |0   |2    |
-ROW   |13292    |{12677} / {12678} > 0.8                                           |Free disk space is less than 20% on volume {#SNMPVALUE}             |   |0     |2       |                                                                                                                                      |13291     |0   |2    |
-ROW   |13293    |{12679} / {12680} > 0.8                                           |Free disk space is less than 20% on volume {#SNMPVALUE}             |   |0     |2       |                                                                                                                                      |13291     |0   |2    |
-ROW   |13294    |{12681}=1                                                         |Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}|   |0     |1       |                                                                                                                                      |13287     |0   |2    |
-ROW   |13328    |{12715}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
-ROW   |13329    |{12929}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
-ROW   |13344    |{12731}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
-ROW   |13345    |{12930}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
-ROW   |13360    |{12747}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
-ROW   |13361    |{12931}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
-ROW   |13376    |{12763}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
-ROW   |13377    |{12932}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
-ROW   |13392    |{12779}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
-ROW   |13393    |{12933}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
-ROW   |13408    |{12795}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
-ROW   |13409    |{12934}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
-ROW   |13436    |({TRIGGER.VALUE}=0&{13136}>75)&pipe;({TRIGGER.VALUE}=1&{13136}>65)|Zabbix vmware collector processes more than 75% busy                |   |0     |3       |                                                                                                                                      |13097     |0   |0    |
-ROW   |13437    |{12824}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
-ROW   |13438    |{12935}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
-ROW   |13467    |({TRIGGER.VALUE}=0&{13100}>75)&pipe;({TRIGGER.VALUE}=1&{13100}>65)|Zabbix alerter processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |13080     |0   |0    |
-ROW   |13468    |({TRIGGER.VALUE}=0&{13102}>75)&pipe;({TRIGGER.VALUE}=1&{13102}>65)|Zabbix configuration syncer processes more than 75% busy            |   |0     |3       |                                                                                                                                      |13081     |0   |0    |
-ROW   |13469    |({TRIGGER.VALUE}=0&{13104}>75)&pipe;({TRIGGER.VALUE}=1&{13104}>65)|Zabbix db watchdog processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13082     |0   |0    |
-ROW   |13470    |({TRIGGER.VALUE}=0&{13106}>75)&pipe;({TRIGGER.VALUE}=1&{13106}>65)|Zabbix discoverer processes more than 75% busy                      |   |0     |3       |                                                                                                                                      |13083     |0   |0    |
-ROW   |13471    |({TRIGGER.VALUE}=0&{13108}>75)&pipe;({TRIGGER.VALUE}=1&{13108}>65)|Zabbix escalator processes more than 75% busy                       |   |0     |3       |                                                                                                                                      |13084     |0   |0    |
-ROW   |13472    |({TRIGGER.VALUE}=0&{13110}>75)&pipe;({TRIGGER.VALUE}=1&{13110}>65)|Zabbix history syncer processes more than 75% busy                  |   |0     |3       |                                                                                                                                      |13085     |0   |0    |
-ROW   |13473    |({TRIGGER.VALUE}=0&{13112}>75)&pipe;({TRIGGER.VALUE}=1&{13112}>65)|Zabbix housekeeper processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13086     |0   |0    |
-ROW   |13474    |({TRIGGER.VALUE}=0&{13114}>75)&pipe;({TRIGGER.VALUE}=1&{13114}>65)|Zabbix http poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13087     |0   |0    |
-ROW   |13475    |({TRIGGER.VALUE}=0&{13116}>75)&pipe;({TRIGGER.VALUE}=1&{13116}>65)|Zabbix icmp pinger processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13088     |0   |0    |
-ROW   |13476    |({TRIGGER.VALUE}=0&{13118}>75)&pipe;({TRIGGER.VALUE}=1&{13118}>65)|Zabbix ipmi poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13089     |0   |0    |
-ROW   |13477    |({TRIGGER.VALUE}=0&{13120}>75)&pipe;({TRIGGER.VALUE}=1&{13120}>65)|Zabbix java poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13275     |0   |0    |
-ROW   |13479    |({TRIGGER.VALUE}=0&{13124}>75)&pipe;({TRIGGER.VALUE}=1&{13124}>65)|Zabbix poller processes more than 75% busy                          |   |0     |3       |                                                                                                                                      |13091     |0   |0    |
-ROW   |13480    |({TRIGGER.VALUE}=0&{13126}>75)&pipe;({TRIGGER.VALUE}=1&{13126}>65)|Zabbix proxy poller processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |13092     |0   |0    |
-ROW   |13481    |({TRIGGER.VALUE}=0&{13030}>75)&pipe;({TRIGGER.VALUE}=1&{13030}>65)|Zabbix self-monitoring processes more than 75% busy                 |   |0     |3       |                                                                                                                                      |13093     |0   |0    |
-ROW   |13482    |({TRIGGER.VALUE}=0&{13128}>75)&pipe;({TRIGGER.VALUE}=1&{13128}>65)|Zabbix snmp trapper processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |13441     |0   |0    |
-ROW   |13483    |({TRIGGER.VALUE}=0&{13130}>75)&pipe;({TRIGGER.VALUE}=1&{13130}>65)|Zabbix timer processes more than 75% busy                           |   |0     |3       |                                                                                                                                      |13094     |0   |0    |
-ROW   |13484    |({TRIGGER.VALUE}=0&{13132}>75)&pipe;({TRIGGER.VALUE}=1&{13132}>65)|Zabbix trapper processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |13095     |0   |0    |
-ROW   |13485    |({TRIGGER.VALUE}=0&{13134}>75)&pipe;({TRIGGER.VALUE}=1&{13134}>65)|Zabbix unreachable poller processes more than 75% busy              |   |0     |3       |                                                                                                                                      |13096     |0   |0    |
-ROW   |13486    |{12895}>100                                                       |More than 100 items having missing data for more than 10 minutes    |   |0     |2       |zabbix[queue,10m] item is collecting data about how many items are missing data for more than 10 minutes (next parameter)             |13023     |0   |0    |
-ROW   |13487    |{12896}<25                                                        |Less than 25% free in the configuration cache                       |   |0     |3       |Consider increasing CacheSize in the zabbix_server.conf configuration file                                                            |13015     |0   |0    |
-ROW   |13488    |{12897}<25                                                        |Less than 25% free in the history cache                             |   |0     |3       |                                                                                                                                      |13073     |0   |0    |
-ROW   |13489    |{12898}<25                                                        |Less than 25% free in the text history cache                        |   |0     |3       |                                                                                                                                      |13017     |0   |0    |
-ROW   |13490    |{12899}<25                                                        |Less than 25% free in the trends cache                              |   |0     |3       |                                                                                                                                      |13019     |0   |0    |
-ROW   |13491    |{12900}=1                                                         |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |10047     |0   |0    |
-ROW   |13492    |{12928}>0                                                         |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |10045     |0   |0    |
-ROW   |13493    |{12902}<1024                                                      |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |10042     |0   |0    |
-ROW   |13494    |{12903}<256                                                       |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |10041     |0   |0    |
-ROW   |13495    |{13085}>30                                                        |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |10011     |0   |0    |
-ROW   |13496    |{13083}>300                                                       |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |10190     |0   |0    |
-ROW   |13497    |{13079}>5                                                         |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |10010     |0   |0    |
-ROW   |13498    |{13081}>20                                                        |Disk I/O is overloaded on {HOST.NAME}                               |   |0     |2       |OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.|13243     |0   |0    |
-ROW   |13499    |{12908}>0                                                         |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |10043     |0   |0    |
-ROW   |13500    |{12909}<50                                                        |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |10012     |0   |0    |
-ROW   |13501    |{12910}>0                                                         |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |10044     |0   |0    |
-ROW   |13502    |{12911}<0                                                         |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |10021     |0   |0    |
-ROW   |13503    |{12912}>0                                                         |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |10016     |0   |0    |
-ROW   |13504    |{12913}<20M                                                       |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |13000     |0   |0    |
-ROW   |13505    |{12914}<20                                                        |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |13272     |0   |2    |
-ROW   |13506    |{12915}<20                                                        |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |13266     |0   |2    |
-ROW   |13508    |{12937}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
-ROW   |13509    |{12938}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13508     |0   |0    |
-ROW   |13510    |{12939}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
-ROW   |13511    |{12940}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
-ROW   |13512    |{12941}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
-ROW   |13513    |{12942}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
-ROW   |13514    |{12943}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
-ROW   |13515    |{12944}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
-ROW   |13516    |{12945}>0                                                         |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
-ROW   |13537    |{12966}<25                                                        |Less than 25% free in the vmware cache                              |   |0     |3       |                                                                                                                                      |13536     |0   |0    |
+FIELDS|triggerid|expression                                                              |description                                                         |url|status|priority|comments                                                                                                                              |templateid|type|flags|
+ROW   |10010    |{13078}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10011    |{13084}>30                                                              |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10012    |{12580}<50                                                              |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |NULL      |0   |0    |
+ROW   |10016    |{10199}>0                                                               |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10021    |{12583}<0                                                               |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10041    |{10204}<256                                                             |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10042    |{12553}<1024                                                            |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10043    |{10208}>0                                                               |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10044    |{10207}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10190    |{13082}>300                                                             |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13000    |{12144}<20M                                                             |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13015    |{12641}<25                                                              |Less than 25% free in the configuration cache                       |   |0     |3       |Consider increasing CacheSize in the zabbix_server.conf configuration file                                                            |NULL      |0   |0    |
+ROW   |13017    |{12651}<25                                                              |Less than 25% free in the text history cache                        |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13019    |{12649}<25                                                              |Less than 25% free in the trends cache                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13023    |{12653}>100                                                             |More than 100 items having missing data for more than 10 minutes    |   |0     |2       |zabbix[queue,10m] item is collecting data about how many items are missing data for more than 10 minutes (next parameter)             |NULL      |0   |0    |
+ROW   |13025    |{12549}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13026    |{12926}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13073    |{12645}<25                                                              |Less than 25% free in the history cache                             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13074    |{12646}<5                                                               |Less than 5% free in the value cache                                |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13080    |({TRIGGER.VALUE}=0 and {13099}>75) or ({TRIGGER.VALUE}=1 and {13099}>65)|Zabbix alerter processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13081    |({TRIGGER.VALUE}=0 and {13101}>75) or ({TRIGGER.VALUE}=1 and {13101}>65)|Zabbix configuration syncer processes more than 75% busy            |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13082    |({TRIGGER.VALUE}=0 and {13103}>75) or ({TRIGGER.VALUE}=1 and {13103}>65)|Zabbix db watchdog processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13083    |({TRIGGER.VALUE}=0 and {13105}>75) or ({TRIGGER.VALUE}=1 and {13105}>65)|Zabbix discoverer processes more than 75% busy                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13084    |({TRIGGER.VALUE}=0 and {13107}>75) or ({TRIGGER.VALUE}=1 and {13107}>65)|Zabbix escalator processes more than 75% busy                       |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13085    |({TRIGGER.VALUE}=0 and {13109}>75) or ({TRIGGER.VALUE}=1 and {13109}>65)|Zabbix history syncer processes more than 75% busy                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13086    |({TRIGGER.VALUE}=0 and {13111}>75) or ({TRIGGER.VALUE}=1 and {13111}>65)|Zabbix housekeeper processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13087    |({TRIGGER.VALUE}=0 and {13113}>75) or ({TRIGGER.VALUE}=1 and {13113}>65)|Zabbix http poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13088    |({TRIGGER.VALUE}=0 and {13115}>75) or ({TRIGGER.VALUE}=1 and {13115}>65)|Zabbix icmp pinger processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13089    |({TRIGGER.VALUE}=0 and {13117}>75) or ({TRIGGER.VALUE}=1 and {13117}>65)|Zabbix ipmi poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13091    |({TRIGGER.VALUE}=0 and {13123}>75) or ({TRIGGER.VALUE}=1 and {13123}>65)|Zabbix poller processes more than 75% busy                          |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13092    |({TRIGGER.VALUE}=0 and {13125}>75) or ({TRIGGER.VALUE}=1 and {13125}>65)|Zabbix proxy poller processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13093    |({TRIGGER.VALUE}=0 and {13029}>75) or ({TRIGGER.VALUE}=1 and {13029}>65)|Zabbix self-monitoring processes more than 75% busy                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13094    |({TRIGGER.VALUE}=0 and {13129}>75) or ({TRIGGER.VALUE}=1 and {13129}>65)|Zabbix timer processes more than 75% busy                           |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13095    |({TRIGGER.VALUE}=0 and {13131}>75) or ({TRIGGER.VALUE}=1 and {13131}>65)|Zabbix trapper processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13096    |({TRIGGER.VALUE}=0 and {13133}>75) or ({TRIGGER.VALUE}=1 and {13133}>65)|Zabbix unreachable poller processes more than 75% busy              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13097    |({TRIGGER.VALUE}=0 and {13135}>75) or ({TRIGGER.VALUE}=1 and {13135}>65)|Zabbix vmware collector processes more than 75% busy                |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13243    |{13080}>20                                                              |Disk I/O is overloaded on {HOST.NAME}                               |   |0     |2       |OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.|NULL      |0   |0    |
+ROW   |13266    |{12592}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13272    |{12598}<20                                                              |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13275    |({TRIGGER.VALUE}=0 and {13119}>75) or ({TRIGGER.VALUE}=1 and {13119}>65)|Zabbix java poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13285    |{13159}=0                                                               |Telnet service is down on {HOST.NAME}                               |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13287    |{12671}=1                                                               |Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}|   |0     |1       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13291    |{12675} / {12676} > 0.8                                                 |Free disk space is less than 20% on volume {#SNMPVALUE}             |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13295    |{12682}<5 or {12682}>90                                                 |Baseboard Temp Critical [{ITEM.VALUE}]                              |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13296    |{12683}<10 or {12683}>83                                                |Baseboard Temp Non-Critical [{ITEM.VALUE}]                          |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13297    |{12684}<0.953 or {12684}>1.149                                          |BB +1.05V PCH Critical [{ITEM.VALUE}]                               |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13298    |{12685}<0.985 or {12685}>1.117                                          |BB +1.05V PCH Non-Critical [{ITEM.VALUE}]                           |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13299    |{12686}<0.683 or {12686}>1.543                                          |BB +1.1V P1 Vccp Critical [{ITEM.VALUE}]                            |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13300    |{12687}<0.708 or {12687}>1.501                                          |BB +1.1V P1 Vccp Non-Critical [{ITEM.VALUE}]                        |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13301    |{12688}<1.362 or {12688}>1.635                                          |BB +1.5V P1 DDR3 Critical [{ITEM.VALUE}]                            |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13302    |{12689}<1.401 or {12689}>1.589                                          |BB +1.5V P1 DDR3 Non-Critical [{ITEM.VALUE}]                        |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13303    |{12690}<1.597 or {12690}>2.019                                          |BB +1.8V SM Critical [{ITEM.VALUE}]                                 |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13304    |{12691}<1.646 or {12691}>1.960                                          |BB +1.8V SM Non-Critical [{ITEM.VALUE}]                             |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13305    |{12692}<2.876 or {12692}>3.729                                          |BB +3.3V Critical [{ITEM.VALUE}]                                    |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13306    |{12693}<2.982 or {12693}>3.625                                          |BB +3.3V Critical [{ITEM.VALUE}]                                    |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13307    |{12694}<2.970 or {12694}>3.618                                          |BB +3.3V Non-Critical [{ITEM.VALUE}]                                |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13308    |{12695}<3.067 or {12695}>3.525                                          |BB +3.3V Non-Critical [{ITEM.VALUE}]                                |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13309    |{12696}<2.876 or {12696}>3.729                                          |BB +3.3V STBY Critical [{ITEM.VALUE}]                               |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13310    |{12697}<2.982 or {12697}>3.625                                          |BB +3.3V STBY Critical [{ITEM.VALUE}]                               |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13311    |{12698}<2.970 or {12698}>3.618                                          |BB +3.3V STBY Non-Critical [{ITEM.VALUE}]                           |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13312    |{12699}<3.067 or {12699}>3.525                                          |BB +3.3V STBY Non-Critical [{ITEM.VALUE}]                           |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13313    |{12700}<4.471 or {12700}>5.538                                          |BB +5.0V Critical [{ITEM.VALUE}]                                    |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13314    |{12701}<4.362 or {12701}>5.663                                          |BB +5.0V Critical [{ITEM.VALUE}]                                    |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13315    |{12702}<4.630 or {12702}>5.380                                          |BB +5.0V Non-Critical [{ITEM.VALUE}]                                |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13316    |{12703}<4.483 or {12703}>5.495                                          |BB +5.0V Non-Critical [{ITEM.VALUE}]                                |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13317    |{12704}<5 or {12704}>66                                                 |BB Ambient Temp Critical [{ITEM.VALUE}]                             |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13318    |{12705}<10 or {12705}>61                                                |BB Ambient Temp Non-Critical [{ITEM.VALUE}]                         |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13319    |{12706}<0 or {12706}>48                                                 |Front Panel Temp Critical [{ITEM.VALUE}]                            |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13320    |{12707}<5 or {12707}>44                                                 |Front Panel Temp Non-Critical [{ITEM.VALUE}]                        |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13321    |{12708}=0                                                               |Power                                                               |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13322    |{12709}=0                                                               |Power                                                               |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13323    |{12710}<324                                                             |System Fan 2 Critical [{ITEM.VALUE}]                                |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13324    |{12711}<378                                                             |System Fan 2 Non-Critical [{ITEM.VALUE}]                            |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13325    |{12712}<324                                                             |System Fan 3 Critical [{ITEM.VALUE}]                                |   |0     |5       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13326    |{12713}<378                                                             |System Fan 3 Non-Critical [{ITEM.VALUE}]                            |   |0     |4       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13327    |{13155}=0                                                               |MySQL is down                                                       |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13330    |{12717}<1024                                                            |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13331    |{12718}<256                                                             |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13332    |{13089}>30                                                              |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13333    |{13088}>300                                                             |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13334    |{13087}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13336    |{12723}>0                                                               |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13337    |{12724}<50                                                              |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |NULL      |0   |0    |
+ROW   |13338    |{12725}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13339    |{12726}<0                                                               |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13340    |{12727}>0                                                               |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13341    |{12728}<20M                                                             |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13342    |{12729}<20                                                              |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13343    |{12730}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13346    |{12733}<1024                                                            |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13347    |{12734}<256                                                             |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13348    |{13074}>30                                                              |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13349    |{13073}>300                                                             |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13350    |{13072}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13352    |{12739}>0                                                               |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13353    |{12740}<50                                                              |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |NULL      |0   |0    |
+ROW   |13354    |{12741}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13355    |{12742}<0                                                               |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13356    |{12743}>0                                                               |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13357    |{12744}<20M                                                             |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13358    |{12745}<20                                                              |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13359    |{12746}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13364    |{13071}>30                                                              |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13365    |{13070}>300                                                             |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13366    |{13069}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13367    |{13068}>20                                                              |Disk I/O is overloaded on {HOST.NAME}                               |   |0     |2       |OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.|NULL      |0   |0    |
+ROW   |13368    |{12755}>0                                                               |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13370    |{12757}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13371    |{12758}<0                                                               |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13372    |{12759}>0                                                               |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13373    |{12760}<20M                                                             |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13374    |{12761}<20                                                              |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13375    |{12762}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13382    |{13075}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13384    |{12771}>0                                                               |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13386    |{12773}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13388    |{12775}>0                                                               |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13389    |{12776}<20M                                                             |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13390    |{12777}<20                                                              |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13391    |{12778}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13395    |{12782}<256                                                             |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13396    |{13093}>30                                                              |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13397    |{13092}>300                                                             |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13398    |{13091}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13399    |{13090}>20                                                              |Disk I/O is overloaded on {HOST.NAME}                               |   |0     |2       |OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.|NULL      |0   |0    |
+ROW   |13400    |{12787}>0                                                               |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13401    |{12788}<50                                                              |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |NULL      |0   |0    |
+ROW   |13402    |{12789}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13403    |{12790}<0                                                               |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13404    |{12791}>0                                                               |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13405    |{12792}<20M                                                             |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13406    |{12793}<20                                                              |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13407    |{12794}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13410    |{12797}<1024                                                            |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13411    |{12798}<256                                                             |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13414    |{13086}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13416    |{12803}>0                                                               |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13418    |{12805}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13419    |{12806}<0                                                               |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13420    |{12807}>0                                                               |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13421    |{12808}<20M                                                             |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13422    |{12809}<20                                                              |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13423    |{12810}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13425    |{12812}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13428    |{12815}<0                                                               |{HOST.NAME} has just been restarted                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13430    |{13095}>300                                                             |Too many processes on {HOST.NAME}                                   |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13431    |{12818}<100000                                                          |Lack of free swap space on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13433    |{12820}<10000                                                           |Lack of free memory on server {HOST.NAME}                           |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13435    |{13094}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13439    |{12826}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |NULL      |0   |2    |
+ROW   |13441    |({TRIGGER.VALUE}=0 and {13127}>75) or ({TRIGGER.VALUE}=1 and {13127}>65)|Zabbix snmp trapper processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13442    |{12830} > ({12831} * 0.7)                                               |70% http-8080 worker threads busy on {HOST.NAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13443    |{12832} > ({12833} * 0.7)                                               |70% http-8443 worker threads busy on {HOST.NAME}                    |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13444    |{12834} > ({12835}  *0.7)                                               |70% jk-8009 worker threads busy on {HOST.NAME}                      |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13445    |{12836}>({12837}*0.7)                                                   |70% mp CMS Old Gen used on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13446    |{12838}>({12839}*0.7)                                                   |70% mp CMS Perm Gen used on {HOST.NAME}                             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13447    |{12840}>({12841}*0.7)                                                   |70% mp Code Cache used on {HOST.NAME}                               |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13448    |{12842}>({12843}*0.7)                                                   |70% mp Perm Gen used on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13449    |{12844}>({12845}*0.7)                                                   |70% mp PS Old Gen used on {HOST.NAME}                               |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13450    |{12846}>({12847}*0.7)                                                   |70% mp PS Perm Gen used on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13451    |{12848}>({12849}*0.7)                                                   |70% mp Tenured Gen used on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13452    |{12850}>({12851}*0.7)                                                   |70% os Opened File Descriptor Count used on {HOST.NAME}             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13453    |{12852}<{12853}                                                         |gc Concurrent Mark Sweep in fire fighting mode on {HOST.NAME}       |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13454    |{12854}<{12855}                                                         |gc Mark Sweep Compact in fire fighting mode on {HOST.NAME}          |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13455    |{12856}<{12857}                                                         |gc PS Mark Sweep in fire fighting mode on {HOST.NAME}               |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13456    |{12858} = 1                                                             |gzip compression is off for connector http-8080 on {HOST.NAME}      |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13457    |{12859} = 1                                                             |gzip compression is off for connector http-8443 on {HOST.NAME}      |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13458    |{12860}={12861}                                                         |mp CMS Old Gen fully committed on {HOST.NAME}                       |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13459    |{12862}={12863}                                                         |mp CMS Perm Gen fully committed on {HOST.NAME}                      |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13460    |{12864}={12865}                                                         |mp Code Cache fully committed on {HOST.NAME}                        |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13461    |{12866}={12867}                                                         |mp Perm Gen fully committed on {HOST.NAME}                          |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13462    |{12868}={12869}                                                         |mp PS Old Gen fully committed on {HOST.NAME}                        |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13463    |{12870}={12871}                                                         |mp PS Perm Gen fully committed on {HOST.NAME}                       |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13464    |{12872}={12873}                                                         |mp Tenured Gen fully committed on {HOST.NAME}                       |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13465    |{12874}=1                                                               |{HOST.NAME} is not reachable                                        |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13466    |{12967}=1                                                               |{HOST.NAME} uses suboptimal JIT compiler                            |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13507    |{12936}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13517    |{12946}<25                                                              |Less than 25% free in the configuration cache                       |   |0     |3       |Consider increasing CacheSize in the zabbix_server.conf configuration file                                                            |NULL      |0   |0    |
+ROW   |13518    |{12947}<25                                                              |Less than 25% free in the history cache                             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13519    |{12948}<25                                                              |Less than 25% free in the text history cache                        |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13520    |{12949}>100                                                             |More than 100 items having missing data for more than 10 minutes    |   |0     |2       |zabbix[queue,10m] item is collecting data about how many items are missing data for more than 10 minutes (next parameter)             |NULL      |0   |0    |
+ROW   |13521    |({TRIGGER.VALUE}=0 and {13137}>75) or ({TRIGGER.VALUE}=1 and {13137}>65)|Zabbix configuration syncer processes more than 75% busy            |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13522    |({TRIGGER.VALUE}=0 and {13139}>75) or ({TRIGGER.VALUE}=1 and {13139}>65)|Zabbix discoverer processes more than 75% busy                      |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13523    |({TRIGGER.VALUE}=0 and {13141}>75) or ({TRIGGER.VALUE}=1 and {13141}>65)|Zabbix history syncer processes more than 75% busy                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13524    |({TRIGGER.VALUE}=0 and {13142}>75) or ({TRIGGER.VALUE}=1 and {13142}>65)|Zabbix housekeeper processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13525    |({TRIGGER.VALUE}=0 and {13143}>75) or ({TRIGGER.VALUE}=1 and {13143}>65)|Zabbix http poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13526    |({TRIGGER.VALUE}=0 and {13144}>75) or ({TRIGGER.VALUE}=1 and {13144}>65)|Zabbix icmp pinger processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13527    |({TRIGGER.VALUE}=0 and {13145}>75) or ({TRIGGER.VALUE}=1 and {13145}>65)|Zabbix ipmi poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13528    |({TRIGGER.VALUE}=0 and {13146}>75) or ({TRIGGER.VALUE}=1 and {13146}>65)|Zabbix java poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13529    |({TRIGGER.VALUE}=0 and {13147}>75) or ({TRIGGER.VALUE}=1 and {13147}>65)|Zabbix poller processes more than 75% busy                          |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13530    |({TRIGGER.VALUE}=0 and {13148}>75) or ({TRIGGER.VALUE}=1 and {13148}>65)|Zabbix self-monitoring processes more than 75% busy                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13531    |({TRIGGER.VALUE}=0 and {13149}>75) or ({TRIGGER.VALUE}=1 and {13149}>65)|Zabbix snmp trapper processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13532    |({TRIGGER.VALUE}=0 and {13150}>75) or ({TRIGGER.VALUE}=1 and {13150}>65)|Zabbix trapper processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13533    |({TRIGGER.VALUE}=0 and {13151}>75) or ({TRIGGER.VALUE}=1 and {13151}>65)|Zabbix unreachable poller processes more than 75% busy              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13534    |({TRIGGER.VALUE}=0 and {13138}>75) or ({TRIGGER.VALUE}=1 and {13138}>65)|Zabbix data sender processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13535    |({TRIGGER.VALUE}=0 and {13140}>75) or ({TRIGGER.VALUE}=1 and {13140}>65)|Zabbix heartbeat sender processes more than 75% busy                |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13536    |{12965}<25                                                              |Less than 25% free in the vmware cache                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13538    |{12968}>0.7                                                             |70% os Process CPU Load on {HOST.NAME}                              |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13539    |{12969}>({12970}*0.7)                                                   |70% mem Heap Memory used on {HOST.NAME}                             |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13540    |{12971}>({12972}*0.7)                                                   |70% mem Non-Heap Memory used on {HOST.NAME}                         |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13541    |{12973}={12974}                                                         |mem Heap Memory fully committed on {HOST.NAME}                      |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13542    |{12975}={12976}                                                         |mem Non-Heap Memory fully committed on {HOST.NAME}                  |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13543    |{12977}<>1                                                              |{HOST.NAME} runs suboptimal VM type                                 |   |0     |1       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13544    |{12994}=0                                                               |FTP service is down on {HOST.NAME}                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13545    |{12995}=0                                                               |HTTP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13546    |{12996}=0                                                               |HTTPS service is down on {HOST.NAME}                                |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13547    |{12997}=0                                                               |IMAP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13548    |{12998}=0                                                               |LDAP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13549    |{13154}=0                                                               |NNTP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13550    |{13156}=0                                                               |NTP service is down on {HOST.NAME}                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13551    |{13152}=0                                                               |POP service is down on {HOST.NAME}                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13552    |{13157}=0                                                               |SMTP service is down on {HOST.NAME}                                 |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13553    |{13158}=0                                                               |SSH service is down on {HOST.NAME}                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13554    |{13096}=0                                                               |{HOST.NAME} is unavailable by ICMP                                  |   |0     |3       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13555    |{13097}>0.15                                                            |Response time is too high on {HOST.NAME}                            |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |13556    |{13098}>20                                                              |Ping loss is too high on {HOST.NAME}                                |   |0     |2       |                                                                                                                                      |NULL      |0   |0    |
+ROW   |10045    |{12927}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
+ROW   |10047    |{12550}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
+ROW   |13075    |{12648}<5                                                               |Less than 5% free in the value cache                                |   |0     |3       |                                                                                                                                      |13074     |0   |0    |
+ROW   |13288    |{12672}=1                                                               |Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}|   |0     |1       |                                                                                                                                      |13287     |0   |2    |
+ROW   |13289    |{12673}=1                                                               |Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}|   |0     |1       |                                                                                                                                      |13287     |0   |2    |
+ROW   |13292    |{12677} / {12678} > 0.8                                                 |Free disk space is less than 20% on volume {#SNMPVALUE}             |   |0     |2       |                                                                                                                                      |13291     |0   |2    |
+ROW   |13293    |{12679} / {12680} > 0.8                                                 |Free disk space is less than 20% on volume {#SNMPVALUE}             |   |0     |2       |                                                                                                                                      |13291     |0   |2    |
+ROW   |13294    |{12681}=1                                                               |Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}|   |0     |1       |                                                                                                                                      |13287     |0   |2    |
+ROW   |13328    |{12715}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
+ROW   |13329    |{12929}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
+ROW   |13344    |{12731}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
+ROW   |13345    |{12930}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
+ROW   |13360    |{12747}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
+ROW   |13361    |{12931}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
+ROW   |13376    |{12763}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
+ROW   |13377    |{12932}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
+ROW   |13392    |{12779}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
+ROW   |13393    |{12933}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
+ROW   |13408    |{12795}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
+ROW   |13409    |{12934}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
+ROW   |13436    |({TRIGGER.VALUE}=0 and {13136}>75) or ({TRIGGER.VALUE}=1 and {13136}>65)|Zabbix vmware collector processes more than 75% busy                |   |0     |3       |                                                                                                                                      |13097     |0   |0    |
+ROW   |13437    |{12824}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |13025     |0   |0    |
+ROW   |13438    |{12935}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13026     |0   |0    |
+ROW   |13467    |({TRIGGER.VALUE}=0 and {13100}>75) or ({TRIGGER.VALUE}=1 and {13100}>65)|Zabbix alerter processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |13080     |0   |0    |
+ROW   |13468    |({TRIGGER.VALUE}=0 and {13102}>75) or ({TRIGGER.VALUE}=1 and {13102}>65)|Zabbix configuration syncer processes more than 75% busy            |   |0     |3       |                                                                                                                                      |13081     |0   |0    |
+ROW   |13469    |({TRIGGER.VALUE}=0 and {13104}>75) or ({TRIGGER.VALUE}=1 and {13104}>65)|Zabbix db watchdog processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13082     |0   |0    |
+ROW   |13470    |({TRIGGER.VALUE}=0 and {13106}>75) or ({TRIGGER.VALUE}=1 and {13106}>65)|Zabbix discoverer processes more than 75% busy                      |   |0     |3       |                                                                                                                                      |13083     |0   |0    |
+ROW   |13471    |({TRIGGER.VALUE}=0 and {13108}>75) or ({TRIGGER.VALUE}=1 and {13108}>65)|Zabbix escalator processes more than 75% busy                       |   |0     |3       |                                                                                                                                      |13084     |0   |0    |
+ROW   |13472    |({TRIGGER.VALUE}=0 and {13110}>75) or ({TRIGGER.VALUE}=1 and {13110}>65)|Zabbix history syncer processes more than 75% busy                  |   |0     |3       |                                                                                                                                      |13085     |0   |0    |
+ROW   |13473    |({TRIGGER.VALUE}=0 and {13112}>75) or ({TRIGGER.VALUE}=1 and {13112}>65)|Zabbix housekeeper processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13086     |0   |0    |
+ROW   |13474    |({TRIGGER.VALUE}=0 and {13114}>75) or ({TRIGGER.VALUE}=1 and {13114}>65)|Zabbix http poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13087     |0   |0    |
+ROW   |13475    |({TRIGGER.VALUE}=0 and {13116}>75) or ({TRIGGER.VALUE}=1 and {13116}>65)|Zabbix icmp pinger processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13088     |0   |0    |
+ROW   |13476    |({TRIGGER.VALUE}=0 and {13118}>75) or ({TRIGGER.VALUE}=1 and {13118}>65)|Zabbix ipmi poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13089     |0   |0    |
+ROW   |13477    |({TRIGGER.VALUE}=0 and {13120}>75) or ({TRIGGER.VALUE}=1 and {13120}>65)|Zabbix java poller processes more than 75% busy                     |   |0     |3       |                                                                                                                                      |13275     |0   |0    |
+ROW   |13479    |({TRIGGER.VALUE}=0 and {13124}>75) or ({TRIGGER.VALUE}=1 and {13124}>65)|Zabbix poller processes more than 75% busy                          |   |0     |3       |                                                                                                                                      |13091     |0   |0    |
+ROW   |13480    |({TRIGGER.VALUE}=0 and {13126}>75) or ({TRIGGER.VALUE}=1 and {13126}>65)|Zabbix proxy poller processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |13092     |0   |0    |
+ROW   |13481    |({TRIGGER.VALUE}=0 and {13030}>75) or ({TRIGGER.VALUE}=1 and {13030}>65)|Zabbix self-monitoring processes more than 75% busy                 |   |0     |3       |                                                                                                                                      |13093     |0   |0    |
+ROW   |13482    |({TRIGGER.VALUE}=0 and {13128}>75) or ({TRIGGER.VALUE}=1 and {13128}>65)|Zabbix snmp trapper processes more than 75% busy                    |   |0     |3       |                                                                                                                                      |13441     |0   |0    |
+ROW   |13483    |({TRIGGER.VALUE}=0 and {13130}>75) or ({TRIGGER.VALUE}=1 and {13130}>65)|Zabbix timer processes more than 75% busy                           |   |0     |3       |                                                                                                                                      |13094     |0   |0    |
+ROW   |13484    |({TRIGGER.VALUE}=0 and {13132}>75) or ({TRIGGER.VALUE}=1 and {13132}>65)|Zabbix trapper processes more than 75% busy                         |   |0     |3       |                                                                                                                                      |13095     |0   |0    |
+ROW   |13485    |({TRIGGER.VALUE}=0 and {13134}>75) or ({TRIGGER.VALUE}=1 and {13134}>65)|Zabbix unreachable poller processes more than 75% busy              |   |0     |3       |                                                                                                                                      |13096     |0   |0    |
+ROW   |13486    |{12895}>100                                                             |More than 100 items having missing data for more than 10 minutes    |   |0     |2       |zabbix[queue,10m] item is collecting data about how many items are missing data for more than 10 minutes (next parameter)             |13023     |0   |0    |
+ROW   |13487    |{12896}<25                                                              |Less than 25% free in the configuration cache                       |   |0     |3       |Consider increasing CacheSize in the zabbix_server.conf configuration file                                                            |13015     |0   |0    |
+ROW   |13488    |{12897}<25                                                              |Less than 25% free in the history cache                             |   |0     |3       |                                                                                                                                      |13073     |0   |0    |
+ROW   |13489    |{12898}<25                                                              |Less than 25% free in the text history cache                        |   |0     |3       |                                                                                                                                      |13017     |0   |0    |
+ROW   |13490    |{12899}<25                                                              |Less than 25% free in the trends cache                              |   |0     |3       |                                                                                                                                      |13019     |0   |0    |
+ROW   |13491    |{12900}=1                                                               |Zabbix agent on {HOST.NAME} is unreachable for 5 minutes            |   |0     |3       |                                                                                                                                      |10047     |0   |0    |
+ROW   |13492    |{12928}>0                                                               |Version of zabbix_agent(d) was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |10045     |0   |0    |
+ROW   |13493    |{12902}<1024                                                            |Configured max number of opened files is too low on {HOST.NAME}     |   |0     |1       |                                                                                                                                      |10042     |0   |0    |
+ROW   |13494    |{12903}<256                                                             |Configured max number of processes is too low on {HOST.NAME}        |   |0     |1       |                                                                                                                                      |10041     |0   |0    |
+ROW   |13495    |{13085}>30                                                              |Too many processes running on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |10011     |0   |0    |
+ROW   |13496    |{13083}>300                                                             |Too many processes on {HOST.NAME}                                   |   |0     |2       |                                                                                                                                      |10190     |0   |0    |
+ROW   |13497    |{13079}>5                                                               |Processor load is too high on {HOST.NAME}                           |   |0     |2       |                                                                                                                                      |10010     |0   |0    |
+ROW   |13498    |{13081}>20                                                              |Disk I/O is overloaded on {HOST.NAME}                               |   |0     |2       |OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.|13243     |0   |0    |
+ROW   |13499    |{12908}>0                                                               |Hostname was changed on {HOST.NAME}                                 |   |0     |1       |                                                                                                                                      |10043     |0   |0    |
+ROW   |13500    |{12909}<50                                                              |Lack of free swap space on {HOST.NAME}                              |   |0     |2       |It probably means that the systems requires more physical memory.                                                                     |10012     |0   |0    |
+ROW   |13501    |{12910}>0                                                               |Host information was changed on {HOST.NAME}                         |   |0     |1       |                                                                                                                                      |10044     |0   |0    |
+ROW   |13502    |{12911}<0                                                               |{HOST.NAME} has just been restarted                                 |   |0     |1       |                                                                                                                                      |10021     |0   |0    |
+ROW   |13503    |{12912}>0                                                               |/etc/passwd has been changed on {HOST.NAME}                         |   |0     |2       |                                                                                                                                      |10016     |0   |0    |
+ROW   |13504    |{12913}<20M                                                             |Lack of available memory on server {HOST.NAME}                      |   |0     |3       |                                                                                                                                      |13000     |0   |0    |
+ROW   |13505    |{12914}<20                                                              |Free inodes is less than 20% on volume {#FSNAME}                    |   |0     |2       |                                                                                                                                      |13272     |0   |2    |
+ROW   |13506    |{12915}<20                                                              |Free disk space is less than 20% on volume {#FSNAME}                |   |0     |2       |                                                                                                                                      |13266     |0   |2    |
+ROW   |13508    |{12937}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
+ROW   |13509    |{12938}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13508     |0   |0    |
+ROW   |13510    |{12939}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
+ROW   |13511    |{12940}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
+ROW   |13512    |{12941}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
+ROW   |13513    |{12942}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
+ROW   |13514    |{12943}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
+ROW   |13515    |{12944}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
+ROW   |13516    |{12945}>0                                                               |Host name of zabbix_agentd was changed on {HOST.NAME}               |   |0     |1       |                                                                                                                                      |13507     |0   |0    |
+ROW   |13537    |{12966}<25                                                              |Less than 25% free in the vmware cache                              |   |0     |3       |                                                                                                                                      |13536     |0   |0    |
 
 TABLE |trigger_depends
 FIELDS|triggerdepid|triggerid_down|triggerid_up|
@@ -1835,14 +1835,14 @@ ROW   |529    |Zabbix cache usage, % free              |900  |200   |0.0000  |10
 ROW   |530    |Zabbix data gathering process busy %    |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |1        |NULL       |NULL       |0    |
 ROW   |531    |Zabbix internal process busy %          |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |1        |NULL       |NULL       |0    |
 ROW   |532    |Zabbix proxy performance                |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |533    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |540    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |541    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |542    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |543    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |544    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |545    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |546    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
+ROW   |533    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |10026      |0    |
+ROW   |540    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |22943      |0    |
+ROW   |541    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |22903      |0    |
+ROW   |542    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |22983      |0    |
+ROW   |543    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |23063      |0    |
+ROW   |544    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |22863      |0    |
+ROW   |545    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |23023      |0    |
+ROW   |546    |Memory usage                            |900  |200   |0.0000  |100.0000|NULL      |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |23159      |0    |
 ROW   |446    |Traffic on interface {#SNMPVALUE}       |900  |200   |0.0000  |100.0000|445       |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |2    |
 ROW   |447    |Traffic on interface {#SNMPVALUE}       |900  |200   |0.0000  |100.0000|445       |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |2    |
 ROW   |449    |Traffic on interface {#SNMPVALUE}       |900  |200   |0.0000  |100.0000|445       |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |2    |
@@ -1859,7 +1859,7 @@ ROW   |524    |CPU load                                |900  |200   |0.0000  |10
 ROW   |525    |CPU utilization                         |900  |200   |0.0000  |100.0000|387       |1               |0            |1        |1          |0      |0.0000      |0.0000       |1        |1        |NULL       |NULL       |0    |
 ROW   |526    |Swap usage                              |600  |340   |0.0000  |100.0000|436       |0               |0            |2        |1          |1      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
 ROW   |528    |Value cache effectiveness               |900  |200   |0.0000  |100.0000|527       |1               |1            |1        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
-ROW   |534    |Memory usage                            |900  |200   |0.0000  |100.0000|533       |1               |1            |0        |1          |0      |0.0000      |0.0000       |0        |0        |NULL       |NULL       |0    |
+ROW   |534    |Memory usage                            |900  |200   |0.0000  |100.0000|533       |1               |1            |0        |1          |0      |0.0000      |0.0000       |1        |2        |NULL       |23317      |0    |
 
 TABLE |graphs_items
 FIELDS|gitemid|graphid|itemid|drawtype|sortorder|color |yaxisside|calc_fnc|type|
@@ -2153,24 +2153,15 @@ ROW   |1762   |520    |23275 |0       |2        |00DDDD|0        |2       |0   |
 ROW   |1763   |520    |23274 |0       |3        |3333FF|0        |2       |0   |
 ROW   |1764   |520    |23620 |0       |4        |999900|0        |2       |0   |
 ROW   |1765   |520    |23635 |0       |5        |00FF00|0        |2       |0   |
-ROW   |1766   |533    |22181 |5       |1        |00C800|0        |2       |0   |
-ROW   |1767   |533    |10026 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1792   |534    |23316 |5       |1        |00C800|0        |2       |0   |
-ROW   |1793   |534    |23317 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1805   |540    |22943 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1806   |540    |22942 |5       |1        |00C800|0        |2       |0   |
-ROW   |1807   |541    |22903 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1808   |541    |22902 |5       |1        |00C800|0        |2       |0   |
-ROW   |1809   |542    |22983 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1810   |542    |22982 |5       |1        |00C800|0        |2       |0   |
-ROW   |1811   |543    |23063 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1812   |543    |23062 |5       |1        |00C800|0        |2       |0   |
-ROW   |1813   |544    |22863 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1814   |544    |22862 |5       |1        |00C800|0        |2       |0   |
-ROW   |1815   |545    |23023 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1816   |545    |23022 |5       |1        |00C800|0        |2       |0   |
-ROW   |1817   |546    |23159 |0       |0        |DD0000|0        |2       |0   |
-ROW   |1818   |546    |23158 |5       |1        |00C800|0        |2       |0   |
+ROW   |1766   |533    |22181 |5       |0        |00C800|0        |2       |0   |
+ROW   |1792   |534    |23316 |5       |0        |00C800|0        |2       |0   |
+ROW   |1806   |540    |22942 |5       |0        |00C800|0        |2       |0   |
+ROW   |1808   |541    |22902 |5       |0        |00C800|0        |2       |0   |
+ROW   |1810   |542    |22982 |5       |0        |00C800|0        |2       |0   |
+ROW   |1812   |543    |23062 |5       |0        |00C800|0        |2       |0   |
+ROW   |1814   |544    |22862 |5       |0        |00C800|0        |2       |0   |
+ROW   |1816   |545    |23022 |5       |0        |00C800|0        |2       |0   |
+ROW   |1818   |546    |23158 |5       |0        |00C800|0        |2       |0   |
 
 TABLE |graph_theme
 FIELDS|graphthemeid|description  |theme       |backgroundcolor|graphcolor|graphbordercolor|gridcolor|maingridcolor|gridbordercolor|textcolor|highlightcolor|leftpercentilecolor|rightpercentilecolor|nonworktimecolor|gridview|legendview|
@@ -3110,6 +3101,9 @@ ROW   |75       |13        |0    |gray              |
 ROW   |76       |13        |1    |green             |
 ROW   |77       |13        |2    |yellow            |
 ROW   |78       |13        |3    |red               |
+ROW   |79       |14        |0    |normal            |
+ROW   |80       |14        |1    |in maintenance    |
+ROW   |81       |14        |2    |no data collection|
 
 TABLE |sysmaps
 FIELDS|sysmapid|name         |width|height|backgroundid|label_type|label_location|highlight|expandproblem|markelements|show_unack|grid_size|grid_show|grid_align|label_format|label_type_host|label_type_hostgroup|label_type_trigger|label_type_map|label_type_image|label_string_host|label_string_hostgroup|label_string_trigger|label_string_map|label_string_image|iconmapid|expand_macros|severity_min|
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl
index 11ea9812b48..a8323202cb7 100644
--- a/create/src/schema.tmpl
+++ b/create/src/schema.tmpl
@@ -35,7 +35,7 @@ UNIQUE		|2		|name
 TABLE|hosts|hostid|ZBX_DATA
 FIELD		|hostid		|t_id		|	|NOT NULL	|0
 FIELD		|proxy_hostid	|t_id		|	|NULL		|0			|1|hosts	|hostid		|RESTRICT
-FIELD		|host		|t_varchar(64)	|''	|NOT NULL	|ZBX_PROXY
+FIELD		|host		|t_varchar(128)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|status		|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
 FIELD		|disable_until	|t_integer	|'0'	|NOT NULL	|ZBX_NODATA
 FIELD		|error		|t_varchar(128)	|''	|NOT NULL	|ZBX_NODATA
@@ -62,7 +62,7 @@ FIELD		|jmx_disable_until|t_integer	|'0'	|NOT NULL	|ZBX_NODATA
 FIELD		|jmx_available	|t_integer	|'0'	|NOT NULL	|ZBX_NODATA
 FIELD		|jmx_errors_from|t_integer	|'0'	|NOT NULL	|ZBX_NODATA
 FIELD		|jmx_error	|t_varchar(128)	|''	|NOT NULL	|ZBX_NODATA
-FIELD		|name		|t_varchar(64)	|''	|NOT NULL	|ZBX_PROXY
+FIELD		|name		|t_varchar(128)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|flags		|t_integer	|'0'	|NOT NULL	|0
 FIELD		|templateid	|t_id		|	|NULL		|0			|3|hosts	|hostid
 FIELD		|description	|t_shorttext	|''	|NOT NULL	|0
@@ -111,8 +111,8 @@ FIELD		|width		|t_integer	|'320'	|NOT NULL	|0
 FIELD		|height		|t_integer	|'200'	|NOT NULL	|0
 FIELD		|x		|t_integer	|'0'	|NOT NULL	|0
 FIELD		|y		|t_integer	|'0'	|NOT NULL	|0
-FIELD		|colspan	|t_integer	|'0'	|NOT NULL	|0
-FIELD		|rowspan	|t_integer	|'0'	|NOT NULL	|0
+FIELD		|colspan	|t_integer	|'1'	|NOT NULL	|0
+FIELD		|rowspan	|t_integer	|'1'	|NOT NULL	|0
 FIELD		|elements	|t_integer	|'25'	|NOT NULL	|0
 FIELD		|valign		|t_integer	|'0'	|NOT NULL	|0
 FIELD		|halign		|t_integer	|'0'	|NOT NULL	|0
@@ -121,6 +121,7 @@ FIELD		|url		|t_varchar(255)	|''	|NOT NULL	|0
 FIELD		|dynamic	|t_integer	|'0'	|NOT NULL	|0
 FIELD		|sort_triggers	|t_integer	|'0'	|NOT NULL	|0
 FIELD		|application	|t_varchar(255)	|''	|NOT NULL	|0
+FIELD		|max_columns	|t_integer	|'3'	|NOT NULL	|0
 INDEX		|1		|screenid
 
 TABLE|slideshows|slideshowid|ZBX_DATA
@@ -141,7 +142,7 @@ INDEX		|2		|screenid
 TABLE|drules|druleid|ZBX_DATA
 FIELD		|druleid	|t_id		|	|NOT NULL	|0
 FIELD		|proxy_hostid	|t_id		|	|NULL		|0			|1|hosts	|hostid		|RESTRICT
-FIELD		|name		|t_varchar(255)	|''	|NOT NULL	|0
+FIELD		|name		|t_varchar(255)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|iprange	|t_varchar(255)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|delay		|t_integer	|'3600'	|NOT NULL	|ZBX_PROXY
 FIELD		|nextcheck	|t_integer	|'0'	|NOT NULL	|ZBX_NODATA
@@ -188,6 +189,12 @@ FIELD		|hostid		|t_id		|	|NOT NULL	|ZBX_PROXY		|2|hosts
 FIELD		|templateid	|t_id		|	|NULL		|0			|3|httptest	|httptestid
 FIELD		|http_proxy	|t_varchar(255)	|''	|NOT NULL	|ZBX_PROXY,ZBX_NODATA
 FIELD		|retries	|t_integer	|'1'	|NOT NULL	|ZBX_PROXY,ZBX_NODATA
+FIELD		|ssl_cert_file	|t_varchar(255)	|''	|NOT NULL	|ZBX_PROXY,ZBX_NODATA
+FIELD		|ssl_key_file	|t_varchar(255)	|''	|NOT NULL	|ZBX_PROXY,ZBX_NODATA
+FIELD		|ssl_key_password|t_varchar(64)	|''	|NOT NULL	|ZBX_PROXY,ZBX_NODATA
+FIELD		|verify_peer	|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
+FIELD		|verify_host	|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
+FIELD		|headers	|t_shorttext	|''	|NOT NULL	|ZBX_PROXY
 INDEX		|1		|applicationid
 UNIQUE		|2		|hostid,name
 INDEX		|3		|status
@@ -198,12 +205,15 @@ FIELD		|httpstepid	|t_id		|	|NOT NULL	|0
 FIELD		|httptestid	|t_id		|	|NOT NULL	|ZBX_PROXY		|1|httptest
 FIELD		|name		|t_varchar(64)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|no		|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
-FIELD		|url		|t_varchar(255)	|''	|NOT NULL	|ZBX_PROXY
-FIELD		|timeout	|t_integer	|'30'	|NOT NULL	|ZBX_PROXY
+FIELD		|url		|t_varchar(2048)|''	|NOT NULL	|ZBX_PROXY
+FIELD		|timeout	|t_integer	|'15'	|NOT NULL	|ZBX_PROXY
 FIELD		|posts		|t_shorttext	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|required	|t_varchar(255)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|status_codes	|t_varchar(255)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|variables	|t_shorttext	|''	|NOT NULL	|ZBX_PROXY
+FIELD		|follow_redirects|t_integer	|'1'	|NOT NULL	|ZBX_PROXY
+FIELD		|retrieve_mode	|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
+FIELD		|headers	|t_shorttext	|''	|NOT NULL	|ZBX_PROXY
 INDEX		|1		|httptestid
 
 TABLE|interface|interfaceid|ZBX_DATA
@@ -215,6 +225,7 @@ FIELD		|useip		|t_integer	|'1'	|NOT NULL	|ZBX_PROXY
 FIELD		|ip		|t_varchar(64)	|'127.0.0.1'|NOT NULL	|ZBX_PROXY
 FIELD		|dns		|t_varchar(64)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|port		|t_varchar(64)	|'10050'|NOT NULL	|ZBX_PROXY
+FIELD		|bulk		|t_integer	|'1'	|NOT NULL	|ZBX_PROXY
 INDEX		|1		|hostid,type
 INDEX		|2		|ip,dns
 
@@ -245,7 +256,7 @@ FIELD		|snmpv3_securitylevel|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
 FIELD		|snmpv3_authpassphrase|t_varchar(64)|''	|NOT NULL	|ZBX_PROXY
 FIELD		|snmpv3_privpassphrase|t_varchar(64)|''	|NOT NULL	|ZBX_PROXY
 FIELD		|formula	|t_varchar(255)	|''	|NOT NULL	|0
-FIELD		|error		|t_varchar(128)	|''	|NOT NULL	|ZBX_NODATA
+FIELD		|error		|t_varchar(2048)|''	|NOT NULL	|ZBX_NODATA
 FIELD		|lastlogsize	|t_bigint	|'0'	|NOT NULL	|ZBX_NODATA
 FIELD		|logtimefmt	|t_varchar(64)	|''	|NOT NULL	|ZBX_PROXY
 FIELD		|templateid	|t_id		|	|NULL		|0			|2|items	|itemid
@@ -368,6 +379,7 @@ FIELD		|def_longdata	|t_shorttext	|''	|NOT NULL	|0
 FIELD		|recovery_msg	|t_integer	|'0'	|NOT NULL	|0
 FIELD		|r_shortdata	|t_varchar(255)	|''	|NOT NULL	|0
 FIELD		|r_longdata	|t_shorttext	|''	|NOT NULL	|0
+FIELD		|formula	|t_varchar(255)	|''	|NOT NULL	|0
 INDEX		|1		|eventsource,status
 UNIQUE		|2		|name
 
@@ -1267,4 +1279,4 @@ INDEX		|1		|itemid
 TABLE|dbversion||
 FIELD		|mandatory	|t_integer	|'0'	|NOT NULL	|
 FIELD		|optional	|t_integer	|'0'	|NOT NULL	|
-ROW		|2030091	|2030091
+ROW		|2030118	|2030118
diff --git a/frontends/php/acknow.php b/frontends/php/acknow.php
index cdf6eb6059d..00e41007d45 100644
--- a/frontends/php/acknow.php
+++ b/frontends/php/acknow.php
@@ -32,8 +32,7 @@ ob_start();
 
 require_once dirname(__FILE__).'/include/page_header.php';
 
-$_REQUEST['go'] = get_request('go', null);
-$bulk = ($_REQUEST['go'] == 'bulkacknowledge');
+$bulk = (getRequest('action', '') == 'trigger.bulkacknowledge');
 
 //	VAR		TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
 $fields = array(
@@ -45,14 +44,14 @@ $fields = array(
 	'message' =>		array(T_ZBX_STR, O_OPT, null,	$bulk ? null : NOT_EMPTY, 'isset({save})||isset({saveandreturn})'),
 	'backurl' =>		array(T_ZBX_STR, O_OPT, null,	null,		null),
 	// actions
-	'go' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, IN('"trigger.bulkacknowledge"'),	null),
 	'saveandreturn' =>	array(T_ZBX_STR, O_OPT, P_ACT|P_SYS, null,	null),
 	'save' =>			array(T_ZBX_STR, O_OPT, P_ACT|P_SYS, null,	null),
 	'cancel' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null)
 );
 check_fields($fields);
 
-$_REQUEST['backurl'] = get_request('backurl', 'tr_status.php');
+$_REQUEST['backurl'] = getRequest('backurl', 'tr_status.php');
 
 /*
  * Redirect
@@ -83,9 +82,9 @@ if (!isset($_REQUEST['events']) && !isset($_REQUEST['eventid']) && !isset($_REQU
 	show_message(_('No events to acknowledge'));
 	require_once dirname(__FILE__).'/include/page_footer.php';
 }
-elseif (get_request('eventid')) {
+elseif (getRequest('eventid')) {
 	$event = API::Event()->get(array(
-		'eventids' => get_request('eventid'),
+		'eventids' => getRequest('eventid'),
 		'output' => array('eventid'),
 		'limit' => 1
 	));
@@ -93,9 +92,9 @@ elseif (get_request('eventid')) {
 		access_deny();
 	}
 }
-elseif (get_request('triggers')) {
+elseif (getRequest('triggers')) {
 	$trigger = API::Trigger()->get(array(
-		'triggerids' => get_request('triggers'),
+		'triggerids' => getRequest('triggers'),
 		'output' => array('triggerid'),
 		'limit' => 1
 	));
@@ -194,7 +193,7 @@ ob_end_flush();
  */
 show_table_header(array(_('ALARM ACKNOWLEDGES').NAME_DELIMITER, ($bulk ? ' BULK ACKNOWLEDGE ' : $eventTriggerName)));
 
-echo SBR;
+echo BR();
 
 if ($bulk) {
 	$title = _('Acknowledge alarm by');
@@ -215,7 +214,7 @@ else {
 		while ($acknowledge = DBfetch($acknowledges)) {
 			$acknowledgesTable->addRow(array(
 				new CCol(getUserFullname($acknowledge), 'user'),
-				new CCol(zbx_date2str(_('d M Y H:i:s'), $acknowledge['clock']), 'time')),
+				new CCol(zbx_date2str(DATE_TIME_FORMAT_SECONDS, $acknowledge['clock']), 'time')),
 				'title'
 			);
 			$acknowledgesTable->addRow(new CCol(zbx_nl2br($acknowledge['message']), null, 2), 'msg');
@@ -238,27 +237,28 @@ else {
 
 $messageTable = new CFormTable($title.' "'.getUserFullname(CWebUser::$data).'"');
 $messageTable->addClass('acknowledge-edit');
-$messageTable->addVar('backurl', $_REQUEST['backurl']);
 
-if (in_array($_REQUEST['backurl'], array('tr_events.php', 'events.php'))) {
-	$messageTable->addVar('eventid', $_REQUEST['eventid']);
-	$messageTable->addVar('triggerid', $_REQUEST['triggerid']);
+$backURL = getRequest('backurl');
+$messageTable->addVar('backurl', $backURL);
+
+if ($backURL === 'tr_events.php' || $backURL === 'events.php') {
+	$messageTable->addVar('triggerid', getRequest('triggerid'));
 	$messageTable->addVar('source', EVENT_SOURCE_TRIGGERS);
 }
-elseif (in_array($_REQUEST['backurl'], array('screenedit.php', 'screens.php'))) {
+elseif ($backURL === 'screenedit.php' || $backURL === 'screens.php') {
 	$messageTable->addVar('screenid', $_REQUEST['screenid']);
 }
 
-if (isset($_REQUEST['eventid'])) {
-	$messageTable->addVar('eventid', $_REQUEST['eventid']);
+if (hasRequest('eventid')) {
+	$messageTable->addVar('eventid', getRequest('eventid'));
 }
-elseif (isset($_REQUEST['triggers'])) {
-	foreach ($_REQUEST['triggers'] as $triggerId) {
+elseif (hasRequest('triggers')) {
+	foreach (getRequest('triggers') as $triggerId) {
 		$messageTable->addVar('triggers['.$triggerId.']', $triggerId);
 	}
 }
-elseif (isset($_REQUEST['events'])) {
-	foreach ($_REQUEST['events'] as $eventId) {
+elseif (hasRequest('events')) {
+	foreach (getRequest('events') as $eventId) {
 		$messageTable->addVar('events['.$eventId.']', $eventId);
 	}
 }
diff --git a/frontends/php/actionconf.php b/frontends/php/actionconf.php
index 3d2758bc522..6c6dae3d19a 100644
--- a/frontends/php/actionconf.php
+++ b/frontends/php/actionconf.php
@@ -40,7 +40,9 @@ $fields = array(
 		null
 	),
 	'evaltype' =>			array(T_ZBX_INT, O_OPT, null,
-		IN(array(CONDITION_EVAL_TYPE_AND_OR, CONDITION_EVAL_TYPE_AND, CONDITION_EVAL_TYPE_OR)), 'isset({save})'),
+		IN(array(CONDITION_EVAL_TYPE_AND_OR, CONDITION_EVAL_TYPE_AND, CONDITION_EVAL_TYPE_OR, CONDITION_EVAL_TYPE_EXPRESSION)),
+		'isset({save})'),
+	'formula' =>			array(T_ZBX_STR, O_OPT, null,   null,		'isset({save})'),
 	'esc_period' =>			array(T_ZBX_INT, O_OPT, null,	BETWEEN(60, 999999), null, _('Default operation step duration')),
 	'status' =>				array(T_ZBX_INT, O_OPT, null,	IN(array(ACTION_STATUS_ENABLED, ACTION_STATUS_DISABLED)), null),
 	'def_shortdata' =>		array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})'),
@@ -57,7 +59,10 @@ $fields = array(
 	'opconditions' =>		array(null,		O_OPT,	null,	null,		null),
 	'new_opcondition' =>	array(null,		O_OPT,	null,	null,		'isset({add_opcondition})'),
 	// actions
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+								IN('"action.massdelete","action.massdisable","action.massenable"'),
+								null
+							),
 	'add_condition' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel_new_condition' => array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null),
 	'add_operation' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -65,11 +70,13 @@ $fields = array(
 	'add_opcondition' =>	array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel_new_opcondition' => array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null),
 	'save' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
-	'clone' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
-	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,	null,		null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,	null,		null),
+	// sort and sortorder
+	'sort' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"name","status"'),						null),
+	'sortorder' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 
 $dataValid = check_fields($fields);
@@ -78,10 +85,6 @@ if ($dataValid && hasRequest('eventsource') && !hasRequest('form')) {
 	CProfile::update('web.actionconf.eventsource', getRequest('eventsource'), PROFILE_TYPE_INT);
 }
 
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
-
-$_REQUEST['go'] = getRequest('go', 'none');
-
 if (isset($_REQUEST['actionid'])) {
 	$actionPermissions = API::Action()->get(array(
 		'output' => array('actionid'),
@@ -96,11 +99,7 @@ if (isset($_REQUEST['actionid'])) {
 /*
  * Actions
  */
-if (isset($_REQUEST['clone']) && isset($_REQUEST['actionid'])) {
-	unset($_REQUEST['actionid']);
-	$_REQUEST['form'] = 'clone';
-}
-elseif (isset($_REQUEST['cancel_new_operation'])) {
+if (isset($_REQUEST['cancel_new_operation'])) {
 	unset($_REQUEST['new_operation']);
 }
 elseif (isset($_REQUEST['cancel_new_opcondition'])) {
@@ -108,17 +107,15 @@ elseif (isset($_REQUEST['cancel_new_opcondition'])) {
 }
 elseif (hasRequest('save')) {
 	$action = array(
-		'name'			=> get_request('name'),
-		'evaltype'		=> get_request('evaltype', 0),
-		'status'		=> get_request('status', ACTION_STATUS_DISABLED),
-		'esc_period'	=> get_request('esc_period', 0),
-		'def_shortdata'	=> get_request('def_shortdata', ''),
-		'def_longdata'	=> get_request('def_longdata', ''),
-		'recovery_msg'	=> get_request('recovery_msg', 0),
-		'r_shortdata'	=> get_request('r_shortdata', ''),
-		'r_longdata'	=> get_request('r_longdata', ''),
-		'conditions'	=> get_request('conditions', array()),
-		'operations'	=> get_request('operations', array())
+		'name' => getRequest('name'),
+		'status' => getRequest('status', ACTION_STATUS_DISABLED),
+		'esc_period' => getRequest('esc_period', 0),
+		'def_shortdata' => getRequest('def_shortdata', ''),
+		'def_longdata' => getRequest('def_longdata', ''),
+		'recovery_msg' => getRequest('recovery_msg', 0),
+		'r_shortdata' => getRequest('r_shortdata', ''),
+		'r_longdata' => getRequest('r_longdata', ''),
+		'operations' => getRequest('operations', array())
 	);
 
 	foreach ($action['operations'] as $num => $operation) {
@@ -127,6 +124,23 @@ elseif (hasRequest('save')) {
 		}
 	}
 
+	$filter = array(
+		'conditions' => getRequest('conditions', array()),
+		'evaltype' => getRequest('evaltype')
+	);
+
+	if ($filter['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+		if (count($filter['conditions']) > 1) {
+			$filter['formula'] = getRequest('formula');
+		}
+		else {
+			// if only one or no conditions are left, reset the evaltype to "and/or" and clear the formula
+			$filter['formula'] = '';
+			$filter['evaltype'] = CONDITION_EVAL_TYPE_AND_OR;
+		}
+	}
+	$action['filter'] = $filter;
+
 	DBstart();
 
 	if (hasRequest('actionid')) {
@@ -156,100 +170,91 @@ elseif (hasRequest('save')) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
 elseif (isset($_REQUEST['delete']) && isset($_REQUEST['actionid'])) {
 	$result = API::Action()->delete(array(getRequest('actionid')));
 
-	show_messages($result, _('Action deleted'), _('Cannot delete action'));
-
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['actionid']);
-		clearCookies($result);
+		uncheckTableRows();
 	}
+	show_messages($result, _('Action deleted'), _('Cannot delete action'));
 }
 elseif (isset($_REQUEST['add_condition']) && isset($_REQUEST['new_condition'])) {
-	try {
-		$newCondition = get_request('new_condition');
+	$newCondition = getRequest('new_condition');
 
-		if ($newCondition) {
-			$conditions = get_request('conditions', array());
+	if ($newCondition) {
+		$conditions = getRequest('conditions', array());
 
-			// when adding new maintenance, in order to check for an existing maintenance, it must have a not null value
-			if ($newCondition['conditiontype'] == CONDITION_TYPE_MAINTENANCE) {
-				$newCondition['value'] = '';
-			}
+		// when adding new maintenance, in order to check for an existing maintenance, it must have a not null value
+		if ($newCondition['conditiontype'] == CONDITION_TYPE_MAINTENANCE) {
+			$newCondition['value'] = '';
+		}
 
-			// check existing conditions and remove duplicate condition values
-			foreach ($conditions as $condition) {
-				if ($newCondition['conditiontype'] == $condition['conditiontype']) {
-					if (is_array($newCondition['value'])) {
-						foreach ($newCondition['value'] as $key => $newValue) {
-							if ($condition['value'] == $newValue) {
-								unset($newCondition['value'][$key]);
-							}
+		// check existing conditions and remove duplicate condition values
+		foreach ($conditions as $condition) {
+			if ($newCondition['conditiontype'] == $condition['conditiontype']) {
+				if (is_array($newCondition['value'])) {
+					foreach ($newCondition['value'] as $key => $newValue) {
+						if ($condition['value'] == $newValue) {
+							unset($newCondition['value'][$key]);
 						}
 					}
-					else {
-						if ($newCondition['value'] == $condition['value']) {
-							$newCondition['value'] = null;
-						}
+				}
+				else {
+					if ($newCondition['value'] == $condition['value']) {
+						$newCondition['value'] = null;
 					}
 				}
 			}
+		}
 
-			$validateConditions = $conditions;
+		$usedFormulaIds = zbx_objectValues($conditions, 'formulaid');
 
-			if (isset($newCondition['value'])) {
-				$newConditionValues = zbx_toArray($newCondition['value']);
-				foreach ($newConditionValues as $newValue) {
-					$condition = $newCondition;
-					$condition['value'] = $newValue;
-					$validateConditions[] = $condition;
-				}
-			}
+		$validateConditions = $conditions;
 
-			if ($validateConditions) {
-				CAction::validateConditions($validateConditions);
+		if (isset($newCondition['value'])) {
+			$newConditionValues = zbx_toArray($newCondition['value']);
+			foreach ($newConditionValues as $newValue) {
+				$condition = $newCondition;
+				$condition['value'] = $newValue;
+				$condition['formulaid'] = CConditionHelper::getNextFormulaId($usedFormulaIds);
+				$usedFormulaIds[] = $condition['formulaid'];
+				$validateConditions[] = $condition;
 			}
-
-			$_REQUEST['conditions'] = $validateConditions;
 		}
-	}
-	catch (APIException $e) {
-		show_error_message(_('Cannot add action condition'));
-		error($e->getMessage());
-	}
-}
-elseif (isset($_REQUEST['add_opcondition']) && isset($_REQUEST['new_opcondition'])) {
-	$new_opcondition = $_REQUEST['new_opcondition'];
 
-	try {
-		CAction::validateOperationConditions($new_opcondition);
-		$new_operation = get_request('new_operation', array());
+		$conditionsValid = true;
+		if ($validateConditions) {
+			$filterConditionValidator = new CActionCondValidator();
+			foreach ($validateConditions as $condition) {
+				if (!$filterConditionValidator->validate($condition)) {
+					$conditionsValid = false;
+					break;
+				}
+			}
+		}
 
-		if (!isset($new_operation['opconditions'])) {
-			$new_operation['opconditions'] = array();
+		if ($conditionsValid) {
+			$_REQUEST['conditions'] = $validateConditions;
 		}
-		if (!str_in_array($new_opcondition, $new_operation['opconditions'])) {
-			array_push($new_operation['opconditions'], $new_opcondition);
+		else {
+			error($filterConditionValidator->getError());
+			show_error_message(_('Cannot add action condition'));
 		}
-
-		$_REQUEST['new_operation'] = $new_operation;
-
-		unset($_REQUEST['new_opcondition']);
-	}
-	catch (APIException $e) {
-		error($e->getMessage());
 	}
 }
 elseif (isset($_REQUEST['add_operation']) && isset($_REQUEST['new_operation'])) {
 	$new_operation = $_REQUEST['new_operation'];
 	$result = true;
 
-	if (API::Action()->validateOperations($new_operation)) {
-		$_REQUEST['operations'] = get_request('operations', array());
+	if (API::Action()->validateOperationsIntegrity($new_operation)) {
+		$_REQUEST['operations'] = getRequest('operations', array());
 
 		$uniqOperations = array(
 			OPERATION_TYPE_HOST_ADD => 0,
@@ -289,7 +294,7 @@ elseif (isset($_REQUEST['add_operation']) && isset($_REQUEST['new_operation']))
 elseif (isset($_REQUEST['edit_operationid'])) {
 	$_REQUEST['edit_operationid'] = array_keys($_REQUEST['edit_operationid']);
 	$edit_operationid = $_REQUEST['edit_operationid'] = array_pop($_REQUEST['edit_operationid']);
-	$_REQUEST['operations'] = get_request('operations', array());
+	$_REQUEST['operations'] = getRequest('operations', array());
 
 	if (isset($_REQUEST['operations'][$edit_operationid])) {
 		$_REQUEST['new_operation'] = $_REQUEST['operations'][$edit_operationid];
@@ -297,9 +302,9 @@ elseif (isset($_REQUEST['edit_operationid'])) {
 		$_REQUEST['new_operation']['action'] = 'update';
 	}
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('g_actionid')) {
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('action.massenable', 'action.massdisable')) && hasRequest('g_actionid')) {
 	$result = true;
-	$enable = (getRequest('go') == 'activate');
+	$enable = (getRequest('action') == 'action.massenable');
 	$status = $enable ? ACTION_STATUS_ENABLED : ACTION_STATUS_DISABLED;
 	$statusName = $enable ? 'enabled' : 'disabled';
 	$actionIds = array();
@@ -310,7 +315,7 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 	$dbActions = DBselect(
 		'SELECT a.actionid'.
 		' FROM actions a'.
-		' WHERE '.dbConditionInt('a.actionid', $_REQUEST['g_actionid'])
+		' WHERE '.dbConditionInt('a.actionid', getRequest('g_actionid'))
 	);
 	while ($row = DBfetch($dbActions)) {
 		$result &= DBexecute(
@@ -336,14 +341,19 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		: _n('Cannot disable action', 'Cannot disable actions', $updated);
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['g_actionid'])) {
-	$goResult = API::Action()->delete($_REQUEST['g_actionid']);
+elseif (hasRequest('action') && getRequest('action') == 'action.massdelete' && hasRequest('g_actionid')) {
+	$result = API::Action()->delete(getRequest('g_actionid'));
 
-	show_messages($goResult, _('Selected actions deleted'), _('Cannot delete selected actions'));
-	clearCookies($goResult);
+	if ($result) {
+		uncheckTableRows();
+	}
+	show_messages($result, _('Selected actions deleted'), _('Cannot delete selected actions'));
 }
 
 /*
@@ -353,10 +363,10 @@ show_messages();
 
 if (hasRequest('form')) {
 	$data = array(
-		'form' => get_request('form'),
-		'actionid' => get_request('actionid'),
-		'new_condition' => get_request('new_condition', array()),
-		'new_operation' => get_request('new_operation', null)
+		'form' => getRequest('form'),
+		'actionid' => getRequest('actionid'),
+		'new_condition' => getRequest('new_condition', array()),
+		'new_operation' => getRequest('new_operation')
 	);
 
 	$action = null;
@@ -364,18 +374,18 @@ if (hasRequest('form')) {
 		$data['action'] = API::Action()->get(array(
 			'actionids' => $data['actionid'],
 			'selectOperations' => API_OUTPUT_EXTEND,
-			'selectConditions' => API_OUTPUT_EXTEND,
+			'selectFilter' => array('formula', 'conditions', 'evaltype'),
 			'output' => API_OUTPUT_EXTEND,
 			'editable' => true
 		));
 		$data['action'] = reset($data['action']);
+
 		$data['eventsource'] = $data['action']['eventsource'];
 	}
 	else {
 		$data['eventsource'] = getRequest('eventsource',
 			CProfile::get('web.actionconf.eventsource', EVENT_SOURCE_TRIGGERS)
 		);
-		$data['evaltype'] = getRequest('evaltype');
 		$data['esc_period'] = getRequest('esc_period');
 	}
 
@@ -383,55 +393,59 @@ if (hasRequest('form')) {
 		sortOperations($data['eventsource'], $data['action']['operations']);
 	}
 	else {
-		$data['action']['name'] = get_request('name');
-		$data['action']['evaltype'] = get_request('evaltype', 0);
-		$data['action']['esc_period'] = get_request('esc_period', SEC_PER_HOUR);
-		$data['action']['status'] = get_request('status', hasRequest('form_refresh') ? 1 : 0);
-		$data['action']['recovery_msg'] = get_request('recovery_msg', 0);
-		$data['action']['conditions'] = get_request('conditions', array());
-		$data['action']['operations'] = get_request('operations', array());
+		$data['action']['name'] = getRequest('name');
+		$data['action']['esc_period'] = getRequest('esc_period', SEC_PER_HOUR);
+		$data['action']['status'] = getRequest('status', hasRequest('form_refresh') ? 1 : 0);
+		$data['action']['recovery_msg'] = getRequest('recovery_msg', 0);
+		$data['action']['operations'] = getRequest('operations', array());
+
+		$data['action']['filter']['evaltype'] = getRequest('evaltype');
+		$data['action']['filter']['formula'] = getRequest('formula');
+		$data['action']['filter']['conditions'] = getRequest('conditions', array());
 
 		sortOperations($data['eventsource'], $data['action']['operations']);
 
 		if ($data['actionid'] && hasRequest('form_refresh')) {
-			$data['action']['def_shortdata'] = get_request('def_shortdata');
-			$data['action']['def_longdata'] = get_request('def_longdata');
+			$data['action']['def_shortdata'] = getRequest('def_shortdata');
+			$data['action']['def_longdata'] = getRequest('def_longdata');
 		}
 		else {
 			if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) {
-				$data['action']['def_shortdata'] = get_request('def_shortdata', ACTION_DEFAULT_SUBJ_TRIGGER);
-				$data['action']['def_longdata'] = get_request('def_longdata', ACTION_DEFAULT_MSG_TRIGGER);
-				$data['action']['r_shortdata'] = get_request('r_shortdata', ACTION_DEFAULT_SUBJ_TRIGGER);
-				$data['action']['r_longdata'] = get_request('r_longdata', ACTION_DEFAULT_MSG_TRIGGER);
+				$data['action']['def_shortdata'] = getRequest('def_shortdata', ACTION_DEFAULT_SUBJ_TRIGGER);
+				$data['action']['def_longdata'] = getRequest('def_longdata', ACTION_DEFAULT_MSG_TRIGGER);
+				$data['action']['r_shortdata'] = getRequest('r_shortdata', ACTION_DEFAULT_SUBJ_TRIGGER);
+				$data['action']['r_longdata'] = getRequest('r_longdata', ACTION_DEFAULT_MSG_TRIGGER);
 			}
 			elseif ($data['eventsource'] == EVENT_SOURCE_DISCOVERY) {
-				$data['action']['def_shortdata'] = get_request('def_shortdata', ACTION_DEFAULT_SUBJ_DISCOVERY);
-				$data['action']['def_longdata'] = get_request('def_longdata', ACTION_DEFAULT_MSG_DISCOVERY);
+				$data['action']['def_shortdata'] = getRequest('def_shortdata', ACTION_DEFAULT_SUBJ_DISCOVERY);
+				$data['action']['def_longdata'] = getRequest('def_longdata', ACTION_DEFAULT_MSG_DISCOVERY);
 			}
 			elseif ($data['eventsource'] == EVENT_SOURCE_AUTO_REGISTRATION) {
-				$data['action']['def_shortdata'] = get_request('def_shortdata', ACTION_DEFAULT_SUBJ_AUTOREG);
-				$data['action']['def_longdata'] = get_request('def_longdata', ACTION_DEFAULT_MSG_AUTOREG);
+				$data['action']['def_shortdata'] = getRequest('def_shortdata', ACTION_DEFAULT_SUBJ_AUTOREG);
+				$data['action']['def_longdata'] = getRequest('def_longdata', ACTION_DEFAULT_MSG_AUTOREG);
 			}
 			else {
-				$data['action']['def_shortdata'] = get_request('def_shortdata');
-				$data['action']['def_longdata'] = get_request('def_longdata');
-				$data['action']['r_shortdata'] = get_request('r_shortdata');
-				$data['action']['r_longdata'] = get_request('r_longdata');
+				$data['action']['def_shortdata'] = getRequest('def_shortdata');
+				$data['action']['def_longdata'] = getRequest('def_longdata');
+				$data['action']['r_shortdata'] = getRequest('r_shortdata');
+				$data['action']['r_longdata'] = getRequest('r_longdata');
 			}
 		}
 	}
 
 	if (!$data['actionid'] && !hasRequest('form_refresh') && $data['eventsource'] == EVENT_SOURCE_TRIGGERS) {
-		$data['action']['conditions'] = array(
-			array(
-				'conditiontype' => CONDITION_TYPE_TRIGGER_VALUE,
-				'operator' => CONDITION_OPERATOR_EQUAL,
-				'value' => TRIGGER_VALUE_TRUE
-			),
+		$data['action']['filter']['conditions'] = array(
 			array(
+				'formulaid' => 'A',
 				'conditiontype' => CONDITION_TYPE_MAINTENANCE,
 				'operator' => CONDITION_OPERATOR_NOT_IN,
 				'value' => ''
+			),
+			array(
+				'formulaid' => 'B',
+				'conditiontype' => CONDITION_TYPE_TRIGGER_VALUE,
+				'operator' => CONDITION_OPERATOR_EQUAL,
+				'value' => TRIGGER_VALUE_TRUE
 			)
 		);
 	}
@@ -439,13 +453,11 @@ if (hasRequest('form')) {
 	$data['allowedConditions'] = get_conditions_by_eventsource($data['eventsource']);
 	$data['allowedOperations'] = get_operations_by_eventsource($data['eventsource']);
 
-	// sort conditions
-	$sortFields = array(
-		array('field' => 'conditiontype', 'order' => ZBX_SORT_DOWN),
-		array('field' => 'operator', 'order' => ZBX_SORT_DOWN),
-		array('field' => 'value', 'order' => ZBX_SORT_DOWN)
-	);
-	CArrayHelper::sort($data['action']['conditions'], $sortFields);
+	if (!hasRequest('add_condition')) {
+		$data['action']['filter']['conditions'] = CConditionHelper::sortConditionsByFormulaId(
+			$data['action']['filter']['conditions']
+		);
+	}
 
 	// new condition
 	$data['new_condition'] = array(
@@ -478,25 +490,31 @@ if (hasRequest('form')) {
 	$actionView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'eventsource' => getRequest('eventsource', CProfile::get('web.actionconf.eventsource', EVENT_SOURCE_TRIGGERS))
+		'eventsource' => getRequest('eventsource', CProfile::get('web.actionconf.eventsource', EVENT_SOURCE_TRIGGERS)),
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	$sortfield = getPageSortField('name');
-
 	$data['actions'] = API::Action()->get(array(
 		'output' => API_OUTPUT_EXTEND,
 		'filter' => array('eventsource' => array($data['eventsource'])),
-		'selectConditions' => API_OUTPUT_EXTEND,
+		'selectFilter' => array('formula', 'conditions', 'evaltype'),
 		'selectOperations' => API_OUTPUT_EXTEND,
 		'editable' => true,
-		'sortfield' => $sortfield,
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit'] + 1
 	));
 
 	// sorting && paging
-	order_result($data['actions'], $sortfield, getPageSortOrder());
-	$data['paging'] = getPagingLine($data['actions'], array('actionid'));
+	order_result($data['actions'], $sortField, $sortOrder);
+	$data['paging'] = getPagingLine($data['actions']);
 
 	// render view
 	$actionView = new CView('configuration.action.list', $data);
diff --git a/frontends/php/adm.gui.php b/frontends/php/adm.gui.php
index 154e990fa13..d7e6bc068b0 100644
--- a/frontends/php/adm.gui.php
+++ b/frontends/php/adm.gui.php
@@ -53,15 +53,15 @@ if (isset($_REQUEST['save'])) {
 	DBstart();
 
 	$configs = array(
-		'default_theme' => get_request('default_theme'),
-		'event_ack_enable' => (is_null(get_request('event_ack_enable')) ? 0 : 1),
-		'event_expire' => get_request('event_expire'),
-		'event_show_max' => get_request('event_show_max'),
-		'dropdown_first_entry' => get_request('dropdown_first_entry'),
-		'dropdown_first_remember' => (is_null(get_request('dropdown_first_remember')) ? 0 : 1),
-		'max_in_table' => get_request('max_in_table'),
-		'search_limit' => get_request('search_limit'),
-		'server_check_interval' => get_request('server_check_interval', 0)
+		'default_theme' => getRequest('default_theme'),
+		'event_ack_enable' => (is_null(getRequest('event_ack_enable')) ? 0 : 1),
+		'event_expire' => getRequest('event_expire'),
+		'event_show_max' => getRequest('event_show_max'),
+		'dropdown_first_entry' => getRequest('dropdown_first_entry'),
+		'dropdown_first_remember' => (is_null(getRequest('dropdown_first_remember')) ? 0 : 1),
+		'max_in_table' => getRequest('max_in_table'),
+		'search_limit' => getRequest('search_limit'),
+		'server_check_interval' => getRequest('server_check_interval', 0)
 	);
 
 	$result = update_config($configs);
@@ -70,14 +70,14 @@ if (isset($_REQUEST['save'])) {
 
 	if ($result) {
 		$msg = array();
-		$msg[] = _s('Default theme "%1$s".', get_request('default_theme'));
-		$msg[] = _s('Event acknowledges "%1$s".', get_request('event_ack_enable'));
-		$msg[] = _s('Show events not older than (in days) "%1$s".', get_request('event_expire'));
-		$msg[] = _s('Show events max "%1$s".', get_request('event_show_max'));
-		$msg[] = _s('Dropdown first entry "%1$s".', get_request('dropdown_first_entry'));
-		$msg[] = _s('Dropdown remember selected "%1$s".', get_request('dropdown_first_remember'));
-		$msg[] = _s('Max count of elements to show inside table cell "%1$s".', get_request('max_in_table'));
-		$msg[] = _s('Zabbix server is running check interval "%1$s".', get_request('server_check_interval'));
+		$msg[] = _s('Default theme "%1$s".', getRequest('default_theme'));
+		$msg[] = _s('Event acknowledges "%1$s".', getRequest('event_ack_enable'));
+		$msg[] = _s('Show events not older than (in days) "%1$s".', getRequest('event_expire'));
+		$msg[] = _s('Show events max "%1$s".', getRequest('event_show_max'));
+		$msg[] = _s('Dropdown first entry "%1$s".', getRequest('dropdown_first_entry'));
+		$msg[] = _s('Dropdown remember selected "%1$s".', getRequest('dropdown_first_remember'));
+		$msg[] = _s('Max count of elements to show inside table cell "%1$s".', getRequest('max_in_table'));
+		$msg[] = _s('Zabbix server is running check interval "%1$s".', getRequest('server_check_interval'));
 
 		add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_ZABBIX_CONFIG, implode('; ', $msg));
 	}
@@ -110,19 +110,19 @@ $cnf_wdgt = new CWidget();
 $cnf_wdgt->addPageHeader(_('CONFIGURATION OF GUI'), $form);
 
 $data = array();
-$data['form_refresh'] = get_request('form_refresh', 0);
+$data['form_refresh'] = getRequest('form_refresh', 0);
 
 if ($data['form_refresh']) {
-	$data['config']['default_theme'] = get_request('default_theme');
-	$data['config']['event_ack_enable'] = get_request('event_ack_enable');
-	$data['config']['dropdown_first_entry'] = get_request('dropdown_first_entry');
-	$data['config']['dropdown_first_remember'] = get_request('dropdown_first_remember');
-	$data['config']['search_limit'] = get_request('search_limit');
-	$data['config']['max_in_table'] = get_request('max_in_table');
-	$data['config']['event_expire'] = get_request('event_expire');
-	$data['config']['event_show_max'] = get_request('event_show_max');
-	$data['config']['server_check_enabled'] = get_request('server_check_enabled');
-	$data['config']['server_check_interval'] = get_request('server_check_interval', 0);
+	$data['config']['default_theme'] = getRequest('default_theme');
+	$data['config']['event_ack_enable'] = getRequest('event_ack_enable');
+	$data['config']['dropdown_first_entry'] = getRequest('dropdown_first_entry');
+	$data['config']['dropdown_first_remember'] = getRequest('dropdown_first_remember');
+	$data['config']['search_limit'] = getRequest('search_limit');
+	$data['config']['max_in_table'] = getRequest('max_in_table');
+	$data['config']['event_expire'] = getRequest('event_expire');
+	$data['config']['event_show_max'] = getRequest('event_show_max');
+	$data['config']['server_check_enabled'] = getRequest('server_check_enabled');
+	$data['config']['server_check_interval'] = getRequest('server_check_interval', 0);
 }
 else {
 	$data['config'] = select_config(false);
diff --git a/frontends/php/adm.iconmapping.php b/frontends/php/adm.iconmapping.php
index 93672f0f0df..0498a642dd4 100644
--- a/frontends/php/adm.iconmapping.php
+++ b/frontends/php/adm.iconmapping.php
@@ -44,7 +44,7 @@ check_fields($fields);
  */
 if (isset($_REQUEST['iconmapid'])) {
 	$iconMap = API::IconMap()->get(array(
-		'iconmapids' => get_request('iconmapid'),
+		'iconmapids' => getRequest('iconmapid'),
 		'output' => API_OUTPUT_EXTEND,
 		'editable' => true,
 		'preservekeys' => true,
@@ -130,15 +130,15 @@ $iconMapWidget = new CWidget();
 $iconMapWidget->addPageHeader(_('CONFIGURATION OF ICON MAPPING'), $iconMapForm);
 
 $data = array(
-	'form_refresh' => get_request('form_refresh', 0),
-	'iconmapid' => get_request('iconmapid'),
+	'form_refresh' => getRequest('form_refresh', 0),
+	'iconmapid' => getRequest('iconmapid'),
 	'iconList' => array(),
 	'inventoryList' => array()
 );
 
 $iconList = API::Image()->get(array(
+	'output' => array('imageid', 'name'),
 	'filter' => array('imagetype' => IMAGE_TYPE_ICON),
-	'output' => API_OUTPUT_EXTEND,
 	'preservekeys' => true
 ));
 order_result($iconList, 'name');
@@ -154,7 +154,7 @@ foreach ($inventoryFields as $field) {
 
 if (isset($_REQUEST['form'])) {
 	if ($data['form_refresh'] || ($_REQUEST['form'] === 'clone')) {
-		$data['iconmap'] = get_request('iconmap');
+		$data['iconmap'] = getRequest('iconmap');
 	}
 	elseif (isset($_REQUEST['iconmapid'])) {
 		$data['iconmap'] = reset($iconMap);
diff --git a/frontends/php/adm.images.php b/frontends/php/adm.images.php
index 90aac4e36b9..41510094b7b 100644
--- a/frontends/php/adm.images.php
+++ b/frontends/php/adm.images.php
@@ -43,7 +43,7 @@ check_fields($fields);
  * Permissions
  */
 if (isset($_REQUEST['imageid'])) {
-	$dbImage = DBfetch(DBselect('SELECT i.imagetype,i.name FROM images i WHERE i.imageid='.zbx_dbstr(get_request('imageid'))));
+	$dbImage = DBfetch(DBselect('SELECT i.imagetype,i.name FROM images i WHERE i.imageid='.zbx_dbstr(getRequest('imageid'))));
 	if (empty($dbImage)) {
 		access_deny();
 	}
@@ -75,15 +75,14 @@ if (isset($_REQUEST['save'])) {
 			}
 		}
 
-		if (isset($_REQUEST['imageid'])) {
+		if (hasRequest('imageid')) {
 			$result = API::Image()->update(array(
-				'imageid' => $_REQUEST['imageid'],
-				'name' => $_REQUEST['name'],
-				'imagetype' => $_REQUEST['imagetype'],
+				'imageid' => getRequest('imageid'),
+				'name' => getRequest('name'),
 				'image' => $image
 			));
 
-			$audit_action = 'Image ['.$_REQUEST['name'].'] updated';
+			$audit_action = 'Image ['.getRequest('name').'] updated';
 		}
 		else {
 			$result = API::Image()->create(array(
@@ -146,14 +145,17 @@ $generalComboBox->addItems(array(
 $form->addItem($generalComboBox);
 
 if (!isset($_REQUEST['form'])) {
-	$form->addItem(new CSubmit('form', _('Create image')));
+	$imageType = getRequest('imagetype', IMAGE_TYPE_ICON);
+
+	$form->addVar('imagetype', $imageType);
+	$form->addItem(new CSubmit('form',  ($imageType == IMAGE_TYPE_ICON) ? _('Create icon') : _('Create background')));
 }
 
 $imageWidget = new CWidget();
 $imageWidget->addPageHeader(_('CONFIGURATION OF IMAGES'), $form);
 
 $data = array(
-	'form' => get_request('form'),
+	'form' => getRequest('form'),
 	'widget' => &$imageWidget
 );
 
@@ -165,14 +167,14 @@ if (!empty($data['form'])) {
 	}
 	else {
 		$data['imageid'] = null;
-		$data['imagename'] = get_request('name', '');
-		$data['imagetype'] = get_request('imagetype', 1);
+		$data['imagename'] = getRequest('name', '');
+		$data['imagetype'] = getRequest('imagetype', IMAGE_TYPE_ICON);
 	}
 
 	$imageForm = new CView('administration.general.image.edit', $data);
 }
 else {
-	$data['imagetype'] = get_request('imagetype', IMAGE_TYPE_ICON);
+	$data['imagetype'] = getRequest('imagetype', IMAGE_TYPE_ICON);
 
 	$data['images'] = API::Image()->get(array(
 		'filter' => array('imagetype' => $data['imagetype']),
diff --git a/frontends/php/adm.macros.php b/frontends/php/adm.macros.php
index 1e27b2bcf2e..c6e521557ec 100644
--- a/frontends/php/adm.macros.php
+++ b/frontends/php/adm.macros.php
@@ -54,7 +54,7 @@ if (isset($_REQUEST['save'])) {
 			'preservekeys' => true
 		));
 
-		$newMacros = get_request('macros', array());
+		$newMacros = getRequest('macros', array());
 
 		// remove empty new macro lines
 		foreach ($newMacros as $number => $newMacro) {
@@ -66,7 +66,7 @@ if (isset($_REQUEST['save'])) {
 		$duplicatedMacros = array();
 		foreach ($newMacros as $number => $newMacro) {
 			// transform macros to uppercase {$aaa} => {$AAA}
-			$newMacros[$number]['macro'] = zbx_strtoupper($newMacro['macro']);
+			$newMacros[$number]['macro'] = mb_strtoupper($newMacro['macro']);
 		}
 
 		// update
@@ -93,7 +93,7 @@ if (isset($_REQUEST['save'])) {
 				throw new Exception(_('Cannot update macro.'));
 			}
 			foreach ($macrosToUpdate as $macro) {
-				add_audit_ext(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_MACRO, $macro['globalmacroid'], $macro['macro'].SPACE.RARR.SPACE.$macro['value'], null, null, null);
+				add_audit_ext(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_MACRO, $macro['globalmacroid'], $macro['macro'].SPACE.'&rArr;'.SPACE.$macro['value'], null, null, null);
 			}
 		}
 
@@ -104,7 +104,7 @@ if (isset($_REQUEST['save'])) {
 				throw new Exception(_('Cannot remove macro.'));
 			}
 			foreach ($globalMacros as $macro) {
-				add_audit_ext(AUDIT_ACTION_DELETE, AUDIT_RESOURCE_MACRO, $macro['globalmacroid'], $macro['macro'].SPACE.RARR.SPACE.$macro['value'], null, null, null);
+				add_audit_ext(AUDIT_ACTION_DELETE, AUDIT_RESOURCE_MACRO, $macro['globalmacroid'], $macro['macro'].SPACE.'&rArr;'.SPACE.$macro['value'], null, null, null);
 			}
 		}
 
@@ -125,7 +125,7 @@ if (isset($_REQUEST['save'])) {
 				'output' => API_OUTPUT_EXTEND
 			));
 			foreach ($newMacrosCreated as $macro) {
-				add_audit_ext(AUDIT_ACTION_ADD, AUDIT_RESOURCE_MACRO, $macro['globalmacroid'], $macro['macro'].SPACE.RARR.SPACE.$macro['value'], null, null, null);
+				add_audit_ext(AUDIT_ACTION_ADD, AUDIT_RESOURCE_MACRO, $macro['globalmacroid'], $macro['macro'].SPACE.'&rArr;'.SPACE.$macro['value'], null, null, null);
 			}
 		}
 
@@ -173,11 +173,11 @@ $cnf_wdgt = new CWidget();
 $cnf_wdgt->addPageHeader(_('CONFIGURATION OF MACROS'), $form);
 
 $data = array();
-$data['form_refresh'] = get_request('form_refresh', 0);
+$data['form_refresh'] = getRequest('form_refresh', 0);
 $data['macros'] = array();
 
 if ($data['form_refresh']) {
-	$data['macros'] = get_request('macros', array());
+	$data['macros'] = getRequest('macros', array());
 }
 else {
 	$data['macros'] = API::UserMacro()->get(array(
diff --git a/frontends/php/adm.other.php b/frontends/php/adm.other.php
index fef7aaceed3..8afe52c55e2 100644
--- a/frontends/php/adm.other.php
+++ b/frontends/php/adm.other.php
@@ -48,21 +48,21 @@ if (isset($_REQUEST['save'])) {
 	$orig_config = select_config(false);
 
 	$configs = array(
-		'refresh_unsupported' => get_request('refresh_unsupported'),
-		'alert_usrgrpid' => get_request('alert_usrgrpid'),
-		'discovery_groupid' => get_request('discovery_groupid'),
-		'snmptrap_logging' => get_request('snmptrap_logging') ? 1 : 0
+		'refresh_unsupported' => getRequest('refresh_unsupported'),
+		'alert_usrgrpid' => getRequest('alert_usrgrpid'),
+		'discovery_groupid' => getRequest('discovery_groupid'),
+		'snmptrap_logging' => getRequest('snmptrap_logging') ? 1 : 0
 	);
 	$result = update_config($configs);
 
 	if ($result) {
 		$audit = array(
-			_s('Refresh unsupported items (in sec) "%1$s".', get_request('refresh_unsupported'))
+			_s('Refresh unsupported items (in sec) "%1$s".', getRequest('refresh_unsupported'))
 		);
 
 		if (hasRequest('discovery_groupid')) {
 			$hostGroup = API::HostGroup()->get(array(
-				'groupids' => get_request('discovery_groupid'),
+				'groupids' => getRequest('discovery_groupid'),
 				'editable' => true,
 				'output' => array('groupid', 'name')
 			));
@@ -79,7 +79,7 @@ if (isset($_REQUEST['save'])) {
 		}
 
 		if (hasRequest('alert_usrgrpid')) {
-			$userGroupId = get_request('alert_usrgrpid');
+			$userGroupId = getRequest('alert_usrgrpid');
 
 			if ($userGroupId) {
 				$userGroupName = DBfetch(DBselect('SELECT u.name FROM usrgrp u WHERE u.usrgrpid='.zbx_dbstr($userGroupId)));
@@ -124,13 +124,13 @@ $cnf_wdgt = new CWidget();
 $cnf_wdgt->addPageHeader(_('OTHER CONFIGURATION PARAMETERS'), $form);
 
 $data = array();
-$data['form_refresh'] = get_request('form_refresh', 0);
+$data['form_refresh'] = getRequest('form_refresh', 0);
 
 if ($data['form_refresh']) {
-	$data['config']['discovery_groupid'] = get_request('discovery_groupid');
-	$data['config']['alert_usrgrpid'] = get_request('alert_usrgrpid');
-	$data['config']['refresh_unsupported'] = get_request('refresh_unsupported');
-	$data['config']['snmptrap_logging'] = get_request('snmptrap_logging');
+	$data['config']['discovery_groupid'] = getRequest('discovery_groupid');
+	$data['config']['alert_usrgrpid'] = getRequest('alert_usrgrpid');
+	$data['config']['refresh_unsupported'] = getRequest('refresh_unsupported');
+	$data['config']['snmptrap_logging'] = getRequest('snmptrap_logging');
 }
 else {
 	$data['config'] = select_config(false);
diff --git a/frontends/php/adm.regexps.php b/frontends/php/adm.regexps.php
index 4046dd66bd1..5c8bf574acc 100644
--- a/frontends/php/adm.regexps.php
+++ b/frontends/php/adm.regexps.php
@@ -35,18 +35,17 @@ $fields = array(
 	'regexpids' =>				array(T_ZBX_INT, O_OPT, P_SYS,		DB_ID,	null),
 	'regexpid' =>				array(T_ZBX_INT, O_OPT, P_SYS,		DB_ID,	'isset({form})&&{form}=="update"'),
 	'name' =>					array(T_ZBX_STR, O_OPT, null,		NOT_EMPTY, 'isset({save})', _('Name')),
-	'test_string' =>			array(T_ZBX_STR, O_OPT, null,		null,	'isset({save})', _('Test string')),
-	'expressions' =>			array(T_ZBX_STR, O_OPT, null,		null,	'isset({save})'),
+	'test_string' =>			array(T_ZBX_STR, O_OPT, P_NO_TRIM,		null,	'isset({save})', _('Test string')),
+	'expressions' =>			array(T_ZBX_STR, O_OPT, P_NO_TRIM,		null,	'isset({save})'),
 	'save' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
-	'delete' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
-	'clone' =>					array(T_ZBX_STR, O_OPT, null,		null,	null),
-	'go' =>						array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	// actions
+	'action' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, IN('"regexp.massdelete"'),	null),
 	'form' =>					array(T_ZBX_STR, O_OPT, P_SYS,		null,	null),
 	'form_refresh' =>			array(T_ZBX_INT, O_OPT, null,		null,	null),
 	// ajax
 	'output' =>					array(T_ZBX_STR, O_OPT, P_ACT,		null,	null),
 	'ajaxaction' =>				array(T_ZBX_STR, O_OPT, P_ACT,		null,	null),
-	'ajaxdata' =>				array(T_ZBX_STR, O_OPT, P_ACT,		null,	null)
+	'ajaxdata' =>				array(T_ZBX_STR, O_OPT, P_ACT|P_NO_TRIM,		null,	null)
 );
 check_fields($fields);
 
@@ -54,20 +53,33 @@ check_fields($fields);
  * Ajax
  */
 if (isset($_REQUEST['output']) && $_REQUEST['output'] == 'ajax') {
-	$ajaxResponse = new AjaxResponse;
-	$ajaxData = get_request('ajaxdata', array());
+	$ajaxResponse = new CAjaxResponse;
+	$ajaxData = getRequest('ajaxdata', array());
 
 	if (isset($_REQUEST['ajaxaction']) && $_REQUEST['ajaxaction'] == 'test') {
 		$result = array(
 			'expressions' => array(),
+			'errors' => array(),
 			'final' => true
 		);
-		$testString = $ajaxData['testString'];
+
+		$validator = new CRegexValidator(array(
+			'messageInvalid' => _('Regular expression must be a string'),
+			'messageRegex' => _('Incorrect regular expression "%1$s": "%2$s"')
+		));
 
 		foreach ($ajaxData['expressions'] as $id => $expression) {
-			$match = GlobalRegExp::matchExpression($expression, $testString);
+			if (!in_array($expression['expression_type'], array(EXPRESSION_TYPE_FALSE, EXPRESSION_TYPE_TRUE)) ||
+				$validator->validate($expression['expression'])
+			) {
+				$match = CGlobalRegexp::matchExpression($expression, $ajaxData['testString']);
+
+				$result['expressions'][$id] = $match;
+			} else {
+				$match = false;
+				$result['errors'][$id] = $validator->getError();
+			}
 
-			$result['expressions'][$id] = $match;
 			$result['final'] = $result['final'] && $match;
 		}
 
@@ -84,20 +96,20 @@ if (isset($_REQUEST['output']) && $_REQUEST['output'] == 'ajax') {
  * Permissions
  */
 if (isset($_REQUEST['regexpid'])) {
-	$regExp = DBfetch(DBSelect('SELECT re.regexpid FROM regexps re WHERE re.regexpid='.zbx_dbstr(get_request('regexpid'))));
+	$regExp = DBfetch(DBSelect('SELECT re.regexpid FROM regexps re WHERE re.regexpid='.zbx_dbstr(getRequest('regexpid'))));
 	if (empty($regExp)) {
 		access_deny();
 	}
 }
-if (isset($_REQUEST['go']) && !isset($_REQUEST['regexpid'])) {
-	if (!isset($_REQUEST['regexpids']) || !is_array($_REQUEST['regexpids'])) {
+if (hasRequest('action') && !hasRequest('regexpid')) {
+	if (!hasRequest('regexpids') || !is_array(getRequest('regexpids'))) {
 		access_deny();
 	}
 	else {
 		$regExpChk = DBfetch(DBSelect(
-			'SELECT COUNT(*) AS cnt FROM regexps re WHERE '.dbConditionInt('re.regexpid', $_REQUEST['regexpids'])
+			'SELECT COUNT(*) AS cnt FROM regexps re WHERE '.dbConditionInt('re.regexpid', getRequest('regexpids'))
 		));
-		if ($regExpChk['cnt'] != count($_REQUEST['regexpids'])) {
+		if ($regExpChk['cnt'] != count(getRequest('regexpids'))) {
 			access_deny();
 		}
 	}
@@ -106,16 +118,12 @@ if (isset($_REQUEST['go']) && !isset($_REQUEST['regexpid'])) {
 /*
  * Actions
  */
-if (isset($_REQUEST['clone']) && isset($_REQUEST['regexpid'])) {
-	unset($_REQUEST['regexpid']);
-	$_REQUEST['form'] = 'clone';
-}
-elseif (isset($_REQUEST['save'])) {
+if (isset($_REQUEST['save'])) {
 	$regExp = array(
 		'name' => $_REQUEST['name'],
 		'test_string' => $_REQUEST['test_string']
 	);
-	$expressions = get_request('expressions', array());
+	$expressions = getRequest('expressions', array());
 
 	DBstart();
 
@@ -141,47 +149,47 @@ elseif (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
-elseif (isset($_REQUEST['go'])) {
-	if ($_REQUEST['go'] == 'delete') {
-		$regExpIds = get_request('regexpid', array());
+elseif (hasRequest('action') && getRequest('action') == 'regexp.massdelete') {
+	$regExpIds = getRequest('regexpids', getRequest('regexpid', array()));
 
-		if (isset($_REQUEST['regexpids'])) {
-			$regExpIds = $_REQUEST['regexpids'];
-		}
+	zbx_value2array($regExpIds);
 
-		zbx_value2array($regExpIds);
+	$regExps = array();
+	foreach ($regExpIds as $regExpId) {
+		$regExps[$regExpId] = getRegexp($regExpId);
+	}
 
-		$regExps = array();
-		foreach ($regExpIds as $regExpId) {
-			$regExps[$regExpId] = getRegexp($regExpId);
-		}
+	DBstart();
 
-		DBstart();
+	$result = DBexecute('DELETE FROM regexps WHERE '.dbConditionInt('regexpid', $regExpIds));
 
-		$result = DBexecute('DELETE FROM regexps WHERE '.dbConditionInt('regexpid', $regExpIds));
+	$regExpCount = count($regExpIds);
 
-		$regExpCount = count($regExpIds);
+	if ($result) {
+		foreach ($regExps as $regExpId => $regExp) {
+			add_audit(AUDIT_ACTION_DELETE, AUDIT_RESOURCE_REGEXP,
+				'Id ['.$regExpId.'] '._('Name').' ['.$regExp['name'].']'
+			);
+		}
 
-		if ($result) {
-			foreach ($regExps as $regExpId => $regExp) {
-				add_audit(AUDIT_ACTION_DELETE, AUDIT_RESOURCE_REGEXP,
-					'Id ['.$regExpId.'] '._('Name').' ['.$regExp['name'].']'
-				);
-			}
+		unset($_REQUEST['form'], $_REQUEST['regexpid']);
+	}
 
-			unset($_REQUEST['form'], $_REQUEST['regexpid']);
-		}
+	$result = DBend($result);
 
-		$result = DBend($result);
-		show_messages($result,
-			_n('Regular expression deleted', 'Regular expressions deleted', $regExpCount),
-			_n('Cannot delete regular expression', 'Cannot delete regular expressions', $regExpCount)
-		);
-		clearCookies($result);
+	if ($result) {
+		uncheckTableRows();
 	}
+	show_messages($result,
+		_n('Regular expression deleted', 'Regular expressions deleted', $regExpCount),
+		_n('Cannot delete regular expression', 'Cannot delete regular expressions', $regExpCount)
+	);
 }
 
 /*
@@ -213,8 +221,8 @@ $regExpWidget->addPageHeader(_('CONFIGURATION OF REGULAR EXPRESSIONS'), $regExpF
 
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'form_refresh' => get_request('form_refresh'),
-		'regexpid' => get_request('regexpid')
+		'form_refresh' => getRequest('form_refresh'),
+		'regexpid' => getRequest('regexpid')
 	);
 
 	if (isset($_REQUEST['regexpid']) && !isset($_REQUEST['form_refresh'])) {
@@ -236,9 +244,9 @@ if (isset($_REQUEST['form'])) {
 		$data['expressions'] = DBfetchArray($dbExpressions);
 	}
 	else {
-		$data['name'] = get_request('name', '');
-		$data['test_string'] = get_request('test_string', '');
-		$data['expressions'] = get_request('expressions', array());
+		$data['name'] = getRequest('name', '');
+		$data['test_string'] = getRequest('test_string', '');
+		$data['expressions'] = getRequest('expressions', array());
 	}
 
 	$regExpForm = new CView('administration.general.regularexpressions.edit', $data);
diff --git a/frontends/php/adm.triggerdisplayoptions.php b/frontends/php/adm.triggerdisplayoptions.php
index 0e325b5473e..ae920f09865 100644
--- a/frontends/php/adm.triggerdisplayoptions.php
+++ b/frontends/php/adm.triggerdisplayoptions.php
@@ -49,16 +49,16 @@ check_fields($fields);
 
 if (isset($_REQUEST['save'])) {
 	$configs = array(
-		'ok_period' => get_request('ok_period'),
-		'blink_period' => get_request('blink_period'),
-		'problem_unack_color' => get_request('problem_unack_color'),
-		'problem_ack_color' => get_request('problem_ack_color'),
-		'ok_unack_color' => get_request('ok_unack_color'),
-		'ok_ack_color' => get_request('ok_ack_color'),
-		'problem_unack_style' => get_request('problem_unack_style', 0),
-		'problem_ack_style' => get_request('problem_ack_style', 0),
-		'ok_unack_style' => get_request('ok_unack_style', 0),
-		'ok_ack_style' => get_request('ok_ack_style', 0)
+		'ok_period' => getRequest('ok_period'),
+		'blink_period' => getRequest('blink_period'),
+		'problem_unack_color' => getRequest('problem_unack_color'),
+		'problem_ack_color' => getRequest('problem_ack_color'),
+		'ok_unack_color' => getRequest('ok_unack_color'),
+		'ok_ack_color' => getRequest('ok_ack_color'),
+		'problem_unack_style' => getRequest('problem_unack_style', 0),
+		'problem_ack_style' => getRequest('problem_ack_style', 0),
+		'ok_unack_style' => getRequest('ok_unack_style', 0),
+		'ok_ack_style' => getRequest('ok_ack_style', 0)
 	);
 
 	DBstart();
@@ -91,20 +91,20 @@ $cnf_wdgt = new CWidget();
 $cnf_wdgt->addPageHeader(_('CONFIGURATION OF ZABBIX'), $form);
 
 $data = array();
-$data['form_refresh'] = get_request('form_refresh', 0);
+$data['form_refresh'] = getRequest('form_refresh', 0);
 
 // form has been submitted
 if ($data['form_refresh']) {
-	$data['ok_period'] = get_request('ok_period');
-	$data['blink_period'] = get_request('blink_period');
-	$data['problem_unack_color'] = get_request('problem_unack_color');
-	$data['problem_ack_color'] = get_request('problem_ack_color');
-	$data['ok_unack_color'] = get_request('ok_unack_color');
-	$data['ok_ack_color'] = get_request('ok_ack_color');
-	$data['problem_unack_style'] = get_request('problem_unack_style');
-	$data['problem_ack_style'] = get_request('problem_ack_style');
-	$data['ok_unack_style'] = get_request('ok_unack_style');
-	$data['ok_ack_style'] = get_request('ok_ack_style');
+	$data['ok_period'] = getRequest('ok_period');
+	$data['blink_period'] = getRequest('blink_period');
+	$data['problem_unack_color'] = getRequest('problem_unack_color');
+	$data['problem_ack_color'] = getRequest('problem_ack_color');
+	$data['ok_unack_color'] = getRequest('ok_unack_color');
+	$data['ok_ack_color'] = getRequest('ok_ack_color');
+	$data['problem_unack_style'] = getRequest('problem_unack_style');
+	$data['problem_ack_style'] = getRequest('problem_ack_style');
+	$data['ok_unack_style'] = getRequest('ok_unack_style');
+	$data['ok_ack_style'] = getRequest('ok_ack_style');
 }
 else {
 	$config = select_config(false);
diff --git a/frontends/php/adm.triggerseverities.php b/frontends/php/adm.triggerseverities.php
index 472bc8ca746..4f8774fdd88 100644
--- a/frontends/php/adm.triggerseverities.php
+++ b/frontends/php/adm.triggerseverities.php
@@ -51,18 +51,18 @@ check_fields($fields);
  */
 if (isset($_REQUEST['save'])) {
 	$configs = array(
-		'severity_name_0' => get_request('severity_name_0', _('Not classified')),
-		'severity_color_0' => get_request('severity_color_0', ''),
-		'severity_name_1' => get_request('severity_name_1', _('Information')),
-		'severity_color_1' => get_request('severity_color_1', ''),
-		'severity_name_2' => get_request('severity_name_2', _('Warning')),
-		'severity_color_2' => get_request('severity_color_2', ''),
-		'severity_name_3' => get_request('severity_name_3', _('Average')),
-		'severity_color_3' => get_request('severity_color_3', ''),
-		'severity_name_4' => get_request('severity_name_4', _('High')),
-		'severity_color_4' => get_request('severity_color_4', ''),
-		'severity_name_5' => get_request('severity_name_5', _('Disaster')),
-		'severity_color_5' => get_request('severity_color_5', '')
+		'severity_name_0' => getRequest('severity_name_0', _('Not classified')),
+		'severity_color_0' => getRequest('severity_color_0', ''),
+		'severity_name_1' => getRequest('severity_name_1', _('Information')),
+		'severity_color_1' => getRequest('severity_color_1', ''),
+		'severity_name_2' => getRequest('severity_name_2', _('Warning')),
+		'severity_color_2' => getRequest('severity_color_2', ''),
+		'severity_name_3' => getRequest('severity_name_3', _('Average')),
+		'severity_color_3' => getRequest('severity_color_3', ''),
+		'severity_name_4' => getRequest('severity_name_4', _('High')),
+		'severity_color_4' => getRequest('severity_color_4', ''),
+		'severity_name_5' => getRequest('severity_name_5', _('Disaster')),
+		'severity_color_5' => getRequest('severity_color_5', '')
 	);
 
 	DBstart();
@@ -96,21 +96,21 @@ $cnf_wdgt = new CWidget();
 $cnf_wdgt->addPageHeader(_('CONFIGURATION OF TRIGGER SEVERITIES'), $form);
 
 $data = array();
-$data['form_refresh'] = get_request('form_refresh', 0);
+$data['form_refresh'] = getRequest('form_refresh', 0);
 
 if ($data['form_refresh']) {
-	$data['config']['severity_name_0'] = get_request('severity_name_0');
-	$data['config']['severity_color_0'] = get_request('severity_color_0', '');
-	$data['config']['severity_name_1'] = get_request('severity_name_1');
-	$data['config']['severity_color_1'] = get_request('severity_color_1', '');
-	$data['config']['severity_name_2'] = get_request('severity_name_2');
-	$data['config']['severity_color_2'] = get_request('severity_color_2', '');
-	$data['config']['severity_name_3'] = get_request('severity_name_3');
-	$data['config']['severity_color_3'] = get_request('severity_color_3', '');
-	$data['config']['severity_name_4'] = get_request('severity_name_4');
-	$data['config']['severity_color_4'] = get_request('severity_color_4', '');
-	$data['config']['severity_name_5'] = get_request('severity_name_5');
-	$data['config']['severity_color_5'] = get_request('severity_color_5', '');
+	$data['config']['severity_name_0'] = getRequest('severity_name_0');
+	$data['config']['severity_color_0'] = getRequest('severity_color_0', '');
+	$data['config']['severity_name_1'] = getRequest('severity_name_1');
+	$data['config']['severity_color_1'] = getRequest('severity_color_1', '');
+	$data['config']['severity_name_2'] = getRequest('severity_name_2');
+	$data['config']['severity_color_2'] = getRequest('severity_color_2', '');
+	$data['config']['severity_name_3'] = getRequest('severity_name_3');
+	$data['config']['severity_color_3'] = getRequest('severity_color_3', '');
+	$data['config']['severity_name_4'] = getRequest('severity_name_4');
+	$data['config']['severity_color_4'] = getRequest('severity_color_4', '');
+	$data['config']['severity_name_5'] = getRequest('severity_name_5');
+	$data['config']['severity_color_5'] = getRequest('severity_color_5', '');
 }
 else {
 	$data['config'] = select_config(false);
diff --git a/frontends/php/adm.valuemapping.php b/frontends/php/adm.valuemapping.php
index a7185470021..066e1526703 100644
--- a/frontends/php/adm.valuemapping.php
+++ b/frontends/php/adm.valuemapping.php
@@ -43,7 +43,7 @@ check_fields($fields);
  * Permissions
  */
 if (isset($_REQUEST['valuemapid'])) {
-	$dbValueMap = DBfetch(DBselect('SELECT v.name FROM valuemaps v WHERE v.valuemapid='.zbx_dbstr(get_request('valuemapid'))));
+	$dbValueMap = DBfetch(DBselect('SELECT v.name FROM valuemaps v WHERE v.valuemapid='.zbx_dbstr(getRequest('valuemapid'))));
 	if (empty($dbValueMap)) {
 		access_deny();
 	}
@@ -56,15 +56,15 @@ try {
 	if (isset($_REQUEST['save'])) {
 		DBstart();
 
-		$valueMap = array('name' => get_request('mapname'));
-		$mappings = get_request('mappings', array());
+		$valueMap = array('name' => getRequest('mapname'));
+		$mappings = getRequest('mappings', array());
 
 		if (isset($_REQUEST['valuemapid'])) {
 			$messageSuccess = _('Value map updated');
 			$messageFailed = _('Cannot update value map');
 			$auditAction = AUDIT_ACTION_UPDATE;
 
-			$valueMap['valuemapid'] = get_request('valuemapid');
+			$valueMap['valuemapid'] = getRequest('valuemapid');
 			$result = updateValueMap($valueMap, $mappings);
 		}
 		else {
@@ -148,14 +148,14 @@ $valueMapWidget->addPageHeader(_('CONFIGURATION OF VALUE MAPPING'), $valueMapFor
 
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'form' => get_request('form', 1),
-		'form_refresh' => get_request('form_refresh', 0),
-		'valuemapid' => get_request('valuemapid'),
+		'form' => getRequest('form', 1),
+		'form_refresh' => getRequest('form_refresh', 0),
+		'valuemapid' => getRequest('valuemapid'),
 		'mappings' => array(),
 		'mapname' => '',
 		'confirmMessage' => null,
-		'add_value' => get_request('add_value'),
-		'add_newvalue' => get_request('add_newvalue')
+		'add_value' => getRequest('add_value'),
+		'add_newvalue' => getRequest('add_newvalue')
 	);
 
 	if (isset($data['valuemapid'])) {
@@ -167,8 +167,8 @@ if (isset($_REQUEST['form'])) {
 			));
 		}
 		else {
-			$data['mapname'] = get_request('mapname', '');
-			$data['mappings'] = get_request('mappings', array());
+			$data['mapname'] = getRequest('mapname', '');
+			$data['mappings'] = getRequest('mappings', array());
 		}
 
 		$valueMapCount = DBfetch(DBselect(
@@ -182,8 +182,8 @@ if (isset($_REQUEST['form'])) {
 	}
 
 	if (empty($data['valuemapid']) && !empty($data['form_refresh'])) {
-		$data['mapname'] = get_request('mapname', '');
-		$data['mappings'] = get_request('mappings', array());
+		$data['mapname'] = getRequest('mapname', '');
+		$data['mappings'] = getRequest('mappings', array());
 	}
 
 	order_result($data['mappings'], 'value');
diff --git a/frontends/php/adm.workingtime.php b/frontends/php/adm.workingtime.php
index 639fba9cfd7..4582bc80438 100644
--- a/frontends/php/adm.workingtime.php
+++ b/frontends/php/adm.workingtime.php
@@ -77,10 +77,10 @@ $cnf_wdgt = new CWidget();
 $cnf_wdgt->addPageHeader(_('CONFIGURATION OF WORKING TIME'), $form);
 
 $data = array();
-$data['form_refresh'] = get_request('form_refresh', 0);
+$data['form_refresh'] = getRequest('form_refresh', 0);
 
 if ($data['form_refresh']) {
-	$data['config']['work_period'] = get_request('work_period');
+	$data['config']['work_period'] = getRequest('work_period');
 }
 else {
 	$data['config'] = select_config(false);
diff --git a/frontends/php/api/.htaccess b/frontends/php/api/.htaccess
deleted file mode 100644
index 2509de4fcf4..00000000000
--- a/frontends/php/api/.htaccess
+++ /dev/null
@@ -1,10 +0,0 @@
-<IfModule mod_authz_core.c>
-	# Apache 2.4
-	Require all denied
-</IfModule>
-
-<IfModule !mod_authz_core.c>
-	# Apache 2.2
-	Order deny,allow
-	Deny from all
-</IfModule>
diff --git a/frontends/php/api_jsonrpc.php b/frontends/php/api_jsonrpc.php
index 1b0401f8309..78bdab6d9ed 100644
--- a/frontends/php/api_jsonrpc.php
+++ b/frontends/php/api_jsonrpc.php
@@ -19,25 +19,33 @@
 **/
 
 
+header('Access-Control-Allow-Origin: *');
+header('Access-Control-Allow-Headers: Content-Type');
+header('Access-Control-Allow-Methods: POST');
+header('Access-Control-Max-Age: 1000');
+
+if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
+	return;
+}
+
 require_once dirname(__FILE__).'/include/func.inc.php';
-require_once dirname(__FILE__).'/include/classes/class.chttp_request.php';
+require_once dirname(__FILE__).'/include/classes/core/CHttpRequest.php';
 
 $allowed_content = array(
 	'application/json-rpc' => 'json-rpc',
 	'application/json' => 'json-rpc',
 	'application/jsonrequest' => 'json-rpc',
 );
-$http_request = new CHTTP_request();
+$http_request = new CHttpRequest();
 $content_type = $http_request->header('Content-Type');
 $content_type = explode(';', $content_type);
 $content_type = $content_type[0];
 
 if (!isset($allowed_content[$content_type])) {
 	header('HTTP/1.0 412 Precondition Failed');
-	exit;
+	return;
 }
 
-
 require_once dirname(__FILE__).'/include/classes/core/Z.php';
 
 header('Content-Type: application/json');
@@ -51,7 +59,7 @@ try {
 	// unset wrappers so that calls between methods would be made directly to the services
 	API::setWrapper();
 
-	$jsonRpc = new CJSONrpc($apiClient, $data);
+	$jsonRpc = new CJsonRpc($apiClient, $data);
 	echo $jsonRpc->execute();
 }
 catch (Exception $e) {
@@ -69,4 +77,3 @@ catch (Exception $e) {
 
 	echo CJs::encodeJson($response);
 }
-
diff --git a/frontends/php/applications.php b/frontends/php/applications.php
index 3b0f7f0d25a..c67863657b8 100644
--- a/frontends/php/applications.php
+++ b/frontends/php/applications.php
@@ -37,15 +37,20 @@ $fields = array(
 	'applicationid' =>		array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,			'isset({form})&&{form}=="update"'),
 	'appname' =>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,		'isset({save})', _('Name')),
 	// actions
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+								IN('"application.massdelete","application.massdisable","application.massenable"'),
+								null
+							),
 	'save' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 	'clone' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 	'form' =>				array(T_ZBX_STR, O_OPT, P_SYS,			null,	null),
-	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,			null,	null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,			null,	null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"name"'),								null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
 /*
  * Permissions
@@ -59,27 +64,26 @@ if (isset($_REQUEST['applicationid'])) {
 		access_deny();
 	}
 }
-if (isset($_REQUEST['go'])) {
-	if (!isset($_REQUEST['applications']) || !is_array($_REQUEST['applications'])) {
+if (hasRequest('action')) {
+	if (!hasRequest('applications') || !is_array(getRequest('applications'))) {
 		access_deny();
 	}
 	else {
 		$dbApplications = API::Application()->get(array(
-			'applicationids' => $_REQUEST['applications'],
+			'applicationids' => getRequest('applications'),
 			'countOutput' => true
 		));
-		if ($dbApplications != count($_REQUEST['applications'])) {
+		if ($dbApplications != count(getRequest('applications'))) {
 			access_deny();
 		}
 	}
 }
-if (get_request('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
+if (getRequest('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
 	access_deny();
 }
-if (get_request('hostid') && !API::Host()->isWritable(array($_REQUEST['hostid']))) {
+if (getRequest('hostid') && !API::Host()->isWritable(array($_REQUEST['hostid']))) {
 	access_deny();
 }
-$_REQUEST['go'] = get_request('go', 'none');
 
 /*
  * Actions
@@ -115,12 +119,15 @@ if (isset($_REQUEST['save'])) {
 			_('Application').' ['.$_REQUEST['appname'].'] ['.$applicationId.']'
 		);
 		unset($_REQUEST['form']);
-		clearCookies($dbApplications, $_REQUEST['hostid']);
 	}
 
 	unset($_REQUEST['save']);
 
 	$result = DBend($dbApplications);
+
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
 }
 elseif (isset($_REQUEST['clone']) && isset($_REQUEST['applicationid'])) {
@@ -148,13 +155,16 @@ elseif (isset($_REQUEST['delete'])) {
 		unset($_REQUEST['form'], $_REQUEST['applicationid']);
 
 		$result = DBend($result);
+
+		if ($result) {
+			uncheckTableRows(getRequest('hostid'));
+		}
 		show_messages($result, _('Application deleted'), _('Cannot delete application'));
-		clearCookies($result, $_REQUEST['hostid']);
 	}
 }
-elseif ($_REQUEST['go'] == 'delete') {
+elseif (hasRequest('action') && getRequest('action') == 'application.massdelete' && hasRequest('applications')) {
 	$result = true;
-	$applications = get_request('applications', array());
+	$applications = getRequest('applications');
 	$deleted = 0;
 
 	DBstart();
@@ -183,17 +193,20 @@ elseif ($_REQUEST['go'] == 'delete') {
 		$deleted++;
 	}
 
-	$messageSuccess = _n('Application deleted', 'Applications deleted', $deleted);
-	$messageFailed = _n('Cannot delete application', 'Cannot delete applications', $deleted);
-
 	$result = DBend($result);
-	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, $_REQUEST['hostid']);
+
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
+	show_messages($result,
+		_n('Application deleted', 'Applications deleted', $deleted),
+		_n('Cannot delete application', 'Cannot delete applications', $deleted)
+	);
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('application.massenable', 'application.massdisable')) && hasRequest('applications')) {
 	$result = true;
 	$hostId = getRequest('hostid');
-	$enable = (getRequest('go') == 'activate');
+	$enable = (getRequest('action') == 'application.massenable');
 	$updated = 0;
 
 	DBstart();
@@ -222,8 +235,10 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
 		? _n('Cannot enable item', 'Cannot enable items', $updated)
 		: _n('Cannot disable item', 'Cannot disable items', $updated);
 
+	if ($result) {
+		uncheckTableRows($hostId);
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, $hostId);
 }
 
 /*
@@ -231,10 +246,10 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
  */
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'applicationid' => get_request('applicationid'),
-		'groupid' => get_request('groupid', 0),
-		'form' => get_request('form'),
-		'form_refresh' => get_request('form_refresh', 0)
+		'applicationid' => getRequest('applicationid'),
+		'groupid' => getRequest('groupid', 0),
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh', 0)
 	);
 
 	if (isset($data['applicationid']) && !isset($_REQUEST['form_refresh'])) {
@@ -245,8 +260,8 @@ if (isset($_REQUEST['form'])) {
 
 	}
 	else {
-		$data['appname'] = get_request('appname', '');
-		$data['hostid'] = get_request('hostid');
+		$data['appname'] = getRequest('appname', '');
+		$data['hostid'] = getRequest('hostid');
 	}
 
 	// render view
@@ -255,28 +270,33 @@ if (isset($_REQUEST['form'])) {
 	$applicationView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
 		'pageFilter' => new CPageFilter(array(
 			'groups' => array('editable' => true, 'with_hosts_and_templates' => true),
 			'hosts' => array('editable' => true, 'templated_hosts' => true),
-			'hostid' => get_request('hostid'),
-			'groupid' => get_request('groupid')
-		))
+			'hostid' => getRequest('hostid'),
+			'groupid' => getRequest('groupid')
+		)),
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 	$data['groupid'] = $data['pageFilter']->groupid;
 	$data['hostid'] = $data['pageFilter']->hostid;
 
 	if ($data['pageFilter']->hostsSelected) {
 		// get application ids
-		$sortfield = getPageSortField('name');
-		$sortorder = getPageSortOrder();
-
 		$data['applications'] = API::Application()->get(array(
 			'hostids' => ($data['pageFilter']->hostid > 0) ? $data['pageFilter']->hostid : null,
 			'groupids' => ($data['pageFilter']->groupid > 0) ? $data['pageFilter']->groupid : null,
 			'output' => array('applicationid'),
 			'editable' => true,
-			'sortfield' => $sortfield,
+			'sortfield' => $sortField,
 			'limit' => $config['search_limit'] + 1
 		));
 
@@ -288,7 +308,7 @@ else {
 			'expandData' => true
 		));
 
-		order_result($data['applications'], $sortfield, $sortorder);
+		order_result($data['applications'], $sortField, $sortOrder);
 
 		// fetch template application source parents
 		$applicationSourceParentIds = getApplicationSourceParentIds(zbx_objectValues($data['applications'], 'applicationid'));
@@ -322,7 +342,7 @@ else {
 	}
 
 	// get paging
-	$data['paging'] = getPagingLine($data['applications'], array('applicationid'));
+	$data['paging'] = getPagingLine($data['applications']);
 
 	// render view
 	$applicationView = new CView('configuration.application.list', $data);
diff --git a/frontends/php/auditacts.php b/frontends/php/auditacts.php
index 0af2d6b3b80..c2f9d2acc62 100644
--- a/frontends/php/auditacts.php
+++ b/frontends/php/auditacts.php
@@ -39,10 +39,6 @@ $fields = array(
 	'filter_set' =>	array(T_ZBX_STR, O_OPT, P_SYS,	null,	null),
 	'alias' =>		array(T_ZBX_STR, O_OPT, P_SYS,	null,	null),
 	'period' =>		array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'dec' =>		array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'inc' =>		array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'left' =>		array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'right' =>		array(T_ZBX_INT, O_OPT, null,	null,	null),
 	'stime' =>		array(T_ZBX_STR, O_OPT, null,	null,	null),
 	// ajax
 	'filterState' => array(T_ZBX_INT, O_OPT, P_ACT, null,	null),
@@ -155,7 +151,7 @@ if ($userId) {
 	$firstAlert = DBfetch(DBselect(
 		'SELECT MIN(a.clock) AS clock'.
 		' FROM alerts a'.
-		' WHERE a.userid='.$userId
+		' WHERE a.userid='.zbx_dbstr($userId)
 	));
 }
 elseif ($data['alias'] === '') {
diff --git a/frontends/php/auditlogs.php b/frontends/php/auditlogs.php
index 9fec93bfa74..766112eb7ba 100644
--- a/frontends/php/auditlogs.php
+++ b/frontends/php/auditlogs.php
@@ -40,10 +40,6 @@ $fields = array(
 	'filter_set' =>		array(T_ZBX_STR, O_OPT, P_SYS,	null,	null),
 	'alias' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,	null),
 	'period' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'dec' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'inc' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'left' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'right' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
 	'stime' =>			array(T_ZBX_STR, O_OPT, null,	null,	null),
 	// ajax
 	'filterState' =>	array(T_ZBX_INT, O_OPT, P_ACT,	null,	null),
@@ -92,7 +88,7 @@ elseif (hasRequest('filter_rst')) {
  */
 $effectivePeriod = navigation_bar_calc('web.auditlogs.timeline', 0, true);
 $data = array(
-	'stime' => get_request('stime'),
+	'stime' => getRequest('stime'),
 	'actions' => array(),
 	'action' => CProfile::get('web.auditlogs.filter.action', -1),
 	'resourcetype' => CProfile::get('web.auditlogs.filter.resourcetype', -1),
@@ -113,8 +109,8 @@ if ($data['action'] > -1) {
 if ($data['resourcetype'] > -1) {
 	$sqlWhere['resourcetype'] = ' AND a.resourcetype='.zbx_dbstr($data['resourcetype']);
 }
-$sqlWhere['from'] = ' AND a.clock>'.$from;
-$sqlWhere['till'] = ' AND a.clock<'.$till;
+$sqlWhere['from'] = ' AND a.clock>'.zbx_dbstr($from);
+$sqlWhere['till'] = ' AND a.clock<'.zbx_dbstr($till);
 
 $sql = 'SELECT a.auditid,a.clock,u.alias,a.ip,a.resourcetype,a.action,a.resourceid,a.resourcename,a.details'.
 		' FROM auditlog a,users u'.
@@ -155,7 +151,7 @@ while ($audit = DBfetch($dbAudit)) {
 		$audit['details'] = DBfetchArray(DBselect(
 			'SELECT ad.table_name,ad.field_name,ad.oldvalue,ad.newvalue'.
 			' FROM auditlog_details ad'.
-			' WHERE ad.auditid='.$audit['auditid']
+			' WHERE ad.auditid='.zbx_dbstr($audit['auditid'])
 		));
 	}
 	$data['actions'][$audit['auditid']] = $audit;
diff --git a/frontends/php/authentication.php b/frontends/php/authentication.php
index d147a4b74d4..5e669892dba 100644
--- a/frontends/php/authentication.php
+++ b/frontends/php/authentication.php
@@ -114,8 +114,8 @@ elseif ($config['authentication_type'] == ZBX_AUTH_LDAP) {
 		));
 
 		$login = $ldapValidator->validate(array(
-			'user' => get_request('user', CWebUser::$data['alias']),
-			'password' => get_request('user_password', '')
+			'user' => getRequest('user', CWebUser::$data['alias']),
+			'password' => getRequest('user_password', '')
 		));
 
 		if (!$login) {
@@ -165,7 +165,7 @@ elseif ($config['authentication_type'] == ZBX_AUTH_LDAP) {
 }
 elseif ($config['authentication_type'] == ZBX_AUTH_HTTP) {
 	if (isset($_REQUEST['save'])) {
-		// get groups wich use this authentication method
+		// get groups that use this authentication method
 		$result = DBfetch(DBselect(
 			'SELECT COUNT(g.usrgrpid) AS cnt_usrgrp FROM usrgrp g WHERE g.gui_access='.GROUP_GUI_ACCESS_INTERNAL
 		));
@@ -210,13 +210,13 @@ show_messages();
  * Display
  */
 $data = array(
-	'form_refresh' => get_request('form_refresh'),
+	'form_refresh' => getRequest('form_refresh'),
 	'config' => $config,
 	'is_authentication_type_changed' => $isAuthenticationTypeChanged,
-	'user' => get_request('user', CWebUser::$data['alias']),
-	'user_password' => get_request('user_password', ''),
+	'user' => getRequest('user', CWebUser::$data['alias']),
+	'user_password' => getRequest('user_password', ''),
 	'user_list' => null,
-	'change_bind_password' => get_request('change_bind_password')
+	'change_bind_password' => getRequest('change_bind_password')
 );
 
 // get tab title
diff --git a/frontends/php/browserwarning.php b/frontends/php/browserwarning.php
index 42b44c9f1fe..353792ad115 100644
--- a/frontends/php/browserwarning.php
+++ b/frontends/php/browserwarning.php
@@ -22,7 +22,7 @@
 require_once dirname(__FILE__).'/include/gettextwrapper.inc.php';
 require_once dirname(__FILE__).'/include/func.inc.php';
 require_once dirname(__FILE__).'/include/defines.inc.php';
-require_once dirname(__FILE__).'/include/classes/class.cview.php';
+require_once dirname(__FILE__).'/include/classes/core/CView.php';
 
 $browserWarningForm = new CView('general.browserwarning');
 $browserWarningForm->render();
diff --git a/frontends/php/chart.php b/frontends/php/chart.php
index bee028cc82a..6bae42df803 100644
--- a/frontends/php/chart.php
+++ b/frontends/php/chart.php
@@ -28,7 +28,8 @@ require_once dirname(__FILE__).'/include/page_header.php';
 
 // VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
 $fields = array(
-	'itemid' =>			array(T_ZBX_INT, O_MAND, P_SYS,	DB_ID,		null),
+	'type' =>           array(T_ZBX_INT, O_OPT, null,   IN(array(GRAPH_TYPE_NORMAL, GRAPH_TYPE_STACKED)), null),
+	'itemids' =>		array(T_ZBX_INT, O_MAND, P_SYS,	DB_ID,		null),
 	'period' =>			array(T_ZBX_INT, O_OPT, P_NZERO, BETWEEN(ZBX_MIN_PERIOD, ZBX_MAX_PERIOD), null),
 	'stime' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'profileIdx' =>		array(T_ZBX_STR, O_OPT, null,	null,		null),
@@ -37,37 +38,60 @@ $fields = array(
 	'from' =>			array(T_ZBX_INT, O_OPT, null,	'{}>=0',	null),
 	'width' =>			array(T_ZBX_INT, O_OPT, null,	'{}>0',		null),
 	'height' =>			array(T_ZBX_INT, O_OPT, null,	'{}>0',		null),
-	'border' =>			array(T_ZBX_INT, O_OPT, null,	IN('0,1'),	null)
+	'border' =>			array(T_ZBX_INT, O_OPT, null,	IN('0,1'),	null),
+	'batch' =>			array(T_ZBX_INT, O_OPT, null,	IN('0,1'),	null),
 );
 check_fields($fields);
 
+$itemIds = getRequest('itemids');
+
 /*
  * Permissions
  */
-$dbItems = API::Item()->get(array(
-	'output' => array('itemid'),
-	'itemids' => $_REQUEST['itemid'],
+$items = API::Item()->get(array(
+	'output' => array('itemid', 'name'),
+	'selectHosts' => array('name'),
+	'itemids' => $itemIds,
 	'webitems' => true,
+	'preservekeys' => true
 ));
-if (!$dbItems) {
-	access_deny();
+foreach ($itemIds as $itemId) {
+	if (!isset($items[$itemId])) {
+		access_deny();
+	}
+}
+
+// sort items
+foreach ($items as &$item) {
+	$item['hostname'] = $item['hosts'][0]['name'];
 }
+unset($item);
+CArrayHelper::sort($items, array('name', 'hostname', 'itemid'));
 
 /*
  * Display
  */
 $timeline = CScreenBase::calculateTime(array(
-	'profileIdx' => get_request('profileIdx', 'web.screens'),
-	'profileIdx2' => get_request('profileIdx2'),
-	'updateProfile' => get_request('updateProfile', true),
-	'period' => get_request('period'),
-	'stime' => get_request('stime')
+	'profileIdx' => getRequest('profileIdx', 'web.screens'),
+	'profileIdx2' => getRequest('profileIdx2'),
+	'updateProfile' => getRequest('updateProfile', true),
+	'period' => getRequest('period'),
+	'stime' => getRequest('stime')
 ));
 
-$graph = new CLineGraphDraw();
+$graph = new CLineGraphDraw(getRequest('type'));
 $graph->setPeriod($timeline['period']);
 $graph->setSTime($timeline['stime']);
 
+// change how the graph will be displayed if more than one item is selected
+if (getRequest('batch')) {
+	// set a default header
+	$graph->setHeader(_('Item values'));
+
+	// hide triggers
+	$graph->showTriggers(false);
+}
+
 if (isset($_REQUEST['from'])) {
 	$graph->setFrom($_REQUEST['from']);
 }
@@ -80,7 +104,13 @@ if (isset($_REQUEST['height'])) {
 if (isset($_REQUEST['border'])) {
 	$graph->setBorder(0);
 }
-$graph->addItem($_REQUEST['itemid'], GRAPH_YAXIS_SIDE_DEFAULT, CALC_FNC_ALL);
+
+foreach ($items as $item) {
+	$graph->addItem($item['itemid'], GRAPH_YAXIS_SIDE_DEFAULT, (getRequest('batch')) ? CALC_FNC_AVG : CALC_FNC_ALL,
+		rgb2hex(get_next_color(1))
+	);
+}
+
 $graph->draw();
 
 require_once dirname(__FILE__).'/include/page_footer.php';
diff --git a/frontends/php/chart2.php b/frontends/php/chart2.php
index 4e3baaa9f76..ee3787dafac 100644
--- a/frontends/php/chart2.php
+++ b/frontends/php/chart2.php
@@ -62,11 +62,11 @@ else {
  * Display
  */
 $timeline = CScreenBase::calculateTime(array(
-	'profileIdx' => get_request('profileIdx', 'web.screens'),
-	'profileIdx2' => get_request('profileIdx2'),
-	'updateProfile' => get_request('updateProfile', true),
-	'period' => get_request('period'),
-	'stime' => get_request('stime')
+	'profileIdx' => getRequest('profileIdx', 'web.screens'),
+	'profileIdx2' => getRequest('profileIdx2'),
+	'updateProfile' => getRequest('updateProfile', true),
+	'period' => getRequest('period'),
+	'stime' => getRequest('stime')
 ));
 
 CProfile::update('web.screens.graphid', $_REQUEST['graphid'], PROFILE_TYPE_ID);
@@ -111,12 +111,12 @@ if (isset($_REQUEST['border'])) {
 	$graph->setBorder(0);
 }
 
-$width = get_request('width', 0);
+$width = getRequest('width', 0);
 if ($width <= 0) {
 	$width = $dbGraph['width'];
 }
 
-$height = get_request('height', 0);
+$height = getRequest('height', 0);
 if ($height <= 0) {
 	$height = $dbGraph['height'];
 }
diff --git a/frontends/php/chart4.php b/frontends/php/chart4.php
index 50ba6119794..1e9f6310a19 100644
--- a/frontends/php/chart4.php
+++ b/frontends/php/chart4.php
@@ -86,8 +86,8 @@ $y = imagesy($im);
 imagefilledrectangle($im, 0, 0, $x, $y, $white);
 imagerectangle($im, 0, 0, $x - 1, $y - 1, $black);
 
-$str = _s('%1$s (year %2$s)', $dbTrigger['description'], zbx_date2str('Y'));
-$x = imagesx($im) / 2 - imagefontwidth(4) * zbx_strlen($str) / 2;
+$str = _s('%1$s (year %2$s)', $dbTrigger['description'], zbx_date2str(_x('Y', DATE_FORMAT_CONTEXT)));
+$x = imagesx($im) / 2 - imagefontwidth(4) * mb_strlen($str) / 2;
 imageText($im, 10, 0, $x, 14, $darkred, $str);
 
 $now = time(null);
diff --git a/frontends/php/chart5.php b/frontends/php/chart5.php
index d85b667a98e..17d55f01058 100644
--- a/frontends/php/chart5.php
+++ b/frontends/php/chart5.php
@@ -79,9 +79,9 @@ $y = imagesy($im);
 imagefilledrectangle($im, 0, 0, $x, $y, $white);
 imagerectangle($im, 0, 0, $x-1, $y-1, $black);
 
-$d = zbx_date2str('Y');
+$d = zbx_date2str(_x('Y', DATE_FORMAT_CONTEXT));
 $str = _s('%1$s (year %2$s)', $service['name'], $d);
-$x = imagesx($im) / 2 - imagefontwidth(4) * zbx_strlen($str) / 2;
+$x = imagesx($im) / 2 - imagefontwidth(4) * mb_strlen($str) / 2;
 imageText($im, 10, 0, $x, 14, $darkred, $str);
 
 $now = time(null);
diff --git a/frontends/php/chart6.php b/frontends/php/chart6.php
index 6649430d16c..b65a96be427 100644
--- a/frontends/php/chart6.php
+++ b/frontends/php/chart6.php
@@ -64,11 +64,11 @@ else {
  * Display
  */
 $timeline = CScreenBase::calculateTime(array(
-	'profileIdx' => get_request('profileIdx', 'web.screens'),
-	'profileIdx2' => get_request('profileIdx2'),
-	'updateProfile' => get_request('updateProfile', true),
-	'period' => get_request('period'),
-	'stime' => get_request('stime')
+	'profileIdx' => getRequest('profileIdx', 'web.screens'),
+	'profileIdx2' => getRequest('profileIdx2'),
+	'updateProfile' => getRequest('updateProfile', true),
+	'period' => getRequest('period'),
+	'stime' => getRequest('stime')
 ));
 
 $graph = new CPieGraphDraw($dbGraph['graphtype']);
@@ -79,12 +79,12 @@ if (isset($_REQUEST['border'])) {
 	$graph->setBorder(0);
 }
 
-$width = get_request('width', 0);
+$width = getRequest('width', 0);
 if ($width <= 0) {
 	$width = $dbGraph['width'];
 }
 
-$height = get_request('height', 0);
+$height = getRequest('height', 0);
 if ($height <= 0) {
 	$height = $dbGraph['height'];
 }
diff --git a/frontends/php/chart_bar.php b/frontends/php/chart_bar.php
index 69847d323ea..2092881196b 100644
--- a/frontends/php/chart_bar.php
+++ b/frontends/php/chart_bar.php
@@ -51,7 +51,7 @@ $fields = array(
 check_fields($fields);
 
 // validate permissions
-$items = get_request('items', array());
+$items = getRequest('items', array());
 $itemIds = zbx_objectValues($_REQUEST['items'], 'itemid');
 $itemsCount = API::Item()->get(array(
 	'itemids' => $itemIds,
@@ -62,19 +62,19 @@ if (count($itemIds) != $itemsCount) {
 	access_deny();
 }
 
-$config = get_request('config', 1);
-$title = get_request('title', _('Report'));
-$xlabel = get_request('xlabel', 'X');
-$ylabel = get_request('ylabel', 'Y');
+$config = getRequest('config', 1);
+$title = getRequest('title', _('Report'));
+$xlabel = getRequest('xlabel', 'X');
+$ylabel = getRequest('ylabel', 'Y');
 
-$showlegend = get_request('showlegend', 0);
-$sorttype = get_request('sorttype', 0);
+$showlegend = getRequest('showlegend', 0);
+$sorttype = getRequest('sorttype', 0);
 
 if ($config == 1) {
-	$scaletype = get_request('scaletype', TIMEPERIOD_TYPE_WEEKLY);
+	$scaletype = getRequest('scaletype', TIMEPERIOD_TYPE_WEEKLY);
 
-	$timesince = get_request('report_timesince', time() - SEC_PER_DAY);
-	$timetill = get_request('report_timetill', time());
+	$timesince = getRequest('report_timesince', time() - SEC_PER_DAY);
+	$timetill = getRequest('report_timetill', time());
 
 	$str_since['hour'] = date('H', $timesince);
 	$str_since['day'] = date('d', $timesince);
@@ -171,9 +171,9 @@ if ($config == 1) {
 				' sum(num) as count,avg(value_avg) as avg,min(value_min) as min,'.
 				' max(value_max) as max,max(clock) as clock'.
 			' FROM trends '.
-			' WHERE itemid='.$itemid.
-				' AND clock>='.$timesince.
-				' AND clock<='.$timetill.
+			' WHERE itemid='.zbx_dbstr($itemid).
+				' AND clock>='.zbx_dbstr($timesince).
+				' AND clock<='.zbx_dbstr($timetill).
 			' GROUP BY itemid,'.$calc_field.
 			' ORDER BY clock ASC'
 			,
@@ -182,9 +182,9 @@ if ($config == 1) {
 				' sum(num) as count,avg(value_avg) as avg,min(value_min) as min,'.
 				' max(value_max) as max,max(clock) as clock'.
 			' FROM trends_uint '.
-			' WHERE itemid='.$itemid.
-				' AND clock>='.$timesince.
-				' AND clock<='.$timetill.
+			' WHERE itemid='.zbx_dbstr($itemid).
+				' AND clock>='.zbx_dbstr($timesince).
+				' AND clock<='.zbx_dbstr($timetill).
 			' GROUP BY itemid,'.$calc_field.
 			' ORDER BY clock ASC'
 			);
@@ -274,9 +274,7 @@ if ($config == 1) {
 		}
 
 		if (!isset($graph_data['captions'])) {
-			$date_caption = ($scaletype == TIMEPERIOD_TYPE_HOURLY)
-				? CHARTBAR_HOURLY_DATE_FORMAT
-				: CHARTBAR_DAILY_DATE_FORMAT;
+			$date_caption = ($scaletype == TIMEPERIOD_TYPE_HOURLY) ? DATE_TIME_FORMAT : DATE_FORMAT;
 
 			$graph_data['captions'] = array();
 			foreach ($item_data['clock'] as $id => $clock) {
@@ -286,7 +284,7 @@ if ($config == 1) {
 	}
 }
 elseif ($config == 2) {
-	$periods = get_request('periods', array());
+	$periods = getRequest('periods', array());
 
 	$graph = new CBarGraphDraw(GRAPH_TYPE_COLUMN);
 	$graph->setHeader('REPORT 1');
@@ -310,9 +308,9 @@ elseif ($config == 2) {
 			$sql = 'SELECT itemid, sum(num) as count,avg(value_avg) as avg,min(value_min) as min,'.
 					' max(value_max) as max,max(clock) as clock'.
 				' FROM trends '.
-				' WHERE itemid='.$itemid.
-					' AND clock>='.$period['report_timesince'].
-					' AND clock<='.$period['report_timetill'].
+				' WHERE itemid='.zbx_dbstr($itemid).
+					' AND clock>='.zbx_dbstr($period['report_timesince']).
+					' AND clock<='.zbx_dbstr($period['report_timetill']).
 				' GROUP BY itemid';
 			$result = DBselect($sql);
 			if ($row = DBfetch($result)) {
@@ -326,9 +324,9 @@ elseif ($config == 2) {
 			$sql = 'SELECT itemid, sum(num) as count,avg(value_avg) as avg,min(value_min) as min,'.
 					' max(value_max) as max,max(clock) as clock'.
 				' FROM trends_uint '.
-				' WHERE itemid='.$itemid.
-					' AND clock>='.$period['report_timesince'].
-					' AND clock<='.$period['report_timetill'].
+				' WHERE itemid='.zbx_dbstr($itemid).
+					' AND clock>='.zbx_dbstr($period['report_timesince']).
+					' AND clock<='.zbx_dbstr($period['report_timetill']).
 				' GROUP BY itemid';
 			$result = DBselect($sql);
 			if ($row = DBfetch($result)) {
@@ -385,23 +383,23 @@ elseif ($config == 2) {
 	}
 }
 elseif ($config == 3) {
-	$hostids = get_request('hostids', array());
-	$groupids = get_request('groupids', array());
+	$hostids = getRequest('hostids', array());
+	$groupids = getRequest('groupids', array());
 
 	// validate permissions
 	if (!API::Host()->isReadable($hostids) || !API::HostGroup()->isReadable($groupids)) {
 		access_deny();
 	}
 
-	$title = get_request('title','Report 2');
-	$xlabel = get_request('xlabel','');
-	$ylabel = get_request('ylabel','');
+	$title = getRequest('title','Report 2');
+	$xlabel = getRequest('xlabel','');
+	$ylabel = getRequest('ylabel','');
 
-	$palette = get_request('palette',0);
-	$palettetype = get_request('palettetype',0);
+	$palette = getRequest('palette',0);
+	$palettetype = getRequest('palettetype',0);
 
-	$scaletype = get_request('scaletype', TIMEPERIOD_TYPE_WEEKLY);
-	$avgperiod = get_request('avgperiod', TIMEPERIOD_TYPE_DAILY);
+	$scaletype = getRequest('scaletype', TIMEPERIOD_TYPE_WEEKLY);
+	$avgperiod = getRequest('avgperiod', TIMEPERIOD_TYPE_DAILY);
 
 	if (!empty($groupids)) {
 		$sql = 'SELECT DISTINCT hg.hostid'.
@@ -434,8 +432,8 @@ elseif ($config == 3) {
 	$graph_data['legend'] = array();
 
 
-	$timesince = get_request('report_timesince', time() - SEC_PER_DAY);
-	$timetill = get_request('report_timetill', time());
+	$timesince = getRequest('report_timesince', time() - SEC_PER_DAY);
+	$timetill = getRequest('report_timetill', time());
 
 	$str_since['hour'] = date('H', $timesince);
 	$str_since['day'] = date('d', $timesince);
@@ -578,17 +576,17 @@ elseif ($config == 3) {
 			array_push($sql_arr,
 				'SELECT itemid,'.$calc_field.' as i,sum(num) as count,avg(value_avg) as avg '.
 				' FROM trends '.
-				' WHERE itemid='.$itemid.
-					' AND clock>='.$start.
-					' AND clock<='.$end.
+				' WHERE itemid='.zbx_dbstr($itemid).
+					' AND clock>='.zbx_dbstr($start).
+					' AND clock<='.zbx_dbstr($end).
 				' GROUP BY itemid,'.$calc_field
 				,
 
 				'SELECT itemid,'.$calc_field.' as i,sum(num) as count,avg(value_avg) as avg '.
 				' FROM trends_uint '.
-				' WHERE itemid='.$itemid.
-					' AND clock>='.$start.
-					' AND clock<='.$end.
+				' WHERE itemid='.zbx_dbstr($itemid).
+					' AND clock>='.zbx_dbstr($start).
+					' AND clock<='.zbx_dbstr($end).
 				' GROUP BY itemid,'.$calc_field
 				);
 
@@ -616,9 +614,7 @@ elseif ($config == 3) {
 				$graph_data['colors'][$count] = rgb2hex($tmp_color);
 			}
 
-			$date_caption = ($scaletype == TIMEPERIOD_TYPE_HOURLY)
-				? CHARTBAR_HOURLY_DATE_FORMAT
-				: CHARTBAR_DAILY_DATE_FORMAT;
+			$date_caption = ($scaletype == TIMEPERIOD_TYPE_HOURLY) ? DATE_TIME_FORMAT : DATE_FORMAT;
 			$graph_data['legend'][$count] = zbx_date2str($date_caption, $start);
 
 			$count++;
@@ -655,8 +651,8 @@ $graph->setSeriesColor($graph_data['colors']);
 $graph->showLegend($showlegend);
 
 $graph->setWidth(1024);
-$graph->setHeight(400);
+$graph->setMinChartHeight(250);
 
-$graph->Draw();
+$graph->draw();
 
 require_once dirname(__FILE__).'/include/page_footer.php';
diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index eefc2ea7b61..cc8ea00f4b5 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -42,26 +42,25 @@ $fields = array(
 	'graphid' =>	array(T_ZBX_INT, O_OPT, P_SYS, DB_ID,		null),
 	'period' =>		array(T_ZBX_INT, O_OPT, P_SYS, null,		null),
 	'stime' =>		array(T_ZBX_STR, O_OPT, P_SYS, null,		null),
-	'action' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN("'go','add','remove'"), null),
 	'fullscreen' =>	array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'),	null),
 	// ajax
 	'filterState' => array(T_ZBX_INT, O_OPT, P_ACT, null,		null),
 	'favobj' =>		array(T_ZBX_STR, O_OPT, P_ACT, null,		null),
 	'favid' =>		array(T_ZBX_INT, O_OPT, P_ACT, null,		null),
-	'favaction' =>	array(T_ZBX_STR, O_OPT, P_ACT, IN("'add','remove'"), null)
+	'favaction' =>	array(T_ZBX_STR, O_OPT, P_ACT, IN('"add","remove"'), null)
 );
 check_fields($fields);
 
 /*
  * Permissions
  */
-if (get_request('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
+if (getRequest('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
 	access_deny();
 }
-if (get_request('hostid') && !API::Host()->isReadable(array($_REQUEST['hostid']))) {
+if (getRequest('hostid') && !API::Host()->isReadable(array($_REQUEST['hostid']))) {
 	access_deny();
 }
-if (get_request('graphid')) {
+if (getRequest('graphid')) {
 	$graphs = API::Graph()->get(array(
 		'graphids' => array($_REQUEST['graphid']),
 		'output' => array('graphid')
@@ -74,10 +73,10 @@ if (get_request('graphid')) {
 $pageFilter = new CPageFilter(array(
 	'groups' => array('real_hosts' => true, 'with_graphs' => true),
 	'hosts' => array('with_graphs' => true),
-	'groupid' => get_request('groupid', null),
-	'hostid' => get_request('hostid', null),
+	'groupid' => getRequest('groupid'),
+	'hostid' => getRequest('hostid'),
 	'graphs' => array('templated' => 0),
-	'graphid' => get_request('graphid', null)
+	'graphid' => getRequest('graphid')
 ));
 
 /*
@@ -125,15 +124,20 @@ if (!empty($_REQUEST['period']) || !empty($_REQUEST['stime'])) {
 		'profileIdx' => 'web.screens',
 		'profileIdx2' => $pageFilter->graphid,
 		'updateProfile' => true,
-		'period' => get_request('period'),
-		'stime' => get_request('stime')
+		'period' => getRequest('period'),
+		'stime' => getRequest('stime')
 	));
 
-	$curl = new Curl();
+	$curl = new CUrl();
 	$curl->removeArgument('period');
 	$curl->removeArgument('stime');
 
 	ob_end_clean();
+
+	DBstart();
+	CProfile::flush();
+	DBend();
+
 	redirect($curl->getUrl());
 }
 
diff --git a/frontends/php/conf.import.php b/frontends/php/conf.import.php
index 4b7d61b5ce4..022f64773e1 100644
--- a/frontends/php/conf.import.php
+++ b/frontends/php/conf.import.php
@@ -46,42 +46,87 @@ if (isset($_REQUEST['cancel'])) {
 }
 ob_end_flush();
 
-
 $data['rules'] = array(
 	'groups' => array('createMissing' => false),
 	'hosts' => array('updateExisting' => false, 'createMissing' => false),
 	'templates' => array('updateExisting' => false, 'createMissing' => false),
-	'templateScreens' => array('updateExisting' => false, 'createMissing' => false),
+	'templateScreens' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
 	'templateLinkage' => array('createMissing' => false),
-	'items' => array('updateExisting' => false, 'createMissing' => false),
-	'discoveryRules' => array('updateExisting' => false, 'createMissing' => false),
-	'triggers' => array('updateExisting' => false, 'createMissing' => false),
-	'graphs' => array('updateExisting' => false, 'createMissing' => false),
+	'applications' => array('createMissing' => false, 'deleteMissing' => false),
+	'items' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
+	'discoveryRules' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
+	'triggers' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
+	'graphs' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
 	'screens' => array('updateExisting' => false, 'createMissing' => false),
 	'maps' => array('updateExisting' => false, 'createMissing' => false),
 	'images' => array('updateExisting' => false, 'createMissing' => false)
 );
+
 // rules presets
 if (isset($_REQUEST['rules_preset']) && !isset($_REQUEST['rules'])) {
 	switch ($_REQUEST['rules_preset']) {
 		case 'host':
 			$data['rules']['groups'] = array('createMissing' => true);
 			$data['rules']['hosts'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['items'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['discoveryRules'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['triggers'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['graphs'] = array('updateExisting' => true, 'createMissing' => true);
+			$data['rules']['applications'] = array(
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['items'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['discoveryRules'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['triggers'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['graphs'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
 			$data['rules']['templateLinkage'] = array('createMissing' => true);
 			break;
 
 		case 'template':
 			$data['rules']['groups'] = array('createMissing' => true);
 			$data['rules']['templates'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['templateScreens'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['items'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['discoveryRules'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['triggers'] = array('updateExisting' => true, 'createMissing' => true);
-			$data['rules']['graphs'] = array('updateExisting' => true, 'createMissing' => true);
+			$data['rules']['templateScreens'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['applications'] = array(
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['items'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['discoveryRules'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['triggers'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
+			$data['rules']['graphs'] = array(
+				'updateExisting' => true,
+				'createMissing' => true,
+				'deleteMissing' => false
+			);
 			$data['rules']['templateLinkage'] = array('createMissing' => true);
 			break;
 
@@ -95,8 +140,9 @@ if (isset($_REQUEST['rules_preset']) && !isset($_REQUEST['rules'])) {
 
 	}
 }
+
 if (isset($_REQUEST['rules'])) {
-	$requestRules = get_request('rules', array());
+	$requestRules = getRequest('rules', array());
 	// if form was submitted with some checkboxes unchecked, those values are not submitted
 	// so that we set missing values to false
 	foreach ($data['rules'] as $ruleName => $rule) {
@@ -104,17 +150,29 @@ if (isset($_REQUEST['rules'])) {
 			if (isset($rule['updateExisting'])) {
 				$requestRules[$ruleName]['updateExisting'] = false;
 			}
+
 			if (isset($rule['createMissing'])) {
 				$requestRules[$ruleName]['createMissing'] = false;
 			}
+
+			if (isset($rule['deleteMissing'])) {
+				$requestRules[$ruleName]['deleteMissing'] = false;
+			}
 		}
-		elseif (!isset($requestRules[$ruleName]['updateExisting']) && isset($rule['updateExisting'])){
+
+		if (!isset($requestRules[$ruleName]['updateExisting']) && isset($rule['updateExisting'])) {
 			$requestRules[$ruleName]['updateExisting'] = false;
 		}
-		elseif (!isset($requestRules[$ruleName]['createMissing']) && isset($rule['createMissing'])){
+
+		if (!isset($requestRules[$ruleName]['createMissing']) && isset($rule['createMissing'])) {
 			$requestRules[$ruleName]['createMissing'] = false;
 		}
+
+		if (!isset($requestRules[$ruleName]['deleteMissing']) && isset($rule['deleteMissing'])) {
+			$requestRules[$ruleName]['deleteMissing'] = false;
+		}
 	}
+
 	$data['rules'] = $requestRules;
 }
 
diff --git a/frontends/php/dashboard.php b/frontends/php/dashboard.php
index 83e8cd52fd7..528fb32db94 100644
--- a/frontends/php/dashboard.php
+++ b/frontends/php/dashboard.php
@@ -40,7 +40,7 @@ $fields = array(
 	'fullscreen' =>		array(T_ZBX_INT, O_OPT, P_SYS,	IN('0,1'),	null),
 	// ajax
 	'widgetName' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
-	'widgetRefresh' =>	array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
+	'widgetRefresh' =>	array(T_ZBX_STR, O_OPT, null,	null,		null),
 	'widgetRefreshRate' => array(T_ZBX_STR, O_OPT, P_ACT, null,		null),
 	'widgetSort' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
 	'widgetState' =>	array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
@@ -311,7 +311,7 @@ $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setAttribute('id', 'favouriteGraphs');
 $icon->setMenuPopup(CMenuPopupHelper::getFavouriteGraphs());
 
-$favouriteGraphs = new CUIWidget(WIDGET_FAVOURITE_GRAPHS, getFavouriteGraphs());
+$favouriteGraphs = new CCollapsibleUiWidget(WIDGET_FAVOURITE_GRAPHS, getFavouriteGraphs());
 $favouriteGraphs->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_FAVOURITE_GRAPHS.'.state', true);
 $favouriteGraphs->setHeader(_('Favourite graphs'), $icon);
 $favouriteGraphs->setFooter(new CLink(_('Graphs').' &raquo;', 'charts.php', 'highlight'), true);
@@ -325,7 +325,7 @@ $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setAttribute('id', 'favouriteMaps');
 $icon->setMenuPopup(CMenuPopupHelper::getFavouriteMaps());
 
-$favouriteMaps = new CUIWidget(WIDGET_FAVOURITE_MAPS, getFavouriteMaps());
+$favouriteMaps = new CCollapsibleUiWidget(WIDGET_FAVOURITE_MAPS, getFavouriteMaps());
 $favouriteMaps->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_FAVOURITE_MAPS.'.state', true);
 $favouriteMaps->setHeader(_('Favourite maps'), $icon);
 $favouriteMaps->setFooter(new CLink(_('Maps').' &raquo;', 'maps.php', 'highlight'), true);
@@ -339,7 +339,7 @@ $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setAttribute('id', 'favouriteScreens');
 $icon->setMenuPopup(CMenuPopupHelper::getFavouriteScreens());
 
-$favouriteScreens = new CUIWidget(WIDGET_FAVOURITE_SCREENS, getFavouriteScreens());
+$favouriteScreens = new CCollapsibleUiWidget(WIDGET_FAVOURITE_SCREENS, getFavouriteScreens());
 $favouriteScreens->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_FAVOURITE_SCREENS.'.state', true);
 $favouriteScreens->setHeader(_('Favourite screens'), $icon);
 $favouriteScreens->setFooter(
@@ -364,7 +364,7 @@ if (CWebUser::$data['type'] == USER_TYPE_SUPER_ADMIN) {
 	$icon = new CIcon(_('Menu'), 'iconmenu');
 	$icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_ZABBIX_STATUS, $rate));
 
-	$zabbixStatus = new CUIWidget(WIDGET_ZABBIX_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
+	$zabbixStatus = new CCollapsibleUiWidget(WIDGET_ZABBIX_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
 	$zabbixStatus->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_ZABBIX_STATUS.'.state', true);
 	$zabbixStatus->setHeader(_('Status of Zabbix'), $icon);
 	$zabbixStatus->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_ZABBIX_STATUS.'_footer'));
@@ -388,7 +388,7 @@ $rate = CProfile::get('web.dashboard.widget.'.WIDGET_SYSTEM_STATUS.'.rf_rate', 6
 $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_SYSTEM_STATUS, $rate));
 
-$systemStatus = new CUIWidget(WIDGET_SYSTEM_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
+$systemStatus = new CCollapsibleUiWidget(WIDGET_SYSTEM_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
 $systemStatus->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_SYSTEM_STATUS.'.state', true);
 $systemStatus->setHeader(_('System status'), $icon);
 $systemStatus->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_SYSTEM_STATUS.'_footer'));
@@ -411,7 +411,7 @@ $rate = CProfile::get('web.dashboard.widget.'.WIDGET_HOST_STATUS.'.rf_rate', 60)
 $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_HOST_STATUS, $rate));
 
-$hostStatus = new CUIWidget(WIDGET_HOST_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
+$hostStatus = new CCollapsibleUiWidget(WIDGET_HOST_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
 $hostStatus->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_HOST_STATUS.'.state', true);
 $hostStatus->setHeader(_('Host status'), $icon);
 $hostStatus->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_HOST_STATUS.'_footer'));
@@ -434,7 +434,7 @@ $rate = CProfile::get('web.dashboard.widget.'.WIDGET_LAST_ISSUES.'.rf_rate', 60)
 $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_LAST_ISSUES, $rate));
 
-$lastIssues = new CUIWidget(WIDGET_LAST_ISSUES, new CSpan(_('Loading...'), 'textcolorstyles'));
+$lastIssues = new CCollapsibleUiWidget(WIDGET_LAST_ISSUES, new CSpan(_('Loading...'), 'textcolorstyles'));
 $lastIssues->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_LAST_ISSUES.'.state', true);
 $lastIssues->setHeader(_n('Last %1$d issue', 'Last %1$d issues', DEFAULT_LATEST_ISSUES_CNT), $icon);
 $lastIssues->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_LAST_ISSUES.'_footer'));
@@ -457,7 +457,7 @@ $rate = CProfile::get('web.dashboard.widget.'.WIDGET_WEB_OVERVIEW.'.rf_rate', 60
 $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_WEB_OVERVIEW, $rate));
 
-$webMonitoring = new CUIWidget(WIDGET_WEB_OVERVIEW, new CSpan(_('Loading...'), 'textcolorstyles'));
+$webMonitoring = new CCollapsibleUiWidget(WIDGET_WEB_OVERVIEW, new CSpan(_('Loading...'), 'textcolorstyles'));
 $webMonitoring->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_WEB_OVERVIEW.'.state', true);
 $webMonitoring->setHeader(_('Web monitoring'), $icon);
 $webMonitoring->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_WEB_OVERVIEW.'_footer'));
@@ -487,7 +487,7 @@ if ($dbDiscoveryRules['cnt'] > 0 && check_right_on_discovery()) {
 	$icon = new CIcon(_('Menu'), 'iconmenu');
 	$icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_DISCOVERY_STATUS, $rate));
 
-	$discoveryStatus = new CUIWidget(WIDGET_DISCOVERY_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
+	$discoveryStatus = new CCollapsibleUiWidget(WIDGET_DISCOVERY_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
 	$discoveryStatus->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_DISCOVERY_STATUS.'.state', true);
 	$discoveryStatus->setHeader(_('Discovery status'), $icon);
 	$discoveryStatus->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_DISCOVERY_STATUS.'_footer'));
@@ -534,6 +534,9 @@ zbx_add_post_js('jqBlink.blink();');
 
 ?>
 <script type="text/javascript">
+	/**
+	 * @see init.js add.popup event
+	 */
 	function addPopupValues(list) {
 		var favourites = {graphid: 1, itemid: 1, screenid: 1, slideshowid: 1, sysmapid: 1};
 
diff --git a/frontends/php/dashconf.php b/frontends/php/dashconf.php
index 98651e735ea..28306b60397 100644
--- a/frontends/php/dashconf.php
+++ b/frontends/php/dashconf.php
@@ -114,18 +114,18 @@ $data = array(
 );
 
 if (isset($_REQUEST['form_refresh'])) {
-	$data['isFilterEnable'] = get_request('filterEnable', 0);
-	$data['maintenance'] = get_request('maintenance', 0);
-	$data['extAck'] = get_request('extAck', 0);
+	$data['isFilterEnable'] = getRequest('filterEnable', 0);
+	$data['maintenance'] = getRequest('maintenance', 0);
+	$data['extAck'] = getRequest('extAck', 0);
 
-	$data['severity'] = get_request('trgSeverity', array());
+	$data['severity'] = getRequest('trgSeverity', array());
 	$data['severity'] = array_keys($data['severity']);
 
 	// groups
-	$data['grpswitch'] = get_request('grpswitch', 0);
-	$data['groupIds'] = get_request('groupids', array());
+	$data['grpswitch'] = getRequest('grpswitch', 0);
+	$data['groupIds'] = getRequest('groupids', array());
 	$data['groupIds'] = zbx_toHash($data['groupIds']);
-	$data['hideGroupIds'] = get_request('hidegroupids', array());
+	$data['hideGroupIds'] = getRequest('hidegroupids', array());
 	$data['hideGroupIds'] = zbx_toHash($data['hideGroupIds']);
 }
 else {
diff --git a/frontends/php/disc_prototypes.php b/frontends/php/disc_prototypes.php
index 0bc9c15396b..d6fd533e627 100644
--- a/frontends/php/disc_prototypes.php
+++ b/frontends/php/disc_prototypes.php
@@ -31,7 +31,7 @@ $page['hist_arg'] = array('parent_discoveryid');
 
 require_once dirname(__FILE__).'/include/page_header.php';
 
-$paramsFieldName = getParamFieldNameByType(get_request('type', 0));
+$paramsFieldName = getParamFieldNameByType(getRequest('type', 0));
 
 // VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
 $fields = array(
@@ -71,7 +71,7 @@ $fields = array(
 	'privatekey' =>				array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})&&isset({type})&&({type})=='.
 		ITEM_TYPE_SSH.'&&({authtype})=='.ITEM_AUTHTYPE_PUBLICKEY),
 	$paramsFieldName =>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({save})&&isset({type})&&'.IN(
-		ITEM_TYPE_SSH.','.ITEM_TYPE_DB_MONITOR.','.ITEM_TYPE_TELNET.','.ITEM_TYPE_CALCULATED,'type'), getParamFieldLabelByType(get_request('type', 0))),
+		ITEM_TYPE_SSH.','.ITEM_TYPE_DB_MONITOR.','.ITEM_TYPE_TELNET.','.ITEM_TYPE_CALCULATED,'type'), getParamFieldLabelByType(getRequest('type', 0))),
 	'snmp_community' =>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,
 		'isset({save})&&isset({type})&&'.IN(ITEM_TYPE_SNMPV1.','.ITEM_TYPE_SNMPV2C,'type'), _('SNMP community')),
 	'snmp_oid' =>				array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,
@@ -96,7 +96,7 @@ $fields = array(
 		'isset({save})&&(isset({type})&&({type}=='.ITEM_TYPE_SNMPV3.')&&({snmpv3_securitylevel}=='.ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV.'))'),
 	'snmpv3_privpassphrase' =>	array(T_ZBX_STR, O_OPT, null,	null,
 		'isset({save})&&(isset({type})&&({type}=='.ITEM_TYPE_SNMPV3.')&&({snmpv3_securitylevel}=='.ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV.'))'),
-	'ipmi_sensor' =>			array(T_ZBX_STR, O_OPT, NO_TRIM,	NOT_EMPTY,
+	'ipmi_sensor' =>			array(T_ZBX_STR, O_OPT, P_NO_TRIM,	NOT_EMPTY,
 		'isset({save})&&(isset({type})&&({type}=='.ITEM_TYPE_IPMI.'))', _('IPMI sensor')),
 	'trapper_hosts' =>			array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})&&isset({type})&&({type}==2)'),
 	'units' =>					array(T_ZBX_STR, O_OPT, null,	null,
@@ -120,7 +120,12 @@ $fields = array(
 	),
 	'add_delay_flex' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	// actions
-	'go' =>						array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+									IN('"itemprototype.massdelete","itemprototype.massdisable",'.
+										'"itemprototype.massenable"'
+									),
+									null
+								),
 	'save' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'clone' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'delete' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -128,17 +133,21 @@ $fields = array(
 	'form' =>					array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form_refresh' =>			array(T_ZBX_INT, O_OPT, null,	null,		null),
 	// filter
-	'filter_set' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null)
+	'filter_set' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
+	// sort and sortorder
+	'sort' =>					array(T_ZBX_STR, O_OPT, P_SYS,
+									IN('"delay","history","key_","name","status","trends","type"'),
+									null
+								),
+	'sortorder' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
-$_REQUEST['go'] = get_request('go', 'none');
-$_REQUEST['params'] = get_request($paramsFieldName, '');
+$_REQUEST['params'] = getRequest($paramsFieldName, '');
 unset($_REQUEST[$paramsFieldName]);
 
 // permissions
-if (get_request('parent_discoveryid', false)) {
+if (getRequest('parent_discoveryid', false)) {
 	$discovery_rule = API::DiscoveryRule()->get(array(
 		'itemids' => $_REQUEST['parent_discoveryid'],
 		'output' => API_OUTPUT_EXTEND,
@@ -171,7 +180,7 @@ else {
  */
 if (isset($_REQUEST['add_delay_flex']) && isset($_REQUEST['new_delay_flex'])) {
 	$timePeriodValidator = new CTimePeriodValidator(array('allowMultiple' => false));
-	$_REQUEST['delay_flex'] = get_request('delay_flex', array());
+	$_REQUEST['delay_flex'] = getRequest('delay_flex', array());
 
 	if ($timePeriodValidator->validate($_REQUEST['new_delay_flex']['period'])) {
 		array_push($_REQUEST['delay_flex'], $_REQUEST['new_delay_flex']);
@@ -187,16 +196,19 @@ elseif (hasRequest('delete') && hasRequest('itemid')) {
 	$result = API::Itemprototype()->delete(array(getRequest('itemid')));
 	$result = DBend($result);
 
+	if ($result) {
+		uncheckTableRows(getRequest('parent_discoveryid'));
+	}
 	show_messages($result, _('Item prototype deleted'), _('Cannot delete item prototype'));
+
 	unset($_REQUEST['itemid'], $_REQUEST['form']);
-	clearCookies($result, getRequest('parent_discoveryid'));
 }
 elseif (isset($_REQUEST['clone']) && isset($_REQUEST['itemid'])) {
 	unset($_REQUEST['itemid']);
 	$_REQUEST['form'] = 'clone';
 }
 elseif (hasRequest('save')) {
-	$delay_flex = get_request('delay_flex', array());
+	$delay_flex = getRequest('delay_flex', array());
 	$db_delay_flex = '';
 	foreach ($delay_flex as $value) {
 		$db_delay_flex .= $value['delay'].'/'.$value['period'].';';
@@ -204,7 +216,7 @@ elseif (hasRequest('save')) {
 	$db_delay_flex = trim($db_delay_flex, ';');
 
 	DBstart();
-	$applications = get_request('applications', array());
+	$applications = getRequest('applications', array());
 	$application = reset($applications);
 	if ($application == 0) {
 		array_shift($applications);
@@ -222,43 +234,43 @@ elseif (hasRequest('save')) {
 	}
 
 	$item = array(
-		'name'			=> get_request('name'),
-		'description'	=> get_request('description'),
-		'key_'			=> get_request('key'),
-		'hostid'		=> get_request('hostid'),
-		'interfaceid'	=> get_request('interfaceid'),
-		'delay'			=> get_request('delay'),
-		'status'		=> get_request('status', ITEM_STATUS_DISABLED),
-		'type'			=> get_request('type'),
-		'snmp_community' => get_request('snmp_community'),
-		'snmp_oid'		=> get_request('snmp_oid'),
-		'value_type'	=> get_request('value_type'),
-		'trapper_hosts'	=> get_request('trapper_hosts'),
-		'port'			=> get_request('port'),
-		'history'		=> get_request('history'),
-		'trends'		=> get_request('trends'),
-		'units'			=> get_request('units'),
-		'multiplier'	=> get_request('multiplier', 0),
-		'delta'			=> get_request('delta'),
-		'snmpv3_contextname' => get_request('snmpv3_contextname'),
-		'snmpv3_securityname' => get_request('snmpv3_securityname'),
-		'snmpv3_securitylevel' => get_request('snmpv3_securitylevel'),
-		'snmpv3_authprotocol' => get_request('snmpv3_authprotocol'),
-		'snmpv3_authpassphrase' => get_request('snmpv3_authpassphrase'),
-		'snmpv3_privprotocol' => get_request('snmpv3_privprotocol'),
-		'snmpv3_privpassphrase' => get_request('snmpv3_privpassphrase'),
-		'formula'		=> get_request('formula'),
-		'logtimefmt'	=> get_request('logtimefmt'),
-		'valuemapid'	=> get_request('valuemapid'),
-		'authtype'		=> get_request('authtype'),
-		'username'		=> get_request('username'),
-		'password'		=> get_request('password'),
-		'publickey'		=> get_request('publickey'),
-		'privatekey'	=> get_request('privatekey'),
-		'params'		=> get_request('params'),
-		'ipmi_sensor'	=> get_request('ipmi_sensor'),
-		'data_type'		=> get_request('data_type'),
-		'ruleid'		=> get_request('parent_discoveryid'),
+		'name'			=> getRequest('name'),
+		'description'	=> getRequest('description'),
+		'key_'			=> getRequest('key'),
+		'hostid'		=> getRequest('hostid'),
+		'interfaceid'	=> getRequest('interfaceid'),
+		'delay'			=> getRequest('delay'),
+		'status'		=> getRequest('status', ITEM_STATUS_DISABLED),
+		'type'			=> getRequest('type'),
+		'snmp_community' => getRequest('snmp_community'),
+		'snmp_oid'		=> getRequest('snmp_oid'),
+		'value_type'	=> getRequest('value_type'),
+		'trapper_hosts'	=> getRequest('trapper_hosts'),
+		'port'			=> getRequest('port'),
+		'history'		=> getRequest('history'),
+		'trends'		=> getRequest('trends'),
+		'units'			=> getRequest('units'),
+		'multiplier'	=> getRequest('multiplier', 0),
+		'delta'			=> getRequest('delta'),
+		'snmpv3_contextname' => getRequest('snmpv3_contextname'),
+		'snmpv3_securityname' => getRequest('snmpv3_securityname'),
+		'snmpv3_securitylevel' => getRequest('snmpv3_securitylevel'),
+		'snmpv3_authprotocol' => getRequest('snmpv3_authprotocol'),
+		'snmpv3_authpassphrase' => getRequest('snmpv3_authpassphrase'),
+		'snmpv3_privprotocol' => getRequest('snmpv3_privprotocol'),
+		'snmpv3_privpassphrase' => getRequest('snmpv3_privpassphrase'),
+		'formula'		=> getRequest('formula', '1'),
+		'logtimefmt'	=> getRequest('logtimefmt'),
+		'valuemapid'	=> getRequest('valuemapid'),
+		'authtype'		=> getRequest('authtype'),
+		'username'		=> getRequest('username'),
+		'password'		=> getRequest('password'),
+		'publickey'		=> getRequest('publickey'),
+		'privatekey'	=> getRequest('privatekey'),
+		'params'		=> getRequest('params'),
+		'ipmi_sensor'	=> getRequest('ipmi_sensor'),
+		'data_type'		=> getRequest('data_type'),
+		'ruleid'		=> getRequest('parent_discoveryid'),
 		'delay_flex'	=> $db_delay_flex,
 		'applications'	=> $applications
 	);
@@ -290,14 +302,15 @@ elseif (hasRequest('save')) {
 	}
 
 	$result = DBend($result);
+
 	if ($result) {
 		unset($_REQUEST['itemid'], $_REQUEST['form']);
-		clearCookies($result, getRequest('parent_discoveryid'));
+		uncheckTableRows(getRequest('parent_discoveryid'));
 	}
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('group_itemid')) {
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('itemprototype.massenable', 'itemprototype.massdisable')) && hasRequest('group_itemid')) {
 	$groupItemId = getRequest('group_itemid');
-	$enable = (getRequest('go') == 'activate');
+	$enable = (getRequest('action') == 'itemprototype.massenable');
 
 	DBstart();
 	$result = $enable ? activate_item($groupItemId) : disable_item($groupItemId);
@@ -312,17 +325,21 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		? _n('Cannot enable item prototype', 'Cannot enable item prototypes', $updated)
 		: _n('Cannot disable item prototype', 'Cannot disable item prototypes', $updated);
 
+	if ($result) {
+		uncheckTableRows(getRequest('parent_discoveryid'));
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, getRequest('parent_discoveryid'));
 }
-elseif (getRequest('go') == 'delete' && hasRequest('group_itemid')) {
+elseif (hasRequest('action') && getRequest('action') == 'itemprototype.massdelete' && hasRequest('group_itemid')) {
 	DBstart();
 
 	$result = API::Itemprototype()->delete(getRequest('group_itemid'));
 	$result = DBend($result);
 
+	if ($result) {
+		uncheckTableRows(getRequest('parent_discoveryid'));
+	}
 	show_messages($result, _('Item prototypes deleted'), _('Cannot delete item prototypes'));
-	clearCookies($result, getRequest('parent_discoveryid'));
 }
 
 /*
@@ -355,36 +372,35 @@ if (isset($_REQUEST['form'])) {
 	$itemView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'form' => get_request('form', null),
-		'parent_discoveryid' => get_request('parent_discoveryid', null),
-		'hostid' => get_request('hostid', null),
-		'discovery_rule' => $discovery_rule
+		'form' => getRequest('form'),
+		'parent_discoveryid' => getRequest('parent_discoveryid'),
+		'hostid' => getRequest('hostid'),
+		'discovery_rule' => $discovery_rule,
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	$sortfield = getPageSortField('name');
-
 	$data['items'] = API::ItemPrototype()->get(array(
 		'discoveryids' => $data['parent_discoveryid'],
 		'output' => API_OUTPUT_EXTEND,
 		'editable' => true,
 		'selectApplications' => API_OUTPUT_EXTEND,
-		'sortfield' => $sortfield,
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit'] + 1
 	));
 
 	$data['items'] = CMacrosResolverHelper::resolveItemNames($data['items']);
 
-	order_result($data['items'], $sortfield, getPageSortOrder());
+	order_result($data['items'], $sortField, $sortOrder);
 
-	$data['paging'] = getPagingLine(
-		$data['items'],
-		array('itemid'),
-		array(
-			'hostid' => get_request('hostid'),
-			'parent_discoveryid' => get_request('parent_discoveryid')
-		)
-	);
+	$data['paging'] = getPagingLine($data['items']);
 
 	// render view
 	$itemView = new CView('configuration.item.prototype.list', $data);
diff --git a/frontends/php/discovery.php b/frontends/php/discovery.php
index 1b7848333ba..2eef7a8e6b2 100644
--- a/frontends/php/discovery.php
+++ b/frontends/php/discovery.php
@@ -31,13 +31,21 @@ require_once dirname(__FILE__).'/include/page_header.php';
 // VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
 $fields = array(
 	'druleid' =>	array(T_ZBX_INT, O_OPT, P_SYS, DB_ID,		null),
-	'fullscreen' =>	array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'),	null)
+	'fullscreen' =>	array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'),	null),
+	// sort and sortorder
+	'sort' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"ip"'),									null),
+	'sortorder' =>	array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('ip', ZBX_SORT_UP);
+
+$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'ip'));
+$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
 
 // check discovery for existing if defined druleid
-if ($druleid = get_request('druleid')) {
+if ($druleid = getRequest('druleid')) {
 	$dbDRule = API::DRule()->get(array(
 			'druleids' => $druleid,
 			'countOutput' => true
@@ -52,16 +60,16 @@ if ($druleid = get_request('druleid')) {
  */
 $data = array(
 	'fullscreen' => $_REQUEST['fullscreen'],
-	'druleid' => get_request('druleid', 0),
-	'sort' => get_request('sort'),
-	'sortorder' => get_request('sortorder'),
+	'druleid' => getRequest('druleid', 0),
+	'sort' => $sortField,
+	'sortorder' => $sortOrder,
 	'services' => array(),
 	'drules' => array()
 );
 
 $data['pageFilter'] = new CPageFilter(array(
 	'drules' => array('filter' => array('status' => DRULE_STATUS_ACTIVE)),
-	'druleid' => get_request('druleid', null)
+	'druleid' => getRequest('druleid')
 ));
 
 if ($data['pageFilter']->drulesSelected) {
@@ -86,8 +94,8 @@ if ($data['pageFilter']->drulesSelected) {
 	$options = array(
 		'selectHosts' => array('hostid', 'name', 'status'),
 		'output' => API_OUTPUT_EXTEND,
-		'sortfield' => getPageSortField('ip'),
-		'sortorder' => getPageSortOrder(),
+		'sortfield' => $sortField,
+		'sortorder' => $sortOrder,
 		'limitSelects' => 1
 	);
 	if (!empty($data['druleid'])) {
diff --git a/frontends/php/discoveryconf.php b/frontends/php/discoveryconf.php
index fdd9b8a9e18..04bda6cb9e9 100644
--- a/frontends/php/discoveryconf.php
+++ b/frontends/php/discoveryconf.php
@@ -42,31 +42,39 @@ $fields = array(
 	'g_druleid' =>		array(T_ZBX_INT, O_OPT, null,	DB_ID,		null),
 	'dchecks' =>		array(null, O_OPT, null,		null,		null),
 	// actions
-	'go' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+							IN('"drule.massdelete","drule.massdisable","drule.massenable"'),
+							null
+						),
 	'save' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
-	'clone' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'delete' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form_refresh' =>	array(T_ZBX_INT, O_OPT, null,	null,		null),
 	'output' =>			array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
 	'ajaxaction' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
-	'ajaxdata' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,		null)
+	'ajaxdata' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
+	// sort and sortorder
+	'sort' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"name"'),								null),
+	'sortorder' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
 $_REQUEST['status'] = isset($_REQUEST['status']) ? DRULE_STATUS_ACTIVE : DRULE_STATUS_DISABLED;
-$_REQUEST['dchecks'] = get_request('dchecks', array());
+$_REQUEST['dchecks'] = getRequest('dchecks', array());
 
 /*
  * Permissions
  */
 if (isset($_REQUEST['druleid'])) {
 	$dbDRule = API::DRule()->get(array(
-		'druleids' => get_request('druleid'),
-		'output' => API_OUTPUT_EXTEND,
-		'selectDChecks' => API_OUTPUT_EXTEND,
+		'druleids' => getRequest('druleid'),
+		'output' => array('name', 'proxy_hostid', 'iprange', 'delay', 'status'),
+		'selectDChecks' => array(
+			'type', 'key_', 'snmp_community', 'ports', 'snmpv3_securityname', 'snmpv3_securitylevel',
+			'snmpv3_authpassphrase', 'snmpv3_privpassphrase', 'uniq', 'snmpv3_authprotocol', 'snmpv3_privprotocol',
+			'snmpv3_contextname'
+		),
 		'editable' => true
 	));
 	if (empty($dbDRule)) {
@@ -74,14 +82,12 @@ if (isset($_REQUEST['druleid'])) {
 	}
 }
 
-$_REQUEST['go'] = get_request('go', 'none');
-
 // ajax
 if (isset($_REQUEST['output']) && $_REQUEST['output'] == 'ajax') {
-	$ajaxResponse = new AjaxResponse;
+	$ajaxResponse = new CAjaxResponse;
 
 	if (isset($_REQUEST['ajaxaction']) && $_REQUEST['ajaxaction'] == 'validate') {
-		$ajaxData = get_request('ajaxdata', array());
+		$ajaxData = getRequest('ajaxdata', array());
 
 		foreach ($ajaxData as $check) {
 			switch ($check['field']) {
@@ -111,26 +117,30 @@ if (isset($_REQUEST['output']) && $_REQUEST['output'] == 'ajax') {
  * Action
  */
 if (isset($_REQUEST['save'])) {
-	$dChecks = get_request('dchecks', array());
-	$uniq = get_request('uniqueness_criteria', 0);
+	$dChecks = getRequest('dchecks', array());
+	$uniq = getRequest('uniqueness_criteria', 0);
 
 	foreach ($dChecks as $dcnum => $check) {
+		if (substr($check['dcheckid'], 0, 3) === 'new') {
+			unset($dChecks[$dcnum]['dcheckid']);
+		}
+
 		$dChecks[$dcnum]['uniq'] = ($uniq == $dcnum) ? 1 : 0;
 	}
 
 	$discoveryRule = array(
-		'name' => get_request('name'),
-		'proxy_hostid' => get_request('proxy_hostid'),
-		'iprange' => get_request('iprange'),
-		'delay' => get_request('delay'),
-		'status' => get_request('status'),
+		'name' => getRequest('name'),
+		'proxy_hostid' => getRequest('proxy_hostid'),
+		'iprange' => getRequest('iprange'),
+		'delay' => getRequest('delay'),
+		'status' => getRequest('status'),
 		'dchecks' => $dChecks
 	);
 
 	DBStart();
 
 	if (isset($_REQUEST['druleid'])) {
-		$discoveryRule['druleid'] = get_request('druleid');
+		$discoveryRule['druleid'] = getRequest('druleid');
 		$result = API::DRule()->update($discoveryRule);
 
 		$messageSuccess = _('Discovery rule updated');
@@ -152,22 +162,24 @@ if (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
 elseif (isset($_REQUEST['delete']) && isset($_REQUEST['druleid'])) {
 	$result = API::DRule()->delete(array($_REQUEST['druleid']));
 
-	show_messages($result, _('Discovery rule deleted'), _('Cannot delete discovery rule'));
-
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['druleid']);
-		clearCookies($result);
+		uncheckTableRows();
 	}
+	show_messages($result, _('Discovery rule deleted'), _('Cannot delete discovery rule'));
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('g_druleid')) {
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('drule.massenable', 'drule.massdisable')) && hasRequest('g_druleid')) {
 	$result = true;
-	$enable = (getRequest('go') == 'activate');
+	$enable = (getRequest('action') == 'drule.massenable');
 	$status = $enable ? DRULE_STATUS_ACTIVE : DRULE_STATUS_DISABLED;
 	$auditAction = $enable ? AUDIT_ACTION_ENABLE : AUDIT_ACTION_DISABLE;
 	$updated = 0;
@@ -175,7 +187,7 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 	DBStart();
 
 	foreach (getRequest('g_druleid') as $druleId) {
-		$result &= DBexecute('UPDATE drules SET status='.$status.' WHERE druleid='.zbx_dbstr($druleId));
+		$result &= DBexecute('UPDATE drules SET status='.zbx_dbstr($status).' WHERE druleid='.zbx_dbstr($druleId));
 
 		if ($result) {
 			$druleData = get_discovery_rule_by_druleid($druleId);
@@ -193,14 +205,19 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		: _n('Cannot disable discovery rule', 'Cannot disable discovery rules', $updated);
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['g_druleid'])) {
-	$result = API::DRule()->delete($_REQUEST['g_druleid']);
+elseif (hasRequest('action') && getRequest('action') == 'drule.massdelete' && hasRequest('g_druleid')) {
+	$result = API::DRule()->delete(getRequest('g_druleid'));
 
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('Discovery rules deleted'), _('Cannot delete discovery rules'));
-	clearCookies($result);
 }
 
 /*
@@ -208,10 +225,10 @@ elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['g_druleid'])) {
  */
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'druleid' => get_request('druleid'),
+		'druleid' => getRequest('druleid'),
 		'drule' => array(),
-		'form' => get_request('form'),
-		'form_refresh' => get_request('form_refresh', 0)
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh', 0)
 	);
 
 	// get drule
@@ -228,14 +245,14 @@ if (isset($_REQUEST['form'])) {
 		}
 	}
 	else {
-		$data['drule']['proxy_hostid'] = get_request('proxy_hostid', 0);
-		$data['drule']['name'] = get_request('name', '');
-		$data['drule']['iprange'] = get_request('iprange', '192.168.0.1-254');
-		$data['drule']['delay'] = get_request('delay', SEC_PER_HOUR);
-		$data['drule']['status'] = get_request('status', DRULE_STATUS_ACTIVE);
-		$data['drule']['dchecks'] = get_request('dchecks', array());
-		$data['drule']['nextcheck'] = get_request('nextcheck', 0);
-		$data['drule']['uniqueness_criteria'] = get_request('uniqueness_criteria', -1);
+		$data['drule']['proxy_hostid'] = getRequest('proxy_hostid', 0);
+		$data['drule']['name'] = getRequest('name', '');
+		$data['drule']['iprange'] = getRequest('iprange', '192.168.0.1-254');
+		$data['drule']['delay'] = getRequest('delay', SEC_PER_HOUR);
+		$data['drule']['status'] = getRequest('status', DRULE_STATUS_ACTIVE);
+		$data['drule']['dchecks'] = getRequest('dchecks', array());
+		$data['drule']['nextcheck'] = getRequest('nextcheck', 0);
+		$data['drule']['uniqueness_criteria'] = getRequest('uniqueness_criteria', -1);
 	}
 
 	if (!empty($data['drule']['dchecks'])) {
@@ -262,18 +279,26 @@ if (isset($_REQUEST['form'])) {
 	$discoveryView->show();
 }
 else {
-	$data = array();
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
+	$data = array(
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
+	);
 
 	// get drules
 	$data['drules'] = API::DRule()->get(array(
-		'output' => API_OUTPUT_EXTEND,
-		'sortfield' => getPageSortField('name'),
-		'selectDChecks' => API_OUTPUT_EXTEND,
+		'output' => array('proxy_hostid', 'name', 'status', 'iprange', 'delay'),
+		'selectDChecks' => array('type'),
 		'editable' => true
 	));
 
 	if ($data['drules']) {
-		foreach ($data['drules'] as $druleId => $drule) {
+		foreach ($data['drules'] as $key => $drule) {
 			// checks
 			$checks = array();
 
@@ -283,23 +308,23 @@ else {
 
 			order_result($checks);
 
-			$data['drules'][$druleId]['checks'] = $checks;
+			$data['drules'][$key]['checks'] = $checks;
 
 			// description
-			$data['drules'][$druleId]['description'] = array();
+			$data['drules'][$key]['description'] = array();
 
 			if ($drule['proxy_hostid']) {
 				$proxy = get_host_by_hostid($drule['proxy_hostid']);
 
-				array_push($data['drules'][$druleId]['description'], $proxy['host'].NAME_DELIMITER);
+				array_push($data['drules'][$key]['description'], $proxy['host'].NAME_DELIMITER);
 			}
 		}
 
-		order_result($data['drules'], getPageSortField('name'), getPageSortOrder());
+		order_result($data['drules'], $sortField, $sortOrder);
 	}
 
 	// get paging
-	$data['paging'] = getPagingLine($data['drules'], array('druleid'));
+	$data['paging'] = getPagingLine($data['drules']);
 
 	// render view
 	$discoveryView = new CView('configuration.discovery.list', $data);
diff --git a/frontends/php/events.php b/frontends/php/events.php
index 1cd78aacb9e..6fdbd1384cd 100644
--- a/frontends/php/events.php
+++ b/frontends/php/events.php
@@ -64,10 +64,6 @@ $fields = array(
 	'hostid'=>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'triggerid'=>		array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'period'=>			array(T_ZBX_INT, O_OPT, null,	null,		null),
-	'dec'=>				array(T_ZBX_INT, O_OPT, null,	null,		null),
-	'inc'=>				array(T_ZBX_INT, O_OPT, null,	null,		null),
-	'left'=>			array(T_ZBX_INT, O_OPT, null,	null,		null),
-	'right'=>			array(T_ZBX_INT, O_OPT, null,	null,		null),
 	'stime'=>			array(T_ZBX_STR, O_OPT, null,	null,		null),
 	'load'=>			array(T_ZBX_STR, O_OPT, P_SYS,	NULL,		null),
 	'fullscreen'=>		array(T_ZBX_INT, O_OPT, P_SYS,	IN('0,1'),	null),
@@ -303,7 +299,7 @@ else {
 	$frmForm->addItem(new CSubmit('csv_export', _('Export to CSV')));
 
 	$eventsWidget->addPageHeader(
-		_('HISTORY OF EVENTS').SPACE.'['.zbx_date2str(_('d M Y H:i:s')).']',
+		_('HISTORY OF EVENTS').SPACE.'['.zbx_date2str(DATE_TIME_FORMAT_SECONDS).']',
 		array(
 			$frmForm,
 			SPACE,
@@ -319,7 +315,7 @@ else {
 	// add host and group filters to the form
 	if ($source == EVENT_SOURCE_TRIGGERS) {
 		if (getRequest('triggerid') != 0) {
-			$r_form->addVar('triggerid', get_request('triggerid'));
+			$r_form->addVar('triggerid', getRequest('triggerid'));
 		}
 
 		$r_form->addItem(array(
@@ -346,6 +342,7 @@ else {
 
 	if ($source == EVENT_SOURCE_TRIGGERS) {
 		$filterForm = new CFormTable(null, null, 'get');
+		$filterForm->setTableClass('formtable old-filter');
 		$filterForm->setAttribute('name', 'zbx_filter');
 		$filterForm->setAttribute('id', 'zbx_filter');
 		$filterForm->addVar('triggerid', $triggerId);
@@ -377,7 +374,7 @@ else {
 		$filterForm->addRow(new CRow(array(
 			new CCol(_('Trigger'), 'form_row_l'),
 			new CCol(array(
-				new CTextBox('trigger', $trigger, 96, 'yes'),
+				new CTextBox('trigger', $trigger, 96, true),
 				new CButton('btn1', _('Select'),
 					'return PopUp("popup.php?'.
 						'dstfrm='.$filterForm->getName().
@@ -601,7 +598,7 @@ else {
 
 			if ($csvExport) {
 				$csvRows[] = array(
-					zbx_date2str(EVENTS_DISCOVERY_TIME_FORMAT, $event_data['clock']),
+					zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event_data['clock']),
 					$event_data['object_data']['ip'],
 					$event_data['object_data']['dns'],
 					$event_data['description'],
@@ -610,7 +607,7 @@ else {
 			}
 			else {
 				$table->addRow(array(
-					zbx_date2str(EVENTS_DISCOVERY_TIME_FORMAT, $event_data['clock']),
+					zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event_data['clock']),
 					$event_data['object_data']['ip'],
 					zbx_empty($event_data['object_data']['dns']) ? SPACE : $event_data['object_data']['dns'],
 					$event_data['description'],
@@ -623,39 +620,104 @@ else {
 	// source not discovery i.e. trigger
 	else {
 		if ($csvExport || $pageFilter->hostsSelected) {
-			$options = array(
+			$knownTriggerIds = array();
+			$validTriggerIds = array();
+
+			$triggerOptions = array(
 				'output' => array('triggerid'),
+				'preservekeys' => true,
 				'monitored' => true
 			);
 
-			if ($triggerId) {
-				$options['triggerids'] = $triggerId;
-			}
-			else {
-				if (getRequest('hostid', 0) > 0) {
-					$options['hostids'] = getRequest('hostid');
-				}
-				elseif (getRequest('groupid') > 0) {
-					$options['groupids'] = getRequest('groupid');
-				}
-			}
-
-			$triggers = API::Trigger()->get($options);
+			$allEventsSliceLimit = $config['search_limit'];
 
-			// query event with short data
-			$events = API::Event()->get(array(
+			$eventOptions = array(
 				'source' => EVENT_SOURCE_TRIGGERS,
 				'object' => EVENT_OBJECT_TRIGGER,
-				'objectids' => zbx_objectValues($triggers, 'triggerid'),
 				'time_from' => $from,
 				'time_till' => $till,
-				'output' => array('eventid'),
+				'output' => array('eventid', 'objectid'),
 				'sortfield' => array('clock', 'eventid'),
 				'sortorder' => ZBX_SORT_DOWN,
-				'limit' => $config['search_limit'] + 1
-			));
+				'limit' => $allEventsSliceLimit + 1
+			);
+
+			if (getRequest('triggerid')) {
+				$filterTriggerIds = array(getRequest('triggerid'));
+				$knownTriggerIds = array_combine($filterTriggerIds, $filterTriggerIds);
+				$validTriggerIds = $knownTriggerIds;
+
+				$eventOptions['objectids'] = $filterTriggerIds;
+			}
+			elseif ($pageFilter->hostid > 0) {
+				$hostTriggers = API::Trigger()->get(array(
+					'output' => array('triggerid'),
+					'hostids' => $pageFilter->hostid,
+					'monitored' => true,
+					'preservekeys' => true
+				));
+				$filterTriggerIds = array_map('strval', array_keys($hostTriggers));
+				$knownTriggerIds = array_combine($filterTriggerIds, $filterTriggerIds);
+				$validTriggerIds = $knownTriggerIds;
+
+				$eventOptions['hostids'] = $pageFilter->hostid;
+				$eventOptions['objectids'] = $validTriggerIds;
+			}
+			elseif ($pageFilter->groupid > 0) {
+				$eventOptions['groupids'] = $pageFilter->groupid;
+
+				$triggerOptions['groupids'] = $pageFilter->groupid;
+			}
+
+			$events = array();
+
+			while (true) {
+				$allEventsSlice = API::Event()->get($eventOptions);
+
+				$triggerIdsFromSlice = array_keys(array_flip(zbx_objectValues($allEventsSlice, 'objectid')));
+
+				$unknownTriggerIds = array_diff($triggerIdsFromSlice, $knownTriggerIds);
+
+				if ($unknownTriggerIds) {
+					$triggerOptions['triggerids'] = $unknownTriggerIds;
+					$validTriggersFromSlice = API::Trigger()->get($triggerOptions);
+
+					foreach ($validTriggersFromSlice as $trigger) {
+						$validTriggerIds[$trigger['triggerid']] = $trigger['triggerid'];
+					}
+
+					foreach ($unknownTriggerIds as $id) {
+						$id = strval($id);
+						$knownTriggerIds[$id] = $id;
+					}
+				}
+
+				foreach ($allEventsSlice as $event) {
+					if (isset($validTriggerIds[$event['objectid']])) {
+						$events[] = array('eventid' => $event['eventid']);
+					}
+				}
+
+				// break loop when either enough events have been retrieved, or last slice was not full
+				if (count($events) >= $config['search_limit'] || count($allEventsSlice) <= $allEventsSliceLimit) {
+					break;
+				}
+
+				/*
+				 * Because events in slices are sorted descending by eventid (i.e. bigger eventid),
+				 * first event in next slice must have eventid that is previous to last eventid in current slice.
+				 */
+				$lastEvent = end($allEventsSlice);
+				$eventOptions['eventid_till'] = $lastEvent['eventid'] - 1;
+			}
+
+			/*
+			 * At this point it is possible that more than $config['search_limit'] events are selected,
+			 * therefore at most only first $config['search_limit'] + 1 events will be used for pagination.
+			 */
+			$events = array_slice($events, 0, $config['search_limit'] + 1);
 
-			// get pagging
+			// get paging
 			$paging = getPagingLine($events);
 
 			// query event with extend data
@@ -676,7 +738,7 @@ else {
 
 			$triggers = API::Trigger()->get(array(
 				'triggerids' => zbx_objectValues($events, 'objectid'),
-				'selectHosts' => array('hostid'),
+				'selectHosts' => array('hostid', 'status'),
 				'selectItems' => array('itemid', 'hostid', 'name', 'key_', 'value_type'),
 				'output' => array('description', 'expression', 'priority', 'flags', 'url')
 			));
@@ -722,7 +784,7 @@ else {
 						'params' => array(
 							'itemid' => $item['itemid'],
 							'action' => in_array($item['value_type'], array(ITEM_VALUE_TYPE_FLOAT, ITEM_VALUE_TYPE_UINT64))
-								? 'showgraph' : 'showvalues'
+								? HISTORY_GRAPH : HISTORY_VALUES
 						)
 					);
 				}
@@ -742,7 +804,7 @@ else {
 
 				if ($csvExport) {
 					$csvRows[] = array(
-						zbx_date2str(EVENTS_ACTION_TIME_FORMAT, $event['clock']),
+						zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event['clock']),
 						(getRequest('hostid', 0) == 0) ? $host['name'] : null,
 						$description,
 						trigger_value2str($event['value']),
@@ -780,7 +842,7 @@ else {
 					}
 
 					$table->addRow(array(
-						new CLink(zbx_date2str(EVENTS_ACTION_TIME_FORMAT, $event['clock']),
+						new CLink(zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event['clock']),
 								'tr_events.php?triggerid='.$event['objectid'].'&eventid='.$event['eventid'],
 							'action'
 						),
diff --git a/frontends/php/graphs.php b/frontends/php/graphs.php
index e9af4935460..aecc7a4cd45 100644
--- a/frontends/php/graphs.php
+++ b/frontends/php/graphs.php
@@ -60,16 +60,19 @@ $fields = array(
 	'copy_targetid' =>		array(T_ZBX_INT, O_OPT, null,		DB_ID,			null),
 	'copy_groupid' =>		array(T_ZBX_INT, O_OPT, P_SYS,		DB_ID,			'isset({copy})&&isset({copy_type})&&{copy_type}==0'),
 	// actions
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, IN('"graph.masscopyto","graph.massdelete"'),	null),
 	'save' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'clone' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'copy' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'cancel' =>				array(T_ZBX_STR, O_OPT, P_SYS,		null,			null),
 	'form' =>				array(T_ZBX_STR, O_OPT, P_SYS,		null,			null),
-	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,		null,			null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,		null,			null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"graphtype","name"'),					null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
-$percentVisible = get_request('visible');
+$percentVisible = getRequest('visible');
 if (!isset($percentVisible['percent_left'])) {
 	unset($_REQUEST['percent_left']);
 }
@@ -83,12 +86,10 @@ if (isset($_REQUEST['yaxismax']) && zbx_empty($_REQUEST['yaxismax'])) {
 	unset($_REQUEST['yaxismax']);
 }
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
-$_REQUEST['go'] = get_request('go', 'none');
-$_REQUEST['items'] = get_request('items', array());
-$_REQUEST['show_3d'] = get_request('show_3d', 0);
-$_REQUEST['show_legend'] = get_request('show_legend', 0);
+$_REQUEST['items'] = getRequest('items', array());
+$_REQUEST['show_3d'] = getRequest('show_3d', 0);
+$_REQUEST['show_legend'] = getRequest('show_legend', 0);
 
 /*
  * Permissions
@@ -107,7 +108,7 @@ if (CUser::$userData['type'] !== USER_TYPE_SUPER_ADMIN) {
 			access_deny();
 		}
 
-		// sets coresponding hostid for later usage
+		// sets corresponding hostid for later usage
 		if (empty($_REQUEST['hostid'])) {
 			$_REQUEST['hostid'] = $discovery_rule['hostid'];
 		}
@@ -167,16 +168,20 @@ if (isset($_REQUEST['clone']) && isset($_REQUEST['graphid'])) {
 		: API::GraphPrototype()->get($options);
 	$graph = reset($graph);
 
-	$_REQUEST = array_merge($_REQUEST, $graph);
-
-	// graph items
-	$_REQUEST['items'] = API::GraphItem()->get(array(
+	$graph['items'] = API::GraphItem()->get(array(
 		'graphids' => $_REQUEST['graphid'],
 		'sortfield' => 'gitemid',
 		'output' => API_OUTPUT_EXTEND,
 		'expandData' => true
 	));
 
+	if($graph['templateid']) {
+		$_REQUEST = array_merge($_REQUEST, $graph);
+	}
+	else {
+		$graph = array_merge($graph, $_REQUEST);
+	}
+
 	unset($_REQUEST['graphid']);
 
 	$_REQUEST['form'] = 'clone';
@@ -267,8 +272,11 @@ elseif (hasRequest('save')) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows($cookieId);
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, $cookieId);
 }
 elseif (hasRequest('delete') && hasRequest('graphid')) {
 	$graphId = getRequest('graphid');
@@ -276,38 +284,46 @@ elseif (hasRequest('delete') && hasRequest('graphid')) {
 	if (hasRequest('parent_discoveryid')) {
 		$result = API::GraphPrototype()->delete(array($graphId));
 
+		if ($result) {
+			uncheckTableRows(getRequest('parent_discoveryid'));
+		}
 		show_messages($result, _('Graph prototype deleted'), _('Cannot delete graph prototype'));
-		clearCookies($result, getRequest('parent_discoveryid'));
 	}
 	else {
 		$result = API::Graph()->delete(array($graphId));
 
+		if ($result) {
+			uncheckTableRows(getRequest('hostid'));
+		}
 		show_messages($result, _('Graph deleted'), _('Cannot delete graph'));
-		clearCookies($result, getRequest('hostid'));
 	}
 
 	if ($result) {
 		unset($_REQUEST['form']);
 	}
 }
-elseif (getRequest('go') == 'delete' && hasRequest('group_graphid')) {
+elseif (hasRequest('action') && getRequest('action') == 'graph.massdelete' && hasRequest('group_graphid')) {
 	$graphIds = getRequest('group_graphid');
 
 	if (hasRequest('parent_discoveryid')) {
 		$result = API::GraphPrototype()->delete($graphIds);
 
+		if ($result) {
+			uncheckTableRows(getRequest('parent_discoveryid'));
+		}
 		show_messages($result, _('Graph prototypes deleted'), _('Cannot delete graph prototypes'));
-		clearCookies($result, getRequest('parent_discoveryid'));
 	}
 	else {
 		$result = API::Graph()->delete($graphIds);
 
+		if ($result) {
+			uncheckTableRows(getRequest('hostid'));
+		}
 		show_messages($result, _('Graphs deleted'), _('Cannot delete graphs'));
-		clearCookies($result, getRequest('hostid'));
 	}
-} elseif (getRequest('go') == 'copy_to' && hasRequest('copy') && hasRequest('group_graphid')) {
+} elseif (hasRequest('action') && getRequest('action') == 'graph.masscopyto' && hasRequest('copy') && hasRequest('group_graphid')) {
 	if (getRequest('copy_targetid') != 0 && hasRequest('copy_type')) {
-		$goResult = true;
+		$result = true;
 
 		$options = array(
 			'output' => array('hostid'),
@@ -344,17 +360,18 @@ elseif (getRequest('go') == 'delete' && hasRequest('group_graphid')) {
 		DBstart();
 		foreach (getRequest('group_graphid') as $graphid) {
 			foreach ($dbHosts as $host) {
-				$goResult &= (bool) copyGraphToHost($graphid, $host['hostid']);
+				$result &= (bool) copyGraphToHost($graphid, $host['hostid']);
 			}
 		}
-		$goResult = DBend($goResult);
+		$result = DBend($result);
 
-		show_messages($goResult, _('Graphs copied'), _('Cannot copy graphs'));
-		clearCookies($goResult,
-			getRequest('parent_discoveryid') == 0 ? getRequest('hostid') : getRequest('parent_discoveryid')
-		);
-
-		$_REQUEST['go'] = 'none2';
+		if ($result) {
+			uncheckTableRows(
+				getRequest('parent_discoveryid') == 0 ? getRequest('hostid') : getRequest('parent_discoveryid')
+			);
+			unset($_REQUEST['group_graphid']);
+		}
+		show_messages($result, _('Graphs copied'), _('Cannot copy graphs'));
 	}
 	else {
 		error(_('No target selected.'));
@@ -367,15 +384,15 @@ elseif (getRequest('go') == 'delete' && hasRequest('group_graphid')) {
  */
 $pageFilter = new CPageFilter(array(
 	'groups' => array(
-		'not_proxy_hosts' => true,
+		'with_hosts_and_templates' => true,
 		'editable' => true
 	),
 	'hosts' => array(
 		'editable' => true,
 		'templated_hosts' => true
 	),
-	'groupid' => get_request('groupid', null),
-	'hostid' => get_request('hostid', null)
+	'groupid' => getRequest('groupid'),
+	'hostid' => getRequest('hostid')
 ));
 
 if (empty($_REQUEST['parent_discoveryid'])) {
@@ -387,21 +404,23 @@ if (empty($_REQUEST['parent_discoveryid'])) {
 	}
 }
 
-if ($_REQUEST['go'] == 'copy_to' && isset($_REQUEST['group_graphid'])) {
+if (hasRequest('action') && getRequest('action') == 'graph.masscopyto' && hasRequest('group_graphid')) {
 	// render view
-	$graphView = new CView('configuration.copy.elements', getCopyElementsFormData('group_graphid'));
+	$data = getCopyElementsFormData('group_graphid');
+	$data['action'] = 'graph.masscopyto';
+	$graphView = new CView('configuration.copy.elements', $data);
 	$graphView->render();
 	$graphView->show();
 }
 elseif (isset($_REQUEST['form'])) {
 	$data = array(
-		'form' => get_request('form'),
-		'form_refresh' => get_request('form_refresh', 0),
-		'graphid' => get_request('graphid', 0),
-		'parent_discoveryid' => get_request('parent_discoveryid'),
-		'group_gid' => get_request('group_gid', array()),
-		'hostid' => get_request('hostid', 0),
-		'normal_only' => get_request('normal_only')
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh', 0),
+		'graphid' => getRequest('graphid', 0),
+		'parent_discoveryid' => getRequest('parent_discoveryid'),
+		'group_gid' => getRequest('group_gid', array()),
+		'hostid' => getRequest('hostid', 0),
+		'normal_only' => getRequest('normal_only')
 	);
 
 	if (!empty($data['graphid']) && !isset($_REQUEST['form_refresh'])) {
@@ -445,7 +464,7 @@ elseif (isset($_REQUEST['form'])) {
 				$parentGraph = getGraphByGraphId($parentGraphid);
 
 				// parent graph prototype link
-				if (get_request('parent_discoveryid')) {
+				if (getRequest('parent_discoveryid')) {
 					$parentGraphPrototype = API::GraphPrototype()->get(array(
 						'output' => array('graphid'),
 						'graphids' => $parentGraph['graphid'],
@@ -472,7 +491,7 @@ elseif (isset($_REQUEST['form'])) {
 				}
 				if (isset($link)) {
 					$data['templates'][] = $link;
-					$data['templates'][] = SPACE.RARR.SPACE;
+					$data['templates'][] = SPACE.'&rArr;'.SPACE;
 				}
 				$parentGraphid = $parentGraph['templateid'];
 			} while ($parentGraphid != 0);
@@ -490,39 +509,39 @@ elseif (isset($_REQUEST['form'])) {
 		));
 	}
 	else {
-		$data['name'] = get_request('name', '');
-		$data['graphtype'] = get_request('graphtype', GRAPH_TYPE_NORMAL);
+		$data['name'] = getRequest('name', '');
+		$data['graphtype'] = getRequest('graphtype', GRAPH_TYPE_NORMAL);
 
 		if ($data['graphtype'] == GRAPH_TYPE_PIE || $data['graphtype'] == GRAPH_TYPE_EXPLODED) {
-			$data['width'] = get_request('width', 400);
-			$data['height'] = get_request('height', 300);
+			$data['width'] = getRequest('width', 400);
+			$data['height'] = getRequest('height', 300);
 		}
 		else {
-			$data['width'] = get_request('width', 900);
-			$data['height'] = get_request('height', 200);
+			$data['width'] = getRequest('width', 900);
+			$data['height'] = getRequest('height', 200);
 		}
 
-		$data['ymin_type'] = get_request('ymin_type', GRAPH_YAXIS_TYPE_CALCULATED);
-		$data['ymax_type'] = get_request('ymax_type', GRAPH_YAXIS_TYPE_CALCULATED);
-		$data['yaxismin'] = get_request('yaxismin', 0);
-		$data['yaxismax'] = get_request('yaxismax', 100);
-		$data['ymin_itemid'] = get_request('ymin_itemid', 0);
-		$data['ymax_itemid'] = get_request('ymax_itemid', 0);
-		$data['show_work_period'] = get_request('show_work_period', 0);
-		$data['show_triggers'] = get_request('show_triggers', 0);
-		$data['show_legend'] = get_request('show_legend', 0);
-		$data['show_3d'] = get_request('show_3d', 0);
-		$data['visible'] = get_request('visible');
+		$data['ymin_type'] = getRequest('ymin_type', GRAPH_YAXIS_TYPE_CALCULATED);
+		$data['ymax_type'] = getRequest('ymax_type', GRAPH_YAXIS_TYPE_CALCULATED);
+		$data['yaxismin'] = getRequest('yaxismin', 0);
+		$data['yaxismax'] = getRequest('yaxismax', 100);
+		$data['ymin_itemid'] = getRequest('ymin_itemid', 0);
+		$data['ymax_itemid'] = getRequest('ymax_itemid', 0);
+		$data['show_work_period'] = getRequest('show_work_period', 0);
+		$data['show_triggers'] = getRequest('show_triggers', 0);
+		$data['show_legend'] = getRequest('show_legend', 0);
+		$data['show_3d'] = getRequest('show_3d', 0);
+		$data['visible'] = getRequest('visible');
 		$data['percent_left'] = 0;
 		$data['percent_right'] = 0;
-		$data['visible'] = get_request('visible');
-		$data['items'] = get_request('items', array());
+		$data['visible'] = getRequest('visible');
+		$data['items'] = getRequest('items', array());
 
 		if (isset($data['visible']['percent_left'])) {
-			$data['percent_left'] = get_request('percent_left', 0);
+			$data['percent_left'] = getRequest('percent_left', 0);
 		}
 		if (isset($data['visible']['percent_right'])) {
-			$data['percent_right'] = get_request('percent_right', 0);
+			$data['percent_right'] = getRequest('percent_right', 0);
 		}
 	}
 
@@ -590,22 +609,27 @@ elseif (isset($_REQUEST['form'])) {
 	$graphView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
 		'pageFilter' => $pageFilter,
-		'hostid' => ($pageFilter->hostid > 0) ? $pageFilter->hostid : get_request('hostid'),
-		'parent_discoveryid' => get_request('parent_discoveryid'),
+		'hostid' => ($pageFilter->hostid > 0) ? $pageFilter->hostid : getRequest('hostid'),
+		'parent_discoveryid' => getRequest('parent_discoveryid'),
 		'graphs' => array(),
-		'discovery_rule' => empty($_REQUEST['parent_discoveryid']) ? null : $discovery_rule
+		'discovery_rule' => empty($_REQUEST['parent_discoveryid']) ? null : $discovery_rule,
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	$sortfield = getPageSortField('name');
-	$sortorder = getPageSortOrder();
-
 	// get graphs
 	$options = array(
 		'hostids' => $data['hostid'] ? $data['hostid'] : null,
 		'groupids' => (!$data['hostid'] && $pageFilter->groupid > 0) ? $pageFilter->groupid : null,
-		'discoveryids' => empty($_REQUEST['parent_discoveryid']) ? null : get_request('parent_discoveryid'),
+		'discoveryids' => empty($_REQUEST['parent_discoveryid']) ? null : getRequest('parent_discoveryid'),
 		'editable' => true,
 		'output' => array('graphid', 'name', 'graphtype'),
 		'limit' => $config['search_limit'] + 1
@@ -615,22 +639,15 @@ else {
 		? API::Graph()->get($options)
 		: API::GraphPrototype()->get($options);
 
-	if ($sortfield == 'graphtype') {
+	if ($sortField == 'graphtype') {
 		foreach ($data['graphs'] as $gnum => $graph) {
 			$data['graphs'][$gnum]['graphtype'] = graphType($graph['graphtype']);
 		}
 	}
 
-	order_result($data['graphs'], $sortfield, $sortorder);
+	order_result($data['graphs'], $sortField, $sortOrder);
 
-	$data['paging'] = getPagingLine(
-		$data['graphs'],
-		array('graphid'),
-		array(
-			'hostid' => get_request('hostid'),
-			'parent_discoveryid' => get_request('parent_discoveryid')
-		)
-	);
+	$data['paging'] = getPagingLine($data['graphs']);
 
 	// get graphs after paging
 	$options = array(
@@ -649,7 +666,7 @@ else {
 		$data['graphs'][$gnum]['graphtype'] = graphType($graph['graphtype']);
 	}
 
-	order_result($data['graphs'], $sortfield, $sortorder);
+	order_result($data['graphs'], $sortField, $sortOrder);
 
 	// render view
 	$graphView = new CView('configuration.graph.list', $data);
diff --git a/frontends/php/history.php b/frontends/php/history.php
index fea1a848c78..1208875fb6a 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -25,7 +25,7 @@ require_once dirname(__FILE__).'/include/graphs.inc.php';
 
 $page['file'] = 'history.php';
 $page['title'] = _('History');
-$page['hist_arg'] = array('itemid', 'hostid', 'groupid', 'graphid', 'period', 'dec', 'inc', 'left', 'right', 'stime', 'action');
+$page['hist_arg'] = array('itemids', 'period', 'stime', 'action', 'graphtype');
 $page['scripts'] = array('class.calendar.js', 'gtlc.js', 'flickerfreescreen.js');
 $page['type'] = detect_page_type(PAGE_TYPE_HTML);
 
@@ -38,24 +38,21 @@ require_once dirname(__FILE__).'/include/page_header.php';
 
 // VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
 $fields = array(
-	'itemid' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,	'!isset({favobj})'),
+	'itemids' =>		array(T_ZBX_INT, O_MAND, P_SYS,	DB_ID,	'isset({favobj})'),
 	'period' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'dec' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'inc' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'left' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
-	'right' =>			array(T_ZBX_INT, O_OPT, null,	null,	null),
 	'stime' =>			array(T_ZBX_STR, O_OPT, null,	null,	null),
 	'filter_task' =>	array(T_ZBX_STR, O_OPT, null,	IN(FILTER_TASK_SHOW.','.FILTER_TASK_HIDE.','.FILTER_TASK_MARK.','.FILTER_TASK_INVERT_MARK), null),
 	'filter' =>			array(T_ZBX_STR, O_OPT, null,	null,	null),
 	'mark_color' =>		array(T_ZBX_STR, O_OPT, null,	IN(MARK_COLOR_RED.','.MARK_COLOR_GREEN.','.MARK_COLOR_BLUE), null),
 	'cmbitemlist' =>	array(T_ZBX_INT, O_OPT, null,	DB_ID,	null),
 	'plaintext' =>		array(T_ZBX_STR, O_OPT, null,	null,	null),
-	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS,	IN('"showgraph","showvalues","showlatest","add","remove"'), null),
+	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS,	IN('"'.HISTORY_GRAPH.'","'.HISTORY_VALUES.'","'.HISTORY_LATEST.'","'.HISTORY_BATCH_GRAPH.'"'), null),
+	'graphtype' =>      array(T_ZBX_INT, O_OPT, null,   IN(array(GRAPH_TYPE_NORMAL, GRAPH_TYPE_STACKED)), null),
 	// ajax
 	'filterState' =>	array(T_ZBX_INT, O_OPT, P_ACT,	null,	null),
 	'favobj' =>			array(T_ZBX_STR, O_OPT, P_ACT,	null,	null),
 	'favid' =>			array(T_ZBX_INT, O_OPT, P_ACT,	null,	null),
-	'favaction' =>		array(T_ZBX_STR, O_OPT, P_ACT,	IN("'add','remove'"), null),
+	'favaction' =>		array(T_ZBX_STR, O_OPT, P_ACT,	IN('"add","remove"'), null),
 	// actions
 	'reset' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null),
 	'cancel' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,	null),
@@ -119,21 +116,20 @@ if ($page['type'] == PAGE_TYPE_JS || $page['type'] == PAGE_TYPE_HTML_BLOCK) {
 /*
  * Actions
  */
-$_REQUEST['action'] = get_request('action', 'showgraph');
-$_REQUEST['itemid'] = array_unique(zbx_toArray($_REQUEST['itemid']));
+$_REQUEST['action'] = getRequest('action', HISTORY_GRAPH);
 
 /*
  * Display
  */
 $items = API::Item()->get(array(
-	'itemids' => $_REQUEST['itemid'],
+	'itemids' => getRequest('itemids'),
 	'webitems' => true,
 	'selectHosts' => array('name'),
 	'output' => array('itemid', 'key_', 'name', 'value_type', 'hostid', 'valuemapid'),
 	'preservekeys' => true
 ));
 
-foreach ($_REQUEST['itemid'] as $itemid) {
+foreach (getRequest('itemids') as $itemid) {
 	if (!isset($items[$itemid])) {
 		access_deny();
 	}
@@ -142,20 +138,19 @@ foreach ($_REQUEST['itemid'] as $itemid) {
 $items = CMacrosResolverHelper::resolveItemNames($items);
 
 $item = reset($items);
-$host = reset($item['hosts']);
-$item['hostname'] = $host['name'];
 
 $data = array(
-	'itemids' => get_request('itemid'),
+	'itemids' => getRequest('itemids'),
 	'items' => $items,
-	'item' => $item,
-	'action' => get_request('action'),
-	'period' => get_request('period'),
-	'stime' => get_request('stime'),
+	'value_type' => $item['value_type'],
+	'action' => getRequest('action'),
+	'period' => getRequest('period'),
+	'stime' => getRequest('stime'),
 	'plaintext' => isset($_REQUEST['plaintext']),
 	'iv_string' => array(ITEM_VALUE_TYPE_LOG => 1, ITEM_VALUE_TYPE_TEXT => 1),
 	'iv_numeric' => array(ITEM_VALUE_TYPE_FLOAT => 1, ITEM_VALUE_TYPE_UINT64 => 1),
-	'fullscreen' => $_REQUEST['fullscreen']
+	'fullscreen' => $_REQUEST['fullscreen'],
+	'graphtype' => getRequest('graphtype', GRAPH_TYPE_NORMAL)
 );
 
 // render view
diff --git a/frontends/php/host_discovery.php b/frontends/php/host_discovery.php
index fb36d818b98..b253ff07c9e 100644
--- a/frontends/php/host_discovery.php
+++ b/frontends/php/host_discovery.php
@@ -31,7 +31,7 @@ $page['hist_arg'] = array('hostid');
 
 require_once dirname(__FILE__).'/include/page_header.php';
 
-$paramsFieldName = getParamFieldNameByType(get_request('type', 0));
+$paramsFieldName = getParamFieldNameByType(getRequest('type', 0));
 
 // supported eval types
 $evalTypes = array(
@@ -73,7 +73,7 @@ $fields = array(
 		'isset({save})&&isset({type})&&({type})=='.ITEM_TYPE_SSH.'&&({authtype})=='.ITEM_AUTHTYPE_PUBLICKEY),
 	$paramsFieldName =>		array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({save})&&isset({type})&&'.
 		IN(ITEM_TYPE_SSH.','.ITEM_TYPE_DB_MONITOR.','.ITEM_TYPE_TELNET.','.ITEM_TYPE_CALCULATED, 'type'),
-		getParamFieldLabelByType(get_request('type', 0))),
+		getParamFieldLabelByType(getRequest('type', 0))),
 	'snmp_community' =>		array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,
 		'isset({save})&&isset({type})&&'.IN(ITEM_TYPE_SNMPV1.','.ITEM_TYPE_SNMPV2C,'type'),
 		_('SNMP community')),
@@ -99,7 +99,7 @@ $fields = array(
 		'isset({save})&&(isset({type})&&({type}=='.ITEM_TYPE_SNMPV3.')&&({snmpv3_securitylevel}=='.ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV.'))'),
 	'snmpv3_privpassphrase' => array(T_ZBX_STR, O_OPT, null, null,
 		'isset({save})&&(isset({type})&&({type}=='.ITEM_TYPE_SNMPV3.')&&({snmpv3_securitylevel}=='.ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV.'))'),
-	'ipmi_sensor' =>		array(T_ZBX_STR, O_OPT, NO_TRIM,	NOT_EMPTY,
+	'ipmi_sensor' =>		array(T_ZBX_STR, O_OPT, P_NO_TRIM,	NOT_EMPTY,
 		'isset({save})&&(isset({type})&&({type}=='.ITEM_TYPE_IPMI.'))', _('IPMI sensor')),
 	'trapper_hosts' =>		array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})&&isset({type})&&({type}==2)'),
 	'lifetime' => 			array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})'),
@@ -108,7 +108,10 @@ $fields = array(
 	'formula' => 			array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})'),
 	'conditions' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	// actions
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+								IN('"discoveryrule.massdelete","discoveryrule.massdisable","discoveryrule.massenable"'),
+								null
+							),
 	'g_hostdruleid' =>		array(T_ZBX_INT, O_OPT, null,	DB_ID,		null),
 	'save' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'clone' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -116,19 +119,20 @@ $fields = array(
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
-	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,	null,		null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,	null,		null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"delay","key_","name","status","type"'),	null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
-$_REQUEST['go'] = get_request('go', 'none');
-$_REQUEST['params'] = get_request($paramsFieldName, '');
+$_REQUEST['params'] = getRequest($paramsFieldName, '');
 unset($_REQUEST[$paramsFieldName]);
 
 /*
  * Permissions
  */
-if (get_request('itemid', false)) {
+if (getRequest('itemid', false)) {
 	$item = API::DiscoveryRule()->get(array(
 		'itemids' => $_REQUEST['itemid'],
 		'output' => API_OUTPUT_EXTEND,
@@ -161,7 +165,7 @@ else {
  */
 if (isset($_REQUEST['add_delay_flex']) && isset($_REQUEST['new_delay_flex'])) {
 	$timePeriodValidator = new CTimePeriodValidator(array('allowMultiple' => false));
-	$_REQUEST['delay_flex'] = get_request('delay_flex', array());
+	$_REQUEST['delay_flex'] = getRequest('delay_flex', array());
 
 	if ($timePeriodValidator->validate($_REQUEST['new_delay_flex']['period'])) {
 		array_push($_REQUEST['delay_flex'], $_REQUEST['new_delay_flex']);
@@ -175,12 +179,15 @@ if (isset($_REQUEST['add_delay_flex']) && isset($_REQUEST['new_delay_flex'])) {
 elseif (isset($_REQUEST['delete']) && isset($_REQUEST['itemid'])) {
 	$result = API::DiscoveryRule()->delete(array(getRequest('itemid')));
 
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
 	show_messages($result, _('Discovery rule deleted'), _('Cannot delete discovery rule'));
+
 	unset($_REQUEST['itemid'], $_REQUEST['form']);
-	clearCookies($result, $_REQUEST['hostid']);
 }
 elseif (isset($_REQUEST['save'])) {
-	$delay_flex = get_request('delay_flex', array());
+	$delay_flex = getRequest('delay_flex', array());
 
 	$db_delay_flex = '';
 	foreach ($delay_flex as $val) {
@@ -230,7 +237,7 @@ elseif (isset($_REQUEST['save'])) {
 	$conditions = array_values($conditions);
 	foreach ($conditions as $condition) {
 		if (!zbx_empty($condition['macro'])) {
-			$condition['macro'] = zbx_strtoupper($condition['macro']);
+			$condition['macro'] = mb_strtoupper($condition['macro']);
 
 			$filter['conditions'][] = $condition;
 		}
@@ -292,17 +299,21 @@ elseif (isset($_REQUEST['save'])) {
 
 	if ($result) {
 		unset($_REQUEST['itemid'], $_REQUEST['form']);
-		clearCookies($result, $_REQUEST['hostid']);
+		uncheckTableRows(getRequest('hostid'));
 	}
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('g_hostdruleid')) {
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('discoveryrule.massenable', 'discoveryrule.massdisable')) && hasRequest('g_hostdruleid')) {
 	$groupHostDiscoveryRuleId = getRequest('g_hostdruleid');
-	$enable = (getRequest('go') == 'activate');
+	$enable = (getRequest('action') == 'discoveryrule.massenable');
 
 	DBstart();
 	$result = $enable ? activate_item($groupHostDiscoveryRuleId) : disable_item($groupHostDiscoveryRuleId);
 	$result = DBend($result);
 
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
+
 	$updated = count($groupHostDiscoveryRuleId);
 
 	$messageSuccess = $enable
@@ -313,13 +324,14 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		: _n('Cannot disable discovery rules', 'Cannot disable discovery rules', $updated);
 
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, getRequest('hostid'));
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['g_hostdruleid'])) {
-	$goResult = API::DiscoveryRule()->delete($_REQUEST['g_hostdruleid']);
+elseif (hasRequest('action') && getRequest('action') == 'discoveryrule.massdelete' && hasRequest('g_hostdruleid')) {
+	$result = API::DiscoveryRule()->delete(getRequest('g_hostdruleid'));
 
-	show_messages($goResult, _('Discovery rules deleted'), _('Cannot delete discovery rules'));
-	clearCookies($goResult, $_REQUEST['hostid']);
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
+	show_messages($result, _('Discovery rules deleted'), _('Cannot delete discovery rules'));
 }
 
 /*
@@ -355,14 +367,20 @@ if (isset($_REQUEST['form'])) {
 	$itemView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'hostid' => get_request('hostid', 0),
+		'hostid' => getRequest('hostid', 0),
 		'host' => $host,
-		'showInfoColumn' => ($host['status'] != HOST_STATUS_TEMPLATE)
+		'showInfoColumn' => ($host['status'] != HOST_STATUS_TEMPLATE),
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	$sortfield = getPageSortField('name');
-
 	// discoveries
 	$data['discoveries'] = API::DiscoveryRule()->get(array(
 		'hostids' => $data['hostid'],
@@ -372,21 +390,21 @@ else {
 		'selectGraphs' => API_OUTPUT_COUNT,
 		'selectTriggers' => API_OUTPUT_COUNT,
 		'selectHostPrototypes' => API_OUTPUT_COUNT,
-		'sortfield' => $sortfield,
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit'] + 1
 	));
 
 	$data['discoveries'] = CMacrosResolverHelper::resolveItemNames($data['discoveries']);
 
-	if ($sortfield === 'status') {
-		orderItemsByStatus($data['discoveries'], getPageSortOrder());
+	if ($sortField === 'status') {
+		orderItemsByStatus($data['discoveries'], $sortOrder);
 	}
 	else {
-		order_result($data['discoveries'], $sortfield, getPageSortOrder());
+		order_result($data['discoveries'], $sortField, $sortOrder);
 	}
 
 	// paging
-	$data['paging'] = getPagingLine($data['discoveries'], array('itemid'), array('hostid' => get_request('hostid')));
+	$data['paging'] = getPagingLine($data['discoveries']);
 
 	// render view
 	$discoveryView = new CView('configuration.host.discovery.list', $data);
diff --git a/frontends/php/host_prototypes.php b/frontends/php/host_prototypes.php
index f131fb33d05..c0ac30e2ec8 100644
--- a/frontends/php/host_prototypes.php
+++ b/frontends/php/host_prototypes.php
@@ -48,7 +48,13 @@ $fields = array(
 	'group_prototypes' =>		array(T_ZBX_STR, O_OPT, null, NOT_EMPTY,	null),
 	'unlink' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		null),
 	'group_hostid' =>			array(T_ZBX_INT, O_OPT, null,	DB_ID,		null),
-	'go' =>						array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	// actions
+	'action' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+									IN('"hostprototype.massdelete","hostprototype.massdisable",'.
+										'"hostprototype.massenable"'
+									),
+									null
+								),
 	'save' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'clone' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'update' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -56,14 +62,14 @@ $fields = array(
 	'cancel' =>					array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form' =>					array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form_refresh' =>			array(T_ZBX_INT, O_OPT, null,	null,		null),
+	// sort and sortorder
+	'sort' =>					array(T_ZBX_STR, O_OPT, P_SYS, IN('"name","status"'),						null),
+	'sortorder' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
-
-$_REQUEST['go'] = get_request('go', 'none');
 
 // permissions
-if (get_request('parent_discoveryid')) {
+if (getRequest('parent_discoveryid')) {
 	$discoveryRule = API::DiscoveryRule()->get(array(
 		'itemids' => $_REQUEST['parent_discoveryid'],
 		'output' => API_OUTPUT_EXTEND,
@@ -75,9 +81,9 @@ if (get_request('parent_discoveryid')) {
 		access_deny();
 	}
 
-	if (get_request('hostid')) {
+	if (getRequest('hostid')) {
 		$hostPrototype = API::HostPrototype()->get(array(
-			'hostids' => get_request('hostid'),
+			'hostids' => getRequest('hostid'),
 			'output' => API_OUTPUT_EXTEND,
 			'selectGroupLinks' => API_OUTPUT_EXTEND,
 			'selectGroupPrototypes' => API_OUTPUT_EXTEND,
@@ -100,27 +106,28 @@ else {
  * Actions
  */
 // add templates to the list
-if (get_request('add_template')) {
-	foreach (get_request('add_templates', array()) as $templateId) {
+if (getRequest('add_template')) {
+	foreach (getRequest('add_templates', array()) as $templateId) {
 		$_REQUEST['templates'][$templateId] = $templateId;
 	}
 }
 // unlink templates
-elseif (get_request('unlink')) {
-	foreach (get_request('unlink') as $templateId => $value) {
+elseif (getRequest('unlink')) {
+	foreach (getRequest('unlink') as $templateId => $value) {
 		unset($_REQUEST['templates'][$templateId]);
 	}
 }
 elseif (isset($_REQUEST['delete']) && isset($_REQUEST['hostid'])) {
-
 	DBstart();
 	$result = API::HostPrototype()->delete(array(getRequest('hostid')));
+	$result = DBend($result);
 
+	if ($result) {
+		uncheckTableRows($discoveryRule['itemid']);
+	}
 	show_messages($result, _('Host prototype deleted'), _('Cannot delete host prototypes'));
 
 	unset($_REQUEST['hostid'], $_REQUEST['form']);
-	DBend($result);
-	clearCookies($result, $discoveryRule['itemid']);
 }
 elseif (isset($_REQUEST['clone']) && isset($_REQUEST['hostid'])) {
 	unset($_REQUEST['hostid']);
@@ -134,19 +141,19 @@ elseif (isset($_REQUEST['save'])) {
 	DBstart();
 
 	$newHostPrototype = array(
-		'host' => get_request('host'),
-		'name' => get_request('name'),
+		'host' => getRequest('host'),
+		'name' => getRequest('name'),
 		'status' => getRequest('status', HOST_STATUS_NOT_MONITORED),
 		'groupLinks' => array(),
 		'groupPrototypes' => array(),
-		'templates' => get_request('templates', array()),
+		'templates' => getRequest('templates', array()),
 		'inventory' => array(
-			'inventory_mode' => get_request('inventory_mode')
+			'inventory_mode' => getRequest('inventory_mode')
 		)
 	);
 
 	// add custom group prototypes
-	foreach (get_request('group_prototypes', array()) as $groupPrototype) {
+	foreach (getRequest('group_prototypes', array()) as $groupPrototype) {
 		if (!$groupPrototype['group_prototypeid']) {
 			unset($groupPrototype['group_prototypeid']);
 		}
@@ -156,14 +163,14 @@ elseif (isset($_REQUEST['save'])) {
 		}
 	}
 
-	if (get_request('hostid')) {
-		$newHostPrototype['hostid'] = get_request('hostid');
+	if (getRequest('hostid')) {
+		$newHostPrototype['hostid'] = getRequest('hostid');
 
 		if (!$hostPrototype['templateid']) {
 			// add group prototypes based on existing host groups
 			$groupPrototypesByGroupId = zbx_toHash($hostPrototype['groupLinks'], 'groupid');
 			unset($groupPrototypesByGroupId[0]);
-			foreach (get_request('group_links', array()) as $groupId) {
+			foreach (getRequest('group_links', array()) as $groupId) {
 				if (isset($groupPrototypesByGroupId[$groupId])) {
 					$newHostPrototype['groupLinks'][] = array(
 						'groupid' => $groupPrototypesByGroupId[$groupId]['groupid'],
@@ -187,10 +194,10 @@ elseif (isset($_REQUEST['save'])) {
 		show_messages($result, _('Host prototype updated'), _('Cannot update host prototype'));
 	}
 	else {
-		$newHostPrototype['ruleid'] = get_request('parent_discoveryid');
+		$newHostPrototype['ruleid'] = getRequest('parent_discoveryid');
 
 		// add group prototypes based on existing host groups
-		foreach (get_request('group_links', array()) as $groupId) {
+		foreach (getRequest('group_links', array()) as $groupId) {
 			$newHostPrototype['groupLinks'][] = array(
 				'groupid' => $groupId
 			);
@@ -201,16 +208,16 @@ elseif (isset($_REQUEST['save'])) {
 		show_messages($result, _('Host prototype added'), _('Cannot add host prototype'));
 	}
 
+	$result = DBend($result);
+
 	if ($result) {
+		uncheckTableRows($discoveryRule['itemid']);
 		unset($_REQUEST['itemid'], $_REQUEST['form']);
 	}
-
-	DBend($result);
-	clearCookies($result, $discoveryRule['itemid']);
 }
 // GO
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('group_hostid')) {
-	$enable = (getRequest('go') == 'activate');
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('hostprototype.massenable', 'hostprototype.massdisable')) && hasRequest('group_hostid')) {
+	$enable = (getRequest('action') == 'hostprototype.massenable');
 	$status = $enable ? HOST_STATUS_MONITORED : HOST_STATUS_NOT_MONITORED;
 	$update = array();
 
@@ -223,7 +230,7 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 	}
 
 	$result = API::HostPrototype()->update($update);
-	DBend($result);
+	$result = DBend($result);
 
 	$updated = count($update);
 
@@ -234,15 +241,20 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		? _n('Cannot enable host prototype', 'Cannot enable host prototypes', $updated)
 		: _n('Cannot disable host prototype', 'Cannot disable host prototypes', $updated);
 
+	if ($result) {
+		uncheckTableRows($discoveryRule['itemid']);
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, $discoveryRule['itemid']);
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['group_hostid'])) {
+elseif (hasRequest('action') && getRequest('action') == 'hostprototype.massdelete' && getRequest('group_hostid')) {
 	DBstart();
-	$go_result = API::HostPrototype()->delete($_REQUEST['group_hostid']);
-	show_messages($go_result, _('Host prototypes deleted'), _('Cannot delete host prototypes'));
-	DBend($go_result);
-	clearCookies($go_result, $discoveryRule['itemid']);
+	$result = API::HostPrototype()->delete(getRequest('group_hostid'));
+	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows($discoveryRule['itemid']);
+	}
+	show_messages($result, _('Host prototypes deleted'), _('Cannot delete host prototypes'));
 }
 
 /*
@@ -252,16 +264,16 @@ if (isset($_REQUEST['form'])) {
 	$data = array(
 		'discovery_rule' => $discoveryRule,
 		'host_prototype' => array(
-			'hostid' => get_request('hostid'),
-			'templateid' => get_request('templateid'),
-			'host' => get_request('host'),
-			'name' => get_request('name'),
-			'status' => getRequest('status', HOST_STATUS_NOT_MONITORED),
+			'hostid' => getRequest('hostid'),
+			'templateid' => getRequest('templateid'),
+			'host' => getRequest('host'),
+			'name' => getRequest('name'),
+			'status' => getRequest('status', HOST_STATUS_MONITORED),
 			'templates' => array(),
 			'inventory' => array(
-				'inventory_mode' => get_request('inventory_mode', HOST_INVENTORY_DISABLED)
+				'inventory_mode' => getRequest('inventory_mode', HOST_INVENTORY_DISABLED)
 			),
-			'groupPrototypes' => get_request('group_prototypes', array())
+			'groupPrototypes' => getRequest('group_prototypes', array())
 		),
 		'groups' => array()
 	);
@@ -269,7 +281,7 @@ if (isset($_REQUEST['form'])) {
 	// add already linked and new templates
 	$data['host_prototype']['templates'] = API::Template()->get(array(
 		'output' => array('templateid', 'name'),
-		'templateids' => get_request('templates', array())
+		'templateids' => getRequest('templates', array())
 	));
 
 	// add parent host
@@ -284,10 +296,10 @@ if (isset($_REQUEST['form'])) {
 	$parentHost = reset($parentHost);
 	$data['parent_host'] = $parentHost;
 
-	if (get_request('group_links')) {
+	if (getRequest('group_links')) {
 		$data['groups'] = API::HostGroup()->get(array(
 			'output' => API_OUTPUT_EXTEND,
-			'groupids' => get_request('group_links'),
+			'groupids' => getRequest('group_links'),
 			'editable' => true,
 			'preservekeys' => true
 		));
@@ -303,7 +315,7 @@ if (isset($_REQUEST['form'])) {
 	}
 
 	// host prototype edit form
-	if (get_request('hostid') && !get_request('form_refresh')) {
+	if (getRequest('hostid') && !getRequest('form_refresh')) {
 		$data['host_prototype'] = array_merge($data['host_prototype'], $hostPrototype);
 
 		$data['groups'] = API::HostGroup()->get(array(
@@ -344,32 +356,35 @@ if (isset($_REQUEST['form'])) {
 	$itemView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'form' => get_request('form', null),
-		'parent_discoveryid' => get_request('parent_discoveryid', null),
-		'discovery_rule' => $discoveryRule
+		'form' => getRequest('form'),
+		'parent_discoveryid' => getRequest('parent_discoveryid'),
+		'discovery_rule' => $discoveryRule,
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
 	// get items
-	$sortfield = getPageSortField('name');
 	$data['hostPrototypes'] = API::HostPrototype()->get(array(
 		'discoveryids' => $data['parent_discoveryid'],
 		'output' => API_OUTPUT_EXTEND,
 		'selectTemplates' => array('templateid', 'name'),
 		'editable' => true,
-		'sortfield' => $sortfield,
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit'] + 1
 	));
 
 	if ($data['hostPrototypes']) {
-		order_result($data['hostPrototypes'], $sortfield, getPageSortOrder());
+		order_result($data['hostPrototypes'], $sortField, $sortOrder);
 	}
 
-	$data['paging'] = getPagingLine(
-		$data['hostPrototypes'],
-		array('hostid'),
-		array('parent_discoveryid' => get_request('parent_discoveryid'))
-	);
+	$data['paging'] = getPagingLine($data['hostPrototypes']);
 
 	// fetch templates linked to the prototypes
 	$templateIds = array();
diff --git a/frontends/php/host_screen.php b/frontends/php/host_screen.php
index 4b1b4fd073c..a01b6faf269 100644
--- a/frontends/php/host_screen.php
+++ b/frontends/php/host_screen.php
@@ -43,13 +43,13 @@ $fields = array(
 	'step' =>		array(T_ZBX_INT, O_OPT, P_SYS, BETWEEN(0, 65535), null),
 	'period' =>		array(T_ZBX_INT, O_OPT, P_SYS, null,		null),
 	'stime' =>		array(T_ZBX_STR, O_OPT, P_SYS, null,		null),
-	'reset' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN("'reset'"), null),
+	'reset' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"reset"'), null),
 	'fullscreen' =>	array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'),	null),
 	// ajax
 	'filterState' => array(T_ZBX_INT, O_OPT, P_ACT,	null,		null),
 	'favobj' =>		array(T_ZBX_STR, O_OPT, P_ACT, null,		null),
 	'favid' =>		array(T_ZBX_INT, O_OPT, P_ACT, null,		null),
-	'favaction' =>	array(T_ZBX_STR, O_OPT, P_ACT, IN("'add','remove'"), null)
+	'favaction' =>	array(T_ZBX_STR, O_OPT, P_ACT, IN('"add","remove"'), null)
 );
 check_fields($fields);
 
@@ -73,11 +73,11 @@ if ($page['type'] == PAGE_TYPE_JS || $page['type'] == PAGE_TYPE_HTML_BLOCK) {
  * Display
  */
 $data = array(
-	'hostid' => get_request('hostid', 0),
+	'hostid' => getRequest('hostid', 0),
 	'fullscreen' => $_REQUEST['fullscreen'],
-	'screenid' => get_request('screenid', CProfile::get('web.hostscreen.screenid', null)),
-	'period' => get_request('period'),
-	'stime' => get_request('stime')
+	'screenid' => getRequest('screenid', CProfile::get('web.hostscreen.screenid', null)),
+	'period' => getRequest('period'),
+	'stime' => getRequest('stime')
 );
 CProfile::update('web.hostscreen.screenid', $data['screenid'], PROFILE_TYPE_ID);
 
diff --git a/frontends/php/hostgroups.php b/frontends/php/hostgroups.php
index 90828545556..f5493449773 100644
--- a/frontends/php/hostgroups.php
+++ b/frontends/php/hostgroups.php
@@ -32,222 +32,252 @@ require_once dirname(__FILE__).'/include/page_header.php';
 $fields = array(
 	'hosts' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'groups' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
-	'hostids' =>		array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'groupids' =>		array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	// group
 	'groupid' =>		array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		'isset({form})&&{form}=="update"'),
-	'name' =>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({save})'),
+	'name' =>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({save})', _('Group name')),
 	'twb_groupid' =>	array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	// actions
-	'go' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+							IN('"hostgroup.massdelete","hostgroup.massdisable","hostgroup.massenable"'),
+							null
+						),
 	'save' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'clone' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'delete' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
-	'cancel' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	// other
 	'form' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
-	'form_refresh' =>	array(T_ZBX_STR, O_OPT, null,	null,		null)
+	'form_refresh' =>	array(T_ZBX_INT, O_OPT, null,	null,		null),
+	// sort and sortorder
+	'sort' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"name"'),								null),
+	'sortorder' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
-
-$_REQUEST['go'] = get_request('go', 'none');
-
-/*
- * Permissions
- */
-if (get_request('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
-	access_deny();
-}
 
 /*
- * Actions
+ * Form actions
  */
-if (isset($_REQUEST['clone']) && isset($_REQUEST['groupid'])) {
-	unset($_REQUEST['groupid']);
-	$_REQUEST['form'] = 'clone';
-}
-elseif (isset($_REQUEST['save'])) {
-	$hostIds = get_request('hosts', array());
-
-	DBstart();
-
-	$hosts = API::Host()->get(array(
-		'hostids' => $hostIds,
-		'output' => array('hostid'),
-		'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
-	));
+if (hasRequest('form')) {
+	if (hasRequest('clone')) {
+		unset($_REQUEST['groupid']);
+	}
+	elseif (hasRequest('save')) {
+		$hostIds = getRequest('hosts', array());
 
-	$templates = API::Template()->get(array(
-		'templateids' => $hostIds,
-		'output' => array('templateid')
-	));
+		DBstart();
 
-	if (!empty($_REQUEST['groupid'])) {
-		$messageSuccess = _('Group updated');
-		$messageFailed = _('Cannot update group');
+		if (getRequest('groupid', 0) != 0) {
+			$messageSuccess = _('Group updated');
+			$messageFailed = _('Cannot update group');
 
-		$oldGroup = API::HostGroup()->get(array(
-			'groupids' => $_REQUEST['groupid'],
-			'output' => API_OUTPUT_EXTEND
-		));
-		$oldGroup = reset($oldGroup);
-
-		$result = true;
-		// don't try to update the name for a discovered host group
-		if ($oldGroup['flags'] != ZBX_FLAG_DISCOVERY_CREATED) {
-			$result = API::HostGroup()->update(array(
-				'groupid' => $_REQUEST['groupid'],
-				'name' => $_REQUEST['name']
-			));
-		}
+			$data = array(
+				'groupid' => getRequest('groupid'),
+				'name' => getRequest('name')
+			);
 
-		if ($result) {
-			$groups = API::HostGroup()->get(array(
-				'groupids' => $_REQUEST['groupid'],
-				'output' => API_OUTPUT_EXTEND
+			$oldGroups = API::HostGroup()->get(array(
+				'output' => array('name', 'flags'),
+				'groupids' => $data['groupid']
 			));
+			if (!$oldGroups) {
+				access_deny();
+			}
+			$oldGroup = reset($oldGroups);
 
-			$result = API::HostGroup()->massUpdate(array(
-				'hosts' => $hosts,
-				'templates' => $templates,
-				'groups' => $groups
-			));
+			$result = true;
 
-			$group = reset($groups);
+			// don't try to update the name for a discovered host group
+			if ($oldGroup['flags'] != ZBX_FLAG_DISCOVERY_CREATED) {
+				$result = API::HostGroup()->update($data);
+			}
 
 			if ($result) {
-				add_audit_ext(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_HOST_GROUP, $group['groupid'], $group['name'],
-					'groups', array('name' => $oldGroup['name']), array('name' => $group['name']));
+				$hosts = API::Host()->get(array(
+					'output' => array('hostid'),
+					'hostids' => $hostIds,
+					'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
+				));
+
+				$templates = API::Template()->get(array(
+					'output' => array('templateid'),
+					'templateids' => $hostIds
+				));
+
+				$result = API::HostGroup()->massUpdate(array(
+					'groups' => array(array('groupid' => $data['groupid'])),
+					'hosts' => $hosts,
+					'templates' => $templates
+				));
+
+				if ($result) {
+					add_audit_ext(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_HOST_GROUP, $data['groupid'], $data['name'],
+						'groups', array('name' => $oldGroup['name']), array('name' => $data['name']));
+				}
 			}
 		}
-	}
-	else {
-		$messageSuccess = _('Group added');
-		$messageFailed = _('Cannot add group');
-
-		$result = API::HostGroup()->create(array('name' => $_REQUEST['name']));
+		else {
+			$messageSuccess = _('Group added');
+			$messageFailed = _('Cannot add group');
 
-		if ($result) {
-			$groups = API::HostGroup()->get(array(
-				'groupids' => $result['groupids'],
-				'output' => API_OUTPUT_EXTEND
-			));
+			$data = array(
+				'name' => getRequest('name')
+			);
 
-			$result = API::HostGroup()->massAdd(array(
-				'hosts' => $hosts,
-				'templates' => $templates,
-				'groups' => $groups
-			));
+			$result = API::HostGroup()->create(array('name' => $data['name']));
 
 			if ($result) {
-				$group = reset($groups);
-
-				add_audit_ext(AUDIT_ACTION_ADD, AUDIT_RESOURCE_HOST_GROUP, $group['groupid'], $group['name'], null, null, null);
+				$data['groupid'] = $result['groupids'][0];
+
+				$hosts = API::Host()->get(array(
+					'output' => array('hostid'),
+					'hostids' => $hostIds,
+					'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
+				));
+
+				$templates = API::Template()->get(array(
+					'output' => array('templateid'),
+					'templateids' => $hostIds
+				));
+
+				$result = API::HostGroup()->massAdd(array(
+					'groups' => array(array('groupid' => $data['groupid'])),
+					'hosts' => $hosts,
+					'templates' => $templates
+				));
+
+				if ($result) {
+					add_audit_ext(AUDIT_ACTION_ADD, AUDIT_RESOURCE_HOST_GROUP, $data['groupid'], $data['name'],
+						null, null, null);
+				}
 			}
 		}
-	}
 
-	$result = DBend($result);
+		$result = DBend($result);
 
-	if ($result) {
-		unset($_REQUEST['form']);
-	}
-	unset($_REQUEST['save']);
+		if ($result) {
+			unset($_REQUEST['form']);
+			uncheckTableRows();
+		}
+		show_messages($result, $messageSuccess, $messageFailed);
 
-	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
-}
-elseif (isset($_REQUEST['delete']) && isset($_REQUEST['groupid'])) {
-	$result = API::HostGroup()->delete(array(getRequest('groupid')));
+		unset($_REQUEST['save']);
+	}
+	elseif (hasRequest('delete') && hasRequest('groupid')) {
+		$result = API::HostGroup()->delete(array(getRequest('groupid')));
 
-	show_messages($result, _('Group deleted'), _('Cannot delete group'));
+		if ($result) {
+			unset($_REQUEST['form']);
+			uncheckTableRows();
+		}
+		show_messages($result, _('Group deleted'), _('Cannot delete group'));
 
-	if ($result) {
-		unset($_REQUEST['form']);
-		clearCookies($result);
+		unset($_REQUEST['delete']);
 	}
-	unset($_REQUEST['delete']);
 }
-elseif ($_REQUEST['go'] == 'delete') {
-	$goResult = API::HostGroup()->delete(get_request('groups', array()));
+/*
+ * List actions
+ */
+elseif (hasRequest('action')) {
+	if (getRequest('action') == 'hostgroup.massdelete') {
+		$groupIds = getRequest('groups', array());
 
-	show_messages($goResult, _('Group deleted'), _('Cannot delete group'));
-	clearCookies($goResult);
-}
-elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
-	$enable =(getRequest('go') == 'activate');
-	$status = $enable ? HOST_STATUS_MONITORED : HOST_STATUS_NOT_MONITORED;
-	$auditAction = $enable ? AUDIT_ACTION_ENABLE : AUDIT_ACTION_DISABLE;
+		if ($groupIds) {
+			$result = API::HostGroup()->delete($groupIds);
 
-	$groups = getRequest('groups', array());
+			$updated = count($groupIds);
 
-	if ($groups) {
-		DBstart();
+			if ($result) {
+				uncheckTableRows();
+			}
+			show_messages($result,
+				_n('Group deleted', 'Groups deleted', $updated),
+				_n('Cannot delete group', 'Cannot delete groups', $updated)
+			);
+		}
+	}
+	elseif (getRequest('action') == 'hostgroup.massenable' || getRequest('action') == 'hostgroup.massdisable') {
+		$enable = (getRequest('action') == 'hostgroup.massenable');
+		$status = $enable ? HOST_STATUS_MONITORED : HOST_STATUS_NOT_MONITORED;
+		$auditAction = $enable ? AUDIT_ACTION_ENABLE : AUDIT_ACTION_DISABLE;
 
-		$hosts = API::Host()->get(array(
-			'groupids' => $groups,
-			'editable' => true,
-			'output' => API_OUTPUT_EXTEND
-		));
+		$groupIds = getRequest('groups', array());
 
-		if ($hosts) {
-			$result = API::Host()->massUpdate(array(
-				'hosts' => $hosts,
-				'status' => $status
+		if ($groupIds) {
+			DBstart();
+
+			$hosts = API::Host()->get(array(
+				'output' => array('hostid', 'status', 'host'),
+				'groupids' => $groupIds,
+				'editable' => true
 			));
 
-			if ($result) {
-				foreach ($hosts as $host) {
-					add_audit_ext(
-						$auditAction,
-						AUDIT_RESOURCE_HOST,
-						$host['hostid'],
-						$host['host'],
-						'hosts',
-						array('status' => $host['status']),
-						array('status' => $status)
-					);
+			$result = true;
+
+			if ($hosts) {
+				$result = API::Host()->massUpdate(array(
+					'hosts' => $hosts,
+					'status' => $status
+				));
+
+				if ($result) {
+					foreach ($hosts as $host) {
+						add_audit_ext($auditAction, AUDIT_RESOURCE_HOST, $host['hostid'], $host['host'], 'hosts',
+							array('status' => $host['status']), array('status' => $status)
+						);
+					}
 				}
 			}
-		}
-		else {
-			$result = true;
-		}
 
-		$result = DBend($result);
+			$result = DBend($result);
 
-		$updated = count($hosts);
+			if ($result) {
+				uncheckTableRows();
+			}
 
-		$messageSuccess = $enable
-			? _n('Host enabled', 'Hosts enabled', $updated)
-			: _n('Host disabled', 'Hosts disabled', $updated);
-		$messageFailed = $enable
-			? _n('Cannot enable host', 'Cannot enable hosts', $updated)
-			: _n('Cannot disable host', 'Cannot disable hosts', $updated);
+			$updated = count($hosts);
 
-		show_messages($result, $messageSuccess, $messageFailed);
-		clearCookies($result);
+			$messageSuccess = $enable
+				? _n('Host enabled', 'Hosts enabled', $updated)
+				: _n('Host disabled', 'Hosts disabled', $updated);
+			$messageFailed = $enable
+				? _n('Cannot enable host', 'Cannot enable hosts', $updated)
+				: _n('Cannot disable host', 'Cannot disable hosts', $updated);
+
+			show_messages($result, $messageSuccess, $messageFailed);
+		}
 	}
 }
 
 /*
- * Display
+ * Display form
  */
-if (isset($_REQUEST['form'])) {
+if (hasRequest('form')) {
 	$data = array(
-		'form' => get_request('form'),
-		'groupid' => get_request('groupid', 0),
-		'hosts' => get_request('hosts', array()),
-		'name' => get_request('name', ''),
-		'twb_groupid' => get_request('twb_groupid', -1)
+		'form' => getRequest('form'),
+		'groupid' => getRequest('groupid', 0),
+		'name' => getRequest('name', ''),
+		'hosts' => getRequest('hosts', array()),
+		'twb_groupid' => getRequest('twb_groupid', -1),
+		'r_hosts' => array()
 	);
 
-	if ($data['groupid'] > 0) {
-		$data['group'] = get_hostgroup_by_groupid($data['groupid']);
+	if ($data['groupid'] != 0) {
+		/*
+		 * Permissions
+		 */
+		$groups = API::HostGroup()->get(array(
+			'output' => array('name', 'flags'),
+			'groupids' => $data['groupid'],
+			'editable' => true
+		));
+		if (!$groups) {
+			access_deny();
+		}
+
+		$data['group'] = reset($groups);
 
 		// if first time select all hosts for group from db
-		if (!isset($_REQUEST['form_refresh'])) {
+		if (!hasRequest('form_refresh')) {
 			$data['name'] = $data['group']['name'];
 
 			$data['hosts'] = API::Host()->get(array(
@@ -262,40 +292,42 @@ if (isset($_REQUEST['form'])) {
 
 	// get all possible groups
 	$data['db_groups'] = API::HostGroup()->get(array(
-		'not_proxy_host' => true,
-		'sortfield' => 'name',
-		'editable' => true,
-		'output' => API_OUTPUT_EXTEND
+		'output' => array('groupid', 'name'),
+		'with_hosts_and_templates' => true,
+		'editable' => true
 	));
+	order_result($data['db_groups'], 'name');
 
 	if ($data['twb_groupid'] == -1) {
-		$gr = reset($data['db_groups']);
+		$dbGroup = reset($data['db_groups']);
 
-		$data['twb_groupid'] = $gr['groupid'];
+		$data['twb_groupid'] = $dbGroup['groupid'];
 	}
 
 	// get all possible hosts
 	$data['db_hosts'] = API::Host()->get(array(
+		'output' => array('hostid', 'name'),
 		'groupids' => $data['twb_groupid'] ? $data['twb_groupid'] : null,
 		'templated_hosts' => true,
-		'sortfield' => 'name',
 		'editable' => true,
-		'output' => API_OUTPUT_EXTEND,
 		'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
 	));
+	order_result($data['db_hosts'], 'name');
 
 	// get selected hosts
-	$data['r_hosts'] = API::Host()->get(array(
-		'hostids' => $data['hosts'],
-		'templated_hosts' => true,
-		'sortfield' => 'name',
-		'output' => API_OUTPUT_EXTEND
-	));
-	$data['r_hosts'] = zbx_toHash($data['r_hosts'], 'hostid');
+	if ($data['hosts']) {
+		$data['r_hosts'] = API::Host()->get(array(
+			'output' => array('hostid', 'name', 'flags'),
+			'hostids' => $data['hosts'],
+			'templated_hosts' => true,
+			'preservekeys' => true
+		));
+		order_result($data['r_hosts'], 'name');
+	}
 
 	// deletable groups
-	if (!empty($data['groupid'])) {
-		$data['deletableHostGroups'] = getDeletableHostGroups($data['groupid']);
+	if ($data['groupid'] != 0) {
+		$data['deletableHostGroups'] = getDeletableHostGroupIds(array($data['groupid']));
 	}
 
 	// render view
@@ -303,44 +335,53 @@ if (isset($_REQUEST['form'])) {
 	$hostgroupView->render();
 	$hostgroupView->show();
 }
+/*
+ * Display list
+ */
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'config' => $config
+		'config' => $config,
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	$sortfield = getPageSortField('name');
-	$sortorder =  getPageSortOrder();
-
 	$groups = API::HostGroup()->get(array(
-		'editable' => true,
 		'output' => array('groupid'),
-		'sortfield' => $sortfield,
+		'editable' => true,
+		'sortfield' => $sortField,
+		'sortorder' => $sortOrder,
 		'limit' => $config['search_limit'] + 1
 	));
 
-	$data['paging'] = getPagingLine($groups, array('groupid'));
+	$data['paging'] = getPagingLine($groups);
+	$groupIds = zbx_objectValues($groups, 'groupid');
 
 	// get hosts and templates count
 	$data['groupCounts'] = API::HostGroup()->get(array(
 		'output' => array('groupid'),
-		'groupids' => zbx_objectValues($groups, 'groupid'),
+		'groupids' => $groupIds,
 		'selectHosts' => API_OUTPUT_COUNT,
 		'selectTemplates' => API_OUTPUT_COUNT,
-		'nopermissions' => true
+		'preservekeys' => true
 	));
-	$data['groupCounts'] = zbx_toHash($data['groupCounts'], 'groupid');
 
 	// get host groups
 	$data['groups'] = API::HostGroup()->get(array(
-		'groupids' => zbx_objectValues($groups, 'groupid'),
+		'output' => array('groupid', 'name', 'flags'),
+		'groupids' => $groupIds,
 		'selectHosts' => array('hostid', 'name', 'status'),
-		'selectTemplates' => array('hostid', 'name', 'status'),
+		'selectTemplates' => array('templateid', 'name'),
 		'selectGroupDiscovery' => array('ts_delete'),
 		'selectDiscoveryRule' => array('itemid', 'name'),
-		'output' => API_OUTPUT_EXTEND,
 		'limitSelects' => $config['max_in_table'] + 1
 	));
-	order_result($data['groups'], $sortfield, $sortorder);
+	order_result($data['groups'], $sortField, $sortOrder);
 
 	// render view
 	$hostgroupView = new CView('configuration.hostgroups.list', $data);
diff --git a/frontends/php/hostinventories.php b/frontends/php/hostinventories.php
index 45606033ce4..7de162b0bd6 100644
--- a/frontends/php/hostinventories.php
+++ b/frontends/php/hostinventories.php
@@ -40,7 +40,13 @@ $fields = array(
 	'filter_field_value' =>	array(T_ZBX_STR, O_OPT, null,	null,		null),
 	'filter_exact' =>		array(T_ZBX_INT, O_OPT, null,	'IN(0,1)',	null),
 	//ajax
-	'filterState' =>		array(T_ZBX_INT, O_OPT, P_ACT,	null,		null)
+	'filterState' =>		array(T_ZBX_INT, O_OPT, P_ACT,	null,		null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS,
+								IN('"name","pr_macaddress_a","pr_name","pr_os","pr_serialno_a","pr_tag","pr_type"'),
+								null
+							),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
 
@@ -54,7 +60,11 @@ if (getRequest('hostid') && !API::Host()->isReadable(array(getRequest('hostid'))
 	access_deny();
 }
 
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
+$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
 
 if (hasRequest('filterState')) {
 	CProfile::update('web.hostinventories.filter.state', getRequest('filterState'), PROFILE_TYPE_INT);
@@ -83,7 +93,7 @@ if ($hostId > 0) {
 
 	// overview tab
 	$data['host'] = API::Host()->get(array(
-		'output' => array('hostid', 'host', 'name', 'maintenance_status', 'description'),
+		'output' => array('hostid', 'host', 'name', 'status', 'maintenance_status', 'description'),
 		'selectInterfaces' => API_OUTPUT_EXTEND,
 		'selectItems' => API_OUTPUT_COUNT,
 		'selectTriggers' => API_OUTPUT_COUNT,
@@ -128,7 +138,9 @@ if ($hostId > 0) {
 else {
 	$data = array(
 		'config' => select_config(),
-		'hosts' => array()
+		'hosts' => array(),
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
 	// filter
@@ -136,7 +148,7 @@ else {
 		'groups' => array(
 			'real_hosts' => true
 		),
-		'groupid' => getRequest('groupid', null)
+		'groupid' => getRequest('groupid')
 	));
 
 	/*
@@ -211,20 +223,17 @@ else {
 				// if we are filtering by inventory field
 				if (!empty($data['filterField']) && !empty($data['filterFieldValue'])) {
 					// must we filter exactly or using a substring (both are case insensitive)
-					$match = $data['filterExact']
-						? (zbx_strtolower($data['hosts'][$num]['inventory'][$data['filterField']]) === zbx_strtolower($data['filterFieldValue']))
-						: (zbx_strpos(
-							zbx_strtolower($data['hosts'][$num]['inventory'][$data['filterField']]),
-							zbx_strtolower($data['filterFieldValue'])
-							) !== false);
+					$haystack = mb_strtolower($data['hosts'][$num]['inventory'][$data['filterField']]);
+					$needle = mb_strtolower($data['filterFieldValue']);
 
+					$match = $data['filterExact'] ? ($haystack === $needle) : (mb_strpos($haystack, $needle) !== false);
 					if (!$match) {
 						unset($data['hosts'][$num]);
 					}
 				}
 			}
 
-			order_result($data['hosts'], getPageSortField('name'), getPageSortOrder());
+			order_result($data['hosts'], $sortField, $sortOrder);
 		}
 	}
 
diff --git a/frontends/php/hostinventoriesoverview.php b/frontends/php/hostinventoriesoverview.php
index 4e7ee389cce..8335ed29927 100644
--- a/frontends/php/hostinventoriesoverview.php
+++ b/frontends/php/hostinventoriesoverview.php
@@ -33,18 +33,25 @@ require_once dirname(__FILE__).'/include/page_header.php';
 $fields = array(
 	'groupid' =>	array(T_ZBX_INT, O_OPT,	P_SYS,	DB_ID,	NULL),
 	'groupby' =>	array(T_ZBX_STR, O_OPT,	P_SYS,	DB_ID,	NULL),
+	// sort and sortorder
+	'sort' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"host_count","inventory_field"'),		null),
+	'sortorder' =>	array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
 
+$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'host_count'));
+$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_DOWN));
+
+CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 /*
  * Permissions
  */
-if (get_request('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
+if (getRequest('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
 	access_deny();
 }
 
-validate_sort_and_sortorder('host_count', ZBX_SORT_DOWN);
-
 if ((PAGE_TYPE_JS == $page['type']) || (PAGE_TYPE_HTML_BLOCK == $page['type'])) {
 	require_once dirname(__FILE__).'/include/page_footer.php';
 	exit;
@@ -54,11 +61,11 @@ $options = array(
 	'groups' => array(
 		'real_hosts' => 1,
 	),
-	'groupid' => get_request('groupid', null),
+	'groupid' => getRequest('groupid'),
 );
 $pageFilter = new CPageFilter($options);
 $_REQUEST['groupid'] = $pageFilter->groupid;
-$_REQUEST['groupby'] = get_request('groupby', '');
+$_REQUEST['groupby'] = getRequest('groupby', '');
 $groupFieldTitle = '';
 
 $hostinvent_wdgt = new CWidget();
@@ -88,8 +95,10 @@ $hostinvent_wdgt->addItem(BR());
 $table = new CTableInfo(_('No hosts found.'));
 $table->setHeader(
 	array(
-		make_sorting_header($groupFieldTitle === '' ? _('Field') : $groupFieldTitle, 'inventory_field'),
-		make_sorting_header(_('Host count'), 'host_count'),
+		make_sorting_header($groupFieldTitle === '' ? _('Field') : $groupFieldTitle, 'inventory_field',
+			$sortField, $sortOrder
+		),
+		make_sorting_header(_('Host count'), 'host_count', $sortField, $sortOrder),
 	)
 );
 
@@ -108,22 +117,24 @@ if($pageFilter->groupsSelected && $groupFieldTitle !== ''){
 
 	// aggregating data by chosen field value
 	$report = array();
-	foreach($hosts as $host){
-		if($host['inventory'][$_REQUEST['groupby']] !== ''){
-			$lowerValue = zbx_strtolower($host['inventory'][$_REQUEST['groupby']]);
-			if(!isset($report[$lowerValue])){
+	foreach($hosts as $host) {
+		if ($host['inventory'][$_REQUEST['groupby']] !== '') {
+			// same names with different letter casing are considered the same
+			$lowerValue = mb_strtolower($host['inventory'][$_REQUEST['groupby']]);
+
+			if (!isset($report[$lowerValue])) {
 				$report[$lowerValue] = array(
 					'inventory_field' => $host['inventory'][$_REQUEST['groupby']],
 					'host_count' => 1
 				);
 			}
-			else{
+			else {
 				$report[$lowerValue]['host_count'] += 1;
 			}
 		}
 	}
 
-	order_result($report, getPageSortField('host_count'), getPageSortOrder());
+	order_result($report, $sortField, $sortOrder);
 
 	foreach($report as $rep){
 		$row = array(
diff --git a/frontends/php/hosts.php b/frontends/php/hosts.php
index 4bb3e7c54f4..401a9a7926b 100644
--- a/frontends/php/hosts.php
+++ b/frontends/php/hosts.php
@@ -22,7 +22,7 @@
 require_once dirname(__FILE__).'/include/config.inc.php';
 require_once dirname(__FILE__).'/include/forms.inc.php';
 
-if (isset($_REQUEST['go']) && $_REQUEST['go'] == 'export' && isset($_REQUEST['hosts'])) {
+if (hasRequest('action') && getRequest('action') == 'host.export' && hasRequest('hosts')) {
 	$page['file'] = 'zbx_export_hosts.xml';
 	$page['type'] = detect_page_type(PAGE_TYPE_XML);
 
@@ -77,10 +77,14 @@ $fields = array(
 	'macro_new' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		'isset({macro_add})'),
 	'value_new' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		'isset({macro_add})'),
 	'macro_add' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		null),
-	'massupdate' =>		array(T_ZBX_STR, O_OPT, P_SYS,			null,		null),
 	'visible' =>		array(T_ZBX_STR, O_OPT, null,			null,		null),
 	// actions
-	'go' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		null),
+	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+							IN('"host.export","host.massdelete","host.massdisable","host.massenable","host.massupdate"'.
+								',"host.massupdateform"'
+							),
+							null
+						),
 	'add_to_group' =>	array(T_ZBX_INT, O_OPT, P_SYS|P_ACT,	DB_ID,		null),
 	'delete_from_group' => array(T_ZBX_INT, O_OPT, P_SYS|P_ACT,	DB_ID,		null),
 	'unlink' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		null),
@@ -92,7 +96,7 @@ $fields = array(
 	'delete' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		null),
 	'cancel' =>			array(T_ZBX_STR, O_OPT, P_SYS,		null,			null),
 	'form' =>			array(T_ZBX_STR, O_OPT, P_SYS,		null,			null),
-	'form_refresh' =>	array(T_ZBX_STR, O_OPT, null,		null,			null),
+	'form_refresh' =>	array(T_ZBX_INT, O_OPT, null,		null,			null),
 	// filter
 	'filter_set' =>		array(T_ZBX_STR, O_OPT, P_SYS,		null,			null),
 	'filter_rst' =>		array(T_ZBX_STR, O_OPT, P_SYS,		null,			null),
@@ -101,20 +105,20 @@ $fields = array(
 	'filter_dns' =>		array(T_ZBX_STR, O_OPT, null,		null,			null),
 	'filter_port' =>	array(T_ZBX_STR, O_OPT, null,		null,			null),
 	// ajax
-	'filterState' =>	array(T_ZBX_INT, O_OPT, P_ACT,		null,			null)
+	'filterState' =>	array(T_ZBX_INT, O_OPT, P_ACT,		null,			null),
+	// sort and sortorder
+	'sort' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"name","status"'),						null),
+	'sortorder' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
-
-$_REQUEST['go'] = get_request('go', 'none');
 
 /*
  * Permissions
  */
-if (get_request('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
+if (getRequest('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
 	access_deny();
 }
-if (get_request('hostid') && !API::Host()->isWritable(array($_REQUEST['hostid']))) {
+if (getRequest('hostid') && !API::Host()->isWritable(array($_REQUEST['hostid']))) {
 	access_deny();
 }
 
@@ -129,7 +133,7 @@ if ($page['type'] == PAGE_TYPE_JS || $page['type'] == PAGE_TYPE_HTML_BLOCK) {
 	exit;
 }
 
-$hostIds = get_request('hosts', array());
+$hostIds = getRequest('hosts', array());
 
 /*
  * Export
@@ -177,11 +181,11 @@ $filter['port'] = CProfile::get('web.hosts.filter_port', '');
  * Actions
  */
 if (isset($_REQUEST['add_template']) && isset($_REQUEST['add_templates'])) {
-	$_REQUEST['templates'] = get_request('templates', array());
+	$_REQUEST['templates'] = getRequest('templates', array());
 	$_REQUEST['templates'] = array_merge($_REQUEST['templates'], $_REQUEST['add_templates']);
 }
 if (isset($_REQUEST['unlink']) || isset($_REQUEST['unlink_and_clear'])) {
-	$_REQUEST['clear_templates'] = get_request('clear_templates', array());
+	$_REQUEST['clear_templates'] = getRequest('clear_templates', array());
 
 	$unlinkTemplates = array();
 
@@ -210,11 +214,11 @@ elseif (isset($_REQUEST['clone']) && isset($_REQUEST['hostid'])) {
 elseif (isset($_REQUEST['full_clone']) && isset($_REQUEST['hostid'])) {
 	$_REQUEST['form'] = 'full_clone';
 }
-elseif (isset($_REQUEST['go']) && $_REQUEST['go'] == 'massupdate' && isset($_REQUEST['masssave'])) {
-	$hostIds = get_request('hosts', array());
-	$visible = get_request('visible', array());
-	$_REQUEST['proxy_hostid'] = get_request('proxy_hostid', 0);
-	$_REQUEST['templates'] = get_request('templates', array());
+elseif (hasRequest('action') && getRequest('action') == 'host.massupdate' && hasRequest('masssave')) {
+	$hostIds = getRequest('hosts', array());
+	$visible = getRequest('visible', array());
+	$_REQUEST['proxy_hostid'] = getRequest('proxy_hostid', 0);
+	$_REQUEST['templates'] = getRequest('templates', array());
 
 	try {
 		DBstart();
@@ -243,13 +247,13 @@ elseif (isset($_REQUEST['go']) && $_REQUEST['go'] == 'massupdate' && isset($_REQ
 		}
 
 		if (isset($visible['inventory_mode'])) {
-			$newValues['inventory_mode'] = get_request('inventory_mode', HOST_INVENTORY_DISABLED);
+			$newValues['inventory_mode'] = getRequest('inventory_mode', HOST_INVENTORY_DISABLED);
 			$newValues['inventory'] = ($newValues['inventory_mode'] == HOST_INVENTORY_DISABLED)
-				? array() : get_request('host_inventory', array());
+				? array() : getRequest('host_inventory', array());
 		}
 
 		$templateIds = array();
-		if (isset($visible['template_table'])) {
+		if (isset($visible['templates'])) {
 			$templateIds = $_REQUEST['templates'];
 		}
 
@@ -332,7 +336,7 @@ elseif (isset($_REQUEST['go']) && $_REQUEST['go'] == 'massupdate' && isset($_REQ
 		}
 
 		$add = array();
-		if ($templateIds && isset($visible['template_table'])) {
+		if ($templateIds && isset($visible['templates'])) {
 			$add['templates'] = $templateIds;
 		}
 
@@ -353,8 +357,8 @@ elseif (isset($_REQUEST['go']) && $_REQUEST['go'] == 'massupdate' && isset($_REQ
 
 		DBend(true);
 
+		uncheckTableRows();
 		show_message(_('Hosts updated'));
-		clearCookies(true);
 
 		unset($_REQUEST['massupdate'], $_REQUEST['form'], $_REQUEST['hosts']);
 	}
@@ -395,6 +399,7 @@ elseif (hasRequest('save')) {
 			$host = array(
 				'hostid' => $hostId,
 				'status' => getRequest('status', HOST_STATUS_NOT_MONITORED),
+				'description' => getRequest('description', ''),
 				'inventory' => (getRequest('inventory_mode') == HOST_INVENTORY_DISABLED)
 					? array()
 					: getRequest('host_inventory', array())
@@ -417,6 +422,13 @@ elseif (hasRequest('save')) {
 					continue;
 				}
 
+				if ($interface['type'] == INTERFACE_TYPE_SNMP && !isset($interface['bulk'])) {
+					$interfaces[$key]['bulk'] = SNMP_BULK_DISABLED;
+				}
+				else {
+					$interfaces[$key]['bulk'] = SNMP_BULK_ENABLED;
+				}
+
 				if ($interface['isNew']) {
 					unset($interfaces[$key]['interfaceid']);
 				}
@@ -442,7 +454,7 @@ elseif (hasRequest('save')) {
 				}
 				else {
 					// transform macros to uppercase {$aaa} => {$AAA}
-					$macros[$key]['macro'] = zbx_strtoupper($macro['macro']);
+					$macros[$key]['macro'] = mb_strtoupper($macro['macro']);
 				}
 			}
 
@@ -532,6 +544,11 @@ elseif (hasRequest('save')) {
 				throw new Exception();
 			}
 
+			// copy web scenarios
+			if (!copyHttpTests($srcHostId, $hostId)) {
+				throw new Exception();
+			}
+
 			// copy triggers
 			$dbTriggers = API::Trigger()->get(array(
 				'output' => array('triggerid'),
@@ -590,8 +607,10 @@ elseif (hasRequest('save')) {
 
 		$result = DBend(true);
 
+		if ($result) {
+			uncheckTableRows();
+		}
 		show_messages($result, $msgOk, $msgFail);
-		clearCookies($result);
 
 		unset($_REQUEST['form'], $_REQUEST['hostid']);
 	}
@@ -602,39 +621,37 @@ elseif (hasRequest('save')) {
 
 	unset($_REQUEST['save']);
 }
-elseif (isset($_REQUEST['delete']) && isset($_REQUEST['hostid'])) {
+elseif (hasRequest('delete') && hasRequest('hostid')) {
 	DBstart();
 
-	$result = API::Host()->delete(array($_REQUEST['hostid']));
+	$result = API::Host()->delete(array(getRequest('hostid')));
 	$result = DBend($result);
 
-	show_messages($result, _('Host deleted'), _('Cannot delete host'));
-
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['hostid']);
+		uncheckTableRows();
 	}
+	show_messages($result, _('Host deleted'), _('Cannot delete host'));
 
 	unset($_REQUEST['delete']);
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete') {
-	$hostIds = get_request('hosts', array());
-
+elseif (hasRequest('action') && getRequest('action') == 'host.massdelete' && hasRequest('hosts')) {
 	DBstart();
 
-	$goResult = API::Host()->delete($hostIds);
-	$goResult = DBend($goResult);
+	$result = API::Host()->delete(getRequest('hosts'));
+	$result = DBend($result);
 
-	show_messages($goResult, _('Host deleted'), _('Cannot delete host'));
-	clearCookies($goResult);
+	if ($result) {
+		uncheckTableRows();
+	}
+	show_messages($result, _('Host deleted'), _('Cannot delete host'));
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
-	$enable =(getRequest('go') == 'activate');
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('host.massenable', 'host.massdisable')) && hasRequest('hosts')) {
+	$enable =(getRequest('action') == 'host.massenable');
 	$status = $enable ? TRIGGER_STATUS_ENABLED : TRIGGER_STATUS_DISABLED;
-	$hosts = getRequest('hosts', array());
 
 	$actHosts = API::Host()->get(array(
-		'hostids' => $hosts,
+		'hostids' => getRequest('hosts'),
 		'editable' => true,
 		'templated_hosts' => true,
 		'output' => array('hostid')
@@ -647,6 +664,10 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
 		$result = updateHostStatus($actHosts, $status);
 		$result = DBend($result);
 
+		if ($result) {
+			uncheckTableRows();
+		}
+
 		$updated = count($actHosts);
 
 		$messageSuccess = $enable
@@ -657,7 +678,6 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
 			: _n('Cannot disable host', 'Cannot disable hosts', $updated);
 
 		show_messages($result, $messageSuccess, $messageFailed);
-		clearCookies($result);
 	}
 }
 
@@ -671,32 +691,32 @@ $pageFilter = new CPageFilter(array(
 		'real_hosts' => true,
 		'editable' => true
 	),
-	'groupid' => get_request('groupid', null)
+	'groupid' => getRequest('groupid')
 ));
 
 $_REQUEST['groupid'] = $pageFilter->groupid;
-$_REQUEST['hostid'] = get_request('hostid', 0);
+$_REQUEST['hostid'] = getRequest('hostid', 0);
 
-if ($_REQUEST['go'] == 'massupdate' && isset($_REQUEST['hosts'])) {
+if (hasRequest('action') && getRequest('action') == 'host.massupdateform' && hasRequest('hosts')) {
 	$hostsWidget->addPageHeader(_('CONFIGURATION OF HOSTS'));
 
 	$data = array(
-		'hosts' => get_request('hosts', array()),
-		'visible' => get_request('visible', array()),
-		'mass_replace_tpls' => get_request('mass_replace_tpls'),
-		'mass_clear_tpls' => get_request('mass_clear_tpls'),
-		'groups' => get_request('groups', array()),
-		'newgroup' => get_request('newgroup', ''),
-		'status' => getRequest('status', HOST_STATUS_NOT_MONITORED),
+		'hosts' => getRequest('hosts'),
+		'visible' => getRequest('visible', array()),
+		'mass_replace_tpls' => getRequest('mass_replace_tpls'),
+		'mass_clear_tpls' => getRequest('mass_clear_tpls'),
+		'groups' => getRequest('groups', array()),
+		'newgroup' => getRequest('newgroup', ''),
+		'status' => getRequest('status', HOST_STATUS_MONITORED),
 		'description' => getRequest('description'),
-		'proxy_hostid' => get_request('proxy_hostid', ''),
-		'ipmi_authtype' => get_request('ipmi_authtype', -1),
-		'ipmi_privilege' => get_request('ipmi_privilege', 2),
-		'ipmi_username' => get_request('ipmi_username', ''),
-		'ipmi_password' => get_request('ipmi_password', ''),
-		'inventory_mode' => get_request('inventory_mode', HOST_INVENTORY_DISABLED),
-		'host_inventory' => get_request('host_inventory', array()),
-		'templates' => get_request('templates', array())
+		'proxy_hostid' => getRequest('proxy_hostid', ''),
+		'ipmi_authtype' => getRequest('ipmi_authtype', -1),
+		'ipmi_privilege' => getRequest('ipmi_privilege', 2),
+		'ipmi_username' => getRequest('ipmi_username', ''),
+		'ipmi_password' => getRequest('ipmi_password', ''),
+		'inventory_mode' => getRequest('inventory_mode', HOST_INVENTORY_DISABLED),
+		'host_inventory' => getRequest('host_inventory', array()),
+		'templates' => getRequest('templates', array())
 	);
 
 	// sort templates
@@ -746,7 +766,7 @@ elseif (isset($_REQUEST['form'])) {
 	$hostsWidget->addPageHeader(_('CONFIGURATION OF HOSTS'));
 
 	$data = array();
-	if ($hostId = get_request('hostid', 0)) {
+	if ($hostId = getRequest('hostid', 0)) {
 		$hostsWidget->addItem(get_header_host_table('', $_REQUEST['hostid']));
 
 		$dbHosts = API::Host()->get(array(
@@ -775,12 +795,18 @@ elseif (isset($_REQUEST['form'])) {
 	$hostsWidget->addItem($hostForm->render());
 
 	$rootClass = 'host-edit';
-	if (get_request('hostid') && $dbHost['flags'] == ZBX_FLAG_DISCOVERY_CREATED) {
+	if (getRequest('hostid') && $dbHost['flags'] == ZBX_FLAG_DISCOVERY_CREATED) {
 		$rootClass .= ' host-edit-discovered';
 	}
 	$hostsWidget->setRootClass($rootClass);
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$frmForm = new CForm();
 	$frmForm->cleanItems();
 	$frmForm->addItem(new CDiv(array(
@@ -799,7 +825,7 @@ else {
 	$hostsWidget->setRootClass('host-list');
 
 	// filter
-	$filterTable = new CTable('', 'filter');
+	$filterTable = new CTable('', 'filter filter-center');
 	$filterTable->addRow(array(
 		array(array(bold(_('Name')), SPACE._('like').NAME_DELIMITER), new CTextBox('filter_host', $filter['host'], 20)),
 		array(array(bold(_('DNS')), SPACE._('like').NAME_DELIMITER), new CTextBox('filter_dns', $filter['dns'], 20)),
@@ -816,7 +842,7 @@ else {
 	$divButtons = new CDiv(array($filterButton, SPACE, $resetButton));
 	$divButtons->setAttribute('style', 'padding: 4px 0;');
 
-	$filterTable->addRow(new CCol($divButtons, 'center', 4));
+	$filterTable->addRow(new CCol($divButtons, 'controls', 4));
 
 	$filterForm = new CForm('get');
 	$filterForm->setAttribute('name', 'zbx_filter');
@@ -832,7 +858,7 @@ else {
 	$table = new CTableInfo(_('No hosts found.'));
 	$table->setHeader(array(
 		new CCheckBox('all_hosts', null, "checkAll('".$form->getName()."', 'all_hosts', 'hosts');"),
-		make_sorting_header(_('Name'), 'name'),
+		make_sorting_header(_('Name'), 'name', $sortField, $sortOrder),
 		_('Applications'),
 		_('Items'),
 		_('Triggers'),
@@ -841,23 +867,20 @@ else {
 		_('Web'),
 		_('Interface'),
 		_('Templates'),
-		make_sorting_header(_('Status'), 'status'),
+		make_sorting_header(_('Status'), 'status', $sortField, $sortOrder),
 		_('Availability')
 	));
 
 	// get Hosts
 	$hosts = array();
 
-	$sortfield = getPageSortField('name');
-	$sortorder = getPageSortOrder();
-
 	if ($pageFilter->groupsSelected) {
 		$hosts = API::Host()->get(array(
 			'output' => array('hostid', 'name', 'status'),
 			'groupids' => ($pageFilter->groupid > 0) ? $pageFilter->groupid : null,
 			'editable' => true,
-			'sortfield' => $sortfield,
-			'sortorder' => $sortorder,
+			'sortfield' => $sortField,
+			'sortorder' => $sortOrder,
 			'limit' => $config['search_limit'] + 1,
 			'search' => array(
 				'name' => ($filter['host'] === '') ? null : $filter['host'],
@@ -874,8 +897,8 @@ else {
 	}
 
 	// sorting && paging
-	order_result($hosts, $sortfield, $sortorder);
-	$paging = getPagingLine($hosts, array('hostid'));
+	order_result($hosts, $sortField, $sortOrder);
+	$paging = getPagingLine($hosts);
 
 	$hosts = API::Host()->get(array(
 		'hostids' => zbx_objectValues($hosts, 'hostid'),
@@ -891,7 +914,7 @@ else {
 		'selectDiscoveryRule' => array('itemid', 'name'),
 		'selectHostDiscovery' => array('ts_delete')
 	));
-	order_result($hosts, $sortfield, $sortorder);
+	order_result($hosts, $sortField, $sortOrder);
 
 	// selecting linked templates to templates linked to hosts
 	$templateIds = array();
@@ -955,33 +978,24 @@ else {
 
 		$statusScript = null;
 
-		switch ($host['status']) {
-			case HOST_STATUS_MONITORED:
-				if ($host['maintenance_status'] == HOST_MAINTENANCE_STATUS_ON) {
-					$statusCaption = _('In maintenance');
-					$statusClass = 'orange';
-				}
-				else {
-					$statusCaption = _('Enabled');
-					$statusClass = 'enabled';
-				}
+		if ($host['status'] == HOST_STATUS_MONITORED) {
+			if ($host['maintenance_status'] == HOST_MAINTENANCE_STATUS_ON) {
+				$statusCaption = _('In maintenance');
+				$statusClass = 'orange';
+			}
+			else {
+				$statusCaption = _('Enabled');
+				$statusClass = 'enabled';
+			}
 
-				$statusScript = 'return Confirm('.zbx_jsvalue(_('Disable host?')).');';
-				$statusUrl = 'hosts.php?hosts'.SQUAREBRACKETS.'='.$host['hostid'].'&go=disable'.url_param('groupid');
-				break;
-
-			case HOST_STATUS_NOT_MONITORED:
-				$statusCaption = _('Disabled');
-				$statusUrl = 'hosts.php?hosts'.SQUAREBRACKETS.'='.$host['hostid'].'&go=activate'.url_param('groupid');
-				$statusScript = 'return Confirm('.zbx_jsvalue(_('Enable host?')).');';
-				$statusClass = 'disabled';
-				break;
-
-			default:
-				$statusCaption = _('Unknown');
-				$statusScript = 'return Confirm('.zbx_jsvalue(_('Disable host?')).');';
-				$statusUrl = 'hosts.php?hosts'.SQUAREBRACKETS.'='.$host['hostid'].'&go=disable'.url_param('groupid');
-				$statusClass = 'unknown';
+			$statusScript = 'return Confirm('.zbx_jsvalue(_('Disable host?')).');';
+			$statusUrl = 'hosts.php?hosts[]='.$host['hostid'].'&action=host.massdisable'.url_param('groupid');
+		}
+		else {
+			$statusCaption = _('Disabled');
+			$statusUrl = 'hosts.php?hosts[]='.$host['hostid'].'&action=host.massenable'.url_param('groupid');
+			$statusScript = 'return Confirm('.zbx_jsvalue(_('Enable host?')).');';
+			$statusClass = 'disabled';
 		}
 
 		$status = new CLink($statusCaption, $statusUrl, $statusClass, $statusScript);
@@ -1047,18 +1061,23 @@ else {
 		));
 	}
 
-	$goBox = new CComboBox('go');
-	$goBox->addItem('export', _('Export selected'));
-	$goBox->addItem('massupdate', _('Mass update'));
-	$goOption = new CComboItem('activate', _('Enable selected'));
+	$goBox = new CComboBox('action');
+
+	$goBox->addItem('host.export', _('Export selected'));
+
+	$goBox->addItem('host.massupdateform', _('Mass update'));
+	$goOption = new CComboItem('host.massenable', _('Enable selected'));
 	$goOption->setAttribute('confirm', _('Enable selected hosts?'));
 	$goBox->addItem($goOption);
-	$goOption = new CComboItem('disable', _('Disable selected'));
+
+	$goOption = new CComboItem('host.massdisable', _('Disable selected'));
 	$goOption->setAttribute('confirm', _('Disable selected hosts?'));
 	$goBox->addItem($goOption);
-	$goOption = new CComboItem('delete', _('Delete selected'));
+
+	$goOption = new CComboItem('host.massdelete', _('Delete selected'));
 	$goOption->setAttribute('confirm', _('Delete selected hosts?'));
 	$goBox->addItem($goOption);
+
 	$goButton = new CSubmit('goButton', _('Go').' (0)');
 	$goButton->setAttribute('id', 'goButton');
 
diff --git a/frontends/php/httpconf.php b/frontends/php/httpconf.php
index e7753b436fe..7dc03197668 100644
--- a/frontends/php/httpconf.php
+++ b/frontends/php/httpconf.php
@@ -57,22 +57,35 @@ $fields = array(
 	'new_application'	=> array(T_ZBX_STR, O_OPT, null,	null,				null),
 	'hostname'			=> array(T_ZBX_STR, O_OPT, null,	null,				null),
 	'templated'			=> array(T_ZBX_STR, O_OPT, null,	null,				null),
+	'verify_host'		=> array(T_ZBX_STR, O_OPT, null,	null,				null),
+	'verify_peer'		=> array(T_ZBX_STR, O_OPT, null,	null,				null),
+	'headers'			=> array(T_ZBX_STR, O_OPT, null, null,					'isset({save})'),
+	'ssl_cert_file'		=> array(T_ZBX_STR, O_OPT, null, null,					'isset({save})'),
+	'ssl_key_file'		=> array(T_ZBX_STR, O_OPT, null, null,					'isset({save})'),
+	'ssl_key_password'	=> array(T_ZBX_STR, O_OPT, null, null,					'isset({save})'),
 	// actions
-	'go'				=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
+	'action'			=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+								IN('"httptest.massclearhistory","httptest.massdelete","httptest.massdisable",'.
+									'"httptest.massenable"'
+								),
+								null
+							),
 	'clone'				=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'del_history'		=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'save'				=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'delete'			=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'cancel'			=> array(T_ZBX_STR, O_OPT, P_SYS,	null,				null),
 	'form'				=> array(T_ZBX_STR, O_OPT, P_SYS,	null,				null),
-	'form_refresh'		=> array(T_ZBX_INT, O_OPT, null,	null,				null)
+	'form_refresh'		=> array(T_ZBX_INT, O_OPT, null,	null,				null),
+	// sort and sortorder
+	'sort'				=> array(T_ZBX_STR, O_OPT, P_SYS, IN('"hostname","name","status"'),				null),
+	'sortorder'			=> array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
-$_REQUEST['showdisabled'] = get_request('showdisabled', CProfile::get('web.httpconf.showdisabled', 1));
+$_REQUEST['showdisabled'] = getRequest('showdisabled', CProfile::get('web.httpconf.showdisabled', 1));
 
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
-$showDisabled = get_request('showdisabled', 1);
+$showDisabled = getRequest('showdisabled', 1);
 CProfile::update('web.httpconf.showdisabled', $showDisabled, PROFILE_TYPE_INT);
 
 if (!empty($_REQUEST['steps'])) {
@@ -95,15 +108,13 @@ if (isset($_REQUEST['httptestid']) || !empty($_REQUEST['group_httptestid'])) {
 		access_deny();
 	}
 }
-$_REQUEST['go'] = get_request('go', 'none');
-
 
 /*
  * Actions
  */
 // add new steps
 if (isset($_REQUEST['new_httpstep'])) {
-	$_REQUEST['steps'] = get_request('steps', array());
+	$_REQUEST['steps'] = getRequest('steps', array());
 	$_REQUEST['new_httpstep']['no'] = count($_REQUEST['steps']) + 1;
 	array_push($_REQUEST['steps'], $_REQUEST['new_httpstep']);
 
@@ -135,6 +146,10 @@ if (isset($_REQUEST['delete']) && isset($_REQUEST['httptestid'])) {
 	unset($_REQUEST['httptestid'], $_REQUEST['form']);
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
 	show_messages($result, _('Web scenario deleted'), _('Cannot delete web scenario'));
 }
 elseif (isset($_REQUEST['clone']) && isset($_REQUEST['httptestid'])) {
@@ -143,7 +158,7 @@ elseif (isset($_REQUEST['clone']) && isset($_REQUEST['httptestid'])) {
 	$_REQUEST['form'] = 'clone';
 }
 elseif (hasRequest('del_history') && hasRequest('httptestid')) {
-	$dbResult = true;
+	$result = true;
 
 	DBstart();
 
@@ -151,10 +166,10 @@ elseif (hasRequest('del_history') && hasRequest('httptestid')) {
 
 	$httpTest = get_httptest_by_httptestid($httptestId);
 	if ($httpTest) {
-		$dbResult = delete_history_by_httptestid($httptestId);
-		if ($dbResult) {
+		$result = delete_history_by_httptestid($httptestId);
+		if ($result) {
 
-			$dbResult = DBexecute('UPDATE httptest SET nextcheck=0 WHERE httptestid='.zbx_dbstr($httptestId));
+			$result = DBexecute('UPDATE httptest SET nextcheck=0 WHERE httptestid='.zbx_dbstr($httptestId));
 
 			$host = DBfetch(DBselect(
 				'SELECT h.host FROM hosts h,httptest ht WHERE ht.hostid=h.hostid AND ht.httptestid='.zbx_dbstr($httptestId)
@@ -166,50 +181,63 @@ elseif (hasRequest('del_history') && hasRequest('httptestid')) {
 		}
 	}
 
-	$dbResult = DBend($dbResult);
+	$result = DBend($result);
 
-	show_messages($dbResult, _('History cleared'), _('Cannot clear history'));
-	clearCookies($dbResult, getRequest('hostid'));
+	show_messages($result, _('History cleared'), _('Cannot clear history'));
 }
 elseif (isset($_REQUEST['save'])) {
+
+	if (hasRequest('httptestid')) {
+		$action = AUDIT_ACTION_UPDATE;
+		$messageTrue = _('Scenario updated');
+		$messageFalse = _('Cannot update web scenario');
+	}
+	else {
+		$action = AUDIT_ACTION_ADD;
+		$messageTrue = _('Scenario added');
+		$messageFalse = _('Cannot add web scenario');
+	}
+
 	try {
 		DBstart();
 
-		if (isset($_REQUEST['httptestid'])) {
-			$action = AUDIT_ACTION_UPDATE;
-			$message_true = _('Scenario updated');
-			$message_false = _('Cannot update web scenario');
-		}
-		else {
-			$action = AUDIT_ACTION_ADD;
-			$message_true = _('Scenario added');
-			$message_false = _('Cannot add web scenario');
-		}
-
 		if (!empty($_REQUEST['applicationid']) && !empty($_REQUEST['new_application'])) {
 			throw new Exception(_('Cannot create new application, web scenario is already assigned to application.'));
 		}
 
-		$steps = get_request('steps', array());
+		$steps = getRequest('steps', array());
 		if (!empty($steps)) {
 			$i = 1;
-			foreach ($steps as $snum => $step) {
-				$steps[$snum]['no'] = $i++;
+			foreach ($steps as $stepNumber => &$step) {
+				$step['no'] = $i++;
+				$step['follow_redirects'] = $step['follow_redirects']
+					? HTTPTEST_STEP_FOLLOW_REDIRECTS_ON
+					: HTTPTEST_STEP_FOLLOW_REDIRECTS_OFF;
+				$step['retrieve_mode'] = $step['retrieve_mode']
+					? HTTPTEST_STEP_RETRIEVE_MODE_HEADERS
+					: HTTPTEST_STEP_RETRIEVE_MODE_CONTENT;
 			}
+			unset($step);
 		}
 
 		$httpTest = array(
 			'hostid' => $_REQUEST['hostid'],
 			'name' => $_REQUEST['name'],
 			'authentication' => $_REQUEST['authentication'],
-			'applicationid' => get_request('applicationid'),
+			'applicationid' => getRequest('applicationid'),
 			'delay' => $_REQUEST['delay'],
 			'retries' => $_REQUEST['retries'],
 			'status' => isset($_REQUEST['status']) ? 0 : 1,
 			'agent' => $_REQUEST['agent'],
 			'variables' => $_REQUEST['variables'],
 			'http_proxy' => $_REQUEST['http_proxy'],
-			'steps' => $steps
+			'steps' => $steps,
+			'verify_peer' => getRequest('verify_peer', HTTPTEST_VERIFY_PEER_OFF),
+			'verify_host' => getRequest('verify_host', HTTPTEST_VERIFY_HOST_OFF),
+			'ssl_cert_file' => getRequest('ssl_cert_file'),
+			'ssl_key_file' => getRequest('ssl_key_file'),
+			'ssl_key_password' => getRequest('ssl_key_password'),
+			'headers' => getRequest('headers')
 		);
 
 		if (!empty($_REQUEST['new_application'])) {
@@ -256,19 +284,19 @@ elseif (isset($_REQUEST['save'])) {
 
 			$httpTest = CArrayHelper::unsetEqualValues($httpTest, $dbHttpTest, array('applicationid'));
 			foreach ($httpTest['steps'] as $snum => $step) {
-				if (isset($step['httpstepid'])) {
+				if (isset($step['httpstepid']) && isset($dbHttpSteps[$step['httpstepid']])) {
 					$newStep = CArrayHelper::unsetEqualValues($step, $dbHttpSteps[$step['httpstepid']], array('httpstepid'));
 					$httpTest['steps'][$snum] = $newStep;
 				}
 			}
 
-			$httpTest['httptestid'] = $httptestid = $_REQUEST['httptestid'];
+			$httpTest['httptestid'] = $httpTestId = $_REQUEST['httptestid'];
 			$result = API::HttpTest()->update($httpTest);
 			if (!$result) {
 				throw new Exception();
 			}
 			else {
-				clearCookies($result, $_REQUEST['hostid']);
+				uncheckTableRows(getRequest('hostid'));
 			}
 		}
 		else {
@@ -277,16 +305,16 @@ elseif (isset($_REQUEST['save'])) {
 				throw new Exception();
 			}
 			else {
-				clearCookies($result, $_REQUEST['hostid']);
+				uncheckTableRows(getRequest('hostid'));
 			}
-			$httptestid = reset($result['httptestids']);
+			$httpTestId = reset($result['httptestids']);
 		}
 
 		$host = get_host_by_hostid($_REQUEST['hostid']);
-		add_audit($action, AUDIT_RESOURCE_SCENARIO, 'Scenario ['.$_REQUEST['name'].'] ['.$httptestid.'] Host ['.$host['host'].']');
+		add_audit($action, AUDIT_RESOURCE_SCENARIO, 'Scenario ['.$_REQUEST['name'].'] ['.$httpTestId.'] Host ['.$host['host'].']');
 
 		unset($_REQUEST['httptestid'], $_REQUEST['form']);
-		show_messages(true, $message_true);
+		show_messages(true, $messageTrue);
 		DBend(true);
 	}
 	catch (Exception $e) {
@@ -296,13 +324,13 @@ elseif (isset($_REQUEST['save'])) {
 		if (!empty($msg)) {
 			error($msg);
 		}
-		show_messages(false, null, $message_false);
+		show_messages(false, null, $messageFalse);
 	}
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('group_httptestid')) {
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('httptest.massenable', 'httptest.massdisable')) && hasRequest('group_httptestid')) {
 	$result = true;
 	$groupHttpTestId = getRequest('group_httptestid');
-	$enable = (getRequest('go') == 'activate');
+	$enable = (getRequest('action') == 'httptest.massenable');
 	$status = $enable ? HTTPTEST_STATUS_ACTIVE : HTTPTEST_STATUS_DISABLED;
 	$statusName = $enable ? 'enabled' : 'disabled';
 	$auditAction = $enable ? AUDIT_ACTION_ENABLE : AUDIT_ACTION_DISABLE;
@@ -340,12 +368,15 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		: _n('Cannot disable web scenario', 'Cannot disable web scenarios', $updated);
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, getRequest('hostid'));
 }
-elseif ($_REQUEST['go'] == 'clean_history' && isset($_REQUEST['group_httptestid'])) {
+elseif (hasRequest('action') && getRequest('action') == 'httptest.massclearhistory' && hasRequest('group_httptestid')) {
 	$result = true;
-	$group_httptestid = $_REQUEST['group_httptestid'];
+	$group_httptestid = getRequest('group_httptestid');
 
 	DBStart();
 
@@ -369,14 +400,19 @@ elseif ($_REQUEST['go'] == 'clean_history' && isset($_REQUEST['group_httptestid'
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
 	show_messages($result, _('History cleared'), _('Cannot clear history'));
-	clearCookies($result, $_REQUEST['hostid']);
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['group_httptestid'])) {
-	$goResult = API::HttpTest()->delete($_REQUEST['group_httptestid']);
+elseif (hasRequest('action') && getRequest('action') == 'httptest.massdelete' && hasRequest('group_httptestid')) {
+	$result = API::HttpTest()->delete(getRequest('group_httptestid'));
 
-	show_messages($goResult, _('Web scenario deleted'), _('Cannot delete web scenario'));
-	clearCookies($goResult, $_REQUEST['hostid']);
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
+	show_messages($result, _('Web scenario deleted'), _('Cannot delete web scenario'));
 }
 
 show_messages();
@@ -386,10 +422,10 @@ show_messages();
  */
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'hostid' => get_request('hostid', 0),
-		'httptestid' => get_request('httptestid', null),
-		'form' => get_request('form'),
-		'form_refresh' => get_request('form_refresh'),
+		'hostid' => getRequest('hostid', 0),
+		'httptestid' => getRequest('httptestid'),
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh'),
 		'templates' => array()
 	);
 
@@ -412,7 +448,7 @@ if (isset($_REQUEST['form'])) {
 						'httpconf.php?form=update&httptestid='.$dbTest['httptestid'].'&hostid='.$dbTest['hostid'],
 						'highlight underline weight_normal'
 					);
-					$data['templates'][] = SPACE.RARR.SPACE;
+					$data['templates'][] = SPACE.'&rArr;'.SPACE;
 				}
 				$httpTestId = $dbTest['templateid'];
 			}
@@ -441,6 +477,12 @@ if (isset($_REQUEST['form'])) {
 		$data['http_password'] = $dbHttpTest['http_password'];
 		$data['http_proxy'] = $dbHttpTest['http_proxy'];
 		$data['templated'] = (bool) $dbHttpTest['templateid'];
+		$data['headers'] = $dbHttpTest['headers'];
+		$data['verify_peer'] = $dbHttpTest['verify_peer'];
+		$data['verify_host'] = $dbHttpTest['verify_host'];
+		$data['ssl_cert_file'] = $dbHttpTest['ssl_cert_file'];
+		$data['ssl_key_file'] = $dbHttpTest['ssl_key_file'];
+		$data['ssl_key_password'] = $dbHttpTest['ssl_key_password'];
 		$data['steps'] = DBfetchArray(DBselect('SELECT h.* FROM httpstep h WHERE h.httptestid='.zbx_dbstr($_REQUEST['httptestid']).' ORDER BY h.no'));
 	}
 	else {
@@ -451,19 +493,25 @@ if (isset($_REQUEST['form'])) {
 			$data['status'] = HTTPTEST_STATUS_ACTIVE;
 		}
 
-		$data['name'] = get_request('name', '');
-		$data['applicationid'] = get_request('applicationid');
-		$data['new_application'] = get_request('new_application', '');
-		$data['delay'] = get_request('delay', 60);
-		$data['retries'] = get_request('retries', 1);
-		$data['agent'] = get_request('agent', '');
-		$data['variables'] = get_request('variables', array());
-		$data['authentication'] = get_request('authentication', HTTPTEST_AUTH_NONE);
-		$data['http_user'] = get_request('http_user', '');
-		$data['http_password'] = get_request('http_password', '');
-		$data['http_proxy'] = get_request('http_proxy', '');
-		$data['templated'] = get_request('templated');
-		$data['steps'] = get_request('steps', array());
+		$data['name'] = getRequest('name', '');
+		$data['applicationid'] = getRequest('applicationid');
+		$data['new_application'] = getRequest('new_application', '');
+		$data['delay'] = getRequest('delay', 60);
+		$data['retries'] = getRequest('retries', 1);
+		$data['agent'] = getRequest('agent', '');
+		$data['variables'] = getRequest('variables', array());
+		$data['authentication'] = getRequest('authentication', HTTPTEST_AUTH_NONE);
+		$data['http_user'] = getRequest('http_user', '');
+		$data['http_password'] = getRequest('http_password', '');
+		$data['http_proxy'] = getRequest('http_proxy', '');
+		$data['templated'] = (bool) getRequest('templated');
+		$data['steps'] = getRequest('steps', array());
+		$data['headers'] = getRequest('headers');
+		$data['verify_peer'] = getRequest('verify_peer');
+		$data['verify_host'] = getRequest('verify_host');
+		$data['ssl_cert_file'] = getRequest('ssl_cert_file');
+		$data['ssl_key_file'] = getRequest('ssl_key_file');
+		$data['ssl_key_password'] = getRequest('ssl_key_password');
 	}
 
 	$data['application_list'] = array();
@@ -480,6 +528,12 @@ if (isset($_REQUEST['form'])) {
 	$httpView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$pageFilter = new CPageFilter(array(
 		'groups' => array(
 			'editable' => true
@@ -488,8 +542,8 @@ else {
 			'editable' => true,
 			'templated_hosts' => true
 		),
-		'hostid' => get_request('hostid'),
-		'groupid' => get_request('groupid')
+		'hostid' => getRequest('hostid'),
+		'groupid' => getRequest('groupid')
 	));
 
 	$data = array(
@@ -497,12 +551,23 @@ else {
 		'pageFilter' => $pageFilter,
 		'showDisabled' => $showDisabled,
 		'httpTests' => array(),
-		'paging' => null
+		'paging' => null,
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	if ($data['pageFilter']->hostsSelected) {
-		$sortfield = getPageSortField('hostname');
+	// show the error column only for hosts
+	if (getRequest('hostid') != 0) {
+		$data['showInfoColumn'] = (bool) API::Host()->get(array(
+			'hostids' => getRequest('hostid'),
+			'output' => array('status')
+		));
+	}
+	else {
+		$data['showInfoColumn'] = true;
+	}
 
+	if ($data['pageFilter']->hostsSelected) {
 		$options = array(
 			'editable' => true,
 			'output' => array('httptestid'),
@@ -519,14 +584,16 @@ else {
 		}
 		$httpTests = API::HttpTest()->get($options);
 
-		order_result($httpTests, $sortfield, getPageSortOrder());
+		order_result($httpTests, $sortField, $sortOrder);
 
-		$data['paging'] = getPagingLine($httpTests, array('httptestid'));
+		$data['paging'] = getPagingLine($httpTests);
 
 		$dbHttpTests = DBselect(
-			'SELECT ht.httptestid,ht.name,ht.delay,ht.status,ht.hostid,ht.templateid,h.name AS hostname'.
+			'SELECT ht.httptestid,ht.name,ht.delay,ht.status,ht.hostid,ht.templateid,h.name AS hostname,ht.retries,'.
+				'ht.authentication,ht.http_proxy,a.applicationid,a.name AS application_name'.
 				' FROM httptest ht'.
 				' INNER JOIN hosts h ON h.hostid=ht.hostid'.
+				' LEFT JOIN applications a ON a.applicationid=ht.applicationid'.
 				' WHERE '.dbConditionInt('ht.httptestid', zbx_objectValues($httpTests, 'httptestid'))
 		);
 		$httpTests = array();
@@ -534,6 +601,20 @@ else {
 			$httpTests[$dbHttpTest['httptestid']] = $dbHttpTest;
 		}
 
+		if($data['showInfoColumn']) {
+			$httpTestsLastData = Manager::HttpTest()->getLastData(array_keys($httpTests));
+
+			foreach ($httpTestsLastData as $httpTestId => &$lastData) {
+				if ($lastData['lastfailedstep'] !== null) {
+					$lastData['failedstep'] = get_httpstep_by_no($httpTestId, $lastData['lastfailedstep']);
+				}
+			}
+			unset($lastData);
+		}
+		else {
+			$httpTestsLastData = array();
+		}
+
 		$dbHttpSteps = DBselect(
 			'SELECT hs.httptestid,COUNT(*) AS stepscnt'.
 				' FROM httpstep hs'.
@@ -544,11 +625,12 @@ else {
 			$httpTests[$dbHttpStep['httptestid']]['stepscnt'] = $dbHttpStep['stepscnt'];
 		}
 
-		order_result($httpTests, $sortfield, getPageSortOrder());
+		order_result($httpTests, $sortField, $sortOrder);
 
 		$data['parentTemplates'] = getHttpTestsParentTemplates($httpTests);
 
 		$data['httpTests'] = $httpTests;
+		$data['httpTestsLastData'] = $httpTestsLastData;
 	}
 
 	// render view
diff --git a/frontends/php/httpdetails.php b/frontends/php/httpdetails.php
index 8fb825c9f74..8a5f8bf11d0 100644
--- a/frontends/php/httpdetails.php
+++ b/frontends/php/httpdetails.php
@@ -70,7 +70,7 @@ if ($page['type'] == PAGE_TYPE_JS || $page['type'] == PAGE_TYPE_HTML_BLOCK) {
  * Collect data
  */
 $httpTest = API::HttpTest()->get(array(
-	'httptestids' => get_request('httptestid'),
+	'httptestids' => getRequest('httptestid'),
 	'output' => API_OUTPUT_EXTEND,
 	'preservekeys' => true
 ));
@@ -116,10 +116,10 @@ $httpdetailsWidget->addPageHeader(
 		_('DETAILS OF SCENARIO'),
 		SPACE,
 		bold(CMacrosResolverHelper::resolveHttpTestName($httpTest['hostid'], $httpTest['name'])),
-		isset($httpTestData['lastcheck']) ? ' ['.zbx_date2str(_('d M Y H:i:s'), $httpTestData['lastcheck']).']' : null
+		isset($httpTestData['lastcheck']) ? ' ['.zbx_date2str(DATE_TIME_FORMAT_SECONDS, $httpTestData['lastcheck']).']' : null
 	),
 	array(
-		get_icon('reset', array('id' => get_request('httptestid'))),
+		get_icon('reset', array('id' => getRequest('httptestid'))),
 		get_icon('fullscreen', array('fullscreen' => $_REQUEST['fullscreen']))
 	)
 );
@@ -250,7 +250,7 @@ $httpdetailsTable->addRow(array(
 $httpdetailsWidget->addItem($httpdetailsTable);
 $httpdetailsWidget->show();
 
-echo SBR;
+echo BR();
 
 // create graphs widget
 $graphsWidget = new CWidget();
@@ -274,9 +274,9 @@ $graphInScreen = new CScreenBase(array(
 	'mode' => SCREEN_MODE_PREVIEW,
 	'dataId' => 'graph_in',
 	'profileIdx' => 'web.httptest',
-	'profileIdx2' => get_request('httptestid'),
-	'period' => get_request('period'),
-	'stime' => get_request('stime')
+	'profileIdx2' => getRequest('httptestid'),
+	'period' => getRequest('period'),
+	'stime' => getRequest('stime')
 ));
 $graphInScreen->timeline['starttime'] = date(TIMESTAMP_FORMAT, get_min_itemclock_by_itemid($itemIds));
 
@@ -316,9 +316,9 @@ $graphTimeScreen = new CScreenBase(array(
 	'mode' => SCREEN_MODE_PREVIEW,
 	'dataId' => 'graph_time',
 	'profileIdx' => 'web.httptest',
-	'profileIdx2' => get_request('httptestid'),
-	'period' => get_request('period'),
-	'stime' => get_request('stime')
+	'profileIdx2' => getRequest('httptestid'),
+	'period' => getRequest('period'),
+	'stime' => getRequest('stime')
 ));
 
 $src = 'chart3.php?height=150'.
diff --git a/frontends/php/httpmon.php b/frontends/php/httpmon.php
index ce02e06b844..0b1e28cfd38 100644
--- a/frontends/php/httpmon.php
+++ b/frontends/php/httpmon.php
@@ -33,21 +33,28 @@ require_once dirname(__FILE__).'/include/page_header.php';
 $fields = array(
 	'fullscreen' =>		array(T_ZBX_INT,	O_OPT,		P_SYS,	IN('0,1'),	null),
 	'groupid' =>		array(T_ZBX_INT,	O_OPT,		P_SYS,	DB_ID,		null),
-	'hostid' =>		array(T_ZBX_INT,	O_OPT,		P_SYS,	DB_ID,		null),
+	'hostid' =>			array(T_ZBX_INT,	O_OPT,		P_SYS,	DB_ID,		null),
+	// sort and sortorder
+	'sort' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"hostname","name"'),						null),
+	'sortorder' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
 
 /*
  * Permissions
  */
-if (get_request('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
+if (getRequest('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
 	access_deny();
 }
-if (get_request('hostid') && !API::Host()->isReadable(array($_REQUEST['hostid']))) {
+if (getRequest('hostid') && !API::Host()->isReadable(array($_REQUEST['hostid']))) {
 	access_deny();
 }
 
-validate_sort_and_sortorder('name', ZBX_SORT_DOWN);
+$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
 
 $options = array(
 	'groups' => array(
@@ -58,8 +65,8 @@ $options = array(
 		'with_monitored_items' => true,
 		'with_httptests' => true
 	),
-	'hostid' => get_request('hostid', null),
-	'groupid' => get_request('groupid', null),
+	'hostid' => getRequest('hostid'),
+	'groupid' => getRequest('groupid'),
 );
 $pageFilter = new CPageFilter($options);
 $_REQUEST['groupid'] = $pageFilter->groupid;
@@ -81,8 +88,8 @@ $httpmon_wdgt->addHeaderRowNumber();
 // TABLE
 $table = new CTableInfo(_('No web scenarios found.'));
 $table->SetHeader(array(
-	$_REQUEST['hostid'] == 0 ? make_sorting_header(_('Host'), 'hostname') : null,
-	make_sorting_header(_('Name'), 'name'),
+	$_REQUEST['hostid'] == 0 ? make_sorting_header(_('Host'), 'hostname', $sortField, $sortOrder) : null,
+	make_sorting_header(_('Name'), 'name', $sortField, $sortOrder),
 	_('Number of steps'),
 	_('Last check'),
 	_('Status')
@@ -124,7 +131,7 @@ if ($pageFilter->hostsSelected) {
 
 	$httpTests = resolveHttpTestMacros($httpTests, true, false);
 
-	order_result($httpTests, getPageSortField('name'), getPageSortOrder());
+	order_result($httpTests, $sortField, $sortOrder);
 
 	// fetch the latest results of the web scenario
 	$lastHttpTestData = Manager::HttpTest()->getLastData(array_keys($httpTests));
@@ -134,7 +141,7 @@ if ($pageFilter->hostsSelected) {
 				&& $lastHttpTestData[$httpTest['httptestid']]['lastfailedstep'] !== null) {
 			$lastData = $lastHttpTestData[$httpTest['httptestid']];
 
-			$lastcheck = zbx_date2str(_('d M Y H:i:s'), $lastData['lastcheck']);
+			$lastcheck = zbx_date2str(DATE_TIME_FORMAT_SECONDS, $lastData['lastcheck']);
 
 			if ($lastData['lastfailedstep'] != 0) {
 				$stepData = get_httpstep_by_no($httpTest['httptestid'], $lastData['lastfailedstep']);
diff --git a/frontends/php/image.php b/frontends/php/image.php
index ef5c22a69f4..3bd94026b66 100644
--- a/frontends/php/image.php
+++ b/frontends/php/image.php
@@ -39,8 +39,8 @@ check_fields($fields);
 $resize = false;
 if (isset($_REQUEST['width']) || isset($_REQUEST['height'])) {
 	$resize = true;
-	$width = get_request('width', 0);
-	$height = get_request('height', 0);
+	$width = getRequest('width', 0);
+	$height = getRequest('height', 0);
 }
 if (!($row = get_image_by_imageid($_REQUEST['imageid']))) {
 	error(_('Incorrect image index.'));
diff --git a/frontends/php/images/general/setup/welcome_screen.png b/frontends/php/images/general/setup/welcome_screen.png
index 31036af6b84..2eaf72ea5c3 100644
--- a/frontends/php/images/general/setup/welcome_screen.png
+++ b/frontends/php/images/general/setup/welcome_screen.png
diff --git a/frontends/php/imgstore.php b/frontends/php/imgstore.php
index e7e1147d699..c0fd1d93af6 100644
--- a/frontends/php/imgstore.php
+++ b/frontends/php/imgstore.php
@@ -42,8 +42,8 @@ check_fields($fields);
 $resize = false;
 if (isset($_REQUEST['width']) || isset($_REQUEST['height'])) {
 	$resize = true;
-	$width = get_request('width', 0);
-	$height = get_request('height', 0);
+	$width = getRequest('width', 0);
+	$height = getRequest('height', 0);
 }
 
 if (isset($_REQUEST['css'])) {
@@ -53,9 +53,9 @@ if (isset($_REQUEST['css'])) {
 			' background-image: url("images/general/no_icon.png"); }'."\n";
 
 	$images = API::Image()->get(array(
+		'output' => array('imageid'),
 		'filter' => array('imagetype' => IMAGE_TYPE_ICON),
-		'output' => API_OUTPUT_EXTEND,
-		'select_image' => 1
+		'select_image' => true
 	));
 	foreach ($images as $image) {
 		$image['image'] = base64_decode($image['image']);
@@ -75,7 +75,7 @@ if (isset($_REQUEST['css'])) {
 	echo $css;
 }
 elseif (isset($_REQUEST['iconid'])) {
-	$iconid = get_request('iconid', 0);
+	$iconid = getRequest('iconid', 0);
 
 	if ($iconid > 0) {
 		$image = get_image_by_imageid($iconid);
@@ -93,7 +93,7 @@ elseif (isset($_REQUEST['iconid'])) {
 	imageOut($source);
 }
 elseif (isset($_REQUEST['imageid'])) {
-	$imageid = get_request('imageid', 0);
+	$imageid = getRequest('imageid', 0);
 
 	session_start();
 	if (isset($_SESSION['image_id'][$imageid])) {
diff --git a/frontends/php/include/acknow.inc.php b/frontends/php/include/acknow.inc.php
index 62229183826..b26e81b64b7 100644
--- a/frontends/php/include/acknow.inc.php
+++ b/frontends/php/include/acknow.inc.php
@@ -51,7 +51,7 @@ function makeAckTab($event) {
 	if (!empty($event['acknowledges']) && is_array($event['acknowledges'])) {
 		foreach ($event['acknowledges'] as $acknowledge) {
 			$acknowledgeTable->addRow(array(
-				zbx_date2str(_('d M Y H:i:s'), $acknowledge['clock']),
+				zbx_date2str(DATE_TIME_FORMAT_SECONDS, $acknowledge['clock']),
 				getUserFullname($acknowledge),
 				new CCol(zbx_nl2br($acknowledge['message']), 'wraptext')
 			));
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index c5351796137..aed5d0aaf96 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -832,7 +832,7 @@ function getActionMessages(array $alerts) {
 
 		$mediaType = array_pop($alert['mediatypes']);
 
-		$time = zbx_date2str(EVENT_ACTION_MESSAGES_DATE_FORMAT, $alert['clock']);
+		$time = zbx_date2str(DATE_TIME_FORMAT_SECONDS, $alert['clock']);
 
 		if ($alert['esc_step'] > 0) {
 			$time = array(
@@ -878,7 +878,7 @@ function getActionMessages(array $alerts) {
 		}
 		else {
 			$info = new CDiv(SPACE, 'status_icon iconerror');
-			$info->setHint($alert['error'], '', 'on');
+			$info->setHint($alert['error'], 'on');
 		}
 
 		$table->addRow(array(
@@ -923,7 +923,7 @@ function getActionCommands(array $alerts) {
 			continue;
 		}
 
-		$time = zbx_date2str(EVENT_ACTION_CMDS_DATE_FORMAT, $alert['clock']);
+		$time = zbx_date2str(DATE_TIME_FORMAT_SECONDS, $alert['clock']);
 
 		if ($alert['esc_step'] > 0) {
 			$time = array(
@@ -977,7 +977,7 @@ function get_actions_hint_by_eventid($eventid, $status = null) {
 				' LEFT JOIN users u ON u.userid=a.userid'.
 				' LEFT JOIN media_type mt ON mt.mediatypeid=a.mediatypeid'.
 			' WHERE a.eventid='.zbx_dbstr($eventid).
-				(is_null($status)?'':' AND a.status='.$status).
+				(is_null($status)?'':' AND a.status='.zbx_dbstr($status)).
 				' AND e.eventid=a.eventid'.
 				' AND a.alerttype IN ('.ALERT_TYPE_MESSAGE.','.ALERT_TYPE_COMMAND.')'.
 			' ORDER BY a.alertid';
diff --git a/frontends/php/include/audit.inc.php b/frontends/php/include/audit.inc.php
index 11701202efc..791b809c006 100644
--- a/frontends/php/include/audit.inc.php
+++ b/frontends/php/include/audit.inc.php
@@ -67,8 +67,8 @@ function add_audit($action, $resourcetype, $details) {
 		return true;
 	}
 
-	if (zbx_strlen($details) > 128) {
-		$details = zbx_substr($details, 0, 125).'...';
+	if (mb_strlen($details) > 128) {
+		$details = mb_substr($details, 0, 125).'...';
 	}
 
 	$ip = !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
@@ -109,8 +109,8 @@ function add_audit_ext($action, $resourcetype, $resourceid, $resourcename, $tabl
 		}
 	}
 
-	if (zbx_strlen($resourcename) > 255) {
-		$resourcename = zbx_substr($resourcename, 0, 252).'...';
+	if (mb_strlen($resourcename) > 255) {
+		$resourcename = mb_substr($resourcename, 0, 252).'...';
 	}
 
 	$ip = !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
@@ -150,8 +150,8 @@ function add_audit_ext($action, $resourcetype, $resourceid, $resourcename, $tabl
 }
 
 function add_audit_details($action, $resourcetype, $resourceid, $resourcename, $details = null) {
-	if (zbx_strlen($resourcename) > 255) {
-		$resourcename = zbx_substr($resourcename, 0, 252).'...';
+	if (mb_strlen($resourcename) > 255) {
+		$resourcename = mb_substr($resourcename, 0, 252).'...';
 	}
 
 	$ip = !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
diff --git a/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php
index 0e9b0963fab..a2c24d2fcbb 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/frontends/php/include/blocks.inc.php
@@ -121,7 +121,7 @@ function getFavouriteGraphs() {
 
 	if ($data['simpleGraphs']) {
 		foreach ($data['simpleGraphs'] as $item) {
-			$favourites->addItem(new CLink($item['label'], 'history.php?action=showgraph&itemid='.$item['id']), 'nowrap');
+			$favourites->addItem(new CLink($item['label'], 'history.php?action='.HISTORY_GRAPH.'&itemids[]='.$item['id']), 'nowrap');
 		}
 	}
 
@@ -318,7 +318,7 @@ function make_system_status($filter) {
 		'maintenance' => $filter['maintenance'],
 		'skipDependent' => true,
 		'withLastEventUnacknowledged' => ($filter['extAck'] == EXTACK_OPTION_UNACK) ? true : null,
-		'selectLastEvent' => API_OUTPUT_EXTEND,
+		'selectLastEvent' => array('eventid', 'acknowledged', 'objectid'),
 		'expandDescription' => true,
 		'filter' => array(
 			'priority' => $filter['severity'],
@@ -326,27 +326,29 @@ function make_system_status($filter) {
 		),
 		'sortfield' => 'lastchange',
 		'sortorder' => ZBX_SORT_DOWN,
-		'output' =>  API_OUTPUT_EXTEND,
+		'output' => array('triggerid', 'priority', 'state', 'description', 'error', 'value', 'lastchange'),
 		'selectHosts' => array('name'),
 		'selectGroups' => array('groupid'),
 		'preservekeys' => true
 	));
 
-	// get acknowledges
 	$eventIds = array();
-	foreach ($triggers as $tnum => $trigger) {
-		if (!empty($trigger['lastEvent'])) {
+
+	foreach ($triggers as $triggerId => $trigger) {
+		if ($trigger['lastEvent']) {
 			$eventIds[$trigger['lastEvent']['eventid']] = $trigger['lastEvent']['eventid'];
 		}
 
-		$triggers[$tnum]['event'] = $trigger['lastEvent'];
-		unset($triggers[$tnum]['lastEvent']);
+		$triggers[$triggerId]['event'] = $trigger['lastEvent'];
+		unset($triggers[$triggerId]['lastEvent']);
 	}
+
+	// get acknowledges
 	if ($eventIds) {
 		$eventAcknowledges = API::Event()->get(array(
 			'output' => array('eventid'),
 			'eventids' => $eventIds,
-			'select_acknowledges' => API_OUTPUT_EXTEND,
+			'select_acknowledges' => array('eventid', 'clock', 'message', 'alias', 'name', 'surname'),
 			'preservekeys' => true
 		));
 	}
@@ -357,24 +359,25 @@ function make_system_status($filter) {
 	// triggers
 	foreach ($triggers as $trigger) {
 		// event
-		if (empty($trigger['event'])) {
+		if ($trigger['event']) {
+			$trigger['event']['acknowledges'] = isset($eventAcknowledges[$trigger['event']['eventid']])
+				? $eventAcknowledges[$trigger['event']['eventid']]['acknowledges']
+				: 0;
+		}
+		else {
 			$trigger['event'] = array(
 				'acknowledged' => false,
 				'clock' => $trigger['lastchange'],
 				'value' => $trigger['value']
 			);
 		}
-		else {
-			$trigger['event']['acknowledges'] = isset($eventAcknowledges[$trigger['event']['eventid']])
-				? $eventAcknowledges[$trigger['event']['eventid']]['acknowledges']
-				: 0;
-		}
 
 		// groups
 		foreach ($trigger['groups'] as $group) {
 			if (!isset($groups[$group['groupid']])) {
 				continue;
 			}
+
 			if (in_array($filter['extAck'], array(EXTACK_OPTION_ALL, EXTACK_OPTION_BOTH))) {
 				$groups[$group['groupid']]['tab_priority'][$trigger['priority']]['count']++;
 
@@ -395,6 +398,8 @@ function make_system_status($filter) {
 	}
 	unset($triggers);
 
+	$config = select_config();
+
 	foreach ($groups as $group) {
 		$groupRow = new CRow();
 
@@ -412,13 +417,13 @@ function make_system_status($filter) {
 			$allTriggersNum = $data['count'];
 			if ($allTriggersNum) {
 				$allTriggersNum = new CSpan($allTriggersNum, 'pointer');
-				$allTriggersNum->setHint(makeTriggersPopup($data['triggers'], $ackParams, $actions));
+				$allTriggersNum->setHint(makeTriggersPopup($data['triggers'], $ackParams, $actions, $config));
 			}
 
 			$unackTriggersNum = $data['count_unack'];
 			if ($unackTriggersNum) {
 				$unackTriggersNum = new CSpan($unackTriggersNum, 'pointer red bold');
-				$unackTriggersNum->setHint(makeTriggersPopup($data['triggers_unack'], $ackParams, $actions));
+				$unackTriggersNum->setHint(makeTriggersPopup($data['triggers_unack'], $ackParams, $actions, $config));
 			}
 
 			switch ($filter['extAck']) {
@@ -448,8 +453,8 @@ function make_system_status($filter) {
 		$table->addRow($groupRow);
 	}
 
-	$script = new CJSScript(get_js(
-		'jQuery("#'.WIDGET_SYSTEM_STATUS.'_footer").html("'._s('Updated: %s', zbx_date2str(_('H:i:s'))).'");'
+	$script = new CJsScript(get_js(
+		'jQuery("#'.WIDGET_SYSTEM_STATUS.'_footer").html("'._s('Updated: %s', zbx_date2str(TIME_FORMAT_SECONDS)).'");'
 	));
 
 	return new CDiv(array($table, $script));
@@ -467,6 +472,7 @@ function make_hoststat_summary($filter) {
 	// get host groups
 	$groups = API::HostGroup()->get(array(
 		'groupids' => $filter['groupids'],
+		'hostids' => isset($filter['hostids']) ? $filter['hostids'] : null,
 		'monitored_hosts' => 1,
 		'output' => array('groupid', 'name')
 	));
@@ -479,7 +485,7 @@ function make_hoststat_summary($filter) {
 	// get hosts
 	$hosts = API::Host()->get(array(
 		'groupids' => zbx_objectValues($groups, 'groupid'),
-		'hostids' => !empty($filter['hostids']) ? $filter['hostids'] : null,
+		'hostids' => isset($filter['hostids']) ? $filter['hostids'] : null,
 		'monitored_hosts' => true,
 		'filter' => array('maintenance_status' => $filter['maintenance']),
 		'output' => array('hostid', 'name'),
@@ -783,8 +789,8 @@ function make_hoststat_summary($filter) {
 		$table->addRow($group_row);
 	}
 
-	$script = new CJSScript(get_js(
-		'jQuery("#'.WIDGET_HOST_STATUS.'_footer").html("'._s('Updated: %s', zbx_date2str(_('H:i:s'))).'");'
+	$script = new CJsScript(get_js(
+		'jQuery("#'.WIDGET_HOST_STATUS.'_footer").html("'._s('Updated: %s', zbx_date2str(TIME_FORMAT_SECONDS)).'");'
 	));
 
 	return new CDiv(array($table, $script));
@@ -841,11 +847,11 @@ function make_status_of_zbx() {
 
 	// check requirements
 	if (CWebUser::$data['type'] == USER_TYPE_SUPER_ADMIN) {
-		$frontendSetup = new FrontendSetup();
+		$frontendSetup = new CFrontendSetup();
 		$reqs = $frontendSetup->checkRequirements();
 		foreach ($reqs as $req) {
-			if ($req['result'] != FrontendSetup::CHECK_OK) {
-				$class = ($req['result'] == FrontendSetup::CHECK_WARNING) ? 'notice' : 'fail';
+			if ($req['result'] != CFrontendSetup::CHECK_OK) {
+				$class = ($req['result'] == CFrontendSetup::CHECK_WARNING) ? 'notice' : 'fail';
 				$table->addRow(array(
 					new CSpan($req['name'], $class),
 					new CSpan($req['current'], $class),
@@ -855,8 +861,8 @@ function make_status_of_zbx() {
 		}
 	}
 
-	$script = new CJSScript(get_js(
-		'jQuery("#'.WIDGET_ZABBIX_STATUS.'_footer").html("'._s('Updated: %s', zbx_date2str(_('H:i:s'))).'");'
+	$script = new CJsScript(get_js(
+		'jQuery("#'.WIDGET_ZABBIX_STATUS.'_footer").html("'._s('Updated: %s', zbx_date2str(TIME_FORMAT_SECONDS)).'");'
 	));
 
 	return new CDiv(array($table, $script));
@@ -1044,7 +1050,7 @@ function make_latest_issues(array $filter = array()) {
 		$unknown = SPACE;
 		if ($trigger['state'] == TRIGGER_STATE_UNKNOWN) {
 			$unknown = new CDiv(SPACE, 'status_icon iconunknown');
-			$unknown->setHint($trigger['error'], '', 'on');
+			$unknown->setHint($trigger['error'], 'on');
 		}
 
 		// trigger has events
@@ -1082,13 +1088,12 @@ function make_latest_issues(array $filter = array()) {
 		$description = new CCol($description, getSeverityStyle($trigger['priority']));
 		if ($trigger['lastEvent']) {
 			$description->setHint(
-				make_popup_eventlist($trigger['triggerid'], $trigger['lastEvent']['eventid']),
-				'', '', false
+				make_popup_eventlist($trigger['triggerid'], $trigger['lastEvent']['eventid']), '', false
 			);
 		}
 
 		// clock
-		$clock = new CLink(zbx_date2str(_('d M Y H:i:s'), $trigger['lastchange']),
+		$clock = new CLink(zbx_date2str(DATE_TIME_FORMAT_SECONDS, $trigger['lastchange']),
 			'events.php?filter_set=1&triggerid='.$trigger['triggerid'].'&source='.EVENT_SOURCE_TRIGGERS.
 				'&show_unknown=1&hostid='.$trigger['hostid'].'&stime='.date(TIMESTAMP_FORMAT, $trigger['lastchange']).
 				'&period='.ZBX_PERIOD_DEFAULT
@@ -1113,8 +1118,8 @@ function make_latest_issues(array $filter = array()) {
 	// initialize blinking
 	zbx_add_post_js('jqBlink.blink();');
 
-	$script = new CJSScript(get_js(
-		'jQuery("#'.WIDGET_LAST_ISSUES.'_footer").html("'._s('Updated: %s', zbx_date2str(_('H:i:s'))).'");'
+	$script = new CJsScript(get_js(
+		'jQuery("#'.WIDGET_LAST_ISSUES.'_footer").html("'._s('Updated: %s', zbx_date2str(TIME_FORMAT_SECONDS)).'");'
 	));
 
 	$infoDiv = new CDiv(_n('%1$d of %2$d issue is shown', '%1$d of %2$d issues are shown', count($triggers), $triggersTotalCount));
@@ -1203,7 +1208,7 @@ function make_webmon_overview($filter) {
 	foreach ($groups as $group) {
 		if (!empty($data[$group['groupid']])) {
 			$table->addRow(array(
-				$group['name'],
+				new CLink($group['name'], 'httpmon.php?groupid='.$group['groupid'].'&hostid=0'),
 				new CSpan(empty($data[$group['groupid']]['ok']) ? 0 : $data[$group['groupid']]['ok'], 'off'),
 				new CSpan(
 					empty($data[$group['groupid']]['failed']) ? 0 : $data[$group['groupid']]['failed'],
@@ -1214,8 +1219,8 @@ function make_webmon_overview($filter) {
 		}
 	}
 
-	$script = new CJSScript(get_js(
-		'jQuery("#'.WIDGET_WEB_OVERVIEW.'_footer").html("'._s('Updated: %s', zbx_date2str(_('H:i:s'))).'");'
+	$script = new CJsScript(get_js(
+		'jQuery("#'.WIDGET_WEB_OVERVIEW.'_footer").html("'._s('Updated: %s', zbx_date2str(TIME_FORMAT_SECONDS)).'");'
 	));
 
 	return new CDiv(array($table, $script));
@@ -1264,8 +1269,8 @@ function make_discovery_status() {
 		));
 	}
 
-	$script = new CJSScript(get_js(
-		'jQuery("#'.WIDGET_DISCOVERY_STATUS.'_footer").html("'._s('Updated: %s', zbx_date2str(_('H:i:s'))).'");'
+	$script = new CJsScript(get_js('jQuery("#'.WIDGET_DISCOVERY_STATUS.'_footer").html("'.
+		_s('Updated: %s', zbx_date2str(TIME_FORMAT_SECONDS)).'");'
 	));
 
 	return new CDiv(array($table, $script));
@@ -1279,12 +1284,11 @@ function make_discovery_status() {
  * @param array $triggers
  * @param array $ackParams
  * @param array $actions
+ * @param array $config
  *
  * @return CTableInfo
  */
-function makeTriggersPopup(array $triggers, array $ackParams, array $actions) {
-	$config = select_config();
-
+function makeTriggersPopup(array $triggers, array $ackParams, array $actions, array $config) {
 	$popupTable = new CTableInfo();
 	$popupTable->setAttribute('style', 'width: 400px;');
 	$popupTable->setHeader(array(
@@ -1303,7 +1307,7 @@ function makeTriggersPopup(array $triggers, array $ackParams, array $actions) {
 		$unknown = SPACE;
 		if ($trigger['state'] == TRIGGER_STATE_UNKNOWN) {
 			$unknown = new CDiv(SPACE, 'status_icon iconunknown');
-			$unknown->setHint($trigger['error'], '', 'on');
+			$unknown->setHint($trigger['error'], 'on');
 		}
 
 		// ack
diff --git a/frontends/php/include/classes/api/CApiService.php b/frontends/php/include/classes/api/CApiService.php
index f94200986ec..be990958882 100644
--- a/frontends/php/include/classes/api/CApiService.php
+++ b/frontends/php/include/classes/api/CApiService.php
@@ -545,13 +545,6 @@ class CApiService {
 				}
 
 				$sqlParts = $this->applyQuerySortField($sortfield, $sortorder, $tableAlias, $sqlParts);
-
-				// add sort field to select if distinct is used
-				if (count($sqlParts['from']) > 1) {
-					if (!str_in_array($tableAlias.'.'.$sortfield, $sqlParts['select']) && !str_in_array($tableAlias.'.*', $sqlParts['select'])) {
-						$sqlParts['select'][$sortfield] = $tableAlias.'.'.$sortfield;
-					}
-				}
 			}
 		}
 
@@ -569,6 +562,14 @@ class CApiService {
 	 * @return array
 	 */
 	protected function applyQuerySortField($sortfield, $sortorder, $alias, array $sqlParts) {
+		// add sort field to select if distinct is used
+		if (count($sqlParts['from']) > 1
+				&& !str_in_array($alias.'.'.$sortfield, $sqlParts['select'])
+				&& !str_in_array($alias.'.*', $sqlParts['select'])) {
+
+			$sqlParts['select'][$sortfield] = $alias.'.'.$sortfield;
+		}
+
 		$sqlParts['order'][$alias.'.'.$sortfield] = $alias.'.'.$sortfield.$sortorder;
 
 		return $sqlParts;
@@ -732,7 +733,7 @@ class CApiService {
 	protected function checkObjectIds(array $objects, $idField, $messageRequired, $messageEmpty, $messageInvalid) {
 		$idValidator = new CIdValidator(array(
 			'messageEmpty' => $messageEmpty,
-			'messageRegex' => $messageInvalid
+			'messageInvalid' => $messageInvalid
 		));
 		foreach ($objects as $object) {
 			if (!isset($object[$idField])) {
@@ -926,7 +927,7 @@ class CApiService {
 	 *
 	 * @param array $array
 	 * @param CPartialValidatorInterface $validator
-	 * @parma array $fullArray
+	 * @param array $fullArray
 	 */
 	protected function checkPartialValidator(array $array, CPartialValidatorInterface $validator, $fullArray = array()) {
 		if (!$validator->validatePartial($array, $fullArray)) {
diff --git a/frontends/php/include/classes/api/clients/CLocalApiClient.php b/frontends/php/include/classes/api/clients/CLocalApiClient.php
index ee82263ee20..497390792a7 100644
--- a/frontends/php/include/classes/api/clients/CLocalApiClient.php
+++ b/frontends/php/include/classes/api/clients/CLocalApiClient.php
@@ -47,17 +47,48 @@ class CLocalApiClient extends CApiClient {
 		$this->serviceFactory = $factory;
 	}
 
-	public function callMethod($api, $method, array $params, $auth) {
+	public function callMethod($requestApi, $requestMethod, array $params, $auth) {
 		global $DB;
 
+		$api = strtolower($requestApi);
+		$method = strtolower($requestMethod);
+
 		$response = new CApiClientResponse();
+
+		// check API
+		if (!$this->isValidApi($api)) {
+			$response->errorCode = ZBX_API_ERROR_PARAMETERS;
+			$response->errorMessage = _s('Incorrect API "%1$s".', $requestApi);
+
+			return $response;
+		}
+
+		// check method
+		if (!$this->isValidMethod($api, $method)) {
+			$response->errorCode = ZBX_API_ERROR_PARAMETERS;
+			$response->errorMessage = _s('Incorrect method "%1$s.%2$s".', $requestApi, $requestMethod);
+
+			return $response;
+		}
+
+		$requiresAuthentication = $this->requiresAuthentication($api, $method);
+
+		// check that no authentication token is passed to methods that don't require it
+		if (!$requiresAuthentication && $auth !== null) {
+			$response->errorCode = ZBX_API_ERROR_PARAMETERS;
+			$response->errorMessage = _s('The "%1$s.%2$s" method must be called without the "auth" parameter.',
+				$requestApi, $requestMethod
+			);
+
+			return $response;
+		}
+
 		$newTransaction = false;
 		try {
-			// check method
-			$this->checkMethod($api, $method);
-
 			// authenticate
-			$this->authenticate($api, $method, $auth);
+			if ($requiresAuthentication) {
+				$this->authenticate($auth);
+			}
 
 			// the nopermission parameter must not be available for external API calls.
 			unset($params['nopermissions']);
@@ -104,53 +135,51 @@ class CLocalApiClient extends CApiClient {
 	}
 
 	/**
-	 * Checks the authentication token if the given method requires authentication.
+	 * Checks if the authentication token is valid.
 	 *
-	 * @param string $api
-	 * @param string $method
 	 * @param string $auth
 	 *
 	 * @throws APIException
 	 */
-	protected function authenticate($api, $method, $auth) {
-		// authenticate
-		if ($this->requiresAuthentication($api, $method)) {
-			if (zbx_empty($auth)) {
-				throw new APIException(ZBX_API_ERROR_NO_AUTH, _('Not authorised.'));
-			}
-
-			$user = $this->serviceFactory->getObject('user')->checkAuthentication(array($auth));
-			$this->debug = $user['debug_mode'];
-		}
-		elseif ($auth !== null) {
-			throw new APIException(ZBX_API_ERROR_PARAMETERS,
-				_s('The "%1$s.%2$s" method must be called without the "auth" parameter.', $api, $method)
-			);
+	protected function authenticate($auth) {
+		if (zbx_empty($auth)) {
+			throw new APIException(ZBX_API_ERROR_NO_AUTH, _('Not authorised.'));
 		}
+
+		$user = $this->serviceFactory->getObject('user')->checkAuthentication(array($auth));
+		$this->debug = $user['debug_mode'];
 	}
 
 	/**
-	 * Checks if the given API and method are valid.
+	 * Returns true if the given API is valid.
 	 *
-	 * @param $api
-	 * @param $method
+	 * @param string $api
 	 *
-	 * @throws APIException
+	 * @return bool
 	 */
-	protected function checkMethod($api, $method) {
-		// validate the API
-		if (!$this->serviceFactory->hasObject($api)) {
-			throw new APIException(ZBX_API_ERROR_PARAMETERS, _s('Incorrect API "%1$s".', $api));
-		}
+	protected function isValidApi($api) {
+		return $this->serviceFactory->hasObject($api);
+	}
 
+	/**
+	 * Returns true if the given method is valid.
+	 *
+	 * @param string $api
+	 * @param string $method
+	 *
+	 * @return bool
+	 */
+	protected function isValidMethod($api, $method) {
 		$apiService = $this->serviceFactory->getObject($api);
 
 		// validate the method
-		if (!in_array($method, get_class_methods($apiService))) {
-			throw new APIException(ZBX_API_ERROR_PARAMETERS,
-				_s('Incorrect method "%1$s.%2$s".', $api, $method)
-			);
+		$availableMethods = array();
+		foreach (get_class_methods($apiService) as $serviceMethod) {
+			// the comparison must be case insensitive
+			$availableMethods[strtolower($serviceMethod)] = true;
 		}
+
+		return isset($availableMethods[$method]);
 	}
 
 	/**
@@ -163,7 +192,7 @@ class CLocalApiClient extends CApiClient {
 	 */
 	protected function requiresAuthentication($api, $method) {
 		return !(($api === 'user' && $method === 'login')
-			|| ($api === 'user' && $method === 'checkAuthentication')
+			|| ($api === 'user' && $method === 'checkauthentication')
 			|| ($api === 'apiinfo' && $method === 'version'));
 	}
 }
diff --git a/frontends/php/api/classes/managers/CApplicationManager.php b/frontends/php/include/classes/api/managers/CApplicationManager.php
index 33c4e864fa6..d8ba8cee100 100644
--- a/frontends/php/api/classes/managers/CApplicationManager.php
+++ b/frontends/php/include/classes/api/managers/CApplicationManager.php
@@ -103,12 +103,12 @@ class CApplicationManager {
 
 		// replace existing application templates
 		if ($applicationTemplates) {
-			$dbAplicationTemplates = DBfetchArray(DBselect(
+			$dbApplicationTemplates = DBfetchArray(DBselect(
 				'SELECT * '.
 				' FROM application_template at'.
 				' WHERE '.dbConditionInt('at.applicationid', zbx_objectValues($applications, 'applicationid'))
 			));
-			DB::replace('application_template', $dbAplicationTemplates, $applicationTemplates);
+			DB::replace('application_template', $dbApplicationTemplates, $applicationTemplates);
 		}
 
 		// TODO: REMOVE info
@@ -340,7 +340,7 @@ class CApplicationManager {
 			'where' => array('applicationid' => $applicationIds)
 		));
 
-		// remove Monitoring > Latest data toggle profile values related to given aplications
+		// remove Monitoring > Latest data toggle profile values related to given applications
 		CProfile::delete('web.latest.toggle', $applicationIds);
 
 		DB::delete('applications', array('applicationid' => $applicationIds));
@@ -392,7 +392,7 @@ class CApplicationManager {
 	 * @return array
 	 */
 	protected function getChildHostsFromApplications(array $applications, array $hostIds = array()) {
-		$hostsTemapltesMap = array();
+		$hostsTemplatesMap = array();
 
 		$sqlWhere = empty($hostIds) ? '' : ' AND '.dbConditionInt('ht.hostid', $hostIds);
 		$dbCursor = DBselect(
@@ -402,10 +402,10 @@ class CApplicationManager {
 				$sqlWhere
 		);
 		while ($dbHost = DBfetch($dbCursor)) {
-			$hostsTemapltesMap[$dbHost['hostid']] = $dbHost['templateid'];
+			$hostsTemplatesMap[$dbHost['hostid']] = $dbHost['templateid'];
 		}
 
-		return $hostsTemapltesMap;
+		return $hostsTemplatesMap;
 	}
 
 	/**
@@ -471,7 +471,7 @@ class CApplicationManager {
 	}
 
 	/**
-	 * Get hosts applications for each passed hosts.
+	 * Get host applications for each passed host.
 	 * Each host has two hashes with applications, one with name keys other with templateid keys.
 	 *
 	 * Resulting structure is:
diff --git a/frontends/php/api/classes/managers/CHistoryManager.php b/frontends/php/include/classes/api/managers/CHistoryManager.php
index b5f35f369d5..39bf13eb58d 100644
--- a/frontends/php/api/classes/managers/CHistoryManager.php
+++ b/frontends/php/include/classes/api/managers/CHistoryManager.php
@@ -27,24 +27,26 @@ class CHistoryManager {
 	/**
 	 * Returns the last $limit history objects for the given items.
 	 *
-	 * @param array $items  an array of items with the 'itemid' and 'value_type' properties
-	 * @param int $limit
+	 * @param array $items      an array of items with the 'itemid' and 'value_type' properties
+	 * @param int   $limit
+	 * @param int   $period     the maximum period to retrieve data for
 	 *
 	 * @return array    an array with items IDs as keys and arrays of history objects as values
 	 */
-	public function getLast(array $items, $limit = 1) {
+	public function getLast(array $items, $limit = 1, $period = null) {
 		$rs = array();
 		foreach ($items as $item) {
-			$table = self::getTableName($item['value_type']);
-			$query = DBselect(
+			$values = DBfetchArray(DBselect(
 				'SELECT *'.
-				' FROM '.$table.' h'.
+				' FROM '.self::getTableName($item['value_type']).' h'.
 				' WHERE h.itemid='.zbx_dbstr($item['itemid']).
+					($period ? ' AND h.clock>'.(time() - $period) : '').
 				' ORDER BY h.clock DESC',
 				$limit
-			);
-			while ($history = DBfetch($query)) {
-				$rs[$history['itemid']][] = $history;
+			));
+
+			if ($values) {
+				$rs[$item['itemid']] = $values;
 			}
 		}
 
diff --git a/frontends/php/api/classes/managers/CHttpTestManager.php b/frontends/php/include/classes/api/managers/CHttpTestManager.php
index de1cdef0424..2a0b949cd72 100644
--- a/frontends/php/api/classes/managers/CHttpTestManager.php
+++ b/frontends/php/include/classes/api/managers/CHttpTestManager.php
@@ -279,7 +279,8 @@ class CHttpTestManager {
 		$httpTests = array();
 		$dbCursor = DBselect(
 			'SELECT ht.httptestid,ht.name,ht.applicationid,ht.delay,ht.status,ht.variables,ht.agent,'.
-				'ht.authentication,ht.http_user,ht.http_password,ht.hostid,ht.templateid'.
+				'ht.authentication,ht.http_user,ht.http_password,ht.http_proxy,ht.retries,ht.hostid,ht.templateid,'.
+				'ht.headers,ht.verify_peer,ht.verify_host,ht.ssl_cert_file,ht.ssl_key_file,ht.ssl_key_password'.
 			' FROM httptest ht'.
 			' WHERE ht.hostid='.zbx_dbstr($templateId)
 		);
@@ -288,7 +289,8 @@ class CHttpTestManager {
 		}
 
 		$dbCursor = DBselect(
-			'SELECT hs.httpstepid,hs.httptestid,hs.name,hs.no,hs.url,hs.timeout,hs.posts,hs.variables,hs.required,hs.status_codes'.
+			'SELECT hs.httpstepid,hs.httptestid,hs.name,hs.no,hs.url,hs.timeout,hs.posts,hs.variables,'.
+				'hs.required,hs.status_codes,hs.headers,hs.follow_redirects,hs.retrieve_mode'.
 			' FROM httpstep hs'.
 			' WHERE '.dbConditionInt('hs.httptestid', array_keys($httpTests))
 		);
@@ -310,12 +312,12 @@ class CHttpTestManager {
 	 * @return bool
 	 */
 	public function inherit(array $httpTests, array $hostIds = array()) {
-		$hostsTemaplatesMap = $this->getChildHostsFromHttpTests($httpTests, $hostIds);
-		if (empty($hostsTemaplatesMap)) {
+		$hostsTemplatesMap = $this->getChildHostsFromHttpTests($httpTests, $hostIds);
+		if (empty($hostsTemplatesMap)) {
 			return true;
 		}
 
-		$preparedHttpTests = $this->prepareInheritedHttpTests($httpTests, $hostsTemaplatesMap);
+		$preparedHttpTests = $this->prepareInheritedHttpTests($httpTests, $hostsTemplatesMap);
 		$inheritedHttpTests = $this->save($preparedHttpTests);
 		$this->inherit($inheritedHttpTests);
 
@@ -333,7 +335,7 @@ class CHttpTestManager {
 	 * @return array
 	 */
 	protected function getChildHostsFromHttpTests(array $httpTests, array $hostIds = array()) {
-		$hostsTemaplatesMap = array();
+		$hostsTemplatesMap = array();
 
 		$sqlWhere = $hostIds ? ' AND '.dbConditionInt('ht.hostid', $hostIds) : '';
 		$dbCursor = DBselect(
@@ -343,10 +345,10 @@ class CHttpTestManager {
 				$sqlWhere
 		);
 		while ($dbHost = DBfetch($dbCursor)) {
-			$hostsTemaplatesMap[$dbHost['hostid']] = $dbHost['templateid'];
+			$hostsTemplatesMap[$dbHost['hostid']] = $dbHost['templateid'];
 		}
 
-		return $hostsTemaplatesMap;
+		return $hostsTemplatesMap;
 	}
 
 	/**
@@ -354,20 +356,20 @@ class CHttpTestManager {
 	 * Using passed parameters decide if new http tests must be created on host or existing ones must be updated.
 	 *
 	 * @param array $httpTests which we need to inherit
-	 * @param array $hostsTemaplatesMap
+	 * @param array $hostsTemplatesMap
 	 *
 	 * @throws Exception
 	 * @return array with http tests, existing apps have 'httptestid' key.
 	 */
-	protected function prepareInheritedHttpTests(array $httpTests, array $hostsTemaplatesMap) {
-		$hostHttpTests = $this->getHttpTestsMapsByHostIds(array_keys($hostsTemaplatesMap));
+	protected function prepareInheritedHttpTests(array $httpTests, array $hostsTemplatesMap) {
+		$hostHttpTests = $this->getHttpTestsMapsByHostIds(array_keys($hostsTemplatesMap));
 
 		$result = array();
 		foreach ($httpTests as $httpTest) {
 			$httpTestId = $httpTest['httptestid'];
 			foreach ($hostHttpTests as $hostId => $hostHttpTest) {
 				// if http test template is not linked to host we skip it
-				if ($hostsTemaplatesMap[$hostId] != $httpTest['hostid']) {
+				if ($hostsTemplatesMap[$hostId] != $httpTest['hostid']) {
 					continue;
 				}
 
diff --git a/frontends/php/api/classes/CAPIInfo.php b/frontends/php/include/classes/api/services/CAPIInfo.php
index 6df953a4066..6df953a4066 100644
--- a/frontends/php/api/classes/CAPIInfo.php
+++ b/frontends/php/include/classes/api/services/CAPIInfo.php
diff --git a/frontends/php/api/classes/CAction.php b/frontends/php/include/classes/api/services/CAction.php
index 543823e3fe4..aa26e6f5cf9 100644
--- a/frontends/php/api/classes/CAction.php
+++ b/frontends/php/include/classes/api/services/CAction.php
@@ -52,7 +52,7 @@ class CAction extends CApiService {
 	public function get($options = array()) {
 		$result = array();
 		$userType = self::$userData['type'];
-		$userid = self::$userData['userid'];
+		$userId = self::$userData['userid'];
 
 		$sqlParts = array(
 			'select'	=> array('actions' => 'a.actionid'),
@@ -82,7 +82,7 @@ class CAction extends CApiService {
 			'searchWildcardsEnabled'	=> null,
 			// output
 			'output'					=> API_OUTPUT_EXTEND,
-			'selectConditions'			=> null,
+			'selectFilter'				=> null,
 			'selectOperations'			=> null,
 			'countOutput'				=> null,
 			'preservekeys'				=> null,
@@ -97,7 +97,7 @@ class CAction extends CApiService {
 			// conditions are checked here by sql, operations after, by api queries
 			$permission = $options['editable'] ? PERM_READ_WRITE : PERM_READ;
 
-			$userGroups = getUserGroupsByUserId($userid);
+			$userGroups = getUserGroupsByUserId($userId);
 
 			// condition hostgroup
 			$sqlParts['where'][] = 'NOT EXISTS ('.
@@ -111,7 +111,7 @@ class CAction extends CApiService {
 					' GROUP BY cc.value'.
 					' HAVING MIN(r.permission) IS NULL'.
 						' OR MIN(r.permission)='.PERM_DENY.
-						' OR MAX(r.permission)<'.$permission.
+						' OR MAX(r.permission)<'.zbx_dbstr($permission).
 					')';
 
 			// condition host or template
@@ -127,7 +127,7 @@ class CAction extends CApiService {
 					' GROUP BY cc.value'.
 					' HAVING MIN(r.permission) IS NULL'.
 						' OR MIN(r.permission)='.PERM_DENY.
-						' OR MAX(r.permission)<'.$permission.
+						' OR MAX(r.permission)<'.zbx_dbstr($permission).
 					')';
 
 			// condition trigger
@@ -145,7 +145,7 @@ class CAction extends CApiService {
 					' GROUP BY cc.value'.
 					' HAVING MIN(r.permission) IS NULL'.
 						' OR MIN(r.permission)='.PERM_DENY.
-						' OR MAX(r.permission)<'.$permission.
+						' OR MAX(r.permission)<'.zbx_dbstr($permission).
 					')';
 		}
 
@@ -248,7 +248,7 @@ class CAction extends CApiService {
 			$sqlParts['limit'] = $options['limit'];
 		}
 
-		$actionids = array();
+		$actionIds = array();
 
 		$sqlParts = $this->applyQueryOutputOptions($this->tableName(), $this->tableAlias(), $options, $sqlParts);
 		$sqlParts = $this->applyQuerySortOptions($this->tableName(), $this->tableAlias(), $options, $sqlParts);
@@ -258,7 +258,7 @@ class CAction extends CApiService {
 				$result = $action['rowscount'];
 			}
 			else {
-				$actionids[$action['actionid']] = $action['actionid'];
+				$actionIds[$action['actionid']] = $action['actionid'];
 
 				$result[$action['actionid']] = $action;
 			}
@@ -266,105 +266,108 @@ class CAction extends CApiService {
 
 		if ($userType != USER_TYPE_SUPER_ADMIN && !$options['nopermissions']) {
 			// check hosts, templates
-			$hosts = $hostids = array();
+			$hosts = array();
+			$hostIds = array();
 			$sql = 'SELECT o.actionid,och.hostid'.
 					' FROM operations o,opcommand_hst och'.
 					' WHERE o.operationid=och.operationid'.
 						' AND och.hostid<>0'.
-						' AND '.dbConditionInt('o.actionid', $actionids);
+						' AND '.dbConditionInt('o.actionid', $actionIds);
 			$dbHosts = DBselect($sql);
 			while ($host = DBfetch($dbHosts)) {
 				if (!isset($hosts[$host['hostid']])) {
 					$hosts[$host['hostid']] = array();
 				}
 				$hosts[$host['hostid']][$host['actionid']] = $host['actionid'];
-				$hostids[$host['hostid']] = $host['hostid'];
+				$hostIds[$host['hostid']] = $host['hostid'];
 			}
 
 			$dbTemplates = DBselect(
 				'SELECT o.actionid,ot.templateid'.
 				' FROM operations o,optemplate ot'.
 				' WHERE o.operationid=ot.operationid'.
-					' AND '.dbConditionInt('o.actionid', $actionids)
+					' AND '.dbConditionInt('o.actionid', $actionIds)
 			);
 			while ($template = DBfetch($dbTemplates)) {
 				if (!isset($hosts[$template['templateid']])) {
 					$hosts[$template['templateid']] = array();
 				}
 				$hosts[$template['templateid']][$template['actionid']] = $template['actionid'];
-				$hostids[$template['templateid']] = $template['templateid'];
+				$hostIds[$template['templateid']] = $template['templateid'];
 			}
 
 			$allowedHosts = API::Host()->get(array(
-				'hostids' => $hostids,
+				'hostids' => $hostIds,
 				'output' => array('hostid'),
 				'editable' => $options['editable'],
 				'templated_hosts' => true,
 				'preservekeys' => true
 			));
-			foreach ($hostids as $hostid) {
-				if (isset($allowedHosts[$hostid])) {
+			foreach ($hostIds as $hostId) {
+				if (isset($allowedHosts[$hostId])) {
 					continue;
 				}
-				foreach ($hosts[$hostid] as $actionid) {
-					unset($result[$actionid], $actionids[$actionid]);
+				foreach ($hosts[$hostId] as $actionId) {
+					unset($result[$actionId], $actionIds[$actionId]);
 				}
 			}
 			unset($allowedHosts);
 
 			// check hostgroups
-			$groups = $groupids = array();
+			$groups = array();
+			$groupIds = array();
 			$dbGroups = DBselect(
 				'SELECT o.actionid,ocg.groupid'.
 				' FROM operations o,opcommand_grp ocg'.
 				' WHERE o.operationid=ocg.operationid'.
-					' AND '.dbConditionInt('o.actionid', $actionids)
+					' AND '.dbConditionInt('o.actionid', $actionIds)
 			);
 			while ($group = DBfetch($dbGroups)) {
 				if (!isset($groups[$group['groupid']])) {
 					$groups[$group['groupid']] = array();
 				}
 				$groups[$group['groupid']][$group['actionid']] = $group['actionid'];
-				$groupids[$group['groupid']] = $group['groupid'];
+				$groupIds[$group['groupid']] = $group['groupid'];
 			}
 
 			$dbGroups = DBselect(
 				'SELECT o.actionid,og.groupid'.
 				' FROM operations o,opgroup og'.
 				' WHERE o.operationid=og.operationid'.
-					' AND '.dbConditionInt('o.actionid', $actionids)
+					' AND '.dbConditionInt('o.actionid', $actionIds)
 			);
 			while ($group = DBfetch($dbGroups)) {
 				if (!isset($groups[$group['groupid']])) {
 					$groups[$group['groupid']] = array();
 				}
 				$groups[$group['groupid']][$group['actionid']] = $group['actionid'];
-				$groupids[$group['groupid']] = $group['groupid'];
+				$groupIds[$group['groupid']] = $group['groupid'];
 			}
 
 			$allowedGroups = API::HostGroup()->get(array(
-				'groupids' => $groupids,
+				'groupids' => $groupIds,
 				'output' => array('groupid'),
 				'editable' => $options['editable'],
 				'preservekeys' => true
 			));
-			foreach ($groupids as $groupid) {
-				if (isset($allowedGroups[$groupid])) {
+			foreach ($groupIds as $groupId) {
+				if (isset($allowedGroups[$groupId])) {
 					continue;
 				}
-				foreach ($groups[$groupid] as $actionid) {
-					unset($result[$actionid], $actionids[$actionid]);
+				foreach ($groups[$groupId] as $actionId) {
+					unset($result[$actionId], $actionIds[$actionId]);
 				}
 			}
 			unset($allowedGroups);
 
 			// check scripts
-			$scripts = $scriptids = array();
+			$scripts = array();
+			$scriptIds = array();
 			$dbScripts = DBselect(
 				'SELECT o.actionid,oc.scriptid'.
 				' FROM operations o,opcommand oc'.
 				' WHERE o.operationid=oc.operationid'.
-					' AND '.dbConditionInt('o.actionid', $actionids).
+					' AND '.dbConditionInt('o.actionid', $actionIds).
 					' AND oc.type='.ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT
 			);
 			while ($script = DBfetch($dbScripts)) {
@@ -372,82 +375,84 @@ class CAction extends CApiService {
 					$scripts[$script['scriptid']] = array();
 				}
 				$scripts[$script['scriptid']][$script['actionid']] = $script['actionid'];
-				$scriptids[$script['scriptid']] = $script['scriptid'];
+				$scriptIds[$script['scriptid']] = $script['scriptid'];
 			}
 
 			$allowedScripts = API::Script()->get(array(
-				'scriptids' => $scriptids,
+				'scriptids' => $scriptIds,
 				'output' => array('scriptid'),
 				'preservekeys' => true
 			));
-			foreach ($scriptids as $scriptid) {
-				if (isset($allowedScripts[$scriptid])) {
+			foreach ($scriptIds as $scriptId) {
+				if (isset($allowedScripts[$scriptId])) {
 					continue;
 				}
-				foreach ($scripts[$scriptid] as $actionid) {
-					unset($result[$actionid], $actionids[$actionid]);
+				foreach ($scripts[$scriptId] as $actionId) {
+					unset($result[$actionId], $actionIds[$actionId]);
 				}
 			}
 			unset($allowedScripts);
 
 			// check users
-			$users = $userids = array();
+			$users = array();
+			$userIds = array();
 			$dbUsers = DBselect(
 				'SELECT o.actionid,omu.userid'.
 				' FROM operations o,opmessage_usr omu'.
 				' WHERE o.operationid=omu.operationid'.
-					' AND '.dbConditionInt('o.actionid', $actionids)
+					' AND '.dbConditionInt('o.actionid', $actionIds)
 			);
 			while ($user = DBfetch($dbUsers)) {
 				if (!isset($users[$user['userid']])) {
 					$users[$user['userid']] = array();
 				}
 				$users[$user['userid']][$user['actionid']] = $user['actionid'];
-				$userids[$user['userid']] = $user['userid'];
+				$userIds[$user['userid']] = $user['userid'];
 			}
 
 			$allowedUsers = API::User()->get(array(
-				'userids' => $userids,
+				'userids' => $userIds,
 				'output' => array('userid'),
 				'preservekeys' => true
 			));
-			foreach ($userids as $userid) {
-				if (isset($allowedUsers[$userid])) {
+			foreach ($userIds as $userId) {
+				if (isset($allowedUsers[$userId])) {
 					continue;
 				}
-				foreach ($users[$userid] as $actionid) {
-					unset($result[$actionid], $actionids[$actionid]);
+				foreach ($users[$userId] as $actionId) {
+					unset($result[$actionId], $actionIds[$actionId]);
 				}
 			}
 
 			// check usergroups
-			$usrgrps = $usrgrpids = array();
-			$dbUsergroups = DBselect(
+			$userGroups = array();
+			$userGroupIds = array();
+			$dbUserGroups = DBselect(
 				'SELECT o.actionid,omg.usrgrpid'.
 				' FROM operations o,opmessage_grp omg'.
 				' WHERE o.operationid=omg.operationid'.
-					' AND '.dbConditionInt('o.actionid', $actionids)
+					' AND '.dbConditionInt('o.actionid', $actionIds)
 			);
-			while ($usrgrp = DBfetch($dbUsergroups)) {
-				if (!isset($usrgrps[$usrgrp['usrgrpid']])) {
-					$usrgrps[$usrgrp['usrgrpid']] = array();
+			while ($userGroup = DBfetch($dbUserGroups)) {
+				if (!isset($userGroups[$userGroup['usrgrpid']])) {
+					$userGroups[$userGroup['usrgrpid']] = array();
 				}
-				$usrgrps[$usrgrp['usrgrpid']][$usrgrp['actionid']] = $usrgrp['actionid'];
-				$usrgrpids[$usrgrp['usrgrpid']] = $usrgrp['usrgrpid'];
+				$userGroups[$userGroup['usrgrpid']][$userGroup['actionid']] = $userGroup['actionid'];
+				$userGroupIds[$userGroup['usrgrpid']] = $userGroup['usrgrpid'];
 			}
 
-			$allowedUsergrps = API::UserGroup()->get(array(
-				'usrgrpids' => $usrgrpids,
+			$allowedUserGroups = API::UserGroup()->get(array(
+				'usrgrpids' => $userGroupIds,
 				'output' => array('usrgrpid'),
 				'preservekeys' => true
 			));
 
-			foreach ($usrgrpids as $usrgrpid) {
-				if (isset($allowedUsergrps[$usrgrpid])) {
+			foreach ($userGroupIds as $userGroupId) {
+				if (isset($allowedUserGroups[$userGroupId])) {
 					continue;
 				}
-				foreach ($usrgrps[$usrgrpid] as $actionid) {
-					unset($result[$actionid], $actionids[$actionid]);
+				foreach ($userGroups[$userGroupId] as $actionId) {
+					unset($result[$actionId], $actionIds[$actionId]);
 				}
 			}
 		}
@@ -458,6 +463,30 @@ class CAction extends CApiService {
 
 		if ($result) {
 			$result = $this->addRelatedObjects($options, $result);
+
+			foreach ($result as &$action) {
+				// unset the fields that are returned in the filter
+				unset($action['formula'], $action['evaltype']);
+
+				if ($options['selectFilter'] !== null) {
+					$filter = $this->unsetExtraFields(
+						array($action['filter']),
+						array('conditions', 'formula', 'evaltype'),
+						$options['selectFilter']
+					);
+					$filter = reset($filter);
+
+					if (isset($filter['conditions'])) {
+						foreach ($filter['conditions'] as &$condition) {
+							unset($condition['actionid'], $condition['conditionid']);
+						}
+						unset($condition);
+					}
+
+					$action['filter'] = $filter;
+				}
+			}
+			unset($action);
 		}
 
 		// removing keys (hash -> array)
@@ -468,11 +497,21 @@ class CAction extends CApiService {
 		return $result;
 	}
 
+	/**
+	 * Check if action exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('action.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('actionid', 'name')), $object),
 			'output' => array('actionid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
@@ -482,7 +521,7 @@ class CAction extends CApiService {
 	/**
 	 * Add actions
 	 *
-	 * @param _array $actions multidimensional array with actions data
+	 * @param array $actions multidimensional array with actions data
 	 * @param array $actions[0,...]['expression']
 	 * @param array $actions[0,...]['description']
 	 * @param array $actions[0,...]['type'] OPTIONAL
@@ -490,95 +529,72 @@ class CAction extends CApiService {
 	 * @param array $actions[0,...]['status'] OPTIONAL
 	 * @param array $actions[0,...]['comments'] OPTIONAL
 	 * @param array $actions[0,...]['url'] OPTIONAL
+	 * @param array $actions[0,...]['filter'] OPTIONAL
 	 * @return boolean
 	 */
 	public function create($actions) {
 		$actions = zbx_toArray($actions);
 
-		// check fields
-		$actionDbFields = array(
-			'name' => null,
-			'eventsource' => null,
-			'evaltype' => null
-		);
-		$duplicates = array();
-		foreach ($actions as $action) {
-			if (!check_db_fields($actionDbFields, $action)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Incorrect parameter for action "%1$s".', $action['name']));
-			}
-			if (isset($action['esc_period']) && $action['esc_period'] < SEC_PER_MIN && $action['eventsource'] == EVENT_SOURCE_TRIGGERS) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" has incorrect value for "esc_period" (minimum %2$s seconds).', $action['name'], SEC_PER_MIN));
-			}
-			if (isset($duplicates[$action['name']])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" already exists.', $action['name']));
-			}
-			else {
-				$duplicates[$action['name']] = $action['name'];
-			}
-		}
+		$this->validateCreate($actions);
 
-		$dbActions = $this->get(array(
-			'filter' => array('name' => $duplicates),
-			'output' => API_OUTPUT_EXTEND,
-			'editable' => true,
-			'nopermissions' => true
-		));
-		foreach ($dbActions as $dbAction) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" already exists.', $dbAction['name']));
+		// Set "evaltype" if specified in "filter" section of action.
+		foreach ($actions as &$action) {
+			if (isset($action['filter'])) {
+				$action['evaltype'] = $action['filter']['evaltype'];
+			}
 		}
-
-		$actionids = DB::insert('actions', $actions);
-
-		$conditions = $operations = array();
-		foreach ($actions as $anum => $action) {
-			// conditions are optional, but when set, its fields must be validated
-			if (isset($action['conditions'])) {
-				if (!is_array($action['conditions'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Incorrect action conditions for action "%1$s".', $action['name']));
+		unset($action);
+
+		// Insert actions into db, get back array with new actionids.
+		$actions = DB::save('actions', $actions);
+		$actions = zbx_toHash($actions, 'actionid');
+
+		$conditionsToCreate = array();
+		$operationsToCreate = array();
+		// Collect conditions and operations to be created and set appropriate action ID.
+		foreach ($actions as $actionId => &$action) {
+			if (isset($action['filter'])) {
+				foreach ($action['filter']['conditions'] as $condition) {
+					$condition['actionid'] = $actionId;
+					$conditionsToCreate[] = $condition;
 				}
+			}
 
-				foreach ($action['conditions'] as $condition) {
-					if (!isset($condition['conditiontype'])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('Missing "%1$s" field for action condition.', 'conditiontype'));
-					}
+			foreach ($action['operations'] as $operation) {
+				$operation['actionid'] = $actionId;
+				$operationsToCreate[] = $operation;
+			}
+		}
+		unset($action);
 
-					$condition['operator'] = isset($condition['operator'])
-						? $condition['operator']
-						: CONDITION_OPERATOR_EQUAL;
+		$createdConditions = $this->addConditions($conditionsToCreate);
 
-					$condition['actionid'] = $actionids[$anum];
-					$conditions[] = $condition;
-				}
-			}
+		// Group back created action conditions by action ID to be used for updating action formula.
+		$conditionsForActions = array();
+		foreach ($createdConditions as $condition) {
+			$conditionsForActions[$condition['actionid']][$condition['conditionid']] = $condition;
+		}
 
-			if (!isset($action['operations']) || empty($action['operations'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Incorrect parameter for action "%1$s".', $action['name']));
-			}
-			else {
-				foreach ($action['operations'] as $operation) {
-					$operation['actionid'] = $actionids[$anum];
-					$operations[] = $operation;
+		// Update "formula" field if evaltype is custom expression.
+		foreach ($actions as $actionId => $action) {
+			if (isset($action['filter'])) {
+				$actionFilter = $action['filter'];
+				if ($actionFilter['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+					$this->updateFormula($actionId, $actionFilter['formula'], $conditionsForActions[$actionId]);
 				}
 			}
 		}
 
-		self::validateConditions($conditions);
-		$this->addConditions($conditions);
-
-		$this->validateOperations($operations);
-		$this->addOperations($operations);
+		// Add operations.
+		$this->addOperations($operationsToCreate);
 
-		return array('actionids' => $actionids);
+		return array('actionids' => array_keys($actions));
 	}
 
 	/**
 	 * Update actions
 	 *
-	 * @param _array $actions multidimensional array with actions data
+	 * @param array $actions multidimensional array with actions data
 	 * @param array $actions[0,...]['actionid']
 	 * @param array $actions[0,...]['expression']
 	 * @param array $actions[0,...]['description']
@@ -587,183 +603,143 @@ class CAction extends CApiService {
 	 * @param array $actions[0,...]['status'] OPTIONAL
 	 * @param array $actions[0,...]['comments'] OPTIONAL
 	 * @param array $actions[0,...]['url'] OPTIONAL
+	 * @param array $actions[0,...]['filter'] OPTIONAL
 	 * @return boolean
 	 */
 	public function update($actions) {
 		$actions = zbx_toArray($actions);
-		$actionids = zbx_objectValues($actions, 'actionid');
-		$update = array();
-
-		$updActions = $this->get(array(
-			'actionids' => $actionids,
-			'editable' => true,
-			'output' => API_OUTPUT_EXTEND,
-			'preservekeys' => true,
+		$actions = zbx_toHash($actions, 'actionid');
+		$actionIds = array_keys($actions);
+
+		$actionsDb = $this->get(array(
+			'actionids'        => $actionIds,
+			'editable'         => true,
+			'output'           => API_OUTPUT_EXTEND,
+			'preservekeys'     => true,
 			'selectOperations' => API_OUTPUT_EXTEND,
-			'selectConditions' => API_OUTPUT_EXTEND
+			'selectFilter'     => array('formula', 'conditions')
 		));
 
-		foreach ($actions as $action) {
-			if (isset($action['actionid']) && !isset($updActions[$action['actionid']])) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!'));
-			}
-		}
+		$this->validateUpdate($actions, $actionsDb);
 
-		// check fields
-		$duplicates = array();
-		foreach ($actions as $action) {
-			$actionName = isset($action['name']) ? $action['name'] : $updActions[$action['actionid']]['name'];
+		$operationsToCreate = array();
+		$operationsToUpdate = array();
+		$operationIdsForDelete = array();
 
-			if (!check_db_fields(array('actionid' => null), $action)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-					'Incorrect parameters for action update method "%1$s".',
-					$actionName
-				));
-			}
+		$actionsUpdateData = array();
 
-			// check if user changed esc_period for trigger eventsource
-			if (isset($action['esc_period'])
-					&& $action['esc_period'] < SEC_PER_MIN
-					&& $updActions[$action['actionid']]['eventsource'] == EVENT_SOURCE_TRIGGERS) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-					'Action "%1$s" has incorrect value for "esc_period" (minimum %2$s seconds).',
-					$actionName,
-					SEC_PER_MIN
-				));
-			}
+		$newActionConditions = null;
+		foreach ($actions as $actionId => $action) {
+			$actionDb = $actionsDb[$actionId];
 
-			$this->checkNoParameters($action, array('eventsource'), _('Cannot update "%1$s" for action "%2$s".'),
-				$actionName
+			$actionUpdateValues = $action;
+			unset(
+				$actionUpdateValues['actionid'],
+				$actionUpdateValues['filter'],
+				$actionUpdateValues['operations'],
+				$actionUpdateValues['conditions'],
+				$actionUpdateValues['formula'],
+				$actionUpdateValues['evaltype']
 			);
 
-			if (!isset($action['name'])) {
-				continue;
-			}
-
-			if (isset($duplicates[$action['name']])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" already exists.', $action['name']));
-			}
-			else {
-				$duplicates[$action['name']] = $action['name'];
-			}
-		}
-
-		$operationsCreate = $operationsUpdate = $operationidsDelete = array();
-		$conditionsCreate = $conditionsUpdate = $conditionidsDelete = array();
-		foreach ($actions as $action) {
-			if (isset($action['name'])) {
-				$actionName = $action['name'];
-
-				$actionExists = $this->get(array(
-					'filter' => array('name' => $actionName),
-					'output' => array('actionid'),
-					'editable' => true,
-					'nopermissions' => true,
-					'preservekeys' => true
-				));
-				if (($actionExist = reset($actionExists))
-						&& (bccomp($actionExist['actionid'], $action['actionid']) != 0)) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" already exists.', $actionName));
-				}
-			}
-			else {
-				$actionName = $updActions[$action['actionid']]['name'];
-			}
+			if (isset($action['filter'])) {
+				$actionFilter = $action['filter'];
 
-			if (isset($action['conditions'])) {
-				if (!is_array($action['conditions'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Incorrect action conditions for action "%1$s".', $actionName));
+				// set formula to empty string of not custom expression
+				if ($actionFilter['evaltype'] != CONDITION_EVAL_TYPE_EXPRESSION) {
+					$actionUpdateValues['formula'] = '';
 				}
 
-				$conditionsDb = isset($updActions[$action['actionid']]['conditions'])
-					? $updActions[$action['actionid']]['conditions']
-					: array();
-				$conditionsDb = zbx_toHash($conditionsDb, 'conditionid');
-
-				foreach ($action['conditions'] as $condition) {
-					$condition['actionid'] = $action['actionid'];
-
-					if (!isset($condition['conditionid'])) {
-						$conditionsCreate[] = $condition;
-					}
-					elseif (isset($conditionsDb[$condition['conditionid']])) {
-						// value and operator validation depends on condition type
-						$defaultFields = array('conditiontype', 'operator', 'value');
-						foreach ($defaultFields as $field) {
-							$condition[$field] = isset($condition[$field])
-								? $condition[$field]
-								: $conditionsDb[$condition['conditionid']][$field];
-						}
-
-						$conditionsUpdate[] = $condition;
-						unset($conditionsDb[$condition['conditionid']]);
-					}
-					else {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect action conditionid.'));
-					}
-				}
-
-				$conditionidsDelete = array_merge($conditionidsDelete, array_keys($conditionsDb));
-			}
-
-			if (isset($action['operations']) && empty($action['operations'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" no operations defined.', $actionName));
+				$actionUpdateValues['evaltype'] = $actionFilter['evaltype'];
 			}
-			elseif (isset($action['operations'])) {
-				$this->validateOperations($action['operations']);
 
-				$operationsDb = $updActions[$action['actionid']]['operations'];
+			if (isset($action['operations'])) {
+				$operationsDb = $actionDb['operations'];
 				$operationsDb = zbx_toHash($operationsDb, 'operationid');
-				foreach ($action['operations'] as $operation) {
-					$operation['actionid'] = $action['actionid'];
 
+				foreach ($action['operations'] as $operation) {
 					if (!isset($operation['operationid'])) {
-						$operationsCreate[] = $operation;
-					}
-					elseif (isset($operationsDb[$operation['operationid']])) {
-						$operationsUpdate[] = $operation;
-						unset($operationsDb[$operation['operationid']]);
+						$operation['actionid'] = $action['actionid'];
+						$operationsToCreate[] = $operation;
 					}
 					else {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect action operationid.'));
+						$operationId = $operation['operationid'];
+
+						if (isset($operationsDb[$operationId])) {
+							$operationsToUpdate[] = $operation;
+							unset($operationsDb[$operationId]);
+						}
 					}
 				}
-				$operationidsDelete = array_merge($operationidsDelete, array_keys($operationsDb));
+				$operationIdsForDelete = array_merge($operationIdsForDelete, array_keys($operationsDb));
 			}
 
-			$actionid = $action['actionid'];
-			unset($action['actionid'], $action['conditions'], $action['operations']);
-			if (!empty($action)) {
-				$update[] = array(
-					'values' => $action,
-					'where' => array('actionid' => $actionid)
-				);
-			}
+			$actionsUpdateData[] = array('values' => $actionUpdateValues, 'where' => array('actionid' => $actionId));
 		}
 
-		DB::update('actions', $update);
+		if ($actionsUpdateData) {
+			DB::update('actions', $actionsUpdateData);
+		}
 
-		self::validateConditions($conditionsCreate);
-		$this->addConditions($conditionsCreate);
+		// add, update and delete operations
+		$this->addOperations($operationsToCreate);
+		$this->updateOperations($operationsToUpdate, $actionsDb);
+		if (!empty($operationIdsForDelete)) {
+			$this->deleteOperations($operationIdsForDelete);
+		}
 
-		self::validateConditions($conditionsUpdate, true);
-		$this->updateConditions($conditionsUpdate);
+		// set actionid for all conditions and group by actionid into $newActionConditions
+		$newActionConditions = null;
+		foreach ($actions as $actionId => $action) {
+			if (isset($action['filter'])) {
+				if ($newActionConditions === null) {
+					$newActionConditions = array();
+				}
 
-		if (!empty($conditionidsDelete)) {
-			$this->deleteConditions($conditionidsDelete);
+				$newActionConditions[$actionId] = array();
+				foreach ($action['filter']['conditions'] as $condition) {
+					$condition['actionid'] = $actionId;
+					$newActionConditions[$actionId][] = $condition;
+				}
+			}
 		}
 
-		$this->addOperations($operationsCreate);
-		$this->updateOperations($operationsUpdate, $updActions);
-		if (!empty($operationidsDelete)) {
-			$this->deleteOperations($operationidsDelete);
+		// if we have any conditions, fetch current conditions from db and do replace by position and group result
+		// by actionid into $actionConditions
+		$actionConditions = array();
+		if ($newActionConditions !== null) {
+			$existingConditions = DBfetchArray(DBselect(
+				'SELECT conditionid,actionid,conditiontype,operator,value'.
+				' FROM conditions'.
+				' WHERE '.dbConditionInt('actionid', $actionIds).
+				' ORDER BY conditionid'
+			));
+			$existingActionConditions = array();
+			foreach ($existingConditions as $condition) {
+				$existingActionConditions[$condition['actionid']][] = $condition;
+			}
+
+			$conditions = DB::replaceByPosition('conditions', $existingActionConditions, $newActionConditions);
+			foreach ($conditions as $condition) {
+				$actionConditions[$condition['actionid']][] = $condition;
+			}
 		}
 
-		return array('actionids' => $actionids);
+		// update formulas for user expressions using new conditions
+		foreach ($actions as $actionId => $action) {
+			if (isset($action['filter']) && $action['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+				$this->updateFormula($actionId, $action['filter']['formula'], $actionConditions[$actionId]);
+			}
+		}
+
+		return array('actionids' => $actionIds);
 	}
 
+	/**
+	 * @param array $conditions
+	 *
+	 * @return mixed
+	 */
 	protected function addConditions($conditions) {
 		foreach ($conditions as $condition) {
 			$connectionDbFields = array(
@@ -774,26 +750,34 @@ class CAction extends CApiService {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect parameters for condition.'));
 			}
 		}
-		DB::insert('conditions', $conditions);
+
+		return DB::save('conditions', $conditions);
 	}
 
 	protected function updateConditions($conditions) {
 		$update = array();
 		foreach ($conditions as $condition) {
-			$conditionid = $condition['conditionid'];
+			$conditionId = $condition['conditionid'];
 			unset($condition['conditionid']);
 			$update = array(
 				'values' => $condition,
-				'where' => array('conditionid' => $conditionid)
+				'where' => array('conditionid' => $conditionId)
 			);
 		}
 		DB::update('conditions', $update);
+
+		return $conditions;
 	}
 
 	protected function deleteConditions($conditionids) {
 		DB::delete('conditions', array('conditionid' => $conditionids));
 	}
 
+	/**
+	 * @param array $operations
+	 *
+	 * @return bool
+	 */
 	protected function addOperations($operations) {
 		foreach ($operations as $operation) {
 			$operationDbFields = array(
@@ -805,73 +789,80 @@ class CAction extends CApiService {
 			}
 		}
 
-		$operationids = DB::insert('operations', $operations);
+		$operations = DB::save('operations', $operations);
+		$operations = zbx_toHash($operations, 'operationid');
 
-		$opmessage = $opcommand = $opmessageGrp = $opmessageUsr = $opcommandHst = $opcommandGrp = $opgroup = $optemplate = array();
-		$opconditionInserts = array();
-		foreach ($operations as $onum => $operation) {
-			$operationid = $operationids[$onum];
+		$opMessagesToInsert = array();
+		$opCommandsToInsert = array();
+		$opMessageGrpsToInsert = array();
+		$opMessageUsrsToInsert = array();
+		$opCommandHstsToInsert = array();
+		$opCommandGroupInserts = array();
+		$opGroupsToInsert = array();
+		$opTemplatesToInsert = array();
+		$opConditionsToInsert = array();
 
+		foreach ($operations as $operationId => $operation) {
 			switch ($operation['operationtype']) {
 				case OPERATION_TYPE_MESSAGE:
 					if (isset($operation['opmessage']) && !empty($operation['opmessage'])) {
-						$operation['opmessage']['operationid'] = $operationid;
-						$opmessage[] = $operation['opmessage'];
+						$operation['opmessage']['operationid'] = $operationId;
+						$opMessagesToInsert[] = $operation['opmessage'];
 					}
 					if (isset($operation['opmessage_usr'])) {
 						foreach ($operation['opmessage_usr'] as $user) {
-							$opmessageUsr[] = array(
-								'operationid' => $operationid,
+							$opMessageUsrsToInsert[] = array(
+								'operationid' => $operationId,
 								'userid' => $user['userid']
 							);
 						}
 					}
 					if (isset($operation['opmessage_grp'])) {
-						foreach ($operation['opmessage_grp'] as $usrgrp) {
-							$opmessageGrp[] = array(
-								'operationid' => $operationid,
-								'usrgrpid' => $usrgrp['usrgrpid']
+						foreach ($operation['opmessage_grp'] as $userGroup) {
+							$opMessageGrpsToInsert[] = array(
+								'operationid' => $operationId,
+								'usrgrpid' => $userGroup['usrgrpid']
 							);
 						}
 					}
 					break;
 				case OPERATION_TYPE_COMMAND:
 					if (isset($operation['opcommand']) && !empty($operation['opcommand'])) {
-						$operation['opcommand']['operationid'] = $operationid;
-						$opcommand[] = $operation['opcommand'];
+						$operation['opcommand']['operationid'] = $operationId;
+						$opCommandsToInsert[] = $operation['opcommand'];
 					}
 					if (isset($operation['opcommand_hst'])) {
-						foreach ($operation['opcommand_hst'] as $hst) {
-							$opcommandHst[] = array(
-								'operationid' => $operationid,
-								'hostid' => $hst['hostid']
+						foreach ($operation['opcommand_hst'] as $host) {
+							$opCommandHstsToInsert[] = array(
+								'operationid' => $operationId,
+								'hostid' => $host['hostid']
 							);
 						}
 					}
 					if (isset($operation['opcommand_grp'])) {
-						foreach ($operation['opcommand_grp'] as $grp) {
-							$opcommandGrp[] = array(
-								'operationid' => $operationid,
-								'groupid' => $grp['groupid']
+						foreach ($operation['opcommand_grp'] as $hostGroup) {
+							$opCommandGroupInserts[] = array(
+								'operationid' => $operationId,
+								'groupid' => $hostGroup['groupid']
 							);
 						}
 					}
 					break;
 				case OPERATION_TYPE_GROUP_ADD:
 				case OPERATION_TYPE_GROUP_REMOVE:
-					foreach ($operation['opgroup'] as $grp) {
-						$opgroup[] = array(
-							'operationid' => $operationid,
-							'groupid' => $grp['groupid']
+					foreach ($operation['opgroup'] as $hostGroup) {
+						$opGroupsToInsert[] = array(
+							'operationid' => $operationId,
+							'groupid' => $hostGroup['groupid']
 						);
 					}
 					break;
 				case OPERATION_TYPE_TEMPLATE_ADD:
 				case OPERATION_TYPE_TEMPLATE_REMOVE:
-					foreach ($operation['optemplate'] as $tpl) {
-						$optemplate[] = array(
-							'operationid' => $operationid,
-							'templateid' => $tpl['templateid']
+					foreach ($operation['optemplate'] as $template) {
+						$opTemplatesToInsert[] = array(
+							'operationid' => $operationId,
+							'templateid' => $template['templateid']
 						);
 					}
 					break;
@@ -881,58 +872,62 @@ class CAction extends CApiService {
 				case OPERATION_TYPE_HOST_DISABLE:
 			}
 			if (isset($operation['opconditions'])) {
-				foreach ($operation['opconditions'] as $opcondition) {
-					$opcondition['operationid'] = $operationid;
-					$opconditionInserts[] = $opcondition;
+				foreach ($operation['opconditions'] as $opCondition) {
+					$opCondition['operationid'] = $operationId;
+					$opConditionsToInsert[] = $opCondition;
 				}
 			}
 		}
-		DB::insert('opconditions', $opconditionInserts);
-		DB::insert('opmessage', $opmessage, false);
-		DB::insert('opcommand', $opcommand, false);
-		DB::insert('opmessage_grp', $opmessageGrp);
-		DB::insert('opmessage_usr', $opmessageUsr);
-		DB::insert('opcommand_hst', $opcommandHst);
-		DB::insert('opcommand_grp', $opcommandGrp);
-		DB::insert('opgroup', $opgroup);
-		DB::insert('optemplate', $optemplate);
+		DB::insert('opconditions', $opConditionsToInsert);
+		DB::insert('opmessage', $opMessagesToInsert, false);
+		DB::insert('opcommand', $opCommandsToInsert, false);
+		DB::insert('opmessage_grp', $opMessageGrpsToInsert);
+		DB::insert('opmessage_usr', $opMessageUsrsToInsert);
+		DB::insert('opcommand_hst', $opCommandHstsToInsert);
+		DB::insert('opcommand_grp', $opCommandGroupInserts);
+		DB::insert('opgroup', $opGroupsToInsert);
+		DB::insert('optemplate', $opTemplatesToInsert);
 
 		return true;
 	}
 
+	/**
+	 * @param array $operations
+	 * @param array $actionsDb
+	 */
 	protected function updateOperations($operations, $actionsDb) {
 		$operationsUpdate = array();
 
 		// messages
-		$opmessageCreate = array();
-		$opmessageUpdate = array();
-		$opmessageDeleteByOpId = array();
+		$opMessagesToInsert = array();
+		$opMessagesToUpdate = array();
+		$opMessagesToDeleteByOpId = array();
 
-		$opmessageGrpCreate = array();
-		$opmessageUsrCreate = array();
-		$opmessageGrpDeleteByOpId = array();
-		$opmessageUsrDeleteByOpId = array();
+		$opMessageGrpsToInsert = array();
+		$opMessageUsrsToInsert = array();
+		$opMessageGrpsToDeleteByOpId = array();
+		$opMessageUsrsToDeleteByOpId = array();
 
 		// commands
-		$opcommandCreate = array();
-		$opcommandUpdate = array();
-		$opcommandDeleteByOpId = array();
-
-		$opcommandGrpCreate = array();
-		$opcommandHstCreate = array();
+		$opCommandsToInsert = array();
+		$opCommandsToUpdate = array();
+		$opCommandsToDeleteByOpId = array();
 
-		$opcommandGrpDeleteByOpId = array();
-		$opcommandHstDeleteByOpId = array();
+		$opCommandGrpsToInsert = array();
+		$opCommandHstsToInsert = array();
+		$opCommandGrpsToDeleteByOpId = array();
+		$opCommandHstsToDeleteByOpId = array();
 
 		// groups
-		$opgroupCreate = array();
-		$opgroupDeleteByOpId = array();
+		$opGroupsToInsert = array();
+		$opGroupsToDeleteByOpId = array();
 
 		// templates
-		$optemplateCreate = array();
-		$optemplateDeleteByOpId = array();
+		$opTemplateToInsert = array();
+		$opTemplatesToDeleteByOpId = array();
 
-		$opconditionsCreate = array();
+		// operation conditions
+		$opConditionsToInsert = array();
 
 		foreach ($operations as $operation) {
 			$operationsDb = zbx_toHash($actionsDb[$operation['actionid']]['operations'], 'operationid');
@@ -944,14 +939,14 @@ class CAction extends CApiService {
 
 				switch ($operationDb['operationtype']) {
 					case OPERATION_TYPE_MESSAGE:
-						$opmessageDeleteByOpId[] = $operationDb['operationid'];
-						$opmessageGrpDeleteByOpId[] = $operationDb['operationid'];
-						$opmessageUsrDeleteByOpId[] = $operationDb['operationid'];
+						$opMessagesToDeleteByOpId[] = $operationDb['operationid'];
+						$opMessageGrpsToDeleteByOpId[] = $operationDb['operationid'];
+						$opMessageUsrsToDeleteByOpId[] = $operationDb['operationid'];
 						break;
 					case OPERATION_TYPE_COMMAND:
-						$opcommandDeleteByOpId[] = $operationDb['operationid'];
-						$opcommandHstDeleteByOpId[] = $operationDb['operationid'];
-						$opcommandGrpDeleteByOpId[] = $operationDb['operationid'];
+						$opCommandsToDeleteByOpId[] = $operationDb['operationid'];
+						$opCommandHstsToDeleteByOpId[] = $operationDb['operationid'];
+						$opCommandGrpsToDeleteByOpId[] = $operationDb['operationid'];
 						break;
 					case OPERATION_TYPE_GROUP_ADD:
 						if ($operation['operationtype'] == OPERATION_TYPE_GROUP_REMOVE) {
@@ -961,7 +956,7 @@ class CAction extends CApiService {
 						if ($operation['operationtype'] == OPERATION_TYPE_GROUP_ADD) {
 							break;
 						}
-						$opgroupDeleteByOpId[] = $operationDb['operationid'];
+						$opGroupsToDeleteByOpId[] = $operationDb['operationid'];
 						break;
 					case OPERATION_TYPE_TEMPLATE_ADD:
 						if ($operation['operationtype'] == OPERATION_TYPE_TEMPLATE_REMOVE) {
@@ -971,7 +966,7 @@ class CAction extends CApiService {
 						if ($operation['operationtype'] == OPERATION_TYPE_TEMPLATE_ADD) {
 							break;
 						}
-						$optemplateDeleteByOpId[] = $operationDb['operationid'];
+						$opTemplatesToDeleteByOpId[] = $operationDb['operationid'];
 						break;
 				}
 			}
@@ -1005,32 +1000,32 @@ class CAction extends CApiService {
 
 					if ($typeChanged) {
 						$operation['opmessage']['operationid'] = $operation['operationid'];
-						$opmessageCreate[] = $operation['opmessage'];
+						$opMessagesToInsert[] = $operation['opmessage'];
 
-						$opmessageGrpCreate = array_merge($opmessageGrpCreate, $operation['opmessage_grp']);
-						$opmessageUsrCreate = array_merge($opmessageUsrCreate, $operation['opmessage_usr']);
+						$opMessageGrpsToInsert = array_merge($opMessageGrpsToInsert, $operation['opmessage_grp']);
+						$opMessageUsrsToInsert = array_merge($opMessageUsrsToInsert, $operation['opmessage_usr']);
 					}
 					else {
-						$opmessageUpdate[] = array(
+						$opMessagesToUpdate[] = array(
 							'values' => $operation['opmessage'],
 							'where' => array('operationid'=>$operation['operationid'])
 						);
 
 						$diff = zbx_array_diff($operation['opmessage_grp'], $operationDb['opmessage_grp'], 'usrgrpid');
-						$opmessageGrpCreate = array_merge($opmessageGrpCreate, $diff['first']);
+						$opMessageGrpsToInsert = array_merge($opMessageGrpsToInsert, $diff['first']);
 
-						foreach ($diff['second'] as $omgrp) {
+						foreach ($diff['second'] as $opMessageGrp) {
 							DB::delete('opmessage_grp', array(
-								'usrgrpid' => $omgrp['usrgrpid'],
+								'usrgrpid' => $opMessageGrp['usrgrpid'],
 								'operationid' => $operation['operationid']
 							));
 						}
 
 						$diff = zbx_array_diff($operation['opmessage_usr'], $operationDb['opmessage_usr'], 'userid');
-						$opmessageUsrCreate = array_merge($opmessageUsrCreate, $diff['first']);
-						foreach ($diff['second'] as $omusr) {
+						$opMessageUsrsToInsert = array_merge($opMessageUsrsToInsert, $diff['first']);
+						foreach ($diff['second'] as $opMessageUsr) {
 							DB::delete('opmessage_usr', array(
-								'userid' => $omusr['userid'],
+								'userid' => $opMessageUsr['userid'],
 								'operationid' => $operation['operationid']
 							));
 						}
@@ -1060,10 +1055,10 @@ class CAction extends CApiService {
 
 					if ($typeChanged) {
 						$operation['opcommand']['operationid'] = $operation['operationid'];
-						$opcommandCreate[] = $operation['opcommand'];
+						$opCommandsToInsert[] = $operation['opcommand'];
 
-						$opcommandGrpCreate = array_merge($opcommandGrpCreate, $operation['opcommand_grp']);
-						$opcommandHstCreate = array_merge($opcommandHstCreate, $operation['opcommand_hst']);
+						$opCommandGrpsToInsert = array_merge($opCommandGrpsToInsert, $operation['opcommand_grp']);
+						$opCommandHstsToInsert = array_merge($opCommandHstsToInsert, $operation['opcommand_hst']);
 					}
 					else {
 						// clear and reset fields to default values on type change
@@ -1090,23 +1085,23 @@ class CAction extends CApiService {
 							$operation['opcommand']['privatekey'] = '';
 						}
 
-						$opcommandUpdate[] = array(
+						$opCommandsToUpdate[] = array(
 							'values' => $operation['opcommand'],
 							'where' => array('operationid' => $operation['operationid'])
 						);
 
 						$diff = zbx_array_diff($operation['opcommand_grp'], $operationDb['opcommand_grp'], 'groupid');
-						$opcommandGrpCreate = array_merge($opcommandGrpCreate, $diff['first']);
+						$opCommandGrpsToInsert = array_merge($opCommandGrpsToInsert, $diff['first']);
 
-						foreach ($diff['second'] as $omgrp) {
+						foreach ($diff['second'] as $opMessageGrp) {
 							DB::delete('opcommand_grp', array(
-								'groupid' => $omgrp['groupid'],
+								'groupid' => $opMessageGrp['groupid'],
 								'operationid' => $operation['operationid']
 							));
 						}
 
 						$diff = zbx_array_diff($operation['opcommand_hst'], $operationDb['opcommand_hst'], 'hostid');
-						$opcommandHstCreate = array_merge($opcommandHstCreate, $diff['first']);
+						$opCommandHstsToInsert = array_merge($opCommandHstsToInsert, $diff['first']);
 						$opCommandHostIds = zbx_objectValues($diff['second'], 'opcommand_hstid');
 						if ($opCommandHostIds) {
 							DB::delete('opcommand_hst', array(
@@ -1129,10 +1124,10 @@ class CAction extends CApiService {
 					}
 
 					$diff = zbx_array_diff($operation['opgroup'], $operationDb['opgroup'], 'groupid');
-					$opgroupCreate = array_merge($opgroupCreate, $diff['first']);
-					foreach ($diff['second'] as $ogrp) {
+					$opGroupsToInsert = array_merge($opGroupsToInsert, $diff['first']);
+					foreach ($diff['second'] as $opGroup) {
 						DB::delete('opgroup', array(
-							'groupid' => $ogrp['groupid'],
+							'groupid' => $opGroup['groupid'],
 							'operationid' => $operation['operationid']
 						));
 					}
@@ -1151,11 +1146,11 @@ class CAction extends CApiService {
 					}
 
 					$diff = zbx_array_diff($operation['optemplate'], $operationDb['optemplate'], 'templateid');
-					$optemplateCreate = array_merge($optemplateCreate, $diff['first']);
+					$opTemplateToInsert = array_merge($opTemplateToInsert, $diff['first']);
 
-					foreach ($diff['second'] as $otpl) {
+					foreach ($diff['second'] as $opTemplate) {
 						DB::delete('optemplate', array(
-							'templateid' => $otpl['templateid'],
+							'templateid' => $opTemplate['templateid'],
 							'operationid' => $operation['operationid']
 						));
 					}
@@ -1172,71 +1167,71 @@ class CAction extends CApiService {
 			self::validateOperationConditions($operation['opconditions']);
 
 			$diff = zbx_array_diff($operation['opconditions'], $operationDb['opconditions'], 'opconditionid');
-			$opconditionsCreate = array_merge($opconditionsCreate, $diff['first']);
+			$opConditionsToInsert = array_merge($opConditionsToInsert, $diff['first']);
 
-			$opconditionsidDelete = zbx_objectValues($diff['second'], 'opconditionid');
-			if (!empty($opconditionsidDelete)) {
-				DB::delete('opconditions', array('opconditionid' => $opconditionsidDelete));
+			$opConditionsIdsToDelete = zbx_objectValues($diff['second'], 'opconditionid');
+			if (!empty($opConditionsIdsToDelete)) {
+				DB::delete('opconditions', array('opconditionid' => $opConditionsIdsToDelete));
 			}
 
-			$operationid = $operation['operationid'];
+			$operationId = $operation['operationid'];
 			unset($operation['operationid']);
 			if (!empty($operation)) {
 				$operationsUpdate[] = array(
 					'values' => $operation,
-					'where' => array('operationid' => $operationid)
+					'where' => array('operationid' => $operationId)
 				);
 			}
 		}
 
 		DB::update('operations', $operationsUpdate);
 
-		if (!empty($opmessageDeleteByOpId)) {
-			DB::delete('opmessage', array('operationid' => $opmessageDeleteByOpId));
+		if (!empty($opMessagesToDeleteByOpId)) {
+			DB::delete('opmessage', array('operationid' => $opMessagesToDeleteByOpId));
 		}
-		if (!empty($opcommandDeleteByOpId)) {
-			DB::delete('opcommand', array('operationid' => $opcommandDeleteByOpId));
+		if (!empty($opCommandsToDeleteByOpId)) {
+			DB::delete('opcommand', array('operationid' => $opCommandsToDeleteByOpId));
 		}
-		if (!empty($opmessageGrpDeleteByOpId)) {
-			DB::delete('opmessage_grp', array('operationid' => $opmessageGrpDeleteByOpId));
+		if (!empty($opMessageGrpsToDeleteByOpId)) {
+			DB::delete('opmessage_grp', array('operationid' => $opMessageGrpsToDeleteByOpId));
 		}
-		if (!empty($opmessageUsrDeleteByOpId)) {
-			DB::delete('opmessage_usr', array('operationid' => $opmessageUsrDeleteByOpId));
+		if (!empty($opMessageUsrsToDeleteByOpId)) {
+			DB::delete('opmessage_usr', array('operationid' => $opMessageUsrsToDeleteByOpId));
 		}
-		if (!empty($opcommandHstDeleteByOpId)) {
-			DB::delete('opcommand_hst', array('operationid' => $opcommandHstDeleteByOpId));
+		if (!empty($opCommandHstsToDeleteByOpId)) {
+			DB::delete('opcommand_hst', array('operationid' => $opCommandHstsToDeleteByOpId));
 		}
-		if (!empty($opcommandGrpDeleteByOpId)) {
-			DB::delete('opcommand_grp', array('operationid' => $opcommandGrpDeleteByOpId));
+		if (!empty($opCommandGrpsToDeleteByOpId)) {
+			DB::delete('opcommand_grp', array('operationid' => $opCommandGrpsToDeleteByOpId));
 		}
-		if (!empty($opcommandGrpDeleteByOpId)) {
-			DB::delete('opcommand_grp', array('opcommand_grpid' => $opcommandGrpDeleteByOpId));
+		if (!empty($opCommandGrpsToDeleteByOpId)) {
+			DB::delete('opcommand_grp', array('opcommand_grpid' => $opCommandGrpsToDeleteByOpId));
 		}
-		if (!empty($opcommandHstDeleteByOpId)) {
-			DB::delete('opcommand_hst', array('opcommand_hstid' => $opcommandHstDeleteByOpId));
+		if (!empty($opCommandHstsToDeleteByOpId)) {
+			DB::delete('opcommand_hst', array('opcommand_hstid' => $opCommandHstsToDeleteByOpId));
 		}
-		if (!empty($opgroupDeleteByOpId)) {
-			DB::delete('opgroup', array('operationid' => $opgroupDeleteByOpId));
+		if (!empty($opGroupsToDeleteByOpId)) {
+			DB::delete('opgroup', array('operationid' => $opGroupsToDeleteByOpId));
 		}
-		if (!empty($optemplateDeleteByOpId)) {
-			DB::delete('optemplate', array('operationid' => $optemplateDeleteByOpId));
+		if (!empty($opTemplatesToDeleteByOpId)) {
+			DB::delete('optemplate', array('operationid' => $opTemplatesToDeleteByOpId));
 		}
 
-		DB::insert('opmessage', $opmessageCreate, false);
-		DB::insert('opcommand', $opcommandCreate, false);
-		DB::insert('opmessage_grp', $opmessageGrpCreate);
-		DB::insert('opmessage_usr', $opmessageUsrCreate);
-		DB::insert('opcommand_grp', $opcommandGrpCreate);
-		DB::insert('opcommand_hst', $opcommandHstCreate);
-		DB::insert('opgroup', $opgroupCreate);
-		DB::insert('optemplate', $optemplateCreate);
-		DB::update('opmessage', $opmessageUpdate);
-		DB::update('opcommand', $opcommandUpdate);
-		DB::insert('opconditions', $opconditionsCreate);
+		DB::insert('opmessage', $opMessagesToInsert, false);
+		DB::insert('opcommand', $opCommandsToInsert, false);
+		DB::insert('opmessage_grp', $opMessageGrpsToInsert);
+		DB::insert('opmessage_usr', $opMessageUsrsToInsert);
+		DB::insert('opcommand_grp', $opCommandGrpsToInsert);
+		DB::insert('opcommand_hst', $opCommandHstsToInsert);
+		DB::insert('opgroup', $opGroupsToInsert);
+		DB::insert('optemplate', $opTemplateToInsert);
+		DB::update('opmessage', $opMessagesToUpdate);
+		DB::update('opcommand', $opCommandsToUpdate);
+		DB::insert('opconditions', $opConditionsToInsert);
 	}
 
-	protected function deleteOperations($operationids) {
-		DB::delete('operations', array('operationid' => $operationids));
+	protected function deleteOperations($operationIds) {
+		DB::delete('operations', array('operationid' => $operationIds));
 	}
 
 	/**
@@ -1270,7 +1265,12 @@ class CAction extends CApiService {
 		return array('actionids' => $actionids);
 	}
 
-	public function validateOperations($operations) {
+	/**
+	 * @param array $operations
+	 *
+	 * @return bool
+	 */
+	public function validateOperationsIntegrity($operations) {
 		$operations = zbx_toArray($operations);
 
 		foreach ($operations as $operation) {
@@ -1294,18 +1294,21 @@ class CAction extends CApiService {
 				}
 			}
 
-			$hostIdsAll = $hostGroupIdsAll = $useridsAll = $userGroupidsAll = array();
+			$hostIdsAll = array();
+			$hostGroupIdsAll = array();
+			$userIdsAll = array();
+			$userGroupIdsAll = array();
 			switch ($operation['operationtype']) {
 				case OPERATION_TYPE_MESSAGE:
-					$userids = isset($operation['opmessage_usr']) ? zbx_objectValues($operation['opmessage_usr'], 'userid') : array();
-					$usergroupids = isset($operation['opmessage_grp']) ? zbx_objectValues($operation['opmessage_grp'], 'usrgrpid') : array();
+					$userIds = isset($operation['opmessage_usr']) ? zbx_objectValues($operation['opmessage_usr'], 'userid') : array();
+					$userGroupIds = isset($operation['opmessage_grp']) ? zbx_objectValues($operation['opmessage_grp'], 'usrgrpid') : array();
 
-					if (empty($userids) && empty($usergroupids)) {
+					if (empty($userIds) && empty($userGroupIds)) {
 						self::exception(ZBX_API_ERROR_PARAMETERS, _('No recipients for action operation message.'));
 					}
 
-					$useridsAll = array_merge($useridsAll, $userids);
-					$userGroupidsAll = array_merge($userGroupidsAll, $usergroupids);
+					$userIdsAll = array_merge($userIdsAll, $userIds);
+					$userGroupIdsAll = array_merge($userGroupIdsAll, $userGroupIds);
 					break;
 				case OPERATION_TYPE_COMMAND:
 					if (!isset($operation['opcommand']['type'])) {
@@ -1376,12 +1379,12 @@ class CAction extends CApiService {
 						}
 					}
 
-					$groupids = array();
+					$groupIds = array();
 					if (isset($operation['opcommand_grp'])) {
-						$groupids = zbx_objectValues($operation['opcommand_grp'], 'groupid');
+						$groupIds = zbx_objectValues($operation['opcommand_grp'], 'groupid');
 					}
 
-					$hostids = array();
+					$hostIds = array();
 					$withoutCurrent = true;
 					if (isset($operation['opcommand_hst'])) {
 						foreach ($operation['opcommand_hst'] as $hstCommand) {
@@ -1389,12 +1392,12 @@ class CAction extends CApiService {
 								$withoutCurrent = false;
 							}
 							else {
-								$hostids[$hstCommand['hostid']] = $hstCommand['hostid'];
+								$hostIds[$hstCommand['hostid']] = $hstCommand['hostid'];
 							}
 						}
 					}
 
-					if (empty($groupids) && empty($hostids) && $withoutCurrent) {
+					if (empty($groupIds) && empty($hostIds) && $withoutCurrent) {
 						if ($operation['opcommand']['type'] == ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT) {
 							self::exception(ZBX_API_ERROR_PARAMETERS, _s('You did not specify targets for action operation global script "%s".', $scripts[$operation['opcommand']['scriptid']]['name']));
 						}
@@ -1403,24 +1406,24 @@ class CAction extends CApiService {
 						}
 					}
 
-					$hostIdsAll = array_merge($hostIdsAll, $hostids);
-					$hostGroupIdsAll = array_merge($hostGroupIdsAll, $groupids);
+					$hostIdsAll = array_merge($hostIdsAll, $hostIds);
+					$hostGroupIdsAll = array_merge($hostGroupIdsAll, $groupIds);
 					break;
 				case OPERATION_TYPE_GROUP_ADD:
 				case OPERATION_TYPE_GROUP_REMOVE:
-					$groupids = isset($operation['opgroup']) ? zbx_objectValues($operation['opgroup'], 'groupid') : array();
-					if (empty($groupids)) {
+					$groupIds = isset($operation['opgroup']) ? zbx_objectValues($operation['opgroup'], 'groupid') : array();
+					if (empty($groupIds)) {
 						self::exception(ZBX_API_ERROR_PARAMETERS, _('Operation has no group to operate.'));
 					}
-					$hostGroupIdsAll = array_merge($hostGroupIdsAll, $groupids);
+					$hostGroupIdsAll = array_merge($hostGroupIdsAll, $groupIds);
 					break;
 				case OPERATION_TYPE_TEMPLATE_ADD:
 				case OPERATION_TYPE_TEMPLATE_REMOVE:
-					$templateids = isset($operation['optemplate']) ? zbx_objectValues($operation['optemplate'], 'templateid') : array();
-					if (empty($templateids)) {
+					$templateIds = isset($operation['optemplate']) ? zbx_objectValues($operation['optemplate'], 'templateid') : array();
+					if (empty($templateIds)) {
 						self::exception(ZBX_API_ERROR_PARAMETERS, _('Operation has no template to operate.'));
 					}
-					$hostIdsAll = array_merge($hostIdsAll, $templateids);
+					$hostIdsAll = array_merge($hostIdsAll, $templateIds);
 					break;
 				case OPERATION_TYPE_HOST_ADD:
 				case OPERATION_TYPE_HOST_REMOVE:
@@ -1438,10 +1441,10 @@ class CAction extends CApiService {
 		if (!API::Host()->isWritable($hostIdsAll)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect action operation host. Host does not exist or you have no access to this host.'));
 		}
-		if (!API::User()->isReadable($useridsAll)) {
+		if (!API::User()->isReadable($userIdsAll)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect action operation user. User does not exist or you have no access to this user.'));
 		}
-		if (!API::UserGroup()->isReadable($userGroupidsAll)) {
+		if (!API::UserGroup()->isReadable($userGroupIdsAll)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect action operation user group. User group does not exist or you have no access to this user group.'));
 		}
 
@@ -1472,29 +1475,29 @@ class CAction extends CApiService {
 
 		// build validators
 		$timePeriodValidator = new CTimePeriodValidator();
-		$discoveryCheckTypeValidator = new CSetValidator(array(
+		$discoveryCheckTypeValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(discovery_check_type2str())
 		));
-		$discoveryObjectStatusValidator = new CSetValidator(array(
+		$discoveryObjectStatusValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(discovery_object_status2str())
 		));
-		$triggerSeverityValidator = new CSetValidator(array(
+		$triggerSeverityValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(getSeverityCaption())
 		));
-		$discoveryObjectValidator = new CSetValidator(array(
+		$discoveryObjectValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(discovery_object2str())
 		));
-		$triggerValueValidator = new CSetValidator(array(
+		$triggerValueValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(trigger_value2str())
 		));
-		$eventTypeValidator = new CSetValidator(array(
+		$eventTypeValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(eventType())
 		));
 
 		foreach ($conditions as $condition) {
 			// on create operator is mandatory and needs validation, but on update it must be validated only if it's set
 			if (!$update || ($update && isset($condition['operator']))) {
-				$operatorValidator = new CSetValidator(array(
+				$operatorValidator = new CLimitedSetValidator(array(
 					'values' => get_operators_by_conditiontype($condition['conditiontype'])
 				));
 				if (!$operatorValidator->validate($condition['operator'])) {
@@ -1722,17 +1725,78 @@ class CAction extends CApiService {
 
 		$actionIds = array_keys($result);
 
-		// adding conditions
-		if (!is_null($options['selectConditions']) && $options['selectConditions'] != API_OUTPUT_COUNT) {
-			$conditions = API::getApiService()->select('conditions', array(
-				'output' => $this->outputExtend($options['selectConditions'], array('actionid', 'conditionid')),
-				'filter' => array('actionid' => $actionIds),
-				'preservekeys' => true
-			));
-			$relationMap = $this->createRelationMap($conditions, 'actionid', 'conditionid');
+		// adding formulas
+		if ($options['selectFilter'] !== null) {
+			$formulaRequested = $this->outputIsRequested('formula', $options['selectFilter']);
+			$evalFormulaRequested = $this->outputIsRequested('eval_formula', $options['selectFilter']);
+			$conditionsRequested = $this->outputIsRequested('conditions', $options['selectFilter']);
+
+			$filters = array();
+			foreach ($result as $action) {
+				$filters[$action['actionid']] = array(
+					'evaltype' => $action['evaltype'],
+					'formula' => isset($action['formula']) ? $action['formula'] : ''
+				);
+			}
+
+			if ($formulaRequested || $evalFormulaRequested || $conditionsRequested) {
+				$conditions = API::getApiService()->select('conditions', array(
+						'output' => array('actionid', 'conditionid', 'conditiontype', 'operator', 'value'),
+						'filter' => array('actionid' => $actionIds),
+					'preservekeys' => true
+				));
+
+				$relationMap = $this->createRelationMap($conditions, 'actionid', 'conditionid');
+				$filters = $relationMap->mapMany($filters, $conditions, 'conditions');
+
+				foreach ($filters as &$filter) {
+					// in case of a custom expression - use the given formula
+					if ($filter['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+						$formula = $filter['formula'];
+					}
+					// in other cases - generate the formula automatically
+					else {
+						$conditions = $filter['conditions'];
+
+						// sort conditions
+						$sortFields = array(
+							array('field' => 'conditiontype', 'order' => ZBX_SORT_DOWN),
+							array('field' => 'operator', 'order' => ZBX_SORT_DOWN),
+							array('field' => 'value', 'order' => ZBX_SORT_DOWN)
+						);
+						CArrayHelper::sort($conditions, $sortFields);
+
+						$conditionsForFormula = array();
+						foreach ($conditions as $condition) {
+							$conditionsForFormula[$condition['conditionid']] = $condition['conditiontype'];
+						}
+						$formula = CConditionHelper::getFormula($conditionsForFormula, $filter['evaltype']);
+					}
 
-			$conditions = $this->unsetExtraFields($conditions, array('actionid', 'conditionid'), $options['selectConditions']);
-			$result = $relationMap->mapMany($result, $conditions, 'conditions');
+					// generate formulaids from the effective formula
+					$formulaIds = CConditionHelper::getFormulaIds($formula);
+					foreach ($filter['conditions'] as &$condition) {
+						$condition['formulaid'] = $formulaIds[$condition['conditionid']];
+					}
+					unset($condition);
+
+					// generated a letter based formula only for actions with custom expressions
+					if ($formulaRequested && $filter['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+						$filter['formula'] = CConditionHelper::replaceNumericIds($formula, $formulaIds);
+					}
+
+					if ($evalFormulaRequested) {
+						$filter['eval_formula'] = CConditionHelper::replaceNumericIds($formula, $formulaIds);
+					}
+				}
+				unset($filter);
+			}
+
+			// add filters to the result
+			foreach ($result as &$action) {
+				$action['filter'] = $filters[$action['actionid']];
+			}
+			unset($action);
 		}
 
 		// adding operations
@@ -1923,4 +1987,449 @@ class CAction extends CApiService {
 
 		return $result;
 	}
+
+	/**
+	 * Returns the parameters for creating a discovery rule filter validator.
+	 *
+	 * @return array
+	 */
+	protected function getFilterSchema() {
+		return array(
+			'validators' => array(
+				'evaltype' => new CLimitedSetValidator(array(
+					'values' => array(
+						CONDITION_EVAL_TYPE_OR,
+						CONDITION_EVAL_TYPE_AND,
+						CONDITION_EVAL_TYPE_AND_OR,
+						CONDITION_EVAL_TYPE_EXPRESSION
+					),
+					'messageInvalid' => _('Incorrect type of calculation for action "%1$s".')
+				)),
+				'formula' => new CStringValidator(array(
+					'empty' => true
+				)),
+				'conditions' => new CCollectionValidator(array(
+					'empty' => true,
+					'messageInvalid' => _('Incorrect conditions for action "%1$s".')
+				))
+			),
+			'postValidators' => array(
+				new CConditionValidator(array(
+					'messageInvalidFormula' => _('Incorrect custom expression "%2$s" for action "%1$s": %3$s.'),
+					'messageMissingCondition' => _('Condition "%2$s" used in formula "%3$s" for action "%1$s" is not defined.'),
+					'messageUnusedCondition' => _('Condition "%2$s" is not used in formula "%3$s" for action "%1$s".')
+				))
+			),
+			'required' => array('evaltype', 'conditions'),
+			'messageRequired' => _('No "%2$s" given for the filter of action "%1$s".'),
+			'messageUnsupported' => _('Unsupported parameter "%2$s" for the filter of action "%1$s".')
+		);
+	}
+
+	/**
+	 * Returns the parameters for creating a action filter condition validator.
+	 *
+	 * @return array
+	 */
+	protected function getFilterConditionSchema() {
+		$conditionTypes = array(
+			CONDITION_TYPE_HOST_GROUP, CONDITION_TYPE_HOST, CONDITION_TYPE_TRIGGER, CONDITION_TYPE_TRIGGER_NAME,
+			CONDITION_TYPE_TRIGGER_SEVERITY, CONDITION_TYPE_TRIGGER_VALUE, CONDITION_TYPE_TIME_PERIOD,
+			CONDITION_TYPE_DHOST_IP, CONDITION_TYPE_DSERVICE_TYPE, CONDITION_TYPE_DSERVICE_PORT,
+			CONDITION_TYPE_DSTATUS, CONDITION_TYPE_DUPTIME, CONDITION_TYPE_DVALUE, CONDITION_TYPE_TEMPLATE,
+			CONDITION_TYPE_EVENT_ACKNOWLEDGED, CONDITION_TYPE_APPLICATION, CONDITION_TYPE_MAINTENANCE,
+			CONDITION_TYPE_DRULE, CONDITION_TYPE_DCHECK, CONDITION_TYPE_PROXY, CONDITION_TYPE_DOBJECT,
+			CONDITION_TYPE_HOST_NAME, CONDITION_TYPE_EVENT_TYPE, CONDITION_TYPE_HOST_METADATA
+		);
+
+		$operators = array(
+			CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL, CONDITION_OPERATOR_LIKE,
+			CONDITION_OPERATOR_NOT_LIKE, CONDITION_OPERATOR_IN, CONDITION_OPERATOR_MORE_EQUAL,
+			CONDITION_OPERATOR_LESS_EQUAL, CONDITION_OPERATOR_NOT_IN
+		);
+
+		return array(
+			'validators' => array(
+				'conditiontype' => new CLimitedSetValidator(array(
+					'values' => $conditionTypes,
+					'messageInvalid' => _('Incorrect filter condition type for action "%1$s".')
+				)) ,
+				'value' => new CStringValidator(array(
+					'empty' => true
+				)),
+				'formulaid' => new CStringValidator(array(
+					'regex' => '/[A-Z]+/',
+					'messageEmpty' => _('Empty filter condition formula ID for action "%1$s".'),
+					'messageRegex' => _('Incorrect filter condition formula ID for action "%1$s".')
+				)),
+				'operator' => new CLimitedSetValidator(array(
+					'values' => $operators,
+					'messageInvalid' => _('Incorrect filter condition operator for action "%1$s".')
+				))
+			),
+			'required' => array('conditiontype', 'value'),
+			'postValidators' => array(
+				new CActionCondValidator()
+			),
+			'messageRequired' => _('No "%2$s" given for a filter condition of action "%1$s".'),
+			'messageUnsupported' => _('Unsupported parameter "%2$s" for a filter condition of action "%1$s".')
+		);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function applyQueryOutputOptions($tableName, $tableAlias, array $options, array $sqlParts) {
+		$sqlParts = parent::applyQueryOutputOptions($tableName, $tableAlias, $options, $sqlParts);
+
+		if ($options['countOutput'] === null) {
+			// add filter fields
+			if ($this->outputIsRequested('formula', $options['selectFilter'])
+				|| $this->outputIsRequested('eval_formula', $options['selectFilter'])
+				|| $this->outputIsRequested('conditions', $options['selectFilter'])) {
+
+				$sqlParts = $this->addQuerySelect('a.formula', $sqlParts);
+				$sqlParts = $this->addQuerySelect('a.evaltype', $sqlParts);
+			}
+			if ($this->outputIsRequested('evaltype', $options['selectFilter'])) {
+				$sqlParts = $this->addQuerySelect('a.evaltype', $sqlParts);
+			}
+		}
+
+		return $sqlParts;
+	}
+
+	/**
+	 * Converts a formula with letters to a formula with IDs and updates it.
+	 *
+	 * @param string 	$actionId
+	 * @param string 	$formulaWithLetters		formula with letters
+	 * @param array 	$conditions
+	 */
+	protected function updateFormula($actionId, $formulaWithLetters, array $conditions) {
+		$formulaIdToConditionId = array();
+
+		foreach ($conditions as $condition) {
+			$formulaIdToConditionId[$condition['formulaid']] = $condition['conditionid'];
+		}
+		$formula = CConditionHelper::replaceLetterIds($formulaWithLetters, $formulaIdToConditionId);
+
+		DB::updateByPk('actions', $actionId, array('formula' => $formula));
+	}
+
+	/**
+	 * Validate input given to action.create API call.
+	 *
+	 * @param $actions
+	 */
+	public function validateCreate($actions) {
+		$actionDbFields = array(
+			'name'        => null,
+			'eventsource' => null
+		);
+
+		$duplicates = array();
+		foreach ($actions as $action) {
+			if (!check_db_fields($actionDbFields, $action)) {
+				self::exception(
+					ZBX_API_ERROR_PARAMETERS,
+					_s('Incorrect parameter for action "%1$s".', $action['name'])
+				);
+			}
+			if (isset($action['esc_period']) && $action['esc_period'] < SEC_PER_MIN
+					&& $action['eventsource'] == EVENT_SOURCE_TRIGGERS) {
+
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+					'Action "%1$s" has incorrect value for "esc_period" (minimum %2$s seconds).',
+					$action['name'], SEC_PER_MIN
+				));
+			}
+			if (isset($duplicates[$action['name']])) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" already exists.', $action['name']));
+			}
+			else {
+				$duplicates[$action['name']] = $action['name'];
+			}
+		}
+
+		$dbActionsWithSameName = $this->get(array(
+			'filter' => array('name' => $duplicates),
+			'output' => API_OUTPUT_EXTEND,
+			'editable' => true,
+			'nopermissions' => true
+		));
+		if ($dbActionsWithSameName) {
+			$dbActionWithSameName = reset($dbActionsWithSameName);
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" already exists.', $dbActionWithSameName['name']));
+		}
+
+		$filterValidator = new CSchemaValidator($this->getFilterSchema());
+		$filterConditionValidator = new CSchemaValidator($this->getFilterConditionSchema());
+
+		$conditionsToValidate = array();
+		$operationsToValidate = array();
+
+		// Validate "filter" sections and "conditions" in them, ensure that "operations" section
+		// is present and is not empty. Also collect conditions and operations for more validation.
+		foreach ($actions as $action) {
+			if (isset($action['filter'])) {
+				$filterValidator->setObjectName($action['name']);
+				$this->checkValidator($action['filter'], $filterValidator);
+
+				foreach ($action['filter']['conditions'] as $condition) {
+					$filterConditionValidator->setObjectName($action['name']);
+					$this->checkValidator($condition, $filterConditionValidator);
+					$conditionsToValidate[] = $condition;
+				}
+			}
+
+			if (!isset($action['operations']) || empty($action['operations'])) {
+				self::exception(
+					ZBX_API_ERROR_PARAMETERS,
+					_s('Incorrect parameter for action "%1$s".', $action['name'])
+				);
+			}
+			else {
+				foreach ($action['operations'] as $operation) {
+					$operationsToValidate[] = $operation;
+				}
+			}
+		}
+
+		// Validate conditions and operations in regard to whats in database now.
+		if ($conditionsToValidate) {
+			$this->validateConditionsPermissions($conditionsToValidate);
+		}
+		$this->validateOperationsIntegrity($operationsToValidate);
+	}
+
+	/**
+	 * Validate input given to action.update API call.
+	 *
+	 * @param array $actions
+	 * @param array $actionsDb
+	 *
+	 * @internal param array $actionDb
+	 */
+	public function validateUpdate($actions, $actionsDb) {
+		foreach ($actions as $action) {
+			if (isset($action['actionid']) && !isset($actionsDb[$action['actionid']])) {
+				self::exception(
+					ZBX_API_ERROR_PERMISSIONS,
+					_('No permissions to referred object or it does not exist!')
+				);
+			}
+		}
+		$actions = zbx_toHash($actions, 'actionid');
+
+		// check fields
+		$duplicates = array();
+		foreach ($actions as $action) {
+			$actionName = isset($action['name']) ? $action['name'] : $actionsDb[$action['actionid']]['name'];
+
+			if (!check_db_fields(array('actionid' => null), $action)) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+					'Incorrect parameters for action update method "%1$s".', $actionName
+				));
+			}
+
+			// check if user changed esc_period for trigger eventsource
+			if (isset($action['esc_period'])
+					&& $action['esc_period'] < SEC_PER_MIN
+					&& $actionsDb[$action['actionid']]['eventsource'] == EVENT_SOURCE_TRIGGERS) {
+
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+					'Action "%1$s" has incorrect value for "esc_period" (minimum %2$s seconds).',
+					$actionName, SEC_PER_MIN
+				));
+			}
+
+			$this->checkNoParameters(
+				$action,
+				array('eventsource'),
+				_('Cannot update "%1$s" for action "%2$s".'),
+				$actionName
+			);
+
+			if (!isset($action['name'])) {
+				continue;
+			}
+
+			if (isset($duplicates[$action['name']])) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" already exists.', $action['name']));
+			}
+			else {
+				$duplicates[$action['name']] = $action['name'];
+			}
+		}
+
+		// Unset accidentally passed in "evaltype" and "formula" fields.
+		foreach ($actions as &$action) {
+			unset($action['evaltype'], $action['formula']);
+		}
+		unset($action);
+
+		$filterValidator = new CSchemaValidator($this->getFilterSchema());
+
+		$filterConditionValidator = new CSchemaValidator($this->getFilterConditionSchema());
+
+		$operationsToValidate = array();
+		$conditionsToValidate = array();
+
+		foreach ($actions as $actionId => $action) {
+			$actionDb = $actionsDb[$actionId];
+
+			if (isset($action['name'])) {
+				$actionName = $action['name'];
+
+				$actionExists = $this->get(array(
+					'filter' => array('name' => $actionName),
+					'output' => array('actionid'),
+					'editable' => true,
+					'nopermissions' => true,
+					'preservekeys' => true
+				));
+				if (($actionExists = reset($actionExists))
+					&& (bccomp($actionExists['actionid'], $actionId) != 0)
+				) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" already exists.', $actionName));
+				}
+			}
+			else {
+				$actionName = $actionDb['name'];
+			}
+
+			if (isset($action['filter'])) {
+				$actionFilter = $action['filter'];
+
+				$filterValidator->setObjectName($actionName);
+				$filterConditionValidator->setObjectName($actionName);
+
+				$this->checkValidator($actionFilter, $filterValidator);
+
+				foreach ($actionFilter['conditions'] as $condition) {
+					$this->checkValidator($condition, $filterConditionValidator);
+					$conditionsToValidate[] = $condition;
+				}
+			}
+
+			if (isset($action['operations']) && empty($action['operations'])) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Action "%1$s" no operations defined.', $actionName));
+			}
+			elseif (isset($action['operations'])) {
+				$operationsDb = $actionsDb[$action['actionid']]['operations'];
+				$operationsDb = zbx_toHash($operationsDb, 'operationid');
+				foreach ($action['operations'] as $operation) {
+					if (!isset($operation['operationid'])) {
+						$operationsToValidate[] = $operation;
+					}
+					elseif (isset($operationsDb[$operation['operationid']])) {
+						$operationsToValidate[] = $operation;
+					}
+					else {
+						self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect action operationid.'));
+					}
+				}
+			}
+		}
+
+		if ($conditionsToValidate) {
+			$this->validateConditionsPermissions($conditionsToValidate);
+		}
+		if ($operationsToValidate) {
+			$this->validateOperationsIntegrity($operationsToValidate);
+		}
+	}
+
+	/**
+	 * Check permissions to DB entities referenced by action conditions.
+	 *
+	 * @param array $conditions   conditions for which permissions to referenced DB entities will be checked
+	 */
+	protected function validateConditionsPermissions(array $conditions) {
+		$hostGroupIdsAll = array();
+		$templateIdsAll = array();
+		$triggerIdsAll = array();
+		$hostIdsAll = array();
+		$discoveryRuleIdsAll = array();
+		$discoveryCheckIdsAll = array();
+		$proxyIdsAll = array();
+
+		foreach ($conditions as $condition) {
+			$conditionValue = $condition['value'];
+			// validate condition values depending on condition type
+			switch ($condition['conditiontype']) {
+				case CONDITION_TYPE_HOST_GROUP:
+					$hostGroupIdsAll[$conditionValue] = $conditionValue;
+					break;
+
+				case CONDITION_TYPE_TEMPLATE:
+					$templateIdsAll[$conditionValue] = $conditionValue;
+					break;
+
+				case CONDITION_TYPE_TRIGGER:
+					$triggerIdsAll[$conditionValue] = $conditionValue;
+					break;
+
+				case CONDITION_TYPE_HOST:
+					$hostIdsAll[$conditionValue] = $conditionValue;
+					break;
+
+				case CONDITION_TYPE_DRULE:
+					$discoveryRuleIdsAll[$conditionValue] = $conditionValue;
+					break;
+
+				case CONDITION_TYPE_DCHECK:
+					$discoveryCheckIdsAll[$conditionValue] = $conditionValue;
+					break;
+
+				case CONDITION_TYPE_PROXY:
+					$proxyIdsAll[$conditionValue] = $conditionValue;
+					break;
+			}
+		}
+
+		if (!API::HostGroup()->isWritable($hostGroupIdsAll)) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_('Incorrect action condition host group. Host group does not exist or you have no access to it.')
+			);
+		}
+		if (!API::Host()->isWritable($hostIdsAll)) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_('Incorrect action condition host. Host does not exist or you have no access to it.')
+			);
+		}
+		if (!API::Template()->isWritable($templateIdsAll)) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_('Incorrect action condition template. Template does not exist or you have no access to it.')
+			);
+		}
+		if (!API::Trigger()->isWritable($triggerIdsAll)) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_('Incorrect action condition trigger. Trigger does not exist or you have no access to it.')
+			);
+		}
+		if (!API::DRule()->isWritable($discoveryRuleIdsAll)) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_('Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it.')
+			);
+		}
+		if (!API::DCheck()->isWritable($discoveryCheckIdsAll)) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_('Incorrect action condition discovery check. Discovery check does not exist or you have no access to it.')
+			);
+		}
+		if (!API::Proxy()->isWritable($proxyIdsAll)) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_('Incorrect action condition proxy. Proxy does not exist or you have no access to it.')
+			);
+		}
+	}
 }
diff --git a/frontends/php/api/classes/CAlert.php b/frontends/php/include/classes/api/services/CAlert.php
index 9ea54b74206..abf334595f0 100644
--- a/frontends/php/api/classes/CAlert.php
+++ b/frontends/php/include/classes/api/services/CAlert.php
@@ -118,7 +118,7 @@ class CAlert extends CApiService {
 						' AND i.hostid=hgg.hostid'.
 					' GROUP BY f.triggerid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-					' AND MAX(r.permission)>='.$permission.
+					' AND MAX(r.permission)>='.zbx_dbstr($permission).
 				')';
 			}
 			// items and LLD rules
@@ -137,7 +137,7 @@ class CAlert extends CApiService {
 						' AND i.hostid=hgg.hostid'.
 					' GROUP BY hgg.hostid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-					' AND MAX(r.permission)>='.$permission.
+					' AND MAX(r.permission)>='.zbx_dbstr($permission).
 				')';
 			}
 		}
@@ -328,14 +328,14 @@ class CAlert extends CApiService {
 	 * @return void
 	 */
 	protected function validateGet(array $options) {
-		$sourceValidator = new CSetValidator(array(
+		$sourceValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(eventSource())
 		));
 		if (!$sourceValidator->validate($options['eventsource'])) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect eventsource value.'));
 		}
 
-		$objectValidator = new CSetValidator(array(
+		$objectValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(eventObject())
 		));
 		if (!$objectValidator->validate($options['eventobject'])) {
diff --git a/frontends/php/api/classes/CApplication.php b/frontends/php/include/classes/api/services/CApplication.php
index 21343a2362f..63bd37e9058 100644
--- a/frontends/php/api/classes/CApplication.php
+++ b/frontends/php/include/classes/api/services/CApplication.php
@@ -108,7 +108,7 @@ class CApplication extends CApiService {
 					' WHERE a.hostid=hgg.hostid'.
 					' GROUP BY hgg.hostid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-						' AND MAX(r.permission)>='.$permission.
+						' AND MAX(r.permission)>='.zbx_dbstr($permission).
 					')';
 		}
 
@@ -237,11 +237,21 @@ class CApplication extends CApiService {
 		return $result;
 	}
 
+	/**
+	 * Check if application exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('application.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('hostid', 'host'), 'name'), $object),
 			'output' => array('applicationid'),
-			'nopermissions' => 1,
 			'limit' => 1
 		));
 
@@ -551,7 +561,7 @@ class CApplication extends CApiService {
 					'SELECT a1.applicationid'.
 					' FROM applications a1,applications a2'.
 					' WHERE a1.name=a2.name'.
-						' AND a1.hostid='.$child['hostid'].
+						' AND a1.hostid='.zbx_dbstr($child['hostid']).
 						' AND '.dbConditionInt('a2.applicationid', $applicationIds)
 				);
 
diff --git a/frontends/php/api/classes/CConfiguration.php b/frontends/php/include/classes/api/services/CConfiguration.php
index 6fbde7dee1b..c97a46f5c7d 100644
--- a/frontends/php/api/classes/CConfiguration.php
+++ b/frontends/php/include/classes/api/services/CConfiguration.php
@@ -73,7 +73,14 @@ class CConfiguration extends CApiService {
 	 */
 	public function import($params) {
 		$importReader = CImportReaderFactory::getReader($params['format']);
-		$configurationImport = new CConfigurationImport($params['source'], $params['rules']);
+
+		$configurationImport = new CConfigurationImport(
+			$params['source'],
+			$params['rules'],
+			new CImportReferencer(),
+			new CImportedObjectContainer(),
+			new CTriggerExpression()
+		);
 		$configurationImport->setReader($importReader);
 
 		return $configurationImport->import();
diff --git a/frontends/php/api/classes/CDCheck.php b/frontends/php/include/classes/api/services/CDCheck.php
index b24d6e16f15..b24d6e16f15 100644
--- a/frontends/php/api/classes/CDCheck.php
+++ b/frontends/php/include/classes/api/services/CDCheck.php
diff --git a/frontends/php/api/classes/CDHost.php b/frontends/php/include/classes/api/services/CDHost.php
index cc8c07fbd75..30d7169647f 100644
--- a/frontends/php/api/classes/CDHost.php
+++ b/frontends/php/include/classes/api/services/CDHost.php
@@ -182,11 +182,21 @@ class CDHost extends CApiService {
 	return $result;
 	}
 
+	/**
+	 * Check if discovered host exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('dhost.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('dhostid')), $object),
 			'output' => array('dhostid'),
-			'nopermissions' => 1,
 			'limit' => 1
 		));
 
diff --git a/frontends/php/api/classes/CDRule.php b/frontends/php/include/classes/api/services/CDRule.php
index df112bbd078..917ee480f3f 100644
--- a/frontends/php/api/classes/CDRule.php
+++ b/frontends/php/include/classes/api/services/CDRule.php
@@ -166,12 +166,21 @@ class CDRule extends CApiService {
 	return $result;
 	}
 
-
+	/**
+	 * Check if discovery rule exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists(array $object) {
+		$this->deprecated('drule.exists method is deprecated.');
+
 		$options = array(
 			'filter' => array(),
 			'output' => array('druleid'),
-			'nopermissions' => 1,
 			'limit' => 1
 		);
 		if (isset($object['name'])) $options['filter']['name'] = $object['name'];
@@ -239,7 +248,15 @@ class CDRule extends CApiService {
 		$uniq = 0;
 
 		foreach ($dChecks as $dcnum => $dCheck) {
-			if (isset($dCheck['uniq']) && ($dCheck['uniq'] == 1)) $uniq++;
+			if (isset($dCheck['uniq']) && ($dCheck['uniq'] == 1)) {
+				if (!in_array($dCheck['type'], array(SVC_AGENT, SVC_SNMPv1, SVC_SNMPv2c, SVC_SNMPv3))) {
+					self::exception(ZBX_API_ERROR_PARAMETERS,
+						_s('Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique.')
+					);
+				}
+
+				$uniq++;
+			}
 
 			if (isset($dCheck['ports']) && !validate_port_list($dCheck['ports'])) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect port range.'));
@@ -385,15 +402,26 @@ class CDRule extends CApiService {
 	 * @return array
 	 */
 	public function create(array $dRules) {
-
 		$this->checkInput($dRules);
 		$this->validateRequiredFields($dRules, __FUNCTION__);
 
+		// check host name duplicates
+		$collectionValidator = new CCollectionValidator(array(
+			'uniqueField' => 'name',
+			'messageDuplicate' => _('Discovery rule "%1$s" already exists.')
+		));
+		$this->checkValidator($dRules, $collectionValidator);
+
 		// checking to the duplicate names
-		foreach ($dRules as $dRule) {
-			if ($this->exists($dRule)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Discovery rule "%s" already exists.', $dRule['name']));
-			}
+		$dbDRules = API::getApiService()->select($this->tableName(), array(
+			'output' => array('name'),
+			'filter' => array('name' => zbx_objectValues($dRules, 'name')),
+			'limit' => 1
+		));
+
+		if ($dbDRules) {
+			$dbDRule = reset($dbDRules);
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Discovery rule "%1$s" already exists.', $dbDRule['name']));
 		}
 
 		$druleids = DB::insert('drules', $dRules);
@@ -455,16 +483,45 @@ class CDRule extends CApiService {
 
 		$defaultValues = DB::getDefaults('dchecks');
 
-		$dRulesUpdate = $dCheckIdsDelete = $dChecksCreate = array();
+		$dRulesUpdate = array();
+		$dCheckIdsDelete = array();
+		$dChecksCreate = array();
+		$dRuleNamesChanged = array();
 
+		// validate drule duplicate names
 		foreach ($dRules as $dRule) {
-			// validate drule duplicate names
-			if (strcmp($dRulesDb[$dRule['druleid']]['name'], $dRule['name']) != 0) {
-				if ($this->exists($dRule)) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Discovery rule "%s" already exists.', $dRule['name']));
+			if (!isset($dRulesDb[$dRule['druleid']])) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _('No permissions to referred object or it does not exist!'));
+			}
+
+			if ($dRulesDb[$dRule['druleid']]['name'] !== $dRule['name']) {
+				if (isset($dRuleNamesChanged[$dRule['name']])) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Discovery rule "%1$s" already exists.',
+						$dRule['name']
+					));
+				}
+				else {
+					$dRuleNamesChanged[$dRule['name']] = $dRule['name'];
 				}
 			}
+		}
+
+		if ($dRuleNamesChanged) {
+			$dbDRules = API::getApiService()->select($this->tableName(), array(
+				'output' => array('name'),
+				'filter' => array('name' => $dRuleNamesChanged),
+				'limit' => 1
+			));
+
+			if ($dbDRules) {
+				$dbDRule = reset($dbDRules);
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Discovery rule "%1$s" already exists.',
+					$dbDRule['name']
+				));
+			}
+		}
 
+		foreach ($dRules as $dRule) {
 			$dRulesUpdate[] = array(
 				'values' => $dRule,
 				'where' => array('druleid' => $dRule['druleid'])
@@ -474,28 +531,29 @@ class CDRule extends CApiService {
 			$dbChecks = $dRulesDb[$dRule['druleid']]['dchecks'];
 
 			$newChecks = array();
+			$oldChecks = array();
 
-			foreach ($dRule['dchecks'] as $cnum => $check) {
-				if (!isset($check['druleid'])) {
-					$check['druleid'] = $dRule['druleid'];
-					unset($check['dcheckid']);
+			foreach ($dRule['dchecks'] as $check) {
+				$check['druleid'] = $dRule['druleid'];
 
+				if (!isset($check['dcheckid'])) {
 					$newChecks[] = array_merge($defaultValues, $check);
-
-					unset($dRule['dchecks'][$cnum]);
+				}
+				else {
+					$oldChecks[] = $check;
 				}
 			}
 
 			$delDCheckIds = array_diff(
 				zbx_objectValues($dbChecks, 'dcheckid'),
-				zbx_objectValues($dRule['dchecks'], 'dcheckid')
+				zbx_objectValues($oldChecks, 'dcheckid')
 			);
 
 			if ($delDCheckIds) {
 				$this->deleteActionConditions($delDCheckIds);
 			}
 
-			DB::replace('dchecks', $dbChecks, array_merge($dRule['dchecks'], $newChecks));
+			DB::replace('dchecks', $dbChecks, array_merge($oldChecks, $newChecks));
 		}
 
 		DB::update('drules', $dRulesUpdate);
@@ -506,46 +564,55 @@ class CDRule extends CApiService {
 	/**
 	 * Delete drules.
 	 *
-	 * @param array $druleIds
+	 * @param array $dRuleIds
 	 *
 	 * @return array
 	 */
-	public function delete(array $druleIds) {
-		$this->validateDelete($druleIds);
+	public function delete(array $dRuleIds) {
+		$this->validateDelete($dRuleIds);
 
 		$actionIds = array();
+		$conditionIds = array();
 
-		$dbActions = DBselect(
-			'SELECT DISTINCT actionid'.
-			' FROM conditions'.
-			' WHERE conditiontype='.CONDITION_TYPE_DRULE.
-				' AND '.dbConditionString('value', $druleIds).
-			' ORDER BY actionid'
+		$dCheckIds = array();
+
+		$dbChecks = DBselect('SELECT dc.dcheckid FROM dchecks dc WHERE '.dbConditionInt('dc.druleid', $dRuleIds));
+
+		while ($dbCheck = DBfetch($dbChecks)) {
+			$dCheckIds[] = $dbCheck['dcheckid'];
+		}
+
+		$dbConditions = DBselect(
+			'SELECT c.conditionid,c.actionid'.
+			' FROM conditions c'.
+			' WHERE (c.conditiontype='.CONDITION_TYPE_DRULE.' AND '.dbConditionString('c.value', $dRuleIds).')'.
+				' OR (c.conditiontype='.CONDITION_TYPE_DCHECK.' AND '.dbConditionString('c.value', $dCheckIds).')'
 		);
-		while ($dbAction = DBfetch($dbActions)) {
-			$actionIds[] = $dbAction['actionid'];
+
+		while ($dbCondition = DBfetch($dbConditions)) {
+			$conditionIds[] = $dbCondition['conditionid'];
+			$actionIds[] = $dbCondition['actionid'];
 		}
 
 		if ($actionIds) {
 			DB::update('actions', array(
 				'values' => array('status' => ACTION_STATUS_DISABLED),
-				'where' => array('actionid' => $actionIds),
+				'where' => array('actionid' => array_unique($actionIds))
 			));
+		}
 
-			DB::delete('conditions', array(
-				'conditiontype' => CONDITION_TYPE_DRULE,
-				'value' => $druleIds
-			));
+		if ($conditionIds) {
+			DB::delete('conditions', array('conditionid' => $conditionIds));
 		}
 
-		$result = DB::delete('drules', array('druleid' => $druleIds));
+		$result = DB::delete('drules', array('druleid' => $dRuleIds));
 		if ($result) {
-			foreach ($druleIds as $druleId) {
-				add_audit(AUDIT_ACTION_DELETE, AUDIT_RESOURCE_DISCOVERY_RULE, '['.$druleId.']');
+			foreach ($dRuleIds as $dRuleId) {
+				add_audit(AUDIT_ACTION_DELETE, AUDIT_RESOURCE_DISCOVERY_RULE, '['.$dRuleId.']');
 			}
 		}
 
-		return array('druleids' => $druleIds);
+		return array('druleids' => $dRuleIds);
 	}
 
 	/**
diff --git a/frontends/php/api/classes/CDService.php b/frontends/php/include/classes/api/services/CDService.php
index c89070e9005..e7041d75fc9 100644
--- a/frontends/php/api/classes/CDService.php
+++ b/frontends/php/include/classes/api/services/CDService.php
@@ -203,11 +203,21 @@ class CDService extends CApiService {
 	return $result;
 	}
 
+	/**
+	 * Check if discovered service exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('dservice.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('dserviceid')), $object),
 			'output' => array('dserviceid'),
-			'nopermissions' => 1,
 			'limit' => 1
 		));
 
diff --git a/frontends/php/api/classes/CDiscoveryRule.php b/frontends/php/include/classes/api/services/CDiscoveryRule.php
index f6c935204ab..57674c8a3a8 100644
--- a/frontends/php/api/classes/CDiscoveryRule.php
+++ b/frontends/php/include/classes/api/services/CDiscoveryRule.php
@@ -111,7 +111,7 @@ class CDiscoveryRule extends CItemGeneral {
 				' WHERE i.hostid=hgg.hostid'.
 				' GROUP BY hgg.hostid'.
 				' HAVING MIN(r.permission)>'.PERM_DENY.
-					' AND MAX(r.permission)>='.$permission.
+					' AND MAX(r.permission)>='.zbx_dbstr($permission).
 				')';
 		}
 
@@ -272,11 +272,21 @@ class CDiscoveryRule extends CItemGeneral {
 		return $result;
 	}
 
+	/**
+	 * Check if low-level discovery rule exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('discoveryrule.exists method is deprecated.');
+
 		$options = array(
 			'filter' => array('key_' => $object['key_']),
 			'output' => array('itemid'),
-			'nopermissions' => true,
 			'limit' => 1
 		);
 
@@ -825,7 +835,7 @@ class CDiscoveryRule extends CItemGeneral {
 	protected function getFilterSchema() {
 		return array(
 			'validators' => array(
-				'evaltype' => new CSetValidator(array(
+				'evaltype' => new CLimitedSetValidator(array(
 					'values' => array(
 						CONDITION_EVAL_TYPE_OR,
 						CONDITION_EVAL_TYPE_AND,
@@ -876,7 +886,7 @@ class CDiscoveryRule extends CItemGeneral {
 					'messageEmpty' => _('Empty filter condition formula ID for discovery rule "%1$s".'),
 					'messageRegex' => _('Incorrect filter condition formula ID for discovery rule "%1$s".')
 				)),
-				'operator' => new CSetValidator(array(
+				'operator' => new CLimitedSetValidator(array(
 					'values' => array(CONDITION_OPERATOR_REGEXP),
 					'messageInvalid' => _('Incorrect filter condition operator for discovery rule "%1$s".')
 				))
diff --git a/frontends/php/api/classes/CEvent.php b/frontends/php/include/classes/api/services/CEvent.php
index d97923a3e87..e44cc7c4ae2 100644
--- a/frontends/php/api/classes/CEvent.php
+++ b/frontends/php/include/classes/api/services/CEvent.php
@@ -150,7 +150,7 @@ class CEvent extends CApiService {
 								' AND i.hostid=hgg.hostid'.
 							' GROUP BY f.triggerid'.
 							' HAVING MIN(r.permission)>'.PERM_DENY.
-								' AND MAX(r.permission)>='.$permission.
+								' AND MAX(r.permission)>='.zbx_dbstr($permission).
 							')';
 				}
 			}
@@ -188,7 +188,7 @@ class CEvent extends CApiService {
 								' AND i.hostid=hgg.hostid'.
 							' GROUP BY hgg.hostid'.
 							' HAVING MIN(r.permission)>'.PERM_DENY.
-								' AND MAX(r.permission)>='.$permission.
+								' AND MAX(r.permission)>='.zbx_dbstr($permission).
 							')';
 				}
 			}
@@ -356,14 +356,14 @@ class CEvent extends CApiService {
 	 * @return void
 	 */
 	protected function validateGet(array $options) {
-		$sourceValidator = new CSetValidator(array(
+		$sourceValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(eventSource())
 		));
 		if (!$sourceValidator->validate($options['source'])) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect source value.'));
 		}
 
-		$objectValidator = new CSetValidator(array(
+		$objectValidator = new CLimitedSetValidator(array(
 			'values' => array_keys(eventObject())
 		));
 		if (!$objectValidator->validate($options['object'])) {
diff --git a/frontends/php/api/classes/CGraph.php b/frontends/php/include/classes/api/services/CGraph.php
index 3b02311a33d..fc432441341 100644
--- a/frontends/php/api/classes/CGraph.php
+++ b/frontends/php/include/classes/api/services/CGraph.php
@@ -90,6 +90,7 @@ class CGraph extends CGraphGeneral {
 			'selectItems'				=> null,
 			'selectGraphItems'			=> null,
 			'selectDiscoveryRule'		=> null,
+			'selectGraphDiscovery'		=> null,
 			'countOutput'				=> null,
 			'groupCount'				=> null,
 			'preservekeys'				=> null,
@@ -116,7 +117,7 @@ class CGraph extends CGraphGeneral {
 					' AND gi.itemid=i.itemid'.
 					' AND i.hostid=hgg.hostid'.
 				' GROUP BY i.hostid'.
-				' HAVING MAX(permission)<'.$permission.
+				' HAVING MAX(permission)<'.zbx_dbstr($permission).
 					' OR MIN(permission) IS NULL'.
 					' OR MIN(permission)='.PERM_DENY.
 				')';
@@ -131,7 +132,7 @@ class CGraph extends CGraphGeneral {
 					' AND g.ymin_itemid=i.itemid'.
 					' AND i.hostid=hgg.hostid'.
 				' GROUP BY i.hostid'.
-				' HAVING MAX(permission)<'.$permission.
+				' HAVING MAX(permission)<'.zbx_dbstr($permission).
 					' OR MIN(permission) IS NULL'.
 					' OR MIN(permission)='.PERM_DENY.
 				')';
@@ -146,7 +147,7 @@ class CGraph extends CGraphGeneral {
 					' AND g.ymax_itemid=i.itemid'.
 					' AND i.hostid=hgg.hostid'.
 				' GROUP BY i.hostid'.
-				' HAVING MAX(permission)<'.$permission.
+				' HAVING MAX(permission)<'.zbx_dbstr($permission).
 					' OR MIN(permission) IS NULL'.
 					' OR MIN(permission)='.PERM_DENY.
 				')';
@@ -392,9 +393,24 @@ class CGraph extends CGraphGeneral {
 			));
 
 			if ($chdGraph = reset($chdGraphs)) {
-				if (zbx_strtolower($tmpGraph['name']) != zbx_strtolower($chdGraph['name'])
-						&& $this->exists(array('name' => $tmpGraph['name'], 'hostids' => $chdHost['hostid']))){
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Graph "%1$s" already exists on "%2$s".', $tmpGraph['name'], $chdHost['host']));
+				if ($tmpGraph['name'] !== $chdGraph['name']) {
+					$graphExists = $this->get(array(
+						'output' => array('graphid'),
+						'hostids' => $chdHost['hostid'],
+						'filter' => array(
+							'name' => $tmpGraph['name'],
+							'flags' => null
+						),
+						'nopermissions' => true,
+						'limit' => 1
+					));
+					if ($graphExists) {
+						self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+							'Graph "%1$s" already exists on "%2$s".',
+							$tmpGraph['name'],
+							$chdHost['host']
+						));
+					}
 				}
 				elseif ($chdGraph['flags'] != $tmpGraph['flags']) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _('Graph with same name but other type exist.'));
@@ -608,6 +624,21 @@ class CGraph extends CGraphGeneral {
 			$result = $relationMap->mapOne($result, $discoveryRules, 'discoveryRule');
 		}
 
+		// adding graph discovery
+		if ($options['selectGraphDiscovery'] !== null) {
+			$graphDiscoveries = API::getApiService()->select('graph_discovery', array(
+				'output' => $this->outputExtend($options['selectGraphDiscovery'], array('graphid')),
+				'filter' => array('graphid' => array_keys($result)),
+				'preservekeys' => true
+			));
+			$relationMap = $this->createRelationMap($graphDiscoveries, 'graphid', 'graphid');
+
+			$graphDiscoveries = $this->unsetExtraFields($graphDiscoveries, array('graphid'),
+				$options['selectGraphDiscovery']
+			);
+			$result = $relationMap->mapOne($result, $graphDiscoveries, 'graphDiscovery');
+		}
+
 		return $result;
 	}
 
diff --git a/frontends/php/api/classes/CGraphGeneral.php b/frontends/php/include/classes/api/services/CGraphGeneral.php
index f788cd9fe7d..f6c3a223635 100644
--- a/frontends/php/api/classes/CGraphGeneral.php
+++ b/frontends/php/include/classes/api/services/CGraphGeneral.php
@@ -242,17 +242,20 @@ abstract class CGraphGeneral extends CApiService {
 	}
 
 	/**
-	 * Check if object exist.
+	 * Check if graph or graph prototype exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
 	 *
 	 * @param array $object
 	 *
 	 * @return bool
 	 */
 	public function exists($object) {
+		$this->deprecated('graph.exists method is deprecated.');
+
 		$options = array(
 			'filter' => array('flags' => null),
 			'output' => array('graphid'),
-			'nopermissions' => true,
 			'limit' => 1
 		);
 
@@ -757,7 +760,7 @@ abstract class CGraphGeneral extends CApiService {
 				}
 			}
 
-			// cheks that there is no two graphs with the same name within host
+			// checks that there are no two graphs with the same name within host
 			foreach ($hostAndTemplateIds as $id) {
 				if (!isset($graphNames[$graph['name']])) {
 					$graphNames[$graph['name']] = array();
diff --git a/frontends/php/api/classes/CGraphItem.php b/frontends/php/include/classes/api/services/CGraphItem.php
index 86bd0a50d15..b420bc914c9 100644
--- a/frontends/php/api/classes/CGraphItem.php
+++ b/frontends/php/include/classes/api/services/CGraphItem.php
@@ -83,7 +83,7 @@ class CGraphItem extends CApiService {
 						' AND i.hostid=hgg.hostid'.
 					' GROUP BY i.itemid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-						' AND MAX(r.permission)>='.$permission.
+						' AND MAX(r.permission)>='.zbx_dbstr($permission).
 					')';
 		}
 
diff --git a/frontends/php/api/classes/CGraphPrototype.php b/frontends/php/include/classes/api/services/CGraphPrototype.php
index 42969e814cb..179fa62fe1f 100644
--- a/frontends/php/api/classes/CGraphPrototype.php
+++ b/frontends/php/include/classes/api/services/CGraphPrototype.php
@@ -116,7 +116,7 @@ class CGraphPrototype extends CGraphGeneral {
 					' AND gi.itemid=i.itemid'.
 					' AND i.hostid=hgg.hostid'.
 				' GROUP BY i.hostid'.
-				' HAVING MAX(permission)<'.$permission.
+				' HAVING MAX(permission)<'.zbx_dbstr($permission).
 					' OR MIN(permission) IS NULL'.
 					' OR MIN(permission)='.PERM_DENY.
 				')';
@@ -403,11 +403,24 @@ class CGraphPrototype extends CGraphGeneral {
 			));
 
 			if ($chdGraph = reset($chdGraphs)) {
-				if (zbx_strtolower($tmpGraph['name']) != zbx_strtolower($chdGraph['name'])
-						&& $this->exists(array('name' => $tmpGraph['name'], 'hostids' => $chdHost['hostid']))) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Graph "%1$s" already exists on "%2$s".', $tmpGraph['name'], $chdHost['host'])
-					);
+				if ($tmpGraph['name'] !== $chdGraph['name']) {
+					$graphExists = $this->get(array(
+						'output' => array('graphid'),
+						'hostids' => $chdHost['hostid'],
+						'filter' => array(
+							'name' => $tmpGraph['name'],
+							'flags' => null
+						),
+						'nopermissions' => true,
+						'limit' => 1
+					));
+					if ($graphExists) {
+						self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+							'Graph "%1$s" already exists on "%2$s".',
+							$tmpGraph['name'],
+							$chdHost['host']
+						));
+					}
 				}
 				elseif ($chdGraph['flags'] != $tmpGraph['flags']) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _('Graph with same name but other type exist.'));
@@ -569,6 +582,11 @@ class CGraphPrototype extends CGraphGeneral {
 			}
 		}
 
+		DB::delete('screens_items', array(
+			'resourceid' => $graphids,
+			'resourcetype' => SCREEN_RESOURCE_LLD_GRAPH
+		));
+
 		DB::delete('graphs', array('graphid' => $graphids));
 
 		foreach ($delGraphs as $graph) {
@@ -705,7 +723,7 @@ class CGraphPrototype extends CGraphGeneral {
 			'itemids' => $itemIds,
 			'webitems' => true,
 			'editable' => true,
-			'output' => array('name', 'value_type', 'flags'),
+			'output' => array('itemid', 'name', 'value_type', 'flags'),
 			'selectItemDiscovery' => array('parent_itemid'),
 			'preservekeys' => true,
 			'filter' => array(
@@ -727,9 +745,15 @@ class CGraphPrototype extends CGraphGeneral {
 
 		foreach ($allowedItems as $item) {
 			if (!in_array($item['value_type'], $allowedValueTypes)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Cannot add a non-numeric item "%1$s" to graph prototype "%2$s".', $item['name'], $graph['name'])
-				);
+				foreach ($dbGraphs as $dbGraph) {
+					$itemIdsInGraphItems = zbx_objectValues($dbGraph['gitems'], 'itemid');
+					if (in_array($item['itemid'], $itemIdsInGraphItems)) {
+						self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+							'Cannot add a non-numeric item "%1$s" to graph prototype "%2$s".',
+							$item['name'], $dbGraph['name']
+						));
+					}
+				}
 			}
 		}
 	}
diff --git a/frontends/php/api/classes/CHistory.php b/frontends/php/include/classes/api/services/CHistory.php
index 1ec5f02a656..1ec5f02a656 100644
--- a/frontends/php/api/classes/CHistory.php
+++ b/frontends/php/include/classes/api/services/CHistory.php
diff --git a/frontends/php/api/classes/CHost.php b/frontends/php/include/classes/api/services/CHost.php
index b3e8e32d648..27843cf6b02 100644
--- a/frontends/php/api/classes/CHost.php
+++ b/frontends/php/include/classes/api/services/CHost.php
@@ -152,7 +152,7 @@ class CHost extends CHostGeneral {
 					' WHERE h.hostid=hgg.hostid'.
 					' GROUP BY hgg.hostid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-						' AND MAX(r.permission)>='.$permission.
+						' AND MAX(r.permission)>='.zbx_dbstr($permission).
 					')';
 		}
 
@@ -477,11 +477,21 @@ class CHost extends CHostGeneral {
 		));
 	}
 
+	/**
+	 * Check if host exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('host.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('hostid', 'host', 'name')), $object),
 			'output' => array('hostid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
@@ -534,7 +544,7 @@ class CHost extends CHostGeneral {
 		$inventoryFields = getHostInventories();
 		$inventoryFields = zbx_objectValues($inventoryFields, 'db_field');
 
-		$statusValidator = new CSetValidator(array(
+		$statusValidator = new CLimitedSetValidator(array(
 			'values' => array(HOST_STATUS_MONITORED, HOST_STATUS_NOT_MONITORED),
 			'messageInvalid' => _('Incorrect status for host "%1$s".')
 		));
@@ -567,7 +577,7 @@ class CHost extends CHostGeneral {
 			}
 
 			$updateDiscoveredValidator = new CUpdateDiscoveredValidator(array(
-				'allowed' => array('hostid', 'status', 'inventory'),
+				'allowed' => array('hostid', 'status', 'inventory', 'description'),
 				'messageAllowedField' => _('Cannot update "%1$s" for a discovered host.')
 			));
 			if ($update) {
@@ -608,20 +618,6 @@ class CHost extends CHostGeneral {
 			}
 
 			if (isset($host['host'])) {
-				// Check if host name isn't longer than 64 chars
-				if (zbx_strlen($host['host']) > 64) {
-					self::exception(
-						ZBX_API_ERROR_PARAMETERS,
-						_n(
-							'Maximum host name length is %1$d characters, "%2$s" is %3$d character.',
-							'Maximum host name length is %1$d characters, "%2$s" is %3$d characters.',
-							64,
-							$host['host'],
-							zbx_strlen($host['host'])
-						)
-					);
-				}
-
 				if (!preg_match('/^'.ZBX_PREG_HOST_FORMAT.'$/', $host['host'])) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect characters used for host name "%s".', $host['host']));
 				}
@@ -644,20 +640,6 @@ class CHost extends CHostGeneral {
 					}
 				}
 
-				// Check if visible name isn't longer than 64 chars
-				if (zbx_strlen($host['name']) > 64) {
-					self::exception(
-						ZBX_API_ERROR_PARAMETERS,
-						_n(
-							'Maximum visible host name length is %1$d characters, "%2$s" is %3$d character.',
-							'Maximum visible host name length is %1$d characters, "%2$s" is %3$d characters.',
-							64,
-							$host['name'],
-							zbx_strlen($host['name'])
-						)
-					);
-				}
-
 				if (isset($hostNames['name'][$host['name']])) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Duplicate host. Host with the same visible name "%s" already exists in data.', $host['name']));
 				}
@@ -732,6 +714,7 @@ class CHost extends CHostGeneral {
 	 * @param int    $hosts ['useip'] Use IP. OPTIONAL
 	 * @param string $hosts ['dns'] DNS. OPTIONAL
 	 * @param string $hosts ['ip'] IP. OPTIONAL
+	 * @param int    $hosts ['bulk'] bulk. OPTIONAL
 	 * @param int    $hosts ['proxy_hostid'] Proxy Host ID. OPTIONAL
 	 * @param int    $hosts ['ipmi_authtype'] IPMI authentication type. OPTIONAL
 	 * @param int    $hosts ['ipmi_privilege'] IPMI privilege. OPTIONAL
@@ -809,6 +792,7 @@ class CHost extends CHostGeneral {
 	 * @param int    $hosts ['useip'] Use IP. OPTIONAL
 	 * @param string $hosts ['dns'] DNS. OPTIONAL
 	 * @param string $hosts ['ip'] IP. OPTIONAL
+	 * @param int    $hosts ['bulk'] bulk. OPTIONAL
 	 * @param int    $hosts ['proxy_hostid'] Proxy Host ID. OPTIONAL
 	 * @param int    $hosts ['ipmi_authtype'] IPMI authentication type. OPTIONAL
 	 * @param int    $hosts ['ipmi_privilege'] IPMI privilege. OPTIONAL
@@ -849,9 +833,6 @@ class CHost extends CHostGeneral {
 				$host['inventory'] = $inventory;
 			}
 
-			API::HostInterface()->replaceHostInterfaces($host);
-			unset($host['interfaces']);
-
 			if (isset($host['macros'])) {
 				$macros[$host['hostid']] = $host['macros'];
 				unset($host['macros']);
@@ -927,6 +908,7 @@ class CHost extends CHostGeneral {
 	 * @param int    $hosts['fields']['useip']			Use IP. OPTIONAL
 	 * @param string $hosts['fields']['dns']			DNS. OPTIONAL
 	 * @param string $hosts['fields']['ip']				IP. OPTIONAL
+	 * @param int    $hosts['fields']['bulk']			bulk. OPTIONAL
 	 * @param int    $hosts['fields']['proxy_hostid']	Proxy Host ID. OPTIONAL
 	 * @param int    $hosts['fields']['ipmi_authtype']	IPMI authentication type. OPTIONAL
 	 * @param int    $hosts['fields']['ipmi_privilege']	IPMI privilege. OPTIONAL
@@ -938,18 +920,18 @@ class CHost extends CHostGeneral {
 	public function massUpdate($data) {
 		$hosts = zbx_toArray($data['hosts']);
 		$inputHostIds = zbx_objectValues($hosts, 'hostid');
-		$hostids = array_unique($inputHostIds);
+		$hostIds = array_unique($inputHostIds);
 
-		sort($hostids);
+		sort($hostIds);
 
-		$updHosts = $this->get(array(
-			'hostids' => $hostids,
+		$dbHosts = $this->get(array(
+			'hostids' => $hostIds,
 			'editable' => true,
-			'output' => API_OUTPUT_EXTEND,
+			'output' => array('hostid'),
 			'preservekeys' => true,
 		));
 		foreach ($hosts as $host) {
-			if (!isset($updHosts[$host['hostid']])) {
+			if (!isset($dbHosts[$host['hostid']])) {
 				self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
 			}
 		}
@@ -979,20 +961,26 @@ class CHost extends CHostGeneral {
 
 			$curHost = reset($hosts);
 
-			$hostExists = $this->get(array(
-				'filter' => array('host' => $curHost['host']),
+			$sameHostnameHost = $this->get(array(
 				'output' => array('hostid'),
-				'editable' => true,
-				'nopermissions' => true
+				'filter' => array('host' => $data['host']),
+				'nopermissions' => true,
+				'limit' => 1
 			));
-			$hostExist = reset($hostExists);
-			if ($hostExist && (bccomp($hostExist['hostid'], $curHost['hostid']) != 0)) {
+			$sameHostnameHost = reset($sameHostnameHost);
+			if ($sameHostnameHost && (bccomp($sameHostnameHost['hostid'], $curHost['hostid']) != 0)) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Host "%1$s" already exists.', $data['host']));
 			}
 
 			// can't add host with the same name as existing template
-			if (API::Template()->exists(array('host' => $curHost['host']))) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Template "%1$s" already exists.', $curHost['host']));
+			$sameHostnameTemplate = API::Template()->get(array(
+				'output' => array('templateid'),
+				'filter' => array('host' => $data['host']),
+				'nopermissions' => true,
+				'limit' => 1
+			));
+			if ($sameHostnameTemplate) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Template "%1$s" already exists.', $data['host']));
 			}
 		}
 
@@ -1004,7 +992,10 @@ class CHost extends CHostGeneral {
 			$updateInterfaces = $data['interfaces'];
 		}
 
-		if (isset($data['templates_clear'])) {
+		$b = isset($data['templates_clear']);
+		$c = array_key_exists('templates_clear', $data);
+		$d = array_keys($data);
+		if ($b) {
 			$updateTemplatesClear = zbx_toArray($data['templates_clear']);
 		}
 
@@ -1043,12 +1034,12 @@ class CHost extends CHostGeneral {
 		if (!zbx_empty($data)) {
 			DB::update('hosts', array(
 				'values' => $data,
-				'where' => array('hostid' => $hostids)
+				'where' => array('hostid' => $hostIds)
 			));
 		}
 
 		if (isset($updateStatus)) {
-			updateHostStatus($hostids, $updateStatus);
+			updateHostStatus($hostIds, $updateStatus);
 		}
 
 		/*
@@ -1059,10 +1050,10 @@ class CHost extends CHostGeneral {
 
 			$hostGroups = API::HostGroup()->get(array(
 				'output' => array('groupid'),
-				'hostids' => $hostids
+				'hostids' => $hostIds
 			));
-			$hostGroupids = zbx_objectValues($hostGroups, 'groupid');
-			$newGroupids = zbx_objectValues($updateGroups, 'groupid');
+			$hostGroupIds = zbx_objectValues($hostGroups, 'groupid');
+			$newGroupIds = zbx_objectValues($updateGroups, 'groupid');
 
 			$result = $this->massAdd(array(
 				'hosts' => $hosts,
@@ -1072,12 +1063,12 @@ class CHost extends CHostGeneral {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot create host group.'));
 			}
 
-			$groupidsToDel = array_diff($hostGroupids, $newGroupids);
+			$groupIdsToDel = array_diff($hostGroupIds, $newGroupIds);
 
-			if ($groupidsToDel) {
+			if ($groupIdsToDel) {
 				$result = $this->massRemove(array(
-					'hostids' => $hostids,
-					'groupids' => $groupidsToDel
+					'hostids' => $hostIds,
+					'groupids' => $groupIdsToDel
 				));
 				if (!$result) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot delete host group.'));
@@ -1086,43 +1077,23 @@ class CHost extends CHostGeneral {
 		}
 
 		/*
-		 * Update interfaces
+		 * Update template linkage
 		 */
-		if (isset($updateInterfaces)) {
-			$hostInterfaces = API::HostInterface()->get(array(
-				'hostids' => $hostids,
-				'output' => API_OUTPUT_EXTEND,
-				'preservekeys' => true,
-				'nopermissions' => true
-			));
-
-			$this->massRemove(array(
-				'hostids' => $hostids,
-				'interfaces' => $hostInterfaces
-			));
-			$this->massAdd(array(
-				'hosts' => $hosts,
-				'interfaces' => $updateInterfaces
-			));
-		}
-
 		if (isset($updateTemplatesClear)) {
-			$templateidsClear = zbx_objectValues($updateTemplatesClear, 'templateid');
+			$templateIdsClear = zbx_objectValues($updateTemplatesClear, 'templateid');
 
 			if ($updateTemplatesClear) {
-				$this->massRemove(array('hostids' => $hostids, 'templateids_clear' => $templateidsClear));
+				$this->massRemove(array('hostids' => $hostIds, 'templateids_clear' => $templateIdsClear));
 			}
 		}
 		else {
-			$templateidsClear = array();
+			$templateIdsClear = array();
 		}
 
-		/*
-		 * Update template linkage
-		 */
+		// unlink templates
 		if (isset($updateTemplates)) {
 			$hostTemplates = API::Template()->get(array(
-				'hostids' => $hostids,
+				'hostids' => $hostIds,
 				'output' => array('templateid'),
 				'preservekeys' => true
 			));
@@ -1131,22 +1102,38 @@ class CHost extends CHostGeneral {
 			$newTemplateids = zbx_objectValues($updateTemplates, 'templateid');
 
 			$templatesToDel = array_diff($hostTemplateids, $newTemplateids);
-			$templatesToDel = array_diff($templatesToDel, $templateidsClear);
+			$templatesToDel = array_diff($templatesToDel, $templateIdsClear);
 
 			if ($templatesToDel) {
 				$result = $this->massRemove(array(
-					'hostids' => $hostids,
+					'hostids' => $hostIds,
 					'templateids' => $templatesToDel
 				));
 				if (!$result) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot unlink template'));
 				}
 			}
+		}
 
+		/*
+		 * update interfaces
+		 */
+		if (isset($updateInterfaces)) {
+			foreach($hostIds as $hostId) {
+				API::HostInterface()->replaceHostInterfaces(array(
+					'hostid' => $hostId,
+					'interfaces' => $updateInterfaces
+				));
+			}
+		}
+
+		// link new templates
+		if (isset($updateTemplates)) {
 			$result = $this->massAdd(array(
 				'hosts' => $hosts,
 				'templates' => $updateTemplates
 			));
+
 			if (!$result) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot link template'));
 			}
@@ -1154,7 +1141,7 @@ class CHost extends CHostGeneral {
 
 		// macros
 		if (isset($updateMacros)) {
-			DB::delete('hostmacro', array('hostid' => $hostids));
+			DB::delete('hostmacro', array('hostid' => $hostIds));
 
 			$this->massAdd(array(
 				'hosts' => $hosts,
@@ -1168,7 +1155,7 @@ class CHost extends CHostGeneral {
 		if (isset($updateInventory)) {
 			// disabling inventory
 			if ($updateInventory['inventory_mode'] == HOST_INVENTORY_DISABLED) {
-				$sql = 'DELETE FROM host_inventory WHERE '.dbConditionInt('hostid', $hostids);
+				$sql = 'DELETE FROM host_inventory WHERE '.dbConditionInt('hostid', $hostIds);
 				if (!DBexecute($sql)) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot delete inventory.'));
 				}
@@ -1178,13 +1165,13 @@ class CHost extends CHostGeneral {
 				$existingInventoriesDb = DBfetchArrayAssoc(DBselect(
 					'SELECT hostid,inventory_mode'.
 					' FROM host_inventory'.
-					' WHERE '.dbConditionInt('hostid', $hostids)
+					' WHERE '.dbConditionInt('hostid', $hostIds)
 				), 'hostid');
 
 				// check existing host inventory data
 				$automaticHostIds = array();
 				if ($updateInventory['inventory_mode'] === null) {
-					foreach ($hostids as $hostId) {
+					foreach ($hostIds as $hostId) {
 						// if inventory is disabled for one of the updated hosts, throw an exception
 						if (!isset($existingInventoriesDb[$hostId])) {
 							$host = get_host_by_hostid($hostId);
@@ -1200,7 +1187,7 @@ class CHost extends CHostGeneral {
 				}
 
 				$inventoriesToSave = array();
-				foreach ($hostids as $hostId) {
+				foreach ($hostIds as $hostId) {
 					$hostInventory = $updateInventory;
 					$hostInventory['hostid'] = $hostId;
 
@@ -1218,7 +1205,7 @@ class CHost extends CHostGeneral {
 
 					$itemsToInventories = API::item()->get(array(
 						'output' => array('inventory_link', 'hostid'),
-						'hostids' => $automaticHostIds ? $automaticHostIds : $hostids,
+						'hostids' => $automaticHostIds ? $automaticHostIds : $hostIds,
 						'nopermissions' => true
 					));
 
diff --git a/frontends/php/api/classes/CHostBase.php b/frontends/php/include/classes/api/services/CHostBase.php
index 3b9d9bea567..3b9d9bea567 100644
--- a/frontends/php/api/classes/CHostBase.php
+++ b/frontends/php/include/classes/api/services/CHostBase.php
diff --git a/frontends/php/api/classes/CHostGeneral.php b/frontends/php/include/classes/api/services/CHostGeneral.php
index b5e335105bd..b5e335105bd 100644
--- a/frontends/php/api/classes/CHostGeneral.php
+++ b/frontends/php/include/classes/api/services/CHostGeneral.php
diff --git a/frontends/php/api/classes/CHostGroup.php b/frontends/php/include/classes/api/services/CHostGroup.php
index 9eb8585b9d8..ad0adb1c4ca 100644
--- a/frontends/php/api/classes/CHostGroup.php
+++ b/frontends/php/include/classes/api/services/CHostGroup.php
@@ -60,7 +60,6 @@ class CHostGroup extends CApiService {
 			'monitored_hosts'			=> null,
 			'templated_hosts'			=> null,
 			'real_hosts'				=> null,
-			'not_proxy_hosts'			=> null,
 			'with_hosts_and_templates'	=> null,
 			'with_items'				=> null,
 			'with_simple_graph_items'	=> null,
@@ -109,7 +108,7 @@ class CHostGroup extends CApiService {
 					' AND '.dbConditionInt('r.groupid', $userGroups).
 				' GROUP BY r.id'.
 				' HAVING MIN(r.permission)>'.PERM_DENY.
-					' AND MAX(r.permission)>='.$permission.
+					' AND MAX(r.permission)>='.zbx_dbstr($permission).
 				')';
 		}
 
@@ -176,7 +175,7 @@ class CHostGroup extends CApiService {
 			$sqlParts['where']['hmh'] = 'g.groupid=mg.groupid';
 		}
 
-		// monitored_hosts, real_hosts, templated_hosts, not_proxy_hosts, with_hosts_and_templates
+		// monitored_hosts, real_hosts, templated_hosts, with_hosts_and_templates
 		if (!is_null($options['monitored_hosts'])) {
 			$sqlParts['from']['hosts_groups'] = 'hosts_groups hg';
 			$sqlParts['where']['hgg'] = 'g.groupid=hg.groupid';
@@ -201,13 +200,6 @@ class CHostGroup extends CApiService {
 			$sqlParts['where'][] = 'h.hostid=hg.hostid';
 			$sqlParts['where'][] = 'h.status='.HOST_STATUS_TEMPLATE;
 		}
-		elseif (!is_null($options['not_proxy_hosts'])) {
-			$sqlParts['from']['hosts_groups'] = 'hosts_groups hg';
-			$sqlParts['from']['hosts'] = 'hosts h';
-			$sqlParts['where']['hgg'] = 'hg.groupid=g.groupid';
-			$sqlParts['where'][] = 'h.hostid=hg.hostid';
-			$sqlParts['where'][] = 'h.status NOT IN ('.HOST_STATUS_PROXY_ACTIVE.','.HOST_STATUS_PROXY_PASSIVE.')';
-		}
 		elseif (!is_null($options['with_hosts_and_templates'])) {
 			$sqlParts['from']['hosts_groups'] = 'hosts_groups hg';
 			$sqlParts['from']['hosts'] = 'hosts h';
@@ -387,11 +379,21 @@ class CHostGroup extends CApiService {
 		));
 	}
 
+	/**
+	 * Check if host group exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('hostgroup.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array('name', 'groupid'), $object),
 			'output' => array('groupid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
@@ -417,10 +419,26 @@ class CHostGroup extends CApiService {
 			if (!isset($group['name']) || zbx_empty($group['name'])) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('Host group name cannot be empty.'));
 			}
-			if ($this->exists(array('name' => $group['name']))) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Host group "%1$s" already exists.', $group['name']));
-			}
 		}
+
+		// check host name duplicates
+		$collectionValidator = new CCollectionValidator(array(
+			'uniqueField' => 'name',
+			'messageDuplicate' => _('Host group "%1$s" already exists.')
+		));
+		$this->checkValidator($groups, $collectionValidator);
+
+		$dbHostGroups = API::getApiService()->select($this->tableName(), array(
+			'output' => array('name'),
+			'filter' => array('name' => zbx_objectValues($groups, 'name')),
+			'limit' => 1
+		));
+
+		if ($dbHostGroups) {
+			$dbHostGroup = reset($dbHostGroups);
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Host group "%1$s" already exists.', $dbHostGroup['name']));
+		}
+
 		$groupids = DB::insert('groups', $groups);
 
 		return array('groupids' => $groupids);
@@ -549,7 +567,7 @@ class CHostGroup extends CApiService {
 			);
 		}
 
-		$dltGroupids = getDeletableHostGroups($groupids);
+		$dltGroupids = getDeletableHostGroupIds($groupids);
 		if (count($groupids) != count($dltGroupids)) {
 			foreach ($groupids as $groupid) {
 				if (isset($dltGroupids[$groupid])) {
@@ -786,7 +804,7 @@ class CHostGroup extends CApiService {
 
 		$objectidsToUnlink = array_merge($hostids, $templateids);
 		if (!empty($objectidsToUnlink)) {
-			$unlinkable = getUnlinkableHosts($groupids, $objectidsToUnlink);
+			$unlinkable = getUnlinkableHostIds($groupids, $objectidsToUnlink);
 			if (count($objectidsToUnlink) != count($unlinkable)) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('One of the objects is left without a host group.'));
 			}
@@ -919,7 +937,7 @@ class CHostGroup extends CApiService {
 
 		// validate hosts without groups
 		if ($hostIdsToValidate) {
-			$unlinkable = getUnlinkableHosts($groupIds, $hostIdsToValidate);
+			$unlinkable = getUnlinkableHostIds($groupIds, $hostIdsToValidate);
 
 			if (count($unlinkable) != count($hostIdsToValidate)) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('One of the objects is left without a host group.'));
diff --git a/frontends/php/api/classes/CHostInterface.php b/frontends/php/include/classes/api/services/CHostInterface.php
index 9319d93bf28..f0cac83d376 100644
--- a/frontends/php/api/classes/CHostInterface.php
+++ b/frontends/php/include/classes/api/services/CHostInterface.php
@@ -104,7 +104,7 @@ class CHostInterface extends CApiService {
 				' WHERE hi.hostid=hgg.hostid'.
 				' GROUP BY hgg.hostid'.
 				' HAVING MIN(r.permission)>'.PERM_DENY.
-					' AND MAX(r.permission)>='.$permission.
+					' AND MAX(r.permission)>='.zbx_dbstr($permission).
 				')';
 		}
 
@@ -190,17 +190,20 @@ class CHostInterface extends CApiService {
 	}
 
 	/**
-	 * Is interface exist.
+	 * Check if host interface exists.
 	 *
-	 * @param array $object
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
 	 *
 	 * @return bool
 	 */
 	public function exists(array $object) {
+		$this->deprecated('hostinterface.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array('interfaceid', 'hostid', 'ip', 'dns'), $object),
 			'output' => array('interfaceid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
@@ -323,6 +326,8 @@ class CHostInterface extends CApiService {
 				$this->checkPort($interface);
 			}
 
+			$this->checkBulk($interface);
+
 			if ($update) {
 				$interface = $updInterface;
 			}
@@ -458,6 +463,7 @@ class CHostInterface extends CApiService {
 			$this->checkDns($interface);
 			$this->checkIp($interface);
 			$this->checkPort($interface);
+			$this->checkBulk($interface);
 
 			// check main interfaces
 			$interfacesToRemove = API::getApiService()->select($this->tableName(), array(
@@ -466,7 +472,8 @@ class CHostInterface extends CApiService {
 					'hostid' => $data['hostids'],
 					'ip' => $interface['ip'],
 					'dns' => $interface['dns'],
-					'port' => $interface['port']
+					'port' => $interface['port'],
+					'bulk' => $interface['bulk']
 				)
 			));
 			if ($interfacesToRemove) {
@@ -491,16 +498,32 @@ class CHostInterface extends CApiService {
 
 		$this->validateMassRemove($data);
 
+		$interfaceIds = array();
 		foreach ($data['interfaces'] as $interface) {
-			DB::delete('interface', array(
-				'hostid' => $data['hostids'],
-				'ip' => $interface['ip'],
-				'dns' => $interface['dns'],
-				'port' => $interface['port']
+			$interfaces = $this->get(array(
+				'output' => array('interfaceid'),
+				'filter' => array(
+					'hostid' => $data['hostids'],
+					'ip' => $interface['ip'],
+					'dns' => $interface['dns'],
+					'port' => $interface['port'],
+					'bulk' => $interface['bulk']
+				),
+				'editable' => true,
+				'preservekeys' => true
 			));
+
+			if ($interfaces) {
+				$interfaceIds = array_merge($interfaceIds, array_keys($interfaces));
+			}
+		}
+
+		if ($interfaceIds) {
+			$interfaceIds = array_keys(array_flip($interfaceIds));
+			DB::delete('interface', array('interfaceid' => $interfaceIds));
 		}
 
-		return array('interfaceids' => zbx_objectValues($data['interfaces'], 'interfaceid'));
+		return array('interfaceids' => $interfaceIds);
 	}
 
 	/**
@@ -568,19 +591,6 @@ class CHostInterface extends CApiService {
 	 * @param array $interface
 	 */
 	protected function checkDns(array $interface) {
-		if (zbx_strlen($interface['dns']) > 64) {
-			self::exception(
-				ZBX_API_ERROR_PARAMETERS,
-				_n(
-					'Maximum DNS name length is %1$d characters, "%2$s" is %3$d character.',
-					'Maximum DNS name length is %1$d characters, "%2$s" is %3$d characters.',
-					64,
-					$interface['dns'],
-					zbx_strlen($interface['dns'])
-				)
-			);
-		}
-
 		if (!empty($interface['dns']) && !preg_match('/^'.ZBX_PREG_DNS_FORMAT.'$/', $interface['dns'])) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect interface DNS parameter "%s" provided.', $interface['dns']));
 		}
@@ -630,6 +640,25 @@ class CHostInterface extends CApiService {
 		}
 	}
 
+	/**
+	 * Validates interface "bulk" field.
+	 * For SNMP interfaces bulk value should be either 0 (disabled) or 1 (enabled).
+	 * For other non-SNMP interfaces bulk value should be 1 (default).
+	 *
+	 * @throws APIException if bulk field is incorrect.
+	 *
+	 * @param array $interface
+	 */
+	protected function checkBulk(array $interface) {
+		if ($interface['type'] !== null && (($interface['type'] != INTERFACE_TYPE_SNMP && isset($interface['bulk'])
+				&& $interface['bulk'] != SNMP_BULK_ENABLED)
+				|| ($interface['type'] == INTERFACE_TYPE_SNMP && isset($interface['bulk'])
+					&& (zbx_empty($interface['bulk'])
+						|| ($interface['bulk'] != SNMP_BULK_DISABLED && $interface['bulk'] != SNMP_BULK_ENABLED))))) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect bulk value for interface.'));
+		}
+	}
+
 	private function checkHostInterfaces(array $interfaces, $hostid) {
 		$interfacesWithMissingData = array();
 
@@ -690,7 +719,7 @@ class CHostInterface extends CApiService {
 			}
 		}
 
-		// gathrer missing host ids
+		// gather missing host ids
 		$hostIds = array();
 		if ($interfaceidsWithoutHostIds) {
 			$dbResult = DBselect('SELECT DISTINCT i.hostid FROM interface i WHERE '.dbConditionInt('i.interfaceid', $interfaceidsWithoutHostIds));
diff --git a/frontends/php/api/classes/CHostPrototype.php b/frontends/php/include/classes/api/services/CHostPrototype.php
index 09ceb158690..bae7d33ffec 100644
--- a/frontends/php/api/classes/CHostPrototype.php
+++ b/frontends/php/include/classes/api/services/CHostPrototype.php
@@ -110,7 +110,7 @@ class CHostPrototype extends CHostBase {
 		$hostPrototypeValidator = new CSchemaValidator($this->getHostPrototypeSchema());
 		$hostPrototypeValidator->setValidator('ruleid', new CIdValidator(array(
 			'messageEmpty' => _('No discovery rule ID given for host prototype "%1$s".'),
-			'messageRegex' => _('Incorrect discovery rule ID for host prototype "%1$s".')
+			'messageInvalid' => _('Incorrect discovery rule ID for host prototype "%1$s".')
 		)));
 
 		// group validators
@@ -180,7 +180,7 @@ class CHostPrototype extends CHostBase {
 					// just in case
 					'messageEmpty' => _('Empty name for host prototype "%1$s".')
 				)),
-				'status' => new CSetValidator(array(
+				'status' => new CLimitedSetValidator(array(
 					'values' => array(HOST_STATUS_MONITORED, HOST_STATUS_NOT_MONITORED),
 					'messageInvalid' => _('Incorrect status for host prototype "%1$s".')
 				)),
@@ -238,7 +238,7 @@ class CHostPrototype extends CHostBase {
 			'validators' => array(
 				'groupid' => new CIdValidator(array(
 					'messageEmpty' => _('No host group ID for group prototype.'),
-					'messageRegex' => _('Incorrect host group ID for group prototype.')
+					'messageInvalid' => _('Incorrect host group ID for group prototype.')
 				))
 			),
 			'required' => array('groupid'),
@@ -373,7 +373,7 @@ class CHostPrototype extends CHostBase {
 	 * @throws APIException if the input is invalid
 	 *
 	 * @param array $hostPrototypes
-	 * @param arary $dbHostPrototypes	array of existing host prototypes with hostids as keys
+	 * @param array $dbHostPrototypes	array of existing host prototypes with hostids as keys
 	 *
 	 * @return void
 	 */
@@ -393,14 +393,14 @@ class CHostPrototype extends CHostBase {
 		$groupLinkValidator = new CPartialSchemaValidator($this->getGroupLinkSchema());
 		$groupLinkValidator->setValidator('group_prototypeid', new CIdValidator(array(
 			'messageEmpty' => _('Group prototype ID cannot be empty.'),
-			'messageRegex' => _('Incorrect group prototype ID.')
+			'messageInvalid' => _('Incorrect group prototype ID.')
 		)));
 
 		// group prototype validator
 		$groupPrototypeValidator = new CPartialSchemaValidator($this->getGroupPrototypeSchema());
 		$groupPrototypeValidator->setValidator('group_prototypeid', new CIdValidator(array(
 			'messageEmpty' => _('Group prototype ID cannot be empty.'),
-			'messageRegex' => _('Incorrect group prototype ID.')
+			'messageInvalid' => _('Incorrect group prototype ID.')
 		)));
 
 		$groupPrototypeGroupIds = array();
@@ -1064,7 +1064,7 @@ class CHostPrototype extends CHostBase {
 	/**
 	 * Checks if the given host prototypes are not inherited from a template.
 	 *
-	 * @throws APIException 	if at least one host prototype is iherited
+	 * @throws APIException 	if at least one host prototype is inherited
 	 *
 	 * @param array $hostPrototypeIds
 	 */
@@ -1131,7 +1131,8 @@ class CHostPrototype extends CHostBase {
 
 		$sqlWhere = array();
 		foreach ($valuesByDiscoveryRuleId as $discoveryRuleId => $values) {
-			$sqlWhere[] = '(hd.parent_itemid='.$discoveryRuleId.' AND '.dbConditionString('h.'.$field, $values).')';
+			$sqlWhere[] = '(hd.parent_itemid='.zbx_dbstr($discoveryRuleId).
+				' AND '.dbConditionString('h.'.$field, $values).')';
 		}
 
 		if ($sqlWhere) {
@@ -1177,7 +1178,7 @@ class CHostPrototype extends CHostBase {
 					' AND i.hostid=hgg.hostid'.
 				' GROUP BY hgg.hostid'.
 				' HAVING MIN(r.permission)>'.PERM_DENY.
-				' AND MAX(r.permission)>='.$permission.
+				' AND MAX(r.permission)>='.zbx_dbstr($permission).
 				')';
 		}
 
@@ -1221,7 +1222,7 @@ class CHostPrototype extends CHostBase {
 				'SELECT hg.group_prototypeid,hg.hostid'.
 					' FROM group_prototype hg'.
 					' WHERE '.dbConditionInt('hg.hostid', $hostPrototypeIds).
-					' AND hg.groupid!=0'
+					' AND hg.groupid IS NOT NULL'
 			));
 			$relationMap = $this->createRelationMap($groupPrototypes, 'hostid', 'group_prototypeid');
 			$groupPrototypes = API::getApiService()->select('group_prototype', array(
@@ -1242,7 +1243,7 @@ class CHostPrototype extends CHostBase {
 				'SELECT hg.group_prototypeid,hg.hostid'.
 				' FROM group_prototype hg'.
 				' WHERE '.dbConditionInt('hg.hostid', $hostPrototypeIds).
-					' AND hg.name NOT LIKE '.zbx_dbstr('')
+					' AND hg.groupid IS NULL'
 			));
 			$relationMap = $this->createRelationMap($groupPrototypes, 'hostid', 'group_prototypeid');
 			$groupPrototypes = API::getApiService()->select('group_prototype', array(
diff --git a/frontends/php/api/classes/CHttpTest.php b/frontends/php/include/classes/api/services/CHttpTest.php
index 8a6b97097cb..0514933f8b8 100644
--- a/frontends/php/api/classes/CHttpTest.php
+++ b/frontends/php/include/classes/api/services/CHttpTest.php
@@ -98,7 +98,7 @@ class CHttpTest extends CApiService {
 					' WHERE ht.hostid=hgg.hostid'.
 					' GROUP BY hgg.hostid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-						' AND MAX(r.permission)>='.$permission.
+						' AND MAX(r.permission)>='.zbx_dbstr($permission).
 					')';
 		}
 
@@ -257,17 +257,32 @@ class CHttpTest extends CApiService {
 	public function create($httpTests) {
 		$httpTests = zbx_toArray($httpTests);
 
+		if (!$httpTests) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameters.'));
+		}
+
 		// find hostid by applicationid
-		foreach ($httpTests as $hnum => $httpTest) {
-			unset($httpTests[$hnum]['templateid']);
+		foreach ($httpTests as &$httpTest) {
+			unset($httpTest['templateid']);
 
 			if (empty($httpTest['hostid']) && !empty($httpTest['applicationid'])) {
 				$dbHostId = DBfetch(DBselect('SELECT a.hostid'.
 						' FROM applications a'.
 						' WHERE a.applicationid='.zbx_dbstr($httpTest['applicationid'])));
-				$httpTests[$hnum]['hostid'] = $dbHostId['hostid'];
+				$httpTest['hostid'] = $dbHostId['hostid'];
 			}
 		}
+		unset($httpTest);
+
+		foreach($httpTests as &$httpTest) {
+			$defaultValues = array(
+				'verify_peer' => HTTPTEST_VERIFY_PEER_OFF,
+				'verify_host' => HTTPTEST_VERIFY_HOST_OFF
+			);
+
+			check_db_fields($defaultValues, $httpTest);
+		}
+		unset($httpTest);
 
 		$this->validateCreate($httpTests);
 
@@ -286,55 +301,43 @@ class CHttpTest extends CApiService {
 	public function update($httpTests) {
 		$httpTests = zbx_toArray($httpTests);
 
-		$httpTests = zbx_toHash($httpTests, 'httptestid');
-		foreach ($httpTests as $hnum => $httpTest) {
-			unset($httpTests[$hnum]['templateid']);
+		if (!$httpTests) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameters.'));
 		}
 
+		$this->checkObjectIds($httpTests, 'httptestid',
+			_('No "%1$s" given for web scenario.'),
+			_('Empty web scenario ID.'),
+			_('Incorrect web scenario ID.')
+		);
+
+		$httpTests = zbx_toHash($httpTests, 'httptestid');
+
 		$dbHttpTests = array();
-		$dbCursor = DBselect('SELECT ht.httptestid,ht.hostid,ht.templateid,ht.name'.
-				' FROM httptest ht'.
-				' WHERE '.dbConditionInt('ht.httptestid', array_keys($httpTests)));
+		$dbCursor = DBselect(
+			'SELECT ht.httptestid,ht.hostid,ht.templateid,ht.name,'.
+				'ht.ssl_cert_file,ht.ssl_key_file,ht.ssl_key_password,ht.verify_peer,ht.verify_host'.
+			' FROM httptest ht'.
+			' WHERE '.dbConditionInt('ht.httptestid', array_keys($httpTests))
+		);
 		while ($dbHttpTest = DBfetch($dbCursor)) {
 			$dbHttpTests[$dbHttpTest['httptestid']] = $dbHttpTest;
 		}
-		$dbCursor = DBselect('SELECT hs.httpstepid,hs.httptestid,hs.name'.
-				' FROM httpstep hs'.
-				' WHERE '.dbConditionInt('hs.httptestid', array_keys($dbHttpTests)));
+
+		$dbCursor = DBselect(
+			'SELECT hs.httpstepid,hs.httptestid,hs.name'.
+			' FROM httpstep hs'.
+			' WHERE '.dbConditionInt('hs.httptestid', array_keys($dbHttpTests))
+		);
 		while ($dbHttpStep = DBfetch($dbCursor)) {
 			$dbHttpTests[$dbHttpStep['httptestid']]['steps'][$dbHttpStep['httpstepid']] = $dbHttpStep;
 		}
 
-		// add hostid if missing
-		// add test name and steps names if it's empty or test is templated
-		// unset steps no for templated tests
-		foreach($httpTests as $tnum => $httpTest) {
-			$test =& $httpTests[$tnum];
-			$dbTest = $dbHttpTests[$httpTest['httptestid']];
-			$test['hostid'] = $dbTest['hostid'];
-
-			if (!isset($test['name']) || zbx_empty($test['name']) || !empty($dbTest['templateid'])) {
-				$test['name'] = $dbTest['name'];
-			}
-			if (!empty($test['steps'])) {
-				foreach ($test['steps'] as $snum => $step) {
-					if (isset($step['httpstepid'])
-							&& (!empty($dbTest['templateid']) || !isset($step['name']) || zbx_empty($step['name']))) {
-						$test['steps'][$snum]['name'] = $dbTest['steps'][$step['httpstepid']]['name'];
-					}
-					if (!empty($dbTest['templateid'])) {
-						unset($test['steps'][$snum]['no']);
-					}
-				}
-			}
-			unset($test);
-		}
-
-		$this->validateUpdate($httpTests);
+		$httpTests = $this->validateUpdate($httpTests, $dbHttpTests);
 
 		Manager::HttpTest()->persist($httpTests);
 
-		return array('httptestids' => zbx_objectValues($httpTests, 'httptestid'));
+		return array('httptestids' => array_keys($httpTests));
 	}
 
 	/**
@@ -436,28 +439,44 @@ class CHttpTest extends CApiService {
 	 * @param array $httpTests
 	 */
 	protected function validateCreate(array $httpTests) {
-		$this->checkNames($httpTests);
-
 		foreach ($httpTests as $httpTest) {
 			$missingKeys = checkRequiredKeys($httpTest, array('name', 'hostid', 'steps'));
 			if (!empty($missingKeys)) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Web scenario missing parameters: %1$s', implode(', ', $missingKeys)));
 			}
+		}
 
-			$nameExists = DBfetch(DBselect('SELECT ht.name FROM httptest ht'.
-				' WHERE ht.name='.zbx_dbstr($httpTest['name']).
-					' AND ht.hostid='.zbx_dbstr($httpTest['hostid']), 1));
-			if ($nameExists) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Web scenario "%1$s" already exists.', $nameExists['name']));
+		$hostIds = zbx_objectValues($httpTests, 'hostid');
+		if (!API::Host()->isWritable($hostIds)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _('No permissions to referred object or it does not exist!'));
+		}
+
+		foreach ($httpTests as $httpTest) {
+			if (zbx_empty($httpTest['name'])) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _('Web scenario name cannot be empty.'));
 			}
 
+			$this->checkSslParameters($httpTest);
+
 			if (empty($httpTest['steps'])) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('Web scenario must have at least one step.'));
 			}
+
 			$this->checkSteps($httpTest);
 			$this->checkDuplicateSteps($httpTest);
 		}
 
+		// check input array for duplicate names
+		$collectionValidator = new CCollectionValidator(array(
+			'uniqueField' => 'name',
+			'uniqueField2' => 'hostid',
+			'messageDuplicate' => _('Web scenario "%1$s" already exists.')
+		));
+		$this->checkValidator($httpTests, $collectionValidator);
+
+		// check database for duplicate names
+		$this->checkDuplicates($httpTests);
+
 		$this->checkApplicationHost($httpTests);
 	}
 
@@ -466,55 +485,116 @@ class CHttpTest extends CApiService {
 	 *  - check permissions
 	 *  - check if web scenario with same name already exists
 	 *  - check that each web scenario object has httptestid defined
+	 *  - return array of web scenarios, if validation was successful
 	 *
 	 * @param array $httpTests
+	 * @param array $dbHttpTests
+	 *
+	 * @return array $httpTests
 	 */
-	protected function validateUpdate(array $httpTests) {
-		$httpTestIds = zbx_objectValues($httpTests, 'httptestid');
-
-		if (!$this->isWritable($httpTestIds)) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('You do not have permission to perform this operation.'));
+	protected function validateUpdate(array $httpTests, array $dbHttpTests) {
+		if (!$this->isWritable(array_keys($httpTests))) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _('No permissions to referred object or it does not exist!'));
 		}
 
-		$this->checkNames($httpTests);
+		$httpTests = $this->extendFromObjects($httpTests, $dbHttpTests, array(
+			'ssl_key_file', 'ssl_cert_file', 'ssl_key_password', 'verify_host', 'verify_peer'
+		));
 
-		foreach ($httpTests as $httpTest) {
-			$missingKeys = checkRequiredKeys($httpTest, array('httptestid'));
-			if (!empty($missingKeys)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Web scenario missing parameters: %1$s', implode(', ', $missingKeys)));
+		foreach ($httpTests as &$httpTest) {
+			$dbHttpTest = $dbHttpTests[$httpTest['httptestid']];
+
+			$httpTest['hostid'] = $dbHttpTest['hostid'];
+
+			if (!isset($httpTest['name']) || $dbHttpTest['templateid']) {
+				$httpTest['name'] = $dbHttpTest['name'];
 			}
 
-			if (isset($httpTest['name'])) {
-				// get hostid from db if it's not provided
-				if (isset($httpTest['hostid'])) {
-					$hostId = $httpTest['hostid'];
-				}
-				else {
-					$hostId = DBfetch(DBselect('SELECT ht.hostid FROM httptest ht'.
-						' WHERE ht.httptestid='.zbx_dbstr($httpTest['httptestid'])));
-					$hostId = $hostId['hostid'];
-				}
+			$this->checkSslParameters($httpTest);
 
-				$nameExists = DBfetch(DBselect('SELECT ht.name FROM httptest ht'.
-					' WHERE ht.name='.zbx_dbstr($httpTest['name']).
-						' AND ht.hostid='.zbx_dbstr($hostId).
-						' AND ht.httptestid<>'.zbx_dbstr($httpTest['httptestid']), 1));
-				if ($nameExists) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Web scenario "%1$s" already exists.', $nameExists['name']));
+			if (array_key_exists('steps', $httpTest) && is_array($httpTest['steps'])) {
+				foreach ($httpTest['steps'] as &$httpTestStep) {
+					if (isset($httpTestStep['httpstepid'])
+							&& ($dbHttpTest['templateid'] || !isset($httpTestStep['name']))) {
+						$httpTestStep['name'] = $dbHttpTest['steps'][$httpTestStep['httpstepid']]['name'];
+					}
+
+					if ($dbHttpTest['templateid']) {
+						unset($httpTestStep['no']);
+					}
+
+					// unset required text and POST variables if retrieving only headers
+					if (isset($httpTestStep['retrieve_mode'])
+							&& ($httpTestStep['retrieve_mode'] == HTTPTEST_STEP_RETRIEVE_MODE_HEADERS)) {
+						$httpTestStep['required'] = '';
+						$httpTestStep['posts'] = '';
+					}
 				}
-			}
+				unset($httpTestStep);
 
-			if (!check_db_fields(array('httptestid' => null), $httpTest)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
+				$this->checkSteps($httpTest, $dbHttpTest);
+				$this->checkDuplicateSteps($httpTest, $dbHttpTest);
 			}
 
-			if (isset($httpTest['steps'])) {
-				$this->checkSteps($httpTest);
-				$this->checkDuplicateSteps($httpTest);
-			}
+			unset($httpTest['templateid']);
 		}
+		unset($httpTest);
+
+		// check input array for duplicate names
+		$collectionValidator = new CCollectionValidator(array(
+			'uniqueField' => 'name',
+			'uniqueField2' => 'hostid',
+			'messageDuplicate' => _('Web scenario "%1$s" already exists.')
+		));
+		$this->checkValidator($httpTests, $collectionValidator);
+
+		// check database for duplicate names
+		$this->checkDuplicates($httpTests, $dbHttpTests);
 
 		$this->checkApplicationHost($httpTests);
+
+		return $httpTests;
+	}
+
+	/**
+	 * Check DB for duplicate names on hosts
+	 *
+	 * @throws APIException if same name on some host is found.
+	 *
+	 * @param array $httpTests		array of web screnarios
+	 * @param array $dbHttpTests	array of DB web screnarios
+	 */
+	protected function checkDuplicates(array $httpTests, array $dbHttpTests = array()) {
+		$httpTestNames = array();
+
+		foreach ($httpTests as $httpTest) {
+			if (isset($httpTest['name'])) {
+				if (zbx_empty($httpTest['name'])) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _('Web scenario name cannot be empty.'));
+				}
+				elseif (($dbHttpTests && $dbHttpTests[$httpTest['httptestid']]['name'] !== $httpTest['name'])
+						|| !$dbHttpTests) {
+					$httpTestNames[$httpTest['hostid']][] = $httpTest['name'];
+				}
+			}
+		}
+
+		if ($httpTestNames) {
+			foreach ($httpTestNames as $hostId => $httpTestName) {
+				$nameExists = API::getApiService()->select($this->tableName(), array(
+					'output' => array('name'),
+					'filter' => array('name' => $httpTestName, 'hostid' => $hostId),
+					'limit' => 1
+				));
+
+				if ($nameExists) {
+					$nameExists = reset($nameExists);
+					self::exception(ZBX_API_ERROR_PARAMETERS,
+						_s('Web scenario "%1$s" already exists.', $nameExists['name'])
+					);
+				}
+			}
+		}
 	}
 
 	/**
@@ -554,60 +634,127 @@ class CHttpTest extends CApiService {
 	 *  - check status_codes field
 	 *  - check name characters
 	 *
+	 * @throws APIException if incorrect characters are passed, incorrect step numbers step is missing.
+	 *
 	 * @param array $httpTest
+	 * @param array $dbHttpTest
 	 */
-	protected function checkSteps(array $httpTest) {
+	protected function checkSteps(array $httpTest, array $dbHttpTest = array()) {
+		if (array_key_exists('steps', $httpTest)
+				&& (!is_array($httpTest['steps']) || (count($httpTest['steps']) == 0))) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _('Web scenario must have at least one step.'));
+		}
+
 		$stepNames = zbx_objectValues($httpTest['steps'], 'name');
 		if (!empty($stepNames) && !preg_grep('/'.ZBX_PREG_PARAMS.'/i', $stepNames)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Web scenario step name should contain only printable characters.'));
 		}
 
+		$followRedirectsValidator = new CLimitedSetValidator(array(
+				'values' => array(HTTPTEST_STEP_FOLLOW_REDIRECTS_OFF, HTTPTEST_STEP_FOLLOW_REDIRECTS_ON)
+			)
+		);
+
+		$retrieveModeValidator = new CLimitedSetValidator(array(
+				'values' => array(HTTPTEST_STEP_RETRIEVE_MODE_CONTENT, HTTPTEST_STEP_RETRIEVE_MODE_HEADERS)
+			)
+		);
+
 		foreach ($httpTest['steps'] as $step) {
+			if ((isset($step['httpstepid']) && array_key_exists('name', $step) && zbx_empty($step['name']))
+					|| (!isset($step['httpstepid']) && (!array_key_exists('name', $step) || zbx_empty($step['name'])))) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _('Web scenario step name cannot be empty.'));
+			}
+
+			if ((isset($step['httpstepid']) && array_key_exists('url', $step) && zbx_empty($step['url']))
+					|| (!isset($step['httpstepid']) && (!array_key_exists('url', $step) || zbx_empty($step['url'])))) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _('Web scenario step URL cannot be empty.'));
+			}
+
 			if (isset($step['no']) && $step['no'] <= 0) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('Web scenario step number cannot be less than 1.'));
 			}
 			if (isset($step['status_codes'])) {
 				$this->checkStatusCode($step['status_codes']);
 			}
+
+			if (isset($step['follow_redirects'])) {
+				$followRedirectsValidator->messageInvalid = _s(
+					'Incorrect follow redirects value for step "%1$s" of web scenario "%2$s".',
+					$step['name'],
+					$httpTest['name']
+				);
+
+				$this->checkValidator($step['follow_redirects'], $followRedirectsValidator);
+			}
+
+			if (isset($step['retrieve_mode'])) {
+				$retrieveModeValidator->messageInvalid = _s(
+					'Incorrect retrieve mode value for step "%1$s" of web scenario "%2$".',
+					$step['name'],
+					$httpTest['name']
+				);
+
+				$this->checkValidator($step['retrieve_mode'], $retrieveModeValidator);
+			}
+		}
+
+		// check if step still exists on update
+		if ($dbHttpTest) {
+			foreach ($httpTest['steps'] as $step) {
+				if (isset($step['httpstepid']) && !isset($dbHttpTest['steps'][$step['httpstepid']])) {
+					self::exception(ZBX_API_ERROR_PARAMETERS,
+						_('No permissions to referred object or it does not exist!')
+					);
+				}
+			}
 		}
 	}
 
 	/**
 	 * Check duplicate step names.
 	 *
+	 * @throws APIException if duplicate step name is found.
+	 *
 	 * @param array $httpTest
+	 * @param array $dbHttpTest
 	 */
-	protected function checkDuplicateSteps(array $httpTest) {
+	protected function checkDuplicateSteps(array $httpTest, array $dbHttpTest = array()) {
 		if ($duplicate = CArrayHelper::findDuplicate($httpTest['steps'], 'name')) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Web scenario step "%1$s" already exists.', $duplicate['name']));
 		}
 	}
 
 	/**
-	 * Validate http response code reange.
-	 * Range can contain ',' and '-'
-	 * Range can be empty string.
+	 * Validate http response code range.
+	 * Range can be empty string, can be set as user macro or be numeric and contain ',' and '-'.
+	 *
+	 * Examples: '100-199, 301, 404, 500-550' or '{$USER_MACRO123}'
 	 *
-	 * Examples: '100-199, 301, 404, 500-550'
+	 * @throws APIException if the status code range is invalid.
 	 *
 	 * @param string $statusCodeRange
 	 *
 	 * @return bool
 	 */
 	protected  function checkStatusCode($statusCodeRange) {
-		if ($statusCodeRange == '') {
+		if ($statusCodeRange === '' || preg_match('/^'.ZBX_PREG_EXPRESSION_USER_MACROS.'$/', $statusCodeRange)) {
 			return true;
 		}
+		else {
+			$ranges = explode(',', $statusCodeRange);
+			foreach ($ranges as $range) {
+				$range = explode('-', $range);
+				if (count($range) > 2) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Invalid response code "%1$s".', $statusCodeRange));
+				}
 
-		foreach (explode(',', $statusCodeRange) as $range) {
-			$range = explode('-', $range);
-			if (count($range) > 2) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Invalid response code range "%1$s".', $statusCodeRange));
-			}
-
-			foreach ($range as $value) {
-				if (!is_numeric($value)) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Invalid response code "%1$s".', $value));
+				foreach ($range as $value) {
+					if (!is_numeric($value)) {
+						self::exception(ZBX_API_ERROR_PARAMETERS,
+							_s('Invalid response code "%1$s".', $statusCodeRange)
+						);
+					}
 				}
 			}
 		}
@@ -616,22 +763,6 @@ class CHttpTest extends CApiService {
 	}
 
 	/**
-	 * Check web scenario names.
-	 *
-	 * @param array $httpTests
-	 *
-	 * @return array|null
-	 */
-	protected function checkNames(array $httpTests) {
-		$httpTestsNames = zbx_objectValues($httpTests, 'name');
-		if (!empty($httpTestsNames)) {
-			if (!preg_grep('/^['.ZBX_PREG_PRINT.']+$/u', $httpTestsNames)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Only characters are allowed.'));
-			}
-		}
-	}
-
-	/**
 	 * Check if user has read permissions on http test with given ids.
 	 *
 	 * @param array $ids
@@ -736,4 +867,47 @@ class CHttpTest extends CApiService {
 
 		return $result;
 	}
+
+	/**
+	 * @param $httpTest
+	 *
+	 * @throws APIException if bad value for "verify_peer" parameter.
+	 * @throws APIException if bad value for "verify_host" parameter.
+	 * @throws APIException if SSL cert is present but SSL key is not.
+	 */
+	protected function checkSslParameters($httpTest) {
+
+		$verifyPeerValidator = new CLimitedSetValidator(
+			array(
+				'values' => array(HTTPTEST_VERIFY_PEER_ON, HTTPTEST_VERIFY_PEER_OFF),
+				'messageInvalid' => _('Incorrect SSL verify peer value for web scenario "%1$s".')
+			)
+		);
+		$verifyPeerValidator->setObjectName($httpTest['name']);
+		$this->checkValidator($httpTest['verify_peer'], $verifyPeerValidator);
+
+		$verifyHostValidator = new CLimitedSetValidator(
+			array(
+				'values' => array(HTTPTEST_VERIFY_HOST_ON, HTTPTEST_VERIFY_HOST_OFF),
+				'messageInvalid' => _('Incorrect SSL verify host value for web scenario "%1$s".')
+			)
+		);
+
+		$verifyHostValidator->setObjectName($httpTest['name']);
+		$this->checkValidator($httpTest['verify_host'], $verifyHostValidator);
+
+			if (($httpTest['ssl_key_password'] != '') && ($httpTest['ssl_key_file'] == '')) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_s('Empty SSL key file for web scenario "%1$s".', $httpTest['name'])
+			);
+		}
+
+		if (($httpTest['ssl_key_file'] != '') && ($httpTest['ssl_cert_file'] == '')) {
+			self::exception(
+				ZBX_API_ERROR_PARAMETERS,
+				_s('Empty SSL certificate file for web scenario "%1$s".', $httpTest['name'])
+			);
+		}
+	}
 }
diff --git a/frontends/php/api/classes/CIconMap.php b/frontends/php/include/classes/api/services/CIconMap.php
index 6d6d536b073..b703757edab 100644
--- a/frontends/php/api/classes/CIconMap.php
+++ b/frontends/php/include/classes/api/services/CIconMap.php
@@ -417,15 +417,15 @@ class CIconMap extends CApiService {
 				}
 
 				try {
-					GlobalRegExp::isValid($mapping['expression']);
+					CGlobalRegexp::isValid($mapping['expression']);
 				}
 				catch (Exception $e) {
 					switch ($e->getCode()) {
-						case GlobalRegExp::ERROR_REGEXP_EMPTY:
+						case CGlobalRegexp::ERROR_REGEXP_EMPTY:
 							self::exception(ZBX_API_ERROR_PARAMETERS,
 								_s('Icon map "%s" cannot have mapping with empty expression.', $iconMap['name']));
 							break;
-						case GlobalRegExp::ERROR_REGEXP_NOT_EXISTS:
+						case CGlobalRegexp::ERROR_REGEXP_NOT_EXISTS:
 							self::exception(ZBX_API_ERROR_PARAMETERS,
 								_s('Icon map "%s" cannot have mapping with global expression that does not exist.', $iconMap['name']));
 							break;
diff --git a/frontends/php/api/classes/CImage.php b/frontends/php/include/classes/api/services/CImage.php
index cafddcd3100..03291c147b2 100644
--- a/frontends/php/api/classes/CImage.php
+++ b/frontends/php/include/classes/api/services/CImage.php
@@ -98,13 +98,18 @@ class CImage extends CApiService {
 			$sqlParts['from']['sysmaps'] = 'sysmaps sm';
 			$sqlParts['from']['sysmaps_elements'] = 'sysmaps_elements se';
 			$sqlParts['where']['sm'] = dbConditionInt('sm.sysmapid', $options['sysmapids']);
-			$sqlParts['where']['smse'] = 'sm.sysmapid=se.sysmapid ';
-			$sqlParts['where']['se'] = '('.
-				'se.iconid_off=i.imageid'.
-				' OR se.iconid_on=i.imageid'.
-				' OR se.iconid_disabled=i.imageid'.
-				' OR se.iconid_maintenance=i.imageid'.
-				' OR sm.backgroundid=i.imageid)';
+			$sqlParts['where']['smse_or_bg'] = '('.
+				'sm.backgroundid=i.imageid'.
+				' OR ('.
+					'sm.sysmapid=se.sysmapid'.
+					' AND ('.
+						'se.iconid_off=i.imageid'.
+						' OR se.iconid_on=i.imageid'.
+						' OR se.iconid_disabled=i.imageid'.
+						' OR se.iconid_maintenance=i.imageid'.
+					')'.
+				')'.
+			')';
 		}
 
 		// filter
@@ -132,7 +137,6 @@ class CImage extends CApiService {
 			}
 			else {
 				$imageids[$image['imageid']] = $image['imageid'];
-				unset($image['image']);
 
 				$result[$image['imageid']] = $image;
 			}
@@ -171,18 +175,20 @@ class CImage extends CApiService {
 	}
 
 	/**
-	 * Check image existence.
+	 * Check if image exists.
 	 *
-	 * @param array $images
-	 * @param array $images['name']
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
 	 *
-	 * @return boolean
+	 * @return bool
 	 */
 	public function exists($object) {
+		$this->deprecated('image.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('imageid', 'name'), 'imagetype'), $object),
 			'output' => array('imageid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
@@ -200,30 +206,15 @@ class CImage extends CApiService {
 		global $DB;
 
 		$images = zbx_toArray($images);
-		$imageids = array();
 
-		if (self::$userData['type'] < USER_TYPE_ZABBIX_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
-		}
+		$this->validateCreate($images);
 
+		$imageids = array();
 		foreach ($images as $image) {
-			$imageDbFields = array(
-				'name' => null,
-				'image' => null,
-				'imagetype' => 1
-			);
-
-			if (!check_db_fields($imageDbFields, $image)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Wrong fields for image "%1$s".', $image['name']));
-			}
-			if ($this->exists(array('name' => $image['name']))) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $image['name']));
-			}
-
 			// decode BASE64
 			$image['image'] = base64_decode($image['image']);
 
-			// validate image
+			// validate image (size and format)
 			$this->checkImage($image['image']);
 
 			$imageid = get_dbid('images', 'imageid');
@@ -316,33 +307,15 @@ class CImage extends CApiService {
 
 		$images = zbx_toArray($images);
 
-		if (self::$userData['type'] < USER_TYPE_ZABBIX_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
-		}
+		$this->validateUpdate($images);
 
 		foreach ($images as $image) {
-			if (!isset($image['imageid'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Wrong fields for image.'));
-			}
-
-			$imageExists = $this->get(array(
-				'filter' => array('name' => $image['name']),
-				'output' => array('imageid'),
-				'nopermissions' => true
-			));
-			$imageExists = reset($imageExists);
-
-			if ($imageExists && (bccomp($imageExists['imageid'], $image['imageid']) != 0)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $image['name']));
-			}
-
 			$values = array();
+
 			if (isset($image['name'])) {
 				$values['name'] = zbx_dbstr($image['name']);
 			}
-			if (isset($image['imagetype'])) {
-				$values['imagetype'] = $image['imagetype'];
-			}
+
 			if (isset($image['image'])) {
 				// decode BASE64
 				$image['image'] = base64_decode($image['image']);
@@ -404,15 +377,17 @@ class CImage extends CApiService {
 				}
 			}
 
-			$sqlUpd = array();
-			foreach ($values as $field => $value) {
-				$sqlUpd[] = $field.'='.$value;
-			}
-			$sql = 'UPDATE images SET '.implode(', ', $sqlUpd).' WHERE imageid='.zbx_dbstr($image['imageid']);
-			$result = DBexecute($sql);
+			if ($values) {
+				$sqlUpd = array();
+				foreach ($values as $field => $value) {
+					$sqlUpd[] = $field.'='.$value;
+				}
+				$sql = 'UPDATE images SET '.implode(', ', $sqlUpd).' WHERE imageid='.zbx_dbstr($image['imageid']);
+				$result = DBexecute($sql);
 
-			if (!$result) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Could not save image!'));
+				if (!$result) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _('Could not save image!'));
+				}
 			}
 		}
 
@@ -493,6 +468,119 @@ class CImage extends CApiService {
 	}
 
 	/**
+	 * Validate create.
+	 *
+	 * @param array $images
+	 *
+	 * @throws APIException if user has no permissions.
+	 * @throws APIException if wrong fields are passed.
+	 * @throws APIException if image with same name already exists.
+	 */
+	protected function validateCreate(array $images) {
+		// validate permissions
+		if (self::$userData['type'] < USER_TYPE_ZABBIX_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
+
+		// check fields
+		foreach ($images as $image) {
+			$imageDbFields = array(
+				'name' => null,
+				'image' => null,
+				'imagetype' => 1
+			);
+
+			if (!check_db_fields($imageDbFields, $image)) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Wrong fields for image "%1$s".', $image['name']));
+			}
+		}
+
+		// check host name duplicates
+		$collectionValidator = new CCollectionValidator(array(
+			'uniqueField' => 'name',
+			'messageDuplicate' => _('Image "%1$s" already exists.')
+		));
+		$this->checkValidator($images, $collectionValidator);
+
+		// check existing names
+		$dbImages = API::getApiService()->select($this->tableName(), array(
+			'output' => array('name'),
+			'filter' => array('name' => zbx_objectValues($images, 'name')),
+			'limit' => 1
+		));
+
+		if ($dbImages) {
+			$dbImage = reset($dbImages);
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $dbImage['name']));
+		}
+	}
+
+	/**
+	 * Validate update.
+	 *
+	 * @param array $images
+	 *
+	 * @throws APIException if user has no permissions.
+	 * @throws APIException if wrong fields are passed.
+	 * @throws APIException if image with same name already exists.
+	 */
+	protected function validateUpdate(array $images) {
+		if (self::$userData['type'] < USER_TYPE_ZABBIX_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
+
+		foreach ($images as $image) {
+			if (!check_db_fields(array('imageid'), $image)) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect input parameters.'));
+			}
+		}
+
+		$dbImages = API::getApiService()->select($this->tableName(), array(
+			'filter' => array('imageid' => zbx_objectValues($images, 'imageid')),
+			'output' => array('imageid', 'name'),
+			'preservekeys' => true
+		));
+
+		$changedImageNames = array();
+		foreach ($images as $image) {
+			if (!isset($dbImages[$image['imageid']])) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _('No permissions to referred object or it does not exist!'));
+			}
+
+			if (array_key_exists('imagetype', $image)) {
+				self::exception(
+					ZBX_API_ERROR_PARAMETERS,
+					_s('Cannot update "imagetype" for image "%1$s".', $dbImages[$image['imageid']]['name'])
+				);
+			}
+
+			if (isset($image['name']) && !zbx_empty($image['name'])
+					&& $dbImages[$image['imageid']]['name'] !== $image['name']) {
+				if (isset($changedImageNames[$image['name']])) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $image['name']));
+				}
+				else {
+					$changedImageNames[$image['name']] = $image['name'];
+				}
+			}
+		}
+
+		// check for existing image names
+		if ($changedImageNames) {
+			$dbImages = API::getApiService()->select($this->tableName(), array(
+				'output' => array('name'),
+				'filter' => array('name' => $changedImageNames),
+				'limit' => 1
+			));
+
+			if ($dbImages) {
+				$dbImage = reset($dbImages);
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $dbImage['name']));
+			}
+		}
+	}
+
+	/**
 	 * Validate image.
 	 *
 	 * @param string $image string representing image, for example, result of base64_decode()
@@ -511,4 +599,33 @@ class CImage extends CApiService {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('File format is unsupported.'));
 		}
 	}
+
+	/**
+	 * Unset "image" field from output.
+	 *
+	 * @param string $tableName
+	 * @param string $tableAlias
+	 * @param array  $options
+	 * @param array  $sqlParts
+	 *
+	 * @return array				The resulting SQL parts array
+	 */
+	protected function applyQueryOutputOptions($tableName, $tableAlias, array $options, array $sqlParts) {
+		if ($options['countOutput'] === null) {
+			if ($options['output'] == API_OUTPUT_EXTEND) {
+				$options['output'] = array('imageid', 'imagetype', 'name');
+			}
+			elseif (is_array($options['output']) && in_array('image', $options['output'])) {
+				foreach ($options['output'] as $idx => $field) {
+					if ($field === 'image') {
+						unset($options['output'][$idx]);
+					}
+				}
+			}
+
+			$sqlParts = parent::applyQueryOutputOptions($tableName, $tableAlias, $options, $sqlParts);
+		}
+
+		return $sqlParts;
+	}
 }
diff --git a/frontends/php/api/classes/CItem.php b/frontends/php/include/classes/api/services/CItem.php
index 0fb8113c2b5..fa6b888c739 100644
--- a/frontends/php/api/classes/CItem.php
+++ b/frontends/php/include/classes/api/services/CItem.php
@@ -134,7 +134,7 @@ class CItem extends CItemGeneral {
 					' WHERE i.hostid=hgg.hostid'.
 					' GROUP BY hgg.hostid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-						' AND MAX(r.permission)>='.$permission.
+						' AND MAX(r.permission)>='.zbx_dbstr($permission).
 					')';
 		}
 
@@ -405,16 +405,19 @@ class CItem extends CItemGeneral {
 	/**
 	 * Check if item exists.
 	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
 	 * @param array $object
 	 *
 	 * @return bool
 	 */
 	public function exists(array $object) {
+		$this->deprecated('item.exists method is deprecated.');
+
 		$options = array(
 			'filter' => array('key_' => $object['key_']),
 			'webitems' => true,
 			'output' => array('itemid'),
-			'nopermissions' => true,
 			'limit' => 1
 		);
 
@@ -601,97 +604,102 @@ class CItem extends CItemGeneral {
 	/**
 	 * Delete items.
 	 *
-	 * @param array $itemids
+	 * @param array $itemIds
+	 * @param bool  $noPermissions
 	 *
 	 * @return array
 	 */
-	public function delete(array $itemids, $nopermissions = false) {
-		if (empty($itemids)) {
+	public function delete(array $itemIds, $noPermissions = false) {
+		if (!$itemIds) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameter.'));
 		}
 
-		$itemids = array_keys(array_flip($itemids));
+		$itemIds = array_keys(array_flip($itemIds));
 
 		$delItems = $this->get(array(
-			'itemids' => $itemids,
-			'editable' => true,
-			'preservekeys' => true,
 			'output' => array('name', 'templateid'),
-			'selectHosts' => array('name')
+			'selectHosts' => array('name'),
+			'itemids' => $itemIds,
+			'editable' => true,
+			'preservekeys' => true
 		));
 
 		// TODO: remove $nopermissions hack
-		if (!$nopermissions) {
-			foreach ($itemids as $itemid) {
-				if (!isset($delItems[$itemid])) {
+		if (!$noPermissions) {
+			foreach ($itemIds as $itemId) {
+				if (!isset($delItems[$itemId])) {
 					self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 				}
-				if ($delItems[$itemid]['templateid'] != 0) {
+				if ($delItems[$itemId]['templateid'] != 0) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot delete templated item.'));
 				}
 			}
 		}
 
 		// first delete child items
-		$parentItemids = $itemids;
+		$parentItemIds = $itemIds;
 		do {
-			$dbItems = DBselect('SELECT i.itemid FROM items i WHERE '.dbConditionInt('i.templateid', $parentItemids));
-			$parentItemids = array();
+			$dbItems = DBselect('SELECT i.itemid FROM items i WHERE '.dbConditionInt('i.templateid', $parentItemIds));
+			$parentItemIds = array();
 			while ($dbItem = DBfetch($dbItems)) {
-				$parentItemids[] = $dbItem['itemid'];
-				$itemids[$dbItem['itemid']] = $dbItem['itemid'];
+				$parentItemIds[] = $dbItem['itemid'];
+				$itemIds[$dbItem['itemid']] = $dbItem['itemid'];
 			}
-		} while (!empty($parentItemids));
+		} while ($parentItemIds);
 
 		// delete graphs, leave if graph still have item
 		$delGraphs = array();
 		$dbGraphs = DBselect(
 			'SELECT gi.graphid'.
 			' FROM graphs_items gi'.
-			' WHERE '.dbConditionInt('gi.itemid', $itemids).
+			' WHERE '.dbConditionInt('gi.itemid', $itemIds).
 				' AND NOT EXISTS ('.
 					'SELECT NULL'.
 					' FROM graphs_items gii'.
 					' WHERE gii.graphid=gi.graphid'.
-						' AND '.dbConditionInt('gii.itemid', $itemids, true).
+						' AND '.dbConditionInt('gii.itemid', $itemIds, true).
 				')'
 		);
 		while ($dbGraph = DBfetch($dbGraphs)) {
 			$delGraphs[$dbGraph['graphid']] = $dbGraph['graphid'];
 		}
 
-		if (!empty($delGraphs)) {
-			$result = API::Graph()->delete($delGraphs, true);
-			if (!$result) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot delete graph.'));
-			}
+		if ($delGraphs) {
+			API::Graph()->delete($delGraphs, true);
 		}
 
 		// check if any graphs are referencing this item
-		$this->checkGraphReference($itemids);
+		$this->checkGraphReference($itemIds);
 
 		$triggers = API::Trigger()->get(array(
-			'itemids' => $itemids,
-			'output' => array('triggerid'),
+			'output' => array(),
+			'itemids' => $itemIds,
 			'nopermissions' => true,
 			'preservekeys' => true
 		));
-		if (!empty($triggers)) {
-			$result = API::Trigger()->delete(array_keys($triggers), true);
-			if (!$result) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot delete trigger.'));
-			}
+		if ($triggers) {
+			API::Trigger()->delete(array_keys($triggers), true);
+		}
+
+		$triggerPrototypes = API::TriggerPrototype()->get(array(
+			'output' => array(),
+			'itemids' => $itemIds,
+			'nopermissions' => true,
+			'preservekeys' => true
+		));
+		if ($triggerPrototypes) {
+			API::TriggerPrototype()->delete(array_keys($triggerPrototypes), true);
 		}
 
 		DB::delete('screens_items', array(
-			'resourceid' => $itemids,
+			'resourceid' => $itemIds,
 			'resourcetype' => array(SCREEN_RESOURCE_SIMPLE_GRAPH, SCREEN_RESOURCE_PLAIN_TEXT)
 		));
-		DB::delete('items', array('itemid' => $itemids));
+		DB::delete('items', array('itemid' => $itemIds));
 		DB::delete('profiles', array(
 			'idx' => 'web.favorite.graphids',
 			'source' => 'itemid',
-			'value_id' => $itemids
+			'value_id' => $itemIds
 		));
 
 		$itemDataTables = array(
@@ -704,12 +712,12 @@ class CItem extends CItemGeneral {
 			'history'
 		);
 		$insert = array();
-		foreach ($itemids as $itemid) {
+		foreach ($itemIds as $itemId) {
 			foreach ($itemDataTables as $table) {
 				$insert[] = array(
 					'tablename' => $table,
 					'field' => 'itemid',
-					'value' => $itemid
+					'value' => $itemId
 				);
 			}
 		}
@@ -721,7 +729,7 @@ class CItem extends CItemGeneral {
 			info(_s('Deleted: Item "%1$s" on "%2$s".', $item['name'], $host['name']));
 		}
 
-		return array('itemids' => $itemids);
+		return array('itemids' => $itemIds);
 	}
 
 	public function syncTemplates($data) {
@@ -1131,7 +1139,7 @@ class CItem extends CItemGeneral {
 			$requestedOutput['prevvalue'] = true;
 		}
 		if ($requestedOutput) {
-			$history = Manager::History()->getLast($result, 2);
+			$history = Manager::History()->getLast($result, 2, ZBX_HISTORY_PERIOD);
 			foreach ($result as &$item) {
 				$lastHistory = isset($history[$item['itemid']][0]) ? $history[$item['itemid']][0] : null;
 				$prevHistory = isset($history[$item['itemid']][1]) ? $history[$item['itemid']][1] : null;
diff --git a/frontends/php/api/classes/CItemGeneral.php b/frontends/php/include/classes/api/services/CItemGeneral.php
index 957c6e27e7e..2b9ee8f46d4 100644
--- a/frontends/php/api/classes/CItemGeneral.php
+++ b/frontends/php/include/classes/api/services/CItemGeneral.php
@@ -321,8 +321,8 @@ abstract class CItemGeneral extends CApiService {
 
 			// update interval
 			if ($fullItem['type'] != ITEM_TYPE_TRAPPER && $fullItem['type'] != ITEM_TYPE_SNMPTRAP) {
-				$res = calculateItemNextcheck(0, $fullItem['type'], $fullItem['delay'], $fullItem['delay_flex'], time());
-				if ($res == ZBX_JAN_2038) {
+				$nextCheck = calculateItemNextCheck(0, $fullItem['delay'], $fullItem['delay_flex'], time());
+				if ($nextCheck == ZBX_JAN_2038) {
 					self::exception(ZBX_API_ERROR_PARAMETERS,
 						_('Item will not be refreshed. Please enter a correct update interval.'));
 				}
@@ -621,7 +621,7 @@ abstract class CItemGeneral extends CApiService {
 	 * @abstract
 	 *
 	 * @param array $items          an array of items to inherit
-	 * @param array|null $hostids   an array of hosts to inherit to; if set to null, teh children will be updated on all
+	 * @param array|null $hostids   an array of hosts to inherit to; if set to null, the children will be updated on all
 	 *                              child hosts
 	 *
 	 * @return bool
@@ -786,7 +786,7 @@ abstract class CItemGeneral extends CApiService {
 
 		$sqlWhere = array();
 		foreach ($itemKeysByHostId as $hostId => $keys) {
-			$sqlWhere[] = '(i.hostid='.$hostId.' AND '.dbConditionString('i.key_', $keys).')';
+			$sqlWhere[] = '(i.hostid='.zbx_dbstr($hostId).' AND '.dbConditionString('i.key_', $keys).')';
 		}
 
 		if ($sqlWhere) {
diff --git a/frontends/php/api/classes/CItemPrototype.php b/frontends/php/include/classes/api/services/CItemPrototype.php
index c34bd872178..e8f93cdf40f 100644
--- a/frontends/php/api/classes/CItemPrototype.php
+++ b/frontends/php/include/classes/api/services/CItemPrototype.php
@@ -109,7 +109,7 @@ class CItemPrototype extends CItemGeneral {
 					' WHERE i.hostid=hgg.hostid'.
 					' GROUP BY hgg.hostid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-						' AND MAX(r.permission)>='.$permission.
+						' AND MAX(r.permission)>='.zbx_dbstr($permission).
 					')';
 		}
 
@@ -264,11 +264,21 @@ class CItemPrototype extends CItemGeneral {
 		return $result;
 	}
 
+	/**
+	 * Check if item prototype exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array $object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('itemprototype.exists method is deprecated.');
+
 		$options = array(
 			'filter' => array('key_' => $object['key_']),
 			'output' => array('itemid'),
-			'nopermissions' => 1,
 			'limit' => 1
 		);
 
@@ -474,7 +484,7 @@ class CItemPrototype extends CItemGeneral {
 				$parentItemids[$dbItem['itemid']] = $dbItem['itemid'];
 				$childPrototypeids[$dbItem['itemid']] = $dbItem['itemid'];
 			}
-		} while (!empty($parentItemids));
+		} while ($parentItemids);
 
 		$options = array(
 			'output' => API_OUTPUT_EXTEND,
@@ -490,16 +500,13 @@ class CItemPrototype extends CItemGeneral {
 
 		// delete graphs with this item prototype
 		$delGraphPrototypes = API::GraphPrototype()->get(array(
+			'output' => array(),
 			'itemids' => $prototypeids,
-			'output' => array('graphid'),
 			'nopermissions' => true,
 			'preservekeys' => true
 		));
-		if (!empty($delGraphPrototypes)) {
-			$result = API::GraphPrototype()->delete(zbx_objectValues($delGraphPrototypes, 'graphid'), true);
-			if (!$result) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot delete graph prototype'));
-			}
+		if ($delGraphPrototypes) {
+			API::GraphPrototype()->delete(array_keys($delGraphPrototypes), true);
 		}
 
 		// check if any graphs are referencing this item
@@ -512,28 +519,27 @@ class CItemPrototype extends CItemGeneral {
 		while ($item = DBfetch($dbItems)) {
 			$createdItems[$item['itemid']] = $item['itemid'];
 		}
-		if (!empty($createdItems)) {
-			$result = API::Item()->delete($createdItems, true);
-			if (!$result) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot delete items created by low level discovery.'));
-			}
+		if ($createdItems) {
+			API::Item()->delete($createdItems, true);
 		}
 
 
 // TRIGGER PROTOTYPES
 		$delTriggerPrototypes = API::TriggerPrototype()->get(array(
+			'output' => array(),
 			'itemids' => $prototypeids,
-			'output' => array('triggerid'),
 			'nopermissions' => true,
 			'preservekeys' => true,
 		));
-		if (!empty($delTriggerPrototypes)) {
-			$result = API::TriggerPrototype()->delete(zbx_objectValues($delTriggerPrototypes, 'triggerid'), true);
-			if (!$result) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Cannot delete trigger prototype'));
-			}
+		if ($delTriggerPrototypes) {
+			API::TriggerPrototype()->delete(array_keys($delTriggerPrototypes), true);
 		}
 
+		// screen items
+		DB::delete('screens_items', array(
+			'resourceid' => $prototypeids,
+			'resourcetype' => array(SCREEN_RESOURCE_LLD_SIMPLE_GRAPH)
+		));
 
 // ITEM PROTOTYPES
 		DB::delete('items', array('itemid' => $prototypeids));
diff --git a/frontends/php/api/classes/CMaintenance.php b/frontends/php/include/classes/api/services/CMaintenance.php
index 6c4880f8431..1114795ee48 100644
--- a/frontends/php/api/classes/CMaintenance.php
+++ b/frontends/php/include/classes/api/services/CMaintenance.php
@@ -144,7 +144,7 @@ class CMaintenance extends CApiService {
 						' GROUP by mh.hostid'.
 						' HAVING MIN(r.permission) IS NULL'.
 							' OR MIN(r.permission)='.PERM_DENY.
-							' OR MAX(r.permission)<'.$permission.
+							' OR MAX(r.permission)<'.zbx_dbstr($permission).
 						')'.
 					' AND NOT EXISTS ('.
 						'SELECT NULL'.
@@ -156,7 +156,7 @@ class CMaintenance extends CApiService {
 						' GROUP by mg.groupid'.
 						' HAVING MIN(r.permission) IS NULL'.
 							' OR MIN(r.permission)='.PERM_DENY.
-							' OR MAX(r.permission)<'.$permission.
+							' OR MAX(r.permission)<'.zbx_dbstr($permission).
 						')';
 
 			if (!is_null($options['groupids'])) {
@@ -255,18 +255,22 @@ class CMaintenance extends CApiService {
 
 
 	/**
-	 * Determine, whether an object already exists
+	 * Check if maintenance exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
 	 *
-	 * @param array $object
 	 * @return bool
 	 */
 	public function exists(array $object) {
+		$this->deprecated('maintenance.exists method is deprecated.');
+
 		$keyFields = array(array('maintenanceid', 'name'));
 
 		$options = array(
 			'filter' => zbx_array_mintersect($keyFields, $object),
 			'output' => array('maintenanceid'),
-			'nopermissions' => true,
 			'limit' => 1
 		);
 		$objs = $this->get($options);
@@ -274,9 +278,10 @@ class CMaintenance extends CApiService {
 	}
 
 	/**
-	 * Add maintenances
+	 * Add maintenances.
 	 *
 	 * @param array $maintenances
+	 *
 	 * @return boolean
 	 */
 	public function create(array $maintenances) {
@@ -332,21 +337,40 @@ class CMaintenance extends CApiService {
 		$insertTimeperiods = array();
 		$now = time();
 		$now -= $now % SEC_PER_MIN;
-		foreach ($maintenances as $mnum => $maintenance) {
+
+		// check fields
+		foreach ($maintenances as $maintenance) {
 			$dbFields = array(
 				'name' => null,
 				'active_since' => $now,
 				'active_till' => $now + SEC_PER_DAY
 			);
+
 			if (!check_db_fields($dbFields, $maintenance)) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect parameters for maintenance.'));
 			}
+		}
 
-			// validate if maintenance name already exists
-			if ($this->exists(array('name' => $maintenance['name']))) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Maintenance "%s" already exists.', $maintenance['name']));
-			}
+		$collectionValidator = new CCollectionValidator(array(
+			'uniqueField' => 'name',
+			'messageDuplicate' => _('Maintenance "%1$s" already exists.')
+		));
+		$this->checkValidator($maintenances, $collectionValidator);
+
+		// validate if maintenance name already exists
+		$dbMaintenances = $this->get(array(
+			'output' => array('name'),
+			'filter' => array('name' => zbx_objectValues($maintenances, 'name')),
+			'nopermissions' => true,
+			'limit' => 1
+		));
+
+		if ($dbMaintenances) {
+			$dbMaintenance = reset($dbMaintenances);
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Maintenance "%1$s" already exists.', $dbMaintenance['name']));
+		}
 
+		foreach ($maintenances as $mnum => $maintenance) {
 			// validate maintenance active since
 			if (!validateUnixTime($maintenance['active_since'])) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s('"%s" must be between 1970.01.01 and 2038.01.18.', _('Active since')));
@@ -417,9 +441,10 @@ class CMaintenance extends CApiService {
 	}
 
 	/**
-	 * Update maintenances
+	 * Update maintenances.
 	 *
 	 * @param array $maintenances
+	 *
 	 * @return boolean
 	 */
 	public function update(array $maintenances) {
@@ -431,8 +456,6 @@ class CMaintenance extends CApiService {
 			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
 
-		$hostids = array();
-		$groupids = array();
 		$updMaintenances = $this->get(array(
 			'maintenanceids' => zbx_objectValues($maintenances, 'maintenanceid'),
 			'editable' => true,
@@ -443,24 +466,48 @@ class CMaintenance extends CApiService {
 			'preservekeys' => true
 		));
 
+		$maintenanceNamesChanged = array();
 		foreach ($maintenances as $maintenance) {
 			if (!isset($updMaintenances[$maintenance['maintenanceid']])) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+				self::exception(ZBX_API_ERROR_PERMISSIONS, _(
+					'No permissions to referred object or it does not exist!'
+				));
 			}
 
-			// Checking whether a maintenance with this name already exists. First, getting all maintenances with the same name as this
-			$receivedMaintenances = API::Maintenance()->get(array(
-				'output' => array('maintenanceid'),
-				'filter' => array('name' => $maintenance['name'])
+			if (isset($maintenance['name']) && !zbx_empty($maintenance['name'])
+					&& $updMaintenances[$maintenance['maintenanceid']]['name'] !== $maintenance['name']) {
+				if (isset($maintenanceNamesChanged[$maintenance['name']])) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Maintenance "%1$s" already exists.',
+						$maintenance['name']
+					));
+				}
+				else {
+					$maintenanceNamesChanged[$maintenance['name']] = $maintenance['name'];
+				}
+			}
+		}
+
+		// check if maintenance already exists
+		if ($maintenanceNamesChanged) {
+			$dbMaintenances = $this->get(array(
+				'output' => array('name'),
+				'filter' => array('name' => $maintenanceNamesChanged),
+				'nopermissions' => true,
+				'limit' => 1
 			));
 
-			// validate if maintenance name already exists
-			foreach ($receivedMaintenances as $rMaintenance) {
-				if (bccomp($rMaintenance['maintenanceid'], $maintenance['maintenanceid']) != 0) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Maintenance "%s" already exists.', $maintenance['name']));
-				}
+			if ($dbMaintenances) {
+				$dbMaintenance = reset($dbMaintenances);
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Maintenance "%1$s" already exists.',
+					$dbMaintenance['name']
+				));
 			}
+		}
 
+		$hostids = array();
+		$groupids = array();
+
+		foreach ($maintenances as $maintenance) {
 			// validate maintenance active since
 			if (!validateUnixTime($maintenance['active_since'])) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s('"%s" must be between 1970.01.01 and 2038.01.18.', _('Active since')));
diff --git a/frontends/php/api/classes/CMap.php b/frontends/php/include/classes/api/services/CMap.php
index bf511c2ba23..e8fc97bc036 100644
--- a/frontends/php/api/classes/CMap.php
+++ b/frontends/php/include/classes/api/services/CMap.php
@@ -304,11 +304,21 @@ class CMap extends CMapElement {
 		));
 	}
 
+	/**
+	 * Check if map exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('map.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('sysmapid', 'name')), $object),
 			'output' => array('sysmapid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
@@ -449,11 +459,15 @@ class CMap extends CMapElement {
 
 				foreach ($map['urls'] as $url) {
 					if ($url['name'] === '' || $url['url'] === '') {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Link should have both "name" and "url" fields for map "%s".', $dbMap['name']));
+						self::exception(ZBX_API_ERROR_PARAMETERS,
+							_s('URL should have both "name" and "url" fields for map "%s".', $dbMap['name'])
+						);
 					}
 
 					if (!isset($urlNames[$url['name']])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Link name should be unique for map "%s".', $dbMap['name']));
+						self::exception(ZBX_API_ERROR_PARAMETERS,
+							_s('URL name should be unique for map "%s".', $dbMap['name'])
+						);
 					}
 
 					unset($urlNames[$url['name']]);
@@ -511,9 +525,9 @@ class CMap extends CMapElement {
 	 * @param string $maps['highlight']
 	 * @param array  $maps['label_type']
 	 * @param int    $maps['label_location']
-	 * @param int    $maps['grid_size']			size of a one grid cell. 100 refers to 100x100 and so on.
+	 * @param int    $maps['grid_size']			size of one grid cell. 100 refers to 100x100 and so on.
 	 * @param int    $maps['grid_show']			does grid need to be shown. Constants: SYSMAP_GRID_SHOW_ON / SYSMAP_GRID_SHOW_OFF
-	 * @param int    $maps['grid_align']		does elements need to be aligned to the grid. Constants: SYSMAP_GRID_ALIGN_ON / SYSMAP_GRID_ALIGN_OFF
+	 * @param int    $maps['grid_align']		do elements need to be aligned to the grid. Constants: SYSMAP_GRID_ALIGN_ON / SYSMAP_GRID_ALIGN_OFF
 	 *
 	 * @return array
 	 */
@@ -600,9 +614,9 @@ class CMap extends CMapElement {
 	 * @param string $maps['backgroundid']
 	 * @param array  $maps['label_type']
 	 * @param int    $maps['label_location']
-	 * @param int    $maps['grid_size']			size of a one grid cell. 100 refers to 100x100 and so on.
+	 * @param int    $maps['grid_size']			size of one grid cell. 100 refers to 100x100 and so on.
 	 * @param int    $maps['grid_show']			does grid need to be shown. Constants: SYSMAP_GRID_SHOW_ON / SYSMAP_GRID_SHOW_OFF
-	 * @param int    $maps['grid_align']		does elements need to be aligned to the grid. Constants: SYSMAP_GRID_ALIGN_ON / SYSMAP_GRID_ALIGN_OFF
+	 * @param int    $maps['grid_align']		do elements need to be aligned to the grid. Constants: SYSMAP_GRID_ALIGN_ON / SYSMAP_GRID_ALIGN_OFF
 	 *
 	 * @return array
 	 */
diff --git a/frontends/php/api/classes/CMapElement.php b/frontends/php/include/classes/api/services/CMapElement.php
index a8a9fb30219..a8a9fb30219 100644
--- a/frontends/php/api/classes/CMapElement.php
+++ b/frontends/php/include/classes/api/services/CMapElement.php
diff --git a/frontends/php/api/classes/CMediatype.php b/frontends/php/include/classes/api/services/CMediatype.php
index af27f1c5095..af27f1c5095 100644
--- a/frontends/php/api/classes/CMediatype.php
+++ b/frontends/php/include/classes/api/services/CMediatype.php
diff --git a/frontends/php/api/classes/CProxy.php b/frontends/php/include/classes/api/services/CProxy.php
index b027288fc98..cf28f0706c2 100644
--- a/frontends/php/api/classes/CProxy.php
+++ b/frontends/php/include/classes/api/services/CProxy.php
@@ -550,7 +550,7 @@ class CProxy extends CApiService {
 			1
 		));
 		if ($dRule) {
-			$proxy = DBfetch(DBselect('SELECT h.host FROM hosts h WHERE h.hostid='.$dRule['proxy_hostid']));
+			$proxy = DBfetch(DBselect('SELECT h.host FROM hosts h WHERE h.hostid='.zbx_dbstr($dRule['proxy_hostid'])));
 
 			self::exception(ZBX_API_ERROR_PARAMETERS,
 				_s('Proxy "%1$s" is used by discovery rule "%2$s".', $proxy['host'], $dRule['name']));
@@ -570,7 +570,7 @@ class CProxy extends CApiService {
 			1
 		));
 		if ($host) {
-			$proxy = DBfetch(DBselect('SELECT h.host FROM hosts h WHERE h.hostid='.$host['proxy_hostid']));
+			$proxy = DBfetch(DBselect('SELECT h.host FROM hosts h WHERE h.hostid='.zbx_dbstr($host['proxy_hostid'])));
 
 			self::exception(ZBX_API_ERROR_PARAMETERS,
 				_s('Host "%1$s" is monitored with proxy "%2$s".', $host['name'], $proxy['host']));
diff --git a/frontends/php/api/classes/CScreen.php b/frontends/php/include/classes/api/services/CScreen.php
index ca68cad9c98..6e49b6d9b0c 100644
--- a/frontends/php/api/classes/CScreen.php
+++ b/frontends/php/include/classes/api/services/CScreen.php
@@ -321,12 +321,22 @@ class CScreen extends CApiService {
 		return $result;
 	}
 
+	/**
+	 * Check if screen exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($data) {
+		$this->deprecated('screen.exists method is deprecated.');
+
 		$screens = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('screenid', 'name')), $data),
 			'preservekeys' => true,
 			'output' => array('screenid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
diff --git a/frontends/php/api/classes/CScreenItem.php b/frontends/php/include/classes/api/services/CScreenItem.php
index 7e47fa6e26b..0a32685d41c 100644
--- a/frontends/php/api/classes/CScreenItem.php
+++ b/frontends/php/include/classes/api/services/CScreenItem.php
@@ -51,7 +51,9 @@ class CScreenItem extends CApiService {
 		SCREEN_RESOURCE_EVENTS,
 		SCREEN_RESOURCE_HOSTGROUP_TRIGGERS,
 		SCREEN_RESOURCE_SYSTEM_STATUS,
-		SCREEN_RESOURCE_HOST_TRIGGERS
+		SCREEN_RESOURCE_HOST_TRIGGERS,
+		SCREEN_RESOURCE_LLD_GRAPH,
+		SCREEN_RESOURCE_LLD_SIMPLE_GRAPH
 	);
 
 	protected $sortColumns = array(
@@ -154,16 +156,16 @@ class CScreenItem extends CApiService {
 		$screenIds = array_keys(array_flip(zbx_objectValues($screenItems, 'screenid')));
 
 		$dbScreens = API::Screen()->get(array(
-			'screenids' => $screenIds,
 			'output' => array('screenid', 'hsize', 'vsize', 'name'),
+			'screenids' => $screenIds,
 			'editable' => true,
 			'preservekeys' => true
 		));
 
 		if (count($dbScreens) < count($screenIds)) {
 			$dbTemplateScreens = API::TemplateScreen()->get(array(
-				'screenids' => $screenIds,
 				'output' => array('screenid', 'hsize', 'vsize', 'name'),
+				'screenids' => $screenIds,
 				'editable' => true,
 				'preservekeys' => true
 			));
@@ -174,8 +176,8 @@ class CScreenItem extends CApiService {
 		}
 
 		$dbScreenItems = $this->get(array(
-			'screenids' => $screenIds,
 			'output' => array('screenitemid', 'screenid', 'x', 'y', 'rowspan', 'colspan'),
+			'screenids' => $screenIds,
 			'editable' => true,
 			'preservekeys' => true
 		));
@@ -245,15 +247,15 @@ class CScreenItem extends CApiService {
 		$screenItemIds = array_keys($screenItems);
 
 		$dbScreens = API::Screen()->get(array(
-			'screenitemids' => $screenItemIds,
 			'output' => array('screenid', 'hsize', 'vsize', 'name'),
+			'screenitemids' => $screenItemIds,
 			'editable' => true,
 			'preservekeys' => true
 		));
 
 		$dbTemplateScreens = API::TemplateScreen()->get(array(
-			'screenitemids' => $screenItemIds,
 			'output' => array('screenid', 'hsize', 'vsize', 'name'),
+			'screenitemids' => $screenItemIds,
 			'editable' => true,
 			'preservekeys' => true
 		));
@@ -263,8 +265,8 @@ class CScreenItem extends CApiService {
 		}
 
 		$dbScreenItems = $this->get(array(
-			'screenitemids' => $screenItemIds,
 			'output' => array('screenitemid', 'screenid', 'x', 'y', 'rowspan', 'colspan', 'resourcetype', 'resourceid'),
+			'screenitemids' => $screenItemIds,
 			'editable' => true,
 			'preservekeys' => true
 		));
@@ -303,8 +305,8 @@ class CScreenItem extends CApiService {
 		}
 
 		$dbScreenItems = $this->get(array(
-			'screenids' => zbx_objectValues($screenItems, 'screenid'),
 			'output' => array('screenitemid', 'screenid', 'x', 'y'),
+			'screenids' => zbx_objectValues($screenItems, 'screenid'),
 			'editable' => true,
 			'preservekeys' => true
 		));
@@ -433,7 +435,14 @@ class CScreenItem extends CApiService {
 	 * @param array $dbScreenItems
 	 */
 	protected function checkInput(array $screenItems, array $dbScreenItems = array()) {
-		$hostGroupsIds = $hostIds = $graphIds = $itemIds = $mapIds = $screenIds = array();
+		$hostGroupsIds = array();
+		$hostIds = array();
+		$graphIds = array();
+		$itemIds = array();
+		$mapIds = array();
+		$screenIds = array();
+		$itemPrototypeIds = array();
+		$graphPrototypeIds = array();
 
 		$screenItems = $this->extendFromObjects($screenItems, $dbScreenItems, array('resourcetype', 'resourceid'));
 
@@ -458,9 +467,12 @@ class CScreenItem extends CApiService {
 				case SCREEN_RESOURCE_TRIGGERS_OVERVIEW:
 				case SCREEN_RESOURCE_HOSTGROUP_TRIGGERS:
 				case SCREEN_RESOURCE_DATA_OVERVIEW:
-					if (in_array($screenItem['resourcetype'], array(SCREEN_RESOURCE_TRIGGERS_OVERVIEW, SCREEN_RESOURCE_DATA_OVERVIEW))) {
+					$overviewResources = array(SCREEN_RESOURCE_TRIGGERS_OVERVIEW, SCREEN_RESOURCE_DATA_OVERVIEW);
+					if (in_array($screenItem['resourcetype'], $overviewResources)) {
 						if (!$screenItem['resourceid']) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _('No host group ID provided for screen element.'));
+							self::exception(ZBX_API_ERROR_PARAMETERS, _(
+								'No host group ID provided for screen element.'
+							));
 						}
 					}
 
@@ -483,6 +495,26 @@ class CScreenItem extends CApiService {
 					$graphIds[$screenItem['resourceid']] = $screenItem['resourceid'];
 					break;
 
+				case SCREEN_RESOURCE_LLD_GRAPH:
+					if (!$screenItem['resourceid']) {
+						self::exception(ZBX_API_ERROR_PARAMETERS, _(
+							'No graph prototype ID provided for screen element.'
+						));
+					}
+
+					$graphPrototypeIds[$screenItem['resourceid']] = $screenItem['resourceid'];
+					break;
+
+				case SCREEN_RESOURCE_LLD_SIMPLE_GRAPH:
+					if (!$screenItem['resourceid']) {
+						self::exception(ZBX_API_ERROR_PARAMETERS, _(
+							'No item prototype ID provided for screen element.'
+						));
+					}
+
+					$itemPrototypeIds[$screenItem['resourceid']] = $screenItem['resourceid'];
+					break;
+
 				case SCREEN_RESOURCE_SIMPLE_GRAPH:
 				case SCREEN_RESOURCE_PLAIN_TEXT:
 					if (!$screenItem['resourceid']) {
@@ -535,37 +567,45 @@ class CScreenItem extends CApiService {
 					case SCREEN_RESOURCE_HOST_TRIGGERS:
 					case SCREEN_RESOURCE_PLAIN_TEXT:
 						if ($screenItem['elements'] < 1 || $screenItem['elements'] > 100) {
-							self::exception(
-								ZBX_API_ERROR_PARAMETERS,
-								_s(
-									'Incorrect value "%1$s" for "%2$s" field: must be between %3$s and %4$s.',
-									$screenItem['elements'],
-									'elements',
-									1,
-									100
-								)
-							);
+							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+								'Incorrect value "%1$s" for "%2$s" field: must be between %3$s and %4$s.',
+								$screenItem['elements'], 'elements', 1, 100
+							));
 						}
 						break;
 				}
 			}
+
+			// check 'max_columns' parameter for LLD screen resources:
+			// is set and valid for create method, and is valid for update method, if set
+			$dbScreenItem = isset($screenItem['screenitemid']) ? $dbScreenItems[$screenItem['screenitemid']] : null;
+
+			$lldResources = array(SCREEN_RESOURCE_LLD_GRAPH, SCREEN_RESOURCE_LLD_SIMPLE_GRAPH);
+			if (in_array($screenItem['resourcetype'], $lldResources)) {
+				$set = isset($screenItem['max_columns']);
+				$valid = ($set && $this->isValidMaxColumns($screenItem['max_columns']));
+
+				$error = ($dbScreenItem ? ($set && !$valid) : (!$set || !$valid));
+				if ($error) {
+					self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect max columns provided for screen element.'));
+				}
+			}
 		}
 
 		// check host groups
 		if ($hostGroupsIds) {
 			$dbHostGroups = API::HostGroup()->get(array(
-				'groupids' => $hostGroupsIds,
 				'output' => array('groupid'),
+				'groupids' => $hostGroupsIds,
 				'editable' => true,
 				'preservekeys' => true
 			));
 
 			foreach ($hostGroupsIds as $hostGroupsId) {
 				if (!isset($dbHostGroups[$hostGroupsId])) {
-					self::exception(
-						ZBX_API_ERROR_PERMISSIONS,
-						_s('Incorrect host group ID "%1$s" provided for screen element.', $hostGroupsId)
-					);
+					self::exception(ZBX_API_ERROR_PERMISSIONS, _s(
+						'Incorrect host group ID "%1$s" provided for screen element.', $hostGroupsId
+					));
 				}
 			}
 		}
@@ -573,18 +613,17 @@ class CScreenItem extends CApiService {
 		// check hosts
 		if ($hostIds) {
 			$dbHosts = API::Host()->get(array(
-				'hostids' => $hostIds,
 				'output' => array('hostid'),
+				'hostids' => $hostIds,
 				'editable' => true,
 				'preservekeys' => true
 			));
 
 			foreach ($hostIds as $hostId) {
 				if (!isset($dbHosts[$hostId])) {
-					self::exception(
-						ZBX_API_ERROR_PERMISSIONS,
-						_s('Incorrect host ID "%1$s" provided for screen element.', $hostId)
-					);
+					self::exception(ZBX_API_ERROR_PERMISSIONS, _s(
+						'Incorrect host ID "%1$s" provided for screen element.', $hostId
+					));
 				}
 			}
 		}
@@ -592,18 +631,35 @@ class CScreenItem extends CApiService {
 		// check graphs
 		if ($graphIds) {
 			$dbGraphs = API::Graph()->get(array(
-				'graphids' => $graphIds,
 				'output' => array('graphid'),
+				'graphids' => $graphIds,
 				'editable' => true,
 				'preservekeys' => true
 			));
 
 			foreach ($graphIds as $graphId) {
 				if (!isset($dbGraphs[$graphId])) {
-					self::exception(
-						ZBX_API_ERROR_PERMISSIONS,
-						_s('Incorrect graph ID "%1$s" provided for screen element.', $graphId)
-					);
+					self::exception(ZBX_API_ERROR_PERMISSIONS, _s(
+						'Incorrect graph ID "%1$s" provided for screen element.', $graphId
+					));
+				}
+			}
+		}
+
+		// check graph prototypes
+		if ($graphPrototypeIds) {
+			$dbGraphPrototypes = API::GraphPrototype()->get(array(
+				'output' => array('graphid'),
+				'graphids' => $graphPrototypeIds,
+				'editable' => true,
+				'preservekeys' => true
+			));
+
+			foreach ($graphPrototypeIds as $graphPrototypeId) {
+				if (!isset($dbGraphPrototypes[$graphPrototypeId])) {
+					self::exception(ZBX_API_ERROR_PERMISSIONS, _s(
+						'Incorrect graph prototype ID "%1$s" provided for screen element.', $graphPrototypeId
+					));
 				}
 			}
 		}
@@ -611,8 +667,8 @@ class CScreenItem extends CApiService {
 		// check items
 		if ($itemIds) {
 			$dbItems = API::Item()->get(array(
-				'itemids' => $itemIds,
 				'output' => array('itemid'),
+				'itemids' => $itemIds,
 				'editable' => true,
 				'preservekeys' => true,
 				'webitems' => true
@@ -620,10 +676,27 @@ class CScreenItem extends CApiService {
 
 			foreach ($itemIds as $itemId) {
 				if (!isset($dbItems[$itemId])) {
-					self::exception(
-						ZBX_API_ERROR_PERMISSIONS,
-						_s('Incorrect item ID "%1$s" provided for screen element.', $itemId)
-					);
+					self::exception(ZBX_API_ERROR_PERMISSIONS, _s(
+						'Incorrect item ID "%1$s" provided for screen element.', $itemId
+					));
+				}
+			}
+		}
+
+		// check item prototypes
+		if ($itemPrototypeIds) {
+			$dbItemPrototypes = API::ItemPrototype()->get(array(
+				'output' => array('itemid'),
+				'itemids' => $itemPrototypeIds,
+				'editable' => true,
+				'preservekeys' => true
+			));
+
+			foreach ($itemPrototypeIds as $itemPrototypeId) {
+				if (!isset($dbItemPrototypes[$itemPrototypeId])) {
+					self::exception(ZBX_API_ERROR_PERMISSIONS, _s(
+						'Incorrect item prototype ID "%1$s" provided for screen element.', $itemPrototypeId
+					));
 				}
 			}
 		}
@@ -631,18 +704,17 @@ class CScreenItem extends CApiService {
 		// check maps
 		if ($mapIds) {
 			$dbMaps = API::Map()->get(array(
-				'sysmapids' => $mapIds,
 				'output' => array('sysmapid'),
+				'sysmapids' => $mapIds,
 				'editable' => true,
 				'preservekeys' => true
 			));
 
 			foreach ($mapIds as $mapId) {
 				if (!isset($dbMaps[$mapId])) {
-					self::exception(
-						ZBX_API_ERROR_PERMISSIONS,
-						_s('Incorrect map ID "%1$s" provided for screen element.', $mapId)
-					);
+					self::exception(ZBX_API_ERROR_PERMISSIONS, _s(
+						'Incorrect map ID "%1$s" provided for screen element.', $mapId
+					));
 				}
 			}
 		}
@@ -650,16 +722,16 @@ class CScreenItem extends CApiService {
 		// check screens
 		if ($screenIds) {
 			$dbScreens = API::Screen()->get(array(
-				'screenids' => $screenIds,
 				'output' => array('screenid'),
+				'screenids' => $screenIds,
 				'editable' => true,
 				'preservekeys' => true
 			));
 
 			if (count($dbScreens) < count($screenIds)) {
 				$dbTemplateScreens = API::TemplateScreen()->get(array(
-					'screenids' => $screenIds,
 					'output' => array('screenid'),
+					'screenids' => $screenIds,
 					'editable' => true,
 					'preservekeys' => true
 				));
@@ -671,10 +743,9 @@ class CScreenItem extends CApiService {
 
 			foreach ($screenIds as $screenId) {
 				if (!isset($dbScreens[$screenId])) {
-					self::exception(
-						ZBX_API_ERROR_PERMISSIONS,
-						_s('Incorrect screen ID "%1$s" provided for screen element.', $screenId)
-					);
+					self::exception(ZBX_API_ERROR_PERMISSIONS, _s(
+						'Incorrect screen ID "%1$s" provided for screen element.', $screenId
+					));
 				}
 			}
 		}
@@ -701,7 +772,7 @@ class CScreenItem extends CApiService {
 	 */
 	protected function checkSpans(array $screenItem, array $screen) {
 		if (isset($screenItem['rowspan'])) {
-			if (!zbx_is_int($screenItem['rowspan']) || $screenItem['rowspan'] < 0) {
+			if (!zbx_is_int($screenItem['rowspan']) || $screenItem['rowspan'] < 1) {
 				self::exception(
 					ZBX_API_ERROR_PARAMETERS,
 					_s(
@@ -715,7 +786,7 @@ class CScreenItem extends CApiService {
 		}
 
 		if (isset($screenItem['colspan'])) {
-			if (!zbx_is_int($screenItem['colspan']) || $screenItem['colspan'] < 0) {
+			if (!zbx_is_int($screenItem['colspan']) || $screenItem['colspan'] < 1) {
 				self::exception(
 					ZBX_API_ERROR_PARAMETERS,
 					_s(
@@ -808,7 +879,10 @@ class CScreenItem extends CApiService {
 					continue;
 				}
 
-				if ($screenItem['x'] == $screenItem2['x'] && $screenItem['y'] == $screenItem2['y']) {
+				if ($screenItem['x'] == $screenItem2['x'] &&
+					$screenItem['y'] == $screenItem2['y'] &&
+					$screenItem['screenid'] == $screenItem2['screenid']
+				) {
 					$screenId = isset($screenItem['screenitemid'])
 						? $dbScreenItems[$screenItem['screenitemid']]['screenid']
 						: $screenItem['screenid'];
@@ -896,4 +970,16 @@ class CScreenItem extends CApiService {
 
 		return $sqlParts;
 	}
+
+	/**
+	 * Checks if value of $maxColumns valid in respect to SCREEN_SURROGATE_MAX_COLUMNS_MIN and
+	 * SCREEN_SURROGATE_MAX_COLUMNS_MIN constants. Returns true if valid, false otherwise.
+	 *
+	 * @param integer $maxColumns
+	 *
+	 * @return bool
+	 */
+	protected function isValidMaxColumns($maxColumns) {
+		return ($maxColumns >= SCREEN_SURROGATE_MAX_COLUMNS_MIN && $maxColumns <= SCREEN_SURROGATE_MAX_COLUMNS_MAX);
+	}
 }
diff --git a/frontends/php/api/classes/CScript.php b/frontends/php/include/classes/api/services/CScript.php
index fa658a2fe3b..fa658a2fe3b 100644
--- a/frontends/php/api/classes/CScript.php
+++ b/frontends/php/include/classes/api/services/CScript.php
diff --git a/frontends/php/api/classes/CService.php b/frontends/php/include/classes/api/services/CService.php
index addf8b5ed3f..8256f1a766f 100644
--- a/frontends/php/api/classes/CService.php
+++ b/frontends/php/include/classes/api/services/CService.php
@@ -186,7 +186,7 @@ class CService extends CApiService {
 			$this->addTimes($serviceTimes);
 		}
 
-		update_services_status_all();
+		updateItServices();
 
 		return array('serviceids' => $serviceIds);
 	}
@@ -322,7 +322,7 @@ class CService extends CApiService {
 			$this->addTimes($serviceTimes);
 		}
 
-		update_services_status_all();
+		updateItServices();
 
 		return array('serviceids' => zbx_objectValues($services, 'serviceid'));
 	}
@@ -357,7 +357,7 @@ class CService extends CApiService {
 
 		DB::delete($this->tableName(), array('serviceid' => $serviceIds));
 
-		update_services_status_all();
+		updateItServices();
 
 		return array('serviceids' => $serviceIds);
 	}
@@ -608,6 +608,8 @@ class CService extends CApiService {
 					$rs = $this->escalateProblems($services, $problemTriggers, $rs);
 				}
 
+				$slaCalculator = new CServicesSlaCalculator();
+
 				// calculate SLAs
 				foreach ($intervals as $interval) {
 					$latestValues = $this->fetchLatestValues($usedSeviceIds, $interval['from']);
@@ -618,7 +620,9 @@ class CService extends CApiService {
 						// only calculate the sla for services which require it
 						if (isset($usedSeviceIds[$serviceId])) {
 							$latestValue = (isset($latestValues[$serviceId])) ? $latestValues[$serviceId] : 0;
-							$intervalSla = $this->calculateSla($service, $interval['from'], $interval['to'], $latestValue);
+							$intervalSla = $slaCalculator->calculateSla($service['alarms'], $service['times'],
+								$interval['from'], $interval['to'], $latestValue
+							);
 						}
 						else {
 							$intervalSla = array(
@@ -708,211 +712,6 @@ class CService extends CApiService {
 		));
 	}
 
-	/**
-	 * Calculates the SLA for the given service during the given period.
-	 *
-	 * Returns the following information:
-	 * - ok             - the percentage of time the service was in OK state;
-	 * - problem        - the percentage of time the service was in problem state;
-	 * - okTime         - the time the service was in OK state, in seconds;
-	 * - problemTime    - the time the service was in problem state, in seconds;
-	 * - downtimeTime   - the time the service was down, in seconds;
-	 * - dt;
-	 * - ut.
-	 *
-	 * @param array $service
-	 * @param $periodStart
-	 * @param $periodEnd
-	 * @param $prevAlarm        the value of the last service alarm
-	 *
-	 * @return array
-	 */
-	protected function calculateSla(array $service, $periodStart, $periodEnd, $prevAlarm) {
-		/**
-		 * structure of "$data":
-		 * - key	- time stamp
-		 * - alarm	- on/off status (0,1 - off; >1 - on)
-		 * - dt_s	- count of downtime starts
-		 * - dt_e	- count of downtime ends
-		 * - ut_s	- count of uptime starts
-		 * - ut_e	- count of uptime ends
-		 */
-		foreach ($service['alarms'] as $alarm) {
-			if ($alarm['clock'] >= $periodStart && $alarm['clock'] <= $periodEnd) {
-				$data[$alarm['clock']]['alarm'] = $alarm['value'];
-			}
-		}
-
-		$unmarkedPeriodType = 'ut';
-
-		foreach ($service['times'] as $time) {
-			if ($time['type'] == SERVICE_TIME_TYPE_UPTIME) {
-				$this->expandPeriodicalTimes($data, $periodStart, $periodEnd, $time['ts_from'], $time['ts_to'], 'ut');
-
-				// if an uptime period exists - unmarked time is downtime
-				$unmarkedPeriodType = 'dt';
-			}
-			elseif ($time['type'] == SERVICE_TIME_TYPE_DOWNTIME) {
-				$this->expandPeriodicalTimes($data, $periodStart, $periodEnd, $time['ts_from'], $time['ts_to'], 'dt');
-			}
-			elseif($time['type'] == SERVICE_TIME_TYPE_ONETIME_DOWNTIME && $time['ts_to'] >= $periodStart && $time['ts_from'] <= $periodEnd) {
-				if ($time['ts_from'] < $periodStart) {
-					$time['ts_from'] = $periodStart;
-				}
-				if ($time['ts_to'] > $periodEnd) {
-					$time['ts_to'] = $periodEnd;
-				}
-
-				if (isset($data[$time['ts_from']]['dt_s'])) {
-					$data[$time['ts_from']]['dt_s']++;
-				}
-				else {
-					$data[$time['ts_from']]['dt_s'] = 1;
-				}
-
-				if (isset($data[$time['ts_to']]['dt_e'])) {
-					$data[$time['ts_to']]['dt_e']++;
-				}
-				else {
-					$data[$time['ts_to']]['dt_e'] = 1;
-				}
-			}
-		}
-
-		if (!isset($data[$periodEnd])) {
-			$data[$periodEnd] = array();
-		}
-
-		// sort by time stamp
-		ksort($data);
-
-		// calculate times
-		$dtCnt = 0;
-		$utCnt = 0;
-		$slaTime = array(
-			'dt' => array('problemTime' => 0, 'okTime' => 0),
-			'ut' => array('problemTime' => 0, 'okTime' => 0)
-		);
-		$prevTime = $periodStart;
-
-		if (isset($data[$periodStart]['ut_s'])) {
-			$utCnt += $data[$periodStart]['ut_s'];
-		}
-		if (isset($data[$periodStart]['ut_e'])) {
-			$utCnt -= $data[$periodStart]['ut_e'];
-		}
-		if (isset($data[$periodStart]['dt_s'])) {
-			$dtCnt += $data[$periodStart]['dt_s'];
-		}
-		if (isset($data[$periodStart]['dt_e'])) {
-			$dtCnt -= $data[$periodStart]['dt_e'];
-		}
-		foreach ($data as $ts => $val) {
-			// skip first data [already read]
-			if ($ts == $periodStart) {
-				continue;
-			}
-
-			if ($dtCnt > 0) {
-				$periodType = 'dt';
-			}
-			elseif ($utCnt > 0) {
-				$periodType = 'ut';
-			}
-			else {
-				$periodType = $unmarkedPeriodType;
-			}
-
-			// state=0,1 [OK] (1 - information severity of trigger), >1 [PROBLEMS] (trigger severity)
-			if ($prevAlarm > 1) {
-				$slaTime[$periodType]['problemTime'] += $ts - $prevTime;
-			}
-			else {
-				$slaTime[$periodType]['okTime'] += $ts - $prevTime;
-			}
-
-			if (isset($val['ut_s'])) {
-				$utCnt += $val['ut_s'];
-			}
-			if (isset($val['ut_e'])) {
-				$utCnt -= $val['ut_e'];
-			}
-			if (isset($val['dt_s'])) {
-				$dtCnt += $val['dt_s'];
-			}
-			if (isset($val['dt_e'])) {
-				$dtCnt -= $val['dt_e'];
-			}
-			if (isset($val['alarm'])) {
-				$prevAlarm = $val['alarm'];
-			}
-
-			$prevTime = $ts;
-		}
-
-		$slaTime['problemTime'] = &$slaTime['ut']['problemTime'];
-		$slaTime['okTime'] = &$slaTime['ut']['okTime'];
-		$slaTime['downtimeTime'] = $slaTime['dt']['okTime'] + $slaTime['dt']['problemTime'];
-
-		$fullTime = $slaTime['problemTime'] + $slaTime['okTime'];
-		if ($fullTime > 0) {
-			$slaTime['problem'] = 100 * $slaTime['problemTime'] / $fullTime;
-			$slaTime['ok'] = 100 * $slaTime['okTime'] / $fullTime;
-		}
-		else {
-			$slaTime['problem'] = 100;
-			$slaTime['ok'] = 100;
-		}
-
-		return $slaTime;
-	}
-
-	/**
-	 * @see calculateSla()
-	 *
-	 * @param $data
-	 * @param $period_start
-	 * @param $period_end
-	 * @param $ts_from
-	 * @param $ts_to
-	 * @param $type
-	 *
-	 * @return void
-	 */
-	function expandPeriodicalTimes(&$data, $period_start, $period_end, $ts_from, $ts_to, $type) {
-		$week = getdate($period_start);
-		$week = $period_start - $week['wday'] * SEC_PER_DAY - $week['hours'] * SEC_PER_HOUR - $week['minutes'] * SEC_PER_MIN - $week['seconds'];
-
-		for (; $week < $period_end; $week += SEC_PER_WEEK) {
-			$_s = $week + $ts_from;
-			$_e = $week + $ts_to;
-
-			if ($period_end < $_s || $period_start >= $_e) {
-				continue;
-			}
-
-			if ($_s < $period_start) {
-				$_s = $period_start;
-			}
-			if ($_e > $period_end) {
-				$_e = $period_end;
-			}
-
-			if (isset($data[$_s][$type.'_s'])) {
-				$data[$_s][$type.'_s']++;
-			}
-			else {
-				$data[$_s][$type.'_s'] = 1;
-			}
-
-			if (isset($data[$_e][$type.'_e'])) {
-				$data[$_e][$type.'_e']++;
-			}
-			else {
-				$data[$_e][$type.'_e'] = 1;
-			}
-		}
-	}
 
 	/**
 	 * Returns an array of triggers which are in a problem state and are linked to the given services.
@@ -1405,7 +1204,7 @@ class CService extends CApiService {
 	 *
 	 * @throws APIException if at least one cycle is possible
 	 *
-	 * @param array $depsToValid	dpendency list to be validated
+	 * @param array $depsToValid	dependency list to be validated
 	 *
 	 * @return void
 	 */
@@ -1423,7 +1222,7 @@ class CService extends CApiService {
 			$arr[$dbDep['serviceupid']][$dbDep['servicedownid']] = $dbDep['servicedownid'];
 		}
 
-		// chech for circularity and add dependencies to the graph
+		// check for circularity and add dependencies to the graph
 		foreach ($depsToValid as $dep) {
 			$this->DFCircularitySearch($dep['serviceid'], $dep['dependsOnServiceid'], $arr);
 			$arr[$dep['serviceid']][$dep['dependsOnServiceid']] = $dep['dependsOnServiceid'];
diff --git a/frontends/php/api/classes/CTemplate.php b/frontends/php/include/classes/api/services/CTemplate.php
index 2c085d1af76..9fe7e329a0d 100644
--- a/frontends/php/api/classes/CTemplate.php
+++ b/frontends/php/include/classes/api/services/CTemplate.php
@@ -121,7 +121,7 @@ class CTemplate extends CHostGeneral {
 					' WHERE h.hostid=hgg.hostid'.
 					' GROUP BY hgg.hostid'.
 					' HAVING MIN(r.permission)>'.PERM_DENY.
-						' AND MAX(r.permission)>='.$permission.
+						' AND MAX(r.permission)>='.zbx_dbstr($permission).
 					')';
 		}
 
@@ -307,11 +307,21 @@ class CTemplate extends CHostGeneral {
 		));
 	}
 
+	/**
+	 * Check if template exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('template.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('templateid', 'host', 'name')), $object),
 			'output' => array('templateid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
@@ -437,24 +447,48 @@ class CTemplate extends CHostGeneral {
 			}
 
 			if (isset($template['host'])) {
-				if ($this->exists(array('host' => $template['host']))) {
+				$templateExists = API::Template()->get(array(
+					'output' => array('templateid'),
+					'filter' => array('host' => $template['host']),
+					'nopermissions' => true,
+					'limit' => 1
+				));
+				if ($templateExists) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Template "%1$s" already exists.', $template['host']));
 				}
 
-				if (API::Host()->exists(array('host' => $template['host']))) {
+				$hostExists = API::Host()->get(array(
+					'output' => array('hostid'),
+					'filter' => array('host' => $template['host']),
+					'nopermissions' => true,
+					'limit' => 1
+				));
+				if ($hostExists) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Host "%1$s" already exists.', $template['host']));
 				}
 			}
 
 			if (isset($template['name'])) {
-				if ($this->exists(array('name' => $template['name']))) {
+				$templateExists = API::Template()->get(array(
+					'output' => array('templateid'),
+					'filter' => array('name' => $template['name']),
+					'nopermissions' => true,
+					'limit' => 1
+				));
+				if ($templateExists) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _s(
 						'Template with the same visible name "%1$s" already exists.',
 						$template['name']
 					));
 				}
 
-				if (API::Host()->exists(array('name' => $template['name']))) {
+				$hostExists = API::Host()->get(array(
+					'output' => array('hostid'),
+					'filter' => array('name' => $template['name']),
+					'nopermissions' => true,
+					'limit' => 1
+				));
+				if ($hostExists) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, _s(
 						'Host with the same visible name "%1$s" already exists.',
 						$template['name']
@@ -580,9 +614,6 @@ class CTemplate extends CHostGeneral {
 			API::Item()->delete(array_keys($delItems), true);
 		}
 
-		// delete screen items
-		DBexecute('DELETE FROM screens_items WHERE '.dbConditionInt('resourceid', $templateids).' AND resourcetype='.SCREEN_RESOURCE_HOST_TRIGGERS);
-
 		// delete host from maps
 		if (!empty($templateids)) {
 			DB::delete('sysmaps_elements', array('elementtype' => SYSMAP_ELEMENT_TYPE_HOST, 'elementid' => $templateids));
@@ -955,24 +986,27 @@ class CTemplate extends CHostGeneral {
 
 			$templateExists = $this->get(array(
 				'output' => array('templateid'),
-				'filter' => array('name' => $template['name']),
-				'editable' => true,
+				'filter' => array('name' => $data['name']),
 				'nopermissions' => true
 			));
 			$templateExist = reset($templateExists);
-
 			if ($templateExist && bccomp($templateExist['templateid'], $template['templateid']) != 0) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
 					'Template with the same visible name "%1$s" already exists.',
-					$template['name']
+					$data['name']
 				));
 			}
 
 			// can't set the same name as existing host
-			if (API::Host()->exists(array('name' => $template['name']))) {
+			$hostExists = API::Host()->get(array(
+				'output' => array('hostid'),
+				'filter' => array('name' => $data['name']),
+				'nopermissions' => true
+			));
+			if ($hostExists) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
 					'Host with the same visible name "%1$s" already exists.',
-					$template['name']
+					$data['name']
 				));
 			}
 		}
@@ -987,12 +1021,10 @@ class CTemplate extends CHostGeneral {
 
 			$templateExists = $this->get(array(
 				'output' => array('templateid'),
-				'filter' => array('host' => $template['host']),
-				'editable' => true,
+				'filter' => array('host' => $data['host']),
 				'nopermissions' => true
 			));
 			$templateExist = reset($templateExists);
-
 			if ($templateExist && bccomp($templateExist['templateid'], $template['templateid']) != 0) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
 					'Template with the same name "%1$s" already exists.',
@@ -1001,7 +1033,12 @@ class CTemplate extends CHostGeneral {
 			}
 
 			// can't set the same name as existing host
-			if (API::Host()->exists(array('host' => $template['host']))) {
+			$hostExists = API::Host()->get(array(
+				'output' => array('hostid'),
+				'filter' => array('host' => $template['host']),
+				'nopermissions' => true
+			));
+			if ($hostExists) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
 					'Host with the same name "%1$s" already exists.',
 					$template['host']
diff --git a/frontends/php/api/classes/CTemplateScreen.php b/frontends/php/include/classes/api/services/CTemplateScreen.php
index 6d71dacf1e2..ee304b8a859 100644
--- a/frontends/php/api/classes/CTemplateScreen.php
+++ b/frontends/php/include/classes/api/services/CTemplateScreen.php
@@ -126,7 +126,7 @@ class CTemplateScreen extends CScreen {
 						' WHERE s.templateid=hgg.hostid'.
 						' GROUP BY hgg.hostid'.
 						' HAVING MIN(r.permission)>'.PERM_DENY.
-							' AND MAX(r.permission)>='.$permission.
+							' AND MAX(r.permission)>='.zbx_dbstr($permission).
 						')';
 			}
 		}
@@ -386,12 +386,22 @@ class CTemplateScreen extends CScreen {
 		return $result;
 	}
 
+	/**
+	 * Check if template screen exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($data) {
+		$this->deprecated('templatescreen.exists method is deprecated.');
+
 		$screens = $this->get(array(
 			'filter' => zbx_array_mintersect(array(array('screenid', 'name'), 'templateid'), $data),
 			'preservekeys' => true,
 			'output' => array('screenid'),
-			'nopermissions' => true,
 			'limit' => 1
 		));
 
@@ -421,6 +431,7 @@ class CTemplateScreen extends CScreen {
 					if ($screenItem['resourceid']) {
 						switch ($screenItem['resourcetype']) {
 							case SCREEN_RESOURCE_GRAPH:
+							case SCREEN_RESOURCE_LLD_GRAPH:
 								$resourceGraphIds[] = $screenItem['resourceid'];
 								break;
 							default:
@@ -446,7 +457,7 @@ class CTemplateScreen extends CScreen {
 
 			// get same graphs on destination template
 			$resourceGraphsMap = array();
-			$dbItems = DBselect(
+			$dbGraphs = DBselect(
 				'SELECT src.graphid AS srcid,dest.graphid as destid'.
 				' FROM graphs dest,graphs src,graphs_items destgi,items desti'.
 				' WHERE dest.name=src.name'.
@@ -455,8 +466,8 @@ class CTemplateScreen extends CScreen {
 					' AND desti.hostid='.zbx_dbstr($templateId).
 					' AND '.dbConditionInt('src.graphid', $resourceGraphIds)
 			);
-			while ($dbItem = DBfetch($dbItems)) {
-				$resourceGraphsMap[$dbItem['srcid']] = $dbItem['destid'];
+			while ($dbGraph = DBfetch($dbGraphs)) {
+				$resourceGraphsMap[$dbGraph['srcid']] = $dbGraph['destid'];
 			}
 
 			$newScreenIds = DB::insert('screens', $screens);
@@ -466,35 +477,46 @@ class CTemplateScreen extends CScreen {
 				foreach ($screen['screenitems'] as $screenItem) {
 					$screenItem['screenid'] = $newScreenIds[$snum];
 
-					$rid = $screenItem['resourceid'];
+					$resourceId = $screenItem['resourceid'];
 
 					switch ($screenItem['resourcetype']) {
 						case SCREEN_RESOURCE_GRAPH:
-							if ($rid && !isset($resourceGraphsMap[$rid])) {
-								$graph = DBfetch(DBselect('SELECT g.name FROM graphs g WHERE g.graphid='.zbx_dbstr($rid)));
-								$template = DBfetch(DBselect('SELECT h.name FROM hosts h WHERE h.hostid='.zbx_dbstr($templateId)));
-
-								self::exception(
-									ZBX_API_ERROR_PARAMETERS,
-									_s('Graph "%1$s" does not exist on template "%2$s".', $graph['name'], $template['name'])
-								);
+						case SCREEN_RESOURCE_LLD_GRAPH:
+							if ($resourceId && !isset($resourceGraphsMap[$resourceId])) {
+								$graph = DBfetch(DBselect(
+									'SELECT g.name FROM graphs g WHERE g.graphid='.zbx_dbstr($resourceId)
+								));
+								$template = DBfetch(DBselect(
+									'SELECT h.name FROM hosts h WHERE h.hostid='.zbx_dbstr($templateId)
+								));
+
+								self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+									'Graph "%1$s" does not exist on template "%2$s".', $graph['name'],
+									$template['name']
+								));
 							}
 
-							$screenItem['resourceid'] = $resourceGraphsMap[$rid];
+							$screenItem['resourceid'] = $resourceGraphsMap[$resourceId];
 							break;
 
 						default:
-							if ($rid && !isset($resourceItemsMap[$rid])) {
-								$item = DBfetch(DBselect('SELECT i.name FROM items i WHERE i.itemid='.zbx_dbstr($rid)));
-								$template = DBfetch(DBselect('SELECT h.name FROM hosts h WHERE h.hostid='.zbx_dbstr($templateId)));
-
-								self::exception(
-									ZBX_API_ERROR_PARAMETERS,
-									_s('Item "%1$s" does not exist on template "%2$s".', $item['name'], $template['name'])
-								);
+							if ($resourceId && !isset($resourceItemsMap[$resourceId])) {
+								$item = DBfetch(DBselect(
+									'SELECT i.name FROM items i WHERE i.itemid='.zbx_dbstr($resourceId)
+								));
+								$template = DBfetch(DBselect(
+									'SELECT h.name FROM hosts h WHERE h.hostid='.zbx_dbstr($templateId)
+								));
+
+								self::exception(ZBX_API_ERROR_PARAMETERS, _s(
+									'Item "%1$s" does not exist on template "%2$s".', $item['name'],
+									$template['name']
+								));
 							}
 
-							$screenItem['resourceid'] = $resourceItemsMap[$rid];
+							if ($resourceId) {
+								$screenItem['resourceid'] = $resourceItemsMap[$resourceId];
+							}
 					}
 
 					$insertScreenItems[] = $screenItem;
@@ -666,7 +688,11 @@ class CTemplateScreen extends CScreen {
 		));
 
 		foreach ($dbExistingScreens as $dbExistingScreen) {
-			$dbTemplate = DBfetch(DBselect('SELECT h.name FROM hosts h WHERE h.hostid='.$dbExistingScreen['templateid']));
+			$dbTemplate = DBfetch(DBselect(
+				'SELECT h.name'.
+				' FROM hosts h'.
+				' WHERE h.hostid='.zbx_dbstr($dbExistingScreen['templateid'])
+			));
 
 			self::exception(
 				ZBX_API_ERROR_PARAMETERS,
diff --git a/frontends/php/api/classes/CTemplateScreenItem.php b/frontends/php/include/classes/api/services/CTemplateScreenItem.php
index a7596136e98..9a4c845dce1 100644
--- a/frontends/php/api/classes/CTemplateScreenItem.php
+++ b/frontends/php/include/classes/api/services/CTemplateScreenItem.php
@@ -29,31 +29,6 @@ class CTemplateScreenItem extends CApiService {
 	protected $tableName = 'screens_items';
 	protected $tableAlias = 'si';
 
-	/**
-	 * Supported values for the resourcetype column.
-	 *
-	 * @var array
-	 */
-	protected static $resourceTypes = array(
-		SCREEN_RESOURCE_GRAPH,
-		SCREEN_RESOURCE_SIMPLE_GRAPH,
-		SCREEN_RESOURCE_MAP,
-		SCREEN_RESOURCE_PLAIN_TEXT,
-		SCREEN_RESOURCE_HOSTS_INFO,
-		SCREEN_RESOURCE_TRIGGERS_INFO,
-		SCREEN_RESOURCE_SERVER_INFO,
-		SCREEN_RESOURCE_CLOCK,
-		SCREEN_RESOURCE_SCREEN,
-		SCREEN_RESOURCE_TRIGGERS_OVERVIEW,
-		SCREEN_RESOURCE_DATA_OVERVIEW,
-		SCREEN_RESOURCE_URL,
-		SCREEN_RESOURCE_ACTIONS,
-		SCREEN_RESOURCE_EVENTS,
-		SCREEN_RESOURCE_HOSTGROUP_TRIGGERS,
-		SCREEN_RESOURCE_SYSTEM_STATUS,
-		SCREEN_RESOURCE_HOST_TRIGGERS
-	);
-
 	protected $sortColumns = array(
 		'screenitemid',
 		'screenid'
@@ -75,7 +50,7 @@ class CTemplateScreenItem extends CApiService {
 	}
 
 	/**
-	 * Get screem item data.
+	 * Get screen item data.
 	 *
 	 * @param array $options
 	 * @param array $options['hostid']			Use hostid to get real resource id
diff --git a/frontends/php/api/classes/CTrigger.php b/frontends/php/include/classes/api/services/CTrigger.php
index a2127ea2b9e..6f51b529502 100644
--- a/frontends/php/api/classes/CTrigger.php
+++ b/frontends/php/include/classes/api/services/CTrigger.php
@@ -134,7 +134,7 @@ class CTrigger extends CTriggerGeneral {
 					' AND f.itemid=i.itemid'.
 					' AND i.hostid=hgg.hostid'.
 				' GROUP BY i.hostid'.
-				' HAVING MAX(permission)<'.$permission.
+				' HAVING MAX(permission)<'.zbx_dbstr($permission).
 					' OR MIN(permission) IS NULL'.
 					' OR MIN(permission)='.PERM_DENY.
 			')';
@@ -215,7 +215,7 @@ class CTrigger extends CTriggerGeneral {
 			$sqlParts['from']['items_applications'] = 'items_applications ia';
 			$sqlParts['where']['a'] = dbConditionInt('ia.applicationid', $options['applicationids']);
 			$sqlParts['where']['ft'] = 'f.triggerid=t.triggerid';
-			$sqlParts['where']['fi'] = 'f.itemid=ia.itemid';
+			$sqlParts['where']['fia'] = 'f.itemid=ia.itemid';
 		}
 
 		// functions
@@ -394,7 +394,6 @@ class CTrigger extends CTriggerGeneral {
 			$sqlParts['from']['functions'] = 'functions f';
 			$sqlParts['from']['items'] = 'items i';
 			$sqlParts['from']['hosts'] = 'hosts h';
-			$sqlParts['where']['i'] = dbConditionInt('i.hostid', $options['hostids']);
 			$sqlParts['where']['ft'] = 'f.triggerid=t.triggerid';
 			$sqlParts['where']['fi'] = 'f.itemid=i.itemid';
 			$sqlParts['where']['hi'] = 'h.hostid=i.hostid';
@@ -436,15 +435,11 @@ class CTrigger extends CTriggerGeneral {
 			return $result;
 		}
 
-		$triggers = zbx_toHash($this->customFetch($this->createSelectQueryFromParts($sqlParts), $options), 'triggerid');
+		$result = zbx_toHash($this->customFetch($this->createSelectQueryFromParts($sqlParts), $options), 'triggerid');
 
 		// return count for post SQL filtered result sets
 		if (!is_null($options['countOutput'])) {
-			return count($triggers);
-		}
-
-		foreach ($triggers as $trigger) {
-			$result[$trigger['triggerid']] = $trigger;
+			return count($result);
 		}
 
 		if ($result) {
@@ -455,6 +450,7 @@ class CTrigger extends CTriggerGeneral {
 		if (!is_null($options['expandDescription']) && $result && array_key_exists('description', reset($result))) {
 			$result = CMacrosResolverHelper::resolveTriggerNames($result);
 		}
+
 		// expandComment
 		if (!is_null($options['expandComment']) && $result && array_key_exists('comments', reset($result))) {
 			$result = CMacrosResolverHelper::resolveTriggerDescriptions($result);
@@ -521,11 +517,17 @@ class CTrigger extends CTriggerGeneral {
 	}
 
 	/**
-	 * @param $object
+	 * Check if trigger exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array $object
 	 *
 	 * @return bool
 	 */
 	public function exists(array $object) {
+		$this->deprecated('trigger.exists method is deprecated.');
+
 		$keyFields = array(
 			array(
 				'hostid',
@@ -547,8 +549,7 @@ class CTrigger extends CTriggerGeneral {
 
 		$triggers = $this->get(array(
 			'filter' => array_merge(zbx_array_mintersect($keyFields, $object), array('flags' => null)),
-			'output' => API_OUTPUT_EXTEND,
-			'nopermissions' => true
+			'output' => API_OUTPUT_EXTEND
 		));
 
 		foreach ($triggers as $trigger) {
@@ -854,12 +855,6 @@ class CTrigger extends CTriggerGeneral {
 			'value_id' => $triggerIds
 		));
 
-		DB::delete('events', array(
-			'source' => array(EVENT_SOURCE_INTERNAL, EVENT_SOURCE_TRIGGERS),
-			'objectid' => $triggerIds,
-			'object' => EVENT_OBJECT_TRIGGER
-		));
-
 		DB::delete('sysmaps_elements', array(
 			'elementid' => $triggerIds,
 			'elementtype' => SYSMAP_ELEMENT_TYPE_TRIGGER
@@ -886,20 +881,19 @@ class CTrigger extends CTriggerGeneral {
 			'value' => $triggerIds
 		));
 
-		// unlink triggers from IT services
-		foreach ($triggerIds as $triggerId) {
-			updateServices($triggerId, SERVICE_STATUS_OK);
-		}
+		if ($this->usedInItServices($triggerIds)) {
+			DB::update('services', array(
+				'values' => array(
+					'triggerid' => null,
+					'showsla' => SERVICE_SHOW_SLA_OFF
+				),
+				'where' => array(
+					'triggerid' => $triggerIds
+				)
+			));
 
-		DB::update('services', array(
-			'values' => array(
-				'triggerid' => null,
-				'showsla' => SERVICE_SHOW_SLA_OFF
-			),
-			'where' => array(
-				'triggerid' => $triggerIds
-			)
-		));
+			updateItServices();
+		}
 
 		parent::deleteByIds($triggerIds);
 	}
@@ -1118,8 +1112,10 @@ class CTrigger extends CTriggerGeneral {
 		$triggers = zbx_toArray($triggers);
 		$infos = array();
 
+		$triggerIds = zbx_objectValues($triggers, 'triggerid');
+
 		$dbTriggers = $this->get(array(
-			'triggerids' => zbx_objectValues($triggers, 'triggerid'),
+			'triggerids' => $triggerIds,
 			'output' => API_OUTPUT_EXTEND,
 			'selectHosts' => array('name'),
 			'selectDependencies' => array('triggerid'),
@@ -1127,7 +1123,10 @@ class CTrigger extends CTriggerGeneral {
 			'nopermissions' => true
 		));
 
-		$descriptionChanged = $expressionChanged = false;
+		$descriptionChanged = false;
+		$expressionChanged = false;
+		$changedPriorityTriggerIds = array();
+
 		foreach ($triggers as &$trigger) {
 			$dbTrigger = $dbTriggers[$trigger['triggerid']];
 			$hosts = zbx_objectValues($dbTrigger['hosts'], 'name');
@@ -1157,7 +1156,7 @@ class CTrigger extends CTriggerGeneral {
 				// remove triggers if expression is changed in a way that trigger will not appear in current host
 				$oldExpressionData = new CTriggerExpression();
 				$oldExpressionData->parse($oldExpression);
-				// chech if at least one template has stayed in expression, this means that child trigger will stay in host
+				// check if at least one template has stayed in expression, this means that child trigger will stay in host
 				$oldTemplates = $oldExpressionData->getHosts();
 				$newTemplates = zbx_toHash($expressionData->getHosts());
 				$proceed = true;
@@ -1194,15 +1193,6 @@ class CTrigger extends CTriggerGeneral {
 					$this->deleteByIds($cTrigIds);
 				}
 
-				// if the trigger contains templates, delete any events that may exist
-				if ($this->expressionHasTemplates($expressionData)) {
-					DB::delete('events', array(
-						'source' => array(EVENT_SOURCE_INTERNAL, EVENT_SOURCE_TRIGGERS),
-						'object' => EVENT_OBJECT_TRIGGER,
-						'objectid' => $trigger['triggerid']
-					));
-				}
-
 				DB::delete('functions', array('triggerid' => $trigger['triggerid']));
 
 				try {
@@ -1242,9 +1232,7 @@ class CTrigger extends CTriggerGeneral {
 
 			// update service status
 			if (isset($trigger['priority']) && $trigger['priority'] != $dbTrigger['priority']) {
-				$serviceStatus = ($dbTrigger['value'] == TRIGGER_VALUE_TRUE) ? $trigger['priority'] : 0;
-
-				updateServices($trigger['triggerid'], $serviceStatus);
+				$changedPriorityTriggerIds[] = $trigger['triggerid'];
 			}
 
 			// restore the full expression to properly validate dependencies
@@ -1256,6 +1244,10 @@ class CTrigger extends CTriggerGeneral {
 		}
 		unset($trigger);
 
+		if ($changedPriorityTriggerIds && $this->usedInItServices($changedPriorityTriggerIds)) {
+			updateItServices();
+		}
+
 		foreach ($infos as $info) {
 			info($info);
 		}
@@ -1397,7 +1389,7 @@ class CTrigger extends CTriggerGeneral {
 					' WHERE '.dbConditionInt('td.triggerid_down', $downTriggerIds)
 				);
 
-				// combine db dependencies with thouse to be added
+				// combine db dependencies with those to be added
 				$upTriggersIds = array();
 				while ($row = DBfetch($res)) {
 					$upTriggersIds[] = $row['triggerid_up'];
@@ -1761,39 +1753,79 @@ class CTrigger extends CTriggerGeneral {
 		// adding last event
 		if ($options['selectLastEvent'] !== null) {
 			foreach ($result as $triggerId => $trigger) {
-				$lastEvent = API::Event()->get(array(
-					'source' => EVENT_SOURCE_TRIGGERS,
-					'object' => EVENT_OBJECT_TRIGGER,
-					'objectids' => $triggerId,
-					'output' => $options['selectLastEvent'],
-					'nopermissions' => true,
-					'sortfield' => array('clock', 'eventid'),
-					'sortorder' => ZBX_SORT_DOWN,
-					'limit' => 1
-				));
+				$result[$triggerId]['lastEvent'] = array();
+			}
 
-				$result[$triggerId]['lastEvent'] = $lastEvent ? reset($lastEvent) : array();
+			if (is_array($options['selectLastEvent'])) {
+				$pkFieldId = $this->pk('events');
+				$outputFields = array(
+					'objectid' => $this->fieldId('objectid', 'e'),
+					'ns' => $this->fieldId('ns', 'e'),
+					$pkFieldId => $this->fieldId($pkFieldId, 'e')
+				);
+
+				foreach ($options['selectLastEvent'] as $field) {
+					if ($this->hasField($field, 'events')) {
+						$outputFields[$field] = $this->fieldId($field, 'e');
+					}
+				}
+
+				$outputFields = implode(',', $outputFields);
+			}
+			else {
+				$outputFields = 'e.*';
 			}
-		}
 
-		return $result;
-	}
+			// due to performance issues, avoid using 'ORDER BY' for outter SELECT
+			$dbEvents = DBselect(
+				'SELECT '.$outputFields.
+				' FROM events e'.
+					' JOIN ('.
+						'SELECT e2.source,e2.object,e2.objectid,MAX(clock) AS clock'.
+						' FROM events e2'.
+						' WHERE e2.source='.EVENT_SOURCE_TRIGGERS.
+							' AND e2.object='.EVENT_OBJECT_TRIGGER.
+							' AND '.dbConditionInt('e2.objectid', $triggerids).
+						' GROUP BY e2.source,e2.object,e2.objectid'.
+					') e3 ON e3.source=e.source'.
+						' AND e3.object=e.object'.
+						' AND e3.objectid=e.objectid'.
+						' AND e3.clock=e.clock'
+			);
+
+			// in case there are multiple records with same 'clock' for one trigger, we'll get different 'ns'
+			$lastEvents = array();
+
+			while ($dbEvent = DBfetch($dbEvents)) {
+				$triggerId = $dbEvent['objectid'];
+				$ns = $dbEvent['ns'];
+
+				// unset fields, that were not requested
+				if (is_array($options['selectLastEvent'])) {
+					if (!in_array('objectid', $options['selectLastEvent'])) {
+						unset($dbEvent['objectid']);
+					}
+					if (!in_array('ns', $options['selectLastEvent'])) {
+						unset($dbEvent['ns']);
+					}
+				}
 
-	protected function applyQuerySortOptions($tableName, $tableAlias, array $options, array $sqlParts) {
-		$sqlParts = parent::applyQuerySortOptions($tableName, $tableAlias, $options, $sqlParts);
+				$lastEvents[$triggerId][$ns] = $dbEvent;
+			}
 
-		// if the parent method call adds a hostname column to the select clause, replace it with "h.name"
-		// since column "t.hostname" doesn't exist
-		if (!zbx_empty($options['sortfield'])
-				&& ($options['sortfield'] === 'hostname' || isset($sqlParts['select']['hostname']))) {
-			$sqlParts['select']['hostname'] = 'h.name as hostname';
+			foreach ($lastEvents as $triggerId => $events) {
+				// find max 'ns' for each trigger and that will be the 'lastEvent'
+				$maxNs = max(array_keys($events));
+				$result[$triggerId]['lastEvent'] = $events[$maxNs];
+			}
 		}
 
-		return $sqlParts;
+		return $result;
 	}
 
 	protected function applyQuerySortField($sortfield, $sortorder, $alias, array $sqlParts) {
-		if ($sortfield == 'hostname') {
+		if ($sortfield === 'hostname') {
+			$sqlParts['select']['hostname'] = 'h.name AS hostname';
 			$sqlParts['from']['functions'] = 'functions f';
 			$sqlParts['from']['items'] = 'items i';
 			$sqlParts['from']['hosts'] = 'hosts h';
@@ -1929,4 +1961,17 @@ class CTrigger extends CTriggerGeneral {
 
 		return $triggers;
 	}
+
+	/**
+	 * Returns true if at least one of the given triggers is used in IT services.
+	 *
+	 * @param array $triggerIds
+	 *
+	 * @return bool
+	 */
+	protected function usedInItServices(array $triggerIds) {
+		$query = DBselect('SELECT serviceid FROM services WHERE '.dbConditionInt('triggerid', $triggerIds), 1);
+
+		return (DBfetch($query) != false);
+	}
 }
diff --git a/frontends/php/api/classes/CTriggerGeneral.php b/frontends/php/include/classes/api/services/CTriggerGeneral.php
index dda1a25be4a..dda1a25be4a 100644
--- a/frontends/php/api/classes/CTriggerGeneral.php
+++ b/frontends/php/include/classes/api/services/CTriggerGeneral.php
diff --git a/frontends/php/api/classes/CTriggerPrototype.php b/frontends/php/include/classes/api/services/CTriggerPrototype.php
index a276159b22a..0c3a1ca6e01 100644
--- a/frontends/php/api/classes/CTriggerPrototype.php
+++ b/frontends/php/include/classes/api/services/CTriggerPrototype.php
@@ -123,7 +123,7 @@ class CTriggerPrototype extends CTriggerGeneral {
 					' AND f.itemid=i.itemid'.
 					' AND i.hostid=hgg.hostid'.
 				' GROUP BY i.hostid'.
-				' HAVING MAX(permission)<'.$permission.
+				' HAVING MAX(permission)<'.zbx_dbstr($permission).
 					' OR MIN(permission) IS NULL'.
 					' OR MIN(permission)='.PERM_DENY.
 			')';
diff --git a/frontends/php/api/classes/CUser.php b/frontends/php/include/classes/api/services/CUser.php
index 0d051aa5486..80789f1eab9 100644
--- a/frontends/php/api/classes/CUser.php
+++ b/frontends/php/include/classes/api/services/CUser.php
@@ -235,7 +235,10 @@ class CUser extends CApiService {
 
 		$themes = array_keys(Z::getThemes());
 		$themes[] = THEME_DEFAULT;
-		$themeValidator = new CSetValidator(array('values' => $themes));
+		$themeValidator = new CLimitedSetValidator(array(
+				'values' => $themes
+			)
+		);
 		$alias = array();
 
 		foreach ($users as &$user) {
@@ -263,7 +266,7 @@ class CUser extends CApiService {
 				$dbUser = $dbUsers[$user['userid']];
 			}
 
-			// check if user alais
+			// check if user alias
 			if (isset($user['alias'])) {
 				// check if we change guest user
 				if ($dbUser['alias'] === ZBX_GUEST_USER && $user['alias'] !== ZBX_GUEST_USER) {
@@ -278,19 +281,6 @@ class CUser extends CApiService {
 						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Duplicate user alias "%s".', $user['alias']));
 					}
 				}
-
-				if (zbx_strlen($user['alias']) > 64) {
-					self::exception(
-						ZBX_API_ERROR_PARAMETERS,
-						_n(
-							'Maximum alias length is %1$d characters, "%2$s" is %3$d character.',
-							'Maximum alias length is %1$d characters, "%2$s" is %3$d characters.',
-							64,
-							$user['alias'],
-							zbx_strlen($user['alias'])
-						)
-					);
-				}
 			}
 
 			if (isset($user['usrgrps'])) {
@@ -474,7 +464,11 @@ class CUser extends CApiService {
 				$newUsrgrpids = zbx_objectValues($user['usrgrps'], 'usrgrpid');
 
 				// deleting all relations with groups, but not touching those, where user still must be after update
-				DBexecute('DELETE FROM users_groups WHERE userid='.$user['userid'].' AND '.dbConditionInt('usrgrpid', $newUsrgrpids, true));
+				DBexecute(
+					'DELETE FROM users_groups'.
+					' WHERE userid='.zbx_dbstr($user['userid']).
+						' AND '.dbConditionInt('usrgrpid', $newUsrgrpids, true)
+				);
 
 				// getting the list of groups user is currently in
 				$dbGroupsUserIn = DBSelect('SELECT usrgrpid FROM users_groups WHERE userid='.zbx_dbstr($user['userid']));
@@ -911,7 +905,7 @@ class CUser extends CApiService {
 		$cnf = array();
 
 		foreach ($config as $id => $value) {
-			if (zbx_strpos($id, 'ldap_') !== false) {
+			if (strpos($id, 'ldap_') !== false) {
 				$cnf[str_replace('ldap_', '', $id)] = $config[$id];
 			}
 		}
@@ -1005,7 +999,7 @@ class CUser extends CApiService {
 		$dbAccess = DBfetch(DBselect(
 			'SELECT MAX(g.gui_access) AS gui_access'.
 			' FROM usrgrp g,users_groups ug'.
-			' WHERE ug.userid='.$userInfo['userid'].
+			' WHERE ug.userid='.zbx_dbstr($userInfo['userid']).
 				' AND g.usrgrpid=ug.usrgrpid'
 		));
 
@@ -1063,10 +1057,10 @@ class CUser extends CApiService {
 
 			DBexecute(
 				'UPDATE users'.
-				' SET attempt_failed='.$userInfo['attempt_failed'].','.
+				' SET attempt_failed='.zbx_dbstr($userInfo['attempt_failed']).','.
 					' attempt_clock='.time().','.
 					' attempt_ip='.zbx_dbstr($ip).
-				' WHERE userid='.$userInfo['userid']
+				' WHERE userid='.zbx_dbstr($userInfo['userid'])
 			);
 
 			add_audit(AUDIT_ACTION_LOGIN, AUDIT_RESOURCE_USER, _s('Login failed "%s".', $name));
@@ -1075,7 +1069,9 @@ class CUser extends CApiService {
 
 		// start session
 		$sessionid = md5(time().$password.$name.rand(0, 10000000));
-		DBexecute('INSERT INTO sessions (sessionid,userid,lastaccess,status) VALUES ('.zbx_dbstr($sessionid).','.$userInfo['userid'].','.time().','.ZBX_SESSION_ACTIVE.')');
+		DBexecute('INSERT INTO sessions (sessionid,userid,lastaccess,status)'.
+			' VALUES ('.zbx_dbstr($sessionid).','.zbx_dbstr($userInfo['userid']).','.time().','.ZBX_SESSION_ACTIVE.')'
+		);
 
 		add_audit(AUDIT_ACTION_LOGIN, AUDIT_RESOURCE_USER, _s('Correct login "%s".', $name));
 
@@ -1085,7 +1081,7 @@ class CUser extends CApiService {
 		$userData['userid'] = $userInfo['userid'];
 
 		if ($userInfo['attempt_failed']) {
-			DBexecute('UPDATE users SET attempt_failed=0 WHERE userid='.$userInfo['userid']);
+			DBexecute('UPDATE users SET attempt_failed=0 WHERE userid='.zbx_dbstr($userInfo['userid']));
 		}
 
 		CWebUser::$data = self::$userData = $userData;
@@ -1130,16 +1126,25 @@ class CUser extends CApiService {
 			}
 
 			if ($userInfo['autologout'] > 0) {
-				DBexecute('DELETE FROM sessions WHERE userid='.$userInfo['userid'].' AND lastaccess<'.(time() - $userInfo['autologout']));
+				DBexecute(
+					'DELETE FROM sessions'.
+					' WHERE userid='.zbx_dbstr($userInfo['userid']).
+						' AND lastaccess<'.(time() - $userInfo['autologout'])
+				);
 			}
 
-			DBexecute('UPDATE sessions SET lastaccess='.time().' WHERE userid='.$userInfo['userid'].' AND sessionid='.zbx_dbstr($sessionid));
+			DBexecute(
+				'UPDATE sessions'.
+				' SET lastaccess='.time().
+				' WHERE userid='.zbx_dbstr($userInfo['userid']).
+					' AND sessionid='.zbx_dbstr($sessionid)
+			);
 		}
 
 		$dbAccess = DBfetch(DBselect(
 			'SELECT MAX(g.gui_access) AS gui_access'.
 			' FROM usrgrp g,users_groups ug'.
-			' WHERE ug.userid='.$userInfo['userid'].
+			' WHERE ug.userid='.zbx_dbstr($userInfo['userid']).
 				' AND g.usrgrpid=ug.usrgrpid'
 		));
 
diff --git a/frontends/php/api/classes/CUserGroup.php b/frontends/php/include/classes/api/services/CUserGroup.php
index f0a48e3d94e..205e4e371f8 100644
--- a/frontends/php/api/classes/CUserGroup.php
+++ b/frontends/php/include/classes/api/services/CUserGroup.php
@@ -193,11 +193,21 @@ class CUserGroup extends CApiService {
 		return $result;
 	}
 
+	/**
+	 * Check if user group exists.
+	 *
+	 * @deprecated	As of version 2.4, use get method instead.
+	 *
+	 * @param array	$object
+	 *
+	 * @return bool
+	 */
 	public function exists($object) {
+		$this->deprecated('usergroup.exists method is deprecated.');
+
 		$objs = $this->get(array(
 			'filter' => array('name' => $object['name']),
 			'output' => array('usrgrpid'),
-			'nopermissions' => true,
 			'limit' => 1,
 		));
 
@@ -226,8 +236,13 @@ class CUserGroup extends CApiService {
 				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect parameters for user group.'));
 			}
 
-			if ($this->exists(array('name' => $usrgrp['name']))) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('User group').' [ '.$usrgrp['name'].' ] '._('already exists'));
+			$userGroupExists = $this->get(array(
+				'output' => array('usrgrpid'),
+				'filter' => array('name' => $usrgrp['name']),
+				'limit' => 1
+			));
+			if ($userGroupExists) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, _s('User group "%1$s" already exists.', $usrgrp['name']));
 			}
 			$insert[$gnum] = $usrgrp;
 		}
@@ -290,7 +305,7 @@ class CUserGroup extends CApiService {
 			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only Super Admins can delete user groups.'));
 		}
 
-		$usrgrpids = zbx_toArray($data['usrgrpids']);
+		$usrgrpids = array_keys(array_flip(zbx_toArray($data['usrgrpids'])));
 		$userids = (isset($data['userids']) && !is_null($data['userids'])) ? zbx_toArray($data['userids']) : null;
 		$rights = (isset($data['rights']) && !is_null($data['rights'])) ? zbx_toArray($data['rights']) : null;
 
@@ -337,8 +352,8 @@ class CUserGroup extends CApiService {
 			$linkedRights = array();
 			$sql = 'SELECT groupid,id'.
 				' FROM rights'.
-				' WHERE '.dbConditionInt('groupid', $usrgrpids);
-			' AND '.dbConditionInt('id', zbx_objectValues($rights, 'id'));
+				' WHERE '.dbConditionInt('groupid', $usrgrpids).
+					' AND '.dbConditionInt('id', zbx_objectValues($rights, 'id'));
 			$linkedRightsDb = DBselect($sql);
 			while ($link = DBfetch($linkedRightsDb)) {
 				if (!isset($linkedRights[$link['groupid']])) $linkedRights[$link['groupid']] = array();
@@ -348,7 +363,7 @@ class CUserGroup extends CApiService {
 			$rightInsert = array();
 			foreach ($usrgrpids as $usrgrpid) {
 				foreach ($rights as $right) {
-					if (!isset($linkedUsers[$usrgrpid][$right['id']])) {
+					if (!isset($linkedRights[$usrgrpid][$right['id']])) {
 						$rightInsert[] = array(
 							'groupid' => $usrgrpid,
 							'permission' => $right['permission'],
diff --git a/frontends/php/api/classes/CUserMacro.php b/frontends/php/include/classes/api/services/CUserMacro.php
index 8ff5fe358bd..86fa98955fe 100644
--- a/frontends/php/api/classes/CUserMacro.php
+++ b/frontends/php/include/classes/api/services/CUserMacro.php
@@ -38,7 +38,7 @@ class CUserMacro extends CApiService {
 	 * @param array $options['hostids'] host ids
 	 * @param array $options['hostmacroids'] host macros ids
 	 * @param array $options['globalmacroids'] global macros ids
-	 * @param array $options['templateids'] tempalate ids
+	 * @param array $options['templateids'] template ids
 	 * @param boolean $options['globalmacro'] only global macros
 	 * @param boolean $options['selectGroups'] select groups
 	 * @param boolean $options['selectHosts'] select hosts
@@ -115,7 +115,7 @@ class CUserMacro extends CApiService {
 						' WHERE hm.hostid=hgg.hostid'.
 						' GROUP BY hgg.hostid'.
 						' HAVING MIN(r.permission)>'.PERM_DENY.
-							' AND MAX(r.permission)>='.$permission.
+							' AND MAX(r.permission)>='.zbx_dbstr($permission).
 						')';
 			}
 		}
@@ -600,7 +600,7 @@ class CUserMacro extends CApiService {
 		if (!isset($macro['macro']) || zbx_empty($macro['macro'])) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty macro.'));
 		}
-		if (zbx_strlen($macro['macro']) > 64) {
+		if (mb_strlen($macro['macro']) > 64) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Macro name "%1$s" is too long, it should not exceed 64 chars.', $macro['macro']));
 		}
 		if (!preg_match('/^'.ZBX_PREG_EXPRESSION_USER_MACROS.'$/', $macro['macro'])) {
@@ -616,7 +616,7 @@ class CUserMacro extends CApiService {
 	 * @throws APIException if the field is too long.
 	 */
 	protected function checkValue(array $macro) {
-		if (isset($macro['value']) && zbx_strlen($macro['value']) > 255) {
+		if (isset($macro['value']) && mb_strlen($macro['value']) > 255) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Macro "%1$s" value is too long, it should not exceed 255 chars.', $macro['macro']));
 		}
 	}
diff --git a/frontends/php/api/classes/CUserMedia.php b/frontends/php/include/classes/api/services/CUserMedia.php
index bb83f961f36..bb83f961f36 100644
--- a/frontends/php/api/classes/CUserMedia.php
+++ b/frontends/php/include/classes/api/services/CUserMedia.php
diff --git a/frontends/php/include/classes/class.ctableinfo.php b/frontends/php/include/classes/class.ctableinfo.php
deleted file mode 100644
index f6cabac89f0..00000000000
--- a/frontends/php/include/classes/class.ctableinfo.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2014 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-class CTableInfo extends CTable {
-
-	public function __construct($message = '...', $class = 'tableinfo') {
-		parent::__construct($message, $class);
-		$this->setOddRowClass('odd_row');
-		$this->setEvenRowClass('even_row');
-		$this->attributes['cellpadding'] = 3;
-		$this->attributes['cellspacing'] = 1;
-		$this->headerClass = 'header';
-		$this->footerClass = 'footer';
-	}
-
-	/**
-	 * Rotate table header text vertical.
-	 * Cells must be marked with "vertical_rotation" class.
-	 */
-	public function makeVerticalRotation() {
-		if (!defined('IS_VERTICAL_ROTATION_JS_INSERTED')) {
-			define('IS_VERTICAL_ROTATION_JS_INSERTED', true);
-
-			insert_js(
-				'jQuery(function($) {
-					$.fn.makeVerticalRotation = function () {
-						var cellsToRotate = $(".vertical_rotation", this),
-							betterCells = [];
-
-						// insert spans
-						cellsToRotate.each(function () {
-							var cell = $(this);
-
-							var text = $("<span>", {
-								text: cell.text()
-							});
-
-							if (IE) {
-								text.css({"font-family": "monospace"});
-							}
-
-							cell.text("").append(text);
-						});
-
-						// rotate cells
-						cellsToRotate.each(function () {
-							var cell = $(this),
-								span = cell.children(),
-								height = cell.height(),
-								width = span.width(),
-								transform = (width / 2) + "px " + (width / 2) + "px";
-
-							var css = {
-								"transform-origin": transform,
-								"-webkit-transform-origin": transform,
-								"-moz-transform-origin": transform,
-								"-o-transform-origin": transform
-							};
-
-							if (IE) {
-								css["font-family"] = "monospace";
-								css["-ms-transform-origin"] = "50% 50%";
-							}
-
-							if (IE9) {
-								css["-ms-transform-origin"] = transform;
-							}
-
-							var divInner = $("<div>", {
-								"class": "vertical_rotation_inner"
-							})
-							.css(css)
-							.append(span.text());
-
-							var div = $("<div>", {
-								height: width,
-								width: height
-							})
-							.append(divInner);
-
-							betterCells.push(div);
-						});
-
-						cellsToRotate.each(function (i) {
-							$(this).html(betterCells[i]);
-						});
-
-						// align text to cell center
-						cellsToRotate.each(function () {
-							var cell = $(this),
-								width = cell.width();
-
-							if (width > 30) {
-								cell.children().css({
-									position: "relative",
-									left: width / 2 - 12
-								});
-							}
-						});
-					};
-				});
-
-				jQuery(document).ready(function() {
-					jQuery(".'.$this->getAttribute('class').'").makeVerticalRotation();
-
-					if (IE8) {
-						jQuery(".vertical_rotation_inner").css({
-							filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)"
-						});
-					}
-					else if (IE9) {
-						jQuery(".vertical_rotation_inner").css({
-							"-ms-transform": "rotate(270deg)"
-						});
-					}
-
-					if (!IE9) {
-						jQuery(".vertical_rotation_inner").css({
-							"writing-mode": "tb-rl"
-						});
-					}
-				});'
-			, true);
-		}
-	}
-}
diff --git a/frontends/php/include/classes/class.ajaxresponse.php b/frontends/php/include/classes/core/CAjaxResponse.php
index 3306cba32bc..a5a87aada57 100644
--- a/frontends/php/include/classes/class.ajaxresponse.php
+++ b/frontends/php/include/classes/core/CAjaxResponse.php
@@ -22,7 +22,7 @@
 /**
  * Class for standard ajax response generation.
  */
-class AjaxResponse {
+class CAjaxResponse {
 
 	private $_result = true;
 	private $_data = array();
@@ -64,7 +64,7 @@ class AjaxResponse {
 	 * @return void
 	 */
 	public function send() {
-		$json = new CJSON();
+		$json = new CJson();
 
 		if ($this->_result) {
 			echo $json->encode(array('result' => true, 'data' => $this->_data));
diff --git a/frontends/php/include/classes/core/CAutoloader.php b/frontends/php/include/classes/core/CAutoloader.php
index f72d4bc1c73..1d74a05eb6c 100644
--- a/frontends/php/include/classes/core/CAutoloader.php
+++ b/frontends/php/include/classes/core/CAutoloader.php
@@ -68,25 +68,15 @@ class CAutoloader {
 	 * @return bool|string
 	 */
 	protected function findClassFile($className) {
-		$foundFile = false;
-
 		foreach ($this->includePaths as $includePath) {
 			$filePath = $includePath.'/'.$className.'.php';
 
 			if (is_file($filePath)) {
-				$foundFile = $filePath;
+				return $filePath;
 				break;
 			}
-			else {
-				// fallback to old class names
-				$filePath = $includePath.'/class.'.strtolower($className).'.php';
-				if (is_file($filePath)) {
-					$foundFile = $filePath;
-					break;
-				}
-			}
 		}
 
-		return $foundFile;
+		return false;
 	}
 }
diff --git a/frontends/php/include/classes/class.cconfigfile.php b/frontends/php/include/classes/core/CConfigFile.php
index ea32c9474ec..ea32c9474ec 100644
--- a/frontends/php/include/classes/class.cconfigfile.php
+++ b/frontends/php/include/classes/core/CConfigFile.php
diff --git a/frontends/php/include/classes/class.chttp_request.php b/frontends/php/include/classes/core/CHttpRequest.php
index f156b8e1b43..63adeaa4f48 100644
--- a/frontends/php/include/classes/class.chttp_request.php
+++ b/frontends/php/include/classes/core/CHttpRequest.php
@@ -22,7 +22,7 @@
 /**
  * Access the HTTP Request
  */
-class CHTTP_request {
+class CHttpRequest {
 
 	/**
 	 * additional HTTP headers not prefixed with HTTP_ in $_SERVER superglobal
@@ -60,7 +60,7 @@ class CHTTP_request {
 
 		$this->headers = array();
 		foreach ($_SERVER as $i => $val) {
-			if (zbx_strpos($i, 'HTTP_') === 0 || in_array($i, $this->add_headers)) {
+			if (strpos($i, 'HTTP_') === 0 || in_array($i, $this->add_headers)) {
 				$name = str_replace(array('HTTP_', '_'), array('', '-'), $i);
 				$this->headers[$name] = $val;
 			}
@@ -86,7 +86,7 @@ class CHTTP_request {
 	 * @param string Case-Insensitive HTTP Header Name (eg: "User-Agent")
 	 */
 	public function header($name) {
-		$name = zbx_strtoupper($name);
+		$name = strtoupper($name);
 		return isset($this->headers[$name]) ? $this->headers[$name] : false;
 	}
 
diff --git a/frontends/php/api/rpc/class.cjsonrpc.php b/frontends/php/include/classes/core/CJsonRpc.php
index e68fb7b2526..6f9843ff9a2 100644
--- a/frontends/php/api/rpc/class.cjsonrpc.php
+++ b/frontends/php/include/classes/core/CJsonRpc.php
@@ -19,7 +19,7 @@
 **/
 
 
-class CJSONrpc {
+class CJsonRpc {
 
 	const VERSION = '2.0';
 
@@ -41,7 +41,7 @@ class CJSONrpc {
 	public function __construct(CApiClient $apiClient, $jsonData) {
 		$this->apiClient = $apiClient;
 
-		$this->json = new CJSON();
+		$this->json = new CJson();
 		$this->initErrors();
 
 		$this->_error = false;
diff --git a/frontends/php/include/classes/core/CSession.php b/frontends/php/include/classes/core/CSession.php
index f6ef5f63b64..22192ccb095 100644
--- a/frontends/php/include/classes/core/CSession.php
+++ b/frontends/php/include/classes/core/CSession.php
@@ -1,5 +1,27 @@
 <?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
 
+
+/**
+ * Session wrapper, currently uses native PHP session.
+ */
 class CSession implements ArrayAccess {
 
 	/**
@@ -20,18 +42,51 @@ class CSession implements ArrayAccess {
 		}
 	}
 
+	/**
+	 * Clears and implicitly flushes session.
+	 */
+	public function clear() {
+		$_SESSION = array();
+		session_write_close();
+	}
+
+	/**
+	 * Sets session value by key offset.
+	 *
+	 * @param mixed $offset
+	 * @param mixed $value
+	 */
 	public function offsetSet($offset, $value) {
 		$_SESSION[$offset] = $value;
 	}
 
+	/**
+	 * Checks if session value exists (isset() calls).
+	 *
+	 * @param mixed $offset
+	 *
+	 * @return bool
+	 */
 	public function offsetExists($offset) {
 		return isset($_SESSION[$offset]);
 	}
 
+	/**
+	 * Unsets session value (unset() calls).
+	 *
+	 * @param mixed $offset
+	 */
 	public function offsetUnset($offset) {
 		unset($_SESSION[$offset]);
 	}
 
+	/**
+	 * Returns value stored in session.
+	 *
+	 * @param mixed $offset
+	 *
+	 * @return mixed|null
+	 */
 	public function offsetGet($offset) {
 		return isset($_SESSION[$offset]) ? $_SESSION[$offset] : null;
 	}
diff --git a/frontends/php/include/classes/class.cview.php b/frontends/php/include/classes/core/CView.php
index 5d3e492f348..5d3e492f348 100644
--- a/frontends/php/include/classes/class.cview.php
+++ b/frontends/php/include/classes/core/CView.php
diff --git a/frontends/php/include/classes/core/ZBase.php b/frontends/php/include/classes/core/ZBase.php
index f355e45914a..697a35c5cab 100644
--- a/frontends/php/include/classes/core/ZBase.php
+++ b/frontends/php/include/classes/core/ZBase.php
@@ -190,9 +190,10 @@ class ZBase {
 	 */
 	private function getIncludePaths() {
 		return array(
-			$this->rootDir.'/include/classes',
 			$this->rootDir.'/include/classes/core',
 			$this->rootDir.'/include/classes/api',
+			$this->rootDir.'/include/classes/api/services',
+			$this->rootDir.'/include/classes/api/managers',
 			$this->rootDir.'/include/classes/api/clients',
 			$this->rootDir.'/include/classes/api/wrappers',
 			$this->rootDir.'/include/classes/db',
@@ -214,18 +215,27 @@ class ZBase {
 			$this->rootDir.'/include/classes/import/readers',
 			$this->rootDir.'/include/classes/import/formatters',
 			$this->rootDir.'/include/classes/items',
+			$this->rootDir.'/include/classes/triggers',
 			$this->rootDir.'/include/classes/server',
 			$this->rootDir.'/include/classes/screens',
+			$this->rootDir.'/include/classes/services',
 			$this->rootDir.'/include/classes/sysmaps',
 			$this->rootDir.'/include/classes/helpers',
 			$this->rootDir.'/include/classes/helpers/trigger',
 			$this->rootDir.'/include/classes/macros',
 			$this->rootDir.'/include/classes/tree',
 			$this->rootDir.'/include/classes/html',
+			$this->rootDir.'/include/classes/html/pageheader',
+			$this->rootDir.'/include/classes/html/widget',
 			$this->rootDir.'/include/classes/parsers',
-			$this->rootDir.'/api/classes',
-			$this->rootDir.'/api/classes/managers',
-			$this->rootDir.'/api/rpc'
+			$this->rootDir.'/include/classes/parsers/results',
+			$this->rootDir.'/include/classes/routing',
+			$this->rootDir.'/include/classes/json',
+			$this->rootDir.'/include/classes/user',
+			$this->rootDir.'/include/classes/setup',
+			$this->rootDir.'/include/classes/regexp',
+			$this->rootDir.'/include/classes/ldap',
+			$this->rootDir.'/include/classes/pagefilter'
 		);
 	}
 
@@ -312,7 +322,7 @@ class ZBase {
 	}
 
 	/**
-	 * Initilaize translations.
+	 * Initialize translations.
 	 */
 	protected function initLocales() {
 		init_mbstrings();
@@ -365,12 +375,14 @@ class ZBase {
 	 * Authenticate user.
 	 */
 	protected function authenticateUser() {
-		if (!CWebUser::checkAuthentication(get_cookie('zbx_sessionid'))) {
+		$sessionId = CWebUser::checkAuthentication(CWebUser::getSessionCookie());
+
+		if (!$sessionId) {
 			CWebUser::setDefault();
 		}
 
 		// set the authentication token for the API
-		API::getWrapper()->auth = get_cookie('zbx_sessionid');
+		API::getWrapper()->auth = $sessionId;
 
 		// enable debug mode in the API
 		API::getWrapper()->debug = CWebUser::getDebugMode();
diff --git a/frontends/php/include/classes/db/DB.php b/frontends/php/include/classes/db/DB.php
index 5aa7d1f6f08..92dc20aa4b9 100644
--- a/frontends/php/include/classes/db/DB.php
+++ b/frontends/php/include/classes/db/DB.php
@@ -326,7 +326,7 @@ class DB {
 			else {
 				switch ($tableSchema['fields'][$field]['type']) {
 					case self::FIELD_TYPE_CHAR:
-						$length = zbx_strlen($values[$field]);
+						$length = mb_strlen($values[$field]);
 						$values[$field] = zbx_dbstr($values[$field]);
 
 						if ($length > $tableSchema['fields'][$field]['length']) {
@@ -354,10 +354,10 @@ class DB {
 						$values[$field] = zbx_dbstr($values[$field]);
 						break;
 					case self::FIELD_TYPE_TEXT:
-						$length = zbx_strlen($values[$field]);
+						$length = mb_strlen($values[$field]);
 						$values[$field] = zbx_dbstr($values[$field]);
 
-						if ($DB['TYPE'] == ZBX_DB_DB2) {
+						if ($DB['TYPE'] == ZBX_DB_DB2 || $DB['TYPE'] == ZBX_DB_ORACLE) {
 							if ($length > 2048) {
 								self::exception(self::SCHEMA_ERROR, _s('Value "%1$s" is too long for field "%2$s" - %3$d characters. Allowed length is 2048 characters.',
 									$values[$field], $field, $length));
@@ -527,14 +527,14 @@ class DB {
 				self::exception(self::DBEXECUTE_ERROR, _s('Cannot perform update statement on table "%1$s" without where condition.', $table));
 			}
 
-			// where condition proccess
+			// where condition processing
 			$sqlWhere = array();
 			foreach ($row['where'] as $field => $values) {
 				if (!isset($tableSchema['fields'][$field]) || is_null($values)) {
 					self::exception(self::DBEXECUTE_ERROR, _s('Incorrect field "%1$s" name or value in where statement for table "%2$s".', $field, $table));
 				}
 				$values = zbx_toArray($values);
-				sort($values); // sorting ids to prevent deadlocks when two transactions depends from each other
+				sort($values); // sorting ids to prevent deadlocks when two transactions depend on each other
 
 				$sqlWhere[] = dbConditionString($field, $values);
 			}
diff --git a/frontends/php/include/classes/db/Db2DbBackend.php b/frontends/php/include/classes/db/Db2DbBackend.php
index a5eb8981ae0..b76a9d8ccbe 100644
--- a/frontends/php/include/classes/db/Db2DbBackend.php
+++ b/frontends/php/include/classes/db/Db2DbBackend.php
@@ -32,7 +32,7 @@ class Db2DbBackend extends DbBackend {
 	protected function checkDbVersionTable() {
 		global $DB;
 
-		$tabSchema = zbx_dbstr(!empty($DB['SCHEMA']) ? $DB['SCHEMA'] : zbx_strtoupper($DB['USER']));
+		$tabSchema = zbx_dbstr(!empty($DB['SCHEMA']) ? $DB['SCHEMA'] : strtoupper($DB['USER']));
 		$tableExists = DBfetch(DBselect('SELECT 1 FROM SYSCAT.TABLES'.
 			" WHERE TABNAME='DBVERSION'".
 				" AND TABSCHEMA=".$tabSchema));
diff --git a/frontends/php/include/classes/db/DbBackend.php b/frontends/php/include/classes/db/DbBackend.php
index 4dece42551b..c231aa7c32a 100644
--- a/frontends/php/include/classes/db/DbBackend.php
+++ b/frontends/php/include/classes/db/DbBackend.php
@@ -87,7 +87,7 @@ abstract class DbBackend {
 	}
 
 	/**
-	 * Return error or null if no error occured.
+	 * Return error or null if no error occurred.
 	 *
 	 * @return mixed
 	 */
diff --git a/frontends/php/include/classes/db/PostgresqlDbBackend.php b/frontends/php/include/classes/db/PostgresqlDbBackend.php
index d0e1ddb7833..ada6157e636 100644
--- a/frontends/php/include/classes/db/PostgresqlDbBackend.php
+++ b/frontends/php/include/classes/db/PostgresqlDbBackend.php
@@ -32,10 +32,13 @@ class PostgresqlDbBackend extends DbBackend {
 	protected function checkDbVersionTable() {
 		global $DB;
 
+		$schema = zbx_dbstr($DB['SCHEMA'] ? $DB['SCHEMA'] : 'public');
+
 		$tableExists = DBfetch(DBselect('SELECT 1 FROM information_schema.tables'.
 			' WHERE table_catalog='.zbx_dbstr($DB['DATABASE']).
-				" AND table_schema='public'".
-				" AND table_name='dbversion'"));
+				' AND table_schema='.$schema.
+				" AND table_name='dbversion'"
+		));
 
 		if (!$tableExists) {
 			$this->setError(_('The frontend does not match Zabbix database.'));
diff --git a/frontends/php/include/classes/debug/CProfiler.php b/frontends/php/include/classes/debug/CProfiler.php
index d72327f6a36..458257c1871 100644
--- a/frontends/php/include/classes/debug/CProfiler.php
+++ b/frontends/php/include/classes/debug/CProfiler.php
@@ -50,7 +50,7 @@ class CProfiler {
 	protected $apiLog = array();
 
 	/**
-	 * Contains sql queryes info.
+	 * Contains SQL queries info.
 	 *
 	 * @var array
 	 */
@@ -157,9 +157,7 @@ class CProfiler {
 			$debug_str .= '</div>';
 			// parameters
 			$debug_str .= '<table><tr><td style="width: 300px" valign="top">Parameters:';
-			foreach ($params as $p) {
-				$debug_str .= '<pre>'.print_r(CHtml::encode($p), true).'</pre>';
-			}
+			$debug_str .= '<pre>'.print_r(CHtml::encode($params), true).'</pre>';
 			$debug_str .= '</td>';
 			// result
 			$debug_str .= '<td valign="top">Result:<pre>'.print_r(CHtml::encode($result), true).'</pre></td>';
@@ -193,7 +191,7 @@ class CProfiler {
 		$debug = new CDiv(null, 'textcolorstyles');
 		$debug->attr('name', 'zbx_debug_info');
 		$debug->attr('style', 'display: none; overflow: auto; width: 95%; border: 1px #777777 solid; margin: 4px; padding: 4px;');
-		$debug->addItem(array(BR(), new CJSscript($debug_str), BR()));
+		$debug->addItem(array(BR(), new CJsScript($debug_str), BR()));
 		$debug->show();
 	}
 
diff --git a/frontends/php/include/classes/export/CConfigurationExport.php b/frontends/php/include/classes/export/CConfigurationExport.php
index df0334ef216..3955b06cfd0 100644
--- a/frontends/php/include/classes/export/CConfigurationExport.php
+++ b/frontends/php/include/classes/export/CConfigurationExport.php
@@ -80,7 +80,7 @@ class CConfigurationExport {
 				'snmpv3_securityname', 'snmpv3_securitylevel', 'snmpv3_authprotocol', 'snmpv3_authpassphrase',
 				'snmpv3_privprotocol', 'snmpv3_privpassphrase', 'formula', 'valuemapid', 'delay_flex', 'params',
 				'ipmi_sensor', 'data_type', 'authtype', 'username', 'password', 'publickey', 'privatekey',
-				'interfaceid', 'port', 'description', 'inventory_link', 'flags'
+				'interfaceid', 'port', 'description', 'inventory_link', 'flags', 'logtimefmt'
 			),
 			'drule' => array('itemid', 'hostid', 'type', 'snmp_community', 'snmp_oid', 'name', 'key_', 'delay', 'history',
 				'trends', 'status', 'value_type', 'trapper_hosts', 'units', 'delta', 'snmpv3_contextname',
@@ -94,7 +94,7 @@ class CConfigurationExport {
 				'snmpv3_contextname', 'snmpv3_securityname', 'snmpv3_securitylevel', 'snmpv3_authprotocol',
 				'snmpv3_authpassphrase', 'snmpv3_privprotocol', 'snmpv3_privpassphrase', 'formula', 'valuemapid',
 				'delay_flex', 'params', 'ipmi_sensor', 'data_type', 'authtype', 'username', 'password', 'publickey',
-				'privatekey', 'interfaceid', 'port', 'description', 'inventory_link', 'flags'
+				'privatekey', 'interfaceid', 'port', 'description', 'inventory_link', 'flags', 'logtimefmt'
 			)
 		);
 	}
@@ -305,7 +305,7 @@ class CConfigurationExport {
 				'name', 'description'
 			),
 			'selectInventory' => true,
-			'selectInterfaces' => array('interfaceid', 'main', 'type', 'useip', 'ip', 'dns', 'port'),
+			'selectInterfaces' => array('interfaceid', 'main', 'type', 'useip', 'ip', 'dns', 'port', 'bulk'),
 			'selectMacros' => API_OUTPUT_EXTEND,
 			'selectGroups' => API_OUTPUT_EXTEND,
 			'selectParentTemplates' => API_OUTPUT_EXTEND,
@@ -799,8 +799,8 @@ class CConfigurationExport {
 		$this->data['maps'] = $sysmaps;
 
 		$images = API::Image()->get(array(
+			'output' => array('imageid', 'name', 'imagetype'),
 			'sysmapids' => zbx_objectValues($sysmaps, 'sysmapid'),
-			'output' => API_OUTPUT_EXTEND,
 			'select_image' => true,
 			'preservekeys' => true
 		));
@@ -839,7 +839,12 @@ class CConfigurationExport {
 	 * @param array $exportScreens
 	 */
 	protected function prepareScreenExport(array &$exportScreens) {
-		$screenIds = $sysmapIds = $groupIds = $hostIds = $graphIds = $itemIds = array();
+		$screenIds = array();
+		$sysmapIds = array();
+		$groupIds = array();
+		$hostIds = array();
+		$graphIds = array();
+		$itemIds = array();
 
 		// gather element ids that must be substituted
 		foreach ($exportScreens as $screen) {
@@ -847,13 +852,9 @@ class CConfigurationExport {
 				if ($screenItem['resourceid'] != 0) {
 					switch ($screenItem['resourcetype']) {
 						case SCREEN_RESOURCE_HOSTS_INFO:
-							// fall through
 						case SCREEN_RESOURCE_TRIGGERS_INFO:
-							// fall through
 						case SCREEN_RESOURCE_TRIGGERS_OVERVIEW:
-							// fall through
 						case SCREEN_RESOURCE_DATA_OVERVIEW:
-							// fall through
 						case SCREEN_RESOURCE_HOSTGROUP_TRIGGERS:
 							$groupIds[$screenItem['resourceid']] = $screenItem['resourceid'];
 							break;
@@ -863,11 +864,12 @@ class CConfigurationExport {
 							break;
 
 						case SCREEN_RESOURCE_GRAPH:
+						case SCREEN_RESOURCE_LLD_GRAPH:
 							$graphIds[$screenItem['resourceid']] = $screenItem['resourceid'];
 							break;
 
 						case SCREEN_RESOURCE_SIMPLE_GRAPH:
-							// fall through
+						case SCREEN_RESOURCE_LLD_SIMPLE_GRAPH:
 						case SCREEN_RESOURCE_PLAIN_TEXT:
 							$itemIds[$screenItem['resourceid']] = $screenItem['resourceid'];
 							break;
@@ -898,13 +900,9 @@ class CConfigurationExport {
 				if ($screenItem['resourceid'] != 0) {
 					switch ($screenItem['resourcetype']) {
 						case SCREEN_RESOURCE_HOSTS_INFO:
-							// fall through
 						case SCREEN_RESOURCE_TRIGGERS_INFO:
-							// fall through
 						case SCREEN_RESOURCE_TRIGGERS_OVERVIEW:
-							// fall through
 						case SCREEN_RESOURCE_DATA_OVERVIEW:
-							// fall through
 						case SCREEN_RESOURCE_HOSTGROUP_TRIGGERS:
 							$screenItem['resourceid'] = $groups[$screenItem['resourceid']];
 							break;
@@ -914,11 +912,12 @@ class CConfigurationExport {
 							break;
 
 						case SCREEN_RESOURCE_GRAPH:
+						case SCREEN_RESOURCE_LLD_GRAPH:
 							$screenItem['resourceid'] = $graphs[$screenItem['resourceid']];
 							break;
 
 						case SCREEN_RESOURCE_SIMPLE_GRAPH:
-							// fall through
+						case SCREEN_RESOURCE_LLD_SIMPLE_GRAPH:
 						case SCREEN_RESOURCE_PLAIN_TEXT:
 							$screenItem['resourceid'] = $items[$screenItem['resourceid']];
 							break;
@@ -1149,7 +1148,8 @@ class CConfigurationExport {
 			'graphids' => $graphIds,
 			'selectHosts' => array('host'),
 			'output' => array('name'),
-			'preservekeys' => true
+			'preservekeys' => true,
+			'filter' => array('flags' => null)
 		));
 
 		foreach ($graphs as $id => $graph) {
@@ -1232,8 +1232,8 @@ class CConfigurationExport {
 		$ids = array();
 
 		$images = API::Image()->get(array(
+			'output' => array('imageid', 'name'),
 			'imageids' => $imageIds,
-			'output' => API_OUTPUT_EXTEND,
 			'preservekeys' => true
 		));
 
diff --git a/frontends/php/include/classes/export/CConfigurationExportBuilder.php b/frontends/php/include/classes/export/CConfigurationExportBuilder.php
index b78cf123771..e713830cb18 100644
--- a/frontends/php/include/classes/export/CConfigurationExportBuilder.php
+++ b/frontends/php/include/classes/export/CConfigurationExportBuilder.php
@@ -494,6 +494,7 @@ class CConfigurationExportBuilder {
 				'ip' => $interface['ip'],
 				'dns' => $interface['dns'],
 				'port' => $interface['port'],
+				'bulk' => $interface['bulk'],
 				'interface_ref' => $interface['interface_ref']
 			);
 		}
@@ -571,7 +572,8 @@ class CConfigurationExportBuilder {
 				'description' => $item['description'],
 				'inventory_link' => $item['inventory_link'],
 				'applications' => $this->formatApplications($item['applications']),
-				'valuemap' => $item['valuemap']
+				'valuemap' => $item['valuemap'],
+				'logtimefmt' => $item['logtimefmt']
 			);
 
 			if (isset($item['interface_ref'])) {
@@ -698,6 +700,7 @@ class CConfigurationExportBuilder {
 				'dynamic' => $screenItem['dynamic'],
 				'sort_triggers' => $screenItem['sort_triggers'],
 				'resource' => $screenItem['resourceid'],
+				'max_columns' => $screenItem['max_columns'],
 				'application' => $screenItem['application']
 			);
 		}
@@ -845,6 +848,7 @@ class CConfigurationExportBuilder {
 				'icon_on' => $element['iconid_on'],
 				'icon_disabled' => $element['iconid_disabled'],
 				'icon_maintenance' => $element['iconid_maintenance'],
+				'application' => $element['application'],
 				'urls' => $this->formatMapElementUrls($element['urls'])
 			);
 		}
diff --git a/frontends/php/include/classes/export/writers/CExportWriter.php b/frontends/php/include/classes/export/writers/CExportWriter.php
index b505f910e6e..2b8e2773952 100644
--- a/frontends/php/include/classes/export/writers/CExportWriter.php
+++ b/frontends/php/include/classes/export/writers/CExportWriter.php
@@ -43,7 +43,7 @@ abstract class CExportWriter {
 	abstract public function write(array $array);
 
 	/**
-	 * Enable or dsable output formatting. Enabled by default.
+	 * Enable or disable output formatting. Enabled by default.
 	 *
 	 * @param bool $value
 	 *
diff --git a/frontends/php/include/classes/export/writers/CJsonExportWriter.php b/frontends/php/include/classes/export/writers/CJsonExportWriter.php
index 318e19e51a2..77a8c25a634 100644
--- a/frontends/php/include/classes/export/writers/CJsonExportWriter.php
+++ b/frontends/php/include/classes/export/writers/CJsonExportWriter.php
@@ -32,7 +32,7 @@ class CJsonExportWriter extends CExportWriter {
 	 * @return string
 	 */
 	public function write(array $array) {
-		$json = new CJSON();
+		$json = new CJson();
 		return $json->encode($array);
 	}
 }
diff --git a/frontends/php/include/classes/graphdraw/CBarGraphDraw.php b/frontends/php/include/classes/graphdraw/CBarGraphDraw.php
index d9766c8697f..5842ce8e6a9 100644
--- a/frontends/php/include/classes/graphdraw/CBarGraphDraw.php
+++ b/frontends/php/include/classes/graphdraw/CBarGraphDraw.php
@@ -26,7 +26,7 @@ class CBarGraphDraw extends CGraphDraw {
 		$this->background = false;
 		$this->opacity = 15; // bar/column opacity
 		$this->sum = false;
-		$this->shiftlegendright = 0; // count of static chars * px/char + for color rectangle + space
+		$this->shiftLegendRight = 0; // count of static chars * px/char + for color rectangle + space
 		$this->shiftCaption = 0;
 		$this->maxCaption = 0;
 		$this->drawLegend = 0;
@@ -54,6 +54,7 @@ class CBarGraphDraw extends CGraphDraw {
 		$this->side_values = array(GRAPH_YAXIS_SIDE_LEFT => ITEM_VALUE_TYPE_UINT64, GRAPH_YAXIS_SIDE_RIGHT => ITEM_VALUE_TYPE_UINT64); // 0 - float, 3 - uint
 		$this->column = null;
 		$this->units = array(GRAPH_YAXIS_SIDE_LEFT => '', GRAPH_YAXIS_SIDE_RIGHT => ''); // units for values
+		$this->minChartHeight = false;
 	}
 
 	/********************************************************************************************************/
@@ -131,9 +132,9 @@ class CBarGraphDraw extends CGraphDraw {
 		foreach ($seriesLegend as $key => $value) {
 			$this->seriesLegend[$key] = $value;
 
-			$tmp = zbx_strlen($value) * 7 + 8; // count of chars * font size + color box
-			if ($tmp > $this->shiftlegendright) {
-				$this->shiftlegendright = $tmp;
+			$tmp = mb_strlen($value) * 7 + 8; // count of chars * font size + color box
+			if ($tmp > $this->shiftLegendRight) {
+				$this->shiftLegendRight = $tmp;
 			}
 		}
 	}
@@ -149,7 +150,7 @@ class CBarGraphDraw extends CGraphDraw {
 		$this->shiftXright = 10;
 
 		if ($this->drawLegend == 0) {
-			$this->shiftlegendright = 0;
+			$this->shiftLegendRight = 0;
 		}
 
 		if ($this->column) {
@@ -494,14 +495,14 @@ class CBarGraphDraw extends CGraphDraw {
 			$i = 0;
 			foreach ($this->series as $key => $serie) {
 				$caption = $this->periodCaption[$key];
-				$dims = imageTextSize(7, 90, $caption);
+				$dims = imageTextSize(8, 90, $caption);
 
 				imageText(
 					$this->im,
-					7,
+					8,
 					90,
 					$i*($this->seriesWidth+$this->seriesDistance)+$this->shiftXleft+$this->shiftXCaptionLeft+round($this->seriesWidth/2)+$dims['width']*2,
-					$this->sizeY+$this->shiftY + $dims['height'] +6,
+					$this->sizeY+$this->shiftY + $dims['height'] + 10,
 					$this->getColor($this->graphtheme['textcolor'], 0),
 					$caption
 				);
@@ -634,7 +635,7 @@ class CBarGraphDraw extends CGraphDraw {
 		}
 
 		$shiftY = $this->shiftY;
-		$shiftX = $this->fullSizeX - $this->shiftlegendright - $this->shiftXright;
+		$shiftX = $this->fullSizeX - $this->shiftLegendRight - $this->shiftXright;
 
 		$count = 0;
 		foreach ($this->series as $key => $serie) {
@@ -673,6 +674,10 @@ class CBarGraphDraw extends CGraphDraw {
 		}
 	}
 
+	public function setMinChartHeight($minChartHeight) {
+		$this->minChartHeight = $minChartHeight;
+	}
+
 	public function draw() {
 		$start_time = microtime(true);
 		set_image_header();
@@ -682,14 +687,28 @@ class CBarGraphDraw extends CGraphDraw {
 		$this->fullSizeX = $this->sizeX;
 		$this->fullSizeY = $this->sizeY;
 
-		if ($this->sizeX < 300 || $this->sizeY < 200) {
-			$this->showLegend(0);
+		if ($this->minChartHeight) {
+
+			$this->calcShifts();
+
+			$shiftsY = $this->shiftY + $this->shiftYLegend + $this->shiftYCaptionBottom + $this->shiftYCaptionTop;
+
+			if ($this->sizeY - $shiftsY < $this->minChartHeight) {
+				$this->sizeY = $this->minChartHeight;
+				$this->fullSizeY = $this->sizeY + $shiftsY + 10;
+			}
 		}
+		else {
+			if ($this->fullSizeX < 300 || $this->fullSizeY < 200) {
+				$this->showLegend(0);
+			}
 
-		$this->calcShifts();
+			$this->calcShifts();
+
+			$this->sizeY -= $this->shiftY + $this->shiftYLegend + $this->shiftYCaptionBottom + $this->shiftYCaptionTop;
+		}
 
-		$this->sizeX -= $this->shiftXleft + $this->shiftXright + $this->shiftlegendright + $this->shiftXCaptionLeft + $this->shiftXCaptionRight;
-		$this->sizeY -= $this->shiftY + $this->shiftYLegend + $this->shiftYCaptionBottom + $this->shiftYCaptionTop;
+		$this->sizeX -= $this->shiftXleft + $this->shiftXright + $this->shiftLegendRight + $this->shiftXCaptionLeft + $this->shiftXCaptionRight;
 
 		$this->calcSeriesWidth();
 		$this->calcMiniMax();
diff --git a/frontends/php/include/classes/graphdraw/CGraphDraw.php b/frontends/php/include/classes/graphdraw/CGraphDraw.php
index e262335ea83..84a4316219f 100644
--- a/frontends/php/include/classes/graphdraw/CGraphDraw.php
+++ b/frontends/php/include/classes/graphdraw/CGraphDraw.php
@@ -231,10 +231,13 @@ abstract class CGraphDraw {
 			$str = $this->items[0]['hostname'].NAME_DELIMITER.$this->items[0]['name'];
 		}
 		else {
+			// TODO: graphs shouldn't resolve names themselves
 			$str = CMacrosResolverHelper::resolveGraphName($this->header, $this->items);
 		}
 
-		$str .= $this->period2str($this->period);
+		if ($this->period) {
+			$str .= $this->period2str($this->period);
+		}
 
 		// calculate largest font size that can fit graph header
 		// TODO: font size must be dynamic in other parts of the graph as well, like legend, timeline, etc
diff --git a/frontends/php/include/classes/graphdraw/CLineGraphDraw.php b/frontends/php/include/classes/graphdraw/CLineGraphDraw.php
index 8329ef7474a..aabd79e5e34 100644
--- a/frontends/php/include/classes/graphdraw/CLineGraphDraw.php
+++ b/frontends/php/include/classes/graphdraw/CLineGraphDraw.php
@@ -100,6 +100,8 @@ class CLineGraphDraw extends CGraphDraw {
 			$drawtype = GRAPH_ITEM_DRAWTYPE_FILLED_REGION;
 		}
 
+		// TODO: graphs shouldn't retrieve items and resolve macros themselves
+		// all of the data must be passed as parameters
 		$items = CMacrosResolverHelper::resolveItemNames(array(get_item_by_itemid($itemid)));
 		$item = reset($items);
 
@@ -262,7 +264,7 @@ class CLineGraphDraw extends CGraphDraw {
 						'SUM(num) AS count,AVG(value_avg) AS avg,MIN(value_min) AS min,'.
 						'MAX(value_max) AS max,MAX(clock) AS clock'.
 					' FROM trends'.
-					' WHERE itemid='.$this->items[$i]['itemid'].
+					' WHERE itemid='.zbx_dbstr($this->items[$i]['itemid']).
 						' AND clock>='.zbx_dbstr($from_time).
 						' AND clock<='.zbx_dbstr($to_time).
 					' GROUP BY itemid,'.$calc_field
@@ -455,7 +457,11 @@ class CLineGraphDraw extends CGraphDraw {
 				' ORDER BY tr.priority'
 			);
 			while (($trigger = DBfetch($db_triggers)) && $cnt < $max) {
-				$db_fnc_cnt = DBselect('SELECT COUNT(*) AS cnt FROM functions f WHERE f.triggerid='.$trigger['triggerid']);
+				$db_fnc_cnt = DBselect(
+					'SELECT COUNT(*) AS cnt'.
+					' FROM functions f'.
+					' WHERE f.triggerid='.zbx_dbstr($trigger['triggerid'])
+				);
 				$fnc_cnt = DBfetch($db_fnc_cnt);
 
 				if ($fnc_cnt['cnt'] != 1) {
@@ -1927,6 +1933,8 @@ class CLineGraphDraw extends CGraphDraw {
 
 			$rowNum++;
 
+			// legends for stacked graphs are written in reverse order so that the order of items
+			// matches the order of lines on the graphs
 			if ($this->type == GRAPH_TYPE_STACKED) {
 				$i--;
 			}
@@ -2160,10 +2168,10 @@ class CLineGraphDraw extends CGraphDraw {
 				$a[6] = $x2;
 				$a[7] = $y2max;
 
-			// don't use break, avg must be drawed in this statement
+			// don't use break, avg must be drawn in this statement
 			case CALC_FNC_AVG:
 
-			// don't use break, avg must be drawed in this statement
+			// don't use break, avg must be drawn in this statement
 			default:
 				$y1 = $y1avg;
 				$y2 = $y2avg;
diff --git a/frontends/php/include/classes/graphdraw/CPieGraphDraw.php b/frontends/php/include/classes/graphdraw/CPieGraphDraw.php
index 99e4fb5f752..b9720f0cb71 100644
--- a/frontends/php/include/classes/graphdraw/CPieGraphDraw.php
+++ b/frontends/php/include/classes/graphdraw/CPieGraphDraw.php
@@ -268,7 +268,7 @@ class CPieGraphDraw extends CGraphDraw {
 
 			$this->sum += $item_value;
 
-			$convertedUnit = zbx_strlen(convert_units(array(
+			$convertedUnit = strlen(convert_units(array(
 				'value' => $item_value,
 				'units' => $this->items[$i]['units']
 			)));
diff --git a/frontends/php/include/classes/helpers/CConditionHelper.php b/frontends/php/include/classes/helpers/CConditionHelper.php
index 7191bef3860..68e9d7b044a 100644
--- a/frontends/php/include/classes/helpers/CConditionHelper.php
+++ b/frontends/php/include/classes/helpers/CConditionHelper.php
@@ -152,4 +152,74 @@ class CConditionHelper {
 
 		return $formula;
 	}
+
+	/**
+	 * Sort conditions by formula id as if they were numbers.
+	 *
+	 * @param array		$conditions		conditions
+	 * @return array
+	 */
+	public static function sortConditionsByFormulaId($conditions) {
+		uasort($conditions, function ($condition1, $condition2) {
+			return CConditionHelper::compareFormulaIds($condition1['formulaid'], $condition2['formulaid']);
+		});
+
+		return $conditions;
+	}
+
+	/**
+	 * Compare formula IDs.
+	 *
+	 * @param string $formulaId1
+	 * @param string $formulaId2
+	 *
+	 * @return int
+	 */
+	public static function compareFormulaIds($formulaId1, $formulaId2) {
+		$len1 = strlen($formulaId1);
+		$len2 = strlen($formulaId2);
+
+		if ($len1 == $len2) {
+			return strcmp($formulaId1, $formulaId2);
+		}
+		else {
+			return ($len1 < $len2) ? -1 : 1;
+		}
+	}
+
+	/**
+	 * Returns next formula ID - A => B, B => C, ..., Z => AA, ..., ZZ => AAA, ...
+	 *
+	 * @param array $formulaIds
+	 *
+	 * @return string
+	 */
+	public static function getNextFormulaId(array $formulaIds) {
+		if (!$formulaIds) {
+			$nextFormulaId = 'A';
+		}
+		else {
+			usort($formulaIds, array('CConditionHelper', 'compareFormulaIds'));
+
+			$lastFormulaId = array_pop($formulaIds);
+
+			$calculateNextFormulaId = function($formulaId) use (&$calculateNextFormulaId) {
+				$head = substr($formulaId, 0, -1);
+				$tail = substr($formulaId, -1);
+
+				if ($tail == 'Z') {
+					$nextFormulaId = $head ? $calculateNextFormulaId($head).'A' : 'AA';
+				}
+				else {
+					$nextFormulaId = $head.chr(ord($tail) + 1);
+				}
+
+				return $nextFormulaId;
+			};
+
+			$nextFormulaId = $calculateNextFormulaId($lastFormulaId);
+		}
+
+		return $nextFormulaId;
+	}
 }
diff --git a/frontends/php/include/classes/helpers/CJs.php b/frontends/php/include/classes/helpers/CJs.php
index 3e0fa3b31fe..090f98f9c00 100644
--- a/frontends/php/include/classes/helpers/CJs.php
+++ b/frontends/php/include/classes/helpers/CJs.php
@@ -27,7 +27,7 @@ class CJs {
 	/**
 	 * The object used to encode values in JSON.
 	 *
-	 * @var CJSON
+	 * @var CJson
 	 */
 	protected static $json;
 
@@ -43,7 +43,7 @@ class CJs {
 	 */
 	public static function encodeJson($data, $forceObject = false) {
 		if (self::$json === null) {
-			self::$json = new CJSON();
+			self::$json = new CJson();
 		}
 
 		return self::$json->encode($data, array(), $forceObject);
@@ -61,7 +61,7 @@ class CJs {
 	 */
 	public static function decodeJson($data, $asArray = true) {
 		if (self::$json === null) {
-			self::$json = new CJSON();
+			self::$json = new CJson();
 		}
 
 		return self::$json->decode($data, $asArray);
diff --git a/frontends/php/include/classes/helpers/CMenuPopupHelper.php b/frontends/php/include/classes/helpers/CMenuPopupHelper.php
index a0d360113d5..269588c6d3e 100644
--- a/frontends/php/include/classes/helpers/CMenuPopupHelper.php
+++ b/frontends/php/include/classes/helpers/CMenuPopupHelper.php
@@ -218,8 +218,9 @@ class CMenuPopupHelper {
 	 *
 	 * @param array  $host						host data
 	 * @param string $host['hostid']			host id
-	 * @param array  $host['graphs']			host graphs (optional)
-	 * @param array  $host['screens']			host screens (optional)
+	 * @param string $host['status']			host status
+	 * @param array  $host['graphs']			host graphs
+	 * @param array  $host['screens']			host screens
 	 * @param array  $scripts					host scripts (optional)
 	 * @param string $scripts[]['name']			script name
 	 * @param string $scripts[]['scriptid']		script id
@@ -232,8 +233,9 @@ class CMenuPopupHelper {
 		$data = array(
 			'type' => 'host',
 			'hostid' => $host['hostid'],
-			'hasGraphs' => (isset($host['graphs']) && $host['graphs']),
-			'hasScreens' => (isset($host['screens']) && $host['screens']),
+			'showGraphs' => (bool) $host['graphs'],
+			'showScreens' => (bool) $host['screens'],
+			'showTriggers' => ($host['status'] == HOST_STATUS_MONITORED),
 			'hasGoTo' => $hasGoTo
 		);
 
@@ -380,13 +382,15 @@ class CMenuPopupHelper {
 			'url' => resolveTriggerUrl($trigger)
 		);
 
+		$host = reset($trigger['hosts']);
+
 		if (in_array(CWebUser::$data['type'], array(USER_TYPE_ZABBIX_ADMIN, USER_TYPE_SUPER_ADMIN))
 				&& $trigger['flags'] == ZBX_FLAG_DISCOVERY_NORMAL) {
-			$host = reset($trigger['hosts']);
-
 			$data['configuration'] = array('hostid' => $host['hostid']);
 		}
 
+		$data['showEvents'] = ($host['status'] == HOST_STATUS_MONITORED);
+
 		return $data;
 	}
 
diff --git a/frontends/php/include/classes/helpers/CUploadFile.php b/frontends/php/include/classes/helpers/CUploadFile.php
index 36e3a5eb91a..69f4e6e2c57 100644
--- a/frontends/php/include/classes/helpers/CUploadFile.php
+++ b/frontends/php/include/classes/helpers/CUploadFile.php
@@ -131,7 +131,7 @@ class CUploadFile {
 	}
 
 	/**
-	 * Return true if file wos uploaded, maybe with errors.
+	 * Return true if file was uploaded, maybe with errors.
 	 *
 	 * @return bool
 	 */
diff --git a/frontends/php/include/classes/class.carea.php b/frontends/php/include/classes/html/CArea.php
index c75fc6c77d6..c75fc6c77d6 100644
--- a/frontends/php/include/classes/class.carea.php
+++ b/frontends/php/include/classes/html/CArea.php
diff --git a/frontends/php/include/classes/class.careamap.php b/frontends/php/include/classes/html/CAreaMap.php
index 92565008b45..eaca7822e66 100644
--- a/frontends/php/include/classes/class.careamap.php
+++ b/frontends/php/include/classes/html/CAreaMap.php
@@ -35,7 +35,7 @@ class CAreaMap extends CTag {
 	}
 
 	public function addItem($value) {
-		if (is_object($value) && zbx_strtolower(get_class($value)) != 'carea') {
+		if (is_object($value) && strtolower(get_class($value)) !== 'carea') {
 			return $this->error('Incorrect value for addItem "'.$value.'".');
 		}
 
diff --git a/frontends/php/include/classes/class.cbutton.php b/frontends/php/include/classes/html/CButton.php
index 543934e201b..543934e201b 100644
--- a/frontends/php/include/classes/class.cbutton.php
+++ b/frontends/php/include/classes/html/CButton.php
diff --git a/frontends/php/include/classes/class.cbuttoncancel.php b/frontends/php/include/classes/html/CButtonCancel.php
index 970ab702e4b..ce0e2c3e732 100644
--- a/frontends/php/include/classes/class.cbuttoncancel.php
+++ b/frontends/php/include/classes/html/CButtonCancel.php
@@ -33,7 +33,7 @@ class CButtonCancel extends CButton {
 		if (!empty($value)) {
 			$url .= $value;
 		}
-		$uri = new Curl($url);
+		$uri = new CUrl($url);
 		$url = $uri->getUrl();
 		return $this->setAttribute('onclick', "javascript: return redirect('".$url."');");
 	}
diff --git a/frontends/php/include/classes/class.cbuttondelete.php b/frontends/php/include/classes/html/CButtonDelete.php
index 6c029ac7470..6c029ac7470 100644
--- a/frontends/php/include/classes/class.cbuttondelete.php
+++ b/frontends/php/include/classes/html/CButtonDelete.php
diff --git a/frontends/php/include/classes/class.cbuttonqmessage.php b/frontends/php/include/classes/html/CButtonQMessage.php
index 208210ac52f..f2349013a4b 100644
--- a/frontends/php/include/classes/class.cbuttonqmessage.php
+++ b/frontends/php/include/classes/html/CButtonQMessage.php
@@ -69,7 +69,7 @@ class CButtonQMessage extends CSubmit {
 
 		if (isset($this->vars)) {
 			$link = $page['file'].'?'.$this->name.'=1'.$this->vars;
-			$url = new Curl($link);
+			$url = new CUrl($link);
 			$action = "redirect('".$url->getUrl()."')";
 		}
 		else {
diff --git a/frontends/php/include/classes/class.ccheckbox.php b/frontends/php/include/classes/html/CCheckBox.php
index 22f2f57836b..97469911648 100644
--- a/frontends/php/include/classes/class.ccheckbox.php
+++ b/frontends/php/include/classes/html/CCheckBox.php
@@ -21,7 +21,7 @@
 
 class CCheckBox extends CInput {
 
-	public function __construct($name = 'checkbox', $checked = 'no', $action = null, $value = 'yes') {
+	public function __construct($name = 'checkbox', $checked = 'no', $action = null, $value = '1') {
 		parent::__construct('checkbox', $name, $value, 'checkbox pointer');
 		$this->setAttribute('onclick', $action);
 		$this->setChecked($checked);
diff --git a/frontends/php/include/classes/class.ccol.php b/frontends/php/include/classes/html/CCol.php
index 09331b268b8..09331b268b8 100644
--- a/frontends/php/include/classes/class.ccol.php
+++ b/frontends/php/include/classes/html/CCol.php
diff --git a/frontends/php/include/classes/html/CCollapsibleUiWidget.php b/frontends/php/include/classes/html/CCollapsibleUiWidget.php
new file mode 100644
index 00000000000..ff29507ec8b
--- /dev/null
+++ b/frontends/php/include/classes/html/CCollapsibleUiWidget.php
@@ -0,0 +1,79 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/**
+ * A class for rendering a widget that can be collapsed or expanded.
+ */
+class CCollapsibleUiWidget extends CUiWidget {
+
+	/**
+	 * Expand/collapse widget.
+	 *
+	 * Supported values:
+	 * - true - expanded;
+	 * - false - collapsed.
+	 *
+	 * @var bool
+	 */
+	public $open = true;
+
+	/**
+	 * Sets the header and adds a default expand-collapse icon.
+	 *
+	 * @param string|array|CTag $caption
+	 * @param string|array|CTag $icons
+	 */
+	public function setHeader($caption = null, $icons = SPACE) {
+		zbx_value2array($icons);
+
+		$icon = new CIcon(
+			_('Show').'/'._('Hide'),
+			$this->open ? 'arrowup' : 'arrowdown',
+			'changeWidgetState(this, "'.$this->id.'");'
+		);
+		$icon->setAttribute('id', $this->id.'_icon');
+		array_unshift($icons, $icon);
+
+		parent::setHeader($caption, $icons);
+	}
+
+	/**
+	 * Display the widget in expanded or collapsed state.
+	 */
+	public function build() {
+		$body = new CDiv($this->body, 'body');
+		$body->setAttribute('id', $this->id);
+
+		if (!$this->open) {
+			$body->setAttribute('style', 'display: none;');
+
+			if ($this->footer) {
+				$this->footer->setAttribute('style', 'display: none;');
+			}
+		}
+
+		$this->cleanItems();
+
+		$this->addItem($this->header);
+		$this->addItem($body);
+		$this->addItem($this->footer);
+	}
+}
diff --git a/frontends/php/include/classes/class.ccolor.php b/frontends/php/include/classes/html/CColor.php
index 46d6770cf05..46d6770cf05 100644
--- a/frontends/php/include/classes/class.ccolor.php
+++ b/frontends/php/include/classes/html/CColor.php
diff --git a/frontends/php/include/classes/class.ccolorcell.php b/frontends/php/include/classes/html/CColorCell.php
index fb35477e6bc..fb35477e6bc 100644
--- a/frontends/php/include/classes/class.ccolorcell.php
+++ b/frontends/php/include/classes/html/CColorCell.php
diff --git a/frontends/php/include/classes/class.ccombobox.php b/frontends/php/include/classes/html/CComboBox.php
index 6ed6991ec03..6ed6991ec03 100644
--- a/frontends/php/include/classes/class.ccombobox.php
+++ b/frontends/php/include/classes/html/CComboBox.php
diff --git a/frontends/php/include/classes/class.ccomboitem.php b/frontends/php/include/classes/html/CComboItem.php
index 341697c7563..341697c7563 100644
--- a/frontends/php/include/classes/class.ccomboitem.php
+++ b/frontends/php/include/classes/html/CComboItem.php
diff --git a/frontends/php/include/classes/class.cdiv.php b/frontends/php/include/classes/html/CDiv.php
index 3300778c399..3300778c399 100644
--- a/frontends/php/include/classes/class.cdiv.php
+++ b/frontends/php/include/classes/html/CDiv.php
diff --git a/frontends/php/include/classes/class.ceditablecombobox.php b/frontends/php/include/classes/html/CEditableComboBox.php
index 8f060c3ca91..c69dddc81d9 100644
--- a/frontends/php/include/classes/class.ceditablecombobox.php
+++ b/frontends/php/include/classes/html/CEditableComboBox.php
@@ -21,11 +21,18 @@
 
 class CEditableComboBox extends CComboBox {
 
-	public function __construct($name = 'editablecombobox', $value = null, $size = 0, $action = null) {
+	public function __construct($name = 'editablecombobox', $value = null, $size = null, $action = null) {
 		insert_javascript_for_editable_combobox();
 		parent::__construct($name, $value, $action);
 		parent::addAction('onfocus', 'CEditableComboBoxInit(this);');
-		parent::addAction('onchange', 'CEditableComboBoxOnChange(this, '.$size.');');
+
+		$width = ($size == ZBX_TEXTBOX_STANDARD_SIZE) ? ZBX_TEXTAREA_STANDARD_WIDTH : null;
+		parent::addAction('onchange',
+			'CEditableComboBoxOnChange(this, '.CJs::encodeJson($size).', '.CJs::encodeJson($width).');'
+		);
+
+		// prevent Firefox remembering selected option on page refresh
+		$this->setAttribute('autocomplete', 'off');
 	}
 
 	public function addItem($value, $caption = '', $selected = null, $enabled = 'yes', $class = null) {
diff --git a/frontends/php/include/classes/class.cfile.php b/frontends/php/include/classes/html/CFile.php
index 07e5ff1d063..07e5ff1d063 100644
--- a/frontends/php/include/classes/class.cfile.php
+++ b/frontends/php/include/classes/html/CFile.php
diff --git a/frontends/php/include/classes/class.cflash.php b/frontends/php/include/classes/html/CFlash.php
index 10cf5cec9cc..10cf5cec9cc 100644
--- a/frontends/php/include/classes/class.cflash.php
+++ b/frontends/php/include/classes/html/CFlash.php
diff --git a/frontends/php/include/classes/class.cflashclock.php b/frontends/php/include/classes/html/CFlashClock.php
index 34b4f10fb43..34b4f10fb43 100644
--- a/frontends/php/include/classes/class.cflashclock.php
+++ b/frontends/php/include/classes/html/CFlashClock.php
diff --git a/frontends/php/include/classes/class.cflashembed.php b/frontends/php/include/classes/html/CFlashEmbed.php
index 61d59131205..61d59131205 100644
--- a/frontends/php/include/classes/class.cflashembed.php
+++ b/frontends/php/include/classes/html/CFlashEmbed.php
diff --git a/frontends/php/include/classes/class.cform.php b/frontends/php/include/classes/html/CForm.php
index 9a96e673d4f..4915f1dd491 100644
--- a/frontends/php/include/classes/class.cform.php
+++ b/frontends/php/include/classes/html/CForm.php
@@ -31,7 +31,7 @@ class CForm extends CTag {
 		if (isset($_COOKIE['zbx_sessionid'])) {
 			$this->addVar('sid', substr($_COOKIE['zbx_sessionid'], 16, 16));
 		}
-		$this->addVar('form_refresh', get_request('form_refresh', 0) + 1);
+		$this->addVar('form_refresh', getRequest('form_refresh', 0) + 1);
 	}
 
 	public function setMethod($value = 'post') {
diff --git a/frontends/php/include/classes/class.cformlist.php b/frontends/php/include/classes/html/CFormList.php
index ed000fc4171..89987a683da 100644
--- a/frontends/php/include/classes/class.cformlist.php
+++ b/frontends/php/include/classes/html/CFormList.php
@@ -42,7 +42,7 @@ class CFormList extends CDiv {
 		$label = $term;
 
 		if (is_object($description)) {
-			$inputClass = zbx_strtolower(get_class($description));
+			$inputClass = strtolower(get_class($description));
 
 			if (in_array($inputClass, $this->formInputs)) {
 				$label = new CLabel($term, $description->getAttribute('id'));
diff --git a/frontends/php/include/classes/class.cformtable.php b/frontends/php/include/classes/html/CFormTable.php
index c881e57f5a9..43ef963a56f 100644
--- a/frontends/php/include/classes/class.cformtable.php
+++ b/frontends/php/include/classes/html/CFormTable.php
@@ -22,13 +22,19 @@
 class CFormTable extends CForm {
 
 	private $align;
-	private $help;
 	private $title;
 	private $tableclass = 'formtable';
 	protected $top_items = array();
 	protected $center_items = array();
 	protected $bottom_items = array();
 
+	/**
+	 * Help icon.
+	 *
+	 * @var CHelp
+	 */
+	protected $help;
+
 	public function __construct($title = null, $action = null, $method = null, $enctype = null, $form_variable = null) {
 		$method = is_null($method) ? 'post' : $method;
 		parent::__construct($method, $action, $enctype);
@@ -36,7 +42,7 @@ class CFormTable extends CForm {
 		$this->setTitle($title);
 
 		$form_variable = is_null($form_variable) ? 'form' : $form_variable;
-		$this->addVar($form_variable, get_request($form_variable, 1));
+		$this->addVar($form_variable, getRequest($form_variable, 1));
 
 		$this->bottom_items = new CCol(SPACE, 'form_row_last');
 		$this->bottom_items->setColSpan(2);
@@ -56,7 +62,7 @@ class CFormTable extends CForm {
 
 	public function setName($value) {
 		if (!is_string($value)) {
-			return $this->error('Incorrect value for setAlign "'.$value.'".');
+			return $this->error('Incorrect value for setName "'.$value.'".');
 		}
 		$this->attr('name', $value);
 		$this->attr('id', zbx_formatDomId($value));
@@ -74,30 +80,17 @@ class CFormTable extends CForm {
 		$this->title = $value;
 	}
 
-	public function setHelp($value = null) {
-		if (is_null($value)) {
-			$this->help = new CHelp();
-		}
-		elseif (is_object($value) && zbx_strtolower(get_class($value)) == 'chelp') {
-			$this->help = $value;
-		}
-		elseif (is_string($value)) {
-			$this->help = new CHelp($value);
-			if ($this->getName() == null) {
-				$this->setName($value);
-			}
-		}
-		else {
-			return $this->error('Incorrect value for setHelp "'.$value.'".');
-		}
-
-		return 0;
+	/**
+	 * Adds a help icon.
+	 */
+	public function addHelpIcon() {
+		$this->help = new CHelp();
 	}
 
 	public function addRow($item1, $item2 = null, $class = null, $id = null) {
-		if (is_object($item1) && zbx_strtolower(get_class($item1)) == 'crow') {
+		if (is_object($item1) && strtolower(get_class($item1)) === 'crow') {
 		}
-		elseif (is_object($item1) && zbx_strtolower(get_class($item1)) == 'ctable') {
+		elseif (is_object($item1) && strtolower(get_class($item1)) === 'ctable') {
 			$td = new CCol($item1, 'form_row_c');
 			$td->setColSpan(2);
 			$item1 = new CRow($td);
@@ -146,10 +139,13 @@ class CFormTable extends CForm {
 		$this->bottom_items->addItem($value);
 	}
 
+	/**
+	 * Sets the class for the table element.
+	 *
+	 * @param string $class
+	 */
 	public function setTableClass($class) {
-		if (is_string($class)) {
-			$this->tableclass = $class;
-		}
+		$this->tableclass = $class;
 	}
 
 	public function bodyToString() {
diff --git a/frontends/php/include/classes/class.chelp.php b/frontends/php/include/classes/html/CHelp.php
index 70cf0fdc58c..70cf0fdc58c 100644
--- a/frontends/php/include/classes/class.chelp.php
+++ b/frontends/php/include/classes/html/CHelp.php
diff --git a/frontends/php/include/classes/class.chostsinfo.php b/frontends/php/include/classes/html/CHostsInfo.php
index 1a2e1245d53..6bef583bfa3 100644
--- a/frontends/php/include/classes/class.chostsinfo.php
+++ b/frontends/php/include/classes/html/CHostsInfo.php
@@ -23,7 +23,7 @@ class CHostsInfo extends CTable {
 
 	public $style;
 
-	public function __construct($groupid = 0, $style = STYLE_HORISONTAL) {
+	public function __construct($groupid = 0, $style = STYLE_HORIZONTAL) {
 		$this->groupid = $groupid;
 		$this->style = null;
 
@@ -32,7 +32,7 @@ class CHostsInfo extends CTable {
 	}
 
 	public function setOrientation($value) {
-		if ($value != STYLE_HORISONTAL && $value != STYLE_VERTICAL) {
+		if ($value != STYLE_HORIZONTAL && $value != STYLE_VERTICAL) {
 			return $this->error('Incorrect value for SetOrientation "'.$value.'".');
 		}
 		$this->style = $value;
@@ -109,7 +109,7 @@ class CHostsInfo extends CTable {
 		}
 
 		$header = new CCol($header_str, 'header');
-		if ($this->style == STYLE_HORISONTAL) {
+		if ($this->style == STYLE_HORIZONTAL) {
 			$header->setColspan(4);
 		}
 
@@ -120,7 +120,7 @@ class CHostsInfo extends CTable {
 		$uncn = new CCol($uncn.'  '._('Unknown'), 'uncn');
 		$total = new CCol($total.'  '._('Total'), 'total');
 
-		if ($this->style == STYLE_HORISONTAL) {
+		if ($this->style == STYLE_HORIZONTAL) {
 			$this->addRow(array($avail, $notav, $uncn, $total));
 		}
 		else {
diff --git a/frontends/php/include/classes/class.ciframe.php b/frontends/php/include/classes/html/CIFrame.php
index 8404a49c180..8404a49c180 100644
--- a/frontends/php/include/classes/class.ciframe.php
+++ b/frontends/php/include/classes/html/CIFrame.php
diff --git a/frontends/php/include/classes/class.cicon.php b/frontends/php/include/classes/html/CIcon.php
index 0827cfb1eaf..0827cfb1eaf 100644
--- a/frontends/php/include/classes/class.cicon.php
+++ b/frontends/php/include/classes/html/CIcon.php
diff --git a/frontends/php/include/classes/class.cimagetexttable.php b/frontends/php/include/classes/html/CImageTextTable.php
index 2afed34657f..2afed34657f 100644
--- a/frontends/php/include/classes/class.cimagetexttable.php
+++ b/frontends/php/include/classes/html/CImageTextTable.php
diff --git a/frontends/php/include/classes/class.cimg.php b/frontends/php/include/classes/html/CImg.php
index 1b2701db494..1b2701db494 100644
--- a/frontends/php/include/classes/class.cimg.php
+++ b/frontends/php/include/classes/html/CImg.php
diff --git a/frontends/php/include/classes/class.cinput.php b/frontends/php/include/classes/html/CInput.php
index 7c84c04803e..c295b39d001 100644
--- a/frontends/php/include/classes/class.cinput.php
+++ b/frontends/php/include/classes/html/CInput.php
@@ -47,18 +47,18 @@ class CInput extends CTag {
 		return $this;
 	}
 
-	public function setReadonly($value = 'yes') {
-		if ((is_string($value) && ($value == 'yes' || $value == 'checked' || $value == 'on') || $value == '1') || (is_int($value) && $value <> 0) || $value === true) {
+	public function setReadonly($value) {
+		if ($value) {
 			$this->attr('readonly', 'readonly');
-			return $this;
 		}
-		$this->removeAttr('readonly');
-		return $this;
+		else {
+			$this->removeAttribute('readonly');
+		}
 	}
 
 	public function setEnabled($value = 'yes') {
 		if ((is_string($value) && ($value == 'yes' || $value == 'checked' || $value == 'on') || $value == '1') || (is_int($value) && $value <> 0) || $value === true) {
-			$this->removeAttr('disabled');
+			$this->removeAttribute('disabled');
 			return $this;
 		}
 		$this->attr('disabled', 'disabled');
diff --git a/frontends/php/include/classes/class.cjsscript.php b/frontends/php/include/classes/html/CJsScript.php
index 4fa34ed3a3e..59018ee24a9 100644
--- a/frontends/php/include/classes/class.cjsscript.php
+++ b/frontends/php/include/classes/html/CJsScript.php
@@ -19,7 +19,7 @@
 **/
 
 
-class CJSscript extends CObject {
+class CJsScript extends CObject {
 
 	public function __construct($item = null) {
 		$this->items = array();
diff --git a/frontends/php/include/classes/class.clabel.php b/frontends/php/include/classes/html/CLabel.php
index 4da5a979015..4da5a979015 100644
--- a/frontends/php/include/classes/class.clabel.php
+++ b/frontends/php/include/classes/html/CLabel.php
diff --git a/frontends/php/include/classes/class.clink.php b/frontends/php/include/classes/html/CLink.php
index b3e4a83472b..a81675ad905 100644
--- a/frontends/php/include/classes/class.clink.php
+++ b/frontends/php/include/classes/html/CLink.php
@@ -52,7 +52,7 @@ class CLink extends CTag {
 				$this->sid = isset($_COOKIE['zbx_sessionid']) ? substr($_COOKIE['zbx_sessionid'], 16, 16) : null;
 			}
 			if (!is_null($this->sid)) {
-				$value .= (zbx_strstr($value, '&') !== false || zbx_strstr($value, '?') !== false)
+				$value .= (strpos($value, '&') !== false || strpos($value, '?') !== false)
 					? '&sid='.$this->sid
 					: '?sid='.$this->sid;
 			}
diff --git a/frontends/php/include/classes/class.clist.php b/frontends/php/include/classes/html/CList.php
index a0d35425370..a0d35425370 100644
--- a/frontends/php/include/classes/class.clist.php
+++ b/frontends/php/include/classes/html/CList.php
diff --git a/frontends/php/include/classes/class.clistbox.php b/frontends/php/include/classes/html/CListBox.php
index a621483352e..a621483352e 100644
--- a/frontends/php/include/classes/class.clistbox.php
+++ b/frontends/php/include/classes/html/CListBox.php
diff --git a/frontends/php/include/classes/class.clistitem.php b/frontends/php/include/classes/html/CListItem.php
index a13b452d94f..a13b452d94f 100644
--- a/frontends/php/include/classes/class.clistitem.php
+++ b/frontends/php/include/classes/html/CListItem.php
diff --git a/frontends/php/include/classes/class.cmultiselect.php b/frontends/php/include/classes/html/CMultiSelect.php
index c2c06c2b602..10f807dd850 100644
--- a/frontends/php/include/classes/class.cmultiselect.php
+++ b/frontends/php/include/classes/html/CMultiSelect.php
@@ -28,11 +28,11 @@ class CMultiSelect extends CTag {
 	 */
 	public function __construct(array $options = array()) {
 		parent::__construct('div', 'yes');
-		$this->attr('id', zbx_formatDomId($options['name']));
 		$this->addClass('multiselect');
+		$this->attr('id', zbx_formatDomId($options['name']));
 
 		// url
-		$url = new Curl('jsrpc.php');
+		$url = new CUrl('jsrpc.php');
 		$url->setArgument('type', PAGE_TYPE_TEXT_RETURN_JSON);
 		$url->setArgument('method', 'multiselect.get');
 		$url->setArgument('objectName', $options['objectName']);
@@ -44,21 +44,27 @@ class CMultiSelect extends CTag {
 		}
 
 		$params = array(
-			'id' => $this->getAttribute('id'),
 			'url' => $url->getUrl(),
 			'name' => $options['name'],
 			'labels' => array(
 				'No matches found' => _('No matches found'),
 				'More matches found...' => _('More matches found...'),
 				'type here to search' => _('type here to search'),
-				'new' => _('new')
+				'new' => _('new'),
+				'Select' => _('Select')
 			),
 			'data' => empty($options['data']) ? array() : zbx_cleanHashes($options['data']),
 			'ignored' => isset($options['ignored']) ? $options['ignored'] : null,
 			'defaultValue' => isset($options['defaultValue']) ? $options['defaultValue'] : null,
 			'disabled' => isset($options['disabled']) ? $options['disabled'] : false,
 			'selectedLimit' => isset($options['selectedLimit']) ? $options['selectedLimit'] : null,
-			'addNew' => isset($options['addNew']) ? $options['addNew'] : false
+			'addNew' => isset($options['addNew']) ? $options['addNew'] : false,
+			'popup' => array(
+				'parameters' => isset($options['popup']['parameters']) ? $options['popup']['parameters'] : null,
+				'width' => isset($options['popup']['width']) ? $options['popup']['width'] : null,
+				'height' => isset($options['popup']['height']) ? $options['popup']['height'] : null,
+				'buttonClass' => isset($options['popup']['buttonClass']) ? $options['popup']['buttonClass'] : null
+			)
 		);
 
 		zbx_add_post_js('jQuery("#'.$this->getAttribute('id').'").multiSelect('.CJs::encodeJson($params).');');
diff --git a/frontends/php/include/classes/class.cnumericbox.php b/frontends/php/include/classes/html/CNumericBox.php
index 88396deb62d..41f83de5061 100644
--- a/frontends/php/include/classes/class.cnumericbox.php
+++ b/frontends/php/include/classes/html/CNumericBox.php
@@ -21,7 +21,7 @@
 
 class CNumericBox extends CInput {
 
-	public function __construct($name = 'number', $value = '0', $size = 20, $readonly = 'no', $allowempty = false, $allownegative = true) {
+	public function __construct($name = 'number', $value = '0', $size = 20, $readonly = false, $allowempty = false, $allownegative = true) {
 		parent::__construct('text', $name, $value);
 		$this->setReadonly($readonly);
 		$this->attr('size', $size);
diff --git a/frontends/php/include/classes/class.cobject.php b/frontends/php/include/classes/html/CObject.php
index 37bfe24454d..37bfe24454d 100644
--- a/frontends/php/include/classes/class.cobject.php
+++ b/frontends/php/include/classes/html/CObject.php
diff --git a/frontends/php/include/classes/class.cparam.php b/frontends/php/include/classes/html/CParam.php
index 67c603cc6d6..67c603cc6d6 100644
--- a/frontends/php/include/classes/class.cparam.php
+++ b/frontends/php/include/classes/html/CParam.php
diff --git a/frontends/php/include/classes/class.cpassbox.php b/frontends/php/include/classes/html/CPassBox.php
index 42c227d76b8..42c227d76b8 100644
--- a/frontends/php/include/classes/class.cpassbox.php
+++ b/frontends/php/include/classes/html/CPassBox.php
diff --git a/frontends/php/include/classes/class.cradiobutton.php b/frontends/php/include/classes/html/CRadioButton.php
index d90611bdc89..d90611bdc89 100644
--- a/frontends/php/include/classes/class.cradiobutton.php
+++ b/frontends/php/include/classes/html/CRadioButton.php
diff --git a/frontends/php/include/classes/class.cradiobuttonlist.php b/frontends/php/include/classes/html/CRadioButtonList.php
index 362a3444f9c..362a3444f9c 100644
--- a/frontends/php/include/classes/class.cradiobuttonlist.php
+++ b/frontends/php/include/classes/html/CRadioButtonList.php
diff --git a/frontends/php/include/classes/class.crow.php b/frontends/php/include/classes/html/CRow.php
index 3a091ad3906..57eb60a9007 100644
--- a/frontends/php/include/classes/class.crow.php
+++ b/frontends/php/include/classes/html/CRow.php
@@ -28,17 +28,13 @@ class CRow extends CTag {
 		$this->attr('id', $id);
 	}
 
-	public function setAlign($value) {
-		return $this->attributes['align'] = $value;
-	}
-
 	public function addItem($item) {
-		if (is_object($item) && zbx_strtolower(get_class($item)) == 'ccol') {
+		if (is_object($item) && strtolower(get_class($item)) === 'ccol') {
 			parent::addItem($item);
 		}
 		elseif (is_array($item)) {
 			foreach ($item as $el) {
-				if (is_object($el) && zbx_strtolower(get_class($el)) == 'ccol') {
+				if (is_object($el) && strtolower(get_class($el)) === 'ccol') {
 					parent::addItem($el);
 				}
 				elseif (!is_null($el)) {
@@ -50,10 +46,4 @@ class CRow extends CTag {
 			parent::addItem(new CCol($item));
 		}
 	}
-
-	public function setWidth($value) {
-		if (is_string($value)) {
-			$this->setAttribute('width', $value);
-		}
-	}
 }
diff --git a/frontends/php/include/classes/class.cserverinfo.php b/frontends/php/include/classes/html/CServerInfo.php
index e722001c179..89e0ebca407 100644
--- a/frontends/php/include/classes/class.cserverinfo.php
+++ b/frontends/php/include/classes/html/CServerInfo.php
@@ -37,7 +37,7 @@ class CServerInfo extends CTable {
 			: _('Zabbix server');
 
 		$this->addRow(new CCol(_('Zabbix server info'), 'nowrap ui-corner-all ui-widget-header'));
-		$this->addRow(_('Updated').NAME_DELIMITER.zbx_date2str(SERVER_INFO_DATE_FORMAT, time()));
+		$this->addRow(_('Updated').NAME_DELIMITER.zbx_date2str(DATE_TIME_FORMAT_SECONDS, time()));
 		$this->addRow(_('Users (online)').NAME_DELIMITER.$status['users_count'].'('.$status['users_online'].')');
 		$this->addRow(new CCol(array(_('Logged in as').SPACE, new CLink(CWebUser::$data['alias'], 'profile.php'))));
 		$this->addRow(new CCol(array($serverLink, SPACE._('is').SPACE, $server)), 'status');
diff --git a/frontends/php/include/classes/class.cseverity.php b/frontends/php/include/classes/html/CSeverity.php
index 338fc135654..338fc135654 100644
--- a/frontends/php/include/classes/class.cseverity.php
+++ b/frontends/php/include/classes/html/CSeverity.php
diff --git a/frontends/php/include/classes/class.cspan.php b/frontends/php/include/classes/html/CSpan.php
index f692f488bcd..f692f488bcd 100644
--- a/frontends/php/include/classes/class.cspan.php
+++ b/frontends/php/include/classes/html/CSpan.php
diff --git a/frontends/php/include/classes/class.csubmit.php b/frontends/php/include/classes/html/CSubmit.php
index 15433f60e91..15433f60e91 100644
--- a/frontends/php/include/classes/class.csubmit.php
+++ b/frontends/php/include/classes/html/CSubmit.php
diff --git a/frontends/php/include/classes/class.ctabview.php b/frontends/php/include/classes/html/CTabView.php
index c92c9b9ed4a..c92c9b9ed4a 100644
--- a/frontends/php/include/classes/class.ctabview.php
+++ b/frontends/php/include/classes/html/CTabView.php
diff --git a/frontends/php/include/classes/class.ctable.php b/frontends/php/include/classes/html/CTable.php
index 4494c2237a0..96ec716046b 100644
--- a/frontends/php/include/classes/class.ctable.php
+++ b/frontends/php/include/classes/html/CTable.php
@@ -69,14 +69,14 @@ class CTable extends CTag {
 		if (is_null($item)) {
 			return null;
 		}
-		if (is_object($item) && zbx_strtolower(get_class($item)) == 'ccol') {
+		if (is_object($item) && strtolower(get_class($item)) === 'ccol') {
 			if (isset($this->header) && !isset($item->attributes['colspan'])) {
 				$item->attributes['colspan'] = $this->colnum;
 			}
 			$item = new CRow($item, $class, $id);
 		}
 
-		if (is_object($item) && zbx_strtolower(get_class($item)) == 'crow') {
+		if (is_object($item) && strtolower(get_class($item)) === 'crow') {
 			$item->attr('class', $class);
 		}
 		else {
@@ -95,7 +95,7 @@ class CTable extends CTag {
 		if (is_null($class)) {
 			$class = $this->headerClass;
 		}
-		if (is_object($value) && zbx_strtolower(get_class($value)) == 'crow') {
+		if (is_object($value) && strtolower(get_class($value)) === 'crow') {
 			if (!is_null($class)) {
 				$value->setAttribute('class', $class);
 			}
diff --git a/frontends/php/include/classes/html/CTableInfo.php b/frontends/php/include/classes/html/CTableInfo.php
new file mode 100644
index 00000000000..d744ecdb0f7
--- /dev/null
+++ b/frontends/php/include/classes/html/CTableInfo.php
@@ -0,0 +1,89 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CTableInfo extends CTable {
+
+	public function __construct($message = '...', $class = 'tableinfo') {
+		parent::__construct($message, $class);
+		$this->setOddRowClass('odd_row');
+		$this->setEvenRowClass('even_row');
+		$this->attributes['cellpadding'] = 3;
+		$this->attributes['cellspacing'] = 1;
+		$this->headerClass = 'header';
+		$this->footerClass = 'footer';
+		$this->addMakeVerticalRotationJs = false;
+	}
+
+	public function toString($destroy = true) {
+		$tableId = $this->getAttribute('id');
+
+		if(!$tableId) {
+			$tableId = uniqid('t');
+			$this->setAttribute('id', $tableId);
+		}
+
+		$string = parent::toString($destroy);
+
+		if($this->addMakeVerticalRotationJs) {
+			$string .= get_js(
+				'var makeVerticalRotationForTable = function() {
+					var table = jQuery("#'.$tableId.'");
+
+					table.makeVerticalRotation();
+
+					if (IE8) {
+						jQuery(".vertical_rotation_inner", table).css({
+							filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)"
+						});
+					}
+					else if (IE9) {
+						jQuery(".vertical_rotation_inner", table).css({
+							"-ms-transform": "rotate(270deg)"
+						});
+					}
+
+					if (!IE9) {
+						jQuery(".vertical_rotation_inner", table).css({
+							"writing-mode": "tb-rl"
+						});
+					}
+				}
+
+				if(!jQuery.isReady) {
+					jQuery(document).ready(makeVerticalRotationForTable);
+				}
+				else {
+					makeVerticalRotationForTable();
+				}',
+			true);
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Rotate table header text vertical.
+	 * Cells must be marked with "vertical_rotation" class.
+	 */
+	public function makeVerticalRotation() {
+		$this->addMakeVerticalRotationJs = true;
+	}
+}
diff --git a/frontends/php/include/classes/class.ctag.php b/frontends/php/include/classes/html/CTag.php
index 0d8833abbaa..aaf34ce1426 100644
--- a/frontends/php/include/classes/class.ctag.php
+++ b/frontends/php/include/classes/html/CTag.php
@@ -194,10 +194,6 @@ class CTag extends CObject {
 		}
 	}
 
-	public function removeAttr($name) {
-		$this->removeAttribute($name);
-	}
-
 	public function removeAttribute($name) {
 		unset($this->attributes[$name]);
 	}
@@ -206,7 +202,17 @@ class CTag extends CObject {
 		$this->attributes[$name] = $value;
 	}
 
-	public function setHint($text, $width = '', $class = '', $byClick = true, $encode = true) {
+	/**
+	 * Adds a hint box to the elemt.
+	 *
+	 * @param string|array|CTag     $text       hint content
+	 * @param string                $spanClass  wrap the content in a span element and assign a this class to the span
+	 * @param bool                  $byClick    if set to true, it will be possible to "freeze" the hint box via a mouse
+	 *                                          click
+	 *
+	 * @return bool
+	 */
+	public function setHint($text, $spanClass = '', $byClick = true) {
 		if (empty($text)) {
 			return false;
 		}
@@ -214,9 +220,9 @@ class CTag extends CObject {
 		encodeValues($text);
 		$text = unpack_object($text);
 
-		$this->addAction('onmouseover', 'hintBox.HintWraper(event, this, '.zbx_jsvalue($text).', "'.$width.'", "'.$class.'");');
+		$this->addAction('onmouseover', 'hintBox.HintWraper(event, this, '.zbx_jsvalue($text).', "'.$spanClass.'");');
 		if ($byClick) {
-			$this->addAction('onclick', 'hintBox.showStaticHint(event, this, '.zbx_jsvalue($text).', "'.$width.'", "'.$class.'");');
+			$this->addAction('onclick', 'hintBox.showStaticHint(event, this, '.zbx_jsvalue($text).', "'.$spanClass.'");');
 		}
 
 		return true;
diff --git a/frontends/php/include/classes/class.ctextarea.php b/frontends/php/include/classes/html/CTextArea.php
index 7f0a0cb79d5..0c130d2302c 100644
--- a/frontends/php/include/classes/class.ctextarea.php
+++ b/frontends/php/include/classes/html/CTextArea.php
@@ -45,7 +45,9 @@ class CTextArea extends CTag {
 		$this->attr('id', zbx_formatDomId($name));
 		$this->attr('name', $name);
 		$this->attr('rows', !empty($options['rows']) ? $options['rows'] : ZBX_TEXTAREA_STANDARD_ROWS);
-		$this->setReadonly(!empty($options['readonly']));
+		if (isset($options['readonly'])) {
+			$this->setReadonly($options['readonly']);
+		}
 		$this->addItem($value);
 
 		// set width
@@ -65,7 +67,7 @@ class CTextArea extends CTag {
 		}
 	}
 
-	public function setReadonly($value = true) {
+	public function setReadonly($value) {
 		if ($value) {
 			$this->attr('readonly', 'readonly');
 		}
diff --git a/frontends/php/include/classes/class.ctextbox.php b/frontends/php/include/classes/html/CTextBox.php
index ff6f3e7eb55..2892fb2fbf8 100644
--- a/frontends/php/include/classes/class.ctextbox.php
+++ b/frontends/php/include/classes/html/CTextBox.php
@@ -23,7 +23,7 @@ class CTextBox extends CInput {
 
 	private $caption;
 
-	public function __construct($name = 'textbox', $value = '', $size = 20, $readonly = 'no', $maxlength = 255) {
+	public function __construct($name = 'textbox', $value = '', $size = 20, $readonly = false, $maxlength = 255) {
 		parent::__construct('text', $name, $value);
 		$this->setReadonly($readonly);
 		$this->caption = null;
diff --git a/frontends/php/include/classes/class.ctriggersinfo.php b/frontends/php/include/classes/html/CTriggersInfo.php
index 26e26a0f182..561bf190ef4 100644
--- a/frontends/php/include/classes/class.ctriggersinfo.php
+++ b/frontends/php/include/classes/html/CTriggersInfo.php
@@ -19,8 +19,6 @@
 **/
 
 
-require_once dirname(__FILE__).'/../triggers.inc.php';
-
 class CTriggersInfo extends CTable {
 
 	public $style;
@@ -28,7 +26,7 @@ class CTriggersInfo extends CTable {
 	private $groupid;
 	private $hostid;
 
-	public function __construct($groupid = null, $hostid = null, $style = STYLE_HORISONTAL) {
+	public function __construct($groupid = null, $hostid = null, $style = STYLE_HORIZONTAL) {
 		$this->style = null;
 
 		parent::__construct(null, 'triggers_info');
@@ -39,7 +37,7 @@ class CTriggersInfo extends CTable {
 	}
 
 	public function setOrientation($value) {
-		if ($value != STYLE_HORISONTAL && $value != STYLE_VERTICAL) {
+		if ($value != STYLE_HORIZONTAL && $value != STYLE_VERTICAL) {
 			return $this->error('Incorrect value for SetOrientation ['.$value.']');
 		}
 		$this->style = $value;
@@ -117,7 +115,7 @@ class CTriggersInfo extends CTable {
 			}
 
 			$header = new CCol($header_str, 'header');
-			if ($this->style == STYLE_HORISONTAL) {
+			if ($this->style == STYLE_HORIZONTAL) {
 				$header->setColspan(8);
 			}
 			$this->addRow($header);
@@ -131,7 +129,7 @@ class CTriggersInfo extends CTable {
 		$high = getSeverityCell(TRIGGER_SEVERITY_HIGH, $high.SPACE.getSeverityCaption(TRIGGER_SEVERITY_HIGH), !$high);
 		$dis = getSeverityCell(TRIGGER_SEVERITY_DISASTER, $dis.SPACE.getSeverityCaption(TRIGGER_SEVERITY_DISASTER), !$dis);
 
-		if (STYLE_HORISONTAL == $this->style) {
+		if (STYLE_HORIZONTAL == $this->style) {
 			$this->addRow(array($trok, $uncl, $info, $warn, $avg, $high, $dis));
 		}
 		else {
diff --git a/frontends/php/include/classes/class.ctweenbox.php b/frontends/php/include/classes/html/CTweenBox.php
index c39221c0709..c39221c0709 100644
--- a/frontends/php/include/classes/class.ctweenbox.php
+++ b/frontends/php/include/classes/html/CTweenBox.php
diff --git a/frontends/php/include/classes/class.cuiwidget.php b/frontends/php/include/classes/html/CUiWidget.php
index b0c6524c82a..a8d660d5e74 100644
--- a/frontends/php/include/classes/class.cuiwidget.php
+++ b/frontends/php/include/classes/html/CUiWidget.php
@@ -19,7 +19,7 @@
 **/
 
 
-class CUIWidget extends CDiv {
+class CUiWidget extends CDiv {
 
 	/**
 	 * Widget id.
@@ -44,21 +44,21 @@ class CUIWidget extends CDiv {
 	 *
 	 * @var CDiv
 	 */
-	private $header;
+	protected $header;
 
 	/**
 	 * Body div.
 	 *
 	 * @var array
 	 */
-	private $body;
+	protected $body;
 
 	/**
 	 * Footer div.
 	 *
 	 * @var CDiv
 	 */
-	private $footer;
+	protected $footer;
 
 	/**
 	 * Construct widget.
@@ -68,28 +68,14 @@ class CUIWidget extends CDiv {
 	 */
 	public function __construct($id, $body = null) {
 		$this->id = $id;
-		$this->open = true;
-		$this->header = null;
 		$this->body = $body ? array($body) : array();
-		$this->footer = null;
 
-		parent::__construct(null, 'ui-widget ui-widget-content ui-helper-clearfix ui-corner-all widget');
+		parent::__construct(null, 'ui-widget ui-widget-content ui-helper-clearfix ui-corner-all widget ui-tabs');
 
 		$this->setAttribute('id', $this->id.'_widget');
 	}
 
 	/**
-	 * Add element to widget body.
-	 *
-	 * @param string|array|CTag $item
-	 */
-	public function addItem($item) {
-		if ($item !== null) {
-			$this->body[] = $item;
-		}
-	}
-
-	/**
 	 * Set widget header.
 	 *
 	 * @param string|array|CTag $caption
@@ -104,14 +90,7 @@ class CUIWidget extends CDiv {
 
 		$this->header = new CDiv(null, 'nowrap ui-corner-all ui-widget-header header');
 
-		$icon = new CIcon(
-			_('Show').'/'._('Hide'),
-			$this->open ? 'arrowup' : 'arrowdown',
-			'changeWidgetState(this, "'.$this->id.'");'
-		);
-		$icon->setAttribute('id', $this->id.'_icon');
-
-		$this->header->addItem(array($icon, $icons, $caption));
+		$this->header->addItem(array($icons, $caption));
 	}
 
 	/**
@@ -151,19 +130,11 @@ class CUIWidget extends CDiv {
 		$body = new CDiv($this->body, 'body');
 		$body->setAttribute('id', $this->id);
 
-		if (!$this->open) {
-			$body->setAttribute('style', 'display: none;');
-
-			if ($this->footer) {
-				$this->footer->setAttribute('style', 'display: none;');
-			}
-		}
-
 		$this->cleanItems();
 
-		parent::addItem($this->header);
-		parent::addItem($body);
-		parent::addItem($this->footer);
+		$this->addItem($this->header);
+		$this->addItem($body);
+		$this->addItem($this->footer);
 	}
 
 	/**
diff --git a/frontends/php/include/classes/class.cvar.php b/frontends/php/include/classes/html/CVar.php
index ef80d06de27..ef80d06de27 100644
--- a/frontends/php/include/classes/class.cvar.php
+++ b/frontends/php/include/classes/html/CVar.php
diff --git a/frontends/php/include/classes/class.cvisibilitybox.php b/frontends/php/include/classes/html/CVisibilityBox.php
index deb266504d6..deb266504d6 100644
--- a/frontends/php/include/classes/class.cvisibilitybox.php
+++ b/frontends/php/include/classes/html/CVisibilityBox.php
diff --git a/frontends/php/include/classes/class.cwarning.php b/frontends/php/include/classes/html/CWarning.php
index 4625274273e..4625274273e 100644
--- a/frontends/php/include/classes/class.cwarning.php
+++ b/frontends/php/include/classes/html/CWarning.php
diff --git a/frontends/php/include/classes/html/CPageHeader.php b/frontends/php/include/classes/html/pageheader/CPageHeader.php
index 1fcf6b42153..1fcf6b42153 100644
--- a/frontends/php/include/classes/html/CPageHeader.php
+++ b/frontends/php/include/classes/html/pageheader/CPageHeader.php
diff --git a/frontends/php/include/classes/class.cwidget.php b/frontends/php/include/classes/html/widget/CWidget.php
index 2da23af972d..2da23af972d 100644
--- a/frontends/php/include/classes/class.cwidget.php
+++ b/frontends/php/include/classes/html/widget/CWidget.php
diff --git a/frontends/php/include/classes/import/C24TriggerConverter.php b/frontends/php/include/classes/import/C24TriggerConverter.php
new file mode 100644
index 00000000000..bc0a8e0fb45
--- /dev/null
+++ b/frontends/php/include/classes/import/C24TriggerConverter.php
@@ -0,0 +1,136 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/**
+ * Trigger expression converter from 2.2 to 2.4.
+ */
+class C24TriggerConverter {
+
+	/**
+	 * A parser for function macros.
+	 *
+	 * @var CFunctionMacroParser
+	 */
+	protected $functionMacroParser;
+
+	/**
+	 * A parser for LLD macros.
+	 *
+	 * @var CMacroParser
+	 */
+	protected $lldMacroParser;
+
+	/**
+	 * @param CFunctionMacroParser  $functionMacroParser
+	 * @param CMacroParser          $lldMacroParser
+	 */
+	public function __construct(CFunctionMacroParser $functionMacroParser, CMacroParser $lldMacroParser) {
+		$this->functionMacroParser = $functionMacroParser;
+		$this->lldMacroParser = $lldMacroParser;
+	}
+
+	/**
+	 * Convert a trigger expression from 2.2 format to 2.4.
+	 *
+	 * The method will replace old operators with their analogues: "&" with "and", "|" - "or" and "#" - "<>".
+	 *
+	 * @param string $expression
+	 *
+	 * @return string
+	 */
+	public function convert($expression) {
+		// don't try to parse the expression if there's nothing to replace
+		if (strpos($expression, '#') === false
+				&& strpos($expression, '&') === false
+				&& strpos($expression, '|') === false) {
+
+			return $expression;
+		}
+
+		// find all the operators that need to be replaced
+		$foundOperators = array();
+		$pos = 0;
+		while (isset($expression[$pos])) {
+			switch ($expression[$pos]) {
+				case '{':
+					// skip function macros
+					$result = $this->functionMacroParser->parse($expression, $pos);
+
+					// if it's not a function macro, try to parse it as an LLD macro
+					if (!$result) {
+						$result = $this->lldMacroParser->parse($expression, $pos);
+					}
+
+					if ($result) {
+						$pos += $result->length - 1;
+					}
+
+					// otherwise just continue as is, other macros don't contain any of these characters
+					break;
+				case '&':
+				case '|':
+				case '#':
+					$foundOperators[$pos] = $expression[$pos];
+
+					break;
+			}
+
+			$pos++;
+		}
+
+		// replace the operators
+		foreach (array_reverse($foundOperators, true) as $pos => $operator) {
+			switch ($operator) {
+				case '&':
+					$expression = $this->replaceLogicalOperator($expression, 'and', $pos);
+
+					break;
+				case '|':
+					$expression = $this->replaceLogicalOperator($expression, 'or', $pos);
+
+					break;
+				case '#':
+					$expression = substr_replace($expression, '<>', $pos, 1);
+
+					break;
+			}
+		}
+
+		return $expression;
+	}
+
+	/**
+	 * Replaces an operator at the given position and removes extra spaces around it.
+	 *
+	 * @param string $expression
+	 * @param string $newOperator
+	 * @param int $pos
+	 *
+	 * @return string
+	 */
+	protected function replaceLogicalOperator($expression, $newOperator, $pos) {
+		$left = substr($expression, 0, $pos);
+		$right = substr($expression, $pos + 1);
+
+		return rtrim($left).' '.$newOperator.' '.ltrim($right);
+	}
+
+}
diff --git a/frontends/php/include/classes/import/CConfigurationImport.php b/frontends/php/include/classes/import/CConfigurationImport.php
index 63609c3e128..f8e7004698e 100644
--- a/frontends/php/include/classes/import/CConfigurationImport.php
+++ b/frontends/php/include/classes/import/CConfigurationImport.php
@@ -40,6 +40,16 @@ class CConfigurationImport {
 	protected $referencer;
 
 	/**
+	 * @var CImportedObjectContainer
+	 */
+	protected $importedObjectContainer;
+
+	/**
+	 * @var CTriggerExpression
+	 */
+	protected $triggerExpression;
+
+	/**
 	 * @var array
 	 */
 	protected $options;
@@ -64,21 +74,25 @@ class CConfigurationImport {
 	 * Source string must be suitable for reader class,
 	 * i.e. if string contains json then reader should be able to read json.
 	 *
-	 * @param string $source
-	 * @param array  $options
+	 * @param string					$source						configuration data in specified format
+	 * @param array						$options					import options "createMissing", "updateExisting" and "deleteMissing"
+	 * @param CImportReferencer			$referencer					class containing all importable objects
+	 * @param CImportedObjectContainer	$importedObjectContainer	class containing processed host and template IDs
+	 * @param CTriggerExpression		$triggerExpression			class to parse trigger expression
 	 */
-	public function __construct($source, array $options = array()) {
+	public function __construct($source, array $options = array(), CImportReferencer $referencer,
+			CImportedObjectContainer $importedObjectContainer, CTriggerExpression $triggerExpression) {
 		$this->options = array(
 			'groups' => array('createMissing' => false),
 			'hosts' => array('updateExisting' => false, 'createMissing' => false),
 			'templates' => array('updateExisting' => false, 'createMissing' => false),
-			'templateScreens' => array('updateExisting' => false, 'createMissing' => false),
+			'templateScreens' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
 			'applications' => array('updateExisting' => false, 'createMissing' => false),
 			'templateLinkage' => array('createMissing' => false),
-			'items' => array('updateExisting' => false, 'createMissing' => false),
-			'discoveryRules' => array('updateExisting' => false, 'createMissing' => false),
-			'triggers' => array('updateExisting' => false, 'createMissing' => false),
-			'graphs' => array('updateExisting' => false, 'createMissing' => false),
+			'items' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
+			'discoveryRules' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
+			'triggers' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
+			'graphs' => array('updateExisting' => false, 'createMissing' => false, 'deleteMissing' => false),
 			'screens' => array('updateExisting' => false, 'createMissing' => false),
 			'maps' => array('updateExisting' => false, 'createMissing' => false),
 			'images' => array('updateExisting' => false, 'createMissing' => false)
@@ -86,6 +100,9 @@ class CConfigurationImport {
 
 		$this->options = array_merge($this->options, $options);
 		$this->source = $source;
+		$this->referencer = $referencer;
+		$this->importedObjectContainer = $importedObjectContainer;
+		$this->triggerExpression = $triggerExpression;
 	}
 
 	/**
@@ -142,13 +159,22 @@ class CConfigurationImport {
 			// pass data to formatter
 			// export has root key "zabbix_export" which is not passed
 			$this->formatter->setData($this->data['zabbix_export']);
-			$this->referencer = new CImportReferencer();
 
 			// parse all import for references to resolve them all together with less sql count
 			$this->gatherReferences();
+
 			$this->processGroups();
 			$this->processTemplates();
 			$this->processHosts();
+
+			// delete missing objects from processed hosts and templates
+			$this->deleteMissingDiscoveryRules();
+			$this->deleteMissingTriggers();
+			$this->deleteMissingGraphs();
+			$this->deleteMissingItems();
+			$this->deleteMissingApplications();
+
+			// import objects
 			$this->processApplications();
 			$this->processItems();
 			$this->processDiscoveryRules();
@@ -156,8 +182,6 @@ class CConfigurationImport {
 			$this->processGraphs();
 			$this->processImages();
 			$this->processMaps();
-
-			// screens should be created after all other elements
 			$this->processTemplateScreens();
 			$this->processScreens();
 		}
@@ -180,12 +204,14 @@ class CConfigurationImport {
 		$itemsRefs = array();
 		$valueMapsRefs = array();
 		$triggersRefs = array();
+		$graphsRefs = array();
 		$iconMapsRefs = array();
 		$mapsRefs = array();
 		$screensRefs = array();
+		$templateScreensRefs = array();
 		$macrosRefs = array();
 		$proxyRefs = array();
-		$hostPrototypeRefs = array();
+		$hostPrototypesRefs = array();
 
 		foreach ($this->getFormattedGroups() as $group) {
 			$groupsRefs[$group['name']] = $group['name'];
@@ -267,8 +293,14 @@ class CConfigurationImport {
 					}
 				}
 
-				foreach ($discoveryRule['trigger_prototypes'] as $trigerp) {
-					$triggersRefs[$trigerp['description']][$trigerp['expression']] = $trigerp['expression'];
+				foreach ($discoveryRule['trigger_prototypes'] as $trigger) {
+					$triggersRefs[$trigger['description']][$trigger['expression']] = $trigger['expression'];
+
+					// add found hosts and items to references from parsed trigger expressions
+					foreach ($trigger['parsedExpressions'] as $expression) {
+						$hostsRefs[$expression['host']] = $expression['host'];
+						$itemsRefs[$expression['host']][$expression['item']] = $expression['item'];
+					}
 				}
 
 				foreach ($discoveryRule['graph_prototypes'] as $graph) {
@@ -284,12 +316,15 @@ class CConfigurationImport {
 
 					foreach ($graph['gitems'] as $gitem) {
 						$gitemItem = $gitem['item'];
+
+						$hostsRefs[$gitemItem['host']] = $gitemItem['host'];
 						$itemsRefs[$gitemItem['host']][$gitemItem['key']] = $gitemItem['key'];
+						$graphsRefs[$gitemItem['host']][$graph['name']] = $graph['name'];
 					}
 				}
 
 				foreach ($discoveryRule['host_prototypes'] as $hostPrototype) {
-					$hostPrototypeRefs[$host][$discoveryRule['key_']][$hostPrototype['host']] = $hostPrototype['host'];
+					$hostPrototypesRefs[$host][$discoveryRule['key_']][$hostPrototype['host']] = $hostPrototype['host'];
 
 					foreach ($hostPrototype['group_prototypes'] as $groupPrototype) {
 						if (isset($groupPrototype['group'])) {
@@ -325,6 +360,7 @@ class CConfigurationImport {
 
 					$hostsRefs[$gitemItem['host']] = $gitemItem['host'];
 					$itemsRefs[$gitemItem['host']][$gitemItem['key']] = $gitemItem['key'];
+					$graphsRefs[$gitemItem['host']][$graph['name']] = $graph['name'];
 				}
 			}
 		}
@@ -332,6 +368,12 @@ class CConfigurationImport {
 		foreach ($this->getFormattedTriggers() as $trigger) {
 			$triggersRefs[$trigger['description']][$trigger['expression']] = $trigger['expression'];
 
+			// add found hosts and items to references from parsed trigger expressions
+			foreach ($trigger['parsedExpressions'] as $expression) {
+				$hostsRefs[$expression['host']] = $expression['host'];
+				$itemsRefs[$expression['host']][$expression['item']] = $expression['item'];
+			}
+
 			foreach ($trigger['dependencies'] as $dependency) {
 				$triggersRefs[$dependency['name']][$dependency['expression']] = $dependency['expression'];
 			}
@@ -404,10 +446,13 @@ class CConfigurationImport {
 							break;
 
 						case SCREEN_RESOURCE_GRAPH:
-							// TODO: gather graphs too
+						case SCREEN_RESOURCE_LLD_GRAPH:
+							$hostsRefs[$resource['host']] = $resource['host'];
+							$graphsRefs[$resource['host']][$resource['name']] = $resource['name'];
 							break;
 
 						case SCREEN_RESOURCE_SIMPLE_GRAPH:
+						case SCREEN_RESOURCE_LLD_SIMPLE_GRAPH:
 						case SCREEN_RESOURCE_PLAIN_TEXT:
 							$hostsRefs[$resource['host']] = $resource['host'];
 							$itemsRefs[$resource['host']][$resource['key']] = $resource['key'];
@@ -427,16 +472,21 @@ class CConfigurationImport {
 
 		foreach ($this->getFormattedTemplateScreens() as $screens) {
 			foreach ($screens as $screen) {
+				$templateScreensRefs[$screen['name']] = $screen['name'];
+
 				if (!empty($screen['screenitems'])) {
 					foreach ($screen['screenitems'] as $screenItem) {
 						$resource = $screenItem['resource'];
 
 						switch ($screenItem['resourcetype']) {
 							case SCREEN_RESOURCE_GRAPH:
-								// TODO: gather graphs too
+							case SCREEN_RESOURCE_LLD_GRAPH:
+								$hostsRefs[$resource['host']] = $resource['host'];
+								$graphsRefs[$resource['host']][$resource['name']] = $resource['name'];
 								break;
 
 							case SCREEN_RESOURCE_SIMPLE_GRAPH:
+							case SCREEN_RESOURCE_LLD_SIMPLE_GRAPH:
 							case SCREEN_RESOURCE_PLAIN_TEXT:
 								$hostsRefs[$resource['host']] = $resource['host'];
 								$itemsRefs[$resource['host']][$resource['key']] = $resource['key'];
@@ -454,18 +504,26 @@ class CConfigurationImport {
 		$this->referencer->addItems($itemsRefs);
 		$this->referencer->addValueMaps($valueMapsRefs);
 		$this->referencer->addTriggers($triggersRefs);
+		$this->referencer->addGraphs($graphsRefs);
 		$this->referencer->addIconMaps($iconMapsRefs);
 		$this->referencer->addMaps($mapsRefs);
 		$this->referencer->addScreens($screensRefs);
+		$this->referencer->addTemplateScreens($templateScreensRefs);
 		$this->referencer->addMacros($macrosRefs);
 		$this->referencer->addProxies($proxyRefs);
-		$this->referencer->addHostPrototypes($hostPrototypeRefs);
+		$this->referencer->addHostPrototypes($hostPrototypesRefs);
 	}
 
 	/**
 	 * Import groups.
+	 *
+	 * @return null
 	 */
 	protected function processGroups() {
+		if (!$this->options['groups']['createMissing']) {
+			return;
+		}
+
 		$groups = $this->getFormattedGroups();
 
 		if (empty($groups)) {
@@ -496,9 +554,18 @@ class CConfigurationImport {
 	 * @throws Exception
 	 */
 	protected function processTemplates() {
-		if ($templates = $this->getFormattedTemplates()) {
-			$templateImporter = new CTemplateImporter($this->options, $this->referencer);
-			$templateImporter->import($templates);
+		if ($this->options['templates']['updateExisting'] || $this->options['templates']['createMissing']) {
+			$templates = $this->getFormattedTemplates();
+			if ($templates) {
+				$templateImporter = new CTemplateImporter($this->options, $this->referencer,
+					$this->importedObjectContainer
+				);
+				$templateImporter->import($templates);
+
+				// get list of imported template IDs and add them processed template ID list
+				$templateIds = $templateImporter->getProcessedTemplateIds();
+				$this->importedObjectContainer->addTemplateIds($templateIds);
+			}
 		}
 	}
 
@@ -508,9 +575,16 @@ class CConfigurationImport {
 	 * @throws Exception
 	 */
 	protected function processHosts() {
-		if ($hosts = $this->getFormattedHosts()) {
-			$hostImporter = new CHostImporter($this->options, $this->referencer);
-			$hostImporter->import($hosts);
+		if ($this->options['hosts']['updateExisting'] || $this->options['hosts']['createMissing']) {
+			$hosts = $this->getFormattedHosts();
+			if ($hosts) {
+				$hostImporter = new CHostImporter($this->options, $this->referencer, $this->importedObjectContainer);
+				$hostImporter->import($hosts);
+
+				// get list of imported host IDs and add them processed host ID list
+				$hostIds = $hostImporter->getProcessedHostIds();
+				$this->importedObjectContainer->addHostIds($hostIds);
+			}
 		}
 	}
 
@@ -518,24 +592,29 @@ class CConfigurationImport {
 	 * Import applications.
 	 */
 	protected function processApplications() {
-		$allApplciations = $this->getFormattedApplications();
+		if (!$this->options['applications']['createMissing']) {
+			return;
+		}
 
-		if (empty($allApplciations)) {
+		$allApplications = $this->getFormattedApplications();
+
+		if (!$allApplications) {
 			return;
 		}
 
 		$applicationsToCreate = array();
 
-		foreach ($allApplciations as $host => $applications) {
-			if (!$this->referencer->isProcessedHost($host)) {
+		foreach ($allApplications as $host => $applications) {
+			$hostId = $this->referencer->resolveHostOrTemplate($host);
+
+			if (!$this->importedObjectContainer->isHostProcessed($hostId)
+					&& !$this->importedObjectContainer->isTemplateProcessed($hostId)) {
 				continue;
 			}
 
-			$hostid = $this->referencer->resolveHostOrTemplate($host);
-
 			foreach ($applications as $application) {
-				$application['hostid'] = $hostid;
-				$appId = $this->referencer->resolveApplication($hostid, $application['name']);
+				$application['hostid'] = $hostId;
+				$appId = $this->referencer->resolveApplication($hostId, $application['name']);
 
 				if (!$appId) {
 					$applicationsToCreate[] = $application;
@@ -543,14 +622,8 @@ class CConfigurationImport {
 			}
 		}
 
-		// create the applications and create a hash hostid->name->applicationid
 		if ($applicationsToCreate) {
-			$newApplicationsIds = API::Application()->create($applicationsToCreate);
-
-			foreach ($newApplicationsIds['applicationids'] as $anum => $applicationId) {
-				$application = $applicationsToCreate[$anum];
-				$this->referencer->addApplicationRef($application['hostid'], $application['name'], $applicationId);
-			}
+			API::Application()->create($applicationsToCreate);
 		}
 
 		// refresh applications because templated ones can be inherited to host and used in items
@@ -561,9 +634,13 @@ class CConfigurationImport {
 	 * Import items.
 	 */
 	protected function processItems() {
+		if (!$this->options['items']['createMissing'] && !$this->options['items']['updateExisting']) {
+			return;
+		}
+
 		$allItems = $this->getFormattedItems();
 
-		if (empty($allItems)) {
+		if (!$allItems) {
 			return;
 		}
 
@@ -571,20 +648,21 @@ class CConfigurationImport {
 		$itemsToUpdate = array();
 
 		foreach ($allItems as $host => $items) {
-			if (!$this->referencer->isProcessedHost($host)) {
+			$hostId = $this->referencer->resolveHostOrTemplate($host);
+
+			if (!$this->importedObjectContainer->isHostProcessed($hostId)
+					&& !$this->importedObjectContainer->isTemplateProcessed($hostId)) {
 				continue;
 			}
 
-			$hostid = $this->referencer->resolveHostOrTemplate($host);
-
 			foreach ($items as $item) {
-				$item['hostid'] = $hostid;
+				$item['hostid'] = $hostId;
 
 				if (isset($item['applications']) && $item['applications']) {
 					$applicationsIds = array();
 
 					foreach ($item['applications'] as $application) {
-						if ($applicationId = $this->referencer->resolveApplication($hostid, $application['name'])) {
+						if ($applicationId = $this->referencer->resolveApplication($hostId, $application['name'])) {
 							$applicationsIds[] = $applicationId;
 						}
 						else {
@@ -597,7 +675,7 @@ class CConfigurationImport {
 				}
 
 				if (isset($item['interface_ref']) && $item['interface_ref']) {
-					$item['interfaceid'] = $this->referencer->interfacesCache[$hostid][$item['interface_ref']];
+					$item['interfaceid'] = $this->referencer->interfacesCache[$hostId][$item['interface_ref']];
 				}
 
 				if (isset($item['valuemap']) && $item['valuemap']) {
@@ -615,7 +693,7 @@ class CConfigurationImport {
 					$item['valuemapid'] = $valueMapId;
 				}
 
-				$itemsId = $this->referencer->resolveItem($hostid, $item['key_']);
+				$itemsId = $this->referencer->resolveItem($hostId, $item['key_']);
 
 				if ($itemsId) {
 					$item['itemid'] = $itemsId;
@@ -629,19 +707,14 @@ class CConfigurationImport {
 
 		// create/update the items and create a hash hostid->key_->itemid
 		if ($this->options['items']['createMissing'] && $itemsToCreate) {
-			$newItemsIds = API::Item()->create($itemsToCreate);
-
-			foreach ($newItemsIds['itemids'] as $inum => $itemid) {
-				$item = $itemsToCreate[$inum];
-				$this->referencer->addItemRef($item['hostid'], $item['key_'], $itemid);
-			}
+			API::Item()->create($itemsToCreate);
 		}
 
 		if ($this->options['items']['updateExisting'] && $itemsToUpdate) {
 			API::Item()->update($itemsToUpdate);
 		}
 
-		// refresh items because templated ones can be inherited to host and used in triggers, grahs, etc.
+		// refresh items because templated ones can be inherited to host and used in triggers, graphs, etc.
 		$this->referencer->refreshItems();
 	}
 
@@ -651,15 +724,22 @@ class CConfigurationImport {
 	 * @throws Exception
 	 */
 	protected function processDiscoveryRules() {
+		if (!$this->options['discoveryRules']['createMissing'] && !$this->options['discoveryRules']['updateExisting']) {
+			return;
+		}
+
 		$allDiscoveryRules = $this->getFormattedDiscoveryRules();
 
-		if (empty($allDiscoveryRules)) {
+		if (!$allDiscoveryRules) {
 			return;
 		}
 
 		// unset rules that are related to hosts we did not process
 		foreach ($allDiscoveryRules as $host => $discoveryRules) {
-			if (!$this->referencer->isProcessedHost($host)) {
+			$hostId = $this->referencer->resolveHostOrTemplate($host);
+
+			if (!$this->importedObjectContainer->isHostProcessed($hostId)
+					&& !$this->importedObjectContainer->isTemplateProcessed($hostId)) {
 				unset($allDiscoveryRules[$host]);
 			}
 		}
@@ -668,13 +748,13 @@ class CConfigurationImport {
 		$itemsToUpdate = array();
 
 		foreach ($allDiscoveryRules as $host => $discoveryRules) {
-			$hostid = $this->referencer->resolveHostOrTemplate($host);
+			$hostId = $this->referencer->resolveHostOrTemplate($host);
 
 			foreach ($discoveryRules as $item) {
-				$item['hostid'] = $hostid;
+				$item['hostid'] = $hostId;
 
 				if (isset($item['interface_ref'])) {
-					$item['interfaceid'] = $this->referencer->interfacesCache[$hostid][$item['interface_ref']];
+					$item['interfaceid'] = $this->referencer->interfacesCache[$hostId][$item['interface_ref']];
 				}
 
 				unset($item['item_prototypes']);
@@ -682,7 +762,7 @@ class CConfigurationImport {
 				unset($item['graph_prototypes']);
 				unset($item['host_prototypes']);
 
-				$itemId = $this->referencer->resolveItem($hostid, $item['key_']);
+				$itemId = $this->referencer->resolveItem($hostId, $item['key_']);
 
 				if ($itemId) {
 					$item['itemid'] = $itemId;
@@ -729,31 +809,31 @@ class CConfigurationImport {
 		$hostPrototypesToCreate = array();
 
 		foreach ($allDiscoveryRules as $host => $discoveryRules) {
-			$hostid = $this->referencer->resolveHostOrTemplate($host);
+			$hostId = $this->referencer->resolveHostOrTemplate($host);
 
 			foreach ($discoveryRules as $item) {
-				// if rule was not processed we should not create/upadate any of it's prototypes
-				if (!isset($processedRules[$hostid][$item['key_']])) {
+				// if rule was not processed we should not create/update any of its prototypes
+				if (!isset($processedRules[$hostId][$item['key_']])) {
 					continue;
 				}
 
-				$item['hostid'] = $hostid;
-				$itemId = $this->referencer->resolveItem($hostid, $item['key_']);
+				$item['hostid'] = $hostId;
+				$itemId = $this->referencer->resolveItem($hostId, $item['key_']);
 
 				// prototypes
 				foreach ($item['item_prototypes'] as $prototype) {
-					$prototype['hostid'] = $hostid;
+					$prototype['hostid'] = $hostId;
 
 					$applicationsIds = array();
 
 					foreach ($prototype['applications'] as $application) {
-						$applicationsIds[] = $this->referencer->resolveApplication($hostid, $application['name']);
+						$applicationsIds[] = $this->referencer->resolveApplication($hostId, $application['name']);
 					}
 
 					$prototype['applications'] = $applicationsIds;
 
 					if (isset($prototype['interface_ref'])) {
-						$prototype['interfaceid'] = $this->referencer->interfacesCache[$hostid][$prototype['interface_ref']];
+						$prototype['interfaceid'] = $this->referencer->interfacesCache[$hostId][$prototype['interface_ref']];
 					}
 
 					if ($prototype['valuemap']) {
@@ -772,8 +852,8 @@ class CConfigurationImport {
 						$prototype['valuemapid'] = $valueMapId;
 					}
 
-					$prototypeId = $this->referencer->resolveItem($hostid, $prototype['key_']);
-					$prototype['rule'] = array('hostid' => $hostid, 'key' => $item['key_']);
+					$prototypeId = $this->referencer->resolveItem($hostId, $prototype['key_']);
+					$prototype['rule'] = array('hostid' => $hostId, 'key' => $item['key_']);
 
 					if ($prototypeId) {
 						$prototype['itemid'] = $prototypeId;
@@ -830,7 +910,7 @@ class CConfigurationImport {
 
 					$hostPrototype['templates'] = $templates;
 
-					$hostPrototypeId = $this->referencer->resolveHostPrototype($hostid, $itemId, $hostPrototype['host']);
+					$hostPrototypeId = $this->referencer->resolveHostPrototype($hostId, $itemId, $hostPrototype['host']);
 
 					if ($hostPrototypeId) {
 						$hostPrototype['hostid'] = $hostPrototypeId;
@@ -843,14 +923,14 @@ class CConfigurationImport {
 				}
 
 				if (isset($item['interface_ref'])) {
-					$item['interfaceid'] = $this->referencer->interfacesCache[$hostid][$item['interface_ref']];
+					$item['interfaceid'] = $this->referencer->interfacesCache[$hostId][$item['interface_ref']];
 				}
 				unset($item['item_prototypes']);
 				unset($item['trigger_prototypes']);
 				unset($item['graph_prototypes']);
 				unset($item['host_prototypes']);
 
-				$itemsId = $this->referencer->resolveItem($hostid, $item['key_']);
+				$itemsId = $this->referencer->resolveItem($hostId, $item['key_']);
 
 				if ($itemsId) {
 					$item['itemid'] = $itemsId;
@@ -902,16 +982,33 @@ class CConfigurationImport {
 		$graphsToUpdate = array();
 
 		foreach ($allDiscoveryRules as $host => $discoveryRules) {
-			$hostid = $this->referencer->resolveHostOrTemplate($host);
+			$hostId = $this->referencer->resolveHostOrTemplate($host);
 
 			foreach ($discoveryRules as $item) {
-				// if rule was not processed we should not create/upadate any of it's prototypes
-				if (!isset($processedRules[$hostid][$item['key_']])) {
+				// if rule was not processed we should not create/update any of its prototypes
+				if (!isset($processedRules[$hostId][$item['key_']])) {
 					continue;
 				}
 
 				// trigger prototypes
 				foreach ($item['trigger_prototypes'] as $trigger) {
+					// search for existing  items in trigger prototype expressions
+					foreach ($trigger['parsedExpressions'] as $expression) {
+						$hostId = $this->referencer->resolveHostOrTemplate($expression['host']);
+						$itemId = $hostId ? $this->referencer->resolveItem($hostId, $expression['item']) : false;
+
+						if (!$itemId) {
+							throw new Exception(_s(
+								'Cannot find item "%1$s" on "%2$s" used in trigger prototype "%3$s" of discovery rule "%4$s" on "%5$s".',
+								$expression['item'],
+								$expression['host'],
+								$trigger['description'],
+								$item['name'],
+								$host
+							));
+						}
+					}
+
 					$triggerId = $this->referencer->resolveTrigger($trigger['description'], $trigger['expression']);
 
 					if ($triggerId) {
@@ -925,8 +1022,6 @@ class CConfigurationImport {
 
 				// graph prototypes
 				foreach ($item['graph_prototypes'] as $graph) {
-					$graphHostIds = array();
-
 					if ($graph['ymin_item_1']) {
 						$hostId = $this->referencer->resolveHostOrTemplate($graph['ymin_item_1']['host']);
 						$itemId = $hostId
@@ -968,38 +1063,27 @@ class CConfigurationImport {
 					}
 
 					foreach ($graph['gitems'] as &$gitem) {
-						if (!$gitemHostId = $this->referencer->resolveHostOrTemplate($gitem['item']['host'])) {
-							throw new Exception(_s('Cannot find host or template "%1$s" used in graph "%2$s".',
-								$gitem['item']['host'], $graph['name']));
-						}
-
-						$gitem['itemid'] = $this->referencer->resolveItem($gitemHostId, $gitem['item']['key']);
+						$gitemHostId = $this->referencer->resolveHostOrTemplate($gitem['item']['host']);
+						$gitem['itemid'] = $gitemHostId
+							? $this->referencer->resolveItem($gitemHostId, $gitem['item']['key'])
+							: false;
 
-						$graphHostIds[$gitemHostId] = $gitemHostId;
+						if (!$gitem['itemid']) {
+							throw new Exception(_s(
+								'Cannot find item "%1$s" on "%2$s" used in graph prototype "%3$s" of discovery rule "%4$s" on "%5$s".',
+								$gitem['item']['key'],
+								$gitem['item']['host'],
+								$graph['name'],
+								$item['name'],
+								$host
+							));
+						}
 					}
 					unset($gitem);
 
-					// TODO: do this for all graphs at once
-					$sql = 'SELECT g.graphid'.
-							' FROM graphs g,graphs_items gi,items i'.
-							' WHERE g.graphid=gi.graphid'.
-								' AND gi.itemid=i.itemid'.
-								' AND g.name='.zbx_dbstr($graph['name']).
-								' AND '.dbConditionInt('i.hostid', $graphHostIds);
-					$graphExists = DBfetch(DBselect($sql));
-
-					if ($graphExists) {
-						$dbGraph = API::GraphPrototype()->get(array(
-							'graphids' => $graphExists['graphid'],
-							'output' => array('graphid'),
-							'editable' => true
-						));
-
-						if (empty($dbGraph)) {
-							throw new Exception(_s('No permission for graph "%1$s".', $graph['name']));
-						}
-
-						$graph['graphid'] = $graphExists['graphid'];
+					$graphId = $this->referencer->resolveGraph($gitemHostId, $graph['name']);
+					if ($graphId) {
+						$graph['graphid'] = $graphId;
 						$graphsToUpdate[] = $graph;
 					}
 					else {
@@ -1017,6 +1101,7 @@ class CConfigurationImport {
 		}
 		if ($graphsToCreate) {
 			API::GraphPrototype()->create($graphsToCreate);
+			$this->referencer->refreshGraphs();
 		}
 		if ($graphsToUpdate) {
 			API::GraphPrototype()->update($graphsToUpdate);
@@ -1029,9 +1114,13 @@ class CConfigurationImport {
 	 * @throws Exception
 	 */
 	protected function processGraphs() {
+		if (!$this->options['graphs']['createMissing'] && !$this->options['graphs']['updateExisting']) {
+			return;
+		}
+
 		$allGraphs = $this->getFormattedGraphs();
 
-		if (empty($allGraphs)) {
+		if (!$allGraphs) {
 			return;
 		}
 
@@ -1039,13 +1128,9 @@ class CConfigurationImport {
 		$graphsToUpdate = array();
 
 		foreach ($allGraphs as $graph) {
-			$graphHostIds = array();
-
 			if ($graph['ymin_item_1']) {
 				$hostId = $this->referencer->resolveHostOrTemplate($graph['ymin_item_1']['host']);
-				$itemId = $hostId
-					? $this->referencer->resolveItem($hostId, $graph['ymin_item_1']['key'])
-					: false;
+				$itemId = $hostId ? $this->referencer->resolveItem($hostId, $graph['ymin_item_1']['key']) : false;
 
 				if (!$itemId) {
 					throw new Exception(_s(
@@ -1061,9 +1146,7 @@ class CConfigurationImport {
 
 			if ($graph['ymax_item_1']) {
 				$hostId = $this->referencer->resolveHostOrTemplate($graph['ymax_item_1']['host']);
-				$itemId = $hostId
-					? $this->referencer->resolveItem($hostId, $graph['ymax_item_1']['key'])
-					: false;
+				$itemId = $hostId ? $this->referencer->resolveItem($hostId, $graph['ymax_item_1']['key']) : false;
 
 				if (!$itemId) {
 					throw new Exception(_s(
@@ -1080,47 +1163,30 @@ class CConfigurationImport {
 			if (isset($graph['gitems']) && $graph['gitems']) {
 				foreach ($graph['gitems'] as &$gitem) {
 					$gitemHostId = $this->referencer->resolveHostOrTemplate($gitem['item']['host']);
+					$gitem['itemid'] = $gitemHostId
+						? $this->referencer->resolveItem($gitemHostId, $gitem['item']['key'])
+						: false;
 
-					if (!$gitemHostId) {
+					if (!$gitem['itemid']) {
 						throw new Exception(_s(
-							'Cannot find host or template "%1$s" used in graph "%2$s".',
+							'Cannot find item "%1$s" on "%2$s" used in graph "%3$s".',
+							$gitem['item']['key'],
 							$gitem['item']['host'],
 							$graph['name']
 						));
 					}
-
-					$gitem['itemid'] = $this->referencer->resolveItem($gitemHostId, $gitem['item']['key']);
-
-					$graphHostIds[$gitemHostId] = $gitemHostId;
 				}
 				unset($gitem);
-			}
 
-			// TODO: do this for all graphs at once
-			$sql = 'SELECT g.graphid'.
-					' FROM graphs g,graphs_items gi,items i'.
-					' WHERE g.graphid=gi.graphid'.
-						' AND gi.itemid=i.itemid'.
-						' AND g.name='.zbx_dbstr($graph['name']).
-						' AND '.dbConditionInt('i.hostid', $graphHostIds);
-			$graphExists = DBfetch(DBselect($sql));
-
-			if ($graphExists) {
-				$dbGraph = API::Graph()->get(array(
-					'graphids' => $graphExists['graphid'],
-					'output' => array('graphid'),
-					'editable' => true
-				));
-
-				if (empty($dbGraph)) {
-					throw new Exception(_s('No permission for graph "%1$s".', $graph['name']));
-				}
+				$graphId = $this->referencer->resolveGraph($gitemHostId, $graph['name']);
 
-				$graph['graphid'] = $graphExists['graphid'];
-				$graphsToUpdate[] = $graph;
-			}
-			else {
-				$graphsToCreate[] = $graph;
+				if ($graphId) {
+					$graph['graphid'] = $graphId;
+					$graphsToUpdate[] = $graph;
+				}
+				else {
+					$graphsToCreate[] = $graph;
+				}
 			}
 		}
 
@@ -1130,15 +1196,21 @@ class CConfigurationImport {
 		if ($this->options['graphs']['updateExisting'] && $graphsToUpdate) {
 			API::Graph()->update($graphsToUpdate);
 		}
+
+		$this->referencer->refreshGraphs();
 	}
 
 	/**
 	 * Import triggers.
 	 */
 	protected function processTriggers() {
+		if (!$this->options['triggers']['createMissing'] && !$this->options['triggers']['updateExisting']) {
+			return;
+		}
+
 		$allTriggers = $this->getFormattedTriggers();
 
-		if (empty($allTriggers)) {
+		if (!$allTriggers) {
 			return;
 		}
 
@@ -1147,6 +1219,20 @@ class CConfigurationImport {
 		$triggersToCreateDependencies = array();
 
 		foreach ($allTriggers as $trigger) {
+			// search for existing items in trigger expressions
+			foreach ($trigger['parsedExpressions'] as $expression) {
+				$hostId = $this->referencer->resolveHostOrTemplate($expression['host']);
+				$itemId = $hostId ? $this->referencer->resolveItem($hostId, $expression['item']) : false;
+
+				if (!$itemId) {
+					throw new Exception(_s('Cannot find item "%1$s" on "%2$s" used in trigger "%3$s".',
+						$expression['item'],
+						$expression['host'],
+						$trigger['description']
+					));
+				}
+			}
+
 			$triggerId = $this->referencer->resolveTrigger($trigger['description'], $trigger['expression']);
 
 			if ($triggerId) {
@@ -1154,9 +1240,11 @@ class CConfigurationImport {
 
 				foreach ($trigger['dependencies'] as $dependency) {
 					$depTriggerId = $this->referencer->resolveTrigger($dependency['name'], $dependency['expression']);
-
 					if (!$depTriggerId) {
-						throw new Exception(_s('Trigger "%1$s" depends on trigger "%2$s", which does not exist.', $trigger['description'], $dependency['name']));
+						throw new Exception(_s('Trigger "%1$s" depends on trigger "%2$s", which does not exist.',
+							$trigger['description'],
+							$dependency['name']
+						));
 					}
 
 					$deps[] = array('triggerid' => $depTriggerId);
@@ -1228,11 +1316,18 @@ class CConfigurationImport {
 	 * Import images.
 	 *
 	 * @throws Exception
+	 *
+	 * @return null
 	 */
 	protected function processImages() {
+		if (CWebUser::$data['type'] != USER_TYPE_SUPER_ADMIN
+				|| (!$this->options['images']['updateExisting'] && !$this->options['images']['createMissing'])) {
+			return;
+		}
+
 		$allImages = $this->getFormattedImages();
 
-		if (empty($allImages)) {
+		if (!$allImages) {
 			return;
 		}
 
@@ -1259,9 +1354,12 @@ class CConfigurationImport {
 	 * Import maps.
 	 */
 	protected function processMaps() {
-		if ($maps = $this->getFormattedMaps()) {
-			$mapImporter = new CMapImporter($this->options, $this->referencer);
-			$mapImporter->import($maps);
+		if ($this->options['maps']['updateExisting'] || $this->options['maps']['createMissing']) {
+			$maps = $this->getFormattedMaps();
+			if ($maps) {
+				$mapImporter = new CMapImporter($this->options, $this->referencer, $this->importedObjectContainer);
+				$mapImporter->import($maps);
+			}
 		}
 	}
 
@@ -1269,9 +1367,14 @@ class CConfigurationImport {
 	 * Import screens.
 	 */
 	protected function processScreens() {
-		if ($screens = $this->getFormattedScreens()) {
-			$screenImporter = new CScreenImporter($this->options, $this->referencer);
-			$screenImporter->import($screens);
+		if ($this->options['screens']['updateExisting'] || $this->options['screens']['createMissing']) {
+			$screens = $this->getFormattedScreens();
+			if ($screens) {
+				$screenImporter = new CScreenImporter($this->options, $this->referencer,
+					$this->importedObjectContainer
+				);
+				$screenImporter->import($screens);
+			}
 		}
 	}
 
@@ -1279,9 +1382,435 @@ class CConfigurationImport {
 	 * Import template screens.
 	 */
 	protected function processTemplateScreens() {
-		if ($screens = $this->getFormattedTemplateScreens()) {
-			$screenImporter = new CTemplateScreenImporter($this->options, $this->referencer);
+		if ($this->options['templateScreens']['updateExisting']
+				|| $this->options['templateScreens']['createMissing']
+				|| $this->options['templateScreens']['deleteMissing']) {
+			$screens = $this->getFormattedTemplateScreens();
+			$screenImporter = new CTemplateScreenImporter($this->options, $this->referencer,
+				$this->importedObjectContainer
+			);
 			$screenImporter->import($screens);
+			$screenImporter->delete($screens);
+		}
+	}
+
+	/**
+	 * Deletes items from DB that are missing in XML.
+	 *
+	 * @return null
+	 */
+	protected function deleteMissingItems() {
+		if (!$this->options['items']['deleteMissing']) {
+			return;
+		}
+
+		$processedHostIds = $this->importedObjectContainer->getHostIds();
+		$processedTemplateIds = $this->importedObjectContainer->getTemplateIds();
+
+		$processedHostIds = array_merge($processedHostIds, $processedTemplateIds);
+
+		// no hosts or templates have been processed
+		if (!$processedHostIds) {
+			return;
+		}
+
+		$itemIdsXML = array();
+
+		$allItems = $this->getFormattedItems();
+
+		if ($allItems) {
+			foreach ($allItems as $host => $items) {
+				$hostId = $this->referencer->resolveHostOrTemplate($host);
+
+				foreach ($items as $item) {
+					$itemId = $this->referencer->resolveItem($hostId, $item['key_']);
+
+					if ($itemId) {
+						$itemIdsXML[$itemId] = $itemId;
+					}
+				}
+			}
+		}
+
+		$dbItemIds = API::Item()->get(array(
+			'output' => array('itemid'),
+			'hostids' => $processedHostIds,
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false,
+			'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
+		));
+
+		$itemsToDelete = array_diff_key($dbItemIds, $itemIdsXML);
+
+		if ($itemsToDelete) {
+			API::Item()->delete(array_keys($itemsToDelete));
+		}
+
+		$this->referencer->refreshItems();
+	}
+
+	/**
+	 * Deletes applications from DB that are missing in XML.
+	 *
+	 * @return null
+	 */
+	protected function deleteMissingApplications() {
+		if (!$this->options['applications']['deleteMissing']) {
+			return;
+		}
+
+		$processedHostIds = $this->importedObjectContainer->getHostIds();
+		$processedTemplateIds = $this->importedObjectContainer->getTemplateIds();
+
+		$processedHostIds = array_merge($processedHostIds, $processedTemplateIds);
+
+		// no hosts or templates have been processed
+		if (!$processedHostIds) {
+			return;
+		}
+
+		$applicationIdsXML = array();
+
+		$allApplications = $this->getFormattedApplications();
+
+		if ($allApplications) {
+			foreach ($allApplications as $host => $applications) {
+				$hostId = $this->referencer->resolveHostOrTemplate($host);
+
+				foreach ($applications as $application) {
+					$applicationId = $this->referencer->resolveApplication($hostId, $application['name']);
+
+					if ($applicationId) {
+						$applicationIdsXML[$applicationId] = $applicationId;
+					}
+				}
+			}
+		}
+
+		$dbApplicationIds = API::Application()->get(array(
+			'output' => array('applicationid'),
+			'hostids' => $processedHostIds,
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false
+		));
+
+		$applicationsToDelete = array_diff_key($dbApplicationIds, $applicationIdsXML);
+		if ($applicationsToDelete) {
+			API::Application()->delete(array_keys($applicationsToDelete));
+		}
+
+		// refresh applications because templated ones can be inherited to host and used in items
+		$this->referencer->refreshApplications();
+	}
+
+	/**
+	 * Deletes triggers from DB that are missing in XML.
+	 *
+	 * @return null
+	 */
+	protected function deleteMissingTriggers() {
+		if (!$this->options['triggers']['deleteMissing']) {
+			return;
+		}
+
+		$processedHostIds = $this->importedObjectContainer->getHostIds();
+		$processedTemplateIds = $this->importedObjectContainer->getTemplateIds();
+
+		$processedHostIds = array_merge($processedHostIds, $processedTemplateIds);
+
+		// no hosts or templates have been processed
+		if (!$processedHostIds) {
+			return;
+		}
+
+		$triggersXML = array();
+
+		$allTriggers = $this->getFormattedTriggers();
+
+		if ($allTriggers) {
+			foreach ($allTriggers as $trigger) {
+				$triggerId = $this->referencer->resolveTrigger($trigger['description'], $trigger['expression']);
+
+				if ($triggerId) {
+					$triggersXML[$triggerId] = $triggerId;
+				}
+			}
+		}
+
+		$dbTriggerIds = API::Trigger()->get(array(
+			'output' => array('triggerid'),
+			'hostids' => $processedHostIds,
+			'selectHosts' => array('hostid'),
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false,
+			'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
+		));
+
+		// check that potentially deletable trigger belongs to same hosts that are in XML
+		// if some triggers belong to more hosts than current XML contains, don't delete them
+		$triggersToDelete = array_diff_key($dbTriggerIds, $triggersXML);
+		$triggerIdsToDelete = array();
+		$processedHostIds = array_flip($processedHostIds);
+
+		foreach ($triggersToDelete as $triggerId => $trigger) {
+			$triggerHostIds = array_flip(zbx_objectValues($trigger['hosts'], 'hostid'));
+			if (!array_diff_key($triggerHostIds, $processedHostIds)) {
+				$triggerIdsToDelete[] = $triggerId;
+			}
+		}
+
+		if ($triggerIdsToDelete) {
+			API::Trigger()->delete($triggerIdsToDelete);
+		}
+
+		// refresh triggers because template triggers can be inherited to host and used in maps
+		$this->referencer->refreshTriggers();
+	}
+
+	/**
+	 * Deletes graphs from DB that are missing in XML.
+	 *
+	 * @return null
+	 */
+	protected function deleteMissingGraphs() {
+		if (!$this->options['graphs']['deleteMissing']) {
+			return;
+		}
+
+		$processedHostIds = $this->importedObjectContainer->getHostIds();
+		$processedTemplateIds = $this->importedObjectContainer->getTemplateIds();
+
+		$processedHostIds = array_merge($processedHostIds, $processedTemplateIds);
+
+		// no hosts or templates have been processed
+		if (!$processedHostIds) {
+			return;
+		}
+
+		$graphsIdsXML = array();
+
+		// gather host IDs for graphs that exist in XML
+		$allGraphs = $this->getFormattedGraphs();
+
+		if ($allGraphs) {
+			foreach ($allGraphs as $graph) {
+				if (isset($graph['gitems']) && $graph['gitems']) {
+					foreach ($graph['gitems'] as $gitem) {
+						$gitemHostId = $this->referencer->resolveHostOrTemplate($gitem['item']['host']);
+						$graphId = $this->referencer->resolveGraph($gitemHostId, $graph['name']);
+
+						if ($graphId) {
+							$graphsIdsXML[$graphId] = $graphId;
+						}
+					}
+				}
+			}
+		}
+
+		$dbGraphIds = API::Graph()->get(array(
+			'output' => array('graphid'),
+			'hostids' => $processedHostIds,
+			'selectHosts' => array('hostid'),
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false,
+			'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
+		));
+
+		// check that potentially deletable graph belongs to same hosts that are in XML
+		// if some graphs belong to more hosts than current XML contains, don't delete them
+		$graphsToDelete = array_diff_key($dbGraphIds, $graphsIdsXML);
+		$graphIdsToDelete = array();
+		$processedHostIds = array_flip($processedHostIds);
+
+		foreach ($graphsToDelete as $graphId => $graph) {
+			$graphHostIds = array_flip(zbx_objectValues($graph['hosts'], 'hostid'));
+
+			if (!array_diff_key($graphHostIds, $processedHostIds)) {
+				$graphIdsToDelete[] = $graphId;
+			}
+		}
+
+		if ($graphIdsToDelete) {
+			API::Graph()->delete($graphIdsToDelete);
+		}
+
+		$this->referencer->refreshGraphs();
+	}
+
+	/**
+	 * Deletes discovery rules and prototypes from DB that are missing in XML.
+	 *
+	 * @return null
+	 */
+	protected function deleteMissingDiscoveryRules() {
+		if (!$this->options['discoveryRules']['deleteMissing']) {
+			return;
+		}
+
+		$processedHostIds = $this->importedObjectContainer->getHostIds();
+		$processedTemplateIds = $this->importedObjectContainer->getTemplateIds();
+
+		$processedHostIds = array_merge($processedHostIds, $processedTemplateIds);
+
+		// no hosts or templates have been processed
+		if (!$processedHostIds) {
+			return;
+		}
+
+		$discoveryRuleIdsXML = array();
+
+		$allDiscoveryRules = $this->getFormattedDiscoveryRules();
+
+		if ($allDiscoveryRules) {
+			foreach ($allDiscoveryRules as $host => $discoveryRules) {
+				$hostId = $this->referencer->resolveHostOrTemplate($host);
+
+				foreach ($discoveryRules as $discoveryRule) {
+					$discoveryRuleId = $this->referencer->resolveItem($hostId, $discoveryRule['key_']);
+
+					if ($discoveryRuleId) {
+						$discoveryRuleIdsXML[$discoveryRuleId] = $discoveryRuleId;
+					}
+				}
+			}
+		}
+
+		$dbDiscoveryRuleIds = API::DiscoveryRule()->get(array(
+			'output' => array('itemid'),
+			'hostids' => $processedHostIds,
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false
+		));
+
+		$discoveryRulesToDelete = array_diff_key($dbDiscoveryRuleIds, $discoveryRuleIdsXML);
+
+		if ($discoveryRulesToDelete) {
+			API::DiscoveryRule()->delete(array_keys($discoveryRulesToDelete));
+		}
+
+		// refresh discovery rules because templated ones can be inherited to host and used for prototypes
+		$this->referencer->refreshItems();
+
+		$hostPrototypeIdsXML = array();
+		$triggerPrototypeIdsXML = array();
+		$itemPrototypeIdsXML = array();
+		$graphPrototypeIdsXML = array();
+
+		foreach ($allDiscoveryRules as $host => $discoveryRules) {
+			$hostId = $this->referencer->resolveHostOrTemplate($host);
+
+			foreach ($discoveryRules as $discoveryRule) {
+				$discoveryRuleId = $this->referencer->resolveItem($hostId, $discoveryRule['key_']);
+
+				if ($discoveryRuleId) {
+					// gather host prototype IDs to delete
+					foreach ($discoveryRule['host_prototypes'] as $hostPrototype) {
+						$hostPrototypeId = $this->referencer->resolveHostPrototype($hostId, $discoveryRuleId,
+							$hostPrototype['host']
+						);
+
+						if ($hostPrototypeId) {
+							$hostPrototypeIdsXML[$hostPrototypeId] = $hostPrototypeId;
+						}
+					}
+
+					// gather trigger prototype IDs to delete
+					foreach ($discoveryRule['trigger_prototypes'] as $triggerPrototype) {
+						$triggerPrototypeId = $this->referencer->resolveTrigger($triggerPrototype['description'],
+							$triggerPrototype['expression']
+						);
+
+						if ($triggerPrototypeId) {
+							$triggerPrototypeIdsXML[$triggerPrototypeId] = $triggerPrototypeId;
+						}
+					}
+
+					// gather graph prototype IDs to delete
+					foreach ($discoveryRule['graph_prototypes'] as $graphPrototype) {
+						$graphPrototypeId = $this->referencer->resolveGraph($hostId, $graphPrototype['name']);
+
+						if ($graphPrototypeId) {
+							$graphPrototypeIdsXML[$graphPrototypeId] = $graphPrototypeId;
+						}
+					}
+
+					// gather item prototype IDs to delete
+					foreach ($discoveryRule['item_prototypes'] as $itemPrototype) {
+						$itemPrototypeId = $this->referencer->resolveItem($hostId, $itemPrototype['key_']);
+
+						if ($itemPrototypeId) {
+							$itemPrototypeIdsXML[$itemPrototypeId] = $itemPrototypeId;
+						}
+					}
+				}
+			}
+		}
+
+		// delete missing host prototypes
+		$dbHostPrototypeIds = API::HostPrototype()->get(array(
+			'output' => array('hostid'),
+			'discoveryids' => $discoveryRuleIdsXML,
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false
+		));
+
+		$hostPrototypesToDelete = array_diff_key($dbHostPrototypeIds, $hostPrototypeIdsXML);
+
+		if ($hostPrototypesToDelete) {
+			API::HostPrototype()->delete(array_keys($hostPrototypesToDelete));
+		}
+
+		// delete missing trigger prototypes
+		$dbTriggerPrototypeIds = API::TriggerPrototype()->get(array(
+			'output' => array('triggerid'),
+			'hostids' => $processedHostIds,
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false
+		));
+
+		$triggerPrototypesToDelete = array_diff_key($dbTriggerPrototypeIds, $triggerPrototypeIdsXML);
+
+		// unlike triggers that belong to multiple hosts, trigger prototypes do not, so we just delete them
+		if ($triggerPrototypesToDelete) {
+			API::TriggerPrototype()->delete(array_keys($triggerPrototypesToDelete));
+		}
+
+		// delete missing graph prototypes
+		$dbGraphPrototypeIds = API::GraphPrototype()->get(array(
+			'output' => array('graphid'),
+			'hostids' => $processedHostIds,
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false
+		));
+
+		$graphPrototypesToDelete = array_diff_key($dbGraphPrototypeIds, $graphPrototypeIdsXML);
+
+		// unlike graphs that belong to multiple hosts, graph prototypes do not, so we just delete them
+		if ($graphPrototypesToDelete) {
+			API::GraphPrototype()->delete(array_keys($graphPrototypesToDelete));
+		}
+
+		// delete missing item prototypes
+		$dbItemPrototypeIds = API::ItemPrototype()->get(array(
+			'output' => array('itemid'),
+			'hostids' => $processedHostIds,
+			'preservekeys' => true,
+			'nopermissions' => true,
+			'inherited' => false
+		));
+
+		$itemPrototypesToDelete = array_diff_key($dbItemPrototypeIds, $itemPrototypeIdsXML);
+
+		if ($itemPrototypesToDelete) {
+			API::ItemPrototype()->delete(array_keys($itemPrototypesToDelete));
 		}
 	}
 
@@ -1297,7 +1826,9 @@ class CConfigurationImport {
 	protected function getFormatter($version) {
 		switch ($version) {
 			case '2.0':
-				return new C20ImportFormatter;
+				$converter = new C24TriggerConverter(new CFunctionMacroParser(), new CMacroParser('#'));
+
+				return new C20ImportFormatter($converter);
 			default:
 				throw new InvalidArgumentException('Unknown import version.');
 		}
@@ -1317,208 +1848,199 @@ class CConfigurationImport {
 	}
 
 	/**
-	 * Get formatted groups, if either "createMissing" groups option is true.
+	 * Get formatted groups.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedGroups() {
 		if (!isset($this->formattedData['groups'])) {
-			$this->formattedData['groups'] = array();
-
-			if ($this->options['groups']['createMissing']) {
-				$this->formattedData['groups'] = $this->formatter->getGroups();
-			}
+			$this->formattedData['groups'] = $this->formatter->getGroups();
 		}
 
 		return $this->formattedData['groups'];
 	}
 
 	/**
-	 * Get formatted templates, if either "createMissing" or "updateExisting" templates option is true.
+	 * Get formatted templates.
 	 *
 	 * @return array
 	 */
-	protected function getFormattedTemplates() {
+	public function getFormattedTemplates() {
 		if (!isset($this->formattedData['templates'])) {
-			$this->formattedData['templates'] = array();
-
-			if ($this->options['templates']['updateExisting'] || $this->options['templates']['createMissing']) {
-				$this->formattedData['templates'] = $this->formatter->getTemplates();
-			}
+			$this->formattedData['templates'] = $this->formatter->getTemplates();
 		}
 
 		return $this->formattedData['templates'];
 	}
 
 	/**
-	 * Get formatted hosts, if either "createMissing" or "updateExisting" hosts option is true.
+	 * Get formatted hosts.
 	 *
 	 * @return array
 	 */
-	protected function getFormattedHosts() {
+	public function getFormattedHosts() {
 		if (!isset($this->formattedData['hosts'])) {
-			$this->formattedData['hosts'] = array();
-
-			if ($this->options['hosts']['updateExisting'] || $this->options['hosts']['createMissing']) {
-				$this->formattedData['hosts'] = $this->formatter->getHosts();
-			}
+			$this->formattedData['hosts'] = $this->formatter->getHosts();
 		}
 
 		return $this->formattedData['hosts'];
 	}
 
 	/**
-	 * Get formatted applications, if either "createMissing" or "updateExisting" applications option is true.
+	 * Get formatted applications.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedApplications() {
 		if (!isset($this->formattedData['applications'])) {
-			$this->formattedData['applications'] = array();
-
-			if ($this->options['templates']['updateExisting']
-					|| $this->options['templates']['createMissing']
-					|| $this->options['hosts']['updateExisting']
-					|| $this->options['hosts']['createMissing']) {
-				$this->formattedData['applications'] = $this->formatter->getApplications();
-			}
+			$this->formattedData['applications'] = $this->formatter->getApplications();
 		}
 
 		return $this->formattedData['applications'];
 	}
 
 	/**
-	 * Get formatted items, if either "createMissing" or "updateExisting" items option is true.
+	 * Get formatted items.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedItems() {
 		if (!isset($this->formattedData['items'])) {
-			$this->formattedData['items'] = array();
-
-			if ($this->options['items']['updateExisting'] || $this->options['items']['createMissing']) {
-				$this->formattedData['items'] = $this->formatter->getItems();
-			}
+			$this->formattedData['items'] = $this->formatter->getItems();
 		}
 
 		return $this->formattedData['items'];
 	}
 
 	/**
-	 * Get formatted discovery rules, if either "createMissing" or "updateExisting" discovery rules option is true.
+	 * Get formatted discovery rules.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedDiscoveryRules() {
 		if (!isset($this->formattedData['discoveryRules'])) {
-			$this->formattedData['discoveryRules'] = array();
+			$this->formattedData['discoveryRules'] = $this->formatter->getDiscoveryRules();
 
-			if ($this->options['discoveryRules']['updateExisting'] || $this->options['discoveryRules']['createMissing']) {
-				$this->formattedData['discoveryRules'] = $this->formatter->getDiscoveryRules();
+			foreach ($this->formattedData['discoveryRules'] as &$discoveryRules) {
+				foreach ($discoveryRules as &$discoveryRule) {
+					foreach ($discoveryRule['trigger_prototypes'] as &$triggerPrototype) {
+						$triggerPrototype['parsedExpressions'] = $this->parseTriggerExpression($triggerPrototype['expression']);
+					}
+					unset($triggerPrototype);
+				}
+				unset($discoveryRule);
 			}
+			unset($discoveryRules);
 		}
 
 		return $this->formattedData['discoveryRules'];
 	}
 
 	/**
-	 * Get formatted triggers, if either "createMissing" or "updateExisting" triggers option is true.
+	 * Get formatted triggers.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedTriggers() {
 		if (!isset($this->formattedData['triggers'])) {
-			$this->formattedData['triggers'] = array();
+			$this->formattedData['triggers'] = $this->formatter->getTriggers();
 
-			if ($this->options['triggers']['updateExisting'] || $this->options['triggers']['createMissing']) {
-				$this->formattedData['triggers'] = $this->formatter->getTriggers();
+			foreach ($this->formattedData['triggers'] as &$trigger) {
+				$trigger['parsedExpressions'] = $this->parseTriggerExpression($trigger['expression']);
 			}
+			unset($trigger);
 		}
 
 		return $this->formattedData['triggers'];
 	}
 
 	/**
-	 * Get formatted graphs, if either "createMissing" or "updateExisting" graphs option is true.
+	 * Parses a trigger expression and returns an array of used hosts and items.
+	 *
+	 * @param string $expression
+	 *
+	 * @return array
+	 *
+	 * @throws Exception
+	 */
+	protected function parseTriggerExpression($expression) {
+		$expressions = array();
+
+		$result = $this->triggerExpression->parse($expression);
+		if (!$result) {
+			throw new Exception($this->triggerExpression->error);
+		}
+
+		foreach ($result->getTokensByType(CTriggerExpressionParserResult::TOKEN_TYPE_FUNCTION_MACRO) as $token) {
+			$expressions[] = array(
+				'host' => $token['data']['host'],
+				'item' => $token['data']['item'],
+			);
+		}
+
+		return $expressions;
+	}
+
+	/**
+	 * Get formatted graphs.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedGraphs() {
 		if (!isset($this->formattedData['graphs'])) {
-			$this->formattedData['graphs'] = array();
-
-			if ($this->options['graphs']['updateExisting'] || $this->options['graphs']['createMissing']) {
-				$this->formattedData['graphs'] = $this->formatter->getGraphs();
-			}
+			$this->formattedData['graphs'] = $this->formatter->getGraphs();
 		}
 
 		return $this->formattedData['graphs'];
 	}
 
 	/**
-	 * Get formatted images, if user is super admin and either "createMissing" or "updateExisting" images option is true.
+	 * Get formatted images.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedImages() {
 		if (!isset($this->formattedData['images'])) {
-			$this->formattedData['images'] = array();
-
-			if (CWebUser::$data['type'] == USER_TYPE_SUPER_ADMIN
-					&& $this->options['images']['updateExisting'] || $this->options['images']['createMissing']) {
-				$this->formattedData['images'] = $this->formatter->getImages();
-			}
+			$this->formattedData['images'] = $this->formatter->getImages();
 		}
 
 		return $this->formattedData['images'];
 	}
 
 	/**
-	 * Get formatted maps, if either "createMissing" or "updateExisting" maps option is true.
+	 * Get formatted maps.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedMaps() {
 		if (!isset($this->formattedData['maps'])) {
-			$this->formattedData['maps'] = array();
-
-			if ($this->options['maps']['updateExisting'] || $this->options['maps']['createMissing']) {
-				$this->formattedData['maps'] = $this->formatter->getMaps();
-			}
+			$this->formattedData['maps'] = $this->formatter->getMaps();
 		}
 
 		return $this->formattedData['maps'];
 	}
 
 	/**
-	 * Get formatted screens, if either "createMissing" or "updateExisting" screens option is true.
+	 * Get formatted screens.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedScreens() {
 		if (!isset($this->formattedData['screens'])) {
-			$this->formattedData['screens'] = array();
-
-			if ($this->options['screens']['updateExisting'] || $this->options['screens']['createMissing']) {
-				$this->formattedData['screens'] = $this->formatter->getScreens();
-			}
+			$this->formattedData['screens'] = $this->formatter->getScreens();
 		}
 
 		return $this->formattedData['screens'];
 	}
 
 	/**
-	 * Get formatted template screens, if either "createMissing" or "updateExisting" template screens option is true.
+	 * Get formatted template screens.
 	 *
 	 * @return array
 	 */
 	protected function getFormattedTemplateScreens() {
 		if (!isset($this->formattedData['templateScreens'])) {
-			$this->formattedData['templateScreens'] = array();
-
-			if ($this->options['templateScreens']['updateExisting'] || $this->options['templateScreens']['createMissing']) {
 				$this->formattedData['templateScreens'] = $this->formatter->getTemplateScreens();
-			}
 		}
 
 		return $this->formattedData['templateScreens'];
diff --git a/frontends/php/include/classes/import/CImportReferencer.php b/frontends/php/include/classes/import/CImportReferencer.php
index 03471b0c1f7..80c2b896897 100644
--- a/frontends/php/include/classes/import/CImportReferencer.php
+++ b/frontends/php/include/classes/import/CImportReferencer.php
@@ -29,7 +29,6 @@ class CImportReferencer {
 	 * @var array with references to interfaceid (hostid -> reference_name -> interfaceid)
 	 */
 	public $interfacesCache = array();
-	protected $processedHosts = array();
 	protected $groups = array();
 	protected $templates = array();
 	protected $hosts = array();
@@ -37,9 +36,11 @@ class CImportReferencer {
 	protected $items = array();
 	protected $valueMaps = array();
 	protected $triggers = array();
+	protected $graphs = array();
 	protected $iconMaps = array();
 	protected $maps = array();
 	protected $screens = array();
+	protected $templateScreens = array();
 	protected $macros = array();
 	protected $proxies = array();
 	protected $hostPrototypes = array();
@@ -50,36 +51,17 @@ class CImportReferencer {
 	protected $itemsRefs;
 	protected $valueMapsRefs;
 	protected $triggersRefs;
+	protected $graphsRefs;
 	protected $iconMapsRefs;
 	protected $mapsRefs;
 	protected $screensRefs;
+	protected $templateScreensRefs;
 	protected $macrosRefs;
 	protected $proxiesRefs;
-	protected $hostPrototypeRefs;
+	protected $hostPrototypesRefs;
 
 
 	/**
-	 * Add host/template that has been updated or created, i.e. all items, discovery rules, etc,
-	 * related to these hosts/templates should be created or updated too.
-	 *
-	 * @param $host
-	 */
-	public function addProcessedHost($host) {
-		$this->processedHosts[$host] = $host;
-	}
-
-	/**
-	 * Checks if host/template has been created or updated during the current import.
-	 *
-	 * @param $host
-	 *
-	 * @return bool
-	 */
-	public function isProcessedHost($host) {
-		return isset($this->processedHosts[$host]);
-	}
-
-	/**
 	 * Get group id by name.
 	 *
 	 * @param string $name
@@ -120,6 +102,7 @@ class CImportReferencer {
 		if ($this->templatesRefs === null) {
 			$this->selectTemplates();
 		}
+
 		return isset($this->templatesRefs[$host]) ? $this->templatesRefs[$host] : false;
 	}
 
@@ -197,7 +180,7 @@ class CImportReferencer {
 	}
 
 	/**
-	 * Get trigger id by trigger name and expression.
+	 * Get trigger ID by trigger name and expression.
 	 *
 	 * @param string $name
 	 * @param string $expression
@@ -213,6 +196,22 @@ class CImportReferencer {
 	}
 
 	/**
+	 * Get graph ID by host ID and graph name.
+	 *
+	 * @param string $hostId
+	 * @param string $name
+	 *
+	 * @return string|bool
+	 */
+	public function resolveGraph($hostId, $name) {
+		if ($this->graphsRefs === null) {
+			$this->selectGraphs();
+		}
+
+		return isset($this->graphsRefs[$hostId][$name]) ? $this->graphsRefs[$hostId][$name] : false;
+	}
+
+	/**
 	 * Get icon map id by name.
 	 *
 	 * @param string $name
@@ -258,7 +257,25 @@ class CImportReferencer {
 	}
 
 	/**
-	 * Get macro id by host id and macro name.
+	 * Get templated screen ID by template ID and screen name.
+	 *
+	 * @param string $templateId
+	 * @param string $screenName
+	 *
+	 * @return string|bool
+	 */
+	public function resolveTemplateScreen($templateId, $screenName) {
+		if ($this->templateScreensRefs === null) {
+			$this->selectTemplateScreens();
+		}
+
+		return isset($this->templateScreensRefs[$templateId][$screenName])
+			? $this->templateScreensRefs[$templateId][$screenName]
+			: false;
+	}
+
+	/**
+	 * Get macro ID by host ID and macro name.
 	 *
 	 * @param string $hostid
 	 * @param string $name
@@ -298,12 +315,12 @@ class CImportReferencer {
 	 * @return string|bool
 	 */
 	public function resolveHostPrototype($hostId, $discoveryRuleId, $hostPrototype) {
-		if ($this->hostPrototypeRefs === null) {
+		if ($this->hostPrototypesRefs === null) {
 			$this->selectHostPrototypes();
 		}
 
-		if (isset($this->hostPrototypeRefs[$hostId][$discoveryRuleId][$hostPrototype])) {
-			return $this->hostPrototypeRefs[$hostId][$discoveryRuleId][$hostPrototype];
+		if (isset($this->hostPrototypesRefs[$hostId][$discoveryRuleId][$hostPrototype])) {
+			return $this->hostPrototypesRefs[$hostId][$discoveryRuleId][$hostPrototype];
 		}
 		else {
 			return false;
@@ -384,17 +401,6 @@ class CImportReferencer {
 	}
 
 	/**
-	 * Add application name association with application id.
-	 *
-	 * @param string $hostId
-	 * @param string $name
-	 * @param string $appId
-	 */
-	public function addApplicationRef($hostId, $name, $appId) {
-		$this->applicationsRefs[$hostId][$name] = $appId;
-	}
-
-	/**
 	 * Add item keys that need association with a database item id.
 	 * Input array has format:
 	 * array('hostname1' => array('itemkey1', 'itemkey2'), 'hostname2' => array('itemkey1'), ...)
@@ -447,6 +453,22 @@ class CImportReferencer {
 	}
 
 	/**
+	 * Add graph names that need association with a database graph ID.
+	 * Input array has format:
+	 * array('hostname1' => array('graphname1', 'graphname2'), 'hostname2' => array('graphname1'), ...)
+	 *
+	 * @param array $graphs
+	 */
+	public function addGraphs(array $graphs) {
+		foreach ($graphs as $host => $hostGraphs) {
+			if (!isset($this->graphs[$host])) {
+				$this->graphs[$host] = array();
+			}
+			$this->graphs[$host] = array_unique(array_merge($this->graphs[$host], $hostGraphs));
+		}
+	}
+
+	/**
 	 * Add trigger name/expression association with trigger id.
 	 *
 	 * @param string $name
@@ -495,6 +517,15 @@ class CImportReferencer {
 	}
 
 	/**
+	 * Add templated screen names that need association with a database screen id.
+	 *
+	 * @param array $screens
+	 */
+	public function addTemplateScreens(array $screens) {
+		$this->templateScreens = array_unique(array_merge($this->templateScreens, $screens));
+	}
+
+	/**
 	 * Add screen name association with screen id.
 	 *
 	 * @param string $name
@@ -505,6 +536,16 @@ class CImportReferencer {
 	}
 
 	/**
+	 * Add template screen name association with template screen ID.
+	 *
+	 * @param string $screenName
+	 * @param string $templateScreenId
+	 */
+	public function addTemplateScreenRef($screenName, $templateScreenId) {
+		$this->templateScreensRefs[$screenName] = $templateScreenId;
+	}
+
+	/**
 	 * Add macros names that need association with a database macro id.
 	 *
 	 * @param array $macros
@@ -570,16 +611,6 @@ class CImportReferencer {
 	}
 
 	/**
-	 * Add host prototype host association with host id.
-	 *
-	 * @param string $host
-	 * @param string $hostPrototypeId
-	 */
-	public function addHostPrototypeRef($host, $hostPrototypeId) {
-		$this->hostPrototypes[$host] = $hostPrototypeId;
-	}
-
-	/**
 	 * Select group ids for previously added group names.
 	 */
 	protected function selectGroups() {
@@ -606,10 +637,10 @@ class CImportReferencer {
 		if (!empty($this->templates)) {
 			$this->templatesRefs = array();
 			$dbTemplates = API::Template()->get(array(
-				'filter' => array('host' => $this->templates),
-				'output' => array('hostid', 'host'),
+				'output' => array('host', 'templateid'),
 				'preservekeys' => true,
-				'editable' => true
+				'editable' => true,
+				'filter' => array('host' => $this->templates)
 			));
 			foreach ($dbTemplates as $template) {
 				$this->templatesRefs[$template['host']] = $template['templateid'];
@@ -627,7 +658,7 @@ class CImportReferencer {
 			$this->hostsRefs = array();
 			// fetch only normal hosts, discovered hosts must not be imported
 			$dbHosts = API::Host()->get(array(
-				'filter' => array('host' => $this->hosts, 'flags' => ZBX_FLAG_DISCOVERY_NORMAL),
+				'filter' => array('host' => $this->hosts),
 				'output' => array('hostid', 'host'),
 				'preservekeys' => true,
 				'templated_hosts' => true,
@@ -687,8 +718,8 @@ class CImportReferencer {
 			}
 
 			if ($sqlWhere) {
-				$dbitems = DBselect('SELECT i.itemid,i.hostid,i.key_ FROM items i WHERE '.implode(' OR ', $sqlWhere));
-				while ($dbItem = DBfetch($dbitems)) {
+				$dbItems = DBselect('SELECT i.itemid,i.hostid,i.key_ FROM items i WHERE '.implode(' OR ', $sqlWhere));
+				while ($dbItem = DBfetch($dbItems)) {
 					$this->itemsRefs[$dbItem['hostid']][$dbItem['key_']] = $dbItem['itemid'];
 				}
 			}
@@ -725,43 +756,56 @@ class CImportReferencer {
 		if (!empty($this->triggers)) {
 			$this->triggersRefs = array();
 
-			$triggerIds = array();
-			$sql = 'SELECT t.triggerid,t.expression,t.description'.
-				' FROM triggers t'.
-				' WHERE '.dbConditionString('t.description', array_keys($this->triggers));
-			$dbTriggers = DBselect($sql);
-			while ($dbTrigger = DBfetch($dbTriggers)) {
-				$dbExpr = explode_exp($dbTrigger['expression']);
-				foreach ($this->triggers as $name => $expressions) {
-					if ($name == $dbTrigger['description']) {
-						foreach ($expressions as $expression) {
-							if ($expression == $dbExpr) {
-								$this->triggersRefs[$name][$expression] = $dbTrigger['triggerid'];
-								$triggerIds[] = $dbTrigger['triggerid'];
-							}
-						}
-					}
-				}
-			}
-
-			$allowedTriggers = API::Trigger()->get(array(
-				'triggerids' => $triggerIds,
-				'output' => array('triggerid'),
+			$dbTriggers = API::Trigger()->get(array(
+				'output' => array('triggerid', 'expression', 'description'),
+				'expandExpression' => true,
 				'filter' => array(
+					'description' => array_keys($this->triggers),
 					'flags' => array(
 						ZBX_FLAG_DISCOVERY_NORMAL,
 						ZBX_FLAG_DISCOVERY_PROTOTYPE,
 						ZBX_FLAG_DISCOVERY_CREATED
 					)
 				),
-				'editable' => true,
-				'preservekeys' => true
+				'editable' => true
 			));
-			foreach ($this->triggersRefs as $name => $expressions) {
-				foreach ($expressions as $expression => $triggerId) {
-					if (!isset($allowedTriggers[$triggerId])) {
-						unset($this->triggersRefs[$name][$expression]);
-					}
+
+			foreach ($dbTriggers as $dbTrigger) {
+				if (isset($this->triggers[$dbTrigger['description']][$dbTrigger['expression']])) {
+					$this->triggersRefs[$dbTrigger['description']][$dbTrigger['expression']] = $dbTrigger['triggerid'];
+				}
+			}
+		}
+	}
+
+	/**
+	 * Select graph IDs for previously added graph names.
+	 */
+	protected function selectGraphs() {
+		if ($this->graphs) {
+			$this->graphsRefs = array();
+
+			$graphNames = array();
+
+			foreach ($this->graphs as $graphs) {
+				foreach ($graphs as $graph) {
+					$graphNames[$graph] = $graph;
+				}
+			}
+
+			$dbGraphs = API::Graph()->get(array(
+				'output' => array('graphid', 'name'),
+				'selectHosts' => array('hostid'),
+				'filter' => array(
+					'name' => $graphNames,
+					'flags' => null
+				),
+				'editable' => true
+			));
+
+			foreach ($dbGraphs as $dbGraph) {
+				foreach ($dbGraph['hosts'] as $host) {
+					$this->graphsRefs[$host['hostid']][$dbGraph['name']] = $dbGraph['graphid'];
 				}
 			}
 		}
@@ -775,6 +819,13 @@ class CImportReferencer {
 	}
 
 	/**
+	 * Unset graph refs to make referencer select them from DB again.
+	 */
+	public function refreshGraphs() {
+		$this->graphsRefs = null;
+	}
+
+	/**
 	 * Select icon map ids for previously added icon maps names.
 	 */
 	protected function selectIconMaps() {
@@ -831,6 +882,28 @@ class CImportReferencer {
 	}
 
 	/**
+	 * Select template screen IDs for previously added screen names and template IDs.
+	 */
+	protected function selectTemplateScreens() {
+		if ($this->templateScreens) {
+			$this->templateScreensRefs = array();
+
+			$dbScreens = DBselect(
+				'SELECT s.screenid, s.name, s.templateid'.
+				' FROM screens s'.
+				' WHERE s.templateid IS NOT NULL '.
+					' AND '.dbConditionString('s.name', $this->templateScreens)
+			);
+
+			while ($dbScreen = DBfetch($dbScreens)) {
+				$this->templateScreensRefs[$dbScreen['templateid']][$dbScreen['name']] = $dbScreen['screenid'];
+			}
+
+			$this->templateScreens = array();
+		}
+	}
+
+	/**
 	 * Select macro ids for previously added macro names.
 	 */
 	protected function selectMacros() {
@@ -880,7 +953,7 @@ class CImportReferencer {
 	 */
 	protected function selectHostPrototypes() {
 		if (!empty($this->hostPrototypes)) {
-			$this->hostPrototypeRefs = array();
+			$this->hostPrototypesRefs = array();
 			$sqlWhere = array();
 			foreach ($this->hostPrototypes as $host => $discoveryRule) {
 				$hostId = $this->resolveHostOrTemplate($host);
@@ -902,7 +975,7 @@ class CImportReferencer {
 						' AND '.implode(' OR ', $sqlWhere)
 				);
 				while ($data = DBfetch($query)) {
-					$this->hostPrototypeRefs[$data['parent_hostid']][$data['parent_itemid']][$data['host']] = $data['hostid'];
+					$this->hostPrototypesRefs[$data['parent_hostid']][$data['parent_itemid']][$data['host']] = $data['hostid'];
 				}
 			}
 		}
diff --git a/frontends/php/include/classes/import/CImportedObjectContainer.php b/frontends/php/include/classes/import/CImportedObjectContainer.php
new file mode 100644
index 00000000000..e967b34cc84
--- /dev/null
+++ b/frontends/php/include/classes/import/CImportedObjectContainer.php
@@ -0,0 +1,97 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/**
+ * Class that holds processed (created and updated) host and template IDs during the current import.
+ */
+class CImportedObjectContainer {
+	/**
+	 * @var array with created and updated hosts.
+	 */
+	protected $hostIds = array();
+
+	/**
+	 * @var array with created and updated templates.
+	 */
+	protected $templateIds = array();
+
+	/**
+	 * Add host IDs that have been created and updated.
+	 *
+	 * @param array $hostIds
+	 */
+	public function addHostIds(array $hostIds) {
+		foreach ($hostIds as $hostId) {
+			$this->hostIds[$hostId] = $hostId;
+		}
+	}
+
+	/**
+	 * Add template IDs that have been created and updated.
+	 *
+	 * @param array $templateIds
+	 */
+	public function addTemplateIds(array $templateIds) {
+		foreach ($templateIds as $templateId) {
+			$this->templateIds[$templateId] = $templateId;
+		}
+	}
+
+	/**
+	 * Checks if host has been created and updated during the current import.
+	 *
+	 * @param string $hostId
+	 *
+	 * @return bool
+	 */
+	public function isHostProcessed($hostId) {
+		return isset($this->hostIds[$hostId]);
+	}
+
+	/**
+	 * Checks if template has been created and updated during the current import.
+	 *
+	 * @param string $templateId
+	 *
+	 * @return bool
+	 */
+	public function isTemplateProcessed($templateId) {
+		return isset($this->templateIds[$templateId]);
+	}
+
+	/**
+	 * Get array of created and updated hosts IDs.
+	 *
+	 * @return array
+	 */
+	public function getHostIds() {
+		return array_values($this->hostIds);
+	}
+
+	/**
+	 * Get array of created and updated template IDs.
+	 *
+	 * @return array
+	 */
+	public function getTemplateIds() {
+		return array_values($this->templateIds);
+	}
+}
diff --git a/frontends/php/include/classes/import/CXmlImport18.php b/frontends/php/include/classes/import/CXmlImport18.php
index 88299b5d1e2..7d2a2f0a276 100644
--- a/frontends/php/include/classes/import/CXmlImport18.php
+++ b/frontends/php/include/classes/import/CXmlImport18.php
@@ -296,19 +296,6 @@ class CXmlImport18 {
 		return isset($map[$name]) ? $map[$name] : $name;
 	}
 
-	protected static function createDOMDocument() {
-		$doc = new DOMDocument('1.0', 'UTF-8');
-		$doc->preserveWhiteSpace = false;
-		$doc->formatOutput = true;
-
-		$root = $doc->appendChild(new DOMElement('zabbix_export'));
-		$root->setAttributeNode(new DOMAttr('version', '1.0'));
-		$root->setAttributeNode(new DOMAttr('date', zbx_date2str(XML_DATE_DATE_FORMAT)));
-		$root->setAttributeNode(new DOMAttr('time', zbx_date2str(XML_TIME_DATE_FORMAT)));
-
-		return $root;
-	}
-
 	/**
 	 * Converts Simple key from old format to new.
 	 *
@@ -392,12 +379,13 @@ class CXmlImport18 {
 		return $array;
 	}
 
-	public static function import($file) {
+	public static function import($source) {
 
 		libxml_use_internal_errors(true);
+		libxml_disable_entity_loader(true);
 
 		$xml = new DOMDocument();
-		if (!$xml->loadXML($file)) {
+		if (!$xml->loadXML($source, LIBXML_IMPORT_FLAGS)) {
 			$text = '';
 			foreach (libxml_get_errors() as $error) {
 				switch ($error->level) {
@@ -420,14 +408,7 @@ class CXmlImport18 {
 			throw new Exception($text);
 		}
 
-		if ($xml->childNodes->item(0)->nodeName != 'zabbix_export') {
-			$xml2 = self::createDOMDocument();
-			$xml2->appendChild($xml2->ownerDocument->importNode($xml->childNodes->item(0), true));
-			self::$xml = $xml2->ownerDocument;
-		}
-		else {
-			self::$xml = $xml;
-		}
+		self::$xml = $xml;
 
 		return true;
 	}
@@ -444,9 +425,14 @@ class CXmlImport18 {
 
 		foreach ($importScreens as $mnum => &$screen) {
 			unset($screen['screenid']);
-			$exists = API::Screen()->exists(array('name' => $screen['name']));
 
-			if ($exists && !empty($rules['screens']['updateExisting'])) {
+			$screenExists = API::Screen()->get(array(
+				'output' => array('screenid'),
+				'filter' => array('name' => $screen['name']),
+				'nopermissions' => true,
+				'limit' => 1
+			));
+			if ($screenExists && $rules['screens']['updateExisting']) {
 				$db_screens = API::Screen()->get(array(
 					'output' => array('screenid'),
 					'filter' => array('name' => $screen['name'])
@@ -459,7 +445,7 @@ class CXmlImport18 {
 
 				$screen['screenid'] = $db_screen['screenid'];
 			}
-			else if ($exists || empty($rules['screens']['createMissing'])) {
+			elseif ($screenExists || !$rules['screens']['createMissing']) {
 				info(_s('Screen "%1$s" skipped - user rule.', $screen['name']));
 				unset($importScreens[$mnum]);
 				continue; // break if not update exist
@@ -473,6 +459,12 @@ class CXmlImport18 {
 				if (!isset($screenitem['resourceid'])) {
 					$screenitem['resourceid'] = 0;
 				}
+				if ($screenitem['rowspan'] == 0) {
+					$screenitem['rowspan'] = 1;
+				}
+				if ($screenitem['colspan'] == 0) {
+					$screenitem['colspan'] = 1;
+				}
 				if (is_array($screenitem['resourceid'])) {
 					switch ($screenitem['resourcetype']) {
 						case SCREEN_RESOURCE_HOSTS_INFO:
@@ -626,38 +618,28 @@ class CXmlImport18 {
 			$images_to_add = array();
 			$images_to_update = array();
 			foreach ($images as $image) {
-				if (API::Image()->exists($image)) {
-					if ((($image['imagetype'] == IMAGE_TYPE_ICON) && !empty($rules['images']['updateExisting']))
-							|| (($image['imagetype'] == IMAGE_TYPE_BACKGROUND) && (!empty($rules['images']['updateExisting'])))
-					) {
-
-						$options = array(
-							'filter' => array('name' => $image['name']),
-							'output' => array('imageid')
-						);
-						$imgs = API::Image()->get($options);
-						$img = reset($imgs);
+				$dbImage = API::Image()->get(array(
+					'output' => array('imageid'),
+					'filter' => array('name' => $image['name']),
+					'limit' => 1
+				));
 
-						$image['imageid'] = $img['imageid'];
+				if ($dbImage && $rules['images']['updateExisting']) {
+					$dbImage = reset($dbImage);
+					$image['imageid'] = $dbImage['imageid'];
 
-						// image will be decoded in class.image.php
-						$image['image'] = $image['encodedImage'];
-						unset($image['encodedImage']);
+					// image will be decoded in class.image.php
+					$image['image'] = $image['encodedImage'];
+					unset($image['encodedImage']);
 
-						$images_to_update[] = $image;
-					}
+					$images_to_update[] = $image;
 				}
-				else {
-					if ((($image['imagetype'] == IMAGE_TYPE_ICON) && !empty($rules['images']['createMissing']))
-							|| (($image['imagetype'] == IMAGE_TYPE_BACKGROUND) && !empty($rules['images']['createMissing']))
-					) {
-
-						// No need to decode_base64
-						$image['image'] = $image['encodedImage'];
+				elseif (!$dbImage && $rules['images']['createMissing']) {
+					// No need to decode_base64
+					$image['image'] = $image['encodedImage'];
 
-						unset($image['encodedImage']);
-						$images_to_add[] = $image;
-					}
+					unset($image['encodedImage']);
+					$images_to_add[] = $image;
 				}
 			}
 
@@ -683,13 +665,18 @@ class CXmlImport18 {
 		$importMaps = $importMaps['zabbix_export']['sysmaps'];
 		foreach ($importMaps as $mnum => &$sysmap) {
 			unset($sysmap['sysmapid']);
-			$exists = API::Map()->exists(array('name' => $sysmap['name']));
 
 			if (!isset($sysmap['label_format'])) {
 				$sysmap['label_format'] = SYSMAP_LABEL_ADVANCED_OFF;
 			}
 
-			if ($exists && !empty($rules['maps']['updateExisting'])) {
+			$mapExists = API::Map()->get(array(
+				'output' => array('sysmapid'),
+				'filter' => array('name' => $sysmap['name']),
+				'nopermissions' => true,
+				'limit' => 1
+			));
+			if ($mapExists && $rules['maps']['updateExisting']) {
 				$db_maps = API::Map()->getObjects(array('name' => $sysmap['name']));
 				if (empty($db_maps)) {
 					throw new Exception(_s('No permissions for map "%1$s".', $sysmap['name']));
@@ -698,10 +685,10 @@ class CXmlImport18 {
 				$db_map = reset($db_maps);
 				$sysmap['sysmapid'] = $db_map['sysmapid'];
 			}
-			else if ($exists || empty($rules['maps']['createMissing'])) {
+			elseif ($mapExists || !$rules['maps']['createMissing']) {
 				info(_s('Map "%1$s" skipped - user rule.', $sysmap['name']));
 				unset($importMaps[$mnum]);
-				continue; // break if not update updateExisting
+				continue;
 			}
 
 			if (isset($sysmap['backgroundid'])) {
@@ -857,39 +844,63 @@ class CXmlImport18 {
 	}
 
 	public static function parseMain($rules) {
+		$triggerExpressionConverter = new C24TriggerConverter(
+			new CFunctionMacroParser(),
+			new CMacroParser('#')
+		);
 		$triggersForDependencies = array();
 
-		if (!empty($rules['hosts']['updateExisting'])
-				|| !empty($rules['hosts']['createMissing'])
-				|| !empty($rules['templates']['createMissing'])
-				|| !empty($rules['templates']['updateExisting'])
-		) {
+		if ($rules['hosts']['updateExisting']
+				|| $rules['hosts']['createMissing']
+				|| $rules['templates']['createMissing']
+				|| $rules['templates']['updateExisting']) {
 			$xpath = new DOMXPath(self::$xml);
 
 			$hosts = $xpath->query('hosts/host');
 
+			// stores parsed host and template IDs
+			$processedHostIds = array();
+
+			// stores converted trigger expressions for each host
+			$triggerExpressions = array();
+
+			// stores converted item keys for each host
+			$itemKeys = array();
+
+			// process hosts
 			foreach ($hosts as $host) {
 				$host_db = self::mapXML2arr($host, XML_TAG_HOST);
 
 				if (!isset($host_db['status'])) {
 					$host_db['status'] = HOST_STATUS_TEMPLATE;
 				}
-				$current_host = ($host_db['status'] == HOST_STATUS_TEMPLATE)
-						? API::Template()->exists($host_db)
-						: API::Host()->exists($host_db);
 
+				if ($host_db['status'] == HOST_STATUS_TEMPLATE) {
+					$current_host = API::Template()->get(array(
+						'output' => array('templateid'),
+						'filter' => array('host' => $host_db['host']),
+						'nopermissions' => true,
+						'limit' => 1
+					));
+				}
+				else {
+					$current_host = API::Host()->get(array(
+						'output' => array('hostid'),
+						'filter' => array('host' => $host_db['host']),
+						'nopermissions' => true,
+						'limit' => 1
+					));
+				}
 
 				if (!$current_host
-						&& (($host_db['status'] == HOST_STATUS_TEMPLATE && empty($rules['templates']['createMissing']))
-								|| ($host_db['status'] != HOST_STATUS_TEMPLATE && empty($rules['hosts']['createMissing'])))
-				) {
+						&& (($host_db['status'] == HOST_STATUS_TEMPLATE && !$rules['templates']['createMissing'])
+						|| ($host_db['status'] != HOST_STATUS_TEMPLATE && !$rules['hosts']['createMissing']))) {
 					continue;
 				}
 
 				if ($current_host
-						&& (($host_db['status'] == HOST_STATUS_TEMPLATE && empty($rules['templates']['updateExisting']))
-								|| ($host_db['status'] != HOST_STATUS_TEMPLATE && empty($rules['hosts']['updateExisting'])))
-				) {
+						&& (($host_db['status'] == HOST_STATUS_TEMPLATE && !$rules['templates']['updateExisting'])
+						|| ($host_db['status'] != HOST_STATUS_TEMPLATE && !$rules['hosts']['updateExisting']))) {
 					continue;
 				}
 
@@ -905,11 +916,12 @@ class CXmlImport18 {
 				/**
 				 * @todo when new XML format will be introduced, this check should be changed to XML version check
 				 */
-				$old_version_input = $host_db['status'] != HOST_STATUS_TEMPLATE;
-				if ($old_version_input) {
-					// rearranging host structure, so it would look more like 2.0 host
-					$interfaces = array();
+				$oldVersionInput = ($host_db['status'] != HOST_STATUS_TEMPLATE);
+
+				$interfaces = array();
 
+				// rearranging host structure, so it would look more like 2.0 host
+				if ($oldVersionInput) {
 					// the main interface is always "agent" type
 					if (!is_null($host_db['ip'])) {
 						$interfaces[] = array(
@@ -922,7 +934,7 @@ class CXmlImport18 {
 						);
 					}
 
-					// now we need to check if host had SNMP items. If it had, we need and SNMP interface for every different port.
+					// now we need to check if host had SNMP items. If it had, we need an SNMP interface for every different port.
 					$items = $xpath->query('items/item', $host);
 					$snmp_interface_ports_created = array();
 					foreach ($items as $item) {
@@ -930,11 +942,9 @@ class CXmlImport18 {
 						if (($item_db['type'] == ITEM_TYPE_SNMPV1
 								|| $item_db['type'] == ITEM_TYPE_SNMPV2C
 								|| $item_db['type'] == ITEM_TYPE_SNMPV3)
-								&& !isset($snmp_interface_ports_created[$item_db['snmp_port']])
-						) {
-
+								&& !isset($snmp_interface_ports_created[$item_db['snmp_port']])) {
 							$interfaces[] = array(
-								'main' => INTERFACE_PRIMARY,
+								'main' => $snmp_interface_ports_created ? INTERFACE_SECONDARY : INTERFACE_PRIMARY,
 								'type' => INTERFACE_TYPE_SNMP,
 								'useip' => $host_db['useip'],
 								'ip' => $host_db['ip'],
@@ -946,15 +956,14 @@ class CXmlImport18 {
 					}
 					unset($snmp_interface_ports_created); // it was a temporary variable
 
-
-					// we ned to add ipmi interface if at least one ipmi item exists
+					// we need to add ipmi interface if at least one ipmi item exists
 					foreach ($items as $item) {
 						$item_db = self::mapXML2arr($item, XML_TAG_ITEM);
 						if ($item_db['type'] == ITEM_TYPE_IPMI) {
 							// when saving a host in 1.8, it's possible to set useipmi=1 and not to fill an IP address
 							// we were not really sure what to do with this host,
 							// and decided to take host IP address instead and show info message about this
-							if ($host_db['ipmi_ip'] == '') {
+							if ($host_db['ipmi_ip'] === '') {
 								$ipmi_ip = $host_db['ip'];
 								info(_s('Host "%s" has "useipmi" parameter checked, but has no "ipmi_ip" parameter! Using host IP address as an address for IPMI interface.', $host_db['host']));
 							}
@@ -964,9 +973,9 @@ class CXmlImport18 {
 							$interfaces[] = array(
 								'main' => INTERFACE_PRIMARY,
 								'type' => INTERFACE_TYPE_IPMI,
-								'useip' => INTERFACE_USE_DNS,
-								'ip' => '',
-								'dns' => $ipmi_ip,
+								'useip' => INTERFACE_USE_IP,
+								'ip' => $ipmi_ip,
+								'dns' => '',
 								'port' => $host_db['ipmi_port']
 							);
 
@@ -980,7 +989,7 @@ class CXmlImport18 {
 					$options = array(
 						'filter' => array('host' => $host_db['host']),
 						'output' => API_OUTPUT_EXTEND,
-						'editable' => 1,
+						'editable' => true,
 						'selectInterfaces' => API_OUTPUT_EXTEND
 					);
 					if ($host_db['status'] == HOST_STATUS_TEMPLATE) {
@@ -997,37 +1006,56 @@ class CXmlImport18 {
 						$current_host = reset($current_host);
 					}
 
-
 					// checking if host already exists - then some of the interfaces may not need to be created
 					if ($host_db['status'] != HOST_STATUS_TEMPLATE) {
-						// for every interface we got based on XML
-						foreach ($interfaces as $i => $interface_db) {
-							// checking every interface of current host
-							foreach ($current_host['interfaces'] as $interface) {
-								// if all parameters of interface are identical
-								if (
-									$interface['type'] == $interface_db['type']
-									&& $interface['ip'] == $interface_db['ip']
-									&& $interface['dns'] == $interface_db['dns']
-									&& $interface['port'] == $interface_db['port']
-									&& $interface['useip'] == $interface_db['useip']
-								) {
-									// this interface is the same as existing one!
-									$interfaces[$i]['interfaceid'] = $interface['interfaceid'];
-									break;
+						$currentMainInterfaces = array();
+						$currentInterfacesByType = array();
+
+						// group existing main interfaces by interface type into $currentMainInterfaces
+						// and group interfaces by type into $currentInterfacesByType
+						foreach ($current_host['interfaces'] as $currentInterface) {
+							if ($currentInterface['main'] == INTERFACE_PRIMARY) {
+								$currentMainInterfaces[$currentInterface['type']] = $currentInterface;
+							}
+
+							$currentInterfacesByType[$currentInterface['type']][] = $currentInterface;
+						}
+
+						// loop through all interfaces we got from XML
+						foreach ($interfaces as &$interfaceXml) {
+							$interfaceXmlType = $interfaceXml['type'];
+
+							// if this is the primary interface of some type and we have default interface of same type
+							// in current (target) host, re-use "interfaceid" of the matching default interface
+							// in current host
+							if ($interfaceXml['main'] == INTERFACE_PRIMARY
+									&& isset($currentMainInterfaces[$interfaceXmlType])) {
+								$interfaceXml['interfaceid'] = $currentMainInterfaces[$interfaceXmlType]['interfaceid'];
+							}
+							else {
+								// otherwise, loop through all current (target) host interfaces with type of current
+								// imported interface and re-use "interfaceid" in case if all interface parameters match
+								if (isset($currentInterfacesByType[$interfaceXmlType])) {
+									foreach ($currentInterfacesByType[$interfaceXmlType] as $currentInterface) {
+										if ($currentInterface['ip'] == $interfaceXml['ip']
+												&& $currentInterface['dns'] == $interfaceXml['dns']
+												&& $currentInterface['port'] == $interfaceXml['port']
+												&& $currentInterface['useip'] == $interfaceXml['useip']) {
+											$interfaceXml['interfaceid'] = $currentInterface['interfaceid'];
+											break;
+										}
+									}
 								}
 							}
 						}
+						unset($interfaceXml);
 
-					}
-					$interfaces_created_with_host = false;
-				}
-				else {
-					if ($host_db['status'] != HOST_STATUS_TEMPLATE) {
 						$host_db['interfaces'] = $interfaces;
-						$interfaces_created_with_host = true;
 					}
 				}
+				elseif ($host_db['status'] != HOST_STATUS_TEMPLATE) {
+					$host_db['interfaces'] = $interfaces;
+				}
 
 // HOST GROUPS {{{
 				$groups = $xpath->query('groups/group', $host);
@@ -1042,39 +1070,36 @@ class CXmlImport18 {
 				}
 
 				foreach ($groups_to_parse as $group) {
-					$current_group = API::HostGroup()->exists($group);
-
-					if ($current_group) {
-						$options = array(
-							'filter' => $group,
-							'output' => API_OUTPUT_EXTEND,
-							'editable' => 1
-						);
-						$current_group = API::HostGroup()->get($options);
-						if (empty($current_group)) {
-							throw new Exception(_s('No permissions for group "%1$s".', $group['name']));
-						}
+					$hostGroup = API::HostGroup()->get(array(
+						'output' => API_OUTPUT_EXTEND,
+						'filter' => $group,
+						'editable' => true,
+						'limit' => 1
+					));
 
-						$host_db['groups'][] = reset($current_group);
+					if ($hostGroup) {
+						$host_db['groups'][] = reset($hostGroup);
 					}
 					else {
-						$result = API::HostGroup()->create($group);
-						if (!$result) {
-							throw new Exception();
-						}
-
-						$options = array(
-							'groupids' => $result['groupids'],
-							'output' => API_OUTPUT_EXTEND
-						);
-						$new_group = API::HostGroup()->get($options);
+						if ($rules['groups']['createMissing']) {
+							$result = API::HostGroup()->create($group);
+							if ($result) {
+								$newHostGroup = API::HostGroup()->get(array(
+									'output' => API_OUTPUT_EXTEND,
+									'groupids' => $result['groupids'],
+									'limit' => 1
+								));
 
-						$host_db['groups'][] = reset($new_group);
+								$host_db['groups'][] = reset($newHostGroup);
+							}
+						}
+						else {
+							throw new Exception(_s('No permissions for host group "%1$s".', $group['name']));
+						}
 					}
 				}
 // }}} HOST GROUPS
 
-
 // MACROS
 				$macros = $xpath->query('macros/macro', $host);
 				if ($macros->length > 0) {
@@ -1086,7 +1111,7 @@ class CXmlImport18 {
 // }}} MACROS
 
 				// host inventory
-				if ($old_version_input) {
+				if ($oldVersionInput) {
 					if (!isset($host_db['inventory'])) {
 						$host_db['inventory'] = array();
 					}
@@ -1113,10 +1138,11 @@ class CXmlImport18 {
 						}
 					}
 
-					$host_db['inventory_mode'] = isset($host_db['inventory']) ? HOST_INVENTORY_MANUAL : HOST_INVENTORY_DISABLED;
+					$host_db['inventory_mode'] = isset($host_db['inventory'])
+						? HOST_INVENTORY_MANUAL
+						: HOST_INVENTORY_DISABLED;
 				}
 
-// HOSTS
 				if (isset($host_db['proxy_hostid'])) {
 					$proxy_exists = API::Proxy()->get(array(
 						'output' => array('proxyid'),
@@ -1127,7 +1153,7 @@ class CXmlImport18 {
 					}
 				}
 
-				if ($current_host && (!empty($rules['hosts']['updateExisting']) || !empty($rules['templates']['updateExisting']))) {
+				if ($current_host && ($rules['hosts']['updateExisting'] || $rules['templates']['updateExisting'])) {
 					if ($host_db['status'] == HOST_STATUS_TEMPLATE) {
 						$host_db['templateid'] = $current_host['templateid'];
 						$result = API::Template()->update($host_db);
@@ -1138,28 +1164,306 @@ class CXmlImport18 {
 						$result = API::Host()->update($host_db);
 						$current_hostid = $current_host['hostid'];
 					}
-					if (!$result) {
-						throw new Exception();
-					}
 				}
-				if (!$current_host && (!empty($rules['hosts']['createMissing']) || !empty($rules['templates']['createMissing']))) {
 
+				if (!$current_host && ($rules['hosts']['createMissing'] || $rules['templates']['createMissing'])) {
 					if ($host_db['status'] == HOST_STATUS_TEMPLATE) {
 						$result = API::Template()->create($host_db);
-						if (!$result) {
-							throw new Exception();
-						}
 						$current_hostid = reset($result['templateids']);
 					}
 					else {
 						$result = API::Host()->create($host_db);
-						if (!$result) {
-							throw new Exception();
-						}
 						$current_hostid = reset($result['hostids']);
 					}
 				}
-				$current_hostname = $host_db['host'];
+
+				// store parsed host IDs
+				$processedHostIds[$host_db['host']] = $current_hostid;
+			}
+
+			// gather triggers and convert old expressions
+			$triggersXML = array();
+
+			// cycle each host and gather trigger descriptions and expressions
+			foreach ($hosts as $host) {
+				$host_db = self::mapXML2arr($host, XML_TAG_HOST);
+
+				$current_hostid = isset($processedHostIds[$host_db['host']])
+					? $processedHostIds[$host_db['host']]
+					: false;
+
+				if ($current_hostid) {
+					$triggersXML[$current_hostid] = array();
+					$triggerExpressions[$host_db['host']] = array();
+
+					$oldVersionInput = ($host_db['status'] != HOST_STATUS_TEMPLATE);
+
+					$triggers = $xpath->query('triggers/trigger', $host);
+					foreach ($triggers as $trigger) {
+						$trigger_db = self::mapXML2arr($trigger, XML_TAG_TRIGGER);
+
+						$oldExpression = $trigger_db['expression'];
+						if (!isset($triggerExpressions[$host_db['host']][$trigger_db['description']])) {
+							$triggerExpressions[$host_db['host']][$trigger_db['description']] = array();
+						}
+
+						if ($oldVersionInput) {
+							$expressionPart = explode(':', $trigger_db['expression']);
+							$keyName = explode(',', $expressionPart[1], 2);
+
+							if (count($keyName) == 2) {
+								$keyValue = explode('.', $keyName[1], 2);
+								$key = $keyName[0].",".$keyValue[0];
+
+								if (in_array($keyName[0], self::$oldKeys)
+										|| in_array($keyName[0], self::$oldKeysPref)) {
+									$trigger_db['expression'] = str_replace($key, self::convertOldSimpleKey($key),
+										$trigger_db['expression']
+									);
+								}
+							}
+						}
+
+						// {HOSTNAME} is here for backward compatibility
+						$trigger_db['expression'] = str_replace('{{HOSTNAME}:', '{'.$host_db['host'].':',
+							$trigger_db['expression']
+						);
+						$trigger_db['expression'] = str_replace('{{HOST.HOST}:', '{'.$host_db['host'].':',
+							$trigger_db['expression']
+						);
+						$trigger_db['expression'] = $triggerExpressionConverter->convert($trigger_db['expression']);
+
+						$triggersXML[$current_hostid][$trigger_db['description']][$trigger_db['expression']] = $trigger_db['expression'];
+
+						$triggerExpressions[$host_db['host']][$trigger_db['description']][$oldExpression] = $trigger_db['expression'];
+					}
+				}
+			}
+
+			// delete missing triggers
+			if ($rules['triggers']['deleteMissing']) {
+				// select triggers from parsed hosts
+				$dbTriggers = API::Trigger()->get(array(
+					'output' => array('triggerid', 'description', 'expression'),
+					'expandExpression' => true,
+					'hostids' => $processedHostIds,
+					'selectHosts' => array('hostid'),
+					'preservekeys' => true,
+					'nopermissions' => true,
+					'inherited' => false,
+					'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
+				));
+
+				// find corresponding trigger ID by description and expression
+				$triggerIdsXML = array();
+				foreach ($dbTriggers as $dbTrigger) {
+					$hostId = reset($dbTrigger['hosts']);
+
+					if (isset($triggersXML[$hostId['hostid']][$dbTrigger['description']][$dbTrigger['expression']])) {
+						$triggerIdsXML[$dbTrigger['triggerid']] = $dbTrigger['triggerid'];
+					}
+				}
+
+				$triggersToDelete = array_diff_key($dbTriggers, $triggerIdsXML);
+				$triggerIdsToDelete = array();
+
+				// check that potentially deletable trigger belongs to same hosts that are in XML
+				// if some triggers belong to more hosts than current XML contains, don't delete them
+				foreach ($triggersToDelete as $triggerId => $trigger) {
+					$triggerHostIds = array_flip(zbx_objectValues($trigger['hosts'], 'hostid'));
+
+					if (!array_diff_key($triggerHostIds, array_flip($processedHostIds))) {
+						$triggerIdsToDelete[] = $triggerId;
+					}
+				}
+
+				if ($triggerIdsToDelete) {
+					API::Trigger()->delete($triggerIdsToDelete);
+				}
+			}
+
+			// delete missing graphs
+			if ($rules['graphs']['deleteMissing']) {
+				$graphsXML = array();
+
+				// cycle each host and gather all graph names
+				foreach ($hosts as $host) {
+					$host_db = self::mapXML2arr($host, XML_TAG_HOST);
+
+					$current_hostid = isset($processedHostIds[$host_db['host']])
+						? $processedHostIds[$host_db['host']]
+						: false;
+
+					if ($current_hostid) {
+						$graphsXML[$current_hostid] = array();
+
+						$graphs = $xpath->query('graphs/graph', $host);
+
+						foreach ($graphs as $graph) {
+							$graph_db = self::mapXML2arr($graph, XML_TAG_GRAPH);
+
+							$graphsXML[$current_hostid][$graph_db['name']] = $graph_db['name'];
+						}
+					}
+				}
+
+				// select graphs from already parsed hosts
+				$dbGraphs = API::Graph()->get(array(
+					'output' => array('graphid', 'name'),
+					'hostids' => $processedHostIds,
+					'selectHosts' => array('hostid'),
+					'preservekeys' => true,
+					'nopermissions' => true,
+					'inherited' => false,
+					'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
+				));
+
+				$graphIdsXML = array();
+				foreach ($dbGraphs as $dbGraph) {
+					$hostId = reset($dbGraph['hosts']);
+
+					if (isset($graphsXML[$hostId['hostid']][$dbGraph['name']])) {
+						$graphIdsXML[$dbGraph['graphid']] = $dbGraph['graphid'];
+					}
+				}
+
+				$graphsToDelete = array_diff_key($dbGraphs, $graphIdsXML);
+				$graphsIdsToDelete = array();
+
+				// check that potentially deletable graph belongs to same hosts that are in XML
+				// if some graphs belong to more hosts than current XML contains, don't delete them
+				foreach ($graphsToDelete as $graphId => $graph) {
+					$graphHostIds = array_flip(zbx_objectValues($graph['hosts'], 'hostid'));
+
+					if (!array_diff_key($graphHostIds, array_flip($processedHostIds))) {
+						$graphsIdsToDelete[] = $graphId;
+					}
+				}
+
+				if ($graphsIdsToDelete) {
+					API::Graph()->delete($graphsIdsToDelete);
+				}
+			}
+
+			// gather items and convert old keys
+			$itemsXML = array();
+
+			foreach ($hosts as $host) {
+				$host_db = self::mapXML2arr($host, XML_TAG_HOST);
+
+				$current_hostid = isset($processedHostIds[$host_db['host']])
+					? $processedHostIds[$host_db['host']]
+					: false;
+
+				if ($current_hostid) {
+					$itemsXML[$current_hostid] = array();
+					$itemKeys[$host_db['host']] = array();
+
+					$oldVersionInput = ($host_db['status'] != HOST_STATUS_TEMPLATE);
+
+					$items = $xpath->query('items/item', $host);
+
+					foreach ($items as $item) {
+						$item_db = self::mapXML2arr($item, XML_TAG_ITEM);
+
+						if ($oldVersionInput) {
+							$oldKey = $item_db['key_'];
+							$item_db['key_'] = self::convertOldSimpleKey($item_db['key_']);
+							$itemKeys[$host_db['host']][$oldKey] = $item_db['key_'];
+						}
+
+						$itemsXML[$current_hostid][$item_db['key_']] = $item_db['key_'];
+					}
+				}
+			}
+
+			// delete missing items
+			if ($rules['items']['deleteMissing']) {
+				$dbItems = API::Item()->get(array(
+					'output' => array('itemid', 'key_', 'hostid'),
+					'hostids' => $processedHostIds,
+					'preservekeys' => true,
+					'nopermissions' => true,
+					'inherited' => false,
+					'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
+				));
+
+				$itemIdsXML = array();
+				foreach ($dbItems as $dbItem) {
+					if (isset($itemsXML[$dbItem['hostid']][$dbItem['key_']])) {
+						$itemIdsXML[$dbItem['itemid']] = $dbItem['itemid'];
+					}
+				}
+
+				$itemsToDelete = array_diff_key($dbItems, $itemIdsXML);
+
+				if ($itemsToDelete) {
+					API::Item()->delete(array_keys($itemsToDelete));
+				}
+			}
+
+			// delete missing applications
+			if ($rules['applications']['deleteMissing']) {
+				$applicationsXML = array();
+
+				foreach ($hosts as $host) {
+					$host_db = self::mapXML2arr($host, XML_TAG_HOST);
+
+					$current_hostid = isset($processedHostIds[$host_db['host']])
+						? $processedHostIds[$host_db['host']]
+						: false;
+
+					if ($current_hostid) {
+						$items = $xpath->query('items/item', $host);
+
+						foreach ($items as $item) {
+							$applications = $xpath->query('applications/application', $item);
+
+							foreach ($applications as $application) {
+								$applicationsXML[$current_hostid][$application->nodeValue] = $application->nodeValue;
+							}
+						}
+					}
+				}
+
+				$dbApplications = API::Application()->get(array(
+					'output' => array('applicationid', 'hostid', 'name'),
+					'hostids' => $processedHostIds,
+					'preservekeys' => true,
+					'nopermissions' => true,
+					'inherited' => false
+				));
+
+				$applicationsIdsXML = array();
+				foreach ($dbApplications as $dbApplication) {
+					if (isset($applicationsXML[$dbApplication['hostid']][$dbApplication['name']])) {
+						$applicationsIdsXML[$dbApplication['applicationid']] = $dbApplication['applicationid'];
+					}
+				}
+
+				$applicationsToDelete = array_diff_key($dbApplications, $applicationsIdsXML);
+				if ($applicationsToDelete) {
+					API::Application()->delete(array_keys($applicationsToDelete));
+				}
+			}
+
+			// cycle each host again and create/update other objects
+			foreach ($hosts as $host) {
+				$host_db = self::mapXML2arr($host, XML_TAG_HOST);
+
+				if (!isset($host_db['status'])) {
+					$host_db['status'] = HOST_STATUS_TEMPLATE;
+				}
+
+				$current_hostid = isset($processedHostIds[$host_db['host']])
+					? $processedHostIds[$host_db['host']]
+					: false;
+
+				if (!$current_hostid) {
+					continue;
+				}
+
+				$oldVersionInput = ($host_db['status'] != HOST_STATUS_TEMPLATE);
 
 // TEMPLATES {{{
 				if (!empty($rules['templateLinkage']['createMissing'])) {
@@ -1195,34 +1499,18 @@ class CXmlImport18 {
 // }}} TEMPLATES
 
 // ITEMS {{{
-				if (!empty($rules['items']['updateExisting']) || !empty($rules['items']['createMissing'])) {
+				if ($rules['items']['updateExisting']
+						|| $rules['items']['createMissing']
+						|| $rules['applications']['createMissing']) {
+					// applications are located under items in version 1.8,
+					// so we need to get item list in any of these cases
 					$items = $xpath->query('items/item', $host);
 
-					// if this is an export from 1.8, we need to make some adjustments to items
-					if ($old_version_input) {
-						if (!$interfaces_created_with_host) {
-							// if host had another interfaces, we are not touching them: they remain as is
-							foreach ($interfaces as $i => $interface) {
-								// interface was not already created
-								if (!isset($interface['interfaceid'])) {
-									// creating interface
-									$interface['hostid'] = $current_hostid;
-									$ids = API::HostInterface()->create($interface);
-									if ($ids === false) {
-										throw new Exception();
-									}
-									$interfaces[$i]['interfaceid'] = reset($ids['interfaceids']);
-								}
-							}
-						}
-						else {
-							$options = array(
-								'hostids' => $current_hostid,
-								'output' => API_OUTPUT_EXTEND
-							);
-							$interfaces = API::HostInterface()->get($options);
-						}
-
+					if ($oldVersionInput) {
+						$interfaces = API::HostInterface()->get(array(
+							'hostids' => $current_hostid,
+							'output' => API_OUTPUT_EXTEND
+						));
 
 						// we must know interface ids to assign them to items
 						$agent_interface_id = null;
@@ -1244,80 +1532,76 @@ class CXmlImport18 {
 						}
 					}
 
+					// if this is an export from 1.8, we need to make some adjustments to items
+					// cycle each XML item
 					foreach ($items as $item) {
-						$item_db = self::mapXML2arr($item, XML_TAG_ITEM);
-						$item_db['hostid'] = $current_hostid;
-
-						// item needs interfaces
-						if ($old_version_input) {
-							// 'snmp_port' column was renamed to 'port'
-							if ($item_db['snmp_port'] != 0) {
-								// zabbix agent items have no ports
-								$item_db['port'] = $item_db['snmp_port'];
-							}
-							unset($item_db['snmp_port']);
-
-							// assigning appropriate interface depending on item type
-							switch ($item_db['type']) {
-								// zabbix agent interface
-								case ITEM_TYPE_ZABBIX:
-								case ITEM_TYPE_SIMPLE:
-								case ITEM_TYPE_EXTERNAL:
-								case ITEM_TYPE_SSH:
-								case ITEM_TYPE_TELNET:
-									$item_db['interfaceid'] = $agent_interface_id;
-									break;
-								// snmp interface
-								case ITEM_TYPE_SNMPV1:
-								case ITEM_TYPE_SNMPV2C:
-								case ITEM_TYPE_SNMPV3:
-									// for an item with different port - different interface
-									$item_db['interfaceid'] = $snmp_interfaces[$item_db['port']];
-									break;
-								case ITEM_TYPE_IPMI:
-									$item_db['interfaceid'] = $ipmi_interface_id;
-									break;
-								// no interfaces required for these item types
-								case ITEM_TYPE_HTTPTEST:
-								case ITEM_TYPE_CALCULATED:
-								case ITEM_TYPE_AGGREGATE:
-								case ITEM_TYPE_INTERNAL:
-								case ITEM_TYPE_ZABBIX_ACTIVE:
-								case ITEM_TYPE_TRAPPER:
-								case ITEM_TYPE_DB_MONITOR:
-									$item_db['interfaceid'] = null;
-									break;
-							}
-
-							$item_db['key_'] = self::convertOldSimpleKey($item_db['key_']);
-						}
+						if ($rules['items']['updateExisting'] || $rules['items']['createMissing']) {
+							$item_db = self::mapXML2arr($item, XML_TAG_ITEM);
+							$item_db['hostid'] = $current_hostid;
+
+							// item needs interfaces
+							if ($oldVersionInput) {
+								// 'snmp_port' column was renamed to 'port'
+								if ($item_db['snmp_port'] != 0) {
+									// zabbix agent items have no ports
+									$item_db['port'] = $item_db['snmp_port'];
+								}
+								unset($item_db['snmp_port']);
+
+								// assigning appropriate interface depending on item type
+								switch ($item_db['type']) {
+									// zabbix agent interface
+									case ITEM_TYPE_ZABBIX:
+									case ITEM_TYPE_SIMPLE:
+									case ITEM_TYPE_EXTERNAL:
+									case ITEM_TYPE_SSH:
+									case ITEM_TYPE_TELNET:
+										$item_db['interfaceid'] = $agent_interface_id;
+										break;
+									// snmp interface
+									case ITEM_TYPE_SNMPV1:
+									case ITEM_TYPE_SNMPV2C:
+									case ITEM_TYPE_SNMPV3:
+										// for an item with different port - different interface
+										$item_db['interfaceid'] = $snmp_interfaces[$item_db['port']];
+										break;
+									case ITEM_TYPE_IPMI:
+										$item_db['interfaceid'] = $ipmi_interface_id;
+										break;
+									// no interfaces required for these item types
+									case ITEM_TYPE_HTTPTEST:
+									case ITEM_TYPE_CALCULATED:
+									case ITEM_TYPE_AGGREGATE:
+									case ITEM_TYPE_INTERNAL:
+									case ITEM_TYPE_ZABBIX_ACTIVE:
+									case ITEM_TYPE_TRAPPER:
+									case ITEM_TYPE_DB_MONITOR:
+										$item_db['interfaceid'] = null;
+										break;
+								}
 
-						$current_item = API::Item()->get(array(
-							'filter' => array(
-								'hostid' => $item_db['hostid'],
-								'key_' => $item_db['key_']
-							),
-							'webitems' => true,
-							'editable' => true,
-							'output' => array('itemid')
-						));
-						$current_item = reset($current_item);
+								$item_db['key_'] = $itemKeys[$host_db['host']][$item_db['key_']];
+							}
 
-						if (!$current_item && empty($rules['items']['createMissing'])) {
-							info(_s('Item "%1$s" skipped - user rule.', $item_db['key_']));
-							continue; // break if not update updateExisting
-						}
-						if ($current_item && empty($rules['items']['updateExisting'])) {
-							info(_s('Item "%1$s" skipped - user rule.', $item_db['key_']));
-							continue; // break if not update updateExisting
+							$current_item = API::Item()->get(array(
+								'filter' => array(
+									'hostid' => $item_db['hostid'],
+									'key_' => $item_db['key_']
+								),
+								'webitems' => true,
+								'editable' => true,
+								'output' => array('itemid')
+							));
+							$current_item = reset($current_item);
 						}
 
-
-// ITEM APPLICATIONS {{{
+						// create applications independently of create or update item options
+						// in case we update items, we need to assign items to applications,
+						// so we also gather application IDs independetly of selected application options
 						$applications = $xpath->query('applications/application', $item);
 
-						$item_applications = array();
-						$applications_to_add = array();
+						$itemApplications = array();
+						$applicationsToAdd = array();
 						$applicationsIds = array();
 
 						foreach ($applications as $application) {
@@ -1334,184 +1618,168 @@ class CXmlImport18 {
 							$applicationValue = reset($current_application);
 
 							if ($current_application) {
-								if (empty($item_applications)) {
-									$item_applications = $current_application;
-									$applicationsIds[] = $applicationValue['applicationid'];
+								if (!$itemApplications) {
+									$itemApplications = $current_application;
 								}
-								else {
-									if (!in_array($applicationValue['applicationid'], $applicationsIds)) {
-										$item_applications = array_merge($item_applications, $current_application);
-										$applicationsIds[] = $applicationValue['applicationid'];
-									}
+								elseif (!in_array($applicationValue['applicationid'], $applicationsIds)) {
+									$itemApplications = array_merge($itemApplications, $current_application);
 								}
+								$applicationsIds[] = $applicationValue['applicationid'];
 							}
 							else {
-								$applications_to_add[] = $application_db;
+								$applicationsToAdd[] = $application_db;
 							}
 						}
 
-						if (!empty($applications_to_add)) {
-							$result = API::Application()->create($applications_to_add);
-							if (!$result) {
-								throw new Exception();
-							}
+						if ($applicationsToAdd && $rules['applications']['createMissing']) {
+							$result = API::Application()->create($applicationsToAdd);
 
-							$options = array(
+							$newApplications = API::Application()->get(array(
 								'applicationids' => $result['applicationids'],
 								'output' => API_OUTPUT_EXTEND
-							);
-							$new_applications = API::Application()->get($options);
+							));
 
-							$item_applications = array_merge($item_applications, $new_applications);
+							$itemApplications = array_merge($itemApplications, $newApplications);
 						}
-// }}} ITEM APPLICATIONS
 
-						if ($current_item && !empty($rules['items']['updateExisting'])) {
-							$item_db['itemid'] = $current_item['itemid'];
-							$result = API::Item()->update($item_db);
-							if (!$result) {
-								throw new Exception();
+						if ($rules['items']['updateExisting'] || $rules['items']['createMissing']) {
+							// if item does not exist and there is no need to create it, skip item creation
+							if (!$current_item && !$rules['items']['createMissing']) {
+								info(_s('Item "%1$s" skipped - user rule.', $item_db['key_']));
+								continue;
 							}
 
-							$current_item = API::Item()->get(array(
-								'itemids' => $result['itemids'],
-								'webitems' => true,
-								'output' => array('itemid')
-							));
-						}
+							// if item exists, but there there is no need for update, skip item update
+							if ($current_item && !$rules['items']['updateExisting']) {
+								info(_s('Item "%1$s" skipped - user rule.', $item_db['key_']));
+								continue;
+							}
+
+							if ($current_item && $rules['items']['updateExisting']) {
+								$item_db['itemid'] = $current_item['itemid'];
+								$result = API::Item()->update($item_db);
 
-						if (!$current_item && !empty($rules['items']['createMissing'])) {
-							$result = API::Item()->create($item_db);
-							if (!$result) {
-								throw new Exception();
+								$current_item = API::Item()->get(array(
+									'itemids' => $result['itemids'],
+									'webitems' => true,
+									'output' => array('itemid')
+								));
 							}
 
-							$current_item = API::Item()->get(array(
-								'itemids' => $result['itemids'],
-								'webitems' => true,
-								'output' => array('itemid')
-							));
-						}
+							if (!$current_item && $rules['items']['createMissing']) {
+								$result = API::Item()->create($item_db);
 
-						if (!empty($item_applications)) {
-							$r = API::Application()->massAdd(array(
-								'applications' => $item_applications,
-								'items' => $current_item
-							));
-							if ($r === false) {
-								throw new Exception();
+								$current_item = API::Item()->get(array(
+									'itemids' => $result['itemids'],
+									'webitems' => true,
+									'output' => array('itemid')
+								));
+							}
+
+							// after items are created or updated, see to if items need to assigned to applications
+							if (isset($itemApplications) && $itemApplications) {
+								API::Application()->massAdd(array(
+									'applications' => $itemApplications,
+									'items' => $current_item
+								));
 							}
 						}
 					}
 				}
 // }}} ITEMS
 
-
 // TRIGGERS {{{
-				if (!empty($rules['triggers']['updateExisting']) || !empty($rules['triggers']['createMissing'])) {
+				if ($rules['triggers']['updateExisting'] || $rules['triggers']['createMissing']) {
 					$triggers = $xpath->query('triggers/trigger', $host);
 
-					$triggers_to_add = array();
-					$triggers_to_upd = array();
+					$triggersToCreate = array();
+					$triggersToUpdate = array();
 
 					foreach ($triggers as $trigger) {
 						$trigger_db = self::mapXML2arr($trigger, XML_TAG_TRIGGER);
 
-						if ($old_version_input) {
-							$expressionPart = explode(':', $trigger_db['expression']);
-							$keyName = explode(',', $expressionPart[1], 2);
-
-							if (count($keyName) == 2) {
-								$keyValue = explode('.', $keyName[1], 2);
-								$key = $keyName[0].",".$keyValue[0];
-
-								if (in_array($keyName[0], self::$oldKeys) || in_array($keyName[0], self::$oldKeysPref)) {
-									$trigger_db['expression'] = str_replace($key, self::convertOldSimpleKey($key), $trigger_db['expression']);
-								}
-							}
-						}
-
-						// {HOSTNAME} is here for backward compatibility
-						$trigger_db['expression'] = str_replace('{{HOSTNAME}:', '{'.$host_db['host'].':', $trigger_db['expression']);
-						$trigger_db['expression'] = str_replace('{{HOST.HOST}:', '{'.$host_db['host'].':', $trigger_db['expression']);
+						$trigger_db['expression'] = $triggerExpressions[$host_db['host']][$trigger_db['description']][$trigger_db['expression']];
 						$trigger_db['hostid'] = $current_hostid;
 
-						if ($current_trigger = API::Trigger()->exists($trigger_db)) {
-							$ctriggers = API::Trigger()->get(array(
-								'filter' => array(
-									'description' => $trigger_db['description']
-								),
-								'hostids' => $current_hostid,
+						$currentTrigger = API::Trigger()->get(array(
+							'output' => array('triggerid'),
+							'filter' => array('description' => $trigger_db['description']),
+							'hostids' => array($current_hostid),
+							'selectHosts' => array('hostid'),
+							'nopermissions' => true,
+							'limit' => 1,
+						));
+						$currentTrigger = reset($currentTrigger);
+
+						if ($currentTrigger) {
+							$dbTriggers = API::Trigger()->get(array(
 								'output' => API_OUTPUT_EXTEND,
-								'editable' => 1
+								'filter' => array('description' => $trigger_db['description']),
+								'hostids' => array($current_hostid),
+								'editable' => true
 							));
 
-							$current_trigger = false;
-							foreach ($ctriggers as $ct) {
-								$tmp_exp = explode_exp($ct['expression']);
-								if (strcmp($trigger_db['expression'], $tmp_exp) == 0) {
-									$current_trigger = $ct;
+							foreach ($dbTriggers as $dbTrigger) {
+								$expression = explode_exp($dbTrigger['expression']);
+
+								if (strcmp($trigger_db['expression'], $expression) == 0) {
+									$currentTrigger = $dbTrigger;
 									break;
 								}
-							}
-							if (!$current_trigger) {
-								throw new Exception(_s('No permission for trigger "%s".', $trigger_db['description']));
+
+								if (!$currentTrigger) {
+									throw new Exception(_s('No permission for trigger "%1$s".',
+										$trigger_db['description']
+									));
+								}
 							}
 						}
 						unset($trigger_db['hostid']);
 
-
-						if (!$current_trigger && empty($rules['triggers']['createMissing'])) {
+						if (!$currentTrigger && !$rules['triggers']['createMissing']) {
 							info(_s('Trigger "%1$s" skipped - user rule.', $trigger_db['description']));
-							continue; // break if not update updateExisting
+							continue;
 						}
-						if ($current_trigger && empty($rules['triggers']['updateExisting'])) {
+						if ($currentTrigger && !$rules['triggers']['updateExisting']) {
 							info(_s('Trigger "%1$s" skipped - user rule.', $trigger_db['description']));
-							continue; // break if not update updateExisting
+							continue;
 						}
 
-						if ($current_trigger && !empty($rules['triggers']['updateExisting'])) {
-							$trigger_db['triggerid'] = $current_trigger['triggerid'];
-							$triggers_to_upd[] = $trigger_db;
+						if (!$currentTrigger && $rules['triggers']['createMissing']) {
+							$triggersToCreate[] = $trigger_db;
 						}
-						if (!$current_trigger && !empty($rules['triggers']['createMissing'])) {
-							$triggers_to_add[] = $trigger_db;
+						if ($currentTrigger && $rules['triggers']['updateExisting']) {
+							$trigger_db['triggerid'] = $currentTrigger['triggerid'];
+							$triggersToUpdate[] = $trigger_db;
 						}
 					}
 
-					if (!empty($triggers_to_upd)) {
-						$result = API::Trigger()->update($triggers_to_upd);
-						if (!$result) {
-							throw new Exception();
-						}
+					if ($triggersToUpdate) {
+						$result = API::Trigger()->update($triggersToUpdate);
 
-						$options = array(
-							'triggerids' => $result['triggerids'],
-							'output' => API_OUTPUT_EXTEND
-						);
-						$r = API::Trigger()->get($options);
+						$triggersUpdated = API::Trigger()->get(array(
+							'output' => API_OUTPUT_EXTEND,
+							'triggerids' => $result['triggerids']
+						));
 
-						$triggersForDependencies = array_merge($triggersForDependencies, $r);
+						$triggersForDependencies = array_merge($triggersForDependencies, $triggersUpdated);
 					}
-					if (!empty($triggers_to_add)) {
-						$result = API::Trigger()->create($triggers_to_add);
-						if (!$result) {
-							throw new Exception();
-						}
 
-						$options = array(
-							'triggerids' => $result['triggerids'],
-							'output' => API_OUTPUT_EXTEND
-						);
-						$r = API::Trigger()->get($options);
-						$triggersForDependencies = array_merge($triggersForDependencies, $r);
+					if ($triggersToCreate) {
+						$result = API::Trigger()->create($triggersToCreate);
+
+						$triggersCreated = API::Trigger()->get(array(
+							'output' => API_OUTPUT_EXTEND,
+							'triggerids' => $result['triggerids']
+						));
+
+						$triggersForDependencies = array_merge($triggersForDependencies, $triggersCreated);
 					}
 				}
 // }}} TRIGGERS
 
-
 // GRAPHS {{{
-				if (!empty($rules['graphs']['updateExisting']) || !empty($rules['graphs']['createMissing'])) {
+				if ($rules['graphs']['updateExisting'] || $rules['graphs']['createMissing']) {
 					$graphs = $xpath->query('graphs/graph', $host);
 
 					$graphs_to_add = array();
@@ -1530,12 +1798,19 @@ class CXmlImport18 {
 							// {HOSTNAME} is here for backward compatibility
 							$gitem_db['host'] = ($gitem_host == '{HOSTNAME}') ? $host_db['host'] : $gitem_host;
 							$gitem_db['host'] = ($gitem_host == '{HOST.HOST}') ? $host_db['host'] : $gitem_host;
-							if ($old_version_input) {
+							if ($oldVersionInput) {
 								$data[0] = self::convertOldSimpleKey($data[0]);
 							}
 							$gitem_db['key_'] = implode(':', $data);
 
-							if ($current_item = API::Item()->exists($gitem_db)) {
+							$itemExists = API::Item()->get(array(
+								'output' => array('itemid'),
+								'filter' => array('key_' => $gitem_db['key_']),
+								'webitems' => true,
+								'nopermissions' => true,
+								'limit' => 1
+							));
+							if ($itemExists) {
 								$current_item = API::Item()->get(array(
 									'filter' => array('key_' => $gitem_db['key_']),
 									'webitems' => true,
@@ -1543,6 +1818,7 @@ class CXmlImport18 {
 									'host' => $gitem_db['host'],
 									'output' => array('itemid', 'hostid')
 								));
+
 								if (empty($current_item)) {
 									throw new Exception(_s('No permission for item "%1$s".', $gitem_db['key_']));
 								}
@@ -1561,7 +1837,6 @@ class CXmlImport18 {
 						$graph_db = self::mapXML2arr($graph, XML_TAG_GRAPH);
 						$graph_db['hostids'] = $graph_hostids;
 
-
 						// do we need to show the graph legend, after it is imported?
 						// in 1.8, this setting was present only for pie and exploded graphs
 						// for other graph types we are always showing the legend
@@ -1569,14 +1844,21 @@ class CXmlImport18 {
 							$graph_db['show_legend'] = 1;
 						}
 
-						$current_graph = API::Graph()->exists($graph_db);
+						$current_graph = API::Graph()->get(array(
+							'output' => array('graphid'),
+							'selectHosts' => array('hostid', 'host'),
+							'hostids' => $graph_db['hostids'],
+							'filter' => array('name' => $graph_db['name']),
+							'nopermissions' => true,
+							'limit' => 1
+						));
 
 						if ($current_graph) {
 							$current_graph = API::Graph()->get(array(
-								'filter' => array('name' => $graph_db['name']),
-								'hostids' => $graph_db['hostids'],
 								'output' => API_OUTPUT_EXTEND,
-								'editable' => 1
+								'hostids' => $graph_db['hostids'],
+								'filter' => array('name' => $graph_db['name']),
+								'editable' => true
 							));
 
 							if (empty($current_graph)) {
@@ -1640,109 +1922,12 @@ class CXmlImport18 {
 					}
 
 					if (!empty($graphs_to_add)) {
-						$r = API::Graph()->create($graphs_to_add);
-						if ($r === false) {
-							throw new Exception();
-						}
+						API::Graph()->create($graphs_to_add);
 					}
 					if (!empty($graphs_to_upd)) {
-						$r = API::Graph()->update($graphs_to_upd);
-						if ($r === false) {
-							throw new Exception();
-						}
-					}
-				}
-
-// SCREENS
-				if (!empty($rules['screens']['updateExisting']) || !empty($rules['screens']['createMissing'])) {
-					$screens_node = $xpath->query('screens', $host);
-
-					if ($screens_node->length > 0) {
-						$importScreens = self::XMLtoArray($screens_node->item(0));
-
-						foreach ($importScreens as $screen) {
-
-							$current_screen = API::TemplateScreen()->get(array(
-								'filter' => array('name' => $screen['name']),
-								'templateids' => $current_hostid,
-								'output' => API_OUTPUT_EXTEND,
-								'editable' => 1,
-							));
-							$current_screen = reset($current_screen);
-
-							if (!$current_screen && empty($rules['screens']['createMissing'])) {
-								info(_s('Screen "%1$s" skipped - user rule.', $screen['name']));
-								continue;
-							}
-							if ($current_screen && empty($rules['screens']['updateExisting'])) {
-								info(_s('Screen "%1$s" skipped - user rule.', $screen['name']));
-								continue;
-							}
-
-							if (isset($screen['screenitems'])) {
-								foreach ($screen['screenitems'] as &$screenitem) {
-									if (!isset($screenitem['resourceid'])) {
-										$screenitem['resourceid'] = 0;
-									}
-
-									if (is_array($screenitem['resourceid'])) {
-										switch ($screenitem['resourcetype']) {
-											case SCREEN_RESOURCE_GRAPH:
-												$db_graphs = API::Graph()->getObjects($screenitem['resourceid']);
-
-												if (empty($db_graphs)) {
-													$error = _s('Cannot find graph "%1$s" used in screen "%2$s".',
-															$screenitem['resourceid']['host'].':'.$screenitem['resourceid']['name'], $screen['name']);
-													throw new Exception($error);
-												}
-
-												$tmp = reset($db_graphs);
-												$screenitem['resourceid'] = $tmp['graphid'];
-												break;
-											case SCREEN_RESOURCE_SIMPLE_GRAPH:
-											case SCREEN_RESOURCE_PLAIN_TEXT:
-												$db_items = API::Item()->getObjects($screenitem['resourceid']);
-
-												if (empty($db_items)) {
-													$error = _s('Cannot find item "%1$s" used in screen "%2$s".',
-															$screenitem['resourceid']['host'].':'.$screenitem['resourceid']['key_'], $screen['name']);
-													throw new Exception($error);
-												}
-
-												$tmp = reset($db_items);
-												$screenitem['resourceid'] = $tmp['itemid'];
-												break;
-											default:
-												$screenitem['resourceid'] = 0;
-												break;
-										}
-									}
-								}
-							}
-
-							$screen['templateid'] = $current_hostid;
-							if ($current_screen) {
-								$screen['screenid'] = $current_screen['screenid'];
-
-								$result = API::TemplateScreen()->update($screen);
-								if (!$result) {
-									throw new Exception(_('Cannot update screen.'));
-								}
-
-								info('['.$current_hostname.'] '._s('Screen "%1$s" updated.', $screen['name']));
-							}
-							else {
-								$result = API::TemplateScreen()->create($screen);
-								if (!$result) {
-									throw new Exception(_('Cannot create screen.'));
-								}
-
-								info('['.$current_hostname.'] '._s('Screen "%1$s" added.', $screen['name']));
-							}
-						}
+						API::Graph()->update($graphs_to_upd);
 					}
 				}
-
 			}
 
 // DEPENDENCIES
diff --git a/frontends/php/include/classes/import/formatters/C20ImportFormatter.php b/frontends/php/include/classes/import/formatters/C20ImportFormatter.php
index 8071ce16736..cc47324ba72 100644
--- a/frontends/php/include/classes/import/formatters/C20ImportFormatter.php
+++ b/frontends/php/include/classes/import/formatters/C20ImportFormatter.php
@@ -24,6 +24,20 @@
  */
 class C20ImportFormatter extends CImportFormatter {
 
+	/**
+	 * Converter for trigger expressions.
+	 *
+	 * @var C24TriggerConverter
+	 */
+	protected $triggerExpressionConverter;
+
+	/**
+	 * @param C24TriggerConverter $triggerExpressionConverter
+	 */
+	public function __construct(C24TriggerConverter $triggerExpressionConverter) {
+		$this->triggerExpressionConverter = $triggerExpressionConverter;
+	}
+
 	public function getGroups() {
 		if (!isset($this->data['groups'])) {
 			return array();
@@ -77,6 +91,11 @@ class C20ImportFormatter extends CImportFormatter {
 
 				if (!empty($host['interfaces'])) {
 					foreach ($host['interfaces'] as $inum => $interface) {
+						// set bulk default value
+						if (!isset($interface['bulk'])) {
+							$interface['bulk'] = SNMP_BULK_ENABLED;
+						}
+
 						$host['interfaces'][$inum] = $this->renameData($interface, array('default' => 'main'));
 					}
 				}
@@ -110,7 +129,6 @@ class C20ImportFormatter extends CImportFormatter {
 
 	public function getApplications() {
 		$applicationsData = array();
-
 		if (isset($this->data['hosts'])) {
 			foreach ($this->data['hosts'] as $host) {
 				if (!empty($host['applications'])) {
@@ -153,6 +171,7 @@ class C20ImportFormatter extends CImportFormatter {
 				}
 			}
 		}
+
 		if (isset($this->data['templates'])) {
 			foreach ($this->data['templates'] as $template) {
 				if (!empty($template['items'])) {
@@ -228,6 +247,8 @@ class C20ImportFormatter extends CImportFormatter {
 			foreach ($this->data['triggers'] as $trigger) {
 				CArrayHelper::convertFieldToArray($trigger, 'dependencies');
 
+				$trigger['expression'] = $this->triggerExpressionConverter->convert($trigger['expression']);
+
 				$triggersData[] = $this->renameTriggerFields($trigger);
 			}
 		}
@@ -352,6 +373,8 @@ class C20ImportFormatter extends CImportFormatter {
 
 		if (!empty($discoveryRule['trigger_prototypes'])) {
 			foreach ($discoveryRule['trigger_prototypes'] as &$trigger) {
+				$trigger['expression'] = $this->triggerExpressionConverter->convert($trigger['expression']);
+
 				$trigger = $this->renameTriggerFields($trigger);
 			}
 			unset($trigger);
diff --git a/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php b/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php
index 5cfa7f01fd0..b305fd504dc 100644
--- a/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php
+++ b/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php
@@ -41,7 +41,15 @@ abstract class CAbstractScreenImporter extends CImporter {
 					$screenItem['resourceid'] = 0;
 					continue;
 				}
-
+				if ($screenItem['rowspan'] == 0) {
+					$screenItem['rowspan'] = 1;
+				}
+				if ($screenItem['colspan'] == 0) {
+					$screenItem['colspan'] = 1;
+				}
+				if (!isset($screenItem['max_columns'])) {
+					$screenItem['max_columns'] = SCREEN_SURROGATE_MAX_COLUMNS_DEFAULT;
+				}
 				switch ($screenItem['resourcetype']) {
 					case SCREEN_RESOURCE_HOSTS_INFO:
 					case SCREEN_RESOURCE_TRIGGERS_INFO:
@@ -64,17 +72,20 @@ abstract class CAbstractScreenImporter extends CImporter {
 						break;
 
 					case SCREEN_RESOURCE_GRAPH:
-						$dbGraphs = API::Graph()->getObjects($resource);
-						if (empty($dbGraphs)) {
+					case SCREEN_RESOURCE_LLD_GRAPH:
+						$hostId = $this->referencer->resolveHostOrTemplate($resource['host']);
+						$graphId = $this->referencer->resolveGraph($hostId, $resource['name']);
+
+						if (!$graphId) {
 							throw new Exception(_s('Cannot find graph "%1$s" used in screen "%2$s".',
 								$resource['name'], $screen['name']));
 						}
 
-						$tmp = reset($dbGraphs);
-						$screenItem['resourceid'] = $tmp['graphid'];
+						$screenItem['resourceid'] = $graphId;
 						break;
 
 					case SCREEN_RESOURCE_SIMPLE_GRAPH:
+					case SCREEN_RESOURCE_LLD_SIMPLE_GRAPH:
 					case SCREEN_RESOURCE_PLAIN_TEXT:
 						$hostId = $this->referencer->resolveHostOrTemplate($resource['host']);
 						$screenItem['resourceid'] = $this->referencer->resolveItem($hostId, $resource['key']);
@@ -104,7 +115,6 @@ abstract class CAbstractScreenImporter extends CImporter {
 						$screenItem['resourceid'] = 0;
 						break;
 				}
-
 			}
 			unset($screenItem);
 		}
diff --git a/frontends/php/include/classes/import/importers/CHostImporter.php b/frontends/php/include/classes/import/importers/CHostImporter.php
index ea1eb60b211..f83d1fdd00a 100644
--- a/frontends/php/include/classes/import/importers/CHostImporter.php
+++ b/frontends/php/include/classes/import/importers/CHostImporter.php
@@ -21,9 +21,22 @@
 
 class CHostImporter extends CImporter {
 
+	/**
+	 * @var array		a list of host IDs which were created or updated to create an interface cache for those hosts
+	 */
+	protected $processedHostIds = array();
+
+	/**
+	 * Import hosts.
+	 *
+	 * @param array $hosts
+	 *
+	 * @throws Exception
+	 */
 	public function import(array $hosts) {
 		$hostsToCreate = array();
 		$hostsToUpdate = array();
+
 		foreach ($hosts as $host) {
 			// preserve host related templates to massAdd them later
 			if ($this->options['templateLinkage']['createMissing'] && !empty($host['templates'])) {
@@ -50,30 +63,28 @@ class CHostImporter extends CImporter {
 
 		$hostsToUpdate = $this->addInterfaceIds($hostsToUpdate);
 
-		// a list of hostids which were created or updated to create an interface cache for those hosts
-		$processedHostIds = array();
 		// create/update hosts
 		if ($this->options['hosts']['createMissing'] && $hostsToCreate) {
 			$newHostIds = API::Host()->create($hostsToCreate);
-			foreach ($newHostIds['hostids'] as $hnum => $hostid) {
+			foreach ($newHostIds['hostids'] as $hnum => $hostId) {
 				$hostHost = $hostsToCreate[$hnum]['host'];
-				$processedHostIds[$hostHost] = $hostid;
-				$this->referencer->addHostRef($hostHost, $hostid);
-				$this->referencer->addProcessedHost($hostHost);
+				$this->processedHostIds[$hostHost] = $hostId;
+
+				$this->referencer->addHostRef($hostHost, $hostId);
 
 				if (!empty($templateLinkage[$hostHost])) {
 					API::Template()->massAdd(array(
-						'hosts' => array('hostid' => $hostid),
+						'hosts' => array('hostid' => $hostId),
 						'templates' => $templateLinkage[$hostHost]
 					));
 				}
 			}
 		}
+
 		if ($this->options['hosts']['updateExisting'] && $hostsToUpdate) {
 			API::Host()->update($hostsToUpdate);
 			foreach ($hostsToUpdate as $host) {
-				$this->referencer->addProcessedHost($host['host']);
-				$processedHostIds[$host['host']] = $host['hostid'];
+				$this->processedHostIds[$host['host']] = $host['hostid'];
 
 				if (!empty($templateLinkage[$host['host']])) {
 					API::Template()->massAdd(array(
@@ -86,13 +97,15 @@ class CHostImporter extends CImporter {
 
 		// create interfaces cache interface_ref->interfaceid
 		$dbInterfaces = API::HostInterface()->get(array(
-			'hostids' => $processedHostIds,
+			'hostids' => $this->processedHostIds,
 			'output' => API_OUTPUT_EXTEND
 		));
+
 		foreach ($hosts as $host) {
-			foreach ($host['interfaces'] as $interface) {
-				if (isset($processedHostIds[$host['host']])) {
-					$hostId = $processedHostIds[$host['host']];
+			if (isset($this->processedHostIds[$host['host']])) {
+				foreach ($host['interfaces'] as $interface) {
+					$hostId = $this->processedHostIds[$host['host']];
+
 					if (!isset($this->referencer->interfacesCache[$hostId])) {
 						$this->referencer->interfacesCache[$hostId] = array();
 					}
@@ -104,8 +117,8 @@ class CHostImporter extends CImporter {
 								&& $dbInterface['useip'] == $interface['useip']
 								&& $dbInterface['port'] == $interface['port']
 								&& $dbInterface['type'] == $interface['type']
-								&& $dbInterface['main'] == $interface['main']) {
-
+								&& $dbInterface['main'] == $interface['main']
+								&& $dbInterface['bulk'] == $interface['bulk']) {
 							$refName = $interface['interface_ref'];
 							$this->referencer->interfacesCache[$hostId][$refName] = $dbInterface['interfaceid'];
 						}
@@ -116,6 +129,15 @@ class CHostImporter extends CImporter {
 	}
 
 	/**
+	 * Get a list of created or updated host IDs.
+	 *
+	 * @return array
+	 */
+	public function getProcessedHostIds() {
+		return $this->processedHostIds;
+	}
+
+	/**
 	 * Change all references in host to database ids.
 	 *
 	 * @throws Exception
@@ -164,39 +186,86 @@ class CHostImporter extends CImporter {
 	/**
 	 * For existing hosts we need to set an interfaceid for existing interfaces or they will be added.
 	 *
-	 * @param array $hosts
+	 * @param array $xmlHosts    hosts from XML for which interfaces will be added
 	 *
 	 * @return array
 	 */
-	protected function addInterfaceIds(array $hosts) {
-
+	protected function addInterfaceIds(array $xmlHosts) {
 		$dbInterfaces = API::HostInterface()->get(array(
-			'hostids' => zbx_objectValues($hosts, 'hostid'),
+			'hostids' => zbx_objectValues($xmlHosts, 'hostid'),
 			'output' => API_OUTPUT_EXTEND,
 			'preservekeys' => true
 		));
+
+		// build lookup maps for:
+		// - interfaces per host
+		// - default (primary) interface ids per host per interface type
+		$dbHostInterfaces = array();
+		$dbHostMainInterfaceIds = array();
+
 		foreach ($dbInterfaces as $dbInterface) {
-			foreach ($hosts as $hnum => $host) {
-				if (!empty($host['interfaces']) && idcmp($host['hostid'], $dbInterface['hostid'])) {
-					foreach ($host['interfaces'] as $inum => $interface) {
-						if ($dbInterface['ip'] == $interface['ip']
-								&& $dbInterface['dns'] == $interface['dns']
-								&& $dbInterface['useip'] == $interface['useip']
-								&& $dbInterface['port'] == $interface['port']
-								&& $dbInterface['type'] == $interface['type']
-								&& $dbInterface['main'] == $interface['main']) {
-							$hosts[$hnum]['interfaces'][$inum]['interfaceid'] = $dbInterface['interfaceid'];
-							break;
-						}
-					}
+			$dbHostId = $dbInterface['hostid'];
+
+			$dbHostInterfaces[$dbHostId][] = $dbInterface;
+			if ($dbInterface['main'] == INTERFACE_PRIMARY) {
+				$dbHostMainInterfaceIds[$dbHostId][$dbInterface['type']] = $dbInterface['interfaceid'];
+			}
+		}
+
+		foreach ($xmlHosts as &$xmlHost) {
+			// if interfaces in XML are empty then do not touch existing interfaces
+			if (!$xmlHost['interfaces']) {
+				unset($xmlHost['interfaces']);
+				continue;
+			}
+
+			$xmlHostId = $xmlHost['hostid'];
+
+			$currentDbHostMainInterfaceIds = isset($dbHostMainInterfaceIds[$xmlHostId])
+				? $dbHostMainInterfaceIds[$xmlHostId]
+				: array();
+
+			$reusedInterfaceIds = array();
+
+			foreach ($xmlHost['interfaces'] as &$xmlHostInterface) {
+				$xmlHostInterfaceType = $xmlHostInterface['type'];
+
+				// check if an existing interfaceid from current host can be reused
+				// in case there is default (primary) interface in current host with same type
+				if ($xmlHostInterface['main'] == INTERFACE_PRIMARY
+						&& isset($currentDbHostMainInterfaceIds[$xmlHostInterfaceType])) {
+					$dbHostInterfaceId = $currentDbHostMainInterfaceIds[$xmlHostInterfaceType];
+
+					$xmlHostInterface['interfaceid'] = $dbHostInterfaceId;
+					$reusedInterfaceIds[$dbHostInterfaceId] = true;
 				}
-				if (empty($hosts[$hnum]['interfaces'])) {
-					unset($hosts[$hnum]['interfaces']);
+			}
+			unset($xmlHostInterface);
+
+			// loop through all interfaces of current host and take interfaceids from ones that
+			// match completely, ignoring hosts from XML with set interfaceids and ignoring hosts
+			// from DB with reused intefaceids
+			foreach ($xmlHost['interfaces'] as &$xmlHostInterface) {
+				foreach ($dbHostInterfaces[$xmlHostId] as $dbHostInterface) {
+					$dbHostInterfaceId = $dbHostInterface['interfaceid'];
+
+					if (!isset($xmlHostInterface['interfaceid']) && !isset($reusedInterfaceIds[$dbHostInterfaceId])
+							&& $dbHostInterface['ip'] == $xmlHostInterface['ip']
+							&& $dbHostInterface['dns'] == $xmlHostInterface['dns']
+							&& $dbHostInterface['useip'] == $xmlHostInterface['useip']
+							&& $dbHostInterface['port'] == $xmlHostInterface['port']
+							&& $dbHostInterface['type'] == $xmlHostInterface['type']
+							&& $dbHostInterface['bulk'] == $xmlHostInterface['bulk']) {
+						$xmlHostInterface['interfaceid'] = $dbHostInterfaceId;
+						$reusedInterfaceIds[$dbHostInterfaceId] = true;
+						break;
+					}
 				}
 			}
+			unset($xmlHostInterface);
 		}
+		unset($xmlHost);
 
-		return $hosts;
+		return $xmlHosts;
 	}
-
 }
diff --git a/frontends/php/include/classes/import/importers/CImporter.php b/frontends/php/include/classes/import/importers/CImporter.php
index b31549a3c13..ac1c3024dc8 100644
--- a/frontends/php/include/classes/import/importers/CImporter.php
+++ b/frontends/php/include/classes/import/importers/CImporter.php
@@ -27,17 +27,25 @@ abstract class CImporter {
 	protected $referencer;
 
 	/**
+	 * @var CImportedObjectContainer
+	 */
+	protected $importedObjectContainer;
+
+	/**
 	 * @var array
 	 */
 	protected $options = array();
 
 	/**
-	 * @param array             $options
-	 * @param CImportReferencer $referencer
+	 * @param array						$options					import options "createMissing", "updateExisting" and "deleteMissing"
+	 * @param CImportReferencer			$referencer					class containing all importable objects
+	 * @param CImportedObjectContainer	$importedObjectContainer	class containing processed host and template IDs
 	 */
-	public function __construct(array $options, CImportReferencer $referencer) {
+	public function __construct(array $options, CImportReferencer $referencer,
+			CImportedObjectContainer $importedObjectContainer) {
 		$this->options = $options;
 		$this->referencer = $referencer;
+		$this->importedObjectContainer = $importedObjectContainer;
 	}
 
 	/**
diff --git a/frontends/php/include/classes/import/importers/CTemplateImporter.php b/frontends/php/include/classes/import/importers/CTemplateImporter.php
index 54a20aee4f6..66bfe82ebd5 100644
--- a/frontends/php/include/classes/import/importers/CTemplateImporter.php
+++ b/frontends/php/include/classes/import/importers/CTemplateImporter.php
@@ -22,6 +22,11 @@
 class CTemplateImporter extends CImporter {
 
 	/**
+	 * @var array		a list of template IDs which were created or updated
+	 */
+	protected $processedTemplateIds = array();
+
+	/**
 	 * Import templates.
 	 *
 	 * @throws Exception
@@ -51,6 +56,7 @@ class CTemplateImporter extends CImporter {
 			$templatesToCreate = array();
 			$templatesToUpdate = array();
 			$templateLinkage = array();
+
 			foreach ($independentTemplates as $name) {
 				$template = $templates[$name];
 				unset($templates[$name]);
@@ -72,26 +78,28 @@ class CTemplateImporter extends CImporter {
 			}
 
 			if ($this->options['templates']['createMissing'] && $templatesToCreate) {
-				$newHostIds = API::Template()->create($templatesToCreate);
+				$newTemplateIds = API::Template()->create($templatesToCreate);
 
 				foreach ($templatesToCreate as $num => $createdTemplate) {
-					$hostId = $newHostIds['templateids'][$num];
-					$this->referencer->addTemplateRef($createdTemplate['host'], $hostId);
-					$this->referencer->addProcessedHost($createdTemplate['host']);
+					$templateId = $newTemplateIds['templateids'][$num];
+
+					$this->referencer->addTemplateRef($createdTemplate['host'], $templateId);
+					$this->processedTemplateIds[$templateId] = $templateId;
 
 					if (!empty($templateLinkage[$createdTemplate['host']])) {
 						API::Template()->massAdd(array(
-							'templates' => array('templateid' => $hostId),
+							'templates' => array('templateid' => $templateId),
 							'templates_link' => $templateLinkage[$createdTemplate['host']]
 						));
 					}
 				}
 			}
+
 			if ($this->options['templates']['updateExisting'] && $templatesToUpdate) {
 				API::Template()->update($templatesToUpdate);
 
 				foreach ($templatesToUpdate as $updatedTemplate) {
-					$this->referencer->addProcessedHost($updatedTemplate['host']);
+					$this->processedTemplateIds[$updatedTemplate['templateid']] = $updatedTemplate['templateid'];
 
 					if (!empty($templateLinkage[$updatedTemplate['host']])) {
 						API::Template()->massAdd(array(
@@ -118,6 +126,15 @@ class CTemplateImporter extends CImporter {
 	}
 
 	/**
+	 * Get a list of created or updated template IDs.
+	 *
+	 * @return array
+	 */
+	public function getProcessedTemplateIds() {
+		return $this->processedTemplateIds;
+	}
+
+	/**
 	 * Check if templates have circular references.
 	 *
 	 * @throws Exception
diff --git a/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php b/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php
index 4a45d69f878..3ea41fac2dc 100644
--- a/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php
+++ b/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php
@@ -26,23 +26,29 @@ class CTemplateScreenImporter extends CAbstractScreenImporter {
 	 *
 	 * @param array $allScreens
 	 *
-	 * @return void
+	 * @return null
 	 */
 	public function import(array $allScreens) {
+		if ((!$this->options['templateScreens']['createMissing']
+				&& !$this->options['templateScreens']['updateExisting']) || !$allScreens) {
+			return;
+		}
+
 		$screensToCreate = array();
 		$screensToUpdate = array();
+
 		foreach ($allScreens as $template => $screens) {
-			// TODO: select all at once out of loop
-			$dbScreens = DBselect('SELECT s.screenid,s.name FROM screens s WHERE'.
-					' s.templateid='.zbx_dbstr($this->referencer->resolveTemplate($template)).
-					' AND '.dbConditionString('s.name', array_keys($screens)));
-			while ($dbScreen = DBfetch($dbScreens)) {
-				$screens[$dbScreen['name']]['screenid'] = $dbScreen['screenid'];
+			$templateId = $this->referencer->resolveTemplate($template);
+
+			if (!$this->importedObjectContainer->isTemplateProcessed($templateId)) {
+				continue;
 			}
 
-			foreach ($screens as $screen) {
+			foreach ($screens as $screenName => $screen) {
+				$screen['screenid'] = $this->referencer->resolveTemplateScreen($templateId, $screenName);
+
 				$screen = $this->resolveScreenReferences($screen);
-				if (isset($screen['screenid'])) {
+				if ($screen['screenid']) {
 					$screensToUpdate[] = $screen;
 				}
 				else {
@@ -53,10 +59,66 @@ class CTemplateScreenImporter extends CAbstractScreenImporter {
 		}
 
 		if ($this->options['templateScreens']['createMissing'] && $screensToCreate) {
-			API::TemplateScreen()->create($screensToCreate);
+			$newScreenIds = API::TemplateScreen()->create($screensToCreate);
+			foreach ($screensToCreate as $num => $newScreen) {
+				$screenId = $newScreenIds['screenids'][$num];
+				$this->referencer->addTemplateScreenRef($newScreen['name'], $screenId);
+			}
 		}
+
 		if ($this->options['templateScreens']['updateExisting'] && $screensToUpdate) {
 			API::TemplateScreen()->update($screensToUpdate);
 		}
 	}
+
+	/**
+	 * Deletes missing template screens.
+	 *
+	 * @param array $allScreens
+	 *
+	 * @return null
+	 */
+	public function delete(array $allScreens) {
+		if (!$this->options['templateScreens']['deleteMissing']) {
+			return;
+		}
+
+		$templateIdsXML = $this->importedObjectContainer->getTemplateIds();
+
+		// no templates have been processed
+		if (!$templateIdsXML) {
+			return;
+		}
+
+		$templateScreenIdsXML = array();
+
+		if ($allScreens) {
+			foreach ($allScreens as $template => $screens) {
+				$templateId = $this->referencer->resolveTemplate($template);
+
+				if ($templateId) {
+					foreach ($screens as $screenName => $screen) {
+						$templateScreenId = $this->referencer->resolveTemplateScreen($templateId, $screenName);
+
+						if ($templateScreenId) {
+							$templateScreenIdsXML[$templateScreenId] = $templateScreenId;
+						}
+					}
+				}
+			}
+		}
+
+		$dbTemplateScreenIds = API::TemplateScreen()->get(array(
+			'output' => array('screenid'),
+			'hostids' => $templateIdsXML,
+			'nopermissions' => true,
+			'preservekeys' => true
+		));
+
+		$templateScreensToDelete = array_diff_key($dbTemplateScreenIds, $templateScreenIdsXML);
+
+		if ($templateScreensToDelete) {
+			API::TemplateScreen()->delete(array_keys($templateScreensToDelete));
+		}
+	}
 }
diff --git a/frontends/php/include/classes/import/readers/CImportReaderFactory.php b/frontends/php/include/classes/import/readers/CImportReaderFactory.php
index aa9f282de8d..0485d80501f 100644
--- a/frontends/php/include/classes/import/readers/CImportReaderFactory.php
+++ b/frontends/php/include/classes/import/readers/CImportReaderFactory.php
@@ -46,7 +46,7 @@ class CImportReaderFactory {
 	}
 
 	/**
-	 * Converts file extenion to associated import format.
+	 * Converts file extension to associated import format.
 	 *
 	 * @static
 	 * @throws Exception
diff --git a/frontends/php/include/classes/import/readers/CJsonImportReader.php b/frontends/php/include/classes/import/readers/CJsonImportReader.php
index ed65d73b020..7285d0192a2 100644
--- a/frontends/php/include/classes/import/readers/CJsonImportReader.php
+++ b/frontends/php/include/classes/import/readers/CJsonImportReader.php
@@ -29,7 +29,7 @@ class CJsonImportReader extends CImportReader {
 	 * @return array
 	 */
 	public function read($string) {
-		$json = new CJSON;
+		$json = new CJson;
 		return $json->decode($string, true);
 	}
 }
diff --git a/frontends/php/include/classes/import/readers/CXmlImportReader.php b/frontends/php/include/classes/import/readers/CXmlImportReader.php
index e5177d4d7c4..c72aa5eb5c2 100644
--- a/frontends/php/include/classes/import/readers/CXmlImportReader.php
+++ b/frontends/php/include/classes/import/readers/CXmlImportReader.php
@@ -32,7 +32,8 @@ class CXmlImportReader extends CImportReader {
 	 */
 	public function read($string) {
 		libxml_use_internal_errors(true);
-		$result = simplexml_load_string($string);
+		libxml_disable_entity_loader(true);
+		$result = simplexml_load_string($string, null, LIBXML_IMPORT_FLAGS);
 		if (!$result) {
 			$errors = libxml_get_errors();
 			libxml_clear_errors();
diff --git a/frontends/php/include/classes/items/CHelpItems.php b/frontends/php/include/classes/items/CHelpItems.php
index bc7b4f09d2b..0bfc3a6e660 100644
--- a/frontends/php/include/classes/items/CHelpItems.php
+++ b/frontends/php/include/classes/items/CHelpItems.php
@@ -114,15 +114,15 @@ class CHelpItems {
 				),
 				array(
 					'key' => 'net.tcp.port[<ip>,port]',
-					'description' => _('Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]')
+					'description' => _('Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]')
 				),
 				array(
 					'key' => 'net.tcp.service[service,<ip>,<port>]',
-					'description' => _('Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45].')
+					'description' => _('Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45].')
 				),
 				array(
 					'key' => 'net.tcp.service.perf[service,<ip>,<port>]',
-					'description' => _('Check performance of service "service". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used.')
+					'description' => _('Check performance of service "service". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used.')
 				),
 				array(
 					'key' => 'net.udp.listen[port]',
@@ -170,7 +170,7 @@ class CHelpItems {
 				),
 				array(
 					'key' => 'system.cpu.util[<cpu>,<type>,<mode>]',
-					'description' => _('CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used.')
+					'description' => _('CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used.')
 				),
 				array(
 					'key' => 'system.hostname[<type>]',
@@ -286,7 +286,7 @@ class CHelpItems {
 				),
 				array(
 					'key' => 'vfs.fs.size[fs,<mode>]',
-					'description' => _('Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].')
+					'description' => _('Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].')
 				),
 				array(
 					'key' => 'vm.memory.size[<mode>]',
@@ -294,15 +294,19 @@ class CHelpItems {
 				),
 				array(
 					'key' => 'web.page.get[host,<path>,<port>]',
-					'description' => _('Get content of WEB page. Default path is /')
+					'description' => _('Get content of web page. Default path is /')
 				),
 				array(
 					'key' => 'web.page.perf[host,<path>,<port>]',
-					'description' => _('Get timing of loading full WEB page. Default path is /')
+					'description' => _('Get timing of loading full web page. Default path is /')
 				),
 				array(
 					'key' => 'web.page.regexp[host,<path>,<port>,<regexp>,<length>]',
-					'description' => _('Get first occurence of regexp in WEB page. Default path is /')
+					'description' => _('Get first occurrence of regexp in web page. Default path is /')
+				),
+				array(
+					'key' => 'wmi.get[<namespace>,<query>]',
+					'description' => _('Execute WMI query and return the first selected object.')
 				)
 			),
 			ITEM_TYPE_ZABBIX_ACTIVE => array(
@@ -372,15 +376,15 @@ class CHelpItems {
 				),
 				array(
 					'key' => 'net.tcp.port[<ip>,port]',
-					'description' => _('Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]')
+					'description' => _('Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]')
 				),
 				array(
 					'key' => 'net.tcp.service.perf[service,<ip>,<port>]',
-					'description' => _('Check performance of service "service". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used.')
+					'description' => _('Check performance of service "service". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used.')
 				),
 				array(
 					'key' => 'net.tcp.service[service,<ip>,<port>]',
-					'description' => _('Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45].')
+					'description' => _('Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45].')
 				),
 				array(
 					'key' => 'net.udp.listen[port]',
@@ -428,7 +432,7 @@ class CHelpItems {
 				),
 				array(
 					'key' => 'system.cpu.util[<cpu>,<type>,<mode>]',
-					'description' => _('CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used.')
+					'description' => _('CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used.')
 				),
 				array(
 					'key' => 'system.hostname[<type>]',
@@ -544,7 +548,7 @@ class CHelpItems {
 				),
 				array(
 					'key' => 'vfs.fs.size[fs,<mode>]',
-					'description' => _('Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].')
+					'description' => _('Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].')
 				),
 				array(
 					'key' => 'vm.memory.size[<mode>]',
@@ -552,15 +556,19 @@ class CHelpItems {
 				),
 				array(
 					'key' => 'web.page.get[host,<path>,<port>]',
-					'description' => _('Get content of WEB page. Default path is /')
+					'description' => _('Get content of web page. Default path is /')
 				),
 				array(
 					'key' => 'web.page.perf[host,<path>,<port>]',
-					'description' => _('Get timing of loading full WEB page. Default path is /')
+					'description' => _('Get timing of loading full web page. Default path is /')
 				),
 				array(
 					'key' => 'web.page.regexp[host,<path>,<port>,<regexp>,<length>,<output>]',
-					'description' => _('Get first occurence of regexp in WEB page. Default path is /')
+					'description' => _('Get first occurrence of regexp in web page. Default path is /')
+				),
+				array(
+					'key' => 'wmi.get[<namespace>,<query>]',
+					'description' => _('Execute WMI query and return the first selected object.')
 				)
 			),
 			ITEM_TYPE_AGGREGATE => array(
@@ -815,6 +823,10 @@ class CHelpItems {
 					'description' => _('Number of values stored in table HISTORY_UINT.')
 				),
 				array(
+					'key' => 'zabbix[host,,maintenance]',
+					'description' => _('Returns current maintenance status of the host.')
+				),
+				array(
 					'key' => 'zabbix[host,<type>,available]',
 					'description' => _('Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx.')
 				),
diff --git a/frontends/php/include/classes/class.cjson.php b/frontends/php/include/classes/json/CJson.php
index 31bda789287..f850195316a 100644
--- a/frontends/php/include/classes/class.cjson.php
+++ b/frontends/php/include/classes/json/CJson.php
@@ -32,7 +32,7 @@
 **
 ** @license http://opensource.org/licenses/bsd-license.php BSD
 **/
-class CJSON {
+class CJson {
 
 	/**
 	 *
@@ -134,7 +134,7 @@ class CJSON {
 	 *
 	 */
 	public function encode($valueToEncode, $deQuote = array(), $forceObject = false) {
-		mb_internal_encoding('ASCII');
+		ini_set('mbstring.internal_encoding', 'ASCII');
 		if (!$this->_config['bypass_ext'] && function_exists('json_encode') && defined('JSON_FORCE_OBJECT')) {
 
 			if ($this->_config['noerror']) {
@@ -158,7 +158,7 @@ class CJSON {
 		if (!empty($deQuote)) {
 			$encoded = $this->_deQuote($encoded, $deQuote);
 		}
-		mb_internal_encoding('UTF-8');
+		ini_set('mbstring.internal_encoding', 'UTF-8');
 
 		return $encoded;
 	}
@@ -245,11 +245,11 @@ class CJSON {
 		$result = null;
 
 		// required for internal parser, it operates with ASCII data
-		mb_internal_encoding('ASCII');
+		ini_set('mbstring.internal_encoding', 'ASCII');
 		if ($this->isValid($encodedValue)) {
 			$result = $this->_json_decode($encodedValue, (bool) $asArray);
 		}
-		mb_internal_encoding('UTF-8');
+		ini_set('mbstring.internal_encoding', 'UTF-8');
 
 		return $result;
 	}
@@ -285,7 +285,7 @@ class CJSON {
 			case 'string':
 				// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
 				$ascii = '';
-				$strlen_var = zbx_strlen($var);
+				$strlen_var = strlen($var);
 
 				/*
 				 * Iterate over every character in the string,
@@ -347,10 +347,10 @@ class CJSON {
 							// characters U-00200000 - U-03FFFFFF, mask 111110XX
 							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 							$char = pack('C*', $ord_var_c,
-										 ord($var{$c + 1}),
-										 ord($var{$c + 2}),
-										 ord($var{$c + 3}),
-										 ord($var{$c + 4}));
+										ord($var{$c + 1}),
+										ord($var{$c + 2}),
+										ord($var{$c + 3}),
+										ord($var{$c + 4}));
 							$c += 4;
 							$utf16 = $this->_utf82utf16($char);
 							$ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -359,11 +359,11 @@ class CJSON {
 							// characters U-04000000 - U-7FFFFFFF, mask 1111110X
 							// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 							$char = pack('C*', $ord_var_c,
-										 ord($var{$c + 1}),
-										 ord($var{$c + 2}),
-										 ord($var{$c + 3}),
-										 ord($var{$c + 4}),
-										 ord($var{$c + 5}));
+										ord($var{$c + 1}),
+										ord($var{$c + 2}),
+										ord($var{$c + 3}),
+										ord($var{$c + 4}),
+										ord($var{$c + 5}));
 							$c += 5;
 							$utf16 = $this->_utf82utf16($char);
 							$ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -384,7 +384,7 @@ class CJSON {
 				 *
 				 * As per the ECMA and JSON specification an object may
 				 * have any string as a property. Unfortunately due to
-				 * a hole in the ECMA specification ifthe key is a
+				 * a hole in the ECMA specification if the key is an
 				 * ECMA reserved word or starts with a digit the
 				 * parameter is only accessible using ECMAScript's
 				 * bracket notation.
@@ -437,7 +437,8 @@ class CJSON {
 	 */
 	protected function _json_decode($str, $asArray = false) {
 		$str = $this->_reduce_string($str);
-		switch (zbx_strtolower($str)) {
+
+		switch (strtolower($str)) {
 			case 'true':
 				// JSON_checker test suite claims
 				// "A JSON payload should be an object or array, not a string."
@@ -482,7 +483,7 @@ class CJSON {
 					$delim = substr($str, 0, 1);
 					$chrs = substr($str, 1, -1);
 					$utf8 = '';
-					$strlen_chrs = zbx_strlen($chrs);
+					$strlen_chrs = strlen($chrs);
 					for ($c = 0; $c < $strlen_chrs; ++$c) {
 						$substr_chrs_c_2 = substr($chrs, $c, 2);
 						$ord_chrs_c = ord($chrs{$c});
@@ -527,7 +528,7 @@ class CJSON {
 								break;
 							case ($ord_chrs_c & 0xE0) == 0xC0:
 								// characters U-00000080 - U-000007FF, mask 110XXXXX
-								//see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 								$utf8 .= substr($chrs, $c, 2);
 								++$c;
 								break;
@@ -597,7 +598,7 @@ class CJSON {
 						}
 					}
 
-					$strlen_chrs = zbx_strlen($chrs);
+					$strlen_chrs = strlen($chrs);
 					for ($c = 0; $c <= $strlen_chrs; ++$c) {
 						$top = end($stk);
 						$substr_chrs_c_2 = substr($chrs, $c, 2);
@@ -665,10 +666,10 @@ class CJSON {
 							// found a quote, and we are not inside a string
 							array_push($stk, array('what' => self::IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
 						}
-						elseif ($chrs{$c} == $top['delim'] && $top['what'] == self::IN_STR
-								&& ((zbx_strlen(substr($chrs, 0, $c)) - zbx_strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
+						elseif (((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)
+								&& $chrs{$c} == $top['delim'] && $top['what'] == self::IN_STR) {
 							// found a quote, we're in a string, and it's not escaped
-							// we know that it's not escaped becase there is _not_ an
+							// we know that it's not escaped because there is _not_ an
 							// odd number of backslashes at the end of the string so far
 							array_pop($stk);
 						}
@@ -782,7 +783,7 @@ class CJSON {
 			return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
 		}
 
-		switch (zbx_strlen($utf8)) {
+		switch (strlen($utf8)) {
 			case 1:
 				// this case should never be reached, because we are in ASCII range
 				// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -823,11 +824,6 @@ class CJSON {
 		return trim($str);
 	}
 
-	protected function _exception($code, $info = array()) {
-		$class = get_class($this);
-		SDI(array($class, $code, (array) $info));
-	}
-
 	//***************************************************************************
 	// 								CHECK JSON									*
 	//***************************************************************************
@@ -916,7 +912,7 @@ class CJSON {
 	 * @return bool
 	 */
 	public function isValid($str) {
-		$len = zbx_strlen($str);
+		$len = strlen($str);
 		$_the_state = 0;
 		$this->_the_top = -1;
 		$this->_push(self::MODE_DONE);
diff --git a/frontends/php/include/classes/class.cldap.php b/frontends/php/include/classes/ldap/CLdap.php
index dea02fa95f4..4766c3df27b 100644
--- a/frontends/php/include/classes/class.cldap.php
+++ b/frontends/php/include/classes/ldap/CLdap.php
@@ -121,7 +121,7 @@ class CLdap {
 			// special bind string
 			$dn = $this->makeFilter($this->cnf['bind_dn'], array('user' => $user, 'host' => $this->cnf['host']));
 		}
-		elseif (zbx_strpos($this->cnf['base_dn'], '%{user}')) {
+		elseif (strpos($this->cnf['base_dn'], '%{user}')) {
 			// direct user bind
 			$dn = $this->makeFilter($this->cnf['base_dn'], array('user' => $user, 'host' => $this->cnf['host']));
 		}
diff --git a/frontends/php/include/classes/macros/CMacrosResolver.php b/frontends/php/include/classes/macros/CMacrosResolver.php
index 984aad7d61a..6878c5e6530 100644
--- a/frontends/php/include/classes/macros/CMacrosResolver.php
+++ b/frontends/php/include/classes/macros/CMacrosResolver.php
@@ -71,6 +71,16 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 			'types' => array('graphFunctionalItem'),
 			'source' => 'name',
 			'method' => 'resolveGraph'
+		),
+		'screenElementURL' => array(
+			'types' => array('host', 'hostId', 'interfaceWithoutPort', 'user'),
+			'source' => 'url',
+			'method' => 'resolveTexts'
+		),
+		'screenElementURLUser' => array(
+			'types' => array('user'),
+			'source' => 'url',
+			'method' => 'resolveTexts'
 		)
 	);
 
@@ -115,7 +125,9 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 
 		$macros = array();
 
-		$hostMacrosAvailable = $agentInterfaceAvailable = $interfaceWithoutPortMacrosAvailable = false;
+		$hostMacrosAvailable = false;
+		$agentInterfaceAvailable = false;
+		$interfaceWithoutPortMacrosAvailable = false;
 
 		if ($this->isTypeAvailable('host')) {
 			foreach ($data as $hostId => $texts) {
@@ -129,6 +141,19 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 			}
 		}
 
+		if ($this->isTypeAvailable('hostId')) {
+			foreach ($data as $hostId => $texts) {
+				if ($hostId != 0) {
+					$hostIdMacros = $this->findMacros(self::PATTERN_HOST_ID, $texts);
+					if ($hostIdMacros) {
+						foreach ($hostIdMacros as $hostMacro) {
+							$macros[$hostId][$hostMacro] = $hostId;
+						}
+					}
+				}
+			}
+		}
+
 		if ($this->isTypeAvailable('agentInterface')) {
 			foreach ($data as $hostId => $texts) {
 				if ($interfaceMacros = $this->findMacros(self::PATTERN_INTERFACE, $texts)) {
@@ -322,10 +347,13 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 
 		// replace macros to value
 		if ($macros) {
+			$pattern = '/'.self::PATTERN_HOST.'|'.self::PATTERN_HOST_ID.'|'.self::PATTERN_INTERFACE.'|'.
+				ZBX_PREG_EXPRESSION_USER_MACROS.'/';
+
 			foreach ($data as $hostId => $texts) {
 				if (isset($macros[$hostId])) {
 					foreach ($texts as $tnum => $text) {
-						preg_match_all('/'.self::PATTERN_HOST.'|'.self::PATTERN_INTERFACE.'|'.ZBX_PREG_EXPRESSION_USER_MACROS.'/', $text, $matches, PREG_OFFSET_CAPTURE);
+						preg_match_all($pattern, $text, $matches, PREG_OFFSET_CAPTURE);
 
 						for ($i = count($matches[0]) - 1; $i >= 0; $i--) {
 							$matche = $matches[0][$i];
@@ -1105,11 +1133,11 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 			$macro = $expr;
 
 			if ($replaceHosts !== null) {
-				// search for macros with all possible indecies
+				// search for macros with all possible indices
 				foreach ($replaceHosts as $i => $host) {
 					$macroTmp = $macro;
 
-					// repalce only macro in first position
+					// replace only macro in first position
 					$macro = preg_replace('/{({HOSTNAME'.$i.'}|{HOST\.HOST'.$i.'}):(.*)}/U', '{'.$host['host'].':$2}', $macro);
 
 					// only one simple macro possible inside functional macro
@@ -1126,13 +1154,13 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 				continue;
 			}
 
-			// look in DB for coressponding item
+			// look in DB for corresponding item
 			$itemHost = $expressionData->expressions[0]['host'];
 			$key = $expressionData->expressions[0]['item'];
 			$function = $expressionData->expressions[0]['functionName'];
 
 			$item = API::Item()->get(array(
-				'output' => array('itemid', 'lastclock', 'value_type', 'lastvalue', 'units', 'valuemapid'),
+				'output' => array('itemid', 'value_type', 'units', 'valuemapid'),
 				'webitems' => true,
 				'filter' => array(
 					'host' => $itemHost,
@@ -1149,6 +1177,17 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 				continue;
 			}
 
+			$lastValue = Manager::History()->getLast(array($item));
+			if ($lastValue) {
+				$lastValue = reset($lastValue[$item['itemid']]);
+				$item['lastvalue'] = $lastValue['value'];
+				$item['lastclock'] = $lastValue['clock'];
+			}
+			else {
+				$item['lastvalue'] = '0';
+				$item['lastclock'] = '0';
+			}
+
 			// do function type (last, min, max, avg) related actions
 			if ($function === 'last') {
 				$value = $item['lastclock'] ? formatHistoryValue($item['lastvalue'], $item) : UNRESOLVED_MACRO_STRING;
@@ -1181,14 +1220,14 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 
 		// for host and trigger items expand macros if they exists
 		if (($selement['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST || $selement['elementtype'] == SYSMAP_ELEMENT_TYPE_TRIGGER)
-				&& (zbx_strpos($label, 'HOST.NAME') !== false
-						|| zbx_strpos($label, 'HOSTNAME') !== false /* deprecated */
-						|| zbx_strpos($label, 'HOST.HOST') !== false
-						|| zbx_strpos($label, 'HOST.DESCRIPTION') !== false
-						|| zbx_strpos($label, 'HOST.DNS') !== false
-						|| zbx_strpos($label, 'HOST.IP') !== false
-						|| zbx_strpos($label, 'IPADDRESS') !== false /* deprecated */
-						|| zbx_strpos($label, 'HOST.CONN') !== false)) {
+				&& (strpos($label, 'HOST.NAME') !== false
+						|| strpos($label, 'HOSTNAME') !== false /* deprecated */
+						|| strpos($label, 'HOST.HOST') !== false
+						|| strpos($label, 'HOST.DESCRIPTION') !== false
+						|| strpos($label, 'HOST.DNS') !== false
+						|| strpos($label, 'HOST.IP') !== false
+						|| strpos($label, 'IPADDRESS') !== false /* deprecated */
+						|| strpos($label, 'HOST.CONN') !== false)) {
 			// priorities of interface types doesn't match interface type ids in DB
 			$priorities = array(
 				INTERFACE_TYPE_AGENT => 4,
@@ -1293,40 +1332,40 @@ class CMacrosResolver extends CMacrosResolverGeneral {
 			case SYSMAP_ELEMENT_TYPE_MAP:
 			case SYSMAP_ELEMENT_TYPE_TRIGGER:
 			case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
-				if (zbx_strpos($label, '{TRIGGERS.UNACK}') !== false) {
+				if (strpos($label, '{TRIGGERS.UNACK}') !== false) {
 					$label = str_replace('{TRIGGERS.UNACK}', get_triggers_unacknowledged($selement), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGERS.PROBLEM.UNACK}') !== false) {
+				if (strpos($label, '{TRIGGERS.PROBLEM.UNACK}') !== false) {
 					$label = str_replace('{TRIGGERS.PROBLEM.UNACK}', get_triggers_unacknowledged($selement, true), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGER.EVENTS.UNACK}') !== false) {
+				if (strpos($label, '{TRIGGER.EVENTS.UNACK}') !== false) {
 					$label = str_replace('{TRIGGER.EVENTS.UNACK}', get_events_unacknowledged($selement), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGER.EVENTS.PROBLEM.UNACK}') !== false) {
+				if (strpos($label, '{TRIGGER.EVENTS.PROBLEM.UNACK}') !== false) {
 					$label = str_replace('{TRIGGER.EVENTS.PROBLEM.UNACK}',
 						get_events_unacknowledged($selement, null, TRIGGER_VALUE_TRUE), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGER.PROBLEM.EVENTS.PROBLEM.UNACK}') !== false) {
+				if (strpos($label, '{TRIGGER.PROBLEM.EVENTS.PROBLEM.UNACK}') !== false) {
 					$label = str_replace('{TRIGGER.PROBLEM.EVENTS.PROBLEM.UNACK}',
 						get_events_unacknowledged($selement, TRIGGER_VALUE_TRUE, TRIGGER_VALUE_TRUE), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGERS.ACK}') !== false) {
+				if (strpos($label, '{TRIGGERS.ACK}') !== false) {
 					$label = str_replace('{TRIGGERS.ACK}',
 						get_triggers_unacknowledged($selement, null, true), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGERS.PROBLEM.ACK}') !== false) {
+				if (strpos($label, '{TRIGGERS.PROBLEM.ACK}') !== false) {
 					$label = str_replace('{TRIGGERS.PROBLEM.ACK}',
 						get_triggers_unacknowledged($selement, true, true), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGER.EVENTS.ACK}') !== false) {
+				if (strpos($label, '{TRIGGER.EVENTS.ACK}') !== false) {
 					$label = str_replace('{TRIGGER.EVENTS.ACK}',
 						get_events_unacknowledged($selement, null, null, true), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGER.EVENTS.PROBLEM.ACK}') !== false) {
+				if (strpos($label, '{TRIGGER.EVENTS.PROBLEM.ACK}') !== false) {
 					$label = str_replace('{TRIGGER.EVENTS.PROBLEM.ACK}',
 						get_events_unacknowledged($selement, null, TRIGGER_VALUE_TRUE, true), $label);
 				}
-				if (zbx_strpos($label, '{TRIGGER.PROBLEM.EVENTS.PROBLEM.ACK}') !== false) {
+				if (strpos($label, '{TRIGGER.PROBLEM.EVENTS.PROBLEM.ACK}') !== false) {
 					$label = str_replace('{TRIGGER.PROBLEM.EVENTS.PROBLEM.ACK}',
 						get_events_unacknowledged($selement, TRIGGER_VALUE_TRUE, TRIGGER_VALUE_TRUE, true), $label);
 				}
diff --git a/frontends/php/include/classes/macros/CMacrosResolverGeneral.php b/frontends/php/include/classes/macros/CMacrosResolverGeneral.php
index 8487bdce6dc..91fcad6443b 100644
--- a/frontends/php/include/classes/macros/CMacrosResolverGeneral.php
+++ b/frontends/php/include/classes/macros/CMacrosResolverGeneral.php
@@ -22,9 +22,10 @@
 class CMacrosResolverGeneral {
 
 	const PATTERN_HOST = '{(HOSTNAME|HOST\.HOST|HOST\.NAME)}';
+	const PATTERN_HOST_ID = '{(HOST\.ID)}';
+	const PATTERN_HOST_FUNCTION = '{(HOSTNAME|HOST\.HOST|HOST\.NAME)([1-9]?)}';
 	const PATTERN_HOST_INTERNAL = 'HOST\.HOST|HOSTNAME';
 	const PATTERN_MACRO_PARAM = '[1-9]?';
-	const PATTERN_HOST_FUNCTION = '{(HOSTNAME|HOST\.HOST|HOST\.NAME)([1-9]?)}';
 	const PATTERN_INTERFACE = '{(IPADDRESS|HOST\.IP|HOST\.DNS|HOST\.CONN)}';
 	const PATTERN_INTERFACE_FUNCTION = '{(IPADDRESS|HOST\.IP|HOST\.DNS|HOST\.CONN|HOST\.PORT)([1-9]?)}';
 	const PATTERN_INTERFACE_FUNCTION_WITHOUT_PORT = '{(IPADDRESS|HOST\.IP|HOST\.DNS|HOST\.CONN)([1-9]?)}';
diff --git a/frontends/php/include/classes/macros/CMacrosResolverHelper.php b/frontends/php/include/classes/macros/CMacrosResolverHelper.php
index 96521d18fed..125108c25d3 100644
--- a/frontends/php/include/classes/macros/CMacrosResolverHelper.php
+++ b/frontends/php/include/classes/macros/CMacrosResolverHelper.php
@@ -30,6 +30,17 @@ class CMacrosResolverHelper {
 	private static $macrosResolver;
 
 	/**
+	 * Create CMacrosResolver object and store in static variable.
+	 *
+	 * @static
+	 */
+	private static function init() {
+		if (self::$macrosResolver === null) {
+			self::$macrosResolver = new CMacrosResolver();
+		}
+	}
+
+	/**
 	 * Resolve macros.
 	 *
 	 * @static
@@ -512,13 +523,27 @@ class CMacrosResolverHelper {
 	}
 
 	/**
-	 * Create CMacrosResolver object and store in static variable.
+	 * Resolve macros in screen element URL.
 	 *
 	 * @static
+	 *
+	 * @param array $screenElement
+	 *
+	 * @return string
 	 */
-	private static function init() {
-		if (self::$macrosResolver === null) {
-			self::$macrosResolver = new CMacrosResolver();
-		}
+	public static function resolveScreenElementURL(array $screenElement) {
+		self::init();
+
+		$macros = self::$macrosResolver->resolve(array(
+			'config' => $screenElement['config'],
+			'data' => array(
+				$screenElement['hostid'] => array(
+					'url' => $screenElement['url']
+				)
+			)
+		));
+		$macros = reset($macros);
+
+		return $macros['url'];
 	}
 }
diff --git a/frontends/php/include/classes/class.cpagefilter.php b/frontends/php/include/classes/pagefilter/CPageFilter.php
index 54cab10fac8..c9aced1e10b 100644
--- a/frontends/php/include/classes/class.cpagefilter.php
+++ b/frontends/php/include/classes/pagefilter/CPageFilter.php
@@ -193,7 +193,7 @@ class CPageFilter {
 
 	/**
 	 * Initialize filter features.
-	 * Supported: Host groups, Hosts, Triggers, Graphs, Applications, Discovery rules, Minimum trigger severities.
+	 * Supported: Host groups, Hosts, Triggers, Graphs, Discovery rules, Minimum trigger severities.
 	 *
 	 * @param array  $options
 	 * @param array  $options['config']
@@ -212,8 +212,6 @@ class CPageFilter {
 	 * @param array  $options['triggers']
 	 * @param array  $options['drules']
 	 * @param string $options['druleid']
-	 * @param array  $options['applications']
-	 * @param string $options['application']
 	 * @param array  $options['severitiesMin']
 	 * @param int    $options['severitiesMin']['default']
 	 * @param string $options['severitiesMin']['mapId']
@@ -221,7 +219,7 @@ class CPageFilter {
 	 */
 	public function __construct(array $options = array()) {
 		$this->config['select_latest'] = isset($options['config']['select_latest']);
-		$this->config['DDReset'] = get_request('ddreset', null);
+		$this->config['DDReset'] = getRequest('ddreset');
 		$this->config['popupDD'] = isset($options['config']['popupDD']);
 
 		$config = select_config();
@@ -273,11 +271,6 @@ class CPageFilter {
 			$this->_initDiscoveries($options['druleid'], $options['drules']);
 		}
 
-		// applications
-		if (isset($options['applications'])) {
-			$this->_initApplications($options['application'], $options['applications']);
-		}
-
 		// severities min
 		if (isset($options['severitiesMin'])) {
 			$this->_initSeveritiesMin($options['severityMin'], $options['severitiesMin']);
@@ -302,7 +295,6 @@ class CPageFilter {
 		$this->_profileIdx['hosts'] = 'web.'.$profileSection.'.hostid';
 		$this->_profileIdx['graphs'] = 'web.'.$profileSection.'.graphid';
 		$this->_profileIdx['drules'] = 'web.'.$profileSection.'.druleid';
-		$this->_profileIdx['application'] = 'web.'.$profileSection.'.application';
 		$this->_profileIdx['severityMin'] = 'web.maps.severity_min';
 
 		if ($this->config['select_latest']) {
@@ -310,7 +302,6 @@ class CPageFilter {
 			$this->_profileIds['hostid'] = CProfile::get(self::HOST_LATEST_IDX);
 			$this->_profileIds['graphid'] = CProfile::get(self::GRAPH_LATEST_IDX);
 			$this->_profileIds['druleid'] = CProfile::get(self::DRULE_LATEST_IDX);
-			$this->_profileIds['application'] = '';
 			$this->_profileIds['severityMin'] = null;
 		}
 		elseif ($this->config['DDReset'] && !$this->config['DDRemember']) {
@@ -318,7 +309,6 @@ class CPageFilter {
 			$this->_profileIds['hostid'] = 0;
 			$this->_profileIds['graphid'] = 0;
 			$this->_profileIds['druleid'] = 0;
-			$this->_profileIds['application'] = '';
 			$this->_profileIds['severityMin'] = null;
 		}
 		else {
@@ -326,7 +316,6 @@ class CPageFilter {
 			$this->_profileIds['hostid'] = CProfile::get($this->_profileIdx['hosts']);
 			$this->_profileIds['graphid'] = CProfile::get($this->_profileIdx['graphs']);
 			$this->_profileIds['druleid'] = CProfile::get($this->_profileIdx['drules']);
-			$this->_profileIds['application'] = CProfile::get($this->_profileIdx['application']);
 
 			// minimum severity
 			$mapId = isset($options['severitiesMin']['mapId']) ? $options['severitiesMin']['mapId'] : null;
@@ -337,7 +326,6 @@ class CPageFilter {
 		$this->_requestIds['hostid'] = isset($options['hostid']) ? $options['hostid'] : null;
 		$this->_requestIds['graphid'] = isset($options['graphid']) ? $options['graphid'] : null;
 		$this->_requestIds['druleid'] = isset($options['druleid']) ? $options['druleid'] : null;
-		$this->_requestIds['application'] = isset($options['application']) ? $options['application'] : null;
 		$this->_requestIds['severityMin'] = isset($options['severityMin']) ? $options['severityMin'] : null;
 	}
 
@@ -405,7 +393,7 @@ class CPageFilter {
 			$this->data['groups'][$group['groupid']] = $group;
 		}
 
-		// select remebered selection
+		// select remembered selection
 		if (is_null($groupid) && $this->_profileIds['groupid']) {
 			// set group only if host is in group or hostid is not set
 			if ($hostid) {
@@ -476,7 +464,7 @@ class CPageFilter {
 				}
 			}
 
-			// select remebered selection
+			// select remembered selection
 			if (is_null($hostId) && $this->_profileIds['hostid']) {
 				$hostId = $this->_profileIds['hostid'];
 			}
@@ -610,53 +598,6 @@ class CPageFilter {
 	}
 
 	/**
-	 * Set applications related variables.
-	 *  - applications: all applications available for dropdown on page
-	 *  - application: application curently selected, can be '' for 'all' or 'not selected'
-	 *  - applicationsSelected: if an application selected, i.e. not 'not selected'
-	 * Applications are dependent on groups.
-	 *
-	 * @param int   $application
-	 * @param array $options
-	 */
-	private function _initApplications($application, array $options) {
-		$this->data['applications'] = array();
-
-		if (!$this->groupsSelected) {
-			$application = '';
-		}
-		else {
-			$def_options = array(
-				'output' => array('name'),
-				'groupids' => ($this->groupid > 0) ? $this->groupid : null
-			);
-			$options = zbx_array_merge($def_options, $options);
-			$applications = API::Application()->get($options);
-
-			foreach ($applications as $app) {
-				$this->data['applications'][$app['name']] = $app;
-			}
-
-			// select remembered selection
-			if (is_null($application) && $this->_profileIds['application']) {
-				$application = $this->_profileIds['application'];
-			}
-
-			// nonexisting or unset application
-			if ((!isset($this->data['applications'][$application]) && $application !== '') || is_null($application)) {
-				$application = '';
-			}
-		}
-
-		if (!is_null($this->_requestIds['application'])) {
-			CProfile::update($this->_profileIdx['application'], $application, PROFILE_TYPE_STR);
-		}
-		$this->isSelected['applicationsSelected'] = ($this->config['DDFirst'] == ZBX_DROPDOWN_FIRST_ALL && !empty($this->data['applications'])) || $application !== '';
-		$this->isSelected['applicationsAll'] = $this->config['DDFirst'] == ZBX_DROPDOWN_FIRST_ALL && !empty($this->data['applications']) && $application === '';
-		$this->ids['application'] = $application;
-	}
-
-	/**
 	 * Initialize minimum trigger severities.
 	 *
 	 * @param string $severityMin
@@ -752,22 +693,6 @@ class CPageFilter {
 	}
 
 	/**
-	 * Get applications combobox with selected item.
-	 *
-	 * @return CComboBox
-	 */
-	public function getApplicationsCB() {
-		$items = array();
-		foreach ($this->applications as $id => $application) {
-			$items[$id] = $application['name'];
-		}
-
-		return $this->_getCB('application', $this->application, $items, array(
-			'objectName' => 'applications'
-		));
-	}
-
-	/**
 	 * Get minimum trigger severities combobox with selected item.
 	 *
 	 * @return CComboBox
@@ -804,12 +729,7 @@ class CPageFilter {
 				$firstLabel = ($this->config['DDFirst'] == ZBX_DROPDOWN_FIRST_NONE) ? _('not selected') : _('all');
 			}
 
-			if ($name === 'application') {
-				$items = array('' => $firstLabel) + $items;
-			}
-			else {
-				$items = array($firstLabel) + $items;
-			}
+			$items = array($firstLabel) + $items;
 		}
 
 		foreach ($items as $id => $name) {
diff --git a/frontends/php/include/classes/parsers/CConditionFormula.php b/frontends/php/include/classes/parsers/CConditionFormula.php
index 47128cfd90b..d4276f3e2b2 100644
--- a/frontends/php/include/classes/parsers/CConditionFormula.php
+++ b/frontends/php/include/classes/parsers/CConditionFormula.php
@@ -21,11 +21,10 @@
 class CConditionFormula {
 
 	// possible parsing states
-	const STATE_INIT = 0;
-	const STATE_AFTER_OPEN_BRACE = 1;
-	const STATE_AFTER_OPERATOR = 2;
-	const STATE_AFTER_CLOSE_BRACE = 3;
-	const STATE_AFTER_CONSTANT = 4;
+	const STATE_AFTER_OPEN_BRACE = 0;
+	const STATE_AFTER_OPERATOR = 1;
+	const STATE_AFTER_CLOSE_BRACE = 2;
+	const STATE_AFTER_CONSTANT = 3;
 
 	/**
 	 * Set to true of the formula is valid.
@@ -84,34 +83,76 @@ class CConditionFormula {
 		$this->pos = 0;
 		$this->formula = $formula;
 
-		$state = self::STATE_INIT;
+		$state = self::STATE_AFTER_OPEN_BRACE;
+		$afterSpace = false;
 		$level = 0;
 
 		while (isset($this->formula[$this->pos])) {
+			if ($this->formula[$this->pos] === ' ') {
+				$afterSpace = true;
+				$this->pos++;
+
+				continue;
+			}
+
 			switch ($state) {
-				case self::STATE_INIT:
 				case self::STATE_AFTER_OPEN_BRACE:
-				case self::STATE_AFTER_OPERATOR:
 					switch ($this->formula[$this->pos]) {
-						case ' ':
+						case '(':
+							$state = self::STATE_AFTER_OPEN_BRACE;
+							$level++;
 							break;
+						default:
+							if ($this->parseConstant()) {
+								$state = self::STATE_AFTER_CONSTANT;
+							}
+							else {
+								break 3;
+							}
+					}
+					break;
+
+				case self::STATE_AFTER_OPERATOR:
+					switch ($this->formula[$this->pos]) {
 						case '(':
 							$state = self::STATE_AFTER_OPEN_BRACE;
 							$level++;
 							break;
 						default:
-							if (!$this->parseConstant()) {
+							if (!$afterSpace) {
+								break 3;
+							}
+
+							if ($this->parseConstant()) {
+								$state = self::STATE_AFTER_CONSTANT;
+							}
+							else {
 								break 3;
 							}
-							$state = self::STATE_AFTER_CONSTANT;
 					}
 					break;
 
 				case self::STATE_AFTER_CLOSE_BRACE:
-				case self::STATE_AFTER_CONSTANT:
 					switch ($this->formula[$this->pos]) {
-						case ' ':
+						case ')':
+							$state = self::STATE_AFTER_CLOSE_BRACE;
+							if ($level == 0) {
+								break 3;
+							}
+							$level--;
 							break;
+						default:
+							if ($this->parseOperator()) {
+								$state = self::STATE_AFTER_OPERATOR;
+							}
+							else {
+								break 3;
+							}
+					}
+					break;
+
+				case self::STATE_AFTER_CONSTANT:
+					switch ($this->formula[$this->pos]) {
 						case ')':
 							$state = self::STATE_AFTER_CLOSE_BRACE;
 							if ($level == 0) {
@@ -120,13 +161,21 @@ class CConditionFormula {
 							$level--;
 							break;
 						default:
-							if (!$this->parseOperator()) {
+							if (!$afterSpace) {
+								break 3;
+							}
+
+							if ($this->parseOperator()) {
+								$state = self::STATE_AFTER_OPERATOR;
+							}
+							else {
 								break 3;
 							}
-							$state = self::STATE_AFTER_OPERATOR;
 					}
 					break;
 			}
+
+			$afterSpace = false;
 			$this->pos++;
 		}
 
diff --git a/frontends/php/include/classes/parsers/CFunctionMacroParser.php b/frontends/php/include/classes/parsers/CFunctionMacroParser.php
new file mode 100644
index 00000000000..ccac03766ed
--- /dev/null
+++ b/frontends/php/include/classes/parsers/CFunctionMacroParser.php
@@ -0,0 +1,388 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/**
+ *  A parser for function macros like "{host.item.func()}".
+ */
+class CFunctionMacroParser extends CParser {
+
+	const STATE_NEW = 0;
+	const STATE_END = 1;
+	const STATE_UNQUOTED = 2;
+	const STATE_QUOTED = 3;
+
+	/**
+	 * The string being parsed
+	 *
+	 * @var string
+	 */
+	protected $source;
+
+	/**
+	 * @param string    $source
+	 * @param int       $startPos
+	 *
+	 * @return bool|CFunctionMacroParserResult
+	 */
+	public function parse($source, $startPos = 0) {
+		$this->source = $source;
+		$this->pos = $startPos;
+
+		if (!isset($this->source[$this->pos]) || $this->source[$this->pos++] != '{'
+				|| ($host = $this->parseHost()) === null) {
+
+			return false;
+		}
+
+		if (!isset($this->source[$this->pos]) || $this->source[$this->pos++] != ':'
+				|| ($item = $this->parseItem()) === null) {
+
+			$this->pos--;
+			return false;
+		}
+
+		if (!isset($this->source[$this->pos]) || $this->source[$this->pos++] != '.'
+				|| !(list($function, $functionParamList) = $this->parseFunction())) {
+
+			$this->pos--;
+			return false;
+		}
+
+		if (!isset($this->source[$this->pos]) || $this->source[$this->pos] != '}') {
+			return false;
+		}
+
+		$expressionLength = $this->pos - $startPos + 1;
+		$expression = substr($this->source, $startPos, $expressionLength);
+		$functionName = substr($function, 0, strpos($function, '('));
+
+		$result = new CFunctionMacroParserResult();
+		$result->source = $this->source;
+		$result->match = $expression;
+		$result->pos = $startPos;
+		$result->length = $expressionLength;
+
+		$result->expression = array(
+			'expression' => $expression,
+			'pos' => $startPos,
+			'host' => $host,
+			'item' => $item,
+			'function' => $function,
+			'functionName' => $functionName,
+			'functionParam' => substr($function, strpos($function, '(') + 1, -1),
+			'functionParamList' => $functionParamList
+		);
+
+		return $result;
+	}
+
+	/**
+	 * Parses a host in a trigger function macro constant and moves a position ($pos) on a next symbol after the host
+	 *
+	 * @return string returns a host name if parsed successfully or null otherwise
+	 */
+	protected function parseHost() {
+		$startPos = $this->pos;
+
+		while (isset($this->source[$this->pos]) && $this->isHostChar($this->source[$this->pos])) {
+			$this->pos++;
+		}
+
+		// is host empty?
+		if ($this->pos == $startPos) {
+			return null;
+		}
+
+		$host = substr($this->source, $startPos, $this->pos - $startPos);
+
+		return $host;
+	}
+
+	/**
+	 * Parses an item in a trigger function macro constant and moves a position ($pos) on a next symbol after the item
+	 *
+	 * @return string returns an item name if parsed successfully or null otherwise
+	 */
+	protected function parseItem() {
+		$startPos = $this->pos;
+
+		while (isset($this->source[$this->pos]) && $this->isKeyChar($this->source[$this->pos])) {
+			$this->pos++;
+		}
+
+		// for instance, agent.ping.last(0)
+		if (isset($this->source[$this->pos]) && $this->source[$this->pos] == '(') {
+			while ($this->pos > $startPos && $this->source[$this->pos] != '.') {
+				$this->pos--;
+			}
+		}
+		// for instance, net.tcp.port[,80]
+		elseif (isset($this->source[$this->pos]) && $this->source[$this->pos] == '[') {
+			$level = 0;
+			$state = self::STATE_END;
+
+			while (isset($this->source[$this->pos])) {
+				if ($level == 0) {
+					// first square bracket + Zapcat compatibility
+					if ($state == self::STATE_END && $this->source[$this->pos] == '[') {
+						$state = self::STATE_NEW;
+					}
+					else {
+						break;
+					}
+				}
+
+				switch ($state) {
+					// a new parameter started
+					case self::STATE_NEW:
+						switch ($this->source[$this->pos]) {
+							case ' ':
+							case ',':
+								break;
+							case '[':
+								$level++;
+								break;
+							case ']':
+								$level--;
+								$state = self::STATE_END;
+								break;
+							case '"':
+								$state = self::STATE_QUOTED;
+								break;
+							default:
+								$state = self::STATE_UNQUOTED;
+						}
+						break;
+					// end of parameter
+					case self::STATE_END:
+						switch ($this->source[$this->pos]) {
+							case ' ':
+								break;
+							case ',':
+								$state = self::STATE_NEW;
+								break;
+							case ']':
+								$level--;
+								break;
+							default:
+								return null;
+						}
+						break;
+					// an unquoted parameter
+					case self::STATE_UNQUOTED:
+						switch ($this->source[$this->pos]) {
+							case ']':
+								$level--;
+								$state = self::STATE_END;
+								break;
+							case ',':
+								$state = self::STATE_NEW;
+								break;
+						}
+						break;
+					// a quoted parameter
+					case self::STATE_QUOTED:
+						switch ($this->source[$this->pos]) {
+							case '"':
+								if ($this->source[$this->pos - 1] != '\\') {
+									$state = self::STATE_END;
+								}
+								break;
+						}
+						break;
+				}
+				$this->pos++;
+			}
+
+			if ($level != 0) {
+				return null;
+			}
+		}
+
+		// is key empty?
+		if ($startPos == $this->pos) {
+			return null;
+		}
+
+		$item = substr($this->source, $startPos, $this->pos - $startPos);
+
+		return $item;
+	}
+
+	/**
+	 * Parses an function in a trigger function macro constant and moves a position ($pos) on a next symbol after the function
+	 *
+	 * Returns an array if parsed successfully or null otherwise
+	 * Returned array contains two elements:
+	 *   0 => function name like "last(0)"
+	 *   1 => array of parsed function parameters
+	 *
+	 * @return array
+	 */
+	protected function parseFunction()
+	{
+		$startPos = $this->pos;
+
+		while (isset($this->source[$this->pos]) && $this->isFunctionChar($this->source[$this->pos])) {
+			$this->pos++;
+		}
+
+		// is function empty?
+		if ($startPos == $this->pos) {
+			return null;
+		}
+
+		if (!isset($this->source[$this->pos]) || $this->source[$this->pos++] != '(') {
+			return null;
+		}
+
+		$state = self::STATE_NEW;
+		$num = 0;
+		$functionParamList = array();
+		$functionParamList[$num] = '';
+
+		while (isset($this->source[$this->pos])) {
+			switch ($state) {
+				// a new parameter started
+				case self::STATE_NEW:
+					switch ($this->source[$this->pos]) {
+						case ' ':
+							break;
+						case ',':
+							$functionParamList[++$num] = '';
+							break;
+						case ')':
+							// end of parameters
+							break 3;
+						case '"':
+							$state = self::STATE_QUOTED;
+							break;
+						default:
+							$functionParamList[$num] .= $this->source[$this->pos];
+							$state = self::STATE_UNQUOTED;
+					}
+					break;
+				// end of parameter
+				case self::STATE_END:
+					switch ($this->source[$this->pos]) {
+						case ' ':
+							break;
+						case ',':
+							$functionParamList[++$num] = '';
+							$state = self::STATE_NEW;
+							break;
+						case ')':
+							// end of parameters
+							break 3;
+						default:
+							return null;
+					}
+					break;
+				// an unquoted parameter
+				case self::STATE_UNQUOTED:
+					switch ($this->source[$this->pos]) {
+						case ')':
+							// end of parameters
+							break 3;
+						case ',':
+							$functionParamList[++$num] = '';
+							$state = self::STATE_NEW;
+							break;
+						default:
+							$functionParamList[$num] .= $this->source[$this->pos];
+					}
+					break;
+				// a quoted parameter
+				case self::STATE_QUOTED:
+					switch ($this->source[$this->pos]) {
+						case '"':
+							$state = self::STATE_END;
+							break;
+						case '\\':
+							if (isset($this->source[$this->pos + 1]) && $this->source[$this->pos + 1] == '"') {
+								$this->pos++;
+							}
+						// break; is not missing here
+						default:
+							$functionParamList[$num] .= $this->source[$this->pos];
+							break;
+					}
+					break;
+			}
+			$this->pos++;
+		}
+
+		if (!isset($this->source[$this->pos]) || $this->source[$this->pos++] != ')') {
+			return null;
+		}
+
+		$function = substr($this->source, $startPos, $this->pos - $startPos);
+
+		return array($function, $functionParamList);
+	}
+
+	/**
+	 * Returns true if the char is allowed in the host name, false otherwise.
+	 *
+	 * @param string $c
+	 *
+	 * @return bool
+	 */
+	protected function isHostChar($c) {
+		if (($c >= 'a' && $c <= 'z') || ($c >= 'A' && $c <= 'Z') || ($c >= '0' && $c <= '9')
+			|| $c == '.' || $c == ' ' || $c == '_' || $c == '-') {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns true if the char is allowed in the item key, false otherwise.
+	 *
+	 * @param string $c
+	 *
+	 * @return bool
+	 */
+	protected function isKeyChar($c) {
+		if (($c >= 'a' && $c <= 'z') || ($c >= 'A' && $c <= 'Z') || ($c >= '0' && $c <= '9')
+			|| $c == '.' || $c == '_' || $c == '-') {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns true if the char is allowed in the function name, false otherwise.
+	 *
+	 * @param string $c
+	 *
+	 * @return bool
+	 */
+	protected function isFunctionChar($c) {
+		if ($c >= 'a' && $c <= 'z') {
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/frontends/php/api/classes/CItemKey.php b/frontends/php/include/classes/parsers/CItemKey.php
index aefdff742a1..aefdff742a1 100644
--- a/frontends/php/api/classes/CItemKey.php
+++ b/frontends/php/include/classes/parsers/CItemKey.php
diff --git a/frontends/php/include/classes/parsers/CMacroParser.php b/frontends/php/include/classes/parsers/CMacroParser.php
new file mode 100644
index 00000000000..fc68dbed877
--- /dev/null
+++ b/frontends/php/include/classes/parsers/CMacroParser.php
@@ -0,0 +1,105 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/**
+ * A parser for custom macros.
+ */
+class CMacroParser extends CParser {
+
+	/**
+	 * A character that must be present right after the opening curly brace.
+	 *
+	 * For example "$" for user macros like "{$MACRO}".
+	 *
+	 * @var string
+	 */
+	protected $prefixChar;
+
+	/**
+	 * @param string $prefixChar
+	 */
+	public function __construct($prefixChar) {
+		$this->prefixChar = $prefixChar;
+	}
+
+	/**
+	 * @param string    $source
+	 * @param int       $startPos
+	 *
+	 * @return bool|CParserResult
+	 */
+	public function parse($source, $startPos = 0) {
+		$this->pos = $startPos;
+
+		if (!isset($source[$this->pos]) || $source[$this->pos] != '{') {
+			return false;
+		}
+
+		$this->pos++;
+
+		if (!isset($source[$this->pos]) || $source[$this->pos] !== $this->prefixChar) {
+			return false;
+		}
+
+		$this->pos++;
+
+		// make sure there's at least one valid macro char
+		if (!isset($source[$this->pos]) || !$this->isMacroChar($source[$this->pos])) {
+			return false;
+		}
+
+		$this->pos++;
+
+		// skip the remaining macro chars
+		while (isset($source[$this->pos]) && $this->isMacroChar($source[$this->pos])) {
+			$this->pos++;
+		}
+
+		if (!isset($source[$this->pos]) || $source[$this->pos] != '}') {
+			return false;
+		}
+
+		$macroLength = $this->pos - $startPos + 1;
+
+		$result = new CParserResult();
+		$result->source = $source;
+		$result->pos = $startPos;
+		$result->length = $macroLength;
+		$result->match = substr($source, $startPos, $macroLength);
+
+		return $result;
+	}
+
+	/**
+	 * Returns true if the char is allowed in the macro, false otherwise
+	 *
+	 * @param string    $c
+	 *
+	 * @return bool
+	 */
+	private function isMacroChar($c) {
+		if (($c >= 'A' && $c <= 'Z') || $c == '.' || $c == '_' || ($c >= '0' && $c <= '9')) {
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/frontends/php/include/classes/parsers/CParser.php b/frontends/php/include/classes/parsers/CParser.php
new file mode 100644
index 00000000000..8b2637150b8
--- /dev/null
+++ b/frontends/php/include/classes/parsers/CParser.php
@@ -0,0 +1,48 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+abstract class CParser {
+
+	/**
+	 * Current cursor position.
+	 *
+	 * @var int
+	 */
+	protected $pos;
+
+	/**
+	 * Returns the current cursor position.
+	 *
+	 * @return int
+	 */
+	public function getPos() {
+		return $this->pos;
+	}
+
+	/**
+	 * Try to parse the string starting from the given position.
+	 *
+	 * @param string	$source		string to parse
+	 * @param int 		$startPos	position to start from
+	 *
+	 * @return CParserResult|bool   returns a CParserResult object if a match has been found or false otherwise
+	 */
+	abstract public function parse($source, $startPos = 0);
+}
diff --git a/frontends/php/include/classes/parsers/CSetParser.php b/frontends/php/include/classes/parsers/CSetParser.php
new file mode 100644
index 00000000000..fa7568a57fc
--- /dev/null
+++ b/frontends/php/include/classes/parsers/CSetParser.php
@@ -0,0 +1,84 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CSetParser extends CParser {
+
+	/**
+	 * Array of string to search for with strings as keys.
+	 *
+	 * @var array
+	 */
+	protected $needles = array();
+
+	/**
+	 * Array of chars that are used in the given strings with chars as keys.
+	 *
+	 * @var array
+	 */
+	protected $chars = array();
+
+	/**
+	 * Array of strings to search for.
+	 *
+	 * @param array $needles
+	 */
+	public function __construct(array $needles) {
+		$this->needles = array_flip($needles);
+
+		$this->chars = array_flip(str_split(implode($needles)));
+	}
+
+	/**
+	 * Find one of the given strings at the given position.
+	 *
+	 * The parser implements a greedy algorithm, i.e., looks for the longest match.
+	 */
+	public function parse($source, $startPos = 0) {
+		$this->pos = $startPos;
+
+		$match = null;
+		$matchPos = null;
+		$token = '';
+		while (isset($source[$this->pos]) && isset($this->chars[$source[$this->pos]])) {
+			$token .= $source[$this->pos];
+
+			$this->pos++;
+
+			// when we found a match, keep looking to see of there may be a longer match
+			if (isset($this->needles[$token])) {
+				$match = $token;
+				$matchPos = $this->pos;
+			}
+		}
+
+		if ($matchPos === null) {
+			return false;
+		}
+
+		$result = new CParserResult();
+		$result->source = $source;
+		$result->match = $match;
+		$result->pos = $startPos;
+		$result->length = $matchPos - $startPos;
+
+		return $result;
+	}
+}
diff --git a/frontends/php/include/classes/parsers/CTriggerExpression.php b/frontends/php/include/classes/parsers/CTriggerExpression.php
index 74de6afbc8d..3d15faf367d 100644
--- a/frontends/php/include/classes/parsers/CTriggerExpression.php
+++ b/frontends/php/include/classes/parsers/CTriggerExpression.php
@@ -20,18 +20,13 @@
 
 class CTriggerExpression {
 	// for parsing of trigger expression
-	const STATE_INIT = 0;
 	const STATE_AFTER_OPEN_BRACE = 1;
-	const STATE_AFTER_OPERATOR = 2;
-	const STATE_AFTER_MINUS = 3;
-	const STATE_AFTER_CLOSE_BRACE = 4;
-	const STATE_AFTER_CONSTANT = 5;
-
-	// for parsing of item key parameters
-	const STATE_NEW = 0;
-	const STATE_END = 1;
-	const STATE_UNQUOTED = 2;
-	const STATE_QUOTED = 3;
+	const STATE_AFTER_BINARY_OPERATOR = 2;
+	const STATE_AFTER_LOGICAL_OPERATOR = 3;
+	const STATE_AFTER_NOT_OPERATOR = 4;
+	const STATE_AFTER_MINUS_OPERATOR = 5;
+	const STATE_AFTER_CLOSE_BRACE = 6;
+	const STATE_AFTER_CONSTANT = 7;
 
 	/**
 	 * Shows a validity of trigger expression
@@ -49,106 +44,102 @@ class CTriggerExpression {
 
 	/**
 	 * An array of trigger functions like {Zabbix server:agent.ping.last(0)}
-	 * The array isn't unique. Same functions can repeats.
+	 * The array isn't unique. Same functions can repeat.
 	 *
-	 * Example:
-	 *   'expressions' => array(
-	 *     0 => array(
-	 *       'expression' => '{Zabbix server:agent.ping.last(0)}',
-	 *       'pos' => 0,
-	 *       'host' => 'Zabbix server',
-	 *       'item' => 'agent.ping',
-	 *       'function' => 'last(0)',
-	 *       'functionName' => 'last',
-	 *       'functionParam' => '0',
-	 *       'functionParamList' => array (0 => '0')
-	 *     )
-	 *   )
+	 * @see CFunctionMacroParserResult::$expression     for a detailed array structure
+	 *
+	 * @deprecated  use result tokens instead
 	 *
 	 * @var array
 	 */
 	public $expressions = array();
 
 	/**
-	 * An array of macros like {TRIGGER.VALUE}
-	 * The array isn't unique. Same macros can repeats.
+	 * An options array
 	 *
-	 * Example:
-	 *   'expressions' => array(
-	 *     0 => array(
-	 *       'expression' => '{TRIGGER.VALUE}'
-	 *     )
-	 *   )
+	 * Supported options:
+	 *   'lldmacros' => true	low-level discovery macros can contain in trigger expression
 	 *
 	 * @var array
 	 */
-	public $macros = array();
+	public $options = array('lldmacros' => true);
 
 	/**
-	 * An array of user macros like {$MACRO}
-	 * The array isn't unique. Same macros can repeats.
+	 * Source string.
 	 *
-	 * Example:
-	 *    array(
-	 *     0 => array(
-	 *       'expression' => '{$MACRO}'
-	 *     ),
-	 *     1 => array(
-	 *       'expression' => '{$MACRO2}'
-	 *     ),
-	 *     2 => array(
-	 *       'expression' => '{$MACRO}'
-	 *     )
-	 *   )
+	 * @var
+	 */
+	public $expression;
+
+	/**
+	 * Current cursor position.
 	 *
-	 * @var array
+	 * @var
 	 */
-	public $usermacros = array();
+	protected $pos;
 
 	/**
-	 * An array of low-level discovery macros like {#MACRO}
-	 * The array isn't unique. Same macros can repeats.
+	 * Parser for binary operators.
 	 *
-	 * Example:
-	 *    array(
-	 *     0 => array(
-	 *       'expression' => '{#MACRO}'
-	 *     ),
-	 *     1 => array(
-	 *       'expression' => '{#MACRO2}'
-	 *     ),
-	 *     2 => array(
-	 *       'expression' => '{#MACRO}'
-	 *     )
-	 *   )
+	 * @var CSetParser
+	 */
+	protected $binaryOperatorParser;
+
+	/**
+	 * Parser for logical operators.
 	 *
-	 * @var array
+	 * @var CSetParser
 	 */
-	public $lldmacros = array();
+	protected $logicalOperatorParser;
 
 	/**
-	 * An initial expression
+	 * Parser for the "not" operator.
 	 *
-	 * @var string
+	 * @var CSetParser
 	 */
-	public $expression;
+	protected $notOperatorParser;
 
 	/**
-	 * An options array
+	 * Parser for the {TRIGGER.VALUE} macro.
 	 *
-	 * Supported otions:
-	 *   'lldmacros' => true	low-level discovery macros can contain in trigger expression
+	 * @var CSetParser
+	 */
+	protected $macroParser;
+
+	/**
+	 * Parser for function macros.
+	 *
+	 * @var CFunctionMacroParser
+	 */
+	protected $functionMacroParser;
+
+	/**
+	 * Parser for user macros.
+	 *
+	 * @var CMacroParser
+	 */
+	protected $userMacroParser;
+
+	/**
+	 * Parser for LLD macros.
+	 *
+	 * @var CMacroParser
+	 */
+	protected $lldMacroParser;
+
+	/**
+	 * Chars that should be treated as spaces.
 	 *
 	 * @var array
 	 */
-	public $options = array('lldmacros' => true);
+	protected $spaceChars = array(' ' => true, "\r" => true, "\n" => true, "\t" => true);
 
 	/**
-	 * A current position on a parsed element
+	 * Object containing the results of parsing.
 	 *
-	 * @var integer
+	 * @var CTriggerExpressionParserResult
 	 */
-	private $pos;
+	protected $result;
 
 	/**
 	 * @param array $options
@@ -158,15 +149,23 @@ class CTriggerExpression {
 		if (isset($options['lldmacros'])) {
 			$this->options['lldmacros'] = $options['lldmacros'];
 		}
+
+		$this->binaryOperatorParser = new CSetParser(array('<', '>', '<=', '>=', '+', '-', '/', '*', '=', '<>'));
+		$this->logicalOperatorParser = new CSetParser(array('and', 'or'));
+		$this->notOperatorParser = new CSetParser(array('not'));
+		$this->macroParser = new CSetParser(array('{TRIGGER.VALUE}'));
+		$this->functionMacroParser = new CFunctionMacroParser();
+		$this->userMacroParser = new CMacroParser('$');
+		$this->lldMacroParser = new CMacroParser('#');
 	}
 
 	/**
 	 * Parse a trigger expression and set public variables $this->isValid, $this->error, $this->expressions,
-	 *   $this->macros, $this->usermacros and $this->lldmacros
+	 *   $this->macros
 	 *
 	 * Examples:
 	 *   expression:
-	 *     {Zabbix server:agent.ping.lats(0)}=1 & {TRIGGER.VALUE}={$TRIGGER.VALUE}
+	 *     {Zabbix server:agent.ping.last(0)}=1 and {TRIGGER.VALUE}={$TRIGGER.VALUE}
 	 *   results:
 	 *     $this->isValid : true
 	 *     $this->error : ''
@@ -182,102 +181,272 @@ class CTriggerExpression {
 	 *         'functionParamList' => array (0 => '0')
 	 *       )
 	 *     )
-	 *     $this->macros : array(
-	 *       0 => array(
-	 *         'expression' => '{TRIGGER.VALUE}'
-	 *       )
-	 *     )
-	 *     $this->usermacros : array(
-	 *       0 => array(
-	 *         'expression' => '{$TRIGGER.VALUE}'
-	 *       )
-	 *     )
 	 *
 	 * @param string $expression
 	 *
-	 * @return bool returns true if expression is valid, false otherwise
+	 * @return CTriggerExpressionParserResult|bool   returns a result object if a match has been found or false otherwise
 	 */
 	public function parse($expression) {
 		// initializing local variables
+		$this->result = new CTriggerExpressionParserResult();
 		$this->isValid = true;
 		$this->error = '';
 		$this->expressions = array();
-		$this->macros = array();
-		$this->usermacros = array();
-		$this->lldmacros = array();
 
 		$this->pos = 0;
 		$this->expression = $expression;
 
-		$state = self::STATE_INIT;
+		$state = self::STATE_AFTER_OPEN_BRACE;
+		$afterSpace = false;
 		$level = 0;
 
 		while (isset($this->expression[$this->pos])) {
+			$char = $this->expression[$this->pos];
+
+			if (isset($this->spaceChars[$char])) {
+				$afterSpace = true;
+				$this->pos++;
+				continue;
+			}
+
 			switch ($state) {
-				case self::STATE_INIT:
 				case self::STATE_AFTER_OPEN_BRACE:
-				case self::STATE_AFTER_OPERATOR:
-					switch ($this->expression[$this->pos]) {
-						case ' ':
+					switch ($char) {
+						case '-':
+							$state = self::STATE_AFTER_MINUS_OPERATOR;
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+								$char, $this->pos, 1
+							);
+							break;
+						case '(':
+							$state = self::STATE_AFTER_OPEN_BRACE;
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPEN_BRACE,
+								$char, $this->pos, 1
+							);
+							$level++;
 							break;
+						default:
+							if ($this->parseUsing($this->notOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+								$state = self::STATE_AFTER_NOT_OPERATOR;
+							}
+							elseif ($this->parseConstant()) {
+								$state = self::STATE_AFTER_CONSTANT;
+							}
+							else {
+								break 3;
+							}
+					}
+
+					break;
+				case self::STATE_AFTER_BINARY_OPERATOR:
+					switch ($char) {
 						case '-':
-							$state = self::STATE_AFTER_MINUS;
+							$state = self::STATE_AFTER_MINUS_OPERATOR;
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+								$char, $this->pos, 1
+							);
 							break;
 						case '(':
 							$state = self::STATE_AFTER_OPEN_BRACE;
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPEN_BRACE,
+								$char, $this->pos, 1
+							);
 							$level++;
 							break;
 						default:
-							if (!$this->parseConstant()) {
+							if ($this->parseConstant()) {
+								$state = self::STATE_AFTER_CONSTANT;
+								break;
+							}
+
+							if (!$afterSpace) {
+								break 3;
+							}
+
+							if ($this->parseUsing($this->notOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+
+								$state = self::STATE_AFTER_NOT_OPERATOR;
+							}
+							else {
 								break 3;
 							}
-							$state = self::STATE_AFTER_CONSTANT;
 					}
+
 					break;
-				case self::STATE_AFTER_MINUS:
-					switch ($this->expression[$this->pos]) {
-						case ' ':
+				case self::STATE_AFTER_LOGICAL_OPERATOR:
+					switch ($char) {
+						case '-':
+							if (!$afterSpace) {
+								break 3;
+							}
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+								$char, $this->pos, 1
+							);
+							$state = self::STATE_AFTER_MINUS_OPERATOR;
 							break;
 						case '(':
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPEN_BRACE,
+								$char, $this->pos, 1
+							);
 							$state = self::STATE_AFTER_OPEN_BRACE;
 							$level++;
 							break;
 						default:
-							if (!$this->parseConstant()) {
+							if (!$afterSpace) {
+								break 3;
+							}
+
+							if ($this->parseUsing($this->notOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+
+								$state = self::STATE_AFTER_NOT_OPERATOR;
+							}
+							elseif ($this->parseConstant()) {
+								$state = self::STATE_AFTER_CONSTANT;
+							}
+							else {
 								break 3;
 							}
-							$state = self::STATE_AFTER_CONSTANT;
 					}
+
 					break;
 				case self::STATE_AFTER_CLOSE_BRACE:
-				case self::STATE_AFTER_CONSTANT:
-					switch ($this->expression[$this->pos]) {
-						case ' ':
-							break;
-						case '=':
-						case '#':
-						case '<':
-						case '>':
-						case '&':
-						case '|':
-						case '+':
-						case '-':
-						case '/':
-						case '*':
-							$state = self::STATE_AFTER_OPERATOR;
+					switch ($char) {
+						case ')':
+							if ($level == 0) {
+								break 3;
+							}
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_CLOSE_BRACE,
+								$char, $this->pos, 1
+							);
+							$level--;
 							break;
+						default:
+							if ($this->parseUsing($this->binaryOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+
+								$state = self::STATE_AFTER_BINARY_OPERATOR;
+								break;
+							}
+
+							if ($this->parseUsing($this->logicalOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+
+								$state = self::STATE_AFTER_LOGICAL_OPERATOR;
+								break;
+							}
+
+							if (!$afterSpace) {
+								break 3;
+							}
+
+							if ($this->parseUsing($this->notOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+
+								$state = self::STATE_AFTER_NOT_OPERATOR;
+							}
+							else {
+								break 3;
+							}
+					}
+
+					break;
+				case self::STATE_AFTER_CONSTANT:
+					switch ($char) {
 						case ')':
-							$state = self::STATE_AFTER_CLOSE_BRACE;
 							if ($level == 0) {
 								break 3;
 							}
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_CLOSE_BRACE,
+								$char, $this->pos, 1
+							);
 							$level--;
+							$state = self::STATE_AFTER_CLOSE_BRACE;
+							break;
+						default:
+							if ($this->parseUsing($this->binaryOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+
+								$state = self::STATE_AFTER_BINARY_OPERATOR;
+								break;
+							}
+
+							if (!$afterSpace) {
+								break 3;
+							}
+
+							if ($this->parseUsing($this->notOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+
+								$state = self::STATE_AFTER_NOT_OPERATOR;
+							}
+							elseif ($this->parseUsing($this->logicalOperatorParser,
+									CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR)) {
+
+								$state = self::STATE_AFTER_LOGICAL_OPERATOR;
+							}
+							else {
+								break 3;
+							}
+					}
+
+					break;
+				case self::STATE_AFTER_NOT_OPERATOR:
+					switch ($char) {
+						case '-':
+							if (!$afterSpace) {
+								break 3;
+							}
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+								$char, $this->pos, 1
+							);
+							$state = self::STATE_AFTER_MINUS_OPERATOR;
+							break;
+						case '(':
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPEN_BRACE,
+								$char, $this->pos, 1
+							);
+							$state = self::STATE_AFTER_OPEN_BRACE;
+							$level++;
 							break;
 						default:
-							break 3;
+							if (!$afterSpace) {
+								break 3;
+							}
+
+							if ($this->parseConstant()) {
+								$state = self::STATE_AFTER_CONSTANT;
+							}
+							else {
+								break 3;
+							}
 					}
+
+					break;
+				case self::STATE_AFTER_MINUS_OPERATOR:
+					switch ($char) {
+						case '(':
+							$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_OPEN_BRACE,
+								$char, $this->pos, 1
+							);
+							$state = self::STATE_AFTER_OPEN_BRACE;
+							$level++;
+							break;
+						default:
+							if ($this->parseConstant()) {
+								$state = self::STATE_AFTER_CONSTANT;
+							}
+							else {
+								break 3;
+							}
+					}
+
 					break;
 			}
+
+			$afterSpace = false;
 			$this->pos++;
 		}
 
@@ -286,13 +455,22 @@ class CTriggerExpression {
 			$this->isValid = false;
 		}
 
-		if ($level != 0 || isset($this->expression[$this->pos]) || $state == self::STATE_AFTER_OPERATOR || $state == self::STATE_AFTER_MINUS) {
+		if ($level != 0 || isset($this->expression[$this->pos])
+				|| ($state != self::STATE_AFTER_CLOSE_BRACE && $state != self::STATE_AFTER_CONSTANT)) {
+
 			$this->error = _('Incorrect trigger expression.').' '._s('Check expression part starting from "%1$s".',
 					substr($this->expression, $this->pos == 0 ? 0 : $this->pos - 1));
 			$this->isValid = false;
+
+			return false;
 		}
 
-		return $this->isValid;
+		$this->result->source = $expression;
+		$this->result->match = $expression;
+		$this->result->pos = 0;
+		$this->result->length = $this->pos;
+
+		return $this->result;
 	}
 
 	/**
@@ -309,310 +487,92 @@ class CTriggerExpression {
 	}
 
 	/**
-	 * Parses a constant in the trigger expression and moves a current position ($this->pos) on a last symbol of the constant
+	 * Parse the string using the given parser. If a match has been found, move the cursor to the last symbol of the
+	 * matched string.
 	 *
-	 * The constant can be:
-	 *  - trigger function like {host:item[].func()}
-	 *  - floating point number; can be with suffix [KMGTsmhdw]
-	 *  - macro like {TRIGGER.VALUE}
-	 *  - user macro like {$MACRO}
+	 * @param CParser   $parser
+	 * @param int       $tokenType
 	 *
-	 * @return bool returns true if parsed successfully, false otherwise
+	 * @return CParserResult|bool		CParserResult object if a match has been found, false otherwise
 	 */
-	private function parseConstant() {
-		if ($this->parseFunctionMacro() || $this->parseNumber() || $this->parseMacro() || $this->parseUserMacro()
-				|| $this->parseLLDMacro()) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Parses a trigger function macro constant in the trigger expression and
-	 * moves a current position ($this->pos) on a last symbol of the macro
-	 *
-	 * @return bool returns true if parsed successfully, false otherwise
-	 */
-	private function parseFunctionMacro() {
+	protected function parseUsing(CParser $parser, $tokenType) {
 		$j = $this->pos;
 
-		if (!isset($this->expression[$j]) || $this->expression[$j++] != '{' || ($host = $this->parseHost($j)) === null) {
-			return false;
-		}
+		$result = $parser->parse($this->expression, $j);
 
-		if (!isset($this->expression[$j]) || $this->expression[$j++] != ':' || ($item = $this->parseItem($j)) === null) {
+		if (!$result) {
 			return false;
 		}
 
-		if (!isset($this->expression[$j]) || $this->expression[$j++] != '.'
-				|| !(list($function, $functionParamList) = $this->parseFunction($j))) {
-			return false;
-		}
+		$this->pos += $result->length - 1;
 
-		if (!isset($this->expression[$j]) || $this->expression[$j] != '}') {
-			return false;
-		}
+		$this->result->addToken($tokenType, $result->match, $result->pos, $result->length);
 
-		$this->expressions[] = array(
-			'expression' => substr($this->expression, $this->pos, $j - $this->pos + 1),
-			'pos' => $this->pos,
-			'host' => $host,
-			'item' => $item,
-			'function' => $function,
-			'functionName' => substr($function, 0, strpos($function, '(')),
-			'functionParam' => substr($function, strpos($function, '(') + 1, -1),
-			'functionParamList' => $functionParamList
-		);
-		$this->pos = $j;
-		return true;
+		return $result;
 	}
 
 	/**
-	 * Parses a host in a trigger function macro constant and moves a position ($pos) on a next symbol after the host
+	 * Parses a constant in the trigger expression and moves a current position ($this->pos) on a last symbol of the
+	 * constant
 	 *
-	 * @return string returns a host name if parsed successfully or null otherwise
-	 */
-	private function parseHost(&$pos)
-	{
-		$j = $pos;
-
-		while (isset($this->expression[$j]) && $this->isHostChar($this->expression[$j])) {
-			$j++;
-		}
-
-		// is host empty?
-		if ($pos == $j) {
-			return null;
-		}
-
-		$host = substr($this->expression, $pos, $j - $pos);
-		$pos = $j;
-		return $host;
-	}
-
-	/**
-	 * Parses an item in a trigger function macro constant and moves a position ($pos) on a next symbol after the item
+	 * The constant can be:
+	 *  - trigger function like {host:item[].func()}
+	 *  - floating point number; can be with suffix [KMGTsmhdw]
+	 *  - macro like {TRIGGER.VALUE}
+	 *  - user macro like {$MACRO}
 	 *
-	 * @return string returns an item name if parsed successfully or null otherwise
+	 * @return bool returns true if parsed successfully, false otherwise
 	 */
-	private function parseItem(&$pos)
-	{
-		$j = $pos;
-
-		while (isset($this->expression[$j]) && $this->isKeyChar($this->expression[$j])) {
-			$j++;
-		}
+	private function parseConstant() {
+		if ($this->parseFunctionMacro() || $this->parseNumber()
+				|| $this->parseUsing($this->macroParser, CTriggerExpressionParserResult::TOKEN_TYPE_MACRO)
+				|| $this->parseUsing($this->userMacroParser, CTriggerExpressionParserResult::TOKEN_TYPE_USER_MACRO)) {
 
-		// for instance, agent.ping.last(0)
-		if (isset($this->expression[$j]) && $this->expression[$j] == '(') {
-			while ($j > $pos && $this->expression[$j] != '.') {
-				$j--;
-			}
+			return true;
 		}
-		// for instance, net.tcp.port[,80]
-		elseif (isset($this->expression[$j]) && $this->expression[$j] == '[') {
-			$level = 0;
-			$state = self::STATE_END;
-
-			while (isset($this->expression[$j])) {
-				if ($level == 0) {
-					// first square bracket + Zapcat compatibility
-					if ($state == self::STATE_END && $this->expression[$j] == '[') {
-						$state = self::STATE_NEW;
-					}
-					else {
-						break;
-					}
-				}
-
-				switch ($state) {
-					// a new parameter started
-					case self::STATE_NEW:
-						switch ($this->expression[$j]) {
-							case ' ':
-							case ',':
-								break;
-							case '[':
-								$level++;
-								break;
-							case ']':
-								$level--;
-								$state = self::STATE_END;
-								break;
-							case '"':
-								$state = self::STATE_QUOTED;
-								break;
-							default:
-								$state = self::STATE_UNQUOTED;
-						}
-						break;
-					// end of parameter
-					case self::STATE_END:
-						switch ($this->expression[$j]) {
-							case ' ':
-								break;
-							case ',':
-								$state = self::STATE_NEW;
-								break;
-							case ']':
-								$level--;
-								break;
-							default:
-								return null;
-						}
-						break;
-					// an unquoted parameter
-					case self::STATE_UNQUOTED:
-						switch ($this->expression[$j]) {
-							case ']':
-								$level--;
-								$state = self::STATE_END;
-								break;
-							case ',':
-								$state = self::STATE_NEW;
-								break;
-						}
-						break;
-					// a quoted parameter
-					case self::STATE_QUOTED:
-						switch ($this->expression[$j]) {
-							case '"':
-								if ($this->expression[$j - 1] != '\\') {
-									$state = self::STATE_END;
-								}
-								break;
-						}
-						break;
-				}
-				$j++;
-			}
 
-			if ($level != 0) {
-				return null;
-			}
-		}
+		// LLD macro support for trigger prototypes
+		if (($this->options['lldmacros']
+			&& $this->parseUsing($this->lldMacroParser, CTriggerExpressionParserResult::TOKEN_TYPE_LLD_MACRO))) {
 
-		// is key empty?
-		if ($pos == $j) {
-			return null;
+			return true;
 		}
 
-		$item = substr($this->expression, $pos, $j - $pos);
-		$pos = $j;
-		return $item;
+		return false;
 	}
 
 	/**
-	 * Parses an function in a trigger function macro constant and moves a position ($pos) on a next symbol after the function
-	 *
-	 * Returns an array if parsed successfully or null otherwise
-	 * Returned array contains two elements:
-	 *   0 => function name like "last(0)"
-	 *   1 => array of parsed function parameters
+	 * Parses a trigger function macro constant in the trigger expression and
+	 * moves a current position ($this->pos) on a last symbol of the macro
 	 *
-	 * @return array
+	 * @return bool returns true if parsed successfully, false otherwise
 	 */
-	private function parseFunction(&$pos)
-	{
-		$j = $pos;
-
-		while (isset($this->expression[$j]) && $this->isFunctionChar($this->expression[$j])) {
-			$j++;
-		}
+	private function parseFunctionMacro() {
+		$startPos = $this->pos;
 
-		// is function empty?
-		if ($pos == $j) {
-			return null;
-		}
+		$parser = new CFunctionMacroParser();
+		$result = $parser->parse($this->expression, $this->pos);
 
-		if (!isset($this->expression[$j]) || $this->expression[$j++] != '(') {
-			return null;
+		if (!$result) {
+			return false;
 		}
 
-		$state = self::STATE_NEW;
-		$num = 0;
-		$functionParamList = array();
-		$functionParamList[$num] = '';
+		$this->pos += $result->length - 1;
 
-		while (isset($this->expression[$j])) {
-			switch ($state) {
-				// a new parameter started
-				case self::STATE_NEW:
-					switch ($this->expression[$j]) {
-						case ' ':
-							break;
-						case ',':
-							$functionParamList[++$num] = '';
-							break;
-						case ')':
-							// end of parameters
-							break 3;
-						case '"':
-							$state = self::STATE_QUOTED;
-							break;
-						default:
-							$functionParamList[$num] .= $this->expression[$j];
-							$state = self::STATE_UNQUOTED;
-					}
-					break;
-				// end of parameter
-				case self::STATE_END:
-					switch ($this->expression[$j]) {
-						case ' ':
-							break;
-						case ',':
-							$functionParamList[++$num] = '';
-							$state = self::STATE_NEW;
-							break;
-						case ')':
-							// end of parameters
-							break 3;
-						default:
-							return null;
-					}
-					break;
-				// an unquoted parameter
-				case self::STATE_UNQUOTED:
-					switch ($this->expression[$j]) {
-						case ')':
-							// end of parameters
-							break 3;
-						case ',':
-							$functionParamList[++$num] = '';
-							$state = self::STATE_NEW;
-							break;
-						default:
-							$functionParamList[$num] .= $this->expression[$j];
-					}
-					break;
-				// a quoted parameter
-				case self::STATE_QUOTED:
-					switch ($this->expression[$j]) {
-						case '"':
-							$state = self::STATE_END;
-							break;
-						case '\\':
-							if (isset($this->expression[$j + 1]) && $this->expression[$j + 1] == '"') {
-								$j++;
-							}
-							// break; is not missing here
-						default:
-							$functionParamList[$num] .= $this->expression[$j];
-							break;
-					}
-					break;
-			}
-			$j++;
-		}
+		$this->result->addToken(CTriggerExpressionParserResult::TOKEN_TYPE_FUNCTION_MACRO, $result->match,
+			$startPos, $result->length,
+			array(
+				'host' => $result->expression['host'],
+				'item' => $result->expression['item'],
+				'function' => $result->expression['function'],
+				'functionName' => $result->expression['functionName'],
+				'functionParams' => $result->expression['functionParamList']
+			)
+		);
 
-		if (!isset($this->expression[$j]) || $this->expression[$j++] != ')') {
-			return null;
-		}
+		$this->expressions[] = $result->expression;
 
-		$function = substr($this->expression, $pos, $j - $pos);
-		$pos = $j;
-		return array($function, $functionParamList);
+		return true;
 	}
 
 	/**
@@ -623,185 +583,52 @@ class CTriggerExpression {
 	 */
 	private function parseNumber() {
 		$j = $this->pos;
+		$digits = 0;
+		$dots = 0;
 
-		if ($this->expression[$j] < '0' || $this->expression[$j] > '9') {
-			return false;
-		}
-
-		$j++;
-		while (isset($this->expression[$j]) && $this->expression[$j] >= '0' && $this->expression[$j] <= '9') {
-			$j++;
-		}
-
-		if (isset($this->expression[$j]) && $this->expression[$j] == '.') {
-			$j++;
-			if (!isset($this->expression[$j]) || $this->expression[$j] < '0' || $this->expression[$j] > '9') {
-				return false;
-			}
-
-			$j++;
-			while (isset($this->expression[$j]) && $this->expression[$j] >= '0' && $this->expression[$j] <= '9') {
+		while (isset($this->expression[$j])) {
+			if ($this->expression[$j] >= '0' && $this->expression[$j] <= '9') {
+				$digits++;
 				$j++;
+				continue;
 			}
-		}
-
-		// check for an optional suffix
-		if (isset($this->expression[$j]) && strpos(ZBX_BYTE_SUFFIXES.ZBX_TIME_SUFFIXES, $this->expression[$j]) !== false) {
-			$j++;
-		}
-
-		$this->pos = $j - 1;
-		return true;
-	}
-
-	/**
-	 * Parses a macro constant in the trigger expression and
-	 * moves a current position ($this->pos) on a last symbol of the macro
-	 *
-	 * @return bool returns true if parsed successfully, false otherwise
-	 */
-	private function parseMacro() {
-		$macros = array('{TRIGGER.VALUE}');
-
-		foreach ($macros as $macro) {
-			$len = strlen($macro);
 
-			if (substr($this->expression, $this->pos, $len) != $macro) {
+			if ($this->expression[$j] === '.') {
+				$dots++;
+				$j++;
 				continue;
 			}
 
-			$this->macros[] = array('expression' => $macro);
-			$this->pos += $len - 1;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Parses an user macro constant in the trigger expression and
-	 * moves a current position ($this->pos) on a last symbol of the macro
-	 *
-	 * @return bool returns true if parsed successfully, false otherwise
-	 */
-	private function parseUserMacro() {
-		$j = $this->pos;
-
-		if ($this->expression[$j++] != '{') {
-			return false;
+			break;
 		}
 
-		if (!isset($this->expression[$j]) || $this->expression[$j++] != '$') {
+		if ($digits == 0 || $dots > 1) {
 			return false;
 		}
 
-		if (!isset($this->expression[$j]) || !$this->isMacroChar($this->expression[$j++])) {
-			return false;
-		}
+		// check for an optional suffix
+		$suffix = null;
+		if (isset($this->expression[$j])
+				&& strpos(ZBX_BYTE_SUFFIXES.ZBX_TIME_SUFFIXES, $this->expression[$j]) !== false) {
 
-		while (isset($this->expression[$j]) && $this->isMacroChar($this->expression[$j])) {
+			$suffix = $this->expression[$j];
 			$j++;
 		}
 
-		if (!isset($this->expression[$j]) || $this->expression[$j] != '}') {
-			return false;
-		}
-
-		$usermacro = substr($this->expression, $this->pos, $j - $this->pos + 1);
-		$this->usermacros[] = array('expression' => $usermacro);
-		$this->pos = $j;
-		return true;
-	}
-
-	/**
-	 * Parses a low-level discovery macro constant in the trigger expression and
-	 * moves a current position ($this->pos) on a last symbol of the macro
-	 *
-	 * @return bool returns true if parsed successfully, false otherwise
-	 */
-	private function parseLLDMacro() {
-		if (!$this->options['lldmacros']) {
-			return false;
-		}
-
-		$j = $this->pos;
-
-		if ($this->expression[$j++] != '{') {
-			return false;
-		}
+		$numberLength = $j - $this->pos;
 
-		if (!isset($this->expression[$j]) || $this->expression[$j++] != '#') {
-			return false;
-		}
-
-		if (!isset($this->expression[$j]) || !$this->isMacroChar($this->expression[$j++])) {
-			return false;
-		}
-
-		while (isset($this->expression[$j]) && $this->isMacroChar($this->expression[$j])) {
-			$j++;
-		}
+		$this->result->addToken(
+			CTriggerExpressionParserResult::TOKEN_TYPE_NUMBER,
+			substr($this->expression, $this->pos, $numberLength),
+			$this->pos,
+			$numberLength,
+			array(
+				'suffix' => $suffix
+			)
+		);
 
-		if (!isset($this->expression[$j]) || $this->expression[$j] != '}') {
-			return false;
-		}
+		$this->pos = $j - 1;
 
-		$lldmacro = substr($this->expression, $this->pos, $j - $this->pos + 1);
-		$this->lldmacros[] = array('expression' => $lldmacro);
-		$this->pos = $j;
 		return true;
 	}
-
-	/**
-	 * Returns true if the char is allowed in the host name, false otherwise
-	 *
-	 * @return bool
-	 */
-	private function isHostChar($c) {
-		if (($c >= 'a' && $c <= 'z') || ($c >= 'A' && $c <= 'Z') || ($c >= '0' && $c <= '9')
-				|| $c == '.' || $c == ' ' || $c == '_' || $c == '-') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns true if the char is allowed in the item key, false otherwise
-	 *
-	 * @return bool
-	 */
-	private function isKeyChar($c) {
-		if (($c >= 'a' && $c <= 'z') || ($c >= 'A' && $c <= 'Z') || ($c >= '0' && $c <= '9')
-				|| $c == '.' || $c == '_' || $c == '-') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns true if the char is allowed in the function name, false otherwise
-	 *
-	 * @return bool
-	 */
-	private function isFunctionChar($c) {
-		if ($c >= 'a' && $c <= 'z') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns true if the char is allowed in the macro, false otherwise
-	 *
-	 * @return bool
-	 */
-	private function isMacroChar($c) {
-		if (($c >= 'A' && $c <= 'Z') || $c == '.' || $c == '_' || ($c >= '0' && $c <= '9')) {
-			return true;
-		}
-
-		return false;
-	}
 }
diff --git a/frontends/php/include/classes/parsers/results/CFunctionMacroParserResult.php b/frontends/php/include/classes/parsers/results/CFunctionMacroParserResult.php
new file mode 100644
index 00000000000..0e45b7430f0
--- /dev/null
+++ b/frontends/php/include/classes/parsers/results/CFunctionMacroParserResult.php
@@ -0,0 +1,47 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+/**
+ * Class for storing the result returned by the function macro parser.
+ */
+class CFunctionMacroParserResult extends CParserResult {
+
+	/**
+	 * Array containing information about the parsed function macro.
+	 *
+	 * Example:
+	 *   array(
+	 *     'expression' => '{Zabbix server:agent.ping.last(0)}',
+	 *     'pos' => 0,
+	 *     'host' => 'Zabbix server',
+	 *     'item' => 'agent.ping',
+	 *     'function' => 'last(0)',
+	 *     'functionName' => 'last',
+	 *     'functionParam' => '0',
+	 *     'functionParamList' => array (0 => '0')
+	 *   )
+	 *
+	 * @deprecated  implement tokens instead
+	 *
+	 * @var array
+	 */
+	public $expression = array();
+
+}
diff --git a/frontends/php/include/classes/parsers/results/CParserResult.php b/frontends/php/include/classes/parsers/results/CParserResult.php
new file mode 100644
index 00000000000..15ac9254a67
--- /dev/null
+++ b/frontends/php/include/classes/parsers/results/CParserResult.php
@@ -0,0 +1,53 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+/**
+ * Class for storing the result returned by a parser.
+ */
+class CParserResult {
+
+	/**
+	 * Source string.
+	 *
+	 * @var	string
+	 */
+	public $source;
+
+	/**
+	 * Parsed string.
+	 *
+	 * @var string
+	 */
+	public $match;
+
+	/**
+	 * Starting position of the matched string in the source string.
+	 *
+	 * @var
+	 */
+	public $pos;
+
+	/**
+	 * Length of the matched string in bytes.
+	 *
+	 * @var int
+	 */
+	public $length;
+}
diff --git a/frontends/php/include/classes/parsers/results/CTriggerExpressionParserResult.php b/frontends/php/include/classes/parsers/results/CTriggerExpressionParserResult.php
new file mode 100644
index 00000000000..426a9e1323f
--- /dev/null
+++ b/frontends/php/include/classes/parsers/results/CTriggerExpressionParserResult.php
@@ -0,0 +1,124 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+/**
+ * Class for storing the result returned by the trigger expression parser.
+ */
+class CTriggerExpressionParserResult extends CParserResult {
+
+	const TOKEN_TYPE_OPEN_BRACE = 0;
+	const TOKEN_TYPE_CLOSE_BRACE = 1;
+	const TOKEN_TYPE_OPERATOR = 2;
+	const TOKEN_TYPE_NUMBER = 3;
+	const TOKEN_TYPE_FUNCTION_MACRO = 4;
+	const TOKEN_TYPE_MACRO = 5;
+	const TOKEN_TYPE_USER_MACRO = 6;
+	const TOKEN_TYPE_LLD_MACRO = 7;
+
+	/**
+	 * Array of expression tokens.
+	 *
+	 * Each token contains the following values:
+	 * - type   - token type
+	 * - value  - the token string itself
+	 * - pos    - position of the token in the source string
+	 * - length - length of the token
+	 * - data   - an array containing additional information about the token
+	 *
+	 * The following "data" information can be available depending on the type of the token.
+	 * For self::TOKEN_TYPE_FUNCTION_MACRO tokens:
+	 * - host           - host name
+	 * - item           - item key
+	 * - function       - the function string, e.g., "function(param1, param2)"
+	 * - functionName   - function name without parameters
+	 * - functionParams - array of function parameters
+	 * For self::TOKEN_TYPE_NUMBER tokens:
+	 * - suffix         - a time or byte suffix
+	 *
+	 * @var array
+	 */
+	protected $tokens = array();
+
+	/**
+	 * Return the expression tokens.
+	 *
+	 * @see CTriggerExpressionParserResult::$token    for the structure of a token array
+	 *
+	 * @return array
+	 */
+	public function getTokens() {
+		return $this->tokens;
+	}
+
+	/**
+	 * Add a token to the result.
+	 *
+	 * @param string        $type       token type
+	 * @param string        $value      token string
+	 * @param string        $pos        position of the token in the source string
+	 * @param string        $length     length of the token
+	 * @param array|null    $data       additional token information
+	 */
+	public function addToken($type, $value, $pos, $length, array $data = null) {
+		$this->tokens[] = array(
+			'type' => $type,
+			'value' => $value,
+			'pos' => $pos,
+			'length' => $length,
+			'data' => $data
+		);
+	}
+
+	/**
+	 * Returns all tokens of the given type.
+	 *
+	 * @param $type
+	 *
+	 * @return array
+	 */
+	public function getTokensByType($type) {
+		$result = array();
+
+		foreach ($this->tokens as $token) {
+			if ($token['type'] == $type) {
+				$result[] = $token;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Check whether the expression contains at least one token of the given type.
+	 *
+	 * @param int $type
+	 *
+	 * @return bool
+	 */
+	public function hasTokenOfType($type) {
+		foreach ($this->tokens as $token) {
+			if ($token['type'] == $type) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/frontends/php/include/classes/class.globalregexp.php b/frontends/php/include/classes/regexp/CGlobalRegexp.php
index bc410e26f88..bcdc12fa629 100644
--- a/frontends/php/include/classes/class.globalregexp.php
+++ b/frontends/php/include/classes/regexp/CGlobalRegexp.php
@@ -26,7 +26,7 @@
  *
  * @throws Exception
  */
-class GlobalRegExp {
+class CGlobalRegexp {
 
 	const ERROR_REGEXP_EMPTY = 1;
 	const ERROR_REGEXP_NOT_EXISTS = 2;
@@ -144,6 +144,16 @@ class GlobalRegExp {
 		return $result;
 	}
 
+	/**
+	 * Matches expression against test string, respecting expression type.
+	 *
+	 * @static
+	 *
+	 * @param array $expression
+	 * @param $string
+	 *
+	 * @return bool
+	 */
 	public static function matchExpression(array $expression, $string) {
 		if ($expression['expression_type'] == EXPRESSION_TYPE_TRUE || $expression['expression_type'] == EXPRESSION_TYPE_FALSE) {
 			$result = self::_matchRegular($expression, $string);
@@ -166,14 +176,31 @@ class GlobalRegExp {
 	 * @return bool
 	 */
 	private static function _matchRegular(array $expression, $string) {
+		$pattern = self::buildRegularExpression($expression);
+
+		$expectedResult = ($expression['expression_type'] == EXPRESSION_TYPE_TRUE);
+
+		return preg_match($pattern, $string) == $expectedResult;
+	}
+
+	/**
+	 * Combines regular expression provided as definition array into a string.
+	 *
+	 * @static
+	 *
+	 * @param array $expression
+	 *
+	 * @return string
+	 */
+	private static function buildRegularExpression(array $expression) {
+		$expression['expression'] = str_replace('/', '\/', $expression['expression']);
+
 		$pattern = '/'.$expression['expression'].'/';
 		if (!$expression['case_sensitive']) {
 			$pattern .= 'i';
 		}
 
-		$expectedResult = ($expression['expression_type'] == EXPRESSION_TYPE_TRUE);
-
-		return preg_match($pattern, $string) == $expectedResult;
+		return $pattern;
 	}
 
 	/**
@@ -190,22 +217,26 @@ class GlobalRegExp {
 		$result = true;
 
 		if ($expression['expression_type'] == EXPRESSION_TYPE_ANY_INCLUDED) {
-			$paterns = explode($expression['exp_delimiter'], $expression['expression']);
+			$patterns = explode($expression['exp_delimiter'], $expression['expression']);
 		}
 		else {
-			$paterns = array($expression['expression']);
+			$patterns = array($expression['expression']);
 		}
 
 		$expectedResult = ($expression['expression_type'] != EXPRESSION_TYPE_NOT_INCLUDED);
 
-		foreach ($paterns as $patern) {
-			if ($expression['case_sensitive']) {
-				$tmp = ((zbx_strstr($string, $patern) !== false) == $expectedResult);
-			}
-			else {
-				$tmp = ((zbx_stristr($string, $patern) !== false) == $expectedResult);
+		if (!$expression['case_sensitive']) {
+			$string = mb_strtolower($string);
+		}
+
+		foreach ($patterns as $pattern) {
+			if (!$expression['case_sensitive']) {
+				$pattern = mb_strtolower($pattern);
 			}
 
+			$pos = mb_strpos($string, $pattern);
+			$tmp = (($pos !== false) == $expectedResult);
+
 			if ($expression['expression_type'] == EXPRESSION_TYPE_ANY_INCLUDED && $tmp) {
 				return true;
 			}
diff --git a/frontends/php/include/classes/class.curl.php b/frontends/php/include/classes/routing/CUrl.php
index 5cc228f7e54..1f7ee12da25 100644
--- a/frontends/php/include/classes/class.curl.php
+++ b/frontends/php/include/classes/routing/CUrl.php
@@ -19,7 +19,7 @@
 **/
 
 
-class Curl {
+class CUrl {
 
 	private $url;
 	protected $reference;
@@ -36,17 +36,17 @@ class Curl {
 			$this->url = $url;
 
 			// parse reference
-			$tmp_pos = zbx_strpos($this->url, '#');
-			if ($tmp_pos !== false) {
-				$this->reference = zbx_substring($this->url, $tmp_pos + 1);
-				$this->url = zbx_substring($this->url, 0, $tmp_pos);
+			$pos = strpos($url, '#');
+			if ($pos !== false) {
+				$this->reference = substr($url, $pos + 1);
+				$this->url = substr($url, 0, $pos);
 			}
 
-			$tmp_pos = zbx_strpos($url, '?');
 			// parse query
-			if ($tmp_pos !== false) {
-				$this->query = zbx_substring($url, $tmp_pos + 1);
-				$this->url = $url = zbx_substring($url, 0, $tmp_pos);
+			$pos = strpos($url, '?');
+			if ($pos !== false) {
+				$this->query = substr($url, $pos + 1);
+				$this->url = substr($url, 0, $pos);
 			}
 
 			$this->formatArguments();
@@ -66,6 +66,7 @@ class Curl {
 
 	public function formatGetArguments() {
 		$this->arguments = $_GET;
+
 		if (isset($_COOKIE['zbx_sessionid'])) {
 			$this->setArgument('sid', substr($_COOKIE['zbx_sessionid'], 16, 16));
 		}
@@ -143,4 +144,14 @@ class Curl {
 	public function toString() {
 		return $this->getUrl();
 	}
+
+	public function getArguments()
+	{
+		return $this->arguments;
+	}
+
+	public function setArguments($arguments)
+	{
+		$this->arguments = $arguments;
+	}
 }
diff --git a/frontends/php/include/classes/routing/CUrlFactory.php b/frontends/php/include/classes/routing/CUrlFactory.php
new file mode 100644
index 00000000000..b1abeaf926d
--- /dev/null
+++ b/frontends/php/include/classes/routing/CUrlFactory.php
@@ -0,0 +1,155 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+class CUrlFactory {
+
+	/**
+	 * Configuration of context configurations. Top-level key is file name from $page['file'], below goes:
+	 * 'remove' - to remove arguments
+	 * 'add' - name of $_REQUEST keys to be kept as arguments
+	 * 'callable' - callable to apply to argument list
+	 *
+	 * @var array
+	 */
+	protected static $contextConfigs = array(
+		'actionconf.php' => array(
+			'remove' => array('actionid')
+		),
+		'applications.php' => array(
+			'remove' => array('applicationid')
+		),
+		'disc_prototypes.php' => array(
+			'remove' => array('itemid'),
+			'add' => array('hostid', 'parent_discoveryid')
+		),
+		'discoveryconf.php' => array(
+			'remove' => array('druleid')
+		),
+		'graphs.php' => array(
+			'remove' => array('graphid'),
+			'add' => array('hostid', 'parent_discoveryid')
+		),
+		'host_discovery.php' => array(
+			'remove' => array('itemid'),
+			'add' => array('hostid')
+		),
+		'host_prototypes.php' => array(
+			'remove' => array('hostid'),
+			'add' => array('parent_discoveryid')
+		),
+		'hostgroups.php' => array(
+			'remove' => array('groupid')
+		),
+		'hosts.php' => array(
+			'remove' => array('hostid')
+		),
+		'httpconf.php' => array(
+			'remove' => array('httptestid')
+		),
+		'items.php' => array(
+			'remove' => array('itemid')
+		),
+		'maintenance.php' => array(
+			'remove' => array('maintenanceid')
+		),
+		'media_types.php' => array(
+			'remove' => array('mediatypeid')
+		),
+		'proxies.php' => array(
+			'remove' => array('proxyid')
+		),
+		'screenconf.php' => array(
+			'remove' => array('screenid'),
+			'add' => array('templateid')
+		),
+		'scripts.php' => array(
+			'remove' => array('scriptid')
+		),
+		'slideconf.php' => array(
+			'remove' => array('slideshowid')
+		),
+		'sysmaps.php' => array(
+			'remove' => array('sysmapid')
+		),
+		'templates.php' => array(
+			'remove' => array('templateid')
+		),
+		'trigger_prototypes.php' => array(
+			'remove' =>  array('triggerid'),
+			'add' => array('parent_discoveryid', 'hostid')
+		),
+		'triggers.php' => array(
+			'remove' => array('triggerid'),
+			'add' => array('hostid')
+		),
+		'usergrps.php' => array(
+			'remove' => array('usrgrpid')
+		),
+		'users.php' => array(
+			'remove' => array('userid')
+		),
+		'__default' => array(
+			'remove' => array('action', 'cancel', 'form', 'delete')
+		)
+	);
+
+	/**
+	 * Creates new CUrl object based on giver URL (or $_REQUEST if null is given),
+	 * and adds/removes parameters based on current page context.
+	 *
+	 * @param string $sourceUrl
+	 *
+	 * @return CUrl
+	 */
+	public static function getContextUrl($sourceUrl = null) {
+		$config = self::resolveConfig();
+
+		$url = new CUrl($sourceUrl);
+
+		if (isset($config['remove'])) {
+			foreach ($config['remove'] as $key) {
+				$url->removeArgument($key);
+			}
+		}
+
+		if (isset($config['add'])) {
+			foreach ($config['add'] as $key) {
+				$url->setArgument($key, getRequest($key));
+			}
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Resolves context configuration for current file (based on $page['file'] global variable)
+	 *
+	 * @return array
+	 */
+	protected static function resolveConfig() {
+		global $page;
+
+		if (isset(self::$contextConfigs[$page['file']])) {
+			return array_merge_recursive(self::$contextConfigs['__default'], self::$contextConfigs[$page['file']]);
+		}
+
+		return self::$contextConfigs['__default'];
+	}
+}
diff --git a/frontends/php/include/classes/screens/CScreenActions.php b/frontends/php/include/classes/screens/CScreenActions.php
index 12d84d342c2..94b1dfe4179 100644
--- a/frontends/php/include/classes/screens/CScreenActions.php
+++ b/frontends/php/include/classes/screens/CScreenActions.php
@@ -175,11 +175,11 @@ class CScreenActions extends CScreenBase {
 			}
 			else {
 				$info = new CDiv(SPACE, 'status_icon iconerror');
-				$info->setHint($alert['error'], '', 'on');
+				$info->setHint($alert['error'], 'on');
 			}
 
 			$actionTable->addRow(array(
-				new CCol(zbx_date2str(HISTORY_OF_ACTIONS_DATE_FORMAT, $alert['clock']), 'top'),
+				new CCol(zbx_date2str(DATE_TIME_FORMAT_SECONDS, $alert['clock']), 'top'),
 				new CCol($actions[$alert['actionid']]['name'], 'top'),
 				new CCol(($alert['mediatypeid'] == 0) ? '-' : $alert['description'], 'top'),
 				new CCol($recipient, 'top'),
diff --git a/frontends/php/include/classes/screens/CScreenBase.php b/frontends/php/include/classes/screens/CScreenBase.php
index d512d57e92f..abf4c00a053 100644
--- a/frontends/php/include/classes/screens/CScreenBase.php
+++ b/frontends/php/include/classes/screens/CScreenBase.php
@@ -51,6 +51,13 @@ class CScreenBase {
 	public $resourcetype;
 
 	/**
+	 * Is templated screen
+	 *
+	 * @var bool
+	 */
+	public $isTemplatedScreen;
+
+	/**
 	 * Screen id
 	 *
 	 * @var int
@@ -123,6 +130,7 @@ class CScreenBase {
 	 * @param int		$options['mode']
 	 * @param int		$options['timestamp']
 	 * @param int		$options['resourcetype']
+	 * @param bool		$options['isTemplatedScreen']
 	 * @param int		$options['screenid']
 	 * @param array		$options['screenitem']
 	 * @param string	$options['action']
@@ -141,10 +149,11 @@ class CScreenBase {
 		$this->mode = isset($options['mode']) ? $options['mode'] : SCREEN_MODE_SLIDESHOW;
 		$this->timestamp = !empty($options['timestamp']) ? $options['timestamp'] : time();
 		$this->resourcetype = isset($options['resourcetype']) ? $options['resourcetype'] : null;
+		$this->isTemplatedScreen = isset($options['isTemplatedScreen']) ? $options['isTemplatedScreen'] : false;
 		$this->screenid = !empty($options['screenid']) ? $options['screenid'] : null;
 		$this->action = !empty($options['action']) ? $options['action'] : null;
 		$this->groupid = !empty($options['groupid']) ? $options['groupid'] : null;
-		$this->hostid = !empty($options['hostid']) ? $options['hostid'] : null;
+		$this->hostid = isset($options['hostid']) ? $options['hostid'] : 0;
 		$this->dataId = !empty($options['dataId']) ? $options['dataId'] : null;
 
 		// get page file
@@ -176,7 +185,7 @@ class CScreenBase {
 			$this->screenitem = $options['screenitem'];
 		}
 		elseif (!empty($options['screenitemid'])) {
-			if (!empty($this->hostid)) {
+			if ($this->hostid != 0) {
 				$this->screenitem = API::TemplateScreenItem()->get(array(
 					'screenitemids' => $options['screenitemid'],
 					'hostids' => $this->hostid,
diff --git a/frontends/php/include/classes/screens/CScreenBuilder.php b/frontends/php/include/classes/screens/CScreenBuilder.php
index f5d3c1587b7..ba00ae06712 100644
--- a/frontends/php/include/classes/screens/CScreenBuilder.php
+++ b/frontends/php/include/classes/screens/CScreenBuilder.php
@@ -163,6 +163,8 @@ class CScreenBuilder {
 	 * @param int		$options['resourcetype']
 	 * @param int		$options['screenitemid']
 	 * @param int		$options['hostid']
+	 * @param array		$options['screen']
+	 * @param int		$options['screenid']
 	 *
 	 * @return CScreenBase
 	 */
@@ -229,6 +231,7 @@ class CScreenBuilder {
 				return new CScreenDataOverview($options);
 
 			case SCREEN_RESOURCE_URL:
+				$options = self::appendTemplatedScreenOption($options);
 				return new CScreenUrl($options);
 
 			case SCREEN_RESOURCE_ACTIONS:
@@ -247,17 +250,62 @@ class CScreenBuilder {
 				return new CScreenHostTriggers($options);
 
 			case SCREEN_RESOURCE_HISTORY:
+				// TODO: pass the items from the outside instead of retrieving them by ids
+				if (isset($options['itemids'])) {
+					$items = API::Item()->get(array(
+						'itemids' => $options['itemids'],
+						'webitems' => true,
+						'selectHosts' => array('name'),
+						'output' => array('itemid', 'hostid', 'name', 'key_', 'value_type', 'valuemapid'),
+						'preservekeys' => true
+					));
+
+					$items = CMacrosResolverHelper::resolveItemNames($items);
+
+					$options['items'] = $items;
+					unset($options['itemids']);
+				}
+
 				return new CScreenHistory($options);
 
 			case SCREEN_RESOURCE_CHART:
 				return new CScreenChart($options);
 
+			case SCREEN_RESOURCE_LLD_GRAPH:
+				$options = self::appendTemplatedScreenOption($options);
+				return new CScreenLldGraph($options);
+
+			case SCREEN_RESOURCE_LLD_SIMPLE_GRAPH:
+				$options = self::appendTemplatedScreenOption($options);
+				return new CScreenLldSimpleGraph($options);
+
 			default:
 				return null;
 		}
 	}
 
 	/**
+	 * Appends boolean option 'isTemplatedScreen' to ouput options.
+	 *
+	 * @param array $options
+	 *
+	 * @return array
+	 */
+	protected static function appendTemplatedScreenOption(array $options) {
+		if (isset($options['screen'])) {
+			$options['isTemplatedScreen'] = (bool) $options['screen']['templateid'];
+		}
+		elseif (isset($options['screenid'])) {
+			$options['isTemplatedScreen'] = (bool) API::TemplateScreen()->get(array(
+				'screenids' => array($options['screenid']),
+				'output' => array()
+			));
+		}
+
+		return $options;
+	}
+
+	/**
 	 * Process screen with particular screen objects.
 	 *
 	 * @return CTable
@@ -292,7 +340,7 @@ class CScreenBuilder {
 		$screenTable->setAttribute('class',
 			in_array($this->mode, array(SCREEN_MODE_PREVIEW, SCREEN_MODE_SLIDESHOW)) ? 'screen_view' : 'screen_edit'
 		);
-		$screenTable->setAttribute('id', 'iframe');
+		$screenTable->setAttribute('id', self::makeScreenTableId($this->screen['screenid']));
 
 		// action top row
 		if ($this->mode == SCREEN_MODE_EDIT) {
@@ -383,6 +431,8 @@ class CScreenBuilder {
 				// screen cell
 				elseif (!empty($screenitem['screenitemid']) && isset($screenitem['resourcetype'])) {
 					$screenBase = CScreenBuilder::getScreen(array(
+						'screen' => $this->screen,
+						'screenid' => $this->screen['screenid'],
 						'isFlickerfree' => $this->isFlickerfree,
 						'pageFile' => $this->pageFile,
 						'mode' => $this->mode,
@@ -466,8 +516,10 @@ class CScreenBuilder {
 					$removeRowLink = 'javascript: location.href = "screenedit.php?screenid='.$this->screen['screenid'].'&rmv_row='.$r.'";';
 				}
 				else {
-					$removeRowLink = 'javascript: if (Confirm("'._('This screen-row is not empty. Delete it?').'")) {'.
-						' location.href = "screenedit.php?screenid='.$this->screen['screenid'].'&rmv_row='.$r.'"; }';
+					$removeRowLink = 'javascript:'.
+						' if (confirm('.CJs::encodeJson(_('This screen-row is not empty. Delete it?')).')) {'.
+							' location.href = "screenedit.php?screenid='.$this->screen['screenid'].'&rmv_row='.$r.'";'.
+						' }';
 				}
 				$icon->addAction('onclick', $removeRowLink);
 				array_push($newColumns, new CCol($icon));
@@ -484,8 +536,10 @@ class CScreenBuilder {
 			for ($i = 0; $i < $this->screen['hsize']; $i++) {
 				$icon = new CImg('images/general/minus.png', null, null, null, 'pointer');
 				if (isset($emptyScreenColumns[$i])) {
-					$removeColumnLink = 'javascript: if (Confirm("'._('This screen-column is not empty. Delete it?').'")) {'.
-						' location.href = "screenedit.php?screenid='.$this->screen['screenid'].'&rmv_col='.$i.'"; }';
+					$removeColumnLink = 'javascript:'.
+						' if (confirm('.CJs::encodeJson(_('This screen-column is not empty. Delete it?')).')) {'.
+							' location.href = "screenedit.php?screenid='.$this->screen['screenid'].'&rmv_col='.$i.'";'.
+						' }';
 				}
 				else {
 					$removeColumnLink = 'javascript: location.href = "screenedit.php?config=1&screenid='.$this->screen['screenid'].'&rmv_col='.$i.'";';
@@ -543,7 +597,7 @@ class CScreenBuilder {
 	 * @param string $screenid
 	 */
 	public static function insertInitScreenJs($screenid) {
-		zbx_add_post_js('init_screen("'.$screenid.'", "iframe", "'.$screenid.'");');
+		zbx_add_post_js('init_screen("'.$screenid.'", "'.self::makeScreenTableId($screenid).'", "'.$screenid.'");');
 	}
 
 	/**
@@ -578,4 +632,15 @@ class CScreenBuilder {
 		CScreenBuilder::insertScreenRefreshTimeJs();
 		CScreenBuilder::insertProcessObjectsJs();
 	}
+
+	/**
+	 * Creates a string for screen table ID attribute.
+	 *
+	 * @param string $screenId
+	 *
+	 * @return string
+	 */
+	protected static function makeScreenTableId($screenId) {
+		return 'screentable_'.$screenId;
+	}
 }
diff --git a/frontends/php/include/classes/screens/CScreenClock.php b/frontends/php/include/classes/screens/CScreenClock.php
index 11f2b5816eb..ed20c339bf5 100644
--- a/frontends/php/include/classes/screens/CScreenClock.php
+++ b/frontends/php/include/classes/screens/CScreenClock.php
@@ -36,11 +36,22 @@ class CScreenClock extends CScreenBase {
 				$items = API::Item()->get(array(
 					'itemids' => $this->screenitem['resourceid'],
 					'selectHosts' => array('host'),
-					'output' => array('lastvalue', 'lastclock')
+					'output' => array('itemid', 'value_type')
 				));
 				$item = reset($items);
 				$host = reset($item['hosts']);
 
+				$lastValue = Manager::History()->getLast(array($item));
+				if ($lastValue) {
+					$lastValue = reset($lastValue[$item['itemid']]);
+					$item['lastvalue'] = $lastValue['value'];
+					$item['lastclock'] = $lastValue['clock'];
+				}
+				else {
+					$item['lastvalue'] = '0';
+					$item['lastclock'] = '0';
+				}
+
 				$timeType = $host['host'];
 				preg_match('/([+-]{1})([\d]{1,2}):([\d]{1,2})/', $item['lastvalue'], $arr);
 
diff --git a/frontends/php/include/classes/screens/CScreenDataOverview.php b/frontends/php/include/classes/screens/CScreenDataOverview.php
index 8a3078b8db4..f79d706d435 100644
--- a/frontends/php/include/classes/screens/CScreenDataOverview.php
+++ b/frontends/php/include/classes/screens/CScreenDataOverview.php
@@ -33,6 +33,17 @@ class CScreenDataOverview extends CScreenBase {
 			$hostids[$dbHostGroup['hostid']] = $dbHostGroup['hostid'];
 		}
 
-		return $this->getOutput(getItemsDataOverview($hostids, $this->screenitem['application'], $this->screenitem['style']));
+		// application filter
+		$applicationIds = null;
+		if ($this->screenitem['application'] !== '') {
+			$applications = API::Application()->get(array(
+				'output' => array('applicationid'),
+				'hostids' => $hostids,
+				'search' => array('name' => $this->screenitem['application'])
+			));
+			$applicationIds = zbx_objectValues($applications, 'applicationid');
+		}
+
+		return $this->getOutput(getItemsDataOverview($hostids, $applicationIds, $this->screenitem['style']));
 	}
 }
diff --git a/frontends/php/include/classes/screens/CScreenEvents.php b/frontends/php/include/classes/screens/CScreenEvents.php
index c55f788b421..bed6952d880 100644
--- a/frontends/php/include/classes/screens/CScreenEvents.php
+++ b/frontends/php/include/classes/screens/CScreenEvents.php
@@ -54,8 +54,8 @@ class CScreenEvents extends CScreenBase {
 			addTriggerValueStyle($statusSpan, $event['value'], $event['clock'], $event['acknowledged']);
 
 			$item->addRow(array(
-				zbx_date2str(_('d M Y H:i:s'), $event['clock']),
-				$host['host'],
+				zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event['clock']),
+				$host['name'],
 				new CLink(
 					$trigger['description'],
 					'tr_events.php?triggerid='.$event['objectid'].'&eventid='.$event['eventid']
diff --git a/frontends/php/include/classes/screens/CScreenHistory.php b/frontends/php/include/classes/screens/CScreenHistory.php
index 5ba8aad3c5b..cf575ec9c18 100644
--- a/frontends/php/include/classes/screens/CScreenHistory.php
+++ b/frontends/php/include/classes/screens/CScreenHistory.php
@@ -22,11 +22,15 @@
 class CScreenHistory extends CScreenBase {
 
 	/**
-	 * Item ids
+	 * Type of graph to display.
 	 *
-	 * @var array
+	 * Supported values:
+	 * - GRAPH_TYPE_NORMAL
+	 * - GRAPH_TYPE_STACKED
+	 *
+	 * @var int
 	 */
-	public $itemids;
+	protected $graphType;
 
 	/**
 	 * Search string
@@ -64,23 +68,14 @@ class CScreenHistory extends CScreenBase {
 	public $items;
 
 	/**
-	 * Item data
-	 *
-	 * @var array
-	 */
-	public $item;
-
-	/**
 	 * Init screen data.
 	 *
 	 * @param array		$options
-	 * @param array		$options['itemids']
 	 * @param string	$options['filter']
 	 * @param int		$options['filterTask']
 	 * @param int		$options['markColor']
 	 * @param boolean	$options['plaintext']
 	 * @param array		$options['items']
-	 * @param array		$options['item']
 	 */
 	public function __construct(array $options = array()) {
 		parent::__construct($options);
@@ -88,29 +83,14 @@ class CScreenHistory extends CScreenBase {
 		$this->resourcetype = SCREEN_RESOURCE_HISTORY;
 
 		// mandatory
-		$this->itemids = isset($options['itemids']) ? $options['itemids'] : null;
-		$this->filter = isset($options['filter']) ? $options['filter'] : null;
+		$this->filter = isset($options['filter']) ? $options['filter'] : '';
 		$this->filterTask = isset($options['filter_task']) ? $options['filter_task'] : null;
 		$this->markColor = isset($options['mark_color']) ? $options['mark_color'] : MARK_COLOR_RED;
+		$this->graphType = isset($options['graphtype']) ? $options['graphtype'] : GRAPH_TYPE_NORMAL;
 
 		// optional
 		$this->items = isset($options['items']) ? $options['items'] : null;
-		$this->item = isset($options['item']) ? $options['item'] : null;
 		$this->plaintext = isset($options['plaintext']) ? $options['plaintext'] : false;
-
-		if (empty($this->items)) {
-			$this->items = API::Item()->get(array(
-				'itemids' => $this->itemids,
-				'webitems' => true,
-				'selectHosts' => array('name'),
-				'output' => array('itemid', 'hostid', 'name', 'key_', 'value_type', 'valuemapid'),
-				'preservekeys' => true
-			));
-
-			$this->items = CMacrosResolverHelper::resolveItemNames($this->items);
-
-			$this->item = reset($this->items);
-		}
 	}
 
 	/**
@@ -122,6 +102,8 @@ class CScreenHistory extends CScreenBase {
 		$output = array();
 
 		$stime = zbxDateToTime($this->timeline['stime']);
+		$itemIds = zbx_objectValues($this->items, 'itemid');
+		$firstItem = reset($this->items);
 
 		$iv_string = array(
 			ITEM_VALUE_TYPE_LOG => 1,
@@ -132,17 +114,17 @@ class CScreenHistory extends CScreenBase {
 			ITEM_VALUE_TYPE_UINT64 => 1
 		);
 
-		if ($this->action == 'showvalues' || $this->action == 'showlatest') {
+		if ($this->action == HISTORY_VALUES || $this->action == HISTORY_LATEST) {
 			$options = array(
-				'history' => $this->item['value_type'],
-				'itemids' => array_keys($this->items),
+				'history' => $firstItem['value_type'],
+				'itemids' => $itemIds,
 				'output' => API_OUTPUT_EXTEND,
 				'sortorder' => ZBX_SORT_DOWN
 			);
-			if ($this->action == 'showlatest') {
+			if ($this->action == HISTORY_LATEST) {
 				$options['limit'] = 500;
 			}
-			elseif ($this->action == 'showvalues') {
+			elseif ($this->action == HISTORY_VALUES) {
 				$config = select_config();
 
 				$options['time_from'] = $stime - 10; // some seconds to allow script to execute
@@ -151,10 +133,10 @@ class CScreenHistory extends CScreenBase {
 			}
 
 			// text log
-			if (isset($iv_string[$this->item['value_type']])) {
+			if (isset($iv_string[$firstItem['value_type']])) {
 				$isManyItems = (count($this->items) > 1);
-				$useLogItem = ($this->item['value_type'] == ITEM_VALUE_TYPE_LOG);
-				$useEventLogItem = (strpos($this->item['key_'], 'eventlog[') === 0);
+				$useLogItem = ($firstItem['value_type'] == ITEM_VALUE_TYPE_LOG);
+				$useEventLogItem = (strpos($firstItem['key_'], 'eventlog[') === 0);
 
 				if (empty($this->plaintext)) {
 					$historyTable = new CTableInfo(_('No values found.'));
@@ -172,7 +154,7 @@ class CScreenHistory extends CScreenBase {
 					);
 				}
 
-				if (!zbx_empty($this->filter) && in_array($this->filterTask, array(FILTER_TASK_SHOW, FILTER_TASK_HIDE))) {
+				if ($this->filter !== '' && in_array($this->filterTask, array(FILTER_TASK_SHOW, FILTER_TASK_HIDE))) {
 					$options['search'] = array('value' => $this->filter);
 					if ($this->filterTask == FILTER_TASK_HIDE) {
 						$options['excludeSearch'] = 1;
@@ -183,20 +165,22 @@ class CScreenHistory extends CScreenBase {
 				$historyData = API::History()->get($options);
 
 				foreach ($historyData as $data) {
-					$data['value'] = encode_log(trim($data['value'], "\r\n"));
+					$data['value'] = trim($data['value'], "\r\n");
 
 					if (empty($this->plaintext)) {
 						$item = $this->items[$data['itemid']];
 						$host = reset($item['hosts']);
 						$color = null;
 
-						if (isset($this->filter) && !zbx_empty($this->filter)) {
-							$contain = zbx_stristr($data['value'], $this->filter);
+						if ($this->filter !== '') {
+							$haystack = mb_strtolower($data['value']);
+							$needle = mb_strtolower($this->filter);
+							$pos = mb_strpos($haystack, $needle);
 
-							if ($contain && $this->filterTask == FILTER_TASK_MARK) {
+							if ($pos !== false && $this->filterTask == FILTER_TASK_MARK) {
 								$color = $this->markColor;
 							}
-							if (!$contain && $this->filterTask == FILTER_TASK_INVERT_MARK) {
+							elseif ($pos === false && $this->filterTask == FILTER_TASK_INVERT_MARK) {
 								$color = $this->markColor;
 							}
 
@@ -213,18 +197,20 @@ class CScreenHistory extends CScreenBase {
 							}
 						}
 
-						$row = array(nbsp(zbx_date2str(_('Y.M.d H:i:s'), $data['clock'])));
+						$row = array(nbsp(zbx_date2str(DATE_TIME_FORMAT_SECONDS, $data['clock'])));
 
 						if ($isManyItems) {
 							$row[] = $host['name'].NAME_DELIMITER.$item['name_expanded'];
 						}
 
 						if ($useLogItem) {
-							$row[] = ($data['timestamp'] == 0) ? '-' : zbx_date2str(HISTORY_LOG_LOCALTIME_DATE_FORMAT, $data['timestamp']);
+							$row[] = ($data['timestamp'] == 0)
+								? '-'
+								: zbx_date2str(DATE_TIME_FORMAT_SECONDS, $data['timestamp']);
 
 							// if this is a eventLog item, showing additional info
 							if ($useEventLogItem) {
-								$row[] = zbx_empty($data['source']) ? '-' : $data['source'];
+								$row[] = ($data['source'] === '') ? '-' : $data['source'];
 								$row[] = ($data['severity'] == 0)
 								? '-'
 								: new CCol(get_item_logtype_description($data['severity']), get_item_logtype_style($data['severity']));
@@ -238,8 +224,8 @@ class CScreenHistory extends CScreenBase {
 						if (is_null($color)) {
 							$min_color = 0x98;
 							$max_color = 0xF8;
-							$int_color = ($max_color - $min_color) / count($this->itemids);
-							$int_color *= array_search($data['itemid'], $this->itemids);
+							$int_color = ($max_color - $min_color) / count($itemIds);
+							$int_color *= array_search($data['itemid'], $itemIds);
 							$int_color += $min_color;
 							$newRow->setAttribute('style', 'background-color: '.sprintf("#%X%X%X", $int_color, $int_color, $int_color));
 						}
@@ -250,7 +236,7 @@ class CScreenHistory extends CScreenBase {
 						$historyTable->addRow($newRow);
 					}
 					else {
-						$output[] = zbx_date2str(HISTORY_LOG_ITEM_PLAINTEXT, $data['clock']);
+						$output[] = zbx_date2str(DATE_TIME_FORMAT_SECONDS, $data['clock']);
 						$output[] = "\t".$data['clock']."\t".htmlspecialchars($data['value'])."\n";
 					}
 				}
@@ -286,13 +272,13 @@ class CScreenHistory extends CScreenBase {
 						}
 
 						$historyTable->addRow(array(
-							zbx_date2str(HISTORY_ITEM_DATE_FORMAT, $data['clock']),
+							zbx_date2str(DATE_TIME_FORMAT_SECONDS, $data['clock']),
 							zbx_nl2br($value)
 						));
 					}
 					// plain text
 					else {
-						$output[] = zbx_date2str(HISTORY_PLAINTEXT_DATE_FORMAT, $data['clock']);
+						$output[] = zbx_date2str(DATE_TIME_FORMAT_SECONDS, $data['clock']);
 						$output[] = "\t".$data['clock']."\t".htmlspecialchars($value)."\n";
 					}
 				}
@@ -303,36 +289,32 @@ class CScreenHistory extends CScreenBase {
 			}
 		}
 
-		if ($this->action == 'showgraph' && !isset($iv_string[$this->item['value_type']])) {
-			$this->dataId = 'historyGraph';
-			$containerId = 'graph_cont1';
-			$src = 'chart.php?itemid='.$this->item['itemid'].'&period='.$this->timeline['period'].'&stime='.$this->timeline['stime'].$this->getProfileUrlParams();
-
-			$output[] = new CDiv(null, 'center', $containerId);
-		}
-
 		// time control
-		if (!$this->plaintext && str_in_array($this->action, array('showvalues', 'showgraph'))) {
+		if (!$this->plaintext && str_in_array($this->action, array(HISTORY_VALUES, HISTORY_GRAPH, HISTORY_BATCH_GRAPH))) {
 			$graphDims = getGraphDims();
 
-			$this->timeline['starttime'] = date(TIMESTAMP_FORMAT, get_min_itemclock_by_itemid($this->item['itemid']));
+			$this->timeline['starttime'] = date(TIMESTAMP_FORMAT, get_min_itemclock_by_itemid($firstItem['itemid']));
+
+			$this->dataId = 'historyGraph';
 
 			$timeControlData = array(
 				'periodFixed' => CProfile::get('web.history.timelinefixed', 1),
 				'sliderMaximumTimePeriod' => ZBX_MAX_PERIOD
 			);
 
-			if (!empty($this->dataId)) {
+			if (($this->action == HISTORY_GRAPH || $this->action == HISTORY_BATCH_GRAPH) && !isset($iv_string[$firstItem['value_type']])) {
+				$containerId = 'graph_cont1';
+				$output[] = new CDiv(null, 'center', $containerId);
+
 				$timeControlData['id'] = $this->getDataId();
 				$timeControlData['containerid'] = $containerId;
-				$timeControlData['src'] = $src;
+				$timeControlData['src'] = $this->getGraphUrl($itemIds);
 				$timeControlData['objDims'] = $graphDims;
 				$timeControlData['loadSBox'] = 1;
 				$timeControlData['loadImage'] = 1;
 				$timeControlData['dynamic'] = 1;
 			}
 			else {
-				$this->dataId = 'historyGraph';
 				$timeControlData['id'] = $this->getDataId();
 				$timeControlData['mainObject'] = 1;
 			}
@@ -340,10 +322,10 @@ class CScreenHistory extends CScreenBase {
 			if ($this->mode == SCREEN_MODE_JS) {
 				$timeControlData['dynamic'] = 0;
 
-				return 'timeControl.addObject("'.$this->getDataId().'", '.zbx_jsvalue($this->timeline).', '.zbx_jsvalue($timeControlData).');';
+				return 'timeControl.addObject("'.$this->getDataId().'", '.CJs::encodeJson($this->timeline).', '.CJs::encodeJson($timeControlData).');';
 			}
 			else {
-				zbx_add_post_js('timeControl.addObject("'.$this->getDataId().'", '.zbx_jsvalue($this->timeline).', '.zbx_jsvalue($timeControlData).');');
+				zbx_add_post_js('timeControl.addObject("'.$this->getDataId().'", '.CJs::encodeJson($this->timeline).', '.CJs::encodeJson($timeControlData).');');
 			}
 		}
 
@@ -353,8 +335,8 @@ class CScreenHistory extends CScreenBase {
 		else {
 			if ($this->mode != SCREEN_MODE_JS) {
 				$flickerfreeData = array(
-					'itemids' => $this->itemids,
-					'action' => $this->action,
+					'itemids' => $itemIds,
+					'action' => ($this->action == HISTORY_BATCH_GRAPH) ? HISTORY_GRAPH : $this->action,
 					'filter' => $this->filter,
 					'filterTask' => $this->filterTask,
 					'markColor' => $this->markColor
@@ -364,4 +346,25 @@ class CScreenHistory extends CScreenBase {
 			}
 		}
 	}
+
+	/**
+	 * Return the URL for the graph.
+	 *
+	 * @param array $itemIds
+	 *
+	 * @return string
+	 */
+	protected function getGraphUrl(array $itemIds) {
+		$url = new CUrl('chart.php');
+		$url->setArgument('period', $this->timeline['period']);
+		$url->setArgument('stime', $this->timeline['stime']);
+		$url->setArgument('itemids', $itemIds);
+		$url->setArgument('type', $this->graphType);
+
+		if ($this->action == HISTORY_BATCH_GRAPH) {
+			$url->setArgument('batch', 1);
+		}
+
+		return $url->getUrl().$this->getProfileUrlParams();
+	}
 }
diff --git a/frontends/php/include/classes/screens/CScreenHostTriggers.php b/frontends/php/include/classes/screens/CScreenHostTriggers.php
index 41716ccb6be..03bd1ca0fe2 100644
--- a/frontends/php/include/classes/screens/CScreenHostTriggers.php
+++ b/frontends/php/include/classes/screens/CScreenHostTriggers.php
@@ -68,8 +68,8 @@ class CScreenHostTriggers extends CScreenBase {
 			$params['hostids'] = $host['hostid'];
 		}
 		else {
-			$groupid = get_request('tr_groupid', CProfile::get('web.screens.tr_groupid', 0));
-			$hostid = get_request('tr_hostid', CProfile::get('web.screens.tr_hostid', 0));
+			$groupid = getRequest('tr_groupid', CProfile::get('web.screens.tr_groupid', 0));
+			$hostid = getRequest('tr_hostid', CProfile::get('web.screens.tr_hostid', 0));
 
 			CProfile::update('web.screens.tr_groupid', $groupid, PROFILE_TYPE_ID);
 			CProfile::update('web.screens.tr_hostid', $hostid, PROFILE_TYPE_ID);
@@ -127,8 +127,10 @@ class CScreenHostTriggers extends CScreenBase {
 			$item->addItem(array(SPACE._('Host').SPACE, $hostsComboBox));
 		}
 
-		$output = new CUIWidget('hat_trstatus', make_latest_issues($params));
-		$output->setDoubleHeader(array(_('HOST ISSUES'), SPACE, zbx_date2str(_('[H:i:s]')), SPACE), $item);
+		$output = new CUiWidget('hat_trstatus', make_latest_issues($params));
+		$output->setDoubleHeader(array(_('HOST ISSUES'), SPACE, '['.zbx_date2str(TIME_FORMAT_SECONDS).']', SPACE),
+			$item
+		);
 
 		return $this->getOutput($output);
 	}
diff --git a/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php b/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php
index ce178b70798..e602da8fe33 100644
--- a/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php
+++ b/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php
@@ -67,8 +67,8 @@ class CScreenHostgroupTriggers extends CScreenBase {
 			$params['groupids'] = $hostgroup['groupid'];
 		}
 		else {
-			$groupid = get_request('tr_groupid', CProfile::get('web.screens.tr_groupid', 0));
-			$hostid = get_request('tr_hostid', CProfile::get('web.screens.tr_hostid', 0));
+			$groupid = getRequest('tr_groupid', CProfile::get('web.screens.tr_groupid', 0));
+			$hostid = getRequest('tr_hostid', CProfile::get('web.screens.tr_hostid', 0));
 
 			CProfile::update('web.screens.tr_groupid', $groupid, PROFILE_TYPE_ID);
 			CProfile::update('web.screens.tr_hostid', $hostid, PROFILE_TYPE_ID);
@@ -128,8 +128,10 @@ class CScreenHostgroupTriggers extends CScreenBase {
 
 		$params['screenid'] = $this->screenid;
 
-		$output = new CUIWidget('hat_htstatus', make_latest_issues($params, true));
-		$output->setDoubleHeader(array(_('HOST GROUP ISSUES'), SPACE, zbx_date2str(_('[H:i:s]')), SPACE), $item);
+		$output = new CUiWidget('hat_htstatus', make_latest_issues($params));
+		$output->setDoubleHeader(array(_('HOST GROUP ISSUES'), SPACE, '['.zbx_date2str(TIME_FORMAT_SECONDS).']', SPACE),
+			$item
+		);
 
 		return $this->getOutput($output);
 	}
diff --git a/frontends/php/include/classes/screens/CScreenLldGraph.php b/frontends/php/include/classes/screens/CScreenLldGraph.php
new file mode 100644
index 00000000000..bc88460b5c9
--- /dev/null
+++ b/frontends/php/include/classes/screens/CScreenLldGraph.php
@@ -0,0 +1,204 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/**
+ * Shows surrogate screen filled with graphs generated by selected graph prototype or preview of graph prototype.
+ */
+class CScreenLldGraph extends CScreenLldGraphBase {
+
+	/**
+	 * @var array
+	 */
+	protected $createdGraphIds = array();
+
+	/**
+	 * @var array
+	 */
+	protected $graphPrototype = null;
+
+	/**
+	 * Returns screen items for surrogate screen.
+	 *
+	 * @return array
+	 */
+	protected function getSurrogateScreenItems() {
+		$createdGraphIds = $this->getCreatedGraphIds();
+		return $this->getGraphsForSurrogateScreen($createdGraphIds);
+	}
+
+	/**
+	 * Retrieves graphs created for graph prototype given as resource for this screen item
+	 * and returns array of the graph IDs.
+	 *
+	 * @return array
+	 */
+	protected function getCreatedGraphIds() {
+		if (!$this->createdGraphIds) {
+			$graphPrototype = $this->getGraphPrototype();
+
+			if ($graphPrototype) {
+				// Get all created (discovered) graphs for host of graph prototype.
+				$allCreatedGraphs = API::Graph()->get(array(
+					'output' => array('graphid', 'name'),
+					'hostids' => array($graphPrototype['discoveryRule']['hostid']),
+					'selectGraphDiscovery' => array('graphid', 'parent_graphid'),
+					'filter' => array('flags' => ZBX_FLAG_DISCOVERY_CREATED),
+				));
+
+				// Collect those graph IDs where parent graph is graph prototype selected for
+				// this screen item as resource.
+				foreach ($allCreatedGraphs as $graph) {
+					if ($graph['graphDiscovery']['parent_graphid'] == $graphPrototype['graphid']) {
+						$this->createdGraphIds[$graph['graphid']] = $graph['name'];
+					}
+				}
+				natsort($this->createdGraphIds);
+				$this->createdGraphIds = array_keys($this->createdGraphIds);
+			}
+		}
+
+		return $this->createdGraphIds;
+	}
+
+	/**
+	 * Makes graph screen items from given graph IDs.
+	 *
+	 * @param array $graphIds
+	 *
+	 * @return array
+	 */
+	protected function getGraphsForSurrogateScreen(array $graphIds) {
+		$screenItemTemplate = $this->getScreenItemTemplate(SCREEN_RESOURCE_GRAPH);
+
+		$screenItems = array();
+		foreach ($graphIds as $graphId) {
+			$screenItem = $screenItemTemplate;
+
+			$screenItem['resourceid'] = $graphId;
+			$screenItem['screenitemid'] = $graphId;
+
+			$screenItems[] = $screenItem;
+		}
+
+		return $screenItems;
+	}
+
+	/**
+	 * Resolves and retrieves effective graph prototype used in this screen item.
+	 *
+	 * @return array|bool
+	 */
+	protected function getGraphPrototype() {
+		if ($this->graphPrototype === null) {
+			$defaultOptions = array(
+				'output' => array('graphid', 'name', 'graphtype', 'show_legend', 'show_3d', 'templated'),
+				'selectDiscoveryRule' => array('hostid')
+			);
+
+			$options = array();
+
+			/*
+			 * If screen item is dynamic or is templated screen, real graph prototype is looked up by "name"
+			 * used as resource ID for this screen item and by current host.
+			 */
+			if (($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM || $this->isTemplatedScreen) && $this->hostid) {
+				$currentGraphPrototype = API::GraphPrototype()->get(array(
+					'output' => array('name'),
+					'graphids' => array($this->screenitem['resourceid'])
+				));
+				$currentGraphPrototype = reset($currentGraphPrototype);
+
+				$options['hostids'] = array($this->hostid);
+				$options['filter'] = array('name' => $currentGraphPrototype['name']);
+			}
+			// otherwise just use resource ID given to this screen item.
+			else {
+				$options['graphids'] = array($this->screenitem['resourceid']);
+			}
+
+			$options = zbx_array_merge($defaultOptions, $options);
+
+			$selectedGraphPrototype = API::GraphPrototype()->get($options);
+			$this->graphPrototype = reset($selectedGraphPrototype);
+		}
+
+		return $this->graphPrototype;
+	}
+
+	/**
+	 * Returns output for preview of graph prototype.
+	 *
+	 * @return CTag
+	 */
+	protected function getPreviewOutput() {
+		$graphPrototype = $this->getGraphPrototype();
+
+		switch ($graphPrototype['graphtype']) {
+			case GRAPH_TYPE_NORMAL:
+			case GRAPH_TYPE_STACKED:
+				$url = 'chart3.php';
+				break;
+
+			case GRAPH_TYPE_EXPLODED:
+			case GRAPH_TYPE_3D_EXPLODED:
+			case GRAPH_TYPE_3D:
+			case GRAPH_TYPE_PIE:
+				$url = 'chart7.php';
+				break;
+
+			case GRAPH_TYPE_BAR:
+			case GRAPH_TYPE_COLUMN:
+			case GRAPH_TYPE_BAR_STACKED:
+			case GRAPH_TYPE_COLUMN_STACKED:
+				$url = 'chart_bar.php';
+				break;
+
+			default:
+				show_error_message(_('Graph prototype not found.'));
+				exit;
+		}
+
+		$graphPrototypeItems = API::GraphItem()->get(array(
+			'output' => array(
+				'gitemid', 'itemid', 'sortorder', 'flags', 'type', 'calc_fnc',  'drawtype', 'yaxisside', 'color'
+			),
+			'graphids' => array($graphPrototype['graphid'])
+		));
+
+		$queryParams = array(
+			'items' => $graphPrototypeItems,
+			'graphtype' => $graphPrototype['graphtype'],
+			'period' => 3600,
+			'legend' => $graphPrototype['show_legend'],
+			'graph3d' => $graphPrototype['show_3d'],
+			'width' => $this->screenitem['width'],
+			'height' => $this->screenitem['height'],
+			'name' => $graphPrototype['name']
+		);
+
+		$url .= '?'.http_build_query($queryParams);
+
+		$img = new CImg($url);
+		$img->preload();
+
+		return new CSpan($img);
+	}
+}
diff --git a/frontends/php/include/classes/screens/CScreenLldGraphBase.php b/frontends/php/include/classes/screens/CScreenLldGraphBase.php
new file mode 100644
index 00000000000..6c1cc13374b
--- /dev/null
+++ b/frontends/php/include/classes/screens/CScreenLldGraphBase.php
@@ -0,0 +1,176 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/**
+ * Base class for screen elements containing surrogate screen with graphs from sources generated from prototypes.
+ */
+abstract class CScreenLldGraphBase extends CScreenBase {
+
+	/**
+	 * Surrogate screen constructed to contain all graphs created from selected graph prototype.
+	 *
+	 * @var array
+	 */
+	protected $surrogateScreen;
+
+	/**
+	 * Screen of this screen item.
+	 *
+	 * @var array
+	 */
+	protected $screen = null;
+
+	/**
+	 * Returns output of screen element or null if there are no graphs/items for surrogate screen.
+	 *
+	 * @return CDiv|null
+	 */
+	public function get() {
+		if ($this->mode == SCREEN_MODE_EDIT) {
+			$output = $this->getOutput($this->getPreviewOutput());
+		}
+		else {
+			$screenItems = $this->getSurrogateScreenItems();
+
+			if ($screenItems) {
+				$this->createSurrogateScreen($screenItems);
+
+				$this->calculateSurrogateScreenSizes();
+
+				$screenBuilder = $this->makeSurrogateScreenBuilder();
+
+				$output = $this->getOutput($screenBuilder->show(), true);
+			}
+			else {
+				$output = null;
+			}
+
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Creates surrogate screen from data of this screen item.
+	 *
+	 * @param array $screenItems
+	 */
+	protected function createSurrogateScreen(array $screenItems = array()) {
+		$screenId = $this->screenitem['screenitemid'].'_'.$this->screenitem['resourceid'];
+
+		foreach ($screenItems as &$screenItem) {
+			$screenItem['screenid'] = $screenId;
+		}
+		unset($screenItem);
+
+		$this->surrogateScreen = array(
+			'screenid' => $screenId,
+			'dynamic' => $this->screenitem['dynamic'],
+			'hsize' => 0,
+			'vsize' => 0,
+			'templateid' => 0,
+			'screenitems' => $screenItems
+		);
+	}
+
+	/**
+	 * Calculates "hsize", "vsize" for surrogate screen and "x" and "y" for surrogate screen items.
+	 */
+	protected function calculateSurrogateScreenSizes() {
+		$screenItemCount = count($this->surrogateScreen['screenitems']);
+		$maxColumns = $this->screenitem['max_columns'];
+
+		$this->surrogateScreen['hsize'] = ($screenItemCount >= $maxColumns) ? $maxColumns : $screenItemCount;
+		$this->surrogateScreen['vsize'] = floor($screenItemCount / $maxColumns) + 1;
+
+		foreach ($this->surrogateScreen['screenitems'] as $key => &$screenItem) {
+			$screenItem['x'] = $key % $maxColumns;
+			$screenItem['y'] = floor($key / $maxColumns);
+		}
+		unset($screenItem);
+	}
+
+	/**
+	 * Returns screen builder used to generate output from surrogate screen.
+	 *
+	 * @return CScreenBuilder
+	 */
+	protected function makeSurrogateScreenBuilder() {
+		return new CScreenBuilder(array(
+			'isFlickerfree' => $this->isFlickerfree,
+			'mode' => $this->mode,
+			'timestamp' => $this->timestamp,
+			'screen' => $this->surrogateScreen,
+			'period' => $this->timeline['period'],
+			'stime' => $this->timeline['stimeNow'],
+			'profileIdx' => $this->profileIdx,
+			'hostid' => $this->hostid,
+			'updateProfile' => false
+		));
+	}
+
+	/**
+	 * Returns template for screen item with specified type.
+	 *
+	 * @param integer $resourceType    Resource type, one of SCREEN_RESOURCE_* constants.
+	 *
+	 * @return array
+	 */
+	protected function getScreenItemTemplate($resourceType) {
+		return array(
+			'resourcetype' => $resourceType,
+			'rowspan' => $this->screenitem['rowspan'],
+			'colspan' => $this->screenitem['colspan'],
+			'height' => $this->screenitem['height'],
+			'width' => $this->screenitem['width'],
+			'dynamic' => $this->screenitem['dynamic'],
+			'halign' => $this->screenitem['halign'],
+			'valign' => $this->screenitem['valign']
+		);
+	}
+
+	/**
+	 * @param array $screenItems
+	 */
+	protected function addItemsToSurrogateScreen(array $screenItems) {
+		foreach ($screenItems as $screenItem) {
+			$this->surrogateScreen['screenitems'][] = $screenItem;
+		}
+	}
+
+	/**
+	 * Gathers and returns items for surrogate screen.
+	 *
+	 * @abstract
+	 *
+	 * @return array
+	 */
+	abstract protected function getSurrogateScreenItems();
+
+	/**
+	 * Returns content for preview of graph.
+	 *
+	 * @abstract
+	 *
+	 * @return CTag
+	 */
+	abstract protected function getPreviewOutput();
+}
diff --git a/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php b/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php
new file mode 100644
index 00000000000..051b0c370b3
--- /dev/null
+++ b/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php
@@ -0,0 +1,171 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/**
+ * Shows surrogate screen filled with simple graphs generated by selected item prototype or preview of item prototype.
+ */
+class CScreenLldSimpleGraph extends CScreenLldGraphBase {
+
+	/**
+	 * @var array
+	 */
+	protected $createdItemIds = array();
+
+	/**
+	 * @var array
+	 */
+	protected $itemPrototype = null;
+
+	/**
+	 * Makes and returns simple graph screen items.
+	 *
+	 * @return array
+	 */
+	protected function getSurrogateScreenItems() {
+		$createdItemIds = $this->getCreatedItemIds();
+		return $this->getSimpleGraphsForSurrogateScreen($createdItemIds);
+	}
+
+	/**
+	 * Retrieves items created for item prototype given as resource for this screen item
+	 * and returns array of the item IDs, ordered by item name.
+	 *
+	 * @return array
+	 */
+	protected function getCreatedItemIds() {
+		if (!$this->createdItemIds) {
+			$itemPrototype = $this->getItemPrototype();
+
+			if ($itemPrototype) {
+				// get all created (discovered) items for current host
+				$allCreatedItems = API::Item()->get(array(
+					'output' => array('itemid', 'name'),
+					'hostids' => array($itemPrototype['discoveryRule']['hostid']),
+					'selectItemDiscovery' => array('itemid', 'parent_itemid'),
+					'filter' => array('flags' => ZBX_FLAG_DISCOVERY_CREATED),
+				));
+
+				// collect those item IDs where parent item is item prototype selected for this screen item as resource
+				foreach ($allCreatedItems as $item) {
+					if ($item['itemDiscovery']['parent_itemid'] == $itemPrototype['itemid']) {
+						$this->createdItemIds[$item['itemid']] = $item['name'];
+					}
+				}
+				natsort($this->createdItemIds);
+				$this->createdItemIds = array_keys($this->createdItemIds);
+			}
+		}
+
+		return $this->createdItemIds;
+	}
+
+	/**
+	 * Makes and return simple graph screen items from given item IDs.
+	 *
+	 * @param array $itemIds
+	 *
+	 * @return array
+	 */
+	protected function getSimpleGraphsForSurrogateScreen(array $itemIds) {
+		$screenItemTemplate = $this->getScreenItemTemplate(SCREEN_RESOURCE_SIMPLE_GRAPH);
+
+		$screenItems = array();
+		foreach ($itemIds as $itemId) {
+			$screenItem = $screenItemTemplate;
+
+			$screenItem['resourceid'] = $itemId;
+			$screenItem['screenitemid'] = $itemId;
+			$screenItem['url'] = $this->screenitem['url'];
+
+			$screenItems[] = $screenItem;
+		}
+
+		return $screenItems;
+	}
+
+	/**
+	 * Returns output for simple graph preview.
+	 *
+	 * @return CTag
+	 */
+	protected function getPreviewOutput() {
+		$itemPrototype = $this->getItemPrototype();
+
+		$queryParams = array(
+			'items' => array($itemPrototype),
+			'period' => 3600,
+			'legend' => 1,
+			'width' => $this->screenitem['width'],
+			'height' => $this->screenitem['height'],
+			'name' => $itemPrototype['hosts'][0]['name'].NAME_DELIMITER.$itemPrototype['name']
+		);
+
+		$src = 'chart3.php?'.http_build_query($queryParams);
+
+		$img = new CImg($src);
+		$img->preload();
+
+		return new CSpan($img);
+	}
+
+	/**
+	 * Resolves and retrieves effective item prototype used in this screen item.
+	 *
+	 * @return array|bool
+	 */
+	protected function getItemPrototype() {
+		if ($this->itemPrototype === null) {
+			$defaultOptions = array(
+				'output' => array('itemid', 'name'),
+				'selectHosts' => array('name'),
+				'selectDiscoveryRule' => array('hostid')
+			);
+
+			$options = array();
+
+			/*
+			 * If screen item is dynamic or is templated screen, real item prototype is looked up by "key"
+			 * used as resource ID for this screen item and by current host.
+			 */
+			if (($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM || $this->isTemplatedScreen) && $this->hostid) {
+				$currentItemPrototype = API::ItemPrototype()->get(array(
+					'output' => array('key_'),
+					'itemids' => array($this->screenitem['resourceid'])
+				));
+				$currentItemPrototype = reset($currentItemPrototype);
+
+				$options['hostids'] = array($this->hostid);
+				$options['filter'] = array('key_' => $currentItemPrototype['key_']);
+			}
+			// otherwise just use resource ID given to to this screen item.
+			else {
+				$options['itemids'] = array($this->screenitem['resourceid']);
+			}
+
+			$options = zbx_array_merge($defaultOptions, $options);
+
+			$selectedItemPrototype = API::ItemPrototype()->get($options);
+			$this->itemPrototype = reset($selectedItemPrototype);
+		}
+
+		return $this->itemPrototype;
+	}
+}
diff --git a/frontends/php/include/classes/screens/CScreenPlainText.php b/frontends/php/include/classes/screens/CScreenPlainText.php
index 712a7b6cad2..789919e142f 100644
--- a/frontends/php/include/classes/screens/CScreenPlainText.php
+++ b/frontends/php/include/classes/screens/CScreenPlainText.php
@@ -83,7 +83,7 @@ class CScreenPlainText extends CScreenBase {
 				case ITEM_VALUE_TYPE_TEXT:
 				case ITEM_VALUE_TYPE_STR:
 				case ITEM_VALUE_TYPE_LOG:
-					$value = $this->screenitem['style'] ? new CJSscript($history['value']) : $history['value'];
+					$value = $this->screenitem['style'] ? new CJsScript($history['value']) : $history['value'];
 					break;
 				default:
 					$value = $history['value'];
@@ -94,7 +94,9 @@ class CScreenPlainText extends CScreenBase {
 				$value = applyValueMap($value, $item['valuemapid']);
 			}
 
-			$table->addRow(array(zbx_date2str(_('d M Y H:i:s'), $history['clock']), new CCol($value, 'pre')));
+			$class = $this->screenitem['style'] ? null : 'pre';
+
+			$table->addRow(array(zbx_date2str(DATE_TIME_FORMAT_SECONDS, $history['clock']), new CCol($value, $class)));
 		}
 
 		return $this->getOutput($table);
diff --git a/frontends/php/include/classes/screens/CScreenSimpleGraph.php b/frontends/php/include/classes/screens/CScreenSimpleGraph.php
index 3bb715d0e12..f938421b4d1 100644
--- a/frontends/php/include/classes/screens/CScreenSimpleGraph.php
+++ b/frontends/php/include/classes/screens/CScreenSimpleGraph.php
@@ -51,19 +51,19 @@ class CScreenSimpleGraph extends CScreenBase {
 		}
 
 		if ($this->mode == SCREEN_MODE_PREVIEW && !empty($resourceid)) {
-			$this->action = 'history.php?action=showgraph&itemid='.$resourceid.'&period='.$this->timeline['period'].
+			$this->action = 'history.php?action='.HISTORY_GRAPH.'&itemids[]='.$resourceid.'&period='.$this->timeline['period'].
 					'&stime='.$this->timeline['stimeNow'].$this->getProfileUrlParams();
 		}
 
-		if (!zbx_empty($resourceid) && $this->mode != SCREEN_MODE_EDIT) {
+		if ($resourceid && $this->mode != SCREEN_MODE_EDIT) {
 			if ($this->mode == SCREEN_MODE_PREVIEW) {
 				$timeControlData['loadSBox'] = 1;
 			}
 		}
 
-		$timeControlData['src'] = zbx_empty($resourceid)
-			? 'chart3.php?'
-			: 'chart.php?itemid='.$resourceid.'&'.$this->screenitem['url'].'&width='.$this->screenitem['width'].'&height='.$this->screenitem['height'];
+		$timeControlData['src'] = $resourceid
+			? 'chart.php?itemids[]='.$resourceid.'&'.$this->screenitem['url'].'&width='.$this->screenitem['width'].'&height='.$this->screenitem['height']
+			: 'chart3.php?';
 
 		$timeControlData['src'] .= ($this->mode == SCREEN_MODE_EDIT)
 			? '&period=3600&stime='.date(TIMESTAMP_FORMAT, time())
@@ -73,21 +73,21 @@ class CScreenSimpleGraph extends CScreenBase {
 
 		// output
 		if ($this->mode == SCREEN_MODE_JS) {
-			return 'timeControl.addObject("'.$this->getDataId().'", '.zbx_jsvalue($this->timeline).', '.zbx_jsvalue($timeControlData).')';
+			return 'timeControl.addObject("'.$this->getDataId().'", '.CJs::encodeJson($this->timeline).', '.CJs::encodeJson($timeControlData).')';
 		}
 		else {
 			if ($this->mode == SCREEN_MODE_SLIDESHOW) {
-				insert_js('timeControl.addObject("'.$this->getDataId().'", '.zbx_jsvalue($this->timeline).', '.zbx_jsvalue($timeControlData).');');
+				insert_js('timeControl.addObject("'.$this->getDataId().'", '.CJs::encodeJson($this->timeline).', '.CJs::encodeJson($timeControlData).');');
 			}
 			else {
-				zbx_add_post_js('timeControl.addObject("'.$this->getDataId().'", '.zbx_jsvalue($this->timeline).', '.zbx_jsvalue($timeControlData).');');
+				zbx_add_post_js('timeControl.addObject("'.$this->getDataId().'", '.CJs::encodeJson($this->timeline).', '.CJs::encodeJson($timeControlData).');');
 			}
 
 			if ($this->mode == SCREEN_MODE_EDIT || $this->mode == SCREEN_MODE_SLIDESHOW) {
 				$item = new CDiv();
 			}
 			elseif ($this->mode == SCREEN_MODE_PREVIEW) {
-				$item = new CLink(null, 'history.php?action=showgraph&itemid='.$resourceid.'&period='.$this->timeline['period'].
+				$item = new CLink(null, 'history.php?action='.HISTORY_GRAPH.'&itemids[]='.$resourceid.'&period='.$this->timeline['period'].
 						'&stime='.$this->timeline['stimeNow']);
 			}
 			$item->setAttribute('id', $containerid);
diff --git a/frontends/php/include/classes/screens/CScreenSystemStatus.php b/frontends/php/include/classes/screens/CScreenSystemStatus.php
index d67238a4a38..303be670dca 100644
--- a/frontends/php/include/classes/screens/CScreenSystemStatus.php
+++ b/frontends/php/include/classes/screens/CScreenSystemStatus.php
@@ -34,7 +34,7 @@ class CScreenSystemStatus extends CScreenBase {
 		// rewrite page file
 		$page['file'] = $this->pageFile;
 
-		$item = new CUIWidget('hat_syssum', make_system_status(array(
+		$item = new CUiWidget('hat_syssum', make_system_status(array(
 			'groupids' => null,
 			'hostids' => null,
 			'maintenance' => null,
@@ -44,7 +44,7 @@ class CScreenSystemStatus extends CScreenBase {
 			'screenid' => $this->screenid
 		)));
 		$item->setHeader(_('Status of Zabbix'), SPACE);
-		$item->setFooter(_s('Updated: %s', zbx_date2str(_('H:i:s'))));
+		$item->setFooter(_s('Updated: %s', zbx_date2str(TIME_FORMAT_SECONDS)));
 
 		return $this->getOutput($item);
 	}
diff --git a/frontends/php/include/classes/screens/CScreenTriggersOverview.php b/frontends/php/include/classes/screens/CScreenTriggersOverview.php
index d393d826e35..cdb5228e6cd 100644
--- a/frontends/php/include/classes/screens/CScreenTriggersOverview.php
+++ b/frontends/php/include/classes/screens/CScreenTriggersOverview.php
@@ -27,19 +27,42 @@ class CScreenTriggersOverview extends CScreenBase {
 	 * @return CDiv (screen inside container)
 	 */
 	public function get() {
-		$hostids = array();
+		// fetch hosts
+		$hosts = API::Host()->get(array(
+			'output' => array('hostid', 'status'),
+			'selectGraphs' => ($this->screenitem['style'] == STYLE_LEFT) ? API_OUTPUT_COUNT : null,
+			'selectScreens' => ($this->screenitem['style'] == STYLE_LEFT) ? API_OUTPUT_COUNT : null,
+			'groupids' => $this->screenitem['resourceid'],
+			'preservekeys' => true
+		));
+
+		$hostIds = array_keys($hosts);
 
-		$dbHostGroups = DBselect(
-			'SELECT DISTINCT hg.hostid'.
-			' FROM hosts_groups hg'.
-			' WHERE hg.groupid='.zbx_dbstr($this->screenitem['resourceid'])
+		$options = array(
+			'output' => array(
+				'description', 'expression', 'priority', 'url', 'value', 'triggerid', 'lastchange', 'flags'
+			),
+			'selectHosts' => array('hostid', 'name', 'status'),
+			'hostids' => $hostIds,
+			'monitored' => true,
+			'skipDependent' => true,
+			'sortfield' => 'description'
 		);
-		while ($dbHostGroup = DBfetch($dbHostGroups)) {
-			$hostids[$dbHostGroup['hostid']] = $dbHostGroup['hostid'];
+
+		// application filter
+		if ($this->screenitem['application'] !== '') {
+			$applications = API::Application()->get(array(
+				'output' => array('applicationid'),
+				'hostids' => $hostIds,
+				'search' => array('name' => $this->screenitem['application'])
+			));
+			$options['applicationids'] = zbx_objectValues($applications, 'applicationid');
 		}
 
-		return $this->getOutput(getTriggersOverview($hostids, $this->screenitem['application'],
-				$this->pageFile, $this->screenitem['style'], $this->screenid
+		$triggers = API::Trigger()->get($options);
+
+		return $this->getOutput(getTriggersOverview($hosts, $triggers, $this->pageFile, $this->screenitem['style'],
+			$this->screenid
 		));
 	}
 }
diff --git a/frontends/php/include/classes/screens/CScreenUrl.php b/frontends/php/include/classes/screens/CScreenUrl.php
index 6eb5d807755..7283baba501 100644
--- a/frontends/php/include/classes/screens/CScreenUrl.php
+++ b/frontends/php/include/classes/screens/CScreenUrl.php
@@ -27,6 +27,28 @@ class CScreenUrl extends CScreenBase {
 	 * @return CDiv (screen inside container)
 	 */
 	public function get() {
-		return $this->getOutput(new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], 'auto'));
+		// prevent from resolving macros in configuration page
+		if ($this->mode != SCREEN_MODE_PREVIEW && $this->mode != SCREEN_MODE_SLIDESHOW) {
+			return $this->getOutput(
+				new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], 'auto')
+			);
+		}
+		elseif ($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM && $this->hostid == 0) {
+			return $this->getOutput(new CTableInfo(_('No host selected.')));
+		}
+
+		$resolveHostMacros = ($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM || $this->isTemplatedScreen);
+
+		$url = CMacrosResolverHelper::resolveScreenElementURL(array(
+			'config' => $resolveHostMacros ? 'screenElementURL' : 'screenElementURLUser',
+			'url' => $this->screenitem['url'],
+			'hostid' => $resolveHostMacros ? $this->hostid : 0
+		));
+
+		$this->screenitem['url'] = $url ? $url : $this->screenitem['url'];
+
+		return $this->getOutput(
+			new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], 'auto')
+		);
 	}
 }
diff --git a/frontends/php/include/classes/services/CServicesSlaCalculator.php b/frontends/php/include/classes/services/CServicesSlaCalculator.php
new file mode 100644
index 00000000000..bc345031953
--- /dev/null
+++ b/frontends/php/include/classes/services/CServicesSlaCalculator.php
@@ -0,0 +1,249 @@
+<?php
+
+/**
+ * A class with SLA calculation logic.
+ *
+ * Class CServicesSlaCalculator
+ */
+class CServicesSlaCalculator {
+
+	/**
+	 * Calculates the SLA for the given service during the given period.
+	 *
+	 * Returns the following information:
+	 * - ok             - the percentage of time the service was in OK state;
+	 * - problem        - the percentage of time the service was in problem state;
+	 * - okTime         - the time the service was in OK state, in seconds;
+	 * - problemTime    - the time the service was in problem state, in seconds;
+	 * - downtimeTime   - the time the service was down, in seconds;
+	 * - dt;
+	 * - ut.
+	 *
+	 * @param array $serviceAlarms
+	 * @param array $serviceTimes
+	 * @param int   $periodStart
+	 * @param int   $periodEnd
+	 * @param int   $startValue        the value of the last service alarm
+	 *
+	 * @return array
+	 */
+	public function calculateSla(array $serviceAlarms, array $serviceTimes, $periodStart, $periodEnd, $startValue) {
+		/**
+		 * structure of "$data":
+		 * - key	- time stamp
+		 * - alarm	- on/off status (0,1 - off; >1 - on)
+		 * - dt_s	- count of downtime starts
+		 * - dt_e	- count of downtime ends
+		 * - ut_s	- count of uptime starts
+		 * - ut_e	- count of uptime ends
+		 */
+		$data = array();
+		foreach ($serviceAlarms as $alarm) {
+			if ($alarm['clock'] >= $periodStart && $alarm['clock'] <= $periodEnd) {
+				$data[$alarm['clock']]['alarm'] = $alarm['value'];
+			}
+		}
+
+		$unmarkedPeriodType = 'ut';
+
+		foreach ($serviceTimes as $time) {
+			if ($time['type'] == SERVICE_TIME_TYPE_UPTIME) {
+				$this->expandPeriodicalTimes($data, $periodStart, $periodEnd, $time['ts_from'], $time['ts_to'], 'ut');
+
+				// if an uptime period exists - unmarked time is downtime
+				$unmarkedPeriodType = 'dt';
+			}
+			elseif ($time['type'] == SERVICE_TIME_TYPE_DOWNTIME) {
+				$this->expandPeriodicalTimes($data, $periodStart, $periodEnd, $time['ts_from'], $time['ts_to'], 'dt');
+			}
+			elseif($time['type'] == SERVICE_TIME_TYPE_ONETIME_DOWNTIME && $time['ts_to'] >= $periodStart && $time['ts_from'] <= $periodEnd) {
+				if ($time['ts_from'] < $periodStart) {
+					$time['ts_from'] = $periodStart;
+				}
+				if ($time['ts_to'] > $periodEnd) {
+					$time['ts_to'] = $periodEnd;
+				}
+
+				if (isset($data[$time['ts_from']]['dt_s'])) {
+					$data[$time['ts_from']]['dt_s']++;
+				}
+				else {
+					$data[$time['ts_from']]['dt_s'] = 1;
+				}
+
+				if (isset($data[$time['ts_to']]['dt_e'])) {
+					$data[$time['ts_to']]['dt_e']++;
+				}
+				else {
+					$data[$time['ts_to']]['dt_e'] = 1;
+				}
+			}
+		}
+
+		if (!isset($data[$periodEnd])) {
+			$data[$periodEnd] = array();
+		}
+
+		// sort by time stamp
+		ksort($data);
+
+		// calculate times
+		$dtCnt = 0;
+		$utCnt = 0;
+		$slaTime = array(
+			'dt' => array('problemTime' => 0, 'okTime' => 0),
+			'ut' => array('problemTime' => 0, 'okTime' => 0)
+		);
+		$prevTime = $periodStart;
+
+		if (isset($data[$periodStart]['ut_s'])) {
+			$utCnt += $data[$periodStart]['ut_s'];
+		}
+		if (isset($data[$periodStart]['ut_e'])) {
+			$utCnt -= $data[$periodStart]['ut_e'];
+		}
+		if (isset($data[$periodStart]['dt_s'])) {
+			$dtCnt += $data[$periodStart]['dt_s'];
+		}
+		if (isset($data[$periodStart]['dt_e'])) {
+			$dtCnt -= $data[$periodStart]['dt_e'];
+		}
+		foreach ($data as $ts => $val) {
+			// skip first data [already read]
+			if ($ts == $periodStart) {
+				continue;
+			}
+
+			if ($dtCnt > 0) {
+				$periodType = 'dt';
+			}
+			elseif ($utCnt > 0) {
+				$periodType = 'ut';
+			}
+			else {
+				$periodType = $unmarkedPeriodType;
+			}
+
+			// state=0,1 [OK] (1 - information severity of trigger), >1 [PROBLEMS] (trigger severity)
+			if ($startValue > 1) {
+				$slaTime[$periodType]['problemTime'] += $ts - $prevTime;
+			}
+			else {
+				$slaTime[$periodType]['okTime'] += $ts - $prevTime;
+			}
+
+			if (isset($val['ut_s'])) {
+				$utCnt += $val['ut_s'];
+			}
+			if (isset($val['ut_e'])) {
+				$utCnt -= $val['ut_e'];
+			}
+			if (isset($val['dt_s'])) {
+				$dtCnt += $val['dt_s'];
+			}
+			if (isset($val['dt_e'])) {
+				$dtCnt -= $val['dt_e'];
+			}
+			if (isset($val['alarm'])) {
+				$startValue = $val['alarm'];
+			}
+
+			$prevTime = $ts;
+		}
+
+		$slaTime['problemTime'] = &$slaTime['ut']['problemTime'];
+		$slaTime['okTime'] = &$slaTime['ut']['okTime'];
+		$slaTime['downtimeTime'] = $slaTime['dt']['okTime'] + $slaTime['dt']['problemTime'];
+
+		$fullTime = $slaTime['problemTime'] + $slaTime['okTime'];
+		if ($fullTime > 0) {
+			$slaTime['problem'] = 100 * $slaTime['problemTime'] / $fullTime;
+			$slaTime['ok'] = 100 * $slaTime['okTime'] / $fullTime;
+		}
+		else {
+			$slaTime['problem'] = 100;
+			$slaTime['ok'] = 100;
+		}
+
+		return $slaTime;
+	}
+
+	/**
+	 * Adds information about a weekly scheduled uptime or downtime to the $data array.
+	 *
+	 * @param array     $data
+	 * @param int       $period_start     start of the SLA calculation period
+	 * @param int       $period_end       end of the SLA calculation period
+	 * @param int       $ts_from          start of the scheduled uptime or downtime
+	 * @param int       $ts_to            end of the scheduled uptime or downtime
+	 * @param string    $type             "ut" for uptime and "dt" for downtime
+	 */
+	protected function expandPeriodicalTimes(array &$data, $period_start, $period_end, $ts_from, $ts_to, $type) {
+		$weekStartDate = new DateTime();
+		$weekStartDate->setTimestamp($period_start);
+
+		$days = $weekStartDate->format('w');
+		$hours = $weekStartDate->format('H');
+		$minutes = $weekStartDate->format('i');
+		$seconds = $weekStartDate->format('s');
+
+		$weekStartDate->modify('-'.$days.' day -'.$hours.' hour -'.$minutes.' minute -'.$seconds.' second');
+
+		$weekStartTimestamp = $weekStartDate->getTimestamp();
+
+		for (; $weekStartTimestamp < $period_end; $weekStartTimestamp += $this->secondsPerNextWeek($weekStartTimestamp)) {
+
+			$weekStartDate->setTimestamp($weekStartTimestamp);
+			$weekStartDate->modify('+'.$ts_from.' second');
+			$_s = $weekStartDate->getTimestamp();
+
+			$weekStartDate->setTimestamp($weekStartTimestamp);
+			$weekStartDate->modify('+'.$ts_to.' second');
+			$_e = $weekStartDate->getTimestamp();
+
+			if ($period_end < $_s || $period_start >= $_e) {
+				continue;
+			}
+
+			if ($_s < $period_start) {
+				$_s = $period_start;
+			}
+			if ($_e > $period_end) {
+				$_e = $period_end;
+			}
+
+			if (isset($data[$_s][$type.'_s'])) {
+				$data[$_s][$type.'_s']++;
+			}
+			else {
+				$data[$_s][$type.'_s'] = 1;
+			}
+
+			if (isset($data[$_e][$type.'_e'])) {
+				$data[$_e][$type.'_e']++;
+			}
+			else {
+				$data[$_e][$type.'_e'] = 1;
+			}
+		}
+	}
+
+
+	/**
+	 * Return seconds in next week relative to given week start timestamp.
+	 *
+	 * @param int $currentWeekStartTimestamp
+	 *
+	 * @return int
+	 */
+	protected function secondsPerNextWeek($currentWeekStartTimestamp) {
+		$currentWeekStartDate = new DateTime();
+		$currentWeekStartDate->setTimestamp($currentWeekStartTimestamp);
+
+		$currentWeekStartDate->modify('+7 day');
+
+		$result = $currentWeekStartDate->getTimestamp() - $currentWeekStartTimestamp;
+
+		return $result;
+	}
+}
diff --git a/frontends/php/include/classes/class.frontendsetup.php b/frontends/php/include/classes/setup/CFrontendSetup.php
index b093e02e5ca..f0ed140db49 100644
--- a/frontends/php/include/classes/class.frontendsetup.php
+++ b/frontends/php/include/classes/setup/CFrontendSetup.php
@@ -23,7 +23,7 @@
  * Class to operate with frontend setup information.
  * Currently only setup requirements are checked.
  */
-class FrontendSetup {
+class CFrontendSetup {
 
 	const MIN_PHP_VERSION = '5.3.0';
 	const MIN_PHP_MEMORY_LIMIT = 134217728; // 128*1024*1024
@@ -67,6 +67,9 @@ class FrontendSetup {
 		$result[] = $this->checkPhpDatabases();
 		$result[] = $this->checkPhpBcmath();
 		$result[] = $this->checkPhpMbstring();
+		if (extension_loaded('mbstring')) {
+			$result[] = $this->checkPhpMbstringFuncOverload();
+		}
 		$result[] = $this->checkPhpSockets();
 		$result[] = $this->checkPhpGd();
 		$result[] = $this->checkPhpGdPng();
@@ -294,7 +297,7 @@ class FrontendSetup {
 	 * @return array
 	 */
 	public function checkPhpMbstring() {
-		$current = mbstrings_available();
+		$current = extension_loaded('mbstring');
 
 		return array(
 			'name' => _('PHP mbstring'),
@@ -306,6 +309,27 @@ class FrontendSetup {
 	}
 
 	/**
+	 * Checks for PHP mbstring.func_overload value.
+	 *
+	 * Note: disabling mbstring functions completely, mbstring.func_overload returns false.
+	 * checkPhpMbstringFuncOverload() will be called after successful checkPhpMbstring(), to avoid duplicate
+	 * error messages. mbstring.func_overload value in php.ini file represents a combination of bitmasks.
+	 *
+	 * @return array
+	 */
+	public function checkPhpMbstringFuncOverload() {
+		$current = ini_get('mbstring.func_overload');
+
+		return array(
+			'name' => _('PHP mbstring.func_overload'),
+			'current' => ($current & 2) ? _('on') : _('off'),
+			'required' => _('off'),
+			'result' => ($current & 2) ? self::CHECK_FATAL : self::CHECK_OK,
+			'error' => _('PHP string function overloading must be disabled.')
+		);
+	}
+
+	/**
 	 * Checks for PHP sockets extension.
 	 *
 	 * @return array
diff --git a/frontends/php/include/setup.inc.php b/frontends/php/include/classes/setup/CSetupWizard.php
index 93286d5baa8..9c4058b01d9 100644
--- a/frontends/php/include/setup.inc.php
+++ b/frontends/php/include/classes/setup/CSetupWizard.php
@@ -21,9 +21,9 @@
 
 class CSetupWizard extends CForm {
 
-	function __construct(&$ZBX_CONFIG) {
+	function __construct($ZBX_CONFIG) {
 		$this->DISABLE_NEXT_BUTTON = false;
-		$this->ZBX_CONFIG = &$ZBX_CONFIG;
+		$this->ZBX_CONFIG = $ZBX_CONFIG;
 
 		$this->stage = array(
 			0 => array(
@@ -71,7 +71,7 @@ class CSetupWizard extends CForm {
 
 	function doNext() {
 		if (isset($this->stage[$this->getStep() + 1])) {
-			$this->ZBX_CONFIG['step']++;
+			$this->ZBX_CONFIG['step'] = $this->ZBX_CONFIG['step'] + 1;
 
 			return true;
 		}
@@ -81,7 +81,7 @@ class CSetupWizard extends CForm {
 
 	function doBack() {
 		if (isset($this->stage[$this->getStep() - 1])) {
-			$this->ZBX_CONFIG['step']--;
+			$this->ZBX_CONFIG['step'] = $this->ZBX_CONFIG['step'] - 1;
 
 			return true;
 		}
@@ -179,7 +179,7 @@ class CSetupWizard extends CForm {
 		$table = new CTable(null, 'requirements');
 		$table->setAlign('center');
 
-		$finalResult = FrontendSetup::CHECK_OK;
+		$finalResult = CFrontendSetup::CHECK_OK;
 
 		$table->addRow(array(
 			SPACE,
@@ -187,18 +187,18 @@ class CSetupWizard extends CForm {
 			new CCol(_('Required'), 'header')
 		));
 
-		$frontendSetup = new FrontendSetup();
+		$frontendSetup = new CFrontendSetup();
 		$reqs = $frontendSetup->checkRequirements();
 		foreach ($reqs as $req) {
 			$result = null;
 
 			// OK
-			if ($req['result'] == FrontendSetup::CHECK_OK) {
+			if ($req['result'] == CFrontendSetup::CHECK_OK) {
 				$rowClass = '';
 				$result = new CSpan(_('OK'), 'ok');
 			}
 			// warning
-			elseif ($req['result'] == FrontendSetup::CHECK_WARNING) {
+			elseif ($req['result'] == CFrontendSetup::CHECK_WARNING) {
 				$rowClass = 'notice';
 				$result = new CSpan(_x('Warning', 'setup'), 'link_menu notice');
 				$result->setHint($req['error']);
@@ -224,7 +224,7 @@ class CSetupWizard extends CForm {
 		}
 
 		// fatal error
-		if ($finalResult == FrontendSetup::CHECK_FATAL) {
+		if ($finalResult == CFrontendSetup::CHECK_FATAL) {
 			$this->DISABLE_NEXT_BUTTON = true;
 
 			$message = array(
@@ -239,7 +239,7 @@ class CSetupWizard extends CForm {
 			$message = array(new CSpan(_('OK'), 'ok'));
 
 			// add a warning message
-			if ($finalResult == FrontendSetup::CHECK_WARNING) {
+			if ($finalResult == CFrontendSetup::CHECK_WARNING) {
 				$message[] = BR();
 				$message[] = _('(with warnings)');
 			}
@@ -259,7 +259,7 @@ class CSetupWizard extends CForm {
 
 		$cmbType = new CComboBox('type', $DB['TYPE'], 'this.form.submit();');
 
-		$frontendSetup = new FrontendSetup();
+		$frontendSetup = new CFrontendSetup();
 		$databases = $frontendSetup->getSupportedDatabases();
 
 		foreach ($databases as $id => $name) {
@@ -284,7 +284,7 @@ class CSetupWizard extends CForm {
 					$server
 				));
 
-				$port = new CNumericBox('port', $this->getConfig('DB_PORT', '0'), 5, 'no', false, false);
+				$port = new CNumericBox('port', $this->getConfig('DB_PORT', '0'), 5, false, false, false);
 				$port->attr('style', '');
 				$port->attr(
 					'onchange',
@@ -304,7 +304,7 @@ class CSetupWizard extends CForm {
 					$database
 				));
 
-				if ($DB['TYPE'] == ZBX_DB_DB2) {
+				if ($DB['TYPE'] == ZBX_DB_DB2 || $DB['TYPE'] == ZBX_DB_POSTGRESQL) {
 					$schema = new CTextBox('schema', $this->getConfig('DB_SCHEMA', ''));
 					$schema->attr('onchange', "disableSetupStepButton('#next_2')");
 					$table->addRow(array(
@@ -370,7 +370,7 @@ class CSetupWizard extends CForm {
 			'zbx_server_port',
 			$this->getConfig('ZBX_SERVER_PORT', '10051'),
 			20,
-			'no',
+			false,
 			false,
 			false
 		);
@@ -395,7 +395,7 @@ class CSetupWizard extends CForm {
 
 	function stage5() {
 		$dbType = $this->getConfig('DB_TYPE');
-		$frontendSetup = new FrontendSetup();
+		$frontendSetup = new CFrontendSetup();
 		$databases = $frontendSetup->getSupportedDatabases();
 
 		$table = new CTable(null, 'requirements');
@@ -422,7 +422,7 @@ class CSetupWizard extends CForm {
 				$table->addRow(array(new CCol(_('Database name'), 'header'), $this->getConfig('DB_DATABASE')));
 				$table->addRow(array(new CCol(_('Database user'), 'header'), $this->getConfig('DB_USER')));
 				$table->addRow(array(new CCol(_('Database password'), 'header'), preg_replace('/./', '*', $this->getConfig('DB_PASSWORD'))));
-				if ($dbType == ZBX_DB_DB2) {
+				if ($dbType == ZBX_DB_DB2 || $dbType == ZBX_DB_POSTGRESQL) {
 					$table->addRow(array(new CCol(_('Database schema'), 'header'), $this->getConfig('DB_SCHEMA')));
 				}
 				break;
@@ -482,7 +482,8 @@ class CSetupWizard extends CForm {
 			elseif ($config->config['DB']['PASSWORD'] != $this->getConfig('DB_PASSWORD')) {
 				$error = true;
 			}
-			elseif ($this->getConfig('DB_TYPE') == ZBX_DB_DB2 && $config->config['DB']['SCHEMA'] != $this->getConfig('DB_SCHEMA')) {
+			elseif (($this->getConfig('DB_TYPE') == ZBX_DB_DB2 || $this->getConfig('DB_TYPE') == ZBX_DB_POSTGRESQL)
+					&& $config->config['DB']['SCHEMA'] != $this->getConfig('DB_SCHEMA')) {
 				$error = true;
 			}
 			elseif ($config->config['ZBX_SERVER'] != $this->getConfig('ZBX_SERVER')) {
@@ -566,6 +567,11 @@ class CSetupWizard extends CForm {
 				$result = DBfetch($db_schema);
 			}
 
+			if (!zbx_empty($DB['SCHEMA']) && $DB['TYPE'] == ZBX_DB_POSTGRESQL) {
+				$db_schema = DBselect('SELECT schema_name FROM information_schema.schemata WHERE schema_name = \''.pg_escape_string($DB['SCHEMA']).'\';');
+				$result = DBfetch($db_schema);
+			}
+
 			if ($result) {
 				$result = DBexecute('CREATE TABLE zabbix_installation_test (test_row INTEGER)');
 				$result &= DBexecute('DROP TABLE zabbix_installation_test');
@@ -590,13 +596,13 @@ class CSetupWizard extends CForm {
 			$this->DISABLE_NEXT_BUTTON = true;
 		}
 		elseif ($this->getStep() == 2) {
-			$this->setConfig('DB_TYPE', get_request('type', $this->getConfig('DB_TYPE')));
-			$this->setConfig('DB_SERVER', get_request('server', $this->getConfig('DB_SERVER', 'localhost')));
-			$this->setConfig('DB_PORT', get_request('port', $this->getConfig('DB_PORT', '0')));
-			$this->setConfig('DB_DATABASE', get_request('database', $this->getConfig('DB_DATABASE', 'zabbix')));
-			$this->setConfig('DB_USER', get_request('user', $this->getConfig('DB_USER', 'root')));
-			$this->setConfig('DB_PASSWORD', get_request('password', $this->getConfig('DB_PASSWORD', '')));
-			$this->setConfig('DB_SCHEMA', get_request('schema', $this->getConfig('DB_SCHEMA', '')));
+			$this->setConfig('DB_TYPE', getRequest('type', $this->getConfig('DB_TYPE')));
+			$this->setConfig('DB_SERVER', getRequest('server', $this->getConfig('DB_SERVER', 'localhost')));
+			$this->setConfig('DB_PORT', getRequest('port', $this->getConfig('DB_PORT', '0')));
+			$this->setConfig('DB_DATABASE', getRequest('database', $this->getConfig('DB_DATABASE', 'zabbix')));
+			$this->setConfig('DB_USER', getRequest('user', $this->getConfig('DB_USER', 'root')));
+			$this->setConfig('DB_PASSWORD', getRequest('password', $this->getConfig('DB_PASSWORD', '')));
+			$this->setConfig('DB_SCHEMA', getRequest('schema', $this->getConfig('DB_SCHEMA', '')));
 
 			if (isset($_REQUEST['retry'])) {
 				if (!$this->checkConnection()) {
@@ -614,9 +620,9 @@ class CSetupWizard extends CForm {
 			}
 		}
 		elseif ($this->getStep() == 3) {
-			$this->setConfig('ZBX_SERVER', get_request('zbx_server', $this->getConfig('ZBX_SERVER', 'localhost')));
-			$this->setConfig('ZBX_SERVER_PORT', get_request('zbx_server_port', $this->getConfig('ZBX_SERVER_PORT', '10051')));
-			$this->setConfig('ZBX_SERVER_NAME', get_request('zbx_server_name', $this->getConfig('ZBX_SERVER_NAME', '')));
+			$this->setConfig('ZBX_SERVER', getRequest('zbx_server', $this->getConfig('ZBX_SERVER', 'localhost')));
+			$this->setConfig('ZBX_SERVER_PORT', getRequest('zbx_server_port', $this->getConfig('ZBX_SERVER_PORT', '10051')));
+			$this->setConfig('ZBX_SERVER_NAME', getRequest('zbx_server_name', $this->getConfig('ZBX_SERVER_NAME', '')));
 			if (isset($_REQUEST['next'][$this->getStep()])) {
 				$this->doNext();
 			}
diff --git a/frontends/php/include/classes/sysmaps/CCanvas.php b/frontends/php/include/classes/sysmaps/CCanvas.php
index a71c8225165..94b0f1ce494 100644
--- a/frontends/php/include/classes/sysmaps/CCanvas.php
+++ b/frontends/php/include/classes/sysmaps/CCanvas.php
@@ -58,7 +58,7 @@ class CCanvas {
 	}
 
 	public function drawTitle($text, $color) {
-		$x = $this->width / 2 - imagefontwidth(4) * zbx_strlen($text) / 2;
+		$x = $this->width / 2 - imagefontwidth(4) * mb_strlen($text) / 2;
 		imagetext($this->canvas, 10, 0, $x, 25, $this->getColor($color), $text);
 	}
 
@@ -67,7 +67,7 @@ class CCanvas {
 	}
 
 	public function getCanvas() {
-		$date = zbx_date2str(MAPS_DATE_FORMAT);
+		$date = zbx_date2str(DATE_TIME_FORMAT_SECONDS);
 		imagestring($this->canvas, 1, $this->width - 120, $this->height - 12, $date, $this->getColor('gray'));
 		imagestringup($this->canvas, 1,
 			$this->width - 10,
diff --git a/frontends/php/include/classes/tree/CTree.php b/frontends/php/include/classes/tree/CTree.php
index 9d9a287430e..bde6f74ef82 100644
--- a/frontends/php/include/classes/tree/CTree.php
+++ b/frontends/php/include/classes/tree/CTree.php
@@ -113,7 +113,7 @@ class CTree {
 
 	private function makeSImgStr($id) {
 		$tr = new CRow();
-		$count = isset($this->tree[$id]['nodeimg']) ? zbx_strlen($this->tree[$id]['nodeimg']) : 0;
+		$count = isset($this->tree[$id]['nodeimg']) ? strlen($this->tree[$id]['nodeimg']) : 0;
 
 		for ($i = 0; $i < $count; $i++) {
 			$td = new CCol();
@@ -208,7 +208,7 @@ class CTree {
 
 		zbx_add_post_js($this->treename.' = new CTree("tree_'.CWebUser::$data['alias'].'_'.$this->treename.'", '.$this->treename.'_tree);');
 
-		return new CJSscript($js);
+		return new CJsScript($js);
 	}
 
 	private function getImg($id, $img) {
diff --git a/frontends/php/include/classes/triggers/CTextTriggerConstructor.php b/frontends/php/include/classes/triggers/CTextTriggerConstructor.php
new file mode 100644
index 00000000000..90b5cdcd89c
--- /dev/null
+++ b/frontends/php/include/classes/triggers/CTextTriggerConstructor.php
@@ -0,0 +1,276 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+/**
+ * A class for implementing conversions used by the trigger wizard.
+ */
+class CTextTriggerConstructor {
+
+	const EXPRESSION_TYPE_MATCH = 0;
+	const EXPRESSION_TYPE_NO_MATCH = 1;
+
+	/**
+	 * Parser used for parsing trigger expressions.
+	 *
+	 * @var CTriggerExpression
+	 */
+	protected $triggerExpression;
+
+	/**
+	 * @param CTriggerExpression $triggerExpression     trigger expression parser
+	 */
+	public function __construct(CTriggerExpression $triggerExpression) {
+		$this->triggerExpression = $triggerExpression;
+	}
+
+	/**
+	 * Create a trigger expression from the given expression parts.
+	 *
+	 * Most of this function was left unchanged to preserve the current behavior of the constructor.
+	 * Feel free to rewrite and correct it if necessary.
+	 *
+	 * @param string    $host                       host name
+	 * @param string    $itemKey                    item key
+	 * @param array     $expressions                array of expression parts
+	 * @param string    $expressions[]['value']     expression string
+	 * @param int       $expressions[]['type']      whether the string should match the expression; supported values:
+	 *                                              self::EXPRESSION_TYPE_MATCH and self::EXPRESSION_TYPE_NO_MATCH
+	 *
+	 * @return bool|string
+	 */
+	public function getExpressionFromParts($host, $itemKey, array $expressions) {
+		$result = '';
+		$prefix = $host.':'.$itemKey.'.';
+
+		if (empty($expressions)) {
+			error(_('Expression cannot be empty'));
+			return false;
+		}
+
+		// regexp used to split an expressions into tokens
+		$ZBX_PREG_EXPESSION_FUNC_FORMAT = '^(['.ZBX_PREG_PRINT.']*) (and|or) (not )?(-)? ?[(]*(([a-zA-Z_.\$]{6,7})(\\((['.ZBX_PREG_PRINT.']+?){0,1}\\)))(['.ZBX_PREG_PRINT.']*)$';
+		$functions = array('regexp' => 1, 'iregexp' => 1);
+		$expr_array = array();
+		$cexpor = 0;
+		$startpos = -1;
+
+		foreach ($expressions as $expression) {
+			if ($expression['type'] == self::EXPRESSION_TYPE_MATCH) {
+				if (!empty($result)) {
+					$result.=' or ';
+				}
+				if ($cexpor == 0) {
+					$startpos = mb_strlen($result);
+				}
+				$cexpor++;
+				$eq_global = '<>0';
+			}
+			else {
+				if (($cexpor > 1) & ($startpos >= 0)) {
+					$head = mb_substr($result, 0, $startpos);
+					$tail = mb_substr($result, $startpos);
+					$result = $head.'('.$tail.')';
+				}
+				$cexpor = 0;
+				$eq_global = '=0';
+				if (!empty($result)) {
+					$result.=' and ';
+				}
+			}
+
+			$expr = ' and '.$expression['value'];
+
+			// strip extra spaces around "and" and "or" operators
+			$expr = preg_replace('/\s+(and|or)\s+/U', ' $1 ', $expr);
+
+			$expr_array = array();
+			$sub_expr_count=0;
+			$sub_expr = '';
+			$multi = preg_match('/.+(and|or).+/', $expr);
+
+			// split an expression into separate tokens
+			// start from the first part of the expression, then move to the next one
+			while (preg_match('/'.$ZBX_PREG_EXPESSION_FUNC_FORMAT.'/i', $expr, $arr)) {
+				$arr[6] = strtolower($arr[6]);
+				if (!isset($functions[$arr[6]])) {
+					error(_('Incorrect function is used').'. ['.$expression['value'].']');
+					return false;
+				}
+				$expr_array[$sub_expr_count]['eq'] = trim($arr[2]);
+				$expr_array[$sub_expr_count]['not'] = trim($arr[3]);
+				$expr_array[$sub_expr_count]['minus'] = trim($arr[4]);
+				$expr_array[$sub_expr_count]['regexp'] = $arr[6].$arr[7];
+
+				$sub_expr_count++;
+				$expr = $arr[1];
+			}
+
+			if (empty($expr_array)) {
+				error(_('Incorrect trigger expression').'. ['.$expression['value'].']');
+				return false;
+			}
+
+			$expr_array[$sub_expr_count-1]['eq'] = '';
+
+			$sub_eq = '';
+			if ($multi > 0) {
+				$sub_eq = $eq_global;
+			}
+
+			foreach ($expr_array as $id => $expr) {
+				$eq = ($expr['eq'] === '') ? '' : ' '.$expr['eq'].' ';
+				$not = ($expr['not'] === '') ? '' : $expr['not'].' ';
+				if ($multi > 0) {
+					$sub_expr = $eq.'('.$not.$expr['minus'].'{'.$prefix.$expr['regexp'].'})'.$sub_eq.$sub_expr;
+				}
+				else {
+					$sub_expr = $eq.$expr['eq'].$not.$expr['minus'].'{'.$prefix.$expr['regexp'].'}'.$sub_eq.$sub_expr;
+				}
+			}
+
+			if ($multi > 0) {
+				$result .= '('.$sub_expr.')';
+			}
+			else {
+				$result .= '(('.$sub_expr.')'.$eq_global.')';
+			}
+		}
+
+		if (($cexpor > 1) & ($startpos >= 0)) {
+			$head = mb_substr($result, 0, $startpos);
+			$tail = mb_substr($result, $startpos);
+			$result = $head.'('.$tail.')';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Break a trigger expression generated by the constructor.
+	 *
+	 * To be successfully parsed, each item function macro must be wrapped in additional parentheses, for example,
+	 * (({item.item.regex(param)})=0)
+	 *
+	 * Most of this function was left unchanged to preserve the current behavior of the constructor.
+	 * Feel free to rewrite and correct it if necessary.
+	 *
+	 * @param string $expression    trigger expression
+	 *
+	 * @return array    an array of expression parts, see self::getExpressionFromParts() for the structure of the part
+	 *                  array
+	 */
+	public function getPartsFromExpression($expression) {
+		// strip extra parentheses
+		$expression = preg_replace('/\(\(\((.+?)\)\) and/i', '(($1) and', $expression);
+		$expression = preg_replace('/\(\(\((.+?)\)\)$/i', '(($1)', $expression);
+
+		$parseResult = $this->triggerExpression->parse($expression);
+
+		$expressions = array();
+		$splitTokens = $this->splitTokensByFirstLevel($parseResult->getTokens());
+		foreach($splitTokens as $key => $tokens) {
+			$expr = array();
+
+			// replace whole function macros with their functions
+			foreach ($tokens as $token) {
+				$value = $token['value'];
+				switch ($token['type']) {
+					case CTriggerExpressionParserResult::TOKEN_TYPE_FUNCTION_MACRO:
+						$value = $token['data']['function'];
+
+						break;
+					case CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR:
+						if ($token['value'] === 'and' || $token['value'] === 'or' || $token['value'] === 'not') {
+							$value = ' '.$token['value'].' ';
+						}
+
+						break;
+				}
+
+				$expr[] = $value;
+			}
+
+			$expr = implode($expr);
+
+			// trim surrounding parentheses
+			$expr = preg_replace('/^\((.*)\)$/u', '$1', $expr);
+
+			// trim parentheses around item function macros
+			$value = preg_replace('/\((.*)\)(=|<>)0/U', '$1', $expr);
+
+			// trim surrounding parentheses
+			$value = preg_replace('/^\((.*)\)$/u', '$1', $value);
+
+			$expressions[$key]['value'] = trim($value);
+			$expressions[$key]['type'] = (strpos($expr, '<>0', mb_strlen($expr) - 4) === false)
+				? self::EXPRESSION_TYPE_NO_MATCH
+				: self::EXPRESSION_TYPE_MATCH;
+		}
+
+		return $expressions;
+	}
+
+	/**
+	 * Split the trigger expression tokens into separate arrays.
+	 *
+	 * The tokens are split at the first occurrence of the "and" or "or" operators with respect to parentheses.
+	 *
+	 * @param array $tokens     an array of tokens from the CTriggerExpressionParserResult
+	 *
+	 * @return array    an array of token arrays grouped by expression
+	 */
+	protected function splitTokensByFirstLevel(array $tokens) {
+		$expresions = array();
+		$currentExpression = array();
+
+		$level = 0;
+		foreach ($tokens as $token) {
+			switch ($token['type']) {
+				case CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR:
+					// look for an "or" or "and" operator on the top parentheses level
+					// if such an expression is found, save all of the tokens before it as a separate expression
+					if ($level == 0 && ($token['value'] === 'or' || $token['value'] === 'and')) {
+						$expresions[] = $currentExpression;
+						$currentExpression = array();
+
+						// continue to the next token
+						continue 2;
+					}
+
+					break;
+				case CTriggerExpressionParserResult::TOKEN_TYPE_OPEN_BRACE:
+					$level++;
+
+					break;
+				case CTriggerExpressionParserResult::TOKEN_TYPE_CLOSE_BRACE:
+					$level--;
+
+					break;
+			}
+
+			$currentExpression[] = $token;
+		}
+
+		$expresions[] = $currentExpression;
+
+		return $expresions;
+	}
+
+}
diff --git a/frontends/php/include/classes/class.cfavorite.php b/frontends/php/include/classes/user/CFavorite.php
index 7cc7d3ee312..7cc7d3ee312 100644
--- a/frontends/php/include/classes/class.cfavorite.php
+++ b/frontends/php/include/classes/user/CFavorite.php
diff --git a/frontends/php/include/classes/user/CProfile.php b/frontends/php/include/classes/user/CProfile.php
new file mode 100644
index 00000000000..686c372e5b7
--- /dev/null
+++ b/frontends/php/include/classes/user/CProfile.php
@@ -0,0 +1,335 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CProfile {
+
+	private static $userDetails = array();
+	private static $profiles = null;
+	private static $update = array();
+	private static $insert = array();
+	private static $stringProfileMaxLength;
+
+	public static function init() {
+		self::$userDetails = CWebUser::$data;
+		self::$profiles = array();
+
+		$profilesTableSchema = DB::getSchema('profiles');
+		self::$stringProfileMaxLength = $profilesTableSchema['fields']['value_str']['length'];
+
+		$db_profiles = DBselect(
+			'SELECT p.*'.
+			' FROM profiles p'.
+			' WHERE p.userid='.self::$userDetails['userid'].
+			' ORDER BY p.userid,p.profileid'
+		);
+		while ($profile = DBfetch($db_profiles)) {
+			$value_type = self::getFieldByType($profile['type']);
+
+			if (!isset(self::$profiles[$profile['idx']])) {
+				self::$profiles[$profile['idx']] = array();
+			}
+			self::$profiles[$profile['idx']][$profile['idx2']] = $profile[$value_type];
+		}
+	}
+
+	/**
+	 * Check if data needs to be inserted or updated.
+	 *
+	 * @return bool
+	 */
+	public static function isModified() {
+		return (self::$insert || self::$update);
+	}
+
+	public static function flush() {
+		$result = false;
+
+		if (self::$profiles !== null && self::$userDetails['userid'] > 0 && self::isModified()) {
+			$result = true;
+
+			foreach (self::$insert as $idx => $profile) {
+				foreach ($profile as $idx2 => $data) {
+					$result &= self::insertDB($idx, $data['value'], $data['type'], $idx2);
+				}
+			}
+
+			ksort(self::$update);
+			foreach (self::$update as $idx => $profile) {
+				ksort($profile);
+				foreach ($profile as $idx2 => $data) {
+					$result &= self::updateDB($idx, $data['value'], $data['type'], $idx2);
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	public static function clear() {
+		self::$insert = array();
+		self::$update = array();
+	}
+
+	public static function get($idx, $default_value = null, $idx2 = 0) {
+		// no user data available, just return the default value
+		if (!CWebUser::$data) {
+			return $default_value;
+		}
+
+		if (is_null(self::$profiles)) {
+			self::init();
+		}
+
+		if (isset(self::$profiles[$idx][$idx2])) {
+			return self::$profiles[$idx][$idx2];
+		}
+		else {
+			return $default_value;
+		}
+	}
+
+	/**
+	 * Returns the values stored under the given $ids as an array.
+	 *
+	 * @param string    $idx
+	 * @param mixed     $defaultValue
+	 *
+	 * @return mixed
+	 */
+	public static function getArray($idx, $defaultValue = null) {
+		if (self::get($idx, null, 0) === null) {
+			return $defaultValue;
+		}
+
+		$i = 0;
+		$values = array();
+		while (self::get($idx, null, $i) !== null) {
+			$values[] = self::get($idx, null, $i);
+
+			$i++;
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Removes profile values from DB and profiles cache.
+	 *
+	 * @param string 		$idx	first identifier
+	 * @param int|array  	$idx2	second identifier, which can be list of identifiers as well
+	 */
+	public static function delete($idx, $idx2 = 0) {
+		if (is_null(self::$profiles)) {
+			self::init();
+		}
+
+		if (!isset(self::$profiles[$idx])) {
+			return;
+		}
+
+		// pick existing Idx2
+		$deleteIdx2 = array();
+		foreach ((array) $idx2 as $checkIdx2) {
+			if (isset(self::$profiles[$idx][$checkIdx2])) {
+				$deleteIdx2[] = $checkIdx2;
+			}
+		}
+
+		if (!$deleteIdx2) {
+			return;
+		}
+
+		// remove from DB
+		self::deleteValues($idx, $deleteIdx2);
+
+		// remove from cache
+		foreach ($deleteIdx2 as $v) {
+			unset(self::$profiles[$idx][$v]);
+		}
+		if (!self::$profiles[$idx]) {
+			unset(self::$profiles[$idx]);
+		}
+	}
+
+	/**
+	 * Removes all values stored under the given idx.
+	 *
+	 * @param string $idx
+	 */
+	public static function deleteIdx($idx) {
+		if (self::$profiles === null) {
+			self::init();
+		}
+
+		if (!isset(self::$profiles[$idx])) {
+			return;
+		}
+
+		self::deleteValues($idx, array_keys(self::$profiles[$idx]));
+		unset(self::$profiles[$idx]);
+	}
+
+	/**
+	 * Deletes the given values from the DB.
+	 *
+	 * @param string 	$idx
+	 * @param array 	$idx2
+	 */
+	protected static function deleteValues($idx, array $idx2) {
+		// remove from DB
+		DB::delete('profiles', array('idx' => $idx, 'idx2' => $idx2));
+	}
+
+	/**
+	 * Update favorite values in DB profiles table.
+	 *
+	 * @param string	$idx		max length is 96
+	 * @param mixed		$value		max length 255 for string
+	 * @param int		$type
+	 * @param int		$idx2
+	 */
+	public static function update($idx, $value, $type, $idx2 = 0) {
+		if (is_null(self::$profiles)) {
+			self::init();
+		}
+
+		if (!self::checkValueType($value, $type)) {
+			return;
+		}
+
+		$profile = array(
+			'idx' => $idx,
+			'value' => $value,
+			'type' => $type,
+			'idx2' => $idx2
+		);
+
+		$current = self::get($idx, null, $idx2);
+		if (is_null($current)) {
+			if (!isset(self::$insert[$idx])) {
+				self::$insert[$idx] = array();
+			}
+			self::$insert[$idx][$idx2] = $profile;
+		}
+		else {
+			if ($current != $value) {
+				if (!isset(self::$update[$idx])) {
+					self::$update[$idx] = array();
+				}
+				self::$update[$idx][$idx2] = $profile;
+			}
+		}
+
+		if (!isset(self::$profiles[$idx])) {
+			self::$profiles[$idx] = array();
+		}
+
+		self::$profiles[$idx][$idx2] = $value;
+	}
+
+	/**
+	 * Stores an array in the profiles.
+	 *
+	 * Each value is stored under the given idx and a sequentially generated idx2.
+	 *
+	 * @param string    $idx
+	 * @param array     $values
+	 * @param int       $type
+	 */
+	public static function updateArray($idx, array $values, $type) {
+		// save new values
+		$i = 0;
+		foreach ($values as $value) {
+			self::update($idx, $value, $type, $i);
+
+			$i++;
+		}
+
+		// delete remaining old values
+		$idx2 = array();
+		while (self::get($idx, null, $i) !== null) {
+			$idx2[] = $i;
+
+			$i++;
+		}
+
+		self::delete($idx, $idx2);
+	}
+
+	private static function insertDB($idx, $value, $type, $idx2) {
+		$value_type = self::getFieldByType($type);
+
+		$values = array(
+			'profileid' => get_dbid('profiles', 'profileid'),
+			'userid' => self::$userDetails['userid'],
+			'idx' => zbx_dbstr($idx),
+			$value_type => zbx_dbstr($value),
+			'type' => $type,
+			'idx2' => $idx2
+		);
+
+		return DBexecute('INSERT INTO profiles ('.implode(', ', array_keys($values)).') VALUES ('.implode(', ', $values).')');
+	}
+
+	private static function updateDB($idx, $value, $type, $idx2) {
+		$sqlIdx2 = ($idx2 > 0) ? ' AND idx2='.zbx_dbstr($idx2) : '';
+
+		$valueType = self::getFieldByType($type);
+
+		return DBexecute(
+			'UPDATE profiles SET '.
+			$valueType.'='.zbx_dbstr($value).','.
+			' type='.$type.
+			' WHERE userid='.self::$userDetails['userid'].
+			' AND idx='.zbx_dbstr($idx).
+			$sqlIdx2
+		);
+	}
+
+	private static function getFieldByType($type) {
+		switch ($type) {
+			case PROFILE_TYPE_INT:
+				$field = 'value_int';
+				break;
+			case PROFILE_TYPE_STR:
+				$field = 'value_str';
+				break;
+			case PROFILE_TYPE_ID:
+			default:
+				$field = 'value_id';
+		}
+
+		return $field;
+	}
+
+	private static function checkValueType($value, $type) {
+		switch ($type) {
+			case PROFILE_TYPE_ID:
+				return zbx_ctype_digit($value);
+			case PROFILE_TYPE_INT:
+				return zbx_is_int($value);
+			case PROFILE_TYPE_STR:
+				return mb_strlen($value) <= self::$stringProfileMaxLength;
+			default:
+				return true;
+		}
+	}
+}
diff --git a/frontends/php/include/classes/class.cwebuser.php b/frontends/php/include/classes/user/CWebUser.php
index 499f48c5f67..70bdfc39dff 100644
--- a/frontends/php/include/classes/class.cwebuser.php
+++ b/frontends/php/include/classes/user/CWebUser.php
@@ -23,6 +23,16 @@ class CWebUser {
 
 	public static $data = null;
 
+	/**
+	 * Tries to login a user and populates self::$data on success.
+	 *
+	 * @param string $login			user login
+	 * @param string $password		user password
+	 *
+	 * @throws Exception if user cannot be logged in
+	 *
+	 * @return bool
+	 */
 	public static function login($login, $password) {
 		try {
 			self::setDefault();
@@ -60,9 +70,7 @@ class CWebUser {
 			$result &= DBexecute('DELETE FROM sessions WHERE sessionid='.zbx_dbstr(get_cookie('zbx_sessionid')));
 
 			if ($result) {
-				zbx_setcookie('zbx_sessionid', self::$data['sessionid'],
-					self::$data['autologin'] ? time() + SEC_PER_DAY * 31 : 0
-				);
+				self::setSessionCookie(self::$data['sessionid']);
 
 				add_audit_ext(AUDIT_ACTION_LOGIN, AUDIT_RESOURCE_USER, self::$data['userid'], '', null, null, null);
 			}
@@ -76,18 +84,18 @@ class CWebUser {
 	}
 
 	public static function logout() {
-		self::$data['sessionid'] = get_cookie('zbx_sessionid');
+		self::$data['sessionid'] = self::getSessionCookie();
 		self::$data = API::User()->logout();
 		zbx_unsetcookie('zbx_sessionid');
 	}
 
-	public static function checkAuthentication($sessionid) {
+	public static function checkAuthentication($sessionId) {
 		try {
-			if ($sessionid !== null) {
-				self::$data = API::User()->checkAuthentication(array($sessionid));
+			if ($sessionId !== null) {
+				self::$data = API::User()->checkAuthentication(array($sessionId));
 			}
 
-			if ($sessionid === null || empty(self::$data)) {
+			if ($sessionId === null || empty(self::$data)) {
 				self::setDefault();
 				self::$data = API::User()->login(array(
 					'user' => ZBX_GUEST_USER,
@@ -99,16 +107,16 @@ class CWebUser {
 					clear_messages(1);
 					throw new Exception();
 				}
-				$sessionid = self::$data['sessionid'];
+				$sessionId = self::$data['sessionid'];
 			}
 
 			if (self::$data['gui_access'] == GROUP_GUI_ACCESS_DISABLED) {
 				throw new Exception();
 			}
 
-			zbx_setcookie('zbx_sessionid', $sessionid, self::$data['autologin'] ? time() + SEC_PER_DAY * 31 : 0);
+			self::setSessionCookie($sessionId);
 
-			return true;
+			return $sessionId;
 		}
 		catch (Exception $e) {
 			self::setDefault();
@@ -116,6 +124,26 @@ class CWebUser {
 		}
 	}
 
+	/**
+	 * Shorthand method for setting current session ID in cookies.
+	 *
+	 * @param string $sessionId		Session ID string
+	 */
+	public static function setSessionCookie($sessionId) {
+		$autoLogin = self::isGuest() ? false : (bool) self::$data['autologin'];
+
+		zbx_setcookie('zbx_sessionid', $sessionId,  $autoLogin ? strtotime('+1 month') : 0);
+	}
+
+	/**
+	 * Retrieves current session ID from zbx_sessionid cookie.
+	 *
+	 * @return string
+	 */
+	public static function getSessionCookie() {
+		return get_cookie('zbx_sessionid');
+	}
+
 	public static function setDefault() {
 		self::$data = array(
 			'alias' => ZBX_GUEST_USER,
diff --git a/frontends/php/include/classes/validators/CActionCondValidator.php b/frontends/php/include/classes/validators/CActionCondValidator.php
new file mode 100644
index 00000000000..21766102e10
--- /dev/null
+++ b/frontends/php/include/classes/validators/CActionCondValidator.php
@@ -0,0 +1,207 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+class CActionCondValidator extends CValidator {
+
+	/**
+	 * Returns true if the given $value is valid, or set's an error and returns false otherwise.
+	 *
+	 *
+	 * @param $condition
+	 *
+	 * @return bool
+	 */
+	public function validate($condition) {
+		// build validators
+		$timePeriodValidator = new CTimePeriodValidator();
+		$discoveryCheckTypeValidator = new CLimitedSetValidator(array(
+			'values' => array_keys(discovery_check_type2str())
+		));
+		$discoveryObjectStatusValidator = new CLimitedSetValidator(array(
+			'values' => array_keys(discovery_object_status2str())
+		));
+		$triggerSeverityValidator = new CLimitedSetValidator(array(
+			'values' => array(
+				TRIGGER_SEVERITY_NOT_CLASSIFIED,
+				TRIGGER_SEVERITY_INFORMATION,
+				TRIGGER_SEVERITY_WARNING,
+				TRIGGER_SEVERITY_AVERAGE,
+				TRIGGER_SEVERITY_HIGH,
+				TRIGGER_SEVERITY_DISASTER
+			)
+		));
+		$discoveryObjectValidator = new CLimitedSetValidator(array(
+			'values' => array_keys(discovery_object2str())
+		));
+		$triggerValueValidator = new CLimitedSetValidator(array(
+			'values' => array_keys(trigger_value2str())
+		));
+		$eventTypeValidator = new CLimitedSetValidator(array(
+			'values' => array_keys(eventType())
+		));
+
+		$conditionValue = $condition['value'];
+		// validate condition values depending on condition type
+		switch ($condition['conditiontype']) {
+			case CONDITION_TYPE_HOST_GROUP:
+				if (!$conditionValue) {
+					$this->setError(_('Empty action condition.'));
+				}
+				break;
+
+			case CONDITION_TYPE_TEMPLATE:
+				if (!$conditionValue) {
+					$this->setError(_('Empty action condition.'));
+				}
+				break;
+
+			case CONDITION_TYPE_TRIGGER:
+				if (!$conditionValue) {
+					$this->setError(_('Empty action condition.'));
+				}
+				break;
+
+			case CONDITION_TYPE_HOST:
+				if (!$conditionValue) {
+					$this->setError(_('Empty action condition.'));
+				}
+				break;
+
+			case CONDITION_TYPE_DRULE:
+				if (!$conditionValue) {
+					$this->setError(_('Empty action condition.'));
+				}
+				break;
+
+			case CONDITION_TYPE_DCHECK:
+				if (!$conditionValue) {
+					$this->setError(_('Empty action condition.'));
+				}
+				break;
+
+			case CONDITION_TYPE_PROXY:
+				if (!$conditionValue) {
+					$this->setError(_('Empty action condition.'));
+				}
+				break;
+
+			case CONDITION_TYPE_DOBJECT:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				elseif (!$discoveryObjectValidator->validate($conditionValue)) {
+					$this->setError(_('Incorrect action condition discovery object.'));
+				}
+				break;
+
+			case CONDITION_TYPE_TIME_PERIOD:
+				if (!$timePeriodValidator->validate($conditionValue)) {
+					$this->setError($timePeriodValidator->getError());
+				}
+				break;
+
+			case CONDITION_TYPE_DHOST_IP:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				else if (!validate_ip_range($conditionValue)) {
+					$this->setError(_s('Incorrect action condition ip "%1$s".', $conditionValue));
+				}
+				break;
+
+			case CONDITION_TYPE_DSERVICE_TYPE:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				elseif (!$discoveryCheckTypeValidator->validate($conditionValue)) {
+					$this->setError(_('Incorrect action condition discovery check.'));
+				}
+				break;
+
+			case CONDITION_TYPE_DSERVICE_PORT:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				elseif (!validate_port_list($conditionValue)) {
+					$this->setError(_s('Incorrect action condition port "%1$s".', $conditionValue));
+				}
+				break;
+
+			case CONDITION_TYPE_DSTATUS:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				elseif (!$discoveryObjectStatusValidator->validate($conditionValue)) {
+					$this->setError(_('Incorrect action condition discovery status.'));
+				}
+				break;
+
+			case CONDITION_TYPE_MAINTENANCE:
+				if (!zbx_empty($conditionValue)) {
+					$this->setError(_('Maintenance action condition value must be empty.'));
+				}
+				break;
+
+			case CONDITION_TYPE_TRIGGER_SEVERITY:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				elseif (!$triggerSeverityValidator->validate($conditionValue)) {
+					$this->setError(_('Incorrect action condition trigger severity.'));
+				}
+				break;
+
+			case CONDITION_TYPE_TRIGGER_VALUE:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				elseif (!$triggerValueValidator->validate($conditionValue)) {
+					$this->setError(_('Incorrect action condition trigger value.'));
+				}
+				break;
+
+			case CONDITION_TYPE_EVENT_TYPE:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				elseif (!$eventTypeValidator->validate($conditionValue)) {
+					$this->setError(_('Incorrect action condition event type.'));
+				}
+				break;
+
+			case CONDITION_TYPE_TRIGGER_NAME:
+			case CONDITION_TYPE_DUPTIME:
+			case CONDITION_TYPE_DVALUE:
+			case CONDITION_TYPE_APPLICATION:
+			case CONDITION_TYPE_HOST_NAME:
+			case CONDITION_TYPE_HOST_METADATA:
+				if (zbx_empty($conditionValue)) {
+					$this->setError(_('Empty action condition.'));
+				}
+				break;
+
+			default:
+				$this->setError(_('Incorrect action condition type.'));
+		}
+
+		// If no error is not set, return true.
+		return !(bool) $this->getError();
+	}
+}
diff --git a/frontends/php/include/classes/validators/CCollectionValidator.php b/frontends/php/include/classes/validators/CCollectionValidator.php
index b68c573f4c5..8733c3ea4d1 100644
--- a/frontends/php/include/classes/validators/CCollectionValidator.php
+++ b/frontends/php/include/classes/validators/CCollectionValidator.php
@@ -52,9 +52,9 @@ class CCollectionValidator extends CValidator {
 	/**
 	 * Error message if the given value is not an array.
 	 *
-	 * @var array
+	 * @var string
 	 */
-	public $messageInvalid = array();
+	public $messageInvalid;
 
 	/**
 	 * Error message if duplicate objects exist.
@@ -73,7 +73,7 @@ class CCollectionValidator extends CValidator {
 	public function validate($value)
 	{
 		if (!is_array($value)) {
-			$this->error($this->messageInvalid);
+			$this->error($this->messageInvalid, $this->stringify($value));
 
 			return false;
 		}
@@ -88,7 +88,14 @@ class CCollectionValidator extends CValidator {
 		// check for objects with duplicate values
 		if ($this->uniqueField) {
 			if ($duplicate = CArrayHelper::findDuplicate($value, $this->uniqueField, $this->uniqueField2)) {
-				$this->error($this->messageDuplicate, $duplicate[$this->uniqueField]);
+				if ($this->uniqueField2 === null) {
+					$this->error($this->messageDuplicate, $duplicate[$this->uniqueField]);
+				}
+				else {
+					$this->error($this->messageDuplicate,
+						$duplicate[$this->uniqueField], $duplicate[$this->uniqueField2]
+					);
+				}
 
 				return false;
 			}
diff --git a/frontends/php/include/classes/validators/CDecimalValidator.php b/frontends/php/include/classes/validators/CDecimalValidator.php
index 4f966e2d926..006c2349adf 100644
--- a/frontends/php/include/classes/validators/CDecimalValidator.php
+++ b/frontends/php/include/classes/validators/CDecimalValidator.php
@@ -36,13 +36,6 @@ class CDecimalValidator extends CValidator {
 	public $maxScale;
 
 	/**
-	 * Error message for format validation.
-	 *
-	 * @var string
-	 */
-	public $messageFormat;
-
-	/**
 	 * Error message for precision validation (optional).
 	 *
 	 * @var string
@@ -64,6 +57,13 @@ class CDecimalValidator extends CValidator {
 	public $messageScale;
 
 	/**
+	 * Error message for type and decimal format validation
+	 *
+	 * @var string
+	 */
+	public $messageInvalid;
+
+	/**
 	 * Checks if the given string is correct double.
 	 *
 	 * @param string $value
@@ -71,56 +71,38 @@ class CDecimalValidator extends CValidator {
 	 * @return bool
 	 */
 	public function validate($value) {
-		// validate format
-		if (!preg_match('/^-?(?:\d+|\d*\.\d+)$/', $value)) {
-			$this->error($this->messageFormat, $value);
+		if (!is_numeric($value) || !preg_match('/^-?\d+(\.\d+)?$/', $value)) {
+			$this->error($this->messageInvalid, $this->stringify($value));
 
 			return false;
 		}
 
 		$parts = explode('.', $value);
 
-		$natural = $parts[0];
-		$naturalSize = strlen($natural);
+		$beforeDot = trim($parts[0], '-');
+		$afterDot = isset($parts[1]) ? $parts[1] : '';
 
-		if (isset($parts[1])) {
-			$scale = $parts[1];
-			$scaleSize = strlen($scale);
-		}
-		else {
-			$scale = null;
-			$scaleSize = 0;
-		}
-
-		// validate scale without natural
-		if ($scaleSize > 0 && $naturalSize == 0) {
-			$this->error($this->messageFormat, $value);
-
-			return false;
-		}
-
-		if ($this->maxPrecision !== null) {
-			$maxNaturals = $this->maxPrecision - $this->maxScale;
+		$beforeDotLength = strlen($beforeDot);
+		$afterDotLength = strlen($afterDot);
 
-			// validate precision
-			if ($naturalSize + $scaleSize > $this->maxPrecision) {
-				$this->error($this->messagePrecision, $value, $maxNaturals, $this->maxScale);
+		if ($this->maxPrecision > 0 && $this->maxScale > 0) {
+			// validate overall precision
+			if ($beforeDotLength + $afterDotLength > $this->maxPrecision) {
+				$this->error($this->messagePrecision, $value, $this->maxPrecision - $this->maxScale, $this->maxScale);
 
 				return false;
 			}
+		}
 
-			// validate digits before point
-			if ($this->maxScale !== null) {
-				if ($naturalSize > $maxNaturals) {
-					$this->error($this->messageNatural, $value, $maxNaturals);
+		// digits before dot
+		if ($beforeDotLength > $this->maxPrecision - $this->maxScale) {
+			$this->error($this->messageNatural, $value, $this->maxPrecision - $this->maxScale);
 
-					return false;
-				}
-			}
+			return false;
 		}
 
-		// validate scale
-		if ($this->maxScale !== null && $scaleSize > $this->maxScale) {
+		// digits after dot
+		if ($afterDotLength > $this->maxScale) {
 			$this->error($this->messageScale, $value, $this->maxScale);
 
 			return false;
diff --git a/frontends/php/include/classes/validators/CTriggerFunctionValidator.php b/frontends/php/include/classes/validators/CFunctionValidator.php
index deadf96d90c..b05d8661f21 100644
--- a/frontends/php/include/classes/validators/CTriggerFunctionValidator.php
+++ b/frontends/php/include/classes/validators/CFunctionValidator.php
@@ -19,7 +19,7 @@
 **/
 
 
-class CTriggerFunctionValidator extends CValidator {
+class CFunctionValidator extends CValidator {
 
 	/**
 	 * The array containing valid functions and parameters to them.
diff --git a/frontends/php/include/classes/validators/CIdValidator.php b/frontends/php/include/classes/validators/CIdValidator.php
index 869093b366a..6dfa3813557 100644
--- a/frontends/php/include/classes/validators/CIdValidator.php
+++ b/frontends/php/include/classes/validators/CIdValidator.php
@@ -19,13 +19,60 @@
 **/
 
 
-class CIdValidator extends CStringValidator {
+class CIdValidator extends CValidator {
 
 	/**
-	 * Numeric ID regex.
+	 * Value to determine whether to allow empty values
+	 *
+	 * @var bool
+	 */
+	public $empty = false;
+
+	/**
+	 * Error message if the id has wrong type or id is out of range or invalid
+	 *
+	 * @var string
+	 */
+	public $messageInvalid;
+
+	/**
+	 * Error message if the id is empty
 	 *
 	 * @var string
 	 */
-	public $regex = '/^\d+$/';
+	public $messageEmpty;
+
+	/**
+	 * Validates ID value
+	 *
+	 * @param string $value
+	 *
+	 * @return bool
+	 */
+	public function validate($value) {
+		if (!is_string($value) && !is_int($value)) {
+			$this->error($this->messageInvalid, $this->stringify($value));
+
+			return false;
+		}
+
+		if (!$this->empty && (string) $value === '0') {
+			$this->error($this->messageEmpty);
+
+			return false;
+		}
+
+		$regex = $this->empty ? '/^(0|(?!0)[0-9]+)$/' : '/^(?!0)\d+$/';
+
+		if (!preg_match($regex, $value) ||
+			bccomp($value, 0)  == -1 ||
+			bccomp($value, ZBX_DB_MAX_ID) == 1
+		) {
+			$this->error($this->messageInvalid, $value);
+
+			return false;
+		}
 
+		return true;
+	}
 }
diff --git a/frontends/php/include/classes/validators/CSetValidator.php b/frontends/php/include/classes/validators/CLimitedSetValidator.php
index 1b0b2e25691..5ba1a3e152d 100644
--- a/frontends/php/include/classes/validators/CSetValidator.php
+++ b/frontends/php/include/classes/validators/CLimitedSetValidator.php
@@ -19,7 +19,7 @@
 **/
 
 
-class CSetValidator extends CValidator {
+class CLimitedSetValidator extends CValidator {
 
 	/**
 	 * Allowed values.
@@ -29,7 +29,7 @@ class CSetValidator extends CValidator {
 	public $values = array();
 
 	/**
-	 * Error message if the value is invalid.
+	 * Error message if the value is invalid or is not of an acceptable type.
 	 *
 	 * @var string
 	 */
@@ -42,8 +42,13 @@ class CSetValidator extends CValidator {
 	 *
 	 * @return bool
 	 */
-	public function validate($value)
-	{
+	public function validate($value) {
+		if (!is_string($value) && !is_int($value)) {
+			$this->error($this->messageInvalid, $this->stringify($value));
+
+			return false;
+		}
+
 		$values = array_flip($this->values);
 
 		if (!isset($values[$value])) {
diff --git a/frontends/php/include/classes/validators/CRegexValidator.php b/frontends/php/include/classes/validators/CRegexValidator.php
new file mode 100644
index 00000000000..181a9a43deb
--- /dev/null
+++ b/frontends/php/include/classes/validators/CRegexValidator.php
@@ -0,0 +1,78 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+class CRegexValidator extends CValidator
+{
+
+	/**
+	 * Error message if the is not a string.
+	 *
+	 * @var string
+	 */
+	public $messageInvalid;
+
+	/**
+	 * Error message if the value is invalid
+	 *
+	 * @var string
+	 */
+	public $messageRegex;
+
+	/**
+	 * Check if regular expression is valid
+	 *
+	 * @param string $value
+	 *
+	 * @return bool
+	 */
+	public function validate($value) {
+		if (!is_string($value) && !is_numeric($value)) {
+			$this->error($this->messageInvalid);
+			return false;
+		}
+
+		// escape '/' since Zabbix server threats them as literal characters.
+		$value = str_replace('/', '\/', $value);
+
+		// validate through preg_match
+		$error = false;
+
+		set_error_handler(function ($errno, $errstr) use (&$error) {
+			if ($errstr != '') {
+				$error = $errstr;
+			}
+		});
+
+		preg_match('/'.$value.'/', null);
+
+		restore_error_handler();
+
+		if ($error) {
+			$this->error(
+				$this->messageRegex,
+				$value,
+				str_replace('preg_match(): ', '', $error)
+			);
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/frontends/php/include/classes/validators/string/CStringValidator.php b/frontends/php/include/classes/validators/CStringValidator.php
index a3988280c91..b6d51e4ae93 100644
--- a/frontends/php/include/classes/validators/string/CStringValidator.php
+++ b/frontends/php/include/classes/validators/CStringValidator.php
@@ -64,6 +64,13 @@ class CStringValidator extends CValidator {
 	public $messageRegex;
 
 	/**
+	 * Error message if not a string, integer or decimal is provided
+	 *
+	 * @var string
+	 */
+	public $messageInvalid;
+
+	/**
 	 * Checks if the given string is:
 	 * - empty
 	 * - not too long
@@ -74,6 +81,12 @@ class CStringValidator extends CValidator {
 	 * @return bool
 	 */
 	public function validate($value) {
+		if (!(is_string($value) || is_numeric($value))) {
+			$this->error($this->messageInvalid, $this->stringify($value));
+
+			return false;
+		}
+
 		if (zbx_empty($value)) {
 			if ($this->empty) {
 				return true;
@@ -85,8 +98,8 @@ class CStringValidator extends CValidator {
 			}
 		}
 
-		if ($this->maxLength && zbx_strlen($value) > $this->maxLength) {
-			$this->error($this->messageMaxLength, $this->maxLength);
+		if ($this->maxLength && mb_strlen($value) > $this->maxLength) {
+			$this->error($this->messageMaxLength, $value, $this->maxLength);
 
 			return false;
 		}
diff --git a/frontends/php/include/classes/validators/CValidator.php b/frontends/php/include/classes/validators/CValidator.php
index 8a1cde5844f..1ec25987175 100644
--- a/frontends/php/include/classes/validators/CValidator.php
+++ b/frontends/php/include/classes/validators/CValidator.php
@@ -110,4 +110,29 @@ abstract class CValidator {
 
 		$this->setError(vsprintf($message, $arguments));
 	}
+
+
+	/**
+	 * Returns string represenation of a variable
+	 *
+	 * @param mixed $value
+	 * @return string
+	 */
+	protected function stringify($value) {
+		if (is_bool($value)) {
+			return $value ? 'true' : 'false';
+		}
+		elseif (is_null($value)) {
+			return 'null';
+		}
+		elseif (is_object($value)) {
+			return get_class($value);
+		}
+		elseif (is_scalar($value)) {
+			return (string)$value;
+		}
+		else {
+			return gettype($value);
+		}
+	}
 }
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index 6bf4d7adc9f..7dec73f8379 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -48,7 +48,7 @@ function DBconnect(&$error) {
 		$result = false;
 	}
 	else {
-		$DB['TYPE'] = zbx_strtoupper($DB['TYPE']);
+		$DB['TYPE'] = strtoupper($DB['TYPE']);
 
 		switch ($DB['TYPE']) {
 			case ZBX_DB_MYSQL:
@@ -78,10 +78,21 @@ function DBconnect(&$error) {
 					$error = 'Error connecting to database.';
 					$result = false;
 				}
-				elseif (false !== ($pgsql_version = pg_parameter_status('server_version'))) {
-					if ((int) $pgsql_version >= 9) {
-						// change the output format for values of type bytea from hex (the default) to escape
-						DBexecute('SET bytea_output = escape');
+				else {
+					$schemaSet = DBexecute('SET search_path = '.zbx_dbstr($DB['SCHEMA'] ? $DB['SCHEMA'] : 'public'), true);
+
+					if(!$schemaSet) {
+						clear_messages();
+						$error = pg_last_error();
+						$result = false;
+					}
+					else {
+						if (false !== ($pgsql_version = pg_parameter_status('server_version'))) {
+							if ((int) $pgsql_version >= 9) {
+								// change the output format for values of type bytea from hex (the default) to escape
+								DBexecute('SET bytea_output = escape');
+							}
+						}
 					}
 				}
 
@@ -424,7 +435,7 @@ function DBselect($query, $limit = null, $offset = 0) {
 			break;
 	}
 
-	// $result is false only if an error occured
+	// $result is false only if an error occurred
 	if ($DB['TRANSACTION_NO_FAILED_SQLS'] && !$result) {
 		$DB['TRANSACTION_NO_FAILED_SQLS'] = false;
 	}
@@ -589,15 +600,15 @@ function DBfetch($cursor, $convertNulls = true) {
 			if ($row = oci_fetch_assoc($cursor)) {
 				$result = array();
 				foreach ($row as $key => $value) {
-					$field_type = zbx_strtolower(oci_field_type($cursor, $key));
+					$field_type = strtolower(oci_field_type($cursor, $key));
 					// Oracle does not support NULL values for string fields, so if the string is empty, it will return NULL
 					// convert it to an empty string to be consistent with other databases
 					$value = (str_in_array($field_type, array('varchar', 'varchar2', 'blob', 'clob')) && is_null($value)) ? '' : $value;
 
-					if (is_object($value) && (zbx_stristr($field_type, 'lob') !== false)) {
+					if (is_object($value) && (strpos($field_type, 'lob') !== false)) {
 						$value = $value->load();
 					}
-					$result[zbx_strtolower($key)] = $value;
+					$result[strtolower($key)] = $value;
 				}
 			}
 			break;
@@ -767,7 +778,7 @@ function zbx_db_search($table, $options, &$sql_parts) {
 				$fieldSearch[] =
 					' UPPER('.$tableShort.'.'.$field.') '.
 					$exclude.' LIKE '.
-					zbx_dbstr($start.zbx_strtoupper($pattern).'%').
+					zbx_dbstr($start.mb_strtoupper($pattern).'%').
 					" ESCAPE '!'";
 			}
 			else {
@@ -775,7 +786,7 @@ function zbx_db_search($table, $options, &$sql_parts) {
 				$fieldSearch[] =
 					' UPPER('.$tableShort.'.'.$field.') '.
 					$exclude.' LIKE '.
-					zbx_dbstr(zbx_strtoupper($pattern)).
+					zbx_dbstr(mb_strtoupper($pattern)).
 					" ESCAPE '!'";
 			}
 		}
diff --git a/frontends/php/include/debug.inc.php b/frontends/php/include/debug.inc.php
index befbb3edf18..33a339919c1 100644
--- a/frontends/php/include/debug.inc.php
+++ b/frontends/php/include/debug.inc.php
@@ -43,7 +43,7 @@ function sdb($return = false) {
 function sdi($msg = 'SDI') {
 	echo 'DEBUG INFO: ';
 	var_dump($msg);
-	echo SBR;
+	echo BR();
 }
 
 function sdii($msg = 'SDII', $for = '', $showInvisible = true) {
@@ -60,7 +60,7 @@ function sdii($msg = 'SDII', $for = '', $showInvisible = true) {
 	}
 	echo 'DEBUG INFO: '.$for;
 	echo '<pre>'.print_r($msg, true).'</pre>';
-	echo SBR;
+	echo BR();
 }
 
 function vdp($var, $msg = null) {
@@ -69,11 +69,11 @@ function vdp($var, $msg = null) {
 		echo '"'.$msg.'"'.SPACE;
 	}
 	var_dump($var);
-	echo SBR;
+	echo BR();
 }
 
 function todo($msg) {
-	echo 'TODO: '.$msg.SBR;
+	echo 'TODO: '.$msg.BR();
 }
 
 
@@ -129,7 +129,7 @@ function sdf(&$var) {
 	else {
 		echo $value;
 	}
-	echo SBR;
+	echo BR();
 }
 
 /**
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 6de1587c235..654c63987c1 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -19,12 +19,12 @@
 **/
 
 
-define('ZABBIX_VERSION',     '2.3.0');
-define('ZABBIX_API_VERSION', '2.3.0');
-define('ZABBIX_DB_VERSION',	 2030091);
+define('ZABBIX_VERSION',		'2.3.4');
+define('ZABBIX_API_VERSION',	'2.3.4');
+define('ZABBIX_DB_VERSION',		2030118);
 
-define('ZABBIX_COPYRIGHT_FROM', '2001');
-define('ZABBIX_COPYRIGHT_TO',   '2014');
+define('ZABBIX_COPYRIGHT_FROM',	'2001');
+define('ZABBIX_COPYRIGHT_TO',	'2014');
 
 define('ZBX_LOGIN_ATTEMPTS',	5);
 define('ZBX_LOGIN_BLOCK',		30); // sec
@@ -34,6 +34,10 @@ define('ZBX_MAX_PERIOD',		63072000); // the maximum period for the time bar cont
 define('ZBX_MAX_DATE',			2147483647); // 19 Jan 2038 05:14:07
 define('ZBX_PERIOD_DEFAULT',	3600); // 1 hour
 
+// the maximum period to display history data for the latest data and item overview pages in seconds
+// by default set to 86400 seconds (24 hours)
+define('ZBX_HISTORY_PERIOD', 86400);
+
 define('ZBX_WIDGET_ROWS', 20);
 
 define('ZBX_FONTPATH',				realpath('fonts')); // where to search for font (GD > 2.0.18)
@@ -121,7 +125,6 @@ define('ZBX_DROPDOWN_FIRST_ALL',	1);
 define('T_ZBX_STR',			0);
 define('T_ZBX_INT',			1);
 define('T_ZBX_DBL',			2);
-define('T_ZBX_PERIOD',		3);
 define('T_ZBX_IP',			4);
 define('T_ZBX_CLR',			5);
 define('T_ZBX_IP_RANGE',	7);
@@ -136,6 +139,7 @@ define('P_SYS',				1);
 define('P_UNSET_EMPTY',		2);
 define('P_ACT',				16);
 define('P_NZERO',			32);
+define('P_NO_TRIM',			64);
 
 //	misc parameters
 define('IMAGE_FORMAT_PNG',	'PNG');
@@ -252,6 +256,9 @@ define('INTERFACE_TYPE_SNMP',		2);
 define('INTERFACE_TYPE_IPMI',		3);
 define('INTERFACE_TYPE_JMX',		4);
 
+define('SNMP_BULK_DISABLED',	0);
+define('SNMP_BULK_ENABLED',		1);
+
 define('MAINTENANCE_STATUS_ACTIVE',		0);
 define('MAINTENANCE_STATUS_APPROACH',	1);
 define('MAINTENANCE_STATUS_EXPIRED',	2);
@@ -513,6 +520,8 @@ define('SCREEN_RESOURCE_HOST_TRIGGERS',		16);
 // used in Monitoring > Latest data > Graph (history.php)
 define('SCREEN_RESOURCE_HISTORY',			17);
 define('SCREEN_RESOURCE_CHART',				18);
+define('SCREEN_RESOURCE_LLD_SIMPLE_GRAPH',	19);
+define('SCREEN_RESOURCE_LLD_GRAPH',			20);
 
 define('SCREEN_SORT_TRIGGERS_DATE_DESC',			0);
 define('SCREEN_SORT_TRIGGERS_SEVERITY_DESC',		1);
@@ -537,9 +546,13 @@ define('SCREEN_DYNAMIC_ITEM',	1);
 define('SCREEN_REFRESH_TIMEOUT',		30);
 define('SCREEN_REFRESH_RESPONSIVENESS',	10);
 
+define('SCREEN_SURROGATE_MAX_COLUMNS_MIN', 1);
+define('SCREEN_SURROGATE_MAX_COLUMNS_DEFAULT', 3);
+define('SCREEN_SURROGATE_MAX_COLUMNS_MAX', 100);
+
 define('DEFAULT_LATEST_ISSUES_CNT', 20);
 
-// alignes
+// alignments
 define('HALIGN_DEFAULT',	0);
 define('HALIGN_CENTER',		0);
 define('HALIGN_LEFT',		1);
@@ -551,7 +564,7 @@ define('VALIGN_TOP',		1);
 define('VALIGN_BOTTOM',		2);
 
 // info module style
-define('STYLE_HORISONTAL',	0);
+define('STYLE_HORIZONTAL',	0);
 define('STYLE_VERTICAL',	1);
 
 // view style [Overview]
@@ -633,6 +646,18 @@ define('HTTPSTEP_ITEM_TYPE_IN',			2);
 define('HTTPSTEP_ITEM_TYPE_LASTSTEP',	3);
 define('HTTPSTEP_ITEM_TYPE_LASTERROR',	4);
 
+define('HTTPTEST_STEP_RETRIEVE_MODE_CONTENT', 0);
+define('HTTPTEST_STEP_RETRIEVE_MODE_HEADERS', 1);
+
+define('HTTPTEST_STEP_FOLLOW_REDIRECTS_OFF', 0);
+define('HTTPTEST_STEP_FOLLOW_REDIRECTS_ON', 1);
+
+define('HTTPTEST_VERIFY_PEER_OFF', 0);
+define('HTTPTEST_VERIFY_PEER_ON', 1);
+
+define('HTTPTEST_VERIFY_HOST_OFF', 0);
+define('HTTPTEST_VERIFY_HOST_ON', 1);
+
 define('EVENT_ACK_DISABLED',	'0');
 define('EVENT_ACK_ENABLED',		'1');
 
@@ -740,15 +765,19 @@ define('EXPRESSION_HOST_ITEM_UNKNOWN',	'#ERROR_ITEM#');
 define('EXPRESSION_NOT_A_MACRO_ERROR',	'#ERROR_MACRO#');
 define('EXPRESSION_FUNCTION_UNKNOWN',	'#ERROR_FUNCTION#');
 
-define('SBR',	"<br/>\n");
+/**
+ * @deprecated use either a literal space " " or a non-breakable space "&nbsp;" instead
+ */
 define('SPACE',	'&nbsp;');
-define('RARR',	'&rArr;');
-define('SQUAREBRACKETS', '%5B%5D');
+
+/**
+ * Symbol used to separate name pairs such as "host: item" or "proxy: host".
+ *
+ * Should not be used as just a colon.
+ */
 define('NAME_DELIMITER', ': ');
-define('UNKNOWN_VALUE', '-');
 
-define('REGEXP_INCLUDE', 0);
-define('REGEXP_EXCLUDE', 1);
+define('UNKNOWN_VALUE', '-');
 
 // suffixes
 define('ZBX_BYTE_SUFFIXES', 'KMGT');
@@ -837,6 +866,14 @@ define('XML_TAG_DEPENDENCY',		'dependency');
 
 define('ZBX_DEFAULT_IMPORT_HOST_GROUP', 'Imported hosts');
 
+// XML import flags
+// See ZBX-8151. Old version of libxml suffered from setting DTDLOAD and NOENT flags by default, which allowed
+// performing XXE attacks. Calling libxml_disable_entity_loader(true) also had no affect if flags passed to libxml
+// calls were 0 - so for better security with legacy libxml we need to call libxml_disable_entity_loader(true) AND
+// pass the LIBXML_NONET flag. Please keep in mind that LIBXML_NOENT actually EXPANDS entities, opposite to it's name -
+// so this flag is not needed here.
+define('LIBXML_IMPORT_FLAGS', LIBXML_NONET);
+
 // API errors
 define('ZBX_API_ERROR_INTERNAL',	111);
 define('ZBX_API_ERROR_PARAMETERS',	100);
@@ -885,7 +922,6 @@ define('WIDGET_ZABBIX_STATUS',		'stszbx');
 define('DB_ID',		"({}>=0&&bccomp('{}',\"10000000000000000000\")<0)&&");
 define('NOT_EMPTY',	"({}!='')&&");
 define('NOT_ZERO',	"({}!=0)&&");
-define('NO_TRIM',	'NO_TRIM');
 
 define('ZBX_VALID_OK',		0);
 define('ZBX_VALID_ERROR',	1);
@@ -903,6 +939,9 @@ define('ZABBIX_HOMEPAGE', 'http://www.zabbix.com');
 define('TIMESTAMP_FORMAT', 'YmdHis');
 define('TIMESTAMP_FORMAT_ZERO_TIME', 'Ymd0000');
 
+// date format context, usable for translators
+define('DATE_FORMAT_CONTEXT', 'Date format (see http://php.net/date)');
+
 // actions
 define('LONG_DESCRIPTION',	0);
 define('SHORT_DESCRIPTION',	1);
@@ -924,6 +963,11 @@ define('COPY_TYPE_TO_HOST', 0);
 define('COPY_TYPE_TO_TEMPLATE', 2);
 define('COPY_TYPE_TO_HOST_GROUP', 1);
 
+define('HISTORY_GRAPH', 'showgraph');
+define('HISTORY_BATCH_GRAPH', 'batchgraph');
+define('HISTORY_VALUES', 'showvalues');
+define('HISTORY_LATEST', 'showlatest');
+
 // configuration -> maps default add icon name
 define('MAP_DEFAULT_ICON', 'Server_(96)');
 
diff --git a/frontends/php/include/draw.inc.php b/frontends/php/include/draw.inc.php
index 1c9776db463..ec7807c3579 100644
--- a/frontends/php/include/draw.inc.php
+++ b/frontends/php/include/draw.inc.php
@@ -39,7 +39,7 @@ function zbx_colormix($image, $bgColor, $fgColor, $alpha) {
 
 /**
  * Draw normal line.
- * PHP imageline() function is broken because it drops fraction instead of correct rounding of X/Y coordnates.
+ * PHP imageline() function is broken because it drops fraction instead of correct rounding of X/Y coordinates.
  * All calls to imageline() must be replaced by the wrapper function everywhere in the code.
  *
  * @param resource  $image  image reference
diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index e0b2206fe57..a80df0c5326 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -173,7 +173,7 @@ function make_event_details($event, $trigger) {
 		new CCol(_('Event')),
 		new CCol(CMacrosResolverHelper::resolveEventDescription(array_merge($trigger, $event)), 'wraptext')
 	));
-	$table->addRow(array(_('Time'), zbx_date2str(_('d M Y H:i:s'), $event['clock'])));
+	$table->addRow(array(_('Time'), zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event['clock'])));
 
 	if ($config['event_ack_enable']) {
 		// to make resulting link not have hint with acknowledges
@@ -246,7 +246,7 @@ function make_small_eventlist($startEvent) {
 
 		$table->addRow(array(
 			new CLink(
-				zbx_date2str(_('d M Y H:i:s'), $event['clock']),
+				zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event['clock']),
 				'tr_events.php?triggerid='.$event['objectid'].'&eventid='.$event['eventid'],
 				'action'
 			),
@@ -299,7 +299,7 @@ function make_popup_eventlist($triggerId, $eventId) {
 		addTriggerValueStyle($eventStatusSpan, $event['value'], $event['clock'], $event['acknowledged']);
 
 		$table->addRow(array(
-			zbx_date2str(_('d M Y H:i:s'), $event['clock']),
+			zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event['clock']),
 			$eventStatusSpan,
 			$duration,
 			zbx_date2age($event['clock']),
@@ -359,7 +359,7 @@ function getEventAckState($event, $backUrl = false, $isLink = true, $params = ar
 			if (is_array($event['acknowledges'])) {
 				$ackLinkHints = makeAckTab($event);
 				if (!empty($ackLinkHints)) {
-					$ackLink->setHint($ackLinkHints, '', '', false);
+					$ackLink->setHint($ackLinkHints, '', false);
 				}
 				$ack = array($ackLink, ' ('.count($event['acknowledges']).')');
 			}
@@ -388,7 +388,7 @@ function getLastEvents($options) {
 	$triggerOptions = array(
 		'filter' => array(),
 		'skipDependent' => 1,
-		'selectHosts' => array('hostid', 'host'),
+		'selectHosts' => array('hostid', 'name'),
 		'output' => API_OUTPUT_EXTEND,
 		'sortfield' => 'lastchange',
 		'sortorder' => ZBX_SORT_DOWN,
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 59521dad8d7..b4e6067b6eb 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -68,25 +68,25 @@ function getUserFormData($userid, $isProfile = false) {
 		}
 	}
 	else {
-		$data['alias']			= get_request('alias', '');
-		$data['name']			= get_request('name', '');
-		$data['surname']		= get_request('surname', '');
-		$data['password1']		= get_request('password1', '');
-		$data['password2']		= get_request('password2', '');
-		$data['url']			= get_request('url', '');
-		$data['autologin']		= get_request('autologin', 0);
-		$data['autologout']		= get_request('autologout', 900);
-		$data['lang']			= get_request('lang', 'en_gb');
-		$data['theme']			= get_request('theme', THEME_DEFAULT);
-		$data['refresh']		= get_request('refresh', 30);
-		$data['rows_per_page']	= get_request('rows_per_page', 50);
-		$data['user_type']		= get_request('user_type', USER_TYPE_ZABBIX_USER);
-		$data['user_groups']	= get_request('user_groups', array());
-		$data['change_password']= get_request('change_password', null);
-		$data['user_medias']	= get_request('user_medias', array());
+		$data['alias']			= getRequest('alias', '');
+		$data['name']			= getRequest('name', '');
+		$data['surname']		= getRequest('surname', '');
+		$data['password1']		= getRequest('password1', '');
+		$data['password2']		= getRequest('password2', '');
+		$data['url']			= getRequest('url', '');
+		$data['autologin']		= getRequest('autologin', 0);
+		$data['autologout']		= getRequest('autologout', 900);
+		$data['lang']			= getRequest('lang', 'en_gb');
+		$data['theme']			= getRequest('theme', THEME_DEFAULT);
+		$data['refresh']		= getRequest('refresh', 30);
+		$data['rows_per_page']	= getRequest('rows_per_page', 50);
+		$data['user_type']		= getRequest('user_type', USER_TYPE_ZABBIX_USER);
+		$data['user_groups']	= getRequest('user_groups', array());
+		$data['change_password']= getRequest('change_password');
+		$data['user_medias']	= getRequest('user_medias', array());
 
 		// set messages
-		$data['messages'] = get_request('messages', array());
+		$data['messages'] = getRequest('messages', array());
 		if (!isset($data['messages']['enabled'])) {
 			$data['messages']['enabled'] = 0;
 		}
@@ -428,7 +428,7 @@ function getItemFilterForm(&$items) {
 	$updateIntervalLabel = new CSpan(array(bold(_('Update interval')), SPACE._('(in sec)').NAME_DELIMITER));
 	$updateIntervalLabel->setAttribute('id', 'filter_delay_label');
 
-	$updateIntervalInput = new CNumericBox('filter_delay', $filter_delay, 5, null, true);
+	$updateIntervalInput = new CNumericBox('filter_delay', $filter_delay, 5, false, true);
 	$updateIntervalInput->setEnabled('no');
 
 	// data type
@@ -470,7 +470,7 @@ function getItemFilterForm(&$items) {
 	$portLabel = new CSpan(array(bold(_('Port')), SPACE._('like').NAME_DELIMITER));
 	$portLabel->setAttribute('id', 'filter_port_label');
 
-	$portField = new CNumericBox('filter_port', $filter_port, 5, null, true);
+	$portField = new CNumericBox('filter_port', $filter_port, 5, false, true);
 	$portField->setEnabled('no');
 
 	// row 1
@@ -499,7 +499,14 @@ function getItemFilterForm(&$items) {
 				'objectOptions' => array(
 					'editable' => true
 				),
-				'data' => $groupFilter
+				'data' => $groupFilter,
+				'popup' => array(
+					'parameters' => 'srctbl=host_groups&dstfrm='.$form->getName().'&dstfld1=filter_groupid'.
+						'&srcfld1=groupid&writeonly=1',
+					'width' => 450,
+					'height' => 450,
+					'buttonClass' => 'input filter-multiselect-select-button'
+				)
 			))
 		), 'col1'),
 		new CCol(bold(_('Type').NAME_DELIMITER), 'label col2'),
@@ -537,7 +544,14 @@ function getItemFilterForm(&$items) {
 					'editable' => true,
 					'templated_hosts' => true
 				),
-				'data' => $hostFilterData
+				'data' => $hostFilterData,
+				'popup' => array(
+					'parameters' => 'srctbl=host_templates&dstfrm='.$form->getName().'&dstfld1=filter_hostid'.
+						'&srcfld1=hostid&writeonly=1',
+					'width' => 450,
+					'height' => 450,
+					'buttonClass' => 'input filter-multiselect-select-button'
+				)
 			))
 		), 'col1'),
 		new CCol($updateIntervalLabel, 'label'),
@@ -564,7 +578,7 @@ function getItemFilterForm(&$items) {
 		new CCol(array($snmpCommunityLabel, $snmpSecurityLabel), 'label'),
 		new CCol(array($snmpCommunityField, $snmpSecurityField)),
 		new CCol(array(bold(_('History')), SPACE._('(in days)').NAME_DELIMITER), 'label'),
-		new CCol(new CNumericBox('filter_history', $filter_history, 8, null, true)),
+		new CCol(new CNumericBox('filter_history', $filter_history, 8, false, true)),
 		new CCol(bold(_('Triggers').NAME_DELIMITER), 'label'),
 		new CCol(new CComboBox('filter_with_triggers', $filter_with_triggers, null, array(
 			-1 => _('all'),
@@ -579,7 +593,7 @@ function getItemFilterForm(&$items) {
 		new CCol($snmpOidLabel, 'label'),
 		new CCol($snmpOidField),
 		new CCol(array(bold(_('Trends')), SPACE._('(in days)').NAME_DELIMITER), 'label'),
-		new CCol(new CNumericBox('filter_trends', $filter_trends, 8, null, true)),
+		new CCol(new CNumericBox('filter_trends', $filter_trends, 8, false, true)),
 		new CCol(bold(_('Template').NAME_DELIMITER), 'label'),
 		new CCol(new CComboBox('filter_templated_items', $filter_templated_items, null, array(
 			-1 => _('all'),
@@ -936,53 +950,53 @@ function getItemFilterForm(&$items) {
  */
 function getItemFormData(array $item = array(), array $options = array()) {
 	$data = array(
-		'form' => get_request('form'),
-		'form_refresh' => get_request('form_refresh'),
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh'),
 		'is_discovery_rule' => !empty($options['is_discovery_rule']),
-		'parent_discoveryid' => get_request('parent_discoveryid', !empty($options['is_discovery_rule']) ? get_request('itemid', null) : null),
-		'itemid' => get_request('itemid', null),
+		'parent_discoveryid' => getRequest('parent_discoveryid', !empty($options['is_discovery_rule']) ? getRequest('itemid') : null),
+		'itemid' => getRequest('itemid'),
 		'limited' => false,
-		'interfaceid' => get_request('interfaceid', 0),
-		'name' => get_request('name', ''),
-		'description' => get_request('description', ''),
-		'key' => get_request('key', ''),
-		'hostname' => get_request('hostname', null),
-		'delay' => get_request('delay', ZBX_ITEM_DELAY_DEFAULT),
-		'history' => get_request('history', 90),
-		'status' => get_request('status', isset($_REQUEST['form_refresh']) ? 1 : 0),
-		'type' => get_request('type', 0),
-		'snmp_community' => get_request('snmp_community', 'public'),
-		'snmp_oid' => get_request('snmp_oid', 'interfaces.ifTable.ifEntry.ifInOctets.1'),
-		'port' => get_request('port', ''),
-		'value_type' => get_request('value_type', ITEM_VALUE_TYPE_UINT64),
-		'data_type' => get_request('data_type', ITEM_DATA_TYPE_DECIMAL),
-		'trapper_hosts' => get_request('trapper_hosts', ''),
-		'units' => get_request('units', ''),
-		'valuemapid' => get_request('valuemapid', 0),
-		'params' => get_request('params', ''),
-		'multiplier' => get_request('multiplier', 0),
-		'delta' => get_request('delta', 0),
-		'trends' => get_request('trends', DAY_IN_YEAR),
-		'new_application' => get_request('new_application', ''),
-		'applications' => get_request('applications', array()),
-		'delay_flex' => get_request('delay_flex', array()),
-		'new_delay_flex' => get_request('new_delay_flex', array('delay' => 50, 'period' => ZBX_DEFAULT_INTERVAL)),
-		'snmpv3_contextname' => get_request('snmpv3_contextname', ''),
-		'snmpv3_securityname' => get_request('snmpv3_securityname', ''),
-		'snmpv3_securitylevel' => get_request('snmpv3_securitylevel', 0),
-		'snmpv3_authprotocol' => get_request('snmpv3_authprotocol', ITEM_AUTHPROTOCOL_MD5),
-		'snmpv3_authpassphrase' => get_request('snmpv3_authpassphrase', ''),
-		'snmpv3_privprotocol' => get_request('snmpv3_privprotocol', ITEM_PRIVPROTOCOL_DES),
-		'snmpv3_privpassphrase' => get_request('snmpv3_privpassphrase', ''),
-		'ipmi_sensor' => get_request('ipmi_sensor', ''),
-		'authtype' => get_request('authtype', 0),
-		'username' => get_request('username', ''),
-		'password' => get_request('password', ''),
-		'publickey' => get_request('publickey', ''),
-		'privatekey' => get_request('privatekey', ''),
-		'formula' => get_request('formula', 1),
-		'logtimefmt' => get_request('logtimefmt', ''),
-		'add_groupid' => get_request('add_groupid', get_request('groupid', 0)),
+		'interfaceid' => getRequest('interfaceid', 0),
+		'name' => getRequest('name', ''),
+		'description' => getRequest('description', ''),
+		'key' => getRequest('key', ''),
+		'hostname' => getRequest('hostname'),
+		'delay' => getRequest('delay', ZBX_ITEM_DELAY_DEFAULT),
+		'history' => getRequest('history', 90),
+		'status' => getRequest('status', isset($_REQUEST['form_refresh']) ? 1 : 0),
+		'type' => getRequest('type', 0),
+		'snmp_community' => getRequest('snmp_community', 'public'),
+		'snmp_oid' => getRequest('snmp_oid', 'interfaces.ifTable.ifEntry.ifInOctets.1'),
+		'port' => getRequest('port', ''),
+		'value_type' => getRequest('value_type', ITEM_VALUE_TYPE_UINT64),
+		'data_type' => getRequest('data_type', ITEM_DATA_TYPE_DECIMAL),
+		'trapper_hosts' => getRequest('trapper_hosts', ''),
+		'units' => getRequest('units', ''),
+		'valuemapid' => getRequest('valuemapid', 0),
+		'params' => getRequest('params', ''),
+		'multiplier' => getRequest('multiplier', 0),
+		'delta' => getRequest('delta', 0),
+		'trends' => getRequest('trends', DAY_IN_YEAR),
+		'new_application' => getRequest('new_application', ''),
+		'applications' => getRequest('applications', array()),
+		'delay_flex' => getRequest('delay_flex', array()),
+		'new_delay_flex' => getRequest('new_delay_flex', array('delay' => 50, 'period' => ZBX_DEFAULT_INTERVAL)),
+		'snmpv3_contextname' => getRequest('snmpv3_contextname', ''),
+		'snmpv3_securityname' => getRequest('snmpv3_securityname', ''),
+		'snmpv3_securitylevel' => getRequest('snmpv3_securitylevel', 0),
+		'snmpv3_authprotocol' => getRequest('snmpv3_authprotocol', ITEM_AUTHPROTOCOL_MD5),
+		'snmpv3_authpassphrase' => getRequest('snmpv3_authpassphrase', ''),
+		'snmpv3_privprotocol' => getRequest('snmpv3_privprotocol', ITEM_PRIVPROTOCOL_DES),
+		'snmpv3_privpassphrase' => getRequest('snmpv3_privpassphrase', ''),
+		'ipmi_sensor' => getRequest('ipmi_sensor', ''),
+		'authtype' => getRequest('authtype', 0),
+		'username' => getRequest('username', ''),
+		'password' => getRequest('password', ''),
+		'publickey' => getRequest('publickey', ''),
+		'privatekey' => getRequest('privatekey', ''),
+		'formula' => getRequest('formula', 1),
+		'logtimefmt' => getRequest('logtimefmt', ''),
+		'add_groupid' => getRequest('add_groupid', getRequest('groupid', 0)),
 		'valuemaps' => null,
 		'possibleHostInventories' => null,
 		'alreadyPopulated' => null,
@@ -1001,7 +1015,7 @@ function getItemFormData(array $item = array(), array $options = array()) {
 		$data['hostid'] = $discoveryRule['hostid'];
 	}
 	else {
-		$data['hostid'] = get_request('hostid', 0);
+		$data['hostid'] = getRequest('hostid', 0);
 	}
 
 	// types, http items only for internal processes
@@ -1018,7 +1032,7 @@ function getItemFormData(array $item = array(), array $options = array()) {
 	if ($item) {
 		$data['item'] = $item;
 		$data['hostid'] = !empty($data['hostid']) ? $data['hostid'] : $data['item']['hostid'];
-		$data['limited'] = $data['item']['templateid'] != 0;
+		$data['limited'] = ($data['item']['templateid'] != 0);
 
 		// get templates
 		$itemid = $item['itemid'];
@@ -1047,17 +1061,17 @@ function getItemFormData(array $item = array(), array $options = array()) {
 					// discovery rule
 					elseif ($data['is_discovery_rule']) {
 						$data['templates'][] = new CLink($host['name'], 'host_discovery.php?form=update&itemid='.$item['itemid'], 'highlight underline weight_normal');
-						$data['templates'][] = SPACE.RARR.SPACE;
+						$data['templates'][] = SPACE.'&rArr;'.SPACE;
 					}
 					// item prototype
 					elseif ($item['discoveryRule']) {
 						$data['templates'][] = new CLink($host['name'], 'disc_prototypes.php?form=update&itemid='.$item['itemid'].'&parent_discoveryid='.$item['discoveryRule']['itemid'], 'highlight underline weight_normal');
-						$data['templates'][] = SPACE.RARR.SPACE;
+						$data['templates'][] = SPACE.'&rArr;'.SPACE;
 					}
 					// plain item
 					else {
 						$data['templates'][] = new CLink($host['name'], 'items.php?form=update&itemid='.$item['itemid'], 'highlight underline weight_normal');
-						$data['templates'][] = SPACE.RARR.SPACE;
+						$data['templates'][] = SPACE.'&rArr;'.SPACE;
 					}
 				}
 				$itemid = $item['templateid'];
@@ -1127,7 +1141,7 @@ function getItemFormData(array $item = array(), array $options = array()) {
 		$data['publickey'] = $data['item']['publickey'];
 		$data['privatekey'] = $data['item']['privatekey'];
 		$data['logtimefmt'] = $data['item']['logtimefmt'];
-		$data['new_application'] = get_request('new_application', '');
+		$data['new_application'] = getRequest('new_application', '');
 
 		if (!$data['is_discovery_rule']) {
 			$data['formula'] = $data['item']['formula'];
@@ -1158,7 +1172,7 @@ function getItemFormData(array $item = array(), array $options = array()) {
 		}
 	}
 
-	// aplications
+	// applications
 	if (count($data['applications']) == 0) {
 		array_push($data['applications'], 0);
 	}
@@ -1295,16 +1309,15 @@ function getCopyElementsFormData($elementsField, $title = null) {
 
 function getTriggerMassupdateFormData() {
 	$data = array(
-		'visible' => get_request('visible', array()),
-		'priority' => get_request('priority', ''),
-		'dependencies' => get_request('dependencies', array()),
-		'massupdate' => get_request('massupdate', 1),
-		'parent_discoveryid' => get_request('parent_discoveryid'),
-		'go' => get_request('go', 'massupdate'),
-		'g_triggerid' => get_request('g_triggerid', array()),
-		'priority' => get_request('priority', 0),
+		'visible' => getRequest('visible', array()),
+		'priority' => getRequest('priority', ''),
+		'dependencies' => getRequest('dependencies', array()),
+		'massupdate' => getRequest('massupdate', 1),
+		'parent_discoveryid' => getRequest('parent_discoveryid'),
+		'g_triggerid' => getRequest('g_triggerid', array()),
+		'priority' => getRequest('priority', 0),
 		'config' => select_config(),
-		'hostid' => get_request('hostid', 0)
+		'hostid' => getRequest('hostid', 0)
 	);
 
 	// get dependencies
@@ -1329,26 +1342,33 @@ function getTriggerMassupdateFormData() {
 	return $data;
 }
 
-function getTriggerFormData() {
+/**
+ * Generate data for the trigger configuration form.
+ *
+ * @param string $exprAction	expression constructor action, see remakeExpression() for a list of supported values
+ *
+ * @return array
+ */
+function getTriggerFormData($exprAction) {
 	$data = array(
-		'form' => get_request('form'),
-		'form_refresh' => get_request('form_refresh'),
-		'parent_discoveryid' => get_request('parent_discoveryid'),
-		'dependencies' => get_request('dependencies', array()),
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh'),
+		'parent_discoveryid' => getRequest('parent_discoveryid'),
+		'dependencies' => getRequest('dependencies', array()),
 		'db_dependencies' => array(),
-		'triggerid' => get_request('triggerid'),
-		'expression' => get_request('expression', ''),
-		'expr_temp' => get_request('expr_temp', ''),
-		'description' => get_request('description', ''),
-		'type' => get_request('type', 0),
-		'priority' => get_request('priority', 0),
-		'status' => get_request('status', 0),
-		'comments' => get_request('comments', ''),
-		'url' => get_request('url', ''),
-		'input_method' => get_request('input_method', IM_ESTABLISHED),
-		'limited' => null,
+		'triggerid' => getRequest('triggerid'),
+		'expression' => getRequest('expression', ''),
+		'expr_temp' => getRequest('expr_temp', ''),
+		'description' => getRequest('description', ''),
+		'type' => getRequest('type', 0),
+		'priority' => getRequest('priority', 0),
+		'status' => getRequest('status', 0),
+		'comments' => getRequest('comments', ''),
+		'url' => getRequest('url', ''),
+		'input_method' => getRequest('input_method', IM_ESTABLISHED),
+		'limited' => false,
 		'templates' => array(),
-		'hostid' => get_request('hostid', 0)
+		'hostid' => getRequest('hostid', 0)
 	);
 
 	if (!empty($data['triggerid'])) {
@@ -1388,14 +1408,14 @@ function getTriggerFormData() {
 					$link,
 					'highlight underline weight_normal'
 				);
-				$data['templates'][] = SPACE.RARR.SPACE;
+				$data['templates'][] = SPACE.'&rArr;'.SPACE;
 			}
 			$tmp_triggerid = $db_triggers['templateid'];
 		} while ($tmp_triggerid != 0);
 		$data['templates'] = array_reverse($data['templates']);
 		array_shift($data['templates']);
 
-		$data['limited'] = $data['trigger']['templateid'] ? 'yes' : null;
+		$data['limited'] = ($data['trigger']['templateid'] != 0);
 
 		// select first host from triggers if gived not match
 		$hosts = $data['trigger']['hosts'];
@@ -1405,10 +1425,10 @@ function getTriggerFormData() {
 		}
 	}
 
-	if ((!empty($data['triggerid']) && !isset($_REQUEST['form_refresh'])) || !empty($data['limited'])) {
+	if ((!empty($data['triggerid']) && !isset($_REQUEST['form_refresh'])) || $data['limited']) {
 		$data['expression'] = explode_exp($data['trigger']['expression']);
 
-		if (empty($data['limited']) || !isset($_REQUEST['form_refresh'])) {
+		if (!$data['limited'] || !isset($_REQUEST['form_refresh'])) {
 			$data['description'] = $data['trigger']['description'];
 			$data['type'] = $data['trigger']['type'];
 			$data['priority'] = $data['trigger']['priority'];
@@ -1435,9 +1455,10 @@ function getTriggerFormData() {
 		$analyze = analyzeExpression($data['expression']);
 		if ($analyze !== false) {
 			list($data['outline'], $data['eHTMLTree']) = $analyze;
-			if (isset($_REQUEST['expr_action']) && $data['eHTMLTree'] != null) {
+			if ($exprAction !== null && $data['eHTMLTree'] != null) {
 				$new_expr = remakeExpression($data['expression'], $_REQUEST['expr_target_single'],
-						$_REQUEST['expr_action'], $data['expr_temp']);
+					$exprAction, $data['expr_temp']
+				);
 				if ($new_expr !== false) {
 					$data['expression'] = $new_expr;
 					$analyze = analyzeExpression($data['expression']);
@@ -1455,13 +1476,8 @@ function getTriggerFormData() {
 			}
 			$data['expression_field_name'] = 'expr_temp';
 			$data['expression_field_value'] = $data['expr_temp'];
-			$data['expression_field_readonly'] = 'yes';
+			$data['expression_field_readonly'] = true;
 			$data['expression_field_params'] = 'this.form.elements["'.$data['expression_field_name'].'"].value';
-			$data['expression_macro_button'] = new CButton('insert_macro', _('Insert macro'), null, 'formlist');
-			$data['expression_macro_button']->setMenuPopup(CMenuPopupHelper::getTriggerMacro());
-			if ($data['limited'] == 'yes') {
-				$data['expression_macro_button']->setAttribute('disabled', 'disabled');
-			}
 		}
 		else {
 			show_messages(false, '', _('Expression Syntax Error.'));
@@ -1501,7 +1517,7 @@ function get_timeperiod_form() {
 	$tblPeriod = new CTable(null, 'formElementTable');
 
 	// init new_timeperiod variable
-	$new_timeperiod = get_request('new_timeperiod', array());
+	$new_timeperiod = getRequest('new_timeperiod', array());
 	$new = is_array($new_timeperiod);
 
 	if (is_array($new_timeperiod)) {
@@ -1609,8 +1625,8 @@ function get_timeperiod_form() {
 	$new_timeperiod['month_nov'] = $month[10];
 	$new_timeperiod['month_dec'] = $month[11];
 
-	$bit_dayofweek = zbx_str_revert($dayofweek);
-	$bit_month = zbx_str_revert($month);
+	$bit_dayofweek = strrev($dayofweek);
+	$bit_month = strrev($month);
 
 	$cmbType = new CComboBox('new_timeperiod[timeperiod_type]', $new_timeperiod['timeperiod_type'], 'submit()');
 	$cmbType->addItem(TIMEPERIOD_TYPE_ONETIME, _('One time only'));
@@ -1730,11 +1746,11 @@ function get_timeperiod_form() {
 
 		if (isset($_REQUEST['add_timeperiod'])) {
 			$date = array(
-				'y' => get_request('new_timeperiod_start_date_year'),
-				'm' => get_request('new_timeperiod_start_date_month'),
-				'd' => get_request('new_timeperiod_start_date_day'),
-				'h' => get_request('new_timeperiod_start_date_hour'),
-				'i' => get_request('new_timeperiod_start_date_minute')
+				'y' => getRequest('new_timeperiod_start_date_year'),
+				'm' => getRequest('new_timeperiod_start_date_month'),
+				'd' => getRequest('new_timeperiod_start_date_day'),
+				'h' => getRequest('new_timeperiod_start_date_hour'),
+				'i' => getRequest('new_timeperiod_start_date_minute')
 			);
 		}
 		else {
diff --git a/frontends/php/include/func.inc.php b/frontends/php/include/func.inc.php
index ce2bc6c8cb8..0f0aa8efd7a 100644
--- a/frontends/php/include/func.inc.php
+++ b/frontends/php/include/func.inc.php
@@ -38,7 +38,7 @@ function zbx_is_callable(array $names) {
 
 /************ REQUEST ************/
 function redirect($url) {
-	$curl = new Curl($url);
+	$curl = new CUrl($url);
 	$curl->setArgument('sid', null);
 	header('Location: '.$curl->getUrl());
 	exit;
@@ -72,31 +72,19 @@ function hasRequest($name) {
  * @return mixed
  */
 function getRequest($name, $def = null) {
-	return hasRequest($name) ? $_REQUEST[$name] : $def;
-}
-
-/**
- * Check request, if exist request - return request value, else return default value.
- *
- * @deprecated function, use getRequest() instead
- *
- * @param string	$name
- * @param mixed		$def
- *
- * @return mixed
- */
-function get_request($name, $def = null) {
-	return getRequest($name, $def);
+	return isset($_REQUEST[$name]) ? $_REQUEST[$name] : $def;
 }
 
 function countRequest($str = null) {
 	if (!empty($str)) {
 		$count = 0;
+
 		foreach ($_REQUEST as $name => $value) {
-			if (strstr($name, $str)) {
+			if (strpos($name, $str) !== false) {
 				$count++;
 			}
 		}
+
 		return $count;
 	}
 	else {
@@ -178,7 +166,7 @@ function dowHrMinToStr($value, $display24Hours = false) {
 	return sprintf('%s %02d:%02d', getDayOfWeekCaption($dow), $hr, $min);
 }
 
-// Convert Day Of Week, Hours and Minutes to seconds representation. For example, 2 11:00 -> 212400. false if error occured
+// Convert Day Of Week, Hours and Minutes to seconds representation. For example, 2 11:00 -> 212400. false if error occurred
 function dowHrMinToSec($dow, $hr, $min) {
 	if (zbx_empty($dow) || zbx_empty($hr) || zbx_empty($min) || !zbx_ctype_digit($dow) || !zbx_ctype_digit($hr) || !zbx_ctype_digit($min)) {
 		return false;
@@ -203,7 +191,7 @@ function dowHrMinToSec($dow, $hr, $min) {
 	return $dow * SEC_PER_DAY + $hr * SEC_PER_HOUR + $min * SEC_PER_MIN;
 }
 
-// Convert timestamp to string representation. Retun 'Never' if 0.
+// Convert timestamp to string representation. Return 'Never' if 0.
 function zbx_date2str($format, $value = null) {
 	static $weekdaynames, $weekdaynameslong, $months, $monthslong;
 
@@ -286,14 +274,14 @@ function zbx_date2str($format, $value = null) {
 	);
 
 	$output = $part = '';
-	$length = zbx_strlen($format);
+	$length = strlen($format);
 
 	for ($i = 0; $i < $length; $i++) {
-		$pchar = ($i > 0) ? zbx_substr($format, $i - 1, 1) : '';
-		$char = zbx_substr($format, $i, 1);
+		$pchar = ($i > 0) ? substr($format, $i - 1, 1) : '';
+		$char = substr($format, $i, 1);
 
 		if ($pchar != '\\' && isset($rplcs[$char])) {
-			$output .= (zbx_strlen($part) ? date($part, $value) : '').$rplcs[$char];
+			$output .= (strlen($part) ? date($part, $value) : '').$rplcs[$char];
 			$part = '';
 		}
 		else {
@@ -301,7 +289,7 @@ function zbx_date2str($format, $value = null) {
 		}
 	}
 
-	$output .= (zbx_strlen($part) > 0) ? date($part, $value) : '';
+	$output .= (strlen($part) > 0) ? date($part, $value) : '';
 
 	return $prefix.$output;
 }
@@ -351,7 +339,7 @@ function rgb2hex($color) {
 		dechex($color[2])
 	);
 	foreach ($HEX as $id => $value) {
-		if (zbx_strlen($value) != 2) {
+		if (strlen($value) != 2) {
 			$HEX[$id] = '0'.$value;
 		}
 	}
@@ -364,10 +352,10 @@ function hex2rgb($color) {
 		$color = substr($color, 1);
 	}
 
-	if (zbx_strlen($color) == 6) {
+	if (strlen($color) == 6) {
 		list($r, $g, $b) = array($color[0].$color[1], $color[2].$color[3], $color[4].$color[5]);
 	}
-	elseif (zbx_strlen($color) == 3) {
+	elseif (strlen($color) == 3) {
 		list($r, $g, $b) = array($color[0].$color[0], $color[1].$color[1], $color[2].$color[2]);
 	}
 	else {
@@ -601,7 +589,7 @@ function convert_units($options = array()) {
 
 	// special processing for unix timestamps
 	if ($options['units'] == 'unixtime') {
-		return zbx_date2str(_('Y.m.d H:i:s'), $options['value']);
+		return zbx_date2str(DATE_TIME_FORMAT_SECONDS, $options['value']);
 	}
 
 	// special processing of uptime
@@ -615,7 +603,7 @@ function convert_units($options = array()) {
 	}
 
 	// any other unit
-	// black list wich do not require units metrics..
+	// black list of units that should have no multiplier prefix (K, M, G etc) applied
 	$blackList = array('%', 'ms', 'rpm', 'RPM');
 
 	if (in_array($options['units'], $blackList) || (zbx_empty($options['units'])
@@ -684,7 +672,7 @@ function convert_units($options = array()) {
 		);
 
 		foreach ($digitUnits[$step] as $dunit => $data) {
-			// skip mili & micro for values without units
+			// skip milli & micro for values without units
 			$digitUnits[$step][$dunit]['value'] = bcpow($step, $data['pow'], 9);
 		}
 	}
@@ -811,11 +799,20 @@ function zbx_avg($values) {
 	return bcdiv($sum, count($values));
 }
 
-// accepts parametr as integer either
+// accepts parameter as integer either
 function zbx_ctype_digit($x) {
 	return ctype_digit(strval($x));
 }
 
+/**
+ * Returns true if the value is an empty string, empty array or null.
+ *
+ * @deprecated use strict comparison instead
+ *
+ * @param $value
+ *
+ * @return bool
+ */
 function zbx_empty($value) {
 	if ($value === null) {
 		return true;
@@ -950,145 +947,6 @@ function zbx_formatDomId($value) {
 	return str_replace(array('[', ']'), array('_', ''), $value);
 }
 
-function zbx_strlen($str) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		return mb_strlen($str);
-	}
-	else {
-		return strlen($str);
-	}
-}
-
-function zbx_strstr($haystack, $needle) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		$pos = mb_strpos($haystack, $needle);
-		if ($pos !== false) {
-			return mb_substr($haystack, $pos);
-		}
-		else {
-			return false;
-		}
-	}
-	else {
-		return strstr($haystack, $needle);
-	}
-}
-
-function zbx_stristr($haystack, $needle) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		$haystack_B = mb_strtoupper($haystack);
-		$needle = mb_strtoupper($needle);
-
-		$pos = mb_strpos($haystack_B, $needle);
-		if ($pos !== false) {
-			$pos = mb_substr($haystack, $pos);
-		}
-		return $pos;
-	}
-	else {
-		return stristr($haystack, $needle);
-	}
-}
-
-function zbx_substring($haystack, $start, $end = null) {
-	if (!is_null($end) && $end < $start) {
-		return '';
-	}
-
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		if (is_null($end)) {
-			$result = mb_substr($haystack, $start);
-		}
-		else {
-			$result = mb_substr($haystack, $start, ($end - $start));
-		}
-	}
-	else {
-		if (is_null($end)) {
-			$result = substr($haystack, $start);
-		}
-		else {
-			$result = substr($haystack, $start, ($end - $start));
-		}
-	}
-
-	return $result;
-}
-
-function zbx_substr($string, $start, $length = null) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		if (is_null($length)) {
-			$result = mb_substr($string, $start);
-		}
-		else {
-			$result = mb_substr($string, $start, $length);
-		}
-	}
-	else {
-		if (is_null($length)) {
-			$result = substr($string, $start);
-		}
-		else {
-			$result = substr($string, $start, $length);
-		}
-	}
-
-	return $result;
-}
-
-function zbx_str_revert($str) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		$result = '';
-		$stop = mb_strlen($str);
-		for ($idx = 0; $idx < $stop; $idx++) {
-			$result = mb_substr($str, $idx, 1).$result;
-		}
-	}
-	else {
-		$result = strrev($str);
-	}
-
-	return $result;
-}
-
-function zbx_strtoupper($str) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		return mb_strtoupper($str);
-	}
-	else {
-		return strtoupper($str);
-	}
-}
-
-function zbx_strtolower($str) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		return mb_strtolower($str);
-	}
-	else {
-		return strtolower($str);
-	}
-}
-
-function zbx_strpos($haystack, $needle, $offset = 0) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		return mb_strpos($haystack, $needle, $offset);
-	}
-	else {
-		return strpos($haystack, $needle, $offset);
-	}
-}
-
-function zbx_stripos($haystack, $needle, $offset = 0) {
-	if (defined('ZBX_MBSTRINGS_ENABLED')) {
-		$haystack = mb_convert_case($haystack, MB_CASE_LOWER);
-		$needle = mb_convert_case($needle, MB_CASE_LOWER);
-		return mb_strpos($haystack, $needle, $offset);
-	}
-	else {
-		return stripos($haystack, $needle, $offset);
-	}
-}
-
 /**
  * Sort an array of objects so that the objects whose $column value matches $pattern are at the top.
  * Return the first $limit objects.
@@ -1105,7 +963,7 @@ function selectByPattern(array $table, $column, $pattern, $limit) {
 
 	$rsTable = array();
 	foreach ($table as $num => $row) {
-		if (zbx_strtoupper($row[$column]) == zbx_strtoupper($pattern)) {
+		if (mb_strtolower($row[$column]) === mb_strtolower($pattern)) {
 			$rsTable = array($num => $row) + $rsTable;
 		}
 		elseif ($limit > 0) {
@@ -1212,26 +1070,6 @@ function order_result(&$data, $sortfield = null, $sortorder = ZBX_SORT_UP) {
 	return true;
 }
 
-function order_by($def, $allways = '') {
-	$orderString = '';
-
-	$sortField = getPageSortField();
-	$sortable = explode(',', $def);
-	if (!str_in_array($sortField, $sortable)) {
-		$sortField = null;
-	}
-	if ($sortField !== null) {
-		$sortOrder = getPageSortOrder();
-		$orderString .= $sortField.' '.$sortOrder;
-	}
-	if (!empty($allways)) {
-		$orderString .= ($sortField === null) ? '' : ',';
-		$orderString .= $allways;
-	}
-
-	return empty($orderString) ? '' : ' ORDER BY '.$orderString;
-}
-
 /**
  * Sorts the macros in the given order. Supports user and LLD macros.
  *
@@ -1520,11 +1358,11 @@ function zbx_str2links($text) {
 
 	$start = 0;
 	foreach ($matches[0] as $match) {
-		$result[] = zbx_substr($text, $start, $match[1] - $start);
+		$result[] = mb_substr($text, $start, $match[1] - $start);
 		$result[] = new CLink($match[0], $match[0], null, null, true);
-		$start = $match[1] + zbx_strlen($match[0]);
+		$start = $match[1] + mb_strlen($match[0]);
 	}
-	$result[] = zbx_substr($text, $start, zbx_strlen($text));
+	$result[] = mb_substr($text, $start, mb_strlen($text));
 
 	return $result;
 }
@@ -1543,42 +1381,14 @@ function zbx_subarray_push(&$mainArray, $sIndex, $element = null, $key = null) {
 
 /*************** PAGE SORTING ******************/
 
-/**
- * Get the sort and sort order parameters for the current page and save it into profiles.
- *
- * @param string $sort
- * @param string $sortorder
- *
- * @retur void
- */
-function validate_sort_and_sortorder($sort = null, $sortorder = ZBX_SORT_UP) {
-	global $page;
-
-	$_REQUEST['sort'] = getPageSortField($sort);
-	$_REQUEST['sortorder'] = getPageSortOrder($sortorder);
-
-	if (!is_null($_REQUEST['sort'])) {
-		$_REQUEST['sort'] = preg_replace('/[^a-z\.\_]/i', '', $_REQUEST['sort']);
-		CProfile::update('web.'.$page['file'].'.sort', $_REQUEST['sort'], PROFILE_TYPE_STR);
-	}
-
-	if (!str_in_array($_REQUEST['sortorder'], array(ZBX_SORT_DOWN, ZBX_SORT_UP))) {
-		$_REQUEST['sortorder'] = ZBX_SORT_UP;
-	}
-
-	CProfile::update('web.'.$page['file'].'.sortorder', $_REQUEST['sortorder'], PROFILE_TYPE_STR);
-}
-
 // creates header col for sorting in table header
-function make_sorting_header($obj, $tabfield, $url = '') {
+function make_sorting_header($obj, $tabfield, $sortField, $sortOrder) {
 	global $page;
 
-	$sortorder = ($_REQUEST['sort'] == $tabfield && $_REQUEST['sortorder'] == ZBX_SORT_UP) ? ZBX_SORT_DOWN : ZBX_SORT_UP;
+	$sortorder = ($sortField == $tabfield && $sortOrder == ZBX_SORT_UP) ? ZBX_SORT_DOWN : ZBX_SORT_UP;
+
+	$link = CUrlFactory::getContextUrl();
 
-	$link = new Curl($url);
-	if (empty($url)) {
-		$link->formatGetArguments();
-	}
 	$link->setArgument('sort', $tabfield);
 	$link->setArgument('sortorder', $sortorder);
 
@@ -1605,7 +1415,7 @@ function make_sorting_header($obj, $tabfield, $url = '') {
 	$cont->addItem(SPACE);
 
 	$img = null;
-	if (isset($_REQUEST['sort']) && $tabfield == $_REQUEST['sort']) {
+	if ($tabfield == $sortField) {
 		if ($sortorder == ZBX_SORT_UP) {
 			$img = new CSpan(SPACE, 'icon_sortdown');
 		}
@@ -1620,36 +1430,6 @@ function make_sorting_header($obj, $tabfield, $url = '') {
 }
 
 /**
- * Returns the sort field for the current page.
- *
- * @param string $default
- *
- * @return string
- */
-function getPageSortField($default = null) {
-	global $page;
-
-	$sort = get_request('sort', CProfile::get('web.'.$page['file'].'.sort'));
-
-	return ($sort) ? $sort : $default;
-}
-
-/**
- * Returns the sort order for the current page.
- *
- * @param string $default
- *
- * @return string
- */
-function getPageSortOrder($default = ZBX_SORT_UP) {
-	global $page;
-
-	$sortorder = get_request('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', $default));
-
-	return ($sortorder) ? $sortorder : $default;
-}
-
-/**
  * Returns the list page number for the current page.
  *
  * The functions first looks for a page number in the HTTP request. If no number is given, falls back to the profile.
@@ -1660,7 +1440,7 @@ function getPageSortOrder($default = ZBX_SORT_UP) {
 function getPageNumber() {
 	global $page;
 
-	$pageNumber = get_request('page');
+	$pageNumber = getRequest('page');
 	if (!$pageNumber) {
 		$lastPage = CProfile::get('web.paging.lastpage');
 		$pageNumber = ($lastPage == $page['file']) ? CProfile::get('web.paging.page', 1) : 1;
@@ -1673,12 +1453,10 @@ function getPageNumber() {
  * Returns paging line.
  *
  * @param array $items				list of items
- * @param array $removeUrlParams	params to remove from URL
- * @param array $urlParams			params to add in URL
  *
  * @return CTable
  */
-function getPagingLine(&$items, array $removeUrlParams = array(), array $urlParams = array()) {
+function getPagingLine(&$items) {
 	global $page;
 
 	$config = select_config();
@@ -1728,18 +1506,7 @@ function getPagingLine(&$items, array $removeUrlParams = array(), array $urlPara
 	$table = null;
 
 	if ($pagesCount > 1) {
-		$url = new Curl();
-
-		if (is_array($urlParams) && $urlParams) {
-			foreach ($urlParams as $key => $value) {
-				$url->setArgument($key, $value);
-			}
-		}
-
-		$removeUrlParams = array_merge($removeUrlParams, array('go', 'form', 'delete', 'cancel'));
-		foreach ($removeUrlParams as $param) {
-			$url->removeArgument($param);
-		}
+		$url = CUrlFactory::getContextUrl();
 
 		if ($startPage > 1) {
 			$url->setArgument('page', 1);
@@ -2058,7 +1825,7 @@ function show_messages($bool = true, $okmsg = null, $errmsg = null) {
 			$lst_error = new CList(null,'messages');
 			foreach ($ZBX_MESSAGES as $msg) {
 				$lst_error->addItem($msg['message'], $msg['type']);
-				$bool = ($bool && 'error' != zbx_strtolower($msg['type']));
+				$bool = ($bool && 'error' !== strtolower($msg['type']));
 			}
 			$msg_show = 6;
 			$msg_count = count($ZBX_MESSAGES);
@@ -2258,13 +2025,15 @@ function get_status() {
 	$dbTriggers = DBselect(
 		'SELECT COUNT(DISTINCT t.triggerid) AS cnt,t.status,t.value'.
 			' FROM triggers t'.
-			' INNER JOIN functions f ON t.triggerid=f.triggerid'.
-			' INNER JOIN items i ON f.itemid=i.itemid'.
-			' INNER JOIN hosts h ON i.hostid=h.hostid'.
-			' WHERE i.status='.ITEM_STATUS_ACTIVE.
-				' AND h.status='.HOST_STATUS_MONITORED.
-				' AND t.flags IN ('.ZBX_FLAG_DISCOVERY_NORMAL.','.ZBX_FLAG_DISCOVERY_CREATED.')'.
-			' GROUP BY t.status,t.value');
+			' WHERE NOT EXISTS ('.
+				'SELECT f.functionid FROM functions f'.
+					' JOIN items i ON f.itemid=i.itemid'.
+					' JOIN hosts h ON i.hostid=h.hostid'.
+					' WHERE f.triggerid=t.triggerid AND (i.status<>'.ITEM_STATUS_ACTIVE.' OR h.status<>'.HOST_STATUS_MONITORED.')'.
+				')'.
+			' AND t.flags IN ('.ZBX_FLAG_DISCOVERY_NORMAL.','.ZBX_FLAG_DISCOVERY_CREATED.')'.
+			' GROUP BY t.status,t.value'
+		);
 	while ($dbTrigger = DBfetch($dbTriggers)) {
 		switch ($dbTrigger['status']) {
 			case TRIGGER_STATUS_ENABLED:
@@ -2420,7 +2189,7 @@ function imageOut(&$image, $format = null) {
 			echo $imageSource;
 			break;
 		case PAGE_TYPE_JSON:
-			$json = new CJSON();
+			$json = new CJson();
 			echo $json->encode(array('result' => $imageId));
 			break;
 		case PAGE_TYPE_TEXT:
@@ -2429,12 +2198,6 @@ function imageOut(&$image, $format = null) {
 	}
 }
 
-function encode_log($data) {
-	return (defined('ZBX_LOG_ENCODING_DEFAULT') && function_exists('mb_convert_encoding'))
-			? mb_convert_encoding($data, _('UTF-8'), ZBX_LOG_ENCODING_DEFAULT)
-			: $data;
-}
-
 /**
  * Check if we have error messages to display.
  *
@@ -2470,15 +2233,12 @@ function checkRequiredKeys(array $array, array $keys) {
 }
 
 /**
- * Clear page cookies on action.
+ * Clears table rows selection's cookies.
  *
- * @param bool   $clear
- * @param string $id	parent id, is used as cookie prefix
+ * @param string $id	parent id, is used as cookie suffix
  */
-function clearCookies($clear = false, $id = null) {
-	if ($clear) {
-		insert_js('cookie.eraseArray("'.basename($_SERVER['SCRIPT_NAME'], '.php').($id ? '_'.$id : '').'")');
-	}
+function uncheckTableRows($cookieId = null) {
+	insert_js('cookie.eraseArray("cb_'.basename($_SERVER['SCRIPT_NAME'], '.php').($cookieId ? '_'.$cookieId : '').'")');
 }
 
 /**
diff --git a/frontends/php/include/gettextwrapper.inc.php b/frontends/php/include/gettextwrapper.inc.php
index e8ebab42c33..4a171a80137 100644
--- a/frontends/php/include/gettextwrapper.inc.php
+++ b/frontends/php/include/gettextwrapper.inc.php
@@ -21,7 +21,7 @@
 
 /**
  * In case gettext functions do not exist, just replacing them with our own,
- * so user can see at least english translation.
+ * so user can see at least English translation.
  */
 if (!function_exists('_')) {
 	/**
@@ -180,7 +180,7 @@ function _xn($message, $messagePlural, $num, $context) {
 /**
  * Returns a formatted string.
  *
- * @param string $format		recieves already stranlated string with format
+ * @param string $format		receives already stranlated string with format
  * @param array  $arguments		arguments to replace according to given format
  *
  * @return string
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 4376c92e42f..34bf6347b71 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -386,12 +386,12 @@ function navigation_bar_calc($idx = null, $idx2 = 0, $update = false) {
 				CProfile::update($idx.'.stime', $_REQUEST['stime'], PROFILE_TYPE_STR, $idx2);
 			}
 		}
-		$_REQUEST['period'] = get_request('period', CProfile::get($idx.'.period', ZBX_PERIOD_DEFAULT, $idx2));
-		$_REQUEST['stime'] = get_request('stime', CProfile::get($idx.'.stime', null, $idx2));
+		$_REQUEST['period'] = getRequest('period', CProfile::get($idx.'.period', ZBX_PERIOD_DEFAULT, $idx2));
+		$_REQUEST['stime'] = getRequest('stime', CProfile::get($idx.'.stime', null, $idx2));
 	}
 
-	$_REQUEST['period'] = get_request('period', ZBX_PERIOD_DEFAULT);
-	$_REQUEST['stime'] = get_request('stime', null);
+	$_REQUEST['period'] = getRequest('period', ZBX_PERIOD_DEFAULT);
+	$_REQUEST['stime'] = getRequest('stime');
 
 	if ($_REQUEST['period'] < ZBX_MIN_PERIOD) {
 		show_message(_n('Minimum time period to display is %1$s hour.',
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index 4f2c33d9d17..319c7b4b47a 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -22,7 +22,7 @@
 function setHostGroupInternal($groupids, $internal = ZBX_NOT_INTERNAL_GROUP) {
 	zbx_value2array($groupids);
 
-	return DBexecute('UPDATE groups SET internal='.$internal.' WHERE '.dbConditionInt('groupid', $groupids));
+	return DBexecute('UPDATE groups SET internal='.zbx_dbstr($internal).' WHERE '.dbConditionInt('groupid', $groupids));
 }
 
 /**
@@ -549,7 +549,7 @@ function updateHostStatus($hostids, $status) {
 		'SELECT h.hostid,h.host,h.status'.
 		' FROM hosts h'.
 		' WHERE '.dbConditionInt('h.hostid', $hostids).
-			' AND h.status='.$oldStatus
+			' AND h.status='.zbx_dbstr($oldStatus)
 	);
 	while ($host = DBfetch($db_hosts)) {
 		$hostIds[] = $host['hostid'];
@@ -692,60 +692,62 @@ function getHostPrototypeSourceParentIds(array $hostPrototypeIds, array $templat
  *
  * @return array
  */
-function getUnlinkableHosts($groupids, $hostids = null) {
-	zbx_value2array($groupids);
-	zbx_value2array($hostids);
-
-	$unlinkableHostIds = array();
-
-	$sql_where = '';
-	if ($hostids !== null) {
-		$sql_where = ' AND '.dbConditionInt('hg.hostid', $hostids);
+function getUnlinkableHostIds(array $groupIds, array $hostIds) {
+	if (!$hostIds) {
+		return array();
 	}
 
-	$result = DBselect(
-		'SELECT hg.hostid,COUNT(hg.groupid) AS grp_count'.
+	$dbResult = DBselect(
+		'SELECT hg.hostid'.
 		' FROM hosts_groups hg'.
-		' WHERE '.dbConditionInt('hg.groupid', $groupids, true).
-				$sql_where.
-		' GROUP BY hg.hostid'.
-		' HAVING COUNT(hg.groupid)>0'
+		' WHERE '.dbConditionInt('hg.groupid', $groupIds, true).
+			' AND '.dbConditionInt('hg.hostid', $hostIds).
+		' GROUP BY hg.hostid'
 	);
-	while ($row = DBfetch($result)) {
-		$unlinkableHostIds[] = $row['hostid'];
+
+	$unlinkableHostIds = array();
+	while ($dbRow = DBfetch($dbResult)) {
+		$unlinkableHostIds[] = $dbRow['hostid'];
 	}
 
 	return $unlinkableHostIds;
 }
 
-function getDeletableHostGroups($groupids = null) {
-	$deletable_groupids = array();
-
-	zbx_value2array($groupids);
-	$hostids = getUnlinkableHosts($groupids);
+function getDeletableHostGroupIds(array $groupIds) {
+	// selecting the list of hosts linked to the host groups
+	$dbResult = DBselect(
+		'SELECT hg.hostid'.
+		' FROM hosts_groups hg'.
+		' WHERE '.dbConditionInt('hg.groupid', $groupIds)
+	);
 
-	$sql_where = '';
-	if (!is_null($groupids)) {
-		$sql_where .= ' AND '.dbConditionInt('g.groupid', $groupids);
+	$linkedHostIds = array();
+	while ($dbRow = DBfetch($dbResult)) {
+		$linkedHostIds[] = $dbRow['hostid'];
 	}
 
-	$db_groups = DBselect(
-		'SELECT DISTINCT g.groupid'.
+	// the list of hosts which can be unlinked from the host groups
+	$hostIds = getUnlinkableHostIds($groupIds, $linkedHostIds);
+
+	$dbResult = DBselect(
+		'SELECT g.groupid'.
 		' FROM groups g'.
 		' WHERE g.internal='.ZBX_NOT_INTERNAL_GROUP.
-			$sql_where.
+			' AND '.dbConditionInt('g.groupid', $groupIds).
 			' AND NOT EXISTS ('.
 				'SELECT NULL'.
 				' FROM hosts_groups hg'.
 				' WHERE g.groupid=hg.groupid'.
-					(!empty($hostids) ? ' AND '.dbConditionInt('hg.hostid', $hostids, true) : '').
+					($hostIds ? ' AND '.dbConditionInt('hg.hostid', $hostIds, true) : '').
 			')'
 	);
-	while ($group = DBfetch($db_groups)) {
-		$deletable_groupids[$group['groupid']] = $group['groupid'];
+
+	$deletableGroupIds = array();
+	while ($dbRow = DBfetch($dbResult)) {
+		$deletableGroupIds[$dbRow['groupid']] = $dbRow['groupid'];
 	}
 
-	return $deletable_groupids;
+	return $deletableGroupIds;
 }
 
 function isTemplate($hostId) {
diff --git a/frontends/php/include/html.inc.php b/frontends/php/include/html.inc.php
index b15412aaa38..5a7eb2415e8 100644
--- a/frontends/php/include/html.inc.php
+++ b/frontends/php/include/html.inc.php
@@ -57,11 +57,16 @@ function bold($str) {
 
 function make_decoration($haystack, $needle, $class = null) {
 	$result = $haystack;
-	$pos = zbx_stripos($haystack, $needle);
+
+	$tmpHaystack = mb_strtolower($haystack);
+	$tmpNeedle = mb_strtolower($needle);
+	$pos = mb_strpos($tmpHaystack, $tmpNeedle);
+
 	if ($pos !== false) {
-		$start = CHtml::encode(zbx_substring($haystack, 0, $pos));
-		$end = CHtml::encode(zbx_substring($haystack, $pos + zbx_strlen($needle)));
-		$found = CHtml::encode(zbx_substring($haystack, $pos, $pos + zbx_strlen($needle)));
+		$start = CHtml::encode(mb_substr($haystack, 0, $pos));
+		$end = CHtml::encode(mb_substr($haystack, $pos + mb_strlen($needle)));
+		$found = CHtml::encode(mb_substr($haystack, $pos, mb_strlen($needle)));
+
 		if (is_null($class)) {
 			$result = array($start, bold($found), $end);
 		}
@@ -69,6 +74,7 @@ function make_decoration($haystack, $needle, $class = null) {
 			$result = array($start, new CSpan($found, $class), $end);
 		}
 	}
+
 	return $result;
 }
 
@@ -190,7 +196,7 @@ function get_icon($type, $params = array()) {
 			return $icon;
 
 		case 'fullscreen':
-			$url = new Curl();
+			$url = new CUrl();
 			$url->setArgument('fullscreen', $params['fullscreen'] ? '0' : '1');
 
 			return new CIcon(
@@ -534,7 +540,7 @@ function getAvailabilityTable($host) {
 				break;
 			case HOST_AVAILABLE_FALSE:
 				$ai = new CDiv(SPACE, 'status_icon status_icon_extra icon'.$val.'unavailable');
-				$ai->setHint($host[$val.'_error'], '', 'on');
+				$ai->setHint($host[$val.'_error'], 'on');
 				break;
 			case HOST_AVAILABLE_UNKNOWN:
 				$ai = new CDiv(SPACE, 'status_icon status_icon_extra icon'.$val.'unknown');
@@ -546,11 +552,12 @@ function getAvailabilityTable($host) {
 	// discovered host lifetime indicator
 	if ($host['flags'] == ZBX_FLAG_DISCOVERY_CREATED && $host['hostDiscovery']['ts_delete']) {
 		$deleteError = new CDiv(SPACE, 'status_icon status_icon_extra iconwarning');
-		$deleteError->setHint(
-			_s('The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s).',
-				zbx_date2age($host['hostDiscovery']['ts_delete']), zbx_date2str(_('d M Y'), $host['hostDiscovery']['ts_delete']),
-				zbx_date2str(_('H:i:s'), $host['hostDiscovery']['ts_delete'])
-			));
+		$deleteError->setHint(_s(
+			'The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s).',
+			zbx_date2age($host['hostDiscovery']['ts_delete']),
+			zbx_date2str(DATE_FORMAT, $host['hostDiscovery']['ts_delete']),
+			zbx_date2str(TIME_FORMAT, $host['hostDiscovery']['ts_delete'])
+		));
 		$ad->addItem($deleteError);
 	}
 
@@ -602,7 +609,7 @@ function createDateSelector($name, $date, $relatedCalendar = null) {
 	$minute = new CNumericBox($name.'_minute', $i, 2);
 	$minute->attr('placeholder', _('mm'));
 
-	$fields = array($day, '/', $month, '/', $year, SPACE, $hour, ':', $minute, $calendarIcon);
+	$fields = array($year, '-', $month, '-', $day, SPACE, $hour, ':', $minute, $calendarIcon);
 
 	zbx_add_post_js('create_calendar(null,'.
 		'["'.$name.'_day","'.$name.'_month","'.$name.'_year","'.$name.'_hour","'.$name.'_minute"],'.
diff --git a/frontends/php/include/httptest.inc.php b/frontends/php/include/httptest.inc.php
index 4072026944f..07adc693815 100644
--- a/frontends/php/include/httptest.inc.php
+++ b/frontends/php/include/httptest.inc.php
@@ -25,8 +25,8 @@ require_once dirname(__FILE__).'/items.inc.php';
 function httptest_authentications($type = null) {
 	$authentication_types = array(
 		HTTPTEST_AUTH_NONE => _('None'),
-		HTTPTEST_AUTH_BASIC => _('Basic authentication'),
-		HTTPTEST_AUTH_NTLM => _('NTLM authentication')
+		HTTPTEST_AUTH_BASIC => _('Basic'),
+		HTTPTEST_AUTH_NTLM => _('NTLM')
 	);
 
 	if (is_null($type)) {
@@ -193,3 +193,57 @@ function resolveHttpTestMacros(array $httpTests, $resolveName = true, $resolveSt
 
 	return $httpTests;
 }
+
+/**
+ * Copies web scenarios from given host ID to destination host.
+ *
+ * @param string $srcHostId		source host ID
+ * @param string $dstHostId		destination host ID
+ *
+ * @return bool
+ */
+function copyHttpTests($srcHostId, $dstHostId) {
+	$httpTests = API::HttpTest()->get(array(
+		'output' => array('name', 'applicationid', 'delay', 'status', 'variables', 'agent', 'authentication',
+			'http_user', 'http_password', 'http_proxy', 'retries', 'ssl_cert_file', 'ssl_key_file',
+			'ssl_key_password', 'verify_peer', 'verify_host', 'headers'
+		),
+		'hostids' => $srcHostId,
+		'selectSteps' => array('name', 'no', 'url', 'timeout', 'posts', 'required', 'status_codes', 'variables',
+			'follow_redirects', 'retrieve_mode', 'headers'
+		),
+		'inherited' => false
+	));
+
+	if (!$httpTests) {
+		return true;
+	}
+
+	// get destination application IDs
+	$srcApplicationIds = array();
+	foreach ($httpTests as $httpTest) {
+		if ($httpTest['applicationid'] != 0) {
+			$srcApplicationIds[] = $httpTest['applicationid'];
+		}
+	}
+
+	if ($srcApplicationIds) {
+		$dstApplicationIds = get_same_applications_for_host($srcApplicationIds, $dstHostId);
+	}
+
+	foreach ($httpTests as &$httpTest) {
+		$httpTest['hostid'] = $dstHostId;
+
+		if (isset($dstApplicationIds[$httpTest['applicationid']])) {
+			$httpTest['applicationid'] = $dstApplicationIds[$httpTest['applicationid']];
+		}
+		else {
+			unset($httpTest['applicationid']);
+		}
+
+		unset($httpTest['httptestid']);
+	}
+	unset($httpTest);
+
+	return (bool) API::HttpTest()->create($httpTests);
+}
diff --git a/frontends/php/include/ident.inc.php b/frontends/php/include/ident.inc.php
index 63263c437ab..f7d9bf2657d 100644
--- a/frontends/php/include/ident.inc.php
+++ b/frontends/php/include/ident.inc.php
@@ -32,7 +32,7 @@ function getImageByIdent($ident) {
 		$images = array();
 
 		$dbImages = API::Image()->get(array(
-			'output' => API_OUTPUT_EXTEND
+			'output' => array('imageid', 'name')
 		));
 
 		foreach ($dbImages as $image) {
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index 09f58693dcf..2511c8eec2e 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -618,19 +618,19 @@ function get_realrule_by_itemid_and_hostid($itemid, $hostid) {
 /**
  * Retrieve overview table object for items.
  *
- * @param array  $hostIds
- * @param string $application name of application to filter
- * @param int    $viewMode
+ * @param array  		$hostIds
+ * @param array|null	$applicationIds		IDs of applications to filter items by
+ * @param int    		$viewMode
  *
  * @return CTableInfo
  */
-function getItemsDataOverview($hostIds, $application, $viewMode) {
+function getItemsDataOverview($hostIds, array $applicationIds = null, $viewMode) {
 	$sqlFrom = '';
 	$sqlWhere = '';
 
-	if ($application !== '') {
-		$sqlFrom = 'applications a,items_applications ia,';
-		$sqlWhere = ' AND i.itemid=ia.itemid AND a.applicationid=ia.applicationid AND a.name='.zbx_dbstr($application);
+	if ($applicationIds !== null) {
+		$sqlFrom = 'items_applications ia,';
+		$sqlWhere = ' AND i.itemid=ia.itemid AND '.dbConditionInt('ia.applicationid', $applicationIds);
 	}
 
 	$dbItems = DBfetchArray(DBselect(
@@ -655,7 +655,7 @@ function getItemsDataOverview($hostIds, $application, $viewMode) {
 	));
 
 	// fetch latest values
-	$history = Manager::History()->getLast(zbx_toHash($dbItems, 'itemid'));
+	$history = Manager::History()->getLast(zbx_toHash($dbItems, 'itemid'), 1, ZBX_HISTORY_PERIOD);
 
 	// fetch data for the host JS menu
 	$hosts = API::Host()->get(array(
@@ -777,25 +777,33 @@ function getItemDataOverviewCells($tableRow, $ithosts, $hostName) {
 	return $tableRow;
 }
 
-/******************************************************************************
- *                                                                            *
- * Comments: !!! Don't forget sync code with C !!!                            *
- *                                                                            *
- ******************************************************************************/
-function get_same_applications_for_host($applications, $hostid) {
-	$child_applications = array();
-	$db_apps = DBselect(
-		'SELECT a1.applicationid'.
+/**
+ * Get same application IDs on destination host and return array with keys as source application IDs
+ * and values as destination application IDs.
+ *
+ * Comments: !!! Don't forget sync code with C !!!
+ *
+ * @param array  $applicationIds
+ * @param string $hostId
+ *
+ * @return array
+ */
+function get_same_applications_for_host(array $applicationIds, $hostId) {
+	$applications = array();
+
+	$dbApplications = DBselect(
+		'SELECT a1.applicationid AS dstappid,a2.applicationid AS srcappid'.
 		' FROM applications a1,applications a2'.
 		' WHERE a1.name=a2.name'.
-			' AND a1.hostid='.zbx_dbstr($hostid).
-			' AND '.dbConditionInt('a2.applicationid', $applications)
+			' AND a1.hostid='.zbx_dbstr($hostId).
+			' AND '.dbConditionInt('a2.applicationid', $applicationIds)
 	);
-	while ($app = DBfetch($db_apps)) {
-		$child_applications[] = $app['applicationid'];
+
+	while ($dbApplication = DBfetch($dbApplications)) {
+		$applications[$dbApplication['srcappid']] = $dbApplication['dstappid'];
 	}
 
-	return $child_applications;
+	return $applications;
 }
 
 /******************************************************************************
@@ -895,8 +903,8 @@ function formatHistoryValue($value, array $item, $trim = true) {
 		// break; is not missing here
 		case ITEM_VALUE_TYPE_TEXT:
 		case ITEM_VALUE_TYPE_LOG:
-			if ($trim && zbx_strlen($value) > 20) {
-				$value = zbx_substr($value, 0, 20).'...';
+			if ($trim && mb_strlen($value) > 20) {
+				$value = mb_substr($value, 0, 20).'...';
 			}
 
 			if ($mapping !== false) {
@@ -912,7 +920,7 @@ function formatHistoryValue($value, array $item, $trim = true) {
 
 /**
  * Retrieves from DB historical data for items and applies functional calculations.
- * If fore some reasons fails, returns UNRESOLVED_MACRO_STRING.
+ * If fails for some reason, returns UNRESOLVED_MACRO_STRING.
  *
  * @param array		$item
  * @param string	$item['value_type']	type of item, allowed: ITEM_VALUE_TYPE_FLOAT and ITEM_VALUE_TYPE_UINT64
@@ -1201,68 +1209,55 @@ function getNextDelayInterval(array $arrOfFlexIntervals, $now, &$nextInterval) {
  *         mm      - minutes (0-59)
  *
  * @param string $seed               seed value applied to delay to spread item checks over the delay period
- * @param int $itemType
- * @param int $delay                 default delay, can be overriden
+ * @param int $delay                 default delay, can be overridden
  * @param string $flexIntervals      flexible intervals
  * @param int $now                   current timestamp
  *
  * @return array
  */
-function calculateItemNextcheck($seed, $itemType, $delay, $flexIntervals, $now) {
-	// special processing of active items to see better view in queue
-	if ($itemType == ITEM_TYPE_ZABBIX_ACTIVE) {
-		if ($delay != 0) {
-			$nextcheck = $now + $delay;
-		}
-		else {
-			$nextcheck = ZBX_JAN_2038;
-		}
-	}
-	else {
-		// try to find the nearest 'nextcheck' value with condition 'now' < 'nextcheck' < 'now' + SEC_PER_YEAR
-		// if it is not possible to check the item within a year, fail
-
-		$arrOfFlexIntervals = explode(';', $flexIntervals);
-		$t = $now;
-		$tmax = $now + SEC_PER_YEAR;
-		$try = 0;
-
-		while ($t < $tmax) {
-			// calculate 'nextcheck' value for the current interval
-			$currentDelay = getCurrentDelay($delay, $arrOfFlexIntervals, $t);
-
-			if ($currentDelay != 0) {
-				$nextcheck = $currentDelay * floor($t / $currentDelay) + ($seed % $currentDelay);
-
-				if ($try == 0) {
-					while ($nextcheck <= $t) {
-						$nextcheck += $currentDelay;
-					}
-				}
-				else {
-					while ($nextcheck < $t) {
-						$nextcheck += $currentDelay;
-					}
+function calculateItemNextCheck($seed, $delay, $flexIntervals, $now) {
+	// try to find the nearest 'nextcheck' value with condition 'now' < 'nextcheck' < 'now' + SEC_PER_YEAR
+	// if it is not possible to check the item within a year, fail
+	$arrOfFlexIntervals = explode(';', $flexIntervals);
+	$t = $now;
+	$tMax = $now + SEC_PER_YEAR;
+	$try = 0;
+
+	while ($t < $tMax) {
+		// calculate 'nextcheck' value for the current interval
+		$currentDelay = getCurrentDelay($delay, $arrOfFlexIntervals, $t);
+
+		if ($currentDelay != 0) {
+			$nextCheck = $currentDelay * floor($t / $currentDelay) + ($seed % $currentDelay);
+
+			if ($try == 0) {
+				while ($nextCheck <= $t) {
+					$nextCheck += $currentDelay;
 				}
 			}
 			else {
-				$nextcheck = ZBX_JAN_2038;
+				while ($nextCheck < $t) {
+					$nextCheck += $currentDelay;
+				}
 			}
+		}
+		else {
+			$nextCheck = ZBX_JAN_2038;
+		}
 
-			// 'nextcheck' < end of the current interval ?
-			// the end of the current interval is the beginning of the next interval - 1
-			if (getNextDelayInterval($arrOfFlexIntervals, $t, $nextInterval) && $nextcheck >= $nextInterval) {
-				// 'nextcheck' is beyond the current interval
-				$t = $nextInterval;
-				$try++;
-			}
-			else {
-				break;
-			}
+		// 'nextcheck' < end of the current interval ?
+		// the end of the current interval is the beginning of the next interval - 1
+		if (getNextDelayInterval($arrOfFlexIntervals, $t, $nextInterval) && $nextCheck >= $nextInterval) {
+			// 'nextcheck' is beyond the current interval
+			$t = $nextInterval;
+			$try++;
+		}
+		else {
+			break;
 		}
 	}
 
-	return $nextcheck;
+	return $nextCheck;
 }
 
 /**
diff --git a/frontends/php/include/js.inc.php b/frontends/php/include/js.inc.php
index ed67208a18d..08899933f9e 100644
--- a/frontends/php/include/js.inc.php
+++ b/frontends/php/include/js.inc.php
@@ -117,45 +117,37 @@ function insert_javascript_for_editable_combobox() {
 
 	$js = '
 		function CEditableComboBoxInit(obj) {
-			// check if option exist
-			var opt = obj.options;
-			if (obj.value) {
-				obj.oldValue = obj.value;
-			}
-			for (var i = 0; i < opt.length; i++) {
-				if (-1 == opt.item(i).value) {
-					return null;
-				}
-			}
-			// create option
-			opt = document.createElement("option");
-			opt.value = -1;
-			if (IE) {
-				opt.innerHTML = "('._('other').' ...)";
-			}
-			else {
-				opt.text = "('._('other').' ...)";
-			}
-			obj.insertBefore(opt, obj.firstChild);
+			// store previous value
+			obj.oldValue = obj.value;
 		}
 
-		function CEditableComboBoxOnChange(obj, size) {
+		function CEditableComboBoxOnChange(obj, size, width) {
 			if (-1 != obj.value) {
 				obj.oldValue = obj.value;
 			}
 			else {
-				var new_obj = document.createElement("input");
-				new_obj.type = "text";
-				new_obj.name = obj.name;
-				if (size && size > 0) {
-					new_obj.size = size;
+				var newObj = document.createElement("input");
+
+				newObj.type = "text";
+				newObj.name = obj.name;
+				newObj.className = "input text";
+
+				if (size !== null) {
+					newObj.size = size;
+				}
+
+				if (width !== null) {
+					newObj.style.width = width + "px";
 				}
+
 				if (obj.oldValue) {
-					new_obj.value = obj.oldValue;
+					newObj.value = obj.oldValue;
 				}
-				obj.parentNode.replaceChild(new_obj, obj);
-				new_obj.focus();
-				new_obj.select();
+
+				obj.parentNode.replaceChild(newObj, obj);
+
+				newObj.focus();
+				newObj.select();
 			}
 		}';
 	insert_js($js);
@@ -399,7 +391,7 @@ function insert_js_function($fnct_name) {
 			break;
 		case 'addSelectedValues':
 			insert_js('
-				function addSelectedValues(form, object) {
+				function addSelectedValues(form, object, parentId) {
 					form = $(form);
 					if (is_null(form)) {
 						return close_window()
@@ -408,7 +400,12 @@ function insert_js_function($fnct_name) {
 					if (!parent) {
 						return close_window();
 					}
-					var items = { object: object, values: [] };
+
+					if (typeof parentId === "undefined") {
+						var parentId = null;
+					}
+
+					var data = { object: object, values: [], parentId: parentId };
 					var chkBoxes = form.getInputs("checkbox");
 					for (var i = 0; i < chkBoxes.length; i++) {
 						if (chkBoxes[i].checked && (chkBoxes[i].name.indexOf("all_") < 0)) {
@@ -419,16 +416,17 @@ function insert_js_function($fnct_name) {
 							else {
 								value[object] = chkBoxes[i].value;
 							}
-							items["values"].push(value);
+							data["values"].push(value);
 						}
 					}
-					parent.addPopupValues(items);
 					close_window();
+
+					parent.jQuery(parent.document).trigger("add.popup", data);
 				}');
 			break;
 		case 'addValue':
 			insert_js('
-				function addValue(object, singleValue) {
+				function addValue(object, singleValue, parentId) {
 					var parent = window.opener;
 					if (!parent) {
 						return close_window();
@@ -440,9 +438,15 @@ function insert_js_function($fnct_name) {
 					else {
 						value[object] = singleValue;
 					}
-					var items = { object: object, values: [value] };
-					parent.addPopupValues(items);
+
+					if (typeof parentId === "undefined") {
+						var parentId = null;
+					}
+					var data = { object: object, values: [value], parentId: parentId };
+
 					close_window();
+
+					parent.jQuery(parent.document).trigger("add.popup", data);
 				}');
 			break;
 		case 'addValues':
@@ -464,7 +468,7 @@ function insert_js_function($fnct_name) {
 						if (parentDocumentForms.length > 0) {
 							frmStorage = jQuery(parentDocumentForms[0]).find("#" + key).get(0);
 						}
-						if (typeof(frmStorage) == "undefined" || is_null(frmStorage)) {
+						if (typeof frmStorage === "undefined" || is_null(frmStorage)) {
 							frmStorage = parentDocument.getElementById(key);
 						}
 
diff --git a/frontends/php/include/locales.inc.php b/frontends/php/include/locales.inc.php
index d5d579d6f19..f9e997d6762 100644
--- a/frontends/php/include/locales.inc.php
+++ b/frontends/php/include/locales.inc.php
@@ -21,22 +21,26 @@
 
 function init_mbstrings() {
 	$res = true;
-	$res &= mbstrings_available();
-	ini_set('mbstring.internal_encoding', 'UTF-8');
-	$res &= (ini_get('mbstring.internal_encoding') == 'UTF-8');
-	ini_set('mbstring.detect_order', 'UTF-8, ISO-8859-1, JIS, SJIS');
-	$res &= (ini_get('mbstring.detect_order') == 'UTF-8, ISO-8859-1, JIS, SJIS');
-	if ($res) {
-		define('ZBX_MBSTRINGS_ENABLED', true);
+	$res &= extension_loaded('mbstring');
+
+	if (version_compare(PHP_VERSION, '5.6', '<')) {
+		ini_set('mbstring.internal_encoding', 'UTF-8');
+		$res &= (ini_get('mbstring.internal_encoding') == 'UTF-8');
+	} else {
+		// it may be necessary to check / set php.internal encoding too after 5.6 is released, see ZBX-8278
+		ini_set('default_charset', 'UTF-8');
+		$res &= (ini_get('default_charset') == 'UTF-8');
 	}
-	return $res;
-}
 
-function mbstrings_available() {
-	return function_exists('mb_strlen') && function_exists('mb_strtoupper') && function_exists('mb_strpos') && function_exists('mb_substr');
+	ini_set('mbstring.detect_order', 'UTF-8, ISO-8859-1, JIS, SJIS');
+	$res &= (ini_get('mbstring.detect_order') === 'UTF-8, ISO-8859-1, JIS, SJIS');
+
+
+	return $res;
 }
 
 /**
+/**
  * Returns a list of all used locales.
  *
  * Each locale has the following properties:
@@ -75,7 +79,8 @@ function getLocales() {
 		'es_ES' => array('name' => _('Spanish (es_ES)'),	'display' => false),
 		'sv_SE' => array('name' => _('Swedish (sv_SE)'),	'display' => false),
 		'tr_TR' => array('name' => _('Turkish (tr_TR)'),	'display' => false),
-		'uk_UA' => array('name' => _('Ukrainian (uk_UA)'),	'display' => true)
+		'uk_UA' => array('name' => _('Ukrainian (uk_UA)'),	'display' => true),
+		'vi_VN' => array('name' => _('Vietnamese (vi_VN)'),	'display' => false)
 	);
 }
 
@@ -172,7 +177,8 @@ function zbx_locale_variants_win($language) {
 		'es_es' => array('Spanish_Spain.1252', 'spanish'),
 		'sv_se' => array('Swedish_Sweden.1252', 'swedish'),
 		'tr_tr' => array('Turkish_Turkey.1254', 'turkish'),
-		'uk_ua' => array('Ukrainian_Ukraine.1251', 'ukrainian')
+		'uk_ua' => array('Ukrainian_Ukraine.1251', 'ukrainian'),
+		'vi_vn' => array('Vietnamese_Viet Nam.1258', 'vietnamese')
 	);
 	return $winLanguageName[strtolower($language)];
 }
diff --git a/frontends/php/include/maintenances.inc.php b/frontends/php/include/maintenances.inc.php
index c0dc16b2b3f..9693fea9868 100644
--- a/frontends/php/include/maintenances.inc.php
+++ b/frontends/php/include/maintenances.inc.php
@@ -50,11 +50,7 @@ function shedule2str($timeperiod) {
 	}
 
 	if ($timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_ONETIME) {
-		$str = _s('At %1$s:%2$s on %3$s',
-			date('H', $timeperiod['start_date']),
-			date('i', $timeperiod['start_date']),
-			zbx_date2str(_('d M Y'), $timeperiod['start_date'])
-		);
+		$str = zbx_date2str(DATE_TIME_FORMAT, $timeperiod['start_date']);
 	}
 	elseif ($timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_DAILY) {
 		$str = _n('At %1$s:%2$s on every day',
@@ -67,7 +63,7 @@ function shedule2str($timeperiod) {
 	elseif ($timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_WEEKLY) {
 		$days = '';
 		$dayofweek = zbx_num2bitstr($timeperiod['dayofweek'], true);
-		$length = zbx_strlen($dayofweek);
+		$length = strlen($dayofweek);
 		for ($i = 0; $i < $length; $i++) {
 			if ($dayofweek[$i] == 1) {
 				if (!zbx_empty($days)) {
@@ -88,7 +84,7 @@ function shedule2str($timeperiod) {
 	elseif ($timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_MONTHLY) {
 		$months = '';
 		$month = zbx_num2bitstr($timeperiod['month'], true);
-		$length = zbx_strlen($month);
+		$length = strlen($month);
 		for ($i = 0; $i < $length; $i++) {
 			if ($month[$i] == 1) {
 				if (!zbx_empty($months)) {
@@ -100,7 +96,7 @@ function shedule2str($timeperiod) {
 		if ($timeperiod['dayofweek'] > 0) {
 			$days = '';
 			$dayofweek = zbx_num2bitstr($timeperiod['dayofweek'], true);
-			$length = zbx_strlen($dayofweek);
+			$length = strlen($dayofweek);
 			for ($i = 0; $i < $length; $i++) {
 				if ($dayofweek[$i] == 1) {
 					if (!zbx_empty($days)) {
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index 68b17fdbc27..9d372a067ce 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -82,16 +82,21 @@ function getActionMapBySysmap($sysmap, array $options = array()) {
 	processAreasCoordinates($sysmap, $areas, $mapInfo);
 
 	$hostIds = array();
+	$triggerIds = array();
+
 	foreach ($sysmap['selements'] as $id => &$selement) {
 		if ($selement['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST) {
 			$hostIds[$selement['elementid']] = $selement['elementid'];
 
-			// expanding hosts url macros again as some hosts were added from hostgroup areeas
+			// expanding host URL macros again as some hosts were added from hostgroup areas
 			// and automatic expanding only happens for elements that are defined for map in db
 			foreach ($selement['urls'] as $urlId => $url) {
 				$selement['urls'][$urlId]['url'] = str_replace('{HOST.ID}', $selement['elementid'], $url['url']);
 			}
 		}
+		elseif ($selement['elementtype'] == SYSMAP_ELEMENT_TYPE_TRIGGER) {
+			$triggerIds[$selement['elementid']] = $selement['elementid'];
+		}
 
 		if ($selement['elementsubtype'] == SYSMAP_ELEMENT_SUBTYPE_HOST_GROUP_ELEMENTS) {
 			unset($sysmap['selements'][$id]);
@@ -103,13 +108,21 @@ function getActionMapBySysmap($sysmap, array $options = array()) {
 
 	$hosts = API::Host()->get(array(
 		'hostids' => $hostIds,
-		'output' => array('status'),
+		'output' => array('hostid', 'status'),
 		'nopermissions' => true,
 		'preservekeys' => true,
 		'selectGraphs' => API_OUTPUT_COUNT,
 		'selectScreens' => API_OUTPUT_COUNT
 	));
 
+	$triggers = API::Trigger()->get(array(
+		'output' => array('triggerid'),
+		'triggerids' => $triggerIds,
+		'selectHosts' => array('status'),
+		'preservekeys' => true,
+		'nopermissions' => true
+	));
+
 	foreach ($sysmap['selements'] as $elem) {
 		$back = get_png_by_selement($mapInfo[$elem['selementid']]);
 		$area = new CArea(
@@ -135,28 +148,22 @@ function getActionMapBySysmap($sysmap, array $options = array()) {
 					$hostId = $elem['elementid'];
 					$scripts = $hostScripts[$elem['elementid']];
 				}
-				if ($hosts[$elem['elementid']]['status'] == HOST_STATUS_MONITORED) {
-					$gotos['triggerStatus'] = array(
-						'hostid' => $elem['elementid'],
-						'show_severity' => isset($options['severity_min']) ? $options['severity_min'] : null
-					);
-				}
-				if ($host['graphs']) {
-					$gotos['graphs'] = array(
-						'hostid' => $host['hostid']
-					);
-				}
-				if ($host['screens']) {
-					$gotos['screens'] = array(
-						'hostid' => $host['hostid']
-					);
-				}
-				$gotos['inventory'] = array(
-					'hostid' => $host['hostid']
-				);
-				$gotos['latestData'] = array(
-					'hostid' => $host['hostid']
+
+				$gotos['triggerStatus'] = array(
+					'hostid' => $elem['elementid'],
+					'show_severity' => isset($options['severity_min']) ? $options['severity_min'] : null
 				);
+				$gotos['showTriggers'] = ($hosts[$elem['elementid']]['status'] == HOST_STATUS_MONITORED);
+
+				$gotos['graphs'] = array('hostid' => $host['hostid']);
+				$gotos['showGraphs'] = (bool) $host['graphs'];
+
+				$gotos['screens'] = array('hostid' => $host['hostid']);
+				$gotos['showScreens'] = (bool) $host['screens'];
+
+				$gotos['inventory'] = array('hostid' => $host['hostid']);
+
+				$gotos['latestData'] = array('hostid' => $host['hostid']);
 				break;
 
 			case SYSMAP_ELEMENT_TYPE_MAP:
@@ -172,6 +179,16 @@ function getActionMapBySysmap($sysmap, array $options = array()) {
 					'stime' => date(TIMESTAMP_FORMAT, time() - SEC_PER_WEEK),
 					'period' => SEC_PER_WEEK
 				);
+
+				$gotos['showEvents'] = false;
+				if (isset($triggers[$elem['elementid']])) {
+					foreach ($triggers[$elem['elementid']]['hosts'] as $host) {
+						if ($host['status'] == HOST_STATUS_MONITORED) {
+							$gotos['showEvents'] = true;
+							break;
+						}
+					}
+				}
 				break;
 
 			case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
@@ -746,12 +763,12 @@ function getSelementsInfo($sysmap, array $options = array()) {
 	}
 
 	$config = select_config();
-	$show_unack = $config['event_ack_enable'] ? $sysmap['show_unack'] : EXTACK_OPTION_ALL;
+	$showUnacknowledged = $config['event_ack_enable'] ? $sysmap['show_unack'] : EXTACK_OPTION_ALL;
 
-	$triggers_map = array();
-	$triggers_map_submaps = array();
-	$hostgroups_map = array();
-	$hosts_map = array();
+	$triggerIdToSelementIds = array();
+	$subSysmapTriggerIdToSelementIds = array();
+	$hostGroupIdToSelementIds = array();
+	$hostIdToSelementIds = array();
 
 	if ($sysmap['sysmapid']) {
 		$iconMap = API::IconMap()->get(array(
@@ -761,41 +778,48 @@ function getSelementsInfo($sysmap, array $options = array()) {
 		));
 		$iconMap = reset($iconMap);
 
-		$hostsToGetInventories = array();
 	}
+	$hostsToGetInventories = array();
 
 	$selements = $sysmap['selements'];
-	foreach ($selements as $selementId => $selement) {
-		$selements[$selementId]['hosts'] = array();
-		$selements[$selementId]['triggers'] = array();
+	$selementIdToSubSysmaps = array();
+	foreach ($selements as $selementId => &$selement) {
+		$selement['hosts'] = array();
+		$selement['triggers'] = array();
 
 		switch ($selement['elementtype']) {
 			case SYSMAP_ELEMENT_TYPE_MAP:
-				$mapids = array($selement['elementid']);
+				$sysmapIds = array($selement['elementid']);
 
-				while (!empty($mapids)) {
-					$maps = API::Map()->get(array(
-						'sysmapids' => $mapids,
+				while (!empty($sysmapIds)) {
+					$subSysmaps = API::Map()->get(array(
+						'sysmapids' => $sysmapIds,
 						'output' => array('sysmapid'),
 						'selectSelements' => API_OUTPUT_EXTEND,
-						'nopermissions' => true
+						'nopermissions' => true,
+						'preservekeys' => true
 					));
 
-					$mapids = array();
-					foreach ($maps as $map) {
-						foreach ($map['selements'] as $sel) {
-							switch ($sel['elementtype']) {
+					if(!isset($selementIdToSubSysmaps[$selementId])) {
+						$selementIdToSubSysmaps[$selementId] = array();
+					}
+					$selementIdToSubSysmaps[$selementId] += $subSysmaps;
+
+					$sysmapIds = array();
+					foreach ($subSysmaps as $subSysmap) {
+						foreach ($subSysmap['selements'] as $subSysmapSelement) {
+							switch ($subSysmapSelement['elementtype']) {
 								case SYSMAP_ELEMENT_TYPE_MAP:
-									$mapids[] = $sel['elementid'];
+									$sysmapIds[] = $subSysmapSelement['elementid'];
 									break;
 								case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
-									$hostgroups_map[$sel['elementid']][$selementId] = $selementId;
+									$hostGroupIdToSelementIds[$subSysmapSelement['elementid']][$selementId] = $selementId;
 									break;
 								case SYSMAP_ELEMENT_TYPE_HOST:
-									$hosts_map[$sel['elementid']][$selementId] = $selementId;
+									$hostIdToSelementIds[$subSysmapSelement['elementid']][$selementId] = $selementId;
 									break;
 								case SYSMAP_ELEMENT_TYPE_TRIGGER:
-									$triggers_map_submaps[$sel['elementid']][$selementId] = $selementId;
+									$subSysmapTriggerIdToSelementIds[$subSysmapSelement['elementid']][$selementId] = $selementId;
 									break;
 							}
 						}
@@ -803,22 +827,26 @@ function getSelementsInfo($sysmap, array $options = array()) {
 				}
 				break;
 			case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
-				$hostgroups_map[$selement['elementid']][$selement['selementid']] = $selement['selementid'];
+				$hostGroupId = $selement['elementid'];
+				$hostGroupIdToSelementIds[$hostGroupId][$selementId] = $selementId;
 				break;
 			case SYSMAP_ELEMENT_TYPE_HOST:
-				$hosts_map[$selement['elementid']][$selement['selementid']] = $selement['selementid'];
+				$hostId = $selement['elementid'];
+				$hostIdToSelementIds[$hostId][$selementId] = $selementId;
 
 				// if we have icon map applied, we need to get inventories for all hosts,
 				// where automatic icon selection is enabled.
 				if ($sysmap['iconmapid'] && $selement['use_iconmap']) {
-					$hostsToGetInventories[] = $selement['elementid'];
+					$hostsToGetInventories[] = $hostId;
 				}
 				break;
 			case SYSMAP_ELEMENT_TYPE_TRIGGER:
-				$triggers_map[$selement['elementid']][$selement['selementid']] = $selement['selementid'];
+				$triggerId = $selement['elementid'];
+				$triggerIdToSelementIds[$triggerId][$selementId] = $selementId;
 				break;
 		}
 	}
+	unset($selement);
 
 	// get host inventories
 	if ($sysmap['iconmapid']) {
@@ -831,94 +859,109 @@ function getSelementsInfo($sysmap, array $options = array()) {
 		));
 	}
 
-	$all_hosts = array();
-	if (!empty($hosts_map)) {
+	$allHosts = array();
+	if (!empty($hostIdToSelementIds)) {
 		$hosts = API::Host()->get(array(
-			'hostids' => array_keys($hosts_map),
+			'hostids' => array_keys($hostIdToSelementIds),
 			'output' => array('name', 'status', 'maintenance_status', 'maintenanceid'),
-			'nopermissions' => true
+			'nopermissions' => true,
+			'preservekeys' => true
 		));
-		$all_hosts = array_merge($all_hosts, $hosts);
-		foreach ($hosts as $host) {
-			foreach ($hosts_map[$host['hostid']] as $belongs_to_sel) {
-				$selements[$belongs_to_sel]['hosts'][$host['hostid']] = $host['hostid'];
+		$allHosts = array_merge($allHosts, $hosts);
+		foreach ($hosts as $hostId => $host) {
+			foreach ($hostIdToSelementIds[$hostId] as $selementId) {
+				$selements[$selementId]['hosts'][$hostId] = $hostId;
 			}
 		}
 	}
 
-	if (!empty($hostgroups_map)) {
-		$hosts = API::Host()->get(array(
-			'groupids' => array_keys($hostgroups_map),
+	$hostsFromHostGroups = array();
+	if (!empty($hostGroupIdToSelementIds)) {
+		$hostsFromHostGroups = API::Host()->get(array(
+			'groupids' => array_keys($hostGroupIdToSelementIds),
 			'output' => array('name', 'status', 'maintenance_status', 'maintenanceid'),
 			'selectGroups' => array('groupid'),
-			'nopermissions' => true
+			'nopermissions' => true,
+			'preservekeys' => true
 		));
-		$all_hosts = array_merge($all_hosts, $hosts);
-		foreach ($hosts as $host) {
+
+		foreach ($hostsFromHostGroups as $hostId => $host) {
 			foreach ($host['groups'] as $group) {
-				if (isset($hostgroups_map[$group['groupid']])) {
-					foreach ($hostgroups_map[$group['groupid']] as $belongs_to_sel) {
-						$selements[$belongs_to_sel]['hosts'][$host['hostid']] = $host['hostid'];
+				$groupId = $group['groupid'];
+
+				if (isset($hostGroupIdToSelementIds[$groupId])) {
+					foreach ($hostGroupIdToSelementIds[$groupId] as $selementId) {
+						$selement =& $selements[$selementId];
+
+						$selement['hosts'][$hostId] = $hostId;
 
 						// add hosts to hosts_map for trigger selection;
-						if (!isset($hosts_map[$host['hostid']])) {
-							$hosts_map[$host['hostid']] = array();
+						if (!isset($hostIdToSelementIds[$hostId])) {
+							$hostIdToSelementIds[$hostId] = array();
 						}
-						$hosts_map[$host['hostid']][$belongs_to_sel] = $belongs_to_sel;
+						$hostIdToSelementIds[$hostId][$selementId] = $selementId;
+
+						unset($selement);
 					}
 				}
 			}
 		}
+
+		$allHosts = array_merge($allHosts, $hostsFromHostGroups);
 	}
-	$all_hosts = zbx_toHash($all_hosts, 'hostid');
+
+	$allHosts = zbx_toHash($allHosts, 'hostid');
 
 	// get triggers data, triggers from current map, select all
-	$all_triggers = array();
+	$allTriggers = array();
 
-	if (!empty($triggers_map)) {
+	if (!empty($triggerIdToSelementIds)) {
 		$triggers = API::Trigger()->get(array(
-			'triggerids' => array_keys($triggers_map),
+			'triggerids' => array_keys($triggerIdToSelementIds),
 			'filter' => array('state' => null),
 			'output' => API_OUTPUT_EXTEND,
-			'nopermissions' => true
+			'nopermissions' => true,
+			'preservekeys' => true
 		));
-		$all_triggers = array_merge($all_triggers, $triggers);
+		$allTriggers = array_merge($allTriggers, $triggers);
 
-		foreach ($triggers as $trigger) {
-			foreach ($triggers_map[$trigger['triggerid']] as $belongs_to_sel) {
-				$selements[$belongs_to_sel]['triggers'][$trigger['triggerid']] = $trigger['triggerid'];
+		foreach ($triggers as $triggerId => $trigger) {
+			foreach ($triggerIdToSelementIds[$triggerId] as $selementId) {
+				$selements[$selementId]['triggers'][$triggerId] = $triggerId;
 			}
 		}
 	}
 
 	// triggers from submaps, skip dependent
-	if (!empty($triggers_map_submaps)) {
+	if (!empty($subSysmapTriggerIdToSelementIds)) {
 		$triggers = API::Trigger()->get(array(
-			'triggerids' => array_keys($triggers_map_submaps),
+			'triggerids' => array_keys($subSysmapTriggerIdToSelementIds),
 			'filter' => array('state' => null),
 			'skipDependent' => true,
 			'output' => API_OUTPUT_EXTEND,
-			'nopermissions' => true
+			'nopermissions' => true,
+			'preservekeys' => true
 		));
-		$all_triggers = array_merge($all_triggers, $triggers);
 
-		foreach ($triggers as $trigger) {
-			foreach ($triggers_map_submaps[$trigger['triggerid']] as $belongs_to_sel) {
-				$selements[$belongs_to_sel]['triggers'][$trigger['triggerid']] = $trigger['triggerid'];
+		foreach ($triggers as $triggerId => $trigger) {
+			foreach ($subSysmapTriggerIdToSelementIds[$triggerId] as $selementId) {
+				$selements[$selementId]['triggers'][$triggerId] = $triggerId;
 			}
 		}
+
+		$allTriggers = array_merge($allTriggers, $triggers);
 	}
 
 	$monitoredHostIds = array();
-	foreach ($all_hosts as $hostid => $host) {
+	foreach ($allHosts as $hostId => $host) {
 		if ($host['status'] == HOST_STATUS_MONITORED) {
-			$monitoredHostIds[$hostid] = $hostid;
+			$monitoredHostIds[$hostId] = $hostId;
 		}
 	}
 
 	// triggers from all hosts/hostgroups, skip dependent
 	if ($monitoredHostIds) {
-		$triggers = API::Trigger()->get(array(
+		$triggersFromMonitoredHosts = API::Trigger()->get(array(
 			'hostids' => $monitoredHostIds,
 			'output' => array('status', 'value', 'priority', 'lastchange', 'description', 'expression'),
 			'selectHosts' => array('hostid'),
@@ -927,72 +970,35 @@ function getSelementsInfo($sysmap, array $options = array()) {
 			'filter' => array('state' => null),
 			'monitored' => true,
 			'skipDependent' => true,
+			'preservekeys' => true
 		));
 
-		$all_triggers = array_merge($all_triggers, $triggers);
-
-		$triggersToFilter = array();
-		foreach ($triggers as $trigger) {
+		foreach ($triggersFromMonitoredHosts as $triggerId => $trigger) {
 			foreach ($trigger['hosts'] as $host) {
-				if (isset($hosts_map[$host['hostid']])) {
-					foreach ($hosts_map[$host['hostid']] as $belongs_to_sel) {
-						// if the map element is using the application filter, save it's triggers for later filtering
-						if ($selements[$belongs_to_sel]['application'] !== '') {
-							$triggersToFilter[] = $trigger;
-						}
+				$hostId = $host['hostid'];
 
-						$selements[$belongs_to_sel]['triggers'][$trigger['triggerid']] = $trigger['triggerid'];
+				if (isset($hostIdToSelementIds[$hostId])) {
+					foreach ($hostIdToSelementIds[$hostId] as $selementId) {
+						$selements[$selementId]['triggers'][$triggerId] = $triggerId;
 					}
 				}
 			}
 		}
 
-		// filters triggers by applications for host and host group elements
-		if ($triggersToFilter) {
-			// create a trigger-application map
-			$itemIds = array();
-			foreach ($triggersToFilter as $trigger) {
-				foreach ($trigger['items'] as $item) {
-					$itemIds[$item['itemid']] = $item['itemid'];
-				}
-			}
-			$items = API::Item()->get(array(
-				'output' => array('itemid'),
-				'selectApplications' => array('name'),
-				'itemids' => $itemIds,
-				'webitems' => true,
-				'preservekeys' => true
-			));
-
-			$triggerApps = array();
-			foreach ($triggersToFilter as $trigger) {
-				foreach ($trigger['items'] as $item) {
-					foreach ($items[$item['itemid']]['applications'] as $app) {
-						$triggerApps[$trigger['triggerid']][$app['name']] = true;
-					}
-				}
-			}
-
-			// unset triggers that don't belong to the chosen applications
-			foreach ($selements as &$selement) {
-				if ($selement['application'] === '') {
-					continue;
-				}
+		$subSysmapHostApplicationFilters = getSelementHostApplicationFilters($selements, $selementIdToSubSysmaps,
+			$hostsFromHostGroups
+		);
+		$selements = filterSysmapTriggers($selements, $subSysmapHostApplicationFilters, $triggersFromMonitoredHosts,
+			$subSysmapTriggerIdToSelementIds
+		);
 
-				foreach ($selement['triggers'] as $triggerId) {
-					if (!isset($triggerApps[$triggerId][$selement['application']])) {
-						unset($selement['triggers'][$triggerId]);
-					}
-				}
-			}
-			unset($selement);
-		}
+		$allTriggers = array_merge($allTriggers, $triggersFromMonitoredHosts);
 	}
 
-	$all_triggers = zbx_toHash($all_triggers, 'triggerid');
+	$allTriggers = zbx_toHash($allTriggers, 'triggerid');
 
 	$unackTriggerIds = API::Trigger()->get(array(
-		'triggerids' => array_keys($all_triggers),
+		'triggerids' => array_keys($allTriggers),
 		'withLastEventUnacknowledged' => true,
 		'output' => array('triggerid'),
 		'nopermissions' => true,
@@ -1014,9 +1020,9 @@ function getSelementsInfo($sysmap, array $options = array()) {
 			'ack' => true
 		);
 
-		foreach ($selement['hosts'] as $hostid) {
-			$host = $all_hosts[$hostid];
-			$last_hostid = $hostid;
+		foreach ($selement['hosts'] as $hostId) {
+			$host = $allHosts[$hostId];
+			$last_hostid = $hostId;
 
 			if ($host['status'] == HOST_STATUS_NOT_MONITORED) {
 				$i['disabled']++;
@@ -1027,7 +1033,7 @@ function getSelementsInfo($sysmap, array $options = array()) {
 		}
 
 		foreach ($selement['triggers'] as $triggerId) {
-			$trigger = $all_triggers[$triggerId];
+			$trigger = $allTriggers[$triggerId];
 
 			if ($options['severity_min'] <= $trigger['priority']) {
 				if ($trigger['status'] == TRIGGER_STATUS_DISABLED) {
@@ -1061,11 +1067,11 @@ function getSelementsInfo($sysmap, array $options = array()) {
 				$lastProblemId = null;
 			}
 
-			$i['problem_title'] = CMacrosResolverHelper::resolveTriggerName($all_triggers[$lastProblemId]);
+			$i['problem_title'] = CMacrosResolverHelper::resolveTriggerName($allTriggers[$lastProblemId]);
 		}
 
 		if ($selement['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST && $i['maintenance'] == 1) {
-			$mnt = get_maintenance_by_maintenanceid($all_hosts[$last_hostid]['maintenanceid']);
+			$mnt = get_maintenance_by_maintenanceid($allHosts[$last_hostid]['maintenanceid']);
 			$i['maintenance_title'] = $mnt['name'];
 		}
 
@@ -1082,22 +1088,22 @@ function getSelementsInfo($sysmap, array $options = array()) {
 
 		switch ($selement['elementtype']) {
 			case SYSMAP_ELEMENT_TYPE_MAP:
-				$info[$selementId] = getMapsInfo($selement, $i, $show_unack);
+				$info[$selementId] = getMapsInfo($selement, $i, $showUnacknowledged);
 				break;
 
 			case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
-				$info[$selementId] = getHostGroupsInfo($selement, $i, $show_unack);
+				$info[$selementId] = getHostGroupsInfo($selement, $i, $showUnacknowledged);
 				break;
 
 			case SYSMAP_ELEMENT_TYPE_HOST:
-				$info[$selementId] = getHostsInfo($selement, $i, $show_unack);
+				$info[$selementId] = getHostsInfo($selement, $i, $showUnacknowledged);
 				if ($sysmap['iconmapid'] && $selement['use_iconmap']) {
 					$info[$selementId]['iconid'] = getIconByMapping($iconMap, $hostInventories[$selement['elementid']]);
 				}
 				break;
 
 			case SYSMAP_ELEMENT_TYPE_TRIGGER:
-				$info[$selementId] = getTriggersInfo($selement, $i, $show_unack);
+				$info[$selementId] = getTriggersInfo($selement, $i, $showUnacknowledged);
 				break;
 
 			case SYSMAP_ELEMENT_TYPE_IMAGE:
@@ -1119,15 +1125,15 @@ function getSelementsInfo($sysmap, array $options = array()) {
 	// get names if needed
 	$elems = separateMapElements($sysmap);
 	if (!empty($elems['sysmaps']) && $mlabel) {
-		$maps = API::Map()->get(array(
+		$subSysmaps = API::Map()->get(array(
 			'sysmapids' => zbx_objectValues($elems['sysmaps'], 'elementid'),
 			'nopermissions' => true,
 			'output' => array('name')
 		));
-		$maps = zbx_toHash($maps, 'sysmapid');
+		$subSysmaps = zbx_toHash($subSysmaps, 'sysmapid');
 
 		foreach ($elems['sysmaps'] as $elem) {
-			$info[$elem['selementid']]['name'] = $maps[$elem['elementid']]['name'];
+			$info[$elem['selementid']]['name'] = $subSysmaps[$elem['elementid']]['name'];
 		}
 	}
 	if (!empty($elems['hostgroups']) && $hglabel) {
@@ -1145,18 +1151,228 @@ function getSelementsInfo($sysmap, array $options = array()) {
 
 	if (!empty($elems['triggers']) && $tlabel) {
 		foreach ($elems['triggers'] as $elem) {
-			$info[$elem['selementid']]['name'] = CMacrosResolverHelper::resolveTriggerName($all_triggers[$elem['elementid']]);
+			$info[$elem['selementid']]['name'] = CMacrosResolverHelper::resolveTriggerName($allTriggers[$elem['elementid']]);
 		}
 	}
 	if (!empty($elems['hosts']) && $hlabel) {
 		foreach ($elems['hosts'] as $elem) {
-			$info[$elem['selementid']]['name'] = $all_hosts[$elem['elementid']]['name'];
+			$info[$elem['selementid']]['name'] = $allHosts[$elem['elementid']]['name'];
 		}
 	}
 
 	return $info;
 }
 
+/**
+ * Takes sysmap selements array, applies filtering by application to triggers and returns sysmap selements array.
+ *
+ * @param array $selements                          selements of current sysmap
+ * @param array $selementHostApplicationFilters     a list of application filters applied to each host under each element
+ *                                                  @see getSelementHostApplicationFilters()
+ * @param array $triggersFromMonitoredHosts         triggers that are relevant to filtering
+ * @param array $subSysmapTriggerIdToSelementIds    a map of triggers in sysmaps to selement IDs
+ *
+ * @return array
+ */
+function filterSysmapTriggers(array $selements, array $selementHostApplicationFilters, array $triggersFromMonitoredHosts, array $subSysmapTriggerIdToSelementIds) {
+	// pick only host, host group or map selements
+	$filterableSelements = array();
+	foreach ($selements as $selementId => $selement) {
+		if ($selement['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST
+				|| $selement['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST_GROUP
+				|| $selement['elementtype'] == SYSMAP_ELEMENT_TYPE_MAP) {
+			$filterableSelements[$selementId] = $selement;
+		}
+	}
+	// calculate list of triggers that might get removed from $selement['triggers']
+	$triggersToFilter = array();
+	foreach ($filterableSelements as $selementId => $selement) {
+		foreach ($selement['triggers'] as $triggerId) {
+			if (!isset($triggersFromMonitoredHosts[$triggerId])) {
+				continue;
+			}
+			$trigger = $triggersFromMonitoredHosts[$triggerId];
+			foreach ($trigger['hosts'] as $host) {
+				$hostId = $host['hostid'];
+				if (isset($selementHostApplicationFilters[$selementId][$hostId])) {
+					$triggersToFilter[$triggerId] = $trigger;
+				}
+			}
+		}
+	}
+
+	// if there are no triggers to filter
+	if (!$triggersToFilter) {
+		return $selements;
+	}
+
+	// produce mapping of trigger to application names it is related to and produce mapping of host to triggers
+	$itemIds = array();
+	foreach ($triggersToFilter as $trigger) {
+		foreach ($trigger['items'] as $item) {
+			$itemIds[$item['itemid']] = $item['itemid'];
+		}
+	}
+	$items = API::Item()->get(array(
+		'output' => array('itemid'),
+		'selectApplications' => array('name'),
+		'itemids' => $itemIds,
+		'webitems' => true,
+		'preservekeys' => true
+	));
+
+	$triggerApplications = array();
+	$hostIdToTriggers = array();
+	foreach ($triggersToFilter as $trigger) {
+		$triggerId = $trigger['triggerid'];
+
+		foreach ($trigger['items'] as $item) {
+			foreach ($items[$item['itemid']]['applications'] as $application) {
+				$triggerApplications[$triggerId][$application['name']] = true;
+			}
+		}
+
+		foreach ($trigger['hosts'] as $host) {
+			$hostIdToTriggers[$host['hostid']][$triggerId] = $trigger;
+		}
+	}
+
+	foreach ($filterableSelements as $selementId => &$selement) {
+		// walk through each host of a submap and apply its filters to all its triggers
+		foreach ($selement['hosts'] as $hostId) {
+			// skip hosts that don't have any filters or triggers to filter
+			if (!isset($hostIdToTriggers[$hostId]) || !isset($selementHostApplicationFilters[$selementId][$hostId])) {
+				continue;
+			}
+
+			// remove the triggers that don't have applications or don't match the filter
+			$filteredApplicationNames = $selementHostApplicationFilters[$selementId][$hostId];
+			foreach ($hostIdToTriggers[$hostId] as $trigger) {
+				$triggerId = $trigger['triggerid'];
+
+				// skip if this trigger is standalone trigger and those are not filtered
+				if (isset($subSysmapTriggerIdToSelementIds[$triggerId])
+						&& isset($subSysmapTriggerIdToSelementIds[$triggerId][$selementId])) {
+					continue;
+				}
+
+				$applicationNamesForTrigger = isset($triggerApplications[$triggerId])
+					? array_keys($triggerApplications[$triggerId])
+					: array();
+
+				if (!array_intersect($applicationNamesForTrigger, $filteredApplicationNames)) {
+					unset($selement['triggers'][$triggerId]);
+				}
+			}
+		}
+	}
+	unset($selement);
+
+	// put back updated selements
+	foreach ($filterableSelements as $selementId => $selement) {
+		$selements[$selementId] = $selement;
+	}
+
+	return $selements;
+}
+
+/**
+ * Returns a list of application filters applied to each host under each element.
+ *
+ * @param array $selements                  selements of current sysmap
+ * @param array $selementIdToSubSysmaps     all sub-sysmaps used in current sysmap, indexed by selementId
+ * @param array $hostsFromHostGroups        collection of hosts that get included via host groups
+ *
+ * @return array    a two-dimensional array with selement IDs as the primary key, host IDs as the secondary key
+ *                  application names as values
+ */
+function getSelementHostApplicationFilters(array $selements, array $selementIdToSubSysmaps, array $hostsFromHostGroups) {
+	$hostIdsForHostGroupId = array();
+	foreach ($hostsFromHostGroups as $host) {
+		$hostId = $host['hostid'];
+		foreach ($host['groups'] as $group) {
+			$hostIdsForHostGroupId[$group['groupid']][$hostId] = $hostId;
+		}
+	}
+
+	$selementHostApplicationFilters = array();
+	foreach ($selements as $selementId => $selement) {
+		switch ($selement['elementtype']) {
+			case SYSMAP_ELEMENT_TYPE_HOST:
+			case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
+				// skip host and host group elements with an empty filter
+				if ($selement['application'] === '') {
+					continue 2;
+				}
+
+				foreach ($selement['hosts'] as $hostId) {
+					$selementHostApplicationFilters[$selementId][$hostId][] = $selement['application'];
+				}
+
+				break;
+
+			case SYSMAP_ELEMENT_TYPE_MAP:
+				foreach ($selementIdToSubSysmaps[$selementId] as $subSysmap) {
+					// add all filters set for host elements
+					foreach ($subSysmap['selements'] as $subSysmapSelement) {
+						if ($subSysmapSelement['elementtype'] != SYSMAP_ELEMENT_TYPE_HOST
+								|| $subSysmapSelement['application'] === '') {
+
+							continue;
+						}
+
+						$hostId = $subSysmapSelement['elementid'];
+						$selementHostApplicationFilters[$selementId][$hostId][] = $subSysmapSelement['application'];
+					}
+
+					// Find all selements with host groups and sort them into two arrays:
+					// - with application filter
+					// - without application filter
+					$hostGroupSelementsWithApplication = array();
+					$hostGroupSelementsWithoutApplication = array();
+					foreach ($subSysmap['selements'] as $subSysmapSelement) {
+						if ($subSysmapSelement['elementtype'] == SYSMAP_ELEMENT_TYPE_HOST_GROUP) {
+							if ($subSysmapSelement['application'] !== '') {
+								$hostGroupSelementsWithApplication[] = $subSysmapSelement;
+							}
+							else {
+								$hostGroupSelementsWithoutApplication[] = $subSysmapSelement;
+							}
+						}
+					}
+
+					// Combine application filters for hosts from host group selements with
+					// application filters set.
+					foreach ($hostGroupSelementsWithApplication as $hostGroupSelement) {
+						$hostGroupId = $hostGroupSelement['elementid'];
+
+						if (isset($hostIdsForHostGroupId[$hostGroupId])) {
+							foreach ($hostIdsForHostGroupId[$hostGroupId] as $hostId) {
+								$selementHostApplicationFilters[$selementId][$hostId][] = $hostGroupSelement['application'];
+							}
+						}
+					}
+
+					// Unset all application filters for hosts in host group selements without any filters.
+					// This might reset application filters set by previous foreach.
+					foreach ($hostGroupSelementsWithoutApplication AS $hostGroupSelement) {
+						$hostGroupId = $hostGroupSelement['elementid'];
+
+						if (isset($hostIdsForHostGroupId[$hostGroupId])) {
+							foreach ($hostIdsForHostGroupId[$hostGroupId] as $hostId) {
+								unset($selementHostApplicationFilters[$selementId][$hostId]);
+							}
+						}
+					}
+				}
+
+				break;
+		}
+	}
+
+	return $selementHostApplicationFilters;
+}
+
 function separateMapElements($sysmap) {
 	$elements = array(
 		'sysmaps' => array(),
@@ -2086,7 +2302,7 @@ function getIconByMapping($iconMap, $inventory) {
 
 		foreach ($iconMap['mappings'] as $mapping) {
 			try {
-				$expr = new GlobalRegExp($mapping['expression']);
+				$expr = new CGlobalRegexp($mapping['expression']);
 				if ($expr->match($inventory['inventory'][$inventories[$mapping['inventory_link']]['db_field']])) {
 					return $mapping['iconid'];
 				}
diff --git a/frontends/php/include/page_footer.php b/frontends/php/include/page_footer.php
index 9968dd7aef6..0af6b72fdd8 100644
--- a/frontends/php/include/page_footer.php
+++ b/frontends/php/include/page_footer.php
@@ -65,12 +65,7 @@ if (isset($DB) && isset($DB['TRANSACTIONS']) && $DB['TRANSACTIONS'] != 0) {
 show_messages();
 
 if (in_array($page['type'], array(PAGE_TYPE_HTML_BLOCK, PAGE_TYPE_HTML))) {
-
-	if (!is_null(CWebUser::$data)
-			&& isset(CWebUser::$data['debug_mode'])
-			&& CWebUser::$data['debug_mode'] == GROUP_DEBUG_MODE_ENABLED
-			&& !getRequest('fullscreen')
-	) {
+	if (!is_null(CWebUser::$data) && isset(CWebUser::$data['debug_mode']) && CWebUser::$data['debug_mode'] == GROUP_DEBUG_MODE_ENABLED) {
 		CProfiler::getInstance()->stop();
 		CProfiler::getInstance()->show();
 	}
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php
index 7d61b234178..c32c7048407 100644
--- a/frontends/php/include/page_header.php
+++ b/frontends/php/include/page_header.php
@@ -25,7 +25,7 @@ if (!isset($page['type'])) {
 if (!isset($page['file'])) {
 	$page['file'] = basename($_SERVER['PHP_SELF']);
 }
-$_REQUEST['fullscreen'] = get_request('fullscreen', 0);
+$_REQUEST['fullscreen'] = getRequest('fullscreen', 0);
 if ($_REQUEST['fullscreen'] === '1') {
 	if (!defined('ZBX_PAGE_NO_MENU')) {
 		define('ZBX_PAGE_NO_MENU', 1);
@@ -111,7 +111,7 @@ switch ($page['type']) {
 		$pageTitle .= isset($page['title']) ? $page['title'] : _('Zabbix');
 
 		if ((defined('ZBX_PAGE_DO_REFRESH') || defined('ZBX_PAGE_DO_JS_REFRESH')) && CWebUser::$data['refresh']) {
-			$pageTitle .= ' ['._('refreshed every').' '.CWebUser::$data['refresh'].' '._('sec').']';
+			$pageTitle .= ' ['._s('refreshed every %1$s sec.', CWebUser::$data['refresh']).']';
 		}
 		break;
 }
@@ -220,7 +220,7 @@ if (!defined('ZBX_PAGE_NO_MENU')) {
 		$chck = $page['file'] == 'authentication.php' && isset($_REQUEST['save'], $_REQUEST['config']);
 		if ($chck && $_REQUEST['config'] == ZBX_AUTH_HTTP || !$chck && isset($config) && $config['authentication_type'] == ZBX_AUTH_HTTP) {
 			$logout =  new CLink(_('Logout'), '', 'small_font', null, 'nosid');
-			$logout->setHint(_s('It is not possible to logout from HTTP authentication.'), null, null, false);
+			$logout->setHint(_s('It is not possible to logout from HTTP authentication.'), null, false);
 		}
 		else {
 			$logout =  new CLink(_('Logout'), 'index.php?reconnect=1', 'small_font', null, null);
@@ -326,7 +326,7 @@ if (isset($page['hist_arg']) && CWebUser::$data['alias'] != ZBX_GUEST_USER && $p
 	$table->show();
 }
 elseif ($page['type'] == PAGE_TYPE_HTML && !defined('ZBX_PAGE_NO_MENU')) {
-	echo SBR;
+	echo BR();
 }
 
 // unset multiple variables
@@ -344,8 +344,8 @@ if ($failedAttempts = CProfile::get('web.login.attempt.failed', 0)) {
 	$error_msg = _n('%4$s failed login attempt logged. Last failed attempt was from %1$s on %2$s at %3$s.',
 		'%4$s failed login attempts logged. Last failed attempt was from %1$s on %2$s at %3$s.',
 		$attempip,
-		zbx_date2str(_('d M Y'), $attempdate),
-		zbx_date2str(_('H:i'), $attempdate),
+		zbx_date2str(DATE_FORMAT, $attempdate),
+		zbx_date2str(TIME_FORMAT, $attempdate),
 		$failedAttempts
 	);
 	error($error_msg);
diff --git a/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php
index e56e92dc738..a819f92d3a7 100644
--- a/frontends/php/include/perm.inc.php
+++ b/frontends/php/include/perm.inc.php
@@ -107,7 +107,7 @@ function getUserGuiAccess($userId, $maxGuiAccess = null) {
 		' FROM usrgrp g,users_groups ug'.
 		' WHERE ug.userid='.zbx_dbstr($userId).
 			' AND g.usrgrpid=ug.usrgrpid'.
-			(($maxGuiAccess === null) ? '' : ' AND g.gui_access<='.$maxGuiAccess)
+			(($maxGuiAccess === null) ? '' : ' AND g.gui_access<='.zbx_dbstr($maxGuiAccess))
 	));
 
 	return $guiAccess ? $guiAccess['gui_access'] : GROUP_GUI_ACCESS_SYSTEM;
@@ -149,7 +149,7 @@ function getGroupsGuiAccess($groupIds, $maxGuiAccess = null) {
 		'SELECT MAX(g.gui_access) AS gui_access'.
 		' FROM usrgrp g'.
 		' WHERE '.dbConditionInt('g.usrgrpid', $groupIds).
-			(($maxGuiAccess === null) ? '' : ' AND g.gui_access<='.$maxGuiAccess)
+			(($maxGuiAccess === null) ? '' : ' AND g.gui_access<='.zbx_dbstr($maxGuiAccess))
 	));
 
 	return $guiAccess ? $guiAccess['gui_access'] : GROUP_GUI_ACCESS_SYSTEM;
diff --git a/frontends/php/include/profiles.inc.php b/frontends/php/include/profiles.inc.php
index 8fe5193b66c..4371a41ca33 100644
--- a/frontends/php/include/profiles.inc.php
+++ b/frontends/php/include/profiles.inc.php
@@ -19,268 +19,6 @@
 **/
 
 
-class CProfile {
-
-	private static $userDetails = array();
-	private static $profiles = null;
-	private static $update = array();
-	private static $insert = array();
-	private static $stringProfileMaxLength;
-
-	public static function init() {
-		self::$userDetails = CWebUser::$data;
-		self::$profiles = array();
-
-		$profilesTableSchema = DB::getSchema('profiles');
-		self::$stringProfileMaxLength = $profilesTableSchema['fields']['value_str']['length'];
-
-		$db_profiles = DBselect(
-			'SELECT p.*'.
-			' FROM profiles p'.
-			' WHERE p.userid='.self::$userDetails['userid'].
-			' ORDER BY p.userid,p.profileid'
-		);
-		while ($profile = DBfetch($db_profiles)) {
-			$value_type = self::getFieldByType($profile['type']);
-
-			if (!isset(self::$profiles[$profile['idx']])) {
-				self::$profiles[$profile['idx']] = array();
-			}
-			self::$profiles[$profile['idx']][$profile['idx2']] = $profile[$value_type];
-		}
-	}
-
-	/**
-	 * Check if data needs to be inserted or updated.
-	 *
-	 * @return bool
-	 */
-	public static function isModified() {
-		return (self::$insert || self::$update);
-	}
-
-	public static function flush() {
-		$result = false;
-
-		if (self::$profiles !== null && self::$userDetails['userid'] > 0 && self::isModified()) {
-			$result = true;
-
-			foreach (self::$insert as $idx => $profile) {
-				foreach ($profile as $idx2 => $data) {
-					$result &= self::insertDB($idx, $data['value'], $data['type'], $idx2);
-				}
-			}
-
-			ksort(self::$update);
-			foreach (self::$update as $idx => $profile) {
-				ksort($profile);
-				foreach ($profile as $idx2 => $data) {
-					$result &= self::updateDB($idx, $data['value'], $data['type'], $idx2);
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	public static function clear() {
-		self::$insert = array();
-		self::$update = array();
-	}
-
-	public static function get($idx, $default_value = null, $idx2 = 0) {
-		// no user data available, just return the default value
-		if (!CWebUser::$data) {
-			return $default_value;
-		}
-
-		if (is_null(self::$profiles)) {
-			self::init();
-		}
-
-		if (isset(self::$profiles[$idx][$idx2])) {
-			return self::$profiles[$idx][$idx2];
-		}
-		else {
-			return $default_value;
-		}
-	}
-
-	/**
-	 * Removes profile values from DB and profiles cache.
-	 *
-	 * @param string 		$idx	first identifier
-	 * @param int|array  	$idx2	second identifier, which can be list of identifiers as well
-	 */
-	public static function delete($idx, $idx2 = 0) {
-		if (is_null(self::$profiles)) {
-			self::init();
-		}
-
-		if (!isset(self::$profiles[$idx])) {
-			return;
-		}
-
-		// pick existing Idx2
-		$deleteIdx2 = array();
-		foreach ((array) $idx2 as $checkIdx2) {
-			if (isset(self::$profiles[$idx][$checkIdx2])) {
-				$deleteIdx2[] = $checkIdx2;
-			}
-		}
-
-		if (!$deleteIdx2) {
-			return;
-		}
-
-		// remove from DB
-		self::deleteValues($idx, $deleteIdx2);
-
-		// remove from cache
-		foreach ($deleteIdx2 as $v) {
-			unset(self::$profiles[$idx][$v]);
-		}
-		if (!self::$profiles[$idx]) {
-			unset(self::$profiles[$idx]);
-		}
-	}
-
-	/**
-	 * Removes all values stored under the given idx.
-	 *
-	 * @param string $idx
-	 */
-	public static function deleteIdx($idx) {
-		if (self::$profiles === null) {
-			self::init();
-		}
-
-		if (!isset(self::$profiles[$idx])) {
-			return;
-		}
-
-		self::deleteValues($idx, array_keys(self::$profiles[$idx]));
-		unset(self::$profiles[$idx]);
-	}
-
-	/**
-	 * Deletes the given values from the DB.
-	 *
-	 * @param string 	$idx
-	 * @param array 	$idx2
-	 */
-	protected static function deleteValues($idx, array $idx2) {
-		// remove from DB
-		DB::delete('profiles', array('idx' => $idx, 'idx2' => $idx2));
-	}
-
-	/**
-	 * Update favorite values in DB profiles table.
-	 *
-	 * @param string	$idx		max length is 96
-	 * @param mixed		$value		max length 255 for string
-	 * @param int		$type
-	 * @param int		$idx2
-	 */
-	public static function update($idx, $value, $type, $idx2 = 0) {
-		if (is_null(self::$profiles)) {
-			self::init();
-		}
-
-		if (!self::checkValueType($value, $type)) {
-			return false;
-		}
-
-		$profile = array(
-			'idx' => $idx,
-			'value' => $value,
-			'type' => $type,
-			'idx2' => $idx2
-		);
-
-		$current = CProfile::get($idx, null, $idx2);
-		if (is_null($current)) {
-			if (!isset(self::$insert[$idx])) {
-				self::$insert[$idx] = array();
-			}
-			self::$insert[$idx][$idx2] = $profile;
-		}
-		else {
-			if ($current != $value) {
-				if (!isset(self::$update[$idx])) {
-					self::$update[$idx] = array();
-				}
-				self::$update[$idx][$idx2] = $profile;
-			}
-		}
-
-		if (!isset(self::$profiles[$idx])) {
-			self::$profiles[$idx] = array();
-		}
-
-		self::$profiles[$idx][$idx2] = $value;
-	}
-
-	private static function insertDB($idx, $value, $type, $idx2) {
-		$value_type = self::getFieldByType($type);
-
-		$values = array(
-			'profileid' => get_dbid('profiles', 'profileid'),
-			'userid' => self::$userDetails['userid'],
-			'idx' => zbx_dbstr($idx),
-			$value_type => zbx_dbstr($value),
-			'type' => $type,
-			'idx2' => $idx2
-		);
-
-		return DBexecute('INSERT INTO profiles ('.implode(', ', array_keys($values)).') VALUES ('.implode(', ', $values).')');
-	}
-
-	private static function updateDB($idx, $value, $type, $idx2) {
-		$sqlIdx2 = ($idx2 > 0) ? ' AND idx2='.zbx_dbstr($idx2) : '';
-
-		$valueType = self::getFieldByType($type);
-
-		return DBexecute(
-			'UPDATE profiles SET '.
-				$valueType.'='.zbx_dbstr($value).','.
-				' type='.$type.
-			' WHERE userid='.self::$userDetails['userid'].
-				' AND idx='.zbx_dbstr($idx).
-				$sqlIdx2
-		);
-	}
-
-	public static function getFieldByType($type) {
-		switch ($type) {
-			case PROFILE_TYPE_INT:
-				$field = 'value_int';
-				break;
-			case PROFILE_TYPE_STR:
-				$field = 'value_str';
-				break;
-			case PROFILE_TYPE_ID:
-			default:
-				$field = 'value_id';
-		}
-
-		return $field;
-	}
-
-	private static function checkValueType($value, $type) {
-		switch ($type) {
-			case PROFILE_TYPE_ID:
-				return zbx_ctype_digit($value);
-			case PROFILE_TYPE_INT:
-				return zbx_is_int($value);
-			case PROFILE_TYPE_STR:
-				return zbx_strlen($value) <= self::$stringProfileMaxLength;
-			default:
-				return true;
-		}
-	}
-}
-
 /************ CONFIG **************/
 function select_config($cache = true) {
 	global $page;
@@ -468,7 +206,8 @@ function getHistoryUrl($page) {
 	// if url length is greater than db field size, skip history update
 	$historyTableSchema = DB::getSchema('user_history');
 
-	return (zbx_strlen($url) > $historyTableSchema['fields']['url5']['length']) ? '' : $url;
+	// $url is encoded
+	return (strlen($url) > $historyTableSchema['fields']['url5']['length']) ? '' : $url;
 }
 
 function addUserHistory($title, $url) {
diff --git a/frontends/php/include/regexp.inc.php b/frontends/php/include/regexp.inc.php
index 1b44dced733..6148f25913f 100644
--- a/frontends/php/include/regexp.inc.php
+++ b/frontends/php/include/regexp.inc.php
@@ -43,6 +43,8 @@ function addRegexp(array $regexp, array $expressions) {
 		// check required fields
 		$dbFields = array('name' => null, 'test_string' => '');
 
+		validateRegexp($expressions);
+
 		if (!check_db_fields($dbFields, $regexp)) {
 			throw new Exception(_('Incorrect arguments passed to function').' [addRegexp]');
 		}
@@ -74,6 +76,8 @@ function updateRegexp(array $regexp, array $expressions) {
 		$regexpId = $regexp['regexpid'];
 		unset($regexp['regexpid']);
 
+		validateRegexp($expressions);
+
 		// check existence
 		if (!getRegexp($regexpId)) {
 			throw new Exception(_('Regular expression does not exist.'));
@@ -110,6 +114,24 @@ function updateRegexp(array $regexp, array $expressions) {
 	return true;
 }
 
+function validateRegexp($expressions) {
+	$validator = new CRegexValidator(array(
+		'messageInvalid' => _('Regular expression must be a string'),
+		'messageRegex' => _('Incorrect regular expression "%1$s": "%2$s"')
+	));
+
+	foreach ($expressions as $expression) {
+		if ($expression['expression_type'] == EXPRESSION_TYPE_TRUE ||
+			$expression['expression_type'] == EXPRESSION_TYPE_FALSE) {
+
+			if (!$validator->validate($expression['expression'])) {
+				throw new \Exception($validator->getError());
+			}
+		}
+	}
+
+}
+
 /**
  * Rewrite Zabbix regexp expressions.
  * If all fields are equal to existing expression, that expression is not touched.
diff --git a/frontends/php/include/reports.inc.php b/frontends/php/include/reports.inc.php
index 0fbb88fad3a..ca7965c6768 100644
--- a/frontends/php/include/reports.inc.php
+++ b/frontends/php/include/reports.inc.php
@@ -27,18 +27,19 @@
  * @return object $reportForm
  */
 function valueDistributionFormForMultiplePeriods($items = array()) {
-	$config = get_request('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
-	$scaletype = get_request('scaletype', TIMEPERIOD_TYPE_WEEKLY);
+	$config = getRequest('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
+	$scaletype = getRequest('scaletype', TIMEPERIOD_TYPE_WEEKLY);
 
-	$title = get_request('title', _('Report 1'));
-	$xlabel = get_request('xlabel', '');
-	$ylabel = get_request('ylabel', '');
-	$showlegend = get_request('showlegend', 0);
+	$title = getRequest('title', _('Report 1'));
+	$xlabel = getRequest('xlabel', '');
+	$ylabel = getRequest('ylabel', '');
+	$showlegend = getRequest('showlegend', 0);
 
 	$report_timesince = $_REQUEST['report_timesince'];
 	$report_timetill = $_REQUEST['report_timetill'];
 
 	$reportForm = new CFormTable(null, null, 'get');
+	$reportForm->setTableClass('formtable old-filter');
 	$reportForm->setAttribute('name', 'zbx_report');
 	$reportForm->setAttribute('id', 'zbx_report');
 
@@ -137,16 +138,17 @@ function valueDistributionFormForMultiplePeriods($items = array()) {
  * @return object $reportForm
  */
 function valueDistributionFormForMultipleItems($items = array(), $periods = array()){
-	$config = get_request('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
+	$config = getRequest('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
 
-	$title = get_request('title', _('Report 2'));
-	$xlabel = get_request('xlabel', '');
-	$ylabel = get_request('ylabel', '');
+	$title = getRequest('title', _('Report 2'));
+	$xlabel = getRequest('xlabel', '');
+	$ylabel = getRequest('ylabel', '');
 
-	$sorttype = get_request('sorttype', 0);
-	$showlegend = get_request('showlegend', 0);
+	$sorttype = getRequest('sorttype', 0);
+	$showlegend = getRequest('showlegend', 0);
 
 	$reportForm = new CFormTable(null, null, 'get');
+	$reportForm->setTableClass('formtable old-filter');
 	$reportForm->setAttribute('name', 'zbx_report');
 	$reportForm->setAttribute('id', 'zbx_report');
 
@@ -179,7 +181,7 @@ function valueDistributionFormForMultipleItems($items = array(), $periods = arra
 			$color = new CColorCell(null, $period['color']);
 
 			$edit_link = 'popup_period.php?period_id='.$pid.'&config='.BR_DISTRIBUTION_MULTIPLE_ITEMS.
-				'&dstfrm='.$reportForm->getName().'&caption='.$period['caption'].'&report_timesince='.
+				'&dstfrm='.$reportForm->getName().url_param($period['caption'], false, 'caption').'&report_timesince='.
 				$period['report_timesince'].'&report_timetill='.$period['report_timetill'].'&color='.$period['color'];
 
 			$caption = new CSpan($period['caption'], 'link');
@@ -188,8 +190,8 @@ function valueDistributionFormForMultipleItems($items = array(), $periods = arra
 			$periods_table->addRow(array(
 				new CCheckBox('group_pid['.$pid.']'),
 				$caption,
-				zbx_date2str(REPORTS_BAR_REPORT_DATE_FORMAT, $period['report_timesince']),
-				zbx_date2str(REPORTS_BAR_REPORT_DATE_FORMAT, $period['report_timetill']),
+				zbx_date2str(DATE_TIME_FORMAT, $period['report_timesince']),
+				zbx_date2str(DATE_TIME_FORMAT, $period['report_timetill']),
 				$color
 			));
 		}
@@ -266,28 +268,29 @@ function valueDistributionFormForMultipleItems($items = array(), $periods = arra
  * @return object $reportForm
  */
 function valueComparisonFormForMultiplePeriods() {
-	$config = get_request('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
+	$config = getRequest('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
 
-	$title = get_request('title', _('Report 3'));
-	$xlabel = get_request('xlabel', '');
-	$ylabel = get_request('ylabel', '');
+	$title = getRequest('title', _('Report 3'));
+	$xlabel = getRequest('xlabel', '');
+	$ylabel = getRequest('ylabel', '');
 
-	$scaletype = get_request('scaletype', TIMEPERIOD_TYPE_WEEKLY);
-	$avgperiod = get_request('avgperiod', TIMEPERIOD_TYPE_DAILY);
+	$scaletype = getRequest('scaletype', TIMEPERIOD_TYPE_WEEKLY);
+	$avgperiod = getRequest('avgperiod', TIMEPERIOD_TYPE_DAILY);
 
-	$report_timesince = get_request('report_timesince', date(TIMESTAMP_FORMAT_ZERO_TIME, time() - SEC_PER_DAY));
-	$report_timetill = get_request('report_timetill', date(TIMESTAMP_FORMAT_ZERO_TIME));
+	$report_timesince = getRequest('report_timesince', date(TIMESTAMP_FORMAT_ZERO_TIME, time() - SEC_PER_DAY));
+	$report_timetill = getRequest('report_timetill', date(TIMESTAMP_FORMAT_ZERO_TIME));
 
-	$itemId = get_request('itemid', 0);
+	$itemId = getRequest('itemid', 0);
 
-	$hostids = get_request('hostids', array());
+	$hostids = getRequest('hostids', array());
 	$hostids = zbx_toHash($hostids);
-	$showlegend = get_request('showlegend', 0);
+	$showlegend = getRequest('showlegend', 0);
 
-	$palette = get_request('palette', 0);
-	$palettetype = get_request('palettetype', 0);
+	$palette = getRequest('palette', 0);
+	$palettetype = getRequest('palettetype', 0);
 
 	$reportForm = new CFormTable(null,null,'get');
+	$reportForm->setTableClass('formtable old-filter');
 	$reportForm->setAttribute('name','zbx_report');
 	$reportForm->setAttribute('id','zbx_report');
 
@@ -306,7 +309,7 @@ function valueComparisonFormForMultiplePeriods() {
 	$reportForm->addRow(_('Legend'), new CCheckBox('showlegend', $showlegend, null, 1));
 	$reportForm->addVar('sortorder', 0);
 
-	$groupids = get_request('groupids', array());
+	$groupids = getRequest('groupids', array());
 	$group_tb = new CTweenBox($reportForm, 'groupids', $groupids, 10);
 
 	$db_groups = API::HostGroup()->get(array(
@@ -321,7 +324,7 @@ function valueComparisonFormForMultiplePeriods() {
 
 	$reportForm->addRow(_('Groups'), $group_tb->Get(_('Selected groups'), _('Other groups')));
 
-	$groupid = get_request('groupid', 0);
+	$groupid = getRequest('groupid', 0);
 	$cmbGroups = new CComboBox('groupid', $groupid, 'submit()');
 	$cmbGroups->addItem(0, _('All'));
 	foreach ($db_groups as $group) {
@@ -405,7 +408,7 @@ function valueComparisonFormForMultiplePeriods() {
 	$itemidVar = new CVar('itemid', $itemId, 'itemid');
 	$reportForm->addItem($itemidVar);
 
-	$txtCondVal = new CTextBox('item_name', $itemName, 50, 'yes');
+	$txtCondVal = new CTextBox('item_name', $itemName, 50, true);
 	$txtCondVal->setAttribute('id', 'item_name');
 
 	$btnSelect = new CButton('btn1', _('Select'),
@@ -450,7 +453,7 @@ function valueComparisonFormForMultiplePeriods() {
  * @return mixed	valid items array on success or false on failure
  */
 function validateBarReportItems($items = array()) {
-	$config = get_request('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
+	$config = getRequest('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
 
 	if (!isset($items) || !$items) {
 		return false;
@@ -509,10 +512,10 @@ function validateBarReportItems($items = array()) {
 	unset($item);
 
 	// check axis value. 0 = count
-	$calcFncValidator = new CSetValidator(array(
+	$calcFncValidator = new CLimitedSetValidator(array(
 		'values' => array(0, CALC_FNC_MIN, CALC_FNC_AVG, CALC_FNC_MAX)
 	));
-	$axisValidator = new CSetValidator(array(
+	$axisValidator = new CLimitedSetValidator(array(
 		'values' => array(GRAPH_YAXIS_SIDE_LEFT, GRAPH_YAXIS_SIDE_RIGHT)
 	));
 
@@ -579,8 +582,8 @@ function validateBarReportPeriods($periods = array()) {
 			return false;
 		}
 		if (!isset($period['caption']) || zbx_empty($period['caption'])) {
-			$period['caption'] = zbx_date2str(REPORTS_BAR_REPORT_DATE_FORMAT, $period['report_timesince']).' - '.
-				zbx_date2str(REPORTS_BAR_REPORT_DATE_FORMAT, $period['report_timetill']);
+			$period['caption'] = zbx_date2str(DATE_TIME_FORMAT, $period['report_timesince']).' - '.
+				zbx_date2str(DATE_TIME_FORMAT, $period['report_timetill']);
 		}
 
 	}
diff --git a/frontends/php/include/schema.inc.php b/frontends/php/include/schema.inc.php
index 52b0da9c821..ca3f4b2f2f4 100644
--- a/frontends/php/include/schema.inc.php
+++ b/frontends/php/include/schema.inc.php
@@ -57,7 +57,7 @@ return array(
 			'host' => array(
 				'null' => false,
 				'type' => DB::FIELD_TYPE_CHAR,
-				'length' => 64,
+				'length' => 128,
 				'default' => '',
 			),
 			'status' => array(
@@ -220,7 +220,7 @@ return array(
 			'name' => array(
 				'null' => false,
 				'type' => DB::FIELD_TYPE_CHAR,
-				'length' => 64,
+				'length' => 128,
 				'default' => '',
 			),
 			'flags' => array(
@@ -434,13 +434,13 @@ return array(
 				'null' => false,
 				'type' => DB::FIELD_TYPE_INT,
 				'length' => 10,
-				'default' => '0',
+				'default' => '1',
 			),
 			'rowspan' => array(
 				'null' => false,
 				'type' => DB::FIELD_TYPE_INT,
 				'length' => 10,
-				'default' => '0',
+				'default' => '1',
 			),
 			'elements' => array(
 				'null' => false,
@@ -490,6 +490,12 @@ return array(
 				'length' => 255,
 				'default' => '',
 			),
+			'max_columns' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_INT,
+				'length' => 10,
+				'default' => '1',
+			),
 		),
 	),
 	'slideshows' => array(
@@ -803,6 +809,41 @@ return array(
 				'length' => 10,
 				'default' => '1',
 			),
+			'ssl_cert_file' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_CHAR,
+				'length' => 255,
+				'default' => '',
+			),
+			'ssl_key_file' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_CHAR,
+				'length' => 255,
+				'default' => '',
+			),
+			'ssl_key_password' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_CHAR,
+				'length' => 64,
+				'default' => '',
+			),
+			'verify_peer' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_INT,
+				'length' => 10,
+				'default' => '0',
+			),
+			'verify_host' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_INT,
+				'length' => 10,
+				'default' => '0',
+			),
+			'headers' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_TEXT,
+				'default' => '',
+			),
 		),
 	),
 	'httpstep' => array(
@@ -835,14 +876,14 @@ return array(
 			'url' => array(
 				'null' => false,
 				'type' => DB::FIELD_TYPE_CHAR,
-				'length' => 255,
+				'length' => 2048,
 				'default' => '',
 			),
 			'timeout' => array(
 				'null' => false,
 				'type' => DB::FIELD_TYPE_INT,
 				'length' => 10,
-				'default' => '30',
+				'default' => '15',
 			),
 			'posts' => array(
 				'null' => false,
@@ -866,6 +907,23 @@ return array(
 				'type' => DB::FIELD_TYPE_TEXT,
 				'default' => '',
 			),
+			'follow_redirects' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_INT,
+				'length' => 10,
+				'default' => '1',
+			),
+			'retrieve_mode' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_INT,
+				'length' => 10,
+				'default' => '0',
+			),
+			'headers' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_TEXT,
+				'default' => '',
+			),
 		),
 	),
 	'interface' => array(
@@ -919,6 +977,12 @@ return array(
 				'length' => 64,
 				'default' => '10050',
 			),
+			'bulk' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_INT,
+				'length' => 10,
+				'default' => '1',
+			),
 		),
 	),
 	'valuemaps' => array(
@@ -1069,7 +1133,7 @@ return array(
 			'error' => array(
 				'null' => false,
 				'type' => DB::FIELD_TYPE_CHAR,
-				'length' => 128,
+				'length' => 2048,
 				'default' => '',
 			),
 			'lastlogsize' => array(
@@ -1642,6 +1706,12 @@ return array(
 				'type' => DB::FIELD_TYPE_TEXT,
 				'default' => '',
 			),
+			'formula' => array(
+				'null' => false,
+				'type' => DB::FIELD_TYPE_CHAR,
+				'length' => 255,
+				'default' => '',
+			),
 		),
 	),
 	'operations' => array(
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index 119d706e865..f3ca6350133 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -41,7 +41,9 @@ function screen_resources($resource = null) {
 		SCREEN_RESOURCE_SYSTEM_STATUS => _('System status'),
 		SCREEN_RESOURCE_TRIGGERS_INFO => _('Triggers info'),
 		SCREEN_RESOURCE_TRIGGERS_OVERVIEW => _('Triggers overview'),
-		SCREEN_RESOURCE_URL => _('Url')
+		SCREEN_RESOURCE_URL => _('URL'),
+		SCREEN_RESOURCE_LLD_GRAPH => _('Graph prototype'),
+		SCREEN_RESOURCE_LLD_SIMPLE_GRAPH => _('Simple graph prototype')
 	);
 
 	if (is_null($resource)) {
diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php
index 6440f704134..aa0b5dd6b2e 100644
--- a/frontends/php/include/services.inc.php
+++ b/frontends/php/include/services.inc.php
@@ -19,40 +19,6 @@
 **/
 
 
-/*
- * Function: get_service_status
- *
- * Description:
- *     Retrieve true status
- *
- * Author:
- *     Aly
- *
- * Comments:
- *		Don't forget to sync code with C!!!!
- */
-function get_service_status($serviceid, $algorithm, $triggerid = null, $status = 0) {
-	if (is_numeric($triggerid)) {
-		$status = ($serv_status = get_service_status_of_trigger($triggerid)) ? $serv_status : $status;
-	}
-
-	if ($algorithm == SERVICE_ALGORITHM_MAX || $algorithm == SERVICE_ALGORITHM_MIN) {
-		$sort_order = ($algorithm == SERVICE_ALGORITHM_MAX) ? ' DESC' : '';
-
-		$result = DBselect(
-			'SELECT s.status'.
-			' FROM services s,services_links l'.
-			' WHERE l.serviceupid='.zbx_dbstr($serviceid).
-				' AND s.serviceid=l.servicedownid'.
-			' ORDER BY s.status'.$sort_order
-		);
-		if ($row = DBfetch($result)) {
-			$status = $row['status'];
-		}
-	}
-	return $status;
-}
-
 function serviceAlgorythm($algorythm = null) {
 	$algorythms = array(
 		SERVICE_ALGORITHM_MAX => _('Problem, if at least one child has a problem'),
@@ -332,125 +298,161 @@ function createServiceMonitoringTree(array $services, array $slaData, $period, &
 }
 
 /**
- * Recalculates the status of the given service and it's parents.
- *
- * Note: this function does not update the status based on the status of the linked trigger,
- * the status is calculated only based on the status of the child services.
+ * Calculates the current IT service status based on it's child services.
  *
- * @param $serviceid
+ * The new statuses are written to the $services array in the "newStatus" property.
  *
- * @return bool
+ * @param string $rootServiceId     id of the service to start calculation from
+ * @param array $servicesLinks      array with service IDs as keys and arrays of child service IDs as values
+ * @param array $services           array of services with IDs as keys
+ * @param array $triggers           array of triggers with trigger IDs as keys
  */
-function update_services_rec($serviceid) {
-	$result = DBselect(
-		'SELECT l.serviceupid,s.algorithm'.
-		' FROM services_links l,services s'.
-		' WHERE s.serviceid=l.serviceupid'.
-			' AND l.servicedownid='.zbx_dbstr($serviceid)
-	);
-	while ($row = DBfetch($result)) {
-		$serviceupid = $row['serviceupid'];
-		$algorithm = $row['algorithm'];
+function calculateItServiceStatus($rootServiceId, array $servicesLinks, array &$services, array $triggers) {
+	$service = &$services[$rootServiceId];
 
-		if ($algorithm == SERVICE_ALGORITHM_MAX || $algorithm == SERVICE_ALGORITHM_MIN) {
-			$status = get_service_status($serviceupid, $algorithm);
-			add_service_alarm($serviceupid, $status, time());
-			DBexecute('UPDATE services SET status='.$status.' WHERE serviceid='.zbx_dbstr($serviceupid));
-		}
-		elseif ($algorithm != SERVICE_ALGORITHM_NONE) {
-			error(_('Unknown calculation algorithm of service status').SPACE.'['.$algorithm.']');
-			return false;
+	// don't calculate a thread if it is already calculated
+	// it can be with soft links
+	if (isset($service['newStatus'])) {
+		return;
+	}
+
+	$newStatus = SERVICE_STATUS_OK;
+
+	// leaf service with a trigger
+	if ($service['triggerid'] != 0) {
+		if ($service['algorithm'] != SERVICE_ALGORITHM_NONE) {
+			$trigger = $triggers[$service['triggerid']];
+			$newStatus = calculateItServiceStatusByTrigger($trigger['status'], $trigger['value'], $trigger['priority']);
 		}
 	}
+	elseif (isset($servicesLinks[$rootServiceId])) {
+		// calculate status depending on children status
+		$statuses = array();
 
-	$result = DBselect('SELECT sl.serviceupid FROM services_links sl WHERE sl.servicedownid='.zbx_dbstr($serviceid));
-	while ($row = DBfetch($result)) {
-		$serviceupid = $row['serviceupid'];
-		update_services_rec($serviceupid); // ATTENTION: recursion!!!
+		foreach ($servicesLinks[$rootServiceId] as $rootServiceId) {
+			calculateItServiceStatus($rootServiceId, $servicesLinks, $services, $triggers);
+			$statuses[] = $services[$rootServiceId]['newStatus'];
+		}
+
+		if ($statuses && $service['algorithm'] != SERVICE_ALGORITHM_NONE) {
+			$maxSeverity = max($statuses);
+
+			// always return the maximum status of child services
+			if ($service['algorithm'] == SERVICE_ALGORITHM_MAX && $maxSeverity != SERVICE_STATUS_OK) {
+				$newStatus = $maxSeverity;
+			}
+			elseif (min($statuses) != SERVICE_STATUS_OK) {
+				$newStatus = $maxSeverity;
+			}
+		}
 	}
+
+	$service['newStatus'] = $newStatus;
 }
 
 /**
- * Retrieves the service linked to given trigger, sets it's status to $status and propagates the status change
- * to the parent services.
+ * Checks the status of the trigger and returns the corresponding service status.
+ *
+ * @param int $triggerStatus
+ * @param int $triggerValue
+ * @param int $triggerPriority
  *
- * @param string $triggerId
- * @param int    $status
+ * @return int
  */
-function updateServices($triggerId, $status) {
-	DBexecute('UPDATE services SET status='.zbx_dbstr($status).' WHERE triggerid='.zbx_dbstr($triggerId));
-
-	$result = DBselect('SELECT s.serviceid FROM services s WHERE s.triggerid='.zbx_dbstr($triggerId));
-
-	while ($row = DBfetch($result)) {
-		add_service_alarm($row['serviceid'], $status, time());
-		update_services_rec($row['serviceid']);
+function calculateItServiceStatusByTrigger($triggerStatus, $triggerValue, $triggerPriority) {
+	if ($triggerStatus == TRIGGER_STATUS_DISABLED || $triggerValue == TRIGGER_VALUE_FALSE) {
+		return SERVICE_STATUS_OK;
 	}
+
+	return $triggerPriority;
 }
 
-/*
- * Function: update_services_status_all
- *
- * Description:
- * Cleaning parent nodes from triggers, updating ALL services status.
- *
- * Comments: !!! Don't forget sync code with C !!!
- *
+/**
+ * Updates the status of all IT services
  */
-function update_services_status_all() {
-	$result = DBselect(
-		'SELECT s.serviceid,s.algorithm,s.triggerid'.
-		' FROM services s'.
-		' WHERE s.serviceid NOT IN ('.
-			'SELECT DISTINCT sl.serviceupid'.
-			' FROM services_links sl'.
-		')'
-	);
+function updateItServices() {
+	$servicesLinks = array();
+	$services = array();
+	$rootServiceIds = array();
+	$triggers = array();
+
+	// auxiliary arrays
+	$triggerIds = array();
+	$servicesLinksDown = array();
+
+	$result = DBselect('SELECT sl.serviceupid,sl.servicedownid FROM services_links sl');
+
 	while ($row = DBfetch($result)) {
-		$status = get_service_status($row['serviceid'], $row['algorithm'], $row['triggerid']);
-		DBexecute('UPDATE services SET status='.$status.' WHERE serviceid='.$row['serviceid']);
-		add_service_alarm($row['serviceid'], $status, time());
+		$servicesLinks[$row['serviceupid']][] = $row['servicedownid'];
+		$servicesLinksDown[$row['servicedownid']] = true;
 	}
 
-	$result = DBselect(
-		'SELECT MAX(sl.servicedownid) AS serviceid,sl.serviceupid'.
-		' FROM services_links sl'.
-		' WHERE sl.servicedownid NOT IN ('.
-			'SELECT DISTINCT sl.serviceupid FROM services_links sl'.
-		')'.
-		' GROUP BY sl.serviceupid'
-	);
+	$result = DBselect('SELECT s.serviceid,s.algorithm,s.triggerid,s.status FROM services s ORDER BY s.serviceid');
+
 	while ($row = DBfetch($result)) {
-		update_services_rec($row['serviceid']);
+		$services[$row['serviceid']] = array(
+			'serviceid' => $row['serviceid'],
+			'algorithm' => $row['algorithm'],
+			'triggerid' => $row['triggerid'],
+			'status' => $row['status']
+		);
+
+		if (!isset($servicesLinksDown[$row['serviceid']])) {
+			$rootServiceIds[] = $row['serviceid'];
+		}
+
+		if ($row['triggerid'] != 0) {
+			$triggerIds[$row['triggerid']] = true;
+		}
 	}
-}
 
-/******************************************************************************
- *                                                                            *
- * Comments: !!! Don't forget sync code with C !!!                            *
- *                                                                            *
- ******************************************************************************/
-function latest_service_alarm($serviceid, $status) {
-	$result = DBselect(
-		'SELECT sa.servicealarmid,sa.value'.
-		' FROM service_alarms sa'.
-		' WHERE sa.serviceid='.zbx_dbstr($serviceid).
-		' ORDER BY sa.servicealarmid DESC', 1
-	);
-	$row = DBfetch($result);
-	return ($row && $row['value'] == $status);
-}
+	if ($triggerIds) {
+		$result = DBselect(
+			'SELECT t.triggerid,t.priority,t.status,t.value'.
+			' FROM triggers t'.
+			' WHERE '.dbConditionInt('t.triggerid', array_keys($triggerIds))
+		);
+
+		while ($row = DBfetch($result)) {
+			$triggers[$row['triggerid']] = array(
+				'priority' => $row['priority'],
+				'status' => $row['status'],
+				'value' => $row['value']
+			);
+		}
+	}
+
+	// clearing auxiliary variables
+	unset($triggerIds, $servicesLinksDown);
+
+	// calculating data
+	foreach ($rootServiceIds as $rootServiceId) {
+		calculateItServiceStatus($rootServiceId, $servicesLinks, $services, $triggers);
+	}
+
+	// updating changed data
+	$updates = array();
+	$inserts = array();
+	$clock = time();
+
+	foreach ($services as $service) {
+		if ($service['newStatus'] != $service['status']) {
+			$updates[] = array(
+				'values' => array('status' => $service['newStatus']),
+				'where' =>  array('serviceid' => $service['serviceid'])
+			);
+			$inserts[] = array(
+				'serviceid' => $service['serviceid'],
+				'clock' => $clock,
+				'value' => $service['newStatus']
+			);
+		}
+	}
 
-/******************************************************************************
- *                                                                            *
- * Comments: !!! Don't forget sync code with C !!!                            *
- *                                                                            *
- ******************************************************************************/
-function add_service_alarm($serviceid, $status, $clock) {
-	if (latest_service_alarm($serviceid, $status)) {
-		return true;
+	if ($updates) {
+		DB::update('services', $updates);
+		DB::insert('service_alarms', $inserts);
 	}
-	return DBexecute('INSERT INTO service_alarms (servicealarmid,serviceid,clock,value) VALUES ('.get_dbid('service_alarms', 'servicealarmid').','.zbx_dbstr($serviceid).','.zbx_dbstr($clock).','.zbx_dbstr($status).')');
 }
 
 /**
diff --git a/frontends/php/include/translateDefines.inc.php b/frontends/php/include/translateDefines.inc.php
index bccf2500581..acdef76f332 100644
--- a/frontends/php/include/translateDefines.inc.php
+++ b/frontends/php/include/translateDefines.inc.php
@@ -24,28 +24,11 @@
  */
 define('UNRESOLVED_MACRO_STRING', '*'._('UNKNOWN').'*');
 
-// date formats
-define('HISTORY_OF_ACTIONS_DATE_FORMAT', _('d M Y H:i:s'));
-define('EVENT_ACTION_MESSAGES_DATE_FORMAT', _('d M Y H:i:s'));
-define('EVENT_ACTION_CMDS_DATE_FORMAT', _('Y.M.d H:i:s'));
-define('HISTORY_LOG_LOCALTIME_DATE_FORMAT', _('Y.M.d H:i:s'));
-define('HISTORY_LOG_ITEM_PLAINTEXT', _('Y-m-d H:i:s'));
-define('HISTORY_PLAINTEXT_DATE_FORMAT', _('Y-m-d H:i:s'));
-define('HISTORY_ITEM_DATE_FORMAT', _('Y.M.d H:i:s'));
-define('EVENTS_DISCOVERY_TIME_FORMAT', _('d M Y H:i:s'));
-define('EVENTS_ACTION_TIME_FORMAT', _('d M Y H:i:s'));
-define('QUEUE_NODES_DATE_FORMAT', _('d M Y H:i:s'));
-define('CHARTBAR_HOURLY_DATE_FORMAT', _('Y.m.d H:i'));
-define('CHARTBAR_DAILY_DATE_FORMAT', _('Y.m.d'));
-// GETTEXT: Date format (year). Do not translate.
-define('REPORT4_ANNUALLY_DATE_FORMAT', _x('Y', 'date format'));
-define('REPORT4_MONTHLY_DATE_FORMAT', _('M Y'));
-define('REPORT4_DAILY_DATE_FORMAT', _('d M Y'));
-define('REPORT4_WEEKLY_DATE_FORMAT', _('d M Y H:i'));
-define('FILTER_TIMEBAR_DATE_FORMAT', _('d M Y H:i'));
-define('REPORTS_BAR_REPORT_DATE_FORMAT', _('d M Y H:i:s'));
-define('POPUP_PERIOD_CAPTION_DATE_FORMAT', _('d M Y H:i:s'));
-define('MAPS_DATE_FORMAT', _('Y.m.d H:i:s'));
-define('SERVER_INFO_DATE_FORMAT', _('D, d M Y H:i:s O'));
-define('XML_DATE_DATE_FORMAT', _('d.m.y'));
-define('XML_TIME_DATE_FORMAT', _('H.i'));
+/**
+ * Date and time formats.
+ */
+define('DATE_TIME_FORMAT_SECONDS', _('Y-m-d H:i:s'));
+define('DATE_TIME_FORMAT', _('Y-m-d H:i'));
+define('DATE_FORMAT', _('Y-m-d'));
+define('TIME_FORMAT_SECONDS', _('H:i:s'));
+define('TIME_FORMAT', _('H:i'));
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index d00c70e0d26..ff155e50972 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -103,18 +103,6 @@ function getSeverityCell($severity, $text = null, $force_normal = false) {
 	return new CCol($text, getSeverityStyle($severity, !$force_normal));
 }
 
-// retrieve trigger's priority for services
-function get_service_status_of_trigger($triggerid) {
-	$sql = 'SELECT t.triggerid,t.priority'.
-			' FROM triggers t'.
-			' WHERE t.triggerid='.zbx_dbstr($triggerid).
-				' AND t.status='.TRIGGER_STATUS_ENABLED.
-				' AND t.value='.TRIGGER_VALUE_TRUE;
-	$rows = DBfetch(DBselect($sql, 1));
-
-	return !empty($rows['priority']) ? $rows['priority'] : 0;
-}
-
 /**
  * Add color style and blinking to an object like CSpan or CDiv depending on trigger status
  * Settings and colors are kept in 'config' database table
@@ -459,7 +447,7 @@ function copyTriggersToHosts($srcTriggerIds, $dstHostIds, $srcHostId = null) {
 		$dependencies = array();
 		foreach ($dbSrcTriggers as $srcTrigger) {
 			if ($srcTrigger['dependencies']) {
-				// get coresponding created trigger id
+				// get corresponding created trigger id
 				$newTrigger = $newTriggers[$srcTrigger['triggerid']];
 
 
@@ -531,161 +519,19 @@ function copyTriggersToHosts($srcTriggerIds, $dstHostIds, $srcHostId = null) {
 	return true;
 }
 
-/**
- * Function split trigger expresion by '&' and '|', that all elements from first level would be separated.
- *
- * @param string $expresion		trigger expresion
- *
- * @return array
- */
-function splitByFirstLevel($expresion) {
-	$pos = 0;
-	$level = 0;
-
-	while (isset($expresion[$pos])) {
-		switch ($expresion[$pos]) {
-			case '(':
-				++$level;
-				break;
-			case ')':
-				--$level;
-				break;
-			case '&':
-			case '|':
-				if (!$level) {
-					$tmpArr[] = trim(substr($expresion, 0, $pos));
-					$expresion = substr($expresion, $pos + 1);
-					$pos = -1;
-				}
-				break;
-			default:
-				break;
-		}
-		++$pos;
-	}
-
-	if ($expresion) {
-		$tmpArr[] = trim($expresion);
-	}
-
-	return $tmpArr;
-}
-
-function construct_expression($itemid, $expressions) {
-	$complite_expr = '';
-	$item = get_item_by_itemid($itemid);
-	$host = get_host_by_itemid($itemid);
-	$prefix = $host['host'].':'.$item['key_'].'.';
-
-	if (empty($expressions)) {
-		error(_('Expression cannot be empty'));
-		return false;
-	}
-
-	$ZBX_PREG_EXPESSION_FUNC_FORMAT = '^(['.ZBX_PREG_PRINT.']*)([&|]{1})[(]*(([a-zA-Z_.\$]{6,7})(\\((['.ZBX_PREG_PRINT.']+?){0,1}\\)))(['.ZBX_PREG_PRINT.']*)$';
-	$functions = array('regexp' => 1, 'iregexp' => 1);
-	$expr_array = array();
-	$cexpor = 0;
-	$startpos = -1;
-
-	foreach ($expressions as $expression) {
-		$expression['value'] = preg_replace('/\s+(AND){1,2}\s+/U', '&', $expression['value']);
-		$expression['value'] = preg_replace('/\s+(OR){1,2}\s+/U', '|', $expression['value']);
-
-		if ($expression['type'] == REGEXP_INCLUDE) {
-			if (!empty($complite_expr)) {
-				$complite_expr.=' | ';
-			}
-			if ($cexpor == 0) {
-				$startpos = zbx_strlen($complite_expr);
-			}
-			$cexpor++;
-			$eq_global = '#0';
-		}
-		else {
-			if (($cexpor > 1) & ($startpos >= 0)) {
-				$head = substr($complite_expr, 0, $startpos);
-				$tail = substr($complite_expr, $startpos);
-				$complite_expr = $head.'('.$tail.')';
-			}
-			$cexpor = 0;
-			$eq_global = '=0';
-			if (!empty($complite_expr)) {
-				$complite_expr.=' & ';
-			}
-		}
-
-		$expr = '&'.$expression['value'];
-		$expr = preg_replace('/\s+(\&|\|){1,2}\s+/U', '$1', $expr);
-
-		$expr_array = array();
-		$sub_expr_count=0;
-		$sub_expr = '';
-		$multi = preg_match('/.+(&|\|).+/', $expr);
-
-		while (preg_match('/'.$ZBX_PREG_EXPESSION_FUNC_FORMAT.'/i', $expr, $arr)) {
-			$arr[4] = zbx_strtolower($arr[4]);
-			if (!isset($functions[$arr[4]])) {
-				error(_('Incorrect function is used').'. ['.$expression['value'].']');
-				return false;
-			}
-			$expr_array[$sub_expr_count]['eq'] = trim($arr[2]);
-			$expr_array[$sub_expr_count]['regexp'] = zbx_strtolower($arr[4]).$arr[5];
-
-			$sub_expr_count++;
-			$expr = $arr[1];
-		}
-
-		if (empty($expr_array)) {
-			error(_('Incorrect trigger expression').'. ['.$expression['value'].']');
-			return false;
-		}
-
-		$expr_array[$sub_expr_count-1]['eq'] = '';
-
-		$sub_eq = '';
-		if ($multi > 0) {
-			$sub_eq = $eq_global;
-		}
-
-		foreach ($expr_array as $id => $expr) {
-			if ($multi > 0) {
-				$sub_expr = $expr['eq'].'({'.$prefix.$expr['regexp'].'})'.$sub_eq.$sub_expr;
-			}
-			else {
-				$sub_expr = $expr['eq'].'{'.$prefix.$expr['regexp'].'}'.$sub_eq.$sub_expr;
-			}
-		}
-
-		if ($multi > 0) {
-			$complite_expr .= '('.$sub_expr.')';
-		}
-		else {
-			$complite_expr .= '(('.$sub_expr.')'.$eq_global.')';
-		}
-	}
-
-	if (($cexpor > 1) & ($startpos >= 0)) {
-		$head = substr($complite_expr, 0, $startpos);
-		$tail = substr($complite_expr, $startpos);
-		$complite_expr = $head.'('.$tail.')';
-	}
-
-	return $complite_expr;
-}
-
 /********************************************************************************
- *																				*
- * Purpose: Translate {10}>10 to something like localhost:procload.last(0)>10	*
- *																				*
- * Comments: !!! Don't forget sync code with C !!!								*
- *																				*
+ *                                                                              *
+ * Purpose: Translate {10}>10 to something like                                 *
+ * localhost:system.cpu.load.last(0)>10                                         *
+ *                                                                              *
+ * Comments: !!! Don't forget sync code with C !!!                              *
+ *                                                                              *
  *******************************************************************************/
 function explode_exp($expressionCompressed, $html = false, $resolveMacro = false, $sourceHost = null, $destinationHost = null) {
 	$expressionExpanded = $html ? array() : '';
 	$trigger = array();
 
-	for ($i = 0, $state = '', $max = zbx_strlen($expressionCompressed); $i < $max; $i++) {
+	for ($i = 0, $state = '', $max = strlen($expressionCompressed); $i < $max; $i++) {
 		if ($expressionCompressed[$i] == '{') {
 			if ($expressionCompressed[$i + 1] == '$') {
 				$state = 'USERMACRO';
@@ -992,9 +838,9 @@ function triggerExpression($trigger, $html = false) {
 /**
  * Implodes expression, replaces names and keys with IDs.
  *
- * Fro example: localhost:procload.last(0)>10 will translated to {12}>10 and created database representation.
+ * For example: localhost:system.cpu.load.last(0)>10 will be translated to {12}>10 and created database representation.
  *
- * @throws Exception if error occureed
+ * @throws Exception if error occurred
  *
  * @param string $expression Full expression with host names and item keys
  * @param numeric $triggerid
@@ -1011,7 +857,7 @@ function implode_exp($expression, $triggerId, &$hostnames = array()) {
 	$newFunctions = array();
 	$functions = array();
 	$items = array();
-	$triggerFunctionValidator = new CTriggerFunctionValidator();
+	$triggerFunctionValidator = new CFunctionValidator();
 
 	foreach ($expressionData->expressions as $exprPart) {
 		if (isset($newFunctions[$exprPart['expression']])) {
@@ -1164,83 +1010,59 @@ function replace_template_dependencies($deps, $hostid) {
 /**
  * Creates and returns the trigger overview table for the given hosts.
  *
- * @param array  $hostIds
- * @param string $application	name of application to filter
- * @param string $pageFile		the page where the element is displayed
- * @param int    $viewMode		table display style: either hosts on top, or host on the left side
- * @param string $screenId		the ID of the screen, that contains the trigger overview table
+ * @param array  	$hosts							an array of hosts with host IDs as keys
+ * @param string 	$hosts[hostid][name]
+ * @param string 	$hosts[hostid][hostid]
+ * @param array		$triggers
+ * @param string	$triggers[][triggerid]
+ * @param string	$triggers[][description]
+ * @param string	$triggers[][expression]
+ * @param int		$triggers[][value]
+ * @param int		$triggers[][lastchange]
+ * @param int		$triggers[][flags]
+ * @param array		$triggers[][url]
+ * @param int		$triggers[][priority]
+ * @param array		$triggers[][hosts]
+ * @param string	$triggers[][hosts][][hostid]
+ * @param string	$triggers[][hosts][][name]
+ * @param string 	$pageFile						the page where the element is displayed
+ * @param int    	$viewMode						table display style: either hosts on top, or host on the left side
+ * @param string 	$screenId						the ID of the screen, that contains the trigger overview table
  *
  * @return CTableInfo
  */
-function getTriggersOverview($hostIds, $application, $pageFile, $viewMode = null, $screenId = null) {
-	if (is_null($viewMode)) {
-		$viewMode = CProfile::get('web.overview.view.style', STYLE_TOP);
-	}
-
-	// get application ids
-	$applicationIds = null;
-	if ($application !== '') {
-		$dbApplications = API::Application()->get(array(
-			'hostids' => $hostIds,
-			'filter' => array('name' => $application),
-			'output' => array('applicationid')
-		));
-		$applicationIds = zbx_objectValues($dbApplications, 'applicationid');
-		$hostIds = null;
-	}
-
-	// get triggers
-	$dbTriggers = API::Trigger()->get(array(
-		'hostids' => $hostIds,
-		'applicationids' => $applicationIds,
-		'monitored' => true,
-		'skipDependent' => true,
-		'output' => API_OUTPUT_EXTEND,
-		'selectHosts' => array('hostid', 'name'),
-		'sortfield' => 'description'
-	));
-
-	// get hosts
-	$hostIds = array();
-	foreach ($dbTriggers as $trigger) {
-		$host = reset($trigger['hosts']);
-
-		$hostIds[$host['hostid']] = $host['hostid'];
-	}
-
-	$hosts = API::Host()->get(array(
-		'output' => array('name', 'hostid', 'status'),
-		'hostids' => $hostIds,
-		'preservekeys' => true,
-		'selectGraphs' => API_OUTPUT_COUNT,
-		'selectScreens' => ($viewMode == STYLE_LEFT) ? API_OUTPUT_COUNT : null
-	));
-
-	$triggers = array();
+function getTriggersOverview(array $hosts, array $triggers, $pageFile, $viewMode = null, $screenId = null) {
+	$data = array();
 	$hostNames = array();
 
-	foreach ($dbTriggers as $trigger) {
-		$host = reset($trigger['hosts']);
-
+	foreach ($triggers as $trigger) {
 		$trigger['description'] = CMacrosResolverHelper::resolveTriggerReference($trigger['expression'], $trigger['description']);
-		$hostNames[$host['hostid']] = $host['name'];
-
-		// a little tricky check for attempt to overwrite active trigger (value=1) with
-		// inactive or active trigger with lower priority.
-		if (!isset($triggers[$trigger['description']][$host['name']])
-				|| (($triggers[$trigger['description']][$host['name']]['value'] == TRIGGER_VALUE_FALSE && $trigger['value'] == TRIGGER_VALUE_TRUE)
-					|| (($triggers[$trigger['description']][$host['name']]['value'] == TRIGGER_VALUE_FALSE || $trigger['value'] == TRIGGER_VALUE_TRUE)
-						&& $trigger['priority'] > $triggers[$trigger['description']][$host['name']]['priority']))) {
-			$triggers[$trigger['description']][$host['name']] = array(
-				'hostid' => $host['hostid'],
-				'triggerid' => $trigger['triggerid'],
-				'value' => $trigger['value'],
-				'lastchange' => $trigger['lastchange'],
-				'priority' => $trigger['priority'],
-				'flags' => $trigger['flags'],
-				'url' => $trigger['url'],
-				'hosts' => array($host)
-			);
+
+		foreach ($trigger['hosts'] as $host) {
+			// triggers may belong to hosts that are filtered out and shouldn't be displayed, skip them
+			if (!isset($hosts[$host['hostid']])) {
+				continue;
+			}
+
+			$hostNames[$host['hostid']] = $host['name'];
+
+			// a little tricky check for attempt to overwrite active trigger (value=1) with
+			// inactive or active trigger with lower priority.
+			if (!isset($data[$trigger['description']][$host['name']])
+					|| (($data[$trigger['description']][$host['name']]['value'] == TRIGGER_VALUE_FALSE && $trigger['value'] == TRIGGER_VALUE_TRUE)
+						|| (($data[$trigger['description']][$host['name']]['value'] == TRIGGER_VALUE_FALSE || $trigger['value'] == TRIGGER_VALUE_TRUE)
+							&& $trigger['priority'] > $data[$trigger['description']][$host['name']]['priority']))) {
+				$data[$trigger['description']][$host['name']] = array(
+					'hostid' => $host['hostid'],
+					'triggerid' => $trigger['triggerid'],
+					'value' => $trigger['value'],
+					'lastchange' => $trigger['lastchange'],
+					'priority' => $trigger['priority'],
+					'flags' => $trigger['flags'],
+					'url' => $trigger['url'],
+					'hosts' => array($host)
+				);
+			}
 		}
 	}
 
@@ -1265,7 +1087,7 @@ function getTriggersOverview($hostIds, $application, $pageFile, $viewMode = null
 		$triggerTable->setHeader($header, 'vertical_header');
 
 		// data
-		foreach ($triggers as $description => $triggerHosts) {
+		foreach ($data as $description => $triggerHosts) {
 			$columns = array(nbsp($description));
 
 			foreach ($hostNames as $hostName) {
@@ -1283,7 +1105,7 @@ function getTriggersOverview($hostIds, $application, $pageFile, $viewMode = null
 		// header
 		$header = array(new CCol(_('Host'), 'center'));
 
-		foreach ($triggers as $description => $triggerHosts) {
+		foreach ($data as $description => $triggerHosts) {
 			$header[] = new CCol($description, 'vertical_rotation');
 		}
 
@@ -1297,7 +1119,7 @@ function getTriggersOverview($hostIds, $application, $pageFile, $viewMode = null
 			$name->setMenuPopup(CMenuPopupHelper::getHost($hosts[$hostId], $scripts[$hostId]));
 
 			$columns = array($name);
-			foreach ($triggers as $triggerHosts) {
+			foreach ($data as $triggerHosts) {
 				$columns[] = getTriggerOverviewCells(
 					isset($triggerHosts[$hostName]) ? $triggerHosts[$hostName] : null,
 					$pageFile,
@@ -1379,7 +1201,7 @@ function getTriggerOverviewCells($trigger, $pageFile, $screenId = null) {
 				'name' => $dbItem['name_expanded'],
 				'params' => array(
 					'action' => in_array($dbItem['value_type'], array(ITEM_VALUE_TYPE_FLOAT, ITEM_VALUE_TYPE_UINT64))
-						? 'showgraph' : 'showlatest',
+						? HISTORY_GRAPH : HISTORY_VALUES,
 					'itemid' => $dbItem['itemid'],
 					'period' => 3600
 				)
@@ -1402,9 +1224,9 @@ function getTriggerOverviewCells($trigger, $pageFile, $screenId = null) {
 		}
 
 		if ($isDependencyFound) {
-			$icon = new Cimg('images/general/arrow_down2.png', 'DEP_DOWN');
+			$icon = new CImg('images/general/arrow_down2.png', 'DEP_DOWN');
 			$icon->setAttribute('style', 'vertical-align: middle; border: 0px;');
-			$icon->setHint($dependencyTable, '', '', false);
+			$icon->setHint($dependencyTable, '', false);
 
 			$desc[] = $icon;
 		}
@@ -1422,9 +1244,9 @@ function getTriggerOverviewCells($trigger, $pageFile, $screenId = null) {
 		}
 
 		if ($isDependencyFound) {
-			$icon = new Cimg('images/general/arrow_up2.png', 'DEP_UP');
+			$icon = new CImg('images/general/arrow_up2.png', 'DEP_UP');
 			$icon->setAttribute('style', 'vertical-align: middle; border: none;');
-			$icon->setHint($dependencyTable, '', '', false);
+			$icon->setHint($dependencyTable, '', false);
 
 			$desc[] = $icon;
 		}
@@ -1627,7 +1449,8 @@ function make_trigger_details($trigger) {
 	$hosts = API::Host()->get(array(
 		'output' => array('name', 'hostid', 'status'),
 		'hostids' => $hostIds,
-		'selectScreens' => API_OUTPUT_COUNT
+		'selectScreens' => API_OUTPUT_COUNT,
+		'selectGraphs' => API_OUTPUT_COUNT
 	));
 
 	if (count($hosts) > 1) {
@@ -1656,7 +1479,7 @@ function make_trigger_details($trigger) {
 	$table->addRow(array(_('Severity'), getSeverityCell($trigger['priority'])));
 	$table->addRow(array(
 		new CCol(_('Expression')),
-		new CCol(explode_exp($trigger['expression'], true, true), 'wraptext')
+		new CCol(explode_exp($trigger['expression'], true, true), 'trigger-expression')
 	));
 	$table->addRow(array(_('Event generation'), _('Normal').((TRIGGER_MULT_EVENT_ENABLED == $trigger['type'])
 		? SPACE.'+'.SPACE._('Multiple PROBLEM events') : '')));
@@ -1694,15 +1517,16 @@ function analyzeExpression($expression) {
 /**
  * Builds expression html tree
  *
- * @param array $expressionTree output of getExpressionTree() function
- * @param array $next           parameter only for recursive call; should be empty array
- * @param int $letterNum        parameter only for recursive call; should be 0
- * @param int $level            parameter only for recursive call
- * @param string $operand       parameter only for recursive call
+ * @param array 	$expressionTree 	output of getExpressionTree() function
+ * @param array 	$next           	parameter only for recursive call; should be empty array
+ * @param int 		$letterNum      	parameter only for recursive call; should be 0
+ * @param int 		$level          	parameter only for recursive call
+ * @param string 	$operator       	parameter only for recursive call
  *
- * @return bool                 returns true if element is found, false - otherwise
+ * @return array	array containing the trigger expression formula as the first element and an array describing the
+ *					expression tree as the second
  */
-function buildExpressionHtmlTree(array $expressionTree, array &$next, &$letterNum, $level = 0, $operand = null) {
+function buildExpressionHtmlTree(array $expressionTree, array &$next, &$letterNum, $level = 0, $operator = null) {
 	$treeList = array();
 	$outline = '';
 
@@ -1711,11 +1535,11 @@ function buildExpressionHtmlTree(array $expressionTree, array &$next, &$letterNu
 
 	foreach ($expressionTree as $key => $element) {
 		switch ($element['type']) {
-			case 'operand':
+			case 'operator':
 				$next[$level] = ($key != $lastKey);
 				$expr = expressionLevelDraw($next, $level);
 				$expr[] = SPACE;
-				$expr[] = italic($element['operand'] == '&' ? _('AND') : _('OR'));
+				$expr[] = ($element['operator'] === 'and') ? _('And') : _('Or');
 				$levelDetails = array(
 					'list' => $expr,
 					'id' => $element['id'],
@@ -1731,12 +1555,12 @@ function buildExpressionHtmlTree(array $expressionTree, array &$next, &$letterNu
 				$treeList[] = $levelDetails;
 
 				list($subOutline, $subTreeList) = buildExpressionHtmlTree($element['elements'], $next, $letterNum,
-						$level + 1, $element['operand']);
+						$level + 1, $element['operator']);
 				$treeList = array_merge($treeList, $subTreeList);
 
 				$outline .= ($level == 0) ? $subOutline : '('.$subOutline.')';
-				if ($operand !== null && $next[$level]) {
-					$outline .= ' '.$operand.' ';
+				if ($operator !== null && $next[$level]) {
+					$outline .= ' '.$operator.' ';
 				}
 				break;
 			case 'expression':
@@ -1744,8 +1568,8 @@ function buildExpressionHtmlTree(array $expressionTree, array &$next, &$letterNu
 
 				$letter = num2letter($letterNum++);
 				$outline .= $letter;
-				if ($operand !== null && $next[$level]) {
-					$outline .= ' '.$operand.' ';
+				if ($operator !== null && $next[$level]) {
+					$outline .= ' '.$operator.' ';
 				}
 
 				if (defined('NO_LINK_IN_TESTING')) {
@@ -1851,59 +1675,16 @@ function expressionLevelDraw(array $next, $level) {
 }
 
 /**
- * Returns number of elements in a trigger expression
- * Element is expression between two operands.
- *
- * For example:
- * expression "{host.key.last(0)}=0 & ({host2:key.last(0)}=0 & {host3.key.last(0)}=0)" has two elements:
- * "{host.key.last(0)}=0" and "({host2:key.last(0)}=0 & {host3.key.last(0)}=0)"
- *
- * @param CTriggerExpression $expressionData
- * @param int $start
- * @param int $end
- *
- * @return integer
- */
-function getExpressionElementsNum(CTriggerExpression $expressionData, $start, $end) {
-	for ($i = $start, $level = 0, $expressionElementsNum = 1; $i <= $end; $i++) {
-		switch ($expressionData->expression[$i]) {
-			case '(':
-				$level++;
-				break;
-			case ')':
-				$level--;
-				break;
-			case '|':
-			case '&':
-				if ($level == 0) {
-					$expressionElementsNum++;
-				}
-				break;
-			case '{':
-				foreach ($expressionData->expressions as $exprPart) {
-					if ($exprPart['pos'] == $i) {
-						$i += strlen($exprPart['expression']) - 1;
-						break;
-					}
-				}
-				break;
-		}
-	}
-
-	return $expressionElementsNum;
-}
-
-/**
  * Makes tree of expression elements
  *
  * Expression:
- *   "{host1:system.cpu.util[,iowait].last(0)} > 50 & {host2:system.cpu.util[,iowait].last(0)} > 50"
+ *   "{host1:system.cpu.util[,iowait].last(0)} > 50 and {host2:system.cpu.util[,iowait].last(0)} > 50"
  * Result:
  *   array(
  *     [0] => array(
- *       'id' => '0_92',
- *       'type' => 'operand',
- *       'operand' => '&',
+ *       'id' => '0_94',
+ *       'type' => 'operator',
+ *       'operator' => 'and',
  *       'elements' => array(
  *         [0] => array(
  *           'id' => '0_44',
@@ -1911,7 +1692,7 @@ function getExpressionElementsNum(CTriggerExpression $expressionData, $start, $e
  *           'expression' => '{host1:system.cpu.util[,iowait].last(0)} > 50'
  *         ),
  *         [1] => array(
- *           'id' => '48_92',
+ *           'id' => '50_94',
  *           'type' => 'expression',
  *           'expression' => '{host2:system.cpu.util[,iowait].last(0)} > 50'
  *         )
@@ -1926,18 +1707,24 @@ function getExpressionElementsNum(CTriggerExpression $expressionData, $start, $e
  * @return array
  */
 function getExpressionTree(CTriggerExpression $expressionData, $start, $end) {
-	$expressionTree = array();
+	$blankSymbols = array(' ', "\r", "\n", "\t");
 
-	foreach (array('|', '&') as $operand) {
-		$operandFound = false;
+	$expressionTree = array();
+	foreach (array('or', 'and') as $operator) {
+		$operatorFound = false;
 		$lParentheses = -1;
 		$rParentheses = -1;
 		$expressions = array();
 		$openSymbolNum = $start;
+		$operatorPos = 0;
+		$operatorToken = '';
 
 		for ($i = $start, $level = 0; $i <= $end; $i++) {
 			switch ($expressionData->expression[$i]) {
 				case ' ':
+				case "\r":
+				case "\n":
+				case "\t":
 					if ($openSymbolNum == $i) {
 						$openSymbolNum++;
 					}
@@ -1954,24 +1741,6 @@ function getExpressionTree(CTriggerExpression $expressionData, $start, $end) {
 						$rParentheses = $i;
 					}
 					break;
-				case $operand:
-					if ($level == 0) {
-						$closeSymbolNum = $i - 1;
-						while ($expressionData->expression[$closeSymbolNum] == ' ') {
-							$closeSymbolNum--;
-						}
-
-						$expressionElementsNum = getExpressionElementsNum($expressionData, $openSymbolNum, $closeSymbolNum);
-						if ($expressionElementsNum == 1 && $openSymbolNum == $lParentheses && $closeSymbolNum == $rParentheses) {
-							$openSymbolNum++;
-							$closeSymbolNum--;
-						}
-
-						$expressions[] = getExpressionTree($expressionData, $openSymbolNum, $closeSymbolNum);
-						$openSymbolNum = $i + 1;
-						$operandFound = true;
-					}
-					break;
 				case '{':
 					foreach ($expressionData->expressions as $exprPart) {
 						if ($exprPart['pos'] == $i) {
@@ -1980,49 +1749,79 @@ function getExpressionTree(CTriggerExpression $expressionData, $start, $end) {
 						}
 					}
 					break;
+				default:
+					// try to parse an operator
+					if ($operator[$operatorPos] === $expressionData->expression[$i]) {
+						$operatorPos++;
+						$operatorToken .= $expressionData->expression[$i];
+
+						// operator found
+						if ($operatorToken === $operator) {
+							// we've reached the end of a complete expression, parse the expression on the left side of
+							// the operator
+							if ($level == 0) {
+								// find the last symbol of the expression before the operator
+								$closeSymbolNum = $i - strlen($operator);
+
+								// trim blank symbols after the expression
+								while (in_array($expressionData->expression[$closeSymbolNum], $blankSymbols)) {
+									$closeSymbolNum--;
+								}
+
+								$expressions[] = getExpressionTree($expressionData, $openSymbolNum, $closeSymbolNum);
+								$openSymbolNum = $i + 1;
+								$operatorFound = true;
+							}
+							$operatorPos = 0;
+							$operatorToken = '';
+						}
+					}
 			}
 		}
 
+		// trim blank symbols in the end of the trigger expression
 		$closeSymbolNum = $end;
-		while ($expressionData->expression[$closeSymbolNum] == ' ') {
+		while (in_array($expressionData->expression[$closeSymbolNum], $blankSymbols)) {
 			$closeSymbolNum--;
 		}
 
-		if ($operandFound) {
-			$expressionElementsNum = getExpressionElementsNum($expressionData, $openSymbolNum, $closeSymbolNum);
-			if ($expressionElementsNum == 1 && $openSymbolNum == $lParentheses && $closeSymbolNum == $rParentheses) {
-				$openSymbolNum++;
-				$closeSymbolNum--;
-			}
-
+		// we've found a whole expression and parsed the expression on the left side of the operator,
+		// parse the expression on the right
+		if ($operatorFound) {
 			$expressions[] = getExpressionTree($expressionData, $openSymbolNum, $closeSymbolNum);
 
+			// trim blank symbols in the beginning of the trigger expression
 			$openSymbolNum = $start;
-			while ($expressionData->expression[$openSymbolNum] == ' ') {
+			while (in_array($expressionData->expression[$openSymbolNum], $blankSymbols)) {
 				$openSymbolNum++;
 			}
 
+			// trim blank symbols in the end of the trigger expression
 			$closeSymbolNum = $end;
-			while ($expressionData->expression[$closeSymbolNum] == ' ') {
+			while (in_array($expressionData->expression[$closeSymbolNum], $blankSymbols)) {
 				$closeSymbolNum--;
 			}
 
 			$expressionTree = array(
 				'id' => $openSymbolNum.'_'.$closeSymbolNum,
 				'expression' => substr($expressionData->expression, $openSymbolNum, $closeSymbolNum - $openSymbolNum + 1),
-				'type' => 'operand',
-				'operand' => $operand,
+				'type' => 'operator',
+				'operator' => $operator,
 				'elements' => $expressions
 			);
 			break;
 		}
-		elseif ($operand == '&') {
+		// if we've tried both operators and didn't find anything, it means there's only one expression
+		// return the result
+		elseif ($operator === 'and') {
+			// trim extra parentheses
 			if ($openSymbolNum == $lParentheses && $closeSymbolNum == $rParentheses) {
 				$openSymbolNum++;
 				$closeSymbolNum--;
 
 				$expressionTree = getExpressionTree($expressionData, $openSymbolNum, $closeSymbolNum);
 			}
+			// no extra parentheses remain, return the result
 			else {
 				$expressionTree = array(
 					'id' => $openSymbolNum.'_'.$closeSymbolNum,
@@ -2037,11 +1836,17 @@ function getExpressionTree(CTriggerExpression $expressionData, $start, $end) {
 }
 
 /**
- * Recreate an expression depending on action
+ * Recreate an expression depending on action.
+ *
+ * Supported action values:
+ * - and	- add an expression using "and";
+ * - or		- add an expression using "or";
+ * - r 		- replace;
+ * - R		- remove.
  *
  * @param string $expression
  * @param string $expressionId  element identifier like "0_55"
- * @param string $action        one of &/|/r/R (AND/OR/replace/Remove)
+ * @param string $action        action to perform
  * @param string $newExpression expression for AND, OR or replace actions
  *
  * @return bool                 returns new expression or false if expression is incorrect
@@ -2071,14 +1876,20 @@ function remakeExpression($expression, $expressionId, $action, $newExpression) {
 }
 
 /**
- * Rebuild expression depending on action
+ * Rebuild expression depending on action.
+ *
+ * Supported action values:
+ * - and	- add an expression using "and";
+ * - or		- add an expression using "or";
+ * - r 		- replace;
+ * - R		- remove.
  *
  * Example:
  *   $expressionTree = array(
  *     [0] => array(
- *       'id' => '0_92',
- *       'type' => 'operand',
- *       'operand' => '&',
+ *       'id' => '0_94',
+ *       'type' => 'operator',
+ *       'operator' => 'and',
  *       'elements' => array(
  *         [0] => array(
  *           'id' => '0_44',
@@ -2086,7 +1897,7 @@ function remakeExpression($expression, $expressionId, $action, $newExpression) {
  *           'expression' => '{host1:system.cpu.util[,iowait].last(0)} > 50'
  *         ),
  *         [1] => array(
- *           'id' => '48_92',
+ *           'id' => '50_94',
  *           'type' => 'expression',
  *           'expression' => '{host2:system.cpu.util[,iowait].last(0)} > 50'
  *         )
@@ -2094,7 +1905,7 @@ function remakeExpression($expression, $expressionId, $action, $newExpression) {
  *     )
  *   )
  *   $action = 'R'
- *   $expressionId = '48_92'
+ *   $expressionId = '50_94'
  *
  * Result:
  *   $expressionTree = array(
@@ -2105,24 +1916,23 @@ function remakeExpression($expression, $expressionId, $action, $newExpression) {
  *     )
  *   )
  *
- * @param array $expressionTree
- * @param string $expressionId  element identifier like "0_55"
- * @param string $action        one of &/|/r/R (AND/OR/replace/Remove)
- * @param string $newExpression expression for AND, OR or replace actions
- * @param string $operand       parameter only for recursive call
+ * @param array 	$expressionTree
+ * @param string 	$expressionId  		element identifier like "0_55"
+ * @param string 	$action        		action to perform
+ * @param string 	$newExpression 		expression for AND, OR or replace actions
+ * @param string 	$operator       	parameter only for recursive call
  *
  * @return bool                 returns true if element is found, false - otherwise
  */
-function rebuildExpressionTree(array &$expressionTree, $expressionId, $action, $newExpression, $operand = null) {
+function rebuildExpressionTree(array &$expressionTree, $expressionId, $action, $newExpression, $operator = null) {
 	foreach ($expressionTree as $key => $expression) {
 		if ($expressionId == $expressionTree[$key]['id']) {
 			switch ($action) {
-				// AND and OR
-				case '&':
-				case '|':
+				case 'and':
+				case 'or':
 					switch ($expressionTree[$key]['type']) {
-						case 'operand':
-							if ($expressionTree[$key]['operand'] == $action) {
+						case 'operator':
+							if ($expressionTree[$key]['operator'] == $action) {
 								$expressionTree[$key]['elements'][] = array(
 									'expression' => $newExpression,
 									'type' => 'expression'
@@ -2130,8 +1940,8 @@ function rebuildExpressionTree(array &$expressionTree, $expressionId, $action, $
 							}
 							else {
 								$element = array(
-									'type' => 'operand',
-									'operand' => $action,
+									'type' => 'operator',
+									'operator' => $action,
 									'elements' => array(
 										$expressionTree[$key],
 										array(
@@ -2144,10 +1954,10 @@ function rebuildExpressionTree(array &$expressionTree, $expressionId, $action, $
 							}
 							break;
 						case 'expression':
-							if (!$operand || $operand != $action) {
+							if (!$operator || $operator != $action) {
 								$element = array(
-									'type' => 'operand',
-									'operand' => $action,
+									'type' => 'operator',
+									'operator' => $action,
 									'elements' => array(
 										$expressionTree[$key],
 										array(
@@ -2170,9 +1980,9 @@ function rebuildExpressionTree(array &$expressionTree, $expressionId, $action, $
 				// replace
 				case 'r':
 					$expressionTree[$key]['expression'] = $newExpression;
-					if ($expressionTree[$key]['type'] == 'operand') {
+					if ($expressionTree[$key]['type'] == 'operator') {
 						$expressionTree[$key]['type'] = 'expression';
-						unset($expressionTree[$key]['operand'], $expressionTree[$key]['elements']);
+						unset($expressionTree[$key]['operator'], $expressionTree[$key]['elements']);
 					}
 					break;
 				// remove
@@ -2183,9 +1993,9 @@ function rebuildExpressionTree(array &$expressionTree, $expressionId, $action, $
 			return true;
 		}
 
-		if ($expressionTree[$key]['type'] == 'operand') {
+		if ($expressionTree[$key]['type'] == 'operator') {
 			if (rebuildExpressionTree($expressionTree[$key]['elements'], $expressionId, $action, $newExpression,
-					$expressionTree[$key]['operand'])) {
+					$expressionTree[$key]['operator'])) {
 				return true;
 			}
 		}
@@ -2200,8 +2010,8 @@ function rebuildExpressionTree(array &$expressionTree, $expressionId, $action, $
  * Example:
  *   $expressionTree = array(
  *     [0] => array(
- *       'type' => 'operand',
- *       'operand' => '&',
+ *       'type' => 'operator',
+ *       'operator' => 'and',
  *       'elements' => array(
  *         [0] => array(
  *           'type' => 'expression',
@@ -2216,15 +2026,15 @@ function rebuildExpressionTree(array &$expressionTree, $expressionId, $action, $
  *   )
  *
  * Result:
- *   "{host1:system.cpu.util[,iowait].last(0)} > 50 & {host2:system.cpu.util[,iowait].last(0)} > 50"
+ *   "{host1:system.cpu.util[,iowait].last(0)} > 50 and {host2:system.cpu.util[,iowait].last(0)} > 50"
  *
  * @param array  $expressionTree
  * @param int    $level				parameter only for recursive call
- * @param string $operand			parameter only for recursive call
+ * @param string $operator			parameter only for recursive call
  *
  * @return string
  */
-function makeExpression(array $expressionTree, $level = 0, $operand = null) {
+function makeExpression(array $expressionTree, $level = 0, $operator = null) {
 	$expression = '';
 
 	end($expressionTree);
@@ -2232,8 +2042,8 @@ function makeExpression(array $expressionTree, $level = 0, $operand = null) {
 
 	foreach ($expressionTree as $key => $element) {
 		switch ($element['type']) {
-			case 'operand':
-				$subExpression = makeExpression($element['elements'], $level + 1, $element['operand']);
+			case 'operator':
+				$subExpression = makeExpression($element['elements'], $level + 1, $element['operator']);
 
 				$expression .= ($level == 0) ? $subExpression : '('.$subExpression.')';
 				break;
@@ -2241,8 +2051,8 @@ function makeExpression(array $expressionTree, $level = 0, $operand = null) {
 				$expression .= $element['expression'];
 				break;
 		}
-		if ($operand !== null && $key != $lastKey) {
-			$expression .= ' '.$operand.' ';
+		if ($operator !== null && $key != $lastKey) {
+			$expression .= ' '.$operator.' ';
 		}
 	}
 
@@ -2292,27 +2102,30 @@ function get_item_function_info($expr) {
 		'str' =>		array('value_type' => _('0 or 1'),	'type' => T_ZBX_INT,			'validation' => IN('0,1')),
 		'strlen' =>		array('value_type' => _('Numeric (integer 64bit)'), 'type' => T_ZBX_INT, 'validation' => NOT_EMPTY),
 		'sum' =>		array('value_type' => $value_type,	'type' => $type_of_value_type,	'validation' => NOT_EMPTY),
-		'time' =>		array('value_type' => 'HHMMSS',		'type' => T_ZBX_INT,			'validation' => 'zbx_strlen({})==6')
+		'time' =>		array('value_type' => 'HHMMSS',		'type' => T_ZBX_INT,			'validation' => 'strlen({})==6')
 	);
 
 	$expressionData = new CTriggerExpression();
+	$parseResult = $expressionData->parse($expr);
 
-	if ($expressionData->parse($expr)) {
-		if (isset($expressionData->macros[0])) {
+	if ($parseResult) {
+		if ($parseResult->hasTokenOfType(CTriggerExpressionParserResult::TOKEN_TYPE_MACRO)) {
 			$result = array(
 				'value_type' => _('0 or 1'),
 				'type' => T_ZBX_INT,
 				'validation' => IN('0,1')
 			);
 		}
-		elseif (isset($expressionData->usermacros[0]) || isset($expressionData->lldmacros[0])) {
+		elseif ($parseResult->hasTokenOfType(CTriggerExpressionParserResult::TOKEN_TYPE_USER_MACRO)
+				|| $parseResult->hasTokenOfType(CTriggerExpressionParserResult::TOKEN_TYPE_LLD_MACRO)) {
+
 			$result = array(
 				'value_type' => $value_type[ITEM_VALUE_TYPE_FLOAT],
 				'type' => T_ZBX_STR,
 				'validation' => 'preg_match("/^'.ZBX_PREG_NUMBER.'$/u", {})'
 			);
 		}
-		elseif (isset($expressionData->expressions[0])) {
+		elseif ($parseResult->hasTokenOfType(CTriggerExpressionParserResult::TOKEN_TYPE_FUNCTION_MACRO)) {
 			$exprPart = reset($expressionData->expressions);
 
 			if (!isset($function_info[$exprPart['functionName']])) {
@@ -2374,61 +2187,58 @@ function get_item_function_info($expr) {
 }
 
 /**
- * Execute expression and return array with keys 'result' as 'TRUE' or 'FALSE' and 'error' as error text
- * if there is one.
+ * Substitute macros in the expression with the given values and evaluate it's result.
  *
- * @param string $expression
- * @param array  $rplcts
+ * @param string $expression                a trigger expression
+ * @param array  $replaceFunctionMacros     an array of macro - value pairs
  *
- * @return array
+ * @return bool     the calculated value of the expression
  */
-function evalExpressionData($expression, $rplcts) {
-	$result = false;
+function evalExpressionData($expression, $replaceFunctionMacros) {
+	// replace function macros with their values
+	$expression = str_replace(array_keys($replaceFunctionMacros), array_values($replaceFunctionMacros), $expression);
 
-	$evStr = str_replace(array_keys($rplcts), array_values($rplcts), $expression);
-	preg_match_all('/[0-9\.]+['.ZBX_BYTE_SUFFIXES.ZBX_TIME_SUFFIXES.']?/', $evStr, $arr, PREG_OFFSET_CAPTURE);
+	$parser = new CTriggerExpression();
+	$parseResult = $parser->parse($expression);
 
-	for ($i = count($arr[0]) - 1; $i >= 0; $i--) {
-		$evStr = substr_replace($evStr, convert($arr[0][$i][0]), $arr[0][$i][1], strlen($arr[0][$i][0]));
-	}
-
-	if (!preg_match("/^[0-9.\s=#()><+*\/&E|\-]+$/is", $evStr)) {
-		return 'FALSE';
+	// The $replaceFunctionMacros array may contain string values which after substitution
+	// will result in an invalid expression. In such cases we should just return false.
+	if (!$parseResult) {
+		return false;
 	}
 
-	$evStr = preg_replace('/(-?[0-9]*\.?[0-9]+) *(\=|\#|\!=|\<|\>) *(-?[0-9]*\.?[0-9]+)/', '((float) "$1" $2 (float) "$3")', $evStr);
+	// turn the expression into valid PHP code
+	$evStr = '';
+	$replaceOperators = array('not' => '!', '=' => '==');
+	foreach ($parseResult->getTokens() as $token) {
+		$value = $token['value'];
 
-	$switch = array('=' => '==', '#' => '!=', '&' => '&&', '|' => '||');
-	$evStr = str_replace(array_keys($switch), array_values($switch), $evStr);
-
-	// execute expression
-	eval('$result = ('.trim($evStr).');');
+		switch ($token['type']) {
+			case CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR:
+				// replace specific operators with their PHP analogues
+				if (isset($replaceOperators[$token['value']])) {
+					$value = $replaceOperators[$token['value']];
+				}
 
-	$result = ($result === true || $result && $result != '-') ? 'TRUE' : 'FALSE';
-	$error = '';
+				break;
+			case CTriggerExpressionParserResult::TOKEN_TYPE_NUMBER:
+				// convert numeric values with suffixes
+				if ($token['data']['suffix'] !== null) {
+					$value = convert($value);
+				}
 
-	// remove eval() generated error message
-	global $ZBX_MESSAGES;
-	if (!empty($ZBX_MESSAGES)) {
-		$messageList = array();
+				$value = '((float) "'.$value.'")';
 
-		foreach ($ZBX_MESSAGES as $zbxMessage) {
-			if (strpos($zbxMessage['message'], 'eval()') !== false) {
-				$error = substr($zbxMessage['message'], 0, strpos($zbxMessage['message'], '['));
-				$result = 'NULL';
-			}
-			else {
-				$messageList[] = $zbxMessage;
-			}
+				break;
 		}
 
-		$ZBX_MESSAGES = $messageList;
+		$evStr .= ' '.$value;
 	}
 
-	return array(
-		'result' => $result,
-		'error' => $error
-	);
+	// execute expression
+	eval('$result = ('.trim($evStr).');');
+
+	return $result;
 }
 
 /**
diff --git a/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php
index b807e89118c..a24d76cb33f 100644
--- a/frontends/php/include/users.inc.php
+++ b/frontends/php/include/users.inc.php
@@ -178,7 +178,9 @@ function change_group_status($userGroupIds, $usersStatus) {
 
 	if ($grant) {
 		return DBexecute(
-			'UPDATE usrgrp SET users_status='.$usersStatus.' WHERE '.dbConditionInt('usrgrpid', $userGroupIds)
+			'UPDATE usrgrp'.
+			' SET users_status='.zbx_dbstr($usersStatus).
+			' WHERE '.dbConditionInt('usrgrpid', $userGroupIds)
 		);
 	}
 	else {
@@ -203,7 +205,7 @@ function change_group_gui_access($userGroupIds, $guiAccess) {
 
 	if ($grant) {
 		return DBexecute(
-			'UPDATE usrgrp SET gui_access='.$guiAccess.' WHERE '.dbConditionInt('usrgrpid', $userGroupIds)
+			'UPDATE usrgrp SET gui_access='.zbx_dbstr($guiAccess).' WHERE '.dbConditionInt('usrgrpid', $userGroupIds)
 		);
 	}
 	else {
@@ -225,7 +227,7 @@ function change_group_debug_mode($userGroupIds, $debugMode) {
 	zbx_value2array($userGroupIds);
 
 	return DBexecute(
-		'UPDATE usrgrp SET debug_mode='.$debugMode.' WHERE '.dbConditionInt('usrgrpid', $userGroupIds)
+		'UPDATE usrgrp SET debug_mode='.zbx_dbstr($debugMode).' WHERE '.dbConditionInt('usrgrpid', $userGroupIds)
 	);
 }
 
diff --git a/frontends/php/include/validate.inc.php b/frontends/php/include/validate.inc.php
index 47f42fcee8c..be78f66fe53 100644
--- a/frontends/php/include/validate.inc.php
+++ b/frontends/php/include/validate.inc.php
@@ -108,7 +108,7 @@ function validate_ip($str, &$arr) {
 
 /**
  * Validate IP mask. IP/bits.
- * bits range for IPv4: 16 - 32
+ * bits range for IPv4: 16 - 30
  * bits range for IPv6: 112 - 128
  *
  * @param string $ip_range
@@ -125,7 +125,7 @@ function validate_ip_range_mask($ip_range) {
 	$bits = $parts[1];
 
 	if (validate_ipv4($ip, $arr)) {
-		return preg_match('/^\d{1,2}$/', $bits) && $bits >= 16 && $bits <= 32;
+		return preg_match('/^\d{1,2}$/', $bits) && $bits >= 16 && $bits <= 30;
 	}
 	elseif (ZBX_HAVE_IPV6 && validate_ipv6($ip, $arr)) {
 		return preg_match('/^\d{1,3}$/', $bits) && $bits >= 112 && $bits <= 128;
@@ -183,7 +183,7 @@ function validate_ip_range_range($ip_range) {
 
 function validate_ip_range($str) {
 	foreach (explode(',', $str) as $ip_range) {
-		if (zbx_strpos($ip_range, '/') !== false) {
+		if (strpos($ip_range, '/') !== false) {
 			if (!validate_ip_range_mask($ip_range)) {
 				return false;
 			}
@@ -213,7 +213,7 @@ function validate_port_list($str) {
 }
 
 function calc_exp($fields, $field, $expression) {
-	if (zbx_strstr($expression, '{}')) {
+	if (strpos($expression, '{}') !== false) {
 		if (!isset($_REQUEST[$field])) {
 			return false;
 		}
@@ -323,7 +323,7 @@ function check_type(&$field, $flags, &$var, $type, $caption = null) {
 		$decimalValidator = new CDecimalValidator(array(
 			'maxPrecision' => 16,
 			'maxScale' => 4,
-			'messageFormat' => _('Value "%2$s" of "%1$s" has incorrect decimal format.'),
+			'messageInvalid' => _('Value "%2$s" of "%1$s" has incorrect decimal format.'),
 			'messagePrecision' => _(
 				'Value "%2$s" of "%1$s" is too long: it cannot have more than %3$s digits before the decimal point '.
 				'and more than %4$s digits after the decimal point.'
@@ -347,7 +347,7 @@ function check_type(&$field, $flags, &$var, $type, $caption = null) {
 	elseif ($type == T_ZBX_DBL_BIG) {
 		$decimalValidator = new CDecimalValidator(array(
 			'maxScale' => 4,
-			'messageFormat' => _('Value "%2$s" of "%1$s" has incorrect decimal format.'),
+			'messageInvalid' => _('Value "%2$s" of "%1$s" has incorrect decimal format.'),
 			'messageScale' => _(
 				'Value "%2$s" of "%1$s" has too many digits after the decimal point: '.
 				'it cannot have more than %3$s digits.'
@@ -460,7 +460,7 @@ function check_field(&$fields, &$field, $checks) {
 		}
 	}
 
-	if (!($flags & NO_TRIM)) {
+	if (!($flags & P_NO_TRIM)) {
 		check_trim($_REQUEST[$field]);
 	}
 
@@ -518,8 +518,6 @@ function check_fields(&$fields, $show_messages = true) {
 		'sid' =>			array(T_ZBX_STR, O_OPT, P_SYS, HEX(),		null),
 		'triggers_hash' =>	array(T_ZBX_STR, O_OPT, P_SYS, NOT_EMPTY,	null),
 		'print' =>			array(T_ZBX_INT, O_OPT, P_SYS, IN('1'),		null),
-		'sort' =>			array(T_ZBX_STR, O_OPT, P_SYS, null,		null),
-		'sortorder' =>		array(T_ZBX_STR, O_OPT, P_SYS, null,		null),
 		'page' =>			array(T_ZBX_INT, O_OPT, P_SYS, null,		null), // paging
 		'ddreset' =>		array(T_ZBX_INT, O_OPT, P_SYS, null,		null)
 	);
diff --git a/frontends/php/include/views/administration.auditacts.list.php b/frontends/php/include/views/administration.auditacts.list.php
index 3c821fa4c2e..87738418d43 100644
--- a/frontends/php/include/views/administration.auditacts.list.php
+++ b/frontends/php/include/views/administration.auditacts.list.php
@@ -36,7 +36,7 @@ $auditWidget->addHeaderRowNumber();
 $filterForm = new CForm('get');
 $filterForm->setAttribute('name', 'zbx_filter');
 $filterForm->setAttribute('id', 'zbx_filter');
-$filterTable = new CTable('', 'filter');
+$filterTable = new CTable('', 'filter filter-center');
 $filterTable->addRow(array(array(
 	bold(_('Recipient')),
 	SPACE,
@@ -116,7 +116,7 @@ foreach ($this->data['alerts'] as $alert) {
 	}
 	else {
 		$info = new CDiv(SPACE, 'status_icon iconerror');
-		$info->setHint($alert['error'], '', 'on');
+		$info->setHint($alert['error'], 'on');
 	}
 
 	$recipient = (isset($alert['userid']) && $alert['userid'])
@@ -124,7 +124,7 @@ foreach ($this->data['alerts'] as $alert) {
 		: $alert['sendto'];
 
 	$auditTable->addRow(array(
-		new CCol(zbx_date2str(_('d M Y H:i:s'), $alert['clock']), 'top'),
+		new CCol(zbx_date2str(DATE_TIME_FORMAT_SECONDS, $alert['clock']), 'top'),
 		new CCol($this->data['actions'][$alert['actionid']]['name'], 'top'),
 		new CCol(($mediatype) ? $mediatype['description'] : '-', 'top'),
 		new CCol($recipient, 'top'),
diff --git a/frontends/php/include/views/administration.auditlogs.list.php b/frontends/php/include/views/administration.auditlogs.list.php
index 767eec50fed..4595df816bf 100644
--- a/frontends/php/include/views/administration.auditlogs.list.php
+++ b/frontends/php/include/views/administration.auditlogs.list.php
@@ -36,7 +36,7 @@ $auditWidget->addHeaderRowNumber();
 $filterForm = new CForm('get');
 $filterForm->setAttribute('name', 'zbx_filter');
 $filterForm->setAttribute('id', 'zbx_filter');
-$filterTable = new CTable('', 'filter');
+$filterTable = new CTable('', 'filter filter-center');
 
 $actionComboBox = new CComboBox('action', $this->data['action']);
 $actionComboBox->addItem(-1, _('All'));
@@ -103,7 +103,7 @@ foreach ($this->data['actions'] as $action) {
 	}
 
 	$auditTable->addRow(array(
-		zbx_date2str(_('d M Y H:i:s'), $action['clock']),
+		zbx_date2str(DATE_TIME_FORMAT_SECONDS, $action['clock']),
 		$action['alias'],
 		$action['ip'],
 		$action['resourcetype'],
diff --git a/frontends/php/include/views/administration.authentication.edit.php b/frontends/php/include/views/administration.authentication.edit.php
index ca1624a1522..a8594fcb3ab 100644
--- a/frontends/php/include/views/administration.authentication.edit.php
+++ b/frontends/php/include/views/administration.authentication.edit.php
@@ -60,7 +60,7 @@ if ($this->data['config']['authentication_type'] == ZBX_AUTH_LDAP) {
 		}
 	}
 	else {
-		$userComboBox = new CTextBox('user', $this->data['user'], ZBX_TEXTBOX_STANDARD_SIZE, 'yes');
+		$userComboBox = new CTextBox('user', $this->data['user'], ZBX_TEXTBOX_STANDARD_SIZE, true);
 	}
 
 	$authenticationFormList->addRow(
@@ -83,7 +83,7 @@ if ($this->data['config']['authentication_type'] == ZBX_AUTH_LDAP) {
 				? 'uid'
 				: $this->data['config']['ldap_search_attribute'],
 			ZBX_TEXTBOX_STANDARD_SIZE,
-			'no',
+			false,
 			128
 		)
 	);
@@ -122,9 +122,9 @@ $authenticationForm->addItem($authenticationTab);
 // create save button
 $saveButton = new CSubmit('save', _('Save'));
 if ($this->data['is_authentication_type_changed']) {
-	$saveButton->addAction('onclick', 'javascript: '.
-		'if (Confirm("'._('Switching authentication method will reset all except this session! Continue?').'")) {'.
-			'jQuery("#authenticationForm").submit(); return true; } else { return false; }'
+	$saveButton->addAction('onclick', 'javascript: if (confirm('.
+		CJs::encodeJson(_('Switching authentication method will reset all except this session! Continue?')).')) {'.
+		'jQuery("#authenticationForm").submit(); return true; } else { return false; }'
 	);
 }
 elseif ($this->data['config']['authentication_type'] != ZBX_AUTH_LDAP) {
diff --git a/frontends/php/include/views/administration.general.gui.edit.php b/frontends/php/include/views/administration.general.gui.edit.php
index 86bcebf04db..b7e9432d3c6 100644
--- a/frontends/php/include/views/administration.general.gui.edit.php
+++ b/frontends/php/include/views/administration.general.gui.edit.php
@@ -52,7 +52,6 @@ $guiView->addTab('gui', _('GUI'), $guiTab);
 
 $guiForm = new CForm();
 $guiForm->setName('guiForm');
-$guiForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $guiForm->addItem($guiView);
 $guiForm->addItem(makeFormFooter(new CSubmit('save', _('Save'))));
 
diff --git a/frontends/php/include/views/administration.general.housekeeper.edit.php b/frontends/php/include/views/administration.general.housekeeper.edit.php
index b9c3e477024..b9d59574deb 100644
--- a/frontends/php/include/views/administration.general.housekeeper.edit.php
+++ b/frontends/php/include/views/administration.general.housekeeper.edit.php
@@ -165,7 +165,6 @@ $houseKeeperView->addTab('houseKeeper', _('Housekeeping'), $houseKeeperTab);
 
 $houseKeeperForm = new CForm();
 $houseKeeperForm->setName('houseKeeperForm');
-$houseKeeperForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $houseKeeperForm->addItem($houseKeeperView);
 $houseKeeperForm->addItem(makeFormFooter(new CSubmit('save', _('Save')), new CButton('resetDefaults', _('Reset defaults'))));
 
diff --git a/frontends/php/include/views/administration.general.iconmap.list.php b/frontends/php/include/views/administration.general.iconmap.list.php
index b710b5b9a51..2ef830ddd51 100644
--- a/frontends/php/include/views/administration.general.iconmap.list.php
+++ b/frontends/php/include/views/administration.general.iconmap.list.php
@@ -30,7 +30,7 @@ foreach ($this->data['iconmaps'] as $iconMap) {
 	$row = array();
 	foreach ($iconMap['mappings'] as $mapping) {
 		$row[] = $this->data['inventoryList'][$mapping['inventory_link']].NAME_DELIMITER.
-				$mapping['expression'].SPACE.RARR.SPACE.$this->data['iconList'][$mapping['iconid']];
+				$mapping['expression'].SPACE.'&rArr;'.SPACE.$this->data['iconList'][$mapping['iconid']];
 		$row[] = BR();
 	}
 
diff --git a/frontends/php/include/views/administration.general.image.edit.php b/frontends/php/include/views/administration.general.image.edit.php
index 7d54a007d45..be2c5a7c7fc 100644
--- a/frontends/php/include/views/administration.general.image.edit.php
+++ b/frontends/php/include/views/administration.general.image.edit.php
@@ -23,21 +23,17 @@ $imageForm = new CForm('post', null, 'multipart/form-data');
 $imageForm->setName('imageForm');
 $imageForm->addVar('form', $this->data['form']);
 $imageForm->addVar('imageid', $this->data['imageid']);
-
-$imageComboBox = new CComboBox('imagetype', $this->data['imagetype']);
-$imageComboBox->addItem(IMAGE_TYPE_ICON, _('Icon'));
-$imageComboBox->addItem(IMAGE_TYPE_BACKGROUND, _('Background'));
+$imageForm->addVar('imagetype', $this->data['imagetype']);
 
 // append form list
 $imageFormList = new CFormList('imageFormList');
-$nameTextBox = new CTextBox('name', $this->data['imagename'], 64, 'no', 64);
+$nameTextBox = new CTextBox('name', $this->data['imagename'], 64, false, 64);
 $nameTextBox->attr('autofocus', 'autofocus');
 $imageFormList->addRow(_('Name'), $nameTextBox);
-$imageFormList->addRow(_('Type'), $imageComboBox);
 $imageFormList->addRow(_('Upload'), new CFile('image'));
 
 if (!empty($this->data['imageid'])) {
-	if ($data['imagetype'] == IMAGE_TYPE_BACKGROUND) {
+	if ($this->data['imagetype'] == IMAGE_TYPE_BACKGROUND) {
 		$imageFormList->addRow(_('Image'), new CLink(new CImg('imgstore.php?width=200&height=200&iconid='.$this->data['imageid'], 'no image'), 'image.php?imageid='.$this->data['imageid']));
 	}
 	else {
@@ -47,7 +43,7 @@ if (!empty($this->data['imageid'])) {
 
 // append tab
 $imageTab = new CTabView();
-$imageTab->addTab('imageTab', _('Image'), $imageFormList);
+$imageTab->addTab('imageTab', ($this->data['imagetype'] == IMAGE_TYPE_ICON) ? _('Icon') : _('Background'), $imageFormList);
 $imageForm->addItem($imageTab);
 
 // append buttons
diff --git a/frontends/php/include/views/administration.general.other.edit.php b/frontends/php/include/views/administration.general.other.edit.php
index a5b3fdb2b07..14574c8a703 100644
--- a/frontends/php/include/views/administration.general.other.edit.php
+++ b/frontends/php/include/views/administration.general.other.edit.php
@@ -42,7 +42,6 @@ $otherView->addTab('other', _('Other parameters'), $otherTab);
 
 $otherForm = new CForm();
 $otherForm->setName('otherForm');
-$otherForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $otherForm->addItem($otherView);
 $otherForm->addItem(makeFormFooter(new CSubmit('save', _('Save'))));
 
diff --git a/frontends/php/include/views/administration.general.regularexpressions.edit.php b/frontends/php/include/views/administration.general.regularexpressions.edit.php
index 6fda291a5c2..ece16463cc6 100644
--- a/frontends/php/include/views/administration.general.regularexpressions.edit.php
+++ b/frontends/php/include/views/administration.general.regularexpressions.edit.php
@@ -32,7 +32,7 @@ $form->addVar('regexpid', $this->data['regexpid']);
  * Expressions tab
  */
 $exprTab = new CFormList('exprTab');
-$nameTextBox = new CTextBox('name', $this->get('name'), ZBX_TEXTBOX_STANDARD_SIZE, null, 128);
+$nameTextBox = new CTextBox('name', $this->get('name'), ZBX_TEXTBOX_STANDARD_SIZE, false, 128);
 $nameTextBox->attr('autofocus', 'autofocus');
 $exprTab->addRow(_('Name'), $nameTextBox);
 
@@ -53,9 +53,9 @@ $exprForm->addRow(array(_('Expression type'), new CComboBox('typeNew', null, nul
 $exprForm->addRow(array(_('Delimiter'), new CComboBox('delimiterNew', null, null, expressionDelimiters())), null, 'delimiterNewRow');
 $exprForm->addRow(array(_('Case sensitive'), new CCheckBox('case_sensitiveNew')));
 $exprFormFooter = array(
-	new Cbutton('saveExpression', _('Add'), null, 'link_menu'),
+	new CButton('saveExpression', _('Add'), null, 'link_menu'),
 	SPACE,
-	new Cbutton('cancelExpression', _('Cancel'), null, 'link_menu')
+	new CButton('cancelExpression', _('Cancel'), null, 'link_menu')
 );
 $exprTab->addRow(null, new CDiv(array($exprForm, $exprFormFooter), 'objectgroup inlineblock border_dotted'), true, 'exprForm');
 
@@ -85,8 +85,8 @@ $form->addItem($regExpView);
 $secondaryActions = array(new CButtonCancel());
 if (isset($this->data['regexpid'])) {
 	array_unshift($secondaryActions,
-		new CSubmit('clone', _('Clone')),
-		new CButtonDelete(_('Delete regular expression?'), url_param('form').url_param('regexpid').url_param('delete', false, 'go'))
+		new CButton('clone', _('Clone')),
+		new CButtonDelete(_('Delete regular expression?'), url_param('regexpid').url_param('regexp.massdelete', false, 'action'))
 	);
 }
 $form->addItem(makeFormFooter(new CSubmit('save', _('Save')), $secondaryActions));
diff --git a/frontends/php/include/views/administration.general.regularexpressions.list.php b/frontends/php/include/views/administration.general.regularexpressions.list.php
index 0afed5bbb84..33dc6671dad 100644
--- a/frontends/php/include/views/administration.general.regularexpressions.list.php
+++ b/frontends/php/include/views/administration.general.regularexpressions.list.php
@@ -47,10 +47,10 @@ foreach($this->data['db_exps'] as $exp) {
 	}
 
 	$expressions[$exp['regexpid']]->addRow(array(
-		$values[$exp['regexpid']],
-		' &raquo; ',
-		$exp['expression'],
-		' ['.expression_type2str($exp['expression_type']).']'
+		new CCol($values[$exp['regexpid']], 'top'),
+		new CCol(' &raquo; ', 'top'),
+		new CCol($exp['expression'], 'pre-wrap  break-lines'),
+		new CCol(' ['.expression_type2str($exp['expression_type']).']', 'top')
 	));
 }
 foreach($this->data['regexps'] as $regexpid => $regexp) {
@@ -61,10 +61,12 @@ foreach($this->data['regexps'] as $regexpid => $regexp) {
 	));
 }
 
-$goBox = new CComboBox('go');
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goBox = new CComboBox('action');
+
+$goOption = new CComboItem('regexp.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected regular expressions?'));
 $goBox->addItem($goOption);
+
 $goButton = new CSubmit('goButton', _('Go').' (0)');
 $goButton->setAttribute('id', 'goButton');
 zbx_add_post_js('chkbxRange.pageGoName = "regexpids";');
diff --git a/frontends/php/include/views/administration.general.triggerDisplayOptions.edit.php b/frontends/php/include/views/administration.general.triggerDisplayOptions.edit.php
index 2944eaadeeb..993cbd756b7 100644
--- a/frontends/php/include/views/administration.general.triggerDisplayOptions.edit.php
+++ b/frontends/php/include/views/administration.general.triggerDisplayOptions.edit.php
@@ -115,7 +115,6 @@ $severityView->addTab('triggerdo', _('Trigger displaying options'), $triggerDOFo
 
 $severityForm = new CForm();
 $severityForm->setName('triggerDisplayOptions');
-$severityForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $severityForm->addItem($severityView);
 $severityForm->addItem(makeFormFooter(new CSubmit('save', _('Save')), new CButton('resetDefaults', _('Reset defaults'))));
 
diff --git a/frontends/php/include/views/administration.general.triggerSeverity.edit.php b/frontends/php/include/views/administration.general.triggerSeverity.edit.php
index 819825e417d..36885e95333 100644
--- a/frontends/php/include/views/administration.general.triggerSeverity.edit.php
+++ b/frontends/php/include/views/administration.general.triggerSeverity.edit.php
@@ -71,7 +71,6 @@ $severityView->addTab('severities', _('Trigger severities'), $severityTab);
 
 $severityForm = new CForm();
 $severityForm->setName('triggerSeverity');
-$severityForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $severityForm->addItem($severityView);
 $severityForm->addItem(makeFormFooter(new CSubmit('save', _('Save')), new CButton('resetDefaults', _('Reset defaults'))));
 
diff --git a/frontends/php/include/views/administration.general.valuemapping.edit.php b/frontends/php/include/views/administration.general.valuemapping.edit.php
index f9d6f004bfe..302edce4f2c 100644
--- a/frontends/php/include/views/administration.general.valuemapping.edit.php
+++ b/frontends/php/include/views/administration.general.valuemapping.edit.php
@@ -24,14 +24,13 @@ include('include/views/js/administration.general.valuemapping.edit.js.php');
 $valueMappingForm = new CForm();
 $valueMappingForm->setName('valueMappingForm');
 $valueMappingForm->addVar('form', $this->data['form']);
-$valueMappingForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $valueMappingForm->addVar('valuemapid', $this->data['valuemapid']);
 
 // create form list
 $valueMappingFormList = new CFormList('valueMappingFormList');
 
 // name
-$nameTextBox = new CTextBox('mapname', $this->data['mapname'], 40, null, 64);
+$nameTextBox = new CTextBox('mapname', $this->data['mapname'], 40, false, 64);
 $nameTextBox->attr('autofocus', 'autofocus');
 $valueMappingFormList->addRow(_('Name'), $nameTextBox);
 
diff --git a/frontends/php/include/views/administration.general.valuemapping.list.php b/frontends/php/include/views/administration.general.valuemapping.list.php
index 194551e7873..9eeb30f5f98 100644
--- a/frontends/php/include/views/administration.general.valuemapping.list.php
+++ b/frontends/php/include/views/administration.general.valuemapping.list.php
@@ -30,7 +30,7 @@ foreach ($this->data['valuemaps'] as $valuemap) {
 
 	$mappings = array();
 	foreach ($valuemap['maps'] as $map) {
-		$mappings[] = $map['value'].SPACE.RARR.SPACE.$map['newvalue'];
+		$mappings[] = $map['value'].SPACE.'&rArr;'.SPACE.$map['newvalue'];
 		$mappings[] = BR();
 	}
 	$valueMappingTable->addRow(array(
diff --git a/frontends/php/include/views/administration.general.workingtime.edit.php b/frontends/php/include/views/administration.general.workingtime.edit.php
index a95466af7ed..0646ccbe8fc 100644
--- a/frontends/php/include/views/administration.general.workingtime.edit.php
+++ b/frontends/php/include/views/administration.general.workingtime.edit.php
@@ -29,8 +29,6 @@ $workingTimeView->addTab('workingTime', _('Working time'), $workingTimeTab);
 
 $workingTimeForm = new CForm();
 $workingTimeForm->setName('workingTimeForm');
-
-$workingTimeForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $workingTimeForm->addItem($workingTimeView);
 $workingTimeForm->addItem(makeFormFooter(new CSubmit('save', _('Save'))));
 
diff --git a/frontends/php/include/views/administration.mediatypes.edit.php b/frontends/php/include/views/administration.mediatypes.edit.php
index 9608d54d9e1..b43cce53eac 100644
--- a/frontends/php/include/views/administration.mediatypes.edit.php
+++ b/frontends/php/include/views/administration.mediatypes.edit.php
@@ -26,12 +26,11 @@ $mediaTypeWidget->addPageHeader(_('CONFIGURATION OF MEDIA TYPES'));
 $mediaTypeForm = new CForm();
 $mediaTypeForm->setName('mediaTypeForm');
 $mediaTypeForm->addVar('form', $this->data['form']);
-$mediaTypeForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $mediaTypeForm->addVar('mediatypeid', $this->data['mediatypeid']);
 
 // create form list
 $mediaTypeFormList = new CFormList('mediaTypeFormList');
-$nameTextBox = new CTextBox('description', $this->data['description'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 100);
+$nameTextBox = new CTextBox('description', $this->data['description'], ZBX_TEXTBOX_STANDARD_SIZE, false, 100);
 $nameTextBox->attr('autofocus', 'autofocus');
 $mediaTypeFormList->addRow(_('Name'), $nameTextBox);
 
diff --git a/frontends/php/include/views/administration.mediatypes.list.php b/frontends/php/include/views/administration.mediatypes.list.php
index f0ed80a65ca..e32d98cbb59 100644
--- a/frontends/php/include/views/administration.mediatypes.list.php
+++ b/frontends/php/include/views/administration.mediatypes.list.php
@@ -36,8 +36,8 @@ $mediaTypeForm->setName('mediaTypesForm');
 $mediaTypeTable = new CTableInfo(_('No media types found.'));
 $mediaTypeTable->setHeader(array(
 	new CCheckBox('all_media_types', null, "checkAll('".$mediaTypeForm->getName()."', 'all_media_types', 'mediatypeids');"),
-	make_sorting_header(_('Name'), 'description'),
-	make_sorting_header(_('Type'), 'type'),
+	make_sorting_header(_('Name'), 'description', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Type'), 'type', $this->data['sort'], $this->data['sortorder']),
 	_('Status'),
 	_('Used in actions'),
 	_('Details')
@@ -88,8 +88,12 @@ foreach ($this->data['mediatypes'] as $mediaType) {
 	$actionColumn = new CCol($actionLinks);
 	$actionColumn->setAttribute('style', 'white-space: normal;');
 
-	$statusLink = 'media_types.php?go='.(($mediaType['status'] == MEDIA_TYPE_STATUS_DISABLED) ? 'activate' : 'disable').
-		'&mediatypeids'.SQUAREBRACKETS.'='.$mediaType['mediatypeid'];
+	$statusLink = 'media_types.php'.
+		'?action='.($mediaType['status'] == MEDIA_TYPE_STATUS_DISABLED
+			? 'mediatype.massenable'
+			: 'mediatype.massdisable'
+		).
+		'&mediatypeids[]='.$mediaType['mediatypeid'];
 
 	$status = (MEDIA_TYPE_STATUS_ACTIVE == $mediaType['status'])
 		? new CLink(_('Enabled'), $statusLink, 'enabled')
@@ -107,16 +111,17 @@ foreach ($this->data['mediatypes'] as $mediaType) {
 }
 
 // create go button
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('mediatype.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected media types?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('mediatype.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected media types?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('mediatype.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected media types?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/administration.proxy.edit.php b/frontends/php/include/views/administration.proxy.edit.php
index fd682e798bc..5799ff8ace6 100644
--- a/frontends/php/include/views/administration.proxy.edit.php
+++ b/frontends/php/include/views/administration.proxy.edit.php
@@ -26,14 +26,13 @@ $proxyWidget->addPageHeader(_('CONFIGURATION OF PROXIES'));
 $proxyForm = new CForm();
 $proxyForm->setName('proxyForm');
 $proxyForm->addVar('form', $this->data['form']);
-$proxyForm->addVar('form_refresh', $this->data['form_refresh']);
 if ($this->data['proxyid']) {
 	$proxyForm->addVar('proxyid', $this->data['proxyid']);
 }
 
 // create form list
 $proxyFormList = new CFormList('proxyFormList');
-$nameTextBox = new CTextBox('host', $this->data['name'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64);
+$nameTextBox = new CTextBox('host', $this->data['name'], ZBX_TEXTBOX_STANDARD_SIZE, false, 128);
 $nameTextBox->attr('autofocus', 'autofocus');
 $proxyFormList->addRow(_('Proxy name'), $nameTextBox);
 
@@ -63,10 +62,10 @@ if ($this->data['status'] == HOST_STATUS_PROXY_PASSIVE) {
 	$connectByComboBox->useJQueryStyle();
 
 	$interfaceTable->addRow(array(
-		new CTextBox('interface[ip]', $this->data['interface']['ip'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64),
-		new CTextBox('interface[dns]', $this->data['interface']['dns'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64),
+		new CTextBox('interface[ip]', $this->data['interface']['ip'], ZBX_TEXTBOX_SMALL_SIZE, false, 64),
+		new CTextBox('interface[dns]', $this->data['interface']['dns'], ZBX_TEXTBOX_SMALL_SIZE, false, 64),
 		$connectByComboBox,
-		new CTextBox('interface[port]', $this->data['interface']['port'], 18, 'no', 64)
+		new CTextBox('interface[port]', $this->data['interface']['port'], 18, false, 64)
 	));
 	$proxyFormList->addRow(_('Interface'), new CDiv($interfaceTable, 'objectgroup inlineblock border_dotted ui-corner-all'));
 }
diff --git a/frontends/php/include/views/administration.proxy.list.php b/frontends/php/include/views/administration.proxy.list.php
index 7b20cd62828..05bc1608003 100644
--- a/frontends/php/include/views/administration.proxy.list.php
+++ b/frontends/php/include/views/administration.proxy.list.php
@@ -37,7 +37,7 @@ $proxyForm->setName('proxyForm');
 $proxyTable = new CTableInfo(_('No proxies found.'));
 $proxyTable->setHeader(array(
 	new CCheckBox('all_hosts', null, "checkAll('".$proxyForm->getName()."', 'all_hosts', 'hosts');"),
-	make_sorting_header(_('Name'), 'host'),
+	make_sorting_header(_('Name'), 'host', $this->data['sort'], $this->data['sortorder']),
 	_('Mode'),
 	_('Last seen (age)'),
 	_('Host count'),
@@ -97,16 +97,17 @@ foreach ($this->data['proxies'] as $proxy) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('proxy.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable hosts monitored by selected proxies?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('proxy.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable hosts monitored by selected proxies?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('proxy.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected proxies?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/administration.script.edit.php b/frontends/php/include/views/administration.script.edit.php
index 18782bb0bbd..6634106af6c 100644
--- a/frontends/php/include/views/administration.script.edit.php
+++ b/frontends/php/include/views/administration.script.edit.php
@@ -27,7 +27,6 @@ $scriptsWidget->addPageHeader(_('CONFIGURATION OF SCRIPTS'));
 $scriptForm = new CForm();
 $scriptForm->setName('scripts');
 $scriptForm->addVar('form', $this->get('form'));
-$scriptForm->addVar('form_refresh', $this->get('form_refresh') + 1);
 
 if ($this->get('scriptid')) {
 	$scriptForm->addVar('scriptid', $this->get('scriptid'));
@@ -70,7 +69,7 @@ $scriptFormList->addRow(
 $scriptFormList->addRow(_('Description'), new CTextArea('description', $this->get('description')));
 
 // user groups
-$userGroups = new CCombobox('usrgrpid', $this->get('usrgrpid'));
+$userGroups = new CComboBox('usrgrpid', $this->get('usrgrpid'));
 $userGroups->addItem(0, _('All'));
 foreach ($this->getArray('usergroups') as $userGroup){
 	$userGroups->addItem($userGroup['usrgrpid'], $userGroup['name']);
@@ -78,7 +77,7 @@ foreach ($this->getArray('usergroups') as $userGroup){
 $scriptFormList->addRow(_('User group'), $userGroups);
 
 // host groups
-$hostGroups = new CCombobox('hgstype', $this->get('hgstype'));
+$hostGroups = new CComboBox('hgstype', $this->get('hgstype'));
 $hostGroups->addItem(0, _('All'));
 $hostGroups->addItem(1, _('Selected'));
 $scriptFormList->addRow(_('Host group'), $hostGroups);
@@ -86,11 +85,16 @@ $scriptFormList->addRow(null, new CMultiSelect(array(
 	'name' => 'groupid',
 	'selectedLimit' => 1,
 	'objectName' => 'hostGroup',
-	'data' => $this->get('hostGroup')
+	'data' => $this->get('hostGroup'),
+	'popup' => array(
+		'parameters' => 'srctbl=host_groups&dstfrm='.$scriptForm->getName().'&dstfld1=groupid&srcfld1=groupid',
+		'width' => 450,
+		'height' => 450
+	)
 )), null, 'hostGroupSelection');
 
 // access
-$accessComboBox = new CCombobox('access', $this->get('access'));
+$accessComboBox = new CComboBox('host_access', $this->get('host_access'));
 $accessComboBox->addItem(PERM_READ, _('Read'));
 $accessComboBox->addItem(PERM_READ_WRITE, _('Write'));
 $scriptFormList->addRow(_('Required host permissions'), $accessComboBox);
@@ -98,7 +102,6 @@ $scriptFormList->addRow(new CLabel(_('Enable confirmation'), 'enableConfirmation
 	new CCheckBox('enableConfirmation', $this->get('enableConfirmation')));
 
 $confirmationLabel = new CLabel(_('Confirmation text'), 'confirmation');
-$confirmationLabel->setAttribute('id', 'confirmationLabel');
 $scriptFormList->addRow($confirmationLabel, array(
 	new CTextBox('confirmation', $this->get('confirmation'), ZBX_TEXTBOX_STANDARD_SIZE),
 	SPACE,
diff --git a/frontends/php/include/views/administration.script.list.php b/frontends/php/include/views/administration.script.list.php
index f4667ff4cde..c3fae91c3e5 100644
--- a/frontends/php/include/views/administration.script.list.php
+++ b/frontends/php/include/views/administration.script.list.php
@@ -35,10 +35,10 @@ $scriptsForm->setAttribute('id', 'scripts');
 $scriptsTable = new CTableInfo(_('No scripts found.'));
 $scriptsTable->setHeader(array(
 	new CCheckBox('all_scripts', null, "checkAll('".$scriptsForm->getName()."', 'all_scripts', 'scripts');"),
-	make_sorting_header(_('Name'), 'name'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Type'),
 	_('Execute on'),
-	make_sorting_header(_('Commands'), 'command'),
+	make_sorting_header(_('Commands'), 'command', $this->data['sort'], $this->data['sortorder']),
 	_('User group'),
 	_('Host group'),
 	_('Host access')
@@ -84,8 +84,9 @@ foreach ($this->data['scripts'] as $script) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('script.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected scripts?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/administration.usergroups.edit.php b/frontends/php/include/views/administration.usergroups.edit.php
index 17aedca60cc..6df685e4558 100644
--- a/frontends/php/include/views/administration.usergroups.edit.php
+++ b/frontends/php/include/views/administration.usergroups.edit.php
@@ -26,7 +26,6 @@ $userGroupWidget->addPageHeader(_('CONFIGURATION OF USER GROUPS'));
 $userGroupForm = new CForm();
 $userGroupForm->setName('userGroupsForm');
 $userGroupForm->addVar('form', $this->data['form']);
-$userGroupForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 $userGroupForm->addVar('group_rights', $this->data['group_rights']);
 if (isset($_REQUEST['usrgrpid'])) {
 	$userGroupForm->addVar('usrgrpid', $this->data['usrgrpid']);
diff --git a/frontends/php/include/views/administration.usergroups.list.php b/frontends/php/include/views/administration.usergroups.list.php
index 751f1af5e07..945d6448005 100644
--- a/frontends/php/include/views/administration.usergroups.list.php
+++ b/frontends/php/include/views/administration.usergroups.list.php
@@ -42,7 +42,7 @@ $userGroupsForm->setName('userGroupsForm');
 $userGroupTable = new CTableInfo(_('No user groups found.'));
 $userGroupTable->setHeader(array(
 	new CCheckBox('all_groups', null, "checkAll('".$userGroupsForm->getName()."','all_groups','group_groupid');"),
-	make_sorting_header(_('Name'), 'name'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	'#',
 	_('Members'),
 	_('Frontend access'),
@@ -54,8 +54,8 @@ foreach ($this->data['usergroups'] as $usrgrp) {
 	$userGroupId = $usrgrp['usrgrpid'];
 
 	$debugMode = ($usrgrp['debug_mode'] == GROUP_DEBUG_MODE_ENABLED)
-		? new CLink(_('Enabled'), 'usergrps.php?go=disable_debug&usrgrpid='.$userGroupId, 'orange')
-		: new CLink(_('Disabled'), 'usergrps.php?go=enable_debug&usrgrpid='.$userGroupId, 'enabled');
+		? new CLink(_('Enabled'), 'usergrps.php?action=usergroup.massdisabledebug&usrgrpid='.$userGroupId, 'orange')
+		: new CLink(_('Disabled'), 'usergrps.php?action=usergroup.massenabledebug&usrgrpid='.$userGroupId, 'enabled');
 
 	// gui access
 	$guiAccess = user_auth_type2str($usrgrp['gui_access']);
@@ -74,13 +74,13 @@ foreach ($this->data['usergroups'] as $usrgrp) {
 
 		$guiAccess = new CLink(
 			$guiAccess,
-			'usergrps.php?go=set_gui_access&set_gui_access='.$nextGuiAuth.'&usrgrpid='.$userGroupId,
+			'usergrps.php?action=usergroup.set_gui_access&set_gui_access='.$nextGuiAuth.'&usrgrpid='.$userGroupId,
 			$guiAccessStyle
 		);
 
 		$usersStatus = ($usrgrp['users_status'] == GROUP_STATUS_ENABLED)
-			? new CLink(_('Enabled'), 'usergrps.php?go=disable_status&usrgrpid='.$userGroupId, 'enabled')
-			: new CLink(_('Disabled'), 'usergrps.php?go=enable_status&usrgrpid='.$userGroupId, 'disabled');
+			? new CLink(_('Enabled'), 'usergrps.php?action=usergroup.massdisable&usrgrpid='.$userGroupId, 'enabled')
+			: new CLink(_('Disabled'), 'usergrps.php?action=usergroup.massenable&usrgrpid='.$userGroupId, 'disabled');
 	}
 	else {
 		$guiAccess = new CSpan($guiAccess, $guiAccessStyle);
@@ -127,25 +127,25 @@ foreach ($this->data['usergroups'] as $usrgrp) {
 }
 
 // append GO buttons
-$goComboBox = new CComboBox('go');
+$goComboBox = new CComboBox('action');
 
-$goOption = new CComboItem('enable_status', _('Enable selected'));
+$goOption = new CComboItem('usergroup.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected groups?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable_status', _('Disable selected'));
+$goOption = new CComboItem('usergroup.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected groups?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('enable_debug', _('Enable debug mode'));
+$goOption = new CComboItem('usergroup.massenabledebug', _('Enable debug mode'));
 $goOption->setAttribute('confirm', _('Enable debug mode in selected groups?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable_debug', _('Disable debug mode'));
+$goOption = new CComboItem('usergroup.massdisabledebug', _('Disable debug mode'));
 $goOption->setAttribute('confirm', _('Disable debug mode in selected groups?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('usergroup.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected groups?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/administration.users.edit.php b/frontends/php/include/views/administration.users.edit.php
index cc88cc18d71..cbb4ffc96c1 100644
--- a/frontends/php/include/views/administration.users.edit.php
+++ b/frontends/php/include/views/administration.users.edit.php
@@ -33,9 +33,8 @@ else {
 // create form
 $userForm = new CForm();
 $userForm->setName('userForm');
-$userForm->addVar('config', get_request('config', 0));
+$userForm->addVar('config', getRequest('config', 0));
 $userForm->addVar('form', $this->data['form']);
-$userForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 
 if (isset($_REQUEST['userid'])) {
 	$userForm->addVar('userid', $this->data['userid']);
@@ -50,7 +49,7 @@ if (!$data['is_profile']) {
 	$nameTextBox = new CTextBox('alias', $this->data['alias'], ZBX_TEXTBOX_STANDARD_SIZE);
 	$nameTextBox->attr('autofocus', 'autofocus');
 	$userFormList->addRow(_('Alias'), $nameTextBox);
-	$userFormList->addRow(_('Name'), new CTextBox('name', $this->data['name'], ZBX_TEXTBOX_STANDARD_SIZE));
+	$userFormList->addRow(_x('Name', 'user first name'), new CTextBox('name', $this->data['name'], ZBX_TEXTBOX_STANDARD_SIZE));
 	$userFormList->addRow(_('Surname'), new CTextBox('surname', $this->data['surname'], ZBX_TEXTBOX_STANDARD_SIZE));
 }
 
@@ -161,8 +160,11 @@ else {
 	$autologoutTextBox->setAttribute('disabled', 'disabled');
 }
 
-$userFormList->addRow(_('Auto-login'), new CCheckBox('autologin', $this->data['autologin'], null, 1));
-$userFormList->addRow(_('Auto-logout (min 90 seconds)'), array($autologoutCheckBox, $autologoutTextBox));
+if ($this->data['alias'] != ZBX_GUEST_USER) {
+	$userFormList->addRow(_('Auto-login'), new CCheckBox('autologin', $this->data['autologin'], null, 1));
+	$userFormList->addRow(_('Auto-logout (min 90 seconds)'), array($autologoutCheckBox, $autologoutTextBox));
+}
+
 $userFormList->addRow(_('Refresh (in seconds)'), new CNumericBox('refresh', $this->data['refresh'], 4));
 $userFormList->addRow(_('Rows per page'), new CNumericBox('rows_per_page', $this->data['rows_per_page'], 6));
 $userFormList->addRow(_('URL (after login)'), new CTextBox('url', $this->data['url'], ZBX_TEXTBOX_STANDARD_SIZE));
@@ -197,7 +199,7 @@ if (uint_in_array(CWebUser::$data['type'], array(USER_TYPE_ZABBIX_ADMIN, USER_TY
 		foreach (getSeverityCaption() as $key => $caption) {
 			$mediaActive = ($media['severity'] & (1 << $key));
 
-			$mediaSeverity[$key] = new CSpan(zbx_substr($caption, 0, 1), $mediaActive ? 'enabled' : null);
+			$mediaSeverity[$key] = new CSpan(mb_substr($caption, 0, 1), $mediaActive ? 'enabled' : null);
 			$mediaSeverity[$key]->setHint($caption.($mediaActive ? ' (on)' : ' (off)'));
 		}
 
@@ -247,7 +249,7 @@ if ($this->data['is_profile']) {
 		SPACE,
 		$soundList,
 		new CButton('start', _('Play'), "javascript: testUserSound('messages_sounds.recovery');", 'formlist'),
-		new CButton('stop', _('Stop'), 'javascript: AudioList.stopAll();', 'formlist')
+		new CButton('stop', _('Stop'), 'javascript: AudioControl.stop();', 'formlist')
 	);
 
 	$triggersTable = new CTable('', 'invisible');
@@ -284,7 +286,7 @@ if ($this->data['is_profile']) {
 			SPACE,
 			$soundList,
 			new CButton('start', _('Play'), "javascript: testUserSound('messages_sounds.".$severity."');", 'formlist'),
-			new CButton('stop', _('Stop'), 'javascript: AudioList.stopAll();', 'formlist')
+			new CButton('stop', _('Stop'), 'javascript: AudioControl.stop();', 'formlist')
 		));
 
 		zbx_subarray_push($msgVisibility, 1, 'messages[triggers.severities]['.$severity.']');
diff --git a/frontends/php/include/views/administration.users.list.php b/frontends/php/include/views/administration.users.list.php
index d30394c2fa9..c9eb1f8866b 100644
--- a/frontends/php/include/views/administration.users.list.php
+++ b/frontends/php/include/views/administration.users.list.php
@@ -51,10 +51,10 @@ $usersForm->setName('userForm');
 $usersTable = new CTableInfo(_('No users found.'));
 $usersTable->setHeader(array(
 	new CCheckBox('all_users', null, "checkAll('".$usersForm->getName()."', 'all_users', 'group_userid');"),
-	make_sorting_header(_('Alias'), 'alias'),
-	make_sorting_header(_('Name'), 'name'),
-	make_sorting_header(_('Surname'), 'surname'),
-	make_sorting_header(_('User type'), 'type'),
+	make_sorting_header(_('Alias'), 'alias', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_x('Name', 'user first name'), 'name', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Surname'), 'surname', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('User type'), 'type', $this->data['sort'], $this->data['sortorder']),
 	_('Groups'),
 	_('Is online?'),
 	_('Login'),
@@ -72,8 +72,8 @@ foreach ($this->data['users'] as $user) {
 		$onlineTime = ($user['autologout'] == 0 || ZBX_USER_ONLINE_TIME < $user['autologout']) ? ZBX_USER_ONLINE_TIME : $user['autologout'];
 
 		$online = (($session['lastaccess'] + $onlineTime) >= time())
-			? new CCol(_('Yes').' ('.date('r', $session['lastaccess']).')', 'enabled')
-			: new CCol(_('No').' ('.date('r', $session['lastaccess']).')', 'disabled');
+			? new CCol(_('Yes').' ('.zbx_date2str(DATE_TIME_FORMAT_SECONDS, $session['lastaccess']).')', 'enabled')
+			: new CCol(_('No').' ('.zbx_date2str(DATE_TIME_FORMAT_SECONDS, $session['lastaccess']).')', 'disabled');
 	}
 	else {
 		$online = new CCol(_('No'), 'disabled');
@@ -81,7 +81,7 @@ foreach ($this->data['users'] as $user) {
 
 	// blocked
 	$blocked = ($user['attempt_failed'] >= ZBX_LOGIN_ATTEMPTS)
-		? new CLink(_('Blocked'), 'users.php?go=unblock&group_userid'.SQUAREBRACKETS.'='.$userId, 'on')
+		? new CLink(_('Blocked'), 'users.php?action=user.massunblock&group_userid[]='.$userId, 'on')
 		: new CSpan(_('Ok'), 'green');
 
 	// user groups
@@ -146,13 +146,16 @@ foreach ($this->data['users'] as $user) {
 }
 
 // append Go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('unblock', _('Unblock selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('user.massunblock', _('Unblock selected'));
 $goOption->setAttribute('confirm', _('Unblock selected users?'));
 $goComboBox->addItem($goOption);
-$goOption = new CComboItem('delete', _('Delete selected'));
+
+$goOption = new CComboItem('user.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected users?'));
 $goComboBox->addItem($goOption);
+
 $goButton = new CSubmit('goButton', _('Go').' (0)');
 $goButton->setAttribute('id', 'goButton');
 zbx_add_post_js('chkbxRange.pageGoName = "group_userid";');
diff --git a/frontends/php/include/views/common.filter.trigger.php b/frontends/php/include/views/common.filter.trigger.php
new file mode 100644
index 00000000000..804073516b9
--- /dev/null
+++ b/frontends/php/include/views/common.filter.trigger.php
@@ -0,0 +1,150 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/js/common.filter.trigger.js.php';
+
+$overview = $this->data['overview'];
+$filter = $this->data['filter'];
+
+$config = select_config();
+
+$filterForm = new CFormTable(null, null, 'get');
+$filterForm->setTableClass('formtable old-filter');
+$filterForm->setAttribute('name', 'zbx_filter');
+$filterForm->setAttribute('id', 'zbx_filter');
+$filterForm->addVar('fullscreen', $filter['fullScreen']);
+$filterForm->addVar('groupid', $filter['groupId']);
+$filterForm->addVar('hostid', $filter['hostId']);
+
+// trigger status
+$filterForm->addRow(_('Triggers status'), new CComboBox('show_triggers', $filter['showTriggers'], null, array(
+	TRIGGERS_OPTION_ALL => _('Any'),
+	TRIGGERS_OPTION_RECENT_PROBLEM => _('Recent problem'),
+	TRIGGERS_OPTION_IN_PROBLEM => _('Problem')
+)));
+
+// ack status
+if ($config['event_ack_enable']) {
+	$filterForm->addRow(_('Acknowledge status'), new CComboBox('ack_status', $filter['ackStatus'], null, array(
+		ZBX_ACK_STS_ANY => _('Any'),
+		ZBX_ACK_STS_WITH_UNACK => _('With unacknowledged events'),
+		ZBX_ACK_STS_WITH_LAST_UNACK => _('With last event unacknowledged')
+	)));
+}
+
+// events
+if (!$overview) {
+	$eventsComboBox = new CComboBox('show_events', $filter['showEvents'], null, array(
+		EVENTS_OPTION_NOEVENT => _('Hide all'),
+		EVENTS_OPTION_ALL => _n('Show all (%1$s day)', 'Show all (%1$s days)', $config['event_expire'])
+	));
+	if ($config['event_ack_enable']) {
+		$eventsComboBox->addItem(EVENTS_OPTION_NOT_ACK,
+			_n('Show unacknowledged (%1$s day)', 'Show unacknowledged (%1$s days)', $config['event_expire'])
+		);
+	}
+	$filterForm->addRow(_('Events'), $eventsComboBox);
+}
+
+// min severity
+$filterForm->addRow(_('Minimum trigger severity'),
+	new CComboBox('show_severity', $filter['showSeverity'], null, array(
+		TRIGGER_SEVERITY_NOT_CLASSIFIED => getSeverityCaption(TRIGGER_SEVERITY_NOT_CLASSIFIED),
+		TRIGGER_SEVERITY_INFORMATION => getSeverityCaption(TRIGGER_SEVERITY_INFORMATION),
+		TRIGGER_SEVERITY_WARNING => getSeverityCaption(TRIGGER_SEVERITY_WARNING),
+		TRIGGER_SEVERITY_AVERAGE => getSeverityCaption(TRIGGER_SEVERITY_AVERAGE),
+		TRIGGER_SEVERITY_HIGH => getSeverityCaption(TRIGGER_SEVERITY_HIGH),
+		TRIGGER_SEVERITY_DISASTER => getSeverityCaption(TRIGGER_SEVERITY_DISASTER)
+	)
+));
+
+// age less than
+$statusChangeDays = new CNumericBox('status_change_days', $filter['statusChangeDays'], 3, false, false, false);
+if (!$filter['statusChange']) {
+	$statusChangeDays->setAttribute('disabled', 'disabled');
+}
+$statusChangeDays->addStyle('vertical-align: middle;');
+
+$statusChangeCheckBox = new CCheckBox('status_change', $filter['statusChange'],
+	'javascript: this.checked ? $("status_change_days").enable() : $("status_change_days").disable()', 1
+);
+$statusChangeCheckBox->addStyle('vertical-align: middle;');
+
+$daysSpan = new CSpan(_('days'));
+$daysSpan->addStyle('vertical-align: middle;');
+$filterForm->addRow(_('Age less than'), array($statusChangeCheckBox, $statusChangeDays, SPACE, $daysSpan));
+
+// name
+$filterForm->addRow(_('Filter by name'), new CTextBox('txt_select', $filter['txtSelect'], 40));
+
+// application
+$filterForm->addRow(_('Filter by application'), array(
+	new CTextBox('application', $filter['application'], 40),
+	new CButton('application_name', _('Select'),
+		'return PopUp("popup.php?srctbl=applications&srcfld1=name&real_hosts=1&dstfld1=application&with_applications=1'.
+		'&dstfrm='.$filterForm->getName().'");',
+		'filter-button'
+	)
+));
+
+// inventory filter
+$inventoryFilters = $filter['inventory'];
+if (!$inventoryFilters) {
+	$inventoryFilters = array(
+		array('field' => '', 'value' => '')
+	);
+}
+$inventoryFields = array();
+foreach (getHostInventories() as $inventory) {
+	$inventoryFields[$inventory['db_field']] = $inventory['title'];
+}
+
+$inventoryFilterTable = new CTable();
+$inventoryFilterTable->setAttribute('id', 'inventory-filter');
+$i = 0;
+foreach ($inventoryFilters as $field) {
+	$inventoryFilterTable->addRow(array(
+		new CComboBox('inventory['.$i.'][field]', $field['field'], null, $inventoryFields),
+		new CTextBox('inventory['.$i.'][value]', $field['value'], 20),
+		new CButton('inventory['.$i.'][remove]', _('Remove'), null, 'link_menu element-table-remove')
+	), 'form_row');
+
+	$i++;
+}
+$inventoryFilterTable->addRow(
+	new CCol(new CButton('inventory_add', _('Add'), null, 'link_menu element-table-add'), null, 3)
+);
+$filterForm->addRow(_('Filter by host inventory'), $inventoryFilterTable);
+
+// maintenance filter
+$filterForm->addRow(_('Show hosts in maintenance'),
+	new CCheckBox('show_maintenance', $filter['showMaintenance'], null, 1)
+);
+
+// show details
+if (!$overview) {
+	$filterForm->addRow(_('Show details'), new CCheckBox('show_details', $filter['showDetails'], null, 1));
+}
+
+// buttons
+$filterForm->addItemToBottomRow(new CSubmit('filter_set', _('Filter'), 'chkbxRange.clearSelectedOnFilterChange();'));
+$filterForm->addItemToBottomRow(new CSubmit('filter_rst', _('Reset'), 'chkbxRange.clearSelectedOnFilterChange();'));
+
+return $filterForm;
diff --git a/frontends/php/include/views/common.macros.php b/frontends/php/include/views/common.macros.php
index 455074d7ab3..e2588002874 100644
--- a/frontends/php/include/views/common.macros.php
+++ b/frontends/php/include/views/common.macros.php
@@ -44,7 +44,7 @@ foreach ($macros as $i => $macro) {
 	$text1->setAttribute('placeholder', '{$MACRO}');
 	$text2 = new CTextBox('macros['.$i.'][value]', $macro['value'], 40, $readonly, 255);
 	$text2->setAttribute('placeholder', _('value'));
-	$span = new CSpan(RARR);
+	$span = new CSpan('&rArr;');
 	$span->addStyle('vertical-align:top;');
 
 	$deleteButtonCell = null;
diff --git a/frontends/php/include/views/conf.import.php b/frontends/php/include/views/conf.import.php
index 6d45b8dd84f..1186d2008a6 100644
--- a/frontends/php/include/views/conf.import.php
+++ b/frontends/php/include/views/conf.import.php
@@ -18,9 +18,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+include dirname(__FILE__).'/js/conf.import.js.php';
 
 $rulesTable = new CTable(null, 'formElementTable');
-$rulesTable->setHeader(array(SPACE, _('Update existing'), _('Add missing')), 'bold');
+$rulesTable->setHeader(array(SPACE, _('Update existing'), _('Create new'), _('Delete missing')), 'bold');
 
 $titles = array(
 	'groups' => _('Groups'),
@@ -28,6 +29,7 @@ $titles = array(
 	'templates' => _('Templates'),
 	'templateScreens' => _('Template screens'),
 	'templateLinkage' => _('Template linkage'),
+	'applications' => _('Applications'),
 	'items' => _('Items'),
 	'discoveryRules' => _('Discovery rules'),
 	'triggers' => _('Triggers'),
@@ -38,7 +40,9 @@ $titles = array(
 );
 $rules = $this->get('rules');
 foreach ($titles as $key => $title) {
-	$cbExist = $cbMissed = SPACE;
+	$cbExist = null;
+	$cbMissed = null;
+	$cbDeleted = null;
 
 	if (isset($rules[$key]['updateExisting'])) {
 		$cbExist = new CCheckBox('rules['.$key.'][updateExisting]', $rules[$key]['updateExisting'], null, 1);
@@ -56,7 +60,17 @@ foreach ($titles as $key => $title) {
 		$cbMissed = new CCheckBox('rules['.$key.'][createMissing]', $rules[$key]['createMissing'], null, 1);
 	}
 
-	$rulesTable->addRow(array($title, new CCol($cbExist, 'center'), new CCol($cbMissed, 'center')));
+	if (isset($rules[$key]['deleteMissing'])) {
+		$cbDeleted = new CCheckBox('rules['.$key.'][deleteMissing]', $rules[$key]['deleteMissing'], null, 1);
+		$cbDeleted->setAttribute('class', 'input checkbox pointer deleteMissing');
+	}
+
+	$rulesTable->addRow(array(
+		$title,
+		new CCol($cbExist, 'center'),
+		new CCol($cbMissed, 'center'),
+		new CCol($cbDeleted, 'center')
+	));
 }
 
 // form list
diff --git a/frontends/php/include/views/configuration.action.edit.php b/frontends/php/include/views/configuration.action.edit.php
index 31c9dc0735e..7a07828cb85 100644
--- a/frontends/php/include/views/configuration.action.edit.php
+++ b/frontends/php/include/views/configuration.action.edit.php
@@ -72,7 +72,7 @@ $conditionTable->attr('style', 'min-width: 350px;');
 $conditionTable->setHeader(array(_('Label'), _('Name'), _('Action')));
 
 $i = 0;
-foreach ($this->data['action']['conditions'] as $condition) {
+foreach ($this->data['action']['filter']['conditions'] as $condition) {
 	if (!isset($condition['conditiontype'])) {
 		$condition['conditiontype'] = 0;
 	}
@@ -86,7 +86,8 @@ foreach ($this->data['action']['conditions'] as $condition) {
 		continue;
 	}
 
-	$label = num2letter($i);
+	$label = isset($condition['formulaid']) ? $condition['formulaid'] : num2letter($i);
+
 	$labelSpan = new CSpan($label, 'label');
 	$labelSpan->setAttribute('data-conditiontype', $condition['conditiontype']);
 	$labelSpan->setAttribute('data-formulaid', $label);
@@ -98,7 +99,8 @@ foreach ($this->data['action']['conditions'] as $condition) {
 			array(
 				new CButton('remove', _('Remove'), 'javascript: removeCondition('.$i.');', 'link_menu'),
 				new CVar('conditions['.$i.']', $condition)
-			)
+			),
+			new CVar('conditions[' . $i . '][formulaid]', $label)
 		),
 		null, 'conditions_'.$i
 	);
@@ -106,11 +108,30 @@ foreach ($this->data['action']['conditions'] as $condition) {
 	$i++;
 }
 
-$calculationTypeComboBox = new CComboBox('evaltype', $this->data['action']['evaltype'], 'submit()');
+$formula = new CTextBox('formula', $this->data['action']['filter']['formula'], ZBX_TEXTBOX_STANDARD_SIZE);
+$formula->attr('id', 'formula');
+$formula->attr('placeholder', 'A or (B and C) &hellip;');
+if ($this->data['action']['filter']['evaltype'] != CONDITION_EVAL_TYPE_EXPRESSION)  {
+	$formula->addClass('hidden');
+}
+
+$calculationTypeComboBox = new CComboBox('evaltype', $this->data['action']['filter']['evaltype'], 'processTypeOfCalculation()');
 $calculationTypeComboBox->addItem(CONDITION_EVAL_TYPE_AND_OR, _('And/Or'));
 $calculationTypeComboBox->addItem(CONDITION_EVAL_TYPE_AND, _('And'));
 $calculationTypeComboBox->addItem(CONDITION_EVAL_TYPE_OR, _('Or'));
-$conditionFormList->addRow(_('Type of calculation'), array($calculationTypeComboBox, new CSpan('', null, 'conditionLabel')), false, 'conditionRow');
+$calculationTypeComboBox->addItem(CONDITION_EVAL_TYPE_EXPRESSION, _('Custom expression'));
+$calculationTypeComboBox->setAttribute('id', 'evaltype');
+
+$conditionFormList->addRow(
+	_('Type of calculation'),
+	array(
+		$calculationTypeComboBox,
+		new CSpan('', ($this->data['action']['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) ? 'hidden' : '', 'conditionLabel'),
+		$formula
+	),
+	false,
+	'conditionRow'
+);
 $conditionFormList->addRow(_('Conditions'), new CDiv($conditionTable, 'objectgroup inlineblock border_dotted ui-corner-all'));
 
 // append new condition to form list
@@ -139,7 +160,13 @@ switch ($this->data['new_condition']['conditiontype']) {
 			'objectOptions' => array(
 				'editable' => true
 			),
-			'defaultValue' => 0
+			'defaultValue' => 0,
+			'popup' => array(
+				'parameters' => 'srctbl=host_groups&dstfrm='.$actionForm->getName().'&dstfld1=new_condition_value_'.
+					'&srcfld1=groupid&writeonly=1&multiselect=1',
+				'width' => 450,
+				'height' => 450
+			)
 		));
 		break;
 
@@ -150,7 +177,13 @@ switch ($this->data['new_condition']['conditiontype']) {
 			'objectOptions' => array(
 				'editable' => true
 			),
-			'defaultValue' => 0
+			'defaultValue' => 0,
+			'popup' => array(
+				'parameters' => 'srctbl=templates&srcfld1=hostid&srcfld2=host&dstfrm='.$actionForm->getName().
+					'&dstfld1=new_condition_value_&templated_hosts=1&multiselect=1&writeonly=1',
+				'width' => 450,
+				'height' => 450
+			)
 		));
 		break;
 
@@ -161,7 +194,13 @@ switch ($this->data['new_condition']['conditiontype']) {
 			'objectOptions' => array(
 				'editable' => true
 			),
-			'defaultValue' => 0
+			'defaultValue' => 0,
+			'popup' => array(
+				'parameters' => 'srctbl=hosts&dstfrm='.$actionForm->getName().'&dstfld1=new_condition_value_'.
+					'&srcfld1=hostid&writeonly=1&multiselect=1',
+				'width' => 450,
+				'height' => 450
+			)
 		));
 		break;
 
@@ -172,7 +211,13 @@ switch ($this->data['new_condition']['conditiontype']) {
 			'objectOptions' => array(
 				'editable' => true
 			),
-			'defaultValue' => 0
+			'defaultValue' => 0,
+			'popup' => array(
+				'parameters' => 'srctbl=triggers&dstfrm='.$actionForm->getName().'&dstfld1=new_condition_value_'.
+					'&srcfld1=triggerid&writeonly=1&multiselect=1&noempty=1',
+				'width' => 600,
+				'height' => 450
+			)
 		));
 		break;
 
@@ -203,7 +248,7 @@ switch ($this->data['new_condition']['conditiontype']) {
 	case CONDITION_TYPE_DRULE:
 		$conditionFormList->addItem(new CVar('new_condition[value]', '0'));
 		$condition = array(
-			new CTextBox('drule', '', ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+			new CTextBox('drule', '', ZBX_TEXTBOX_STANDARD_SIZE, true),
 			SPACE,
 			new CButton('btn1', _('Select'),
 				'return PopUp("popup.php?srctbl=drules&srcfld1=druleid&srcfld2=name'.
@@ -216,7 +261,7 @@ switch ($this->data['new_condition']['conditiontype']) {
 	case CONDITION_TYPE_DCHECK:
 		$conditionFormList->addItem(new CVar('new_condition[value]', '0'));
 		$condition = array(
-			new CTextBox('dcheck', '', ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+			new CTextBox('dcheck', '', ZBX_TEXTBOX_STANDARD_SIZE, true),
 			SPACE,
 			new CButton('btn1', _('Select'),
 				'return PopUp("popup.php?srctbl=dchecks&srcfld1=dcheckid&srcfld2=name'.
@@ -229,7 +274,7 @@ switch ($this->data['new_condition']['conditiontype']) {
 	case CONDITION_TYPE_PROXY:
 		$conditionFormList->addItem(new CVar('new_condition[value]', '0'));
 		$condition = array(
-			new CTextBox('proxy', '', ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+			new CTextBox('proxy', '', ZBX_TEXTBOX_STANDARD_SIZE, true),
 			SPACE,
 			new CButton('btn1', _('Select'),
 				'return PopUp("popup.php?srctbl=proxies&srcfld1=hostid&srcfld2=host'.
@@ -313,7 +358,7 @@ $operationFormList = new CFormList('operationlist');
 
 if ($this->data['eventsource'] == EVENT_SOURCE_TRIGGERS || $this->data['eventsource'] == EVENT_SOURCE_INTERNAL) {
 	$operationFormList->addRow(_('Default operation step duration'), array(
-		new CNumericBox('esc_period', $this->data['action']['esc_period'], 6, 'no'),
+		new CNumericBox('esc_period', $this->data['action']['esc_period'], 6),
 		' ('._('minimum 60 seconds').')')
 	);
 }
@@ -411,6 +456,7 @@ $operationFormList->addRow(_('Action operations'), new CDiv(array($operationsTab
 if (!empty($this->data['new_operation'])) {
 	$newOperationsTable = new CTable(null, 'formElementTable');
 	$newOperationsTable->addItem(new CVar('new_operation[action]', $this->data['new_operation']['action']));
+	$newOperationsTable->addItem(new CVar('new_operation[actionid]', $this->data['actionid']));
 
 	if (isset($this->data['new_operation']['id'])) {
 		$newOperationsTable->addItem(new CVar('new_operation[id]', $this->data['new_operation']['id']));
@@ -784,17 +830,26 @@ if (!empty($this->data['new_operation'])) {
 			$groupList = new CTable();
 			$groupList->setAttribute('id', 'opGroupList');
 			$groupList->addRow(new CRow(
-				new CCol(array(
+				new CCol(
 					new CMultiSelect(array(
 						'name' => 'discoveryHostGroup',
 						'objectName' => 'hostGroup',
-						'objectOptions' => array('editable' => true)
+						'objectOptions' => array('editable' => true),
+						'popup' => array(
+							'parameters' => 'srctbl=host_groups&dstfrm='.$actionForm->getName().
+								'&dstfld1=discoveryHostGroup&srcfld1=groupid&writeonly=1&multiselect=1',
+							'width' => 450,
+							'height' => 450
+						)
 					)),
-					new CButton('add', _('Add'), 'return addDiscoveryHostGroup();', 'link_menu')
-				), null, 2),
+					null, 2
+				),
 				null,
 				'opGroupListFooter'
 			));
+			$groupList->addRow(new CCol(
+				new CButton('add', _('Add'), 'return addDiscoveryHostGroup();', 'link_menu'), null, 2
+			));
 
 			// load host groups
 			$groupIds = isset($this->data['new_operation']['opgroup'])
@@ -829,17 +884,26 @@ if (!empty($this->data['new_operation'])) {
 			$templateList = new CTable();
 			$templateList->setAttribute('id', 'opTemplateList');
 			$templateList->addRow(new CRow(
-				new CCol(array(
+				new CCol(
 					new CMultiSelect(array(
 						'name' => 'discoveryTemplates',
 						'objectName' => 'templates',
-						'objectOptions' => array('editable' => true)
+						'objectOptions' => array('editable' => true),
+						'popup' => array(
+							'parameters' => 'srctbl=templates&srcfld1=hostid&srcfld2=host&dstfrm='.$actionForm->getName().
+								'&dstfld1=discoveryTemplates&templated_hosts=1&multiselect=1&writeonly=1',
+							'width' => 450,
+							'height' => 450
+						)
 					)),
-					new CButton('add', _('Add'), 'return addDiscoveryTemplates();', 'link_menu')
-				), null, 2),
+					null, 2
+				),
 				null,
 				'opTemplateListFooter'
 			));
+			$templateList->addRow(new CCol(
+				new CButton('add', _('Add'), 'return addDiscoveryTemplates();', 'link_menu'), null, 2
+			));
 
 			// load templates
 			$templateIds = isset($this->data['new_operation']['optemplate'])
@@ -944,7 +1008,7 @@ if (!empty($this->data['new_operation'])) {
 
 		$allowedOpConditions = get_opconditions_by_eventsource($this->data['eventsource']);
 
-		$new_opcondition = get_request('new_opcondition', array());
+		$new_opcondition = getRequest('new_opcondition', array());
 		if (!is_array($new_opcondition)) {
 			$new_opcondition = array();
 		}
diff --git a/frontends/php/include/views/configuration.action.list.php b/frontends/php/include/views/configuration.action.list.php
index 8d9174e65af..5f547b0e8bd 100644
--- a/frontends/php/include/views/configuration.action.list.php
+++ b/frontends/php/include/views/configuration.action.list.php
@@ -48,16 +48,16 @@ $actionForm->setName('actionForm');
 $actionTable = new CTableInfo(_('No actions found.'));
 $actionTable->setHeader(array(
 	new CCheckBox('all_items', null, "checkAll('".$actionForm->getName()."', 'all_items', 'g_actionid');"),
-	make_sorting_header(_('Name'), 'name'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Conditions'),
 	_('Operations'),
-	make_sorting_header(_('Status'), 'status')
+	make_sorting_header(_('Status'), 'status', $this->data['sort'], $this->data['sortorder'])
 ));
 
 foreach ($this->data['actions'] as $action) {
 	$conditions = array();
-	order_result($action['conditions'], 'conditiontype', ZBX_SORT_DOWN);
-	foreach ($action['conditions'] as $condition) {
+	order_result($action['filter']['conditions'], 'conditiontype', ZBX_SORT_DOWN);
+	foreach ($action['filter']['conditions'] as $condition) {
 		$conditions[] = get_condition_desc($condition['conditiontype'], $condition['operator'], $condition['value']);
 		$conditions[] = BR();
 	}
@@ -70,13 +70,13 @@ foreach ($this->data['actions'] as $action) {
 
 	if ($action['status'] == ACTION_STATUS_DISABLED) {
 		$status = new CLink(_('Disabled'),
-			'actionconf.php?go=activate&g_actionid'.SQUAREBRACKETS.'='.$action['actionid'].url_param('eventsource'),
+			'actionconf.php?action=action.massenable&g_actionid[]='.$action['actionid'].url_param('eventsource'),
 			'disabled'
 		);
 	}
 	else {
 		$status = new CLink(_('Enabled'),
-			'actionconf.php?go=disable&g_actionid'.SQUAREBRACKETS.'='.$action['actionid'].url_param('eventsource'),
+			'actionconf.php?action=action.massdisable&g_actionid[]='.$action['actionid'].url_param('eventsource'),
 			'enabled'
 		);
 	}
@@ -91,16 +91,17 @@ foreach ($this->data['actions'] as $action) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('action.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected actions?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('action.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected actions?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('action.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected actions?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/configuration.application.list.php b/frontends/php/include/views/configuration.application.list.php
index ecfede4252e..f63051f7357 100644
--- a/frontends/php/include/views/configuration.application.list.php
+++ b/frontends/php/include/views/configuration.application.list.php
@@ -58,7 +58,7 @@ $applicationTable = new CTableInfo(_('No applications found.'));
 $applicationTable->setHeader(array(
 	new CCheckBox('all_applications', null, "checkAll('".$applicationForm->getName()."', 'all_applications', 'applications');"),
 	($this->data['hostid'] > 0) ? null : _('Host'),
-	make_sorting_header(_('Application'), 'name'),
+	make_sorting_header(_('Application'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Show')
 ));
 
@@ -106,16 +106,17 @@ foreach ($this->data['applications'] as $application) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('application.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected applications?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('application.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected applications?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('application.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected applications?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/configuration.copy.elements.php b/frontends/php/include/views/configuration.copy.elements.php
index d429a28c8c2..04a1d182ca6 100644
--- a/frontends/php/include/views/configuration.copy.elements.php
+++ b/frontends/php/include/views/configuration.copy.elements.php
@@ -36,7 +36,7 @@ $triggersForm = new CForm();
 $triggersForm->setName('triggersForm');
 $triggersForm->addVar($this->data['elements_field'], $this->data['elements']);
 $triggersForm->addVar('hostid', $this->data['hostid']);
-$triggersForm->addVar('go', 'copy_to');
+$triggersForm->addVar('action', $this->data['action']);
 
 // create form list
 $triggersFormList = new CFormList('triggersFormList');
@@ -106,7 +106,11 @@ $triggersFormList->addRow(_('Target'), $targets);
 
 // append tabs to form
 $triggersTab = new CTabView();
-$triggersTab->addTab('triggersTab', count($this->data['elements']).SPACE._('elements copy to ...'), $triggersFormList);
+
+$triggersTab->addTab('triggersTab',
+	_n('Copy %1$s element to...', 'Copy %1$s elements to...', count($this->data['elements'])),
+	$triggersFormList
+);
 $triggersForm->addItem($triggersTab);
 
 // append buttons to form
diff --git a/frontends/php/include/views/configuration.discovery.edit.php b/frontends/php/include/views/configuration.discovery.edit.php
index a9d8de7a8d8..a4a3e69d296 100644
--- a/frontends/php/include/views/configuration.discovery.edit.php
+++ b/frontends/php/include/views/configuration.discovery.edit.php
@@ -28,7 +28,6 @@ $discoveryWidget->addPageHeader(_('CONFIGURATION OF DISCOVERY RULES'));
 $discoveryForm = new CForm();
 $discoveryForm->setName('discoveryForm');
 $discoveryForm->addVar('form', $this->data['form']);
-$discoveryForm->addVar('form_refresh', $this->data['form_refresh'] + 1);
 if (!empty($this->data['druleid'])) {
 	$discoveryForm->addVar('druleid', $this->data['druleid']);
 }
diff --git a/frontends/php/include/views/configuration.discovery.list.php b/frontends/php/include/views/configuration.discovery.list.php
index 024707d2867..3740f8716c5 100644
--- a/frontends/php/include/views/configuration.discovery.list.php
+++ b/frontends/php/include/views/configuration.discovery.list.php
@@ -37,7 +37,7 @@ $discoveryForm->setName('druleForm');
 $discoveryTable = new CTableInfo(_('No discovery rules found.'));
 $discoveryTable->setHeader(array(
 	new CCheckBox('all_drules', null, "checkAll('".$discoveryForm->getName()."', 'all_drules', 'g_druleid');"),
-	make_sorting_header(_('Name'), 'name'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('IP range'),
 	_('Delay'),
 	_('Checks'),
@@ -48,7 +48,7 @@ foreach ($data['drules'] as $drule) {
 
 	$status = new CCol(new CLink(
 		discovery_status2str($drule['status']),
-		'?g_druleid'.SQUAREBRACKETS.'='.$drule['druleid'].($drule['status'] == DRULE_STATUS_ACTIVE ? '&go=disable' : '&go=activate'),
+		'?g_druleid[]='.$drule['druleid'].'&action='.($drule['status'] == DRULE_STATUS_ACTIVE ? 'drule.massdisable' : 'drule.massenable'),
 		discovery_status2style($drule['status'])
 	));
 
@@ -63,16 +63,17 @@ foreach ($data['drules'] as $drule) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('drule.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected discovery rules?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('drule.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected discovery rules?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('drule.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected discovery rules?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/configuration.graph.edit.php b/frontends/php/include/views/configuration.graph.edit.php
index 996eb45715e..cc927ea56c0 100644
--- a/frontends/php/include/views/configuration.graph.edit.php
+++ b/frontends/php/include/views/configuration.graph.edit.php
@@ -34,7 +34,6 @@ else {
 $graphForm = new CForm();
 $graphForm->setName('graphForm');
 $graphForm->addVar('form', $this->data['form']);
-$graphForm->addVar('form_refresh', $this->data['form_refresh']);
 $graphForm->addVar('hostid', $this->data['hostid']);
 if (!empty($this->data['parent_discoveryid'])) {
 	$graphForm->addVar('parent_discoveryid', $this->data['parent_discoveryid']);
@@ -70,23 +69,34 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 
 	if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL) {
 		// percent left
-		$percentLeftTextBox = new CTextBox('percent_left', $this->data['percent_left'], 6, 'no', 7);
+		$percentLeftTextBox = new CTextBox('percent_left', $this->data['percent_left'], 6, false, 7);
 		$percentLeftCheckbox = new CCheckBox('visible[percent_left]', 1, 'javascript: showHideVisible("percent_left");', 1);
 
-		if ($this->data['percent_left'] == 0) {
+		if(isset($this->data['visible']) && isset($this->data['visible']['percent_left'])) {
+			$percentLeftTextBox->attr('style', '');
+			$percentLeftCheckbox->setChecked(1);
+		}
+		elseif ($this->data['percent_left'] == 0) {
 			$percentLeftTextBox->attr('style', 'visibility: hidden;');
 			$percentLeftCheckbox->setChecked(0);
 		}
+
 		$graphFormList->addRow(_('Percentile line (left)'), array($percentLeftCheckbox, SPACE, $percentLeftTextBox));
 
 		// percent right
-		$percentRightTextBox = new CTextBox('percent_right', $this->data['percent_right'], 6, 'no', 7);
+		$percentRightTextBox = new CTextBox('percent_right', $this->data['percent_right'], 6, false, 7);
 		$percentRightCheckbox = new CCheckBox('visible[percent_right]', 1, 'javascript: showHideVisible("percent_right");', 1);
 
-		if ($this->data['percent_right'] == 0) {
+		if(isset($this->data['visible']) && isset($this->data['visible']['percent_right'])) {
+			$percentRightTextBox->attr('style', '');
+			$percentRightCheckbox->setChecked(1);
+		}
+		elseif ($this->data['percent_right'] == 0) {
 			$percentRightTextBox->attr('style', 'visibility: hidden;');
 			$percentRightCheckbox->setChecked(0);
 		}
+
+
 		$graphFormList->addRow(_('Percentile line (right)'), array($percentRightCheckbox, SPACE, $percentRightTextBox));
 	}
 
@@ -115,7 +125,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 			$ymin_name = $min_host['name'].NAME_DELIMITER.$minItem['name_expanded'];
 		}
 
-		$yaxisMinData[] = new CTextBox('ymin_name', $ymin_name, 36, 'yes');
+		$yaxisMinData[] = new CTextBox('ymin_name', $ymin_name, 36, true);
 		$yaxisMinData[] = new CButton('yaxis_min', _('Select'), 'javascript: '.
 			'return PopUp("popup.php?dstfrm='.$graphForm->getName().
 				'&dstfld1=ymin_itemid'.
@@ -135,7 +145,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 					'&parent_discoveryid='.$this->data['parent_discoveryid'].
 					'&dstfld1=ymin_itemid'.
 					'&dstfld2=ymin_name'.
-					'&srctbl=prototypes'.
+					'&srctbl=item_prototypes'.
 					'&srcfld1=itemid'.
 					'&srcfld2=name'.
 					'&numeric=1", 0, 0, "zbx_popup_item");',
@@ -173,7 +183,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 			$ymax_name = $max_host['name'].NAME_DELIMITER.$maxItem['name_expanded'];
 		}
 
-		$yaxisMaxData[] = new CTextBox('ymax_name', $ymax_name, 36, 'yes');
+		$yaxisMaxData[] = new CTextBox('ymax_name', $ymax_name, 36, true);
 		$yaxisMaxData[] = new CButton('yaxis_max', _('Select'), 'javascript: '.
 			'return PopUp("popup.php?dstfrm='.$graphForm->getName().
 				'&dstfld1=ymax_itemid'.
@@ -193,7 +203,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 					'&parent_discoveryid='.$this->data['parent_discoveryid'].
 					'&dstfld1=ymax_itemid'.
 					'&dstfld2=ymax_name'.
-					'&srctbl=prototypes'.
+					'&srctbl=item_prototypes'.
 					'&srcfld1=itemid'.
 					'&srcfld2=name'.
 					'&numeric=1", 0, 0, "zbx_popup_item");',
@@ -243,7 +253,7 @@ if ($this->data['parent_discoveryid']) {
 			url_param($this->data['graphtype'], false, 'graphtype').
 			url_param('parent_discoveryid').
 			($this->data['normal_only'] ? '&normal_only=1' : '').
-			'&srctbl=prototypes&srcfld1=itemid&srcfld2=name&numeric=1", 800, 600);',
+			'&srctbl=item_prototypes&srcfld1=itemid&srcfld2=name&numeric=1", 800, 600);',
 		'link_menu'
 	);
 }
diff --git a/frontends/php/include/views/configuration.graph.list.php b/frontends/php/include/views/configuration.graph.list.php
index 071190d962a..f1e20a32631 100644
--- a/frontends/php/include/views/configuration.graph.list.php
+++ b/frontends/php/include/views/configuration.graph.list.php
@@ -74,10 +74,10 @@ $graphTable = new CTableInfo(!empty($this->data['parent_discoveryid']) ? _('No g
 $graphTable->setHeader(array(
 	new CCheckBox('all_graphs', null, "checkAll('".$graphForm->getName()."', 'all_graphs', 'group_graphid');"),
 	!empty($this->data['hostid']) ? null : _('Hosts'),
-	make_sorting_header(_('Name'), 'name'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Width'),
 	_('Height'),
-	make_sorting_header(_('Graph type'), 'graphtype')
+	make_sorting_header(_('Graph type'), 'graphtype', $this->data['sort'], $this->data['sortorder'])
 ));
 
 foreach ($this->data['graphs'] as $graph) {
@@ -150,12 +150,13 @@ foreach ($this->data['graphs'] as $graph) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
+$goComboBox = new CComboBox('action');
+
 if (!$this->data['parent_discoveryid']) {
-	$goComboBox->addItem('copy_to', _('Copy selected to ...'));
+	$goComboBox->addItem('graph.masscopyto', _('Copy selected to ...'));
 }
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('graph.massdelete', _('Delete selected'));
 $goOption->setAttribute(
 	'confirm',
 	$this->data['parent_discoveryid'] ? _('Delete selected graph prototypes?') : _('Delete selected graphs?')
diff --git a/frontends/php/include/views/configuration.host.discovery.edit.php b/frontends/php/include/views/configuration.host.discovery.edit.php
index 7d478305fbc..005363802a6 100644
--- a/frontends/php/include/views/configuration.host.discovery.edit.php
+++ b/frontends/php/include/views/configuration.host.discovery.edit.php
@@ -55,7 +55,7 @@ $itemFormList->addRow(_('Name'), $nameTextBox);
 if ($this->data['limited']) {
 	$itemForm->addVar('type', $this->data['type']);
 	$itemFormList->addRow(_('Type'),
-		new CTextBox('typename', item_type2str($this->data['type']), ZBX_TEXTBOX_STANDARD_SIZE, 'yes')
+		new CTextBox('typename', item_type2str($this->data['type']), ZBX_TEXTBOX_STANDARD_SIZE, true)
 	);
 }
 else {
@@ -109,11 +109,11 @@ $itemFormList->addRow(_('Context name'),
 	false, 'row_snmpv3_contextname'
 );
 $itemFormList->addRow(_('SNMP community'),
-	new CTextBox('snmp_community', $this->data['snmp_community'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64),
+	new CTextBox('snmp_community', $this->data['snmp_community'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64),
 	false, 'row_snmp_community'
 );
 $itemFormList->addRow(_('Security name'),
-	new CTextBox('snmpv3_securityname', $this->data['snmpv3_securityname'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64),
+	new CTextBox('snmpv3_securityname', $this->data['snmpv3_securityname'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64),
 	false, 'row_snmpv3_securityname'
 );
 
@@ -134,7 +134,7 @@ $itemFormList->addRow(_('Authentication protocol'),
 	false, 'row_snmpv3_authprotocol'
 );
 $itemFormList->addRow(_('Authentication passphrase'),
-	new CTextBox('snmpv3_authpassphrase', $this->data['snmpv3_authpassphrase'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64),
+	new CTextBox('snmpv3_authpassphrase', $this->data['snmpv3_authpassphrase'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64),
 	false, 'row_snmpv3_authpassphrase'
 );
 $privProtocolRadioButton = array(
@@ -148,11 +148,11 @@ $itemFormList->addRow(_('Privacy protocol'),
 	false, 'row_snmpv3_privprotocol'
 );
 $itemFormList->addRow(_('Privacy passphrase'),
-	new CTextBox('snmpv3_privpassphrase', $this->data['snmpv3_privpassphrase'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64),
+	new CTextBox('snmpv3_privpassphrase', $this->data['snmpv3_privpassphrase'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64),
 	false, 'row_snmpv3_privpassphrase'
 );
 $itemFormList->addRow(_('Port'),
-	new CTextBox('port', $this->data['port'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false, 'row_port'
+	new CTextBox('port', $this->data['port'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false, 'row_port'
 );
 $itemFormList->addRow(_('IPMI sensor'),
 	new CTextBox('ipmi_sensor', $this->data['ipmi_sensor'], ZBX_TEXTBOX_STANDARD_SIZE, $this->data['limited'], 128),
@@ -165,16 +165,16 @@ $authTypeComboBox->addItem(ITEM_AUTHTYPE_PASSWORD, _('Password'));
 $authTypeComboBox->addItem(ITEM_AUTHTYPE_PUBLICKEY, _('Public key'));
 $itemFormList->addRow(_('Authentication method'), $authTypeComboBox, false, 'row_authtype');
 $itemFormList->addRow(_('User name'),
-	new CTextBox('username', $this->data['username'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false, 'row_username'
+	new CTextBox('username', $this->data['username'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false, 'row_username'
 );
 $itemFormList->addRow(_('Public key file'),
-	new CTextBox('publickey', $this->data['publickey'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false, 'row_publickey'
+	new CTextBox('publickey', $this->data['publickey'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false, 'row_publickey'
 );
 $itemFormList->addRow(_('Private key file'),
-	new CTextBox('privatekey', $this->data['privatekey'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false,  'row_privatekey'
+	new CTextBox('privatekey', $this->data['privatekey'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false,  'row_privatekey'
 );
 $itemFormList->addRow(_('Password'),
-	new CTextBox('password', $this->data['password'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false, 'row_password'
+	new CTextBox('password', $this->data['password'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false, 'row_password'
 );
 $itemFormList->addRow(_('Executed script'),
 	new CTextArea('params_es', $this->data['params'], array('rows' => ZBX_TEXTAREA_STANDARD_ROWS, 'width' => ZBX_TEXTAREA_STANDARD_WIDTH)),
@@ -228,7 +228,7 @@ $itemFormList->addRow(_('Flexible intervals'),
 $newFlexInt = new CSpan(array(
 	_('Interval (in sec)'),
 	SPACE,
-	new CNumericBox('new_delay_flex[delay]', $this->data['new_delay_flex']['delay'], 5, 'no', false, false),
+	new CNumericBox('new_delay_flex[delay]', $this->data['new_delay_flex']['delay'], 5, false, false, false),
 	SPACE,
 	_('Period'),
 	SPACE,
@@ -295,17 +295,7 @@ if (!$conditions) {
 	$conditions = array(array('macro' => '', 'value' => '', 'formulaid' => num2letter(0)));
 }
 else {
-	// sort conditions by formula id as if they were numbers
-	uasort($conditions, function($condition1, $condition2) {
-		$len1 = strlen($condition1['formulaid']);
-		$len2 = strlen($condition2['formulaid']);
-
-		if (strlen($condition1['formulaid']) == strlen($condition2['formulaid'])) {
-			return strcmp($condition1['formulaid'], $condition2['formulaid']);
-		}
-
-		return ($len1 < $len2) ? -1 : 1;
-	});
+	$conditions = CConditionHelper::sortConditionsByFormulaId($conditions);
 }
 
 // fields
diff --git a/frontends/php/include/views/configuration.host.discovery.list.php b/frontends/php/include/views/configuration.host.discovery.list.php
index 6b0f1fdc3b9..5a1b02ea1b1 100644
--- a/frontends/php/include/views/configuration.host.discovery.list.php
+++ b/frontends/php/include/views/configuration.host.discovery.list.php
@@ -41,21 +41,17 @@ $discoveryForm->addVar('hostid', $this->data['hostid']);
 // create table
 $discoveryTable = new CTableInfo(_('No discovery rules found.'));
 
-$sortLink = new CUrl();
-$sortLink->setArgument('hostid', $this->data['hostid']);
-$sortLink = $sortLink->getUrl();
-
 $discoveryTable->setHeader(array(
 	new CCheckBox('all_items', null, "checkAll('".$discoveryForm->getName()."', 'all_items', 'g_hostdruleid');"),
-	make_sorting_header(_('Name'), 'name', $sortLink),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Items'),
 	_('Triggers'),
 	_('Graphs'),
 	($data['host']['flags'] == ZBX_FLAG_DISCOVERY_NORMAL) ? _('Hosts') : null,
-	make_sorting_header(_('Key'), 'key_', $sortLink),
-	make_sorting_header(_('Interval'), 'delay', $sortLink),
-	make_sorting_header(_('Type'), 'type', $sortLink),
-	make_sorting_header(_('Status'), 'status', $sortLink),
+	make_sorting_header(_('Key'), 'key_', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Interval'), 'delay', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Type'), 'type', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Status'), 'status', $this->data['sort'], $this->data['sortorder']),
 	$data['showInfoColumn'] ? _('Info') : null
 ));
 
@@ -75,7 +71,12 @@ foreach ($data['discoveries'] as $discovery) {
 	// status
 	$status = new CLink(
 		itemIndicator($discovery['status'], $discovery['state']),
-		'?hostid='.$_REQUEST['hostid'].'&g_hostdruleid='.$discovery['itemid'].'&go='.($discovery['status'] ? 'activate' : 'disable'),
+		'?hostid='.$_REQUEST['hostid'].
+			'&g_hostdruleid='.$discovery['itemid'].
+			'&action='.($discovery['status'] == ITEM_STATUS_DISABLED
+				? 'discoveryrule.massenable'
+				: 'discoveryrule.massdisable'
+			),
 		itemIndicatorStyle($discovery['status'], $discovery['state'])
 	);
 
@@ -83,7 +84,7 @@ foreach ($data['discoveries'] as $discovery) {
 	if ($data['showInfoColumn']) {
 		if ($discovery['status'] == ITEM_STATUS_ACTIVE && !zbx_empty($discovery['error'])) {
 			$info = new CDiv(SPACE, 'status_icon iconerror');
-			$info->setHint($discovery['error'], '', 'on');
+			$info->setHint($discovery['error'], 'on');
 		}
 		else {
 			$info = '';
@@ -108,21 +109,21 @@ foreach ($data['discoveries'] as $discovery) {
 		array(
 			new CLink(
 				_('Item prototypes'),
-				'disc_prototypes.php?hostid='.get_request('hostid').'&parent_discoveryid='.$discovery['itemid']
+				'disc_prototypes.php?hostid='.getRequest('hostid').'&parent_discoveryid='.$discovery['itemid']
 			),
 			' ('.$discovery['items'].')'
 		),
 		array(
 			new CLink(
 				_('Trigger prototypes'),
-				'trigger_prototypes.php?hostid='.get_request('hostid').'&parent_discoveryid='.$discovery['itemid']
+				'trigger_prototypes.php?hostid='.getRequest('hostid').'&parent_discoveryid='.$discovery['itemid']
 			),
 			' ('.$discovery['triggers'].')'
 		),
 		array(
 			new CLink(
 				_('Graph prototypes'),
-				'graphs.php?hostid='.get_request('hostid').'&parent_discoveryid='.$discovery['itemid']
+				'graphs.php?hostid='.getRequest('hostid').'&parent_discoveryid='.$discovery['itemid']
 			),
 			' ('.$discovery['graphs'].')'
 		),
@@ -136,16 +137,17 @@ foreach ($data['discoveries'] as $discovery) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('discoveryrule.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected discovery rules?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('discoveryrule.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected discovery rules?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('discoveryrule.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected discovery rules?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/configuration.host.edit.php b/frontends/php/include/views/configuration.host.edit.php
index 1226bd083eb..78cae2c927a 100644
--- a/frontends/php/include/views/configuration.host.edit.php
+++ b/frontends/php/include/views/configuration.host.edit.php
@@ -21,64 +21,11 @@
 
 require_once dirname(__FILE__).'/js/configuration.host.edit.js.php';
 
-$divTabs = new CTabView();
-if (!isset($_REQUEST['form_refresh'])) {
-	$divTabs->setSelected(0);
-}
-
-$host_groups = get_request('groups', array());
-if (isset($_REQUEST['groupid']) && ($_REQUEST['groupid'] > 0) && empty($host_groups)) {
-	array_push($host_groups, $_REQUEST['groupid']);
-}
-
-$newgroup = get_request('newgroup', '');
-$host = get_request('host', '');
-$visiblename = get_request('visiblename', '');
-$proxy_hostid = get_request('proxy_hostid', '');
-$ipmi_authtype = get_request('ipmi_authtype', -1);
-$ipmi_privilege = get_request('ipmi_privilege', 2);
-$ipmi_username = get_request('ipmi_username', '');
-$ipmi_password = get_request('ipmi_password', '');
-$inventory_mode = get_request('inventory_mode', HOST_INVENTORY_DISABLED);
-$host_inventory = get_request('host_inventory', array());
-$macros = get_request('macros', array());
-$interfaces = get_request('interfaces', array());
-$templateIds = get_request('templates', array());
-$clear_templates = get_request('clear_templates', array());
-
-if ((getRequest('hostid', 0) == 0) && !hasRequest('form_refresh')) {
-	$status = HOST_STATUS_MONITORED;
-}
-else {
-	$status = getRequest('status', HOST_STATUS_NOT_MONITORED);
-}
-
-$_REQUEST['hostid'] = get_request('hostid', 0);
-
-$frm_title = _('Host');
-if ($_REQUEST['hostid'] > 0) {
+if (getRequest('hostid', 0) > 0) {
 	$dbHost = $this->data['dbHost'];
 
-	$frm_title .= SPACE.' ['.$dbHost['host'].']';
-	$original_templates = $dbHost['parentTemplates'];
-	$original_templates = zbx_toHash($original_templates, 'templateid');
-
-	if (isset($_REQUEST['mainInterfaces'][INTERFACE_TYPE_AGENT])) {
-		$mainAgentId = $_REQUEST['mainInterfaces'][INTERFACE_TYPE_AGENT];
-		$interfaces[$mainAgentId]['main'] = '1';
-	}
-	if (isset($_REQUEST['mainInterfaces'][INTERFACE_TYPE_SNMP])) {
-		$snmpAgentId = $_REQUEST['mainInterfaces'][INTERFACE_TYPE_SNMP];
-		$interfaces[$snmpAgentId]['main'] = '1';
-	}
-	if (isset($_REQUEST['mainInterfaces'][INTERFACE_TYPE_JMX])) {
-		$ipmiAgentId = $_REQUEST['mainInterfaces'][INTERFACE_TYPE_JMX];
-		$interfaces[$ipmiAgentId]['main'] = '1';
-	}
-	if (isset($_REQUEST['mainInterfaces'][INTERFACE_TYPE_IPMI])) {
-		$jmxAgentId = $_REQUEST['mainInterfaces'][INTERFACE_TYPE_IPMI];
-		$interfaces[$jmxAgentId]['main'] = '1';
-	}
+	$originalTemplates = $dbHost['parentTemplates'];
+	$originalTemplates = zbx_toHash($originalTemplates, 'templateid');
 
 	// get items that populate host inventory fields
 	$hostItemsToInventory = API::Item()->get(array(
@@ -92,36 +39,48 @@ if ($_REQUEST['hostid'] > 0) {
 	$hostItemsToInventory = CMacrosResolverHelper::resolveItemNames($hostItemsToInventory);
 }
 else {
-	$original_templates = array();
+	$dbHost = array();
+	$originalTemplates = array();
 }
 
-// load data from the DB when opening the full clone form for the first time
-$cloneFormOpened = (in_array(getRequest('form'), array('clone', 'full_clone')) && getRequest('form_refresh') == 1);
-if (getRequest('hostid') && (!hasRequest('form_refresh') || $cloneFormOpened)) {
-	$proxy_hostid = $dbHost['proxy_hostid'];
+$cloningDiscoveredHost = (in_array(getRequest('form'), array('clone', 'full_clone'))
+	&& (getRequest('form_refresh') == 1) && ($dbHost['flags'] == ZBX_FLAG_DISCOVERY_CREATED)
+);
+
+// Use data from database when host is opened and form is shown for first time or discovered host is being cloned.
+if (getRequest('hostid') && (!hasRequest('form_refresh') || $cloningDiscoveredHost)) {
+	$proxyHostId = $dbHost['proxy_hostid'];
 	$host = $dbHost['host'];
-	$visiblename = $dbHost['name'];
+	$visibleName = $dbHost['name'];
 
 	// display empty visible name if equal to host name
-	if ($visiblename === $host) {
-		$visiblename = '';
+	if ($visibleName === $host) {
+		$visibleName = '';
 	}
 
-	$status = $dbHost['status'];
-
-	$ipmi_authtype = $dbHost['ipmi_authtype'];
-	$ipmi_privilege = $dbHost['ipmi_privilege'];
-	$ipmi_username = $dbHost['ipmi_username'];
-	$ipmi_password = $dbHost['ipmi_password'];
+	$ipmiAuthtype = $dbHost['ipmi_authtype'];
+	$ipmiPrivilege = $dbHost['ipmi_privilege'];
+	$ipmiUsername = $dbHost['ipmi_username'];
+	$ipmiPassword = $dbHost['ipmi_password'];
 
 	$macros = order_macros($dbHost['macros'], 'macro');
-	$host_groups = zbx_objectValues($dbHost['groups'], 'groupid');
+	$hostGroups = zbx_objectValues($dbHost['groups'], 'groupid');
 
-	$host_inventory = $dbHost['inventory'];
-	$inventory_mode = empty($host_inventory) ? HOST_INVENTORY_DISABLED : $dbHost['inventory']['inventory_mode'];
+	if ($cloningDiscoveredHost) {
+		$status = getRequest('status', HOST_STATUS_NOT_MONITORED);
+		$description = getRequest('description', '');
+		$hostInventory = getRequest('host_inventory', array());
+	}
+	else {
+		$status = $dbHost['status'];
+		$description = $dbHost['description'];
+		$hostInventory = $dbHost['inventory'];
+	}
+
+	$inventoryMode = isset($dbHost['inventory']['inventory_mode']) ? $dbHost['inventory']['inventory_mode'] : HOST_INVENTORY_DISABLED;
 
 	$templateIds = array();
-	foreach ($original_templates as $tpl) {
+	foreach ($originalTemplates as $tpl) {
 		$templateIds[$tpl['templateid']] = $tpl['templateid'];
 	}
 
@@ -141,28 +100,82 @@ if (getRequest('hostid') && (!hasRequest('form_refresh') || $cloneFormOpened)) {
 		}
 		$interfaces[$hinum]['locked'] = $locked;
 	}
+
+	$clearTemplates = array();
+
+	$newGroupName = '';
+}
+else {
+	$hostGroups = getRequest('groups', array());
+	if (hasRequest('groupid') && (getRequest('groupid', 0) > 0) && empty($hostGroups)) {
+		array_push($hostGroups, getRequest('groupid'));
+	}
+
+	$newGroupName = getRequest('newgroup', '');
+
+	$host = getRequest('host', '');
+	$visibleName = getRequest('visiblename', '');
+	$proxyHostId = getRequest('proxy_hostid', '');
+	$ipmiAuthtype = getRequest('ipmi_authtype', -1);
+	$ipmiPrivilege = getRequest('ipmi_privilege', 2);
+	$ipmiUsername = getRequest('ipmi_username', '');
+	$ipmiPassword = getRequest('ipmi_password', '');
+	$inventoryMode = getRequest('inventory_mode', HOST_INVENTORY_DISABLED);
+	$hostInventory = getRequest('host_inventory', array());
+	$macros = getRequest('macros', array());
+	$interfaces = getRequest('interfaces', array());
+	$templateIds = getRequest('templates', array());
+	$clearTemplates = getRequest('clear_templates', array());
+	$description = getRequest('description', '');
+
+	if ((getRequest('hostid', 0) == 0) && !hasRequest('form_refresh')) {
+		$status = HOST_STATUS_MONITORED;
+	}
+	else {
+		$status = getRequest('status', HOST_STATUS_NOT_MONITORED);
+	}
+}
+
+$mainInterfaces = getRequest('mainInterfaces', array());
+foreach (array(INTERFACE_TYPE_AGENT, INTERFACE_TYPE_SNMP, INTERFACE_TYPE_JMX, INTERFACE_TYPE_IPMI) as $interfaceType) {
+	if (isset($mainInterfaces[$interfaceType])) {
+		$interfaceId = $mainInterfaces[$interfaceType];
+		$interfaces[$interfaceId]['main'] = '1';
+	}
 }
 
-$clear_templates = array_intersect($clear_templates, array_keys($original_templates));
-$clear_templates = array_diff($clear_templates, array_keys($templateIds));
+$clearTemplates = array_intersect($clearTemplates, array_keys($originalTemplates));
+$clearTemplates = array_diff($clearTemplates, array_keys($templateIds));
 natcasesort($templateIds);
 
 // whether this is a discovered host
-$isDiscovered = (get_request('hostid') && $dbHost['flags'] == ZBX_FLAG_DISCOVERY_CREATED && get_request('form') == 'update');
+$isDiscovered = (
+	getRequest('hostid')
+	&& $dbHost['flags'] == ZBX_FLAG_DISCOVERY_CREATED
+	&& in_array(getRequest('form'), array('update'))
+);
+
+$divTabs = new CTabView();
+if (!hasRequest('form_refresh')) {
+	$divTabs->setSelected(0);
+}
 
 $frmHost = new CForm();
 $frmHost->setName('web.hosts.host.php.');
-$frmHost->addVar('form', get_request('form', 1));
+$frmHost->addVar('form', getRequest('form', 1));
 
-$frmHost->addVar('clear_templates', $clear_templates);
+$frmHost->addVar('clear_templates', $clearTemplates);
 
 $hostList = new CFormList('hostlist');
 
-if ($_REQUEST['hostid'] > 0 && get_request('form') != 'clone') {
-	$frmHost->addVar('hostid', $_REQUEST['hostid']);
+$hostId = getRequest('hostid', 0);
+if ($hostId > 0 && getRequest('form') != 'clone') {
+	$frmHost->addVar('hostid', $hostId);
 }
-if ($_REQUEST['groupid'] > 0) {
-	$frmHost->addVar('groupid', $_REQUEST['groupid']);
+
+$groupId = getRequest('groupid', 0);
+if ($groupId > 0) {
+	$frmHost->addVar('groupid', $groupId);
 }
 
 // LLD rule link
@@ -176,18 +189,16 @@ if ($isDiscovered) {
 	);
 }
 
-$hostTB = new CTextBox('host', $host, ZBX_TEXTBOX_STANDARD_SIZE, $isDiscovered);
-$hostTB->setAttribute('maxlength', 64);
+$hostTB = new CTextBox('host', $host, ZBX_TEXTBOX_STANDARD_SIZE, $isDiscovered, 128);
 $hostTB->setAttribute('autofocus', 'autofocus');
 $hostList->addRow(_('Host name'), $hostTB);
 
-$visiblenameTB = new CTextBox('visiblename', $visiblename, ZBX_TEXTBOX_STANDARD_SIZE, $isDiscovered);
-$visiblenameTB->setAttribute('maxlength', 64);
+$visiblenameTB = new CTextBox('visiblename', $visibleName, ZBX_TEXTBOX_STANDARD_SIZE, $isDiscovered, 128);
 $hostList->addRow(_('Visible name'), $visiblenameTB);
 
 // groups for normal hosts
 if (!$isDiscovered) {
-	$grp_tb = new CTweenBox($frmHost, 'groups', $host_groups, 10);
+	$grp_tb = new CTweenBox($frmHost, 'groups', $hostGroups, 10);
 	$all_groups = API::HostGroup()->get(array(
 		'editable' => true,
 		'output' => API_OUTPUT_EXTEND
@@ -199,7 +210,7 @@ if (!$isDiscovered) {
 
 	$hostList->addRow(_('Groups'), $grp_tb->get(_('In groups'), _('Other groups')));
 
-	$newgroupTB = new CTextBox('newgroup', $newgroup, ZBX_TEXTBOX_SMALL_SIZE);
+	$newgroupTB = new CTextBox('newgroup', $newGroupName, ZBX_TEXTBOX_SMALL_SIZE);
 	$newgroupTB->setAttribute('maxlength', 64);
 	$tmp_label = _('New group');
 	if (CWebUser::$data['type'] != USER_TYPE_SUPER_ADMIN) {
@@ -225,9 +236,7 @@ if (!$isDiscovered) {
 		$script = 'hostInterfacesManager.addNew("agent");';
 	}
 	else {
-		$json = new CJSON();
-		$encodedInterfaces = $json->encode($interfaces);
-		$script = 'hostInterfacesManager.add('.$encodedInterfaces.');';
+		$script = 'hostInterfacesManager.add('.CJs::encodeJson(array_values($interfaces)).');';
 	}
 	zbx_add_post_js($script);
 
@@ -382,15 +391,11 @@ else {
 	$hostList->addRow(_('IPMI interfaces'), new CDiv($ifTab, 'border_dotted objectgroup interface-group'), false, null, 'interface-row interface-row-last');
 }
 
-$hostList->addRow(_('Description'), new CTextArea('description',
-	(getRequest('hostid') > 0 && !hasRequest('form_refresh'))
-		? $this->data['dbHost']['description']
-		: getRequest('description')
-));
+$hostList->addRow(_('Description'), new CTextArea('description', $description));
 
 // Proxy
 if (!$isDiscovered) {
-	$proxyControl = new CComboBox('proxy_hostid', $proxy_hostid);
+	$proxyControl = new CComboBox('proxy_hostid', $proxyHostId);
 	$proxyControl->addItem(0, _('(no proxy)'));
 
 	$db_proxies = API::Proxy()->get(array('output' => API_OUTPUT_EXTEND));
@@ -417,12 +422,12 @@ else {
 }
 $hostList->addRow(_('Monitored by proxy'), $proxyControl);
 
-$hostList->addRow(_('Enabled'), new CCheckBox('status', (HOST_STATUS_MONITORED == $status), null, HOST_STATUS_MONITORED));
+$hostList->addRow(_('Enabled'), new CCheckBox('status', ($status == HOST_STATUS_MONITORED), null, HOST_STATUS_MONITORED));
 
-if ($_REQUEST['form'] == 'full_clone') {
+if (getRequest('form') == 'full_clone') {
 	// host applications
 	$hostApps = API::Application()->get(array(
-		'hostids' => $_REQUEST['hostid'],
+		'hostids' => $hostId,
 		'inherited' => false,
 		'output' => array('name'),
 		'preservekeys' => true
@@ -443,7 +448,7 @@ if ($_REQUEST['form'] == 'full_clone') {
 
 	// host items
 	$hostItems = API::Item()->get(array(
-		'hostids' => $_REQUEST['hostid'],
+		'hostids' => $hostId,
 		'inherited' => false,
 		'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL),
 		'output' => array('itemid', 'hostid', 'key_', 'name')
@@ -467,7 +472,7 @@ if ($_REQUEST['form'] == 'full_clone') {
 	// host triggers
 	$hostTriggers = API::Trigger()->get(array(
 		'inherited' => false,
-		'hostids' => $_REQUEST['hostid'],
+		'hostids' => $hostId,
 		'output' => array('triggerid', 'description'),
 		'selectItems' => array('type'),
 		'filter' => array('flags' => array(ZBX_FLAG_DISCOVERY_NORMAL))
@@ -495,7 +500,7 @@ if ($_REQUEST['form'] == 'full_clone') {
 	// host graphs
 	$hostGraphs = API::Graph()->get(array(
 		'inherited' => false,
-		'hostids' => $_REQUEST['hostid'],
+		'hostids' => $hostId,
 		'filter' => array('flags' => array(ZBX_FLAG_DISCOVERY_NORMAL)),
 		'selectHosts' => array('hostid'),
 		'selectItems' => array('type'),
@@ -524,11 +529,11 @@ if ($_REQUEST['form'] == 'full_clone') {
 	}
 
 	// discovery rules
-	$hostDiscoveryRuleids = array();
+	$hostDiscoveryRuleIds = array();
 
 	$hostDiscoveryRules = API::DiscoveryRule()->get(array(
 		'inherited' => false,
-		'hostids' => $_REQUEST['hostid'],
+		'hostids' => $hostId,
 		'output' => array('itemid', 'hostid', 'key_', 'name')
 	));
 
@@ -540,7 +545,7 @@ if ($_REQUEST['form'] == 'full_clone') {
 			$discoveryRuleList[$discoveryRule['itemid']] = $discoveryRule['name_expanded'];
 		}
 		order_result($discoveryRuleList);
-		$hostDiscoveryRuleids = array_keys($discoveryRuleList);
+		$hostDiscoveryRuleIds = array_keys($discoveryRuleList);
 
 		$listBox = new CListBox('discoveryRules', null, 8);
 		$listBox->setAttribute('disabled', 'disabled');
@@ -550,8 +555,8 @@ if ($_REQUEST['form'] == 'full_clone') {
 
 	// item prototypes
 	$hostItemPrototypes = API::ItemPrototype()->get(array(
-		'hostids' => $_REQUEST['hostid'],
-		'discoveryids' => $hostDiscoveryRuleids,
+		'hostids' => $hostId,
+		'discoveryids' => $hostDiscoveryRuleIds,
 		'inherited' => false,
 		'output' => array('itemid', 'hostid', 'key_', 'name')
 	));
@@ -573,8 +578,8 @@ if ($_REQUEST['form'] == 'full_clone') {
 
 	// Trigger prototypes
 	$hostTriggerPrototypes = API::TriggerPrototype()->get(array(
-		'hostids' => $_REQUEST['hostid'],
-		'discoveryids' => $hostDiscoveryRuleids,
+		'hostids' => $hostId,
+		'discoveryids' => $hostDiscoveryRuleIds,
 		'inherited' => false,
 		'output' => array('triggerid', 'description'),
 		'selectItems' => array('type')
@@ -601,8 +606,8 @@ if ($_REQUEST['form'] == 'full_clone') {
 
 	// Graph prototypes
 	$hostGraphPrototypes = API::GraphPrototype()->get(array(
-		'hostids' => $_REQUEST['hostid'],
-		'discoveryids' => $hostDiscoveryRuleids,
+		'hostids' => $hostId,
+		'discoveryids' => $hostDiscoveryRuleIds,
 		'inherited' => false,
 		'selectHosts' => array('hostid'),
 		'output' => array('graphid', 'name')
@@ -624,7 +629,7 @@ if ($_REQUEST['form'] == 'full_clone') {
 
 	// host prototypes
 	$hostPrototypes = API::HostPrototype()->get(array(
-		'discoveryids' => $hostDiscoveryRuleids,
+		'discoveryids' => $hostDiscoveryRuleIds,
 		'inherited' => false,
 		'output' => array('hostid', 'name')
 	));
@@ -640,6 +645,28 @@ if ($_REQUEST['form'] == 'full_clone') {
 		$listBox->addItems($prototypeList);
 		$hostList->addRow(_('Host prototypes'), $listBox);
 	}
+
+	// web scenarios
+	$httpTests = API::HttpTest()->get(array(
+		'output' => array('httptestid', 'name'),
+		'hostids' => $hostId,
+		'inherited' => false
+	));
+
+	if ($httpTests) {
+		$httpTestList = array();
+
+		foreach ($httpTests as $httpTest) {
+			$httpTestList[$httpTest['httptestid']] = $httpTest['name'];
+		}
+
+		order_result($httpTestList);
+
+		$listBox = new CListBox('httpTests', null, 8);
+		$listBox->setAttribute('disabled', 'disabled');
+		$listBox->addItems($httpTestList);
+		$hostList->addRow(_('Web scenarios'), $listBox);
+	}
 }
 $divTabs->addTab('hostTab', _('Host'), $hostList);
 
@@ -672,33 +699,37 @@ if (!$isDiscovered) {
 					new CSubmit('unlink['.$template['templateid'].']', _('Unlink'), null, 'link_menu'),
 					SPACE,
 					SPACE,
-					isset($original_templates[$template['templateid']])
+					isset($originalTemplates[$template['templateid']])
 						? new CSubmit('unlink_and_clear['.$template['templateid'].']', _('Unlink and clear'), null, 'link_menu')
 						: SPACE
 				)
 			),
 			null, 'conditions_'.$template['templateid']
 		);
-
 		$ignoredTemplates[$template['templateid']] = $template['name'];
 	}
 
-	$tmplList->addRow(_('Linked templates'), new CDiv($linkedTemplateTable, 'objectgroup inlineblock border_dotted ui-corner-all'));
+	$tmplList->addRow(_('Linked templates'), new CDiv($linkedTemplateTable, 'template-link-block objectgroup inlineblock border_dotted ui-corner-all'));
 
 	// create new linked template table
 	$newTemplateTable = new CTable(null, 'formElementTable');
 	$newTemplateTable->attr('id', 'newTemplateTable');
-	$newTemplateTable->attr('style', 'min-width: 400px;');
 
 	$newTemplateTable->addRow(array(new CMultiSelect(array(
 		'name' => 'add_templates[]',
 		'objectName' => 'templates',
-		'ignored' => $ignoredTemplates
+		'ignored' => $ignoredTemplates,
+		'popup' => array(
+			'parameters' => 'srctbl=templates&srcfld1=hostid&srcfld2=host&dstfrm='.$frmHost->getName().
+				'&dstfld1=add_templates_&templated_hosts=1&multiselect=1',
+			'width' => 450,
+			'height' => 450
+		)
 	))));
 
 	$newTemplateTable->addRow(array(new CSubmit('add_template', _('Add'), null, 'link_menu')));
 
-	$tmplList->addRow(_('Link new templates'), new CDiv($newTemplateTable, 'objectgroup inlineblock border_dotted ui-corner-all'));
+	$tmplList->addRow(_('Link new templates'), new CDiv($newTemplateTable, 'template-link-block objectgroup inlineblock border_dotted ui-corner-all'));
 }
 // templates for discovered hosts
 else {
@@ -710,7 +741,7 @@ else {
 		$linkedTemplateTable->addRow($templateLink, null, 'conditions_'.$template['templateid']);
 	}
 
-	$tmplList->addRow(_('Linked templates'), new CDiv($linkedTemplateTable, 'objectgroup inlineblock border_dotted ui-corner-all'));
+	$tmplList->addRow(_('Linked templates'), new CDiv($linkedTemplateTable, 'template-link-block objectgroup inlineblock border_dotted ui-corner-all'));
 }
 
 $divTabs->addTab('templateTab', _('Templates'), $tmplList);
@@ -722,14 +753,14 @@ $ipmiList = new CFormList('ipmilist');
 
 // normal hosts
 if (!$isDiscovered) {
-	$cmbIPMIAuthtype = new CComboBox('ipmi_authtype', $ipmi_authtype);
+	$cmbIPMIAuthtype = new CComboBox('ipmi_authtype', $ipmiAuthtype);
 	$cmbIPMIAuthtype->addItems(ipmiAuthTypes());
 	$cmbIPMIAuthtype->addClass('openView');
 	$cmbIPMIAuthtype->setAttribute('size', 7);
 	$cmbIPMIAuthtype->addStyle('width: 170px;');
 	$ipmiList->addRow(_('Authentication algorithm'), $cmbIPMIAuthtype);
 
-	$cmbIPMIPrivilege = new CComboBox('ipmi_privilege', $ipmi_privilege);
+	$cmbIPMIPrivilege = new CComboBox('ipmi_privilege', $ipmiPrivilege);
 	$cmbIPMIPrivilege->addItems(ipmiPrivileges());
 	$cmbIPMIPrivilege->addClass('openView');
 	$cmbIPMIPrivilege->setAttribute('size', 5);
@@ -745,8 +776,8 @@ else {
 	$ipmiList->addRow(_('Privilege level'), $cmbIPMIPrivilege);
 }
 
-$ipmiList->addRow(_('Username'), new CTextBox('ipmi_username', $ipmi_username, ZBX_TEXTBOX_SMALL_SIZE, $isDiscovered));
-$ipmiList->addRow(_('Password'), new CTextBox('ipmi_password', $ipmi_password, ZBX_TEXTBOX_SMALL_SIZE, $isDiscovered));
+$ipmiList->addRow(_('Username'), new CTextBox('ipmi_username', $ipmiUsername, ZBX_TEXTBOX_SMALL_SIZE, $isDiscovered));
+$ipmiList->addRow(_('Password'), new CTextBox('ipmi_password', $ipmiPassword, ZBX_TEXTBOX_SMALL_SIZE, $isDiscovered));
 $divTabs->addTab('ipmiTab', _('IPMI'), $ipmiList);
 
 /*
@@ -765,7 +796,6 @@ $divTabs->addTab('macroTab', _('Macros'), $macrosView->render());
 $inventoryFormList = new CFormList('inventorylist');
 
 // radio buttons for inventory type choice
-$inventoryMode = (isset($dbHost['inventory']['inventory_mode'])) ? $dbHost['inventory']['inventory_mode'] : HOST_INVENTORY_DISABLED;
 $inventoryDisabledBtn = new CRadioButton('inventory_mode', HOST_INVENTORY_DISABLED, null, 'host_inventory_radio_'.HOST_INVENTORY_DISABLED,
 	$inventoryMode == HOST_INVENTORY_DISABLED
 );
@@ -795,21 +825,21 @@ $hostInventoryTable = DB::getSchema('host_inventory');
 $hostInventoryFields = getHostInventories();
 
 foreach ($hostInventoryFields as $inventoryNo => $inventoryInfo) {
-	if (!isset($host_inventory[$inventoryInfo['db_field']])) {
-		$host_inventory[$inventoryInfo['db_field']] = '';
+	if (!isset($hostInventory[$inventoryInfo['db_field']])) {
+		$hostInventory[$inventoryInfo['db_field']] = '';
 	}
 
 	if ($hostInventoryTable['fields'][$inventoryInfo['db_field']]['type'] == DB::FIELD_TYPE_TEXT) {
-		$input = new CTextArea('host_inventory['.$inventoryInfo['db_field'].']', $host_inventory[$inventoryInfo['db_field']]);
+		$input = new CTextArea('host_inventory['.$inventoryInfo['db_field'].']', $hostInventory[$inventoryInfo['db_field']]);
 		$input->addStyle('width: 64em;');
 	}
 	else {
 		$fieldLength = $hostInventoryTable['fields'][$inventoryInfo['db_field']]['length'];
-		$input = new CTextBox('host_inventory['.$inventoryInfo['db_field'].']', $host_inventory[$inventoryInfo['db_field']]);
+		$input = new CTextBox('host_inventory['.$inventoryInfo['db_field'].']', $hostInventory[$inventoryInfo['db_field']]);
 		$input->setAttribute('maxlength', $fieldLength);
 		$input->addStyle('width: '.($fieldLength > 64 ? 64 : $fieldLength).'em;');
 	}
-	if ($inventory_mode == HOST_INVENTORY_DISABLED) {
+	if ($inventoryMode == HOST_INVENTORY_DISABLED) {
 		$input->setAttribute('disabled', 'disabled');
 	}
 
@@ -822,7 +852,7 @@ foreach ($hostInventoryFields as $inventoryNo => $inventoryInfo) {
 		$populatingItemCell = array(' &larr; ', $populatingLink);
 
 		$input->addClass('linked_to_item'); // this will be used for disabling fields via jquery
-		if ($inventory_mode == HOST_INVENTORY_AUTOMATIC) {
+		if ($inventoryMode == HOST_INVENTORY_AUTOMATIC) {
 			$input->setAttribute('disabled', 'disabled');
 		}
 	}
@@ -832,7 +862,7 @@ foreach ($hostInventoryFields as $inventoryNo => $inventoryInfo) {
 	$input->addStyle('float: left;');
 
 	$populatingItem = new CSpan($populatingItemCell, 'populating_item');
-	if ($inventory_mode != HOST_INVENTORY_AUTOMATIC) { // those links are visible only in automatic mode
+	if ($inventoryMode != HOST_INVENTORY_AUTOMATIC) { // those links are visible only in automatic mode
 		$populatingItem->addStyle('display: none');
 	}
 
diff --git a/frontends/php/include/views/configuration.host.massupdate.php b/frontends/php/include/views/configuration.host.massupdate.php
index 2652cf8c2bd..231234f9d71 100644
--- a/frontends/php/include/views/configuration.host.massupdate.php
+++ b/frontends/php/include/views/configuration.host.massupdate.php
@@ -24,7 +24,7 @@ require_once dirname(__FILE__).'/js/configuration.host.edit.js.php';
 // create form
 $hostForm = new CForm();
 $hostForm->setName('hostForm');
-$hostForm->addVar('go', 'massupdate');
+$hostForm->addVar('action', 'host.massupdate');
 foreach ($this->data['hosts'] as $hostid) {
 	$hostForm->addVar('hosts['.$hostid.']', $hostid);
 }
@@ -48,18 +48,24 @@ if (isset($_REQUEST['groups'])) {
 	}
 }
 
-$replaceGroups = new CMultiSelect(array(
+$replaceGroups = new CDiv(new CMultiSelect(array(
 	'name' => 'groups[]',
 	'objectName' => 'hostGroup',
 	'objectOptions' => array('editable' => true),
-	'data' => $hostGroupsToReplace
-));
+	'data' => $hostGroupsToReplace,
+	'popup' => array(
+		'parameters' => 'srctbl=host_groups&dstfrm='.$hostForm->getName().'&dstfld1=groups_&srcfld1=groupid'.
+			'&writeonly=1&multiselect=1',
+		'width' => 450,
+		'height' => 450
+	)
+)), null, 'replaceGroups');
 
 $hostFormList->addRow(
 	array(
 		_('Replace host groups'),
 		SPACE,
-		new CVisibilityBox('visible[groups]', isset($this->data['visible']['groups']), 'groups_', _('Original'))
+		new CVisibilityBox('visible[groups]', isset($this->data['visible']['groups']), 'replaceGroups', _('Original'))
 	),
 	$replaceGroups
 );
@@ -94,19 +100,25 @@ if (isset($_REQUEST['new_groups'])) {
 	}
 }
 if (CWebUser::getType() == USER_TYPE_SUPER_ADMIN) {
-	$newGroups = new CMultiSelect(array(
+	$newGroups = new CDiv(new CMultiSelect(array(
 		'name' => 'new_groups[]',
 		'objectName' => 'hostGroup',
 		'objectOptions' => array('editable' => true),
 		'data' => $hostGroupsToAdd,
-		'addNew' => true
-	));
+		'addNew' => true,
+		'popup' => array(
+			'parameters' => 'srctbl=host_groups&dstfrm='.$hostForm->getName().'&dstfld1=new_groups_&srcfld1=groupid'.
+				'&writeonly=1&multiselect=1',
+			'width' => 450,
+			'height' => 450
+		)
+	)), null, 'newGroups');
 
 	$hostFormList->addRow(
 		array(
 			_('Add new or existing host groups'),
 			SPACE,
-			new CVisibilityBox('visible[new_groups]', isset($this->data['visible']['new_groups']), 'new_groups_', _('Original'))
+			new CVisibilityBox('visible[new_groups]', isset($this->data['visible']['new_groups']), 'newGroups', _('Original'))
 		),
 		$newGroups
 	);
@@ -116,7 +128,13 @@ else {
 		'name' => 'new_groups[]',
 		'objectName' => 'hostGroup',
 		'objectOptions' => array('editable' => true),
-		'data' => $hostGroupsToAdd
+		'data' => $hostGroupsToAdd,
+		'popup' => array(
+			'parameters' => 'srctbl=host_groups&dstfrm='.$hostForm->getName().'&dstfld1=new_groups_&srcfld1=groupid'.
+				'&writeonly=1&multiselect=1',
+			'width' => 450,
+			'height' => 450
+		)
 	));
 
 	$hostFormList->addRow(
@@ -155,13 +173,16 @@ $hostFormList->addRow(
 );
 
 // append status to form list
+$statusComboBox = new CComboBox('status', $this->data['status']);
+$statusComboBox->addItem(HOST_STATUS_MONITORED, _('Enabled'));
+$statusComboBox->addItem(HOST_STATUS_NOT_MONITORED, _('Disabled'));
 $hostFormList->addRow(
 	array(
-		_('Enabled'),
+		_('Status'),
 		SPACE,
 		new CVisibilityBox('visible[status]', isset($this->data['visible']['status']), 'status', _('Original'))
 	),
-	new CCheckBox('status', (HOST_STATUS_MONITORED == $this->data['status']), null, HOST_STATUS_MONITORED)
+	$statusComboBox
 );
 
 $templatesFormList = new CFormList('templatesFormList');
@@ -171,31 +192,42 @@ $templatesTable = new CTable(null, 'formElementTable');
 $templatesTable->setAttribute('style', 'min-width: 500px;');
 $templatesTable->setAttribute('id', 'template_table');
 
+$clearDiv = new CDiv();
+$clearDiv->addStyle('clear: both;');
+
 $templatesDiv = new CDiv(
 	array(
-		$templatesTable,
 		new CMultiSelect(array(
 			'name' => 'templates[]',
 			'objectName' => 'templates',
-			'data' => $this->data['linkedTemplates']
+			'data' => $this->data['linkedTemplates'],
+			'popup' => array(
+				'parameters' => 'srctbl=templates&srcfld1=hostid&srcfld2=host&dstfrm='.$hostForm->getName().
+					'&dstfld1=templates_&templated_hosts=1&multiselect=1',
+				'width' => 450,
+				'height' => 450
+			)
 		)),
-		new CCheckBox('mass_replace_tpls', $this->data['mass_replace_tpls']),
-		SPACE,
-		_('Replace'),
-		BR(),
-		new CCheckBox('mass_clear_tpls', $this->data['mass_clear_tpls']),
-		SPACE,
-		_('Clear when unlinking')
+		$clearDiv,
+		new CDiv(array(
+			new CCheckBox('mass_replace_tpls', $this->data['mass_replace_tpls']),
+			SPACE,
+			_('Replace'),
+			BR(),
+			new CCheckBox('mass_clear_tpls', $this->data['mass_clear_tpls']),
+			SPACE,
+			_('Clear when unlinking')
+		), 'floatleft')
 	),
 	'objectgroup inlineblock border_dotted ui-corner-all'
 );
-$templatesDiv->setAttribute('id', 'templates_div');
+$templatesDiv->setAttribute('id', 'templateDiv');
 
 $templatesFormList->addRow(
 	array(
 		_('Link templates'),
 		SPACE,
-		new CVisibilityBox('visible[template_table]', !empty($this->data['visible']['template_table']) ? 'yes' : 'no', 'templates_div', _('Original'))
+		new CVisibilityBox('visible[templates]', isset($this->data['visible']['templates']), 'templateDiv', _('Original'))
 	),
 	$templatesDiv
 );
diff --git a/frontends/php/include/views/configuration.host.prototype.edit.php b/frontends/php/include/views/configuration.host.prototype.edit.php
index f941ce00dba..92b9ddc5ae1 100644
--- a/frontends/php/include/views/configuration.host.prototype.edit.php
+++ b/frontends/php/include/views/configuration.host.prototype.edit.php
@@ -37,7 +37,7 @@ if (!isset($_REQUEST['form_refresh'])) {
 
 $frmHost = new CForm();
 $frmHost->setName('hostPrototypeForm.');
-$frmHost->addVar('form', get_request('form', 1));
+$frmHost->addVar('form', getRequest('form', 1));
 $frmHost->addVar('parent_discoveryid', $discoveryRule['itemid']);
 
 $hostList = new CFormList('hostlist');
@@ -50,7 +50,7 @@ if ($hostPrototype['templateid'] && $data['parents']) {
 			'?form=update&hostid='.$parent['hostid'].'&parent_discoveryid='.$parent['discoveryRule']['itemid'],
 			'highlight underline weight_normal'
 		);
-		$parents[] = SPACE.RARR.SPACE;
+		$parents[] = SPACE.'&rArr;'.SPACE;
 	}
 	array_pop($parents);
 	$hostList->addRow(_('Parent discovery rules'), $parents);
@@ -72,14 +72,13 @@ $hostList->addRow(_('Visible name'), $visiblenameTB);
 
 // display inherited parameters only for hosts prototypes on hosts
 if ($parentHost['status'] != HOST_STATUS_TEMPLATE) {
-	$interfaces = array();
 	$existingInterfaceTypes = array();
+
 	foreach ($parentHost['interfaces'] as $interface) {
-		$interface['locked'] = true;
 		$existingInterfaceTypes[$interface['type']] = true;
-		$interfaces[$interface['interfaceid']] = $interface;
 	}
-	zbx_add_post_js('hostInterfacesManager.add('.CJs::encodeJson($interfaces).');');
+
+	zbx_add_post_js('hostInterfacesManager.add('.CJs::encodeJson($parentHost['interfaces']).');');
 	zbx_add_post_js('hostInterfacesManager.disable();');
 
 	// table for agent interfaces with footer
@@ -179,7 +178,13 @@ $groupList->addRow(_('Groups'), new CMultiSelect(array(
 		'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
 	),
 	'data' => $groups,
-	'disabled' => (bool) $hostPrototype['templateid']
+	'disabled' => (bool) $hostPrototype['templateid'],
+	'popup' => array(
+		'parameters' => 'srctbl=host_groups&dstfrm='.$frmHost->getName().'&dstfld1=group_links_'.
+			'&srcfld1=groupid&writeonly=1&multiselect=1&normal_only=1',
+		'width' => 450,
+		'height' => 450
+	)
 )));
 
 // new group prototypes
@@ -241,7 +246,13 @@ if (!$hostPrototype['templateid']) {
 	$newTemplateTable->addRow(array(new CMultiSelect(array(
 		'name' => 'add_templates[]',
 		'objectName' => 'templates',
-		'ignored' => $ignoreTemplates
+		'ignored' => $ignoreTemplates,
+		'popup' => array(
+			'parameters' => 'srctbl=templates&srcfld1=hostid&srcfld2=host&dstfrm='.$frmHost->getName().
+				'&dstfld1=add_templates_&templated_hosts=1&multiselect=1',
+			'width' => 450,
+			'height' => 450
+		)
 	))));
 
 	$newTemplateTable->addRow(array(new CSubmit('add_template', _('Add'), null, 'link_menu')));
diff --git a/frontends/php/include/views/configuration.host.prototype.list.php b/frontends/php/include/views/configuration.host.prototype.list.php
index cfaaf1d042e..d96dd0d54c5 100644
--- a/frontends/php/include/views/configuration.host.prototype.list.php
+++ b/frontends/php/include/views/configuration.host.prototype.list.php
@@ -43,15 +43,11 @@ $itemForm->addVar('parent_discoveryid', $this->data['parent_discoveryid']);
 // create table
 $hostTable = new CTableInfo(_('No host prototypes found.'));
 
-$sortLink = new CUrl();
-$sortLink->setArgument('parent_discoveryid', $this->data['parent_discoveryid']);
-$sortLink = $sortLink->getUrl();
-
 $hostTable->setHeader(array(
 	new CCheckBox('all_hosts', null, "checkAll('".$itemForm->getName()."', 'all_hosts', 'group_hostid');"),
-	make_sorting_header(_('Name'),'name', $sortLink),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Templates'),
-	make_sorting_header(_('Status'),'status', $sortLink)
+	make_sorting_header(_('Status'), 'status', $this->data['sort'], $this->data['sortorder'])
 ));
 
 foreach ($this->data['hostPrototypes'] as $hostPrototype) {
@@ -102,8 +98,13 @@ foreach ($this->data['hostPrototypes'] as $hostPrototype) {
 
 	// status
 	$status = new CLink(item_status2str($hostPrototype['status']),
-		'?group_hostid='.$hostPrototype['hostid'].'&parent_discoveryid='.$discoveryRule['itemid'].
-		'&go='.($hostPrototype['status'] ? 'activate' : 'disable'), itemIndicatorStyle($hostPrototype['status'])
+		'?group_hostid='.$hostPrototype['hostid'].
+			'&parent_discoveryid='.$discoveryRule['itemid'].
+			'&action='.($hostPrototype['status'] == HOST_STATUS_NOT_MONITORED
+				? 'hostprototype.massenable'
+				: 'hostprototype.massdisable'
+			),
+		itemIndicatorStyle($hostPrototype['status'])
 	);
 
 	$hostTable->addRow(array(
@@ -115,16 +116,16 @@ foreach ($this->data['hostPrototypes'] as $hostPrototype) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+$goOption = new CComboItem('hostprototype.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected host prototypes?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('hostprototype.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected host prototypes?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('hostprototype.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected host prototypes?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/configuration.hostgroups.edit.php b/frontends/php/include/views/configuration.hostgroups.edit.php
index 75d24960132..26c87fbfb2d 100644
--- a/frontends/php/include/views/configuration.hostgroups.edit.php
+++ b/frontends/php/include/views/configuration.hostgroups.edit.php
@@ -53,7 +53,7 @@ foreach ($this->data['db_hosts'] as $host) {
 	}
 }
 foreach ($this->data['r_hosts'] as $host) {
-	if (isset($this->data['r_hosts'][$host['hostid']]) && $host['flags'] == ZBX_FLAG_DISCOVERY_NORMAL) {
+	if ($host['flags'] == ZBX_FLAG_DISCOVERY_NORMAL) {
 		$hostsComboBox->addItem($host['hostid'], $host['name']);
 	}
 	else {
@@ -68,7 +68,7 @@ $hostGroupTab->addTab('hostgroupTab', _('Host group'), $hostGroupFormList);
 $hostGroupForm->addItem($hostGroupTab);
 
 // append buttons to form
-if (empty($this->data['groupid'])) {
+if ($this->data['groupid'] == 0) {
 	$hostGroupForm->addItem(makeFormFooter(
 		new CSubmit('save', _('Save')),
 		new CButtonCancel()
@@ -76,7 +76,7 @@ if (empty($this->data['groupid'])) {
 }
 else {
 	$deleteButton = new CButtonDelete(_('Delete selected group?'), url_param('form').url_param('groupid'));
-	if (empty($this->data['deletableHostGroups'])) {
+	if (!isset($this->data['deletableHostGroups'][$this->data['groupid']])) {
 		$deleteButton->attr('disabled', 'disabled');
 	}
 
diff --git a/frontends/php/include/views/configuration.hostgroups.list.php b/frontends/php/include/views/configuration.hostgroups.list.php
index fb1b13dcfc3..3862030888f 100644
--- a/frontends/php/include/views/configuration.hostgroups.list.php
+++ b/frontends/php/include/views/configuration.hostgroups.list.php
@@ -47,7 +47,7 @@ $hostGroupForm->setName('hostgroupForm');
 $hostGroupTable = new CTableInfo(_('No host groups found.'));
 $hostGroupTable->setHeader(array(
 	new CCheckBox('all_groups', null, "checkAll('".$hostGroupForm->getName()."', 'all_groups', 'groups');"),
-	make_sorting_header(_('Name'), 'name'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	' # ',
 	_('Members'),
 	_('Info')
@@ -126,12 +126,12 @@ foreach ($this->data['groups'] as $group) {
 	// info, discovered item lifetime indicator
 	if ($group['flags'] == ZBX_FLAG_DISCOVERY_CREATED && $group['groupDiscovery']['ts_delete']) {
 		$info = new CDiv(SPACE, 'status_icon iconwarning');
-		$info->setHint(
-			_s('The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s).',
-				zbx_date2age($group['groupDiscovery']['ts_delete']), zbx_date2str(_('d M Y'), $group['groupDiscovery']['ts_delete']),
-				zbx_date2str(_('H:i:s'), $group['groupDiscovery']['ts_delete'])
-			)
-		);
+		$info->setHint(_s(
+			'The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s).',
+			zbx_date2age($group['groupDiscovery']['ts_delete']),
+			zbx_date2str(DATE_FORMAT, $group['groupDiscovery']['ts_delete']),
+			zbx_date2str(TIME_FORMAT, $group['groupDiscovery']['ts_delete'])
+		));
 	}
 	else {
 		$info = '';
@@ -151,16 +151,20 @@ foreach ($this->data['groups'] as $group) {
 }
 
 // create go button
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('hostgroup.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected hosts?'));
 $goComboBox->addItem($goOption);
-$goOption = new CComboItem('disable', _('Disable selected'));
+
+$goOption = new CComboItem('hostgroup.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable hosts in the selected host groups?'));
 $goComboBox->addItem($goOption);
-$goOption = new CComboItem('delete', _('Delete selected'));
+
+$goOption = new CComboItem('hostgroup.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected host groups?'));
 $goComboBox->addItem($goOption);
+
 $goButton = new CSubmit('goButton', _('Go').' (0)');
 $goButton->setAttribute('id', 'goButton');
 zbx_add_post_js('chkbxRange.pageGoName = "groups";');
diff --git a/frontends/php/include/views/configuration.httpconf.edit.php b/frontends/php/include/views/configuration.httpconf.edit.php
index e1e5aba8f3f..0806a26d90b 100644
--- a/frontends/php/include/views/configuration.httpconf.edit.php
+++ b/frontends/php/include/views/configuration.httpconf.edit.php
@@ -74,15 +74,6 @@ $httpFormList->addRow(_('New application'),
 	new CTextBox('new_application', $this->data['new_application'], ZBX_TEXTBOX_STANDARD_SIZE), false, null, 'new'
 );
 
-// Authentication
-$authenticationComboBox = new CComboBox('authentication', $this->data['authentication'], 'submit();');
-$authenticationComboBox->addItems(httptest_authentications());
-$httpFormList->addRow(_('Authentication'), $authenticationComboBox);
-if (in_array($this->data['authentication'], array(HTTPTEST_AUTH_BASIC, HTTPTEST_AUTH_NTLM))) {
-	$httpFormList->addRow(_('User'), new CTextBox('http_user', $this->data['http_user'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64));
-	$httpFormList->addRow(_('Password'), new CTextBox('http_password', $this->data['http_password'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64));
-}
-
 // update interval
 $httpFormList->addRow(_('Update interval (in sec)'), new CNumericBox('delay', $this->data['delay'], 5));
 
@@ -134,20 +125,65 @@ $agentComboBox->addItemsInGroup(_('Others'), array(
 	'Lynx/2.8.4rel.1 libwww-FM/2.14' => 'Lynx 2.8.4rel.1',
 	'Links (2.3pre1; Linux 2.6.35.10 i686; 225x51)' => 'Links 2.3pre1',
 	'Links (2.2; Linux 2.6.37.6-0.7-desktop i686; 225x51)' => 'Links 2.2',
-	'Googlebot/2.1 (+http://www.google.com/bot.html)' => 'Googlebot'
+	'Googlebot/2.1 (+http://www.google.com/bot.html)' => 'Googlebot',
+	-1 => _('other').' ...'
 ));
+
 $httpFormList->addRow(_('Agent'), $agentComboBox);
 
 // append HTTP proxy to form list
-$httpProxyTextBox = new CTextBox('http_proxy', $this->data['http_proxy'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 255);
+$httpProxyTextBox = new CTextBox('http_proxy', $this->data['http_proxy'], ZBX_TEXTBOX_STANDARD_SIZE, false, 255);
 $httpProxyTextBox->setAttribute('placeholder', 'http://[username[:password]@]proxy.example.com[:port]');
 $httpFormList->addRow(_('HTTP proxy'), $httpProxyTextBox);
 
-// append status to form list
+// append variables to form list
 $httpFormList->addRow(_('Variables'), new CTextArea('variables', $this->data['variables']));
+
+// append headers to form list
+$httpFormList->addRow(_('Headers'), new CTextArea('headers', $this->data['headers']));
+
+// status
 $httpFormList->addRow(_('Enabled'), new CCheckBox('status', !$this->data['status']));
 
 /*
+ * Authentication tab
+ */
+$httpAuthenticationFormList = new CFormList('httpAuthenticationFormList');
+
+// Authentication type
+$authenticationComboBox = new CComboBox('authentication', $this->data['authentication'], 'submit();');
+$authenticationComboBox->addItems(httptest_authentications());
+$httpAuthenticationFormList->addRow(_('Authentication'), $authenticationComboBox);
+if (in_array($this->data['authentication'], array(HTTPTEST_AUTH_BASIC, HTTPTEST_AUTH_NTLM))) {
+	$httpAuthenticationFormList->addRow(_('User'), new CTextBox('http_user', $this->data['http_user'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64));
+	$httpAuthenticationFormList->addRow(_('Password'), new CTextBox('http_password', $this->data['http_password'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64));
+}
+
+// SSL verify peer checkbox
+$httpAuthenticationFormList->addRow(_('SSL verify peer'), new CCheckBox('verify_peer', $this->data['verify_peer']));
+
+// SSL verify host checkbox
+$httpAuthenticationFormList->addRow(_('SSL verify host'), new CCheckBox('verify_host', $this->data['verify_host']));
+
+// SSL certificate file
+$httpAuthenticationFormList->addRow(
+	_('SSL certificate file'),
+	new CTextBox('ssl_cert_file', $this->data['ssl_cert_file'], ZBX_TEXTBOX_STANDARD_SIZE, false, 255)
+);
+
+// SSL key file
+$httpAuthenticationFormList->addRow(
+	_('SSL key file'),
+	new CTextBox('ssl_key_file', $this->data['ssl_key_file'], ZBX_TEXTBOX_STANDARD_SIZE, false, 255)
+);
+
+// SSL key password
+$httpAuthenticationFormList->addRow(
+	_('SSL key password'),
+	new CTextBox('ssl_key_password', $this->data['ssl_key_password'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64)
+);
+
+/*
  * Step tab
  */
 $httpStepFormList = new CFormList('httpFormList');
@@ -195,8 +231,10 @@ foreach ($this->data['steps'] as $stepid => $step) {
 		'name_step' => $stepid
 	));
 
-	if (zbx_strlen($step['url']) > 70) {
-		$url = new CSpan(substr($step['url'], 0, 35).SPACE.'...'.SPACE.substr($step['url'], zbx_strlen($step['url']) - 25, 25));
+	if (mb_strlen($step['url']) > 70) {
+		$start = mb_substr($step['url'], 0, 35);
+		$end = mb_substr($step['url'], mb_strlen($step['url']) - 25, 25);
+		$url = new CSpan($start.SPACE.'...'.SPACE.$end);
 		$url->setHint($step['url']);
 	}
 	else {
@@ -240,6 +278,8 @@ if (!$this->data['form_refresh']) {
 }
 $httpTab->addTab('scenarioTab', _('Scenario'), $httpFormList);
 $httpTab->addTab('stepTab', _('Steps'), $httpStepFormList);
+$httpTab->addTab('authenticationTab', _('Authentication'), $httpAuthenticationFormList);
+
 $httpForm->addItem($httpTab);
 
 // append buttons to form
diff --git a/frontends/php/include/views/configuration.httpconf.list.php b/frontends/php/include/views/configuration.httpconf.list.php
index c58c81e5044..a54ce71f6ff 100644
--- a/frontends/php/include/views/configuration.httpconf.list.php
+++ b/frontends/php/include/views/configuration.httpconf.list.php
@@ -58,21 +58,58 @@ $httpForm->addVar('hostid', $this->data['hostid']);
 $httpTable = new CTableInfo(_('No web scenarios found.'));
 $httpTable->setHeader(array(
 	new CCheckBox('all_httptests', null, "checkAll('".$httpForm->getName()."', 'all_httptests', 'group_httptestid');"),
-	($this->data['hostid'] == 0) ? make_sorting_header(_('Host'), 'hostname') : null,
-	make_sorting_header(_('Name'), 'name'),
+	($this->data['hostid'] == 0)
+		? make_sorting_header(_('Host'), 'hostname', $this->data['sort'], $this->data['sortorder'])
+		: null,
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Number of steps'),
 	_('Update interval'),
-	make_sorting_header(_('Status'), 'status'))
-);
+	_('Retries'),
+	_('Authentication'),
+	_('HTTP proxy'),
+	_('Application'),
+	make_sorting_header(_('Status'), 'status', $this->data['sort'], $this->data['sortorder']),
+	$this->data['showInfoColumn'] ? _('Info') : null
+));
+
+$httpTestsLastData = $this->data['httpTestsLastData'];
+$httpTests = $this->data['httpTests'];
 
-foreach ($this->data['httpTests'] as $httpTestId => $httpTest) {
+foreach ($httpTests as $httpTestId => $httpTest) {
 	$name = array();
 	if (isset($this->data['parentTemplates'][$httpTestId])) {
 		$template = $this->data['parentTemplates'][$httpTestId];
 		$name[] = new CLink($template['name'], '?groupid=0&hostid='.$template['id'], 'unknown');
 		$name[] = NAME_DELIMITER;
 	}
-	$name[] = new CLink($httpTest['name'], '?form=update'.'&httptestid='.$httpTest['httptestid'].'&hostid='.$httpTest['hostid']);
+	$name[] = new CLink($httpTest['name'], '?form=update'.'&httptestid='.$httpTestId.'&hostid='.$httpTest['hostid']);
+
+	if ($this->data['showInfoColumn']) {
+		if($httpTest['status'] == HTTPTEST_STATUS_ACTIVE && isset($httpTestsLastData[$httpTestId]) && $httpTestsLastData[$httpTestId]['lastfailedstep']) {
+			$lastData = $httpTestsLastData[$httpTestId];
+
+			$failedStep = $lastData['failedstep'];
+
+			$errorMessage = $failedStep
+				? _s(
+					'Step "%1$s" [%2$s of %3$s] failed: %4$s',
+					$failedStep['name'],
+					$failedStep['no'],
+					$httpTest['stepscnt'],
+					($lastData['error'] === null) ? _('Unknown error') : $lastData['error']
+				)
+				: _s('Unknown step failed: %1$s', $lastData['error']);
+
+			$infoIcon = new CDiv(SPACE, 'status_icon iconerror');
+			$infoIcon->setHint($errorMessage, 'on');
+		}
+		else {
+			$infoIcon = '';
+		}
+	}
+	else {
+		$infoIcon = null;
+	}
 
 	$httpTable->addRow(array(
 		new CCheckBox('group_httptestid['.$httpTest['httptestid'].']', null, null, $httpTest['httptestid']),
@@ -80,36 +117,46 @@ foreach ($this->data['httpTests'] as $httpTestId => $httpTest) {
 		$name,
 		$httpTest['stepscnt'],
 		$httpTest['delay'],
+		$httpTest['retries'],
+		httptest_authentications($httpTest['authentication']),
+		($httpTest['http_proxy'] !== '') ? _('Yes') : _('No'),
+		($httpTest['applicationid'] != 0) ? $httpTest['application_name'] : '-',
 		new CLink(
 			httptest_status2str($httpTest['status']),
 			'?group_httptestid[]='.$httpTest['httptestid'].
 				'&hostid='.$httpTest['hostid'].
-				'&go='.($httpTest['status'] ? 'activate' : 'disable'),
+				'&action='.($httpTest['status'] == HTTPTEST_STATUS_DISABLED
+					? 'httptest.massenable'
+					: 'httptest.massdisable'
+				),
 			httptest_status2style($httpTest['status'])
-		)
+		),
+		$infoIcon
 	));
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
-$goOption->setAttribute('confirm', _('Enable selected WEB scenarios?'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('httptest.massenable', _('Enable selected'));
+$goOption->setAttribute('confirm', _('Enable selected web scenarios?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
-$goOption->setAttribute('confirm',_('Disable selected WEB scenarios?'));
+$goOption = new CComboItem('httptest.massdisable', _('Disable selected'));
+$goOption->setAttribute('confirm',_('Disable selected web scenarios?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('clean_history', _('Clear history for selected'));
-$goOption->setAttribute('confirm', _('Delete history of selected WEB scenarios?'));
+$goOption = new CComboItem('httptest.massclearhistory', _('Clear history for selected'));
+$goOption->setAttribute('confirm', _('Delete history of selected web scenarios?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
-$goOption->setAttribute('confirm', _('Delete selected WEB scenarios?'));
+$goOption = new CComboItem('httptest.massdelete', _('Delete selected'));
+$goOption->setAttribute('confirm', _('Delete selected web scenarios?'));
 $goComboBox->addItem($goOption);
 
 $goButton = new CSubmit('goButton', _('Go').' (0)');
 $goButton->setAttribute('id', 'goButton');
+
 zbx_add_post_js('chkbxRange.pageGoName = "group_httptestid";');
 zbx_add_post_js('chkbxRange.prefix = "'.$this->data['hostid'].'";');
 zbx_add_post_js('cookie.prefix = "'.$this->data['hostid'].'";');
diff --git a/frontends/php/include/views/configuration.httpconf.popup.php b/frontends/php/include/views/configuration.httpconf.popup.php
index 2a4eb8468ef..99589bebc6c 100644
--- a/frontends/php/include/views/configuration.httpconf.popup.php
+++ b/frontends/php/include/views/configuration.httpconf.popup.php
@@ -21,14 +21,15 @@
 
 include('include/views/js/configuration.httpconf.popup.js.php');
 
-$httpPopupWidget = new CWidget();
+$httpPopupWidget = new CWidget(null, 'httptest-popup');
 
-if (isset($_REQUEST['save'])) {
+$result = false;
+if (hasRequest('save')) {
 	$result = true;
-	if ((!isset($_REQUEST['stepid']) || (isset($_REQUEST['stepid']) && $_REQUEST['name'] !== $_REQUEST['old_name']))
-			&& isset($_REQUEST['steps_names'])) {
-		foreach ($_REQUEST['steps_names'] as $name) {
-			if ($name === $_REQUEST['name']) {
+	if ((!hasRequest('stepid') || (hasRequest('stepid') && getRequest('name') !== getRequest('old_name')))
+			&& hasRequest('steps_names')) {
+		foreach (getRequest('steps_names', array()) as $name) {
+			if ($name === getRequest('name')) {
 				show_error_message(_s('Step with name "%1$s" already exists.', $name));
 				$result = false;
 			}
@@ -36,51 +37,66 @@ if (isset($_REQUEST['save'])) {
 	}
 }
 
-if (isset($_REQUEST['save']) && $result) {
-	if (!isset($_REQUEST['stepid'])) {
-		insert_js('add_httpstep('.
-					zbx_jsvalue($_REQUEST['dstfrm']).','.
-					zbx_jsvalue($_REQUEST['name']).','.
-					zbx_jsvalue($_REQUEST['timeout']).','.
-					zbx_jsvalue($_REQUEST['url']).','.
-					zbx_jsvalue($_REQUEST['posts']).','.
-					zbx_jsvalue($_REQUEST['variables']).','.
-					zbx_jsvalue($_REQUEST['required']).','.
-					zbx_jsvalue($_REQUEST['status_codes']).");\n"
-		);
+if (hasRequest('stepid')) {
+	$followRedirects = getRequest('follow_redirects', HTTPTEST_STEP_FOLLOW_REDIRECTS_OFF);
+	$retrieveMode = getRequest('retrieve_mode', HTTPTEST_STEP_RETRIEVE_MODE_CONTENT);
+}
+else {
+	$followRedirects = HTTPTEST_STEP_FOLLOW_REDIRECTS_ON;
+	$retrieveMode = HTTPTEST_STEP_RETRIEVE_MODE_CONTENT;
+}
+
+if (hasRequest('save') && $result) {
+
+	$httpStepForJs = array(
+		'stepid' => getRequest('stepid'),
+		'name' => getRequest('name'),
+		'timeout' => getRequest('timeout'),
+		'url' => getRequest('url'),
+		'posts'  => getRequest('posts'),
+		'variables' => getRequest('variables'),
+		'required' => getRequest('required'),
+		'status_codes' => getRequest('status_codes'),
+		'headers' => getRequest('headers'),
+		'follow_redirects' => getRequest('follow_redirects'),
+		'retrieve_mode'  => getRequest('retrieve_mode')
+	);
+
+	if (!hasRequest('stepid')) {
+		insert_js('add_httpstep('.CJs::encodeJson(getRequest('dstfrm')).','.
+					CJs::encodeJson($httpStepForJs).');'."\n");
 	}
 	else {
-		insert_js('update_httpstep('.
-					zbx_jsvalue($_REQUEST['dstfrm']).','.
-					zbx_jsvalue($_REQUEST['list_name']).','.
-					zbx_jsvalue($_REQUEST['stepid']).','.
-					zbx_jsvalue($_REQUEST['name']).','.
-					zbx_jsvalue($_REQUEST['timeout']).','.
-					zbx_jsvalue($_REQUEST['url']).','.
-					zbx_jsvalue($_REQUEST['posts']).','.
-					zbx_jsvalue($_REQUEST['variables']).','.
-					zbx_jsvalue($_REQUEST['required']).','.
-					zbx_jsvalue($_REQUEST['status_codes']).");\n"
+		insert_js('update_httpstep('.CJs::encodeJson(getRequest('dstfrm')).','.
+					CJs::encodeJson(getRequest('list_name')).','.
+					CJs::encodeJson($httpStepForJs).');'."\n"
 		);
 	}
 }
 else {
 	$httpPopupForm = new CForm();
-	$httpPopupForm->addVar('dstfrm', get_request('dstfrm', null));
-	$httpPopupForm->addVar('stepid', get_request('stepid', null));
-	$httpPopupForm->addVar('list_name', get_request('list_name', null));
-	$httpPopupForm->addVar('templated', get_request('templated', null));
-	$httpPopupForm->addVar('old_name', get_request('old_name', null));
-	$httpPopupForm->addVar('steps_names', get_request('steps_names', null));
+	$httpPopupForm->addVar('dstfrm', getRequest('dstfrm'));
+	$httpPopupForm->addVar('stepid', getRequest('stepid'));
+	$httpPopupForm->addVar('list_name', getRequest('list_name'));
+	$httpPopupForm->addVar('templated', getRequest('templated'));
+	$httpPopupForm->addVar('old_name', getRequest('old_name'));
+	$httpPopupForm->addVar('steps_names', getRequest('steps_names'));
 
 	$httpPopupFormList = new CFormList('httpPopupFormList');
-	$httpPopupFormList->addRow(_('Name'), new CTextBox('name', get_request('name', ''), ZBX_TEXTBOX_STANDARD_SIZE, get_request('templated', null), 64));
-	$httpPopupFormList->addRow(_('URL'), new CTextBox('url', get_request('url', ''), ZBX_TEXTBOX_STANDARD_SIZE));
-	$httpPopupFormList->addRow(_('Post'), new CTextArea('posts', get_request('posts', '')));
-	$httpPopupFormList->addRow(_('Variables'), new CTextArea('variables', get_request('variables', '')));
-	$httpPopupFormList->addRow(_('Timeout'), new CNumericBox('timeout', get_request('timeout', 15), 5));
-	$httpPopupFormList->addRow(_('Required string'), new CTextBox('required', get_request('required', ''), ZBX_TEXTBOX_STANDARD_SIZE));
-	$httpPopupFormList->addRow(_('Required status codes'), new CTextBox('status_codes', get_request('status_codes', ''), ZBX_TEXTBOX_STANDARD_SIZE));
+	$httpPopupFormList->addRow(_('Name'), new CTextBox('name', getRequest('name', ''), ZBX_TEXTBOX_STANDARD_SIZE, (bool) getRequest('templated'), 64));
+	$httpPopupFormList->addRow(_('URL'), new CTextBox('url', getRequest('url', ''), ZBX_TEXTBOX_STANDARD_SIZE, false, null));
+	$httpPopupFormList->addRow(_('Post'), new CTextArea('posts', getRequest('posts', '')));
+	$httpPopupFormList->addRow(_('Variables'), new CTextArea('variables', getRequest('variables', '')));
+
+	$httpPopupFormList->addRow(_('Headers'), new CTextArea('headers', getRequest('headers', '')));
+
+	$httpPopupFormList->addRow(_('Follow redirects'), new CCheckBox('follow_redirects', $followRedirects, null, true));
+
+	$httpPopupFormList->addRow(_('Retrieve only headers'), new CCheckBox('retrieve_mode', $retrieveMode, null, true));
+
+	$httpPopupFormList->addRow(_('Timeout'), new CNumericBox('timeout', getRequest('timeout', 15), 5));
+	$httpPopupFormList->addRow(_('Required string'), new CTextBox('required', getRequest('required', ''), ZBX_TEXTBOX_STANDARD_SIZE));
+	$httpPopupFormList->addRow(_('Required status codes'), new CTextBox('status_codes', getRequest('status_codes', ''), ZBX_TEXTBOX_STANDARD_SIZE));
 
 	// append tabs to form
 	$httpPopupTab = new CTabView();
@@ -88,7 +104,7 @@ else {
 	$httpPopupForm->addItem($httpPopupTab);
 
 	// append buttons to form
-	$stepid = get_request('stepid', null);
+	$stepid = getRequest('stepid');
 	$httpPopupForm->addItem(makeFormFooter(
 		new CSubmit('save', isset($stepid) ? _('Update') : _('Add')),
 		new CButtonCancel(null, 'close_window();')
diff --git a/frontends/php/include/views/configuration.item.edit.php b/frontends/php/include/views/configuration.item.edit.php
index cb8d4c9b7cb..deb47c5a8d8 100644
--- a/frontends/php/include/views/configuration.item.edit.php
+++ b/frontends/php/include/views/configuration.item.edit.php
@@ -55,7 +55,7 @@ $itemFormList->addRow(_('Name'), $nameTextBox);
 if ($this->data['limited']) {
 	$itemForm->addVar('type', $this->data['type']);
 	$itemFormList->addRow(_('Type'),
-		new CTextBox('typename', item_type2str($this->data['type']), ZBX_TEXTBOX_STANDARD_SIZE, 'yes')
+		new CTextBox('typename', item_type2str($this->data['type']), ZBX_TEXTBOX_STANDARD_SIZE, true)
 	);
 }
 else {
@@ -115,11 +115,11 @@ $itemFormList->addRow(_('Context name'),
 	false, 'row_snmpv3_contextname'
 );
 $itemFormList->addRow(_('SNMP community'),
-	new CTextBox('snmp_community', $this->data['snmp_community'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64),
+	new CTextBox('snmp_community', $this->data['snmp_community'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64),
 	false, 'row_snmp_community'
 );
 $itemFormList->addRow(_('Security name'),
-	new CTextBox('snmpv3_securityname', $this->data['snmpv3_securityname'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64),
+	new CTextBox('snmpv3_securityname', $this->data['snmpv3_securityname'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64),
 	false, 'row_snmpv3_securityname'
 );
 
@@ -140,7 +140,7 @@ $itemFormList->addRow(_('Authentication protocol'),
 	false, 'row_snmpv3_authprotocol'
 );
 $itemFormList->addRow(_('Authentication passphrase'),
-	new CTextBox('snmpv3_authpassphrase', $this->data['snmpv3_authpassphrase'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64),
+	new CTextBox('snmpv3_authpassphrase', $this->data['snmpv3_authpassphrase'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64),
 	false, 'row_snmpv3_authpassphrase'
 );
 $privProtocolRadioButton = array(
@@ -154,11 +154,11 @@ $itemFormList->addRow(_('Privacy protocol'),
 	false, 'row_snmpv3_privprotocol'
 );
 $itemFormList->addRow(_('Privacy passphrase'),
-	new CTextBox('snmpv3_privpassphrase', $this->data['snmpv3_privpassphrase'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 64),
+	new CTextBox('snmpv3_privpassphrase', $this->data['snmpv3_privpassphrase'], ZBX_TEXTBOX_STANDARD_SIZE, false, 64),
 	false, 'row_snmpv3_privpassphrase'
 );
 $itemFormList->addRow(_('Port'),
-	new CTextBox('port', $this->data['port'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false, 'row_port'
+	new CTextBox('port', $this->data['port'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false, 'row_port'
 );
 $itemFormList->addRow(_('IPMI sensor'),
 	new CTextBox('ipmi_sensor', $this->data['ipmi_sensor'], ZBX_TEXTBOX_STANDARD_SIZE, $this->data['limited'], 128),
@@ -171,16 +171,16 @@ $authTypeComboBox->addItem(ITEM_AUTHTYPE_PASSWORD, _('Password'));
 $authTypeComboBox->addItem(ITEM_AUTHTYPE_PUBLICKEY, _('Public key'));
 $itemFormList->addRow(_('Authentication method'), $authTypeComboBox, false, 'row_authtype');
 $itemFormList->addRow(_('User name'),
-	new CTextBox('username', $this->data['username'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false, 'row_username'
+	new CTextBox('username', $this->data['username'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false, 'row_username'
 );
 $itemFormList->addRow(_('Public key file'),
-	new CTextBox('publickey', $this->data['publickey'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false, 'row_publickey'
+	new CTextBox('publickey', $this->data['publickey'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false, 'row_publickey'
 );
 $itemFormList->addRow(_('Private key file'),
-	new CTextBox('privatekey', $this->data['privatekey'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false,  'row_privatekey'
+	new CTextBox('privatekey', $this->data['privatekey'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false,  'row_privatekey'
 );
 $itemFormList->addRow(_('Password'),
-	new CTextBox('password', $this->data['password'], ZBX_TEXTBOX_SMALL_SIZE, 'no', 64), false, 'row_password'
+	new CTextBox('password', $this->data['password'], ZBX_TEXTBOX_SMALL_SIZE, false, 64), false, 'row_password'
 );
 $itemFormList->addRow(_('Executed script'),
 	new CTextArea('params_es', $this->data['params'], array('rows' => ZBX_TEXTAREA_STANDARD_ROWS, 'width' => ZBX_TEXTAREA_STANDARD_WIDTH)),
@@ -203,7 +203,7 @@ $itemFormList->addRow(_('Formula'),
 if ($this->data['limited']) {
 	$itemForm->addVar('value_type', $this->data['value_type']);
 	$itemFormList->addRow(_('Type of information'),
-		new CTextBox('value_type_name', itemValueTypeString($this->data['value_type']), ZBX_TEXTBOX_STANDARD_SIZE, 'yes')
+		new CTextBox('value_type_name', itemValueTypeString($this->data['value_type']), ZBX_TEXTBOX_STANDARD_SIZE, true)
 	);
 }
 else {
@@ -219,7 +219,7 @@ else {
 // append data type to form list
 if ($this->data['limited']) {
 	$itemForm->addVar('data_type', $this->data['data_type']);
-	$dataType = new CTextBox('data_type_name', item_data_type2str($this->data['data_type']), ZBX_TEXTBOX_SMALL_SIZE, 'yes');
+	$dataType = new CTextBox('data_type_name', item_data_type2str($this->data['data_type']), ZBX_TEXTBOX_SMALL_SIZE, true);
 }
 else {
 	$dataType = new CComboBox('data_type', $this->data['data_type']);
@@ -240,7 +240,7 @@ if ($this->data['limited']) {
 	$multiplier[] = $multiplierCheckBox;
 
 	$multiplier[] = SPACE;
-	$formulaTextBox = new CTextBox('formula', $this->data['formula'], ZBX_TEXTBOX_SMALL_SIZE, 1);
+	$formulaTextBox = new CTextBox('formula', $this->data['formula'], ZBX_TEXTBOX_SMALL_SIZE, true);
 	$formulaTextBox->setAttribute('style', 'text-align: right;');
 	$multiplier[] = $formulaTextBox;
 }
@@ -295,7 +295,7 @@ $itemFormList->addRow(_('Flexible intervals'),
 $newFlexInt = new CSpan(array(
 	_('Interval (in sec)'),
 	SPACE,
-	new CNumericBox('new_delay_flex[delay]', $this->data['new_delay_flex']['delay'], 5, 'no', false, false),
+	new CNumericBox('new_delay_flex[delay]', $this->data['new_delay_flex']['delay'], 5, false, false, false),
 	SPACE,
 	_('Period'),
 	SPACE,
@@ -315,42 +315,32 @@ $dataConfig = select_config();
 $keepHistory = array();
 $keepHistory[] =  new CNumericBox('history', $this->data['history'], 8);
 if ($dataConfig['hk_history_global'] && !$data['parent_discoveryid'] && !$data['is_template']) {
-	$keepHistory[] = SPACE;
+	$keepHistory[] = ' '._x('Overridden by', 'item_form').' ';
 	if (CWebUser::getType() == USER_TYPE_SUPER_ADMIN) {
-		$keepHistory[] = new CSpan(_x('Overridden by', 'item_form'));
-		$keepHistory[] = SPACE;
 		$link = new CLink(_x('global housekeeping settings', 'item_form'), 'adm.housekeeper.php');
 		$link->setAttribute('target', '_blank');
-		$keepHistory[] =  $link;
-		$keepHistory[] = SPACE;
-		$keepHistory[] = new CSpan('('._n('%1$s day', '%1$s days', $dataConfig['hk_history']).')');
+		$keepHistory[] = $link;
 	}
 	else {
-		$keepHistory[] = new CSpan(_('Overriden by global housekeeping settings').
-			'('._n('%1$s day', '%1$s days', $dataConfig['hk_history']).')'
-		);
+		$keepHistory[] = _x('global housekeeping settings', 'item_form');
 	}
+	$keepHistory[] = ' ('._n('%1$s day', '%1$s days', $dataConfig['hk_history']).')';
 }
 $itemFormList->addRow(_('History storage period (in days)'), $keepHistory);
 
 $keepTrend = array();
 $keepTrend[] =  new CNumericBox('trends', $this->data['trends'], 8);
 if ($dataConfig['hk_trends_global'] && !$data['parent_discoveryid'] && !$data['is_template']) {
-	$keepTrend[] = SPACE;
+	$keepTrend[] = ' '._x('Overridden by', 'item_form').' ';
 	if (CWebUser::getType() == USER_TYPE_SUPER_ADMIN) {
-		$keepTrend[] = new CSpan(_x('Overridden by', 'item_form'));
-		$keepTrend[] = SPACE;
 		$link = new CLink(_x('global housekeeping settings', 'item_form'), 'adm.housekeeper.php');
 		$link->setAttribute('target', '_blank');
-		$keepTrend[] =  $link;
-		$keepTrend[] = SPACE;
-		$keepTrend[] = new CSpan('('._n('%1$s day', '%1$s days', $dataConfig['hk_trends']).')');
+		$keepTrend[] = $link;
 	}
 	else {
-		$keepTrend[] = new CSpan(_('Overriden by global housekeeping settings').
-			'('._n('%1$s day', '%1$s days', $dataConfig['hk_trends']).')'
-		);
+		$keepTrend[] = _x('global housekeeping settings', 'item_form');
 	}
+	$keepTrend[] = ' ('._n('%1$s day', '%1$s days', $dataConfig['hk_trends']).')';
 }
 
 $itemFormList->addRow(_('Trend storage period (in days)'), $keepTrend, false, 'row_trends');
@@ -367,7 +357,7 @@ $deltaOptions = array(
 );
 if ($this->data['limited']) {
 	$itemForm->addVar('delta', $this->data['delta']);
-	$deltaComboBox = new CTextBox('delta_name', $deltaOptions[$this->data['delta']], null, 'yes');
+	$deltaComboBox = new CTextBox('delta_name', $deltaOptions[$this->data['delta']], null, true);
 }
 else {
 	$deltaComboBox= new CComboBox('delta', $this->data['delta']);
@@ -378,7 +368,11 @@ $itemFormList->addRow(_('Store value'), $deltaComboBox, false, 'row_delta');
 // append valuemap to form list
 if ($this->data['limited']) {
 	$itemForm->addVar('valuemapid', $this->data['valuemapid']);
-	$valuemapComboBox = new CTextBox('valuemap_name', !empty($this->data['valuemaps']) ? $this->data['valuemaps'] : _('As is'), ZBX_TEXTBOX_SMALL_SIZE, 'yes');
+	$valuemapComboBox = new CTextBox('valuemap_name',
+		!empty($this->data['valuemaps']) ? $this->data['valuemaps'] : _('As is'),
+		ZBX_TEXTBOX_SMALL_SIZE,
+		true
+	);
 }
 else {
 	$valuemapComboBox = new CComboBox('valuemapid', $this->data['valuemapid']);
diff --git a/frontends/php/include/views/configuration.item.list.php b/frontends/php/include/views/configuration.item.list.php
index 6cc0cc1dcfb..d7bc63cbcfc 100644
--- a/frontends/php/include/views/configuration.item.list.php
+++ b/frontends/php/include/views/configuration.item.list.php
@@ -55,20 +55,22 @@ if (!empty($this->data['hostid'])) {
 }
 
 // create table
-$itemTable = new CTableInfo(_('No items found.'));
+$itemTable = new CTableInfo(
+	($this->data['filterSet']) ? _('No items found.') : _('Specify some filter condition to see the items.')
+);
 $itemTable->setHeader(array(
 	new CCheckBox('all_items', null, "checkAll('".$itemForm->getName()."', 'all_items', 'group_itemid');"),
 	_('Wizard'),
 	empty($this->data['filter_hostid']) ? _('Host') : null,
-	make_sorting_header(_('Name'), 'name'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Triggers'),
-	make_sorting_header(_('Key'), 'key_'),
-	make_sorting_header(_('Interval'), 'delay'),
-	make_sorting_header(_('History'), 'history'),
-	make_sorting_header(_('Trends'), 'trends'),
-	make_sorting_header(_('Type'), 'type'),
+	make_sorting_header(_('Key'), 'key_', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Interval'), 'delay', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('History'), 'history', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Trends'), 'trends', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Type'), 'type', $this->data['sort'], $this->data['sortorder']),
 	_('Applications'),
-	make_sorting_header(_('Status'), 'status'),
+	make_sorting_header(_('Status'), 'status', $this->data['sort'], $this->data['sortorder']),
 	$data['showInfoColumn'] ? _('Info') : null
 ));
 
@@ -102,7 +104,9 @@ foreach ($this->data['items'] as $item) {
 	// status
 	$status = new CCol(new CLink(
 		itemIndicator($item['status'], $item['state']),
-		'?group_itemid='.$item['itemid'].'&hostid='.$item['hostid'].'&go='.($item['status'] ? 'activate' : 'disable'),
+		'?group_itemid='.$item['itemid'].
+			'&hostid='.$item['hostid'].
+			'&action='.($item['status'] == ITEM_STATUS_DISABLED ? 'item.massenable' : 'item.massdisable'),
 		itemIndicatorStyle($item['status'], $item['state'])
 	));
 
@@ -112,7 +116,7 @@ foreach ($this->data['items'] as $item) {
 
 		if ($item['status'] == ITEM_STATUS_ACTIVE && !zbx_empty($item['error'])) {
 			$info = new CDiv(SPACE, 'status_icon iconerror');
-			$info->setHint($item['error'], '', 'on');
+			$info->setHint($item['error'], 'on');
 
 			$infoIcons[] = $info;
 		}
@@ -120,10 +124,11 @@ foreach ($this->data['items'] as $item) {
 		// discovered item lifetime indicator
 		if ($item['flags'] == ZBX_FLAG_DISCOVERY_CREATED && $item['itemDiscovery']['ts_delete']) {
 			$deleteError = new CDiv(SPACE, 'status_icon iconwarning');
-			$deleteError->setHint(
-				_s('The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s).',
-					zbx_date2age($item['itemDiscovery']['ts_delete']), zbx_date2str(_('d M Y'), $item['itemDiscovery']['ts_delete']),
-					zbx_date2str(_('H:i:s'), $item['itemDiscovery']['ts_delete'])
+			$deleteError->setHint(_s(
+				'The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s).',
+				zbx_date2age($item['itemDiscovery']['ts_delete']),
+				zbx_date2str(DATE_FORMAT, $item['itemDiscovery']['ts_delete']),
+				zbx_date2str(TIME_FORMAT, $item['itemDiscovery']['ts_delete'])
 			));
 
 			$infoIcons[] = $deleteError;
@@ -255,26 +260,27 @@ foreach ($this->data['items'] as $item) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('item.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected items?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('item.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected items?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('massupdate', _('Mass update'));
+$goOption = new CComboItem('item.massupdate', _('Mass update'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('copy_to', _('Copy selected to ...'));
+$goOption = new CComboItem('item.masscopyto', _('Copy selected to ...'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('clean_history', _('Clear history for selected'));
+$goOption = new CComboItem('item.massclearhistory', _('Clear history for selected'));
 $goOption->setAttribute('confirm', _('Delete history of selected items?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('item.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected items?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/configuration.item.massupdate.php b/frontends/php/include/views/configuration.item.massupdate.php
index 4c500a37ce1..aaab93147a1 100644
--- a/frontends/php/include/views/configuration.item.massupdate.php
+++ b/frontends/php/include/views/configuration.item.massupdate.php
@@ -478,16 +478,22 @@ if ($this->data['displayApplications']) {
 		}
 	}
 
-	$replaceApp = new CMultiSelect(array(
+	$replaceApp = new CDiv(new CMultiSelect(array(
 		'name' => 'applications[]',
 		'objectName' => 'applications',
 		'objectOptions' => array('hostid' => $this->data['hostid']),
-		'data' => $appToReplace
-	));
+		'data' => $appToReplace,
+		'popup' => array(
+			'parameters' => 'srctbl=applications&dstfrm='.$itemForm->getName().'&dstfld1=applications_'.
+				'&srcfld1=applicationid&multiselect=1&noempty=1&hostid='.$this->data['hostid'],
+			'width' => 450,
+			'height' => 450
+		)
+	)), null, 'replaceApp');
 
 	$itemFormList->addRow(
 		array(_('Replace applications'), SPACE, new CVisibilityBox('visible[applications]',
-			isset($this->data['visible']['applications']), 'applications_', _('Original')
+			isset($this->data['visible']['applications']), 'replaceApp', _('Original')
 		)),
 		$replaceApp
 	);
@@ -522,17 +528,23 @@ if ($this->data['displayApplications']) {
 		}
 	}
 
-	$newApp = new CMultiSelect(array(
+	$newApp = new CDiv(new CMultiSelect(array(
 		'name' => 'new_applications[]',
 		'objectName' => 'applications',
 		'objectOptions' => array('hostid' => $this->data['hostid']),
 		'data' => $appToAdd,
-		'addNew' => true
-	));
+		'addNew' => true,
+		'popup' => array(
+			'parameters' => 'srctbl=applications&dstfrm='.$itemForm->getName().'&dstfld1=new_applications_'.
+				'&srcfld1=applicationid&multiselect=1&noempty=1&hostid='.$this->data['hostid'],
+			'width' => 450,
+			'height' => 450
+		)
+	)), null, 'newApp');
 
 	$itemFormList->addRow(
 		array(_('Add new or existing applications'), SPACE, new CVisibilityBox('visible[new_applications]',
-			isset($this->data['visible']['new_applications']), 'new_applications_', _('Original')
+			isset($this->data['visible']['new_applications']), 'newApp', _('Original')
 		)),
 		$newApp
 	);
diff --git a/frontends/php/include/views/configuration.item.prototype.list.php b/frontends/php/include/views/configuration.item.prototype.list.php
index 61842b5244c..6e5a90ff22b 100644
--- a/frontends/php/include/views/configuration.item.prototype.list.php
+++ b/frontends/php/include/views/configuration.item.prototype.list.php
@@ -42,20 +42,16 @@ $itemForm->addVar('parent_discoveryid', $this->data['parent_discoveryid']);
 // create table
 $itemTable = new CTableInfo(_('No item prototypes found.'));
 
-$sortLink = new CUrl();
-$sortLink->setArgument('parent_discoveryid', $this->data['parent_discoveryid']);
-$sortLink = $sortLink->getUrl();
-
 $itemTable->setHeader(array(
 	new CCheckBox('all_items', null, "checkAll('".$itemForm->getName()."', 'all_items', 'group_itemid');"),
-	make_sorting_header(_('Name'),'name', $sortLink),
-	make_sorting_header(_('Key'), 'key_', $sortLink),
-	make_sorting_header(_('Interval'), 'delay', $sortLink),
-	make_sorting_header(_('History'), 'history', $sortLink),
-	make_sorting_header(_('Trends'), 'trends', $sortLink),
-	make_sorting_header(_('Type'), 'type', $sortLink),
+	make_sorting_header(_('Name'),'name', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Key'), 'key_', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Interval'), 'delay', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('History'), 'history', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Trends'), 'trends', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Type'), 'type', $this->data['sort'], $this->data['sortorder']),
 	_('Applications'),
-	make_sorting_header(_('Status'), 'status', $sortLink)
+	make_sorting_header(_('Status'), 'status', $this->data['sort'], $this->data['sortorder'])
 ));
 
 foreach ($this->data['items'] as $item) {
@@ -76,7 +72,10 @@ foreach ($this->data['items'] as $item) {
 		itemIndicator($item['status']),
 		'?group_itemid='.$item['itemid'].
 			'&parent_discoveryid='.$this->data['parent_discoveryid'].
-			'&go='.($item['status'] ? 'activate' : 'disable'),
+			'&action='.($item['status'] == ITEM_STATUS_DISABLED
+				? 'itemprototype.massenable'
+				: 'itemprototype.massdisable'
+			),
 		itemIndicatorStyle($item['status'])
 	);
 
@@ -108,16 +107,17 @@ foreach ($this->data['items'] as $item) {
 }
 
 // create go buttons
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('itemprototype.massenable', _('Enable selected'));
 $goOption->setAttribute('confirm', _('Enable selected item prototypes?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem('itemprototype.massdisable', _('Disable selected'));
 $goOption->setAttribute('confirm', _('Disable selected item prototypes?'));
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('itemprototype.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected item prototypes?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/configuration.maintenance.edit.php b/frontends/php/include/views/configuration.maintenance.edit.php
index 74f5d8f46ff..c5197a90ef9 100644
--- a/frontends/php/include/views/configuration.maintenance.edit.php
+++ b/frontends/php/include/views/configuration.maintenance.edit.php
@@ -44,11 +44,11 @@ $maintenanceFormList->addRow(_('Maintenance type'), $typeComboBox);
 
 // active since
 if (isset($_REQUEST['active_since'])) {
-	$fromYear = get_request('active_since_year');
-	$fromMonth = get_request('active_since_month');
-	$fromDay = get_request('active_since_day');
-	$fromHours = get_request('active_since_hour');
-	$fromMinutes = get_request('active_since_minute');
+	$fromYear = getRequest('active_since_year');
+	$fromMonth = getRequest('active_since_month');
+	$fromDay = getRequest('active_since_day');
+	$fromHours = getRequest('active_since_hour');
+	$fromMinutes = getRequest('active_since_minute');
 	$fromDate = array(
 		'y' => $fromYear,
 		'm' => $fromMonth,
@@ -66,11 +66,11 @@ $maintenanceForm->addVar('active_since', $activeSince);
 
 // active till
 if (isset($_REQUEST['active_till'])) {
-	$toYear = get_request('active_till_year');
-	$toMonth = get_request('active_till_month');
-	$toDay = get_request('active_till_day');
-	$toHours = get_request('active_till_hour');
-	$toMinutes = get_request('active_till_minute');
+	$toYear = getRequest('active_till_year');
+	$toMonth = getRequest('active_till_month');
+	$toDay = getRequest('active_till_day');
+	$toHours = getRequest('active_till_hour');
+	$toMinutes = getRequest('active_till_minute');
 	$toDate = array(
 		'y' => $toYear,
 		'm' => $toMonth,
diff --git a/frontends/php/include/views/configuration.maintenance.list.php b/frontends/php/include/views/configuration.maintenance.list.php
index af2a09832a0..f112f528a29 100644
--- a/frontends/php/include/views/configuration.maintenance.list.php
+++ b/frontends/php/include/views/configuration.maintenance.list.php
@@ -41,10 +41,10 @@ $maintenanceForm->setName('maintenanceForm');
 $maintenanceTable = new CTableInfo(_('No maintenance periods found.'));
 $maintenanceTable->setHeader(array(
 	new CCheckBox('all_maintenances', null, "checkAll('".$maintenanceForm->getName()."', 'all_maintenances', 'maintenanceids');"),
-	make_sorting_header(_('Name'), 'name'),
-	make_sorting_header(_('Type'), 'maintenance_type'),
-	make_sorting_header(_('Active since'), 'active_since'),
-	make_sorting_header(_('Active till'), 'active_till'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Type'), 'maintenance_type', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Active since'), 'active_since', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Active till'), 'active_till', $this->data['sort'], $this->data['sortorder']),
 	_('State'),
 	_('Description')
 ));
@@ -68,18 +68,20 @@ foreach ($this->data['maintenances'] as $maintenance) {
 		new CCheckBox('maintenanceids['.$maintenanceid.']', null, null, $maintenanceid),
 		new CLink($maintenance['name'], 'maintenance.php?form=update&maintenanceid='.$maintenanceid),
 		$maintenance['maintenance_type'] ? _('No data collection') : _('With data collection'),
-		zbx_date2str(_('d M Y H:i'), $maintenance['active_since']),
-		zbx_date2str(_('d M Y H:i'), $maintenance['active_till']),
+		zbx_date2str(DATE_TIME_FORMAT, $maintenance['active_since']),
+		zbx_date2str(DATE_TIME_FORMAT, $maintenance['active_till']),
 		$maintenanceStatus,
 		$maintenance['description']
 	));
 }
 
 // create go button
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('maintenance.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected maintenance periods?'));
 $goComboBox->addItem($goOption);
+
 $goButton = new CSubmit('goButton', _('Go').' (0)');
 $goButton->setAttribute('id', 'goButton');
 zbx_add_post_js('chkbxRange.pageGoName = "maintenanceids";');
diff --git a/frontends/php/include/views/configuration.screen.constructor.edit.php b/frontends/php/include/views/configuration.screen.constructor.edit.php
index 8e0c6306be0..f18ca55c827 100644
--- a/frontends/php/include/views/configuration.screen.constructor.edit.php
+++ b/frontends/php/include/views/configuration.screen.constructor.edit.php
@@ -19,9 +19,9 @@
 **/
 
 
-$action = 'screenedit.php?form=update&screenid='.get_request('screenid');
+$action = 'screenedit.php?form=update&screenid='.getRequest('screenid');
 if (isset($_REQUEST['screenitemid'])) {
-	$action .= '&screenitemid='.get_request('screenitemid');
+	$action .= '&screenitemid='.getRequest('screenitemid');
 }
 
 // create screen form
@@ -57,22 +57,24 @@ if (isset($_REQUEST['screenitemid']) && !isset($_REQUEST['form_refresh'])) {
 	$dynamic		= $screenItem['dynamic'];
 	$sortTriggers	= $screenItem['sort_triggers'];
 	$application	= $screenItem['application'];
+	$maxColumns		= $screenItem['max_columns'];
 }
 else {
-	$resourceType	= get_request('resourcetype', 0);
-	$resourceId		= get_request('resourceid', 0);
-	$width			= get_request('width', 500);
-	$height			= get_request('height', 100);
-	$colspan		= get_request('colspan', 1);
-	$rowspan		= get_request('rowspan', 1);
-	$elements		= get_request('elements', 25);
-	$valign			= get_request('valign', VALIGN_DEFAULT);
-	$halign			= get_request('halign', HALIGN_DEFAULT);
-	$style			= get_request('style', 0);
-	$url			= get_request('url', '');
-	$dynamic		= get_request('dynamic', SCREEN_SIMPLE_ITEM);
-	$sortTriggers	= get_request('sort_triggers', SCREEN_SORT_TRIGGERS_DATE_DESC);
-	$application	= get_request('application', '');
+	$resourceType	= getRequest('resourcetype', 0);
+	$resourceId		= getRequest('resourceid', 0);
+	$width			= getRequest('width', 500);
+	$height			= getRequest('height', 100);
+	$colspan		= getRequest('colspan', 1);
+	$rowspan		= getRequest('rowspan', 1);
+	$elements		= getRequest('elements', 25);
+	$valign			= getRequest('valign', VALIGN_DEFAULT);
+	$halign			= getRequest('halign', HALIGN_DEFAULT);
+	$style			= getRequest('style', 0);
+	$url			= getRequest('url', '');
+	$dynamic		= getRequest('dynamic', SCREEN_SIMPLE_ITEM);
+	$sortTriggers	= getRequest('sort_triggers', SCREEN_SORT_TRIGGERS_DATE_DESC);
+	$application	= getRequest('application', '');
+	$maxColumns		= getRequest('max_columns', 3);
 }
 
 // append resource types to form list
@@ -133,12 +135,62 @@ if ($resourceType == SCREEN_RESOURCE_GRAPH) {
 
 	$screenFormList->addVar('resourceid', $id);
 	$screenFormList->addRow(_('Graph name'), array(
-		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, true),
 		$selectButton
 	));
 }
 
 /*
+ * Screen item: Graph prototype
+ */
+elseif ($resourceType == SCREEN_RESOURCE_LLD_GRAPH) {
+	$caption = '';
+	$id = 0;
+
+	$graphPrototypes = API::GraphPrototype()->get(array(
+		'output' => array('name'),
+		'graphids' => $resourceId,
+		'selectHosts' => array('name')
+	));
+
+	if ($graphPrototypes) {
+		$id = $resourceId;
+		$graphPrototype = reset($graphPrototypes);
+
+		order_result($graphPrototype['hosts'], 'name');
+		$graphPrototype['host'] = reset($graphPrototype['hosts']);
+
+		$caption = $graphPrototype['host']['name'].NAME_DELIMITER.$graphPrototype['name'];
+	}
+
+	if ($this->data['screen']['templateid']) {
+		$selectButton = new CButton('select', _('Select'),
+			'javascript: return PopUp("popup.php?srctbl=graph_prototypes&srcfld1=graphid&srcfld2=name'.
+			'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
+			'&only_hostid='.$this->data['screen']['templateid'].
+			'&templated_hosts=1&writeonly=1", 800, 450);',
+			'formlist'
+		);
+	}
+	else {
+		$selectButton = new CButton('select', _('Select'),
+			'javascript: return PopUp("popup.php?srctbl=graph_prototypes&srcfld1=graphid&srcfld2=name'.
+			'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
+			'&real_hosts=1&writeonly=1", 800, 450);',
+			'formlist'
+		);
+	}
+
+	$screenFormList->addVar('resourceid', $id);
+	$screenFormList->addRow(_('Graph name'), array(
+		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, true),
+		$selectButton
+	));
+
+	$screenFormList->addRow(_('Max columns'), new CNumericBox('max_columns', $maxColumns, 3, false, false, false));
+}
+
+/*
  * Screen item: Simple graph
  */
 elseif ($resourceType == SCREEN_RESOURCE_SIMPLE_GRAPH) {
@@ -166,26 +218,76 @@ elseif ($resourceType == SCREEN_RESOURCE_SIMPLE_GRAPH) {
 			'javascript: return PopUp("popup.php?srctbl=items&srcfld1=itemid&srcfld2=name'.
 				'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
 				'&templated_hosts=1&only_hostid='.$this->data['screen']['templateid'].
-				'&templated=1&writeonly=1&numeric=1", 800, 450);', 'formlist'
+				'&writeonly=1&numeric=1", 800, 450);', 'formlist'
 		);
 	}
 	else {
 		$selectButton = new CButton('select', _('Select'),
 			'javascript: return PopUp("popup.php?srctbl=items&srcfld1=itemid&srcfld2=name'.
 				'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
-				'&real_hosts=1&with_simple_graph_items=1&writeonly=1&templated=0&numeric=1", 800, 450);',
+				'&real_hosts=1&with_simple_graph_items=1&writeonly=1&numeric=1", 800, 450);',
 			'formlist'
 		);
 	}
 
 	$screenFormList->addVar('resourceid', $id);
 	$screenFormList->addRow(_('Parameter'), array(
-		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, true),
 		$selectButton
 	));
 }
 
 /*
+ * Screen item: Simple graph prototype
+ */
+elseif ($resourceType == SCREEN_RESOURCE_LLD_SIMPLE_GRAPH) {
+	$caption = '';
+	$id = 0;
+
+	$items = API::ItemPrototype()->get(array(
+		'output' => array('hostid', 'key_', 'name'),
+		'itemids' => $resourceId,
+		'selectHosts' => array('name')
+	));
+
+	if ($items) {
+		$items = CMacrosResolverHelper::resolveItemNames($items);
+
+		$id = $resourceId;
+		$item = reset($items);
+		$item['host'] = reset($item['hosts']);
+
+		$caption = $item['host']['name'].NAME_DELIMITER.$item['name_expanded'];
+	}
+
+	if ($this->data['screen']['templateid']) {
+		$selectButton = new CButton('select', _('Select'),
+			'javascript: return PopUp("popup.php?srctbl=item_prototypes&srcfld1=itemid&srcfld2=name'.
+				'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
+				'&templated_hosts=1&only_hostid='.$this->data['screen']['templateid'].
+				'&writeonly=1&numeric=1", 800, 450);',
+			'formlist'
+		);
+	}
+	else {
+		$selectButton = new CButton('select', _('Select'),
+			'javascript: return PopUp("popup.php?srctbl=item_prototypes&srcfld1=itemid&srcfld2=name'.
+				'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
+				'&real_hosts=1&with_discovery_rule=1&items=1&writeonly=1&numeric=1", 800, 450);',
+			'formlist'
+		);
+	}
+
+	$screenFormList->addVar('resourceid', $id);
+	$screenFormList->addRow(_('Parameter'), array(
+		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, true),
+		$selectButton
+	));
+
+	$screenFormList->addRow(_('Max columns'), new CNumericBox('max_columns', $maxColumns, 3, false, false, false));
+}
+
+/*
  * Screen item: Map
  */
 elseif ($resourceType == SCREEN_RESOURCE_MAP) {
@@ -204,7 +306,7 @@ elseif ($resourceType == SCREEN_RESOURCE_MAP) {
 
 	$screenFormList->addVar('resourceid', $id);
 	$screenFormList->addRow(_('Parameter'), array(
-		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, true),
 		new CButton('select', _('Select'),
 			'javascript: return PopUp("popup.php?srctbl=sysmaps&srcfld1=sysmapid&srcfld2=name'.
 				'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
@@ -248,15 +350,15 @@ elseif ($resourceType == SCREEN_RESOURCE_PLAIN_TEXT) {
 	else {
 		$selectButton = new CButton('select', _('Select'),
 			'javascript: return PopUp("popup.php?srctbl=items&srcfld1=itemid&srcfld2=name'.
-				'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
-				'&real_hosts=1&writeonly=1&templated=0", 800, 450);',
+				'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption&real_hosts=1'.
+				'&writeonly=1", 800, 450);',
 			'formlist'
 		);
 	}
 
 	$screenFormList->addVar('resourceid', $id);
 	$screenFormList->addRow(_('Parameter'), array(
-		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, true),
 		$selectButton
 	));
 	$screenFormList->addRow(_('Show lines'), new CNumericBox('elements', $elements, 3));
@@ -288,7 +390,13 @@ elseif (in_array($resourceType, array(SCREEN_RESOURCE_HOSTGROUP_TRIGGERS, SCREEN
 			'objectOptions' => array('editable' => true),
 			'data' => $data ? array(array('id' => $data['groupid'], 'name' => $data['name'])) : null,
 			'defaultValue' => 0,
-			'selectedLimit' => 1
+			'selectedLimit' => 1,
+			'popup' => array(
+				'parameters' => 'srctbl=host_groups&dstfrm='.$screenForm->getName().'&dstfld1=resourceid'.
+					'&srcfld1=groupid&writeonly=1',
+				'width' => 450,
+				'height' => 450
+			)
 		)));
 	}
 	else {
@@ -310,7 +418,13 @@ elseif (in_array($resourceType, array(SCREEN_RESOURCE_HOSTGROUP_TRIGGERS, SCREEN
 			'objectOptions' => array('editable' => true),
 			'data' => $data ? array(array('id' => $data['hostid'], 'name' => $data['name'])) : null,
 			'defaultValue' => 0,
-			'selectedLimit' => 1
+			'selectedLimit' => 1,
+			'popup' => array(
+				'parameters' => 'srctbl=hosts&dstfrm='.$screenForm->getName().'&dstfld1=resourceid'.
+					'&srcfld1=hostid&writeonly=1',
+				'width' => 450,
+				'height' => 450
+			)
 		)));
 	}
 
@@ -377,7 +491,13 @@ elseif (in_array($resourceType, array(SCREEN_RESOURCE_TRIGGERS_OVERVIEW, SCREEN_
 		'objectName' => 'hostGroup',
 		'objectOptions' => array('editable' => true),
 		'data' => $data ? array(array('id' => $data['groupid'], 'name' => $data['name'])) : null,
-		'selectedLimit' => 1
+		'selectedLimit' => 1,
+		'popup' => array(
+			'parameters' => 'srctbl=host_groups&dstfrm='.$screenForm->getName().'&dstfld1=resourceid'.
+				'&srcfld1=groupid&writeonly=1',
+			'width' => 450,
+			'height' => 450
+		)
 	)));
 	$screenFormList->addRow(_('Application'), new CTextBox('application', $application, ZBX_TEXTBOX_STANDARD_SIZE, false, 255));
 }
@@ -411,7 +531,7 @@ elseif ($resourceType == SCREEN_RESOURCE_SCREEN) {
 
 	$screenFormList->addVar('resourceid', $id);
 	$screenFormList->addRow(_('Parameter'), array(
-		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+		new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, true),
 		new CButton('select', _('Select'),
 			'javascript: return PopUp("popup.php?srctbl=screens2&srcfld1=screenid&srcfld2=name'.
 				'&dstfrm='.$screenForm->getName().'&dstfld1=resourceid&dstfld2=caption'.
@@ -445,7 +565,13 @@ elseif ($resourceType == SCREEN_RESOURCE_HOSTS_INFO || $resourceType == SCREEN_R
 		'objectOptions' => array('editable' => true),
 		'data' => $data ? array(array('id' => $data['groupid'], 'name' => $data['name'])) : null,
 		'defaultValue' => 0,
-		'selectedLimit' => 1
+		'selectedLimit' => 1,
+		'popup' => array(
+			'parameters' => 'srctbl=host_groups&dstfrm='.$screenForm->getName().'&dstfld1=resourceid'.
+				'&srcfld1=groupid&writeonly=1',
+			'width' => 450,
+			'height' => 450
+		)
 	)));
 }
 
@@ -453,7 +579,7 @@ elseif ($resourceType == SCREEN_RESOURCE_HOSTS_INFO || $resourceType == SCREEN_R
  * Screen item: Clock
  */
 elseif ($resourceType == SCREEN_RESOURCE_CLOCK) {
-	$caption = get_request('caption', '');
+	$caption = getRequest('caption', '');
 
 	if (zbx_empty($caption) && TIME_TYPE_HOST == $style && $resourceId > 0) {
 		$items = API::Item()->get(array(
@@ -494,7 +620,7 @@ elseif ($resourceType == SCREEN_RESOURCE_CLOCK) {
 			);
 		}
 		$screenFormList->addRow(_('Parameter'), array(
-			new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+			new CTextBox('caption', $caption, ZBX_TEXTBOX_STANDARD_SIZE, true),
 			$selectButton
 		));
 	}
@@ -511,8 +637,8 @@ else {
  */
 if (in_array($resourceType, array(SCREEN_RESOURCE_HOSTS_INFO, SCREEN_RESOURCE_TRIGGERS_INFO))) {
 	$styleRadioButton = array(
-		new CRadioButton('style', STYLE_HORISONTAL, null, 'style_'.STYLE_HORISONTAL, $style == STYLE_HORISONTAL),
-		new CLabel(_('Horizontal'), 'style_'.STYLE_HORISONTAL),
+		new CRadioButton('style', STYLE_HORIZONTAL, null, 'style_'.STYLE_HORIZONTAL, $style == STYLE_HORIZONTAL),
+		new CLabel(_('Horizontal'), 'style_'.STYLE_HORIZONTAL),
 		new CRadioButton('style', STYLE_VERTICAL, null, 'style_'.STYLE_VERTICAL, $style == STYLE_VERTICAL),
 		new CLabel(_('Vertical'), 'style_'.STYLE_VERTICAL)
 	);
@@ -532,13 +658,21 @@ else {
 }
 
 if (in_array($resourceType, array(SCREEN_RESOURCE_URL))) {
-	$screenFormList->addRow(_('Url'), new CTextBox('url', $url, ZBX_TEXTBOX_STANDARD_SIZE));
+	$screenFormList->addRow(_('URL'), new CTextBox('url', $url, ZBX_TEXTBOX_STANDARD_SIZE));
 }
 else {
 	$screenFormList->addVar('url', '');
 }
 
-if (in_array($resourceType, array(SCREEN_RESOURCE_GRAPH, SCREEN_RESOURCE_SIMPLE_GRAPH, SCREEN_RESOURCE_CLOCK, SCREEN_RESOURCE_URL))) {
+$resourcesWithWidthAndHeight = array(
+	SCREEN_RESOURCE_GRAPH,
+	SCREEN_RESOURCE_SIMPLE_GRAPH,
+	SCREEN_RESOURCE_CLOCK,
+	SCREEN_RESOURCE_URL,
+	SCREEN_RESOURCE_LLD_GRAPH,
+	SCREEN_RESOURCE_LLD_SIMPLE_GRAPH
+);
+if (in_array($resourceType, $resourcesWithWidthAndHeight)) {
 	$screenFormList->addRow(_('Width'), new CNumericBox('width', $width, 5));
 	$screenFormList->addRow(_('Height'), new CNumericBox('height', $height, 5));
 }
@@ -547,8 +681,17 @@ else {
 	$screenFormList->addVar('height', 100);
 }
 
-if (in_array($resourceType, array(SCREEN_RESOURCE_GRAPH, SCREEN_RESOURCE_SIMPLE_GRAPH, SCREEN_RESOURCE_MAP, SCREEN_RESOURCE_CLOCK, SCREEN_RESOURCE_URL))) {
-	$hightAlignRadioButton = array(
+$resourcesWithHAlign = array(
+	SCREEN_RESOURCE_GRAPH,
+	SCREEN_RESOURCE_SIMPLE_GRAPH,
+	SCREEN_RESOURCE_MAP,
+	SCREEN_RESOURCE_CLOCK,
+	SCREEN_RESOURCE_URL,
+	SCREEN_RESOURCE_LLD_GRAPH,
+	SCREEN_RESOURCE_LLD_SIMPLE_GRAPH
+);
+if (in_array($resourceType, $resourcesWithHAlign)) {
+	$hAlignRadioButton = array(
 		new CRadioButton('halign', HALIGN_LEFT, null, 'halign_'.HALIGN_LEFT, $halign == HALIGN_LEFT),
 		new CLabel(_('Left'), 'halign_'.HALIGN_LEFT),
 		new CRadioButton('halign', HALIGN_CENTER, null, 'halign_'.HALIGN_CENTER, $halign == HALIGN_CENTER),
@@ -556,13 +699,13 @@ if (in_array($resourceType, array(SCREEN_RESOURCE_GRAPH, SCREEN_RESOURCE_SIMPLE_
 		new CRadioButton('halign', HALIGN_RIGHT, null, 'halign_'.HALIGN_RIGHT, $halign == HALIGN_RIGHT),
 		new CLabel(_('Right'), 'halign_'.HALIGN_RIGHT)
 	);
-	$screenFormList->addRow(_('Horizontal align'), new CDiv($hightAlignRadioButton, 'jqueryinputset'));
+	$screenFormList->addRow(_('Horizontal align'), new CDiv($hAlignRadioButton, 'jqueryinputset'));
 }
 else {
 	$screenFormList->addVar('halign', 0);
 }
 
-$verticalAlignRadioButton = array(
+$vAlignRadioButton = array(
 	new CRadioButton('valign', VALIGN_TOP, null, 'valign_'.VALIGN_TOP, $valign == VALIGN_TOP),
 	new CLabel(_('Top'), 'valign_'.VALIGN_TOP),
 	new CRadioButton('valign', VALIGN_MIDDLE, null, 'valign_'.VALIGN_MIDDLE, $valign == VALIGN_MIDDLE),
@@ -570,12 +713,20 @@ $verticalAlignRadioButton = array(
 	new CRadioButton('valign', VALIGN_BOTTOM, null, 'valign_'.VALIGN_BOTTOM, $valign == VALIGN_BOTTOM),
 	new CLabel(_('Bottom'), 'valign_'.VALIGN_BOTTOM)
 );
-$screenFormList->addRow(_('Vertical align'), new CDiv($verticalAlignRadioButton, 'jqueryinputset'));
+$screenFormList->addRow(_('Vertical align'), new CDiv($vAlignRadioButton, 'jqueryinputset'));
 $screenFormList->addRow(_('Column span'), new CNumericBox('colspan', $colspan, 3));
 $screenFormList->addRow(_('Row span'), new CNumericBox('rowspan', $rowspan, 3));
 
 // dynamic addon
-if ($this->data['screen']['templateid'] == 0 && in_array($resourceType, array(SCREEN_RESOURCE_GRAPH, SCREEN_RESOURCE_SIMPLE_GRAPH, SCREEN_RESOURCE_PLAIN_TEXT))) {
+$resourcesWithDynamic = array(
+	SCREEN_RESOURCE_GRAPH,
+	SCREEN_RESOURCE_SIMPLE_GRAPH,
+	SCREEN_RESOURCE_PLAIN_TEXT,
+	SCREEN_RESOURCE_URL,
+	SCREEN_RESOURCE_LLD_GRAPH,
+	SCREEN_RESOURCE_LLD_SIMPLE_GRAPH
+);
+if ($this->data['screen']['templateid'] == 0 && in_array($resourceType, $resourcesWithDynamic)) {
 	$screenFormList->addRow(_('Dynamic item'), new CCheckBox('dynamic', $dynamic, null, 1));
 }
 
diff --git a/frontends/php/include/views/configuration.screen.list.php b/frontends/php/include/views/configuration.screen.list.php
index 649952acd1a..eab38d1bd1e 100644
--- a/frontends/php/include/views/configuration.screen.list.php
+++ b/frontends/php/include/views/configuration.screen.list.php
@@ -48,7 +48,7 @@ $screenForm->addVar('templateid', $this->data['templateid']);
 $screenTable = new CTableInfo(_('No screens found.'));
 $screenTable->setHeader(array(
 	new CCheckBox('all_screens', null, "checkAll('".$screenForm->getName()."', 'all_screens', 'screens');"),
-	make_sorting_header(_('Name'), 'name'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Dimension (cols x rows)'),
 	_('Screen')
 ));
@@ -63,11 +63,11 @@ foreach ($this->data['screens'] as $screen) {
 }
 
 // create go button
-$goComboBox = new CComboBox('go');
+$goComboBox = new CComboBox('action');
 if (empty($this->data['templateid'])) {
-	$goComboBox->addItem('export', _('Export selected'));
+	$goComboBox->addItem('screen.export', _('Export selected'));
 }
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem('screen.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected screens?'));
 $goComboBox->addItem($goOption);
 
diff --git a/frontends/php/include/views/configuration.services.edit.php b/frontends/php/include/views/configuration.services.edit.php
index fb76a2af118..e87d8173403 100644
--- a/frontends/php/include/views/configuration.services.edit.php
+++ b/frontends/php/include/views/configuration.services.edit.php
@@ -42,13 +42,13 @@ if (isset($this->data['service'])) {
 
 // create form list
 $servicesFormList = new CFormList('servicesFormList');
-$nameTextBox = new CTextBox('name', $this->data['name'], ZBX_TEXTBOX_STANDARD_SIZE, 'no', 128);
+$nameTextBox = new CTextBox('name', $this->data['name'], ZBX_TEXTBOX_STANDARD_SIZE, false, 128);
 $nameTextBox->attr('autofocus', 'autofocus');
 $servicesFormList->addRow(_('Name'), $nameTextBox);
 
 // append parent link to form list
 $servicesFormList->addRow(_('Parent service'), array(
-	new CTextBox('parent_name', $this->data['parentname'], ZBX_TEXTBOX_STANDARD_SIZE, 'yes', 128),
+	new CTextBox('parent_name', $this->data['parentname'], ZBX_TEXTBOX_STANDARD_SIZE, true, 128),
 	new CButton('select_parent', _('Change'), "javascript: openWinCentered('services.php?pservices=1".url_param('serviceid')."', 'ZBX_Services_List', 740, 420, 'scrollbars=1, toolbar=0, menubar=0, resizable=1, dialog=0');", 'formlist')
 ));
 
@@ -59,7 +59,7 @@ $servicesFormList->addRow(_('Status calculation algorithm'), $algorithmComboBox)
 
 // append SLA to form list
 $showslaCheckbox = new CCheckBox('showsla', ($this->data['showsla'] == 0) ? 'no' : 'yes', null, 1);
-$goodslaTextBox = new CTextBox('goodsla', $this->data['goodsla'], 6, 'no', 8);
+$goodslaTextBox = new CTextBox('goodsla', $this->data['goodsla'], 6, false, 8);
 if (!$this->data['showsla']) {
 	$goodslaTextBox->setAttribute('disabled', 'disabled');
 }
@@ -67,7 +67,7 @@ $servicesFormList->addRow(_('Calculate SLA, acceptable SLA (in %)'), array($show
 
 // append trigger to form list
 $servicesFormList->addRow(_('Trigger'), array(
-	new CTextBox('trigger', $this->data['trigger'], ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+	new CTextBox('trigger', $this->data['trigger'], ZBX_TEXTBOX_STANDARD_SIZE, true),
 	new CButton('btn1', _('Select'),
 		'return PopUp("popup.php?'.
 			'dstfrm='.$servicesForm->getName().
@@ -77,12 +77,11 @@ $servicesFormList->addRow(_('Trigger'), array(
 			'&srcfld1=triggerid'.
 			'&srcfld2=description'.
 			'&real_hosts=1'.
-			'&monitored_hosts=1'.
 			'&with_triggers=1");',
 		'formlist'
 	)
 ));
-$servicesFormList->addRow(_('Sort order (0->999)'), new CTextBox('sortorder', $this->data['sortorder'], 3, 'no', 3));
+$servicesFormList->addRow(_('Sort order (0->999)'), new CTextBox('sortorder', $this->data['sortorder'], 3, false, 3));
 
 /*
  * Dependencies tab
@@ -146,8 +145,8 @@ foreach ($this->data['times'] as $serviceTime) {
 			break;
 		case SERVICE_TIME_TYPE_ONETIME_DOWNTIME:
 			$type = new CSpan(_('One-time downtime'), 'disabled');
-			$from = zbx_date2str(_('d M Y H:i'), $serviceTime['ts_from']);
-			$to = zbx_date2str(_('d M Y H:i'), $serviceTime['ts_to']);
+			$from = zbx_date2str(DATE_TIME_FORMAT, $serviceTime['ts_from']);
+			$to = zbx_date2str(DATE_TIME_FORMAT, $serviceTime['ts_to']);
 			break;
 	}
 	$row = new CRow(array(
@@ -176,11 +175,11 @@ $serviceTimeTable = new CTable(null, 'formElementTable');
 if ($this->data['new_service_time']['type'] == SERVICE_TIME_TYPE_ONETIME_DOWNTIME) {
 	// downtime since
 	if (isset($_REQUEST['new_service_time']['from'])) {
-		$fromYear = get_request('new_service_time_from_year');
-		$fromMonth = get_request('new_service_time_from_month');
-		$fromDay = get_request('new_service_time_from_day');
-		$fromHours = get_request('new_service_time_from_hour');
-		$fromMinutes = get_request('new_service_time_from_minute');
+		$fromYear = getRequest('new_service_time_from_year');
+		$fromMonth = getRequest('new_service_time_from_month');
+		$fromDay = getRequest('new_service_time_from_day');
+		$fromHours = getRequest('new_service_time_from_hour');
+		$fromMinutes = getRequest('new_service_time_from_minute');
 		$fromDate = array(
 			'y' => $fromYear,
 			'm' => $fromMonth,
@@ -199,11 +198,11 @@ if ($this->data['new_service_time']['type'] == SERVICE_TIME_TYPE_ONETIME_DOWNTIM
 
 	// downtime till
 	if (isset($_REQUEST['new_service_time']['to'])) {
-		$toYear = get_request('new_service_time_to_year');
-		$toMonth = get_request('new_service_time_to_month');
-		$toDay = get_request('new_service_time_to_day');
-		$toHours = get_request('new_service_time_to_hour');
-		$toMinutes = get_request('new_service_time_to_minute');
+		$toYear = getRequest('new_service_time_to_year');
+		$toMonth = getRequest('new_service_time_to_month');
+		$toDay = getRequest('new_service_time_to_day');
+		$toHours = getRequest('new_service_time_to_hour');
+		$toMinutes = getRequest('new_service_time_to_minute');
 		$toDate = array(
 			'y' => $toYear,
 			'm' => $toMonth,
@@ -240,16 +239,16 @@ else {
 		$weekToComboBox->addItem($dow, getDayOfWeekCaption($dow));
 	}
 	$timeFromHourTextBox = new CTextBox('new_service_time[from_hour]', isset($_REQUEST['new_service_time']['from_hour'])
-			? $_REQUEST['new_service_time']['from_hour'] : '', 2, 'no', 2);
+			? $_REQUEST['new_service_time']['from_hour'] : '', 2, false, 2);
 	$timeFromHourTextBox->setAttribute('placeholder', _('hh'));
 	$timeFromMinuteTextBox = new CTextBox('new_service_time[from_minute]', isset($_REQUEST['new_service_time']['from_minute'])
-			? $_REQUEST['new_service_time']['from_minute'] : '', 2, 'no', 2);
+			? $_REQUEST['new_service_time']['from_minute'] : '', 2, false, 2);
 	$timeFromMinuteTextBox->setAttribute('placeholder', _('mm'));
 	$timeToHourTextBox = new CTextBox('new_service_time[to_hour]', isset($_REQUEST['new_service_time']['to_hour'])
-			? $_REQUEST['new_service_time']['to_hour'] : '', 2, 'no', 2);
+			? $_REQUEST['new_service_time']['to_hour'] : '', 2, false, 2);
 	$timeToHourTextBox->setAttribute('placeholder', _('hh'));
 	$timeToMinuteTextBox = new CTextBox('new_service_time[to_minute]', isset($_REQUEST['new_service_time']['to_minute'])
-			? $_REQUEST['new_service_time']['to_minute'] : '', 2, 'no', 2);
+			? $_REQUEST['new_service_time']['to_minute'] : '', 2, false, 2);
 	$timeToMinuteTextBox->setAttribute('placeholder', _('mm'));
 
 	$serviceTimeTable->addRow(array(_('From'), $weekFromComboBox, new CCol(array(_('Time'), SPACE, $timeFromHourTextBox, ' : ', $timeFromMinuteTextBox))));
diff --git a/frontends/php/include/views/configuration.slideconf.edit.php b/frontends/php/include/views/configuration.slideconf.edit.php
index c97521b3c7d..dca07675e8c 100644
--- a/frontends/php/include/views/configuration.slideconf.edit.php
+++ b/frontends/php/include/views/configuration.slideconf.edit.php
@@ -38,7 +38,7 @@ $slideFormList = new CFormList('slideFormList');
 $nameTextBox = new CTextBox('name', $this->data['name'], ZBX_TEXTBOX_STANDARD_SIZE);
 $nameTextBox->attr('autofocus', 'autofocus');
 $slideFormList->addRow(_('Name'), $nameTextBox);
-$slideFormList->addRow(_('Default delay (in seconds)'), new CNumericBox('delay', $this->data['delay'], 5, 'no', false, false));
+$slideFormList->addRow(_('Default delay (in seconds)'), new CNumericBox('delay', $this->data['delay'], 5, false, false, false));
 
 // append slide table
 $slideTable = new CTableInfo(null, 'formElementTable');
@@ -53,7 +53,7 @@ $slideTable->setHeader(array(
 ));
 
 $i = 1;
-foreach ($this->data['slides'] as $step => $slides) {
+foreach ($this->data['slides'] as $key => $slides) {
 	$name = '';
 	if (!empty($slides['screenid'])) {
 		$screen = get_screen_by_screenid($slides['screenid']);
@@ -62,22 +62,22 @@ foreach ($this->data['slides'] as $step => $slides) {
 		}
 	}
 
-	$delay = new CNumericBox('slides['.$step.'][delay]', !empty($slides['delay']) ? $slides['delay'] : '', 5, 'no', true, false);
+	$delay = new CNumericBox('slides['.$key.'][delay]', !empty($slides['delay']) ? $slides['delay'] : '', 5, false, true, false);
 	$delay->setAttribute('placeholder', _('default'));
 
-	$removeButton = new CButton('remove_'.$step, _('Remove'), 'javascript: removeSlide(this);', 'link_menu');
-	$removeButton->setAttribute('remove_slide', $step);
+	$removeButton = new CButton('remove_'.$key, _('Remove'), 'javascript: removeSlide(this);', 'link_menu');
+	$removeButton->setAttribute('remove_slide', $key);
 
 	$row = new CRow(
 		array(
 			new CSpan(null, 'ui-icon ui-icon-arrowthick-2-n-s move'),
-			new CSpan($i++.':', 'rowNum', 'current_slide_'.$step),
+			new CSpan($i++.':', 'rowNum', 'current_slide_'.$key),
 			$name,
 			$delay,
 			$removeButton
 		),
 		'sortable',
-		'slides_'.$step
+		'slides_'.$key
 	);
 	$slideTable->addRow($row);
 }
diff --git a/frontends/php/include/views/configuration.slideconf.list.php b/frontends/php/include/views/configuration.slideconf.list.php
index 6cb7211c171..b568805a240 100644
--- a/frontends/php/include/views/configuration.slideconf.list.php
+++ b/frontends/php/include/views/configuration.slideconf.list.php
@@ -37,9 +37,9 @@ $slideForm->setName('slideForm');
 $slidesTable = new CTableInfo(_('No slide shows found.'));
 $slidesTable->setHeader(array(
 	new CCheckBox('all_shows', null, "checkAll('".$slideForm->getName()."', 'all_shows', 'shows');"),
-	make_sorting_header(_('Name'), 'name'),
-	make_sorting_header(_('Delay'), 'delay'),
-	make_sorting_header(_('Count of slides'), 'cnt')
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Delay'), 'delay', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Count of slides'), 'cnt', $this->data['sort'], $this->data['sortorder'])
 ));
 
 foreach ($this->data['slides'] as $slide) {
@@ -52,10 +52,12 @@ foreach ($this->data['slides'] as $slide) {
 }
 
 // create go button
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem('slideshow.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected slide shows?'));
 $goComboBox->addItem($goOption);
+
 $goButton = new CSubmit('goButton', _('Go').' (0)');
 $goButton->setAttribute('id', 'goButton');
 zbx_add_post_js('chkbxRange.pageGoName = "shows";');
diff --git a/frontends/php/include/views/configuration.sysmap.edit.php b/frontends/php/include/views/configuration.sysmap.edit.php
index 6bbcf646fc6..5f2bc024e9f 100644
--- a/frontends/php/include/views/configuration.sysmap.edit.php
+++ b/frontends/php/include/views/configuration.sysmap.edit.php
@@ -27,8 +27,8 @@ $sysmapWidget->addPageHeader(_('CONFIGURATION OF NETWORK MAPS'));
 // create sysmap form
 $sysmapForm = new CForm();
 $sysmapForm->setName('map.edit.php');
-$sysmapForm->addVar('form', get_request('form', 1));
-$sysmapForm->addVar('form_refresh', get_request('form_refresh', 0) + 1);
+$sysmapForm->addVar('form', getRequest('form', 1));
+
 if (isset($this->data['sysmap']['sysmapid'])) {
 	$sysmapForm->addVar('sysmapid', $this->data['sysmap']['sysmapid']);
 }
@@ -60,7 +60,7 @@ $iconMappingsLink = new CLink(_('show icon mappings'), 'adm.iconmapping.php');
 $iconMappingsLink->setAttribute('target', '_blank');
 $sysmapList->addRow(_('Automatic icon mapping'), array($iconMappingComboBox, SPACE, $iconMappingsLink));
 
-// append multiple checkboxs to form list
+// append multiple checkboxes to form list
 $sysmapList->addRow(_('Icon highlight'), new CCheckBox('highlight', $this->data['sysmap']['highlight'], null, 1));
 $sysmapList->addRow(_('Mark elements on trigger status change'), new CCheckBox('markelements', $this->data['sysmap']['markelements'], null, 1));
 $sysmapList->addRow(_('Expand single problem'), new CCheckBox('expandproblem', $this->data['sysmap']['expandproblem'], null, 1));
@@ -142,7 +142,7 @@ $i = 0;
 foreach ($this->data['sysmap']['urls'] as $url) {
 	$urlLabel = new CTextBox('urls['.$i.'][name]', $url['name'], 32);
 	$urlLink = new CTextBox('urls['.$i.'][url]', $url['url'], 32);
-	$urlEtype = new CCombobox('urls['.$i.'][elementtype]', $url['elementtype']);
+	$urlEtype = new CComboBox('urls['.$i.'][elementtype]', $url['elementtype']);
 	$urlEtype->addItems(sysmap_element_types());
 	$removeButton = new CSpan(_('Remove'), 'link_menu');
 	$removeButton->addAction('onclick', '$("urlEntry_'.$i.'").remove();');
@@ -159,7 +159,7 @@ $templateUrlLabel = new CTextBox('urls[#{id}][name]', '', 32);
 $templateUrlLabel->setAttribute('disabled', 'disabled');
 $templateUrlLink = new CTextBox('urls[#{id}][url]', '', 32);
 $templateUrlLink->setAttribute('disabled', 'disabled');
-$templateUrlEtype = new CCombobox('urls[#{id}][elementtype]');
+$templateUrlEtype = new CComboBox('urls[#{id}][elementtype]');
 $templateUrlEtype->setAttribute('disabled', 'disabled');
 $templateUrlEtype->addItems(sysmap_element_types());
 $templateRemoveButton = new CSpan(_('Remove'), 'link_menu');
diff --git a/frontends/php/include/views/configuration.sysmap.list.php b/frontends/php/include/views/configuration.sysmap.list.php
index c4234e4db51..431bd697a15 100644
--- a/frontends/php/include/views/configuration.sysmap.list.php
+++ b/frontends/php/include/views/configuration.sysmap.list.php
@@ -40,9 +40,9 @@ $sysmapWidget->addHeaderRowNumber();
 $sysmapTable = new CTableInfo(_('No maps found.'));
 $sysmapTable->setHeader(array(
 	new CCheckBox('all_maps', null, "checkAll('".$sysmapForm->getName()."', 'all_maps', 'maps');"),
-	make_sorting_header(_('Name'), 'name'),
-	make_sorting_header(_('Width'), 'width'),
-	make_sorting_header(_('Height'), 'height'),
+	make_sorting_header(_('Name'), 'name', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Width'), 'width', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Height'), 'height', $this->data['sort'], $this->data['sortorder']),
 	_('Edit')
 ));
 
@@ -57,11 +57,14 @@ foreach ($this->data['maps'] as $map) {
 }
 
 // create go button
-$goComboBox = new CComboBox('go');
-$goComboBox->addItem('export', _('Export selected'));
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goComboBox = new CComboBox('action');
+
+$goComboBox->addItem('map.export', _('Export selected'));
+
+$goOption = new CComboItem('map.massdelete', _('Delete selected'));
 $goOption->setAttribute('confirm', _('Delete selected maps?'));
 $goComboBox->addItem($goOption);
+
 $goButton = new CSubmit('goButton', _('Go').' (0)');
 $goButton->setAttribute('id', 'goButton');
 zbx_add_post_js('chkbxRange.pageGoName = "maps";');
diff --git a/frontends/php/include/views/configuration.template.edit.php b/frontends/php/include/views/configuration.template.edit.php
index 520e903697f..9a2779c960e 100644
--- a/frontends/php/include/views/configuration.template.edit.php
+++ b/frontends/php/include/views/configuration.template.edit.php
@@ -24,13 +24,13 @@ if (!isset($_REQUEST['form_refresh'])) {
 	$divTabs->setSelected(0);
 }
 
-$templateid = get_request('templateid', 0);
-$host = get_request('template_name', '');
-$visiblename = get_request('visiblename', '');
-$newgroup = get_request('newgroup', '');
-$templateIds = get_request('templates', array());
-$clear_templates = get_request('clear_templates', array());
-$macros = get_request('macros', array());
+$templateid = getRequest('templateid', 0);
+$host = getRequest('template_name', '');
+$visiblename = getRequest('visiblename', '');
+$newgroup = getRequest('newgroup', '');
+$templateIds = getRequest('templates', array());
+$clear_templates = getRequest('clear_templates', array());
+$macros = getRequest('macros', array());
 
 $frm_title = _('Template');
 
@@ -40,8 +40,7 @@ if ($templateid > 0) {
 $frmHost = new CForm();
 $frmHost->setName('tpl_for');
 
-$frmHost->addVar('form', get_request('form', 1));
-$frmHost->addVar('clear_templates', $clear_templates);
+$frmHost->addVar('form', getRequest('form', 1));
 $frmHost->addVar('groupid', $_REQUEST['groupid']);
 
 if ($templateid) {
@@ -76,11 +75,11 @@ if ($templateid > 0 && !hasRequest('form_refresh')) {
 	$templateIds = $this->data['original_templates'];
 }
 else {
-	$groups = get_request('groups', array());
+	$groups = getRequest('groups', array());
 	if (isset($_REQUEST['groupid']) && ($_REQUEST['groupid'] > 0) && !uint_in_array($_REQUEST['groupid'], $groups)) {
 		array_push($groups, $_REQUEST['groupid']);
 	}
-	$hosts_linked_to = get_request('hosts', array());
+	$hosts_linked_to = getRequest('hosts', array());
 }
 
 $clear_templates = array_intersect($clear_templates, array_keys($this->data['original_templates']));
@@ -92,13 +91,11 @@ $frmHost->addVar('clear_templates', $clear_templates);
 $templateList = new CFormList('hostlist');
 
 // FORM ITEM : Template name text box [  ]
-$template_nameTB = new CTextBox('template_name', $host, 54);
-$template_nameTB->setAttribute('maxlength', 64);
+$template_nameTB = new CTextBox('template_name', $host, 54, false, 128);
 $template_nameTB->attr('autofocus', 'autofocus');
 $templateList->addRow(_('Template name'), $template_nameTB);
 
-$visiblenameTB = new CTextBox('visiblename', $visiblename, 54);
-$visiblenameTB->setAttribute('maxlength', 64);
+$visiblenameTB = new CTextBox('visiblename', $visiblename, 54, false, 128);
 $templateList->addRow(_('Visible name'), $visiblenameTB);
 
 // FORM ITEM : Groups tween box [  ] [  ]
@@ -127,7 +124,7 @@ if (CWebUser::$data['type'] != USER_TYPE_SUPER_ADMIN) {
 $templateList->addRow(SPACE, array($tmp_label, BR(), $newgroupTB), null, null, 'new');
 
 // FORM ITEM : linked Hosts tween box [  ] [  ]
-$twb_groupid = get_request('twb_groupid', 0);
+$twb_groupid = getRequest('twb_groupid', 0);
 if ($twb_groupid == 0) {
 	$gr = reset($all_groups);
 	$twb_groupid = $gr['groupid'];
@@ -374,6 +371,28 @@ if ($_REQUEST['form'] == 'full_clone') {
 
 		$templateList->addRow(_('Screens'), $listBox);
 	}
+
+	// web scenarios
+	$httpTests = API::HttpTest()->get(array(
+		'output' => array('httptestid', 'name'),
+		'hostids' => $templateid,
+		'inherited' => false
+	));
+
+	if ($httpTests) {
+		$httpTestList = array();
+
+		foreach ($httpTests as $httpTest) {
+			$httpTestList[$httpTest['httptestid']] = $httpTest['name'];
+		}
+
+		order_result($httpTestList);
+
+		$listBox = new CListBox('httpTests', null, 8);
+		$listBox->setAttribute('disabled', 'disabled');
+		$listBox->addItems($httpTestList);
+		$templateList->addRow(_('Web scenarios'), $listBox);
+	}
 }
 
 $divTabs->addTab('templateTab', _('Template'), $templateList);
@@ -387,7 +406,6 @@ $tmplList = new CFormList('tmpllist');
 // create linked template table
 $linkedTemplateTable = new CTable(_('No templates linked.'), 'formElementTable');
 $linkedTemplateTable->attr('id', 'linkedTemplateTable');
-$linkedTemplateTable->attr('style', 'min-width: 400px;');
 $linkedTemplateTable->setHeader(array(_('Name'), _('Action')));
 
 $ignoredTemplates = array();
@@ -414,7 +432,7 @@ foreach ($this->data['linkedTemplates'] as $template) {
 	$ignoredTemplates[$template['templateid']] = $template['name'];
 }
 
-$tmplList->addRow(_('Linked templates'), new CDiv($linkedTemplateTable, 'objectgroup inlineblock border_dotted ui-corner-all'));
+$tmplList->addRow(_('Linked templates'), new CDiv($linkedTemplateTable, 'template-link-block objectgroup inlineblock border_dotted ui-corner-all'));
 
 // create new linked template table
 $newTemplateTable = new CTable(null, 'formElementTable');
@@ -424,7 +442,13 @@ $newTemplateTable->attr('style', 'min-width: 400px;');
 $newTemplateTable->addRow(array(new CMultiSelect(array(
 	'name' => 'add_templates[]',
 	'objectName' => 'templates',
-	'ignored' => $ignoredTemplates
+	'ignored' => $ignoredTemplates,
+	'popup' => array(
+		'parameters' => 'srctbl=templates&srcfld1=hostid&srcfld2=host&dstfrm='.$frmHost->getName().
+			'&dstfld1=add_templates_&templated_hosts=1&multiselect=1',
+		'width' => 450,
+		'height' => 450
+	)
 ))));
 
 $newTemplateTable->addRow(
@@ -433,7 +457,7 @@ $newTemplateTable->addRow(
 	)
 );
 
-$tmplList->addRow(_('Link new templates'), new CDiv($newTemplateTable, 'objectgroup inlineblock border_dotted ui-corner-all'));
+$tmplList->addRow(_('Link new templates'), new CDiv($newTemplateTable, 'template-link-block objectgroup inlineblock border_dotted ui-corner-all'));
 
 $divTabs->addTab('tmplTab', _('Linked templates'), $tmplList);
 // } TEMPLATES
diff --git a/frontends/php/include/views/configuration.triggers.edit.php b/frontends/php/include/views/configuration.triggers.edit.php
index 8ce2b872ef3..fd8dd972167 100644
--- a/frontends/php/include/views/configuration.triggers.edit.php
+++ b/frontends/php/include/views/configuration.triggers.edit.php
@@ -72,7 +72,7 @@ $expressionTextBox = new CTextArea(
 		'readonly' => $this->data['expression_field_readonly']
 	)
 );
-if ($this->data['expression_field_readonly'] == 'yes') {
+if ($this->data['expression_field_readonly']) {
 	$triggersForm->addVar('expression', $this->data['expression']);
 }
 
@@ -84,41 +84,47 @@ $addExpressionButton = new CButton(
 		'&srcfld1=expression&expression=" + escape('.$this->data['expression_field_params'].'), 800, 265);',
 	'formlist'
 );
-if ($this->data['limited'] == 'yes') {
+if ($this->data['limited']) {
 	$addExpressionButton->setAttribute('disabled', 'disabled');
 }
 $expressionRow = array($expressionTextBox, $addExpressionButton);
-if (!empty($this->data['expression_macro_button'])) {
-	array_push($expressionRow, $this->data['expression_macro_button']);
-}
+
 if ($this->data['input_method'] == IM_TREE) {
+	// insert macro button
+	$insertMacroButton = new CButton('insert_macro', _('Insert expression'), null, 'formlist');
+	$insertMacroButton->setMenuPopup(CMenuPopupHelper::getTriggerMacro());
+	if ($this->data['limited']) {
+		$insertMacroButton->setAttribute('disabled', 'disabled');
+	}
+	$expressionRow[] = $insertMacroButton;
+
 	array_push($expressionRow, BR());
 	if (empty($this->data['outline'])) {
 		// add button
 		$addExpressionButton = new CSubmit('add_expression', _('Add'), null, 'formlist');
-		if ($this->data['limited'] == 'yes') {
+		if ($this->data['limited']) {
 			$addExpressionButton->setAttribute('disabled', 'disabled');
 		}
 		array_push($expressionRow, $addExpressionButton);
 	}
 	else {
 		// add button
-		$addExpressionButton = new CSubmit('and_expression', _('AND'), null, 'formlist');
-		if ($this->data['limited'] == 'yes') {
+		$addExpressionButton = new CSubmit('and_expression', _('And'), null, 'formlist');
+		if ($this->data['limited']) {
 			$addExpressionButton->setAttribute('disabled', 'disabled');
 		}
 		array_push($expressionRow, $addExpressionButton);
 
 		// or button
-		$orExpressionButton = new CSubmit('or_expression', _('OR'), null, 'formlist');
-		if ($this->data['limited'] == 'yes') {
+		$orExpressionButton = new CSubmit('or_expression', _('Or'), null, 'formlist');
+		if ($this->data['limited']) {
 			$orExpressionButton->setAttribute('disabled', 'disabled');
 		}
 		array_push($expressionRow, $orExpressionButton);
 
 		// replace button
 		$replaceExpressionButton = new CSubmit('replace_expression', _('Replace'), null, 'formlist');
-		if ($this->data['limited'] == 'yes') {
+		if ($this->data['limited']) {
 			$replaceExpressionButton->setAttribute('disabled', 'disabled');
 		}
 		array_push($expressionRow, $replaceExpressionButton);
@@ -143,24 +149,24 @@ if ($this->data['input_method'] == IM_TREE) {
 	$expressionTable->setOddRowClass('even_row');
 	$expressionTable->setEvenRowClass('even_row');
 	$expressionTable->setHeader(array(
-		($this->data['limited'] == 'yes') ? null : _('Target'),
+		$this->data['limited'] ? null : _('Target'),
 		_('Expression'),
 		empty($this->data['parent_discoveryid']) ? _('Error') : null,
-		($this->data['limited'] == 'yes') ? null : _('Action')
+		$this->data['limited'] ? null : _('Action')
 	));
 
 	$allowedTesting = true;
 	if (!empty($this->data['eHTMLTree'])) {
 		foreach ($this->data['eHTMLTree'] as $i => $e) {
-			if ($this->data['limited'] != 'yes') {
+			if (!$this->data['limited']) {
 				$deleteUrl = new CSpan(_('Delete'), 'link');
 				$deleteUrl->setAttribute('onclick', 'javascript:'.
-					' if (Confirm("'._('Delete expression?').'")) {'.
+					' if (confirm('.CJs::encodeJson(_('Delete expression?')).')) {'.
 						' delete_expression("'.$e['id'] .'");'.
 						' document.forms["'.$triggersForm->getName().'"].submit();'.
 					' }'
 				);
-				$triggerCheckbox = new CCheckbox('expr_target_single', ($i == 0) ? 'yes' : 'no', 'check_target(this);', $e['id']);
+				$triggerCheckbox = new CCheckBox('expr_target_single', ($i == 0) ? 'yes' : 'no', 'check_target(this);', $e['id']);
 			}
 			else {
 				$triggerCheckbox = null;
@@ -183,7 +189,7 @@ if ($this->data['input_method'] == IM_TREE) {
 							array_push($errorTexts, $expVal, ':', $errTxt);
 						}
 					}
-					$errorImg->setHint($errorTexts, '', 'left');
+					$errorImg->setHint($errorTexts, 'left');
 				}
 				$errorColumn = new CCol($errorImg, 'center');
 			}
@@ -192,7 +198,7 @@ if ($this->data['input_method'] == IM_TREE) {
 			}
 
 			// templated trigger
-			if ($this->data['limited'] == 'yes') {
+			if ($this->data['limited']) {
 				// make all links inside inactive
 				$listSize = count($e['list']);
 				for ($i = 0; $i < $listSize; $i++) {
diff --git a/frontends/php/include/views/configuration.triggers.expression.php b/frontends/php/include/views/configuration.triggers.expression.php
index 52909b0ebe5..edf58eff616 100644
--- a/frontends/php/include/views/configuration.triggers.expression.php
+++ b/frontends/php/include/views/configuration.triggers.expression.php
@@ -21,7 +21,7 @@
 
 require_once dirname(__FILE__).'/js/configuration.triggers.expression.js.php';
 
-$expressionWidget = new CWidget(null, 'trigger-expression');
+$expressionWidget = new CWidget(null, 'trigger-popup');
 
 // create form
 $expressionForm = new CForm();
@@ -39,7 +39,7 @@ $expressionFormList = new CFormList('expressionFormList');
 
 // append item to form list
 $item = array(
-	new CTextBox('description', $this->data['description'], ZBX_TEXTBOX_STANDARD_SIZE, 'yes'),
+	new CTextBox('description', $this->data['description'], ZBX_TEXTBOX_STANDARD_SIZE, true),
 	new CButton('select', _('Select'), 'return PopUp(\'popup.php?writeonly=1&dstfrm='.$expressionForm->getName().
 		'&dstfld1=itemid&dstfld2=description&submitParent=1'.(!empty($this->data['parent_discoveryid']) ? '&normal_only=1' : '').
 		'&srctbl=items&srcfld1=itemid&srcfld2=name\', 0, 0, \'zbx_popup_item\');',
@@ -49,7 +49,7 @@ $item = array(
 if (!empty($this->data['parent_discoveryid'])) {
 	$item[] = new CButton('select', _('Select prototype'), 'return PopUp(\'popup.php?dstfrm='.$expressionForm->getName().
 		'&dstfld1=itemid&dstfld2=description&submitParent=1'.url_param('parent_discoveryid', true).
-		'&srctbl=prototypes&srcfld1=itemid&srcfld2=name\', 0, 0, \'zbx_popup_item\');',
+		'&srctbl=item_prototypes&srcfld1=itemid&srcfld2=name\', 0, 0, \'zbx_popup_item\');',
 		'formlist'
 	);
 }
@@ -64,7 +64,7 @@ $expressionFormList->addRow(_('Function'), $functionComboBox);
 
 if (isset($this->data['functions'][$this->data['selectedFunction']]['params'])) {
 	foreach ($this->data['functions'][$this->data['selectedFunction']]['params'] as $paramId => $paramFunction) {
-		$paramValue = isset($this->data['param'][$paramId]) ? $this->data['param'][$paramId] : null;
+		$paramValue = isset($this->data['params'][$paramId]) ? $this->data['params'][$paramId] : null;
 
 		if ($paramFunction['T'] == T_ZBX_INT) {
 			$paramTypeElement = null;
@@ -92,25 +92,24 @@ if (isset($this->data['functions'][$this->data['selectedFunction']]['params']))
 					&& substr($this->data['expr_type'], 0, 6) != 'regexp'
 					&& substr($this->data['expr_type'], 0, 7) != 'iregexp') {
 				$paramTypeElement = SPACE._('Time');
-				$paramField = new CTextBox('param['.$paramId.']', $paramValue, 10);
+				$paramField = new CTextBox('params['.$paramId.']', $paramValue, 10);
 			}
 			else {
 				$paramField = ($this->data['paramtype'] == PARAM_TYPE_COUNTS)
-					? new CNumericBox('param['.$paramId.']', (int) $paramValue, 10)
-					: new CTextBox('param['.$paramId.']', $paramValue, 10);
+					? new CNumericBox('params['.$paramId.']', (int) $paramValue, 10)
+					: new CTextBox('params['.$paramId.']', $paramValue, 10);
 			}
 
 			$expressionFormList->addRow($paramFunction['C'].' ', array($paramField, $paramTypeElement));
 		}
 		else {
-			$expressionFormList->addRow($paramFunction['C'], new CTextBox('param['.$paramId.']', $paramValue, 30));
+			$expressionFormList->addRow($paramFunction['C'], new CTextBox('params['.$paramId.']', $paramValue, 30));
 			$expressionForm->addVar('paramtype', PARAM_TYPE_TIME);
 		}
 	}
 }
 else {
 	$expressionForm->addVar('paramtype', PARAM_TYPE_TIME);
-	$expressionForm->addVar('param', 0);
 }
 
 $expressionFormList->addRow('N', new CTextBox('value', $this->data['value'], 10));
diff --git a/frontends/php/include/views/configuration.triggers.list.php b/frontends/php/include/views/configuration.triggers.list.php
index d1b75626e4c..75b009cf079 100644
--- a/frontends/php/include/views/configuration.triggers.list.php
+++ b/frontends/php/include/views/configuration.triggers.list.php
@@ -94,21 +94,14 @@ $triggersForm->addVar('parent_discoveryid', $this->data['parent_discoveryid']);
 $triggersForm->addVar('hostid', $this->data['hostid']);
 
 // create table
-$link = new Curl();
-if (!empty($this->data['parent_discoveryid'])) {
-	$link->setArgument('parent_discoveryid', $this->data['parent_discoveryid']);
-}
-$link->setArgument('hostid', $this->data['hostid']);
-$link = $link->getUrl();
-
 $triggersTable = new CTableInfo(_('No triggers found.'));
 $triggersTable->setHeader(array(
 	new CCheckBox('all_triggers', null, "checkAll('".$triggersForm->getName()."', 'all_triggers', 'g_triggerid');"),
-	make_sorting_header(_('Severity'), 'priority', $link),
+	make_sorting_header(_('Severity'), 'priority', $this->data['sort'], $this->data['sortorder']),
 	empty($this->data['hostid']) ? _('Host') : null,
-	make_sorting_header(_('Name'), 'description', $link),
+	make_sorting_header(_('Name'), 'description', $this->data['sort'], $this->data['sortorder']),
 	_('Expression'),
-	make_sorting_header(_('Status'), 'status', $link),
+	make_sorting_header(_('Status'), 'status', $this->data['sort'], $this->data['sortorder']),
 	$data['showInfoColumn'] ? _('Info') : null
 ));
 
@@ -217,7 +210,7 @@ foreach ($this->data['triggers'] as $tnum => $trigger) {
 	if ($data['showInfoColumn']) {
 		if ($trigger['status'] == TRIGGER_STATUS_ENABLED && !zbx_empty($trigger['error'])) {
 			$info = new CDiv(SPACE, 'status_icon iconerror');
-			$info->setHint($trigger['error'], '', 'on');
+			$info->setHint($trigger['error'], 'on');
 		}
 		else {
 			$info = '';
@@ -233,7 +226,10 @@ foreach ($this->data['triggers'] as $tnum => $trigger) {
 		$status = new CLink(
 			triggerIndicator($trigger['status']),
 			'trigger_prototypes.php?'.
-				'go='.($trigger['status'] == TRIGGER_STATUS_DISABLED ? 'activate' : 'disable').
+				'action='.($trigger['status'] == TRIGGER_STATUS_DISABLED
+					? 'triggerprototype.massenable'
+					: 'triggerprototype.massdisable'
+				).
 				'&hostid='.$this->data['hostid'].
 				'&g_triggerid='.$triggerid.
 				'&parent_discoveryid='.$this->data['parent_discoveryid'],
@@ -244,7 +240,10 @@ foreach ($this->data['triggers'] as $tnum => $trigger) {
 		$status = new CLink(
 			triggerIndicator($trigger['status'], $trigger['state']),
 			'triggers.php?'.
-				'go='.($trigger['status'] == TRIGGER_STATUS_DISABLED ? 'activate' : 'disable').
+				'action='.($trigger['status'] == TRIGGER_STATUS_DISABLED
+					? 'trigger.massenable'
+					: 'trigger.massdisable'
+				).
 				'&hostid='.$this->data['hostid'].
 				'&g_triggerid='.$triggerid,
 			triggerIndicatorStyle($trigger['status'], $trigger['state'])
@@ -266,45 +265,46 @@ foreach ($this->data['triggers'] as $tnum => $trigger) {
 	$checkBox = new CCheckBox('g_triggerid['.$triggerid.']', null, null, $triggerid);
 	$checkBox->setEnabled(empty($trigger['discoveryRule']));
 
-	// expression
-	$expressionColumn = new CCol(triggerExpression($trigger, true));
-	$expressionColumn->setAttribute('style', 'white-space: normal;');
-
 	$triggersTable->addRow(array(
 		$checkBox,
 		getSeverityCell($trigger['priority']),
 		$hosts,
 		$description,
-		$expressionColumn,
+		new CCol(triggerExpression($trigger, true), 'trigger-expression'),
 		$status,
 		$info
 	));
 }
 
 // create go button
-$goComboBox = new CComboBox('go');
-$goOption = new CComboItem('activate', _('Enable selected'));
+
+$actionObject = $this->data['parent_discoveryid'] ? 'triggerprototype' : 'trigger';
+
+$goComboBox = new CComboBox('action');
+
+$goOption = new CComboItem($actionObject.'.massenable', _('Enable selected'));
 $goOption->setAttribute(
 	'confirm',
 	$this->data['parent_discoveryid'] ? _('Enable selected trigger prototypes?') : _('Enable selected triggers?')
 );
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('disable', _('Disable selected'));
+$goOption = new CComboItem($actionObject.'.massdisable', _('Disable selected'));
 $goOption->setAttribute(
 	'confirm',
 	$this->data['parent_discoveryid'] ? _('Disable selected trigger prototypes?') : _('Disable selected triggers?')
 );
 $goComboBox->addItem($goOption);
 
-$goOption = new CComboItem('massupdate', _('Mass update'));
+$goOption = new CComboItem($actionObject.'.massupdateform', _('Mass update'));
 $goComboBox->addItem($goOption);
+
 if (empty($this->data['parent_discoveryid'])) {
-	$goOption = new CComboItem('copy_to', _('Copy selected to ...'));
+	$goOption = new CComboItem($actionObject.'.masscopyto', _('Copy selected to ...'));
 	$goComboBox->addItem($goOption);
 }
 
-$goOption = new CComboItem('delete', _('Delete selected'));
+$goOption = new CComboItem($actionObject.'.massdelete', _('Delete selected'));
 $goOption->setAttribute(
 	'confirm',
 	$this->data['parent_discoveryid'] ? _('Delete selected trigger prototypes?') : _('Delete selected triggers?')
diff --git a/frontends/php/include/views/configuration.triggers.massupdate.php b/frontends/php/include/views/configuration.triggers.massupdate.php
index cbab9175b33..3921d7ffa17 100644
--- a/frontends/php/include/views/configuration.triggers.massupdate.php
+++ b/frontends/php/include/views/configuration.triggers.massupdate.php
@@ -45,9 +45,8 @@ else {
 // create form
 $triggersForm = new CForm();
 $triggersForm->setName('triggersForm');
-$triggersForm->addVar('massupdate', $this->data['massupdate']);
 $triggersForm->addVar('hostid', $this->data['hostid']);
-$triggersForm->addVar('go', $this->data['go']);
+$triggersForm->addVar('action', $this->data['action']);
 if ($this->data['parent_discoveryid']) {
 	$triggersForm->addVar('parent_discoveryid', $this->data['parent_discoveryid']);
 }
@@ -127,12 +126,11 @@ if (empty($this->data['parent_discoveryid'])) {
 					'dstfrm=massupdate'.
 					'&dstact=add_dependency'.
 					'&reference=deptrigger'.
-					'&dstfld1=new_dependency[]'.
+					'&dstfld1=new_dependency'.
 					'&srctbl=triggers'.
 					'&objname=triggers'.
 					'&srcfld1=triggerid'.
 					'&multiselect=1'.
-					'&monitored_hosts=1'.
 					'&with_triggers=1", 1000, 700);',
 				'link_menu'
 			)
diff --git a/frontends/php/include/views/general.login.php b/frontends/php/include/views/general.login.php
index f61cd875429..d2d0d2b5dd6 100644
--- a/frontends/php/include/views/general.login.php
+++ b/frontends/php/include/views/general.login.php
@@ -22,8 +22,8 @@
 define('ZBX_PAGE_NO_HEADER', 1);
 define('ZBX_PAGE_NO_FOOTER', 1);
 
-$request = CHtml::encode(get_request('request', ''));
-$message = CHtml::encode(get_request('message', '')) ;
+$request = CHtml::encode(getRequest('request', ''));
+$message = CHtml::encode(getRequest('message', '')) ;
 // remove debug code for login form message, trimming not in regex to relay only on [ ] in debug message.
 $message = trim(preg_replace('/\[.*\]/', '', $message));
 
@@ -69,7 +69,7 @@ require_once dirname(__FILE__).'/../page_header.php';
 									<div class="label"><?php echo _('Password'); ?></div><input type="password" id="password" name="password" class="input"/>
 								</li>
 								<li style="margin-top: 8px; text-align: center;">
-									<input type="checkbox" id="autologin" name="autologin" value="1" <?php echo (get_request('autologin', 1) == 1) ? 'checked="checked"' : ''; ?> />
+									<input type="checkbox" id="autologin" name="autologin" value="1" <?php echo (getRequest('autologin', 1) == 1) ? 'checked="checked"' : ''; ?> />
 									<label for="autologin" class="bold" style="line-height: 20px; vertical-align: top;">
 										<?php echo _('Remember me for 30 days'); ?>
 									</label>
diff --git a/frontends/php/include/views/general.search.php b/frontends/php/include/views/general.search.php
index 263d6fccc94..c2b57265bc8 100644
--- a/frontends/php/include/views/general.search.php
+++ b/frontends/php/include/views/general.search.php
@@ -21,7 +21,7 @@
 
 $searchForm = new CForm('get','search.php');
 
-$searchBox = new CTextBox('search', get_request('search'));
+$searchBox = new CTextBox('search', getRequest('search'));
 $searchBox->setAttribute('autocomplete', 'off');
 $searchBox->addClass('search');
 $searchForm->addItem($searchBox);
diff --git a/frontends/php/include/views/general.warning.php b/frontends/php/include/views/general.warning.php
index 8cdf8e3e0b3..85d98c6f6bb 100644
--- a/frontends/php/include/views/general.warning.php
+++ b/frontends/php/include/views/general.warning.php
@@ -19,33 +19,32 @@
 **/
 
 
-$pageHeader = new CPageHeader('Warning [refreshed every 30 sec]');
+$pageHeader = new CPageHeader(_('Warning').' ['._s('refreshed every %1$s sec.', 30).']');
 $pageHeader->addCssInit();
 $pageHeader->display();
+
 ?>
 <body>
 <?php
+
 // check if a CWarning object is passed
-if(!$warning = $this->get('warning')) {
+if (!$warning = $this->get('warning')) {
 	$message = $this->get('message');
 
-	if (isset($message['header'])) {
+	if (is_array($message) && isset($message['header'])) {
 		$message = array(bold($message['header']), BR(), $message['text']);
 	}
-	else {
-		$message = $this->get('message');
-	}
 
 	// if not - render a standard warning with a message
 	$warning = new CWarning('Zabbix '.ZABBIX_VERSION, $message);
-	$warning->setButtons(array(
-		new CButton('login', _('Retry'), 'document.location.reload();', 'formlist'),
-	));
+	$warning->setButtons(array(new CButton('login', _('Retry'), 'document.location.reload();', 'formlist')));
 }
+
 $warning->show();
+
 ?>
-<script>
-	setTimeout("document.location.reload();", 30000);
+<script type="text/javascript">
+	setTimeout('document.location.reload();', 30000);
 </script>
 
 </body>
diff --git a/frontends/php/include/views/inventory.host.list.php b/frontends/php/include/views/inventory.host.list.php
index 0be21808fe2..1a863a0b153 100644
--- a/frontends/php/include/views/inventory.host.list.php
+++ b/frontends/php/include/views/inventory.host.list.php
@@ -26,7 +26,7 @@ $rForm->addItem(array(_('Group'), SPACE, $this->data['pageFilter']->getGroupsCB(
 $hostInventoryWidget->addPageHeader(_('HOST INVENTORY'), SPACE);
 $hostInventoryWidget->addHeader(_('Hosts'), $rForm);
 
-$filterTable = new CTable('', 'filter');
+$filterTable = new CTable('', 'filter filter-center');
 // getting inventory fields to make a drop down
 $inventoryFields = getHostInventories(true); // 'true' means list should be ordered by title
 $inventoryFieldsComboBox = new CComboBox('filter_field', $this->data['filterField']);
@@ -71,15 +71,15 @@ $hostInventoryWidget->addHeaderRowNumber();
 
 $table = new CTableInfo(_('No hosts found.'));
 $table->setHeader(array(
-	make_sorting_header(_('Host'), 'name'),
+	make_sorting_header(_('Host'), 'name', $this->data['sort'], $this->data['sortorder']),
 	_('Group'),
-	make_sorting_header(_('Name'), 'pr_name'),
-	make_sorting_header(_('Type'), 'pr_type'),
-	make_sorting_header(_('OS'), 'pr_os'),
-	make_sorting_header(_('Serial number A'), 'pr_serialno_a'),
-	make_sorting_header(_('Tag'), 'pr_tag'),
-	make_sorting_header(_('MAC address A'), 'pr_macaddress_a'))
-);
+	make_sorting_header(_('Name'), 'pr_name', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Type'), 'pr_type', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('OS'), 'pr_os', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Serial number A'), 'pr_serialno_a', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('Tag'), 'pr_tag', $this->data['sort'], $this->data['sortorder']),
+	make_sorting_header(_('MAC address A'), 'pr_macaddress_a', $this->data['sort'], $this->data['sortorder'])
+));
 
 foreach ($this->data['hosts'] as $host) {
 	$hostGroups = array();
diff --git a/frontends/php/include/views/inventory.host.view.php b/frontends/php/include/views/inventory.host.view.php
index 31ce1045474..fa151b59a01 100644
--- a/frontends/php/include/views/inventory.host.view.php
+++ b/frontends/php/include/views/inventory.host.view.php
@@ -167,19 +167,28 @@ if ($this->data['host']['inventory']) {
 	if ($this->data['host']['inventory']['os']) {
 		$overviewFormList->addRow(
 			$this->data['tableTitles']['os']['title'],
-			new CSpan(zbx_str2links($this->data['host']['inventory']['os']), 'text-field')
+			array(new CDiv(new CSpan(
+				zbx_str2links($this->data['host']['inventory']['os']), 'inventory-text-field'),
+				'inventory-text-field-wrap'
+			))
 		);
 	}
 	if ($this->data['host']['inventory']['hardware']) {
 		$overviewFormList->addRow(
 			$this->data['tableTitles']['hardware']['title'],
-			new CSpan(zbx_str2links($this->data['host']['inventory']['hardware']), 'text-field')
+			array(new CDiv(new CSpan(
+				zbx_str2links($this->data['host']['inventory']['hardware']), 'inventory-text-field'),
+				'inventory-text-field-wrap'
+			))
 		);
 	}
 	if ($this->data['host']['inventory']['software']) {
 		$overviewFormList->addRow(
 			$this->data['tableTitles']['software']['title'],
-			new CSpan(zbx_str2links($this->data['host']['inventory']['software']), 'text-field')
+			array(new CDiv(new CSpan(
+				zbx_str2links($this->data['host']['inventory']['software']), 'inventory-text-field'),
+				'inventory-text-field-wrap'
+			))
 		);
 	}
 }
@@ -187,15 +196,20 @@ if ($this->data['host']['inventory']) {
 // description
 if ($this->data['host']['description'] !== '') {
 	$overviewFormList->addRow(_('Description'),
-		new CDiv(zbx_str2links($this->data['host']['description']), 'description')
+		array(new CDiv(new CSpan(
+			zbx_str2links($this->data['host']['description']), 'inventory-text-field'),
+			'inventory-text-field-wrap'
+		))
 	);
 }
 
 // latest data
-$overviewFormList->addRow(_('Latest data'), array(
+$overviewFormList->addRow(_('Monitoring'), array(
 	new CLink(_('Web'), 'httpmon.php?hostid='.$this->data['host']['hostid'].url_param('groupid')),
-	new CLink(_('Latest data'), 'latest.php?form=1&select=&show_details=1&filter_set=Filter&hostid='.
-		$this->data['host']['hostid'].url_param('groupid'), 'overview-link'),
+	new CLink(_('Latest data'),
+		'latest.php?form=1&select=&show_details=1&filter_set=Filter&hostids[]='.$this->data['host']['hostid'],
+		'overview-link'
+	),
 	new CLink(_('Triggers'),
 		'tr_status.php?filter_set=1&show_triggers=2&ack_status=1&show_events=1&show_events=0&show_details=1'.
 		'&txt_select=&show_maintenance=1&hostid='.$this->data['host']['hostid'].url_param('groupid'), 'overview-link'),
@@ -256,7 +270,7 @@ if ($this->data['host']['inventory']) {
 		if (!zbx_empty($value)) {
 			$detailsFormList->addRow(
 				$this->data['tableTitles'][$key]['title'],
-				new CSpan(zbx_str2links($value), 'text-field')
+				array(new CDiv(new CSpan(zbx_str2links($value), 'inventory-text-field'), 'inventory-text-field-wrap'))
 			);
 
 			$inventoryValues = true;
diff --git a/frontends/php/include/views/js/adm.regexprs.edit.js.php b/frontends/php/include/views/js/adm.regexprs.edit.js.php
index 467e1b61ed9..3991a6ae879 100644
--- a/frontends/php/include/views/js/adm.regexprs.edit.js.php
+++ b/frontends/php/include/views/js/adm.regexprs.edit.js.php
@@ -1,6 +1,6 @@
 <script type="text/x-jquery-tmpl" id="expressionRow">
 	<tr id="exprRow_#{id}">
-		<td>#{expression}</td>
+		<td class="pre-wrap break-lines">#{expression}</td>
 		<td>#{type}</td>
 		<td>#{case_sensitive}</td>
 		<td class="nowrap">
@@ -12,7 +12,7 @@
 
 <script type="text/x-jquery-tmpl" id="testTableRow">
 	<tr class="even_row">
-		<td class="wraptext">#{expression}</td>
+		<td class="pre-wrap break-lines">#{expression}</td>
 		<td>#{type}</td>
 		<td><span class="bold #{resultClass}">#{result}</span></td>
 	</tr>
@@ -346,28 +346,47 @@
 			 * @param {Object} response ajax response
 			 */
 			showTestResults: function(response) {
-				var tplData, expr, exprResult;
+				var tplData, expr, exprResult, hasErrors;
 
 				$('#testResultTable tr:not(.header)').remove();
 
+				hasErrors = false;
+
 				for (var id in this.expressions) {
+					var result;
 					expr = this.expressions[id];
 					exprResult = response.data.expressions[id];
 
+					if (response.data.errors[id]) {
+						hasErrors = true;
+						result = response.data.errors[id];
+					}
+					else {
+						result = exprResult ? <?php echo CJs::encodeJson(_('TRUE')); ?> : <?php echo CJs::encodeJson(_('FALSE')); ?>;
+					}
+
 					tplData = {
 						expression: expr.data.expression,
 						type: expr.type2str(),
-						result: exprResult ? <?php echo CJs::encodeJson(_('TRUE')); ?> : <?php echo CJs::encodeJson(_('FALSE')); ?>,
+						result: result,
 						resultClass: exprResult ? 'green' : 'red'
 					};
 
 					$('#testResultTable').append(this.testTableRowTpl.evaluate(tplData));
 				}
 
-				tplData = {
-					resultClass: response.data.final ? 'green' : 'red',
-					result: response.data.final ? <?php echo CJs::encodeJson(_('TRUE')); ?> : <?php echo CJs::encodeJson(_('FALSE')); ?>
-				};
+				if (hasErrors) {
+					tplData = {
+						resultClass: 'red',
+						result: <?php echo CJs::encodeJson(_('UNKNOWN')); ?>
+					};
+				}
+				else {
+					tplData = {
+						resultClass: response.data.final ? 'green' : 'red',
+						result: response.data.final ? <?php echo CJs::encodeJson(_('TRUE')); ?> : <?php echo CJs::encodeJson(_('FALSE')); ?>
+					};
+				}
 
 				$('#testResultTable').append(this.testCombinedTableRowTpl.evaluate(tplData));
 				$('#testResultTable').css({opacity: 1});
@@ -424,9 +443,7 @@
 		// on clone we remove regexpid hidden field and also expressionid from expressions
 		// it's needed because after clone all expressions should be added as new for cloned reg. exp
 		$('#clone').click(function() {
-			$('#regexpid').remove();
-			$('#clone').remove();
-			$('#delete').remove();
+			$('#regexpid, #clone, #delete').remove();
 			$('#cancel').addClass('ui-corner-left');
 
 			for (var id in zabbixRegExp.expressions) {
diff --git a/frontends/php/include/views/js/administration.script.edit.js.php b/frontends/php/include/views/js/administration.script.edit.js.php
index cc9b2a70194..4f3bbb78f18 100644
--- a/frontends/php/include/views/js/administration.script.edit.js.php
+++ b/frontends/php/include/views/js/administration.script.edit.js.php
@@ -46,7 +46,7 @@
 
 		// confirmation text input
 		jQuery('#confirmation').keyup(function() {
-			jQuery('#testConfirmation, #confirmationLabel').prop('disabled', (this.value == ''));
+			jQuery('#testConfirmation').prop('disabled', (this.value == ''));
 		}).keyup();
 
 		// enable confirmation checkbox
@@ -55,7 +55,7 @@
 				jQuery('#confirmation').removeAttr('disabled').keyup();
 			}
 			else {
-				jQuery('#confirmation, #testConfirmation, #confirmationLabel').prop('disabled', true);
+				jQuery('#confirmation, #testConfirmation').prop('disabled', true);
 			}
 		}).change();
 
diff --git a/frontends/php/include/views/js/monitoring.triggers.js.php b/frontends/php/include/views/js/common.filter.trigger.js.php
index 24184296bfa..b0b439ea026 100644
--- a/frontends/php/include/views/js/monitoring.triggers.js.php
+++ b/frontends/php/include/views/js/common.filter.trigger.js.php
@@ -9,11 +9,11 @@
 		</td>
 		<td>
 			<input class="input text" type="text" id="inventory_#{rowNum}_value" name="inventory[#{rowNum}][value]"
-					size="20" maxlength="255">
+				   size="20" maxlength="255">
 		</td>
 		<td>
 			<input class="input link_menu element-table-remove" type="button" id="inventory_#{rowNum}_remove"
-					name="inventory_#{rowNum}_remove" value="<?php echo _('Remove'); ?>">
+				   name="inventory_#{rowNum}_remove" value="<?php echo _('Remove'); ?>">
 		</td>
 	</tr>
 </script>
diff --git a/frontends/php/include/views/js/common.macros.js.php b/frontends/php/include/views/js/common.macros.js.php
index f0553509273..e2bc85a3584 100644
--- a/frontends/php/include/views/js/common.macros.js.php
+++ b/frontends/php/include/views/js/common.macros.js.php
@@ -5,7 +5,7 @@
 				placeholder="{$MACRO}" style="text-transform:uppercase;">
 		</td>
 		<td>
-			<span style="vertical-align:top;"><?php echo RARR ?></span>
+			<span style="vertical-align:top;">&rArr;</span>
 		</td>
 		<td>
 			<input class="input text" type="text" id="macros_#{rowNum}_value" name="macros[#{rowNum}][value]" size="40" maxlength="255" placeholder="value">
diff --git a/frontends/php/include/views/js/conf.import.js.php b/frontends/php/include/views/js/conf.import.js.php
new file mode 100644
index 00000000000..7b8293c05ae
--- /dev/null
+++ b/frontends/php/include/views/js/conf.import.js.php
@@ -0,0 +1,9 @@
+<script type="text/javascript">
+	jQuery(function($) {
+		$('#import').click(function() {
+			if ($('.deleteMissing:checked').length > 0) {
+				return confirm('<?php echo _('Delete all elements that are not present in the XML file?') ?>');
+			}
+		});
+	});
+</script>
diff --git a/frontends/php/include/views/js/configuration.action.edit.js.php b/frontends/php/include/views/js/configuration.action.edit.js.php
index ec2abdb0769..eab265b31c0 100644
--- a/frontends/php/include/views/js/configuration.action.edit.js.php
+++ b/frontends/php/include/views/js/configuration.action.edit.js.php
@@ -135,6 +135,9 @@
 		userscript: <?php echo ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT; ?>
 	};
 
+	/**
+	 * @see init.js add.popup event
+	 */
 	function addPopupValues(list) {
 		var i,
 			value,
@@ -237,8 +240,15 @@
 	}
 
 	function removeOperation(index) {
-		jQuery('#operations_' + index).find('*').remove();
-		jQuery('#operations_' + index).remove();
+		var row = jQuery('#operations_' + index);
+		var rowParent = row.parent();
+
+		row.find('*').remove();
+		row.remove();
+
+		if (IE8) {
+			rowParent.closest('table').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 
 	function removeOperationCondition(index) {
@@ -249,11 +259,25 @@
 	}
 
 	function removeOpmsgUsrgrpRow(usrgrpid) {
-		jQuery('#opmsgUsrgrpRow_' + usrgrpid).remove();
+		var row = jQuery('#opmsgUsrgrpRow_' + usrgrpid);
+		var rowParent = row.parent();
+
+		row.remove();
+
+		if (IE8) {
+			rowParent.closest('table').parent().closest('table').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 
 	function removeOpmsgUserRow(userid) {
-		jQuery('#opmsgUserRow_' + userid).remove();
+		var row = jQuery('#opmsgUserRow_' + userid);
+		var rowParent = row.parent();
+
+		row.remove();
+
+		if (IE8) {
+			rowParent.closest('table').parent().closest('table').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 
 	function removeOpGroupRow(groupid) {
@@ -309,7 +333,7 @@
 
 		// host group
 		if (object.target == 'hostGroup') {
-			var values = jQuery('#opCmdTargetObject').multiSelect.getData();
+			var values = jQuery('#opCmdTargetObject').multiSelect('getData');
 
 			object.opcommand_grpid = jQuery(objectForm).find('input[name="opCmdId"]').val();
 
@@ -343,7 +367,7 @@
 
 		// host
 		else if (object.target == 'host') {
-			var values = jQuery('#opCmdTargetObject').multiSelect.getData();
+			var values = jQuery('#opCmdTargetObject').multiSelect('getData');
 
 			object.opcommand_hstid = jQuery(objectForm).find('input[name="opCmdId"]').val();
 
@@ -399,7 +423,7 @@
 
 		// multiselect
 		if (opCmdTarget != 'current') {
-			jQuery('#opCmdTargetObject').remove();
+			jQuery('.multiselect-wrapper').remove();
 
 			var opCmdTargetObject = jQuery('<div>', {
 				id: 'opCmdTargetObject',
@@ -408,11 +432,21 @@
 
 			jQuery('#opCmdTargetSelect').append(opCmdTargetObject);
 
+			var srctbl = (opCmdTarget == 'host') ? 'hosts' : 'host_groups',
+				srcfld1 = (opCmdTarget == 'host') ? 'hostid' : 'groupid';
+
 			jQuery(opCmdTargetObject).multiSelectHelper({
+				id: 'opCmdTargetObject',
 				objectName: (opCmdTarget == 'host') ? 'hosts' : 'hostGroup',
 				name: 'opCmdTargetObjectName[]',
 				objectOptions: {
 					editable: true
+				},
+				popup: {
+					parameters: 'srctbl=' + srctbl + '&dstfrm=action.edit&dstfld1=opCmdTargetObject&srcfld1=' +
+						srcfld1 + '&writeonly=1&multiselect=1',
+					width: 450,
+					height: 450
 				}
 			});
 		}
@@ -497,6 +531,15 @@
 	}
 
 	function processTypeOfCalculation() {
+		if(jQuery('#evaltype').val() == <?php echo CONDITION_EVAL_TYPE_EXPRESSION ?>) {
+			jQuery('#conditionLabel').hide();
+			jQuery('#formula').show();
+		}
+		else {
+			jQuery('#conditionLabel').show();
+			jQuery('#formula').hide();
+		}
+
 		var labels = jQuery('#conditionTable .label');
 
 		if (labels.length > 1) {
@@ -543,7 +586,7 @@
 	}
 
 	function addDiscoveryTemplates() {
-		var values = jQuery('#discoveryTemplates').multiSelect.getData();
+		var values = jQuery('#discoveryTemplates').multiSelect('getData');
 
 		for (var key in values) {
 			var data = values[key];
@@ -559,11 +602,11 @@
 			}
 		}
 
-		jQuery('#dsc_templateid').multiSelect.clean();
+		jQuery('#discoveryTemplates').multiSelect('clean');
 	}
 
 	function addDiscoveryHostGroup() {
-		var values = jQuery('#discoveryHostGroup').multiSelect.getData();
+		var values = jQuery('#discoveryHostGroup').multiSelect('getData');
 
 		for (var key in values) {
 			var data = values[key];
@@ -579,13 +622,21 @@
 			}
 		}
 
-		jQuery('#dsc_groupid').multiSelect.clean();
+		jQuery('#discoveryHostGroup').multiSelect('clean');
 	}
 
 	jQuery(document).ready(function() {
 		// clone button
 		jQuery('#clone').click(function() {
 			jQuery('#actionid, #delete, #clone').remove();
+
+			var operationIdNameRegex = /operations\[\d+\]\[operationid\]/;
+			jQuery('input[name^=operations]').each(function() {
+				if ($(this).getAttribute('name').match(operationIdNameRegex)) {
+					$(this).remove();
+				}
+			});
+
 			jQuery('#cancel').addClass('ui-corner-left');
 			jQuery('#form').val('clone');
 			jQuery('#name').focus();
diff --git a/frontends/php/include/views/js/configuration.discovery.edit.js.php b/frontends/php/include/views/js/configuration.discovery.edit.js.php
index 0ee2a809f22..bf5ddee7850 100644
--- a/frontends/php/include/views/js/configuration.discovery.edit.js.php
+++ b/frontends/php/include/views/js/configuration.discovery.edit.js.php
@@ -203,6 +203,9 @@
 		}
 	}
 
+	/**
+	 * @see init.js add.popup event
+	 */
 	function addPopupValues(list) {
 		// templates
 		var dcheckRowTpl = new Template(jQuery('#dcheckRowTPL').html()),
@@ -317,6 +320,10 @@
 
 			jQuery('#uniqueness_criteria_row_' + dcheckid).remove();
 		}
+
+		if (IE8) {
+			jQuery('#dcheckList').find('table').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 
 	function showNewCheckForm(e, dcheckType, dcheckId) {
@@ -383,7 +390,7 @@
 				var name = itemObj.attr('name').replace('dchecks[' + dcheckId + '][', '');
 				name = name.substring(0, name.length - 1);
 
-				// ignore "name" value bacause it is virtual
+				// ignore "name" value because it is virtual
 				if (name !== 'name') {
 					jQuery('#' + name).val(itemObj.val());
 
@@ -391,9 +398,9 @@
 					var radioObj = jQuery('input[name=' + name + ']');
 
 					if (radioObj.attr('type') == 'radio') {
-						radioObj.removeAttr('checked');
+						radioObj.prop('checked', false);
 
-						jQuery('#' + name + '_' + itemObj.val()).attr('checked', 'checked');
+						jQuery('#' + name + '_' + itemObj.val()).prop('checked', true);
 					}
 				}
 			});
@@ -446,7 +453,7 @@
 				ignoreNames = ['druleid', 'name', 'ports', 'type'];
 
 			if (jQuery.inArray(dcheckType, snmpTypes) !== -1 && jQuery.inArray(oldType, snmpTypes) !== -1) {
-				// ignore value reset when change type from snmpt's
+				// ignore value reset when changing type from snmp's
 			}
 			else {
 				jQuery('#new_check_form input[type="text"]').each(function(i, item) {
@@ -499,6 +506,10 @@
 		if (showPrivProtocol) {
 			jQuery('#newCheckPrivProtocolRow .jqueryinputset').buttonset();
 		}
+
+		if (IE8) {
+			jQuery('#type').closest('li').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 
 	function saveNewDCheckForm(dcheckId) {
@@ -638,7 +649,7 @@
 	}
 
 	function selectUniquenessCriteriaDefault() {
-		jQuery('#uniqueness_criteria_ip').attr('checked', 'checked');
+		jQuery('#uniqueness_criteria_ip').prop('checked', true);
 	}
 
 	jQuery(document).ready(function() {
diff --git a/frontends/php/include/views/js/configuration.graph.edit.js.php b/frontends/php/include/views/js/configuration.graph.edit.js.php
index a4c2ab3785c..0136922086a 100644
--- a/frontends/php/include/views/js/configuration.graph.edit.js.php
+++ b/frontends/php/include/views/js/configuration.graph.edit.js.php
@@ -170,10 +170,10 @@
 		var size = jQuery('#itemsTable tr.sortable').length;
 
 		for (var i = 0; i < size; i++) {
-			var nameLink = 'PopUp("popup.php?writeonly=1&dstfrm=graphForm'
+			var nameLink = 'PopUp("popup.php?writeonly=1&numeric=1&dstfrm=graphForm'
 				+ '&dstfld1=items_' + i + '_itemid&dstfld2=items_' + i + '_name'
 				+ (jQuery('#items_' + i + '_flags').val() == <?php echo ZBX_FLAG_DISCOVERY_PROTOTYPE; ?>
-					? '&srctbl=prototypes&parent_discoveryid=<?php echo $this->data['parent_discoveryid']; ?>'
+					? '&srctbl=item_prototypes&parent_discoveryid=<?php echo $this->data['parent_discoveryid']; ?>'
 						+ '&srcfld3=flags&dstfld3=items_' + i + '_flags'
 					: '&srctbl=items')
 				+ '<?php echo !empty($this->data['normal_only']) ? '&normal_only=1' : ''; ?>'
diff --git a/frontends/php/include/views/js/configuration.host.edit.js.php b/frontends/php/include/views/js/configuration.host.edit.js.php
index b566ec1dc9a..3fff2efe34f 100644
--- a/frontends/php/include/views/js/configuration.host.edit.js.php
+++ b/frontends/php/include/views/js/configuration.host.edit.js.php
@@ -7,6 +7,10 @@
 	</td>
 	<td class="interface-ip">
 		<input class="input text" name="interfaces[#{iface.interfaceid}][ip]" type="text" size="24" maxlength="64" value="#{iface.ip}" />
+		<div class="interface-bulk">
+			<input class="input checkbox pointer" type="checkbox" id="interfaces[#{iface.interfaceid}][bulk]" name="interfaces[#{iface.interfaceid}][bulk]" value="1" #{*attrs.checked_bulk} />
+			<label for="interfaces[#{iface.interfaceid}][bulk]"><?php echo _('Use bulk requests'); ?></label>
+		</div>
 	</td>
 	<td class="interface-dns">
 		<input class="input text" name="interfaces[#{iface.interfaceid}][dns]" type="text" size="30" maxlength="64" value="#{iface.dns}" />
@@ -54,6 +58,10 @@
 			domRow = jQuery('#hostInterfaceRow_' + hostInterface.interfaceid);
 			jQuery('.jqueryinputset', domRow).buttonset();
 
+			if (hostInterface.type != <?php echo INTERFACE_TYPE_SNMP; ?>) {
+				jQuery('.interface-bulk', domRow).remove();
+			}
+
 			if (hostInterface.locked) {
 				addNotDraggableIcon(domRow);
 			}
@@ -166,6 +174,15 @@
 				attrs.checked_main = 'checked="checked"';
 			}
 
+			if (hostInterface.type == <?php echo INTERFACE_TYPE_SNMP; ?>) {
+				if (hostInterface.bulk == 1) {
+					attrs.checked_bulk = 'checked="checked"';
+				}
+				else {
+					attrs.checked_bulk = '';
+				}
+			}
+
 			return attrs;
 		}
 
@@ -191,28 +208,6 @@
 			return footerRowId;
 		}
 
-		function getHostInterfaceNumericType(typeName) {
-			var typeNum;
-
-			switch (typeName) {
-				case 'agent':
-					typeNum = '<?php echo INTERFACE_TYPE_AGENT; ?>';
-					break;
-				case 'snmp':
-					typeNum = '<?php echo INTERFACE_TYPE_SNMP; ?>';
-					break;
-				case 'jmx':
-					typeNum = '<?php echo INTERFACE_TYPE_JMX; ?>';
-					break;
-				case 'ipmi':
-					typeNum = '<?php echo INTERFACE_TYPE_IPMI; ?>';
-					break;
-				default:
-					throw new Error('Unknown host interface type name.');
-			}
-			return typeNum;
-		}
-
 		function createNewHostInterface(hostInterfaceType) {
 			var newInterface = {
 				isNew: true,
@@ -222,6 +217,10 @@
 				ip: '127.0.0.1'
 			};
 
+			if (newInterface.type == <?php echo INTERFACE_TYPE_SNMP; ?>) {
+				newInterface.bulk = 1;
+			}
+
 			newInterface.interfaceid = 1;
 			while (allHostInterfaces[newInterface.interfaceid] !== void(0)) {
 				newInterface.interfaceid++;
@@ -257,9 +256,9 @@
 
 		return {
 			add: function(hostInterfaces) {
-				for (var hostInterfaceId in hostInterfaces) {
-					addHostInterface(hostInterfaces[hostInterfaceId]);
-					renderHostInterfaceRow(hostInterfaces[hostInterfaceId]);
+				for (var i = 0; i < hostInterfaces.length; i++) {
+					addHostInterface(hostInterfaces[i]);
+					renderHostInterfaceRow(hostInterfaces[i]);
 				}
 				resetMainInterfaces();
 			},
@@ -308,7 +307,7 @@
 			disable: function() {
 				jQuery('.interface-drag-control, .interface-control').html('');
 				jQuery('.interfaceRow').find('input').attr('readonly', true);
-				jQuery('.interfaceRow').find('input[type="radio"]').attr('disabled', true);
+				jQuery('.interfaceRow').find('input[type="radio"], input[type="checkbox"]').attr('disabled', true);
 				jQuery('.interface-connect-to').find('input').button('disable');
 			}
 		}
@@ -344,6 +343,35 @@
 
 				ui.helper.remove();
 
+				if (getHostInterfaceNumericType(hostInterfaceTypeName) == <?php echo INTERFACE_TYPE_SNMP; ?>) {
+					if (jQuery('.interface-bulk', jQuery('#hostInterfaceRow_' + hostInterfaceId)).length == 0) {
+						var bulkDiv = jQuery('<div>', {
+							'class': 'interface-bulk'
+						});
+
+						// append checkbox
+						bulkDiv.append(jQuery('<input>', {
+							id: 'interfaces[' + hostInterfaceId + '][bulk]',
+							'class': 'input checkbox pointer',
+							type: 'checkbox',
+							name: 'interfaces[' + hostInterfaceId + '][bulk]',
+							value: 1,
+							checked: true
+						}));
+
+						// append label
+						bulkDiv.append(jQuery('<label>', {
+							'for': 'interfaces[' + hostInterfaceId + '][bulk]',
+							text: '<?php echo _('Use bulk requests'); ?>'
+						}));
+
+						jQuery('.interface-ip', jQuery('#hostInterfaceRow_' + hostInterfaceId)).append(bulkDiv);
+					}
+				}
+				else {
+					jQuery('.interface-bulk', jQuery('#hostInterfaceRow_' + hostInterfaceId)).remove();
+				}
+
 				hostInterfacesManager.setType(hostInterfaceId, hostInterfaceTypeName);
 				hostInterfacesManager.resetMainInterfaces();
 			},
@@ -402,9 +430,30 @@
 		}).change();
 	});
 
+	function getHostInterfaceNumericType(typeName) {
+		var typeNum;
+
+		switch (typeName) {
+			case 'agent':
+				typeNum = '<?php echo INTERFACE_TYPE_AGENT; ?>';
+				break;
+			case 'snmp':
+				typeNum = '<?php echo INTERFACE_TYPE_SNMP; ?>';
+				break;
+			case 'jmx':
+				typeNum = '<?php echo INTERFACE_TYPE_JMX; ?>';
+				break;
+			case 'ipmi':
+				typeNum = '<?php echo INTERFACE_TYPE_IPMI; ?>';
+				break;
+			default:
+				throw new Error('Unknown host interface type name.');
+		}
+		return typeNum;
+	}
+
 	function removeTemplate(templateid) {
 		jQuery('#templates_' + templateid).remove();
 		jQuery('#template_row_' + templateid).remove();
 	}
-
 </script>
diff --git a/frontends/php/include/views/js/configuration.httpconf.edit.js.php b/frontends/php/include/views/js/configuration.httpconf.edit.js.php
index 829a9bf8ab6..a0f2253e992 100644
--- a/frontends/php/include/views/js/configuration.httpconf.edit.js.php
+++ b/frontends/php/include/views/js/configuration.httpconf.edit.js.php
@@ -14,6 +14,9 @@
 		jQuery('#steps_' + step + '_variables').remove();
 		jQuery('#steps_' + step + '_required').remove();
 		jQuery('#steps_' + step + '_status_codes').remove();
+		jQuery('#steps_' + step + '_headers').remove();
+		jQuery('#steps_' + step + '_retrieve_mode').remove();
+		jQuery('#steps_' + step + '_follow_redirects').remove();
 
 		if (table.find('tr.sortable').length <= 1) {
 			table.sortable('disable');
@@ -42,6 +45,9 @@
 			jQuery('#steps_' + step + '_variables').attr('id', 'tmp_steps_' + step + '_variables');
 			jQuery('#steps_' + step + '_required').attr('id', 'tmp_steps_' + step + '_required');
 			jQuery('#steps_' + step + '_status_codes').attr('id', 'tmp_steps_' + step + '_status_codes');
+			jQuery('#steps_' + step + '_headers').attr('id', 'tmp_steps_' + step + '_headers');
+			jQuery('#steps_' + step + '_follow_redirects').attr('id', 'tmp_steps_' + step + '_follow_redirects');
+			jQuery('#steps_' + step + '_retrieve_mode').attr('id', 'tmp_steps_' + step + '_retrieve_mode');
 			jQuery('#current_step_' + step).attr('id', 'tmp_current_step_' + step);
 
 			// set order number
@@ -69,6 +75,9 @@
 			jQuery('#tmp_steps_' + n + '_variables').attr('id', 'steps_' + newStep + '_variables');
 			jQuery('#tmp_steps_' + n + '_required').attr('id', 'steps_' + newStep + '_required');
 			jQuery('#tmp_steps_' + n + '_status_codes').attr('id', 'steps_' + newStep + '_status_codes');
+			jQuery('#tmp_steps_' + n + '_headers').attr('id', 'steps_' + newStep + '_headers');
+			jQuery('#tmp_steps_' + n + '_follow_redirects').attr('id', 'steps_' + newStep + '_follow_redirects');
+			jQuery('#tmp_steps_' + n + '_retrieve_mode').attr('id', 'steps_' + newStep + '_retrieve_mode');
 
 			jQuery('#remove_' + newStep).attr('remove_step', newStep);
 			jQuery('#name_' + newStep).attr('name_step', newStep);
@@ -84,6 +93,9 @@
 			jQuery('#steps_' + newStep + '_variables').attr('name', 'steps[' + newStep + '][variables]');
 			jQuery('#steps_' + newStep + '_required').attr('name', 'steps[' + newStep + '][required]');
 			jQuery('#steps_' + newStep + '_status_codes').attr('name', 'steps[' + newStep + '][status_codes]');
+			jQuery('#steps_' + newStep + '_headers').attr('name', 'steps[' + newStep + '][headers]');
+			jQuery('#steps_' + newStep + '_retrieve_mode').attr('name', 'steps[' + newStep + '][retrieve_mode]');
+			jQuery('#steps_' + newStep + '_follow_redirects').attr('name', 'steps[' + newStep + '][follow_redirects]');
 
 			// set new step order position
 			currStep.attr('id', 'current_step_' + newStep);
@@ -133,7 +145,7 @@
 				return ui;
 			},
 			start: function(e, ui) {
-				// fix placeholder not to change height while object is beeing dragged
+				// fix placeholder not to change height while object is being dragged
 				$(ui.placeholder).height($(ui.helper).height());
 
 				if (IE8) {
@@ -153,7 +165,7 @@
 					stepNames += '&steps_names[]=' + $(stepName).val();
 				});
 
-				return PopUp('popup_httpstep.php?dstfrm=httpForm' + stepNames, 600, 510);
+				return PopUp('popup_httpstep.php?dstfrm=httpForm' + stepNames, 600, 542);
 			});
 		<?php endif ?>
 
@@ -177,7 +189,10 @@
 					+ '<?php echo url_param($step['required'], false, 'required'); ?>'
 					+ '<?php echo url_param($step['status_codes'], false, 'status_codes'); ?>'
 					+ '<?php echo url_param($step['name'], false, 'old_name'); ?>'
-					+ stepNames, 600, 510);
+					+ '<?php echo url_param($step['headers'], false, 'headers'); ?>'
+					+ '<?php echo url_param($step['retrieve_mode'], false, 'retrieve_mode'); ?>'
+					+ '<?php echo url_param($step['follow_redirects'], false, 'follow_redirects'); ?>'
+					+ stepNames, 600, 542);
 			});
 		<?php endforeach ?>
 	});
diff --git a/frontends/php/include/views/js/configuration.httpconf.popup.js.php b/frontends/php/include/views/js/configuration.httpconf.popup.js.php
index 9f10cfe219c..27c4349c703 100644
--- a/frontends/php/include/views/js/configuration.httpconf.popup.js.php
+++ b/frontends/php/include/views/js/configuration.httpconf.popup.js.php
@@ -7,43 +7,57 @@
 		obj.appendChild(new_variable);
 	}
 
-	function add_httpstep(formname, name, timeout, url, posts, variables, required, status_codes) {
+	function add_httpstep(formname, httpstep) {
 		var form = window.opener.document.forms[formname];
 		if (!form) {
 			close_window();
 			return false;
 		}
 
-		add_var_to_opener_obj(form, 'new_httpstep[name]', name);
-		add_var_to_opener_obj(form, 'new_httpstep[timeout]', timeout);
-		add_var_to_opener_obj(form, 'new_httpstep[url]', url);
-		add_var_to_opener_obj(form, 'new_httpstep[posts]', posts);
-		add_var_to_opener_obj(form, 'new_httpstep[variables]', variables);
-		add_var_to_opener_obj(form, 'new_httpstep[required]', required);
-		add_var_to_opener_obj(form, 'new_httpstep[status_codes]', status_codes);
+		add_var_to_opener_obj(form, 'new_httpstep[name]', httpstep.name);
+		add_var_to_opener_obj(form, 'new_httpstep[timeout]', httpstep.timeout);
+		add_var_to_opener_obj(form, 'new_httpstep[url]', httpstep.url);
+		add_var_to_opener_obj(form, 'new_httpstep[posts]', httpstep.posts);
+		add_var_to_opener_obj(form, 'new_httpstep[variables]', httpstep.variables);
+		add_var_to_opener_obj(form, 'new_httpstep[required]', httpstep.required);
+		add_var_to_opener_obj(form, 'new_httpstep[status_codes]', httpstep.status_codes);
+		add_var_to_opener_obj(form, 'new_httpstep[headers]', httpstep.headers);
+		add_var_to_opener_obj(form, 'new_httpstep[follow_redirects]', httpstep.follow_redirects);
+		add_var_to_opener_obj(form, 'new_httpstep[retrieve_mode]', httpstep.retrieve_mode);
 
 		form.submit();
 		close_window();
 		return true;
 	}
 
-	function update_httpstep(formname, list_name, stepid, name, timeout, url, posts, variables, required, status_codes) {
+	function update_httpstep(formname, list_name, httpstep) {
 		var form = window.opener.document.forms[formname];
 		if (!form) {
 			close_window();
 			return false;
 		}
 
-		add_var_to_opener_obj(form, list_name + '[' + stepid + '][name]', name);
-		add_var_to_opener_obj(form, list_name + '[' + stepid + '][timeout]', timeout);
-		add_var_to_opener_obj(form, list_name + '[' + stepid + '][url]', url);
-		add_var_to_opener_obj(form, list_name + '[' + stepid + '][posts]', posts);
-		add_var_to_opener_obj(form, list_name + '[' + stepid + '][variables]', variables);
-		add_var_to_opener_obj(form, list_name + '[' + stepid + '][required]', required);
-		add_var_to_opener_obj(form, list_name + '[' + stepid + '][status_codes]', status_codes);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][name]', httpstep.name);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][timeout]', httpstep.timeout);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][url]', httpstep.url);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][posts]', httpstep.posts);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][variables]', httpstep.variables);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][required]', httpstep.required);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][status_codes]', httpstep.status_codes);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][headers]', httpstep.headers);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][follow_redirects]', httpstep.follow_redirects);
+		add_var_to_opener_obj(form, list_name + '[' + httpstep.stepid + '][retrieve_mode]', httpstep.retrieve_mode);
 
 		form.submit();
 		close_window();
 		return true;
 	}
+
+	jQuery(function() {
+		jQuery('#retrieve_mode')
+			.on('change', function() {
+				jQuery('#required, #posts').attr('disabled', this.checked);
+			})
+			.trigger('change');
+	});
 </script>
diff --git a/frontends/php/include/views/js/configuration.services.edit.js.php b/frontends/php/include/views/js/configuration.services.edit.js.php
index 256582473d1..d38041c3468 100644
--- a/frontends/php/include/views/js/configuration.services.edit.js.php
+++ b/frontends/php/include/views/js/configuration.services.edit.js.php
@@ -80,6 +80,10 @@
 			tr.appendChild(td);
 			document.getElementById('service_children').firstChild.appendChild(tr);
 			jQuery('#service_children .message').css('display', 'none');
+
+			if (IE8) {
+				jQuery('#service_children').parent().addClass('ie8fix-inline').removeClass('ie8fix-inline');
+			}
 		}
 	}
 
@@ -87,13 +91,23 @@
 		removeObjectById('children_' + serviceid);
 		removeObjectById('children_' + serviceid + '_name');
 		removeObjectById('children_' + serviceid + '_serviceid');
+
+		if (IE8) {
+			jQuery('#service_children').parent().addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 
 	function removeTime(id) {
+		var parent = jQuery('#times_' + id).parent();
+
 		removeObjectById('times_' + id);
 		removeObjectById('times_' + id + '_type');
 		removeObjectById('times_' + id + '_from');
 		removeObjectById('times_' + id + '_to');
 		removeObjectById('times_' + id + '_note');
+
+		if (IE8) {
+			parent.closest('table').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 </script>
diff --git a/frontends/php/include/views/js/configuration.slideconf.edit.js.php b/frontends/php/include/views/js/configuration.slideconf.edit.js.php
index a8d67ade85e..b58f227e264 100644
--- a/frontends/php/include/views/js/configuration.slideconf.edit.js.php
+++ b/frontends/php/include/views/js/configuration.slideconf.edit.js.php
@@ -1,5 +1,5 @@
 <script type="text/x-jquery-tmpl" id="screenRowTPL">
-<tr id="slides_#{rowId}" class="sortable">
+<tr class="sortable" id="slides_#{rowId}">
 	<td>
 		<span class="ui-icon ui-icon-arrowthick-2-n-s move"></span>
 		<input id="slides_#{rowId}_screenid" name="slides[#{rowId}][screenid]" type="hidden" value="#{screenid}" />
@@ -34,21 +34,26 @@
 		}
 
 		recalculateSortOrder();
+
+		if (IE8) {
+			jQuery('#slideTable').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 
 	function recalculateSortOrder() {
 		var i = 0;
 
 		jQuery('#slideTable tr.sortable .rowNum').each(function() {
-			var step = (i == 0) ? '0' : i;
+			var newStep = (i == 0) ? '0' : i,
+				currentStep = jQuery(this).closest('tr').attr('id').split('_')[1];
 
 			// rewrite ids to temp
-			jQuery('#remove_' + step).attr('id', 'tmp_remove_' + step);
-			jQuery('#slides_' + step).attr('id', 'tmp_slides_' + step);
-			jQuery('#slides_' + step + '_slideid').attr('id', 'tmp_slides_' + step + '_slideid');
-			jQuery('#slides_' + step + '_screenid').attr('id', 'tmp_slides_' + step + '_screenid');
-			jQuery('#slides_' + step + '_delay').attr('id', 'tmp_slides_' + step + '_delay');
-			jQuery('#current_slide_' + step).attr('id', 'tmp_current_slide_' + step);
+			jQuery('#remove_' + currentStep).attr('id', 'tmp_remove_' + newStep);
+			jQuery('#slides_' + currentStep).attr('id', 'tmp_slides_' + newStep);
+			jQuery('#slides_' + currentStep + '_slideid').attr('id', 'tmp_slides_' + newStep + '_slideid');
+			jQuery('#slides_' + currentStep + '_screenid').attr('id', 'tmp_slides_' + newStep + '_screenid');
+			jQuery('#slides_' + currentStep + '_delay').attr('id', 'tmp_slides_' + newStep + '_delay');
+			jQuery('#current_slide_' + currentStep).attr('id', 'tmp_current_slide_' + newStep);
 
 			// set order number
 			jQuery(this)
@@ -60,6 +65,7 @@
 		// rewrite ids in new order
 		for (var n = 0; n < i; n++) {
 			var newStep = jQuery('#tmp_current_slide_' + n).attr('new_slide');
+			jQuery('#tmp_current_slide_' + n).removeAttr('new_slide');
 
 			jQuery('#tmp_remove_' + n).attr('id', 'remove_' + newStep);
 			jQuery('#tmp_slides_' + n).attr('id', 'slides_' + newStep);
@@ -70,13 +76,18 @@
 			jQuery('#slides_' + newStep + '_slideid').attr('name', 'slides[' + newStep + '][slideid]');
 			jQuery('#slides_' + newStep + '_screenid').attr('name', 'slides[' + newStep + '][screenid]');
 			jQuery('#slides_' + newStep + '_delay').attr('name', 'slides[' + newStep + '][delay]');
-			jQuery('#remove_' + newStep).attr('remove_slide', newStep);
+			jQuery('#remove_' + newStep)
+				.attr('remove_slide', newStep)
+				.attr('name', 'remove_' + newStep);
 
 			// set new slide order position
 			jQuery('#tmp_current_slide_' + n).attr('id', 'current_slide_' + newStep);
 		}
 	}
 
+	/**
+	 * @see init.js add.popup event
+	 */
 	function addPopupValues(list) {
 		var initSize = jQuery('#slideTable tr.sortable .rowNum').length,
 			defaultDelay = jQuery('#delay').val();
@@ -101,6 +112,10 @@
 		}
 
 		createPlaceholders();
+
+		if (IE8) {
+			jQuery('#slideTable').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+		}
 	}
 
 	function initSortable() {
@@ -133,7 +148,7 @@
 					td.width(slideTableColumnWidths[i]);
 				});
 
-				// when dragging element on safari, it jumps out of the table on IE it moves about 4 pixes to right
+				// when dragging element on safari, it jumps out of the table on IE it moves about 4 pixels to right
 				if (SF || IE8) {
 					// move back draggable element to proper position
 					ui.css('left', (ui.offset().left - 4) + 'px');
diff --git a/frontends/php/include/views/js/configuration.sysmaps.js.php b/frontends/php/include/views/js/configuration.sysmaps.js.php
index 1069bc20cd4..62500514128 100644
--- a/frontends/php/include/views/js/configuration.sysmaps.js.php
+++ b/frontends/php/include/views/js/configuration.sysmaps.js.php
@@ -90,9 +90,7 @@
 			<tr id="hostGroupSelectRow">
 				<td><?php echo _('Host group'); ?></td>
 				<td>
-					<div>
-						<div id="elementNameHostGroup" class="multiselect" style="width: 312px;"></div>
-					</div>
+					<div id="elementNameHostGroup" class="multiselect" style="width: 312px;"></div>
 				</td>
 			</tr>
 			<tr id="hostSelectRow">
@@ -106,7 +104,7 @@
 				<td>
 					<input readonly="readonly" size="50" id="elementNameTrigger" name="elementName" class="input">
 					<input type="hidden" id="elementExpressionTrigger" name="elementExpressionTrigger">
-					<span class="link" onclick="PopUp('popup.php?writeonly=1&dstfrm=selementForm&dstfld1=elementid&dstfld2=elementNameTrigger&dstfld3=elementExpressionTrigger&srctbl=triggers&srcfld1=triggerid&srcfld2=description&srcfld3=expression&monitored_hosts=1&with_triggers=1',450,450)"><?php echo _('Select'); ?></span>
+					<span class="link" onclick="PopUp('popup.php?writeonly=1&dstfrm=selementForm&dstfld1=elementid&dstfld2=elementNameTrigger&dstfld3=elementExpressionTrigger&srctbl=triggers&srcfld1=triggerid&srcfld2=description&srcfld3=expression&with_triggers=1&real_hosts=1&noempty=1',450,450)"><?php echo _('Select'); ?></span>
 				</td>
 			</tr>
 			<tr id="mapSelectRow">
@@ -120,7 +118,7 @@
 				<td><?php echo _('Application'); ?></td>
 				<td>
 					<input size="50" id="application" name="application" class="input">
-					<span id="application-select" class="link"><?php echo _('Select'); ?></span>
+					<input id="application-select" type="button" class="input link_menu select-popup" value="<?php echo _('Select'); ?>">
 				</td>
 			</tr>
 
@@ -404,7 +402,7 @@
 							<tfoot>
 							<tr>
 								<td colspan="4">
-									<span class="link_menu" onclick="PopUp('popup.php?srctbl=triggers&srcfld1=triggerid&real_hosts=1&reference=linktrigger&multiselect=1&writeonly=1&monitored_hosts=1&with_triggers=1');"><?php echo _('Add'); ?></span>
+									<span class="link_menu" onclick="PopUp('popup.php?srctbl=triggers&srcfld1=triggerid&real_hosts=1&reference=linktrigger&multiselect=1&writeonly=1&with_triggers=1&noempty=1');"><?php echo _('Add'); ?></span>
 								</td>
 							</tr>
 							</tfoot>
@@ -488,4 +486,16 @@ jQuery(document).ready(function() {
 		return false;
 	});
 })
+
+/**
+ * @see init.js add.popup event
+ */
+function addPopupValues(data) {
+	if (data.object === 'name') {
+		jQuery('#application').val(data.values[0].name);
+	}
+	else if (data.object === 'linktrigger') {
+		ZABBIX.apps.map.object.linkForm.addNewTriggers(data.values);
+	}
+}
 </script>
diff --git a/frontends/php/include/views/js/configuration.triggers.edit.js.php b/frontends/php/include/views/js/configuration.triggers.edit.js.php
index b52c677a581..62fa34d0b24 100644
--- a/frontends/php/include/views/js/configuration.triggers.edit.js.php
+++ b/frontends/php/include/views/js/configuration.triggers.edit.js.php
@@ -6,6 +6,9 @@
 		});
 	});
 
+	/**
+	 * @see init.js add.popup event
+	 */
 	function addPopupValues(list) {
 		if (!isset('object', list)) {
 			return false;
diff --git a/frontends/php/include/views/js/configuration.triggers.expression.js.php b/frontends/php/include/views/js/configuration.triggers.expression.js.php
index 90f4294fd43..9323c9c81d7 100644
--- a/frontends/php/include/views/js/configuration.triggers.expression.js.php
+++ b/frontends/php/include/views/js/configuration.triggers.expression.js.php
@@ -38,10 +38,10 @@
 					|| jQuery('#expr_type option:selected').val().substr(0, 6) == 'strlen'
 					|| jQuery('#expr_type option:selected').val().substr(0, 4) == 'band') {
 				if (jQuery('#paramtype option:selected').val() == <?php echo PARAM_TYPE_COUNTS; ?>) {
-					jQuery('#param_0').removeAttr('readonly');
+					jQuery('#params_0').removeAttr('readonly');
 				}
 				else {
-					jQuery('#param_0').attr('readonly', 'readonly');
+					jQuery('#params_0').attr('readonly', 'readonly');
 				}
 			}
 		});
@@ -51,10 +51,10 @@
 					|| jQuery('#expr_type option:selected').val().substr(0, 6) == 'strlen'
 					|| jQuery('#expr_type option:selected').val().substr(0, 4) == 'band') {
 				if (jQuery('#paramtype option:selected').val() == <?php echo PARAM_TYPE_COUNTS; ?>) {
-					jQuery('#param_0').removeAttr('readonly');
+					jQuery('#params_0').removeAttr('readonly');
 				}
 				else {
-					jQuery('#param_0').attr('readonly', 'readonly');
+					jQuery('#params_0').attr('readonly', 'readonly');
 				}
 			}
 		});
diff --git a/frontends/php/include/views/js/monitoring.history.js.php b/frontends/php/include/views/js/monitoring.history.js.php
index d3980cee32b..70f35a3822f 100644
--- a/frontends/php/include/views/js/monitoring.history.js.php
+++ b/frontends/php/include/views/js/monitoring.history.js.php
@@ -1,40 +1,59 @@
 <script type="text/javascript">
+	/**
+	 * @see init.js add.popup event
+	 */
 	function addPopupValues(list) {
 		if (!isset('object', list)) {
 			throw("Error hash attribute 'list' doesn't contain 'object' index");
 			return false;
 		}
 
-		var favorites = {'itemid': 1};
-		if (isset(list.object, favorites)) {
-			for (var i = 0; i < list.values.length; i++) {
-				if (!isset(i, list.values) || empty(list.values[i])) {
-					continue;
-				}
-				create_var('zbx_filter', 'itemid[' + list.values[i].itemid + ']', list.values[i].itemid, false);
+		for (var i = 0; i < list.values.length; i++) {
+			if (!isset(i, list.values) || empty(list.values[i])) {
+				continue;
 			}
-
-			$('zbx_filter').submit();
-		}
-	}
-
-	function removeSelectedItems(objId, name) {
-		var obj = jQuery('#' + objId);
-		if (empty(obj)) {
-			return false;
+			create_var('zbx_filter', 'itemids[' + list.values[i].itemid + ']', list.values[i].itemid, false);
 		}
 
-		jQuery('option:selected', obj).each(function(){
-			var self = jQuery(this);
+		$('zbx_filter').submit();
+	}
 
-			if (jQuery('option', obj).length > 1) {
-				jQuery('#' + name + '_' + self.val()).remove();
-				self.remove();
-			}
-			else {
-				alert(<?php echo CJs::encodeJson(_('Cannot remove all items, at least one item should remain.')); ?>);
+	jQuery(function($){
+		$('#remove_log').click(function() {
+			var obj = $('#cmbitemlist_');
+			if (empty(obj)) {
 				return false;
 			}
+
+			jQuery('option:selected', obj).each(function(){
+				var self = $(this);
+
+				if ($('option', obj).length > 1) {
+					$('#filter_itemids_' + self.val()).remove();
+					self.remove();
+				}
+				else {
+					alert(<?php echo CJs::encodeJson(_('Cannot remove all items, at least one item should remain.')); ?>);
+					return false;
+				}
+			});
 		});
-	}
+
+		$('input[name="graphtype"]').change(function() {
+			var form = $(this).parents('form');
+			form.append($('<input>', {
+				type: 'hidden',
+				name: 'period',
+				value: timeControl.timeline.period()
+			}));
+			if (!timeControl.timeline.isNow()) {
+				form.append($('<input>', {
+					type: 'hidden',
+					name: 'stime',
+					value: timeControl.timeline.usertime() - timeControl.timeline.period()
+				}));
+			}
+			form.submit();
+		})
+	});
 </script>
diff --git a/frontends/php/include/views/js/monitoring.latest.js.php b/frontends/php/include/views/js/monitoring.latest.js.php
index d6a055e3ad4..aa6640cae5d 100644
--- a/frontends/php/include/views/js/monitoring.latest.js.php
+++ b/frontends/php/include/views/js/monitoring.latest.js.php
@@ -1,5 +1,6 @@
 <script type="text/javascript">
 	jQuery(function($) {
+		chkbxRange.pageGoName = "itemids";
 
 		/**
 		 * Make so that all visible table rows would alternate colors
@@ -117,5 +118,9 @@
 				toggle_open_state: openState
 			});
 		});
+
+		$('#filter_set, #filter_rst').click(function() {
+			chkbxRange.clearSelectedOnFilterChange();
+		});
 	});
 </script>
diff --git a/frontends/php/include/views/js/monitoring.slides.js.php b/frontends/php/include/views/js/monitoring.slides.js.php
index d4e34ead738..25c59b29413 100644
--- a/frontends/php/include/views/js/monitoring.slides.js.php
+++ b/frontends/php/include/views/js/monitoring.slides.js.php
@@ -6,7 +6,9 @@
 				echo CJs::encodeJson(array(
 					WIDGET_SLIDESHOW => array(
 						'frequency' => $this->data['element']['delay'] * $this->data['refreshMultiplier'],
-						'url' => 'slides.php?output=html&elementid='.$this->data['elementId'].url_param('groupid').url_param('hostid'),
+						'url' => 'slides.php?output=html&elementid='.$this->data['elementId'].
+							(isset($this->data['groupid']) ? '&groupid='.$this->data['groupid'] : '').
+							(isset($this->data['hostid']) ? '&hostid='.$this->data['hostid'] : ''),
 						'counter' => 0,
 						'darken' => 0,
 						'params' => array(
diff --git a/frontends/php/include/views/monitoring.dashconf.php b/frontends/php/include/views/monitoring.dashconf.php
index 2cebcdea4f4..b2992062cba 100644
--- a/frontends/php/include/views/monitoring.dashconf.php
+++ b/frontends/php/include/views/monitoring.dashconf.php
@@ -57,13 +57,25 @@ if ($this->data['grpswitch']) {
 		'name' => 'groupids[]',
 		'objectName' => 'hostGroup',
 		'data' => $this->data['groups'],
-		'disabled' => !$this->data['isFilterEnable']
+		'disabled' => !$this->data['isFilterEnable'],
+		'popup' => array(
+			'parameters' => 'srctbl=host_groups&dstfrm='.$dashconfForm->getName().'&dstfld1=groupids_'.
+				'&srcfld1=groupid&multiselect=1',
+			'width' => 450,
+			'height' => 450
+		)
 	)));
 	$dashconfFormList->addRow(_('Hide selected groups'), new CMultiSelect(array(
 		'name' => 'hidegroupids[]',
 		'objectName' => 'hostGroup',
 		'data' => $this->data['hideGroups'],
-		'disabled' => !$this->data['isFilterEnable']
+		'disabled' => !$this->data['isFilterEnable'],
+		'popup' => array(
+			'parameters' => 'srctbl=host_groups&dstfrm='.$dashconfForm->getName().'&dstfld1=hidegroupids_'.
+				'&srcfld1=groupid&multiselect=1',
+			'width' => 450,
+			'height' => 450
+		)
 	)));
 }
 
diff --git a/frontends/php/include/views/monitoring.discovery.php b/frontends/php/include/views/monitoring.discovery.php
index a9fa099baa2..4b9cdb10195 100644
--- a/frontends/php/include/views/monitoring.discovery.php
+++ b/frontends/php/include/views/monitoring.discovery.php
@@ -32,12 +32,12 @@ $discoveryRulesComboBox = $this->data['pageFilter']->getDiscoveryCB();
 $discoveryHeaderForm->addItem(array(_('Discovery rule').SPACE, $discoveryRulesComboBox));
 $discoveryWidget->addHeader(_('Discovery rules'), $discoveryHeaderForm);
 
-// craete table
+// create table
 $discoveryTable = new CTableInfo(_('No discovered devices found.'));
 $discoveryTable->makeVerticalRotation();
 
 $header = array(
-	make_sorting_header(_('Discovered device'), 'ip'),
+	make_sorting_header(_('Discovered device'), 'ip', $this->data['sort'], $this->data['sortorder']),
 	new CCol(_('Monitored host'), 'left'),
 	new CCol(array(_('Uptime').'/', _('Downtime')), 'left')
 );
diff --git a/frontends/php/include/views/monitoring.history.php b/frontends/php/include/views/monitoring.history.php
index 36bb3c0a9e4..e1c9d6d3f59 100644
--- a/frontends/php/include/views/monitoring.history.php
+++ b/frontends/php/include/views/monitoring.history.php
@@ -21,63 +21,78 @@
 
 require_once dirname(__FILE__).'/js/monitoring.history.js.php';
 
-$historyWidget = new CWidget();
+$historyWidget = new CWidget(null, 'history');
 
-$header = array('left' => count($this->data['items']).SPACE._('ITEMS'), 'right' => array());
+$header = array(
+	'left' => _n('%1$s ITEM', '%1$s ITEMS', count($this->data['items'])),
+	'right' => array()
+);
 $headerPlaintext = array();
 
-if (count($this->data['items']) == 1) {
-	$header['left'] = array(new CLink($this->data['item']['hostname'], 'latest.php?hostid='.$this->data['item']['hostid']), NAME_DELIMITER, $this->data['item']['name_expanded']);
-	$headerPlaintext[] = $this->data['item']['hostname'].NAME_DELIMITER.$this->data['item']['name_expanded'];
+if ($this->data['action'] != HISTORY_BATCH_GRAPH) {
+	$item = reset($this->data['items']);
+	$host = reset($item['hosts']);
 
-	if ($this->data['action'] == 'showgraph') {
+	$header['left'] = array(
+		new CLink($host['name'], 'latest.php?filter_set=1&hostids[]='.$item['hostid']),
+		NAME_DELIMITER,
+		$item['name_expanded']
+	);
+	$headerPlaintext[] = $host['name'].NAME_DELIMITER.$item['name_expanded'];
+
+	if ($this->data['action'] == HISTORY_GRAPH) {
 		$header['right'][] = get_icon('favourite', array(
 			'fav' => 'web.favorite.graphids',
-			'elid' => $this->data['item']['itemid'],
+			'elid' => $item['itemid'],
 			'elname' => 'itemid'
 		));
 	}
 }
 
-$header['right'][] = SPACE;
+$header['right'][] = ' ';
 $header['right'][] = get_icon('fullscreen', array('fullscreen' => $this->data['fullscreen']));
 
-// append action form to header
-$actionForm = new CForm('get');
-$actionForm->addVar('itemid', $_REQUEST['itemid']);
+// don't display the action form if we view multiple items on a graph
+if ($this->data['action'] != HISTORY_BATCH_GRAPH) {
+	$actionForm = new CForm('get');
+	$actionForm->addVar('itemids', getRequest('itemids'));
 
-if (isset($_REQUEST['filter_task'])) {
-	$actionForm->addVar('filter_task', $_REQUEST['filter_task']);
-}
-if (isset($_REQUEST['filter'])) {
-	$actionForm->addVar('filter', $_REQUEST['filter']);
-}
-if (isset($_REQUEST['mark_color'])) {
-	$actionForm->addVar('mark_color', $_REQUEST['mark_color']);
-}
+	if (isset($_REQUEST['filter_task'])) {
+		$actionForm->addVar('filter_task', $_REQUEST['filter_task']);
+	}
+	if (isset($_REQUEST['filter'])) {
+		$actionForm->addVar('filter', $_REQUEST['filter']);
+	}
+	if (isset($_REQUEST['mark_color'])) {
+		$actionForm->addVar('mark_color', $_REQUEST['mark_color']);
+	}
 
-$actionComboBox = new CComboBox('action', $this->data['action'], 'submit()');
-if (isset($this->data['iv_numeric'][$this->data['item']['value_type']])) {
-	$actionComboBox->addItem('showgraph', _('Graph'));
-}
-$actionComboBox->addItem('showvalues', _('Values'));
-$actionComboBox->addItem('showlatest', _('500 latest values'));
-$actionForm->addItem($actionComboBox);
+	$actionComboBox = new CComboBox('action', $this->data['action'], 'submit()');
+	if (isset($this->data['iv_numeric'][$this->data['value_type']])) {
+		$actionComboBox->addItem(HISTORY_GRAPH, _('Graph'));
+	}
+	$actionComboBox->addItem(HISTORY_VALUES, _('Values'));
+	$actionComboBox->addItem(HISTORY_LATEST, _('500 latest values'));
+	$actionForm->addItem($actionComboBox);
 
-if ($this->data['action'] != 'showgraph') {
-	$actionForm->addItem(array(SPACE, new CSubmit('plaintext', _('As plain text'))));
-}
+	if ($this->data['action'] != HISTORY_GRAPH) {
+		$actionForm->addItem(array(' ', new CSubmit('plaintext', _('As plain text'))));
+	}
 
-array_unshift($header['right'], $actionForm, SPACE);
+	array_unshift($header['right'], $actionForm, ' ');
+}
 
 // create filter
-if ($this->data['action'] == 'showvalues' || $this->data['action'] == 'showlatest') {
-	if (isset($this->data['iv_string'][$this->data['item']['value_type']])) {
+if ($this->data['action'] == HISTORY_VALUES || $this->data['action'] == HISTORY_LATEST) {
+	if (isset($this->data['iv_string'][$this->data['value_type']])) {
 		$filterForm = new CFormTable(null, null, 'get');
+		$filterForm->setTableClass('formtable old-filter');
 		$filterForm->setAttribute('name', 'zbx_filter');
 		$filterForm->setAttribute('id', 'zbx_filter');
 		$filterForm->addVar('action', $this->data['action']);
-		$filterForm->addVar('itemid', zbx_toHash($_REQUEST['itemid']));
+		foreach (getRequest('itemids') as $itemId) {
+			$filterForm->addVar('itemids[]', $itemId, 'filter_itemids_'.$itemId);
+		}
 
 		$itemListbox = new CListBox('cmbitemlist[]');
 		$itemsData = array();
@@ -98,17 +113,17 @@ if ($this->data['action'] == 'showvalues' || $this->data['action'] == 'showlates
 		}
 
 		$addItemButton = new CButton('add_log', _('Add'), "return PopUp('popup.php?multiselect=1&real_hosts=1".
-				'&reference=itemid&srctbl=items&value_types[]='.$this->data['item']['value_type']."&srcfld1=itemid');");
+				'&reference=itemid&srctbl=items&value_types[]='.$this->data['value_type']."&srcfld1=itemid');");
 		$deleteItemButton = null;
 
 		if (count($this->data['items']) > 1) {
-			$deleteItemButton = new CSubmit('remove_log', _('Remove selected'), "javascript: removeSelectedItems('cmbitemlist_', 'itemid')");
+			$deleteItemButton = new CSubmit('remove_log', _('Remove selected'));
 		}
 
 		$filterForm->addRow(_('Items list'), array($itemListbox, BR(), $addItemButton, $deleteItemButton));
-		$filterForm->addRow(_('Select rows with value like'), new CTextBox('filter', get_request('filter', ''), ZBX_TEXTBOX_FILTER_SIZE));
+		$filterForm->addRow(_('Select rows with value like'), new CTextBox('filter', getRequest('filter', ''), ZBX_TEXTBOX_FILTER_SIZE));
 
-		$filterTask = get_request('filter_task', 0);
+		$filterTask = getRequest('filter_task', 0);
 
 		$taskComboBox = new CComboBox('filter_task', $filterTask, 'submit()');
 		$taskComboBox->addItem(FILTER_TASK_SHOW, _('Show selected'));
@@ -118,12 +133,12 @@ if ($this->data['action'] == 'showvalues' || $this->data['action'] == 'showlates
 		$tasks = array($taskComboBox);
 
 		if (str_in_array($filterTask, array(FILTER_TASK_MARK, FILTER_TASK_INVERT_MARK))) {
-			$colorComboBox = new CComboBox('mark_color', get_request('mark_color', 0));
+			$colorComboBox = new CComboBox('mark_color', getRequest('mark_color', 0));
 			$colorComboBox->addItem(MARK_COLOR_RED, _('as Red'));
 			$colorComboBox->addItem(MARK_COLOR_GREEN, _('as Green'));
 			$colorComboBox->addItem(MARK_COLOR_BLUE, _('as Blue'));
 
-			$tasks[] = SPACE;
+			$tasks[] = ' ';
 			$tasks[] = $colorComboBox;
 		}
 
@@ -132,21 +147,33 @@ if ($this->data['action'] == 'showvalues' || $this->data['action'] == 'showlates
 	}
 }
 
+// for batch graphs don't remember the time selection in the profiles
+if ($this->data['action'] == HISTORY_BATCH_GRAPH) {
+	$profileIdx = false;
+	$profileIdx2 = false;
+	$updateProfile = false;
+}
+else {
+	$profileIdx = 'web.item.graph';
+	$profileIdx2 = reset($this->data['itemids']);
+	$updateProfile = ($this->data['action'] != HISTORY_BATCH_GRAPH);
+}
+
 // create history screen
 $screen = CScreenBuilder::getScreen(array(
 	'resourcetype' => SCREEN_RESOURCE_HISTORY,
 	'action' => $this->data['action'],
 	'items' => $this->data['items'],
-	'item' => $this->data['item'],
-	'itemids' => $this->data['itemids'],
-	'profileIdx' => 'web.item.graph',
-	'profileIdx2' => reset($this->data['itemids']),
+	'profileIdx' => $profileIdx,
+	'profileIdx2' => $profileIdx2,
+	'updateProfile' => $updateProfile,
 	'period' => $this->data['period'],
 	'stime' => $this->data['stime'],
-	'filter' => get_request('filter'),
-	'filter_task' => get_request('filter_task'),
-	'mark_color' => get_request('mark_color'),
-	'plaintext' => $this->data['plaintext']
+	'filter' => getRequest('filter'),
+	'filter_task' => getRequest('filter_task'),
+	'mark_color' => getRequest('mark_color'),
+	'plaintext' => $this->data['plaintext'],
+	'graphtype' => $this->data['graphtype']
 ));
 
 // append plaintext to widget
@@ -154,28 +181,26 @@ if ($this->data['plaintext']) {
 	$plaintextSpan = new CSpan(null, 'textblackwhite');
 
 	foreach ($headerPlaintext as $text) {
-		$plaintextSpan->addItem(array(new CJSscript($text), BR()));
+		$plaintextSpan->addItem(array(new CJsScript($text), BR()));
 	}
 
 	$screen = $screen->get();
 
 	$pre = new CTag('pre', true);
 	foreach ($screen as $text) {
-		$pre->addItem(new CJSscript($text));
+		$pre->addItem(new CJsScript($text));
 	}
 	$plaintextSpan->addItem($pre);
 	$historyWidget->addItem($plaintextSpan);
 }
-
-// append graph to widget
 else {
 	$right = new CTable();
 	$right->addRow($header['right']);
 
 	$historyWidget->addPageHeader($header['left'], $right);
-	$historyWidget->addItem(SPACE);
+	$historyWidget->addItem(BR());
 
-	if (isset($this->data['iv_string'][$this->data['item']['value_type']])) {
+	if (isset($this->data['iv_string'][$this->data['value_type']])) {
 		$historyWidget->addFlicker($filterForm, CProfile::get('web.history.filter.state', 1));
 	}
 
@@ -184,8 +209,42 @@ else {
 
 	$historyWidget->addItem($historyTable);
 
-	if ($this->data['action'] == 'showvalues' || $this->data['action'] == 'showgraph') {
-		$historyWidget->addFlicker(new CDiv(null, null, 'scrollbar_cntr'), CProfile::get('web.history.filter.state', 1));
+	if (in_array($this->data['action'], array(HISTORY_VALUES, HISTORY_GRAPH, HISTORY_BATCH_GRAPH))) {
+		// time bar
+		$filter = array(
+			new CDiv(null, null, 'scrollbar_cntr')
+		);
+
+		// display the graph type filter for graphs with multiple items
+		if ($this->data['action'] == HISTORY_BATCH_GRAPH) {
+			$filterTable = new CTable('', 'filter');
+
+			$graphType = array(
+				new CRadioButton('graphtype', GRAPH_TYPE_NORMAL, null, 'graphtype_'.GRAPH_TYPE_NORMAL,
+					($this->data['graphtype'] == GRAPH_TYPE_NORMAL)
+				),
+				new CLabel(_('Normal'), 'graphtype_'.GRAPH_TYPE_NORMAL),
+				new CRadioButton('graphtype', GRAPH_TYPE_STACKED, null, 'graphtype_'.GRAPH_TYPE_STACKED,
+					($this->data['graphtype'] == GRAPH_TYPE_STACKED)
+				),
+				new CLabel(_('Stacked'), 'graphtype_'.GRAPH_TYPE_STACKED)
+			);
+			$filterTable->addRow(array(
+				new CCol(bold(_('Graph type').':'), 'label'),
+				new CCol(new CSpan($graphType, 'jqueryinputset'), 'buttoncol')
+			));
+
+			$filterForm = new CForm('GET');
+			$filterForm->setAttribute('name', 'zbx_filter');
+			$filterForm->setAttribute('id', 'zbx_filter');
+			$filterForm->addVar('action', $this->data['action']);
+			$filterForm->addVar('itemids', $this->data['itemids']);
+			$filterForm->addItem($filterTable);
+
+			$filter[] = $filterForm;
+		}
+
+		$historyWidget->addFlicker($filter, CProfile::get('web.history.filter.state', 1));
 
 		CScreenBuilder::insertScreenStandardJs(array(
 			'timeline' => $screen->timeline,
diff --git a/frontends/php/include/views/monitoring.maps.php b/frontends/php/include/views/monitoring.maps.php
index 167a06238ff..d6ed80b728f 100644
--- a/frontends/php/include/views/monitoring.maps.php
+++ b/frontends/php/include/views/monitoring.maps.php
@@ -26,7 +26,7 @@ $mapTable->setAttribute('style', 'margin-top: 4px;');
 $icon = $fsIcon = null;
 
 if (!empty($this->data['maps'])) {
-	$mapComboBox = new CComboBox('sysmapid', get_request('sysmapid', 0), 'submit()');
+	$mapComboBox = new CComboBox('sysmapid', getRequest('sysmapid', 0), 'submit()');
 	foreach ($this->data['maps'] as $sysmapId => $map) {
 		$mapComboBox->addItem($sysmapId, $map['name']);
 	}
@@ -47,7 +47,7 @@ if (!empty($this->data['maps'])) {
 		// check for permissions
 		if (isset($this->data['maps'][$parent['sysmapid']])) {
 			$parentMaps[] = SPACE.SPACE;
-			$parentMaps[] = new Clink($parent['name'], 'maps.php?sysmapid='.$parent['sysmapid'].'&fullscreen='.$this->data['fullscreen'].'&severity_min='.$this->data['severity_min']);
+			$parentMaps[] = new CLink($parent['name'], 'maps.php?sysmapid='.$parent['sysmapid'].'&fullscreen='.$this->data['fullscreen'].'&severity_min='.$this->data['severity_min']);
 		}
 	}
 	if (!empty($parentMaps)) {
diff --git a/frontends/php/include/views/monitoring.overview.php b/frontends/php/include/views/monitoring.overview.items.php
index 88279282ecf..1b1b782439e 100644
--- a/frontends/php/include/views/monitoring.overview.php
+++ b/frontends/php/include/views/monitoring.overview.items.php
@@ -19,8 +19,6 @@
 **/
 
 
-zbx_add_post_js('jqBlink.blink();');
-
 $overviewWidget = new CWidget();
 
 $typeComboBox = new CComboBox('type', $this->data['type'], 'submit()');
@@ -29,49 +27,19 @@ $typeComboBox->addItem(SHOW_DATA, _('Data'));
 
 $headerForm = new CForm('get');
 $headerForm->addItem(array(_('Group'), SPACE, $this->data['pageFilter']->getGroupsCB()));
-$headerForm->addItem(array(SPACE, _('Application'), SPACE, $this->data['pageFilter']->getApplicationsCB()));
 $headerForm->addItem(array(SPACE, _('Type'), SPACE, $typeComboBox));
 
 $overviewWidget->addHeader(_('Overview'), $headerForm);
 
-$hintTable = new CTableInfo();
-$hintTable->setAttribute('style', 'width: 200px');
-
-if ($this->data['type'] == SHOW_TRIGGERS) {
-	$hintTable->addRow(array(new CCol(SPACE, 'normal'), _('OK')));
-}
-
+// hint table
+$hintTable = new CTableInfo(null, 'tableinfo tableinfo-overview-hint');
 for ($i = 0; $i < TRIGGER_SEVERITY_COUNT; $i++) {
 	$hintTable->addRow(array(getSeverityCell($i), _('PROBLEM')));
 }
+$hintTable->addRow(array(new CCol(SPACE), _('OK or no trigger')));
 
-$config = select_config();
-
-if ($this->data['type'] == SHOW_TRIGGERS) {
-	// blinking preview in help popup (only if blinking is enabled)
-	if ($config['blink_period'] > 0) {
-		$row = new CRow(null);
-		$row->addItem(new CCol(SPACE, 'normal'));
-		for ($i = 0; $i < TRIGGER_SEVERITY_COUNT; $i++) {
-			$row->addItem(new CCol(SPACE, getSeverityStyle($i)));
-		}
-		$col = new CTable('', 'blink overview-mon-severities');
-		$col->addRow($row);
-
-		// double div necassary for FireFox
-		$col = new CCol(new CDiv(new CDiv($col), 'overview-mon-severities-container'));
-
-		$hintTable->addRow(array($col, _s('Age less than %s', convertUnitsS($config['blink_period']))));
-	}
-
-	$hintTable->addRow(array(new CCol(SPACE), _('No trigger')));
-}
-else {
-	$hintTable->addRow(array(new CCol(SPACE), _('OK or no trigger')));
-}
-
-$help = new CHelp('web.view.php', 'right');
-$help->setHint($hintTable, '', '', true, false);
+$help = new CHelp();
+$help->setHint($hintTable);
 
 // header right
 $overviewWidget->addPageHeader(_('OVERVIEW'), array(
@@ -91,24 +59,37 @@ $hostLocationForm->additem(array(_('Hosts location'), SPACE, $styleComboBox));
 
 $overviewWidget->addHeader($hostLocationForm);
 
-if ($config['dropdown_first_entry'] || $this->data['pageFilter']->applicationsSelected) {
-	if ($this->data['type'] == SHOW_DATA) {
-		$dataTable = getItemsDataOverview(
-			array_keys($this->data['pageFilter']->hosts),
-			$this->data['pageFilter']->application,
-			$this->data['view_style']
-		);
-	}
-	elseif ($this->data['type'] == SHOW_TRIGGERS) {
-		global $page;
-
-		$dataTable = getTriggersOverview(
-			array_keys($this->data['pageFilter']->hosts),
-			$this->data['pageFilter']->application,
-			$page['file'],
-			$this->data['view_style']
-		);
-	}
+// filter
+$filterForm = new CFormTable(null, null, 'get');
+$filterForm->setTableClass('formtable old-filter');
+$filterForm->setAttribute('name', 'zbx_filter');
+$filterForm->setAttribute('id', 'zbx_filter');
+$filterForm->addVar('fullscreen', $this->data['fullscreen']);
+$filterForm->addVar('groupid', $this->data['groupid']);
+$filterForm->addVar('hostid', $this->data['hostid']);
+
+// application
+$filterForm->addRow(_('Filter by application'), array(
+	new CTextBox('application', $this->data['filter']['application'], 40),
+	new CButton('application_name', _('Select'),
+		'return PopUp("popup.php?srctbl=applications&srcfld1=name&real_hosts=1&dstfld1=application&with_applications=1'.
+		'&dstfrm='.$filterForm->getName().'");',
+		'filter-button'
+	)
+));
+
+// filter buttons
+$filterForm->addItemToBottomRow(new CSubmit('filter_set', _('Filter'), 'chkbxRange.clearSelectedOnFilterChange();'));
+$filterForm->addItemToBottomRow(new CSubmit('filter_rst', _('Reset'), 'chkbxRange.clearSelectedOnFilterChange();'));
+
+$overviewWidget->addFlicker($filterForm, CProfile::get('web.overview.filter.state', 0));
+
+// data table
+$config = select_config();
+if ($config['dropdown_first_entry']) {
+	$dataTable = getItemsDataOverview(array_keys($this->data['pageFilter']->hosts), $this->data['applicationIds'],
+		$this->data['view_style']
+	);
 }
 else {
 	$dataTable = new CTableInfo(_('No items found.'));
diff --git a/frontends/php/include/views/monitoring.overview.triggers.php b/frontends/php/include/views/monitoring.overview.triggers.php
new file mode 100644
index 00000000000..7bce3777f6e
--- /dev/null
+++ b/frontends/php/include/views/monitoring.overview.triggers.php
@@ -0,0 +1,121 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+zbx_add_post_js('jqBlink.blink();');
+
+$overviewWidget = new CWidget();
+
+$typeComboBox = new CComboBox('type', $this->data['type'], 'submit()');
+$typeComboBox->addItem(SHOW_TRIGGERS, _('Triggers'));
+$typeComboBox->addItem(SHOW_DATA, _('Data'));
+
+$headerForm = new CForm('get');
+$headerForm->addItem(array(_('Group'), SPACE, $this->data['pageFilter']->getGroupsCB()));
+$headerForm->addItem(array(SPACE, _('Type'), SPACE, $typeComboBox));
+
+$overviewWidget->addHeader(_('Overview'), $headerForm);
+
+// hint table
+$hintTable = new CTableInfo(null, 'tableinfo tableinfo-overview-hint');
+$hintTable->addRow(array(new CCol(SPACE, 'normal'), _('OK')));
+for ($i = 0; $i < TRIGGER_SEVERITY_COUNT; $i++) {
+	$hintTable->addRow(array(getSeverityCell($i), _('PROBLEM')));
+}
+
+$config = select_config();
+
+// blinking preview in help popup (only if blinking is enabled)
+if ($config['blink_period'] > 0) {
+	$row = new CRow(null);
+	$row->addItem(new CCol(SPACE, 'normal'));
+	for ($i = 0; $i < TRIGGER_SEVERITY_COUNT; $i++) {
+		$row->addItem(new CCol(SPACE, getSeverityStyle($i)));
+	}
+	$col = new CTable('', 'blink overview-mon-severities');
+	$col->addRow($row);
+
+	// double div necassary for FireFox
+	$col = new CCol(new CDiv(new CDiv($col), 'overview-mon-severities-container'));
+
+	$hintTable->addRow(array($col, _s('Age less than %s', convertUnitsS($config['blink_period']))));
+}
+
+$hintTable->addRow(array(new CCol(SPACE), _('No trigger')));
+
+$help = new CHelp();
+$help->setHint($hintTable);
+
+// header right
+$overviewWidget->addPageHeader(_('OVERVIEW'), array(
+	get_icon('fullscreen', array('fullscreen' => $this->data['fullscreen'])),
+	SPACE,
+	$help
+));
+
+// header left
+$styleComboBox = new CComboBox('view_style', $this->data['view_style'], 'submit()');
+$styleComboBox->addItem(STYLE_TOP, _('Top'));
+$styleComboBox->addItem(STYLE_LEFT, _('Left'));
+
+$hostLocationForm = new CForm('get');
+$hostLocationForm->addVar('groupid', $this->data['groupid']);
+$hostLocationForm->additem(array(_('Hosts location'), SPACE, $styleComboBox));
+
+$overviewWidget->addHeader($hostLocationForm);
+
+// filter
+$filter = $this->data['filter'];
+$filterFormView = new CView('common.filter.trigger', array(
+	'overview' => true,
+	'filter' => array(
+		'showTriggers' => $filter['showTriggers'],
+		'ackStatus' => $filter['ackStatus'],
+		'showSeverity' => $filter['showSeverity'],
+		'statusChange' => $filter['statusChange'],
+		'statusChangeDays' => $filter['statusChangeDays'],
+		'txtSelect' => $filter['txtSelect'],
+		'application' => $filter['application'],
+		'inventory' => $filter['inventory'],
+		'showMaintenance' => $filter['showMaintenance'],
+		'hostId' => $this->data['hostid'],
+		'groupId' => $this->data['groupid'],
+		'fullScreen' => $this->data['fullscreen']
+	)
+));
+$filterForm = $filterFormView->render();
+
+$overviewWidget->addFlicker($filterForm, CProfile::get('web.overview.filter.state', 0));
+
+// data table
+if ($config['dropdown_first_entry']) {
+	global $page;
+
+	$dataTable = getTriggersOverview($this->data['hosts'], $this->data['triggers'], $page['file'],
+		$this->data['view_style']
+	);
+}
+else {
+	$dataTable = new CTableInfo(_('No triggers found.'));
+}
+
+$overviewWidget->addItem($dataTable);
+
+return $overviewWidget;
diff --git a/frontends/php/include/views/monitoring.screen.php b/frontends/php/include/views/monitoring.screen.php
index 2451c61e983..0e07a3220b4 100644
--- a/frontends/php/include/views/monitoring.screen.php
+++ b/frontends/php/include/views/monitoring.screen.php
@@ -85,10 +85,10 @@ else {
 			'hosts' => array(
 				'monitored_hosts' => true,
 				'with_items' => true,
-				'DDFirstLabel' => _('Default')
+				'DDFirstLabel' => _('not selected')
 			),
-			'hostid' => get_request('hostid', null),
-			'groupid' => get_request('groupid', null)
+			'hostid' => getRequest('hostid'),
+			'groupid' => getRequest('groupid')
 		));
 		$_REQUEST['groupid'] = $pageFilter->groupid;
 		$_REQUEST['hostid'] = $pageFilter->hostid;
@@ -105,8 +105,8 @@ else {
 		'mode' => SCREEN_MODE_PREVIEW,
 		'profileIdx' => 'web.screens',
 		'profileIdx2' => $screen['screenid'],
-		'groupid' => get_request('groupid'),
-		'hostid' => get_request('hostid'),
+		'groupid' => getRequest('groupid'),
+		'hostid' => getRequest('hostid'),
 		'period' => $this->data['period'],
 		'stime' => $this->data['stime']
 	));
diff --git a/frontends/php/include/views/monitoring.slides.php b/frontends/php/include/views/monitoring.slides.php
index f162c8983c5..fc89a85f0b3 100644
--- a/frontends/php/include/views/monitoring.slides.php
+++ b/frontends/php/include/views/monitoring.slides.php
@@ -19,10 +19,6 @@
 **/
 
 
-if ($this->data['elementId']) {
-	require_once dirname(__FILE__).'/js/monitoring.slides.js.php';
-}
-
 $slideshowWidget = new CWidget('hat_slides');
 
 // create header form
@@ -110,4 +106,8 @@ else {
 	$slideshowWidget->addItem(new CTableInfo(_('No slide shows found.')));
 }
 
+if ($this->data['elementId'] && isset($this->data['element'])) {
+	require_once dirname(__FILE__).'/js/monitoring.slides.js.php';
+}
+
 return $slideshowWidget;
diff --git a/frontends/php/include/views/monitoring.triggerComment.php b/frontends/php/include/views/monitoring.triggerComment.php
index 4caba8dc1a9..f938a565f99 100644
--- a/frontends/php/include/views/monitoring.triggerComment.php
+++ b/frontends/php/include/views/monitoring.triggerComment.php
@@ -22,7 +22,7 @@
 require_once dirname(__FILE__).'/js/monitoring.triggerComment.js.php';
 
 $commentWidget = new CWidget('triggerComment');
-$commentWidget->addPageHeader(_('TRIGGER COMMENTS'));
+$commentWidget->addPageHeader(_('TRIGGER DESCRIPTION'));
 
 // create form
 $commentForm = new CForm();
@@ -36,11 +36,11 @@ $commentTextArea = new CTextArea('comments', CMacrosResolverHelper::resolveTrigg
 	'rows' => 25, 'width' => ZBX_TEXTAREA_BIG_WIDTH, 'readonly' => $this->data['isCommentExist']
 ));
 $commentTextArea->attr('autofocus', 'autofocus');
-$commentFormList->addRow(_('Comments'), $commentTextArea);
+$commentFormList->addRow(_('Description'), $commentTextArea);
 
 // append tabs to form
 $commentTab = new CTabView();
-$commentTab->addTab('commentTab', _s('Comments for "%s".', $this->data['trigger']['description']), $commentFormList);
+$commentTab->addTab('commentTab', _s('Description for "%s".', $this->data['trigger']['description']), $commentFormList);
 $commentForm->addItem($commentTab);
 
 // append buttons to form
diff --git a/frontends/php/index.php b/frontends/php/index.php
index db07f57c4d9..ddc5a060b04 100644
--- a/frontends/php/index.php
+++ b/frontends/php/index.php
@@ -63,15 +63,17 @@ if ($config['authentication_type'] == ZBX_AUTH_HTTP) {
 // login via form
 if (isset($_REQUEST['enter']) && $_REQUEST['enter'] == _('Sign in')) {
 	// try to login
+	$autoLogin = getRequest('autologin', 0);
+
 	DBstart();
 	$loginSuccess = CWebUser::login(getRequest('name', ''), getRequest('password', ''));
 	DBend(true);
 
 	if ($loginSuccess) {
 		// save remember login preference
-		$user = array('autologin' => getRequest('autologin', 0));
+		$user = array('autologin' => $autoLogin);
 
-		if (CWebUser::$data['autologin'] != $user['autologin']) {
+		if (CWebUser::$data['autologin'] != $autoLogin) {
 			API::User()->updateProfile($user);
 		}
 
@@ -90,7 +92,7 @@ if (isset($_REQUEST['enter']) && $_REQUEST['enter'] == _('Sign in')) {
 }
 else {
 	// login the user from the session, if the session id is empty - login as a guest
-	CWebUser::checkAuthentication(get_cookie('zbx_sessionid'));
+	CWebUser::checkAuthentication(CWebUser::getSessionCookie());
 }
 
 // the user is not logged in, display the login form
@@ -102,7 +104,7 @@ if (!CWebUser::$data['alias'] || CWebUser::$data['alias'] == ZBX_GUEST_USER) {
 		case ZBX_AUTH_LDAP:
 		case ZBX_AUTH_INTERNAL:
 			if (isset($_REQUEST['enter'])) {
-				$_REQUEST['autologin'] = get_request('autologin', 0);
+				$_REQUEST['autologin'] = getRequest('autologin', 0);
 			}
 
 			if ($messages = clear_messages()) {
diff --git a/frontends/php/items.php b/frontends/php/items.php
index 3c591772deb..af01a5b88ce 100644
--- a/frontends/php/items.php
+++ b/frontends/php/items.php
@@ -103,7 +103,7 @@ $fields = array(
 		'isset({save})&&isset({type})&&{type}=='.ITEM_TYPE_SNMPV3.'&&{snmpv3_securitylevel}=='.ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV),
 	'snmpv3_privpassphrase' =>	array(T_ZBX_STR, O_OPT, null,	null,
 		'isset({save})&&isset({type})&&{type}=='.ITEM_TYPE_SNMPV3.'&&{snmpv3_securitylevel}=='.ITEM_SNMPV3_SECURITYLEVEL_AUTHPRIV),
-	'ipmi_sensor' =>			array(T_ZBX_STR, O_OPT, NO_TRIM, NOT_EMPTY,
+	'ipmi_sensor' =>			array(T_ZBX_STR, O_OPT, P_NO_TRIM, NOT_EMPTY,
 		'isset({save})&&isset({type})&&{type}=='.ITEM_TYPE_IPMI, _('IPMI sensor')),
 	'trapper_hosts' =>			array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})&&isset({type})&&{type}==2'),
 	'units' =>					array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})&&isset({value_type})&&'.
@@ -125,7 +125,12 @@ $fields = array(
 	'del_history' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'add_delay_flex' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	// actions
-	'go' =>						array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+									IN('"item.massclearhistory","item.masscopyto","item.massdelete",'.
+										'"item.massdisable","item.massenable","item.massupdate"'
+									),
+									null
+								),
 	'save' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'clone' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'update' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -175,11 +180,16 @@ $fields = array(
 	'subfilter_history' =>		array(T_ZBX_INT, O_OPT, null,	null,		null),
 	'subfilter_trends' =>		array(T_ZBX_INT, O_OPT, null,	null,		null),
 	// ajax
-	'filterState' =>			array(T_ZBX_INT, O_OPT, P_ACT,	null,		null)
+	'filterState' =>			array(T_ZBX_INT, O_OPT, P_ACT,	null,		null),
+	// sort and sortorder
+	'sort' =>					array(T_ZBX_STR, O_OPT, P_SYS,
+									IN('"delay","history","key_","name","status","trends","type"'),
+									null
+								),
+	'sortorder' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
-$_REQUEST['go'] = getRequest('go', 'none');
+
 $_REQUEST['params'] = getRequest($paramsFieldName, '');
 unset($_REQUEST[$paramsFieldName]);
 
@@ -364,9 +374,12 @@ elseif (isset($_REQUEST['delete']) && isset($_REQUEST['itemid'])) {
 	if ($item = get_item_by_itemid($_REQUEST['itemid'])) {
 		$result = API::Item()->delete(array(getRequest('itemid')));
 	}
-	show_messages($result, _('Item deleted'), _('Cannot delete item'));
+
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
 	unset($_REQUEST['itemid'], $_REQUEST['form']);
-	clearCookies($result, getRequest('hostid'));
+	show_messages($result, _('Item deleted'), _('Cannot delete item'));
 }
 elseif (isset($_REQUEST['clone']) && isset($_REQUEST['itemid'])) {
 	unset($_REQUEST['itemid']);
@@ -429,7 +442,7 @@ elseif (isset($_REQUEST['save'])) {
 			'snmpv3_authpassphrase' => getRequest('snmpv3_authpassphrase'),
 			'snmpv3_privprotocol' => getRequest('snmpv3_privprotocol'),
 			'snmpv3_privpassphrase' => getRequest('snmpv3_privpassphrase'),
-			'formula' => getRequest('formula'),
+			'formula' => getRequest('formula', '1'),
 			'trends' => getRequest('trends'),
 			'logtimefmt' => getRequest('logtimefmt'),
 			'valuemapid' => getRequest('valuemapid'),
@@ -473,7 +486,7 @@ elseif (isset($_REQUEST['save'])) {
 
 	$result = DBend($result);
 
-	if (isset($_REQUEST['itemid'])) {
+	if (hasRequest('itemid')) {
 		show_messages($result, _('Item updated'), _('Cannot update item'));
 	}
 	else {
@@ -482,7 +495,7 @@ elseif (isset($_REQUEST['save'])) {
 
 	if ($result) {
 		unset($_REQUEST['itemid'], $_REQUEST['form']);
-		clearCookies($result, getRequest('hostid'));
+		uncheckTableRows(getRequest('hostid'));
 	}
 }
 // cleaning history for one item
@@ -503,8 +516,8 @@ elseif (isset($_REQUEST['del_history']) && isset($_REQUEST['itemid'])) {
 	}
 
 	$result = DBend($result);
+
 	show_messages($result, _('History cleared'), _('Cannot clear history'));
-	clearCookies($result, getRequest('hostid'));
 }
 // mass update
 elseif (isset($_REQUEST['update']) && isset($_REQUEST['massupdate']) && isset($_REQUEST['group_itemid'])) {
@@ -526,14 +539,22 @@ elseif (isset($_REQUEST['update']) && isset($_REQUEST['massupdate']) && isset($_
 		$db_delay_flex = null;
 	}
 
-	if (!is_null(getRequest('formula', null))) {
-		$_REQUEST['multiplier'] = 1;
+	$formula = getRequest('formula');
+	if ($formula === null) {
+		// no changes to formula/multiplier
+		$multiplier = null;
 	}
-	if (getRequest('formula', null) === '0') {
-		$_REQUEST['multiplier'] = 0;
+	elseif ($formula === '0') {
+		// for mass update "magic" value '0' means that multiplier must be disabled and formula set to default value '1'
+		$multiplier = 0;
+		$formula = '1';
+	}
+	else {
+		// otherwise multiplier must be enabled with formula value entered by user
+		$multiplier = 1;
 	}
 
-	$applications = getRequest('applications', null);
+	$applications = getRequest('applications');
 	if (isset($applications[0]) && $applications[0] == '0') {
 		$applications = array();
 	}
@@ -600,7 +621,7 @@ elseif (isset($_REQUEST['update']) && isset($_REQUEST['massupdate']) && isset($_
 			'trapper_hosts' => getRequest('trapper_hosts'),
 			'port' => getRequest('port'),
 			'units' => getRequest('units'),
-			'multiplier' => getRequest('multiplier'),
+			'multiplier' => $multiplier,
 			'delta' => getRequest('delta'),
 			'snmpv3_contextname' => getRequest('snmpv3_contextname'),
 			'snmpv3_securityname' => getRequest('snmpv3_securityname'),
@@ -609,7 +630,7 @@ elseif (isset($_REQUEST['update']) && isset($_REQUEST['massupdate']) && isset($_
 			'snmpv3_authpassphrase' => getRequest('snmpv3_authpassphrase'),
 			'snmpv3_privprotocol' => getRequest('snmpv3_privprotocol'),
 			'snmpv3_privpassphrase' => getRequest('snmpv3_privpassphrase'),
-			'formula' => getRequest('formula'),
+			'formula' => $formula,
 			'trends' => getRequest('trends'),
 			'logtimefmt' => getRequest('logtimefmt'),
 			'valuemapid' => getRequest('valuemapid'),
@@ -659,21 +680,24 @@ elseif (isset($_REQUEST['update']) && isset($_REQUEST['massupdate']) && isset($_
 
 	$result = DBend($result);
 
-	show_messages($result, _('Items updated'), _('Cannot update items'));
-
 	if ($result) {
 		unset($_REQUEST['group_itemid'], $_REQUEST['massupdate'], $_REQUEST['update'], $_REQUEST['form']);
-		clearCookies($result, getRequest('hostid'));
+		uncheckTableRows(getRequest('hostid'));
 	}
+	show_messages($result, _('Items updated'), _('Cannot update items'));
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('group_itemid')) {
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('item.massenable', 'item.massdisable')) && hasRequest('group_itemid')) {
 	$groupItemId = getRequest('group_itemid');
-	$enable = (getRequest('go') == 'activate');
+	$enable = (getRequest('action') == 'item.massenable');
 
 	DBstart();
 	$result = $enable ? activate_item($groupItemId) : disable_item($groupItemId);
 	$result = DBend($result);
 
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
+
 	$updated = count($groupItemId);
 
 	$messageSuccess = $enable
@@ -684,9 +708,8 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		: _n('Cannot disable item', 'Cannot disable items', $updated);
 
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, getRequest('hostid'));
 }
-elseif (getRequest('go') == 'copy_to' && hasRequest('copy') && hasRequest('group_itemid')) {
+elseif (hasRequest('action') && getRequest('action') == 'item.masscopyto' && hasRequest('copy') && hasRequest('group_itemid')) {
 	if (hasRequest('copy_targetid') && getRequest('copy_targetid') > 0 && hasRequest('copy_type')) {
 		// hosts or templates
 		if (getRequest('copy_type') == COPY_TYPE_TO_HOST || getRequest('copy_type') == COPY_TYPE_TO_TEMPLATE) {
@@ -710,26 +733,26 @@ elseif (getRequest('go') == 'copy_to' && hasRequest('copy') && hasRequest('group
 
 		DBstart();
 
-		$goResult = copyItemsToHosts(getRequest('group_itemid'), $hosts_ids);
-		$goResult = DBend($goResult);
+		$result = copyItemsToHosts(getRequest('group_itemid'), $hosts_ids);
+		$result = DBend($result);
 
-		show_messages($goResult, _('Items copied'), _('Cannot copy items'));
-		clearCookies($goResult, getRequest('hostid'));
-
-		$_REQUEST['go'] = 'none2';
+		if ($result) {
+			uncheckTableRows(getRequest('hostid'));
+			unset($_REQUEST['group_itemid']);
+		}
+		show_messages($result, _('Items copied'), _('Cannot copy items'));
 	}
 	else {
 		show_error_message(_('No target selected.'));
 	}
 }
 // clean history for selected items
-elseif ($_REQUEST['go'] == 'clean_history' && isset($_REQUEST['group_itemid'])) {
+elseif (hasRequest('action') && getRequest('action') == 'item.massclearhistory' && hasRequest('group_itemid')) {
 	DBstart();
 
-	$goResult = delete_history_by_itemid($_REQUEST['group_itemid']);
+	$result = delete_history_by_itemid(getRequest('group_itemid'));
 
-
-	foreach ($_REQUEST['group_itemid'] as $id) {
+	foreach (getRequest('group_itemid') as $id) {
 		if (!$item = get_item_by_itemid($id)) {
 			continue;
 		}
@@ -739,15 +762,17 @@ elseif ($_REQUEST['go'] == 'clean_history' && isset($_REQUEST['group_itemid']))
 		);
 	}
 
-	$goResult = DBend($goResult);
+	$result = DBend($result);
 
-	show_messages($goResult, _('History cleared'), $goResult);
-	clearCookies($goResult, getRequest('hostid'));
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
+	show_messages($result, _('History cleared'), $result);
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['group_itemid'])) {
+elseif (hasRequest('action') && getRequest('action') == 'item.massdelete' && hasRequest('group_itemid')) {
 	DBstart();
 
-	$group_itemid = $_REQUEST['group_itemid'];
+	$group_itemid = getRequest('group_itemid');
 
 	$itemsToDelete = API::Item()->get(array(
 		'output' => array('key_', 'itemid'),
@@ -768,8 +793,11 @@ elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['group_itemid'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
 	show_messages($result, _('Items deleted'), _('Cannot delete items'));
-	clearCookies($result, getRequest('hostid'));
 }
 
 /*
@@ -806,7 +834,7 @@ if (isset($_REQUEST['form']) && str_in_array($_REQUEST['form'], array(_('Create
 	$itemView->render();
 	$itemView->show();
 }
-elseif ($_REQUEST['go'] == 'massupdate' || isset($_REQUEST['massupdate']) && isset($_REQUEST['group_itemid'])) {
+elseif ((hasRequest('action') && getRequest('action') == 'item.massupdate') || hasRequest('massupdate') && hasRequest('group_itemid')) {
 	$data = array(
 		'form' => getRequest('form'),
 		'hostid' => getRequest('hostid'),
@@ -927,20 +955,29 @@ elseif ($_REQUEST['go'] == 'massupdate' || isset($_REQUEST['massupdate']) && iss
 	$itemView->render();
 	$itemView->show();
 }
-elseif (getRequest('go') == 'copy_to' && hasRequest('group_itemid')) {
+elseif (hasRequest('action') && getRequest('action') == 'item.masscopyto' && hasRequest('group_itemid')) {
 	// render view
-	$graphView = new CView('configuration.copy.elements', getCopyElementsFormData('group_itemid', _('CONFIGURATION OF ITEMS')));
+	$data = getCopyElementsFormData('group_itemid', _('CONFIGURATION OF ITEMS'));
+	$data['action'] = 'item.masscopyto';
+	$graphView = new CView('configuration.copy.elements', $data);
 	$graphView->render();
 	$graphView->show();
 }
 // list of items
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$_REQUEST['hostid'] = empty($_REQUEST['filter_hostid']) ? null : $_REQUEST['filter_hostid'];
 
 	$data = array(
 		'form' => getRequest('form'),
 		'hostid' => getRequest('hostid'),
-		'sortfield' => getPageSortField('name')
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
 	// items
@@ -957,7 +994,7 @@ else {
 		'selectApplications' => API_OUTPUT_EXTEND,
 		'selectDiscoveryRule' => API_OUTPUT_EXTEND,
 		'selectItemDiscovery' => array('ts_delete'),
-		'sortfield' => $data['sortfield'],
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit'] + 1
 	);
 	$preFilter = count($options, COUNT_RECURSIVE);
@@ -1028,12 +1065,12 @@ else {
 		$options['filter']['ipmi_sensor'] = $_REQUEST['filter_ipmi_sensor'];
 	}
 
-	$afterFilter = count($options, COUNT_RECURSIVE);
-	if (empty($options['hostids']) && $preFilter == $afterFilter) {
-		$data['items'] = array();
+	$data['filterSet'] = ($options['hostids'] || $preFilter != count($options, COUNT_RECURSIVE));
+	if ($data['filterSet']) {
+		$data['items'] = API::Item()->get($options);
 	}
 	else {
-		$data['items'] = API::Item()->get($options);
+		$data['items'] = array();
 	}
 
 	// set values for subfilters, if any of subfilters = false then item shouldnt be shown
@@ -1156,14 +1193,14 @@ else {
 		}
 	}
 
-	if ($data['sortfield'] === 'status') {
-		orderItemsByStatus($data['items'], getPageSortOrder());
+	if ($sortField === 'status') {
+		orderItemsByStatus($data['items'], $sortOrder);
 	}
 	else {
-		order_result($data['items'], $data['sortfield'], getPageSortOrder());
+		order_result($data['items'], $sortField, $sortOrder);
 	}
 
-	$data['paging'] = getPagingLine($data['items'], array('itemid'));
+	$data['paging'] = getPagingLine($data['items']);
 
 	$itemTriggerIds = array();
 	foreach ($data['items'] as $item) {
diff --git a/frontends/php/js/chkbxrange.js b/frontends/php/js/chkbxrange.js
new file mode 100644
index 00000000000..cac959103f8
--- /dev/null
+++ b/frontends/php/js/chkbxrange.js
@@ -0,0 +1,326 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+/*
+ * Automatic checkbox range selection
+ */
+var chkbxRange = {
+	startbox:		null,	// start checkbox obj
+	chkboxes:		{},		// ckbx list
+	prefix:			null,	// prefix for cookie name
+	pageGoName:		null,	// which checkboxes should be counted by Go button and saved to cookies
+	selectedIds:	{},		// ids of selected objects
+	goButton:		null,
+	cookieName:		null,
+
+	init: function() {
+		// cookie name
+		var path = new Curl();
+		var filename = basename(path.getPath(), '.php');
+		this.cookieName = 'cb_' + filename + (this.prefix ? '_' + this.prefix : '');
+
+		this.resetOtherPageCookies();
+
+		// initialize checkboxes
+		var chkboxes = jQuery('.tableinfo .checkbox:not(:disabled)');
+		if (chkboxes.length > 0) {
+			for (var i = 0; i < chkboxes.length; i++) {
+				this.implement(chkboxes[i]);
+			}
+		}
+
+		// load selected checkboxes from cookies or cache
+		if (this.pageGoName != null) {
+			this.selectedIds = cookie.readJSON(this.cookieName);
+
+			// check if checkboxes should be selected from cookies
+			if (!jQuery.isEmptyObject(this.selectedIds)) {
+				var objectIds = jQuery.map(this.selectedIds, function(id) { return id });
+			}
+			// no checkboxes selected from cookies, check browser cache if checkboxes are still checked and update state
+			else {
+				var checkedFromCache = jQuery('.tableinfo tr:not(.header) .checkbox:checked:not(:disabled)');
+				var objectIds = jQuery.map(checkedFromCache, jQuery.proxy(function(checkbox) {
+					return this.getObjectIdFromName(checkbox.name);
+				}, this));
+			}
+
+			this.checkObjects(this.pageGoName, objectIds, true);
+			this.update(this.pageGoName);
+		}
+
+		// bind event to the "Go" button
+		this.goButton = $('goButton');
+		if (!is_null(this.goButton)) {
+			addListener(this.goButton, 'click', this.submitGo.bindAsEventListener(this), false);
+		}
+	},
+
+	implement: function(obj) {
+		// skip the "select all" checkbox
+		if (obj.name.indexOf('all_') > -1) {
+			return;
+		}
+
+		var objName = this.getObjectFromName(obj.name);
+
+		if (typeof(this.chkboxes[objName]) === 'undefined') {
+			this.chkboxes[objName] = [];
+		}
+		this.chkboxes[objName].push(obj);
+
+		addListener(obj, 'click', this.handleClick.bindAsEventListener(this), false);
+
+		if (objName == this.pageGoName) {
+			var objId = jQuery(obj).val();
+			if (isset(objId, this.selectedIds)) {
+				obj.checked = true;
+			}
+		}
+	},
+
+	/**
+	 * Handles a click on one of the checkboxes.
+	 *
+	 * @param e
+	 */
+	handleClick: function(e) {
+		e = e || window.event;
+		var checkbox = Event.element(e);
+
+		PageRefresh.restart();
+
+		var object = this.getObjectFromName(checkbox.name);
+		var objectId = this.getObjectIdFromName(checkbox.name);
+
+		// range selection
+		if ((e.ctrlKey || e.shiftKey) && this.startbox != null) {
+			this.checkObjectRange(object, this.startbox, checkbox, this.startbox.checked);
+		}
+		// an individual checkbox
+		else {
+			this.checkObjects(object, [objectId], checkbox.checked);
+		}
+
+		this.update(object);
+		this.saveCookies(object);
+
+		this.startbox = checkbox;
+	},
+
+	/**
+	 * Extracts the name of an object from the name of a checkbox.
+	 *
+	 * @param {string} name
+	 *
+	 * @returns {string}
+	 */
+	getObjectFromName: function(name) {
+		return name.split('[')[0];
+	},
+
+	/**
+	 * Extracts the ID of an object from the name of a checkbox.
+	 *
+	 * @param {string} name
+	 *
+	 * @returns {string}
+	 */
+	getObjectIdFromName: function(name) {
+		var id = name.split('[')[1];
+		id = id.substring(0, id.lastIndexOf(']'));
+
+		return id;
+	},
+
+	/**
+	 * Toggle all checkboxes of the given objects.
+	 *
+	 * Checks all of the checkboxes that belong to these objects and highlights the table row.
+	 *
+	 * @param {string}  object
+	 * @param {Array}   objectIds     array of objects IDs as integers
+	 * @param {bool}    checked
+	 */
+	checkObjects: function(object, objectIds, checked) {
+		jQuery.each(this.chkboxes[object], jQuery.proxy(function(i, checkbox) {
+			var objectId = this.getObjectIdFromName(checkbox.name);
+
+			if (objectIds.indexOf(objectId) > -1) {
+				checkbox.checked = checked;
+
+				jQuery(checkbox).closest('tr').toggleClass('selected', checked);
+
+				if (checked) {
+					this.selectedIds[objectId] = objectId;
+				}
+				else {
+					delete this.selectedIds[objectId];
+				}
+			}
+		}, this));
+	},
+
+	/**
+	 * Toggle all objects between the two checkboxes.
+	 *
+	 * @param {string} object
+	 * @param {object} startCheckbox
+	 * @param {object} endCheckbox
+	 * @param {bool} checked
+	 */
+	checkObjectRange: function(object, startCheckbox, endCheckbox, checked) {
+		var checkboxes = this.chkboxes[object];
+
+		var startCheckboxIndex = checkboxes.indexOf(startCheckbox);
+		var endCheckboxIndex = checkboxes.indexOf(endCheckbox);
+		var start = Math.min(startCheckboxIndex, endCheckboxIndex);
+		var end = Math.max(startCheckboxIndex, endCheckboxIndex);
+
+		var objectIds = [];
+		for (var i = start; i <= end; i++) {
+			objectIds.push(this.getObjectIdFromName(checkboxes[i].name));
+		}
+		this.checkObjects(object, objectIds, checked);
+
+	},
+
+	/**
+	 * Toggle all of the checkboxes belonging to the given object group.
+	 *
+	 * @param {string} object
+	 *
+	 * @param {bool} checked
+	 */
+	checkObjectAll: function(object, checked) {
+		// main checkbox exists and is clickable, but other checkboxes may not exist and object may be empty
+		if (typeof this.chkboxes[object] !== 'undefined') {
+			var objectIds = jQuery.map(this.chkboxes[object], jQuery.proxy(function(checkbox) {
+				return this.getObjectIdFromName(checkbox.name);
+			}, this));
+
+			this.checkObjects(object, objectIds, checked);
+		}
+	},
+
+	/**
+	 * Update the general state after toggling a checkbox.
+	 *
+	 * @param {string} object
+	 */
+	update: function(object) {
+		// update main checkbox state
+		this.updateMainCheckbox();
+
+		if (this.pageGoName == object) {
+			this.updateGoButton();
+		}
+	},
+
+	/**
+	 * Update the state of the "Go" controls.
+	 */
+	updateGoButton: function() {
+		var count = 0;
+		jQuery.each(this.selectedIds, function() {
+			count++;
+		});
+
+		// update go button
+		var goButton = jQuery('#goButton');
+		goButton.val(goButton.val().split(' ')[0] + ' (' + count + ')')
+			.prop('disabled', count == 0);
+		jQuery('#action').prop('disabled', count == 0);
+	},
+
+	// check if all checkboxes are selected and select main checkbox, else disable checkbox, select options and button
+	updateMainCheckbox: function() {
+		var mainCheckbox = jQuery('.tableinfo .header .checkbox:not(:disabled)');
+		if (!mainCheckbox.length) {
+			return;
+		}
+
+		var countAvailable = jQuery('.tableinfo tr:not(.header) .checkbox:not(:disabled)').length;
+
+		if (countAvailable > 0) {
+			var countChecked = jQuery('.tableinfo tr:not(.header) .checkbox:not(:disabled):checked').length;
+
+			mainCheckbox = mainCheckbox[0];
+			mainCheckbox.checked = (countChecked == countAvailable);
+
+			if (mainCheckbox.checked) {
+				jQuery('.tableinfo .header').addClass('selectedMain');
+			}
+			else {
+				jQuery('.tableinfo .header').removeClass('selectedMain');
+			}
+		}
+		else {
+			mainCheckbox.disabled = true;
+		}
+	},
+
+	/**
+	 * Save the state of the checkboxes belonging to the given object group in cookies.
+	 *
+	 * @param {string} object
+	 */
+	saveCookies: function(object) {
+		if (this.pageGoName == object) {
+			cookie.createJSON(this.cookieName, this.selectedIds);
+		}
+	},
+
+	clearSelectedOnFilterChange: function() {
+		cookie.eraseArray(this.cookieName);
+	},
+
+	/**
+	 * Reset all selections on other pages.
+	 */
+	resetOtherPageCookies: function() {
+		for (var key in cookie.cookies) {
+			var cookiePair = key.split('=');
+			if (cookiePair[0].indexOf('cb_') > -1 && cookiePair[0].indexOf(this.cookieName) == -1) {
+				cookie.erase(key);
+			}
+		}
+	},
+
+	submitGo: function(e) {
+		e = e || window.event;
+
+		var goSelect = $('go');
+		var confirmText = goSelect.options[goSelect.selectedIndex].getAttribute('confirm');
+
+		if (!is_null(confirmText) && !confirm(confirmText)) {
+			Event.stop(e);
+			return false;
+		}
+
+		var form = jQuery('#goButton').closest('form');
+		for (var key in this.selectedIds) {
+			if (!empty(this.selectedIds[key])) {
+				create_var(form.name, this.pageGoName + '[' + key + ']', key, false);
+			}
+		}
+		return true;
+	}
+};
diff --git a/frontends/php/js/class.cdate.js b/frontends/php/js/class.cdate.js
index 25e4b240da2..5201ae69f36 100644
--- a/frontends/php/js/class.cdate.js
+++ b/frontends/php/js/class.cdate.js
@@ -52,7 +52,8 @@ CDate.prototype = {
 
 	/**
 	* Formats date according given format. Uses server timezone.
-	* Supported formats: 'd M Y H:i', 'j. M Y G:i', 'Y/m/d H:i', 'M jS, Y h:i A', 'Y M d H:i', 'd.m.Y H:i'
+	* Supported formats:	'd M Y H:i', 'j. M Y G:i', 'Y/m/d H:i', 'Y-m-d H:i', 'Y-m-d H:i:s', 'Y-m-d', 'H:i:s', 'H:i',
+	*						'M jS, Y h:i A', 'Y M d H:i', 'd.m.Y H:i'
 	*
 	* @param format PHP style date format limited to supported formats
 	*
@@ -65,7 +66,8 @@ CDate.prototype = {
 			mnth = this.getMonth(),
 			yr = this.getFullYear(),
 			hrs = this.getHours(),
-			mnts = this.getMinutes();
+			mnts = this.getMinutes(),
+			sec = this.getSeconds();
 
 		/**
 		 * Transform datetime parts to two digits e.g., 2 becomes 02
@@ -77,7 +79,7 @@ CDate.prototype = {
 		}
 
 		/**
-		 * Append date suffix according to english rules e.g., 3 becomes 3rd
+		 * Append date suffix according to English rules e.g., 3 becomes 3rd
 		 * @param int date
 		 * @return string
 		 */
@@ -101,6 +103,14 @@ CDate.prototype = {
 				return dt + '. ' + shortMn[mnth] + ' ' + yr + ' ' + hrs + ':' + appZr(mnts);
 			case 'Y/m/d H:i':
 				return yr + '/' + appZr(mnth + 1) + '/' + appZr(dt) + ' ' + appZr(hrs) + ':' + appZr(mnts);
+			case 'Y-m-d H:i':
+				return yr + '-' + appZr(mnth + 1) + '-' + appZr(dt) + ' ' + appZr(hrs) + ':' + appZr(mnts);
+			case 'Y-m-d':
+				return yr + '-' + appZr(mnth + 1) + '-' + appZr(dt);
+			case 'H:i:s':
+				return  appZr(hrs) + ':' + appZr(mnts) + ':' + appZr(sec);
+			case 'H:i':
+				return  appZr(hrs) + ':' + appZr(mnts);
 			case 'M jS, Y h:i A':
 				var ampm = (hrs < 12) ? 'AM' : 'PM';
 				hrs = appZr((hrs + 11) % 12 + 1);
@@ -109,9 +119,13 @@ CDate.prototype = {
 				return  yr + ' ' + shortMn[mnth] + ' ' +appZr(dt) + ' ' + appZr(hrs) + ':' + appZr(mnts);
 			case 'd.m.Y H:i':
 				return appZr(dt) + '.' + appZr(mnth + 1) + '.' + yr + ' ' + appZr(hrs) + ':' + appZr(mnts);
+			case 'd. m. Y H:i':
+				return appZr(dt) + '. ' + appZr(mnth + 1) + '. ' + yr + ' ' + appZr(hrs) + ':' + appZr(mnts);
+			default:
+				// defaults to Y-m-d H:i:s
+				return yr + '-' + appZr(mnth + 1) + '-' + appZr(dt) + ' ' + appZr(hrs) + ':' + appZr(mnts) +
+					':' + appZr(sec);
 		}
-
-		return false;
 	},
 
 	getZBXDate: function() {
diff --git a/frontends/php/js/class.cmap.js b/frontends/php/js/class.cmap.js
index 30e8055f8d2..bc522dd7d92 100644
--- a/frontends/php/js/class.cmap.js
+++ b/frontends/php/js/class.cmap.js
@@ -150,6 +150,13 @@ ZABBIX.apps.map = (function($) {
 				});
 			}
 
+			// for some reason IE8 does not catch clicks if there is no background color and alpha opacity is 0
+			if (IE8) {
+				this.container.css({
+					backgroundColor: 'white'
+				});
+			}
+
 			if (IE || GK) {
 				this.base64image = false;
 				this.mapimg = $('#sysmap_img');
@@ -488,30 +495,15 @@ ZABBIX.apps.map = (function($) {
 				$('#elementType').change(function() {
 					var obj = $(this);
 
-					// clean element id and name
 					switch (obj.val()) {
 						// host
 						case '0':
-							$('#elementNameHost').multiSelectHelper({
-								objectName: 'hosts',
-								name: 'elementValue',
-								selectedLimit: 1,
-								objectOptions: {
-									editable: true
-								}
-							});
+							jQuery('#elementNameHost').multiSelect('clean');
 							break;
 
 						// host group
 						case '3':
-							$('#elementNameHostGroup').multiSelectHelper({
-								objectName: 'hostGroup',
-								name: 'elementValue',
-								selectedLimit: 1,
-								objectOptions: {
-									editable: true
-								}
-							});
+							jQuery('#elementNameHostGroup').multiSelect('clean');
 							break;
 
 						// others types
@@ -560,11 +552,11 @@ ZABBIX.apps.map = (function($) {
 
 				// application selection pop up
 				$('#application-select').click(function() {
-					var data = $('elementNameHost').multiSelect.getData();
+					var data = $('#elementNameHost').multiSelect('getData');
 
 					PopUp('popup.php?srctbl=applications&srcfld1=name&real_hosts=1&dstfld1=application'
 						+ '&with_applications=1&dstfrm=selementForm'
-						+ ((data.length > 0) ? '&hostid='+ data[0].id : ''),
+						+ ((data.length > 0 && $('#elementType').val() == '4') ? '&hostid='+ data[0].id : ''),
 						450, 450
 					);
 				});
@@ -704,6 +696,9 @@ ZABBIX.apps.map = (function($) {
 						this.massForm.hide();
 						$('#link-connect-to').show();
 						this.form.show();
+
+						// resize multiselect
+						$('.multiselect').multiSelect('resize');
 					}
 
 					// multiple elements selected
@@ -1268,13 +1263,47 @@ ZABBIX.apps.map = (function($) {
 					});
 			}
 
+			// hosts
+			$('#elementNameHost').multiSelectHelper({
+				id: 'elementNameHost',
+				objectName: 'hosts',
+				name: 'elementValue',
+				selectedLimit: 1,
+				objectOptions: {
+					editable: true
+				},
+				popup: {
+					parameters: 'srctbl=hosts&dstfrm=selementForm&dstfld1=elementNameHost' +
+						'&srcfld1=hostid&writeonly=1',
+					width: 450,
+					height: 450
+				}
+			});
+
+			// host group
+			$('#elementNameHostGroup').multiSelectHelper({
+				id: 'elementNameHostGroup',
+				objectName: 'hostGroup',
+				name: 'elementValue',
+				selectedLimit: 1,
+				objectOptions: {
+					editable: true
+				},
+				popup: {
+					parameters: 'srctbl=host_groups&dstfrm=selementForm&dstfld1=elementNameHostGroup' +
+						'&srcfld1=groupid&writeonly=1',
+					width: 450,
+					height: 450
+				}
+			});
+
 			this.actionProcessor = new ActionProcessor(formActions);
 			this.actionProcessor.process();
 		}
 
 		SelementForm.prototype = {
 			/**
-			 * Shows lement form.
+			 * Shows element form.
 			 */
 			show: function() {
 				this.formContainer.draggable('option', 'handle', '#formDragHandler');
@@ -1353,34 +1382,26 @@ ZABBIX.apps.map = (function($) {
 					$('#use_iconmap').prop('disabled', true);
 				}
 
-				// set element id and name
-				switch (selement.elementtype) {
-					// host
-					case '0':
-						$('#elementNameHost').multiSelectHelper({
-							objectName: 'hosts',
-							name: 'elementValue',
-							data: [{id: selement.elementid, name: selement.elementName}],
-							selectedLimit: 1,
-							objectOptions: {
-								editable: true
-							}
-						});
-						break;
+				// set multiselect values
+				if (selement.elementtype == 0 || selement.elementtype == 3) {
+					var item = {
+						'id': selement.elementid,
+						'name': selement.elementName
+					};
 
-					// host group
-					case '3':
-						$('#elementNameHostGroup').multiSelectHelper({
-							objectName: 'hostGroup',
-							name: 'elementValue',
-							data: [{id: selement.elementid, name: selement.elementName}],
-							selectedLimit: 1,
-							objectOptions: {
-								editable: true
-							}
-						});
-						break;
+					switch (selement.elementtype) {
+						// host
+						case '0':
+							$('#elementNameHost').multiSelect('addData', item);
+							break;
+
+						// host group
+						case '3':
+							$('#elementNameHostGroup').multiSelect('addData', item);
+							break;
+					}
 				}
+
 			},
 
 			/**
@@ -1417,7 +1438,7 @@ ZABBIX.apps.map = (function($) {
 				switch (data.elementtype) {
 					// host
 					case '0':
-						var elementData = $('#elementNameHost').multiSelect.getData();
+						var elementData = $('#elementNameHost').multiSelect('getData');
 
 						if (empty(elementData)) {
 							data.elementid = '0';
@@ -1431,7 +1452,7 @@ ZABBIX.apps.map = (function($) {
 
 					// host group
 					case '3':
-						var elementData = $('#elementNameHostGroup').multiSelect.getData();
+						var elementData = $('#elementNameHostGroup').multiSelect('getData');
 
 						if (empty(elementData)) {
 							data.elementid = '0';
@@ -2040,17 +2061,3 @@ ZABBIX.apps.map = (function($) {
 		}
 	};
 }(jQuery));
-
-/**
- * Function that is executed by popup.php to ass selected values to destination.
- * It uses a sysmap global variable that created in sysmap.php file via 'var sysmap = ZABBIX.apps.map.run();'
- *
- * @param list link triggers selected in popup
- * @param {String} list.object name of objects which we returned
- * @param {Array} list.values list of link triggers
- */
-function addPopupValues(list) {
-	if (list.object === 'linktrigger') {
-		ZABBIX.apps.map.object.linkForm.addNewTriggers(list.values);
-	}
-}
diff --git a/frontends/php/js/class.cookie.js b/frontends/php/js/class.cookie.js
index 3220e7367e6..3730dc0e682 100644
--- a/frontends/php/js/class.cookie.js
+++ b/frontends/php/js/class.cookie.js
@@ -22,19 +22,11 @@ var cookie = {
 	prefix:	null,
 
 	init: function() {
-		var path = new Curl();
-		var filename = basename(path.getPath(), '.php');
-		var cookieName = 'cb_' + filename + (this.prefix ? '_' + this.prefix : '');
 		var allCookies = document.cookie.split('; ');
 
 		for (var i = 0; i < allCookies.length; i++) {
 			var cookiePair = allCookies[i].split('=');
-			if (cookiePair[0].indexOf('cb_') > -1 && cookiePair[0].indexOf(cookieName) == -1) {
-				this.erase(cookiePair[0]);
-			}
-			else {
-				this.cookies[cookiePair[0]] = cookiePair[1];
-			}
+			this.cookies[cookiePair[0]] = cookiePair[1];
 		}
 	},
 
@@ -145,7 +137,7 @@ var cookie = {
 			list_part = this.read(name + '_' + part);
 			part++;
 		}
-		var range = list.split(',');
+		var range = (list != '') ? list.split(',') : [];
 		return range;
 	},
 
@@ -166,10 +158,6 @@ var cookie = {
 	},
 
 	eraseArray: function(name) {
-		if (name.indexOf('cb_') != 0) {
-			name = 'cb_' + name;
-		}
-
 		var partCount = parseInt(this.read(name + '_parts'), 10);
 
 		if (!is_null(partCount)) {
diff --git a/frontends/php/js/common.js b/frontends/php/js/common.js
index 19167878e86..b0f12d5d73b 100644
--- a/frontends/php/js/common.js
+++ b/frontends/php/js/common.js
@@ -24,6 +24,12 @@ function isset(key, obj) {
 	return (is_null(key) || is_null(obj)) ? false : (typeof(obj[key]) != 'undefined');
 }
 
+/**
+ * @deprecated  use strict comparison instead
+ *
+ * @param obj
+ * @returns {*}
+ */
 function empty(obj) {
 	if (is_null(obj)) {
 		return true;
@@ -41,6 +47,12 @@ function empty(obj) {
 	return is_array(obj) && obj.length == 0;
 }
 
+/**
+ * @deprecated use === null instead
+ *
+ * @param obj
+ * @returns {boolean}
+ */
 function is_null(obj) {
 	return (obj == null);
 }
@@ -169,7 +181,9 @@ function checkAll(form_name, chkMain, shkName) {
 	var frmForm = document.forms[form_name];
 	var value = frmForm.elements[chkMain].checked;
 
-	chkbxRange.checkAll(shkName, value);
+	chkbxRange.checkObjectAll(shkName, value);
+	chkbxRange.update(shkName);
+	chkbxRange.saveCookies(shkName);
 
 	return true;
 }
@@ -286,18 +300,6 @@ function getDimensions(obj, trueSide) {
 	return dim;
 }
 
-function getParent(obj, name) {
-	if (obj.parentNode.nodeName.toLowerCase() == name.toLowerCase()) {
-		return obj.parentNode;
-	}
-	else if (obj.parentNode.nodeName.toLowerCase() == 'body') {
-		return null;
-	}
-	else {
-		return getParent(obj.parentNode, name);
-	}
-}
-
 function getPosition(obj) {
 	obj = $(obj);
 	var pos = {top: 0, left: 0};
diff --git a/frontends/php/js/flickerfreescreen.js b/frontends/php/js/flickerfreescreen.js
index 46e5ea32bb2..b7da46b82fa 100644
--- a/frontends/php/js/flickerfreescreen.js
+++ b/frontends/php/js/flickerfreescreen.js
@@ -146,6 +146,16 @@ jQuery(function($) {
 				this.refreshProfile(id, ajaxUrl);
 			}
 
+			// SCREEN_RESOURCE_LLD_GRAPH
+			else if (screen.resourcetype == 20) {
+				this.refreshProfile(id, ajaxUrl);
+			}
+
+			// SCREEN_RESOURCE_LLD_SIMPLE_GRAPH
+			else if (screen.resourcetype == 19) {
+				this.refreshProfile(id, ajaxUrl);
+			}
+
 			// SCREEN_RESOURCE_PLAIN_TEXT
 			else if (screen.resourcetype == 3) {
 				if (isSelfRefresh || this.isRefreshAllowed(screen)) {
@@ -390,7 +400,7 @@ jQuery(function($) {
 		},
 
 		getCalculatedSTime: function(screen) {
-			if (!empty(timeControl.timeline) && screen.timeline.period >= timeControl.timeline.maxperiod) {
+			if (!empty(timeControl.timeline) && screen.timeline.period > timeControl.timeline.maxperiod) {
 				return new CDate(timeControl.timeline.starttime() * 1000).getZBXDate();
 			}
 
diff --git a/frontends/php/js/functions.js b/frontends/php/js/functions.js
index f081aaf0f6e..751bd4f256b 100644
--- a/frontends/php/js/functions.js
+++ b/frontends/php/js/functions.js
@@ -17,184 +17,6 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-// trigger log expression
-var logexpr_count = 0;
-var key_count = 0;
-
-function nextObject(n) {
-	var t = n.parentNode.tagName;
-	do {
-		n = n.nextSibling;
-	} while (n && n.nodeType != 1 && n.parentNode.tagName == t);
-
-	return n;
-}
-
-function previousObject(p) {
-	var t = p.parentNode.tagName;
-	do {
-		p = p.previousSibling;
-	} while (p && p.nodeType != 1 && p.parentNode.tagName == t);
-
-	return p;
-}
-
-function add_logexpr() {
-	var REGEXP_EXCLUDE = 1;
-	try {
-		var expr = document.getElementById('logexpr');
-		var expr_t = document.getElementById('expr_type');
-		var bt_and = document.getElementById('add_key_and');
-		var bt_or = document.getElementById('add_key_or');
-		var iregexp = document.getElementById('iregexp');
-	}
-	catch(e) {
-		throw('Error: ' + (IE ? e.description : e));
-	}
-
-	var ex = bt_and.disabled ? '|' : '&';
-	var ex_v = bt_and.disabled ? ' OR ' : ' AND ';
-	if (expr_t.value == REGEXP_EXCLUDE) {
-		ex = bt_and.disabled ? '&' : '|';
-	}
-
-	var expression = '';
-	var expr_v = '';
-	var lp;
-	for (lp = 0; lp < key_count; lp++) {
-		var key = document.getElementsByName('keys[' + lp + '][value]')[0];
-		var typ = document.getElementsByName('keys[' + lp + '][type]')[0];
-		if (typeof(key) != 'undefined' && typeof(typ) != 'undefined') {
-			if (expression != '') {
-				expression += ex;
-				expr_v += ex_v;
-			}
-			expression += typ.value + '(' + key.value + ')';
-			expr_v += typ.value + '(' + key.value + ')';
-			remove_keyword('keytr' + lp);
-		}
-	}
-
-	if (typeof(expr.value) != 'undefined' && expr.value != '') {
-		if (expression != '') {
-			expression += ex;
-			expr_v += ex_v;
-		}
-		expression += iregexp.checked ? 'iregexp' : 'regexp';
-		expression += '(' + expr.value + ')';
-		expr_v += iregexp.checked ? 'iregexp' : 'regexp';
-		expr_v += '(' + expr.value + ')';
-	}
-
-	if (expression == '') {
-		return false;
-	}
-
-	var classattr = IE ? 'className' : 'class';
-
-	var tr = document.createElement('tr');
-	document.getElementById('exp_list').firstChild.appendChild(tr);
-
-	tr.setAttribute(classattr, 'even_row');
-	tr.setAttribute('id', 'logtr' + logexpr_count);
-
-	var td = document.createElement('td');
-	tr.appendChild(td);
-	td.appendChild(document.createTextNode(expr_v));
-
-	jQuery(td).append(jQuery('<input>', {
-		name: 'expressions[' + logexpr_count + '][value]',
-		type: 'hidden',
-		value: expression
-	}));
-
-	jQuery(td).append(jQuery('<input>', {
-		name: 'expressions[' + logexpr_count + '][view]',
-		type: 'hidden',
-		value: expr_v
-	}));
-
-	var td = document.createElement('td');
-	tr.appendChild(td);
-
-	td.appendChild(document.createTextNode(expr_t.options[expr_t.selectedIndex].text));
-
-	jQuery(td).append(jQuery('<input>', {
-		name: 'expressions[' + logexpr_count + '][type]',
-		type: 'hidden',
-		value: expr_t.value
-	}));
-
-	// optional
-	var td = document.createElement('td');
-	tr.appendChild(td);
-
-	td.setAttribute(IE ? 'cssText' : 'style', 'white-space: nowrap;');
-
-	var img = document.createElement('img');
-	img.setAttribute('src', 'images/general/arrow_up.png');
-	img.setAttribute('border', '0');
-	img.setAttribute('alt', 'up');
-
-	var url = document.createElement('a');
-	url.setAttribute('href', 'javascript: element_up("logtr' + logexpr_count + '");');
-	url.setAttribute(classattr, 'action');
-	url.appendChild(img);
-
-	td.appendChild(url);
-	td.appendChild(document.createTextNode(' '));
-
-	var img = document.createElement('img');
-	img.setAttribute('src', 'images/general/arrow_down.png');
-	img.setAttribute('border', '0');
-	img.setAttribute('alt', 'down');
-
-	var url = document.createElement('a');
-	url.setAttribute('href', 'javascript: element_down("logtr' + logexpr_count + '");');
-	url.setAttribute(classattr, 'action');
-	url.appendChild(img);
-
-	td.appendChild(url);
-
-	var td = document.createElement('td');
-	tr.appendChild(td);
-
-	var url = document.createElement('a');
-	url.setAttribute('href', 'javascript: if (confirm("' + locale['S_DELETE_EXPRESSION_Q'] + '")) { remove_expression("logtr' + logexpr_count + '"); }');
-	url.setAttribute(classattr, 'action');
-	url.appendChild(document.createTextNode(locale['S_DELETE']));
-
-	td.appendChild(url);
-
-	logexpr_count++;
-	expr.value = '';
-	expr_t.selectedIndex=0;
-	bt_and.disabled = false;
-	bt_or.disabled = false;
-}
-
-function remove_expression(expr_id) {
-	var expr_tr = document.getElementById(expr_id);
-	var id = getIdFromNodeId(expr_id);
-	if (is_number(id)) {
-		var elm_v = document.getElementsByName('expressions[' + id + '][value]')[0];
-		var elm_t = document.getElementsByName('expressions[' + id + '][type]')[0];
-		var elm_s = document.getElementsByName('expressions[' + id + '][view]')[0];
-
-		if (typeof(elm_v) != 'undefined') {
-			elm_v.parentNode.removeChild(elm_v);
-		}
-		if (typeof(elm_t) != 'undefined') {
-			elm_t.parentNode.removeChild(elm_t);
-		}
-		if (typeof(elm_s) != 'undefined') {
-			elm_s.parentNode.removeChild(elm_s);
-		}
-	}
-	if (typeof(expr_tr) != 'undefined') {
-		expr_tr.parentNode.removeChild(expr_tr);
-	}
-}
 
 function getIdFromNodeId(id) {
 	if (typeof(id) == 'string') {
@@ -207,225 +29,6 @@ function getIdFromNodeId(id) {
 	return null;
 }
 
-function element_up(elementid) {
-	var c_obj = document.getElementById(elementid);
-	var p_obj = c_obj.parentNode;
-
-	if (typeof(p_obj) == 'undefined') {
-		return null;
-	}
-
-	var c2_obj = previousObject(c_obj);
-	if (c2_obj && c2_obj.id.length > 0) {
-		swapNodes(c2_obj, c_obj);
-		swapNodesNames(c2_obj, c_obj);
-	}
-}
-
-function element_down(elementid) {
-	var c_obj = document.getElementById(elementid);
-	var p_obj = c_obj.parentNode;
-
-	if (typeof(p_obj) == 'undefined') {
-		return null;
-	}
-
-	var c2_obj = nextObject(c_obj);
-	if (c2_obj && c2_obj.id.length > 0) {
-		swapNodes(c_obj, c2_obj);
-		swapNodesNames(c_obj, c2_obj);
-	}
-}
-
-function swapNodes(n1, n2) {
-	var p1, p2, b;
-
-	if ((p1 = n1.parentNode) && (p2 = n2.parentNode)) {
-		b = nextObject(n2);
-		if (n1 == b) {
-			return;
-		}
-
-		p1.replaceChild(n2, n1); // new, old
-		if (b) {
-			// n1 - the node which we insert
-			// b - the node before which we insert
-			p2.insertBefore(n1, b);
-		}
-		else {
-			p2.appendChild(n1);
-		}
-	}
-}
-
-function swapNodesNames(n1, n2) {
-	var id1 = n1.id;
-	var id2 = n2.id;
-	if (is_string(id1) && is_string(id2)) {
-		var reg = /logtr([0-9])/i;
-		id1 = parseInt(id1.replace(reg, '$1'));
-		id2 = parseInt(id2.replace(reg, '$1'));
-	}
-
-	if (is_number(id1) && is_number(id2)) {
-		var elm = [];
-		elm[0] = document.getElementsByName('expressions[' + id1 + '][value]')[0];
-		elm[1] = document.getElementsByName('expressions[' + id1 + '][type]')[0];
-		elm[2] = document.getElementsByName('expressions[' + id1 + '][view]')[0];
-		elm[3] = document.getElementsByName('expressions[' + id2 + '][value]')[0];
-		elm[4] = document.getElementsByName('expressions[' + id2 + '][type]')[0];
-		elm[5] = document.getElementsByName('expressions[' + id2 + '][view]')[0];
-
-		swapNodes(elm[0], elm[3]);
-		swapNodes(elm[1], elm[4]);
-		swapNodes(elm[2], elm[5]);
-
-		return true;
-	}
-	return false;
-}
-
-function closeForm(page) {
-	try {
-		// set header confirmation message to opener
-		var msg = IE ? document.getElementById('page_msg').innerText : document.getElementById('page_msg').textContent;
-		window.opener.location.replace(page + '?msg=' + encodeURI(msg));
-	}
-	catch (e) {
-		throw(e);
-	}
-
-	if (IE) {
-		// close current popup after 1s, wait when opener window is refreshed (IE7 issue)
-		window.setTimeout(function() { window.self.close(); }, 1000);
-	}
-	else {
-		window.self.close();
-	}
-}
-
-function add_keyword(bt_type) {
-	try {
-		var expr = document.getElementById('logexpr');
-		var iregexp = document.getElementById('iregexp');
-		var cb = document.getElementById(bt_type == 'and' ? 'add_key_or' : 'add_key_and');
-	}
-	catch(e) {
-		throw('Error: ' + (IE ? e.description : e));
-	}
-
-	if (typeof(expr.value) == 'undefined' || expr.value == '') {
-		return false;
-	}
-
-	cb.disabled = true;
-
-	var classattr = IE ? 'className' : 'class';
-
-	var tr = document.createElement('tr');
-	document.getElementById('key_list').firstChild.appendChild(tr);
-
-	tr.setAttribute(classattr, 'even_row');
-	tr.setAttribute('id', 'keytr' + key_count);
-
-	// keyword
-	var td = document.createElement('td');
-	tr.appendChild(td);
-
-	td.appendChild(document.createTextNode(expr.value));
-
-	var input = IE ? document.createElement('<input name="keys[' + key_count + '][value]" />') : document.createElement('input');
-	input.setAttribute('type', 'hidden');
-	input.setAttribute('value', expr.value);
-	!IE ? input.setAttribute('name', 'keys[' + key_count + '][value]') : '';
-
-	td.appendChild(input);
-
-	// type
-	var td = document.createElement('td');
-	tr.appendChild(td);
-
-	td.appendChild(document.createTextNode(iregexp.checked ? 'iregexp' : 'regexp'));
-
-	var input = IE ? document.createElement('<input name="keys[' + key_count + '][type]" />') : document.createElement('input');
-	input.setAttribute('type', 'hidden');
-	input.setAttribute('value', iregexp.checked ? 'iregexp' : 'regexp');
-	!IE ? input.setAttribute('name', 'keys[' + key_count + '][type]') : '';
-
-	td.appendChild(input);
-
-	// delete
-	var td = document.createElement('td');
-	tr.appendChild(td);
-
-	var url = document.createElement('a');
-	url.setAttribute('href', 'javascript: if(confirm("' + locale['S_DELETE_KEYWORD_Q'] + '")) remove_keyword("keytr' + key_count + '");');
-	url.setAttribute(classattr, 'action');
-	url.appendChild(document.createTextNode(locale['S_DELETE']));
-
-	td.appendChild(url);
-
-	key_count++;
-	expr.value = '';
-}
-
-function add_keyword_and() {
-	add_keyword('and');
-}
-
-function add_keyword_or() {
-	add_keyword('or');
-}
-
-function getIdFromNodeKeyId(id) {
-	if (typeof(id) == 'string') {
-		var reg = /keytr([0-9])/i;
-		id = parseInt(id.replace(reg, '$1'));
-	}
-	if (typeof(id) == 'number') {
-		return id;
-	}
-	return null;
-}
-
-function remove_keyword(key_id) {
-	var key_tr = document.getElementById(key_id);
-	var id = getIdFromNodeKeyId(key_id);
-	if (is_number(id)) {
-		var elm_v = document.getElementsByName('keys[' + id + '][value]')[0];
-		var elm_t = document.getElementsByName('keys[' + id + '][type]')[0];
-
-		if (typeof(elm_v) == 'undefined') {
-			elm_v.parentNode.removeChild(elm_v);
-		}
-		if (typeof(elm_t) == 'undefined') {
-			elm_t.parentNode.removeChild(elm_t);
-		}
-	}
-	if (typeof(key_tr) != 'undefined') {
-		key_tr.parentNode.removeChild(key_tr);
-	}
-
-	var lp;
-	var bData = false;
-	for (lp = 0; lp < key_count; lp++) {
-		var elm_v = document.getElementsByName('keys[' + lp + '][value]')[0];
-		if (typeof(elm_v) != 'undefined') {
-			bData = true;
-		}
-	}
-	if (!bData) {
-		var bt_and = document.getElementById('add_key_and');
-		var bt_or = document.getElementById('add_key_or');
-		if (typeof(bt_and) != 'undefined') {
-			bt_and.disabled = false;
-		}
-		if (typeof(bt_or) != 'undefined') {
-			bt_or.disabled = false;
-		}
-	}
-}
-
 function check_target(e) {
 	var targets = document.getElementsByName('expr_target_single');
 	for (var i = 0; i < targets.length; ++i) {
diff --git a/frontends/php/js/init.js b/frontends/php/js/init.js
index 03f806805b1..eeb58cbadcb 100644
--- a/frontends/php/js/init.js
+++ b/frontends/php/js/init.js
@@ -113,9 +113,43 @@ jQuery(function($) {
 		return false;
 	});
 
+	/*
+	 * add.popup event
+	 *
+	 * Call multiselect method 'addData' if parent was multiselect, execute addPopupValues function
+	 * or just update input field value
+	 *
+	 * @param object data
+	 * @param string data.object   object name
+	 * @param array  data.values   values
+	 * @param string data.parentId parent id
+	 */
+	$(document).on('add.popup', function(e, data) {
+		// multiselect check
+		if ($('#' + data.parentId).hasClass('multiselect')) {
+			for (var i = 0; i < data.values.length; i++) {
+				if (typeof data.values[i].id !== 'undefined') {
+					var item = {
+						'id': data.values[i].id,
+						'name': data.values[i].name,
+						'prefix': data.values[i].prefix
+					};
+					jQuery('#' + data.parentId).multiSelect('addData', item);
+				}
+			}
+		}
+		else if (typeof addPopupValues !== 'undefined') {
+			// execute function if they exist
+			addPopupValues(data);
+		}
+		else {
+			jQuery('#' + data.parentId).val(data.values[0].name);
+		}
+	});
+
 	// create jquery buttons
 	$('input.jqueryinput').button();
-	$('div.jqueryinputset').buttonset();
+	$('.jqueryinputset').buttonset();
 
 	createPlaceholders();
 });
diff --git a/frontends/php/js/main.js b/frontends/php/js/main.js
index f281774333c..438224def83 100644
--- a/frontends/php/js/main.js
+++ b/frontends/php/js/main.js
@@ -150,277 +150,6 @@ var MMenu = {
 };
 
 /*
- * Automatic checkbox range selection
- */
-var chkbxRange = {
-	startbox:		null,	// start checkbox obj
-	startboxName:	null,	// start checkbox name
-	chkboxes:		{},		// ckbx list
-	prefix:			null,	// prefix for cookie name
-	pageGoName:		null,	// which checkboxes should be counted by Go button
-	pageGoCount:	0,		// selected checkboxes
-	selectedIds:	{},		// ids of selected checkboxes
-	goButton:		null,
-	cookieName:		null,
-
-	init: function() {
-		var path = new Curl();
-		var filename = basename(path.getPath(), '.php');
-		this.cookieName = 'cb_' + filename + (this.prefix ? '_' + this.prefix : '');
-		this.selectedIds = cookie.readJSON(this.cookieName);
-
-		var chkboxes = jQuery('.tableinfo .checkbox:not(:disabled)');
-		if (chkboxes.length > 0) {
-			for (var i = 0; i < chkboxes.length; i++) {
-				this.implement(chkboxes[i]);
-			}
-		}
-
-		this.selectMainCheckbox();
-
-		this.goButton = $('goButton');
-		if (!is_null(this.goButton)) {
-			addListener(this.goButton, 'click', this.submitGo.bindAsEventListener(this), false);
-		}
-
-		this.setGo();
-	},
-
-	implement: function(obj) {
-		var objName = obj.name.split('[')[0];
-
-		if (typeof(this.chkboxes[objName]) === 'undefined') {
-			this.chkboxes[objName] = [];
-		}
-		this.chkboxes[objName].push(obj);
-
-		addListener(obj, 'click', this.check.bindAsEventListener(this), false);
-
-		if (objName == this.pageGoName) {
-			var objId = jQuery(obj).val();
-			if (isset(objId, this.selectedIds)) {
-				obj.checked = true;
-			}
-		}
-	},
-
-	// check if all checkboxes are selected and select main checkbox, else disable checkbox, select options and button
-	selectMainCheckbox: function() {
-		var mainCheckbox = jQuery('.tableinfo .header .checkbox:not(:disabled)');
-		if (!mainCheckbox.length) {
-			return;
-		}
-
-		var countAvailable = jQuery('.tableinfo tr:not(.header) .checkbox:not(:disabled)').length;
-
-		if (countAvailable > 0) {
-			var countChecked = jQuery('.tableinfo tr:not(.header) .checkbox:not(:disabled):checked').length;
-
-			mainCheckbox = mainCheckbox[0];
-			mainCheckbox.checked = (countChecked == countAvailable);
-
-			if (mainCheckbox.checked) {
-				jQuery('.tableinfo .header').addClass('selectedMain');
-			}
-			else {
-				jQuery('.tableinfo .header').removeClass('selectedMain');
-			}
-		}
-		else {
-			mainCheckbox.disabled = true;
-		}
-	},
-
-	check: function(e) {
-		e = e || window.event;
-		var obj = Event.element(e);
-
-		PageRefresh.restart();
-
-		if (typeof(obj) === 'undefined' || obj.type.toLowerCase() != 'checkbox' || obj.disabled === true) {
-			return true;
-		}
-
-		this.setGo();
-
-		if (obj.name.indexOf('all_') > -1 || obj.name.indexOf('_single') > -1) {
-			return true;
-		}
-		var objName = obj.name.split('[')[0];
-
-		// check range selection
-		if (e.ctrlKey || e.shiftKey) {
-			if (!is_null(this.startbox) && this.startboxName == objName && obj.name != this.startbox.name) {
-				var chkboxes = this.chkboxes[objName];
-				var flag = false;
-
-				for (var i = 0; i < chkboxes.length; i++) {
-					if (typeof(chkboxes[i]) !== 'undefined') {
-						if (flag) {
-							chkboxes[i].checked = this.startbox.checked;
-						}
-						if (obj.name == chkboxes[i].name) {
-							break;
-						}
-						if (this.startbox.name == chkboxes[i].name) {
-							flag = true;
-						}
-					}
-				}
-
-				if (flag) {
-					this.setGo();
-					this.selectMainCheckbox();
-					return true;
-				}
-				else {
-					for (var i = chkboxes.length - 1; i >= 0; i--) {
-						if (typeof(chkboxes[i]) !== 'undefined') {
-							if (flag) {
-								chkboxes[i].checked = this.startbox.checked;
-							}
-
-							if (obj.name == chkboxes[i].name) {
-								this.setGo();
-								this.selectMainCheckbox();
-								return true;
-							}
-
-							if (this.startbox.name == chkboxes[i].name) {
-								flag = true;
-							}
-						}
-					}
-				}
-			}
-
-			this.setGo();
-		}
-		else {
-			this.selectMainCheckbox();
-		}
-
-		this.startbox = obj;
-		this.startboxName = objName;
-	},
-
-	checkAll: function(name, value) {
-		if (typeof(this.chkboxes[name]) === 'undefined') {
-			return false;
-		}
-
-		var chkboxes = this.chkboxes[name];
-		for (var i = 0; i < chkboxes.length; i++) {
-			if (typeof(chkboxes[i]) !== 'undefined' && chkboxes[i].disabled !== true) {
-				var objName = chkboxes[i].name.split('[')[0];
-				if (objName == name) {
-					chkboxes[i].checked = value;
-				}
-			}
-		}
-
-		var mainCheckbox = jQuery('.tableinfo .header .checkbox:not(:disabled)')[0];
-		if (mainCheckbox.checked) {
-			jQuery('.tableinfo .header').addClass('selectedMain');
-		}
-		else {
-			jQuery('.tableinfo .header').removeClass('selectedMain');
-		}
-	},
-
-	clearSelectedOnFilterChange: function() {
-		cookie.eraseArray(this.cookieName);
-	},
-
-	setGo: function() {
-		if (!is_null(this.pageGoName)) {
-			if (typeof(this.chkboxes[this.pageGoName]) !== 'undefined') {
-				var chkboxes = this.chkboxes[this.pageGoName];
-				for (var i = 0; i < chkboxes.length; i++) {
-					if (typeof(chkboxes[i]) !== 'undefined') {
-						var box = chkboxes[i];
-						var objName = box.name.split('[')[0];
-						var objId = box.name.split('[')[1];
-						objId = objId.substring(0, objId.lastIndexOf(']'));
-						var crow = getParent(box, 'tr');
-
-						if (box.checked) {
-							if (!is_null(crow)) {
-								var origClass = crow.getAttribute('origClass');
-								if (is_null(origClass)) {
-									crow.setAttribute('origClass', crow.className);
-								}
-								crow.className = 'selected';
-							}
-							if (objName == this.pageGoName) {
-								this.selectedIds[objId] = objId;
-							}
-						}
-						else {
-							if (!is_null(crow)) {
-								var origClass = crow.getAttribute('origClass');
-
-								if (!is_null(origClass)) {
-									crow.className = origClass;
-									crow.removeAttribute('origClass');
-								}
-							}
-							if (objName == this.pageGoName) {
-								delete(this.selectedIds[objId]);
-							}
-						}
-					}
-				}
-
-			}
-
-			var countChecked = 0;
-			for (var key in this.selectedIds) {
-				if (!empty(this.selectedIds[key])) {
-					countChecked++;
-				}
-			}
-
-			if (!is_null(this.goButton)) {
-				var tmp_val = this.goButton.value.split(' ');
-				this.goButton.value = tmp_val[0] + ' (' + countChecked + ')';
-			}
-
-			cookie.createJSON(this.cookieName, this.selectedIds);
-
-			if (jQuery('#go').length) {
-				jQuery('#go')[0].disabled = (countChecked == 0);
-			}
-			if (jQuery('#goButton').length) {
-				jQuery('#goButton')[0].disabled = (countChecked == 0);
-			}
-
-			this.pageGoCount = countChecked;
-		}
-	},
-
-	submitGo: function(e) {
-		e = e || window.event;
-
-		var goSelect = $('go');
-		var confirmText = goSelect.options[goSelect.selectedIndex].getAttribute('confirm');
-
-		if (!is_null(confirmText) && !confirm(confirmText)) {
-			Event.stop(e);
-			return false;
-		}
-
-		var form = getParent(this.goButton, 'form');
-		for (var key in this.selectedIds) {
-			if (!empty(this.selectedIds[key])) {
-				create_var(form.name, this.pageGoName + '[' + key + ']', key, false);
-			}
-		}
-		return true;
-	}
-};
-
-/*
  * Audio control system
  */
 var AudioControl = {
@@ -632,7 +361,7 @@ var jqBlink = {
  */
 var hintBox = {
 
-	createBox: function(e, target, hintText, width, className, isStatic) {
+	createBox: function(e, target, hintText, className, isStatic) {
 		var box = jQuery('<div></div>').addClass('hintbox');
 
 		if (typeof hintText === 'string') {
@@ -646,10 +375,6 @@ var hintBox = {
 			box.html(hintText);
 		}
 
-		if (!empty(width)) {
-			box.css('width', width + 'px');
-		}
-
 		if (isStatic) {
 			var close_link = jQuery('<div>' + locale['S_CLOSE'] + '</div>')
 				.addClass('link')
@@ -667,14 +392,14 @@ var hintBox = {
 		return box;
 	},
 
-	HintWraper: function(e, target, hintText, width, className) {
+	HintWraper: function(e, target, hintText, className) {
 		target.isStatic = false;
 
 		jQuery(target).on('mouseenter', function(e, d) {
 			if (d) {
 				e = d;
 			}
-			hintBox.showHint(e, target, hintText, width, className, false);
+			hintBox.showHint(e, target, hintText, className, false);
 
 		}).on('mouseleave', function(e) {
 			hintBox.hideHint(e, target);
@@ -687,13 +412,13 @@ var hintBox = {
 		jQuery(target).trigger('mouseenter', e);
 	},
 
-	showStaticHint: function(e, target, hint, width, className, resizeAfterLoad) {
+	showStaticHint: function(e, target, hint, className, resizeAfterLoad) {
 		var isStatic = target.isStatic;
 		hintBox.hideHint(e, target, true);
 
 		if (!isStatic) {
 			target.isStatic = true;
-			hintBox.showHint(e, target, hint, width, className, true);
+			hintBox.showHint(e, target, hint, className, true);
 
 			if (resizeAfterLoad) {
 				hint.one('load', function(e) {
@@ -703,12 +428,12 @@ var hintBox = {
 		}
 	},
 
-	showHint: function(e, target, hintText, width, className, isStatic) {
+	showHint: function(e, target, hintText, className, isStatic) {
 		if (target.hintBoxItem) {
 			return;
 		}
 
-		target.hintBoxItem = hintBox.createBox(e, target, hintText, width, className, isStatic);
+		target.hintBoxItem = hintBox.createBox(e, target, hintText, className, isStatic);
 		hintBox.positionHint(e, target);
 		target.hintBoxItem.show();
 	},
@@ -726,7 +451,7 @@ var hintBox = {
 			target.clientY = e.clientY;
 		}
 
-		// doesn't fit in the screen horizontaly
+		// doesn't fit in the screen horizontally
 		if (target.hintBoxItem.width() + 10 > wWidth) {
 			left = scrollLeft + 2;
 		}
@@ -752,7 +477,7 @@ var hintBox = {
 			top = scrollTop + target.clientY + 10;
 		}
 
-		// fallback if doesnt't fit verticaly but could fit if aligned to right or left
+		// fallback if doesn't fit verticaly but could fit if aligned to right or left
 		if ((top - scrollTop + target.hintBoxItem.height() > wHeight)
 				&& (target.clientX - 10 > target.hintBoxItem.width() || wWidth - target.clientX - 10 > target.hintBoxItem.width())) {
 
@@ -905,13 +630,9 @@ function changeFlickerState(id, titleWhenVisible, titleWhenHidden) {
 		}
 	});
 
-	// resize multiselect
-	if (typeof flickerResizeMultiselect === 'undefined' && state == 1) {
-		flickerResizeMultiselect = true;
-
-		if (jQuery('.multiselect').length > 0) {
-			jQuery('#' + id).multiSelect.resize();
-		}
+	// resize multiselects in the flicker
+	if (jQuery('.multiselect').length > 0 && state == 1) {
+		jQuery('.multiselect', jQuery('#' + id)).multiSelect('resize');
 	}
 }
 
@@ -961,32 +682,47 @@ function sendAjaxData(options) {
  */
 function createPlaceholders() {
 	if (IE) {
-		jQuery('[placeholder]')
-			.focus(function() {
-				var obj = jQuery(this);
+		jQuery('[placeholder]').each(function() {
+			var placeholder = jQuery(this);
 
-				if (obj.val() == obj.attr('placeholder')) {
-					obj.val('');
-					obj.removeClass('placeholder');
-				}
-			})
-			.blur(function() {
-				var obj = jQuery(this);
+			if (!placeholder.data('has-placeholder-handlers')) {
+				placeholder
+					.data('has-placeholder-handlers', true)
+					.focus(function() {
+						var obj = jQuery(this);
 
-				if (obj.val() == '' || obj.val() == obj.attr('placeholder')) {
-					obj.val(obj.attr('placeholder'));
-					obj.addClass('placeholder');
-				}
-			})
-			.blur();
+						if (!obj.attr('placeholder')) {
+							return;
+						}
 
-		jQuery('form').submit(function() {
-			jQuery('.placeholder').each(function() {
-				var obj = jQuery(this);
+						if (obj.val() == obj.attr('placeholder')) {
+							obj.val('');
+							obj.removeClass('placeholder');
+						}
+					})
+					.blur(function() {
+						var obj = jQuery(this);
 
-				if (obj.val() == obj.attr('placeholder')) {
-					obj.val('');
-				}
+						if (!obj.attr('placeholder')) {
+							return;
+						}
+
+						if (obj.val() == '' ||  obj.val() == obj.attr('placeholder')) {
+							obj.val(obj.attr('placeholder'));
+							obj.addClass('placeholder');
+						}
+					})
+					.blur();
+			}
+
+			jQuery('form').submit(function() {
+				jQuery('.placeholder').each(function() {
+					var obj = jQuery(this);
+
+					if (obj.val() == obj.attr('placeholder')) {
+						obj.val('');
+					}
+				});
 			});
 		});
 	}
@@ -1191,3 +927,120 @@ function getConditionFormula(conditions, evalType) {
 		table.trigger('tableupdate.dynamicRows', options);
 	}
 }(jQuery));
+
+jQuery(function ($) {
+	var verticalHeaderTables = {};
+
+	var tablesWidthChangeChecker = function() {
+		for (var tableId in verticalHeaderTables) {
+			if (verticalHeaderTables.hasOwnProperty(tableId)) {
+				var table = verticalHeaderTables[tableId];
+
+				if (table && table.width() != table.data('last-width')) {
+					centerVerticalCellContents(table);
+				}
+			}
+		}
+		setTimeout(tablesWidthChangeChecker, 100);
+	};
+
+	var centerVerticalCellContents = function(table) {
+		var verticalCells = $('.vertical_rotation', table);
+
+		verticalCells.each(function() {
+			var cell = $(this),
+				cellWidth = cell.width();
+
+			if (cellWidth > 30) {
+				cell.children().css({
+					position: 'relative',
+					left: (cellWidth / 2 - 12) + 'px'
+				});
+			}
+		});
+
+		table.data('last-width', table.width());
+	};
+
+	tablesWidthChangeChecker();
+
+	$.fn.makeVerticalRotation = function() {
+		this.each(function(i) {
+			var table = $(this);
+
+			if (table.data('rotated') == 1) {
+				return;
+			}
+			table.data('rotated', 1);
+
+			var cellsToRotate = $('.vertical_rotation', table),
+				betterCells = [];
+
+			// insert spans
+			cellsToRotate.each(function() {
+				var cell = $(this);
+
+				var text = $('<span>', {
+					text: cell.html()
+				});
+
+				if (IE) {
+					text.css({'font-family': 'monospace'});
+				}
+
+				cell.text('').append(text);
+			});
+
+			// rotate cells
+			cellsToRotate.each(function() {
+				var cell = $(this),
+					span = cell.children(),
+					height = cell.height(),
+					width = span.width(),
+					transform = (width / 2) + 'px ' + (width / 2) + 'px';
+
+				var css = {
+					"transform-origin": transform,
+					"-webkit-transform-origin": transform,
+					"-moz-transform-origin": transform,
+					"-o-transform-origin": transform
+				};
+
+				if (IE) {
+					css['font-family'] = 'monospace';
+					css['-ms-transform-origin'] = '50% 50%';
+				}
+
+				if (IE9) {
+					css['-ms-transform-origin'] = transform;
+				}
+
+				var divInner = $('<div>', {
+					'class': 'vertical_rotation_inner'
+				})
+					.css(css)
+					.append(span.text());
+
+				var div = $('<div>', {
+					height: width,
+					width: height
+				})
+					.append(divInner);
+
+				betterCells.push(div);
+			});
+
+			cellsToRotate.each(function(i) {
+				$(this).html(betterCells[i]);
+			});
+
+			centerVerticalCellContents(table);
+
+			table.on('remove', function() {
+				delete verticalHeaderTables[table.attr('id')];
+			});
+
+			verticalHeaderTables[table.attr('id')] = table;
+		});
+	};
+});
diff --git a/frontends/php/js/menupopup.js b/frontends/php/js/menupopup.js
index ef6d14a3635..a501cea38e4 100644
--- a/frontends/php/js/menupopup.js
+++ b/frontends/php/js/menupopup.js
@@ -43,7 +43,7 @@ function getMenuPopupFavouriteGraphs(options) {
 			t('Favourite simple graphs'),
 			options.simpleGraphs,
 			'itemid',
-			'popup.php?srctbl=items&srcfld1=itemid&reference=itemid&multiselect=1&numeric=1&templated=0'
+			'popup.php?srctbl=items&srcfld1=itemid&reference=itemid&multiselect=1&numeric=1'
 				+ '&with_simple_graph_items=1&real_hosts=1'
 		);
 	}
@@ -172,24 +172,24 @@ function getMenuPopupHistory(options) {
 	if (typeof options.hasLatestGraphs !== 'undefined' && options.hasLatestGraphs) {
 		items[items.length] = {
 			label: t('Last hour graph'),
-			url: new Curl('history.php?itemid=' + options.itemid + '&action=showgraph&period=3600').getUrl()
+			url: new Curl('history.php?itemids[]=' + options.itemid + '&action=showgraph&period=3600').getUrl()
 		};
 
 		items[items.length] = {
 			label: t('Last week graph'),
-			url: new Curl('history.php?itemid=' + options.itemid + '&action=showgraph&period=604800').getUrl()
+			url: new Curl('history.php?itemids[]=' + options.itemid + '&action=showgraph&period=604800').getUrl()
 		};
 
 		items[items.length] = {
 			label: t('Last month graph'),
-			url: new Curl('history.php?itemid=' + options.itemid + '&action=showgraph&period=2678400').getUrl()
+			url: new Curl('history.php?itemids[]=' + options.itemid + '&action=showgraph&period=2678400').getUrl()
 		};
 	}
 
 	// latest values
 	items[items.length] = {
 		label: t('Latest values'),
-		url: new Curl('history.php?itemid=' + options.itemid + '&action=showvalues&period=3600').getUrl()
+		url: new Curl('history.php?itemids[]=' + options.itemid + '&action=showvalues&period=3600').getUrl()
 	};
 
 	return [{
@@ -206,8 +206,9 @@ function getMenuPopupHistory(options) {
  * @param string options[]['name']			script name
  * @param string options[]['scriptid']		script id
  * @param string options[]['confirmation']	confirmation text
- * @param bool   options['hasGraphs']		link to host graphs page
- * @param bool   options['hasScreens']		link to host screen page
+ * @param bool   options['showGraphs']		link to host graphs page
+ * @param bool   options['showScreens']		link to host screen page
+ * @param bool   options['showTriggers']	link to "Status of triggers" page
  * @param bool   options['hasGoTo']			"Go to" block in popup
  *
  * @return array
@@ -236,30 +237,29 @@ function getMenuPopupHost(options) {
 		// latest
 		gotos[gotos.length] = {
 			label: t('Latest data'),
-			url: new Curl('latest.php?hostid=' + options.hostid).getUrl()
+			url: new Curl('latest.php?filter_set=1&hostids[]=' + options.hostid).getUrl()
 		};
 
-		// trigger status
+		// triggers
 		gotos[gotos.length] = {
 			label: t('Triggers'),
+			css: options.showTriggers ? '' : 'ui-state-disabled',
 			url: new Curl('tr_status.php?hostid=' + options.hostid).getUrl()
 		};
 
 		// graphs
-		if (options.hasGraphs) {
-			gotos[gotos.length] = {
-				label: t('Graphs'),
-				url: new Curl('charts.php?hostid=' + options.hostid).getUrl()
-			};
-		}
+		gotos[gotos.length] = {
+			label: t('Graphs'),
+			css: options.showGraphs ? '' : 'ui-state-disabled',
+			url: new Curl('charts.php?hostid=' + options.hostid).getUrl()
+		};
 
 		// screens
-		if (options.hasScreens) {
-			gotos[gotos.length] = {
-				label: t('Host screens'),
-				url: new Curl('host_screen.php?hostid=' + options.hostid).getUrl()
-			};
-		}
+		gotos[gotos.length] = {
+			label: t('Host screens'),
+			css: options.showScreens ?  '' : 'ui-state-disabled',
+			url: new Curl('host_screen.php?hostid=' + options.hostid).getUrl()
+		};
 
 		sections[sections.length] = {
 			label: t('Go to'),
@@ -282,10 +282,14 @@ function getMenuPopupHost(options) {
  * @param array  options['gotos']['latestData']		link to latest data page
  * @param array  options['gotos']['inventory']		link to host inventory page
  * @param array  options['gotos']['graphs']			link to host graph page with url parameters ("name" => "value")
+ * @param array  options['gotos']['showGraphs']		display "Graphs" link enabled or disabled
  * @param array  options['gotos']['screens']		link to host screen page with url parameters ("name" => "value")
+ * @param array  options['gotos']['showScreens']	display "Screens" link enabled or disabled
  * @param array  options['gotos']['triggerStatus']	link to trigger status page with url parameters ("name" => "value")
+ * @param array  options['gotos']['showTriggers']	display "Triggers" link enabled or disabled
  * @param array  options['gotos']['submap']			link to submap page with url parameters ("name" => "value")
  * @param array  options['gotos']['events']			link to events page with url parameters ("name" => "value")
+ * @param array  options['gotos']['showEvents']		display "Latest events" link enabled or disabled
  * @param array  options['urls']					local and global map urls (optional)
  * @param string options['url'][]['label']			url label
  * @param string options['url'][]['url']			url
@@ -347,6 +351,7 @@ function getMenuPopupMap(options) {
 
 			gotos[gotos.length] = {
 				label: t('Triggers'),
+				css: options.gotos.showTriggers ? '' : 'ui-state-disabled',
 				url: url.getUrl()
 			};
 		}
@@ -361,6 +366,7 @@ function getMenuPopupMap(options) {
 
 			gotos[gotos.length] = {
 				label: t('Graphs'),
+				css: options.gotos.showGraphs ? '' : 'ui-state-disabled',
 				url: url.getUrl()
 			};
 		}
@@ -375,6 +381,7 @@ function getMenuPopupMap(options) {
 
 			gotos[gotos.length] = {
 				label: t('Host screens'),
+				css: options.gotos.showScreens ? '' : 'ui-state-disabled',
 				url: url.getUrl()
 			};
 		}
@@ -403,6 +410,7 @@ function getMenuPopupMap(options) {
 
 			gotos[gotos.length] = {
 				label: t('Latest events'),
+				css: options.gotos.showEvents ? '' : 'ui-state-disabled',
 				url: url.getUrl()
 			};
 		}
@@ -586,6 +594,7 @@ function getMenuPopupTrigger(options) {
 
 	items[items.length] = {
 		label: t('Events'),
+		css: options.showEvents ? '' : 'ui-state-disabled',
 		url: url.getUrl()
 	};
 
@@ -633,10 +642,8 @@ function getMenuPopupTrigger(options) {
 
 		jQuery.each(options.items, function(i, item) {
 			var url = new Curl('history.php');
-
-			jQuery.each(item.params, function(key, value) {
-				url.setArgument(key, value);
-			});
+			url.setArgument('action', item.params.action);
+			url.setArgument('itemids[]', item.params.itemid);
 
 			items[items.length] = {
 				label: item.name,
@@ -723,43 +730,34 @@ function getMenuPopupTriggerLog(options) {
 }
 
 /**
- * Get menu popup trigger macro section data.
+ * Get data for the "Insert expression" menu in the trigger expression constructor.
  *
  * @return array
  */
 function getMenuPopupTriggerMacro(options) {
 	var items = [],
-		data = {
-			'TRIGGER.VALUE=0': 0,
-			'TRIGGER.VALUE=1': 1,
-			'TRIGGER.VALUE=2': 2,
-			'TRIGGER.VALUE#0': 10,
-			'TRIGGER.VALUE#1': 11,
-			'TRIGGER.VALUE#2': 12
-		};
+		expressions = [
+			{
+				label: t('Trigger status "OK"'),
+				string: '{TRIGGER.VALUE}=0'
+			},
+			{
+				label: t('Trigger status "Problem"'),
+				string: '{TRIGGER.VALUE}=1'
+			}
+		];
 
-	jQuery.each(data, function(label, value) {
+	jQuery.each(expressions, function(key, expression) {
 		items[items.length] = {
-			label: label,
+			label: expression.label,
 			clickCallback: function() {
-				var expression = jQuery('#expr_temp');
+				var expressionInput = jQuery('#expr_temp');
 
-				if (expression.val().length > 0 && !confirm(t('Do you wish to replace the conditional expression?'))) {
+				if (expressionInput.val().length > 0 && !confirm(t('Do you wish to replace the conditional expression?'))) {
 					return false;
 				}
 
-				var sign, valueString;
-
-				if (value >= 10) {
-					valueString = value % 10;
-					sign = '#';
-				}
-				else {
-					valueString = value;
-					sign = '=';
-				}
-
-				expression.val('{TRIGGER.VALUE}' + sign + valueString);
+				expressionInput.val(expression.string);
 
 				jQuery(this).closest('.menuPopup').fadeOut(100);
 			}
@@ -767,7 +765,7 @@ function getMenuPopupTriggerMacro(options) {
 	});
 
 	return [{
-		label: t('Insert macro'),
+		label: t('Insert expression'),
 		items: items
 	}];
 }
diff --git a/frontends/php/js/multiselect.js b/frontends/php/js/multiselect.js
index 894a99e0b85..73ced640f04 100644
--- a/frontends/php/js/multiselect.js
+++ b/frontends/php/js/multiselect.js
@@ -48,7 +48,8 @@ jQuery(function($) {
 			'No matches found': t('No matches found'),
 			'More matches found...': t('More matches found...'),
 			'type here to search': t('type here to search'),
-			'new': t('new')
+			'new': t('new'),
+			'Select': t('Select')
 		};
 
 		return this.each(function() {
@@ -56,44 +57,137 @@ jQuery(function($) {
 		});
 	};
 
+	/*
+	 * Multiselect methods
+	 */
+	var methods = {
+		/**
+		 * Get multi select selected data.
+		 *
+		 * @return array    array of multiselect value objects
+		 */
+		getData: function() {
+			var ms = this.first().data('multiSelect');
+
+			var data = [];
+			for (var id in ms.values.selected) {
+				var item = ms.values.selected[id];
+
+				data[data.length] = {
+					id: id,
+					name: item.name,
+					prefix: item.prefix === 'undefined' ? '' : item.prefix
+				};
+			}
+
+			return data;
+		},
+
+		/**
+		 * Rezise multiselect selected text
+		 *
+		 * @return jQuery
+		 */
+		resize: function() {
+			return this.each(function() {
+				var obj = $(this);
+				var ms = $(this).data('multiSelect');
+
+				resizeAllSelectedTexts(obj, ms.options, ms.values);
+			});
+		},
+
+		/**
+		 * Insert outside data
+		 *
+		 * @param object    multiselect value object
+		 *
+		 * @return jQuery
+		 */
+		addData: function(item) {
+			return this.each(function() {
+				var obj = $(this);
+				var ms = $(this).data('multiSelect');
+
+				// clean input if selectedLimit = 1
+				if (ms.options.selectedLimit == 1) {
+					for (var id in ms.values.selected) {
+						removeSelected(id, obj, ms.values, ms.options);
+					}
+
+					cleanAvailable(item, ms.values);
+				}
+				addSelected(item, obj, ms.values, ms.options);
+			});
+		},
+
+		/**
+		 * Clean multi select object values.
+		 *
+		 * @return jQuery
+		 */
+		clean: function() {
+			return this.each(function() {
+				var obj = $(this);
+				var ms = $(this).data('multiSelect');
+
+				for (var id in ms.values.selected) {
+					removeSelected(id, obj, ms.values, ms.options);
+				}
+
+				cleanAvailable(obj, ms.values);
+			});
+		}
+	};
+
 	/**
 	 * Create multi select input element.
 	 *
-	 * @param string options['id']				multi select id in dom
-	 * @param string options['url']				backend url
-	 * @param string options['name']			input element name
-	 * @param object options['labels']			translated labels (optional)
-	 * @param object options['data']			preload data {id, name, prefix} (optional)
+	 * @param string options['url']					backend url
+	 * @param string options['name']				input element name
+	 * @param object options['labels']				translated labels (optional)
+	 * @param object options['data']				preload data {id, name, prefix} (optional)
 	 * @param string options['data'][id]
 	 * @param string options['data'][name]
-	 * @param string options['data'][prefix]	(optional)
-	 * @param array  options['ignored']			preload ignored {id: name} (optional)
-	 * @param string options['defaultValue']	default value for input element (optional)
-	 * @param bool   options['disabled']		turn on/off readonly state (optional)
-	 * @param bool   options['addNew']			allow user to create new names (optional)
-	 * @param int    options['selectedLimit']	how many items can be selected (optional)
-	 * @param int    options['limit']			how many available items can be received from backend (optional)
+	 * @param string options['data'][prefix]		(optional)
+	 * @param array  options['ignored']				preload ignored {id: name} (optional)
+	 * @param string options['defaultValue']		default value for input element (optional)
+	 * @param bool   options['disabled']			turn on/off readonly state (optional)
+	 * @param bool   options['addNew']				allow user to create new names (optional)
+	 * @param int    options['selectedLimit']		how many items can be selected (optional)
+	 * @param int    options['limit']				how many available items can be received from backend (optional)
+	 * @param object options['popup']				popup data {parameters, width, height, buttonClass} (optional)
+	 * @param string options['popup']['parameters']
+	 * @param int    options['popup']['width']
+	 * @param int    options['popup']['height']
+	 * @param string options['popup']['buttonClass'](optional)
 	 *
 	 * @return object
 	 */
 	$.fn.multiSelect = function(options) {
+		// call a public method
+		if (methods[options]) {
+			return methods[options].apply(this, Array.prototype.slice.call(arguments, 1));
+		}
+
 		var defaults = {
-			id: '',
 			url: '',
 			name: '',
 			labels: {
 				'No matches found': 'No matches found',
 				'More matches found...': 'More matches found...',
 				'type here to search': 'type here to search',
-				'new': 'new'
+				'new': 'new',
+				'Select': 'Select'
 			},
 			data: [],
-			ignored: [],
+			ignored: {},
 			addNew: false,
 			defaultValue: null,
 			disabled: false,
 			selectedLimit: null,
-			limit: 20
+			limit: 20,
+			popup: []
 		};
 		options = $.extend({}, defaults, options);
 
@@ -110,80 +204,32 @@ jQuery(function($) {
 		};
 
 		return this.each(function() {
-			/**
-			 * Clean multi select object values.
-			 */
-			$.fn.multiSelect.clean = function(msId) {
-				var ms = window.multiSelect[msId];
+			var obj = $(this);
 
-				for (var id in ms.values.selected) {
-					removeSelected(id, ms.obj, ms.values, ms.options);
-				}
-
-				cleanAvailable(ms.obj, ms.values);
-			};
-
-			/**
-			 * Get multi select selected data.
-			 *
-			 * @return array
-			 */
-			$.fn.multiSelect.getData = function() {
-				var data = [];
-
-				for (var id in values.selected) {
-					data[data.length] = {
-						id: id,
-						name: $('input[value="' + id + '"]', obj).data('name'),
-						prefix: $('input[value="' + id + '"]', obj).data('prefix')
-					};
-				}
-
-				return data;
-			};
-
-			/**
-			 * Rezise multiselect selected text
-			 */
-			$.fn.multiSelect.resize = function() {
-				$.each(window.multiSelect, function(i) {
-					var ms = window.multiSelect[i];
-					if (!empty(ms.options.data)) {
-						resizeAllSelectedTexts(ms.obj, ms.options, ms.values);
-					}
-				});
-			}
-
-			/**
-			 * MultiSelect object.
-			 */
-			if (empty(window.multiSelect)) {
-				window.multiSelect = {};
-			}
-
-			window.multiSelect[options.id] = {
+			var ms = {
 				options: options,
-				obj: $(this),
-				jqxhr: null,
 				values: {
 					search: '',
-					width: null,
+					width: parseInt(obj.css('width')),
 					isWaiting: false,
 					isAjaxLoaded: true,
 					isMoreMatchesFound: false,
-					isAvailableOpenned: false,
+					isAvailableOpened: false,
 					selected: {},
 					available: {},
-					ignored: empty(options.ignored) ? [] : options.ignored
+					ignored: empty(options.ignored) ? {} : options.ignored
 				}
 			};
 
-			var ms = window.multiSelect[options.id],
-				obj = ms.obj,
-				jqxhr = ms.jqxhr,
-				values = ms.values;
+			// store the configuration in the elements data
+			obj.data('multiSelect', ms);
 
-			ms.values.width = parseInt(obj.css('width'));
+			var values = ms.values;
+
+			// add wrap
+			obj.wrap(jQuery('<div>', {
+				'class': 'multiselect-wrapper'
+			}));
 
 			// search input
 			if (!options.disabled) {
@@ -206,12 +252,12 @@ jQuery(function($) {
 					}
 
 					var search = input.val();
-
 					if (!empty(search)) {
 						if (input.data('lastSearch') != search) {
 							if (!values.isWaiting) {
 								values.isWaiting = true;
 
+								var jqxhr = null;
 								window.setTimeout(function() {
 									values.isWaiting = false;
 
@@ -398,17 +444,17 @@ jQuery(function($) {
 				})
 				.append($('<ul>'))
 				.mouseenter(function() {
-					values.isAvailableOpenned = true;
+					values.isAvailableOpened = true;
 				})
 				.mouseleave(function() {
-					values.isAvailableOpenned = false;
+					values.isAvailableOpened = false;
 				});
 
 				// multi select
 				obj.append(available)
 				.focusout(function() {
 					setTimeout(function() {
-						if (!values.isAvailableOpenned && $('.available', obj).is(':visible')) {
+						if (!values.isAvailableOpened && $('.available', obj).is(':visible')) {
 							hideAvailable(obj);
 						}
 					}, 200);
@@ -426,6 +472,43 @@ jQuery(function($) {
 
 			// resize
 			resize(obj, values, options);
+
+			// draw popup link
+			if (options.popup.parameters != null) {
+				var popupBlock = $('<div>', {
+					'class': 'select-popup'
+				});
+
+				var urlParameters = options.popup.parameters;
+
+				if (options.ignored) {
+					$.each(options.ignored, function(i, value) {
+						urlParameters = urlParameters + '&excludeids[]=' + i;
+					});
+				}
+
+				var popupButton = $('<input>', {
+					type: 'button',
+					'class': options.popup.buttonClass ? options.popup.buttonClass : 'input link_menu select-popup',
+					value: options.labels['Select']
+				});
+
+				if (options.disabled) {
+					popupButton.attr('disabled', true);
+				}
+				else {
+					popupButton.click(function() {
+						return PopUp('popup.php?' + urlParameters, options.popup.width, options.popup.height);
+					});
+				}
+
+				obj.parent().append(popupButton);
+			}
+
+			// IE browsers use default width
+			if (IE) {
+				options.defaultWidth = $('input[type="text"]', obj).width();
+			}
 		});
 	};
 
@@ -805,10 +888,20 @@ jQuery(function($) {
 		}
 
 		if (IE) {
-			$('input[type="text"]', obj).css({
+			var input = $('input[type="text"]', obj);
+
+			input.css({
 				'padding-top': top,
-				'padding-left': left
+				'padding-left': left,
+				'width': options.defaultWidth - left
 			});
+
+			// IE8 hack to fix inline-block container resizing and poke input element value to trigger reflow
+			if (IE8) {
+				$('.multiselect-wrapper').addClass('ie8fix-inline').removeClass('ie8fix-inline');
+				var currentInputVal = input.val();
+				input.val(' ').val(currentInputVal);
+			}
 		}
 		else {
 			$('input[type="text"]', obj).css({
@@ -911,7 +1004,10 @@ jQuery(function($) {
 	}
 
 	function removePlaceholder(obj) {
-		$('input[type="text"]', obj).removeAttr('placeholder');
+		$('input[type="text"]', obj)
+			.removeAttr('placeholder')
+			.removeClass('placeholder')
+			.val('');
 	}
 
 	function getLimit(values, options) {
diff --git a/frontends/php/js/pages/tr_logform.js b/frontends/php/js/pages/tr_logform.js
new file mode 100644
index 00000000000..0ec3b78634d
--- /dev/null
+++ b/frontends/php/js/pages/tr_logform.js
@@ -0,0 +1,414 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+// trigger log expression
+var logexpr_count = 0;
+var key_count = 0;
+
+function nextObject(n) {
+	var t = n.parentNode.tagName;
+	do {
+		n = n.nextSibling;
+	} while (n && n.nodeType != 1 && n.parentNode.tagName == t);
+
+	return n;
+}
+
+function previousObject(p) {
+	var t = p.parentNode.tagName;
+	do {
+		p = p.previousSibling;
+	} while (p && p.nodeType != 1 && p.parentNode.tagName == t);
+
+	return p;
+}
+
+function add_logexpr() {
+	var EXPRESSION_TYPE_NO_MATCH = 1;
+	try {
+		var expr = document.getElementById('logexpr');
+		var expr_t = document.getElementById('expr_type');
+		var bt_and = document.getElementById('add_key_and');
+		var bt_or = document.getElementById('add_key_or');
+		var iregexp = document.getElementById('iregexp');
+	}
+	catch(e) {
+		throw('Error: ' + (IE ? e.description : e));
+	}
+
+	var ex = bt_and.disabled ? ' or ' : ' and ';
+	if (expr_t.value == EXPRESSION_TYPE_NO_MATCH) {
+		ex = bt_and.disabled ? ' and ' : ' or ';
+	}
+
+	var expression = '';
+	var lp;
+	for (lp = 0; lp < key_count; lp++) {
+		var key = document.getElementsByName('keys[' + lp + '][value]')[0];
+		var typ = document.getElementsByName('keys[' + lp + '][type]')[0];
+		if (typeof(key) != 'undefined' && typeof(typ) != 'undefined') {
+			if (expression != '') {
+				expression += ex;
+			}
+			expression += typ.value + '(' + key.value + ')';
+			remove_keyword('keytr' + lp);
+		}
+	}
+
+	if (typeof(expr.value) != 'undefined' && expr.value != '') {
+		if (expression != '') {
+			expression += ex;
+		}
+		expression += iregexp.checked ? 'iregexp' : 'regexp';
+		expression += '(' + expr.value + ')';
+	}
+
+	if (expression == '') {
+		return false;
+	}
+
+	var classattr = IE ? 'className' : 'class';
+
+	var tr = document.createElement('tr');
+	document.getElementById('exp_list').firstChild.appendChild(tr);
+
+	tr.setAttribute(classattr, 'even_row');
+	tr.setAttribute('id', 'logtr' + logexpr_count);
+
+	var td = document.createElement('td');
+	tr.appendChild(td);
+	td.appendChild(document.createTextNode(expression));
+
+	jQuery('.formlongtable.formtable').before(jQuery('<input>', {
+		name: 'expressions[' + logexpr_count + '][value]',
+		type: 'hidden',
+		value: expression
+	}));
+
+	var td = document.createElement('td');
+	tr.appendChild(td);
+
+	td.appendChild(document.createTextNode(expr_t.options[expr_t.selectedIndex].text));
+
+	jQuery('.formlongtable.formtable').before(jQuery('<input>', {
+		name: 'expressions[' + logexpr_count + '][type]',
+		type: 'hidden',
+		value: expr_t.value
+	}));
+
+	// optional
+	var td = document.createElement('td');
+	tr.appendChild(td);
+
+	td.setAttribute(IE ? 'cssText' : 'style', 'white-space: nowrap;');
+
+	var img = document.createElement('img');
+	img.setAttribute('src', 'images/general/arrow_up.png');
+	img.setAttribute('onclick', 'element_up("logtr' + logexpr_count + '");');
+	img.setAttribute('border', '0');
+	img.setAttribute('alt', 'up');
+	img.setAttribute('class', 'updown');
+
+	td.appendChild(img);
+	td.appendChild(document.createTextNode(' '));
+
+	var img = document.createElement('img');
+	img.setAttribute('src', 'images/general/arrow_down.png');
+	img.setAttribute('onclick', 'element_down("logtr' + logexpr_count + '");');
+	img.setAttribute('border', '0');
+	img.setAttribute('alt', 'down');
+	img.setAttribute('class', 'updown');
+
+	td.appendChild(img);
+
+	var td = document.createElement('td');
+	tr.appendChild(td);
+
+	var url = document.createElement('a');
+	url.setAttribute('href', 'javascript: if (confirm("' + locale['S_DELETE_EXPRESSION_Q'] + '")) { remove_expression("logtr' + logexpr_count + '"); }');
+	url.setAttribute(classattr, 'action');
+	url.appendChild(document.createTextNode(locale['S_DELETE']));
+
+	td.appendChild(url);
+
+	logexpr_count++;
+	expr.value = '';
+	expr_t.selectedIndex=0;
+	bt_and.disabled = false;
+	bt_or.disabled = false;
+
+	processExpressionList();
+}
+
+function remove_expression(expr_id) {
+	var expr_tr = document.getElementById(expr_id);
+	var id = getIdFromNodeId(expr_id);
+	if (is_number(id)) {
+		var elm_v = document.getElementsByName('expressions[' + id + '][value]')[0];
+		var elm_t = document.getElementsByName('expressions[' + id + '][type]')[0];
+		var elm_s = document.getElementsByName('expressions[' + id + '][view]')[0];
+
+		if (typeof(elm_v) != 'undefined') {
+			elm_v.parentNode.removeChild(elm_v);
+		}
+		if (typeof(elm_t) != 'undefined') {
+			elm_t.parentNode.removeChild(elm_t);
+		}
+		if (typeof(elm_s) != 'undefined') {
+			elm_s.parentNode.removeChild(elm_s);
+		}
+	}
+	if (typeof(expr_tr) != 'undefined') {
+		expr_tr.parentNode.removeChild(expr_tr);
+	}
+
+	processExpressionList();
+}
+
+function processExpressionList() {
+	actions = jQuery('#exp_list td:nth-child(3) .updown');
+	actions.show();
+	actions.first().hide();
+	actions.last().hide();
+
+	rows = jQuery('#exp_list tr').not(':first');
+	rows.filter(':even').attr('class', 'even_row');
+	rows.filter(':odd').attr('class', 'odd_row');
+}
+
+function element_up(elementid) {
+	var c_obj = document.getElementById(elementid);
+	var p_obj = c_obj.parentNode;
+
+	if (typeof(p_obj) == 'undefined') {
+		return null;
+	}
+
+	var c2_obj = previousObject(c_obj);
+	if (c2_obj && c2_obj.id.length > 0) {
+		swapNodes(c2_obj, c_obj);
+		swapNodesNames(c2_obj, c_obj);
+	}
+
+	processExpressionList();
+}
+
+function element_down(elementid) {
+	var c_obj = document.getElementById(elementid);
+	var p_obj = c_obj.parentNode;
+
+	if (typeof(p_obj) == 'undefined') {
+		return null;
+	}
+
+	var c2_obj = nextObject(c_obj);
+	if (c2_obj && c2_obj.id.length > 0) {
+		swapNodes(c_obj, c2_obj);
+		swapNodesNames(c_obj, c2_obj);
+	}
+
+	processExpressionList();
+}
+
+function swapNodes(n1, n2) {
+	var p1, p2, b;
+
+	if ((p1 = n1.parentNode) && (p2 = n2.parentNode)) {
+		b = nextObject(n2);
+		if (n1 == b) {
+			return;
+		}
+
+		p1.replaceChild(n2, n1); // new, old
+		if (b) {
+			// n1 - the node which we insert
+			// b - the node before which we insert
+			p2.insertBefore(n1, b);
+		}
+		else {
+			p2.appendChild(n1);
+		}
+	}
+}
+
+function swapNodesNames(n1, n2) {
+	var id1 = n1.id;
+	var id2 = n2.id;
+	if (is_string(id1) && is_string(id2)) {
+		var reg = /logtr([0-9])/i;
+		id1 = parseInt(id1.replace(reg, '$1'));
+		id2 = parseInt(id2.replace(reg, '$1'));
+	}
+
+	if (is_number(id1) && is_number(id2)) {
+		var elm = [];
+		elm[0] = document.getElementsByName('expressions[' + id1 + '][value]')[0];
+		elm[1] = document.getElementsByName('expressions[' + id1 + '][type]')[0];
+		elm[2] = document.getElementsByName('expressions[' + id2 + '][value]')[0];
+		elm[3] = document.getElementsByName('expressions[' + id2 + '][type]')[0];
+
+		swapNodes(elm[0], elm[2]);
+		swapNodes(elm[1], elm[3]);
+
+		return true;
+	}
+	return false;
+}
+
+function closeForm(page) {
+	try {
+		// set header confirmation message to opener
+		var msg = IE ? document.getElementById('page_msg').innerText : document.getElementById('page_msg').textContent;
+		window.opener.location.replace(page + '?msg=' + encodeURI(msg));
+	}
+	catch (e) {
+		throw(e);
+	}
+
+	if (IE) {
+		// close current popup after 1s, wait when opener window is refreshed (IE7 issue)
+		window.setTimeout(function() { window.self.close(); }, 1000);
+	}
+	else {
+		window.self.close();
+	}
+}
+
+function add_keyword(bt_type) {
+	try {
+		var expr = document.getElementById('logexpr');
+		var iregexp = document.getElementById('iregexp');
+		var cb = document.getElementById(bt_type == 'and' ? 'add_key_or' : 'add_key_and');
+	}
+	catch(e) {
+		throw('Error: ' + (IE ? e.description : e));
+	}
+
+	if (typeof(expr.value) == 'undefined' || expr.value == '') {
+		return false;
+	}
+
+	cb.disabled = true;
+
+	var classattr = IE ? 'className' : 'class';
+
+	var tr = document.createElement('tr');
+	document.getElementById('key_list').firstChild.appendChild(tr);
+
+	tr.setAttribute(classattr, 'even_row');
+	tr.setAttribute('id', 'keytr' + key_count);
+
+	// keyword
+	var td = document.createElement('td');
+	tr.appendChild(td);
+
+	td.appendChild(document.createTextNode(expr.value));
+
+	var input = IE ? document.createElement('<input name="keys[' + key_count + '][value]" />') : document.createElement('input');
+	input.setAttribute('type', 'hidden');
+	input.setAttribute('value', expr.value);
+	!IE ? input.setAttribute('name', 'keys[' + key_count + '][value]') : '';
+
+	td.appendChild(input);
+
+	// type
+	var td = document.createElement('td');
+	tr.appendChild(td);
+
+	td.appendChild(document.createTextNode(iregexp.checked ? 'iregexp' : 'regexp'));
+
+	var input = IE ? document.createElement('<input name="keys[' + key_count + '][type]" />') : document.createElement('input');
+	input.setAttribute('type', 'hidden');
+	input.setAttribute('value', iregexp.checked ? 'iregexp' : 'regexp');
+	!IE ? input.setAttribute('name', 'keys[' + key_count + '][type]') : '';
+
+	td.appendChild(input);
+
+	// delete
+	var td = document.createElement('td');
+	tr.appendChild(td);
+
+	var url = document.createElement('a');
+	url.setAttribute('href', 'javascript: if(confirm("' + locale['S_DELETE_KEYWORD_Q'] + '")) remove_keyword("keytr' + key_count + '");');
+	url.setAttribute(classattr, 'action');
+	url.appendChild(document.createTextNode(locale['S_DELETE']));
+
+	td.appendChild(url);
+
+	key_count++;
+	expr.value = '';
+}
+
+function add_keyword_and() {
+	add_keyword('and');
+}
+
+function add_keyword_or() {
+	add_keyword('or');
+}
+
+function getIdFromNodeKeyId(id) {
+	if (typeof(id) == 'string') {
+		var reg = /keytr([0-9])/i;
+		id = parseInt(id.replace(reg, '$1'));
+	}
+	if (typeof(id) == 'number') {
+		return id;
+	}
+	return null;
+}
+
+function remove_keyword(key_id) {
+	var key_tr = document.getElementById(key_id);
+	var id = getIdFromNodeKeyId(key_id);
+	if (is_number(id)) {
+		var elm_v = document.getElementsByName('keys[' + id + '][value]')[0];
+		var elm_t = document.getElementsByName('keys[' + id + '][type]')[0];
+
+		if (typeof(elm_v) == 'undefined') {
+			elm_v.parentNode.removeChild(elm_v);
+		}
+		if (typeof(elm_t) == 'undefined') {
+			elm_t.parentNode.removeChild(elm_t);
+		}
+	}
+	if (typeof(key_tr) != 'undefined') {
+		key_tr.parentNode.removeChild(key_tr);
+	}
+
+	var lp;
+	var bData = false;
+	for (lp = 0; lp < key_count; lp++) {
+		var elm_v = document.getElementsByName('keys[' + lp + '][value]')[0];
+		if (typeof(elm_v) != 'undefined') {
+			bData = true;
+		}
+	}
+	if (!bData) {
+		var bt_and = document.getElementById('add_key_and');
+		var bt_or = document.getElementById('add_key_or');
+		if (typeof(bt_and) != 'undefined') {
+			bt_and.disabled = false;
+		}
+		if (typeof(bt_or) != 'undefined') {
+			bt_or.disabled = false;
+		}
+	}
+}
diff --git a/frontends/php/jsLoader.php b/frontends/php/jsLoader.php
index 734c43e67d6..f6ee27d7749 100644
--- a/frontends/php/jsLoader.php
+++ b/frontends/php/jsLoader.php
@@ -58,6 +58,7 @@ $availableJScripts = array(
 	'servercheck.js' => '',
 	'flickerfreescreen.js' => '',
 	'multiselect.js' => '',
+	'chkbxrange.js' => '',
 	// vendors
 	'prototype.js' => '',
 	'jquery.js' => 'jquery/',
@@ -84,6 +85,7 @@ $availableJScripts = array(
 	'sysmap.tpl.js' => 'templates/',
 	// page-specific scripts
 	'items.js' => 'pages/',
+	'tr_logform.js' => 'pages/',
 );
 
 $tranStrings = array(
@@ -97,7 +99,7 @@ $tranStrings = array(
 		'S_MONTH_SHORT' => _x('m', 'month short'),
 		'S_DAY_SHORT' => _x('d', 'day short'),
 		'S_HOUR_SHORT' => _x('h', 'hour short'),
-		'S_DATE_FORMAT' => FILTER_TIMEBAR_DATE_FORMAT
+		'S_DATE_FORMAT' => DATE_TIME_FORMAT
 	),
 	'functions.js' => array(
 		'Cancel' => _('Cancel'),
@@ -172,7 +174,8 @@ $tranStrings = array(
 		'No matches found' => _('No matches found'),
 		'More matches found...' => _('More matches found...'),
 		'type here to search' => _('type here to search'),
-		'new' => _('new')
+		'new' => _('new'),
+		'Select' => _('Select')
 	),
 	'menupopup.js' => array(
 		'Acknowledge' => _('Acknowledge'),
@@ -191,7 +194,9 @@ $tranStrings = array(
 		'Favourite screens' => _('Favourite screens'),
 		'Favourite simple graphs' => _('Favourite simple graphs'),
 		'Favourite slide shows' => _('Favourite slide shows'),
-		'Insert macro' => _('Insert macro'),
+		'Insert expression' => _('Insert expression'),
+		'Trigger status "OK"' => _('Trigger status "OK"'),
+		'Trigger status "Problem"' => _('Trigger status "Problem"'),
 		'Item "%1$s"' => _('Item "%1$s"'),
 		'Go to' => _('Go to'),
 		'Graphs' => _('Graphs'),
@@ -243,6 +248,7 @@ if (empty($_GET['files'])) {
 		'class.bbcode.js',
 		'class.csuggest.js',
 		'main.js',
+		'chkbxrange.js',
 		'functions.js',
 		'menupopup.js',
 		'init.js'
diff --git a/frontends/php/jsrpc.php b/frontends/php/jsrpc.php
index c15c14cd002..95c82ebbffe 100644
--- a/frontends/php/jsrpc.php
+++ b/frontends/php/jsrpc.php
@@ -21,10 +21,10 @@
 
 require_once dirname(__FILE__).'/include/config.inc.php';
 
-$requestType = get_request('type', PAGE_TYPE_JSON);
+$requestType = getRequest('type', PAGE_TYPE_JSON);
 if ($requestType == PAGE_TYPE_JSON) {
-	$http_request = new CHTTP_request();
-	$json = new CJSON();
+	$http_request = new CHttpRequest();
+	$json = new CJson();
 	$data = $json->decode($http_request->body(), true);
 }
 else {
@@ -130,10 +130,11 @@ switch ($data['method']) {
 						'priority' => $priority,
 						'sound' => $sound,
 						'color' => getSeverityColor($trigger['priority'], $event['value']),
-						'title' => $title.' [url='.$url_tr_status.']'.$host['host'].'[/url]',
+						'title' => $title.' [url='.$url_tr_status.']'.$host['name'].'[/url]',
 						'body' => array(
 							_('Details').': [url='.$url_events.']'.$trigger['description'].'[/url]',
-							_('Date').': [b][url='.$url_tr_events.']'.zbx_date2str(_('d M Y H:i:s'), $event['clock']).'[/url][/b]',
+							_('Date').': [b][url='.$url_tr_events.']'.
+								zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event['clock']).'[/url][/b]',
 						),
 						'timeout' => $msgsettings['timeout']
 					);
@@ -180,6 +181,7 @@ switch ($data['method']) {
 			'mode' => !empty($data['mode']) ? $data['mode'] : null,
 			'timestamp' => !empty($data['timestamp']) ? $data['timestamp'] : time(),
 			'resourcetype' => !empty($data['resourcetype']) ? $data['resourcetype'] : null,
+			'screenid' => (isset($data['screenid']) && $data['screenid'] != 0) ? $data['screenid'] : null,
 			'screenitemid' => !empty($data['screenitemid']) ? $data['screenitemid'] : null,
 			'groupid' => !empty($data['groupid']) ? $data['groupid'] : null,
 			'hostid' => !empty($data['hostid']) ? $data['hostid'] : null,
@@ -393,7 +395,7 @@ if ($requestType == PAGE_TYPE_JSON) {
 	}
 }
 elseif ($requestType == PAGE_TYPE_TEXT_RETURN_JSON) {
-	$json = new CJSON();
+	$json = new CJson();
 
 	echo $json->encode(array(
 		'jsonrpc' => '2.0',
diff --git a/frontends/php/latest.php b/frontends/php/latest.php
index 7f63bbfeec3..bdf0905f04c 100644
--- a/frontends/php/latest.php
+++ b/frontends/php/latest.php
@@ -25,8 +25,9 @@ require_once dirname(__FILE__).'/include/items.inc.php';
 
 $page['title'] = _('Latest data');
 $page['file'] = 'latest.php';
-$page['hist_arg'] = array('groupid', 'hostid', 'show', 'select', 'open', 'applicationid');
+$page['hist_arg'] = array('groupids', 'hostids', 'filter_set');
 $page['type'] = detect_page_type(PAGE_TYPE_HTML);
+$page['scripts'] = array('multiselect.js');
 
 define('ZBX_PAGE_MAIN_HAT', 'hat_latest');
 
@@ -38,29 +39,32 @@ require_once dirname(__FILE__).'/include/page_header.php';
 
 //	VAR						TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
 $fields = array(
-	'apps' =>				array(T_ZBX_INT, O_OPT, null,	DB_ID,		null),
-	'groupid' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
-	'hostid' =>				array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
+	'groupids' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
+	'hostids' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'fullscreen' =>			array(T_ZBX_INT, O_OPT, P_SYS,	IN('0,1'),	null),
 	'select' =>				array(T_ZBX_STR, O_OPT, null,	null,		null),
 	'show_without_data' =>	array(T_ZBX_INT, O_OPT, null,	IN('0,1'),	null),
 	'show_details' =>		array(T_ZBX_INT, O_OPT, null,	IN('0,1'),	null),
+	'application' =>		array(T_ZBX_STR, O_OPT, null,	null,		null),
 	'filter_rst' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'filter_set' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'filterState' =>		array(T_ZBX_INT, O_OPT, P_ACT,	null,		null),
 	'favobj' =>				array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
 	'toggle_ids' =>			array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
-	'toggle_open_state' =>	array(T_ZBX_INT, O_OPT, P_ACT,	null,		null)
+	'toggle_open_state' =>	array(T_ZBX_INT, O_OPT, P_ACT,	null,		null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"host","lastclock","name"'),				null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
 
 /*
  * Permissions
  */
-if (getRequest('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
+if (getRequest('groupids') && !API::HostGroup()->isReadable(getRequest('groupids'))) {
 	access_deny();
 }
-if (getRequest('hostid') && !API::Host()->isReadable(array($_REQUEST['hostid']))) {
+if (getRequest('hostids') && !API::Host()->isReadable(getRequest('hostids'))) {
 	access_deny();
 }
 
@@ -113,84 +117,107 @@ if (hasRequest('filter_set')) {
 	CProfile::update('web.latest.filter.select', getRequest('select', ''), PROFILE_TYPE_STR);
 	CProfile::update('web.latest.filter.show_without_data', getRequest('show_without_data', 0), PROFILE_TYPE_INT);
 	CProfile::update('web.latest.filter.show_details', getRequest('show_details', 0), PROFILE_TYPE_INT);
+	CProfile::update('web.latest.filter.application', getRequest('application', ''), PROFILE_TYPE_STR);
+	CProfile::updateArray('web.latest.filter.groupids', getRequest('groupids', array()), PROFILE_TYPE_STR);
+	CProfile::updateArray('web.latest.filter.hostids', getRequest('hostids', array()), PROFILE_TYPE_STR);
 }
 elseif (hasRequest('filter_rst')) {
 	DBStart();
 	CProfile::delete('web.latest.filter.select');
 	CProfile::delete('web.latest.filter.show_without_data');
 	CProfile::delete('web.latest.filter.show_details');
+	CProfile::delete('web.latest.filter.application');
+	CProfile::deleteIdx('web.latest.filter.groupids');
+	CProfile::deleteIdx('web.latest.filter.hostids');
 	DBend();
 }
 
-$filterSelect = CProfile::get('web.latest.filter.select', '');
-$filterShowWithoutData = CProfile::get('web.latest.filter.show_without_data', 1);
-$filterShowDetails = CProfile::get('web.latest.filter.show_details');
+$filter = array(
+	'select' => CProfile::get('web.latest.filter.select', ''),
+	'showWithoutData' => CProfile::get('web.latest.filter.show_without_data', 1),
+	'showDetails' => CProfile::get('web.latest.filter.show_details'),
+	'application' => CProfile::get('web.latest.filter.application', ''),
+	'groupids' => CProfile::getArray('web.latest.filter.groupids'),
+	'hostids' => CProfile::getArray('web.latest.filter.hostids')
+);
 
-$pageFilter = new CPageFilter(array(
-	'groups' => array(
-		'real_hosts' => true
-	),
-	'hosts' => array(
-		'with_monitored_items' => true
-	),
-	'hostid' => getRequest('hostid', null),
-	'groupid' => getRequest('groupid', null)
-));
-$_REQUEST['groupid'] = $pageFilter->groupid;
-$_REQUEST['hostid'] = $pageFilter->hostid;
+// we'll need to hide the host column if only one host is selected
+$singleHostSelected = (count($filter['hostids']) == 1);
 
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
+$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
 
-$sortField = getPageSortField();
-$sortOrder = getPageSortOrder();
+CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
 
 $applications = $items = $hostScripts = array();
 
-// get hosts
-if ($_REQUEST['hostid']) {
-	$availableHostIds = array($_REQUEST['hostid']);
-}
-elseif ($pageFilter->hostsSelected) {
-	$availableHostIds = array_keys($pageFilter->hosts);
+// we'll only display the values if the filter is set
+$filterSet = ($filter['select'] !== '' || $filter['application'] !== '' || $filter['groupids'] || $filter['hostids']);
+if ($filterSet) {
+	$hosts = API::Host()->get(array(
+		'output' => array('name', 'hostid', 'status'),
+		'hostids' => $filter['hostids'],
+		'groupids' => $filter['groupids'],
+		'selectGraphs' => API_OUTPUT_COUNT,
+		'with_monitored_items' => true,
+		'preservekeys' => true
+	));
 }
 else {
-	$availableHostIds = array();
+	$hosts = array();
 }
 
-$hosts = API::Host()->get(array(
-	'output' => array('name', 'hostid', 'status'),
-	'hostids' => $availableHostIds,
-	'selectGraphs' => API_OUTPUT_COUNT,
-	'with_monitored_items' => true,
-	'preservekeys' => true
-));
-
 if ($hosts) {
+
 	foreach ($hosts as &$host) {
 		$host['item_cnt'] = 0;
 	}
 	unset($host);
 
-	if (count($hosts) > 1) {
+	if (!$singleHostSelected) {
 		$sortFields = ($sortField === 'host') ? array(array('field' => 'name', 'order' => $sortOrder)) : array('name');
 		CArrayHelper::sort($hosts, $sortFields);
 	}
-}
 
-// get items
-if ($hosts) {
+	$hostIds = array_keys($hosts);
+
+	$applications = null;
+
+	// if an application filter is set, fetch the applications and then use them to filter items
+	if ($filter['application'] !== '') {
+		$applications = API::Application()->get(array(
+			'output' => API_OUTPUT_EXTEND,
+			'hostids' => $hostIds,
+			'search' => array('name' => $filter['application']),
+			'preservekeys' => true
+		));
+	}
+
 	$items = API::Item()->get(array(
 		'hostids' => array_keys($hosts),
 		'output' => array('itemid', 'name', 'type', 'value_type', 'units', 'hostid', 'state', 'valuemapid', 'status',
 			'error', 'trends', 'history', 'delay', 'key_', 'flags'),
 		'selectApplications' => array('applicationid'),
 		'selectItemDiscovery' => array('ts_delete'),
+		'applicationids' => ($applications !== null) ? zbx_objectValues($applications, 'applicationid') : null,
 		'webitems' => true,
 		'filter' => array(
 			'status' => array(ITEM_STATUS_ACTIVE)
 		),
 		'preservekeys' => true
 	));
+
+	// if the applications haven't been loaded when filtering, load them based on the retrieved items to avoid
+	// fetching applications from hosts that may not be displayed
+	if ($applications === null) {
+		$applications = API::Application()->get(array(
+			'output' => API_OUTPUT_EXTEND,
+			'hostids' => array_keys(array_flip(zbx_objectValues($items, 'hostid'))),
+			'search' => array('name' => $filter['application']),
+			'preservekeys' => true
+		));
+	}
 }
 
 if ($items) {
@@ -200,17 +227,22 @@ if ($items) {
 
 	// filter items by name
 	foreach ($items as $key => $item) {
-		if (!zbx_empty($filterSelect) && !zbx_stristr($item['name_expanded'], $filterSelect)) {
-			unset($items[$key]);
+		if (($filter['select'] !== '')) {
+			$haystack = mb_strtolower($item['name_expanded']);
+			$needle = mb_strtolower($filter['select']);
+
+			if (mb_strpos($haystack, $needle) === false) {
+				unset($items[$key]);
+			}
 		}
 	}
 
 	if ($items) {
 		// get history
-		$history = Manager::History()->getLast($items, 2);
+		$history = Manager::History()->getLast($items, 2, ZBX_HISTORY_PERIOD);
 
 		// filter items without history
-		if (!$filterShowWithoutData) {
+		if (!$filter['showWithoutData']) {
 			foreach ($items as $key => $item) {
 				if (!isset($history[$item['itemid']])) {
 					unset($items[$key]);
@@ -220,8 +252,6 @@ if ($items) {
 	}
 
 	if ($items) {
-		$hostIds = array_keys(array_flip(zbx_objectValues($items, 'hostid')));
-
 		// add item last update date for sorting
 		foreach ($items as &$item) {
 			if (isset($history[$item['itemid']])) {
@@ -242,13 +272,6 @@ if ($items) {
 		}
 		CArrayHelper::sort($items, $sortFields);
 
-		// get applications
-		$applications = API::Application()->get(array(
-			'output' => API_OUTPUT_EXTEND,
-			'hostids' => $hostIds,
-			'preservekeys' => true
-		));
-
 		if ($applications) {
 			foreach ($applications as &$application) {
 				$application['hostname'] = $hosts[$application['hostid']]['name'];
@@ -262,7 +285,7 @@ if ($items) {
 			CArrayHelper::sort($applications, $sortFields);
 		}
 
-		if ($_REQUEST['hostid'] == 0) {
+		if (!$singleHostSelected) {
 			// get host scripts
 			$hostScripts = API::Script()->getScriptsByHosts($hostIds);
 
@@ -272,60 +295,167 @@ if ($items) {
 				'countOutput' => true,
 				'groupCount' => true
 			));
-
-			foreach ($screens as $screen) {
-				$hosts[$screen['hostid']]['screens'] = $screen['rowscount'];
+			$screens = zbx_toHash($screens, 'hostid');
+			foreach ($hosts as &$host) {
+				$host['screens'] = isset($screens[$host['hostid']]);
 			}
+			unset($host);
 		}
 	}
 }
 
-if ($filterShowDetails) {
+if ($filter['showDetails']) {
 	$config = select_config();
 }
 
+// multiselect hosts
+$multiSelectHostData = array();
+if ($filter['hostids']) {
+	$filterHosts = API::Host()->get(array(
+		'output' => array('hostid', 'name'),
+		'hostids' => $filter['hostids']
+	));
+
+	foreach ($filterHosts as $host) {
+		$multiSelectHostData[] = array(
+			'id' => $host['hostid'],
+			'name' => $host['name']
+		);
+	}
+}
+
+// multiselect host groups
+$multiSelectHostGroupData = array();
+if ($filter['groupids'] !== null) {
+	$filterGroups = API::HostGroup()->get(array(
+		'output' => array('groupid', 'name'),
+		'groupids' => $filter['groupids']
+	));
+
+	foreach ($filterGroups as $group) {
+		$multiSelectHostGroupData[] = array(
+			'id' => $group['groupid'],
+			'name' => $group['name']
+		);
+	}
+}
+
 /*
  * Display
  */
 $latestWidget = new CWidget(null, 'latest-mon');
+$latestWidget->addHeader(_('Items'));
 
-$form = new CForm('get');
-$form->addItem(array(_('Group').SPACE, $pageFilter->getGroupsCB()));
-$form->addItem(array(SPACE._('Host').SPACE, $pageFilter->getHostsCB()));
-
-$latestWidget->addHeader(_('Items'), $form);
-
-$filterForm = new CFormTable(null, null, 'get');
+$filterForm = new CForm('get');
 $filterForm->setAttribute('name',' zbx_filter');
 $filterForm->setAttribute('id', 'zbx_filter');
-$filterForm->addRow(_('Show items with name like'), new CTextBox('select', $filterSelect, 20));
-$filterForm->addRow(_('Show items without data'), new CCheckBox('show_without_data', $filterShowWithoutData, null, 1));
-$filterForm->addRow(_('Show details'), new CCheckBox('show_details', $filterShowDetails, null, 1));
-$filterForm->addItemToBottomRow(new CSubmit('filter_set', _('Filter')));
-$filterForm->addItemToBottomRow(new CSubmit('filter_rst', _('Reset')));
+
+$filterTable = new CTable(null, 'filter');
+$filterTable->setCellPadding(0);
+$filterTable->setCellSpacing(0);
+
+$filterTable->addRow(
+	array(
+		new CCol(bold(_('Host groups').':'), 'label'),
+		new CCol(new CMultiSelect(
+			array(
+				'name' => 'groupids[]',
+				'objectName' => 'hostGroup',
+				'data' => $multiSelectHostGroupData,
+				'popup' => array(
+					'parameters' => 'srctbl=host_groups&dstfrm='.$filterForm->getName().'&dstfld1=groupids_'.
+						'&srcfld1=groupid&multiselect=1',
+					'width' => 450,
+					'height' => 450,
+					'buttonClass' => 'input filter-multiselect-select-button'
+				)
+			)),
+			'inputcol'
+		),
+		new CCol(bold(_('Name').':'), 'label'),
+		new CCol(new CTextBox('select', $filter['select'], 40), 'inputcol'),
+	)
+);
+
+$filterTable->addRow(
+	array(
+		new CCol(bold(_('Hosts').':'), 'label'),
+		new CCol(new CMultiSelect(
+			array(
+				'name' => 'hostids[]',
+				'objectName' => 'hosts',
+				'data' => $multiSelectHostData,
+				'popup' => array(
+					'parameters' => 'srctbl=hosts&dstfrm='.$filterForm->getName().'&dstfld1=hostids_&srcfld1=hostid'.
+						'&real_hosts=1&multiselect=1',
+					'width' => 450,
+					'height' => 450,
+					'buttonClass' => 'input filter-multiselect-select-button'
+				)
+			)),
+			'inputcol'
+		),
+		new CCol(bold(_('Show items without data').':'), 'label'),
+		new CCol(new CCheckBox('show_without_data', $filter['showWithoutData'], null, 1), 'inputcol')
+	)
+);
+
+$filterTable->addRow(array(
+	new CCol(bold(_('Application').':'), 'label'),
+	new CCol(
+		array(
+			new CTextBox('application', $filter['application']),
+			new CButton('application_name', _('Select'),
+				'return PopUp("popup.php?srctbl=applications&srcfld1=name&real_hosts=1&dstfld1=application'.
+					'&with_applications=1&dstfrm='.$filterForm->getName().'");',
+				'filter-select-button'
+			)
+		),
+		'inputcol'
+	),
+	new CCol(bold(_('Show details').':'), 'label'),
+	new CCol(new CCheckBox('show_details', $filter['showDetails'], null, 1), 'inputcol'),
+));
+
+$filterButton = new CSubmit('filter_set', _('Filter'), 'chkbxRange.clearSelectedOnFilterChange();');
+$filterButton->useJQueryStyle();
+
+$resetButton = new CSubmit('filter_rst', _('Reset'), 'chkbxRange.clearSelectedOnFilterChange();');
+$resetButton->useJQueryStyle();
+
+$divButtons = new CDiv(array($filterButton, SPACE, $resetButton));
+$divButtons->setAttribute('style', 'padding: 4px 0px;');
+
+$filterTable->addRow(new CCol($divButtons, 'controls', 4));
+
+$filterForm->addItem($filterTable);
 
 $latestWidget->addFlicker($filterForm, CProfile::get('web.latest.filter.state', 0));
 $latestWidget->addPageHeader(_('LATEST DATA'), get_icon('fullscreen', array('fullscreen' => $_REQUEST['fullscreen'])));
 
+$form = new CForm('GET', 'history.php');
+$form->setName('items');
+$form->addVar('action', HISTORY_BATCH_GRAPH);
+
 // table
-$table = new CTableInfo(_('No values found.'));
+$table = new CTableInfo(($filterSet) ? _('No values found.') : _('Specify some filter condition to see the values.'));
 
-if (getRequest('hostid')) {
+if ($singleHostSelected) {
 	$hostHeader = null;
 	$hostColumn = null;
 }
 else {
-	$hostHeader = make_sorting_header(_('Host'), 'host');
+	$hostHeader = make_sorting_header(_('Host'), 'host', $sortField, $sortOrder);
 	$hostHeader->addClass('latest-host');
 	$hostHeader->setAttribute('title', _('Host'));
 
-	$hostColumn = SPACE;
+	$hostColumn = '';
 }
 
-$nameHeader = make_sorting_header(_('Name'), 'name');
+$nameHeader = make_sorting_header(_('Name'), 'name', $sortField, $sortOrder);
 $nameHeader->setAttribute('title', _('Name'));
 
-$lastCheckHeader = make_sorting_header(_('Last check'), 'lastclock');
+$lastCheckHeader = make_sorting_header(_('Last check'), 'lastclock', $sortField, $sortOrder);
 $lastCheckHeader->addClass('latest-lastcheck');
 $lastCheckHeader->setAttribute('title', _('Last check'));
 
@@ -335,7 +465,11 @@ $lastValueHeader->setAttribute('title', _('Last value'));
 $lastDataHeader = new CCol(new CSpan(_x('Change', 'noun in latest data')), 'latest-data');
 $lastDataHeader->setAttribute('title', _x('Change', 'noun in latest data'));
 
-if ($filterShowDetails) {
+$checkAllCheckbox = new CCheckBox('all_items', null, "checkAll('".$form->getName()."', 'all_items', 'itemids');");
+
+$checkAllCheckboxCol = new CCol($checkAllCheckbox, 'latest-checkbox');
+
+if ($filter['showDetails']) {
 	$intervalHeader = new CCol(new CSpan(_('Interval')), 'latest-interval');
 	$intervalHeader->setAttribute('title', _('Interval'));
 
@@ -354,6 +488,7 @@ if ($filterShowDetails) {
 	$table->addClass('latest-details');
 	$table->setHeader(array(
 		new CCol(new CDiv(null, 'app-list-toggle-all icon-plus-9x9')),
+		$checkAllCheckboxCol,
 		$hostHeader,
 		$nameHeader,
 		$intervalHeader,
@@ -363,19 +498,20 @@ if ($filterShowDetails) {
 		$lastCheckHeader,
 		$lastValueHeader,
 		$lastDataHeader,
-		new CCol(SPACE, 'latest-actions'),
+		new CCol(null, 'latest-actions'),
 		$infoHeader
 	));
 }
 else {
 	$table->setHeader(array(
 		new CCol(new CDiv(null, 'app-list-toggle-all icon-plus-9x9')),
+		$checkAllCheckboxCol,
 		$hostHeader,
 		$nameHeader,
 		$lastCheckHeader,
 		$lastValueHeader,
 		$lastDataHeader,
-		new CCol(SPACE, 'latest-actions')
+		new CCol(null, 'latest-actions')
 	));
 }
 
@@ -398,7 +534,7 @@ foreach ($items as $key => $item){
 
 	// last check time and last value
 	if ($lastHistory) {
-		$lastClock = zbx_date2str(_('d M Y H:i:s'), $lastHistory['clock']);
+		$lastClock = zbx_date2str(DATE_TIME_FORMAT_SECONDS, $lastHistory['clock']);
 		$lastValue = formatHistoryValue($lastHistory['value'], $item, false);
 	}
 	else {
@@ -432,29 +568,33 @@ foreach ($items as $key => $item){
 			&& (($config['hk_trends_global'] && $config['hk_trends'] == 0) || $item['trends'] == 0)
 	);
 
+	$checkbox = new CCheckBox('itemids['.$item['itemid'].']', null, null, $item['itemid']);
+	$checkbox->removeAttribute('id');
+
 	if ($item['value_type'] == ITEM_VALUE_TYPE_FLOAT || $item['value_type'] == ITEM_VALUE_TYPE_UINT64) {
 		$actions = $showLink
 			? UNKNOWN_VALUE
-			: new CLink(_('Graph'), 'history.php?action=showgraph&itemid='.$item['itemid']);
+			: new CLink(_('Graph'), 'history.php?action='.HISTORY_GRAPH.'&itemids[]='.$item['itemid']);
 	}
 	else {
 		$actions = $showLink
 			? UNKNOWN_VALUE
-			: new CLink(_('History'), 'history.php?action=showvalues&itemid='.$item['itemid']);
+			: new CLink(_('History'), 'history.php?action='.HISTORY_VALUES.'&itemids[]='.$item['itemid']);
+		$checkbox->setEnabled(false);
 	}
 
 	$stateCss = ($item['state'] == ITEM_STATE_NOTSUPPORTED) ? 'unknown' : '';
 
-	if ($filterShowDetails) {
+	if ($filter['showDetails']) {
 		// item key
 		$itemKey = ($item['type'] == ITEM_TYPE_HTTPTEST || $item['flags'] == ZBX_FLAG_DISCOVERY_CREATED)
 			? new CSpan($item['key_expanded'], 'enabled')
 			: new CLink($item['key_expanded'], 'items.php?form=update&itemid='.$item['itemid'], 'enabled');
 
 		// info
-		if ($item['status'] == ITEM_STATUS_ACTIVE && !zbx_empty($item['error'])) {
-			$info = new CDiv(SPACE, 'status_icon iconerror');
-			$info->setHint($item['error'], '', 'on');
+		if ($item['status'] == ITEM_STATUS_ACTIVE && $item['error'] !== '') {
+			$info = new CDiv(null, 'status_icon iconerror');
+			$info->setHint($item['error'], 'on');
 		}
 		else {
 			$info = '';
@@ -469,7 +609,8 @@ foreach ($items as $key => $item){
 		}
 
 		$row = new CRow(array(
-			SPACE,
+			'',
+			$checkbox,
 			$hostColumn,
 			new CCol(new CDiv(array($item['name_expanded'], BR(), $itemKey), $stateCss.' item')),
 			new CCol(new CSpan(
@@ -490,7 +631,8 @@ foreach ($items as $key => $item){
 	}
 	else {
 		$row = new CRow(array(
-			SPACE,
+			'',
+			$checkbox,
 			$hostColumn,
 			new CCol(new CSpan($item['name_expanded'], $stateCss.' item')),
 			new CCol(new CSpan($lastClock, $stateCss)),
@@ -504,9 +646,11 @@ foreach ($items as $key => $item){
 	foreach ($item['applications'] as $itemApplication) {
 		$applicationId = $itemApplication['applicationid'];
 
-		$applications[$applicationId]['item_cnt']++;
-		// objects may have different properties, so it's better to use a copy of it
-		$tab_rows[$applicationId][] = clone $row;
+		if (isset($applications[$applicationId])) {
+			$applications[$applicationId]['item_cnt']++;
+			// objects may have different properties, so it's better to use a copy of it
+			$tab_rows[$applicationId][] = clone $row;
+		}
 	}
 
 	// remove items with applications from the collection
@@ -522,7 +666,7 @@ foreach ($applications as $appid => $dbApp) {
 
 	$openState = CProfile::get('web.latest.toggle', null, $dbApp['applicationid']);
 
-	$toggle = new CDiv(SPACE, 'app-list-toggle icon-plus-9x9');
+	$toggle = new CDiv(null, 'app-list-toggle icon-plus-9x9');
 	if ($openState) {
 		$toggle->addClass('icon-minus-9x9');
 	}
@@ -531,21 +675,23 @@ foreach ($applications as $appid => $dbApp) {
 
 	$hostName = null;
 
-	if ($_REQUEST['hostid'] == 0) {
+	if (!$singleHostSelected) {
 		$hostName = new CSpan($host['name'],
 			'link_menu menu-host'.(($host['status'] == HOST_STATUS_NOT_MONITORED) ? ' not-monitored' : '')
 		);
+
 		$hostName->setMenuPopup(CMenuPopupHelper::getHost($host, $hostScripts[$host['hostid']]));
 	}
 
 	// add toggle row
 	$table->addRow(array(
 		$toggle,
+		'',
 		$hostName,
 		new CCol(array(
 				bold($dbApp['name']),
-				SPACE.'('._n('%1$s Item', '%1$s Items', $dbApp['item_cnt']).')'
-			), null, $filterShowDetails ? 10 : 5)
+				' ('._n('%1$s Item', '%1$s Items', $dbApp['item_cnt']).')'
+			), null, $filter['showDetails'] ? 10 : 5)
 	), 'odd_row');
 
 	// add toggle sub rows
@@ -574,7 +720,7 @@ foreach ($items as $item) {
 
 	// last check time and last value
 	if ($lastHistory) {
-		$lastClock = zbx_date2str(_('d M Y H:i:s'), $lastHistory['clock']);
+		$lastClock = zbx_date2str(DATE_TIME_FORMAT_SECONDS, $lastHistory['clock']);
 		$lastValue = formatHistoryValue($lastHistory['value'], $item, false);
 	}
 	else {
@@ -609,30 +755,34 @@ foreach ($items as $item) {
 			&& (($config['hk_trends_global'] && $config['hk_trends'] == 0) || $item['trends'] == 0)
 	);
 
+	$checkbox = new CCheckBox('itemids['.$item['itemid'].']', null, null, $item['itemid']);
+	$checkbox->removeAttribute('id');
+
 	if ($item['value_type'] == ITEM_VALUE_TYPE_FLOAT || $item['value_type'] == ITEM_VALUE_TYPE_UINT64) {
 		$actions = $showLink
 			? UNKNOWN_VALUE
-			: new CLink(_('Graph'), 'history.php?action=showgraph&itemid='.$item['itemid']);
+			: new CLink(_('Graph'), 'history.php?action='.HISTORY_GRAPH.'&itemids[]='.$item['itemid']);
 	}
 	else {
 		$actions = $showLink
 			? UNKNOWN_VALUE
-			: new CLink(_('History'), 'history.php?action=showvalues&itemid='.$item['itemid']);
+			: new CLink(_('History'), 'history.php?action='.HISTORY_VALUES.'&itemids[]='.$item['itemid']);
+		$checkbox->setEnabled(false);
 	}
 
 	$stateCss = ($item['state'] == ITEM_STATE_NOTSUPPORTED) ? 'unknown' : '';
 
 	$host = $hosts[$item['hostid']];
-	if ($filterShowDetails) {
+	if ($filter['showDetails']) {
 		// item key
 		$itemKey = ($item['type'] == ITEM_TYPE_HTTPTEST || $item['flags'] == ZBX_FLAG_DISCOVERY_CREATED)
 			? new CSpan($item['key_expanded'], 'enabled')
 			: new CLink($item['key_expanded'], 'items.php?form=update&itemid='.$item['itemid'], 'enabled');
 
 		// info
-		if ($item['status'] == ITEM_STATUS_ACTIVE && !zbx_empty($item['error'])) {
-			$info = new CDiv(SPACE, 'status_icon iconerror');
-			$info->setHint($item['error'], '', 'on');
+		if ($item['status'] == ITEM_STATUS_ACTIVE && $item['error'] !== '') {
+			$info = new CDiv(null, 'status_icon iconerror');
+			$info->setHint($item['error'], 'on');
 		}
 		else {
 			$info = '';
@@ -647,7 +797,8 @@ foreach ($items as $item) {
 		}
 
 		$row = new CRow(array(
-			SPACE,
+			'',
+			$checkbox,
 			$hostColumn,
 			new CCol(new CDiv(array($item['name_expanded'], BR(), $itemKey), $stateCss.' item')),
 			new CCol(new CSpan(
@@ -668,7 +819,8 @@ foreach ($items as $item) {
 	}
 	else {
 		$row = new CRow(array(
-			SPACE,
+			'',
+			$checkbox,
 			$hostColumn,
 			new CCol(new CSpan($item['name_expanded'], $stateCss.' item')),
 			new CCol(new CSpan($lastClock, $stateCss)),
@@ -692,7 +844,7 @@ foreach ($hosts as $hostId => $dbHost) {
 
 	$openState = CProfile::get('web.latest.toggle_other', null, $host['hostid']);
 
-	$toggle = new CDiv(SPACE, 'app-list-toggle icon-plus-9x9');
+	$toggle = new CDiv(null, 'app-list-toggle icon-plus-9x9');
 	if ($openState) {
 		$toggle->addClass('icon-minus-9x9');
 	}
@@ -701,23 +853,25 @@ foreach ($hosts as $hostId => $dbHost) {
 
 	$hostName = null;
 
-	if ($_REQUEST['hostid'] == 0) {
+	if (!$singleHostSelected) {
 		$hostName = new CSpan($host['name'],
 			'link_menu menu-host'.(($host['status'] == HOST_STATUS_NOT_MONITORED) ? ' not-monitored' : '')
 		);
+
 		$hostName->setMenuPopup(CMenuPopupHelper::getHost($host, $hostScripts[$host['hostid']]));
 	}
 
 	// add toggle row
 	$table->addRow(array(
 		$toggle,
+		'',
 		$hostName,
 		new CCol(
 			array(
 				bold('- '.('other').' -'),
-				SPACE.'('._n('%1$s Item', '%1$s Items', $dbHost['item_cnt']).')'
+				' ('._n('%1$s Item', '%1$s Items', $dbHost['item_cnt']).')'
 			),
-			null, $filterShowDetails ? 10 : 5
+			null, $filter['showDetails'] ? 10 : 5
 		)
 	), 'odd_row');
 
@@ -732,7 +886,16 @@ foreach ($hosts as $hostId => $dbHost) {
 	}
 }
 
-$latestWidget->addItem($table);
+$goBox = new CComboBox('graphtype', GRAPH_TYPE_STACKED, null, array(
+	GRAPH_TYPE_STACKED => _('Display stacked graph'),
+	GRAPH_TYPE_NORMAL => _('Display graph')
+));
+$goBox->setAttribute('id', 'go');
+$goButton = new CSubmit('goButton', _('Go').' (0)');
+
+$form->addItem(array($table, get_table_header(array($goBox, $goButton))));
+
+$latestWidget->addItem($form);
 $latestWidget->show();
 
 require_once dirname(__FILE__).'/include/page_footer.php';
diff --git a/frontends/php/locale/bg/LC_MESSAGES/frontend.po b/frontends/php/locale/bg/LC_MESSAGES/frontend.po
index 166ee97f599..8d47fc86231 100644
--- a/frontends/php/locale/bg/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/bg/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-01-12 23:52+0300\n"
 "Last-Translator: Fahri <fahri_hasan@hotmail.com>\n"
 "Language-Team: \n"
@@ -15,29 +15,31 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1358027539.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" трябва да бъде между 1970.01.01 и 2038.01.18"
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Покажи ОК тригерите\" трябва да е \"0\" или положително число."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Мигане на тригерите при промяна в състоянието\" трябва да е \"0\" или положително число."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,24 +51,22 @@ msgstr[1] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (година %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Елемент на данните"
 msgstr[1] "%1$s Елементи на данните"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -81,7 +81,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -102,23 +102,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d устройство"
 msgstr[1] "%d устройства"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - безкрайно)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(в дни)"
 
@@ -126,34 +126,34 @@ msgstr "(в дни)"
 msgid "(in sec)"
 msgstr "(в сек)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(минимум 60 секунди, 0 - използване подразбиращото се)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(без прокси)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[ОБЩО ПОТВЪРЖДАВАНЕ]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 или 1"
 
@@ -169,7 +169,7 @@ msgstr "10 секунди"
 msgid "30 seconds"
 msgstr "30 секунди"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D преглед"
 
@@ -185,7 +185,7 @@ msgstr "5 секунди"
 msgid "500 latest values"
 msgstr "500 последни стойности"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -204,12 +204,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ПОТВЪРЖДАВАНЕ НА АЛАРМА"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "И"
 
@@ -221,19 +220,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "ДОКЛАД ЗА ИЗПОЛЗВАЕМОСТ"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Абсолютната разлика между последната и предишна стойност е < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Абсолютната разлика между последната и предишна стойност е = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Абсолютната разлика между последната и предишна стойност е > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Абсолютната разлика между последната и предишна стойност НЕ е N"
 
@@ -245,42 +244,42 @@ msgstr "Допустимо ниво SLA"
 msgid "Access denied!"
 msgstr "Достъпът отказан!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Акаунтът е блокиран за %s секунди"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Потвърдено"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Потвърждавам"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Потвърждение добавено"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Потвърждение аларма от"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Потвърждение и назад"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Потвърждаване на състояние"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Потвърдено"
 
@@ -305,62 +304,65 @@ msgstr "Потвърждаване изключено"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Действие"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "В действието \"%1$s\" е зададена неправилна стойност за \"esc_period\" (минимум %2$s секунди)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Действие добавено"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Действие изтрито"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -373,21 +375,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Действие на операции"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Действие актуализирано"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Действия"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Активен"
@@ -397,80 +399,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Активно"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Активно с"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Активно до"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Добави"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Добави коментар от"
 
@@ -486,27 +491,23 @@ msgstr "Добави хост"
 msgid "Add link"
 msgstr "Добави връзка"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Добави липсващ"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Добави прототип"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Добави към"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Добави към любими"
@@ -515,7 +516,7 @@ msgstr "Добави към любими"
 msgid "Add to host group"
 msgstr "Добави към хост група"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Добави към хост групи"
 
@@ -527,7 +528,7 @@ msgstr "Добавено"
 msgid "Admin"
 msgstr "Администратор"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Администрация"
 
@@ -535,34 +536,34 @@ msgstr "Администрация"
 msgid "Advanced labels"
 msgstr "Разширени етикети"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Възраст"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Възраст по-малка от"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Възраст по-малка от %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Агент"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Интерфейси на агента"
@@ -571,12 +572,12 @@ msgstr "Интерфейси на агента"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Интерфейс на Агента или SNMP или JMX или IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Псевдоним"
 
@@ -584,123 +585,126 @@ msgstr "Псевдоним"
 msgid "Align icons"
 msgstr "Подравняване на иконите"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Всички"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Всички групи"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Във всички връзки трябва да са уточнени \"Име\" и \"URL\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Позволени хостове"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Някой"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Всеки включващ символен низ"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Приложение"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Приложението \"%1$s\" вече съществува."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Приложение добавено"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Приложение изтрито"
 msgstr[1] "Приложение изтрито"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Грешка в приложението."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Приложение актуализирано"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Приложение с ID \"%1$s\" не е налично за \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Приложения"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Прилагане"
 
@@ -709,16 +713,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Приближаване"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Апр"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Април"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Сигурен ли сте, че искате да извършите това действие?"
 
@@ -734,9 +738,9 @@ msgstr "Размер на област"
 msgid "Area type"
 msgstr "Тип област"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -750,52 +754,49 @@ msgstr "Като обикновен текст"
 msgid "Asset tag"
 msgstr "Собсвеник етикет "
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "В (час:минута)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Трябва да бъде избран най-малко един хост или група."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Трябва да бъдат създаден най-малко един период на поддръжка."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Одит"
@@ -815,26 +816,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Авг"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Август"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Автентификация"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Алгоритъм за автентификация"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -893,9 +896,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -904,20 +907,20 @@ msgstr "Автоматично"
 msgid "Automatic icon mapping"
 msgstr "Автоматично съответствие на икона"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Автоматичен избор на икона"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Наличност"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Доклад за наличност"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Наличен"
 
@@ -926,36 +929,36 @@ msgstr "Наличен"
 msgid "Average"
 msgstr "Среден"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Средно от"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Средната стойност за периода T е < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Средната стойност за периода T е = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Средната стойност за периода T е > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Средната стойност за периода T НЕ е N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Мястото на X-ос"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "Б"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Фон"
@@ -964,7 +967,7 @@ msgstr "Фон"
 msgid "Background image"
 msgstr "Фоново изображение"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Бар доклади"
 
@@ -974,8 +977,8 @@ msgid "Base DN"
 msgstr "База данни за търсене (Base DN)"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Основна автентификация"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -987,15 +990,15 @@ msgstr "Име на връзката (Bind DN)"
 msgid "Bind password"
 msgstr " Парола за връзката (Bind password)"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Черен & Син"
 
@@ -1007,8 +1010,8 @@ msgstr "Мигане"
 msgid "Blocked"
 msgstr "Блокиран"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Дебела линия"
 
@@ -1016,22 +1019,22 @@ msgstr "Дебела линия"
 msgid "Boolean"
 msgstr "Логически"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Долен"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Ярък"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Български (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Общо потвърждаване"
 
@@ -1057,7 +1060,7 @@ msgstr "КОНФИГУРАЦИЯ НА ПРИЛОЖЕНИЯ"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "КОНФИГУРАЦИЯ НА АВТЕНТИКАЦИЯ"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1087,7 +1090,7 @@ msgstr "КОНФИГУРАЦИЯ НА ХОСТ ГРУПИ"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "КОНФИГУРАЦИЯ НА ХОСТОВЕ"
 
@@ -1100,7 +1103,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "КОНФИГУРАЦИЯ СЪОТВЕТСТВИЕ НА ИКОНА"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "КОНФИГУРАЦИЯ НА ИЗОБРАЖЕНИЯ"
 
@@ -1109,14 +1112,14 @@ msgstr "КОНФИГУРАЦИЯ НА ИЗОБРАЖЕНИЯ"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "КОНФИГУРАЦИЯ НА IT УСЛУГИТЕ"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "КОНФИГУРАЦИЯ НА ЕЛЕМЕНТ НА ДАННИТЕ ПРОТОТИПИ"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "КОНФИГУРАЦИЯ НА елементи на данните"
 
@@ -1145,7 +1148,7 @@ msgstr "КОНФИГУРАЦИЯ КАРТИ НА МРЕЖАТА"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "КОНФИГУРАЦИЯ НА ПРОКСИТА"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "КОНФИГУРАЦИЯ НА РЕГУЛЯРНИ ИЗРАЗИ"
 
@@ -1165,7 +1168,7 @@ msgstr "КОНФИГУРАЦИЯ НА СКРИПТОВЕ"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "КОНФИГУРАЦИЯ НА СЛАЙДШОУ"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "КОНФИГУРАЦИЯ НА ШАБЛОНИТЕ"
 
@@ -1181,7 +1184,7 @@ msgstr "КОНФИГУРАЦИЯ ВАЖНОСТ НА ТРИГЕР "
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "КОНФИГУРАЦИЯ НА ТРИГЕРИ"
 
@@ -1213,22 +1216,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "КОНФИГУРАЦИЯ НА ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1237,21 +1240,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Изчисли SLA, допустимо ниво SLA (в %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Изчислено"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Последни права за достъп"
 
@@ -1259,92 +1262,95 @@ msgstr "Последни права за достъп"
 msgid "Callback"
 msgstr "Обратно повикване"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Канада (136 символа)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Отказ"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Събитието не може да се потвърди"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Не може да се добави действие"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Не може да се добави приложение"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Не може да се добави зависимост от хост към шаблон."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Не може да се добави зависимост от тригер \"%1$s:%2$s\" към несъществуващ тригер \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Не може да се добави правило за откриване"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Не може да се добави графика"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Не може да се добави група"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Не може да се добави потребител"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1352,24 +1358,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Не може да се добави изображение"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Не може да се добави изображение."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Не може да се добави елемент на данните"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1377,20 +1383,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr "Не може да се добави макро."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Не може да се добави поддръжка"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Не може да се добави метод на уведомление"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Не може да се добави повече от един елемент на данните от тип \"Графична сума\" в графика \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1399,24 +1405,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Не може да се добави карта на мрежата"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Не може да се добави ново приложение \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Не може да се добави прокси"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Не може да се добави регулярен израз"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Не може да се добави екран"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Не може да се добави скрипт"
 
@@ -1428,27 +1434,27 @@ msgstr "Не може да се добави услуга"
 msgid "Cannot add slide show"
 msgstr "Не може да се добави слайдшоу"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Не може да се добави шаблон"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Не може да се добави тригер"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Не може да се добави потребител"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Не може да се добави потребител. И двете пароли трябва да бъдат еднакви."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Не може да се добавят потребители."
 
@@ -1456,7 +1462,7 @@ msgstr "Не може да се добавят потребители."
 msgid "Cannot add value map"
 msgstr "Не може да се добави стойност на реализациите"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Не може да се добави уеб сценарий"
 
@@ -1476,23 +1482,23 @@ msgstr "Не може да се промени метода на автенти�
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Не може да се промени метода на автентификация на Zabbix вътрешен"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Не може да се изчисти историята"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Не може да се клонират графичните прототипи"
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Не може да се клонират елемент на данните прототипи"
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Не може да се клонират тригер прототипите"
 
@@ -1500,20 +1506,20 @@ msgstr "Не може да се клонират тригер прототипи
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Не може да се свърже към трапер порта на Zabbix сървър демона, но той трябва да бъде наличен за да тръгне скрипта."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Не може да се копират графиките"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Не може да се копират елементите от данните"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Не може да се копира тригер \"%1$s:%2$s\", защото има множество хостове в израза."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1522,19 +1528,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "Не може да се създаде друга връзка към базата данни."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Не може да създаде циклична зависимост."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Не може да се създаде зависимост на тригера от себе си."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Не може да се създаде правило за откриване"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Не може да се създаде хост група."
 
@@ -1543,102 +1549,102 @@ msgstr "Не може да се създаде хост група."
 msgid "Cannot create icon map"
 msgstr "Не може да се създаде съответствие на икона"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, fuzzy, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Не може да се създаде съответствие на икона с идентично име \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Не може да се създаде карта  \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Не може да се създаде ново приложение, вече е възложен уеб сценарий за приложението."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Не може да се създаде нов елемент"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Не може да се създаде екран."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Не може да се изтрие Zabbix вътрешен потребител \"%1$s\", опитайте с изключване на този потребител."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Не може да се изтрие действието"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Не може да се изтрие приложението"
 msgstr[1] "Не може да се изтрие приложението"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Не може да се изтрие зависимостта"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Не може да се изтрие правило за откриване"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Не може да се изтрият правилата за откриване"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Не може да се изтрие графиката"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Не може да се изтрие графичния прототип"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Не може да се изтрие графиката."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Не може да се изтрият графиките"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Не може да се изтрият графиките, създадени с ниско ниво на откриване."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Не може да се изтрие групата"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Не може да се изтрие групата"
+msgstr[1] "Не може да се изтрие групата"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Не може да се изтрие хоста"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Не може да се изтрие хост групата."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1647,79 +1653,79 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "Не може да се изтрие съответствие на икона"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Не може да се изтрие изображението"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Не може да се изтрият инвентарните данни."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Не може да се изтрие елемент на данните"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Не може да се изтрият елементите от данните"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Не може да се изтрият елементите от данните, създадени с ниско ниво на откриване."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Не може да се изтрие поддръжката"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Не може да се изтрие метод на уведомление"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Не може да се изтрие картата на мрежата"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Не може да се изтрие проксито"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Не може да се изтрие регулярния израз"
 msgstr[1] "Не може да се изтрият регулярните изрази"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Не може да се изтрие екрана"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Не може да се изтрие скрипта"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Не може да се изтрият скриптовете. Празен входен параметър \"scriptids\"."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Не може да се изтрият скриптовете. Скрипт \"%1$s\" се използва в операция на действие \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Не може да се изтрият избраните действия "
 
@@ -1727,77 +1733,80 @@ msgstr "Не може да се изтрият избраните действи
 msgid "Cannot delete service"
 msgstr "Не може да се изтрие услугата"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Не може да се изтрие слайдшоу"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Не може да се изтрие шаблона"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Не може да се изтрият шаблонни графики."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Не може да се изтрие шаблонния елемент на данните."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Не може да се изтрият шаблонни елементи на данните"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Не може да се изтрият шаблонни елементи на данните."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Не може да се изтрие шаблонния тригер \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Не може да се изтрие шаблон на уеб сценарий \"%1$s\"."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Не може да се изтрие тригера"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Не може да се изтрие шаблонния тригер прототипа"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Не може да се изтрие тригера."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Не може да се изтрият тригерите"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Не може да се изтрият тригерите, създадени с ниско ниво на откриване."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Не може да се изтрие потребителя"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Не може да се изтрие потребителско уведомление."
 
@@ -1805,78 +1814,78 @@ msgstr "Не може да се изтрие потребителско увед
 msgid "Cannot delete value map"
 msgstr "Не може да се изтрие стойност на реализациите"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Не може да се изтрие уеб сценарий"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Не може да се изключи метод на уведомление"
 msgstr[1] "Не може да се изключи метод на уведомление"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1891,135 +1900,129 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Не може да се активира метод на уведомление"
 msgstr[1] "Не може да се активира метод на уведомление"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Не може да се намери фоновото изображение \"%1$s\" използвано в карта \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не може да се намери графиката \"%1$s\" използвана в екран \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Не може да се намери групата \"%1$s\" използвана в карта \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не може да се намери групата \"%1$s\" използвана в екран \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Не може да се намери хоста \"%1$s\" използван в карта \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не може да се намери хоста \"%1$s\" използван в екран \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Не може да се намери хост интефейса в \"%1$s\" за елемент на данните ключ \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2030,34 +2033,53 @@ msgstr "Не може да се намери иконата  \"%1$s\" изпол
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Не може да се намери съответствие на икона \"%1$s\" използвана в карта на мрежата \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не може да се намери елемент на данните \"%1$s\" използван в екран \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Не може да се намери картата \"%1$s\" използвана в изнесената карта \"%2$s\"."
@@ -2067,41 +2089,41 @@ msgstr "Не може да се намери картата \"%1$s\" изпол�
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Не може да се намери картата \"%1$s\" използвана в карта \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не може да се намери картата \"%1$s\" използвана в екран \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Не може да се намерят обектите с име"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не може да се намери екрана \"%1$s\" използван в екран \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Не може да се намери тригера \"%1$s\" използван в карта \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2114,12 +2136,14 @@ msgstr "Не може да се изгради дървовидна структ
 msgid "Cannot format tree."
 msgstr "Не може да се изгради дървовидна структора."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Не може да се отвори израз \"%s\"."
@@ -2131,59 +2155,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Неуспешно свързване с \"view file\" \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Не може да вмъкне потребителско уведомление."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Не може да се върже шаблона"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Неуспешно излизане от системата."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Неуспешно общо актуализиране името на хоста."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Неуспешно общо актуализиране видимото име на хоста."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Неправилни ID-та на дублиран шаблон за връзката: %s."
@@ -2203,7 +2228,7 @@ msgstr "Невъзможно е да се изпълни актуализира�
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Невъзможно е да се изпълни актуализирането на таблица \"%1$s\" без израз where."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2212,11 +2237,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Не може да се премахнат всички елементи на данните, трябва да остане поне един елемент на данните."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2224,11 +2249,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Грешка при изтриване на макрос."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Не може да се преименува гост потребителя."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Правилата за откриване не може да се запишат без проверка."
 
@@ -2237,217 +2262,226 @@ msgstr "Правилата за откриване не може да се за�
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Не може да се зададе \"templateid\" за приложения \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Не може да се зададе \"templateid\" за екран \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Не може да се зададе \"templateid\" за тригер прототип \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Не може да се превключи хоста на мрежовия интерфейс."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Не може да се деблокират потребителите"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Не може да се премахнат и изчистят уеб сценариите."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Не може да се премахнат и изчистят правилата за откриване"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Не може да се премахнат и изчистят графичните прототипи"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Не може да се премахнат и изчистят графиките."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Не може да се премахнат и изчистят елемент на данните прототипите"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Не може да се премахнат и изчистят елементите от данните"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Не може да се премахнат и изчистят тригерите"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Не може да се премахне шаблона"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Не може да се премахне тригер \"%s\", той има елементи на данните от шаблона, които са останали свързани към хост."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Не може да се актуализира \"templateid\" за приложение \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Не може да се актуализира \"templateid\" за графика \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Не може да се актуализира \"templateid\" за екран \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Не може да се актуализира \"templateid\" за тригер прототип \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Не може да се актуализира действието"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Не може да се актуализира приложението"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Не може да се актуализира коментара"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Не може да се актуализира конфигурацията"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Не може да се актуализира режима за отстраняване на грешки"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Не може да се актуализират правилата за откриване"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Не може да се актуализира достъпа до уеб интерфейс"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Не може да се актуализира графиката"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Не може да се актуализира групата"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Не може да се актуализира групата."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Не може да се актуализира хоста"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Не може да се актуализират хостовете"
 
@@ -2460,24 +2494,24 @@ msgstr "Не може да се актуализира съответствие
 msgid "Cannot update image"
 msgstr "Не може да се актуализира изображението"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Не може да се актуализира изображението."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Не може да се актуализира елемент на данните"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Не може да се актуализират елементите на данните"
 
@@ -2489,16 +2523,16 @@ msgstr "Не може да се актуализира макроса."
 msgid "Cannot update macros"
 msgstr "Не може да се актуализират макросите"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Не може да се актуализира поддръжката"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Не може да се актуализира карта на мрежата \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Не може да се актуализира метод на уведомление"
 
@@ -2506,28 +2540,24 @@ msgstr "Не може да се актуализира метод на увед�
 msgid "Cannot update network map"
 msgstr "Не може да се актуализира картата на мрежата"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Не може да се актуализира проксито"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Не може да се актуализират регуларните изрази"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Не може да се актуализира екрана"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Не може да се актуализира екрана."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Не може да се актуализира скрипта"
 
@@ -2539,40 +2569,41 @@ msgstr "Не може да се актуализират услугите"
 msgid "Cannot update slide show"
 msgstr "Не може да се актуализира слайдшоу"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Не може да се актуализира шаблона"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Не може да се актуализира тригера"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Не може да се актуализира потребителя"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Не може да се актуализира потребителското уведомление."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Не може да се актуализира потребителя. И двете пароли трябва да бъдат еднакви."
 
@@ -2580,15 +2611,15 @@ msgstr "Не може да се актуализира потребителя. �
 msgid "Cannot update value map"
 msgstr "Не може да се актуализира стойност на реализациите"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr " Не може да се актуализира уеб сценарий"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Заглавие"
 
@@ -2597,47 +2628,47 @@ msgstr "Заглавие"
 msgid "Case sensitive"
 msgstr "Чувствително към регистъра (отчитане на главни и малки букви)"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Центриран"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Промяна"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Промяна"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Промени парола"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Символ"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Включва символен низ "
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Не включва символен низ "
 
@@ -2646,48 +2677,48 @@ msgid "Chassis"
 msgstr "Шаси"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Проверката вече съществува."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Проверете част от израза започваща от \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Моля, проверете ключа. Пример показва по подразбиране."
 
@@ -2696,44 +2727,44 @@ msgid "Check type"
 msgstr "Проверете типа"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Проверки"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Проверките трябва да са уникални."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Китайски (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Китайски (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Цикличната връзка не може да бъде създадена за елемент от картата \"%s\"."
@@ -2748,34 +2779,35 @@ msgstr "Циклична връзка в карти: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Циклична връзка в екраните: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Циклична връзка в шаблоните: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Връзката към цикличен шаблон не е позволена."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Класически"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Изчисти"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Изчисти историята и динамиката на промените"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Изчисти историята за избраните"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Изчисти когато се прекрати връзката"
 
@@ -2785,69 +2817,69 @@ msgstr "Часовник"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Клониране"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Затвори"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Затвори израз конструктора"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Цвят"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, fuzzy, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "Цвят \"%1$s\" не е коректен: очаква шестнадесетичен код на цвят (6 символа)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Цвят (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 #, fuzzy
 msgid "Column span"
 msgstr "Участък на колоната"
@@ -2863,7 +2895,7 @@ msgstr "Комбиниран резултат"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Команда"
 
@@ -2871,41 +2903,31 @@ msgstr "Команда"
 msgid "Command actions"
 msgstr "Команда за действия"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Комапдата не може да бъде празна."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Команди"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Коментар актуализиран"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Коментари"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Коментари за \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Комерсиален"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Сравнете стойностите за многократни периоди"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Съставяне на права за достъп"
 
@@ -2913,29 +2935,39 @@ msgstr "Съставяне на права за достъп"
 msgid "Condition"
 msgstr "Условие"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Условия"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3099,23 +3131,23 @@ msgstr "Конфигурация актуализиране"
 msgid "Configure (Filter %s)"
 msgstr "Конфигуриране (Филтър %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Потвърждение текст"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Свържи се с"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Свързан като '%1$s'"
@@ -3174,7 +3206,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3182,30 +3214,37 @@ msgstr ""
 msgid "Contract number"
 msgstr "Номер за контакт"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Координати"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Копирай"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Копиране на избраните в ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Неправилен вход \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Не може да запази изображение!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Число"
 
@@ -3225,6 +3264,10 @@ msgstr "Създаване на приложение"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3242,7 +3285,7 @@ msgstr "Създаване на графика (първо изберете хо
 msgid "Create graph prototype"
 msgstr "Създаване на графични прототипи"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Създаване на хост"
 
@@ -3255,16 +3298,16 @@ msgstr "Създаване на хост група"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 #, fuzzy
 msgid "Create icon map"
 msgstr "Създаване съответствие на икона"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Създаване на изображение"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Създаване на елемент на данните"
 
@@ -3288,6 +3331,10 @@ msgstr "Създаване на карта"
 msgid "Create media type"
 msgstr "Създаване на метод на уведомление"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Създаване на прокси"
@@ -3312,11 +3359,11 @@ msgstr "Създаване на скрипт"
 msgid "Create slide show"
 msgstr "Създаване на слайдшоу"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Създаване на шаблон"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Създаване на тригер"
 
@@ -3340,42 +3387,42 @@ msgstr "Създаване на потребителска група"
 msgid "Create value map"
 msgstr "Създаване стойност на реализациите"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Създадено: Приложение \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Създадено: Правило за откриване \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Създадено: елемент на данните \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Създадено: елемент на данните прототип \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Създадено: Тригер \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Създадено: Тригер прототип \"%1$s\" в \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Създадено: Уеб сценарий \"%1$s\" в \"%2$s\"."
@@ -3385,51 +3432,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Текущата дата е < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Текущата дата е = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Текущата дата е > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Текущата дата НЕ е N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Текущ хост"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Текущото време е < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Текущото време е = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Текущото време е > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Текущото време НЕ е N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Текуща стойност"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3442,7 +3490,7 @@ msgstr "Персонализирани графики"
 msgid "Custom label"
 msgstr "Персонализиран етикет"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Персонализирания етикет за карта \"%2$s\" в елементите от тип \"%1$s\" не може да бъде празен."
@@ -3456,7 +3504,7 @@ msgstr "Персонализиран множител"
 msgid "Custom screens"
 msgstr "Персонализирани екрани"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Персонализиран скрипт"
 
@@ -3476,18 +3524,14 @@ msgstr "Персонализиран размер"
 msgid "Custom slides"
 msgstr "Персонализирани слайдове"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Чешки (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "КОНФИГУРАЦИЯ НА ПАНЕЛ"
@@ -3503,28 +3547,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "ПОДРОБНОСТИ ЗА СЦЕНАРИЯ"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "ИЗКЛЮЧЕНО"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "ОТКРИТО"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3532,25 +3576,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS име"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "НЕДОСТЪПНО"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Тъмно оранжево"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Тъмен"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Табло"
 
@@ -3562,20 +3606,21 @@ msgstr "Конфигурация на табло"
 msgid "Dashboard filter"
 msgstr "Филтър табло"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Пунктирана линия"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Данни"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3598,11 +3643,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Тип данни"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "База данни файл"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "База данни хост"
 
@@ -3610,35 +3656,39 @@ msgstr "База данни хост"
 msgid "Database monitor"
 msgstr "База данни монитор"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Име на база данни"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Парола на база данни"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Порт на база данни"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Схема на база данни"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "База данни сървър"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Тип на база данни"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "База данни потребител"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Дата"
 
@@ -3658,53 +3708,52 @@ msgstr "Дата за изтичане на поддръжката HW"
 msgid "Date HW purchased"
 msgstr "Дата на закупуване HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Ден"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Ден от месеца"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Деня от месеца е < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Деня от месеца е = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Деня от месеца е > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Деня от месеца НЕ е N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Ден от седмицата"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Деня от седмицата е < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Деня от седмицата е = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Деня от седмицата е > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Деня от седмицата НЕ е N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Дни"
 
@@ -3712,22 +3761,22 @@ msgstr "Дни"
 msgid "Debug"
 msgstr "Отстраняване на грешки"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Режим за отстраняване на грешки"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Режим за отстраняване на грешки актуализиран"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Дек"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Декември"
 
@@ -3737,15 +3786,14 @@ msgstr "Десетичен"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -3758,11 +3806,11 @@ msgid "Default delay (in seconds)"
 msgstr "Забавяне по подразбиране (в секунди)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Съобщение по подразбиране"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Продължителност по подразбиране на стъпка от операцията"
 
@@ -3785,30 +3833,34 @@ msgstr "Тема по подразбиране \"%1$s\"."
 msgid "Delay"
 msgstr "Закъснение"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Закъснение (в сек)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Закъснение с"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Изтриване"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Изтриване и изчистване"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Изтриване и изчистване на избраните шаблони? (Внимание: всички свързани хостове ще бъдат изчистени!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Изтриване и изчистване на шаблона? (Внимание: всички свързани хостове ще бъдат изчистени!)"
 
@@ -3816,54 +3868,54 @@ msgstr "Изтриване и изчистване на шаблона? (Вни�
 msgid "Delete application?"
 msgstr "Изтриване на приложението?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Изтриване на текущото действие?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Изтриване на правилото за откриване?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Изтриване на израза?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Изтриване на графиката?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Изтриване историята на избрания УЕБ сценарий?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Изтриване историята на избраните елементи на данните?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 #, fuzzy
 msgid "Delete icon map?"
 msgstr "Изтриване съответствие на икона?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Изтриване на елемент на данните?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Изтриване на ключова дума?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Изтриване на връзките между избраните елементи?"
 
@@ -3871,11 +3923,15 @@ msgstr "Изтриване на връзките между избраните �
 msgid "Delete maintenance period?"
 msgstr "Изтриване периода на поддръжка?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Изтриване карта на мрежата?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Изтриване на прокси?"
 
@@ -3883,7 +3939,7 @@ msgstr "Изтриване на прокси?"
 msgid "Delete regular expression?"
 msgstr "Изтриване на регулярен израз?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Изтриване на сценарий?"
 
@@ -3891,71 +3947,67 @@ msgstr "Изтриване на сценарий?"
 msgid "Delete screen?"
 msgstr "Изтриване на екран?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Изтриване на скрипт?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Изтриване на избраните"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Изтриване на избрания УЕБ сценарий?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Изтриване на избраните действия?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Изтриване на избраните приложения?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Изтриване на избраните правила за откриване?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Изтриване на избраните елементи?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Изтриване на избраните графики?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Изтриване на избраната група ?"
@@ -3964,27 +4016,27 @@ msgstr "Изтриване на избраната група ?"
 msgid "Delete selected groups?"
 msgstr "Изтриване на избраните групи?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Изтриване на избраните хост групи?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Изтриване на избрания хост?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Изтриване на избраните хостове?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Изтриване на избраното изображение?"
 
@@ -3992,31 +4044,31 @@ msgstr "Изтриване на избраното изображение?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Изтриване на избраните елементи на данните?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Изтриване на избрания период на поддръжка?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Изтриване на избраните карти?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Изтриване на избрания метод на уведомление?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Изтриване на избраните методи на уведомление?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Изтриване на избраните проксита?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Изтриване на избраните регулярни изрази?"
 
@@ -4024,15 +4076,15 @@ msgstr "Изтриване на избраните регулярни израз
 msgid "Delete selected screens?"
 msgstr "Изтриване на избраните екрани?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Изтриване на избраните скриптове?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Изтриване на избраните слайдшоу?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Изтриване на избраните шаблони?"
 
@@ -4044,11 +4096,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Изтриване на избраните тригери?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Изтриване на избрания потребител?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Изтриване на избраните потребители?"
 
@@ -4063,11 +4115,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Изтриване на избраната стойност на реализациите? То се използва от елемент на данните %d !"
 msgstr[1] "Изтриване на избраната стойност на реализациите? То се използва от елементи на данните %d !"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Изтриване на избраните и свързаните с тях елементи"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4076,15 +4132,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Изтриване на слайдшоу?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Изтриване на шаблон?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Изтриване на тригер?"
 
@@ -4092,62 +4148,62 @@ msgstr "Изтриване на тригер?"
 msgid "Deleted"
 msgstr "Изтрито"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Изтрито: Приложение \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Изтрито: Правило за откриване \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Изтрито: Графика \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Изтрито: Хост \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Изтрито: елемент на данните \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Изтрито: елемент на данните прототип \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Изтрито: Прокси \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Изтрито: Шаблон \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Изтрито: Тригер \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Изтрито: Тригер прототип \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Изтрит: Уеб сценарий \"%1$s\" в \"%2$s\"."
@@ -4156,35 +4212,35 @@ msgstr "Изтрит: Уеб сценарий \"%1$s\" в \"%2$s\"."
 msgid "Delimiter"
 msgstr "Разделител"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Делта (проста промяна)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Делта (скорост за секунда)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Отказ"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Зависимости"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Зависим"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Зависи от"
 
@@ -4192,30 +4248,41 @@ msgstr "Зависи от"
 msgid "Deployment status"
 msgstr "Състояние на разгръщане"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Описание"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Подробности"
 
@@ -4228,71 +4295,71 @@ msgid "Device"
 msgstr "Устройство"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Критерии уникалност на устройството "
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Разликата между МАКС и МИН стойност за период от T е < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Разликата между МАКС и МИН стойност за период от T е = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Разликата между МАКС и МИН стойност за период от T е > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Разликата между МАКС и МИН стойност за период от T НЕ е N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Разликата между последната и предходните стойности, тогава N = 1, 0 - в противен случай"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Разликата между последната и предходните стойности, тогава N НЕ Е 1, 0 - в противен случай"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Разликата между последната и предишна стойност е < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Разликата между последната и предишна стойност е = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Разликата между последната и предишна стойност е > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Разликата между последната и предишна стойност НЕ е N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4316,48 +4383,44 @@ msgstr "Изключване режим за отстраняване на гр�
 msgid "Disable host"
 msgstr "Изключване на хост"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Изключване на хост?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Изключване на хост в избраната хост група?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Изключване на хост, който се наблюдава от избраното прокси?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Изключване на избраните"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Изключване на избрания УЕБ сценарий?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Изключване на избраните действия?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Изключване на избраните приложения?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Изключване на избраните правила за откриване??"
 
@@ -4365,11 +4428,11 @@ msgstr "Изключване на избраните правила за отк�
 msgid "Disable selected groups?"
 msgstr "Изключване на избраните групи?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Изключване на избраните хостове?"
 
@@ -4377,42 +4440,47 @@ msgstr "Изключване на избраните хостове?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Изключване на избраните елементи на данните?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Изключване на избраните методи на уведомление?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Изключване на избраните тригери?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Изключено"
 
@@ -4425,7 +4493,7 @@ msgstr "Бедствие"
 msgid "Discovered"
 msgstr "Открит"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4433,17 +4501,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "Открито устройство"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Откриване"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Откриване чрез прокси"
 
@@ -4451,17 +4519,17 @@ msgstr "Откриване чрез прокси"
 msgid "Discovery check"
 msgstr "Проверка за откриване"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Проверки за откриване"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Списък за откриване"
 
@@ -4470,67 +4538,70 @@ msgid "Discovery object"
 msgstr "Обект за откриване"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Правило за откриване"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Правило за откриване \"%1$s\" вече съществува в \"%2$s\", наследен от друг шаблон."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "В правило за откриване \"%1$s:%2$s\" има неправилен период за съхранение на изгубените ресурси: \"%3$s\". (мин: %4$d, макс: %5$d, потребителско макро позволено)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Правило за откриване \"%s\" вече съществува."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "В правило за откриване \"%1$s:%2$s\" има неправилен период за съхранение на изгубените ресурси: \"%3$s\". (мин: %4$d, макс: %5$d, потребителско макро позволено)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Правило за откриване създадено"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Правило за откриване изтрито"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Правило за откриване актуализирано"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Правила за откриване"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Правила за откриване изтрити"
 
@@ -4542,7 +4613,7 @@ msgstr "Статус на откриване"
 msgid "Display OK triggers for"
 msgstr "Покажи тригерите OK за"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Показване"
 
@@ -4551,32 +4622,32 @@ msgstr "Показване"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Показване на %1$s от %2$s намерени"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Разпределение на стойностите за няколко елемента от данните"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Разпределение на стойностите за няколко периода"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Без изчисляване"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Желаете ли да замени условния израз?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Готово"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Точка"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Недостъпно"
@@ -4586,30 +4657,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недостъпен"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Време на прекъсване"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Плъзнете тук, за да промените типа на интерфейса на \"IPMI\" тип."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Плъзнете тук, за да промените типа на интерфейса на \"JMX\" тип."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Плъзнете тук, за да промените типа на интерфейса на \"SNMP\" тип."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Плъзнете тук, за да промените типа на интерфейса на \"agent\" тип."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Стил на рисуване"
 
@@ -4627,74 +4698,75 @@ msgstr "Първо влизане в падащо меню \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Запомни избраното в падащо меню \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Дублиране на зависимостите в тригер \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Дублиране на хост. Хост със същото име \"%s\" вече съществува в данните."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Дублиране на хост. Хост със същото видимо име \"%s\" вече съществува в данните."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Дублиране име на карта за карта \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Дублиране име на важност \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Дублиране на потребителски псевдоним \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Продължителност"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Продължителност (сек)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Холандски (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Динамичен елемент на данните"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "Е"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ГРЕШКА"
 
@@ -4702,13 +4774,13 @@ msgstr "ГРЕШКА"
 msgid "EVENTS"
 msgstr "СЪБИТИЯ"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Всеки URL адрес трябва да има уникално име. Моля, уверете се, че има само едно URL с това име "
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4716,9 +4788,9 @@ msgstr "Всеки URL адрес трябва да има уникално им
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Редактиране"
 
@@ -4726,7 +4798,7 @@ msgstr "Редактиране"
 msgid "Edit map element"
 msgstr "Редактиране елемент от карта"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Редактиране на тригер"
 
@@ -4734,27 +4806,61 @@ msgstr "Редактиране на тригер"
 msgid "Element"
 msgstr "Елемент"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Име на елемент"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Е-мейл"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Празен"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Състояние на действие празно."
 
@@ -4762,76 +4868,98 @@ msgstr "Състояние на действие празно."
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Празен входен параметър."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Празен вход."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Празно макро."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Празно име."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Празни параметри"
 
@@ -4840,11 +4968,11 @@ msgstr "Празни параметри"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4852,11 +4980,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Празен период от време.."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Активиране"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Активиране на потвърждение"
 
@@ -4876,11 +5008,11 @@ msgstr "Активиране потвърждаване на събитие"
 msgid "Enable host"
 msgstr "Активиране на хост"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Активиране на хост?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Активиране наблюдаване на хостове от избраните проксита?"
 
@@ -4893,36 +5025,32 @@ msgstr "Активиране наблюдаване на хостове от и�
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Активиране на избрани"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Активиране на избрания УЕБ сценарий?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Активиране на избраните действия?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Активиране на избраните приложения?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Активиране на избраните правила за откриване?"
 
@@ -4930,11 +5058,11 @@ msgstr "Активиране на избраните правила за отк�
 msgid "Enable selected groups?"
 msgstr "Активиране на избраните групи?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Активиране на избраните хостове?"
 
@@ -4942,64 +5070,68 @@ msgstr "Активиране на избраните хостове?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Активиране на избраните елементи на данните?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Активиране на избраните методи на уведомление?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Активиране на избраните тригери?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Активно"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Английски (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Английски (US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Грешка"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Грешка в заявката за търсене за таблица \"%1$s\"."
@@ -5017,15 +5149,15 @@ msgstr "Събитие"
 msgid "Event ID"
 msgstr "ID на събитие"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "ID-то на събитие от последния запис в регистъра съответства на регулярен израз T, тогава N = 1, 0 - в противен случай"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "ID-то на събитие от последния запис в регистъра съответства на регулярен израз T, тогава N НЕ е 1, 0 - в противен случай"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Потвърждаване на събитие"
 
@@ -5034,7 +5166,7 @@ msgstr "Потвърждаване на събитие"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Потвърждаване на събитие \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Потвърждаване на събитие изключено"
 
@@ -5042,7 +5174,7 @@ msgstr "Потвърждаване на събитие изключено"
 msgid "Event details"
 msgstr "Детайли за събитието"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Генериране на събитие"
 
@@ -5062,9 +5194,10 @@ msgstr "Детайли за източник на събитието"
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Събития"
 
@@ -5072,36 +5205,41 @@ msgstr "Събития"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Всеки ден "
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Всяка седмица"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Екса"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Изключване"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Изпълнение"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Грешка при изпълнение на SQL [%1$s] в [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Изпълнение на"
 
@@ -5109,13 +5247,13 @@ msgstr "Изпълнение на"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Изпълнение на скрипт"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Потвърждение на изпълнение"
 
@@ -5127,7 +5265,7 @@ msgstr "Разширяване на макроси"
 msgid "Expand single problem"
 msgstr "Разширяване на единичен проблем"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Очаквайки JSON-rpc версия 2.0, и се получава \"%s\"."
@@ -5137,12 +5275,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Изтекъл"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Разширено кръгова"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Експортиране на избраните"
 
@@ -5150,22 +5288,22 @@ msgstr "Експортиране на избраните"
 msgid "Export to CSV"
 msgstr "Експортиране в CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Изразяване"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Грешка в синтаксиса на изразяване."
 
@@ -5173,11 +5311,12 @@ msgstr "Грешка в синтаксиса на изразяване."
 msgid "Expression Variable Elements"
 msgstr "Променливи елементи на изразяване"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Изразът не може да бъде празен"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Конструктор на изразяване"
 
@@ -5198,17 +5337,17 @@ msgid "External check"
 msgstr "Външна проверка"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "ЛЪЖА"
 
@@ -5217,16 +5356,17 @@ msgstr "ЛЪЖА"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Неуспешно"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Неуспешно"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5234,40 +5374,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Одит отказа"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Любими графики"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Любими карти"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Любими екрани"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Любими "
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Фев"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Февруари"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Поле"
 
@@ -5311,19 +5451,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Поле \"druleid\" е задължително."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Field \"name\" е задължително."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Формата на файла не се поддържа."
 
@@ -5332,13 +5472,13 @@ msgstr "Формата на файла не се поддържа."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Файлът е прекалено голям, максимален размер на качване %1$s байта."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Файлът не съществува. Опитвате се да намерите \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5346,68 +5486,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Запълване"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Филтър"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Филтър по хост група"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Филтър по име"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Търсене на низ V в последната (най-нова) стойност. N = 1 - ако бъде открито, 0 - в противен случай"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Търсене на низ V в последната (най-нова) стойност. N НЕ е 1 - ако бъде открито, 0 - в противен случай"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Завърши"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Финландски (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Първи"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Първи"
@@ -5416,8 +5559,8 @@ msgstr "Първи"
 msgid "Fit to map"
 msgstr "Въведете в картата на мрежата"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Фиксирано"
 
@@ -5427,76 +5570,80 @@ msgstr "Фиксирано"
 msgid "Flexible intervals"
 msgstr "Гъвкави интервали"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "За гостите, паролата трябва да бъде празна"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Формула"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Четвърти"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Френски (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Пт"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Петък"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "От"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Достъп до уеб интерфейс"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Достъп до уеб интерфейс актуализиран"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Съобщения в уеб интерфейс"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Пълен клонинг"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Цял екран"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Функция"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "Г"
@@ -5506,50 +5653,50 @@ msgstr "Г"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM модем"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "Графичен потребителски интерфейс (GUI)"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "GUI достъп забранен."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Общ"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Генерирано за %s сек"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Немски (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5557,65 +5704,65 @@ msgid "Get support"
 msgstr "Получаване на поддръжка"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Гига"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Като се има предвид, израза не е макро"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Глобалния израз не съществува."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Глобален скрипт"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Глобални скриптове"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Изпълни"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Отиди на"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5624,66 +5771,73 @@ msgid "Gradient line"
 msgstr "Градиентна линия"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Графика"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Графика \"%1$s\" вече съществува в \"%2$s\" (наследена от друг шаблон)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Графика \"%1$s\" вече съществува в  \"%2$s\" (елементите от данните не са идентични)"
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Графика \"%1$s\" вече съществува в \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Графика \"%1$s\" не може да бъде наследена. Липса на задължителните елементи на данните в \"%2$s\" (елемент на данните за максималната стойност на Y ос)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Графика \"%1$s\" не може да бъде наследена. Липса на задължителните елементи на данните в \"%2$s\" (елемент на данните за минимална стойност на Y ос)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Графика \"%1$s\" не може да бъде наследена. Липса на задължителните елементи на данните в \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Графика \"%1$s\" не съществува в шаблон \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Графика \"%1$s\" пропуснато - потребителско правило."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Графика \"%1$s\" с шаблонни елементи на данните не може да съдържа елементи на данните от други хостове."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Графика добавена"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Графика изтрита"
 
@@ -5695,54 +5849,59 @@ msgstr "Елемент от графика"
 msgid "Graph item"
 msgstr "елемент на данните от графика"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Име на графика"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Графичен прототип \"%1$s\" с шаблонни елементи на данните не може да съдържа елементи на данните от други хостове."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Графичен прототип \"%s\" изтрит."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Графични прототипи"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5754,49 +5913,51 @@ msgstr "Графични прототипи за"
 msgid "Graph sum"
 msgstr "Обща графика"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Тип графика"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Графика актуализирана"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Графика с името \"%1$s\" вече съществува в графики или графични прототипи."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Графика със същото име, но различен тип вече съществува."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Графики"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Графики копирани"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Графики изтрити"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Гръцки (el_GR)"
 
@@ -5805,54 +5966,58 @@ msgstr "Гръцки (el_GR)"
 msgid "Grid"
 msgstr "Решетка"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Група"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Група \"%1$s\" не съществува."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Група \"%1$s\" за хост \"%2$s\" не съществува."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Група добавена"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Група изтрита"
+msgid_plural "Groups deleted"
+msgstr[0] "Група изтрита"
+msgstr[1] "Група изтрита"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5863,40 +6028,42 @@ msgstr "Група за откритите хостове"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Име на група"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Група актуализирана"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Групиране по"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Групи"
 
@@ -5904,22 +6071,13 @@ msgstr "Групи"
 msgid "Groups in maintenance"
 msgstr "Групи в поддръжка"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "h.i A"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "h:i A"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "h:i:s A"
 
@@ -5936,7 +6094,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "ПРЕГЛЕД НА ИНВЕНТАРНИТЕ ДАННИ ЗА ХОСТ"
 
@@ -5954,7 +6112,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP автентикация"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
@@ -5975,12 +6134,17 @@ msgstr "Хардуер"
 msgid "Hardware (Full details)"
 msgstr "Хардуер (Пълни подробности)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Височина"
@@ -5993,15 +6157,15 @@ msgstr "Помощ"
 msgid "Hexadecimal"
 msgstr "Шестнадесетичен"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Скрит"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Скрий"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Скрий всички"
 
@@ -6017,15 +6181,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Скриване на изключени тригери"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Скрий избраните"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6034,23 +6198,23 @@ msgstr ""
 msgid "High"
 msgstr "Висок"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "История"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "История изчистена"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Изчистването на историята може да отнеме много време. Да се продължи ли?"
 
@@ -6071,79 +6235,79 @@ msgstr "История на събитията"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Хоризонтален"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Хоризонтално подравняване"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Хост"
 msgstr[1] "Хост"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Хост \"%1$s\" вече съществува."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Хост \"%1$s\" се наблюдава с прокси \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "В хост \"%s\" е избран параметър \"useipmi\", но не е зададен параметър\"ipmi_ip\"! Използване IP адреса на хоста като адрес за интерфейс IPMI."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Хост (във възходящ ред)"
 
@@ -6155,66 +6319,68 @@ msgstr "IP адрес на хост"
 msgid "Host access"
 msgstr "Хост достъп"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Хост добавен"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Хоста не може да има повече от един стандартен интерфейс от един и същ тип."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Хост брояч"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Хост изтрит"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Хост група"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Хост група \"%1$s\" вече съществува."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6231,14 +6397,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "Тип етикет на хост група"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Хост групи"
 
@@ -6248,8 +6415,8 @@ msgstr "Хост групи"
 msgid "Host interface"
 msgstr "Хост интерфейс"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Инвентарни данни на хост"
 
@@ -6265,7 +6432,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "Хост етикет"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Хост списък"
 
@@ -6274,18 +6441,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Име на хоста"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6294,72 +6461,72 @@ msgstr ""
 msgid "Host networks"
 msgstr "Хост мрежи"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6371,7 +6538,7 @@ msgstr ""
 msgid "Host router"
 msgstr "Хост рутер"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Хост екрани"
 
@@ -6383,51 +6550,52 @@ msgstr "Състояние на хост"
 msgid "Host subnet mask"
 msgstr "Маска на подмрежата на хоста"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Хост време"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Актуализацията на хоста се провали."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Хост актуализиран"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Хост със същото име \"%s\" вече съществува."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Хост със същото видимо име \"%s\" вече съществува."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Хостове"
 
@@ -6435,11 +6603,11 @@ msgstr "Хостове"
 msgid "Hosts & Groups"
 msgstr "Хостове & Групи"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Хостове (наблюдаван/не е наблюдаван/шаблон)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Хостове / шаблони"
 
@@ -6451,37 +6619,38 @@ msgstr "Хостове в"
 msgid "Hosts in maintenance"
 msgstr "Хостове в поддръжка"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Информация за хостове"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Местоположение на хостове"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Хостове актуализирани"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Ежечасово"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Часа"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Унгарски (hu_HU)"
 
@@ -6499,22 +6668,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6522,26 +6691,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP адрес"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP и DNS не може да бъдат празни за хост интерфейса."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP диапазон"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "IP диапазонът не може да бъде празен."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6549,22 +6718,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI агент"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI алгоритъм за автентификация"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "IPMI интирфейс"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI парола"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI ниво на привилегия"
 
@@ -6574,7 +6743,7 @@ msgstr "IPMI ниво на привилегия"
 msgid "IPMI sensor"
 msgstr "IPMI сензор"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI потребителско име"
 
@@ -6607,7 +6776,7 @@ msgstr "Зависимости на IT услуга"
 msgid "IT service parent"
 msgstr "Главна IT услуга"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6623,25 +6792,25 @@ msgid "ITEMS"
 msgstr "елементи на данните"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Икона"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Икона (по подразбиране)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Икона (изключено)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Икона (поддръжка)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Икона (проблем)"
 
@@ -6663,42 +6832,44 @@ msgstr "Икона етикет за тип"
 msgid "Icon map"
 msgstr "Съответствие на икона"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, fuzzy, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Съответствие на икона \"%1$s\" не може да бъде изтрита. Използва се в картата на мрежата \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, fuzzy, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Съответствие на икона \"%1$s\" се отнася до неправилно iconid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, fuzzy, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Съответствие на икона \"%1$s\" се отнася до неправилна връзка на инвентар \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, fuzzy, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Съответствие на икона \"%s\" вече съществува."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, fuzzy, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Съответствие на икона \"%s\" не може да има съответствие с празен израз."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, fuzzy, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Съответствие на икона \"%s\" не може да има съответствие с глобален израз, които не съществува."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, fuzzy, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Съответствие на икона \"%s\" има неправилен израз."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, fuzzy, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Съответствие на икона \"%s\" трябва да има най-малко едно съответствие."
@@ -6713,7 +6884,8 @@ msgstr "Съответствие на икона създадена"
 msgid "Icon map deleted"
 msgstr "Съответствие на икона изтрита"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 #, fuzzy
 msgid "Icon map name cannot be empty."
 msgstr "Името на съответствие на икона не може да бъде празно."
@@ -6723,31 +6895,31 @@ msgstr "Името на съответствие на икона не може �
 msgid "Icon map updated"
 msgstr "Съответствие на икона актуализирана"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, fuzzy, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Съответствие на икона с iconmapid \"%s\" не съществува."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 #, fuzzy
 msgid "Icon mapping"
 msgstr "Съответствие на икона"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, fuzzy, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "В запис съответствие на икона \"%1$s\" за \"%2$s\" вече съществува."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 #, fuzzy
 msgid "Iconmap is not enabled"
 msgstr "Съответствие на икона не е активирано"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Икони"
 
@@ -6755,21 +6927,23 @@ msgstr "Икони"
 msgid "Identical expression already exists"
 msgstr "Идентичен израз вече съществува"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Ако смятате, че това съобщение е грешно, моля консултирайте се с администраторите за получаване на необходимите права."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Изображение"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6778,7 +6952,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Изображение добавено"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Изображение изтрито"
 
@@ -6786,12 +6960,13 @@ msgstr "Изображение изтрито"
 msgid "Image label type"
 msgstr "Тип етикет на изображение"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Грешка при зареждане на изображение [%1$s] в [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "Размера на изображението трябва да бъде по-малко от 1MB."
 
@@ -6800,66 +6975,66 @@ msgid "Image updated"
 msgstr "Изображение актуализирано"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Изображения"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Изображенията за всички карти ще бъдат обновени!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Веднага"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Импортиране"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Неуспешно импортиране"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Импортиране на файл"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Импортиране успешно"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Невъзможно е да се филтрира по инвентарни данни на поле \"%s\", което не съществува."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Невъзможно е да се премахне последния ред и колона."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "В"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "В група"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "В групи"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6872,244 +7047,282 @@ msgstr "В поддръжка"
 msgid "In progress"
 msgstr "В процес на изпълнение"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Включва"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Неправилна стойност на поле \"soft\" за зависимостта на услугата \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Неправилна стойност %1$s на тип етикет за карта \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Неправилен IP диапазон \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Неправилен SNMP OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Неправилно SNMP community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Неправилно допустимо SLA за услуга \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Неправилно действие в условие проверка за откриване."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Неправилно действие в условие проверка за откриване. Проверка за откриване не съществува или нямате права за достъп до него."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Неправилно действие в условие правило за откриване. Правило за откриване не съществува или нямате права за достъп до него."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Неправилно действие в условие състояние на откриване."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Неправилно действие в условие хост група. Хост групата не съществува или нямате права за достъп до нея."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Неправилно действие в условие хост. Хоста не съществува или нямате права за достъп до него."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Неправилно действие в условие прокси. Проксито не съществува или нямате права за достъп до него."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Неправилно действие в условие шаблон. Шаблона не съществува или нямате права за достъп до него."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Неправилно действие в условие тригер. Тригера не съществува или нямате права за достъп до него."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Неправилно действие в условие тип."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Неправилно действие в id на условие."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Неправилно действие в операция тип команда."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Неправилно действие в операция на условие за тип потвърждаване."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Неправилно действие в операция на тип условие."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Неправилно действие в операция на стойности в стъпка ескалация."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Неправилно действие в операция хост група. Хост групата не съществува или нямате права за достъп до нея."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Неправилно действие в операция хост. Хоста не съществува или нямате права за достъп до него."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Неправилно действие в операция порт \"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Неправилно действие в операция стъпка продължителност."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Неправилно действие в тип операция."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Неправилно действие в операция потребителска група. Потребителската групата не съществува или нямате права за достъп до нея."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Неправилно действие в операция потребител. Потребителя не съществува или нямате права за достъп до него."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Неправилно действие в id на операция. "
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Неправилен алгоритъм за услуга \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Подадени са неправилни аргументи за функцията"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Подадени са неправилни аргументи за функцията."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Подадени са неправилни аргументи за метода."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Неправилен протокол за автентификация на правило за откриването \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Неправилен протокол за автентификация за елемент на данните \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Неправилно изчислена стойност SLA за услуга \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Използвани са неправилни символи за името на хост \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Неправилно закъснение."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7119,11 +7332,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7132,11 +7345,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Неправилно име на поле \"%1$s\" или стойност в израза where за таблица \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Неправилни полета за тригер."
 
@@ -7144,74 +7357,100 @@ msgstr "Неправилни полета за тригер."
 msgid "Incorrect file upload."
 msgstr "Неправилно качване на файл."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Неправилен променлив интервал \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Неправилен променлив интервал в елемент на данните \"%1$s\". Променливият интервал трябва да бъде низ."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Използва се неправилна функция"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Неправилна хост група."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7219,182 +7458,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr "Неправилен индекс на изображение."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "За интерфейса е зададен неправилен DNS параметър \"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "За интерфейса е зададен неправилен IP параметър \"%s\"."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "За интерфейса е зададен неправилен порт \"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Неправилно поле \"%s\" за инвентарни данни."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Неправилен елемент на данните за стойност ос."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "В тригер израза \"%2$s\" е зададен неправилен ключ за елемента на данните \"%1$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "В тригер функцията \"%2$s\" е зададен неправилен тип стойност за елемента на данните \"%1$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Неправилен ключ."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Неправилен списък на елементи на данните."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Неправилна поддръжка - датата трябва да бъде между 1970.01.01 и 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Неправилна дата на поддръжка."
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Неправилен ден от периода на поддържане"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Неправилен ден от седмицата на поддръжката"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Неправилен период от месеца за поддръжката"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Неправилен период за поддръжката"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Неправилен период за поддръжката (минимум 5 минути)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Неправилен период от седмицата за поддръжката"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Неправилна стойност височина за карта \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Неправилна стойност ширина за карта \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Неправилен параметър за операции."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, fuzzy, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Използван е неправилен параметър за съответствие на икона \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Неправилен параметър за състояние."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, fuzzy, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Неправилен параметър за съответствие на икона метод на актуализиране \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Неправилен параметър за поддръжка"
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Неправилен параметър за потребителска група."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Неправилен родител за услуга \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Неправилен родител за услуга."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Неправилен диапазон от портовете."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "Неправилен протокол за поверителност на правило за откриване \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "Неправилен протокол за поверителност за елемент на данните \"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Неправилно id на прокси."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Зададен е неправилен тип ресурс за елемент на данните на екрана."
 
@@ -7403,64 +7661,68 @@ msgstr "Зададен е неправилен тип ресурс за елем
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Зададен е неправилен екран за слайдшоу."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Неправилно време за приключване на услугата."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Неправилно време за започване на услугата."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Неправилен тип време за услугата."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Неправилно подреждане за услуга \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Неправилно състояние за услуга  \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Неправилно състояние."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7481,52 +7743,57 @@ msgstr "Неправилен времеви период \"%1$s\". Начало�
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Неправилен времеви период \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Неправилно ID на тригер за услуга \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Неправилен израз в тригер"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Неправилен израз в тригер."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Неправилен израз в тригер. Хост \"%1$s\" не съществува или нямате права за достъп до него."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Неправилен израз в тригер. Хост \"%s\" не съществува или нямате права за достъп до него."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Неправилен израз в тригер. Елементите на израза в тригер не трябва да принадлежат към един шаблон и хост едновременно."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "В израза е зададена неправилна тригер функция \"%1$s\"."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Неправилен тип asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Неправилна потребителска група."
 
@@ -7535,7 +7802,8 @@ msgstr "Неправилна потребителска група."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7555,7 +7823,7 @@ msgstr "Неправилна стойност \"%1$s\" за поле цяло ч
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Неправилна стойност \"%1$s\" за поле цяло положително число \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7565,43 +7833,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Неправилна стойност за setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Неправилно работно време."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Неправилен елемент на данните за макс. Y в графика \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Неправилен елемент на данните за мин. Y в графика \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Индонезийски (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Инфо"
 
@@ -7610,15 +7884,15 @@ msgstr "Инфо"
 msgid "Information"
 msgstr "Информация"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Вмъкване макро"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Инсталация"
 
@@ -7626,31 +7900,32 @@ msgstr "Инсталация"
 msgid "Installer name"
 msgstr "Име на инсталатора"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Интерфейса е свързан с елемента на данните \"%1$s\" в \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Интерфейсът се използва от елементи на данните, които изискват този тип интерфейс."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "В интерфейс с DNS \"%1$s\" не може да има празен IP адрес."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "В интерфейс с IP \"%1$s\" не може да бъде празно DNS името, при налични свойства \"Използвай DNS\" в \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "В интерфейс с IP \"%1$s\" не може да бъде празно DNS името."
@@ -7670,7 +7945,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Вътрешна грешка JSON-RPC."
 
@@ -7678,7 +7953,7 @@ msgstr "Вътрешна грешка JSON-RPC."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Вътрешна грешка."
 
@@ -7691,19 +7966,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Интервал"
 
@@ -7713,112 +7988,114 @@ msgstr "Интервал"
 msgid "Interval (in sec)"
 msgstr "Интервал (в сек)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Невалиден JSON. Възникна грешка на сървъра, при разбор на текст JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Невалидна заявка."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Невалидна дата \\\"%s\\\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Невалидно id на хост за макро \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Невалиден период на поддръжка"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Невалидни параметри на метода."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Невалидни параметри."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Невалиден код на отговор \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Невалиден диапазон за код на отговор \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Невалиден период на време"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Невалидно име за преглед дава \"%s\". Позволени символи: \"a-z\" and \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Инвентаризация"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7827,7 +8104,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Поле за инвентаризация"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Режим на инвентарните данни"
 
@@ -7835,12 +8112,12 @@ msgstr "Режим на инвентарните данни"
 msgid "Is online?"
 msgstr "На линия ли е?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Проблем"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Не е възможно да се филтрира по парола на потребителя."
 
@@ -7848,70 +8125,71 @@ msgstr "Не е възможно да се филтрира по парола н
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Не е възможно да се излезе от HTTP автентификация."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Не е възможно да се търси по парола на потребителя."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Италиански (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Елемент на данните"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Елемент на данните \"%1$s\" вече съществува в \"%2$s\", наследен от друг шаблон."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Елемент на данните \"%1$s\" не може да попълне липсващото поле номерирано \"%2$d\" инвентарни данни за потребителя. Изберете: от 0 (не попълвай) до %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Елемент на данните \"%1$s\" не съществува в шаблон \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Елемент на данните \"%1$s\" не съществува."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Елемент на данните \"%1$s\" в \"%2$s\": приложение \"%3$s\" не съществува."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Елемент на данните \"%1$s\" пропуска - потребителското правило."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Елемент на данните \"%1$s:%2$s\" има невалиден порт: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Елемент на данните добавен"
 
@@ -7919,17 +8197,17 @@ msgstr "Елемент на данните добавен"
 msgid "Item count"
 msgstr "Брой елементи на данните "
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Елемент на данните изтрит"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7943,56 +8221,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Елемент на данните прототип"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Елемент на данните прототипи"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -8000,92 +8278,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Елемент на данните прототип за"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Елемент на данните актуализиран"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Елемент на данните използва интерфейс от не родителски хост."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Елемент на данните използва невалиден тип интерфейс."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Елемента на данните не се обновява. Моля, въведете правилния интервал за актуализация."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Ключ от елемент на данните \"%1$s\" вече съществува в \"%2$s\" като правило за откриване."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Ключ от елемент на данните \"%1$s\" вече съществува в \"%2$s\" като елемент на данните създаден в елемент на данните прототип."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Ключ от елемент на данните \"%1$s\" вече съществува в \"%2$s\" като елемент на данните прототип."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Ключ от елемент на данните \"%1$s\" вече съществува в \"%2$s\" като елемент на данните."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Ключ от елемент на данните \"%1$s\" вече съществува в \"%2$s\" като неизвестен елемент на данните."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Ключ от елемент на данните \"%1$s\" вече съществува в \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Ключ от елемент на данните \"%1$s\" вече съществува."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Елементи на данните "
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Елементи на данните (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Елементи на данните копирани"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Елементи на данните изтрити"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Списък елементи на данните"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Елементи на данните актуализирани"
 
@@ -8097,72 +8375,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX агент"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX интерфейс"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Не успешно генериране на JSON-rpc грешка. Няма такава грешка \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpc метода не е дефиниран."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpc параметъра не е масив."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "JSON-rpc версията не е уточнена."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Идентификатор Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Яну"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Януари"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Японски (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Юли"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Юли"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Юни"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Юни"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "К"
@@ -8171,40 +8449,40 @@ msgstr "К"
 msgid "Keep lost resources period (in days)"
 msgstr "Период на пазене на загубените ресурси (в дни)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Ключ"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Ключ \"%1$s\" не съвпада с <grpmax|grpmin|grpsum|grpavg>[\"Хост група(и)\", \"Ключ елемент на данните\", \"<last|min|max|avg|sum|count>\", \"параметри\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Ключ фраза за достъп"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Ключова дума"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Кило"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Корейски (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "ПОСЛЕДНИ ДАННИ"
 
@@ -8235,37 +8513,37 @@ msgstr "Успешно влизане чрез LDAP"
 msgid "LDAP login was not successful"
 msgstr "Неуспешно влизане чрез LDAP"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "ЛОКАЛЕН"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "ИЗГУБЕН"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Етикет"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Разположение на етикет"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Език"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Последно"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Последна"
@@ -8277,19 +8555,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "Последно %1$d събитие"
 msgstr[1] "Последни %1$d събития"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Последната (най-нова) T стойност е < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Последната (най-нова) T стойност е = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Последната (най-нова) T стойност е > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Последната (най-нова) T стойност НЕ е N"
 
@@ -8309,28 +8587,28 @@ msgstr "Последните 365 дни"
 msgid "Last 7 days"
 msgstr "Последните 7 дни"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Последна промяна"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Последна промяна (низходящ)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Последна проверка"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Графика за последния час"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Графика за последния месец"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "За последното"
 
@@ -8338,66 +8616,67 @@ msgstr "За последното"
 msgid "Last seen (age)"
 msgstr "Последно активен (възраст)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Последна стойност"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Графика за последната седмица"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Последни данни"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Последни събития"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Латвийски (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "От лявата страна"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Легенда"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Дължината в символи на последната (най-нова) T стойност е < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Дължината в символи на последната (най-нова) T стойност е = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Дължината в символи на последната (най-нова) T стойност е > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Дължината в символи на последната (най-нова) T стойност НЕ е N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Линия"
 
@@ -8405,39 +8684,29 @@ msgstr "Линия"
 msgid "Link"
 msgstr "Връзка"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Индикатори на връзка"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Имета на връзката трябва да бъде уникална за карта на мрежата \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Полето за връзка selementid1 сочи към несъществуващо selement ID \"%1$s\" за карта на мрежата \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Полето за връзка selementid2 сочи към несъществуващо selement ID \"%1$s\" за карта на мрежата \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Във връзката трябва да бъдат попълнени и двете полета \"име\" и \"url\" за карта на мрежат \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Прикрепете шаблони"
 
@@ -8449,50 +8718,50 @@ msgstr "Връзка към шаблон"
 msgid "Link to templates"
 msgstr "Връзка към шаблони"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Връзка с шаблони"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Свързани шаблони"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Свързано с"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Връзки между избраните елементи"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Връзки за избрания елемент"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Списъкът е празен"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Зарежда се..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Местно време"
 
@@ -8509,36 +8778,36 @@ msgid "Location longitude"
 msgstr "Местонахождение (дължина)"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Дневник (лог)"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "Важността на последния запис в дневника е < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "Важността на последния запис в дневника е = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "Важността на последния запис в дневника е > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "Важността на последния запис в дневника НЕ е N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "Източника на събитието на последния запис в дневника съвпада с параметър T, тогава N = 1, 0 - в противен случай"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "Източника на събитието на последния запис в дневника съвпада с параметър T, тогава N НЕ е 1, 0 - в противен случай"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Формат за време в дневника (логове)"
@@ -8547,12 +8816,12 @@ msgstr "Формат за време в дневника (логове)"
 msgid "Log unmatched SNMP traps"
 msgstr "Записите в дневника не съвпадат SNMP traps"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Влезли сте като"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8563,12 +8832,12 @@ msgstr "Вход в системата"
 msgid "Login as Guest"
 msgstr "Вход като гост"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Неуспешно влизане \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8577,8 +8846,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Неправилно въведено потребителско име или парола."
 
@@ -8599,22 +8869,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "М"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8626,7 +8892,7 @@ msgstr "MAC адрес A"
 msgid "MAC address B"
 msgstr "MAC адрес B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "ПОДДРЪЖКА"
 
@@ -8651,49 +8917,49 @@ msgstr "ТОП 100 НА НАЙ-АКТИВНИТЕ ТРИГЕРИ"
 msgid "Macro"
 msgstr "Макро"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Макро \"%1$s\" вече съществува в \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Макро \"%1$s\" вече съществува."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "Макро \"%1$s\" не е уникален."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Стойността на макро \"%1$s\" е твърде дълга, не трябва да надвишава 255 символа."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Името на макро \"%1$s\" е твърде дълго, не трябва да надвишава 64 символа."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "Макро с globalmacroid \"%1$s\" не съществува."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Макро с hostmacroid \"%1$s\" не съществува."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Макроси"
 
@@ -8701,31 +8967,36 @@ msgstr "Макроси"
 msgid "Macros updated"
 msgstr "Макроси актуализирани"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Поддръжка"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Поддръжка \"%s\" вече съществува."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "Стойността за поддръжката \"Активно от\" не може да бъде по-голяма от \"Активно до\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Поддръжка добавена"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Поддръжка изтрита"
 
@@ -8733,7 +9004,7 @@ msgstr "Поддръжка изтрита"
 msgid "Maintenance period"
 msgstr "Период на поддръжка"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Продължителност на поддръжката"
 
@@ -8749,25 +9020,25 @@ msgstr "Състояние на поддръжката"
 msgid "Maintenance type"
 msgstr "Тип поддръжка"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Поддръжка актуализирана"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Поддръжка и събиране на данни"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Поддръжка без събиране на данни"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Задължителния параметър липсва."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Ръчно"
 
@@ -8778,12 +9049,12 @@ msgstr "Принудителен изход"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Карта на мрежата"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Карта на мрежата \"%1$s\" пропусната - правило от потребителя."
@@ -8793,12 +9064,12 @@ msgstr "Карта на мрежата \"%1$s\" пропусната - прав
 msgid "Map \"%s\""
 msgstr "Карта на мрежата \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Карта на мрежата \"%s\" създадена."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Карта на мрежата \"%s\" актуализирана."
@@ -8815,12 +9086,12 @@ msgstr "Тип етикет на карта на мрежата"
 msgid "Map save operation failed."
 msgstr "Неуспешна операция за запазване карта на мрежата."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Съпоставено с"
 
@@ -8830,23 +9101,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Съпоставяне на стойност \"%1$s\" не е уникална."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Съответствия"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Карти на мрежата"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Мар"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Март"
 
@@ -8854,28 +9125,34 @@ msgstr "Март"
 msgid "Mark elements on trigger status change"
 msgstr "При промяна състоянието на тригер маркирай елементи"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Маркирай останалите"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Маркирай избраните"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Общо актуализиране"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Общо актуализиране на елементите"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Максимален брой елементи, които да се показват вътре в клетката на таблицата"
@@ -8889,32 +9166,11 @@ msgstr "Максимален брой елементи, които да се п�
 msgid "Max count of events per trigger to show"
 msgstr "Максимален брой на събитията, които се показват в тригера"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Максимизиране"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8922,107 +9178,101 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "Максималната стойност за период T е < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "Максималната стойност за период T е = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "Максималната стойност за период T е > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "Максималната стойност за период T НЕ е N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Май"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Май"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Уведомления"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Метод на уведомление"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Метод на уведомление \"%s\" вече съществува."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Метод на уведомление добавено"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Метод на уведомление изтрито"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Метод на уведомление изключено"
 msgstr[1] "Метод на уведомление изключено"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Метод на уведомление включено"
 msgstr[1] "Метод на уведомление включено"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Метод на уведомление актуализирано"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Методи на уведомление"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Методите на уведомление се използват от действие \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Мега"
 
@@ -9037,14 +9287,14 @@ msgid "Memory limit: %s"
 msgstr "Ограничение на паметта: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Меню"
 
@@ -9054,7 +9304,7 @@ msgstr "Меню"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Съобщение"
 
@@ -9062,68 +9312,68 @@ msgstr "Съобщение"
 msgid "Message actions"
 msgstr "Съобщение действия"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Ограничение на текстово съобщение"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 #, fuzzy
 msgid "Message timeout"
 msgstr "Време преди изключване на съобщенията"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 #, fuzzy
 msgid "Message timeout (seconds)"
 msgstr "Време преди изключване на съобщенията (секунди)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Съобщения"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Съобщения"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Методът не е намерен."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Средeн"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Минимизиране"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9132,80 +9382,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "Минималната стойност за период T е < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "Минималната стойност за период T е = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "Минималната стойност за период T е > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "Минималната стойност за период T НЕ е N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Минути"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Липсващо поле \"itemid\" за елемент на данните."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Липсващо поле \"name\" за графика."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Липсващ елемент на данните \"%1$s\" за хост \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Липсващи елементи на данните за графика \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9215,7 +9462,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Липсващ ключ \"%1$s\" за хост \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Липсващ параметър: usrgrpids."
 
@@ -9227,18 +9474,18 @@ msgstr "Режим"
 msgid "Model"
 msgstr "Модел"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Пн"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Понеделник"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Наблюдава се чрез прокси"
 
@@ -9246,33 +9493,33 @@ msgstr "Наблюдава се чрез прокси"
 msgid "Monitored host"
 msgstr "Наблюдаван хост"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Месец"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Ежемесечно"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9280,7 +9527,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Повече от 10 минути"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Повече от една графика с името \"%1$s\" в хост."
@@ -9289,19 +9536,19 @@ msgstr "Повече от една графика с името \"%1$s\" в хо
 msgid "Most busy triggers top 100"
 msgstr "Топ 100 на най-ативните тригери"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Множество събития с ПРОБЛЕМ"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Многократно генериране на събития с ПРОБЛЕМ"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Изключване на звука"
 
@@ -9314,60 +9561,58 @@ msgstr "КАРТИ НА МРЕЖАТА"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "НЯМА ДАННИ"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM автентификация"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9378,26 +9623,32 @@ msgstr "NTLM автентификация"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Име"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9416,12 +9667,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9429,7 +9680,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Карта на мрежата добавена"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Карта на мрежата изтрита"
 
@@ -9441,7 +9692,7 @@ msgstr "Карта на мрежата актуализирана"
 msgid "Network maps"
 msgstr "Карти на мрежата"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Никога"
 
@@ -9449,24 +9700,24 @@ msgstr "Никога"
 msgid "Never executed"
 msgstr "Никога да не се изпълнява"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Ново"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Ново приложение"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Ново състояние"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Нов елемент"
 
@@ -9477,16 +9728,16 @@ msgstr "Нов елемент"
 msgid "New flexible interval"
 msgstr "Нов гъвкав интервал"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Нова група"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Нова хост група"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Нов елемент на данните за графика"
 
@@ -9494,83 +9745,99 @@ msgstr "Нов елемент на данните за графика"
 msgid "New media"
 msgstr "Ново уведомление"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Нов регулярен израз"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Ново време за услуга"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Още"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Следващо"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Не"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Не полето \"ymax_type\" за графика \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Не полето \"ymin_type\" за графика \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9578,25 +9845,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Не е предвидено URL за елемент от екрана."
 
@@ -9622,8 +9889,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Не са налични действия."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9633,7 +9900,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Няма приложение с ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9641,30 +9908,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "В операция на действие за команда \"%s\" не е уточнен тип автентификация."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "В операция на действие за команда \"%s\" не е уточнено потребителското име за автентификация."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Не е уточнено потребителското име за автентификация."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "За операция на действие не е уточнена командата."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "За операция на действие не е уточнен тип команда."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Не са дефинирани условия."
 
@@ -9673,27 +9941,27 @@ msgstr "Не са дефинирани условия."
 msgid "No data collection"
 msgstr "Без събиране на данни"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "Няма получени данни през период от време T, тогава N = 1, 0 - в противен случай"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "Няма получени данни през период от време T, тогава N НЕ е 1, 0 - в противен случай"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Не е интерфейс по подразбиране \"%1$s\" тип в хост \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Не са дефинирани зависимостите."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Няма подробности"
 
@@ -9701,39 +9969,39 @@ msgstr "Няма подробности"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Не уточнено ID на правило за откриване."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Няма намерени грешки."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Няма събиния"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Няма събиния за потвърждаване"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Не е уточнена цел за изпълнение за команда \"%s\" в операция на действие."
@@ -9748,7 +10016,7 @@ msgstr "Не е качен файл."
 msgid "No flexible intervals defined."
 msgstr "Не са дефинирани гъвкави интервали."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "За елемент от екрана не е уточнено ID на графика."
 
@@ -9757,7 +10025,11 @@ msgstr "За елемент от екрана не е уточнено ID на �
 msgid "No graph item with graphid \"%s\"."
 msgstr "Няма елемент на графика с graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9766,48 +10038,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Няма групи за хост \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Няма групи за хостове."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Не е дефинирано ID на хост."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Не е зададен хост за макро \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Не е определено ID на хост група за елемент от екрана."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9820,17 +10093,22 @@ msgstr "Няма хост група с groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Няма хост с  hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Няма икона за елемент от карта на мрежата \"%s\"."
@@ -9849,33 +10127,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Не е открит интерфейс"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Не е открит интерфейс."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Няма интерфейс за хост \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Не е определено ID на елемент на данните за елемент от екрана."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9894,7 +10179,7 @@ msgid "No items defined."
 msgstr "Не са дефинирани елементи на данните."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9910,7 +10195,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Не е определено ID на карта на мрежата за елемент от екрана."
 
@@ -9919,15 +10204,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9939,133 +10224,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Нямате право на достъп до графика \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Нямате право на достъп до хост \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Нямате право на достъп до елемент на данните \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Нямате право на достъп до шаблон \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Нямате право на достъп до тригер \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Нямате право на достъп"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Нямате право на достъп до група \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Нямате право на достъп до карта на мрежата \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Нямате право на достъп до екран \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Нямате право на достъп до системата."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Нямате право на достъп до посочения обект или той не съществува!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Не е уточнен файла с личен ключ за команда \"%s\" в операция на действие."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Не е уточнен файла с личен ключ."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Няма прокси"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Не е уточнен файла с обществен ключ за команда \"%s\" в операция на действие."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Не е уточнен файла с обществен ключ."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Няма получатели на съобщение в операция на действие."
 
@@ -10073,7 +10403,7 @@ msgstr "Няма получатели на съобщение в операци�
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Не е определено ID на екран за елемент от екрана."
 
@@ -10081,82 +10411,83 @@ msgstr "Не е определено ID на екран за елемент от
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Не е уточнен скрипт за команда в операция на действие."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Не е избрана цел"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Не е избрана цел."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Не са дефинирани интервали. Работа 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Няма тригер"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Няма тригер с triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Не са дефинирани тригери."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Не са намерени тригери."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10165,57 +10496,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Няма намерени стойности."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Нищо"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Нормално"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Нормален преглед"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Непотвърдено"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Няма шаблонни елементи на данните"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Не всички шаблони са свързани към \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Не е позволено да зададете парола за потребителя \"гост\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Не е налично"
 
@@ -10224,7 +10556,7 @@ msgstr "Не е налично"
 msgid "Not classified"
 msgstr "Не е класифицирано"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Не е свързан"
 
@@ -10237,8 +10569,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Не се поддържа"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Бележка"
@@ -10251,7 +10583,7 @@ msgstr "Бележки"
 msgid "Nothing"
 msgstr "Нищо"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Нищо общо."
 
@@ -10259,87 +10591,87 @@ msgstr "Нищо общо."
 msgid "Notification report"
 msgstr "Доклад за нотификациите"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Нотификации"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Ное"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Ноември"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Сега"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Броят на секунди от началото на периода е < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Броят на секунди от началото на периода е = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Броят на секунди от началото на периода е > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Броят на секунди от началото на периода НЕ е N"
 
@@ -10347,88 +10679,88 @@ msgstr "Броят на секунди от началото на периода
 msgid "Number of status changes"
 msgstr "Брой на промените в състоянието"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Брой стъпки"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Броя на успешно извлечени стойности V (които отговарят на оператор O) за период T е < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Броя на успешно извлечени стойности V (които отговарят на оператор O) за период T е = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Броя на успешно извлечени стойности V (които отговарят на оператор O) за период T е > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Броя на успешно извлечени стойности V (които отговарят на оператор O) за период T НЕ е N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Брой на потребителите (на линия)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Числен (с плаваща точка)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Числен (цяло число 64бит)"
 
@@ -10443,16 +10775,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "ОК"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10468,8 +10802,7 @@ msgstr "OOB рутер"
 msgid "OOB subnet mask"
 msgstr "OOB маска на подмрежата"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "ИЛИ"
 
@@ -10489,11 +10822,12 @@ msgstr "ОС (Кратко описание)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "ДРУГИ КОНФИГУРАЦИОННИ ПАРАМЕТРИ"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "ПРЕГЛЕД"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Окт"
 
@@ -10501,25 +10835,25 @@ msgstr "Окт"
 msgid "Octal"
 msgstr "Осмичен"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Октомври"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Изкл"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ок"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Вкл"
 
@@ -10527,113 +10861,116 @@ msgstr "Вкл"
 msgid "On status change triggers blink for"
 msgstr "Мигане на тригери при промяна на състоянието "
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Веднъж"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Само един път"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Еднократна недостъпност"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Само Супер Администраторите могат да създават глобални макроси."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Само Супер Администраторите могат да създават хост групи."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 #, fuzzy
 msgid "Only Super Admins can create icon maps."
 msgstr "Само Супер Администраторите могат да създават съответствие на икона."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Само Супер Администраторите могат да създават методи на уведомление."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Само Супер Администраторите могат да изтриват глобални макроси."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Само Супер Администраторите могат да изтриват методи на уведомление."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Само Супер Администраторите могат да изтриват потребителски групи."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Само Супер Администраторите могат да редактират методи на уведомление."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Само Супер Администраторите могат да актуализират глобални макроси."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 #, fuzzy
 msgid "Only Super Admins can update icon maps."
 msgstr "Само Супер Администраторите могат да актуализират съответствие на икона."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Само Zabbix Администраторите могат да добавят потребителско уведомление."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Само Zabbix Администраторите могат да променят потребителско уведомление."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Само Zabbix Администраторите могат да премахват потребителско уведомление."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Позволени са само символи."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Преброени са само елементи на данните възложени за активни хостове"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Само една проверка може да бъде уникална."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Само едно име на потребителска група може да бъде променено в даден момент."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Индикаторът показва само последните 20%%."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Преброени са само тригерите възложени за активни хостове и зависими от активни елементи на данните"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Операция \"%s\" вече съществува."
@@ -10642,28 +10979,28 @@ msgstr "Операция \"%s\" вече съществува."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Операцията не може да се извърши поради неоторизирано искане."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Състояние на операция"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Детайли на операция"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Операцията няма група за да функционира."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Операцията няма шаблон за да функционира."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Тип операция"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Операции"
@@ -10672,25 +11009,27 @@ msgstr "Операции"
 msgid "Operator"
 msgstr "Оператор"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10720,24 +11059,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Оригинал"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Оригинално синьо"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Друг"
 
@@ -10745,19 +11084,19 @@ msgstr "Друг"
 msgid "Other configuration parameters"
 msgstr "Други конфигурационни параметри"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Други групи"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Други хостове"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10767,21 +11106,21 @@ msgstr "Други хостове | Група"
 msgid "Other parameters"
 msgstr "Други параметри"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Друг | група"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Други"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10794,14 +11133,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Преглед"
 
@@ -10809,7 +11145,7 @@ msgstr "Преглед"
 msgid "Overview by proxy"
 msgstr "Преглед чрез прокси"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "П"
@@ -10818,147 +11154,155 @@ msgstr "П"
 msgid "PERSONAL DASHBOARD"
 msgstr "ЛИЧНО ТАБЛО"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Поддръжка на база данни в PHP "
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Поддръжка на PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Поддръжка на JPEG в PHP gd"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Поддръжка на PNG в PHP gd"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP опция max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP опция max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP опция memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP опция post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP опция upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP session auto start"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "Часови пояс на PHP"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Версия на PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10967,32 +11311,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМ"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "Страницата получи неверни данни"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Палитра"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Палитра #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Параметър"
 
@@ -11001,7 +11347,7 @@ msgstr "Параметър"
 msgid "Parent discovery rules"
 msgstr "Родителски правила за откриване."
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11021,33 +11367,33 @@ msgstr "Родителски тригери"
 msgid "Parent web scenarios"
 msgstr "Родител за уеб сценарии"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Грешка в анализа на SQL [%1$s] в [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Синтактична грешка"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Пасивен"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11057,20 +11403,21 @@ msgstr "Пасивен"
 msgid "Password"
 msgstr "Парола"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Парола (потвърждаване)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "За метода на уведомлението се изисква парола."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Паролата не трябва да е празена"
 
@@ -11079,21 +11426,21 @@ msgstr "Паролата не трябва да е празена"
 msgid "Peak memory usage: %s"
 msgstr "Пик на използваната памет: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Процентна линия (вляво)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Процентна линия (вдясно)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11101,12 +11448,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Период"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Тип период"
@@ -11116,24 +11463,24 @@ msgstr "Тип период"
 msgid "Periods"
 msgstr "Периоди"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Права за достъп"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права за достъп може да бъдат назначен само за потребителски групи."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Персийски (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Пета"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Кръгов"
 
@@ -11145,55 +11492,56 @@ msgstr "Поставяне на алгоритъм"
 msgid "Plain text"
 msgstr "Обикновен текст"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Възпроизвеждане"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Възпроизвеждане на звук"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Моля, коригирайте всички проблеми и натиснете бутон \"Повторен опит\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Моля, въведете текста за потвърждение."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Моля, изберете два елемента"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Полски (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Попълнете полето: данни за инвентаризация на хост"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Порт"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Порта не може да бъде празен за хост интерфейс."
 
@@ -11201,51 +11549,51 @@ msgstr "Порта не може да бъде празен за хост инт
 msgid "Port range"
 msgstr "Диапазон на порт"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Португалски (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Португалски (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Позиция"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Пост"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Предварителен преглед"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Назад"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Предишен"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Предишната стойност е < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Предишната стойност е = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Предишната стойност е > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Предишната стойност НЕ е N"
 
@@ -11295,30 +11643,31 @@ msgstr "Защита фраза за достъп"
 msgid "Privacy protocol"
 msgstr "Протокол за поверителност"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Файл с личен ключ"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Ниво на привилегия"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Може би липсва php-ldap модула."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Проблем"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Показване на проблем"
 
@@ -11330,16 +11679,16 @@ msgstr "Проблем на"
 msgid "Problem time"
 msgstr "Време на проблема"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Проблем, ако всички деца имат проблеми"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Проблем, ако най-малко едно дете има проблем"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Проблеми"
 
@@ -11347,75 +11696,71 @@ msgstr "Проблеми"
 msgid "Profile"
 msgstr "Профил"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Прототипи"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Проксита"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Прокси"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Прокси \"%1$s\" за хост \"%2$s\" не съществува."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Прокси \"%1$s\" се използва от правило за откриване \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Прокси \"%s\" вече съществува."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Прокси добавено"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Прокси изтрито"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Хостове на прокси"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Създаването на прокси интерфейс се провали."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Актуализирането на прокси интерфейс се провали."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Режим на прокси"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Име на прокси"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Прокси актуализирано"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Обществен ключ"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11426,7 +11771,7 @@ msgstr "Файл с обществен ключ"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "ПРЕХВЪРЛЯНЕ ЕЛЕМЕНТИ НА ДАННИТЕ, ЧАКАЩИ АКТУАЛИЗИРАНЕ"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Опашка"
 
@@ -11434,18 +11779,18 @@ msgstr "Опашка"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Четене"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Само за четене"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Четене-писане"
 
@@ -11457,7 +11802,7 @@ msgstr "Причина"
 msgid "Received value"
 msgstr "Получената стойност"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11465,11 +11810,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Получател"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Получател (възходящ)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Получател (низходящ)"
 
@@ -11480,28 +11825,28 @@ msgstr "Получател (низходящ)"
 msgid "Recipient(s)"
 msgstr "Получател(и)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Възстановяване"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Съобщение на възстановяване"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Тема на възстановяване"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Обнови (в секунди)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Множител за интервал на обновяване"
 
@@ -11519,47 +11864,51 @@ msgstr "Обнови неподдържаните елементи на данн
 msgid "Regular expression"
 msgstr "Регулярен израз"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "Регулярен израз \"%s\" вече съществува."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "Регулярен израз V съответства на последната стойност в период T, тогава N = 1, 0 - в противен случай"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "Регулярен израз V съответства на последната стойност в период T, тогава N = 1, 0 - в противен случай (без малки и главни букви)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "Регулярен израз V съответства на последната стойност в период T, тогава N НЕ е 1, 0 - в противен случай"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "Регулярен израз V съответства на последната стойност в период T, тогава N = 1, 0 - в противен случай (без малки и главни букви)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Регулярен израз добавен"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Регулярен израз изтрит"
 msgstr[1] "Регулярни изрази изтрити"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Регулярен израз не съществува."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Регулярен израз актуализиран"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11576,26 +11925,28 @@ msgstr "Отдалечена команда"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11606,21 +11957,19 @@ msgstr "Отдалечена команда"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Премахни"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11628,11 +11977,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Премахни елемент"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Премахни от"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Премахни от любими"
@@ -11641,7 +11990,7 @@ msgstr "Премахни от любими"
 msgid "Remove from host group"
 msgstr "Премахни от хост група"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Премахни от хост групи"
 
@@ -11653,28 +12002,28 @@ msgstr "Премахни хост"
 msgid "Remove link"
 msgstr "Премахни връзката"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Премахни избраните"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Смени"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Смени зависимостите"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Смени хост групата"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Отчет"
 
@@ -11682,38 +12031,39 @@ msgstr "Отчет"
 msgid "Report 1"
 msgstr "Отчет 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Отчет 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Отчет 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Отчети"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Необходимо"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 #, fuzzy
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Задължителното поле \"expression\" липсва в съответствие на икона."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 #, fuzzy
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Задължителното поле \"iconid\" липсва в съответствие на икона."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 #, fuzzy
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Задължителното поле \"inventory_link\" липсва в съответствие на икона."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Необходими са права за достъп за хоста"
 
@@ -11721,29 +12071,31 @@ msgstr "Необходими са права за достъп за хоста"
 msgid "Required performance (vps)"
 msgstr "Необходима производителност (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Необходима производителност на сървъра, нови стойности за секунда"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Необходими кодове за състояние"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Необходим низ"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Нулиране"
 
@@ -11762,9 +12114,9 @@ msgstr "Изчисти всички имена и цветове на стойн
 msgid "Reset confirmation"
 msgstr "Потвърждаване на нулиране"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11777,7 +12129,7 @@ msgstr "Решено"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Ресурс"
@@ -11792,15 +12144,15 @@ msgstr "Време на отговор"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Резултат"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Резултатът е ЛЪЖА"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Резултатът е ИСТИНА"
 
@@ -11813,7 +12165,8 @@ msgstr "Резултат от \"%s\""
 msgid "Result type"
 msgstr "Тип резултат"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr "Повторни опити"
 
@@ -11821,60 +12174,69 @@ msgstr "Повторни опити"
 msgid "Retries left"
 msgstr "Останали повторни опити"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Повторен опит"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Отдясно"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Обединение на редове"
 
@@ -11882,11 +12244,11 @@ msgstr "Обединение на редове"
 msgid "Rows"
 msgstr "Редове"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Редове на страница"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Правила"
 
@@ -11931,20 +12293,20 @@ msgid "Run remote commands on hosts"
 msgstr "Изпълни отдалечени команди на хост"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Руски (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Нд"
@@ -11960,7 +12322,7 @@ msgstr "ЕКРАНИ"
 msgid "SEARCH"
 msgstr "ТЪРСИ"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "СЪРВЪР"
 
@@ -11975,13 +12337,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "СЛАЙДШОУ"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11990,17 +12352,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP е-мейл"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP сървър"
@@ -12016,7 +12378,7 @@ msgstr "SNMP Ключ"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12028,9 +12390,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMP интерфейс"
@@ -12039,7 +12401,7 @@ msgstr "SNMP интерфейс"
 msgid "SNMP trap"
 msgstr "SNMP trap"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "Ключа за SNMP trap е невалиден."
 
@@ -12063,7 +12425,7 @@ msgstr "SNMPv3 агент"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Брой SQL: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12081,7 +12443,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Грешка при изпълнение на SQL заявка \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12090,15 +12452,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH агент"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "СЪСТОЯНИЕ НА ОТКРИВАНЕ"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "СЪСТОЯНИЕ НА ТРИГЕРИ"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "СЪСТОЯНИЕ НА УЕБ МОНИТОРИНГ"
 
@@ -12106,92 +12488,92 @@ msgstr "СЪСТОЯНИЕ НА УЕБ МОНИТОРИНГ"
 msgid "STATUS OF ZABBIX"
 msgstr "СЪСТОЯНИЕ НА ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Сб"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Събота"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Запиши"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Запиши и обратни"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Мащаб"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Сценарий"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Сценарий добавен"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Сценарий актуализиран"
 
@@ -12203,7 +12585,7 @@ msgstr "Сценарии"
 msgid "Schedule"
 msgstr "Планирано"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12214,126 +12596,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Екран"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Екран \"%1$s\" добавен."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "Екран \"%1$s\" вече съществува в шаблон \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "Екран \"%1$s\" вече съществува."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Екран \"%1$s\" пропуснато - потребителско правило."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Екран \"%1$s\" актуализиран."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Екран добавен"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Конфигуриране на екран"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Екран изтрит"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Екрана трябва да съдържа най-малко един ред и колона."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Екран актуализиран"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Екрани"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Скрипт"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Скрипт добавен"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Скрипт изтрит"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Име на скрипт"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12342,17 +12723,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "Профил на скрипт"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Скрипт актуализиран"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Скриптове"
 
@@ -12373,7 +12754,7 @@ msgstr "Шаблона за търсене е празен"
 msgid "Search/Filter elements limit"
 msgstr "Ограничение за елементи на търсене/филтър"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Вторичен"
 
@@ -12405,7 +12786,7 @@ msgstr "Вторичен телефон Б за контакт"
 msgid "Secondary POC screen name"
 msgstr "Вторичен прякор за контакт"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Секунди"
 
@@ -12424,69 +12805,76 @@ msgstr "Ниво на сигурност"
 msgid "Security name"
 msgstr "Име на сигурност"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Изберете"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Изберете прототип"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Изберете редовете, които съдържат описание"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Избрано"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Избраните действия са изтрити"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Избрани елементи"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Избрани групи"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Избрани хостове"
 
@@ -12502,7 +12890,7 @@ msgstr "Изпрати съобщение до потребителски гру
 msgid "Send message to users"
 msgstr "Изпрати съобщение до потребители"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Изпратете само до"
 
@@ -12510,11 +12898,11 @@ msgstr "Изпратете само до"
 msgid "Send to"
 msgstr "Изпрати до"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Изпрати до потребителски групи"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Изпрати до потребители"
 
@@ -12523,17 +12911,17 @@ msgstr "Изпрати до потребители"
 msgid "Sent"
 msgstr "Изпратено"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Сеп"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Разделен"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Септември"
 
@@ -12545,7 +12933,7 @@ msgstr "Сериен номер А"
 msgid "Serial number B"
 msgstr "Сериен номер Б"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Сървър"
@@ -12554,44 +12942,44 @@ msgstr "Сървър"
 msgid "Server info"
 msgstr "Информация за сървъра"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Време на сървъра"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Услуга"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Услуга \"%1$s\" не може да бъде изтрита, защото друга услуга зависи от нея."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Услуга \"%1$s\" не може да бъде зависима от себе си."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Услуга \"%1$s\" не може да бъде свързан към тригер и да бъде подчинена едновременно."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Услуга \"%1$s\" е здраво свързана с друга услуга."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Услугата не може да бъде родител и подчинен в същото време."
 
@@ -12607,11 +12995,11 @@ msgstr "Услуга изтрита"
 msgid "Service port"
 msgstr "Порт на услуга"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "Времето за стартиране на услугата трябва да бъде по-малко от крайното време."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Интервали от време за услуга"
 
@@ -12623,49 +13011,53 @@ msgstr "Тип услуга"
 msgid "Service updated"
 msgstr "Услуга актуализирана"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Услуги"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Услугите образуват кръгова зависимост."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Сесията е прекратена, моля влезте повторно в системата."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Важност"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Важност (низходящ)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Името важност не може да бъде празно."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Покажи"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Покажи всички"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Покажи детайли"
 
@@ -12695,35 +13087,36 @@ msgstr "Покажи събития не по-стари от (в дни)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Покажи събития не по-стари от (в дни) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Покажи хостове в поддръжка"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Покажи елементи на данните, съдържащи в името"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Покажи елементи на данните без данни"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Покажи легенда"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Покажи линии"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Покажи избраните"
 
@@ -12731,19 +13124,22 @@ msgstr "Покажи избраните"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Покажи текста като HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Покажи тригерите"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Покажи непотвърдените"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Покажи стойност"
@@ -12752,11 +13148,11 @@ msgstr "Покажи стойност"
 msgid "Show warning if Zabbix server is down"
 msgstr "Покажи предупреждение, ако Zabbix сървъра е недостъпен"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Покажи работното време"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Показан"
 
@@ -12776,6 +13172,10 @@ msgstr "Проста проверка"
 msgid "Simple graph"
 msgstr "Проста графика"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Пощенски код"
@@ -12813,7 +13213,7 @@ msgid "Site state / province"
 msgstr "Област / район"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12831,16 +13231,16 @@ msgstr "Пропуснато копиране на графика \"%1$s\" в х
 msgid "Slide"
 msgstr "Слайд"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Слайдшоу"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Слайдшоу \"%s\" вече съществува."
@@ -12849,11 +13249,11 @@ msgstr "Слайдшоу \"%s\" вече съществува."
 msgid "Slide show added"
 msgstr "Слайдшоу добавено"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Слайдшоу изтрито"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Слайдшоу трябва да съдържа слайдове."
 
@@ -12861,10 +13261,10 @@ msgstr "Слайдшоу трябва да съдържа слайдове."
 msgid "Slide show updated"
 msgstr "Слайдшоу актуализирано"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Слайдшоу"
 
@@ -12872,15 +13272,15 @@ msgstr "Слайдшоу"
 msgid "Slides"
 msgstr "Слайдове"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Словашки (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Заспиване"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Софт"
 
@@ -12913,28 +13313,28 @@ msgid "Software application E"
 msgstr "Софтуерно приложение E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Сортирай по"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Ред на сортиране (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Сортирай тригерите по"
 
@@ -12947,11 +13347,11 @@ msgstr "Сортиране по поле \"%1$s\" не е разрешено."
 msgid "Source"
 msgstr "Източник"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Испански (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Уточненият скрипт не съществува или не разполагате с права за достъп до командата в операция на действие."
 
@@ -12959,63 +13359,63 @@ msgstr "Уточненият скрипт не съществува или не
 msgid "Speed"
 msgstr "Скорост"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Подредени"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Стандартни елементи на данните"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Започни в"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Състояние"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Състояние"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Състояние (възходящ)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Състояние (низходящ)"
 
@@ -13028,7 +13428,7 @@ msgstr "Изчисляване на състояние"
 msgid "Status calculation algorithm"
 msgstr "Алгоритъм за изчисляване на състояние"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Кодове за състояние"
 
@@ -13037,7 +13437,7 @@ msgid "Status of Web monitoring"
 msgstr "Състояние на уеб мониторинг"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Състояние на Zabbix"
 
@@ -13054,40 +13454,40 @@ msgid "Status only"
 msgstr "Само състояние"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Стъпка"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Стъпка \"%1$s\" [%2$s of %3$s] неуспешно: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Продължителност на стъпка"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Стъпка на сценарий"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr "Стъпка с име \\\"%1$s\\\" вече съществува."
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Стъпки"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Спри"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Съхрани стойност"
@@ -13096,11 +13496,11 @@ msgstr "Съхрани стойност"
 msgid "Straight"
 msgstr "Прав"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Стил"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Подфилтър [засяга само филтрирани данни!]"
 
@@ -13108,11 +13508,11 @@ msgstr "Подфилтър [засяга само филтрирани данн�
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Тема"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Подкарта"
 
@@ -13121,32 +13521,32 @@ msgid "Success Audit"
 msgstr "Успешен одит"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "Сумата от стойностите на период T е < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Сумата на стойностите за период T е = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Сумата на стойностите за период T е > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "Сумата от стойностите на период T НЕ е N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Нед"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Неделя"
 
@@ -13154,27 +13554,27 @@ msgstr "Неделя"
 msgid "Support"
 msgstr "Поддръжка"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Фамилия"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Шведски (sv_SE)"
 
@@ -13182,16 +13582,16 @@ msgstr "Шведски (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "Превключването на метода за автентификация ще възстанови всичко по подразбиране, с изключение на тази сесия! Искате ли да продължите?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Система по подразбиране"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Грешка в системна."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13200,21 +13600,21 @@ msgid "System status"
 msgstr "Състояние на системата"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "Т"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -13233,11 +13633,11 @@ msgid "TOTAL"
 msgstr "ОБЩО"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "ТРИГЕР КОМЕНТАРИ"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "ИСТИНА"
 
@@ -13255,14 +13655,14 @@ msgstr "Таблица \"%1$s\" няма поле с име \"%2$s\"."
 msgid "Tag"
 msgstr "Етикет"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Цел"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Списък на цели"
 
@@ -13271,130 +13671,133 @@ msgid "Target type"
 msgstr "Тип цел"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Шаблон"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Шаблон \"%1$s\" вече съществува."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Шаблон \"%1$s\" за хост \"%2$s\" не съществува."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Шаблон добавен"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Шаблонът не може да бъде прикрепен към друг шаблон повече от веднъж, дори чрез други шаблони."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Шаблон изтрит"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Група на шаблон"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Връзка с шаблон"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Списък на шаблони"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Име на шаблон"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Шаблон на екрани"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Шаблон на тригер"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Шаблон актуалзиран"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Шаблон със същото име \"%s\" вече съществува."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Шаблон със същото видимо име \"%s\" вече съществува."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Шаблонни елементи на данните"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Шаблони"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Шаблони \"%1$s\" изключени от хостове \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Тера"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Тест"
 
@@ -13402,11 +13805,11 @@ msgstr "Тест"
 msgid "Test authentication"
 msgstr "Тест на автентификация"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Тест на конфигурация"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Тест на данни"
 
@@ -13420,22 +13823,22 @@ msgid "Test string"
 msgstr "Тест на низ"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Текст"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13443,7 +13846,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "Интерфейса не съответства на Zabbix база данни."
@@ -13458,26 +13861,26 @@ msgstr "Интерфейса не съответства на Zabbix база д
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Още не е открит елемента на данните и ще бъде изтрит от %1$s (on %2$s at %3$s)."
@@ -13486,20 +13889,20 @@ msgstr "Още не е открит елемента на данните и ще
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Полученият JSON не е валидно JSON-RPC искане."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "Исканата дистанционна процедурата не съществува / не е налична"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 #, fuzzy
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr "Приложението на уеб сценарий принадлежи към друг хост от хост на уеб сценарий."
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Тема"
 
@@ -13510,11 +13913,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "Съществува \"%1$d\" група с вътрешен достъп до Графичен потребителски интерфейс (GUI)."
 msgstr[1] "Съществуват \"%1$d\" групи с вътрешен достъп до Графичен потребителски интерфейс (GUI)."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Трети"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Това поле се попълва автоматично от елемент на данните \"%s\"."
@@ -13523,11 +13926,11 @@ msgstr "Това поле се попълва автоматично от еле
 msgid "This month"
 msgstr "Този месец"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Този колона от екран не е празена. Искате ли да я изтриете?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Този ред от екран не е празен. Искате ли да го изтриете?"
 
@@ -13539,27 +13942,27 @@ msgstr "Тзе седмица"
 msgid "This year"
 msgstr "Тази година"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Чет"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "До"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13568,28 +13971,28 @@ msgstr "До"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Време"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Време (възходящ)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Време (низходящ)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13597,54 +14000,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Период от време"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Смяна на времето"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Тип време"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Просрочване на времето"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Времева маркировка"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "Времевата маркировка не се различава от времето на Zabbix сървъра за повече от T секунди, тогава N = 1, 0 - в противен случай"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "Времевата маркировка не се различава от времето на Zabbix сървъра за повече от T секунди, тогава N НЕ е 1, 0 - в противен случай"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Заглавие"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Към"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "За да зададете интерфейс за хост изберете един тип елемент на данните за всички елементи на данните"
 
@@ -13652,17 +14055,18 @@ msgstr "За да зададете интерфейс за хост избере
 msgid "Today"
 msgstr "Днеска"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Горен край"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Общо"
 
@@ -13680,7 +14084,7 @@ msgstr "Общо време: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Транзакцията не е затворена. Прекратяване ..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Грешка при транспорт."
 
@@ -13697,91 +14101,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Динамика на промените"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Тригер"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Тригер \"%1$s\" вече съществува в \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Тригер \"%1$s\" зависи от тригер \"%2$s\", който не съществува."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Тригер \"%1$s\" пропуснат - потребителско правило."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Тригер \"%s\" принадлежи към шаблони с различни връзки."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Тригер добавен"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Коментари към тригер"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Тригер изтрит"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Преглед на опциите на тригер"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13796,11 +14200,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Състояние на тригер израза"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "Тригер израза трябва да съдържа поне един хост: ключова отправна точка."
 
@@ -13808,7 +14213,7 @@ msgstr "Тригер израза трябва да съдържа поне ед
 msgid "Trigger form"
 msgstr "Форма на тригер за дневника"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "В тригера има елементи на данните от шаблон \"%1$s\", който не е свързан към хост."
@@ -13821,12 +14226,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "В тригер от шаблон \"%1$s\" има зависимост с тригер от шаблон \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Тригера току що е добавен. Досега състоянието му не е актуализирано."
 
@@ -13838,52 +14243,52 @@ msgstr "Тип етикет на тригер"
 msgid "Trigger name"
 msgstr "Име на тригер"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Тригер прототип"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Тригер прототипи"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13891,23 +14296,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Тригер прототип за"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Важност на тригер "
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Важност на тригер "
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Тригер актуализиран"
 
@@ -13915,40 +14328,41 @@ msgstr "Тригер актуализиран"
 msgid "Trigger value"
 msgstr "Стойност на тригер"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Тригери"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Тригери изтрити"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Информация за тригери"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Общо актуализиране на тригери"
 
@@ -13956,78 +14370,78 @@ msgstr "Общо актуализиране на тригери"
 msgid "Triggers overview"
 msgstr "Преглед на тригери"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Състояние на тригери"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Топ 100 на тригерите"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Тригери с важност"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Пресечена"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Опитай пак да прочетеш недостъпното свойство \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Вто"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Турски (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Два елемента трябва да бъдат избрани"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Двата елемента на данните (\"%1$s\" и \"%2$s\") не могат да се попълнят в едно поле \"%3$s\" инвентарни данни за хост, това ще доведе до конфликт."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Тип"
 
@@ -14035,62 +14449,64 @@ msgstr "Тип"
 msgid "Type (Full details)"
 msgstr "Тип (Пълни подробности)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Тип (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Тип (възходящ)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Тип (низходящ)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Тип на изчислението"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Тип на информацията"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "За ключ на дневника (лога) типа на информацията трябва да бъде \"Дневник (лог)\"."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "За обобщаване елентите на данните типа на информацията трябва да бъде \"Числен (с плаваща точка)\"."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Типове"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "НЕИЗВЕСТЕН"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "ДОСТЪПЕН"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (след влизане в системата)"
 
@@ -14106,20 +14522,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 символа)"
 
@@ -14127,15 +14553,11 @@ msgstr "USA (160 символа)"
 msgid "USER PROFILE"
 msgstr "ПОТРЕБИТЕЛСКИ ПРОФИЛ"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Украински (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Не може да изберете конфигурация."
 
@@ -14143,7 +14565,7 @@ msgstr "Не може да изберете конфигурация."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Непотвърдено"
 
@@ -14156,20 +14578,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Непотвърдени събития ПРОБЛЕМ"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Само непотвърдени"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Деблокирай избраните"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Деблокиране на избраните потребители?"
 
@@ -14178,29 +14600,29 @@ msgstr "Деблокиране на избраните потребители?"
 msgid "Units"
 msgstr "Единици за измерване"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14210,23 +14632,20 @@ msgstr "Неизвестно"
 msgid "Unknown action"
 msgstr "Неизвестно действие"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Неизвестен алгоритъм за изчисляване състоянието на услугите"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Неизвестна функция."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Неизвестен елемент на данните за хост, няма такъв елемент на данните в избрания хост"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Неизвестен хост, няма такъв хост в системата"
 
@@ -14238,23 +14657,23 @@ msgstr "Неизвестен тип интерфейс."
 msgid "Unknown resource"
 msgstr "Неизвестен ресурс"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Неизвестен тип стойност"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Прекратяване на връзката"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Прекратяване на връзката и изчистване"
 
@@ -14262,61 +14681,61 @@ msgstr "Прекратяване на връзката и изчистване"
 msgid "Unlink from template"
 msgstr "Прекратяване на връзката от шаблон"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Прекратяване на връзката от шаблони"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Приложение \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Правило за откриване \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Графика \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Графичен прототип \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Елемент на данните \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Прототип на елемент на данните \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Тригер \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Тригер прототип \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Прекратена връзка: Уеб сценарий \"%1$s\" в \"%2$s\"."
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Включване на звука"
 
@@ -14330,32 +14749,43 @@ msgstr "Неподдържано разширение на файла за им�
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Неподдържан формат за импортиране \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Достъпно"
@@ -14366,34 +14796,34 @@ msgid "Up"
 msgstr "Достъпен"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Актуализиране"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Актуализиране на съществуващото"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Интервал за актуализиране"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Интервал за актуализиране (в сек)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Актуализирано"
 
@@ -14401,55 +14831,55 @@ msgstr "Актуализирано"
 msgid "Updated status of host"
 msgstr "Актуално състояние на хост"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Актуализирано: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Актуализирано: Проиложение \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Актуализирано: Правило за откриване \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Актуализирано: Елемент на данните \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Актуализирано: Прототип на елемент на данните \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Актуализирано: Тригер \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Актуализирано: Тригер прототип \"%1$s\" в \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Актуализиран: Уеб сценарий \"%1$s\" в \"%2$s\"."
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Качване"
 
@@ -14457,15 +14887,15 @@ msgstr "Качване"
 msgid "Upper level maps"
 msgstr "Ниво на горните карти"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 #, fuzzy
 msgid "Uptime"
 msgstr "Време без прекъсване - достъпно (Ъптайм)"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14473,10 +14903,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Време без прекъсване - достъпно/Време на прекъсване"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14491,84 +14921,88 @@ msgid "Used in actions"
 msgstr "Използва се в действия"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Потребител"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "Потребител \"%s\" не може да бъде без потребителска група."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Потребител добавен"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Потребителят не може да промени типа за себе си"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Потребителят не може да добави себе си към изключена група или група с изключен GUI достъп."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Потребителят не може да промени GUI достъпа за себе си."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Потребителят не може да промени състоянието за себе си"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Потребителят не може да промени състоянието за себе си"
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Потребител изтрит"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Потребителска група"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Потребителска група \"%1$s\" се използва в скрипт \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "Потребителска група \"%s\" вече съществува."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14585,34 +15019,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Потребителски групи"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Не е позполено на потребителя да изтрие себе си."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Потребителят не може да промени GUI достъпа за себе си, като стане член на потребителска група \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Потребителят не може да промени системното състояние за себе си, като стане член на потребителска група  \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Потребителско име"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "Потребителско име не съответства на БД"
 
@@ -14638,243 +15072,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Тип потребител"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Потребител актуализиран"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Потребител с псевдоним \"%s\" вече съществува."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Потребителско име"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Потребители"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Потребители (на линия)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Деблокирани потребители"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Стойност"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Стойност \"%1$s\" е невалидна за параметър \"grid_align\". Възможните опции са: \"%2$s\" и \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14909,11 +15343,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14959,10 +15393,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Стойност на реализациите с valuemapid \"%1$s\" не съществува."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Стойност на реализациите"
 
@@ -14971,7 +15405,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "Стойноста на реализациите трябва да имат най-малко една реализация."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14983,8 +15417,8 @@ msgstr "Стойност: няма данни"
 msgid "Values"
 msgstr "Стойности"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Променливи"
 
@@ -14997,64 +15431,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Вертикален"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Вертикално подравняване"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Прегледа не се показва."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Видимо име"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Видимото име не може да бъде празно, ако липсва име на хост."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Внимание"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Съжаляваме, достигнат е максималния възможен брой от елементи."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Уеб"
 
@@ -15062,68 +15501,86 @@ msgstr "Уеб"
 msgid "Web monitoring"
 msgstr "Уеб мониторинг"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr "Уеб сценарий \"%1$s\" вече съществува в хост \"%2$s\"."
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Уеб сценарий \"%1$s\" вече съществува."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Уеб сценарий изтрит"
 
-#: httpconf.php:337
+#: httpconf.php:365
 #, fuzzy
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Уеб сценарий изключен"
 msgstr[1] "Уеб сценарий изключен"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, fuzzy, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr "Липсващи параметри в уеб сценарий: %1$s"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr "Уеб сценария трябва да има най-малко една стъпка."
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr "Стъпка на уеб сценарий \"%1$s\" вече съществува"
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 #, fuzzy
 msgid "Web scenario step name should contain only printable characters."
 msgstr "Името на стъпка от уеб сценарий трябва да съдържа само печатни символи."
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 #, fuzzy
 msgid "Web scenario step number cannot be less than 1."
 msgstr "Номера на стъпка от уеб сценарий не може да бъде по-малко от 1."
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Уеб сценарии"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Сря"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Сряда"
 
@@ -15131,9 +15588,9 @@ msgstr "Сряда"
 msgid "Week"
 msgstr "Седмица"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Ежеседмично"
 
@@ -15141,12 +15598,12 @@ msgstr "Ежеседмично"
 msgid "When active"
 msgstr "Когато е активен"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Ширина"
@@ -15156,28 +15613,28 @@ msgstr "Ширина"
 msgid "With data collection"
 msgstr "Със събиране на данни"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "С последното непотвърдено събитие"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "С проблеми"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "С тригери"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "С непотвърдени събития"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Без проблеми"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Без тригери"
 
@@ -15186,7 +15643,7 @@ msgid "Wizard"
 msgstr "Помощник"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15199,180 +15656,165 @@ msgstr "Работно време"
 msgid "Working time \"%1$s\"."
 msgstr "Работно време \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Пиша"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Грешни полета за зависимост на услуга \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Грешни полета за елемент."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Грешни полета за хот \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr "Грешни полета за изображение."
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Грешни полета за макро \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Грешни полета за метод на уведомление."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Грешни полета за скрипт."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Грешни полета за услуга \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Грешни полета за време на услуга \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Грешни полета за тригер."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Грешни полета за потребител \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Грешно макро \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Етикет на X ос"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML файла съдържа грешка %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML файла съдържа грешки"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML файла съдържа фатална грешка %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML файла съдържа предупреждение %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Й"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Y ос МАКС стойност"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y ос МАКС стойност трябва да бъде по-голяма от стойността на Y ос МИН."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Y ос МИН стойност"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Мястото на Y ос"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Етикет на Y ос"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "m/d/Y h:i:s A"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "m/d/Y h:i:s A"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "m/d/Y"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "m/d/Y h:i A"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr "m/d/Y h:i:s A"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15380,97 +15822,106 @@ msgstr "m/d/Y h:i:s A"
 msgid "Year"
 msgstr "Година"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Ежегодно"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Да"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Йотта"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 #, fuzzy
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Вие не може да изберете някои от езиците, защото не е инсталирана локализация за тях на уеб сървъра."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Вие нямате право да променяте привилегиите за потребител \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Вие не сте влезли в системата."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Не може да превключвате хостове за текущата селекция."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Вие не сте уточнили хост за операцията."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Вие не сте уточнили хост група за операцията."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Вие не сте уточнили цели за команда \"%s\" в операция на действие."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Вие не сте уточнили цели за глобален скрипт \"%s\" в операция на действие."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "Вие нямате права за извършване на тази операция."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Вие нямате права за създаване на потребители."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Вие нямате права за актуализиране на другите потребители."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Вие нямате права за актуализиране на потребителя или потребителят не съществува."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Трябва да влезете в системата, за да видите тази страница."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "З"
@@ -15483,7 +15934,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15502,8 +15953,8 @@ msgid "Zabbix User"
 msgstr "Zabbix Потребител"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15529,10 +15980,11 @@ msgstr "Вътрешен Zabbix"
 msgid "Zabbix internal authentication"
 msgstr "Вътрешена автентификация Zabbix"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix сървър"
@@ -15548,7 +16000,7 @@ msgstr ""
 "1. Неправилно IP/DNS на сървъра в \"zabbix.conf.php\";\n"
 "2. Неправилна конфигурация на мрежата.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "IP адреса или порта на Zabbix сървъра не е зададен!"
 
@@ -15556,15 +16008,15 @@ msgstr "IP адреса или порта на Zabbix сървъра не е з�
 msgid "Zabbix server activity check interval"
 msgstr "Интервал за проверка активността на Zabbix сървъра "
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Информация за Zabbix сървър"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix сървърът не работи: показаната информация може да не е актуална."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix сървъра работи"
 
@@ -15573,11 +16025,11 @@ msgstr "Zabbix сървъра работи"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Интервала за проверка работоспособността на Zabbix сървъра е \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Име на Zabbix сървъра"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Порт на Zabbix сървъра"
 
@@ -15585,25 +16037,20 @@ msgstr "Порт на Zabbix сървъра"
 msgid "Zabbix trapper"
 msgstr "Zabbix трапер"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Зетта"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Мащабиране"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[h:i:s A]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Грешна стойност за ден: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Грешна стойност за месец: \"%s\" ]"
@@ -15612,19 +16059,19 @@ msgstr "[Грешна стойност за месец: \"%s\" ]"
 msgid "agent"
 msgstr "агент"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "Всички"
 
@@ -15632,19 +16079,15 @@ msgstr "Всички"
 msgid "all media"
 msgstr "всички уведомления"
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "вече съществува"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "като син"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "като зелен"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "като гервен"
 
@@ -15656,83 +16099,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "сред"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "д"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "дни"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "дд"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15754,19 +16163,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "динамичен"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "елементи"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "копиране на елементи в ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from и esc_step_to трябва да бъдат заедно."
 
@@ -15778,47 +16183,49 @@ msgstr "точно"
 msgid "executed"
 msgstr "изпълнено"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "фиксиран"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "намерени"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "ч"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "чч"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "хост"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "хост група"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "икона"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "изображение"
 
@@ -15826,7 +16233,7 @@ msgstr "изображение"
 msgid "in"
 msgstr "в"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15836,7 +16243,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "е"
 
@@ -15844,20 +16251,20 @@ msgstr "е"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "последно"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "съдържа"
@@ -15866,12 +16273,12 @@ msgstr "съдържа"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "м"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -15880,46 +16287,46 @@ msgstr "м"
 msgid "macro(s)"
 msgstr "макрос(и)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "поддръжка"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "карта на мрежата"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "макс"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "мин"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "минимум 60 секунди"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "мм"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "милисекунда"
@@ -15928,17 +16335,17 @@ msgstr "милисекунда"
 msgid "must be a valid LDAP user"
 msgstr "трябва да бъде валиден LDAP потребител"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "няма данни"
@@ -15951,12 +16358,14 @@ msgstr "не в"
 msgid "not like"
 msgstr "не съдържа"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "не работи"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "не е избрано"
 
@@ -15965,57 +16374,61 @@ msgstr "не е избрано"
 msgid "not sent"
 msgstr "не е изпратено"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "сега"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "на"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "в"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "друг"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "обновяване на всеки"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16024,25 +16437,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "запомни избраните"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "стартира"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "с"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "сек"
 
@@ -16055,7 +16467,7 @@ msgstr "секунди"
 msgid "sent"
 msgstr "изпратено"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "кратко описание"
 
@@ -16064,36 +16476,36 @@ msgstr "кратко описание"
 msgid "show icon mappings"
 msgstr "покажи съответствие на икони"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "покажи стойност на реализациите"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "шаблон с ID \"%1$s\" е изпълнен  %2$s пъти"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "до"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "тригер"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "неизвестен"
 
@@ -16105,11 +16517,11 @@ msgstr "стойност"
 msgid "via"
 msgstr "чрез"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "г"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "гггг"
diff --git a/frontends/php/locale/cs/LC_MESSAGES/frontend.po b/frontends/php/locale/cs/LC_MESSAGES/frontend.po
index 2bf51ad16c0..cd2eaa80912 100644
--- a/frontends/php/locale/cs/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/cs/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-11-04 20:24+0300\n"
 "Last-Translator: Jan <jan.garaj@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -15,22 +15,24 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1383589494.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr ""
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -38,7 +40,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -51,7 +53,7 @@ msgstr[2] ""
 msgid "%1$s (year %2$s)"
 msgstr ""
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
@@ -59,10 +61,8 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
@@ -70,7 +70,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -87,7 +87,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -111,23 +111,23 @@ msgstr[0] "%d zařízení"
 msgstr[1] "%d zařízení"
 msgstr[2] "%d zařízení"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr ""
 
@@ -135,34 +135,34 @@ msgstr ""
 msgid "(in sec)"
 msgstr "(v sek)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimum 60 sekund, 0 - použij defaultní nastavení akce)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(bez proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[HROMADNÉ POTVRZENÍ]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 nebo 1"
 
@@ -178,7 +178,7 @@ msgstr "10 sekund"
 msgid "30 seconds"
 msgstr "30 sekund"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D pohled"
 
@@ -194,7 +194,7 @@ msgstr "5 sekund"
 msgid "500 latest values"
 msgstr "500 posledních hodnot"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -213,12 +213,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "POTVRZENÍ ALARMŮ"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "A"
 
@@ -230,19 +229,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "PROTOKOL DOSTUPNOSTI"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -254,42 +253,42 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Přístup odepřen!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Účet zablokován na %s sekund"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Potvrzeno"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Přijmout"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Přijetí bylo potvrzeno"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Alarm přijat -"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Přijmout a zpět"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Stav přijetí"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Přijato"
 
@@ -314,63 +313,66 @@ msgstr "Potvrzování přijetí deaktivováno"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Akce"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr ""
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Akce byla přidána"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Akce byla smazána"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -384,21 +386,21 @@ msgstr[2] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Operace akce"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Akce byla aktualizována"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Akce"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktivní"
@@ -408,80 +410,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr ""
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktivní od"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktivní do"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Přidat"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Přidat komentář -"
 
@@ -497,27 +502,23 @@ msgstr "Přidat hostitele"
 msgid "Add link"
 msgstr "Přidat odkaz"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Přidat chybějící"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr ""
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Přidat do"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Přidat do oblíbených"
@@ -526,7 +527,7 @@ msgstr "Přidat do oblíbených"
 msgid "Add to host group"
 msgstr "Přidat hostitele do skupiny"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Přidat hostitele do skupin"
 
@@ -538,7 +539,7 @@ msgstr "Přidáno"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administrace"
 
@@ -546,34 +547,34 @@ msgstr "Administrace"
 msgid "Advanced labels"
 msgstr "Rozšířený popis"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Stáří"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Stáří méně než"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Stáří méně než %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agent"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Agentova rozhraní"
@@ -582,12 +583,12 @@ msgstr "Agentova rozhraní"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agent nebo SNMP nebo JMX nebo IPMI rozhraní"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -595,87 +596,90 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Zarovnat ikony"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Vše"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Všechny skupiny"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Veškeré odkazy by měly mít zadáno \"Jméno\" a \"URL\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Povolení hostitelé"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Jakýkoliv"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Obsahuje libovolný řetězec"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Aplikace"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Aplikace \"%1$s\" již existuje."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Aplikace byla přidána"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
@@ -683,36 +687,36 @@ msgstr[0] "Aplikace byla smazána"
 msgstr[1] "Aplikace byla smazána"
 msgstr[2] "Aplikace byla smazána"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Chyba aplikace."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Aplikace byla aktualizována"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Aplikace s ID \"%1$s\" není na \"%2$s\" dostupná."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Aplikace"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Použít"
 
@@ -721,16 +725,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Dub"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Duben"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Chcete opravdu provést tuto akci?"
 
@@ -746,9 +750,9 @@ msgstr "Velikost oblasti"
 msgid "Area type"
 msgstr "Typ oblasti"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -762,22 +766,17 @@ msgstr "Jako prostý text"
 msgid "Asset tag"
 msgstr "Inventární číslo"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
@@ -785,7 +784,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
@@ -793,23 +792,25 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "V (hodina:minuta)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr ""
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audit"
@@ -829,26 +830,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Srp"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Srpen"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Autentizační algoritmus"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -907,9 +910,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -917,20 +920,20 @@ msgstr "Automaticky"
 msgid "Automatic icon mapping"
 msgstr "Automatické přiřazení ikony"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Automatický výběr ikony"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Dostupnost"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Protokol dostupnosti"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Dostupný"
 
@@ -939,36 +942,36 @@ msgstr "Dostupný"
 msgid "Average"
 msgstr "Střední"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Průměr za"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr ""
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Poloha osy"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Pozadí"
@@ -977,7 +980,7 @@ msgstr "Pozadí"
 msgid "Background image"
 msgstr "Obrázek na pozadí"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Sloupcové grafy"
 
@@ -987,8 +990,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Základní autentifikace"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -1000,15 +1003,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind heslo"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Černá & Modrá"
 
@@ -1020,8 +1023,8 @@ msgstr "Blikání"
 msgid "Blocked"
 msgstr "Blokovaný"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Tučná čára"
 
@@ -1029,22 +1032,22 @@ msgstr "Tučná čára"
 msgid "Boolean"
 msgstr "Logická hodnota"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Dole"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Zesvětlit"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Hromadné potvrzení"
 
@@ -1070,7 +1073,7 @@ msgstr "NASTAVENÍ APLIKACÍ"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "NASTAVENÍ AUTENTIFIKACE"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1100,7 +1103,7 @@ msgstr "NASTAVENÍ SKUPIN HOSTITELŮ"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "NASTAVENÍ HOSTITELŮ"
 
@@ -1112,7 +1115,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr ""
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "NASTAVENÍ OBRÁZKŮ"
 
@@ -1121,14 +1124,14 @@ msgstr "NASTAVENÍ OBRÁZKŮ"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "NASTAVENÍ IT-SLUŽEB"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "NASTAVENÍ PŘEDLOH PRO POLOŽKY"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "NASTAVENÍ POLOŽEK"
 
@@ -1157,7 +1160,7 @@ msgstr "NASTAVENÍ SÍŤOVÝCH MAP"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "NASTAVENÍ PROXY"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "NASTAVENÍ PRO REGULÁRNÍ VÝRAZY"
 
@@ -1177,7 +1180,7 @@ msgstr "NASTAVENÍ SKRIPTŮ"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "NASTAVENÍ PREZENTACÍ"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "NASTAVENÍ ŠABLON"
 
@@ -1193,7 +1196,7 @@ msgstr "NASTAVENÍ PRIORIT SPOUŠTĚČŮ"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "NASTAVENÍ SPOUŠTĚČŮ"
 
@@ -1225,22 +1228,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "NASTAVENÍ ZABBIXU"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1249,21 +1252,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Výpočet SLA, akceptovatelné SLA (v %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Vypočítaná"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Vypočtená práva"
 
@@ -1271,92 +1274,95 @@ msgstr "Vypočtená práva"
 msgid "Callback"
 msgstr "Odvolat"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Kanada (136 znaků)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Nelze potvrdit událost"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Nelze přidat akci"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Nelze přidat aplikaci"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Šablona nemůže záviset na hostiteli."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Nelze přidat pravidlo pro průzkum"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Nelze přidat graf"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Nelze přidat skupinu"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Nelze přidat hostitele"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1364,24 +1370,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Nelze přidat obrázek"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr ""
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Nelze přidat položku"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1389,20 +1395,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr ""
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Nelze přidat servisní okno"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Nelze přidat typ média"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Nelze přidat více než jednu položku typu \"Souhrn grafu\" pro graf \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1411,24 +1417,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Nelze přidat síťovou mapu"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Nelze přidat proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Nelze přidat regulární výraz"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Nelze přidat obrazovku"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Nelze přidat skript"
 
@@ -1440,27 +1446,27 @@ msgstr "Nelze přidat službu"
 msgid "Cannot add slide show"
 msgstr "Nelze přidat slide-show"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Nelze přidat šablonu"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Nelze přidat spouštěč"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Nelze přidat uživatele"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Nelze přidat uživatele. Obě hesla musí být stejná."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Nelze přidat uživatele."
 
@@ -1468,7 +1474,7 @@ msgstr "Nelze přidat uživatele."
 msgid "Cannot add value map"
 msgstr "Nelze přidat mapu hodnot"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1488,23 +1494,23 @@ msgstr ""
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Nelze smazat historii"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Nelze klonovat předlohy pro grafy."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Nelze klonovat předlohy položek."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Nelze klonovat předlohy spouštěčů."
 
@@ -1512,20 +1518,20 @@ msgstr "Nelze klonovat předlohy spouštěčů."
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Připojení na trapper port daemona Zabbix serveru selhalo. Pro spuštění skriptu, ale musí být port dostupný."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Nelze kopírovat grafy"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Nelze zkopírovat položky"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Spouštěč \"%1$s:%2$s\" nelze zkopírovat, protože jeho definice zahrnuje více hostitelů."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1534,19 +1540,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "Nelze otevřít další připojení k databázi."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Nelze vytvořit pravidlo pro Discovery"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Nelze vytvořit skupinu hostitelů."
 
@@ -1554,42 +1560,39 @@ msgstr "Nelze vytvořit skupinu hostitelů."
 msgid "Cannot create icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr ""
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Nelze smazat akci"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
@@ -1597,60 +1600,64 @@ msgstr[0] "Nelze smazat aplikaci"
 msgstr[1] "Nelze smazat aplikaci"
 msgstr[2] "Nelze smazat aplikaci"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Nelze smazat pravidlo pro průzkum"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Nelze smazat graf"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Nelze smazat grafy"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Nelze smazat skupinu"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Nelze smazat skupinu"
+msgstr[1] "Nelze smazat skupinu"
+msgstr[2] "Nelze smazat skupinu"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Nelze smazat hostitele"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1658,80 +1665,80 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Nelze smazat obrázek"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Nelze smazat položku"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Nelze smazat položky"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Nelze smazat servisní okno"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Nelze smazat síťovou mapu"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Nelze smazat proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Nelze smazat regulární výraz"
 msgstr[1] "Nelze smazat regulární výrazy"
 msgstr[2] "Nelze smazat regulární výrazy"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Nelze smazat skript"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr ""
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr ""
 
@@ -1739,77 +1746,80 @@ msgstr ""
 msgid "Cannot delete service"
 msgstr "Nelze smazat službu"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Nelze smazat šablonu"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Nelze smazat spouštěč"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Nelze smazat spouštěče"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Nelze smazat uživatele"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1817,88 +1827,88 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr "Nelze smazat mapu hodnot"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1913,146 +1923,140 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2063,34 +2067,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2100,41 +2123,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2147,12 +2170,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr ""
@@ -2165,7 +2190,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
@@ -2173,52 +2198,53 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Nelze připojit šablonu"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr ""
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2238,7 +2264,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2247,11 +2273,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2259,11 +2285,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr ""
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr ""
 
@@ -2272,217 +2298,226 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Nelze odblokovat uživatele"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr ""
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Nelze odpojit šablonu"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Nelze upravit akci"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Nelze upravit aplikaci"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Nelze upravit komentář"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Nelze upravit ladící mód"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Nelze aktualizovat pravidlo pro průzkum"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Nelze upravit graf"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Nelze upravit skupinu"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr ""
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Nelze upravit hostitele"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr ""
 
@@ -2494,24 +2529,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr "Nelze upravit obrázek"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Nelze upravit položku"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr ""
 
@@ -2523,16 +2558,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr "Nelze upravit makra"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Nelze upravit servisní okno"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr ""
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2540,28 +2575,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr "Nelze upravit síťovou mapu"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Nelze upravit proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Nelze upravit regulární výraz"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Nelze upravit obrazovku"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Nelze upravit skript"
 
@@ -2573,40 +2604,41 @@ msgstr "Nelze upravit službu"
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Nelze upravit šablonu"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Nelze upravit spouštěč"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Nelze upravit uživatele"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Nelze upravit uživatele. Obě hesla musí být stejná."
 
@@ -2614,15 +2646,15 @@ msgstr "Nelze upravit uživatele. Obě hesla musí být stejná."
 msgid "Cannot update value map"
 msgstr "Nelze aktualizovat mapu hodnot"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Popisek"
 
@@ -2631,47 +2663,47 @@ msgstr "Popisek"
 msgid "Case sensitive"
 msgstr "Rozlišovat velikost"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Změna"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Změnit heslo"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Znak"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Obsahuje řetězec"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Neobsahuje řetězec"
 
@@ -2680,48 +2712,48 @@ msgid "Chassis"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr ""
 
@@ -2730,44 +2762,44 @@ msgid "Check type"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Kontroly"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr ""
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Čínsky (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr ""
@@ -2782,34 +2814,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Pročistit historii vybraných"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Pročistit při odpojování"
 
@@ -2819,69 +2852,69 @@ msgstr "Hodiny"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Vytvořit kopii"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Zavřít"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Barva"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Barva (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Rozsah sloupců"
 
@@ -2896,7 +2929,7 @@ msgstr "Kombinovaný výsledek"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Příkaz"
 
@@ -2904,41 +2937,31 @@ msgstr "Příkaz"
 msgid "Command actions"
 msgstr "Akce příkazů"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr ""
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr ""
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Komentář byl aktualizován"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Komentáře"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr ""
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Porovnání hodnot pro časové období"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2946,29 +2969,39 @@ msgstr ""
 msgid "Condition"
 msgstr "Podmínka"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Podmínky"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3131,23 +3164,23 @@ msgstr "Nastavení bylo aktualizováno"
 msgid "Configure (Filter %s)"
 msgstr ""
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Připojit k"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr ""
@@ -3195,7 +3228,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3203,30 +3236,38 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Kopírovat vybrané do ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Nepodařilo se uložit obrázek!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Počet"
 
@@ -3246,6 +3287,10 @@ msgstr "Vytvořit aplikaci"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3263,7 +3308,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3276,15 +3321,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
-#: adm.iconmapping.php:126
-msgid "Create icon map"
+#: adm.images.php:151
+msgid "Create icon"
 msgstr ""
 
-#: adm.images.php:149
-msgid "Create image"
+#: adm.iconmapping.php:126
+msgid "Create icon map"
 msgstr ""
 
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr ""
 
@@ -3308,6 +3353,10 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr ""
@@ -3332,11 +3381,11 @@ msgstr "Vytvořit skript"
 msgid "Create slide show"
 msgstr ""
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr ""
 
@@ -3360,42 +3409,42 @@ msgstr ""
 msgid "Create value map"
 msgstr "Vytvořit mapu hodnot"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3405,51 +3454,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr ""
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr ""
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3462,7 +3512,7 @@ msgstr "Vlastní grafy"
 msgid "Custom label"
 msgstr ""
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3476,7 +3526,7 @@ msgstr "Vlastní multiplikátor"
 msgid "Custom screens"
 msgstr "Vlastní obrazovky"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr ""
 
@@ -3496,18 +3546,14 @@ msgstr ""
 msgid "Custom slides"
 msgstr "Vlastní prezentace"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Česky (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "NASTAVENÍ ŘÍDÍCÍHO PANELU"
@@ -3523,28 +3569,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "DETAILY SCÉNÁŘE"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "ZAKÁZÁNO"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr ""
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3552,25 +3598,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Jméno DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr ""
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Denně"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr ""
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Tmavší"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Řídící panel"
 
@@ -3582,20 +3628,21 @@ msgstr "Nastavení řídícího panelu"
 msgid "Dashboard filter"
 msgstr "Filtr řídících panelů"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Čárkovaná čára"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Data"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3618,11 +3665,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Datový typ"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr ""
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr ""
 
@@ -3630,35 +3678,39 @@ msgstr ""
 msgid "Database monitor"
 msgstr "Monitor databáze"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr ""
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr ""
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr ""
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr ""
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr ""
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr ""
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr ""
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Datum"
 
@@ -3678,53 +3730,52 @@ msgstr ""
 msgid "Date HW purchased"
 msgstr ""
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Den"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Den v měsíci"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Den v týdnu"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "dní"
 
@@ -3732,22 +3783,22 @@ msgstr "dní"
 msgid "Debug"
 msgstr "Ladící výstup"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Ladící mód"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Ladící mód byl aktualizován"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Pro"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Prosinec"
 
@@ -3757,15 +3808,14 @@ msgstr "Desítkový"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Výchozí"
 
@@ -3778,11 +3828,11 @@ msgid "Default delay (in seconds)"
 msgstr ""
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Výchozí zpráva"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3805,30 +3855,34 @@ msgstr ""
 msgid "Delay"
 msgstr "Prodleva"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr ""
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Zpožděno o"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Smazat"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Smazat a pročistit"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Upozornění: tímto smažete vybrané šablony a pročistíte všechny připojené hostitele"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3836,53 +3890,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Smazat výraz?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Smazat graf?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Smazat historii vybraných webových scénářů?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Smazat historii vybraných položek?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Smazat klíčové slovo?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3890,11 +3944,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr "Smazat servisní okno?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3902,7 +3960,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr "Smazat regulární výraz?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Smazat scénář?"
 
@@ -3910,71 +3968,67 @@ msgstr "Smazat scénář?"
 msgid "Delete screen?"
 msgstr "Smazat obrazovku?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Smazat skript?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Smazat vybrané"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Smazat vybrané scénáře?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Smazat vybrané aplikace?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Smazat vybrané průzkumy?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Smazat vybrané prvky?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Smazat vybrané grafy?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Smazat vybranou skupinu?"
@@ -3983,27 +4037,27 @@ msgstr "Smazat vybranou skupinu?"
 msgid "Delete selected groups?"
 msgstr "Smazat vybrané skupiny?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Smazat vybraného hostitele?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Smazat vybrané hostitele?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Smazat vybraný obrázek?"
 
@@ -4011,31 +4065,31 @@ msgstr "Smazat vybraný obrázek?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Smazat vybrané položky?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Smazat vybraná servisní okna?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Smazat vybrané mapy?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Smazat vybrané typy médií?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Smazat vybrané proxy?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Smazat vybrané regulární výrazy?"
 
@@ -4043,15 +4097,15 @@ msgstr "Smazat vybrané regulární výrazy?"
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Smazat vybrané skripty?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Smazat vybrané šablony?"
 
@@ -4063,11 +4117,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Smazat vybrané spouštěče?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Smazat vybraného uživatele?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Smazat vybrané uživatele?"
 
@@ -4083,11 +4137,15 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Smazat vybrané včetně připojených položek"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4096,15 +4154,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Smazat spouštěč?"
 
@@ -4112,62 +4170,62 @@ msgstr "Smazat spouštěč?"
 msgid "Deleted"
 msgstr "Smazán"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4176,35 +4234,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Oddělovač"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Rozdíl (změna)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Rozdíl (rychlost za sekundu)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Zakázat"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Závisející"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Závisí na"
 
@@ -4212,30 +4270,41 @@ msgstr "Závisí na"
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Popis"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Detaily"
 
@@ -4248,71 +4317,71 @@ msgid "Device"
 msgstr "Zařízení"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Jedinečný identifikátor zařízení"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4336,48 +4405,44 @@ msgstr "Zakázat ladící mód pro vybrané skupiny?"
 msgid "Disable host"
 msgstr "Zakázat hostitele"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Zakázat hostitele sledované přes vybrané proxy?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Zakázat vybrané"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Zakázat vybrané webové scénáře?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Zakázat vybrané aplikace?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Zakázat vybrané průzkumy?"
 
@@ -4385,11 +4450,11 @@ msgstr "Zakázat vybrané průzkumy?"
 msgid "Disable selected groups?"
 msgstr "Zakázat vybrané skupiny?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Zakázat vybrané hostitele?"
 
@@ -4397,42 +4462,47 @@ msgstr "Zakázat vybrané hostitele?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Zakázat vybrané položky?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Zakázat vybrané spouštěče?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Zakázáno"
 
@@ -4445,7 +4515,7 @@ msgstr "Kritický"
 msgid "Discovered"
 msgstr "Nalezené"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4453,17 +4523,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "Nalezené zařízení"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Průzkum"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Průzkum podle proxy"
 
@@ -4471,17 +4541,17 @@ msgstr "Průzkum podle proxy"
 msgid "Discovery check"
 msgstr "Kontrola průzkumu"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4490,69 +4560,72 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Pravidlo pro průzkum"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Pravidlo pro průzkum bylo smazáno"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Pravidlo pro průzkum bylo aktualizováno"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Pravidla pro průzkum byla smazána"
 
@@ -4564,7 +4637,7 @@ msgstr "Stav průzkumu"
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Zobrazuji"
 
@@ -4573,32 +4646,32 @@ msgstr "Zobrazuji"
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Rozložení hodnot pro více časových období"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Rozložení hodnot pro časové období"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Nevypočítávat"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Tečka"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4608,30 +4681,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Prostoj"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Styl vykreslení"
 
@@ -4649,74 +4722,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Trvání"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Nizozemsky (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Dynamická položka"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "CHYBA"
 
@@ -4724,13 +4798,13 @@ msgstr "CHYBA"
 msgid "EVENTS"
 msgstr "UDÁLOSTI"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4738,9 +4812,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Upravit"
 
@@ -4748,7 +4822,7 @@ msgstr "Upravit"
 msgid "Edit map element"
 msgstr "Upravit prvek mapy"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4756,27 +4830,61 @@ msgstr ""
 msgid "Element"
 msgstr "Prvek"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Název prvku"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "E-mail"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Prázdný"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4784,76 +4892,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4862,11 +4992,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4874,11 +5004,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Povolit"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4898,11 +5032,11 @@ msgstr ""
 msgid "Enable host"
 msgstr "Povolit hostitele"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Povolit hostitele sledované přes vybrané proxy?"
 
@@ -4915,36 +5049,32 @@ msgstr "Povolit hostitele sledované přes vybrané proxy?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Povolit vybrané"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Povolit vybrané průzkumy?"
 
@@ -4952,11 +5082,11 @@ msgstr "Povolit vybrané průzkumy?"
 msgid "Enable selected groups?"
 msgstr "Povolit vybrané skupiny?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4964,64 +5094,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Povolit vybrané položky?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Povolit vybrané spouštěče?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Anglicky (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Chyba"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -5039,15 +5173,15 @@ msgstr "Událost"
 msgid "Event ID"
 msgstr "ID události"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Událost potvrzena"
 
@@ -5056,7 +5190,7 @@ msgstr "Událost potvrzena"
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Potvrzování událostí zakázáno"
 
@@ -5064,7 +5198,7 @@ msgstr "Potvrzování událostí zakázáno"
 msgid "Event details"
 msgstr "Detaily události"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Generování události"
 
@@ -5084,9 +5218,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Události"
 
@@ -5094,36 +5229,41 @@ msgstr "Události"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Perioda dne(í)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Perioda týdne(ů)"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Vyjma"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr ""
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5131,13 +5271,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Vykonaný skript"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5149,7 +5289,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr "Rozvést jeden problém"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5159,12 +5299,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Rozdělený koláčový"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Exportovat vybrané"
 
@@ -5172,22 +5312,22 @@ msgstr "Exportovat vybrané"
 msgid "Export to CSV"
 msgstr ""
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Výraz"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5195,11 +5335,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr "Proměnné výrazu"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Výraz nemůže být prázdný"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5220,17 +5361,17 @@ msgid "External check"
 msgstr "Vnější kontrola"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "NEPRAVDA"
 
@@ -5239,16 +5380,17 @@ msgstr "NEPRAVDA"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Selhalo"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Selhalo"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5256,40 +5398,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Neúspěšný audit"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Oblíbené grafy"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Oblíbené mapy"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Oblíbené obrazovky"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Oblíbené"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Ún"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Únor"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Pole"
 
@@ -5333,19 +5475,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5354,13 +5496,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5368,68 +5510,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Oblast"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtr"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filtrovat podle jména"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Dokončit"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "První"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5438,8 +5583,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Pevná"
 
@@ -5449,76 +5594,80 @@ msgstr "Pevná"
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Heslo účtu guest musí být prázdné"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Vzorec"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Čtvrtý"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Francouzsky (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Pá"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Pátek"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Od"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Vytvořit úplnou kopii"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Funkce"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5528,50 +5677,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "Grafické rozhraní"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr ""
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Obecné"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Německy (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5579,65 +5728,65 @@ msgid "Get support"
 msgstr "Podpora"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Zadaný výraz není makro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Proveď"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5646,66 +5795,73 @@ msgid "Gradient line"
 msgstr "Přechod"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Graf"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Graf byl přidán"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Graf byl smazán"
 
@@ -5717,54 +5873,59 @@ msgstr "Prvek grafu"
 msgid "Graph item"
 msgstr "Položka grafu"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Název grafu"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5776,49 +5937,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr "Souhrn grafu"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Typ grafu"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Graf byl aktualizován"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Grafy"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Grafy byly zkopírovány"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Grafy byly smazány"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5827,54 +5990,59 @@ msgstr ""
 msgid "Grid"
 msgstr "Mřížka"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Skupina"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Skupina byla přidána"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Skupina byla smazána"
+msgid_plural "Groups deleted"
+msgstr[0] "Skupina byla smazána"
+msgstr[1] "Skupina byla smazána"
+msgstr[2] "Skupina byla smazána"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5885,40 +6053,42 @@ msgstr "Skupina pro nalezené hostitele"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Název skupiny"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Skupina byla aktualizována"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -5926,22 +6096,13 @@ msgstr "Skupiny"
 msgid "Groups in maintenance"
 msgstr "Skupiny v servisním okně"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "G:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "G:i:s"
 
@@ -5958,7 +6119,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5976,7 +6137,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5997,12 +6159,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Výška"
@@ -6015,15 +6182,15 @@ msgstr "Nápověda"
 msgid "Hexadecimal"
 msgstr "Šestnáctkový"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Skryta"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Skrýt"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Skrýt vše"
 
@@ -6039,15 +6206,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Skrýt zakázané spouštěče"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Skrýt vybrané"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6056,23 +6223,23 @@ msgstr ""
 msgid "High"
 msgstr "Závažný"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Historie"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Historie byla pročištěna"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Pročištění historie může chvíli trvat. Pokračovat?"
 
@@ -6093,80 +6260,80 @@ msgstr "Historie událostí"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Vodorovný"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Vodorovné zarovnání"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Hostitel"
 msgstr[1] "Hostitel"
 msgstr[2] "Hostitel"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6178,31 +6345,31 @@ msgstr "IP hostitele"
 msgid "Host access"
 msgstr "Přístup hostitele"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Hostitel byl přidán"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Počet hostitelů"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Hostitel byl smazán"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
@@ -6210,36 +6377,38 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Skupina hostitele"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6256,14 +6425,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Skupina hostitelů"
 
@@ -6273,8 +6443,8 @@ msgstr "Skupina hostitelů"
 msgid "Host interface"
 msgstr ""
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6290,7 +6460,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6299,18 +6469,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Název hostitele"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6319,74 +6489,74 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6398,7 +6568,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6410,51 +6580,52 @@ msgstr "Stav hostitele"
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr ""
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Hostitel byl aktualizován"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hostitelé"
 
@@ -6462,11 +6633,11 @@ msgstr "Hostitelé"
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hostitelé (sl/nesl/šab/zak)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6478,37 +6649,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr "Hostitelé v servisním okně"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Informace o hostiteli"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Umístění hostitelů"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Hodinově"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "hodin"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Maďarsky (hu_HU)"
 
@@ -6526,22 +6698,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6549,26 +6721,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP adresa"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Rozsah IP"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6576,22 +6748,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr "IPMI agent"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI autentizační algoritmus"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI heslo"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI úroveň oprávnění"
 
@@ -6601,7 +6773,7 @@ msgstr "IPMI úroveň oprávnění"
 msgid "IPMI sensor"
 msgstr "IPMI senzor"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI uživatelské jméno"
 
@@ -6634,7 +6806,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6650,25 +6822,25 @@ msgid "ITEMS"
 msgstr "POLOŽKY"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ikona"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Ikona (výchozí)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Ikona (zakázáno)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Ikona (údržba)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Ikona (problém)"
 
@@ -6689,42 +6861,44 @@ msgstr "Typ popisku ikony"
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6737,7 +6911,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6745,29 +6920,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6775,21 +6950,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Pokud si myslíte, že tato zpráva je špatně, prosím kontaktuje vašeho administrátora pro přidělení potřebných oprávnění."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Obrázek"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6798,7 +6975,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Obrázek byl přidán"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Obrázek byl smazán"
 
@@ -6806,12 +6983,13 @@ msgstr "Obrázek byl smazán"
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6820,66 +6998,66 @@ msgid "Image updated"
 msgstr "Obrázek byl aktualizován"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Obrázky"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Ihned"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Import"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Importovat soubor"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "V"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Ve skupinách"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6892,244 +7070,282 @@ msgstr "Probíhá údržba"
 msgid "In progress"
 msgstr "Probíhá"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Včetně"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Funkci byly předány neplatné argumenty"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7139,11 +7355,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7152,11 +7368,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7164,74 +7380,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Není použita platná funkce"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7239,182 +7481,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Neplatný seznam položek."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Neplatné datum servisu"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Neplatná perioda dní servisu"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Neplatný den v týdnu servisu"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Neplatná perioda měsíců servisu"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Neplatná doba trvání servisu"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Neplatná perioda týdnů servisu"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7423,64 +7684,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7501,52 +7766,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Neplatný výraz spouštěče"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7555,7 +7825,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7575,7 +7846,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7585,43 +7856,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7630,15 +7907,15 @@ msgstr ""
 msgid "Information"
 msgstr "Informační"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Vložit"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Vložit makro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Instalace"
 
@@ -7646,31 +7923,32 @@ msgstr "Instalace"
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr ""
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7690,7 +7968,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7698,7 +7976,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7711,19 +7989,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Interval"
 
@@ -7733,112 +8011,114 @@ msgstr "Interval"
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventář"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7847,7 +8127,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7855,12 +8135,12 @@ msgstr ""
 msgid "Is online?"
 msgstr "Je přihlášený?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Problém"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7868,70 +8148,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italsky (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Položka"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Položka byla přidána"
 
@@ -7939,18 +8220,18 @@ msgstr "Položka byla přidána"
 msgid "Item count"
 msgstr "Počet položek"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Položka byla smazána"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7965,58 +8246,58 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -8024,92 +8305,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Položka byla aktualizována"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Položka nebude akutalizována. Zadejte, prosím, správný interval aktualizací."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Položky"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Položky (sl/nesl/nep)[šab]"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Položky byly zkopírovány"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Položky byly smazány"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Seznam položek"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Položky byly aktualizovány"
 
@@ -8121,72 +8402,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber účet"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Led"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Leden"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japonsky (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Čvc"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Červenec"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Čer"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Červen"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8195,40 +8476,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Klíč"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Klíčové slovo"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Korejsky (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "POSLEDNÍ HODNOTY"
 
@@ -8259,37 +8540,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr ""
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Popisek"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Umístění popisku"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Jazyk"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Poslední"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8302,19 +8583,19 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8334,28 +8615,28 @@ msgstr "Posledních 365 dní"
 msgid "Last 7 days"
 msgstr "Posledních 7 dní"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Poslední změna"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Poslední kontrola"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Graf za poslední hodinu"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Graf za poslední měsíc"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Posledních"
 
@@ -8363,66 +8644,67 @@ msgstr "Posledních"
 msgid "Last seen (age)"
 msgstr "Poslední kontakt (stáří)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Poslední hodnota"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Graf za minulý týden"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Poslední hodnoty"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Poslední události"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Litevsky (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Vlevo"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legenda"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Čára"
 
@@ -8430,39 +8712,29 @@ msgstr "Čára"
 msgid "Link"
 msgstr "Spojnice"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Ukazatel stavu spojnice"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8474,50 +8746,50 @@ msgstr "Připojit šablonu"
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Připojené šablony"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Připojené k"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Nahrávám..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Místní čas"
 
@@ -8534,36 +8806,36 @@ msgid "Location longitude"
 msgstr ""
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Formát času pro logování"
@@ -8572,12 +8844,12 @@ msgstr "Formát času pro logování"
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8588,12 +8860,12 @@ msgstr "Přihlásit"
 msgid "Login as Guest"
 msgstr ""
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8602,8 +8874,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8624,22 +8897,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "F Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8651,7 +8920,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "ÚDRŽBA"
 
@@ -8676,49 +8945,49 @@ msgstr "NEJAKTIVNĚJŠÍ SPOUŠTĚČE TOP 100"
 msgid "Macro"
 msgstr "Makro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Makra"
 
@@ -8726,31 +8995,36 @@ msgstr "Makra"
 msgid "Macros updated"
 msgstr "Makra byla aktualizována"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Servisní okna"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Servisní okno bylo přidáno"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Servisní okno bylo smazáno"
 
@@ -8758,7 +9032,7 @@ msgstr "Servisní okno bylo smazáno"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Délka servisního okna"
 
@@ -8774,25 +9048,25 @@ msgstr "Stav údržby"
 msgid "Maintenance type"
 msgstr "Typ servisního okna"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Servisní okno bylo aktualizováno"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8803,12 +9077,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Mapa"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8818,12 +9092,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8840,12 +9114,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr "Ukládání mapy selhalo."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8855,23 +9129,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Mapy"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "bře"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "březen"
 
@@ -8879,28 +9153,34 @@ msgstr "březen"
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Označit ostatní"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Označit vybrané"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Hromadná aktualizace"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Největší zobrazovaný počet položek v tabulce"
@@ -8914,35 +9194,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr "Největší zobrazovaný počet událostí spouštěče"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximalizovat"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8950,16 +9206,16 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
@@ -8967,92 +9223,85 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "kvě"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Média"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Typ média"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Typ média byl smazán"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Typ média byl aktualizován"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Typy médií"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9067,14 +9316,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9084,7 +9333,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Zpráva"
 
@@ -9092,66 +9341,66 @@ msgstr "Zpráva"
 msgid "Message actions"
 msgstr "Akce zpráv"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr ""
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Střed"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimalizovat"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9160,7 +9409,7 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
@@ -9168,73 +9417,70 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "minut"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9244,7 +9490,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9256,18 +9502,18 @@ msgstr "Mód"
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "po"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "pondělí"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Sledován přes proxy"
 
@@ -9275,33 +9521,33 @@ msgstr "Sledován přes proxy"
 msgid "Monitored host"
 msgstr "Sledovaný hostitel"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Sledování"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Měsíc"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "měsíčně"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9309,7 +9555,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Více jak 10 minut"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9318,19 +9564,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "Nejaktivnější spouštěče TOP 100"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "opakování události"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr ""
 
@@ -9343,60 +9589,58 @@ msgstr "SÍŤOVÉ MAPY"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr ""
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
+msgid "NTLM"
 msgstr ""
 
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9407,26 +9651,32 @@ msgstr ""
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Jméno"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9445,12 +9695,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9458,7 +9708,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Síťová mapa byla přidána"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Síťová mapa byla smazána"
 
@@ -9470,7 +9720,7 @@ msgstr "Síťová mapa byla aktualizována"
 msgid "Network maps"
 msgstr "Síťové mapy"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Nikdy"
 
@@ -9478,24 +9728,24 @@ msgstr "Nikdy"
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Nová"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Nová aplikace"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Nová podmínka"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Nový prvek"
 
@@ -9506,16 +9756,16 @@ msgstr "Nový prvek"
 msgid "New flexible interval"
 msgstr "Nový proměnný interval"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Nová skupina"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Nová položka grafu"
 
@@ -9523,83 +9773,99 @@ msgstr "Nová položka grafu"
 msgid "New media"
 msgstr "Nové médium"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Nový regulární výraz"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Nový servisní čas"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Další"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Ne"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9607,25 +9873,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9651,8 +9917,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9662,7 +9928,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9670,30 +9936,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9702,27 +9969,27 @@ msgstr ""
 msgid "No data collection"
 msgstr "bez sběru dat"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9730,39 +9997,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Nejsou žádné události k potvrzení"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9777,7 +10044,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9786,7 +10053,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9795,48 +10066,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9849,17 +10121,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9878,33 +10155,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9923,7 +10207,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9939,7 +10223,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9948,15 +10232,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9968,133 +10252,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr ""
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10102,7 +10431,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10110,82 +10439,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Není vybrán cíl"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Není spouštěč"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10194,57 +10524,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Žádná"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normální"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Nepotvrzeno"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Položky bez šablony"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Nedostupný"
 
@@ -10253,7 +10584,7 @@ msgstr "Nedostupný"
 msgid "Not classified"
 msgstr "Neurčeno"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Nepřihlášený"
 
@@ -10266,8 +10597,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nepodporováno"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Poznámka"
@@ -10280,7 +10611,7 @@ msgstr "Poznámky"
 msgid "Nothing"
 msgstr "Nic"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10288,87 +10619,87 @@ msgstr ""
 msgid "Notification report"
 msgstr "Protokol zpráv"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Zprávy"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "lis"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "listopad"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10376,88 +10707,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "Počet změn stavu"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Počet kroků"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Počet uživatelů (přihlášených)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Číslo (float)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Číslo (integer 64bit)"
 
@@ -10472,16 +10803,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10497,8 +10830,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "NEBO"
 
@@ -10518,11 +10850,12 @@ msgstr "OS (krátce)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "PŘEHLED"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "říj"
 
@@ -10530,25 +10863,25 @@ msgstr "říj"
 msgid "Octal"
 msgstr "Osmičkový"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "říjen"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Off"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "On"
 
@@ -10556,111 +10889,114 @@ msgstr "On"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Pouze jednou"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Jednorázový downtime"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Počítány jsou pouze položky přiřazené k povoleným hostitelům"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Počítány jsou pouze spouštěče přiřazené k povoleným hostitelům a závisející na povolených položkách"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10669,28 +11005,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Podmínka operace"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Typ operace"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operace"
@@ -10699,25 +11035,27 @@ msgstr "Operace"
 msgid "Operator"
 msgstr "Operátor"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10747,24 +11085,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Původní"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Původní modrá"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Další"
 
@@ -10772,19 +11110,19 @@ msgstr "Další"
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Další skupiny"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10794,21 +11132,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Další parametry"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10821,14 +11159,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Přehled"
 
@@ -10836,7 +11171,7 @@ msgstr "Přehled"
 msgid "Overview by proxy"
 msgstr "Přehled podle proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10845,147 +11180,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr "ŘÍDÍCÍ PANEL"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHP - podpora databází"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP - verze"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10994,32 +11337,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLÉM"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Barevná paleta"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parametr"
 
@@ -11028,7 +11373,7 @@ msgstr "Parametr"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11048,33 +11393,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Pasivní"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11084,20 +11429,21 @@ msgstr "Pasivní"
 msgid "Password"
 msgstr "Heslo"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Heslo (ověření)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Heslo nemůže být prázdné"
 
@@ -11106,21 +11452,21 @@ msgstr "Heslo nemůže být prázdné"
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11128,12 +11474,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Období"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Opakování"
@@ -11143,24 +11489,24 @@ msgstr "Opakování"
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Koláčový"
 
@@ -11172,55 +11518,56 @@ msgstr ""
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Vyberte, prosím, dva prvky"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polsky (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11228,51 +11575,51 @@ msgstr ""
 msgid "Port range"
 msgstr ""
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portugalsky (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Pozice"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "POST"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Náhled"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Předchozí"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11321,30 +11668,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Soubor se soukromým klíčem"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problém"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Zobrazit problémy"
 
@@ -11356,16 +11704,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Problém, když všechny podřazené mají problém"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problém, když alespoň jeden podřazený má problém"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problémy"
 
@@ -11373,75 +11721,71 @@ msgstr "Problémy"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxy"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy byla přidána"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy byla smazána"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Mód proxy"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Název proxy"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy byla aktualizována"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Veřejný klíč"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11452,7 +11796,7 @@ msgstr "Soubor s veřejným klíčem"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "FRONTA POLOŽEK K AKTUALIZACI"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Fronta"
 
@@ -11460,18 +11804,18 @@ msgstr "Fronta"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Čtení"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Pouze čtení"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Čtení a zápis"
 
@@ -11483,7 +11827,7 @@ msgstr "Důvod"
 msgid "Received value"
 msgstr "Přijatá hodnota"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11491,11 +11835,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Příjemce"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11506,28 +11850,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "Příjemce(i)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr ""
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Zpráva při obnovení"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Předmět zprávy při obnovení"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Automatická aktualizace (sekund)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Multiplikátor času aktualizace"
 
@@ -11545,48 +11889,52 @@ msgstr ""
 msgid "Regular expression"
 msgstr "Regulární výraz"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Regulární výraz byl přidán"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Regulární výraz byl smazán"
 msgstr[1] "Regulární výrazy byli smazány"
 msgstr[2] "Regulární výrazy byli smazány"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Regulární výraz byl aktualizován"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11603,26 +11951,28 @@ msgstr "Vzdálený příkaz"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11633,21 +11983,19 @@ msgstr "Vzdálený příkaz"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Odstranit"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11655,11 +12003,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Odstranit prvek"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Odebrat z"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11668,7 +12016,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11680,28 +12028,28 @@ msgstr "Smazat hostitele"
 msgid "Remove link"
 msgstr "Odstranit spojnici"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Odstranit vybrané"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Nahradit"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Protokol"
 
@@ -11709,35 +12057,36 @@ msgstr "Protokol"
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Protokoly"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Vyžadováno"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11745,29 +12094,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr "Požadovaný výkon (hodnoty/sekundu)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Požadovaný výkon serveru - nové hodnoty za sekundu"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Reset"
 
@@ -11786,9 +12137,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11801,7 +12152,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Zdroj"
@@ -11816,15 +12167,15 @@ msgstr "Odezva"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Výsledek"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Výsledek je NEPRAVDA"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Výsledek je PRAVDA"
 
@@ -11837,7 +12188,8 @@ msgstr ""
 msgid "Result type"
 msgstr "Typ výsledku"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11845,60 +12197,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Zbývá pokusů"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Znovu zkusit"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Vpravo"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Rozsah řádků"
 
@@ -11906,11 +12267,11 @@ msgstr "Rozsah řádků"
 msgid "Rows"
 msgstr "Řádky"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Počet řádků na stránku"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Pravidla"
 
@@ -11955,20 +12316,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Rusky (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11984,7 +12345,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr "HLEDAT"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr ""
 
@@ -11999,13 +12360,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "PREZENTACE"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -12014,17 +12375,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP e-mail"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP server"
@@ -12040,7 +12401,7 @@ msgstr ""
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12052,9 +12413,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -12063,7 +12424,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12087,7 +12448,7 @@ msgstr "SNMPv3 agent"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12105,7 +12466,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12114,15 +12475,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH agent"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "STAV PRŮZKUMU"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STAV SPOUŠTĚČŮ"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "STAV SLEDOVÁNÍ WEBŮ"
 
@@ -12130,92 +12511,92 @@ msgstr "STAV SLEDOVÁNÍ WEBŮ"
 msgid "STATUS OF ZABBIX"
 msgstr "STAV ZABBIXU"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "So"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sobota"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Uložit"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Měřítko"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Scénář"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Scénář byl přidán"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Scénář byl aktualizován"
 
@@ -12227,7 +12608,7 @@ msgstr "Scénáře"
 msgid "Schedule"
 msgstr "Termín"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12238,126 +12619,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Obrazovka byla přidána"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Nastavení buňky obrazovky"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Obrazovka byla smazána"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Obrazovka byla aktualizována"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Obrazovky"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Skript"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Skript byl přidán"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Skript byl smazán"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Název skriptu"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12366,17 +12746,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Skript byl aktualizován"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Skripty"
 
@@ -12397,7 +12777,7 @@ msgstr "Vyhledávací vzor je prázdný"
 msgid "Search/Filter elements limit"
 msgstr "Omezení počtu položek pro vyhledávání/filtr"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Druhý"
 
@@ -12429,7 +12809,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "sekund"
 
@@ -12448,69 +12828,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Vybrat"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Vybrat řádky s hodnotou jako"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Vybrané"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Vybrané skupiny"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Vybraní hostitelé"
 
@@ -12526,7 +12913,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Poslat pouze na"
 
@@ -12534,11 +12921,11 @@ msgstr "Poslat pouze na"
 msgid "Send to"
 msgstr "Poslat na"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12547,17 +12934,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Zář"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Odděleně"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Září"
 
@@ -12569,7 +12956,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Server"
@@ -12578,44 +12965,44 @@ msgstr "Server"
 msgid "Server info"
 msgstr "Server info"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Čas na serveru"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Služba"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Služba nemůže být nadřazená i podřazená zároveň."
 
@@ -12631,11 +13018,11 @@ msgstr "Služba byla smazána"
 msgid "Service port"
 msgstr "Port služby"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Servisní časy"
 
@@ -12647,49 +13034,54 @@ msgstr "Typ služby"
 msgid "Service updated"
 msgstr "Služba byla aktualizována"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Služby"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Závažnost"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Zobrazit"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Zobrazit vše"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Zobrazit detaily"
 
@@ -12719,35 +13111,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Zobrazit hostitele v servisním okně"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Zobrazit legendu"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Zobrazit řádků"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Zobrazit vybrané"
 
@@ -12755,19 +13148,23 @@ msgstr "Zobrazit vybrané"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Zobrazit text jako HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Zobrazit spouštěče"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Zobrazit nepotvrzené"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Ukázat hodnotu"
@@ -12776,11 +13173,11 @@ msgstr "Ukázat hodnotu"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Zobrazit praconí dobu"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "zobrazena"
 
@@ -12800,6 +13197,10 @@ msgstr "Jednoduchá kontrola"
 msgid "Simple graph"
 msgstr "Jednoduchý graf"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12837,7 +13238,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12855,16 +13256,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Prezentace"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12873,11 +13274,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12885,10 +13286,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Prezentace"
 
@@ -12896,15 +13297,15 @@ msgstr "Prezentace"
 msgid "Slides"
 msgstr "Slajdy"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Soft"
 
@@ -12937,28 +13338,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Řadit podle"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Řazení (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12971,11 +13372,11 @@ msgstr ""
 msgid "Source"
 msgstr "Zdroj"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Španělsky (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12983,63 +13384,63 @@ msgstr ""
 msgid "Speed"
 msgstr "Rychlost"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Skládaný"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Stav"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Stav"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -13052,7 +13453,7 @@ msgstr "Výpočet stavu"
 msgid "Status calculation algorithm"
 msgstr "Algoritmus výpočtu stavu"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Návratové hodnoty"
 
@@ -13061,7 +13462,7 @@ msgid "Status of Web monitoring"
 msgstr "Stav sledování webů"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Stav ZABBIXe"
 
@@ -13078,40 +13479,40 @@ msgid "Status only"
 msgstr "Pouze stav"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Krok"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Krok scénáře"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Kroky"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Uložit hodnotu"
@@ -13120,11 +13521,11 @@ msgstr "Uložit hodnotu"
 msgid "Straight"
 msgstr "Přímý"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Styl"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13132,11 +13533,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Předmět"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13145,32 +13546,32 @@ msgid "Success Audit"
 msgstr "Úspěšný audit"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "ne"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "neděle"
 
@@ -13178,27 +13579,27 @@ msgstr "neděle"
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Příjmení"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Švédsky (sv_SE)"
 
@@ -13206,16 +13607,16 @@ msgstr "Švédsky (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Výchozí nastavení"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13224,21 +13625,21 @@ msgid "System status"
 msgstr "Stav systému"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13257,11 +13658,11 @@ msgid "TOTAL"
 msgstr "CELKEM"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "KOMENTÁŘE KE SPOUŠTĚČI"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "PRAVDA"
 
@@ -13279,14 +13680,14 @@ msgstr ""
 msgid "Tag"
 msgstr "Označení"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Cíl"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13295,130 +13696,133 @@ msgid "Target type"
 msgstr "Typ cíle"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Šablona"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Šablona byla smazána"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Propojení šablon"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Šablona byla aktualizována"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Položky ze šablony"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Šablony"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Test"
 
@@ -13426,11 +13830,11 @@ msgstr "Test"
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Testovací data"
 
@@ -13444,22 +13848,22 @@ msgid "Test string"
 msgstr "Testovací řetězec"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Text"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13467,7 +13871,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13482,12 +13886,12 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -13495,7 +13899,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -13503,7 +13907,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13512,19 +13916,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Téma"
 
@@ -13536,11 +13940,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "třetí"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13549,11 +13953,11 @@ msgstr ""
 msgid "This month"
 msgstr "Tento měsíc"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13565,27 +13969,27 @@ msgstr "Tento týden"
 msgid "This year"
 msgstr "Tento rok"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "čt"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "čtvrtek"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Do"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13594,28 +13998,28 @@ msgstr "Do"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Čas"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13623,54 +14027,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Časové období"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Druh času"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Časový limit"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Časové razítko"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Titulek"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13678,17 +14082,18 @@ msgstr ""
 msgid "Today"
 msgstr "Dnes"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "nahoře"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Celkem"
 
@@ -13706,7 +14111,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13723,77 +14128,77 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trendy"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Spouštěč"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Spouštěč byl přidán"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Komentáře ke spouštěči"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Spouštěč byl smazán"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
@@ -13801,14 +14206,14 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13824,11 +14229,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13836,7 +14242,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13849,12 +14255,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13866,54 +14272,54 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13921,23 +14327,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Závažnost spouštěče"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Spouštěč byl aktualizován"
 
@@ -13945,40 +14359,41 @@ msgstr "Spouštěč byl aktualizován"
 msgid "Trigger value"
 msgstr "Hodnota spouštěče"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Spouštěče"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Spouštěče byly smazány"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Informace o spouštěčích"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Hromadná aktualizace spouštěčů"
 
@@ -13986,78 +14401,78 @@ msgstr "Hromadná aktualizace spouštěčů"
 msgid "Triggers overview"
 msgstr "Přehled spouštěčů"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Stav spouštěče"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Spouštěče se závažností"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "zkráceno"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "út"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "úterý"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Musí být vybrané dva prvky"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Typ"
 
@@ -14065,62 +14480,64 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Typ (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Způsob vyhodnocení"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Typ informace"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Typy"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "NEZNÁMÝ"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (po přihlášení)"
 
@@ -14136,20 +14553,30 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr ""
 
@@ -14157,15 +14584,11 @@ msgstr ""
 msgid "USER PROFILE"
 msgstr "PROFIL UŽIVATELE"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukrajinsky (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14173,7 +14596,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Nepotvrzené"
 
@@ -14186,20 +14609,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "pouze nepotvrzené"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Odblokovat vybrané"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Odblokovat vybrané uživatele?"
 
@@ -14208,29 +14631,29 @@ msgstr "Odblokovat vybrané uživatele?"
 msgid "Units"
 msgstr "Jednotky"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14240,23 +14663,20 @@ msgstr "Neznámý"
 msgid "Unknown action"
 msgstr "Neznámá akce"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Neznámý algoritmus výpočtu stavu služby"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Zadaná položka ve vybraném hostiteli neexistuje"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Zadaný hostitel v systému neexistuje"
 
@@ -14268,23 +14688,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr "Neznámý zdroj"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Neznámý typ hodnoty"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Odpojit"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Odpojit a pročistit"
 
@@ -14292,61 +14712,61 @@ msgstr "Odpojit a pročistit"
 msgid "Unlink from template"
 msgstr "Odpojit od šablony"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14360,32 +14780,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14396,34 +14827,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Interval aktualizací"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Interval aktualizace (s)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Aktualizováno"
 
@@ -14431,55 +14862,55 @@ msgstr "Aktualizováno"
 msgid "Updated status of host"
 msgstr "Aktualizován stav hostitele"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Nahrát"
 
@@ -14487,14 +14918,14 @@ msgstr "Nahrát"
 msgid "Upper level maps"
 msgstr "Mapa nejvyšší úrovně"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Doba provozu"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14502,9 +14933,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Doba dostupnosti/nedostupnosti"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14520,85 +14951,89 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Uživatel"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Uživatel byl přidán"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Uživatel nemůže měnit svůj stav"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Uživatel byl smazán"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Skupina uživatelů"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14616,34 +15051,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Skupiny uživatelů"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Uživatelské jméno"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14669,243 +15104,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Typ uživatele"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Uživatel byl aktualizován"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr ""
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Uživatelé"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Uživatelé (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Uživatelé odblokováni"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Hodnota"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14940,11 +15375,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14990,10 +15425,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Mapování hodnot"
 
@@ -15002,7 +15437,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -15014,8 +15449,8 @@ msgstr ""
 msgid "Values"
 msgstr "Hodnoty"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Proměnné"
 
@@ -15028,64 +15463,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Svislý"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Svislé zarovnání"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr ""
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Upozornění"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Je nám líto, maximální počet elementů na zapamatování byl již dosažen."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15093,67 +15533,85 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Sledování webů"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "St"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Středa"
 
@@ -15161,9 +15619,9 @@ msgstr "Středa"
 msgid "Week"
 msgstr "Týden"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Týdně"
 
@@ -15171,12 +15629,12 @@ msgstr "Týdně"
 msgid "When active"
 msgstr "Kdy je aktivní"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Šířka"
@@ -15186,28 +15644,28 @@ msgstr "Šířka"
 msgid "With data collection"
 msgstr "Se sběrem dat"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "S poslední událostí nepotvrzenou"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "S problémy"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Se spouštěči"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "S nepotvrzenými událostmi"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Bez problémů"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Bez spouštěčů"
 
@@ -15216,7 +15674,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15229,277 +15687,271 @@ msgstr "Pracovní doba"
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Zápis"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML soubor obsahuje chyby"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Maximální hodnota na ose Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Minimální hodnota na ose Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Strana osy Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "j. M Y G:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "j. n. Y"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "j. n. Y G:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Rok"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Ročně"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Ano"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Nejste přihlášen(a)."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr ""
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr ""
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr ""
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Pro zobrazení této stránky musíte být přihlášen(a)."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15512,7 +15964,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15531,8 +15983,8 @@ msgid "Zabbix User"
 msgstr "Zabbix uživatel"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15558,10 +16010,11 @@ msgstr "Zabbix vnitřní proměnné"
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr ""
@@ -15574,7 +16027,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15582,15 +16035,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "ZABBIX server běží"
 
@@ -15599,11 +16052,11 @@ msgstr "ZABBIX server běží"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr ""
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr ""
 
@@ -15611,25 +16064,20 @@ msgstr ""
 msgid "Zabbix trapper"
 msgstr "Zabbix zachytávač"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zvětšení"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[G:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15638,19 +16086,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "vše"
 
@@ -15658,19 +16106,15 @@ msgstr "vše"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "již existuje"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "modře"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "zeleně"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "červeně"
 
@@ -15682,83 +16126,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "průměr"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "j. M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "j. M Y G:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "j. M Y G:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "j. M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "j.n."
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "j.n. G:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "dní"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15780,19 +16190,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dynamický"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "prvků kopírovat do ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15804,47 +16210,49 @@ msgstr ""
 msgid "executed"
 msgstr "vykonáno"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "pevný"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "nalezených"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr ""
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr ""
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr ""
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr ""
 
@@ -15852,7 +16260,7 @@ msgstr ""
 msgid "in"
 msgstr "mezi"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15862,7 +16270,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15870,20 +16278,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "poslední"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "jako"
@@ -15892,12 +16300,12 @@ msgstr "jako"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15906,46 +16314,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr ""
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "údržba"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15954,17 +16362,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "žádná data"
@@ -15977,12 +16385,14 @@ msgstr "mimo"
 msgid "not like"
 msgstr "ne jako"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "neběží"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "nevybráno"
 
@@ -15991,57 +16401,61 @@ msgstr "nevybráno"
 msgid "not sent"
 msgstr "neposláno"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "nyní"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "z"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "v"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "jiný"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "aktualizováno každých"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16050,25 +16464,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "pamatovat vybranou"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "kořen"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "běží"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sek"
 
@@ -16081,7 +16494,7 @@ msgstr "sekund"
 msgid "sent"
 msgstr "posláno"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr ""
 
@@ -16089,36 +16502,36 @@ msgstr ""
 msgid "show icon mappings"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "zobrazit mapování hodnot"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "do"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr ""
 
@@ -16130,11 +16543,11 @@ msgstr ""
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr ""
diff --git a/frontends/php/locale/de/LC_MESSAGES/frontend.po b/frontends/php/locale/de/LC_MESSAGES/frontend.po
index 062db11cc89..6f3cf5fbb95 100644
--- a/frontends/php/locale/de/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/de/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-11-04 19:10+0300\n"
 "Last-Translator: maxhq <jens@jebecs.de>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -15,22 +15,24 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1383585000.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" muss zwischen 01.01.1970 und 18.01.2038 liegen."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"OK-Auslöser anzeigen\" muss \"0\" oder eine positive Ganzzahl sein."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Auslöser blinken bei Statusänderung\" muss \"0\" oder eine Ganzzahl sein."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -38,7 +40,7 @@ msgstr[0] "%1$d Tag"
 msgstr[1] "%1$d Tage"
 
 # Der Singular gehört überprüft, wenn das 1 von x heißt.
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -50,24 +52,22 @@ msgstr[1] "%1$d von %2$d Ereignissen werden angezeigt"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (Jahr %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Datenpunkt"
 msgstr[1] "%1$s Datenpunkte"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s Tag"
 msgstr[1] "%1$s Tage"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -82,7 +82,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -103,23 +103,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d Gerät"
 msgstr[1] "%d Geräte"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - unendlich)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Nur Super-Admins können Gruppen erstellen)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(in Tagen)"
 
@@ -127,34 +127,34 @@ msgstr "(in Tagen)"
 msgid "(in sec)"
 msgstr "(in Sek.)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(Minimum 60 Sekunden, 0: Standard-Aktion benutzen)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(kein Proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[MASSENBESTÄTIGUNG]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 oder 1"
 
@@ -170,7 +170,7 @@ msgstr "10 Sekunden"
 msgid "30 seconds"
 msgstr "30 Sekunden"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D-Ansicht"
 
@@ -186,7 +186,7 @@ msgstr "5 Sekunden"
 msgid "500 latest values"
 msgstr "500 letzte Werte"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Untermenü/Untermenü/...>Skript"
 
@@ -205,12 +205,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ALARMBESTÄTIGUNGEN"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "UND"
 
@@ -222,19 +221,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "VERFÜGBARKEITSBERICHT"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Der Unterschied zwischen dem letzten und vorletzten Wert ist < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Der Unterschied zwischen dem letzten und vorletzten Wert ist = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Der Unterschied zwischen dem letzten und vorletzten Wert ist > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Der Unterschied zwischen dem letzten und vorletzten Wert ist NICHT N"
 
@@ -246,42 +245,42 @@ msgstr "Akzeptable SLA"
 msgid "Access denied!"
 msgstr "Zugriff verweigert!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Zugriff verweigert."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Konto ist für %s Sekunden blockiert"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Bestätigt"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Bestätigen"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Bestätigung hinzugefügt"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Alarm wurde bestätigt von"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Bestätigen und zurück"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Bestätigungsstatus"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Bestätigt"
 
@@ -306,63 +305,66 @@ msgstr "Bestätigungen deaktiviert"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Aktion"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Aktion \"%1$s\" existiert bereits."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Aktion \"%1$s\" hat falschen Wert in \"esc_period\" (mindestens %2$s Sekunden)."
 
 # Mit oder ohne "hat"?
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Aktion \"%1$s\" hat keine Operationen definiert."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Aktion hinzugefügt"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Aktion gelöscht"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -375,21 +377,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Aktionsoperationen"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Aktion geändert"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Aktionen"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktiv"
@@ -399,80 +401,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Aktiv"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktiv seit"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktiv bis"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Kommentar hinzufügen von"
 
@@ -488,27 +493,23 @@ msgstr "Host hinzufügen"
 msgid "Add link"
 msgstr "Verbindung hinzufügen"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Fehlendes hinzufügen"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Neue oder existierende Kategorie hinzufügen"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Neue oder existierende Hostgruppe hinzufügen"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Prototyp hinzufügen"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Hinzufügen zu"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Zu Favoriten hinzufügen"
@@ -517,7 +518,7 @@ msgstr "Zu Favoriten hinzufügen"
 msgid "Add to host group"
 msgstr "Zu Host-Gruppe hinzufügen"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Zu Hostgruppen hinzufügen"
 
@@ -529,7 +530,7 @@ msgstr "Hinzugefügt"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administration"
 
@@ -537,34 +538,34 @@ msgstr "Administration"
 msgid "Advanced labels"
 msgstr "Erweiterte Beschriftungen"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Alter"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Jünger als"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Jünger als %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agent"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Agent-Schnittstellen"
@@ -573,12 +574,12 @@ msgstr "Agent-Schnittstellen"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agent-, SNMP-, JMX- oder IPMI-Schnittstelle"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -586,87 +587,90 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Symbole ausrichten"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Alle"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Alle Gruppen"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Alle Verknüpfungen sollten Angaben für \"Name\" und \"URL\" haben"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Zugelassene Hosts"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Jeden"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Beliebige Zeichenfolge enthalten"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Kategorie"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Kategorie \"%1$s\" existiert bereits."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Kategorie hinzugefügt"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
@@ -674,36 +678,36 @@ msgstr[0] "Kategorie gelöscht"
 msgstr[1] "Kategorie gelöscht"
 
 # Achtung: Hier ist NICHT die Zabbix "item application" gemeint.
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Programmfehler."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Kategorie geändert"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Kategorie mit ID \"%1$s\" ist nicht verfügbar auf \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Kategorien"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Verwenden"
 
@@ -712,16 +716,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Kommend"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Apr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "April"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Wollen Sie diese Aktion wirklich durchführen?"
 
@@ -738,9 +742,9 @@ msgstr "Bereichsgröße"
 msgid "Area type"
 msgstr "Bereichstyp"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -754,52 +758,49 @@ msgstr "als Klartext"
 msgid "Asset tag"
 msgstr "Inventarnummer"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "Um %1$s:%2$s Uhr am %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "Um %1$s:%2$s Uhr am %3$s %4$s im %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "Um %1$s:%2$s Uhr am %3$s. Tag im %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] "Um %1$s:%2$s Uhr am %3$s jeder Woche"
 msgstr[1] "Um %1$s:%2$s Uhr am %3$s jeder %4$s. Woche"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] "Um %1$s:%2$s Uhr jeden Tages"
 msgstr[1] "Um %1$s:%2$s Uhr aller %3$s Tage"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "Um (Stunde:Minute)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Zumindest einen Host oder eine Gruppe auswählen."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Zumindest ein Wartungsfenster muss erstellt werden."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Protokolle"
@@ -819,26 +820,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Aug"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "August"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Authentifizierungs-Algorithmus"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -897,9 +900,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -907,20 +910,20 @@ msgstr "Automatisch"
 msgid "Automatic icon mapping"
 msgstr "Automatische Symbolzuordnung"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Automatische Symbolauswahl"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Verfügbarkeit"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Verfügbarkeitsanalyse"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Verfügbar"
 
@@ -929,38 +932,38 @@ msgstr "Verfügbar"
 msgid "Average"
 msgstr "Durchschnitt"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Durchschnitt über"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Durchschnittswert im Zeitraum T ist < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Durchschnittswert im Zeitraum T ist = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Durchnittswert im Zeitraum T ist > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Durchnittswert im Zeitraum T ist NICHT N"
 
 # nach meinem Verständnis bezieht sich das darauf, ob die Achse entweder links oder rechts bzw. oben oder unten positioniert wird. 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Achsenposition"
 
 # Byte
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Hintergrund"
@@ -970,7 +973,7 @@ msgid "Background image"
 msgstr "Hintergrundbild"
 
 # Diagramm oder Report?
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Säulendiagramm"
 
@@ -980,8 +983,8 @@ msgid "Base DN"
 msgstr "Base-DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Basis-Authentifizierung"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -993,15 +996,15 @@ msgstr "Bind-DN"
 msgid "Bind password"
 msgstr "Bind-Passwort"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Bitweises UND des letzen (jüngsten) T-Werts mit der Maske N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Bitweises UND des letzen (jüngsten) T-Werts mit der Maske NICHT N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Schwarz & Blau"
 
@@ -1014,8 +1017,8 @@ msgid "Blocked"
 msgstr "Gesperrt"
 
 # Vielleicht reichts sogar "fett"
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Linie (fett)"
 
@@ -1023,22 +1026,22 @@ msgstr "Linie (fett)"
 msgid "Boolean"
 msgstr "Wahrheitswert"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Unten"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Aufhellen"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgarisch (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Massenbestätigung"
 
@@ -1065,7 +1068,7 @@ msgstr "KONFIGURATION KATEGORIEN"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "KONFIGURATION AUTHENTIFIZIERUNG"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1096,7 +1099,7 @@ msgstr "KONFIGURATION HOSTGRUPPEN"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "KONFIGURATION HOST-PROTOTYPEN"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "KONFIGURATION HOSTS"
 
@@ -1108,7 +1111,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "KONFIGURATION SYMBOLZUORDNUNG"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "KONFIGURATION BILDER"
 
@@ -1117,14 +1120,14 @@ msgstr "KONFIGURATION BILDER"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "KONFIGURATION IT-DIENSTE"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "KONFIGURATION DATENPUNKT-VORLAGEN"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "KONFIGURATION DATENPUNKTE"
 
@@ -1153,7 +1156,7 @@ msgstr "KONFIGURATION KARTEN"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "KONFIGURATION PROXYS"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "KONFIGURATION REGULÄRER AUSDRÜCKE"
 
@@ -1173,7 +1176,7 @@ msgstr "KONFIGURATION SKRIPTS"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "KONFIGURATION VORFÜHRUNG"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "KONFIGURATION VORLAGEN"
 
@@ -1189,7 +1192,7 @@ msgstr "KONFIGURATION AUSLÖSER-SCHWEREGRADE"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "KONFIGURATION AUSLÖSER"
 
@@ -1221,22 +1224,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "ZABBIX-KONFIGURATION"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1246,21 +1249,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "SLA berechnen, annehmbare SLA (in %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Berechnet"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Errechnete Berechtigungen"
 
@@ -1268,92 +1271,95 @@ msgstr "Errechnete Berechtigungen"
 msgid "Callback"
 msgstr "Rückruf"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Kanada (136 Zeichen)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Kann Ereignis nicht bestätigen"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Nicht-numerischer Datenpunkt \"%1$s\" kann dem Graphen \"%2$s\" nicht hinzgefügt werden."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Kann Aktion nicht hinzufügen"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Kann Kategorie nicht hinzufügen"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Abhängigkeit von einem Host zu einer Vorlage nicht möglich."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Kann keine Abhängigkeit von Auslöser \"%1$s:%2$s\" zu nichtexistentem Auslöser \"%3$s:%4$s\" hinzufügen."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Kann Suchlauf nicht hinzufügen"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Kann Diagramm nicht hinzufügen"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Kann Gruppe nicht hinzufügen"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Kann Host nicht hinzufügen"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1361,24 +1367,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Kann Bild nicht hinzufügen"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Kann Bild nicht hinzufügen."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Kann Datenpunkt nicht hinzufügen"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Kann Datenpunkt \"%1$s\" von \"%2$s\" nicht hinzufügen zur Kategorie \"%3$s\" von \"%4$s\""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Kann Datenpunkte nicht hinzufügen."
 
@@ -1386,20 +1392,20 @@ msgstr "Kann Datenpunkte nicht hinzufügen."
 msgid "Cannot add macro."
 msgstr "Kann Makro nicht hinzufügen."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Kann Wartung nicht hinzufügen"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Kann Medientyp nicht hinzufügen"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Diagramm \"%1$s\" darf nicht mehr als einen Datenpunkt vom Typ \"Diagramm-Summe\" haben."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "Diagrammprototyp \"%1$s\" darf nicht mehr als einen Datenpunkt vom Typ \"Diagramm-Summe\" haben."
@@ -1408,24 +1414,24 @@ msgstr "Diagrammprototyp \"%1$s\" darf nicht mehr als einen Datenpunkt vom Typ \
 msgid "Cannot add network map"
 msgstr "Kann Netzwerkkarte nicht hinzufügen"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Kann die neue Kategorie \"%1$s\" nicht hinzufügen."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Kann Proxy nicht hinzufügen"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Kann regulären Ausdruck nicht hinzufügen"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Kann Tafel nicht hinzufügen"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Kann Skript nicht hinzufügen"
 
@@ -1437,27 +1443,27 @@ msgstr "Kann Dienst nicht hinzufügen"
 msgid "Cannot add slide show"
 msgstr "Kann Vorführung nicht hinzufügen"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Kann Vorlage nicht hinzufügen"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Kann Auslöser nicht hinzufügen"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Kann Benutzer nicht hinzufügen"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Kann Benutzer nicht hinzufügen. Passwörter müssen übereinstimmen."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Kann Benutzer nicht hinzufügen."
 
@@ -1465,7 +1471,7 @@ msgstr "Kann Benutzer nicht hinzufügen."
 msgid "Cannot add value map"
 msgstr "Kann Wertezuordnung nicht hinzufügen"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Kann Web-Szenario nicht hinzufügen"
 
@@ -1486,23 +1492,23 @@ msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Kann Authentifizierungsmethode nicht auf Zabbix-intern ändern"
 
 # Das heißt sonst nirgends "Verlauf", oder?
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Kann Verlauf nicht leeren"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Kann Diagramm-Vorlagen nicht klonen."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Kann Datenpunktvorlagen nicht klonen."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Kann Auslöser-Vorlagen nicht klonen."
 
@@ -1511,20 +1517,20 @@ msgid "Cannot connect to the trapper port of zabbix server daemon, but it should
 msgstr "Kann keine Verbindung zum Trapper-Port des Zabbix-Serverdaemon aufbauen, er muss aber zur Ausführung des Skripts verfügbar sein."
 
 # Graph/Graphen
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Kann Digramme nicht kopieren"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Kann Datenpunkte nicht kopieren"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Kann den Trigger \"%1$s:%2$s\" nicht kopieren, weil er mehrere Hosts im Ausdruck hat."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1533,19 +1539,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "Kann keine weitere Datenbankverbindung aufbauen."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Kann keine zirkuläre Abhängigkeit erstellen."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Trigger kann nicht von sich selbst abhängig sein."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Kann Suchlauf nicht erstellen"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Kann Host-Gruppe nicht erstellen."
 
@@ -1553,102 +1559,102 @@ msgstr "Kann Host-Gruppe nicht erstellen."
 msgid "Cannot create icon map"
 msgstr "Kann Symbolzuordnung nicht erstellen"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Kann keine Symbolzuordnung mit identischem Namen \"%s\" erstellen."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Kann Karte \"%s\" nicht erstellen."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Kann keine neue Kategorie anlegen. Web-Szenario ist schon einer Kategorie zugewiesen."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Kann neuen Datenpunkt nicht erstellen"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Kann Ansichtstafel nicht erstellen."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Kann Zabbix-internen Benutzer \"%1$s\" nicht löschen. Alternativ könnte er deaktiviert werden."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Kann Aktion nicht löschen"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Kann Kategorie nicht löschen"
 msgstr[1] "Kann Kategorie nicht löschen"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Kann Abhängigkeit nicht löschen"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Kann Suchlauf nicht löschen"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Kann Suchläufe nicht löschen"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Kann Diagramm nicht löschen"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Kann Schaubild nicht löschen"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Kann Diagramm nicht löschen."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Kann Diagramme nicht löschen"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Kann keine Diagramme löschen, die vom Objektsuchlauf erstellt wurden."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Kann Gruppe nicht löschen"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Kann Gruppe nicht löschen"
+msgstr[1] "Kann Gruppe nicht löschen"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Kann Host nicht löschen"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Kann Host-Gruppe nicht löschen."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Kann Systemprototyp nicht löschen."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1656,79 +1662,79 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "Kann Symbolzuordnung nicht löschen"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Kann Bild nicht löschen"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Kann Inventar nicht löschen."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Kann Datenpunkt nicht löschen"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Kann Datenpunkte nicht löschen"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Kann keine Datenpunkte löschen, die vom Objektsuchlauf erstellt wurden."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Kann Wartung nicht löschen"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Kann Medien-Typ nicht löschen"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Kann Karte nicht löschen"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Kann Proxy nicht löschen"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Kann Regular Expression nicht löschen"
 msgstr[1] "Kann regulären Ausdruck nicht löschen"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Kann Tafel nicht löschen"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Kann Skript nicht löschen"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Kann Skripte nicht löschen. Eingabeparameter \"scriptids\" ist leer."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Kann Skript nicht löschen. Aktionsoperation \"%2$s\" verwendet Skript \"%1$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Kann ausgewählte Aktionen nicht löschen"
 
@@ -1736,77 +1742,80 @@ msgstr "Kann ausgewählte Aktionen nicht löschen"
 msgid "Cannot delete service"
 msgstr "Kann Dienst nicht löschen"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Kann Vorführung nicht löschen"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Kann Vorlage nicht löschen"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Kann vorlagenbasierte Kategorie nicht löschen."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Kann vorlagenbasierte Diagramme nicht löschen."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Kann vorlagenbasierten Datenpunkt nicht löschen."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Kann vorlagenbasierte Datenpunkte nicht löschen"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Kann vorlagenbasierte Datenpunkte nicht löschen."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Kann vorlagenbasierten Auslöser \"%1$s:%2$s\" nicht löschen."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Kann vorlagenbasiertes Web-Szenario \"%1$s\" nicht löschen."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Kann Auslöser nicht löschen"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Kann Auslöserprototyp nicht löschen"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Kann Auslöser nicht löschen."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Kann Auslöser nicht löschen"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Kann keine Auslöser löschen, der vom Objektsuchlauf erstellt wurde."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Kann Benutzer nicht löschen"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Kann Benutzermedium nicht löschen."
 
@@ -1814,78 +1823,78 @@ msgstr "Kann Benutzermedium nicht löschen."
 msgid "Cannot delete value map"
 msgstr "Kann Wertezuordnung nicht löschen"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Kann Web-Szenario nicht löschen"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Kann Medientyp nicht deaktivieren"
 msgstr[1] "Kann Medientyp nicht deaktivieren"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1900,135 +1909,129 @@ msgstr "Kann Datenpunktwarteschlange nicht anzeigen."
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Kann Medientyp nicht aktivieren"
 msgstr[1] "Kann Medientyp nicht aktivieren"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Kann Hintergrundbild \"%1$s\" nicht finden, das in Karte \"%2$s\" verwendet wird."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kann Diagramm \"%1$s\" nicht finden, das in Tafel \"%2$s\" verwendet wird."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Kann Gruppe \"%1$s\" nicht finden, die in Karte \"%2$s\" verwendet wird."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kann Gruppe \"%1$s\" nicht finden, die in Tafel \"%2$s\" verwendet wird."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Kann Host \"%1$s\" nicht finden, der in Karte \"%2$s\" verwendet wird."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kann Host \"%1$s\" nicht finden, der in Tafel \"%2$s\" verwendet wird."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Kann für den Datenpunktschlüssel \"%2$s\" die Hostschnittstelle auf \"%1$s\" nicht finden."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Kann System oder Vorlage \"%1$s\" nicht finden, die in Graph \"%2$s\" benutzt wird."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2039,34 +2042,53 @@ msgstr "Kann Symbol \"%1$s\" nicht finden, das in Karte \"%2$s\" verwendet wird.
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Kann Symbolzuordnung \"%1$s\" nicht finden, die in Karte \"%2$s\" verwendet wird."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kann Datenpunkt \"%1$s\" nicht finden, der in Tafel \"%2$s\" verwendet wird."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Kann Karte \"%1$s\" nicht finden, die in exportierter Karte \"%2$s\" verwendet wird."
@@ -2076,41 +2098,41 @@ msgstr "Kann Karte \"%1$s\" nicht finden, die in exportierter Karte \"%2$s\" ver
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Kann Karte \"%1$s\" nicht finden, die in Karte \"%2$s\" verwendet wird."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kann Karte \"%1$s\" nicht finden, die in Tafel \"%2$s\" verwendet wird."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Kann keine Objekte finden namens"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kann Tafel \"%1$s\" nicht finden, die in Tafel \"%2$s\" verwendet wird."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Kann Auslöser \"%1$s\" nicht finden, der in Karte \"%2$s\" verwendet wird."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2123,12 +2145,14 @@ msgstr "Kann Baum nicht formatieren. Überprüfen Sie die logische Struktur in d
 msgid "Cannot format tree."
 msgstr "Kann Baum nicht formatieren."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Kann Ausdruck \"%s\" nicht auflösen."
@@ -2140,59 +2164,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Kann die Datei \"%s\" nicht einbinden."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Kann Benutzermedium nicht einfügen."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Kann Vorlage nicht verbinden"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Abmelden nicht möglich."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Massenänderung nicht möglich für Hostnamen."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Massenänderung nicht möglich für sichtbare Hostnamen."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Kann doppelte Vorlagen-IDs nicht übergeben für die Verknüpfung: %s."
@@ -2212,7 +2237,7 @@ msgstr "Kann keine Änderung der Tabelle \"%1$s\" ohne Werte durchführen."
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Kann keine Änderung auf Tabelle \"%1$s\" durchführen ohne WHERE-Bedingung."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "Kann Kategorien verschiedener Systeme und Vorlagen nicht verarbeiten."
 
@@ -2221,11 +2246,11 @@ msgstr "Kann Kategorien verschiedener Systeme und Vorlagen nicht verarbeiten."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Kann Antwort nicht lesen. Überprüfen Sie die Verbindungen mit dem Zabbix-Server \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2233,11 +2258,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Kann Makro nicht entfernen."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Gastbenutzer kann nicht umbenannt werden."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Kann Suchlauf nicht ohne Prüfungen speichern."
 
@@ -2246,217 +2271,226 @@ msgstr "Kann Suchlauf nicht ohne Prüfungen speichern."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Kann Befehl nicht abschicken. Überprüfen Sie die Verbindungen mit dem Zabbix-Server \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "Kann \"%1$s\" nicht setzen für Datenpunkt \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Kann \"%1$s\" nicht setzen für Auslöser \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Kann \"templateid\" nicht setzen für Kategorie \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Kann \"templateid\" nicht setzen für Tafel \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Kann \"templateid\" nicht setzen für Auslöser-Prototypen \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Kann Inventarfeld nicht setzen wegen deaktivierter Inventarfunktion."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Kann Host der Schnittstelle nicht ändern."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Kann Benutzer nicht entsperren"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Kann Web-Szenarien nicht trennen und leeren."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Kann Kategorien nicht trennen und leeren."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Kann Suchläufe nicht trennen und leeren"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Kann Diagramm-Prototyp nicht trennen und leeren"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Kann Diagramme nicht trennen und leeren."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Kann Datenpunktprototyp nicht trennen und leeren"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Kann Datenpunkte nicht trennen und leeren"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Kann Auslöser nicht trennen und leeren"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Kann Vorlage nicht trennen"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Kann den Auslöser \"%s\" nicht trennen, da er Datenpunkte einer Vorlage enthält, die noch mit dem Host verknüpft ist."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Kann \"%1$s\" für Datenpunkt \"%2$s\" nicht ändern."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Kann \"%1$s\" für Auslöser \"%2$s\" nicht ändern."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Kann \"templateid\" nicht ändern für Kategorie \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Kann \"templateid\" nicht ändern für Diagramm \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Kann \"templateid\" nicht ändern für Tafel \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Kann \"templateid\" nicht ändern für Auslöser-Protoypen \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Kann Aktion nicht ändern"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Kann Kategorie nicht ändern"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Kann Kommentar nicht ändern"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Kann die Konfiguration nicht ändern"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Kann Debug-Modus nicht ändern"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Kann Suchlauf nicht ändern"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Kann Zugriff auf Oberfläche nicht ändern"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Kann Diagramm nicht ändern"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Kann Gruppe nicht ändern"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Kann Gruppe nicht ändern."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Kann Host nicht ändern"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Kann Hosts nicht ändern"
 
@@ -2468,24 +2502,24 @@ msgstr "Kann Symbolzuordnung nicht ändern"
 msgid "Cannot update image"
 msgstr "Kann Bild nicht ändern"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Kann Bild nicht ändern."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Kann Datenpunkt nicht ändern"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Kann Datenpunkte nicht ändern"
 
@@ -2497,16 +2531,16 @@ msgstr "Kann Makro nicht ändern."
 msgid "Cannot update macros"
 msgstr "Kann Makros nicht ändern"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Kann Wartung nicht ändern"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Kann Karte \"%s\" nicht ändern."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Kann Medientyp nicht ändern"
 
@@ -2514,28 +2548,24 @@ msgstr "Kann Medientyp nicht ändern"
 msgid "Cannot update network map"
 msgstr "Kann Karte nicht ändern"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Kann Proxy nicht ändern"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Kann regulären Ausdruck nicht ändern"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Kann Tafel nicht ändern"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Kann Ansichtstafel nicht ändern."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Kann Skript nicht ändern"
 
@@ -2547,41 +2577,42 @@ msgstr "Kann Dienst nicht ändern"
 msgid "Cannot update slide show"
 msgstr "Kann Vorführung nicht ändern"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Kann Vorlage nicht ändern"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Kann Kategorien aus Vorlagen nicht ändern."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Kann Auslöser nicht ändern"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Kann Benutzer nicht ändern"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Kann Benutzermedium nicht ändern."
 
 # Vereinheitlichen
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Kann Benutzer nicht ändern. Die angegebenen Kennwörter stimmen nicht überein."
 
@@ -2589,15 +2620,15 @@ msgstr "Kann Benutzer nicht ändern. Die angegebenen Kennwörter stimmen nicht �
 msgid "Cannot update value map"
 msgstr "Kann Wertezuordnung nicht ändern"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Kann Web-Szenario nicht ändern"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "Kann Suchlaufprüfung nicht validieren: ungültige Anfrage oder Verbindung zum Zabbix-Server fehlgeschlagen."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Bildunterschrift"
 
@@ -2606,47 +2637,47 @@ msgstr "Bildunterschrift"
 msgid "Case sensitive"
 msgstr "Groß- und Kleinschreibung beachten"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Mitte"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Ändern"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Änderung"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Kennwort ändern"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Zeichen"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Zeichenfolge enthalten"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Zeichenfolge nicht enthalten"
 
@@ -2655,48 +2686,48 @@ msgid "Chassis"
 msgstr "Gehäuse"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Prüfung existiert bereits."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Prüfen Sie den Teil des Ausdrucks der bei \"%1$s\" beginnt."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Bitte überprüfen Sie den Schlüssel. Standard-Beispiel wurde absolviert."
 
@@ -2705,44 +2736,44 @@ msgid "Check type"
 msgstr "Typ prüfen"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Überprüfungen"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Prüfungen sollten einzigartig sein."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chinesisch (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Chinesisch (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Keine zirkuläre Verbindung möglich für Kartenelement \"%s\"."
@@ -2757,35 +2788,36 @@ msgstr "Zirkularbezug in Karte: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Zirkulabezug in Ansichtstafeln: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Zirkularbezug in Vorlagen: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Zirkulare Verknüpfungen zwischen Vorlagen sind unzulässig."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Klassisch"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Leeren"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Verlauf und Trends leeren"
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Verlauf leeren"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Leeren, wenn getrennt wird"
 
@@ -2795,69 +2827,69 @@ msgstr "Uhr"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Klonen"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Schließen"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Ausdrucksgenerator schließen"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Farbe"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "Farb-Angabe \"%1$s\" falsch: Erwarte hexadekadischen Farb-Code (6 Stellen)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Farbe (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Spaltenspannweite"
 
@@ -2872,7 +2904,7 @@ msgstr "Kombiniertes Ergebnis"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Befehl"
 
@@ -2880,41 +2912,31 @@ msgstr "Befehl"
 msgid "Command actions"
 msgstr "Befehlsaktionen"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Befehl kann nicht leer sein."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Befehle"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Kommentar geändert"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Kommentare"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Kommentare zu \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Kommerziell"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Vergleiche Werte für mehrere Zeiträume"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Zusammenstellung von Berechtigungen"
 
@@ -2922,29 +2944,39 @@ msgstr "Zusammenstellung von Berechtigungen"
 msgid "Condition"
 msgstr "Voraussetzung"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Voraussetzungen"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3107,23 +3139,23 @@ msgstr "Konfiguration geändert"
 msgid "Configure (Filter %s)"
 msgstr "Konfigurieren (Filter %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Bestätigungstext"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Verbinden mit"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Verbunden als '%1$s'"
@@ -3182,7 +3214,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3190,32 +3222,39 @@ msgstr ""
 msgid "Contract number"
 msgstr "Vertragsnummer"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Koordinaten"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Kopieren"
 
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
 # Passive Form besser lesbar im Dropdown-Feld
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Kopieren zu ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Gültige Anmeldung \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Konnte Bild nicht speichern!"
 
 # Zähler?
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Gesamt"
 
@@ -3235,6 +3274,10 @@ msgstr "Neue Kategorie"
 msgid "Create application (select host first)"
 msgstr "Neue Kategorie (zuerst System wählen)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3252,7 +3295,7 @@ msgstr "Neues Diagramm (zuerst Host wählen)"
 msgid "Create graph prototype"
 msgstr "Neuer Diagrammprototyp"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Neuer Host"
 
@@ -3265,15 +3308,15 @@ msgstr "Neue Hostgruppe"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Neue Symbolzuordnung"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Neues Bild"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Neuer Datenpunkt"
 
@@ -3297,6 +3340,10 @@ msgstr "Neue Karte"
 msgid "Create media type"
 msgstr "Neuer Medientyp"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Neuer Proxy"
@@ -3321,11 +3368,11 @@ msgstr "Neues Skript"
 msgid "Create slide show"
 msgstr "Neue Vorführung"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Neue Vorlage"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Neuer Auslöser"
 
@@ -3350,42 +3397,42 @@ msgstr "Neue Benutzergruppe"
 msgid "Create value map"
 msgstr "Neue Zuordnung"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Kategorie \"%1$s\" auf \"%2$s\" erstellt."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Neuer Suchlauf \"%1$s\" auf \"%2$s\" erstellt."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Hostprototyp \"%1$s\" auf \"%2$s\" erstellt."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Datenpunkt \"%1$s\" auf \"%2$s\" erstellt."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Datenpunktprototyp \"%1$s\" auf \"%2$s\" erstellt."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Auslöser \"%1$s\" auf \"%2$s\" erstellt."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Auslöser-Prototyp \"%1$s\" auf \"%2$s\" erstellt."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Webszenario \"%1$s\" auf \"%2$s\" erstellt."
@@ -3395,51 +3442,52 @@ msgid "Critical"
 msgstr "Kritisch"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Heutiges Datum < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Heutiges Datum = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Heutiges Datum > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Heutiges Datum NICHT N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Aktueller Host"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Momentane Zeit < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Momentane Zeit = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Momentane Zeit > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Momentane Zeit NICHT N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Aktueller Wert"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3453,7 +3501,7 @@ msgstr "Benutzerdefinierte Diagramme"
 msgid "Custom label"
 msgstr "Einheitlich"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Benutzerdefinierte Bezeichnung der Karte \"%2$s\", Elemente des Typs \"%1$s\" dürfen nicht leer sein."
@@ -3467,7 +3515,7 @@ msgstr "Benutzerdefinierter Multiplikator"
 msgid "Custom screens"
 msgstr "Benutzerdefinierte Tafeln"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Benutzerdefiniertes Skript"
 
@@ -3488,18 +3536,14 @@ msgstr "Benutzerdefinierte Größe"
 msgid "Custom slides"
 msgstr "Benutzerdefinierte Seite"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Tschechisch (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "KONFIGURATION DER ÜBERSICHTSSEITE"
@@ -3515,28 +3559,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "DETAILS DES SZENARIOS"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "DEAKTIVIERT"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "ENTDECKT"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3544,25 +3588,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS-Name"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "RUNTER"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Täglich"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Dunkles Orange"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Abdunkeln"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -3575,20 +3619,21 @@ msgid "Dashboard filter"
 msgstr "Filter der Übersichtsseite"
 
 # Vielleicht reicht "gestrichelt"
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Linie (gestrichelt)"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Wert"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3611,11 +3656,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Datentyp"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Datenbank-Datei"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Datenbank-Host"
 
@@ -3623,35 +3669,39 @@ msgstr "Datenbank-Host"
 msgid "Database monitor"
 msgstr "Database-Monitor"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Datenbank-Port"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Datenbank-Schema"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Datenbank-Server"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Datenbank-Typ"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Datum"
 
@@ -3671,53 +3721,52 @@ msgstr "Ende der HW-Wartung"
 msgid "Date HW purchased"
 msgstr "HW-Anschaffungsdatum"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Tag"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Tag des Monats"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Tag des Monats < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Tag des Monats = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Tag des Monats > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Tag des Monats NICHT N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Wochentag"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Wochentag < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Wochentag = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Wochentag > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Wochentag NICHT N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Tage"
 
@@ -3725,22 +3774,22 @@ msgstr "Tage"
 msgid "Debug"
 msgstr "Debug"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Debug-Modus"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Debug-Modus geändert"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dez"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Dezember"
 
@@ -3750,15 +3799,14 @@ msgstr "Dezimal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Standard"
 
@@ -3771,11 +3819,11 @@ msgid "Default delay (in seconds)"
 msgstr "Standard-Verzögerung (in Sekunden)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Standardnachricht"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Standarddauer eines Operationsschritts"
 
@@ -3798,30 +3846,34 @@ msgstr "Standard-Thema \"%1$s\"."
 msgid "Delay"
 msgstr "Verzögerung"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Verzögerung (in Sek.)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Verspätung"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Löschen"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Löschen und leeren"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Ausgewählte Vorlagen löschen und leeren? (Warnung: leert Daten aller verbundenen Hosts!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Vorlage löschen und leeren? (Achtung: Alle verbundenen Hosts werden geleert!)"
 
@@ -3829,53 +3881,53 @@ msgstr "Vorlage löschen und leeren? (Achtung: Alle verbundenen Hosts werden gel
 msgid "Delete application?"
 msgstr "Kategorie löschen?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Aktuelle Aktion löschen?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Suchlauf löschen?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Ausdruck löschen?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Diagramm löschen?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Verlauf des ausgewählten Web-Szenarios leeren?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Verlauf ausgewählter Datenpunkte leeren?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Symbolzuordnung löschen?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Datenpunkt löschen?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Schlüsselwort löschen?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Verknüpfung zwischen ausgewählten Elementen löschen?"
 
@@ -3883,11 +3935,15 @@ msgstr "Verknüpfung zwischen ausgewählten Elementen löschen?"
 msgid "Delete maintenance period?"
 msgstr "Wartungszeitraum löschen?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Netzwerkübersicht löschen?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Proxy löschen?"
 
@@ -3895,7 +3951,7 @@ msgstr "Proxy löschen?"
 msgid "Delete regular expression?"
 msgstr "Regulären Ausdruck löschen?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Szenario löschen?"
 
@@ -3903,72 +3959,68 @@ msgstr "Szenario löschen?"
 msgid "Delete screen?"
 msgstr "Tafel löschen?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Skript löschen?"
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Löschen"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Ausgewählte Web-Szenarios löschen?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Ausgewählte Aktionen löschen?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Ausgewählte Kategorien löschen?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Ausgewählte Suchläufe löschen?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Ausgewählte Elemente löschen?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Ausgewählte Diagramme löschen?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Ausgewählte Gruppe löschen?"
@@ -3977,27 +4029,27 @@ msgstr "Ausgewählte Gruppe löschen?"
 msgid "Delete selected groups?"
 msgstr "Ausgewählte Gruppen löschen?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Ausgewählte Hostgruppe löschen?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Ausgewählte Hosts löschen?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Ausgewählte Hosts löschen?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Ausgewählte Bilder löschen?"
 
@@ -4005,31 +4057,31 @@ msgstr "Ausgewählte Bilder löschen?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Ausgewählte Datenpunkte löschen?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Ausgewählte Wartungszeiträume löschen?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Ausgewählte Karten löschen?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Ausgewählten Medientyp löschen?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Ausgewählte Medientypen löschen?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Ausgewählte Proxys löschen?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Ausgewählte reguläre Audrücke löschen?"
 
@@ -4037,15 +4089,15 @@ msgstr "Ausgewählte reguläre Audrücke löschen?"
 msgid "Delete selected screens?"
 msgstr "Ausgewählte Tafeln löschen?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Ausgewählte Skripte löschen?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Ausgewählte Vorführungen löschen?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Ausgewählte Vorlagen löschen?"
 
@@ -4057,11 +4109,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Ausgewählte Auslöser löschen?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Ausgewählten Benutzer löschen?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Ausgewählte Benutzer löschen?"
 
@@ -4076,11 +4128,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Ausgewählte Wertezuordnung löschen? Datenpunkt %d verwendet sie!"
 msgstr[1] "Ausgewählte Wertezuordnung löschen? Die Datenpunkte %d verwenden sie!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Ausgewählte und verbundene Datenpunkte gelöscht"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4089,15 +4145,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Vorführung löschen?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Vorlage löschen?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Auslöser löschen?"
 
@@ -4105,62 +4161,62 @@ msgstr "Auslöser löschen?"
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Gelöscht: Kategorie \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Gelöscht: Suchlauf \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Gelöscht: Diagramm \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Gelöscht: Host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Gelöscht: Datenpunkt \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Gelöscht: Datenpunktprototyp \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Gelöscht: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Gelöscht: Vorlage \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Gelöscht: Auslöser \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Gelöscht: Auslöser-Prototyp \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Gelöscht: Web-Szenario \"%1$s\" auf \"%2$s\"."
@@ -4169,35 +4225,35 @@ msgstr "Gelöscht: Web-Szenario \"%1$s\" auf \"%2$s\"."
 msgid "Delimiter"
 msgstr "Trennzeichen"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (nur Änderung)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (pro Sekunde)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Verweigern"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "ABHÄNGIGKEIT"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "hängt ab von"
 
@@ -4205,30 +4261,41 @@ msgstr "hängt ab von"
 msgid "Deployment status"
 msgstr "Verteilungsstatus"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Beschreibung"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Details"
 
@@ -4241,71 +4308,71 @@ msgid "Device"
 msgstr "Gerät"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Eindeutigkeitsmerkmal des Hosts"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Unterschied zwischen MAX- und MIN-Wert im Zeitraum T < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Unterschied zwischen MAX- und MIN-Wert im Zeitraum T = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Unterschied zwischen MAX- und MIN-Wert im Zeitraum T > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Unterschied zwischen MAX- und MIN-Wert im Zeitraum T NICHT N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Differenz zwischen letzten und vorherigen Werten, dann N = 1, sonst 0"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Differenz zwischen letzten und vorherigen Werten, dann N NICHT 1, sonst 0"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Unterschied zwischen letztem und vorletztem Wert ist kleiner als N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Unterschied zwischen letztem und vorletztem Wert ist N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Unterschied zwischen letztem und vorletztem Wert ist größer N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Unterschied zwischen letztem und vorletztem Wert ist nicht N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4329,49 +4396,45 @@ msgstr "Debug-Modus für ausgewählte Gruppen deaktivieren?"
 msgid "Disable host"
 msgstr "Deaktiviere Host"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Host deaktivieren?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Hosts in der ausgewählten Gruppe löschen?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Hosts deaktivieren, die durch ausgewählte Proxys überwacht werden?"
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Deaktivieren"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Ausgewählte Web-Szenarios deaktivieren?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Ausgewählte Aktionen deaktivieren?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Ausgewählte Kategorien deaktivieren?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Ausgewählte Suchläufe deaktivieren?"
 
@@ -4379,11 +4442,11 @@ msgstr "Ausgewählte Suchläufe deaktivieren?"
 msgid "Disable selected groups?"
 msgstr "Ausgewählte Gruppen deaktivieren?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Ausgewählte Hosts deaktivieren?"
 
@@ -4391,42 +4454,47 @@ msgstr "Ausgewählte Hosts deaktivieren?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Ausgewählte Datenpunkte deaktivieren?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Ausgewählte Medientypen deaktivieren?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Ausgewählte Auslöser deaktivieren?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Deaktiviert"
 
@@ -4439,7 +4507,7 @@ msgstr "Desaster"
 msgid "Discovered"
 msgstr "Gefunden"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Gefunden von"
 
@@ -4448,17 +4516,17 @@ msgid "Discovered device"
 msgstr "Gefundenes Gerät"
 
 # Gleichzeitig Menüeintrag für "network discovery" und "low level discovery" --> aargh
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Suchläufe"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Suchlauf durch Proxy"
 
@@ -4466,17 +4534,17 @@ msgstr "Suchlauf durch Proxy"
 msgid "Discovery check"
 msgstr "Suchlaufprüfung"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "Fehler bei Suchlaufprüfung"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Suchlaufprüfungen"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Suchlaufliste"
 
@@ -4486,67 +4554,70 @@ msgstr "Suchlaufobjekt"
 
 # Überschrift der Suchlauf-Liste bei "network discovery"
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Host-Suchläufe"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Suchlauf \"%1$s\" existiert bereits auf \"%2$s\", vererbt durch eine andere Vorlage."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "Suchlauf \"%1$s:%2$s\" hat eine falsche Lebensdauer: \"%3$s\". (min. %4$d, max. %5$d, benutzerdefiniertes Makro erlaubt)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Suchlauf \"%s\" existiert bereits."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "Suchlauf \"%1$s:%2$s\" hat eine falsche Lebensdauer: \"%3$s\". (min. %4$d, max. %5$d, benutzerdefiniertes Makro erlaubt)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Suchlauf erstellt"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Suchlauf gelöscht"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Suchlauf geändert"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Objektsuchläufe"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Suchläufe gelöscht"
 
@@ -4558,7 +4629,7 @@ msgstr "Suchlaufstatus"
 msgid "Display OK triggers for"
 msgstr "OK-Auslöser zeigen"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Zeige"
 
@@ -4567,32 +4638,32 @@ msgstr "Zeige"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Zeige %1$s von %2$s gefundenen"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Verteilung der Werte für mehrere Datenpunkte"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Verteilung der Werte für mehrere Zeiträume"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Nicht berechnen"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Wollen Sie den bedingten Ausdruck ersetzen?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Erledigt"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Punkte"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Nicht erreichbar"
@@ -4602,30 +4673,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nicht erreichbar"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Downtime"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Hier ziehen um den Schnittstellentyp zu \"IPMI\"-Typ zu ändern."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Hier ziehen um den Schnittstellentyp zu \"JMX\" zu ändern."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Hier ziehen um den Schnittstellentyp zu \"SNMP\"-Typ zu ändern."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Hier ziehen um den Schnittstellentyp zu \"Agent\" zu ändern."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Anzeigestil"
 
@@ -4643,75 +4714,76 @@ msgstr "Erster Eintrag im Dropdown \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Dropdown merkt sich Auswahl \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Abhängigkeits-Duplikat bei Auslöser \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Doppelter Host. Es existiert bereits ein Host mit gleichem Namen \"%s\"."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Doppelter Host. Es existiert bereits ein Host mit gleichem sichtbaren Namen \"%s\"."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Karte namens \"%s\" bereits vorhanden."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Schweregrad namens \"%s\" bereits vorhanden."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Benutzer-Alias bereits vorhanden \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Dauer"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Dauer (Sek.)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Niederländisch (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Dynamisches Element"
 
 # Exa
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "FEHLER"
 
@@ -4719,13 +4791,13 @@ msgstr "FEHLER"
 msgid "EVENTS"
 msgstr "EREIGNISSE"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Jede URL sollte einzigartig sein. Bitte überprüfen Sie, dass nur eine URL existiert namens"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4733,9 +4805,9 @@ msgstr "Jede URL sollte einzigartig sein. Bitte überprüfen Sie, dass nur eine
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -4743,7 +4815,7 @@ msgstr "Bearbeiten"
 msgid "Edit map element"
 msgstr "Kartenelement bearbeiten"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Bearbeite Auslöser"
 
@@ -4754,27 +4826,61 @@ msgstr "Kartenelement"
 # Wird benutzt:

 # 1. bei Auswahl der Beschriftungsart eines Kartenelements

 # 2. als Spaltentitel in der Tabelle der Verbindungen eines Elements
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Name des Elements"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "E-Mail"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Leer"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Aktions-Bedingung leer."
 
@@ -4782,76 +4888,98 @@ msgstr "Aktions-Bedingung leer."
 msgid "Empty color."
 msgstr "Farbe leer."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "Leeres System."
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Leerer Eingabe-Parameter."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "Eingegebene Parameter leer."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Leere Eingabe."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Leeres Makro."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "Name leer für Skript \"%1$s\"."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "Name leer für Skript."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Leerer Name."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Parameter leer"
 
@@ -4860,11 +4988,11 @@ msgstr "Parameter leer"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Leere Antwort erhalten von Zabbix-Server \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4872,11 +5000,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Leerer Zeitraum."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Aktiviere"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Bestätigung aktivieren"
 
@@ -4896,11 +5028,11 @@ msgstr "Aktiviere Ereignis-Bestätigungen"
 msgid "Enable host"
 msgstr "Aktiviere Host"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Host aktivieren?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Hosts aktivieren, die durch ausgewählte Proxys überwacht werden?"
 
@@ -4914,36 +5046,32 @@ msgid "Enable internal housekeeping"
 msgstr ""
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Aktivieren"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Ausgewählte WEB-Szenarios aktivieren?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Ausgewählte Aktionen aktivieren?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Ausgewählte Kategorien aktivieren?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Ausgewählte Suchläufe aktivieren?"
 
@@ -4951,11 +5079,11 @@ msgstr "Ausgewählte Suchläufe aktivieren?"
 msgid "Enable selected groups?"
 msgstr "Ausgewählte Gruppen aktivieren?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Ausgewählte Hosts aktivieren?"
 
@@ -4963,64 +5091,68 @@ msgstr "Ausgewählte Hosts aktivieren?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Ausgewählte Elemente aktivieren?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Ausgewählte Medien-Typen aktivieren?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Ausgewählte Auslöser aktivieren?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Englisch (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Englisch (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Fehler"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Fehler bei der Suchanfrage für Tabelle \"%1$s\"."
@@ -5038,15 +5170,15 @@ msgstr "Ereignis"
 msgid "Event ID"
 msgstr "Ereignis-ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "Ereignis-ID des letzten auf regulären Ausdruck T passenden Protokolleintrags, dann N = 1, sonst 0"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "Ereignis-ID des letzten auf regulären Ausdruck T passenden Protokolleintrags, dann N NICHT 1, sonst 0"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Ereignis bestätigt"
 
@@ -5055,7 +5187,7 @@ msgstr "Ereignis bestätigt"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Ereignis Bestätigung \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Ereignisbestätigungen deaktiviert"
 
@@ -5063,7 +5195,7 @@ msgstr "Ereignisbestätigungen deaktiviert"
 msgid "Event details"
 msgstr "Ereignisdetails"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Ereigniserzeugung"
 
@@ -5083,9 +5215,10 @@ msgstr "Details Auslöserquelle"
 msgid "Event type"
 msgstr "Ereignistyp"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Ereignisse"
 
@@ -5093,36 +5226,41 @@ msgstr "Ereignisse"
 msgid "Events and alerts"
 msgstr "Ereignisse und Alarmierungen"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Jeden Tag"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Jede Woche"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Ausschließen"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Ausführen"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Fehler beim Ausführen von SQL [%1$s] in [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Ausführen auf"
 
@@ -5130,13 +5268,13 @@ msgstr "Ausführen auf"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Ausgeführtes Skript"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Ausführbestätigung"
 
@@ -5148,7 +5286,7 @@ msgstr "Makros erweitern"
 msgid "Expand single problem"
 msgstr "Bei einzelnem Problem Details anzeigen"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Erwarte JSON-rpc version 2.0, \"%s\" wurde geliefert."
@@ -5158,13 +5296,13 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Auseinander gezogen"
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Exportieren"
 
@@ -5172,22 +5310,22 @@ msgstr "Exportieren"
 msgid "Export to CSV"
 msgstr "Exportieren als CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Syntax Fehler im Ausdruck."
 
@@ -5195,11 +5333,12 @@ msgstr "Syntax Fehler im Ausdruck."
 msgid "Expression Variable Elements"
 msgstr "Variable Elemente des Ausdrucks"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Ausdruck darf nicht leer sein"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Ausdrucksgenerator"
 
@@ -5220,17 +5359,17 @@ msgid "External check"
 msgstr "Externe Überprüfung"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "Fr"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "FALSCH"
 
@@ -5239,16 +5378,17 @@ msgstr "FALSCH"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Ausfall"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Gescheitert"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5257,40 +5397,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Fehlgeschlagene Anmeldung"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Diagramm-Favoriten"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Karten-Favoriten"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Tafel-Favoriten"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Favoriten"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Feb"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Februar"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Feld"
 
@@ -5334,19 +5474,19 @@ msgstr "Feld \"%1$s\" ist keine Zeichenfolge."
 msgid "Field \"%1$s\" must be missing."
 msgstr "Feld \"%1$s\" muss fehlen."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "\"druleid\" ist ein Pflichtfeld."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "\"Name\" ist ein Pflichtfeld."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Dateiformat wird nicht unterstützt."
 
@@ -5355,13 +5495,13 @@ msgstr "Dateiformat wird nicht unterstützt."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Datei ist zu groß. Maximalgröße beträgt %1$s Byte."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Datei einer Übersicht existiert nicht. Es handelt sich um \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5369,68 +5509,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Gefüllt"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtern"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Nach Hostgruppe filtern"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Nach Namen filtern"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Suche string V in letztem Wert, N = 1 bei Treffer, 0 bei keinem Treffer"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Finde Text V in letztem (jüngstem) Wert. N NICHT 1 - wenn gefunden, sonst 0"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Beenden"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Finnisch (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Ersten"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Erste"
@@ -5439,8 +5582,8 @@ msgstr "Erste"
 msgid "Fit to map"
 msgstr "An Karte anpassen"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fest"
 
@@ -5450,77 +5593,81 @@ msgstr "Fest"
 msgid "Flexible intervals"
 msgstr "Flexible Intervalle"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Für den Gast muss das Passwort leer bleiben"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Formel"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Vierten"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Französisch (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Fr"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Freitag"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Von"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Zugriff auf Oberfläche"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Zugriff auf Oberfläche geändert"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Benachrichtigung in Oberfläche"
 
 # Das heißt nicht überall gleich.
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Vollständig klonen"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Funktion"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5530,50 +5677,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM-Modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "Oberfläche"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Zugriff auf Oberfläche deaktiviert."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Allgemein"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Erstellt in %s s"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Deutsch (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5581,65 +5728,65 @@ msgid "Get support"
 msgstr "Support"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Übergebene Expression ist kein Makro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Globaler Ausdruck existiert nicht."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Globales Skript"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Globale Skripts"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Los"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5648,66 +5795,73 @@ msgid "Gradient line"
 msgstr "Linie (Gradient)"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Diagramm"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Diagramm \"%1$s\" existiert schon auf \"%2$s\" (geerbt aus anderer Vorlage)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Diagramm \"%1$s\" existiert schon auf \"%2$s\" (Unterschiedliche Elemente)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Diagramm \"%1$s\" existiert bereits auf \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Diagramm \"%1$s\" kann nicht vererbt werden. Benötigte Elemente (für Ymax-Wert) sind in \"%2$s\" nicht vorhanden."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Diagramm \"%1$s\" kann nicht vererbt werden. Benötigte Elemente (für Ymin-Wert) sind in \"%2$s\" nicht vorhanden."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Diagramm \"%1$s\" kann nicht vererbt werden. Benötigte Elemente sind in \"%2$s\" nicht vorhanden."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Diagramm \"%1$s\" existiert nicht in Vorlage \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Diagramm \"%1$s\" übersprungen - Benutzereinstellung."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Diagramm \"%1$s\" mit vorlagenbasierten Elementen darf keine Elemente anderer Hosts enthalten,"
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Diagramm hinzugefügt"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Diagramm gelöscht"
 
@@ -5719,54 +5873,59 @@ msgstr "Diagrammelement"
 msgid "Graph item"
 msgstr "Diagramm Element"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Diagrammname"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Diagrammprototyp \"%1$s\" mit vorlagenbasierten Elementen darf keine Elemente anderer Hosts enthalten,"
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Diagrammprototyp \"%s\" gelöscht."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Diagramm-Prototypen"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5778,49 +5937,51 @@ msgstr "Diagrammprototypen von"
 msgid "Graph sum"
 msgstr "Diagrammsumme"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Diagrammtyp"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Diagramm geändert"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Diagramm namens \"%1$s\" existiert bereits (ggf. als Diagrammprototyp)."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Namensgleiches Diagramm anderen Typs existiert bereits."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Diagramme"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Diagramme kopiert"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Diagramme gelöscht"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Griechisch (el_GR)"
 
@@ -5829,54 +5990,58 @@ msgstr "Griechisch (el_GR)"
 msgid "Grid"
 msgstr "Raster"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Gruppe"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Gruppe \"%1$s\" existiert nicht."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Gruppe \"%1$s\" für Host \"%2$s\" existiert nicht."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Gruppe hinzugefügt"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Gruppe gelöscht"
+msgid_plural "Groups deleted"
+msgstr[0] "Gruppe gelöscht"
+msgstr[1] "Gruppe gelöscht"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5887,40 +6052,42 @@ msgstr "Gruppe für entdeckte Hosts"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Gruppenname"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Gruppe geändert"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Gruppiert nach"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -5928,25 +6095,16 @@ msgstr "Gruppen"
 msgid "Groups in maintenance"
 msgstr "Gruppen in Wartung"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
 # Ich weiß nicht, ob man das als Nicht-Programmierer versteht.

 # 

 # http://php.net/manual/en/function.date.php
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5963,7 +6121,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr "HOST-INVENTAR"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "ÜBERSICHT HOST-INVENTAR"
 
@@ -5981,7 +6139,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP-Authentifizierung"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTP-Proxy"
 
@@ -6002,12 +6161,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr "Hardware (Alle Details)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Höhe"
@@ -6020,15 +6184,15 @@ msgstr "Hilfe"
 msgid "Hexadecimal"
 msgstr "Hexadezimal"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Ausblenden"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Alles ausblenden"
 
@@ -6044,16 +6208,16 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Deaktivierte Auslöser ausblenden"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Ausblenden"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "Ausgewählte Gruppen verstecken"
 
@@ -6062,23 +6226,23 @@ msgstr "Ausgewählte Gruppen verstecken"
 msgid "High"
 msgstr "Hoch"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Verlauf"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Verlauf geleert"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Es dauert eine Weile, den Verlauf zu leeren. Fortfahren?"
 
@@ -6099,81 +6263,81 @@ msgstr "Ereignisverlauf"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Horizontale Ausrichtung"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
 msgstr[1] "Host"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" existiert bereits."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Host \"%1$s\" wird überwacht von Proxy \"%2$s\"."
 
 # use_ipmi
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "Bei Host \"%s\" ist der Parameter \"useipmi\" ausgewählt, \"ipmi_ip\" aber nicht eingestellt. Benutze IP-Adresse des Hosts als Adresse für die IPMI-Schnittstelle."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Hosts (aufsteigend)"
 
@@ -6186,66 +6350,68 @@ msgstr "Host-IP"
 msgid "Host access"
 msgstr "Zugriffstyp"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Hosts hinzugefügt"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Host kann nicht mehr als eine Standardschnittstelle gleichen Typs haben."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Anzahl der Hosts"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Host gelöscht"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Hostgruppe"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Hostgruppe \"%1$s\" existiert bereits."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Systemgruppe \"%1$s\" kann nicht gelöscht werden weil ein globales Skript sie verwendet."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "Systemgruppe \"%1$s\" kann nicht gelöscht werden weil ein System von ihr abhängt."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "\"%1$s\" ist eine interne Systemgruppe und kann nicht gelöscht werden."
@@ -6262,14 +6428,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "Beschriftung Hostgruppe"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "Hostgruppe braucht einen Namen."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Hostgruppen"
 
@@ -6279,8 +6446,8 @@ msgstr "Hostgruppen"
 msgid "Host interface"
 msgstr "Hostschnittstelle"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Hostinventar"
 
@@ -6296,7 +6463,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "Beschriftung Host"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Liste der Hosts"
 
@@ -6305,18 +6472,18 @@ msgid "Host metadata"
 msgstr "Systemmetadaten"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Name des Hosts"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "Systemname \"%1$s\" ist zu lang, darf nicht länger als %2$d Zeichen sein."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6325,72 +6492,72 @@ msgstr ""
 msgid "Host networks"
 msgstr "Hostnetzwerke"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Hostprototyp names \"%1$s\" existiert bereits in Suchlauf \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Hostprototyp mit Anzeigename \"%1$s\" existiert bereits in Suchlauf \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6402,7 +6569,7 @@ msgstr ""
 msgid "Host router"
 msgstr "Router des Hosts"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Host-Tafeln"
 
@@ -6414,51 +6581,52 @@ msgstr "Hoststatus"
 msgid "Host subnet mask"
 msgstr "Subnetzmaske des Hosts"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Systemzeit"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Änderung des Hosts fehlgeschlagen."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Host geändert"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Host mit gleichem Namen \"%s\" existiert bereits."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Host mit gleichem sichtbaren Namen \"%s\" existiert bereits."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hosts"
 
@@ -6466,11 +6634,11 @@ msgstr "Hosts"
 msgid "Hosts & Groups"
 msgstr "Hosts & Gruppen"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hosts (ü/nü/v)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Hosts / Vorlagen"
 
@@ -6482,37 +6650,38 @@ msgstr "Hosts in"
 msgid "Hosts in maintenance"
 msgstr "Hosts in Wartung"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Hostübersicht"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Hoststandort"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Hosts geändert"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Stunden"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Ungarisch (hu_HU)"
 
@@ -6530,22 +6699,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6553,26 +6722,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP-Adresse"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP und DNS können nicht leer sein bei Hostschnittstelle."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP-Bereich"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "IP-Bereich darf nicht leer sein."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6580,22 +6749,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI-Agent"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI-Authentifizierungsart"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "IPMI-Schnittstellen"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI-Passwort"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI Privilege level"
 
@@ -6605,7 +6774,7 @@ msgstr "IPMI Privilege level"
 msgid "IPMI sensor"
 msgstr "IPMI-Sensor"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI-Benutzername"
 
@@ -6639,7 +6808,7 @@ msgstr "IT-Dienst-Abhängigkeiten"
 msgid "IT service parent"
 msgstr "Übergeordneter IT-Dienst"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6655,25 +6824,25 @@ msgid "ITEMS"
 msgstr "ELEMENTE"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Symbol"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Symbol (Standard)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Symbol (deaktiviert)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Symbol (in Wartung)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Symbol (Problem)"
 
@@ -6694,42 +6863,44 @@ msgstr "Symbolbeschriftung"
 msgid "Icon map"
 msgstr "Symbolübersicht"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Symolzuordnung \"%1$s\" kann nicht gelöscht werden; benutzt in Karte \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Symbolzuordnung \"%1$s\" hat Zuordnung mit falscher iconid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Symbolzuordnung \"%1$s\" ist zugeordnet zur falschen Inventarverknüpfung \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Symbolzuordnung \"%s\" existiert bereits."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Symbolzuordnung \"%s\" darf keine Zuordnung zu leerem Ausdruck haben."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Symbolzuordnung \"%s\" darf keine Zuordnung haben zu globalem Ausdruck, der nicht existiert."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Symbolzuordung \"%s\" weist einen falschen Ausdruck auf."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Symbolzuordnung \"%s\" muss mindestens eine Zuordnung haben."
@@ -6742,7 +6913,8 @@ msgstr "Symbolzuordnung erstellt"
 msgid "Icon map deleted"
 msgstr "Symbolzuordnung gelöscht"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Bezeichnung der Symbolzuordnung darf nicht leer sein."
 
@@ -6750,29 +6922,29 @@ msgstr "Bezeichnung der Symbolzuordnung darf nicht leer sein."
 msgid "Icon map updated"
 msgstr "Symbolzuordnung geändert"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Symbolzuordung mit iconmapid \"%s\" existiert nicht."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Symbol zuordnen"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "Symbolzuordnungseintrag \"%1$s\" zu \"%2$s\" existiert bereits."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Symbolzuordnung ist nicht aktiviert"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Symbole"
 
@@ -6780,21 +6952,23 @@ msgstr "Symbole"
 msgid "Identical expression already exists"
 msgstr "Ein identischer Ausdruck existiert bereits"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Fragen Sie bitte ihren Administrator um die nötigen Berechtigungen, falls Sie meinen, dass Sie diese Meldung nicht sehen sollten."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Bild"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6803,7 +6977,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Bild hinzugefügt"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Bild gelöscht"
 
@@ -6811,12 +6985,13 @@ msgstr "Bild gelöscht"
 msgid "Image label type"
 msgstr "Beschriftung Bild"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Fehler [%1$s] beim Laden des Bildes in [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "Bildgröße muß kleiner als 1MB sein."
 
@@ -6825,66 +7000,66 @@ msgid "Image updated"
 msgstr "Bild geändert"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Bilder"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Die Bilder für alle Karten werden geändert!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Zurzeit"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Importieren"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Import fehlgeschlagen"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Datei importieren"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Import erfolgreich"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Filtern nach Inventarfeld \"%s\" nicht möglich; es existiert nicht."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Letzte Zeile und Spalte können nicht gelöscht werden."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "In"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "In Gruppe"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "In Gruppen"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6897,244 +7072,282 @@ msgstr "In Wartung"
 msgid "In progress"
 msgstr "In Bearbeitung"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Einfügen"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Falscher Wert im Feld \"weich\" für die Abhängigkeit von Dienst \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Falscher Wert für %1$s Beschriftungstyp der Karte \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Falscher IP-Bereich: \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Falsche SNMP-OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Falsche SNMP-Community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Falsche zulässige SLA für Dienst \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Fehlerhafte Aktionsbedingung: Suchlaufprüfung."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Unzulässige Aktionsbedingung: Suchlaufprüfung. Suchlaufprüfung existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "Unzulässige Aktionsbedingung: Suchlaufobjekt"
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Unzulässige Aktionsbedingung: Suchlauf. Suchlauf existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Unzulässige Aktionsbedingung: Suchlaufstatus."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "Unzulässige Aktionsbedingung: Ereignistyp."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Unzulässige Aktionsbedingung: Hostgruppe. Hostgruppe existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Unzulässige Aktionsbedingung: Host. Host existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "Unzulässige Aktionsbedingung: IP-Adresse \"%1$s\"."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "Unzulässiger Operator in Aktionsbedingung."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "Unzulässige Aktionsbedingung: Port \"%1$s\"."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Unzulässige Aktionsbedingung: Proxy. Proxy existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Unzulässige Aktionsbedingung: Vorlage. Vorlage existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "Unzulässige Aktionsbedingung: Auslöserschweregrad."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "Unzulässige Aktionsbedingung: Auslöserwert."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Unzulässige Aktionsbedingung: Auslöser. Auslöser existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Unzulässiger Typ der Aktionsbedingung."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Unzulässige \"conditionid\" in Aktion."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "Unzulässige Aktionsbedingungen in Aktion \"%1$s\"."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Unzulässiger Kommandotyp in Aktionsoperation."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Unzulässiger Bestätigungstyp in Aktionsoperation."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Unzulässiger Bedingungstyp in Aktionsoperation."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Unzulässiger Eskalationsstufenwert in Aktionsoperation."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Unzulässige Hostgruppe in Aktionsoperation. Hostgruppe existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Unzulässiger Host in Aktionsoperation. Host existiert nicht oder Sie haben keine Berechtigung dafür."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Unzulässige Aktionsbedingung: Port \"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Unzulässige Aktionsbedingung: Schrittdauer."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Unzulässiger Typ der Aktionsoperation."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Unzulässige Aktionsoperation: Benutzergruppe. Benutzergruppe existiert nicht oder Sie haben keine Berechtigung für diese Benutzergruppe."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Unzulässiger Benutzer für Aktionsoperation. Benutzer existiert nicht oder Sie haben keinen Zugriff auf ihn."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Unzulässige \"operationid\" in Aktion."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Unzulässiger Algorithmus für Dienst \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Der Funktion wurden falsche/fehlerhafte Argumente übergeben"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Falsche/fehlerhafte Argumente an Funktion übergeben."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Methode erhielt falsche/fehlerhafte Argumente."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Unzulässiges Authentifizierungsprotokoll in Suchlauf \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Unzulässiges Authentifzierungsprotokoll für Datenpunkt \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Unzulässiger Wert für berechnete SLA bei Service \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "Unzulässige Zeichen in System \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Unzulässige Zeichen im Hostnamen \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "Unzulässige Zeichen im Proxynamen \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Unzulässige Verzögerung."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "Unzulässige Suchlauf-ID in Hostprototyp \"%1$s\"."
@@ -7144,11 +7357,11 @@ msgstr "Unzulässige Suchlauf-ID in Hostprototyp \"%1$s\"."
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "Unzulässiges Ereignisobjekt \"%1$s\" (%2$s) für Ereignisquelle \"%3$s\" (%4$s), nur folgende Objekte werden unterstützt: %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "Unzulässiger Wert für \"eventobject\""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "Unzulässiger Wert für \"eventsource\""
 
@@ -7157,11 +7370,11 @@ msgstr "Unzulässiger Wert für \"eventsource\""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Unzulässiges Feld \"%1$s\" Name oder Wert in Where-Klausel für Tabelle \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "Unzulässige Felder für Karte."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Unzulässige Felder für Auslöser."
 
@@ -7169,74 +7382,100 @@ msgstr "Unzulässige Felder für Auslöser."
 msgid "Incorrect file upload."
 msgstr "Unzulässiger Datei-Upload."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Unzulässiges flexibles Intervall \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Unzulässiges flexibles Intervall für Datenpunkt \"%1$s\". Flexible Intervalle sind Zeichenketten."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Unzulässige Funktion verwendet"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "Unzulässige Gruppenprototyp-ID."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "Unzulässige Gruppenprototypen im Hostprototyp \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "Unzulässige Hostgruppen-ID im Gruppenprototyp."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Unzulässige Hostgruppe."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "Unzulässige Hostgruppen im Hostprototyp \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "Unzulässige Hostprototyp-ID."
 
@@ -7244,182 +7483,201 @@ msgstr "Unzulässige Hostprototyp-ID."
 msgid "Incorrect image index."
 msgstr "Unzulässiger Bildindex."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Unzulässiger Schnittstellen-DNS-Parameter \"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Unzulässiger Schnittstellen-IP-Parameter \"%s\"."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Unzulässiger Schnittstellenport \"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Unzulässiges Inventarfeld \"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Unzulässiger Datenpunkt für Achswert."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Unzulässiger Datenpunkt-Schlüssel \"%1$s\" für Auslöser-Ausdruck auf \"%2$s\" verwendet."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Falscher Schlüssel."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Fehlerhafte Liste von Datenpunkten."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Falsches Wartungsdatum - muss zwischen 01.01.1970 und 18.01.2038 liegen"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Falsches Wartungsdatum"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Falsche Wartungstage"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Falsche Wartungswochentage"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Falscher Wartungsmonat"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Falscher Wartungszeitraum"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Falscher Wartungszeitraum (mindestens 5 Minuten)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Falsche Wartungswoche"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Kartenhöhe-Wert falsch für Karte \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Kartenbreite-Wert falsch für Karte \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "Falsches Menüpfad für Skript \"%1$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "Falscher Parameter für Aktion \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Falscher Parameter für Operationen."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Falscher Parameter verwendet für Symbolzuordnung \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Falsche Parameter benutzt für Bedingung."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Falsche Parameter in Update-Methode \"%s\" für die Symbolzuordnung."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Falsche Parameter für Wartung."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Falsche Parameter für Benutzer-Gruppe."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Falscher übergeordneter Dienst für Dienst \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Falscher übergeordneter Dienst."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Falscher Port-Bereich."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Falsche proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Falscher Ressourcentyp angegeben für Tafelelement."
 
@@ -7428,64 +7686,68 @@ msgstr "Falscher Ressourcentyp angegeben für Tafelelement."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Zabbix-Server \"%1$s\" hat eine falsche Antwort geschickt."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Falsche Tafel für Diaschau angegeben."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Falscher Endzeitpunkt für Dienst."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Falscher Startzeitpunkt für Dienst."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Falscher Zeittyp für Dienst."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Falsche Sortierreihenfolge für Dienst \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Falscher Status für Dienst \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Falscher Status."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7506,52 +7768,57 @@ msgstr "Ungültiger Zeitraum \"%1$s\"; Anfangszeit darf nicht nach der Endzeit l
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Ungültiger Zeitraum \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Falsche Auslöser-ID für Dienst \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Falscher Auslöser-Ausdruck"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Ungültiger Auslöser-Ausdruck."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Ungültiger Auslöser-Ausdruck. Host \"%1$s\" existiert nicht oder Sie haben keinen Zugriff auf ihn."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Falscher Auslöser-Ausdruck. Host \"%s\" existiert nicht or Sie haben keinen Zugriff auf ihn."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Falscher Auslöser-Ausdruck. Die Elemente eines Ausdrucks sollten nicht gleichzeitig zu einer Vorlage und einem Host gehören."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Ungültige Auslöser-Funktion \"%1$s\" im Ausdruck angegeben."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Falscher Typ von asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Falsche Benutzergruppe."
 
@@ -7560,7 +7827,8 @@ msgstr "Falsche Benutzergruppe."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "Falscher Wert \"%1$s\" für Feld \"%2$s\"."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Falscher Wert \"%1$s\" für Feld \"%2$s\": Muss zwischen %3$s und %4$s liegen"
@@ -7580,7 +7848,7 @@ msgstr "Falscher Wert \"%1$s\" für das Ganzzahl-Feld \"%2$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Falscher Wert \"%1$s\" für das vorzeichenlose Ganzzahl-Feld \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "Falscher Wert für Feld \"%1$s\"."
@@ -7590,43 +7858,49 @@ msgstr "Falscher Wert für Feld \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "Falscher Wert für Feld \"%1$s\": Darf nicht leer sein."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Falscher Wert für setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Falscher Wert benutzt für Proxystatus \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Ungültige Arbeitszeit."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Falscher Datenpunkt für das Y-Maximum von Diagramm \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Falscher Datenpunkt für das Y-Minimum von Diagramm \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonesisch (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Info"
 
@@ -7635,15 +7909,15 @@ msgstr "Info"
 msgid "Information"
 msgstr "Information"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Einfügen"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Makro einfügen"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Installation"
 
@@ -7651,31 +7925,32 @@ msgstr "Installation"
 msgid "Installer name"
 msgstr "Installiert von"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Schnittstelle ist verknüpft mit Datenpunkt \"%1$s\" auf \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Es existieren Datenpunkte, die diese Art Schnittstelle benötigen."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "Es wurde keine IP-Adresse angegeben für Schnittstelle mit DNS-Namen \"%1$s\"."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "DNS-Name darf nicht leer bleiben auf Schnittstelle mit IP-Adresse \"%1$s\", Es wurde angegeben, dass der DNS-Name verwendet wird auf \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "Es wurde kein DNS-Name angegeben für Schnittstelle mit IP-Adresse \"%1$s\"."
@@ -7695,7 +7970,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Intern"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Interner JSON-RPC-Fehler."
 
@@ -7703,7 +7978,7 @@ msgstr "Interner JSON-RPC-Fehler."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Interner Fehler."
 
@@ -7716,19 +7991,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Intervall"
 
@@ -7738,112 +8013,114 @@ msgstr "Intervall"
 msgid "Interval (in sec)"
 msgstr "Intervall (in Sek)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Ungültiges JSON. Beim Parsen am Server trat ein Fehler auf."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Ungültige Abfrage."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Ungültiges Datum \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "Ungültiger erster Parameter."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Ungültige hostid für Makro \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Ungültiger Wartungszeitraum"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Ungültige Methoden-Parameter."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Ungültige Parameter."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Ungültiger Antwort-Code \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Ungültiger Antwort-Code-Bereich \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "Ungültiger dritter Parameter."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Ungültige Zeitspanne"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Ungültiger Name für Ansicht \"%s\" angegeben. Erlaubte Zeichen sind: \"a-z\" und \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventar"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7852,7 +8129,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Invertarfeld"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Inventarmodus"
 
@@ -7860,12 +8137,12 @@ msgstr "Inventarmodus"
 msgid "Is online?"
 msgstr "Online?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Problem"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Nach Benutzer-Passwort kann nicht gefiltert werden."
 
@@ -7873,70 +8150,71 @@ msgstr "Nach Benutzer-Passwort kann nicht gefiltert werden."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Abmelden ist nicht möglich bei HTTP-Authentifizierung."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Nach Benutzer-Passwort kann nicht gesucht werden."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italienisch (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Datenpunkt"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Datenpunkt \"%1$s\" existiert bereits auf \"%2$s\"; vererbt von einer anderen Vorlage."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "Datenpunkt \"%1$s\" existiert bereits auf \"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Datenpunkt \"%1$s\" kann das fehlende Inventarfeld Nummer \"%2$d\" nicht befüllen. Zur Wahl steht: 0 (nicht befüllen) bis %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Datenpunkt \"%1$s\" existiert nicht in Vorlage \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Datenpunkt \"%1$s\" existiert nicht."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Datenpunkt \"%1$s\" auf \"%2$s\": Kategorie \"%3$s\" existiert nicht."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Datenpunkt \"%1$s\" übersprungen -- Benutzerregel."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Datenpunkt \"%1$s:%2$s\" hat ungültigen Port: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Datenpunkt hinzugefügt"
 
@@ -7944,17 +8222,17 @@ msgstr "Datenpunkt hinzugefügt"
 msgid "Item count"
 msgstr "Anzahl der Datenpunkte"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Elemente gelöscht"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7968,56 +8246,56 @@ msgstr "Element im Zustand \"normal\""
 msgid "Item in \"not supported\" state"
 msgstr "Element im Zustand \"nicht unterstützt\""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Elementen-Prototyp"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Elementen-Prototypen"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -8025,92 +8303,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Elementen-Prototyp von"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Element geändert"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Element nutzt Hostschnittstelle eines nicht übergeordneten Hosts."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Schnittstellentyp ist ungeeignet für dieses Element."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Element wird nicht geändert. Bitte ein korrektes Zeitintervall angeben."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Element mit Schlüssel \"%1$s\" existiert bereits auf \"%2$s\" als Suchlauf."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Element mit Schlüssel \"%1$s\" existiert bereits auf \"%2$s\" als Prototyp-basierter Datenpunkt."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Element mit Schlüssel \"%1$s\" existiert bereits auf \"%2$s\" als Datenpunktprototyp."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Element mit Schlüssel \"%1$s\" existiert bereits auf \"%2$s\" als Datenpunkt."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Element mit Schlüssel \"%1$s\" existiert bereits auf \"%2$s\" als unbekanntes Element. "
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Datenpunkt mit Schlüssel \"%1$s\" existiert bereits auf \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Datenpunkt mit Schlüssel \"%1$s\" existiert bereits."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Datenpunkte"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Datenpunkte (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Datenpunkte kopiert"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Datenpunkte gelöscht"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Datenpunktliste"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Datenpunkte geändert"
 
@@ -8122,72 +8400,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX-Agent"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX-Schnittstellen"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "JSON-rpc-Fehlererzeugung fehlgeschlagen. Kein Fehler \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpc-Methode ist nicht definiert."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpc params ist kein Array."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "JSON-rpc-Version nicht angegeben."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber-Kennung"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Januar"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japanisch (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Jul"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Juli"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Jun"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Juni"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8196,40 +8474,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Verschwundene Ressourcen behalten (in Tagen)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Schlüssel"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Schlüssel \"%1$s\" entspricht nicht <grpmax|grpmin|grpsum|grpavg>[\"Host-Gruppe(n)\", \"Schlüssel\", \"<last|min|max|avg|sum|count>\", \"Parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Schlüssel-Passwort"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Schlüsselwort"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Koreanisch (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "AKTUELLE DATEN"
 
@@ -8260,38 +8538,38 @@ msgstr "LDAP-Anmeldung erfolgreich"
 msgid "LDAP login was not successful"
 msgstr "LDAP-Anmeldung fehlgeschlagen"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "ORTSZEIT"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "VERLOREN"
 
 # Bei Auswahl dieses Punkts kann für jedes Kartenelement eine eigene Beschriftung festgelegt werden; Übersetzung wird gleichzeitig für Eingabetextfeld benutzt
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Beschriftungstext"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Beschriftungsposition"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Sprache"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Letzter"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Letzte"
@@ -8303,19 +8581,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "Letztes %1$d Problem"
 msgstr[1] "Letzte %1$d Probleme"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Letzter (jüngster) Wert T ist < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Letzter (jüngster) Wert T ist = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Letzter (jüngster) Wert T ist > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Letzter (jüngster) Wert T ist NICHT N"
 
@@ -8335,28 +8613,28 @@ msgstr "Letzten 365 Tage"
 msgid "Last 7 days"
 msgstr "Letzten 7 Tage"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Letzte Änderung"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Letzte Änderung (absteigend)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Letzte Überprüfung"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Diagramm für die letzte Stunde"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Diagramm für den letzten Monat"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Letzten"
 
@@ -8364,66 +8642,67 @@ msgstr "Letzten"
 msgid "Last seen (age)"
 msgstr "Zuletzt gesehen vor"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Aktueller Wert"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Diagramm für die letzte Woche"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Aktuelle Daten"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Aktuelle Ereignisse"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Lettisch (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Links"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legende"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Zeichenlänge des letzten (jüngsten) Werts T ist < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Zeichenlänge des letzten (jüngsten) Werts T ist = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Zeichenlänge des letzten (jüngsten) Werts T ist > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Zeichenlänge des letzten (jüngsten) Werts T ist NICHT N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Linie"
 
@@ -8431,39 +8710,29 @@ msgstr "Linie"
 msgid "Link"
 msgstr "Verbindung"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Indikatoren"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Der Name der Verbindung sollte eindeutig sein für die Karte \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Das Verknüfpungs-Feld selementid1 verweist auf ein nicht existierendes Karten-selement ID \"%1$s\" für Karte \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Das Verknüfpungs-Feld selementid2 verweist auf ein nicht existierendes Karten-selement ID \"%1$s\" für Karte \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Verknüpfung muss \"name\" und \"url\" Felder haben für Karte \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Vorlagen verknüpfen"
 
@@ -8475,50 +8744,50 @@ msgstr "Verbinden mit Vorlage"
 msgid "Link to templates"
 msgstr "Verbinden mit Vorlagen"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Verbinden mit Vorlage"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Verbundene Vorlagen"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Verbunden mit"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Verbindungen ausgewählter Elemente"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Verbindungen des ausgewählten Elements"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Liste ist leer"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Lade ..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Lokalzeit"
 
@@ -8535,36 +8804,36 @@ msgid "Location longitude"
 msgstr "Längengrad"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "Schweregrad des letzten Protokolleintrags ist < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "Schweregrad des letzten Protokolleintrags ist = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "Schweregrad des letzten Protokolleintrags ist > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "Schweregrad des letzten Protokolleintrags ist NICHT N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "Quelle des letzten Protokolleintrags entspricht T, dann N = 1, sonst 0"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "Quelle des letzten Protokolleintrags entspricht T, dann N NICHT 1, sonst 0"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Log-Zeitformat"
@@ -8573,12 +8842,12 @@ msgstr "Log-Zeitformat"
 msgid "Log unmatched SNMP traps"
 msgstr "Nicht verarbeitbare SNMP-Traps protokollieren"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Angemeldet als"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8589,12 +8858,12 @@ msgstr "Anmelden"
 msgid "Login as Guest"
 msgstr "Als Gast anmelden"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Anmeldung fehlgeschlagen \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8603,8 +8872,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Benutzername oder Passwort falsch."
 
@@ -8625,22 +8895,18 @@ msgstr "Objektsuchlauf-Regel im Zustand \"normal\""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr "Objektsuchlauf-Regel im Zustand \"nicht unterstützt\""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "Mo"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8652,7 +8918,7 @@ msgstr "MAC-Adresse A"
 msgid "MAC address B"
 msgstr "MAC-Adresse B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "IN WARTUNG"
 
@@ -8677,49 +8943,49 @@ msgstr "TOP-100-AUSLÖSER"
 msgid "Macro"
 msgstr "Makro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" existiert bereits auf \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" existiert bereits."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "Makro \"%1$s\" ist nicht einzigartig."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Wert für Makro \"%1$s\" ist zu lang. Er darf 255 Zeichen nicht überschreiten."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Makroname \"%1$s\" ist zu lang. Er darf 64 Zeichen nicht überschreiten."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "Es existiert kein Makro mit globalmacroid \"%1$s\"."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Es existiert kein Makro mit hostmacroid \"%1$s\"."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Makros"
 
@@ -8727,31 +8993,36 @@ msgstr "Makros"
 msgid "Macros updated"
 msgstr "Makros geändert"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Wartung"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Wartung \"%s\" existiert bereits."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "Der Wert für \"Aktiv seit\" kann bei Wartungen nicht größer sein als \"Aktiv bis\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Wartung hinzugefügt"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Wartung gelöscht"
 
@@ -8759,7 +9030,7 @@ msgstr "Wartung gelöscht"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Länge des Wartungszeitraumes"
 
@@ -8775,25 +9046,25 @@ msgstr "Wartungsstatus"
 msgid "Maintenance type"
 msgstr "Wartungsart"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Wartung geändert"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Wartung mit Datensammlung"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Wartung ohne Datensammlung"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Pflichtparameter fehlt."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Manuell"
 
@@ -8804,12 +9075,12 @@ msgstr "Manuelles Abmelden"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Karte"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Karte \"%1$s\" übersprungen -- Benutzerregel."
@@ -8819,12 +9090,12 @@ msgstr "Karte \"%1$s\" übersprungen -- Benutzerregel."
 msgid "Map \"%s\""
 msgstr "Karte \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Karte \"%s\" erstellt."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Karte \"%s\" geändert."
@@ -8841,12 +9112,12 @@ msgstr "Beschriftung Karte"
 msgid "Map save operation failed."
 msgstr "Karten speichen fehlgeschlagen."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Zugeordnet"
 
@@ -8856,23 +9127,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Zuordnungswert \"%1$s\" ist nicht eindeutig."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Zuordnungen"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Karten"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "März"
 
@@ -8880,29 +9151,35 @@ msgstr "März"
 msgid "Mark elements on trigger status change"
 msgstr "Elemente bei Statusänderung des Auslösers markieren"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Andere markieren"
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Markieren"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Massenänderung"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Massenänderung von Elementen"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Max. Anzahl der anzuzeigenden Elemente einer Tabellenzelle"
@@ -8916,32 +9193,11 @@ msgstr "Höchstzahl der gezeigten Elemente in Zelle \"%1$s\"."
 msgid "Max count of events per trigger to show"
 msgstr "Maximal anzeigbare Anzahl von Ereignissen pro Auslöser"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximieren"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8949,107 +9205,101 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "Maximaler Wert im Zeitraum T ist < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "Maximaler Wert im Zeitraum T ist = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "Maximaler Wert im Zeitraum T ist > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "Maximaler Wert im Zeitraum T ist NICHT N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Mai"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Mai"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Medien"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Medientyp"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Medientyp \"%s\" existiert bereits."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Medientyp hinzugefügt"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Medientyp gelöscht"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Medientyp deaktiviert"
 msgstr[1] "Medientyp deaktiviert"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Medientyp aktiviert"
 msgstr[1] "Medientyp aktiviert"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Medientyp geändert"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Medientypen"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Medientypen, die von der Aktion \"%s\" genutzt werden."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9064,14 +9314,14 @@ msgid "Memory limit: %s"
 msgstr "Speicherlimit: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menü"
 
@@ -9081,7 +9331,7 @@ msgstr "Menü"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Nachricht"
 
@@ -9089,66 +9339,66 @@ msgstr "Nachricht"
 msgid "Message actions"
 msgstr "Nachrichten-Aktionen"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Limit des Nachrichten-Texts"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Nachrichten-Timeout"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Nachrichten-Timeout (Sekunden)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Nachrichtensystem"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Methode nicht gefunden."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Mitte"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimieren"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9157,80 +9407,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "Minimaler Wert im Zeitraum T ist < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "Minimaler Wert im Zeitraum T ist = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "Minimaler Wert im Zeitraum T ist > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "Minimaler Wert im Zeitraum T ist NICHT N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Minuten"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Feld \"itemid\" fehlt bei Datenpunkt."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Feld \"name\" fehlt bei Diagramm."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Fehlender Datenpunkt \"%1$s\" auf Host \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Fehlendes Element in Diagramm \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9240,7 +9487,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Schlüssel \"%1$s\" fehlt bei Host \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Fehlender Parameter: usrgrpids."
 
@@ -9252,18 +9499,18 @@ msgstr "Modus"
 msgid "Model"
 msgstr "Modell"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Mo"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Montag"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Überwacht von Proxy"
 
@@ -9271,33 +9518,33 @@ msgstr "Überwacht von Proxy"
 msgid "Monitored host"
 msgstr "Überwachter Host"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Überwachung"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Monat"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Monatlich"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9305,7 +9552,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Mehr als 10 Minuten"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Es existiert mehr als ein Diagramm namens \"%1$s\" auf dem Host."
@@ -9314,19 +9561,19 @@ msgstr "Es existiert mehr als ein Diagramm namens \"%1$s\" auf dem Host."
 msgid "Most busy triggers top 100"
 msgstr "Top-100-Auslöser"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Mehrere PROBLEM-Ereignisse"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Mehrere PROBLEM-Ereignisse erzeugen"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Stumm"
 
@@ -9339,60 +9586,58 @@ msgstr "KARTEN"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "KEINE DATEN"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM-Authentifizierung"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9403,26 +9648,32 @@ msgstr "NTLM-Authentifizierung"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Name"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9441,12 +9692,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9454,7 +9705,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Netzwerkkarte hinzugefügt"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Netzwerkkarte gelöscht"
 
@@ -9466,7 +9717,7 @@ msgstr "Netzwerkkarte geändert"
 msgid "Network maps"
 msgstr "Karten"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Niemals"
 
@@ -9474,24 +9725,24 @@ msgstr "Niemals"
 msgid "Never executed"
 msgstr "Noch nie ausgeführt"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Neu"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Neue Kategorie"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Neue Bedingung"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Neues Element"
 
@@ -9502,16 +9753,16 @@ msgstr "Neues Element"
 msgid "New flexible interval"
 msgstr "Neues flexibles Intervall"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Neue Gruppe"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Neue Hostgruppe"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Neues Element für Diagramm"
 
@@ -9519,83 +9770,99 @@ msgstr "Neues Element für Diagramm"
 msgid "New media"
 msgstr "Neues Medium"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Neuer regulärer Ausdruck"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Neue Servicezeit"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Weiter"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Weiter"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Nein"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Kein Feld \"ymax_type\" für Diagramm \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Kein Feld \"ymin_type\" für Diagramm \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9603,25 +9870,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr "Keine IT-Dienste gefunden."
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Keine URL angegeben für das Element der Übersichtsseite."
 
@@ -9647,8 +9914,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Keine Aktionen gefunden."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9658,7 +9925,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Keine Kategorie mit ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9666,31 +9933,32 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "Kein Authentifizierungs-Typ festgelegt für Kommando \"%s\" in Aktionsoperation."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "Kein Authentifizierungs-Benutzername festgelegt für Kommando \"%s\" in Aktionsoperation."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Kein Benutzername für Authentifizierung angegeben."
 
 # Kommando/Befehl?
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Kein Kommando festgelegt für Aktionsoperation."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Kein Kommando-Typ festgelegt für Aktionsoperation."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Keine Bedingungen definiert."
 
@@ -9699,27 +9967,27 @@ msgstr "Keine Bedingungen definiert."
 msgid "No data collection"
 msgstr "Ohne Datensammlung"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "Keine Daten empfangen im Zeitraum T, dann N = 1, sonst 0"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "Keine Daten empfangen im Zeitraum T, dann N NICHT 1, sonst 0"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Keine Standardschnittstelle für Typ \"%1$s\" bei \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Keine Abhängigkeiten definiert."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Keine Details"
 
@@ -9727,39 +9995,39 @@ msgstr "Keine Details"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr "Keine Suchlauf-ID angegeben für Hostprototyp \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Keine Suchlauf-IDs festgelegt."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr "Keine Suchläufe gefunden."
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Keine Fehler gefunden."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Keine Ereignisse"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Keine Ereignisse zu bestätigen"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Kein Ziel festgelegt für das Ausführen des Kommandos \"%s\" der Aktionsoperation."
@@ -9774,7 +10042,7 @@ msgstr "Keine Datei hinaufgeladen."
 msgid "No flexible intervals defined."
 msgstr "Keine flexiblen Intervalle definiert."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Keine Diagramm ID für Übersichtsseitenelement eingegeben."
 
@@ -9783,7 +10051,11 @@ msgstr "Keine Diagramm ID für Übersichtsseitenelement eingegeben."
 msgid "No graph item with graphid \"%s\"."
 msgstr "Kein Diagramm mit graphid \"%s\" vorhanden."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9792,48 +10064,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Keine Gruppen für Host \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Keine Gruppen für Hosts."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Keine Host-IDs angegeben."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Kein Host angegeben für Makro \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Keine Hostgruppen-ID für Tafelelement angegeben."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9846,17 +10119,22 @@ msgstr "Keine Hostgruppen mit groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Kein Host mit hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Kein Symbol für Kartenelement \"%s\"."
@@ -9875,33 +10153,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Keine Schnittstelle gefunden"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Keine Schnittstelle gefunden."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Keine Schnittstellen für Host \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Keine Element-ID eingegeben für Tafelelement."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr "Keine Datenpunktprototypen gefunden."
 
@@ -9920,7 +10205,7 @@ msgid "No items defined."
 msgstr "Keine Datenpunkte definiert."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9936,7 +10221,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Keine map ID für das Element der Übersichtsseite eingegeben."
 
@@ -9945,15 +10230,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9965,133 +10250,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Keine Berechtigung für Diagramm \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Keine Berechtigung für Host \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Keine Berechtigung für Element \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Keine Berechtigung für Vorlage \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Keine Berechtigung für Auslöser \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Keine Berechtigungen"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Keine Berechtigungen für Gruppe \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Keine Berechtigungen für Karte \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Keine Berechtigungen für Ansichtstafel \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Keine Berechtigung zum Zugriff auf die Oberfläche."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Keine Berechtigungen für dieses bestimmte Objekt oder es existiert nicht!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Keine Datei mit privatem Schlüssel festgelegt für das Kommando \"%s\" der Aktionsoperation."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Keine Datei mit privatem Schlüssel angegeben."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Kein Proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Keine Datei mit öffentlichem Schlüssel festgelegt für das Kommando \"%s\" der Aktionsoperation."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Keine Datei mit öffentlichem Schlüssel angegeben."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Keine Empfänger für die Nachricht der Aktionsoperation."
 
@@ -10099,7 +10429,7 @@ msgstr "Keine Empfänger für die Nachricht der Aktionsoperation."
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Keine Tafel-ID angegeben für das Element."
 
@@ -10107,82 +10437,83 @@ msgstr "Keine Tafel-ID angegeben für das Element."
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Kein Skript festgelegt für das Kommando der Aktionsoperation."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Kein Ziel ausgewählt"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Kein Ziel ausgewählt."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Keine Zeiten definiert. Arbeit rund um die Uhr."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Keine Auslöser"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Kein Auslöser mit triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Keine Auslöser definiert."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Keine Auslöser gefunden."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10191,57 +10522,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Keine Werte gefunden."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Kein"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normal"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Normale Ansicht"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Unbestätigt"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Keine Elemente aus Vorlagen"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Nicht alle Vorlagen sind verbunden mit \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nicht erlaubt, Passwort für Benutzer \"guest\" zu setzen."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
@@ -10251,7 +10583,7 @@ msgstr "Nicht verfügbar"
 msgid "Not classified"
 msgstr "Nicht klassifiziert"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Nicht angemeldet"
 
@@ -10264,8 +10596,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nicht unterstützt"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Notiz"
@@ -10279,7 +10611,7 @@ msgstr "Notizen"
 msgid "Nothing"
 msgstr "Keine"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Nichts zu tun."
 
@@ -10287,87 +10619,87 @@ msgstr "Nichts zu tun."
 msgid "Notification report"
 msgstr "Benachrichtigungs-Report"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "November"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Jetzt"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Zahl der Sekunden seit 1.1.1970 ist < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Zahl der Sekunden seit 1.1.1970 ist = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Zahl der Sekunden seit 1.1.1970 ist > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Zahl der Sekunden seit 1.1.1970 ist NICHT N"
 
@@ -10375,88 +10707,88 @@ msgstr "Zahl der Sekunden seit 1.1.1970 ist NICHT N"
 msgid "Number of status changes"
 msgstr "Anzahl der Statusänderungen"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Anzahl der Schritte"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Zahl erfolgreich empfangener Werte V (die Operator O erfüllen) im Zeitraum T ist < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Zahl erfolgreich empfangener Werte V (die Operator O erfüllen) im Zeitraum T ist = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Zahl erfolgreich empfangener Werte V (die Operator O erfüllen) im Zeitraum T ist > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Zahl erfolgreich empfangener Werte V (die Operator O erfüllen) im Zeitraum T ist NICHT N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Anzahl der Benutzer (online)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numerisch (float)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numerisch (Integer 64 bit)"
 
@@ -10471,16 +10803,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10496,8 +10830,7 @@ msgstr "OOB-Router"
 msgid "OOB subnet mask"
 msgstr "OOB-Subnetz-Maske"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "ODER"
 
@@ -10517,11 +10850,12 @@ msgstr "Betriebssystem (kurz)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "ANDERE KONFIGURATIONSPARAMETER"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "ÜBERSICHT"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Okt"
 
@@ -10529,25 +10863,25 @@ msgstr "Okt"
 msgid "Octal"
 msgstr "Oktal"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Oktober"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Aus"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "An"
 
@@ -10555,112 +10889,115 @@ msgstr "An"
 msgid "On status change triggers blink for"
 msgstr "Ändert sich der Zustand, blinken Auslöser"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Einmal"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Einmalig"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Einmalige Downtime"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Nur Super-Admins können globale Makros erstellen."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Nur Super-Admins können Hostgruppen erstellen."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Nur Super-Admins können Symbole zuordnen."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Nur Super-Admins können Medientypen erstellen."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Nur Super-Admins können globale Makros löschen."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Nur Super-Admins können Medientypen löschen."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Nur Super-Admins können Benutzergruppen löschen."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Nur Super-Admins können Medientypen bearbeiten."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Nur Super-Admins können globale Makros ändern."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Nur Super-Admins können Symbolzuweisungen verändern."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Nur Zabbix-Admins können Benutzermedien hinzufügen."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Nur Zabbix-Admins können Benutzermedien verändern."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Nur Zabbix-Admins können Benutzermedien löschen."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Nur Buchstaben erlaubt."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Nur Datenpunkte, die mit aktiven Hosts verbunden sind, werden gezählt"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Nur eine Prüfung kann als einzigartig markiert werden."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Benutzergruppen können nur einzeln geändert werden."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Nur die letzten 20%% des Indikators werden angezeigt."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Nur Auslöser, die mit aktiven Hosts und aktiven Datenpunkten verbunden sind, werden gezählt"
 
 # Der Browser
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Operation \"%s\" existiert bereits."
@@ -10669,28 +11006,28 @@ msgstr "Operation \"%s\" existiert bereits."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operation kann wegen unautorisierter Anfrage nicht ausgeführt werden."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Operationsvoraussetzungen"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Operations-Details"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Operation hat keine zugeordneten Gruppen zur Ausführung."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Operation hat keine zugeordneten Vorlagen zur Ausführung."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Operationstyp"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operationen"
@@ -10699,25 +11036,27 @@ msgstr "Operationen"
 msgid "Operator"
 msgstr "Operator"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10747,24 +11086,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Original"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Original-Blau"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Weitere Einstellungen"
 
@@ -10772,19 +11111,19 @@ msgstr "Weitere Einstellungen"
 msgid "Other configuration parameters"
 msgstr "Andere Konfigurationsparameter"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Andere Gruppen"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Andere Hosts"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10795,22 +11134,22 @@ msgstr "Andere Hosts | Gruppe"
 msgid "Other parameters"
 msgstr "Weitere Einstellungen"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Andere | Gruppe"
 
 # Andere Browser
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Andere"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10823,14 +11162,11 @@ msgstr "Datenpunkteinstellungen überschreiben"
 msgid "Override item trend period"
 msgstr "Datenpunkteinstellungen überschreiben"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Übersicht"
 
@@ -10839,7 +11175,7 @@ msgid "Overview by proxy"
 msgstr "Übersicht nach Proxy"
 
 # Peta
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10848,147 +11184,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "PERSÖNLICHES DASHBOARD"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Datenbankunterstützung für PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Unterstützung für PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Unterstützung für PHP gd JPEG-Bilder"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Unterstützung für PHP gd PNG-Bilder"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP-Option max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP-Option max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP-Option memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP-Option post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP-Option upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "Automatischer Start der PHP-Sitzung"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP-Zeitzone"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP-Version"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10997,32 +11341,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLEM"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "Seite hat falsche Daten erhalten"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palette"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palette #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -11031,7 +11377,7 @@ msgstr "Parameter"
 msgid "Parent discovery rules"
 msgstr "Übergeordnete Suchläufe"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11052,33 +11398,33 @@ msgstr "Übergeordnete Auslöser"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "SQL-Parsing-Fehler [%1$s] in [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Parsing-Fehler"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Passiv"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11088,20 +11434,21 @@ msgstr "Passiv"
 msgid "Password"
 msgstr "Kennwort"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Kennwort (nochmal)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Passwort nötig für Medientyp."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Das Passwort sollte nicht leer sein"
 
@@ -11110,21 +11457,21 @@ msgstr "Das Passwort sollte nicht leer sein"
 msgid "Peak memory usage: %s"
 msgstr "Spitze der Speichernutzung: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Perzentilenstrich (links)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Perzentilenstrich (rechts)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11132,12 +11479,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Zeitraum"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Art des Zeitraumes"
@@ -11147,24 +11494,24 @@ msgstr "Art des Zeitraumes"
 msgid "Periods"
 msgstr "Zeitspannen"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Berechtigungen können nur Benutzergruppen zugewiesen werden."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persisch (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Torte"
 
@@ -11176,55 +11523,56 @@ msgstr "Platzierungs-Algorithmus"
 msgid "Plain text"
 msgstr "Klartext"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Abspielen"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Geräusch abspielen"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Bitte bereinigen Sie alle Probleme und drücken \"Wiederholen\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Bitte Bestätigungs-Text eingeben."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Bitte zwei Elemente auswählen"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polnisch (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Befüllt das Inventarfeld des Hosts"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Port einer Hostschnittstelle darf nicht leer sein."
 
@@ -11232,51 +11580,51 @@ msgstr "Port einer Hostschnittstelle darf nicht leer sein."
 msgid "Port range"
 msgstr "Port-Bereich"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portugiesisch (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Portugiesisch (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Position"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Stelle"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Vorschau"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Zurück"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Vorige"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Vorheriger Wert ist < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Vorheriger Wert ist = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Vorheriger Wert ist > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Vorheriger Wert ist NICHT N"
 
@@ -11325,7 +11673,7 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
@@ -11333,23 +11681,24 @@ msgid "Private key file"
 msgstr "Datei mit privatem Schlüsel"
 
 # Bezieht sich auf IPMI-Einstellungen
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Berechtigungsebene"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Womöglich fehlt das Modul php-ldap."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problem"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Problemdarstellung"
 
@@ -11362,16 +11711,16 @@ msgstr "Problem auf"
 msgid "Problem time"
 msgstr "Ausfallzeit"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Problem, wenn alle untergeordneten Dienste Probleme haben"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problem, wenn mindestens ein untergeordneter Dienst Probleme hat"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Probleme"
 
@@ -11379,75 +11728,71 @@ msgstr "Probleme"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototypen"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxys"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" für Host \"%2$s\" existiert nicht."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Suchlauf \"%2$s\" verwendet Proxy \"%1$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Proxy \"%s\" existiert bereits."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy angelegt"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy gelöscht"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Proxy-Hosts"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Erzeugung der Proxyschnittstelle fehlgeschlagen."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Änderung der Proxyschnittstelle fehlgeschlagen."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Modus"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Name des Proxys"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy geändert"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Öffentlicher Schlüssel"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11458,7 +11803,7 @@ msgstr "Datei mit öffentlichem Schlüssel"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "WARTESCHLANGE FÜR UPDATE VON DATENPUNKTEN"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Warteschlange"
 
@@ -11466,18 +11811,18 @@ msgstr "Warteschlange"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Lesen"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Nur lesen"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Lesen/Schreiben"
 
@@ -11489,7 +11834,7 @@ msgstr "Grund"
 msgid "Received value"
 msgstr "Empfangener Wert"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11497,11 +11842,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Empfänger (aufsteigend)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Empfänger (absteigend)"
 
@@ -11512,28 +11857,28 @@ msgstr "Empfänger (absteigend)"
 msgid "Recipient(s)"
 msgstr "Empfänger"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Wiederherstellung"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Wiederherstellungsnachricht"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Wiederherstellungs-Betreff"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Nachladen (in Sekunden)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Aktualisierungszeit Multiplikator"
 
@@ -11551,47 +11896,51 @@ msgstr "Nicht unterstützte Datenpunkte erneut prüfen nach \"%1$s\" Sekunden."
 msgid "Regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "Regulärer Ausdruck \"%s\" existiert bereits."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "Regulärer Ausdruck V, der auf letzten Wert im Zeitraum T passt, dann N = 1, sonst 0"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "Regulärer Ausdruck V, der auf letzten Wert im Zeitraum T passt, dann N = 1, sonst 0 (Groß-/Kleinschreibung egal)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "Regulärer Ausdruck V, der auf letzten Wert im Zeitraum T passt, dann N NICHT 1, sonst 0"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "Regulärer Ausdruck V, der auf letzten Wert im Zeitraum T passt, dann N NICHT 1, sonst 0 (Groß-/Kleinschreibung egal)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Regulärer Ausdruck hinzugefügt"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Regulärer Ausdruck gelöscht"
 msgstr[1] "Reguläre Ausdrücke gelöscht"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Regulärer Ausdruck existiert nicht."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Regulärer Ausdruck geändert"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11608,26 +11957,28 @@ msgstr "Befehl ausführen"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11638,21 +11989,19 @@ msgstr "Befehl ausführen"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Entfernen"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11660,11 +12009,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Entferne Element"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Löschen von"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Entfernen aus Favoriten"
@@ -11673,7 +12022,7 @@ msgstr "Entfernen aus Favoriten"
 msgid "Remove from host group"
 msgstr "Entferne aus Hostgruppe"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Entferne aus Hostgruppen"
 
@@ -11686,28 +12035,28 @@ msgid "Remove link"
 msgstr "Entferne Verbindung"
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Löschen"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Abhängigkeiten ersetzen"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Ersetze Hostgruppen"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Bericht"
 
@@ -11715,35 +12064,36 @@ msgstr "Bericht"
 msgid "Report 1"
 msgstr "Bericht 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Bericht 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Bericht 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Berichte"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Benötigt"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Feld \"Ausdruck\" nicht ausgefüllt für Symbolzuordnung."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Feld \"iconid\" fehlt in Symbolzuordnung."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Feld \"inventory_link\" fehlt in Symbolzuordnung."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Benötigte Hostberechtigungen"
 
@@ -11751,29 +12101,31 @@ msgstr "Benötigte Hostberechtigungen"
 msgid "Required performance (vps)"
 msgstr "Nötige Leistung (Werte/s)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Erwartetes Datenaufkommen / Eingehende Werte pro Sekunde"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Geforderter HTTP-Statuscode"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Geforderte Zeichenkette"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -11792,9 +12144,9 @@ msgstr "Alle Namen und Farben zurücksetzen auf Standard-Werte?"
 msgid "Reset confirmation"
 msgstr "Bestätigung zurücksetzen"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11808,7 +12160,7 @@ msgstr "Wiederhergestellt"
 # Dropdown-Feld zur Auswahl des angezeigten Elements einer "screen"-Zelle
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Anzeigeelement"
@@ -11823,15 +12175,15 @@ msgstr "Antwortzeit"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Ergebnis"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Ergebnis ist FALSCH"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Ergebnis ist WAHR"
 
@@ -11844,7 +12196,8 @@ msgstr "Ergebnis von \"%s\""
 msgid "Result type"
 msgstr "Ergebnistyp"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11852,61 +12205,70 @@ msgstr ""
 msgid "Retries left"
 msgstr "Versuche übrig"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Rechts"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
 # Es geht um die Verbindung von Tabellenzellen
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Zeilenspannweite"
 
@@ -11914,11 +12276,11 @@ msgstr "Zeilenspannweite"
 msgid "Rows"
 msgstr "Zeilen"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Zeilen pro Seite"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Regeln"
 
@@ -11963,22 +12325,22 @@ msgid "Run remote commands on hosts"
 msgstr "Befehle ausführen auf Hosts"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russisch (ru_RU)"
 
 # Samstag
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Sa"
 
 # Sonntag
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "So"
@@ -11994,7 +12356,7 @@ msgstr "ANSICHTSTAFELN"
 msgid "SEARCH"
 msgstr "SUCHE"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVER"
 
@@ -12009,13 +12371,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "VORFÜHRUNGEN"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -12024,17 +12386,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP-E-Mail-Absender"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP-HELO/EHLO"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP-Server"
@@ -12050,7 +12412,7 @@ msgstr "SNMP-Schlüssel"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP-OID"
 
@@ -12062,9 +12424,9 @@ msgstr "SNMP-OID"
 msgid "SNMP community"
 msgstr "SNMP-Community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMP-Schnittstellen"
@@ -12073,7 +12435,7 @@ msgstr "SNMP-Schnittstellen"
 msgid "SNMP trap"
 msgstr "SNMP-Trap"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "Schlüssel für SNMP-Trap ist unzulässig."
 
@@ -12097,7 +12459,7 @@ msgstr "SNMPv3-Agent"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "SQL-Zähler: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12115,7 +12477,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Fehler beim Ausführen der SQL-Anweisung \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12124,15 +12486,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH-Agent"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "STATUS DES SUCHLAUFS"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STATUS DES AUSLÖSERS"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "STATUS DER WEBÜBERWACHUNG"
 
@@ -12140,92 +12522,92 @@ msgstr "STATUS DER WEBÜBERWACHUNG"
 msgid "STATUS OF ZABBIX"
 msgstr "ZABBIX-STATUS"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Sa"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Samstag"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Speichern"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Speichern und zurück"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Skalierung"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Szenario"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Szenario hinzugefügt"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Szenario geändert"
 
@@ -12237,7 +12619,7 @@ msgstr "Szenarios"
 msgid "Schedule"
 msgstr "Zeitplanung"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12248,126 +12630,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Tafel"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Tafel \"%1$s\" angelegt."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "Tafel \"%1$s\" existiert bereits in Vorlage \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "Tafel \"%1$s\" existiert bereits."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Tafel \"%1$s\" übersprungen -- Benutzerregel."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Tafel \"%1$s\" geändert."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Tafel hinzugefügt"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Zelleneinstellung"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Tafel gelöscht"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Tafel sollte zumindest eine Zeile und Spalte haben."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Tafel geändert"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Tafeln"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Skript"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Skript hinzugefügt"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Skript gelöscht"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Scriptname"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12376,17 +12757,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "Skript-Profiler"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Skript geändert"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Skripte"
 
@@ -12407,7 +12788,7 @@ msgstr "Suchmuster ist leer"
 msgid "Search/Filter elements limit"
 msgstr "Suche/Filter nach Elementen"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Zweiten"
 
@@ -12439,7 +12820,7 @@ msgstr "Zweitkontakt Telefon B"
 msgid "Secondary POC screen name"
 msgstr "Anzeigename für Zweitkontakt"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Sekunden"
 
@@ -12458,69 +12839,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Auswählen"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Wähle Prototyp"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Zeilen auswählen mit Wert wie"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Ausgewählte"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Ausgewählte Aktionen gelöscht"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Ausgewählte Elemente"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Ausgewählte Gruppen"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Ausgewählte Hosts"
 
@@ -12536,7 +12924,7 @@ msgstr "Schicke Nachricht an Benutzergruppe"
 msgid "Send message to users"
 msgstr "Schicke Nachricht an Benutzer"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Schicke nur an"
 
@@ -12544,11 +12932,11 @@ msgstr "Schicke nur an"
 msgid "Send to"
 msgstr "Empfänger"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Schicke an Benutzergruppe"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Schicke an Benutzer"
 
@@ -12557,17 +12945,17 @@ msgstr "Schicke an Benutzer"
 msgid "Sent"
 msgstr "Verschickt"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Sep"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Getrennt"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "September"
 
@@ -12579,7 +12967,7 @@ msgstr "Seriennummer A"
 msgid "Serial number B"
 msgstr "Seriennummer B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Server"
@@ -12589,44 +12977,44 @@ msgstr "Server"
 msgid "Server info"
 msgstr "Zabbix-Serverinfo"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Serverzeit"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Dienst"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Dienst \"%1$s\" kann nicht gelöscht werden weil ein anderer Dienst von ihm abhängt."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Dienst \"%1$s\" kann nicht von sich selbst abhängen."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Dienst \"%1$s\" kann nicht gleichzeitig einem Auslöser zugeordnet werden und untergeordnete Dienste haben."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Dienst \"%1$s\" ist bereits einem anderen Dienst fest zugeordnet. "
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Dienst kann nicht gleichzeitig über- und untergeordneter Dienst sein."
 
@@ -12642,11 +13030,11 @@ msgstr "Dienst gelöscht"
 msgid "Service port"
 msgstr "Serviceport"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "Startzeitpunkt des Dienstes muss vor dem Endzeitpunkt liegen."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Servicezeiten"
 
@@ -12658,51 +13046,54 @@ msgstr "Servicetyp"
 msgid "Service updated"
 msgstr "Dienst geändert"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Dienste"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Dienste bilden eine zirkläre Abhängigkeit."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Sitzung beendet, bitte neu anmelden."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Schweregrad"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Schweregrad (absteigend)"
 
 # Schwere
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Name des Schweregrads darf nicht leer bleiben."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "anzeigen"
 
-# Von Alarm nirgends die Rede
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Alle anzeigen"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Details einblenden"
 
@@ -12733,36 +13124,37 @@ msgstr "Zeige Ereignisse die jünger sind als (Tage)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Zeige Ereignisse die jünger sind als (Tage) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Zeige Hosts in Wartung"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Zeige Datenpunkte mit Namen wie"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Zeige Datenpunkte ohne Daten"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Zeige Legende"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Zeilen anzeigen"
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Anzeigen"
 
@@ -12770,19 +13162,22 @@ msgstr "Anzeigen"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Zeige Text als HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Zeige Auslöser"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Nicht bestätigte anzeigen"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Wert anzeigen"
@@ -12791,11 +13186,11 @@ msgstr "Wert anzeigen"
 msgid "Show warning if Zabbix server is down"
 msgstr "Warnung zeigen, wenn der Zabbix-Server nicht läuft"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Zeige Arbeitszeit"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Angezeigt"
 
@@ -12815,6 +13210,10 @@ msgstr "Einfache Prüfung"
 msgid "Simple graph"
 msgstr "Einfaches Diagramm"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Aufstellort Postleitzahl"
@@ -12853,7 +13252,7 @@ msgid "Site state / province"
 msgstr "Bundesland"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12872,16 +13271,16 @@ msgstr "Kopieren des Diagramms \"%1$s\" zum Host \"%2$s\" übersprungen."
 msgid "Slide"
 msgstr "Vorführung"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Vorführung"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Vorführung \"%s\" existiert bereits."
@@ -12890,11 +13289,11 @@ msgstr "Vorführung \"%s\" existiert bereits."
 msgid "Slide show added"
 msgstr "Vorführung angelegt"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Vorführung gelöscht"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Vorführung ohne Seiten nicht möglich."
 
@@ -12902,10 +13301,10 @@ msgstr "Vorführung ohne Seiten nicht möglich."
 msgid "Slide show updated"
 msgstr "Vorführung geändert"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Vorführung"
 
@@ -12913,15 +13312,15 @@ msgstr "Vorführung"
 msgid "Slides"
 msgstr "Seiten"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Slovakisch (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Dösen"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "variabel"
 
@@ -12954,28 +13353,28 @@ msgid "Software application E"
 msgstr "Programm E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Sortieren nach"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Sortierreihenfolge (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Sortiere Auslöser nach"
 
@@ -12988,11 +13387,11 @@ msgstr "Nach Feld \"%1$s\" darf nicht sortiert werden."
 msgid "Source"
 msgstr "Quelle"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spanisch (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Das angegebene Skript existiert nicht oder Sie haben nicht die notwendigen Berechtigungen."
 
@@ -13000,64 +13399,64 @@ msgstr "Das angegebene Skript existiert nicht oder Sie haben nicht die notwendig
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Gestapelt"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Standard-Element"
 
 # Spaltenüberschrift für Startzeitpunkt einer Operationsschritts
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Start bei"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Status"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Status"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Status (aufsteigend)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Status (absteigend)"
 
@@ -13070,7 +13469,7 @@ msgstr "Statusberechnung"
 msgid "Status calculation algorithm"
 msgstr "Berechnungsalgorithmus"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Status-Codes"
 
@@ -13079,7 +13478,7 @@ msgid "Status of Web monitoring"
 msgstr "Status der Webüberwachung"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Zabbix-Status"
 
@@ -13096,40 +13495,40 @@ msgid "Status only"
 msgstr "Status des Elements"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Schritt"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Schritt \"%1$s\" [%2$s von %3$s] fehlgeschlagen: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Dauer des Schritts"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Schritt des Szenarios"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Schritte"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Halt"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Wert speichern"
@@ -13139,11 +13538,11 @@ msgstr "Wert speichern"
 msgid "Straight"
 msgstr "Straight"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Stil"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Folgefilter [wirkt nur auf gefilterte Daten!]"
 
@@ -13151,11 +13550,11 @@ msgstr "Folgefilter [wirkt nur auf gefilterte Daten!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Betreff"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Unter-Karte"
 
@@ -13165,32 +13564,32 @@ msgid "Success Audit"
 msgstr "Erfolgreiche Anmeldung"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "Summe aller Werte im Zeitraum T ist < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Summe aller Werte im Zeitraum T ist gleich N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Summe aller Werte im Zeitraum T ist > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "Summe aller Werte im Zeitraum T ist NICHT N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "So"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -13198,27 +13597,27 @@ msgstr "Sonntag"
 msgid "Support"
 msgstr "Unterstützung"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Nachname"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Schwedisch (sv_SE)"
 
@@ -13226,16 +13625,16 @@ msgstr "Schwedisch (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "Alle Sitzungen werden zurückgesetzt beim Wechseln der Authentifizierungsmethode! Weiter?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Standard"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Systemfehler."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13244,24 +13643,24 @@ msgid "System status"
 msgstr "Hoststatus (Schweregrade)"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
 # Tera
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
 # Donnerstag
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Do"
 
 # Dienstag
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Di"
@@ -13280,11 +13679,11 @@ msgid "TOTAL"
 msgstr "GESAMT"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "AUSLÖSER-KOMMENTARE"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "WAHR"
 
@@ -13302,14 +13701,14 @@ msgstr "Tabelle \"%1$s\" hat keine Spalte namens \"%2$s\"."
 msgid "Tag"
 msgstr "Kennzeichnung"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Ziel"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Ziel-Liste"
 
@@ -13318,130 +13717,133 @@ msgid "Target type"
 msgstr "Zieltyp"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Vorlage"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Vorlage \"%1$s\" existiert bereits."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Vorlage \"%1$s\" für Host \"%2$s\" existiert nicht."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Vorlage angelegt"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Vorlage kann nicht mehrfach mit anderer Vorlage verbunden werden -- auch nicht durch andere Vorlagen."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Vorlage gelöscht"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Vorlagen-Gruppe"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Vorlagenverlinkung"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Vorlagen-Liste"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Vorlagenname"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Vorlagentafel"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Vorlagen-Auslöser"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Vorlage geändert"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Eine Vorlage mit dem selben Namen \"%s\" existiert bereits."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Eine Vorlage mit dem selben sichtbaren Namen \"%s\" existiert bereits."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Datenpunkte aus Vorlage"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Vorlage \"%1$s\" getrennt von Host \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Test"
 
@@ -13449,11 +13851,11 @@ msgstr "Test"
 msgid "Test authentication"
 msgstr "Authentifizierung testen"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Test-Bestätigung"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Testdaten"
 
@@ -13467,22 +13869,22 @@ msgid "Test string"
 msgstr "Test-String"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Text"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13490,7 +13892,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "Die Version der Oberfläche passt nicht zur Zabbix-Datenbank."
@@ -13505,26 +13907,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Der Datenpunkt wurde nicht mehr gefunden und wird in %1$s gelöscht (am %2$s um %3$s)."
@@ -13533,19 +13935,19 @@ msgstr "Der Datenpunkt wurde nicht mehr gefunden und wird in %1$s gelöscht (am
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Das empfangene JSON ist keine gültige JSON-RPC-Anfrage."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "Die angeforderte Remote-Prozedur existiert nicht oder ist nicht verfügbar"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Thema"
 
@@ -13556,11 +13958,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "Es gibt \"%1$d\" Gruppe mit interner Authentifizierung."
 msgstr[1] "Es gibt \"%1$d\" Gruppen mit interner Authentifizierung."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Dritten"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Dieses Feld wird automatisch befüllt aus dem Datenpunkt \"%s\"."
@@ -13569,11 +13971,11 @@ msgstr "Dieses Feld wird automatisch befüllt aus dem Datenpunkt \"%s\"."
 msgid "This month"
 msgstr "Diesen Monat"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Diese Tafelspalte ist nicht leer. Löschen?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Diese Tafelzeile ist nicht leer. Löschen?"
 
@@ -13585,27 +13987,27 @@ msgstr "Diese Woche"
 msgid "This year"
 msgstr "Dieses Jahr"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Do"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Bis"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13614,28 +14016,28 @@ msgstr "Bis"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Zeit"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Zeit (aufsteigend)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Zeit (absteigend)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13643,54 +14045,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Zeitspanne"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Zeitverschiebung"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Zeittyp"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Timeout"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "Zeitstempel weicht von Zabbix-Serverzeit nicht mehr als T Sekunden ab, dann N = 1, sonst 0"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "Zeitstempel weicht von Zabbix-Serverzeit nicht mehr als T Sekunden ab, dann N NICHT 1, sonst 0"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Titel"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Bis"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Zur Festlegung der Hostschnittstelle wählen Sie nur Datenpunkt eines Typs"
 
@@ -13698,17 +14100,18 @@ msgstr "Zur Festlegung der Hostschnittstelle wählen Sie nur Datenpunkt eines Ty
 msgid "Today"
 msgstr "Heute"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Oben"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Summe"
 
@@ -13726,7 +14129,7 @@ msgstr "Zeit gesamt: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Transaktion wurde nicht geschlossen. Abbruch ..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Transportfehler."
 
@@ -13743,91 +14146,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trends"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Auslöser"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Auslöser \"%1$s\" existiert bereits für \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Auslöser \"%1$s\" hängt ab von Auslöser \"%2$s\", welcher nicht existiert."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Auslöser \"%1$s\" übersprungen -- Benutzerregel."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Auslöser \"%s\" gehört zu Vorlagen mit unterschiedlichen Verknüpfungen."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Auslöser hinzugefügt"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Auslöser Kommentare"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Auslöser wurde gelöscht"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Auslöser-Anzeige"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13842,11 +14245,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Bedingung für Auslöserausdruck"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "Auslöser-Ausdrücke muss mindestens eine Kombination Host:Schlüssel beinhalten."
 
@@ -13854,7 +14258,7 @@ msgstr "Auslöser-Ausdrücke muss mindestens eine Kombination Host:Schlüssel be
 msgid "Trigger form"
 msgstr "Auslöser-Formular"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "Auslöser verwendet Datenpunkte von Vorlage \"%1$s\", die nicht mit dem Host verbunden ist."
@@ -13867,12 +14271,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "Auslöser in Vorlage \"%1$s\" hängt ab von Auslöser in Vorlage \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Auslöser gerade angelegt, Zustand noch unbekannt."
 
@@ -13884,52 +14288,52 @@ msgstr "Beschriftung Auslöser"
 msgid "Trigger name"
 msgstr "Auslöser-Name"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Auslöser-Prototyp"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Auslöser-Prototypen"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13937,23 +14341,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Auslöser-Prototypen von"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Auslöser-Schwere"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Auslöserpriorität"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Auslöser geändert"
 
@@ -13961,40 +14373,41 @@ msgstr "Auslöser geändert"
 msgid "Trigger value"
 msgstr "Auslöserwert"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Auslöser"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Auslöser wurden gelöscht"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Auslöser-Übersicht"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Massenänderung (Auslöser)"
 
@@ -14002,78 +14415,78 @@ msgstr "Massenänderung (Auslöser)"
 msgid "Triggers overview"
 msgstr "Auslöser"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Auslöser-Status"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Top-100-Auslöser"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Auslöser mit Gewichtung"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Abgeschnitten"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Versuch, nicht verfügbare Eigenschaft \"%s\" zu lesen"
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Di"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Türkisch (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Zwei Elemente müssen ausgewählt werden"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Zwei Datenpunkte (\"%1$s\" und \"%2$s\") können nicht das gleiche Inventarfeld \"%3$s\" befüllen."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Typ"
 
@@ -14081,62 +14494,64 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr "Typ (Alle Details)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Typ (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Typ (aufsteigend)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Typ (absteigend)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Ermittlungsart"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Informationstyp"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "Für Log-Schlüssel muss der Informationstyp \"Log\" sein."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "Für aggregierte Datenpunkte muss der Informationstyp \"Numerisch (float)\" sein."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Typen"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "UNBEKANNT"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "RAUF"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL nach dem Anmelden"
 
@@ -14152,20 +14567,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 Zeichen)"
 
@@ -14173,15 +14598,11 @@ msgstr "USA (160 Zeichen)"
 msgid "USER PROFILE"
 msgstr "BENUTZERPROFIL"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukrainisch (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Konfiguration kann nicht ausgewählt werden."
 
@@ -14189,7 +14610,7 @@ msgstr "Konfiguration kann nicht ausgewählt werden."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Unbestätigt"
 
@@ -14202,21 +14623,21 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Unbestätigte PROBLEM-Ereignisse"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Nur Unbestätigte"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
 # Passive Form besser lesbar im Dropdown-Feld
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Entsperren"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Ausgewählte Benutzer entsperren?"
 
@@ -14225,29 +14646,29 @@ msgstr "Ausgewählte Benutzer entsperren?"
 msgid "Units"
 msgstr "Einheit"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14257,23 +14678,20 @@ msgstr "Unbekannt"
 msgid "Unknown action"
 msgstr "Unbekannte Aktion"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Unbekannter Berechnungsalgorithmus für Dienst-Status"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Unbekannte Funktion."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Ausgewählter Host enthält keinen solchen Datenpunkt"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Kein solcher Host im System gefunden"
 
@@ -14285,23 +14703,23 @@ msgstr "Unbekannter Schnittstellentyp."
 msgid "Unknown resource"
 msgstr "Unbekannte Ressource"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Unbekannter Werttyp"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Trennen"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Trennen und reinigen"
 
@@ -14310,61 +14728,61 @@ msgid "Unlink from template"
 msgstr "Verbindung mit Vorlage entfernen"
 
 # Das ist gelegentlich auch als "trennen" bezeichnet. Ich bin weder besonders glücklich mit "trennen" noch mit "verbinden".
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Verbindung mit Vorlagen entfernen"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Getrennt: Kategorie \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Getrennt: Suchlauf \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Getrennt: Diagramm \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Getrennt: Diagramm Entwurf \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Getrennt: Datenpunkt \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Getrennt: Datenpunktprototyp \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Getrennt: Auslöser \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Getrennt: Auslöser-Prototyp \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Ton an"
 
@@ -14378,32 +14796,43 @@ msgstr "Nicht unterstützte Import-Dateiendung \"%1$s\"."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Nicht unterstütztes Importformat \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Erreichbar"
@@ -14414,34 +14843,34 @@ msgid "Up"
 msgstr "Erreichbar"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Ändern"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Ändere existierende"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Aktualisierungsintervall"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Aktualisierungsintervall (in Sek)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Geändert"
 
@@ -14449,55 +14878,55 @@ msgstr "Geändert"
 msgid "Updated status of host"
 msgstr "Geänderter Status des Hosts"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Geändert: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Geändert: Kategorie \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Geändert: Suchlauf \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Geändert: Datenpunkt \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Geändert: Datenpunktprototyp \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Geändert: Auslöser \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Geändert: Auslöser-Prototyp \"%1$s\" auf \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -14505,14 +14934,14 @@ msgstr "Hochladen"
 msgid "Upper level maps"
 msgstr "Übergeordnete Karten"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Laufzeit"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14520,10 +14949,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Uptime/Downtime"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14538,84 +14967,88 @@ msgid "Used in actions"
 msgstr "Benutzt in Aktion"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Benutzer"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "Benutzer \"%s\" kann nicht ohne Gruppe sein."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Benutzer hinzugefügt"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Benutzer kann Typ nicht für sich selbst ändern"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Benutzer kann sich nicht selbst eintragen in eine deaktiverte Gruppe oder eine ohne Zugriff auf die Oberfläche."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Benutzer kann Zugriff auf die Oberfläche nicht für sich selbst ändern."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Benutzer können den Status sich selbst nicht zuweisen"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Benutzer können den Status sich selbst nicht zuweisen."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Benutzer gelöscht"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Benutzergruppe"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Benutzer-Gruppe \"%1$s\" wird verwendet in Skript \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "Benutzergruppe \"%s\" existiert bereits."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14632,34 +15065,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Benutzergruppen"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Benutzer darf sich nicht selbst löschen."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Benutzer darf nicht den Zugriff auf die Oberfläche für sich modifizieren, indem er Mitglied der Benutzer-Gruppe \"%s\" wird."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Benutzer darf nicht den System-Status für sich modifizieren, indem er Mitglied der Benutzer-Gruppe \"%s\" wird."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Benutzername"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "DB-Benutzername passt nicht"
 
@@ -14685,243 +15118,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Benutzertyp"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Benutzer geändert"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Benutzer mit dem Alias \"%s\" existiert bereits."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Benutzername"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Benutzer"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Benutzer (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Benutzer entsperrt"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Wert"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Wert \"%1$s\" ist unzulässig für Parameter \"grid_align\". Zur Wahl stehen: \"%2$s\" and \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14956,11 +15389,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -15006,10 +15439,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Wertzuordnung mit valuemapid \"%1$s\" existiert nicht."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Wertezuordnung"
 
@@ -15018,7 +15451,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "Wertezuordung muss mindestens eine Zuordnung haben."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -15030,8 +15463,8 @@ msgstr "Wert: Keine Daten"
 msgid "Values"
 msgstr "Werte"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Variablen"
 
@@ -15044,65 +15477,70 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "vertikal"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Vertikale Ausrichtung"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Ansicht ist nicht gerendert."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Sichtbarer Name"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Sichtbarer Name darf nicht leer sein wenn der Hostname fehlt."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Warnung"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
 # "remember"?
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Leider wurde die maximale mögliche Anzahl von Elementen zur Erinnerung erreicht."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15110,65 +15548,83 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web-Überwachung"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Mi"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -15176,9 +15632,9 @@ msgstr "Mittwoch"
 msgid "Week"
 msgstr "Woche"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "wöchentlich"
 
@@ -15186,12 +15642,12 @@ msgstr "wöchentlich"
 msgid "When active"
 msgstr "Aktiv um"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Breite"
@@ -15201,28 +15657,28 @@ msgstr "Breite"
 msgid "With data collection"
 msgstr "Mit Datensammlung"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Mit unbestätigtem letztem Ereignis"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Mit Problemen"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Mit Auslöser"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Mit unbestätigten Ereignissen"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Ohne Probleme"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Ohne Auslöser"
 
@@ -15231,7 +15687,7 @@ msgid "Wizard"
 msgstr "Assistent"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15244,277 +15700,271 @@ msgstr "Arbeitszeit"
 msgid "Working time \"%1$s\"."
 msgstr "Arbeitszeit \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Schreiben"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Falsche Felder für Abhängigkeit des Dienstes \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Falsche Felder für Element."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Falsche Felder für Host \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Falsche Felder für Makro \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Falsche felder für Medientyp."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Falsche Felder für Skript."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Falsche Felder für Dienst \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Falsche Felder für Zeit des Dienstes \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Falsche Felder für Auslöser."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Falsche Felder für Benutzer \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Falsches Makro \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Beschriftung X-Achse"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML-Datei hat Fehler %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML-Datei hat Fehler"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML-Datei hat fatalen Fehler %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML-Datei enthält Warnung %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Maximalwert Y-Achse"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Der Maximalwert der Y-Achse muss größer sein als der Minimalwert."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Mindestwert Y-Achse"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Y-Achse"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Beschriftung Y-Achse"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Jahr"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "jährlich"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Ja"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Sie können einige der Sprachen nicht auswählen, weil die nötige Locale nicht auf dem Web-Server installiert ist."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Sie dürfen die Privilegien für Benutzer \"%s\" nicht ändern."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Sie sind nicht angemeldet."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Mit der aktuellen Auswahl können Sie keine Hosts ändern."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Sie haben keinen Host angegeben für die Operation."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Sie haben keine angegeben Host-Gruppe für die Operation."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Sie haben kein Ziel angegeben für das Operations-Kommando \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Sie haben kein Ziel angegeben für das Operations-Kommando globales Skript \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "Sie haben keine Berechtigung, diese Operation durchzuführen."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Sie haben keine Berechtigung zur Erstellung von Benutzer."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Sie haben keine Berechtigung, andere Benutzer zu ändern."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Sie haben entweder keine Berechtigung, Benutzer zu ändern, oder der Benutzer existiert nicht."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Sie müssen sich anmelden um diese Seite sehen zu können."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15527,7 +15977,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15546,8 +15996,8 @@ msgid "Zabbix User"
 msgstr "Zabbix-Benutzer"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15573,10 +16023,11 @@ msgstr "Zabbix-intern"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix-interne Authentifizierung"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix-Server"
@@ -15592,7 +16043,7 @@ msgstr ""
 "1. Falscher Domain-Name oder falsche IP-Adresse in \"zabbix.conf.php\";\n"
 "2. Netzwerkkonfiguration fehlerhaft.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "IP-Adresse oder Port nicht eingestellt für Zabbix-Server!"
 
@@ -15601,15 +16052,15 @@ msgstr "IP-Adresse oder Port nicht eingestellt für Zabbix-Server!"
 msgid "Zabbix server activity check interval"
 msgstr "Prüfintervall für Zabbix-Serveraktivität"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Zabbix-Serverinfo"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix-Server läuft nicht: Angezeigte Informationen sind womöglich nicht aktuell."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix-Server läuft"
 
@@ -15618,11 +16069,11 @@ msgstr "Zabbix-Server läuft"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Prüfintervall des Zabbix-Servers ist \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Name des Zabbix-Servers"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Zabbix-Server-Port"
 
@@ -15630,25 +16081,20 @@ msgstr "Zabbix-Server-Port"
 msgid "Zabbix trapper"
 msgstr "Zabbix-Trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zoomen"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Falscher Wert für Tag: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Falscher Wert für Monat: \"%s\" ]"
@@ -15657,19 +16103,19 @@ msgstr "[Falscher Wert für Monat: \"%s\" ]"
 msgid "agent"
 msgstr "Agent"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "alle"
 
@@ -15677,19 +16123,15 @@ msgstr "alle"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "existiert bereits"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "als Blau"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "als Grün"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "als Rot"
 
@@ -15701,83 +16143,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "durchschn."
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "T"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "Tage"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "TT"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15799,19 +16207,15 @@ msgstr ""
 msgid "discovery"
 msgstr "Suchlauf"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "Elemente"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "Elemente kopieren nach ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from und esc_step_to müssen gemeinsam angegeben werden."
 
@@ -15823,47 +16227,49 @@ msgstr "genau"
 msgid "executed"
 msgstr "ausgeführt"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "fest"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "gefundenen/m"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "Host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "Host-Gruppe"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "Symbol"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "Bild"
 
@@ -15871,7 +16277,7 @@ msgstr "Bild"
 msgid "in"
 msgstr "in"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15882,7 +16288,7 @@ msgid "internal"
 msgstr ""
 
 # Zabbix server "is" running | Zabbix server "-" läuft
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "-"
 
@@ -15890,20 +16296,20 @@ msgstr "-"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "letzte"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "genauso wie"
@@ -15912,12 +16318,12 @@ msgstr "genauso wie"
 msgid "low-level discovery rule"
 msgstr "Objektsuchlauf-Regel"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15926,46 +16332,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "Makro(s)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "Wartung"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "Karte"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max."
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min."
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "Mindestens 60 Sekunden"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15974,17 +16380,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "muss ein gültiger LDAP-Benutzer sein"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "Keine Daten"
@@ -15997,12 +16403,14 @@ msgstr "nicht in"
 msgid "not like"
 msgstr "nicht wie"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "nicht gestartet"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "nicht ausgewählt"
 
@@ -16011,58 +16419,62 @@ msgstr "nicht ausgewählt"
 msgid "not sent"
 msgstr "nicht gesendet"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "jetzt"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "von"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
 # In den ersten beiden Vorkommen "am", wie ein Tag. 3. Vorkommen unklar
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "an"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "andere"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "aktualisiert alle"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16071,8 +16483,8 @@ msgstr ""
 msgid "remember selected"
 msgstr "Auswahl merken"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
@@ -16080,18 +16492,17 @@ msgid "root"
 msgstr "root"
 
 # läuft
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "läuft"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
 # Sekunden
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "Sek"
 
@@ -16104,7 +16515,7 @@ msgstr "Sekunden"
 msgid "sent"
 msgstr "gesendet"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "Kurzbeschreibung"
 
@@ -16112,36 +16523,36 @@ msgstr "Kurzbeschreibung"
 msgid "show icon mappings"
 msgstr "Zeige Symbolzuordnung"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "Wert-Zuordnung zeigen"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "Vorlagen ID \"%1$s\" kommt %2$s mal vor"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "bis"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "Auslöser"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -16153,11 +16564,11 @@ msgstr "Wert"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "J"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "JJJJ"
diff --git a/frontends/php/locale/el/LC_MESSAGES/frontend.po b/frontends/php/locale/el/LC_MESSAGES/frontend.po
index 5306deac77f..25965012733 100644
--- a/frontends/php/locale/el/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/el/LC_MESSAGES/frontend.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2012-05-04 10:10+0200\n"
 "Last-Translator: ΓΙΑΝΝΗΣ <yannis@computerstudio.gr>\n"
 "Language-Team: none\n"
@@ -18,29 +18,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.1.4\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr ""
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "Το Πεδίο \"Εμφάνιση εναυσμάτων OK\" πρέπει να είναι \"0\" ή θετικός ακέραιος."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "Το Πεδίο \"Αναβόσβημα εναυσμάτων επί αλλαγής κατάστασης\" πρέπει να είναι \"0\" ή θετικός ακέραιος."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -52,24 +54,22 @@ msgstr[1] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (έτος %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Συλλέκτη"
 msgstr[1] "%1$s Συλλέκτες"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -84,7 +84,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -105,23 +105,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d συσκευή"
 msgstr[1] "%d συσκευές"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - απεριόριστα)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(σε ημέρες)"
 
@@ -129,34 +129,34 @@ msgstr "(σε ημέρες)"
 msgid "(in sec)"
 msgstr "(σε δευτερόλεπτα)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(ελάχιστο 60 δευτερόλεπτα, 0 - προκαθορισμένη χρήση)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(χωρίς διαμεσολαβητή)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[ΜΑΖΙΚΗ ΑΝΑΓΝΩΡΙΣΗ]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 ή 1"
 
@@ -172,7 +172,7 @@ msgstr "10 δευτερόλεπτα"
 msgid "30 seconds"
 msgstr "30 δευτερόλεπτα"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D προβολή"
 
@@ -188,7 +188,7 @@ msgstr "5 δευτερόλεπτα"
 msgid "500 latest values"
 msgstr "500 τελευταίες τιμές"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -207,12 +207,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ΑΝΑΓΝΩΡΙΣΕΙΣ ΣΥΝΑΓΕΡΜΟΥ"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "ΚΑΙ"
 
@@ -224,19 +223,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "ΑΝΑΦΟΡΑ ΔΙΑΘΕΣΙΜΟΤΗΤΑΣ"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -248,42 +247,42 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Απαγορευμένη πρόσβαση!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Αποκλεισμένος λογαριασμός για %s δευτερόλεπτα"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Αναγνώριση"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Αναγνώριση"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Προστέθηκε αναγνώριση"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Αναγνώριση συναγερμού από"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Αναγνώριση και επιστροφή"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Κατάσταση αναγνώρισης"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Αναγνωρισμένο"
 
@@ -308,62 +307,65 @@ msgstr "Απενεργοποιημένη αναγνώριση"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Ενέργεια \"%1$s\" έχει λανθασμένη τιμή για \"esc_period\" (ελάχιστο %2$s δευτερόλεπτα)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Η ενέργεια προστέθηκε"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Η ενέργεια διεγράφη"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -376,21 +378,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Εργασίες ενέργειας"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Η Ενέργεια ενημερώθηκε"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Ενεργό"
@@ -400,80 +402,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr ""
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Ενεργό από"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Ενεργό έως"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Προσθήκη σχολίου απο"
 
@@ -489,27 +494,23 @@ msgstr "Προσθήκη ξενιστή"
 msgid "Add link"
 msgstr "Προσθήκη συνδέσμου"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Προσθήκη απόντος"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Προσθήκη προτότυπου"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Προσθήκη σε"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Προσθήκη στα αγαπημένα"
@@ -518,7 +519,7 @@ msgstr "Προσθήκη στα αγαπημένα"
 msgid "Add to host group"
 msgstr "Προσθήκη στην ομάδα ξενιστών"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Προσθήκη στις ομάδες ξενιστών"
 
@@ -530,7 +531,7 @@ msgstr "Προστέθηκε"
 msgid "Admin"
 msgstr "Διαχειριστής"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Διαχείριση"
 
@@ -538,34 +539,34 @@ msgstr "Διαχείριση"
 msgid "Advanced labels"
 msgstr "Σύνθετες ετικέτες"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Ηλικία"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Ηλικία μικρότερη απο"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Ηλικία μικρότερη απο %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Αντιπρόσωπος"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Διεπαφές αντιπρόσωπου"
@@ -574,12 +575,12 @@ msgstr "Διεπαφές αντιπρόσωπου"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Διεπαφή αντιπρόσωπου ή SNMP ή JMX ή IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Ψευδώνυμο"
 
@@ -587,123 +588,126 @@ msgstr "Ψευδώνυμο"
 msgid "Align icons"
 msgstr "Ευθυγράμμιση εικονιδιων"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Όλα"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Όλες οι ομάδες"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Όλοι οι σύνδεσμοι πρέπει να έχουν \"Όνομα\" και \"URL\" καθορισμένο"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Επιτρεπόμενοι ξενιστές"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Κάθε"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Οποιαδήποτε στοιχειοσειρά χαρακτήρων περιλαμβάνεται"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Κατηγορία"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Η Κατηγορία \"%1$s\" υπάρχει ήδη."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Κατηγορία προστέθηκε"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Κατηγορία διεγράφη"
 msgstr[1] "Κατηγορία διεγράφη"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Σφάλμα εφαρμογής."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Κατηγορία ενημερώθηκε"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Κατηγορία με ID \"%1$s\" δεν είναι διαθέσιμη σε \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Κατηγορίες"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Εφαρμογή"
 
@@ -712,16 +716,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Απρ"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Απρίλιος"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Σίγουρα θέλετε να εκτελέσετε αυτή την ενέργεια;"
 
@@ -737,9 +741,9 @@ msgstr "Μέγεθος περιοχής"
 msgid "Area type"
 msgstr "Τύπος περιοχής"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -753,52 +757,49 @@ msgstr "Ως απλό κείμενο"
 msgid "Asset tag"
 msgstr "Ετικέτα αποκτήματος"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "Σε (ώρα:λεπτό)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr ""
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Επιθεώρηση"
@@ -818,26 +819,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Αυγ"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Αύγουστος"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Ταυτοποίηση"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Αλγόριθμος ταυτοποίησης"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -896,9 +899,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Αυτόματο"
 
@@ -906,20 +909,20 @@ msgstr "Αυτόματο"
 msgid "Automatic icon mapping"
 msgstr "Αυτόματη αντιστοίχιση εικονιδίου"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Αυτόματη επιλογή εικονιδίου"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Διαθεσιμότητα"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Αναφορά διαθεσιμότητας"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Διαθέσιμο"
 
@@ -928,36 +931,36 @@ msgstr "Διαθέσιμο"
 msgid "Average"
 msgstr "Μέση"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Μέσος όρος με"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr ""
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Πλευρά άξονα"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Παρασκήνιο"
@@ -966,7 +969,7 @@ msgstr "Παρασκήνιο"
 msgid "Background image"
 msgstr "Εικόνα παρασκηνίου"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Ραβδωτές αναφορές"
 
@@ -976,8 +979,8 @@ msgid "Base DN"
 msgstr "Βάση DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Βασική ταυτοποίηση"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -989,15 +992,15 @@ msgstr "Συσχέτιση DN"
 msgid "Bind password"
 msgstr "Συσχέτιση συνθηματικού"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Μαύρο & Κυανό"
 
@@ -1009,8 +1012,8 @@ msgstr "Αναβόσβημα"
 msgid "Blocked"
 msgstr "Αποκλεισμένο"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Έντονη γραμμή"
 
@@ -1018,22 +1021,22 @@ msgstr "Έντονη γραμμή"
 msgid "Boolean"
 msgstr "Λογικό"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Κάτω"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Φωτεινό"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Μαζική αναγνώριση"
 
@@ -1059,7 +1062,7 @@ msgstr "ΔΙΑΜΟΡΦΩΣΗ ΚΑΤΗΓΟΡΙΩΝ"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΤΑΥΤΟΠΟΙΗΣΗΣ"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1089,7 +1092,7 @@ msgstr "ΔΙΑΜΟΡΦΩΣΗ ΟΜΑΔΩΝ ΞΕΝΙΣΤΩΝ"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΞΕΝΙΣΤΩΝ"
 
@@ -1101,7 +1104,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΑΝΤΙΣΤΟΙΧΙΣΗΣ ΕΙΚΟΝΙΔΙΟΥ"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΕΙΚΟΝΩΝ"
 
@@ -1110,14 +1113,14 @@ msgstr "ΔΙΑΜΟΡΦΩΣΗ ΕΙΚΟΝΩΝ"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΥΠΗΡΕΣΙΩΝ IT"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΠΡΟΤΟΤΥΠΩΝ ΣΥΛΛΕΚΤΩΝ"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΣΥΛΛΕΚΤΩΝ"
 
@@ -1146,7 +1149,7 @@ msgstr "ΔΙΑΜΟΡΦΩΣΗ ΧΑΡΤΩΝ ΔΙΚΤΥΟΥ"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΔΙΑΜΕΣΟΛΑΒΗΤΩΝ"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΚΑΝΟΝΙΚΩΝ ΕΚΦΡΑΣΕΩΝ"
 
@@ -1166,7 +1169,7 @@ msgstr "ΔΙΑΜΟΡΦΩΣΗ ΔΕΣΜΩΝ ΕΝΕΡΓΕΙΩΝ"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΠΡΟΒΟΛΩΝ ΔΙΑΦΑΝΕΙΑΣ"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΣΧΕΔΙΟΤΥΠΩΝ"
 
@@ -1182,7 +1185,7 @@ msgstr "ΔΙΑΜΟΡΦΩΣΗ ΒΑΡΥΤΗΤΑΣ ΕΝΑΥΣΜΑΤΩΝ"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΕΝΑΥΣΜΑΤΩΝ"
 
@@ -1214,22 +1217,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1238,21 +1241,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Υπολογισμός SLA, αποδεκτό SLA (in %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Υπολογισμένο"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Υπολογισμένα δικαιώματα"
 
@@ -1260,92 +1263,95 @@ msgstr "Υπολογισμένα δικαιώματα"
 msgid "Callback"
 msgstr "Επανάκληση"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Καναδάς (136 χαρακτήρες)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Ματαίωση"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Αδύνατη η αναγνώριση συμβάντος"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Αδύνατη η προσθήκη ενέργειας"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Αδύνατη η προσθήκη κατηγορίας"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Αδύνατη η προσθήκη εξάρτησης απο ξενιστή σε σχεδιότυπο."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Αδύνατη η προσθήκη κανόνα εντοπισμού"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Αδύνατη η προσθήκη γραφήματος"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Αδύνατη η προσθήκης ομάδος"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Αδύνατη η προσθήκη ξενιστή"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1353,24 +1359,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Αδύνατη η προσθήκη εικόνας"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr ""
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Αδύνατη η προσθήκη συλλέκτη"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1378,20 +1384,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr ""
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Αδύνατη η προσθήκη συντήρησης"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Αδύνατη η προσθήκη τύπου μέσων"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Αδύνατη η προσθήκη περισσοτέρων του ενός συλλέκτη τύπου \"Graph sum\" στο γράφημα \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1400,24 +1406,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Αδύνατη η προσθήκη χάρτη δικτύου"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Αδύνατη η προσθήκη διαμεσολαβητή"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Αδύνατη η προσθήκη κανονικής έκφρασης"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Αδύνατη η προσθήκη οθόνης"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Αδύνατη η προσθήκη δέσμης ενεργειών"
 
@@ -1429,27 +1435,27 @@ msgstr "Αδύνατη η προσθήκη υπηρεσίας"
 msgid "Cannot add slide show"
 msgstr "Αδύνατη η προσθήκη προβολής διαφάνειας"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Αδύνατη η προσθήκη σχεδιότυπου"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Αδύνατη η προσθήκη εναύσματος"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Αδύνατη η προσθήκη χρήστη"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Αδύνατη η προσθήκη χρήστη. Αμφότερα συνθηματικά πρέπει να είναι ίδια."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Αδύνατη η προσθήκη χρηστών."
 
@@ -1457,7 +1463,7 @@ msgstr "Αδύνατη η προσθήκη χρηστών."
 msgid "Cannot add value map"
 msgstr "Αδύνατη η προσθήκη αντιστοιχίας τιμής"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1477,23 +1483,23 @@ msgstr ""
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Αδύνατη η εκκαθάριση ιστορικού"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Αδύνατη η κλωνοποίηση προτότυπων γραφημάτων."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Αδύνατη η κλωνοποίηση προτότυπων συλλεκτών."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Αδύνατη η κλωνοποίηση προτότυπων εναυσμάτων."
 
@@ -1501,20 +1507,20 @@ msgstr "Αδύνατη η κλωνοποίηση προτότυπων εναυσ
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Αδύνατη η σύνδεση με την θύρα παγιδευτή του zabbix, αλλά θα πρέπει να είναι διαθέσιμη για την εκτέλεση της δέσμης ενεργειών."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Αδύνατη η αντιγραφή γραφημάτων"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Αδύνατη η αντιγραφή συλλεκτών"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Αδύνατη η αντιγραφή εναύσματος \"%1$s:%2$s\", επειδή έχει πολλούς ξενιστές στην έκφραση."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1523,19 +1529,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "Αδύνατη η δημιουργία σύνδεσης άλλης βάσης δεδομένων."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Αδύνατη η δημιουργία κανόνα εντοπισμού"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Αδύνατη η δημιουργία ομάδος ξενιστή."
 
@@ -1543,102 +1549,102 @@ msgstr "Αδύνατη η δημιουργία ομάδος ξενιστή."
 msgid "Cannot create icon map"
 msgstr "Αδύνατη η δημιουργία αντιστοίχισης εικονιδίου"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Αδύνατη η δημιουργία αντιστοιχίσεων εικονιδίου με ίδιο όνομα \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Αδύνατη η δημιουργία χάρτη \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Αδύνατη η δημιουργία νέου στοιχείου"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Αδύνατη η διαγραφή Zabbix εσωτερικού χρήστη \"%1$s\", απενεργοποιήστε το χρήστη."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Αδύνατη η διαγραφή ενέργειας"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Αδύνατη η διαγραφή κατηγορίας"
 msgstr[1] "Αδύνατη η διαγραφή κατηγορίας"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Αδύνατη η διαγραφή εξάρτησης"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Αδύνατη η διαγραφή κανόνα εντοπισμού"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Αδύνατη η διαγραφή γραφήματος"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Αδύνατη η διαγραφή γραφήματος."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Αδύνατη η διαγραφή γραφημάτων"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Αδύνατη η διαγραφή ομάδος"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Αδύνατη η διαγραφή ομάδος"
+msgstr[1] "Αδύνατη η διαγραφή ομάδος"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Αδύνατη η διαγραφή ξενιστή"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Αδύνατη η διαγραφή ομάδος ξενιστών."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1646,80 +1652,80 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "Αδύνατη η διαγραφή αντιστοίχισης εικονιδίου"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Αδύνατη η διαγραφή εικόνας"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Αδύνατη η διαγραφή απογραφής."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Αδύνατη η διαγραφή συλλέκτη"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Αδύνατη η διαγραφή συλλεκτών"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Αδύνατη η διαγραφή συντήρησης"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Αδύνατη η διαγραφή τύπου μέσων"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Αδύνατη η διαγραφή χάρτη δικτύου"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Αδύνατη η διαγραφή διαμεσολαβητή"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 #, fuzzy
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Αδύνατη η διαγραφή κανονικής έκφρασης"
 msgstr[1] "Αδύνατη η διαγραφή κανονικής έκφρασης"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Αδύνατη η διαγραφή οθόνης"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Αδύνατη η διαγραφή δέσμης ενεργειών"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Αδύνατη η διαγραφή δεσμών ενεργειών. Κενή παράμετρος εισόδου \"scriptids\"."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Αδύνατη η διαγραφή δεσμών ενεργειών. Η Δέσμη ενεργειών \"%1$s\" χρησιμοποιείτε στην εργασία ενέργειας \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Αδύνατη η διαγραφή επιλεγμένων ενεργειών"
 
@@ -1727,77 +1733,80 @@ msgstr "Αδύνατη η διαγραφή επιλεγμένων ενεργει
 msgid "Cannot delete service"
 msgstr "Αδύνατη η διαγραφή υπηρεσίας"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Αδύνατη η διαγραφή προβολής διαφάνειας"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Αδύνατη η διαγραφή σχεδιότυπου"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Αδύνατη η διαγραφή σχεδιότυπων γραφημάτων."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Αδύνατη η διαγραφή σχεδιότυπου συλλέκτη."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Αδύνατη η διαγραφή σχεδιότυπων συλλεκτών."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Αδύνατη η διαγραφή σχεδιότυπου εναύσματος \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Αδύνατη η διαγραφή εναύσματος"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Αδύνατη η διαγραφή εναύσματος."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Αδύνατη η διαγραφή εναυσμάτων"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Αδύνατη η διαγραφή χρήστη"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1805,78 +1814,78 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr "Αδύνατη η διαγραφή αντιστοίχισης τιμών"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Αδύνατη η απενεργοποίηση τύπου μέσων"
 msgstr[1] "Αδύνατη η απενεργοποίηση τύπου μέσων"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1890,135 +1899,129 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Αδύνατη η ενεργοποίηση τύπου μέσων"
 msgstr[1] "Αδύνατη η ενεργοποίηση τύπου μέσων"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Δεν βρίσκω γράφημα \"%1$s\" χρησιμοποιούμενο στην οθόνη \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Δεν βρίσκω ομάδα \"%1$s\" χρησιμοποιούμενη στο χάρτη \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Δεν βρίσκω ομάδα \"%1$s\" χρησιμοποιούμενη στην οθόνη \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Δεν βρίσκω ξενιστή \"%1$s\" χρησιμοποιούμενο στο χάρτη \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Δεν βρίσκω ξενιστή \"%1$s\" χρησιμοποιούμενο στην οθόνη \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Δεν βρίσκω διεπαφή ξενιστή στον \"%1$s\" για κλειδί συλλέκτη \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2029,34 +2032,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Δεν βρίσκω συλλέκτη \"%1$s\" χρησιμοποιούμενο στην οθόνη \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2066,41 +2088,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Δεν βρίσκω χάρτη \"%1$s\" χρησιμοποιούμενο στην οθόνη \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Δεν βρίσκω αντικείμενα με όνομα"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Δεν βρίσκω οθόνη \"%1$s\" χρησιμοποιούμενη στην οθόνη \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2113,12 +2135,14 @@ msgstr "Αδύνατον ο μορφότυπος Δένδρου. Έλεγξε τ
 msgid "Cannot format tree."
 msgstr "Αδύνατον ο μορφότυπος δένδρου."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Δεν μπορώ να συμπτύξω την έκφραση \"%s\"."
@@ -2130,59 +2154,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Δεν περιέχει προβολή αρχείου \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Αδύνατη η συσχέτιση σχεδιότυπου"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Αδύνατη η αποσύνδεση."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Αδύνατη η μαζική ενημέρωση ονόματος ξενιστή."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Αδύνατη η μαζική ενημέρωση ορατού ονόματος ξενιστή."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Αδύνατη η μεταβίβαση διπλότυπων IDs σχεδιότυπων για τον σύνδεσμο: %s."
@@ -2202,7 +2227,7 @@ msgstr "Αδύνατη η εκτέλεση πρότασης ενημέρωσης
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Αδύνατη η εκτέλεση πρότασης ενημέρωσης σε πίνακα \"%1$s\" χωρίς συνθήκη where."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2211,11 +2236,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2223,11 +2248,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Αδύνατη η κατάργηση μακροεντολής."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Αδύνατη η αποθήκευση κανόνα εντοπισμού χωρίς ελέγχους."
 
@@ -2236,217 +2261,226 @@ msgstr "Αδύνατη η αποθήκευση κανόνα εντοπισμού
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Αδύνατη η εναλλαγή ξενιστή για διεπαφή."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Αδύνατη η απεμπλοκή χρηστών"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Αδύνατη η αποσύνδεση και καθαρισμός κανόνων εντοπισμού"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Αδύνατη η αποσύνδεση και καθαρισμός προτότυπων γραφημάτων"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Αδύνατη η αποσύνδεση και καθαρισμός γραφημάτων."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Αδύνατη η αποσύνδεση και καθαρισμός προτότυπων συλλεκτών"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Αδύνατη η αποσύνδεση και καθαρισμός συλλεκτών"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Αδύνατη η αποσύνδεση και καθαρισμός εναυσμάτων"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Αδύνατη η αποσύνδεση σχεδιότυπου"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Αδύνατη η αποσύνδεση εναύσματος \"%s\", έχει συλλέκτες από σχεδιότυπο συνδεδεμένο με ξενιστή."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Αδύνατη η ενημέρωση ενέργειας"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Αδύνατη η ενημέρωση κατηγορίας"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Αδύνατη η ενημέρωση σχολίου"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Αδύνατη η ενημέρωση διαμόρφωσης"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Αδύνατη η ενημέρωση λειτουργίας εκσφαλμάτωσης"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Αδύνατη η ενημέρωση κανόνα εντοπισμού"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Αδύνατη η ενημέρωση πρόσβασης frontend"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Αδύνατη η ενημέρωση γραφήματος"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Αδύνατη η ενημέρωση ομάδος"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Αδύνατη η ενημέρωση ομάδος."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Αδύνατη η ενημέρωση ξενιστή"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Αδύνατη η ενημέρωση ξενιστών"
 
@@ -2458,24 +2492,24 @@ msgstr "Αδύνατη η ενημέρωση αντιστοίχισης εικο
 msgid "Cannot update image"
 msgstr "Αδύνατη η ενημέρωση εικόνας"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Αδύνατη η ενημέρωση συλλέκτη"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Αδύνατη η ενημέρωση συλλεκτών"
 
@@ -2487,16 +2521,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr "Αδύνατη η ενημέρωση μακροεντολών"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Αδύνατη η ενημέρωση συντήρησης"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Αδύνατη η ενημέρωση χάρτη \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Αδύνατη η ενημέρωση τύπου μέσων"
 
@@ -2504,28 +2538,24 @@ msgstr "Αδύνατη η ενημέρωση τύπου μέσων"
 msgid "Cannot update network map"
 msgstr "Αδύνατη η ενημέρωση χάρτη δικτύου"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Αδύνατη η ενημέρωση διαμεσολαβητή"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Αδύνατη η ενημέρωση κανονικής έκφρασης"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Αδύνατη η ενημέρωση οθόνης"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Αδύνατη η ενημέρωση δέσμης ενεργειών"
 
@@ -2537,40 +2567,41 @@ msgstr "Αδύνατη η ενημέρωση υπηρεσίας"
 msgid "Cannot update slide show"
 msgstr "Αδύνατη η ενημέρωση προβολής διαφάνειας"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Αδύνατη η ενημέρωση σχεδιότυπου"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Αδύνατη η ενημέρωση εναύσματος"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Αδύνατη η ενημέρωση χρήστη"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Αδύνατη η ενημέρωση χρήστη. Αμφότερα συνθηματικά πρέπει να είναι ίδια."
 
@@ -2578,15 +2609,15 @@ msgstr "Αδύνατη η ενημέρωση χρήστη. Αμφότερα συ
 msgid "Cannot update value map"
 msgstr "Αδύνατη η ενημέρωση αντιστοίχισης τιμών"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Επικεφαλίδα"
 
@@ -2595,47 +2626,47 @@ msgstr "Επικεφαλίδα"
 msgid "Case sensitive"
 msgstr "Διάκριση πεζών-κεφαλαίων"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Κέντρο"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Αλλαγή"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Αλλαγή συνθηματικού"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Χαρακτήρας"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Περιλαμβάνεται στοιχειοσειρά χαρακτήρων"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Δεν περιλαμβάνεται στοιχειοσειρά χαρακτήρων"
 
@@ -2644,48 +2675,48 @@ msgid "Chassis"
 msgstr "Πλαίσιο"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Ο Έλεγχος υπάρχει ήδη."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Ελέγξτε το τμήμα έκφρασης που ξεκινά απο \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Ελέγξτε το κλειδί, παρακαλώ. Προκαθορισμένο παράδειγμα πέρασε."
 
@@ -2694,44 +2725,44 @@ msgid "Check type"
 msgstr "Ελέγξτε τον τύπο"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Έλεγχοι"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Οι έλεγχοι πρέπει να είναι μοναδικοί."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Κινέζικα (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Κυκλική σύνδεση δεν μπορεί να δημιουργηθεί για στοιχείο χάρτη \"%s\"."
@@ -2746,34 +2777,35 @@ msgstr "Κυκλική αναφορά σε χάρτες: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Κυκλική αναφορά σε οθόνες: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Κυκλική αναφορά σε σχεδιότυπα: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Εκκαθάριση"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Εκκαθάριση ιστορικού και τάσεων"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Εκκαθάριση ιστορικού επιλεγμένων"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Εκκαθάριση όταν αποσυνδέεται"
 
@@ -2783,69 +2815,69 @@ msgstr "Ρολόι"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Κλώνος"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Κλείσιμο κατασκευής έκφρασης"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Χρώμα"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Χρώμα (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Εύρος στήλης"
 
@@ -2860,7 +2892,7 @@ msgstr "Συνδυασμένο αποτέλεσμα"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Εντολή"
 
@@ -2868,41 +2900,31 @@ msgstr "Εντολή"
 msgid "Command actions"
 msgstr "Εντολή ενεργειών"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Η εντολή δεν μπορεί να είναι κενή."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Εντολές"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Σχόλιο ενημερώθηκε"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Σχόλια"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Εμπορικό"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Σύγκριση τιμών για πολλαπλές περιόδους"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Σύνθεση δικαιωμάτων"
 
@@ -2910,29 +2932,39 @@ msgstr "Σύνθεση δικαιωμάτων"
 msgid "Condition"
 msgstr "Συνθήκη"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Συνθήκες"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Διαμόρφωση"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3095,23 +3127,23 @@ msgstr "Διαμόρφωση ενημερώθηκε"
 msgid "Configure (Filter %s)"
 msgstr "Διαμόρφωση (Φίλτρο %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Κείμενο επιβεβαίωσης"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Σύνδεση με"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Σύνδεση ως '%1$s'"
@@ -3170,7 +3202,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3178,30 +3210,37 @@ msgstr ""
 msgid "Contract number"
 msgstr "Αριθμός σύμβασης"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Συντεταγμένες"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Αντιγραφή επιλεγμένων σε ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Αδύνατη η αποθήκευση εικόνας!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Απαρίθμηση"
 
@@ -3221,6 +3260,10 @@ msgstr "Δημιουργία κατηγορίας"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3238,7 +3281,7 @@ msgstr "Δημιουργία γραφήματος (επιλογή ξενιστή
 msgid "Create graph prototype"
 msgstr "Δημιουργία πρωτότυπου γραφήματος"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Δημιουργία ξενιστή"
 
@@ -3251,15 +3294,15 @@ msgstr "Δημιουργία ομάδος ξενιστή"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Δημιουργία αντιστοίχισης εικονιδίου"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Δημιουργία εικόνας"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Δημιουργία συλλέκτη"
 
@@ -3283,6 +3326,10 @@ msgstr "Δημιουργία χάρτη"
 msgid "Create media type"
 msgstr "Δημιουργία τύπου μέσων"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Δημιουργία διαμεσολαβητή"
@@ -3307,11 +3354,11 @@ msgstr "Δημιουργία δέσμης ενεργειών"
 msgid "Create slide show"
 msgstr "Δημιουργία προβολής διαφάνειας"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Δημιουργία σχεδιότυπου"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Δημιουργία εναύσματος"
 
@@ -3335,42 +3382,42 @@ msgstr "Δημιουργία ομάδος χρήστη"
 msgid "Create value map"
 msgstr "Δημιουργία αντιστοίχισης τιμών"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Δημιουργήθηκε: Κατηγορία \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Δημιουργήθηκε: Κανόνας εντοπισμού \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Δημιουργήθηκε: Συλλέκτης \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Δημιουργήθηκε: Πρωτότυπος συλλέκτης \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Δημιουργήθηκε: Έναυσμα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Δημιουργήθηκε: Πρωτότυπο έναυσμα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3380,51 +3427,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Τρέχων ξενιστής"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Τρέχουσα τιμή"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3437,7 +3485,7 @@ msgstr "Προσαρμοσμένα γραφήματα"
 msgid "Custom label"
 msgstr "Προσαρμοσμένη ετικέτα"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Η Προσαρμοσμένη ετικέτα για χάρτη \"%2$s\" στοιχείων τύπου \"%1$s\" δεν πρέπει να είναι άδεια."
@@ -3451,7 +3499,7 @@ msgstr "Προσαρμοσμένος πολλαπλασιαστής"
 msgid "Custom screens"
 msgstr "Προσαρμοσμένες οθόνες"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Προσαρμοσμένη δέσμη ενεργειών"
 
@@ -3471,18 +3519,14 @@ msgstr "Προσαρμοσμένο μέγεθος"
 msgid "Custom slides"
 msgstr "Προσαρμοσμένες διαφάνειες"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Τσέχικα (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "ΔΙΑΜΟΡΦΩΣΗ ΠΙΝΑΚΑ ΕΛΕΓΧΟΥ"
@@ -3498,28 +3542,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "ΛΕΠΤΟΜΕΡΕΙΕΣ ΣΕΝΑΡΙΟΥ"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΟ"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "ΕΝΤΟΠΙΣΜΕΝΟ"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3527,25 +3571,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS όνομα"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "ΜΗ ΔΙΑΘΕΣΙΜΟ"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Ημερησίως"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Σκοτεινό πορτοκαλί"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Σκοτεινό"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Πίνακας ελέγχου"
 
@@ -3557,20 +3601,21 @@ msgstr "Διαμόρφωση πίνακα ελέγχου"
 msgid "Dashboard filter"
 msgstr "Φίλτρο πίνακα ελέγχου"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Διακεκομμένη γραμμή"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Δεδομένα"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3593,11 +3638,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Τύπος δεδομένων"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Αρχείο βάσης δεδομένων"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Υπολογιστής βάσης δεδομένων"
 
@@ -3605,35 +3651,39 @@ msgstr "Υπολογιστής βάσης δεδομένων"
 msgid "Database monitor"
 msgstr "Εποπτεία βάσης δεδομένων"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Συνθηματικό βάσης δεδομένων"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Θύρα βάσης δεδομένων"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Σχήμα βάσης δεδομένων"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Εξυπηρετητής βάσης δεδομένων"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Τύπος βάσης δεδομένων"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Χρήστης βάσης δεδομένων"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -3653,53 +3703,52 @@ msgstr "Ημερομηνία λήξης συντήρησης HW"
 msgid "Date HW purchased"
 msgstr "Ημερομηνία αγοράς HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Ημέρα"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Ημέρα του μήνα"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Ημέρα της εβδομάδος"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Ημέρες"
 
@@ -3707,22 +3756,22 @@ msgstr "Ημέρες"
 msgid "Debug"
 msgstr "Εκσφαλμάτωση"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Λειτουργία εκσφαλμάτωσης"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Η Λειτουργία εκσφαλμάτωσης ενημερώθηκε"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Δεκ"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Δεκέμβριος"
 
@@ -3732,15 +3781,14 @@ msgstr "Δεκαδικός"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
@@ -3753,11 +3801,11 @@ msgid "Default delay (in seconds)"
 msgstr "Προκαθορισμένη καθυστέρηση (σε δευτερόλεπτα)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Προκαθορισμένο μήνυμα"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3780,30 +3828,34 @@ msgstr "Προκαθορισμένο θέμα \"%1$s\"."
 msgid "Delay"
 msgstr "Καθυστέρηση"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Καθυστέρηση (σε δευτερόλεπτα)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Καθυστερημένο από"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Διαγραφή και καθαρισμός"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Διαγραφή και καθαρισμός επιλεγμένων σχεδιότυπων; (Προσοχή: όλοι οι συνδεδεμένοι ξενιστές θα καθαριστούν!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Διαγραφή και καθαρισμός σχεδιότυπου; (Προσοχή: όλοι οι συνδεδεμένοι ξενιστές θα καθαριστούν!)"
 
@@ -3811,53 +3863,53 @@ msgstr "Διαγραφή και καθαρισμός σχεδιότυπου; (Π
 msgid "Delete application?"
 msgstr "Διαγραφή κατηγορίας;"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Διαγραφή τρέχουσας ενέργειας;"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Διαγραφή κανόνα εντοπισμού;"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Διαγραφή έκφρασης;"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Διαγραφή γραφήματος;"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Διαγραφή ιστορικού επιλεγμένων σεναρίων ΙΣΤΟΥ;"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Διαγραφή ιστορικού επιλεγμένων συλλεκτών;"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Διαγραφή αντιστοίχισης εικονιδίων;"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Διαγραφή λέξης-κλειδί;"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Διαγραφή συνδέσμων μεταξύ επιλεγμένων στοιχείων;"
 
@@ -3865,11 +3917,15 @@ msgstr "Διαγραφή συνδέσμων μεταξύ επιλεγμένων
 msgid "Delete maintenance period?"
 msgstr "Διαγραφή περιόδου συντήρησης;"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Διαγραφή χάρτη δικτύου;"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Διαγραφή διαμεσολαβητή;"
 
@@ -3877,7 +3933,7 @@ msgstr "Διαγραφή διαμεσολαβητή;"
 msgid "Delete regular expression?"
 msgstr "Διαγραφή κανονικής έκφρασης;"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Διαγραφή σεναρίου;"
 
@@ -3885,71 +3941,67 @@ msgstr "Διαγραφή σεναρίου;"
 msgid "Delete screen?"
 msgstr "Διαγραφή οθόνης;"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Διαγραφή δέσμης ενεργειών;"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Διαγραφή επιλεγμένων"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Διαγραφή επιλεγμένων σεναρίων ΙΣΤΟΥ;"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Διαγραφή επιλεγμένων ενεργειών;"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Διαγραφή επιλεγμένων κατηγοριών;"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Διαγραφή επιλεγμένων κανόνων εντοπισμού;"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Διαγραφή επιλεγμένων στοιχείων;"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Διαγραφή επιλεγμένων γραφημάτων;"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Διαγραφή επιλεγμένης ομάδος;"
@@ -3958,27 +4010,27 @@ msgstr "Διαγραφή επιλεγμένης ομάδος;"
 msgid "Delete selected groups?"
 msgstr "Διαγραφή επιλεγμένων ομάδων;"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Διαγραφή επιλεγμένων ομάδων ξενιστών;"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Διαγραφή επιλεγμένου ξενιστή;"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Διαγραφή επιλεγμένων ξενιστών;"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Διαγραφή επιλεγμένης εικόνας;"
 
@@ -3986,31 +4038,31 @@ msgstr "Διαγραφή επιλεγμένης εικόνας;"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Διαγραφή επιλεγμένων συλλεκτών;"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Διαγραφή επιλεγμένων περιόδων συντήρησης;"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Διαγραφή επιλεγμένων χαρτών;"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Διαγραφή επιλεγμένου τύπου μέσων;"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Διαγραφή επιλεγμένων τύπων μέσων;"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Διαγραφή επιλεγμένων διαμεσολαβητών;"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Διαγραφή επιλεγμένης κανονικής έκφρασης;"
 
@@ -4018,15 +4070,15 @@ msgstr "Διαγραφή επιλεγμένης κανονικής έκφρασ�
 msgid "Delete selected screens?"
 msgstr "Διαγραφή επιλεγμένων οθονών;"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Διαγραφή επιλεγμένων δεσμών ενεργειών;"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Διαγραφή επιλεγμένων προβολών διαφάνειας;"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Διαγραφή επιλεγμένων σχεδιότυπων;"
 
@@ -4038,11 +4090,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Διαγραφή επιλεγμένων εναυσμάτων;"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Διαγραφή επιλεγμένου χρήστη;"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Διαγραφή επιλεγμένων χρηστών;"
 
@@ -4057,11 +4109,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Διαγραφή επιλεγμένης αντιστοίχισης τιμής; Χρησιμοποιείται για %d συλλέκτη!"
 msgstr[1] "Διαγραφή επιλεγμένης αντιστοίχισης τιμής; Χρησιμοποιείται για %d συλλέκτες!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Διαγραφή επιλεγμένων με συνδεδεμένα στοιχεία"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4070,15 +4126,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Διαγραφή προβολής διαφάνειας;"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Διαγραφή σχεδιότυπου;"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Διαγραφή εναύσματος;"
 
@@ -4086,62 +4142,62 @@ msgstr "Διαγραφή εναύσματος;"
 msgid "Deleted"
 msgstr "Διεγραμμένα"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Διεγράφη: Κατηγορία \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Διεγράφη: Κανόνας εντοπισμού \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Διεγράφη: Γράφημα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Διεγράφη: Ξενιστής \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Διεγράφη: Συλλέκτης \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Διεγράφη: Πρωτότυπος συλλέκτης \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Διεγράφη: Διαμεσολαβητής \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Διεγράφη: Σχεδιότυπο \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Διεγράφη: Έναυσμα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Διεγράφη: Πρωτότυπο έναυσμα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4150,35 +4206,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Οριοθέτης"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Διαφορά (απλή αλλαγή)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Διαφορά (ταχύτητα ανά δευτερόλεπτο)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Άρνηση"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Εξαρτήσεις"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Εξαρτημένο"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Εξαρτάται από"
 
@@ -4186,30 +4242,41 @@ msgstr "Εξαρτάται από"
 msgid "Deployment status"
 msgstr "Κατάσταση υλοποίησης"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
@@ -4222,71 +4289,71 @@ msgid "Device"
 msgstr "Συσκευή"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Κριτήρια μοναδικότητας συσκευής"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4310,48 +4377,44 @@ msgstr "Απενεργοποίηση εκσφαλμάτωσης σε επιλε�
 msgid "Disable host"
 msgstr "Απενεργοποίηση ξενιστή"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Απενεργοποίηση ξενιστή;"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Απενεργοποίηση ξενιστών στις επιλεγμένες ομάδες ξενιστών;"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Απενεργοποίηση ξενιστών εποπτευόμενων απο επιλεγμένους διαμεσολαβητές;"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Απενεργοποίηση επιλεγμένων"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Απενεργοποίηση επιλεγμένων σεναρίων ΙΣΤΟΥ;"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Απενεργοποίηση επιλεγμένων ενεργειών;"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Απενεργοποίηση επιλεγμένων κατηγοριών;"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Απενεργοποίηση επιλεγμένων κανόνων εντοπισμού;"
 
@@ -4359,11 +4422,11 @@ msgstr "Απενεργοποίηση επιλεγμένων κανόνων εν�
 msgid "Disable selected groups?"
 msgstr "Απενεργοποίηση επιλεγμένων ομάδων;"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Απενεργοποίηση επιλεγμένων ξενιστών;"
 
@@ -4371,42 +4434,47 @@ msgstr "Απενεργοποίηση επιλεγμένων ξενιστών;"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Απενεργοποίηση επιλεγμένων συλλεκτών;"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Απενεργοποίηση επιλεγμένων τύπων μέσων;"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Απενεργοποίηση επιλεγμένων εναυσμάτων;"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
@@ -4419,7 +4487,7 @@ msgstr "Καταστροφή"
 msgid "Discovered"
 msgstr "Εντοπισμένο"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4427,17 +4495,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "Εντοπισμένη συσκευή"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Εντοπισμός"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Εντοπισμός με διαμεσολαβητή"
 
@@ -4445,17 +4513,17 @@ msgstr "Εντοπισμός με διαμεσολαβητή"
 msgid "Discovery check"
 msgstr "Έλεγχος εντοπισμού"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Έλεγχοι εντοπισμών"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Κατάλογος εντοπισμού"
 
@@ -4464,67 +4532,70 @@ msgid "Discovery object"
 msgstr "Αντικείμενο εντοπισμού"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Κανόνας εντοπισμού"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Ο κανόνας εντοπισμού \"%1$s\" υπάρχει ήδη σε \"%2$s\", κληρονομημένος από άλλο σχεδιότυπο."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "Ο Κανόνας εντοπισμού \"%1$s:%2$s\" έχει λανθασμένο χρόνο ζωής: \"%3$s\". (ελάχιστο: %4$d, μέγιστο: %5$d, επιτρέπεται μακροεντολή χρήστη)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Ο κανόνας εντοπισμού \"%s\" υπάρχει ήδη."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "Ο Κανόνας εντοπισμού \"%1$s:%2$s\" έχει λανθασμένο χρόνο ζωής: \"%3$s\". (ελάχιστο: %4$d, μέγιστο: %5$d, επιτρέπεται μακροεντολή χρήστη)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Κανόνας εντοπισμού δημιουργήθηκε"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Κανόνας εντοπισμού διεγράφη"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Κανόνας εντοπισμού ενημερώθηκε"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Κανόνες εντοπισμού"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Κανόνες εντοπισμού διεγράφησαν"
 
@@ -4536,7 +4607,7 @@ msgstr "Κατάσταση εντοπισμού"
 msgid "Display OK triggers for"
 msgstr "Εμφάνιση εναυσμάτων OK για"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Εμφάνιση"
 
@@ -4545,32 +4616,32 @@ msgstr "Εμφάνιση"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Εμφάνιση %1$s από %2$s βρέθηκαν"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Κατανομή τιμών για πολλαπλούς συλλέκτες"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Κατανομή τιμών για πολλαπλές περιόδους"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Μην υπολογίζεις"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Θέλετε να αντικαταστήσετε την υπο συνθήκη έκφραση;"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Έγινε"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Τελεία"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4580,30 +4651,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Χρόνος μη διαθεσιμότητας"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Σύρετε εδώ για να αλλάξετε τον τύπο της διεπαφής σε \"IPMI\"."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Σύρετε εδώ για να αλλάξετε τον τύπο της διεπαφής σε \"JMX\"."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Σύρετε εδώ για να αλλάξετε τον τύπο της διεπαφής σε \"SNMP\"."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Σύρετε εδώ για να αλλάξετε τον τύπο της διεπαφής σε \"αντιπρόσωπος\"."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Τρόπος σχεδίασης"
 
@@ -4621,74 +4692,75 @@ msgstr "Πρώτη καταχώρηση Κυλιόμενων επιλογών \"
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Υπενθύμιση επιλεγμένης κυλιόμενης επιλογής \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Διπλό όνομα ξενιστή. Ξενιστής με ίδιο όνομα ξενιστή \"%s\" υπάρχει ήδη στα δεδομένα."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Διπλό όνομα ξενιστή. Ξενιστής με ίδιο ορατό όνομα \"%s\" υπάρχει ήδη στα δεδομένα."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Διπλό όνομα χάρτη για χάρτη \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Διπλό όνομα σοβαρότητας \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Διπλό ψευδώνυμο χρήστη \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Διάρκεια"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Ολλανδικά (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Δυναμικός συλλέκτης"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ΛΑΘΟΣ"
 
@@ -4696,13 +4768,13 @@ msgstr "ΛΑΘΟΣ"
 msgid "EVENTS"
 msgstr "ΣΥΜΒΑΝΤΑ"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Κάθε URL πρέπει να έχει μοναδικό όνομα. Βεβαιωθείτε να υπάρχει μόνο ένα ονομαζόμενο URL"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4710,9 +4782,9 @@ msgstr "Κάθε URL πρέπει να έχει μοναδικό όνομα. Β�
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Επεξεργασία"
 
@@ -4720,7 +4792,7 @@ msgstr "Επεξεργασία"
 msgid "Edit map element"
 msgstr "Επεξεργασία στοιχείου χάρτη"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Επεξεργασία εναύσματος"
 
@@ -4728,27 +4800,61 @@ msgstr "Επεξεργασία εναύσματος"
 msgid "Element"
 msgstr "Στοιχείο"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Όνομα στοιχείου"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Ηλεκτρονικό ταχυδρομείο"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Κενό"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Κενή συνθήκη ενέργειας."
 
@@ -4756,76 +4862,98 @@ msgstr "Κενή συνθήκη ενέργειας."
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Κενή παράμετρος εισόδου."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Κενή εισαγωγή."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Κενή μακροεντολή."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Κενό όνομα."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Κενές παράμετροι"
 
@@ -4834,11 +4962,11 @@ msgstr "Κενές παράμετροι"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4846,11 +4974,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Ενεργοποίηση επιβεβαίωσης"
 
@@ -4870,11 +5002,11 @@ msgstr "Ενεργοποίηση αναγνωρίσεων συμβάντων"
 msgid "Enable host"
 msgstr "Ενεργοποίηση ξενιστή"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Ενεργοποίηση ξενιστή;"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Ενεργοποίηση ξενιστών εποπτευόμενων απο επιλεγμένους διαμεσολαβητές;"
 
@@ -4887,36 +5019,32 @@ msgstr "Ενεργοποίηση ξενιστών εποπτευόμενων α�
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Ενεργοποίηση επιλεγμένου"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Ενεργοποίηση επιλεγμένων σεναρίων ΙΣΤΟΥ;"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Ενεργοποίηση επιλεγμένων ενεργειών;"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Ενεργοποίηση επιλεγμένων κατηγοριών;"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Ενεργοποίηση επιλεγμένων κανόνων εντοπισμού;"
 
@@ -4924,11 +5052,11 @@ msgstr "Ενεργοποίηση επιλεγμένων κανόνων εντο�
 msgid "Enable selected groups?"
 msgstr "Ενεργοποίηση επιλεγμένων ομάδων;"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Ενεργοποίηση επιλεγμένων ξενιστών;"
 
@@ -4936,64 +5064,68 @@ msgstr "Ενεργοποίηση επιλεγμένων ξενιστών;"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Ενεργοποίηση επιλεγμένων συλλεκτών;"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Ενεργοποίηση επιλεγμένων τύπων μέσων;"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Ενεργοποίηση επιλεγμένων εναυσμάτων;"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Αγγλικά (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Σφάλμα στό αίτημα αναζήτησης για πίνακα \"%1$s\"."
@@ -5011,15 +5143,15 @@ msgstr "Συμβάν"
 msgid "Event ID"
 msgstr "Αναγνωριστικό συμβάντος"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Αναγνωρισμένο συμβάν"
 
@@ -5028,7 +5160,7 @@ msgstr "Αναγνωρισμένο συμβάν"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Αναγνωρισμένα συμβάντα \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Απενεργοποιημένη αναγνώριση συμβάντων"
 
@@ -5036,7 +5168,7 @@ msgstr "Απενεργοποιημένη αναγνώριση συμβάντων
 msgid "Event details"
 msgstr "Λεπτομέρειες συμβάντος"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Παραγωγή συμβάντος"
 
@@ -5056,9 +5188,10 @@ msgstr "Λεπτομέρειες προέλευσης συμβάντος"
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Συμβάντα"
 
@@ -5066,36 +5199,41 @@ msgstr "Συμβάντα"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Καθημερινά (ες)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Κάθε εβδομάδα (ες)"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Εξα"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Εξαίρεση"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Σφάλμα εκτέλεσης SQL [%1$s] in [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Εκτέλεση σε"
 
@@ -5103,13 +5241,13 @@ msgstr "Εκτέλεση σε"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Εκτελέσιμη δέσμη ενεργειών"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Επιβεβαίωση εκτέλεσης"
 
@@ -5121,7 +5259,7 @@ msgstr "Ανάπτυξη μακροεντολών"
 msgid "Expand single problem"
 msgstr "Ανάπτυξη απλού προβλήματος"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Αναμένοντας JSON-rpc έκδοση 2.0, δόθηκε \"%s\"."
@@ -5131,12 +5269,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Αναπτυγμένο"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Εξαγωγή επιλεγμένων"
 
@@ -5144,22 +5282,22 @@ msgstr "Εξαγωγή επιλεγμένων"
 msgid "Export to CSV"
 msgstr "Εξαγωγή σε CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Έκφραση"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Συντακτικό σφάλμα έκφρασης."
 
@@ -5167,11 +5305,12 @@ msgstr "Συντακτικό σφάλμα έκφρασης."
 msgid "Expression Variable Elements"
 msgstr "Στοιχεία μεταβλητής έκφρασης"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Η Έκφραση δεν μπορεί να είναι κενή"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Κατασκευή έκφρασης"
 
@@ -5193,17 +5332,17 @@ msgstr "Εξωτερικός έλεγχος"
 
 # SMS , Twitter
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Γραπτά μηνύματα"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "ΨΕΥΔΕΣ"
 
@@ -5212,16 +5351,17 @@ msgstr "ΨΕΥΔΕΣ"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Αποτυχία"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5229,40 +5369,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Αποτυχία επιθεώρησης"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Αγαπημένα γραφήματα"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Αγαπημένοι χάρτες"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Αγαπημένες οθόνες"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Αγαπημένα"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Φεβ"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Πεδίο"
 
@@ -5306,19 +5446,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Το Πεδίο \"druleid\" είναι απαιτούμενο."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Το Πεδίο \"name\" είναι απαιτούμενο."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5327,13 +5467,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Το αρχείο είναι πολύ μεγάλο, μέγιστο μέγεθος αναφόρτωσης %1$s δυφιοσυλλαβές."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Αρχείο παρεχόμενο για προβολή δεν υπάρχει. Προσπάθεια εξεύρεσης \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5341,68 +5481,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Γεμισμένη περιοχή"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Φίλτρο"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Φιλτράρισμα με ομάδα ξενιστών"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Φιλτράρισμα μέ όνομα"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Τέλος"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Πρώτο"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5411,8 +5554,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr "Προσαρμογή στο χάρτη"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Σταθερό"
 
@@ -5422,76 +5565,80 @@ msgstr "Σταθερό"
 msgid "Flexible intervals"
 msgstr "Ευέλικτα διαστήματα"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Το συνθηματικό για επισκέπτη πρέπει να είναι κενό"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Τύπος"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Τέταρτος"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Γαλλικά (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Παρ"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Από"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Πρόσβαση στο περιβάλλον ΙΣΤΟΥ"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Η Πρόσβαση στο περιβάλλον ΙΣΤΟΥ ενημερώθηκε"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Μηνύματα στο περιβάλλον ΙΣΤΟΥ"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Πλήρης κλώνος"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Πλήρης οθόνη"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Συνάρτηση"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5501,50 +5648,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM μόντεμ"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Απενεργοποιημένη πρόσβαση GUI."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Γενικά"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Παραγόμενο σε %s δευτερόλεπτα"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Γερμανικά (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5552,65 +5699,65 @@ msgid "Get support"
 msgstr "Υποστήριξη"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Γίγα"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Η δοσμένη έκφραση δεν είναι μακροεντολή"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Γενική έκφραση δεν υπάρχει."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Γενική δέσμη ενεργειών"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Γενικές δέσμες ενεργειών"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Μετάβαση"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Μετάβαση σε"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5619,66 +5766,73 @@ msgid "Gradient line"
 msgstr "Χρωμοβαθμισμένη γραμμή"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Γράφημα"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Γράφημα \"%1$s\" υπάρχει ήδη σε \"%2$s\" (εξαρτώμενο από άλλο σχεδιότυπο)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Γράφημα \"%1$s\" υπάρχει ήδη σε \"%2$s\" (συλλέκτες όχι πανομοιότυποι)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Γράφημα \"%1$s\" υπάρχει ήδη σε \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Γράφημα \"%1$s\" δεν κληρονομείται. Δεν χρειάζονται συλλέκτες σε \"%2$s\" (Ymax τιμή συλλέκτη)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Γράφημα \"%1$s\" δεν κληρονομείται. Δεν χρειάζονται συλλέκτες σε \"%2$s\" (Ymin τιμή συλλέκτη)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Γράφημα \"%1$s\" δεν κληρονομείται. Δεν χρειάζονται συλλέκτες σε \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Γράφημα προστέθηκε"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Γράφημα διεγράφη"
 
@@ -5690,54 +5844,59 @@ msgstr "Στοιχείο γραφήματος"
 msgid "Graph item"
 msgstr "Συλλέκτης γραφήματος"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Όνομα γραφήματος"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Το πρωτότυπο γράφημα \"%s\" διεγράφη."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Πρωτότυπα γραφήματα"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5749,49 +5908,51 @@ msgstr "Πρωτότυπα γραφήματα από"
 msgid "Graph sum"
 msgstr "Άθροισμα γραφήματος"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Τύπος γραφήματος"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Γράφημα ενημερώθηκε"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Υπάρχει γράφημα με ίδιο όνομα αλλά άλλο τύπο."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Γραφήματα"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Γραφήματα αντιγράφηκαν"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Γραφήματα διεγράφησαν"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Ελληνικά (el_GR)"
 
@@ -5800,54 +5961,58 @@ msgstr "Ελληνικά (el_GR)"
 msgid "Grid"
 msgstr "Πλέγμα"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Ομάδα"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Η ομάδα \"%1$s\" δεν υπάρχει."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Ομάδα \"%1$s\" για ξενιστή \"%2$s\" δεν υπάρχει."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Ομάδα προστέθηκε"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Ομάδα διεγράφη"
+msgid_plural "Groups deleted"
+msgstr[0] "Ομάδα διεγράφη"
+msgstr[1] "Ομάδα διεγράφη"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5858,40 +6023,42 @@ msgstr "Ομάδα για εντοπισμένους ξενιστές"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Όνομα ομάδος"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Ομάδα ενημερώθηκε"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Ομαδοποίηση με"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Ομάδες"
 
@@ -5899,22 +6066,13 @@ msgstr "Ομάδες"
 msgid "Groups in maintenance"
 msgstr "Ομάδες σε συντήρηση"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H:i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5931,7 +6089,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "ΕΠΙΣΚΟΠΗΣΗ ΑΠΟΓΡΑΦΗΣ ΞΕΝΙΣΤΗ"
 
@@ -5949,7 +6107,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP ταυτοποίηση"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5970,12 +6129,17 @@ msgstr "Υλικό"
 msgid "Hardware (Full details)"
 msgstr "Υλικό (Αναλυτικά στοιχεία)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Ύψος"
@@ -5988,15 +6152,15 @@ msgstr "Βοήθεια"
 msgid "Hexadecimal"
 msgstr "Δεκαεξαδικό"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Κρυφό"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Απόκρυψη"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Απόκρυψη όλων"
 
@@ -6012,15 +6176,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Απόκρυψη απενεργοποιημένων εναυσμάτων"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Απόκρυψη επιλεγμένων"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6029,23 +6193,23 @@ msgstr ""
 msgid "High"
 msgstr "Υψηλή"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Ιστορικό"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Ιστορικό καθαρίστηκε"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Η εκκαθάριση ιστορικού μπορεί να πάρει πολύ χρόνο. Συνέχεια;"
 
@@ -6066,80 +6230,80 @@ msgstr "Ιστορικό συμβάντων"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Οριζόντια"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Οριζόντια ευθυγράμμιση"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Ξενιστής"
 msgstr[1] "Ξενιστής"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Ο ξενιστής \"%1$s\" υπάρχει ήδη."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "Ο ξενιστής \"%s\" έχει \"useipmi\" ελεγχόμενη παράμετρο, αλλά χωρίς \"ipmi_ip\" παράμετρο! Χρησιμοποιείτε IP διεύθυνση ξενιστή ώς διεύθυνση IPMI διεπαφής."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Ξενιστής (αύξουσα)"
 
@@ -6151,66 +6315,68 @@ msgstr "IP ξενιστή"
 msgid "Host access"
 msgstr "Πρόσβαση ξενιστή"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Ξενιστής προστέθηκε"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Ο ξενιστής δεν μπορεί να έχει πλέον της μιάς προκαθορισμένες διεπαφές ίδιου τύπου."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Πλήθος ξενιστών"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Ξενιστής διεγράφη"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Ομάδα ξενιστών"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6227,14 +6393,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "Τύπος ετικέτας ομάδος ξενιστών"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Ομάδες ξενιστών"
 
@@ -6244,8 +6411,8 @@ msgstr "Ομάδες ξενιστών"
 msgid "Host interface"
 msgstr "Διεπαφή ξενιστή"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Απογραφή ξενιστή"
 
@@ -6261,7 +6428,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "Τύπος ετικέτας ξενιστή"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Κατάλογος ξενιστών"
 
@@ -6270,18 +6437,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Όνομα ξενιστή"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6290,72 +6457,72 @@ msgstr ""
 msgid "Host networks"
 msgstr "Δίκτυα ξενιστών"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6367,7 +6534,7 @@ msgstr ""
 msgid "Host router"
 msgstr "Δρομολόγηση ξενιστή"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Οθόνες ξενιστών"
 
@@ -6379,51 +6546,52 @@ msgstr "Κατάσταση ξενιστή"
 msgid "Host subnet mask"
 msgstr "Μάσκα υποδικτύου ξενιστή"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Χρόνος ξενιστή"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Αποτυχία ενημέρωσης ξενιστή."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Ξενιστής ενημερώθηκε"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Ξενιστής με ίδιο όνομα \"%s\" υπάρχει ήδη."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Ξενιστής με ίδιο ορατό όνομα \"%s\" υπάρχει ήδη."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Ξενιστές"
 
@@ -6431,11 +6599,11 @@ msgstr "Ξενιστές"
 msgid "Hosts & Groups"
 msgstr "Ξενιστές & Ομάδες"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Ξενιστές (ε/χε/π)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Ξενιστές / σχεδιότυπα"
 
@@ -6447,37 +6615,38 @@ msgstr "Περιεχόμενοι ξενιστές"
 msgid "Hosts in maintenance"
 msgstr "Ξενιστές σε συντήρηση"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Πληροφορίες ξενιστών"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Τοποθεσία ξενιστών"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Ξενιστές ενημερώθηκαν"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Ωριαία"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Ώρες"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Ουγγρικά (hu_HU)"
 
@@ -6495,22 +6664,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6518,26 +6687,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP διεύθυνση"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP και DNS δεν μπορούν να είναι κενά για διεπαφή ξενιστή."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Περιοχή IP"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "Η Περιοχή IP δεν μπορεί να είναι κενή."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6545,22 +6714,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "Αντιπρόσωπος IPMI"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "Αλγόριθμος ταυτοποίησης IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Διεπαφές IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "Συνθηματικό IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Επίπεδο προνομίων IPMI"
 
@@ -6570,7 +6739,7 @@ msgstr "Επίπεδο προνομίων IPMI"
 msgid "IPMI sensor"
 msgstr "Αισθητήρας IPMI"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "Όνομα χρήστη IPMI"
 
@@ -6603,7 +6772,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6619,25 +6788,25 @@ msgid "ITEMS"
 msgstr "ΣΥΛΛΕΚΤΕΣ"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Εικόνα"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Εικόνα (προκαθορισμένη)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Εικόνα (απενεργοποιημένη)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Εικόνα (συντήρηση)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Εικόνα (πρόβλημα)"
 
@@ -6658,42 +6827,44 @@ msgstr "Τύπος σήματος εικόνας"
 msgid "Icon map"
 msgstr "Αντιστοίχιση εικονιδίων"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%1$s\" δεν διαγράφεται. Σε χρήση στον χάρτη \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%1$s\" έχει αντιστοίχιση με λανθασμένη iconid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%1$s\" έχει αντιστοίχιση με λανθασμένο σύνδεσμο απογραφής \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%s\" υπάρχει ήδη."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%s\" δεν μπορεί να έχει αντιστοίχιση με κενή έκφραση."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%s\" δεν μπορεί να έχει αντιστοίχιση με ανύπαρκτη γενική έκφραση."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%s\" έχει εσφαλμένη έκφραση."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%s\" πρέπει να έχει τουλάχιστον μία αντιστοίχιση."
@@ -6706,7 +6877,8 @@ msgstr "Αντιστοίχιση εικονιδίου δημιουργήθηκε
 msgid "Icon map deleted"
 msgstr "Αντιστοίχιση εικονιδίου διεγράφη"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Το όνομα αντιστοίχισης εικονιδίου δεν μπορεί να είναι κενό."
 
@@ -6714,29 +6886,29 @@ msgstr "Το όνομα αντιστοίχισης εικονιδίου δεν �
 msgid "Icon map updated"
 msgstr "Αντιστοίχιση εικονιδίου ενημερώθηκε"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Η Αντιστοίχιση εικονιδίου με iconmapid \"%s\" δεν υπάρχει."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Αντιστοιχία εικονιδίου"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "Η εγγραφή αντιστοιχίας εικονιδίου \"%1$s\" έναντι \"%2$s\" υπάρχει ήδη."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Η Αντιστοίχιση εικονιδίου είναι ανενεργή"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Εικονίδια"
 
@@ -6744,21 +6916,23 @@ msgstr "Εικονίδια"
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Αν νομίζετε ότι το μήνυμα είναι λάθος, συμβουλευτείτε τους διαχειριστές για τις αναγκαίες άδειες."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Εικόνα"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6767,7 +6941,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Εικόνα προστέθηκε"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Εικόνα διεγράφη"
 
@@ -6775,12 +6949,13 @@ msgstr "Εικόνα διεγράφη"
 msgid "Image label type"
 msgstr "Τύπος σήμανσης εικόνας"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6789,66 +6964,66 @@ msgid "Image updated"
 msgstr "Εικόνα ενημερώθηκε"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Εικόνες"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Οι εικόνες όλων των χαρτών θα ενημερωθούν!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Άμεσα"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Εισαγωγή απέτυχε"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Εισαγωγή αρχείου"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Επιτυχής εισαγωγή"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Αδύνατο φιλτράρισμα με πεδίο απογραφής \"%s\", ανύπαρκτο."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Αδύνατη η απομάκρυνση τελευταίας γραμμής και στήλης."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "Σε"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "Σε ομάδα"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Συνδέεται με ομάδες"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6861,244 +7036,282 @@ msgstr "Σε συντήρηση"
 msgid "In progress"
 msgstr "Σε εξέλιξη"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Συμπεριλαμβάνω"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Λανθασμένη \"soft\" τιμή πεδίου για εξάρτηση με υπηρεσία \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Λανθασμένη %1$s τιμή σήμανσης για χάρτη \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Λανθασμένη περιοχή IP \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Λανθασμένο SNMP OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Λανθασμένο SNMP community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Λανθασμένη αποδοχή SLA για υπηρεσία \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Λανθασμένη συνθήκη ενέργειας ελέγχου εντοπισμού."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Λανθασμένη συνθήκη ενέργειας ελέγχου εντοπισμού. Ό έλεγχος δεν υπάρχει ή δεν έχετε πρόσβαση."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Λανθασμένη συνθήκη ενέργειας κανόνα εντοπισμού. Ό κανόνας δεν υπάρχει ή δεν έχετε πρόσβαση."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Λανθασμένη συνθήκη ενέργειας κατάστασης εντοπισμού."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Λανθασμένη συνθήκη ενέργειας ομάδος ξενιστών. Ομάδα ξενιστών δεν υπάρχει ή δεν έχετε πρόσβαση."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Λανθασμένη συνθήκη ενέργειας ξενιστή. Ο ξενιστής δεν υπάρχει ή δεν έχετε πρόσβαση."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Λανθασμένος διαμεσολαβητής στη συνθήκη ενέργειας. Ο διαμεσολαβητής δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτόν."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Λανθασμένο σχεδιότυπο συνθήκης ενέργειας. Σχεδιότυπο δεν υπάρχει ή δεν έχετε πρόσβαση."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Λανθασμένο έναυσμα στη συνθήκη ενέργειας. Έναυσμα δεν υπάρχει ή δεν έχετε πρόσβαση."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Λανθασμένος τύπος στη συνθήκη ενέργειας."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Λανθασμένος τύπος εντολής στην εργασία ενέργειας."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Λανθασμένος τύπος αναγνώρισης συνθήκης εργασίας ενέργειας."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Λανθασμένος τύπος συνθήκης εργασίας ενέργειας."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Λανθασμένες βηματικές τιμές κλιμάκωσης εργασίας ενέργειας."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Λανθασμένη ομάδα ξενιστών εργασίας ενέργειας. Η Ομάδα ξενιστών δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτήν."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Λανθασμένος ξενιστής εργασίας ενέργειας. Ο ξενιστής δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτόν."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Λανθασμένη θύρα εργασίας ενέργειας \"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Λανθασμένος τύπος εργασίας ενέργειας."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Λανθασμένη ομάδα χρήστη εργασίας ενέργειας. Η ομάδα χρήστη δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτήν."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Λανθασμένος χρήστης εργασίας ενέργειας. Ο χρήστης δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτόν."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Λανθασμένος αλγόριθμος για υπηρεσία \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Λανθασμένα ορίσματα πέρασαν στην συνάρτηση"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Λανθασμένες μεταβλητές πέρασαν στη συνάρτηση."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Λανθασμένα ορίσματα πέρασαν στη μέθοδο."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Λανθασμένη τιμή υπολογισμού SLA για υπηρεσία \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Λανθασμένοι χαρακτήρες για όνομα ξενιστή \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Λανθασμένη καθυστέρηση."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7108,11 +7321,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7121,11 +7334,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Λανθασμένο πεδίο \"%1$s\" όνομα ή τιμή στη δήλωση where του πίνακα \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Λανθασμένα πεδία για έναυσμα."
 
@@ -7133,74 +7346,100 @@ msgstr "Λανθασμένα πεδία για έναυσμα."
 msgid "Incorrect file upload."
 msgstr "Λανθασμένο αρχείο αναφόρτωσης."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Λανθασμένη συνάρτηση σε χρήση"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Λανθασμένη ομάδα ξενιστών."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7208,182 +7447,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr "Δείκτης λανθασμένης εικόνας."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Λανθασμένη παράμετρος DNS διεπαφής \"%s\" παρέχεται."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Λανθασμένη παράμετρος IP διεπαφής \"%s\" παρέχεται."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Λανθασμένη θύρα διεπαφής \"%s\" παρέχεται."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Λανθασμένο πεδίο απογραφής \"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Λανθασμένος συλλέκτης για τιμή άξονα."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Λανθασμένο κλειδί συλλέκτη \"%1$s\" παρέχεται για έκφραση εναύσματος σε \"%2$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Λανθασμένο κλειδί."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Λανθασμένος κατάλογος συλλεκτών."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Λανθασμένη συντήρηση - η ημερομηνία πρέπει να είναι μεταξύ 01/01/1970 και 18/01/2038"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Λανθασμένη ημερομηνία συντήρησης"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Λανθασμένη περίοδος ημερησίας συντήρησης"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Λανθασμένες ημέρες συντήρησης την εβδομάδα"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Λανθασμένη περίοδος μηνιαίας συντήρησης"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Λανθασμένη περίοδος συντήρησης"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Λανθασμένη περίοδος συντήρησης (ελάχιστο 5 λεπτά)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Λανθασμένη περίοδος εβδομαδιαίας συντήρησης"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Λανθασμένη τιμή ύψους για χάρτη \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Λανθασμένη τιμή πλάτους για χάρτη \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Λανθασμένη παράμετρος για λειτουργίες."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Χρησιμοποιείται λανθασμένη παράμετρο για αντιστοίχιση εικονιδίου \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Λανθασμένη παράμετρος για συνθήκη."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Λανθασμένες παράμετροι για μέθοδο ενημέρωσης αντιστοίχισης εικονιδίου \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Λανθασμένες παράμετροι για συντήρηση."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Λανθασμένες παράμετροι για ομάδα χρηστών."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Λανθασμένος γονέας για υπηρεσία \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Λανθασμένη γονική υπηρεσία."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Λανθασμένη περιοχή θυρών."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Λανθασμένο id διαμεσολαβητή."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Παρέχεται λανθασμένος τύπος πόρου για οθόνη συλλέκτη."
 
@@ -7392,64 +7650,68 @@ msgstr "Παρέχεται λανθασμένος τύπος πόρου για �
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Λανθασμένη ώρα λήξης υπηρεσίας."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Λανθασμένη ώρα έναρξης υπηρεσίας."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Λανθασμένος τύπος χρόνου υπηρεσίας."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Λανθασμένη σειρά ταξινόμησης για την υπηρεσία \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Λανθασμένη κατάσταση για την υπηρεσία \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Λανθασμένη κατάσταση."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7470,52 +7732,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Λανθασμένη χρονική περίοδος \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Λανθασμένο αναγνωριστικό εναύσματος για την υπηρεσία \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Λανθασμένη έκφραση εναύσματος"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Λανθασμένη έκφραση εναύσματος."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Λανθασμένη έκφραση εναύσματος. Ο ξενιστής \"%1$s\" δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτόν."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Λανθασμένη έκφραση εναύσματος. Ο ξενιστής \"%s\" δεν υπάρχει ή δέν έχετε πρόσβαση."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Λανθασμένη έκφραση εναύσματος. Στοιχεία έκφρασης εναύσματος δεν πρέπει να ανήκουν ταυτόχρονα σε ξενιστή και σχεδιότυπο."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Λανθασμένη λειτουργία εναύσματος \"%1$s\" παρέχεται στην έκφραση."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Λανθασμένος τύπος του asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Λανθασμένη ομάδα χρήστη."
 
@@ -7524,7 +7791,8 @@ msgstr "Λανθασμένη ομάδα χρήστη."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7544,7 +7812,7 @@ msgstr "Λανθασμένη τιμή \"%1$s\" για πεδίο ακεραίο�
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Λανθασμένη τιμή \"%1$s\" για πεδίο απρόσημου ακέραιου \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7554,43 +7822,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Λανθασμένη τιμή για setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Πληροφορία"
 
@@ -7599,15 +7873,15 @@ msgstr "Πληροφορία"
 msgid "Information"
 msgstr "Πληροφόρηση"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Εισαγωγή μακροεντολής"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Εγκατάσταση"
 
@@ -7615,31 +7889,32 @@ msgstr "Εγκατάσταση"
 msgid "Installer name"
 msgstr "Όνομα εγκαταστάτη"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Η διεπαφή είναι συνδεδεμένη στο συλλέκτη \"%1$s\" επί \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Η διεπαφή χρησιμοποιείται απο συλλέκτες που χρειάζονται αυτόν τον τύπο διεπαφής."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "Η διεπαφή με DNS \"%1$s\" δεν μπορεί να έχει κενή διεύθυνση IP."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "Η διεπαφή με IP \"%1$s\" δεν μπορεί να έχει κενό όνομα DNS ενώ έχει \"Use DNS\" ιδιότητα σε \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "Η διεπαφή με IP \"%1$s\" δεν μπορεί να έχει κενό όνομα DNS."
@@ -7659,7 +7934,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Εσωτερικό JSON-RPC σφάλμα."
 
@@ -7667,7 +7942,7 @@ msgstr "Εσωτερικό JSON-RPC σφάλμα."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Εσωτερικό σφάλμα."
 
@@ -7680,19 +7955,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Χρονικό διάστημα"
 
@@ -7702,112 +7977,114 @@ msgstr "Χρονικό διάστημα"
 msgid "Interval (in sec)"
 msgstr "Διάστημα (σε δευτ)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Άκυρο JSON. Παρουσιάστηκε σφάλμα στον εξυπηρετητή ενώ ανέλυε το κείμενο JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Άκυρο Αίτημα."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Άκυρο hostid για μακροεντολή \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Άκυρες παράμετροι μεθόδου."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Άκυρες παράμετροι."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Δόθηκε άκυρο όνομα προβολής \"%s\". Επιτρεπόμενοι χαρακτήρες: \"a-z\" and \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Απογραφή"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7816,7 +8093,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Πεδίο απογραφής"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Τρόπος απογραφής"
 
@@ -7824,12 +8101,12 @@ msgstr "Τρόπος απογραφής"
 msgid "Is online?"
 msgstr "Είναι συνδεδεμένος;"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Θέμα"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7837,70 +8114,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Ιταλικά (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Συλλέκτης"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Ο συλλέκτης \"%1$s\" υπάρχει ήδη σε \"%2$s\", κληρονομημένος απο άλλο σχεδιότυπο."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Ο συλλέκτης \"%1$s\" δεν συμπληρώνει ελλιπές πεδίο απογραφής ξενιστή \"%2$d\". Επιλογές: απο 0 (μήν συμπληρώνεις) έως %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Ο συλλέκτης \"%1$s\" δεν υπάρχει."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Συλλέκτης \"%1$s:%2$s\" έχει άκυρη θύρα: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Συλλέκτης προστέθηκε"
 
@@ -7908,17 +8186,17 @@ msgstr "Συλλέκτης προστέθηκε"
 msgid "Item count"
 msgstr "Πλήθος συλλεκτών"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Συλλέκτης διεγράφη"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7932,56 +8210,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Πρωτότυπος συλλέκτης"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Πρωτότυποι συλλέκτες"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7989,92 +8267,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Πρωτότυποι συλλέκτες του"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Συλλέκτης ενημερώθηκε"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Ο συλλέκτης χρησιμοποιεί διεπαφή ξενιστή από όχι γονικό ξενιστή."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Ο συλλέκτης χρησιμοποιεί λάθος τύπο διεπαφής."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Ο συλλέκτης δεν θα ανανεωθεί. Δώστε σωστό χρονικό διάστημα ενημέρωσης."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Ο συλλέκτης με κλειδί \"%1$s\" υπάρχει ήδη σε \"%2$s\" ως κανόνας εντοπισμού."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Ο συλλέκτης με κλειδί \"%1$s\" υπάρχει ήδη σε \"%2$s\" ως συλλέκτης δημιουργηθείς απο πρωτότυπο συλλέκτη."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Ο συλλέκτης με κλειδί \"%1$s\" υπάρχει ήδη σε \"%2$s\" ως πρωτότυπος συλλέκτης."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Ο συλλέκτης με κλειδί \"%1$s\" υπάρχει ήδη σε \"%2$s\" ως συλλέκτης."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Ο συλλέκτης με κλειδί \"%1$s\" υπάρχει ήδη σε \"%2$s\" ως άγνωστο στοιχείο συλλέκτη."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Ο συλλέκτης με κλειδί \"%1$s\" υπάρχει ήδη σε \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Συλλέκτες"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Συλλέκτες (ε/α/χυ)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Συλλέκτες αντιγράφηκαν"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Συλλέκτες διεγράφησαν"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Κατάλογος συλλεκτών"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Συλλέκτες ενημερώθηκαν"
 
@@ -8086,72 +8364,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "Αντιπρόσωπος JMX"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX διεπαφές"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Αποτυχία δημιουργίας λάθους JSON-rpc. Δεν υπάρχει τέτοιο λάθος \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "Δεν ορίσθηκε μέθοδος JSON-rpc."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "Οι παράμετροι JSON-rpc δεν είναι πίνακας."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "Η έκδοση JSON-rpc δεν προσδιορίζεται."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber αναγνωριστικό"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Ιαν"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Ιαπωνικά (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Ιούλ"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Ιούλιος"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Ιούν"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Ιούνιος"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8160,40 +8438,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr "Διατήρηση περιόδου απωλεσθέντων πόρων (σε ημέρες)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Κλειδί"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Το κλειδί \"%1$s\" δεν ταιριάζει <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Κλειδί συνθηματικής φράσης"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Λέξη-κλειδί"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Κιλο"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Κορεάτικα (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "ΤΕΛΕΥΤΑΙΑ ΔΕΔΟΜΕΝΑ"
 
@@ -8224,37 +8502,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "ΤΟΠΙΚΟ"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "ΑΠΩΛΕΣΘΕΝ"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Επιγραφή"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Θέση επιγραφής"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Τελευταίο"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8266,19 +8544,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "Τελευταίο %1$d θέμα"
 msgstr[1] "Τελευταία %1$d θέματα"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8298,28 +8576,28 @@ msgstr "Τελευταίες 365 ημέρες"
 msgid "Last 7 days"
 msgstr "Τελευταίες 7 ημέρες"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Τελευταία μεταβολή"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Τελευταία μεταβολή (φθίνουσα)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Τελευταίος έλεγχος"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Γράφημα τελευταίας ώρας"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Γράφημα τελευταίου μήνα"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Τελευταίο απο"
 
@@ -8327,66 +8605,67 @@ msgstr "Τελευταίο απο"
 msgid "Last seen (age)"
 msgstr "Τελευταία εμφάνιση (ηλικία)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Τελευταία τιμή"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Γράφημα τελευταίας εβδομάδος"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Τελευταία δεδομένα"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Τελευταία συμβάντα"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Λετονικά (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Αριστερά"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Υπόμνημα"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Γραμμή"
 
@@ -8394,39 +8673,29 @@ msgstr "Γραμμή"
 msgid "Link"
 msgstr "Σύνδεσμος"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Σύνδεση δεικτών"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Τό όνομα συνδέσμου πρέπει να είναι μοναδικό για χάρτη \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Ο σύνδεσμος πεδίου selementid1 δείχνει σε ανύπαρκτο selement ID χάρτη \"%1$s\" για χάρτη \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Ο σύνδεσμος πεδίου selementid2 δείχνει σε ανύπαρκτο selement ID χάρτη \"%1$s\" για χάρτη \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Ο σύνδεσμος πρέπει να έχει \"name\" και \"url\" πεδία για χάρτη \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Σύνδεση σχεδιότυπων"
 
@@ -8438,50 +8707,50 @@ msgstr "Σύνδεση με σχεδιότυπο"
 msgid "Link to templates"
 msgstr "Σύνδεση με σχεδιότυπα"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Σύνδεση με σχεδιότυπα"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Συνδεδεμένα σχεδιότυπα"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Συνδεδεμένο με"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Ο κατάλογος είναι άδειος"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Φορτώνω..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Τοπική ώρα"
 
@@ -8498,36 +8767,36 @@ msgid "Location longitude"
 msgstr "Γεωγραφικό μήκος τοποθεσίας"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Καταγραφή"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Μορφότυπος καταγραφής ώρας"
@@ -8536,12 +8805,12 @@ msgstr "Μορφότυπος καταγραφής ώρας"
 msgid "Log unmatched SNMP traps"
 msgstr "Καταγραφή αταίριαστων SNMP traps"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Συνδεδεμένος ως"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8552,12 +8821,12 @@ msgstr "Σύνδεση"
 msgid "Login as Guest"
 msgstr "Σύνδεση ως φιλοξενούμενος"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8566,8 +8835,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8588,22 +8858,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8615,7 +8881,7 @@ msgstr "MAC διεύθυνση A"
 msgid "MAC address B"
 msgstr "MAC διεύθυνση B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "ΣΥΝΤΗΡΗΣΗ"
 
@@ -8640,49 +8906,49 @@ msgstr "ΤΑ 100 ΠΙΟ ΠΟΛΥΑΣΧΟΛΑ ΕΝΑΥΣΜΑΤΑ"
 msgid "Macro"
 msgstr "Μακροεντολή"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Η μακροεντολή \"%1$s\" υπάρχει ήδη σε \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Η μακροεντολή \"%1$s\" υπάρχει ήδη."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "Η μακροεντολή \"%1$s\" δεν είναι μοναδική."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Το μέγεθος της μακροεντολής \"%1$s\" είναι πολύ μεγάλο, δεν πρέπει να υπερβαίνει τους 255 χαρακτήρες."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Τό όνομα της μακροεντολής \"%1$s\" είναι πολύ μεγάλο, δεν πρέπει να υπερβαίνει τους 64 χαρακτήρες."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Η μακροεντολή με hostmacroid \"%1$s\" δεν υπάρχει."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Μακροεντολές"
 
@@ -8690,31 +8956,36 @@ msgstr "Μακροεντολές"
 msgid "Macros updated"
 msgstr "Μακροεντολές ενημερώθηκαν"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Συντήρηση"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Η συντήρηση \"%s\" υπάρχει ήδη."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Συντήρηση προστέθηκε"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Συντήρηση διεγράφη"
 
@@ -8722,7 +8993,7 @@ msgstr "Συντήρηση διεγράφη"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Μήκος περιόδου συντήρησης"
 
@@ -8738,25 +9009,25 @@ msgstr "Κατάσταση συντήρησης"
 msgid "Maintenance type"
 msgstr "Τύπος συντήρησης"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Συντήρηση ενημερώθηκε"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Συντήρηση με συλλογή δεδομένων"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Συντήρηση χωρίς συλλογή δεδομένων"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Λείπει υποχρεωτική παράμετρος."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Χειροκίνητα"
 
@@ -8767,12 +9038,12 @@ msgstr "Χειροκίνητη αποσύνδεση"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Χάρτης"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8782,12 +9053,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr "Χάρτης \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Χάρτης \"%s\" δημιουργήθηκε."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Χάρτης \"%s\" ενημερώθηκε."
@@ -8804,12 +9075,12 @@ msgstr "Τύπος σήματος χάρτη"
 msgid "Map save operation failed."
 msgstr "Λειτουργία αποθήκευσης χάρτη απέτυχε."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Αντιστοιχισμένο σε"
 
@@ -8819,23 +9090,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Η αντιστοιχία \"%1$s\" δεν είναι μοναδική."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Αντιστοιχίσεις"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Χάρτες"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Μαρ"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Μάρτιος"
 
@@ -8843,28 +9114,34 @@ msgstr "Μάρτιος"
 msgid "Mark elements on trigger status change"
 msgstr "Σημειώστε τα στοιχεία σε μεταβολή κατάστασης εναύσματος"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Σημειώστε άλλα"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Σημάδι επιλέχθηκε"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Μαζική ενημέρωση"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Μαζική ενημέρωση στοιχείων"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Μέγιστο πλήθος στοιχείων πρός εμφάνιση ανά σελίδα"
@@ -8878,32 +9155,11 @@ msgstr "Μέγιστο πλήθος στοιχείων πρός εμφάνιση
 msgid "Max count of events per trigger to show"
 msgstr "Μέγιστο πλήθος συμβάντων πρός εμφάνιση ανά έναυσμα"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Μεγιστοποίηση"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8911,107 +9167,101 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Μάιος"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Μέσα ενημέρωσης"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Τύπος μέσων"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Ο τύπος μέσων \"%s\" υπάρχει ήδη."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Τύπος μέσων προστέθηκε"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Τύπος μέσων διεγράφη"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Απενεργοποιημένος τύπος μέσων"
 msgstr[1] "Απενεργοποιημένος τύπος μέσων"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Ενεργοποιημένος τύπος μέσων"
 msgstr[1] "Ενεργοποιημένος τύπος μέσων"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Τύπος μέσων ενημερώθηκε"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Τύποι μέσων ενημέρωσης"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Τύποι μέσων χρησιμοποιούνται στην ενέργεια \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Μέγα"
 
@@ -9026,14 +9276,14 @@ msgid "Memory limit: %s"
 msgstr "Όριο μνήμης: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Επιλογές"
 
@@ -9043,7 +9293,7 @@ msgstr "Επιλογές"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Μήνυμα"
 
@@ -9051,66 +9301,66 @@ msgstr "Μήνυμα"
 msgid "Message actions"
 msgstr "Μήνυμα ενεργειών"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Όριο κειμένου μηνύματος"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Χρονικό όριο μηνύματος"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Χρονικό όριο μηνύματος (δευτερόλεπτα)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Ανταλλαγή μηνυμάτων"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Μέθοδος δεν βρέθηκε."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Ενδιάμεσο"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Ελαχιστοποίηση"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9119,80 +9369,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Λεπτά"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Απόντες συλλέκτες για γράφημα \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9202,7 +9449,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Λείπει το κλειδί \"%1$s\" για τον ξενιστή \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9214,18 +9461,18 @@ msgstr "Τρόπος"
 msgid "Model"
 msgstr "Πρότυπο"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Δευ"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Εποπτευόμενο μέσω διαμεσολαβητή"
 
@@ -9233,33 +9480,33 @@ msgstr "Εποπτευόμενο μέσω διαμεσολαβητή"
 msgid "Monitored host"
 msgstr "Εποπτευόμενος ξενιστής"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Εποπτεία"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Μήνας"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Μηνιαίως"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9267,7 +9514,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Περισσότερο απο 10 λεπτά"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9276,19 +9523,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "Τα 100 πιο απασχολημένα εναύσματα"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Πολλαπλά ΠΡΟΒΛΗΜΑΤΙΚΑ συμβάντα"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Παραγωγή συμβάντων πολλαπλών ΠΡΟΒΛΗΜΑΤΩΝ"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Σίγαση"
 
@@ -9301,60 +9548,58 @@ msgstr "ΧΑΡΤΕΣ ΔΙΚΤΥΟΥ"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "ΧΩΡΙΣ ΔΕΔΟΜΕΝΑ"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM ταυτοποίηση"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9365,26 +9610,32 @@ msgstr "NTLM ταυτοποίηση"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Όνομα"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9403,12 +9654,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9416,7 +9667,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Χάρτης δικτύου προστέθηκε"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Χάρτης δικτύου διεγράφη"
 
@@ -9428,7 +9679,7 @@ msgstr "Χάρτης δικτύου ενημερώθηκε"
 msgid "Network maps"
 msgstr "Χάρτες δικτύου"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Ποτέ"
 
@@ -9436,24 +9687,24 @@ msgstr "Ποτέ"
 msgid "Never executed"
 msgstr "Ουδέποτε εκτελεστέο"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Νέο"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Νέα κατηγορία"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Νέα συνθήκη"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Νέο στοιχείο"
 
@@ -9464,16 +9715,16 @@ msgstr "Νέο στοιχείο"
 msgid "New flexible interval"
 msgstr "Νέο ευέλικτο χρονικό διάστημα"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Νέα ομάδα"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Νέα ομάδα ξενιστή"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Νέος συλλέκτης για το γράφημα"
 
@@ -9481,83 +9732,99 @@ msgstr "Νέος συλλέκτης για το γράφημα"
 msgid "New media"
 msgstr "Νέο μέσο ενημέρωσης"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Νέα κανονική έκφραση"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Νέος χρόνος υπηρεσίας"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Επόμενο"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Όχι"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9565,25 +9832,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Δεν παρέχεται URL για στοιχείο οθόνης."
 
@@ -9609,8 +9876,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Δεν βρέθηκαν ενέργειες."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9620,7 +9887,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Ουδεμία κατηγορία με αναγνωριστικό \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9628,30 +9895,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "Δεν καθορίστηκε τύπος ταυτοποίησης για εντολή εργασίας ενέργειας \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "Δεν καθορίστηκε όνομα χρήστη ταυτοποίησης για εντολή εργασίας ενέργειας \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Δεν καθορίστηκε εντολή για εργασία ενέργειας."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Δεν καθορίστηκε τύπος εντολής για εργασία ενέργειας."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Δέν ορίστηκαν συνθήκες."
 
@@ -9660,27 +9928,27 @@ msgstr "Δέν ορίστηκαν συνθήκες."
 msgid "No data collection"
 msgstr "Χωρίς συλλογή δεδομένων"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Όχι προεπιλεγμένη διεπαφή για \"%1$s\" τύπου σε \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Δεν ορίστηκαν εξαρτήσεις."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Χωρίς λεπτομέρειες"
 
@@ -9688,39 +9956,39 @@ msgstr "Χωρίς λεπτομέρειες"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Δεν δόθηκαν IDs κανόνα εντοπισμού."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Δεν βρέθηκαν λάθη."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Δεν υπάρχουν συμβάντα για αναγνώριση"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Δεν καθορίστηκε στόχος εκτέλεσης για εντολή εργασίας ενέργειας \"%s\"."
@@ -9735,7 +10003,7 @@ msgstr "Δεν αναφορτώθηκε αρχείο."
 msgid "No flexible intervals defined."
 msgstr "Δεν ορίσθηκαν εθέλικτα διαστήματα."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Δεν παρέχεται ID γραφήματος για στοιχείο οθόνης."
 
@@ -9744,7 +10012,11 @@ msgstr "Δεν παρέχεται ID γραφήματος για στοιχεί�
 msgid "No graph item with graphid \"%s\"."
 msgstr "Χωρίς στοιχείο γραφήματος με αναγνωριστικό \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9753,48 +10025,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Χωρίς ομάδες για ξενιστή \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Χωρίς ομάδες για ξενιστές."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Δεν δίνονται αναγνωριστικά ξενιστή."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Δεν δίνεται ξενιστής για μακροεντολή \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Δεν παρέχεται ID ομάδος ξενιστή για στοιχείο οθόνης."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9807,17 +10080,22 @@ msgstr "Χωρίς ομάδες ξενιστών με groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Χωρίς ξενιστή με hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Όχι εικονίδιο για στοιχείο χάρτη \"%s\"."
@@ -9836,33 +10114,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Δεν βρέθηκε διεπαφή"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Δεν βρέθηκε διεπαφή."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Χωρίς διεπαφές για τον ξενιστή \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Δεν παρέχεται ID συλλέκτη για στοιχείο οθόνης."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9881,7 +10166,7 @@ msgid "No items defined."
 msgstr "Δεν ορίσθηκαν συλλέκτες."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9897,7 +10182,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Δεν παρέχεται ID χάρτη για στοιχείο οθόνης."
 
@@ -9906,15 +10191,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9926,133 +10211,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Όχι δικαιώματα για συλλέκτη \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Χωρίς δικαιώματα για πρόσβαση συστήματος."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Χωρίς δικαιώματα σε αντικείμενο που αναφέρεται ή δεν υπάρχει!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Δεν καθορίστηκε αρχείο ιδιωτικού κλειδιού για εντολή εργασίας ενέργειας \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Χωρίς διαμεσολαβητή"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Δεν καθορίστηκε αρχείο δημοσίου κλειδιού για εντολή εργασίας ενέργειας \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Χωρίς παραλήπτες για μήνυμα εργασίας ενέργειας."
 
@@ -10060,7 +10390,7 @@ msgstr "Χωρίς παραλήπτες για μήνυμα εργασίας ε�
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Δεν παρέχεται ID οθόνης για στοιχείο οθόνης."
 
@@ -10068,82 +10398,83 @@ msgstr "Δεν παρέχεται ID οθόνης για στοιχείο οθό
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Δεν καθορίσθηκε δέσμη ενεργειών για εντολή εργασίας ενέργειας."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Δεν επιλέχθηκε στόχος"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Δεν επιλέχθηκε στόχος."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Δεν ορίσθηκαν χρόνοι. Εργασία 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Χωρίς έναυσμα"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Χωρίς έναυσμα με triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Δεν ορίσθηκαν εναύσματα."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10152,57 +10483,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Ουδέν"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Κανονικό"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Κανονική προβολή"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Μη αναγνώριση"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Μη Σχεδιότυποι συλλέκτες"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Δεν επιτρέπεται ορισμός συνθηματικού για χρήστη \"guest\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Μη διαθέσιμο"
 
@@ -10211,7 +10543,7 @@ msgstr "Μη διαθέσιμο"
 msgid "Not classified"
 msgstr "Αταξινόμητο"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Ασύνδετο"
 
@@ -10224,8 +10556,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Μη υποστηριζόμενο"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Σημείωση"
@@ -10238,7 +10570,7 @@ msgstr "Σημειώσεις"
 msgid "Nothing"
 msgstr "Τίποτα"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Καμμία ενέργεια."
 
@@ -10246,87 +10578,87 @@ msgstr "Καμμία ενέργεια."
 msgid "Notification report"
 msgstr "Αναφορά ειδοποίησης"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Νοε"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Τώρα"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10334,88 +10666,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "Αριθμός αλλαγών κατάστασης"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Αριθμός βημάτων"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Αριθμός χρηστών (σε σύνδεση)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Αριθμητικό (κινητή υποδιαστολή)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Αριθμητικό (ακέραιος 64-δύφιος)"
 
@@ -10430,16 +10762,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10455,8 +10789,7 @@ msgstr "OOB δρομολογητής"
 msgid "OOB subnet mask"
 msgstr "OOB μάσκα υποδικτύου"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "Ή"
 
@@ -10476,11 +10809,12 @@ msgstr "ΛΣ (Σύντομο)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "ΑΛΛΕΣ ΠΑΡΑΜΕΤΡΕΣ ΡΥΘΜΙΣΗΣ"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "ΕΠΙΣΚΟΠΗΣΗ"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Οκτ"
 
@@ -10488,25 +10822,25 @@ msgstr "Οκτ"
 msgid "Octal"
 msgstr "Οκταδικό"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Οκτώβριος"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Εκτός"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Επί"
 
@@ -10514,111 +10848,114 @@ msgstr "Επί"
 msgid "On status change triggers blink for"
 msgstr "Σε αλλαγή κατάστασης τα εναύσματα αναβοσβήνουν για"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Άπαξ"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Μία φορά μόνο"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Μία φορά μή διαθέσιμο"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν γενικές μακροεντολές."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν ομάδες ξενιστών."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν αντιστοίχιση εικονιδίων."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν τύπους μέσων ενημέρωσης."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Μόνο Υπερ Διαχειριστές διαγράφουν γενικές μακροεντολές."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Μόνο Υπερ Διαχειριστές διαγράφουν τύπους μέσων ενημέρωσης."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Μόνο Υπερ Διαχειριστές διαγράφουν ομάδες χρηστών."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Μόνο Υπερ Διαχειριστές επεξεργάζονται τύπους μέσων ενημέρωσης."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Μόνο Υπερ Διαχειριστές ενημερώνουν γενικές μακροεντολές."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Μόνο Υπερ Διαχειριστές ενημερώνουν αντιστοιχίσεις εικονιδίων."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Επιτρέπονται μόνο χαρακτήρες."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Απαριθμώνται μόνο συλλέκτες εκχωρημένοι σε ενεργούς ξενιστές"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Μόνο ένας έλεγχος μπορεί να είναι μοναδικός."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Απαριθμώνται μόνο εναύσματα εκχωρημένα σε ενεργούς ξενιστές και εξαρτώμενα απο ενεργούς συλλέκτες"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Η λειτουργία \"%s\" υπάρχει ήδη."
@@ -10627,28 +10964,28 @@ msgstr "Η λειτουργία \"%s\" υπάρχει ήδη."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Η λειτουργία δεν εκτελείται λόγω μη εξουσιοδοτημένης αίτησης."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Συνθήκη λειτουργίας"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Λεπτομέρειες λειτουργίας"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Η λειτουργία δεν έχει ομάδα να λειτουργήσει."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Η λειτουργία δεν έχει σχεδιότυπο να λειτουργήσει."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Τύπος λειτουργίας"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Λειτουργίες"
@@ -10657,25 +10994,27 @@ msgstr "Λειτουργίες"
 msgid "Operator"
 msgstr "Χειριστής"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10705,24 +11044,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Αρχικό"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Αρχικό κυανό"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Άλλο"
 
@@ -10730,19 +11069,19 @@ msgstr "Άλλο"
 msgid "Other configuration parameters"
 msgstr "Άλλες παράμετροι διαμόρφωσης"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Άλλες ομάδες"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Άλλοι ξενιστές"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10752,21 +11091,21 @@ msgstr "Άλλοι ξενιστές | Ομάδα"
 msgid "Other parameters"
 msgstr "Άλλες παράμετροι"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Άλλο | ομάδα"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Άλλα"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10779,14 +11118,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Επισκόπηση"
 
@@ -10794,7 +11130,7 @@ msgstr "Επισκόπηση"
 msgid "Overview by proxy"
 msgstr "Επισκόπηση με διαμεσολαβητή"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10803,147 +11139,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr "ΠΡΟΣΩΠΙΚΟΣ ΠΙΝΑΚΑΣ ΕΛΕΓΧΟΥ"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Υποστήριξη βάσεων δεδομένων PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "Ζώνη ώρας PHP"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Έκδοση PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10952,32 +11296,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "ΠΡΟΒΛΗΜΑ"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "Η σελίδα έλαβε λάθος δεδομένα"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Χρωματολόγιο"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Χρωματολόγιο #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Παράμετρος"
 
@@ -10986,7 +11332,7 @@ msgstr "Παράμετρος"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11006,33 +11352,33 @@ msgstr "Γονικά εναύσματα"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Σφάλμα ανάλυσης SQL [%1$s] in [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Σφάλμα ανάλυσης"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Παθητικός"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11042,20 +11388,21 @@ msgstr "Παθητικός"
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Συνθηματικό (ξανά)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Απαιτείται συνθηματικό για τύπο μέσων ενημέρωσης."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Το συνθηματικό δεν μπορεί να είναι κενό"
 
@@ -11064,21 +11411,21 @@ msgstr "Το συνθηματικό δεν μπορεί να είναι κενό
 msgid "Peak memory usage: %s"
 msgstr "Κορυφή χρήσης μνήμης: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Εκατοστιαία γραμμή (αριστερά)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Εκατοστιαία γραμμή (δεξιά)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11086,12 +11433,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Περίοδος"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Τύπος περιόδου"
@@ -11101,24 +11448,24 @@ msgstr "Τύπος περιόδου"
 msgid "Periods"
 msgstr "Περίοδοι"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Τα δικαιώματα μπορούν να εκχωρηθούν μόνο σε ομάδες χρηστών."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Πετα"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Πίτα"
 
@@ -11130,55 +11477,56 @@ msgstr "Αλγόριθμος τοποθέτησης"
 msgid "Plain text"
 msgstr "Απλό κείμενο"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Παίξε"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Παίξε ήχο"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Διορθώστε όλα τα θέματα και πατήστε \"Retry\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Εισάγετε κείμενο επιβεβαίωσης."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Επιλέξτε δύο στοιχεία"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Πολωνικά (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Συμπληρώνει πεδίο απογραφής ξενιστή"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Θύρα"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Η θύρα δεν μπορεί να είναι κενή για διεπαφή ξενιστή."
 
@@ -11186,51 +11534,51 @@ msgstr "Η θύρα δεν μπορεί να είναι κενή για διεπ
 msgid "Port range"
 msgstr "Περιοχή θύρας"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Πορτογαλικά (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Θέση"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Post"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Προεπισκόπηση"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11280,30 +11628,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Αρχείο ιδιωτικού κλειδιού"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Επίπεδο δικαιωμάτων"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Πρόβλημα"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Πρόβλημα εμφάνισης"
 
@@ -11315,16 +11664,16 @@ msgstr "Πρόβλημα σε"
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Πρόβλημα, άν όλα τα θυγατρικά έχουν προβλήματα"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Πρόβλημα, άν τουλάχιστον ένα θυγατρικό έχει πρόβλημα"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Προβλήματα"
 
@@ -11332,75 +11681,71 @@ msgstr "Προβλήματα"
 msgid "Profile"
 msgstr "Προφίλ"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Πρωτότυπα"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Διαμεσολαβητές"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Διαμεσολαβητής"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Διαμεσολαβητής \"%1$s\" για ξενιστή \"%2$s\" δεν υπάρχει."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Ο διαμεσολαβητής \"%s\" υπάρχει ήδη."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Διαμεσολαβητής προστέθηκε"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Διαμεσολαβητής διεγράφη"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Ξενιστές διαμεσολάβησης"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Αποτυχία δημιουργίας διεπαφής διαμεσολαβητή."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Αποτυχία ενημέρωσης διεπαφής διαμεσολαβητή."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Τρόπος διαμεσολάβησης"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Όνομα Διαμεσολαβητή"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Διαμεσολαβητής ενημερώθηκε"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Δημόσιο κλειδί"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11411,7 +11756,7 @@ msgstr "Αρχείο δημόσιου κλειδιού"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "ΟΥΡΑ ΑΠΟ ΣΥΛΛΕΚΤΕΣ ΠΡΟΣ ΕΝΗΜΕΡΩΣΗ"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Ουρά"
 
@@ -11419,18 +11764,18 @@ msgstr "Ουρά"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Ανάγνωση"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Μόνο ανάγνωση"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Ανάγνωση-εγγραφή"
 
@@ -11442,7 +11787,7 @@ msgstr "Αιτία"
 msgid "Received value"
 msgstr "Ληφθείσα τιμή"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11450,11 +11795,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Παραλήπτης"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11465,28 +11810,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "Παραλήπτης(ες)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Ανάκτηση"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Μήνυμα ανάκτησης"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Ανάκτηση θέματος"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Ανανέωση (σε δευτερόλεπτα)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Πολλαπλασιαστής χρόνου ανανέωσης"
 
@@ -11504,48 +11849,52 @@ msgstr "Ανανέωση ανυποστήρικτων συλλεκτών (σε �
 msgid "Regular expression"
 msgstr "Κανονική έκφραση"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "Κανονική έκφραση \"%s\" υπάρχει ήδη."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Κανονική έκφραση προστέθηκε"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 #, fuzzy
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Κανονική έκφραση διεγράφη"
 msgstr[1] "Κανονική έκφραση διεγράφη"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Κανονική έκφραση δεν υπάρχει."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Κανονική έκφραση ενημερώθηκε"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11562,26 +11911,28 @@ msgstr "Απομακρυσμένη εντολή"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11592,21 +11943,19 @@ msgstr "Απομακρυσμένη εντολή"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11614,11 +11963,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Αφαίρεση στοιχείου"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Αφαίρεση από"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Αφαίρεση από αγαπημένα"
@@ -11627,7 +11976,7 @@ msgstr "Αφαίρεση από αγαπημένα"
 msgid "Remove from host group"
 msgstr "Αφαίρεση από ομάδα ξενιστών"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Αφαίρεση από ομάδες ξενιστών"
 
@@ -11639,28 +11988,28 @@ msgstr "Αφαίρεση ξενιστή"
 msgid "Remove link"
 msgstr "Αφαίρεση συνδέσμου"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Αφαίρεση επιλεγμένου"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Αντικατάσταση"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Αντικατάσταση εξαρτήσεων"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Αντικατάσταση ομάδων ξενιστών"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Αναφορά"
 
@@ -11668,35 +12017,36 @@ msgstr "Αναφορά"
 msgid "Report 1"
 msgstr "Αναφορά 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Αναφορά 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Αναφορά 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Αναφορές"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Απαιτούμενο"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Απαιτούμενο πεδίο \"expression\" λείπει στην αντιστοίχιση εικονιδίου."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Απαιτούμενο πεδίο \"iconid\" λείπει στην αντιστοίχιση εικονιδίου."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Απαιτούμενο πεδίο \"inventory_link\" λείπει στην αντιστοίχιση εικονιδίου."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Απαιτούμενα δικαιώματα ξενιστή"
 
@@ -11704,29 +12054,31 @@ msgstr "Απαιτούμενα δικαιώματα ξενιστή"
 msgid "Required performance (vps)"
 msgstr "Απαιτούμενη απόδοση (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Απαιτούμενη απόδοση εξυπηρετητή, νέες τιμές ανά δευτερόλεπτο"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Απαιτούμενοι κωδικοί κατάστασης"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Απαιτούμενη στοιχειοσειρά"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Επαναφορά"
 
@@ -11745,9 +12097,9 @@ msgstr "Επαναφορά όλων των ονομάτων και χρωμάτ�
 msgid "Reset confirmation"
 msgstr "Επιβεβαίωση επαναφοράς"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11760,7 +12112,7 @@ msgstr "Επιλυμένο"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Πόρος"
@@ -11775,15 +12127,15 @@ msgstr "Χρόνος απόκρισης"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Αποτέλεσμα"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Αποτέλεσμα ΨΕΥΔΕΣ"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Αποτέλεσμα ΑΛΗΘΕΣ"
 
@@ -11796,7 +12148,8 @@ msgstr "Αποτέλεσμα από \"%s\""
 msgid "Result type"
 msgstr "Τύπος αποτελέσματος"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11804,60 +12157,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Προσπάθειες έμειναν"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Επανάληψη"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Δεξιά"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Ανάπτυξη γραμμής"
 
@@ -11865,11 +12227,11 @@ msgstr "Ανάπτυξη γραμμής"
 msgid "Rows"
 msgstr "Γραμμές"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Γραμμές ανά σελίδα"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Κανόνες"
 
@@ -11914,20 +12276,20 @@ msgid "Run remote commands on hosts"
 msgstr "Εκτέλεση απομακρυσμένων εντολών στους ξενιστές"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Ρωσικά (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11943,7 +12305,7 @@ msgstr "ΟΘΟΝΕΣ"
 msgid "SEARCH"
 msgstr "ΑΝΑΖΗΤΗΣΗ"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "ΕΞΥΠΗΡΕΤΗΤΗΣ"
 
@@ -11958,13 +12320,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "ΠΡΟΒΟΛΗ ΔΙΑΦΑΝΕΙΩΝ"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11973,17 +12335,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP ηλεκτρονικό ταχυδρομείο"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "Εξυπηρετητής SMTP"
@@ -11999,7 +12361,7 @@ msgstr "SNMP Κλειδί"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12011,9 +12373,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP κοινότητα"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "Διεπαφές SNMP"
@@ -12022,7 +12384,7 @@ msgstr "Διεπαφές SNMP"
 msgid "SNMP trap"
 msgstr "SNMP παγίδα"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "SNMP άκυρο κλειδί παγίδας."
 
@@ -12046,7 +12408,7 @@ msgstr "Αντιπρόσωπος SNMPv3"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Απαρίθμηση SQL: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12064,7 +12426,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Αποτυχία εκτέλεσης δήλωσης SQL \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12073,15 +12435,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "Αντιπρόσωπος SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "ΚΑΤΑΣΤΑΣΗ ΕΝΤΟΠΙΣΜΟΥ"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "ΚΑΤΑΣΤΑΣΗ ΕΝΑΥΣΜΑΤΩΝ"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "ΚΑΤΑΣΤΑΣΗ ΕΠΟΠΤΕΙΑΣ ΙΣΤΟΥ"
 
@@ -12089,92 +12471,92 @@ msgstr "ΚΑΤΑΣΤΑΣΗ ΕΠΟΠΤΕΙΑΣ ΙΣΤΟΥ"
 msgid "STATUS OF ZABBIX"
 msgstr "ΚΑΤΑΣΤΑΣΗ ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Σάβ"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Αποθήκευση και επιστροφή"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Κλίμακα"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Σενάριο"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Το Σενάριο προστέθηκε"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Το Σενάριο ενημερώθηκε"
 
@@ -12186,7 +12568,7 @@ msgstr "Σενάρια"
 msgid "Schedule"
 msgstr "Χρονοδιάγραμμα"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12197,126 +12579,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Οθόνη"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Οθόνη \"%1$s\" προστέθηκε."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "Η οθόνη \"%1$s\" υπάρχει ήδη."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Οθόνη \"%1$s\" ενημερώθηκε."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Οθόνη προστέθηκε"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Διαμόρφωση κυττάρου οθόνης"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Οθόνη διεγράφη"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Η οθόνη πρέπει να περιέχει τουλάχιστον μία γραμμή και στήλη."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Οθόνη ενημερώθηκε"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Οθόνες"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Δέσμη ενεργειών"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Δέσμη ενεργειών προστέθηκε"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Δέσμη ενεργειών διεγράφη"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Όνομα δέσμης ενεργειών"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12325,17 +12706,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "Προφίλ δέσμης ενεργειών"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Δέσμη ενεργειών ενημερώθηκε"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Δέσμες ενεργειών"
 
@@ -12356,7 +12737,7 @@ msgstr "Το σχέδιο αναζήτησης είναι άδειο"
 msgid "Search/Filter elements limit"
 msgstr "Όριο στοιχείων Αναζήτησης/Φίλτρου"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Δεύτερο"
 
@@ -12388,7 +12769,7 @@ msgstr "Τηλέφωνο B Δεύτερης Επαφής"
 msgid "Secondary POC screen name"
 msgstr "Καλλιτεχνικό όνομα Δεύτερης Επαφής"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Δευτερόλεπτα"
 
@@ -12407,69 +12788,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Επιλέξτε"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Επιλέξτε πρωτότυπο"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Επιλέξτε γραμμές με τιμή, όπως"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Επιλεγμένο"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Επιλεγμένες ενέργειες διεγράφησαν"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Επιλεγμένα στοιχεία"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Επιλεγμένες ομάδες"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Επιλεγμένοι ξενιστές"
 
@@ -12485,7 +12873,7 @@ msgstr "Αποστολή μηνύματος σε ομάδες χρηστών"
 msgid "Send message to users"
 msgstr "Αποστολή μηνύματος σε χρήστες"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Αποστολή μόνο σε"
 
@@ -12493,11 +12881,11 @@ msgstr "Αποστολή μόνο σε"
 msgid "Send to"
 msgstr "Αποστολή σε"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Αποστολή σε Ομάδες χρηστών"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Αποστολή σε Χρήστες"
 
@@ -12506,17 +12894,17 @@ msgstr "Αποστολή σε Χρήστες"
 msgid "Sent"
 msgstr "Εστάλη"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Σεπ"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Χωριστό"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Σεπτέμβριος"
 
@@ -12528,7 +12916,7 @@ msgstr "Σειριακός αριθμός Α"
 msgid "Serial number B"
 msgstr "Σειριακός αριθμός Β"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Εξυπηρετητής"
@@ -12537,44 +12925,44 @@ msgstr "Εξυπηρετητής"
 msgid "Server info"
 msgstr "Πληροφορίες εξυπηρετητή"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Ώρα εξυπηρετητή"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Υπηρεσία"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Η υπηρεσία \"%1$s\" δεν διαγράφεται, επειδή εξαρτάται από άλλη υπηρεσία."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Η υπηρεσία \"%1$s\" δεν μπορεί να αυτοεξαρτάται."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Η υπηρεσία \"%1$s\" δεν μπορεί να συνδέεται με έναυσμα και να έχει θυγατρικό την ίδια στιγμή."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Η υπηρεσία \"%1$s\" είναι ήδη διασυνδεδεμένη σε διαφορετική υπηρεσία."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Η υπηρεσία δεν μπορεί να είναι γονική και θυγατρική την ίδια στιγμή."
 
@@ -12590,11 +12978,11 @@ msgstr "Υπηρεσία διεγράφη"
 msgid "Service port"
 msgstr "Θύρα υπηρεσίας"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "Χρόνος έναρξης υπηρεσίας πρέπει να είναι μικρότερος του χρόνου λήξης."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Χρόνοι υπηρεσίας"
 
@@ -12606,49 +12994,53 @@ msgstr "Τύπος υπηρεσίας"
 msgid "Service updated"
 msgstr "Υπηρεσία ενημερώθηκε"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Υπηρεσίες"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Τερματισμός συνεδρίας. Επανασυνδεθείτε."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Σοβαρότητα"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Σοβαρότητα (φθίνουσα)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Το Όνομα σοβαρότητας δεν μπορεί να είναι κενό."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Εμφάνιση"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Εμφάνιση όλων"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Εμφάνιση λεπτομερειών"
 
@@ -12678,35 +13070,36 @@ msgstr "Εμφάνιση συμβάντων όχι παλαιότερων απο
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Εμφάνιση συμβάντων όχι παλαιότερων απο (σε ημέρες) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Εμφάνιση ξενιστών σε συντήρηση"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Εμφάνιση συλλεκτών με όνομα ώς"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Εμφάνιση συλλεκτών χωρίς δεδομένα"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Εμφάνιση υπομνήματος"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Εμφάνιση γραμμών"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Εμφάνιση επιλεγμένου"
 
@@ -12714,19 +13107,22 @@ msgstr "Εμφάνιση επιλεγμένου"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Εμφάνιση κειμένου ως HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Εμφάνιση εναυσμάτων"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Εμφάνιση μη αναγνωρισμένων"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Εμφάνιση τιμής"
@@ -12735,11 +13131,11 @@ msgstr "Εμφάνιση τιμής"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Εμφάνιση χρόνου εργασίας"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Ορατό"
 
@@ -12759,6 +13155,10 @@ msgstr "Απλός έλεγχος"
 msgid "Simple graph"
 msgstr "Απλό γράφημα"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Ταχυδρομικός κώδικας"
@@ -12796,7 +13196,7 @@ msgid "Site state / province"
 msgstr "Κράτος / Επαρχία"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12814,16 +13214,16 @@ msgstr "Παράλειψη αντιγραφής γραφήματος \"%1$s\" σ
 msgid "Slide"
 msgstr "Διαφάνεια"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Προβολή διαφάνειας"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Η προβολή διαφάνειας \"%s\" υπάρχει ήδη."
@@ -12832,11 +13232,11 @@ msgstr "Η προβολή διαφάνειας \"%s\" υπάρχει ήδη."
 msgid "Slide show added"
 msgstr "Προβολή διαφάνειας προστέθηκε"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Προβολή διαφάνειας διεγράφη"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Η προβολή διαφάνειας πρέπει να περιέχει διαφάνειες."
 
@@ -12844,10 +13244,10 @@ msgstr "Η προβολή διαφάνειας πρέπει να περιέχε�
 msgid "Slide show updated"
 msgstr "Προβολή διαφάνειας ενημερώθηκε"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Προβολές διαφάνειας"
 
@@ -12855,15 +13255,15 @@ msgstr "Προβολές διαφάνειας"
 msgid "Slides"
 msgstr "Διαφάνειες"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Σλοβακικά (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Αναβολή"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Μαλακό"
 
@@ -12896,28 +13296,28 @@ msgid "Software application E"
 msgstr "Λογισμική εφαρμογή Ε"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Ταξινόμηση με"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Σειρά ταξινόμησης (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Ταξινόμηση εναυσμάτων με"
 
@@ -12930,11 +13330,11 @@ msgstr "Ταξινόμηση με πεδίο \"%1$s\" δεν επιτρέπετ�
 msgid "Source"
 msgstr "Προέλευση"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Ισπανικά (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Η καθορισμένη δέσμη ενεργειών δεν υπάρχει ή δεν έχετε δικαιώματα σε αυτή για εντολή εργασίας ενέργειας."
 
@@ -12942,63 +13342,63 @@ msgstr "Η καθορισμένη δέσμη ενεργειών δεν υπάρ�
 msgid "Speed"
 msgstr "Ταχύτητα"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Στοιβαγμένο"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Τυπικοί συλλέκτες"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Κατάσταση"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -13011,7 +13411,7 @@ msgstr "Υπολογισμός κατάστασης"
 msgid "Status calculation algorithm"
 msgstr "Αλγόριθμος υπολογισμού κατάστασης"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Κωδικοί κατάστασης"
 
@@ -13020,7 +13420,7 @@ msgid "Status of Web monitoring"
 msgstr "Κατάσταση Εποπτείας Ιστού"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Κατάσταση του Zabbix"
 
@@ -13037,40 +13437,40 @@ msgid "Status only"
 msgstr "Κατάσταση μόνο"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Βήμα"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Βήμα \"%1$s\" [%2$s of %3$s] απέτυχε: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Βήμα σεναρίου"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Βήματα"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Σταματώ"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Αποθηκευμένη τιμή"
@@ -13079,11 +13479,11 @@ msgstr "Αποθηκευμένη τιμή"
 msgid "Straight"
 msgstr "Ευθεία"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Τρόπος"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Υπο-φίλτρο [επηρεάζει μόνο φιλτραρισμένα δεδομένα!]"
 
@@ -13091,11 +13491,11 @@ msgstr "Υπο-φίλτρο [επηρεάζει μόνο φιλτραρισμέ�
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Θέμα"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Υποχάρτης"
 
@@ -13104,32 +13504,32 @@ msgid "Success Audit"
 msgstr "Επιτυχής επιθεώρηση"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Κυρ"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -13137,27 +13537,27 @@ msgstr "Κυριακή"
 msgid "Support"
 msgstr "Υποστήριξη"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Επώνυμο"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Σουηδικά (sv_SE)"
 
@@ -13165,16 +13565,16 @@ msgstr "Σουηδικά (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Προκαθορισμένο σύστημα"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Σφάλμα συστήματος."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13183,21 +13583,21 @@ msgid "System status"
 msgstr "Κατάσταση συστήματος"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13216,11 +13616,11 @@ msgid "TOTAL"
 msgstr "ΣΥΝΟΛΟ"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "ΣΧΟΛΙΑ ΕΝΑΥΣΜΑΤΟΣ"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "ΑΛΗΘΕΣ"
 
@@ -13238,14 +13638,14 @@ msgstr "Ο πίνακας \"%1$s\" δεν έχει πεδίο με όνομα \"
 msgid "Tag"
 msgstr "Ετικέτα"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Στόχος"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Κατάλογος στόχων"
 
@@ -13254,130 +13654,133 @@ msgid "Target type"
 msgstr "Τύπος στόχου"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Σχεδιότυπο"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Το σχεδιότυπο \"%1$s\" υπάρχει ήδη."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Σχεδιότυπο \"%1$s\" για ξενιστή \"%2$s\" δεν υπάρχει."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Σχεδιότυπο προστέθηκε"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Σχεδιότυπο διεγράφη"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Ομάδα σχεδιότυπων"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Συσχέτιση σχεδιότυπου"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Κατάλογος σχεδιότυπων"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Όνομα σχεδιότυπου"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Σχεδιότυπα οθονών"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Έναυσμα σχεδιότυπου"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Το σχεδιότυπο ενημερώθηκε"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Το σχεδιότυπο με ίδιο όνομα \"%s\" υπάρχει ήδη."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Σχεδιότυπο με ίδιο ορατό όνομα \"%s\" υπάρχει ήδη."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Συλλέκτες σχεδιότυπου"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Σχεδιότυπα"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Σχεδιότυπα \"%1$s\" αποσυνδεδεμένα απο ξενιστές \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Τέρα"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Δοκιμή"
 
@@ -13385,11 +13788,11 @@ msgstr "Δοκιμή"
 msgid "Test authentication"
 msgstr "Δοκιμή ταυτοποίησης"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Δοκιμή επιβεβαίωσης"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Δοκιμή δεδομένων"
 
@@ -13403,22 +13806,22 @@ msgid "Test string"
 msgstr "Στοιχειοσειρά δοκιμής"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Κείμενο"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13426,7 +13829,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13441,26 +13844,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Ο συλλέκτης δεν εντοπίζεται πιά και θα διαγραφεί σε %1$s (επί %2$s σε %3$s)."
@@ -13469,19 +13872,19 @@ msgstr "Ο συλλέκτης δεν εντοπίζεται πιά και θα �
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Η ληφθείσα JSON είναι άκυρη αίτηση JSON-RPC."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "Η ζητούμενη απομακρυσμένη-διαδικασία δεν υπάρχει / δεν είναι διαθέσιμη"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Θέμα"
 
@@ -13492,11 +13895,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "Υπάρχει \"%1$d\" ομάδα με Εσωτερική GUI πρόσβαση."
 msgstr[1] "Υπάρχουν \"%1$d\" ομάδες με Εσωτερική GUI πρόσβαση."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Τρίτος"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Το πεδίο αυτό συμπληρώνεται αυτόματα από το συλλέκτη \"%s\"."
@@ -13505,11 +13908,11 @@ msgstr "Το πεδίο αυτό συμπληρώνεται αυτόματα α�
 msgid "This month"
 msgstr "Αυτό το μήνα"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Αυτή η στήλη-οθόνης δεν είναι κενή. Να διαγραφεί;"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Αυτή η γραμμή-οθόνης δεν είναι κενή. Να διαγραφεί;"
 
@@ -13521,27 +13924,27 @@ msgstr "Αυτή την εβδομάδα"
 msgid "This year"
 msgstr "Αυτό το έτος"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Πέμ"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Έως"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13550,28 +13953,28 @@ msgstr "Έως"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Χρόνος"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13579,54 +13982,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Χρονική περίοδος"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Χρονική μετατόπιση"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Τύπος χρόνου"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Λήξη χρόνου"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Σήμανση χρόνου"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Τίτλος"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Σε"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Για να ορίσετε διεπαφή ξενιστή επιλέξτε απλό τύπο στοιχείου για όλα τα στοιχεία"
 
@@ -13634,17 +14037,18 @@ msgstr "Για να ορίσετε διεπαφή ξενιστή επιλέξτ�
 msgid "Today"
 msgstr "Σήμερα"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Κορυφή"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Σύνολο"
 
@@ -13662,7 +14066,7 @@ msgstr "Συνολικός χρόνος: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Η συναλλαγή δεν έκλεισε. Ματαίωση..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Σφάλμα μεταφοράς."
 
@@ -13679,91 +14083,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Τάσεις"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Έναυσμα"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Το έναυσμα \"%1$s\" υπάρχει ήδη σε \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Το έναυσμα \"%s\" ανήκει σε σχεδιότυπο με διαφορετικούς συνδέσμους."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Έναυσμα προστέθηκε"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Σχόλια εναύσματος"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Έναυσμα διεγράφη"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Εμφάνιση επιλογών εναύσματος"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13778,11 +14182,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Συνθήκη έκφρασης εναύσματος"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "Η έκφραση εναύσματος πρέπει να περιέχει τουλάχιστον μία αναφορά ξενιστή:κλειδί."
 
@@ -13790,7 +14195,7 @@ msgstr "Η έκφραση εναύσματος πρέπει να περιέχε�
 msgid "Trigger form"
 msgstr "Μορφή εναύσματος"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "Το έναυσμα έχει συλλέκτες απο σχεδιότυπο \"%1$s\" που δεν συνδέεται σε ξενιστή."
@@ -13803,12 +14208,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "Το έναυσμα στο σχεδιότυπο \"%1$s\" έχει εξάρτηση με το έναυσμα στο σχεδιότυπο \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Έναυσμα μόλις προστέθηκε. Δεν έχει ενημέρωση κατάστασης ακόμη."
 
@@ -13820,52 +14225,52 @@ msgstr "Τύπος ετικέτας εναύσματος"
 msgid "Trigger name"
 msgstr "Όνομα εναύσματος"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Πρωτότυπο έναυσμα"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Πρωτότυπα εναύσματα"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13873,23 +14278,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Πρωτότυπα εναύσματο από"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Βαρύτητες εναυσμάτων"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Σοβαρότητα εναύσματος"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Έναυσμα ενημερώθηκε"
 
@@ -13897,40 +14310,41 @@ msgstr "Έναυσμα ενημερώθηκε"
 msgid "Trigger value"
 msgstr "Τιμή εναύσματος"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Εναύσματα"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Εναύσματα διεγράφησαν"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Πληροφορίες εναυσμάτων"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Μαζική ενημέρωση εναυσμάτων"
 
@@ -13938,78 +14352,78 @@ msgstr "Μαζική ενημέρωση εναυσμάτων"
 msgid "Triggers overview"
 msgstr "Επισκόπηση εναυσμάτων"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Κατάσταση εναυσμάτων"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Κορυφαία 100 εναύσματα"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Εναύσματα με σοβαρότητα"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Κατατετμημένο"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Τρι"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Δύο στοιχεία θα πρέπει να επιλεχθούν"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Δύο συλλέκτες (\"%1$s\" και \"%2$s\") δεν μπορούν να συμπληρώσουν ίδιο πεδίο απογραφής ξενιστή \"%3$s\", αυτό θα οδηγούσε σε σύγκρουση."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Τύπος"
 
@@ -14017,62 +14431,64 @@ msgstr "Τύπος"
 msgid "Type (Full details)"
 msgstr "Τύπος (Αναλυτικά στοιχεία)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Τύπος (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Τύπος υπολογισμού"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Τύπος πληροφοριών"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Τύποι"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "ΑΓΝΩΣΤΟ"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "ΕΠΑΝΩ"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (μετά την σύνδεση)"
 
@@ -14088,20 +14504,30 @@ msgstr "URL Β"
 msgid "URL C"
 msgstr "URL Γ"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "ΗΠΑ (160 χαρακτήρες)"
 
@@ -14109,15 +14535,11 @@ msgstr "ΗΠΑ (160 χαρακτήρες)"
 msgid "USER PROFILE"
 msgstr "ΠΡΟΦΙΛ ΧΡΗΣΤΗ"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ουκρανικά (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Αδύνατη η επιλογή διαμόρφωσης."
 
@@ -14125,7 +14547,7 @@ msgstr "Αδύνατη η επιλογή διαμόρφωσης."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Μη αναγνωρισμένο"
 
@@ -14138,20 +14560,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Μη αναγνωρισμένα συμβάντα ΠΡΟΒΛΗΜΑ"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Μόνο μη αναγνωρισμένα"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Απεμπλοκή επιλεγμένου"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Απεμπλοκή επιλεγμένων χρηστών;"
 
@@ -14160,29 +14582,29 @@ msgstr "Απεμπλοκή επιλεγμένων χρηστών;"
 msgid "Units"
 msgstr "Μονάδες"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14192,23 +14614,20 @@ msgstr "Άγνωστο"
 msgid "Unknown action"
 msgstr "Άγνωστη ενέργεια"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Άγνωστος αλγόριθμος υπολογισμού της κατάστασης υπηρεσίας"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Άγνωστη λειτουργία."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Άγνωστος συλλέκτης ξενιστή, κανένας τέτοιος συλλέκτης σε επιλεγμένο ξενιστή"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Άγνωστος ξενιστής, δεν υπάρχει τέτοιος ξενιστής στο σύστημα"
 
@@ -14220,23 +14639,23 @@ msgstr "Άγνωστος τύπος διεπαφής."
 msgid "Unknown resource"
 msgstr "Άγνωστος πόρος"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Άγνωστος τύπος τιμής"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Αποσύνδεση"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Αποσύνδεση και εκκαθάριση"
 
@@ -14244,61 +14663,61 @@ msgstr "Αποσύνδεση και εκκαθάριση"
 msgid "Unlink from template"
 msgstr "Αποσύνδεση από σχεδιότυπο"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Αποσύνδεση από σχεδιότυπα"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Ασύνδετο: Κατηγορία \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Ασύνδετο: Κανόνας εντοπισμού \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Ασύνδετο: Γράφημα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Ασύνδετο: Πρωτότυπο γράφημα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Ασύνδετο: Συλλέκτης \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Ασύνδετο: Πρωτότυπος συλλέκτης \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Ασύνδετο: Έναυσμα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Ασύνδετο: Πρωτότυπο έναυσμα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Αναίρεση σίγασης"
 
@@ -14312,32 +14731,43 @@ msgstr "Ανυποστήρικτη εισαγωγή επέκτασης αρχε�
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Ανυποστήρικτη εισαγωγή μορφότυπου \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14348,34 +14778,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Ενημέρωση υφιστάμενων"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Διάστημα ενημέρωσης"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Διάστημα ενημέρωσης (σε δευτερόλεπτα)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Ενημερωμένο"
 
@@ -14383,55 +14813,55 @@ msgstr "Ενημερωμένο"
 msgid "Updated status of host"
 msgstr "Κατάσταση ενημέρωσης του ξενιστή"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Ενημερωμένο: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Ενημερώθηκε: Κατηγορία \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Ενημερώθηκε: Κανόνας εντοπισμού \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Ενημερώθηκε: Συλλέκτης \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Ενημερώθηκε: Πρωτότυπος συλλέκτης \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Ενημερώθηκε: Έναυσμα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Ενημερώθηκε: Πρωτότυπο έναυσμα \"%1$s\" σε \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Ανεβάστε"
 
@@ -14439,14 +14869,14 @@ msgstr "Ανεβάστε"
 msgid "Upper level maps"
 msgstr "Χάρτες Άνω επίπεδο"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Χρόνος διαθεσιμότητας"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14454,10 +14884,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Χρόνος διαθεσιμότητας/Μη Διαθεσιμότητας"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14472,84 +14902,88 @@ msgid "Used in actions"
 msgstr "Χρησιμοποιείται σε ενέργειες"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Χρήστης"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "Χρήστης \"%s\" δεν μπορεί να είναι χωρίς ομάδα χρηστών."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Χρήστης προστέθηκε"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Ο χρήστης δεν μπορεί να αλλάξει τον τύπο για τον εαυτό του"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Ο χρήστης δεν μπορεί να αλλάξει την πρόσβαση GUI για τον εαυτό του."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Ο χρήστης δεν μπορεί να αλλάξει την κατάσταση του εαυτού του"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Ο χρήστης δεν μπορεί να αλλάξει την κατάσταση του εαυτού του."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Χρήστης διεγράφη"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Ομάδα χρήστη"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Ομάδα χρήστη \"%1$s\" χρησιμοποιείται στη δέσμη ενεργειών \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14566,34 +15000,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Ομάδες χρηστών"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Ο χρήστης δεν επιτρέπεται να διαγράψει τον εαυτό του."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Ο χρήστης δεν μπορεί να τροποποιήσει την πρόσβαση GUI για τον εαυτό του με το να γίνει μέλος της ομάδας χρηστών \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Ο χρήστης δεν μπορεί να τροποποιήσει την κατάσταση του συστήματος για τον εαυτό του με το να γίνει μέλος της ομάδας χρηστών \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Όνομα χρήστη"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14619,244 +15053,244 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Τύπος χρήστη"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Χρήστης ενημερώθηκε"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Χρήστης με ψευδώνυμο \"%s\" υπάρχει ήδη."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Χρήστες"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Χρήστες (συνδεδεμένοι)"
 
 # Αρση αποκλεισμού
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Χρήστες απεμπλάκησαν"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Τιμή"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Η Τιμή \"%1$s\" είναι άκυρη για την παράμετρο \"grid_align\". Οι Επιλογές είναι: \"%2$s\" και \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14891,11 +15325,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14941,10 +15375,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Αντιστοιχία τιμής με valuemapid \"%1$s\" δεν υπάρχει."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Αντιστοίχιση τιμής"
 
@@ -14953,7 +15387,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "Η αντιστοίχιση τιμής πρέπει να έχει τουλάχιστον μία αντιστοιχία."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14965,8 +15399,8 @@ msgstr "Τιμή: όχι δεδομένα"
 msgid "Values"
 msgstr "Τιμές"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Μεταβλητές"
 
@@ -14979,64 +15413,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Κατακόρυφο"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Κατακόρυφη ευθυγράμμιση"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Η Προβολή δεν αποδίδεται."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Ορατό όνομα"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Το ορατό όνομα δεν μπορεί να είναι κενό αν το όνομα ξενιστή απουσιάζει."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Λυπούμαστε, ο μέγιστος πιθανόν αριθμός στοιχείων για υπενθύμιση έχει καλυφθεί."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Ιστός"
 
@@ -15044,65 +15483,83 @@ msgstr "Ιστός"
 msgid "Web monitoring"
 msgstr "Εποπτεία Ιστού"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Τετ"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
@@ -15110,9 +15567,9 @@ msgstr "Τετάρτη"
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Εβδομαδιαίως"
 
@@ -15120,12 +15577,12 @@ msgstr "Εβδομαδιαίως"
 msgid "When active"
 msgstr "Όταν είναι ενεργά"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Πλάτος"
@@ -15135,28 +15592,28 @@ msgstr "Πλάτος"
 msgid "With data collection"
 msgstr "Με συλλογή δεδομένων"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Με το τελευταίο συμβάν μη αναγνωρισμένο"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Με προβλήματα"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Με εναύσματα"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Με μη αναγνωρισμένα συμβάντα"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Χωρίς προβλήματα"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Χωρίς εναύσματα"
 
@@ -15165,7 +15622,7 @@ msgid "Wizard"
 msgstr "Οδηγός"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15178,277 +15635,271 @@ msgstr "Χρόνος εργασίας"
 msgid "Working time \"%1$s\"."
 msgstr "Χρόνος εργασίας \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Εγγραφή"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Λάθος πεδία για εξάρτηση υπηρεσίας \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Λάθος πεδία για στοιχείο."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Λάθος πεδία για ξενιστή \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Λάθος πεδία για μακροεντολή \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Λάθος πεδία για τύπο μέσων ενημέρωσης."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Λάθος πεδία για δέσμη εντολών."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Λάθος πεδία για υπηρεσία \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Λάθος πεδία για χρόνο υπηρεσίας \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Λάθος πεδία για έναυσμα."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Λάθος πεδία για χρήστη \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Λάθος μακροεντολής \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "Χ"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Χ ετικέτα"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML αρχείο περιέχει σφάλμα %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML αρχείο περιέχει λάθη"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML αρχείο περιέχει θανάσιμο σφάλμα %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML αρχείο περιέχει προειδοποίηση %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Ψ"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Μέγιστη τιμή άξονα Ψ"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Ελάχιστη τιμή άξονα Ψ"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Πλευρά άξονα ψ"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Ψ ετικέτα"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Έτος"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Ετησίως"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Ναί"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Γιοττα"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Δεν μπορείται να επιλέξετε κάποια από τις γλώσσες, επειδή οι τοπικές ρυθμίσεις για αυτές δεν είναι εγκατεστημένες στον εξυπηρετητή ιστού."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Δεν σας επιτρέπεται να αλλοιώσετε τα προνόμια του χρήστη \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Δεν έχετε συνδεθεί."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Δεν μπορείτε να αλλάξετε ξενιστές για την τρέχουσα επιλογή."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Δεν προσδιορίζει ξενιστή για λειτουργία."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Δεν προσδιορίζει ομάδα ξενιστών για λειτουργία."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Δεν καθορίσατε στόχους για εντολή εργασίας ενέργειας \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Δεν καθορίσατε στόχους για γενική δέσμη ενεργειών εργασίας ενέργειας \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "Δεν έχετε άδεια για να εκτελέσετε αυτή τη λειτουργία."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Δεν έχετε δικαιώματα για δημιουργία χρηστών."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Δεν έχετε δικαιώματα για ενημέρωση άλλων χρηστών."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Δεν έχετε δικαιώματα για ενημέρωση χρήστη ή αυτός δεν υπάρχει."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Πρέπει να συνδεθείτε για να δείτε αυτή τη σελίδα."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15461,7 +15912,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15480,8 +15931,8 @@ msgid "Zabbix User"
 msgstr "Zabbix Χρήστης"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15507,10 +15958,11 @@ msgstr "Zabbix εσωτερικό"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix εσωτερική ταυτοποίηση"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Εξυπηρετητής Zabbix"
@@ -15526,7 +15978,7 @@ msgstr ""
 "1. Λανθασμένος εξυπηρετητής IP/DNS στο \"zabbix.conf.php\";\n"
 "2. Λανθασμένη διαμόρφωση δικτύου.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "Δεν ρυθμίστηκε η IP ή θύρα του εξυπηρετητή Zabbix!"
 
@@ -15534,15 +15986,15 @@ msgstr "Δεν ρυθμίστηκε η IP ή θύρα του εξυπηρετη�
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Zabbix πληροφορίες εξυπηρετητή"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Ο Εξυπηρετητής Zabbix λειτουργεί"
 
@@ -15551,11 +16003,11 @@ msgstr "Ο Εξυπηρετητής Zabbix λειτουργεί"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Όνομα εξυπηρετητή Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Θύρα εξυπηρετητή Zabbix"
 
@@ -15563,25 +16015,20 @@ msgstr "Θύρα εξυπηρετητή Zabbix"
 msgid "Zabbix trapper"
 msgstr "Zabbix παγιδευτής"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Ζεττα"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Μεγέθυνση"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Λάθος τιμή για ημέρα: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Λάθος τιμή για μήνα: \"%s\" ]"
@@ -15590,19 +16037,19 @@ msgstr "[Λάθος τιμή για μήνα: \"%s\" ]"
 msgid "agent"
 msgstr "αντιπρόσωπος"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "όλα"
 
@@ -15610,19 +16057,15 @@ msgstr "όλα"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "υπάρχει ήδη"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "ως Κυανό"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "ως Πράσινο"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "ως Κόκκινο"
 
@@ -15634,83 +16077,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "μ.ο."
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "ημέρες"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "ηη"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15732,19 +16141,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "δυναμικό"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "στοιχεία"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "αντιγραφή στοιχείων σε ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from και esc_step_to πρέπει να καθορίζονται μαζί."
 
@@ -15756,48 +16161,50 @@ msgstr "ακριβώς"
 msgid "executed"
 msgstr "εκτελεσμένο"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "σταθερό"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "βρέθηκαν"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
 # ωω
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "ωω"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "ξενιστής"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "ομάδα ξενιστή"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "εικονίδιο"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "εικόνα"
 
@@ -15805,7 +16212,7 @@ msgstr "εικόνα"
 msgid "in"
 msgstr "εν"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15815,7 +16222,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "είναι"
 
@@ -15823,20 +16230,20 @@ msgstr "είναι"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "τελευταίο"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "ώς"
@@ -15845,12 +16252,12 @@ msgstr "ώς"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15859,46 +16266,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr "μακροεντολή(ες)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "συντήρηση"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "χάρτης"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "μεγ."
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "ελάχ."
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15907,17 +16314,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr "πρέπει να είναι έγκυρος χρήστης LDAP"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "όχι δεδομένα"
@@ -15930,12 +16337,14 @@ msgstr "όχι σε"
 msgid "not like"
 msgstr "όχι ώς"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "δεν λειτουργεί"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "δεν επιλέχθηκε"
 
@@ -15944,57 +16353,61 @@ msgstr "δεν επιλέχθηκε"
 msgid "not sent"
 msgstr "δεν στέλνω"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "τώρα"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "απο"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "επί"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "άλλο"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "ανανεώνεται κάθε"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16003,25 +16416,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "επιλεγμένη υπενθύμιση"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "λειτουργία"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "δευτ."
 
@@ -16034,7 +16446,7 @@ msgstr "δευτερόλεπτα"
 msgid "sent"
 msgstr "απεσταλμένο"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "σύντομη περιγραφή"
 
@@ -16042,36 +16454,36 @@ msgstr "σύντομη περιγραφή"
 msgid "show icon mappings"
 msgstr "εμφάνιση αντιστοιχίσεων εικονίδιου"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "εμφάνιση αντιστοιχίσεων τιμών"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "το ID σχεδιότυπου \"%1$s\" πέρασε %2$s φορές"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "έως"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "έναυσμα"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "άγνωστο"
 
@@ -16083,11 +16495,11 @@ msgstr "τιμή"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "εεεε"
diff --git a/frontends/php/locale/en_US/LC_MESSAGES/frontend.po b/frontends/php/locale/en_US/LC_MESSAGES/frontend.po
index c65d9786aae..6a09510725e 100644
--- a/frontends/php/locale/en_US/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/en_US/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2014-02-04 10:36+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: \n"
@@ -14,29 +14,31 @@ msgstr ""
 "X-Generator: Pootle 2.5.0\n"
 "X-POOTLE-MTIME: 1391502970.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" must be between 1970.01.01 and 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d day"
 msgstr[1] "%1$d days"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -48,24 +50,22 @@ msgstr[1] "%1$d of %2$d issues are shown"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (year %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Item"
 msgstr[1] "%1$s Items"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s day"
 msgstr[1] "%1$s days"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -80,7 +80,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -101,23 +101,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d device"
 msgstr[1] "%d devices"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - infinitely)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Only super admins can create groups)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(in days)"
 
@@ -125,34 +125,34 @@ msgstr "(in days)"
 msgid "(in sec)"
 msgstr "(in sec)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimum 60 seconds, 0 - use action default)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(no proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[BULK ACKNOWLEDGE]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 or 1"
 
@@ -168,7 +168,7 @@ msgstr "10 seconds"
 msgid "30 seconds"
 msgstr "30 seconds"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D view"
 
@@ -184,7 +184,7 @@ msgstr "5 seconds"
 msgid "500 latest values"
 msgstr "500 latest values"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Sub-menu/Sub-menu.../>Script"
 
@@ -203,12 +203,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ALARM ACKNOWLEDGES"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "AND"
 
@@ -220,19 +219,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "AVAILABILITY REPORT"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Absolute difference between last and previous value is < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Absolute difference between last and previous value is = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Absolute difference between last and previous value is > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Absolute difference between last and previous value is NOT N"
 
@@ -244,42 +243,42 @@ msgstr "Acceptable SLA"
 msgid "Access denied!"
 msgstr "Access denied!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Access denied."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Account is blocked for %s seconds"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Ack"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Acknowledge"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Acknowledge added"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Acknowledge alarm by"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Acknowledge and return"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Acknowledge status"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Acknowledged"
 
@@ -304,62 +303,65 @@ msgstr "Acknowledging disabled"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Action"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Action \"%1$s\" already exists."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Action \"%1$s\" has no operations defined."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Action added"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Action deleted"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -372,21 +374,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Action operations"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Action updated"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Actions"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Active"
@@ -396,80 +398,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Active"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Active since"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Active till"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Add"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Add comment by"
 
@@ -485,27 +490,23 @@ msgstr "Add host"
 msgid "Add link"
 msgstr "Add link"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Add missing"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Add new or existing applications"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Add new or existing host groups"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Add prototype"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Add to"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Add to favorites"
@@ -514,7 +515,7 @@ msgstr "Add to favorites"
 msgid "Add to host group"
 msgstr "Add to host group"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Add to host groups"
 
@@ -526,7 +527,7 @@ msgstr "Added"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administration"
 
@@ -534,34 +535,34 @@ msgstr "Administration"
 msgid "Advanced labels"
 msgstr "Advanced labels"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Age"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Age less than"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Age less than %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agent"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Agent interfaces"
@@ -570,12 +571,12 @@ msgstr "Agent interfaces"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agent or SNMP or JMX or IPMI interface"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -583,123 +584,126 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Align icons"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "All"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "All groups"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "All links should have \"Name\" and \"URL\" specified"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Allowed hosts"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Any"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Any character string included"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Application"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Application \"%1$s\" already exists."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Application added"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Application deleted"
 msgstr[1] "Application deleted"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Application error."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Application updated"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Application with ID \"%1$s\" is not available on \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Applications"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Apply"
 
@@ -708,16 +712,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Approaching"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Apr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "April"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Are you sure you want perform this action?"
 
@@ -733,9 +737,9 @@ msgstr "Area size"
 msgid "Area type"
 msgstr "Area type"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -749,52 +753,49 @@ msgstr "As plain text"
 msgid "Asset tag"
 msgstr "Asset tag"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "At %1$s:%2$s on %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "At %1$s:%2$s on %3$s %4$s of every %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "At %1$s:%2$s on day %3$s of every %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] "At %1$s:%2$s on every %3$s of every week"
 msgstr[1] "At %1$s:%2$s on every %3$s of every %4$s weeks"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] "At %1$s:%2$s on every day"
 msgstr[1] "At %1$s:%2$s on every %3$s days"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "At (hour:minute)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "At least one host or group should be selected."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "At least one maintenance period must be created."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audit"
@@ -814,26 +815,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Aug"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "August"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Authentication"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Authentication algorithm"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -892,9 +895,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automatic"
 
@@ -902,20 +905,20 @@ msgstr "Automatic"
 msgid "Automatic icon mapping"
 msgstr "Automatic icon mapping"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Automatic icon selection"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Availability"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Availability report"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Available"
 
@@ -924,36 +927,36 @@ msgstr "Available"
 msgid "Average"
 msgstr "Average"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Average by"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Average value of a period T is < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Average value of a period T is = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Average value of a period T is > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Average value of a period T is NOT N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Axis side"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Background"
@@ -962,7 +965,7 @@ msgstr "Background"
 msgid "Background image"
 msgstr "Background image"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Bar reports"
 
@@ -972,8 +975,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Basic authentication"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -985,15 +988,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind password"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Bitwise AND of last (most recent) T value and mask is = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Bitwise AND of last (most recent) T value and mask is NOT N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Black & Blue"
 
@@ -1005,8 +1008,8 @@ msgstr "Blinking"
 msgid "Blocked"
 msgstr "Blocked"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Bold line"
 
@@ -1014,22 +1017,22 @@ msgstr "Bold line"
 msgid "Boolean"
 msgstr "Boolean"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Bottom"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Brighten"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgarian (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Bulk acknowledge"
 
@@ -1055,7 +1058,7 @@ msgstr "CONFIGURATION OF APPLICATIONS"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURATION OF AUTHENTICATION"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1085,7 +1088,7 @@ msgstr "CONFIGURATION OF HOST GROUPS"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "CONFIGURATION OF HOST PROTOTYPES"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURATION OF HOSTS"
 
@@ -1097,7 +1100,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURATION OF ICON MAPPING"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURATION OF IMAGES"
 
@@ -1106,14 +1109,14 @@ msgstr "CONFIGURATION OF IMAGES"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURATION OF IT SERVICES"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURATION OF ITEM PROTOTYPES"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURATION OF ITEMS"
 
@@ -1142,7 +1145,7 @@ msgstr "CONFIGURATION OF NETWORK MAPS"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURATION OF PROXIES"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURATION OF REGULAR EXPRESSIONS"
 
@@ -1162,7 +1165,7 @@ msgstr "CONFIGURATION OF SCRIPTS"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURATION OF SLIDE SHOWS"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURATION OF TEMPLATES"
 
@@ -1178,7 +1181,7 @@ msgstr "CONFIGURATION OF TRIGGER SEVERITIES"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURATION OF TRIGGERS"
 
@@ -1210,22 +1213,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURATION OF ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1234,21 +1237,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Calculate SLA, acceptable SLA (in %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Calculated"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Calculated permissions"
 
@@ -1256,92 +1259,95 @@ msgstr "Calculated permissions"
 msgid "Callback"
 msgstr "Callback"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canada (136 characters)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Cancel"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Cannot acknowledge event"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Cannot add a non-numeric item \"%1$s\"."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Cannot add action"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Cannot add action condition"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Cannot add application"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Cannot add dependency from a host to a template."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Cannot add discovery rule"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Cannot add graph"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Cannot add group"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Cannot add host"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Cannot add host prototype"
 
@@ -1349,24 +1355,24 @@ msgstr "Cannot add host prototype"
 msgid "Cannot add image"
 msgstr "Cannot add image"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Cannot add image."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Cannot add item"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Cannot add items."
 
@@ -1374,20 +1380,20 @@ msgstr "Cannot add items."
 msgid "Cannot add macro."
 msgstr "Cannot add macro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Cannot add maintenance"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Cannot add media type"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
@@ -1396,24 +1402,24 @@ msgstr "Cannot add more than one item with type \"Graph sum\" on graph prototype
 msgid "Cannot add network map"
 msgstr "Cannot add network map"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Cannot add new application \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Cannot add proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Cannot add regular expression"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Cannot add screen"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Cannot add script"
 
@@ -1425,27 +1431,27 @@ msgstr "Cannot add service"
 msgid "Cannot add slide show"
 msgstr "Cannot add slide show"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Cannot add template"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Cannot add trigger"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Cannot add user"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Cannot add user. Both passwords must be equal."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Cannot add users."
 
@@ -1453,7 +1459,7 @@ msgstr "Cannot add users."
 msgid "Cannot add value map"
 msgstr "Cannot add value map"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Cannot add web scenario"
 
@@ -1473,23 +1479,23 @@ msgstr "Cannot change authentication method to LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Cannot change authentication method to Zabbix internal"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Cannot clear history"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Cannot clone graph prototypes."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Cannot clone host prototypes."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Cannot clone item prototypes."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Cannot clone trigger prototypes."
 
@@ -1497,20 +1503,20 @@ msgstr "Cannot clone trigger prototypes."
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Cannot copy graphs"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Cannot copy items"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "Cannot create a host prototype on a discovered host \"%1$s\"."
@@ -1519,19 +1525,19 @@ msgstr "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgid "Cannot create another database connection."
 msgstr "Cannot create another database connection."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Cannot create circular dependencies."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Cannot create dependency on trigger itself."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Cannot create discovery rule"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Cannot create host group."
 
@@ -1539,102 +1545,102 @@ msgstr "Cannot create host group."
 msgid "Cannot create icon map"
 msgstr "Cannot create icon map"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Cannot create icon maps with identical name \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Cannot create map \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Cannot create new application, web scenario is already assigned to application."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Cannot create new element"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Cannot create screen."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Cannot delete action"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Cannot delete application"
 msgstr[1] "Cannot delete application"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Cannot delete dependency"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Cannot delete discovery rule"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Cannot delete discovery rules"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Cannot delete graph"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Cannot delete graph prototype"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Cannot delete graph."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Cannot delete graphs"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Cannot delete graphs created by low level discovery."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Cannot delete group"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Cannot delete group"
+msgstr[1] "Cannot delete group"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Cannot delete host"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Cannot delete host group."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Cannot delete host prototype."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Cannot delete host prototypes"
 
@@ -1642,79 +1648,79 @@ msgstr "Cannot delete host prototypes"
 msgid "Cannot delete icon map"
 msgstr "Cannot delete icon map"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Cannot delete image"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Cannot delete inventory."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Cannot delete item"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Cannot delete items"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Cannot delete items created by low level discovery."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Cannot delete maintenance"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Cannot delete media type"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Cannot delete network map"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Cannot delete proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Cannot delete regular expression"
 msgstr[1] "Cannot delete regular expressions"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Cannot delete screen"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Cannot delete script"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Cannot delete scripts. Empty input parameter \"scriptids\"."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Cannot delete selected actions"
 
@@ -1722,77 +1728,80 @@ msgstr "Cannot delete selected actions"
 msgid "Cannot delete service"
 msgstr "Cannot delete service"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Cannot delete slide show"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Cannot delete template"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Cannot delete templated application."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Cannot delete templated graphs."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Cannot delete templated host prototype."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Cannot delete templated item."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Cannot delete templated items"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Cannot delete templated items."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Cannot delete templated trigger \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Cannot delete templated web scenario \"%1$s\"."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Cannot delete trigger"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Cannot delete trigger prototype"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Cannot delete trigger."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Cannot delete triggers"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Cannot delete triggers created by low level discovery."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Cannot delete user"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Cannot delete user media."
 
@@ -1800,78 +1809,78 @@ msgstr "Cannot delete user media."
 msgid "Cannot delete value map"
 msgstr "Cannot delete value map"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Cannot delete web scenario"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Cannot disable media type"
 msgstr[1] "Cannot disable media type"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1886,135 +1895,129 @@ msgstr "Cannot display item queue."
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "Cannot display more than one item with type \"Graph sum\"."
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Cannot enable media type"
 msgstr[1] "Cannot enable media type"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Cannot find group \"%1$s\" used in map \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Cannot find host \"%1$s\" used in map \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2025,34 +2028,53 @@ msgstr "Cannot find icon \"%1$s\" used in map \"%2$s\"."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
@@ -2062,41 +2084,41 @@ msgstr "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Cannot find map \"%1$s\" used in map \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Cannot find objects with name"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2109,12 +2131,14 @@ msgstr "Cannot format Tree. Check logic structure in service links."
 msgid "Cannot format tree."
 msgstr "Cannot format tree."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Cannot implode expression \"%s\"."
@@ -2126,59 +2150,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
 msgstr[1] "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgstr[1] "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Cannot include view file \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Cannot insert user media."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Cannot link template"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Cannot logout."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Cannot mass update host name."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Cannot mass update visible host name."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Cannot pass duplicate template IDs for the linkage: %s."
@@ -2198,7 +2223,7 @@ msgstr "Cannot perform update statement on table \"%1$s\" without values."
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Cannot perform update statement on table \"%1$s\" without where condition."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "Cannot process applications from different hosts or templates."
 
@@ -2207,11 +2232,11 @@ msgstr "Cannot process applications from different hosts or templates."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Cannot remove all items, at least one item should remain."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2219,11 +2244,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Cannot remove macro."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Cannot rename guest user."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Cannot save discovery rule without checks."
 
@@ -2232,217 +2257,226 @@ msgstr "Cannot save discovery rule without checks."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Cannot send command, check connection with Zabbix server \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "Cannot set \"%1$s\" for item \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Cannot set \"%1$s\" for trigger \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Cannot set \"templateid\" for application \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Cannot set \"templateid\" for screen \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Cannot set inventory fields for disabled inventory."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Cannot switch host for interface."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Cannot unblock users"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Cannot unlink and clear Web scenarios."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Cannot unlink and clear applications."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Cannot unlink and clear discovery rules"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Cannot unlink and clear graph prototypes"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Cannot unlink and clear graphs."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Cannot unlink and clear item prototypes"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Cannot unlink and clear items"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Cannot unlink and clear triggers"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Cannot unlink template"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "Cannot update \"%1$s\" for a discovered host."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Cannot update \"%1$s\" for a discovered item."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Cannot update \"%1$s\" for a discovered trigger."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Cannot update \"%1$s\" for item \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Cannot update \"%1$s\" for trigger \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Cannot update \"templateid\" for application \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Cannot update \"templateid\" for graph \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Cannot update \"templateid\" for screen \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Cannot update a discovered graph."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Cannot update a discovered host group."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Cannot update action"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Cannot update application"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Cannot update comment"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Cannot update configuration"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Cannot update debug mode"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Cannot update discovery rule"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Cannot update frontend access"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Cannot update graph"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Cannot update group"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Cannot update group."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Cannot update groups for discovered host \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Cannot update host"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Cannot update host prototype"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Cannot update hosts"
 
@@ -2454,24 +2488,24 @@ msgstr "Cannot update icon map"
 msgid "Cannot update image"
 msgstr "Cannot update image"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Cannot update image."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Cannot update interface for discovered host \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Cannot update item"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Cannot update items"
 
@@ -2483,16 +2517,16 @@ msgstr "Cannot update macro."
 msgid "Cannot update macros"
 msgstr "Cannot update macros"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Cannot update maintenance"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Cannot update map \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Cannot update media type"
 
@@ -2500,28 +2534,24 @@ msgstr "Cannot update media type"
 msgid "Cannot update network map"
 msgstr "Cannot update network map"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Cannot update proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Cannot update proxy for discovered host \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Cannot update regular expression"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Cannot update screen"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Cannot update screen."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Cannot update script"
 
@@ -2533,40 +2563,41 @@ msgstr "Cannot update service"
 msgid "Cannot update slide show"
 msgstr "Cannot update slide show"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Cannot update template"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Cannot update templated applications."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "Cannot update templates on discovered host \"%1$s\"."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Cannot update trigger"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Cannot update user"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Cannot update user media."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Cannot update user. Both passwords must be equal."
 
@@ -2574,15 +2605,15 @@ msgstr "Cannot update user. Both passwords must be equal."
 msgid "Cannot update value map"
 msgstr "Cannot update value map"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Cannot update web scenario"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Caption"
 
@@ -2591,47 +2622,47 @@ msgstr "Caption"
 msgid "Case sensitive"
 msgstr "Case sensitive"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Center"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Change"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Change"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Change password"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Character"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Character string included"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Character string not included"
 
@@ -2640,48 +2671,48 @@ msgid "Chassis"
 msgstr "Chassis"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Check already exists."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Check expression part starting from \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Check the key, please. Default example was passed."
 
@@ -2690,44 +2721,44 @@ msgid "Check type"
 msgstr "Check type"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Checks"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Checks should be unique."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chinese (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Chinese (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Circular link cannot be created for map element \"%s\"."
@@ -2742,34 +2773,35 @@ msgstr "Circular reference in maps: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Circular reference in screens: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Circular reference in templates: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Circular template linkage is not allowed."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Classic"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Clear"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Clear history and trends"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Clear history for selected"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Clear when unlinking"
 
@@ -2779,69 +2811,69 @@ msgstr "Clock"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Clone"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Close"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Close expression constructor"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Color"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Color (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Column span"
 
@@ -2856,7 +2888,7 @@ msgstr "Combined result"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Command"
 
@@ -2864,41 +2896,31 @@ msgstr "Command"
 msgid "Command actions"
 msgstr "Command actions"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Command cannot be empty."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Commands"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Comment updated"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Comments"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Comments for \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Commercial"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Compare values for multiple periods"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Composing permissions"
 
@@ -2906,29 +2928,39 @@ msgstr "Composing permissions"
 msgid "Condition"
 msgstr "Condition"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Conditions"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Configuration"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3091,23 +3123,23 @@ msgstr "Configuration updated"
 msgid "Configure (Filter %s)"
 msgstr "Configure (Filter %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Confirmation text"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Connect to"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Connected as '%1$s'"
@@ -3166,7 +3198,7 @@ msgid "Context name"
 msgstr "Context name"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3174,30 +3206,37 @@ msgstr ""
 msgid "Contract number"
 msgstr "Contract number"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Coordinates"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Copy"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Copy selected to ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Correct login \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Could not save image!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Count"
 
@@ -3217,6 +3256,10 @@ msgstr "Create application"
 msgid "Create application (select host first)"
 msgstr "Create application (select host first)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3234,7 +3277,7 @@ msgstr "Create graph (select host first)"
 msgid "Create graph prototype"
 msgstr "Create graph prototype"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Create host"
 
@@ -3247,15 +3290,15 @@ msgstr "Create host group"
 msgid "Create host prototype"
 msgstr "Create host prototype"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Create icon map"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Create image"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Create item"
 
@@ -3279,6 +3322,10 @@ msgstr "Create map"
 msgid "Create media type"
 msgstr "Create media type"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Create proxy"
@@ -3303,11 +3350,11 @@ msgstr "Create script"
 msgid "Create slide show"
 msgstr "Create slide show"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Create template"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Create trigger"
 
@@ -3331,42 +3378,42 @@ msgstr "Create user group"
 msgid "Create value map"
 msgstr "Create value map"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Created: Application \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Created: Host prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Created: Item \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Created: Item prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Created: Trigger \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Created: Web scenario \"%1$s\" on \"%2$s\"."
@@ -3376,51 +3423,52 @@ msgid "Critical"
 msgstr "Critical"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Current date is < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Current date is = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Current date is > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Current date is NOT N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Current host"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Current time is < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Current time is = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Current time is > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Current time is NOT N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Current value"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3433,7 +3481,7 @@ msgstr "Custom graphs"
 msgid "Custom label"
 msgstr "Custom label"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
@@ -3447,7 +3495,7 @@ msgstr "Custom multiplier"
 msgid "Custom screens"
 msgstr "Custom screens"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Custom script"
 
@@ -3467,18 +3515,14 @@ msgstr "Custom size"
 msgid "Custom slides"
 msgstr "Custom slides"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Czech (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, M jS Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "DASHBOARD CONFIGURATION"
@@ -3494,28 +3538,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "DETAILS OF SCENARIO"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "DISABLED"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DISCOVERED"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3523,25 +3567,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS name"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "DOWN"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Daily"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Dark orange"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Darken"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -3553,20 +3597,21 @@ msgstr "Dashboard configuration"
 msgid "Dashboard filter"
 msgstr "Dashboard filter"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Dashed line"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Data"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3589,11 +3634,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Data type"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Database file"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Database host"
 
@@ -3601,35 +3647,39 @@ msgstr "Database host"
 msgid "Database monitor"
 msgstr "Database monitor"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Database name"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Database password"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Database port"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Database schema"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Database server"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Database type"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Database user"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Date"
 
@@ -3649,53 +3699,52 @@ msgstr "Date HW maintenance expires"
 msgid "Date HW purchased"
 msgstr "Date HW purchased"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Day"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Day of month"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Day of month is < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Day of month is = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Day of month is > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Day of month is NOT N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Day of week"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Day of week is < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Day of week is = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Day of week is > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Day of week is NOT N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Days"
 
@@ -3703,22 +3752,22 @@ msgstr "Days"
 msgid "Debug"
 msgstr "Debug"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Debug mode"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Debug mode updated"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dec"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "December"
 
@@ -3728,15 +3777,14 @@ msgstr "Decimal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Default"
 
@@ -3749,11 +3797,11 @@ msgid "Default delay (in seconds)"
 msgstr "Default delay (in seconds)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Default message"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Default operation step duration"
 
@@ -3776,30 +3824,34 @@ msgstr "Default theme \"%1$s\"."
 msgid "Delay"
 msgstr "Delay"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Delay (in sec)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Delayed by"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Delete"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Delete and clear"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 
@@ -3807,53 +3859,53 @@ msgstr "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgid "Delete application?"
 msgstr "Delete application?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Delete current action?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Delete discovery rule?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Delete expression?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Delete graph?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Delete history of selected WEB scenarios?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Delete history of selected items?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Delete icon map?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Delete item?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Delete keyword?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Delete links between selected elements?"
 
@@ -3861,11 +3913,15 @@ msgstr "Delete links between selected elements?"
 msgid "Delete maintenance period?"
 msgstr "Delete maintenance period?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Delete network map?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Delete proxy?"
 
@@ -3873,7 +3929,7 @@ msgstr "Delete proxy?"
 msgid "Delete regular expression?"
 msgstr "Delete regular expression?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Delete scenario?"
 
@@ -3881,71 +3937,67 @@ msgstr "Delete scenario?"
 msgid "Delete screen?"
 msgstr "Delete screen?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Delete script?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Delete selected"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Delete selected WEB scenarios?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Delete selected actions?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Delete selected applications?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Delete selected discovery rules?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Delete selected elements?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Delete selected graphs?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Delete selected group?"
@@ -3954,27 +4006,27 @@ msgstr "Delete selected group?"
 msgid "Delete selected groups?"
 msgstr "Delete selected groups?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Delete selected host groups?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr "Delete selected host prototype?"
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr "Delete selected host prototypes?"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Delete selected host?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Delete selected hosts?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Delete selected image?"
 
@@ -3982,31 +4034,31 @@ msgstr "Delete selected image?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Delete selected items?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Delete selected maintenance periods?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Delete selected maps?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Delete selected media type?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Delete selected media types?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Delete selected proxies?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Delete selected regular expressions?"
 
@@ -4014,15 +4066,15 @@ msgstr "Delete selected regular expressions?"
 msgid "Delete selected screens?"
 msgstr "Delete selected screens?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Delete selected scripts?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Delete selected slide shows?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Delete selected templates?"
 
@@ -4034,11 +4086,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Delete selected triggers?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Delete selected user?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Delete selected users?"
 
@@ -4053,11 +4105,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Delete selected value mapping? It is used for %d item!"
 msgstr[1] "Delete selected value mapping? It is used for %d items!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Delete selected with linked elements"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4066,15 +4122,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Delete slide show?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Delete template?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Delete trigger?"
 
@@ -4082,62 +4138,62 @@ msgstr "Delete trigger?"
 msgid "Deleted"
 msgstr "Deleted"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Application \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Graph \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Deleted: Host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Item \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Deleted: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Deleted: Template \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
@@ -4146,35 +4202,35 @@ msgstr "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgid "Delimiter"
 msgstr "Delimiter"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (simple change)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (speed per second)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Deny"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Dependencies"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Dependent"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Depends on"
 
@@ -4182,30 +4238,41 @@ msgstr "Depends on"
 msgid "Deployment status"
 msgstr "Deployment status"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Description"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Details"
 
@@ -4218,71 +4285,71 @@ msgid "Device"
 msgstr "Device"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Device uniqueness criteria"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Difference between MAX and MIN value of a period T is < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Difference between MAX and MIN value of a period T is = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Difference between MAX and MIN value of a period T is > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Difference between MAX and MIN value of a period T is NOT N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Difference between last and preceding values, then N = 1, 0 - otherwise"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Difference between last and previous value is < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Difference between last and previous value is = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Difference between last and previous value is > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Difference between last and previous value is NOT N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4306,48 +4373,44 @@ msgstr "Disable debug mode in selected groups?"
 msgid "Disable host"
 msgstr "Disable host"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Disable host?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Disable hosts in the selected host groups?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Disable hosts monitored by selected proxies?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Disable selected"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Disable selected WEB scenarios?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Disable selected actions?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Disable selected applications?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Disable selected discovery rules?"
 
@@ -4355,11 +4418,11 @@ msgstr "Disable selected discovery rules?"
 msgid "Disable selected groups?"
 msgstr "Disable selected groups?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr "Disable selected host prototypes?"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Disable selected hosts?"
 
@@ -4367,42 +4430,47 @@ msgstr "Disable selected hosts?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Disable selected items?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Disable selected media types?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Disable selected triggers?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Disabled"
 
@@ -4415,7 +4483,7 @@ msgstr "Disaster"
 msgid "Discovered"
 msgstr "Discovered"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Discovered by"
 
@@ -4423,17 +4491,17 @@ msgstr "Discovered by"
 msgid "Discovered device"
 msgstr "Discovered device"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Discovery"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Discovery by proxy"
 
@@ -4441,17 +4509,17 @@ msgstr "Discovery by proxy"
 msgid "Discovery check"
 msgstr "Discovery check"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "Discovery check error"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Discovery checks"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Discovery list"
 
@@ -4460,67 +4528,70 @@ msgid "Discovery object"
 msgstr "Discovery object"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Discovery rule"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Discovery rule created"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Discovery rule deleted"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Discovery rule updated"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Discovery rules"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Discovery rules deleted"
 
@@ -4532,7 +4603,7 @@ msgstr "Discovery status"
 msgid "Display OK triggers for"
 msgstr "Display OK triggers for"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Displaying"
 
@@ -4541,32 +4612,32 @@ msgstr "Displaying"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Displaying %1$s of %2$s found"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Distribution of values for multiple items"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Distribution of values for multiple periods"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Do not calculate"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Do you wish to replace the conditional expression?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Done"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Dot"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Down"
@@ -4576,30 +4647,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Down"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Downtime"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Drag here to change the type of the interface to \"IPMI\" type."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Drag here to change the type of the interface to \"JMX\" type."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Drag here to change the type of the interface to \"SNMP\" type."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Drag here to change the type of the interface to \"agent\" type."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Draw style"
 
@@ -4617,74 +4688,75 @@ msgstr "Dropdown first entry \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Dropdown remember selected \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Duplicate dependencies in trigger \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Duplicate host. Host with the same host name \"%s\" already exists in data."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Duplicate map name for map \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr "Duplicate script name \"%1$s\"."
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Duplicate severity name \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Duplicate user alias \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Duration"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Duration (sec)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Dutch (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Dynamic item"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ERROR"
 
@@ -4692,13 +4764,13 @@ msgstr "ERROR"
 msgid "EVENTS"
 msgstr "EVENTS"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Each URL should have a unique name. Please make sure there is only one URL named"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4706,9 +4778,9 @@ msgstr "Each URL should have a unique name. Please make sure there is only one U
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Edit"
 
@@ -4716,7 +4788,7 @@ msgstr "Edit"
 msgid "Edit map element"
 msgstr "Edit map element"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Edit trigger"
 
@@ -4724,27 +4796,61 @@ msgstr "Edit trigger"
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Element name"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Empty"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Empty action condition."
 
@@ -4752,76 +4858,98 @@ msgstr "Empty action condition."
 msgid "Empty color."
 msgstr "Empty color."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr "Empty host ID for host prototype."
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "Empty host."
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Empty input parameter."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "Empty input parameters."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Empty input."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Empty macro."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr "Empty name for group prototype."
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr "Empty name for host prototype \"%1$s\"."
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "Empty name for script \"%1$s\"."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "Empty name for script."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Empty name."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Empty parameters"
 
@@ -4830,11 +4958,11 @@ msgstr "Empty parameters"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Empty response received from Zabbix server \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4842,11 +4970,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Empty time period."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Enable"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Enable confirmation"
 
@@ -4866,11 +4998,11 @@ msgstr "Enable event acknowledges"
 msgid "Enable host"
 msgstr "Enable host"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Enable host?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Enable hosts monitored by selected proxies?"
 
@@ -4883,36 +5015,32 @@ msgstr "Enable hosts monitored by selected proxies?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Enable selected"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Enable selected WEB scenarios?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Enable selected actions?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Enable selected applications?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Enable selected discovery rules?"
 
@@ -4920,11 +5048,11 @@ msgstr "Enable selected discovery rules?"
 msgid "Enable selected groups?"
 msgstr "Enable selected groups?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr "Enable selected host prototypes?"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Enable selected hosts?"
 
@@ -4932,64 +5060,68 @@ msgstr "Enable selected hosts?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Enable selected items?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Enable selected media types?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Enable selected triggers?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Enabled"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "English (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "English (US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Error"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Error in search request for table \"%1$s\"."
@@ -5007,15 +5139,15 @@ msgstr "Event"
 msgid "Event ID"
 msgstr "Event ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Event acknowledged"
 
@@ -5024,7 +5156,7 @@ msgstr "Event acknowledged"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Event acknowledges \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Event acknowledging disabled"
 
@@ -5032,7 +5164,7 @@ msgstr "Event acknowledging disabled"
 msgid "Event details"
 msgstr "Event details"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Event generation"
 
@@ -5052,9 +5184,10 @@ msgstr "Event source details"
 msgid "Event type"
 msgstr "Event type"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Events"
 
@@ -5062,36 +5195,41 @@ msgstr "Events"
 msgid "Events and alerts"
 msgstr "Events and alerts"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Every day(s)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Every week(s)"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Exclude"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Execute"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Execute SQL error [%1$s] in [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Execute on"
 
@@ -5099,13 +5237,13 @@ msgstr "Execute on"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Executed script"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Execution confirmation"
 
@@ -5117,7 +5255,7 @@ msgstr "Expand macros"
 msgid "Expand single problem"
 msgstr "Expand single problem"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Expecting JSON-rpc version 2.0, \"%s\" is given."
@@ -5127,12 +5265,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Expired"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Exploded"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Export selected"
 
@@ -5140,22 +5278,22 @@ msgstr "Export selected"
 msgid "Export to CSV"
 msgstr "Export to CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Expression"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Expression Syntax Error."
 
@@ -5163,11 +5301,12 @@ msgstr "Expression Syntax Error."
 msgid "Expression Variable Elements"
 msgstr "Expression Variable Elements"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Expression cannot be empty"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Expression constructor"
 
@@ -5188,17 +5327,17 @@ msgid "External check"
 msgstr "External check"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "FALSE"
 
@@ -5207,16 +5346,17 @@ msgstr "FALSE"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Fail"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Failed"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5224,40 +5364,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Failure Audit"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Favorite graphs"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Favorite maps"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Favorite screens"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Favorites"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Feb"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "February"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Field"
 
@@ -5301,19 +5441,19 @@ msgstr "Field \"%1$s\" is not a string."
 msgid "Field \"%1$s\" must be missing."
 msgstr "Field \"%1$s\" must be missing."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Field \"druleid\" is required."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Field \"name\" is required."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "File format is unsupported."
 
@@ -5322,13 +5462,13 @@ msgstr "File format is unsupported."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "File is too big, max upload size is %1$s bytes."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "File provided to a view does not exist. Tried to find \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5336,68 +5476,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Filled region"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filter"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Filter by host group"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filter by name"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Finish"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Finnish (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "First"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "First"
@@ -5406,8 +5549,8 @@ msgstr "First"
 msgid "Fit to map"
 msgstr "Fit to map"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fixed"
 
@@ -5417,76 +5560,80 @@ msgstr "Fixed"
 msgid "Flexible intervals"
 msgstr "Flexible intervals"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "For guest, password must be empty"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Formula"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Fourth"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "French (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Fri"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Friday"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "From"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Frontend access"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Frontend access updated"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Frontend messaging"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Full clone"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Function"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5496,50 +5643,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "GUI access disabled."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "General"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Generated in %s sec"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "German (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5547,65 +5694,65 @@ msgid "Get support"
 msgstr "Get support"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Given expression is not a macro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Global expression does not exist."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Global script"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Global scripts"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Go"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Go to"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "Go to dashboard"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5614,66 +5761,73 @@ msgid "Gradient line"
 msgstr "Gradient line"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Graph"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Graph \"%1$s\" already exists on \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Graph \"%1$s\" does not exist on template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Graph \"%1$s\" skipped - user rule."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Graph added"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Graph deleted"
 
@@ -5685,54 +5839,59 @@ msgstr "Graph element"
 msgid "Graph item"
 msgstr "Graph item"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Graph name"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "Graph prototype"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Graph prototype \"%s\" deleted."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Graph prototypes"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5744,49 +5903,51 @@ msgstr "Graph prototypes of"
 msgid "Graph sum"
 msgstr "Graph sum"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Graph type"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Graph updated"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Graph with same name but other type exist."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Graphs"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Graphs copied"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Graphs deleted"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Greek (el_GR)"
 
@@ -5795,54 +5956,58 @@ msgstr "Greek (el_GR)"
 msgid "Grid"
 msgstr "Grid"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Group"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Group \"%1$s\" does not exist."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Group \"%1$s\" for host \"%2$s\" does not exist."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Group added"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Group deleted"
+msgid_plural "Groups deleted"
+msgstr[0] "Group deleted"
+msgstr[1] "Group deleted"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5853,40 +6018,42 @@ msgstr "Group for discovered hosts"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr "Group for discovered hosts \"%1$s\"."
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Group name"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr "Group prototype ID cannot be empty."
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr "Group prototype cannot be based on a discovered host group \"%1$s\"."
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr "Group prototypes"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Group updated"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Grouping by"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Groups"
 
@@ -5894,22 +6061,13 @@ msgstr "Groups"
 msgid "Groups in maintenance"
 msgstr "Groups in maintenance"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "h.i A"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "h:i A"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "h:i:s A"
 
@@ -5926,7 +6084,7 @@ msgstr "HOST GROUP ISSUES"
 msgid "HOST INVENTORY"
 msgstr "HOST INVENTORY"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "HOST INVENTORY OVERVIEW"
 
@@ -5944,7 +6102,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP authentication"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
@@ -5965,12 +6124,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr "Hardware (Full details)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Height"
@@ -5983,15 +6147,15 @@ msgstr "Help"
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Hidden"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Hide"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Hide all"
 
@@ -6007,15 +6171,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Hide disabled triggers"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Hide selected"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "Hide selected groups"
 
@@ -6024,23 +6188,23 @@ msgstr "Hide selected groups"
 msgid "High"
 msgstr "High"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "History"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "History cleared"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "History clearing can take a long time. Continue?"
 
@@ -6061,80 +6225,80 @@ msgstr "History of events"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Horizontal align"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
 msgstr[1] "Host"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" already exists."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Host (ascending)"
 
@@ -6146,66 +6310,68 @@ msgstr "Host IP"
 msgid "Host access"
 msgstr "Host access"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Host added"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Host cannot have more than one default interface of the same type."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Host count"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Host deleted"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Host group"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Host group \"%1$s\" already exists."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "Host group \"%1$s\" is internal and can not be deleted."
@@ -6222,14 +6388,15 @@ msgstr "Host group issues"
 msgid "Host group label type"
 msgstr "Host group label type"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "Host group name cannot be empty."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Host groups"
 
@@ -6239,8 +6406,8 @@ msgstr "Host groups"
 msgid "Host interface"
 msgstr "Host interface"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Host inventory"
 
@@ -6256,7 +6423,7 @@ msgstr "Host issues"
 msgid "Host label type"
 msgstr "Host label type"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Host list"
 
@@ -6265,18 +6432,18 @@ msgid "Host metadata"
 msgstr "Host metadata"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Host name"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr "Host name for host prototype \"%1$s\" must contain macros."
@@ -6285,72 +6452,72 @@ msgstr "Host name for host prototype \"%1$s\" must contain macros."
 msgid "Host networks"
 msgstr "Host networks"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "Host prototype \"%1$s\" already exists on \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr "Host prototype \"%1$s\" must have at least one host group."
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr "Host prototype added"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr "Host prototype deleted"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr "Host prototype updated"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr "Host prototype with host name \"%1$s\" already exists."
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr "Host prototype with visible name \"%1$s\" already exists."
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr "Host prototypes"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr "Host prototypes deleted"
 
@@ -6362,7 +6529,7 @@ msgstr "Host prototypes of"
 msgid "Host router"
 msgstr "Host router"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Host screens"
 
@@ -6374,51 +6541,52 @@ msgstr "Host status"
 msgid "Host subnet mask"
 msgstr "Host subnet mask"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Host time"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Host update failed."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Host updated"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Host with the same name \"%s\" already exists."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Host with the same visible name \"%s\" already exists."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hosts"
 
@@ -6426,11 +6594,11 @@ msgstr "Hosts"
 msgid "Hosts & Groups"
 msgstr "Hosts & Groups"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hosts (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Hosts / templates"
 
@@ -6442,37 +6610,38 @@ msgstr "Hosts in"
 msgid "Hosts in maintenance"
 msgstr "Hosts in maintenance"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Hosts info"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Hosts location"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Hosts updated"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Hourly"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Hours"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Hungarian (hu_HU)"
 
@@ -6490,22 +6659,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6513,26 +6682,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP address"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP and DNS cannot be empty for host interface."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP range"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "IP range cannot be empty."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6540,22 +6709,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI agent"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI authentication algorithm"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "IPMI interfaces"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI password"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI privilege level"
 
@@ -6565,7 +6734,7 @@ msgstr "IPMI privilege level"
 msgid "IPMI sensor"
 msgstr "IPMI sensor"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI username"
 
@@ -6598,7 +6767,7 @@ msgstr "IT service dependencies"
 msgid "IT service parent"
 msgstr "IT service parent"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6614,25 +6783,25 @@ msgid "ITEMS"
 msgstr "ITEMS"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Icon"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Icon (default)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Icon (disabled)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Icon (maintenance)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Icon (problem)"
 
@@ -6653,42 +6822,44 @@ msgstr "Icon label type"
 msgid "Icon map"
 msgstr "Icon map"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Icon map \"%s\" already exists."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Icon map \"%s\" cannot have mapping with empty expression."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Icon map \"%s\" has incorrect expression."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Icon map \"%s\" must have at least one mapping."
@@ -6701,7 +6872,8 @@ msgstr "Icon map created"
 msgid "Icon map deleted"
 msgstr "Icon map deleted"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Icon map name cannot be empty."
 
@@ -6709,29 +6881,29 @@ msgstr "Icon map name cannot be empty."
 msgid "Icon map updated"
 msgstr "Icon map updated"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Icon map with iconmapid \"%s\" does not exist."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Icon mapping"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Iconmap is not enabled"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Icons"
 
@@ -6739,21 +6911,23 @@ msgstr "Icons"
 msgid "Identical expression already exists"
 msgstr "Identical expression already exists"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Image"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Image \"%1$s\" already exists."
@@ -6762,7 +6936,7 @@ msgstr "Image \"%1$s\" already exists."
 msgid "Image added"
 msgstr "Image added"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Image deleted"
 
@@ -6770,12 +6944,13 @@ msgstr "Image deleted"
 msgid "Image label type"
 msgstr "Image label type"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Image load error [%1$s] in [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "Image size must be less than 1MB."
 
@@ -6784,66 +6959,66 @@ msgid "Image updated"
 msgstr "Image updated"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Images"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Images for all maps will be updated!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Immediately"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Import"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Import failed"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Import file"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Imported successfully"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Impossible to filter by inventory field \"%s\", which does not exist."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Impossible to remove last row and column."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "In"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "In group"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "In groups"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6856,244 +7031,282 @@ msgstr "In maintenance"
 msgid "In progress"
 msgstr "In progress"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Include"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Incorrect %1$s label type value for map \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Incorrect IP range \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Incorrect SNMP OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Incorrect SNMP community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Incorrect acceptable SLA for service \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Incorrect action condition discovery check."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "Incorrect action condition discovery object."
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Incorrect action condition discovery status."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "Incorrect action condition event type."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Incorrect action condition host group. Host group does not exist or you have no access to it."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Incorrect action condition host. Host does not exist or you have no access to it."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "Incorrect action condition ip \"%1$s\"."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "Incorrect action condition operator."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "Incorrect action condition port \"%1$s\"."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Incorrect action condition template. Template does not exist or you have no access to it."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "Incorrect action condition trigger severity."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "Incorrect action condition trigger value."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Incorrect action condition type."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Incorrect action conditionid."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "Incorrect action conditions for action \"%1$s\"."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Incorrect action operation command type."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Incorrect action operation condition acknowledge type."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Incorrect action operation condition type."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Incorrect action operation escalation step values."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Incorrect action operation host. Host does not exist or you have no access to this host."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Incorrect action operation port \"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Incorrect action operation step duration."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Incorrect action operation type."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Incorrect action operation user. User does not exist or you have no access to this user."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Incorrect action operationid."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Incorrect algorithm for service \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Incorrect arguments passed to function"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Incorrect arguments passed to function."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Incorrect arguments passed to method."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Incorrect authentication protocol for discovery rule \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Incorrect authentication protocol for item \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Incorrect calculate SLA value for service \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "Incorrect characters used for host \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Incorrect characters used for host name \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "Incorrect characters used for proxy name \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Incorrect delay."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "Incorrect discovery rule ID for host prototype \"%1$s\"."
@@ -7103,11 +7316,11 @@ msgstr "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "Incorrect eventobject value."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "Incorrect eventsource value."
 
@@ -7116,11 +7329,11 @@ msgstr "Incorrect eventsource value."
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "Incorrect fields for sysmap."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Incorrect fields for trigger."
 
@@ -7128,74 +7341,100 @@ msgstr "Incorrect fields for trigger."
 msgid "Incorrect file upload."
 msgstr "Incorrect file upload."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Incorrect flexible interval \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Incorrect function is used"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "Incorrect group prototype ID."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "Incorrect group prototypes for host prototype \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "Incorrect host group ID for group prototype."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Incorrect host group."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "Incorrect host groups for host prototype \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "Incorrect host prototype ID."
 
@@ -7203,182 +7442,201 @@ msgstr "Incorrect host prototype ID."
 msgid "Incorrect image index."
 msgstr "Incorrect image index."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Incorrect interface DNS parameter \"%s\" provided."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Incorrect interface IP parameter \"%s\" provided."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Incorrect interface port \"%s\" provided."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Incorrect inventory field \"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Incorrect item for axis value."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Incorrect key."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Incorrect list of items."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Incorrect maintenance date"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Incorrect maintenance day period"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Incorrect maintenance days of week"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Incorrect maintenance month period"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Incorrect maintenance period"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Incorrect maintenance period (minimum 5 minutes)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Incorrect maintenance week period"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Incorrect map height value for map \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Incorrect map width value for map \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "Incorrect menu path for script \"%1$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "Incorrect object value."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "Incorrect parameter for action \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Incorrect parameter for operations."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Incorrect parameter is used for icon map \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Incorrect parameters for condition."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Incorrect parameters for icon map update method \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Incorrect parameters for maintenance."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Incorrect parameters for user group."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Incorrect parent for service \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Incorrect parent service."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Incorrect port range."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "Incorrect privacy protocol for discovery rule \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "Incorrect privacy protocol for item \"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Incorrect proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Incorrect resource type provided for screen item."
 
@@ -7387,64 +7645,68 @@ msgstr "Incorrect resource type provided for screen item."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Incorrect response received from Zabbix server \"%1$s\"."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Incorrect screen provided for slide show."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Incorrect service end time."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Incorrect service start time."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Incorrect service time type."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Incorrect sorder order for service \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "Incorrect source value."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr "Incorrect status for host prototype \"%1$s\"."
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Incorrect status for service \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Incorrect status."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr "Incorrect theme for user \"%1$s\"."
@@ -7465,52 +7727,57 @@ msgstr "Incorrect time period \"%1$s\" start time must be less than end time."
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Incorrect time period \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Incorrect trigger ID for service \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Incorrect trigger expression"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Incorrect trigger expression."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Incorrect trigger function \"%1$s\" provided in expression."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Incorrect type of asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Incorrect user group."
 
@@ -7519,7 +7786,8 @@ msgstr "Incorrect user group."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "Incorrect value \"%1$s\" for \"%2$s\" field."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
@@ -7539,7 +7807,7 @@ msgstr "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "Incorrect value for field \"%1$s\"."
@@ -7549,43 +7817,49 @@ msgstr "Incorrect value for field \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "Incorrect value for field \"%1$s\": cannot be empty."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Incorrect value for setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Incorrect value used for proxy status \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Incorrect working time."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Incorrect y max item for graph \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Incorrect y min item for graph \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonesian (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Info"
 
@@ -7594,15 +7868,15 @@ msgstr "Info"
 msgid "Information"
 msgstr "Information"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Insert"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Insert macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Installation"
 
@@ -7610,31 +7884,32 @@ msgstr "Installation"
 msgid "Installer name"
 msgstr "Installer name"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interface"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Interface is linked to item \"%1$s\" on \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Interface is used by items that require this type of the interface."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "Interface with DNS \"%1$s\" cannot have empty IP address."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "Interface with IP \"%1$s\" cannot have empty DNS name."
@@ -7654,7 +7929,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Internal"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Internal JSON-RPC error."
 
@@ -7662,7 +7937,7 @@ msgstr "Internal JSON-RPC error."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Internal error."
 
@@ -7675,19 +7950,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Interval"
 
@@ -7697,112 +7972,114 @@ msgstr "Interval"
 msgid "Interval (in sec)"
 msgstr "Interval (in sec)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Invalid JSON. An error occurred on the server while parsing the JSON text."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Invalid Request."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Invalid date \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "Invalid first parameter."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "Invalid fourth parameter."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Invalid hostid for macro \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Invalid maintenance period"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Invalid method parameters."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "Invalid number of parameters."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Invalid params."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr "Invalid period for field \"%1$s\"."
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Invalid response code \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Invalid response code range \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "Invalid second parameter."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "Invalid third parameter."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Invalid time period"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventory"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7811,7 +8088,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Inventory field"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Inventory mode"
 
@@ -7819,12 +8096,12 @@ msgstr "Inventory mode"
 msgid "Is online?"
 msgstr "Is online?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Issue"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "It is not possible to filter by user password."
 
@@ -7832,70 +8109,71 @@ msgstr "It is not possible to filter by user password."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "It is not possible to logout from HTTP authentication."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "It is not possible to search by user password."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italian (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Item"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "Item \"%1$s\" already exists on \"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Item \"%1$s\" does not exist on template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Item \"%1$s\" does not exist."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Item \"%1$s\" skipped - user rule."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Item added"
 
@@ -7903,17 +8181,17 @@ msgstr "Item added"
 msgid "Item count"
 msgstr "Item count"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Item deleted"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7927,56 +8205,56 @@ msgstr "Item in \"normal\" state"
 msgid "Item in \"not supported\" state"
 msgstr "Item in \"not supported\" state"
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Item prototype"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Item prototypes"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7984,92 +8262,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Item prototypes of"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Item updated"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Item uses host interface from non-parent host."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Item uses incorrect interface type."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Item will not be refreshed. Please enter a correct update interval."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Item with key \"%1$s\" already exists on \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Item with key \"%1$s\" already exists."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Items"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Items (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Items copied"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Items deleted"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Items list"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Items updated"
 
@@ -8081,72 +8359,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX agent"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX interfaces"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "JSON-rpc error generation failed. No such error \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpc method is not defined."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpc params is not an Array."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "JSON-rpc version is not specified."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber identifier"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "January"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japanese (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Jul"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "July"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Jun"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "June"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8155,40 +8433,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Keep lost resources period (in days)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Key"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Key passphrase"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Keyword"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Korean (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "LATEST DATA"
 
@@ -8219,37 +8497,37 @@ msgstr "LDAP login successful"
 msgid "LDAP login was not successful"
 msgstr "LDAP login was not successful"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "LOST"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Label"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Label location"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Language"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Last"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Last"
@@ -8261,19 +8539,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "Last %1$d issue"
 msgstr[1] "Last %1$d issues"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Last (most recent) T value is < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Last (most recent) T value is = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Last (most recent) T value is > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Last (most recent) T value is NOT N"
 
@@ -8293,28 +8571,28 @@ msgstr "Last 365 days"
 msgid "Last 7 days"
 msgstr "Last 7 days"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Last change"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Last change (descending)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Last check"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Last hour graph"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Last month graph"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Last of"
 
@@ -8322,66 +8600,67 @@ msgstr "Last of"
 msgid "Last seen (age)"
 msgstr "Last seen (age)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Last value"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Last week graph"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Latest data"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Latest events"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr "Latest values"
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Latvian (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Left"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legend"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Length of last (most recent) T value in characters is < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Length of last (most recent) T value in characters is = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Length of last (most recent) T value in characters is > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Length of last (most recent) T value in characters is NOT N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Line"
 
@@ -8389,39 +8668,29 @@ msgstr "Line"
 msgid "Link"
 msgstr "Link"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Link indicators"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Link name should be unique for map \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr "Link new templates"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Link templates"
 
@@ -8433,50 +8702,50 @@ msgstr "Link to template"
 msgid "Link to templates"
 msgstr "Link to templates"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Link with templates"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Linked templates"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Linked to"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Links between the selected elements"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Links for the selected element"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "List is empty"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "Lithuanian (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Loading..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Local time"
 
@@ -8493,36 +8762,36 @@ msgid "Location longitude"
 msgstr "Location longitude"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "Log severity of the last log entry is < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "Log severity of the last log entry is = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "Log severity of the last log entry is > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "Log severity of the last log entry is NOT N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Log time format"
@@ -8531,12 +8800,12 @@ msgstr "Log time format"
 msgid "Log unmatched SNMP traps"
 msgstr "Log unmatched SNMP traps"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Logged in as"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8547,12 +8816,12 @@ msgstr "Login"
 msgid "Login as Guest"
 msgstr "Login as Guest"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Login failed \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8561,8 +8830,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Login name or password is incorrect."
 
@@ -8583,22 +8853,18 @@ msgstr "Low-level discovery rule in \"normal\" state"
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr "Low-level discovery rule in \"not supported\" state"
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8610,7 +8876,7 @@ msgstr "MAC address A"
 msgid "MAC address B"
 msgstr "MAC address B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "MAINTENANCE"
 
@@ -8635,49 +8901,49 @@ msgstr "MOST BUSY TRIGGERS TOP 100"
 msgid "Macro"
 msgstr "Macro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Macro \"%1$s\" already exists on \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Macro \"%1$s\" already exists."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "Macro \"%1$s\" is not unique."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "Macro with globalmacroid \"%1$s\" does not exist."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Macro with hostmacroid \"%1$s\" does not exist."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Macros"
 
@@ -8685,31 +8951,36 @@ msgstr "Macros"
 msgid "Macros updated"
 msgstr "Macros updated"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Maintenance"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr "Maintenance action condition value must be empty."
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Maintenance added"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Maintenance deleted"
 
@@ -8717,7 +8988,7 @@ msgstr "Maintenance deleted"
 msgid "Maintenance period"
 msgstr "Maintenance period"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Maintenance period length"
 
@@ -8733,25 +9004,25 @@ msgstr "Maintenance status"
 msgid "Maintenance type"
 msgstr "Maintenance type"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Maintenance updated"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Maintenance with data collection"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Maintenance without data collection"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Mandatory parameter is missing."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Manual"
 
@@ -8762,12 +9033,12 @@ msgstr "Manual Logout"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Map"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Map \"%1$s\" skipped - user rule."
@@ -8777,12 +9048,12 @@ msgstr "Map \"%1$s\" skipped - user rule."
 msgid "Map \"%s\""
 msgstr "Map \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Map \"%s\" created."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Map \"%s\" updated."
@@ -8799,12 +9070,12 @@ msgstr "Map label type"
 msgid "Map save operation failed."
 msgstr "Map save operation failed."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr "Map with name \"%s\" already exists."
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Mapped to"
 
@@ -8814,23 +9085,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Mapping value \"%1$s\" is not unique."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Mappings"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Maps"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "March"
 
@@ -8838,28 +9109,34 @@ msgstr "March"
 msgid "Mark elements on trigger status change"
 msgstr "Mark elements on trigger status change"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Mark others"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Mark selected"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr "Mask"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Mass update"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Mass update elements"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Max count of elements to show inside table cell"
@@ -8873,32 +9150,11 @@ msgstr "Max count of elements to show inside table cell \"%1$s\"."
 msgid "Max count of events per trigger to show"
 msgstr "Max count of events per trigger to show"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximize"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgstr[1] "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgstr[1] "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgstr[1] "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8906,107 +9162,101 @@ msgid "Maximum number of flexible intervals added"
 msgstr "Maximum number of flexible intervals added"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "Maximum time period to display is %1$s day."
 msgstr[1] "Maximum time period to display is %1$s days."
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "Maximum value for period T is < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "Maximum value for period T is = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "Maximum value for period T is > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "Maximum value for period T is NOT N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgstr[1] "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "May"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "May"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Media"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Media type"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Media type \"%s\" already exists."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Media type added"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Media type deleted"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Media type disabled"
 msgstr[1] "Media type disabled"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Media type enabled"
 msgstr[1] "Media type enabled"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Media type updated"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Media types"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Media types used by action \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9021,14 +9271,14 @@ msgid "Memory limit: %s"
 msgstr "Memory limit: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9038,7 +9288,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Message"
 
@@ -9046,66 +9296,66 @@ msgstr "Message"
 msgid "Message actions"
 msgstr "Message actions"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Message text limit"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Message timeout"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Message timeout (seconds)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Messages"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Messaging"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Method not found."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Middle"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimize"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9114,80 +9364,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr "Minimum severity"
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] "Minimum time period to display is %1$s hour."
 msgstr[1] "Minimum time period to display is %1$s hours."
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr "Minimum trigger severity"
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "Minimum value for period T is < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "Minimum value for period T is = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "Minimum value for period T is > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "Minimum value for period T is NOT N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Minutes"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr "Missing \"%1$s\" field for action condition."
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr "Missing \"%1$s\" field for item."
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr "Missing \"%1$s\" field for period."
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr "Missing \"gitemid\" field for item."
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Missing \"itemid\" field for item."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr "Missing \"name\" field for graph prototype."
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Missing \"name\" field for graph."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Missing item \"%1$s\" for host \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Missing items for graph \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr "Missing items for graph prototype \"%1$s\"."
@@ -9197,7 +9444,7 @@ msgstr "Missing items for graph prototype \"%1$s\"."
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Missing key \"%1$s\" for host \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Missing parameter: usrgrpids."
 
@@ -9209,18 +9456,18 @@ msgstr "Mode"
 msgid "Model"
 msgstr "Model"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Mon"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Monday"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Monitored by proxy"
 
@@ -9228,33 +9475,33 @@ msgstr "Monitored by proxy"
 msgid "Monitored host"
 msgstr "Monitored host"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Monitoring"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Month"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Monthly"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr "More matches found..."
 
@@ -9262,7 +9509,7 @@ msgstr "More matches found..."
 msgid "More than 10 minutes"
 msgstr "More than 10 minutes"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "More than one graph with name \"%1$s\" within host."
@@ -9271,19 +9518,19 @@ msgstr "More than one graph with name \"%1$s\" within host."
 msgid "Most busy triggers top 100"
 msgstr "Most busy triggers top 100"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Multiple PROBLEM events"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Multiple PROBLEM events generation"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Mute"
 
@@ -9296,60 +9543,58 @@ msgstr "NETWORK MAPS"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "NO DATA"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM authentication"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9360,26 +9605,32 @@ msgstr "NTLM authentication"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Name"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr "Name for group prototype \"%1$s\" must contain macros."
@@ -9398,12 +9649,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9411,7 +9662,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Network map added"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Network map deleted"
 
@@ -9423,7 +9674,7 @@ msgstr "Network map updated"
 msgid "Network maps"
 msgstr "Network maps"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Never"
 
@@ -9431,24 +9682,24 @@ msgstr "Never"
 msgid "Never executed"
 msgstr "Never executed"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "New"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "New application"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "New condition"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "New element"
 
@@ -9459,16 +9710,16 @@ msgstr "New element"
 msgid "New flexible interval"
 msgstr "New flexible interval"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "New group"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "New host group"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "New item for the graph"
 
@@ -9476,83 +9727,99 @@ msgstr "New item for the graph"
 msgid "New media"
 msgstr "New media"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "New regular expression"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "New service time"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Next"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Next"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "No"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr "No \"%1$s\" given for graph prototype."
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr "No \"%1$s\" given for graph."
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr "No \"%1$s\" given for host prototype."
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr "No \"%2$s\" given for host prototype \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "No \"ymax_type\" field for graph \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "No \"ymin_type\" field for graph \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr "No IPMI interfaces found."
 
@@ -9560,25 +9827,25 @@ msgstr "No IPMI interfaces found."
 msgid "No IT services found."
 msgstr "No IT services found."
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr "No JMX interfaces found."
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr "No SNMP OID specified."
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr "No SNMP community specified."
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr "No SNMP interfaces found."
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "No URL provided for screen element."
 
@@ -9604,8 +9871,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "No actions found."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr "No agent interfaces found."
 
@@ -9615,7 +9882,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "No application with ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr "No applications found."
 
@@ -9623,30 +9890,31 @@ msgstr "No applications found."
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "No authentication type specified for action operation command \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "No authentication user name specified for action operation command \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "No authentication user name specified."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "No command specified for action operation."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "No command type specified for action operation."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "No conditions defined."
 
@@ -9655,27 +9923,27 @@ msgstr "No conditions defined."
 msgid "No data collection"
 msgstr "No data collection"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "No data received during period of time T, then N = 1, 0 - otherwise"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "No data received during period of time T, then N NOT 1, 0 - otherwise"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "No default interface for \"%1$s\" type on \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "No dependencies defined."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "No details"
 
@@ -9683,39 +9951,39 @@ msgstr "No details"
 msgid "No discovered devices found."
 msgstr "No discovered devices found."
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr "No discovery rule ID given for host prototype \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "No discovery rule IDs given."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr "No discovery rules found."
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "No errors found."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "No events"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr "No events found."
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "No events to acknowledge"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "No execution target specified for action operation command \"%s\"."
@@ -9730,7 +9998,7 @@ msgstr "No file was uploaded."
 msgid "No flexible intervals defined."
 msgstr "No flexible intervals defined."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "No graph ID provided for screen element."
 
@@ -9739,7 +10007,11 @@ msgstr "No graph ID provided for screen element."
 msgid "No graph item with graphid \"%s\"."
 msgstr "No graph item with graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr "No graph prototypes found."
 
@@ -9748,48 +10020,49 @@ msgid "No graphs added."
 msgstr "No graphs added."
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr "No graphs found."
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "No groups for host \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "No groups for hosts."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "No host IDs given."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "No host given for macro \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr "No host group ID for group prototype."
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "No host group ID provided for screen element."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr "No host groups found."
 
@@ -9802,17 +10075,22 @@ msgstr "No host groups with groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr "No host prototypes found."
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "No host with hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr "No hosts found."
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "No icon for map element \"%s\"."
@@ -9831,33 +10109,40 @@ msgstr "No images found."
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "No interface found"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "No interface found."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr "No interface provided for proxy \"%s\"."
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "No interfaces for host \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "No item ID provided for screen element."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr "No item keys found."
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr "No item prototypes found."
 
@@ -9876,7 +10161,7 @@ msgid "No items defined."
 msgstr "No items defined."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr "No items found."
 
@@ -9892,7 +10177,7 @@ msgstr "No maintenance periods defined."
 msgid "No maintenance periods found."
 msgstr "No maintenance periods found."
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "No map ID provided for screen element."
 
@@ -9901,15 +10186,15 @@ msgid "No maps added."
 msgstr "No maps added."
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr "No maps found."
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr "No matches found"
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr "No media found."
 
@@ -9921,133 +10206,178 @@ msgstr "No media types found."
 msgid "No notifications found."
 msgstr "No notifications found."
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr "No operations defined."
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "No permission for graph \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "No permission for host \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "No permission for item \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "No permission for template \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "No permissions"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "No permissions for map \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "No permissions for screen \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "No permissions for system access."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "No permissions to referred object or it does not exist!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "No private key file specified for action operation command \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "No private key file specified."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr "No proxies found."
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "No proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "No public key file specified for action operation command \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "No public key file specified."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "No recipients for action operation message."
 
@@ -10055,7 +10385,7 @@ msgstr "No recipients for action operation message."
 msgid "No regular expressions found."
 msgstr "No regular expressions found."
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "No screen ID provided for screen element."
 
@@ -10063,82 +10393,83 @@ msgstr "No screen ID provided for screen element."
 msgid "No screens added."
 msgstr "No screens added."
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr "No screens found."
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "No script specified for action operation command."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr "No scripts found."
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr "No slide shows found."
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr "No slides found."
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr "No status for proxy."
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "No target selected"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "No target selected."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr "No templates found."
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr "No templates linked."
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "No times defined. Work 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "No trigger"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "No trigger with triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "No triggers defined."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "No triggers found."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr "No user groups found."
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr "No users found."
 
@@ -10147,57 +10478,58 @@ msgid "No value maps found."
 msgstr "No value maps found."
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "No values found."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr "No web scenarios found."
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "None"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normal"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Normal view"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Not Ack"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Not Templated items"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Not all templates are linked to \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Not allowed to set password for user \"guest\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Not available"
 
@@ -10206,7 +10538,7 @@ msgstr "Not available"
 msgid "Not classified"
 msgstr "Not classified"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Not connected"
 
@@ -10219,8 +10551,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Not supported"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Note"
@@ -10233,7 +10565,7 @@ msgstr "Notes"
 msgid "Nothing"
 msgstr "Nothing"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Nothing to do."
 
@@ -10241,87 +10573,87 @@ msgstr "Nothing to do."
 msgid "Notification report"
 msgstr "Notification report"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notifications"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "November"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Now"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Number of seconds since the Epoch is < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Number of seconds since the Epoch is = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Number of seconds since the Epoch is > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Number of seconds since the Epoch is NOT N"
 
@@ -10329,88 +10661,88 @@ msgstr "Number of seconds since the Epoch is NOT N"
 msgid "Number of status changes"
 msgstr "Number of status changes"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Number of steps"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Number of users (online)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numeric (float)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numeric (integer 64bit)"
 
@@ -10425,16 +10757,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr "OK or no trigger"
 
@@ -10450,8 +10784,7 @@ msgstr "OOB router"
 msgid "OOB subnet mask"
 msgstr "OOB subnet mask"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "OR"
 
@@ -10471,11 +10804,12 @@ msgstr "OS (Short)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "OTHER CONFIGURATION PARAMETERS"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "OVERVIEW"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Oct"
 
@@ -10483,25 +10817,25 @@ msgstr "Oct"
 msgid "Octal"
 msgstr "Octal"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "October"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Off"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "On"
 
@@ -10509,111 +10843,114 @@ msgstr "On"
 msgid "On status change triggers blink for"
 msgstr "On status change triggers blink for"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Once"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr "One of the objects is left without a host group."
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "One time only"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "One-time downtime"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Only Super Admins can create global macros."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Only Super Admins can create host groups."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Only Super Admins can create icon maps."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Only Super Admins can create media types."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Only Super Admins can delete global macros."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Only Super Admins can delete media types."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Only Super Admins can delete user groups."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Only Super Admins can edit media types."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Only Super Admins can update global macros."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Only Super Admins can update icon maps."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Only Zabbix Admins can add user media."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Only Zabbix Admins can change user media."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Only Zabbix Admins can remove user media."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Only items assigned to enabled hosts are counted"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Only one check can be unique."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Only one user group name can be changed at a time."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Only the last 20%% of the indicator is displayed."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr "Only trigger events can be acknowledged."
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Operation \"%s\" already exists."
@@ -10622,28 +10959,28 @@ msgstr "Operation \"%s\" already exists."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operation cannot be performed due to unauthorized request."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Operation condition"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Operation details"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Operation has no group to operate."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Operation has no template to operate."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Operation type"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operations"
@@ -10652,25 +10989,27 @@ msgstr "Operations"
 msgid "Operator"
 msgstr "Operator"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10700,24 +11039,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Original"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Original blue"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Other"
 
@@ -10725,19 +11064,19 @@ msgstr "Other"
 msgid "Other configuration parameters"
 msgstr "Other configuration parameters"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Other groups"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Other hosts"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10747,21 +11086,21 @@ msgstr "Other hosts | Group"
 msgid "Other parameters"
 msgstr "Other parameters"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Other | group"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Others"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Overridden by"
@@ -10774,14 +11113,11 @@ msgstr "Override item history period"
 msgid "Override item trend period"
 msgstr "Override item trend period"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Overview"
 
@@ -10789,7 +11125,7 @@ msgstr "Overview"
 msgid "Overview by proxy"
 msgstr "Overview by proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10798,147 +11134,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "PERSONAL DASHBOARD"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHP databases support"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "PHP gd FreeType support"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "PHP gd JPEG support"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "PHP gd PNG support"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP option max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP option max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP option memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP option post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP option upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP session auto start"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP time zone"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP version"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10947,32 +11291,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLEM"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "Page received incorrect data"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palette"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palette #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -10981,7 +11327,7 @@ msgstr "Parameter"
 msgid "Parent discovery rules"
 msgstr "Parent discovery rules"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr "Parent graphs"
 
@@ -11001,33 +11347,33 @@ msgstr "Parent triggers"
 msgid "Parent web scenarios"
 msgstr "Parent web scenarios"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Parse SQL error [%1$s] in [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Parse error"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Passive"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11037,20 +11383,21 @@ msgstr "Passive"
 msgid "Password"
 msgstr "Password"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Password (once again)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Password required for media type."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Password should not be empty"
 
@@ -11059,21 +11406,21 @@ msgstr "Password should not be empty"
 msgid "Peak memory usage: %s"
 msgstr "Peak memory usage: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Percentile line (left)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Percentile line (right)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11081,12 +11428,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Period"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Period type"
@@ -11096,24 +11443,24 @@ msgstr "Period type"
 msgid "Periods"
 msgstr "Periods"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Permissions"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Permissions can be assigned for user groups only."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persian (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Pie"
 
@@ -11125,55 +11472,56 @@ msgstr "Placing algorithm"
 msgid "Plain text"
 msgstr "Plain text"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Play"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Play sound"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Please correct all issues and press \"Retry\" button"
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Please enter confirmation text."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Please select two elements"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polish (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Populates host inventory field"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Port cannot be empty for host interface."
 
@@ -11181,51 +11529,51 @@ msgstr "Port cannot be empty for host interface."
 msgid "Port range"
 msgstr "Port range"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portuguese (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Portuguese (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Position"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Post"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Preview"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Previous"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Previous"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Previous value is < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Previous value is = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Previous value is > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Previous value is NOT N"
 
@@ -11274,30 +11622,31 @@ msgstr "Privacy passphrase"
 msgid "Privacy protocol"
 msgstr "Privacy protocol"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Private key file"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Privilege level"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Probably php-ldap module is missing."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problem"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Problem display"
 
@@ -11309,16 +11658,16 @@ msgstr "Problem on"
 msgid "Problem time"
 msgstr "Problem time"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Problem, if all children have problems"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problem, if at least one child has a problem"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problems"
 
@@ -11326,75 +11675,71 @@ msgstr "Problems"
 msgid "Profile"
 msgstr "Profile"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototypes"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxies"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Proxy \"%s\" already exists."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy added"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy deleted"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Proxy hosts"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Proxy interface creation failed."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Proxy interface update failed."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Proxy mode"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Proxy name"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy updated"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Public key"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11405,7 +11750,7 @@ msgstr "Public key file"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "QUEUE OF ITEMS TO BE UPDATED"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Queue"
 
@@ -11413,18 +11758,18 @@ msgstr "Queue"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Read"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Read only"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Read-write"
 
@@ -11436,7 +11781,7 @@ msgstr "Reason"
 msgid "Received value"
 msgstr "Received value"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11444,11 +11789,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Recipient"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Recipient (ascending)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Recipient (descending)"
 
@@ -11459,28 +11804,28 @@ msgstr "Recipient (descending)"
 msgid "Recipient(s)"
 msgstr "Recipient(s)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Recovery"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Recovery message"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Recovery subject"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Refresh (in seconds)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Refresh time multiplier"
 
@@ -11498,47 +11843,51 @@ msgstr "Refresh unsupported items (in sec) \"%1$s\"."
 msgid "Regular expression"
 msgstr "Regular expression"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "Regular expression \"%s\" already exists."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Regular expression added"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Regular expression deleted"
 msgstr[1] "Regular expressions deleted"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Regular expression does not exist."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Regular expression updated"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11555,26 +11904,28 @@ msgstr "Remote command"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11585,21 +11936,19 @@ msgstr "Remote command"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Remove"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11607,11 +11956,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Remove element"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Remove from"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Remove from favorites"
@@ -11620,7 +11969,7 @@ msgstr "Remove from favorites"
 msgid "Remove from host group"
 msgstr "Remove from host group"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Remove from host groups"
 
@@ -11632,28 +11981,28 @@ msgstr "Remove host"
 msgid "Remove link"
 msgstr "Remove link"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Remove selected"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Replace"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr "Replace applications"
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Replace depenencies"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Replace host groups"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Report"
 
@@ -11661,35 +12010,36 @@ msgstr "Report"
 msgid "Report 1"
 msgstr "Report 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Report 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Report 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Reports"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Required"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Required field \"expression\" is missing in icon mapping."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Required field \"iconid\" is missing in icon mapping."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Required field \"inventory_link\" is missing in icon mapping."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Required host permissions"
 
@@ -11697,29 +12047,31 @@ msgstr "Required host permissions"
 msgid "Required performance (vps)"
 msgstr "Required performance (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Required server performance, new values per second"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Required status codes"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Required string"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Reset"
 
@@ -11738,9 +12090,9 @@ msgstr "Reset all names and colors to default values?"
 msgid "Reset confirmation"
 msgstr "Reset confirmation"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11753,7 +12105,7 @@ msgstr "Resolved"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Resource"
@@ -11768,15 +12120,15 @@ msgstr "Response time"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Result"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Result is FALSE"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Result is TRUE"
 
@@ -11789,7 +12141,8 @@ msgstr "Result of \"%s\""
 msgid "Result type"
 msgstr "Result type"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr "Retries"
 
@@ -11797,60 +12150,69 @@ msgstr "Retries"
 msgid "Retries left"
 msgstr "Retries left"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Retry"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Right"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr "Romanian (ro_RO)"
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Row span"
 
@@ -11858,11 +12220,11 @@ msgstr "Row span"
 msgid "Rows"
 msgstr "Rows"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Rows per page"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Rules"
 
@@ -11907,20 +12269,20 @@ msgid "Run remote commands on hosts"
 msgstr "Run remote commands on hosts"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -11936,7 +12298,7 @@ msgstr "SCREENS"
 msgid "SEARCH"
 msgstr "SEARCH"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVER"
 
@@ -11951,13 +12313,13 @@ msgstr "SHA"
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "SLIDE SHOWS"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11966,17 +12328,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP email"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP server"
@@ -11992,7 +12354,7 @@ msgstr "SNMP Key"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12004,9 +12366,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMP interfaces"
@@ -12015,7 +12377,7 @@ msgstr "SNMP interfaces"
 msgid "SNMP trap"
 msgstr "SNMP trap"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "SNMP trap key is invalid."
 
@@ -12039,7 +12401,7 @@ msgstr "SNMPv3 agent"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "SQL count: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12057,7 +12419,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQL statement execution has failed \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12066,15 +12428,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH agent"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "STATUS OF DISCOVERY"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STATUS OF TRIGGERS"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "STATUS OF WEB MONITORING"
 
@@ -12082,92 +12464,92 @@ msgstr "STATUS OF WEB MONITORING"
 msgid "STATUS OF ZABBIX"
 msgstr "STATUS OF ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Sat"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Saturday"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Save"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Save and return"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Scale"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Scenario"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Scenario added"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Scenario updated"
 
@@ -12179,7 +12561,7 @@ msgstr "Scenarios"
 msgid "Schedule"
 msgstr "Schedule"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr "Scheduled check"
 
@@ -12190,126 +12572,125 @@ msgstr "Scheduled check"
 msgid "Screen"
 msgstr "Screen"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Screen \"%1$s\" added."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "Screen \"%1$s\" already exists on template \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "Screen \"%1$s\" already exists."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Screen \"%1$s\" skipped - user rule."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Screen \"%1$s\" updated."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Screen added"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Screen cell configuration"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Screen deleted"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Screen should contain at least one row and column."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Screen updated"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Screens"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Script"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Script \"%1$s\" already exists."
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Script added"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Script deleted"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Script name"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
@@ -12318,17 +12699,17 @@ msgstr "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgid "Script profiler"
 msgstr "Script profiler"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Script updated"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr "Script with scriptid \"%1$s\" does not exist."
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -12349,7 +12730,7 @@ msgstr "Search pattern is empty"
 msgid "Search/Filter elements limit"
 msgstr "Search/Filter elements limit"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Second"
 
@@ -12381,7 +12762,7 @@ msgstr "Secondary POC phone B"
 msgid "Secondary POC screen name"
 msgstr "Secondary POC screen name"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Seconds"
 
@@ -12400,69 +12781,76 @@ msgstr "Security level"
 msgid "Security name"
 msgstr "Security name"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Select"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Select prototype"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Select rows with value like"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Selected"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Selected actions deleted"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Selected elements"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Selected groups"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Selected hosts"
 
@@ -12478,7 +12866,7 @@ msgstr "Send message to user groups"
 msgid "Send message to users"
 msgstr "Send message to users"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Send only to"
 
@@ -12486,11 +12874,11 @@ msgstr "Send only to"
 msgid "Send to"
 msgstr "Send to"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Send to User groups"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Send to Users"
 
@@ -12499,17 +12887,17 @@ msgstr "Send to Users"
 msgid "Sent"
 msgstr "Sent"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Sep"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Separated"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "September"
 
@@ -12521,7 +12909,7 @@ msgstr "Serial number A"
 msgid "Serial number B"
 msgstr "Serial number B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Server"
@@ -12530,44 +12918,44 @@ msgstr "Server"
 msgid "Server info"
 msgstr "Server info"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Server time"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Service"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Service \"%1$s\" cannot be dependent on itself."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Service \"%1$s\" is already hardlinked to a different service."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Service cannot be parent and child at the same time."
 
@@ -12583,11 +12971,11 @@ msgstr "Service deleted"
 msgid "Service port"
 msgstr "Service port"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "Service start time must be less than end time."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Service times"
 
@@ -12599,49 +12987,53 @@ msgstr "Service type"
 msgid "Service updated"
 msgstr "Service updated"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Services"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Services form a circular dependency."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Session terminated, re-login, please."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Severity"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Severity (descending)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Severity name cannot be empty."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Show"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Show all"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Show details"
 
@@ -12671,35 +13063,36 @@ msgstr "Show events not older than (in days)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Show events not older than (in days) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Show hosts in maintenance"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Show items with name like"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Show items without data"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Show legend"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Show lines"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Show selected"
 
@@ -12707,19 +13100,22 @@ msgstr "Show selected"
 msgid "Show selected groups"
 msgstr "Show selected groups"
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Show text as HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Show triggers"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Show unacknowledged"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Show value"
@@ -12728,11 +13124,11 @@ msgstr "Show value"
 msgid "Show warning if Zabbix server is down"
 msgstr "Show warning if Zabbix server is down"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Show working time"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Shown"
 
@@ -12752,6 +13148,10 @@ msgstr "Simple check"
 msgid "Simple graph"
 msgstr "Simple graph"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Site ZIP / postal"
@@ -12789,7 +13189,7 @@ msgid "Site state / province"
 msgstr "Site state / province"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12807,16 +13207,16 @@ msgstr "Skipped copying of graph \"%1$s\" to host \"%2$s\"."
 msgid "Slide"
 msgstr "Slide"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Slide show"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Slide show \"%s\" already exists."
@@ -12825,11 +13225,11 @@ msgstr "Slide show \"%s\" already exists."
 msgid "Slide show added"
 msgstr "Slide show added"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Slide show deleted"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Slide show must contain slides."
 
@@ -12837,10 +13237,10 @@ msgstr "Slide show must contain slides."
 msgid "Slide show updated"
 msgstr "Slide show updated"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Slide shows"
 
@@ -12848,15 +13248,15 @@ msgstr "Slide shows"
 msgid "Slides"
 msgstr "Slides"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Snooze"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Soft"
 
@@ -12889,28 +13289,28 @@ msgid "Software application E"
 msgstr "Software application E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Sort by"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Sort order (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Sort triggers by"
 
@@ -12923,11 +13323,11 @@ msgstr "Sorting by field \"%1$s\" not allowed."
 msgid "Source"
 msgstr "Source"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spanish (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Specified script does not exist or you do not have rights on it for action operation command."
 
@@ -12935,63 +13335,63 @@ msgstr "Specified script does not exist or you do not have rights on it for acti
 msgid "Speed"
 msgstr "Speed"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Stacked"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Standard items"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Start in"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "State"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Status"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Status (ascending)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Status (descending)"
 
@@ -13004,7 +13404,7 @@ msgstr "Status calculation"
 msgid "Status calculation algorithm"
 msgstr "Status calculation algorithm"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Status codes"
 
@@ -13013,7 +13413,7 @@ msgid "Status of Web monitoring"
 msgstr "Status of Web monitoring"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Status of Zabbix"
 
@@ -13030,40 +13430,40 @@ msgid "Status only"
 msgstr "Status only"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Step"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Step duration"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Step of scenario"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr "Step with name \"%1$s\" already exists."
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Steps"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Stop"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Store value"
@@ -13072,11 +13472,11 @@ msgstr "Store value"
 msgid "Straight"
 msgstr "Straight"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Style"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Subfilter [affects only filtered data!]"
 
@@ -13084,11 +13484,11 @@ msgstr "Subfilter [affects only filtered data!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Subject"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Submap"
 
@@ -13097,32 +13497,32 @@ msgid "Success Audit"
 msgstr "Success Audit"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "Sum of values of a period T is < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Sum of values of a period T is = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Sum of values of a period T is > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "Sum of values of a period T is NOT N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Sun"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Sunday"
 
@@ -13130,27 +13530,27 @@ msgstr "Sunday"
 msgid "Support"
 msgstr "Support"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Last Name"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Swedish (sv_SE)"
 
@@ -13158,16 +13558,16 @@ msgstr "Swedish (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "Switching authentication method will reset all except this session! Continue?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "System default"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "System error."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13176,21 +13576,21 @@ msgid "System status"
 msgstr "System status"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -13209,11 +13609,11 @@ msgid "TOTAL"
 msgstr "TOTAL"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "TRIGGER COMMENTS"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "TRUE"
 
@@ -13231,14 +13631,14 @@ msgstr "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgid "Tag"
 msgstr "Tag"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Target"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Target list"
 
@@ -13247,130 +13647,133 @@ msgid "Target type"
 msgstr "Target type"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Template"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Template \"%1$s\" already exists."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Template \"%1$s\" for host \"%2$s\" does not exist."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Template added"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Template cannot be linked to another template more than once even through other templates."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Template deleted"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Template group"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Template linkage"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Template list"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Template name"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Template screens"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Template trigger"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Template updated"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Template with the same name \"%s\" already exists."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Template with the same visible name \"%s\" already exists."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Templated items"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Templates"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Test"
 
@@ -13378,11 +13781,11 @@ msgstr "Test"
 msgid "Test authentication"
 msgstr "Test authentication"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Test confirmation"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Test data"
 
@@ -13396,22 +13799,22 @@ msgid "Test string"
 msgstr "Test string"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Text"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13419,7 +13822,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "The frontend does not match Zabbix database."
@@ -13434,26 +13837,26 @@ msgstr "The frontend does not match Zabbix database. Current database version (m
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "The image is used in icon map %1$s."
 msgstr[1] "The image is used in icon maps %1$s."
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] "The image is used in map %1$s."
 msgstr[1] "The image is used in maps %1$s."
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
@@ -13462,19 +13865,19 @@ msgstr "The item is not discovered anymore and will be deleted in %1$s (on %2$s
 msgid "The queue is empty."
 msgstr "The queue is empty."
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "The received JSON is not a valid JSON-RPC Request."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "The requested remote-procedure does not exist / is not available"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr "The web scenario application belongs to a different host than the web scenario host."
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Theme"
 
@@ -13485,11 +13888,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "There is \"%1$d\" group with Internal GUI access."
 msgstr[1] "There are \"%1$d\" groups with Internal GUI access."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Third"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "This field is automatically populated by item \"%s\"."
@@ -13498,11 +13901,11 @@ msgstr "This field is automatically populated by item \"%s\"."
 msgid "This month"
 msgstr "This month"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "This screen-column is not empty. Delete it?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "This screen-row is not empty. Delete it?"
 
@@ -13514,27 +13917,27 @@ msgstr "This week"
 msgid "This year"
 msgstr "This year"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Thu"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Thursday"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Till"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13543,28 +13946,28 @@ msgstr "Till"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Time"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Time (ascending)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Time (descending)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13572,54 +13975,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Time period"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Time shift"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Time type"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Timeout"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Title"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "To"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "To set a host interface select a single item type for all items"
 
@@ -13627,17 +14030,18 @@ msgstr "To set a host interface select a single item type for all items"
 msgid "Today"
 msgstr "Today"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Top"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Total"
 
@@ -13655,7 +14059,7 @@ msgstr "Total time: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Transaction has not been closed. Aborting..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Transport error."
 
@@ -13672,91 +14076,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trends"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Trigger"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Trigger \"%1$s\" already exists on \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Trigger \"%1$s\" skipped - user rule."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Trigger \"%s\" belongs to templates with different linkages."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Trigger added"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr "Trigger cannot be dependent on a trigger that is inherited from it."
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Trigger comments"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Trigger deleted"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Trigger displaying options"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13771,11 +14175,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Trigger expression condition"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "Trigger expression must contain at least one host:key reference."
 
@@ -13783,7 +14188,7 @@ msgstr "Trigger expression must contain at least one host:key reference."
 msgid "Trigger form"
 msgstr "Trigger form"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "Trigger has items from template \"%1$s\" that is not linked to host."
@@ -13796,12 +14201,12 @@ msgstr "Trigger in \"normal\" state"
 msgid "Trigger in \"unknown\" state"
 msgstr "Trigger in \"unknown\" state"
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Trigger just added. No status update so far."
 
@@ -13813,52 +14218,52 @@ msgstr "Trigger label type"
 msgid "Trigger name"
 msgstr "Trigger name"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Trigger prototype"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Trigger prototypes"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13866,23 +14271,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Trigger prototypes of"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Trigger severities"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Trigger severity"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Trigger updated"
 
@@ -13890,40 +14303,41 @@ msgstr "Trigger updated"
 msgid "Trigger value"
 msgstr "Trigger value"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Triggers"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr "Triggers (e/d)[p/o]"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Triggers deleted"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Triggers info"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Triggers massupdate"
 
@@ -13931,78 +14345,78 @@ msgstr "Triggers massupdate"
 msgid "Triggers overview"
 msgstr "Triggers overview"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Triggers status"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Triggers top 100"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Triggers with severity"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Truncated"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Try to read inaccessible property \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Tue"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Turkish (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Two elements should be selected"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Type"
 
@@ -14010,62 +14424,64 @@ msgstr "Type"
 msgid "Type (Full details)"
 msgstr "Type (Full details)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Type (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Type (ascending)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Type (descending)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Type of calculation"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Type of information"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "Type of information must be \"Log\" for log key."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "Type of information must be \"Numeric (float)\" for aggregate items."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Types"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "UP"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (after login)"
 
@@ -14081,20 +14497,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr ""
+
+#: include/html.inc.php:112
 msgid "URL parameter cannot be array."
 msgstr "URL parameter cannot be array."
 
-#: include/html.inc.php:112
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr "URL parameter name is empty."
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 characters)"
 
@@ -14102,15 +14528,11 @@ msgstr "USA (160 characters)"
 msgid "USER PROFILE"
 msgstr "USER PROFILE"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukrainian (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Unable to select configuration."
 
@@ -14118,7 +14540,7 @@ msgstr "Unable to select configuration."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "Unable to upload file because \"file_uploads\" is disabled."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Unacknowledged"
 
@@ -14131,20 +14553,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Unacknowledged PROBLEM events"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Unacknowledged only"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Unblock selected"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Unblock selected users?"
 
@@ -14153,29 +14575,29 @@ msgstr "Unblock selected users?"
 msgid "Units"
 msgstr "Units"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14185,23 +14607,20 @@ msgstr "Unknown"
 msgid "Unknown action"
 msgstr "Unknown action"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Unknown calculation algorithm of service status"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Unknown function."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Unknown host item, no such item in selected host"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Unknown host, no such host present in system"
 
@@ -14213,23 +14632,23 @@ msgstr "Unknown interface type."
 msgid "Unknown resource"
 msgstr "Unknown resource"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Unknown value type"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Unlink"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Unlink and clear"
 
@@ -14237,61 +14656,61 @@ msgstr "Unlink and clear"
 msgid "Unlink from template"
 msgstr "Unlink from template"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Unlink from templates"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Application \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Item \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Unmute"
 
@@ -14305,32 +14724,43 @@ msgstr "Unsupported import file extension \"%1$s\"."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Unsupported import format \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr "Unsupported parameter \"%1$s\" for group prototype."
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Up"
@@ -14341,34 +14771,34 @@ msgid "Up"
 msgstr "Up"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Update"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Update existing"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Update interval"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Update interval (in sec)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Updated"
 
@@ -14376,55 +14806,55 @@ msgstr "Updated"
 msgid "Updated status of host"
 msgstr "Updated status of host"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Updated: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Updated: Application \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Updated: Item \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Updated: Trigger \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Upload"
 
@@ -14432,14 +14862,14 @@ msgstr "Upload"
 msgid "Upper level maps"
 msgstr "Upper level maps"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Uptime"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14447,10 +14877,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Uptime/Downtime"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14465,84 +14895,88 @@ msgid "Used in actions"
 msgstr "Used in actions"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "User"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "User \"%s\" cannot be without user group."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "User added"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "User can't change type for himself"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "User cannot add himself to a disabled group or a group with disabled GUI access."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "User cannot change GUI access for himself."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "User cannot change status of himself"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "User cannot change status of himself."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "User deleted"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "User group"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "User group \"%1$s\" is used in script \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "User group \"%s\" already exists."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14559,34 +14993,34 @@ msgstr "User group for database down message \"%1$s\"."
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "User groups"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "User is not allowed to delete himself."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "User may not modify system status for himself by becoming a member of user group \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "User name"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "User name does not match with DB"
 
@@ -14612,243 +15046,243 @@ msgstr ""
 msgid "User sessions"
 msgstr "User sessions"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "User type"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "User updated"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "User with alias \"%s\" already exists."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Username"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Users"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Users (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Users unblocked"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Value"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
@@ -14883,11 +15317,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14933,10 +15367,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Value map with valuemapid \"%1$s\" does not exist."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Value mapping"
 
@@ -14945,7 +15379,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "Value mapping must have at least one mapping."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14957,8 +15391,8 @@ msgstr "Value: no data"
 msgid "Values"
 msgstr "Values"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Variables"
 
@@ -14971,64 +15405,69 @@ msgid "Verbose"
 msgstr "Verbose"
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Vertical align"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "View is not rendered."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Visible name"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Visible name cannot be empty if host name is missing."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Warning"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "We are sorry, the maximum possible number of elements to remember has been reached."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15036,66 +15475,84 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web monitoring"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Web scenario \"%1$s\" already exists."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Web scenario deleted"
 
-#: httpconf.php:337
+#: httpconf.php:365
 #, fuzzy
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web scenario disabled"
 msgstr[1] "Web scenario disabled"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr "Web scenario missing parameters: %1$s"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr "Web scenario must have at least one step."
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr "Web scenario step \"%1$s\" already exists."
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr "Web scenario step name should contain only printable characters."
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr "Web scenario step number cannot be less than 1."
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Web scenarios"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Wed"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Wednesday"
 
@@ -15103,9 +15560,9 @@ msgstr "Wednesday"
 msgid "Week"
 msgstr "Week"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Weekly"
 
@@ -15113,12 +15570,12 @@ msgstr "Weekly"
 msgid "When active"
 msgstr "When active"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Width"
@@ -15128,28 +15585,28 @@ msgstr "Width"
 msgid "With data collection"
 msgstr "With data collection"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "With last event unacknowledged"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "With problems"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "With triggers"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "With unacknowledged events"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Without problems"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Without triggers"
 
@@ -15158,7 +15615,7 @@ msgid "Wizard"
 msgstr "Wizard"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15171,180 +15628,165 @@ msgstr "Working time"
 msgid "Working time \"%1$s\"."
 msgstr "Working time \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Write"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Wrong fields for dependency for service \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Wrong fields for element."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Wrong fields for host \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr "Wrong fields for image \"%1$s\"."
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr "Wrong fields for image."
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr "Wrong fields for linktrigger delete."
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr "Wrong fields for linktrigger update."
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr "Wrong fields for linktrigger."
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Wrong fields for macro \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr "Wrong fields for map link."
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Wrong fields for media type."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr "Wrong fields for proxy \"%1$s\"."
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Wrong fields for script."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Wrong fields for service \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Wrong fields for time for service \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Wrong fields for trigger."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Wrong fields for user \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Wrong macro \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "X label"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML file contains error %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML file contains errors"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML file contains fatal error %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML file contains warning %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Y axis MAX value"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y axis MAX value must be greater than Y axis MIN value."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Y axis MIN value"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Y axis side"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Y label"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "m/d/Y h:i:s A"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "m/d/Y h:i:s A"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "m/d/Y"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "m/d/Y h:i A"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr "m/d/Y h:i:s A"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15352,96 +15794,105 @@ msgstr "m/d/Y h:i:s A"
 msgid "Year"
 msgstr "Year"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Yearly"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Yes"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "You are not allowed to alter privileges for user \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "You are not logged in."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "You can not switch hosts for current selection."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "You did not specify host for operation."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "You did not specify host group for operation."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "You did not specify targets for action operation command \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "You did not specify targets for action operation global script \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "You do not have permission to perform this operation."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "You do not have permissions to create users."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "You do not have permissions to update other users."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "You do not have permissions to update user or user does not exist."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr "You have no permissions to access this page."
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "You must login to view this page."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr "Your are logged in as"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15454,7 +15905,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15473,8 +15924,8 @@ msgid "Zabbix User"
 msgstr "Zabbix User"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15500,10 +15951,11 @@ msgstr "Zabbix internal"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix internal authentication"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix server"
@@ -15519,7 +15971,7 @@ msgstr ""
 "1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
 "2. Incorrect network configuration.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "Zabbix server IP or port is not set!"
 
@@ -15527,15 +15979,15 @@ msgstr "Zabbix server IP or port is not set!"
 msgid "Zabbix server activity check interval"
 msgstr "Zabbix server activity check interval"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Zabbix server info"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix server is not running: the information displayed may not be current."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix server is running"
 
@@ -15544,11 +15996,11 @@ msgstr "Zabbix server is running"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Zabbix server is running check interval \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Zabbix server name"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Zabbix server port"
 
@@ -15556,25 +16008,20 @@ msgstr "Zabbix server port"
 msgid "Zabbix trapper"
 msgstr "Zabbix trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zoom"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[h:i:s A]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Wrong value for day: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Wrong value for month: \"%s\" ]"
@@ -15583,19 +16030,19 @@ msgstr "[Wrong value for month: \"%s\" ]"
 msgid "agent"
 msgstr "agent"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "all"
 
@@ -15603,19 +16050,15 @@ msgstr "all"
 msgid "all media"
 msgstr "all media"
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "already exists"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "as Blue"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "as Green"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "as Red"
 
@@ -15627,83 +16070,49 @@ msgstr "auto registration"
 msgid "auto-registered host"
 msgstr "auto-registered host"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "avg"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "M jS, Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "M jS, Y h:i A"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "M jS, Y h:i:s A"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "m/d"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "m/d"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "m/d h:i A"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "m/d/y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "days"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15725,19 +16134,15 @@ msgstr "discovered service"
 msgid "discovery"
 msgstr "discovery"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dynamic"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elements"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "elements copy to ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from and esc_step_to must be set together."
 
@@ -15749,47 +16154,49 @@ msgstr "exactly"
 msgid "executed"
 msgstr "executed"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "fixed"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "found"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "host group"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "icon"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "image"
 
@@ -15797,7 +16204,7 @@ msgstr "image"
 msgid "in"
 msgstr "in"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15807,7 +16214,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr "internal"
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "is"
 
@@ -15815,20 +16222,20 @@ msgstr "is"
 msgid "item"
 msgstr "item"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "last"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "like"
@@ -15837,12 +16244,12 @@ msgstr "like"
 msgid "low-level discovery rule"
 msgstr "low-level discovery rule"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15851,46 +16258,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "macro(s)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "maintenance"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "map"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "minimum 60 seconds"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15899,17 +16306,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "must be a valid LDAP user"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr "new"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "no data"
@@ -15922,12 +16329,14 @@ msgstr "not in"
 msgid "not like"
 msgstr "not like"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "not running"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "not selected"
 
@@ -15936,57 +16345,61 @@ msgstr "not selected"
 msgid "not sent"
 msgstr "not sent"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "now"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "of"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr "off"
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "on"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "other"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "refreshed every"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15995,25 +16408,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "remember selected"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "running"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sec"
 
@@ -16026,7 +16438,7 @@ msgstr "seconds"
 msgid "sent"
 msgstr "sent"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "short description"
 
@@ -16034,36 +16446,36 @@ msgstr "short description"
 msgid "show icon mappings"
 msgstr "show icon mappings"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "show value mappings"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "template ID \"%1$s\" is passed %2$s times"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "to"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "trigger"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr "type here to search"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "unknown"
 
@@ -16075,11 +16487,11 @@ msgstr "value"
 msgid "via"
 msgstr "via"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyyy"
diff --git a/frontends/php/locale/es/LC_MESSAGES/frontend.po b/frontends/php/locale/es/LC_MESSAGES/frontend.po
index 4b283cdfd0e..e9c40847e55 100644
--- a/frontends/php/locale/es/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/es/LC_MESSAGES/frontend.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
-"PO-Revision-Date: 2013-09-13 10:08+0300\n"
-"Last-Translator: vins <piranesi@gmail.com>\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
+"PO-Revision-Date: 2014-05-08 17:11+0300\n"
+"Last-Translator: Saúl <saulortega.co@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -13,31 +13,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1379059698.0\n"
+"X-POOTLE-MTIME: 1399561895.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" debe encontrarse entre 1970.01.01 y 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Pantalla iniciadores OK\" necesita ser \"0\" o un entero positivo."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Iniciador parpadeará en cambio de estado\" necesita ser \"0\" o un entero positivo."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1$d día"
+msgstr[1] "%1$d días"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,24 +51,22 @@ msgstr[1] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (año %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Monitor"
 msgstr[1] "%1$s Monitores"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s día"
 msgstr[1] "%1$s días"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -81,7 +81,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -102,23 +102,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d dispositivo"
 msgstr[1] "%d dispositivos"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - infinito)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Solo los super administradores pueden crear grupos)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(en días)"
 
@@ -126,34 +126,34 @@ msgstr "(en días)"
 msgid "(in sec)"
 msgstr "(en seg.)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(mínimo 60 segundos, 0 - acción por defecto)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(sin proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[RECONOCIMIENTO MASIVO]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 ó 1"
 
@@ -169,7 +169,7 @@ msgstr "10 segundos"
 msgid "30 seconds"
 msgstr "30 segundos"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "Vista 3D"
 
@@ -185,7 +185,7 @@ msgstr "5 segundos"
 msgid "500 latest values"
 msgstr "Los últimos 500 valores"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -204,12 +204,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ALARMAS ACEPTADAS"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "Y"
 
@@ -221,19 +220,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "INFORME DE DISPONIBILIDAD"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "La diferencia absoluta entre el último valor y el anterior es < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "La diferencia absoluta entre el último valor y el anterior es = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "La diferencia absoluta entre el último valor y el anterior es > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "La diferencia absoluta entre el último valor y el anterior NO es N"
 
@@ -245,42 +244,42 @@ msgstr "SLA aceptable"
 msgid "Access denied!"
 msgstr "¡Acceso denegado!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Acceso denegado."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "La cuenta está bloqueada durante %s segundos"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Aceptar"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Aceptada"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Aceptación añadida"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Alarma aceptada por"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Aceptar y volver"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Estado del reconocimiento"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Aceptada"
 
@@ -305,62 +304,65 @@ msgstr "Reconocimiento desactivado"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Acción"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr ""
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Acción añadida"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Acción eliminada"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -373,21 +375,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Operaciones de la acción"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Acción actualizada"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Activado"
@@ -397,80 +399,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr ""
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Activo desde"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Activo hasta"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Añadir"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Comentario añadido por"
 
@@ -486,27 +491,23 @@ msgstr "Añadir equipo"
 msgid "Add link"
 msgstr "Añadir link"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr ""
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Añadir prototipo"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Añadir a"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Añadir a favoritos"
@@ -515,7 +516,7 @@ msgstr "Añadir a favoritos"
 msgid "Add to host group"
 msgstr "Añadir a grupo de equipos"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Añadir a grupos de equipos"
 
@@ -527,7 +528,7 @@ msgstr "Añadido"
 msgid "Admin"
 msgstr "Administrador"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administración"
 
@@ -535,34 +536,34 @@ msgstr "Administración"
 msgid "Advanced labels"
 msgstr "Etiquetas avanzadas"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Edad"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Edad menor que"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Edad menor que %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agente"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Interfaces del agente"
@@ -571,12 +572,12 @@ msgstr "Interfaces del agente"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agente o SNMP o JMX o interfaz IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -584,123 +585,126 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Alinear iconos"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Todo"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Todos los grupos"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos los enlaces deben tener especificados \"Nombre\" y \"URL\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Equipos permitidos"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Cualquier"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Cualquier cadena incluida"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Aplicaciones"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Aplicación \"%1$s\" todavía existe."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Aplicación añadida"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Aplicación eliminada"
 msgstr[1] "Aplicación eliminada"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Error de aplicación"
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Aplicación actualizada"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Aplicación con ID \"%1$s\" no está disponible en \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -709,16 +713,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Abril"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Abril"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "¿Está usted seguro de que desea realizar estar acción?"
 
@@ -734,9 +738,9 @@ msgstr "Tamaño del área"
 msgid "Area type"
 msgstr "Tipo de área"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -750,52 +754,49 @@ msgstr "Como texto plano"
 msgid "Asset tag"
 msgstr ""
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "En (horas:minutos)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Al menos debe seleccionarse un equipo o grupo."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Al menos debe crearse un periodo de mantenimiento"
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Auditoría"
@@ -815,26 +816,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Agosto"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Agosto"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Algoritmo de autenticación"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -893,9 +896,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automático"
 
@@ -903,20 +906,20 @@ msgstr "Automático"
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Selección automática de iconos"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Disponibilidad"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Informe de disponibilidad"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Disponible"
 
@@ -925,36 +928,36 @@ msgstr "Disponible"
 msgid "Average"
 msgstr "Media"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Media por"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr ""
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Eje horizontal"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Fondo"
@@ -963,7 +966,7 @@ msgstr "Fondo"
 msgid "Background image"
 msgstr "Imagen de fondo"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Informe de barras"
 
@@ -973,8 +976,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Autenticación básica"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -986,15 +989,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind passwd"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Operación Y binaria de los últimos (más recientes) T valores y la máscara es = NOperación Y binaria de los últimos (más recientes) T valores y la máscara es = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Operación Y binaria de los últimos (más recientes) T valores y la máscara NO es NOperación Y binaria de los últimos (más recientes) T valores y la máscara NO es N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Negro & Azul"
 
@@ -1006,8 +1009,8 @@ msgstr "Parpadear"
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Línea gruesa"
 
@@ -1015,22 +1018,22 @@ msgstr "Línea gruesa"
 msgid "Boolean"
 msgstr "Booleano"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Debajo"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Aclarar"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Búlgaro (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Reconocer todos"
 
@@ -1056,7 +1059,7 @@ msgstr "CONFIGURACIÓN DE APLICACIONES"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURACIÓN DE AUTENTICACIÓN"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1086,7 +1089,7 @@ msgstr "CONFIGURACIÓN DE GRUPOS DE EQUIPOS"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURACIÓN DE EQUIPOS"
 
@@ -1098,7 +1101,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURACIÓN DE MAPA DE ICONOS"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURACIÓN DE IMÁGENES"
 
@@ -1107,14 +1110,14 @@ msgstr "CONFIGURACIÓN DE IMÁGENES"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURACIÓN DE SERVICIOS DE IT"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURACIÓN DE PROTOTIPOS DE MONITORES"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURACIÓN DE MONITORES"
 
@@ -1143,7 +1146,7 @@ msgstr "CONFIGURACIÓN DE MAPAS DE RED"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURACIÓN DE PROXY'S"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURACIÓN DE EXPRESIONES REGULARES"
 
@@ -1163,7 +1166,7 @@ msgstr "CONFIGURACIÓN DE SCRIPTS"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURACIÓN DE LAS DIAPOSITIVAS"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURACIÓN DE PLANTILLAS"
 
@@ -1179,7 +1182,7 @@ msgstr "CONFIGURACIÓN DE NIVELES DE INICIADORES"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURACIÓN DEL INICIADOR"
 
@@ -1211,22 +1214,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURACIÓN DE ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1235,21 +1238,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Calcular SLA, SLA aceptable (en %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Calculado"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Permisos calculados"
 
@@ -1257,92 +1260,95 @@ msgstr "Permisos calculados"
 msgid "Callback"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canadá (136 caracteres)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "No se pudo reconocer el evento"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "No es posible añadir la acción"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "No es posible añadir la aplicación"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "No se puede añadir dependencia desde un equipo a una plantilla"
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "No es posible añadir la regla"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "No es posible añadir el gráfico"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "No es posible añadir el grupo"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "No es posible añadir el equipo"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1350,24 +1356,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "No es posible añadir la imágen"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "No se pudo añadir la imágen."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "No es posible añadir el monitor"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "No se pudo añadir items."
 
@@ -1375,20 +1381,20 @@ msgstr "No se pudo añadir items."
 msgid "Cannot add macro."
 msgstr "No se pudo añadir la macro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "No es posible añadir el período de mantenimiento"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "No es posible añadir el tipo de medio"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1397,24 +1403,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "No es posible añadir un mapa de red"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "No es posible añadir el proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "No es posible añadir la expresión regular"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "No es posible añadir la pantalla"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "No es posible añadir el script"
 
@@ -1426,27 +1432,27 @@ msgstr "No es posible añadir el servicio"
 msgid "Cannot add slide show"
 msgstr "No es posible añadir la diapositiva"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "No es posible añadir la plantilla"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "No es posible añadir el iniciador"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "No es posible añadir al usuario"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "No es posible añadir al usuario. Ambas contraseñas deben ser iguales."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "No es posible añadir los usuarios"
 
@@ -1454,7 +1460,7 @@ msgstr "No es posible añadir los usuarios"
 msgid "Cannot add value map"
 msgstr "No es posible añadir la asignación"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "No se pudo añadir escenario web"
 
@@ -1474,23 +1480,23 @@ msgstr "No se pudo cambiar el método de autenticación a LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "No es posible eliminar el histórico"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "No se pueden clonar los gráficos"
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "No se pueden clonar los monitores"
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "No se pueden clonar los iniciadores"
 
@@ -1498,20 +1504,20 @@ msgstr "No se pueden clonar los iniciadores"
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "No se pueden copiar los gráficos"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "No se pueden copiar los monitores"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "No se pueden copiar los iniciadores \"%1$s:%2$s\", por que tienen multiples equipos en la expresión."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1520,19 +1526,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "No se puede crear otra conexión a base de datos"
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "No se puede crear una regla de descubrimiento"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "No se puede crear un grupo de equipos"
 
@@ -1540,102 +1546,102 @@ msgstr "No se puede crear un grupo de equipos"
 msgid "Cannot create icon map"
 msgstr "No se puede crear un mapa de iconos"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "No se puede crear un mapa de iconos con el mismo nombre \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "No se puede crear el mapa \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "No se puede crear un nuevo elemento"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "No se pudo crear la pantalla."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "No se puede borrar el usuario \"%1$s\", prueba deshabilitandolo primero."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "No es posible eliminar la acción"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "No es posible eliminar la aplicación"
 msgstr[1] "No es posible eliminar la aplicación"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "No es posible eliminar la dependecia"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "No es posible eliminar la regla"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "No es posible eliminar el gráfico"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "No es posible eliminar el gráfico"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "No es posible eliminar los gráficos"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "No es posible eliminar el grupo"
+msgid_plural "Cannot delete groups"
+msgstr[0] "No es posible eliminar el grupo"
+msgstr[1] "No es posible eliminar el grupo"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "No es posible eliminar el equipo"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "No es posible eliminar el grupo de equipos"
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1643,80 +1649,80 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "No es posible eliminar el mapa de iconos"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "No es posible eliminar la imágen"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "No es posible eliminar el inventario"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "No es posible eliminar el monitor"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "No es posible eliminar los monitores"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "No es posible eliminar el periodo de mantenimiento"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "No es posible eliminar el tipo de medio"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "No es posible eliminar el mapa de red"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "No es posible eliminar el proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 #, fuzzy
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "No es posible eliminar la expresión regular"
 msgstr[1] "No es posible eliminar la expresión regular"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "No es posible eliminar la pantalla"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "No es posible eliminar el script"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "No es posible eliminar los scripts. Parámetro de entrada \"scriptids\" vacío."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "No es posible eliminar los scripts. script \"%1$s\" es usado en accioón \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "No es posible eliminar las acciones seleccionadas"
 
@@ -1724,77 +1730,80 @@ msgstr "No es posible eliminar las acciones seleccionadas"
 msgid "Cannot delete service"
 msgstr "No es posible eliminar el servicio"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "No es posible eliminar la diapositiva"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "No es posible eliminar las plantilla"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "No es posible eliminar los gráficos de la plantilla"
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "No es posible eliminar el monitor de la plantilla"
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "No es posible eliminar los monitores de la plantilla"
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "No es posible eliminar los iniciadores"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "No es posible eliminar el iniciador"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "No es posible eliminar los iniciadores"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "No es posible eliminar al usuario"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1802,78 +1811,78 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr "No es posible eliminar la asignación"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "No es posible eliminar el tipo de media"
 msgstr[1] "No es posible eliminar el tipo de media"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1887,135 +1896,129 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "No se puede habilitar el tipo de medio"
 msgstr[1] "No se puede habilitar el tipo de medio"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "No se puede encontrar el gráfico \"%1$s\" usado en la pantalla \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2026,34 +2029,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2063,41 +2085,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "No se puede encontrar objetos con nombre"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "No se puede encontrar pantalla \"%1$s\" usada en pantalla \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2110,12 +2132,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr ""
@@ -2127,59 +2151,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "No se puede linkar plantilla"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Imposible cerrar sesión"
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2199,7 +2224,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2208,11 +2233,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2220,11 +2245,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "No se puede eliminar la macro"
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr ""
 
@@ -2233,217 +2258,226 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "No se pueden desbloquear usuarios"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "No se pueden deslinkar y limpiar reglas de descubrimiento"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr ""
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr ""
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "No es posible actualizar la acción"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "No es posible actualizar la aplicación"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "No es posible actualizar el comentario"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "No se puede poner en modo debug"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "No es posible actualizar la regla"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "No es posible actualizar el gráfico"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "No es posible actualizar el grupo"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr ""
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "No es posible actualizar el equipo"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr ""
 
@@ -2455,24 +2489,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr "No es posible actualizar la imágen"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "No es posible actualizar el monitor"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr ""
 
@@ -2484,16 +2518,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr ""
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr ""
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2501,28 +2535,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr ""
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr ""
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr ""
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "No es posible actualizar la pantalla"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr ""
 
@@ -2534,40 +2564,41 @@ msgstr "No es posible actualizar el servicio"
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr ""
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "No es posible actualizar el iniciador"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "No es posible actualizar al usuario"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "No es posible actualizar al usuario. Ambas contraseñas deben ser iguales."
 
@@ -2575,15 +2606,15 @@ msgstr "No es posible actualizar al usuario. Ambas contraseñas deben ser iguale
 msgid "Cannot update value map"
 msgstr "No es posible actualizar la asignación"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr ""
 
@@ -2592,47 +2623,47 @@ msgstr ""
 msgid "Case sensitive"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Variación con valor anterior"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Cambiar la contraseña"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Carácter"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr ""
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr ""
 
@@ -2641,48 +2672,48 @@ msgid "Chassis"
 msgstr "Chasis"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr ""
 
@@ -2691,44 +2722,44 @@ msgid "Check type"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Comprobaciones"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr ""
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chino (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Link circular no puede ser creado para elemento del mapa \"%s\"."
@@ -2743,34 +2774,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Referencias circulares en plantillas: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Limpiar"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Limpiar historial y tendencias"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Eliminar histórico del monitor seleccionado"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Limpiar cuando se deslinke"
 
@@ -2780,69 +2812,69 @@ msgstr "Reloj"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Clonar"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Cerrar"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Color"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Color (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Separación de columna"
 
@@ -2857,7 +2889,7 @@ msgstr "Resultados combinados"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Comando"
 
@@ -2865,41 +2897,31 @@ msgstr "Comando"
 msgid "Command actions"
 msgstr ""
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr ""
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Comandos"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Comentario actualizado"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Comentarios"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Comercial"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2907,29 +2929,39 @@ msgstr ""
 msgid "Condition"
 msgstr "Condición"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Condiciones"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Configuración"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3092,23 +3124,23 @@ msgstr "Configuración actualizada"
 msgid "Configure (Filter %s)"
 msgstr "Configurar (Filtro %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "texto de confirmación"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Conectado a"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Conectado como '%1$s'"
@@ -3156,7 +3188,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3164,30 +3196,37 @@ msgstr ""
 msgid "Contract number"
 msgstr "Número de contrato"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Copiar a ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "¡No se puede guardar imagen!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Contador"
 
@@ -3207,6 +3246,10 @@ msgstr "Crear aplicación"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3224,7 +3267,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3237,15 +3280,15 @@ msgstr "Crear grupo de equipos"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Crear mapa de iconos"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Crear imagen"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Crear monitor"
 
@@ -3269,6 +3312,10 @@ msgstr "Crear mapa"
 msgid "Create media type"
 msgstr "Crear tipo de medio"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Crear proxy"
@@ -3293,11 +3340,11 @@ msgstr "Crear script"
 msgid "Create slide show"
 msgstr "Crear diapositivas"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Crear plantilla"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Crear iniciador"
 
@@ -3321,42 +3368,42 @@ msgstr "Crear grupo de usuarios"
 msgid "Create value map"
 msgstr "Asignar nuevo valor"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Creada: Aplicación \"%1$s\" sobre \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Creada: Regla de descubrimiento \"%1$s\" sobre \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Creado: Monitor \"%1$s\" sobre \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Creado: Iniciador \"%1$s\" sobre \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3366,51 +3413,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Equipo actual"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Valor actual"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3423,7 +3471,7 @@ msgstr "Personalizar gráficos"
 msgid "Custom label"
 msgstr "Personalizar etiquetas"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3437,7 +3485,7 @@ msgstr "Personalizar multiplicador"
 msgid "Custom screens"
 msgstr "Personalizar pantallas"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Personalizar script"
 
@@ -3457,18 +3505,14 @@ msgstr "Tamaño personalizado"
 msgid "Custom slides"
 msgstr "Diapositivas personalizadas"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Checo (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr ""
@@ -3484,28 +3528,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "DETALLES DEL ESCENARIO"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "DESHABILITADO"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DESCUBIERTO"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3513,25 +3557,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Nombre DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "ABAJO"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Diario"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Naranja oscuro"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Oscurecer"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr ""
 
@@ -3543,20 +3587,21 @@ msgstr ""
 msgid "Dashboard filter"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr ""
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Monitores"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3579,11 +3624,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Tipos de datos"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Fichero de base de datos"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Servidor de base de datos"
 
@@ -3591,35 +3637,39 @@ msgstr "Servidor de base de datos"
 msgid "Database monitor"
 msgstr "Monitor de base de datos"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Puerto de la base de datos"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Esquema de la base de datos"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Servidor de base de datos"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Tipo de base de datos"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Usuario de base de datos"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Fecha"
 
@@ -3639,53 +3689,52 @@ msgstr "Fecha HW mantenimiento expira"
 msgid "Date HW purchased"
 msgstr ""
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Día"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Día del mes"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Día de semana"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Días"
 
@@ -3693,22 +3742,22 @@ msgstr "Días"
 msgid "Debug"
 msgstr "Depurar"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Modo depuración"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Modo depuración actualizado"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Diciembre"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Diciembre"
 
@@ -3718,15 +3767,14 @@ msgstr "Decimal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Por defecto"
 
@@ -3739,11 +3787,11 @@ msgid "Default delay (in seconds)"
 msgstr "Retraso por defecto (en segundos)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Mensaje por defecto"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3766,30 +3814,34 @@ msgstr "Tema por defecto \"%1$s\"."
 msgid "Delay"
 msgstr "Demora"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Demora (en seg)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Demorado por"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Eliminar"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Eliminar y limpiar"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3797,53 +3849,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr "¿Eliminar aplicación?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "¿Eliminar acción actual?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "¿Eliminar regla de descubrimiento?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "¿Eliminar el gráfico?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
+#: include/views/configuration.item.list.php:278
+msgid "Delete history of selected items?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:274
-msgid "Delete history of selected items?"
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3851,11 +3903,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3863,7 +3919,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "¿Eliminar escenario?"
 
@@ -3871,71 +3927,67 @@ msgstr "¿Eliminar escenario?"
 msgid "Delete screen?"
 msgstr "¿Eliminar pantalla?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "¿Eliminar script?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Eliminar"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "¿Eliminar escenarios WEB seleccionados?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr ""
@@ -3944,27 +3996,27 @@ msgstr ""
 msgid "Delete selected groups?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "¿Eliminar equipo seleccionado?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "¿Eliminar equipos seleccionados?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "¿Eliminar la imágen seleccionada?"
 
@@ -3972,31 +4024,31 @@ msgstr "¿Eliminar la imágen seleccionada?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr ""
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr ""
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr ""
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr ""
 
@@ -4004,15 +4056,15 @@ msgstr ""
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr ""
 
@@ -4024,11 +4076,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr ""
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "¿Eliminar usuarios seccionados?"
 
@@ -4043,11 +4095,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Eliminar selección junto con los elementos vinculados"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4056,15 +4112,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr ""
 
@@ -4072,62 +4128,62 @@ msgstr ""
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4136,35 +4192,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (cambio sencillo)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (velocidad por segundo)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Denegar"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr ""
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Depende de"
 
@@ -4172,30 +4228,41 @@ msgstr "Depende de"
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Nombre descriptivo"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Detalles"
 
@@ -4208,71 +4275,71 @@ msgid "Device"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4296,48 +4363,44 @@ msgstr ""
 msgid "Disable host"
 msgstr ""
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr ""
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Desactivar"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr ""
 
@@ -4345,11 +4408,11 @@ msgstr ""
 msgid "Disable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr ""
 
@@ -4357,42 +4420,47 @@ msgstr ""
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -4405,7 +4473,7 @@ msgstr "Crítica"
 msgid "Discovered"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4413,17 +4481,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr ""
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Descubrimiento"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr ""
 
@@ -4431,17 +4499,17 @@ msgstr ""
 msgid "Discovery check"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4450,67 +4518,70 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Regla de descubrimiento"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Regla de descubrimiento eliminada"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Regla de descubrimiento actualizada"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Reglas de descubrimiento eliminadas"
 
@@ -4522,7 +4593,7 @@ msgstr "Estado del descubrimiento"
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr ""
 
@@ -4531,32 +4602,32 @@ msgstr ""
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr ""
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr ""
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "No calculado"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr ""
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4566,30 +4637,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Tiempo inoperativo"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Estilo del trazado"
 
@@ -4607,74 +4678,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Duración"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Holandés (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr ""
 
@@ -4682,13 +4754,13 @@ msgstr ""
 msgid "EVENTS"
 msgstr "EVENTOS"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4696,9 +4768,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Editar"
 
@@ -4706,7 +4778,7 @@ msgstr "Editar"
 msgid "Edit map element"
 msgstr ""
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4714,27 +4786,61 @@ msgstr ""
 msgid "Element"
 msgstr "Grupo"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Nombre del elemento"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Sin contenido"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4742,76 +4848,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4820,11 +4948,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4832,11 +4960,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr ""
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4856,11 +4988,11 @@ msgstr ""
 msgid "Enable host"
 msgstr ""
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr ""
 
@@ -4873,36 +5005,32 @@ msgstr ""
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Activar"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr ""
 
@@ -4910,11 +5038,11 @@ msgstr ""
 msgid "Enable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4922,64 +5050,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Activado"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Inglés (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Error"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -4997,15 +5129,15 @@ msgstr ""
 msgid "Event ID"
 msgstr ""
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr ""
 
@@ -5014,7 +5146,7 @@ msgstr ""
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr ""
 
@@ -5022,7 +5154,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr ""
 
@@ -5042,9 +5174,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Eventos"
 
@@ -5052,36 +5185,41 @@ msgstr "Eventos"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr ""
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr ""
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr ""
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr ""
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5089,13 +5227,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5107,7 +5245,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5117,12 +5255,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr ""
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr ""
 
@@ -5130,22 +5268,22 @@ msgstr ""
 msgid "Export to CSV"
 msgstr ""
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Expresión"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5153,11 +5291,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr ""
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5178,17 +5317,17 @@ msgid "External check"
 msgstr "Comprobación externa"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "INACTIVO"
 
@@ -5197,16 +5336,17 @@ msgstr "INACTIVO"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Ha fallado"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr ""
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5214,40 +5354,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr ""
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr ""
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr ""
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr ""
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr ""
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr ""
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr ""
 
@@ -5291,19 +5431,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5312,13 +5452,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5326,68 +5466,71 @@ msgstr ""
 msgid "Filled region"
 msgstr ""
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtro"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Finalizar"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr ""
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5396,8 +5539,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fijo"
 
@@ -5407,76 +5550,80 @@ msgstr "Fijo"
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr ""
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr ""
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr ""
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Francés (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr ""
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Desde"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Función"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5486,50 +5633,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "Modem GSM"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr ""
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr ""
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Zabbix"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Alemán(de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5537,65 +5684,65 @@ msgid "Get support"
 msgstr "Obtener soporte"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr ""
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr ""
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5604,66 +5751,73 @@ msgid "Gradient line"
 msgstr ""
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Gráficos"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Gráfico añadido"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Gráfico eliminado"
 
@@ -5675,54 +5829,59 @@ msgstr "Elemento del gráfico"
 msgid "Graph item"
 msgstr "Gráfico del elemento"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Nombre del gráfico"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5734,49 +5893,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Tipo de gráfico"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Gráfico actualizado"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr ""
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5785,54 +5946,58 @@ msgstr ""
 msgid "Grid"
 msgstr ""
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Grupo"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Grupo añadido"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Grupo eliminado"
+msgid_plural "Groups deleted"
+msgstr[0] "Grupo eliminado"
+msgstr[1] "Grupo eliminado"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5843,40 +6008,42 @@ msgstr ""
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Nombre del grupo"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Grupo actualizado"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Grupos"
 
@@ -5884,22 +6051,13 @@ msgstr "Grupos"
 msgid "Groups in maintenance"
 msgstr ""
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5916,7 +6074,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5934,7 +6092,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5955,12 +6114,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Altura"
@@ -5973,15 +6137,15 @@ msgstr "Ayuda"
 msgid "Hexadecimal"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Ocultar"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr ""
 
@@ -5997,15 +6161,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Ocultar iniciadores desactivados"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Ocultar seleccionados"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6014,23 +6178,23 @@ msgstr ""
 msgid "High"
 msgstr "Alta"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Histórico (días)"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Histórico eliminado"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Eliminar el histórico puede llevarse tiempo. ¿Continuar?"
 
@@ -6051,80 +6215,80 @@ msgstr "Histórico de eventos"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Alineación horizontal"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Equipo/Plantilla"
 msgstr[1] "Equipo/Plantilla"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6136,66 +6300,68 @@ msgstr "IP del equipo"
 msgid "Host access"
 msgstr ""
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Equipo añadido"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Equipo eliminado"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Grupo del equipo"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6212,14 +6378,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Grupos de equipos"
 
@@ -6229,8 +6396,8 @@ msgstr "Grupos de equipos"
 msgid "Host interface"
 msgstr ""
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6246,7 +6413,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6255,18 +6422,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6275,72 +6442,72 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6352,7 +6519,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6364,51 +6531,52 @@ msgstr ""
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr ""
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Equipo actualizado"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Equipos"
 
@@ -6416,11 +6584,11 @@ msgstr "Equipos"
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Equipos (m/n/p)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6432,37 +6600,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Información de los equipos"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr ""
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr ""
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr ""
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr ""
 
@@ -6480,22 +6649,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6503,26 +6672,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Rango de IP's"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6530,22 +6699,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr ""
 
@@ -6555,7 +6724,7 @@ msgstr ""
 msgid "IPMI sensor"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr ""
 
@@ -6588,7 +6757,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6604,25 +6773,25 @@ msgid "ITEMS"
 msgstr "MONITORES"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Icono"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr ""
 
@@ -6643,42 +6812,44 @@ msgstr "Tipo de etiqueta para el icono"
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6691,7 +6862,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6699,29 +6871,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6729,21 +6901,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Imágen"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6752,7 +6926,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Imágen añadida"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Imágen eliminada"
 
@@ -6760,12 +6934,13 @@ msgstr "Imágen eliminada"
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6774,66 +6949,66 @@ msgid "Image updated"
 msgstr "Imágen actualizada"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Imágenes"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr ""
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Importar"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Fichero para importar"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr ""
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6846,244 +7021,282 @@ msgstr ""
 msgid "In progress"
 msgstr "En progreso"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr ""
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr ""
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7093,11 +7306,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7106,11 +7319,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7118,74 +7331,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr ""
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7193,182 +7432,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr ""
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr ""
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr ""
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr ""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr ""
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr ""
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7377,64 +7635,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7455,52 +7717,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7509,7 +7776,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7529,7 +7797,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7539,43 +7807,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7584,15 +7858,15 @@ msgstr ""
 msgid "Information"
 msgstr "Informativa"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Insertar"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
 msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Instalación"
 
@@ -7600,31 +7874,32 @@ msgstr "Instalación"
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr ""
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7644,7 +7919,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7652,7 +7927,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7665,19 +7940,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr ""
 
@@ -7687,112 +7962,114 @@ msgstr ""
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventario"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7801,7 +8078,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7809,12 +8086,12 @@ msgstr ""
 msgid "Is online?"
 msgstr "¿Está conectado?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr ""
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7822,70 +8099,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italiano (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Monitor"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Monitor añadido"
 
@@ -7893,17 +8171,17 @@ msgstr "Monitor añadido"
 msgid "Item count"
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Monitor eliminado"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7917,56 +8195,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7974,92 +8252,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Monitor actualizado"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Monitores"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Monitores(m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Monitores eliminados"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Monitores actualizados"
 
@@ -8071,72 +8349,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Identificador Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr ""
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr ""
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japonés (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr ""
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr ""
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr ""
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr ""
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8145,40 +8423,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Monitor"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr ""
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr ""
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr ""
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "ÚLTIMA FECHA"
 
@@ -8209,37 +8487,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr ""
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Etiqueta"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Posición de la etiqueta"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Idioma"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Último"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8251,19 +8529,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8283,28 +8561,28 @@ msgstr ""
 msgid "Last 7 days"
 msgstr ""
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Último cambio"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Última comprobación"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Gráfico de la última hora"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Gráfico del último mes"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "El último de"
 
@@ -8312,66 +8590,67 @@ msgstr "El último de"
 msgid "Last seen (age)"
 msgstr ""
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Gráfico de la última semana"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Última fecha"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Últimos eventos"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Letón (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Izquierda"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr ""
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr ""
 
@@ -8379,39 +8658,29 @@ msgstr ""
 msgid "Link"
 msgstr "Vínculo"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr ""
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8423,50 +8692,50 @@ msgstr "Vincular con plantilla"
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr ""
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Tiempo local"
 
@@ -8483,36 +8752,36 @@ msgid "Location longitude"
 msgstr ""
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Registro"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Formato de fecha para el registro"
@@ -8521,12 +8790,12 @@ msgstr "Formato de fecha para el registro"
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8537,12 +8806,12 @@ msgstr "Iniciar sesión"
 msgid "Login as Guest"
 msgstr ""
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8551,8 +8820,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8573,22 +8843,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8600,7 +8866,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr ""
 
@@ -8625,49 +8891,49 @@ msgstr "LOS 100 INICIADORES MÁS VOLÁTILES"
 msgid "Macro"
 msgstr ""
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr ""
 
@@ -8675,31 +8941,36 @@ msgstr ""
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr ""
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr ""
 
@@ -8707,7 +8978,7 @@ msgstr ""
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr ""
 
@@ -8723,25 +8994,25 @@ msgstr ""
 msgid "Maintenance type"
 msgstr ""
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr ""
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8752,12 +9023,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Mapa"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8767,12 +9038,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8789,12 +9060,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr ""
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8804,23 +9075,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Mapas"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr ""
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr ""
 
@@ -8828,28 +9099,34 @@ msgstr ""
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Marcar otros"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Marcar seleccionados"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Actualizar masivamente"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr ""
@@ -8863,32 +9140,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr ""
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8896,105 +9152,99 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr ""
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Medio"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Tipo de medio"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Tipo de medio eliminado"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Tipo de medio actualizado"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Tipos de medios"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr ""
 
@@ -9009,14 +9259,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr ""
 
@@ -9026,7 +9276,7 @@ msgstr ""
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Mensaje"
 
@@ -9034,66 +9284,66 @@ msgstr "Mensaje"
 msgid "Message actions"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr ""
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Medio"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9102,80 +9352,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr ""
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9185,7 +9432,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9197,18 +9444,18 @@ msgstr "Modo"
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr ""
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr ""
 
@@ -9216,33 +9463,33 @@ msgstr ""
 msgid "Monitored host"
 msgstr ""
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Monitorización"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Mes"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Mensual"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9250,7 +9497,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Más de 10 minutos"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9259,19 +9506,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "Los 100 iniciadores más volátiles"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -9284,60 +9531,58 @@ msgstr "MAPAS DE LA RED"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "SIN DATOS"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "Autenticación NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9348,26 +9593,32 @@ msgstr "Autenticación NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Nombre"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9386,12 +9637,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9399,7 +9650,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Mapa de red añadido"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Mapa de red eliminado"
 
@@ -9411,7 +9662,7 @@ msgstr "Mapa de red actualizado"
 msgid "Network maps"
 msgstr "Mapas de la red"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Nunca"
 
@@ -9419,24 +9670,24 @@ msgstr "Nunca"
 msgid "Never executed"
 msgstr "No ejecutar nunca"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Nuevo"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Nueva aplicación"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Nueva condición"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Nuevo elemento"
 
@@ -9447,16 +9698,16 @@ msgstr "Nuevo elemento"
 msgid "New flexible interval"
 msgstr "Nuevo intervalo flexible"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Nuevo grupo"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Nuevo grupo de equipos"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Nuevo elemento para el gráfico"
 
@@ -9464,83 +9715,99 @@ msgstr "Nuevo elemento para el gráfico"
 msgid "New media"
 msgstr "Nuevo medio"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Nueva expresión regular"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Nuevo tiempo del servicio"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Siguiente"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "No"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9548,25 +9815,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9592,8 +9859,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "No se encontraron acciones."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9603,7 +9870,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9611,30 +9878,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9643,27 +9911,27 @@ msgstr ""
 msgid "No data collection"
 msgstr ""
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Sin detalles"
 
@@ -9671,39 +9939,39 @@ msgstr "Sin detalles"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9718,7 +9986,7 @@ msgstr "Fichero no actualizado."
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9727,7 +9995,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9736,48 +10008,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Sin grupos para equipos."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9790,17 +10063,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9819,33 +10097,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9864,7 +10149,7 @@ msgid "No items defined."
 msgstr "Sin monitores definidos."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9880,7 +10165,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9889,15 +10174,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9909,133 +10194,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10043,7 +10373,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10051,82 +10381,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Sin iniciadores"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10135,57 +10466,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Ninguno"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normal"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr ""
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr ""
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "No disponible"
 
@@ -10194,7 +10526,7 @@ msgstr "No disponible"
 msgid "Not classified"
 msgstr "No clasificada"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr ""
 
@@ -10207,8 +10539,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "No soportado"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Nota"
@@ -10221,7 +10553,7 @@ msgstr "Notas"
 msgid "Nothing"
 msgstr "Nada"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10229,87 +10561,87 @@ msgstr ""
 msgid "Notification report"
 msgstr "Informe de notificaciones"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr ""
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10317,88 +10649,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "Número de cambios de estado"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Número de pasos"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Número de usuarios(en línea)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numérico (coma flotante)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr ""
 
@@ -10413,16 +10745,18 @@ msgid "OEM"
 msgstr ""
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10438,8 +10772,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "O"
 
@@ -10459,11 +10792,12 @@ msgstr ""
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "VISTAZO GENERAL"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10471,25 +10805,25 @@ msgstr ""
 msgid "Octal"
 msgstr ""
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "INACTIVO"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "ACTIVO"
 
@@ -10497,111 +10831,114 @@ msgstr "ACTIVO"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Una vez inoperativo"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10610,28 +10947,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Operación a realizar"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operaciones"
@@ -10640,25 +10977,27 @@ msgstr "Operaciones"
 msgid "Operator"
 msgstr "Operador"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10688,24 +11027,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Original"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Azul (Original)"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Otras configuraciones"
 
@@ -10713,19 +11052,19 @@ msgstr "Otras configuraciones"
 msgid "Other configuration parameters"
 msgstr "Otros parámetros de configuración"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Otros grupos"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Otros equipos"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10735,21 +11074,21 @@ msgstr "Otros equipos | grupo"
 msgid "Other parameters"
 msgstr "Otras configuraciones"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Otro | grupo"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Otros"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10762,14 +11101,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Vistazo general"
 
@@ -10777,7 +11113,7 @@ msgstr "Vistazo general"
 msgid "Overview by proxy"
 msgstr "Vistazo general por proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10786,147 +11122,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10935,32 +11279,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr ""
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr ""
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parámetro"
 
@@ -10969,7 +11315,7 @@ msgstr "Parámetro"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10989,33 +11335,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11025,20 +11371,21 @@ msgstr ""
 msgid "Password"
 msgstr "Contraseña"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Contraseña (de nuevo)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr ""
 
@@ -11047,21 +11394,21 @@ msgstr ""
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11069,12 +11416,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Período"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Tipo de período"
@@ -11084,24 +11431,24 @@ msgstr "Tipo de período"
 msgid "Periods"
 msgstr "Períodos"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Permisos"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr ""
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr ""
 
@@ -11113,55 +11460,56 @@ msgstr ""
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Por favor, selecciona dos elementos"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polaco (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Puerto"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11169,51 +11517,51 @@ msgstr ""
 msgid "Port range"
 msgstr "Rango de puertos"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portugues (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Posición"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Post"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Anterior"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11262,30 +11610,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11297,16 +11646,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr ""
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr ""
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problemas"
 
@@ -11314,75 +11663,71 @@ msgstr "Problemas"
 msgid "Profile"
 msgstr "Perfiles"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototipos"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxys"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr ""
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11393,7 +11738,7 @@ msgstr ""
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "COLA DE MONITORES PARA SER ACTUALIZADOS"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Cola"
 
@@ -11401,18 +11746,18 @@ msgstr "Cola"
 msgid "RMCP+"
 msgstr ""
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Lectura"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Sólo lectura"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Lectura-escritura"
 
@@ -11424,7 +11769,7 @@ msgstr "Causa"
 msgid "Received value"
 msgstr "Valor recibido"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11432,11 +11777,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11447,28 +11792,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "Receptor(es)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Recuperar"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Mensaje de recuperación"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Asunto de recuperación"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Refrescar (en segundos)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr ""
 
@@ -11486,47 +11831,51 @@ msgstr ""
 msgid "Regular expression"
 msgstr "Expresión regular"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11543,26 +11892,28 @@ msgstr "Comando remoto"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11573,21 +11924,19 @@ msgstr "Comando remoto"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Eliminar"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11595,11 +11944,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Eliminar elemento"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Eliminar de"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Eliminar de favoritos"
@@ -11608,7 +11957,7 @@ msgstr "Eliminar de favoritos"
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11620,28 +11969,28 @@ msgstr "Eliminar equipo"
 msgid "Remove link"
 msgstr "Eliminar link"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Eliminar seleccionados"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Informe"
 
@@ -11649,35 +11998,36 @@ msgstr "Informe"
 msgid "Report 1"
 msgstr "Informe 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Informe 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Informe 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Informes"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Requerido"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11685,29 +12035,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr "Rendimiento (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr ""
 
@@ -11726,9 +12078,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11741,7 +12093,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Recurso"
@@ -11756,15 +12108,15 @@ msgstr "Tiempo de respuesta"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Resultado"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Resultado es FALSO"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "RESULTADO is VERDADERO"
 
@@ -11777,7 +12129,8 @@ msgstr ""
 msgid "Result type"
 msgstr "Tipo de resultado"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11785,60 +12138,69 @@ msgstr ""
 msgid "Retries left"
 msgstr ""
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Reintentar"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Derecho"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Separación de fila"
 
@@ -11846,11 +12208,11 @@ msgstr "Separación de fila"
 msgid "Rows"
 msgstr "Filas"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Filas por página"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Reglas aplicables a cada grupo"
 
@@ -11895,20 +12257,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Ruso (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11924,7 +12286,7 @@ msgstr "PANTALLAS"
 msgid "SEARCH"
 msgstr "BUSCAR"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVIDOR"
 
@@ -11939,13 +12301,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "DIAPOSITIVAS"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11954,17 +12316,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP email"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "Servidor SMTP"
@@ -11980,7 +12342,7 @@ msgstr "SNMP Key"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11992,9 +12354,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "Comunidad SNMP"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMO interfaces"
@@ -12003,7 +12365,7 @@ msgstr "SNMO interfaces"
 msgid "SNMP trap"
 msgstr "SNMP trap"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12027,7 +12389,7 @@ msgstr "Agente SNMPv3"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12045,7 +12407,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12054,15 +12416,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "Agente SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "ESTADO DEL DESCUBRIMIENTO"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "ESTADO DE LOS INICIADORES"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "ESTADO DE LA MONITORIZACIÓN WEB"
 
@@ -12070,92 +12452,92 @@ msgstr "ESTADO DE LA MONITORIZACIÓN WEB"
 msgid "STATUS OF ZABBIX"
 msgstr "ESTADO DE ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Sábado"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sábado"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Guardar"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Guardar y volver"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Escala"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Escenario"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Escenario añadido"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Escenario actualizado"
 
@@ -12167,7 +12549,7 @@ msgstr "Escenarios"
 msgid "Schedule"
 msgstr ""
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12178,126 +12560,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Pantalla"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Pantalla añadida"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Configuración de la celda de la pantalla"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Pantalla eliminada"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Pantalla actualizada"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Pantallas"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Script"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr ""
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Nombre del script"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12306,17 +12687,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr ""
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr ""
 
@@ -12337,7 +12718,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr ""
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr ""
 
@@ -12369,7 +12750,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Segundos"
 
@@ -12388,69 +12769,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Seleccionar / Examinar..."
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr ""
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr ""
 
@@ -12466,7 +12854,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr ""
 
@@ -12474,11 +12862,11 @@ msgstr ""
 msgid "Send to"
 msgstr "Enviar a"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Enviar a usuarios"
 
@@ -12487,17 +12875,17 @@ msgstr "Enviar a usuarios"
 msgid "Sent"
 msgstr "Enviado"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Septiembre"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Septiembre"
 
@@ -12509,7 +12897,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Servidor"
@@ -12518,44 +12906,44 @@ msgstr "Servidor"
 msgid "Server info"
 msgstr "Información del servidor"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Hora del sevidor"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Servicio"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12571,11 +12959,11 @@ msgstr "Servicio eliminado"
 msgid "Service port"
 msgstr "Puerto del servicio"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Tiempos del servicio"
 
@@ -12587,49 +12975,53 @@ msgstr "Tipo de servicio"
 msgid "Service updated"
 msgstr "Servicio actualizado"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Servicios"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Gravedad"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Gravedad (descendente)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Gravedad, no puede ser vacío."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Mostrar"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Mostrar todo"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Mostrar detalles"
 
@@ -12659,35 +13051,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr ""
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Mostrar líneas"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Mostrar seleccionados"
 
@@ -12695,19 +13088,22 @@ msgstr "Mostrar seleccionados"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Mostrar iniciadores"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr ""
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Mostrar valor"
@@ -12716,11 +13112,11 @@ msgstr "Mostrar valor"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Mostrar tiempo de trabajo"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Se muestra"
 
@@ -12740,6 +13136,10 @@ msgstr "Comprobación sencilla"
 msgid "Simple graph"
 msgstr "Gráfico sencillo"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Código postor/ZIP"
@@ -12777,7 +13177,7 @@ msgid "Site state / province"
 msgstr "Estado/Provincia"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12795,16 +13195,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Diapositiva"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12813,11 +13213,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12825,10 +13225,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Diapositivas"
 
@@ -12836,15 +13236,15 @@ msgstr "Diapositivas"
 msgid "Slides"
 msgstr "Diapositivas"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Blando"
 
@@ -12877,28 +13277,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Orden de clasificación (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Ordenar iniciadores por"
 
@@ -12911,11 +13311,11 @@ msgstr ""
 msgid "Source"
 msgstr "Orígen"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Español (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12923,63 +13323,63 @@ msgstr ""
 msgid "Speed"
 msgstr "Velocidad"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Apilado"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Estado"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Estado"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -12992,7 +13392,7 @@ msgstr "Cálculo del estado"
 msgid "Status calculation algorithm"
 msgstr "Algoritmo para el cálculo del estado"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Códigos de estado"
 
@@ -13001,7 +13401,7 @@ msgid "Status of Web monitoring"
 msgstr "Estado de la monitorización Web"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Estado de ZABBIX"
 
@@ -13018,40 +13418,40 @@ msgid "Status only"
 msgstr "Sólo el estado"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Paso"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Paso \"%1$s\" [%2$s de %3$s] falló: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Paso del escenario"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Pasos"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Valor almacenado"
@@ -13060,11 +13460,11 @@ msgstr "Valor almacenado"
 msgid "Straight"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Estilo"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13072,11 +13472,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Título"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Submapa"
 
@@ -13085,32 +13485,32 @@ msgid "Success Audit"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Domingo"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -13118,27 +13518,27 @@ msgstr "Domingo"
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Apellido"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Sueco (sv_SE)"
 
@@ -13146,16 +13546,16 @@ msgstr "Sueco (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Error del sistema"
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13164,21 +13564,21 @@ msgid "System status"
 msgstr "Estado del sistema"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13197,11 +13597,11 @@ msgid "TOTAL"
 msgstr "TOTAL"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "COMENTARIOS DEL INICIADOR"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "ACTIVO"
 
@@ -13219,14 +13619,14 @@ msgstr ""
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Destino"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13235,130 +13635,133 @@ msgid "Target type"
 msgstr "Tipo de destino"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Plantilla"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Plantilla añadida"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Plantilla borrada"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Plantilla vinculada"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Nombre de plantilla"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr ""
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Plantillas"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr ""
 
@@ -13366,11 +13769,11 @@ msgstr ""
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr ""
 
@@ -13384,22 +13787,22 @@ msgid "Test string"
 msgstr ""
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Texto"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13407,7 +13810,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13422,26 +13825,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13450,19 +13853,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr ""
 
@@ -13473,11 +13876,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Tercera"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13486,11 +13889,11 @@ msgstr ""
 msgid "This month"
 msgstr "Este mes"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13502,27 +13905,27 @@ msgstr "Esta semana"
 msgid "This year"
 msgstr "Este año"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Jueves"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Hasta"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13531,28 +13934,28 @@ msgstr "Hasta"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Fecha y hora"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13560,54 +13963,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Período de tiempo"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Tipo de tiempo"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Timeout"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Feha y hora"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Título"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "A"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13615,17 +14018,18 @@ msgstr ""
 msgid "Today"
 msgstr "Hoy"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Encima"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Total"
 
@@ -13643,7 +14047,7 @@ msgstr "Tiempo total: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13660,91 +14064,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Tendencias (días)"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Iniciadores"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Iniciador añadido"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Comentarios del iniciador"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Iniciador eliminado"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13759,11 +14163,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13771,7 +14176,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13784,12 +14189,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13801,52 +14206,52 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13854,23 +14259,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Gravedad del iniciador"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Iniciador actualizado"
 
@@ -13878,40 +14291,41 @@ msgstr "Iniciador actualizado"
 msgid "Trigger value"
 msgstr "Valor del iniciador"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Iniciadores"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Iniciadores eliminados"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Información de los iniciadores"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr ""
 
@@ -13919,78 +14333,78 @@ msgstr ""
 msgid "Triggers overview"
 msgstr "Vistazo general de los iniciadores"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr ""
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr ""
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr ""
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr ""
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Tipo"
 
@@ -13998,62 +14412,64 @@ msgstr "Tipo"
 msgid "Type (Full details)"
 msgstr "Tipo (detalles completos)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Tipo (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Tipo de cálculo"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Tipo de información"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr ""
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "DESCONOCIDO"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "SUBIR"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (después de iniciar sesión)"
 
@@ -14069,20 +14485,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 caracteres)"
 
@@ -14090,15 +14516,11 @@ msgstr "USA (160 caracteres)"
 msgid "USER PROFILE"
 msgstr "PERFIL DE USUARIO"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ucraniano (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14106,7 +14528,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr ""
 
@@ -14119,20 +14541,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr ""
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr ""
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr ""
 
@@ -14141,29 +14563,29 @@ msgstr ""
 msgid "Units"
 msgstr "Unidad"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14173,23 +14595,20 @@ msgstr "Desconocido"
 msgid "Unknown action"
 msgstr "Acción desconocida"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr ""
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14201,23 +14620,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr "Recurso desconocido"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Desvincular"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Desvincular y eliminar"
 
@@ -14225,61 +14644,61 @@ msgstr "Desvincular y eliminar"
 msgid "Unlink from template"
 msgstr "Desvincular de plantilla"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Desvincular de plantillas"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14293,32 +14712,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14329,34 +14759,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Actualizar"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Refrescar cada (s)"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Intervalo de actualización (en segundos)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Actualizado"
 
@@ -14364,55 +14794,55 @@ msgstr "Actualizado"
 msgid "Updated status of host"
 msgstr "Actualizados estado del equipo"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Actualizado: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Cargar"
 
@@ -14420,14 +14850,14 @@ msgstr "Cargar"
 msgid "Upper level maps"
 msgstr "Mapas de nivel superior"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Tiempo operativo"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14435,9 +14865,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Tiempo operativo/Tiempo inoperativo"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14453,84 +14883,88 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Usuario"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Usuario añadido"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr ""
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Usuario eliminado"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Un grupo de usuarios"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14547,34 +14981,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Grupos de usuarios"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr ""
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14600,243 +15034,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Tipo de usuario"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Usuario actualizado"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr ""
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Usuarios"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Usuarios (en línea)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Usuarios desbloqueados"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Estado"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14871,11 +15305,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14921,10 +15355,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Asignación de valores"
 
@@ -14933,7 +15367,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14945,8 +15379,8 @@ msgstr "Valores: sin datos"
 msgid "Values"
 msgstr "Valores"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Variables"
 
@@ -14959,64 +15393,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Alineación vertical"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Vista no se representa"
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Nombre visible"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Baja"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15024,65 +15463,83 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitorización Web"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr ""
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Miércoles"
 
@@ -15090,9 +15547,9 @@ msgstr "Miércoles"
 msgid "Week"
 msgstr "Semana"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Semanal"
 
@@ -15100,12 +15557,12 @@ msgstr "Semanal"
 msgid "When active"
 msgstr "Cuando se active"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Anchura"
@@ -15115,28 +15572,28 @@ msgstr "Anchura"
 msgid "With data collection"
 msgstr ""
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Con problemas"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Con iniciadores"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Sin problemas"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Sin iniciadores"
 
@@ -15145,7 +15602,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15158,277 +15615,271 @@ msgstr "Jornada laboral"
 msgid "Working time \"%1$s\"."
 msgstr "Jornada laboral \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr ""
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Valor MAX del eje Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Valor MIN del eje Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Lado del eje Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Etiqueta Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Año"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Anual"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Si"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr ""
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Tí no puede elegir algunos idiomas porque el paquete \"locales\" para ellos no está instalado en el servidor web."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Tú no tienes permiso para modificar los privilegios del usuario \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "No iniciaste sesión."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Tú no puedes cambiar de host para la selección actual."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Tú no tienes permiso para crear usuarios."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Tú no tienes permisos para actualizar a otros usuarios."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Tú no tienes permisos para actualizar el usuario o el usuario no existe."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Debes iniciar sesión para ver esta página."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15441,7 +15892,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15460,8 +15911,8 @@ msgid "Zabbix User"
 msgstr "Usuario Zabbix"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15487,10 +15938,11 @@ msgstr "Zabbix interno"
 msgid "Zabbix internal authentication"
 msgstr "Autenticación interna de Zabbix"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Servidor Zabbix"
@@ -15503,7 +15955,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "¡IP o puerto del servidor Zabbix no configurados!"
 
@@ -15511,15 +15963,15 @@ msgstr "¡IP o puerto del servidor Zabbix no configurados!"
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Información del servidor Zabbix"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Servidor Zabbix ejecutándose"
 
@@ -15528,11 +15980,11 @@ msgstr "Servidor Zabbix ejecutándose"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Nombre del servidor Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Puerto del servidor Zabbix"
 
@@ -15540,25 +15992,20 @@ msgstr "Puerto del servidor Zabbix"
 msgid "Zabbix trapper"
 msgstr "Trapper ZABBIX"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zoom"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15567,19 +16014,19 @@ msgstr ""
 msgid "agent"
 msgstr "agente"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "todo"
 
@@ -15587,19 +16034,15 @@ msgstr "todo"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "todavía existe"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "Como Azul"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "Como Verde"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "Como Rojo"
 
@@ -15611,83 +16054,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "media"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "días"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15709,19 +16118,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dinámico"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elementos"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "Elementos copiados a..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15733,47 +16138,49 @@ msgstr "exactamente"
 msgid "executed"
 msgstr "ejecutado"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr ""
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "equipo"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "Grupo de equipos"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "icono"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "imagen"
 
@@ -15781,7 +16188,7 @@ msgstr "imagen"
 msgid "in"
 msgstr "contenido en"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15791,7 +16198,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "es"
 
@@ -15799,20 +16206,20 @@ msgstr "es"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "último"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "igual que"
@@ -15821,12 +16228,12 @@ msgstr "igual que"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15835,46 +16242,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr "macro(s)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "mantenimiento"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "mapa"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "máximo"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "mínimo"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15883,17 +16290,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr ""
@@ -15906,12 +16313,14 @@ msgstr "no contenido en"
 msgid "not like"
 msgstr "distinto de"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "No ejecutándose"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "no seleccionada"
 
@@ -15920,57 +16329,61 @@ msgstr "no seleccionada"
 msgid "not sent"
 msgstr "no enviada"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "ahora"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "En"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "sobre"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "otro"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "actualizar cada"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15979,25 +16392,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "recordar selección"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "Ejecutándose"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "seg"
 
@@ -16010,7 +16422,7 @@ msgstr "segundos"
 msgid "sent"
 msgstr "enviada"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "descripción corta"
 
@@ -16018,36 +16430,36 @@ msgstr "descripción corta"
 msgid "show icon mappings"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr ""
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "a"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "iniciador"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr ""
 
@@ -16059,11 +16471,11 @@ msgstr "valor"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyyy"
diff --git a/frontends/php/locale/fa/LC_MESSAGES/frontend.po b/frontends/php/locale/fa/LC_MESSAGES/frontend.po
index af75e5b4474..0fe533f11ae 100644
--- a/frontends/php/locale/fa/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/fa/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:57+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2014-04-13 14:12+0300\n"
 "Last-Translator: Mohammad <mohammadsharifi666@gmail.com>\n"
 "Language-Team: none\n"
@@ -14,28 +14,30 @@ msgstr ""
 "X-Generator: Pootle 2.5.0\n"
 "X-POOTLE-MTIME: 1397391161.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" می بايست بين 1970.01.01 و 2038.01.18 باشد."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "مقدار \"نمايش تريگرهای OK\" می بايست \"0\" يا يک مقدار صحيح مثبت باشد."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "مقدار \"چشمک زدن هنگام تغيير وضعيت تريگرها\" می بايست \"0\" يا يک مقدار صحيح مثبت باشد."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d روز%1$d روز"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -46,22 +48,20 @@ msgstr[0] "تعداد %1$d از %2$d مشکل نمايش داده شده است�
 msgid "%1$s (year %2$s)"
 msgstr "%1$s(سال%2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s آيتم%1$s آيتم"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -74,7 +74,7 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -92,23 +92,23 @@ msgid "%d device"
 msgid_plural "%d devices"
 msgstr[0] "%dدستگاه"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 تا بینهایت)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(به روز)"
 
@@ -116,34 +116,34 @@ msgstr "(به روز)"
 msgid "(in sec)"
 msgstr "(به ثانيه)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "حداقل 60 ثانیه - به صورت پیش فرض"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(بدون پروکسی)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[بخش تصدیق]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 یا 1"
 
@@ -159,7 +159,7 @@ msgstr "10 ثانیه"
 msgid "30 seconds"
 msgstr "30 ثانیه"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "نمایش سه بعدی"
 
@@ -175,7 +175,7 @@ msgstr "5 ثانیه"
 msgid "500 latest values"
 msgstr "500 مقدار اخیر"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -194,12 +194,11 @@ msgstr "لاگ فعاليت"
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "هشدار تصدیق"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "و"
 
@@ -211,19 +210,19 @@ msgstr "لاگ مميزی"
 msgid "AVAILABILITY REPORT"
 msgstr "گزارش دسترسی"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -235,42 +234,42 @@ msgstr ""
 msgid "Access denied!"
 msgstr "غير قابل دسترسي!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "حساب کاربری برای %s ثانیه مسدود شد."
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "تأیید"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "تأیید کردن"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "تأیید افزوده شد"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "هشدار تأیید شده است توسط"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "تصدیق و بازگشت"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "وضعیت تایید"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "تأیید شده"
 
@@ -295,61 +294,64 @@ msgstr "تأیید غیر فعال شده"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "فعالیت ها"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr ""
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "فعالیت اضافه شد"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "فعالیت حذف شد"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -361,21 +363,21 @@ msgstr[0] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "عملکرد های فعالیت"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "فعالیت بروز شد"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "فعالیت ها"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "فعال"
@@ -385,80 +387,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr ""
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "فعال از"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "فعال تا"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "افزودن"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "افزودن توضیح توسط"
 
@@ -474,27 +479,23 @@ msgstr "افزودن هاست"
 msgid "Add link"
 msgstr "افزودن لینک"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "افزودن خطا"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "افزودن نمونه اولیه\t"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "افزودن به"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "افزودن به مورد علاقه ها"
@@ -503,7 +504,7 @@ msgstr "افزودن به مورد علاقه ها"
 msgid "Add to host group"
 msgstr "افزودن به گروه هاست"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "افزودن به گروه هاست ها"
 
@@ -515,7 +516,7 @@ msgstr "افزوده شد"
 msgid "Admin"
 msgstr "مدیر"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "مدیریت"
 
@@ -523,34 +524,34 @@ msgstr "مدیریت"
 msgid "Advanced labels"
 msgstr "برچسب های پیشرفته"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "سن"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "سن کمتر از"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "سن کمتر از %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "عامل"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "واسط های عامل"
@@ -559,12 +560,12 @@ msgstr "واسط های عامل"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "نام مستعار"
 
@@ -572,122 +573,125 @@ msgstr "نام مستعار"
 msgid "Align icons"
 msgstr "هم تراز کردن آیکن"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "همه"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "همه گروه ها"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "همه لینک ها باید \"نام\" و \"آدرس\" مشخص داشته باشند"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "هاست ها مجاز"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "هیچ"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "فاقد رشته کاراکتری"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "برنامه ها"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "برنامه \"%s\" قبلاً وجود دارد"
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "برنامه اضافه شد"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "برنامه حذف شد"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "خطای برنامه."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "برنامه بروز شد"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "برنامه با شناسه \"%1$s\" در \"%2$s\" در دسترس نیست."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "برنامه‌ها"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "اعمال"
 
@@ -696,16 +700,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "آوریل"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "آوریل"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "آیا مطمئنید که می‌خواهید این فعالیت را اجرا کنید؟"
 
@@ -721,9 +725,9 @@ msgstr "اندازه ناحیه"
 msgid "Area type"
 msgstr "نوع ناحیه"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -737,50 +741,47 @@ msgstr "به عنوان متن ساده"
 msgid "Asset tag"
 msgstr "برچسب دارایی"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "در (ساعت:دقیقه)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr ""
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "ممیزی"
@@ -800,26 +801,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "اوت"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "اوت"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "تصدیق هویت"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "الگوریتم تصدیق هویت"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -878,9 +881,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "خودکار"
 
@@ -888,20 +891,20 @@ msgstr "خودکار"
 msgid "Automatic icon mapping"
 msgstr "نگاشت خودکار آیکن"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "انتخاب آیکن خودکار"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "دسترسی"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "گزارش دسترسی"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "در دسترس"
 
@@ -910,36 +913,36 @@ msgstr "در دسترس"
 msgid "Average"
 msgstr "متوسط"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "میانگین توسط"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr ""
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "سمت محور"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "پس زمینه"
@@ -948,7 +951,7 @@ msgstr "پس زمینه"
 msgid "Background image"
 msgstr "تصویر پس زمینه"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "گزارش‌های میله ای"
 
@@ -958,8 +961,8 @@ msgid "Base DN"
 msgstr ""
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "تصدیق هویت اصلی"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -971,15 +974,15 @@ msgstr ""
 msgid "Bind password"
 msgstr "مقید به کلمه عبور"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "مشکی و آبی"
 
@@ -991,8 +994,8 @@ msgstr "چشمک زن"
 msgid "Blocked"
 msgstr "مسدود شده"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "خط‌ توپر"
 
@@ -1000,22 +1003,22 @@ msgstr "خط‌ توپر"
 msgid "Boolean"
 msgstr "بولی"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "پایین"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "درخشان کردن"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "تأیید دسته ای"
 
@@ -1041,7 +1044,7 @@ msgstr "پیکربندی برنامه ها"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr ""
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1071,7 +1074,7 @@ msgstr "پیکربندی گروه هاست ها"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr ""
 
@@ -1083,7 +1086,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr ""
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr ""
 
@@ -1092,14 +1095,14 @@ msgstr ""
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "پیکربندی سرویس های IT"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "پیکربندی نمونه اولیه آیتم"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "پیکربندی آیتم"
 
@@ -1128,7 +1131,7 @@ msgstr "پیکربندی نقشه های شبکه"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "پیکربندی پروکسی ها"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr ""
 
@@ -1148,7 +1151,7 @@ msgstr "پیکربندی اسکریپت ها"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "پیکربندی نمایش اسلاید ها"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr ""
 
@@ -1164,7 +1167,7 @@ msgstr ""
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "پیکربندی هشدار ها"
 
@@ -1196,22 +1199,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "پیکربندی سیستم سپهر"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1220,21 +1223,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "محاسبه SLA (درصد)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "محاسبه کردن"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "محاسبه کردن مجوز ها"
 
@@ -1242,92 +1245,95 @@ msgstr "محاسبه کردن مجوز ها"
 msgid "Callback"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "فارسی(136 کاراکتر)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "لغو"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "رویداد نمی تواند تأیید شود"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "فعالیت نمی تواند اضافه شود"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "برنامه نمی تواند اضافه شود"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "وابستگی از یک هاست به یک قالب نمی‌تواند اضافه شود"
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "قانون کشف نمی تواند اضافه شود"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "نمودار نمی تواند اضافه شود"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "گروه نمی تواند اضافه شود"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "هاست نمی تواند اضافه شود"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1335,24 +1341,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "تصویر نمی تواند اضافه شود"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr ""
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "آیتم نمی تواند اضافه شود"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1360,20 +1366,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr "ماکرو نمی تواند اضافه شود"
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "دوره نگهداری نمی تواند اضافه شود"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "نوع رسانه نمی تواند اضافه شود"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1382,24 +1388,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "نقشه شبکه نمی تواند اضافه شود"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "پروکسی نمی تواند اضافه شود"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "عبارت منظم نمی تواند اضافه شود"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "صفحه نمایش نمی تواند اضافه شود"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "اسکریپت نمی تواند اضافه شود"
 
@@ -1411,27 +1417,27 @@ msgstr "سرویس نمی تواند اضافه شود"
 msgid "Cannot add slide show"
 msgstr "نمایش اسلاید نمی تواند اضافه شود"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "قالب نمی تواند اضافه شود"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "هشدار نمی تواند اضافه شود"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "کاربر نمی تواند اضافه شود"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "کاربر نمی تواند اضافه شود. هردو کلمه عبور باید یکسان باشند."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "کاربران نمی توانند اضافه شوند"
 
@@ -1439,7 +1445,7 @@ msgstr "کاربران نمی توانند اضافه شوند"
 msgid "Cannot add value map"
 msgstr "نگاشت مقدار نمی تواند اضافه شود"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1459,23 +1465,23 @@ msgstr "روش تصدیق هویت نمی تواند به LDAP تغییر پید
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "روش تصدیق هویت نمی تواند به Fanoos internal تغییر پیدا کند"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "تاریخچه نمی‌تواند پاک شود"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "نمونه اولیه نمودارها نمی‌توانند کپی شوند"
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "نمونه اولیه آیتم ها نمی‌توانند کپی شوند"
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "نمونه اولیه هشدارها نمی‌توانند کپی شوند"
 
@@ -1483,20 +1489,20 @@ msgstr "نمونه اولیه هشدارها نمی‌توانند کپی شون
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "اتصال به پورت سرویس سرور فانوس نمی‌تواند برقرار شود.ولی این پورت باید برای اجرای اسکریپت در دسترس باشد.اتصال به پورت سرویس سرور فانوس نمی‌تواند برقرار شود.ولی این پورت باید برای اجرای اسکریپت در دسترس باشد.اتصال به پورت سرویس سرور فانوس نمی‌تواند برقرار شود.ولی این پورت باید برای اجرای اسکریپت در دسترس باشد.اتصال به پورت سرویس سرور فانوس نمی‌تواند برقرار شود.ولی این پورت باید برای اجرای اسکریپت در دسترس باشد.اتصال به پورت سرویس سرور فانوس نمی‌تواند برقرار شود.ولی این پورت باید برای اجرای اسکریپت در دسترس باشد."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "نمودارها نمی‌توانند کپی شوند"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "آیتم ها نمی‌توانند کپی شوند"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "هشدار \"%1$s:%2$s\" نمی‌تواند کپی شود ، زیرا چندین هاست در عبارت خود دارد.هشدار \"%1$s:%2$s\" نمی‌تواند کپی شود ، زیرا چندین هاست در عبارت خود دارد.هشدار \"%1$s:%2$s\" نمی‌تواند کپی شود ، زیرا چندین هاست در عبارت خود دارد.هشدار \"%1$s:%2$s\" نمی‌تواند کپی شود ، زیرا چندین هاست در عبارت خود دارد.هشدار \"%1$s:%2$s\" نمی‌تواند کپی شود ، زیرا چندین هاست در عبارت خود دارد."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1505,19 +1511,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "اتصال دیگری به پایگاه داده نمی‌توانند ایجاد شود."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "قانون کشف نمی‌توانند ایجاد شود."
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr ""
 
@@ -1525,101 +1531,100 @@ msgstr ""
 msgid "Cannot create icon map"
 msgstr "نگاشت آیکن نمی‌توانند ایجاد شود."
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "نگاشت آیکن ها با نام یکسان \"%s\" نمی‌توانند ایجاد شود."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "نقشه \"%s\" نمی‌تواند ایجاد شود."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "عنصر جدید نمی‌تواند ایجاد شود."
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "فعالیت نمی‌تواند حذف شود"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "برنامه نمی‌تواند حذف شود"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "قانون کشف نمی‌تواند حذف شود"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "نمودار نمی‌تواند حذف شود"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "نمودار نمی‌تواند حذف شود"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "نمودارها نمی‌توانند حذف شوند"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "گروه نمی‌تواند حذف شود"
+msgid_plural "Cannot delete groups"
+msgstr[0] "گروه نمی‌تواند حذف شود"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "هاست نمی‌تواند حذف شود"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "گروه هاست نمی تواند حذف شود"
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1627,78 +1632,78 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "نگاشت آیکن نمی‌توانند حذف شود"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "تصویر نمی‌تواند حذف شود"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "فهرست نمی‌تواند حذف شود."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "آیتم نمی‌تواند حذف شود"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "آیتم ها نمی‌توانند حذف شوند"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "دوره نگهداری نمی‌تواند حذف شود"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "نوع رسانه نمی تواند حذف شود"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "نقشه شبکه نمی تواند حذف شود"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "پروکسی نمی تواند حذف شود"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "صفحه نمایش نمی تواند حذف شود"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "اسکریپت نمی تواند حذف شود"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "اسکریپت ها نمی تواند حذف شود.پارامتر ورودی \"شناسه اسکریپت\" خالی است."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "فعالیت های انتخاب شده نمی‌توانند حذف شوند"
 
@@ -1706,77 +1711,80 @@ msgstr "فعالیت های انتخاب شده نمی‌توانند حذف ش�
 msgid "Cannot delete service"
 msgstr "سرویس نمی‌تواند حذف شود"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "نمایش اسلاید نمی‌تواند حذف شود"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "قالب نمی تواند حذف شود"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "هشدارهای قالب شده \"%1$s:%2$s\" نمی توانند حذف شوند."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "هشدار نمی‌تواند حذف شود"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "هشدار نمی‌تواند حذف شود"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "هشدارها نمی‌توانند حذف شوند"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "کاربر نمی‌تواند حذف شود"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1784,67 +1792,67 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr "نگاشت آیکن نمی‌تواند حذف شود"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "نوع رسانه نمی تواند غیرفعال شود"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1857,123 +1865,117 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "نوع رسانه نمی تواند فعال شود"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "واسط هاست در \"%1$s\" برای کلید آیتم \"%2$s\" پیدا نشد."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -1984,34 +1986,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2021,41 +2042,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "شیء با نام پیدا نشد"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2068,12 +2089,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "عبارت \"%s\" نمی‌تواند از داخل اجرا شود."
@@ -2084,58 +2107,59 @@ msgid "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
 msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "فایل نمایش \"%s\" نمی‌تواند شامل شود."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "قالب نمی تواند پیوندزده شود"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "نمیتوانید خارج شوید"
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr " نام هاست را نمیتوانید دسته‌ای بروز کنید."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr " نام قابل مشاهده هاست را نمیتوانید دسته‌ای بروز کنید."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "شناسه قالب تکراری برای پیوند : %s را نمیتوانید پاس کنید."
@@ -2155,7 +2179,7 @@ msgstr "دستور بروزرسانی برای جدول \"%1$s\" را نمیتو
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "دستور بروزرسانی برای جدول \"%1$s\" را نمیتوانید بدون شرط اجرا کنید."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2164,11 +2188,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2176,11 +2200,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "ماکرو نمیتواند حذف شود."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "قانون کشف بدون بررسی را نمیتوانید ذخیره کنید."
 
@@ -2189,217 +2213,226 @@ msgstr "قانون کشف بدون بررسی را نمیتوانید ذخیره
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "کاربر را نمیتوانید رفع انسداد کنید"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "قوانین کشف را نمیتوانید جدا و پاک کنید"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "نمونه‌های اولیه را نمیتوانید جدا و پاک کنید"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "نمودارها را نمیتوانید جدا و پاک کنید"
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "نمونه‌های اولیه آیتم را نمیتوانید جدا و پاک کنید"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "آیتم ها را نمیتوانید جدا و پاک کنید"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "هشدار ها را نمیتوانید جدا و پاک کنید"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "قالب را نمی‌توانید جدا کنید"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
-#, fuzzy, c-format
+#: include/classes/api/services/CHostGeneral.php:234
+#, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
-msgstr "هشدار \"%s\" را نمیتوانید جدا کنید ، آیتم های دارد از قالبی که از هاست جدا شده است.هشدار \"%s\" را نمیتوانید جدا کنید ، آیتم های دارد از قالبی که از هاست جدا شده است.هشدار \"%s\" را نمیتوانید جدا کنید ، آیتم های دارد از قالبی که از هاست جدا شده است.هشدار \"%s\" را نمیتوانید جدا کنید ، آیتم های دارد از قالبی که از هاست جدا شده است.هشدار \"%s\" را نمیتوانید جدا کنید ، آیتم های دارد از قالبی که از هاست جدا شده است."
+msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "فعالیت نمی‌تواند بروز شود"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "برنامه نمی‌تواند بروز شود"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "توضیح نمی‌تواند بروز شود"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "پیکر بندی نمی‌تواند بروز شود"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "حالت رفع خطا نمیتواند بروز شود"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "قانون کشف نمیتواند بروز شود"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "دسترسی به واسط کاربری نمیتواند بروز شود"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "نمودار نمی‌تواند بروز شود"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "گروه نمی‌تواند بروز شود"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "گروه نمی‌تواند بروز شود"
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "هاست نمی‌تواند بروز شود"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "هاست ها نمی‌تواند بروز شود"
 
@@ -2411,24 +2444,24 @@ msgstr "نگاشت آیکن نمی‌توانند بروز شود."
 msgid "Cannot update image"
 msgstr "تصویر نمیتواند بروز شود"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "آیتم نمی‌تواند بروز شود"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "آیتم ها نمی‌توانند بروز شوند"
 
@@ -2440,16 +2473,16 @@ msgstr "ماکرو نمی‌تواند بروز شود"
 msgid "Cannot update macros"
 msgstr "ماکرو نمی‌تواند بروز شود"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "دوره نگهداری نمی‌تواند بروز شود"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "نقشه \"%s\" نمی‌تواند بروز شود."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "نوع رسانه نمی تواند بروز شود"
 
@@ -2457,28 +2490,24 @@ msgstr "نوع رسانه نمی تواند بروز شود"
 msgid "Cannot update network map"
 msgstr "نقشه شبکه نمی تواند بروز شود"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "پروکسی نمی‌تواند بروز شود"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "عبارت منظم نمی تواند بروز شود"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "صفحه نمایش نمی تواند بروز شود"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "اسکریپت نمی تواند بروز شود"
 
@@ -2490,40 +2519,41 @@ msgstr "سرویس نمی‌تواند بروز شود"
 msgid "Cannot update slide show"
 msgstr "نمایش اسلاید نمی‌تواند بروز شود"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "قالب نمی تواند بروز شود"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "هشدار نمی‌تواند بروز شود"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "کاربر نمی‌تواند بروز شود"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "کاربر نمی‌تواند بروز شود. هردو کلمه عبور باشد یکسان باشند."
 
@@ -2531,15 +2561,15 @@ msgstr "کاربر نمی‌تواند بروز شود. هردو کلمه عبو
 msgid "Cannot update value map"
 msgstr "نگاشت نقشه نمیتواند بروز شود"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "عنوان"
 
@@ -2548,47 +2578,47 @@ msgstr "عنوان"
 msgid "Case sensitive"
 msgstr "حساس به متن"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "مرکز"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "تغییر"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "تغییر رمز عبور"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "کاراکتر"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "در بر داشتن رشته کاراکتری"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "در بر نداشتن رشته کاراکتری"
 
@@ -2597,48 +2627,48 @@ msgid "Chassis"
 msgstr "اسکلت"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "بررسی از قبل وجود دارد"
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "بخش عبارت بررسی از \"%1$s\" شروع می‌شود."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "لطفاً کلید را بررسی کنید، نمونه پیش ‌فرض پاس داده خواهد شد."
 
@@ -2647,44 +2677,44 @@ msgid "Check type"
 msgstr "نوع تطبیق"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "تطبیق ها"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "تطبیق ها باید منحصر به فرد باشد."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr ""
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "پیوند حلقه ای برای عنصر نقشه \"%s\" نمیتواند ایجاد شود"
@@ -2699,34 +2729,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "پاک کردن"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "پاک کردن تاریخچه و روند ها"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "پاک کردن تاریخچه"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "پاک کردن وقتی جدا شد"
 
@@ -2736,69 +2767,69 @@ msgstr "ساعت"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "کپی برداری"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "بستن"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "بستن عبارت سازنده"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "رنگ"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "رنگ (تصویب)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "محدوده ستون"
 
@@ -2813,7 +2844,7 @@ msgstr "ترکیب کردن نتیجه ها"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "فرمان"
 
@@ -2821,41 +2852,31 @@ msgstr "فرمان"
 msgid "Command actions"
 msgstr "فرمان فعالیت"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "فرمان نمی تواند خالی باشد."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "فرمان ها"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "توضیح بروز شد"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "توضیحات"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "تجاری"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "مقایسه مقادیر برای بازه ها چندگانه"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "تصنیف مجوز"
 
@@ -2863,29 +2884,39 @@ msgstr "تصنیف مجوز"
 msgid "Condition"
 msgstr "شرط"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "شروط"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "پیکربندی"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3048,23 +3079,23 @@ msgstr "پیکربندی بروز شد"
 msgid "Configure (Filter %s)"
 msgstr "پیکربندی(فیلتر %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "متن تایید"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "متصل به"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "وارد شده اید بعنوان'%1$s' "
@@ -3112,7 +3143,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3120,30 +3151,36 @@ msgstr ""
 msgid "Contract number"
 msgstr "شماره تماس"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "رونوشت"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "کپی انتخاب شده ها به..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "نتوانست تصویر را ذخیره کند."
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "تعداد"
 
@@ -3163,6 +3200,10 @@ msgstr "ایجاد برنامه"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3180,7 +3221,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3193,15 +3234,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "ایجاد نگاشت آیکن"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "ایجاد تصویر"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "ایجاد آیتم"
 
@@ -3225,6 +3266,10 @@ msgstr "ایجاد نقشه"
 msgid "Create media type"
 msgstr "ایجاد نوع رسانه"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "ایجاد پروکسی"
@@ -3249,11 +3294,11 @@ msgstr "ایجاد اسکریپت"
 msgid "Create slide show"
 msgstr "ایجاد نمایش اسلاید"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "ایجاد هشدار"
 
@@ -3277,42 +3322,42 @@ msgstr ""
 msgid "Create value map"
 msgstr "ایجاد نگاشت مقدار"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "ایجاد: برنامه \"%1$s\" در \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "ایجاد:قانون کشف \"%1$s\" در \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "ایجاد: آیتم \"%1$s\" در \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3322,51 +3367,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "هاست فعلی"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "مقدار فعلی"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3379,7 +3425,7 @@ msgstr "نقشه های سفارشی"
 msgid "Custom label"
 msgstr "برچسب سفارشی"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3393,7 +3439,7 @@ msgstr "تکثیر کننده سفارشی"
 msgid "Custom screens"
 msgstr "صفحات نمایش سفارشی"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "اسکریپت سفارشی"
 
@@ -3413,18 +3459,14 @@ msgstr "اندازه سفارشی"
 msgid "Custom slides"
 msgstr "اسلایدهای سفارشی"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr ""
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "پیکربندی داشبورد"
@@ -3440,28 +3482,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "جزئیات سناریو"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "غیرفعال"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "کشف شده"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3469,25 +3511,25 @@ msgstr ""
 msgid "DNS name"
 msgstr ""
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "پایین"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "روزانه"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "نارنجی تیره"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "تیره تر"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "داشبورد"
 
@@ -3499,20 +3541,21 @@ msgstr "پیکربندی داشبورد"
 msgid "Dashboard filter"
 msgstr "فیلتر داشبورد"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "خط تیره"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "داده"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3535,11 +3578,12 @@ msgstr ""
 msgid "Data type"
 msgstr "نوع داده"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "فایل دیتابیس"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "هاست پایگاه داده"
 
@@ -3547,35 +3591,39 @@ msgstr "هاست پایگاه داده"
 msgid "Database monitor"
 msgstr "مانیتور پایگاه داده"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "نام پایگاه داده"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "کلمه عبور پایگاه داده"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "پرت پایگاه داده"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "شمای پایگاه داده"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "سرور پایگاه داده"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "نوع پایگاه داده"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "کاربر پایگاه داده"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "تاریخ"
 
@@ -3595,53 +3643,52 @@ msgstr "تاریخ منقضی شدن تعمیر سخت افزار"
 msgid "Date HW purchased"
 msgstr "تاریخ خرید سخت افزار"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "روز"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "روز از ماه"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "روز از هفته"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "روز"
 
@@ -3649,22 +3696,22 @@ msgstr "روز"
 msgid "Debug"
 msgstr "رفع خطا"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "حالت رفع خطا"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "حالت رفع خطا بروز شد"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr ""
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "دسامبر"
 
@@ -3674,15 +3721,14 @@ msgstr "اعشاری،دهدهی"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "پیش فرض"
 
@@ -3695,11 +3741,11 @@ msgid "Default delay (in seconds)"
 msgstr "تأخیر پیش فرض(ثانیه)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "پیام پیش فرض"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3722,30 +3768,34 @@ msgstr ""
 msgid "Delay"
 msgstr "تاخیر"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "تأخیر(به ثانیه)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "تأخیر توسط"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "حذف"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "حذف و پاک کردن"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3753,53 +3803,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
+#: include/views/configuration.item.list.php:278
+msgid "Delete history of selected items?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:274
-msgid "Delete history of selected items?"
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3807,11 +3857,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3819,7 +3873,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr ""
 
@@ -3827,71 +3881,67 @@ msgstr ""
 msgid "Delete screen?"
 msgstr ""
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr ""
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "حذف موارد"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr ""
@@ -3900,27 +3950,27 @@ msgstr ""
 msgid "Delete selected groups?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr ""
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr ""
 
@@ -3928,31 +3978,31 @@ msgstr ""
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr ""
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr ""
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr ""
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr ""
 
@@ -3960,15 +4010,15 @@ msgstr ""
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr ""
 
@@ -3980,11 +4030,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr ""
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr ""
 
@@ -3998,11 +4048,15 @@ msgid "Delete selected value mapping? It is used for %d item!"
 msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "حذف موارد با عناصر پیوند زده شده"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4011,15 +4065,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr ""
 
@@ -4027,62 +4081,62 @@ msgstr ""
 msgid "Deleted"
 msgstr "حذف شد"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4091,35 +4145,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "جداکننده"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "دلتا(تغییر ساده)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "دلتا(سرعت بر ثانیه)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "رد کردن"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "وابستگی‌ها"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "وابسته"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "وابسته به"
 
@@ -4127,30 +4181,41 @@ msgstr "وابسته به"
 msgid "Deployment status"
 msgstr "وضعیت گسترش"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "توصیف"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "جزئیات"
 
@@ -4163,71 +4228,71 @@ msgid "Device"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "ضابطه یکتایی دستگاه"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4251,48 +4316,44 @@ msgstr ""
 msgid "Disable host"
 msgstr "غیرفعال‌سازی هاست"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "غیرفعال‌سازی هاست؟"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr ""
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "غیرفعال سازی موارد"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr ""
 
@@ -4300,11 +4361,11 @@ msgstr ""
 msgid "Disable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr ""
 
@@ -4312,42 +4373,47 @@ msgstr ""
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "غیرفعال‌شده"
 
@@ -4360,7 +4426,7 @@ msgstr "حادثه بد"
 msgid "Discovered"
 msgstr "کشف شده"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4368,17 +4434,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "دستگاه کشف شده"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "کشف"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "کشف با پروکسی"
 
@@ -4386,17 +4452,17 @@ msgstr "کشف با پروکسی"
 msgid "Discovery check"
 msgstr "تطبیق کشف"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "تطبیق کشف"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4405,65 +4471,68 @@ msgid "Discovery object"
 msgstr "تطبیق شیء"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "قانون کشف"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr ""
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr ""
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "قوانین کشف"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr ""
 
@@ -4475,7 +4544,7 @@ msgstr "وضعیت کشف"
 msgid "Display OK triggers for"
 msgstr "نمایش هشدار های رفع شده برای"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "نمایش"
 
@@ -4484,32 +4553,32 @@ msgstr "نمایش"
 msgid "Displaying %1$s of %2$s found"
 msgstr "نمایش %1$s از %2$s پیدا شده"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "توزیع مقادیر برای چندیدن آیتم"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "توزیع مقادیر برای چندیدن دوره"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "محاسبه نشود"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "انجام‌شده"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "نقطه"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4519,30 +4588,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "زمان از کار افتادگی"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "رسم سبک"
 
@@ -4560,74 +4629,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "مدت"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "آیتم پویا"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "خطا"
 
@@ -4635,13 +4705,13 @@ msgstr "خطا"
 msgid "EVENTS"
 msgstr "رویدادها"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است."
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4649,9 +4719,9 @@ msgstr "هر آدرس اینترنتی باید یک نام واحد داشته
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "ویرایش"
 
@@ -4659,7 +4729,7 @@ msgstr "ویرایش"
 msgid "Edit map element"
 msgstr "ویرایش نگاشت عنصر"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "ویرایش هشدار"
 
@@ -4667,27 +4737,61 @@ msgstr "ویرایش هشدار"
 msgid "Element"
 msgstr "عنصر"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "نام عنصر"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "خالی"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4695,76 +4799,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "ورودی خالی است"
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4773,11 +4899,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4785,11 +4911,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "فعال‌سازی"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "فعال‌سازی تصدیق"
 
@@ -4809,11 +4939,11 @@ msgstr "فعال بودن تصدیق رویداد ها"
 msgid "Enable host"
 msgstr "فعال‌سازی هاست"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr ""
 
@@ -4826,36 +4956,32 @@ msgstr ""
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "فعال سازی موارد"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr ""
 
@@ -4863,11 +4989,11 @@ msgstr ""
 msgid "Enable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4875,64 +5001,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "فعال‌شده"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "انگلیسی"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "خطا"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -4950,15 +5080,15 @@ msgstr "رویداد"
 msgid "Event ID"
 msgstr "شناسه‌ی رویداد"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "رویداد تأیید شده"
 
@@ -4967,7 +5097,7 @@ msgstr "رویداد تأیید شده"
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "تأیید رویداد غیر فعال شده"
 
@@ -4975,7 +5105,7 @@ msgstr "تأیید رویداد غیر فعال شده"
 msgid "Event details"
 msgstr "جزئیات رویداد"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "تولید رویداد"
 
@@ -4995,9 +5125,10 @@ msgstr "جزییات متن رویداد"
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "وقایع"
 
@@ -5005,36 +5136,41 @@ msgstr "وقایع"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "هر روز"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "هر هفته"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr ""
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "مانع شدن"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "اجرا"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "اجرا روی"
 
@@ -5042,13 +5178,13 @@ msgstr "اجرا روی"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "اجرای اسکریپت"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "تأیید اجرا"
 
@@ -5060,7 +5196,7 @@ msgstr "بسط دادن ماکروها"
 msgid "Expand single problem"
 msgstr "بسط دادن یک مشکل"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5070,12 +5206,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "گسترش یافته"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "صادر کردن موارد"
 
@@ -5083,22 +5219,22 @@ msgstr "صادر کردن موارد"
 msgid "Export to CSV"
 msgstr "صدور به CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "عبارت"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "خطای نحوی عبارت"
 
@@ -5106,11 +5242,12 @@ msgstr "خطای نحوی عبارت"
 msgid "Expression Variable Elements"
 msgstr "عبارت عناصر متغییر"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "عبارت نمیتواند خالی باشد"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "ساختار عبارت"
 
@@ -5131,17 +5268,17 @@ msgid "External check"
 msgstr "تطبیق خارجی"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "نادرست"
 
@@ -5150,16 +5287,17 @@ msgstr "نادرست"
 msgid "FTP"
 msgstr ""
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "شکست"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "شکست خورد"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5167,40 +5305,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "شکست ممیزی"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "نمودارهای مورد علاقه"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "نقشه های مورد علاقه"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "صفحات نمایش مورد علاقه"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "مورد علاقه ها"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr ""
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "فوریه"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "فیلد"
 
@@ -5244,19 +5382,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5265,13 +5403,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5279,68 +5417,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "منطقه پرشده"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "فیلتر"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "فیلتر با گروه هاست "
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "فیلتر بر اساس نام"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "پایان"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "ابتدا"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5349,8 +5490,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr "متناسب با نقشه"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "ثابت"
 
@@ -5360,76 +5501,80 @@ msgstr "ثابت"
 msgid "Flexible intervals"
 msgstr "وقفه منعطف"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "برای میهمان ، کلمه عبور باید خالی باشد"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr ""
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "چهارم"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr ""
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr ""
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "جمعه"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "از"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "دسترسی به واسط کاربری"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "کپی کامل"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "تمام‌صفحه"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "تابع"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5439,50 +5584,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "مودم GSM"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "واسط گرافیکی کاربران"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "دسترسی واسط گرافیکی غیرفعال شده است."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "عمومی"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "در %s ثانیه تولید شده است"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5490,65 +5635,65 @@ msgid "Get support"
 msgstr "پشتیبانی"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr ""
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "اسکریپت عمومی"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "اسکریپت های عمومی"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "برو"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "برو به"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5557,66 +5702,73 @@ msgid "Gradient line"
 msgstr "خط گراديان"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "نمودار"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr ""
 
@@ -5628,54 +5780,59 @@ msgstr "عنصر گراف"
 msgid "Graph item"
 msgstr "آیتم گراف"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "نام گراف"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "نمونه اولیه گراف"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5687,49 +5844,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr "مجموع گراف"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "نوع گراف"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "نمودارها"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr ""
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5738,54 +5897,56 @@ msgstr ""
 msgid "Grid"
 msgstr "شبکه اى"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "گروه"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr ""
+msgid_plural "Groups deleted"
+msgstr[0] ""
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5796,40 +5957,42 @@ msgstr "گروه برای هاست های کشف شده"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "نام گروه"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr ""
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "گروه کردن بر اساس"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "گروهها"
 
@@ -5837,22 +6000,13 @@ msgstr "گروهها"
 msgid "Groups in maintenance"
 msgstr "گروه‌های در دست نگه داری"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5869,7 +6023,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "نمای کلی موجودی هاست"
 
@@ -5887,7 +6041,8 @@ msgstr ""
 msgid "HTTP authentication"
 msgstr "احراز هویت HTTP"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5908,12 +6063,17 @@ msgstr "سخت افزار"
 msgid "Hardware (Full details)"
 msgstr "سخت افزار (جزییات کامل)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "ارتفاع"
@@ -5926,15 +6086,15 @@ msgstr "راهنما"
 msgid "Hexadecimal"
 msgstr "شانزده شانزدهى"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "پنهان"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "پنهان کردن"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "مخفی کردن همه"
 
@@ -5950,15 +6110,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "مخفی کردن هشدار های غیرفعال"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "مخفی کردن موارد"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -5967,23 +6127,23 @@ msgstr ""
 msgid "High"
 msgstr "بالا"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "تاریخچه"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -6004,79 +6164,79 @@ msgstr "تاریخچه رویدادها"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "افقی"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "ردیف کردن افقی"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "هاست"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "هاست (صعودی)"
 
@@ -6088,64 +6248,66 @@ msgstr "آدرس هاست"
 msgid "Host access"
 msgstr "دسترسی هاست"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr ""
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "هاست نمی‌تواند بیشتر از یک واسط پیش فرض داشته باشد."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "تعداد هاست"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr ""
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "گروه هاست"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6162,14 +6324,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "نوع برچسب گروه هاست"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "گروه هاست ها"
 
@@ -6179,8 +6342,8 @@ msgstr "گروه هاست ها"
 msgid "Host interface"
 msgstr "واسط هاست"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "فهرست هاست"
 
@@ -6196,7 +6359,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "نوع برچسب هاست"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "لیست هاست"
 
@@ -6205,18 +6368,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "نام هاست"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6225,70 +6388,70 @@ msgstr ""
 msgid "Host networks"
 msgstr "شبکه‌های هاست"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6300,7 +6463,7 @@ msgstr ""
 msgid "Host router"
 msgstr "مسیریاب هاست"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "صفحات نمایش هاست"
 
@@ -6312,51 +6475,52 @@ msgstr "وضعیت هاست"
 msgid "Host subnet mask"
 msgstr "subnet mask هاست"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "زمان هاست"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "هاست ‌ها"
 
@@ -6364,11 +6528,11 @@ msgstr "هاست ‌ها"
 msgid "Hosts & Groups"
 msgstr "هاست ها و گروه ها "
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "هاست ها (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6380,37 +6544,38 @@ msgstr "میزبا در"
 msgid "Hosts in maintenance"
 msgstr "میزبا در دست نگه داری"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "اطلاعات هاست"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "مکان هاست ها"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "ساعتی"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "ساعت"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr ""
 
@@ -6428,22 +6593,22 @@ msgstr "شناسه"
 msgid "IMAP"
 msgstr ""
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr ""
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6451,26 +6616,26 @@ msgstr ""
 msgid "IP address"
 msgstr "آدرس IP"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "محدوده IP"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6478,22 +6643,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr "عامل IPMI"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "الگوریتم تصدیق هویت IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "واسط های IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "گذر واژه IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "سطح ویژه IPMI "
 
@@ -6503,7 +6668,7 @@ msgstr "سطح ویژه IPMI "
 msgid "IPMI sensor"
 msgstr "سنسور IPMI "
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "نام کاربری IPMI"
 
@@ -6536,7 +6701,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6552,25 +6717,25 @@ msgid "ITEMS"
 msgstr "آیتم ها"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "نشان"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "نشان (پیش‌فرض)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "نشان(غیرفعال)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "نشان(نگهداری)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "نشان(مشکل)"
 
@@ -6591,42 +6756,44 @@ msgstr "نوع برچسب نشان"
 msgid "Icon map"
 msgstr "نگاشت نشان"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6639,7 +6806,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6647,29 +6815,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "نگاشت نشان"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "نشانها"
 
@@ -6677,21 +6845,23 @@ msgstr "نشانها"
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "تصویر"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6700,7 +6870,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr ""
 
@@ -6708,12 +6878,13 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6722,66 +6893,66 @@ msgid "Image updated"
 msgstr ""
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "تصاویر"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "فوری"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "وارد کردن"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "واردات پرونده"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "در"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "در گروه"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "در گروه ها"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6794,244 +6965,282 @@ msgstr "در نگهداری"
 msgid "In progress"
 msgstr "در حال پیشرفت"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "شامل"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr ""
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7041,11 +7250,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7054,11 +7263,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7066,74 +7275,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr ""
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7141,182 +7376,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr ""
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr ""
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr ""
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr ""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr ""
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr ""
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7325,64 +7579,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7403,52 +7661,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7457,7 +7720,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7477,7 +7741,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7487,43 +7751,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "اطلاعات"
 
@@ -7532,15 +7802,15 @@ msgstr "اطلاعات"
 msgid "Information"
 msgstr "اطلاعات"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "درج"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "درج macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "نصب"
 
@@ -7548,31 +7818,32 @@ msgstr "نصب"
 msgid "Installer name"
 msgstr "نام نصاب"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "واسط"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7592,7 +7863,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7600,7 +7871,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7613,19 +7884,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "بازه"
 
@@ -7635,112 +7906,114 @@ msgstr "بازه"
 msgid "Interval (in sec)"
 msgstr "بازه (ثانیه)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "فهرست"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7749,7 +8022,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7757,12 +8030,12 @@ msgstr ""
 msgid "Is online?"
 msgstr ""
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "مطلب"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7770,70 +8043,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr ""
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "آیتم"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr ""
 
@@ -7841,16 +8115,16 @@ msgstr ""
 msgid "Item count"
 msgstr "تعداد آیتم"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr ""
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7863,54 +8137,54 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "نمونه اولیه آیتم"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "نمونه اولیه آیتم ها"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7918,92 +8192,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "آیتم ها"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr ""
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr ""
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "لیست آیتم"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr ""
 
@@ -8015,72 +8289,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr "عامل JMX"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "واسط های JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "شناسه Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr ""
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr ""
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr ""
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr ""
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr ""
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr ""
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr ""
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8089,40 +8363,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr "نگهداری آخرین بازه منابع (روز)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "کلید"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "کلیدواژه"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr ""
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr ""
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr ""
 
@@ -8153,37 +8427,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "محلی"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "از دست رفته"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "برچسب"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "محل برچسب"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "زبان"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "آخرین"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8194,19 +8468,19 @@ msgid "Last %1$d issue"
 msgid_plural "Last %1$d issues"
 msgstr[0] "%1$d پیامد اخیر"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8226,28 +8500,28 @@ msgstr "365 روز گذشته"
 msgid "Last 7 days"
 msgstr "7 روز گذشته"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "آخرین تغییرات"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "آخرین تغییرات (نزولی)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "آخرین بررسی"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "نمودار ساعت گذشته"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "نمودار ماه گذشته"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "آخرین از"
 
@@ -8255,66 +8529,67 @@ msgstr "آخرین از"
 msgid "Last seen (age)"
 msgstr "آخرین مشاهده(سن)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "آخرین مقدار"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "نمودار هفته گذشته"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "آخرین اطلاعات"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "آخرین رویدادها"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "چپ"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "فهرست"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "سطر"
 
@@ -8322,39 +8597,29 @@ msgstr "سطر"
 msgid "Link"
 msgstr "پیوند"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "شاخص پیوند"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8366,50 +8631,50 @@ msgstr "پیوند به قالب"
 msgid "Link to templates"
 msgstr "پیوند به قالب ها"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "پیوند با قالب ها"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "پیوندزده به قالب ها"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "پیوند داده شده به"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "لیست خالی است"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "در حال بارگیری..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "زمان محلی"
 
@@ -8426,36 +8691,36 @@ msgid "Location longitude"
 msgstr "طول جغرافیایی"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "ثبت وقایع"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "قالب ثبت زمان"
@@ -8464,12 +8729,12 @@ msgstr "قالب ثبت زمان"
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "واردشده به عنوان"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8480,12 +8745,12 @@ msgstr "ورود"
 msgid "Login as Guest"
 msgstr "ورود به عنوان میهمان"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8494,8 +8759,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8516,22 +8782,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8543,7 +8805,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "نگهداری"
 
@@ -8568,49 +8830,49 @@ msgstr "100 هشدار بالا"
 msgid "Macro"
 msgstr "ماکرو"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "ماکروها"
 
@@ -8618,31 +8880,36 @@ msgstr "ماکروها"
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "نگهداری"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr ""
 
@@ -8650,7 +8917,7 @@ msgstr ""
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "طول دوره نگه داری"
 
@@ -8666,25 +8933,25 @@ msgstr "وضعیت نکهداری"
 msgid "Maintenance type"
 msgstr "نوع تعمیر و نگه داری"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr ""
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "دستی"
 
@@ -8695,12 +8962,12 @@ msgstr "خروج از سیستم دستی"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "نقشه"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8710,12 +8977,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr "\"%s\" نقشه "
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8732,12 +8999,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr ""
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "نگاشت شده به"
 
@@ -8747,23 +9014,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "نگاشت"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "نقشه‌ها"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr ""
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr ""
 
@@ -8771,28 +9038,34 @@ msgstr ""
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "انتخاب دیگران"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "انتخاب موارد"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "بروز رسانی کلی"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "حداکثر تعداد عناصر در جدول"
@@ -8806,29 +9079,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr "حداکثر تعداد رویداد در هشدارها"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "بزرگ‌سازی"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8836,101 +9091,96 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr ""
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "رسانه"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "نوع رسانه"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr ""
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr ""
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "انوع رسانه"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr ""
 
@@ -8945,14 +9195,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "فهرست"
 
@@ -8962,7 +9212,7 @@ msgstr "فهرست"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "پیام"
 
@@ -8970,66 +9220,66 @@ msgstr "پیام"
 msgid "Message actions"
 msgstr "فعالیت‌های پیام"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "پیام"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "پیام‌رسانی"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "وسط"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "حداقل کردن"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9038,79 +9288,76 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "دقیقه"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9120,7 +9367,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9132,18 +9379,18 @@ msgstr "حالت"
 msgid "Model"
 msgstr "مدل"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "دوشنبه"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "مانیتور شده با پروکسی"
 
@@ -9151,33 +9398,33 @@ msgstr "مانیتور شده با پروکسی"
 msgid "Monitored host"
 msgstr "هاست مانیتور شده"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "مانیتورینگ"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "ماه"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "ماهانه"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9185,7 +9432,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "بیشتر از 10 دقیقه"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9194,19 +9441,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "100 هشدار بیشتر آشغال شده"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "رویدادهای مشکلات چندگانه"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "تولید وقایع مشکلات چندگانه"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "بی‌صدا"
 
@@ -9219,60 +9466,58 @@ msgstr "نقشه های شبکه"
 msgid "NNTP"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "بدون داده"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "احراز هویت NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9283,26 +9528,32 @@ msgstr "احراز هویت NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "نام"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9321,12 +9572,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9334,7 +9585,7 @@ msgstr ""
 msgid "Network map added"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr ""
 
@@ -9346,7 +9597,7 @@ msgstr ""
 msgid "Network maps"
 msgstr "نقشه های شبکه"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "هرگز"
 
@@ -9354,24 +9605,24 @@ msgstr "هرگز"
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "جدید"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "برنامه جدید"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "شرط جدید"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "عنصر جدید"
 
@@ -9382,16 +9633,16 @@ msgstr "عنصر جدید"
 msgid "New flexible interval"
 msgstr "وقفه منعطف جدید"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "گروه جدید"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "گروه هاست جدید"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "آیتم جدید برای گراف"
 
@@ -9399,83 +9650,99 @@ msgstr "آیتم جدید برای گراف"
 msgid "New media"
 msgstr "رسانه جدید"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "عبارت منظم جدید"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "زمان سرویس جدید"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "بعدی"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "خیر"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9483,25 +9750,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9527,8 +9794,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9538,7 +9805,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9546,30 +9813,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "هیچ "
 
@@ -9578,27 +9846,27 @@ msgstr "هیچ "
 msgid "No data collection"
 msgstr "هیچ شرطی تعریف نشده است"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "بدون جزئیات"
 
@@ -9606,39 +9874,39 @@ msgstr "بدون جزئیات"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9653,7 +9921,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9662,7 +9930,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9671,48 +9943,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9725,17 +9998,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9754,33 +10032,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9799,7 +10084,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9815,7 +10100,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9824,15 +10109,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9844,133 +10129,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "(بدون پروکسی)"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -9978,7 +10308,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -9986,82 +10316,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "هدف انتخاب نشده"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "هدف انتخاب نشده"
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "بدون هشدار"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10070,57 +10401,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "هیچکدام"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "عادی"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "نمای عادی‌"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "بدون تأیید"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "بدون آیتم های قالب شده"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "غیرقابل دسترس"
 
@@ -10129,7 +10461,7 @@ msgstr "غیرقابل دسترس"
 msgid "Not classified"
 msgstr "رده بندی نشده"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "متصل نشده"
 
@@ -10142,8 +10474,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "عدم پشتیبانی"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr ""
@@ -10156,7 +10488,7 @@ msgstr "یادداشتها"
 msgid "Nothing"
 msgstr "هیچ‌چیز"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10164,87 +10496,87 @@ msgstr ""
 msgid "Notification report"
 msgstr "گزارش آگاه سازی"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "اخطارها"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "نوامبر"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "حالا"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10252,88 +10584,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "تعداد حالت‌های تغییر یافته"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "تعداد مراحل"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "تعداد کاربران (در دسترس)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "عددی(شناور)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "عددی(صحیح 64 بیتی)"
 
@@ -10348,16 +10680,18 @@ msgid "OEM"
 msgstr ""
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "صحیح"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10373,8 +10707,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "یا"
 
@@ -10394,11 +10727,12 @@ msgstr "سیستم عامل(خلاصه)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "نمای کلی"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10406,25 +10740,25 @@ msgstr ""
 msgid "Octal"
 msgstr "هشت هشتی"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "اکتبر"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "خاموش"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "صحیح"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "روشن"
 
@@ -10432,111 +10766,114 @@ msgstr "روشن"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "یکبار"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "فقط یکبار"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "یکبار پایین آمده"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10545,28 +10882,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "جزئیات عملکرد"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "نوع عملکرد"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "عملکردها"
@@ -10575,25 +10912,27 @@ msgstr "عملکردها"
 msgid "Operator"
 msgstr "عملگر"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10623,24 +10962,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "اصلی"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "آبی اصلی"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "دیگر"
 
@@ -10648,19 +10987,19 @@ msgstr "دیگر"
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "دیگر گروه ها"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "هاست ها دیگر"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10670,21 +11009,21 @@ msgstr "گروه‌ها | هاست های دیگر"
 msgid "Other parameters"
 msgstr "پارامترهای دیگر"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "دیگران"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10697,14 +11036,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "نمای کلی"
 
@@ -10712,7 +11048,7 @@ msgstr "نمای کلی"
 msgid "Overview by proxy"
 msgstr "نمای کلی با پروکسی"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10721,147 +11057,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr "داشبورد شخصی"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10870,32 +11214,34 @@ msgstr ""
 msgid "POP"
 msgstr ""
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "مشکل"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr ""
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "پارامتر"
 
@@ -10904,7 +11250,7 @@ msgstr "پارامتر"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10924,33 +11270,33 @@ msgstr "هشدارهای والد"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "منفعل"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -10960,20 +11306,21 @@ msgstr "منفعل"
 msgid "Password"
 msgstr "گذز واژه"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "گذرواژه (دوباره)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "برای نوع رسانه گذر واژه لازم است."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "گذرواژه نباید خالی باشد"
 
@@ -10982,21 +11329,21 @@ msgstr "گذرواژه نباید خالی باشد"
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11004,12 +11351,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "دوره"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "نوع دوره"
@@ -11019,24 +11366,24 @@ msgstr "نوع دوره"
 msgid "Periods"
 msgstr "دوره ها"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "مجوزها"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "فارسی"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr ""
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "دایره ای"
 
@@ -11048,55 +11395,56 @@ msgstr "محل الگوریتم"
 msgid "Plain text"
 msgstr "متن ساده"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "پخش"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "پخش صدا"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "لطفاً دو عنصر انتخاب کنید"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "قرار گرفتن در فیلد هاست"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "پرت"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11104,51 +11452,51 @@ msgstr ""
 msgid "Port range"
 msgstr "محدوده پرت"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr ""
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "موقعیت"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "پست"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "قبلی"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11197,30 +11545,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "فابل کلید اختصاصی"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "سطح ویژه"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "مشکل"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "نمایش مشکل"
 
@@ -11232,16 +11581,16 @@ msgstr "نمایش مشکل"
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "مشکل، اگر همه فرزندان مشکل دارند"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "مشکل، اگر دست کم یکی از فرزندان مشکل دارند"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "مشکل"
 
@@ -11249,75 +11598,71 @@ msgstr "مشکل"
 msgid "Profile"
 msgstr "پروفایل"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "نمونه‌های اولیه"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "پروکسی ها"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "پروکسی"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr ""
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "كليد عمومى"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11328,7 +11673,7 @@ msgstr "فایل کلید عمومی"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "صفی از آیتم ها که بروز شدند"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "صف"
 
@@ -11336,18 +11681,18 @@ msgstr "صف"
 msgid "RMCP+"
 msgstr ""
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "خواندن"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "فقط خواندنی"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "خواندن-نوشتن"
 
@@ -11359,7 +11704,7 @@ msgstr "دلیل"
 msgid "Received value"
 msgstr "وقادیر دریافت شده"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11367,11 +11712,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "گیرنده"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11382,28 +11727,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "گیرنده(ها)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "بازیابی"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "پیام بازیابی"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "موضوع بازیابی"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "رفرش(به ثانیه)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "تعداد رفرش های تکثیر کننده"
 
@@ -11421,46 +11766,50 @@ msgstr ""
 msgid "Regular expression"
 msgstr "عبارت منظم"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11477,26 +11826,28 @@ msgstr "فرمان راه دور"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11507,21 +11858,19 @@ msgstr "فرمان راه دور"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "حذف"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11529,11 +11878,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "حذف عنصر"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "حذف از"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "حذف از مورد علاقه ها"
@@ -11542,7 +11891,7 @@ msgstr "حذف از مورد علاقه ها"
 msgid "Remove from host group"
 msgstr "حذف از گروه هاست"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "حذف از گروه های هاست"
 
@@ -11554,28 +11903,28 @@ msgstr "حذف میزبان‌"
 msgid "Remove link"
 msgstr "حذف پیوند"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "حذف انتخاب شده"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "جایگزینی"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "جایگزینی گروه هاست ها"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "گزارش"
 
@@ -11583,35 +11932,36 @@ msgstr "گزارش"
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "گزارشات"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "مورد نیاز"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "مجوز هاست مورد نیاز است"
 
@@ -11619,29 +11969,31 @@ msgstr "مجوز هاست مورد نیاز است"
 msgid "Required performance (vps)"
 msgstr "کارایی مورد نیاز(vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "کارایی مورد نیاز سرور ، مقادیر جدید بر ثانیه"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "کدهای وضعیت مورد نیاز"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "رشته مورد نیاز"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "بازنشانی"
 
@@ -11660,9 +12012,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr "بازنشاندن تصدیق"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11675,7 +12027,7 @@ msgstr "رفع شد"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "منبع"
@@ -11690,15 +12042,15 @@ msgstr "زمان پاسخ"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "نتیجه"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "نتیجه غلط است"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "نتیجه درست است"
 
@@ -11711,7 +12063,8 @@ msgstr ""
 msgid "Result type"
 msgstr "نوع نتیجه"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11719,60 +12072,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "ترک سعی مجدد "
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "سعی مجدد"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "راست"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "پهنای سطر"
 
@@ -11780,11 +12142,11 @@ msgstr "پهنای سطر"
 msgid "Rows"
 msgstr "سطرها"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "سطر در صفحه"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "قوانین"
 
@@ -11829,20 +12191,20 @@ msgid "Run remote commands on hosts"
 msgstr "اجرای فرمان راه دور روی هاست ها"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11858,7 +12220,7 @@ msgstr "صفحات نمایش"
 msgid "SEARCH"
 msgstr "جستجو"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "سرور"
 
@@ -11873,13 +12235,13 @@ msgstr ""
 msgid "SLA"
 msgstr "سطح سرویس"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "نمایش اسلایدها"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "پیام کوتاه"
 
@@ -11888,17 +12250,17 @@ msgstr "پیام کوتاه"
 msgid "SMTP"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr ""
@@ -11914,7 +12276,7 @@ msgstr "کلید SNMP"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr ""
 
@@ -11926,9 +12288,9 @@ msgstr ""
 msgid "SNMP community"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "واسط های SNMP"
@@ -11937,7 +12299,7 @@ msgstr "واسط های SNMP"
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -11961,7 +12323,7 @@ msgstr "عامل SNMPv3"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -11979,7 +12341,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr ""
@@ -11988,15 +12350,35 @@ msgstr ""
 msgid "SSH agent"
 msgstr "عامل SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "وضعیت کشف"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "وضعیت هشدارها"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "وضعیت مانیتورینگ وب"
 
@@ -12004,92 +12386,92 @@ msgstr "وضعیت مانیتورینگ وب"
 msgid "STATUS OF ZABBIX"
 msgstr "وضعیت سپهر فانوس"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "شنبه"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "شنبه"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "ذخیره"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "ذخیره و بازگشت"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "مقیاس‌بندی"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "سناریو"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr ""
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr ""
 
@@ -12101,7 +12483,7 @@ msgstr "سناریوها"
 msgid "Schedule"
 msgstr "زمان‌بندی"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12112,126 +12494,125 @@ msgstr ""
 msgid "Screen"
 msgstr "صفحه‌نمایش"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "پیکربندی سلول‌های صفحات نمایش"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr ""
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr ""
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "صفحات ‌نمایش"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "اسکریپت"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr ""
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "نام اسکریپت"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12240,17 +12621,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr ""
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "اسکریپت ها"
 
@@ -12271,7 +12652,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr "محدودسازی مشخصه های جستجو/فیلتر"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "ثانیه"
 
@@ -12303,7 +12684,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "ثانیه"
 
@@ -12322,69 +12703,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "انتخاب"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "انتخاب نمونه اولیه"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "انتخاب سطرها با مقادیر مانند"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "انتخاب شده"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "عناصر انتخاب شده"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "گروه‌های انتخاب شده"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "هاست های انتخاب شده"
 
@@ -12400,7 +12788,7 @@ msgstr "ارسال پیام به گروه کاربران"
 msgid "Send message to users"
 msgstr "ارسال پیام به کاربران"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "ارسال فقط به"
 
@@ -12408,11 +12796,11 @@ msgstr "ارسال فقط به"
 msgid "Send to"
 msgstr "ارسال به"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "ارسال پیام به گروه کاربران"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "ارسال به کاربران"
 
@@ -12421,17 +12809,17 @@ msgstr "ارسال به کاربران"
 msgid "Sent"
 msgstr "ارسال‌شده"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "جداشده"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "سپتامبر"
 
@@ -12443,7 +12831,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "سرور"
@@ -12452,44 +12840,44 @@ msgstr "سرور"
 msgid "Server info"
 msgstr "اطلاعات کارساز"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "زمان سرور"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "سرویس"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12505,11 +12893,11 @@ msgstr ""
 msgid "Service port"
 msgstr "پرت سرویس"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "مدت سرویس"
 
@@ -12521,49 +12909,52 @@ msgstr "نوع سرویس"
 msgid "Service updated"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "سرویس ها "
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "جلسه پایان یافت ، لطفاً دوباره وارد شوید"
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "جدیت"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "جدیت (نزولی)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "نمایش"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "نمایش همه"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "نمایش جزئیات"
 
@@ -12593,35 +12984,36 @@ msgstr "عدم نمایش وقایع قدیمی تر از (روز)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "نمایش هاست در دست نگهداری"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "نمایش آیتم ها با نام شبیه"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "نمایش آیتم ها بدون داده"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "نمایش فهرست"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "نمایش خطوط"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "نمایش موارد"
 
@@ -12629,19 +13021,21 @@ msgstr "نمایش موارد"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "نمایش متن به عنوان HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "نمایش هشدارها"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "نمایش تأیید نشده ها"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "نمایش مقدار"
@@ -12650,11 +13044,11 @@ msgstr "نمایش مقدار"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "نمایش ساعت کاری"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "نمایش"
 
@@ -12674,6 +13068,10 @@ msgstr "بررسی ساده"
 msgid "Simple graph"
 msgstr "نمودار ساده"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "کدپستی سایت"
@@ -12711,7 +13109,7 @@ msgid "Site state / province"
 msgstr "استان سایت"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12729,16 +13127,16 @@ msgstr ""
 msgid "Slide"
 msgstr "اسلاید"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "نمایش اسلاید"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12747,11 +13145,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12759,10 +13157,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "نمایش اسلایدها"
 
@@ -12770,15 +13168,15 @@ msgstr "نمایش اسلایدها"
 msgid "Slides"
 msgstr "اسلایدها"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "بعدا"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr ""
 
@@ -12811,28 +13209,28 @@ msgid "Software application E"
 msgstr "نرم‌افزار کاربردی ه"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "مرتب سازی بر اساس"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "مرتب سازی(0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "مرتب سازی هشدارها بر اساس"
 
@@ -12845,11 +13243,11 @@ msgstr ""
 msgid "Source"
 msgstr "منبع"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr ""
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12857,63 +13255,63 @@ msgstr ""
 msgid "Speed"
 msgstr "سرعت"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "پشته‌ای"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "آیتم های استاندارد"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "حالت"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "وضعیت"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -12926,7 +13324,7 @@ msgstr "محاسبه وضعیت"
 msgid "Status calculation algorithm"
 msgstr "الگوریتم محاسبه وضعیت"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "کد وضعیت"
 
@@ -12935,7 +13333,7 @@ msgid "Status of Web monitoring"
 msgstr "وضعیت مانیتورینگ وب"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "وضعیت سپهر فانوس"
 
@@ -12952,40 +13350,40 @@ msgid "Status only"
 msgstr "فقط وضعیت"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "گام"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "گام سناریو"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "مراحل"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "توقف"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "ذخیره مقدار"
@@ -12994,11 +13392,11 @@ msgstr "ذخیره مقدار"
 msgid "Straight"
 msgstr "مستقیم"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "سبک"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "زیرفیلتر[نتیجه فقط بر روی داده‌های فیلتر شده]"
 
@@ -13006,11 +13404,11 @@ msgstr "زیرفیلتر[نتیجه فقط بر روی داده‌های فیل�
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "موضوع"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "زیر نقشه"
 
@@ -13019,32 +13417,32 @@ msgid "Success Audit"
 msgstr "رسیدگی موفق"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "یکشنبه"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "یکشنبه"
 
@@ -13052,27 +13450,27 @@ msgstr "یکشنبه"
 msgid "Support"
 msgstr "پشتیبانی"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "نام خانوادگی"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr ""
 
@@ -13080,16 +13478,16 @@ msgstr ""
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "پیش‌فرض سیستم"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "خطای سیستم."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13098,21 +13496,21 @@ msgid "System status"
 msgstr "وضعیت سیستم"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13131,11 +13529,11 @@ msgid "TOTAL"
 msgstr "کل"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "توضیحات هشدارها"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "درست"
 
@@ -13153,14 +13551,14 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "هدف"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "فهرست هدف "
 
@@ -13169,130 +13567,133 @@ msgid "Target type"
 msgstr "نوع هدف"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "قالب"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr ""
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "گروه قالب"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "پیوند قالب"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "لیست قالب"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "نام قالب"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "هشدار قالب"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "قالب آیتم ها"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "قالب ها"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "آزمایش"
 
@@ -13300,11 +13701,11 @@ msgstr "آزمایش"
 msgid "Test authentication"
 msgstr " آزمایش احراز هویت"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "آزمایش کردن تأیید"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "آزمایش داده"
 
@@ -13318,22 +13719,22 @@ msgid "Test string"
 msgstr "آزمایش رشته"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "متن"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13341,7 +13742,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13356,24 +13757,24 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13382,19 +13783,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "پوسته"
 
@@ -13404,11 +13805,11 @@ msgid "There is \"%1$d\" group with Internal GUI access."
 msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "سوم"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13417,11 +13818,11 @@ msgstr ""
 msgid "This month"
 msgstr "این ماه"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13433,27 +13834,27 @@ msgstr "این هفته"
 msgid "This year"
 msgstr "امسال"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "پنجشنبه"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "تا"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13462,28 +13863,28 @@ msgstr "تا"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "زمان"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13491,54 +13892,54 @@ msgstr ""
 msgid "Time period"
 msgstr "دوره زمانی"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "انتقال زمان"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "نوع زمان"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "زمان انقضا"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "مهر زمان"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "عنوان"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "به"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13546,17 +13947,18 @@ msgstr ""
 msgid "Today"
 msgstr "امروز"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "بالا"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "کل"
 
@@ -13574,7 +13976,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13591,90 +13993,90 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "روندها"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "هشدار"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr ""
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "توضیحات هشدار"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr ""
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "نمایش گزبنه های هشدار"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13688,11 +14090,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "عبارت شرط هشدار"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13700,7 +14103,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr "روش هشدار"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13713,12 +14116,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13730,50 +14133,50 @@ msgstr "نوع برچسب هشدار"
 msgid "Trigger name"
 msgstr "نام هشدار"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "نمونه اولیه هشدار"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "نمونه های اولیه هشدار"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13781,23 +14184,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "نمونه های اولیه هشدار از"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "جدیت هشدارها"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "جدیت هشدار"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr ""
 
@@ -13805,40 +14216,41 @@ msgstr ""
 msgid "Trigger value"
 msgstr "مقدار هشدار"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "هشدارها"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr ""
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "اطلاعات هشدارها"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "بروز رسانی گروهی هشدارها"
 
@@ -13846,78 +14258,78 @@ msgstr "بروز رسانی گروهی هشدارها"
 msgid "Triggers overview"
 msgstr "نمای کلی هشدارها"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "وضعیت هشدارها"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "100 هشدار بالا"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "هشدارها بهمراه جدیت"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "بریدن"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "سه شنبه"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "سه شنبه"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "دو عنصر باید انتخاب شود"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "نوع"
 
@@ -13925,62 +14337,64 @@ msgstr "نوع"
 msgid "Type (Full details)"
 msgstr "نوع[جزییات کامل]"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "نوع (صحیح)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "نوع محاسبات"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "نوع اطلاعات"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "انواع"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "ناشناخته"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "بالا"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "نشانی اینترنتی(بعد از ورود)"
 
@@ -13996,20 +14410,30 @@ msgstr "نشانی اینترنتی ب"
 msgid "URL C"
 msgstr "نشانی اینترنتی ج"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "نشانی های اینترنتی"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "انگلیسی(160 کاراکتر)"
 
@@ -14017,15 +14441,11 @@ msgstr "انگلیسی(160 کاراکتر)"
 msgid "USER PROFILE"
 msgstr "پروفایل کاربر "
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr ""
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr ""
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14033,7 +14453,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "تأیید نشده"
 
@@ -14046,20 +14466,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "رویدادهای مشکل تأیید نشده"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "فقط تأیید نشده"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "رفع انسداد موارد"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr ""
 
@@ -14068,29 +14488,29 @@ msgstr ""
 msgid "Units"
 msgstr "واحدها"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14100,23 +14520,20 @@ msgstr "ناشناخته"
 msgid "Unknown action"
 msgstr "فعالیت ناشناخته"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr ""
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14128,23 +14545,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr ""
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "حذف پیوند"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "حذف پیوند و پاک کردن"
 
@@ -14152,61 +14569,61 @@ msgstr "حذف پیوند و پاک کردن"
 msgid "Unlink from template"
 msgstr "حذف پیوند از قالب"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "حذف پیوند از قالب ها"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "وصل صدا"
 
@@ -14220,32 +14637,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14256,34 +14684,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "به‌روزرسانی"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "بروزرسانی در حال حاضر"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr " فاصله به‌روزرسانی"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "بازه‌ی به‌روزرسانی (ثانیه)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "بروز شده"
 
@@ -14291,55 +14719,55 @@ msgstr "بروز شده"
 msgid "Updated status of host"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "بروز شده : %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "بارگذاری"
 
@@ -14347,14 +14775,14 @@ msgstr "بارگذاری"
 msgid "Upper level maps"
 msgstr "نقشه های سطح بالاتر"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "زمان کار"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14362,10 +14790,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "زمان کار/زمان از کارافتادگی"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "نشانی اینترنتی"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14380,83 +14808,87 @@ msgid "Used in actions"
 msgstr "استفاده شده در فعالیت"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "کار‌بر"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr ""
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "گروه کابر"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14472,34 +14904,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "گروه های کابران"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "نام کاربری"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14525,243 +14957,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "نوع کاربر"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr ""
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "نام کاربری"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "کاربران"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "کاربران (آنلاین)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "مقدار"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14796,11 +15228,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14846,10 +15278,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "نگاشت مقدار"
 
@@ -14858,7 +15290,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14870,8 +15302,8 @@ msgstr ""
 msgid "Values"
 msgstr "مقادیر"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "متغیرها"
 
@@ -14884,64 +15316,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "عمودی"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "ردیف کردن عمودی"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "نام قابل رؤیت"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "اخطار"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "وب"
 
@@ -14949,63 +15386,81 @@ msgstr "وب"
 msgid "Web monitoring"
 msgstr "مانیتورینگ وب"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "چهارشنبه"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
@@ -15013,9 +15468,9 @@ msgstr "چهارشنبه"
 msgid "Week"
 msgstr "هفته"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "هفتگی"
 
@@ -15023,12 +15478,12 @@ msgstr "هفتگی"
 msgid "When active"
 msgstr "وقتی فعال شد"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "عرض"
@@ -15038,28 +15493,28 @@ msgstr "عرض"
 msgid "With data collection"
 msgstr "با جمع آوری داده"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "با آخرین وقایع تأیید نشده"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "با مشکلات"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "با هشدارها"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "با وقایع تأیید نشده"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "بدون مشکلات"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "بدون هشدارها"
 
@@ -15068,7 +15523,7 @@ msgid "Wizard"
 msgstr "ویزارد"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15081,180 +15536,165 @@ msgstr "ساعت کاری"
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "نوشتن"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr ""
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "برچسب افقی"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr ""
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "حداکثر مقدار محور افقی"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "حداکثر مقدار محور عمودی"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "سمت محور عمودی"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "برچسب عمودی"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr ""
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr ""
 
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr ""
-
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr ""
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15262,96 +15702,105 @@ msgstr ""
 msgid "Year"
 msgstr "سال"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "سالانه"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "بله"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr ""
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "شما وارد نشدید"
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr ""
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr ""
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr ""
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "شما باید وارد شوید تا این صفحه را ببینید"
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15364,7 +15813,7 @@ msgstr "سپهر فانوس"
 msgid "Zabbix"
 msgstr "سپهر فانوس"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15383,8 +15832,8 @@ msgid "Zabbix User"
 msgstr "کاربر سپهر فانوس"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15410,10 +15859,11 @@ msgstr "Sepehr internal"
 msgid "Zabbix internal authentication"
 msgstr "Sepehr internal authentication"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "سرور سپهر فانوس"
@@ -15426,7 +15876,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15434,15 +15884,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "سرور سپهر فانوس در حال اجراست"
 
@@ -15451,11 +15901,11 @@ msgstr "سرور سپهر فانوس در حال اجراست"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "نام سرور سپهر فانوس"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "پرت سرور سپهر فانوس"
 
@@ -15463,25 +15913,20 @@ msgstr "پرت سرور سپهر فانوس"
 msgid "Zabbix trapper"
 msgstr "Sepehr trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr ""
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "بزرگ‌نمایی‌"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr ""
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15490,19 +15935,19 @@ msgstr ""
 msgid "agent"
 msgstr "عامل"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "همه"
 
@@ -15510,19 +15955,15 @@ msgstr "همه"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr ""
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "به عنوان آبی"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "به عنوان سبز"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "به عنوان قرمز"
 
@@ -15534,83 +15975,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "میانگین"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr ""
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr ""
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr ""
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "m/d"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr ""
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "روز"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15632,19 +16039,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "پویا"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "اجزاء"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "عناصر کپی شوند به..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15656,47 +16059,49 @@ msgstr "دقیقا"
 msgid "executed"
 msgstr "اجراشده"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "ثابت"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "پیدا شده"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "هاست"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "گروه هاست"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "نشان"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "تصویر"
 
@@ -15704,7 +16109,7 @@ msgstr "تصویر"
 msgid "in"
 msgstr "در"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15714,7 +16119,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15722,20 +16127,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "آخرین"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "مانند"
@@ -15744,12 +16149,12 @@ msgstr "مانند"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15758,46 +16163,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr "ماکرو(ها)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "نگهداری"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "نقشه"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "بیشترین"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "کمترین"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15806,17 +16211,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "بدون داده"
@@ -15829,12 +16234,14 @@ msgstr "نیست در"
 msgid "not like"
 msgstr "نیست شبیه"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "اجرا نشده"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "انتخاب نشده"
 
@@ -15843,57 +16250,61 @@ msgstr "انتخاب نشده"
 msgid "not sent"
 msgstr "فرستاده نشده"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "حالا"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "از"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "در"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "دیگر"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "رفرش کن هر"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15902,25 +16313,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "موارد را یادآوری کن"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "ریشه"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "در حال اجرا"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "ثانیه"
 
@@ -15933,7 +16343,7 @@ msgstr "ثانیه"
 msgid "sent"
 msgstr "ارسال‌شده"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "شرح کوتاه"
 
@@ -15941,36 +16351,36 @@ msgstr "شرح کوتاه"
 msgid "show icon mappings"
 msgstr "نمایش نشان های نگاشت شده"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "نمایش مقادیر نگاشت شده"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "به"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "هشدار"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "ناشناخته"
 
@@ -15982,11 +16392,11 @@ msgstr "مقدار"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr ""
diff --git a/frontends/php/locale/fi/LC_MESSAGES/frontend.po b/frontends/php/locale/fi/LC_MESSAGES/frontend.po
index ee0995e99e3..ada0f1582b8 100644
--- a/frontends/php/locale/fi/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/fi/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-10-10 08:23+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -14,29 +14,31 @@ msgstr ""
 "X-Generator: Pootle 2.5.0\n"
 "X-POOTLE-MTIME: 1381386223.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" täytyy olla välillä 1970.01.01 - 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Näytä OK-tilassa olevat liipaisimet\" täytyy olla \"0\" tai positiivinen kokonaisluku.\"Näytä OK-tilassa olevat liipaisimet\" täytyy olla \"0\" tai positiivinen kokonaisluku.\"Näytä OK-tilassa olevat liipaisimet\" täytyy olla \"0\" tai positiivinen kokonaisluku.\"Näytä OK-tilassa olevat liipaisimet\" täytyy olla \"0\" tai positiivinen kokonaisluku.\"Näytä OK-tilassa olevat liipaisimet\" täytyy olla \"0\" tai positiivinen kokonaisluku."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Liipaisimet viĺkkuvat tilanvaihdossa\" täytyy olla \"0\" tai positiivinen kokonaisluku.\"Liipaisimet viĺkkuvat tilanvaihdossa\" täytyy olla \"0\" tai positiivinen kokonaisluku.\"Liipaisimet viĺkkuvat tilanvaihdossa\" täytyy olla \"0\" tai positiivinen kokonaisluku.\"Liipaisimet viĺkkuvat tilanvaihdossa\" täytyy olla \"0\" tai positiivinen kokonaisluku.\"Liipaisimet viĺkkuvat tilanvaihdossa\" täytyy olla \"0\" tai positiivinen kokonaisluku."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -48,24 +50,22 @@ msgstr[1] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (vuosi %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Nimike"
 msgstr[1] "%1$s Nimikettä"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -80,7 +80,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -101,23 +101,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d laite"
 msgstr[1] "%d laitetta"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - toistaiseksi)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(päivissä)"
 
@@ -125,34 +125,34 @@ msgstr "(päivissä)"
 msgid "(in sec)"
 msgstr "(sekunneissa)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimi 60 sekuntia, 0 - käytä toiminnan oletusta)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(ei välityspalvelinta)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[MASSAKUITTAUS]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 tai 1"
 
@@ -168,7 +168,7 @@ msgstr "10 sekuntia"
 msgid "30 seconds"
 msgstr "30 sekuntia"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D-näkymä"
 
@@ -184,7 +184,7 @@ msgstr "5 sekuntia"
 msgid "500 latest values"
 msgstr "500 viimeisintä arvoa"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -203,12 +203,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "HÄLYTYSTEN KUITTAUKSET"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "JA"
 
@@ -220,19 +219,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "SAATAVUUSRAPORTTI"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -244,42 +243,42 @@ msgstr "Hyväksyttävä SLA"
 msgid "Access denied!"
 msgstr "Ei käyttöoikeutta!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Tilin käyttö on estetty %s sekuntia"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Kuittaa"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Kuittaa"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Kuittaus lisätty"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Kuittaa hälytys"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Kuittaa ja palaa"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Kuittaa tila"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Kuitattu"
 
@@ -304,62 +303,65 @@ msgstr "Kuittaus pois päältä"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Toiminto"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Toiminnolla \"%1$s\" on väärä arvo kohdalle \"esc_period\" (minimi %2$s sekuntia).Toiminnolla \"%1$s\" on väärä arvo kohdalle \"esc_period\" (minimi %2$s sekuntia).Toiminnolla \"%1$s\" on väärä arvo kohdalle \"esc_period\" (minimi %2$s sekuntia).Toiminnolla \"%1$s\" on väärä arvo kohdalle \"esc_period\" (minimi %2$s sekuntia).Toiminnolla \"%1$s\" on väärä arvo kohdalle \"esc_period\" (minimi %2$s sekuntia)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Toiminto lisätty"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Toiminto poistettu"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -372,21 +374,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Toiminnon operaatiot"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Toiminto päivitetty"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktiivinen"
@@ -396,80 +398,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktiivinen lähtien"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktiivinen asti"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Lisää"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Lisää kommentti"
 
@@ -485,27 +490,23 @@ msgstr "Lisää kone"
 msgid "Add link"
 msgstr "Lisää linkki"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Lisää puuttuvat"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Lisää prototyyppi"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Lisää"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Lisää suosikkeihin"
@@ -514,7 +515,7 @@ msgstr "Lisää suosikkeihin"
 msgid "Add to host group"
 msgstr "Lisää koneryhmään"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Lisää koneryhmiin"
 
@@ -526,7 +527,7 @@ msgstr "Lisätty"
 msgid "Admin"
 msgstr "Hallinta"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Hallinta"
 
@@ -534,34 +535,34 @@ msgstr "Hallinta"
 msgid "Advanced labels"
 msgstr "Edistyneet nimilaput"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Ikä"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Ikä vähemmän kuin"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Ikä vähemmän kuin %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agentti"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Agentin verkkoliitännät"
@@ -570,12 +571,12 @@ msgstr "Agentin verkkoliitännät"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agentin, SNMP:n, JMX:n tai IPMI:n verkkoliitäntä"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -583,123 +584,126 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Oikaise ikonit"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Kaikki"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Kaikki ryhmät"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Kaikilla linkeillä pitäisi olla \"Nimi\" tai \"URL\" määriteltynä"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Sallitut koneet"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Mikä tahansa"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Mikä tahansa merkkijono mukaanluettuna"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Sovellus"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Sovellus \"%1$s\" on jo olemassa."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Sovellus lisätty"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Sovellus poistettu"
 msgstr[1] "Sovellus poistettu"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Sovelluksessa virhe."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Sovellus päivitetty"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Sovellus ID:llä \"%1$s\" ei ole käytettävissä koneella \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Sovellukset"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Käytä"
 
@@ -708,16 +712,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Lähestyy"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Huhti"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Huhtikuu"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Oletko varma, että haluat tehdä tämän toiminnon?"
 
@@ -733,9 +737,9 @@ msgstr "Alueen koko"
 msgid "Area type"
 msgstr "Alueen tyyppi"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -749,52 +753,49 @@ msgstr "Paljaana tekstinä"
 msgid "Asset tag"
 msgstr "Omaisuustunniste"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "klo (tunti:minuutti)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Ainakin yksi kone tai ryhmä pitää olla valittuna."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Ainakin yksi ylläpitoikkuna täytyy olla luotuna."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Seuranta"
@@ -814,26 +815,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "elo"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "elokuu"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Tunnistautuminen"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Tunnistautumisalgoritmi"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -892,9 +895,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automaattinen"
 
@@ -902,20 +905,20 @@ msgstr "Automaattinen"
 msgid "Automatic icon mapping"
 msgstr "Automaattinen ikonien kartoitus"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Automaattinen ikonien valinta"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Saatavuus"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Saatavuusraportti"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Saatavilla"
 
@@ -924,36 +927,36 @@ msgstr "Saatavilla"
 msgid "Average"
 msgstr "Keskiarvo"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr ""
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Ajanjakson T keskiarvo on < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Ajanjakson T keskiarvo = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Ajanjakson T keskiarvo on > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Ajanjakson T keskiarvo EI ole N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Akselin puoli"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "t"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Tausta"
@@ -962,7 +965,7 @@ msgstr "Tausta"
 msgid "Background image"
 msgstr "Taustakuva"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Pylväsraportit"
 
@@ -972,8 +975,8 @@ msgid "Base DN"
 msgstr "Perus-DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Basic-autentikointi"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -985,15 +988,15 @@ msgstr "Sidonta-DN"
 msgid "Bind password"
 msgstr "Sidonnan salasana"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Musta & sininen"
 
@@ -1005,8 +1008,8 @@ msgstr "Välkkyvä"
 msgid "Blocked"
 msgstr "Estetty"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Lihavoitu viiva"
 
@@ -1014,22 +1017,22 @@ msgstr "Lihavoitu viiva"
 msgid "Boolean"
 msgstr "Totuusarvo"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Alareuna"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Vaalenna"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgaria (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Joukkokuittaus"
 
@@ -1055,7 +1058,7 @@ msgstr ""
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr ""
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1085,7 +1088,7 @@ msgstr ""
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr ""
 
@@ -1097,7 +1100,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr ""
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr ""
 
@@ -1106,14 +1109,14 @@ msgstr ""
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr ""
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr ""
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr ""
 
@@ -1142,7 +1145,7 @@ msgstr ""
 msgid "CONFIGURATION OF PROXIES"
 msgstr ""
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr ""
 
@@ -1162,7 +1165,7 @@ msgstr ""
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr ""
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr ""
 
@@ -1178,7 +1181,7 @@ msgstr ""
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr ""
 
@@ -1210,22 +1213,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1234,21 +1237,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr ""
 
@@ -1256,92 +1259,95 @@ msgstr ""
 msgid "Callback"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr ""
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr ""
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr ""
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr ""
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr ""
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr ""
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr ""
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr ""
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1349,24 +1355,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr ""
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr ""
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1374,20 +1380,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr ""
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr ""
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr ""
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1396,24 +1402,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr ""
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr ""
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr ""
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr ""
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr ""
 
@@ -1425,27 +1431,27 @@ msgstr ""
 msgid "Cannot add slide show"
 msgstr ""
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr ""
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr ""
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr ""
 
@@ -1453,7 +1459,7 @@ msgstr ""
 msgid "Cannot add value map"
 msgstr ""
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1473,23 +1479,23 @@ msgstr ""
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -1497,20 +1503,20 @@ msgstr ""
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr ""
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr ""
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1519,19 +1525,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr ""
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr ""
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr ""
 
@@ -1539,101 +1545,100 @@ msgstr ""
 msgid "Cannot create icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr ""
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr ""
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
 msgid "Cannot delete group"
-msgstr ""
+msgid_plural "Cannot delete groups"
+msgstr[0] ""
+msgstr[1] ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr ""
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1641,79 +1646,79 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr ""
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr ""
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr ""
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr ""
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr ""
 
@@ -1721,77 +1726,80 @@ msgstr ""
 msgid "Cannot delete service"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr ""
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr ""
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1799,77 +1807,77 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] ""
 msgstr[1] ""
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1883,134 +1891,128 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] ""
 msgstr[1] ""
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2021,34 +2023,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2058,41 +2079,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2105,12 +2126,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr ""
@@ -2122,59 +2145,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr ""
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr ""
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2194,7 +2218,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2203,11 +2227,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2215,11 +2239,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr ""
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr ""
 
@@ -2228,217 +2252,226 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr ""
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr ""
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr ""
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr ""
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr ""
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr ""
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr ""
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr ""
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr ""
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr ""
 
@@ -2450,24 +2483,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr ""
 
@@ -2479,16 +2512,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr ""
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr ""
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2496,28 +2529,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr ""
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr ""
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr ""
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr ""
 
@@ -2529,40 +2558,41 @@ msgstr ""
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr ""
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr ""
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr ""
 
@@ -2570,15 +2600,15 @@ msgstr ""
 msgid "Cannot update value map"
 msgstr ""
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr ""
 
@@ -2587,47 +2617,47 @@ msgstr ""
 msgid "Case sensitive"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr ""
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr ""
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr ""
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr ""
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr ""
 
@@ -2636,48 +2666,48 @@ msgid "Chassis"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr ""
 
@@ -2686,44 +2716,44 @@ msgid "Check type"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr ""
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr ""
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr ""
@@ -2738,34 +2768,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr ""
 
@@ -2775,69 +2806,69 @@ msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr ""
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr ""
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr ""
 
@@ -2852,7 +2883,7 @@ msgstr ""
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr ""
 
@@ -2860,41 +2891,31 @@ msgstr ""
 msgid "Command actions"
 msgstr ""
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr ""
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr ""
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr ""
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr ""
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr ""
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2902,29 +2923,39 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr ""
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3087,23 +3118,23 @@ msgstr ""
 msgid "Configure (Filter %s)"
 msgstr ""
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr ""
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr ""
@@ -3151,7 +3182,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3159,30 +3190,37 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr ""
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr ""
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr ""
 
@@ -3202,6 +3240,10 @@ msgstr ""
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3219,7 +3261,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3232,15 +3274,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
-#: adm.iconmapping.php:126
-msgid "Create icon map"
+#: adm.images.php:151
+msgid "Create icon"
 msgstr ""
 
-#: adm.images.php:149
-msgid "Create image"
+#: adm.iconmapping.php:126
+msgid "Create icon map"
 msgstr ""
 
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr ""
 
@@ -3264,6 +3306,10 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr ""
@@ -3288,11 +3334,11 @@ msgstr ""
 msgid "Create slide show"
 msgstr ""
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr ""
 
@@ -3316,42 +3362,42 @@ msgstr ""
 msgid "Create value map"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3361,51 +3407,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr ""
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr ""
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3418,7 +3465,7 @@ msgstr ""
 msgid "Custom label"
 msgstr ""
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3432,7 +3479,7 @@ msgstr ""
 msgid "Custom screens"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr ""
 
@@ -3452,18 +3499,14 @@ msgstr ""
 msgid "Custom slides"
 msgstr ""
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr ""
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr ""
@@ -3479,28 +3522,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr ""
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr ""
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr ""
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3508,25 +3551,25 @@ msgstr ""
 msgid "DNS name"
 msgstr ""
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr ""
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr ""
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr ""
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr ""
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr ""
 
@@ -3538,20 +3581,21 @@ msgstr ""
 msgid "Dashboard filter"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr ""
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3574,11 +3618,12 @@ msgstr ""
 msgid "Data type"
 msgstr ""
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr ""
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr ""
 
@@ -3586,35 +3631,39 @@ msgstr ""
 msgid "Database monitor"
 msgstr ""
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr ""
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr ""
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr ""
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr ""
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr ""
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr ""
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr ""
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr ""
 
@@ -3634,53 +3683,52 @@ msgstr ""
 msgid "Date HW purchased"
 msgstr ""
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr ""
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr ""
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr ""
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr ""
 
@@ -3688,22 +3736,22 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr ""
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr ""
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr ""
 
@@ -3713,15 +3761,14 @@ msgstr ""
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr ""
 
@@ -3734,11 +3781,11 @@ msgid "Default delay (in seconds)"
 msgstr ""
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr ""
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3761,30 +3808,34 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr ""
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr ""
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr ""
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3792,53 +3843,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
+#: include/views/configuration.item.list.php:278
+msgid "Delete history of selected items?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:274
-msgid "Delete history of selected items?"
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3846,11 +3897,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3858,7 +3913,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr ""
 
@@ -3866,71 +3921,67 @@ msgstr ""
 msgid "Delete screen?"
 msgstr ""
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr ""
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr ""
@@ -3939,27 +3990,27 @@ msgstr ""
 msgid "Delete selected groups?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr ""
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr ""
 
@@ -3967,31 +4018,31 @@ msgstr ""
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr ""
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr ""
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr ""
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr ""
 
@@ -3999,15 +4050,15 @@ msgstr ""
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr ""
 
@@ -4019,11 +4070,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr ""
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr ""
 
@@ -4038,11 +4089,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4051,15 +4106,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr ""
 
@@ -4067,62 +4122,62 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4131,35 +4186,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr ""
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr ""
 
@@ -4167,30 +4222,41 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr ""
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr ""
 
@@ -4203,71 +4269,71 @@ msgid "Device"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4291,48 +4357,44 @@ msgstr ""
 msgid "Disable host"
 msgstr ""
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr ""
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr ""
 
@@ -4340,11 +4402,11 @@ msgstr ""
 msgid "Disable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr ""
 
@@ -4352,42 +4414,47 @@ msgstr ""
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr ""
 
@@ -4400,7 +4467,7 @@ msgstr ""
 msgid "Discovered"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4408,17 +4475,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr ""
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr ""
 
@@ -4426,17 +4493,17 @@ msgstr ""
 msgid "Discovery check"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4445,67 +4512,70 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr ""
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr ""
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr ""
 
@@ -4517,7 +4587,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr ""
 
@@ -4526,32 +4596,32 @@ msgstr ""
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr ""
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr ""
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr ""
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr ""
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4561,30 +4631,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr ""
 
@@ -4602,74 +4672,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr ""
 
@@ -4677,13 +4748,13 @@ msgstr ""
 msgid "EVENTS"
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4691,9 +4762,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr ""
 
@@ -4701,7 +4772,7 @@ msgstr ""
 msgid "Edit map element"
 msgstr ""
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4709,27 +4780,61 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr ""
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr ""
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr ""
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4737,76 +4842,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4815,11 +4942,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4827,11 +4954,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr ""
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4851,11 +4982,11 @@ msgstr ""
 msgid "Enable host"
 msgstr ""
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr ""
 
@@ -4868,36 +4999,32 @@ msgstr ""
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr ""
 
@@ -4905,11 +5032,11 @@ msgstr ""
 msgid "Enable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4917,64 +5044,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr ""
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr ""
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr ""
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -4992,15 +5123,15 @@ msgstr ""
 msgid "Event ID"
 msgstr ""
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr ""
 
@@ -5009,7 +5140,7 @@ msgstr ""
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr ""
 
@@ -5017,7 +5148,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr ""
 
@@ -5037,9 +5168,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr ""
 
@@ -5047,36 +5179,41 @@ msgstr ""
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr ""
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr ""
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr ""
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr ""
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5084,13 +5221,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5102,7 +5239,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5112,12 +5249,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr ""
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr ""
 
@@ -5125,22 +5262,22 @@ msgstr ""
 msgid "Export to CSV"
 msgstr ""
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr ""
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5148,11 +5285,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr ""
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5173,17 +5311,17 @@ msgid "External check"
 msgstr ""
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr ""
 
@@ -5192,16 +5330,17 @@ msgstr ""
 msgid "FTP"
 msgstr ""
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr ""
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr ""
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5209,40 +5348,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr ""
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr ""
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr ""
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr ""
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr ""
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr ""
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr ""
 
@@ -5286,19 +5425,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5307,13 +5446,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5321,68 +5460,71 @@ msgstr ""
 msgid "Filled region"
 msgstr ""
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr ""
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr ""
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr ""
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5391,8 +5533,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr ""
 
@@ -5402,76 +5544,80 @@ msgstr ""
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr ""
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr ""
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr ""
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr ""
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr ""
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr ""
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr ""
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5481,50 +5627,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr ""
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr ""
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr ""
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr ""
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5532,65 +5678,65 @@ msgid "Get support"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr ""
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr ""
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5599,66 +5745,73 @@ msgid "Gradient line"
 msgstr ""
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr ""
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr ""
 
@@ -5670,54 +5823,59 @@ msgstr ""
 msgid "Graph item"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5729,49 +5887,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr ""
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr ""
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5780,54 +5940,57 @@ msgstr ""
 msgid "Grid"
 msgstr ""
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr ""
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr ""
+msgid_plural "Groups deleted"
+msgstr[0] ""
+msgstr[1] ""
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5838,40 +6001,42 @@ msgstr ""
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr ""
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr ""
 
@@ -5879,22 +6044,13 @@ msgstr ""
 msgid "Groups in maintenance"
 msgstr ""
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5911,7 +6067,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5929,7 +6085,8 @@ msgstr ""
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5950,12 +6107,17 @@ msgstr ""
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr ""
@@ -5968,15 +6130,15 @@ msgstr ""
 msgid "Hexadecimal"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr ""
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr ""
 
@@ -5992,15 +6154,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr ""
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6009,23 +6171,23 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -6046,79 +6208,79 @@ msgstr ""
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr ""
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6130,66 +6292,68 @@ msgstr ""
 msgid "Host access"
 msgstr ""
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr ""
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr ""
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr ""
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6206,14 +6370,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr ""
 
@@ -6223,8 +6388,8 @@ msgstr ""
 msgid "Host interface"
 msgstr ""
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6240,7 +6405,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6249,18 +6414,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6269,72 +6434,72 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6346,7 +6511,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6358,51 +6523,52 @@ msgstr ""
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr ""
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr ""
 
@@ -6410,11 +6576,11 @@ msgstr ""
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6426,37 +6592,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr ""
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr ""
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr ""
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr ""
 
@@ -6474,22 +6641,22 @@ msgstr ""
 msgid "IMAP"
 msgstr ""
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr ""
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6497,26 +6664,26 @@ msgstr ""
 msgid "IP address"
 msgstr ""
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr ""
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6524,22 +6691,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr ""
 
@@ -6549,7 +6716,7 @@ msgstr ""
 msgid "IPMI sensor"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr ""
 
@@ -6582,7 +6749,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6598,25 +6765,25 @@ msgid "ITEMS"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr ""
 
@@ -6637,42 +6804,44 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6685,7 +6854,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6693,29 +6863,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6723,21 +6893,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr ""
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6746,7 +6918,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr ""
 
@@ -6754,12 +6926,13 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6768,66 +6941,66 @@ msgid "Image updated"
 msgstr ""
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr ""
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr ""
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr ""
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr ""
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr ""
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6840,244 +7013,282 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr ""
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr ""
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7087,11 +7298,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7100,11 +7311,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7112,74 +7323,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr ""
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7187,182 +7424,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr ""
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr ""
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr ""
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr ""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr ""
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr ""
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7371,64 +7627,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7449,52 +7709,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7503,7 +7768,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7523,7 +7789,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7533,43 +7799,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7578,15 +7850,15 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr ""
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
 msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr ""
 
@@ -7594,31 +7866,32 @@ msgstr ""
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr ""
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7638,7 +7911,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7646,7 +7919,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7659,19 +7932,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr ""
 
@@ -7681,112 +7954,114 @@ msgstr ""
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr ""
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7795,7 +8070,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7803,12 +8078,12 @@ msgstr ""
 msgid "Is online?"
 msgstr ""
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr ""
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7816,70 +8091,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr ""
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr ""
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr ""
 
@@ -7887,17 +8163,17 @@ msgstr ""
 msgid "Item count"
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr ""
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7911,56 +8187,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7968,92 +8244,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr ""
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr ""
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr ""
 
@@ -8065,72 +8341,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr ""
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr ""
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr ""
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr ""
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr ""
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr ""
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr ""
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr ""
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8139,40 +8415,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr ""
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr ""
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr ""
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr ""
 
@@ -8203,37 +8479,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr ""
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr ""
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr ""
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr ""
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr ""
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8245,19 +8521,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8277,28 +8553,28 @@ msgstr ""
 msgid "Last 7 days"
 msgstr ""
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr ""
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr ""
 
@@ -8306,66 +8582,67 @@ msgstr ""
 msgid "Last seen (age)"
 msgstr ""
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr ""
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr ""
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr ""
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr ""
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr ""
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr ""
 
@@ -8373,39 +8650,29 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr ""
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8417,50 +8684,50 @@ msgstr ""
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr ""
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr ""
 
@@ -8477,36 +8744,36 @@ msgid "Location longitude"
 msgstr ""
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr ""
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr ""
@@ -8515,12 +8782,12 @@ msgstr ""
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8531,12 +8798,12 @@ msgstr ""
 msgid "Login as Guest"
 msgstr ""
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8545,8 +8812,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8567,22 +8835,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8594,7 +8858,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr ""
 
@@ -8619,49 +8883,49 @@ msgstr ""
 msgid "Macro"
 msgstr ""
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr ""
 
@@ -8669,31 +8933,36 @@ msgstr ""
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr ""
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr ""
 
@@ -8701,7 +8970,7 @@ msgstr ""
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr ""
 
@@ -8717,25 +8986,25 @@ msgstr ""
 msgid "Maintenance type"
 msgstr ""
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr ""
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8746,12 +9015,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8761,12 +9030,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8783,12 +9052,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr ""
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8798,23 +9067,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr ""
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr ""
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr ""
 
@@ -8822,28 +9091,34 @@ msgstr ""
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr ""
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr ""
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr ""
@@ -8857,32 +9132,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr ""
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8890,105 +9144,99 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr ""
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr ""
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr ""
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr ""
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr ""
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr ""
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr ""
 
@@ -9003,14 +9251,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr ""
 
@@ -9020,7 +9268,7 @@ msgstr ""
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr ""
 
@@ -9028,66 +9276,66 @@ msgstr ""
 msgid "Message actions"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr ""
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9096,80 +9344,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr ""
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9179,7 +9424,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9191,18 +9436,18 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr ""
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr ""
 
@@ -9210,33 +9455,33 @@ msgstr ""
 msgid "Monitored host"
 msgstr ""
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr ""
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9244,7 +9489,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9253,19 +9498,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr ""
 
@@ -9278,60 +9523,58 @@ msgstr ""
 msgid "NNTP"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr ""
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
+msgid "NTLM"
 msgstr ""
 
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9342,26 +9585,32 @@ msgstr ""
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9380,12 +9629,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9393,7 +9642,7 @@ msgstr ""
 msgid "Network map added"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr ""
 
@@ -9405,7 +9654,7 @@ msgstr ""
 msgid "Network maps"
 msgstr ""
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr ""
 
@@ -9413,24 +9662,24 @@ msgstr ""
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr ""
 
@@ -9441,16 +9690,16 @@ msgstr ""
 msgid "New flexible interval"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr ""
 
@@ -9458,83 +9707,99 @@ msgstr ""
 msgid "New media"
 msgstr ""
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr ""
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr ""
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9542,25 +9807,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9586,8 +9851,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9597,7 +9862,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9605,30 +9870,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9637,27 +9903,27 @@ msgstr ""
 msgid "No data collection"
 msgstr ""
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9665,39 +9931,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9712,7 +9978,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9721,7 +9987,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9730,48 +10000,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9784,17 +10055,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9813,33 +10089,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9858,7 +10141,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9874,7 +10157,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9883,15 +10166,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9903,133 +10186,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr ""
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10037,7 +10365,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10045,82 +10373,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr ""
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10129,57 +10458,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr ""
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr ""
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr ""
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr ""
 
@@ -10188,7 +10518,7 @@ msgstr ""
 msgid "Not classified"
 msgstr ""
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr ""
 
@@ -10201,8 +10531,8 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr ""
@@ -10215,7 +10545,7 @@ msgstr ""
 msgid "Nothing"
 msgstr ""
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10223,87 +10553,87 @@ msgstr ""
 msgid "Notification report"
 msgstr ""
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr ""
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr ""
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10311,88 +10641,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr ""
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr ""
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr ""
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr ""
 
@@ -10407,16 +10737,18 @@ msgid "OEM"
 msgstr ""
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr ""
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10432,8 +10764,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr ""
 
@@ -10453,11 +10784,12 @@ msgstr ""
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr ""
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10465,25 +10797,25 @@ msgstr ""
 msgid "Octal"
 msgstr ""
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr ""
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr ""
 
@@ -10491,111 +10823,114 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr ""
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10604,28 +10939,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr ""
@@ -10634,25 +10969,27 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10682,24 +11019,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr ""
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr ""
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr ""
 
@@ -10707,19 +11044,19 @@ msgstr ""
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10729,21 +11066,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10756,14 +11093,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr ""
 
@@ -10771,7 +11105,7 @@ msgstr ""
 msgid "Overview by proxy"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10780,147 +11114,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10929,32 +11271,34 @@ msgstr ""
 msgid "POP"
 msgstr ""
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr ""
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr ""
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr ""
 
@@ -10963,7 +11307,7 @@ msgstr ""
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10983,33 +11327,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11019,20 +11363,21 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr ""
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr ""
 
@@ -11041,21 +11386,21 @@ msgstr ""
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11063,12 +11408,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr ""
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr ""
@@ -11078,24 +11423,24 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr ""
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr ""
 
@@ -11107,55 +11452,56 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr ""
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr ""
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11163,51 +11509,51 @@ msgstr ""
 msgid "Port range"
 msgstr ""
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr ""
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr ""
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr ""
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11256,30 +11602,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11291,16 +11638,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr ""
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr ""
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr ""
 
@@ -11308,75 +11655,71 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr ""
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr ""
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11387,7 +11730,7 @@ msgstr ""
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr ""
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr ""
 
@@ -11395,18 +11738,18 @@ msgstr ""
 msgid "RMCP+"
 msgstr ""
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr ""
 
@@ -11418,7 +11761,7 @@ msgstr ""
 msgid "Received value"
 msgstr ""
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11426,11 +11769,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11441,28 +11784,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr ""
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr ""
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr ""
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr ""
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr ""
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr ""
 
@@ -11480,47 +11823,51 @@ msgstr ""
 msgid "Regular expression"
 msgstr ""
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11537,26 +11884,28 @@ msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11567,21 +11916,19 @@ msgstr ""
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr ""
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11589,11 +11936,11 @@ msgstr ""
 msgid "Remove element"
 msgstr ""
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr ""
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11602,7 +11949,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11614,28 +11961,28 @@ msgstr ""
 msgid "Remove link"
 msgstr ""
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr ""
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr ""
 
@@ -11643,35 +11990,36 @@ msgstr ""
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr ""
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr ""
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11679,29 +12027,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr ""
 
@@ -11720,9 +12070,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11735,7 +12085,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr ""
@@ -11750,15 +12100,15 @@ msgstr ""
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr ""
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr ""
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr ""
 
@@ -11771,7 +12121,8 @@ msgstr ""
 msgid "Result type"
 msgstr ""
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11779,60 +12130,69 @@ msgstr ""
 msgid "Retries left"
 msgstr ""
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr ""
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr ""
 
@@ -11840,11 +12200,11 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr ""
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr ""
 
@@ -11889,20 +12249,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11918,7 +12278,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr ""
 
@@ -11933,13 +12293,13 @@ msgstr ""
 msgid "SLA"
 msgstr ""
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr ""
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr ""
 
@@ -11948,17 +12308,17 @@ msgstr ""
 msgid "SMTP"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr ""
@@ -11974,7 +12334,7 @@ msgstr ""
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr ""
 
@@ -11986,9 +12346,9 @@ msgstr ""
 msgid "SNMP community"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -11997,7 +12357,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12021,7 +12381,7 @@ msgstr ""
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12039,7 +12399,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr ""
@@ -12048,15 +12408,35 @@ msgstr ""
 msgid "SSH agent"
 msgstr ""
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr ""
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr ""
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr ""
 
@@ -12064,92 +12444,92 @@ msgstr ""
 msgid "STATUS OF ZABBIX"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr ""
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr ""
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr ""
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr ""
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr ""
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr ""
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr ""
 
@@ -12161,7 +12541,7 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12172,126 +12552,125 @@ msgstr ""
 msgid "Screen"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr ""
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr ""
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr ""
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr ""
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr ""
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr ""
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12300,17 +12679,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr ""
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr ""
 
@@ -12331,7 +12710,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr ""
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr ""
 
@@ -12363,7 +12742,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr ""
 
@@ -12382,69 +12761,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr ""
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr ""
 
@@ -12460,7 +12846,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr ""
 
@@ -12468,11 +12854,11 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12481,17 +12867,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr ""
 
@@ -12503,7 +12889,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr ""
@@ -12512,44 +12898,44 @@ msgstr ""
 msgid "Server info"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr ""
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr ""
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12565,11 +12951,11 @@ msgstr ""
 msgid "Service port"
 msgstr ""
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr ""
 
@@ -12581,49 +12967,53 @@ msgstr ""
 msgid "Service updated"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr ""
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr ""
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr ""
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr ""
 
@@ -12653,35 +13043,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr ""
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr ""
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr ""
 
@@ -12689,19 +13080,22 @@ msgstr ""
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr ""
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr ""
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr ""
@@ -12710,11 +13104,11 @@ msgstr ""
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr ""
 
@@ -12734,6 +13128,10 @@ msgstr ""
 msgid "Simple graph"
 msgstr ""
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12771,7 +13169,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12789,16 +13187,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr ""
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12807,11 +13205,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12819,10 +13217,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr ""
 
@@ -12830,15 +13228,15 @@ msgstr ""
 msgid "Slides"
 msgstr ""
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr ""
 
@@ -12871,28 +13269,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12905,11 +13303,11 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr ""
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12917,63 +13315,63 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr ""
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -12986,7 +13384,7 @@ msgstr ""
 msgid "Status calculation algorithm"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr ""
 
@@ -12995,7 +13393,7 @@ msgid "Status of Web monitoring"
 msgstr ""
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr ""
 
@@ -13012,40 +13410,40 @@ msgid "Status only"
 msgstr ""
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr ""
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr ""
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr ""
@@ -13054,11 +13452,11 @@ msgstr ""
 msgid "Straight"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr ""
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13066,11 +13464,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13079,32 +13477,32 @@ msgid "Success Audit"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr ""
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr ""
 
@@ -13112,27 +13510,27 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr ""
 
@@ -13140,16 +13538,16 @@ msgstr ""
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13158,21 +13556,21 @@ msgid "System status"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13191,11 +13589,11 @@ msgid "TOTAL"
 msgstr ""
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
+msgid "TRIGGER DESCRIPTION"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr ""
 
@@ -13213,14 +13611,14 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13229,130 +13627,133 @@ msgid "Target type"
 msgstr ""
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr ""
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr ""
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr ""
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr ""
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr ""
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr ""
 
@@ -13360,11 +13761,11 @@ msgstr ""
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr ""
 
@@ -13378,22 +13779,22 @@ msgid "Test string"
 msgstr ""
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13401,7 +13802,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13416,26 +13817,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13444,19 +13845,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr ""
 
@@ -13467,11 +13868,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13480,11 +13881,11 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13496,27 +13897,27 @@ msgstr ""
 msgid "This year"
 msgstr ""
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr ""
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr ""
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr ""
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13525,28 +13926,28 @@ msgstr ""
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13554,54 +13955,54 @@ msgstr ""
 msgid "Time period"
 msgstr ""
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr ""
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13609,17 +14010,18 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr ""
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr ""
 
@@ -13637,7 +14039,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13654,91 +14056,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr ""
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr ""
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr ""
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr ""
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr ""
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13753,11 +14155,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13765,7 +14168,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13778,12 +14181,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13795,52 +14198,52 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13848,23 +14251,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr ""
 
@@ -13872,40 +14283,41 @@ msgstr ""
 msgid "Trigger value"
 msgstr ""
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr ""
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr ""
 
@@ -13913,78 +14325,78 @@ msgstr ""
 msgid "Triggers overview"
 msgstr ""
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr ""
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr ""
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr ""
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr ""
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr ""
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr ""
 
@@ -13992,62 +14404,64 @@ msgstr ""
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr ""
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr ""
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr ""
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr ""
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr ""
 
@@ -14063,20 +14477,30 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr ""
 
@@ -14084,15 +14508,11 @@ msgstr ""
 msgid "USER PROFILE"
 msgstr ""
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr ""
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr ""
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14100,7 +14520,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr ""
 
@@ -14113,20 +14533,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr ""
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr ""
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr ""
 
@@ -14135,29 +14555,29 @@ msgstr ""
 msgid "Units"
 msgstr ""
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14167,23 +14587,20 @@ msgstr ""
 msgid "Unknown action"
 msgstr ""
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr ""
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14195,23 +14612,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr ""
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr ""
 
@@ -14219,61 +14636,61 @@ msgstr ""
 msgid "Unlink from template"
 msgstr ""
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14287,32 +14704,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14323,34 +14751,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr ""
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr ""
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr ""
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr ""
 
@@ -14358,55 +14786,55 @@ msgstr ""
 msgid "Updated status of host"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr ""
 
@@ -14414,14 +14842,14 @@ msgstr ""
 msgid "Upper level maps"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14429,9 +14857,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr ""
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14447,84 +14875,88 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr ""
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr ""
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr ""
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14541,34 +14973,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr ""
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr ""
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14594,243 +15026,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr ""
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr ""
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr ""
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14865,11 +15297,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14915,10 +15347,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr ""
 
@@ -14927,7 +15359,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14939,8 +15371,8 @@ msgstr ""
 msgid "Values"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr ""
 
@@ -14953,64 +15385,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr ""
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr ""
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr ""
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr ""
 
@@ -15018,65 +15455,83 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr ""
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr ""
 
@@ -15084,9 +15539,9 @@ msgstr ""
 msgid "Week"
 msgstr ""
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr ""
 
@@ -15094,12 +15549,12 @@ msgstr ""
 msgid "When active"
 msgstr ""
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr ""
@@ -15109,28 +15564,28 @@ msgstr ""
 msgid "With data collection"
 msgstr ""
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr ""
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr ""
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr ""
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr ""
 
@@ -15139,7 +15594,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15152,180 +15607,165 @@ msgstr ""
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr ""
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr ""
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr ""
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr ""
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr ""
 
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr ""
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr ""
-
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr ""
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15333,96 +15773,105 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr ""
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr ""
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr ""
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr ""
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr ""
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr ""
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr ""
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr ""
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15435,7 +15884,7 @@ msgstr ""
 msgid "Zabbix"
 msgstr ""
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15454,8 +15903,8 @@ msgid "Zabbix User"
 msgstr ""
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15481,10 +15930,11 @@ msgstr ""
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr ""
@@ -15497,7 +15947,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15505,15 +15955,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr ""
 
@@ -15522,11 +15972,11 @@ msgstr ""
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr ""
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr ""
 
@@ -15534,25 +15984,20 @@ msgstr ""
 msgid "Zabbix trapper"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr ""
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr ""
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr ""
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15561,19 +16006,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr ""
 
@@ -15581,19 +16026,15 @@ msgstr ""
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr ""
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr ""
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr ""
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr ""
 
@@ -15605,83 +16046,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr ""
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr ""
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr ""
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr ""
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr ""
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr ""
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15703,19 +16110,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr ""
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15727,47 +16130,49 @@ msgstr ""
 msgid "executed"
 msgstr ""
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr ""
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr ""
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr ""
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr ""
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr ""
 
@@ -15775,7 +16180,7 @@ msgstr ""
 msgid "in"
 msgstr ""
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15785,7 +16190,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15793,20 +16198,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr ""
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr ""
@@ -15815,12 +16220,12 @@ msgstr ""
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15829,46 +16234,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr ""
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr ""
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15877,17 +16282,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr ""
@@ -15900,12 +16305,14 @@ msgstr ""
 msgid "not like"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr ""
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr ""
 
@@ -15914,57 +16321,61 @@ msgstr ""
 msgid "not sent"
 msgstr ""
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr ""
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr ""
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr ""
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "verestä joka"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15973,25 +16384,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "muista valitut"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "juuri"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "käynnissä"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sek"
 
@@ -16004,7 +16414,7 @@ msgstr "sekuntia"
 msgid "sent"
 msgstr "lähetetty"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "lyhyt kuvaus"
 
@@ -16012,36 +16422,36 @@ msgstr "lyhyt kuvaus"
 msgid "show icon mappings"
 msgstr "näytä ikoni"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr ""
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr ""
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr ""
 
@@ -16053,11 +16463,11 @@ msgstr ""
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "vvvv"
diff --git a/frontends/php/locale/fr/LC_MESSAGES/frontend.po b/frontends/php/locale/fr/LC_MESSAGES/frontend.po
index 8152eed5057..39a76deff46 100644
--- a/frontends/php/locale/fr/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/fr/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-11-10 21:47+0300\n"
 "Last-Translator: Sébastien <sebastien@tiramiseb.fr>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -15,29 +15,31 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1384112843.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" doit être entre 1970.01.01 et 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Afficher les déclencheurs OK\" doit être \"0\" ou un entier positif."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Les déclencheurs clignotent au changement d'état\"doit être \"0\" ou un entier positif."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d jour"
 msgstr[1] "%1$d jours"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,24 +51,22 @@ msgstr[1] "%1$d problèmes sur %2$d sont affichés"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (année %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s élément"
 msgstr[1] "%1$s éléments"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s jour"
 msgstr[1] "%1$s jours"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -81,7 +81,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -102,23 +102,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d équipement"
 msgstr[1] "%d équipements"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - infini)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Seuls les super administrateurs peuvent créer des groupes)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(en jours)"
 
@@ -126,34 +126,34 @@ msgstr "(en jours)"
 msgid "(in sec)"
 msgstr "(en sec)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(60 secondes minimum, 0 - action par défaut)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(pas de proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "---[ACQUITTEMENT COLLECTIF]---"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 ou 1"
 
@@ -169,7 +169,7 @@ msgstr "10 secondes"
 msgid "30 seconds"
 msgstr "30 secondes"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "Vue 3D"
 
@@ -185,7 +185,7 @@ msgstr "5 secondes"
 msgid "500 latest values"
 msgstr "500 dernières valeurs"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -204,12 +204,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ACQUITTEMENT ALARME"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "ET"
 
@@ -221,19 +220,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "RAPPORT DE DISPONIBILITÉ"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "La différence absolue entre la dernière valeur et la précédente < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "La différence absolue entre la dernière valeur et la précédente = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "La différence absolue entre la dernière valeur et la précédente > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "La différence absolue entre la dernière valeur et la précédente n'est PAS N"
 
@@ -245,42 +244,42 @@ msgstr "SLA acceptable"
 msgid "Access denied!"
 msgstr "Accès refusé !"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Accès refusé."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Compte bloqué pendant %s secondes"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Acquitté"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Acquittement"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Acquittement ajouté"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Acquittement alarme par"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Acquittement et retour"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "État de l'acquittement"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Acquitté"
 
@@ -305,62 +304,65 @@ msgstr "Acquittement désactivé"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Action"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Action \"%1$s\" déjà existante."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "L'action \"%1$s\" a une valeur incorrecte pour \"esc_period\" (%2$s secondes minimum)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Aucune opération définie pour l'action \"%1$s\"."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Action ajoutée"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Action supprimée"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -373,21 +375,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Opérations d'action"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Action mise à jour"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Actions"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Actif"
@@ -397,80 +399,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Actif"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Actif depuis"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Actif jusqu'à"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Ajouter"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Ajout commentaire par"
 
@@ -486,27 +491,23 @@ msgstr "Ajouter hôte"
 msgid "Add link"
 msgstr "Ajouter le lien"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Ajouter manquants"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Ajouter des nouvelles applications ou des applications existantes"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Ajouter de nouveaux groupes d'hôtes ou des groupes d'hôtes existants"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Ajouter prototype"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Ajouter à"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Ajouter aux favoris"
@@ -515,7 +516,7 @@ msgstr "Ajouter aux favoris"
 msgid "Add to host group"
 msgstr "Ajouter au groupe d'hôtes"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Ajouter aux groupes d'hôte"
 
@@ -527,7 +528,7 @@ msgstr "Ajout"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administration"
 
@@ -535,34 +536,34 @@ msgstr "Administration"
 msgid "Advanced labels"
 msgstr "Étiquettes avancés"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Age"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Age inférieur à"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Age inférieur à %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agent"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Interfaces de l'agent"
@@ -571,12 +572,12 @@ msgstr "Interfaces de l'agent"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Interface de l'agent ou SNMP ou JMX ou IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Identifiant"
 
@@ -584,123 +585,126 @@ msgstr "Identifiant"
 msgid "Align icons"
 msgstr "Aligner les icônes"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Tous"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Tous les groupes"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tous liens doivent avoir \"Nom\" et \"URL\" spécifiés"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Hôtes autorisés"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Tous"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Toute chaîne de caractères inclue"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Application"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "L'application \"%1$s\" existe déjà."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Application ajoutée"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Application supprimée"
 msgstr[1] "Application supprimée"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Erreur application."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Application modifiée"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "L'application avec l'ID \"%1$s\" n'est pas disponible sur \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Applications"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -709,16 +713,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Proche de"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Avr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Avril"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Êtes-vous sûr de vouloir effectuer cette action ?"
 
@@ -734,9 +738,9 @@ msgstr "Taille de la zone"
 msgid "Area type"
 msgstr "Type de la zone"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -750,52 +754,49 @@ msgstr "Format texte"
 msgid "Asset tag"
 msgstr "Tag caractéristique"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "À %1$s:%2$s le %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "À %1$s:%2$s le %3$s %4$s de chaque %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "À %1$s:%2$s le %3$sme jour de chaque %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] "À %1$s:%2$s chaque %3$s de chaque semaine"
 msgstr[1] "À %1$s:%2$s chaque %3$s toutes les %4$s semaines"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] "À %1$s:%2$s chaque jour"
 msgstr[1] "À %1$s:%2$s tous les %3$s jours"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "À (heure:minute)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Au moins un hôte ou un groupe doit être sélectionné."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Une période de maintenance au moins doit être créée."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audit"
@@ -815,26 +816,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Aoû"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Août"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Authentification"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Algorithme d'authentification"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -893,9 +896,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -903,20 +906,20 @@ msgstr "Automatique"
 msgid "Automatic icon mapping"
 msgstr "Correspondance d'icône automatique"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Sélection automatique d'icône"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Disponibilité"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Rapport de disponibilité"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Disponible"
 
@@ -925,36 +928,36 @@ msgstr "Disponible"
 msgid "Average"
 msgstr "Moyen"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Moyenne par"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "La valeur moyenne d'une période T < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "La valeur moyenne d'une période T = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "La valeur moyenne d'une période T > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "La valeur moyenne d'une période T n'est PAS N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Coté de l'axe"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Fond"
@@ -963,7 +966,7 @@ msgstr "Fond"
 msgid "Background image"
 msgstr "Image de fond"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Rapports graphiques en barres"
 
@@ -973,8 +976,8 @@ msgid "Base DN"
 msgstr "DN de base"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Authentification simple"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -986,15 +989,15 @@ msgstr "DN de lien"
 msgid "Bind password"
 msgstr "Mot de passe de lien"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Noir & bleu"
 
@@ -1006,8 +1009,8 @@ msgstr "Clignotant"
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Ligne épaisse"
 
@@ -1015,22 +1018,22 @@ msgstr "Ligne épaisse"
 msgid "Boolean"
 msgstr "Booléen"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Bas"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Éclaircir"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgare (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Acquittement collectif"
 
@@ -1056,7 +1059,7 @@ msgstr "CONFIGURATION DES APPLICATIONS"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURATION DE L'AUTHENTIFICATION"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1086,7 +1089,7 @@ msgstr "CONFIGURATION DES GROUPES D’HÔTES"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "CONFIGURATION DES PROTOTYPES D'HÔTES"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURATION DES HÔTES"
 
@@ -1098,7 +1101,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURATION DE LA CORRESPONDANCE D'ICÔNES"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURATION DES IMAGES"
 
@@ -1107,14 +1110,14 @@ msgstr "CONFIGURATION DES IMAGES"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURATION DES SERVICES"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURATION DE PROTOTYPES D'ÉLÉMENTS"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURATION DES ÉLÉMENTS"
 
@@ -1143,7 +1146,7 @@ msgstr "CONFIGURATION DES CARTES RÉSEAU"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURATION DES PROXIES"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURATION DES EXPRESSIONS RATIONNELLES"
 
@@ -1163,7 +1166,7 @@ msgstr "CONFIGURATION DES SCRIPTS"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURATION DES DIAPORAMAS"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURATION DES MODÈLES"
 
@@ -1179,7 +1182,7 @@ msgstr "CONFIGURATION DES SÉVÉRITÉS DES DÉCLENCHEURS"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURATION DES DÉCLENCHEURS"
 
@@ -1211,22 +1214,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURATION DE ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1235,21 +1238,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Calculer SLA, SLA acceptable (en %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Calculé"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Permissions calculées"
 
@@ -1257,92 +1260,95 @@ msgstr "Permissions calculées"
 msgid "Callback"
 msgstr "Rappel"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canada (136 caractères)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Annuler"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Impossible d'acquitter l'événement"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Impossible d'ajouter un élément non-numérique \"%1$s\" au graphique \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Impossible d'ajouter un élément non numérique \"%1$s\" au prototype de graphique \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Impossible d'ajouter un élément non numérique \"%1$s\"."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Impossible d'ajouter l'action"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Impossible d'ajouter une condition d'action"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Impossible d'ajouter l'application"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Impossible d'ajouter une dépendance d'un hôte à un modèle."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Impossible d'ajouter la dépendance du déclencheur \"%1$s:%2$s\" au déclencheur non existant \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Impossible d'ajouter la règle de découverte"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Impossible d'ajouter le graphique"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Impossible d'ajouter le groupe"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Impossible d'ajouter l'hôte"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Impossible d'ajouter un prototype d'hôte"
 
@@ -1350,24 +1356,24 @@ msgstr "Impossible d'ajouter un prototype d'hôte"
 msgid "Cannot add image"
 msgstr "Impossible d'ajouter l'image"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Impossible d'ajouter l'image."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Impossible d'ajouter l'élément"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Impossible d'ajouter l'élément \"%1$s\" de \"%2$s\" à l'application \"%3$s\" de \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Impossible d'ajouter des items."
 
@@ -1375,20 +1381,20 @@ msgstr "Impossible d'ajouter des items."
 msgid "Cannot add macro."
 msgstr "Impossible d'ajouter la macro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Impossible d'ajouter une maintenance"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Impossible d'ajouter un type de média"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Impossible d'ajouter plus d'un élément de type \"Somme du graphique\" sur le graphique \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "Impossible d'ajouter plus d'un élément de type \"Somme de graphique\" sur le prototype de graphique \"%1$s\"."
@@ -1397,24 +1403,24 @@ msgstr "Impossible d'ajouter plus d'un élément de type \"Somme de graphique\"
 msgid "Cannot add network map"
 msgstr "Impossible d'ajouter une carte"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Impossible d'ajouter la nouvelle application \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Impossible d'ajouter le proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Impossible d'ajouter l'expression rationnelle"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Impossible d'ajouter l'écran"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Impossible d'ajouter le script"
 
@@ -1426,27 +1432,27 @@ msgstr "Impossible d'ajouter le service"
 msgid "Cannot add slide show"
 msgstr "Impossible d'ajouter le diaporama"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Impossible d'ajouter le modèle"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Impossible d'ajouter le déclencheur"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Impossible d'ajouter l'utilisateur"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Impossible d'ajouter l'utilisateur. Les mots de passe doivent être identiques."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Impossible d'ajouter des utilisateurs."
 
@@ -1454,7 +1460,7 @@ msgstr "Impossible d'ajouter des utilisateurs."
 msgid "Cannot add value map"
 msgstr "Impossible d'ajouter une table de correspondance"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Impossible d'ajouter le scénario web"
 
@@ -1474,23 +1480,23 @@ msgstr "Impossible de changer la méthode d'authentification en LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Impossible de changer la méthode d'authentification en Zabbix interne"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Impossible de nettoyer l'historique"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Impossible de cloner les prototypes de graphiques."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Impossible de cloner des prototypes d'hôtes."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Impossible de cloner les prototypes d'éléments."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Impossible de cloner les prototypes de déclencheurs."
 
@@ -1498,20 +1504,20 @@ msgstr "Impossible de cloner les prototypes de déclencheurs."
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Impossible de se connecter au port \"trapper\" du serveur Zabbix, il doit être disponible pour exécuter le script."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Impossible de copier le graphique"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Impossible de copier les éléments"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Impossible de copier le déclencheur \"%1$s:%2$s\" parce qu'il contient plusieurs hôtes dans l'expression."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "Impossible de créer un prototype d'hôte sur un hôte découvert \"%1$s\"."
@@ -1520,19 +1526,19 @@ msgstr "Impossible de créer un prototype d'hôte sur un hôte découvert \"%1$s
 msgid "Cannot create another database connection."
 msgstr "Impossible de créer une autre connexion base de donnée."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Impossible de créer des dépendances circulaires."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Impossible de créer une dépendance sur le déclencheur lui-même."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Impossible de créer une règle de découverte"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Impossible de créer le groupe d'hôtes."
 
@@ -1540,102 +1546,102 @@ msgstr "Impossible de créer le groupe d'hôtes."
 msgid "Cannot create icon map"
 msgstr "Impossible de créer la correspondance d'icône"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Impossible de créer des correspondances d'icônes avec le même nom \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Impossible de créer la carte \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Impossible de créer une nouvelle application, le scénario web est déjà assigné à une application."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Impossible de créer un nouvel élément"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Impossible de créer l'écran."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Impossible de supprimer l'utilisateur interne Zabbix \"%1$s\", essayez de désactiver cet utilisateur."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Impossible de supprimer l'action"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Impossible de supprimer l'application"
 msgstr[1] "Impossible de supprimer l'application"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Impossible de supprimer la dépendance"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Impossible de supprimer la règle de découverte"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Impossible d'effacer les règles de découverte"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Impossible de supprimer le graphique"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Impossible de supprimer le prototype de graphique"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Impossible de supprimer le graphique."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Impossible de supprimer les graphiques"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Impossible de supprimer des graphiques créés par la découverte de bas niveau."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Impossible de supprimer le groupe"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Impossible de supprimer le groupe"
+msgstr[1] "Impossible de supprimer le groupe"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Impossible de supprimer l'hôte"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Impossible de supprimer le groupe d'hôtes."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Impossible de supprimer un prototype d'hôte."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Impossible de supprimer des prototypes d'hôtes"
 
@@ -1643,79 +1649,79 @@ msgstr "Impossible de supprimer des prototypes d'hôtes"
 msgid "Cannot delete icon map"
 msgstr "Impossible de supprimer la correspondance d'icône"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Impossible de supprimer l'image"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Impossible de supprimer l'inventaire."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Impossible de supprimer l'élément"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Impossible de supprimer les éléments"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Impossible de supprimer des éléments créés par la découverte de bas niveau."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Impossible de supprimer une maintenance"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Impossible de supprimer le type de média"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Impossible de supprimer la carte"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Impossible de supprimer le proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Impossible de supprimer l'expression rationnelle"
 msgstr[1] "Impossible de supprimer les expressions rationnelles"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Impossible de supprimer l'écran"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Impossible de supprimer le script"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Impossible de supprimer les scripts. Paramètre d'entrée \"scriptids\" vide."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Impossible de supprimer les scripts. Le script \"%1$s\" est utilisé dans l'opération de l'action \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Impossible de supprimer des scripts. Le script avec l'identifiant \"%1$s\" n'existe pas."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Impossible de supprimer les actions sélectionnées"
 
@@ -1723,77 +1729,80 @@ msgstr "Impossible de supprimer les actions sélectionnées"
 msgid "Cannot delete service"
 msgstr "Impossible de supprimer le service"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Impossible de supprimer le diaporama"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Impossible de supprimer le modèle"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Impossible de supprimer une application provenant d'un modèle."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Impossible de supprimer des graphiques provenant d'un modèle."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Impossible de supprimer un prototype d'hôte provenant d'un modèle."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Impossible de supprimer un élément provenant d'un modèle."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Impossible de supprimer des éléments de provenant de modèles."
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Impossible de supprimer des éléments provenant d'un modèle."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Impossible de supprimer le déclencheur d'un modèle \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Impossible de supprimer le scénario web \"%1$s\" provenant d'un modèle."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Impossible de supprimer le déclencheur"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Impossible de supprimer le prototype de déclencheur"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Impossible de supprimer le déclencheur."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Impossible de supprimer les déclencheurs"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Impossible de supprimer des déclencheurs créés par la découverte de bas niveau."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Impossible de supprimer l'utilisateur"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Impossible de supprimer le média utilisateur."
 
@@ -1801,78 +1810,78 @@ msgstr "Impossible de supprimer le média utilisateur."
 msgid "Cannot delete value map"
 msgstr "Impossible de supprimer la table de correspondance"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Impossible de supprimer le scénario web"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Impossible de désactiver le type de média"
 msgstr[1] "Impossible de désactiver le type de média"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1887,135 +1896,129 @@ msgstr "Impossible d'afficher la file d'attente des éléments."
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "Impossible d'afficher plus d'un élément de type \"Somme de graphique\"."
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Impossible d'activer le type de média"
 msgstr[1] "Impossible d'activer le type de média"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossible de trouver l'image de fond \"%1$s\" utilisée dans la carte \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossible de trouver le graphique \"%1$s\" utilisé dans l'écran \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossible de trouver le groupe \"%1$s\" utilisé dans la carte \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossible de trouver le groupe \"%1$s\" utilisé dans l'écran \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossible de trouver l'hôte \"%1$s\" utilisé dans la carte \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossible de trouver l'hôte \"%1$s\" utilisé dans l'écran \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Impossible de trouver l'interface de l'hôte sur \"%1$s\" pour la clé d'élément \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Impossible de trouver l'hôte ou le modèle \"%1$s\" utilisé dans le graphique \"%2$s\"."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2026,34 +2029,53 @@ msgstr "Impossible de trouver l'icône \"%1$s\" utilisée dans la carte \"%2$s\"
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossible de trouver la correspondance d'icône \"%1$s\" utilisée dans la carte \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossible de trouver l'élément \"%1$s\" utilisé dans l'écran \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Impossible de trouver la carte \"%1$s\" utilisée dans la carte exportée \"%2$s\"."
@@ -2063,41 +2085,41 @@ msgstr "Impossible de trouver la carte \"%1$s\" utilisée dans la carte exporté
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossible de trouver la carte \"%1$s\" utilisée dans la carte \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossible de trouver la carte \"%1$s\" utilisée dans l'écran \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Impossible de trouver les objets nommés"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossible de trouver l'écran \"%1$s\" utilisée dans l'écran \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossible de trouver le déclencheur \"%1$s\" utilisé dans la carte \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2110,12 +2132,14 @@ msgstr "Impossible de formater l'arbre. Vérifiez la structure logique des liens
 msgid "Cannot format tree."
 msgstr "Impossible de formater l'arbre."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Impossible d'imploser l'expression \"%s\"."
@@ -2127,59 +2151,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] "Impossible d'importer l'écran \"%1$s\" : le sous-écran \"%2$s\" n'existe pas."
 msgstr[1] "Impossible d'importer l'écran \"%1$s\" : les sous-écrans \"%2$s\" n'existent pas."
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "Impossible d'importer le modèle \"%1$s\", le modèle lié \"%2$s\" n'existe pas."
 msgstr[1] "Impossible d'importer le modèle \"%1$s\", les modèles liés \"%2$s\" n'existent pas."
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Impossible d'inclure le fichier de vue \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Impossible d'ajouter le média utilisateur."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Impossible de lier le modèle"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Impossible de se déconnecter."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Impossible de réaliser une mise à jour collective du nom d'hôte."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Impossible de réaliser une mise à jour collective du nom d'hôte visible."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Impossible de passer des identifiants de modèles identiques pour le lien : %s."
@@ -2199,7 +2224,7 @@ msgstr "Impossible d'effectuer une mise à jour sur la table \"%1$s\" sans valeu
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Impossible d'effectuer une mise à jour sur la table \"%1$s\" sans condition \"where\"."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "Impossible de traiter des applications d'hôtes ou modèles différents."
 
@@ -2208,11 +2233,11 @@ msgstr "Impossible de traiter des applications d'hôtes ou modèles différents.
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Impossible de lire la réponse, veuillez vérifier la connexion avec le serveur Zabbix \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Impossible de supprimer tous les éléments, au moins un élément doit rester."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2220,11 +2245,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Impossible de supprimer la macro."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Impossible de renommer l'utilisateur invité."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Impossible d'enregistrer une règle de découverte sans vérifications."
 
@@ -2233,169 +2258,172 @@ msgstr "Impossible d'enregistrer une règle de découverte sans vérifications."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Impossible d'envoyer une commande, veuillez vérifier la connexion avec le serveur Zabbix \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "Impossible de configurer \"%1$s\" pour l'élément \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Impossible de configurer \"%1$s\" pour le déclencheur \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Impossible de configurer la valeur \"templateid\" pour l'application \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Impossible de configurer la valeur \"templateid\" pour l'écran \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Impossible de configurer la valeur \"templateid\" pour le prototype de déclencheur \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Impossible de configurer les champs d'inventaire pour un inventaire désactivé."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Impossible de changer d'hôte pour l'interface."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Impossible de débloquer les utilisateurs"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Impossible de délier et effacer les scénarios web."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Impossible de délier et effacer les applications."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Impossible de délier et effacer les règles de découverte"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Impossible de délier et effacer les prototypes de graphiques"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Impossible de délier et effacer les graphiques."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Impossible de délier et effacer les prototypes d'éléments"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Impossible de délier et effacer les éléments"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Impossible de délier et effacer les déclencheurs"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Impossible de délier le modèle"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Impossible de délier le déclencheur \"%s\", il a des éléments du modèle qui sont laissés liés à l'hôte."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "Impossible de mettre à jour \"%1$s\" pour un hôte découvert."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Impossible de mettre à jour \"%1$s\" pour un élément découvert."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Impossible de mettre à jour \"%1$s\" pour un déclencheur découvert."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Impossible de mettre à jour \"%1$s\" pour l'élément \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Impossible de mettre à jour \"%1$s\" pour le déclencheur \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Impossible de mettre à jour la valeur \"templateid\" pour l'application \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Impossible de mettre à jour la valeur \"templateid\" pour le graphique \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Impossible de mettre à jour \"templateid\" pour le prototype de graphique \"%1$s\"."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Impossible de mettre à jour la valeur \"templateid\" pour l'écran \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Impossible de mettre à jour la valeur \"templateid\" pour le prototype de déclencheur \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Impossible de mettre à jour un graphique découvert."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Impossible de mettre à jour un groupe d'hôtes découvert."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Impossible de mettre à jour l'action"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Impossible de mettre à jour l'application"
 
-# Homogénéisation update = mettre à jour
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Impossible de mettre à jour le commentaire"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
@@ -2403,49 +2431,54 @@ msgid "Cannot update configuration"
 msgstr "Impossible de mettre à jour la configuration"
 
 # Homogénéisation update = mettre à jour
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Impossible de mettre à jour le mode debug"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Impossible de mettre à jour la règle de découverte"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Impossible de mettre à jour l'accès à l'interface"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Impossible de mettre à jour le graphique"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Impossible de mettre à jour le groupe"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Impossible de mettre à jour le groupe."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Impossible de mettre à jour les groupes pour l'hôte découvert \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Impossible de mettre à jour l'hôte"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Impossible de mettre à jour le prototype d'hôte"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Impossible de mettre à jour les hôtes"
 
@@ -2457,24 +2490,24 @@ msgstr "Impossible de mettre à jour la table de correspondance d'icônes"
 msgid "Cannot update image"
 msgstr "Impossible de mettre à jour l'image"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Impossible de mettre à jour l'image."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Impossible de mettre à jour l'interface de l'hôte découvert \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Impossible de mettre à jour l'élément"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Impossible de mettre à jour les éléments"
 
@@ -2486,16 +2519,16 @@ msgstr "Impossible de mettre à jour la macro."
 msgid "Cannot update macros"
 msgstr "Impossible de mettre à jour les macros"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Impossible de mettre à jour la maintenance"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Impossible de mettre à jour la carte \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Impossible de mettre à jour le type de média"
 
@@ -2503,28 +2536,24 @@ msgstr "Impossible de mettre à jour le type de média"
 msgid "Cannot update network map"
 msgstr "Impossible de mettre à jour la carte"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Impossible de mettre à jour le proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Impossible de mettre à jour le proxy pour l'hôte découvert \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Impossible de mettre à jour l'expression rationnelle"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Impossible de mettre à jour l'écran"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Impossible de mettre à jour l'écran."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Impossible de mettre à jour le script"
 
@@ -2536,40 +2565,41 @@ msgstr "Impossible de mettre à jour le service"
 msgid "Cannot update slide show"
 msgstr "Impossible de mettre à jour le diaporama"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Impossible de mettre à jour le modèle"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Impossible de mettre à jour une application provenant d'un modèle."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "Impossible de mettre à jour les modèles sur l'hôte découvert \"%1$s\"."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Impossible de mettre à jour le déclencheur"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Impossible de mettre à jour l'utilisateur"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Impossible de mettre à jour le média utilisateur."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Impossible de mettre à jour l'utilisateur. Les mots de passe doivent être identiques."
 
@@ -2577,15 +2607,15 @@ msgstr "Impossible de mettre à jour l'utilisateur. Les mots de passe doivent ê
 msgid "Cannot update value map"
 msgstr "Impossible de mettre à jour la table de correspondance"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Impossible de mettre à jour le scénario web"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "Impossible de valider le test de découverte : requête invalide ou connexion au serveur Zabbix échouée."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Légende"
 
@@ -2594,47 +2624,47 @@ msgstr "Légende"
 msgid "Case sensitive"
 msgstr "Sensible à la casse"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Centre"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Changement"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Variation"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Caractère"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Chaîne de caractères inclue"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Chaîne de caractères non inclue"
 
@@ -2643,48 +2673,48 @@ msgid "Chassis"
 msgstr "Châssis"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "La vérification existe déjà."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Vérifiez l'expression à partir de \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Veuillez vérifier la clé. L'exemple par défaut a été utilisé."
 
@@ -2693,44 +2723,44 @@ msgid "Check type"
 msgstr "Vérifiez le type"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Vérifications"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Les vérifications doivent être uniques."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chinois (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Chinois (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Impossible de créer un lien circulaire pour l'élément de la carte \"%s\"."
@@ -2745,34 +2775,35 @@ msgstr "Référence circulaire dans les cartes : %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Référence circulaire dans les écrans : %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Référence circulaire dans les modèles : %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Le lien de modèles circulaire n'est pas autorisé."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Classique"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Effacer"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Effacer l'historique et les tendances"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Effacer l'historique des éléments sélectionnés"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Effacer en déliant"
 
@@ -2782,69 +2813,69 @@ msgstr "Horloge"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Clone"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Fermer"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Fermer le constructeur d'expression"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Couleur"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "La couleur \"%1$s\" n'est pas correcte : un code couleur hexadécimal est attendu (6 symboles)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Couleur (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Étendue de la colonne"
 
@@ -2859,7 +2890,7 @@ msgstr "Résultat combiné"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Commande"
 
@@ -2867,41 +2898,31 @@ msgstr "Commande"
 msgid "Command actions"
 msgstr "Actions associées à la commande"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Commande ne peut pas être vide."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Commandes"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Commentaire mis à jour"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Commentaires"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Commentaires pour \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Commercial"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Comparer les valeurs de multiples périodes"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Permissions de base"
 
@@ -2909,29 +2930,39 @@ msgstr "Permissions de base"
 msgid "Condition"
 msgstr "Condition"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Conditions"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Configuration"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3094,23 +3125,23 @@ msgstr "Configuration mise à jour"
 msgid "Configure (Filter %s)"
 msgstr "Configurer (Filtre %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Texte de confirmation"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Connexion à"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Connecté en tant que '%1$s'"
@@ -3169,7 +3200,7 @@ msgid "Context name"
 msgstr "Nom de contexte"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3177,30 +3208,37 @@ msgstr ""
 msgid "Contract number"
 msgstr "Numéro de contrat"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Coordonnées"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Copier"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Copier les éléments sélectionnés sur ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Connexion correcte \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Impossible de sauvegarder l'image !"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Compte"
 
@@ -3220,6 +3258,10 @@ msgstr "Créer une application"
 msgid "Create application (select host first)"
 msgstr "Créer une application (sélectionner un hôte d'abord)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3237,7 +3279,7 @@ msgstr "Créer un graphique (sélectionner l'hôte d'abord)"
 msgid "Create graph prototype"
 msgstr "Créer un prototype de graphique"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Créer un hôte"
 
@@ -3250,15 +3292,15 @@ msgstr "Créer un groupe d'hôtes"
 msgid "Create host prototype"
 msgstr "Créer un prototype d'hôte"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Créer une table de correspondance d'icônes"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Créer une image"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Créer un élément"
 
@@ -3282,6 +3324,10 @@ msgstr "Créer une carte"
 msgid "Create media type"
 msgstr "Créer un type de média"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Créer un proxy"
@@ -3306,11 +3352,11 @@ msgstr "Créer un script"
 msgid "Create slide show"
 msgstr "Créer un diaporama"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Créer un modèle"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Créer un déclencheur"
 
@@ -3334,42 +3380,42 @@ msgstr "Créer un groupe d'utilisateurs"
 msgid "Create value map"
 msgstr "Créer une table de correspondance"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Créée : Application \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Créée : Règle de découverte \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Créé : prototype d'hôte \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Créé : Élément \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Créé : Prototype d'élément \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Créé : Déclencheur \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Créé : Prototype de déclencheur \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Créé : scénario web \"%1$s\" sur \"%2$s\"."
@@ -3379,51 +3425,52 @@ msgid "Critical"
 msgstr "Critique"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "La date actuelle est < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "La date actuelle est = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "La date actuelle est > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "La date actuelle n'est PAS N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Hôte courant"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "L'heure actuelle est < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "L'heure actuelle est = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "L'heure actuelle est > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "L'heure actuelle n'est PAS N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Valeur courante"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3436,7 +3483,7 @@ msgstr "Graphiques personnalisés"
 msgid "Custom label"
 msgstr "Étiquette personnalisée"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "L'étiquette personnalisée pour les éléments de la carte \"%2$s\" de type \"%1$s\" ne doit pas être vide."
@@ -3450,7 +3497,7 @@ msgstr "Multiplicateur personnalisé"
 msgid "Custom screens"
 msgstr "Écrans personnalisés"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Script personnalisé"
 
@@ -3470,18 +3517,14 @@ msgstr "Taille personnalisée"
 msgid "Custom slides"
 msgstr "Diapositives personnalisées"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Tchèque (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "CONFIGURATION DU TABLEAU DE BORD"
@@ -3497,28 +3540,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "DÉTAILS DU SCENARIO"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "DÉSACTIVÉ"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DÉCOUVERT"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3526,25 +3569,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Nom DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "ARRÊTÉ"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Journalier"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Orange foncé"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Assombrir"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
@@ -3556,20 +3599,21 @@ msgstr "Configuration du tableau de bord"
 msgid "Dashboard filter"
 msgstr "Filtre du tableau de bord"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Ligne pointillée"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Données"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3592,11 +3636,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Type de donnée"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Fichier base de données"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Hôte base de données"
 
@@ -3604,35 +3649,39 @@ msgstr "Hôte base de données"
 msgid "Database monitor"
 msgstr "Surveillance base de données"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Mot de passe utilisateur de la base de données"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Port de la base de données"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Schéma de la base de données"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Serveur base de données"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Nom base de données"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Utilisateur base de données"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Date"
 
@@ -3652,53 +3701,52 @@ msgstr "Matériel - Date de fin de maintenance"
 msgid "Date HW purchased"
 msgstr "Matériel - Date d'achat"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Jour"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Jour du mois"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Le jour du mois est < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Le jour du mois est = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Le jour du mois est > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Le jour du mois n'est PAS N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Jour de la semaine"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Le jour de la semaine est < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Le jour de la semaine est = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Le jour de la semaine est > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Le jour de la semaine n'est PAS N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Jours"
 
@@ -3706,22 +3754,22 @@ msgstr "Jours"
 msgid "Debug"
 msgstr "Debug"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Mode debug"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Mode debug modifié"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Déc"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Décembre"
 
@@ -3731,15 +3779,14 @@ msgstr "Décimal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Défaut"
 
@@ -3752,11 +3799,11 @@ msgid "Default delay (in seconds)"
 msgstr "Délai par défaut (en secondes)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Message par défaut"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Durée de l'étape d'opération par défaut"
 
@@ -3779,30 +3826,34 @@ msgstr "Thème par défaut \"%1$s\"."
 msgid "Delay"
 msgstr "Délai"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Délai (en sec)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Retardé de"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Supprimer"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Supprimer et effacer"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Attention : ceci supprimera les modèles sélectionnés et effecera les hôtes liés"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Supprimer et effacer le modèle (Attention : tous les liens avec les hôtes seront effacés!)"
 
@@ -3810,53 +3861,53 @@ msgstr "Supprimer et effacer le modèle (Attention : tous les liens avec les hô
 msgid "Delete application?"
 msgstr "Supprimer l'application ?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Effacer l'action actuelle ?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Supprimer la règle de découverte ?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Supprimer l'expression ?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Supprimer le graphique ?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Supprimer l'historique des scénarios WEB sélectionnés ?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Supprimer l'historique des éléments sélectionnés ?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Supprimer la correspondance d'icône ?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Effacer l'élément ?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Supprimer mot-clé ?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Supprimer les liens entre les éléments sélectionnés ?"
 
@@ -3864,11 +3915,15 @@ msgstr "Supprimer les liens entre les éléments sélectionnés ?"
 msgid "Delete maintenance period?"
 msgstr "Supprimer la période de maintenance ?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Supprimer la carte réseau ?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Supprimer le proxy ?"
 
@@ -3876,7 +3931,7 @@ msgstr "Supprimer le proxy ?"
 msgid "Delete regular expression?"
 msgstr "Supprimer l'expression rationnelle ?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Supprimer le scénario ?"
 
@@ -3884,71 +3939,67 @@ msgstr "Supprimer le scénario ?"
 msgid "Delete screen?"
 msgstr "Supprimer l'écran ?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Supprimer script ?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Supprimer les éléments sélectionnés"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Supprimer les scénarios WEB sélectionnés ?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Supprimer les actions sélectionnées ?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Supprimer les applications sélectionnées ?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Supprimer les règles de découverte sélectionnées ?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Spprimer les éléments sélectionnés ?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Supprimer les graphiques sélectionnés ?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Supprimer le groupe sélectionné ?"
@@ -3957,27 +4008,27 @@ msgstr "Supprimer le groupe sélectionné ?"
 msgid "Delete selected groups?"
 msgstr "Supprimer les groupes sélectionnés ?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Supprimer les groupes d'hôtes sélectionnés ?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr "Supprimer le prototype d'hôte sélectionné ?"
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr "Supprimer les prototypes d'hôtes sélectionnés ?"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Supprimer hôte sélectionné ?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Suppression des hôtes sélectionnés ?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Supprimer l'image sélectionnée ?"
 
@@ -3985,31 +4036,31 @@ msgstr "Supprimer l'image sélectionnée ?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Supprimer les éléments sélectionnés ?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Supprimer les maintenances sélectionnées ?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Supprimer les cartes sélectionnées ?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Supprimer le type de média sélectionné ?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Supprimer les types de media sélectionnés ?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Supprimer les proxies sélectionnés ?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Supprimer les expressions rationnelles ?"
 
@@ -4017,15 +4068,15 @@ msgstr "Supprimer les expressions rationnelles ?"
 msgid "Delete selected screens?"
 msgstr "Supprimer les écrans sélectionnés ?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Supprimer les scripts sélectionnés ?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Supprimer les diaporamas sélectionnés ?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Supprimer les modèles sélectionnés ?"
 
@@ -4037,11 +4088,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Supprimer les déclencheurs sélectionnés ?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Supprimer l'utilisateur sélectionné ?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Supprimer les utilisateurs sélectionnés ?"
 
@@ -4056,11 +4107,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Supprimer la table de correspondance sélectionnée ? Elle est utilisé par %d élément !"
 msgstr[1] "Supprimer la table de correspondance sélectionnée ? Elle est utilisé par %d éléments !"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Supprimer les liens avec les éléments sélectionnés"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4069,15 +4124,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Supprimer le diaporama ?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Supprimer le modèle ?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Supprimer le déclencheur ?"
 
@@ -4085,62 +4140,62 @@ msgstr "Supprimer le déclencheur ?"
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Supprimée : Application \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Supprimée : Règle de découverte \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Supprimé : Graphique \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Supprimé : Hôte \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Supprimé : Prototype d'hôte \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Supprimé : Élément \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Supprimé : Prototype d'élément \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Supprimé : Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Supprimé : Modèle \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Supprimé : Déclencheur \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Supprimé : Prototype de déclencheur \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Supprimé : Scénario web \"%1$s\" sur \"%2$s\"."
@@ -4149,35 +4204,35 @@ msgstr "Supprimé : Scénario web \"%1$s\" sur \"%2$s\"."
 msgid "Delimiter"
 msgstr "Délimiteur"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (changement simple)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (vitesse par seconde)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Interdit"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Dépendances"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Dépendant"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Dépend de"
 
@@ -4185,30 +4240,41 @@ msgstr "Dépend de"
 msgid "Deployment status"
 msgstr "État du déploiement"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Description"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Détails"
 
@@ -4221,71 +4287,71 @@ msgid "Device"
 msgstr "Equipement"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Critère d'unicité de l'équipement"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "La différence entre les valeurs MAX et MIN de la période T est < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "La différence entre les valeurs MAX et MIN de la période T est = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "La différence entre les valeurs MAX et MIN de la période T est > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "La différence entre les valeurs MAX et MIN de la période T n'est PAS N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Différence entre la dernière valeur et la précédente, alors N = 1, 0 - autrement"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Différence entre la dernière valeur et la précédente, alors N n'est PAS 1, 0 - autrement"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "La différence entre la dernière valeur et la précédente est < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "La différence entre la dernière valeur et la précédente est = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "La différence entre la dernière valeur et la précédente est > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "La différence entre la dernière valeur et la précédente n'est PAS N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4309,48 +4375,44 @@ msgstr "Désactiver le mode debug des groupes sélectionnés ?"
 msgid "Disable host"
 msgstr "Désactiver hôte"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Désactiver l'hôte ?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Désactiver les hôtes dans les groupes d'hôtes sélectionnés ?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Désactiver les hôtes surveillés par les proxies sélectionnés ?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Désactiver les éléments sélectionnés"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Désactiver les scénarios WEB sélectionnés ?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Désactiver les actions sélectionnées ?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Désactiver les applications sélectionnées ?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Désactiver les règles de découverte sélectionnées ?"
 
@@ -4358,11 +4420,11 @@ msgstr "Désactiver les règles de découverte sélectionnées ?"
 msgid "Disable selected groups?"
 msgstr "Désactiver les groupes sélectionnés ?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr "Désactiver les prototypes d'hôtes sélectionnés ?"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Désactiver les hôtes sélectionnés ?"
 
@@ -4370,42 +4432,47 @@ msgstr "Désactiver les hôtes sélectionnés ?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Désactiver les éléments sélectionnés ?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Désactiver les types de média sélectionnés ?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Désactiver les déclencheurs sélectionnés ?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Désactivé"
 
@@ -4418,7 +4485,7 @@ msgstr "Désastre"
 msgid "Discovered"
 msgstr "Découvert"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Découvert par"
 
@@ -4426,17 +4493,17 @@ msgstr "Découvert par"
 msgid "Discovered device"
 msgstr "Equipement découvert"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Découverte"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Découverte par le proxy"
 
@@ -4444,17 +4511,17 @@ msgstr "Découverte par le proxy"
 msgid "Discovery check"
 msgstr "Test de découverte"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "Erreur de test de découverte"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Tests de découverte"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Liste des découvertes"
 
@@ -4463,67 +4530,70 @@ msgid "Discovery object"
 msgstr "Objet de découverte"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Règle de découverte"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "La règle de découverte \"%1$s\" existe déjà sur \"%2$s\""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "La règle de découverte \"%1$s:%2$s\" a une durée de vie incorrecte : \"%3$s\". (min: %4$d, max: %5$d, macro utilisateur autorisée)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "La règle de découverte \"%s\" existe déjà."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "La règle de découverte \"%1$s:%2$s\" a une durée de vie incorrecte : \"%3$s\". (min: %4$d, max: %5$d, macro utilisateur autorisée)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Règle de découverte créée"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Règle de découverte supprimée"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Règle de découverte modifiée"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Règles de découverte"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Règles de découverte supprimées"
 
@@ -4535,7 +4605,7 @@ msgstr "État de la découverte"
 msgid "Display OK triggers for"
 msgstr "Afficher les déclencheurs OK pendant"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Affichage de"
 
@@ -4544,32 +4614,32 @@ msgstr "Affichage de"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Affichage de %1$s sur %2$s trouvés"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Distribution de valeurs par éléments multiples"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Distribution de valeurs par périodes multiples"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Ne pas calculer"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Souhaitez-vous remplacer l'expression conditionnelle ?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Terminé"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Point"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Arrêté"
@@ -4579,30 +4649,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Arrêté"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Temps d'arrêt"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Glisser ici pour changer le type de l'interface en \"IPMI\"."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Glisser ici pour changer le type de l'interface en \"JMX\"."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Glisser ici pour changer le type de l'interface en \"SNMP\"."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Glisser ici pour changer le type de l'interface en \"agent\"."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Style de dessin"
 
@@ -4620,74 +4690,75 @@ msgstr "Première entrée du menu déroulant \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Mémorisation de la sélection \"%1$s\" du menu déroulant."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Dépendances dupliquées dans le déclencheur \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Nom de prototype de groupe \"%2$s\" dupliqué pour le prototype d'hôte \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Identifiant de groupe d'hôte \"%2$s\" dupliqué pour le prototype d'hôte \"%1$s\"."
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Hôte dupliqué. Un hôte avec le même nom d'hôte \"%s\" existe déjà."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Hôte dupliqué. Un hôte avec le même nom visible \"%s\" existe déjà."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Nom de carte dupliqué pour la carte \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr "Nom de script \"%1$s\" dupliqué."
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Nom de sévérité \"%s\" dupliqué."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Alias utilisateur \"%s\" dupliqué."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Durée"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Durée (sec)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Néerlandais (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Élément dynamique"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ERREUR"
 
@@ -4695,13 +4766,13 @@ msgstr "ERREUR"
 msgid "EVENTS"
 msgstr "ÉVÉNEMENTS"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Chaque URL doivent avoir un nom unique. Veuillez vous assurer qu'il n'existe qu'un URL du même nom"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4709,9 +4780,9 @@ msgstr "Chaque URL doivent avoir un nom unique. Veuillez vous assurer qu'il n'ex
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Édition"
 
@@ -4719,7 +4790,7 @@ msgstr "Édition"
 msgid "Edit map element"
 msgstr "Modifier l'élément de la carte"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Modifier le déclencheur"
 
@@ -4727,27 +4798,61 @@ msgstr "Modifier le déclencheur"
 msgid "Element"
 msgstr "Élément"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Nom de l'élément"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Courriel"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Vide"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Condition d'action vide."
 
@@ -4755,76 +4860,98 @@ msgstr "Condition d'action vide."
 msgid "Empty color."
 msgstr "Couleur vide."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr "Identifiant d'hôte vide pour le prototype d'hôte."
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "Hôte vide."
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Paramètre d'entrée vide."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "Paramètres d'entrée vides."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Entrée vide."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Macro vide."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr "Nom du prototype de groupe vide."
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr "Nom du prototype d'hôte \"%1$s\" vide."
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "Nom du script \"%1$s\" vide."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "Nom du script vide."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Nom vide."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Paramètres vide"
 
@@ -4833,11 +4960,11 @@ msgstr "Paramètres vide"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Réponse vide reçue du serveur Zabbix \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4845,11 +4972,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Période de temps vide."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Activer"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Activer confirmation"
 
@@ -4869,11 +5000,11 @@ msgstr "Activer les acquittements d'événements"
 msgid "Enable host"
 msgstr "Activer hôte"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Activer l'hôte ?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Activer les hôtes surveillés par les proxies sélectionnés ?"
 
@@ -4886,36 +5017,32 @@ msgstr "Activer les hôtes surveillés par les proxies sélectionnés ?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Activer les éléments sélectionnés"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Activer les scénarios WEB sélectionnés ?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Activer les actions sélectionnées ?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Activer les applications sélectionnées ?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Activer les règles de découverte sélectionnées ?"
 
@@ -4923,11 +5050,11 @@ msgstr "Activer les règles de découverte sélectionnées ?"
 msgid "Enable selected groups?"
 msgstr "Activer les groupes sélectionnés ?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr "Activer les prototypes d'hôtes sélectionnés ?"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Activer les hôtes sélectionnés ?"
 
@@ -4935,64 +5062,68 @@ msgstr "Activer les hôtes sélectionnés ?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Activer les éléments sélectionnés ?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Activer les types de média sélectionnés ?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Activer les déclencheurs sélectionnés ?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Activé"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Anglais (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Anglais (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Erreur"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erreur dans la requête de recherche dans la table \"%1$s\"."
@@ -5010,15 +5141,15 @@ msgstr "Événement"
 msgid "Event ID"
 msgstr "ID événement"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "L'ID événement de la dernière entrée de journal correspond à l'expression rationnelle T alors N = 1, 0 - autrement"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "L'ID événement de la dernière entrée de journal correspond à l'expression rationnelle T alors N n'est PAS 1, 0 - autrement"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Événement acquitté"
 
@@ -5027,7 +5158,7 @@ msgstr "Événement acquitté"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Acquittements d'événements \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Acquittement d'événements désactivé"
 
@@ -5035,7 +5166,7 @@ msgstr "Acquittement d'événements désactivé"
 msgid "Event details"
 msgstr "Détails de l'événement"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Génération d'événement"
 
@@ -5055,9 +5186,10 @@ msgstr "Détails de la source de l'événement"
 msgid "Event type"
 msgstr "Type d'événement"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Événements"
 
@@ -5065,36 +5197,41 @@ msgstr "Événements"
 msgid "Events and alerts"
 msgstr "Événements et alertes"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Tous les N jours"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Toutes les N semaines"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Exclure"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Exécuter"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Erreur d'exécution SQL [%1$s] dans [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Exécuter sur"
 
@@ -5102,13 +5239,13 @@ msgstr "Exécuter sur"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Script exécuté"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Confirmation d'exécution"
 
@@ -5120,7 +5257,7 @@ msgstr "Détailler les macros"
 msgid "Expand single problem"
 msgstr "Détailler problème unique"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "JSON-rpc version 2.0 attendu, \"%s\" a été fourni."
@@ -5130,12 +5267,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Expiré"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Explosé"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Export sélectionné"
 
@@ -5143,22 +5280,22 @@ msgstr "Export sélectionné"
 msgid "Export to CSV"
 msgstr "Exporter en CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Expression"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Erreur de syntaxe dans l'expression."
 
@@ -5166,11 +5303,12 @@ msgstr "Erreur de syntaxe dans l'expression."
 msgid "Expression Variable Elements"
 msgstr "Expression Variable Éléments"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "L'expression ne peut pas être vide"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Constructeur d'expression"
 
@@ -5191,17 +5329,17 @@ msgid "External check"
 msgstr "Vérification externe"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "FAUX"
 
@@ -5210,16 +5348,17 @@ msgstr "FAUX"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Échec"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Échoué"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5227,40 +5366,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Audit d'échec"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Graphiques favoris"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Cartes favorites"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Écrans favoris"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Favoris"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Fév"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Février"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Champ"
 
@@ -5304,19 +5443,19 @@ msgstr "Le champ \"%1$s\" n'est pas une chaîne."
 msgid "Field \"%1$s\" must be missing."
 msgstr "Le champ \"%1$s\" doit être manquant."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Le champ \"druleid\" est obligatoire."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Le champ \"nom\" est obligatoire."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Ce format de fichier n'est pas supporté."
 
@@ -5325,13 +5464,13 @@ msgstr "Ce format de fichier n'est pas supporté."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Fichier trop gros, la taille maximale de téléversement est de %1$s octets."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Le fichier fourni à la vue n'existe pas. Essayé de trouver \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5339,68 +5478,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Région remplie"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtre"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Filtrer par groupe d'hôte"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filtrer par nom"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Rechercher la chaîne V dans la dernière (plus récente) valeur. N = 1 - si trouvé, 0 - autrement"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Rechercher la chaîne V dans la dernière (plus récente) valeur. N n'est PAS 1 - si trouvé, 0 - autrement"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Terminé"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Finnois (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Premier"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Premier"
@@ -5409,8 +5551,8 @@ msgstr "Premier"
 msgid "Fit to map"
 msgstr "Ajuster à la carte"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fixe"
 
@@ -5420,76 +5562,80 @@ msgstr "Fixe"
 msgid "Flexible intervals"
 msgstr "Intervalles flexibles"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Pour guest, le mot de passe doit être vide"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Formule"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Quatrième"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Français (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Ven"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Vendredi"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "De"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Accès à l'interface"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Accès à l'interface mis à jour"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Messages dans l'interface"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Clone complet"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Fonction"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5499,50 +5645,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "Modem GSM"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Accès GUI désactivé."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Général"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Généré en %s secondes"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Allemand (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5550,65 +5696,65 @@ msgid "Get support"
 msgstr "Accès support"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "L'expression fournie n'est pas une macro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "L'expression globale n'existe pas."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Script global"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Scripts globaux"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Exécuter"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Aller à"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "Aller au tableau de bord"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5617,66 +5763,73 @@ msgid "Gradient line"
 msgstr "Ligne en gradiant"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Graphique"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Le graphique \"%1$s\" existe déjà sur \"%2$s\" (hérité d'un autre modèle)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Le graphique \"%1$s\" existe déjà sur \"%2$s\" (les éléments ne sont pas identiques)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Le graphique \"%1$s\" existe déjà sur \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Le graphique \"%1$s\" ne peut pas hériter. Pas d'élément obligatoire sur \"%2$s\" (valeur Ymax de l'élément)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Le graphique \"%1$s\" ne peut pas hériter. Pas d'élément obligatoire sur \"%2$s\" (valeur Ymin de l'élément)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Le graphique \"%1$s\" ne peut pas hériter. Pas d'élément obligatoire sur \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Le graphique \"%1$s\" n'existe pas dans le modèle \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Graphique \"%1$s\" sauté - règle utilisateur."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Le graphique \"%1$s\" avec des éléments de modèles ne peut pas contenir d'éléments d'autres hôtes."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Graphique ajouté"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Graphique supprimé"
 
@@ -5688,54 +5841,59 @@ msgstr "Élément graphique"
 msgid "Graph item"
 msgstr "Élément du graphique"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Nom du graphique"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "Prototype de graphique"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Le prototype de graphique \"%1$s\" avec des éléments de modèles ne peut pas contenir des éléments d'autres hôtes."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Prototype de graphique \"%s\" supprimé."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Prototypes de graphiques"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5747,49 +5905,51 @@ msgstr "Prototypes de graphiques de"
 msgid "Graph sum"
 msgstr "Somme du graphique"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Type de graphique"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Graphique mis à jour"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Un graphique nommé \"%1$s\" existe déjà parmi les graphiques ou prototypes de graphiques."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Un graphique avec le même nom mais un autre type existe déjà."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Graphiques"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Graphique copié"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Graphiques supprimés"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Grec (el_GR)"
 
@@ -5798,54 +5958,58 @@ msgstr "Grec (el_GR)"
 msgid "Grid"
 msgstr "Grille"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Groupe"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Le groupe \"%1$s\" ne peut pas être effacé, car il est utilisé par un prototype d'hôte."
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Le groupe \"%1$s\" n'existe pas."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Le groupe \"%1$s\" pour l'hôte \"%2$s\" n'existe pas."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Groupe ajouté"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Groupe supprimé"
+msgid_plural "Groups deleted"
+msgstr[0] "Groupe supprimé"
+msgstr[1] "Groupe supprimé"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5856,40 +6020,42 @@ msgstr "Groupe des hôtes découverts"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr "Groupe pour les hôtes découverts \"%1$s\"."
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Nom du groupe"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr "L'ID du prototype de groupe ne peut pas être vide."
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr "Le prototype de groupe ne peut pas être basé sur un groupe d'hôte \"%1$s\" découvert."
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr "Prototypes de groupes"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Groupe mis à jour"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Groupement par"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Groupes"
 
@@ -5897,22 +6063,13 @@ msgstr "Groupes"
 msgid "Groups in maintenance"
 msgstr "Groupes en maintenance"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5929,7 +6086,7 @@ msgstr "PROBLÈMES DE GROUPE D'HÔTES"
 msgid "HOST INVENTORY"
 msgstr "INVENTAIRE D'HÔTE"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "APERÇU DE L'INVENTAIRE D'HÔTES"
 
@@ -5947,7 +6104,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "Authentification HTTP"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
@@ -5968,12 +6126,17 @@ msgstr "Matériel"
 msgid "Hardware (Full details)"
 msgstr "Matériel (détails complet)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Hauteur"
@@ -5986,15 +6149,15 @@ msgstr "Aide"
 msgid "Hexadecimal"
 msgstr "Hexadécimal"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Caché"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Cacher"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Tout cacher"
 
@@ -6010,15 +6173,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Cacher les déclencheurs désactivés"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Cacher sélections"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "Cacher les groupes sélectionnés"
 
@@ -6027,23 +6190,23 @@ msgstr "Cacher les groupes sélectionnés"
 msgid "High"
 msgstr "Haut"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Historique"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Historique nettoyé"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Le nettoyage de l'historique prend du temps. Continuer ?"
 
@@ -6064,80 +6227,80 @@ msgstr "Historique des événements"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Alignement horizontal"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Hôte"
 msgstr[1] "Hôte"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "L'hôte \"%1$s\" existe déjà."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "L'hôte \"%1$s\" est surveillé par le proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "L'hôte \"%s\" a le paramètre \"useipmi\" validé mais n'a pas de paramètre \"ipmi_ip\"! Utilisation de l'adresse IP de l'hôte comme adresse de l'interface IPMI."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Hôte (ascendant)"
 
@@ -6149,66 +6312,68 @@ msgstr "IP hôte"
 msgid "Host access"
 msgstr "Accès hôte"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Hôte ajouté"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Un hôte ne peut pas avoir plus d'une interface par défaut du même type."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Nombre d'hôtes"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Hôte supprimé"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Groupe d'hôtes"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Le groupe d'hôtes \"%1$s\" existe déjà."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Le groupe d'hôtes \"%1$s\" ne peut pas être effacé, car il est utilisé dans un script global."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "Le groupe d'hôte \"%1$s\" ne peut pas être effacé, car certains hôtes en dépendent."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "Le groupe d'hôtes \"%1$s\" est interne et ne peut pas être effacé."
@@ -6225,14 +6390,15 @@ msgstr "Problèmes du groupe d'hôtes"
 msgid "Host group label type"
 msgstr "Type d'étiquette du groupe d'hôtes"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "Le nom du groupe d'hôtes ne peut pas être vide."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Groupes d'hôtes"
 
@@ -6242,8 +6408,8 @@ msgstr "Groupes d'hôtes"
 msgid "Host interface"
 msgstr "Interface hôte"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Inventaire d'hôtes"
 
@@ -6259,7 +6425,7 @@ msgstr "Problèmes de l'hôte"
 msgid "Host label type"
 msgstr "Type d'étiquette d'hôte"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Liste d'hôtes"
 
@@ -6268,18 +6434,18 @@ msgid "Host metadata"
 msgstr "Métadonnées de l'hôte"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Nom de l'hôte"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "Le nom d'hôte \"%1$s\" est trop long, il ne peut pas être plus long que %2$d caractères."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr "Le nom d'hôte pour le prototype d'hôte \"%1$s\" doit contenir des macros."
@@ -6288,72 +6454,72 @@ msgstr "Le nom d'hôte pour le prototype d'hôte \"%1$s\" doit contenir des macr
 msgid "Host networks"
 msgstr "Réseaux de l'hôte"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Le prototype d'hôte \"%1$s\" existe déjà sur \"%2$s\", hérité d'un autre modèle."
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "Le prototype d'hôte \"%1$s\" existe déjà sur \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr "Le prototype d'hôte \"%1$s\" doit avoir au moins un groupe d'hôtes."
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr "Prototype d'hôte ajouté"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr "Prototype d'hôte supprimé"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr "Prototype d'hôte mis à jour"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Un prototype d'hôte avec le nom d'hôte \"%1$s\" existe déjà dans la règle de découverte \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr "Un prototype d'hôte avec le nom d'hôte \"%1$s\" existe déjà."
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Un prototype d'hôte avec le nom visible \"%1$s\" existe déjà dans la règle de découverte \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr "Un prototype d'hôte avec le nom visible \"%1$s\" existe déjà."
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr "Prototypes d'hôtes"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr "Prototypes d'hôtes supprimés"
 
@@ -6365,7 +6531,7 @@ msgstr "Prototypes d'hôtes de "
 msgid "Host router"
 msgstr "Hôte - Routeur"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Écrans de l'hôte"
 
@@ -6377,51 +6543,52 @@ msgstr "État de l'hôte"
 msgid "Host subnet mask"
 msgstr "Hôte - Masque de sous-réseau"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Temps de l'hôte"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Échec de la mise à jour de l'hôte."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Hôte mis à jour"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Hôte ayant le même nom \"%s\" existe déjà."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Un hôte ayant le même nom visible \"%s\" existe déjà."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hôtes"
 
@@ -6429,11 +6596,11 @@ msgstr "Hôtes"
 msgid "Hosts & Groups"
 msgstr "Hôtes & Groupes"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hôtes (s/ns/m)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Hôtes / Modèles"
 
@@ -6445,37 +6612,38 @@ msgstr "Hôtes dans"
 msgid "Hosts in maintenance"
 msgstr "Hôtes en maintenance"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Informations hôtes"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Localisation des hôtes"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Hôtes mis à jour"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Horaire"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Heures"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Hongrois (hu_HU)"
 
@@ -6493,22 +6661,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6516,26 +6684,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "adresse IP"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "L'IP et le DNS ne peuvent être vide dans l'interface de l'hôte."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Plage d'adresses IP"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "La plage d'adresses IP ne peut pas être vide."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6543,22 +6711,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "agent IPMI"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "algorithme d'authentification IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Interfaces IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "mot de passe IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Niveau de privilège IPMI"
 
@@ -6568,7 +6736,7 @@ msgstr "Niveau de privilège IPMI"
 msgid "IPMI sensor"
 msgstr "Capteur IPMI"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "nom d'utilisateur IPMI"
 
@@ -6601,7 +6769,7 @@ msgstr "Dépendances du service"
 msgid "IT service parent"
 msgstr "Parent du service"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6617,25 +6785,25 @@ msgid "ITEMS"
 msgstr "ÉLÉMENTS"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Icône"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Icône (par défaut)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Icône (désactivée)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Icône (maintenance)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Icône (problème)"
 
@@ -6656,42 +6824,44 @@ msgstr "Type d'étiquette d'icône"
 msgid "Icon map"
 msgstr "Correspondance d'icône"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "La correspondance d'icône \"%1$s\" ne peut pas être supprimée. Utilisée dans la carte \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "La correspondance d'icône \"%1$s\" a une correspondance incorrecte avec l'identifiant d'icône \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "La correspondance d'icône \"%1$s\" a une correspondance incorrecte avec le lien d'inventaire \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "La correspondance d'icône \"%s\" existe déjà."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "La correspondance d'icône \"%s\" ne peut pas avoir une correspondance avec une expression vide."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "La correspondance d'icône \"%s\" ne peut pas avoir une correspondance avec une expression globale inexistante."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "La correspondance d'icône \"%s\" a une expression incorrecte."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "La correspondance d'icône \"%s\" doit avoir au moins une correspondance."
@@ -6704,7 +6874,8 @@ msgstr "Correspondance d'icône créée"
 msgid "Icon map deleted"
 msgstr "Correspondance d'icône supprimée"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "La correspondance d'icône ne peut pas être vide."
 
@@ -6712,29 +6883,29 @@ msgstr "La correspondance d'icône ne peut pas être vide."
 msgid "Icon map updated"
 msgstr "Correspondance d'icône mise à jour"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "La correspondance d'icône avec l'identifiant \"%s\" n'existe pas."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Correspondance d'icônes"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "La correspondance d'icône \"%1$s\" associée à \"%2$s\" existe déjà."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "La correspondance d'icône n'est pas active"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Icônes"
 
@@ -6742,21 +6913,23 @@ msgstr "Icônes"
 msgid "Identical expression already exists"
 msgstr "Une expression identique existe déjà"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Si vous pensez que ce message n'est pas correct, veuillez consulter votre administrateur pour obtenir les permissions nécessaires."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Image"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "L'image \"%1$s\" existe déjà."
@@ -6765,7 +6938,7 @@ msgstr "L'image \"%1$s\" existe déjà."
 msgid "Image added"
 msgstr "Image ajoutée"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Image supprimée"
 
@@ -6773,12 +6946,13 @@ msgstr "Image supprimée"
 msgid "Image label type"
 msgstr "Type d'étiquette d'image"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Erreur de chargement d'image [%1$s] dans [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "La taille de l'image doit être inférieure à 1 Mo."
 
@@ -6787,66 +6961,66 @@ msgid "Image updated"
 msgstr "Image modifiée"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Images"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Les images de toutes les cartes seront mises à jour !"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Immédiatement"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Importer"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Échec import"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Importer fichier"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Importé avec succès"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Impossible de filtrer par le champ d'inventaire \"%s\", qui n'existe pas."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Impossible de supprimer la dernière ligne ou colonne."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "Dans"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "Dans le groupe"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Dans les groupes"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6859,244 +7033,282 @@ msgstr "En maintenance"
 msgid "In progress"
 msgstr "En cours"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Inclure"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Valeur du champ \"doux\" pour la dépendance du service \"%1$s\" incorrecte."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Valeur de type d'étiquette %1$s incorrecte pour la carte \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Plage d'adresses IP \"%s\" incorrecte."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "OID SNMP incorrect."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Communauté SNMP incorrecte."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "SLA acceptable incorrect pour le service \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Test de découverte associé à la condition d'action incorrect."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Test de découverte associé à la condition d'action incorrect. Le test de découverte n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "Test de découverte associé à la condition d'action incorrect."
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Règle de découverte associée à la condition d'action incorrecte. La règle de découverte n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "État de découverte associé à la condition d'action incorrect."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "Type d'événement associé à la condition d'action incorrect."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Groupe d'hôtes associé à la condition d'action incorrect. Le groupe d'hôtes n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Hôte associé à la condition d'action incorrect. L'hôte n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "Condition d'action ip \"%1$s\" incorrecte."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "Opérateur de condition d'action incorrect."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "Port de condition d'action \"%1$s\" incorrect."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Proxy associé à la condition d'action incorrect. Le proxy n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Modèle associé à la condition d'action incorrect. Le modèle n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "Sévérité de déclencheur de condition d'action incorrecte."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "Valeur de déclencheur de condition d'action incorrecte."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Déclencheur associé à la condition d'action incorrect. Le déclencheur n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Type associé à la condition d'action incorrect."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Identifiant de condition d'action incorrect."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "Conditions d'action incorrectes pour l'action \"%1$s\"."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Type de commande d'opération d'action incorrect."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Type d'acquittement de condition d'opération d'action incorrect."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Type de condition associé à la condition d'action incorrect."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Valeurs de pas d'escalade associées à la condition d'action incorrectes."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Groupe d'hôtes associé à la condition d'action incorrect. Le groupe d'hôtes n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Hôte associé à la condition d'action incorrect. L'hôte n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Port \"%s\" associé à l'action incorrect."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Durée d'étape d'opération d'action incorrecte."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Type d'opération associée à l'action incorrect."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Groupe d'utilisateurs associé à l'action incorrect. Le groupe d'utilisateurs n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Utilisateur associé à l'action incorrect. L'utilisateur n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Identifiant d'opération d'action incorrect."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Algorithme incorrect pour le service \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Arguments incorrects passés à la fonction"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Arguments incorrects passés à la fonction."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Arguments incorrects passés à la méthode."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Protocole d'authentification incorrect pour la règle de découverte \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Protocole d'authentification incorrect pour l'élément \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Valeur de calcul de SLA incorrect pour le service \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "Caractères incorrects utilisés pour l'hôte \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Caractères incorrects utilisés pour le nom d'hôte \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "Caractères incorrects utilisés pour le nom de proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Délai incorrect."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "ID de règle de découverte incorrect pour le prototype d'hôte \"%1$s\"."
@@ -7106,11 +7318,11 @@ msgstr "ID de règle de découverte incorrect pour le prototype d'hôte \"%1$s\"
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "Objet d'événement \"%1$s\" (%2$s) incorrect pour la source d'événement \"%3$s\" (%4$s), seuls les objets suivants sont supportés : %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "Valeur eventobject incorrecte."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "Valeur eventsource incorrecte."
 
@@ -7119,11 +7331,11 @@ msgstr "Valeur eventsource incorrecte."
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Nom ou valeur incorrecte du champ \"%1$s\" dans l'instruction \"where\" pour la table \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "Champs incorrects pour sysmap."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Champs incorrects pour le déclencheur."
 
@@ -7131,74 +7343,100 @@ msgstr "Champs incorrects pour le déclencheur."
 msgid "Incorrect file upload."
 msgstr "Téléversement de fichier incorrect."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Intervalle flexible \"%1$s\" incorrect."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Intervalle flexible dans l'élément \"%1$s\" incorrect. L'intervalle flexiblet doit être une chaîne."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Fonction incorrecte utilisée"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "ID de prototype de groupe incorrect."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "Prototypes de groupes incorrects pour le prototype d'hôte \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "ID de groupe d'hôtes incorrect pour le prototype de groupe."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Groupe d'hôtes incorrect."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "Groupes d'hôtes incorrect pour le prototype d'hôte \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "ID de prototype d'hôte incorrect."
 
@@ -7206,182 +7444,201 @@ msgstr "ID de prototype d'hôte incorrect."
 msgid "Incorrect image index."
 msgstr "Index d'image incorrect."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Paramètre DNS de l'interface incorrect \"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Paramètre IP de l'interface incorrect \"%s\"."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Paramètre port de l'interface incorrect \"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Champ d'inventaire \"%s\" incorrect."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Élément incorrect pour la valeur de l'axe."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Clé d'élément \"%1$s\" incorrecte pour l'expression du déclencheur sur \"%2$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "Type de valeur d'élément \"%1$s\" incorrect fourni pour la fonction de déclencheur \"%2$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Clé incorrecte."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Liste d'éléments incorrecte."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Maintenance incorrecte - la date doit être entre 1970.01.01 et 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Date de maintenance incorrecte"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Jour de période de maintenance incorrect"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Jours de la semaine de période de maintenance incorrects"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Mois de période de maintenance incorrect"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Période de maintenance incorrecte"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Période de maintenance incorrecte (5 minutes minimum)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Semaine de période de maintenance incorrecte"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Hauteur de carte incorrecte pour la carte \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Largeur de carte incorrecte pour la carte \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "Chemin de menu incorrect pour le script \"%1$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "Valeur d'objet incorrecte."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "Paramètre incorrect pour l'action \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Paramètre incorrect pour les opérations."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Paramètre incorrect pour l'icône de la carte \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Paramètres incorrects pour la condition."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Paramètres incorrects pour la méthode de mise à jour de la correspondance d'icône \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Paramètres incorrects pour la maintenance."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Paramètres incorrects pour le groupe d'utilisateurs."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Parent incorrect pour le service \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Service parent incorrect."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Intervalle de ports incorrect."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "Protocole de sécurité incorrect pour la règle de découverte \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "Protocole de sécurité incorrect pour l'élément \"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Proxyid incorrect."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Type de ressource incorrect pour l'élément de l'écran."
 
@@ -7390,64 +7647,68 @@ msgstr "Type de ressource incorrect pour l'élément de l'écran."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Réponse incorrecte reçue du serveur Zabbix \"%1$s\"."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Écran fourni pour le diaporama incorrect."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Heure de fin de service incorrecte."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Heure de début de service incorrecte."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Type d'horaire du service incorrect."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Ordre sorder incorrect pour le service \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "Valeur source incorrecte."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr "État incorrect pour le prototype d'hôte \"%1$s\"."
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "État incorrect pour le service \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "État incorrect."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr "Thème incorrect pour l'utilisateur \"%1$s\"."
@@ -7468,52 +7729,57 @@ msgstr "Période de temps \"%1$s\" incorrecte, l'heure de départ doit être ava
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Période de temps incorrecte \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "ID de déclencheur incorrect pour le service \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Expression de déclencheur incorrecte"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Expression du déclencheur incorrecte."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Expression du déclencheur incorrecte. L'hôte \"%1$s\" n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Expression du déclencheur incorrecte. L'hôte \"%s\" n'existe pas ou vous n'y avez pas accès."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Expression du déclencheur incorrecte. Les éléments de l'expression du déclencheur ne peuvent pas appartenir à un modèle et un hôte simultanément."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Fonction de déclencheur \"%1$s\" fournie dans l'expression incorrecte."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Type d'asort_by_key incorrect."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Groupe d'utilisateurs incorrect."
 
@@ -7522,7 +7788,8 @@ msgstr "Groupe d'utilisateurs incorrect."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "Valeur \"%1$s\" incorrecte pour le champ \"%2$s\"."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Valeur \"%1$s\" incorrecte pour le champ \"%2$s\" : doit être entre %3$s et %4$s."
@@ -7542,7 +7809,7 @@ msgstr "Valeur incorrecte \"%1$s\" pour le champ d'entier \"%2$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Valeur incorrecte \"%1$s\" pour le champ d'entier non signé \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "Valeur incorrecte pour le champ \"%1$s\"."
@@ -7552,43 +7819,49 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "Valeur incorrecte pour le champ \"%1$s\" : ne peut pas être vide."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Valeur incorrecte pour setMessage() : \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Valeur incorrecte utilisée pour l'état de proxy \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Heures ouvrées incorrectes."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Élément pour la valeur y maximale pour le graphique \"%1$s\" incorrect."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Élément pour la valeur y minimale pour le graphique \"%1$s\" incorrect."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonésien (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Info"
 
@@ -7597,15 +7870,15 @@ msgstr "Info"
 msgid "Information"
 msgstr "Information"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Insertion"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Insérer une macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Installation"
 
@@ -7613,31 +7886,32 @@ msgstr "Installation"
 msgid "Installer name"
 msgstr "Nom de l'installeur"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interface"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "L'interface est liée à l'élément \"%1$s\" sur \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "L'interface est utilisée pr des éléments qui requièrent ce type d'interface."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "L'interface avec le DNS \"%1$s\" cannotne peut pas avoir d'adresse IP vide."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "L'interface avec l'IP \"%1$s\" ne peut pas avoir de nom DNS vide avec la proprioété \"Utiliser le DNS\" à \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "L'interface avec l'IP \"%1$s\" ne peut pas avoir de nom DNS vide."
@@ -7657,7 +7931,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Interne"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Erreur JSON-RPC interne."
 
@@ -7665,7 +7939,7 @@ msgstr "Erreur JSON-RPC interne."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Erreur interne."
 
@@ -7678,19 +7952,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Intervalle"
 
@@ -7700,112 +7974,114 @@ msgstr "Intervalle"
 msgid "Interval (in sec)"
 msgstr "Intervalle (en sec)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "JSON invalide. Une erreur s'est produite sur le serveur pendant l'analyse du texte JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Requête invalide."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Date invalide \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "Premier paramètre invalide."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "Quatrième paramètre invalide."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Identifiant d'hôte (hostid) invalide pour la macro \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Période de maintenance invalide"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Paramètres de la méthode invalides."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "Nombre de paramètres invalide."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Paramètres invalides."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr "Période invalide pour le champ \"%1$s\"."
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Code de réponse \"%1$s\" invalide."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Intervalle de code de réponse \"%1$s\" invalide."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "Second paramètre invalide."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "Troisième paramètre invalide."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Période de temps invalide"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Nom de vue fourni \"%s\" invalide. Caractères autorisés : \"a-z\" et \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7814,7 +8090,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Champ d'inventaire"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Mode d'inventaire"
 
@@ -7822,12 +8098,12 @@ msgstr "Mode d'inventaire"
 msgid "Is online?"
 msgstr "Est connecté ?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Problème"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Impossible de filtrer sur le mot de passe utilisateur."
 
@@ -7835,70 +8111,71 @@ msgstr "Impossible de filtrer sur le mot de passe utilisateur."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Il n'est pas possible de se déconnecter avec l'authentification HTTP."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Impossible de chercher par mot de passe utilisateur."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italien (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Élément"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "L'élément \"%1$s\" existe déjà sur \"%2$s\", hérité depuis un autre modèle."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "L'élément \"%1$s\" ne peut pas remplir le champ d'inventair numéro \"%2$d\" manquant. Les choix sont : de 0 (ne pas remplir) à %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "L'élément \"%1$s\" n'existe pas dans le modèle \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "L'élément \"%1$s\" n'existe pas."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Élément \"%1$s\" sur \"%2$s\" : l'application \"%3$s\" n'existe pas."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Élément \"%1$s\" sauté - règle utilisateur."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "L'élément \"%1$s:%2$s\" a un port invalide : \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Élément ajouté"
 
@@ -7906,17 +8183,17 @@ msgstr "Élément ajouté"
 msgid "Item count"
 msgstr "Nombre d'éléments"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Élément supprimé"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7930,56 +8207,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Prototype de l'élément"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Prototypes d'éléments"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7987,92 +8264,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Prototypes d'éléments de"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Élément mis à jour"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "L'élément utilise une interface d'un hôte non-parent."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "L'élément utilise un type d'interface incorrect."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "L'élément ne sera pas rafraichi. Veuillez saisir une période de mise à jour valide."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Un élément avec la clé \"%1$s\" existe déjà sur \"%2$s\" comme règle de découverte."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Un élément avec la clé \"%1$s\" existe déjà sur \"%2$s\" comme élément créé d'un prototype d'élément."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Un élément avec la clé \"%1$s\" existe déjà sur \"%2$s\" comme prototype d'élément."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Un élément avec la clé \"%1$s\" existe déjà sur \"%2$s\" comme élément."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Un élément avec la clé \"%1$s\" existe déjà sur \"%2$s\" comme élément inconnu."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Un élément avec la clé \"%1$s\" existe déjà sur \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Un élément avec la clé \"%1$s\" existe déjà."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Éléments"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Éléments (s/ns/nosup)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Élément copiés"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Éléments supprimés"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Liste d'éléments"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Éléments modifiés"
 
@@ -8084,72 +8361,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "agent JMX"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "Interfaces JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Génération de l'erreur JSON-rpc échouée. Erreur \"%s\" introuvable."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "La méthode JSON-rpc n'est pas définie."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "Les paramètres JSON-rpc ne sont pas un tableau."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "La version de JSON-rpc n'est pas spécifiée."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Identifiant Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Janvier"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japonais (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Juil"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Juillet"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Juin"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Juin"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8158,40 +8435,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Période de conservation des ressources perdues (en jours)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Clé"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "La clé \"%1$s\" ne correspond pas à <grpmax|grpmin|grpsum|grpavg>[\"Groupe(s) d'hôtes\", \"Clé\", \"<last|min|max|avg|sum|count>\", \"paramètre\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Phrase de passe de la clé"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Mot-clé"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Coréen (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "DERNIÈRES DONNÉES"
 
@@ -8222,37 +8499,37 @@ msgstr "Connexion LDAP réussie"
 msgid "LDAP login was not successful"
 msgstr "Connexion LDAP échouée"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOCALE"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "PERDU"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Étiquette"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Positionnement de l'étiquette"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Langue"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Dernier"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Dernière"
@@ -8264,19 +8541,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "%1$d dernier problème"
 msgstr[1] "%1$d derniers problèmes"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "La dernière (plus récente) valeur T est < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "La dernière (plus récente) valeur T est = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "La dernière (plus récente) valeur T est > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "La dernière (plus récente) valeur T n'est PAS N"
 
@@ -8296,28 +8573,28 @@ msgstr "365 derniers jours"
 msgid "Last 7 days"
 msgstr "7 derniers jours"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Dernier changement"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Derniers changements (décroissant)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Dernière vérification"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Graphique de la dernière heure"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Graphique du dernier mois"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Dernier"
 
@@ -8325,66 +8602,67 @@ msgstr "Dernier"
 msgid "Last seen (age)"
 msgstr "Dernière observation (âge)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Dernière valeur"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Graphique dernière semaine"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Dernières données"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Derniers événements"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Letton (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Gauche"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Légende"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "La longueur de la dernière (plus récente) valeur T, en caractères, est < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "La longueur de la dernière (plus récente) valeur T, en caractères, est = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "La longueur de la dernière (plus récente) valeur T, en caractères, est > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "La longueur de la dernière (plus récente) valeur T, en caractères, n'est PAS N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Ligne"
 
@@ -8392,39 +8670,29 @@ msgstr "Ligne"
 msgid "Link"
 msgstr "Lien"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Indicateurs de lien"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Le nom de lien devrait être unique pour la carte \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Le champ de lien selementid1 pointe vers l'identifiant d'élément de carte inexistant \"%1$s\" pour la carte \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Le champs de lien selementid2 pointe vers l'identifiant d'élément de carte inexistant \"%1$s\" pour la carte \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Le lien doit avoir les deux champs \"nom\" et \"url\" pour la carte \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Lier les modèles"
 
@@ -8436,50 +8704,50 @@ msgstr "Lier au modèle"
 msgid "Link to templates"
 msgstr "Lier aux modèles"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Lier avec les modèles"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Modèles liés"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Lié à"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Liens entre les éléments sélectionnés"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Liens pour l'élément sélectionné"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "La liste est vide"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "Lituanien (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Chargement..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Temps local"
 
@@ -8496,36 +8764,36 @@ msgid "Location longitude"
 msgstr "Longitude de l'emplacement"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Journal"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "La sévérité de log de la dernière entrée de journal est < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "La sévérité de log de la dernière entrée de journal est = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "La sévérité de log de la dernière entrée de journal est > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "La sévérité de log de la dernière entrée de journal n'est PAS N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "La source de la dernière entrée de journal correspond au paramètre T, alors N = 1, 0 - autrement"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "La source de la dernière entrée de journal correspond au paramètre T, alors N n'est PAS 1, 0 - autrement"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Format de l'horodatage du journal"
@@ -8534,12 +8802,12 @@ msgstr "Format de l'horodatage du journal"
 msgid "Log unmatched SNMP traps"
 msgstr "Enregistrer les traps SNMP non appariés"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Connecté en tant que"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8550,12 +8818,12 @@ msgstr "Connexion"
 msgid "Login as Guest"
 msgstr "Connexion en tant qu'Invité"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Connexion échouée \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8564,8 +8832,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Nom ou mot de passe incorrect."
 
@@ -8586,22 +8855,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "L"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8613,7 +8878,7 @@ msgstr "Adresse MAC A"
 msgid "MAC address B"
 msgstr "Adresse MAC B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "MAINTENANCE"
 
@@ -8638,49 +8903,49 @@ msgstr "TOP 100 DES DÉCLENCHEURS"
 msgid "Macro"
 msgstr "Macro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "La macro \"%1$s\" existe déjà sur \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "La macro \"%1$s\" existe déjà."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "La macro \"%1$s\" n'est pas unique."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "La valeur de la macro \"%1$s\" est trop longue, elle ne doit pas excéder 255 caractères."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Le nom de la macro \"%1$s\" est trop long, il ne doit pas excéder 64 caractères."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "La macro avec l'identifiant global (globalmacroid) \"%1$s\" n'existe pas."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "La macro avec l'identifiant (hostmacroid) \"%1$s\" n'existe pas."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Macros"
 
@@ -8688,31 +8953,36 @@ msgstr "Macros"
 msgid "Macros updated"
 msgstr "Macro modifiée"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Maintenance"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "La maintenance \"%1$s\" existe déjà."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "La valeur \"Active depuis\" de la maintenance ne peut pas être ultérieure à la valeur \"Active jusqu'à\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr "La valeur de la condition d'action de maintenance doit être vide."
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Maintenance ajoutée"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Maintenance supprimée"
 
@@ -8720,7 +8990,7 @@ msgstr "Maintenance supprimée"
 msgid "Maintenance period"
 msgstr "Période de maintenance"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Durée de la période de maintenance"
 
@@ -8736,25 +9006,25 @@ msgstr "État de maintenance"
 msgid "Maintenance type"
 msgstr "Type de maintenance"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Maintenance modifiée"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Maintenance avec collecte de données"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Maintenance sans collecte de données"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Un paramètre obligatoire est manquant."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Manuel"
 
@@ -8765,12 +9035,12 @@ msgstr "Déconnexion manuelle"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Carte"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Carte \"%1$s\" sautée - règle utilisateur."
@@ -8780,12 +9050,12 @@ msgstr "Carte \"%1$s\" sautée - règle utilisateur."
 msgid "Map \"%s\""
 msgstr "Carte \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Carte \"%s\" créée."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Carte \"%s\" mise à jour."
@@ -8802,12 +9072,12 @@ msgstr "Type d'étiquette de carte"
 msgid "Map save operation failed."
 msgstr "Échec de la sauvegarde de la carte."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr "Une carte nommée \"%s\" existe déjà."
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Correspond à"
 
@@ -8817,23 +9087,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "La vauleur de correspondance \"%1$s\" n'est pas unique."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Correspondances"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Cartes"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Mars"
 
@@ -8841,28 +9111,34 @@ msgstr "Mars"
 msgid "Mark elements on trigger status change"
 msgstr "Marquer les éléments lors de changement de l'état du déclencheur"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Marquer les autres"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Marquer les éléments sélectionnés"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr "Masque"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Modification collective"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Modifier les éléments collectivement"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Nombre maximal d'éléments affichés dans une cellule"
@@ -8876,32 +9152,11 @@ msgstr "Nombre maximal d'éléments affichés dans la cellule \"%1$s\"."
 msgid "Max count of events per trigger to show"
 msgstr "Nombre maximal d'événements par déclencheur à afficher"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "La longueur maximale du nom de DNS est de %1$d caractères, \"%2$s\" compte %3$d caractère."
-msgstr[1] "La longueur maximale du nom de DNS est de %1$d caractères, \"%2$s\" compte %3$d caractères."
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "La longueur maximale d'un alias est de %1$d caractères, \"%2$s\" compte %3$d caractère."
-msgstr[1] "La longueur maximale d'un alias est de %1$d caractères, \"%2$s\" compte %3$d caractères."
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "La longueur maximale d'un nom d'hôte est de %1$d caractères, \"%2$s\" compte %3$d caractère."
-msgstr[1] "La longueur maximale d'un nom d'hôte est de %1$d caractères, \"%2$s\" compte %3$d caractères."
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8909,107 +9164,101 @@ msgid "Maximum number of flexible intervals added"
 msgstr "Nombre maximal d'intervalles flexibles ajouté"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "La valeur maximale pour la période T < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "La valeur maximale pour la période T est égale à N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "La valeur maximale pour la période T > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "La valeur maximale pour la période T n'est PAS N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Mai"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Mai"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Média"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Type de média"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Le type de média \"%s\" existe déjà."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Type de média ajouté"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Type média supprimé"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Type média désactivé"
 msgstr[1] "Type média désactivé"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Type média activé"
 msgstr[1] "Type média activé"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Type de média mis à jour"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Types de média"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Types de média utilisés par l'action \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Méga"
 
@@ -9024,14 +9273,14 @@ msgid "Memory limit: %s"
 msgstr "Limite mémoire : %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9041,7 +9290,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Message"
 
@@ -9049,66 +9298,66 @@ msgstr "Message"
 msgid "Message actions"
 msgstr "Actions associées au message"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Limite du message texte"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Expiration du message"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Expiration du message (secondes)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Messages"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Messagerie"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Méthode pas trouvée."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Milieu"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimiser"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9117,80 +9366,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "La valeur minimale pour la période T < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "La valeur minimale pour la période T est égale à N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "La valeur minimale pour la période T > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "La valeur minimale pour la période T n'est PAS N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Minutes"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Champ \"itemid\" manquant pour l'élément."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Champ \"nom\" manquant pour le graphique."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Élément \"%1$s\" manquant pour l'hôte \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Éléments manquants pour le graphique \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9200,7 +9446,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Clé \"%1$s\" manquante pour l'hôte \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Paramètre manquant : usrgrpids."
 
@@ -9212,18 +9458,18 @@ msgstr "Mode"
 msgid "Model"
 msgstr "Modèle"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Lun"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Lundi"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Surveillé via le proxy"
 
@@ -9231,33 +9477,33 @@ msgstr "Surveillé via le proxy"
 msgid "Monitored host"
 msgstr "Hôte surveillé"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Surveillance"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Mois"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Mensuel"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9265,7 +9511,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Plus de 10 minutes"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Plus d'un graphique nommé \"%1$s\" dans l'hôte."
@@ -9274,19 +9520,19 @@ msgstr "Plus d'un graphique nommé \"%1$s\" dans l'hôte."
 msgid "Most busy triggers top 100"
 msgstr "Top 100 des déclencheurs"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Événements PROBLÈME multiples"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Génération d'événements PROBLEME multiples"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Sourdine"
 
@@ -9299,60 +9545,58 @@ msgstr "CARTES RÉSEAU"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "PAS DE DONNÉES"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "Authentification NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9363,26 +9607,32 @@ msgstr "Authentification NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Nom"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9401,12 +9651,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9414,7 +9664,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Carte ajoutée"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Carte réseau supprimée"
 
@@ -9426,7 +9676,7 @@ msgstr "Carte mise à jour"
 msgid "Network maps"
 msgstr "Cartes réseau"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Jamais"
 
@@ -9434,24 +9684,24 @@ msgstr "Jamais"
 msgid "Never executed"
 msgstr "Jamais exécuté"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Nouveau"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Nouvelle application"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Nouvelle condition"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Nouvel élément"
 
@@ -9462,16 +9712,16 @@ msgstr "Nouvel élément"
 msgid "New flexible interval"
 msgstr "Nouvel intervalle flexible"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Nouveau groupe"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Nouveau groupe d'hôtes"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Nouvel élément pour le graphique"
 
@@ -9479,83 +9729,99 @@ msgstr "Nouvel élément pour le graphique"
 msgid "New media"
 msgstr "Nouveau média"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Nouvelle expression rationnelle"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Nouvelle période de maintenance"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Suivant"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Suivante"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Non"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Aucun champ \"ymax_type\" pour le graphique \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Aucun champ \"ymin_type\" pour le graphique \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9563,25 +9829,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Aucune URL fournie pour l'élément d'écran."
 
@@ -9607,8 +9873,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Aucune action trouvée."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9618,7 +9884,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Aucune application avec l'ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9626,30 +9892,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "Aucun type d'authentification spécifiée pour la commande d'opération d'action \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "Aucun nom d'utilisateur d'authentification spécifié pour la commande d'opération d'action \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Aucun nom d'utilisateur d'authentification spécifié."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Aucune commande spécifiée pour l'opération d'action."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Aucun type de commande spécifié pour l'opération d'action."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Aucune confition définie."
 
@@ -9658,27 +9925,27 @@ msgstr "Aucune confition définie."
 msgid "No data collection"
 msgstr "Sans collecte de données"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "Si aucune donnée n'est reçue pendant la période T, alors N = 1, 0 - autrement"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "Si aucune donnée n'est reçue pendant la période T, alors N n'est PAS 1, 0 - autrement"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Aucune interface par défaut pour le type \"%1$s\" sur \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Aucune dépendance définie."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Pas de détails"
 
@@ -9686,39 +9953,39 @@ msgstr "Pas de détails"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Aucun identifiant de règle de découverte fourni."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Aucune erreur trouvée."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Aucun événement"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Pas d'événement à acquitter"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Aucune cible d'exécution spécifiée pour la commande d'opération d'action \"%s\"."
@@ -9733,7 +10000,7 @@ msgstr "Aucun fichier n'a été téléversé."
 msgid "No flexible intervals defined."
 msgstr "Pas d'intervalle flexible défini."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Aucun identifiant de graphique fourni pour l'élément d'écran."
 
@@ -9742,7 +10009,11 @@ msgstr "Aucun identifiant de graphique fourni pour l'élément d'écran."
 msgid "No graph item with graphid \"%s\"."
 msgstr "Aucun élément de graphique avec l'identifiant (graphid) \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9751,48 +10022,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Aucun groupe pour l'hôte \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Aucun groupe pour les hôtes."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Aucun identifiant d'hôte fourni."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Aucun hôte fourni pour la macro \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Aucun identifiant de groupe d'hôtes fourni pour l'élément d'écran."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9805,17 +10077,22 @@ msgstr "Aucun groupe d'hôtes avec l'identifiant (groupid) \"%s\"."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, fuzzy, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Pas de hôte avec hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Aucune icône pour l'élément de carte \"%s\"."
@@ -9834,33 +10111,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Aucune interface trouvée"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Aucune interface trouvée."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Aucune interface pour l'hôte \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Aucun identifiant d'élément fourni pour l'élément d'écran."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9879,7 +10163,7 @@ msgid "No items defined."
 msgstr "Aucun élément défini."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9895,7 +10179,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Aucun identifiant de carte fourni pour l'élément d'écran."
 
@@ -9904,15 +10188,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9924,133 +10208,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Aucune permission pour le graphique \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Aucune permission pour l'hôte \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Aucune permission pour l'élément \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Aucune permission pour le modèle \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Aucune permission pour le déclencheur \"%1$s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Aucune permission"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Aucune permission pour le groupe \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Aucune permission pour la carte \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Aucune permission pour l'écran \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Aucune permission pour l'accès au système."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Aucune permission pour l'objet appelé ou il n'existe pas !"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Aucun fichier de clé privée spécifié pour la commande d'opération d'action \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Aucun fichier de clé privée spécifié."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Aucun proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Aucun fichier de clé publique spécifié pour la commande d'opération d'action \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Aucun fichier de clé publique spécifié."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Aucun destinataire pour le message d'opération d'action."
 
@@ -10058,7 +10387,7 @@ msgstr "Aucun destinataire pour le message d'opération d'action."
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Aucun identifiant d'écran fourni pour l'élément d'écran."
 
@@ -10066,82 +10395,83 @@ msgstr "Aucun identifiant d'écran fourni pour l'élément d'écran."
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Aucun script spécifié pour la commande d'opération d'action."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Aucune cible sélectionnée"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Aucune cible sélectionnée."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Aucune heure ouvrée définie. Travail 24h/24 7j/7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Aucun déclencheur"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Aucun déclencheur avec l'identifiant (triggerid) \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Aucun déclencheur défini."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Aucun déclencheur trouvé."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10150,57 +10480,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Aucune valeur trouvée."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Aucun"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normal"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Vue normale"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Non acquitté"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Éléments hors modèle"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Tous les modèles ne sont pas liés à \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Configuration du mot de passe de l'utilisateur \"guest\" interdite."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Non disponible"
 
@@ -10209,7 +10540,7 @@ msgstr "Non disponible"
 msgid "Not classified"
 msgstr "Non classé"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Non connecté"
 
@@ -10222,8 +10553,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Non supporté"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Note"
@@ -10236,7 +10567,7 @@ msgstr "Notes"
 msgid "Nothing"
 msgstr "Rien"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Rien à faire."
 
@@ -10244,87 +10575,87 @@ msgstr "Rien à faire."
 msgid "Notification report"
 msgstr "Rapport de notification"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notifications"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Novembre"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Maintenant"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Le nombre de secondes depuis l'Epoch est < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Le nombre de secondes depuis l'Epoch est = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Le nombre de secondes depuis l'Epoch est > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Le nombre de secondes depuis l'Epoch n'est PAS N"
 
@@ -10332,88 +10663,88 @@ msgstr "Le nombre de secondes depuis l'Epoch n'est PAS N"
 msgid "Number of status changes"
 msgstr "Nombre de changements d'états"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Nombre d'étapes"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Le nombre de valeurs V remontées avec succès (qui respectent l'opérateur O) pour la période T est < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Le nombre de valeurs V remontées avec succès (qui respectent l'opérateur O) pour la période T est = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Le nombre de valeurs V remontées avec succès (qui respectent l'opérateur O) pour la période T est > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Le nombre de valeurs V remontées avec succès (qui respectent l'opérateur O) pour la période T n'est PAS N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Nombre d'utilisateurs"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numérique (flottant)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numérique (entier 64bit)"
 
@@ -10428,16 +10759,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10453,8 +10786,7 @@ msgstr "Hôte - Routeur OOB"
 msgid "OOB subnet mask"
 msgstr "Hôte - Masque de sous-réseau OOB"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "OU"
 
@@ -10474,11 +10806,12 @@ msgstr "OS (Court)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "AUTRES PARAMÈTRES DE CONFIGURATION"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "APERÇU"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Oct"
 
@@ -10486,25 +10819,25 @@ msgstr "Oct"
 msgid "Octal"
 msgstr "Octal"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Octobre"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Inactif"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Actif"
 
@@ -10512,111 +10845,114 @@ msgstr "Actif"
 msgid "On status change triggers blink for"
 msgstr "Au changement d'état, clignoter pendant"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Une fois"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Une fois uniquement"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Temps d'arrêt unique"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Seuls les super administrateurs peuvent créer des macros globales."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Seuls les super administrateurs peuvent créer des groupes d'hôtes."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Seuls les super administrateurs peuvent créer des correspondances d'icônes."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Seuls les super administrateurs peuvent créer des types de médias."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Seuls les super administrateurs peuvent effacer des macros globales."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Seuls les super administrateurs peuvent effacer des types de médias."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Seuls les super administrateurs peuvent effacer des groupes d'utilisateurs."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Seuls les super administrateurs peuvent éditer les types de médias."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Seuls les super administrateurs peuvent mettre à jour les macros globales."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Seuls les super administrateurs peuvent mettre à jour les correspondances d'icônes."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Seuls les administrateurs Zabbix peuvent ajouter des médias utilisateurs."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Seuls les administrateurs Zabbix peuvent changer les médias utilisateurs."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Seuls les administrateurs Zabbix peuvent supprimer des médias utilisateurs."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Seuls des caractères sont autorisés."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Seuls les éléments assignés à des hôtes activés sont comptés"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Une seule vérification peut être unique."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Un seul nom de groupe d'utilisateurs peut être changé en même temps."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Seules les 20 derniers %% des indicateurs sont affichés."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Seuls les déclencheurs assignés à des hôtes activés et dépendant d'éléments activés sont comptés"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "L'opération \"%s\" existe déjà."
@@ -10625,28 +10961,28 @@ msgstr "L'opération \"%s\" existe déjà."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "L'opération ne peut pas être effectuée en raison d'une requête non autorisée."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Condition d'opération"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Détails de l'opération"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "L'opération n'a pas de groupe à exploiter."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "L'opération n'a pas de modèle à exploiter."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Type d'opération"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Opérations"
@@ -10655,25 +10991,27 @@ msgstr "Opérations"
 msgid "Operator"
 msgstr "Opérateur"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10703,24 +11041,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Original"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Bleu original"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Autre"
 
@@ -10728,19 +11066,19 @@ msgstr "Autre"
 msgid "Other configuration parameters"
 msgstr "Autres paramètres de configuration"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Autres groupes"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Autres hôtes"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10750,21 +11088,21 @@ msgstr "Autres hôtes | Groupe"
 msgid "Other parameters"
 msgstr "Autres paramètres"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Autre | Groupe"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Autres"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10777,14 +11115,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Aperçu"
 
@@ -10792,7 +11127,7 @@ msgstr "Aperçu"
 msgid "Overview by proxy"
 msgstr "Aperçu via proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10801,147 +11136,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "TABLEAU DE BORD PERSONNEL"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "bcmath pour PHP"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "ctype pour PHP"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "support de bases de données par PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "gd pour PHP"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Support FreeType pour PHP gd"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Support JPEG pour PHP gd"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Support PNG pour PHP gd"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "gettext pour PHP"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "libxml pour PHP"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "mbstring pour PHP"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "Option PHP max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "Option PHP max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "Option PHP memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "Option PHP post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "Option PHP upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "Session PHP"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "Démarrage automatique de session PHP"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "Sockets pour PHP"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "Fuseau horaire PHP"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Version de PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "xmlreader pour PHP"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "xmlwriter pour PHP"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10950,32 +11293,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLÈME"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "La page a reçu des données incorrectes"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palette"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palette #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Paramètre"
 
@@ -10984,7 +11329,7 @@ msgstr "Paramètre"
 msgid "Parent discovery rules"
 msgstr "Règles de découverte parentes"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11004,34 +11349,34 @@ msgstr "Déclencheurs parents"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Erreur d'analyse SQL [%1$s] dans [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 #, fuzzy
 msgid "Parse error"
 msgstr "Erreur d'analyse"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Passif"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11041,20 +11386,21 @@ msgstr "Passif"
 msgid "Password"
 msgstr "Mot de passe"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Mot de passe (une autre fois)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Mot de passe requis pour le type de média."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Le mot de passe ne doit pas être vide"
 
@@ -11063,21 +11409,21 @@ msgstr "Le mot de passe ne doit pas être vide"
 msgid "Peak memory usage: %s"
 msgstr "Pic d'utilisation mémoire : %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Ligne de centile (gauche)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Ligne de centile (droite)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11085,12 +11431,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Période"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Périodicité"
@@ -11100,24 +11446,24 @@ msgstr "Périodicité"
 msgid "Periods"
 msgstr "Périodes"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Permissions"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Les permissions ne peuvent être assignées qu'aux groupes d'utilisateurs."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persan (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Péta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Camembert"
 
@@ -11129,55 +11475,56 @@ msgstr "Algorithme de placement"
 msgid "Plain text"
 msgstr "Texte brut"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Jouer"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Jouer un son"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Veuillez corriger tous les problèmes et appuyer sur le bouton \"Réessayer\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Veuillez entrer le texte de confirmation."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Veuillez sélectionner deux éléments"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polonais (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Remplit le champ d'inventaire d'hôte"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Le port ne peut pas être vide pour l'interface hôte."
 
@@ -11185,51 +11532,51 @@ msgstr "Le port ne peut pas être vide pour l'interface hôte."
 msgid "Port range"
 msgstr "Intervalle du port"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portugais (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Portugais (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Position"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "POST"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Aperçu"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Précédent"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Précédente"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "La valeur précédente est < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "La valeur précédente est = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "La valeur précédente est > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "La valeur précédente n'est PAS N"
 
@@ -11278,30 +11625,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Fichier de clé privée"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Niveau de privilège"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Le module php-ldap est probablement manquant."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problème"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Affichage des problèmes"
 
@@ -11313,16 +11661,16 @@ msgstr "Problème sur"
 msgid "Problem time"
 msgstr "Heure du problème"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Problème si tous les enfants ont un problème"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problème si au moins un enfant a un problème"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problèmes"
 
@@ -11330,75 +11678,71 @@ msgstr "Problèmes"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototypes"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxies"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Le proxy \"%1$s\" pour l'hôte \"%2$s\" n'existe pas."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Le proxy \"%1$s\" est utilisé par la règle de découverte \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Le proxy \"%s\" existe déjà."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy ajouté"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy supprimé"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Hôtes proxy"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "La création de l'interface du proxy a échoué."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "La mise à jour de l'interface du proxy a échoué."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Mode proxy"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Nom du proxy"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy modifié"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Clé publique"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11409,7 +11753,7 @@ msgstr "Fichier de clé publique"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "FILE D'ATTENTE DES ÉLÉMENTS À METTRE À JOUR"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "File d'attente"
 
@@ -11417,18 +11761,18 @@ msgstr "File d'attente"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Lecture"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Lecture seule"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Lecture-écriture"
 
@@ -11440,7 +11784,7 @@ msgstr "Raison"
 msgid "Received value"
 msgstr "Valeur reçue"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11448,11 +11792,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Destinateur (croissant)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Destinataire (décroissant)"
 
@@ -11463,28 +11807,28 @@ msgstr "Destinataire (décroissant)"
 msgid "Recipient(s)"
 msgstr "Destinataire(s)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Récupération"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Message de récupération"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Sujet de récupération"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Rafraîchissement (en secondes)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Multiplicateur de la période de rafraîchissement"
 
@@ -11502,48 +11846,52 @@ msgstr "Rafraîchissement des éléments non supportés (en sec) \"%1$s\"."
 msgid "Regular expression"
 msgstr "Expression rationnelle"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "L'expression rationnelle \"%s\" existe déjà."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "Si la dernière valeur dans la période T correspond à l'expression rationnelle V, alors N = 1, 0 - autrement"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "Si la dernière valeur dans la période T correspond à l'expression rationnelle V, alors N = 1, 0 - autrement (insensible à la casse)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "Si la dernière valeur dans la période T correspond à l'expression rationnelle V, alors N n'est PAS 1, 0 - autrement"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "Si la dernière valeur dans la période T correspond à l'expression rationnelle V, alors N n'est PAS 1, 0 - autrement (insensible à la casse)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Expression rationnelle ajoutée"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 #, fuzzy
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Expression régulière supprimée"
 msgstr[1] "Expression régulière supprimée"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "L'expression rationnelle n'existe pas."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Expression rationnelle modifiée"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11560,26 +11908,28 @@ msgstr "Commande à distance"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11590,21 +11940,19 @@ msgstr "Commande à distance"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Supprimer"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11612,11 +11960,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Supprimer l'élément"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Retirer de"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Retirer des favoris"
@@ -11625,7 +11973,7 @@ msgstr "Retirer des favoris"
 msgid "Remove from host group"
 msgstr "Retirer du groupe d'hôtes"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Retirer du groupe d'hôte"
 
@@ -11637,28 +11985,28 @@ msgstr "Supprimer l'hôte"
 msgid "Remove link"
 msgstr "Supprimer le lien"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Supprimer la sélection"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Remplacer"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Remplacer les dépendances"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Remplacer les groupes d'hôtes"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Rapport"
 
@@ -11666,35 +12014,36 @@ msgstr "Rapport"
 msgid "Report 1"
 msgstr "Rapport 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Rapport 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Rapport 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Rapports"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Requis"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Le champ requis \"expression\" manque dans la correspondance d'icône."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Le champ requis \"iconid\" manque dans la correspondance d'icône."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Le champ requis \"inventory_link\" manque dans la correspondance d'icône."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Permissions d'hôte requses"
 
@@ -11702,29 +12051,31 @@ msgstr "Permissions d'hôte requses"
 msgid "Required performance (vps)"
 msgstr "Performance requise (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Performance serveur requise, nouvelles valeurs par seconde"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Code d'état requis"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Chaîne requise"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -11743,9 +12094,9 @@ msgstr "Réinitialiser tous les noms et couleurs à leur valeur par défaut ?"
 msgid "Reset confirmation"
 msgstr "Confirmation de la réinitialisation"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11758,7 +12109,7 @@ msgstr "Résolu"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Ressource"
@@ -11773,15 +12124,15 @@ msgstr "Temps de réponse"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Résultat"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Le résultat est FAUX"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Le résultat est VRAI"
 
@@ -11794,7 +12145,8 @@ msgstr "Résultat de \"%s\""
 msgid "Result type"
 msgstr "Type de résultat"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11802,60 +12154,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Essais restants"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Réessayer"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Droit"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Étendue de la ligne"
 
@@ -11863,11 +12224,11 @@ msgstr "Étendue de la ligne"
 msgid "Rows"
 msgstr "Lignes"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Lignes par page"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Règles"
 
@@ -11912,20 +12273,20 @@ msgid "Run remote commands on hosts"
 msgstr "Exécuter des commandes distantes sur l'hôte"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russe (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -11941,7 +12302,7 @@ msgstr "ÉCRANS"
 msgid "SEARCH"
 msgstr "RECHERCHE"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVEUR"
 
@@ -11956,13 +12317,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "DIAPORAMAS"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11971,17 +12332,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "adresse SMTP"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP HELO"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "serveur SMTP"
@@ -11997,7 +12358,7 @@ msgstr "Clé SNMP"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "OID SNMP"
 
@@ -12009,9 +12370,9 @@ msgstr "OID SNMP"
 msgid "SNMP community"
 msgstr "communauté SNMP"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "Interfaces SNMP"
@@ -12020,7 +12381,7 @@ msgstr "Interfaces SNMP"
 msgid "SNMP trap"
 msgstr "Trap SNMP"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "La clé du trap SNMP est invalide."
 
@@ -12044,7 +12405,7 @@ msgstr "agent SNMPv3"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Comptes SQL : %s (sélections : %s | exécutions : %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12062,7 +12423,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "L'exécution de l'instruction SQL a échoué\"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12071,15 +12432,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "Agent SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "ÉTAT DE LA DÉCOUVERTE"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "ÉTATS DES DÉCLENCHEURS"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "ÉTAT DE LA SUPERVISION WEB"
 
@@ -12087,92 +12468,92 @@ msgstr "ÉTAT DE LA SUPERVISION WEB"
 msgid "STATUS OF ZABBIX"
 msgstr "ÉTAT DE ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Sam"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Samedi"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Sauver"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Sauver et retour"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Échelle"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Scénario"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Scénario ajouté"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Scénario modifié"
 
@@ -12184,7 +12565,7 @@ msgstr "Scénarios"
 msgid "Schedule"
 msgstr "Planification"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12195,126 +12576,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Écran"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Écran \"%1$s\" ajouté."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "L'écran \"%1$s\" existe déjà dans le modèle \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "L'écran \"%1$s\" existe déjà."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Écran \"%1$s\" sauté - règle utilisateur."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Écran \"%1$s\" mis à jour."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Écran ajouté"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Configuration cellule écran"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Écran supprimé"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Un écran doit contenir au moins une ligne et une colonne."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Écran mis à jour"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Écrans"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Script"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Script ajouté"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Script supprimé"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Nom du script"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12323,17 +12703,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "Profileur de script"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Script modifié"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -12354,7 +12734,7 @@ msgstr "Expression de recherche vide"
 msgid "Search/Filter elements limit"
 msgstr "Limite d'éléments recherchés/filtrés"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Second"
 
@@ -12386,7 +12766,7 @@ msgstr "Contact Secondaire - Téléphone 2"
 msgid "Secondary POC screen name"
 msgstr "Contact Secondaire - Identifiant"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Secondes"
 
@@ -12405,69 +12785,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Sélectionner"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Sélectionner le prototype"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Sélection les lignes avec une valeur comme"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Sélectionné"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Actions sélectionnées supprimées"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Éléments sélectonnés"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Groupes sélectionnés"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Hôtes sélectionnés"
 
@@ -12483,7 +12870,7 @@ msgstr "Envoyer le message aux groupes d'utilisateurs"
 msgid "Send message to users"
 msgstr "Envoyer le message aux utilisateurs"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Envoyer uniquement à"
 
@@ -12491,11 +12878,11 @@ msgstr "Envoyer uniquement à"
 msgid "Send to"
 msgstr "Envoyer"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Envoyer aux groupes d'utilisateurs"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Envoyer aux utilisateurs"
 
@@ -12504,17 +12891,17 @@ msgstr "Envoyer aux utilisateurs"
 msgid "Sent"
 msgstr "Envoyé"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Sep"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Séparé"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Septembre"
 
@@ -12526,7 +12913,7 @@ msgstr "Numéro de série A"
 msgid "Serial number B"
 msgstr "Numéro de série B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Serveur"
@@ -12535,44 +12922,44 @@ msgstr "Serveur"
 msgid "Server info"
 msgstr "Informations serveur"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Temps serveur"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Service"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Le service \"%1$s\" ne peut pas être effacé car un autre service en dépend."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Le service \"%1$s\" ne peut pas dépendre de lui-même."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Le service \"%1$s\" ne peut pas être lié à un déclencheur et avoir des enfants en même temps."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Le service \"%1$s\" est déjà lié à un autre service."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Le service ne peut pas être parent et enfant en même temps."
 
@@ -12588,11 +12975,11 @@ msgstr "Service supprimé"
 msgid "Service port"
 msgstr "Port du service"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "L'heure de démarrage du service doit être antérieure à l'heure de fin."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Périodes de maintenance"
 
@@ -12604,49 +12991,53 @@ msgstr "Type de service"
 msgid "Service updated"
 msgstr "Service mis à jour"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Services"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Les services forment une dépendance circulaire."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Session terminée, veuillez vous reconnecter."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Sévérité"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Sévérité (descendante)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Le nom de la sévérité ne peut pas ête vide."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Afficher"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Afficher tout"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Afficher les détails"
 
@@ -12676,35 +13067,36 @@ msgstr "Afficher les événements plus récents que (en jours)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Afficher les événements plus récents que (en jours) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Afficher les hôtes en maintenance"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Afficher les éléments nommés comme"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Afficher les éléments sans donnée"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Afficher la légende"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Afficher les lignes"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Afficher sélections"
 
@@ -12712,19 +13104,22 @@ msgstr "Afficher sélections"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Afficher le texte en HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Afficher les déclencheurs"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Afficher non acquittés"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Afficher valeur"
@@ -12733,11 +13128,11 @@ msgstr "Afficher valeur"
 msgid "Show warning if Zabbix server is down"
 msgstr "Afficher une alerte si le serveur Zabbix est arrêté"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Afficher les heures ouvrées"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Affiché"
 
@@ -12757,6 +13152,10 @@ msgstr "Vérification simple"
 msgid "Simple graph"
 msgstr "Graphique simple"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Site - Code postal"
@@ -12794,7 +13193,7 @@ msgid "Site state / province"
 msgstr "Site - État / province"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12812,16 +13211,16 @@ msgstr "Copie du graphique \"%1$s\" sur l'hôte \"%2$s\" sautée."
 msgid "Slide"
 msgstr "Diapositive"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Diaporama"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Le diaporama \"%s\" existe déjà."
@@ -12830,11 +13229,11 @@ msgstr "Le diaporama \"%s\" existe déjà."
 msgid "Slide show added"
 msgstr "Diaporama ajouté"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Diaporama supprimé"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Le diaporama doit contenir des diapositives."
 
@@ -12842,10 +13241,10 @@ msgstr "Le diaporama doit contenir des diapositives."
 msgid "Slide show updated"
 msgstr "Diaporama mis à jour"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Diaporamas"
 
@@ -12853,15 +13252,15 @@ msgstr "Diaporamas"
 msgid "Slides"
 msgstr "Diapositives"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Slovaque (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Reporter"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Souple"
 
@@ -12894,28 +13293,28 @@ msgid "Software application E"
 msgstr "Application logicielle E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Trié par"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Ordre de tri (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Trier les déclencheurs par"
 
@@ -12928,11 +13327,11 @@ msgstr "Tri par le champ \"%1$s\" non autorisé."
 msgid "Source"
 msgstr "Source"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Espagnol (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Le script spécifié n'existe pas ou vous n'avez pas les droits dessis pour une commande d'opération d'action."
 
@@ -12940,63 +13339,63 @@ msgstr "Le script spécifié n'existe pas ou vous n'avez pas les droits dessis p
 msgid "Speed"
 msgstr "Vitesse"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Empilé"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Éléments standards"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Démarrer dans"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "État"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "État"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "État (croissant)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "État (décroissant)"
 
@@ -13009,7 +13408,7 @@ msgstr "Calcul de l'état"
 msgid "Status calculation algorithm"
 msgstr "Algorithme de calcul de l'état"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Codes d'état"
 
@@ -13018,7 +13417,7 @@ msgid "Status of Web monitoring"
 msgstr "État de la supervision Web"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "État de Zabbix"
 
@@ -13035,40 +13434,40 @@ msgid "Status only"
 msgstr "État seulement"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Étape"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Étape \"%1$s\" [%2$s sur %3$s] échouée : %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Durée de l'étape"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Étape du scénario"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Étapes"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Stop"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Stocker valeur"
@@ -13077,11 +13476,11 @@ msgstr "Stocker valeur"
 msgid "Straight"
 msgstr "Littéral"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Style"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Sous-filtre [affecte uniquement les données filtrées !]"
 
@@ -13089,11 +13488,11 @@ msgstr "Sous-filtre [affecte uniquement les données filtrées !]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Sujet"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Sous-carte"
 
@@ -13102,32 +13501,32 @@ msgid "Success Audit"
 msgstr "Succès Audit"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "La somme des valeurs pour une période T est < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "La somme des valeurs pour une période T est = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "La somme des valeurs pour une période T est > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "La somme des valeurs pour une période T n'est PAS N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Dim"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -13135,27 +13534,27 @@ msgstr "Dimanche"
 msgid "Support"
 msgstr "Support"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Prénom"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Suédois (sv_SE)"
 
@@ -13163,16 +13562,16 @@ msgstr "Suédois (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "Changer de méthode d'authentification va réinitialiser toutes les sessions sauf celle-ci ! Continuer ?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Valeur système par défaut"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Erreur système."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13181,21 +13580,21 @@ msgid "System status"
 msgstr "État du système"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "J"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "M"
@@ -13214,11 +13613,11 @@ msgid "TOTAL"
 msgstr "TOTAL"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "COMMENTAIRES SUR DÉCLENCHEUR"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "VRAI"
 
@@ -13236,14 +13635,14 @@ msgstr "La table \"%1$s\" n'a pas de champ nommé \"%2$s\"."
 msgid "Tag"
 msgstr "Étiquette"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Cible"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Liste des cibles"
 
@@ -13252,130 +13651,133 @@ msgid "Target type"
 msgstr "Type de cible"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Modèle"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Le modèle \"%1$s\" existe déjà."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Le modèle \"%1$s\" pour l'hôte \"%2$s\" n'existe pas."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Modèle ajouté"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Un modèle ne peut pas être lié à un autre modèle plus d'une fois, même à travers d'autres modèles."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Modèle supprimé"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Groupe de modèles"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Lien entre modèles"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Liste de modèles"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Écrans du modèle"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Déclencheurs du modèle"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Modèle mis à jour"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Un modèle avec le même nom \"%s\" existe déjà."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Un modèle avec le même nom visible \"%s\" existe déjà."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Éléments en modèle"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Modèles"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Les modèles \"%1$s\" sont déliés de l'hôte \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Téra"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Test"
 
@@ -13383,11 +13785,11 @@ msgstr "Test"
 msgid "Test authentication"
 msgstr "Tester l'authentification"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Confirmation du test"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Données de test"
 
@@ -13401,22 +13803,22 @@ msgid "Test string"
 msgstr "Chaîne de test"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Texte"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13424,7 +13826,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13439,26 +13841,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "L'élément n'est plus découvert et sera effacé dans %1$s (le %2$s à %3$s)."
@@ -13467,19 +13869,19 @@ msgstr "L'élément n'est plus découvert et sera effacé dans %1$s (le %2$s à
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Le JSON reçu n'est pas une requête JSON-RPC valide."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "La remote-procedure demandée n'existe pas / n'est pas disponible"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Thème"
 
@@ -13490,11 +13892,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "Il y a \"%1$d\" groupe avec l'accès GUI interne."
 msgstr[1] "Il y a \"%1$d\" groupes avec l'accès GUI interne."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Troisième"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Ce champ est automatiquement rempli par l'élément \"%s\"."
@@ -13503,11 +13905,11 @@ msgstr "Ce champ est automatiquement rempli par l'élément \"%s\"."
 msgid "This month"
 msgstr "Ce mois-ci"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Cette colonne de l'écran n'est pas vide. L'effacer ?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Cette ligne de l'écran n'est pas vide. L'effacer ?"
 
@@ -13519,27 +13921,27 @@ msgstr "Cette semaine"
 msgid "This year"
 msgstr "Cette année"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Jeu"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "À"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13548,28 +13950,28 @@ msgstr "À"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Heure"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Heure (croissant)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Heure (décroissant)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13577,54 +13979,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Période de temps"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Décalage temporel"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Type temps"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Expiration"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Horodateur"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "Si l'heure n'est pas différente de celle du serveur Zabbix de plus de T secondes, alors N = 1, 0 - autrement"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "Si l'heure n'est pas différente de celle du serveur Zabbix de plus de T secondes, alors N n'est PAS 1, 0 - autrement"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Titre"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "À"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Pour configurer une interface d'hôte, sélectionner un type d'élément pour tous les éléments"
 
@@ -13632,17 +14034,18 @@ msgstr "Pour configurer une interface d'hôte, sélectionner un type d'élément
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Haut"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Total"
 
@@ -13660,7 +14063,7 @@ msgstr "Temps total : %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "La transaction n'a pas été fermée. Abandon..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Erreur de transport."
 
@@ -13677,91 +14080,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Tendances"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Déclencheur"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Le déclencheur \"%1$s\" existe déjà sur \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Le déclencheur \"%1$s\" dépend du déclencheur \"%2$s\", qui n'existe pas."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Déclencheur \"%1$s\" sauté - règle utilisateur."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Le déclencheur \"%s\" appartient à des modèles avec des liens différents."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Déclencheur ajouté"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Commentaires du déclencheur"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Déclencheur supprimé"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Options d'affichage des déclencheurs"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13776,11 +14179,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Condition de l'expression du déclencheur"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "L'expression du déclencheur doit contenir au moins une référence hôte:clé."
 
@@ -13788,7 +14192,7 @@ msgstr "L'expression du déclencheur doit contenir au moins une référence hôt
 msgid "Trigger form"
 msgstr "Formulaire de déclencheur"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "Le déclencheur a des éléments du modèle \"%1$s\" qui n'est pas lié à l'hôte."
@@ -13801,12 +14205,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "Le déclencheur du modèle \"%1$s\" a une dépendance au déclencheur du modèle \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Déclencheur récemment ajouté. Pas de mise à jour d'état pour le moment."
 
@@ -13818,52 +14222,52 @@ msgstr "Type d'étiquette de déclencheur"
 msgid "Trigger name"
 msgstr "Nom du déclencheur"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Prototype du déclencheur"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Prototypes de déclencheurs"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13871,23 +14275,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Prototypes de déclencheurs de"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Sévérités des déclencheurs"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Sévérité du déclencheur"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Déclencheur mis à jour"
 
@@ -13895,40 +14307,41 @@ msgstr "Déclencheur mis à jour"
 msgid "Trigger value"
 msgstr "Valeur du déclencheur"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Déclencheurs"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Déclencheurs supprimés"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Informations des déclencheurs"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Modification collective des déclencheurs"
 
@@ -13936,78 +14349,78 @@ msgstr "Modification collective des déclencheurs"
 msgid "Triggers overview"
 msgstr "Aperçu des déclencheurs"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "État des déclencheurs"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Top 100 des déclencheurs"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Déclencheurs avec la sévérité"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Tronqué"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Essai de lecture de la propriété \"%s\" inaccessible."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Mar"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Turc (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Deux éléments doivent être sélectionnés"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Deux éléments (\"%1$s\" et \"%2$s\") ne peuvent pas remplir un champ d'inventaire d'hôte \"%3$s\", cela mènerait à un conflit."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Type"
 
@@ -14015,62 +14428,64 @@ msgstr "Type"
 msgid "Type (Full details)"
 msgstr "Type (détails complet)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Type (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Type (croissant)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Type (décroissant)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Type de calcul"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Type d'information"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "Le type d'information doit être \"Journal\" pour une clé journal."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "Le type d'information doit être \"Numérique (flottant)\" pour les éléments agrégés."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Types"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "INCONNU"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "ACTIF"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (après connexion)"
 
@@ -14086,20 +14501,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 caractères)"
 
@@ -14107,15 +14532,11 @@ msgstr "USA (160 caractères)"
 msgid "USER PROFILE"
 msgstr "PROFIL UTILISATEUR"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukrainien (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Impossible de sélectionner la configuration."
 
@@ -14123,7 +14544,7 @@ msgstr "Impossible de sélectionner la configuration."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "Impossible de téléverser un fichier car \"file_uploads\" est désactivé."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Non acquitté"
 
@@ -14136,20 +14557,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Événements PROBLÈME non acquittés"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Non acquittés uniquement"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Débloquer la sélection"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Débloquer les utilisateurs sélectionnés ?"
 
@@ -14158,29 +14579,29 @@ msgstr "Débloquer les utilisateurs sélectionnés ?"
 msgid "Units"
 msgstr "Unités"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14190,23 +14611,20 @@ msgstr "Inconnu"
 msgid "Unknown action"
 msgstr "Action inconnue"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Algorithme de calcul de l'état des services inconnu"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Fonction inconnue."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Élément inconnu, cet élément n'existe pas dans l'hôte sélectionné"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Hôte inconnu, cet hôte n'est pas défini"
 
@@ -14218,23 +14636,23 @@ msgstr "Type d'interface inconnu."
 msgid "Unknown resource"
 msgstr "Ressource inconnue"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Type de valeur inconnu"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Supprimer lien"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Supprimer lien et nettoyer"
 
@@ -14242,61 +14660,61 @@ msgstr "Supprimer lien et nettoyer"
 msgid "Unlink from template"
 msgstr "Supprimer lien au modèle"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Supprimer lien aux modèles"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Déliée : Application \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Déliée : Règle de découverte \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Délié : Graphique \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Délié : Prototype de graphique \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Délié : Élément \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Délié : Prototype d'élément \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Délié : Déclencheur \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Délié : Prototype de déclencheur \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Enlever la sourdine"
 
@@ -14310,32 +14728,43 @@ msgstr "Extension de fichier \"%1$s\" non supportée."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Format d'import \"%1$s\" non supporté."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Fonctionne"
@@ -14346,34 +14775,34 @@ msgid "Up"
 msgstr "Fonctionne"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Actualiser"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Actualiser l'existant"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Intervalle d'actualisation"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Intervalle d'actualisation (en sec)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Mis à jour"
 
@@ -14381,55 +14810,55 @@ msgstr "Mis à jour"
 msgid "Updated status of host"
 msgstr "État de l'hôte mis à jour"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Mis à jour : %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Mise à jour : Application \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Mise à jour : Règle de découverte \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Mis à jour : Élément \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Mis à jour : Prototype d'élément \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Mis à jour : Déclencheur \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Mis à jour : Prototype de déclencheur \"%1$s\" sur \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Téléverser"
 
@@ -14437,14 +14866,14 @@ msgstr "Téléverser"
 msgid "Upper level maps"
 msgstr "Cartes de niveau supérieur"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Temps de fonctionnement"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14452,10 +14881,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Fonctionnement/Arrêt"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "URL"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14471,84 +14900,88 @@ msgid "Used in actions"
 msgstr "Utilisé dans les actions"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Utilisateur"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "L'utilisateur \"%s\" ne peut pas être dans aucun groupe d'utilisateurs."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Utilisateur ajouté"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Un utilisateur ne peut pas changer son type lui-même"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Un utilisateur ne peut pas s'ajouter à un groupe désactivé ou à un groupe sans accès GUI."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Un utilisateur ne peut pas changer son propre accès GUI."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Un utilisateur ne peut pas changer son propre état"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Un utilisateur ne peut pas changer son propre état."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Utilisateur supprimé"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Groupe d'utilisateurs"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans le script \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "Le groupe d'utilisateurs \"%s\" existe déjà."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14565,34 +14998,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Groupes d'utilisateurs"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Un utilisateur n'est pas autorisé à s'effacer lui-même."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Un utilisateur ne peut pas modifier son propre accès GUI en devenant un membre du groupe d'utilisateurs \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Un utilisateur ne peut pas modifier son propre état système en devenant un membre du groupe d'utilisateurs \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "Le nom d'utilisateur ne correspond pas avec la base de données"
 
@@ -14618,243 +15051,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Type d'utilisateur"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Utilisateur mis à jour"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Un utilisateur avec l'alias \"%s\" existe déjà."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Utilisateurs (en ligne)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Utilisateurs débloqués"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Valeur"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "La valeur \"%1$s\" est invalide pour le paramètre \"grid_align\". Les choix sont : \"%2$s\" et \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14889,11 +15322,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14939,10 +15372,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "La table de correspondance avec l'identifiant (valuemapid) \"%1$s\" n'existe pas."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Table de correspondance"
 
@@ -14951,7 +15384,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "La table de correspondance doit avoir au moins une correspondance."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14963,8 +15396,8 @@ msgstr "Valeur : pas de donnée"
 msgid "Values"
 msgstr "Valeurs"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Variables"
 
@@ -14977,64 +15410,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Alignement vertical"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "La vue n'est pas rendue."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Nom visible"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Le nom visible ne peut pas être vide si le nom d'hôte est manquant."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Avertissement"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Nous sommes désolés, le nombre maximal d'éléments à mémoriser a été atteint."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15042,65 +15480,83 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Supervision Web"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Mer"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -15108,9 +15564,9 @@ msgstr "Mercredi"
 msgid "Week"
 msgstr "Semaine"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Hebdomadaire"
 
@@ -15118,12 +15574,12 @@ msgstr "Hebdomadaire"
 msgid "When active"
 msgstr "Lorsque actif"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Largeur"
@@ -15133,28 +15589,28 @@ msgstr "Largeur"
 msgid "With data collection"
 msgstr "Avec collecte de données"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Avec le dernier événement non acquitté"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Avec problèmes"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Avec déclencheurs"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Avec des événements non acquittés"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Sans problème"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Sans déclencheur"
 
@@ -15163,7 +15619,7 @@ msgid "Wizard"
 msgstr "Assistant"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15176,180 +15632,165 @@ msgstr "Heures ouvrées"
 msgid "Working time \"%1$s\"."
 msgstr "Heures ouvrées \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Écriture"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Champs incorrects pour une dépendance du service \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Champs incorrects pour l'élément."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Champs incorrects pour l'hôte \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Champs incorrects pour la macro \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Champs incorrects pour le type de média."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Champs incorrects pour le script."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Champs incorrects pour le service \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Champs incorrects pour l'horaire du service \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Champs incorrects pour le déclencheur."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Champs incorrects pour l'utilisateur \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Macro \"%1$s\" incorrecte."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Étiquette X"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "Le fichier XML contient une erreur %1$s :"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "Le fichier XML contient des erreurs"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "Le fichier XML contient une erreur fatale %1$s :"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "Le fichier XML contient un avertissement %1$s :"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "A"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Valeur MAX axe Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "La valeur maximal de l'axe Y doit être supérieure à la valeur minimale de l'axe Y."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Valeur minimale axe Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Coté de l'axe Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Étiquette Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "d/m/Y H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "d M Y H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "d/m/Y"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "d/m/Y H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr "d/m/Y H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15357,96 +15798,105 @@ msgstr "d/m/Y H:i:s"
 msgid "Year"
 msgstr "Année"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Annuel"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Oui"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Certaines langues ne peuvent pas être choisi, car elles ne sont pas toutes installées sur le serveur web."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Vous n'êtes pas autorisé à changer les privilèges de l'utilisateur \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Vous n'êtes pas connecté."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Vous ne pouvez pas échanger les hôtes pour la sélection courante."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Vous n'avez pas spécifié l'hôte pour l'opération."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Vous n'avez pas spécifié le groupe d'hôtes pour l'opération."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Vous n'avez pas spécifié les cibles pour la commande d'opération d'action \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Vous n'avez pas spécifié les cibles pour le script global d'opération de l'action \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "Vous n'avez pas la permission d'effectuer cette opération."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Vous n'avez pas la permission de créer des utilisateurs."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Vous n'avez pas la permission de modifier d'autres utilisateurs."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Vous n'avez pas la permission de modifier l'utilisateur ou l'utilisateur n'existe pas."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Vous devez vous identifier pour accéder à cette page."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15459,7 +15909,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15478,8 +15928,8 @@ msgid "Zabbix User"
 msgstr "Utilisateur Zabbix"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15505,10 +15955,11 @@ msgstr "Zabbix interne"
 msgid "Zabbix internal authentication"
 msgstr "Authentification Zabbix interne"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Serveur Zabbix"
@@ -15524,7 +15975,7 @@ msgstr ""
 "1. IP/DNS incorrecte dans \"zabbix.conf.php\" ;\n"
 "2. configuration réseau incorrecte.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "IP ou port du serveur Zabbix non défini !"
 
@@ -15532,15 +15983,15 @@ msgstr "IP ou port du serveur Zabbix non défini !"
 msgid "Zabbix server activity check interval"
 msgstr "Intervalle de vérification de l'activité du serveur Zabbix"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Information du serveur Zabbix"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Le serveur Zabbix ne fonctionne pas : les informations affichées peuvent ne pas être actuelles."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Serveur Zabbix en fonction"
 
@@ -15549,11 +16000,11 @@ msgstr "Serveur Zabbix en fonction"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Le serveur Zabbix exécute l'intervalle de vérification \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Nom du serveur Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Port du serveur Zabbix"
 
@@ -15561,25 +16012,20 @@ msgstr "Port du serveur Zabbix"
 msgid "Zabbix trapper"
 msgstr "Zabbix trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zoom"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Valeur incorrecte pour le jour : \"%s\"]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Valeur incorrecte pour le mois : \"%s\"]"
@@ -15588,19 +16034,19 @@ msgstr "[Valeur incorrecte pour le mois : \"%s\"]"
 msgid "agent"
 msgstr "agent"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "tous"
 
@@ -15608,19 +16054,15 @@ msgstr "tous"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "existe déjà"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "en Bleu"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "en Vert"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "en Rouge"
 
@@ -15632,83 +16074,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "moy"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "j"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d/m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d/m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d/m/y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "jours"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15730,19 +16138,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dynamique"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "éléments"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "éléments copiés vers ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from et esc_step_to doivent être précisés en même temps."
 
@@ -15754,47 +16158,49 @@ msgstr "exactement"
 msgid "executed"
 msgstr "exécuté"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "fixe"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "trouvés"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "hôte"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "groupe d'hôte"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "icône"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "image"
 
@@ -15802,7 +16208,7 @@ msgstr "image"
 msgid "in"
 msgstr "dans"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15812,7 +16218,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "est"
 
@@ -15820,20 +16226,20 @@ msgstr "est"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "dernier"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "comme"
@@ -15842,12 +16248,12 @@ msgstr "comme"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15856,46 +16262,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "macro(s)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "maintenance"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "carte"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "60 secondes minimum"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15904,17 +16310,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "doit être un utilisateur LDAP correct"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "pas de donnée"
@@ -15927,12 +16333,14 @@ msgstr "not in"
 msgid "not like"
 msgstr "pas comme"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "À l'arrêt"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "non sélectionné"
 
@@ -15941,57 +16349,61 @@ msgstr "non sélectionné"
 msgid "not sent"
 msgstr "non envoyé"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "maintenant"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "de"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "sur"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "autre"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "rafraichir tous les"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16000,25 +16412,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "mémoriser la sélection"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "racine"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "En marche"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sec"
 
@@ -16031,7 +16442,7 @@ msgstr "secondes"
 msgid "sent"
 msgstr "envoyé"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "description courte"
 
@@ -16039,36 +16450,36 @@ msgstr "description courte"
 msgid "show icon mappings"
 msgstr "afficher les correspondances d'icônes"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "afficher les correspondances de valeurs"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "ID du modèle \"%1$s\" passé %2$s fois"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "à"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "déclencheur"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "inconnu"
 
@@ -16080,11 +16491,11 @@ msgstr "valeur"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "a"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "aaaa"
diff --git a/frontends/php/locale/hu/LC_MESSAGES/frontend.po b/frontends/php/locale/hu/LC_MESSAGES/frontend.po
index d00d60b631e..8b20e89b1c2 100644
--- a/frontends/php/locale/hu/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/hu/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-12-10 22:17+0300\n"
 "Last-Translator: Robert <szenasy.robert@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -15,29 +15,31 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1386706647.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" 1970.01.01 és 2038.01.18 között kell lennie."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,24 +51,22 @@ msgstr[1] ""
 msgid "%1$s (year %2$s)"
 msgstr ""
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s elem"
 msgstr[1] "%1$s elem"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -81,7 +81,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -102,23 +102,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d eszköz"
 msgstr[1] "%d eszköz"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - végtelen)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(napokban)"
 
@@ -126,34 +126,34 @@ msgstr "(napokban)"
 msgid "(in sec)"
 msgstr "(másodpercekben)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimum 60 másodperc, 0 - alapértelmezett használata)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(nincs proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[CSOPORTOS VISSZAIGAZOLÁS]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 vagy 1"
 
@@ -169,7 +169,7 @@ msgstr "10 másodperc"
 msgid "30 seconds"
 msgstr "30 másodperc"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D nézet"
 
@@ -185,7 +185,7 @@ msgstr "5 másodperc"
 msgid "500 latest values"
 msgstr "500 legfrissebb érték"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -204,12 +204,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "RIASZTÁSOK VISSZAIGAZOLÁSAI"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "ÉS"
 
@@ -221,19 +220,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "RENDELKEZÉSRE-ÁLLÁS JELENTÉSEK"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -245,42 +244,42 @@ msgstr "Elfogadható SLA"
 msgid "Access denied!"
 msgstr "Hozzáférés megtagadva!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "A fiók %s másidpercig zárolva."
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Nyugtázom"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Visszaigazolás"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Visszaigazolás hozzáadva"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Riasztás visszaigazolta"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Nyugtázás és visszatérés"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Nyugtázás állapota"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Nyugtázva"
 
@@ -305,62 +304,65 @@ msgstr ""
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Eljárás"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr ""
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Eljárás hozzáadva"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Eljárás törölve"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -373,21 +375,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Eljárás műveletei"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Eljárás frissítve"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Eljárások"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktív"
@@ -397,80 +399,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Aktív"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktív ettől"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktív eddig"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Megjegyzés hozzáfűzése"
 
@@ -486,27 +491,23 @@ msgstr "Új hoszt"
 msgid "Add link"
 msgstr "Kapcsolat felvétele"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr ""
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Prototípus hozzáadása"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Hozzáadás"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Hozzáadás a kedvencekhez"
@@ -515,7 +516,7 @@ msgstr "Hozzáadás a kedvencekhez"
 msgid "Add to host group"
 msgstr ""
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr "Felvéve"
 msgid "Admin"
 msgstr "Rendszergazda"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Adminisztráció"
 
@@ -535,34 +536,34 @@ msgstr "Adminisztráció"
 msgid "Advanced labels"
 msgstr ""
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Kor"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr ""
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr ""
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Ügynök"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Ügynök interface"
@@ -571,12 +572,12 @@ msgstr "Ügynök interface"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Másodlagos név"
 
@@ -584,123 +585,126 @@ msgstr "Másodlagos név"
 msgid "Align icons"
 msgstr "Ikonok igazítása"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Mind"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Minden csoport"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Engedélyezett hosztok"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Bármely"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Bármely szót tartalmaz"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Alkalmazás"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr ""
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Alkalmazás felvéve"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Alkalmazás törölve"
 msgstr[1] "Alkalmazás törölve"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Alkalmazás hiba."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Alkalmazás frissítve"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr ""
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Alkalmazások"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Alkalmaz"
 
@@ -709,16 +713,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Ápr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Április"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr ""
 
@@ -734,9 +738,9 @@ msgstr "Terület mérete"
 msgid "Area type"
 msgstr "Terület típusa"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -750,52 +754,49 @@ msgstr "Szövegként"
 msgid "Asset tag"
 msgstr ""
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr ""
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr ""
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audit"
@@ -815,26 +816,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Aug"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Augusztus"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Authentikáció"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Autentikációs algoritmus"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -893,9 +896,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automatikus"
 
@@ -903,20 +906,20 @@ msgstr "Automatikus"
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr ""
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Elérhetőség"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Rendelkezésre-állás jelentések"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Elérhető"
 
@@ -925,36 +928,36 @@ msgstr "Elérhető"
 msgid "Average"
 msgstr "Átlagos"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Átlag"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr ""
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Tengely elhelyezkedése"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Háttér"
@@ -963,7 +966,7 @@ msgstr "Háttér"
 msgid "Background image"
 msgstr "Háttérkép"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Egyedi riportok"
 
@@ -973,8 +976,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Alap authentikáció"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -986,15 +989,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr ""
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Fekete & kék"
 
@@ -1006,8 +1009,8 @@ msgstr "Villogó"
 msgid "Blocked"
 msgstr "Zárolva"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Vastag vonal"
 
@@ -1015,22 +1018,22 @@ msgstr "Vastag vonal"
 msgid "Boolean"
 msgstr "Boolean"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Alúl"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Világosabb"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Csoportos visszaigazolás"
 
@@ -1056,7 +1059,7 @@ msgstr "ALKALMAZÁSOK KONFIGURÁCIÓJA"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "AUTENTIKÁCIÓ KONFIGURÁCIÓ"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1086,7 +1089,7 @@ msgstr "HOSZT CSOPORTOK KONFIGURÁCIÓJA"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr ""
 
@@ -1098,7 +1101,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr ""
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "KÉPEK KONFIGURÁLÁSA"
 
@@ -1107,14 +1110,14 @@ msgstr "KÉPEK KONFIGURÁLÁSA"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "IT SZOLGÁLTATÁSOK KONFIGURÁLÁSA"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "ELEM PROTOTIPUS KONFIGURÁLÁSA"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "ELEMEK KONFIGURÁLÁSA"
 
@@ -1143,7 +1146,7 @@ msgstr "HÁLÓZATI TÉRKÉPEK KONFIGURÁLÁSA"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "PROXY KONFIGURÁLÁSA"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "REGULÁRIS KIFEJEZÉSEK KONFIGURÁLÁSA"
 
@@ -1163,7 +1166,7 @@ msgstr "SCRIPTEK KONFIGURÁLÁSA"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "BEMUTATÓK KONFIGURÁLÁSA"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "SABLONOK KONFIGURÁLÁSA"
 
@@ -1179,7 +1182,7 @@ msgstr ""
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "TRIGGEREK KONFIGURÁLÁSA"
 
@@ -1211,22 +1214,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "ZABBIX KONFIGURÁLÁSA"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1235,21 +1238,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Kalkulált"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr ""
 
@@ -1257,92 +1260,95 @@ msgstr ""
 msgid "Callback"
 msgstr "Visszahívás"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Kanada (136 karakter)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Nem lehet visszaigazolni az eseményt"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Az eljárást nem lehet felvenni"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Alkalmazás felvétele sikertelen"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Nem lehet hozzáadni felderítési szabályt"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Grafikon hozzáadása nem sikerült"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Csoport létrehozása sikertelen"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Hoszt felvétele sikertelen"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1350,24 +1356,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Nem sikerült a képet hozzáadni"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Nem sikerült a képet hozzáadni."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Elem felvétele sikertelen"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1375,20 +1381,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr "Makró hozzáadása sikertelen."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Karbantartás hozzáadása sikertelen"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr ""
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1397,24 +1403,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Hálózati térkép létrehozása sikertelen"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Proxy létrehozása sikertelen"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Reguláris kifejezés hozzáadása nem sikerült"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Képernyő létrehozása sikertelen"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Script felvétele sikertelen"
 
@@ -1426,27 +1432,27 @@ msgstr "Szolgáltatás létrehozása sikertelen"
 msgid "Cannot add slide show"
 msgstr "Bemutató hozzáadása sikertelen"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "A mintát nem lehet létrehozni"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Triggerek létrehozása sikertelen"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Felhasználó létrehozása sikertelen"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Felhasználó létrehozása sikertelen. A beírt jelszavak nem azonosak."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Felhasználók hozzáadása sikertelen."
 
@@ -1454,7 +1460,7 @@ msgstr "Felhasználók hozzáadása sikertelen."
 msgid "Cannot add value map"
 msgstr "Az érték-hozzárendelést nem lehet végrehajtani"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1474,23 +1480,23 @@ msgstr ""
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Előzmények törlése sikertelen"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -1498,20 +1504,20 @@ msgstr ""
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Nem lehet másolni a grafikonokat"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Elemek másolása sikertelen"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1520,19 +1526,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "Nem hozható létre kapcsolat másik adatbázissal."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr ""
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr ""
 
@@ -1540,102 +1546,102 @@ msgstr ""
 msgid "Cannot create icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr ""
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Nem hozható létre új elem."
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Nem hozható létre új képernyő."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Az eljárást nem lehet törölni"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Alkalmazás törlése sikertelen"
 msgstr[1] "Alkalmazás törlése sikertelen"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Függőség nem törölhető"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Nem lehet törölni a felderítési szabályt"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "A grafikon törlése nem sikerült"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Grafikon nem törölhető."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "A grafikonok törlése nem sikerült"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Csoport törlése sikertelen"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Csoport törlése sikertelen"
+msgstr[1] "Csoport törlése sikertelen"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Hoszt törlése sikertelen"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Hoszt csoport törlése sikertelen."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1643,80 +1649,80 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Nem sikerült a képet törölni"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Elem törlése sikertelen"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Cannot delete items"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Karbantartás törlése sikertelen"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Hálózati térkép törlése sikertelen"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Proxy törlése sikertelen"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 #, fuzzy
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Reguláris kifejezés törlése nem sikerült"
 msgstr[1] "Reguláris kifejezés törlése nem sikerült"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Script törlése sikertelen"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr ""
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr ""
 
@@ -1724,77 +1730,80 @@ msgstr ""
 msgid "Cannot delete service"
 msgstr "Szolgáltatás törlése sikertelen"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Minta nem törölhető"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Trigger törlése sikertelen"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Triggerek törlése sikertelen"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Felhasználó törlése sikertelen"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1802,77 +1811,77 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr "Az érték-hozzárendelést nem lehet törölni"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] ""
 msgstr[1] ""
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1886,134 +1895,128 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] ""
 msgstr[1] ""
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2024,34 +2027,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2061,41 +2083,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2108,12 +2130,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr ""
@@ -2125,59 +2149,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Minta csatolása sikertelen"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr ""
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2197,7 +2222,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2206,11 +2231,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2218,11 +2243,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Makró eltávolítása sikertelen."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr ""
 
@@ -2231,217 +2256,226 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Felhasználói-státusz engedélyezése sikertelen"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr ""
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Minta leválasztása sikertelen"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Az eljárást nem lehet frissíteni"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Alkalmazás frissítése sikertelen"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Megyjegyzés frissítése sikertelen"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Hibakereső mód frissítése sikertelen"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Nem lehet módosítani a felderítési szabályt"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "A grafikon frissítése nem sikerült"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Csoport frissítése sikertelen"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Csoport frissítése sikertelen."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Hoszt frissítése sikertelen"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr ""
 
@@ -2453,24 +2487,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr "Nem sikerült a képet frissíteni"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Nem sikerült a képet frissíteni."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Elem frissítése sikertelen"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Elemek frissítése sikertelen"
 
@@ -2482,16 +2516,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr ""
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Karbantartás frissítése sikertelen"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr ""
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2499,28 +2533,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr "Hálózati térkép frissítése sikertelen"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Proxy frissítése sikertelen"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Reguláris kifejezés frissítése nem sikerült"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Képernyő frissítése sikertelen"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Script frissítése sikertelen"
 
@@ -2532,40 +2562,41 @@ msgstr "Szolgáltatások frissítése sikertelen"
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Minta frissítése sikertelen"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "A triggert nem lehet frissíteni"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Felhasználó frissítése sikertelen"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Felhasználó frissítése sikertelen. A beírt jelszavak nem azonosak."
 
@@ -2573,15 +2604,15 @@ msgstr "Felhasználó frissítése sikertelen. A beírt jelszavak nem azonosak."
 msgid "Cannot update value map"
 msgstr "Nem lehet frissíteni az érték-hozzárendelést"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Felirat"
 
@@ -2590,47 +2621,47 @@ msgstr "Felirat"
 msgid "Case sensitive"
 msgstr "Kis/nagybetű érzékeny"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Középre"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Módosítás"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Módosít"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Jelszó módosítása"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Betű"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Tartalmazza a következő szót"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Nem tartalmazza a következő szót"
 
@@ -2639,48 +2670,48 @@ msgid "Chassis"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr ""
 
@@ -2689,44 +2720,44 @@ msgid "Check type"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Ellenőrzések"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr ""
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Kínai (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Kínai (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr ""
@@ -2741,34 +2772,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Kijelölt elem előzményeinek törlése"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr ""
 
@@ -2778,69 +2810,69 @@ msgstr "Óra"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Klón"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Bezár"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Szín"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Szín (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Oszlopok száma"
 
@@ -2855,7 +2887,7 @@ msgstr "Kombinált eredmény"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Parancs"
 
@@ -2863,41 +2895,31 @@ msgstr "Parancs"
 msgid "Command actions"
 msgstr "Parancs eljárások"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr ""
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Parancsok"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Megjegyzés frissítve"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Megjegyzés"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr ""
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Több időszak értékeinek összehasonlítása"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2905,29 +2927,39 @@ msgstr ""
 msgid "Condition"
 msgstr "Feltétel"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Feltételek"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Konfiguráció"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3090,23 +3122,23 @@ msgstr "Konfiguráció frissítése"
 msgid "Configure (Filter %s)"
 msgstr ""
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Kapcsolódva"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr ""
@@ -3154,7 +3186,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3162,30 +3194,37 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Másolás"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Kiválasztott másolása ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Kép mentése sikertelen!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Számol"
 
@@ -3205,6 +3244,10 @@ msgstr "Alkalmazás"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3222,7 +3265,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3235,15 +3278,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
-#: adm.iconmapping.php:126
-msgid "Create icon map"
+#: adm.images.php:151
+msgid "Create icon"
 msgstr ""
 
-#: adm.images.php:149
-msgid "Create image"
+#: adm.iconmapping.php:126
+msgid "Create icon map"
 msgstr ""
 
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr ""
 
@@ -3267,6 +3310,10 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr ""
@@ -3291,11 +3338,11 @@ msgstr "Script létrehozása"
 msgid "Create slide show"
 msgstr ""
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr ""
 
@@ -3319,42 +3366,42 @@ msgstr ""
 msgid "Create value map"
 msgstr "Érték-hozzárendelés létrehozása"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3364,51 +3411,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr ""
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr ""
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3421,7 +3469,7 @@ msgstr "Egyéni grafikonok"
 msgid "Custom label"
 msgstr ""
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3435,7 +3483,7 @@ msgstr "Egyedi szorzó"
 msgid "Custom screens"
 msgstr "Egyedi képernyők"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr ""
 
@@ -3455,18 +3503,14 @@ msgstr ""
 msgid "Custom slides"
 msgstr ""
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr ""
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "DASHBOARD KONFIGURÁCIÓ"
@@ -3482,28 +3526,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "SCENARIO RÉSZLETEI"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "LETILTVA"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr ""
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3511,25 +3555,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS név"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr ""
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Napi"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr ""
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Sötétebb"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -3541,20 +3585,21 @@ msgstr "Dashboard konfiguráció"
 msgid "Dashboard filter"
 msgstr "Dashboard szűrő"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Szaggatott vonal"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Adat"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3577,11 +3622,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Adat típus"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr ""
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr ""
 
@@ -3589,35 +3635,39 @@ msgstr ""
 msgid "Database monitor"
 msgstr "Adatbázis monitor"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr ""
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr ""
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr ""
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr ""
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr ""
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr ""
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr ""
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Dátum"
 
@@ -3637,53 +3687,52 @@ msgstr ""
 msgid "Date HW purchased"
 msgstr ""
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Nap"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Hónap napja"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Hét napja"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Napok"
 
@@ -3691,22 +3740,22 @@ msgstr "Napok"
 msgid "Debug"
 msgstr "Hibakeresés"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Hibakereső mód"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Hibakereső mód frissítve"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr ""
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "December"
 
@@ -3716,15 +3765,14 @@ msgstr "Decimális"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -3737,11 +3785,11 @@ msgid "Default delay (in seconds)"
 msgstr ""
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Alapértelmezett üzenet"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3764,30 +3812,34 @@ msgstr ""
 msgid "Delay"
 msgstr "Késleltetés"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr ""
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Késleltetve"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Törlés"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Törlés ÉS kiürítés"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Figyelmeztetés: Ez a művelet törli a kijelölt mintákat és eltávolítja az érintett elemeket az összes csatolt hosztról"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3795,53 +3847,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Törli a kifejezést?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Grafikon törlése?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Kijelölt WEB scenario előzményeinek törlése?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Kijelölt elemek előzményeinek törlése?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Törli a kulcsszót?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3849,11 +3901,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr "Törli a karbantartási időszakot?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3861,7 +3917,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr "Töröljem a reguláris kifejezést?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Scenario törlése?"
 
@@ -3869,71 +3925,67 @@ msgstr "Scenario törlése?"
 msgid "Delete screen?"
 msgstr "Képernyő törlése?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Script törlése?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Kiválasztott törlése"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Kijelölt WEB scenario-k törlése?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Törli a kiválasztott alkalmazásokat?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Törli a kijelölt felderítési szabályokat?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Törli a kiválasztott grafikonokat?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Törli a kiválasztott csoportokat?"
@@ -3942,27 +3994,27 @@ msgstr "Törli a kiválasztott csoportokat?"
 msgid "Delete selected groups?"
 msgstr "Törli a kiválasztott csoportokat?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Törli a kiválasztott hosztokat?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Törli a kijelölt hosztokat?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Kijelölt kép törlése?"
 
@@ -3970,31 +4022,31 @@ msgstr "Kijelölt kép törlése?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Kijelölt elemek törlése?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Kijelölt karbantartási időszak törlése?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Törli a kjelölt térképeket?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Törli a kiválasztott proxykat?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Töröljem a kiválasztott reguláris kifejezéseket?"
 
@@ -4002,15 +4054,15 @@ msgstr "Töröljem a kiválasztott reguláris kifejezéseket?"
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Törli a kiválasztott szkripteket?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Törli a kijelölt mintákat?"
 
@@ -4022,11 +4074,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Törli a kijelölt triggereket?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Törli a kiválasztott felhasználót?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Törli a kiválasztott felhasználókat?"
 
@@ -4041,11 +4093,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Törli a kijelölteket a csatolt elemekkel együtt?"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4054,15 +4110,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Törli a kiválasztott triggert?"
 
@@ -4070,62 +4126,62 @@ msgstr "Törli a kiválasztott triggert?"
 msgid "Deleted"
 msgstr "Törölve"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4134,35 +4190,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Elválasztó"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Változás (egyszeri változás)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Változás (másodpercenként)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Hozzáférés megtagadva"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Függő"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Függőség"
 
@@ -4170,30 +4226,41 @@ msgstr "Függőség"
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Leírás"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Részletek"
 
@@ -4206,71 +4273,71 @@ msgid "Device"
 msgstr "Eszköz"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Egyedi eszköz szabály"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4294,48 +4361,44 @@ msgstr "Letiltja a hibakereső módot a kiválasztott csoportok számára?"
 msgid "Disable host"
 msgstr "Hoszt tiltása"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Letiltja a hosztokat a kiválasztott proxykon?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Kiválasztott tiltása"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Kijelölt WEB scenario-k tiltása?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Letiltja a kiválasztott alkalmazásokat?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Letiltja a kijelölt felderítési szabályokat?"
 
@@ -4343,11 +4406,11 @@ msgstr "Letiltja a kijelölt felderítési szabályokat?"
 msgid "Disable selected groups?"
 msgstr "Tiltja a kiválasztott felhasználókat?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Letiltja a kijelölt hosztokat?"
 
@@ -4355,42 +4418,47 @@ msgstr "Letiltja a kijelölt hosztokat?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Kijelölt elemek tiltása?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Letiltja a kijelölt triggereket?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Letiltva"
 
@@ -4403,7 +4471,7 @@ msgstr "Katasztrofális"
 msgid "Discovered"
 msgstr "Felderítve"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4411,17 +4479,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "Felderített eszköz"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Felderítés"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Felderítés proxy-n keresztül"
 
@@ -4429,17 +4497,17 @@ msgstr "Felderítés proxy-n keresztül"
 msgid "Discovery check"
 msgstr "Felderítés"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4448,67 +4516,70 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Felderítési szabály"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Felderítési szabály törölve"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Felderítési szabály frissítve"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Felderítési szabályok törölve"
 
@@ -4520,7 +4591,7 @@ msgstr "Felderítés állapota"
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Megjelenít"
 
@@ -4529,32 +4600,32 @@ msgstr "Megjelenít"
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Több elem értékeinek eloszlása"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Több időszak értékeinek eloszlása"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Ne számoljon"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Pontozott vonal"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4564,30 +4635,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Kiesés"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Rajz stílusa"
 
@@ -4605,74 +4676,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Időtartam"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Holland (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Dinamikus elem"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr ""
 
@@ -4680,13 +4752,13 @@ msgstr ""
 msgid "EVENTS"
 msgstr "ESEMÉNYEK"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4694,9 +4766,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Szerkesztés"
 
@@ -4704,7 +4776,7 @@ msgstr "Szerkesztés"
 msgid "Edit map element"
 msgstr "Térkép elem szerkesztése"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4712,27 +4784,61 @@ msgstr ""
 msgid "Element"
 msgstr "Elem"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Elem név"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Üres"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4740,76 +4846,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4818,11 +4946,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4830,11 +4958,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Engedélyezés"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4854,11 +4986,11 @@ msgstr ""
 msgid "Enable host"
 msgstr "Hoszt engedélyezése"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Engedélyezi a hosztokat a kiválasztott proxykon?"
 
@@ -4871,36 +5003,32 @@ msgstr "Engedélyezi a hosztokat a kiválasztott proxykon?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Kijelölt engedélyezése"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Engedélyezi a kijelölt felderítési szabályokat?"
 
@@ -4908,11 +5036,11 @@ msgstr "Engedélyezi a kijelölt felderítési szabályokat?"
 msgid "Enable selected groups?"
 msgstr "Engedélyezi a kiválasztott felhasználókat?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4920,64 +5048,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Kijelölt elemek engedélyezése?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Engedélyezi a kijelölt triggereket?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Angol (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Hiba"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -4995,15 +5127,15 @@ msgstr "Esemény"
 msgid "Event ID"
 msgstr "Esemény azonosító"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Esemény visszaigazolva"
 
@@ -5012,7 +5144,7 @@ msgstr "Esemény visszaigazolva"
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr ""
 
@@ -5020,7 +5152,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Esemény részletei"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Esemény generálás"
 
@@ -5040,9 +5172,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Események"
 
@@ -5050,36 +5183,41 @@ msgstr "Események"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Minden nap"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Minden héten"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Kivéve"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr ""
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5087,13 +5225,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Végrehajtott szkript"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5105,7 +5243,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr "Egyes hibák kifejtése"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5115,12 +5253,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Bontott kör"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Kijelölt(ek) exportálása"
 
@@ -5128,22 +5266,22 @@ msgstr "Kijelölt(ek) exportálása"
 msgid "Export to CSV"
 msgstr ""
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Kifejezés"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5151,11 +5289,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr ""
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "A kifejezés nem lehet üres"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5176,17 +5315,17 @@ msgid "External check"
 msgstr "Külső ellenőrzés"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "HAMIS"
 
@@ -5195,16 +5334,17 @@ msgstr "HAMIS"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Hiba"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Hiba"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5212,40 +5352,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Sikertelen Események"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr ""
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr ""
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Kedvencek"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr ""
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Február"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Mező"
 
@@ -5289,19 +5429,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5310,13 +5450,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5324,68 +5464,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Kitöltés"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Szűrő"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Vége"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Első"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5394,8 +5537,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fix"
 
@@ -5405,76 +5548,80 @@ msgstr "Fix"
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "A vendég felhasználó (guest) jelszavának üresnek kell lennie"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr ""
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Negyedik"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Francia (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr ""
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Péntek"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "-tól"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Teljes klón"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Funkció"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5484,50 +5631,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr ""
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Általános"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Német (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5535,65 +5682,65 @@ msgid "Get support"
 msgstr "Támogatás"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Mehet"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5602,66 +5749,73 @@ msgid "Gradient line"
 msgstr "Meredek vonal"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Grafikon"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Grafikon hozzáadva"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Grafikon törölve"
 
@@ -5673,54 +5827,59 @@ msgstr "Grafikon elem"
 msgid "Graph item"
 msgstr "Grafikon adatsor"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Grafikon név"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5732,49 +5891,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr "Összesített grafikon"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Grafikon típusa"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Grafikon frissítve"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Grafikonok"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Grafikonok másolva"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Grafikonok törölve"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5783,54 +5944,58 @@ msgstr ""
 msgid "Grid"
 msgstr ""
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Csoport"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Csoport létrehozva"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Csoport törölve"
+msgid_plural "Groups deleted"
+msgstr[0] "Csoport törölve"
+msgstr[1] "Csoport törölve"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5841,40 +6006,42 @@ msgstr "Csoport a felderített hosztoknak"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Csoport név"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Csoport frissítve"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Csoportok"
 
@@ -5882,22 +6049,13 @@ msgstr "Csoportok"
 msgid "Groups in maintenance"
 msgstr "Karbantartott csoportok"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5914,7 +6072,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5932,7 +6090,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5953,12 +6112,17 @@ msgstr "Hardver"
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Magasság"
@@ -5971,15 +6135,15 @@ msgstr "Segítség"
 msgid "Hexadecimal"
 msgstr "Hexadecimális"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Elrejtés"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Összes elrejtése"
 
@@ -5995,15 +6159,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Letiltott triggereket elrejtése"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Választottak elrejtése"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6012,23 +6176,23 @@ msgstr ""
 msgid "High"
 msgstr "Magas"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Előzmények"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Előzmények törölve"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Az előzmények törlése hosszabb időt vehet igénybe. Folytatja?"
 
@@ -6049,79 +6213,79 @@ msgstr "Események előzményei"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Vízszintes igazítás"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Hoszt"
 msgstr[1] "Hoszt"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6133,66 +6297,68 @@ msgstr "Hoszt IP"
 msgid "Host access"
 msgstr "Hoszt elérés"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Hoszt felvéve"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Hoszt törölve"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Hoszt csoport"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6209,14 +6375,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Hoszt csoportok"
 
@@ -6226,8 +6393,8 @@ msgstr "Hoszt csoportok"
 msgid "Host interface"
 msgstr ""
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6243,7 +6410,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6252,18 +6419,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Hoszt név"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6272,72 +6439,72 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6349,7 +6516,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6361,51 +6528,52 @@ msgstr "Hoszt státusz"
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr ""
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Hoszt frissítve"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hosztok"
 
@@ -6413,11 +6581,11 @@ msgstr "Hosztok"
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hosztok (m/n/mi)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6429,37 +6597,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr "Karbantartott hosztok"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Hoszt info"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Hosztok elhelyezkedése"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Óránként"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Órák"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Magyar (hu_HU)"
 
@@ -6477,22 +6646,22 @@ msgstr "Azonosító"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6500,26 +6669,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP cím"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP tartomány"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6527,22 +6696,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr "IPMI agent"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI autentikációs algoritmus"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI jelszó"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI jogosultsági szint"
 
@@ -6552,7 +6721,7 @@ msgstr "IPMI jogosultsági szint"
 msgid "IPMI sensor"
 msgstr "IPMI szenzor"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI felhasználónév"
 
@@ -6585,7 +6754,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6601,25 +6770,25 @@ msgid "ITEMS"
 msgstr "ELEMEK"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ikon"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Ikon (alapértelmezett)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Ikon (letiltva)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Ikon (karbantartás)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Ikon (hiba)"
 
@@ -6640,42 +6809,44 @@ msgstr "Ikon cimke típusa"
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6688,7 +6859,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6696,29 +6868,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6726,21 +6898,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Kép"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6749,7 +6923,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Kép hozzáadva"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Kép törölve"
 
@@ -6757,12 +6931,13 @@ msgstr "Kép törölve"
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6771,66 +6946,66 @@ msgid "Image updated"
 msgstr "Kép frissítve"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Képek"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Azonnal"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Import"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Import fájl"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "-ban/-ben"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr ""
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6843,244 +7018,282 @@ msgstr ""
 msgid "In progress"
 msgstr "Folyamatban"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Beleértve"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "A funkció argumentuma hibás"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7090,11 +7303,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7103,11 +7316,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7115,74 +7328,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Hibás funkció"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7190,182 +7429,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Hibás elemlista."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Hibás karbantartási dátum"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Hibás karbantartási nap"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Hibás karbantartás, \"hét napjai\""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Hibás karbantartási hónap"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Hibás karbantartási időszak"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Hibás karbantartási hét"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7374,64 +7632,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7452,52 +7714,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Hibás trigger kifejezés"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7506,7 +7773,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7526,7 +7794,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7536,43 +7804,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7581,15 +7855,15 @@ msgstr ""
 msgid "Information"
 msgstr "Információ"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Makró beszúrása"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Telepítés"
 
@@ -7597,31 +7871,32 @@ msgstr "Telepítés"
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr ""
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7641,7 +7916,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7649,7 +7924,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7662,19 +7937,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Intervallum"
 
@@ -7684,112 +7959,114 @@ msgstr "Intervallum"
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Leltár"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7798,7 +8075,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7806,12 +8083,12 @@ msgstr ""
 msgid "Is online?"
 msgstr "Bejelentkezve?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Eredmény"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7819,70 +8096,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Olasz (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Elem"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Adatsor hozzáadva"
 
@@ -7890,17 +8168,17 @@ msgstr "Adatsor hozzáadva"
 msgid "Item count"
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Elem törölve"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7914,56 +8192,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7971,92 +8249,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Adatsor frissítve"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Az elem nem lesz frissítve. Kérem javítsa a frissítési intervallumot."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Elemek"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Elemek (m/l/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Elemek másolva"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Elemek törölve"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Adatsorok hozzáadva"
 
@@ -8068,72 +8346,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber Azonosító"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr ""
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Január"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japán (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr ""
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Július"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr ""
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Június"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8142,40 +8420,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Kulcs"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Kulcsszó"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Koreai (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "AKTUÁLIS ADATOK"
 
@@ -8206,37 +8484,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr ""
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Cimke"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Cimke elhelyezkedése"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Nyelv"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Utolsó"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8248,19 +8526,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8280,28 +8558,28 @@ msgstr "Utolsó 365 nap"
 msgid "Last 7 days"
 msgstr "Utolsó 7 nap"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Aktuális változás"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Utolsó ellenőrzés"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Utolsó óra grafikonja"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Utolsó hónap grafikonja"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Utolsó"
 
@@ -8309,66 +8587,67 @@ msgstr "Utolsó"
 msgid "Last seen (age)"
 msgstr "Utolsó kapcsolat időpontja"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Utolsó érték"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Utolsó hét grafikonja"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Legfrissebb adat"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Legfrissebb események"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Litván (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Balra"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Jelmagyarázat"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Vonal"
 
@@ -8376,39 +8655,29 @@ msgstr "Vonal"
 msgid "Link"
 msgstr "Kapcsolat"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Kapcsolatjelzők"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8420,50 +8689,50 @@ msgstr "Hozzáadás a sablonhoz"
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Csatolt minták"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Csatolva"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Betöltés..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Helyi idő"
 
@@ -8480,36 +8749,36 @@ msgid "Location longitude"
 msgstr ""
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Napló"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Napló időformátuma"
@@ -8518,12 +8787,12 @@ msgstr "Napló időformátuma"
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8534,12 +8803,12 @@ msgstr "Belépés"
 msgid "Login as Guest"
 msgstr ""
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8548,8 +8817,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8570,22 +8840,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8597,7 +8863,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "KARBANTARTÁS"
 
@@ -8622,49 +8888,49 @@ msgstr "LEGGYAKORIBB TRIGGER-EK (TOP 100)"
 msgid "Macro"
 msgstr ""
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Makrók"
 
@@ -8672,31 +8938,36 @@ msgstr "Makrók"
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Karbantartás"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Karbantartás hozzáadva"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Karbantartás törölve"
 
@@ -8704,7 +8975,7 @@ msgstr "Karbantartás törölve"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Karbantartási időszak hossza"
 
@@ -8720,25 +8991,25 @@ msgstr "Karbantartás állapota"
 msgid "Maintenance type"
 msgstr "Karbantartás típusa"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Karbantartás frissítve"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8749,12 +9020,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Térkép"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8764,12 +9035,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8786,12 +9057,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr "Térkép mentése sikertelen."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8801,23 +9072,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Térképek"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr ""
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Március"
 
@@ -8825,28 +9096,34 @@ msgstr "Március"
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Inverz megjelölése"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Válaszott megjelölése"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Tömeges frissítés"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "A táblázat mezőiben maximálisan megjelenő elemek száma"
@@ -8860,32 +9137,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr "Triggerenkénti maximálisan megjelenített eseményszám"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximalizál"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8893,105 +9149,99 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Május"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Eszköztípus"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Eszköztípus"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Eszköztípus törölve"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Eszköztípus frissítve"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Eszköztípusok"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9006,14 +9256,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menü"
 
@@ -9023,7 +9273,7 @@ msgstr "Menü"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Üzenet"
 
@@ -9031,66 +9281,66 @@ msgstr "Üzenet"
 msgid "Message actions"
 msgstr "Üzenet eljárások"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr ""
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Középre"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimalizál"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9099,80 +9349,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Percek"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9182,7 +9429,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9194,18 +9441,18 @@ msgstr "Mód"
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr ""
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Hétfő"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Proxin keresztül monitorozva"
 
@@ -9213,33 +9460,33 @@ msgstr "Proxin keresztül monitorozva"
 msgid "Monitored host"
 msgstr "Monitorozitt hoszt"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Felügyelet"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Hónap"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Havi"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9247,7 +9494,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Több, mint 10 perc"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9256,19 +9503,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "Leggyakoribb trigger-ek (top 100)"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr ""
 
@@ -9281,60 +9528,58 @@ msgstr "HÁLÓZATI TÉRKÉPEK"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr ""
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
+msgid "NTLM"
 msgstr ""
 
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9345,26 +9590,32 @@ msgstr ""
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Név"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9383,12 +9634,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9396,7 +9647,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Hálózati térkép létrehozva"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Hálózati térkép törölve"
 
@@ -9408,7 +9659,7 @@ msgstr "Hálózati térkép frissítve"
 msgid "Network maps"
 msgstr "Hálózati térképek"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Soha"
 
@@ -9416,24 +9667,24 @@ msgstr "Soha"
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Új"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Új alkalmazás"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Új feltétel"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr ""
 
@@ -9444,16 +9695,16 @@ msgstr ""
 msgid "New flexible interval"
 msgstr "Új, változó intervallum"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Új csoport"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Új adatsor a grafikonhoz"
 
@@ -9461,83 +9712,99 @@ msgstr "Új adatsor a grafikonhoz"
 msgid "New media"
 msgstr "Új eszköztípus"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Új reguláris kifejezés"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Új szolgáltatási időszak felvétele"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Következő"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Nem"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9545,25 +9812,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9589,8 +9856,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9600,7 +9867,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9608,30 +9875,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9640,27 +9908,27 @@ msgstr ""
 msgid "No data collection"
 msgstr "Adatgyűjtés nélkül"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9668,39 +9936,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Nincsenek visszaigazolandó események"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9715,7 +9983,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9724,7 +9992,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9733,48 +10005,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9787,17 +10060,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9816,33 +10094,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9861,7 +10146,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9877,7 +10162,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9886,15 +10171,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9906,133 +10191,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr ""
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10040,7 +10370,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10048,82 +10378,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Nincs cél kiválasztva"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Nincs trigger"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10132,57 +10463,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Nincs"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normál"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Nincs nyugtázva"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Elemek minta nélkül"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Nem elérhető"
 
@@ -10191,7 +10523,7 @@ msgstr "Nem elérhető"
 msgid "Not classified"
 msgstr "Nincs osztályozva"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Nincs csatlakozva"
 
@@ -10204,8 +10536,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nem támogatott"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Jegyzet"
@@ -10218,7 +10550,7 @@ msgstr "Jegyzetek"
 msgid "Nothing"
 msgstr "Semmi"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10226,87 +10558,87 @@ msgstr ""
 msgid "Notification report"
 msgstr "Értesítési riportok"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Értesítések"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "November"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10314,88 +10646,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "Állapotváltozások száma"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Folyamat lépéseinek száma"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Felhasználók száma (bejelentkezve)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numerikus (lebegőpontos)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numerikus (64 bites egész szám)"
 
@@ -10410,16 +10742,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10435,8 +10769,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "VAGY"
 
@@ -10456,11 +10789,12 @@ msgstr "Oprendszer (rövid leírás)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "ÁTTEKINTÉS"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10468,25 +10802,25 @@ msgstr ""
 msgid "Octal"
 msgstr "Oktális"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Október"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "KIKAPCSOL"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "BEKAPCSOL"
 
@@ -10494,111 +10828,114 @@ msgstr "BEKAPCSOL"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Egy alkalommal"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Egyszeri kiesés"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Csak az engedélyezett hosztokhoz rendelt elemekből számítva"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Csak az engedélyezett hosztokhoz rendelt, engedélyezett elemekhez tartozó triggerekből számítva"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10607,28 +10944,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Működési kondíciók"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Működés típusa"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Műveletek"
@@ -10637,25 +10974,27 @@ msgstr "Műveletek"
 msgid "Operator"
 msgstr "Operátor"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10685,24 +11024,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Eredeti"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Eredeti kék"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Egyéb"
 
@@ -10710,19 +11049,19 @@ msgstr "Egyéb"
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10732,21 +11071,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Egyéb paraméterek"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10759,14 +11098,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Áttekintés"
 
@@ -10774,7 +11110,7 @@ msgstr "Áttekintés"
 msgid "Overview by proxy"
 msgstr "Áttekintés proxinként"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10783,147 +11119,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr "SZEMÉLYES DASHBOARD"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHP adatbázis támogatás"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP verzió"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10932,32 +11276,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "HIBA"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Paletta"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Paraméter"
 
@@ -10966,7 +11312,7 @@ msgstr "Paraméter"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10986,33 +11332,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11022,20 +11368,21 @@ msgstr ""
 msgid "Password"
 msgstr "Jelszó"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Jelszó (ismétlés)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "A jelszó nem lehet üres"
 
@@ -11044,21 +11391,21 @@ msgstr "A jelszó nem lehet üres"
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11066,12 +11413,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Időszak"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Időszak típusa"
@@ -11081,24 +11428,24 @@ msgstr "Időszak típusa"
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Kör"
 
@@ -11110,55 +11457,56 @@ msgstr ""
 msgid "Plain text"
 msgstr "Szöveg"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr ""
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Lengyel (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11166,51 +11514,51 @@ msgstr ""
 msgid "Port range"
 msgstr ""
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portugál (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Pozíció"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Küldés"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Előnézet"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Előző"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11259,30 +11607,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Privát kulcsfájl"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Hiba"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11294,16 +11643,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Számítás, ha minden alárendelt elem állapota hibás"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Számítás, ha legalább egy alárendelt elem állapota hibás"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Hibák"
 
@@ -11311,75 +11660,71 @@ msgstr "Hibák"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxik"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy létrehozva"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy törölve"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Proxy neve"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy frissítve"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Publikus kulcs"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11390,7 +11735,7 @@ msgstr "Publikus kulcsfájl"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "FRISSÍTENDŐ ELEMEK A FELDOLGOZÁSI SORBAN"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Feldolgozási sor"
 
@@ -11398,18 +11743,18 @@ msgstr "Feldolgozási sor"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Olvasás"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Csak olvasható"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Írható-olvasható"
 
@@ -11421,7 +11766,7 @@ msgstr "Ok"
 msgid "Received value"
 msgstr "Fogadott érték"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11429,11 +11774,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Címzett"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11444,28 +11789,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "Címzett(ek)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr ""
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Üzenet a helyreállásról"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Visszaállás tárgya"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Frissités (másodpercben)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr ""
 
@@ -11483,48 +11828,52 @@ msgstr ""
 msgid "Regular expression"
 msgstr "Reguláris kifejezés"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Reguláris kifejezés hozzáadva"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 #, fuzzy
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Reguláris kifejezés törölve"
 msgstr[1] "Reguláris kifejezés törölve"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Reguláris kifejezés frissítve"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11541,26 +11890,28 @@ msgstr "Távoli parancs"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11571,21 +11922,19 @@ msgstr "Távoli parancs"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11593,11 +11942,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Elem eltávolítása"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Eltávolítás"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11606,7 +11955,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11618,28 +11967,28 @@ msgstr "Hoszt eltávolítása"
 msgid "Remove link"
 msgstr "Kapcsolat eltávolítása"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Kijelöltek eltávolítása"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Csere"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Jelentés"
 
@@ -11647,35 +11996,36 @@ msgstr "Jelentés"
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Jelentések"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Szükséges"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11683,29 +12033,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Szükséges szerver teljesítmény (másodpercenkénti mérések száma))"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Visszaállítás"
 
@@ -11724,9 +12076,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11739,7 +12091,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Forrás"
@@ -11754,15 +12106,15 @@ msgstr "Válaszidő"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Eredmény"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Az eredmény HAMIS"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Az eredmény IGAZ"
 
@@ -11775,7 +12127,8 @@ msgstr ""
 msgid "Result type"
 msgstr "Eredmény típusa"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11783,60 +12136,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Hátralévő próbálkozások száma"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Újra"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Jobbra"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Sorok száma"
 
@@ -11844,11 +12206,11 @@ msgstr "Sorok száma"
 msgid "Rows"
 msgstr "Sorok"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Sorok oldalanként"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Szabályok"
 
@@ -11893,20 +12255,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Orosz (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11922,7 +12284,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr "KERESÉS"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr ""
 
@@ -11937,13 +12299,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "BEMUTATÓK"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11952,17 +12314,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP email"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP szerver"
@@ -11978,7 +12340,7 @@ msgstr ""
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11990,9 +12352,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP jelszó (community)"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -12001,7 +12363,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12025,7 +12387,7 @@ msgstr "SNMPv3 agent"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12043,7 +12405,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12052,15 +12414,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH agent"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "FELDERÍTÉS ÁLLAPOTA"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "TRIGGEREK ÁLLAPOTA"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "WEB FELÜGYELET ÁLLAPOTA"
 
@@ -12068,92 +12450,92 @@ msgstr "WEB FELÜGYELET ÁLLAPOTA"
 msgid "STATUS OF ZABBIX"
 msgstr "ZABBIX ÁLLAPOT"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr ""
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Szombat"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Mentés"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Skála"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Scenario"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Scenario létrehozva"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Scenario frissítve"
 
@@ -12165,7 +12547,7 @@ msgstr "Scenario-k"
 msgid "Schedule"
 msgstr "Időzítés"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12176,126 +12558,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Képernyő"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Képernyő létrehozva"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Képernyő cella konfigurálása"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Képernyő törölve"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Képernyő frissítve"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Képernyők"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Script"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Script felvéve"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Script törölve"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Script név"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12304,17 +12685,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Script frissítve"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Scriptek"
 
@@ -12335,7 +12716,7 @@ msgstr "A keresési feltétel üres"
 msgid "Search/Filter elements limit"
 msgstr "Keresési/Szűrési limit"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Második"
 
@@ -12367,7 +12748,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Másodpercek"
 
@@ -12386,69 +12767,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Kiválaszt"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "A következő értéket tartalmazó sorok kiválasztása"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Kijelölt"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Kijelölt csoportok"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Kijelölt hosztok"
 
@@ -12464,7 +12852,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Küldés csak ide"
 
@@ -12472,11 +12860,11 @@ msgstr "Küldés csak ide"
 msgid "Send to"
 msgstr "Küldés"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12485,17 +12873,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Szeptember"
 
@@ -12507,7 +12895,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Szerver"
@@ -12516,44 +12904,44 @@ msgstr "Szerver"
 msgid "Server info"
 msgstr "Szerver info"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Szerver idő"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Szolgáltatás"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Egy szolgáltatás nem lehet egyszerre szülő és alárendelt."
 
@@ -12569,11 +12957,11 @@ msgstr "Szolgáltatás törölve"
 msgid "Service port"
 msgstr "Szerviz port"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Szolgáltatási időszakok"
 
@@ -12585,49 +12973,53 @@ msgstr "Szerviz típus"
 msgid "Service updated"
 msgstr "Szolgáltatás frissítve"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Súlyosság"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Megjelenít"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Mutasd mindet"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Részletek megjelenítése"
 
@@ -12657,35 +13049,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Karbantartás alatti hosztok megjelenítése"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Vonalak megjelenítése"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Választottak megjelenítése"
 
@@ -12693,19 +13086,22 @@ msgstr "Választottak megjelenítése"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Szöveg megjelenítése HTML-ként"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Triggerek megjelenítése"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Nyugtázatlan események megjelenítése"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Érték megjelenítése"
@@ -12714,11 +13110,11 @@ msgstr "Érték megjelenítése"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Munkaidő megjelenítése"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr ""
 
@@ -12738,6 +13134,10 @@ msgstr "Egyszerű ellenőrzés"
 msgid "Simple graph"
 msgstr "Egyszerű grafikon"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12775,7 +13175,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12793,16 +13193,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Bemutató"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12811,11 +13211,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12823,10 +13223,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Bemutatók"
 
@@ -12834,15 +13234,15 @@ msgstr "Bemutatók"
 msgid "Slides"
 msgstr "Bemutatók"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Lágy"
 
@@ -12875,28 +13275,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Rendezés"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Sorba rendezés (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12909,11 +13309,11 @@ msgstr ""
 msgid "Source"
 msgstr "Forrás"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spanyol (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12921,63 +13321,63 @@ msgstr ""
 msgid "Speed"
 msgstr "Sebesség"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Rögzített"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Állapot"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Státusz"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -12990,7 +13390,7 @@ msgstr "Státusz számítás"
 msgid "Status calculation algorithm"
 msgstr "Státusz-számítási algoritmus"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Státusz kódok"
 
@@ -12999,7 +13399,7 @@ msgid "Status of Web monitoring"
 msgstr "Web felügyelet állapota"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "ZABBIX állapot"
 
@@ -13016,40 +13416,40 @@ msgid "Status only"
 msgstr "Csak státusz"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Lépés"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Scenario lépése"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Lépések száma"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Érték tárolása"
@@ -13058,11 +13458,11 @@ msgstr "Érték tárolása"
 msgid "Straight"
 msgstr "Straight"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Stílus"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13070,11 +13470,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Tárgy"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13083,32 +13483,32 @@ msgid "Success Audit"
 msgstr "Sikeres Események"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr ""
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Vasárnap"
 
@@ -13116,27 +13516,27 @@ msgstr "Vasárnap"
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Vezetéknév"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Svéd (sv_SE)"
 
@@ -13144,16 +13544,16 @@ msgstr "Svéd (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Alapértelmezett"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13162,21 +13562,21 @@ msgid "System status"
 msgstr "Rendszer státusz"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13195,11 +13595,11 @@ msgid "TOTAL"
 msgstr "ÖSSZESEN"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "TRIGGER MEGJEGYZÉSEI"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "IGAZ"
 
@@ -13217,14 +13617,14 @@ msgstr ""
 msgid "Tag"
 msgstr "Cimke"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Cél"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13233,130 +13633,133 @@ msgid "Target type"
 msgstr "Cél típusa"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Minta"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Minta törölve"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Minta csatolások"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Minta frissítve"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Elemek mintából"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Minták"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Teszt"
 
@@ -13364,11 +13767,11 @@ msgstr "Teszt"
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Teszt adat"
 
@@ -13382,22 +13785,22 @@ msgid "Test string"
 msgstr "Teszt szöveg"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Szöveg"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13405,7 +13808,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13420,26 +13823,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13448,19 +13851,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Téma"
 
@@ -13471,11 +13874,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Harmadik"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13484,11 +13887,11 @@ msgstr ""
 msgid "This month"
 msgstr "Ebben a hónapban"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13500,27 +13903,27 @@ msgstr "Ezen a héten"
 msgid "This year"
 msgstr "Ebben az évben"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr ""
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "-ig"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13529,28 +13932,28 @@ msgstr "-ig"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Idő"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13558,54 +13961,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Idő periódus"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Idő típusa"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Időtúllépés"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Időpecsét"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Cím"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13613,17 +14016,18 @@ msgstr ""
 msgid "Today"
 msgstr "Ma"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Felül"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Összes"
 
@@ -13641,7 +14045,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13658,91 +14062,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trendek"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Trigger"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Trigger létrehozva"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Trigger megjegyzései"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Trigger törölve"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13757,11 +14161,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13769,7 +14174,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13782,12 +14187,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13799,52 +14204,52 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13852,23 +14257,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Trigger súlyosság"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Trigger frissítve"
 
@@ -13876,40 +14289,41 @@ msgstr "Trigger frissítve"
 msgid "Trigger value"
 msgstr "Trigger érték"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Trigger-ek"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Triggerek törölve"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Trigger info"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Triggerek tömeges frissítése"
 
@@ -13917,78 +14331,78 @@ msgstr "Triggerek tömeges frissítése"
 msgid "Triggers overview"
 msgstr "Trigger áttekintés"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr ""
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Triggerek a következő súlyossággal"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Csonkolt"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr ""
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr ""
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Típus"
 
@@ -13996,62 +14410,64 @@ msgstr "Típus"
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Típus (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Számítás tipusa"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Információ típusa"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Típusok"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "ISMERETLEN"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (belépés után)"
 
@@ -14067,20 +14483,30 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr ""
 
@@ -14088,15 +14514,11 @@ msgstr ""
 msgid "USER PROFILE"
 msgstr "FELHASZNÁLÓI PROFIL"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukrán (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14104,7 +14526,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr ""
 
@@ -14117,20 +14539,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr ""
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Zárolás feloldása"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Engedélyezi a kijelölt zárolt felhasználókat?"
 
@@ -14139,29 +14561,29 @@ msgstr "Engedélyezi a kijelölt zárolt felhasználókat?"
 msgid "Units"
 msgstr "Egységek"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14171,23 +14593,20 @@ msgstr "Ismeretlen"
 msgid "Unknown action"
 msgstr "Ismeretlen eljárás"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Ismeretlen szolgáltatási státusz számítási algoritmus"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14199,23 +14618,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr "Ismeretlen forrás"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Ismeretlen érték típus"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Leválasztás"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Leválasztás és kiürítés"
 
@@ -14223,61 +14642,61 @@ msgstr "Leválasztás és kiürítés"
 msgid "Unlink from template"
 msgstr "Eltávolítás a sablonból"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14291,32 +14710,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14327,34 +14757,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Frissítés"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Frissítési gyakoriság"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Frissítési gyakoriság (másodpercekben)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Frissítve"
 
@@ -14362,55 +14792,55 @@ msgstr "Frissítve"
 msgid "Updated status of host"
 msgstr "Hoszt frissített státusza"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Feltöltés"
 
@@ -14418,14 +14848,14 @@ msgstr "Feltöltés"
 msgid "Upper level maps"
 msgstr "Felsőbb szintű térképek"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Üzemidő"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14433,9 +14863,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Üzemidő/Kiesés"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14451,84 +14881,88 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Felhasználó"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Új felhasználó felvéve"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "A felhasználó nem módosíthatja saját státuszát"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Felhasználó törölve"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Felhasználói csoport"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14545,34 +14979,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Felhasználói csoportok"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Felhasználónév"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14598,243 +15032,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Felhasználó típus"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Felhasználó frissítve"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr ""
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Felhasználók"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Felhasználók (bejelentkezve)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Felhasználói-zárolás megszüntetve"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Érték"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14869,11 +15303,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14919,10 +15353,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Érték-hozzárendelés"
 
@@ -14931,7 +15365,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14943,8 +15377,8 @@ msgstr ""
 msgid "Values"
 msgstr "Értékek"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Változók"
 
@@ -14957,64 +15391,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Függőleges igazítás"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr ""
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Figyelmezetés"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15022,65 +15461,83 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web felügyelet"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr ""
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -15088,9 +15545,9 @@ msgstr "Szerda"
 msgid "Week"
 msgstr "Hét"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Heti"
 
@@ -15098,12 +15555,12 @@ msgstr "Heti"
 msgid "When active"
 msgstr "Amikor aktív"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Szélesség"
@@ -15113,28 +15570,28 @@ msgstr "Szélesség"
 msgid "With data collection"
 msgstr "Adatgyűjtéssel"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Hiba nélkül"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Triggerekkel"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Hibásak"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Triggerek nélkül"
 
@@ -15143,7 +15600,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15156,180 +15613,165 @@ msgstr "Munkaidő"
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Írás"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "Az XML fájl hibákat tartalmaz"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Y tengely MAX érték"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Y tengely MIN érték"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Y tengely elhelyezkedése"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr ""
 
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr ""
-
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr ""
-
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr ""
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15337,96 +15779,105 @@ msgstr ""
 msgid "Year"
 msgstr "Év"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Évi"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Igen"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr ""
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr ""
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr ""
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr ""
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr ""
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15439,7 +15890,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15458,8 +15909,8 @@ msgid "Zabbix User"
 msgstr "Zabbix felhasználó"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15485,10 +15936,11 @@ msgstr "ZABBIX belső"
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr ""
@@ -15501,7 +15953,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15509,15 +15961,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "A Zabbix szerver fut"
 
@@ -15526,11 +15978,11 @@ msgstr "A Zabbix szerver fut"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr ""
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr ""
 
@@ -15538,25 +15990,20 @@ msgstr ""
 msgid "Zabbix trapper"
 msgstr "ZABBIX trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zeta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr ""
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr ""
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15565,19 +16012,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "mind"
 
@@ -15585,19 +16032,15 @@ msgstr "mind"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "már létezik"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "Kék"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "Zöld"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "Piros"
 
@@ -15609,83 +16052,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "átl"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "Y M d"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr ""
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "Y M d H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr ""
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "napok"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15707,19 +16116,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "elemek másolása..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15731,47 +16136,49 @@ msgstr ""
 msgid "executed"
 msgstr "végrehajtva"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr ""
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "talált"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr ""
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr ""
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr ""
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr ""
 
@@ -15779,7 +16186,7 @@ msgstr ""
 msgid "in"
 msgstr "ban / ben"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15789,7 +16196,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15797,20 +16204,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "utolsó"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "mint"
@@ -15819,12 +16226,12 @@ msgstr "mint"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15833,46 +16240,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr ""
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "karbantartás"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "minimum 60 másodperc"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15881,17 +16288,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "nincs adat"
@@ -15904,12 +16311,14 @@ msgstr "nem ban / ben"
 msgid "not like"
 msgstr "nem mint"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "nem fut"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "nincs kiválasztva"
 
@@ -15918,57 +16327,61 @@ msgstr "nincs kiválasztva"
 msgid "not sent"
 msgstr "nincs elküldve"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "most"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr ""
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr ""
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "frissítés minden"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15977,25 +16390,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "választás megjegyzése"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "futó"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "mp"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "mp"
 
@@ -16008,7 +16420,7 @@ msgstr "másodperc"
 msgid "sent"
 msgstr "küldve"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "rövid leírás"
 
@@ -16016,36 +16428,36 @@ msgstr "rövid leírás"
 msgid "show icon mappings"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "érték hozzárendelések"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "-nak/-nek"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "ismeretlen"
 
@@ -16057,11 +16469,11 @@ msgstr "érték"
 msgid "via"
 msgstr "keresztűl"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "é"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "éééé"
diff --git a/frontends/php/locale/id/LC_MESSAGES/frontend.po b/frontends/php/locale/id/LC_MESSAGES/frontend.po
index 32619ef8c9c..8c280a0c1b4 100644
--- a/frontends/php/locale/id/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/id/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-10-10 08:26+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -14,28 +14,30 @@ msgstr ""
 "X-Generator: Pootle 2.5.0\n"
 "X-POOTLE-MTIME: 1381386369.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" harus antara 1970.01.01 dan 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Tampilan OK memicu\" harus \"0\" atau bilangan bulat positif."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
-msgstr "\"Pemicu berkedip pada perubahan status\" harus \"0\" atau bilangan bulat positif.\"Pemicu berkedip pada perubahan status\" harus \"0\" atau bilangan bulat positif.\"Pemicu berkedip pada perubahan status\" harus \"0\" atau bilangan bulat positif.\"Pemicu berkedip pada perubahan status\" harus \"0\" atau bilangan bulat positif.\"Pemicu berkedip pada perubahan status\" harus \"0\" atau bilangan bulat positif."
+msgstr "\"Pemicu berkedip pada perubahan status\" harus \"0\" atau bilangan bulat positif."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -46,22 +48,20 @@ msgstr[0] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (tahun %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Buah"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -74,7 +74,7 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -92,23 +92,23 @@ msgid "%d device"
 msgid_plural "%d devices"
 msgstr[0] "%d perangkat"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - tak terbatas)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(dalam hari)"
 
@@ -116,34 +116,34 @@ msgstr "(dalam hari)"
 msgid "(in sec)"
 msgstr "(dalam detik)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(paling rendah 60 detik, 0 - gunakan aksi yang berlaku)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(tanpa proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[PEMBERITAHUAN DALAM JUMLAH BESAR]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 atau 1"
 
@@ -159,7 +159,7 @@ msgstr "10 detik"
 msgid "30 seconds"
 msgstr "30 detik"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "Tampilan 3D"
 
@@ -175,7 +175,7 @@ msgstr "5 detik"
 msgid "500 latest values"
 msgstr "500 isi terbaru"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -194,12 +194,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ALARM PEMBERITAHUAN"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "DAN"
 
@@ -211,19 +210,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "KETERSEDIAAN LAPORAN"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Perbedaan absolut antara nilai terakhir dan sebelumnya adalah < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Perbedaan absolut antara nilai terakhir dan sebelumnya adalah = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Perbedaan absolut antara nilai terakhir dan sebelumnya adalah > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Perbedaan absolut antara nilai terakhir dan sebelumnya adalah BUKAN N"
 
@@ -235,42 +234,42 @@ msgstr "SLA yang dapat diterima"
 msgid "Access denied!"
 msgstr "Akses ditolak!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Akun diblokir selama %s detik"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Ack"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Pemberitahuan"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Pemberitahuan ditambahkan"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Alarm pemberitahuan oleh"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Beritahu dan kembali"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Status pemberitahuan"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Pemberitahuan"
 
@@ -295,61 +294,64 @@ msgstr "Mengakui dinonaktifkan"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Tindakan"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Aksi \"%1$s\" memiliki nilai yang salah untuk \"esc_period\" (minimal %2$s detik).Aksi \"%1$s\" memiliki nilai yang salah untuk \"esc_period\" (minimal %2$s detik).Aksi \"%1$s\" memiliki nilai yang salah untuk \"esc_period\" (minimal %2$s detik).Aksi \"%1$s\" memiliki nilai yang salah untuk \"esc_period\" (minimal %2$s detik).Aksi \"%1$s\" memiliki nilai yang salah untuk \"esc_period\" (minimal %2$s detik)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Aksi ditambahkan"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Aksi dihapus"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -361,21 +363,21 @@ msgstr[0] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Aksi operasi"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Aksi diperbarui"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Aksi"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktif"
@@ -385,80 +387,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Aktif"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktif sejak"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktif sampai"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Tambah"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Tambah komentar oleh"
 
@@ -474,27 +479,23 @@ msgstr "Tambah host"
 msgid "Add link"
 msgstr "Tambah tautan"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Tambah hilang"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Tambah bentuk dasar"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Tambah ke"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Tambahkan ke favorit"
@@ -503,7 +504,7 @@ msgstr "Tambahkan ke favorit"
 msgid "Add to host group"
 msgstr "Tambahkan ke grup host"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Tambahkan ke grup host"
 
@@ -515,7 +516,7 @@ msgstr "Menambahkan"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administrasi"
 
@@ -523,34 +524,34 @@ msgstr "Administrasi"
 msgid "Advanced labels"
 msgstr "Advanced labels"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Usia"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Usia kurang dari"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Usia kurang dari %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agen"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Agen interfaces"
@@ -559,12 +560,12 @@ msgstr "Agen interfaces"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agen atau SNMP atau JMX atau IPMI interface"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "alias"
 
@@ -572,122 +573,125 @@ msgstr "alias"
 msgid "Align icons"
 msgstr "Meluruskan icon"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Semua"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Semua grup"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Semua tautan harus memiliki \"Nama\" dan \"URL\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Host yang diizinkan"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Semua"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Termasuk semua karakter string"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Aplikasi"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Aplikasi \"%1$s\" sudah tersedia."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Aplikasi ditambahkan"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Aplikasi dihapus"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Aplikasi bermasalah."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Aplikasi telah diperbarui"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Aplikasi dengan ID \"%1$s\" tidak tersedia pada \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Aplikasi"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Terapkan"
 
@@ -696,16 +700,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Menjelang"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Apr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "April"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Apakah Anda yakin ingin melakukan tindakan ini?"
 
@@ -721,9 +725,9 @@ msgstr "Luas area"
 msgid "Area type"
 msgstr "Jenis area"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -737,50 +741,47 @@ msgstr "Sebagai teks biasa"
 msgid "Asset tag"
 msgstr "Label aset"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "Pada (jam:menit)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Setidaknya satu host atau grup harus dipilih."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Setidaknya satu periode pemeliharaan harus dibuat."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audit"
@@ -800,26 +801,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Agu"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Agustus"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Otentikasi"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Algoritma otentikasi"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -878,9 +881,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Otomatis"
 
@@ -888,20 +891,20 @@ msgstr "Otomatis"
 msgid "Automatic icon mapping"
 msgstr "Pemetaan ikon otomatis"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Pemilihan ikon otomatis"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Ketersediaan"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Laporan ketersediaan"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Tersedia"
 
@@ -910,36 +913,36 @@ msgstr "Tersedia"
 msgid "Average"
 msgstr "Rata-rata"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Rata-rata berdasarkan"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Nilai rata-rata dari periode T adalah < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Nilai rata-rata dari periode T adalah = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Nilai rata-rata dari periode T adalah > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Nilai rata-rata dari periode T adalah BUKAN N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Sumbu sisi"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Latar belakang"
@@ -948,7 +951,7 @@ msgstr "Latar belakang"
 msgid "Background image"
 msgstr "Gambar latar belakang"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Grafik laporan"
 
@@ -958,8 +961,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Otentikasi dasar"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -971,15 +974,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind password"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Hitam & Biru"
 
@@ -991,8 +994,8 @@ msgstr "Berkedip"
 msgid "Blocked"
 msgstr "Diblokir"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Garis tebal"
 
@@ -1000,22 +1003,22 @@ msgstr "Garis tebal"
 msgid "Boolean"
 msgstr "Boolean"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Bawah"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Lebih terang"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Bulk pemberitahuan"
 
@@ -1041,7 +1044,7 @@ msgstr "KONFIGURASI APLIKASI"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "KONFIGURASI OTENTIKASI"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1071,7 +1074,7 @@ msgstr "KONFIGURASI GRUP HOST"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "KONFIGURASI HOST"
 
@@ -1083,7 +1086,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "KONFIGURASI IKON PEMETAAN"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "KONFIGURASI GAMBAR"
 
@@ -1092,14 +1095,14 @@ msgstr "KONFIGURASI GAMBAR"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "KONFIGURASI SERVICE ITU SENDIRI"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "KONFIGURASI PROTOTIPE ITEM"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "KONFIGURASI ITEM"
 
@@ -1128,7 +1131,7 @@ msgstr "KONFIGURASI PEMETAAN JARINGAN"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "KONFIGURASI PROXY"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "KONFIGURASI EKSPRESI REGULER"
 
@@ -1148,7 +1151,7 @@ msgstr "KONFIGURASI SKRIP"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "KONFIGURASI SLIDE SHOW"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "KONFIGURASI TEMPLATE"
 
@@ -1164,7 +1167,7 @@ msgstr "KONFIGURASI SEVERITIES TRIGGER"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "KONFIGURASI TRIGGER"
 
@@ -1196,22 +1199,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "KONFIGURASI ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1220,21 +1223,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Hitung SLA, SLA yang diterima (dalam %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Dihitung"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Hitung izin"
 
@@ -1242,92 +1245,95 @@ msgstr "Hitung izin"
 msgid "Callback"
 msgstr "Callback"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Kanada (136 karakter)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Batal"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Tidak dapat pemberitahuan event"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Tidak dapat menambah aksi"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Tidak dapat menambah aplikasi"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Tidak dapat menambah dependency dari host ke template."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Tidak dapat menambah dependency dari trigger \"%1$s:%2$s\" ke trigger yang tidak ada \"%3$s:%4$s\".Tidak dapat menambah dependency dari trigger \"%1$s:%2$s\" ke trigger yang tidak ada \"%3$s:%4$s\".Tidak dapat menambah dependency dari trigger \"%1$s:%2$s\" ke trigger yang tidak ada \"%3$s:%4$s\".Tidak dapat menambah dependency dari trigger \"%1$s:%2$s\" ke trigger yang tidak ada \"%3$s:%4$s\".Tidak dapat menambah dependency dari trigger \"%1$s:%2$s\" ke trigger yang tidak ada \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Tidak dapat menambah aturan discovery"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Tidak dapat menambah grafik"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Tidak dapat menambah grup"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Tidak dapat menambah host"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1335,24 +1341,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Tidak dapat menambah gambar"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Tidak dapat menambah gambar."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Tidak dapat menambah item"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1360,20 +1366,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr "Tidak dapat menambah macro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Tidak dapat menambah perawatan"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Tidak dapat menambah tipe media"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
-msgstr "Tidak dapat menambah lebih dari satu item dengan tipe \"Graph sum\" pada grafik \"%1$s\".Tidak dapat menambah lebih dari satu item dengan tipe \"Graph sum\" pada grafik \"%1$s\".Tidak dapat menambah lebih dari satu item dengan tipe \"Graph sum\" pada grafik \"%1$s\".Tidak dapat menambah lebih dari satu item dengan tipe \"Graph sum\" pada grafik \"%1$s\".Tidak dapat menambah lebih dari satu item dengan tipe \"Graph sum\" pada grafik \"%1$s\"."
+msgstr "Tidak dapat menambah lebih dari satu item dengan tipe \"Graph sum\" pada grafik \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1382,24 +1388,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Tidak dapat menambah peta jaringan"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Tidak dapat menambah proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Tidak dapat menambah ekspresi reguler"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Tidak dapat menambah layar"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Tidak dapat menambah skrip"
 
@@ -1411,27 +1417,27 @@ msgstr "Tidak dapat menambah service"
 msgid "Cannot add slide show"
 msgstr "Tidak dapat menambah slide show"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Tidak dapat menambah template"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Tidak dapat menambah trigger"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Tidak dapat menambah user"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Tidak dapat menambah user. Kedua password harus sama."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Tidak dapat menambah user."
 
@@ -1439,7 +1445,7 @@ msgstr "Tidak dapat menambah user."
 msgid "Cannot add value map"
 msgstr "Tidak dapat menambah nilai peta"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1459,44 +1465,44 @@ msgstr "Tidak dapat mengganti metode otentikasi ke LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Tidak dapat mengganti metode otentikasi ke Zabbix internal"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Tidak dapat membersihkan jejak"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Tidak dapat meng-klon protipe grafik."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Tidak dapat meng-klon prototipe item."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Tidak dapat meng-klon prototipe trigger."
 
 #: scripts_exec.php:70
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
-msgstr "Tidak dapat terhubung ke port penangkap dari server daemon zabbix, tetapi harus tersedia untuk menjalankan script.Tidak dapat terhubung ke port penangkap dari server daemon zabbix, tetapi harus tersedia untuk menjalankan script.Tidak dapat terhubung ke port penangkap dari server daemon zabbix, tetapi harus tersedia untuk menjalankan script.Tidak dapat terhubung ke port penangkap dari server daemon zabbix, tetapi harus tersedia untuk menjalankan script.Tidak dapat terhubung ke port penangkap dari server daemon zabbix, tetapi harus tersedia untuk menjalankan script."
+msgstr "Tidak dapat terhubung ke port penangkap dari server daemon zabbix, tetapi harus tersedia untuk menjalankan script."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Tidak dapan menyalin grafik"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Tidak dapat menyalin item"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
-msgstr "Tidak dapat menyalin trigger \"%1$s:%2$s\", karena memiliki host lebih dari satu pada ekspresi.Tidak dapat menyalin trigger \"%1$s:%2$s\", karena memiliki host lebih dari satu pada ekspresi.Tidak dapat menyalin trigger \"%1$s:%2$s\", karena memiliki host lebih dari satu pada ekspresi.Tidak dapat menyalin trigger \"%1$s:%2$s\", karena memiliki host lebih dari satu pada ekspresi.Tidak dapat menyalin trigger \"%1$s:%2$s\", karena memiliki host lebih dari satu pada ekspresi."
+msgstr "Tidak dapat menyalin trigger \"%1$s:%2$s\", karena memiliki host lebih dari satu pada ekspresi."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1505,19 +1511,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "Tidak dapat membuat koneksi database lainnya."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Tidak dapat membuat dependensi melingkar."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Tidak dapat membuat dependensi pada trigger itu sendiri."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Tidak dapat membuat aturan discovery"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Tidak dapat membuat grup host."
 
@@ -1525,101 +1531,100 @@ msgstr "Tidak dapat membuat grup host."
 msgid "Cannot create icon map"
 msgstr "Tidak dapat membuat ikon peta"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Tidak dapat membuat ikon pemetaan dengan nama yang mirip \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Tidak dapat membuat peta \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Tidak dapat membuat elemen baru"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Tidak dapat membuat layar."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
-msgstr "Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan user tersebut.Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan user tersebut.Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan user tersebut.Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan user tersebut.Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan user tersebut."
+msgstr "Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan user tersebut."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Tidak dapat menghapus aksi"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Tidak dapat menghapus aplikasi"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Tidak dapat menghapus dependency"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Tidak dapat menghapus aturan discovery"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Tidak dapat menghapus aturan discovery"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Tidak dapat menghapus grafik"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Tidak dapat menghapus prototipe grafik"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Tidak dapat menghapus grafik."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Tidak dapat menghapus grafik"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Tidak dapat menghapus grafik yang dibuat oleh discovery tingkat bawah."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Tidak dapat menghapus grup"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Tidak dapat menghapus grup"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Tidak dapat menghapus host"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Tidak dapat menghapus grup host."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1627,78 +1632,78 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "Tidak dapat menghapus peta ikon"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Tidak dapat menghapus gambar"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Tidak dapat menghapus inventaris."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Tidak dapat menghapus item"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Tidak dapat menghapus item"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Tidak dapat menghapus item yang dibuat oleh discovery tingkat bawah."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Tidak dapat menghapus perawatan"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Tidak dapat menghapus tipe media"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Tidak dapat menghapus peta jaringan"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Tidak dapat menghapus proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Tidak dapat menghapus ekspresi reguler"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Tidak dapat menghapus layar"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Tidak dapat menghapus script"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Tidak dapat menghapus script. Parameter input kosong \"scriptids\"."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
-msgstr "Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\".Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\".Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\".Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\".Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\"."
+msgstr "Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Tidak dapat menghapus aksi yang dipilih"
 
@@ -1706,77 +1711,80 @@ msgstr "Tidak dapat menghapus aksi yang dipilih"
 msgid "Cannot delete service"
 msgstr "Tidak dapat menghapus service"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Tidak dapat menghapus slide show"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Tidak dapat mengahapus template"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Tidap dapat menghapus grafik template."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Tidak dapat menghapus item template."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Tdak dapat menghapus item templated"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Tidak dapat menghapus item template."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Tidak dapat menghapus trigger template \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Tidak dapat menghapus trigger"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Tidak dapat menghapus prototipe trigger"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Tidak dapat menghapus trigger."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Tidak dapat menghapus trigger."
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Tidak dapat menghapus trigger yang dibuat oleh discovery tingkat bawah."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Tidak dapat menghapus user"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Tidak dapat menghapus media user."
 
@@ -1784,67 +1792,67 @@ msgstr "Tidak dapat menghapus media user."
 msgid "Cannot delete value map"
 msgstr "Tidak dapat menghapus nilai peta"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Tidak dapat me-non-aktifkan tipe media"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1857,123 +1865,117 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Tidak dapat mengaktifkan tipe media"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Tidak dapat menemukan gambar latar \"%1$s\" used in map \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Tidak dapat menemukan grrafik \"%1$s\" yang digunakan pada layar \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Tidak dapat menemukan grup \"%1$s\" yang digunakan di peta \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Tidak dapat menemukan grup \"%1$s\" yang digunakan pada layar \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Tidak dapat menemukan host \"%1$s\" yang digunakan di peta \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Tidak dapat menemukan host \"%1$s\" yang digunakan pada layar \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
-msgstr "Tidak dapat menemukan host interface pada \"%1$s\" untuk kunci item \"%2$s\".Tidak dapat menemukan host interface pada \"%1$s\" untuk kunci item \"%2$s\".Tidak dapat menemukan host interface pada \"%1$s\" untuk kunci item \"%2$s\".Tidak dapat menemukan host interface pada \"%1$s\" untuk kunci item \"%2$s\".Tidak dapat menemukan host interface pada \"%1$s\" untuk kunci item \"%2$s\"."
-
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
+msgstr "Tidak dapat menemukan host interface pada \"%1$s\" untuk kunci item \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -1984,78 +1986,97 @@ msgstr "Tidak dapat menemukan ikon \"%1$s\" yang digunakan pada peta \"%2$s\"."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Tidak dapat menemukan ikon peta \"%1$s\" yang digunakan pada peta \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Tidak dapat menemukan item \"%1$s\" yang digunakan pada layar \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
-msgstr "Tidak dapat menemukan peta \"%1$s\" yang digunakan pada peta \"%2$s\" yang telah diekspor.Tidak dapat menemukan peta \"%1$s\" yang digunakan pada peta \"%2$s\" yang telah diekspor.Tidak dapat menemukan peta \"%1$s\" yang digunakan pada peta \"%2$s\" yang telah diekspor.Tidak dapat menemukan peta \"%1$s\" yang digunakan pada peta \"%2$s\" yang telah diekspor.Tidak dapat menemukan peta \"%1$s\" yang digunakan pada peta \"%2$s\" yang telah diekspor."
+msgstr "Tidak dapat menemukan peta \"%1$s\" yang digunakan pada peta \"%2$s\" yang telah diekspor."
 
 #: include/classes/import/importers/CMapImporter.php:201
 #, c-format
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Tidak dapat menemukan peta \"%1$s\" yang digunakan pada peta \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Tidak dapat menemukan peta \"%1$s\" yang digunakan pada layar \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Tidak dapat menemukan objek dengan nama"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Tidak dapat menemukan layar \"%1$s\" yang digunakan pada layar \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Tidak dapat menemukan trigger \"%1$s\" yang digunakan pada peta \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2068,12 +2089,14 @@ msgstr "Tidak dapat memformat Tree. Periksa struktur logika dalam service link."
 msgid "Cannot format tree."
 msgstr "Tidak dapat memformat tree."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Tidak bisa implode ekspresi \"%s\"."
@@ -2084,58 +2107,59 @@ msgid "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
 msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
-#, fuzzy, c-format
+#: include/classes/import/importers/CTemplateImporter.php:122
+#, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
-msgstr[0] "Tidak bisa mengimpor template \"%2$s\", template \"%3$s\" yang terhubung tidak ada.Tidak bisa mengimpor template \"%2$s\", template \"%3$s\" yang terhubung tidak ada.Tidak bisa mengimpor template \"%2$s\", template \"%3$s\" yang terhubung tidak ada."
+msgstr[0] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Tidak dapat menyertakan tampilan file \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Tidak bisa memasukkan media pengguna."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Tidak dapat menghubungkan template"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Tidak bisa logout."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Tidak dapat perbarui nama host secara masal."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Tidak dapat perbarui nama host yang tampil secara masal."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Tidak mengizinkan duplakasi template ID untuk linkage: %s."
@@ -2143,7 +2167,7 @@ msgstr "Tidak mengizinkan duplakasi template ID untuk linkage: %s."
 #: include/classes/db/DB.php:801
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
-msgstr "Tidak bisa menghapus pernyataan pada tabel \"%1$s\" tanpa where condition.Tidak bisa menghapus pernyataan pada tabel \"%1$s\" tanpa where condition.Tidak bisa menghapus pernyataan pada tabel \"%1$s\" tanpa where condition.Tidak bisa menghapus pernyataan pada tabel \"%1$s\" tanpa where condition.Tidak bisa menghapus pernyataan pada tabel \"%1$s\" tanpa where condition."
+msgstr "Tidak bisa menghapus pernyataan pada tabel \"%1$s\" tanpa where condition."
 
 #: include/classes/db/DB.php:516
 #, c-format
@@ -2155,7 +2179,7 @@ msgstr "Tidak bisa perbarui pernyataan pada tabel \"%1$s\" tanpa nilai."
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Tidak bisa perbarui pernyataan pada tabel \"%1$s\" tanpa where condition."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2164,11 +2188,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2176,11 +2200,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Tidak dapat menghapus macro."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Tidak dapat merubah nama guest user."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Tidak dapat menyimpan aturan discovery tanpa pemeriksaan."
 
@@ -2189,217 +2213,226 @@ msgstr "Tidak dapat menyimpan aturan discovery tanpa pemeriksaan."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Tidak dapat merubah \"templateid\" untuk aplikasi \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Tidak dapat merubah \"templateid\" untuk layar \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Tidak dapat merubah \"templateid\" untuk prototipe trigger \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Tidak bisa merubah host untuk interface."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Tidak dapat membuka blokir user"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Tidak dapat membatalkan hubungan dan membersihkan aturan discovery"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Tidak dapat membatalkan hubungan dan membersihkan prototipe grafik"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Tidak dapat membatalkan hubungan dan membersihkan grafik."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Tidak dapat membatalkan hubungan dan membersihkan prototipe item"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Tidak dapat membatalkan hubungan dan membersihkan item"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Tidak dapat membatalkan hubungan dan membersihkan trigger"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Tidak dapat membatalkan hubungan template"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, fuzzy, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
-msgstr "Tidak dapat membatalkan hubungan trigger \"%s\", memiliki item dari template yang tersisa ke host yang terhubung.Tidak dapat membatalkan hubungan trigger \"%s\", memiliki item dari template yang tersisa ke host yang terhubung.Tidak dapat membatalkan hubungan trigger \"%s\", memiliki item dari template yang tersisa ke host yang terhubung.Tidak dapat membatalkan hubungan trigger \"%s\", memiliki item dari template yang tersisa ke host yang terhubung.Tidak dapat membatalkan hubungan trigger \"%s\", memiliki item dari template yang tersisa ke host yang terhubung."
+msgstr "Tidak dapat membatalkan hubungan trigger \"%s\", memiliki item dari template yang tersisa ke host yang terhubung."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Tidak dapat perbarui \"templateid\" untuk aplikasi \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Tidak dapat perbarui \"templateid\" untuk grafik \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Tidak dapat perbarui \"templateid\" untuk layar \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Tidak dapat perbarui \"templateid\" untuk prototipe trigger \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Tidak dapat perbarui aksi"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Tidak dapat perbarui aplikasi"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Tidak dapat perbarui komentar"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Tidak dapat perbarui konfigurasi"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Tidak dapat perbarui mode debug"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Tidak dapat perbarui aturan discovery"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Tidak dapat perbarui akses frontend"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Tidak dapat perbarui grafik"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Tidak dapat perbarui grup"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Tidak dapat perbarui grup."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Tidak dapat perbarui host"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Tidak dapat perbarui host"
 
@@ -2411,24 +2444,24 @@ msgstr "Tidak dapat perbarui icon map"
 msgid "Cannot update image"
 msgstr "Tidak dapat perbarui gambar"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Tidak dapat perbarui gambar."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Tidak dapat perbarui item"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Tidak dapat perbarui item"
 
@@ -2440,16 +2473,16 @@ msgstr "Tidak dapat perbarui macro."
 msgid "Cannot update macros"
 msgstr "Tidak dapat perbarui macro"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Tidak dapat perbarui pemeliharaan"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Tidak dapat perbarui map \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Tidak dapat perbarui tipe media"
 
@@ -2457,28 +2490,24 @@ msgstr "Tidak dapat perbarui tipe media"
 msgid "Cannot update network map"
 msgstr "Tidak dapat perbarui peta jaringan"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Tidak dapat perbarui proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Tidak dapat perbarui ekspresi regular"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Tidak dapat perbarui layar"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Tidak dapat perbarui layar."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Tidak dapat perbarui script"
 
@@ -2490,40 +2519,41 @@ msgstr "Tidak dapat perbarui service"
 msgid "Cannot update slide show"
 msgstr "Tidak dapat perbarui slide show"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Tidak dapat perbarui template"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Tidak dapat perbarui trigger"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Tidak dapat perbarui user"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Tidak dapat perbarui media user."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Tidak dapat perbarui user. Kedua password harus sama."
 
@@ -2531,15 +2561,15 @@ msgstr "Tidak dapat perbarui user. Kedua password harus sama."
 msgid "Cannot update value map"
 msgstr "Tidak dapat perbarui  nilai map"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Caption"
 
@@ -2548,47 +2578,47 @@ msgstr "Caption"
 msgid "Case sensitive"
 msgstr "Case sensitive"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Tengah"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Ubah"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Ubah"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Ubah password"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Karakter"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Termasuk string karakter"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Tidak termasuk string karakter"
 
@@ -2597,48 +2627,48 @@ msgid "Chassis"
 msgstr "Kerangka"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Pemeriksaan sudah ada."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Pemeriksaan bagian ekspresi dimulai dari \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Mohon periksa kunci. Contoh standar disahkan."
 
@@ -2647,44 +2677,44 @@ msgid "Check type"
 msgstr "Periksa tipe"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Periksa"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Pemeriksaan harus unik."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chinese (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Chinese (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Tautan melingkar tidak dapat dibuatkan untuk elemen map \"%s\"."
@@ -2699,34 +2729,35 @@ msgstr "Refensi melingkar pada map: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Referensi melingkar pada layar: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Referensi melingkar pada template: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Template linkage melingkar tidak diperbolehkan."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Klasik"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Bersih"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Bersihkan riwayat dan tren"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Bersihkan riwayat pada yang terpilih"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Bersihkan ketika membatalkan penautan"
 
@@ -2736,69 +2767,69 @@ msgstr "Jam"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Klon"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Tutup"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Tutup pembangun ekspresi"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Warna"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Warna (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Jarak kolom"
 
@@ -2813,7 +2844,7 @@ msgstr "Hasil kombinasi"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Perintah"
 
@@ -2821,41 +2852,31 @@ msgstr "Perintah"
 msgid "Command actions"
 msgstr "Aksi perintah"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Perintah tidak boleh kosong."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Perintah"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Perintah diperbarui"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Komentar"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Komersial"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Bandingkan nilai untuk banyak periode"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Menyusun izin"
 
@@ -2863,29 +2884,39 @@ msgstr "Menyusun izin"
 msgid "Condition"
 msgstr "Kondisi"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Kondisi"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3048,23 +3079,23 @@ msgstr "Konfigurasi diperbarui"
 msgid "Configure (Filter %s)"
 msgstr "Konfigurasi (Filter %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Teks konfirmasi"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Hubungkan ke"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Terhubung sebagai '%1$s'"
@@ -3122,7 +3153,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3130,30 +3161,36 @@ msgstr ""
 msgid "Contract number"
 msgstr "Nomor kontrak"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Koordinat"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Salin"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Salin yang dipilih ke ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Login yang bernar \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Tidak dapat menyimpan gambar!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Hitung"
 
@@ -3173,6 +3210,10 @@ msgstr "Buat aplikasi"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3190,7 +3231,7 @@ msgstr "Buat grafik (pilih host lebih dulu)"
 msgid "Create graph prototype"
 msgstr "Buat prototipe grafik"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Buat host"
 
@@ -3203,15 +3244,15 @@ msgstr "Buat grup host"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Buat peta icon"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Buat gambar"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Buat item"
 
@@ -3235,6 +3276,10 @@ msgstr "Buat peta"
 msgid "Create media type"
 msgstr "Buat tipe media"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Buat proxy"
@@ -3259,11 +3304,11 @@ msgstr "Buat script"
 msgid "Create slide show"
 msgstr "Buat slide show"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Buat template"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Buat trigger"
 
@@ -3287,42 +3332,42 @@ msgstr "Buat grup user"
 msgid "Create value map"
 msgstr "Buat peta nilai"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Dibuat: Aplikasi \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Dibuat: Aturan discovery \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Dibuat: Item \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Dibuat: Prototipe item \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Dibuat: Trigger \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Dibuat: Prototipe trigger \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3332,51 +3377,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Tanggal saat ini < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Tanggal saat ini = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Tanggal saat ini > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Tanggal saat ini BUKAN N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Host saat ini"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Waktu saat ini < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Waktu saat ini = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Waktu saat ini > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Waktu saat ini BUKAN N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Nilai saat ini"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3389,7 +3435,7 @@ msgstr "Custom grafik"
 msgid "Custom label"
 msgstr "Custom label"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Custom label untuk peta \"%2$s\" tipe elemen \"%1$s\" tidak mungkin kosong."
@@ -3403,7 +3449,7 @@ msgstr "Custom multiplier"
 msgid "Custom screens"
 msgstr "Custom layar"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Custom script"
 
@@ -3413,7 +3459,7 @@ msgstr "Custom severity"
 
 #: include/views/administration.general.triggerSeverity.edit.php:67
 msgid "Custom severity names affect all locales and require manual translation!"
-msgstr "Custom nama severity berdampak pada semua locales dan membutuhkan translasi manual!Custom nama severity berdampak pada semua locales dan membutuhkan translasi manual!Custom nama severity berdampak pada semua locales dan membutuhkan translasi manual!Custom nama severity berdampak pada semua locales dan membutuhkan translasi manual!Custom nama severity berdampak pada semua locales dan membutuhkan translasi manual!"
+msgstr "Custom nama severity berdampak pada semua locales dan membutuhkan translasi manual!"
 
 #: include/views/js/configuration.sysmaps.js.php:45
 msgid "Custom size"
@@ -3423,18 +3469,14 @@ msgstr "Custom ukuran"
 msgid "Custom slides"
 msgstr "Custom slides"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Czech (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "KONFIGURASI DASHBOARD"
@@ -3450,28 +3492,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "DETAIL SKRENARIO"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "NON-AKTIFKAN"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DISCOVERED"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3479,25 +3521,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Nama DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "DOWN"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Harian"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Orange gelap"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Lebih gelap"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -3509,20 +3551,21 @@ msgstr "Konfigurasi Dashboard"
 msgid "Dashboard filter"
 msgstr "Filter dashboard"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Garis putus-putus"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Data"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3545,11 +3588,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Tipe data"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "File database"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Host database"
 
@@ -3557,35 +3601,39 @@ msgstr "Host database"
 msgid "Database monitor"
 msgstr "Monitor database"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Nama database"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Password database"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Port database"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Schema database"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Server database"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Tipe database"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "User database"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Tanggal"
 
@@ -3605,53 +3653,52 @@ msgstr "Tanggal HW pemeliharaan habis"
 msgid "Date HW purchased"
 msgstr "Tanggal HW dibeli"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Hari"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Hari bulan"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Hari bulan < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Hari bulan = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Hari bulan > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Hari bulan BUKAN N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Hari minggu"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Hari minggu < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Hari minggu = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Hari minggu > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Hari minggu BUKAN N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Hari"
 
@@ -3659,22 +3706,22 @@ msgstr "Hari"
 msgid "Debug"
 msgstr "Debug"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Mode debug"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Mode debug diperbarui"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Des"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Desember"
 
@@ -3684,15 +3731,14 @@ msgstr "Desimal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Standar"
 
@@ -3705,11 +3751,11 @@ msgid "Default delay (in seconds)"
 msgstr "Standar delay (dalam detik)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Standar pesan"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Standar durasi langkah operasi"
 
@@ -3732,84 +3778,88 @@ msgstr "Standar theme \"%1$s\"."
 msgid "Delay"
 msgstr "Delay"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Delay (dalam det)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Delay oleh"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Hapus"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Hapus dan bersihkan"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
-msgstr "Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang terhubung akan dibersihkan!)Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang terhubung akan dibersihkan!)Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang terhubung akan dibersihkan!)Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang terhubung akan dibersihkan!)Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang terhubung akan dibersihkan!)"
+msgstr "Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang terhubung akan dibersihkan!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
-msgstr "Hapus dan bersihkan template? (Peringatan: semua host yang terhubung akan dibersihkan!)Hapus dan bersihkan template? (Peringatan: semua host yang terhubung akan dibersihkan!)Hapus dan bersihkan template? (Peringatan: semua host yang terhubung akan dibersihkan!)Hapus dan bersihkan template? (Peringatan: semua host yang terhubung akan dibersihkan!)Hapus dan bersihkan template? (Peringatan: semua host yang terhubung akan dibersihkan!)"
+msgstr "Hapus dan bersihkan template? (Peringatan: semua host yang terhubung akan dibersihkan!)"
 
 #: include/views/configuration.application.edit.php:55
 msgid "Delete application?"
 msgstr "Hapus aplikasi?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Hapus aksi yang berlaku?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Hapus aturan discovery?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Hapus ekspresi?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Hapus grafik?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Hapus riwayat pada skenario WEB yang terpilih?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Hapus riwayat pada item yang terpilih?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Hapus peta ikon?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Hapus item?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Hapus kata kunci?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Hapus tautan antara elemen yang dipilih?"
 
@@ -3817,11 +3867,15 @@ msgstr "Hapus tautan antara elemen yang dipilih?"
 msgid "Delete maintenance period?"
 msgstr "Hapus periode pemeliharaan?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Hapus peta jaringan?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Hapus proxy?"
 
@@ -3829,7 +3883,7 @@ msgstr "Hapus proxy?"
 msgid "Delete regular expression?"
 msgstr "Hapus ekspresi regular?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Hapus skenario?"
 
@@ -3837,71 +3891,67 @@ msgstr "Hapus skenario?"
 msgid "Delete screen?"
 msgstr "Hapus layar?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Hapus script?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Hapus yang dipilih"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Hapus skenario WEB yang dipilih?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Hapus aksi yang dipilih?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Hapus aplikasi yang dipilih?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Hapus aturan discovery yang dipilih?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Hapus elemen yang dipilih?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Hapus grafik terpilih?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Hapus grup yang dipilih?"
@@ -3910,27 +3960,27 @@ msgstr "Hapus grup yang dipilih?"
 msgid "Delete selected groups?"
 msgstr "Hapus grup yang dipilih?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Hapus grup host yang dipilih?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Hapus host yang dipilih?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Hapus host yang dipilih?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Hapus gambar yang dipilih?"
 
@@ -3938,31 +3988,31 @@ msgstr "Hapus gambar yang dipilih?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Hapus item yang dipilih?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Hapus periode pemeliharaan yang dipilih?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Hapus peta yang dipilih?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Hapus tipe media yang dipilih?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Hapus tipe media yang dipilih?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Hapus proxy yang dipilih?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Hapus ekspresi reguler yang dipilih?"
 
@@ -3970,15 +4020,15 @@ msgstr "Hapus ekspresi reguler yang dipilih?"
 msgid "Delete selected screens?"
 msgstr "Hapus layar yang dipilih?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Hapus skrip yang dipilih?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Hapus slide show yang dipilih?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Hapus template yang dipilih?"
 
@@ -3990,11 +4040,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Hapus trigger yang dipilih?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Hapus user yang dipilih?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Hapus user yang dipilih?"
 
@@ -4008,11 +4058,15 @@ msgid "Delete selected value mapping? It is used for %d item!"
 msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Hapus nilai peta yang dipilih? Ini digunakan untuk %d item!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Hapus yang dipilih dengan elemen yang terkait"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4021,15 +4075,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Hapus slide show?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Hapus template?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Hapus trigger?"
 
@@ -4037,62 +4091,62 @@ msgstr "Hapus trigger?"
 msgid "Deleted"
 msgstr "Dihapus"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Dihapus: Aplikasi \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Dihapus: Aturan discovery \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Dihapus: Grafik \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Dihapus: Host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Dihapus: Item \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Dihapus: Prototipe item \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Dihapus: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Dihapus : Template \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Dihapus: Trigger \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Dihapus: Prototipe trigger \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4101,35 +4155,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Pembatas"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (perubahan sederhana)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (kecepatan per detik)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Tolak"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Dependensi"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Tergantung"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Tergantung pada"
 
@@ -4137,30 +4191,41 @@ msgstr "Tergantung pada"
 msgid "Deployment status"
 msgstr "Status deployment"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Deskripsi"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Detail"
 
@@ -4173,71 +4238,71 @@ msgid "Device"
 msgstr "Perangkat"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Kriteria keunikan perangkat"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Selisih antara MAX dan MIN dari nilai periode T adalah < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Selisih antara MAX dan MIN dari nilai periode T adalah = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Selisih antara MAX dan MIN dari nilai periode T adalah > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Selisih antara MAX dan MIN dari nilai periode T adalah BUKAN N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Selisih antara nilai akhir dan awal, sehingga N = 1, 0 - Jika tidak"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Selisih antara nilai akhir dan awal, sehingga N BUKAN 1, 0 - Jika tidak"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Selisih antara nilai akhir dan nilai sebelumnya adalah < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Selisih antara nilai akhir dan nilai sebelumnya adalah = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Selisih antara nilai akhir dan nilai sebelumnya adalah > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Selisih antara nilai akhir dan nilai sebelumnya adalah BUKAN N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4261,48 +4326,44 @@ msgstr "Non-aktifkan mode debug pada grup yang dipilih?"
 msgid "Disable host"
 msgstr "Non-aktifkan host"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Non-aktifkan host?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Non-aktifkan host pada grup host yang dipilih?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Non-aktifkan host yang dimonitor dengan proxy yang terpilih?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Non-aktifkan yang dipilih"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Non-aktifkan skenario WEB yang dipilih?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Non-aktifkan aksi yang dipilih?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Non-aktifkan aplikasi yang dipilih?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Non-aktifkan aturan discovery yang dipilih?"
 
@@ -4310,11 +4371,11 @@ msgstr "Non-aktifkan aturan discovery yang dipilih?"
 msgid "Disable selected groups?"
 msgstr "Non-aktifkan grup yang dipilih?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Non-aktifkan host yang dipilih?"
 
@@ -4322,42 +4383,47 @@ msgstr "Non-aktifkan host yang dipilih?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Non-aktifkan item yang dipilih?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Non-aktifkan tipe media yang dipilih?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Non-aktifkan trigger yang dipilih?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Non-aktifkan"
 
@@ -4370,7 +4436,7 @@ msgstr "Bencana"
 msgid "Discovered"
 msgstr "Ditemukan"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4378,17 +4444,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "Perangkat yang ditemukan"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Penemuan"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Penemuan berdasarkan proxy"
 
@@ -4396,17 +4462,17 @@ msgstr "Penemuan berdasarkan proxy"
 msgid "Discovery check"
 msgstr "Periksa penemuan"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Periksa penemuan"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Daftar penemuan"
 
@@ -4415,65 +4481,68 @@ msgid "Discovery object"
 msgstr "Obyek penemuan"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Aturan penemuan"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
-msgstr "Aturan penemuan \"%1$s\" sudah ada pada \"%2$s\", diwarisi dari template lain.Aturan penemuan \"%1$s\" sudah ada pada \"%2$s\", diwarisi dari template lain.Aturan penemuan \"%1$s\" sudah ada pada \"%2$s\", diwarisi dari template lain.Aturan penemuan \"%1$s\" sudah ada pada \"%2$s\", diwarisi dari template lain.Aturan penemuan \"%1$s\" sudah ada pada \"%2$s\", diwarisi dari template lain."
+msgstr "Aturan penemuan \"%1$s\" sudah ada pada \"%2$s\", diwarisi dari template lain."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "Aturan penemuan \"%1$s:%2$s\" memiliki lifetime yang salah: \"%3$s\". (min: %4$d, max: %5$d, makro user dibolehkan)Aturan penemuan \"%1$s:%2$s\" memiliki lifetime yang salah: \"%3$s\". (min: %4$d, max: %5$d, makro user dibolehkan)Aturan penemuan \"%1$s:%2$s\" memiliki lifetime yang salah: \"%3$s\". (min: %4$d, max: %5$d, makro user dibolehkan)Aturan penemuan \"%1$s:%2$s\" memiliki lifetime yang salah: \"%3$s\". (min: %4$d, max: %5$d, makro user dibolehkan)Aturan penemuan \"%1$s:%2$s\" memiliki lifetime yang salah: \"%3$s\". (min: %4$d, max: %5$d, makro user dibolehkan)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Aturan penemuan \"%s\" sudah ada."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "Aturan penemuan \"%1$s:%2$s\" memiliki lifetime yang salah: \"%3$s\". (min: %4$d, max: %5$d, makro user dibolehkan)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Aturan penemuan dibuat"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Aturan penemuan dihapus"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Aturan penemuan diperbarui"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Aturan penemuan"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Aturan penemuan dihapus"
 
@@ -4485,7 +4554,7 @@ msgstr "Status penemuan"
 msgid "Display OK triggers for"
 msgstr "Tampilkan trigger OK untuk"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Menampilkan"
 
@@ -4494,32 +4563,32 @@ msgstr "Menampilkan"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Menampilkan %1$s dari %2$s yang ditemukan"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Distribusi nilai untuk multiple item"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Distribusi nilai untuk multiple periode"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Jangan dikalkulasi"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Apakah Anda ingin mengganti ekspresi kondisional?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Selesai"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Titik"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Mati"
@@ -4529,30 +4598,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Mati"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Downtime"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Geser disini untuk merubah tipe interface ke tipe \"IPMI\"."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Geser disini untuk merubah tipe interface ke tipe \"JMX\"."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Geser disini untuk merubah tipe interface ke tipe \"SNMP\"."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Geser disini untuk merubah tipe interface ke tipe \"agent\""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Menggambar gaya"
 
@@ -4570,74 +4639,75 @@ msgstr "Drowdown catatan pertama \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Dropdown ingat yang dipilih \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Duplikasi dependensi pada trigger \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Duplikasi host. Host dengan nama \"%s\" sudah ada dalam data."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Duplikasi host. Host dengan nama tampil \"%s\" sudah ada dalam data."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Duplikasi nama peta untuk peta \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Duplikasi nama severity \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Duplikasi alias user \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Durasi"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Durasi (dtk)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Dutch (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Item dinamis"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ERROR"
 
@@ -4645,13 +4715,13 @@ msgstr "ERROR"
 msgid "EVENTS"
 msgstr "EVENT"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
-msgstr "Setiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL bernamaSetiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL bernamaSetiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL bernamaSetiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL bernamaSetiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL bernama"
+msgstr "Setiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL bernama"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4659,9 +4729,9 @@ msgstr "Setiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL ber
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Ubah"
 
@@ -4669,7 +4739,7 @@ msgstr "Ubah"
 msgid "Edit map element"
 msgstr "Ubah elemen peta"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Ubah trigger"
 
@@ -4677,27 +4747,61 @@ msgstr "Ubah trigger"
 msgid "Element"
 msgstr "Elemen"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Nama elemen"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Kosong"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Kondisi aksi kosong."
 
@@ -4705,76 +4809,98 @@ msgstr "Kondisi aksi kosong."
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Masukan parameter kosong."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Masukan kosong."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Makro kosong."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Nama kosong."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Parameter kosong"
 
@@ -4783,11 +4909,11 @@ msgstr "Parameter kosong"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4795,11 +4921,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Periode waktu kosong."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Aktif"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Aktifkan konfirmasi"
 
@@ -4819,11 +4949,11 @@ msgstr "Aktifkan pemberitahuan event"
 msgid "Enable host"
 msgstr "Aktifkan host"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Aktifkan host?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Aktifkan host yang termonitor pada proxies yang terpilih?"
 
@@ -4836,36 +4966,32 @@ msgstr "Aktifkan host yang termonitor pada proxies yang terpilih?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Aktifkan yang dipilih"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Aktifkan skenario WEB yang dipilih?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Aktifkan aksi yang dipilih?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Aktifkan aplikasi yang dipilih?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Aktifkan aturan discovery yang dipilih?"
 
@@ -4873,11 +4999,11 @@ msgstr "Aktifkan aturan discovery yang dipilih?"
 msgid "Enable selected groups?"
 msgstr "Aktifkan grup yang dipilih?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Aktifkan host yang dipilih?"
 
@@ -4885,64 +5011,68 @@ msgstr "Aktifkan host yang dipilih?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Aktifkan item yang dipilih?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Aktifkan tipe media yang dipilih?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Aktifkan trigger yang dipilih?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Aktif"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "English (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "English (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Error"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Error pada permintaan pencarian untuk label \"%1$s\"."
@@ -4960,15 +5090,15 @@ msgstr "Event"
 msgid "Event ID"
 msgstr "Event ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
-msgstr "ID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N = 1, 0 - jika tidakID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N = 1, 0 - jika tidakID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N = 1, 0 - jika tidakID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N = 1, 0 - jika tidakID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N = 1, 0 - jika tidak"
+msgstr "ID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N = 1, 0 - jika tidak"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
-msgstr "ID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N BUKAN 1, 0 - jika tidakID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N BUKAN 1, 0 - jika tidakID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N BUKAN 1, 0 - jika tidakID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N BUKAN 1, 0 - jika tidakID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N BUKAN 1, 0 - jika tidak"
+msgstr "ID event dari catatan entri terakhir cocok dengan ekspresi reguler T, lalu N BUKAN 1, 0 - jika tidak"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Pemberitahuan event"
 
@@ -4977,7 +5107,7 @@ msgstr "Pemberitahuan event"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Pemberitahuan event \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Permberitahuan event dimatikan"
 
@@ -4985,7 +5115,7 @@ msgstr "Permberitahuan event dimatikan"
 msgid "Event details"
 msgstr "Detail event"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Pembuatan event"
 
@@ -5005,9 +5135,10 @@ msgstr "Detail sumber event"
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Event"
 
@@ -5015,36 +5146,41 @@ msgstr "Event"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Setiap hari"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Setiap minggu"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Kecuali"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Jalankan"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Jalankan error SQL [%1$s] pada [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Jalankan saat"
 
@@ -5052,13 +5188,13 @@ msgstr "Jalankan saat"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Skrip yang dijalankan"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Konfirmasi eksekusi"
 
@@ -5070,7 +5206,7 @@ msgstr "Perluas macro"
 msgid "Expand single problem"
 msgstr "Perluas masalah tunggal"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Pastikan JSON-rpc versi 2.0, \"%s\" yang ada."
@@ -5080,12 +5216,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Kadaluarsa"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Meledak"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Ekspor yang dipilih"
 
@@ -5093,22 +5229,22 @@ msgstr "Ekspor yang dipilih"
 msgid "Export to CSV"
 msgstr "Ekspor ke CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Ekspresi"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Ekspresi Sintaks Error."
 
@@ -5116,11 +5252,12 @@ msgstr "Ekspresi Sintaks Error."
 msgid "Expression Variable Elements"
 msgstr "Ekspresi Variabel Element"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Ekspresi tidak boleh kosong"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Pembangun ekspresi"
 
@@ -5141,17 +5278,17 @@ msgid "External check"
 msgstr "Periksa eksternal"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "PALSU"
 
@@ -5160,16 +5297,17 @@ msgstr "PALSU"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Gagal"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Gagal"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5177,40 +5315,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Kegagalan Audit"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Grafik favorit"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Peta favorit"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Layar favorit"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Favorit"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Feb"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Februari"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Field"
 
@@ -5254,19 +5392,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Field \"druleid\" diperlukan."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Field \"name\" diperlukan."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5275,13 +5413,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "File terlalu besar, ukuran maksimal upload %1$s byte."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "File yang disediakan untuk dilihat tidak ada. Coba temukan \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5289,68 +5427,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Region diisi"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Saring"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Saring berdasarkan grup host"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Saring berdasarkan nama"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
-msgstr "Cari V string dalam nilai (paling baru) terakhir. N = 1 - jika ditemukan, 0 - jika tidakCari V string dalam nilai (paling baru) terakhir. N = 1 - jika ditemukan, 0 - jika tidakCari V string dalam nilai (paling baru) terakhir. N = 1 - jika ditemukan, 0 - jika tidakCari V string dalam nilai (paling baru) terakhir. N = 1 - jika ditemukan, 0 - jika tidakCari V string dalam nilai (paling baru) terakhir. N = 1 - jika ditemukan, 0 - jika tidak"
+msgstr "Cari V string dalam nilai (paling baru) terakhir. N = 1 - jika ditemukan, 0 - jika tidak"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
-msgstr "Cari V string dalam nilai (paling baru) terakhir. N BUKAN 1 - jika ditemukan, 0 - jika tidakCari V string dalam nilai (paling baru) terakhir. N BUKAN 1 - jika ditemukan, 0 - jika tidakCari V string dalam nilai (paling baru) terakhir. N BUKAN 1 - jika ditemukan, 0 - jika tidakCari V string dalam nilai (paling baru) terakhir. N BUKAN 1 - jika ditemukan, 0 - jika tidakCari V string dalam nilai (paling baru) terakhir. N BUKAN 1 - jika ditemukan, 0 - jika tidak"
+msgstr "Cari V string dalam nilai (paling baru) terakhir. N BUKAN 1 - jika ditemukan, 0 - jika tidak"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Selesai"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Finnish (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Pertama"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Pertama"
@@ -5359,8 +5500,8 @@ msgstr "Pertama"
 msgid "Fit to map"
 msgstr "Paskan pada peta"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Tetap"
 
@@ -5370,76 +5511,80 @@ msgstr "Tetap"
 msgid "Flexible intervals"
 msgstr "Fleksibel interval"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Untuk guest, password harus kosong"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Rumus"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Keempat"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "French (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Jum"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Jumat"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Dari"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Akses frontend"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Akses frontend telah diperbarui"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Sistem pesan frontend"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Full clone"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Layar penuh"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Fungsi"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5449,50 +5594,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "Modem GSM"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Akses GUI non-aktif."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Umum"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Pembuatan dalam %s det"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "German (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5500,65 +5645,65 @@ msgid "Get support"
 msgstr "Minta bantuan"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Ekspresi yang diberikan bukan sebuah macro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Ekspresi global tidak ada."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Skrip global"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Skrip global"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Lanjut"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Lanjut ke"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5567,66 +5712,73 @@ msgid "Gradient line"
 msgstr "Garis gradasi"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Grafik"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Grafik \"%1$s\" sudah ada di \"%2$s\" (diwarisi dari template lain)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Grafik \"%1$s\" sudah ada di \"%2$s\" (item tidak identik)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Grafik \"%1$s\" sudah ada di \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
-msgstr "Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymax).Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymax).Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymax).Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymax).Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymax)."
+msgstr "Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymax)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
-msgstr "Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymin).Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymin).Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymin).Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymin).Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymin)."
+msgstr "Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\" (Nilai item Ymin)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
-msgstr "Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\".Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\".Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\".Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\".Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\"."
+msgstr "Grafik \"%1$s\" tidak dapat mewarisi. Tidak ada item yang dibutuhkan pada \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Grafik \"%1$s\" tidak ada pada template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Grafik \"%1$s\" diabaikan - aturan user."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
-msgstr "Grafik \"%1$s\" dengan item template tidak boleh mengandung item dari host lainnya.Grafik \"%1$s\" dengan item template tidak boleh mengandung item dari host lainnya.Grafik \"%1$s\" dengan item template tidak boleh mengandung item dari host lainnya.Grafik \"%1$s\" dengan item template tidak boleh mengandung item dari host lainnya.Grafik \"%1$s\" dengan item template tidak boleh mengandung item dari host lainnya."
+msgstr "Grafik \"%1$s\" dengan item template tidak boleh mengandung item dari host lainnya."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Grafik ditambahkan"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Grafik dihapus"
 
@@ -5638,54 +5790,59 @@ msgstr "Elemen grafik"
 msgid "Graph item"
 msgstr "Item grafik"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Nama grafik"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
-msgstr "Prototipe grafik \"%1$s\" dengan kerangka item tidak boleh mengandung item dari host lain.Prototipe grafik \"%1$s\" dengan kerangka item tidak boleh mengandung item dari host lain.Prototipe grafik \"%1$s\" dengan kerangka item tidak boleh mengandung item dari host lain.Prototipe grafik \"%1$s\" dengan kerangka item tidak boleh mengandung item dari host lain.Prototipe grafik \"%1$s\" dengan kerangka item tidak boleh mengandung item dari host lain."
+msgstr "Prototipe grafik \"%1$s\" dengan kerangka item tidak boleh mengandung item dari host lain."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Prototipe grafik \"%s\" dihapus."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Prototipe grafik"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5697,49 +5854,51 @@ msgstr "Prototipe grafik dari"
 msgid "Graph sum"
 msgstr "Grafik jumlah"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Tipe grafik"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Grafik diperbarui"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Grafik dengan nama \"%1$s\" sudah ada dalam grafik atau prototipe grafik."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Grafik dengan nama yang sama tetapi tipe lain sudah ada."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Grafik"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Grafik telah disalin"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Grafik telah dihapus"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Greek (el_GR)"
 
@@ -5748,54 +5907,57 @@ msgstr "Greek (el_GR)"
 msgid "Grid"
 msgstr "Kisi-kisi"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Grup"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Grup \"%1$s\" tidak ada."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Grup \"%1$s\" untuk host \"%2$s\" tidak ada."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Grup ditambah"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Grup dihapus"
+msgid_plural "Groups deleted"
+msgstr[0] "Grup dihapus"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5806,40 +5968,42 @@ msgstr "Grup untuk host yang ditemukan"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Nama grup"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Grup diperbarui"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Grup berdasarkan"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Grup"
 
@@ -5847,22 +6011,13 @@ msgstr "Grup"
 msgid "Groups in maintenance"
 msgstr "Grup dalam pemeliharaan"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5879,7 +6034,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "RANGKUMAN INVETARIS HOST"
 
@@ -5897,7 +6052,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "Otentikasi HTTP"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5918,12 +6074,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr "Hardware (Detail lengkap)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Tinggi"
@@ -5936,15 +6097,15 @@ msgstr "Bantuan"
 msgid "Hexadecimal"
 msgstr "Heksadesimal"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Tersembunyi"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Sembunyikan"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Sembunyikan semua"
 
@@ -5960,15 +6121,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Sembunyikan trigger non-aktif"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Sembunyikan yang dipilih"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -5977,23 +6138,23 @@ msgstr ""
 msgid "High"
 msgstr "Tinggi"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Riwayat"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Riwayat dibersihkan"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Pembersihan riwayat akan memakan waktu lama. Lanjutkan?"
 
@@ -6014,78 +6175,78 @@ msgstr "Riwayat event"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Luruskan horisontal"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" sudah ada."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Host \"%1$s\" dipantau dengan proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, fuzzy, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
-msgstr "Host \"%s\" setelah diperiksa memiliki parameter \"useipmi\", tetapi tidka memiliki parameter \"ipmi_ip\"! Gunakan alamat IP host sebagai alamat untuk antarmuka IPMI.Host \"%s\" setelah diperiksa memiliki parameter \"useipmi\", tetapi tidka memiliki parameter \"ipmi_ip\"! Gunakan alamat IP host sebagai alamat untuk antarmuka IPMI.Host \"%s\" setelah diperiksa memiliki parameter \"useipmi\", tetapi tidka memiliki parameter \"ipmi_ip\"! Gunakan alamat IP host sebagai alamat untuk antarmuka IPMI.Host \"%s\" setelah diperiksa memiliki parameter \"useipmi\", tetapi tidka memiliki parameter \"ipmi_ip\"! Gunakan alamat IP host sebagai alamat untuk antarmuka IPMI.Host \"%s\" setelah diperiksa memiliki parameter \"useipmi\", tetapi tidka memiliki parameter \"ipmi_ip\"! Gunakan alamat IP host sebagai alamat untuk antarmuka IPMI."
+msgstr "Host \"%s\" setelah diperiksa memiliki parameter \"useipmi\", tetapi tidka memiliki parameter \"ipmi_ip\"! Gunakan alamat IP host sebagai alamat untuk antarmuka IPMI."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Host (ascending)"
 
@@ -6097,64 +6258,66 @@ msgstr "Host IP"
 msgid "Host access"
 msgstr "Akses host"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Host ditambah"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
-msgstr "Host tidak boleh memiliki lebih dari satu default interface pada tipe yang sama.Host tidak boleh memiliki lebih dari satu default interface pada tipe yang sama.Host tidak boleh memiliki lebih dari satu default interface pada tipe yang sama.Host tidak boleh memiliki lebih dari satu default interface pada tipe yang sama.Host tidak boleh memiliki lebih dari satu default interface pada tipe yang sama."
+msgstr "Host tidak boleh memiliki lebih dari satu default interface pada tipe yang sama."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Hitung host"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Host dihapus"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Host grup"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Host grup \"%1$s\" sudah ada."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6171,14 +6334,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "Tipe label grup host"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Grup host"
 
@@ -6188,8 +6352,8 @@ msgstr "Grup host"
 msgid "Host interface"
 msgstr "Antarmuka host"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Inventaris Host"
 
@@ -6205,7 +6369,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "Tipe label host"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Daftar host"
 
@@ -6214,18 +6378,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Nama host"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6234,70 +6398,70 @@ msgstr ""
 msgid "Host networks"
 msgstr "Jaringan host"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6309,7 +6473,7 @@ msgstr ""
 msgid "Host router"
 msgstr "Router host"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Layar host"
 
@@ -6321,51 +6485,52 @@ msgstr "Status host"
 msgid "Host subnet mask"
 msgstr "Subnet mask host"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Waktu host"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Perbarui host gagal."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Host diperbarui"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Host dengan nama yang sama \"%s\" sudah ada."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Host dengan nama tampil yang sama \"%s\" sudah ada."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Host"
 
@@ -6373,11 +6538,11 @@ msgstr "Host"
 msgid "Hosts & Groups"
 msgstr "Host & Grup"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Host (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Host / template"
 
@@ -6389,37 +6554,38 @@ msgstr "Host dalam"
 msgid "Hosts in maintenance"
 msgstr "Host dalam pemeliharaan"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Info host"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Lokasi host"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Host diperbarui"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Tiap jam"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Jam"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Hungarian (hu_HU)"
 
@@ -6437,22 +6603,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6460,26 +6626,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "Alamat IP"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP dan DNS tidak boleh kosong untuk host interface."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Jarak IP"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "Jarak IP tidak boleh kosong."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6487,22 +6653,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "Agen IPMI"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "Algoritma otentikasi IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Interface IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "Password IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Tingkatan hak khusus IPMI"
 
@@ -6512,7 +6678,7 @@ msgstr "Tingkatan hak khusus IPMI"
 msgid "IPMI sensor"
 msgstr "Sensor IPMI"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI username"
 
@@ -6545,7 +6711,7 @@ msgstr "Dipendensi IT service"
 msgid "IT service parent"
 msgstr "IT service induk"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6561,25 +6727,25 @@ msgid "ITEMS"
 msgstr "ITEM"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ikon"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Ikon (default)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Ikon (non-aktif)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Ikon (pemeliharaan)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Ikon (masalah)"
 
@@ -6600,42 +6766,44 @@ msgstr "Ikon tipe label"
 msgid "Icon map"
 msgstr "Ikon peta"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Peta ikon \"%1$s\" tidak dapat dihapus. Digunakan pada peta \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Peta ikon \"%1$s\" dipetakan dengan iconid salah \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Peta ikon \"%1$s\" dipetakan dengan tautan inventory salah \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Peta ikon \"%s\" sudah ada."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Peta ikon \"%s\" tidak boleh memiliki pemetaan dengan ekspresi kosong."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, fuzzy, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
-msgstr "Peta ikon \"%s\" tidak boleh memiliki pemetaan dengan ekspresi global yang tidak ada.Peta ikon \"%s\" tidak boleh memiliki pemetaan dengan ekspresi global yang tidak ada.Peta ikon \"%s\" tidak boleh memiliki pemetaan dengan ekspresi global yang tidak ada.Peta ikon \"%s\" tidak boleh memiliki pemetaan dengan ekspresi global yang tidak ada.Peta ikon \"%s\" tidak boleh memiliki pemetaan dengan ekspresi global yang tidak ada."
+msgstr "Peta ikon \"%s\" tidak boleh memiliki pemetaan dengan ekspresi global yang tidak ada."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Peta ikon \"%s\" memiliki ekspresi yang salah."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Peta ikon \"%s\" setidaknya harus memiliki satu pemetaan."
@@ -6648,7 +6816,8 @@ msgstr "Peta ikon dibuat"
 msgid "Icon map deleted"
 msgstr "Peta ikon dihapus"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Nama peta ikon tidak boleh kosong."
 
@@ -6656,29 +6825,29 @@ msgstr "Nama peta ikon tidak boleh kosong."
 msgid "Icon map updated"
 msgstr "Peta ikon diperbarui"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Peta ikon dengan iconmapid \"%s\" tidak ada."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Pemetaan ikon"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "Entri pemetaan ikon \"%1$s\" melawan \"%2$s\" sudah ada."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Peta ikon tidak dinon-aktifkan"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Ikon"
 
@@ -6686,21 +6855,23 @@ msgstr "Ikon"
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
-msgstr "Jika menurut Anda pesan ini salah, mohon hubungi administrator Anda untuk mendapatkan izin yang diperlukan.Jika menurut Anda pesan ini salah, mohon hubungi administrator Anda untuk mendapatkan izin yang diperlukan.Jika menurut Anda pesan ini salah, mohon hubungi administrator Anda untuk mendapatkan izin yang diperlukan.Jika menurut Anda pesan ini salah, mohon hubungi administrator Anda untuk mendapatkan izin yang diperlukan.Jika menurut Anda pesan ini salah, mohon hubungi administrator Anda untuk mendapatkan izin yang diperlukan."
+msgstr "Jika menurut Anda pesan ini salah, mohon hubungi administrator Anda untuk mendapatkan izin yang diperlukan."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Gambar"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6709,7 +6880,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Gambar ditambah"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Gambar dihapus"
 
@@ -6717,12 +6888,13 @@ msgstr "Gambar dihapus"
 msgid "Image label type"
 msgstr "Gambar tipe label"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6731,66 +6903,66 @@ msgid "Image updated"
 msgstr "Gambar diperbarui"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Gambar"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Gambar untuk semua peta akan diperbarui!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Segera"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Impor"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Impor gagal"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Impor file"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Impor berhasil"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, fuzzy, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
-msgstr "Tidak memungkinkan untuk filter berdasarkan field inventori \"%s\", yang tidak ada.Tidak memungkinkan untuk filter berdasarkan field inventori \"%s\", yang tidak ada.Tidak memungkinkan untuk filter berdasarkan field inventori \"%s\", yang tidak ada.Tidak memungkinkan untuk filter berdasarkan field inventori \"%s\", yang tidak ada.Tidak memungkinkan untuk filter berdasarkan field inventori \"%s\", yang tidak ada."
+msgstr "Tidak memungkinkan untuk filter berdasarkan field inventori \"%s\", yang tidak ada."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Tidak memungkinkan untuk menghapus baris dan kolom terakhir."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "Dalam"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "Dalam grup"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Dalam grup"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6803,244 +6975,282 @@ msgstr "Dalam pemeliharaan"
 msgid "In progress"
 msgstr "Dalam proses"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Termasuk"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Nilai \"soft\" field salah untuk dependensi untuk service \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Nilai tipe label %1$s salah untuk peta \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Range IP \"%s\" salah."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "SNMP OID salah."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Komunitas SNMP salah."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "SLA yang dapat diterima untuk service \"%1$s\" salah."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Aksi kondisi pemeriksa penemuan salah."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
-msgstr "Aksi kondisi pemeriksa penemuan salah. Pemeriksa penemuan tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi pemeriksa penemuan salah. Pemeriksa penemuan tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi pemeriksa penemuan salah. Pemeriksa penemuan tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi pemeriksa penemuan salah. Pemeriksa penemuan tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi pemeriksa penemuan salah. Pemeriksa penemuan tidak ada atau Anda tidak memiliki akses untuk itu."
+msgstr "Aksi kondisi pemeriksa penemuan salah. Pemeriksa penemuan tidak ada atau Anda tidak memiliki akses untuk itu."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
-msgstr "Aksi kondisi aturan penemuan salah. Aturan penemuan tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi aturan penemuan salah. Aturan penemuan tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi aturan penemuan salah. Aturan penemuan tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi aturan penemuan salah. Aturan penemuan tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi aturan penemuan salah. Aturan penemuan tidak ada atau Anda tidak memiliki akses untuk itu."
+msgstr "Aksi kondisi aturan penemuan salah. Aturan penemuan tidak ada atau Anda tidak memiliki akses untuk itu."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Aksi kondisi status penemuan salah."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
-msgstr "Aksi kondisi grup host salah. Grup host tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi grup host salah. Grup host tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi grup host salah. Grup host tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi grup host salah. Grup host tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi grup host salah. Grup host tidak ada atau Anda tidak memiliki akses untuk itu."
+msgstr "Aksi kondisi grup host salah. Grup host tidak ada atau Anda tidak memiliki akses untuk itu."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
-msgstr "Aksi kondisi host salah. Host tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi host salah. Host tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi host salah. Host tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi host salah. Host tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi host salah. Host tidak ada atau Anda tidak memiliki akses untuk itu."
+msgstr "Aksi kondisi host salah. Host tidak ada atau Anda tidak memiliki akses untuk itu."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
-msgstr "Aksi kondisi proxy salah. Proxy tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi proxy salah. Proxy tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi proxy salah. Proxy tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi proxy salah. Proxy tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi proxy salah. Proxy tidak ada atau Anda tidak memiliki akses untuk itu."
+msgstr "Aksi kondisi proxy salah. Proxy tidak ada atau Anda tidak memiliki akses untuk itu."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
-msgstr "Aksi kondisi template salah. Template tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi template salah. Template tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi template salah. Template tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi template salah. Template tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi template salah. Template tidak ada atau Anda tidak memiliki akses untuk itu."
+msgstr "Aksi kondisi template salah. Template tidak ada atau Anda tidak memiliki akses untuk itu."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
-msgstr "Aksi kondisi trigger salah. Trigger tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi trigger salah. Trigger tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi trigger salah. Trigger tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi trigger salah. Trigger tidak ada atau Anda tidak memiliki akses untuk itu.Aksi kondisi trigger salah. Trigger tidak ada atau Anda tidak memiliki akses untuk itu."
+msgstr "Aksi kondisi trigger salah. Trigger tidak ada atau Anda tidak memiliki akses untuk itu."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Aksi kondisi tipe salah."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Aksi kondisi  id salah."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Aksi operasi tipe perintah salah."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Kesalahan aksi kondisi pengoperasian tipe pemberitahuan."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Kesalahan aksi operasi tipe kondisi."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Kesalahan aksi operasi nilai langkah eskalasi."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
-msgstr "Kesalahan aksi operasi grup host. Grup host tidak ada atau Anda tidak memiliki akses ke grup host ini.Kesalahan aksi operasi grup host. Grup host tidak ada atau Anda tidak memiliki akses ke grup host ini.Kesalahan aksi operasi grup host. Grup host tidak ada atau Anda tidak memiliki akses ke grup host ini.Kesalahan aksi operasi grup host. Grup host tidak ada atau Anda tidak memiliki akses ke grup host ini.Kesalahan aksi operasi grup host. Grup host tidak ada atau Anda tidak memiliki akses ke grup host ini."
+msgstr "Kesalahan aksi operasi grup host. Grup host tidak ada atau Anda tidak memiliki akses ke grup host ini."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
-msgstr "Kesalahan aksi operasi host. Host tidak ada atau Anda tidak memiliki akses ke host ini.Kesalahan aksi operasi host. Host tidak ada atau Anda tidak memiliki akses ke host ini.Kesalahan aksi operasi host. Host tidak ada atau Anda tidak memiliki akses ke host ini.Kesalahan aksi operasi host. Host tidak ada atau Anda tidak memiliki akses ke host ini.Kesalahan aksi operasi host. Host tidak ada atau Anda tidak memiliki akses ke host ini."
+msgstr "Kesalahan aksi operasi host. Host tidak ada atau Anda tidak memiliki akses ke host ini."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Kesalahan aksi operasi port \"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Kesalahan aksi operasi durasi langkah."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Kesalahan tipe aksi operasi."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
-msgstr "Kesalahan aksi operasi grup user. Grup user tidak ada atau Anda tidak memiliki akses ke grup user ini.Kesalahan aksi operasi grup user. Grup user tidak ada atau Anda tidak memiliki akses ke grup user ini.Kesalahan aksi operasi grup user. Grup user tidak ada atau Anda tidak memiliki akses ke grup user ini.Kesalahan aksi operasi grup user. Grup user tidak ada atau Anda tidak memiliki akses ke grup user ini.Kesalahan aksi operasi grup user. Grup user tidak ada atau Anda tidak memiliki akses ke grup user ini."
+msgstr "Kesalahan aksi operasi grup user. Grup user tidak ada atau Anda tidak memiliki akses ke grup user ini."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
-msgstr "Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki akses ke user ini.Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki akses ke user ini.Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki akses ke user ini.Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki akses ke user ini.Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki akses ke user ini."
+msgstr "Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki akses ke user ini."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Kesalahan akasi operasi id."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Kesalahan algoritma untuk service \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Kesalahan pelolosan argumen ke fungsi"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Kesalahan pelolosan argumen ke fungsi."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Kesalahan pelolosan argumen ke metode."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Kesalahan hitung nilai SLA untuk service \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Kesalahan karakter yang digunakan untuk nama host \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Kesalahan delay."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7050,24 +7260,24 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
 #: include/classes/db/DB.php:534 include/classes/db/DB.php:808
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
-msgstr "Kesalahan nama field \"%1$s\" atau nilai pada statemen where untuk tabel \"%2$s\".Kesalahan nama field \"%1$s\" atau nilai pada statemen where untuk tabel \"%2$s\".Kesalahan nama field \"%1$s\" atau nilai pada statemen where untuk tabel \"%2$s\".Kesalahan nama field \"%1$s\" atau nilai pada statemen where untuk tabel \"%2$s\".Kesalahan nama field \"%1$s\" atau nilai pada statemen where untuk tabel \"%2$s\"."
+msgstr "Kesalahan nama field \"%1$s\" atau nilai pada statemen where untuk tabel \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Kesalahan field untuk trigger."
 
@@ -7075,74 +7285,100 @@ msgstr "Kesalahan field untuk trigger."
 msgid "Incorrect file upload."
 msgstr "Kesalahan file upload."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Kesalahan interval flexible \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
-msgstr "Kesalahan interval fleksibel dalam item \"%1$s\". Interval fleksibel harus string.Kesalahan interval fleksibel dalam item \"%1$s\". Interval fleksibel harus string.Kesalahan interval fleksibel dalam item \"%1$s\". Interval fleksibel harus string.Kesalahan interval fleksibel dalam item \"%1$s\". Interval fleksibel harus string.Kesalahan interval fleksibel dalam item \"%1$s\". Interval fleksibel harus string."
+msgstr "Kesalahan interval fleksibel dalam item \"%1$s\". Interval fleksibel harus string."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Kesalahan fungsi telah digunakan"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Kesalahan grup host."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7150,182 +7386,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr "Kesalahan indeks gambar."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Kesalahan parameter interface DNS \"%s\" yang disediakan."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Kesalahan parameter IP interface \"%s\" yang disediakan."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Kesalahan port interface \"%s\" yang disediakan."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Kesalahan field inventori \"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Kesalahan item untuk nilai axis."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
-msgstr "Kesalahan item key \"%1$s\" disediakan untuk ekspresi trigger pada \"%2$s\".Kesalahan item key \"%1$s\" disediakan untuk ekspresi trigger pada \"%2$s\".Kesalahan item key \"%1$s\" disediakan untuk ekspresi trigger pada \"%2$s\".Kesalahan item key \"%1$s\" disediakan untuk ekspresi trigger pada \"%2$s\".Kesalahan item key \"%1$s\" disediakan untuk ekspresi trigger pada \"%2$s\"."
+msgstr "Kesalahan item key \"%1$s\" disediakan untuk ekspresi trigger pada \"%2$s\"."
+
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Kesalahan key."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Kesalahan daftar item."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Kesalahan pemeliharaan - tanggal harus antara 1970.01.01 dan 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Kesalahan waktu pemeliharaan"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Kesalahan pemeliharaan periode waktu"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Kesalahan pemeliharaan hari mingguan"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Kesalahan pemeliharaan periode bulan"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Kesalahan pemeliharaan periode"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Kesalahan periode pemeliharaan (minimum 5 menit)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Kesalahan periode minggu pemeliharaan"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Kesalahan nilai tinggi peta untuk peta \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Kesalahan nilai lebar peta untuk peta \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Kesalahan parameter untuk operasi."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Kesalahan parameter yang digunakan untuk peta ikon \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Kesalahan parameter untuk kondisi."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Kesalahan parameter untuk metode perbaruan peta ikon \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Kesalahan parameter untuk pemeliharaan."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Kesalahan parameter untuk grup user."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Kesalahan induk untuk service \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Kesalahan service induk."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Kesalahan range port."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Kesalahan proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Kesalahan tipe sumber yang disediakan untuk item layar."
 
@@ -7334,64 +7589,68 @@ msgstr "Kesalahan tipe sumber yang disediakan untuk item layar."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Kesalahan layar yang disediakan untuk slide show."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Kesalahan waktu akhir service."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Kesalahan waktu mulai service."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Kesalahan tipe waktu service."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Kesalahan sorder pengurutan untuk service \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Kesalahan status untuk service \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Kesalahan status."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7399,12 +7658,12 @@ msgstr ""
 #: include/classes/validators/CTimePeriodValidator.php:99
 #, c-format
 msgid "Incorrect time period \"%1$s\" start day must be less or equal to end day."
-msgstr "Kesalahan periode waktu \"%1$s\" hari pertama harus lebih kecil atau sama dengan dari hari akhir.Kesalahan periode waktu \"%1$s\" hari pertama harus lebih kecil atau sama dengan dari hari akhir.Kesalahan periode waktu \"%1$s\" hari pertama harus lebih kecil atau sama dengan dari hari akhir.Kesalahan periode waktu \"%1$s\" hari pertama harus lebih kecil atau sama dengan dari hari akhir.Kesalahan periode waktu \"%1$s\" hari pertama harus lebih kecil atau sama dengan dari hari akhir."
+msgstr "Kesalahan periode waktu \"%1$s\" hari pertama harus lebih kecil atau sama dengan dari hari akhir."
 
 #: include/classes/validators/CTimePeriodValidator.php:105
 #, c-format
 msgid "Incorrect time period \"%1$s\" start time must be less than end time."
-msgstr "Kesalahan periode waktu \"%1$s\" waktu mulai harus lebih kecil dan waktu akhir.Kesalahan periode waktu \"%1$s\" waktu mulai harus lebih kecil dan waktu akhir.Kesalahan periode waktu \"%1$s\" waktu mulai harus lebih kecil dan waktu akhir.Kesalahan periode waktu \"%1$s\" waktu mulai harus lebih kecil dan waktu akhir.Kesalahan periode waktu \"%1$s\" waktu mulai harus lebih kecil dan waktu akhir."
+msgstr "Kesalahan periode waktu \"%1$s\" waktu mulai harus lebih kecil dan waktu akhir."
 
 #: include/classes/validators/CTimePeriodValidator.php:89
 #: include/classes/validators/CTimePeriodValidator.php:94
@@ -7412,52 +7671,57 @@ msgstr "Kesalahan periode waktu \"%1$s\" waktu mulai harus lebih kecil dan waktu
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Kesalahan periode waktu \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Kesalahan ID trigger untuk service \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Kesalahan ekspresi trigger"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Kesalahan ekspresi trigger."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
-msgstr "Kesalahan ekspresi trigger. Host \"%1$s\" tidak ada atau Anda tidak memiliki akses ke host tersebut.Kesalahan ekspresi trigger. Host \"%1$s\" tidak ada atau Anda tidak memiliki akses ke host tersebut.Kesalahan ekspresi trigger. Host \"%1$s\" tidak ada atau Anda tidak memiliki akses ke host tersebut.Kesalahan ekspresi trigger. Host \"%1$s\" tidak ada atau Anda tidak memiliki akses ke host tersebut.Kesalahan ekspresi trigger. Host \"%1$s\" tidak ada atau Anda tidak memiliki akses ke host tersebut."
+msgstr "Kesalahan ekspresi trigger. Host \"%1$s\" tidak ada atau Anda tidak memiliki akses ke host tersebut."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, fuzzy, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
-msgstr "Kesalahan ekspresi trigger. Host \"%s\" tidak ada atau Anda tidak memiliki akses ke host tersebut.Kesalahan ekspresi trigger. Host \"%s\" tidak ada atau Anda tidak memiliki akses ke host tersebut.Kesalahan ekspresi trigger. Host \"%s\" tidak ada atau Anda tidak memiliki akses ke host tersebut.Kesalahan ekspresi trigger. Host \"%s\" tidak ada atau Anda tidak memiliki akses ke host tersebut.Kesalahan ekspresi trigger. Host \"%s\" tidak ada atau Anda tidak memiliki akses ke host tersebut."
+msgstr "Kesalahan ekspresi trigger. Host \"%s\" tidak ada atau Anda tidak memiliki akses ke host tersebut."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
-msgstr "Kesalahan ekspresi trigger. Elemen ekspresi trigger tidak seharusnya menjadi miliki template dan host secara bersamaan.Kesalahan ekspresi trigger. Elemen ekspresi trigger tidak seharusnya menjadi miliki template dan host secara bersamaan.Kesalahan ekspresi trigger. Elemen ekspresi trigger tidak seharusnya menjadi miliki template dan host secara bersamaan.Kesalahan ekspresi trigger. Elemen ekspresi trigger tidak seharusnya menjadi miliki template dan host secara bersamaan.Kesalahan ekspresi trigger. Elemen ekspresi trigger tidak seharusnya menjadi miliki template dan host secara bersamaan."
+msgstr "Kesalahan ekspresi trigger. Elemen ekspresi trigger tidak seharusnya menjadi miliki template dan host secara bersamaan."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Kesalahan fungsi trigger \"%1$s\" disediakan dalam ekspresi."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Kesalahan tipe dari asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Kesalahan grup user."
 
@@ -7466,7 +7730,8 @@ msgstr "Kesalahan grup user."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7486,7 +7751,7 @@ msgstr "Kesalahan nilai \"%1$s\" untuk field int \"%2$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Kesalahan nilai \"%1$s\" untuk field int yang tidak ditandai \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7496,43 +7761,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Kesalahan nilai untuk setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Kesalahan waktu kerja."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Kesalahan item y max untuk grafik \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Kesalahan item y min untuk grafik \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonesian (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Info"
 
@@ -7541,15 +7812,15 @@ msgstr "Info"
 msgid "Information"
 msgstr "Informasi"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Sisipkan"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Sisipkan makro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Instalasi"
 
@@ -7557,31 +7828,32 @@ msgstr "Instalasi"
 msgid "Installer name"
 msgstr "Nama installer"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interface"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Interface terhubung ke item \"%1$s\" pada \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Interface digunakan oleh item yang memerlukan tipe interface ini."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "Interface dengan DNS \"%1$s\" alamat IP tidak boleh kosong."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
-msgstr "Interface dengan IP \"%1$s\" tidak boleh mengosongkan nama DNS ketika memiliki \"Use DNS\" properti pada \"%2$s\".Interface dengan IP \"%1$s\" tidak boleh mengosongkan nama DNS ketika memiliki \"Use DNS\" properti pada \"%2$s\".Interface dengan IP \"%1$s\" tidak boleh mengosongkan nama DNS ketika memiliki \"Use DNS\" properti pada \"%2$s\".Interface dengan IP \"%1$s\" tidak boleh mengosongkan nama DNS ketika memiliki \"Use DNS\" properti pada \"%2$s\".Interface dengan IP \"%1$s\" tidak boleh mengosongkan nama DNS ketika memiliki \"Use DNS\" properti pada \"%2$s\"."
+msgstr "Interface dengan IP \"%1$s\" tidak boleh mengosongkan nama DNS ketika memiliki \"Use DNS\" properti pada \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "Interface dengan IP \"%1$s\" nama DNS tidak boleh kosong."
@@ -7601,7 +7873,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Internal JSON-RPC error."
 
@@ -7609,7 +7881,7 @@ msgstr "Internal JSON-RPC error."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Internal error."
 
@@ -7622,19 +7894,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Interval"
 
@@ -7644,112 +7916,114 @@ msgstr "Interval"
 msgid "Interval (in sec)"
 msgstr "Interval (dalam det)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "JSON tidak sah. Terjadi kesalahan pada server saat parsing teks JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Permintaan tidak sah."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Hostid tidak sah untuk makro \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Metode parameter tidak sah."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Params tidak sah."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Kode respon \"%1$s\" tidak sah."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Range kode respon \"%1$s\" tidak sah."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Periode waktu tidak sah"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, fuzzy, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
-msgstr "Pemberian nama view \"%s\" tidak sah. Karakter yang dibolehkan: \"a-z\" dan \".\".Pemberian nama view \"%s\" tidak sah. Karakter yang dibolehkan: \"a-z\" dan \".\".Pemberian nama view \"%s\" tidak sah. Karakter yang dibolehkan: \"a-z\" dan \".\".Pemberian nama view \"%s\" tidak sah. Karakter yang dibolehkan: \"a-z\" dan \".\".Pemberian nama view \"%s\" tidak sah. Karakter yang dibolehkan: \"a-z\" dan \".\"."
+msgstr "Pemberian nama view \"%s\" tidak sah. Karakter yang dibolehkan: \"a-z\" dan \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7758,7 +8032,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Field inventaris"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Mode inventaris"
 
@@ -7766,12 +8040,12 @@ msgstr "Mode inventaris"
 msgid "Is online?"
 msgstr "Apakah online?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Isu"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Tidak memungkinkan untuk menyaring berdasarkan password user."
 
@@ -7779,70 +8053,71 @@ msgstr "Tidak memungkinkan untuk menyaring berdasarkan password user."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Tidak memungkinkan untuk logout melalui otentikasi HTTP."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Tidak memungkinkan untuk mencari dengan password user."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italian (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Item"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Item \"%1$s\" sudah ada di \"%2$s\", mewarisi dari template lain."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Item \"%1$s\" tidak bisa diisi field nomor \"%2$d\" inventori host hilang . Pilihannya : dari 0 (jangan diisi) ke %3$d.Item \"%1$s\" tidak bisa diisi field nomor \"%2$d\" inventori host hilang . Pilihannya : dari 0 (jangan diisi) ke %3$d.Item \"%1$s\" tidak bisa diisi field nomor \"%2$d\" inventori host hilang . Pilihannya : dari 0 (jangan diisi) ke %3$d.Item \"%1$s\" tidak bisa diisi field nomor \"%2$d\" inventori host hilang . Pilihannya : dari 0 (jangan diisi) ke %3$d.Item \"%1$s\" tidak bisa diisi field nomor \"%2$d\" inventori host hilang . Pilihannya : dari 0 (jangan diisi) ke %3$d."
+msgstr "Item \"%1$s\" tidak bisa diisi field nomor \"%2$d\" inventori host hilang . Pilihannya : dari 0 (jangan diisi) ke %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Item \"%1$s\" tidak ada di template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Item \"%1$s\" tidak ada."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Item \"%1$s\" pada \"%2$s\": aplikasi \"%3$s\" tidak ada."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Item \"%1$s\" diabaikan - aturan user."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Item \"\"%1$s:%2$s\" memiliki port yang salah: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Item ditambah"
 
@@ -7850,16 +8125,16 @@ msgstr "Item ditambah"
 msgid "Item count"
 msgstr "Item hitung"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Item dihapus"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7872,54 +8147,54 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Item prototipe"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Item prototipe"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7927,92 +8202,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Item prototipe dari"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Item diperbarui"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Item menggunakan interface host dari yang bukan host induk."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Item menggunakan tipe inferface yang salah."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
-msgstr "Item tidak akan disegarkan. Mohon masukkan pembaruan interval yang benar.Item tidak akan disegarkan. Mohon masukkan pembaruan interval yang benar.Item tidak akan disegarkan. Mohon masukkan pembaruan interval yang benar.Item tidak akan disegarkan. Mohon masukkan pembaruan interval yang benar.Item tidak akan disegarkan. Mohon masukkan pembaruan interval yang benar."
+msgstr "Item tidak akan disegarkan. Mohon masukkan pembaruan interval yang benar."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai aturan discovery."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
-msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah item yang dibuat dari protipe item.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah item yang dibuat dari protipe item.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah item yang dibuat dari protipe item.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah item yang dibuat dari protipe item.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah item yang dibuat dari protipe item."
+msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah item yang dibuat dari protipe item."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
-msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah prototipe item.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah prototipe item.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah prototipe item.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah prototipe item.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah prototipe item."
+msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah prototipe item."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai sebuah item."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
-msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai elemen item yang tidak diketahui.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai elemen item yang tidak diketahui.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai elemen item yang tidak diketahui.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai elemen item yang tidak diketahui.Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai elemen item yang tidak diketahui."
+msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\" sebagai elemen item yang tidak diketahui."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Item"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Item (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Item disalin"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Item dihapus"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Daftar item"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Item diperbarui"
 
@@ -8024,72 +8299,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "Agen JMX"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "Interface JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Generasi JSON-rpc gagal. Tidak ada error \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "Metode JSON-rps tidak didefinisikan."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "Params JSON-rpc bukan sebagai Array."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "Versi JSON-rps tidak ditentukan."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber identifier"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Januari"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japanese (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Jul"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Juli"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Jun"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Juni"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8098,40 +8373,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Simpan periode kehilangan sumber daya (dalam hari)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Kunci"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
-msgstr "Kunci \"%1$s\" tidak cocok <grpmax|grpmin|grpsum|grpavg>[\"Grup host\", \"Kunci item\", \"<last|min|max|avg|sum|count>\", \"parameter\"].Kunci \"%1$s\" tidak cocok <grpmax|grpmin|grpsum|grpavg>[\"Grup host\", \"Kunci item\", \"<last|min|max|avg|sum|count>\", \"parameter\"].Kunci \"%1$s\" tidak cocok <grpmax|grpmin|grpsum|grpavg>[\"Grup host\", \"Kunci item\", \"<last|min|max|avg|sum|count>\", \"parameter\"].Kunci \"%1$s\" tidak cocok <grpmax|grpmin|grpsum|grpavg>[\"Grup host\", \"Kunci item\", \"<last|min|max|avg|sum|count>\", \"parameter\"].Kunci \"%1$s\" tidak cocok <grpmax|grpmin|grpsum|grpavg>[\"Grup host\", \"Kunci item\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
+msgstr "Kunci \"%1$s\" tidak cocok <grpmax|grpmin|grpsum|grpavg>[\"Grup host\", \"Kunci item\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Kunci passphrase"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Kata kunci"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Korean (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "DATA TERBARU"
 
@@ -8162,37 +8437,37 @@ msgstr "Login LDAP berhasil"
 msgid "LDAP login was not successful"
 msgstr "Login LDAP gagal"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOKAL"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "HILANG"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Label"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Label lokasi"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Bahasa"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Terakhir"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Terakhir"
@@ -8203,19 +8478,19 @@ msgid "Last %1$d issue"
 msgid_plural "Last %1$d issues"
 msgstr[0] "Isu terakhir %1$d"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Terbaru nilai T < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Terbaru nilai T = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Terbaru nilai T > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Terbaru nilai T BUKAN N"
 
@@ -8235,28 +8510,28 @@ msgstr "365 hari terakhir"
 msgid "Last 7 days"
 msgstr "7 hari terakhir"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Perubahan terakhir"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Perubahan terakhir (descending)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Permeriksaan terakhir"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Grafik jam terakhir"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Grafik bulan terakhir"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Terakhir dari"
 
@@ -8264,66 +8539,67 @@ msgstr "Terakhir dari"
 msgid "Last seen (age)"
 msgstr "Terakhir terlihat (umur)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Nilai terakhir"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Grafik minggu terakhir"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Data terbaru"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Event terakhir"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Latvian (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Kiri"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legenda"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Panjang dari nilai T terbaru dalam karakter < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Panjang dari nilai T terbaru dalam karakter = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Panjang dari nilai T terbaru dalam karakter > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Panjang dari nilai T terbaru dalam karakter BUKAN N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Garis"
 
@@ -8331,39 +8607,29 @@ msgstr "Garis"
 msgid "Link"
 msgstr "Tautan"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Indikator tautan"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Nama tautan harus unik untuk peta \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
-msgstr "Field tautan selementid1 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\".Field tautan selementid1 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\".Field tautan selementid1 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\".Field tautan selementid1 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\".Field tautan selementid1 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\"."
+msgstr "Field tautan selementid1 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
-msgstr "Field tautan selementid2 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\".Field tautan selementid2 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\".Field tautan selementid2 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\".Field tautan selementid2 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\".Field tautan selementid2 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\"."
-
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Tautan harus miliki kedua field \"nama\" dan \"url\" untuk peta \"%s\"."
+msgstr "Field tautan selementid2 mengarah kepada peta yang tidak ada selement ID \"%1$s\" untuk peta \"%2$s\"."
 
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Template tautan"
 
@@ -8375,50 +8641,50 @@ msgstr "Tautan ke template"
 msgid "Link to templates"
 msgstr "Tautan ke template"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Tautan dengan template"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Template terhubung"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Terhubung ke"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Hubungan antara elemen yang dipilih"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Hubungan untuk elemen yang dipilih"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Daftar kosong"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Loading..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Waktu lokal"
 
@@ -8435,36 +8701,36 @@ msgid "Location longitude"
 msgstr "Longitude lokasi"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "Log keparahan dari entri log terakhir adalah < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "Log keparahan dari entri log terakhir adalah = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "Log keparahan dari entri log terakhir adalah > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "Log keparahan dari entri log terakhir adalah BUKAN N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
-msgstr "Log sumber dari entri log terakhir cocok dengan parameter T, maka N = 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N = 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N = 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N = 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N = 1, 0 - jika tidak"
+msgstr "Log sumber dari entri log terakhir cocok dengan parameter T, maka N = 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N = 1, 0 - jika tidak"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
-msgstr "Log sumber dari entri log terakhir cocok dengan parameter T, maka N BUKAN 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N BUKAN 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N BUKAN 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N BUKAN 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N BUKAN 1, 0 - jika tidak"
+msgstr "Log sumber dari entri log terakhir cocok dengan parameter T, maka N BUKAN 1, 0 - jika tidakLog sumber dari entri log terakhir cocok dengan parameter T, maka N BUKAN 1, 0 - jika tidak"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Log format waktu"
@@ -8473,12 +8739,12 @@ msgstr "Log format waktu"
 msgid "Log unmatched SNMP traps"
 msgstr "Log jebakan SNMP yang tidak sama"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Masuk sebagai"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8489,12 +8755,12 @@ msgstr "Login"
 msgid "Login as Guest"
 msgstr "Login sebagai Guest"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Login gagal \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8503,8 +8769,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Login nama atau passwordk salah."
 
@@ -8525,22 +8792,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8552,7 +8815,7 @@ msgstr "Alamat MAC A"
 msgid "MAC address B"
 msgstr "Alamat MAC B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "PEMELIHARAAN"
 
@@ -8577,49 +8840,49 @@ msgstr "TRIGGER TERSIBUK 100 TERATAS"
 msgid "Macro"
 msgstr "Makro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" sudah ada pada \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" sudah ada."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "Makro \"%1$s\" tidak unik."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Nilai makro \"%1$s\" terlalu panjang, tidak boleh melebihi 255 karakter."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Nama makro \"%1$s\" terlalu panjang, tidak boleh melebihi 64 karakter."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "Makro dengan globalmacroid \"%1$s\" tidak ada."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Makro dengan hostmacroid \"%1$s\" tidak ada."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Makro"
 
@@ -8627,31 +8890,36 @@ msgstr "Makro"
 msgid "Macros updated"
 msgstr "Makro diperbarui"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Pemeliharaan"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Pemeliharaan \"%s\" sudah ada."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
-msgstr "Pemeliharaan \"Aktif sejak\" nilai tidak boleh lebih besar dari \"Aktif sampai\".Pemeliharaan \"Aktif sejak\" nilai tidak boleh lebih besar dari \"Aktif sampai\".Pemeliharaan \"Aktif sejak\" nilai tidak boleh lebih besar dari \"Aktif sampai\".Pemeliharaan \"Aktif sejak\" nilai tidak boleh lebih besar dari \"Aktif sampai\".Pemeliharaan \"Aktif sejak\" nilai tidak boleh lebih besar dari \"Aktif sampai\"."
+msgstr "Pemeliharaan \"Aktif sejak\" nilai tidak boleh lebih besar dari \"Aktif sampai\".Pemeliharaan \"Aktif sejak\" nilai tidak boleh lebih besar dari \"Aktif sampai\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Pemeliharaan ditambah"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Pemeliharan dihapus"
 
@@ -8659,7 +8927,7 @@ msgstr "Pemeliharan dihapus"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Panjang periode pemeliharaan"
 
@@ -8675,25 +8943,25 @@ msgstr "Status pemeliharaan"
 msgid "Maintenance type"
 msgstr "Tipe pemeliharaan"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Pemeliharaan diperbarui"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Pemeliharaan dengan koleksi data"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Pemeliharaan tanpa koleksi data"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Parameter wajib telah hilang."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Manual"
 
@@ -8704,12 +8972,12 @@ msgstr "Manual Logout"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Peta"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Peta \"%1$s\" diabaikan - aturan user."
@@ -8719,12 +8987,12 @@ msgstr "Peta \"%1$s\" diabaikan - aturan user."
 msgid "Map \"%s\""
 msgstr "Peta \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Peta \"%s\" dibuat."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Peta \"%s\" diperbarui."
@@ -8741,12 +9009,12 @@ msgstr "Tipe label peta"
 msgid "Map save operation failed."
 msgstr "Operasi menyimpan peta gagal."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Dipetakan ke"
 
@@ -8756,23 +9024,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Nilai pemetaan \"%1$s\" tidak unik."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Pemetaan"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Peta"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Maret"
 
@@ -8780,28 +9048,34 @@ msgstr "Maret"
 msgid "Mark elements on trigger status change"
 msgstr "Tandai elemen pada perubahan status trigger"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Tandai lainnya"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Tandai yang dipilih"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Perbarui secara masal"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Perbarui elemen secara masal"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Hitung max elemen untuk menampilkan didalam sel tabel"
@@ -8815,29 +9089,11 @@ msgstr "Hitung max elemen untuk menampilkan didalam sel tabel \"%1$s\"."
 msgid "Max count of events per trigger to show"
 msgstr "Hitung max dari event per trigger untuk ditampilkan"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Perbesar"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CUser.php:286
-#, fuzzy, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Panjang maksimal alias adalah %2$d karakter, \"%3$s\" adalah %1$d karakter.Panjang maksimal alias adalah %2$d karakter, \"%3$s\" adalah %1$d karakter.Panjang maksimal alias adalah %2$d karakter, \"%3$s\" adalah %1$d karakter."
-
-#: api/classes/CHost.php:616
-#, fuzzy, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Panjang maksimal nama host adalah %2$d karakter, \"%3$s\" adalah %1$d karakter.Panjang maksimal nama host adalah %2$d karakter, \"%3$s\" adalah %1$d karakter.Panjang maksimal nama host adalah %2$d karakter, \"%3$s\" adalah %1$d karakter."
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8845,103 +9101,98 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, fuzzy, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maksimal panjang nama host terlihat adalah %2$d karakter, \"%3$s\" adalah %1$d karakter.Maksimal panjang nama host terlihat adalah %2$d karakter, \"%3$s\" adalah %1$d karakter.Maksimal panjang nama host terlihat adalah %2$d karakter, \"%3$s\" adalah %1$d karakter."
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Mei"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Mei"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Media"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Tipe media"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Tipe media \"%s\" sudah ada."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Tipe media ditambah"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Tipe media dihapus"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Tipe media dinon-aktifkan"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Tipe media diaktifkan"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Tipe media diperbarui"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Tipe media"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Tipe media digunakan oleh aksi \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -8956,14 +9207,14 @@ msgid "Memory limit: %s"
 msgstr "Batas memori: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -8973,7 +9224,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Pesan"
 
@@ -8981,66 +9232,66 @@ msgstr "Pesan"
 msgid "Message actions"
 msgstr "Aksi pesan"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Batas teks pesan"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Habis waktu pesan"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Habis waktu pesan (detik)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Pesan"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Pesan"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Metode tidak ditemukan."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Tengah"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Perkecil"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9049,79 +9300,76 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Menit"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Hilangnya field \"itemid\" untuk item."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Hilangnya field \"nama\" untuk grafik."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Hilangnya item \"%1$s\" untuk host \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Hilangnya item untuk grafik \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9131,7 +9379,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Hilangnya kunci \"%1$s\" untuk host \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Hilangnya parameter: usrgrpids."
 
@@ -9143,18 +9391,18 @@ msgstr "Mode"
 msgid "Model"
 msgstr "Model"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Sen"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Senin"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Terpantau oleh proxy"
 
@@ -9162,33 +9410,33 @@ msgstr "Terpantau oleh proxy"
 msgid "Monitored host"
 msgstr "Host terpantau"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Pemantauan"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Bulan"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9196,7 +9444,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Lebih dari 10 menit"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Lebih dari satu grafik dengan nama \"%1$s\" dengan host."
@@ -9205,19 +9453,19 @@ msgstr "Lebih dari satu grafik dengan nama \"%1$s\" dengan host."
 msgid "Most busy triggers top 100"
 msgstr "Trigger tersibuk 100 teratas"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Beberapa MASALAH event"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Beberapa MASALAH generasi event"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Bisu"
 
@@ -9230,60 +9478,58 @@ msgstr "PETA JARINGAN"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "TIDAK ADA DATA"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "Otentikasi NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9294,26 +9540,32 @@ msgstr "Otentikasi NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Nama"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9332,12 +9584,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9345,7 +9597,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Peta jaringan ditambah"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Peta jaringan dihapus"
 
@@ -9357,7 +9609,7 @@ msgstr "Peta jaringan diperbarui"
 msgid "Network maps"
 msgstr "Peta jaringan"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Tak pernah"
 
@@ -9365,24 +9617,24 @@ msgstr "Tak pernah"
 msgid "Never executed"
 msgstr "Tak pernah dieksekusi"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Baru"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Aplikasi baru"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Kondisi baru"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Element baru"
 
@@ -9393,16 +9645,16 @@ msgstr "Element baru"
 msgid "New flexible interval"
 msgstr "Interval fleksibel baru"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Grup baru"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Grup host baru"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Item baru untuk grafik"
 
@@ -9410,83 +9662,99 @@ msgstr "Item baru untuk grafik"
 msgid "New media"
 msgstr "Media baru"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Ekspresi reguler baru"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Waktu service baru"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Lanjut"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Lanjut"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Tidak"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Tidak ada field \"ymax_type\" untuk grafik \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Tidak ada field \"ymix_type\" untuk grafik \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9494,25 +9762,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Tidak ada URL yang disediakan untuk elemen layar."
 
@@ -9538,8 +9806,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Tidak ada aksi yang ditemukan."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9549,7 +9817,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Tidak ada aplikasi dengan ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9557,30 +9825,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, fuzzy, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
-msgstr "Tidak ada tipe otentikasi yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada tipe otentikasi yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada tipe otentikasi yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada tipe otentikasi yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada tipe otentikasi yang spesifik untuk aksi operasi perintah \"%s\"."
+msgstr "Tidak ada tipe otentikasi yang spesifik untuk aksi operasi perintah \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, fuzzy, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
-msgstr "Tidak ada otentikasi nama user yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada otentikasi nama user yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada otentikasi nama user yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada otentikasi nama user yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada otentikasi nama user yang spesifik untuk aksi operasi perintah \"%s\"."
+msgstr "Tidak ada otentikasi nama user yang spesifik untuk aksi operasi perintah \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Tidak ada otentikasi nama user yang spesifik."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Tidak ada perintah yang spesifik untuk aksi operasi."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Tidak ada tipe perintah yang spesifik untuk aksi operasi."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Tidak ada kondisi yang didefinisikan."
 
@@ -9589,27 +9858,27 @@ msgstr "Tidak ada kondisi yang didefinisikan."
 msgid "No data collection"
 msgstr "Tidak ada data yang dikumpulkan"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Tidak ada interface standar untuk \"%1$s\" ketik di \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Tidak ada dependensi yang didefinisikan."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Tidak ada detail"
 
@@ -9617,42 +9886,42 @@ msgstr "Tidak ada detail"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Tidak ada aturan ID yang diberikan pada discovery."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Tidak ada error yang ditemukan."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Tidak ada event"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Tidak ada event untuk pemberitahuan"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, fuzzy, c-format
 msgid "No execution target specified for action operation command \"%s\"."
-msgstr "Tidak ada sasaran eksekusi yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada sasaran eksekusi yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada sasaran eksekusi yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada sasaran eksekusi yang spesifik untuk aksi operasi perintah \"%s\".Tidak ada sasaran eksekusi yang spesifik untuk aksi operasi perintah \"%s\"."
+msgstr "Tidak ada sasaran eksekusi yang spesifik untuk aksi operasi perintah \"%s\"."
 
 #: include/classes/helpers/CUploadFile.php:156
 msgid "No file was uploaded."
@@ -9664,7 +9933,7 @@ msgstr "Tidak ada file yang diupload."
 msgid "No flexible intervals defined."
 msgstr "Tidak ada interval fleksibel yang didefinisikan."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Tidak ada ID grafik yang disediakan untuk element layar."
 
@@ -9673,7 +9942,11 @@ msgstr "Tidak ada ID grafik yang disediakan untuk element layar."
 msgid "No graph item with graphid \"%s\"."
 msgstr "Tidak ada item grafik dengan graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9682,48 +9955,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Tidak ada grup untuk host \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Tidak ada grup untuk host."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Tidak ada ID host yang diberikan."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Tidak ada host yang diberikan untuk makro \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Tidak ada ID grup host yang disediakan untuk element layar."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9736,17 +10010,22 @@ msgstr "Tidak ada grup host dengan groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Tidak ada host dengan hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Tidak ada ikon untuk elemen peta \"%s\"."
@@ -9765,33 +10044,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Tidak ada interface yang ditemukan"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Tidak ada interface yang ditemukan."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Tidak ada interface untuk host \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Tidak ada ID item yang disediakan untuk element layar."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9810,7 +10096,7 @@ msgid "No items defined."
 msgstr "Tidak item yang didefinisikan."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9826,7 +10112,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Tidak ada ID peta yang disediakan untuk element layar."
 
@@ -9835,15 +10121,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9855,133 +10141,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Tidak ada izin untuk grafik \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Tidak ada izin untuk host \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Tidak ada izin untuk item \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Tidak ada permission untuk template \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Tidak ada izin untuk trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Tidak ada izin"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Tidak ada izin untuk grup \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Tidak ada izin untuk peta \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Tidak ada izin untuk layar \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Tidak ada izin untuk akses sistem."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Tidak ada izin untuk objek yang dirujuk atau objek tidak ada!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, fuzzy, c-format
 msgid "No private key file specified for action operation command \"%s\"."
-msgstr "Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\".Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\".Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\".Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\".Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\"."
+msgstr "Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Tidak ada file kunci pribadi yang dispesifikasikan."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Tidak ada proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, fuzzy, c-format
 msgid "No public key file specified for action operation command \"%s\"."
-msgstr "Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\".Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\".Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\".Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\".Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\"."
+msgstr "Tidak ada file kunci pribadi yang dispesifikasikan untuk aksi operasi perintah \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Tidak file kunci publik yang dispesifikasikan."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Tidak ada penerima untuk aksi operasi pesan."
 
@@ -9989,7 +10320,7 @@ msgstr "Tidak ada penerima untuk aksi operasi pesan."
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Tidak ada ID layar yang disediakan untuk element layar."
 
@@ -9997,82 +10328,83 @@ msgstr "Tidak ada ID layar yang disediakan untuk element layar."
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Tidak ada skrip yang dispesifikasikan untuk aksi operasi perintah."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Tidak ada sasaran yang dipilih"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Tidak ada sasaran yang dipilih."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Tidak ada waktu yang didefinisikan. Kerja 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Tidak ada trigger"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Tidak ada trigger dengan triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Tidak ada trigger yang didefinisikan."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Tidak ada trigger yang ditemukan."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10081,57 +10413,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Tidak ada nilai yang ditemukan."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Tidak ada"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normal"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Tampilan normal"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Bukan pemberitahuan"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Bukan item yang dibuat template"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Tidak semua template terhubung ke \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Tidak diizinkan menggunakan password untuk user \"guest\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Tidak tersedia"
 
@@ -10140,7 +10473,7 @@ msgstr "Tidak tersedia"
 msgid "Not classified"
 msgstr "Tidak diklasifikasikan"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Tidak tersambung"
 
@@ -10153,8 +10486,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Tidak didukung"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Catatan"
@@ -10167,7 +10500,7 @@ msgstr "Catatan"
 msgid "Nothing"
 msgstr "Tidak ada"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Tidak ada yang dilakukan."
 
@@ -10175,87 +10508,87 @@ msgstr "Tidak ada yang dilakukan."
 msgid "Notification report"
 msgstr "Laporan notifikasi"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notifikasi"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "November"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Sekarang"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Jumlah detik sejak Epoch adalah < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Jumlah detik sejak Epoch adalah = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Jumlah detik sejak Epoch adalah > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Jumlah detik sejak Epoch adalah BUKAN N"
 
@@ -10263,88 +10596,88 @@ msgstr "Jumlah detik sejak Epoch adalah BUKAN N"
 msgid "Number of status changes"
 msgstr "Jumlah status yang berubah"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Jumlah langkah"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Jumlah user (online)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numerik (float)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numerik (integer 64bit)"
 
@@ -10359,16 +10692,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10384,8 +10719,7 @@ msgstr "Router OOB"
 msgid "OOB subnet mask"
 msgstr "Subnet mask OOB"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "ATAU"
 
@@ -10405,11 +10739,12 @@ msgstr "OS (Singkat)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "PARAMETER KONFIGURASI LAINNYA"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "RANGKUMAN"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Okt"
 
@@ -10417,25 +10752,25 @@ msgstr "Okt"
 msgid "Octal"
 msgstr "Octal"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Oktober"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Mati"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Nyala"
 
@@ -10443,111 +10778,114 @@ msgstr "Nyala"
 msgid "On status change triggers blink for"
 msgstr "Pada perubahan status trigger berkedip untuk"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Sekali"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Satu kali saja"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Satu-kali downtime"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Hanya Super admin yang bisa membuat makro global."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Hanya Super admin yang bisa membuat grup host."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Hanya Super admin yang bisa membuat peta ikon."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Hanya Super Admin yang bisa membuat tipe media."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Hanya Super admin yang bisa menghapus makro global."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Hanya Super Admin yang bisa menghapus tipe media."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Hanya Super admin yang bisa menghapus grup user."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Hanya Super Admin yang bisa mengubah tipe media."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Hanya Super admin yang bisa mengubah makro global."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Hanya Super admin yang bisa perbarui peta ikon."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Hanya Zabbix Admin yang bisa menambah media user."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Hanya Zabbix Admin yang dapat merubah media user."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Hanya Zabbix Admin yang dapat menghapus media user."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Hanya karakter yang diperbolehkan."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Hanya item yang ditugaskan ke host aktif yang dihitung"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Hanya satu periksa yang menjadi unik."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Hanya satu nama grup user yang bisa diubah secara bersamaan. "
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Hanya sekitar 20%% indikator yang ditampilkan."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
-msgstr "Hanya trigger yang ditugaskan ke host aktif dan tergantung pada item aktif yang dihitung.Hanya trigger yang ditugaskan ke host aktif dan tergantung pada item aktif yang dihitung.Hanya trigger yang ditugaskan ke host aktif dan tergantung pada item aktif yang dihitung.Hanya trigger yang ditugaskan ke host aktif dan tergantung pada item aktif yang dihitung.Hanya trigger yang ditugaskan ke host aktif dan tergantung pada item aktif yang dihitung."
+msgstr "Hanya trigger yang ditugaskan ke host aktif dan tergantung pada item aktif yang dihitung."
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Operasi \"%s\" sudah ada."
@@ -10556,28 +10894,28 @@ msgstr "Operasi \"%s\" sudah ada."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operasi tidak dapat dilakukan karena permintaan yang tidak sah."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Kondisi operasi"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Detail operasi"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Operasi tidak memiliki grup untuk beroperasi."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Operasi tidak memiliki template untuk beroperasi."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Tipe operasi"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operasi"
@@ -10586,25 +10924,27 @@ msgstr "Operasi"
 msgid "Operator"
 msgstr "Operator"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10634,24 +10974,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Original"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Original blue"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Lainnya"
 
@@ -10659,19 +10999,19 @@ msgstr "Lainnya"
 msgid "Other configuration parameters"
 msgstr "Parameter konfigurasi lainnya"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Grup lainnya"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Host lainnya"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10681,21 +11021,21 @@ msgstr "Host | Grup lainnya"
 msgid "Other parameters"
 msgstr "Parameter lainnya"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Grup | lainnya"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Lainnya"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10708,14 +11048,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Rangkuman"
 
@@ -10723,7 +11060,7 @@ msgstr "Rangkuman"
 msgid "Overview by proxy"
 msgstr "Rangkuman berdasarkan proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10732,147 +11069,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "DASHBOARD PRIBADI"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Dukungan database PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Dukungan PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Dukungan PHP gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Dukungan PHP gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "Pilihan PHP max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "Pilihan PHP max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "Pilihan PHP memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "Pilihan PHP post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "Pilihan PHP upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP session auto start"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP soket"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "Zona waktu PHP"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Versi PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10881,32 +11226,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "MASALAH"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "Halaman menerima data yang salah"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palet"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palet #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -10915,7 +11262,7 @@ msgstr "Parameter"
 msgid "Parent discovery rules"
 msgstr "Aturan discovery induk"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10935,33 +11282,33 @@ msgstr "Trigger induk"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "SQL parse error [%1$s] dalam [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Parse error"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Pasif"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -10971,20 +11318,21 @@ msgstr "Pasif"
 msgid "Password"
 msgstr "Password"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Password (sekali lagi)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Password yang dibutuhkan untuk tipe media."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Password tidak seharusnya kosong"
 
@@ -10993,21 +11341,21 @@ msgstr "Password tidak seharusnya kosong"
 msgid "Peak memory usage: %s"
 msgstr "Puncak penggunakan memori: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Baris persentil (kiri)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Baris persentil (kanan)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11015,12 +11363,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Periode"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Tipe periode"
@@ -11030,24 +11378,24 @@ msgstr "Tipe periode"
 msgid "Periods"
 msgstr "Periode"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Izin"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Perizinan dapat diberikan hanya untuk grup user."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persian (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Pie"
 
@@ -11059,55 +11407,56 @@ msgstr "Menempatkan algoritma"
 msgid "Plain text"
 msgstr "Plain text"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Mainkan"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Mainkan suara"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Harap perbaiki semua masalah dan tekan tombol \"Coba Lagi\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Silahkan masukkan teks konfirmasi."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Silahkan pilih dua elemen"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polish (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Mengisi field inventaris host"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Port tidak boleh kosong untuk interface host."
 
@@ -11115,51 +11464,51 @@ msgstr "Port tidak boleh kosong untuk interface host."
 msgid "Port range"
 msgstr "Range port"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portuguese (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Posisi"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Post"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Tinjau"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Nilai sebelumnya adalah < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Nilai sebelumnya adalah = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Nilai sebelumnya adalah > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Nilai sebelumnya adalah BUKAN N"
 
@@ -11208,30 +11557,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "File kunci pribadi"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Tingkatan hak"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Kemungkinan modul php-ldap hilang."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Masalah"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Masalah tampilan"
 
@@ -11243,16 +11593,16 @@ msgstr "Masalah pada"
 msgid "Problem time"
 msgstr "Masalah saat"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Masalah, jika semua turunan memiliki masalah"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Masalah, jika setidaknya satu turunan memiliki masalah"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Masalah"
 
@@ -11260,75 +11610,71 @@ msgstr "Masalah"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototipe"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxy"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\"  untuk host \"%2$s\" tidak ada."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\"  sedang digunakan oleh aturan discovery \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Proxy \"%s\" sudah ada."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy ditambah"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy dihapus"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Host proxy"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Pembuatan interface proxy gagal."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Perbaruan interface proxy gagal."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Mode proxy"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Nama proxy"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy diperbarui"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Kunci publik"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11339,7 +11685,7 @@ msgstr "File kunci publik"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "ANTRIAN ITEM AKAN DIPERBARUI"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Antrian"
 
@@ -11347,18 +11693,18 @@ msgstr "Antrian"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Baca"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Hanya baca"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Baca-tulis"
 
@@ -11370,7 +11716,7 @@ msgstr "Alasan"
 msgid "Received value"
 msgstr "Nilai yang diterima"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11378,11 +11724,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Penerima"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Penerima (ascending)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Penerima (descending)"
 
@@ -11393,28 +11739,28 @@ msgstr "Penerima (descending)"
 msgid "Recipient(s)"
 msgstr "Penerima"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Pemulihan"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Pesan pemulihan"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Judul pemulihan"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Segarkan (dalam detik)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Segarkan waktu multiplier"
 
@@ -11432,46 +11778,50 @@ msgstr "Segarkan item yang tidak didukung (dalam det) \"%1$s\"."
 msgid "Regular expression"
 msgstr "Ekspresi reguler"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "Ekspresi regule \"%s\" sudah ada."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
-msgstr "Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak "
+msgstr "Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
-msgstr "Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak (bukan case-sensitive)Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak (bukan case-sensitive)Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak (bukan case-sensitive)Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak (bukan case-sensitive)Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak (bukan case-sensitive)"
+msgstr "Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N = 1, 0 - jika tidak (bukan case-sensitive)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
-msgstr "Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak "
+msgstr "Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
-msgstr "Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak (bukan case-sensitive)Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak (bukan case-sensitive)Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak (bukan case-sensitive)Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak (bukan case-sensitive)Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak (bukan case-sensitive)"
+msgstr "Ekspresi reguler V cocok dengan nilai terakhir dalam periode T, maka N BUKAN 1, 0 - jika tidak (bukan case-sensitive)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Ekspresi reguler ditambah"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Ekspresi reguler dihapus"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Ekspresi reguler tidak ada."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Ekspresi reguler diperbarui"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11488,26 +11838,28 @@ msgstr "Perintah jarak jauh"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11518,21 +11870,19 @@ msgstr "Perintah jarak jauh"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Hapus"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11540,11 +11890,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Hapus elemen"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Hapus dari"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Hapus dari favorit"
@@ -11553,7 +11903,7 @@ msgstr "Hapus dari favorit"
 msgid "Remove from host group"
 msgstr "Hapus dari grup host"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Hapus dari grup host"
 
@@ -11565,28 +11915,28 @@ msgstr "Hapus host"
 msgid "Remove link"
 msgstr "Hapus tautan"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Hapus yang dipilih"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Gantikan"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Gantikan dependensi"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Gantikan grup host"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Laporan"
 
@@ -11594,35 +11944,36 @@ msgstr "Laporan"
 msgid "Report 1"
 msgstr "Laporan 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Laporan 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Laporan 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Laporan"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Dibutuhkan"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Field \"ekspresi\" yang dibutuhkan hilang pada pemetaan ikon."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Field \"iconid\" yang dibutuhkan hilang pada pemetaan ikon."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Field \"inventory_link\" yang dibutuhkan hilang pada pemetaan ikon."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Dibutuhkan perizinan host"
 
@@ -11630,29 +11981,31 @@ msgstr "Dibutuhkan perizinan host"
 msgid "Required performance (vps)"
 msgstr "Dibutuhkan performa (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Dibutuhkan performa server, nilai baru per detik"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Dibutuhkan kode status"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Dibutuhkan string"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Reset"
 
@@ -11671,9 +12024,9 @@ msgstr "Reset semua nama dan warna ke nilai standar?"
 msgid "Reset confirmation"
 msgstr "Konfirmasi reset"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11686,7 +12039,7 @@ msgstr "Terselesaikan"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Sumber"
@@ -11701,15 +12054,15 @@ msgstr "Waktu respon"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Hasil "
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Hasilnya adalah SALAH"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Hasilnya adalah BENAR"
 
@@ -11722,7 +12075,8 @@ msgstr "Hasil dari \"%s\""
 msgid "Result type"
 msgstr "Tipe hasil"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11730,60 +12084,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Retries kiri"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Coba lagi"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Kanan"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Jarak baris"
 
@@ -11791,11 +12154,11 @@ msgstr "Jarak baris"
 msgid "Rows"
 msgstr "Baris"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Baris per halaman"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Aturan"
 
@@ -11840,20 +12203,20 @@ msgid "Run remote commands on hosts"
 msgstr "Jalankan perintah jarak jauh pada host"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -11869,7 +12232,7 @@ msgstr "LAYAR"
 msgid "SEARCH"
 msgstr "CARI"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVER"
 
@@ -11884,13 +12247,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "SLIDE SHOW"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11899,17 +12262,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "Email SMTP"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "Helo SMTP"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "Server SMTP"
@@ -11925,7 +12288,7 @@ msgstr "Kunci SNMP"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "OID SNMP"
 
@@ -11937,9 +12300,9 @@ msgstr "OID SNMP"
 msgid "SNMP community"
 msgstr "Komunitas SNMP"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "Interface SNMP"
@@ -11948,7 +12311,7 @@ msgstr "Interface SNMP"
 msgid "SNMP trap"
 msgstr "Jebakan SNMP"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "Kunci jebakan SNMP tidak sah."
 
@@ -11972,7 +12335,7 @@ msgstr "Agen SNMPv3"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Hitung SQL: %s (memilih: %s | mengeksekusi: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -11990,7 +12353,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Eksekusi pernyataan SQL gagal \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -11999,15 +12362,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "Agen SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "STATUS DISCOVERY"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STATUS TRIGGER"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "STATUS PEMANTAUAN WEB"
 
@@ -12015,92 +12398,92 @@ msgstr "STATUS PEMANTAUAN WEB"
 msgid "STATUS OF ZABBIX"
 msgstr "STATUS ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Sab"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Simpan"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Simpan dan kembali"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Skala"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Skenario"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Skenario ditambah"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Skenario diperbarui"
 
@@ -12112,7 +12495,7 @@ msgstr "Skenario"
 msgid "Schedule"
 msgstr "Jadwal"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12123,126 +12506,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Layar"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Layar \"%1$s\" ditambah."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "Layar \"%1$s\" sudah ada di template \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "Layar \"%1$s\" sudah ada."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Layar \"%1$s\" diabaikan - aturan user."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Layar \"%1$s\" diperbarui."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Layar ditambah"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Konfigurasi sel layar"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Layar dihapus"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Layar seharusnya memiliki setidaknya satu baris dan kolom."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Layar diperbarui"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Layar"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Skrip"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Skrip ditambah"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Skrip dihapus"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Nama skrip"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12251,17 +12633,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "Skrip profiler"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Skrip diperbarui"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Skrip"
 
@@ -12282,7 +12664,7 @@ msgstr "Pola pencarian kosong"
 msgid "Search/Filter elements limit"
 msgstr "Cari/Filter batas elemen"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Detik"
 
@@ -12314,7 +12696,7 @@ msgstr "Telepon B POC kedua"
 msgid "Secondary POC screen name"
 msgstr "Nama layar POC kedua"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Detik"
 
@@ -12333,69 +12715,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Pilih"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Pilih prototipe"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Pilih baris dengan nilai seperti"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Dipilih"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Aksi yang dipilih dihapus"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Elemen yang dipilih"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Grup yang dipilih"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Host yang dipilih"
 
@@ -12411,7 +12800,7 @@ msgstr "Kirim pesan ke grup user"
 msgid "Send message to users"
 msgstr "Kirim pesan ke user"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Hanya kirim ke"
 
@@ -12419,11 +12808,11 @@ msgstr "Hanya kirim ke"
 msgid "Send to"
 msgstr "Kirim ke"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Kirim ke grup User"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Kirim ke User"
 
@@ -12432,17 +12821,17 @@ msgstr "Kirim ke User"
 msgid "Sent"
 msgstr "Terkirim"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Sep"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Dipisahkan"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "September"
 
@@ -12454,7 +12843,7 @@ msgstr "Nomor seri A"
 msgid "Serial number B"
 msgstr "Nomor seri B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Server"
@@ -12463,44 +12852,44 @@ msgstr "Server"
 msgid "Server info"
 msgstr "Info server"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Waktu server"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Service"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Service \"%1$s\" tidak dapat dihapus, karena terkait pada service lain."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Service \"%1$s\" tidak dapat terkait pada dirinya sendiri."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
-msgstr "Service \"%1$s\" tidak dapat dihubungkan ke trigger dan memiliki turunan secara bersamaan.Service \"%1$s\" tidak dapat dihubungkan ke trigger dan memiliki turunan secara bersamaan.Service \"%1$s\" tidak dapat dihubungkan ke trigger dan memiliki turunan secara bersamaan.Service \"%1$s\" tidak dapat dihubungkan ke trigger dan memiliki turunan secara bersamaan.Service \"%1$s\" tidak dapat dihubungkan ke trigger dan memiliki turunan secara bersamaan."
+msgstr "Service \"%1$s\" tidak dapat dihubungkan ke trigger dan memiliki turunan secara bersamaan."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr " Service \"%1$s\" sudah sangat terkait kepada service lain."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Service tidak dapat menjadi induk dan turunan secara bersamaan."
 
@@ -12516,11 +12905,11 @@ msgstr "Service dihapus"
 msgid "Service port"
 msgstr "Port service"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "Waktu mulai service harus lebih kecil dari waktu akhir."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Waktu service"
 
@@ -12532,49 +12921,52 @@ msgstr "Tipe service"
 msgid "Service updated"
 msgstr "Service diperbarui"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Service"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Form service dependensi melingkar."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Sesi dimatikan, mohon login kembali."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Keparahan"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Keparahan (descending)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Nama keparahan tidak boleh kosong."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Tampilkan"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Tampilkan semua"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Tampilkan detail"
 
@@ -12604,35 +12996,36 @@ msgstr "Tampilkan event yang tidak lebih lama dari (dalam hari)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Tampilkan event yang tidak lebih lama dari (dalam hari) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Tampilkan host yang dalam pemeliharaan"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Tampilkan item dengan nama seperti"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Tampilkan item tanpa data"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Tampilkan legenda"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Tampilkan garis"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Tampilkan yang dipilih"
 
@@ -12640,19 +13033,21 @@ msgstr "Tampilkan yang dipilih"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Tampilkan teks sebagai HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Tampilkan trigger"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Tampilkan yang bukan pemberitahuan"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Tampilkan nilai"
@@ -12661,11 +13056,11 @@ msgstr "Tampilkan nilai"
 msgid "Show warning if Zabbix server is down"
 msgstr "Tampilkan peringatan jika server Zabbix mati"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Tampilkan waktu kerja"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Ditampilkan"
 
@@ -12685,6 +13080,10 @@ msgstr "Pemeriksaan sederhana"
 msgid "Simple graph"
 msgstr "Grafik sederhana"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Kode pos situs"
@@ -12722,7 +13121,7 @@ msgid "Site state / province"
 msgstr "Provinsi situs"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12740,16 +13139,16 @@ msgstr "Abaikan menyalin grafik \"%1$s\" ke host \"%2$s\"."
 msgid "Slide"
 msgstr "Slide"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Slide show"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Slide show \"%s\" sudah ada."
@@ -12758,11 +13157,11 @@ msgstr "Slide show \"%s\" sudah ada."
 msgid "Slide show added"
 msgstr "Slide show ditambah"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Slide show dihapus"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Slide show harus mengandung slide."
 
@@ -12770,10 +13169,10 @@ msgstr "Slide show harus mengandung slide."
 msgid "Slide show updated"
 msgstr "Slide show diperbarui"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Slide show"
 
@@ -12781,15 +13180,15 @@ msgstr "Slide show"
 msgid "Slides"
 msgstr "Slide"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Tidur"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Lembut"
 
@@ -12822,28 +13221,28 @@ msgid "Software application E"
 msgstr "Aplikasi software E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Urutkan berdasarkan"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Pengurutan (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Urutkan trigger berdasarkan"
 
@@ -12856,75 +13255,75 @@ msgstr "Urut berdasarkan field \"%1$s\" tidak boleh."
 msgid "Source"
 msgstr "Sumber"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spanish (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
-msgstr "Skrip yang dispesifikasikan tidak ada atau Anda tidak memiliki hak atasnya untuk perintah aksi operasi.Skrip yang dispesifikasikan tidak ada atau Anda tidak memiliki hak atasnya untuk perintah aksi operasi.Skrip yang dispesifikasikan tidak ada atau Anda tidak memiliki hak atasnya untuk perintah aksi operasi.Skrip yang dispesifikasikan tidak ada atau Anda tidak memiliki hak atasnya untuk perintah aksi operasi.Skrip yang dispesifikasikan tidak ada atau Anda tidak memiliki hak atasnya untuk perintah aksi operasi."
+msgstr "Skrip yang dispesifikasikan tidak ada atau Anda tidak memiliki hak atasnya untuk perintah aksi operasi."
 
 #: httpdetails.php:131 httpdetails.php:296
 msgid "Speed"
 msgstr "Kecepatan"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Ditumpuk"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Item standar"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Memulai"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "State"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Status"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Status (ascending)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Status (descending)"
 
@@ -12937,7 +13336,7 @@ msgstr "Status kalkulasi"
 msgid "Status calculation algorithm"
 msgstr "Status kalkulasi algoritma"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Status kode"
 
@@ -12946,7 +13345,7 @@ msgid "Status of Web monitoring"
 msgstr "Status pemantauan Web"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Status Zabbix"
 
@@ -12963,40 +13362,40 @@ msgid "Status only"
 msgstr "Status saja"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Langkah"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Langkah \"%1$s\" [%2$s of %3$s] gagal: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Durasi langkah"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Langkah skenario"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Langkah"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Berhenti"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Menyimpan nilai"
@@ -13005,11 +13404,11 @@ msgstr "Menyimpan nilai"
 msgid "Straight"
 msgstr "Lurus"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Gaya"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Subfilter [hanya mempengaruhi data yang disaring!]"
 
@@ -13017,11 +13416,11 @@ msgstr "Subfilter [hanya mempengaruhi data yang disaring!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Subyek"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Submap"
 
@@ -13030,32 +13429,32 @@ msgid "Success Audit"
 msgstr "Audit sukses"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Jumlah dari nilai untuk periode waktu adalah T = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Jumlah dari nilai untuk periode waktu adalah T > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Sen"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Senin"
 
@@ -13063,44 +13462,44 @@ msgstr "Senin"
 msgid "Support"
 msgstr "Dukungan"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Nama keluarga"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Swedish (sv_SE)"
 
 #: include/views/administration.authentication.edit.php:126
 msgid "Switching authentication method will reset all except this session! Continue?"
-msgstr "Pengalihan metode otentikasi akan mengatur ulang semua kecuali sesi ini! Lanjutkan?Pengalihan metode otentikasi akan mengatur ulang semua kecuali sesi ini! Lanjutkan?Pengalihan metode otentikasi akan mengatur ulang semua kecuali sesi ini! Lanjutkan?Pengalihan metode otentikasi akan mengatur ulang semua kecuali sesi ini! Lanjutkan?Pengalihan metode otentikasi akan mengatur ulang semua kecuali sesi ini! Lanjutkan?"
+msgstr "Pengalihan metode otentikasi akan mengatur ulang semua kecuali sesi ini! Lanjutkan?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Standar sistem"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Sistem error."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13109,21 +13508,21 @@ msgid "System status"
 msgstr "Status sistem"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -13142,11 +13541,11 @@ msgid "TOTAL"
 msgstr "TOTAL"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "KOMENTAR TRIGGER"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "BENAR"
 
@@ -13164,14 +13563,14 @@ msgstr "Tabel \"%1$s\" tidak memiliki field dengan nama \"%2$s\"."
 msgid "Tag"
 msgstr "Label"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Sasaran"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Daftar sasaran"
 
@@ -13180,130 +13579,133 @@ msgid "Target type"
 msgstr "Tipe sasaran"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Template"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Template \"%1$s\" sudah ada."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Template \"%1$s\" untuk host \"%2$s\" tidak ada."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Template telah ditambah"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
-msgstr "Template tidak dapat dikaitkan dengan template lain lebih dari sekali bahkan melalui template lainnya.Template tidak dapat dikaitkan dengan template lain lebih dari sekali bahkan melalui template lainnya.Template tidak dapat dikaitkan dengan template lain lebih dari sekali bahkan melalui template lainnya.Template tidak dapat dikaitkan dengan template lain lebih dari sekali bahkan melalui template lainnya.Template tidak dapat dikaitkan dengan template lain lebih dari sekali bahkan melalui template lainnya."
+msgstr "Template tidak dapat dikaitkan dengan template lain lebih dari sekali bahkan melalui template lainnya."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Template telah dihapus"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Template grup"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Template linkage"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Daftar template"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Nama template"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Layar template"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Trigger template"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Template diperbarui"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Template dengan nama yang sama \"%s\" sudah ada."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Template dengan visible name yang sama \"%s\" sudah ada."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Item yang memiliki template"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Template"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Template \"%1$s\" tidak dihubungkan dari host \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Tes"
 
@@ -13311,11 +13713,11 @@ msgstr "Tes"
 msgid "Test authentication"
 msgstr "Tes otentikasi"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Tes konfirmasi"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Tes data"
 
@@ -13329,22 +13731,22 @@ msgid "Test string"
 msgstr "Tes string"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Teks"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13352,7 +13754,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13367,45 +13769,45 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr "Item ini tidak ditemukan lagi dan akan terhapus dalam %1$s (on %2$s at %3$s).Item ini tidak ditemukan lagi dan akan terhapus dalam %1$s (on %2$s at %3$s).Item ini tidak ditemukan lagi dan akan terhapus dalam %1$s (on %2$s at %3$s).Item ini tidak ditemukan lagi dan akan terhapus dalam %1$s (on %2$s at %3$s).Item ini tidak ditemukan lagi dan akan terhapus dalam %1$s (on %2$s at %3$s)."
+msgstr "Item ini tidak ditemukan lagi dan akan terhapus dalam %1$s (on %2$s at %3$s)."
 
 #: queue.php:78
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "JSON yang diterima bukanlah permintaan JSON-RPC."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "Remote-procedure yang diminta tidak ada / tidak tersedia"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Theme"
 
@@ -13415,11 +13817,11 @@ msgid "There is \"%1$d\" group with Internal GUI access."
 msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "Ada \"%1$d\" grup dengan akses Internal GUI."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Ketiga"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Field ini secara otomatis diisi oleh item \"%s\"."
@@ -13428,11 +13830,11 @@ msgstr "Field ini secara otomatis diisi oleh item \"%s\"."
 msgid "This month"
 msgstr "Bulan ini"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Kolom layar ini tidak kosong. Hapus?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Baris layar ini tidak kosong. Hapus?"
 
@@ -13444,27 +13846,27 @@ msgstr "Minggu ini"
 msgid "This year"
 msgstr "Tahun ini"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Kam"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Kamis"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Hingga"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13473,28 +13875,28 @@ msgstr "Hingga"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Waktu"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Waktu (ascending)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Waktu (descending)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13502,54 +13904,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Periode waktu"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Waktu pergeseran"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Tipe waktu"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Batas waktu"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
-msgstr "Timestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N = 1, 0 - jika tidakTimestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N = 1, 0 - jika tidakTimestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N = 1, 0 - jika tidakTimestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N = 1, 0 - jika tidakTimestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N = 1, 0 - jika tidak"
+msgstr "Timestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N = 1, 0 - jika tidak"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
-msgstr "Timestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N BUKAN 1, 0 - jika tidakTimestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N BUKAN 1, 0 - jika tidakTimestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N BUKAN 1, 0 - jika tidakTimestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N BUKAN 1, 0 - jika tidakTimestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N BUKAN 1, 0 - jika tidak"
+msgstr "Timestamp tidak berbeda dengan waktu server Zabbix selama T detik, maka N BUKAN 1, 0 - jika tidak"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Judul"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Ke"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Untuk mengatur interface host pilih satu tipe item untuk semua item"
 
@@ -13557,17 +13959,18 @@ msgstr "Untuk mengatur interface host pilih satu tipe item untuk semua item"
 msgid "Today"
 msgstr "Hari ini"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Atas"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Total"
 
@@ -13585,7 +13988,7 @@ msgstr "Total waktu: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Transaksi belum ditutup. Membatalkan..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Trasnport error."
 
@@ -13602,90 +14005,90 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Tren"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Trigger"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Trigger \"%1$s\" sudah ada pada \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Trigger \"%1$s\" tergantung pada trigger \"%2$s\", yang tidak ada."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Trigger \"%1$s\" diabaikan - aturan user."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Trigger \"%s\" milik template dengan linkage berbeda."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Trigger ditambah"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Trigger komentar"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Trigger dihapus"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Trigger menampilkan pilihan"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13699,11 +14102,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Trigger kondisi ekspresi"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "Ekspresi trigger harus mengandung setidaknya satu host:key referensi."
 
@@ -13711,10 +14115,10 @@ msgstr "Ekspresi trigger harus mengandung setidaknya satu host:key referensi."
 msgid "Trigger form"
 msgstr "Trigger dari"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
-msgstr "Trigger memiliki item dari template \"%1$s\" yang tidak ditautkan ke host.Trigger memiliki item dari template \"%1$s\" yang tidak ditautkan ke host.Trigger memiliki item dari template \"%1$s\" yang tidak ditautkan ke host.Trigger memiliki item dari template \"%1$s\" yang tidak ditautkan ke host.Trigger memiliki item dari template \"%1$s\" yang tidak ditautkan ke host."
+msgstr "Trigger memiliki item dari template \"%1$s\" yang tidak ditautkan ke host."
 
 #: include/actions.inc.php:1161
 msgid "Trigger in \"normal\" state"
@@ -13724,12 +14128,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
-msgstr "Trigger pada template \"%1$s\" memiliki ketergantungan dengan trigger pada template \"%2$s\".Trigger pada template \"%1$s\" memiliki ketergantungan dengan trigger pada template \"%2$s\".Trigger pada template \"%1$s\" memiliki ketergantungan dengan trigger pada template \"%2$s\".Trigger pada template \"%1$s\" memiliki ketergantungan dengan trigger pada template \"%2$s\".Trigger pada template \"%1$s\" memiliki ketergantungan dengan trigger pada template \"%2$s\"."
+msgstr "Trigger pada template \"%1$s\" memiliki ketergantungan dengan trigger pada template \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Trigger baru saja ditambah. Tidak ada status baru selama ini."
 
@@ -13741,50 +14145,50 @@ msgstr "Tipe label trigger"
 msgid "Trigger name"
 msgstr "Nama trigger"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Prototipe trigger"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Prototipe trigger"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13792,23 +14196,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Prototipe trigger dari"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Trigger tingkat keparahan"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Trigger keparahan"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Trigger diperbarui"
 
@@ -13816,40 +14228,41 @@ msgstr "Trigger diperbarui"
 msgid "Trigger value"
 msgstr "Nilai trigger"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Trigger"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Trigger dihapus"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Info trigger"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Perbarui trigger secara masal"
 
@@ -13857,78 +14270,78 @@ msgstr "Perbarui trigger secara masal"
 msgid "Triggers overview"
 msgstr "Rangkuman trigger"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Status trigger"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Trigger 100 teratas"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Trigger dengan keparahan"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Dipotong"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Coba membaca propterti yang tidak dapat diakses \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Sel"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Dua elemen harus dipilih"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Dua item (\"%1$s\" dan \"%2$s\") tidak dapat mengisi satu field inventori host \"%3$s\", ini akan mengakibatkan konflik.Dua item (\"%1$s\" dan \"%2$s\") tidak dapat mengisi satu field inventori host \"%3$s\", ini akan mengakibatkan konflik.Dua item (\"%1$s\" dan \"%2$s\") tidak dapat mengisi satu field inventori host \"%3$s\", ini akan mengakibatkan konflik.Dua item (\"%1$s\" dan \"%2$s\") tidak dapat mengisi satu field inventori host \"%3$s\", ini akan mengakibatkan konflik.Dua item (\"%1$s\" dan \"%2$s\") tidak dapat mengisi satu field inventori host \"%3$s\", ini akan mengakibatkan konflik."
+msgstr "Dua item (\"%1$s\" dan \"%2$s\") tidak dapat mengisi satu field inventori host \"%3$s\", ini akan mengakibatkan konflik."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Tipe"
 
@@ -13936,62 +14349,64 @@ msgstr "Tipe"
 msgid "Type (Full details)"
 msgstr "Tipe (Detail lengkap)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Tipe (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Tipe (ascending)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Tipe (descending)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Tipe kalkulasi"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Tipe informasi"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "Tipe informasi harus berupa \"Log\" untuk kunci log."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
-msgstr "Tipe informasi harus berupa \"Numerik (float)\" untuk item yang diagregasi.Tipe informasi harus berupa \"Numerik (float)\" untuk item yang diagregasi.Tipe informasi harus berupa \"Numerik (float)\" untuk item yang diagregasi.Tipe informasi harus berupa \"Numerik (float)\" untuk item yang diagregasi.Tipe informasi harus berupa \"Numerik (float)\" untuk item yang diagregasi."
+msgstr "Tipe informasi harus berupa \"Numerik (float)\" untuk item yang diagregasi."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Tipe"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "TIDAK DIKENAL"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "ATAS"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (setelah masuk)"
 
@@ -14007,20 +14422,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URL"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 karakter)"
 
@@ -14028,15 +14453,11 @@ msgstr "USA (160 karakter)"
 msgid "USER PROFILE"
 msgstr "PROFIL USER"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukrainian (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Tidak dapat memilih konfigurasi."
 
@@ -14044,7 +14465,7 @@ msgstr "Tidak dapat memilih konfigurasi."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Bukan pemberitahuan"
 
@@ -14057,20 +14478,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Event MASALAH yang bukan pemberitahuan"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Hanya yang bukan pemberitahuan"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Membuka blokir yang dipilih"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Membuka blokir user yang dipilih?"
 
@@ -14079,29 +14500,29 @@ msgstr "Membuka blokir user yang dipilih?"
 msgid "Units"
 msgstr "Unit"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14111,23 +14532,20 @@ msgstr "Tidak dikenal"
 msgid "Unknown action"
 msgstr "Aksi tidak dikenal"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Kalkulasi algoritma yang tidak dikenal dari status service"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Fungsi yang tidak dikenal."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
-msgstr "Item host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilihItem host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilihItem host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilihItem host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilihItem host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilih"
+msgstr "Item host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilih"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Host tidak dikenal, tidak ada host yang hadir dalam sistem"
 
@@ -14139,23 +14557,23 @@ msgstr "Tipe interface tidak dikenal."
 msgid "Unknown resource"
 msgstr "Sumber daya tidak dikenal"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Tipe nilai tidak dikenal"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Putuskan"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Putuskan dan bersihkan"
 
@@ -14163,61 +14581,61 @@ msgstr "Putuskan dan bersihkan"
 msgid "Unlink from template"
 msgstr "Putuskan dari template"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Putuskan dari template"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Diputus: Aplikasi \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Diputus: Aturan discovery \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Diputus: Grafik \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Diputus: Prototipe grafik \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Diputus: Item \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Diputus: Prototipe item \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Diputus: Trigger \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Diputus: Prototipe trigger \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Nyalakan suara"
 
@@ -14231,32 +14649,43 @@ msgstr "Tidak mendukung import ekstensi file \"%1$s\"."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Tidak mendukung format import \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Nyala"
@@ -14267,34 +14696,34 @@ msgid "Up"
 msgstr "Nyala"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Perbaru"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Perbaru yang ada"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Perbaru interval"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Perbaru interval (dalam det)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Diperbarui"
 
@@ -14302,55 +14731,55 @@ msgstr "Diperbarui"
 msgid "Updated status of host"
 msgstr "Status host diperbarui"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Diperbarui: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Diperbarui: Aplikasi \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Diperbarui: Aturan discovery \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Diperbarui: Item \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Diperbarui: Prototipe item \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Diperbarui: Trigger \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Diperbarui: Prototipe trigger \"%1$s\" pada \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Unggah"
 
@@ -14358,14 +14787,14 @@ msgstr "Unggah"
 msgid "Upper level maps"
 msgstr "Tingkat peta lebih atas"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Waktu nyala"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14373,10 +14802,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Waktu nyala/Waktu mati"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14391,83 +14820,87 @@ msgid "Used in actions"
 msgstr "Digunakan dalam aksi"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "User"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "User \"%s\" tidak bisa tanpa grup user."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "User ditambah"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "User tidak dapat mengganti tipe untuk dirinya sendiri"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
-msgstr "User tidak dapat menambah dirinya sendiri ke grup non-aktif atau grup dengan akses GUI non-aktif.User tidak dapat menambah dirinya sendiri ke grup non-aktif atau grup dengan akses GUI non-aktif.User tidak dapat menambah dirinya sendiri ke grup non-aktif atau grup dengan akses GUI non-aktif.User tidak dapat menambah dirinya sendiri ke grup non-aktif atau grup dengan akses GUI non-aktif.User tidak dapat menambah dirinya sendiri ke grup non-aktif atau grup dengan akses GUI non-aktif."
+msgstr "User tidak dapat menambah dirinya sendiri ke grup non-aktif atau grup dengan akses GUI non-aktif."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "User tidak dapat merubah akses GUI untuk dirinya sendiri."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "User tidak dapat merubah status untuk dirinya sendiri"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "User tidak dapat merubah status untuk dirinya sendiri."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "User dihapus"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Grup user"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Grup user \"%1$s\" digunakan dalam skrip \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "Grup user \"%s\" sudah ada."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14483,34 +14916,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Grup user"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "User tidak diizinkan menghapus dirinya sendiri."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, fuzzy, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
-msgstr "User tidak dapat memodifikasi akses GUI untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\".User tidak dapat memodifikasi akses GUI untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\".User tidak dapat memodifikasi akses GUI untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\".User tidak dapat memodifikasi akses GUI untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\".User tidak dapat memodifikasi akses GUI untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\"."
+msgstr "User tidak dapat memodifikasi akses GUI untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, fuzzy, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
-msgstr "User tidak dapat memodifikasi status sistem untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\".User tidak dapat memodifikasi status sistem untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\".User tidak dapat memodifikasi status sistem untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\".User tidak dapat memodifikasi status sistem untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\".User tidak dapat memodifikasi status sistem untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\"."
+msgstr "User tidak dapat memodifikasi status sistem untuk dirinya sendiri dengan menjadi anggota dari grup user \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Nama user"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "Nama user tidak cocok dengan DB"
 
@@ -14536,243 +14969,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Tipe user"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "User diperbarui"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "User dengan alias \"%s\" sudah ada."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Username"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "User"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "User (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "User dibuka blokir"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Nilai"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
-msgstr "Nilai \"%1$s\" tidak valid untuk parameter \"grid_align\". Pilihannya : \"%2$s\" dan \"%3$s\"Nilai \"%1$s\" tidak valid untuk parameter \"grid_align\". Pilihannya : \"%2$s\" dan \"%3$s\"Nilai \"%1$s\" tidak valid untuk parameter \"grid_align\". Pilihannya : \"%2$s\" dan \"%3$s\"Nilai \"%1$s\" tidak valid untuk parameter \"grid_align\". Pilihannya : \"%2$s\" dan \"%3$s\"Nilai \"%1$s\" tidak valid untuk parameter \"grid_align\". Pilihannya : \"%2$s\" dan \"%3$s\""
+msgstr "Nilai \"%1$s\" tidak valid untuk parameter \"grid_align\". Pilihannya : \"%2$s\" dan \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14780,12 +15213,12 @@ msgstr ""
 #: include/classes/db/DB.php:333
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
-msgstr "Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah %4$d karakter.Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah %4$d karakter.Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah %4$d karakter.Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah %4$d karakter.Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah %4$d karakter."
+msgstr "Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah %4$d karakter."
 
 #: include/classes/db/DB.php:362
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is 2048 characters."
-msgstr "Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah 2048 karakter.Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah 2048 karakter.Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah 2048 karakter.Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah 2048 karakter.Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah 2048 karakter."
+msgstr "Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah 2048 karakter."
 
 #: include/validate.inc.php:326 include/validate.inc.php:350
 #, c-format
@@ -14807,11 +15240,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14857,10 +15290,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Peta nilai dengan valuemapid \"%1$s\" tidak ada."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Pemetaan nilai"
 
@@ -14869,7 +15302,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "Pemetaan nilai harus memiliki setidaknya satu pemetaan."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14881,8 +15314,8 @@ msgstr "Nilai: tidak ada data"
 msgid "Values"
 msgstr "Nilai"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Variabel"
 
@@ -14895,64 +15328,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Meluruskan vertikal"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Tampilan tidak diberikan."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Nama terlihat"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Nama terlihat tidak boleh kosong jika nama hostnya hilang."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Peringatan"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
-msgstr "Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu diingat telah tercapai.Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu diingat telah tercapai.Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu diingat telah tercapai.Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu diingat telah tercapai.Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu diingat telah tercapai."
+msgstr "Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu diingat telah tercapai."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -14960,63 +15398,81 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Pemantauan Web"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Rab"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Rabu"
 
@@ -15024,9 +15480,9 @@ msgstr "Rabu"
 msgid "Week"
 msgstr "Minggu"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Mingguan"
 
@@ -15034,12 +15490,12 @@ msgstr "Mingguan"
 msgid "When active"
 msgstr "Ketidak aktif"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Lebar"
@@ -15049,28 +15505,28 @@ msgstr "Lebar"
 msgid "With data collection"
 msgstr "Dengan koleksi data"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Dengan event pemberitahuan terakhir"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Dengan masalah"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Dengan trigger"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Dengan event pemberitahuan"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Tanpa masalah"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Tanpa trigger"
 
@@ -15079,7 +15535,7 @@ msgid "Wizard"
 msgstr "Pemandu"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15092,277 +15548,271 @@ msgstr "Waktu kerja"
 msgid "Working time \"%1$s\"."
 msgstr "Waktu kerja \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Tulis"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Field salah untuk dependensi untuk service \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Field yang salah untuk elemen."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Field yang salah untuk host \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Field yang salah untuk makro \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Field yang salah untuk tipe media."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Field yang salah untuk skrip."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Field yang salah untuk service \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Field yang salah untuk waktu untuk service \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Field yang salah untuk trigger."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Field yang salah untuk user \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Makro yang salah \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Label X"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "File XML mengandung error %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "File XML mengandung error"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "File XML mengandung error fatal %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "File XML mengandung peringatan %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Nilai Y axis MAX"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Nilai Y axis MAX harus lebih besar dari nilai Y axis MIN."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Nilai Y axis MIN"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Sisi Y axis"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Label Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Tahun"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Tahunan"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Ya"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
-msgstr "Anda tidak dapat memilih beberapa bahasa, karena locale untuk mereka tidak terinstall pada web server.Anda tidak dapat memilih beberapa bahasa, karena locale untuk mereka tidak terinstall pada web server.Anda tidak dapat memilih beberapa bahasa, karena locale untuk mereka tidak terinstall pada web server.Anda tidak dapat memilih beberapa bahasa, karena locale untuk mereka tidak terinstall pada web server.Anda tidak dapat memilih beberapa bahasa, karena locale untuk mereka tidak terinstall pada web server."
+msgstr "Anda tidak dapat memilih beberapa bahasa, karena locale untuk mereka tidak terinstall pada web server."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Anda tidak diizinkan mengubah hak pengguna untuk user \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Anda belum login."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Anda tidak dapat mengganti host pada yang terpilih."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Anda tidak dapat menentukan host untuk operasi."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Anda tidak dapat menentukan grup host untuk operasi."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Anda tidak dapat menentukan target untuk perintah aksi operasi \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, fuzzy, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
-msgstr "Anda tidak dapat menentukan target untuk skrip global aksi operasi \"%s\".Anda tidak dapat menentukan target untuk skrip global aksi operasi \"%s\".Anda tidak dapat menentukan target untuk skrip global aksi operasi \"%s\".Anda tidak dapat menentukan target untuk skrip global aksi operasi \"%s\".Anda tidak dapat menentukan target untuk skrip global aksi operasi \"%s\"."
-
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+msgstr "Anda tidak dapat menentukan target untuk skrip global aksi operasi \"%s\"."
+
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "Anda tidak memiliki hak untuk melakukan operasi ini."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Anda tidak memiliki hak untuk membuat user."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Anda tidak memiliki hak untuk perbarui user lain."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Anda tidak memiliki hak untuk perbarui user atau user tidak ada."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Anda harus login untuk menampilkan halaman ini."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15375,7 +15825,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15394,8 +15844,8 @@ msgid "Zabbix User"
 msgstr "User Zabbix"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15421,10 +15871,11 @@ msgstr "Internal Zabbix"
 msgid "Zabbix internal authentication"
 msgstr "Otentikasi internal Zabbix"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Server Zabbix"
@@ -15440,7 +15891,7 @@ msgstr ""
 "1. IP/DNS server salah pada \"zabbix.conf.php\";\n"
 "2. Konfigurasi jaringan salah.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "IP server Zabbix atau port belum ditentukan!"
 
@@ -15448,15 +15899,15 @@ msgstr "IP server Zabbix atau port belum ditentukan!"
 msgid "Zabbix server activity check interval"
 msgstr "Pemeriksaan interval aktifitas server Zabbix"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Info server Zabbix"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
-msgstr "Server Zabbix tidak berjalan: Informasi yang ditampilkan mungkin tidak saat ini.Server Zabbix tidak berjalan: Informasi yang ditampilkan mungkin tidak saat ini.Server Zabbix tidak berjalan: Informasi yang ditampilkan mungkin tidak saat ini.Server Zabbix tidak berjalan: Informasi yang ditampilkan mungkin tidak saat ini.Server Zabbix tidak berjalan: Informasi yang ditampilkan mungkin tidak saat ini."
+msgstr "Server Zabbix tidak berjalan: Informasi yang ditampilkan mungkin tidak saat ini."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Server Zabbix berjalan"
 
@@ -15465,11 +15916,11 @@ msgstr "Server Zabbix berjalan"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Server Zabbix sedang berjalan pemeriksaan interval \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Nama server Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Port server Zabbix"
 
@@ -15477,25 +15928,20 @@ msgstr "Port server Zabbix"
 msgid "Zabbix trapper"
 msgstr "Jebakan Zabbix"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Perbesar"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Nilai yang salah untuk hari: \"%s\"]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Nilai yang salah untuk bulan: \"%s\" ]"
@@ -15504,19 +15950,19 @@ msgstr "[Nilai yang salah untuk bulan: \"%s\" ]"
 msgid "agent"
 msgstr "agen"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "semua"
 
@@ -15524,19 +15970,15 @@ msgstr "semua"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "sudah ada"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "sebagai Biru"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "Sebagai Hijau"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "sebagai Merah"
 
@@ -15548,83 +15990,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "avg"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "hari"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15646,19 +16054,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dinamis"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elemen"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "elemen disalin ke ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_stem_from dan esc_step_to harus ditentukan bersama."
 
@@ -15670,47 +16074,49 @@ msgstr "persis"
 msgid "executed"
 msgstr "dieksekusi"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "tetap"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "ditemukan"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "grup host"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "ikon"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "gambar"
 
@@ -15718,7 +16124,7 @@ msgstr "gambar"
 msgid "in"
 msgstr "dalam"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15728,7 +16134,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "adalah"
 
@@ -15736,20 +16142,20 @@ msgstr "adalah"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "terakhir"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "seperti"
@@ -15758,12 +16164,12 @@ msgstr "seperti"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15772,46 +16178,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "makro"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "pemeliharaan"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "peta"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "Minimal 60 detik"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15820,17 +16226,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "harus user LDAP yang valid"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "tidak ada data"
@@ -15843,12 +16249,14 @@ msgstr "tidak didalam"
 msgid "not like"
 msgstr "tidak seperti"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "tidak berjalan"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "tidak dipilih"
 
@@ -15857,57 +16265,61 @@ msgstr "tidak dipilih"
 msgid "not sent"
 msgstr "tidak terkirim"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "sekarang"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "dari"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "pada"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "lainnya"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "segarkan setiap"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15916,25 +16328,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "ingat yang dipilih"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "berjalan"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "det"
 
@@ -15947,7 +16358,7 @@ msgstr "detik"
 msgid "sent"
 msgstr "terkirim"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "penjelasan singkat"
 
@@ -15955,36 +16366,36 @@ msgstr "penjelasan singkat"
 msgid "show icon mappings"
 msgstr "tampilkan pemetaan ikon"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "tampilkan nilai pemetaan"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "template ID \"%1$s\" dilewatkan %2$s kali"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "ke"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "trigger"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "tidak diketahui"
 
@@ -15996,11 +16407,11 @@ msgstr "nilai"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyyy"
diff --git a/frontends/php/locale/it/LC_MESSAGES/frontend.po b/frontends/php/locale/it/LC_MESSAGES/frontend.po
index 1ed4489abd7..5c68fa3b069 100644
--- a/frontends/php/locale/it/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/it/LC_MESSAGES/frontend.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
-"PO-Revision-Date: 2014-02-13 08:04+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
+"PO-Revision-Date: 2014-07-30 08:08+0300\n"
 "Last-Translator: quadrata <dimitri.bellini@quadrata.it>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
 "Language: it\n"
@@ -13,31 +13,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1392271478.0\n"
+"X-POOTLE-MTIME: 1406700499.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" deve essere compresa tra 1970.01.01 e 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"I trigger lampeggiano al cambio di stato\" deve essere \"0\" o un intero positivo.\"I trigger lampeggiano al cambio di stato\" deve essere \"0\" o un intero positivo."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"I trigger lampeggiano al cambio di stato\" deve essere \"0\" o un intero positivo.\"I trigger lampeggiano al cambio di stato\" deve essere \"0\" o un intero positivo."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d giorno"
 msgstr[1] "%1$d giorni"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,24 +51,22 @@ msgstr[1] "%1$d di %2$d problemi visualizzati"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (anno %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s voce"
 msgstr[1] "%1$s voci"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s giorno"
 msgstr[1] "%1$s giorni"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -78,10 +78,10 @@ msgstr[1] "%1s minuti"
 #, c-format
 msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1$s tentativo disponibile"
+msgstr[1] "%1$s tentativi disponibili"
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -102,23 +102,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d dispositivo"
 msgstr[1] "%d dispositivi"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - indefinitamente)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Solo i super amministratori possono creare gruppi)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(in giorni)"
 
@@ -126,34 +126,34 @@ msgstr "(in giorni)"
 msgid "(in sec)"
 msgstr "(in sec)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimo 60 secondi, 0 - usa il valore predefinito)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(nessun proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr "(con allarmi)"
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[ACKNOWLEDGE MASSIVO]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 o 1"
 
@@ -169,7 +169,7 @@ msgstr "10 secondi"
 msgid "30 seconds"
 msgstr "30 secondi"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "vista 3D"
 
@@ -185,7 +185,7 @@ msgstr "5 secondi"
 msgid "500 latest values"
 msgstr "ultimi 500 valori"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Sub-menu/Sub-menu.../>Script"
 
@@ -195,7 +195,7 @@ msgstr "<manuale>"
 
 #: include/views/administration.auditacts.list.php:31
 msgid "ACTION LOG"
-msgstr ""
+msgstr "ACTION LOG"
 
 #: include/views/configuration.host.discovery.edit.php:144
 #: include/views/configuration.item.edit.php:150
@@ -204,36 +204,35 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ALLARMI CON ACKNOWLEDGE"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "E"
 
 #: include/views/administration.auditlogs.list.php:31
 msgid "AUDIT LOG"
-msgstr ""
+msgstr "AUDIT LOG"
 
 #: report2.php:163
 msgid "AVAILABILITY REPORT"
 msgstr "RESOCONTO DISPONIBILITÀ"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "La differenza assoluta tra l'ultimo valore ed il precedente e' < N."
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "La differenza assoluta tra l'ultimo valore ed il precedente e' = N."
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "La differenza assoluta tra l'ultimo valore ed il precedente e' > N."
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "La differenza assoluta tra l'ultimo valore ed il precedente NON e' N."
 
@@ -245,42 +244,42 @@ msgstr "SLA accettabile"
 msgid "Access denied!"
 msgstr "Accesso negato!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Accesso negato."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "L'account è bloccato per %s secondi"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Ack"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Acknowledge"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Acknowledge aggiunta"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Aggiungi acknowledge all'allarme da"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Aggiungi acknowledge e ritorna"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Stato acknowledge"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Con acknowledge"
 
@@ -305,62 +304,65 @@ msgstr "Acknowledge disabilitati"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Azione"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "L'azione \"%1$s\" esiste già."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "L'azione \"%1$s\" ha un valore errato per \"esc_period\" (minimo %2$s secondi)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "L'azione \"%1$s\" non ha operazioni definite."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Azione aggiunta"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Azione rimossa"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] "Azione disabilitata"
 msgstr[1] "Azioni disabilitate"
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] "Azione abilitata"
@@ -371,23 +373,23 @@ msgstr[1] "Azioni abilitate"
 #: include/views/administration.auditacts.list.php:32
 #: include/views/administration.auditlogs.list.php:29
 msgid "Action log"
-msgstr ""
+msgstr "Action log"
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Operazioni"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Azione aggiornata"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Azioni"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Attivo"
@@ -397,80 +399,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Attivo"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Attivo da"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Attivo fino a"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Aggiungi"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr "Aggiungi figlio"
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Aggiungi commento da"
 
@@ -486,27 +491,23 @@ msgstr "Aggiungi host"
 msgid "Add link"
 msgstr "Aggiungi collegamento"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Aggiungi mancanti"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Aggiungi applicazioni nuove o esistenti"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Aggiungi gruppi host nuovi o esistenti"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Aggiungi prototipo"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Aggiungi a"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Aggiungi ai preferiti"
@@ -515,7 +516,7 @@ msgstr "Aggiungi ai preferiti"
 msgid "Add to host group"
 msgstr "Aggiungi al gruppo host"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Aggiungi ai gruppi host"
 
@@ -527,7 +528,7 @@ msgstr "Aggiunto"
 msgid "Admin"
 msgstr "Ammin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Amministrazione"
 
@@ -535,34 +536,34 @@ msgstr "Amministrazione"
 msgid "Advanced labels"
 msgstr "Etichette avanzate"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Età"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Periodo inferiore a"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Periodo inferiore a %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agente"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr "Nome Host Agent definito nel file di configurazione. Valore stringa."
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Interfacce agente"
@@ -571,12 +572,12 @@ msgstr "Interfacce agente"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Interfaccia agente o SNMP o JMX o IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr "Aggregate check non richiedono nessun agent avviato sull'host da monitorare. Zabbix server colleziona aggregando le metriche presenti sul database interno. Vedere manuale Zabbix."
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -584,123 +585,125 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Allinea icone"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Tutti"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Tutti i gruppi"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tutti i collegamenti devono avere \"Nome\" e \"URL\" definiti"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Host consentiti"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr "Quantita' di memoria in byte. Se non specificata verra' utilizzata quella totale."
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
-msgstr ""
+msgstr "And"
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
-msgstr ""
+msgstr "And/Or"
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Tutti"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Tutte le stringhe di caratteri incluse"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Applicazione"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "L'applicazione \"%1$s\" esiste già."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Applicazione aggiunta"
 
-#: applications.php:151 applications.php:186
-#, fuzzy
+#: applications.php:162 applications.php:202
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Applicazione eliminata"
 msgstr[1] "Applicazione eliminata"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Errore dell'applicazione."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Applicazione aggiornata"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "L'applicazione con ID \"%1$s\" non è disponibile su \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Applica"
 
@@ -709,16 +712,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Prossimo"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Apr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Aprile"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Sicuro di voler eseguire questa azione?"
 
@@ -734,9 +737,9 @@ msgstr "Dimensione area"
 msgid "Area type"
 msgstr "Tipo area"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -750,52 +753,49 @@ msgstr "Come testo semplice"
 msgid "Asset tag"
 msgstr "Tag attività"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "Alle %1$s:%2$s il %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "Alle %1$s:%2$s il %3$s %4$s di ogni %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "Alle %1$s:%2$s il giorno %3$s di ogni %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] "Alle %1$s:%2$s ogni %3$s di tutte le settimane"
 msgstr[1] "Alle %1$s:%2$s di ogni %3$s di tutte %4$s le settimane"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] "Alle %1$s:%2$s di tutti i giorni"
 msgstr[1] "Alle %1$s:%2$s di tutti %3$s i giorni"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "Alle (ore:minuti)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Selezionare almeno un host o gruppo."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Creare almeno un intervallo di manutenzione."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr "Almeno un'istanza di MySQL, PostgreSQL, Oracle, SQLite3 o IBM DB2 deve essere supportata."
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audit"
@@ -813,28 +813,30 @@ msgstr "Ritenzione dati Audit su disco (in giorni) \"%1$s\"."
 #: include/views/administration.auditlogs.list.php:28
 #: include/views/administration.auditlogs.list.php:32
 msgid "Audit log"
-msgstr ""
+msgstr "Audit log"
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Ago"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Agosto"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Algoritmo di autenticazione"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -893,9 +895,9 @@ msgstr "Ritenzione eventi e avvisi di Auto-registration su disco"
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr "Ritenzione eventi e avvisi di Auto-registration su disco (in giorni) \"%1$s\"."
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automatico"
 
@@ -903,20 +905,20 @@ msgstr "Automatico"
 msgid "Automatic icon mapping"
 msgstr "Mappatura icone automatica"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Selezione automatica icona"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Disponibilità"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Report disponibilita'"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Disponibile"
 
@@ -925,36 +927,36 @@ msgstr "Disponibile"
 msgid "Average"
 msgstr "Media"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Media per"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Il valore medio di un periodo T è < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Il valore medio di un periodo T è = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Il valore medio di un periodo T è > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Il valore medio di un periodo T NON è N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Lato asse"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Sfondo"
@@ -963,7 +965,7 @@ msgstr "Sfondo"
 msgid "Background image"
 msgstr "Immagine di sfondo"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Report a barre"
 
@@ -973,8 +975,8 @@ msgid "Base DN"
 msgstr "DN base"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Autenticazione semplice"
+msgid "Basic"
+msgstr "Basic"
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -986,15 +988,15 @@ msgstr "Associa DN"
 msgid "Bind password"
 msgstr "Associa password"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Il bit AND degli ultimi (più recenti) valore e maschera di T è = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Il bit AND degli ultimi (più recenti) valore e maschera di T NON è N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Il bit AND degli ultimi (più recenti) valore e maschera di T NON è N"
 
@@ -1006,8 +1008,8 @@ msgstr "Lampeggiante"
 msgid "Blocked"
 msgstr "Bloccato"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Linea in grassetto"
 
@@ -1015,22 +1017,22 @@ msgstr "Linea in grassetto"
 msgid "Boolean"
 msgstr "Booleano"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "In basso"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Illumina"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgaro (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Acknowledge massivo"
 
@@ -1056,7 +1058,7 @@ msgstr "CONFIGURAZIONE APPLICAZIONI"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURAZIONE AUTENTICAZIONE"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1086,7 +1088,7 @@ msgstr "CONFIGURAZIONE GRUPPI HOST"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "CONFIGURAZIONE DEI PROTOTIPI HOST"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURAZIONE HOST"
 
@@ -1098,7 +1100,7 @@ msgstr "CONFIGURAZIONE HOUSEKEEPING"
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURAZIONE MAPPATURA ICONE"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURAZIONE IMMAGINI"
 
@@ -1107,14 +1109,14 @@ msgstr "CONFIGURAZIONE IMMAGINI"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURAZIONE SERVIZI IT"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURAZIONE PROTOTIPI DI ITEM"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURAZIONE PARAMETRI"
 
@@ -1143,7 +1145,7 @@ msgstr "CONFIGURAZIONE MAPPE DI RETE"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURAZIONE PROXY"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURAZIONE ESPRESSIONI REGOLARI"
 
@@ -1163,7 +1165,7 @@ msgstr "CONFIGURAZIONE SCRIPT"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURAZIONE PRESENTAZIONI"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURAZIONE TEMPLATE"
 
@@ -1179,7 +1181,7 @@ msgstr "CONFIGURAZIONE SEVERITY DEI TRIGGER"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURAZIONE TRIGGER"
 
@@ -1211,22 +1213,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURAZIONE ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr "CPU info - lista completa informazioni per tutte le CPU di default"
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr "CPU(s) load. Processor load. La \"cpu\" e il \"mode\" sono opzionali. Se non viene specificata una \"cpu\" vengono utilizzate tutte. Se \"mode\" non e' specificato viene utilizzato avg1 di default. Attenzione non sono valori espressi in percentuale."
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
-msgstr "CPU utilisation. Processor load in percents. La \"cpu\",\"type\" e \"mode\" sono opzioni. Se \"cpu\" e' assente vengono utilizzate tutte. Se \"type\" e' assente viene utilizzato \"user\". Se \"mode\" e' assente viene utilizzato \"avg1\"."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
+msgstr "CPU (s) utilizzo. Carico del processore in percentuale. La cpu, \"type e mode\" sono opzionali. Se \"cpu\"  non specifita sono tutte utilizzate. Se \"type\" non specificato viene utilizzata la \"user\". Se \"mode\" non specificato e' utilizzato avg1."
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr "Calcola MD5 check sum per il file indicato. Stringa hash MD5 del file. Puo' essere utilizzato solo per file inferiori ai 64MB, altrimenti non supportato. Esempio: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 
@@ -1235,21 +1237,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Calcola SLA, SLA accettabile (in %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr "Calcola check sum per il file indicato. Check sum del file calcolato con algoritmo standard UNIX utilizzando l'utility \"cksum\". Esempio: vfs.file.cksum[/etc/passwd]"
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
-msgstr "Calcola spazio disco per il volume indicato. Spazio disco in KB. Se \"mode\" non e' specificato viene utilizzata l'opzione \"total\". In caso di \"mounted volume\", viene restituito lo spazio non utilizzato dal file system locale. Esempio: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+msgstr "Calcolo spazio disco per un dato volume. Lo spazio disco e' in KB. Se \"mode\" assente viene utilizzato \"total\". In caso di volume montato, viene restituito lo spazio inutilizzato su disco per il file system locale. Esempio: vfs.fs.size [/ tmp, libero]."
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Calculated"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Permessi calcolati"
 
@@ -1257,92 +1259,95 @@ msgstr "Permessi calcolati"
 msgid "Callback"
 msgstr "Callback"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canada (136 caratteri)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Annulla"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Impossibile aggiungere acknowledge all'evento"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Impossibile aggiungere un item non-numerico \"%1$s\" al grafico \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Impossibile aggiungere un item non-numerico \"%1$s\" al prototipo di grafico \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Impossibile aggiungere un item non-numerico \"%1$s\"."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Impossibile aggiungere l'azione"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Impossibile aggiungere condizione dell'azione."
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Impossibile aggiungere l'applicazione"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Impossibile aggiungere dipendenza da un host a un template"
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Impossibile aggiungere dipendenza dal trigger \"%1$s:%2$s\" al trigger inesistente \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Impossibile aggiungere regola di discovery"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Impossibile aggiungere il grafico"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr "Impossibile aggiungere il grafico prototipo"
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Impossibile aggiungere il gruppo"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
-msgstr ""
+msgstr "Impossibile aggiungere il gruppo."
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Impossibile aggiungere l'host"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Impossibile aggiungere prototipo host"
 
@@ -1350,24 +1355,24 @@ msgstr "Impossibile aggiungere prototipo host"
 msgid "Cannot add image"
 msgstr "Impossibile aggiungere l'immagine"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Impossibile aggiungere l'immagine"
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Impossibile aggiungere l'item"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Non posso aggiungere l'item \"%1$s\" da \"%2$s\" all'applicazione \"%3$s\" da \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr "Impossibile aggiungere l'item prototipo"
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Impossibile aggiungere item."
 
@@ -1375,20 +1380,20 @@ msgstr "Impossibile aggiungere item."
 msgid "Cannot add macro."
 msgstr "Impossibile aggiungere la macro"
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Impossibile aggiungere manutenzione"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Impossibile aggiungere il tipo di supporto"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Impossibile aggiungere più di un item del tipo \"Somma grafici\" nel grafico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "Impossibile aggiungere più di un item del tipo \"Somma grafici\" al prototipo di grafico \"%1$s\"."
@@ -1397,24 +1402,24 @@ msgstr "Impossibile aggiungere più di un item del tipo \"Somma grafici\" al pro
 msgid "Cannot add network map"
 msgstr "Impossibile aggiungere la mappa di rete"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Impossibile aggiungere nuova applicazione \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Impossibile aggiungere il proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Impossibile aggiungere l'espressione regolare"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Impossibile aggiungere la schermata"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Impossibile aggiungere lo script"
 
@@ -1426,27 +1431,27 @@ msgstr "Impossibile aggiungere il servizio"
 msgid "Cannot add slide show"
 msgstr "Impossibile aggiungere la presentazione"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Impossibile aggiungere il template"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Impossibile aggiungere il trigger"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr "Impossibile aggiungere il trigger prototipo"
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Impossibile aggiungere l'utente"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Impossibile aggiungere l'utente. Entrambe le password devono essere uguali."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Impossibile aggiungere utenti."
 
@@ -1454,7 +1459,7 @@ msgstr "Impossibile aggiungere utenti."
 msgid "Cannot add value map"
 msgstr "Impossibile aggiungere mappa dei valori"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Impossibile aggiungere scenario web"
 
@@ -1474,23 +1479,23 @@ msgstr "Impossibile cambiare metodo di autenticazione in LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Impossibile cambiare metodo di autenticazione in interna Zabbix"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Impossibile cancellare storico"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Impossibile clonare prototipi di grafico."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Impossibile clonare prototipi host."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Impossibile clonare prototipi di item."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Impossibile clonare prototipi di trigger."
 
@@ -1498,20 +1503,20 @@ msgstr "Impossibile clonare prototipi di trigger."
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Non è possibile connettersi alla porta del trapper del demone Zabbix server, ma dovrebbe essere disponibile per eseguire lo script."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Impossibile copiare grafici"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Impossibile copiare item"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Impossibile copiare trigger \"%1$s:%2$s\", perchè contiene host multipli nell'espressione."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "Impossibile creare prototipo host per un host discoverato \"%1$s\"."
@@ -1520,19 +1525,19 @@ msgstr "Impossibile creare prototipo host per un host discoverato \"%1$s\"."
 msgid "Cannot create another database connection."
 msgstr "Impossibile creare un'altra connessione database."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Impossibile creare dipendenze circolari."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Impossibile creare dipendenza nel trigger stesso."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Impossibile creare regola di discovery"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Impossibile creare gruppo host."
 
@@ -1540,102 +1545,100 @@ msgstr "Impossibile creare gruppo host."
 msgid "Cannot create icon map"
 msgstr "Impossibile creare mappa icone"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Impossibile creare mappe icone con nome identico \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Impossibile creare mappa \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Impossibile creare nuova applicazione, uno scenario web è già assegnato all'applicazione.Impossibile creare nuova applicazione, uno scenario web è già assegnato all'applicazione."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Impossibile creare nuovo elemento"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Impossibile creare schermata."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
-msgstr ""
+msgstr "Impossibile creare template."
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Impossibile rimuovere utente interno Zabbix \"%1$s\", prova a disabilitare quell'utente."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Impossibile cancellare l'azione"
 
-#: applications.php:151 applications.php:187
-#, fuzzy
+#: applications.php:162 applications.php:203
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Impossibile cancellare l'applicazione"
 msgstr[1] "Impossibile cancellare l'applicazione"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Impossibile cancellare dipendenza"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Impossibile cancellare regola di discovery"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Impossibile cancellare regola di discovery"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Impossibile rimuovere il grafico"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Impossibile rimuovere prototipo di grafico"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr "Non posso cancellare il grafico prototipo"
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Impossibile rimuovere grafico."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Impossibile rimuovere grafici"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Impossibile rimuovere grafici creati da discovery di basso livello."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
 msgid "Cannot delete group"
-msgstr "Impossibile rimuovere il gruppo"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Impossibile rimuovere il gruppo"
+msgstr[1] "Impossibile rimuovere il gruppo"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Impossibile rimuovere l'host"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Impossibile rimuovere gruppo host."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Impossibile rimuovere prototipo host."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Impossibile rimuovere prototipo host"
 
@@ -1643,79 +1646,79 @@ msgstr "Impossibile rimuovere prototipo host"
 msgid "Cannot delete icon map"
 msgstr "Impossibile rimuovere mappa icone"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Impossibile rimuovere l'immagine"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Impossibile rimuovere inventario."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Impossibile rimuovere l'item"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr "Non posso cancellare l'item prototipo"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr "Non posso cancellare l'item prototipo"
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Impossibile rimuovere gli item"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Impossibile rimuovere item creati da discovery di basso livello."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Impossibile rimuovere manutenzione"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Impossibile rimuovere il tipo di supporto"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Impossibile rimuovere la mappa di rete"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Impossibile rimuovere il proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Impossibile rimuovere l'espressione regolare"
 msgstr[1] "Impossibile rimuovere le espressioni regolari"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Impossibile rimuovere la schermata"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Impossibile rimuovere lo script"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Impossibile rimuovere gli script. Parametro input \"scriptids\" vuoto."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Impossibile rimuovere gli script. Lo script \"%1$s\" e' utilizzato nell'operazione \"%2$s\" dell'azione."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Impossibile rimuovere gli scripts. Lo script con scriptid \"%s\" non esiste."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Impossibile rimuovere azioni selezionate."
 
@@ -1723,77 +1726,80 @@ msgstr "Impossibile rimuovere azioni selezionate."
 msgid "Cannot delete service"
 msgstr "Impossibile rimuovere il servizio"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Impossibile rimuovere la presentazione"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Impossibile rimuovere il template"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Impossibile rimuovere applicazioni con template."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Impossibile rimuovere i grafici basati su template."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Impossibile rimuovere prototipo host con template."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Impossibile rimuovere l'item basato su template."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Impossibile rimuovere gli item basati su template"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Impossibile rimuovere gli item basati su template."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Impossibile rimuovere i trigger \"%1$s:%2$s\" basati su template."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Impossibile rimuovere scenario web con template \"%1$s\"."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Impossibile rimuovere il trigger"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Impossibile rimuovere il prototipo di trigger"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr "Non posso cancellare il trigger prototipo"
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Impossibile rimuovere il trigger."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Impossibile rimuovere i trigger"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Impossibile rimuovere i trigger creati da discovery di basso livello."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Impossibile rimuovere l'utente"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Impossibile rimuovere supporto utente."
 
@@ -1801,77 +1807,77 @@ msgstr "Impossibile rimuovere supporto utente."
 msgid "Cannot delete value map"
 msgstr "Impossibile rimuovere mappa valori"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Impossibile rimuovere scenario web"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] "Impossibile disabilitare azione"
 msgstr[1] "Impossibile disabilitare le azioni"
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] "Impossibile disabilitare regola di discovery"
 msgstr[1] "Impossibile disabilitare regole di discovery"
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] "Impossibile disabilitare regole di discovery"
 msgstr[1] "Impossibile disabilitare regole di discovery"
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "Impossibile disabilitare host"
 msgstr[1] "Impossibile disabilitare gli host"
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] "Impossibile disabilitare prototipo host"
 msgstr[1] "Impossibile disabilitare prototipi host"
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Impossibile disabilitare item"
 msgstr[1] "Impossibile disabilitare gli item"
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] "Impossibile disabilitare prototipo item"
 msgstr[1] "Impossibile disabilitare prototipi item"
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Impossibile disabilitare tipo di supporto"
 msgstr[1] "Impossibile disabilitare tipo di supporto"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "Impossibile disabilitare trigger"
 msgstr[1] "Impossibile disabilitare i trigger"
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] "Impossibile disabilitare prototipo trigger"
 msgstr[1] "Impossibile disabilitare prototipi trigger"
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] "Impossibile disabilitare gruppo utente"
 msgstr[1] "Impossibile disabilitare gruppi utente"
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Impossibile disabilitare scenario web"
@@ -1885,134 +1891,128 @@ msgstr "Impossibile visualizzare coda item."
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "Impossibile visualizzare più di un item del tipo \"Somma grafici\"."
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] "Impossibile abilitare l'azione"
 msgstr[1] "Impossibile abilitare le azioni"
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] "Impossibile abilitare regola discovery"
 msgstr[1] "Impossibile abilitare le regole di discovery"
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] "Impossibile abilitare le regole di discovery"
 msgstr[1] "Impossibile abilitare le regole di discovery"
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "Impossibile abilitare host"
 msgstr[1] "Impossibile abilitare gli host"
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] "Impossibile abilitare prototipo host"
 msgstr[1] "Impossibile abilitare prototipi host"
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Impossibile abilitare item"
 msgstr[1] "Impossibile abilitare gli item"
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] "Impossibile abilitare prototipo item"
 msgstr[1] "Impossibile abilitare i prototipi item"
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Impossibile abilitare tipo di supporto"
 msgstr[1] "Impossibile abilitare tipo di supporto"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "Impossibile abilitare trigger"
 msgstr[1] "Impossibile abilitare i trigger"
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] "Impossibile abilitare prototipo trigger"
 msgstr[1] "Impossibile abilitare prototipi trigger"
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] "Impossibile abilitare gruppo utente"
 msgstr[1] "Impossibile abilitare gruppi utente"
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Impossibile abilitare scenario web"
 msgstr[1] "Impossibile abilitare scenari web"
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossibile trovare immagine di sfondo \"%1$s\" utilizzata nella mappa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossibile trovare grafico \"%1$s\" utilizzato nella schermata \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossibile trovare gruppo \"%1$s\" utilizzato nella mappa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossibile trovare gruppo \"%1$s\" utilizzato nella schermata \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossibile trovare host \"%1$s\" utilizzato nella mappa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossibile trovare host \"%1$s\" utilizzato nella schermata \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Impossibile trovare gruppo host \"%1$s\" per il prototipo host \"%2$s\" della regola di discovery \"%3$s\" su \"%4$s\"."
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Impossibile trovare interfaccia host su \"%1$s\" per la chiave item \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Non è possibile trovare host o template \"%1$s\" utilizzati nel grafico \"%2$s\"."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2023,34 +2023,53 @@ msgstr "Impossibile trovare icona \"%1$s\" utilizzata nella mappa \"%2$s\"."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossibile trovare mappa icone \"%1$s\" utilizzata nella mappa \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph \"%3$s\"."
 msgstr "Impossibile trovare l'item \"%1$s\" su \"%2$s\" utilizzato come valore MAX per l'asse Y sul grafico \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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 "Impossibile trovare l'item \"%1$s\" su \"%2$s\" utilizzato come valore MAX per l'asse Y sul grafico prototipo \"%3$s\" originato dalla regola di discovery \"%4$s\" su \"%5$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph \"%3$s\"."
 msgstr "Impossibile trovare l'item \"%1$s\" su \"%2$s\" utilizzato come valore MIN per l'asse Y sul grafico \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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 "Impossibile trovare l'item \"%1$s\" su \"%2$s\" utilizzato come valore MIN per l'asse Y sul grafico prototipo \"%3$s\" originato dalla regola di discovery \"%4$s\" su \"%5$s\"."
 
-#: include/classes/import/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossibile trovare item \"%1$s\" utilizzato nella schermata \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Impossibile trovare mappa \"%1$s\" utilizzata nella mappa esportata \"%2$s\"."
@@ -2060,41 +2079,41 @@ msgstr "Impossibile trovare mappa \"%1$s\" utilizzata nella mappa esportata \"%2
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossibile trovare mappa \"%1$s\" utilizzata nella mappa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossibile trovare mappa \"%1$s\" utilizzata nella schermata \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Impossibile trovare oggetti con nome"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Impossibile trovare schermata \"%1$s\" utilizzata nella schermata \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Impossibile trovare template \"%1$s\" per prototipo host \"%2$s\" della regola di discovery \"%3$s\" su \"%4$s\"."
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Impossibile trovare trigger \"%1$s\" utilizzato nella mappa \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr "Impossibile trovare il valore mappa \"%1$s\" usato per l'elemento \"%2$s\" su \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Impossibile trovare il valore mappa \"%1$s\" utilizzato per il item prototipo \"%2$s\" della regola di discovery \"%3$s\" su \"%4$s\"."
@@ -2107,12 +2126,14 @@ msgstr "Impossibile formattare Albero. Controlla la struttura logica nei collega
 msgid "Cannot format tree."
 msgstr "Impossibile formattare albero."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
-msgstr ""
+msgstr "Impossibile avere il nome template vuoto."
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Impossibile implodere espressione \"%s\"."
@@ -2124,59 +2145,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] "Non è possibile importare la schermata \"%1$s\": sottoschermata \"%2$s\" inesistente."
 msgstr[1] "Non è possibile importare la schermata \"%1$s\": sottoschermate \"%2$s\" inesistenti."
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "Non e' possibile importare il template \"%1$s\", template collegato \"%2$s\" inesistente."
 msgstr[1] "Non e' possibile importare il template \"%1$s\", template collegati \"%2$s\" inesistenti."
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Impossibile includere file vista \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
-msgstr ""
+msgstr "Impossibile inserire espressione trigger"
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Impossibile inserire supporto utente."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Impossibile collegare template"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
-msgstr ""
+msgstr "Impossibile collegare template."
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr "Login non possibile"
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Impossibile disconnettersi."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Impossibile aggiornare massivamente nome host."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
-msgstr ""
+msgstr "Impossibile aggiornare massivamente nome template."
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Impossibile aggiornare massivamente nome visibile host."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
-msgstr ""
+msgstr "Impossibile aggiornare massivamente nome visibile del template."
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Impossibile passare ID template duplicati per il collegamento: %s."
@@ -2196,7 +2218,7 @@ msgstr "Impossibile eseguire aggiornament statement nella tabella \"%1$s\" senza
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Impossibile eseguire aggiornamento statement nella tabella \"%1$s\" senza condizione where."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "Non è possibile processare applicazioni provenienti da host o template differenti."
 
@@ -2205,23 +2227,23 @@ msgstr "Non è possibile processare applicazioni provenienti da host o template
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Impossibile leggere risposta, controlla connessione al server Zabbix \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Impossibile rimuovere tutti gli item, almeno un item deve rimanere."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
-msgstr ""
+msgstr "Impossibile rimuovere gruppo."
 
 #: adm.macros.php:104
 msgid "Cannot remove macro."
 msgstr "Impossibile rimuovere macro."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Impossibile rinominare utente guest."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Impossibile salvare regola di discovery senza controlli."
 
@@ -2230,217 +2252,226 @@ msgstr "Impossibile salvare regola di discovery senza controlli."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Impossibile inviare comando, controlla connessione al server Zabbix \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "Impossibile impostare \"%1$s\" per l'item \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Impossibile impostare \"%1$s\" per il trigger \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Impossibile impostare \"templateid\" per l'applicazione \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Impossibile impostare \"templateid\" per la schermata \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Impossibile impostare \"templateid\" per il prototipo di trigger \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Impossibile impostare campi inventario per un inventario disabilitato."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Impossibile cambiare host per l'interfaccia."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Impossibile sbloccare utenti"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Impossibile scollegare e pulire scenari Web."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Impossibile scollegare e pulire applicazioni."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Impossibile scollegare e pulire le regole di discovery"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Impossibile scollegare e pulire prototipi di grafico"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Impossibile scollegare e pulire grafici."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Impossibile scollegare e pulire prototipi di item"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Impossibile scollegare e pulire gli item"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Impossibile scollegare e pulire i trigger"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Impossibile scollegare template"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
-msgstr ""
+msgstr "Impossibile scollegare template."
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Impossibile scollegare il trigger \"%s\", possiede item da un template che e' stato lasciato collegato all'host."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "Impossibile aggiornare \"%1$s\" per l'host discoverato."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Impossibile aggiornare \"%1$s\" per un item discoverato."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Impossibile aggiornare \"%1$s\" per un trigger discoverato."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr "Impossibile aggiornate \"%1$s\" per l'azione \"%2$s\"."
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Impossibile aggiornare \"%1$s\" per l'item \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Impossibile aggiornare \"%1$s\" per il trigger \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr "Impossibile aggiornare \"imagetype\" per l'immagine \"%1$s\"."
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Impossibile aggiornare \"templateid\" per l'applicazione \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Impossibile aggiornare \"templateid\" per il grafico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Impossibile aggiornare \"templateid\" per il prototipo di grafico \"%1$s\"."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Impossibile aggiornare \"templateid\" per la schermata \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr "Impossibile aggiornare \"templateid\" per il template schermata \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Impossibile aggiornare \"templateid\" per il prototipo di trigger \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Impossibile aggiornare un grafico discoverato."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Impossibile aggionrare un gruppo host discoverato."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Impossibile aggiornare l'azione"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Impossibile aggiornare l'applicazione"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Impossibile aggiornare aggiornare il commento"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Impossibile aggiornare la configurazione"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Impossibile aggiornare la modalità debug"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr "Impossibile aggiornare la descrizione"
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Impossibile aggiornare la regola di discovery"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Impossibile aggiornare l'accesso al frontend"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Impossibile aggiornare il grafico"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr "Impossibile aggiornare il grafico prototipo"
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Impossibile aggiornare il gruppo"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Impossibile aggiornare il gruppo."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Impossibile aggiornare gruppi per l'host discoverato \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Impossibile aggiornare l'host"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Impossibile aggiornare il prototipo host"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Impossibile aggiornare gli host"
 
@@ -2452,24 +2483,24 @@ msgstr "Impossibile aggiornare la mappa icone"
 msgid "Cannot update image"
 msgstr "Impossibile aggiornare immagine"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Impossibile aggiornare immagine."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Impossibile aggiornare l'interfaccia per l'host discoverato \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Impossibile aggiornare l'item"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr "Impossibile aggiornare item prototipo"
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Impossibile aggiornare gli item"
 
@@ -2481,16 +2512,16 @@ msgstr "Impossibile aggiornare la macro."
 msgid "Cannot update macros"
 msgstr "Impossibile aggiornare le macro"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Impossibile aggiornare la manutenzione"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Impossibile aggiornare la mappa \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Impossibile aggiornare il tipo di supporto"
 
@@ -2498,28 +2529,24 @@ msgstr "Impossibile aggiornare il tipo di supporto"
 msgid "Cannot update network map"
 msgstr "Impossibile aggiornare la mappa di rete"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Impossibile aggiornare il proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Impossibile aggiornare proxy per l'host discoverato \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Impossibile aggiornare l'espressione regolare"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Impossibile aggiornare la schermata"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Impossibile aggiornare la schermata."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Impossibile aggiornare lo script"
 
@@ -2531,40 +2558,41 @@ msgstr "Impossibile aggiornare il servizio"
 msgid "Cannot update slide show"
 msgstr "Impossibile aggiornare la presentazione"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Impossibile aggiornare il template"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Impossibile aggiornare applicazioni con template."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "Impossibile aggiornare template su host discoverato \"%1$s\"."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Impossibile aggiornare il trigger"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr "Impossibile aggiornare trigger prototipo"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr "Impossibile aggiornare i trigger prototipo"
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Impossibile aggiornare l'utente"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Impossibile aggiornare il supporto utente"
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Impossibile aggiornare l'utente. Entrambe le password devono essere uguali."
 
@@ -2572,15 +2600,15 @@ msgstr "Impossibile aggiornare l'utente. Entrambe le password devono essere ugua
 msgid "Cannot update value map"
 msgstr "Impossibile aggiornare la mappa dei valori"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Impossibile aggiornare scenario web"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "Impossibile validare controllo discovery: richiesta non valida o connessione al server Zabbix fallita.Impossibile validare controllo discovery: richiesta non valida o connessione al server Zabbix fallita.Impossibile validare controllo discovery: richiesta non valida o connessione al server Zabbix fallita.Impossibile validare controllo discovery: richiesta non valida o connessione al server Zabbix fallita.Impossibile validare controllo discovery: richiesta non valida o connessione al server Zabbix fallita.Impossibile validare controllo discovery: richiesta non valida o connessione al server Zabbix fallita."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Didascalia"
 
@@ -2589,47 +2617,47 @@ msgstr "Didascalia"
 msgid "Case sensitive"
 msgstr "Case sensitive"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr "Acquisisci tutte le trap SNMP provenienti da un indirizzo corrispondente alla regex. Default: Regex non definita."
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr "Acquisisci tutte le trap SNMP che non sono acquisite da altri snmptrap[] item provenienti dalla corrispettivo indirizzo dell'interfaccia."
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Centro"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Sostituisci"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Variazione"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Cambia password"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Carattere"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Stringa di caratteri inclusa"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Stringa di caratteri non inclusa"
 
@@ -2638,48 +2666,48 @@ msgid "Chassis"
 msgstr "Chassis"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr "Chassis info - restituisce tutte le informazioni di default"
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Il controllo esiste già."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Controlla la porzione di espressione che parte da \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr "Controlla l'esistenza del file. 0 - il file non esiste, 1 - file presente"
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr "Controlla se il servizio è disponibile. 0 - il servizio è giù, 1 - il servizio è in esecuzione. Se <ip> non specificato, viene utilizzato l'IP o il nome DNS della definizione host. Se <porta> non specificato, viene utilizzata la porta di defualt del servizio."
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
-msgstr "Controllare se il servizio è disponibile. 0 - il servizio è giù, 1 - il servizio è in esecuzione. Se <ip> non presente, viene utilizzato 127.0.0.1. Se il numero di porta non è presente, viene utilizzata la porta di default del servizio. Esempio: net.tcp.service [ftp,, 45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
-msgstr "Verifica stato del servizio \"service\". 0 - servizio down,  sec - numero di secondi trascorsi per connetersi al servizio. Se l'ip non e' specificato viene utilizzato 127.0.0.1. Se la porta non viene specificata, viene utilizzata la porta standard del servizio."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
+msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr "Controlla le prestazioni del servizio. 0 - servizio è down, sec - numero di secondi trascorsi per la connessione al servizio. Se <ip> assente, IP o nome DNS è acquisito dalla definizione dell'host. Se <porta> assente, viene utilizzata la porta di default del servizio."
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr "Controlla la fruibilità dell'agente. Risulta sempre 1. Può essere usato come un ping TCP."
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Controlla la chiave, per favore. L'esempio di default e' giusto."
 
@@ -2688,44 +2716,44 @@ msgid "Check type"
 msgstr "Tipo controllo"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
-msgstr "Verificare se è possibile effettuare una connessione TCP verso la porta (numero). 0 - non è possibile connettersi, 1 - può collegarsi. Indirizzo IP è opzionale. Se <ip> non presente, viene utilizzato 127.0.0.1. Esempio: net.tcp.port [80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Controlli"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr "Controlla se il servizio DNS è attivo. 0 - DNS è inattivo (server non ha risposto o risoluzione DNS fallita), 1 - DNS è attivo."
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr "Controlla se il server è accessibile tramite ping ICMP. 0 - ICMP ping fallito. 1 - ping ICMP eseguito con successo. Ogni processo zabbix_server eseguono un ICMP ping con frequenza PingerFrequency in secondi."
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr "Verifica se questa porta è in stato LISTEN. 0 - non è, 1 - è in stato LISTEN."
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "I controlli devono essere univoci."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Cinese (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Cinese (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Il collegamento circolare non può esser creato per l'elemento della mappa \"%s\"."
@@ -2740,34 +2768,35 @@ msgstr "Riferimento circolare nelle mappe: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Riferimento circolare nelle schermate: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Riferimento circolare nei template: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Il collegamento circolare di template non è permesso."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Classico"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Pulisci"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Pulisci storico e trend"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Pulisci storico per i selezionati"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Pulisci duranto lo scollegamento"
 
@@ -2777,69 +2806,69 @@ msgstr "Orologio"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Clona"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Chiudi"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Chiudi costruttore di espressioni"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Colore"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "Il colore \"%1$s\" è errato: atteso codice colore esadecimale (6 simboli)"
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Colore (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Larghezza colonna"
 
@@ -2854,7 +2883,7 @@ msgstr "Risultato combinato"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Comando"
 
@@ -2862,41 +2891,31 @@ msgstr "Comando"
 msgid "Command actions"
 msgstr "Azioni comando"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Il comando non può essere vuoto."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Comandi"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Commento aggiornato"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Commenti"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Commenti per \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Commerciale"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Confronta valori per periodi multipli"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Permessi composti"
 
@@ -2904,29 +2923,39 @@ msgstr "Permessi composti"
 msgid "Condition"
 msgstr "Condizione"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Condizioni"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr "Statistiche della cache di configurazione. Cache - buffer (modalità: pfree, total, used, free)."
 
@@ -3089,23 +3118,23 @@ msgstr "Configurazione aggiornata"
 msgid "Configure (Filter %s)"
 msgstr "Configura (Filtro %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Testo di conferma"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Connetti tramite"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Connesso a '%1$s'"
@@ -3164,7 +3193,7 @@ msgid "Context name"
 msgstr "Nome contesto"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr "Contesto switch."
 
@@ -3172,30 +3201,37 @@ msgstr "Contesto switch."
 msgid "Contract number"
 msgstr "Numero contratto"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Coordinate"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Copia"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Copia selezionati su ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Login corretto \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Impossibile salvare l'immagine!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Conteggio"
 
@@ -3215,6 +3251,10 @@ msgstr "Crea applicazione"
 msgid "Create application (select host first)"
 msgstr "Crea applicazione (seleziona prima host)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3232,7 +3272,7 @@ msgstr "Crea grafico (seleziona prima host)"
 msgid "Create graph prototype"
 msgstr "Crea prototipo di grafico"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Crea host"
 
@@ -3245,15 +3285,15 @@ msgstr "Crea gruppo di host"
 msgid "Create host prototype"
 msgstr "Crea prototipo host"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Crea mappa di icone"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Crea immagine"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Crea item"
 
@@ -3277,6 +3317,10 @@ msgstr "Crea mappa"
 msgid "Create media type"
 msgstr "Crea tipo di supporto"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Crea proxy"
@@ -3301,11 +3345,11 @@ msgstr "Crea script"
 msgid "Create slide show"
 msgstr "Crea presentazione"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Crea template"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Crea trigger"
 
@@ -3329,42 +3373,42 @@ msgstr "Crea gruppo utenti"
 msgid "Create value map"
 msgstr "Crea mappa di valore"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Creato: Applicazione \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Creato: Regola di discovery \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Creato: Prototipo host \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Creato: Item \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Creato: Prototipo di item \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Creato: Trigger \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Creato: Prototipo di trigger \"%1$s\" su \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Creato: Scenario web \"%1$s\" su \"%2$s\"."
@@ -3374,51 +3418,52 @@ msgid "Critical"
 msgstr "Critico"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr "OS installato - restituisce tutte le informazioni di default"
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "La data corrente è < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "La data corrente è = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "La data corrente è > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "La data corrente NON è N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Host corrente"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "L'ora corrente è < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "L'ora corrente è = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "L'ora corrente è > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "L'ora corrente NON è N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Valore corrente"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3431,7 +3476,7 @@ msgstr "Grafici personalizzati"
 msgid "Custom label"
 msgstr "Etichette personalizzate"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "L'etichetta personalizzata per gli elementi della mappa \"%2$s\" del tipo \"%1$s\" non può esser vuota."
@@ -3445,7 +3490,7 @@ msgstr "Moltiplicatore personalizzato"
 msgid "Custom screens"
 msgstr "Schermate personalizzate"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Script personalizzato"
 
@@ -3465,18 +3510,14 @@ msgstr "Dimensione personalizzata"
 msgid "Custom slides"
 msgstr "Diapositive personalizzate"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Czech (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "CONFIGURAZIONE CRUSCOTTO"
@@ -3492,28 +3533,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "DETTAGLI DELLO SCENARIO"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "DISABILITATO"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DA DISCOVERY"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3521,25 +3562,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Nome DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "GIÙ"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Per giorni"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Arancione scuro"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Scurisci"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Cruscotto"
 
@@ -3551,20 +3592,21 @@ msgstr "Configurazione cruscotto"
 msgid "Dashboard filter"
 msgstr "Filtro cruscotto"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Linea tratteggiata"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Dati"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr "Statistiche data cache. Cache - uno dei valori (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3587,11 +3629,12 @@ msgstr "Periodo storicizzazione del dato (in giorni)"
 msgid "Data type"
 msgstr "Tipo di dati"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "File di database"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Host del database"
 
@@ -3599,35 +3642,39 @@ msgstr "Host del database"
 msgid "Database monitor"
 msgstr "Database monitor"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Nome del database"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Password del database"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Porta del database"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Schema del database"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Server del database"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Tipo di database"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Utente del database"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Data"
 
@@ -3647,53 +3694,52 @@ msgstr "Data di scadenza manutenzione HW"
 msgid "Date HW purchased"
 msgstr "Data di acquisto HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Giorno"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Giorno del mese"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Giorno del mese è < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Giorno del mese è = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Giorno del mese è > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Giorno del mese NON è N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Giorno della settimana"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Giorno della settimana è < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Giorno della settimana è = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Giorno della settimana è > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Giorno della settimana NON è N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Giorni"
 
@@ -3701,22 +3747,22 @@ msgstr "Giorni"
 msgid "Debug"
 msgstr "Debug"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Modalità debug"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Modalità debug aggiornata"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dic"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Dicembre"
 
@@ -3726,15 +3772,14 @@ msgstr "Decimale"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Default"
 
@@ -3747,11 +3792,11 @@ msgid "Default delay (in seconds)"
 msgstr "Intervallo predefinito (in secondi)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Messaggio predefinito"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Durata predefinita step dell'operazione"
 
@@ -3774,30 +3819,34 @@ msgstr "Tema predefinito \"%1$s\"."
 msgid "Delay"
 msgstr "Intervallo"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Intervallo (in sec)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Ritardato di"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Rimuovi"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Rimuovi e pulisci"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Rimuovere e pulire template selezionati? (Attenzione: tutti gli host collegati saranno puliti!)Rimuovere e pulire template selezionati? (Attenzione: tutti gli host collegati saranno puliti!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Rimuovere e pulire il template? (Attenzione: tutti gli host collegati saranno puliti!)Rimuovere e pulire il template? (Attenzione: tutti gli host collegati saranno puliti!)"
 
@@ -3805,53 +3854,53 @@ msgstr "Rimuovere e pulire il template? (Attenzione: tutti gli host collegati sa
 msgid "Delete application?"
 msgstr "Rimuovere applicazione?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Rimuovere azione corrente?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Rimuovere regola di discovery?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Rimuovere espressione?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr "Cancella grafico prototipo?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Rimuovere il grafico?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Rimuovere storeico degli scenari WEB selezionati?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Rimuovere storico degli item selezionati?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Rimuovere mappa di icone?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr "Cancella item prototipo?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Rimuovere item?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Rimuovere parola chiave?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Rimuovere collegamenti tra gli elementi selezionati?"
 
@@ -3859,11 +3908,15 @@ msgstr "Rimuovere collegamenti tra gli elementi selezionati?"
 msgid "Delete maintenance period?"
 msgstr "Rimuovere periodo di manutenzione?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Rimuovere mappa di rete?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Rimuovere proxy?"
 
@@ -3871,7 +3924,7 @@ msgstr "Rimuovere proxy?"
 msgid "Delete regular expression?"
 msgstr "Rimuovere espressione regolare?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Rimuovere scenario?"
 
@@ -3879,71 +3932,67 @@ msgstr "Rimuovere scenario?"
 msgid "Delete screen?"
 msgstr "Rimuovere schermata?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Rimuovere script?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Rimuovi selezionati"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Rimuovere scenari WEB selezionati?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Rimuovere azioni selezionate?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Rimuovere applicazioni selezionate?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Rimuovere regole di discovery selezionate?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Rimuovere elementi selezionati?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr "Cancella grafici prototipo selezionati?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Rimuovere grafici selezionati?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Rimuovere gruppi selezionati?"
@@ -3952,27 +4001,27 @@ msgstr "Rimuovere gruppi selezionati?"
 msgid "Delete selected groups?"
 msgstr "Rimuovere gruppi selezionati?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Rimuovere gruppi di host selezionati?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr "Rimuovere prototipi host selezionati?"
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr "Rimuovere prototipi host selezionati?"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Rimuovi host selezionato?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Rimuovere gli host selezionati?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Rimuovere l'immagine selezionata?"
 
@@ -3980,31 +4029,31 @@ msgstr "Rimuovere l'immagine selezionata?"
 msgid "Delete selected item prototypes?"
 msgstr "Cancella item prototipo selezionati?"
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Rimuovere item selezionati?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Rimuovere periodi di manutenzione selezionati?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Rimuovere mappe selezionate?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Rimuovere tipo di supporto selezionato?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Rimuovere tipi di supporto?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Rimuovere proxy selezionati?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Rimuovere espressioni regolari selezionate?"
 
@@ -4012,15 +4061,15 @@ msgstr "Rimuovere espressioni regolari selezionate?"
 msgid "Delete selected screens?"
 msgstr "Rimuovere schermate selezionate?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Rimuovere script selezionati?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Rimuovere presentazioni selezionate?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Rimuovere template selezionati?"
 
@@ -4032,11 +4081,11 @@ msgstr "Cancella trigger prototipo selezionati?"
 msgid "Delete selected triggers?"
 msgstr "Rimuovere trigger selezionati?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Rimuovere utente selezionato?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Rimuovere utenti selezionati?"
 
@@ -4051,11 +4100,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Rimuovere mappatura di valori selezionata? È utilizzata per l'item %d!"
 msgstr[1] "Rimuovere mappatura di valori selezionata? È utilizzata per %d item!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Rimuovi selezionati assieme agli elementi collegati"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr "Eliminare servizio %1$s\"?"
@@ -4064,15 +4117,15 @@ msgstr "Eliminare servizio %1$s\"?"
 msgid "Delete slide show?"
 msgstr "Rimuovere presentazione?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Rimuovere template?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr "Cancella trigger prototipo?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Rimuovere trigger?"
 
@@ -4080,62 +4133,62 @@ msgstr "Rimuovere trigger?"
 msgid "Deleted"
 msgstr "Rimosso"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Rimossa: Applicazione \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Rimossa: Regola di discovery \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Rimosso: Grafico \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Rimosso: Host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Rimosso: Prototipo host \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Rimosso: Item \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Rimosso: Prototipo di item \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Rimosso: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Rimosso: Template \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Rimosso: Trigger \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Rimosso: Prototipo di trigger \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Rimosso: Scenario web \"%1$s\" su \"%2$s\"."
@@ -4144,35 +4197,35 @@ msgstr "Rimosso: Scenario web \"%1$s\" su \"%2$s\"."
 msgid "Delimiter"
 msgstr "Separatore"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (cambio semplice)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (velocità al secondo)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Nega"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Dipendenze"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Subordinato"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Dipende da"
 
@@ -4180,30 +4233,41 @@ msgstr "Dipende da"
 msgid "Deployment status"
 msgstr "Stato di deploy"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Descrizione"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Dettagli"
 
@@ -4216,71 +4280,71 @@ msgid "Device"
 msgstr "Dispositivo"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr "Device interrupts."
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr "Lista device - lista device PCI di default"
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr "Statistica letture device."
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Criteri di univocità del dispositivo"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr "Statistica scritture device."
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "La differenza tra i valori MAX e MIN del periodo T è < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "La differenza tra i valori MAX e MIN del periodo T è = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "La differenza tra i valori MAX e MIN del periodo T è > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "La differenza tra i valori MAX e MIN del periodo T NON è N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Differenza tra l'ultimo valore e il precedente, allora N = 1, 0 - altrimentiDifferenza tra l'ultimo valore e il precedente, allora N = 1, 0 - altrimenti"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Differenza tra l'ultimo valore e i precedenti, allora N NON 1, 0 - altrimentiDifferenza tra l'ultimo valore e i precedenti, allora N NON 1, 0 - altrimenti"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "La differenza tra l'ultimo valore e i precedenti è < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "La differenza tra l'ultimo valore e il precedente è = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "La differenza tra l'ultimo valore e il precedente è > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "La differenza tra l'ultimo valore e il precedente NON è N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr "Diverse informazioni su processo/i specifico/i"
 
@@ -4304,48 +4368,44 @@ msgstr "Disabilitare modalità debug nei gruppi selezionati?"
 msgid "Disable host"
 msgstr "Disabilita host"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Disabilitare host?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Disabilitare host nei gruppi di host selezionato?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Disabilitare host monitorati dai proxy selezionati?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Disabilita selezionati"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Disabilitare scenari WEB selezionati?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Disabilitare azioni selezionate?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Disabilitare applicazioni selezionate?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Disabilitare regole di discovery selezionate?"
 
@@ -4353,11 +4413,11 @@ msgstr "Disabilitare regole di discovery selezionate?"
 msgid "Disable selected groups?"
 msgstr "Disabilitare gruppi selezionati?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr "Disabilitare prototipi host selezionati?"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Disabilitare host selezionati?"
 
@@ -4365,42 +4425,47 @@ msgstr "Disabilitare host selezionati?"
 msgid "Disable selected item prototypes?"
 msgstr "Disabilita item prototipo selezionati?"
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Disabilitare item selezionati?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Disabilitare tipi di supporto selezionati?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr "Disabilita trigger prototipo selezionati?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Disabilitare trigger selezionati?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Disabilitato"
 
@@ -4413,7 +4478,7 @@ msgstr "Disastro"
 msgid "Discovered"
 msgstr "Da discovery"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Discoverato da"
 
@@ -4421,17 +4486,17 @@ msgstr "Discoverato da"
 msgid "Discovered device"
 msgstr "Dispositivo trovato"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Discovery"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Discovery per proxy"
 
@@ -4439,17 +4504,17 @@ msgstr "Discovery per proxy"
 msgid "Discovery check"
 msgstr "Controllo discovery"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "Errore di controllo discovery"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Controlli discovery"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Lista discovery"
 
@@ -4458,67 +4523,70 @@ msgid "Discovery object"
 msgstr "Oggetto discovery"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Regola di discovery"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "La regola di discovery \"%1$s\" esiste già su \"%2$s\", ereditata da un altro template."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Regola di discovery \"%1$s\" gia' presente in \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "La regola di discovery \"%1$s:%2$s\" ha una durata errata: \"%3$s\". (min: %4$d, max %5$d, macro utente consentite)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "La regola di discovery \"%s\" esiste già."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "La regola di discovery \"%1$s:%2$s\" ha una durata errata: \"%3$s\". (min: %4$d, max %5$d, macro utente consentite)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Regola di discovery creata"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Regola di discovery rimossa"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] "Regola di discovery disabilitata"
 msgstr[1] "Regole di discovery disabilitate"
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] "Regola di discovery abilitata"
 msgstr[1] "Regole di discovery abilitate"
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Regola di discovery aggiornata"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Regole di discovery"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Regole di discovery rimosse"
 
@@ -4530,7 +4598,7 @@ msgstr "Stato discovery"
 msgid "Display OK triggers for"
 msgstr "Mostra trigger OK per"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Visualizzati"
 
@@ -4539,32 +4607,32 @@ msgstr "Visualizzati"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Visualizzati %1$s di %2$s trovate"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Distribuzione dei valori per item multipli"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Distribuzione dei valori per periodi multipli"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Non calcolare"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Desideri sostituire l'espressione condizionale?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Fatto"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Punto"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Giù"
@@ -4574,30 +4642,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Giù"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Tempo di inattività"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Rilascia qui per cambiare il tipo di interfaccia nel tipo \"IPMI\"."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Rilascia qui per cambiare il tipo di interfaccia nel tipo \"JMX\"."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Rilascia qui per cambiare il tipo di interfaccia nel tipo \"SNMP\"."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Rilascia qui per cambiare il tipo di interfaccia nel tipo \"agente\"."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Stile disegno"
 
@@ -4615,74 +4683,75 @@ msgstr "Prima voce menù a discesa \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Ricorda selezionato \"%1$s\" nel menù a discesa."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Dipendenze duplicate nel trigger \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Nome \"%2$s\" prototipo gruppo duplicato per il prototipo host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr "ID gruppo host \"%2$s\" duplicato per il prototipo host \"%1$s\"."
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Host duplicato. Un host con lo stesso nome host \"%s\" esiste già nei dati."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Host duplicato. Un host con lo stesso nome visibile \"%s\" esiste già nei dati."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Nome mappa duplicato per la mappa \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr "Nome script duplicato \"%s\"."
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Nome severity duplicato \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Alias utente duplicato \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Durata"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Durata (sec)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Olandese (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Item dinamico"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ERRORE"
 
@@ -4690,13 +4759,13 @@ msgstr "ERRORE"
 msgid "EVENTS"
 msgstr "EVENTI"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Ogni URL deve avere un nome univoco. Per favore assicurarsi che ci sia un solo URL con quel nomeOgni URL deve avere un nome univoco. Per favore assicurarsi che ci sia un solo URL con quel nome"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4704,9 +4773,9 @@ msgstr "Ogni URL deve avere un nome univoco. Per favore assicurarsi che ci sia u
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Modifica"
 
@@ -4714,7 +4783,7 @@ msgstr "Modifica"
 msgid "Edit map element"
 msgstr "Modifica elemento mappa"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Modifica trigger"
 
@@ -4722,27 +4791,61 @@ msgstr "Modifica trigger"
 msgid "Element"
 msgstr "Elemento"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Nome elemento"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Svuota"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Condizione azione vuota."
 
@@ -4750,76 +4853,98 @@ msgstr "Condizione azione vuota."
 msgid "Empty color."
 msgstr "Colore vuoto."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr "ID host vuoto per il prototipo host."
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "Host vuoto."
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Parametro di input vuoto."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "Parametri in input assenti."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Input vuoto."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Macro vuoto."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr "Nome vuoto per il prototipo gruppo."
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr "Nome vuoto per il prototipo host \"%1$s\"."
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "Campo nome assente per script \"%1$s\"."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "Campo nome assente per script."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Nome vuoto."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Parametri vuoti"
 
@@ -4828,23 +4953,27 @@ msgstr "Parametri vuoti"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Risposta vuota ricevuta dal server Zabbix \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
-msgstr ""
+msgstr "ID schermata assente per la schermata"
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
-msgstr ""
+msgstr "ID schermata assente per il template schermata."
 
 #: include/classes/validators/CTimePeriodValidator.php:46
 msgid "Empty time period."
 msgstr "Periodo di tempo vuoto."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Abilita"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Abilita conferma"
 
@@ -4864,11 +4993,11 @@ msgstr "Abilita acknowledge eventi"
 msgid "Enable host"
 msgstr "Abilita host"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Abilitare host?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Abilitare host monitorati dai proxy selezionati?"
 
@@ -4881,36 +5010,32 @@ msgstr "Abilitare host monitorati dai proxy selezionati?"
 msgid "Enable internal housekeeping"
 msgstr "Abilita housekeeping interno"
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Abilita selezionati"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Abilitare scenari WEB selezionati?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Abilitare azioni selezionate?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Abilitare applicazioni selezionate?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Abilitare regole di discovery selezionate?"
 
@@ -4918,11 +5043,11 @@ msgstr "Abilitare regole di discovery selezionate?"
 msgid "Enable selected groups?"
 msgstr "Abilitare gruppi selezionati?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr "Abilitare prototipi host selezionati?"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Abilitare host selezionati?"
 
@@ -4930,64 +5055,68 @@ msgstr "Abilitare host selezionati?"
 msgid "Enable selected item prototypes?"
 msgstr "Abilita item prototipo selezionati?"
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Abilitare item selezionati?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Abilitare tipi di supporto selezionati?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr "Abilita trigger prototipo selezionati?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Abilitare trigger selezionati?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Inglese (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Inglese (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Errore"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Errore nella richiesta di ricerca per la tabella \"%1$s\"."
@@ -5005,15 +5134,15 @@ msgstr "Evento"
 msgid "Event ID"
 msgstr "ID evento"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "L'ID evento dell'ultima voce nei log corrisponde all'espressione regolare T, quindi N = 1, 0 - altrimentiL'ID evento dell'ultima voce nei log corrisponde all'espressione regolare T, quindi N = 1, 0 - altrimenti"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "L'ID evento dell'ultima voce nei log corrisponde all'espressione regolare T, quindi N NON è 1, 0 - altrimentiL'ID evento dell'ultima voce nei log corrisponde all'espressione regolare T, quindi N NON è 1, 0 - altrimenti"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Aggiunta acknowledge ad evento"
 
@@ -5022,7 +5151,7 @@ msgstr "Aggiunta acknowledge ad evento"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Acknowledge evento \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Aggiunta acknowledge eventi disabilitata"
 
@@ -5030,7 +5159,7 @@ msgstr "Aggiunta acknowledge eventi disabilitata"
 msgid "Event details"
 msgstr "Dettagli evento"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Generazione evento"
 
@@ -5050,9 +5179,10 @@ msgstr "Dettagli sorgente evento"
 msgid "Event type"
 msgstr "Tipo evento"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Eventi"
 
@@ -5060,36 +5190,41 @@ msgstr "Eventi"
 msgid "Events and alerts"
 msgstr "Eventi e avvisi"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Ogni giorno(i)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Ogni settimana(e)"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Esa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Escludi"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Esegui"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Esegui errore SQL [%1$s] in [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Esegui su"
 
@@ -5097,13 +5232,13 @@ msgstr "Esegui su"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Script eseguito"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Conferma esecuzione"
 
@@ -5115,7 +5250,7 @@ msgstr "Espandi macro"
 msgid "Expand single problem"
 msgstr "Espandi singolo problema"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Prevista versione 2.0 di JSON-rpc, è stato riportato \"%s\"."
@@ -5125,12 +5260,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Scaduto"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Esploso"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Esporta selezionati"
 
@@ -5138,22 +5273,22 @@ msgstr "Esporta selezionati"
 msgid "Export to CSV"
 msgstr "Esporta in CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Espressione"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Errore di sintassi nell'espressione."
 
@@ -5161,11 +5296,12 @@ msgstr "Errore di sintassi nell'espressione."
 msgid "Expression Variable Elements"
 msgstr "Elementi Variabile nell'espressione"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "L'espressione non può esser vuota"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Costruttore di espressioni"
 
@@ -5186,17 +5322,17 @@ msgid "External check"
 msgstr "External check"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Texting Ez"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "V"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "FALSO"
 
@@ -5205,16 +5341,17 @@ msgstr "FALSO"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Fallito"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Fallito"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5222,40 +5359,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Fallimento Audit"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Grafici preferiti"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Mappe preferite"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Schermate preferite"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr "Grafico semplice preferito"
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr "Presentazione preferita"
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Preferiti"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Feb"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Febbraio"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Campo"
 
@@ -5299,19 +5436,19 @@ msgstr "Il campo \"%1$s\" non è una stringa."
 msgid "Field \"%1$s\" must be missing."
 msgstr "Il campo \"%1$s\" potrebbe mancare."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Il campo \"druleid\" è richiesto."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Il campo \"nome\" è richiesto."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Il formato file non è supportato."
 
@@ -5320,13 +5457,13 @@ msgstr "Il formato file non è supportato."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Il file è troppo grande, la dimensione massima di caricamento è %1$s byte."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Il file fornito alla schermata non esiste. Si è provato a trovare \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr "File time information. Numbero di secondi.Il \"mode\" e' optional. Se \"mode\" e' assente \"modify\" e' utilizzato."
 
@@ -5334,68 +5471,71 @@ msgstr "File time information. Numbero di secondi.Il \"mode\" e' optional. Se \"
 msgid "Filled region"
 msgstr "Regione riempita"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtro"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Filtra per gruppo host"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filtra per nome"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Cerca stringa V nell'ultimo (più recente) valore. N = 1 - se trovato, 0 - altrimentiCerca stringa V nell'ultimo (più recente) valore. N = 1 - se trovato, 0 - altrimenti"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Cerca stringa V nell'ultimo (più recente) valore. N NON è 1 - se trovato, 0 - altrimenti.Cerca stringa V nell'ultimo (più recente) valore. N NON è 1 - se trovato, 0 - altrimenti."
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr "Cerca stringa in un file. 0 - espressione non trovata, 1 - trovata"
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr "Cerca stringa in un file. Stringa corrispondente"
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Termina"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Finlandese (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Primo"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Primo"
@@ -5404,8 +5544,8 @@ msgstr "Primo"
 msgid "Fit to map"
 msgstr "Adatta alla mappa"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fisso"
 
@@ -5415,76 +5555,80 @@ msgstr "Fisso"
 msgid "Flexible intervals"
 msgstr "Intervalli flessibili"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Per l'account guest, la password deve essere vuota"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Formula"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Quarto"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Francese (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Ven"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Venerdì"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Da"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Accesso frontend"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Accesso frontend aggiornato"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Messaggi frontend"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Clona tutto"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Funzione"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
-msgstr ""
+msgstr "Funzione \"%1$s\" non utilizzabile per l'item selezionato \"%2$s\""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5494,116 +5638,116 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr "GRAFICI"
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "Modem GSM"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Accesso GUI disabilitato."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Generale"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Generato in %s sec"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Tedesco (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
-msgstr "Ottinie contenuto pagina WEB. Il percorso di defualt e' \"/\""
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
+msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr "Ottieni contenuti di un dato file."
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
-msgstr "Ottieni la prima occorrenza della regexp di una pagina WEB. Il percorso di defualt e' \"/\""
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
+msgstr ""
 
 #: include/page_header.php:194
 msgid "Get support"
 msgstr "Ottieni supporto"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
-msgstr "Ottieni il tempo di caricamento di tutta la pagina WEB. Il percorso di default e' \"/\""
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
+msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "L'espressione fornita non è una macro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "L'espressione globale non esiste."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Script globale"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Script globali"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Vai"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Vai a"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "Vai al cruscotto"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5612,66 +5756,73 @@ msgid "Gradient line"
 msgstr "Linea sfumata"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Grafico"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Il grafico \"%1$s\" esiste già su \"%2$s\" (ereditato da un altro template)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Il grafico \"%1$s\" esiste già su \"%2$s\" (gli item non sono identici)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Il grafico \"%1$s\" esiste già su \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Il grafico \"%1$s\" non può ereditare. Non sono presenti gli item richiesti su \"%2$s\" (item valore Ymax)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Il grafico \"%1$s\" non può ereditare. Non sono presenti gli item richiesti su \"%2$s\" (item valore Ymin)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Il grafico \"%1$s\" non può ereditare. Non sono presenti gli item richiesti su \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Il grafico \"%1$s\" non esiste nel template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Grafico \"%1$s\" saltato - regola utente."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Il grafico \"%1$s\" che ha item con template non può contenere item da altri host."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Grafico aggiunto"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Grafico rimosso"
 
@@ -5683,54 +5834,59 @@ msgstr "Elemento del grafico"
 msgid "Graph item"
 msgstr "Item del grafico"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Nome del grafico"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "Prototipo grafico"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "Grafico prototipo \"%1$s\" contiene prototipi item provenineti da multiple regole discovery."
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
-msgstr ""
+msgstr "Grafico prototipo  \"%1$s\" deve avere almeno un prototipo item."
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Il prototipo di grafico \"%1$s\" che ha item con template non può contenere item da altri host."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Prototipo di grafico \"%s\" rimosso."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr "Grafico prototipo aggiunto"
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr "Grafico prototipo cancellato"
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr "Grafico prototipo aggiornato"
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Prototipi di grafico"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr "Grafico prototipo cancellato"
 
@@ -5742,49 +5898,51 @@ msgstr "Prototipi di grafico di"
 msgid "Graph sum"
 msgstr "Somma dei grafici"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Tipo di grafico"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Grafico aggiornato"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Un grafico con nome \"%1$s\" esiste già tra i grafici o prototipi di grafico."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Un grafico con lo stesso nome ma di un altro tipo esiste già."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Grafici"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Grafici copiati"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Grafici rimossi"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Greco (el_GR)"
 
@@ -5793,54 +5951,57 @@ msgstr "Greco (el_GR)"
 msgid "Grid"
 msgstr "Griglia"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Gruppo"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Il gruppo \"%1$s\" non può esser rimosso, perchè è utilizzato da un prototipo host."
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Il gruppo \"%1$s\" non esiste."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Il gruppo \"%1$s\" per l'host \"%2$s\" non esiste."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Gruppo aggiunto"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr "Gruppo rimosso"
+msgid_plural "Groups deleted"
+msgstr[0] "Gruppo rimosso"
+msgstr[1] "Gruppo rimosso"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5851,40 +6012,42 @@ msgstr "Gruppo per host discoverati"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr "Gruppo per host discoverati \"%1$s\"."
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Nome del gruppo"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr "L'ID prototipo gruppo non può esser rimosso."
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr "Il prototipo gruppo non può esser basato su un gruppo host discoverato \"%1$s\"."
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr "Prototipi gruppo"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Gruppo aggiornato"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Raggruppamento per"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -5892,22 +6055,13 @@ msgstr "Gruppi"
 msgid "Groups in maintenance"
 msgstr "Gruppi in manutenzione"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5924,7 +6078,7 @@ msgstr "PROBLEMI HOST GROUP "
 msgid "HOST INVENTORY"
 msgstr "INVENTARIO HOST"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "PANORAMICA INVENTARIO HOST"
 
@@ -5942,7 +6096,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "Autenticazione HTTP"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
@@ -5963,12 +6118,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr "Hardware (Dettagli completi)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Altezza"
@@ -5981,15 +6141,15 @@ msgstr "Aiuto"
 msgid "Hexadecimal"
 msgstr "Esadecimale"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Nascondi"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Nascondi tutti"
 
@@ -6005,15 +6165,15 @@ msgstr "Nascondi trigger prototipo disabilitati"
 msgid "Hide disabled triggers"
 msgstr "Nascondi trigger disabilitati"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Nascondi selezionati"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "Nascondi gruppi selezionati"
 
@@ -6022,23 +6182,23 @@ msgstr "Nascondi gruppi selezionati"
 msgid "High"
 msgstr "Alta"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Storico"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Storico pulito"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "La pulizia dello storico può durare a lungo. Continuare?"
 
@@ -6059,79 +6219,79 @@ msgstr "Storico eventi"
 msgid "History storage period"
 msgstr "Periodo storicizzazione History"
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr "Periodo storicizzazione History (in giorni)"
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Allinea in orizzontale"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
 msgstr[1] "Host"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "L'host \"%1$s\" esiste già."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "L'host \"%1$s\" è monitorato dal proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "L'host \"%s\" ha il parametro \"usepmi\" abilitato, ma non ha alcun parametro \"ipmi_ip\"! Indirizzo IP dell'host in uso come indirizzo per l'interfaccia IPMI."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Host (crescente)"
 
@@ -6143,66 +6303,68 @@ msgstr "IP host"
 msgid "Host access"
 msgstr "Accesso host"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Host aggiunto"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Un host non può avere più di un'interfaccia predefinita dello stesso tipo.Un host non può avere più di un'interfaccia predefinita dello stesso tipo."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Numero host"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Host rimosso"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] "Host disabilitato"
 msgstr[1] "Host disabilitati"
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] "Host abilitato"
 msgstr[1] "Host abilitati"
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Gruppo host"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Il gruppo host \"%1$s\" esiste già."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Il gruppo host \"%1$s\" non può esser rimosso, in quanto è utilizzato in uno script globale."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "Il gruppo host \"%1$s\" non può esser rimosso, in quanto alcuni host dipendono da esso."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "Il gruppo host \"%1$s\" non può esser rimosso, in quanto alcuni host dipendono da esso."
@@ -6219,14 +6381,15 @@ msgstr "Problemi Host group"
 msgid "Host group label type"
 msgstr "Tipo etichetta gruppo host"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "Il nome del gruppo host non può esser vuoto."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Gruppo host"
 
@@ -6236,8 +6399,8 @@ msgstr "Gruppo host"
 msgid "Host interface"
 msgstr "Interfaccia host"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Inventario host"
 
@@ -6253,7 +6416,7 @@ msgstr "Problemi host"
 msgid "Host label type"
 msgstr "Tipo etichetta host"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Lista host"
 
@@ -6262,18 +6425,18 @@ msgid "Host metadata"
 msgstr "Metadati host"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Nome host"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "Nome host \"%1$s\" è troppo lungo, non deve esser più lungo di %2$d caratteri."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr "Il nome host per il prototipo host \"%1$s\" deve contenere macro."
@@ -6282,72 +6445,72 @@ msgstr "Il nome host per il prototipo host \"%1$s\" deve contenere macro."
 msgid "Host networks"
 msgstr "Reti di host"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Il prototipo host \"%1$s\" esiste già su \"%2$s\", ereditato da un altro template."
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "Il prototipo host \"%1$s\" esiste già su \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr "Il prototipo host \"%1$s\" deve avere almeno un gruppo host."
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr "Prototipo host aggiunto"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr "Prototipo host rimosso"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] "Prototipo Host disabilitato"
 msgstr[1] "Prototipi Host disabilitati"
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] "Prototipo Host abilitato"
 msgstr[1] "Prototipi Host abilitati"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr "Prototipo host aggiornato"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Il prototipo host con nome host \"%1$s\" esiste già nella regola discovery \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr "Il prototipo host con nome host \"%1$s\" esiste già."
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Il prototipo host con nome visibile \"%1$s\" esiste già nella regola discovery \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr "Il protipo host con nome visibile \"%1$s\" esiste già."
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr "Prototipo host"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr "Prototipi host timossi"
 
@@ -6359,7 +6522,7 @@ msgstr "Prototipo host di"
 msgid "Host router"
 msgstr "Router dell'host"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Schermate host"
 
@@ -6371,51 +6534,52 @@ msgstr "Stato host"
 msgid "Host subnet mask"
 msgstr "Maschera sottorete dell'host"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Ora dell'host"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Aggiornamento host fallito."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Host aggiornato"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr "Host con nome uguale \"%1$s\" gia' presente."
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Un host con lo stesso nome \"%s\" esiste già."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host con nome visibile \"%1$s\" gia' presente."
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Un host con lo stesso nome visibile \"%s\" esiste già."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Host"
 
@@ -6423,11 +6587,11 @@ msgstr "Host"
 msgid "Hosts & Groups"
 msgstr "Host & Gruppi"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Host (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Host / template"
 
@@ -6439,37 +6603,38 @@ msgstr "Host in"
 msgid "Hosts in maintenance"
 msgstr "Host in manutenzione"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Host info"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Posizione host"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Host aggiornati"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Per ore"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Ore"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr "Housekeeping"
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Ungherese (hu_HU)"
 
@@ -6487,22 +6652,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6510,26 +6675,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP e DNS non possono esser vuoti per l'interfaccia host."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Intervallo IP"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "L'intervallo IP non può essere vuoto."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6537,22 +6702,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "Agente IPMI"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "Algoritmo autenticazione IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Interfacce IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "Password IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Livello di privilegio IPMI"
 
@@ -6562,7 +6727,7 @@ msgstr "Livello di privilegio IPMI"
 msgid "IPMI sensor"
 msgstr "Sensore IPMI"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "Nome utente IPMI"
 
@@ -6595,7 +6760,7 @@ msgstr "Dipendenze servizio IT"
 msgid "IT service parent"
 msgstr "Servizio IT primario"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6611,25 +6776,25 @@ msgid "ITEMS"
 msgstr "ITEM"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Icona"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Icona (predefinita)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Icona (disabilitata)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Icona (manutenzione)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Icona (problema)"
 
@@ -6650,42 +6815,44 @@ msgstr "Tipo etichetta icone"
 msgid "Icon map"
 msgstr "Mappa icone"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "La mappa icone \"%1$s\" non può esser rimossa. È utilizzata nella mappa \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "La mappa icone \"%1$s\" contiene una mappatura con iconid \"%2$s\" errato."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "La mappa icone \"%1$s\" contiene una mappatura con collegamento inventario \"%2$s\" errato."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "La mappa icone \"%s\" esiste già."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "La mappa icone \"%s\" non può avere una mappatura con espressione vuota."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "La mappa icone \"%s\" non può avere una mappatura con un'espressione globale che non esiste."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "La mappa icone \"%s\" contiene un'espressione errata."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "La mappa icone \"%s\" deve avere almeno una mappatura."
@@ -6698,7 +6865,8 @@ msgstr "Mappa icone creata"
 msgid "Icon map deleted"
 msgstr "Mappa icone rimossa"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Il nome della mappa icone non può esser vuoto."
 
@@ -6706,29 +6874,29 @@ msgstr "Il nome della mappa icone non può esser vuoto."
 msgid "Icon map updated"
 msgstr "Mappa icone aggiornata"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "La mappa icone con iconmapid \"%s\" non esiste."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Mappatura icone"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "La voce mappatura icone \"%1$s\" su %2$s\" esiste già."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Mappa icone non abilitata"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Icone"
 
@@ -6736,21 +6904,23 @@ msgstr "Icone"
 msgid "Identical expression already exists"
 msgstr "Un'espressione identica esiste già"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Se pensi che questo messaggio sia sbagliato, per favore contatta il tuo amministratore per ricevere i permessi necessari.Se pensi che questo messaggio sia sbagliato, per favore contatta il tuo amministratore per ricevere i permessi necessari."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Immagine"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "L'immagine \"%1$s\" esiste già."
@@ -6759,7 +6929,7 @@ msgstr "L'immagine \"%1$s\" esiste già."
 msgid "Image added"
 msgstr "Immagine aggiunta"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Immagine rimossa"
 
@@ -6767,12 +6937,13 @@ msgstr "Immagine rimossa"
 msgid "Image label type"
 msgstr "Tipo etichetta immagine"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Errore caricamento immagine [%1$s] in [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "La dimensione dell'immagine deve essere inferiore a 1MB."
 
@@ -6781,66 +6952,66 @@ msgid "Image updated"
 msgstr "Immagine aggiornata"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Immagini"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Le immagini di tutte le mappe verranno aggiornate!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Immediatamente"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Importa"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Importazione fallita"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Importa file"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Importato con successo"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Impossibile filtrare per campo inventario \"%s\", che non esiste."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Impossibile rimuovere l'ultima riga e l'ultima colonna."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "Inclusi"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "Nel gruppo"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Nei gruppi"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6853,244 +7024,282 @@ msgstr "In manutenzione"
 msgid "In progress"
 msgstr "In corso"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Includi"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Valore errato nel campo \"soft\" per la dipendenza del servizio \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Valore del tipo di etichetta %1$s errato per la mappa \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Intervallo IP \"%s\" errato."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "OID SNMP errato."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Comunità SNMP errata."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "SLA accettabile errata per il servizio \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Controllo discovery errato per la condizione dell'azione."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Controllo discovery errato per la condizione dell'azione. Il controllo discovery non esiste o non hai accesso ad esso.Controllo discovery errato per la condizione dell'azione. Il controllo discovery non esiste o non hai accesso ad esso."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "Oggetto discovery della condizione azione errato."
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Regola di discovery errata per la condizione dell'azione. La regola di discovery non esiste o non hai accesso ad essa.Regola di discovery errata per la condizione dell'azione. La regola di discovery non esiste o non hai accesso ad essa."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Stato discovery errato per la condizione dell'azione."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "Tipo evento errato per la condizione dell'azione."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Gruppo host errato per la condizione dell'azione. Il gruppo host non esiste o non hai accesso ad esso.Gruppo host errato per la condizione dell'azione. Il gruppo host non esiste o non hai accesso ad esso."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Host errato per la condizione dell'azione. L'host non esiste o non hai accesso ad esso.Host errato per la condizione dell'azione. L'host non esiste o non hai accesso ad esso."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "IP della condizione azione \"%1$s\" errato."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "Operatore condizione azione errato."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "Porta della condizione azione \"%1$s\" errata."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Proxy errato per la condizione dell'azione. Il proxy non esiste o non hai accesso ad esso.Proxy errato per la condizione dell'azione. Il proxy non esiste o non hai accesso ad esso."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Template errato per la condizione dell'azione. Il template non esiste o non hai accesso ad esso.Template errato per la condizione dell'azione. Il template non esiste o non hai accesso ad esso."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "Severity del trigger nella condizione azione errata."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "Valore trigger nella condizione azione errato."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Trigger errato per la condizione dell'azione. Il trigger non esiste o non hai accesso ad esso.Trigger errato per la condizione dell'azione. Il trigger non esiste o non hai accesso ad esso."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Tipo errato per la condizione dell'azione."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Parametro conditionid dell'azione errato."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "Condizioni azione errate per l'azione \"%1$s\"."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Tipo di comando errato per l'operazione dell'azione."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Tipo acknowledge errato per la condizione dell'operazione azione."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Tipo di condizione errato per l'operazione dell'azione."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Valori dei passi di escalation errati per l'operazione dell'azione."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Gruppo host errato per l'operazione dell'azione. Il gruppo host non esiste o non hai accesso a questo gruppo host.Gruppo host errato per l'operazione dell'azione. Il gruppo host non esiste o non hai accesso a questo gruppo host."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Host errato per l'operazione dell'azione. L'host non esiste o non hai accesso a questo host.Host errato per l'operazione dell'azione. L'host non esiste o non hai accesso a questo host."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Porta \"%s\" errata per l'operazione dell'azione."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Durata degli step errata per l'operazione dell'azione."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Tipo errato per l'operazione dell'azione."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Gruppo utenti errato per l'operazione dell'azione. Il gruppo utenti non esiste o non hai accesso a questo gruppo utenti.Gruppo utenti errato per l'operazione dell'azione. Il gruppo utenti non esiste o non hai accesso a questo gruppo utenti."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Utente errato per l'operazione dell'azione. L'utente non esiste o non accesso a questo utente.Utente errato per l'operazione dell'azione. L'utente non esiste o non accesso a questo utente."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Parametro operationid dell'azione errato."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Algoritmo errato per il servizio \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Argomenti errati passati alla funzione"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Argomenti errati passati alla funzione."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Argomenti errati passati al metodo."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Protocollo di autenticazione per la regola discovery \"%1$s\" errato."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Protocollo di autenticazione per l'item \"%1$s\" errato."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Valore SLA calcolato errato per il servizio \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "Caratteri errati utilizzati per l'host \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Caratteri errati usati per il nome host \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "Caratteri errati utilizzati per il nome proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr "Utilizzati caratteri non corretti per il nome template \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Intervallo errato."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "ID regola discovery errato per il prototipo host \"%1$s\"."
@@ -7100,11 +7309,11 @@ msgstr "ID regola discovery errato per il prototipo host \"%1$s\"."
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "Oggetto dell'evento \"%1$s\" (%2$s) errato per la sorgente dell'evento \"%3$s\" (%4$s), solo i seguenti oggetti sono supportati: %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "Valore eventobject errato."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "Valore eventsource errato."
 
@@ -7113,11 +7322,11 @@ msgstr "Valore eventsource errato."
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Nome o valore errato per il campo \"%1$s\" nello statement where per la tabella \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "Campi errati per sysmap."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Campi errati per il trigger."
 
@@ -7125,74 +7334,100 @@ msgstr "Campi errati per il trigger."
 msgid "Incorrect file upload."
 msgstr "Caricamento file errato."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Intervallo flessibile \"%1$s\" errato."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Intervallo flessibile errato nell'item \"%1$s\". L'intervallo flessibile deve essere una stringa."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Funzione errata utilizzata"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr "ID grafico \"%1$s\" non corretto per elemento schermata."
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "ID prototipo gruppo errato."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "Prototipi gruppo errati per il prototipo host \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr "ID host \"%1$s\" non corretto per elemento schermata."
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr "ID gruppo host \"%1$s\" non corretto per elemento schermata."
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "ID gruppo host errato per il prototipo gruppo."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Gruppo host errato."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "Gruppi host errati per il prototipo host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "ID prototipo host errato."
 
@@ -7200,182 +7435,201 @@ msgstr "ID prototipo host errato."
 msgid "Incorrect image index."
 msgstr "Indice immagine errato."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr "Parametri di input non corretti."
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Fornito paramentro interfaccia DNS \"%s\" errato."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Fornito parametro interfaccia IP \"%s\" errato."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Fornita porta interfaccia \"%s\" errata."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Campo inventario \"%s\" errato."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr "ID item \"%1$s\" non corretto per elemento schermata."
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Item errato per il valore dell'asse."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Fornita chiave item \"%1$s\" errata per l'espressione del trigger in \"%2$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "Fornito tipo valore item \"%1$s\" errato per la funzione trigger \"%2$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Chiave errata."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Lista di item errata."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Manutenzione errata - la data deve essere tra 1970.01.01 e 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Data di manutenzione errata"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Periodo del giorno per la manutenzione errato"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Giorni della settimana per la manutenzione errati"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Periodo del mese per la manutenzione errato"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Periodo di manutenzione errato"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Periodo di manutenzione errato (minimo 5 minuti)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Periodo della settimana per la manutenzione errato"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr "ID mappa \"%1$s\" non corretto per elemento schermata."
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Valore altezza mappa per la mappa \"%s\" errato."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Valore larghezza mappa per la mappa \"%s\" errato."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "Errato percorso menu per script \"%1$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "Valore oggetto errato."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "Parametro errato per l'azione \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Parametro per le operazioni errato."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Usato parametro errato per la mappa icone \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr "Parametri errati per il metodo di aggiornamento azione \"%1$s\"."
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Parametri errati per la condizione."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Parametri errati per il metodo di aggiornamento mappa icone \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Parametri errati per la manutenzione."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Parametri errati per il gruppo utenti."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Servizio primario errato per il servizio \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Servizio primario errato."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Range porte errato."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "Protocollo privacy errato per la regola discovery \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "Protocollo privacy per l'item \"%1$s\" errato."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Parametro proxid errato."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Fornito tipo di risorsa errato per l'item della schermata."
 
@@ -7384,64 +7638,68 @@ msgstr "Fornito tipo di risorsa errato per l'item della schermata."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Risposta errata ricevuta dal server Zabbix \"%1$s\"."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr "Errato ID Schermata \"%1$s\" fornita come elemento schermata."
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
-msgstr ""
+msgstr "ID schermata non corretto."
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Fornita schermata errata per la presentazione."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Ora di fine servizio errata."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Ora di inizio servizio errata."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Tipo di ora servizio errato."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Ordine sorder per il servizio \"%1$s\" errato."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "Valore sorgente errato."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr "Stato host non corretto \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr "Stato errato per il prototipo host \"%1$s\"."
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Stato del servizio \"%1$s\" errato."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Stato errato."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
-msgstr ""
+msgstr "Template ID schermata non corretto."
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr "Tema errato per l'utente \"%1$s\"."
@@ -7462,52 +7720,57 @@ msgstr "Periodo di tempo \"%1$s\" errato, il giorno di partenza dev'essere minor
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Periodo di tempo \"%1$s\" errato."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "ID trigger per il servizio \"%1$s\" errato."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Espressione trigger errata"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Espressione trigger errata."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Espressione trigger errata. L'host \"%1$s\" non esiste o non hai accesso a questo host."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Espressione trigger errata. L'host \"%s\" non esiste o non hai accesso a questo host."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Espressione trigger errata. Gli elementi dell'espressione trigger non devono appartenere ad un template e a un host contemporaneamente.Espressione trigger errata. Gli elementi dell'espressione trigger non devono appartenere ad un template e a un host contemporaneamente."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Fornita funzione trigger \"%1$s\" errata nell'espressione."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Tipo di asort_by_key errato."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Gruppo utenti errato."
 
@@ -7516,7 +7779,8 @@ msgstr "Gruppo utenti errato."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "Valore \"%1$s\" errato per il campo \"%2$s\"."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Valore \"%1$s\" errato per il campo \"%2$s\": dev'esser contenuto tra %3$s e %4$s."
@@ -7536,7 +7800,7 @@ msgstr "Valore \"%1$s\" errato per il campo int \"%2$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Valore \"%1$s\" errato per il campo int senza segno \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "Valore errato per il campo \"%1$s\"."
@@ -7546,43 +7810,49 @@ msgstr "Valore errato per il campo \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "Valore errato per il campo \"%1$s\": non può esser vuoto."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Valore errato per setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Valore errato utilizzato per lo stato proxy \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Orario di lavoro errato."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Item max y errato per il grafico \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Item min y errato per il grafico \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonesiano (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Info"
 
@@ -7591,15 +7861,15 @@ msgstr "Info"
 msgid "Information"
 msgstr "Informazioni"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Inserisci"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Inserisci macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Installazione"
 
@@ -7607,31 +7877,32 @@ msgstr "Installazione"
 msgid "Installer name"
 msgstr "Nome installatore"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "L'interfaccia è collegata all'item \"%1$s\" su \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "L'interfaccia è usata dagli item che richiedono questo tipo di interfaccia.L'interfaccia è usata dagli item che richiedono questo tipo di interfaccia."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "L'interfaccia con DNS \"%1$s\" non può avere indirizzo IP vuoto."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "L'interfaccia con IP \"%1$s\" non può avere nome DNS vuoto avendo la proprietà \"Use DNS\" su \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "L'interfaccia con IP \"%1$s\" non può avere nome DNS vuoto."
@@ -7651,7 +7922,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Interno"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Errore JSON-RPC interno."
 
@@ -7659,7 +7930,7 @@ msgstr "Errore JSON-RPC interno."
 msgid "Internal data storage period (in days)"
 msgstr "Periodo storicizzazione Internal Data (in giorni)"
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Errore interno."
 
@@ -7672,19 +7943,19 @@ msgstr "Periodo storicizzazione \"Internal event ed alert\""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr "Periodo storicizzazione \"Internal event ed alert\" (in giorni) \"%1$s\"."
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Intervallo"
 
@@ -7694,112 +7965,114 @@ msgstr "Intervallo"
 msgid "Interval (in sec)"
 msgstr "Intervallo (in sec)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "JSON non valido. Si è verificato un errore nel server durante l'analisi del testo JSON.JSON non valido. Si è verificato un errore nel server durante l'analisi del testo JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Richiesta non valida."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Data \"%s\" non valida."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "Primo parametro errato."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "Quarto parametro non valido."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Parametro hostid non valido per la macro \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Key invalida \"%1$s\" per la regola di discovery \"%2$s\" su \"%3$s\": %4$s."
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Key invalida \"%1$s\" per l'item \"%2$s\" in \"%3$s\": %4$s."
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Key non valida \"%1$s\" come prototipo item \"%2$s\" in \"%3$s\": %4$s."
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr "Key non valida \"%1$s\": %2$s."
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Periodo di manutenzione non valido."
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Parametri del metodo non validi."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "Numero di parametri non valido."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Parametri non validi"
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr "Periodo errato per il campo \"%1$s\"."
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Codice di risposta \"%1$s\" non valido."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Intervallo dei codici di risposta \"%1$s\" non valido."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "Secondo parametro non valido."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "Terzo parametro non valido."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Periodo di tempo non valido"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Nome vista dato \"%s\" non valido. Caratteri permessi: \"a-z\" e \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventario"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr "Inventory disabilitato per host \"%1$s\"."
@@ -7808,7 +8081,7 @@ msgstr "Inventory disabilitato per host \"%1$s\"."
 msgid "Inventory field"
 msgstr "Campo inventario"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Modalità inventario"
 
@@ -7816,12 +8089,12 @@ msgstr "Modalità inventario"
 msgid "Is online?"
 msgstr "È online?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Problema"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Impossibile filtrare per password utente."
 
@@ -7829,70 +8102,71 @@ msgstr "Impossibile filtrare per password utente."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Impossibile far logout da autenticazione HTTP."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Impossibile cercare per password utente."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italiano (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Item"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr "Item \"%1$s\""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "L'item \"%1$s\" esiste già su \"%2$s\", ereditato da un altro template."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "L'item \"%1$s\" esiste già su \"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "L'item \"%1$s\" non può popolare un campo numero \"%2$d\" mancante nell'inventario host. Le scelte sono: da 0 (non popolare) a \"%3$d\"."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "L'item \"%1$s\" non esiste nel template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "L'item \"%1$s\" non esiste."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Item \"%1$s\" su \"%2$s\": l'applicazione \"%3$s\" non esiste."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Item \"%1$s\" saltato - regola utente."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "L'item \"%1$s\":\"%2$s\" ha una porta non valida: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Item aggiunto"
 
@@ -7900,17 +8174,17 @@ msgstr "Item aggiunto"
 msgid "Item count"
 msgstr "Numero item"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Item rimosso"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Item disabilitato"
 msgstr[1] "Item disabilitati"
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Item abilitato"
@@ -7924,56 +8198,56 @@ msgstr "Item in stato \"normale\""
 msgid "Item in \"not supported\" state"
 msgstr "Item in stato \"non supportato\""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
-msgstr ""
+msgstr "Item non selezionato"
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Prototipo item"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Il prototipo item \"%1$s\" esiste già su \"%2$s\", ereditato da un altro template."
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "Prototipo Item \"%1$s\" gia' definito in \"%2$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr "Item prototipo aggiunto"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr "Item prototipo cancellato"
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] "Item prototipo disabilitato"
 msgstr[1] "Item prototipo disabilitati"
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] "Item prototipo abilitato"
 msgstr[1] "Item prototipo abilitati"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr "Item prototipo aggiornato"
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Prototipi item"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr "Prototipo Item cancellato"
 
@@ -7981,92 +8255,92 @@ msgstr "Prototipo Item cancellato"
 msgid "Item prototypes of"
 msgstr "Prototipi item di"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Item aggiornato"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "L'item utilizza un'interfaccia utente da un host non-primario."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "L'item utilizza un tipo di interfaccia errato."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "L'item non sarà aggiornato. Per favore inserire un intervallo di aggiornamento corretto.L'item non sarà aggiornato. Per favore inserire un intervallo di aggiornamento corretto."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Item con chiave \"%1$s\" esiste già su \"%2$s\" come regola di discovery."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Item con chiave \"%1$s\" esiste già su \"%2$s\" come item creato da un prototipo item."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Item con chiave \"%1$s\" esiste già su \"%2$s\" come prototipo item."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Item con chiave \"%1$s\" esiste già su \"%2$s\" come item."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Item con chiave \"%1$s\" esiste già su \"%2$s\" come elemento item sconosciuto."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Item con chiave \"%1$s\" esiste già su \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Item con chiave \"%1$s\" già esistente."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Item"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Item (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Item copiati"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Item rimossi"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Lista item"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Item aggiornati"
 
@@ -8078,72 +8352,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "Agente JMX"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "Interfacce JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Generazione errori JSON-rpc fallita. Nessun errore \"%s\" di questo tipo."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "Il metodo JSON-rpc non è definito."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "I parametri JSON-rpc non sono un Array."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "La versione JSON-rpc non è specificata."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Identificativo Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Gen"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Gennaio"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Giapponese (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Lug"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Luglio"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Giu"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Giugno"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8152,40 +8426,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Periodo conservazione risorse perse (in giorni)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Chiave"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "La chiave \"%1$s\" non corrisponde <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Passphrase della chiave"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Parola chiave"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Coreano (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "ULTIMI DATI"
 
@@ -8216,37 +8490,37 @@ msgstr "Login LDAP riuscito"
 msgid "LDAP login was not successful"
 msgstr "Il login LDAP è fallito"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOCALE"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "PERSO"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Etichetta"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Posizione etichetta"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Lingua"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Ultimo"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Ultimo"
@@ -8258,19 +8532,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "Ultimo problema %1$d"
 msgstr[1] "Ultimi %1$d problemi"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "L'ultimo (più recente) valore T è < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "L'ultimo (più recente) valore T è = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "L'ultimo (più recente) valore T è > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "L'ultimo (più recente) valore T NON è N"
 
@@ -8290,28 +8564,28 @@ msgstr "Ultimi 365 giorni"
 msgid "Last 7 days"
 msgstr "Ultimi 7 giorni"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Ultima modifica"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Ultima modifica (decrescente)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Ultimo controllo"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Grafico dell'ultima ora"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Grafico ultimo mese"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Ultimo di"
 
@@ -8319,66 +8593,67 @@ msgstr "Ultimo di"
 msgid "Last seen (age)"
 msgstr "Visto l'ultima volta (età)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Ultimo valore"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Grafico ultima settimana"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Ultimi dati"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Ultimi eventi"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr "Ultimi valori"
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Lettone (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Sinistra"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legenda"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "La lunghezza dell'ultimo (più recente) valore T in caratteri è < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "La lunghezza dell'ultimo (più recente) valore T in caratteri è = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "La lunghezza dell'ultimo (più recente) valore T in caratteri è > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "La lunghezza dell'ultimo (più recente) valore T in caratteri NON è N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Linea"
 
@@ -8386,39 +8661,29 @@ msgstr "Linea"
 msgid "Link"
 msgstr "Collegamento"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Indicatori collegamento"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Il nome del collegamento deve essere univoco per la mappa \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr "Collega nuovi template"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Il collegamento del campo selementid1 punta a un ID mappa selement \"%1$s\" per la mappa \"%2$s\" inesistente."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Il collegamento del campo selementid2 punta a un ID mappa selement \"%1$s\" per la mappa \"%2$s\" inesistente."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Il collegamento dovrebbe avere entrambi i campi \"nome\" e \"url\" per la mappa \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Template di collegamento"
 
@@ -8430,50 +8695,50 @@ msgstr "Collega al template"
 msgid "Link to templates"
 msgstr "Collega ai template"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Collegamento con template"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Template collegati"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Collegato a"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Collegamenti tra gli elementi selezionati"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Collegamenti per l'elemento selezionato"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "La lista è vuota"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr "Lista interfaccia di rete. Valore testo."
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "Lituano (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Caricamento..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Ora locale"
 
@@ -8490,36 +8755,36 @@ msgid "Location longitude"
 msgstr "Longitudine della posizione"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "La severity log dell'ultima voce log è < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "La severity log dell'ultima voce log è = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "La severity log dell'ultima voce log è > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "La severity log dell'ultima voce log NON è N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "La sorgente log dell'ultima voce log corrisponde al parametro T, quindi N = 1, 0 - altrimentiLa sorgente log dell'ultima voce log corrisponde al parametro T, quindi N = 1, 0 - altrimenti"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "La sorgente log dell'ultima voce log corrisponde al parametro T, quindi N NON è 1, 0 - altrimentiLa sorgente log dell'ultima voce log corrisponde al parametro T, quindi N NON è 1, 0 - altrimenti"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Formato orario log"
@@ -8528,12 +8793,12 @@ msgstr "Formato orario log"
 msgid "Log unmatched SNMP traps"
 msgstr "Registrare trap SNMP sconosciute"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Connesso come"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8544,12 +8809,12 @@ msgstr "Accedi"
 msgid "Login as Guest"
 msgstr "Accedi come Guest"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Login fallito \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr "Il nome utente \"%1$s\" non corrisponde col nome \"%2$s\" utilizzato come autenticazione HTTP."
@@ -8558,8 +8823,9 @@ msgstr "Il nome utente \"%1$s\" non corrisponde col nome \"%2$s\" utilizzato com
 msgid "Login name or password is incorrect!"
 msgstr "Nome login o password non corretta!"
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Nome o password login errati."
 
@@ -8580,22 +8846,18 @@ msgstr "Regola discovery di basso livello in stato \"normale\"."
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr "Regola discovery di basso livello in stato \"non supportata\"."
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "L"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr "MAC address - lista di tutti i MAC address con nome interfaccia di default"
 
@@ -8607,7 +8869,7 @@ msgstr "MAC address A"
 msgid "MAC address B"
 msgstr "MAC address B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "MANUTENZIONE"
 
@@ -8632,49 +8894,49 @@ msgstr "TOP 100 TRIGGER PIÙ UTILIZZATI"
 msgid "Macro"
 msgstr "Macro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "La macro \"%1$s\" esiste già su \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "La macro \"%1$s\" esiste già."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "La macro \"%1$s\" non è univoca."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Il valore della macro \"%1$s\" è troppo lungo. Non deve superare 255 caratteri."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Il nome della macro \"%1$s\" è troppo lungo, non deve superare 64 caratteri."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "La macro con globalmacroid \"%1$s\" non esiste."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "La macro con hostmacroid \"%1$s\" non esiste."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Macro"
 
@@ -8682,31 +8944,36 @@ msgstr "Macro"
 msgid "Macros updated"
 msgstr "Macro aggiornate"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Manutenzione"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "La manutenzione \"%s\" esiste già."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "Il valore della manutenzione \"Attivo da\" non può essere più grande di \"Attivo fino\".Il valore della manutenzione \"Attivo da\" non può essere più grande di \"Attivo fino\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr "Il valore di manutenzione della condizione azione deve esser vuoto."
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Manutenzione aggiunta"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Manutenzione eliminata"
 
@@ -8714,7 +8981,7 @@ msgstr "Manutenzione eliminata"
 msgid "Maintenance period"
 msgstr "Periodo di manutenzione"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Durata periodo manutenzione"
 
@@ -8730,25 +8997,25 @@ msgstr "Stato manutenzione"
 msgid "Maintenance type"
 msgstr "Tipo manutenzione"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Manutenzione aggiornata"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Manutenzione con collezionamento dati"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Manutenzione senza collezionamento dati"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Parametro obbligatorio mancante."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Manuale"
 
@@ -8759,12 +9026,12 @@ msgstr "Logout manuale"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Mappa"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Mappa \"%1$s\" saltata - regola utente."
@@ -8774,12 +9041,12 @@ msgstr "Mappa \"%1$s\" saltata - regola utente."
 msgid "Map \"%s\""
 msgstr "Mappa \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Mappa \"%s\" creata."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Mappa \"%s\" aggiornata."
@@ -8796,12 +9063,12 @@ msgstr "Tipo etichetta mappa"
 msgid "Map save operation failed."
 msgstr "Operazione di salvataggio mappa fallita."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr "La mappa con nome \"%s\" esiste già."
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Mappato a"
 
@@ -8811,23 +9078,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Il valore di mappatura \"%1$s\" non è univoco."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Mappature"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Mappe"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Marzo"
 
@@ -8835,28 +9102,34 @@ msgstr "Marzo"
 msgid "Mark elements on trigger status change"
 msgstr "Evidenzia elementi al cambio di stato trigger"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Evidenzia altri"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Evidenzia selezionati"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr "Maschera"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Aggiornamento massivo"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Elementi per l'aggiornamento massivo"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Numero massimo di elementi da visualizzare nella cella di una tabella"
@@ -8870,32 +9143,11 @@ msgstr "Numero massimo di elementi da visualizzare nella cella di una tabella \"
 msgid "Max count of events per trigger to show"
 msgstr "Numero massimo di eventi per trigger da visualizzare"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Massimizza"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Lunghezza massina nome DNS e' %1$d caratteri, \"%2$s\" e' %3$d carattere."
-msgstr[1] "Lunghezza massina nome DNS e' %1$d caratteri, \"%2$s\" e' %3$d caratteri."
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "La massima lunghezza alias è %1$d caratteri, \"%2$s\" è %3$d carattere."
-msgstr[1] "La massima lunghezza alias è %1$d caratteri, \"%2$s\" è %3$d caratteri."
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "La massima lunghezza nome host è %1$d caratteri, \"%2$s\" è %3$d carattere."
-msgstr[1] "La massima lunghezza nome host è %1$d caratteri, \"%2$s\" è %3$d caratteri."
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8903,105 +9155,99 @@ msgid "Maximum number of flexible intervals added"
 msgstr "Numero massimo di intervalli flessibili aggiunto"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr "Numero massimo di file aperti supportati dall'OS."
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr "Numero massimo di processi supportati dall'OS."
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "Il periodo di tempo massimo da visualizzare è \"%1$s\" giorno."
 msgstr[1] "Il periodo di tempo massimo da visualizzare è \"%1$s\" giorni."
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "Il valore massimo per il periodo T è < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "Il valore massimo per il periodo T è = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "Il valore massimo per il periodo T è > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "Il valore massimo per il periodo T NON è N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "La massima lunghezza nome host visibile è %1$d caratteri, \"%2$s\" è %3$d carattere."
-msgstr[1] "La massima lunghezza nome host visibile è %1$d caratteri, \"%2$s\" è %3$d caratteri."
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Maggio"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Maggio"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Supporti"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Tipi di supporto"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Il tipo di supporto \"%s\" esiste già."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Tipi di supporto aggiunti"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Tipo di supporto rimosso"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Tipo di supporto disabilitato"
 msgstr[1] "Tipo di supporto disabilitato"
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Tipo di supporto abilitato"
 msgstr[1] "Tipo di supporto abilitato"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Tipo di supporto aggiornato"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Tipi di supporto"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Tipi di supporto usati dall'azione \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9016,14 +9262,14 @@ msgid "Memory limit: %s"
 msgstr "Limite di memoria: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr "Memoria utilizzata da un processo. <name> nome processo (default: \"all processes\"). <user> nome utente (default: \"all users\"). <mode> possibili valori: avg, max, min, sum (default). <cmdline> filtrati dalla command line (supporta regex). Esempio: proc.mem[,root]."
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9033,7 +9279,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Messaggio"
 
@@ -9041,66 +9287,66 @@ msgstr "Messaggio"
 msgid "Message actions"
 msgstr "Azioni del messaggio"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Limite testuale del messaggio"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Timeout messaggio"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Timeout messaggio (secondi)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Messaggi"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Messaggi"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Metodo non trovato."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Centro"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimizza"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr "Valore minimo richiesto per PHP memory limit e' %s (opzione di configurazione \"memory_limit\")."
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr "Velore minimo richiesto da PHP upload filesize e' %s (opzione di configurazione \"upload_max_filesize\")."
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr "Versione minima richiesta di PHP e' %s."
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr "Tempo minimo di esecuzione script richiesto da PHP e' %s (opzione di configurazione \"max_execution_time\")."
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr "Limite minimo richiesto sul tempo di analisi input per gli script PHP è %s (opzione di configurazione \"max_input_time\")."
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr "Dimensione minima necessaria di post PHP è %s (opzione di configurazione \"post_max_size\")."
@@ -9109,80 +9355,77 @@ msgstr "Dimensione minima necessaria di post PHP è %s (opzione di configurazion
 msgid "Minimum severity"
 msgstr "Severity minima"
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] "Il periodo di tempo minimo da visualizzare è %1$s ora."
 msgstr[1] "Il periodo di tempo minimo da visualizzare è %1$s ore."
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr "Severity trigger minima"
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "Il valore minimo per il periodo T è < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "Il valore minimo per il periodo T è = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "Il valore minimo per il periodo T è > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "Il valore minimo per il periodo T NON è N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Minuti"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr "Campo \"%1$s\" mancante per la condizione dell'azione."
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr "Campo \"%1$s\" mancante per l'item."
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr "Campo \"%1$s\" mancante per il periodo."
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr "Campo \"gitemid\" mancante per l'item."
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Campo \"itemid\" mancante per l'item."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr "Campo \"name\" mancante per il prototipo grafico."
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Campo \"nome\" mancante per il grafico."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Item \"%1$s\" mancante per l'host \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Item mancanti per il grafico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr "Item mancanti per il prototipo grafico \"%1$s\"."
@@ -9192,7 +9435,7 @@ msgstr "Item mancanti per il prototipo grafico \"%1$s\"."
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Chiave \"%1$s\" mancante per l'host \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Paramentro mancante: usrgrpids."
 
@@ -9204,18 +9447,18 @@ msgstr "Modalità"
 msgid "Model"
 msgstr "Modello"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Lun"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Lunedì"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Monitorato dal proxy"
 
@@ -9223,33 +9466,33 @@ msgstr "Monitorato dal proxy"
 msgid "Monitored host"
 msgstr "Host monitorato"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Monitoraggio"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr "Controllo dei log eventi di Windows. pattern, severity, eventid - regular expressions"
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr "Controllo dei file di log con rotazione. fileformat - [path][regexp], pattern - regular expression"
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr "Controllo file di log. pattern - regular expression"
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Mese"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Per mesi"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr "Più corrispondenze trovate..."
 
@@ -9257,7 +9500,7 @@ msgstr "Più corrispondenze trovate..."
 msgid "More than 10 minutes"
 msgstr "Più di 10 minuti"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Più di un grafico con nome \"%1$s\" all'interno dell'host."
@@ -9266,19 +9509,19 @@ msgstr "Più di un grafico con nome \"%1$s\" all'interno dell'host."
 msgid "Most busy triggers top 100"
 msgstr "Top 100 trigger più utilizzati"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Eventi PROBLEMA multipli"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Generazione multipli eventi PROBLEMA"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Muto"
 
@@ -9291,60 +9534,58 @@ msgstr "MAPPE DI RETE"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "NESSUN DATO"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "Autenticazione NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9355,26 +9596,32 @@ msgstr "Autenticazione NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Nome"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr "Nome per il prototipo gruppo \"%1$s\" deve contenere macro."
@@ -9393,12 +9640,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr "Periodo storicizzazione eventi e allarmi per Network discovery (in giorni) \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr "Interfaccia di rete statistica di input. Valore intero. Se la modalità è mancante viene utilizzato Byte."
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr "Interfaccia di rete statistica di output. Valore intero. Se la modalità è mancante viene utilizzato Byte."
 
@@ -9406,7 +9653,7 @@ msgstr "Interfaccia di rete statistica di output. Valore intero. Se la modalità
 msgid "Network map added"
 msgstr "Mappa di rete aggiunta"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Mappa di rete rimossa"
 
@@ -9418,7 +9665,7 @@ msgstr "Mappa di rete aggiornata"
 msgid "Network maps"
 msgstr "Mappe di rete"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Mai"
 
@@ -9426,24 +9673,24 @@ msgstr "Mai"
 msgid "Never executed"
 msgstr "Mai eseguito"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Nuovo"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Nuova applicazione"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Nuova condizione"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Nuovo elemento"
 
@@ -9454,16 +9701,16 @@ msgstr "Nuovo elemento"
 msgid "New flexible interval"
 msgstr "Nuovo intervallo flessibile"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Nuovo gruppo"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Nuovo gruppo host"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Nuovo item per il grafico"
 
@@ -9471,83 +9718,99 @@ msgstr "Nuovo item per il grafico"
 msgid "New media"
 msgstr "Nuovo supporto"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Nuova espressione regolare"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Nuovo orario di servizio"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Successivo"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Successivo"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "No"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr "Nessun \"%1$s\" fornito per il prototipo grafico."
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr "Nessun \"%1$s\" fornito per il grafico."
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr "Nessun \"%1$s\" fornito per il prototipo host."
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
-msgstr ""
+msgstr "Nessun \"%1$s\" fornito per la schermata."
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
+msgstr "Nessun \"%1$s\" fornito per il template schermata."
+
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr "Nessun \"%2$s\" fornito per il prototipo host \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Nessun campo \"ymax_type\" per il grafico \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Nessun campo \"ymin_type\" per il grafico \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr "Nessuna interfaccia IPMI trovata."
 
@@ -9555,25 +9818,25 @@ msgstr "Nessuna interfaccia IPMI trovata."
 msgid "No IT services found."
 msgstr "Nessun servizio IT trovato."
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr "Nessuna interfaccia JMX trovata."
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr "Nessun SNMP OID specificato."
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr "Nessun SNMP community specificato."
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr "Nessuna interfaccia SNMP trovata."
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Nessun URL fornito per l'elemento della schermata."
 
@@ -9599,8 +9862,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Nessuna azione trovata."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr "Nessuna interfaccia agent trovata."
 
@@ -9610,7 +9873,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Nessuna applicazione con ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr "Nessuna applicazione trovata."
 
@@ -9618,30 +9881,31 @@ msgstr "Nessuna applicazione trovata."
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "Nessun tipo di autenticazione specificato per il comando dell'operazione azione \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "Nessun nome utente di autenticazione specificatoper il comando dell'operazione azione \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Nessun nome utente di autenticazione specificato."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Nessun comando specificato per l'operazione dell'azione."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Nessun tipo di comando specificato per l'operazione dell'azione."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Nessuna condizione definita."
 
@@ -9650,27 +9914,27 @@ msgstr "Nessuna condizione definita."
 msgid "No data collection"
 msgstr "Senza collezionamento dati"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "Nessun dato ricevuto durante il periodo di tempo T, quindi N = 1, 0 - altrimentiNessun dato ricevuto durante il periodo di tempo T, quindi N = 1, 0 - altrimenti"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "Nessun dato ricevuto durante il periodo di tempo T, quindi N NON è 1, 0 - altrimentiNessun dato ricevuto durante il periodo di tempo T, quindi N NON è 1, 0 - altrimenti"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Nessuna interfaccia di default per tipo \"%1$s\" su \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Nessuna dipendenza definita."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Nessun dettaglio"
 
@@ -9678,39 +9942,39 @@ msgstr "Nessun dettaglio"
 msgid "No discovered devices found."
 msgstr "Nessun device discoverato trovato."
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr "Nessun ID regola discovery fornito per il prototipo host \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Nessun ID regola di discovery fornito."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr "Nessuna regola di discovery trovata."
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Nessun errore trovato."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Nessun evento"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr "Nessun evento trovato."
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Nessun evento a cui aggiungere acknowledge"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Nessun target di esecuzione specificato per il comando dell'operazione azione \"%s\"."
@@ -9725,7 +9989,7 @@ msgstr "Nessun file è stato caricato."
 msgid "No flexible intervals defined."
 msgstr "Nessun intervallo flessibile definito."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Nessun ID grafico fornito per l'elemento della schermata."
 
@@ -9734,7 +9998,11 @@ msgstr "Nessun ID grafico fornito per l'elemento della schermata."
 msgid "No graph item with graphid \"%s\"."
 msgstr "Nessun item del grafico con graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr "Nessun graph prototype trovato."
 
@@ -9743,48 +10011,49 @@ msgid "No graphs added."
 msgstr "Nessun grafico aggiunto."
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr "Nessun grafico trovato."
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Nessun gruppo per l'host \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Nessun gruppo per gli host."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr "Nessun gruppo per il template \"%1$s\"."
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Nessun ID host fornito."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Nessun host fornito per la macro \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr "Nessun ID gruppo host per il prototipo gruppo."
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Nessun ID gruppo host fornito per l'elemento della schermata."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr "Nessun host group trovato. "
 
@@ -9797,17 +10066,22 @@ msgstr "Nessun gruppo host con groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr "Nessun prototipo host trovato."
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Nessun host con hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr "Nessun host trovato."
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Nessuna icona per l'elemento della mappa \"%s\"."
@@ -9826,33 +10100,40 @@ msgstr "Nessuna immagine trovata."
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Nessuna interfaccia trovata"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Nessuna interfaccia trovata."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr "Nessuna interfaccia fornita per il proxy \"%s\"."
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Nessuna interfaccia per l'host \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Nessun ID item fornito per l'elemento della schermata."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr "Nessun item key trovato."
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr "Nessun item prototype trovato."
 
@@ -9871,7 +10152,7 @@ msgid "No items defined."
 msgstr "Nessun item definito."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr "Nessun item trovato."
 
@@ -9887,7 +10168,7 @@ msgstr "Nesun periodo di manutenzione definito."
 msgid "No maintenance periods found."
 msgstr "Nessun periodo di manutenzione trovato."
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Nessun ID mappa fornito per l'elemento della schermata."
 
@@ -9896,15 +10177,15 @@ msgid "No maps added."
 msgstr "Nessuna mappa aggiunta."
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr "Nessuna mappa trovata."
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr "Nessuna corrispondenza trovata"
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr "Nessun media trovato."
 
@@ -9916,133 +10197,178 @@ msgstr "Nessun media type trovato."
 msgid "No notifications found."
 msgstr "Nessuna notifica trovata."
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr "Nessuna operazione definita."
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Nessun permesso per il grafico \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Nessun permesso per l'host \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Nessun permesso per l'item \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Nessun permesso per il template \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Nessun permesso per il trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Nessun permesso"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Nessun permesso per il gruppo \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Nessun permesso per la mappa \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Nessun permesso per la schermata \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Nessun permesso per l'accesso al sistema."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Nessun permesso all'oggetto riferito o non esiste!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Nessun file di chiave provata specificato per il comando dell'operazione azione \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Nessun file di chiave privata specificato."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr "Nessun proxy trovato."
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Nessun proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Nessun file di chiave privata specificato per il comando dell'operazione azione \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Nessun file di chiave pubblica specificato."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Nessun destinatario per il messaggio dell'operazione azione."
 
@@ -10050,7 +10376,7 @@ msgstr "Nessun destinatario per il messaggio dell'operazione azione."
 msgid "No regular expressions found."
 msgstr "Nessuna regular expression trovata."
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Nessun ID schermata fornito per l'elemento della schermata."
 
@@ -10058,82 +10384,83 @@ msgstr "Nessun ID schermata fornito per l'elemento della schermata."
 msgid "No screens added."
 msgstr "Nessuna schermata aggiunta."
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr "Nessuna schermata trovata."
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Nessuno script specificato per il comando dell'operazione azione."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr "Nessun script trovato."
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr "Nessuna presentazione trovata."
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr "Nessuna presentazione trovata."
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr "Nessuno stato per il proxy."
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Nessun target selezionato"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Nessun target selezionato."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr "Nessun template trovato."
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr "Nessun template collegato."
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Nessun orario definito. Lavoro 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Nessun trigger"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Nessun trigger con triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Nessun trigger definito."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Nessun trigger trovato."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr "Nessun gruppo utente trovato."
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr "Nessun utente trovato."
 
@@ -10142,57 +10469,58 @@ msgid "No value maps found."
 msgstr "Nessun valore mappa trovato."
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Nessun valore trovato."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr "Nessun Web Scenario trovato."
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Nessuno"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normale"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Vista normale"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Senza Ack"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Item senza template"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Non tutti i template sono collegati a \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Non autorizzato ad impostare la password per l'utente \"guest\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Non disponibile"
 
@@ -10201,7 +10529,7 @@ msgstr "Non disponibile"
 msgid "Not classified"
 msgstr "Non classificato"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Non connesso"
 
@@ -10214,8 +10542,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Non supportato"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Nota"
@@ -10228,7 +10556,7 @@ msgstr "Note"
 msgid "Nothing"
 msgstr "Niente"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Niente da fare."
 
@@ -10236,87 +10564,87 @@ msgstr "Niente da fare."
 msgid "Notification report"
 msgstr "Report notifiche"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Novembre"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Adesso"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr "Numero di processori disponibili."
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr "Numero di inode per il dato volume. Se \"mode\" e' assente viene utilizzato il totale."
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr "Numero di item all'intero del database Zabbix."
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr "Numero di item all'interno della proxy history che non sono ancora stati inviati al server"
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr "Numero di item all'interno della coda che sono in ritardo da a secondi, inclusi."
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr "Numero di host monitorati"
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr "Numbero di processi. <name> e <user> come in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filtrato da command line (supporta regex). Esempio: proc.num[apache2,www-data]. Su Windows, solo <name> e <user> sono supportati."
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Numero di core del processore su VMware hypervisor, <url> - URL servizio VMware, <uuid> - VMware hypervisor nome host"
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Numero di thread processore su VMware hypervisor, <url> - URL servizio VMware, <uuid> - VMware hypervisor nome host"
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Numero di processori sulla macchina virtuale VMware, <url> - URL servizio VMware, <uuid> - Nome host macchina virtuale VMware"
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Numero di secondi a partire da Epoch è < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Numero di secondi a partire da Epoch è = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Numero di secondi a partire da Epoch è > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Numero di secondi a partire da Epoch NON è N"
 
@@ -10324,88 +10652,88 @@ msgstr "Numero di secondi a partire da Epoch NON è N"
 msgid "Number of status changes"
 msgstr "Numero di cambiamenti di stato"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Numero di passi"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Numero di valori V recuperati con successo (che soddisfano l'operatore O) per il periodo T è < NNumero di valori V recuperati con successo (che soddisfano l'operatore O) per il periodo T è < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Numero di valori V recuperati con successo (che soddisfano l'operatore O) per il periodo T è = NNumero di valori V recuperati con successo (che soddisfano l'operatore O) per il periodo T è = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Numero di valori V recuperati con successo (che soddisfano l'operatore O) per il periodo T è > NNumero di valori V recuperati con successo (che soddisfano l'operatore O) per il periodo T è > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Numero di valori V recuperati con successo (che soddisfano l'operatore O) per il periodo T NON è NNumero di valori V recuperati con successo (che soddisfano l'operatore O) per il periodo T NON è N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr "Numero di trigger all'interno del database Zabbix."
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr "Numero di item in stato \"non supportati\" all'interno del database Zabbix."
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Numero di utenti (online)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr "Numero utenti connessi. Utilizzato comando \"who\" lato agent."
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr "Numero di valori storicizzati nella tabella HISTORY."
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr "Numero di valori storicizzati nella tabella HISTORY_LOG."
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr "Numero di valori memorizzati nella tabella HISTORY_STR."
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr "Numero di valori memorizzati nella tabella HISTORY_TEXT."
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr "Numero di valori memorizzati nella tabella HISTORY_UINT."
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr "Numero di valori memorizzati nella tabella TRENDS."
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr "Numero di valori memorizzati nella tabella TRENDS_UINT."
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Numero di macchine virtuali su VMware hypervisor, <url> - servizio VMware URL, <uuid> - VMware hypervisor nome host"
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numerico (float)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numerico (intero 64bit)"
 
@@ -10420,16 +10748,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr "OK o nessun trigger"
 
@@ -10445,8 +10775,7 @@ msgstr "Router OOB"
 msgid "OOB subnet mask"
 msgstr "Maschera sottorete OOB"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "O"
 
@@ -10466,11 +10795,12 @@ msgstr "OS (Breve)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "ALTRI PARAMETRI DI CONFIGURAZIONE"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "PANORAMICA"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Ott"
 
@@ -10478,25 +10808,25 @@ msgstr "Ott"
 msgid "Octal"
 msgstr "Ottale"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Ottobre"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Off"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "On"
 
@@ -10504,111 +10834,114 @@ msgstr "On"
 msgid "On status change triggers blink for"
 msgstr "Al cambio di stato i trigger lampeggiano per"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Una volta"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr "Uno degli oggetti è rimasto senza gruppo host."
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Solo una volta"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Inattività una-volta"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Solo i Super Amministratori possono creare macro globali."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Solo i Super Amministratori possono creare gruppi host."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Solo i Super Amministratori possono creare mappe icone."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Solo i Super Amministratori possono tipi di supporto."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Solo i Super Amministratori possono rimuovere macro globali."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Solo i Super Amministratori possono rimuovere tipi di supporto."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Solo i Super Amministratori possono cancellare i gruppi utente."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Solo i Super Amministratori possono modificare i tipi di supporto."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Solo i Super Amministratori possono aggiornare le macro globali."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Solo i Super Amministratori possono aggiornare le mappe icone."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Solo gli Amministratori Zabbix posso aggiungere supporti utente."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Solo gli Amministratori Zabbix possono cambiare i supporti utente."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Solo gli Amministratori Zabbix possono rimuovere i supporti utente."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Sono permessi solo caratteri."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Solo gli item assegnati agli host abilitati sono conteggiati."
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Un solo controllo può esser unico."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Può esser cambiato un solo nome di gruppo utente per volta."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Solo l'ultimo 20%% dell'indicatore viene visualizzato."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr "Solo gli eventi trigger possono avere acknowledge."
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Solo i trigger assegnati agli host abilitati e dipendenti da item abilitati son conteggiatiSolo i trigger assegnati agli host abilitati e dipendenti da item abilitati son conteggiati"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "L'operazione \"%s\" esiste già."
@@ -10617,28 +10950,28 @@ msgstr "L'operazione \"%s\" esiste già."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "L'operazione non può esser eseguita a causa di richiesta non autorizzata.L'operazione non può esser eseguita a causa di richiesta non autorizzata."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Condizione dell'operazione"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Dettagli dell'operazione"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "L'operazione non ha gruppi per operare."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "L'operazione non ha template per operare."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Tipo operazione"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operazioni"
@@ -10647,25 +10980,27 @@ msgstr "Operazioni"
 msgid "Operator"
 msgstr "Operatore"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10695,24 +11030,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Originale"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Blu originale"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Altri"
 
@@ -10720,19 +11055,19 @@ msgstr "Altri"
 msgid "Other configuration parameters"
 msgstr "Altri parametri di configurazione"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Altri gruppi"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Altri host"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10742,21 +11077,21 @@ msgstr "Altri host | Gruppo"
 msgid "Other parameters"
 msgstr "Altri parametri"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Altri | gruppo"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Altri"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr "Out-of-window collision. Collisions count."
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Sovrascritto da"
@@ -10769,14 +11104,11 @@ msgstr "Sovrascrivi periodo dello storico item"
 msgid "Override item trend period"
 msgstr "Sovrascrivi periodo del trend item"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr "Sovrascritto dalle impostazioni di housekeeping globali"
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Panoramica"
 
@@ -10784,7 +11116,7 @@ msgstr "Panoramica"
 msgid "Overview by proxy"
 msgstr "Panoramica per proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10793,147 +11125,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "CRUSCOTTO PERSONALE"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr "Estensione PHP bcmath assente (configurare il paramentro PHP --enable-bcmath)."
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr "Estensione PHP CType mancante (parametro di configurazione di PHP --enable-ctype)."
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Supporto PHP per database"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Supporto PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr "Supporto PHP gd FreeType assente."
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr "Supporto PHP gd JPEG assente."
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Supporto PHP gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr "Supporto PHP gd PNG assente."
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Supporto PHP gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr "Estensione PHP gd mancante (parametro di configurazione di PHP --with-gd)."
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr "Estensione PHP gettext mancante (parametro di configurazione di PHP --with-gettext). Le traduzioni non saranno disponibili."
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr "Estensione PHP libxml assente."
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr "Estensione PHP mbstring mancante (parametro di configurazione di PHP --enable-mbstring)."
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "Opzione PHP max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "Opzione PHP max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "Opzione PHP memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "Opzione PHP post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "Opzione PHP upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "Sessione PHP"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "Auto-start sessione PHP"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr "Sessione PHP avvio automatico deve essere disabilitata (direttiva PHP \"session.auto_start\")."
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr "Estensione PHP session mancante (parametro di configurazione di PHP --enable-sessione)."
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "Socket PHP"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr "Estensione PHP sockets mancante (parametro di configurazione di PHP --enable-sockets)."
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "Fuso orario PHP"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Versione PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr "Manca estensione PHP XmlReader."
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr "Estensione PHP xmlwriter assente."
 
@@ -10942,32 +11282,34 @@ msgstr "Estensione PHP xmlwriter assente."
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLEMA"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "La pagina ha ricevuto dati errati"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Tavolozza"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Tavolozza #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parametro"
 
@@ -10976,7 +11318,7 @@ msgstr "Parametro"
 msgid "Parent discovery rules"
 msgstr "Regole di discovery primarie"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr "Grafici primari"
 
@@ -10996,33 +11338,33 @@ msgstr "Trigger primario"
 msgid "Parent web scenarios"
 msgstr "Scenari web primari"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Analizza errore SQL [%1$s] in [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Analizza errore"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Passivo"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11032,20 +11374,21 @@ msgstr "Passivo"
 msgid "Password"
 msgstr "Password"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Password (ancora una volta)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
-msgstr ""
+msgstr "Password non disponibile per gli utenti con %1$s."
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Password richiesta per il tipo di supporto."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "La password non deve esser vuota"
 
@@ -11054,21 +11397,21 @@ msgstr "La password non deve esser vuota"
 msgid "Peak memory usage: %s"
 msgstr "Limite utilizzo memoria: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Linea di percentile (sinistra)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Linea di percentile (destra)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr "Esegue una query DNS. In caso di successo restituisce una stringa di caratteri con le informazioni richieste."
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11076,12 +11419,12 @@ msgstr "Esegue una query DNS. In caso di successo restituisce una stringa di car
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Periodo"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Tipo di periodo"
@@ -11091,24 +11434,24 @@ msgstr "Tipo di periodo"
 msgid "Periods"
 msgstr "Periodi"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Permessi"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "I permessi possono esser assegnati solo per i gruppi utente."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persiano (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Torta"
 
@@ -11120,55 +11463,56 @@ msgstr "Algoritmo di posizionamento"
 msgid "Plain text"
 msgstr "Testo semplice"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Riproduci"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Riproduci suono"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Per favore correggi tutti i problemi e premi il bottone \"Riprova\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Per favore invia testo di conferma."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Per favore seleziona due elementi"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polacco (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Popola campo inventario host"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Porta"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "La porta non può esser vuota per l'interfaccia host."
 
@@ -11176,51 +11520,51 @@ msgstr "La porta non può esser vuota per l'interfaccia host."
 msgid "Port range"
 msgstr "Range porte"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portoghese (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Portoghese (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Posizione"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Post"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Anteprima"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Precedente"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Precedente"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Il valore precedente è < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Il valore precedente è = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Il valore precedente è > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Il valore precedente NON è N"
 
@@ -11269,30 +11613,31 @@ msgstr "Passphrase di privacy"
 msgid "Privacy protocol"
 msgstr "Protocollo di privacy"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "File chiave privata"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Livello privilegi"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Probabilmente il modulo php-ldap è mancante."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problema"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Mostra problema"
 
@@ -11304,16 +11649,16 @@ msgstr "Problema su"
 msgid "Problem time"
 msgstr "Ora problema"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Problema, se tutti i figli hanno problemi"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problema, se almeno un servizio derivato ha un problema"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problemi"
 
@@ -11321,75 +11666,71 @@ msgstr "Problemi"
 msgid "Profile"
 msgstr "Profilo"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototipi"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxy"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Il proxy \"%1$s\" per l'host \"%2$s\" non esiste."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Il proxy \"%1$s\" è usato dalla regola di discovery \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Il proxy \"%s\" esiste già."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy aggiunto"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy rimosso"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Host del proxy"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Creazione dell'interfaccia proxy fallita."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Aggiornamento dell'interfaccia proxy fallito."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Modalità proxy"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Nome proxy"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy aggiornato"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Chiave pubblica"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11400,7 +11741,7 @@ msgstr "File di chiave pubblica"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "CODA DI ITEM DA AGGIORNARE"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Coda"
 
@@ -11408,18 +11749,18 @@ msgstr "Coda"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Lettura"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Sola lettura"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Lettura-scrittura"
 
@@ -11431,7 +11772,7 @@ msgstr "Causa"
 msgid "Received value"
 msgstr "Valore ricevuto"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11439,11 +11780,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Destinatario (crescente)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Destinatario (discendente)"
 
@@ -11454,28 +11795,28 @@ msgstr "Destinatario (discendente)"
 msgid "Recipient(s)"
 msgstr "Destinatario(i)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Ripristino"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Messaggio di ripristino"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Soggetto del ripristino"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Aggiorna (in secondi)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr "Tempo di refresh"
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Moltiplicatore del tempo di aggiornamento"
 
@@ -11493,47 +11834,51 @@ msgstr "Aggiorna item non supportati (in sec) \"%1$s\"."
 msgid "Regular expression"
 msgstr "Espressione regolare"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "L'espressione regolare \"%s\" esiste già."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "L'espressione regolare V corrisponde all'ultimo valore nel periodo T, quindi N = 1, 0 - altrimentiL'espressione regolare V corrisponde all'ultimo valore nel periodo T, quindi N = 1, 0 - altrimenti"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "L'espressione regolare V corrisponde all'ultimo valore nel periodo T, quindi N = 1, 0 - altrimenti (non case-sensitive)L'espressione regolare V corrisponde all'ultimo valore nel periodo T, quindi N = 1, 0 - altrimenti (non case-sensitive)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "L'espressione regolare V corrisponde all'ultimo valore nel periodo T, quindi N NON è 1, 0 - altrimentiL'espressione regolare V corrisponde all'ultimo valore nel periodo T, quindi N NON è 1, 0 - altrimenti"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "L'espressione regolare V corrisponde all'ultimo valore nel periodo T, quindi N NON è 1, 0 - altrimenti (non case-sensitive)L'espressione regolare V corrisponde all'ultimo valore nel periodo T, quindi N NON è 1, 0 - altrimenti (non case-sensitive)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Espressione regolare aggiunta"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Espressione regolare rimossa"
 msgstr[1] "Espressioni regolari rimosse"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "L'espressione regolare non esiste."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Espressione regolare aggiornata"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11550,26 +11895,28 @@ msgstr "Comando remoto"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11580,21 +11927,19 @@ msgstr "Comando remoto"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr "Rimuovi tutto"
 
@@ -11602,11 +11947,11 @@ msgstr "Rimuovi tutto"
 msgid "Remove element"
 msgstr "Rimuovi elemento"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Rimuovi da"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Rimuovi dai preferiti"
@@ -11615,7 +11960,7 @@ msgstr "Rimuovi dai preferiti"
 msgid "Remove from host group"
 msgstr "Rimuovi da gruppo host"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Rimuovi dai gruppi host"
 
@@ -11627,28 +11972,28 @@ msgstr "Rimuovi host"
 msgid "Remove link"
 msgstr "Rimuovi collegamento"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Rimuovi selezionati"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr "Sostituisci applicazioni"
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Sostituisci dipendenze"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Sostituisci gruppi host"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Report"
 
@@ -11656,35 +12001,36 @@ msgstr "Report"
 msgid "Report 1"
 msgstr "Report 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Report 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Report 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Report"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Necessario"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Il campo \"espressione\" richiesto è assente nella mappatura icone."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Il campo \"iconid\" richiesto è assente nella mappatura icone."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Il campo \"inventory_link\" richiesto è assente nella mappatura icone."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Permessi host richiesti"
 
@@ -11692,29 +12038,31 @@ msgstr "Permessi host richiesti"
 msgid "Required performance (vps)"
 msgstr "Performance stimate (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr "Nuovi valori al secondo da processare dal server Zabbix (valore teorico stimato)."
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Stima performance server, nuovi valori per secondo"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Status Code atteso"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Stringa attesa"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Azzera"
 
@@ -11733,9 +12081,9 @@ msgstr "Ripristinare tutti i nomi ed i colori ai valori predefiniti"
 msgid "Reset confirmation"
 msgstr "Conferma ripristino"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11748,7 +12096,7 @@ msgstr "Risolto"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Risorsa"
@@ -11763,15 +12111,15 @@ msgstr "Tempo di risposta"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Risultato"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Il risultato è FALSO"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Il risultato è VERO"
 
@@ -11784,7 +12132,8 @@ msgstr "Risultato di \"%s\""
 msgid "Result type"
 msgstr "Tipo di risultato"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr "Tentativi"
 
@@ -11792,60 +12141,69 @@ msgstr "Tentativi"
 msgid "Retries left"
 msgstr "Tentativi rimasti"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Riprova"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr "Restituisce ICMP ping response time in secondi. Esempio: 0.02"
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr "Restituisce la availability di un particolare tipo di controlli per l'host. Valore di item corrispondono alle icone availability nella lista host. Valori validi: agent, SNMP, IPMI, JMX."
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr "Restituisce informazioni host dettagliate. Valore tipo stringa"
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr "Restituisce hostaname (o nome NetBIOS (di default) su Windows). Valore tipo stringa. Esempio valore restituito: www.zabbix.com"
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr "Restituisce le informazioni associate con Zabbix Java Gateway. Paramteri validi: ping, versione."
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr "Restituisce la percentuale di pacchetti ICMP ping persi."
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Destra"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr "Rumeno (ro_RO)"
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Larghezza riga"
 
@@ -11853,11 +12211,11 @@ msgstr "Larghezza riga"
 msgid "Rows"
 msgstr "Righe"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Righe per pagina"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Regole"
 
@@ -11902,20 +12260,20 @@ msgid "Run remote commands on hosts"
 msgstr "Esegui comandi remoti sugli host"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr "Esegue comando specificato sull'host."
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -11931,7 +12289,7 @@ msgstr "SCHERMATE"
 msgid "SEARCH"
 msgstr "CERCA"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVER"
 
@@ -11946,13 +12304,13 @@ msgstr "SHA"
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "PRESENTAZIONI"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11961,17 +12319,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "Email SMTP"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "Server SMTP"
@@ -11987,7 +12345,7 @@ msgstr "Chiave SNMP"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11999,9 +12357,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "Interfacce SNMP"
@@ -12010,7 +12368,7 @@ msgstr "Interfacce SNMP"
 msgid "SNMP trap"
 msgstr "Trap SNMP"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "La chiave della trap SNMP non è valida."
 
@@ -12034,7 +12392,7 @@ msgstr "Agente SNMPv3"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Conteggio SQL: %s (selezioni: %s | esecuzioni: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12052,7 +12410,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "L'esecuzione dello statement SQL è fallita \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12061,15 +12419,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "Agente SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "STATO DISCOVERY"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STATO DEI TRIGGER"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "STATO DEL MONITORAGGIO WEB"
 
@@ -12077,92 +12455,92 @@ msgstr "STATO DEL MONITORAGGIO WEB"
 msgid "STATUS OF ZABBIX"
 msgstr "STATO DI ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Sab"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sabato"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Salva"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Salva e ritorna"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Scala"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Scenario"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Scenario aggiunto"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Scenario aggiornato"
 
@@ -12174,7 +12552,7 @@ msgstr "Scenari"
 msgid "Schedule"
 msgstr "Schedulazione"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr "Controllo pianificato"
 
@@ -12185,126 +12563,125 @@ msgstr "Controllo pianificato"
 msgid "Screen"
 msgstr "Schermata"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Schermata \"%1$s\" aggiunta."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "La schermata \"%1$s\" esiste già nel template \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "La schermata \"%1$s\" esiste già."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr "Schermata \"%1$s\" cella X - %2$s Y - %3$s gia' utilizzata."
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr "Schermata \"%1$s\" span cell colonna X - %2$s Y - %3$s non corretta."
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr "Schermata \"%1$s\" span cell colonna X - %2$s Y - %3$s è troppo grande."
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr "Schermata \"%1$s\" estensione riga nella cella X - %2$s Y - %3$s non è corretto."
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr "Schermata \"%1$s\" estensione riga nella cella X - %2$s Y - %3$s è troppo grande."
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Schermata \"%1$s\" saltata - regola utente."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Schermata \"%1$s\" aggiornata."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Schermata aggiunta"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Configurazione cella schermata"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Schermata rimossa"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "La schermata deve contenere almeno una riga e una colonna."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Schermata aggiornata"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Schermate"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Script"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Lo script \"%s\" esiste già."
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Script aggiunto"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Percorso menu Script \"%1$s\" già utilizzato come nome script \"%2$s\"."
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr "Percorso menu Script \"%1$s\" già utilizzato come nome script \"%2$s\"."
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Percorso menu Script \"%1$s\" già utilizzato come nome script \"%2$s\"."
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr "Nome Script \"%1$s\" già utilizzato come percorso script \"%2$s\"."
@@ -12313,17 +12690,17 @@ msgstr "Nome Script \"%1$s\" già utilizzato come percorso script \"%2$s\"."
 msgid "Script profiler"
 msgstr "Creatore di profili script"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Script aggiornato"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr "Lo script con scriptid \"%s\" non esiste."
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Script"
 
@@ -12344,7 +12721,7 @@ msgstr "Il pattern di ricerca è vuoto"
 msgid "Search/Filter elements limit"
 msgstr "Limite Cerca/Filtra elementi"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Secondi"
 
@@ -12376,7 +12753,7 @@ msgstr "Telefono POC secondario B"
 msgid "Secondary POC screen name"
 msgstr "Nome schermata POC secondaria"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Secondi"
 
@@ -12395,69 +12772,76 @@ msgstr "Livello di sicurezza"
 msgid "Security name"
 msgstr "Nome di sicurezza"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Seleziona"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Seleziona prototipi"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Seleziona righe con valori contenenti"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Selezionati"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Azioni selezionate eliminate"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Elementi selezionati"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Gruppi selezionati"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Host selezionati"
 
@@ -12473,7 +12857,7 @@ msgstr "Invia messaggio ai gruppi utente"
 msgid "Send message to users"
 msgstr "Invia messaggio agli utenti"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Invia solo a"
 
@@ -12481,11 +12865,11 @@ msgstr "Invia solo a"
 msgid "Send to"
 msgstr "Invia a"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Invia ai gruppi Utente"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Invia agli Utenti"
 
@@ -12494,17 +12878,17 @@ msgstr "Invia agli Utenti"
 msgid "Sent"
 msgstr "Inviato"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Set"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Separati"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Settembre"
 
@@ -12516,7 +12900,7 @@ msgstr "Numero seriale A"
 msgid "Serial number B"
 msgstr "Numero seriale B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Server"
@@ -12525,44 +12909,44 @@ msgstr "Server"
 msgid "Server info"
 msgstr "Info server"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Ora server"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Servizio"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr "Servizio \"%1$s\""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Il servizio \"%1$s\" non può esser rimosso, in quanto dipendente da un altro servizio."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Il servizio \"%1$s\" non può esser dipendente da se stesso."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Il servizio \"%1$s\" non può esser collegato ad un trigger ed avere figli allo stesso tempo."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Il servizio \"%1$s\" è già collegato fisicamente a un servizio differente."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Il servizio non può esser primario e derivato allo stesso tempo."
 
@@ -12578,11 +12962,11 @@ msgstr "Servizio rimosso"
 msgid "Service port"
 msgstr "Porta servizio"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "L'ora di partenza del servizio deve essere minore dell'ora di fine."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Orari servizio"
 
@@ -12594,49 +12978,53 @@ msgstr "Tipo servizio"
 msgid "Service updated"
 msgstr "Servizio aggiornato"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Servizi"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "I servizi formano una dipendenza circolare."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Sessione terminata, rieffettua il login, per favore."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Severity"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Severity (discendente)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Il nome della severity non può esser vuoto."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Mostra"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Mostra tutti"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Mostra i dettagli"
 
@@ -12666,35 +13054,36 @@ msgstr "Mostra eventi non più vecchi di (in giorni)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Mostra eventi non più vecchi di (in giorni) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Mostra gli host in manutenzione"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Mostra items con il nome che contiene"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Mostra voci senza dati"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Mostra legenda"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Mostra linee"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Mostra selezionati"
 
@@ -12702,19 +13091,22 @@ msgstr "Mostra selezionati"
 msgid "Show selected groups"
 msgstr "Mostra gruppi selezionati"
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Mostra testo come HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Mostra trigger"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Mostra senza acknowledge"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Mostra valore"
@@ -12723,11 +13115,11 @@ msgstr "Mostra valore"
 msgid "Show warning if Zabbix server is down"
 msgstr "Mostra avvertimento se Zabbix Server non risponde"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Mostra orario di lavoro"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Visibile"
 
@@ -12747,6 +13139,10 @@ msgstr "Simple check"
 msgid "Simple graph"
 msgstr "Grafico semplice"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "ZIP / Codice postale"
@@ -12784,7 +13180,7 @@ msgid "Site state / province"
 msgstr "Stato / provincia sito"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr "Dimensioni di un dato file. Dimensione in byte. Il file deve avere i permessi di lettura per l'utente zabbix. Esempio: vfs.file.size[/var/log/syslog]"
 
@@ -12802,16 +13198,16 @@ msgstr "Saltata copia del grafico \"%1$s\" sull'host \"%2$s\"."
 msgid "Slide"
 msgstr "Diapositiva"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Presentazione"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr "Slide show \"%1$s\" già esiste."
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "La presentazione \"%s\" esiste già."
@@ -12820,11 +13216,11 @@ msgstr "La presentazione \"%s\" esiste già."
 msgid "Slide show added"
 msgstr "Presentazione aggiunta"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Presentazione rimossa"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "La presentazione deve contenere diapositive."
 
@@ -12832,10 +13228,10 @@ msgstr "La presentazione deve contenere diapositive."
 msgid "Slide show updated"
 msgstr "Presentazione aggiornata"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Presentazioni"
 
@@ -12843,15 +13239,15 @@ msgstr "Presentazioni"
 msgid "Slides"
 msgstr "Diapositive"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Slovacco (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Posponi"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Soft"
 
@@ -12884,28 +13280,28 @@ msgid "Software application E"
 msgstr "Applicazione software E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr "Architettura software"
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr "Elenco dei pacchetti software - elenca tutti i pacchetti per tutti i gestori di pacchetti supportati di default"
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Ordina per"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Ordinamento (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Ordina trigger per"
 
@@ -12918,11 +13314,11 @@ msgstr "L'ordinamento per campo \"%1$s\" non è permesso."
 msgid "Source"
 msgstr "Sorgente"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spagnolo (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Lo script specificato non esiste o non hai i diritti su esso per il comando dell'operazione azione.Lo script specificato non esiste o non hai i diritti su esso per il comando dell'operazione azione."
 
@@ -12930,63 +13326,63 @@ msgstr "Lo script specificato non esiste o non hai i diritti su esso per il coma
 msgid "Speed"
 msgstr "Velocità"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Sovrapposto"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Item standard"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Inizia in"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr "Ora di avvio del server Zabbix, Unix timestamp."
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Stato"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr "Stato di servizio. 0 - in esecuzione, 1 - in pausa, 2 - attesa avvio, 3 - attesa pausa, 4 - attesa avanzamento, 5 - attesa stop, 6 - fermo, 7 - sconosciuto, 255 - servizio inesistente"
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Stato"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Stato (crescente)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Stato (discendente)"
 
@@ -12999,7 +13395,7 @@ msgstr "Calcolo dello stato"
 msgid "Status calculation algorithm"
 msgstr "Algoritmo di calcolo dello stato"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Codici di stato"
 
@@ -13008,7 +13404,7 @@ msgid "Status of Web monitoring"
 msgstr "Stato del monitoraggio Web"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Stato di Zabbix"
 
@@ -13025,40 +13421,40 @@ msgid "Status only"
 msgstr "Solo lo stato"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Passo"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Passo \"%1$s\" [%2$s of %3$s] fallito: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Durata del passo"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Passo dello scenario"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr "Il passo con nome \"%1$s\" esiste già."
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Passi"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Ferma"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Memorizza il valore"
@@ -13067,11 +13463,11 @@ msgstr "Memorizza il valore"
 msgid "Straight"
 msgstr "Dritto"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Stile"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Sotto-filtro [influenza solo i dati filtrati!]"
 
@@ -13079,11 +13475,11 @@ msgstr "Sotto-filtro [influenza solo i dati filtrati!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Soggetto"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Sottomappa"
 
@@ -13092,32 +13488,32 @@ msgid "Success Audit"
 msgstr "Riuscita Audit"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr "Somma per interfaccia di rete del traffico in entrata e in uscita. Valore intero. Modalità - one of bytes (default), packets, errors or dropped"
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "La somma dei valori del periodo T è < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "La somma dei valori del periodo T è = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "La somma dei valori del periodo T è > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "La somma dei valori del periodo T NON è N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Dom"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -13125,27 +13521,27 @@ msgstr "Domenica"
 msgid "Support"
 msgstr "Supporto"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Cognome"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr "Swap in. Se tipo è \"count\"- viene restituito swapins. Se il tipo è \"pages \" - viene restituito \"pages swapped\". Se swap è mancante viene utilizzato \"all\"."
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr "Swap out. Se il tipo e' \"count\" - restituisce swapouts. Se il tipo e' \"pages\" - Restituisce le pagine swapped. Se \"swap\" assente viene utilizzato tutto."
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr "Spazio Swap. Numero di Byte. Se swap assente viene considerato tutto. Se \"mode\" assente viene considerata la \"free\"."
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Svedese (sv_SE)"
 
@@ -13153,16 +13549,16 @@ msgstr "Svedese (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "Il cambio del metodo di autenticazione ripristinerà tutto eccetto questa sessione! Continuare?Il cambio del metodo di autenticazione ripristinerà tutto eccetto questa sessione! Continuare?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Predefinito di sistema"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Errore sistema."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr "System local time. Tempo in secondi."
 
@@ -13171,21 +13567,21 @@ msgid "System status"
 msgstr "Stato sistema"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr "System uptime in secondi."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "G"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "M"
@@ -13204,11 +13600,11 @@ msgid "TOTAL"
 msgstr "TOTALE"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "COMMENTI TRIGGER"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "VERO"
 
@@ -13226,14 +13622,14 @@ msgstr "La tavola \"%1$s\" non contiene un campo chiamato \"%2$s\"."
 msgid "Tag"
 msgstr "Tag"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Target"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Lista target"
 
@@ -13242,130 +13638,133 @@ msgid "Target type"
 msgstr "Tipo target"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Template"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Il template \"%1$s\" esiste già."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Il template \"%1$s\" per l'host \"%2$s\" non esiste."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr "Template \"%1$s\" con chiave item \"%2$s\" già collegato all'host."
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Template aggiunto"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Il template non può esser collegato a un altro template più di una volta anche attraverso altri template.Il template non può esser collegato a un altro template più di una volta anche attraverso altri template."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Template rimosso"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Gruppo template"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Collegamento template"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Lista template"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Nome template"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr "Template schermata \"%1$s\" gia' presente."
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Schermate template"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Trigger del template"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Template aggiornato"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr "Template con stesso nome \"%1$s\" gia' presente."
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Un template con lo stesso nome \"%s\" esiste già."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr "Template con stesso nome visibile \"%1$s\" gia' presente."
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Un template con lo stesso nome visibile \"%s\" esiste già."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Items con template"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Template"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Template \"%1$s\" scollegati dagli host \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Test"
 
@@ -13373,11 +13772,11 @@ msgstr "Test"
 msgid "Test authentication"
 msgstr "Autenticazione di test"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Conferma di test"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Dati di test"
 
@@ -13391,22 +13790,22 @@ msgid "Test string"
 msgstr "Stringa di test"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Testo"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr "La coordinata X dell'elemento schermata situato a X - %1$s s e Y - %2$s della schermata \"%3$s\" è troppo grande."
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr "La coordinata Y di elemento dello schermo situato a X - %1$s e Y - %2$s della schermata \"%3$s\" è troppo grande."
@@ -13414,7 +13813,7 @@ msgstr "La coordinata Y di elemento dello schermo situato a X - %1$s e Y - %2$s
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "Il frontend non corrisponde al database Zabbix."
@@ -13429,26 +13828,26 @@ msgstr "Il frontend non corrisponde al database Zabbix. Versione corrente del da
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Il gruppo host non è stato più discoverato e sarà rimosso in %1$s (il %2$s alle %3$s)."
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "L'host non è stato più discoverato e sarà rimosso in %1$s (il %2$s alle %3$s)."
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "L'immagine è utilizzata nella mappa icone %1$s."
 msgstr[1] "L'immagine è utilizzata nelle mappe icone %1$s."
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] "L'immagine è utilizzata nella mappa %1$s."
 msgstr[1] "L'immagine è utilizzata nelle mappe %1$s."
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "L'item non è più rilevato da discovery e sarà rimosso in %1$s (il %2$s alle %3$s)."
@@ -13457,19 +13856,19 @@ msgstr "L'item non è più rilevato da discovery e sarà rimosso in %1$s (il %2$
 msgid "The queue is empty."
 msgstr "La coda è vuota."
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Il JSON ricevuto non è una Richiesta JSON-RPC valida."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "La procedura remota richiesta non esiste / non è disponibile"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr "L'applicazione dello scenario web appartiene a un host diverso dall'host dello scenario web.L'applicazione dello scenario web appartiene a un host diverso dall'host dello scenario web."
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Tema"
 
@@ -13480,11 +13879,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "C'è il gruppo \"%1$d\" con accesso interno GUI."
 msgstr[1] "Ci sono i gruppi \"%1$d\" con accesso GUI interno."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Terzo"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Questo campo è automaticamente popolato dall'item \"%s\"."
@@ -13493,11 +13892,11 @@ msgstr "Questo campo è automaticamente popolato dall'item \"%s\"."
 msgid "This month"
 msgstr "Questo mese"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Questa colonna della schermata non è vuota. Cancellarla?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Questa riga della schermata non è vuota. Cancellarla?"
 
@@ -13509,27 +13908,27 @@ msgstr "Questa settimana"
 msgid "This year"
 msgstr "Quest'anno"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Gio"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Fino a"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13538,28 +13937,28 @@ msgstr "Fino a"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Ora"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Ora (ascendente)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Ora (discendente)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr "Tempo di un particolare processo Zabbix o di un gruppo di processi (identificati da <type> e <num>) trascorsi in <state> in percentuale."
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr "Tempo ultimo accesso del proxy. Nome - nome proxy. Param - lastaccess. Timestamp Unix."
 
@@ -13567,54 +13966,54 @@ msgstr "Tempo ultimo accesso del proxy. Nome - nome proxy. Param - lastaccess. T
 msgid "Time period"
 msgstr "Periodo di tempo"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Spostamento temporale"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Tipo ora"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr "Fuso orario PHP non impostato (parametro di configurazione \"date.timezone\")."
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Timeout"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Data e ora"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "Data e ora non diversi dall'ora sul server Zabbix per più di T secondi, quindi N = 1, 0 - altrimentiData e ora non diversi dall'ora sul server Zabbix per più di T secondi, quindi N = 1, 0 - altrimenti"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "Data e ora non diversi dall'ora sul server Zabbix per più di T secondi, quindi N NON è 1, 0 - altrimentiData e ora non diversi dall'ora sul server Zabbix per più di T secondi, quindi N NON è 1, 0 - altrimenti"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr "Timestamp boot di sistema."
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Titolo"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "A"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Per impostare un'interfaccia host seleziona un singolo tipo di item per tutti gli itemPer impostare un'interfaccia host seleziona un singolo tipo di item per tutti gli item"
 
@@ -13622,17 +14021,18 @@ msgstr "Per impostare un'interfaccia host seleziona un singolo tipo di item per
 msgid "Today"
 msgstr "Oggi"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "In alto"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Totale"
 
@@ -13650,7 +14050,7 @@ msgstr "Tempo totale: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "La transazione non è stata chiusa. Interruzione..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Errore di trasporto."
 
@@ -13667,91 +14067,91 @@ msgstr "Periodo storicizzazione valori Trend (in giorni) \"%1$s\"."
 msgid "Trend storage period"
 msgstr "Periodo storicizzazione Trend"
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr "Periodo storicizzazione Trend (in giorni)"
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trend"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Trigger"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Il trigger \"%1$s\" esiste già su \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Il trigger \"%1$s\" dipende dal trigger \"%2$s\", il quale non esiste."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Trigger \"%1$s\" saltato - regola utente."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Il trigger \"%s\" appartiene a template con differenti collegamenti."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Trigger aggiunto"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr "Un trigger non può dipendere da un trigger che deriva da esso."
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Commenti trigger"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr "Periodo storicizzazione dati Trigger (in giorni)"
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Trigger rimosso"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] "Trigger disabilitato"
 msgstr[1] "Trigger disabilitati"
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Opzioni di visualizzazione trigger"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] "Trigger abilitato"
@@ -13766,11 +14166,12 @@ msgstr "Periodo storicizzazione dati eventi e allarmi"
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr "Periodo storicizzazione dati eventi e allarmi (in giorni) \"%1$s\"."
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Condizione di espressione trigger"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "L'espressione trigger deve contenere almeno un riferimento host:key."
 
@@ -13778,7 +14179,7 @@ msgstr "L'espressione trigger deve contenere almeno un riferimento host:key."
 msgid "Trigger form"
 msgstr "Form Trigger"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "Il trigger contiene item dal template \"%1$s\" che non è collegato all'host."
@@ -13791,12 +14192,12 @@ msgstr "Trigger in stato \"normal\"."
 msgid "Trigger in \"unknown\" state"
 msgstr "Trigger in stato \"sconosciuto\"."
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "Il trigger nel template \"%1$s\" contiene dipendenze dal trigger nel template \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Trigger appena aggiunto. Nessun aggiornamento di stato."
 
@@ -13808,52 +14209,52 @@ msgstr "Tipo etichetta trigger"
 msgid "Trigger name"
 msgstr "Nome trigger"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Prototipo trigger"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "Trigger prototipo \"%1$s\" contiene prototipi item provenienti da multiple regole di discovery."
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
-msgstr ""
+msgstr "Trigger prototipo \"%1$s\" deve contenere almeno un prototipo item."
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr "Prototipo Trigger aggiunto"
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr "Prototipo Trigger cancellato"
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] "Prototipo Trigger disabilitato"
 msgstr[1] "Prototipi Trigger disabilitati"
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] "Prototipo Trigger abilitato"
 msgstr[1] "Prototipi Trigger abilitati"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr "Prototipo Trigger aggiornato"
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Prototipi trigger"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr "Prototipo Trigger cancellato"
 
@@ -13861,23 +14262,31 @@ msgstr "Prototipo Trigger cancellato"
 msgid "Trigger prototypes of"
 msgstr "Prototipi trigger di"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr "Prototipi Trigger aggiornati"
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Severity trigger"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Severity trigger"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Trigger aggiornato"
 
@@ -13885,40 +14294,41 @@ msgstr "Trigger aggiornato"
 msgid "Trigger value"
 msgstr "Valore trigger"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Trigger"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr "Trigger (e/d)[p/o]"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Trigger rimossi"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Info trigger"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Aggiornamento massivo dei trigger"
 
@@ -13926,78 +14336,78 @@ msgstr "Aggiornamento massivo dei trigger"
 msgid "Triggers overview"
 msgstr "Panoramica Trigger"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Stato trigger"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Top 100 trigger"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Trigger con severity"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Troncato"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Prova a leggere proprietà inaccessibile \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Mar"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Turco (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Due elementi devono esser selezionati"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Due item (\"%1$s\" e \"%2$s\") non possono popolare un campo dell'inventario host \"%3$s\", questo porterebbe ad un conflitto."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Tipo"
 
@@ -14005,62 +14415,64 @@ msgstr "Tipo"
 msgid "Type (Full details)"
 msgstr "Tipo (dettagli completi)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Tipo (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Tipo (crescente)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Tipo (discendente)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Tipo di calcolo"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Tipo di informazione"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "Il tipo di informazione deve essere \"Log\" per la chiave log."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "Il tipo di informazione deve essere \"Numerico (float)\" per aggregare gli item.Il tipo di informazione deve essere \"Numerico (float)\" per aggregare gli item."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Tipi"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "SCONOSCIUTI"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "SU"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (dopo il login)"
 
@@ -14076,20 +14488,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr ""
+
+#: include/html.inc.php:112
 msgid "URL parameter cannot be array."
 msgstr "Il parametro URL non può essere un array."
 
-#: include/html.inc.php:112
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr "Il nome del parametro URL è vuoto."
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 caratteri)"
 
@@ -14097,15 +14519,11 @@ msgstr "USA (160 caratteri)"
 msgid "USER PROFILE"
 msgstr "PROFILO UTENTE"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ucraino (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Impossibile selezionare configurazione."
 
@@ -14113,7 +14531,7 @@ msgstr "Impossibile selezionare configurazione."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "Impossibile caricare il file in quanto \"file_uploads\" è disabilitato."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Senza acknowledge"
 
@@ -14126,20 +14544,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Eventi PROBLEMA senza acknowledge"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Solo senza acknowledge"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
-msgstr ""
+msgstr "Non disponibile per utenti con %1$s."
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Sblocca selezionati"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Sbloccare utenti selezionati?"
 
@@ -14148,29 +14566,29 @@ msgstr "Sbloccare utenti selezionati?"
 msgid "Units"
 msgstr "Unità"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14180,23 +14598,20 @@ msgstr "Sconosciuti"
 msgid "Unknown action"
 msgstr "Azione sconosciuta"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Algoritmo di calcolo dello stato del servizio sconosciuto"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
-msgstr ""
+msgstr "Errore sconosciuto"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Funzione sconosciuta."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item host sconosciuto, nessun item di questo tipo nell'host selezionato"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Host sconosciuto, nessun host di questo tipo presente nel sistema"
 
@@ -14208,23 +14623,23 @@ msgstr "Tipo di interfaccia sconosciuto."
 msgid "Unknown resource"
 msgstr "Risorsa sconosciuta"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
-msgstr ""
+msgstr "Passo sconosciuto fallito: %1$s"
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Tipo valore sconosciuto"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Scollega"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Scollega e pulisci"
 
@@ -14232,61 +14647,61 @@ msgstr "Scollega e pulisci"
 msgid "Unlink from template"
 msgstr "Scollega dal template"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Scollega dai template"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Applicazione \"%1$s\" su \"%2$s\""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Scollegata: Regola di discovery \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Grafico \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Prototipo di grafico \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Prototipo host \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Item \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Prototipo di item \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Trigger \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Prototipo di trigger \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Scollegato: Scenario web \"%1$s\" su \"%2$s\"."
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Disattiva muto"
 
@@ -14300,32 +14715,43 @@ msgstr "Importazione dell'estensione file \"%1$s\" non supportata."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Importazione formato \"%1$s\" non supportata."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr "Parametro \"%1$s\" non supportato per il prototipo gruppo."
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Parametro \"%2$s\" non supportato per il prototipo host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr "Parametro \"%2$s\" non supportato per l'inventario host del prototipo host %1$s."
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Su"
@@ -14336,34 +14762,34 @@ msgid "Up"
 msgstr "Su"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Aggiorna"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Aggiorna esistenti"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Intervallo di aggiornamento"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Intervallo di aggiornamento (in sec)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Aggiornato"
 
@@ -14371,55 +14797,55 @@ msgstr "Aggiornato"
 msgid "Updated status of host"
 msgstr "Stato host aggiornato"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Aggiornato: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Aggiornato: Applicazione \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Aggiornata: Regola di discovery \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Aggiornato: Prototipo host \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Aggiornato: Item \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Aggiornato: Prototipo di item \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Aggiornato: Trigger \"%1$s\" su \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Aggiornato: Prototipo di trigger \"%1$s\" su \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Aggiornato: Scenario Web \"%1$s\" su \"%2$s\"."
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Carica"
 
@@ -14427,14 +14853,14 @@ msgstr "Carica"
 msgid "Upper level maps"
 msgstr "Mappe al livello superiore"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Tempo di attività"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr "Uptime del processo Zabbix server in secondi."
 
@@ -14442,10 +14868,10 @@ msgstr "Uptime del processo Zabbix server in secondi."
 msgid "Uptime/Downtime"
 msgstr "Tempo di attività/inattività"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14460,84 +14886,88 @@ msgid "Used in actions"
 msgstr "Utilizzato nelle azioni"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Utente"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "L'utente \"%s\" non può esser senza gruppo utenti."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Utente aggiunto"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "L'utente non può cambiare tipo per se stesso"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "L'utente non può aggiungere se stesso ad un gruppo disabilitato o ad un gruppo con accesso alla GUI disabilitato.L'utente non può aggiungere se stesso ad un gruppo disabilitato o ad un gruppo con accesso alla GUI disabilitato."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "L'utente non può cambiare l'accesso alla GUI per se stesso."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "L'utente non può cambiare il proprio stato"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "L'utente non può cambiare il proprio stato."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Utente rimosso"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Gruppo utenti"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr "Gruppo utente \"%1$s\" è l'unico gruppo che contiene l'utente \"%2$s\"."
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Gruppo utente \"%1$s\" e' configurato per ricevere le segnalazioni di database down."
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Il gruppo utenti \"%1$s\" è utilizzato nello script \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "Il gruppo utenti \"%s\" esiste già."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] "Gruppo utente disabilitato"
 msgstr[1] "Gruppi utente disabilitati"
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] "Gruppo utente abilitato"
@@ -14554,34 +14984,34 @@ msgstr "Gruppo Utente per segnalazione problemi Database \"%1$s\"."
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Gruppi utenti"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "L'utente non ha i permessi per cancellare se stesso."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "L'utente non può modificare il proprio accesso alla GUI diventando un membro del gruppo utenti \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "L'utente non può modificare lo stato del sistema per se stesso diventando un membro del gruppo \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Nome utente"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "Il nome utente non corrisponde con il DB"
 
@@ -14607,243 +15037,243 @@ msgstr "Periodo storicizzazione sessioni utente (in giorni) \"%1$s\"."
 msgid "User sessions"
 msgstr "Sessioni utente"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Tipo utente"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Utente aggiornato"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "L'utente con alias \"%s\" esiste già."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Nome utente"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Utenti"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Utenti (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Utenti sbloccati"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr "Statistiche della cache VMware. Modi validi: total, free, pfree, used and pused."
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr "VMware cluster stato, <url> - URL servizio VMware, <name> - nome VMware cluster"
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr "VMware event log, <url> - URL servizio VMware"
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor BIOS uuid, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor dimensione della memoria balloone, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor nome del cluster, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr "VMware datastore hypervisor statistiche read, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor, <datastore> - nome datastore, <mode> - latency"
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr "VMware datastore hypervisor statistiche write, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor, <datastore> - nome datastore, <mode> - latency"
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor modello, <url> - URL servizio VMware, <uuid> -  nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor nome, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr "VMware hypervisor statistiche input scheda di rete, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor, <mode> - bps"
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr "VMware hypervisor statistiche di output di rete, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor, <mode> - bps"
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware frequenza del processore hypervisor, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor modello processore, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware utilizzo del processore hypervisor in Hz, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor "
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor stato, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor dimensione totale della memoria, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor uptime, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor dimensione memoria utilizzata, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware hypervisor nome del fornitore, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware versione hypervisor, <url> - URL servizio VMware, <uuid> - nome host VMware hypervisor"
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr "Servizio VMware nome completo, <url> - URL VMware servizio"
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr "Versione del servizio VMware, <url> - URL VMware servizio"
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware dimensione della memoria balloone, <url> - URL servizio VMware, <uuid> - nome host macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware spazio di archiviazione erogato, <url> - URL servizio VMware, <uuid> - nome host macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware dimensione della memoria compressa, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr "Macchina virtuale VMware statistiche lettura disco, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware, <instance> - istanza dispositivo disco, <mode> - bps/ops - byte/operazioni al secondo"
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr "Macchina virtuale VMware statistiche scrittura disco, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware, <instance> - istanza dispositivo disco, <mode> - bps/ops - byte/operazioni al secondo"
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr "Macchina virtuale VMware statistiche del file system , <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware, <fsname> - nome del file system, <mode> - total/free/used/pfree/pused"
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware utilizzo memoria guest, <url> - URL servizio VMware, <uuid> - nome host macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware utilizzo della memoria, <url> - URL servizio VMware, <uuid> - nome host macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware Virtual Machine Name hypervisor, <url> - URL servizio VMware, <uuid> - nome host macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware nome della macchina virtuale, <url> - URL servizio VMware, <uuid> - nome host macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr "Macchina virtuale VMware statistiche traffico interfaccia di rete in Input, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware, <instance> - istanza interfaccia di rete, <mode> - bps/pps - bytes/packets per secondo"
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr "Macchina virtuale VMware statistiche traffico interfaccia di rete in Output, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware, <instance> - istanza interfaccia di rete, <mode> - bps/pps - bytes/packets per secondo"
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware stato alimentazione della macchina virtuale , <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware dimensione private memory, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Utilizzo del processore macchina virtuale VMware in Hz, <url> - URL servizio VMware, <uuid> - nome host macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Dimensione shared memory macchina virtuale VMware comune, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Dimensione swapped memory macchina virtuale VMware, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware dimensione totale della memoria, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware spazio di archiviazione uncommitted, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Macchina virtuale VMware spazio di archiviazione non condiviso, <url> - URL servizio VMware, <uuid> - nome host della macchina virtuale VMware"
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware machine virtuale uptime, <url> - URL servizio VMware, <uuid> - nome host macchina virtuale VMware"
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Valore"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Il valore \"%1$s\" non è valido per il parametro \"grid_align\". Le scelte sono: \"%2$s\" e \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr "Il valore \"%1$s\" non è valido per il parametro \"grid_show\". Le scelte sono: \"%2$s\" e \"%3$s\"."
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Il valore \"%1$s\" non è valido per il parametro \"grid_show\". Le scelte sono: \"%2$s\"."
@@ -14861,28 +15291,28 @@ msgstr "Il valore \"%1$s\" è troppo lungo per il campo \"%2$s\" - %3$d caratter
 #: include/validate.inc.php:326 include/validate.inc.php:350
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has incorrect decimal format."
-msgstr ""
+msgstr "Valore \"%2$s\" di \"%1$s\" ha un formato decimale non corretto."
 
 #: include/validate.inc.php:336 include/validate.inc.php:352
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits after the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "Valore \"%2$s\" di \"%1$s\" ha troppe cifre dopo la virgola: non può avere più di %3$s cifre."
 
 #: include/validate.inc.php:332
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits before the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "Valore \"%2$s\" di \"%1$s\" ha troppe cifre prima della virgola: non può avere più di %3$s cifre."
 
 #: include/validate.inc.php:328
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
-msgstr ""
+msgstr "Valore \"%2$s\" of \"%1$s\" è troppo lungo: non può avere più di %3$s cifre prima della virgola e più di %4$s cifre dopo la virgola."
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr "Efficacia della Value Cache. I parametri validi sono: requests, hits and misses."
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr "Statistiche della Value Cahce. Opzioni valide: total, free, pfree, used and pused."
 
@@ -14928,10 +15358,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "La mappa valori con valuemapid \"%1$s\" non esiste."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Mappatura valori"
 
@@ -14940,7 +15370,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "La mappatura valori deve avere almeno una mappatura."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr "Valore di qualsiasi performance counter, dove il parametro \"counter\" è il percorso del counter  \"interval\" è un numero di ultimi secondi, per il quale l'agente restituisce un valore medio."
 
@@ -14952,8 +15382,8 @@ msgstr "Valore: nessun dato"
 msgid "Values"
 msgstr "Valori"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Variabili"
 
@@ -14966,64 +15396,69 @@ msgid "Verbose"
 msgstr "Dettagliato"
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr "Versione di zabbix_agent(d) in esecuzione sull'host monitorato. Valore Stringa. Esempio di valore restituito: 1.1"
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Verticale"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Allineamento verticale"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr "Vietnamita (vi_VN)"
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "La vista non è visualizzata."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr "Statistiche memoria virtuale."
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Nome visibile"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Il nome visibile non può esser vuoto se il nome host è assente."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Bassa"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr "Attenzione"
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Siamo spiacenti, il numero massimo possibile di elementi da conservare è stato raggiunto.Siamo spiacenti, il numero massimo possibile di elementi da conservare è stato raggiunto."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15031,65 +15466,83 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitoraggio web"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr "Lo scenario web \"%1$s\" esiste già sull'host \"%2$s\"."
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Lo scenario Web \"%1$s\" esiste già."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Scenario web rimosso"
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Scenario web disabilitato"
 msgstr[1] "Scenario web disabilitato"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Scenario web abilitato"
 msgstr[1] "Scenari web abilitati"
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr "Parametri mancanti nello scenario web: %1$s"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr "Lo scenario web deve avere almeno un passo."
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr "Il passo \"%1$s\" dello scenario web esiste già."
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr "Web scenario step URL non puo' essere vuoto."
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr "Web scenario nome step non puo' essere vuoto."
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr "Il nome del passo nello scenario web deve contenere solo caratteri stampabili.Il nome del passo nello scenario web deve contenere solo caratteri stampabili."
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr "Il numero del passo nello scenario web non può essere minore di 1."
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Scenari web"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Mer"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Mercoledì"
 
@@ -15097,9 +15550,9 @@ msgstr "Mercoledì"
 msgid "Week"
 msgstr "Settimana"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Per settimane"
 
@@ -15107,12 +15560,12 @@ msgstr "Per settimane"
 msgid "When active"
 msgstr "Quando attivo"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Larghezza"
@@ -15122,28 +15575,28 @@ msgstr "Larghezza"
 msgid "With data collection"
 msgstr "Con collezionamento dati"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Con ultimo evento senza acknowledge"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Con problemi"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Con trigger"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Con eventi senza acknowledge"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Senza problemi"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Senza trigger"
 
@@ -15152,7 +15605,7 @@ msgid "Wizard"
 msgstr "Procedura guidata"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15165,277 +15618,271 @@ msgstr "Orario di lavoro"
 msgid "Working time \"%1$s\"."
 msgstr "Orario di lavoro \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Scrivi"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Campi errati per la dipendenza del servizio \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Campi errati per l'elemento."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Campi errati per l'host \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr "Campi errati per l'immagine \"%1$s\"."
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr "Campi errati per l'immagine."
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr "Campi errati per la cancellazione del collegamento trigger."
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr "Campi errati per l'aggiornamento del collegamento trigger."
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr "Campi errati per il collegamento trigger."
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Campi errati per la macro \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr "Campi errati per il collegamento mappa."
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Campi errati per il tipo di supporto."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr "Campi errati per il proxy \"%1$s\"."
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Campi errati per lo script."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Campi errati per il servizio \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Campi errati per l'orario del servizio \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Campi errati per il trigger."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Campi errati per l'utente \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Macro errata \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Etichetta X"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "Il file XML contiene un errore %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "Il file XML contiene errori"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "Il file XML contiene un errore fatale %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "Il file XML contiene un avvertimento %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "A"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Valore MAX asse Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Il valore MAX dell'asse Y dev'esser più grande del valore MIN dell'asse Y.Il valore MAX dell'asse Y dev'esser più grande del valore MIN dell'asse Y."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Valore MIN asse Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Lato asse Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Etichetta Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Anno"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Per anni"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Si"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Impossibile scegliere alcune delle lingue, in quanto i loro locale non sono installati sul server web.Impossibile scegliere alcune delle lingue, in quanto i loro locale non sono installati sul server web."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Non ti è consentito alterare i privilegi per l'utente \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Non hai effettuato il login."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Non puoi cambiare host per la selezione corrente."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Non hai specificato un host per l'operazione."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Non hai specificato un gruppo host per l'operazione."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Non hai specificato target per il comando dell'operazione azione \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Non hai specificato target per lo script globale dell'operazione azione \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "Non hai i permessi per eseguire questa operazione."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Non hai i permessi per creare utenti."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Non hai i permessi per aggiornare gli utenti."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Non hai i permessi per aggiornare l'utente oppure l'utente non esiste."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr "Non hai i permessi per accedere a questa pagina."
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Devi esser connesso per visualizzare questa pagina."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr "Sei connesso come"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15448,7 +15895,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15467,8 +15914,8 @@ msgid "Zabbix User"
 msgstr "Utente Zabbix"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15494,10 +15941,11 @@ msgstr "Interna Zabbix"
 msgid "Zabbix internal authentication"
 msgstr "Autenticazione interna Zabbix"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Server Zabbix"
@@ -15513,7 +15961,7 @@ msgstr ""
 "1. IP/DNS server errato nel file \"zabbix.conf.php\";\n"
 "2. Configurazione rete errata.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "IP o porta del server Zabbix non impostati!"
 
@@ -15521,15 +15969,15 @@ msgstr "IP o porta del server Zabbix non impostati!"
 msgid "Zabbix server activity check interval"
 msgstr "Intervallo di controllo attività del server Zabbix"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Info server Zabbix"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Il server Zabbix non è in esecuzione: le informazioni visualizzate potrebbero non esser aggiornate.Il server Zabbix non è in esecuzione: le informazioni visualizzate potrebbero non esser aggiornate."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Il server Zabbix è in esecuzione"
 
@@ -15538,11 +15986,11 @@ msgstr "Il server Zabbix è in esecuzione"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Il server Zabbix sta eseguendo un intervallo di controllo \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Nome server Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Porta server Zabbix"
 
@@ -15550,25 +15998,20 @@ msgstr "Porta server Zabbix"
 msgid "Zabbix trapper"
 msgstr "Trapper Zabbix"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zoom"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Valore errato per giorno: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Valore errato per mese: \"%s\" ]"
@@ -15577,19 +16020,19 @@ msgstr "[Valore errato per mese: \"%s\" ]"
 msgid "agent"
 msgstr "agente"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "tutti"
 
@@ -15597,19 +16040,15 @@ msgstr "tutti"
 msgid "all media"
 msgstr "tutti i supporti"
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "esiste già"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "come Blu"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "come Verde"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "come Rosso"
 
@@ -15621,83 +16060,49 @@ msgstr "auto registrazione"
 msgid "auto-registered host"
 msgstr "host auto-registrato"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "avg"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "giorni"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15719,19 +16124,15 @@ msgstr "servizio discoverato"
 msgid "discovery"
 msgstr "discovery"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dinamico"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elementi"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "copia elementi in ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from e esc_step_to devono essere impostati assieme."
 
@@ -15743,47 +16144,49 @@ msgstr "uguale"
 msgid "executed"
 msgstr "eseguito"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "fisso"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "trovati"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "Impostazioni di housekeeping globali"
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "gruppo host"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "icona"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "immagine"
 
@@ -15791,7 +16194,7 @@ msgstr "immagine"
 msgid "in"
 msgstr "in"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "Sintassi non corretta in \"%1$s\""
@@ -15801,7 +16204,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr "interno"
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "è"
 
@@ -15809,20 +16212,20 @@ msgstr "è"
 msgid "item"
 msgstr "item"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr "Key non definita"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "ultimi"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "contiene"
@@ -15831,12 +16234,12 @@ msgstr "contiene"
 msgid "low-level discovery rule"
 msgstr "regola discovery di basso-livello"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15845,46 +16248,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "macro"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "manutenzione"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "mappa"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "minimo 60 secondi"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15893,17 +16296,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "deve essere un utente LDAP valido"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr "nuovo"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
-msgstr ""
+msgstr "nuovo"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "nessun dato"
@@ -15916,12 +16319,14 @@ msgstr "non in"
 msgid "not like"
 msgstr "non contiene"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "non in esecuzione"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "non selezionato"
 
@@ -15930,57 +16335,61 @@ msgstr "non selezionato"
 msgid "not sent"
 msgstr "non inviato"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "ora"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "di"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr "off"
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "il"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "altri"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "aggiornato ogni"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr "aggiornamento ogni %1$s sec."
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15989,25 +16398,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "conserva selezione"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "in esecuzione"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sec"
 
@@ -16020,7 +16428,7 @@ msgstr "secondi"
 msgid "sent"
 msgstr "inviato"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "breve descrizione"
 
@@ -16028,36 +16436,36 @@ msgstr "breve descrizione"
 msgid "show icon mappings"
 msgstr "mostra mappature icone"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "mostra mappature valori"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "L'ID template \"%1$s\" è passato %2$s volte"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "a"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "trigger"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr "digita qui per cercare"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr "fine della key non prevista"
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "sconosciuto"
 
@@ -16069,11 +16477,11 @@ msgstr "valore"
 msgid "via"
 msgstr "via"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyyy"
diff --git a/frontends/php/locale/ja/LC_MESSAGES/frontend.po b/frontends/php/locale/ja/LC_MESSAGES/frontend.po
index 74d454402b7..c1b55281bc8 100644
--- a/frontends/php/locale/ja/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/ja/LC_MESSAGES/frontend.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:57+0300\n"
-"PO-Revision-Date: 2014-04-23 06:32+0300\n"
+"POT-Creation-Date: 2014-08-25 14:59+0300\n"
+"PO-Revision-Date: 2014-08-25 02:59+0300\n"
 "Last-Translator: Atsushi <a.tanaka77@gmail.com>\n"
 "Language-Team: Zabbix\n"
 "Language: ja\n"
@@ -13,30 +13,32 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1398227566.0\n"
+"X-POOTLE-MTIME: 1408928376.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\"は1970.01.01から2038.01.18の間で設定してください。"
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"復旧トリガーの表示期間\"は\"0\"かそれ以上の整数を設定してください。"
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"トリガー変化時の点滅期間\"は\"0\"かそれ以上の整数を設定してください。"
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 日"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -47,22 +49,20 @@ msgstr[0] "%2$d件中%1$d件の障害が表示されています"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (%2$s年)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$sアイテム"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s日"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -73,9 +73,9 @@ msgstr[0] "%1$s分"
 #, c-format
 msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
-msgstr[0] ""
+msgstr[0] "リトライ残り%1$s回"
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -93,23 +93,23 @@ msgid "%d device"
 msgid_plural "%d devices"
 msgstr[0] "%dデバイス"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - 無限)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(特権管理者のみがグループを作成できます)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(日)"
 
@@ -117,34 +117,34 @@ msgstr "(日)"
 msgid "(in sec)"
 msgstr "(秒)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(最小60秒、0 - デフォルト設定を利用)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(プロキシなし)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr "(ワーニングあり)"
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[障害対応コメントの一括処理]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0または1"
 
@@ -160,7 +160,7 @@ msgstr "10秒"
 msgid "30 seconds"
 msgstr "30秒"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D表示"
 
@@ -176,7 +176,7 @@ msgstr "5秒"
 msgid "500 latest values"
 msgstr "最新500個の値"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<サブメニュー/サブメニュー.../>スクリプト"
 
@@ -195,12 +195,11 @@ msgstr "アクションログ"
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "アラーム確認"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "AND"
 
@@ -212,19 +211,19 @@ msgstr "監査ログ"
 msgid "AVAILABILITY REPORT"
 msgstr "稼働レポート"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "最新値と前回値の絶対値の差 < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "最新値と前回値の絶対値の差 = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "最新値と前回値の絶対値の差 > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "最新値と前回値の絶対値の差 NOT N"
 
@@ -236,42 +235,42 @@ msgstr "SLAの許容値"
 msgid "Access denied!"
 msgstr "アクセスは拒否されました！"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "アクセスは拒否されました。"
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "アカウントは%s秒間ブロックされています"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "コメントあり"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "障害対応コメント"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "障害対応コメントを追加しました"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "障害対応コメントユーザー:"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "コメントを入力して戻る"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "障害対応コメントのステータス"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "障害対応済"
 
@@ -296,61 +295,64 @@ msgstr "障害対応コメントは無効に設定されています"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "アクション"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "アクション\"%1$s\"はすでに存在しています。"
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "アクション\"%1$s\"の\"エスカレーションの間隔\"の設定が正しくありません (最小%2$s秒)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "アクション\"%1$s\"に実行内容が設定されていません。"
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "アクションを追加しました"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "アクションを削除しました"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] "アクションを無効にしました"
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] "アクションを有効にしました"
@@ -362,21 +364,21 @@ msgstr[0] "アクションを有効にしました"
 msgid "Action log"
 msgstr "アクションログ"
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "アクションの実行内容"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "アクションを更新しました"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "アクション"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "アクティブ"
@@ -386,80 +388,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "有効"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "開始日時"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "終了日時"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "追加"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr "子を追加"
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "コメントを追加"
 
@@ -475,27 +480,23 @@ msgstr "ホストを追加"
 msgid "Add link"
 msgstr "リンクの追加"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "存在しない場合に追加"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "アプリケーションの新規作成または追加"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "ホストグループの新規作成または追加"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "プロトタイプを追加"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "次に追加"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "お気に入りに追加"
@@ -504,7 +505,7 @@ msgstr "お気に入りに追加"
 msgid "Add to host group"
 msgstr "ホストグループに追加"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "ホストグループに追加"
 
@@ -516,7 +517,7 @@ msgstr "追加"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "管理"
 
@@ -524,34 +525,34 @@ msgstr "管理"
 msgid "Advanced labels"
 msgstr "拡張ラベル"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "経過時間"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "表示期間"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "表示期間 %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "エージェント"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr "設定ファイル内に設定されたエージェントのホスト名。文字列値。"
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "エージェントのインターフェース"
@@ -560,12 +561,12 @@ msgstr "エージェントのインターフェース"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "エージェント、SNMP、JMX、IPMIインターフェース"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr "アグリゲートチェックは監視対象のホスト上でエージェントが起動している必要はありません。Zabbixサーバーはデータベースから直接情報を収集します。詳細はZabbixマニュアル参照。"
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "エイリアス"
 
@@ -573,121 +574,124 @@ msgstr "エイリアス"
 msgid "Align icons"
 msgstr "グリッドに揃える"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "すべて"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "すべてのグループ"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "すべてのリンクに\"名前\"と\"URL\"を設定する必要があります"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr "バイト単位でのメモリサイズ、もしくは全体からのパーセント表示。modeが指定されない場合はtotalが利用される。"
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
-msgstr ""
+msgstr "And"
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
-msgstr ""
+msgstr "And/Or"
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "すべて"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "いずれかの文字列が含まれる"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "アプリケーション"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "アプリケーション\"%1$s\"はすでに存在します。"
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "アプリケーションを追加しました"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "アプリケーションを削除しました"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "アプリケーションエラー。"
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "アプリケーションを更新しました"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "\"%2$s\"にID\"%1$s\"を持つアプリケーションは利用できません。"
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "適用"
 
@@ -696,16 +700,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "メンテナンス待ち"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "4月"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "4月"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "この操作を実行しても良いですか？"
 
@@ -721,9 +725,9 @@ msgstr "エリアサイズ"
 msgid "Area type"
 msgstr "エリアタイプ"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -737,50 +741,47 @@ msgstr "プレーンテキスト"
 msgid "Asset tag"
 msgstr "資産タグ"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "%3$s %1$s:%2$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "毎%5$s %3$s %4$s %1$s:%2$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
-msgstr "毎%4$s %3$日 %1$s:%2$s"
+msgstr "毎%4$s %3$s日 %1$s:%2$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] "毎%4$s週 毎%3$s %1$s:%2$s"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] "毎%3$s日 %1$s:%2$s"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "開始時刻 (時:分)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "少なくとも1つ以上のホストまたはホストグループを選択する必要があります。"
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "少なくとも1つ以上のメンテナンス期間を作成する必要があります。"
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr "少なくともMySQL、PostgreSQL、Oracle、SQLite3、IBM DB2のうち1つがサポートされている必要があります。"
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "監査"
@@ -800,26 +801,28 @@ msgstr "監査データ保存期間 (日) \"%1$s\"。"
 msgid "Audit log"
 msgstr "監査ログ"
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "8月"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "8月"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "認証"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "認証アルゴリズム"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -878,9 +881,9 @@ msgstr "自動登録イベントとアラートのデータ保存期間"
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr "自動登録イベントとアラートのデータ保存期間(日) \"%1$s\"。"
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "自動"
 
@@ -888,20 +891,20 @@ msgstr "自動"
 msgid "Automatic icon mapping"
 msgstr "アイコンの自動マッピング"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "アイコンの自動選択"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "エージェントの状態"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "稼働レポート"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "利用可能"
 
@@ -910,36 +913,36 @@ msgstr "利用可能"
 msgid "Average"
 msgstr "軽度の障害"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "次による平均"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "期間Tの値の平均値 < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "期間Tの値の平均値 = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "期間Tの値の平均値 > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "期間Tの値の平均値 NOT N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "軸の位置"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "背景"
@@ -948,7 +951,7 @@ msgstr "背景"
 msgid "Background image"
 msgstr "背景のイメージ"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "バーレポート"
 
@@ -958,8 +961,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Basic認証"
+msgid "Basic"
+msgstr "Basic"
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -971,15 +974,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind password"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "最新(T秒前/T個前)の値とマスクのANDビット演算 = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "最新(T秒前/T個前)の値とマスクのANDビット演算  NOT N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Black & Blue"
 
@@ -991,8 +994,8 @@ msgstr "点滅"
 msgid "Blocked"
 msgstr "ブロックしました"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "太線"
 
@@ -1000,22 +1003,22 @@ msgstr "太線"
 msgid "Boolean"
 msgstr "ブール型"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "下"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "明るく"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "ブルガリア語 (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "障害対応コメントの一括処理"
 
@@ -1041,7 +1044,7 @@ msgstr "アプリケーションの設定"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "認証の設定"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1071,7 +1074,7 @@ msgstr "ホストグループの設定"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "ホストのプロトタイプの設定"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "ホストの設定"
 
@@ -1083,7 +1086,7 @@ msgstr "データの保存期間設定"
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "アイコンのマッピングの設定"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "イメージの設定"
 
@@ -1092,14 +1095,14 @@ msgstr "イメージの設定"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "ITサービスの設定"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "アイテムのプロトタイプの設定"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "アイテムの設定"
 
@@ -1128,7 +1131,7 @@ msgstr "ネットワークマップの設定"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "プロキシの設定"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "正規表現の設定"
 
@@ -1148,7 +1151,7 @@ msgstr "スクリプトの設定"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "スライドショーの設定"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "テンプレートの設定"
 
@@ -1164,7 +1167,7 @@ msgstr "トリガー深刻度の設定"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "トリガーの設定"
 
@@ -1196,22 +1199,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "Zabbixの設定"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr "CPU情報 - デフォルトはすべてのCPUのすべての情報リスト"
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr "CPU load。プロセッサのロードアベレージ。cpuとmodeの設定はオプション。cpuが指定されない場合はallが利用される。modeが指定されない場合はavg1が利用される。この値はパーセンテージではないことに注意。"
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
-msgstr "CPU utilisation。プロセッサのパーセント表示での負荷状況。cpu、type、modeはオプション。cpuが指定されない場合はallが利用される。typeが指定されない場合はuserが利用される。modeが指定されない場合はavg1が利用される。"
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
+msgstr "CPU utilisation。プロセッサの負荷状況をパーセント表示。cpu、type、modeの設定はオプション。cpuが指定されない場合はallが利用される。typeが指定されない場合はusersが利用される。modeが指定されない場合はavg1が利用される。"
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr "指定されたファイルのMD5チェックサム計算。そのファイルのMD5ハッシュ文字列。例： vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 
@@ -1220,21 +1223,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "SLAの計算、SLAの許容値(%)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr "指定されたファイルのチェックサムを計算。チェックサムの計算は標準的なアルゴリズムであるUNIXのユーティリティcksumが利用される。例：vfs.file.cksum[/etc/passwd]"
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
-msgstr "指定されたボリュームのディスク容量を計算。ディスク容量はバイト単位。modeが指定されない場合はtotalが利用される。 例：vfs.fs.size[/tmp,free]。"
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+msgstr "指定されたボリュームのディスク容量を計算。ディスク容量はバイト単位。modeが指定されない場合はtotalが利用される。マウントされたボリュームが指定された場合にはローカルファイルシステムの未使用ディスク容量が返却される。 例：vfs.fs.size[/tmp,free]"
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "計算"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "有効な権限"
 
@@ -1242,92 +1245,95 @@ msgstr "有効な権限"
 msgid "Callback"
 msgstr "コールバック"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "カナダ (136文字)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "イベントの障害対応コメントを入力できません"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "数値型ではないアイテム\"%1$s\"はグラフ\"%2$s\"に追加できません。"
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "数値型ではないアイテム\"%1$s\"はグラフのプロトタイプ\"%2$s\"に追加できません。"
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "数値型ではないアイテム\"%1$s\"は追加できません。"
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "アクションを追加できません"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "アクションの実行条件を追加できません"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "アプリケーションを追加できません"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "ホストからテンプレートへの依存関係は作成できません"
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "トリガー\"%1$s:%2$s\"から存在しないトリガー\"%3$s:%4$s\"への依存関係を追加できません。"
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "ディスカバリのルールを追加できません"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "グラフを追加できません"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr "グラフのプロトタイプを追加できません"
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "グループを追加できません"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr "グループを追加できません。"
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "ホストを追加できません"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "ホストのプロトタイプを追加できません"
 
@@ -1335,24 +1341,24 @@ msgstr "ホストのプロトタイプを追加できません"
 msgid "Cannot add image"
 msgstr "イメージを追加できません"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "イメージを追加できません。"
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "アイテムを追加できません"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "\"%2$s\"のアイテム\"%1$s\"を\"%4$s\"のアプリケーション\"%3$s\"に追加できません"
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr "アイテムのプロトタイプが追加できません"
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "アイテムを追加できません。"
 
@@ -1360,20 +1366,20 @@ msgstr "アイテムを追加できません。"
 msgid "Cannot add macro."
 msgstr "マクロを追加できません"
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "メンテナンスを追加できません"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "メディアタイプを追加できません"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "グラフ\"%1$s\"にグラフの合計値は2つ以上設定できません。"
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "グラフのプロトタイプ\"%1$s\"にグラフの合計値は2つ以上設定できません。"
@@ -1382,24 +1388,24 @@ msgstr "グラフのプロトタイプ\"%1$s\"にグラフの合計値は2つ以
 msgid "Cannot add network map"
 msgstr "ネットワークマップを追加できません"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "新規アプリケーション\"%1$s\"を追加できません。"
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "プロキシを追加できません"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "正規表現を追加できません"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "スクリーンを追加できません"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "スクリプトを追加できません"
 
@@ -1411,27 +1417,27 @@ msgstr "サービスを追加できません"
 msgid "Cannot add slide show"
 msgstr "スライドショーを追加できません"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "テンプレートを追加できません"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "トリガーを追加できません"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr "トリガーのプロトタイプが追加できません"
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "ユーザーを追加できません"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "ユーザーを追加できません。パスワードが一致していません。"
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "ユーザーを追加できません"
 
@@ -1439,7 +1445,7 @@ msgstr "ユーザーを追加できません"
 msgid "Cannot add value map"
 msgstr "値のマッピングを追加できません"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Webシナリオを追加できません"
 
@@ -1459,23 +1465,23 @@ msgstr "認証方式をLDAPに変更できません"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "認証方式をZabbix内部データベースに変更できません"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "ヒストリを削除できません"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "グラフのプロトタイプを複製できません"
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "ホストのプロトタイプを複製できません"
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "アイテムのプロトタイプを複製できません"
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "トリガーのプロトタイプを複製できません"
 
@@ -1483,20 +1489,20 @@ msgstr "トリガーのプロトタイプを複製できません"
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "ZabbixサーバーデーモンのTrapperポートに接続できません。スクリプトを実行するためには適切に設定を行ってください。"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "グラフをコピーできません"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "アイテムをコピーできません"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "条件式に複数のホストが利用されているため、トリガー\"%1$s:%2$s\"をコピーできません。"
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "発見されたホスト\"%1$s\"にホストのプロトタイプは作成できません。"
@@ -1505,19 +1511,19 @@ msgstr "発見されたホスト\"%1$s\"にホストのプロトタイプは作�
 msgid "Cannot create another database connection."
 msgstr "データベースへのコネクションを作成できません。"
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "循環する依存関係は作成できません。"
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "自身に対する依存関係は作成できません。"
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "ディスカバリルールを作成できません"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "ホストグループを作成できません。"
 
@@ -1525,100 +1531,98 @@ msgstr "ホストグループを作成できません。"
 msgid "Cannot create icon map"
 msgstr "アイコンのマッピングを作成できません"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "\"%s\"と同名のアイコンのマッピングは作成できません。"
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "マップ\"%s\"を作成できません。"
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "新規アプリケーションを作成できません。Webシナリオがアプリケーションに割り当てられています。"
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "新しい要素を作成できません"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "スクリーンを作成できません。"
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr "テンプレートを作成できません。"
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Zabbixユーザー\"%1$s\"を削除できません。ユーザーを無効に設定してください。"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "アクションを削除できません"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "アプリケーションを削除できません"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "依存関係を削除できません"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "ディスカバリのルールを削除できません"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "ディスカバリルールを削除できません"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "グラフを削除できません"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "グラフのプロトタイプを削除できません"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr "グラフのプロトタイプを削除できません"
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "グラフを削除できません"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "グラフを削除できません"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "ローレベルディスカバリによって作成されたグラフは削除できません。"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
 msgid "Cannot delete group"
-msgstr "グループを削除できません"
+msgid_plural "Cannot delete groups"
+msgstr[0] "グループを削除できません"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "ホストを削除できません"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "ホストグループを削除できません"
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "ホストのプロトタイプを削除できません"
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "ホストのプロトタイプを削除できません"
 
@@ -1626,78 +1630,78 @@ msgstr "ホストのプロトタイプを削除できません"
 msgid "Cannot delete icon map"
 msgstr "アイコンのマッピングを削除できません"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "イメージを削除できません"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "インベントリを削除できません"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "アイテムを削除できません"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr "アイテムのプロトタイプを削除できません"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr "アイテムのプロトタイプを削除できません"
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "アイテムを削除できません"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "ローレベルディスカバリによって作成されたアイテムは削除できません。"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "メンテナンスを削除できません"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "メディアタイプを削除できません"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "ネットワークマップを削除できません"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "プロキシを削除できません"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "正規表現を削除できません"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "スクリーンを削除できません"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "スクリプトを削除できません"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "スクリプトを削除できません。\"scriptids\"の値が空白です"
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "スクリプトを削除できません。スクリプト\"%1$s\"は実行するアクション\"%2$s\"に利用されています。"
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "スクリプトを削除できません。スクリプトID\"%1$s\"は存在しません。"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "選択したアクションを削除できません。"
 
@@ -1705,77 +1709,80 @@ msgstr "選択したアクションを削除できません。"
 msgid "Cannot delete service"
 msgstr "サービスを削除できません"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "スライドショーを削除できません"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "テンプレートを削除できません"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "テンプレートのアプリケーションを削除できません。"
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "テンプレートのグラフを削除できません。"
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "テンプレートのホストのプロトタイプを削除できません"
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "テンプレートのアイテムを削除できません"
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "テンプレートのアイテムを削除できません"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "テンプレートのアイテムを削除できません"
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "テンプレートのトリガー\"%1$s:%2$s\"を削除できません"
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "テンプレートのWebシナリオ\"%1$s\"を削除できません。"
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "トリガーを削除できません"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "トリガープロトタイプを削除できません"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr "トリガーのプロトタイプを削除できません"
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "トリガーを削除できません"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "トリガーを削除できません"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "ローレベルディスカバリによって作成されたトリガーは削除できません。"
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "ユーザーを削除できません"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "ユーザーのメディアを削除できません"
 
@@ -1783,66 +1790,66 @@ msgstr "ユーザーのメディアを削除できません"
 msgid "Cannot delete value map"
 msgstr "値のマッピングを削除できません"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Webシナリオを削除できません"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] "アクションを無効にできません"
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] "ディスカバリルールを無効にできません"
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] "ディスカバリルールを無効にできません"
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "ホストを無効にできません"
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] "ホストのプロトタイプを無効にできません"
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "アイテムを無効にできません"
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] "アイテムのプロトタイプを無効にできません"
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "メディアタイプを無効にできません"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "トリガーを無効にできません"
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] "トリガーのプロトタイプを無効にできません"
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] "ユーザーグループを無効にできません"
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Webシナリオを無効にできません"
@@ -1855,122 +1862,116 @@ msgstr "アイテムのキューを表示できません。"
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "グラフの合計値は2つ以上表示できません。"
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] "アクションを有効にできません"
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] "ディスカバリルールを有効にできません"
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] "ディスカバリルールを有効にできません"
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "ホストを有効にできません"
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] "ホストのプロトタイプを有効にできません"
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "アイテムを有効にできません"
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] "アイテムのプロトタイプを有効にできません"
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "メディアタイプを有効にできません"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "トリガーを有効にできません"
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] "トリガーのプロトタイプを有効にできません"
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] "ユーザーグループを有効にできません"
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Webシナリオを有効にできません"
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "マップ\"%2$s\"で利用されている背景画像\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "スクリーン\"%2$s\"で利用されているグラフ\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "マップ\"%2$s\"で利用されているグループ\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "スクリーン\"%2$s\"で利用されているグループ\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "マップ\"%2$s\"で利用されているホスト\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "スクリーン\"%2$s\"で利用されているホスト\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\"上のディスカバリルール\"%3$s\"のホストのプロトタイプ\"%2$s\"のためのホストグループ\"%1$s\"が見つかりません。"
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "アイテムのキー\"%2$s\"のインターフェースは\"%1$s\"に存在しません"
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "グラフ\"%2$s\"で利用されているホストまたはテンプレート\"%1$s\"が見つかりません。"
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -1981,34 +1982,53 @@ msgstr "マップ\"%2$s\"で利用されているアイコン\"%1$s\"が見つ�
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "マップ\"%2$s\"で利用されているアイコンのマッピング\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph \"%3$s\"."
 msgstr "グラフ\"%3$s\"のY軸の最大値として利用されている\"%2$s\"上のアイテム\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CConfigurationImport.php:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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 "\"%5$s\"上のディスカバリルール\"%4$s\"のグラフのプロトタイプ\"%3$s\"でY軸の最大値として利用されている\"%2$s\"上のアイテム\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CConfigurationImport.php:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph \"%3$s\"."
 msgstr "グラフ\"%3$s\"のY軸の最小値として利用されている\"%2$s\"上のアイテム\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CConfigurationImport.php:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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 "\"%5$s\"上のディスカバリルール\"%4$s\"のグラフのプロトタイプ\"%3$s\"でY軸の最小値として利用されている\"%2$s\"上のアイテム\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr "グラフ\"%3$s\"内で利用されている\"%2$s\"上のアイテム\"%1$s\"が見つかりません。"
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr "トリガー\"%3$s\"内で利用されている\"%2$s\"上のアイテム\"%1$s\"が見つかりません。"
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "スクリーン\"%2$s\"で利用されているアイテム\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "エクスポートされたマップ\"%2$s\"で利用されているマップ\"%1$s\"が見つかりません。"
@@ -2018,41 +2038,41 @@ msgstr "エクスポートされたマップ\"%2$s\"で利用されているマ�
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "マップ\"%2$s\"で利用されているマップ\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "スクリーン\"%2$s\"で利用されているマップ\"%1$s\"が見つかりません。"
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "そのような名前を持ったオブジェクトは存在しません"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "スクリーン\"%2$s\"で利用されているスクリーン\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\"上のディスカバリルール\"%3$s\"のホストのプロトタイプ\"%2$s\"のためのテンプレート\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "マップ\"%2$s\"で利用されているトリガー\"%1$s\"が見つかりません。"
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr "\"%3$s\"上のアイテム\"%2$s\"で利用されている値のマッピング\"%1$s\"がみつかりません。"
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\"上のディスカバリルール\"%3$s\"のアイテムのプロトタイプ\"%2$s\"で利用されている値のマッピング\"%1$s\"がみつかりません。"
@@ -2065,12 +2085,14 @@ msgstr "ツリーをフォーマットできません。サービスのリンク
 msgid "Cannot format tree."
 msgstr "ツリーをフォーマットできません。"
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr "テンプレート表示名に空白は設定できません。"
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "条件式\"%s\"を展開できません"
@@ -2081,58 +2103,59 @@ msgid "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
 msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] "スクリーン\"%1$s\"をインポートできません：サブスクリーン\"%2$s\"がありません。"
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "テンプレート\"%1$s\"をインポートできません。リンクされているテンプレート\"%2$s\"が存在しません。"
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "ビューファイル\"%s\"を読み込めません。"
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr "トリガー条件式を追加できません"
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "ユーザーメディアを追加できません"
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "テンプレートをリンクできません"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr "テンプレートをリンクできません。"
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr "ログインできません。"
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "ログアウトできません。"
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "ホスト名を一括更新できません"
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr "テンプレート名を一括更新できません。"
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "ホストの表示名は一括更新できません。"
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr "テンプレートの表示名を一括更新できません。"
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "テンプレートIDの重複のためリンク%sを作成できません。"
@@ -2152,7 +2175,7 @@ msgstr "値がないため\"%1$s\"テーブルにupdate文を実行できませ�
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "where句がないため\"%1$s\"テーブルにupdate文を実行できません。"
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "異なるホストまたはテンプレートのアプリケーションを処理できません。"
 
@@ -2161,11 +2184,11 @@ msgstr "異なるホストまたはテンプレートのアプリケーション
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "レスポンスを読めません。Zabbixサーバー\"%1$s\"との接続を確認してください。"
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "すべてのアイテムを削除できません。少なくとの1つ以上のアイテムが残っています。"
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr "グループを削除できません。"
 
@@ -2173,11 +2196,11 @@ msgstr "グループを削除できません。"
 msgid "Cannot remove macro."
 msgstr "マクロを削除できません"
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "ゲストユーザーの名前は変更できません"
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "ディスカバリルールにはチェックの設定が必須です"
 
@@ -2186,217 +2209,226 @@ msgstr "ディスカバリルールにはチェックの設定が必須です"
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "コマンドを送信できません。Zabbixサーバー\"%1$s\"との接続を確認してください。"
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "アイテム\"%2$s\"に\"%1$s\"を設定できません。"
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "トリガー\"%2$s\"に\"%1$s\"を設定できません。"
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "アプリケーション\"%1$s\"に\"templateid\"を設定できません。"
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "スクリーン\"%1$s\"に\"templateid\"を設定できません。"
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "トリガーのプロトタイプ\"%1$s\"に\"templateid\"を設定できません。"
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "無効の状態のインベントリのフィールドは設定できません。"
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "インターフェースのためのホストを切り替えできません。"
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "ユーザーのブロックを解除できません"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Webシナリオのリンク削除と削除が行えません。"
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "アプリケーションのリンク削除と削除が行えません。"
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "ディスカバリルールのリンク削除と削除が行えません"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "グラフのプロトタイプのリンク削除と削除が行えません"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "グラフのリンク削除と削除が行えません"
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "アイテムのプロトタイプのリンク削除と削除が行えません"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "アイテムのリンク削除と削除が行えません"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "トリガーのリンク削除と削除が行えません"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "テンプレートのリンクを削除できません"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr "テンプレートのリンクを削除できません。"
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "トリガー\"%s\"のリンクを削除できません。ホストにリンクされたテンプレートのアイテムを利用しています。"
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "発見されたホストの\"%1$s\"を更新できません"
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "発見されたアイテムの\"%1$s\"を更新できません"
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "発見されたトリガーの\"%1$s\"を更新できません"
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr "アクション\"%2$s\"の\"%1$s\"を更新できません。"
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "アイテム\"%2$s\"の\"%1$s\"を更新できません。"
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "トリガー\"%2$s\"の\"%1$s\"を更新できません。"
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr "イメージ\"%1$s\"の\"imagetype\"を更新できません。"
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "アプリケーション\"%1$s\"の\"templateid\"を更新できません。"
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "グラフ\"%1$s\"の\"templateid\"を更新できません。"
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "グラフのプロトタイプ\"%1$s\"の\"templateid\"を更新できません。"
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "スクリーン\"%1$s\"の\"templateid\"を更新できません。"
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr "テンプレートスクリーン\"%1$s\"の\"templateid\"を更新できません。"
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "トリガーのプロトタイプ\"%1$s\"の\"templateid\"を更新できません。"
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "発見されたグラフを更新できません"
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "発見されたホストグループを更新できません"
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "アクションを更新できません"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "アプリケーションを更新できません"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "コメントを更新できません"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "設定を更新できません"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "デバッグモードを更新できません"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr "説明を更新できません"
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "ディスカバリのルールを更新できません"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Webインターフェースのアクセスを更新できません"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "グラフを更新できません"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr "グラフのプロトタイプを更新できません"
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "グループを更新できません"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "グループを更新できません"
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "発見されたホスト\"%1$s\"のグループを更新できません"
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "ホストを更新できません"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "ホストのプロトタイプを更新できません"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "ホストを更新できません"
 
@@ -2408,24 +2440,24 @@ msgstr "アイコンのマッピングを更新できません"
 msgid "Cannot update image"
 msgstr "イメージを更新できません"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "イメージを更新できません。"
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "発見されたホスト\"%1$s\"のインターフェースを更新できません"
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "アイテムを更新できません"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr "アイテムのプロトタイプを更新できません"
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "アイテムを更新できません"
 
@@ -2437,16 +2469,16 @@ msgstr "マクロを更新できません"
 msgid "Cannot update macros"
 msgstr "マクロを更新できません"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "メンテナンスを更新できません"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "マップ\"%s\"を更新できません。"
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "メディアタイプを更新できません"
 
@@ -2454,28 +2486,24 @@ msgstr "メディアタイプを更新できません"
 msgid "Cannot update network map"
 msgstr "ネットワークマップを更新できません"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "プロキシを更新できません"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "発見されたホスト\"%1$s\"のプロキシを更新できません"
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "正規表現を更新できません"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "スクリーンを更新できません"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "スクリーンを更新できません。"
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "スクリプトを更新できません"
 
@@ -2487,40 +2515,41 @@ msgstr "サービスを更新できません"
 msgid "Cannot update slide show"
 msgstr "スライドショーを更新できません"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "テンプレートを更新できません"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "テンプレートのアプリケーションを更新できません。"
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "発見されたホスト\"%1$s\"のテンプレートを更新できません"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "トリガーを更新できません"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr "トリガーのプロトタイプが更新できません"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr "トリガーのプロトタイプが更新できません"
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "ユーザーを更新できません"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "ユーザーのメディアを更新できません"
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "ユーザーを更新できません。パスワードが一致していません。"
 
@@ -2528,15 +2557,15 @@ msgstr "ユーザーを更新できません。パスワードが一致してい
 msgid "Cannot update value map"
 msgstr "値のマッピングを更新できません"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Webシナリオを更新できません"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "ディスカバリチェックが検証できません：リクエストが正しくないかZabbixサーバーに接続できません。"
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "説明"
 
@@ -2545,47 +2574,47 @@ msgstr "説明"
 msgid "Case sensitive"
 msgstr "大文字小文字を区別"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr "regexに一致する該当アドレスからのすべてのSNMPトラップをキャッチする。regexのデフォルトは空文字列。"
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr "インターフェースの該当アドレスからのsnmptrap[]アイテムでキャッチされていないすべてのSNMPトラップをキャッチする。"
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "中央"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "変更"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "変更"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "パスワード変更"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "文字列"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "文字列が含まれる"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "文字列が含まれない"
 
@@ -2594,48 +2623,48 @@ msgid "Chassis"
 msgstr "シャーシ"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr "シヤーシ情報 - デフォルトではfull情報を返却"
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "すでに存在します。"
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "条件式の%1$s\"から始まる部分を確認してください。"
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr "ファイルの存在チェック。0 - ファイルが存在しない、1 - ファイルが存在する"
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr "サービスが動作中かチェック。0 - サービス停止中、1 - サービス動作中。<ip>が指定されない場合はホストの定義からIPかDNS名を取得する。<port>が指定されない場合はサービスのデフォルトポート番号が利用される。"
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
-msgstr "サービスが動作中かチェック。0 - サービス停止中、1 - サービス動作中。<ip>が指定されない場合は127.0.0.1が利用される。<port>が指定されない場合はサービスのデフォルトポート番号が利用される。例： net.tcp.service[ftp,,45]。"
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+msgstr "サービスが動作中かチェック。0 - サービス停止中、1 - サービス動作中。IPが指定されない場合は127.0.0.1が利用される。ポート番号が指定されない場合はサービスのデフォルトポート番号が利用される。 例: net.tcp.service[ftp,,45]"
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
-msgstr "\"service\"サービスのパフォーマンスチェック。0 - サービス停止中、秒数 - そのサービスへの接続にかかった秒数。ipが指定されない場合は127.0.0.1が利用される。port番号が指定されない場合はサービスのデフォルトポート番号が利用される。"
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
+msgstr "サービスのパフォーマンスチェック。0 - サービス停止中、秒数 - そのサービスへの接続にかかった秒数。IPが指定されない場合は127.0.0.1が利用される。ポート番号が指定されない場合はサービスのデフォルトポート番号が利用される。"
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr "サービスのパフォーマンスチェック。0 - サービス停止中、秒数 - そのサービスへの接続にかかった秒数。<ip>が指定されない場合はホスト設定のIPかDNS名が利用される。<port>が指定されない場合は、サービスのデフォルトポート番号が利用される。"
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr "エージェントの可用性チェック。エージェントが使用可能ならば1を返却。nodata()を使用してホストが使用可能かどうかをチェックする。"
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "キーを確認してください。デフォルトの例は利用できました。"
 
@@ -2644,44 +2673,44 @@ msgid "Check type"
 msgstr "チェックのタイプ"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
-msgstr "そのポート番号に対してTCPコネクションを作成できるかチェック。0 - 接続不可、1 - 接続可。IPアドレスの指定はオプション。もしipが指定されない場合は127.0.0.1が利用される。例： net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+msgstr "そのポート番号に対してTCPコネクションを作成できるかチェック。0 - 接続不可、1 - 接続可。IPアドレスの指定はオプション。もしIPが指定されない場合は127.0.0.1が利用される。 例： net.tcp.port[,80]"
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "チェック"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr "DNSサービスが起動しているかチェック。0 - DNSが停止(サーバーの応答がないか、DNSの名前解決に失敗)、1 - DNSが稼働中。"
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr "サーバーがICMP pingでアクセス可能かチェック。0 - ICMP pingに失敗。1 - ICMP pingに成功。"
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr "このポート番号がLISTEN状態にあるかチェック。0 - 違う、1 - LISTEN状態にある。"
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "チェックは重複できません"
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "中国語 (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "中国語 (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "マップのアイコン\"%s\"に循環するリンクは作成できません"
@@ -2696,34 +2725,35 @@ msgstr "マップ%1$sに循環参照が存在します。"
 msgid "Circular reference in screens: %1$s."
 msgstr "スクリーン%1$sに循環参照が存在します。"
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "テンプレート%1$sに循環参照が存在します。"
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "テンプレートの循環リンクは行えません。"
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "クラシック"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "クリア"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "ヒストリとトレンドを削除"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "選択したヒストリを削除"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "リンク削除時にクリア"
 
@@ -2733,69 +2763,69 @@ msgstr "時刻"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "複製"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "閉じる"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "条件式ビルダーを閉じる"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "色"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "色\"%1$s\"の設定が正しくありません: 16進数のカラーコードを指定してください(6文字)。"
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "色 (正常)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr "列を追加しました"
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr "列を削除しました"
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "列の結合"
 
@@ -2810,7 +2840,7 @@ msgstr "最終結果"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "コマンド"
 
@@ -2818,41 +2848,31 @@ msgstr "コマンド"
 msgid "Command actions"
 msgstr "コマンドアクション"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "コマンドを設定してください。"
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "コマンド"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "コメントを更新しました"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "コメント"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "\"%s\"のコメント。"
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "商用サービス"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "複数の期間による値の比較"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "権限の編集"
 
@@ -2860,29 +2880,39 @@ msgstr "権限の編集"
 msgid "Condition"
 msgstr "アクションの実行条件"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr "アクション\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で利用されていません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で利用されていません。"
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr "アクション\"%1$s\"の式\"%3$s\"内で利用されている条件\"%2$s\"は設定されていません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"の式\"%3$s\"内で利用されている条件\"%2$s\"は設定されていません。"
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "アクションの実行条件"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "設定"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr "設定したキャッシュの統計。cache - buffer (mode: pfree, total, used, free)。"
 
@@ -3045,23 +3075,23 @@ msgstr "設定を更新しました"
 msgid "Configure (Filter %s)"
 msgstr "設定 (フィルター %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "確認テキスト"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "接続方法"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "ユーザー'%1$s'でログイン"
@@ -3120,7 +3150,7 @@ msgid "Context name"
 msgstr "コンテキスト名"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr "コンテキストスイッチの回数。"
 
@@ -3128,30 +3158,36 @@ msgstr "コンテキストスイッチの回数。"
 msgid "Contract number"
 msgstr "契約番号"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "座標"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "コピー"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] "項目%1$sをコピー ..."
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "選択をコピー..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "ユーザー\"%s\"のログイン"
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "イメージを保存できませんでした!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "カウント"
 
@@ -3171,6 +3207,10 @@ msgstr "アプリケーションの作成"
 msgid "Create application (select host first)"
 msgstr "アプリケーションの作成 (先にホストを選択)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr "背景の作成"
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3188,7 +3228,7 @@ msgstr "グラフの作成 (先にホストを選択)"
 msgid "Create graph prototype"
 msgstr "グラフのプロトタイプの作成"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "ホストの作成"
 
@@ -3201,15 +3241,15 @@ msgstr "ホストグループの作成"
 msgid "Create host prototype"
 msgstr "ホストのプロトタイプの作成"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr "アイコンの作成"
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "アイコンのマッピングの作成"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "イメージの作成"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "アイテムの作成"
 
@@ -3233,6 +3273,10 @@ msgstr "マップの作成"
 msgid "Create media type"
 msgstr "メディアタイプの作成"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr "新規作成"
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "プロキシの作成"
@@ -3257,11 +3301,11 @@ msgstr "スクリプトの作成"
 msgid "Create slide show"
 msgstr "スライドショーの作成"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "テンプレートの作成"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "トリガーの作成"
 
@@ -3285,42 +3329,42 @@ msgstr "ユーザーグループの作成"
 msgid "Create value map"
 msgstr "値のマッピングの作成"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "作成: \"%2$s\"のアプリケーション\"%1$s\"。"
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "作成: \"%2$s\"のディスカバリルール\"%1$s\"。"
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "作成: \"%2$s\"のホストのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "作成: \"%2$s\"のアイテム\"%1$s\"。"
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "作成: \"%2$s\"のアイテムのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "作成: \"%2$s\"のトリガー\"%1$s\"。"
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "作成: \"%2$s\"のトリガーのプロトタイプ\"%1$s\"。"
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "作成: \"%2$s\"のWebシナリオ\"%1$s\"."
@@ -3330,51 +3374,52 @@ msgid "Critical"
 msgstr "クリティカル"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr "現在のOS - デフォルトはfullの情報を返却"
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "現在の年月日 < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "現在の年月日 = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "現在の年月日 > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "現在の年月日 NOT N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "現在のホスト"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "現在の時刻 < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "現在の時刻 = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "現在の時刻 > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "現在の時刻 NOT N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "現在の値"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr "カスタム条件式"
@@ -3387,7 +3432,7 @@ msgstr "カスタムグラフ"
 msgid "Custom label"
 msgstr "カスタムラベル"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "マップ\"%2$s\"のカスタムラベルのタイプ要素\"%1$s\"を設定してください。"
@@ -3401,7 +3446,7 @@ msgstr "乗数"
 msgid "Custom screens"
 msgstr "カスタムスクリーン"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "カスタムスクリプト"
 
@@ -3421,18 +3466,14 @@ msgstr "カスタムサイズ"
 msgid "Custom slides"
 msgstr "カスタムスライド"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "チェコ語 (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, Y/m/d H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "ダッシュボードの設定"
@@ -3448,28 +3489,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "シナリオの名前"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "無効"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DISCOVERED"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3477,25 +3518,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS名"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "DOWN"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "毎日"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Dark orange"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "暗く"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
@@ -3507,20 +3548,21 @@ msgstr "ダッシュボードの設定"
 msgid "Dashboard filter"
 msgstr "ダッシュボードフィルター"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "破線"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "データ"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr "データキャッシュの統計。cache - values (mode: all, float, uint, str, log, text)、history (mode: pfree, total, used, free)、trend (mode: pfree, total, used, free)、text (mode: pfree, total, used, free)。"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3543,11 +3585,12 @@ msgstr "データ保存期間 (日)"
 msgid "Data type"
 msgstr "データの形式"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "データベースファイル"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "データベースホスト"
 
@@ -3555,35 +3598,39 @@ msgstr "データベースホスト"
 msgid "Database monitor"
 msgstr "データベースモニタ"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "データベース名"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "データベースパスワード"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "データベースポート"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "データベーススキーマ"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "データベースサーバー"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "データベースタイプ"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "データベースユーザー"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "日付"
 
@@ -3603,53 +3650,52 @@ msgstr "ハードウェアメンテナンス終了日"
 msgid "Date HW purchased"
 msgstr "ハードウェア購入日"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "日"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "日"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "現在の月の日付 < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "現在の月の日付 = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "現在の月の日付 > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "現在の月の日付 NOT N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "曜日"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "現在の曜日 < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "現在の曜日 = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "現在の曜日 > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "現在の曜日 NOT N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "日"
 
@@ -3657,22 +3703,22 @@ msgstr "日"
 msgid "Debug"
 msgstr "デバッグ"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "デバッグモード"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "デバッグモードを更新しました"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "12月"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "12月"
 
@@ -3682,15 +3728,14 @@ msgstr "10進数"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "標準"
 
@@ -3703,11 +3748,11 @@ msgid "Default delay (in seconds)"
 msgstr "デフォルトの更新間隔 (秒)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "デフォルトのメッセージ"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "デフォルトのアクション実行ステップの間隔"
 
@@ -3730,30 +3775,34 @@ msgstr "デフォルトのテーマ\"%1$s\"。"
 msgid "Delay"
 msgstr "間隔"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "間隔 (秒)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "遅延時間"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "削除"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr "XMLファイル内に存在しないすべての要素を削除しますか？"
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "削除とクリア"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "選択したテンプレートとデータを削除しますか？(警告: リンクしているすべてのホストからデータが削除されます！)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "テンプレートとデータを削除しますか？(警告: リンクしているすべてのホストからデータが削除されます！)"
 
@@ -3761,53 +3810,53 @@ msgstr "テンプレートとデータを削除しますか？(警告: リンク
 msgid "Delete application?"
 msgstr "アプリケーションを削除しますか？"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "現在のアクションを削除しますか？"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "ディスカバリルールを削除しますか？"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "条件式を削除しますか？"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr "グラフのプロトタイプを削除しますか？"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "グラフを削除しますか？"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "選択したWebシナリオのヒストリを削除しますか？"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "選択したアイテムのヒストリを削除しますか？"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr "選択したWebシナリオのヒストリを削除しますか？"
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "アイコンのマッピングを削除しますか？"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr "アイテムのプロトタイプを削除しますか？"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "アイテムを削除しますか？"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "キーワードを削除しますか？"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "選択した要素間のリンクを削除しますか？"
 
@@ -3815,11 +3864,15 @@ msgstr "選択した要素間のリンクを削除しますか？"
 msgid "Delete maintenance period?"
 msgstr "メンテナンス期間を削除しますか？"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr "存在しない場合に削除"
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "ネットワークマップを削除しますか？"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "プロキシを削除しますか？"
 
@@ -3827,7 +3880,7 @@ msgstr "プロキシを削除しますか？"
 msgid "Delete regular expression?"
 msgstr "正規表現を削除しますか？"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "シナリオを削除しますか？"
 
@@ -3835,71 +3888,67 @@ msgstr "シナリオを削除しますか？"
 msgid "Delete screen?"
 msgstr "スクリーンを削除しますか？"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "スクリプトを削除しますか？"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "選択を削除"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "選択したWebシナリオを削除しますか？"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "選択したアクションを削除しますか？"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "選択したアプリケーションを削除しますか？"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "選択したディスカバリルールを削除しますか？"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "選択した要素を削除しますか？"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr "選択したグラフのプロトタイプを削除しますか？"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "選択したグラフを削除しますか？"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "選択したグループを削除しますか？"
@@ -3908,27 +3957,27 @@ msgstr "選択したグループを削除しますか？"
 msgid "Delete selected groups?"
 msgstr "選択したグループを削除しますか？"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "選択したホストグループを削除しますか？"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr "選択したホストのプロトタイプを削除しますか？"
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr "選択したホストのプロトタイプを削除しますか？"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "選択したホストを削除しますか？"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "選択したホストを削除しますか？"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "選択したイメージを削除しますか？"
 
@@ -3936,31 +3985,31 @@ msgstr "選択したイメージを削除しますか？"
 msgid "Delete selected item prototypes?"
 msgstr "選択したアイテムのプロトタイプを削除しますか？"
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "選択したアイテムを削除しますか？"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "選択したメンテナンス期間を削除しますか？"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "選択したマップを削除しますか？"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "選択したメディアタイプを削除しますか？"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "選択したメディアタイプを削除しますか？"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "選択したプロキシを削除しますか？"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "選択した正規表現を削除しますか？"
 
@@ -3968,15 +4017,15 @@ msgstr "選択した正規表現を削除しますか？"
 msgid "Delete selected screens?"
 msgstr "選択したスクリーンを削除しますか？"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "選択したスクリプトを削除しますか？"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "選択したスライドショーを削除しますか？"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "選択したテンプレートを削除しますか？"
 
@@ -3988,11 +4037,11 @@ msgstr "選択したトリガーのプロトタイプを削除しますか？"
 msgid "Delete selected triggers?"
 msgstr "選択したトリガーを削除しますか？"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "選択したユーザーを削除しますか？"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "選択したユーザーを削除しますか？"
 
@@ -4006,11 +4055,15 @@ msgid "Delete selected value mapping? It is used for %d item!"
 msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "選択した値のマッピングを削除しますか？この設定はアイテム\"%d\"に利用されています！"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr "選択したWebシナリオを削除しますか？"
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "選択したテンプレートとリンクされた要素を削除"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr "サービス\"%1$s\"を削除しますか？"
@@ -4019,15 +4072,15 @@ msgstr "サービス\"%1$s\"を削除しますか？"
 msgid "Delete slide show?"
 msgstr "スライドショーを削除しますか？"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "テンプレートを削除しますか？"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr "トリガーのプロトタイプを削除しますか？"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "トリガーを削除しますか？"
 
@@ -4035,62 +4088,62 @@ msgstr "トリガーを削除しますか？"
 msgid "Deleted"
 msgstr "削除"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のアプリケーション\"%1$s\"。"
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のディスカバリルール\"%1$s\"。"
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のグラフ\"%1$s\"。"
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "削除: ホスト\"%1$s\"。"
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のホストのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のアイテム\"%1$s\"。"
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のアイテムのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "削除: プロキシ \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "削除: テンプレート\"%1$s\"。"
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のトリガー\"%1$s\"。"
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のトリガーのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "削除: \"%2$s\"のWebシナリオ\"%1$s\"。"
@@ -4099,35 +4152,35 @@ msgstr "削除: \"%2$s\"のWebシナリオ\"%1$s\"。"
 msgid "Delimiter"
 msgstr "区切り文字"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "差分"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "差分/時間"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "拒否"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "依存関係"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "依存先"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "依存先"
 
@@ -4135,30 +4188,41 @@ msgstr "依存先"
 msgid "Deployment status"
 msgstr "配布ステータス"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "説明"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr "\"%s\"の説明。"
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr "説明を更新しました"
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "詳細"
 
@@ -4171,71 +4235,71 @@ msgid "Device"
 msgstr "デバイス"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr "デバイスの割り込み回数。"
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr "デバイスリスト - デフォルトはPCIデバイスのリスト。"
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr "ディスク読み込み統計。"
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "デバイスの固有性を特定する基準"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr "ディスク書き込み統計。"
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "期間Tの間の最大値と最小値の差 < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "期間Tの間の最大値と最小値の差 = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "期間Tの間の最大値と最小値の差 > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "期間Tの間の最大値と最小値の差 NOT N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "最新値と前回値が異なる N = 1、その他の場合 N = 0 (=条件)"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "最新値と前回値が異なる N = 1、その他の場合 N = 0 (#条件)"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "最新値と前回値の差 < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "最新値と前回値の差 = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "最新値と前回値の差 > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "最新値と前回値の差 NOT N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr "特定のプロセスに関する様々な情報"
 
@@ -4259,48 +4323,44 @@ msgstr "選択したグループのデバッグモードを無効にしますか
 msgid "Disable host"
 msgstr "ホストを無効"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "ホストを無効にしますか？"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "選択したホストグループのホストを無効にしますか？"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "選択したプロキシによるホストの監視を無効にしますか？"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "選択を無効"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "選択したWebシナリオを無効にしますか？"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "選択したアクションを無効にしますか？"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "選択したアプリケーションを無効にしますか？"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "選択したディスカバリルールを無効にしますか？"
 
@@ -4308,11 +4368,11 @@ msgstr "選択したディスカバリルールを無効にしますか？"
 msgid "Disable selected groups?"
 msgstr "選択したグループを無効にしますか？"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr "選択したホストのプロトタイプを無効にしますか？"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "選択したホストを無効にしますか？"
 
@@ -4320,42 +4380,47 @@ msgstr "選択したホストを無効にしますか？"
 msgid "Disable selected item prototypes?"
 msgstr "選択したアイテムのプロトタイプを無効にしますか？"
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "選択したアイテムを無効にしますか？"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "選択したメディアタイプを削除しますか？"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr "選択したトリガーのプロトタイプを無効にしますか？"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "選択したトリガーを無効にしますか？"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr "選択したWebシナリオを無効にしますか？"
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "無効"
 
@@ -4368,7 +4433,7 @@ msgstr "致命的な障害"
 msgid "Discovered"
 msgstr "発見"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Discovered by"
 
@@ -4376,17 +4441,17 @@ msgstr "Discovered by"
 msgid "Discovered device"
 msgstr "発見されたホスト"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "ディスカバリ"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "プロキシによるディスカバリ"
 
@@ -4394,17 +4459,17 @@ msgstr "プロキシによるディスカバリ"
 msgid "Discovery check"
 msgstr "ディスカバリチェック"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "ディスカバリチェックエラー"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "ディスカバリチェック"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "ディスカバリリスト"
 
@@ -4413,65 +4478,68 @@ msgid "Discovery object"
 msgstr "ディスカバリオブジェクト"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "ディスカバリルール"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "ディスカバリルール\"%1$s\"は\"%2$s\"にすでに存在します (他のテンプレートからの継承)。"
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "ディスカバリルール\"%1$s\"は\"%2$s\"にすでに存在します。"
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "ディスカバリルール\"%1$s:%2$s\"の生存期間が正しくありません: \"%3$s\"。(ユーザーマクロでは最小: %4$d, 最大: %5$d が許可されています)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr "ディスカバリルール\"%1$s\"はすでに存在します。"
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "ディスカバリルール\"%s\"はすでに存在します。"
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "ディスカバリルール\"%1$s:%2$s\"の生存期間が正しくありません: \"%3$s\"。(ユーザーマクロでは最小: %4$d, 最大: %5$d が許可されています)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "ディスカバリルールを作成しました"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "ディスカバリのルールを削除しました"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] "ディスカバリルールを無効にしました"
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] "ディスカバリツールを有効にしました"
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "ディスカバリのルールを更新しました"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "ディスカバリルール"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "ディスカバリのルールを削除しました"
 
@@ -4483,7 +4551,7 @@ msgstr "ディスカバリのステータス"
 msgid "Display OK triggers for"
 msgstr "復旧トリガーの表示期間"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Displaying"
 
@@ -4492,32 +4560,32 @@ msgstr "Displaying"
 msgid "Displaying %1$s of %2$s found"
 msgstr "%2$sのうち%1$s件を表示しています"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "複数のアイテムによる値の分布"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "複数の期間による値の分布"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "計算しない"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "条件式を置き換えますか？"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Done"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "点線"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Down"
@@ -4527,30 +4595,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Down"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "ダウンタイム"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "ここにドラッグしてインターフェースのタイプをIPMIに変更。"
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "ここにドラッグしてインターフェースのタイプをJMXに変更。"
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "ここにドラッグしてインターフェースのタイプをSNMPに変更。"
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "ここにドラッグしてインターフェースのタイプをエージェントに変更。"
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "グラフの形式"
 
@@ -4568,74 +4636,75 @@ msgstr "ドロップダウンの1つ目の項目 \"%1$s\""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "ドロップダウンの選択を記憶する \"%1$s\""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "トリガー\"%1$s\"の依存関係が重複しています。"
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"のグループのプロトタイプ名\"%2$s\"が重複しています。"
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"のホストグループID\"%2$s\"が重複しています。"
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "ホストが重複しています。同じホスト名\"%s\"を持つホスト設定がすでに存在しています。"
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "ホストが重複しています。同じホストの表示名\"%s\"を持つホストがすでに存在しています。"
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "マップ\"%s\"のマップ名が重複しています"
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr "スクリプト名\"%1$s\"は重複しています"
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "重要度名\"%s\"は重複しています"
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "ユーザー名\"%s\"は重複しています"
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "継続期間"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "期間 (秒)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "オランダ語 (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "ダイナミックアイテム"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "エラー"
 
@@ -4643,13 +4712,13 @@ msgstr "エラー"
 msgid "EVENTS"
 msgstr "イベント"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "各URLの名前は重複できません。同じURL名が利用されていないか確認してください"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4657,9 +4726,9 @@ msgstr "各URLの名前は重複できません。同じURL名が利用されて
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "変更"
 
@@ -4667,7 +4736,7 @@ msgstr "変更"
 msgid "Edit map element"
 msgstr "マップアイコンの変更"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "トリガーの変更"
 
@@ -4675,27 +4744,61 @@ msgstr "トリガーの変更"
 msgid "Element"
 msgstr "項目"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "アイコン名"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "メール"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "空白"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr "Webシナリオ\"%1$s\"のためのSSL証明書ファイルが空白です。"
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr "Webシナリオ\"%1$s\"のためのSSL秘密鍵ファイルが空白です。"
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "アクションの実行条件が空白です。"
 
@@ -4703,76 +4806,98 @@ msgstr "アクションの実行条件が空白です。"
 msgid "Empty color."
 msgstr "色の設定が空白です。"
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr "アクション\"%1$s\"のフィルター条件式IDが空白です。"
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルター条件式IDが空白です。"
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルター条件マクロが空白です。"
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr "ホストのプロトタイプのホストIDが空白です。"
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "ホストが空白です。"
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "入力パラメータが空白です"
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "入力パラメータが空白です。"
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "入力値が空白です"
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "マクロが空白です。"
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr "グループのプロトタイプの名前が空白です。"
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"の名前が空白です。"
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "スクリプト\"%1$s\"の名前が空白です。"
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "スクリプトの名前が空白です。"
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "名前が空白です。"
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "パラメータが空白です"
 
@@ -4781,11 +4906,11 @@ msgstr "パラメータが空白です"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Zabbixサーバー\"%1$s\"から空のデータを受信しました。"
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr "スクリーンのスクリーンIDが空白です。"
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr "プンプレートスクリーンのスクリーンIDが空白です。"
 
@@ -4793,11 +4918,15 @@ msgstr "プンプレートスクリーンのスクリーンIDが空白です。"
 msgid "Empty time period."
 msgstr "期間が空白です。"
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr "WebシナリオIDが空白です。"
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "有効"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "確認を有効"
 
@@ -4817,11 +4946,11 @@ msgstr "イベントの障害対応コメントを有効"
 msgid "Enable host"
 msgstr "ホストを有効"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "ホストを有効にしますか？"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "選択したプロキシによるホストの監視を有効にしますか？"
 
@@ -4834,36 +4963,32 @@ msgstr "選択したプロキシによるホストの監視を有効にします
 msgid "Enable internal housekeeping"
 msgstr "データの削除処理を有効"
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "選択を有効"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "選択したWebシナリオを有効にしますか？"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "選択したアクションを有効にしますか？"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "選択したアプリケーションを有効にしますか？"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "選択したディスカバリルールを有効にしますか？"
 
@@ -4871,11 +4996,11 @@ msgstr "選択したディスカバリルールを有効にしますか？"
 msgid "Enable selected groups?"
 msgstr "選択したグループを有効にしますか？"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr "選択したホストのプロトタイプを有効にしますか？"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "選択したホストを有効にしますか？"
 
@@ -4883,64 +5008,68 @@ msgstr "選択したホストを有効にしますか？"
 msgid "Enable selected item prototypes?"
 msgstr "選択したアイテムのプロトタイプを有効にしますか？"
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "選択したアイテムを有効にしますか？"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "選択したメディアタイプを有効にしますか？"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr "選択したトリガーのプロトタイプを有効にしますか？"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "選択したトリガーを有効にしますか？"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr "選択したWebシナリオを有効にしますか？"
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "有効"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "英語 (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "英語 (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "エラー"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "テーブル\"%1$s\"の検索リクエストに失敗しました。"
@@ -4958,15 +5087,15 @@ msgstr "イベント"
 msgid "Event ID"
 msgstr "イベントID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "最新のログのイベントIDが正規表現と一致 N = 1、その他の場合 N = 0 (=条件)"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "最新のログのイベントIDが正規表現と一致 N = 1、その他の場合 N = 0 (#条件)"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "障害対応済"
 
@@ -4975,7 +5104,7 @@ msgstr "障害対応済"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "イベントの障害対応コメント\"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "イベントの障害対応コメントが無効です"
 
@@ -4983,7 +5112,7 @@ msgstr "イベントの障害対応コメントが無効です"
 msgid "Event details"
 msgstr "イベント詳細"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "イベント生成"
 
@@ -5003,9 +5132,10 @@ msgstr "イベントソースの詳細"
 msgid "Event type"
 msgstr "イベントタイプ"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "イベント"
 
@@ -5013,36 +5143,41 @@ msgstr "イベント"
 msgid "Events and alerts"
 msgstr "イベントとアラート"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "繰返し間隔(日)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "繰返し間隔(週)"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "エクサ"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "含めない"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "実行"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "SQL実行エラー [%2$s]内の[%1$s]。"
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr "WMIクエリを実行して最初に選択したオブジェクトを返却。"
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "次で実行"
 
@@ -5050,13 +5185,13 @@ msgstr "次で実行"
 msgid "Executed"
 msgstr "実行"
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "実行するスクリプト"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "実行の確認"
 
@@ -5068,7 +5203,7 @@ msgstr "マクロの展開"
 msgid "Expand single problem"
 msgstr "障害が1つのときに詳細を展開"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "JSON-rpc version 2.0が必要です, \"%s\" でリクエストされました。"
@@ -5078,12 +5213,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "メンテナンス期間の終了"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "分解円グラフ"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "選択をエクスポート"
 
@@ -5091,22 +5226,22 @@ msgstr "選択をエクスポート"
 msgid "Export to CSV"
 msgstr "CSVエクスポート"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "条件式"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "条件式の構文エラー。"
 
@@ -5114,11 +5249,12 @@ msgstr "条件式の構文エラー。"
 msgid "Expression Variable Elements"
 msgstr "条件式の変数要素"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "条件式は必須のパラメータです"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "条件式ビルダー"
 
@@ -5139,17 +5275,17 @@ msgid "External check"
 msgstr "外部チェック"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "偽"
 
@@ -5158,16 +5294,17 @@ msgstr "偽"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "失敗"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "失敗"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr "テンプレートの更新の失敗。"
 
@@ -5175,40 +5312,40 @@ msgstr "テンプレートの更新の失敗。"
 msgid "Failure Audit"
 msgstr "失敗の監査"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "お気に入りのグラフ"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "お気に入りのマップ"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "お気に入りのスクリーン"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr "お気に入りのシンプルグラフ"
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr "お気に入りのスライドショー"
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "お気に入り"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "2月"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "2月"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "フィールド"
 
@@ -5252,19 +5389,19 @@ msgstr "フィールド\"%1$s\"は文字列ではありません。"
 msgid "Field \"%1$s\" must be missing."
 msgstr "フィールド\"%1$s\"が入力されていません。"
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "フィールド\"druleid\"を指定してください"
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr "フィールド\"host\"は必須です。"
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "フィールド\"name\"を指定してください"
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "ファイルフォーマットがサポートされていません。"
 
@@ -5273,13 +5410,13 @@ msgstr "ファイルフォーマットがサポートされていません。"
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "ファイルサイズが大きすぎます。アップロードファイルサイズの最大値は%1$sバイトです。"
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "表示するために生成したファイルが存在しません。\"%s\"を見つけます。"
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr "ファイルの時刻情報。秒数。modeはオプション。modeが指定されない場合はusedが利用される。"
 
@@ -5287,68 +5424,71 @@ msgstr "ファイルの時刻情報。秒数。modeはオプション。modeが�
 msgid "Filled region"
 msgstr "面"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "フィルター"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr "アプリケーションによるフィルター"
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "ホストグループによるフィルター"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr "ホストインベントリによるフィルター"
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "名前によるフィルター"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr "フィルター"
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "最新値に文字列Vが存在する場合N = 1、その他の場合 N = 0 (=条件)"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "最新値に文字列Vが存在する場合N = 1、その他の場合 N = 0 (#条件)"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr "ファイル内の文字列検索。0 - 指定した正規表現が見つからない、1 - 見つかった"
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr "ファイル内の文字列検索。文字列のマッチング"
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "終了"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "フィンランド語 (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "第1週"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "第1週"
@@ -5357,8 +5497,8 @@ msgstr "第1週"
 msgid "Fit to map"
 msgstr "マップに合わせる"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "固定"
 
@@ -5368,76 +5508,80 @@ msgstr "固定"
 msgid "Flexible intervals"
 msgstr "例外の更新間隔"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr "リダイレクトをたどる"
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "ゲストのパスワードは空白である必要があります"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "式"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "第4週"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "フランス語 (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "金"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "金曜"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "開始"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Webインターフェースへのアクセス"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Webインターフェースへのアクセスを更新しました"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Webインターフェースのアラート表示"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "すべて複製"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "フルスクリーン"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "関数"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr "関数\"%1$s\"は選択されたアイテム\"%2$s\"と一緒に利用できません"
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5447,116 +5591,116 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr "グラフ"
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSMモデム"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "表示設定"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "GUIアクセスを無効にしました"
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "一般設定"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Generated in %s sec"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "ドイツ語 (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
-msgstr "Webページのコンテンツ取得。デフォルトのpathは /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
+msgstr "Webページの取得するコンテンツ。デフォルトのパスは /"
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr "指定したファイルのコンテンツ取得。"
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
-msgstr "Webページ内の正規表現での最初の出現を取得。デフォルトのpathは /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
+msgstr "Webページ内にある正規表現の最初の出現箇所を取得。デフォルトのパスは /"
 
 #: include/page_header.php:194
 msgid "Get support"
 msgstr "サポート"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
-msgstr "Webページ全体の読み込み時間を取得。デフォルトのpathは /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
+msgstr "Webページ全体を取得するタイミングを取得。デフォルトのパスは /"
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "ギガ"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "設定した条件式はマクロではありません"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "グローバル条件式が存在しません。"
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "グローバルスクリプト"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "グローバルスクリプト"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "実行"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "次のページへ移動"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "ダッシュボードへ移動"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5565,66 +5709,73 @@ msgid "Gradient line"
 msgstr "グラデーションライン"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "グラフ"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "グラフ\"%1$s\"は\"%2$s\"にすでに存在します (他のテンプレートからの継承)。"
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "グラフ\"%1$s\"は\"%2$s\"にすでに存在します (アイテムは同一ではありません)。"
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "グラフ\"%1$s\"は\"%2$s\"にすでに存在します。"
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "グラフ\"%1$s\"は継承できません。指定されたアイテムは\"%2$s\"に存在しません (Y軸の最大値用のアイテム)。"
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "グラフ\"%1$s\"は継承できません。指定されたアイテムは\"%2$s\"に存在しません (Y軸の最小値用のアイテム)。"
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "グラフ\"%1$s\"は継承できません。指定されたアイテムは\"%2$s\"に存在しません。"
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "グラフ\"%1$s\"はテンプレート\"%2$s\"に存在しません。"
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "グラフ\"%1$s\"はスキップされました - ユーザの指定。"
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "テンプレートのアイテムを含むグラフ\"%1$s\"には他のホストのアイテムを設定できません。"
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "グラフを追加しました"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "グラフを削除しました"
 
@@ -5636,54 +5787,59 @@ msgstr "グラフの要素"
 msgid "Graph item"
 msgstr "グラフアイテム"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "グラフ名"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "グラフのプロトタイプ"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr "グラフのプロトタイプ\"%1$s\"に複数のディスカバリルールからのアイテムのプロトタイプが含まれています。"
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr "グラフのプロトタイプ\"%1$s\"は少なくとも1つ以上のアイテムのプロトタイプを設定する必要があります。"
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "テンプレートのアイテムを含むグラフのプロトタイプ\"%1$s\"には他のホストのアイテムを設定できません。"
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "グラフのプロトタイプ\"%s\"を削除しました。"
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr "グラフのプロトタイプを追加しました"
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr "グラフのプロトタイプを削除しました"
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr "グラフのプロトタイプが見つかりません。"
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr "グラフのプロトタイプを更新しました"
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "グラフのプロトタイプ"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr "グラフのプロトタイプを削除しました"
 
@@ -5695,49 +5851,51 @@ msgstr "グラフのプロトタイプ:"
 msgid "Graph sum"
 msgstr "グラフの合計値"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "グラフのタイプ"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "グラフを更新しました"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "\"%1$s\"の名前を持つグラフはグラフもしくはグラフのプロトタイプにすでに存在します。"
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "同じ名前で異なるタイプのグラフが存在します。"
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "グラフ"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "グラフをコピーしました"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "グラフを削除しました"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "ギリシャ語 (el_GR)"
 
@@ -5746,54 +5904,56 @@ msgstr "ギリシャ語 (el_GR)"
 msgid "Grid"
 msgstr "グリッド"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "グループ"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "ホストのプロトタイプで利用されているためグループ\"%1$s\"は削除できません。"
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "グループ\"%1$s\"は存在しません。"
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "ホスト\"%2$s\"のグループ\"%1$s\"は存在しません。"
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "グループを追加しました"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr "グループを削除しました"
+msgid_plural "Groups deleted"
+msgstr[0] "グループを削除しました"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5804,40 +5964,42 @@ msgstr "ディスカバリで発見されたホストのグループ"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr "ディスカバリで発見されたホスト\"%1$s\"のグループ。"
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "グループ名"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr "グループのプロトタイプIDを設定してください。"
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr "グループのプロトタイプに発見されたホスト用のグループ\"%1$s\"を利用することはできません。"
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr "グループのプロトタイプ"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "グループを更新しました"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "次によるグルーピング"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "グループ"
 
@@ -5845,22 +6007,13 @@ msgstr "グループ"
 msgid "Groups in maintenance"
 msgstr "メンテナンス対象のホストグループ"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5877,7 +6030,7 @@ msgstr "ホストグループの障害"
 msgid "HOST INVENTORY"
 msgstr "ホストインベントリ"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "ホストインベントリの概要"
 
@@ -5895,7 +6048,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP認証"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTPプロキシ"
 
@@ -5916,12 +6070,17 @@ msgstr "ハードウェア"
 msgid "Hardware (Full details)"
 msgstr "ハードウェア (詳細)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr "ヘッダー"
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "高さ"
@@ -5934,15 +6093,15 @@ msgstr "ヘルプ"
 msgid "Hexadecimal"
 msgstr "16進数"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "非表示"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "非表示"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "すべてを隠す"
 
@@ -5958,15 +6117,15 @@ msgstr "無効なトリガーのプロトタイプを非表示"
 msgid "Hide disabled triggers"
 msgstr "無効なトリガーを非表示"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
-msgstr ""
+msgstr "非表示フィルター"
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "選択を非表示"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "選択したグループを隠す"
 
@@ -5975,23 +6134,23 @@ msgstr "選択したグループを隠す"
 msgid "High"
 msgstr "重度の障害"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "ヒストリ"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "ヒストリを削除しました"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "ヒストリの削除には時間を要します。実行しますか？"
 
@@ -6012,78 +6171,78 @@ msgstr "イベント履歴"
 msgid "History storage period"
 msgstr "ヒストリ保存期間"
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr "ヒストリ保存期間(日)"
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "横"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "横位置"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "ホスト"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "ホスト\"%1$s\"はすでに存在しています。"
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "ホスト\"%1$s\"はプロキシ\"%2$s\"経由で監視されています。"
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "ホスト\"%s\"は\"IPMIを使用\"にチェックが入っていますが、\"IPMI IP\"にIPアドレスが入力されていません。IPMIインターフェースとしてホストのIPを利用します。"
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "ホスト(昇順)"
 
@@ -6095,64 +6254,66 @@ msgstr "ホストのIPアドレス"
 msgid "Host access"
 msgstr "ホストアクセス"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "ホストを追加しました"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "ホストに同じタイプのデフォルトインターフェースは2つ以上設定できません。"
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "ホスト数"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "ホストを削除しました"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] "ホストを無効にしました"
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] "ホストを有効にしました"
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "ホストグループ"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "ホストグループ\"%1$s\"はすでに存在しています。"
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "グローバルスクリプトに利用されているためホストグループ\"%1$s\"を削除できません。"
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "いくつかのホストが所属しているためホストグループ\"%1$s\"を削除できません。"
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "ホストグループ\"%1$s\"は内部的に使用されているため削除できません。"
@@ -6169,14 +6330,15 @@ msgstr "ホストグループの障害"
 msgid "Host group label type"
 msgstr "ホストグループのラベルタイプ"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "ホストグループ名が設定されていません。"
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "ホストグループ"
 
@@ -6186,8 +6348,8 @@ msgstr "ホストグループ"
 msgid "Host interface"
 msgstr "ホストインターフェース"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "ホストインベントリ"
 
@@ -6203,7 +6365,7 @@ msgstr "ホストの障害"
 msgid "Host label type"
 msgstr "ホストのラベルタイプ"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "ホストリスト"
 
@@ -6212,18 +6374,18 @@ msgid "Host metadata"
 msgstr "ホストメタデータ"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "ホスト名"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "ホスト名\"%1$s\"が長すぎます。%2$d文字未満で設定してください。"
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr "ホストのプロトタイプ\"%1$s\"のホスト名はマクロを含んでいる必要があります。"
@@ -6232,70 +6394,70 @@ msgstr "ホストのプロトタイプ\"%1$s\"のホスト名はマクロを含�
 msgid "Host networks"
 msgstr "ホストネットワーク"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "ホストのプロトタイプ\"%1$s\"は\"%2$s\"にすでに存在しています(他のテンプレートからの継承)。"
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"は\"%2$s\"にすでに存在しています。"
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr "ホストのプロトタイプ\"%1$s\"は少なくとも1つ以上のホストグループが設定されている必要があります。"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr "ホストのプロトタイプを追加しました"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr "ホストのプロトタイプを削除しました"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] "ホストのプロトタイプを無効にしました"
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] "ホストのプロトタイプを有効にしました"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr "ホストのプロトタイプを更新しました"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "ホスト名\"%1$s\"を持つホストのプロトタイプはディスカバリルール\"%2$s\"にすでに存在しています。"
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr "ホスト名\"%1$s\"を持つホストのプロトタイプはすでに存在しています。"
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "ホストの表示名\"%1$s\"を持つホストのプロトタイプはディスカバリルール\"%2$s\"にすでに存在しています。"
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr "ホストの表示名\"%1$s\"を持つホストのプロトタイプはすでに存在しています。"
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr "ホストのプロトタイプ"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr "ホストのプロトタイプを削除しました"
 
@@ -6307,7 +6469,7 @@ msgstr "トリガーのプロトタイプ:"
 msgid "Host router"
 msgstr "ホストルータ"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "ホストスクリーン"
 
@@ -6319,51 +6481,52 @@ msgstr "ホストステータス"
 msgid "Host subnet mask"
 msgstr "ホストのサブネットマスク"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "ホスト時間"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "ホストの更新に失敗しました"
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "ホストを更新しました"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr "同じホスト名\"%1$s\"を持つホストがすでに存在します。"
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "同じホスト名\"%s\"を持つホストがすでに存在します。"
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "同じホストの表示名\"%1$s\"を持つホストがすでに存在します。"
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "同じホストの表示名\"%s\"を持つホストがすでに存在します。"
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "ホスト"
 
@@ -6371,11 +6534,11 @@ msgstr "ホスト"
 msgid "Hosts & Groups"
 msgstr "ホスト & グループ"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "ホスト数 (有効/無効/テンプレート)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "ホスト / テンプレート"
 
@@ -6387,37 +6550,38 @@ msgstr "グループに含まれるホスト"
 msgid "Hosts in maintenance"
 msgstr "メンテナンス対象のホスト"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "ホスト情報"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "ホストの位置"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "ホストを更新しました"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "毎時間"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "時間"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr "データの保存期間"
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "ハンガリー語 (hu_HU)"
 
@@ -6435,22 +6599,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IPアドレス"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6458,26 +6622,26 @@ msgstr "IPアドレス"
 msgid "IP address"
 msgstr "IPアドレス"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "ホストインターフェースのIPとDNSは必須項目です"
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IPアドレスの範囲"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "IPレンジは必須項目です"
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6485,22 +6649,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMIエージェント"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI認証アルゴリズム"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "IPMIインターフェース"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMIパスワード"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI特権レベル"
 
@@ -6510,7 +6674,7 @@ msgstr "IPMI特権レベル"
 msgid "IPMI sensor"
 msgstr "IPMIセンサー"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMIユーザー名"
 
@@ -6543,7 +6707,7 @@ msgstr "ITサービスの依存関係"
 msgid "IT service parent"
 msgstr "ITサービスの親"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6559,25 +6723,25 @@ msgid "ITEMS"
 msgstr "アイテム"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "アイコン"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "アイコン (デフォルト)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "アイコン (無効)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "アイコン (メンテナンス)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "アイコン (障害)"
 
@@ -6598,42 +6762,44 @@ msgstr "アイコンラベルのタイプ"
 msgid "Icon map"
 msgstr "アイコンのマッピング"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "アイコンのマッピング\"%1$s\"を削除できません。マップ\"%2$s\"に利用されています。"
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "アイコンのマッピング\"%1$s\"は正しくないアイコンID\"%2$s\"と関連づけられています。"
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "アイコンのマッピング\"%1$s\"は正しくないインベントリリンク\"%2$s\"と関連づけられています。"
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "アイコンのマッピング\"%s\"はすでに存在します。"
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "アイコンのマッピング\"%s\"は空白の条件式と関連づけることはできません。"
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "アイコンのマッピング\"%s\"は存在しないグローバル条件式と関連づけることはできません。"
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "アイコンのマッピング\"%s\"の条件式が正しくありません。"
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "アイコンのマッピング\"%s\"は少なくとも1つ以上の項目と関連づける必要があります。"
@@ -6646,7 +6812,8 @@ msgstr "アイコンのマッピングを作成しました"
 msgid "Icon map deleted"
 msgstr "アイコンのマッピングを削除しました"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "アイコンのマッピング名を設定してください。"
 
@@ -6654,29 +6821,29 @@ msgstr "アイコンのマッピング名を設定してください。"
 msgid "Icon map updated"
 msgstr "アイコンのマッピングを更新しました"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "アイコンのマッピングID\"%s\"を持つアイコンのマッピングは存在しません。"
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "アイコンのマッピング"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "\"%2$s\"に対するアイコンのマッピング\"%1$s\"はすでに存在します。"
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "アイコンのマッピングが無効です"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "アイコン"
 
@@ -6684,21 +6851,23 @@ msgstr "アイコン"
 msgid "Identical expression already exists"
 msgstr "同じ設定の正規表現がすでに存在します"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "このメッセージが間違っている場合は、必要な権限を得るために管理者に問い合わせてください"
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "イメージ"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "イメージ\"%1$s\"はすでに存在しています。"
@@ -6707,7 +6876,7 @@ msgstr "イメージ\"%1$s\"はすでに存在しています。"
 msgid "Image added"
 msgstr "イメージを追加しました"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "イメージを削除しました"
 
@@ -6715,12 +6884,13 @@ msgstr "イメージを削除しました"
 msgid "Image label type"
 msgstr "イメージラベルのタイプ"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "[%2$s]内の[%1$s]のイメージの読み込みエラー。"
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "イメージのサイズは1MB未満にしてください。"
 
@@ -6729,66 +6899,66 @@ msgid "Image updated"
 msgstr "イメージを更新しました"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "イメージ"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "すべてのマップのイメージがアップデートされます！"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "すぐに"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "インポート"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "インポートに失敗しました"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "インポートするファイル"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "インポートに成功しました"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "インベントリフィールド\"%s\"が存在しないためフィルターが行えません。"
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "最後の行と列は削除できません。"
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "利用中"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "グループに所属"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "所属グループ"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6801,244 +6971,282 @@ msgstr "メンテナンス中"
 msgid "In progress"
 msgstr "実行中"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "含める"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "サービス\"%1$s\"依存関係のフィールド\"soft\"の値が正しくありません。"
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "マップ\"%2$s\"のラベルタイプの値%1$sが正しくありません。"
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
-msgstr ""
+msgstr "API\"%1$s\"が正しくありません。"
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "IPアドレスの範囲\"%s\"が正しくありません"
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "SNMP OIDの値が正しくありません。"
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "SNMPコミュニティの値が正しくありません。"
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr "Webシナリオ\"%1$s\"のためのSSLホスト検証の値が正しくありません。"
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr "Webシナリオ\"%1$s\"のためのSSLピア検証の値が正しくありません。"
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "サービス\"%1$s\"のSLAの許容値が正しくありません。"
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "アクションの実行条件のディスカバリチェックの値が正しくありません。"
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "アクションの実行条件のディスカバリチェックの値が正しくありません。ディスカバリチェックが存在しないか、権限がありません。"
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "アクションの実行条件のディスカバリオブジェクトが正しくありません。"
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "アクションの実行条件のディスカバリルールが正しくありません。ディスカバリルールが存在しないか、権限がありません"
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "アクションの実行条件のディスカバリのステータスの値が正しくありません。"
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "アクションの実行条件のイベントタイプが正しくありません。"
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "アクションの実行条件のホストグループの値が正しくありません。ホストグループが存在しないか、アクセス権がありません。"
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "アクションの実行条件のホストの値が正しくありません。ホストが存在しないか、アクセス権がありません。"
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "アクションの実行条件のIPアドレス\"%1$s\"が正しくありません。"
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "アクションの実行条件の演算子が正しくありません。"
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "アクションの実行条件のポート\"%1$s\"が正しくありません。"
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "アクションの実行条件のプロキシ設定が正しくありません。プロキシが存在しないか、アクセス権がありません。"
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "アクションの実行条件のテンプレートの値が正しくありません。テンプレートが存在しないか、アクセス権がありません。"
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "アクションの実行条件のトリガーの深刻度が正しくありません。"
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "アクションの実行条件のトリガーの値が正しくありません。"
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "アクションの実行条件のトリガーの値が正しくありません。トリガーが存在しないか、アクセス権がありません。"
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "アクションの実行条件のタイプの値が正しくありません"
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "アクションの実行条件が正しくありません。"
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "アクション\"%1$s\"の実行条件が正しくありません。"
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "実行するアクションのコマンドタイプの値が正しくありません。"
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "実行するアクションの障害対応コメントのタイプが正しくありません。"
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "実行するアクションの実行条件のタイプが正しくありません。"
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "実行するアクションのエスカレーションステップの値が正しくありません。"
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "実行するアクションのホストグループの値が正しくありません。ホストグループが存在しないか、アクセス権限がありません。"
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "実行するアクションのホストの値が正しくありません。ホストが存在しないか、アクセス権限がありません。"
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "実行するアクションのポート\"%s\"が正しくありません。"
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "アクションの実行ステップ期間が正しくありません。"
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "実行するアクションのタイプが正しくありません。"
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "実行するアクションのユーザーグループの値が正しくありません。グループが存在しないか、アクセス権がありません。"
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "実行するアクションのユーザーの値が正しくありません。ユーザーが存在しないか、アクセス権がありません。"
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "実行するアクションの設定が正しくありません。"
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "サービス\"%1$s\"のアルゴリズムが正しくありません。"
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "設定項目が間違っています"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "不正な引数が関数に渡されました。"
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "入力項目が正しくありません。"
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"の認証プロトコルが正しくありません。"
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "アイテム\"%1$s\"の認証プロトコルが正しくありません。"
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr "インターフェースのbulkの値が正しくありません。"
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "サービス\"%1$s\"のSLAの値の計算が正しくありません。"
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "ホスト\"%1$s\"に不正な文字列が使用されています。"
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "ホスト名\"%s\"に不正な文字列が使用されています。"
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "プロキシ名\"%1$s\"に利用されている文字列が正しくありません。"
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr "テンプレート名\"%1$s\"に利用されている文字列が正しくありません。"
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr "アクション\"%1$s\"の条件式が正しくありません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
+msgstr "ディスカバリルール\"%1$s\"の条件式が正しくありません。"
+
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません: %3$s。"
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "間隔の値が正しくありません。"
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"のディスカバリルールIDが正しくありません。"
@@ -7048,11 +7256,11 @@ msgstr "ホストのプロトタイプ\"%1$s\"のディスカバリルールID�
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "イベントソース\"%3$s\" (%4$s)に対するイベントオブジェクト\"%1$s\" (%2$s)が正しくありません次のオブジェクトのみサポートされています: %5$s。"
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "イベントオブジェクトの値が正しくありません。"
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "イベントソースの値が正しくありません。"
 
@@ -7061,11 +7269,11 @@ msgstr "イベントソースの値が正しくありません。"
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "テーブル\"%2$s\"へのwhereステートメントのフィールド\"%1$s\"の名前または値が正しくありません。"
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "マップの設定が正しくありません。"
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "トリガーの設定が正しくありません。"
 
@@ -7073,74 +7281,100 @@ msgstr "トリガーの設定が正しくありません。"
 msgid "Incorrect file upload."
 msgstr "アップロードされたファイルが正しくありません。"
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr "アクション\"%1$s\"のフィルター条件式IDが正しくありません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルター条件式IDが正しくありません。"
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルター条件マクロが正しくありません。"
+
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr "アクション\"%1$s\"のフィルター条件演算子が正しくありません。"
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルター条件演算子が正しくありません。"
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr "アクション\"%1$s\"のフィルター条件タイプが正しくありません。"
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "例外の更新間隔\"%1$s\"の設定が正しくありません。"
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "アイテム\"%1$s\"の例外の更新間隔の設定が正しくありません。例外の更新間隔の設定は文字列のみ利用できます。"
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr "Webシナリオ\"%2$s\"のステップ\"%1$s\"のリダイレクトをたどる値が正しくありません。"
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "間違った関数が利用されています"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr "スクリーンの要素のグラフID\"%1$s\"が正しくありません。"
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr "スクリーンの要素のグラフのプロトタイプID\"%1$s\"が正しくありません。"
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "グループのプロトタイプIDが正しくありません。"
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"のグループのプロトタイプが正しくありません。"
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr "スクリーンの要素のホストID\"%1$s\"が正しくありません。"
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr "スクリーンの要素のホストグループID\"%1$s\"が正しくありません。"
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "グループのプロトタイプのホストグループIDが正しくありません。"
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "ホストグループが正しくありません。"
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"のホストグループが正しくありません。"
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "ホストのプロトタイプIDが正しくありません。"
 
@@ -7148,182 +7382,201 @@ msgstr "ホストのプロトタイプIDが正しくありません。"
 msgid "Incorrect image index."
 msgstr "イメージのインデックスが正しくありません。"
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr "入力されたパラメータが正しくありません。"
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "インターフェースのDNSパラメータ\"%s\"が正しくありません。"
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "インターフェースのIPパラメータ\"%s\"が正しくありません。"
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "インターフェースのポート\"%s\"が正しくありません。"
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "インベントリのフィールド\"%s\"が正しくありません。"
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr "スクリーンの要素のアイテムID\"%1$s\"が正しくありません。"
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "軸に設定されたアイテムが正しくありません。"
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "トリガー条件式\"%2$s\"に正しくないアイテムキー\"%1$s\"が利用されています。"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr "スクリーンの要素のアイテムのプロトタイプID\"%1$s\"が正しくありません。"
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "トリガー関数\"%2$s\"に正しくないアイテムのデータ型\"%1$s\" が利用されています。"
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "キーが正しくありません。"
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "アイテムのリストの誤り"
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "メンテナンス期間が正しくありません - 日時は1970.01.01から2038.01.18の間で設定してください"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "メンテナンス日付が正しくありません"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "メンテナンス日が正しくありません"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "メンテナンス曜日が正しくありません"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "メンテナンス月が正しくありません"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "メンテナンス期間が正しくありません"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "メンテナンス期間が正しくありません (最小5分)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "メンテナンス週が正しくありません"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr "スクリーンの要素のマップID\"%1$s\"が正しくありません。"
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "マップ\"%s\"の高さの値が正しくありません。"
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "マップ\"%s\"の幅の値が正しくありません。"
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr "スクリーンの要素の最大列数が正しくありません。"
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "スクリプト\"%1$s\"のメニューパスが正しくありません。"
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
-msgstr ""
+msgstr "メソッド\"%1$s.%2$s\"が正しくありません。"
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "オブジェクトの値が正しくありません。"
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "アクション\"%1$s\"のパラメータが正しくありません。"
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "実行するアクションのパラメータが正しくありません。"
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "アイコンのマッピング\"%s\"のパラメータが正しくありません。"
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr "アクション更新メソッド\"%1$s\"のパラメータが正しくありません。"
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "アクションの実行条件のパラメータが正しくありません。"
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "アイコンのマッピングの更新メソッド\"%s\"のパラメータが正しくありません。"
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "メンテナンスのパラメータが正しくありません。"
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "ユーザーグループのパラメータが正しくありません。"
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "サービス\"%1$s\"の親が正しくありません。"
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "親サービスが正しくありません。"
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "ポートの範囲が正しくありません。"
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のプライバシープロトコルが正しくありません。"
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "アイテム\"%1$s\"のプライバシープロトコルが正しくありません。"
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "プロキシIDが正しくありません。"
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "スクリーンのリソースタイプが正しくありません。"
 
@@ -7332,64 +7585,68 @@ msgstr "スクリーンのリソースタイプが正しくありません。"
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Zabbixサーバー\"%1$s\"から正しくない値を受信しました。"
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr "Webシナリオ\"%2$\"のステップ\"%1$s\"の取得モードの値が正しくありません。"
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr "スクリーンの要素のグラフID\"%1$s\"が正しくありません。"
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr "スクリーンIDが正しくありません。"
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "スライドショーに設定されているスクリーンが正しくありません。"
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "サービス終了時刻が正しくありません。"
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "サービス開始時刻が正しくありません。"
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "サービスタイムの種別が正しくありません。"
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "サービス\"%1$s\"の結びつけ順が正しくありません。"
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "ソースの値が正しくありません。"
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr "ホスト\"%1$s\"のステータスが正しくありません。"
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"のステータスが正しくありません。"
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "サービス\"%1$s\"のステータスが正しくありません。"
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "ステータスが正しくありません。"
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr "テンプレートスクリーンIDが正しくありません。"
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr "ユーザー\"%1$s\"のテーマが正しくありません。"
@@ -7410,52 +7667,57 @@ msgstr "期間の設定\"%1$s\"が正しくありません。開始日は終了�
 msgid "Incorrect time period \"%1$s\"."
 msgstr "期間\"%1$s\"が正しくありません。"
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "サービス\"%1$s\"のトリガーIDが正しくありません。"
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "間違ったトリガーの条件式"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "トリガー条件式が正しくありません。"
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "トリガー条件式が正しくありません。ホスト\"%1$s\"が存在しないか、ホストへのアクセス権がありません。"
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "トリガー条件式が正しくありません。ホスト\"%s\"が存在しないか、ホストへのアクセス権がありません。"
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "トリガー条件式が正しくありません。トリガー条件式のはテンプレートとホストの両方に属することはできません。"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "条件式のトリガー関数\"%1$s\"が正しくありません。"
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "asort_by_keyのタイプが正しくありません。"
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr "アクション\"%1$s\"の計算のタイプが正しくありません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"の計算のタイプが正しくありません。"
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "ユーザーグループが正しくありません。"
 
@@ -7464,7 +7726,8 @@ msgstr "ユーザーグループが正しくありません。"
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "\"%2$s\"フィールドの値\"%1$s\"が正しくありません。"
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "\"%2$s\"フィールドの値\"%1$s\"が正しくありません: %3$sから%4$sの間で設定してください。"
@@ -7484,7 +7747,7 @@ msgstr "整数フィールド\"%2$s\"の値\"%1$s\"が正しくありません�
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "符号なし整数フィールド\"%2$s\"の値\"%1$s\"が正しくありません。"
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "フィールド\"%1$s\"の値が正しくありません。"
@@ -7494,43 +7757,49 @@ msgstr "フィールド\"%1$s\"の値が正しくありません。"
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "フィールド\"%1$s\"の値が正しくありません: 空の値を設定することはできません。"
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "setMessage()の値が正しくありません: \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "プロキシのステータス\"%1$s\"に利用されている値が正しくありません。"
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr "WebシナリオIDが正しくありません。"
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "ワーキングタイムの設定が正しくありません。"
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "グラフ\"%1$s\"のY軸の最大値のアイテムが正しくありません。"
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "グラフ\"%1$s\"のY軸の最小値のアイテムが正しくありません。"
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "インドネシア語 (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "情報"
 
@@ -7539,15 +7808,15 @@ msgstr "情報"
 msgid "Information"
 msgstr "情報"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "挿入"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "マクロの挿入"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr "条件式の挿入"
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "インストール"
 
@@ -7555,31 +7824,32 @@ msgstr "インストール"
 msgid "Installer name"
 msgstr "インストーラ名"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "インターフェース"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "インターフェースは\"%2$s\"のアイテム\"%1$s\"にリンクされています。"
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "インターフェースはこのタイプのインターフェースを利用するアイテムで利用されています"
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "DNS \"%1$s\"が設定されたインターフェースにIPアドレスを設定してください。"
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "\"%2$s\"の\"DNSを使用\"にチェックが入っている場合、IPアドレス\"%1$s\"のインターフェースのDNS名は必須項目です。"
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "IPアドレス\"%1$s\"が設定されたインターフェースにDNS名を設定してください。"
@@ -7599,7 +7869,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Zabbixデータベース内のユーザー情報"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "JSON-RPC内部エラー。"
 
@@ -7607,7 +7877,7 @@ msgstr "JSON-RPC内部エラー。"
 msgid "Internal data storage period (in days)"
 msgstr "内部データ保存期間 (日)"
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "内部エラー。"
 
@@ -7620,19 +7890,19 @@ msgstr "内部イベントとアラートのデータ保存期間"
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr "内部イベントとアラートのデータ保存期間(日) \"%1$s\"。"
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "更新間隔"
 
@@ -7642,112 +7912,114 @@ msgstr "更新間隔"
 msgid "Interval (in sec)"
 msgstr "更新間隔 (秒)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "JSONデータが正しくありません。JSONテキストのパース中にサーバーでエラーが発生しました。"
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "リクエストが正しくありません。"
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "日付\"%s\"が正しくありません。"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "1つ目のパラメータが正しくありません。"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "4つ目のパラメータが正しくありません。"
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "マクロ\"%1$s\"のhostidが正しくありません。"
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "\"%3$s\": %4$sのディスカバリルール\"%2$s\"のアイテムキー\"%1$s\"が正しくありません。"
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr "\"%3$s\": %4$sのアイテム\"%2$s\"のキー\"%1$s\"が正しくありません。"
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr "\"%3$s\": %4$sのアイテムプロトタイプ\"%2$s\"のキー\"%1$s\"が正しくありません。"
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr "キー\"%1$s\": %2$sが正しくありません。"
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "メンテナンス期間が正しくありません。"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "メソッドのパラメータが正しくありません。"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "パラメータの数が正しくありません。"
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "パラメータが正しくありません。"
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr "フィールド\"%1$s\"の期間が正しくありません。"
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "レスポンスコード\"%1$s\"が正しくありません。"
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "レスポンスコードの範囲\"%1$s\"が正しくありません。"
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "2つ目のパラメータが正しくありません。"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "3つ目のパラメータが正しくありません。"
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "時間の指定が正しくありません。"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "表示名\"%s\"が正しくありません。利用できる文字: \"a-z\"および\".\"。"
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "インベントリ"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr "ホスト\"%1$s\"のインベントリを無効にしました。"
@@ -7756,7 +8028,7 @@ msgstr "ホスト\"%1$s\"のインベントリを無効にしました。"
 msgid "Inventory field"
 msgstr "インベントリフィールド"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "インベントリモード"
 
@@ -7764,12 +8036,12 @@ msgstr "インベントリモード"
 msgid "Is online?"
 msgstr "ログイン状態"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "問題"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "ユーザーのパスワードによるフィルターは行えません。"
 
@@ -7777,70 +8049,71 @@ msgstr "ユーザーのパスワードによるフィルターは行えません
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "HTTP認証からはログアウトできません。"
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "ユーザーのパスワードによる検索は行えません。"
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "イタリア語 (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "アイテム"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr "アイテム\"%1$s\""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "アイテム\"%1$s\"は\"%2$s\"にすでに存在します (他のテンプレートからの継承)。"
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "アイテム\"%1$s\"は\"%2$s\"にすでに存在します。"
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "アイテム\"%1$s\"はフィールド番号が存在しないホストインベントリ\"%2$d\"を自動設定することができません。0 (自動設定しない)から%3$dの間で設定してください。"
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "アイテム\"%1$s\"はテンプレート\"%2$s\"に存在しません。"
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "アイテム\"%1$s\"は存在しません。"
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "\"%2$s\"上のアイテム\"%1$s\": アプリケーション\"%3$s\"は存在しません。"
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "アイテム\"%1$s\"はスキップされました - ユーザの指定。"
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "アイテム\"%1$s:%2$s\"のポート\"%3$s\"は正しくありません。"
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "アイテムを追加しました"
 
@@ -7848,16 +8121,16 @@ msgstr "アイテムを追加しました"
 msgid "Item count"
 msgstr "アイテム数"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "アイテムを削除しました"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "アイテムを無効にしました"
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "アイテムを有効にしました"
@@ -7870,54 +8143,54 @@ msgstr "アイテムが\"通常\"の状態"
 msgid "Item in \"not supported\" state"
 msgstr "アイテムが\"取得不可\"の状態"
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr "アイテムが選択されていません"
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "アイテムのプロトタイプ"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "アイテムのプロトタイプ\"%1$s\"は\"%2$s\"にすでに存在します(他のテンプレートからの継承)。"
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "アイテムのプロトタイプ\"%1$s\"は\"%2$s\"にすでに存在します。"
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr "アイテムのプロトタイプを追加しました"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr "アイテムのプロトタイプを削除しました"
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] "アイテムのプロトタイプを無効にしました"
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] "アイテムにプロトタイプを有効にしました"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr "アイテムのプロトタイプを更新しました"
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "アイテムのプロトタイプ"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr "アイテムのプロトタイプを削除しました"
 
@@ -7925,92 +8198,92 @@ msgstr "アイテムのプロトタイプを削除しました"
 msgid "Item prototypes of"
 msgstr "アイテムのプロトタイプ:"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "アイテムを更新しました"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "アイテムが親ホストのものではないホストインターフェースを利用しています。"
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "アイテムに正しくないインターフェースタイプが設定されています。"
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "アイテムは更新されません。正しい更新間隔を設定してください。"
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "キー\"%1$s\"が設定されたアイテムは\"%2$s\"にディスカバリルールとしてすでに存在します。"
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "キー\"%1$s\"が設定されたアイテムはホスト\"%2$s\"にプロトタイプから生成されたアイテムとしてすでに存在します。"
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "キー\"%1$s\"が設定されたアイテムはホスト\"%2$s\"にプロトタイプとしてすでに存在します。"
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "キー\"%1$s\"が設定されたアイテムはホスト\"%2$s\"にすでに存在します。"
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "キー\"%1$s\"が設定されたアイテムはホスト\"%2$s\"に不明なアイテムとしてすでに存在します。"
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "キー\"%1$s\"が設定されたアイテムは指定したホスト\"%2$s\"にすでに存在します。"
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "キー\"%1$s\"が設定されたアイテムがすでに存在します。"
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "アイテム"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "アイテム数 (有効/無効/取得不可)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "アイテムをコピーしました"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "アイテムを削除しました"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "アイテムのリスト"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "アイテムを更新しました"
 
@@ -8022,72 +8295,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMXエージェント"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMXインターフェース"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "JSON-rpcエラーの生成失敗。そのようなエラーはありません\"%s\"。"
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpcメソッドがありません。"
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpcパラメータがありません。"
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "JSON-rpcバージョンがありません。"
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "JabberID"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "1月"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "1月"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "日本語 (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "7月"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "7月"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "6月"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "6月"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8096,40 +8369,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "存在しなくなったリソースの保持期間(日)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "キー"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "キー\"%1$s\"が<grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]とマッチしません。"
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "キーのパスフレーズ"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "キーワード"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "キロ"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "韓国語 (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "最新のデータ"
 
@@ -8160,37 +8433,37 @@ msgstr "LDAPによるログインが成功しました"
 msgid "LDAP login was not successful"
 msgstr "LDAPによるログインが失敗しました"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "ローカル"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "LOST"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "ラベル"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "ラベルの位置"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "言語"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "最新"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "最新"
@@ -8201,19 +8474,19 @@ msgid "Last %1$d issue"
 msgid_plural "Last %1$d issues"
 msgstr[0] "最新%1$d件の障害"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "最新(T秒前/T個前)の値 < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "最新(T秒前/T個前)の値 = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "最新(T秒前/T個前)の値 > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "最新(T秒前/T個前)の値 NOT N"
 
@@ -8233,28 +8506,28 @@ msgstr "最新365日"
 msgid "Last 7 days"
 msgstr "最新7日"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "最新の変更"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "最新の変更 (降順)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "最新のチェック時刻"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "最新1時間のグラフ"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "最新1ヶ月のグラフ"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "最新の"
 
@@ -8262,66 +8535,67 @@ msgstr "最新の"
 msgid "Last seen (age)"
 msgstr "最新データ受信時刻 (経過時間)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "最新の値"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "最新1週間のグラフ"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "最新データ"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "最新のイベント"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr "最新の値"
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "ラトビア語 (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "左"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "凡例"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "最新(T秒前/T個前)の文字列の長さ < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "最新(T秒前/T個前)の文字列の長さ = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "最新(T秒前/T個前)の文字列の長さ > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "最新(T秒前/T個前)の文字列の長さ NOT N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "線"
 
@@ -8329,39 +8603,29 @@ msgstr "線"
 msgid "Link"
 msgstr "リンク"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "障害発生時の条件設定"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "マップ\"%s\"のリンク名は重複できません。"
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr "新規テンプレートをリンク"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "マップ\"%2$s\"のselementid1項目は、存在しないマップのselement ID \"%1$s\"を指しています。"
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "マップ\"%2$s\"のselementid2項目は、存在しないマップのselement ID \"%1$s\"を指しています。"
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "マップ\"%s\"のリンクには\"名前\"と\"URL\"の両方を設定する必要があります。"
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "テンプレートをリンク"
 
@@ -8373,50 +8637,50 @@ msgstr "テンプレートとのリンクを作成"
 msgid "Link to templates"
 msgstr "テンプレートとリンク"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "テンプレートとのリンク"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "テンプレートとのリンク"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "次にリンク"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "選択された要素間のリンク"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "選択された要素のリンク"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "リストがありません"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr "ネットワークインターフェースのリスト。テキスト値。"
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "リトアニア語 (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "読み込み中..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "ローカル時間"
 
@@ -8433,36 +8697,36 @@ msgid "Location longitude"
 msgstr "経度"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "ログ"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "最新のログの深刻度 < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "最新のログの深刻度 = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "最新のログの深刻度 > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "最新のログの深刻度 NOT N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "最新のイベントログのログソースに文字列Tと一致 N = 1、その他の場合 N = 0"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "最新のイベントログのログソースに文字列Tと一致 N NOT 1、その他の場合 N = 0"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "ログの時間の形式"
@@ -8471,12 +8735,12 @@ msgstr "ログの時間の形式"
 msgid "Log unmatched SNMP traps"
 msgstr "マッチしないSNMPトラップをログに記録"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "次のユーザーでログイン"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8487,12 +8751,12 @@ msgstr "ログイン"
 msgid "Login as Guest"
 msgstr "ゲストとしてログイン"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "ログイン失敗\"%s\""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr "ユーザー名\"%1$s\"がHTTP認証で利用したユーザー名\"%2$s\"と一致しません。"
@@ -8501,8 +8765,9 @@ msgstr "ユーザー名\"%1$s\"がHTTP認証で利用したユーザー名\"%2$s
 msgid "Login name or password is incorrect!"
 msgstr "ログイン名かパスワードが間違っています!"
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "ログイン名かパスワードが間違っています。"
 
@@ -8523,22 +8788,18 @@ msgstr "ローレベルディスカバリが\"通常\"の状態"
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr "ローレベルディスカバリが\"取得不可\"の状態"
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "Y/m"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr "MACアドレスのリスト - デフォルトではインターフェイス名を持つすべてのMACアドレスのリスト"
 
@@ -8550,7 +8811,7 @@ msgstr "MACアドレスA"
 msgid "MAC address B"
 msgstr "MACアドレスB"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "メンテナンス"
 
@@ -8575,49 +8836,49 @@ msgstr "障害発生数上位100項目"
 msgid "Macro"
 msgstr "マクロ"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "マクロ\"%1$s\"は\"%2$s\"にすでに存在します。"
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "マクロ\"%1$s\"はすでに存在します。"
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "マクロ\"%1$s\"がユニークではありません。"
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "マクロ\"%1$s\"の値が長すぎます。255文字以下で設定してください。"
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "マクロ名\"%1$s\"が長すぎます。64文字以下で設定してください。"
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "globalmacroid \"%1$s\"を持つマクロは存在しません。"
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "hostmacroid \"%1$s\"を持つマクロは存在しません。"
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "マクロ"
 
@@ -8625,31 +8886,36 @@ msgstr "マクロ"
 msgid "Macros updated"
 msgstr "マクロを更新しました"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "メンテナンス"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "メンテナンス\"%s\"はすでに存在します。"
+msgid "Maintenance \"%1$s\" already exists."
+msgstr "メンテナンス\"%1$s\"はすでに存在します。"
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "メンテナンス期間の開始時刻は終了時刻よりも大きい値を指定できません。"
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr "アクションの実行条件のメンテナンスの設定は空である必要があります。"
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "メンテナンスを追加しました"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "メンテナンスを削除しました"
 
@@ -8657,7 +8923,7 @@ msgstr "メンテナンスを削除しました"
 msgid "Maintenance period"
 msgstr "メンテナンス期間"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "メンテナンス期間"
 
@@ -8673,25 +8939,25 @@ msgstr "メンテナンスの状態"
 msgid "Maintenance type"
 msgstr "メンテナンスタイプ"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "メンテナンスを更新しました"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "データ収集ありのメンテナンス"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "データ収集なしのメンテナンス"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "必須のパラメータが設定されていません。"
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "マニュアル"
 
@@ -8702,12 +8968,12 @@ msgstr "手動ログアウト"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "マップ"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "マップ\"%1$s\"はスキップされました - ユーザの指定。"
@@ -8717,12 +8983,12 @@ msgstr "マップ\"%1$s\"はスキップされました - ユーザの指定。"
 msgid "Map \"%s\""
 msgstr "マップ\"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "マップ\"%s\"を作成しました。"
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "マップ\"%s\"を更新しました。"
@@ -8739,12 +9005,12 @@ msgstr "マップラベルのタイプ"
 msgid "Map save operation failed."
 msgstr "マップの保存操作に失敗しました"
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr "マップ\"%s\"はすでに存在します。"
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "マッピング文字列"
 
@@ -8754,23 +9020,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "値のマッピング\"%1$s\"はユニークではありません。"
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "マッピング"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "マップ"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "3月"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "3月"
 
@@ -8778,28 +9044,34 @@ msgstr "3月"
 msgid "Mark elements on trigger status change"
 msgstr "トリガーの状態が変化した要素をマーク"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "その他をマーク"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "選択をマーク"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr "マスク"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "一括更新"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "要素の一括更新"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr "最大列数"
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "一覧表示の最大項目数"
@@ -8813,29 +9085,11 @@ msgstr "一覧表示の最大項目数 \"%1$s\"。"
 msgid "Max count of events per trigger to show"
 msgstr "トリガーあたりのイベント表示の最大数"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "最大化"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "DNS名の最大文字数は%1$d文字です。\"%2$s\"は%3$d文字あります。"
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "エイリアスの最大文字数は%1$d文字です。\"%2$s\"は%3$d文字あります。"
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "ホスト名の最大文字数は%1$d文字です。\"%2$s\"は%3$d文字あります。"
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8843,101 +9097,96 @@ msgid "Maximum number of flexible intervals added"
 msgstr "例外の更新間隔の設定数が上限に達しました"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr "OSでサポートされる最大ファイルオープン数。"
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr "OSでサポートされる最大プロセス数。"
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "表示できる最大の期間は%1$s日です。"
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "期間Tの値の最大値 < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "期間Tの値の最大値 = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "期間Tの値の最大値 > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "期間Tの値の最大値 NOT N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "ホストの表示名の最大文字数は%1$d文字です。\"%2$s\"は%3$d文字あります。"
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "5月"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "5月"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "メディア"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "メディアタイプ"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "メディアタイプ\"%s\"はすでに存在します。"
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "メディアタイプを追加しました"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "メディアタイプを削除しました"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "メディアタイプを無効にしました"
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "メディアタイプを有効にしました"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "メディアタイプを更新しました"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "メディアタイプ"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "メディアタイプはアクション\"%s\"に利用されています。"
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "メガ"
 
@@ -8952,14 +9201,14 @@ msgid "Memory limit: %s"
 msgstr "メモリ制限: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr "プロセスの利用メモリ。<name>はプロセス名 (default: すべてのプロセス)。<user>はユーザー名 (default: すべてのユーザー)。<mode>は次の値：avg, max, min, sum (デフォルト)。<cmdline>はコマンド名によりフィルタリング (正規表現をサポート)。例： proc.mem[,root]。"
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "メニュー"
 
@@ -8969,7 +9218,7 @@ msgstr "メニュー"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "メッセージ"
 
@@ -8977,66 +9226,66 @@ msgstr "メッセージ"
 msgid "Message actions"
 msgstr "メッセージアクション"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "メッセージの上限文字数"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "表示期間"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "表示期間 (秒)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "メッセージ"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "アラート表示"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "メソッドが見つかりません。"
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "中央"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "最小化"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr "PHPメモリ上限の最小値は%sです (\"memory_limit\"設定オプション)。"
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr "PHPアップロードファイルサイズの最小値は%sです (\"upload_max_filesize\"設定オプション)。"
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr "PHPの最小バージョンは%sです。"
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr "PHPスクリプトの実行時間の最小値は%sです (\"max_execution_time\"設定オプション)。"
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr "PHPスクリプトの入力パース時間の最小値は%sです (\"max_input_time\"設定オプション)。"
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr "PHPのpostサイズの最小値は%sです (\"post_max_size\"設定オプション)。"
@@ -9045,79 +9294,76 @@ msgstr "PHPのpostサイズの最小値は%sです (\"post_max_size\"設定オ�
 msgid "Minimum severity"
 msgstr "最小の深刻度"
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] "表示できる最小の期間は%1$s時間です。"
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr "最小のトリガー深刻度"
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "期間Tの値の最小値 < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "期間Tの値の最小値 = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "期間Tの値の最小値 > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "期間Tの値の最小値 NOT N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "分"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr "アクションの実行条件の\"%1$s\"フィールドが存在しません。"
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr "アイテムの\"%1$s\"フィールドが存在しません。"
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr "期間の\"%1$s\"フィールドが存在しません。"
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr "アイテムの\"gitemid\"フィールドが存在しません。"
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "アイテムの\"itemid\"フィールドが存在しません。"
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr "グラフのプロトタイプの\"name\"フィールドが存在しません。"
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "グラフの\"name\"フィールドが存在しません。"
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "ホスト\"%2$s\"のアイテム\"%1$s\"が存在しません。"
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "グラフ\"%1$s\"のアイテムが存在しません。"
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr "グラフのプロトタイプ\"%1$s\"のアイテムが存在しません。"
@@ -9127,7 +9373,7 @@ msgstr "グラフのプロトタイプ\"%1$s\"のアイテムが存在しませ�
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "ホスト\"%2$s\"にはキー\"%1$s\"が設定されていません。"
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "パラメータが設定されていません: usrgrpids。"
 
@@ -9139,18 +9385,18 @@ msgstr "モード"
 msgid "Model"
 msgstr "モデル"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "月"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "月曜"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "プロキシによる監視"
 
@@ -9158,33 +9404,33 @@ msgstr "プロキシによる監視"
 msgid "Monitored host"
 msgstr "監視中のホスト"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "監視データ"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr "Windowsイベントログ監視。pattern, severity, eventid - 正規表現"
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr "ローテーションありのログファイル監視。file_format - [path][regexp], pattern - 正規表現"
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr "ログファイル監視。pattern - 正規表現"
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "月"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "毎月"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr "条件に一致するデータがさらに存在します..."
 
@@ -9192,7 +9438,7 @@ msgstr "条件に一致するデータがさらに存在します..."
 msgid "More than 10 minutes"
 msgstr "10分以上"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "ホストに\"%1$s\"の名前を持つグラフが1つ以上存在します。"
@@ -9201,19 +9447,19 @@ msgstr "ホストに\"%1$s\"の名前を持つグラフが1つ以上存在しま
 msgid "Most busy triggers top 100"
 msgstr "障害発生数上位100項目"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "障害イベントを継続して生成"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "障害イベントを継続して生成"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "ミュート"
 
@@ -9226,60 +9472,58 @@ msgstr "ネットワークマップ"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "データなし"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM認証"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr "NTLM"
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9290,26 +9534,32 @@ msgstr "NTLM認証"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "名前"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr "名前"
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr "グループのプロトタイプ\"%1$s\"の名前はマクロを含んでいる必要があります。"
@@ -9328,12 +9578,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr "ネットワークディスカバリイベントとアラートのデータ保存期間 (日) \"%1$s\"。"
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr "ネットワークインターフェース入力統計。整数値。modeが指定されない場合はbytesが利用される。"
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr "ネットワークインターフェース出力統計。整数値。modeが指定されない場合はbytesが利用される。"
 
@@ -9341,7 +9591,7 @@ msgstr "ネットワークインターフェース出力統計。整数値。mod
 msgid "Network map added"
 msgstr "ネットワークマップを追加しました"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "ネットワークマップを削除しました"
 
@@ -9353,7 +9603,7 @@ msgstr "ネットワークマップを更新しました"
 msgid "Network maps"
 msgstr "ネットワークマップ"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "未監視"
 
@@ -9361,24 +9611,24 @@ msgstr "未監視"
 msgid "Never executed"
 msgstr "未実行"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "新規"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "アプリケーションの作成"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "新規条件"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "新規要素"
 
@@ -9389,16 +9639,16 @@ msgstr "新規要素"
 msgid "New flexible interval"
 msgstr "例外の更新間隔の作成"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "新規グループ作成"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "新規ホストグループ作成"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "グラフに追加するアイテム"
 
@@ -9406,83 +9656,99 @@ msgstr "グラフに追加するアイテム"
 msgid "New media"
 msgstr "新規メディア"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "正規表現の作成"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "新規サービスタイム"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "次へ"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "次へ"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "いいえ"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr "グラフのプロトタイプに\"%1$s\"が定義されていません。"
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr "グラフに\"%1$s\"が定義されていません。"
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr "ホストのプロトタイプに\"%1$s\"が定義されていません。"
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr "スクリーンに\"%1$s\"が定義されていません。"
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr "テンプレートスクリーンに\"%1$s\"が定義されていません。"
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr "Webシナリオに\"%1$s\"が定義されていません。"
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr "アクション\"%1$s\"のフィルター条件の\"%2$s\"が定義されていません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルター条件の\"%2$s\"が定義されていません。"
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"に\"%2$s\"が定義されていません。"
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr "アクション\"%1$s\"のフィルターの\"%2$s\"が定義されていません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルターの\"%2$s\"が定義されていません。"
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "グラフ\"%s\"のフィールド\"ymax_type\"がありません。"
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "グラフ\"%s\"のフィールド\"ymin_type\"がありません。"
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr "IPMIインターフェースが設定されていません"
 
@@ -9490,25 +9756,25 @@ msgstr "IPMIインターフェースが設定されていません"
 msgid "No IT services found."
 msgstr "ITサービスが設定されていません。"
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr "JMXインターフェースが設定されていません。"
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr "SNMP OIDが設定されていません。"
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr "SNMPコミュニティ名が設定されていません。"
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr "SNMPイターフェースが設定されていません。"
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "スクリーンの要素にURLが設定されていません。"
 
@@ -9534,8 +9800,8 @@ msgstr "アクションログ履歴はありません。"
 msgid "No actions found."
 msgstr "アクションが設定されていません。"
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr "エージェントのインターフェースが設定されていません。"
 
@@ -9545,7 +9811,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "ID\"%1$s\"を持つアプリケーションが設定されていません。"
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr "アプリケーションがありません。"
 
@@ -9553,30 +9819,31 @@ msgstr "アプリケーションがありません。"
 msgid "No audit log entries found."
 msgstr "監査ログ履歴はありません。"
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "実行するアクションのコマンド\"%s\"に認証のタイプが設定されていません。"
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "実行するアクションのコマンド\"%s\"に認証ユーザー名が設定されていません。"
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "認証ユーザー名が設定されていません。"
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "実行するアクションにコマンドが設定されていません。"
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "実行するアクションにコマンドタイプが設定されていません。"
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "アクションの実行条件が設定されていません。"
 
@@ -9585,27 +9852,27 @@ msgstr "アクションの実行条件が設定されていません。"
 msgid "No data collection"
 msgstr "データ収集なし"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "期間Tの間にデータが存在しない N= 1、それ以外 N = 0"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "期間Tの間にデータが存在しない N NOT 1、それ以外 N NOT 0"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "\"%2$s\"上の\"%1$s\"タイプのデフォルトインターフェースが設定されていません。"
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "依存関係が設定されていません。"
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "詳細がありません"
 
@@ -9613,39 +9880,39 @@ msgstr "詳細がありません"
 msgid "No discovered devices found."
 msgstr "発見されたデバイスはありません。"
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"にディスカバリルールIDが設定されていません。"
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "ディスカバリルールIDが設定されていません。"
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr "ディスカバリルールが設定されていません。"
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "エラーはありません。"
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "イベントはありません"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr "イベントはありません。"
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "障害対応コメントを行うイベントはありません"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "実行するアクションのコマンド\"%s\"に実行する対象が設定されていません。"
@@ -9660,7 +9927,7 @@ msgstr "ファイルがアップロードされていません。"
 msgid "No flexible intervals defined."
 msgstr "例外の更新間隔は設定されていません。"
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "スクリーンの要素にグラフIDが設定されていません。"
 
@@ -9669,7 +9936,11 @@ msgstr "スクリーンの要素にグラフIDが設定されていません。"
 msgid "No graph item with graphid \"%s\"."
 msgstr "グラフID\"%s\"のグラフアイテムがありません。"
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr "スクリーンの要素のグラフのプロトタイプIDが設定されていません。"
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr "グラフのプロトタイプが設定されていません。"
 
@@ -9678,48 +9949,49 @@ msgid "No graphs added."
 msgstr "グラフが追加されていません。"
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr "グラフはありません。"
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "ホスト\"%s\"にグループが設定されていません。"
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "ホストにグループが設定されていません。"
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr "テンプレート\"%1$s\"にグループが設定されていません。"
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr "テンプレートにグループが設定されていません。"
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "ホストIDが存在しません。"
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "マクロ\"%1$s\"のためのホストが設定されていません。"
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr "グループのプロトタイプにホストグループIDが設定されていません。"
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "スクリーンの要素にホストグループIDが設定されていません。"
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr "ホストグループはありません。"
 
@@ -9732,17 +10004,22 @@ msgstr "グループID\"%s\"を持つホストグループが設定されてい�
 msgid "No host prototypes found."
 msgstr "ホストプロトタイプが設定されていません。"
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr "ホストが選択されていません。"
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "ホストID\"%s\"を持つホストが設定されていません。"
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr "ホストが設定されていません。"
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "マップの要素\"%s\"にアイコンが存在しません。"
@@ -9761,33 +10038,40 @@ msgstr "イメージはありません。"
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "インターフェースが見つかりません。"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "インターフェースが見つかりません。"
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr "プロキシ\"%s\"にインターフェースが設定されていません。"
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "ホスト\"%s\"にインターフェースが設定されていません。"
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "スクリーンの要素にアイテムIDが設定されていません。"
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr "アイテムのキーが設定されていません。"
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr "スクリーンの要素のアイテムのプロトタイプIDが設定されていません。"
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr "アイテムのプロトタイプが設定されていません。"
 
@@ -9806,7 +10090,7 @@ msgid "No items defined."
 msgstr "アイテムが設定されていません。"
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr "アイテムが設定されていません。"
 
@@ -9822,7 +10106,7 @@ msgstr "メンテナンス期間が設定されていません。"
 msgid "No maintenance periods found."
 msgstr "メンテナンス期間が設定されていません。"
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "スクリーンの要素にマップIDが設定されていません。"
 
@@ -9831,15 +10115,15 @@ msgid "No maps added."
 msgstr "マップが追加されていません。"
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr "マップが設定されていません。"
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr "条件に一致するデータはありません"
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr "メディアが設定されていません。"
 
@@ -9851,133 +10135,178 @@ msgstr "メディアタイプが設定されていません。"
 msgid "No notifications found."
 msgstr "通知はありません。"
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr "アクションの実行内容が設定されていません。"
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "グラフ\"%1$s\"への権限がありません。"
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "ホスト\"%1$s\"への権限がありません。"
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "アイテム\"%1$s\"への権限がありません。"
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "テンプレート\"%1$s\"への権限がありません。"
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "トリガー\"%s\"への権限がありません。"
+msgid "No permission for trigger \"%1$s\"."
+msgstr "トリガー\"%1$s\"への権限がありません。"
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "権限がありません"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "グループ\"%1$s\"への権限がありません。"
+msgid "No permissions for host group \"%1$s\"."
+msgstr "ホストグループ\"%1$s\"への権限がありません。"
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "マップ\"%1$s\"への権限がありません。"
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "スクリーン\"%1$s\"への権限がありません。"
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "システムへのアクセス権がありません。"
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "対象が存在しないか、アクセス権がありません！"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "実行するアクションのコマンド\"%s\"に秘密鍵ファイルが設定されていません。"
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "秘密鍵ファイルが設定されていません。"
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr "プロキシが設定されていません。"
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "プロキシなし"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "実行するアクションのコマンド\"%s\"に公開鍵ファイルが設定されていません。"
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "公開鍵ファイルが設定されていません。"
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "実行するアクションのメッセージに送信先が設定されていません。"
 
@@ -9985,7 +10314,7 @@ msgstr "実行するアクションのメッセージに送信先が設定され
 msgid "No regular expressions found."
 msgstr "正規表現が設定されていません。"
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "スクリーンの要素にスクリーンIDが設定されていません。"
 
@@ -9993,82 +10322,83 @@ msgstr "スクリーンの要素にスクリーンIDが設定されていませ�
 msgid "No screens added."
 msgstr "スクリーンが追加されていません。"
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr "スクリーンが設定されていません。"
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "実行するアクションのコマンドにスクリプトが設定されていません。"
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr "スクリプトが設定されていません。"
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr "スライドショーが設定されていません。"
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr "スライドが設定されていません。"
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr "プロキシにステータスが設定されていません。"
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "何も選択されていません"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "何も選択されていません。"
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr "テンプレートが設定されていません。"
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr "テンプレートがリンクされていません。"
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "時間が設定されていません。24x7として動作します。"
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "トリガーがありません"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "トリガーID\"%1$s\"を持つトリガーは存在しません。"
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "トリガーが設定されていません。"
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "トリガーが存在しません。"
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr "ユーザーグループが設定されていません。"
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr "ユーザーが設定されていません。"
 
@@ -10077,57 +10407,58 @@ msgid "No value maps found."
 msgstr "値のマッピングが設定されていません。"
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "値が存在しません。"
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr "Webシナリオが設定されていません。"
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "なし"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "ノーマル"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "通常表示"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "コメントなし"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "テンプレートではないアイテム"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "すべてのテンプレートは\"%s\"にリンクされていません。"
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "ゲストユーザーはパスワードを設定できません。"
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
-msgstr ""
+msgstr "権限がありません。"
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "利用不可"
 
@@ -10136,7 +10467,7 @@ msgstr "利用不可"
 msgid "Not classified"
 msgstr "未分類"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "未ログイン"
 
@@ -10149,8 +10480,8 @@ msgstr "未送信"
 msgid "Not supported"
 msgstr "取得不可"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "ノート"
@@ -10163,7 +10494,7 @@ msgstr "備考"
 msgid "Nothing"
 msgstr "なし"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "実行するものがありません"
 
@@ -10171,87 +10502,87 @@ msgstr "実行するものがありません"
 msgid "Notification report"
 msgstr "通知レポート"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "通知レポート"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "11月"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "11月"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "現在"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr "有効なプロセッサー数。"
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
-msgstr ""
+msgstr "ホスト数 (有効/無効/テンプレート)"
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr "指定されたボリュームのinode数。modeが指定されなかった場合は利用済数。"
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
-msgstr ""
+msgstr "アイテム数 (有効/無効/取得不可)"
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr "Zabbixデータベース内のアイテム数。"
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr "サーバーへ未送信のプロキシ内のヒストリアイテム数"
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr "fromからtoまでの時間遅れているキュー内のアイテム数。"
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr "監視ホスト数"
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr "プロセス数。<name>と<user>はproc.memアイテムと同様。<state>はall (default), run, sleep, zomb。<cmdline>はコマンドラインでフィルタリングする(正規表現をサポート)。例：proc.num[apache2,www-data]。Windows上では<name>と<user>のみをサポート。"
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザー上のプロセッサコア数、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーのホスト名"
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザー上のプロセッサスレッド数、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーのホスト名"
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシン上のプロセッサ数、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンのホスト名"
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "エポック時間からの経過秒数 < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "エポック時間からの経過秒数 = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "エポック時間からの経過秒数 > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "エポック時間からの経過秒数 NOT N"
 
@@ -10259,88 +10590,88 @@ msgstr "エポック時間からの経過秒数 NOT N"
 msgid "Number of status changes"
 msgstr "ステータス変更の回数"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "ステップ数"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "期間T内に含まれる(条件Oを満たす)値Vの個数 < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "期間T内に含まれる(条件Oを満たす)値Vの個数 = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "期間T内に含まれる(条件Oを満たす)値Vの個数 > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "期間T内に含まれる(条件Oを満たす)値Vの個数 NOT N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr "トリガー数 (有効/無効 [障害/正常])"
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr "Zabbixデータベース内のトリガー数。"
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr "Zabbixデータベース内の取得不可アイテム数。"
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "ユーザー数 (オンライン)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr "ユーザー接続数。エージェントサイドでwhoコマンドを利用。"
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr "テーブルHISTORY内の値保存数。"
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr "テーブルHISTORY_LOG内の値保存数。"
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr "テーブルHISTORY_STR内の値保存数。"
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr "テーブルHISTORY_TEXT内の値保存数。"
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr "テーブルHISTORY_UINT内の値保存数。"
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr "テーブルTRENDS内の値保存数。"
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr "テーブルTRENDS_UINT内の値保存数。"
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザー上の仮想マシン数、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーのホスト名"
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "数値 (浮動小数)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "数値 (整数)"
 
@@ -10355,16 +10686,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "正常"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr "正常もしくはトリガー設定なし"
 
@@ -10380,8 +10713,7 @@ msgstr "OOBルータ"
 msgid "OOB subnet mask"
 msgstr "OOBサブネットマスク"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "OR"
 
@@ -10401,11 +10733,12 @@ msgstr "OS (簡易説明)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "その他の設定パラメータ"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "概要"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "10月"
 
@@ -10413,25 +10746,25 @@ msgstr "10月"
 msgid "Octal"
 msgstr "8進数"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "10月"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "OFF"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "正常"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "ON"
 
@@ -10439,111 +10772,114 @@ msgstr "ON"
 msgid "On status change triggers blink for"
 msgstr "ステータスが変化したトリガーの点滅期間"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "一度だけ"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr "ホストグループが設定されていないオブジェクトが残っています"
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "一度限り"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "一時的なダウンタイム"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "特権管理者のみがグローバルマクロを作成できます。"
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "特権管理者のみがホストグループを作成できます。"
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "特権管理者のみがアイコンのマッピングを作成できます。"
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "特権管理者のみがメディアタイプを作成できます。"
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "特権管理者のみがグローバルマクロを削除できます。"
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "特権管理者のみがメディアタイプを削除できます。"
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "特権管理者のみがユーザーグループを削除できます。"
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "特権管理者のみがメディアタイプを修正できます。"
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "特権管理者のみがグローバルマクロを更新できます。"
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "特権管理者のみがアイコンのマッピングを更新できます。"
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "特権管理者のみがユーザーのメディアを追加できます。"
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "特権管理者のみがユーザーのメディアを変更できます。"
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "特権管理者のみがユーザーのメディアを削除できます。"
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "文字列のみ使用することができます。"
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr "Zabbixエージェント、SNMPv1、SNMPv2、SNMPv3がユニークかどうかだけチェックします。"
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "有効なホストのアイテムのみカウント"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "ユニークかどうかだけチェックします。"
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "同時には1つのユーザーグループ名しか変更できません。"
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "上位20%%の領域が表示されています。"
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr "障害対応コメントはトリガーのイベントにのみ追加できます。"
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "有効なホストとアイテムのトリガーのみカウント"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "実行するアクション\"%s\"はすでに存在します。"
@@ -10552,28 +10888,28 @@ msgstr "実行するアクション\"%s\"はすでに存在します。"
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "認証されていないリクエストのため操作を実行できません。"
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "アクションの実行条件"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "実行内容の詳細"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "操作対象のグループがありません。"
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "操作対象のテンプレートがありません。"
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "実行内容のタイプ"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "アクションの実行内容"
@@ -10582,25 +10918,27 @@ msgstr "アクションの実行内容"
 msgid "Operator"
 msgstr "オペレータ"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
-msgstr ""
+msgstr "Or"
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10630,24 +10968,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "変更なし"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Original blue"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "その他"
 
@@ -10655,19 +10993,19 @@ msgstr "その他"
 msgid "Other configuration parameters"
 msgstr "その他の設定パラメータ"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "その他のグループ"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "その他のホスト"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10677,21 +11015,21 @@ msgstr "その他のホスト | グループ"
 msgid "Other parameters"
 msgstr "その他のパラメータ"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "その他 | グループ"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "その他"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr "Out-of-window collision。衝突数。"
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "次で上書き"
@@ -10704,14 +11042,11 @@ msgstr "アイテムのヒストリの保存期間を上書き"
 msgid "Override item trend period"
 msgstr "アイテムのトレンドの保存期間を上書き"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr "グローバルなデータの保存期間設定を上書き"
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "概要"
 
@@ -10719,7 +11054,7 @@ msgstr "概要"
 msgid "Overview by proxy"
 msgstr "プロキシごとの概要"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10728,147 +11063,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "ダッシュボード"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr "PHP bcmathモジュールが存在しません (PHPのconfigure時のパラメータ --enable-bcmath)。"
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr "PHP ctypeモジュールが存在しません (PHPのconfigure時のパラメータ --enable-ctype)。"
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHPデータベースサポート"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "PHP gd FreeTypeのサポート"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr "PHP gd FreeTypeのサポート"
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr "PHP gd JPEGイメージがサポートされていません。"
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "PHP gd JPEGのサポート"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr "PHP gd PNGイメージがサポートされていません。"
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "PHP gd PNGのサポート"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr "PHP GDモジュールが存在しません (PHPのconfigure時のパラメータ --with-gd)。"
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr "PHP gettextモジュールが存在しません (PHPのconfigure時のパラメータ --with-gettext)。翻訳が利用できません。"
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr "PHP libxmlモジュールが存在しません。"
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr "PHP mbstringモジュールが存在しません (PHPのconfigure時のパラメータ --enable-mbstring)。"
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr "PHP mbstring.func_overload"
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP max_execution_timeオプション"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP max_input_timeオプション"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP memory_limitオプション"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP post_max_sizeオプション"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP upload_max_filesizeオプション"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP session auto start"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr "PHP session auto startは無効に設定する必要があります (PHPのパラメータ\"session.auto_start\")。"
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr "PHP sessionモジュールが存在しません (PHPのconfigure時のパラメータ --enable-session)。"
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr "PHP socketsモジュールが存在しません (PHPのconfigure時のパラメータ --enable-sockets)。"
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr "PHP文字列関数のオーバーロードは無効に設定する必要があります。"
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP time zone"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHPバージョン"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr "PHP xmlreaderモジュールが存在しません。"
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr "PHP xmlwriterモジュールが存在しません。"
 
@@ -10877,32 +11220,34 @@ msgstr "PHP xmlwriterモジュールが存在しません。"
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "障害"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "誤ったデータを受信しました"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "パレット"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "パレット #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "パラメータ"
 
@@ -10911,7 +11256,7 @@ msgstr "パラメータ"
 msgid "Parent discovery rules"
 msgstr "親ディスカバリルール"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr "親グラフ"
 
@@ -10931,33 +11276,33 @@ msgstr "親トリガー"
 msgid "Parent web scenarios"
 msgstr "親Webシナリオ"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "SQLパースエラー [%2$s]内の[%1$s]。"
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "パースエラー"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "パッシブ"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -10967,20 +11312,21 @@ msgstr "パッシブ"
 msgid "Password"
 msgstr "パスワード"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "パスワード(確認)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
-msgstr ""
+msgstr "ユーザーのパスワードに%1$sは利用できません。"
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "メディアタイプのパスワードを設定してください。"
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "パスワードを設定してください"
 
@@ -10989,21 +11335,21 @@ msgstr "パスワードを設定してください"
 msgid "Peak memory usage: %s"
 msgstr "ピークのメモリ使用量: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "パーセンタイルライン (左)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "パーセンタイルライン (右)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr "DNS検索の実行。成功すれば要求したタイプの情報文字列が返却される。"
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11011,12 +11357,12 @@ msgstr "DNS検索の実行。成功すれば要求したタイプの情報文字
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "期間"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "期間のタイプ"
@@ -11026,24 +11372,24 @@ msgstr "期間のタイプ"
 msgid "Periods"
 msgstr "期間"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "権限"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "権限はユーザーグループにのみ割り当てることができます。"
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "ペルシャ語 (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "ペタ"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "円グラフ"
 
@@ -11055,55 +11401,56 @@ msgstr "配置アルゴリズム"
 msgid "Plain text"
 msgstr "プレーンテキスト"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "再生"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "サウンド再生"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "すべての問題を解決して\"Retry\"ボタンを押してください"
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "確認のテキストを入力してください。"
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "2つの要素を選択してください"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "ポーランド語 (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "ホストインベントリフィールドの自動設定"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "ポート"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "ホストインターフェースのポートは必須項目です。"
 
@@ -11111,51 +11458,51 @@ msgstr "ホストインターフェースのポートは必須項目です。"
 msgid "Port range"
 msgstr "ポートの範囲"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "ポルトガル語 (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "ポルトガル語 (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "ポジション"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "POST"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "プレビュー"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "前"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "前"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "前回の値 < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "前回の値 = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "前回の値 > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "前回の値 NOT N"
 
@@ -11204,30 +11551,31 @@ msgstr "プライバシーパスフレーズ"
 msgid "Privacy protocol"
 msgstr "プライバシープロトコル"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "秘密鍵ファイル"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "特権レベル"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "php-ldapモジュールが見つかりません。"
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "障害"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "障害の表示"
 
@@ -11239,16 +11587,16 @@ msgstr "障害"
 msgid "Problem time"
 msgstr "障害時間"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "すべての子に障害があった場合に障害として検知"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "子に一つでも障害があった場合に障害として検知"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "障害"
 
@@ -11256,75 +11604,71 @@ msgstr "障害"
 msgid "Profile"
 msgstr "プロファイル"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "プロトタイプ"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "プロキシ"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "ホスト\"%2$s\"のプロキシ\"%1$s\"は存在しません。"
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "プロキシ\"%1$s\"はディスカバリルール\"%2$s\"に利用されています。"
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "プロキシ\"%s\"はすでに存在します。"
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "プロキシを追加しました"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "プロキシを削除しました"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "プロキシ経由で監視するホスト"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "プロキシのインターフェース作成に失敗しました。"
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "プロキシのインターフェース更新に失敗しました。"
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "プロキシモード"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "プロキシ名"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "プロキシを更新しました"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "公開鍵"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11335,7 +11679,7 @@ msgstr "公開鍵ファイル"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "更新待ちアイテムのキュー"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "キュー"
 
@@ -11343,18 +11687,18 @@ msgstr "キュー"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "読込"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "読込専用"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "読書可能"
 
@@ -11366,19 +11710,19 @@ msgstr "理由"
 msgid "Received value"
 msgstr "受信した値"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
-msgstr ""
+msgstr "最近の障害"
 
 #: include/views/administration.auditacts.list.php:41
 msgid "Recipient"
 msgstr "送信先"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "受信者 (昇順)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "受信者 (降順)"
 
@@ -11389,28 +11733,28 @@ msgstr "受信者 (降順)"
 msgid "Recipient(s)"
 msgstr "送信先"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "復旧"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "リカバリメッセージ"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "復旧通知の件名"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "更新(秒)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr "リフレッシュ間隔"
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "リフレッシュ間隔の乗数"
 
@@ -11428,46 +11772,50 @@ msgstr "取得不可アイテムの更新間隔(秒) \"%1$s\"."
 msgid "Regular expression"
 msgstr "正規表現"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "正規表現\"%s\"はすでに存在します。"
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "最新(T秒前/T個前)の値が正規表現Vに一致する場合 N = 1、その他の場合 N = 0 (=条件)"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "最新(T秒前/T個前)の値が正規表現Vに一致する場合 N = 1、その他の場合 N = 0 (=条件、大文字小文字を区別しない)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "最新(T秒前/T個前)の値が正規表現Vに一致する場合 N = 1、その他の場合 N = 0 (#条件)"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "最新(T秒前/T個前)の値が正規表現Vに一致する場合 N = 1、その他の場合 N = 0 (#条件、大文字小文字を区別しない)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "正規表現を追加しました"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "正規表現を削除しました"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "正規表現は存在しません"
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr "正規表現は文字列で設定してください"
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "正規表現を更新しました"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11484,26 +11832,28 @@ msgstr "リモートコマンド"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11514,21 +11864,19 @@ msgstr "リモートコマンド"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "削除"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr "すべて削除"
 
@@ -11536,11 +11884,11 @@ msgstr "すべて削除"
 msgid "Remove element"
 msgstr "アイコンの削除"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "次から削除"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "お気に入りから削除"
@@ -11549,7 +11897,7 @@ msgstr "お気に入りから削除"
 msgid "Remove from host group"
 msgstr "ホストグループから削除"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "ホストグループから削除"
 
@@ -11561,28 +11909,28 @@ msgstr "ホストを削除"
 msgid "Remove link"
 msgstr "リンクの削除"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "選択を除去"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "置換"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr "アプリケーションを置換"
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "依存関係を置換"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "ホストグループを置換"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "レポート"
 
@@ -11590,35 +11938,36 @@ msgstr "レポート"
 msgid "Report 1"
 msgstr "レポート1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "レポート2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "レポート3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "レポート"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "要求文字列"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "アイコンのマッピングに必須フィールド\"条件式\"がありません。"
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "アイコンのマッピングに必須フィールド\"アイコンID\"がありません。"
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "アイコンのマッピングに必須フィールド\"インベントリリンク\"がありません。"
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "必要なホストへのアクセス権"
 
@@ -11626,29 +11975,31 @@ msgstr "必要なホストへのアクセス権"
 msgid "Required performance (vps)"
 msgstr "要求パフォーマンス (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr "Zabbixサーバーの要求パフォーマンスを1秒ごとに期待される新しい値で取得。"
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "1秒あたりの監視項目数(Zabbixサーバーの要求パフォーマンス)"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "要求ステータスコード"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "要求文字列"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "リセット"
 
@@ -11667,9 +12018,9 @@ msgstr "すべての名前と色をデフォルト値に戻しますか？"
 msgid "Reset confirmation"
 msgstr "リセットの確認"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11682,7 +12033,7 @@ msgstr "解決済"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "リソース"
@@ -11697,15 +12048,15 @@ msgstr "レスポンスタイム"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "結果"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "結果が偽"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "結果が真"
 
@@ -11718,7 +12069,8 @@ msgstr "\"%s\"の結果"
 msgid "Result type"
 msgstr "結果のタイプ"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr "リトライ"
 
@@ -11726,60 +12078,69 @@ msgstr "リトライ"
 msgid "Retries left"
 msgstr "リトライの残り回数"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr "ヘッダーのみを取得"
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "再試行"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr "ICMP pingの応答時間を秒で返却。例： 0.02"
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr "ホスト上の特定のチェック種別の稼働状況返却。このアイテムの値がホストリストの稼働状況アイコンに対応する。有効なtypes： agent, snmp, ipmi, jmx。"
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr "ホストの現在のメンテナンス状態を返却。"
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr "ホスト情報の詳細を返却。文字列値"
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr "ホスト名(Windows上ではデフォルトでNetBIOS名)を返却。文字列値。返却値例： www.zabbix.com"
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr "関連付けられているZabbix Java Gatewayの情報返却。有効なオプション：ping, version。"
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr "ICMP pingパケットのロスト率を返却。"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "右"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr "ルーマニア語 (ro_RO)"
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr "行を追加しました"
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr "行を削除しました"
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "行の結合"
 
@@ -11787,11 +12148,11 @@ msgstr "行の結合"
 msgid "Rows"
 msgstr "行"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "ページあたりの表示行数"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "ルール"
 
@@ -11813,7 +12174,7 @@ msgstr "コマンドを実行"
 
 #: include/actions.inc.php:479
 msgid "Run custom commands on Zabbix agent"
-msgstr "Zabbixエージェント城でカスタムコマンドを実行"
+msgstr "Zabbixエージェント上でカスタムコマンドを実行"
 
 #: include/actions.inc.php:482
 msgid "Run custom commands on Zabbix server"
@@ -11836,20 +12197,20 @@ msgid "Run remote commands on hosts"
 msgstr "ホストでリモートコマンドを実行"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr "ホスト上で指定したコマンドを実行。"
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "ロシア語 (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -11865,7 +12226,7 @@ msgstr "スクリーン"
 msgid "SEARCH"
 msgstr "検索"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "サーバー"
 
@@ -11880,13 +12241,13 @@ msgstr "SHA"
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "スライドショー"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11895,17 +12256,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "送信元メールアドレス"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTPサーバー"
@@ -11921,7 +12282,7 @@ msgstr "SNMPキー"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11933,9 +12294,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMPコミュニティ"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMPインターフェース"
@@ -11944,7 +12305,7 @@ msgstr "SNMPインターフェース"
 msgid "SNMP trap"
 msgstr "SNMPトラップ"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "SNMPトラップのキーが正しくありません。"
 
@@ -11968,7 +12329,7 @@ msgstr "SNMPv3エージェント"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "SQLカウント: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -11986,7 +12347,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQLの実行に失敗しました\"%1$s\"。"
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -11995,15 +12356,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSHエージェント"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr "SSL証明書ファイル"
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr "SSL秘密鍵ファイル"
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr "SSL秘密鍵パスワード"
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr "SSLホスト検証"
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr "SSLピア検証"
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "ディスカバリのステータス"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "トリガーのステータス"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "Web監視のステータス"
 
@@ -12011,92 +12392,92 @@ msgstr "Web監視のステータス"
 msgid "STATUS OF ZABBIX"
 msgstr "Zabbixサーバーの状態"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "土"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "土曜"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "保存"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "保存して戻る"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "横軸の目盛"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "シナリオ"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "シナリオを追加しました"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "シナリオを更新しました"
 
@@ -12108,7 +12489,7 @@ msgstr "シナリオ"
 msgid "Schedule"
 msgstr "スケジュール"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr "スケジュールされたチェック時刻"
 
@@ -12119,126 +12500,125 @@ msgstr "スケジュールされたチェック時刻"
 msgid "Screen"
 msgstr "スクリーン"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "スクリーン\"%1$s\"を追加しました。"
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "スクリーン\"%1$s\"はテンプレート\"%2$2\"にすでに存在します。"
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "スクリーン\"%1$s\"はすでに存在します。"
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr "スクリーン\"%1$s\"のセル X - %2$s Y - %3$s は既に使用されています。"
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr "スクリーン\"%1$s\"のセル X - %2$s Y - %3$s 内の列の結合が正しくありません。"
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr "スクリーン\"%1$s\"のセル X - %2$s Y - %3$s の列の幅が大きすぎます。"
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr "スクリーン\"%1$s\"のセル X - %2$s Y - %3$s の行の結合が正しくありません。"
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr "スクリーン\"%1$s\"のセル X - %2$s Y - %3$s の行の高さが大きすぎます。"
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "スクリーン\"%1$s\"はスキップされました - ユーザの指定。"
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "スクリーン\"%1$s\"を更新しました。"
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "スクリーンを追加しました"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "スクリーンセルの設定"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "スクリーンを削除しました"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "スクリーンは少なくとも1つ以上の行か列を設定する必要があります。"
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "スクリーンを更新しました"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "スクリーン"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "スクリプト"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "スクリプト\"%1$s\"はすでに存在します。"
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "スクリプトを追加しました"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "スクリプトを削除しました"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr "スクリプトのメニューパス\"%1$s\"はスクリプト名\"%2$s\"にすでに利用されています。"
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "スクリプト名"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr "スクリプト名\"%1$s\"はスクリプト\"%2$s\"のメニューパスにすでに利用されています。"
@@ -12247,17 +12627,17 @@ msgstr "スクリプト名\"%1$s\"はスクリプト\"%2$s\"のメニューパ�
 msgid "Script profiler"
 msgstr "スクリプトプロファイラ"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "スクリプトを更新しました"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr "スクリプトID\"%1$s\"は存在しません。"
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "スクリプト"
 
@@ -12278,7 +12658,7 @@ msgstr "検索パターンが空白です"
 msgid "Search/Filter elements limit"
 msgstr "検索/フィルターの項目の上限値"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "第2週"
 
@@ -12310,7 +12690,7 @@ msgstr "セカンダリPOC電話番号B"
 msgid "Secondary POC screen name"
 msgstr "セカンダリPOCスクリーン名"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "秒"
 
@@ -12329,69 +12709,76 @@ msgstr "セキュリティレベル"
 msgid "Security name"
 msgstr "セキュリティ名"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "選択"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "プロトタイプの選択"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "次の値が含まれる行を表示"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "選択"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "選択したアクションを削除しました"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "選択した要素"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "選択したグループ"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "選択したホスト"
 
@@ -12407,7 +12794,7 @@ msgstr "ユーザーグループにメッセージを送信"
 msgid "Send message to users"
 msgstr "ユーザーにメッセージを送信"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "次のメディアのみ使用"
 
@@ -12415,11 +12802,11 @@ msgstr "次のメディアのみ使用"
 msgid "Send to"
 msgstr "送信先"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "ユーザーグループに送信"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "ユーザーに送信"
 
@@ -12428,17 +12815,17 @@ msgstr "ユーザーに送信"
 msgid "Sent"
 msgstr "送信済"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "9月"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "障害数と未対応数を表示"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "9月"
 
@@ -12450,7 +12837,7 @@ msgstr "シリアル番号A"
 msgid "Serial number B"
 msgstr "シリアル番号B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "サーバー"
@@ -12459,44 +12846,44 @@ msgstr "サーバー"
 msgid "Server info"
 msgstr "サーバー情報"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "サーバー時間"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "サービス"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr "サービス\"%1$s\""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "サービス\"%1$s\"は削除できません。他のサービスからの依存関係があります。"
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "サービス\"%1$s\"は自分自身に依存できません。"
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "サービス\"%1$s\"はトリガーへのリンクと子を持つことを同時にできません。"
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "サービス\"%1$s\"は既に他のサービスにハードリンクされています。"
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "サービスは同時に親と子になることはできません"
 
@@ -12512,11 +12899,11 @@ msgstr "サービスを削除しました"
 msgid "Service port"
 msgstr "サービスのポート"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "サービス開始時刻は終了時刻よりも前でなければなりません。"
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "サービスタイム"
 
@@ -12528,49 +12915,52 @@ msgstr "サービスのタイプ"
 msgid "Service updated"
 msgstr "サービスを更新しました"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "サービス"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "サービスの依存関係が循環設定されています。"
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "セッションが切断されました。再度ログインしてください。"
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "深刻度"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "深刻度(降順)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "深刻度を設定してください。"
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "表示"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "すべて表示"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] "すべて表示 (%1$s日)"
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "詳細を表示"
 
@@ -12600,35 +12990,36 @@ msgstr "イベントの表示期間(日)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "イベントの表示期間(日) \"%1$s\""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
-msgstr ""
+msgstr "フィルターの表示"
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "メンテナンス中のホストを表示"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "次の文字列を含むアイテムを表示"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "ヒストリがないアイテムを表示"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "凡例を表示"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "表示する行数"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "選択を表示"
 
@@ -12636,19 +13027,21 @@ msgstr "選択を表示"
 msgid "Show selected groups"
 msgstr "選択したグループを表示"
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "HTMLとしてテキストを表示"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "トリガーを表示"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "未対応を表示"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] "未対応を表示 (%1$s日)"
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "値のマッピングの使用"
@@ -12657,11 +13050,11 @@ msgstr "値のマッピングの使用"
 msgid "Show warning if Zabbix server is down"
 msgstr "Zabbixサーバー停止時にワーニングを表示"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "ワーキングタイムの表示"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "表示"
 
@@ -12681,6 +13074,10 @@ msgstr "シンプルチェック"
 msgid "Simple graph"
 msgstr "シンプルグラフ"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr "シンプルグラフのプロトタイプ"
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "郵便番号"
@@ -12718,7 +13115,7 @@ msgid "Site state / province"
 msgstr "県"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr "指定されたファイルのサイズ。サイズはバイト単位。ファイルはzabbixユーザーでの読み取り権限が必要。例： vfs.file.size[/var/log/syslog]"
 
@@ -12736,16 +13133,16 @@ msgstr "ホスト\"%2$s\"へのグラフ\"%1$s\"のコピーをスキップし�
 msgid "Slide"
 msgstr "スライド"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "スライドショー"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr "スライドショー\"%1$s\"はすでに存在します。"
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "スライドショー\"%s\"はすでに存在します。"
@@ -12754,11 +13151,11 @@ msgstr "スライドショー\"%s\"はすでに存在します。"
 msgid "Slide show added"
 msgstr "スライドショーを追加しました"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "スライドショーを削除しました"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "スライドショーには必ずスライドを設定してください"
 
@@ -12766,10 +13163,10 @@ msgstr "スライドショーには必ずスライドを設定してください
 msgid "Slide show updated"
 msgstr "スライドショーを更新しました"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "スライドショー"
 
@@ -12777,15 +13174,15 @@ msgstr "スライドショー"
 msgid "Slides"
 msgstr "スライド"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "スロバキア語 (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "スヌーズ"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "ソフト"
 
@@ -12818,28 +13215,28 @@ msgid "Software application E"
 msgstr "ソフトウェアアプリケーションE"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr "ソフトウェアアーキテクチャー"
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr "ソフトウェアパッケージリスト - デフォルトですべてのパッケージマネージャーをサポートしてパッケージの全リストを返却"
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "次によるソート"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
-msgstr ""
+msgstr "次による項目のソート"
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "ソート順(0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "次によるトリガーのソート"
 
@@ -12852,11 +13249,11 @@ msgstr "フィールド\"%1$s\"による並べ替えは許可されていませ�
 msgid "Source"
 msgstr "ソース"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "スペイン語(es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "実行するアクションのコマンドで指定されたスクリプトが存在しないか、権限がありません。"
 
@@ -12864,63 +13261,63 @@ msgstr "実行するアクションのコマンドで指定されたスクリプ
 msgid "Speed"
 msgstr "スピード"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "積算グラフ"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "標準のアイテム"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "開始時刻"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr "Zabbixサーバーの起動時刻、UNIXタイムスタンプ。"
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "ステータス"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr "サービスの状態。0 - 実行中、1 - 一時停止中、2 - 開始待ち、3 - 一時停止待ち、4 - 続行待ち、5 - 停止待ち、6 - 停止、7 - 不明、255 - 該当サービスなし"
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "ステータス"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "ステータス (昇順)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "ステータス (降順)"
 
@@ -12933,7 +13330,7 @@ msgstr "ステータスの計算"
 msgid "Status calculation algorithm"
 msgstr "ステータス計算アルゴリズム"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "ステータスコード"
 
@@ -12942,7 +13339,7 @@ msgid "Status of Web monitoring"
 msgstr "Web監視のステータス"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Zabbixサーバーの状態"
 
@@ -12959,40 +13356,40 @@ msgid "Status only"
 msgstr "ステータスのみ"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "ステップ"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "ステップ\"%1$s\" [%3$sの%2$s] 失敗: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "ステップの間隔"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "シナリオのステップ"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr "\"%1$s\"の名前を持つステップがすでに存在します。"
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "ステップ"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "停止"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "保存時の計算"
@@ -13001,11 +13398,11 @@ msgstr "保存時の計算"
 msgid "Straight"
 msgstr "Straight"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "スタイル"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "サブフィルター [フィルターされたデータにのみ影響します！]"
 
@@ -13013,11 +13410,11 @@ msgstr "サブフィルター [フィルターされたデータにのみ影響�
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "件名"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "サブマップ"
 
@@ -13026,32 +13423,32 @@ msgid "Success Audit"
 msgstr "成功の監査"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr "ネットワークインターフェースの入出力統計の総計。整数値。mode - bytes(デフォルト), packets, errors, dropped。"
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "期間Tの値の合計値 < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "期間Tの値の合計値 = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "期間Tの値の合計値 > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "期間Tの値の合計値 NOT N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "日"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "日曜"
 
@@ -13059,27 +13456,27 @@ msgstr "日曜"
 msgid "Support"
 msgstr "サポート"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "名字"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr "スワップイン。typeにcountを指定 - swapinsを返却。typeにpagesを指定 - ページ単位のスワップインを返却。"
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr "スワップアウト。typeにcountを指定 - swapoutsを返却。typeにpagesを指定 - ページ単位のスワップアウトを返却。"
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr "スワップ領域。バイト数もしくはパーセンテージ。"
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "スウェーデン語 (sv_SE)"
 
@@ -13087,16 +13484,16 @@ msgstr "スウェーデン語 (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "認証方式の変更を行うと現在のセッション以外はリセットされます実行しますか？"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "システムデフォルト"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "システムエラー。"
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr "システムのローカル時刻。"
 
@@ -13105,21 +13502,21 @@ msgid "System status"
 msgstr "システムステータス"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr "システムの稼働秒数。"
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -13138,11 +13535,11 @@ msgid "TOTAL"
 msgstr "合計"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "トリガーのコメント"
+msgid "TRIGGER DESCRIPTION"
+msgstr "トリガーの説明"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "真"
 
@@ -13160,14 +13557,14 @@ msgstr "テーブル\"%1$s\"にフィールド名\"%2$s\"が存在しません�
 msgid "Tag"
 msgstr "タグ"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "ターゲット"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "ターゲットリスト"
 
@@ -13176,130 +13573,133 @@ msgid "Target type"
 msgstr "ターゲットタイプ"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "テンプレート"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "テンプレート\"%1$s\"はそでに存在します。"
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "ホスト\"%2$s\"のテンプレート\"%1$s\"は存在しません。"
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr "キー\"%2$s\"を持つアイテムを含むテンプレート\"%1$s\"がすでにホストにリンクされています。"
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "テンプレートを追加しました"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "テンプレートは複数のテンプレートとリンクすることはできません(他のテンプレート経由でも不可)。"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "テンプレートを削除しました"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "テンプレートグループ"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "テンプレートのリンク"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "テンプレートリスト"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "テンプレート名"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr "テンプレートスクリーン\"%1$s\"がすでに存在します。"
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "テンプレートスクリーン"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "テンプレートトリガー"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "テンプレートを更新しました"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr "同じ名前\"%1$s\"を持つテンプレートがすでに存在します。"
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "同じ名前\"%s\"を持つテンプレートがすでに存在します。"
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr "同じ表示名\"%1$s\"を持つテンプレートがすでに存在します。"
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "同じ表示名\"%s\"を持つテンプレートがすでに存在します"
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "テンプレートのアイテム"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "テンプレート"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "テンプレート\"%1$s\"とホスト\"%2$s\"のリンクを削除しました。"
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "テラ"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "テスト"
 
@@ -13307,11 +13707,11 @@ msgstr "テスト"
 msgid "Test authentication"
 msgstr "認証のテスト"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "テストの確認"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "テストデータ"
 
@@ -13325,22 +13725,22 @@ msgid "Test string"
 msgstr "テスト文字列"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "テキスト"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
-msgstr ""
+msgstr "メソッド\"%1$s.%2$s\"は\"auth\"パラメータなしで呼び出してください。"
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr "スクリーン\"%3$s\"のX - %1$s Y - %2$sにあるスクリーンの要素のX座標が大きすぎます。"
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr "スクリーン\"%3$s\"のX - %1$s Y - %2$sにあるスクリーンの要素のY座標が大きすぎます。"
@@ -13348,7 +13748,7 @@ msgstr "スクリーン\"%3$s\"のX - %1$s Y - %2$sにあるスクリーンの�
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "WebインターフェースがZabbixデータベースと互換性がありません。"
@@ -13363,24 +13763,24 @@ msgstr "WebインターフェースがZabbixデータベースと互換性があ
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "ホストグループが発見されなくなったため%1$sに削除されます。 (日時 %2$s at %3$s)"
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "ホストが発見されなくなったため%1$sに削除されます。 (日時 %2$s at %3$s)"
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "イメージはアイコンのマッピング%1$sに利用されています。"
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] "イメージはマップ%1$sに利用されています。"
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "アイテムが発見されなくなったため%1$sに削除されます。(日時 %2$s %3$s)"
@@ -13389,19 +13789,19 @@ msgstr "アイテムが発見されなくなったため%1$sに削除されま�
 msgid "The queue is empty."
 msgstr "アイテムの遅延はありません。"
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "受信したJSONは正しくないJSON-RPCリクエストです。"
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "受信したリモートプロシージャーは存在しないか利用することができません。"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr "Webシナリオが設定されているホストと異なるホストに所属するアプリケーションが利用されています。"
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "テーマ"
 
@@ -13411,11 +13811,11 @@ msgid "There is \"%1$d\" group with Internal GUI access."
 msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "GUIアクセスの権限があるグループが%1$dつあります。"
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "第3週"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "このフィールドはアイテム\"%s\"によって自動的に設定されます。"
@@ -13424,11 +13824,11 @@ msgstr "このフィールドはアイテム\"%s\"によって自動的に設定
 msgid "This month"
 msgstr "今月"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "スクリーンの列は空ではありません。削除しますか？"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "スクリーンの行は空ではありません。削除しますか？"
 
@@ -13440,27 +13840,27 @@ msgstr "今週"
 msgid "This year"
 msgstr "今年"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "木"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "木曜"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "終了"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13469,28 +13869,28 @@ msgstr "終了"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "時間"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "時間 (昇順)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "時間 (降順)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr "特定のZabbixのプロセスもしくはプロセスグループ(<type>や<num>で特定できるもの)が<state>で消費している時間のパーセンテージ。"
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr "プロキシへの最終アクセス時刻。name - プロキシ名、param - lastaccess。UNIXタイムスタンプ。"
 
@@ -13498,54 +13898,54 @@ msgstr "プロキシへの最終アクセス時刻。name - プロキシ名、pa
 msgid "Time period"
 msgstr "期間"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "タイムシフト"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "時間の形式"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr "PHPのタイムゾーンが設定されていません (\"date.timezone\"設定パラメータ)。"
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "タイムアウト"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "タイムスタンプ"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "タイムスタンプがZabbixサーバーの時刻とT秒以上の差がある場合 N = 1、その他の場合 N =0 (=条件)"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "タイムスタンプがZabbixサーバーの時刻とT秒以上の差がある場合 N = 1、その他の場合 N =0 (#条件)"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr "システムブート時刻。"
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "タイトル"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "終了"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "すべてのアイテムのため1つのホストインターフェースを選択する必要があります"
 
@@ -13553,17 +13953,18 @@ msgstr "すべてのアイテムのため1つのホストインターフェー�
 msgid "Today"
 msgstr "今日"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "上"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "合計"
 
@@ -13581,7 +13982,7 @@ msgstr "トータル時間: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "トランザクションがクローズされていません。終了します..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "転送エラー。"
 
@@ -13598,90 +13999,90 @@ msgstr "トレンドデータ保存期間(日) \"%1$s\"。"
 msgid "Trend storage period"
 msgstr "トレンド保存期間"
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr "トレンド保存期間 (日)"
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "トレンド"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "トリガー"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "トリガー\"%1$s\"は\"%2$s\"にすでに存在します。"
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "トリガー\"%1$s\"は存在しないトリガー\"%2$s\"に依存しています。"
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "トリガー\"%1$s\"はスキップされました - ユーザの指定。"
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "トリガー\"%s\"はリンクされている他のテンプレートに含まれています"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "トリガーを追加しました"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr "トリガーは自身を継承したトリガーと依存関係を持つことはできません。"
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "トリガーのコメント"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr "トリガーデータ保存期間(日)"
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "トリガーを削除しました"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr "トリガーの説明"
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] "トリガーを無効にしました"
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "トリガー表示オプション"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] "トリガーを有効にしました"
@@ -13695,11 +14096,12 @@ msgstr "トリガーイベントとアラートのデータ保存期間"
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr "トリガーイベントとアラートのデータ保存期間 (日) \"%1$s\"。"
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "トリガー条件式の状態"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "トリガー条件式には少なくとも1つ以上のホストとアイテムのキーを設定する必要があります。"
 
@@ -13707,7 +14109,7 @@ msgstr "トリガー条件式には少なくとも1つ以上のホストとア�
 msgid "Trigger form"
 msgstr "トリガーフォーム"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "トリガーはホストにリンクされていないテンプレート\"%1$s\"に含まれるアイテムを利用しています。"
@@ -13720,12 +14122,12 @@ msgstr "トリガーが\"通常\"の状態"
 msgid "Trigger in \"unknown\" state"
 msgstr "トリガーが\"不明\"の状態"
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "テンプレート\"%1$s\"のトリガーはテンプレート\"%2$s\"のトリガーと依存関係が設定されています。"
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "トリガーは追加されたばかりです。現在までステータスが更新されていません。"
 
@@ -13737,50 +14139,50 @@ msgstr "トリガーラベルタイプ"
 msgid "Trigger name"
 msgstr "トリガー名"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "トリガーのプロトタイプ"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr "トリガーのプロトタイプ\"%1$s\"に複数のディスカバリルールからのアイテムのプロトタイプが含まれています。"
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr "トリガーのプロトタイプ\"%1$s\"は少なくとも1つ以上のアイテムのプロトタイプを設定する必要があります。"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr "トリガーのプロトタイプを追加しました"
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr "トリガーのプロトタイプを削除しました"
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] "トリガーのプロトタイプを無効にしました"
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] "トリガーのプロトタイプを有効にしました"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr "トリガーのプロトタイプを更新しました"
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "トリガーのプロトタイプ"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr "トリガーのプロトタイプを削除しました"
 
@@ -13788,23 +14190,31 @@ msgstr "トリガーのプロトタイプを削除しました"
 msgid "Trigger prototypes of"
 msgstr "トリガーのプロトタイプ:"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr "トリガーのプロトタイプを更新しました"
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "トリガーの深刻度"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "トリガーの深刻度"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr "トリガーのステータス \"正常\""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr "トリガーのステータス \"障害\""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "トリガーを更新しました"
 
@@ -13812,40 +14222,41 @@ msgstr "トリガーを更新しました"
 msgid "Trigger value"
 msgstr "トリガーの値"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "トリガー"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr "トリガー数 (有効/無効)[障害/正常]"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "トリガーを削除しました"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "トリガー情報"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "トリガーの一括更新"
 
@@ -13853,78 +14264,78 @@ msgstr "トリガーの一括更新"
 msgid "Triggers overview"
 msgstr "トリガーの概要"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "トリガーのステータス"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "障害発生数上位100項目"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "表示するトリガーの深刻度"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Truncated"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "アクセスできないプロパティ\"%s\"を参照しようとしています。"
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "火"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "火曜"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "トルコ語 (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "2つの要素を選択する必要があります"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "2つのアイテム(\"%1$s\"と\"%2$s\")から1つのホストのインベントリフィールド\"%3$s\"を自動的に設定することはできません。"
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "タイプ"
 
@@ -13932,62 +14343,64 @@ msgstr "タイプ"
 msgid "Type (Full details)"
 msgstr "タイプ(詳細)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "タイプ (正常)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "タイプ (昇順)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "タイプ (降順)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "計算のタイプ"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "データ型"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "logキーを利用する場合はデータ型を\"ログ\"に設定してください。"
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "Zabbixアグリゲートを利用する場合はデータ型を\"数値(浮動小数)\"に設定してください。"
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "タイプ"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "UP"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "ログイン後のURL"
 
@@ -14003,20 +14416,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr "URLの名前はマップ\"%s\"上で重複できません。"
+
+#: include/html.inc.php:112
 msgid "URL parameter cannot be array."
 msgstr "URLパラメータに配列は利用できません。"
 
-#: include/html.inc.php:112
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr "URLパラメータが設定されていません。"
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr "マップ\"%s\"上のURLは名前とURLの両方を設定する必要があります。"
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URL"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160文字)"
 
@@ -14024,15 +14447,11 @@ msgstr "USA (160文字)"
 msgid "USER PROFILE"
 msgstr "ユーザープロファイル"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "ウクライナ語 (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "選択した設定は行えません"
 
@@ -14040,7 +14459,7 @@ msgstr "選択した設定は行えません"
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "\"file_uploads\"が無効のためファイルをアップロードできません。"
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "未対応"
 
@@ -14053,20 +14472,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "未対応の障害イベント"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "障害対応コメント未入力のみ"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
-msgstr ""
+msgstr "ユーザーに%1$sは利用できません。"
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "選択したユーザーのブロックを解除"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "選択したユーザーのブロックを解除しますか？"
 
@@ -14075,29 +14494,29 @@ msgstr "選択したユーザーのブロックを解除しますか？"
 msgid "Units"
 msgstr "単位"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14107,23 +14526,20 @@ msgstr "不明"
 msgid "Unknown action"
 msgstr "不明なアクション"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "不明なサービスの計算アルゴリズム"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
-msgstr ""
+msgstr "不明なエラー"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "不明な関数。"
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "不明なアイテム。選択したホストにそのようなアイテムは存在しません"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "不明なホスト。そのようなホストは存在しません"
 
@@ -14135,23 +14551,23 @@ msgstr "不明なインターフェースのタイプ。"
 msgid "Unknown resource"
 msgstr "不明なリソース"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
-msgstr ""
+msgstr "不明なステップ失敗: %1$s"
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "不明な値のタイプ"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "リンクを削除"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "リンクと保存データを削除"
 
@@ -14159,61 +14575,61 @@ msgstr "リンクと保存データを削除"
 msgid "Unlink from template"
 msgstr "テンプレートとのリンクを解除"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "テンプレートとのリンクを解除"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のアプリケーション\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のディスカバリルール\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のグラフ\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のグラフのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のホストのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のアイテム\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のアイテムのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のトリガー\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のトリガーのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "リンク削除: \"%2$s\"のWebシナリオ\"%1$s\"。"
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "ミュートを解除"
 
@@ -14227,32 +14643,43 @@ msgstr "インポートファイルの拡張子\"%1$s\"はサポートされて�
 msgid "Unsupported import format \"%1$s\"."
 msgstr "インポートフォーマット\"%1$s\"はサポートされていません。"
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr "グループのプロトタイプではパラメータ\"%1$s\"は利用できません。"
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr "アクション\"%1$s\"のフィルター条件ではパラメータ\"%2$s\"は利用できません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルター条件ではパラメータ\"%2$s\"はサポートされていません。"
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr "ホストのプロトタイプ\"%1$s\"ではパラメータ\"%2$s\"は利用できません。"
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr "ホストのプロトタイプ%1$sのホストインベントリではパラメータ\"%2$s\"は利用できません。"
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr "アクション\"%1$s\"のフィルターではパラメータ\"%2$s\"は利用できません。"
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ディスカバリルール\"%1$s\"のフィルターではパラメータ\"%2$s\"はサポートされていません。"
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Up"
@@ -14263,34 +14690,34 @@ msgid "Up"
 msgstr "Up"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "更新"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "既存の設定を上書"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "更新間隔"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "更新間隔(秒)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "更新"
 
@@ -14298,55 +14725,55 @@ msgstr "更新"
 msgid "Updated status of host"
 msgstr "ホストのステータスを更新しました"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "更新時刻: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "更新: \"%2$s\"のアプリケーション\"%1$s\"。"
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "更新: \"%2$s\"のディスカバリルール\"%1$s\"。"
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "更新: \"%2$s\"のホストのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "更新: \"%2$s\"のアイテム\"%1$s\"。"
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "更新: \"%2$s\"のアイテムのプロトタイプ\"%1$s\"。"
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "更新: \"%2$s\"のトリガー\"%1$s\"。"
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "更新: \"%2$s\"のトリガーのプロトタイプ\"%1$s\"。"
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "更新: \"%2$s\"のWebシナリオ\"%1$s\"。"
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "アップロード"
 
@@ -14354,14 +14781,14 @@ msgstr "アップロード"
 msgid "Upper level maps"
 msgstr "上位レベルのマップ"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "アップタイム"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr "Zabbixサーバープロセスの稼働秒数。"
 
@@ -14369,10 +14796,10 @@ msgstr "Zabbixサーバープロセスの稼働秒数。"
 msgid "Uptime/Downtime"
 msgstr "アップタイム/ダウンタイム"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "URL"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr "bulkリクエストを利用"
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14387,83 +14814,87 @@ msgid "Used in actions"
 msgstr "アクションで利用"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "ユーザー"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "ユーザー\"%s\"にユーザーグループを設定してください。"
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "ユーザーを追加しました"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "ユーザーは自身のユーザータイプを変更できません"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "ユーザーは無効のグループやGUIアクセスが無効のグループに自分自身を追加できません。"
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "ユーザーは自分自身のGUIアクセスを変更できません。"
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "ユーザーは自分自身のステータスを変更できません"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "ユーザーは自分自身のステータスを変更できません。"
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "ユーザーを削除しました"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "ユーザーグループ"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr "ユーザーグループ\"%1$s\"はすでに存在します。"
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr "ユーザーグループ\"%1$s\"はユーザー\"%2$s\"が所属する唯一のグループです。"
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "ユーザーグループ\"%1$s\"はデータベース停止メッセージの設定に利用されています。"
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "ユーザーグループ\"%1$s\"はスクリプト\"%2$s\"に利用されています。"
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "ユーザーグループ\"%s\"はすでに存在します。"
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] "ユーザーグループを無効にしました"
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] "ユーザーグループを有効にしました"
@@ -14479,34 +14910,34 @@ msgstr "データベース停止メッセージ\"%1$s\"の送信先グループ�
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "ユーザーグループ"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "自身のユーザーアカウントは削除できません。"
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "ユーザーはグループ\"%s\"のメンバーになることにより自分自身のWebインターフェースへのアクセス設定を変更することはできません。"
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "ユーザーはグループ\"%s\"のメンバーになることにより自分自身のシステムステータスを変更することはできません。"
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "ユーザー名"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "ユーザー名がデータベースと一致しません"
 
@@ -14532,243 +14963,243 @@ msgstr "ユーザーセッションデータ保存期間(日) \"%1$s\"。"
 msgid "User sessions"
 msgstr "ユーザーセッション"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "ユーザーの種類"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "ユーザーを更新しました"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "アカウント名\"%s\"を持つユーザーがすでに存在します。"
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "ユーザー名"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "ユーザー"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "ユーザー数 (オンライン)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "ユーザーのブロックを解除しました"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr "VMwareのキャッシュ統計。利用可能なモード：total, free, pfree, used, pused。"
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr "VMwareクラスターの状態、<url> - VMwareサービスURL、<name> - VMwareクラスター名"
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr "VMwareのイベントログ、<url> - VMwareサービスURL"
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのBIOS uuid、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのバルーニングされたメモリサイズ、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのクラスター名、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr "VMwareハイパーバイザーのデータストア読み込み統計、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名、<datastore> - データストア名、<mode> - latency"
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr "VMwareハイパーバイザーのデータストア書き込み統計、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名、<datastore> - データストア名、<mode> - latency"
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのモデル、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザー名、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr "VMwareハイパーバイザーネットワーク入力統計、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名、<mode> - bps"
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr "VMwareハイパーバイザーネットワーク出力統計、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名、<mode> - bps"
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのプロセッサー周波数、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのプロセッサーモデル、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのプロセッサー利用量(Hz)、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのステータス、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーのトータルメモリサイズ、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーの稼働秒数、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーの利用済メモリサイズ、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーベンダー名、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMwareハイパーバイザーバージョン、<url> - VMwareサービスURL、<uuid> - VMwareハイパーバイザーホスト名"
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr "VMwareサービスフルネーム、<url> - VMwareサービスURL"
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr "VMwareサービスバージョン、<url> - VMwareサービスURL"
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMwareバーチャルマシンのバルーニングされたメモリサイズ、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンのコミットされたストレージ容量、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンの圧縮されたメモリサイズ、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr "VMware仮想マシンのディスクデバイスの読み込み統計、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名、<instance> - ディスクデバイスインスタンス、<mode> - bps/ops - 毎秒のバイト/オペレーション"
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr "VMware仮想マシンのディスクデバイスの書き込み統計、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名、<instance> - ディスクデバイスインスタンス、<mode> - bps/ops - 毎秒のバイト/オペレーション"
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr "VMware仮想マシンのファイルシステム統計、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名、<fsname> - ファイルシステム名、<mode> - total/free/used/pfree/pused"
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンのゲストのメモリ利用量、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンのホストのメモリ利用量、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンハイパーバイザー名、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシン名、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr "VMware仮想マシンネットワークインターフェース入力統計、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名、<instance> - ネットワークインターフェースインスタンス、<mode> - bps/pps - 毎秒バイト/パケット"
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr "VMware仮想マシンネットワークインターフェース出力統計、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名、<instance> - ネットワークインターフェースインスタンス、<mode> - bps/pps - 毎秒バイト/パケット"
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシン電源状態、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンプライベートメモリサイズ、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンのプロセッサ利用量(Hz)、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンの共有メモリサイズ、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンのスワップされたメモリサイズ、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンのトータルメモリサイズ、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンのコミットされていないストレージ容量、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンの共有していないストレージの容量、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware仮想マシンの稼働秒数、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンホスト名"
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "値"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "パラメータ\"grid_align\"の値\"%1$s\"が正しくありません。\"%2$s\"または\"%3$s\"を設定してください。"
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr "パラメータ\"grid_show\"の値\"%1$s\"が正しくありません。\"%2$s\"または\"%3$s\"を設定してください。"
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "パラメータ\"grid_show\"の値\"%1$s\"が正しくありません。\"%2$s\"を設定してください。"
@@ -14786,28 +15217,28 @@ msgstr "フィールド\"%2$s\"の値\"%1$s\"が長過ぎます - %3$d文字。2
 #: include/validate.inc.php:326 include/validate.inc.php:350
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has incorrect decimal format."
-msgstr ""
+msgstr "\"%1$s\"の値\"%2$s\"は10進数のフォーマットではありません。"
 
 #: include/validate.inc.php:336 include/validate.inc.php:352
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits after the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "\"%1$s\"の値\"%2$s\"は小数点以下の桁数が多すぎます: %3$s桁を超える値は設定できません。"
 
 #: include/validate.inc.php:332
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits before the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "\"%1$s\"の値\"%2$s\"は小数点より前の桁数が多すぎます: %3$s桁を超える値は設定できません。"
 
 #: include/validate.inc.php:328
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
-msgstr ""
+msgstr "\"%1$s\"の値\"%2$s\"は長すぎます: 小数点より前は%3$s桁までで小数点以下は%4$sまでです。"
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr "値キャッシュの効果。有効なパラメータ：requests, hits, misses。"
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr "値キャッシュ統計。有効なパラメータ：total, free, pfree, used, pused。"
 
@@ -14853,10 +15284,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "ID \"%1$s\"を持つ値のマッピング設定は存在しません。"
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "値のマッピング"
 
@@ -14865,7 +15296,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "値のマッピングは少なくとも1つ以上のマッピング設定を行う必要があります。"
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr "任意のパフォーマンスカウンター値、\"counter\"パラメータはカウンターのパス、\"interval\"パラメータは直近の秒数、それぞれのエージェントは平均値を返却する。"
 
@@ -14877,8 +15308,8 @@ msgstr "値: データなし"
 msgid "Values"
 msgstr "値"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "変数"
 
@@ -14891,64 +15322,69 @@ msgid "Verbose"
 msgstr "Verbose"
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr "監視対象ホスト上で稼働しているZabbixエージェントのバージョン。文字列値。 返却値例：2.2"
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "縦"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "縦位置"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr "ベトナム語 (vi_VN)"
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "ビューは描画されませんでした。"
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr "仮想メモリステータス。"
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "表示名"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "ホスト名を設定しない場合、表示名は必須項目です。"
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "警告"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr "警告"
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "要素を保存できる最大値に達しました"
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -14956,63 +15392,81 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web監視"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr "Webシナリオ\"%1$s\"はホスト\"%2$s\"にすでに存在します。"
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Webシナリオ\"%1$s\"はすでに存在します。"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Webシナリオを削除しました"
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Webシナリオを無効にしました"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Webシナリオを有効にしました"
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr "Webシナリオに%1$sが設定されていません"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr "Webシナリオは少なくとも1つ以上のステップが設定されている必要があります。"
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr "Webシナリオの名前は必須項目です。"
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr "Webシナリオにステップ\"%1$s\"がすでに存在します。"
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr "WebシナリオのステップのURLは必須項目です。"
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr "Webシナリオのステップの名前は必須項目です。"
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr "Webシナリオのステップ名には表示可能な文字のみ使用できます。"
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr "Webシナリオのステップ数は1以下にはできません。"
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Webシナリオ"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "水"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "水曜"
 
@@ -15020,9 +15474,9 @@ msgstr "水曜"
 msgid "Week"
 msgstr "週"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "毎週"
 
@@ -15030,12 +15484,12 @@ msgstr "毎週"
 msgid "When active"
 msgstr "有効な時間帯"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "幅"
@@ -15045,28 +15499,28 @@ msgstr "幅"
 msgid "With data collection"
 msgstr "データ収集あり"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "コメント未入力の最新のイベント"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "障害あり"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "トリガーあり"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "コメント未入力のイベント"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "障害なし"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "トリガーなし"
 
@@ -15075,7 +15529,7 @@ msgid "Wizard"
 msgstr "ウィザード"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15088,180 +15542,165 @@ msgstr "ワーキングタイム"
 msgid "Working time \"%1$s\"."
 msgstr "ワーキングタイム\"%1$s\"。"
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "書込"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "サービス\"%1$s\"の依存関係のフィールドが正しくありません。"
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "要素の設定が正しくありません。"
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "ホスト\"%s\"の設定が正しくありません。"
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr "イメージ\"%1$s\"のフィールドが正しくありません。"
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr "イメージのフィールドが正しくありません。"
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr "リンクトリガー削除の設定が正しくありません。"
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr "リンクトリガー更新の設定が正しくありません。"
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr "リンクトリガーの設定が正しくありません。"
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "マクロ\"%1$s\"の設定が正しくありません。"
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr "マップリンクの設定が正しくありません。"
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "メディアタイプの設定が正しくありません。"
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr "プロキシ\"%1$s\"の設定が正しくありません。"
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "スクリプトの設定が正しくありません。"
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "サービス\"%1$s\"の設定が正しくありません。"
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "サービス\"%1$s\"のための時間の設定が正しくありません。"
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "トリガーの設定が正しくありません。"
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "ユーザー\"%s\"の設定が正しくありません"
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "正しくないマクロ \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Xラベル"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XMLファイルにエラーが含まれています %1$s"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XMLファイルにエラーが含まれています"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XMLファイルに致命的なエラーが含まれています %1$s"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XMLファイルにワーニングが含まれています %1$s"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Y軸の最大値"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y軸の最大値はY軸の最小値よりも大きな値を設定してください。"
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Y軸の最小値"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Y軸"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Yラベル"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y/m/d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y/m/d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr "Y/m/d"
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr "Y/m/d H:i"
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr "Y/m/d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15269,96 +15708,105 @@ msgstr "Y/m/d H:i:s"
 msgid "Year"
 msgstr "年"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "毎年"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "はい"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "ヨタ"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Webサーバーにロケールがインストールされていないため、いくつかの言語は利用できません。"
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "ユーザー\"%s\"の権限変更は許可されていません。"
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "ログインしていません"
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "現在選択しているホストに切り替えることができません。"
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "操作を行うホストが指定されていません。"
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "操作を行うホストグループが指定されていません。"
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "アクションのコマンド実行\"%s\"のターゲットが指定されていません。"
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "アクションのグローバルスクリプト\"%s\"のターゲットが指定されていません。"
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "操作に対する権限がありません。"
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "ユーザーを作成する権限がありません。"
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "他のユーザーを更新する権限がありません。"
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "ユーザーを更新する権限がないか、ユーザーが存在しません。"
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr "このページを表示する権限がありません。"
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "このページを表示するためにはログインする必要があります"
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr "次のユーザーでログイン"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15371,7 +15819,7 @@ msgstr "Zabbix"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15390,8 +15838,8 @@ msgid "Zabbix User"
 msgstr "Zabbixユーザー"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15417,10 +15865,11 @@ msgstr "Zabbixインターナル"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix内部データベースのユーザー情報による認証"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbixサーバー"
@@ -15436,7 +15885,7 @@ msgstr ""
 "1. \"zabbix.conf.php\"に設定されたサーバーのIPまたはDNSが正しくない;\n"
 "2. ネットワークの設定が正しくありません。\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "Zabbix serverのIPアドレスまたはポート番号が設定されていません！"
 
@@ -15444,15 +15893,15 @@ msgstr "Zabbix serverのIPアドレスまたはポート番号が設定されて
 msgid "Zabbix server activity check interval"
 msgstr "Zabbixサーバーの動作チェック間隔"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Zabbixサーバーの情報"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbixサーバーが動作していません (画面のリフレッシュを行ってステータスを再確認してください)"
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbixサーバーの起動"
 
@@ -15461,11 +15910,11 @@ msgstr "Zabbixサーバーの起動"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Zabbixサーバーの動作チェック間隔\"%1$s\""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Zabbixサーバー名"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Zabbixサーバーのポート"
 
@@ -15473,25 +15922,20 @@ msgstr "Zabbixサーバーのポート"
 msgid "Zabbix trapper"
 msgstr "Zabbixトラッパー"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "ゼタ"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "ズーム"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[日の値が正しくありません: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[月の値が正しくありません: \"%s\" ]"
@@ -15500,19 +15944,19 @@ msgstr "[月の値が正しくありません: \"%s\" ]"
 msgid "agent"
 msgstr "エージェント"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "すべて"
 
@@ -15520,19 +15964,15 @@ msgstr "すべて"
 msgid "all media"
 msgstr "すべてのメディア"
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "すでに存在します"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "青"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "緑"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "赤"
 
@@ -15544,83 +15984,49 @@ msgstr "自動登録"
 msgid "auto-registered host"
 msgstr "自動登録ホスト"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "平均"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr "\"%1$s\"から始まる条件式を確認してください"
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "Y/m/d"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "Y/m/d H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "Y/m/d H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "m/d"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "m/d"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "m/d H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "y/m/d"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "日"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15642,19 +16048,15 @@ msgstr "発見されたサービス"
 msgid "discovery"
 msgstr "ディスカバリ"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "ダイナミック"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "要素"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "要素のコピー先..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_fromとesc_step_toは両方設定する必要があります。"
 
@@ -15666,47 +16068,49 @@ msgstr "完全一致"
 msgid "executed"
 msgstr "実行"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr "条件式が指定されていません"
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "fixed"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "found"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "グローバルなデータの保存期間設定"
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "ホスト"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "ホストグループ"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "アイコン"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "イメージ"
 
@@ -15714,7 +16118,7 @@ msgstr "イメージ"
 msgid "in"
 msgstr "期間中"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "間違った書式が\"%1$s\"付近に見つかりました"
@@ -15724,7 +16128,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr "内部イベント"
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "is"
 
@@ -15732,20 +16136,20 @@ msgstr "is"
 msgid "item"
 msgstr "アイテム"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr "キーが設定されていません"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "最新値"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "含まれる"
@@ -15754,12 +16158,12 @@ msgstr "含まれる"
 msgid "low-level discovery rule"
 msgstr "ローレベルディスカバリルール"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15768,46 +16172,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "マクロ"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "メンテナンス"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "マップ"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "最大"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "最小"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "最小60秒"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15816,17 +16220,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "有効なLDAPユーザーが必要です"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr "新規"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "データなし"
@@ -15839,12 +16243,14 @@ msgstr "期間外"
 msgid "not like"
 msgstr "含まれない"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "停止中"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "選択されていません"
 
@@ -15853,57 +16259,61 @@ msgstr "選択されていません"
 msgid "not sent"
 msgstr "未送信"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "現在"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "of"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr "off"
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "on"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "その他"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "更新"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr "%1$s秒ごとに更新。"
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr "正規表現"
@@ -15912,25 +16322,24 @@ msgstr "正規表現"
 msgid "remember selected"
 msgstr "選択を記憶"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "ルート"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "実行中"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "秒"
 
@@ -15943,7 +16352,7 @@ msgstr "秒"
 msgid "sent"
 msgstr "送信済み"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "短い説明"
 
@@ -15951,36 +16360,36 @@ msgstr "短い説明"
 msgid "show icon mappings"
 msgstr "アイコンのマッピングを表示"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "値のマッピングの表示"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "テンプレートID\"%1$s\"が%2$s回利用されています"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "to"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "トリガー"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr "検索文字列を入力"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr "キーの末尾が間違っています"
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "不明"
 
@@ -15992,11 +16401,11 @@ msgstr "値"
 msgid "via"
 msgstr "via"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyyy"
diff --git a/frontends/php/locale/ko/LC_MESSAGES/frontend.po b/frontends/php/locale/ko/LC_MESSAGES/frontend.po
index 7ac14486c49..c9ca40aa671 100644
--- a/frontends/php/locale/ko/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/ko/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Konstantin <konstantin.buravcov@zabbix.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -13,28 +13,30 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Basepath: ../../\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr ""
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -45,22 +47,20 @@ msgstr[0] ""
 msgid "%1$s (year %2$s)"
 msgstr ""
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] ""
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -73,7 +73,7 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -91,23 +91,23 @@ msgid "%d device"
 msgid_plural "%d devices"
 msgstr[0] ""
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr ""
 
@@ -115,34 +115,34 @@ msgstr ""
 msgid "(in sec)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr ""
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr ""
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr ""
 
@@ -158,7 +158,7 @@ msgstr "10초"
 msgid "30 seconds"
 msgstr "30초"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr ""
 
@@ -174,7 +174,7 @@ msgstr "5초"
 msgid "500 latest values"
 msgstr "최근 500개의 값"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -193,12 +193,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "알람 확인"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "AND"
 
@@ -210,19 +209,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "가동 보고서"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -234,42 +233,42 @@ msgstr ""
 msgid "Access denied!"
 msgstr ""
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr ""
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "인지"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "인지"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "인지를 추가하였습니다"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "인지 사용자:"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr ""
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr ""
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "인지 완료"
 
@@ -294,61 +293,64 @@ msgstr ""
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "액션"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr ""
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "액션을 추가하였습니다"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "액션을 삭제하였습니다"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -360,21 +362,21 @@ msgstr[0] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr ""
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "액션을 갱신하였습니다"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "액션"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "활성"
@@ -384,80 +386,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr ""
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr ""
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr ""
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "추가"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "주석 추가"
 
@@ -473,27 +478,23 @@ msgstr "호스트 추가"
 msgid "Add link"
 msgstr ""
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr ""
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr ""
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr ""
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr ""
@@ -502,7 +503,7 @@ msgstr ""
 msgid "Add to host group"
 msgstr ""
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr ""
 
@@ -514,7 +515,7 @@ msgstr "추가"
 msgid "Admin"
 msgstr ""
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "관리"
 
@@ -522,34 +523,34 @@ msgstr "관리"
 msgid "Advanced labels"
 msgstr ""
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr ""
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr ""
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr ""
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "에이전트"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr ""
@@ -558,12 +559,12 @@ msgstr ""
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "로그인 이름"
 
@@ -571,122 +572,125 @@ msgstr "로그인 이름"
 msgid "Align icons"
 msgstr ""
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "허가된 호스트"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr ""
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr ""
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "애플리케이션"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr ""
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "애플리케이션을 추가하였습니다"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "애플리케이션을 삭제하였습니다"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr ""
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "애플리케이션을 갱신하였습니다"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr ""
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "애플리케이션"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr ""
 
@@ -695,16 +699,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr ""
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr ""
 
@@ -720,9 +724,9 @@ msgstr ""
 msgid "Area type"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -736,50 +740,47 @@ msgstr "일반 텍스트로 보기"
 msgid "Asset tag"
 msgstr ""
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr ""
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr ""
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "감사"
@@ -799,26 +800,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr ""
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr ""
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -877,9 +880,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr ""
 
@@ -887,20 +890,20 @@ msgstr ""
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr ""
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "상태"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "가동 보고서"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "감시 중"
 
@@ -909,36 +912,36 @@ msgstr "감시 중"
 msgid "Average"
 msgstr "가벼운 장애"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr ""
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr ""
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr ""
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "배경"
@@ -947,7 +950,7 @@ msgstr "배경"
 msgid "Background image"
 msgstr "배경 이미지"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr ""
 
@@ -957,7 +960,7 @@ msgid "Base DN"
 msgstr ""
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
+msgid "Basic"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
@@ -970,15 +973,15 @@ msgstr ""
 msgid "Bind password"
 msgstr ""
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr ""
 
@@ -990,8 +993,8 @@ msgstr ""
 msgid "Blocked"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "굵은 선"
 
@@ -999,22 +1002,22 @@ msgstr "굵은 선"
 msgid "Boolean"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "아래쪽"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr ""
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr ""
 
@@ -1040,7 +1043,7 @@ msgstr ""
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr ""
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1070,7 +1073,7 @@ msgstr ""
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr ""
 
@@ -1082,7 +1085,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr ""
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr ""
 
@@ -1091,14 +1094,14 @@ msgstr ""
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr ""
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr ""
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "아이템 설정"
 
@@ -1127,7 +1130,7 @@ msgstr "네트워크 맵 설정"
 msgid "CONFIGURATION OF PROXIES"
 msgstr ""
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr ""
 
@@ -1147,7 +1150,7 @@ msgstr ""
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "슬라이드쇼 설정"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr ""
 
@@ -1163,7 +1166,7 @@ msgstr ""
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "트리거 설정"
 
@@ -1195,22 +1198,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "ZABBIX 설정"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1219,21 +1222,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "자동 계산"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr ""
 
@@ -1241,92 +1244,95 @@ msgstr ""
 msgid "Callback"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr ""
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "취소"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr ""
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "액션을 추가할 수 없습니다"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "애플리케이션을 추가할 수 없습니다"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "디스커버리 규칙을 추가할 수 없습니다"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "그래프를 추가할 수 없습니다"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "그룹을 추가할 수 없습니다"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "호스트를 추가할 수 없습니다"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1334,24 +1340,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "이미지를 추가할 수 없습니다"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr ""
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "아이템을 추가할 수 없습니다"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1359,20 +1365,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr ""
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr ""
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr ""
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1381,24 +1387,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr ""
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr ""
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr ""
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "스크린을 추가할 수 없습니다"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr ""
 
@@ -1410,27 +1416,27 @@ msgstr "서비스를 추가할 수 없습니다"
 msgid "Cannot add slide show"
 msgstr ""
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "트리거를 추가할 수 없습니다"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "사용자를 추가할 수 없습니다"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "사용자를 추가할 수 없습니다. 암호가 일치하지 않습니다."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr ""
 
@@ -1438,7 +1444,7 @@ msgstr ""
 msgid "Cannot add value map"
 msgstr "값 매핑을 추가할 수 없습니다"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1458,23 +1464,23 @@ msgstr ""
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "이력을 삭제할 수 없습니다"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -1482,20 +1488,20 @@ msgstr ""
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr ""
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr ""
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1504,19 +1510,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr ""
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr ""
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr ""
 
@@ -1524,101 +1530,100 @@ msgstr ""
 msgid "Cannot create icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr ""
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "액션을 삭제할 수 없습니다"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "애플리케이션을 삭제할 수 없습니다"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "디스커버리 규칙을 삭제할 수 없습니다"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "그래프를 삭제할 수 없습니다"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "그룹을 삭제할 수 없습니다"
+msgid_plural "Cannot delete groups"
+msgstr[0] "그룹을 삭제할 수 없습니다"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "호스트를 삭제할 수 없습니다"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1626,78 +1631,78 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "이미지를 삭제할 수 없습니다"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "아이템을 삭제할 수 없습니다"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "아이템을 삭제할 수 없습니다"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr ""
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr ""
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr ""
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr ""
 
@@ -1705,77 +1710,80 @@ msgstr ""
 msgid "Cannot delete service"
 msgstr "서비스를 삭제할 수 없습니다"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr ""
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "트리거를 삭제할 수 없습니다"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "트리거를 삭제할 수 없습니다"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "사용자를 삭제할 수 없습니다"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1783,66 +1791,66 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr "값 매핑을 삭제할 수 없습니다"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] ""
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1855,122 +1863,116 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] ""
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -1981,34 +1983,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2018,41 +2039,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2065,12 +2086,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr ""
@@ -2081,58 +2104,59 @@ msgid "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
 msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr ""
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr ""
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2152,7 +2176,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2161,11 +2185,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2173,11 +2197,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr ""
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr ""
 
@@ -2186,217 +2210,226 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr ""
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr ""
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "액션을 갱신할 수 없습니다"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "애플리케이션을 갱신할 수 없습니다"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "주석을 갱신할 수 없습니다"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr ""
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "디스커버리 규칙을 갱신할 수 없습니다"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "그래프를 갱신할 수 없습니다"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "그룹을 갱신할 수 없습니다"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr ""
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "호스트를 갱신할 수 없습니다"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr ""
 
@@ -2408,24 +2441,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr "이미지를 갱신할 수 없습니다"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "아이템을 갱신할 수 없습니다"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr ""
 
@@ -2437,16 +2470,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr ""
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr ""
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2454,28 +2487,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr ""
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr ""
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr ""
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "스크린을 갱신할 수 없습니다"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr ""
 
@@ -2487,40 +2516,41 @@ msgstr "서비스를 갱신할 수 없습니다"
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr ""
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "트리거를 갱신할 수 없습니다"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "사용자를 갱신할 수 없습니다"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "사용자를 갱신할 수 없습니다. 암호가 일치하지 않습니다."
 
@@ -2528,15 +2558,15 @@ msgstr "사용자를 갱신할 수 없습니다. 암호가 일치하지 않습�
 msgid "Cannot update value map"
 msgstr "값 매핑을 갱신할 수 없습니다"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr ""
 
@@ -2545,47 +2575,47 @@ msgstr ""
 msgid "Case sensitive"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "변경"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "암호변경"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "문자"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr ""
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr ""
 
@@ -2594,48 +2624,48 @@ msgid "Chassis"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr ""
 
@@ -2644,44 +2674,44 @@ msgid "Check type"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "검사 항목"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr ""
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "중국어 (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr ""
@@ -2696,34 +2726,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "선택 아이템 이력 삭제"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr ""
 
@@ -2733,69 +2764,69 @@ msgstr "시각"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "복제"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "색"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr ""
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "열 합치기"
 
@@ -2810,7 +2841,7 @@ msgstr ""
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr ""
 
@@ -2818,41 +2849,31 @@ msgstr ""
 msgid "Command actions"
 msgstr ""
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr ""
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr ""
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "주석을 갱신하였습니다"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "주석"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr ""
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2860,29 +2881,39 @@ msgstr ""
 msgid "Condition"
 msgstr "조건"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "조건"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "설정"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3045,23 +3076,23 @@ msgstr "설정을 갱신하였습니다"
 msgid "Configure (Filter %s)"
 msgstr ""
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "접속 방법"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr ""
@@ -3109,7 +3140,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3117,30 +3148,36 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "복사"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "선택 항목 복사..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr ""
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "회"
 
@@ -3160,6 +3197,10 @@ msgstr "애플리케이션 작성"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3177,7 +3218,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3190,15 +3231,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
-#: adm.iconmapping.php:126
-msgid "Create icon map"
+#: adm.images.php:151
+msgid "Create icon"
 msgstr ""
 
-#: adm.images.php:149
-msgid "Create image"
+#: adm.iconmapping.php:126
+msgid "Create icon map"
 msgstr ""
 
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr ""
 
@@ -3222,6 +3263,10 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr ""
@@ -3246,11 +3291,11 @@ msgstr ""
 msgid "Create slide show"
 msgstr ""
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr ""
 
@@ -3274,42 +3319,42 @@ msgstr ""
 msgid "Create value map"
 msgstr "값 매핑 작성"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3319,51 +3364,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr ""
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr ""
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3376,7 +3422,7 @@ msgstr "커스텀 그래프"
 msgid "Custom label"
 msgstr ""
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3390,7 +3436,7 @@ msgstr "승수"
 msgid "Custom screens"
 msgstr "커스텀 스크린"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr ""
 
@@ -3410,18 +3456,14 @@ msgstr ""
 msgid "Custom slides"
 msgstr ""
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr ""
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr ""
@@ -3437,28 +3479,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "시나리오 이름"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr ""
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr ""
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3466,25 +3508,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS 이름"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr ""
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "일간"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr ""
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr ""
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr ""
 
@@ -3496,20 +3538,21 @@ msgstr ""
 msgid "Dashboard filter"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "파선"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "데이터"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3532,11 +3575,12 @@ msgstr ""
 msgid "Data type"
 msgstr ""
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr ""
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr ""
 
@@ -3544,35 +3588,39 @@ msgstr ""
 msgid "Database monitor"
 msgstr ""
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr ""
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr ""
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr ""
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr ""
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr ""
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr ""
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr ""
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr ""
 
@@ -3592,53 +3640,52 @@ msgstr ""
 msgid "Date HW purchased"
 msgstr ""
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "일"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr ""
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr ""
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr ""
 
@@ -3646,22 +3693,22 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr ""
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr ""
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr ""
 
@@ -3671,15 +3718,14 @@ msgstr ""
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Default"
 
@@ -3692,11 +3738,11 @@ msgid "Default delay (in seconds)"
 msgstr ""
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr ""
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3719,30 +3765,34 @@ msgstr ""
 msgid "Delay"
 msgstr "갱신 간격"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr ""
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr ""
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "삭제"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr ""
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3750,53 +3800,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "그래프를 삭제하시겠습니까?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
+#: include/views/configuration.item.list.php:278
+msgid "Delete history of selected items?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:274
-msgid "Delete history of selected items?"
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3804,11 +3854,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3816,7 +3870,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "시나리오를 삭제하시겠습니까?"
 
@@ -3824,71 +3878,67 @@ msgstr "시나리오를 삭제하시겠습니까?"
 msgid "Delete screen?"
 msgstr "스크린을 삭제하시겠습니까?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr ""
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "선택 항목 삭제"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr ""
@@ -3897,27 +3947,27 @@ msgstr ""
 msgid "Delete selected groups?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "선택한 호스트를 삭제하시겠습니까?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "선택한 호스트를 삭제하시겠습니까?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "선택한 이미지를 삭제하시겠습니까?"
 
@@ -3925,31 +3975,31 @@ msgstr "선택한 이미지를 삭제하시겠습니까?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr ""
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr ""
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr ""
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr ""
 
@@ -3957,15 +4007,15 @@ msgstr ""
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr ""
 
@@ -3977,11 +4027,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr ""
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "선택한 사용자를 삭제하시겠습니까?"
 
@@ -3995,11 +4045,15 @@ msgid "Delete selected value mapping? It is used for %d item!"
 msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "선택 항목 및 연결된 구성요소 삭제"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4008,15 +4062,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr ""
 
@@ -4024,62 +4078,62 @@ msgstr ""
 msgid "Deleted"
 msgstr "삭제"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4088,35 +4142,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "델타"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "델타(변경 값/초)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "거부"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr ""
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "의존 대상"
 
@@ -4124,30 +4178,41 @@ msgstr "의존 대상"
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "이름"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "자세히"
 
@@ -4160,71 +4225,71 @@ msgid "Device"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4248,48 +4313,44 @@ msgstr ""
 msgid "Disable host"
 msgstr ""
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr ""
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "선택 항목 비활성화"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr ""
 
@@ -4297,11 +4358,11 @@ msgstr ""
 msgid "Disable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr ""
 
@@ -4309,42 +4370,47 @@ msgstr ""
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "비활성"
 
@@ -4357,7 +4423,7 @@ msgstr "심각한 장애"
 msgid "Discovered"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4365,17 +4431,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr ""
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "디스커버리"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr ""
 
@@ -4383,17 +4449,17 @@ msgstr ""
 msgid "Discovery check"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4402,65 +4468,68 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "디스커버리 규칙"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "디스커버리 규칙을 삭제하였습니다"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "디스커버리 규칙을 갱신하였습니다"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "디스커버리 규칙을 삭제하였습니다"
 
@@ -4472,7 +4541,7 @@ msgstr "디스커버리 상태"
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr ""
 
@@ -4481,32 +4550,32 @@ msgstr ""
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr ""
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr ""
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "계산 안함"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "점선"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4516,30 +4585,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "정지 시간"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "종류"
 
@@ -4557,74 +4626,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "기간"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "네덜란드어 (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr ""
 
@@ -4632,13 +4702,13 @@ msgstr ""
 msgid "EVENTS"
 msgstr "이벤트"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4646,9 +4716,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "편집"
 
@@ -4656,7 +4726,7 @@ msgstr "편집"
 msgid "Edit map element"
 msgstr ""
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4664,27 +4734,61 @@ msgstr ""
 msgid "Element"
 msgstr "항목"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "구성요소 이름"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "전자우편"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "닫기"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4692,76 +4796,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4770,11 +4896,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4782,11 +4908,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr ""
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4806,11 +4936,11 @@ msgstr ""
 msgid "Enable host"
 msgstr ""
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr ""
 
@@ -4823,36 +4953,32 @@ msgstr ""
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "선택 항목 활성화"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr ""
 
@@ -4860,11 +4986,11 @@ msgstr ""
 msgid "Enable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4872,64 +4998,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "활성"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "영어 (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "에러"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -4947,15 +5077,15 @@ msgstr ""
 msgid "Event ID"
 msgstr ""
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr ""
 
@@ -4964,7 +5094,7 @@ msgstr ""
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr ""
 
@@ -4972,7 +5102,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr ""
 
@@ -4992,9 +5122,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "이벤트"
 
@@ -5002,36 +5133,41 @@ msgstr "이벤트"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr ""
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr ""
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr ""
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr ""
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5039,13 +5175,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5057,7 +5193,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5067,12 +5203,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr ""
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr ""
 
@@ -5080,22 +5216,22 @@ msgstr ""
 msgid "Export to CSV"
 msgstr ""
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "조건식"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5103,11 +5239,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr ""
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5128,17 +5265,17 @@ msgid "External check"
 msgstr "외부 검사"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "정상"
 
@@ -5147,16 +5284,17 @@ msgstr "정상"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "실패"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr ""
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5164,40 +5302,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr ""
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr ""
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr ""
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr ""
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr ""
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr ""
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr ""
 
@@ -5241,19 +5379,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5262,13 +5400,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5276,68 +5414,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "면"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "필터"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "종료"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr ""
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5346,8 +5487,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "고정"
 
@@ -5357,76 +5498,80 @@ msgstr "고정"
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr ""
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr ""
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr ""
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "프랑스어 (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr ""
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "금"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "개시"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "기능"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5436,50 +5581,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM 모뎀"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr ""
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr ""
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "일반"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "독일어 (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5487,65 +5632,65 @@ msgid "Get support"
 msgstr "서포트"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr ""
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr ""
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5554,66 +5699,73 @@ msgid "Gradient line"
 msgstr ""
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "그래프"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "그래프를 추가하였습니다"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "그래프를 삭제하였습니다"
 
@@ -5625,54 +5777,59 @@ msgstr "그래프 구성요소"
 msgid "Graph item"
 msgstr "그래프 아이템"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "그래프 이름"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5684,49 +5841,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "그래프 종류"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "그래프를 갱신하였습니다"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "그래프"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr ""
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5735,54 +5894,57 @@ msgstr ""
 msgid "Grid"
 msgstr ""
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "그룹"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "그룹을 추가하였습니다"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "그룹을 삭제하였습니다"
+msgid_plural "Groups deleted"
+msgstr[0] "그룹을 삭제하였습니다"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5793,40 +5955,42 @@ msgstr ""
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "그룹 이름"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "그룹을 갱신하였습니다"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "그룹"
 
@@ -5834,22 +5998,13 @@ msgstr "그룹"
 msgid "Groups in maintenance"
 msgstr ""
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5866,7 +6021,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5884,7 +6039,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5905,12 +6061,17 @@ msgstr "하드웨어"
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "높이"
@@ -5923,15 +6084,15 @@ msgstr "도움말"
 msgid "Hexadecimal"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "감추기"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr ""
 
@@ -5947,15 +6108,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "비활성 트리거 감추기"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "선택 항목 감추기"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -5964,23 +6125,23 @@ msgstr ""
 msgid "High"
 msgstr "중증 장애"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "이력"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "이력이 삭제되었습니다"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "이력 삭제에 시간이 걸릴 수도 있습니다. 계속하시겠습니까?"
 
@@ -6001,79 +6162,79 @@ msgstr "이벤트 이력"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "가로"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "가로 위치"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "호스트"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6085,64 +6246,66 @@ msgstr "호스트 IP 주소"
 msgid "Host access"
 msgstr ""
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "호스트를 추가하였습니다"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "호스트를 삭제하였습니다"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "호스트 그룹"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6159,14 +6322,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "호스트 그룹"
 
@@ -6176,8 +6340,8 @@ msgstr "호스트 그룹"
 msgid "Host interface"
 msgstr ""
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6193,7 +6357,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6202,18 +6366,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6222,70 +6386,70 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6297,7 +6461,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6309,51 +6473,52 @@ msgstr ""
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr ""
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "호스트를 갱신하였습니다"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "호스트"
 
@@ -6361,11 +6526,11 @@ msgstr "호스트"
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "호스트 수 (감시/미감시/템플릿)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6377,37 +6542,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "호스트 정보"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr ""
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr ""
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr ""
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "헝가리어 (hu_HU)"
 
@@ -6425,22 +6591,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP 주소"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6448,26 +6614,26 @@ msgstr "IP 주소"
 msgid "IP address"
 msgstr "IP 주소"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP 주소 범위"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6475,22 +6641,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr ""
 
@@ -6500,7 +6666,7 @@ msgstr ""
 msgid "IPMI sensor"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr ""
 
@@ -6533,7 +6699,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6549,25 +6715,25 @@ msgid "ITEMS"
 msgstr "아이템"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "아이콘"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr ""
 
@@ -6588,42 +6754,44 @@ msgstr "아이콘 라벨 종류"
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6636,7 +6804,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6644,29 +6813,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6674,21 +6843,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "이미지"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6697,7 +6868,7 @@ msgstr ""
 msgid "Image added"
 msgstr "이미지를 추가하였습니다"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "이미지를 삭제하였습니다"
 
@@ -6705,12 +6876,13 @@ msgstr "이미지를 삭제하였습니다"
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6719,66 +6891,66 @@ msgid "Image updated"
 msgstr "이미지를 갱신하였습니다"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "이미지"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr ""
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "가져오기"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "파일 가져오기"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr ""
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6791,244 +6963,282 @@ msgstr ""
 msgid "In progress"
 msgstr "진행 중"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr ""
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr ""
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7038,11 +7248,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7051,11 +7261,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7063,74 +7273,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr ""
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7138,182 +7374,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr ""
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr ""
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr ""
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr ""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr ""
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr ""
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7322,64 +7577,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7400,52 +7659,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7454,7 +7718,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7474,7 +7739,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7484,43 +7749,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7529,15 +7800,15 @@ msgstr ""
 msgid "Information"
 msgstr "정보"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "삽입"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
 msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "설치"
 
@@ -7545,31 +7816,32 @@ msgstr "설치"
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr ""
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7589,7 +7861,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7597,7 +7869,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7610,19 +7882,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr ""
 
@@ -7632,112 +7904,114 @@ msgstr ""
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "목록"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7746,7 +8020,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7754,12 +8028,12 @@ msgstr ""
 msgid "Is online?"
 msgstr "로그인 상태"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr ""
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7767,70 +8041,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "이탈리아어 (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "아이템"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "아이템을 추가하였습니다"
 
@@ -7838,16 +8113,16 @@ msgstr "아이템을 추가하였습니다"
 msgid "Item count"
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "아이템을 삭제하였습니다"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7860,54 +8135,54 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7915,92 +8190,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "아이템을 갱신하였습니다"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "아이템"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "아이템 수(감시/미감시/취득불가)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "아이템을 삭제하였습니다"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "아이템을 갱신하였습니다"
 
@@ -8012,72 +8287,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "JabberID"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr ""
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr ""
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "일본어 (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr ""
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr ""
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr ""
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr ""
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8086,40 +8361,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "키"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr ""
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr ""
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr ""
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "최근 데이터"
 
@@ -8150,37 +8425,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr ""
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "라벨"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "라벨 위치"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "언어"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "최근"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8191,19 +8466,19 @@ msgid "Last %1$d issue"
 msgid_plural "Last %1$d issues"
 msgstr[0] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8223,28 +8498,28 @@ msgstr ""
 msgid "Last 7 days"
 msgstr ""
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "최근 갱신"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "최근 검사"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "최근 1시간의 그래프"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "최근 1개월의 그래프"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "최근"
 
@@ -8252,66 +8527,67 @@ msgstr "최근"
 msgid "Last seen (age)"
 msgstr ""
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "최근 값"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "최근 1주일의 그래프"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "최근 데이터"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "최근 이벤트"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "라트비아어 (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "왼쪽"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr ""
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "선"
 
@@ -8319,39 +8595,29 @@ msgstr "선"
 msgid "Link"
 msgstr "연결"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr ""
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8363,50 +8629,50 @@ msgstr "템플릿과의 링크 작성"
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr ""
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "로컬 시간"
 
@@ -8423,36 +8689,36 @@ msgid "Location longitude"
 msgstr ""
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "로그"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "로그 시간 형식"
@@ -8461,12 +8727,12 @@ msgstr "로그 시간 형식"
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8477,12 +8743,12 @@ msgstr "로그인"
 msgid "Login as Guest"
 msgstr ""
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8491,8 +8757,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8513,22 +8780,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8540,7 +8803,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr ""
 
@@ -8565,49 +8828,49 @@ msgstr "실행 트리거 최상위 100항목"
 msgid "Macro"
 msgstr ""
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr ""
 
@@ -8615,31 +8878,36 @@ msgstr ""
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr ""
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr ""
 
@@ -8647,7 +8915,7 @@ msgstr ""
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr ""
 
@@ -8663,25 +8931,25 @@ msgstr ""
 msgid "Maintenance type"
 msgstr ""
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr ""
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8692,12 +8960,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "맵"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8707,12 +8975,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8729,12 +8997,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr ""
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8744,23 +9012,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "맵"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr ""
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr ""
 
@@ -8768,28 +9036,34 @@ msgstr ""
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "선택 이외 항목 색 지정"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "선택 항목 색 지정"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "일괄갱신"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr ""
@@ -8803,29 +9077,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr ""
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8833,101 +9089,96 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr ""
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "연락 방법"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "연락 방법"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "연락 방법을 삭제하였습니다"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "연락 방법을 갱신하였습니다"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "연락 방법"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr ""
 
@@ -8942,14 +9193,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr ""
 
@@ -8959,7 +9210,7 @@ msgstr ""
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "메시지"
 
@@ -8967,66 +9218,66 @@ msgstr "메시지"
 msgid "Message actions"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr ""
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "가운데"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9035,79 +9286,76 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr ""
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9117,7 +9365,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9129,18 +9377,18 @@ msgstr "모드"
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr ""
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "월"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr ""
 
@@ -9148,33 +9396,33 @@ msgstr ""
 msgid "Monitored host"
 msgstr ""
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "모니터링"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "월"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "월간"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9182,7 +9430,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9191,19 +9439,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "실행 트리거 최상위 100항목"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr ""
 
@@ -9216,60 +9464,58 @@ msgstr "네트워크 맵"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr ""
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
+msgid "NTLM"
 msgstr ""
 
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9280,26 +9526,32 @@ msgstr ""
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "이름"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9318,12 +9570,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9331,7 +9583,7 @@ msgstr ""
 msgid "Network map added"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr ""
 
@@ -9343,7 +9595,7 @@ msgstr ""
 msgid "Network maps"
 msgstr "네트워크 맵"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Never"
 
@@ -9351,24 +9603,24 @@ msgstr "Never"
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "새로 만들기"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "새 조건"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr ""
 
@@ -9379,16 +9631,16 @@ msgstr ""
 msgid "New flexible interval"
 msgstr "새로운 유동적인 갱신 간격"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "새 그룹"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "그래프에 추가할 아이템"
 
@@ -9396,83 +9648,99 @@ msgstr "그래프에 추가할 아이템"
 msgid "New media"
 msgstr "새 연락 방법"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "새 서비스 시간"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "다음"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "아니오"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9480,25 +9748,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9524,8 +9792,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9535,7 +9803,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9543,30 +9811,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9575,27 +9844,27 @@ msgstr ""
 msgid "No data collection"
 msgstr ""
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9603,39 +9872,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9650,7 +9919,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9659,7 +9928,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9668,48 +9941,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9722,17 +9996,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9751,33 +10030,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9796,7 +10082,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9812,7 +10098,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9821,15 +10107,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9841,133 +10127,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr ""
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -9975,7 +10306,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -9983,82 +10314,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "트리거가 없습니다"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10067,57 +10399,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "없음"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "꺾은선 그래프"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr ""
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr ""
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "미감시"
 
@@ -10126,7 +10459,7 @@ msgstr "미감시"
 msgid "Not classified"
 msgstr "미분류"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr ""
 
@@ -10139,8 +10472,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "취득 불가"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "설명"
@@ -10153,7 +10486,7 @@ msgstr "비고"
 msgid "Nothing"
 msgstr "없음"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10161,87 +10494,87 @@ msgstr ""
 msgid "Notification report"
 msgstr "통지 보고서"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "통지"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr ""
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10249,88 +10582,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "상태 변경 횟수"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "스텝 수"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "사용자 수 (온라인)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "숫자(float)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr ""
 
@@ -10345,16 +10678,18 @@ msgid "OEM"
 msgstr ""
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "정상"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10370,8 +10705,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "OR"
 
@@ -10391,11 +10725,12 @@ msgstr ""
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "개요"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10403,25 +10738,25 @@ msgstr ""
 msgid "Octal"
 msgstr ""
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "OFF"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "OK"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "ON"
 
@@ -10429,111 +10764,114 @@ msgstr "ON"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "일시적인 정지 시간"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10542,28 +10880,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "오퍼레이션 종류"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "오퍼레이션"
@@ -10572,25 +10910,27 @@ msgstr "오퍼레이션"
 msgid "Operator"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10620,24 +10960,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "변경 안함"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr ""
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "기타"
 
@@ -10645,19 +10985,19 @@ msgstr "기타"
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10667,21 +11007,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr "기타 파라미터"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10694,14 +11034,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "개요"
 
@@ -10709,7 +11046,7 @@ msgstr "개요"
 msgid "Overview by proxy"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10718,147 +11055,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10867,32 +11212,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr ""
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr ""
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "파라미터"
 
@@ -10901,7 +11248,7 @@ msgstr "파라미터"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10921,33 +11268,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -10957,20 +11304,21 @@ msgstr ""
 msgid "Password"
 msgstr "암호"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "암호 확인"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr ""
 
@@ -10979,21 +11327,21 @@ msgstr ""
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11001,12 +11349,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "기간"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr ""
@@ -11016,24 +11364,24 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr ""
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr ""
 
@@ -11045,55 +11393,56 @@ msgstr ""
 msgid "Plain text"
 msgstr "일반 텍스트"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr ""
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "포트"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11101,51 +11450,51 @@ msgstr ""
 msgid "Port range"
 msgstr ""
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "포르투갈어 (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "POST"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "미리보기"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "이전"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11194,30 +11543,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11229,16 +11579,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr ""
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr ""
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "장애"
 
@@ -11246,75 +11596,71 @@ msgstr "장애"
 msgid "Profile"
 msgstr "프로파일"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr ""
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr ""
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11325,7 +11671,7 @@ msgstr ""
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "갱신 아이템 큐"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "큐"
 
@@ -11333,18 +11679,18 @@ msgstr "큐"
 msgid "RMCP+"
 msgstr ""
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "읽기 전용"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "쓰기 가능"
 
@@ -11356,7 +11702,7 @@ msgstr "이유"
 msgid "Received value"
 msgstr "수신 값"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11364,11 +11710,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11379,28 +11725,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "수신처"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr ""
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr ""
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr ""
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "새로 고침(초)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr ""
 
@@ -11418,46 +11764,50 @@ msgstr ""
 msgid "Regular expression"
 msgstr ""
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11474,26 +11824,28 @@ msgstr "원격 명령"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11504,21 +11856,19 @@ msgstr "원격 명령"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "삭제"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11526,11 +11876,11 @@ msgstr ""
 msgid "Remove element"
 msgstr ""
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr ""
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11539,7 +11889,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11551,28 +11901,28 @@ msgstr "호스트 삭제"
 msgid "Remove link"
 msgstr ""
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr ""
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr ""
 
@@ -11580,35 +11930,36 @@ msgstr ""
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "보고서"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "요구 문자열"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11616,29 +11967,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr ""
 
@@ -11657,9 +12010,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11672,7 +12025,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "리소스"
@@ -11687,15 +12040,15 @@ msgstr "응답 시간"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr ""
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr ""
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr ""
 
@@ -11708,7 +12061,8 @@ msgstr ""
 msgid "Result type"
 msgstr ""
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11716,60 +12070,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "남은 재시도 횟수"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "재실행"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "오른쪽"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "행 합치기"
 
@@ -11777,11 +12140,11 @@ msgstr "행 합치기"
 msgid "Rows"
 msgstr "행"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr ""
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "규칙"
 
@@ -11826,20 +12189,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "러시아어 (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11855,7 +12218,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr ""
 
@@ -11870,13 +12233,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "슬라이드쇼"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11885,17 +12248,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "발송자 전자우편 주소"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP 서버"
@@ -11911,7 +12274,7 @@ msgstr ""
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11923,9 +12286,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -11934,7 +12297,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -11958,7 +12321,7 @@ msgstr "SNMPv3 에이전트"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -11976,7 +12339,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -11985,15 +12348,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr ""
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "디스커버리 상태"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "트리거 상태"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "웹 감시 상태"
 
@@ -12001,92 +12384,92 @@ msgstr "웹 감시 상태"
 msgid "STATUS OF ZABBIX"
 msgstr "ZABBIX 서버 상태"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr ""
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "토"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "저장"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr ""
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "시나리오"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "시나리오를 추가하였습니다"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "시나리오를 갱신하였습니다"
 
@@ -12098,7 +12481,7 @@ msgstr "시나리오"
 msgid "Schedule"
 msgstr ""
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12109,126 +12492,125 @@ msgstr ""
 msgid "Screen"
 msgstr "스크린"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "스크린을 추가하였습니다"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "스크린 셀 설정"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "스크린을 삭제하였습니다"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "스크린을 갱신하였습니다"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "스크린"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "스크립트"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr ""
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "스크립트 이름"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12237,17 +12619,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr ""
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr ""
 
@@ -12268,7 +12650,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr ""
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr ""
 
@@ -12300,7 +12682,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "초"
 
@@ -12319,69 +12701,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "선택"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr ""
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr ""
 
@@ -12397,7 +12786,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr ""
 
@@ -12405,11 +12794,11 @@ msgstr ""
 msgid "Send to"
 msgstr "수신처"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12418,17 +12807,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr ""
 
@@ -12440,7 +12829,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "서버"
@@ -12449,44 +12838,44 @@ msgstr "서버"
 msgid "Server info"
 msgstr "서버 정보"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "서버 시간"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "서비스"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12502,11 +12891,11 @@ msgstr "서비스를 삭제하였습니다"
 msgid "Service port"
 msgstr "서비스 포트"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "서비스 시간"
 
@@ -12518,49 +12907,52 @@ msgstr "서비스 종류"
 msgid "Service updated"
 msgstr "서비스를 갱신하였습니다"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "서비스"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "심각도"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "표시"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "모두 보이기"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "상세 보이기"
 
@@ -12590,35 +12982,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr ""
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "표시할 행 수"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "선택 항목 보이기"
 
@@ -12626,19 +13019,21 @@ msgstr "선택 항목 보이기"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "트리거 표시"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr ""
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "값 매핑 사용"
@@ -12647,11 +13042,11 @@ msgstr "값 매핑 사용"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Woring time 표시"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr ""
 
@@ -12671,6 +13066,10 @@ msgstr "간단 검사"
 msgid "Simple graph"
 msgstr "단순 그래프"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12708,7 +13107,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12726,16 +13125,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "슬라이드쇼"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12744,11 +13143,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12756,10 +13155,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "슬라이드쇼"
 
@@ -12767,15 +13166,15 @@ msgstr "슬라이드쇼"
 msgid "Slides"
 msgstr "슬라이드"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Soft"
 
@@ -12808,28 +13207,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "정렬 순서(0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12842,11 +13241,11 @@ msgstr ""
 msgid "Source"
 msgstr "소스"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "스페인어 (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12854,63 +13253,63 @@ msgstr ""
 msgid "Speed"
 msgstr "속도"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "누적 그래프"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "상태"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "상태"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -12923,7 +13322,7 @@ msgstr "상태 계산"
 msgid "Status calculation algorithm"
 msgstr "상태 계산 알고리즘"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "상태 코드"
 
@@ -12932,7 +13331,7 @@ msgid "Status of Web monitoring"
 msgstr "웹 감시 상태"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "ZABBIX 서버 상태"
 
@@ -12949,40 +13348,40 @@ msgid "Status only"
 msgstr "상태만"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "스텝"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "시나리오 스텝"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "스텝"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "보존 시 계산"
@@ -12991,11 +13390,11 @@ msgstr "보존 시 계산"
 msgid "Straight"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "표시 형식"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13003,11 +13402,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "제목"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13016,32 +13415,32 @@ msgid "Success Audit"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr ""
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "일"
 
@@ -13049,27 +13448,27 @@ msgstr "일"
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "성"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "스웨덴어 (sv_SE)"
 
@@ -13077,16 +13476,16 @@ msgstr "스웨덴어 (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13095,21 +13494,21 @@ msgid "System status"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13128,11 +13527,11 @@ msgid "TOTAL"
 msgstr "합계"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "트리거 주석"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "장애"
 
@@ -13150,14 +13549,14 @@ msgstr ""
 msgid "Tag"
 msgstr "태그"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "대상"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13166,130 +13565,133 @@ msgid "Target type"
 msgstr "대상 종류"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "템플릿"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr ""
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "템플릿 링크"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr ""
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "템플릿"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr ""
 
@@ -13297,11 +13699,11 @@ msgstr ""
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr ""
 
@@ -13315,22 +13717,22 @@ msgid "Test string"
 msgstr ""
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "텍스트"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13338,7 +13740,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13353,24 +13755,24 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13379,19 +13781,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr ""
 
@@ -13401,11 +13803,11 @@ msgid "There is \"%1$d\" group with Internal GUI access."
 msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13414,11 +13816,11 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13430,27 +13832,27 @@ msgstr ""
 msgid "This year"
 msgstr ""
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr ""
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "목"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "종료"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13459,28 +13861,28 @@ msgstr "종료"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "시각"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13488,54 +13890,54 @@ msgstr ""
 msgid "Time period"
 msgstr "기간"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "사용할 시간"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "타임아웃"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "타임 스탬프"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13543,17 +13945,18 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "위쪽"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "합계"
 
@@ -13571,7 +13974,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13588,90 +13991,90 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "트렌드"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "트리거"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "트리거를 추가하였습니다"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "트리거 주석"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "트리거를 삭제하였습니다"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13685,11 +14088,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13697,7 +14101,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13710,12 +14114,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13727,50 +14131,50 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13778,23 +14182,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "트리거 심각도"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "트리거를 갱신하였습니다"
 
@@ -13802,40 +14214,41 @@ msgstr "트리거를 갱신하였습니다"
 msgid "Trigger value"
 msgstr "트리거 값"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "트리거"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "트리거를 삭제하였습니다"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "트리거 정보"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr ""
 
@@ -13843,78 +14256,78 @@ msgstr ""
 msgid "Triggers overview"
 msgstr "트리거 개요"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr ""
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr ""
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr ""
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "화"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr ""
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "종류"
 
@@ -13922,62 +14335,64 @@ msgstr "종류"
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "계산 종류"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "데이터형"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr ""
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "알 수 없음"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "로그인 후 URL"
 
@@ -13993,20 +14408,30 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr ""
 
@@ -14014,15 +14439,11 @@ msgstr ""
 msgid "USER PROFILE"
 msgstr "사용자 프로파일"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr ""
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14030,7 +14451,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr ""
 
@@ -14043,20 +14464,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr ""
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr ""
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr ""
 
@@ -14065,29 +14486,29 @@ msgstr ""
 msgid "Units"
 msgstr "단위"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14097,23 +14518,20 @@ msgstr "알 수 없음"
 msgid "Unknown action"
 msgstr "알 수 없는 액션"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr ""
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14125,23 +14543,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr "알 수 없는 리소스"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "링크 삭제"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "링크와 보존 데이터 삭제"
 
@@ -14149,61 +14567,61 @@ msgstr "링크와 보존 데이터 삭제"
 msgid "Unlink from template"
 msgstr "템플릿과의 링크 삭제"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14217,32 +14635,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14253,34 +14682,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "갱신"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "갱신 간격"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "갱신 간격(초)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "갱신"
 
@@ -14288,55 +14717,55 @@ msgstr "갱신"
 msgid "Updated status of host"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "업로드"
 
@@ -14344,14 +14773,14 @@ msgstr "업로드"
 msgid "Upper level maps"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "가동 시간"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14359,9 +14788,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "업타임/다운타임"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14377,83 +14806,87 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "사용자"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "사용자를 추가하였습니다"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr ""
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "사용자를 삭제하였습니다"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "사용자 그룹"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14469,34 +14902,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "사용자 그룹"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr ""
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14522,243 +14955,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "사용자 종류"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "사용자를 갱신하였습니다"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr ""
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "사용자"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "사용자 (온라인)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "값"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14793,11 +15226,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14843,10 +15276,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "값 매핑"
 
@@ -14855,7 +15288,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14867,8 +15300,8 @@ msgstr ""
 msgid "Values"
 msgstr "값"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "변수"
 
@@ -14881,64 +15314,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "세로"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "세로 위치"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr ""
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "경고"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "웹"
 
@@ -14946,63 +15384,81 @@ msgstr "웹"
 msgid "Web monitoring"
 msgstr "웹 감시"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr ""
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "수"
 
@@ -15010,9 +15466,9 @@ msgstr "수"
 msgid "Week"
 msgstr "주"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "주간"
 
@@ -15020,12 +15476,12 @@ msgstr "주간"
 msgid "When active"
 msgstr "연락 허용 시간대"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "너비"
@@ -15035,28 +15491,28 @@ msgstr "너비"
 msgid "With data collection"
 msgstr ""
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr ""
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr ""
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr ""
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr ""
 
@@ -15065,7 +15521,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15078,180 +15534,165 @@ msgstr "Working time"
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr ""
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Y축 최댓값"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Y축 최솟값"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Y축"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr ""
 
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr ""
-
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr ""
-
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr ""
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15259,96 +15700,105 @@ msgstr ""
 msgid "Year"
 msgstr "년"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "연간"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "예"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr ""
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr ""
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr ""
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr ""
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr ""
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr ""
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15361,7 +15811,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr ""
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15380,8 +15830,8 @@ msgid "Zabbix User"
 msgstr "ZABBIX 사용자"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15407,10 +15857,11 @@ msgstr "ZABBIX 내장"
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr ""
@@ -15423,7 +15874,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15431,15 +15882,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "ZABBIX 서버 가동 중"
 
@@ -15448,11 +15899,11 @@ msgstr "ZABBIX 서버 가동 중"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr ""
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr ""
 
@@ -15460,25 +15911,20 @@ msgstr ""
 msgid "Zabbix trapper"
 msgstr "ZABBIX trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr ""
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr ""
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr ""
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15487,19 +15933,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "전체"
 
@@ -15507,19 +15953,15 @@ msgstr "전체"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr ""
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "파랑"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "녹색"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "빨강"
 
@@ -15531,83 +15973,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "평균"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr ""
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr ""
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr ""
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15629,19 +16037,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "아이템 복사 대상..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15653,47 +16057,49 @@ msgstr ""
 msgid "executed"
 msgstr ""
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr ""
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr ""
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr ""
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr ""
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr ""
 
@@ -15701,7 +16107,7 @@ msgstr ""
 msgid "in"
 msgstr "범위 내"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15711,7 +16117,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15719,20 +16125,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr ""
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "포함"
@@ -15741,12 +16147,12 @@ msgstr "포함"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15755,46 +16161,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr ""
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr ""
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "최대"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "최소"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15803,17 +16209,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr ""
@@ -15826,12 +16232,14 @@ msgstr "범위 밖"
 msgid "not like"
 msgstr "포함 안함"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "정지 중"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr ""
 
@@ -15840,57 +16248,61 @@ msgstr ""
 msgid "not sent"
 msgstr "미송신"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr ""
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "of"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr ""
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr ""
 
-#: include/page_header.php:114
-msgid "refreshed every"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15899,25 +16311,24 @@ msgstr ""
 msgid "remember selected"
 msgstr ""
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "가동 중"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "초"
 
@@ -15930,7 +16341,7 @@ msgstr ""
 msgid "sent"
 msgstr "송신 완료"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr ""
 
@@ -15938,36 +16349,36 @@ msgstr ""
 msgid "show icon mappings"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr ""
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr ""
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr ""
 
@@ -15979,11 +16390,11 @@ msgstr ""
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr ""
diff --git a/frontends/php/locale/lt/LC_MESSAGES/frontend.po b/frontends/php/locale/lt/LC_MESSAGES/frontend.po
index 33611047d42..e69e597558f 100644
--- a/frontends/php/locale/lt/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/lt/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-10-10 08:29+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -14,22 +14,24 @@ msgstr ""
 "X-Generator: Pootle 2.5.0\n"
 "X-POOTLE-MTIME: 1381386543.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" turi būti tarp 1970.01.01 ir 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Rodyti OK trigerius\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius.\"Rodyti OK trigerius\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius.\"Rodyti OK trigerius\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius.\"Rodyti OK trigerius\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius.\"Rodyti OK trigerius\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Trigeriai mirksi keičiantis statusui\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius.\"Trigeriai mirksi keičiantis statusui\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius.\"Trigeriai mirksi keičiantis statusui\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius.\"Trigeriai mirksi keičiantis statusui\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius.\"Trigeriai mirksi keičiantis statusui\" reikšmė turi būti \"0\" arba teigiamas sveikasis skaičius."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -37,7 +39,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -50,7 +52,7 @@ msgstr[2] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (metai %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
@@ -58,10 +60,8 @@ msgstr[0] "%1$s Elementą"
 msgstr[1] "%1$s Elementus"
 msgstr[2] "%1$s Elementų"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
@@ -69,7 +69,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -86,7 +86,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -110,23 +110,23 @@ msgstr[0] "%d įtaisą"
 msgstr[1] "%d įtaisus"
 msgstr[2] "%d įtaisų"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - begalybės)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Tik super administratoriai gali kurti grupes)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(dienomis)"
 
@@ -134,34 +134,34 @@ msgstr "(dienomis)"
 msgid "(in sec)"
 msgstr "(sekundėmis)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(mažiausiai 60 sekundžių, 0 - naudoti numatytą veiksmą)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(nerastas įgaliotasis serveris)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[BULK ACKNOWLEDGE]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 arba 1"
 
@@ -177,7 +177,7 @@ msgstr "10 sekundžių"
 msgid "30 seconds"
 msgstr "30 sekundžių"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D vaizdas"
 
@@ -193,7 +193,7 @@ msgstr "5 sekundės"
 msgid "500 latest values"
 msgstr "500 paskutinių reikšmių"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -212,12 +212,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ALARM ACKNOWLEDGES"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "AND"
 
@@ -230,19 +229,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "AVAILABILITY REPORT"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Absoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra < NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra < NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra < NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra < NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Absoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra = NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra = NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra = NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra = NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Absoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra > NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra > NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra > NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra > NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Absoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra NOT NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra NOT NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra NOT NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra NOT NAbsoliutus skirtumas tarp paskutinės ir prieš tai esančios reikšmės yra NOT N"
 
@@ -254,46 +253,46 @@ msgstr "Priimtinas SLA"
 msgid "Access denied!"
 msgstr "Prieiga uždrausta!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
 # 1 sekundei

 # 2-9 sekundėms

 # 20-100 sekundžių and e.t.c.
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Paskyra užblokuota %s sekundžių"
 
 # There is no acronym for this word in LT language we're writing all word "Pripažinimas"
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Pripažinimas"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Pripažinimas"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Pripažinimas pridėtas"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Pripažinimo aliarmas pagal"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Pripažinti ir sugrįžti"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Pripažinimo būsena"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Pripažintas"
 
@@ -318,63 +317,66 @@ msgstr "Pripažinimas išjungtas"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Veiksmas"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Veiksmas \"%1$s\" turi neteisinga reikšme \"esc_period\" (minimaliai %2$s sekundžių).Veiksmas \"%1$s\" turi neteisinga reikšme \"esc_period\" (minimaliai %2$s sekundžių).Veiksmas \"%1$s\" turi neteisinga reikšme \"esc_period\" (minimaliai %2$s sekundžių).Veiksmas \"%1$s\" turi neteisinga reikšme \"esc_period\" (minimaliai %2$s sekundžių).Veiksmas \"%1$s\" turi neteisinga reikšme \"esc_period\" (minimaliai %2$s sekundžių)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Veiksmas pridėtas"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Veiksmas ištrintas"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -388,21 +390,21 @@ msgstr[2] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Veiksmo operacijos"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Veiksmas atnaujintas"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Veiksmai"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktyvus"
@@ -412,80 +414,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Aktyvus"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktyvus nuo"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktyvus iki"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Pridėti"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Pridėti komentarą pagal"
 
@@ -501,27 +506,23 @@ msgstr "Pridėti mazgą"
 msgid "Add link"
 msgstr "Pridėti nuorodą"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Pridėti trūkstamą"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Pridėti prototipą"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Pridėti prie"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Pridėti prie mėgstamiausių"
@@ -530,7 +531,7 @@ msgstr "Pridėti prie mėgstamiausių"
 msgid "Add to host group"
 msgstr "Pridėti prie mazgų grupės"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Pridėti prie mazgų grupių"
 
@@ -542,7 +543,7 @@ msgstr "Pridėtas"
 msgid "Admin"
 msgstr "Adminas"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administravimas"
 
@@ -550,34 +551,34 @@ msgstr "Administravimas"
 msgid "Advanced labels"
 msgstr "Sudėtingesnė žymė"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Laikotarpis"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Laikotarpis mažesnis už"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Laikotarpis mažesnis už %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agentas"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Agento sąsaja"
@@ -586,12 +587,12 @@ msgstr "Agento sąsaja"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agentas arba SNMP arba JMX arba IPMI sąsaja"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alternatyvus vardas"
 
@@ -599,87 +600,90 @@ msgstr "Alternatyvus vardas"
 msgid "Align icons"
 msgstr "Piktogramų lygiavimas"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Visi"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Visos grupės"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Visos nuorodos turi turėti apibrėžtą \"Pavadinimą\" ir \"URL\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Leidžiami mazgai"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Bet kuris"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Bet kuri simbolio eilutė įtraukta"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Programa"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Programa \"%1$s\" jau egzistuoja."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Programa pridėta"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
@@ -687,36 +691,36 @@ msgstr[0] "Programa ištrinta"
 msgstr[1] "Programa ištrinta"
 msgstr[2] "Programa ištrinta"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Programos klaida."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Programa atnaujinta"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Programa su ID \"%1$s\" yra nepasiekiama ant \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Programos"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Taikyti"
 
@@ -725,16 +729,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Kreipiantis"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Bal"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Balandis"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Ar tikrai jūs norite atlikti šį veiksmą?"
 
@@ -750,9 +754,9 @@ msgstr "Srities dydis"
 msgid "Area type"
 msgstr "Srities tipas"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -766,22 +770,17 @@ msgstr "Kaip gryną tekstą"
 msgid "Asset tag"
 msgstr "Aprašo punkto gairė"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
@@ -789,7 +788,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
@@ -797,23 +796,25 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "Ties (valanda:minutė)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Bent vienas mazgas arba grupė turi būti pažymėti."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Bent vienas priežiūros periodas turi būti sukurtas."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Auditas"
@@ -833,26 +834,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Rugpj"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autentifikacija"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Autentifikacijos algoritmas"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -911,9 +914,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automatinis"
 
@@ -921,20 +924,20 @@ msgstr "Automatinis"
 msgid "Automatic icon mapping"
 msgstr "Automatinis piktogramų išdėstymas"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Automatinis piktogramų pažymėjimas"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Prieinamumas"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Prieinamumo ataskaita"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Pasiekiamas"
 
@@ -943,36 +946,36 @@ msgstr "Pasiekiamas"
 msgid "Average"
 msgstr "Vidutinis"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Vidutinis pagal"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Vidutinė laikotarpio reikšmė T yra < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Vidutinė laikotarpio reikšmė T yra = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Vidutinė laikotarpio reikšmė T yra > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Vidutinė laikotarpio reikšmė T yra NOT N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Koordinačių ašį"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Fonas"
@@ -981,7 +984,7 @@ msgstr "Fonas"
 msgid "Background image"
 msgstr "Fono paveikslėlis"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Stulpinė ataskaita"
 
@@ -991,8 +994,8 @@ msgid "Base DN"
 msgstr "Bazė DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Pagrindinė autentifikacija"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -1004,15 +1007,15 @@ msgstr "Įrišti DN"
 msgid "Bind password"
 msgstr "Įrišti slaptažodį"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Juoda ir Mėlyna"
 
@@ -1026,8 +1029,8 @@ msgstr "Mirksinti"
 msgid "Blocked"
 msgstr "Užblokuotas"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Pusjuodė eilutė"
 
@@ -1035,22 +1038,22 @@ msgstr "Pusjuodė eilutė"
 msgid "Boolean"
 msgstr "Būlio"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Apačia"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Šviesinti"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgarų (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Didžiosios dalies pripažinimas"
 
@@ -1076,7 +1079,7 @@ msgstr "CONFIGURATION OF APPLICATIONS"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURATION OF AUTHENTICATION"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1106,7 +1109,7 @@ msgstr "CONFIGURATION OF HOST GROUPS"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURATION OF HOSTS"
 
@@ -1118,7 +1121,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURATION OF ICON MAPPING"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURATION OF IMAGES"
 
@@ -1127,14 +1130,14 @@ msgstr "CONFIGURATION OF IMAGES"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURATION OF IT SERVICES"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURATION OF ITEM PROTOTYPES"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURATION OF ITEMS"
 
@@ -1163,7 +1166,7 @@ msgstr "CONFIGURATION OF NETWORK MAPS"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURATION OF PROXIES"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURATION OF REGULAR EXPRESSIONS"
 
@@ -1183,7 +1186,7 @@ msgstr "CONFIGURATION OF SCRIPTS"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURATION OF SLIDE SHOWS"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURATION OF TEMPLATES"
 
@@ -1199,7 +1202,7 @@ msgstr "CONFIGURATION OF TRIGGER SEVERITIES"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURATION OF TRIGGERS"
 
@@ -1231,22 +1234,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURATION OF ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1255,21 +1258,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Apskaičiuoti SLA, priimtinas SLA (į %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Apskaičiuotas"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Apskaičiavimo leidimai"
 
@@ -1277,92 +1280,95 @@ msgstr "Apskaičiavimo leidimai"
 msgid "Callback"
 msgstr "Atgalinis skambutis"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Kanada (136 ženklų)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Negalima pripažinti įvykio"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Negalima pridėti veiksmo"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Negalima pridėti programą"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Negalima pridėti priklausomybės iš mazgo į šabloną."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Negalima pridėti priklausomybės iš trigerio \"%1$s:%2$s\" į neegzistuojantį trigerį \"%3$s:%4$s\".Negalima pridėti priklausomybės iš trigerio \"%1$s:%2$s\" į neegzistuojantį trigerį \"%3$s:%4$s\".Negalima pridėti priklausomybės iš trigerio \"%1$s:%2$s\" į neegzistuojantį trigerį \"%3$s:%4$s\".Negalima pridėti priklausomybės iš trigerio \"%1$s:%2$s\" į neegzistuojantį trigerį \"%3$s:%4$s\".Negalima pridėti priklausomybės iš trigerio \"%1$s:%2$s\" į neegzistuojantį trigerį \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Negalima pridėti atradimo taisyklės"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Negalima pridėti grafiko"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Negalima pridėti grupės"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Negalima pridėti mazgo"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1370,24 +1376,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Negalima pridėti atvaizdo"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Negalima pridėti atvaizdo."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Negalima pridėti elemento"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1395,20 +1401,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr "Negalima pridėti makro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Negalima pridėti priežiūros"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Negalima pridėti medijos tipo"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Negalima pridėti daugiau nei vieno elemento su tipu \"Grafiko suma\" ant grafiko \"%1$s\".Negalima pridėti daugiau nei vieno elemento su tipu \"Grafiko suma\" ant grafiko \"%1$s\".Negalima pridėti daugiau nei vieno elemento su tipu \"Grafiko suma\" ant grafiko \"%1$s\".Negalima pridėti daugiau nei vieno elemento su tipu \"Grafiko suma\" ant grafiko \"%1$s\".Negalima pridėti daugiau nei vieno elemento su tipu \"Grafiko suma\" ant grafiko \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1417,24 +1423,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Negalima pridėti tinklo žemėlapio"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Negalima pridėti įgaliotojo serverio"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Negalima pridėti reguliarios išraiškos"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Negalima pridėti ekrano"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Negalima pridėti skripto"
 
@@ -1446,27 +1452,27 @@ msgstr "Negalima pridėti serviso"
 msgid "Cannot add slide show"
 msgstr "Negalima pridėti skaidrių rodymo"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Negalima pridėti šablono"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Negalima pridėti trigerio"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Negalima pridėti vartotojo"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Negalima pridėti vartotojo. Abu slaptažodžiai turi sutapti."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Negalima pridėti vartotojų."
 
@@ -1474,7 +1480,7 @@ msgstr "Negalima pridėti vartotojų."
 msgid "Cannot add value map"
 msgstr "Negalima pridėti reikšmių žemėlapio"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1494,23 +1500,23 @@ msgstr "Negalima pakeisti autentifikacijos metodo į LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Negalima pakeisti autentifikacijos metodo į Zabbix vidinį"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Negalima išvalyti istorijos"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Negalima klonuoti grafiko prototipų."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Negalima klonuoti elemento prototipų."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Negalima klonuoti trigerio prototipų."
 
@@ -1518,20 +1524,20 @@ msgstr "Negalima klonuoti trigerio prototipų."
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Negalima prisijungti prie traperio jungties zabbixo serverio tarnybos, bet turėtų būti galima paleisti skriptą.Negalima prisijungti prie traperio jungties zabbixo serverio tarnybos, bet turėtų būti galima paleisti skriptą.Negalima prisijungti prie traperio jungties zabbixo serverio tarnybos, bet turėtų būti galima paleisti skriptą.Negalima prisijungti prie traperio jungties zabbixo serverio tarnybos, bet turėtų būti galima paleisti skriptą.Negalima prisijungti prie traperio jungties zabbixo serverio tarnybos, bet turėtų būti galima paleisti skriptą."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Negalima nukopijuoti grafiko"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Negalima nukopijuoti elementų"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1540,19 +1546,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr ""
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr ""
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr ""
 
@@ -1560,102 +1566,102 @@ msgstr ""
 msgid "Cannot create icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr ""
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr ""
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
 msgid "Cannot delete group"
-msgstr ""
+msgid_plural "Cannot delete groups"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr ""
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1663,80 +1669,80 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr ""
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr ""
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr ""
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr ""
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr ""
 
@@ -1744,77 +1750,80 @@ msgstr ""
 msgid "Cannot delete service"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr ""
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr ""
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1822,88 +1831,88 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1918,146 +1927,140 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2068,34 +2071,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2105,41 +2127,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2152,12 +2174,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr ""
@@ -2170,7 +2194,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
@@ -2178,52 +2202,53 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr ""
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr ""
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2243,7 +2268,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2252,11 +2277,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2264,11 +2289,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr ""
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr ""
 
@@ -2277,217 +2302,226 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr ""
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr ""
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr ""
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr ""
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr ""
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr ""
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr ""
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr ""
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr ""
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr ""
 
@@ -2499,24 +2533,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr ""
 
@@ -2528,16 +2562,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr ""
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr ""
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2545,28 +2579,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr ""
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr ""
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr ""
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr ""
 
@@ -2578,40 +2608,41 @@ msgstr ""
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr ""
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr ""
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr ""
 
@@ -2619,15 +2650,15 @@ msgstr ""
 msgid "Cannot update value map"
 msgstr ""
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr ""
 
@@ -2636,47 +2667,47 @@ msgstr ""
 msgid "Case sensitive"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr ""
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr ""
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr ""
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr ""
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr ""
 
@@ -2685,48 +2716,48 @@ msgid "Chassis"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr ""
 
@@ -2735,44 +2766,44 @@ msgid "Check type"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr ""
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr ""
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr ""
@@ -2787,34 +2818,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr ""
 
@@ -2824,69 +2856,69 @@ msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr ""
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr ""
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr ""
 
@@ -2901,7 +2933,7 @@ msgstr ""
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr ""
 
@@ -2909,41 +2941,31 @@ msgstr ""
 msgid "Command actions"
 msgstr ""
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr ""
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr ""
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr ""
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr ""
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr ""
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2951,29 +2973,39 @@ msgstr ""
 msgid "Condition"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr ""
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3136,23 +3168,23 @@ msgstr ""
 msgid "Configure (Filter %s)"
 msgstr ""
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr ""
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr ""
@@ -3200,7 +3232,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3208,30 +3240,38 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr ""
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr ""
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr ""
 
@@ -3251,6 +3291,10 @@ msgstr ""
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3268,7 +3312,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3281,15 +3325,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
-#: adm.iconmapping.php:126
-msgid "Create icon map"
+#: adm.images.php:151
+msgid "Create icon"
 msgstr ""
 
-#: adm.images.php:149
-msgid "Create image"
+#: adm.iconmapping.php:126
+msgid "Create icon map"
 msgstr ""
 
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr ""
 
@@ -3313,6 +3357,10 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr ""
@@ -3337,11 +3385,11 @@ msgstr ""
 msgid "Create slide show"
 msgstr ""
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr ""
 
@@ -3365,42 +3413,42 @@ msgstr ""
 msgid "Create value map"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3410,51 +3458,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr ""
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr ""
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3467,7 +3516,7 @@ msgstr ""
 msgid "Custom label"
 msgstr ""
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3481,7 +3530,7 @@ msgstr ""
 msgid "Custom screens"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr ""
 
@@ -3501,18 +3550,14 @@ msgstr ""
 msgid "Custom slides"
 msgstr ""
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr ""
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr ""
@@ -3528,28 +3573,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr ""
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr ""
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr ""
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3557,25 +3602,25 @@ msgstr ""
 msgid "DNS name"
 msgstr ""
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr ""
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr ""
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr ""
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr ""
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr ""
 
@@ -3587,20 +3632,21 @@ msgstr ""
 msgid "Dashboard filter"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr ""
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3623,11 +3669,12 @@ msgstr ""
 msgid "Data type"
 msgstr ""
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr ""
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr ""
 
@@ -3635,35 +3682,39 @@ msgstr ""
 msgid "Database monitor"
 msgstr ""
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr ""
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr ""
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr ""
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr ""
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr ""
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr ""
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr ""
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr ""
 
@@ -3683,53 +3734,52 @@ msgstr ""
 msgid "Date HW purchased"
 msgstr ""
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr ""
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr ""
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr ""
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr ""
 
@@ -3737,22 +3787,22 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr ""
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr ""
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr ""
 
@@ -3762,15 +3812,14 @@ msgstr ""
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr ""
 
@@ -3783,11 +3832,11 @@ msgid "Default delay (in seconds)"
 msgstr ""
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr ""
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3810,30 +3859,34 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr ""
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr ""
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr ""
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3841,53 +3894,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
+#: include/views/configuration.item.list.php:278
+msgid "Delete history of selected items?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:274
-msgid "Delete history of selected items?"
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3895,11 +3948,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3907,7 +3964,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr ""
 
@@ -3915,71 +3972,67 @@ msgstr ""
 msgid "Delete screen?"
 msgstr ""
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr ""
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr ""
@@ -3988,27 +4041,27 @@ msgstr ""
 msgid "Delete selected groups?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr ""
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr ""
 
@@ -4016,31 +4069,31 @@ msgstr ""
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr ""
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr ""
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr ""
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr ""
 
@@ -4048,15 +4101,15 @@ msgstr ""
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr ""
 
@@ -4068,11 +4121,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr ""
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr ""
 
@@ -4088,11 +4141,15 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4101,15 +4158,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr ""
 
@@ -4117,62 +4174,62 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4181,35 +4238,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr ""
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr ""
 
@@ -4217,30 +4274,41 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr ""
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr ""
 
@@ -4253,71 +4321,71 @@ msgid "Device"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4341,48 +4409,44 @@ msgstr ""
 msgid "Disable host"
 msgstr ""
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr ""
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr ""
 
@@ -4390,11 +4454,11 @@ msgstr ""
 msgid "Disable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr ""
 
@@ -4402,42 +4466,47 @@ msgstr ""
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr ""
 
@@ -4450,7 +4519,7 @@ msgstr ""
 msgid "Discovered"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4458,17 +4527,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr ""
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr ""
 
@@ -4476,17 +4545,17 @@ msgstr ""
 msgid "Discovery check"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4495,69 +4564,72 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr ""
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr ""
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr ""
 
@@ -4569,7 +4641,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr ""
 
@@ -4578,32 +4650,32 @@ msgstr ""
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr ""
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr ""
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr ""
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr ""
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4613,30 +4685,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr ""
 
@@ -4654,74 +4726,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr ""
 
@@ -4729,13 +4802,13 @@ msgstr ""
 msgid "EVENTS"
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4743,9 +4816,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr ""
 
@@ -4753,7 +4826,7 @@ msgstr ""
 msgid "Edit map element"
 msgstr ""
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4761,27 +4834,61 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr ""
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr ""
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr ""
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4789,76 +4896,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4867,11 +4996,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4879,11 +5008,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr ""
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4903,11 +5036,11 @@ msgstr ""
 msgid "Enable host"
 msgstr ""
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr ""
 
@@ -4920,36 +5053,32 @@ msgstr ""
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr ""
 
@@ -4957,11 +5086,11 @@ msgstr ""
 msgid "Enable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4969,64 +5098,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr ""
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr ""
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr ""
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -5044,15 +5177,15 @@ msgstr ""
 msgid "Event ID"
 msgstr ""
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr ""
 
@@ -5061,7 +5194,7 @@ msgstr ""
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr ""
 
@@ -5069,7 +5202,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr ""
 
@@ -5089,9 +5222,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr ""
 
@@ -5099,36 +5233,41 @@ msgstr ""
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr ""
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr ""
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr ""
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr ""
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5136,13 +5275,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5154,7 +5293,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5164,12 +5303,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr ""
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr ""
 
@@ -5177,22 +5316,22 @@ msgstr ""
 msgid "Export to CSV"
 msgstr ""
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr ""
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5200,11 +5339,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr ""
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5225,17 +5365,17 @@ msgid "External check"
 msgstr ""
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr ""
 
@@ -5244,16 +5384,17 @@ msgstr ""
 msgid "FTP"
 msgstr ""
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr ""
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr ""
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5261,40 +5402,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr ""
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr ""
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr ""
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr ""
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr ""
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr ""
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr ""
 
@@ -5338,19 +5479,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5359,13 +5500,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5373,68 +5514,71 @@ msgstr ""
 msgid "Filled region"
 msgstr ""
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr ""
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr ""
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr ""
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5443,8 +5587,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr ""
 
@@ -5454,76 +5598,80 @@ msgstr ""
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr ""
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr ""
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr ""
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr ""
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr ""
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr ""
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr ""
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5533,50 +5681,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr ""
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr ""
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr ""
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr ""
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5584,65 +5732,65 @@ msgid "Get support"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr ""
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr ""
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5651,66 +5799,73 @@ msgid "Gradient line"
 msgstr ""
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr ""
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr ""
 
@@ -5722,54 +5877,59 @@ msgstr ""
 msgid "Graph item"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5781,49 +5941,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr ""
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr ""
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5832,54 +5994,58 @@ msgstr ""
 msgid "Grid"
 msgstr ""
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr ""
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr ""
+msgid_plural "Groups deleted"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5890,40 +6056,42 @@ msgstr ""
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr ""
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr ""
 
@@ -5931,22 +6099,13 @@ msgstr ""
 msgid "Groups in maintenance"
 msgstr ""
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5963,7 +6122,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5981,7 +6140,8 @@ msgstr ""
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -6002,12 +6162,17 @@ msgstr ""
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr ""
@@ -6020,15 +6185,15 @@ msgstr ""
 msgid "Hexadecimal"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr ""
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr ""
 
@@ -6044,15 +6209,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr ""
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6061,23 +6226,23 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -6098,80 +6263,80 @@ msgstr ""
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr ""
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6183,31 +6348,31 @@ msgstr ""
 msgid "Host access"
 msgstr ""
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr ""
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr ""
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
@@ -6215,36 +6380,38 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr ""
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6261,14 +6428,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr ""
 
@@ -6278,8 +6446,8 @@ msgstr ""
 msgid "Host interface"
 msgstr ""
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6295,7 +6463,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6304,18 +6472,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6324,74 +6492,74 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6403,7 +6571,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6415,51 +6583,52 @@ msgstr ""
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr ""
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr ""
 
@@ -6467,11 +6636,11 @@ msgstr ""
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6483,37 +6652,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr ""
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr ""
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr ""
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr ""
 
@@ -6531,22 +6701,22 @@ msgstr ""
 msgid "IMAP"
 msgstr ""
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr ""
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6554,26 +6724,26 @@ msgstr ""
 msgid "IP address"
 msgstr ""
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr ""
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6581,22 +6751,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr ""
 
@@ -6606,7 +6776,7 @@ msgstr ""
 msgid "IPMI sensor"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr ""
 
@@ -6639,7 +6809,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6655,25 +6825,25 @@ msgid "ITEMS"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr ""
 
@@ -6694,42 +6864,44 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6742,7 +6914,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6750,29 +6923,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6780,21 +6953,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr ""
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6803,7 +6978,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr ""
 
@@ -6811,12 +6986,13 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6825,66 +7001,66 @@ msgid "Image updated"
 msgstr ""
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr ""
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr ""
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr ""
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr ""
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr ""
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6897,244 +7073,282 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr ""
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr ""
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7144,11 +7358,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7157,11 +7371,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7169,74 +7383,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr ""
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7244,182 +7484,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr ""
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr ""
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr ""
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr ""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr ""
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr ""
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7428,64 +7687,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7506,52 +7769,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7560,7 +7828,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7580,7 +7849,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7590,43 +7859,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7635,15 +7910,15 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr ""
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
 msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr ""
 
@@ -7651,31 +7926,32 @@ msgstr ""
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr ""
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7695,7 +7971,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7703,7 +7979,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7716,19 +7992,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr ""
 
@@ -7738,112 +8014,114 @@ msgstr ""
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr ""
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7852,7 +8130,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7860,12 +8138,12 @@ msgstr ""
 msgid "Is online?"
 msgstr ""
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr ""
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7873,70 +8151,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr ""
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr ""
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr ""
 
@@ -7944,18 +8223,18 @@ msgstr ""
 msgid "Item count"
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr ""
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7970,58 +8249,58 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -8029,92 +8308,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr ""
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr ""
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr ""
 
@@ -8126,72 +8405,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr ""
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr ""
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr ""
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr ""
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr ""
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr ""
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr ""
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr ""
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8200,40 +8479,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr ""
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr ""
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr ""
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr ""
 
@@ -8264,37 +8543,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr ""
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr ""
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr ""
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr ""
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr ""
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8307,19 +8586,19 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8339,28 +8618,28 @@ msgstr ""
 msgid "Last 7 days"
 msgstr ""
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr ""
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr ""
 
@@ -8368,66 +8647,67 @@ msgstr ""
 msgid "Last seen (age)"
 msgstr ""
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr ""
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr ""
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr ""
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr ""
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr ""
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr ""
 
@@ -8435,39 +8715,29 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr ""
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8479,50 +8749,50 @@ msgstr ""
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr ""
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr ""
 
@@ -8539,36 +8809,36 @@ msgid "Location longitude"
 msgstr ""
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr ""
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr ""
@@ -8577,12 +8847,12 @@ msgstr ""
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8593,12 +8863,12 @@ msgstr ""
 msgid "Login as Guest"
 msgstr ""
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8607,8 +8877,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8629,22 +8900,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8656,7 +8923,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr ""
 
@@ -8681,49 +8948,49 @@ msgstr ""
 msgid "Macro"
 msgstr ""
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr ""
 
@@ -8731,31 +8998,36 @@ msgstr ""
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr ""
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr ""
 
@@ -8763,7 +9035,7 @@ msgstr ""
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr ""
 
@@ -8779,25 +9051,25 @@ msgstr ""
 msgid "Maintenance type"
 msgstr ""
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr ""
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8808,12 +9080,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8823,12 +9095,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8845,12 +9117,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr ""
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8860,23 +9132,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr ""
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr ""
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr ""
 
@@ -8884,28 +9156,34 @@ msgstr ""
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr ""
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr ""
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr ""
@@ -8919,35 +9197,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr ""
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8955,16 +9209,16 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
@@ -8972,92 +9226,85 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr ""
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr ""
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr ""
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr ""
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr ""
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr ""
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr ""
 
@@ -9072,14 +9319,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr ""
 
@@ -9089,7 +9336,7 @@ msgstr ""
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr ""
 
@@ -9097,66 +9344,66 @@ msgstr ""
 msgid "Message actions"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr ""
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9165,7 +9412,7 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
@@ -9173,73 +9420,70 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr ""
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9249,7 +9493,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9261,18 +9505,18 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr ""
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr ""
 
@@ -9280,33 +9524,33 @@ msgstr ""
 msgid "Monitored host"
 msgstr ""
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr ""
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9314,7 +9558,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9323,19 +9567,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr ""
 
@@ -9348,60 +9592,58 @@ msgstr ""
 msgid "NNTP"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr ""
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
+msgid "NTLM"
 msgstr ""
 
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9412,26 +9654,32 @@ msgstr ""
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9450,12 +9698,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9463,7 +9711,7 @@ msgstr ""
 msgid "Network map added"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr ""
 
@@ -9475,7 +9723,7 @@ msgstr ""
 msgid "Network maps"
 msgstr ""
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr ""
 
@@ -9483,24 +9731,24 @@ msgstr ""
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr ""
 
@@ -9511,16 +9759,16 @@ msgstr ""
 msgid "New flexible interval"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr ""
 
@@ -9528,83 +9776,99 @@ msgstr ""
 msgid "New media"
 msgstr ""
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr ""
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr ""
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9612,25 +9876,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9656,8 +9920,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9667,7 +9931,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9675,30 +9939,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9707,27 +9972,27 @@ msgstr ""
 msgid "No data collection"
 msgstr ""
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9735,39 +10000,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9782,7 +10047,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9791,7 +10056,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9800,48 +10069,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9854,17 +10124,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9883,33 +10158,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9928,7 +10210,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9944,7 +10226,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9953,15 +10235,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9973,133 +10255,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr ""
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10107,7 +10434,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10115,82 +10442,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr ""
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10199,57 +10527,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr ""
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr ""
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr ""
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr ""
 
@@ -10258,7 +10587,7 @@ msgstr ""
 msgid "Not classified"
 msgstr ""
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr ""
 
@@ -10271,8 +10600,8 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr ""
@@ -10285,7 +10614,7 @@ msgstr ""
 msgid "Nothing"
 msgstr ""
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10293,87 +10622,87 @@ msgstr ""
 msgid "Notification report"
 msgstr ""
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr ""
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr ""
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10381,88 +10710,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr ""
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr ""
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr ""
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr ""
 
@@ -10477,16 +10806,18 @@ msgid "OEM"
 msgstr ""
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr ""
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10502,8 +10833,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr ""
 
@@ -10523,11 +10853,12 @@ msgstr ""
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr ""
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10535,25 +10866,25 @@ msgstr ""
 msgid "Octal"
 msgstr ""
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr ""
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr ""
 
@@ -10561,111 +10892,114 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr ""
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10674,28 +11008,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr ""
@@ -10704,25 +11038,27 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10752,24 +11088,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr ""
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr ""
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr ""
 
@@ -10777,19 +11113,19 @@ msgstr ""
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10799,21 +11135,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10826,14 +11162,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr ""
 
@@ -10841,7 +11174,7 @@ msgstr ""
 msgid "Overview by proxy"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10850,147 +11183,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10999,32 +11340,34 @@ msgstr ""
 msgid "POP"
 msgstr ""
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr ""
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr ""
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr ""
 
@@ -11033,7 +11376,7 @@ msgstr ""
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11053,33 +11396,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11089,20 +11432,21 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr ""
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr ""
 
@@ -11111,21 +11455,21 @@ msgstr ""
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11133,12 +11477,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr ""
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr ""
@@ -11148,24 +11492,24 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr ""
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr ""
 
@@ -11177,55 +11521,56 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr ""
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr ""
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11233,51 +11578,51 @@ msgstr ""
 msgid "Port range"
 msgstr ""
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr ""
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr ""
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr ""
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11326,30 +11671,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11361,16 +11707,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr ""
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr ""
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr ""
 
@@ -11378,75 +11724,71 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr ""
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr ""
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11457,7 +11799,7 @@ msgstr ""
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr ""
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr ""
 
@@ -11465,18 +11807,18 @@ msgstr ""
 msgid "RMCP+"
 msgstr ""
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr ""
 
@@ -11488,7 +11830,7 @@ msgstr ""
 msgid "Received value"
 msgstr ""
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11496,11 +11838,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11511,28 +11853,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr ""
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr ""
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr ""
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr ""
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr ""
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr ""
 
@@ -11550,48 +11892,52 @@ msgstr ""
 msgid "Regular expression"
 msgstr ""
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11608,26 +11954,28 @@ msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11638,21 +11986,19 @@ msgstr ""
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr ""
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11660,11 +12006,11 @@ msgstr ""
 msgid "Remove element"
 msgstr ""
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr ""
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11673,7 +12019,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11685,28 +12031,28 @@ msgstr ""
 msgid "Remove link"
 msgstr ""
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr ""
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr ""
 
@@ -11714,35 +12060,36 @@ msgstr ""
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr ""
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr ""
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11750,29 +12097,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr ""
 
@@ -11791,9 +12140,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11806,7 +12155,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr ""
@@ -11821,15 +12170,15 @@ msgstr ""
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr ""
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr ""
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr ""
 
@@ -11842,7 +12191,8 @@ msgstr ""
 msgid "Result type"
 msgstr ""
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11850,60 +12200,69 @@ msgstr ""
 msgid "Retries left"
 msgstr ""
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr ""
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr ""
 
@@ -11911,11 +12270,11 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr ""
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr ""
 
@@ -11960,20 +12319,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11989,7 +12348,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr ""
 
@@ -12004,13 +12363,13 @@ msgstr ""
 msgid "SLA"
 msgstr ""
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr ""
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr ""
 
@@ -12019,17 +12378,17 @@ msgstr ""
 msgid "SMTP"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr ""
@@ -12045,7 +12404,7 @@ msgstr ""
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr ""
 
@@ -12057,9 +12416,9 @@ msgstr ""
 msgid "SNMP community"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -12068,7 +12427,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12092,7 +12451,7 @@ msgstr ""
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12110,7 +12469,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr ""
@@ -12119,15 +12478,35 @@ msgstr ""
 msgid "SSH agent"
 msgstr ""
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr ""
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr ""
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr ""
 
@@ -12135,92 +12514,92 @@ msgstr ""
 msgid "STATUS OF ZABBIX"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr ""
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr ""
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr ""
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr ""
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr ""
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr ""
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr ""
 
@@ -12232,7 +12611,7 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12243,126 +12622,125 @@ msgstr ""
 msgid "Screen"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr ""
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr ""
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr ""
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr ""
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr ""
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr ""
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12371,17 +12749,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr ""
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr ""
 
@@ -12402,7 +12780,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr ""
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr ""
 
@@ -12434,7 +12812,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr ""
 
@@ -12453,69 +12831,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr ""
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr ""
 
@@ -12531,7 +12916,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr ""
 
@@ -12539,11 +12924,11 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12552,17 +12937,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr ""
 
@@ -12574,7 +12959,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr ""
@@ -12583,44 +12968,44 @@ msgstr ""
 msgid "Server info"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr ""
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr ""
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12636,11 +13021,11 @@ msgstr ""
 msgid "Service port"
 msgstr ""
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr ""
 
@@ -12652,49 +13037,54 @@ msgstr ""
 msgid "Service updated"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr ""
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr ""
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr ""
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr ""
 
@@ -12724,35 +13114,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr ""
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr ""
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr ""
 
@@ -12760,19 +13151,23 @@ msgstr ""
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr ""
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr ""
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr ""
@@ -12781,11 +13176,11 @@ msgstr ""
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr ""
 
@@ -12805,6 +13200,10 @@ msgstr ""
 msgid "Simple graph"
 msgstr ""
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12842,7 +13241,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12860,16 +13259,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr ""
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12878,11 +13277,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12890,10 +13289,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr ""
 
@@ -12901,15 +13300,15 @@ msgstr ""
 msgid "Slides"
 msgstr ""
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr ""
 
@@ -12942,28 +13341,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12976,11 +13375,11 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr ""
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12988,63 +13387,63 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr ""
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -13057,7 +13456,7 @@ msgstr ""
 msgid "Status calculation algorithm"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr ""
 
@@ -13066,7 +13465,7 @@ msgid "Status of Web monitoring"
 msgstr ""
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr ""
 
@@ -13083,40 +13482,40 @@ msgid "Status only"
 msgstr ""
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr ""
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr ""
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr ""
@@ -13125,11 +13524,11 @@ msgstr ""
 msgid "Straight"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr ""
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13137,11 +13536,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13150,32 +13549,32 @@ msgid "Success Audit"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr ""
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr ""
 
@@ -13183,27 +13582,27 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr ""
 
@@ -13211,16 +13610,16 @@ msgstr ""
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13229,21 +13628,21 @@ msgid "System status"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13262,11 +13661,11 @@ msgid "TOTAL"
 msgstr ""
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
+msgid "TRIGGER DESCRIPTION"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr ""
 
@@ -13284,14 +13683,14 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13300,130 +13699,133 @@ msgid "Target type"
 msgstr ""
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr ""
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr ""
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr ""
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr ""
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr ""
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr ""
 
@@ -13431,11 +13833,11 @@ msgstr ""
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr ""
 
@@ -13449,22 +13851,22 @@ msgid "Test string"
 msgstr ""
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13472,7 +13874,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13487,12 +13889,12 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -13500,7 +13902,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -13508,7 +13910,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13517,19 +13919,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr ""
 
@@ -13541,11 +13943,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13554,11 +13956,11 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13570,27 +13972,27 @@ msgstr ""
 msgid "This year"
 msgstr ""
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr ""
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr ""
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr ""
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13599,28 +14001,28 @@ msgstr ""
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13628,54 +14030,54 @@ msgstr ""
 msgid "Time period"
 msgstr ""
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr ""
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13683,17 +14085,18 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr ""
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr ""
 
@@ -13711,7 +14114,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13728,77 +14131,77 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr ""
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr ""
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr ""
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr ""
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr ""
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
@@ -13806,14 +14209,14 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13829,11 +14232,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13841,7 +14245,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13854,12 +14258,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13871,54 +14275,54 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13926,23 +14330,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr ""
 
@@ -13950,40 +14362,41 @@ msgstr ""
 msgid "Trigger value"
 msgstr ""
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr ""
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr ""
 
@@ -13991,78 +14404,78 @@ msgstr ""
 msgid "Triggers overview"
 msgstr ""
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr ""
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr ""
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr ""
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr ""
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr ""
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr ""
 
@@ -14070,62 +14483,64 @@ msgstr ""
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr ""
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr ""
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr ""
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr ""
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr ""
 
@@ -14141,20 +14556,30 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr ""
 
@@ -14162,15 +14587,11 @@ msgstr ""
 msgid "USER PROFILE"
 msgstr ""
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr ""
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr ""
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14178,7 +14599,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr ""
 
@@ -14191,20 +14612,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr ""
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr ""
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr ""
 
@@ -14213,29 +14634,29 @@ msgstr ""
 msgid "Units"
 msgstr ""
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14245,23 +14666,20 @@ msgstr ""
 msgid "Unknown action"
 msgstr ""
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr ""
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14273,23 +14691,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr ""
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr ""
 
@@ -14297,61 +14715,61 @@ msgstr ""
 msgid "Unlink from template"
 msgstr ""
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14365,32 +14783,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14401,34 +14830,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr ""
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr ""
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr ""
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr ""
 
@@ -14436,55 +14865,55 @@ msgstr ""
 msgid "Updated status of host"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr ""
 
@@ -14492,14 +14921,14 @@ msgstr ""
 msgid "Upper level maps"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14507,9 +14936,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr ""
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14525,85 +14954,89 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr ""
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr ""
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr ""
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14621,34 +15054,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr ""
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr ""
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14674,243 +15107,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr ""
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr ""
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr ""
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14945,11 +15378,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14995,10 +15428,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr ""
 
@@ -15007,7 +15440,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -15019,8 +15452,8 @@ msgstr ""
 msgid "Values"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr ""
 
@@ -15033,64 +15466,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr ""
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr ""
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr ""
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr ""
 
@@ -15098,67 +15536,85 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr ""
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr ""
 
@@ -15166,9 +15622,9 @@ msgstr ""
 msgid "Week"
 msgstr ""
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr ""
 
@@ -15176,12 +15632,12 @@ msgstr ""
 msgid "When active"
 msgstr ""
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr ""
@@ -15191,28 +15647,28 @@ msgstr ""
 msgid "With data collection"
 msgstr ""
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr ""
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr ""
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr ""
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr ""
 
@@ -15221,7 +15677,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15234,180 +15690,165 @@ msgstr ""
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr ""
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr ""
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr ""
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr ""
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr ""
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr ""
 
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr ""
-
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr ""
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15415,96 +15856,105 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr ""
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr ""
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr ""
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr ""
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr ""
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr ""
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr ""
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr ""
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15517,7 +15967,7 @@ msgstr ""
 msgid "Zabbix"
 msgstr ""
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15536,8 +15986,8 @@ msgid "Zabbix User"
 msgstr ""
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15563,10 +16013,11 @@ msgstr ""
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr ""
@@ -15579,7 +16030,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15587,15 +16038,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr ""
 
@@ -15604,11 +16055,11 @@ msgstr ""
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr ""
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr ""
 
@@ -15616,25 +16067,20 @@ msgstr ""
 msgid "Zabbix trapper"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr ""
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr ""
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr ""
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15643,19 +16089,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr ""
 
@@ -15663,19 +16109,15 @@ msgstr ""
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr ""
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr ""
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr ""
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr ""
 
@@ -15687,83 +16129,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr ""
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr ""
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr ""
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr ""
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr ""
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr ""
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15785,19 +16193,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr ""
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15809,47 +16213,49 @@ msgstr ""
 msgid "executed"
 msgstr ""
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr ""
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr ""
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr ""
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr ""
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr ""
 
@@ -15857,7 +16263,7 @@ msgstr ""
 msgid "in"
 msgstr ""
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15867,7 +16273,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15875,20 +16281,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr ""
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr ""
@@ -15897,12 +16303,12 @@ msgstr ""
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15911,46 +16317,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr ""
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr ""
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15959,17 +16365,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr ""
@@ -15982,12 +16388,14 @@ msgstr ""
 msgid "not like"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr ""
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr ""
 
@@ -15996,57 +16404,61 @@ msgstr ""
 msgid "not sent"
 msgstr ""
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr ""
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr ""
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr ""
 
-#: include/page_header.php:114
-msgid "refreshed every"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16055,25 +16467,24 @@ msgstr ""
 msgid "remember selected"
 msgstr ""
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr ""
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr ""
 
@@ -16086,7 +16497,7 @@ msgstr ""
 msgid "sent"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr ""
 
@@ -16094,36 +16505,36 @@ msgstr ""
 msgid "show icon mappings"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr ""
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr ""
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr ""
 
@@ -16135,11 +16546,11 @@ msgstr ""
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr ""
diff --git a/frontends/php/locale/lv/LC_MESSAGES/frontend.po b/frontends/php/locale/lv/LC_MESSAGES/frontend.po
index b7519bd076e..5b768944b60 100644
--- a/frontends/php/locale/lv/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/lv/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-10-15 07:19+0300\n"
 "Last-Translator: Jaba <janis.jaunbalodis@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -15,22 +15,24 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1381814381.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" jabūt intervālā no 1970.01.01 līdz 2038.01.18"
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -38,7 +40,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -51,7 +53,7 @@ msgstr[2] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (%2$s. gads)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
@@ -59,10 +61,8 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
@@ -70,7 +70,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -87,7 +87,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -111,23 +111,23 @@ msgstr[0] "%d iekārta"
 msgstr[1] "%d iekārtas"
 msgstr[2] "%d iekārtu"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - bezgalīgi)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Tikai super administratori var veidot grupas)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(dienas)"
 
@@ -135,34 +135,34 @@ msgstr "(dienas)"
 msgid "(in sec)"
 msgstr "(sekundēs)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(ne mazāk par 60 sekundēm, 0 - izmantot darbības noklusēto vērtību)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(bez starpniekservera)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[MASVEIDA APSTIPRINĀJUMS]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 vai 1"
 
@@ -178,7 +178,7 @@ msgstr "10 sekundes"
 msgid "30 seconds"
 msgstr "30 sekundes"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D skats"
 
@@ -194,7 +194,7 @@ msgstr "5 sekundes"
 msgid "500 latest values"
 msgstr "500 jaunākās vērtības"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -213,12 +213,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "TRAUKSMES APSTIPRINĀJUMI"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "UN"
 
@@ -230,19 +229,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "PIEEJAMĪBAS ATSKAITE"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -254,42 +253,42 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Piekļuve liegta!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Pieeja liegta."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Konts ir bloķēts uz %s sekundēm"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Apst"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Apstiprinājums"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Apstiprinājums pievienots"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Apstiprināt trauksmi kā"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Apstiprināt un atgriezties"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Apstiprinājuma stāvoklis"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Apstiprināts"
 
@@ -314,63 +313,66 @@ msgstr "Apstiprināšana atspējota"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Darbība"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr ""
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Darbība pievienota"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Darbība izdzēsta"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -384,21 +386,21 @@ msgstr[2] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Darbības operācijas"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Darbība atjaunota"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Darbības"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktīvs"
@@ -408,80 +410,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr ""
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktīvs no"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktīvs līdz"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Pievienot"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Pievienot komentāru kā"
 
@@ -497,27 +502,23 @@ msgstr "Pievienot mezglu"
 msgid "Add link"
 msgstr "Pievienot saiti"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Pievienot trūkstošos"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Pievienot prototipu"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Pievienot"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Pievienot izlasei"
@@ -528,7 +529,7 @@ msgstr "Pievienot resursdatoru grupai"
 
 # Pievienot resursdatoru grupām?

 #
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Pievienot mezglu grupām"
 
@@ -540,7 +541,7 @@ msgstr "Pievienots"
 msgid "Admin"
 msgstr "Administrators"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administrācija"
 
@@ -548,34 +549,34 @@ msgstr "Administrācija"
 msgid "Advanced labels"
 msgstr ""
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Vecums"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Vecums mazāks par"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr ""
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Aģents"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Aģenta interfeiss"
@@ -584,12 +585,12 @@ msgstr "Aģenta interfeiss"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Aģenta vai SNMP vai JMX vai IPMI interfeiss"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Saīsne"
 
@@ -597,87 +598,90 @@ msgstr "Saīsne"
 msgid "Align icons"
 msgstr ""
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Viss"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Visas grupas"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Atļautie resursdatori"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Jebkurš"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr ""
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Rādītāju grupa"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr ""
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Rādītāju grupa pievienota"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
@@ -685,36 +689,36 @@ msgstr[0] "Rādītāju grupa izdzēsta"
 msgstr[1] "Rādītāju grupa izdzēsta"
 msgstr[2] "Rādītāju grupa izdzēsta"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Aplikācijas kļūda."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Rādītāju grupa atjaunota"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr ""
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Rādītāju grupas"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Pielietot"
 
@@ -723,16 +727,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Apr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Aprīlis"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr ""
 
@@ -748,9 +752,9 @@ msgstr ""
 msgid "Area type"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -764,22 +768,17 @@ msgstr ""
 msgid "Asset tag"
 msgstr ""
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
@@ -787,7 +786,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
@@ -795,23 +794,25 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr ""
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr ""
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audits"
@@ -831,26 +832,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Aug"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Augusts"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autentifikācija"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Autentifikācijas algoritms"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -909,9 +912,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automātiski"
 
@@ -919,20 +922,20 @@ msgstr "Automātiski"
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr ""
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Pieejamība"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Pieejamības ziņojums"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Pieejams"
 
@@ -941,36 +944,36 @@ msgstr "Pieejams"
 msgid "Average"
 msgstr "Vidējs"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Vidējais pēc"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Vidējā vērtība par periodu T ir < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Vidējā vērtība par periodu T ir = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Vidējā vērtība par periodu T ir > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Vidējā vērtība par periodu T NAV N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr ""
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Fons"
@@ -979,7 +982,7 @@ msgstr "Fons"
 msgid "Background image"
 msgstr "Fona attēls"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr ""
 
@@ -989,8 +992,8 @@ msgid "Base DN"
 msgstr "Bāzes DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Pamata autentifikācija"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -1002,15 +1005,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind parole"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Melns & Zils"
 
@@ -1022,8 +1025,8 @@ msgstr "Mirgošana"
 msgid "Blocked"
 msgstr "Bloķēts"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Treknraksta līnija"
 
@@ -1031,22 +1034,22 @@ msgstr "Treknraksta līnija"
 msgid "Boolean"
 msgstr "Loģiskais"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Apakša"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr ""
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgāru (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr ""
 
@@ -1072,7 +1075,7 @@ msgstr "APLIKĀCIJU KONFIGURĀCIJA"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "AUTENTIFIKĀCIJAS KONFIGURĀCIJA"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1102,7 +1105,7 @@ msgstr "MEZGLU GRUPU KONFIGURĀCIJA"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr ""
 
@@ -1114,7 +1117,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr ""
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "ATTĒLU KONFIGURĀCIJA"
 
@@ -1123,14 +1126,14 @@ msgstr "ATTĒLU KONFIGURĀCIJA"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "IT SERVISU KONFIGURĀCIJA"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr ""
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr ""
 
@@ -1159,7 +1162,7 @@ msgstr ""
 msgid "CONFIGURATION OF PROXIES"
 msgstr ""
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr ""
 
@@ -1179,7 +1182,7 @@ msgstr "SKRIPTU KONFIGURĀCIJA"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr ""
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "VEIDŅU KONFIGURĀCIJA"
 
@@ -1195,7 +1198,7 @@ msgstr ""
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "TRIGERU KONFIGURĀCIJA"
 
@@ -1227,22 +1230,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "ZABBIX KONFIGURĀCIJA"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1251,21 +1254,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Izskaitļots"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr ""
 
@@ -1273,92 +1276,95 @@ msgstr ""
 msgid "Callback"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Kanāda (136 simboli)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Notikumu nav iespējams apstiprināt"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr ""
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Aplikāciju nevar pievienot"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr ""
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Grafiku nav iespējams pievienot"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Grupu nav iespējams pievienot"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Resursdatoru nav iespējams pievienot"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1366,24 +1372,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Attēlu nevar pievienot"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Attēlu nevar pievienot."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr ""
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1391,20 +1397,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr "Nevar pievienot makro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr ""
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr ""
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1413,24 +1419,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Nav iespējams pievienot tīkla karti"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr ""
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr ""
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr ""
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Skriptu nav iespējams pievienot"
 
@@ -1442,27 +1448,27 @@ msgstr "Servisu nav iespējams pievienot"
 msgid "Cannot add slide show"
 msgstr ""
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Šablonu nav iespējams pievienot"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Trigeri nav iespējams pievienot"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Lietotāju nav iespējams pievienot"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Lietotāju nav iespējams pievienot. Abām parolēm jāsakrīt."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Nevar pievienot lietotājus."
 
@@ -1470,7 +1476,7 @@ msgstr "Nevar pievienot lietotājus."
 msgid "Cannot add value map"
 msgstr ""
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1490,23 +1496,23 @@ msgstr ""
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -1514,20 +1520,20 @@ msgstr ""
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Grafikus nav iespējams pārkopēt"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr ""
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1536,19 +1542,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr ""
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr ""
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr ""
 
@@ -1556,102 +1562,103 @@ msgstr ""
 msgid "Cannot create icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Karti \"%s\" nav iespējams izveidot."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr ""
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Grafiku nav iespējams izdzēst"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Grafikus nav iespējams izdzēst"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Grupu nav iespējams dzēst"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Grupu nav iespējams dzēst"
+msgstr[1] "Grupu nav iespējams dzēst"
+msgstr[2] "Grupu nav iespējams dzēst"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr ""
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1659,80 +1666,80 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Attēlu nav iespējams izdzēst"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Tīkla karti nav iespējams izdzēst"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr ""
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Skriptu nav iespējams izdzēst"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr ""
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr ""
 
@@ -1740,77 +1747,80 @@ msgstr ""
 msgid "Cannot delete service"
 msgstr "Servisu nav iespējams izdzēst"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr ""
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Trigeri nav iespējams izdzēst"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Trigerus nav iespējams izdzēst"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Lietotāju nav iespējams izdzēst"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1818,88 +1828,88 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1914,146 +1924,140 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Nevar atrast grupu \"%1$s\", kas ir izmantota kartē \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2064,34 +2068,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2101,41 +2124,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2148,12 +2171,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr ""
@@ -2166,7 +2191,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
@@ -2174,52 +2199,53 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr ""
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr ""
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2239,7 +2265,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2248,11 +2274,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2260,11 +2286,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr ""
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr ""
 
@@ -2273,217 +2299,226 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Lietotājus nav iespējams atbloķēt"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr ""
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr ""
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr ""
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr ""
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr ""
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Atkļūdošanas režīmu nav iespējams atjaunot"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Grafiku nav iespējams atjaunot"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr ""
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr ""
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr ""
 
@@ -2495,24 +2530,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr "Attēlu nav iespējams atjaunot"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr ""
 
@@ -2524,16 +2559,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr ""
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr ""
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2541,28 +2576,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr ""
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr ""
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr ""
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Nevar modificēt skriptu"
 
@@ -2574,40 +2605,41 @@ msgstr ""
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr ""
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Lietotāju nav iespējams modificēt"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr ""
 
@@ -2615,15 +2647,15 @@ msgstr ""
 msgid "Cannot update value map"
 msgstr ""
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr ""
 
@@ -2632,47 +2664,47 @@ msgstr ""
 msgid "Case sensitive"
 msgstr "Reģistrjūtīgs"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Centrs"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Mainīt"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Mainīt paroli"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Simbols"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Simbolu rinda iekļauta"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Simbolu rinda nav iekļauta"
 
@@ -2681,48 +2713,48 @@ msgid "Chassis"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr ""
 
@@ -2731,44 +2763,44 @@ msgid "Check type"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr ""
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Ķīniešu (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Ķīniešu (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr ""
@@ -2783,34 +2815,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Klasiskais"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Iztīrīt"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr ""
 
@@ -2820,69 +2853,69 @@ msgstr "Pulkstenis"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Klonēt"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Aizvērt"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Krāsa"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Krāsa (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr ""
 
@@ -2897,7 +2930,7 @@ msgstr "Gala rezultāts"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Komanda"
 
@@ -2905,41 +2938,31 @@ msgstr "Komanda"
 msgid "Command actions"
 msgstr ""
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr ""
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Komandas"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Komentārs atjaunots"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Komentāri"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Komerciāls"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2947,29 +2970,39 @@ msgstr ""
 msgid "Condition"
 msgstr "Nosacījums"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Nosacījumi"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3132,23 +3165,23 @@ msgstr "Konfigurācija saglabāta"
 msgid "Configure (Filter %s)"
 msgstr ""
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Apstiprinājuma teksts"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr ""
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr ""
@@ -3196,7 +3229,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3204,30 +3237,38 @@ msgstr ""
 msgid "Contract number"
 msgstr "Līguma numurs"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Koordinātes"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Kopēt"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Kopēt atlasītos uz ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Attēlu nevar saglabāt!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Skaits"
 
@@ -3247,6 +3288,10 @@ msgstr "Izveidot aplikāciju"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3264,7 +3309,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3277,15 +3322,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr ""
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Izveidot attēlu"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr ""
 
@@ -3309,6 +3354,10 @@ msgstr "Izveidot karti"
 msgid "Create media type"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Izveidot starpniekserveri"
@@ -3333,11 +3382,11 @@ msgstr "Izveidot skriptu"
 msgid "Create slide show"
 msgstr ""
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Izveidot veidni"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Izveidot trigeri"
 
@@ -3361,42 +3410,42 @@ msgstr "Izveidot lietotāju gupu"
 msgid "Create value map"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Izveidota: Aplikācija \"%1$s\" uz \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Izveidots: Trigeris \"%1$s\" on \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Izveidots trigera prototips \"%1$s\" on \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Izveidots tīmekļa scenārijs \"%1$s\" on \"%2$s\""
@@ -3406,51 +3455,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr ""
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr ""
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3463,7 +3513,7 @@ msgstr ""
 msgid "Custom label"
 msgstr ""
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3477,7 +3527,7 @@ msgstr ""
 msgid "Custom screens"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr ""
 
@@ -3497,18 +3547,14 @@ msgstr ""
 msgid "Custom slides"
 msgstr ""
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Čehu (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "INFOPANEĻA KONFIGURĀCIJA"
@@ -3524,28 +3570,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr ""
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "ATSPĒJOTS"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr ""
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3553,25 +3599,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS vārds"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr ""
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Ik dienu"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Tumši oranžs"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Tumšāks"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Infopanelis"
 
@@ -3583,20 +3629,21 @@ msgstr "Infopaneļa konfigurācija"
 msgid "Dashboard filter"
 msgstr "Infopaneļa filtrs"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Pārtraukta līnija"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Dati"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3619,11 +3666,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Datu tips"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Datubāzes fails"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr ""
 
@@ -3631,35 +3679,39 @@ msgstr ""
 msgid "Database monitor"
 msgstr "Datubāzes uzraudzība"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Datubāzes vārds"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Datubāzes parole"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Datubāzes ports"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Datubāzes shēma"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Datubāzes serveris"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Datubāzes tips"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Datubāzes lietotājs"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Datums"
 
@@ -3679,53 +3731,52 @@ msgstr ""
 msgid "Date HW purchased"
 msgstr "Datums, kad aparatūra iegādāta"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Diena"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Mēneša diena"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Mēneša diena ir < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Mēneša diena ir = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Mēneša diena ir > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Mēneša diena nav N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Nedēļas diena"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Nedēļas diena ir < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Nedēļas diena ir = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Nedēļas diena ir > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Nedēļas diena nav N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Dienas"
 
@@ -3733,22 +3784,22 @@ msgstr "Dienas"
 msgid "Debug"
 msgstr "Atkļūdošana"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Atkļūdošanas režīms"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Atkļūdošanas režīms atjaunots"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dec"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Decembris"
 
@@ -3758,15 +3809,14 @@ msgstr "Decimāls"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Noklusētais"
 
@@ -3779,11 +3829,11 @@ msgid "Default delay (in seconds)"
 msgstr "Noklusētā aizkave (sekundēs)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Noklusētais ziņojums"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3806,30 +3856,34 @@ msgstr "Noklusētais dizains \"%1$s\"."
 msgid "Delay"
 msgstr "Aizture"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Aizkave (sek)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Aizkave pēc"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Dzēst"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr ""
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3837,53 +3891,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Dzēst izteiksmi?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Dzēst grafiku?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Dzēst iezīmēto Tīmekļa scenāriju vēsturi?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr ""
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Dzēst atslēgas vārdu?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3891,11 +3945,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3903,7 +3961,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr ""
 
@@ -3911,71 +3969,67 @@ msgstr ""
 msgid "Delete screen?"
 msgstr ""
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Vai dzēst skriptu?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Dzēst iezīmētos"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Dzēst iezīmētos Tīmekļa scenārijus?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Vai dzēst iezīmētos elementus?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Vai dzēst izvēlētos grafikus?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Vai dzēst izvēlēto grupu?"
@@ -3984,27 +4038,27 @@ msgstr "Vai dzēst izvēlēto grupu?"
 msgid "Delete selected groups?"
 msgstr "Vai dzēst iezīmētās grupas?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr ""
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Vai dzēst iezīmēto attēlu?"
 
@@ -4012,31 +4066,31 @@ msgstr "Vai dzēst iezīmēto attēlu?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr ""
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr ""
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Vai dzēst iezīmētās kartes?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr ""
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr ""
 
@@ -4044,15 +4098,15 @@ msgstr ""
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Vai dzēst iezīmētos skriptus?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr ""
 
@@ -4064,11 +4118,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Izdzēst atlasīto lietotāju?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Vai dzēst atlasītos lietotājus?"
 
@@ -4084,11 +4138,15 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4097,15 +4155,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Dzēst"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Dzēst trigeri?"
 
@@ -4113,62 +4171,62 @@ msgstr "Dzēst trigeri?"
 msgid "Deleted"
 msgstr "Izdzēsts"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4177,35 +4235,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Atdalītājs"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr ""
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr ""
 
@@ -4213,30 +4271,41 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Apraksts"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Detaļas"
 
@@ -4249,71 +4318,71 @@ msgid "Device"
 msgstr "Iekārta"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Atšķirība starp MAX un MIX vērtību par periodu T ir < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Atšķirība starp MAX un MIX vērtību par periodu T ir = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Atšķirība starp MAX un MIX vērtību par periodu T ir > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Atšķirība starp MAX un MIX vērtību par periodu T NAV N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4337,48 +4406,44 @@ msgstr "Atspējot atkļūdošanas režīmu iezīmētajās grupās?"
 msgid "Disable host"
 msgstr "Atspējot mezglu"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr ""
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Atspējot iezīmētos Tīmekļa scenārijus?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr ""
 
@@ -4386,11 +4451,11 @@ msgstr ""
 msgid "Disable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr ""
 
@@ -4398,42 +4463,47 @@ msgstr ""
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Atspējots"
 
@@ -4446,7 +4516,7 @@ msgstr "Katastrofa"
 msgid "Discovered"
 msgstr "Atklāts"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4454,17 +4524,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr ""
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr ""
 
@@ -4472,17 +4542,17 @@ msgstr ""
 msgid "Discovery check"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4491,69 +4561,72 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr ""
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr ""
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr ""
 
@@ -4565,7 +4638,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Attēlo"
 
@@ -4574,32 +4647,32 @@ msgstr "Attēlo"
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr ""
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr ""
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr ""
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Pabeigts"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Punkti"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4609,30 +4682,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Dīkstāve"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr ""
 
@@ -4650,74 +4723,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Ilgums"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Holandiešu (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "KĻŪDA"
 
@@ -4725,13 +4799,13 @@ msgstr "KĻŪDA"
 msgid "EVENTS"
 msgstr "NOTIKUMI"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4739,9 +4813,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Rediģēt"
 
@@ -4749,7 +4823,7 @@ msgstr "Rediģēt"
 msgid "Edit map element"
 msgstr "Rediģēt kartes elementu"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Labot trigeri"
 
@@ -4757,27 +4831,61 @@ msgstr "Labot trigeri"
 msgid "Element"
 msgstr "Elements"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Elementa vārds"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "E-pasts"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Tukšs"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4785,76 +4893,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4863,11 +4993,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4875,11 +5005,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr ""
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4899,11 +5033,11 @@ msgstr ""
 msgid "Enable host"
 msgstr ""
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr ""
 
@@ -4916,36 +5050,32 @@ msgstr ""
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr ""
 
@@ -4953,11 +5083,11 @@ msgstr ""
 msgid "Enable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4965,64 +5095,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Ieslēgts"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Angļu (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Angļu (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Kļūda"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -5040,15 +5174,15 @@ msgstr "Notikums"
 msgid "Event ID"
 msgstr "Notikuma ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Notikums apstiprināts"
 
@@ -5057,7 +5191,7 @@ msgstr "Notikums apstiprināts"
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr ""
 
@@ -5065,7 +5199,7 @@ msgstr ""
 msgid "Event details"
 msgstr "Notikuma detaļas"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr ""
 
@@ -5085,9 +5219,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Notikumi"
 
@@ -5095,36 +5230,41 @@ msgstr "Notikumi"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr ""
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Eksa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Neiekļaut"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Izpildīt"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5132,13 +5272,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Palaist skriptu"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Izpildes apstiprināšana"
 
@@ -5150,7 +5290,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5160,12 +5300,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr ""
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr ""
 
@@ -5173,22 +5313,22 @@ msgstr ""
 msgid "Export to CSV"
 msgstr "Eksportēt uz CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Izteiksme"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Izteiksmes sintakses kļūda."
 
@@ -5196,11 +5336,12 @@ msgstr "Izteiksmes sintakses kļūda."
 msgid "Expression Variable Elements"
 msgstr ""
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Izteiksme nedrīkst būt tukša"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Izteiksmes konstruktors"
 
@@ -5221,17 +5362,17 @@ msgid "External check"
 msgstr "Ārēja pārbaude"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "P"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "NEPATIESS"
 
@@ -5240,16 +5381,17 @@ msgstr "NEPATIESS"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr ""
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr ""
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5257,40 +5399,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr ""
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr ""
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr ""
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Favorīti"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Feb"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Februāris"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Lauks"
 
@@ -5334,19 +5476,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5355,13 +5497,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5369,68 +5511,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Aizpildīts reģions"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtrs"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Finišs"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Somu (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Pirmais"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5439,8 +5584,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fiksēts"
 
@@ -5450,76 +5595,80 @@ msgstr "Fiksēts"
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr ""
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Formula"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr ""
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Franču (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Pie"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Piektdiena"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "No"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Saskarnes piekļuve"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Funkcija"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5529,50 +5678,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM modems"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "GUI pieeja liegta."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr ""
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Vācu (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5580,65 +5729,65 @@ msgid "Get support"
 msgstr "Atbalsts"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Aiziet"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Aiziet uz"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5647,66 +5796,73 @@ msgid "Gradient line"
 msgstr ""
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Grafiks"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Grafiks pievienots"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Grafiks izdzēsts"
 
@@ -5718,54 +5874,59 @@ msgstr "Grafika elements"
 msgid "Graph item"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Grafika nosaukums"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Grafika prototipi"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5777,49 +5938,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Grafika tips"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Grafiks atjaunots"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Grafiki"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Grafiki pārkopēti"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Grafiki izdzēsti"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Grieķu (el_GR)"
 
@@ -5828,54 +5991,59 @@ msgstr "Grieķu (el_GR)"
 msgid "Grid"
 msgstr "Režģis"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Grupa"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Grupa \"%1$s\" nepastāv."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Grupa pievienota"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Grupa izdzēsta"
+msgid_plural "Groups deleted"
+msgstr[0] "Grupa izdzēsta"
+msgstr[1] "Grupa izdzēsta"
+msgstr[2] "Grupa izdzēsta"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5886,40 +6054,42 @@ msgstr ""
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Grupas nosaukums"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Grupa atjaunota"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Grupēt pēc"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Grupas"
 
@@ -5927,22 +6097,13 @@ msgstr "Grupas"
 msgid "Groups in maintenance"
 msgstr "Grupas uzturēšanā"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5959,7 +6120,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5977,7 +6138,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP autentifikācija"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTP starpniekserveris"
 
@@ -5998,12 +6160,17 @@ msgstr "Aparatūra"
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Augstums"
@@ -6016,15 +6183,15 @@ msgstr "Palīdzība"
 msgid "Hexadecimal"
 msgstr "Heksadecimāls"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Slēpts"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Slēpt"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Paslēpt visu"
 
@@ -6040,15 +6207,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Paslēpt atspējotos trigerus"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Paslēpt atlasītos"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6057,23 +6224,23 @@ msgstr ""
 msgid "High"
 msgstr "Augsts"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Vēsture"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Vēsture nodzēsta"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Vēstures dzēšana var aizņemt daudz laika. Vai turpināt?"
 
@@ -6094,58 +6261,57 @@ msgstr "Notikumu vēsture"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horizontāli"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr ""
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
@@ -6153,22 +6319,23 @@ msgstr[0] "Iekārta"
 msgstr[1] "Iekārta"
 msgstr[2] "Iekārta"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Iekārta \"%1$s\" jau eksistē."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Iekārta \"%1$s\" tiek monitorēta ar startpniekserveri \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Iekārta (augoši)"
 
@@ -6180,31 +6347,31 @@ msgstr "Mezgla IP"
 msgid "Host access"
 msgstr "Iekārtas piekļuve"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Iekārta pievienota"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr ""
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
@@ -6212,36 +6379,38 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Iekārtas grupa"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Iekārtas grupa \"%1$s\" jau eksistē."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6258,14 +6427,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Iekārtas grupas"
 
@@ -6275,8 +6445,8 @@ msgstr "Iekārtas grupas"
 msgid "Host interface"
 msgstr "Iekārtas interfeiss"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6292,7 +6462,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Iekārtu saraksts"
 
@@ -6301,18 +6471,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Iekārtas vārds"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6321,74 +6491,74 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6400,7 +6570,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6412,51 +6582,52 @@ msgstr "Mezglu stāvoklis"
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Iekārtas laiks"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Mezgli"
 
@@ -6464,11 +6635,11 @@ msgstr "Mezgli"
 msgid "Hosts & Groups"
 msgstr "Iekārtas & Grupas"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Mezgli (u/n/š)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Iekārtas / šabloni"
 
@@ -6480,37 +6651,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr "Mezgli uzturēšanā"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Iekārtu atrašanās vieta"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr ""
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Stundas"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Ungāru (hu_HU)"
 
@@ -6528,22 +6700,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6551,26 +6723,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP adrese"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP apgabals"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6578,22 +6750,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI aģents"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI autentifikācijas algoritms"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI parole"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr ""
 
@@ -6603,7 +6775,7 @@ msgstr ""
 msgid "IPMI sensor"
 msgstr "IPMI sensors"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI lietotājvārds"
 
@@ -6636,7 +6808,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6652,25 +6824,25 @@ msgid "ITEMS"
 msgstr "RĀDĪTĀJI"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ikona"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Ikona (noklusējuma)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Ikona (atspējots)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Ikona (uzturēšana)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Ikona (problēma)"
 
@@ -6691,42 +6863,44 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6739,7 +6913,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6747,29 +6922,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Ikonas"
 
@@ -6777,21 +6952,23 @@ msgstr "Ikonas"
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Attēls"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6800,7 +6977,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Attēls pievienots"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Attēls izdzēsts"
 
@@ -6808,12 +6985,13 @@ msgstr "Attēls izdzēsts"
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6822,66 +7000,66 @@ msgid "Image updated"
 msgstr "Attēls atjaunots"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Attēli"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Nekavējoties"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Importēt"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Importa mēģinājums neveiksmīgs"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Importa fails"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Imports veiksmīgs"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "Grupā"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Grupās"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6894,244 +7072,282 @@ msgstr "Iekš apkopes"
 msgid "In progress"
 msgstr ""
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Iekļaut"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Funkcijai tika padots nepareizs arguments"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Funkcijai tika padots nepareizs arguments."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Metodei tika padots nepareizs arguments"
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7141,11 +7357,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7154,11 +7370,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7166,74 +7382,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Tiek izmantota nepareiza funkcija"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7241,182 +7483,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr ""
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr ""
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr ""
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr ""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr ""
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr ""
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7425,64 +7686,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7503,52 +7768,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7557,7 +7827,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7577,7 +7848,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7587,43 +7858,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Nepareizs darba laiks."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonēziešu (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7632,15 +7909,15 @@ msgstr ""
 msgid "Information"
 msgstr "Informācija"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Ievietot"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Ievietot makro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Instalācija"
 
@@ -7648,31 +7925,32 @@ msgstr "Instalācija"
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interfeiss"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7692,7 +7970,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Iekšējais"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "JSON-RPC iekšējā kļūda."
 
@@ -7700,7 +7978,7 @@ msgstr "JSON-RPC iekšējā kļūda."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Iekšējā kļūda."
 
@@ -7713,19 +7991,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Intervāls"
 
@@ -7735,112 +8013,114 @@ msgstr "Intervāls"
 msgid "Interval (in sec)"
 msgstr "Intervāls (sekundēs)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Uzskaite"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7849,7 +8129,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7857,12 +8137,12 @@ msgstr ""
 msgid "Is online?"
 msgstr "Ir tiešsaistē?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Problēma"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7870,70 +8150,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Itāļu (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Rādītājs"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Rādītājs pievienots"
 
@@ -7941,18 +8222,18 @@ msgstr "Rādītājs pievienots"
 msgid "Item count"
 msgstr "Rādītāju skaits"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Rādītājs izdzēsts"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7967,58 +8248,58 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Rādītāja prototips"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Rādītāju prototipi"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -8026,92 +8307,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Rādītājs atjaunots"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Rādītāji"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Rādītāji (u/a/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Rādītāji pārkopēti"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Rādītāji izdzēsti"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Rādītāju saraksts"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Rādītāji atjaunoti"
 
@@ -8123,72 +8404,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX aģents"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX interfeisi"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpc metode nav definēta"
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "Nav norādīta JSON-rpc versija."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber identifikators"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Janvāris"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japāņu (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Jūl"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Jūlijs"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Jūn"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Jūnijs"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8197,40 +8478,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Atslēga"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Atslēgas vārds"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Korejiešu (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "JAUNĀKĀ INFORMĀCIJA"
 
@@ -8261,37 +8542,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOKĀLAIS"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Iezīme"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Iezīmes izvietojums"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Valoda"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr ""
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Pēdējā"
@@ -8304,19 +8585,19 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8336,28 +8617,28 @@ msgstr "Pēdējās 365 dienas"
 msgid "Last 7 days"
 msgstr "Pēdējās 7 dienas"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Pēdējā izmaiņa"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Pēdējā pārbaude"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr ""
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr ""
 
@@ -8365,66 +8646,67 @@ msgstr ""
 msgid "Last seen (age)"
 msgstr ""
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Pēdējā vērtība"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr ""
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Jaunākā informācija"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Pēdējie notikumi"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Latviešu (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr ""
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr ""
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Līnija"
 
@@ -8432,39 +8714,29 @@ msgstr "Līnija"
 msgid "Link"
 msgstr "Saite"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr ""
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8476,50 +8748,50 @@ msgstr ""
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr ""
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "Lietuviešu (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Lādējas..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Vietējais laiks"
 
@@ -8536,36 +8808,36 @@ msgid "Location longitude"
 msgstr "Atrašanās vietas ģeogrāfiskais garums"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Žurnalēšanas fails"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr ""
@@ -8574,12 +8846,12 @@ msgstr ""
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8590,12 +8862,12 @@ msgstr "Pieslēgties"
 msgid "Login as Guest"
 msgstr "Pieteikšanās kā viesim"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Pieteikšanās mēģinājums neveiksmīgs \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8604,8 +8876,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8626,22 +8899,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "P"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M G"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8653,7 +8922,7 @@ msgstr "MAC adrese A"
 msgid "MAC address B"
 msgstr "MAC adrese B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr ""
 
@@ -8678,49 +8947,49 @@ msgstr ""
 msgid "Macro"
 msgstr "Makro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr ""
 
@@ -8728,31 +8997,36 @@ msgstr ""
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr ""
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr ""
 
@@ -8760,7 +9034,7 @@ msgstr ""
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr ""
 
@@ -8776,25 +9050,25 @@ msgstr ""
 msgid "Maintenance type"
 msgstr ""
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr ""
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8805,12 +9079,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Karte"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8820,12 +9094,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr "Karte \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Karte \"%s\" izveidota."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Karte \"%s\" atjaunota."
@@ -8842,12 +9116,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr "Kartes saglabāšana nav bijusi veiksmīga."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8857,23 +9131,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Kartes"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Marts"
 
@@ -8881,28 +9155,34 @@ msgstr "Marts"
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Atzīmēt pārējos"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Iekrāsot izvēlētās"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Maksimālais elementu skaits, ko rādīt tabulas šūnā"
@@ -8916,35 +9196,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maksimizēt"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8952,16 +9208,16 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
@@ -8969,92 +9225,85 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "Maksimālā vērtība par periodu T ir < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "Maksimālā vērtība par periodu T ir = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "Maksimālā vērtība par periodu T ir > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "Maksimālā vērtība par periodu T NAV N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Mai"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Mai"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr ""
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr ""
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr ""
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr ""
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr ""
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9069,14 +9318,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Izvēlne"
 
@@ -9086,7 +9335,7 @@ msgstr "Izvēlne"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Ziņojums"
 
@@ -9094,66 +9343,66 @@ msgstr "Ziņojums"
 msgid "Message actions"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Ziņojumi"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Pa vidu"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimizēt"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9162,7 +9411,7 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
@@ -9170,73 +9419,70 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Minūtes"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9246,7 +9492,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9258,18 +9504,18 @@ msgstr ""
 msgid "Model"
 msgstr "Modelis"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Pir"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Uzraudzība ar starpniekserveri"
 
@@ -9277,33 +9523,33 @@ msgstr "Uzraudzība ar starpniekserveri"
 msgid "Monitored host"
 msgstr ""
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Uzraudzība"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Mēnesis"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Mēnesī"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9311,7 +9557,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Vairāk nekā 10 minūtes"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9320,19 +9566,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Klusums"
 
@@ -9345,60 +9591,58 @@ msgstr "TĪKLA KARTES"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "NAV DATU"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM autentifikācija"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9409,26 +9653,32 @@ msgstr "NTLM autentifikācija"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Nosaukums"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9447,12 +9697,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9460,7 +9710,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Tīkla karte pievienota"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Tīkla karte izdzēsta"
 
@@ -9472,7 +9722,7 @@ msgstr ""
 msgid "Network maps"
 msgstr "Tīkla kartes"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Nekad"
 
@@ -9480,24 +9730,24 @@ msgstr "Nekad"
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Jauns"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Jauna aplikācija"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Izveidot jaunu nosacījumu"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Jauns elements"
 
@@ -9508,16 +9758,16 @@ msgstr "Jauns elements"
 msgid "New flexible interval"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Jauna grupa"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr ""
 
@@ -9525,83 +9775,99 @@ msgstr ""
 msgid "New media"
 msgstr ""
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr ""
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Nākamais"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Nē"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9609,25 +9875,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9653,8 +9919,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9664,7 +9930,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9672,30 +9938,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9704,27 +9971,27 @@ msgstr ""
 msgid "No data collection"
 msgstr ""
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9732,39 +9999,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9779,7 +10046,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9788,7 +10055,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9797,48 +10068,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9851,17 +10123,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9880,33 +10157,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9925,7 +10209,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9941,7 +10225,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9950,15 +10234,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9970,133 +10254,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Nav tiesības"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Nav starpniekservera"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10104,7 +10433,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10112,82 +10441,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Nav trigeris"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10196,57 +10526,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr ""
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Nav Apst"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Nav šablona rādītāji"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Nav pieejams"
 
@@ -10255,7 +10586,7 @@ msgstr "Nav pieejams"
 msgid "Not classified"
 msgstr ""
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr ""
 
@@ -10268,8 +10599,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Netiek atbalstīts"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Piezīme"
@@ -10282,7 +10613,7 @@ msgstr "Piezīmes"
 msgid "Nothing"
 msgstr "Nekas"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10290,87 +10621,87 @@ msgstr ""
 msgid "Notification report"
 msgstr ""
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr ""
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Novembris"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Tagad"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10378,88 +10709,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr ""
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Soļu skaits"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Lietotāju skaits (tiešsaistē)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numurs (peldošais)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numurs (vesels skaitlis 64bit)"
 
@@ -10474,16 +10805,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10499,8 +10832,7 @@ msgstr "OOB maršrutētājs"
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "VAI"
 
@@ -10520,11 +10852,12 @@ msgstr ""
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "PĀRSKATS"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Okt"
 
@@ -10532,25 +10865,25 @@ msgstr "Okt"
 msgid "Octal"
 msgstr "Oktāls"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Oktobris"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr ""
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Apstiprināt"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr ""
 
@@ -10558,111 +10891,114 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Vienreiz"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr ""
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10671,28 +11007,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Operācijas nosacījums"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Operācijas detaļas"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Operācijas tips"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operācija"
@@ -10701,25 +11037,27 @@ msgstr "Operācija"
 msgid "Operator"
 msgstr "Operators"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10749,24 +11087,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr ""
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr ""
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Cits"
 
@@ -10774,19 +11112,19 @@ msgstr "Cits"
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Citas grupas"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10796,21 +11134,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Citi parametri"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Citi"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10823,14 +11161,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Pārskats"
 
@@ -10838,7 +11173,7 @@ msgstr "Pārskats"
 msgid "Overview by proxy"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10847,147 +11182,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "PERSONĀLAIS INFOPANELIS"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHP datubāzu atbalsts"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "PHP gd FreeType atbalsts"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "PHP gd JPEG atbalsts"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "PHP gd PNG atbalsts"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP opcija max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP opcija max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP opcija memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP opcija post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP opcija upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP sesija"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP ligzdas"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP laika zona"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP versija"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10996,32 +11339,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLĒMA"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palete"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palete #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parametrs"
 
@@ -11030,7 +11375,7 @@ msgstr "Parametrs"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11050,33 +11395,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11086,20 +11431,21 @@ msgstr ""
 msgid "Password"
 msgstr "Parole"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Parole (vēlreiz)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Parole nedrīkst būt tukša"
 
@@ -11108,21 +11454,21 @@ msgstr "Parole nedrīkst būt tukša"
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11130,12 +11476,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Periods"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr ""
@@ -11145,24 +11491,24 @@ msgstr ""
 msgid "Periods"
 msgstr "Periodi"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Pieejas tiesības"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persiešu (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Pīrāgs"
 
@@ -11174,55 +11520,56 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Atskaņot"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Atskaņot skaņu"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr ""
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Poļu (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Ports"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11230,51 +11577,51 @@ msgstr ""
 msgid "Port range"
 msgstr "Portu diapazons"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Protugāļu (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Portugāļu (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Pozīcija"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Priekšskatījums"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Iepriekšējais"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11323,30 +11670,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Privātās atslēgas fails"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Privilēģiju līmenis"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problēma"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11358,16 +11706,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr ""
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr ""
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problēmas"
 
@@ -11375,75 +11723,71 @@ msgstr "Problēmas"
 msgid "Profile"
 msgstr "Profils"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototips"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Starpniekserveri"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Starpniekserveris"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Starpniekserveris \"%s\" jau eksistē."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Starpniekserveris pievienots"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Starpniekserveris izdzēsts"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Starpniekservera vārds"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Publiskā atslēga"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11454,7 +11798,7 @@ msgstr "Publiskās atslēgas fails"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr ""
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Rinda"
 
@@ -11462,18 +11806,18 @@ msgstr "Rinda"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Lasīšana"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Tikai lasīšana"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Lasīšana un rakstīšana"
 
@@ -11485,7 +11829,7 @@ msgstr "Iemesls"
 msgid "Received value"
 msgstr "Saņemtā vērtība"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11493,11 +11837,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Saņēmējs"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Saņēmējs (augoši)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Saņēmējs (dilstoši)"
 
@@ -11508,28 +11852,28 @@ msgstr "Saņēmējs (dilstoši)"
 msgid "Recipient(s)"
 msgstr "Saņemēj(s/i)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Atjaunošana"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Atjaunošanas ziņojums"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr ""
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Atsvaidzināt (sekundēs)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Atsvaidzināšanas laika reizinātājs"
 
@@ -11547,48 +11891,52 @@ msgstr ""
 msgid "Regular expression"
 msgstr "Regulārā izteiksme"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11605,26 +11953,28 @@ msgstr "Attālināta komanda"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11635,21 +11985,19 @@ msgstr "Attālināta komanda"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Dzēst"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11657,11 +12005,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Dzēst elementu"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Dzēst no"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11670,7 +12018,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Dzēst no mezglu grupām"
 
@@ -11682,28 +12030,28 @@ msgstr "Dzēst mezglu"
 msgid "Remove link"
 msgstr "Dzēst saiti"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Dzēst iezīmētos"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Aizstāt"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Atskaite"
 
@@ -11711,35 +12059,36 @@ msgstr "Atskaite"
 msgid "Report 1"
 msgstr "Ziņojums 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Ziņojums 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Ziņojums 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Atskaites"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr ""
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11747,29 +12096,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr "Nepieciešamā veikstpēja (vs)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Atiestatīt"
 
@@ -11788,9 +12139,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11803,7 +12154,7 @@ msgstr "Atrisināts"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr ""
@@ -11818,15 +12169,15 @@ msgstr "Atbildes laiks"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Rezultāts"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr ""
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr ""
 
@@ -11839,7 +12190,8 @@ msgstr ""
 msgid "Result type"
 msgstr "Rezultāta tips"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11847,60 +12199,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Palikuši mēģinājumi"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Pa labi"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr ""
 
@@ -11908,11 +12269,11 @@ msgstr ""
 msgid "Rows"
 msgstr "Rindas"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Ieriaksti lapā"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Noteikumi"
 
@@ -11957,20 +12318,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Krievu (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -11986,7 +12347,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr "MEKLĒT"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVERIS"
 
@@ -12001,13 +12362,13 @@ msgstr ""
 msgid "SLA"
 msgstr ""
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr ""
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -12016,17 +12377,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP e-pasts"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP serveris"
@@ -12042,7 +12403,7 @@ msgstr "SNMP Atslēga"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12054,9 +12415,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMP interfeiss"
@@ -12065,7 +12426,7 @@ msgstr "SNMP interfeiss"
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12089,7 +12450,7 @@ msgstr "SNMPv3 aģents"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12107,7 +12468,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12116,15 +12477,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH aģents"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr ""
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "TRIGERU STATUS"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "TĪMEKĻA UZRAUDZĪBAS STĀVOKLIS"
 
@@ -12132,92 +12513,92 @@ msgstr "TĪMEKĻA UZRAUDZĪBAS STĀVOKLIS"
 msgid "STATUS OF ZABBIX"
 msgstr "ZABBIX STĀVOKLIS"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr ""
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sestdiena"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Saglabāt"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr ""
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Scenārijs"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Scenārijs pievienots"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr ""
 
@@ -12229,7 +12610,7 @@ msgstr "Scenārijs"
 msgid "Schedule"
 msgstr ""
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12240,126 +12621,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Ekrāns"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr ""
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Ekrāns atjaunos"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Ekrāni"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Skripts"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Skripts \"%1$s\" jau eksistē."
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Skripts pievienots"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Skripts izdzēsts"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Skripta nosaukums"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12368,17 +12748,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Skripts modificēts"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr "Skripts ar identifikatoru \"%1$s\" neeksistē."
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Skripts"
 
@@ -12399,7 +12779,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr "Meklēšanas/filtra rezultātu limits"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Otrais"
 
@@ -12431,7 +12811,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Sekundes"
 
@@ -12450,69 +12830,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Atlasīt"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Atlasītie"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Atlasītie elementi"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Atlasītās grupas"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr ""
 
@@ -12528,7 +12915,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Sūtīt tikai"
 
@@ -12536,11 +12923,11 @@ msgstr "Sūtīt tikai"
 msgid "Send to"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12549,17 +12936,17 @@ msgstr ""
 msgid "Sent"
 msgstr "Sūtīt"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Sep"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Septembris"
 
@@ -12571,7 +12958,7 @@ msgstr "Sērijas numurs A"
 msgid "Serial number B"
 msgstr "Sērijas numurs B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Serveris"
@@ -12580,44 +12967,44 @@ msgstr "Serveris"
 msgid "Server info"
 msgstr "Servera info"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Servera laiks"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Serviss"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12633,11 +13020,11 @@ msgstr ""
 msgid "Service port"
 msgstr "Servisa ports"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr ""
 
@@ -12649,49 +13036,54 @@ msgstr "Servisa tips"
 msgid "Service updated"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Servisi"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Parādīt"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Parādīt visu"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Parādīt detaļas"
 
@@ -12721,35 +13113,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr ""
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Parādīt līnijas"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Parādīt atlasītos"
 
@@ -12757,19 +13150,23 @@ msgstr "Parādīt atlasītos"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Rādīt tekstu kā HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Rādīt trigerus"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr ""
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Rādīt vērtību"
@@ -12778,11 +13175,11 @@ msgstr "Rādīt vērtību"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Parādīt darba laiku"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Parādīts"
 
@@ -12802,6 +13199,10 @@ msgstr "Vienkārša pārbaude"
 msgid "Simple graph"
 msgstr "Vienkāršs grafiks"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12839,7 +13240,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12857,16 +13258,16 @@ msgstr ""
 msgid "Slide"
 msgstr "Slaids"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr ""
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12875,11 +13276,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12887,10 +13288,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr ""
 
@@ -12898,15 +13299,15 @@ msgstr ""
 msgid "Slides"
 msgstr "Slaidi"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Slovāku (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr ""
 
@@ -12939,28 +13340,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Kārtot pēc"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12973,11 +13374,11 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spāņu (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12985,63 +13386,63 @@ msgstr ""
 msgid "Speed"
 msgstr "Ātrums"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr ""
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Stāvoklis"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -13054,7 +13455,7 @@ msgstr ""
 msgid "Status calculation algorithm"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Statusa kodi"
 
@@ -13063,7 +13464,7 @@ msgid "Status of Web monitoring"
 msgstr "Tīmekļa uzraudzības stāvoklis"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Zabbix stāvoklis"
 
@@ -13080,40 +13481,40 @@ msgid "Status only"
 msgstr ""
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Solis"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Soļa ilgums"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Scenārija solis"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Soļi"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Apturēt"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr ""
@@ -13122,11 +13523,11 @@ msgstr ""
 msgid "Straight"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Stils"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13134,11 +13535,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Tēma"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13147,32 +13548,32 @@ msgid "Success Audit"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Saule"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Svētdiena"
 
@@ -13180,27 +13581,27 @@ msgstr "Svētdiena"
 msgid "Support"
 msgstr "Atbalsts"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Uzvārds"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Zviedru (sv_SE)"
 
@@ -13208,16 +13609,16 @@ msgstr "Zviedru (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Sistēmas kļūda."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13226,21 +13627,21 @@ msgid "System status"
 msgstr "Sistēmas stāvoklis"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "C"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "O"
@@ -13259,11 +13660,11 @@ msgid "TOTAL"
 msgstr "KOPĀ"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "TRIGERA KOMENTĀRI"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "PATIESS"
 
@@ -13281,14 +13682,14 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13297,130 +13698,133 @@ msgid "Target type"
 msgstr ""
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Šablons"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Šablons pievienots"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Šablons izdzēsts"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Šablona grupa"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Šablonu saistīšana"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Šablonu saraksts"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Šablonu nosaukums"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Šablona trigeris"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Šablons atjaunots"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr ""
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Šabloni"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Tests"
 
@@ -13428,11 +13832,11 @@ msgstr "Tests"
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Pārbaudāmie dati"
 
@@ -13446,22 +13850,22 @@ msgid "Test string"
 msgstr ""
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Teksts"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13469,7 +13873,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13484,12 +13888,12 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -13497,7 +13901,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -13505,7 +13909,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13514,19 +13918,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Saņemtais JSON pieprasījums nav derīgs JSON-RPC."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Motīvs"
 
@@ -13538,11 +13942,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Trešais"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13551,11 +13955,11 @@ msgstr ""
 msgid "This month"
 msgstr "Šis mēnesis"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13567,27 +13971,27 @@ msgstr "Šī nedēļa"
 msgid "This year"
 msgstr "Šis gads"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Cet"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Līdz"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13596,28 +14000,28 @@ msgstr "Līdz"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Laiks"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Laiks (augoši)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Laiks (dilstoši)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13625,54 +14029,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Laika periods"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Taimauts"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr ""
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Virsraksts"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Līdz"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13680,17 +14084,18 @@ msgstr ""
 msgid "Today"
 msgstr "Šodiena"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr ""
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Kopā"
 
@@ -13708,7 +14113,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13725,77 +14130,77 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr ""
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Trigeris"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Trigeris pievienots"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Trigera piezīmes"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Trigeris izdzēsts"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
@@ -13803,14 +14208,14 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13826,11 +14231,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13838,7 +14244,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr "Trigera forma"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13851,12 +14257,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13868,54 +14274,54 @@ msgstr ""
 msgid "Trigger name"
 msgstr "Trigera nosaukums"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Trigera prototips"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Trigeru prototipi"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13923,23 +14329,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Trigeru prototipi no"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Trigeris atjaunots"
 
@@ -13947,40 +14361,41 @@ msgstr "Trigeris atjaunots"
 msgid "Trigger value"
 msgstr "Trigera vērtība"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Trigeri"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Trigeri izdzēsti"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Informācija par trigeriem"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr ""
 
@@ -13988,78 +14403,78 @@ msgstr ""
 msgid "Triggers overview"
 msgstr ""
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Trigera status"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Top 100 trigeri"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr ""
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Otr"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Turku (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Jāiezīmē divi elementi"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Tips"
 
@@ -14067,62 +14482,64 @@ msgstr "Tips"
 msgid "Type (Full details)"
 msgstr "Tips (Visas detaļas)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Tips (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Aprēķina tips"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Informācijas tips"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Tipi"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "NEZINĀMS"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "Saite"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "Tīmekļa adrese (pēc pieslēgšanās)"
 
@@ -14138,20 +14555,30 @@ msgstr "Tīmekļa adrese B"
 msgid "URL C"
 msgstr "Tīmekļa adrese C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "ASV (160 rakstzīmes)"
 
@@ -14159,15 +14586,11 @@ msgstr "ASV (160 rakstzīmes)"
 msgid "USER PROFILE"
 msgstr "LIETOTĀJA PROFILA"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukraiņu (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14175,7 +14598,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr ""
 
@@ -14188,20 +14611,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr ""
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Atbloķēt iezīmētos"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Vai atbloķēt iezīmētos lietotājus?"
 
@@ -14210,29 +14633,29 @@ msgstr "Vai atbloķēt iezīmētos lietotājus?"
 msgid "Units"
 msgstr "Vienības"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14242,23 +14665,20 @@ msgstr "Nav zināms"
 msgid "Unknown action"
 msgstr "Nezināma darbība"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr ""
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Nezināma funkcija."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14270,23 +14690,23 @@ msgstr "Nezināms interfeisa tips."
 msgid "Unknown resource"
 msgstr "Nezināms resurss"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Nezināms vērtības tips"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Atvienot"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Atvienot un iztīrīt"
 
@@ -14294,61 +14714,61 @@ msgstr "Atvienot un iztīrīt"
 msgid "Unlink from template"
 msgstr "Atvienot no šablona"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Atvienot no šabloniem"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14362,32 +14782,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14398,34 +14829,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Atjaunot"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Atjaunošanas intervāls"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Atjaunošanas intervāls (sekundēs)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Saglabāts"
 
@@ -14433,55 +14864,55 @@ msgstr "Saglabāts"
 msgid "Updated status of host"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Atjaunots: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Augšupielādēt"
 
@@ -14489,14 +14920,14 @@ msgstr "Augšupielādēt"
 msgid "Upper level maps"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Darbspējas laiks"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14504,10 +14935,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Darbspējas laiks/Zaudlaiks"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Saite"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14522,85 +14953,89 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Lietotājs"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Lietotājs pievienots"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr ""
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Lietotājs izdzēsts"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Lietotāju grupa"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14618,34 +15053,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Lietotāju grupas"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Lietotājam nav atļauts dzēst sevi."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Lietotāja vārds"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "Lietotāja vārds nesakrīt ar datubāzē esošo."
 
@@ -14671,243 +15106,243 @@ msgstr ""
 msgid "User sessions"
 msgstr "Lietotāja sesijas"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Lietotāja tips"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Lietotāja dati atjaunoti"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Lietotājvārds"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Lietotāji"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Lietotāji (pieslēgušies)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Lietotāji atbloķēti"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Vērtība"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14942,11 +15377,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14992,10 +15427,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Vērtību plānojums"
 
@@ -15004,7 +15439,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -15016,8 +15451,8 @@ msgstr "Vērtība: nav datu"
 msgid "Values"
 msgstr "Vērtības"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Mainīgie"
 
@@ -15030,64 +15465,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertikāli"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Vertikāls novietojums"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr ""
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "T"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Tīmeklis"
 
@@ -15095,67 +15535,85 @@ msgstr "Tīmeklis"
 msgid "Web monitoring"
 msgstr "Tīmekļa uzraudzība"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Tīmekļa scenārijs \"%1$s\" jau eksistē."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Tīmekļa scenārijs izdzēsts"
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Tīmekļa scenāris"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Tre"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Trešdiena"
 
@@ -15163,9 +15621,9 @@ msgstr "Trešdiena"
 msgid "Week"
 msgstr "Nedēļa"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Nedēļas"
 
@@ -15173,12 +15631,12 @@ msgstr "Nedēļas"
 msgid "When active"
 msgstr "Kad aktīvs"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Platums"
@@ -15188,28 +15646,28 @@ msgstr "Platums"
 msgid "With data collection"
 msgstr ""
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Ar problēmām"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Ar trigeriem"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Bez problēmām"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Bez trigeriem"
 
@@ -15218,7 +15676,7 @@ msgid "Wizard"
 msgstr "Vednis"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15231,277 +15689,271 @@ msgstr "Darba laiks"
 msgid "Working time \"%1$s\"."
 msgstr "Darba laiks \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Rakstīšana"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Nepareizs makros \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "X iezīme"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML fails satur kļūdu %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML fails satur kļūdas"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML fails satur brīdinājumu %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "G"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Y ass MAX vērtība"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Y ass MIN vērtība"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr ""
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Y iezīme"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr ""
 
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "G.M.d S:m:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "G.m.d"
-
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "G.m.d S:m"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "G.m.d S:m:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr ""
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Gads"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Ik gadu"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Jā"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Jota"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Jūs neesat pieslēdzies."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Jums nav tiesības veidot jaunus lietotājus."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Jums nav tiesības atjaunot citu lietotāju datus."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Jums nav tiesības atjaunot citu lietotāju datus vai arī lietotājs vairāk neeksistē."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Jums jāpieslēdzas, lai aplūkotu šo lapu."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr "Tu esi pieslēdzies kā"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15514,7 +15966,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15533,8 +15985,8 @@ msgid "Zabbix User"
 msgstr "Zabbix lietotājs"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15560,10 +16012,11 @@ msgstr "Zabbix iekšējā"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix iekšējā autentifikācija"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix serveris"
@@ -15576,7 +16029,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15584,15 +16037,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Zabbix servera informācija"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix serveris nav palaists: attēlotā informācija var nebūt aktuāla"
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix serveris darbojas"
 
@@ -15601,11 +16054,11 @@ msgstr "Zabbix serveris darbojas"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Zabbix servera vārds"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Zabbix servera ports"
 
@@ -15613,25 +16066,20 @@ msgstr "Zabbix servera ports"
 msgid "Zabbix trapper"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Tālummaiņa"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[S:m:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15640,19 +16088,19 @@ msgstr ""
 msgid "agent"
 msgstr "aģents"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "visi"
 
@@ -15660,19 +16108,15 @@ msgstr "visi"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "jau eksistē"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "zilas"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "zaļas"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "sarkanas"
 
@@ -15684,83 +16128,49 @@ msgstr "automātiskā reģistrēšanās"
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "vid"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M G S:m"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m S:m"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.g"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "dienas"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15782,19 +16192,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dinamisks"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elementi"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "kopēt elementus uz ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15806,47 +16212,49 @@ msgstr "gluži"
 msgid "executed"
 msgstr "izpildīts"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "fiksēts"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "atrastiem"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "s"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "ss"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr ""
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr ""
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "ikona"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "attēls"
 
@@ -15854,7 +16262,7 @@ msgstr "attēls"
 msgid "in"
 msgstr "iekšā"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15864,7 +16272,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "ir"
 
@@ -15872,20 +16280,20 @@ msgstr "ir"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "pēdējais"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "kā"
@@ -15894,12 +16302,12 @@ msgstr "kā"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15908,46 +16316,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "makros(i)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr ""
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "karte"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "minimums 60 sekundes"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15956,17 +16364,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "nepieciešams derīgs LDAP lietotājs"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr "jauns"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "nav datu"
@@ -15979,12 +16387,14 @@ msgstr "nav iekš"
 msgid "not like"
 msgstr "nav kā"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "negriežas"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "nav izvēlēts"
 
@@ -15993,57 +16403,61 @@ msgstr "nav izvēlēts"
 msgid "not sent"
 msgstr "netika nosūtīts"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "tagad"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "no"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "uz"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "cits"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "atjaunots katras"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16052,25 +16466,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "atcerēties izvēlēto"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "palaists"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sek"
 
@@ -16083,7 +16496,7 @@ msgstr "sekundes"
 msgid "sent"
 msgstr "nosūtīts"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "īss apraksts"
 
@@ -16091,36 +16504,36 @@ msgstr "īss apraksts"
 msgid "show icon mappings"
 msgstr "parādīt ikonu plānojumu"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "parādīt vērtību plānojumu"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "veidne ID \"%1$s\" ir nodota %2$s reizes"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "līdz"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "trigeris"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr "ieraksti ko meklēt"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "nezināms"
 
@@ -16132,11 +16545,11 @@ msgstr "vērtība"
 msgid "via"
 msgstr "caur"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "g"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "gggg"
diff --git a/frontends/php/locale/nl/LC_MESSAGES/frontend.po b/frontends/php/locale/nl/LC_MESSAGES/frontend.po
index afd439252e5..5c2dcd5dc42 100644
--- a/frontends/php/locale/nl/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/nl/LC_MESSAGES/frontend.po
@@ -2,9 +2,9 @@
 # Raymond Kuiper <qix@the-wired.net>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-11-21 15:44+0300\n"
 "Last-Translator: open-future <patrik@open-future.be>\n"
 "Language-Team: NL\n"
@@ -17,29 +17,31 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1385041464.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" moet vallen tussen 1970.01.01 en 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Laat triggers met status OK zien\" moet \"0\" of meer zijn."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Triggers laten knipperen op status verandering\" moet \"0\" of meer zijn."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d dag"
 msgstr[1] "%1$d dagen"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -51,24 +53,22 @@ msgstr[1] "%1$d van %2$d problemen wordt getoond"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (jaar %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Item"
 msgstr[1] "%1$s Items"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s dag"
 msgstr[1] "%1$s dagen"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -83,7 +83,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -104,23 +104,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d device"
 msgstr[1] "%d devices"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - oneindig)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Alleen super admins kunnen groupen aanmaken)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(in dagen)"
 
@@ -128,34 +128,34 @@ msgstr "(in dagen)"
 msgid "(in sec)"
 msgstr "(in sec)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimaal 60 seconden, 0 - gebruik standaard waarde van de actie)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(geen proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[BEVESTIG IN BULK]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 of 1"
 
@@ -171,7 +171,7 @@ msgstr "10 seconden"
 msgid "30 seconds"
 msgstr "30 seconden"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D aanzicht"
 
@@ -187,7 +187,7 @@ msgstr "5 seconden"
 msgid "500 latest values"
 msgstr "500 laatste waardes"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Sub-menu/Sub-menu.../>Script"
 
@@ -206,12 +206,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "MELDING BEVESTIGINGEN"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "EN"
 
@@ -223,19 +222,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "BESCHIKBAARHEIDS REPORT"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Absoluut verschil tussen het laatste en voorlaatste waarde is < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Absoluut verschil tussen het laatste en voorlaatste waarde is = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Absoluut verschil tussen het laatste en voorlaatste waarde is > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Absoluut verschil tussen het laatste en voorlaatste waarde is niet N"
 
@@ -247,42 +246,42 @@ msgstr "Aanvaardbare SLA"
 msgid "Access denied!"
 msgstr "Toegang geweigerd!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Toegang geweigerd"
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Account is geblokkeerd voor %s seconden"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Bvst"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Bevestigen"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Bevestiging toegevoegd"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Melding bevestigd door"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Bevestig en keer terug"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Bevestiging status"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Bevestigd"
 
@@ -307,62 +306,65 @@ msgstr "Bevestigen is uitgeschakeld"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Actie"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Actie \"%1$s\" bestaat reeds."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Actie \"%1$s\" heeft verkeerde waare voor \"esc_period\" (minimum %2$s seconden)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Actie \"%1$s\" geen bewerking gedefinieerd."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Actie toegevoegd"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Actie verwijderd"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -375,21 +377,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Actie handelingen"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Actie bijgewerkt"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Acties"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Actief"
@@ -399,80 +401,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Actief"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Actief sinds"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Actief tot"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Toevoegen"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Opmerking toegevoegd door"
 
@@ -488,27 +493,23 @@ msgstr "Host toevoegen"
 msgid "Add link"
 msgstr "Koppeling toevoegen"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Ontbrekende toevoegen"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Voeg nieuwe of bestaande applicaties toe"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Voeg nieuwe of bestaande hostgroepen toe"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Prototype toevoegen"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Toevoegen aan"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Toevoegen aan Favorieten"
@@ -517,7 +518,7 @@ msgstr "Toevoegen aan Favorieten"
 msgid "Add to host group"
 msgstr "Aan host groep toevoegen"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Aan host groepen toevoegen"
 
@@ -529,7 +530,7 @@ msgstr "Toegevoegd"
 msgid "Admin"
 msgstr "Beheerder"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Beheer"
 
@@ -537,34 +538,34 @@ msgstr "Beheer"
 msgid "Advanced labels"
 msgstr "Geavanceerde labels"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Doorlooptijd"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Leeftijd minder dan"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Doorlooptijd minder dan %s "
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agent"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Agent interfaces"
@@ -573,12 +574,12 @@ msgstr "Agent interfaces"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agent, SNNMP, JMX of IPMI interface"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -586,123 +587,126 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Iconen uitlijnen"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Alle"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Alle groepen"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Bij alle koppelingen moeten \"Naam\" en \"URL\" gespecificeerd zijn."
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Toegestane hosts"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Iedere"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Iedere character string meegenomen"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Applicatie"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Applicatie \"%1$s\" bestaat reeds."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Applicatie toegevoegd"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Applicatie verwijderd"
 msgstr[1] "Applicatie verwijderd"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Applicatie fout."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Applicatie bijgewerkt"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Applicatie ID \"%1$s\" is niet beschikbaar op \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Applicaties"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -711,16 +715,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Naderen"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Apr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "April"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Weet je zeker dat je deze actie uit wilt voeren?"
 
@@ -736,9 +740,9 @@ msgstr "Grootte van het gebied"
 msgid "Area type"
 msgstr "Type van het gebied"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -752,52 +756,49 @@ msgstr "Als platte tekst"
 msgid "Asset tag"
 msgstr "Asset nummer"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "Om %1$s:%2$s op %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "Om %1$s:%2$s op %3$s %4$s elke %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "Om %1$s:%2$s op dag %3$s elke %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] "Op %1$s:%2$s op elke %3$s van iedere week"
 msgstr[1] "Op %1$s:%2$s op elke %3$s van alle %4$s weken"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] "Op %1$s:%2$ s op elke dag"
 msgstr[1] "Op %1$s:%2$s op alle %3$s dagen"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "Op (hour:minute)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Op zijn minst een host of groep moet geselecteerd zijn."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Op zijn minst een onderhoudsperiode moet aangemaakt zijn."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Controle"
@@ -817,26 +818,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Aug"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Augustus"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Authenticatie"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Authenticatie algoritme"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -895,9 +898,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -905,20 +908,20 @@ msgstr "Automatisch"
 msgid "Automatic icon mapping"
 msgstr "Automatisch iconen koppelen"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Automatisch iconen selecteren"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Beschikbaarheid"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Beschikbaarheids rapportage"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Beschikbaar"
 
@@ -927,36 +930,36 @@ msgstr "Beschikbaar"
 msgid "Average"
 msgstr "Gemiddeld"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Gemiddeld met"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Gemiddelde waarde gedurende periode T is < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Gemiddelde waarde gedurende periode T is = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Gemiddelde waarde gedurende periode T is > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Gemiddelde waarde gedurende periode T is NIET N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "As positie"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Achtergrond"
@@ -965,7 +968,7 @@ msgstr "Achtergrond"
 msgid "Background image"
 msgstr "Achtergrond afbeelding"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Staafdiagram rapportages"
 
@@ -975,8 +978,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Basis authenticatie"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -988,15 +991,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind paswoord"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Bitsgewijs AND van de laatste (meest recente) T-waarde en masker is = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Bitsgewijs AND van de laatste (meest recente) T-waarde en masker is NOT N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Zwart en Blauw"
 
@@ -1008,8 +1011,8 @@ msgstr "Knipperend"
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Vette lijn"
 
@@ -1017,22 +1020,22 @@ msgstr "Vette lijn"
 msgid "Boolean"
 msgstr "Booleaans"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Onderzijde"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Lichter maken"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgaars (bg_NG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "In bulk bevestigen"
 
@@ -1058,7 +1061,7 @@ msgstr "CONFIGURATIE VAN APPLICATIES"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURATIE VAN AUTHENTICATIE"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1088,7 +1091,7 @@ msgstr "CONFIGURATIE VAN HOST GROEPEN"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "CONFIGURATIE VAN HOST PROTOTYPES"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURATIE VAN HOSTS"
 
@@ -1100,7 +1103,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURATIE VAN DE ICON MAPPING"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURATIE VAN AFBEELDINGEN"
 
@@ -1109,14 +1112,14 @@ msgstr "CONFIGURATIE VAN AFBEELDINGEN"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURATIE VAN IT SERVICES"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURATIE VAN ITEM PROTOTYPES"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURATIE VAN ITEMS"
 
@@ -1145,7 +1148,7 @@ msgstr "CONFIGURATIE VAN NETWERK KAARTEN"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURATIE VAN PROXIES"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURATIE VAN REGULIERE EXPRESSIES"
 
@@ -1165,7 +1168,7 @@ msgstr "CONFIGURATIE VAN SCRIPTS"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURATIE VAN DIA VOORSTELLINGEN"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURATIE VAN TEMPLATES"
 
@@ -1181,7 +1184,7 @@ msgstr "CONFIGURATIE VAN TRIGGER SEVERITIES"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURATIE VAN TRIGGERS"
 
@@ -1213,22 +1216,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURATIE VAN ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1237,21 +1240,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Bereken SLA, acceptabele SLA (in %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Berekend"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Berekende permissies"
 
@@ -1259,92 +1262,95 @@ msgstr "Berekende permissies"
 msgid "Callback"
 msgstr "Terugbellen"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canada (136 karakter)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Kan event niet bevestigen"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Kan geen niet-numeriek item \"%1$s\" aan grafiek \"%2$s\" toevoegen."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Kan een niet-numeriek item niet toevoegen \"%1$s\" in grafiek prototype \"%2$s\".Kan een niet-numeriek item niet toevoegen \"%1$s\" in grafiek prototype \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Kan een niet-numeriek item \"%1$s\" niet toevoegen."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "kan actie niet toevoegen"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Kan actie voorwaarde niet toevoegen"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Kan applicatie niet toevoegen"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Kan geen host afhankelijkheid toevoegen aan een template."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Kan afhankelijkheid niet toevoegen van trigger \"%1$s:%2$s\" naar niet bestaande trigger \"%3$s:%4$s\".Kan afhankelijkheid niet toevoegen van trigger \"%1$s:%2$s\" naar niet bestaande trigger \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Kan discovery regel niet toevoegen"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Kan grafiek niet toevoegen"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Kan groep niet toevoegen"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Kan host niet toevoegen"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Kan gastheer prototype niet toevoegen"
 
@@ -1352,24 +1358,24 @@ msgstr "Kan gastheer prototype niet toevoegen"
 msgid "Cannot add image"
 msgstr "Kan afbeelding niet toevoegen"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Kan geen afbeelding toevoegen."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Kan item niet toevoegen"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Kan geen add-item \"%1$s\" van \"%2$s\" om de toepassing \"%3$s\" van \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Kan geen items toevoegen."
 
@@ -1377,20 +1383,20 @@ msgstr "Kan geen items toevoegen."
 msgid "Cannot add macro."
 msgstr "Kan geen macro toevoegen."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Kan onderhoud niet toeveoegen"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Kan media type niet toevoegen"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Kan niet meer dan één item van het type \"Grafiek som\" toevoegen aan grafiek \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "Kan meer dan een item niet toevoegen met type \"Graph sum\" op de grafiek prototype \"%1$s\".Kan meer dan een item niet toevoegen met type \"Graph sum\" op de grafiek prototype \"%1$s\"."
@@ -1399,24 +1405,24 @@ msgstr "Kan meer dan een item niet toevoegen met type \"Graph sum\" op de grafie
 msgid "Cannot add network map"
 msgstr "Kan netwerk kaart niet toevoegen"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Kan nieuwe applicatie \"%1$s\" niet toevoegen."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Kan proxy niet toevoegen"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Kan reguliere expressie niet toevoegen"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Kan scherm niet toevoegen"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Kan script niet toevoegen"
 
@@ -1428,27 +1434,27 @@ msgstr "Kan service niet toevoegen"
 msgid "Cannot add slide show"
 msgstr "Kan diavoorstelling niet toevoegen"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Kan template niet toevoegen"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Kan trigger niet toevoegen"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Kan gebruiker niet toevoegen"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Kan gebruiker niet toevoegen. Beide wachtwoorden moeten hetzelfde zijn."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Kan gebruikers niet toevoegen."
 
@@ -1456,7 +1462,7 @@ msgstr "Kan gebruikers niet toevoegen."
 msgid "Cannot add value map"
 msgstr "Kan niet map waarde bijwerken"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Kan web scenario niet toevoegen."
 
@@ -1476,23 +1482,23 @@ msgstr "Kan authenticatie methode niet naar LDAP veranderen"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Kan authenticatie methode niet naar Zabbix internal veranderen"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Kan geschiedenis niet opschonen"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Kan grafiek prototypes niet klonen"
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Kan gastheer prototypes niet clonen."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Kan item prototypes niet klonen"
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Kan trigger prototypes niet klonen"
 
@@ -1500,20 +1506,20 @@ msgstr "Kan trigger prototypes niet klonen"
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Kan niet verbinden met de de Zabbix server daemon trapper port, deze zou beschikbaar moeten zijn voor het script."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Kan de grafieken niet kopieren"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Kan de items niet kopieren"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Kan trigger \"%1$s:%2$s\" niet kopiëren, omdat er meerde hosts in de expressie zijn."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "Kan een gastheer prototype op een ontdekte gastheer niet maken \"%1$s\"."
@@ -1522,19 +1528,19 @@ msgstr "Kan een gastheer prototype op een ontdekte gastheer niet maken \"%1$s\".
 msgid "Cannot create another database connection."
 msgstr "Kan geen andere database verbinding opzetten."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Kan geen circulaire afhankelijkheden maken."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Kan geen afhankelijkheid maken op de trigger zelf."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Kan discovery regel niet aanmaken"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Kan hostgroep niet maken."
 
@@ -1542,102 +1548,102 @@ msgstr "Kan hostgroep niet maken."
 msgid "Cannot create icon map"
 msgstr "Kan icoon map niet aanmaken"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Kan géén icoon mappen met identieke namen \"%s\" aanmaken."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Kan de map \"%s\" niet aanmaken."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Kan nieuwe applicatie niet aanmaken, web scenairo is al reeds toegewezen aan applicatie."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Kan nieuw element niet aanmaken"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Kan screen niet aanmaken."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Kan de Zabbix gebruiker \"%1$s\" niet verwijderen, probeer de gebruiker uit te schakelen."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Kan actie niet verwijderen"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Kan applicatie niet verwijderen"
 msgstr[1] "Kan applicatie niet verwijderen"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Kan de afhankelijkheid niet verwijderen"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Kan discovery regel niet verwijderen"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Kan discovery regels niet verwijderen"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Kan grafiek niet verwijderen"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Kan grafiek prototype niet verwijderen"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Kan grafiek niet verwijderen."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Kan grafieken niet verwijderen"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Kan de aangemaakte grafieken door low level discovery niet verwijderen."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Kan groep niet verwijderen"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Kan groep niet verwijderen"
+msgstr[1] "Kan groep niet verwijderen"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Kan host niet verwijderen"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Kan host groep niet verwijderen."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Kan gastheer prototype niet verwijderen."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Kan gastheer prototypes niet verwijderen"
 
@@ -1645,79 +1651,79 @@ msgstr "Kan gastheer prototypes niet verwijderen"
 msgid "Cannot delete icon map"
 msgstr "Kan icoon map niet verwijderen"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Kan afbeelding niet verwijderen"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Kan inventarisatie niet verwijderen"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Kan item niet verwijderen"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Kan items niet verwijderen"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Kan aangemaakte items door low level discovery niet verwijderen."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Kan onderhoud niet verwijderen"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Kan het mediatype niet verwijderen"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Kan netwerk kaart niet verwijderen"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Kan proxy niet verwijderen"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Kan reguliere expressie niet verwijderen"
 msgstr[1] "Kan reguliere expressies niet verwijderen"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Kan scherm niet verwijderen"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Kan script niet verwijderen"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Kan scripts niet verwijderen. \"scriptids\" is leeg."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Kan de scripts niet verwijderen. Het script \"%1$s\" wordt gebruikt in een handeling voor actie \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Kan scripts niet verwijderen. Scripts met scriptid \"%1$s\" bestaat niet."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Kan de geslecteerde acties niet verwijderen"
 
@@ -1725,77 +1731,80 @@ msgstr "Kan de geslecteerde acties niet verwijderen"
 msgid "Cannot delete service"
 msgstr "Kan service niet verwijderen"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Kan de diashow niet verwijderen"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Kan template niet verwijderen"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Kan applicatie in template niet verwijderen"
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Kan een template grafiek niet verwijderen."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Kan templated gastheer prototype niet verwijderen."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Kan een template item niet verwijderen."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Kan items in template niet verwijderen"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Kan template items niet verwijderen."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Kan de template trigger \"%1$s:%2$s\" niet verwijderen."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Kan web scenario \"%1$s in template niet verwijderen."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Kan trigger niet verwijderen"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Kan trigger prototype niet verwijderen"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Kan trigger niet verwijderen."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Kan triggers niet verwijderen"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Kan aangemaakte triggers door low level discovery niet verwijderen."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Kan gebruiker niet verwijderen"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Kan gebruikersmedia niet verwijderen."
 
@@ -1803,78 +1812,78 @@ msgstr "Kan gebruikersmedia niet verwijderen."
 msgid "Cannot delete value map"
 msgstr "Kan waarde relaties niet verwijderen"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Kan web scenario niet verwijderen"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Kan mediatype niet uitgeschakelen"
 msgstr[1] "Kan mediatype niet uitgeschakelen"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1889,135 +1898,129 @@ msgstr "Kan artikel wachtrij niet weergeven."
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "Kan niet meer dan één item weergeven met type \"Graph sum\"."
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Kan mediatype niet inschakelen"
 msgstr[1] "Kan mediatype niet inschakelen"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Kan achtergrondafbeelding \"%1$s\" gebruikt in map \"%2$s niet terugvinden."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kan grafiek \"%1$s\" in scherm \"%2$s\" niet vinden."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Kan groep \"%1$s\" gebruikt in map \"%2$s\" niet terugvinden."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kan groep \"%1$s\" in scherm \"%2$s\" niet vinden."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Kan host \"%1$s\" gebruikt in map \"%2$s\" niet terugvinden."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kan host \"%1$s\" in scherm \"%2$s\" niet vinden."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Kan de host interface op \"%1$s\" voor item key \"%2$s\" niet vinden."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Kan host of sjabloon \"%1$s\" gebruikt in grafiek \"%2$s\" niet vinden."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2028,34 +2031,53 @@ msgstr "Kan icoon \"%1$s\" gebruikt in map \"%2$s\" niet terugvinden."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Kan de icoon map \"%1$s\" gebruikt in map \"%2$s\" niet vinden."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kan item \"%1$s\" gebruikt in scherm \"%2$s\" niet vinden."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Kan de map \"%1$s\" gebruikt de geexporteerde map \"%2$s\" niet vinden."
@@ -2065,41 +2087,41 @@ msgstr "Kan de map \"%1$s\" gebruikt de geexporteerde map \"%2$s\" niet vinden."
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Kan map \"%1$s\" gebruikt in map \"%2$s\" niet vinden."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kan kaart \"%1$s\" gebruikt in scherm \"%2$s\" niet vinden."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Kan geen objecten vinden met naam"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Kan scherm \"%1$s\" gebruikt in scherm \"%2$s\" niet vinden."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Kan trigger \"%1$s\" gebruikt in map \"%2$s\" niet vinden."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2112,12 +2134,14 @@ msgstr "Kan boom niet opmaken. Controleer de structuur van de service links."
 msgid "Cannot format tree."
 msgstr "Kan structuur niet formatteren."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Kan expressie \"%s\" niet imploderen."
@@ -2129,59 +2153,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] "Kan scherm niet importeren \"%1$s\": subscherm \"%2$s\" bestaat niet."
 msgstr[1] "Kan scherm niet importeren \"%1$s\": subschermen \"%2$s\" bestaan niet."
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "Kan sjabloon niet importeren \"%1$s\", gekoppeld sjabloon \"%2$s\" bestaat niet."
 msgstr[1] "Kan sjabloon niet importeren \"%1$s\", gekoppelde sjablonen \"%2$s\" bestaan niet."
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Kan view bestand \"%s\" niet invoegen."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Kan gebruikersmedia niet invoegen."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Kan template niet ontkoppelen"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Kan niet uitloggen."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Kan hostnaam niet in bulk bijwerken."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Kan de zichtbare hostnaam niet in bulk bijwerken."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Kan dubbele template IDs niet verwerken bij koppelen: %s."
@@ -2201,7 +2226,7 @@ msgstr "Kan de update statement niet uitvoeren op tabel \"%1$s\" zonder waarden.
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Kan de update statement niet uitvoeren op tabel \"%1$s\" zonder where conditie."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "Kan toepassingen van verschillende hosts of sjablonen niet verwerken."
 
@@ -2210,11 +2235,11 @@ msgstr "Kan toepassingen van verschillende hosts of sjablonen niet verwerken."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Kan het antwoord niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan het antwoord niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan het antwoord niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan het antwoord niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan het antwoord niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan het antwoord niet lezen, controleer verbinding met de Zabbix server \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Kan niet alle items verwijderen, op zijn minst een item moet aanwezig blijven."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2222,11 +2247,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Kan macro niet verwijderen."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Kan de gastgebruiker niet hernoemen."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Kan de discovery regel niet opslaan zonder checks."
 
@@ -2235,217 +2260,226 @@ msgstr "Kan de discovery regel niet opslaan zonder checks."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Kan commando niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan commando niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan commando niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan commando niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan commando niet lezen, controleer verbinding met de Zabbix server \"%1$s\".Kan commando niet lezen, controleer verbinding met de Zabbix server \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "\"%1$s\" kan niet ingesteld worden voor item \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "\"%1$s\" kan niet ingesteld worden voor trigger \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "\"templateid\" kan niet ingesteld worden voor applicatie \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "\"templateid\" kan niet ingesteld worden voor scherm \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "\"templateid\" kan niet ingesteld worden voor trigger prototype \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Inventory velden kunnen niet ingesteld worden voor uitgeschakelde inventaris."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Kan de host interface niet omschakelen."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Kan gebruikers niet deblokkeren"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Kan Web scenarios niet ontkoppelen en opschonen."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Kan applicaties niet ontkoppelen en opschonen."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Kan discovery regels niet onkoppelen en opschonen"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Kan grafiek prototypes niet ontkoppelen en opschonen"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Kan grafieken niet ontkoppelen en opschonen"
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Kan prototypes niet ontkoppelen en opschonen"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Kan items niet ontkoppelen en opschonen"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Kan triggers niet ontkoppelen en opschonen"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Kan template niet ontkoppelen"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Kan de trigger \"%s\" niet onkopplen, er is een template aan de host gekoppeld welke de items bevat."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "Kan  \"%1$s\" niet updaten voor een ontdekt gastheer."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Kan \"%1$s\" niet updaten voor een ontdekt item."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Kan \"%1$s\" niet updaten voor een ontdekte trigger."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "\"%1$s\" kan niet bijgewerkt worden voor item \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "\"%1$s\" kan niet bijgewerkt worden voor trigger \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "\"templateid\" kan niet bijgewerkt worden voor applicatie \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "\"templateid\" kan niet bijgewerkt worden voor grafiek \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Kan \"templateid\" voor graph prototype \"%1$s\" niet updaten."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "\"templateid\" kan niet bijgewerkt worden voor scherm \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "\"templateid\" kan niet bijgewerkt worden voor trigger prototype \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Kan een ontdekte grafiek niet bijwerken."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Kan een ontdekte gastheer groep niet bijwerken."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Kan actie niet bijwerken"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Kan applicatie niet bijwerken"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Kan opmerkingen niet bijwerken"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Kan de configuratie niet bijwerken"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Kan debug modus niet bijwerken"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Kan discovery rule niet bijwerken"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Kan frontend toegang niet bijwerken"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Kan grafiek niet bijwerken"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Kan groep niet bijwerken"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Kan groep niet bijwerken."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Kan geen groepen updaten voor ontdekte host \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Kan host niet bijwerken"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Kan gastheer prototype niet bijwerken"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Kan hosts niet bijwerken"
 
@@ -2457,24 +2491,24 @@ msgstr "kan icoon map niet bijwerken"
 msgid "Cannot update image"
 msgstr "Kan afbeelding niet bijwerken"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Kan afbeelding niet bijwerken."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Kan interface niet bijwerken voor ontdekte host \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Kan item niet bijwerken"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Kan items niet bijwerken"
 
@@ -2486,16 +2520,16 @@ msgstr "Kan macro niet bijwerken."
 msgid "Cannot update macros"
 msgstr "Kan macros niet bijwerken"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Kan onderhoud niet bijwerken"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Kan kaart \"%s\" niet aanmaken."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Kan mediatype niet bijwerken"
 
@@ -2503,28 +2537,24 @@ msgstr "Kan mediatype niet bijwerken"
 msgid "Cannot update network map"
 msgstr "Kan netwerk kaart niet bijwerken"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Kan proxy niet bijwerken"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Kan proxy niet bijwerken voor ontdekte host \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Kan reguliere expressie niet bijwerken"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Kan scherm niet bijwerken"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Kan scherm niet bijwerken."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Kan script niet bijwerken"
 
@@ -2536,40 +2566,41 @@ msgstr "Kan service niet bijwerken"
 msgid "Cannot update slide show"
 msgstr "Kan de diavoorstelling niet bijwerken"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Kan template niet bijwerken"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Kan applicatie in template niet bijwerken."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "Kan geen sjablonen op ontdekte host \"%1$s\" bijwerken."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Kan trigger niet bijwerken"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Kan gebruiker niet bijwerken"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Kan gebruikersmedia niet bijwerken."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Kan gebruiker niet bijwerken. Beide wachtwoorden moeten hetzelfde zijn."
 
@@ -2577,15 +2608,15 @@ msgstr "Kan gebruiker niet bijwerken. Beide wachtwoorden moeten hetzelfde zijn."
 msgid "Cannot update value map"
 msgstr "Kan value map niet bijwerken"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Kan web scenario niet bijwerken"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "Kan ontdekking controleren niet valideren: ongeldig verzoek of aansluiting op Zabbix server is mislukt.Kan ontdekking controleren niet valideren: ongeldig verzoek of aansluiting op Zabbix server is mislukt.Kan ontdekking controleren niet valideren: ongeldig verzoek of aansluiting op Zabbix server is mislukt.Kan ontdekking controleren niet valideren: ongeldig verzoek of aansluiting op Zabbix server is mislukt.Kan ontdekking controleren niet valideren: ongeldig verzoek of aansluiting op Zabbix server is mislukt.Kan ontdekking controleren niet valideren: ongeldig verzoek of aansluiting op Zabbix server is mislukt."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Beschrijving"
 
@@ -2594,47 +2625,47 @@ msgstr "Beschrijving"
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Midden"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Aanpassen"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Wijzig"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Karakter"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Iedere character string meegenomen"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Iedere character string niet meegenomen"
 
@@ -2643,48 +2674,48 @@ msgid "Chassis"
 msgstr "Chassis"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Controle bestaat al."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Controleer stuk van expressie beginnend bij \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Controleer de sleutel, aub. Standaard voorbeeld werd doorgegeven."
 
@@ -2693,44 +2724,44 @@ msgid "Check type"
 msgstr "Controleer type"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Controles"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Controles moeten uniek zijn."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chinese (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Chinees (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Circulaire link kan niet aangemaakt worden voor map element \"%s\"."
@@ -2745,34 +2776,35 @@ msgstr "Circulaire referentie in maps : %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Circulaire referentie in schermen : %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Circulaire referentie in sjablonen: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Circulair linken van sjablonen is niet toegestaan."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Klassiek"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Wissen"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Wis geschiedenis en trends"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Wis geschiedenis voor selectie"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Wis bij ontkoppelen"
 
@@ -2782,69 +2814,69 @@ msgstr "Klok"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Kloon"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Sluiten"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Sluit expressie bouwer"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Kleur"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "Kleur \"%1$s\" is niet juist: hexadecimale kleurcode (6 symbolen) wordt verwacht."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Kleur (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Kolom breedte"
 
@@ -2859,7 +2891,7 @@ msgstr "Gecombineerd resultaat"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Commando"
 
@@ -2867,41 +2899,31 @@ msgstr "Commando"
 msgid "Command actions"
 msgstr "Commando acties"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Commando kan niet leeg zijn."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Commando's"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Opmerkingen bijgewerkt"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Opmerkingen"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Reacties voor \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Commercieel"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Vergelijk waardes voor meerdere periodes"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Samengestelde permissies"
 
@@ -2909,29 +2931,39 @@ msgstr "Samengestelde permissies"
 msgid "Condition"
 msgstr "Condities"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Condities"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3094,23 +3126,23 @@ msgstr "Configuratie bijgewerkt"
 msgid "Configure (Filter %s)"
 msgstr "Configureer (Filter %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Bevestigingstekst"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Verbinding met"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Geconnecteerd als '%1$s'"
@@ -3169,7 +3201,7 @@ msgid "Context name"
 msgstr "Verband naam"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3177,30 +3209,37 @@ msgstr ""
 msgid "Contract number"
 msgstr "Contract nummer"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Coordinaten"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Kopie"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Kopieer selectie naar ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Juist login \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Kan afbeelding niet opslaan!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Telling"
 
@@ -3220,6 +3259,10 @@ msgstr "Creër applicatie"
 msgid "Create application (select host first)"
 msgstr "Maak applicatie aan (selecteer eerst een host)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3237,7 +3280,7 @@ msgstr "Maak grafiek aan (selecteer eerst een host)"
 msgid "Create graph prototype"
 msgstr "Maak grafiek prototype aan"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Maak host aan"
 
@@ -3250,15 +3293,15 @@ msgstr "Maak hostgroep aan"
 msgid "Create host prototype"
 msgstr "Maak gastheer prototype"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Maak icoon map aan"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Maak afbeelding aan"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Maak item aan"
 
@@ -3282,6 +3325,10 @@ msgstr "Maak kaart"
 msgid "Create media type"
 msgstr "Maak media type aan"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Maak proxy aan"
@@ -3306,11 +3353,11 @@ msgstr "Maak script aan"
 msgid "Create slide show"
 msgstr "Maak slide show aan"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Maak sjabloon aan"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Maak trigger aan"
 
@@ -3334,42 +3381,42 @@ msgstr "Make gebruikersgroep aan"
 msgid "Create value map"
 msgstr "Maak value map aan"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Aangemaakt: Applicatie \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Aangemaakt: Discovery regel \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Gemaakt: Host prototype \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Aangemaakt: Item \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Aangemaakt: Item prototype \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Aangemaakt: Trigger \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr " Aangemaakt: Trigger prototype \"%1$s\" op \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Aangemaakt: Web scenario \"%1$s\" op \"%2$s\"."
@@ -3379,51 +3426,52 @@ msgid "Critical"
 msgstr "Kritiek"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Huidige datum is < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Huidige datum is = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Huidige datum is > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Huidige datum is NIET N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Huidige host"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Huidige tijd is < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Huidige tijd is = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Huidige tijd is > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Huidige tijd is NIET N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Huidige waarde"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3436,7 +3484,7 @@ msgstr "Speciale grafieken"
 msgid "Custom label"
 msgstr "Aangepast label"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Aangepast label elementen van type \"%1$s\" voor map \"%2$s\" mogen niet leeg zijn."
@@ -3450,7 +3498,7 @@ msgstr "Aangepaste vermenigvuldiging"
 msgid "Custom screens"
 msgstr "Aangepaste schermen"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Aangepast script"
 
@@ -3470,18 +3518,14 @@ msgstr "Aangepaste maat"
 msgid "Custom slides"
 msgstr "Aangepaste slides"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Tsjechisch (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "DASHBOARD CONFIGURATIE"
@@ -3497,28 +3541,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "DETAILS VAN SCENARIO"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "UITGESCHAKELD"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "ONTDEKT"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3526,25 +3570,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS naam"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "BENEDEN"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Dagelijks"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Donker oranje"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Verdonkeren"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -3556,20 +3600,21 @@ msgstr "Dashboard configuratie"
 msgid "Dashboard filter"
 msgstr "Dashboard filter"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Gestippelde lijn"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Data"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3592,11 +3637,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Data type"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Databasebestand"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Databasehost"
 
@@ -3604,35 +3650,39 @@ msgstr "Databasehost"
 msgid "Database monitor"
 msgstr "Databasemonitor"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Databasenaam"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Databasepaswoord"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Databasepoort"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Databaseschema"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Databaseserver"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Databasetype"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Databasegebruiker"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Datum"
 
@@ -3652,53 +3702,52 @@ msgstr "Datum HW onderhoud vervalt"
 msgid "Date HW purchased"
 msgstr "Datum HW aangekocht"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Dag"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Dag van de maand"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Dag van de maand is < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Dag van de maand is = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Dag van de maand is > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Dag van de maand is NIET N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Dag van de week"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Dag van de week is < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Dag van de week is = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Dag van de week is > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Dag van de week is NIET N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Dagen"
 
@@ -3706,22 +3755,22 @@ msgstr "Dagen"
 msgid "Debug"
 msgstr "Debug"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Debug mode"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Debug mode bijgewerkt"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dec"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "December"
 
@@ -3731,15 +3780,14 @@ msgstr "Decimaal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Standaard"
 
@@ -3752,11 +3800,11 @@ msgid "Default delay (in seconds)"
 msgstr "Standaard vertraging (in seconden)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Standaard bericht"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Standaard duur van bewerking"
 
@@ -3779,30 +3827,34 @@ msgstr "Standaard thema \"%1$s\"."
 msgid "Delay"
 msgstr "Vertraging"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Vertraging (in sec)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Vertraagd door"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Verwijder"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Verwijder en opschonen"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Geselecteerde sjablonen verwijderen en opschonen? (Aandacht: alle gelinkte host worden opgeschoont!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Sjabloon verwijderen en opschonen? (Aandacht: alle gelinkte host worden opgeschoont!)"
 
@@ -3810,53 +3862,53 @@ msgstr "Sjabloon verwijderen en opschonen? (Aandacht: alle gelinkte host worden
 msgid "Delete application?"
 msgstr "Applicatie verwijderen?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Huidige actie verwijderen?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Discovery regel verwijderen?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Expressie verwijderen?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Grafiek verwijderen?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Geschiedenies van geselecteerd WEB scenarios verwijderen?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Geschiedenis van geslecteerde items verwijderen?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Icoon map verwijderen?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Item verwijderen?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Sleutelwoord verwijderen?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Koppeling tussen geselecteerd elementen verwijderen?"
 
@@ -3864,11 +3916,15 @@ msgstr "Koppeling tussen geselecteerd elementen verwijderen?"
 msgid "Delete maintenance period?"
 msgstr "Onderhousperiode verwijderen?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Netwerkmap verwijderen?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Proxy verwijderen?"
 
@@ -3876,7 +3932,7 @@ msgstr "Proxy verwijderen?"
 msgid "Delete regular expression?"
 msgstr "Reguliere expressie verwijderen?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Scenario verwijderen?"
 
@@ -3884,71 +3940,67 @@ msgstr "Scenario verwijderen?"
 msgid "Delete screen?"
 msgstr "Scherm verwijderen?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Script verwijderen?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Selectie verwijderd"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Geselecteerde WEB scenarios verwijderen?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Geselecteerde acties verwijderen?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Geselecteerde applicaties verwijderen?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Geselecteerde discovery regels verwijderen?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Geselecteerde elementen verwijderen?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Geselecteerde grafieken verwijderen?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Geselecteerde groep verwijderen?"
@@ -3957,27 +4009,27 @@ msgstr "Geselecteerde groep verwijderen?"
 msgid "Delete selected groups?"
 msgstr "Geselecteerde groepen verwijderen?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Geselecteerde hostgroepen verwijderen?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr "Verwijder geselecteerde gastheer prototype?"
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr "Wis geselecteerde gastheer prototypes?"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Geselecteerde host verwijderen?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Geselecteerde hosts verwijderen?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Geselecteerderde afbeelding verwijderen?"
 
@@ -3985,31 +4037,31 @@ msgstr "Geselecteerderde afbeelding verwijderen?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Geselecteerde items verwijderen?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Geselecteerde onderhoudsperiode verwijderen?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Geselecteerde mappen verwijderen?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Geselecteerd media type verwijderen?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Geselecteerde media types verwijderen?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Geselecteerde proxies verwijderen?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Geselecteerde reguliere expressies verwijderen?"
 
@@ -4017,15 +4069,15 @@ msgstr "Geselecteerde reguliere expressies verwijderen?"
 msgid "Delete selected screens?"
 msgstr "Geselecteerde schermen verwijderen?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Geselecteerde scripts verwijderen?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Geselecteerde slide shows verwijderen?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Geselecteerde sjablonen verwijderen?"
 
@@ -4037,11 +4089,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Geselecteerde trigger verwijderen?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Geselecteerde gebruiker verwijderen?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Geselecteerde gebruikers verwijderen?"
 
@@ -4056,11 +4108,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Geselecteerde value mapping verwijderen? Het wordt gebruikt voor item %d!"
 msgstr[1] "Geselecteerde value mapping verwijderen? Het wordt gebruikt voor items %d!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Selectie met gelinkte elementen verwijderen?"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4069,15 +4125,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Slide show verwijderen?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Sjabloon verwijderen?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Trigger verwijderen?"
 
@@ -4085,62 +4141,62 @@ msgstr "Trigger verwijderen?"
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Applicatie \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Discovery regel \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Grafiek \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Verwijderd: Host %1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Host prototype \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Item \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Item prototype \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Verwijderd: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Verwijderd: Sjabloon \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Trigger \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Trigger prototype \"%1$s\" op \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Verwijderd: Web scenario \"%1$s\" op \"%2$s\"."
@@ -4149,35 +4205,35 @@ msgstr "Verwijderd: Web scenario \"%1$s\" op \"%2$s\"."
 msgid "Delimiter"
 msgstr "Onderscheidingsteken"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (simpele verandering)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (snelheid per seconde)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Weiger"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Afhankelijkheden"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Afhankelijk"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Afhankelijk van"
 
@@ -4185,30 +4241,41 @@ msgstr "Afhankelijk van"
 msgid "Deployment status"
 msgstr "Uitrol status"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Omschrijving"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Details"
 
@@ -4221,71 +4288,71 @@ msgid "Device"
 msgstr "Apparaat"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Apparaat uniekheidscriteria"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Verschil tussen MAX en MIN waarde van periode T is < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Verschil tussen MAX en MIN waarde van periode T is = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Verschil tussen MAX en MIN waarde van periode T is > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Verschil tussen MAX en MIN waarde van periode T is NIET N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Verschil tussen laatste en vorige waarden, dan N = 1, 0 - anders"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Verschil tussen laatste en vorige waarden, dan N NIET 1, 0 - anders"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Verschil tussen laatste en vorige waarde is < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Verschil tussen laatste en vorige waarde is = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Verschil tussen laatste en vorige waarde is > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Verschil tussen laatste en vorige waarde is NIET N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4309,48 +4376,44 @@ msgstr "Debug mode in geselecteerde groepen uitschakelen?"
 msgid "Disable host"
 msgstr "Host uitschakelen"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Host uitschakelen?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Hosts in geselecteerde hostgroepen uitschakelen?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Host gecontroleerd door geslecteerde proxies uitschakelen?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Selectie uitschakelen"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Geselecteerde WEB scenarios uitschakelen?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Geselecteerde acites uitschakelen?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Geselecteerde applicaties uitschakelen?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Geselecteerde discovery regeles uitschakelen?"
 
@@ -4358,11 +4421,11 @@ msgstr "Geselecteerde discovery regeles uitschakelen?"
 msgid "Disable selected groups?"
 msgstr "Geselecteerde groepen uitschakelen?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr "Uitschakelen geselecteerde gastheer prototypes?"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Geselecteerde hosts uitschakelen?"
 
@@ -4370,42 +4433,47 @@ msgstr "Geselecteerde hosts uitschakelen?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Geselecteerde items uitschakelen?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Geselecteerde media types uitschakelen?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Geselecteerde trigger uitschakelen?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Gedeactiveerd"
 
@@ -4418,7 +4486,7 @@ msgstr "Catastrofe"
 msgid "Discovered"
 msgstr "Ontdekt"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Ontdekt door"
 
@@ -4426,17 +4494,17 @@ msgstr "Ontdekt door"
 msgid "Discovered device"
 msgstr "Ontdekt apparaat"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Ontdekken"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Ontdekt door proxy"
 
@@ -4444,17 +4512,17 @@ msgstr "Ontdekt door proxy"
 msgid "Discovery check"
 msgstr "Ontdekking controle"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "Ontdekking controle fout"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Ontdekking controles"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Ontdekking lijst"
 
@@ -4463,67 +4531,70 @@ msgid "Discovery object"
 msgstr "Ontdekking object"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Ontdekking regel"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Ontdekkingsregel \"%1$s\"  bestaat al op \"%2$s\", geerfd van een ander sjabloon."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "Ontdekkingsregel \"%1$s:%2$s\" heeft een foute levensduur: \"%3$s\". (min: %4$d, max: %5$d, gebruikersmacro toegelaten)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Ontdekkingsregel \"%s\" bestaat al."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "Ontdekkingsregel \"%1$s:%2$s\" heeft een foute levensduur: \"%3$s\". (min: %4$d, max: %5$d, gebruikersmacro toegelaten)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Ontdekkingsregel aangemaakt"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Ontdekkingsregel verwijderd"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Ontdekkingsregel aangepast"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Ontdekkingsregels"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Ontdekkingsregels verwijderd"
 
@@ -4535,7 +4606,7 @@ msgstr "Ontdekking status"
 msgid "Display OK triggers for"
 msgstr "Toon triggers met status OK voor"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Weergeven"
 
@@ -4544,32 +4615,32 @@ msgstr "Weergeven"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Weergave %1$s van %2$s gevonden"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Distributie van waarden voor meerdere items"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Distributie van waarden voor meerdere perioden"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Bereken niet"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Wens je de voorwaardelijke expressie te vervangen?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Afgerond"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Punt"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Uit"
@@ -4579,30 +4650,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Uit"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Uitvaltijd"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Sleep naar hier om het type van de interface naar \"IPMI\" te veranderen"
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Sleep naar hier om het type van de interface naar \"JMX\" te veranderen"
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Sleep naar hier om het type van de interface naar \"SNMP\" te veranderen"
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Sleep naar hier om het type van de interface naar \"agent\" te veranderen"
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Afbeelding stijl"
 
@@ -4620,74 +4691,75 @@ msgstr "Vervolgkeuzelijst eerste item \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Vervolgkeuzelijst herinner geselecteerd \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Dupliceer afhankelijkheden in trigger \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Dupliceren van groep prototype naam \"%2$s\" voor gastheer prototype \"%1$s\".Dupliceren van groep prototype naam \"%2$s\" voor gastheer prototype \"%1$s\".Dupliceren van groep prototype naam \"%2$s\" voor gastheer prototype \"%1$s\".Dupliceren van groep prototype naam \"%2$s\" voor gastheer prototype \"%1$s\".Dupliceren van groep prototype naam \"%2$s\" voor gastheer prototype \"%1$s\".Dupliceren van groep prototype naam \"%2$s\" voor gastheer prototype \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Dupliceren gastheer groep ID \"%2$s\" voor gastheer prototype \"%1$s\"."
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Dubbele host. Er bestaat reeds een host met dezelfde hostnaam \"%s\"."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Dubbele host. Er bestaat reeds een host met de zichtbare naam \"%s\"."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Dubbele mapnaam voor volgende map \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr "Dupliceer script naam \"%1$s\"."
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Dubbele severity naam \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Dubbele gebruikersalias \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Looptijd"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Looptijd (sec)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Dutch (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Dynamisch item"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "FOUT"
 
@@ -4695,13 +4767,13 @@ msgstr "FOUT"
 msgid "EVENTS"
 msgstr "EVENEMENTEN"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Elke URL moet een unieke naam hebben, Aub wees zeker dat er maar een URL is met deze naam"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4709,9 +4781,9 @@ msgstr "Elke URL moet een unieke naam hebben, Aub wees zeker dat er maar een URL
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Bijwerken"
 
@@ -4719,7 +4791,7 @@ msgstr "Bijwerken"
 msgid "Edit map element"
 msgstr "Map element bijwerken"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Trigger bijwerken"
 
@@ -4727,27 +4799,61 @@ msgstr "Trigger bijwerken"
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Element naam"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Leeg"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Lege actie conditie"
 
@@ -4755,76 +4861,98 @@ msgstr "Lege actie conditie"
 msgid "Empty color."
 msgstr "Lege kleur."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr "Lege host ID voor host prototype."
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "Lege host."
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Lege invoerparameter"
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "Lege invoerparameters."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Lege invoer"
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Lege macro"
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr "Lege naam voor groep prototype."
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr "Lege naam voor gastheer prototype \"%1$s\"."
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "Lege naam voor script \"%1$s\"."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "Lege naam voor script."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Lege naam/"
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Lege parameters"
 
@@ -4833,11 +4961,11 @@ msgstr "Lege parameters"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Leeg antwoord ontvangen van de Zabbix server \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4845,11 +4973,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Lege tijdsperiode"
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Activeer"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Activeer bevestiging"
 
@@ -4869,11 +5001,11 @@ msgstr "Activeer evenement bevestiging"
 msgid "Enable host"
 msgstr "Activeer host"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Host activeren?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Hosts gecontroleerd bij geselecteerd procies activeren?"
 
@@ -4886,36 +5018,32 @@ msgstr "Hosts gecontroleerd bij geselecteerd procies activeren?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Activeer selectie"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Geselecteerde WEB scenarios activeren?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Geselecteerde acties activeren?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Geslelecteerd applicaties activeren?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Geselecteerde ontdekkingsregels activeren?"
 
@@ -4923,11 +5051,11 @@ msgstr "Geselecteerde ontdekkingsregels activeren?"
 msgid "Enable selected groups?"
 msgstr "Geselecteerde groepen activeren?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr "Activeer geselecteerde gastheer prototypes?"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Geselecteerde hosts activeren?"
 
@@ -4935,64 +5063,68 @@ msgstr "Geselecteerde hosts activeren?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Geselecteerde items activeren?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Geselecteerde media types activeren?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Geselecteerde triggers activeren?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Geactiveerd"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Engels (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Engels (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Fout"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Fout in opzoek verzoek voor tabel \"%1$s\"."
@@ -5010,15 +5142,15 @@ msgstr "Gebeurtenis"
 msgid "Event ID"
 msgstr "gebeurtenis ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "Gebeurtenis-ID van vorig logboekvermelding passend aan reguliere expressie T, dan is N = 1, 0 - andersGebeurtenis-ID van vorig logboekvermelding passend aan reguliere expressie T, dan is N = 1, 0 - andersGebeurtenis-ID van vorig logboekvermelding passend aan reguliere expressie T, dan is N = 1, 0 - andersGebeurtenis-ID van vorig logboekvermelding passend aan reguliere expressie T, dan is N = 1, 0 - anders"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "Gebeurtenis-ID van vorig logboekvermelding bijpassende reguliere expressie T, dan is N NIET 1, 0 - andersGebeurtenis-ID van vorig logboekvermelding bijpassende reguliere expressie T, dan is N NIET 1, 0 - andersGebeurtenis-ID van vorig logboekvermelding bijpassende reguliere expressie T, dan is N NIET 1, 0 - andersGebeurtenis-ID van vorig logboekvermelding bijpassende reguliere expressie T, dan is N NIET 1, 0 - anders"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Event erkend"
 
@@ -5027,7 +5159,7 @@ msgstr "Event erkend"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Event erkent \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Event erkennen uitgeschakeld"
 
@@ -5035,7 +5167,7 @@ msgstr "Event erkennen uitgeschakeld"
 msgid "Event details"
 msgstr "Details evenement"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Gebeurteniscreatie"
 
@@ -5055,9 +5187,10 @@ msgstr "Gebeurtenisbron gegevens"
 msgid "Event type"
 msgstr "Soort evenement"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Gebeurtenissen"
 
@@ -5065,36 +5198,41 @@ msgstr "Gebeurtenissen"
 msgid "Events and alerts"
 msgstr "Gebeurtenissen en waarschuwingen"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Elke dag(en)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Alle weken"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Uitsluiten"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Uitvoer SQL-fout [%1$s] in [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Uitvoeren op"
 
@@ -5102,13 +5240,13 @@ msgstr "Uitvoeren op"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Uitgevoerd script"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Uitvoer bevestiging"
 
@@ -5120,7 +5258,7 @@ msgstr "Uit te breiden macro's"
 msgid "Expand single problem"
 msgstr "Expand enkel probleem"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Verwacht dat JSON-rpc versie 2.0, \"%s\" gegeven is."
@@ -5130,12 +5268,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Verlopen"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Exploded"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Exporteer geselecteerde"
 
@@ -5143,22 +5281,22 @@ msgstr "Exporteer geselecteerde"
 msgid "Export to CSV"
 msgstr "Exporteren naar CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Expressie"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Expressie Syntax Error."
 
@@ -5166,11 +5304,12 @@ msgstr "Expressie Syntax Error."
 msgid "Expression Variable Elements"
 msgstr "Expressie Variabele Elementen"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Expressie kan niet leeg zijn"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Expressie bouwer"
 
@@ -5191,17 +5330,17 @@ msgid "External check"
 msgstr "Externe controle"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "ONWAAR"
 
@@ -5210,16 +5349,17 @@ msgstr "ONWAAR"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Misluk"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Mislukt"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5227,40 +5367,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Controle op mislukking"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Favoriete grafieken"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Favoriete kaarten"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Favourite schermen"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Favorieten"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Feb"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Februarie"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Veld"
 
@@ -5304,19 +5444,19 @@ msgstr "Veld \"%1$s\" is geen string."
 msgid "Field \"%1$s\" must be missing."
 msgstr "Veld \"%1$s\" moet ontbreken."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Veld \"druleid\" is nodig."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Veld \"naam\" is noodzakelijk."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Bestandsformaat wordt niet ondersteund."
 
@@ -5325,13 +5465,13 @@ msgstr "Bestandsformaat wordt niet ondersteund."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Bestand is te groot, max upload grootte is %1$s bytes."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Bestand aangeboden aan de view bestaat niet. Geprobeerd om \"%s\" te vinden."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5339,68 +5479,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Ingevulde regio"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filter"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Filter per host groep"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filter per naam"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Vindt reeks V in de laatste (meest recente) waarde. N = 1 - indien gevonden, 0 - andersVindt reeks V in de laatste (meest recente) waarde. N = 1 - indien gevonden, 0 - andersVindt reeks V in de laatste (meest recente) waarde. N = 1 - indien gevonden, 0 - andersVindt reeks V in de laatste (meest recente) waarde. N = 1 - indien gevonden, 0 - anders"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Vindt reeks V in de laatste (meest recente) waarde. N NIET 1 - indien gevonden, 0 - andersVindt reeks V in de laatste (meest recente) waarde. N NIET 1 - indien gevonden, 0 - andersVindt reeks V in de laatste (meest recente) waarde. N NIET 1 - indien gevonden, 0 - andersVindt reeks V in de laatste (meest recente) waarde. N NIET 1 - indien gevonden, 0 - anders"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Eindigen"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Fins (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Eerst"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Eerst"
@@ -5409,8 +5552,8 @@ msgstr "Eerst"
 msgid "Fit to map"
 msgstr "Passend in kaart"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Statisch"
 
@@ -5420,76 +5563,80 @@ msgstr "Statisch"
 msgid "Flexible intervals"
 msgstr "Flexibele intervallen"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Voor de gasten, moet het wachtwoord leeg zijn"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Formule"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Vierde"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "French (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Vrij"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Van"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Voorkant toegang"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Voorkant toegang geupdate"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Voorkant Berichten"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Volledige klone"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Volledig scherm"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Functie"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5499,50 +5646,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "GUI toegang uitgeschakeld."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Algemeen"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Gegenereerd in %s sec"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "German (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5550,65 +5697,65 @@ msgid "Get support"
 msgstr "Neem ondersteuning"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Gegeven uitdrukking is geen macro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Globale uitdrukking bestaat niet."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Globaal script"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Globale scripts"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Ga"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Ga naar"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "Ga naar instrumentenbord"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5617,66 +5764,73 @@ msgid "Gradient line"
 msgstr "Verlooplijn"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Grafiek"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Grafiek \"%1$s\" bestaat al op \"%2$s\" (overgenomen van een ander sjabloon).Grafiek \"%1$s\" bestaat al op \"%2$s\" (overgenomen van een ander sjabloon).Grafiek \"%1$s\" bestaat al op \"%2$s\" (overgenomen van een ander sjabloon).Grafiek \"%1$s\" bestaat al op \"%2$s\" (overgenomen van een ander sjabloon)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Grafiek \"%1$s\" bestaat al op \"%2$s\" (items zijn niet identiek)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Grafiek \"%1$s\" bestaat al op \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\" (Ymax waarde item).Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\" (Ymax waarde item).Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\" (Ymax waarde item).Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\" (Ymax waarde item)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\" (Ymin waarde item).Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\" (Ymin waarde item).Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\" (Ymin waarde item).Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\" (Ymin waarde item)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Grafiek \"%1$s\" kan niet erven. Geen vereiste items op \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Grafiek \"%1$s\" bestaat niet op template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Grafiek \"%1$s\" overgeslagen - gebruikers regel."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Grafiek \"%1$s\" met templated items kan geen items van andere hosts bevatten.Grafiek \"%1$s\" met templated items kan geen items van andere hosts bevatten.Grafiek \"%1$s\" met templated items kan geen items van andere hosts bevatten.Grafiek \"%1$s\" met templated items kan geen items van andere hosts bevatten."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Grafiek toegevoegd"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Grafiek verwijderd"
 
@@ -5688,54 +5842,59 @@ msgstr "Grafiek element"
 msgid "Graph item"
 msgstr "Grafiek artikel"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Grafiek naam"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "Grafiek prototype"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Grafiek prototype \"%1$s\" met templated artikkelen kan geen items van andere hosts bevatten.Grafiek prototype \"%1$s\" met templated artikkelen kan geen items van andere hosts bevatten.Grafiek prototype \"%1$s\" met templated artikkelen kan geen items van andere hosts bevatten.Grafiek prototype \"%1$s\" met templated artikkelen kan geen items van andere hosts bevatten."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Grafiek prototype \"%s\" verwijderd."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Grafiek prototypes"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5747,49 +5906,51 @@ msgstr "Grafiek prototypes van"
 msgid "Graph sum"
 msgstr "Grafiek som"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Grafiek type"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Grafiek bijgewerkt"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Grafiek met de naam \"%1$s\" bestaat al in grafieken of grafiek prototypes.Grafiek met de naam \"%1$s\" bestaat al in grafieken of grafiek prototypes.Grafiek met de naam \"%1$s\" bestaat al in grafieken of grafiek prototypes.Grafiek met de naam \"%1$s\" bestaat al in grafieken of grafiek prototypes."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Grafiek met dezelfde naam maar andere soort bestaat reeds."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Grafieken"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Grafieken gekopieerd"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Grafieken verwijderd"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Grieks (el_GR)"
 
@@ -5798,54 +5959,58 @@ msgstr "Grieks (el_GR)"
 msgid "Grid"
 msgstr "Raster"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Groep"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt door een gastheer prototype.Groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt door een gastheer prototype.Groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt door een gastheer prototype.Groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt door een gastheer prototype."
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Groep \"%1$s\" bestaat niet."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Groep \"%1$s\" voor host \"%2$s\" bestaat niet."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Groep toegevoegd"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Groep verwijderd"
+msgid_plural "Groups deleted"
+msgstr[0] "Groep verwijderd"
+msgstr[1] "Groep verwijderd"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5856,40 +6021,42 @@ msgstr "Groep voor ontdekte hosts"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr "Groep voor ontdekte hosts \"%1$s\"."
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Groep naam"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr "Groep prototype ID kan niet leeg zijn."
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr "Groep prototype kan niet worden gebaseerd op een ontdekte gastheer groep \"%1$s\".Groep prototype kan niet worden gebaseerd op een ontdekte gastheer groep \"%1$s\".Groep prototype kan niet worden gebaseerd op een ontdekte gastheer groep \"%1$s\".Groep prototype kan niet worden gebaseerd op een ontdekte gastheer groep \"%1$s\"."
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr "Groep prototypes"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Groep bijgewerkt"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Groeperen door"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Groepen"
 
@@ -5897,22 +6064,13 @@ msgstr "Groepen"
 msgid "Groups in maintenance"
 msgstr "Groepen in onderhoud"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5929,7 +6087,7 @@ msgstr "HOST GROUP PROBLEMEN"
 msgid "HOST INVENTORY"
 msgstr "HOST INVENTARIS"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "OVERZICHT HOST INVENTARIS"
 
@@ -5947,7 +6105,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP authenticatie"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
@@ -5968,12 +6127,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr "Hardware (Volledige details)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Hoogte"
@@ -5986,15 +6150,15 @@ msgstr "Help"
 msgid "Hexadecimal"
 msgstr "Hexadecimaal"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Verberg"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Verberg al"
 
@@ -6010,15 +6174,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Verberg uitgeschakelde triggers"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Verberg geselecteerde"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "Verberg geselecteerde groepen"
 
@@ -6027,23 +6191,23 @@ msgstr "Verberg geselecteerde groepen"
 msgid "High"
 msgstr "Hoog"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Geschiedenis"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Geschiedenis opgeschoond"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Geschiedenis opkuisen kan een lange tijd duren. Doorgaan?"
 
@@ -6064,80 +6228,80 @@ msgstr "Geschiedenis van gebeurtenissen"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Horizontale uitlijning"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
 msgstr[1] "Host"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" bestaat reeds."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Host \"%1$s\" wordt gemonitord via proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "Host \"%s\" heeft de parameter \"useipmi\" aangevinkt, maar heeft geen \"ipmi_ip\" parameter! Host IP-adres wordt gebruikt als adres voor de IPMI interface."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Host (oplopend)"
 
@@ -6149,66 +6313,68 @@ msgstr "Host IP"
 msgid "Host access"
 msgstr "Host toegang"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Host toegevoegd"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Host kan niet meer dan een standaard interface van hetzelfde type bevatten.Host kan niet meer dan een standaard interface van hetzelfde type bevatten.Host kan niet meer dan een standaard interface van hetzelfde type bevatten.Host kan niet meer dan een standaard interface van hetzelfde type bevatten."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Host telt"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Host verwijderd"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Hostgroep"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Host groep \"%1$s\" bestaat al."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "Host groep \"%1$s\" kan niet worden verwijderd, omdat sommige hosts hier van afhankelijk zijn.Host groep \"%1$s\" kan niet worden verwijderd, omdat sommige hosts hier van afhankelijk zijn.Host groep \"%1$s\" kan niet worden verwijderd, omdat sommige hosts hier van afhankelijk zijn.Host groep \"%1$s\" kan niet worden verwijderd, omdat sommige hosts hier van afhankelijk zijn."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "Host groep \"%1$s\" is intern en kan niet verwijderd worden."
@@ -6225,14 +6391,15 @@ msgstr "Host groep problemen"
 msgid "Host group label type"
 msgstr "Hostgroep typeplaatje"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "Host groepsnaam mag niet leeg zijn."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Hostgroepen"
 
@@ -6242,8 +6409,8 @@ msgstr "Hostgroepen"
 msgid "Host interface"
 msgstr "Host interface"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Host inventaris"
 
@@ -6259,7 +6426,7 @@ msgstr "Host problemen"
 msgid "Host label type"
 msgstr "Host typeplaatje"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Hostlijst"
 
@@ -6268,18 +6435,18 @@ msgid "Host metadata"
 msgstr "Host metadata"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Host naam"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "Hostnaam \"%1$s\" is te lang, het mag niet langer zijn dan %2$d tekens."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr "Hostnaam voor host prototype \"%1$s\" moet macro's bevatten."
@@ -6288,72 +6455,72 @@ msgstr "Hostnaam voor host prototype \"%1$s\" moet macro's bevatten."
 msgid "Host networks"
 msgstr "Host netwerken"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Host prototype \"%1$s\" bestaat al op \"%2$s\", geërfd van een andere sjabloon.Host prototype \"%1$s\" bestaat al op \"%2$s\", geërfd van een andere sjabloon.Host prototype \"%1$s\" bestaat al op \"%2$s\", geërfd van een andere sjabloon.Host prototype \"%1$s\" bestaat al op \"%2$s\", geërfd van een andere sjabloon."
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "Host prototype \"%1$s\" bestaat al op \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr "Host prototype \"%1$s\" moet ten minste een host groep bevatten."
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr "Host prototype toegevoegd"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr "Host prototype verwijderd"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr "Host prototype bijgewerkt"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Host prototype met hostnaam \"%1$s\" bestaat al op ontdekking regel \"%2$s\".Host prototype met hostnaam \"%1$s\" bestaat al op ontdekking regel \"%2$s\".Host prototype met hostnaam \"%1$s\" bestaat al op ontdekking regel \"%2$s\".Host prototype met hostnaam \"%1$s\" bestaat al op ontdekking regel \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr "Host prototype met hostnaam \"%1$s\" bestaat reeds."
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Host prototype met zichtbare naam \"%1$s\" bestaat al op ontdekking regel \"%2$s\".Host prototype met zichtbare naam \"%1$s\" bestaat al op ontdekking regel \"%2$s\".Host prototype met zichtbare naam \"%1$s\" bestaat al op ontdekking regel \"%2$s\".Host prototype met zichtbare naam \"%1$s\" bestaat al op ontdekking regel \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr "Host prototype met zichtbare naam \"%1$s\" bestaat reeds."
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr "Host prototypes"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr "Verwijderde host prototypes"
 
@@ -6365,7 +6532,7 @@ msgstr "Host prototypes van"
 msgid "Host router"
 msgstr "Host router"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Host schermen"
 
@@ -6377,51 +6544,52 @@ msgstr "Host status"
 msgid "Host subnet mask"
 msgstr "Host subnetmasker"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Host tijd"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Host update is mislukt."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Host bijgewerkt"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Host met dezelfde naam '%s' bestaat reeds."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Er bestaat reeds een host met de zichtbare naam \"%s\"."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hosts"
 
@@ -6429,11 +6597,11 @@ msgstr "Hosts"
 msgid "Hosts & Groups"
 msgstr "Hosts & Groepen"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hosts (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Hosts / sjablonen"
 
@@ -6445,37 +6613,38 @@ msgstr "Hosts in"
 msgid "Hosts in maintenance"
 msgstr "Hosts in onderhoud"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Hosts info"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Hosts locatie"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Hosts bijgewerkt"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Ieder uur"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Uren"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Hongaars (hu_HU)"
 
@@ -6493,22 +6662,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6516,26 +6685,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP adres"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP en DNS kan niet leeg zijn voor host interface."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP bereik"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "IP bereik kan niet leeg zijn."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6543,22 +6712,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI agent"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI authenticatie algoritme"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "IPMI interfaces"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI wachtwoord"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI privilegeniveau"
 
@@ -6568,7 +6737,7 @@ msgstr "IPMI privilegeniveau"
 msgid "IPMI sensor"
 msgstr "IPMI sensor"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI gebruikersnaam"
 
@@ -6601,7 +6770,7 @@ msgstr "IT service afhankelijkheden"
 msgid "IT service parent"
 msgstr "Bovenliggende IT service"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6617,25 +6786,25 @@ msgid "ITEMS"
 msgstr "ITEMS"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Icoon"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Icoon (standaard)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Icoon (gedesactiveerd)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Icoon (onderhoud)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Icoon (probleem)"
 
@@ -6656,42 +6825,44 @@ msgstr "Icoon label type"
 msgid "Icon map"
 msgstr "icoon map"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Icoon map \"%1$s\" is toegewezen met onjuiste icoonid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Icoon map \"%1$s\" is toegewezen met onjuiste inventaris link \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Icoon map \"%s\" bestaad reeds."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Icoon map \"%s\" kan niet toegewezen worden aan lege expressie."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Icoon map \"%1$s\" kan niet toegewezen worden met globale expressie die niet bestaat.Icoon map \"%1$s\" kan niet toegewezen worden met globale expressie die niet bestaat.Icoon map \"%1$s\" kan niet toegewezen worden met globale expressie die niet bestaat.Icoon map \"%1$s\" kan niet toegewezen worden met globale expressie die niet bestaat."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Icoon map \"%s\" heeft onjuiste expressie."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Icon map \"%s\" moet ten minste één mapping hebben."
@@ -6704,7 +6875,8 @@ msgstr "Icoon map aangemaakt"
 msgid "Icon map deleted"
 msgstr "Icoon map verwijderd"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Icoon map naam kan niet leeg zijn."
 
@@ -6712,29 +6884,29 @@ msgstr "Icoon map naam kan niet leeg zijn."
 msgid "Icon map updated"
 msgstr "Icoon map bijgewerkt"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Icoon map met iconmapid \"%s\" bestaat niet."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Icoon toewijzing"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "Vermelding icoon toewijzing \"%1$s\" tegen \"%2$s\" bestaat reeds."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Icoonmap is niet geactiveerd"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Iconen"
 
@@ -6742,21 +6914,23 @@ msgstr "Iconen"
 msgid "Identical expression already exists"
 msgstr "Identieke expressie bestaat reeds"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Als u denkt dat dit bericht foutis, neem dan contact op met uw beheerders over het verkrijgen van de nodige toestemmingen.Als u denkt dat dit bericht foutis, neem dan contact op met uw beheerders over het verkrijgen van de nodige toestemmingen.Als u denkt dat dit bericht foutis, neem dan contact op met uw beheerders over het verkrijgen van de nodige toestemmingen.Als u denkt dat dit bericht foutis, neem dan contact op met uw beheerders over het verkrijgen van de nodige toestemmingen."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Afbeelding"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Afbeelding \"%1$s\" bestaat al."
@@ -6765,7 +6939,7 @@ msgstr "Afbeelding \"%1$s\" bestaat al."
 msgid "Image added"
 msgstr "Afbeelding toegevoegd"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Afbeelding verwijderd"
 
@@ -6773,12 +6947,13 @@ msgstr "Afbeelding verwijderd"
 msgid "Image label type"
 msgstr "Afbeelding typeplaatje"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Afbeelding load error [%1$s] in [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "De afbeelding moet kleiner zijn dan 1 MB."
 
@@ -6787,66 +6962,66 @@ msgid "Image updated"
 msgstr "Afbeelding bijgewerkt"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Afbeeldingen voor alle kaarten worden bijgewerkt!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Onmiddellijk"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Importeren"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Import is mislukt"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Importeren bestand"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Import is geslaagd"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Onmogelijk om op te filteren op inventaris veld \"%s\", dat niet bestaat."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Onmogelijk om laatste rij en kolom te verwijderen."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "In"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "In groep"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "In groepen"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6859,245 +7034,283 @@ msgstr "In onderhoud"
 msgid "In progress"
 msgstr "In uitvoering"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "bevat"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Onjuiste \"soft\" veldwaarde voor afhankelijkheid voor service \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Onjuiste %1$s label soort waarde voor map \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Onjuist IP range \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Onjuist SNMP OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Onjuist SNMP community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Onjuiste aanvaardbare SLA voor service \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Verkeerde actie, conditie discovery controleren."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Verkeerde actie, conditie discovery controleren. Discovery controle bestaat niet of u heeft geen toegang.Verkeerde actie, conditie discovery controleren. Discovery controle bestaat niet of u heeft geen toegang.Verkeerde actie, conditie discovery controleren. Discovery controle bestaat niet of u heeft geen toegang.Verkeerde actie, conditie discovery controleren. Discovery controle bestaat niet of u heeft geen toegang."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "Verkeerde actie conditie discovery object."
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Verkeerde actie conditie discovery regel. Discovery regel bestaat niet of u hebt er geen toegang toe."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Verkeerde actie conditie discovery status."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "Verkeerde actie conditie type gebeurtenis."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Verkeerde actie conditie host groep. Host groep bestaat niet of u hebt er geen toegang toe.Verkeerde actie conditie host groep. Host groep bestaat niet of u hebt er geen toegang toe.Verkeerde actie conditie host groep. Host groep bestaat niet of u hebt er geen toegang toe.Verkeerde actie conditie host groep. Host groep bestaat niet of u hebt er geen toegang toe."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Verkeerde actie conditie host. Host bestaat niet of u hebt geen toegang.Verkeerde actie conditie host. Host bestaat niet of u hebt geen toegang.Verkeerde actie conditie host. Host bestaat niet of u hebt geen toegang.Verkeerde actie conditie host. Host bestaat niet of u hebt geen toegang."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "Verkeerde actie voorwaarde ip \"%1$s\"."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "Verkeerde actie voorwaarde gebruiker."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "Verkeerde actie voorwaarde poort \"%1$s\"."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Verkeerde actie voorwaarde proxy. Proxy bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde proxy. Proxy bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde proxy. Proxy bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde proxy. Proxy bestaat niet of u hebt geen toegang."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Verkeerde actie voorwaarde sjabloon. Sjabloon bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde sjabloon. Sjabloon bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde sjabloon. Sjabloon bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde sjabloon. Sjabloon bestaat niet of u hebt geen toegang."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "Verkeerde actie voorwaarde trigger gevoeligheid."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "Verkeerde actie voorwaarde trigger waarde."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Verkeerde actie voorwaarde trigger. Trigger bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde trigger. Trigger bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde trigger. Trigger bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde trigger. Trigger bestaat niet of u hebt geen toegang."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Verkeerd type actie voorwaarde."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Verkeerde actie conditionid."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "Onjuiste actie voorwaarden voor de actie \"%1$s\"."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 #, fuzzy
 msgid "Incorrect action operation command type."
 msgstr "Verkeerde actie bediening soort commando."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Verkeerde actie bedrijfstoestand type erkennen."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Verkeerde actie bediening conditie type."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Verkeerde actie bediening escalatie stap waarden."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Verkeerde actie van host-groep. Host groep bestaat niet of u heeft geen toegang tot deze host groep."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Verkeerde actie van host. Host bestaat niet of u heeft geen toegang tot deze host."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Verkeerde actie bediening poort \"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Verkeerde actie werking stapduur."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Verkeerde actie soort operatie."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Verkeerde actie bediening gebruikersgroep. Gebruikersgroep bestaat niet of u heeft geen toegang tot deze gebruikersgroep."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Verkeerde actie bediening gebruiker. Gebruiker bestaat niet of u heeft geen toegang tot deze gebruiker."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Verkeerde actie operationid."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Onjuist algoritme voor service \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Onjuiste argumenten doorgegeven aan de functie"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Onjuiste argumenten doorgegeven aan de functie."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Onjuiste argumenten doorgegeven aan de werkwijze."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Onjuist authenticatie protocol voor discovery rule \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Onjuiste authenticatie protocol voor punt \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Onjuiste berekening SLA waarde voor service \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "Verkeerde tekens gebruikt voor host \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Verkeerde tekens gebruikt voor hostnaam \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "Verkeerde tekens gebruikt voor proxy naam \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Onjuist vertraging."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "Onjuiste ontdekking regel ID voor host prototype \"%1$s\"."
@@ -7105,13 +7318,13 @@ msgstr "Onjuiste ontdekking regel ID voor host prototype \"%1$s\"."
 #: include/classes/validators/event/CEventSourceObjectValidator.php:66
 #, c-format
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
-msgstr "Onjuist gebeurtenisobject \"%1$s\" (%2$s) voor event source \"%3$s\" (%4$s), worden alleen de volgende objecten ondersteund: % 5$s."
+msgstr "Onjuist gebeurtenisobject \"%1$s\" (%2$s) voor event source \"%3$s\" (%4$s), worden alleen de volgende objecten ondersteund: %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "Onjuist eventobject waarde."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "Onjuiste gebeurtenis bron waarde."
 
@@ -7120,11 +7333,11 @@ msgstr "Onjuiste gebeurtenis bron waarde."
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Onjuist veld \"%1$s\" naam of waarde in waar statement voor tabel \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "Onjuiste velden voor sysmap."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Onjuiste velden voor trigger."
 
@@ -7132,74 +7345,100 @@ msgstr "Onjuiste velden voor trigger."
 msgid "Incorrect file upload."
 msgstr "Onjuist bestand opgeladen."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Onjuist flexibele interval \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Onjuiste flexibel interval in Item \"%1$s\". Flexibele interval moet een string zijn."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Verkeerde functie wordt gebruikt"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "Verkeerde groep prototype ID."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "Verkeerde groep prototypes voor host prototype \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "Verkeerde host groep ID voor groep prototype."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Verkeerde host groep."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "Verkeerde host groepen voor host prototype \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "Verkeerde host prototype ID."
 
@@ -7207,182 +7446,201 @@ msgstr "Verkeerde host prototype ID."
 msgid "Incorrect image index."
 msgstr "Verkeerde index voor afbeelding."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Verkeerde interface DNS parameter \"%s\" ingevoerd."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Verkeerde interface IP parameter \"%s\" ingevoerd."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Verkeerde interface poort \"%s\" ingevoerd."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Verkeerd inventaris veld \"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Onjuiste punt voor aswaarde."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Onjuist artikel sleutel \"%1$s\" ingevoerd voor trigger uitdrukking op \"%2$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "Onjuiste waarde item type \"%1$s\" bedoeld als trigger functie \"%2$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Verkeerde sleutel."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Onjuiste lijst van items."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Verkeerde onderhouds - datum moet zijn tussen 1970.01.01 en 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Verkeerde onderhouds datum"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Verkeerde dag onderhoudsperiode"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Verkeerd onderhouds dagen van de week"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Verkeerde periode onderhouds maanden"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Verkeerde onderhouds periode"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Verkeerde onderhouds periode (minimum 5 minuten)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Verkeerd onderhouds weken"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Foutieve hoogte ingesteld voor kaart \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Foutieve breedte ingesteld voor kaart \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "Onjuist menupad voor script \"%1$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "Onjuist object waarde."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "Onjuiste parameter voor de actie \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Verkeerde parameter voor operaties."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Verkeerde parameter wordt gebruikt voor het pictogram map \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Verkeerde parameters voor de conditie."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Verkeerde parameters voor pictogram kaart update methode \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Verkeerde parameters voor onderhoud."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Verkeerde parameters voor de gebruikersgroep."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Verkeerde ouder voor service \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Verkeerde ouder service."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Verkeerd poortbereik."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "Verkeerd privacy protocol voor discovery rule \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "Verkeerd privacy protocol voor item \"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Verkeerde proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Onjuist bron type ingevoerd voor het scherm item."
 
@@ -7391,64 +7649,68 @@ msgstr "Onjuist bron type ingevoerd voor het scherm item."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Verkeerde reactie ontvangen van Zabbix server \"%1$s\"."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Verkeerd scherm aangebracht voor diashow."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Verkeerde dienst eindtijd."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Verkeerde dienst starttijd."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Verkeerd type servicetijd."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Verkeerde sorder order voor service \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "Verkeerde bronwaarde."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr "Verkeerde status van host prototype \"%1$s\"."
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Verkeerde status voor service \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Verkeerde status."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr "Onjuist thema voor gebruiker \"%1$s\"."
@@ -7469,52 +7731,57 @@ msgstr "Onjuist tijd \"%1$s\" starttijd moet minder dan eindtijd zijn."
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Onjuist tijdsperiode \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Verkeerde trigger ID voor service \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Verkeerde trigger expressie"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Verkeerde trigger expressie."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Verkeerde trigger expressie. Host \"%1$s\" bestaat niet of u heeft geen toegang tot deze host."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Verkeerde trigger expressie. Host \"%s\" bestaat niet of u heeft geen toegang tot deze host."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Verkeerde trigger expressie. Trigger expressie-elementen mogen niet behoren tot een template en een gastheer tegelijk."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Verkeerde trigger functie \"%1$s\" ingevoerd in expressie."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Verkeerd type asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Verkeerde gebruikersgroep."
 
@@ -7523,7 +7790,8 @@ msgstr "Verkeerde gebruikersgroep."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "Onjuiste waarde \"%1$s\" voor \"%2$s\" veld."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Onjuiste waarde \"%1$s\" voor \"%2$s\" veld: moet zijn tussen de %3$s en %4$s."
@@ -7543,7 +7811,7 @@ msgstr "Onjuiste waarde \"%1$s\" voor int veld \"%2$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Onjuiste waarde \"%1$s\" voor unsigned int veld \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "Onjuiste waarde voor veld \"%1$s\"."
@@ -7553,43 +7821,49 @@ msgstr "Onjuiste waarde voor veld \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "Onjuiste waarde voor veld \"%1$s\": kan niet leeg zijn."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Onjuiste waarde voor setMessage (): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Onjuiste waarde gebruikt voor proxy-status \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Verkeerde werktijd."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Verkeerd y max item voor grafiek \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Verkeerd y min item voor grafiek \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonesisch (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Info"
 
@@ -7598,15 +7872,15 @@ msgstr "Info"
 msgid "Information"
 msgstr "Informatie"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Invoegen"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Macro invoegen"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Installatie"
 
@@ -7614,34 +7888,35 @@ msgstr "Installatie"
 msgid "Installer name"
 msgstr "Naam installateur"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interface"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Interface is gekoppeld aan item \"%1$s\" op \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Interface wordt gebruikt door items die dit type van de interface vereisen."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "Interface met DNS \"%1$s\" kan geen leeg IP-adres bevatten."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "Interface met IP \"%1$s\" kan geen lege DNS naam hebben zolang er gebruikt gemaakt wordt van  \"Use DNS\" op \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
-msgstr "Interface met IP \"% 1 $ s\" kan geen lege DNS-naam hebben."
+msgstr "Interface met IP \"%1$s\" kan geen lege DNS-naam hebben."
 
 #: include/views/administration.authentication.edit.php:38
 msgctxt "authentication"
@@ -7658,7 +7933,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Interne"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Interne JSON-RPC fout."
 
@@ -7666,7 +7941,7 @@ msgstr "Interne JSON-RPC fout."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Interne fout."
 
@@ -7679,19 +7954,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Interval"
 
@@ -7701,112 +7976,114 @@ msgstr "Interval"
 msgid "Interval (in sec)"
 msgstr "Interval (in sec)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Ongeldige JSON. Er is een fout opgetreden op de servertijdens het ontleden van de JSON tekst."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Ongeldige Request."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Ongeldige datum \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "Ongeldige eerste parameter."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "Ongeldige vierde parameter."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Ongeldige hostid voor macro \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Ongeldige onderhoudsperiode"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Ongeldige werkwijze parameters."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "Ongeldig aantal parameters."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Ongeldige parameters."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr "Ongeldige periode voor het veld \"%1$s\"."
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Ongeldige respons code \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Ongeldige respons code, range \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "Ongeldige tweede parameter."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "Ongeldige derde parameter."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Ongeldige tijdsperiode"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Ongeldige view naam gegeven \"%s\". Toegestane tekens: \"a-z\" en \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7815,7 +8092,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Inventaris veld"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Inventaris modus"
 
@@ -7823,12 +8100,12 @@ msgstr "Inventaris modus"
 msgid "Is online?"
 msgstr "Is verbonden?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Probleem"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Het is niet mogelijk om te filteren op gebruikerswachtwoord."
 
@@ -7836,70 +8113,71 @@ msgstr "Het is niet mogelijk om te filteren op gebruikerswachtwoord."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Het is niet mogelijk om uit te loggen uit HTTP-authenticatie."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Het is niet mogelijk om te zoeken op gebruikerswachtwoord."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italian (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Item"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Item \"%1$s\" bestaat al op \"%2$s\", geërfd van een ander sjabloon."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "Item \"%1$s\" bestaat al op \"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Item \"%1$s\" kan een ontbrekende host inventaris veld nummer \"%2$d\" niet invullen. Keuzes zijn: van 0 (niet bevolken) tot %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Item \"%1$s\" bestaat niet op template '%2$s \"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Item \"%1$s\" bestaat niet."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Item \"%1$s\" op \"%2$s\": applicatie \"%3$s\" bestaat niet."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Item \"%1$s\" overgeslagen - user regel."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Item \"%1$s:%2$s\" bevat ongeldige poort: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Item toegevoegd"
 
@@ -7907,17 +8185,17 @@ msgstr "Item toegevoegd"
 msgid "Item count"
 msgstr "Product aantallen"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Item verwijderd"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7931,56 +8209,56 @@ msgstr "Item in \"normale\" toestand"
 msgid "Item in \"not supported\" state"
 msgstr "Item in \"niet ondersteund\" toestand"
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Item prototype"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Item prototype \"%1$s\" bestaat al op \"%2$s\", geërfd van een ander sjabloon."
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Item prototypes"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7988,92 +8266,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Item prototypes van"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Item bijgewerkt"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Item maakt gebruik van de host interface van niet-ouder host."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Item maakt gebruik van verkeerd interface type."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Item zal niet worden vernieuwd. Vul alstublieft een werkend update-interval in."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Item met de key \"%1$s\" bestaat reeds op \"%2$s\" als een ontdekking regel."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Item met de key \"%1$s\" bestaat reeds op \"%2$s\" als een item gemaakt van prototype item."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Item met de sleutel \"%1$s\" bestaat reeds op \"%2$s\" als een item prototype."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Item met de sleutel \"%1$s\" bestaat reeds op \"%2$s\" als een item."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Item met de sleutel \"%1$s\" bestaat reeds op \"%2$s\" als een onbekende item element."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Item met de sleutel \"%1$s\" bestaat reeds op \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Item met de sleutel \"%1$s\" bestaat reeds."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Items"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Items (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Items gekopieerd"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Items verwijderd"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Items lijst"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Bijgewerkte artikelen"
 
@@ -8085,72 +8363,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX agent"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX interfaces"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "JSON-rpc fout generatie mislukt. Geen dergelijke fout \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpc-methode is niet gedefinieerd."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpc params is geen een Array."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "JSON-rpc-versie is niet gespecificeerd."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber id"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Januari"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japanese (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Jul"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Juli"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Jun"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Juni"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8159,40 +8437,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Houd verloren middelen periode bij (in dagen)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Key"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Sleutel \"%1$s\" komt niet overeen met <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Key wachtzin"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "sleutelwoord"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Koreaans (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "LAATSTE DATA"
 
@@ -8223,37 +8501,37 @@ msgstr "LDAP login succesvol"
 msgid "LDAP login was not successful"
 msgstr "LDAP login was niet succesvol"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "VERLOREN"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Label"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Label locatie"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Taal"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Laatst"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Laatste"
@@ -8265,19 +8543,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "Laatste %1$d probleem"
 msgstr[1] "Laatste %1$d problemen"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Laatst (meest recente) T waarde is < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Laatst (meest recente) T waarde = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Laatst (meest recente) T waarde > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Laatst (meest recente) T waarde is NOT N"
 
@@ -8297,28 +8575,28 @@ msgstr "Laatste 365 dagen"
 msgid "Last 7 days"
 msgstr "Laaste 7 dagen"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Laatste verandering"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Laatste wijziging (aflopend)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Laatste controle"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Grafiek voor het laatste uur"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Grafiek voor de laatste maand"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Laatste van"
 
@@ -8326,66 +8604,67 @@ msgstr "Laatste van"
 msgid "Last seen (age)"
 msgstr "Voor het laatst gezien (doorlooptijd)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Laatste waarde"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Grafiek van de laatste week"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Laatste data"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Laatste gebeurtenissen"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr "Laatste waarden"
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Lets (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Links"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legenda"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Lengte van de laatste (meest recente) T waarde in letters is < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Lengte van de laatste (meest recente) T waarde in letters is = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Lengte van de laatste (meest recente) T waarde in letters is > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Lengte van de laatste (meest recente) T waarde in letters is NIET N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Lijn"
 
@@ -8393,39 +8672,29 @@ msgstr "Lijn"
 msgid "Link"
 msgstr "Koppeling"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Koppelings indicatoren"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Naam van de koppeling moet uniek zijn voor de kaart \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr "Koppelen nieuwe sjablonen"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Link selementid1 veld wijst naar een niet-bestaande map selement ID \"%1$s\" voor map \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "De koppeling in kaart \"%s\" moet voorzien zijn van \"naam\" en \"url\" velden. "
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8437,50 +8706,50 @@ msgstr "Koppel aan template"
 msgid "Link to templates"
 msgstr "Koppel aan templates"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Koppel aan templates"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Gekoppelde templates"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Gekoppeld aan"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Lijst is leeg"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Laden..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Lokale tijd"
 
@@ -8497,36 +8766,36 @@ msgid "Location longitude"
 msgstr "Locatie longitude"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Log tijd formaat"
@@ -8535,12 +8804,12 @@ msgstr "Log tijd formaat"
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Ingelogd als"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8551,12 +8820,12 @@ msgstr "Login"
 msgid "Login as Guest"
 msgstr "Login in als Guest"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8565,8 +8834,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8587,22 +8857,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8614,7 +8880,7 @@ msgstr "MAC adres A"
 msgid "MAC address B"
 msgstr "MAC adres B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "ONDERHOUD"
 
@@ -8639,49 +8905,49 @@ msgstr "MEEST ACTIVE TRIGGERS TOP 100"
 msgid "Macro"
 msgstr "Macro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Macros"
 
@@ -8689,31 +8955,36 @@ msgstr "Macros"
 msgid "Macros updated"
 msgstr "Macros zijn bijgewerkt"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Onderhoud"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Onderhoud \"%s\" bestaat reeds."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Onderhoud toegevoegd"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Onderhoud verwijderd"
 
@@ -8721,7 +8992,7 @@ msgstr "Onderhoud verwijderd"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Onderhouds duur"
 
@@ -8737,25 +9008,25 @@ msgstr "Onderhouds status"
 msgid "Maintenance type"
 msgstr "Onderhouds type"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Onderhoud bijgewerkt"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Handmatig"
 
@@ -8766,12 +9037,12 @@ msgstr "Handmatig uitloggen"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Kaart"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8781,12 +9052,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr "Kaart \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Kaart \"%s\" aangemaakt."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Kaart \"%s\" bijgewerkt."
@@ -8803,12 +9074,12 @@ msgstr "Kaart label type"
 msgid "Map save operation failed."
 msgstr "Opslaan van kaart is mislukt."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8818,23 +9089,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Kaarten"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mrt"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Maart"
 
@@ -8842,28 +9113,34 @@ msgstr "Maart"
 msgid "Mark elements on trigger status change"
 msgstr "Markeer elementen bij status wijziging van een trigger"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Markeer andere"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Markeer geselecteerde"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Bulk bijwerken"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Elementen in bulk bijwerken"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Het maximum aantal elementen wat in een cell getoond wordt"
@@ -8877,32 +9154,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr "Maximum aantal getoonde gebeurtenissen per trigger"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximalizeer"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8910,105 +9166,99 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Mei"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Media"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Media type"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Media type verwijderd"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Media type bijgewerkt"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Media types"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9023,14 +9273,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9040,7 +9290,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Bericht"
 
@@ -9048,66 +9298,66 @@ msgstr "Bericht"
 msgid "Message actions"
 msgstr "Bericht acties"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Text limiet voor bericht"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Bericht timeout"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Berichten"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Methode niet gevonden."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Midden"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9116,80 +9366,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr ""
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9199,7 +9446,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9211,18 +9458,18 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr ""
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr ""
 
@@ -9230,33 +9477,33 @@ msgstr ""
 msgid "Monitored host"
 msgstr ""
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Monitoring"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Maand"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Maandelijks"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9264,7 +9511,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9273,19 +9520,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "Meest actieve triggers top 100"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr ""
 
@@ -9298,60 +9545,58 @@ msgstr "NETWERK MAPPEN"
 msgid "NNTP"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr ""
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
+msgid "NTLM"
 msgstr ""
 
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9362,26 +9607,32 @@ msgstr ""
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Naam"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9400,12 +9651,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9413,7 +9664,7 @@ msgstr ""
 msgid "Network map added"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr ""
 
@@ -9425,7 +9676,7 @@ msgstr ""
 msgid "Network maps"
 msgstr "Netwerk mappen"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr ""
 
@@ -9433,24 +9684,24 @@ msgstr ""
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr ""
 
@@ -9461,16 +9712,16 @@ msgstr ""
 msgid "New flexible interval"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Nieuwe groep"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Nieuw item voor de grafiek"
 
@@ -9478,83 +9729,99 @@ msgstr "Nieuw item voor de grafiek"
 msgid "New media"
 msgstr "Nieuw media"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr ""
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr ""
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Nee"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9562,25 +9829,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9606,8 +9873,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9617,7 +9884,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9625,30 +9892,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9657,27 +9925,27 @@ msgstr ""
 msgid "No data collection"
 msgstr ""
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9685,39 +9953,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9732,7 +10000,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9741,7 +10009,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9750,48 +10022,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9804,17 +10077,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9833,33 +10111,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9878,7 +10163,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9894,7 +10179,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9903,15 +10188,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9923,133 +10208,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr ""
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10057,7 +10387,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10065,82 +10395,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr ""
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10149,57 +10480,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Geen"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr ""
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr ""
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Niet beschikbaar"
 
@@ -10208,7 +10540,7 @@ msgstr "Niet beschikbaar"
 msgid "Not classified"
 msgstr "Niet geclassificeerd"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr ""
 
@@ -10221,8 +10553,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Niet ondersteund"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr ""
@@ -10235,7 +10567,7 @@ msgstr "Opmerkingen"
 msgid "Nothing"
 msgstr "Niets"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10243,87 +10575,87 @@ msgstr ""
 msgid "Notification report"
 msgstr "Notificaties report"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notificaties"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr ""
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10331,88 +10663,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "Aantal keren veranderd"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr ""
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Aantal Gebruikers (online)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numeriek (zwevend)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr ""
 
@@ -10427,16 +10759,18 @@ msgid "OEM"
 msgstr ""
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10452,8 +10786,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr ""
 
@@ -10473,11 +10806,12 @@ msgstr ""
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "OVERZICHT"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10485,25 +10819,25 @@ msgstr ""
 msgid "Octal"
 msgstr ""
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "UIT"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "AAN"
 
@@ -10511,111 +10845,114 @@ msgstr "AAN"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr ""
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10624,28 +10961,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr ""
@@ -10654,25 +10991,27 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10702,24 +11041,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr ""
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr ""
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Anders"
 
@@ -10727,19 +11066,19 @@ msgstr "Anders"
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10749,21 +11088,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Andere parameters"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10776,14 +11115,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Overzicht"
 
@@ -10791,7 +11127,7 @@ msgstr "Overzicht"
 msgid "Overview by proxy"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10800,147 +11136,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10949,32 +11293,34 @@ msgstr ""
 msgid "POP"
 msgstr ""
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr ""
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr ""
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -10983,7 +11329,7 @@ msgstr "Parameter"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11003,33 +11349,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11039,20 +11385,21 @@ msgstr ""
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Wachtwoord (normaals)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr ""
 
@@ -11061,21 +11408,21 @@ msgstr ""
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11083,12 +11430,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Periode"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr ""
@@ -11098,24 +11445,24 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr ""
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr ""
 
@@ -11127,55 +11474,56 @@ msgstr ""
 msgid "Plain text"
 msgstr "Platte tekst"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr ""
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Poort"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11183,51 +11531,51 @@ msgstr ""
 msgid "Port range"
 msgstr ""
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr ""
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr ""
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr ""
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11276,30 +11624,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11311,16 +11660,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr ""
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr ""
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problemen"
 
@@ -11328,75 +11677,71 @@ msgstr "Problemen"
 msgid "Profile"
 msgstr "Profiel"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr ""
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr ""
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11407,7 +11752,7 @@ msgstr ""
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "WACHTRIJ VAN ITEMS OM BIJGEWERKT TE WORDEN"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Wachtrij"
 
@@ -11415,18 +11760,18 @@ msgstr "Wachtrij"
 msgid "RMCP+"
 msgstr ""
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Alleen lezen"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Lees-schrijf"
 
@@ -11438,7 +11783,7 @@ msgstr "Reden"
 msgid "Received value"
 msgstr ""
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11446,11 +11791,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11461,28 +11806,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "Ontvanger(s)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr ""
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr ""
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr ""
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Verversing (in seconden)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr ""
 
@@ -11500,47 +11845,51 @@ msgstr ""
 msgid "Regular expression"
 msgstr ""
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11557,26 +11906,28 @@ msgstr "Remote commando"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11587,21 +11938,19 @@ msgstr "Remote commando"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr ""
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11609,11 +11958,11 @@ msgstr ""
 msgid "Remove element"
 msgstr ""
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr ""
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11622,7 +11971,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11634,28 +11983,28 @@ msgstr ""
 msgid "Remove link"
 msgstr ""
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr ""
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr ""
 
@@ -11663,35 +12012,36 @@ msgstr ""
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Reporten"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr ""
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11699,29 +12049,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr ""
 
@@ -11740,9 +12092,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11755,7 +12107,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Bron"
@@ -11770,15 +12122,15 @@ msgstr ""
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr ""
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr ""
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr ""
 
@@ -11791,7 +12143,8 @@ msgstr ""
 msgid "Result type"
 msgstr ""
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11799,60 +12152,69 @@ msgstr ""
 msgid "Retries left"
 msgstr ""
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Recht"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Rij breedte"
 
@@ -11860,11 +12222,11 @@ msgstr "Rij breedte"
 msgid "Rows"
 msgstr "Rijen"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr ""
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr ""
 
@@ -11909,20 +12271,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11938,7 +12300,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr ""
 
@@ -11953,13 +12315,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr ""
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11968,17 +12330,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP Email"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP Groet"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP Server"
@@ -11994,7 +12356,7 @@ msgstr ""
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12006,9 +12368,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP gemeenschap"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -12017,7 +12379,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12041,7 +12403,7 @@ msgstr "SNMPv3 agent"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12059,7 +12421,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr ""
@@ -12068,15 +12430,35 @@ msgstr ""
 msgid "SSH agent"
 msgstr ""
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr ""
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STATUS VAN TRIGGERS"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr ""
 
@@ -12084,92 +12466,92 @@ msgstr ""
 msgid "STATUS OF ZABBIX"
 msgstr "STATUS van ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr ""
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr ""
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Bewaar"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr ""
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr ""
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr ""
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr ""
 
@@ -12181,7 +12563,7 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12192,126 +12574,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Scherm"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Scherm toegevoegd"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Scherm cel configuratie"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Scherm verwijderd"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Scherm bijgewerkt"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Schermen"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Script"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr ""
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Script naam"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12320,17 +12701,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr ""
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr ""
 
@@ -12351,7 +12732,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr ""
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr ""
 
@@ -12383,7 +12764,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr ""
 
@@ -12402,69 +12783,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Selecteer"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr ""
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr ""
 
@@ -12480,7 +12868,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr ""
 
@@ -12488,11 +12876,11 @@ msgstr ""
 msgid "Send to"
 msgstr "Verzend aan"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12501,17 +12889,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr ""
 
@@ -12523,7 +12911,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Server"
@@ -12532,44 +12920,44 @@ msgstr "Server"
 msgid "Server info"
 msgstr "Server info"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Server time"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Service"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12585,11 +12973,11 @@ msgstr "Service verwijderd"
 msgid "Service port"
 msgstr ""
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr ""
 
@@ -12601,49 +12989,53 @@ msgstr ""
 msgid "Service updated"
 msgstr "Service bijgewerkt"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr ""
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Severity"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Severity (aflopend)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Severity naam mag niet leeg zijn."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Toon"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Toon alles"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Toon details"
 
@@ -12673,35 +13065,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr ""
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Toon lijnen"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Toon geselecteerde"
 
@@ -12709,19 +13102,22 @@ msgstr "Toon geselecteerde"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Toon triggers"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr ""
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Toon waarde"
@@ -12730,11 +13126,11 @@ msgstr "Toon waarde"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Toon werktijd"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr ""
 
@@ -12754,6 +13150,10 @@ msgstr "Simple check"
 msgid "Simple graph"
 msgstr "Simpel grafiek"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12791,7 +13191,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12809,16 +13209,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr ""
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12827,11 +13227,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12839,10 +13239,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr ""
 
@@ -12850,15 +13250,15 @@ msgstr ""
 msgid "Slides"
 msgstr ""
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Soft"
 
@@ -12891,28 +13291,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Sorteer orde (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12925,11 +13325,11 @@ msgstr ""
 msgid "Source"
 msgstr "Bron"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spanish (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12937,63 +13337,63 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr ""
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Status"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -13006,7 +13406,7 @@ msgstr "Status calculatie"
 msgid "Status calculation algorithm"
 msgstr "Status calculatie algoritme"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr ""
 
@@ -13015,7 +13415,7 @@ msgid "Status of Web monitoring"
 msgstr ""
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Status van ZABBIX"
 
@@ -13032,40 +13432,40 @@ msgid "Status only"
 msgstr "Status alleen"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr ""
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr ""
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Bewaar waarde"
@@ -13074,11 +13474,11 @@ msgstr "Bewaar waarde"
 msgid "Straight"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Stijle"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13086,11 +13486,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13099,32 +13499,32 @@ msgid "Success Audit"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr ""
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr ""
 
@@ -13132,27 +13532,27 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Achternaam"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr ""
 
@@ -13160,16 +13560,16 @@ msgstr ""
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13178,21 +13578,21 @@ msgid "System status"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13211,11 +13611,11 @@ msgid "TOTAL"
 msgstr ""
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "TRIGGER OPMERKINGEN"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "WAAR"
 
@@ -13233,14 +13633,14 @@ msgstr ""
 msgid "Tag"
 msgstr "Etiket"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13249,130 +13649,133 @@ msgid "Target type"
 msgstr ""
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Template"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr ""
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Template verbindingen"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Er bestaat reeds een Template met de zichtbare naam \"%s\"."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr ""
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Templates"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr ""
 
@@ -13380,11 +13783,11 @@ msgstr ""
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr ""
 
@@ -13398,22 +13801,22 @@ msgid "Test string"
 msgstr ""
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Tekst"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13421,7 +13824,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13436,26 +13839,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13464,19 +13867,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr ""
 
@@ -13487,11 +13890,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13500,11 +13903,11 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13516,27 +13919,27 @@ msgstr ""
 msgid "This year"
 msgstr ""
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr ""
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr ""
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Tot"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13545,28 +13948,28 @@ msgstr "Tot"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Tijd"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13574,54 +13977,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Tijd periode"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Tijd type"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Tijdsstempel"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13629,17 +14032,18 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "boven"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Totaal"
 
@@ -13657,7 +14061,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13674,91 +14078,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trends"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Trigger"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Trigger toegevoegd"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Trigger opmerkingen"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Trigger verwijderd"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13773,11 +14177,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13785,7 +14190,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13798,12 +14203,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13815,52 +14220,52 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13868,23 +14273,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Trigger severities"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Trigger severity"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "trigger bijgewerkt"
 
@@ -13892,40 +14305,41 @@ msgstr "trigger bijgewerkt"
 msgid "Trigger value"
 msgstr "trigger waarde"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "triggers"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Triggers verwijderd"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Triggers info"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Triggers massa update"
 
@@ -13933,78 +14347,78 @@ msgstr "Triggers massa update"
 msgid "Triggers overview"
 msgstr "Triggers overzicht"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Trigger status"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Trigger top 100"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Triggers met severity"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Afgekapt"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Di"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Twee elementen moeten geselecteerd worden"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Twee items (\"%1$s\" en \"%2$s\") kunnen niet beiden het host inventory veld \"%3$s\" vullen, dit zal conflicteren."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Type"
 
@@ -14012,62 +14426,64 @@ msgstr "Type"
 msgid "Type (Full details)"
 msgstr "Type (Volledige details)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Type (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Type van de berekening"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Type informatie"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Types"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "ONBEKEND"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "OP"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (na de login)"
 
@@ -14083,20 +14499,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 karakters)"
 
@@ -14104,15 +14530,11 @@ msgstr "USA (160 karakters)"
 msgid "USER PROFILE"
 msgstr "GEBRUIKERS PROFIEL"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Oekraïens (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Kan de configuratie niet selecteren."
 
@@ -14120,7 +14542,7 @@ msgstr "Kan de configuratie niet selecteren."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Niet bevestigd"
 
@@ -14133,20 +14555,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Niet bevestigde PROBLEM gebeurtenissen"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Alleen niet bevestigd"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Selectie deblokkeren"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Deblokeer de geselecteerde gebruikers?"
 
@@ -14155,29 +14577,29 @@ msgstr "Deblokeer de geselecteerde gebruikers?"
 msgid "Units"
 msgstr "Eenheden"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14187,23 +14609,20 @@ msgstr "Onbekend"
 msgid "Unknown action"
 msgstr "Onbekende actie"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Onbekend berekenings algoritme voor de service status"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Onbekende functie."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Onbekend host item, het item bestaat niet voor de geselecteerde host"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Onbekende host, de host bestaat niet in het systeem"
 
@@ -14215,23 +14634,23 @@ msgstr "Onbekend interface type."
 msgid "Unknown resource"
 msgstr "Onbekende bron"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Onbekend waarde type"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Ontkoppelen"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Ontkoppelen en opschonen"
 
@@ -14239,61 +14658,61 @@ msgstr "Ontkoppelen en opschonen"
 msgid "Unlink from template"
 msgstr "Ontkoppel van template"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Ontkoppel van templates"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Ontkoppeld: Applicatie \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Ontkoppeld: Discovery regel \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Ontkoppeld: Grafiek \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Ontkoppeld: Grafiek prototype \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Ontkoppeld: Item \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Ontkoppeld: Item prototype \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Ontkoppeld: Trigger \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Ontkoppeld: Trigger prototype \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Geluid aan"
 
@@ -14307,32 +14726,43 @@ msgstr "File extensie \"%1$s\" is niet ondersteund bij importeren."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Niet ondersteund import formaat \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14343,34 +14773,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Bijwerken"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Bestaande bijwerken"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Bijwerk interval"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Bijwerk interval (in sec)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Bijgewerkt"
 
@@ -14378,55 +14808,55 @@ msgstr "Bijgewerkt"
 msgid "Updated status of host"
 msgstr "Werk de status van de host bij"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Bijgewerkt: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Bijgewerkt: Applicatie \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Bijgewerkt: Discovery regel \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Bijgewerkt: Item \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Bijgewerkt: Item prototype \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Bijgewerkt: Trigger \"%1$s\" van \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Bijgewerkt: Trigger prototype \"%1$s\" van \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Upload"
 
@@ -14434,14 +14864,14 @@ msgstr "Upload"
 msgid "Upper level maps"
 msgstr "Kaarten op hoger liggend niveau"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Uptime"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14449,10 +14879,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Uptime/Downtime"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14467,84 +14897,88 @@ msgid "Used in actions"
 msgstr "Gebruikt in acties"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Gebruiker"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "Gebruiker \"%s\" kan niet zonder gebruikers groep."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Gebruikers toegevoegd"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Gebruiker kan eigen type niet aanpassen"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Gebruiker kan eigen status niet wijzigen"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Gebruiker verwijderd"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Gebruikers groep"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Gebruikers groep \"%1$s\" wordt gebruikt in script \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14561,34 +14995,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Gebruikers groepen"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Gebruiker mag zichzelf niet verwijderen"
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14614,243 +15048,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Gebruikerstype"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Gebruiker bijgewerkt"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Gebruiker met het alias \"%s\" bestaat reeds."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Gebruikers"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Gebruikers (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Gebruiker is geblokkeerd"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Waarde"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14885,11 +15319,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14935,10 +15369,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Waarde afbeeldingen"
 
@@ -14947,7 +15381,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14959,8 +15393,8 @@ msgstr ""
 msgid "Values"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr ""
 
@@ -14973,64 +15407,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Verticale uitlijning"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Zichbare naam"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Zichbare naam mag niet leeg zijn als de hostnaam leeg is."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr ""
 
@@ -15038,65 +15477,83 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr ""
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr ""
 
@@ -15104,9 +15561,9 @@ msgstr ""
 msgid "Week"
 msgstr "Week"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Wekelijks"
 
@@ -15114,12 +15571,12 @@ msgstr "Wekelijks"
 msgid "When active"
 msgstr "Wanneer actief"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Breedte"
@@ -15129,28 +15586,28 @@ msgstr "Breedte"
 msgid "With data collection"
 msgstr ""
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr ""
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr ""
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr ""
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr ""
 
@@ -15159,7 +15616,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15172,277 +15629,271 @@ msgstr "Werktijd"
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr ""
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Verkeerde velden voor gebruiker \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML bestand bevat fouten"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Y-as MAX waarde"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Y lijn MIN waarde"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Y lijn zijde"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Jaar"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Jaarlijks"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Ja"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Je kunt een aantal talen niet selecteren omdat de locales hiervoor ontbreken op de webserver."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Je mag de rechten van de gebruiker \"%s\" niet aanpassen."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Je bent niet ingelogd."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Je hebt geen host opgegeven voor de handeling."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Je hebt geen host groep opgegeven voor deze handeling."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Je hebt geen doel opgegeven voor het commando \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, fuzzy, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Je hebt geen doel opgegeven voor het globale script \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Je hebt onvoldoende rechten om gebruikers aan te maken."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Je hebt onvoldoende rechten om andere gebruikers bij te werken."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Je hebt onvoldoende rechten om bij te werken of de gebruiker bestaat niet."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Je moet inloggen om deze pagina te bekijken."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15455,7 +15906,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15474,8 +15925,8 @@ msgid "Zabbix User"
 msgstr "Zabbix Gebruiker"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15501,10 +15952,11 @@ msgstr "ZABBIX intern"
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix server"
@@ -15517,7 +15969,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15525,15 +15977,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix server is actief"
 
@@ -15542,11 +15994,11 @@ msgstr "Zabbix server is actief"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Zabbix server naam"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Zabbix server poort"
 
@@ -15554,25 +16006,20 @@ msgstr "Zabbix server poort"
 msgid "Zabbix trapper"
 msgstr "Zabbix trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zoom"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15581,19 +16028,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "alle"
 
@@ -15601,19 +16048,15 @@ msgstr "alle"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "bestaat reeds"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "als Blauw"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "als Groen"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "als Rood"
 
@@ -15625,83 +16068,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "gmd"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "dagen"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15723,19 +16132,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elementen"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "elementen kopieren naar ...."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from en esc_step_to moeten samen gezet worden."
 
@@ -15747,48 +16152,50 @@ msgstr "exact"
 msgid "executed"
 msgstr "uitgevoerd"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 #, fuzzy
 msgid "fixed"
 msgstr "opgelost"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "gevonden"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "host groep"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "icoon"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "afbeelding"
 
@@ -15796,7 +16203,7 @@ msgstr "afbeelding"
 msgid "in"
 msgstr "in"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15806,7 +16213,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15814,21 +16221,21 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 #, fuzzy
 msgid "last"
 msgstr "laatste"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 #, fuzzy
 msgid "like"
@@ -15838,12 +16245,12 @@ msgstr "als"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15852,46 +16259,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr "macro(s)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "onderhoud"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "kaart"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15900,17 +16307,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "geen data"
@@ -15923,12 +16330,14 @@ msgstr "niet in"
 msgid "not like"
 msgstr "niet als"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "Niet lopende"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "niet geselecteerd"
 
@@ -15937,57 +16346,61 @@ msgstr "niet geselecteerd"
 msgid "not sent"
 msgstr "Niet verzonden"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "nu"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "of"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "op"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "andere"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "ververs elke"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15997,8 +16410,8 @@ msgstr ""
 msgid "remember selected"
 msgstr "onthoud geslecteerden"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
@@ -16006,17 +16419,16 @@ msgstr "onthoud geslecteerden"
 msgid "root"
 msgstr "wortel"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "Lopende"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sec"
 
@@ -16029,7 +16441,7 @@ msgstr "seconden"
 msgid "sent"
 msgstr "Verzonden"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "korte beschrijving"
 
@@ -16037,37 +16449,37 @@ msgstr "korte beschrijving"
 msgid "show icon mappings"
 msgstr "Laat icon mappings zien"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "laat value mappings zien"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "template ID \"%1$s\" is %2$s keer verwerkt"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 #, fuzzy
 msgid "to"
 msgstr "tot"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "trigger"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "onbekend"
 
@@ -16079,11 +16491,11 @@ msgstr "waarde"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "JJJJ"
diff --git a/frontends/php/locale/pl/LC_MESSAGES/frontend.po b/frontends/php/locale/pl/LC_MESSAGES/frontend.po
index bd97610fbec..7ce2feba32f 100644
--- a/frontends/php/locale/pl/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/pl/LC_MESSAGES/frontend.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:57+0300\n"
-"PO-Revision-Date: 2014-04-01 19:53+0300\n"
-"Last-Translator: refaston <refaston@o2.pl>\n"
+"POT-Creation-Date: 2014-08-25 14:59+0300\n"
+"PO-Revision-Date: 2014-08-25 09:26+0300\n"
+"Last-Translator: Paweł <pawel.seledec@zeto.olsztyn.pl>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -13,24 +13,26 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1396374795.0\n"
+"X-POOTLE-MTIME: 1408951568.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
-msgstr "„%s” musi zawierać się w przedziale pomiędzy 01.01.1970 a 18.01.2038."
+msgstr "\"%s\" musi zawierać się w przedziale pomiędzy 1970-01-01 a 2038-01-18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
-msgstr "Pole „Wyświetlanie wyzwalaczy w stanie OK” musi być wartością 0 lub dodatnią liczbą całkowitą."
+msgstr "Pole \"Wyświetlanie wyzwalaczy w stanie OK przez\" musi być wartością \"0\" lub dodatnią liczbą całkowitą."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
-msgstr "Pole \"Miganie wyzwalaczy o zmienionym stanie\" musi być wartością 0 lub dodatnią liczbą całkowitą."
+msgstr "Pole \"Przy zmianie stanu wyzwalacze migają przez\" musi być wartością \"0\" lub dodatnią liczbą całkowitą."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -38,12 +40,12 @@ msgstr[0] "%1$d dzień"
 msgstr[1] "%1$d dni"
 msgstr[2] "%1$d dni"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
-msgstr[0] "%1$d z %2$d problem jest widoczny"
-msgstr[1] "%1$d z %2$d problemy są widoczne"
+msgstr[0] "%1$d z %2$d problemu jest widoczny"
+msgstr[1] "%1$d z %2$d problemów są widoczne"
 msgstr[2] "%1$d z %2$d problemów jest widocznych"
 
 #: chart4.php:89 chart5.php:83
@@ -51,7 +53,7 @@ msgstr[2] "%1$d z %2$d problemów jest widocznych"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (rok %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
@@ -59,10 +61,8 @@ msgstr[0] "%1$s pozycja"
 msgstr[1] "%1$s pozycje"
 msgstr[2] "%1$s pozycji"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
@@ -70,38 +70,38 @@ msgstr[0] "%1$s dzień"
 msgstr[1] "%1$s dni"
 msgstr[2] "%1$s dni"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
-#, fuzzy, c-format
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
+#, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
 msgstr[0] "%1$s minuta"
-msgstr[1] "%1$s minuta"
-msgstr[2] "%1$s minut(y)"
+msgstr[1] "%1$s minuty"
+msgstr[2] "%1$s minut"
 
 #: include/classes/screens/CScreenActions.php:151
 #: include/views/administration.auditacts.list.php:90
-#, fuzzy, c-format
+#, c-format
 msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
-msgstr[0] "%1$s próba została"
-msgstr[1] "%1$s próba została"
-msgstr[2] "%1$s próbyzostały"
+msgstr[0] "została %1$s próba"
+msgstr[1] "zostały %1$s próby"
+msgstr[2] "zostało %1$s prób"
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%1$s sekunda"
+msgstr[1] "%1$s sekundy"
+msgstr[2] "%1$s sekund"
 
 #: include/page_header.php:344
 #, c-format
 msgid "%4$s failed login attempt logged. Last failed attempt was from %1$s on %2$s at %3$s."
 msgid_plural "%4$s failed login attempts logged. Last failed attempt was from %1$s on %2$s at %3$s."
-msgstr[0] "%4$s nieudana próba logowania. Ostatnia z %1$s %2$s %3$s."
-msgstr[1] "%4$s nieudane próby logowania. Ostatnia z %1$s %2$s %3$s."
-msgstr[2] "%4$s nieudanych prób logowania. Ostatnia z %1$s %2$s %3$s."
+msgstr[0] "%4$s nieudana próba logowania. Ostatnia nieudana próba z %1$s %2$s %3$s."
+msgstr[1] "%4$s nieudane próby logowania. Ostatnia nieudana próba z %1$s %2$s %3$s."
+msgstr[2] "%4$s nieudanych prób logowania. Ostatnia nieudana próba z %1$s %2$s %3$s."
 
 #: include/views/monitoring.discovery.php:130
 #, c-format
@@ -111,23 +111,23 @@ msgstr[0] "%d urządzenie"
 msgstr[1] "%d urządzenia"
 msgstr[2] "%d urządzeń"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - nieskończenie)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Tylko super administrator może tworzyć grupy)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(w dniach)"
 
@@ -135,34 +135,34 @@ msgstr "(w dniach)"
 msgid "(in sec)"
 msgstr "(w sekundach)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimum 60 sekund, 0 - używaj wartości domyślnej dla akcji)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(brak proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
-msgstr ""
+msgstr "(z ostrzeżeniami)"
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[POTWIERDZENIE ZBIORCZE]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 lub 1"
 
@@ -178,7 +178,7 @@ msgstr "10 sekund"
 msgid "30 seconds"
 msgstr "30 sekund"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "Widok 3D"
 
@@ -194,17 +194,17 @@ msgstr "5 sekund"
 msgid "500 latest values"
 msgstr "500 ostatnich wartości"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Sub-menu/Sub-menu.../>Skrypt"
 
 #: include/views/configuration.sysmap.edit.php:55
 msgid "<manual>"
-msgstr "<podręcznik>"
+msgstr "<ręczne>"
 
 #: include/views/administration.auditacts.list.php:31
 msgid "ACTION LOG"
-msgstr ""
+msgstr "LOG AKCJI"
 
 #: include/views/configuration.host.discovery.edit.php:144
 #: include/views/configuration.item.edit.php:150
@@ -213,38 +213,37 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "POTWIERDZENIA ALARMÓW"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
-msgstr "AND"
+msgstr "I"
 
 #: include/views/administration.auditlogs.list.php:31
 msgid "AUDIT LOG"
-msgstr ""
+msgstr "LOG AUDYTU"
 
 #: report2.php:163
 msgid "AVAILABILITY REPORT"
 msgstr "RAPORT DOSTĘPNOŚCI"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Różnica bezwzględna między ostatnią i poprzednią wartością jest < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Różnica bezwzględna między ostatnią i poprzednią wartością jest = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Różnica bezwzględna między ostatnią i poprzednią wartością jest > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
-msgstr "Różnica bezwzględna między ostatnią i poprzednią wartością jest NOT N"
+msgstr "Różnica bezwzględna między ostatnią i poprzednią wartością NIE jest = N"
 
 #: report3.php:83 srv_status.php:143
 msgid "Acceptable SLA"
@@ -254,42 +253,42 @@ msgstr "Akceptowalne SLA"
 msgid "Access denied!"
 msgstr "Dostęp zabroniony!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Dostęp zabroniony."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Konto zostało zablokowane na %s sekund"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
-msgstr "Zatw."
+msgstr "Potw."
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Potwierdzenie"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
-msgstr "Potwierdzenie dodane"
+msgstr "Dodano potwierdzenie"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Potwierdzenie alarmu przez"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Potwierdź i wróć"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Status potwierdzenia"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Potwierdzone"
 
@@ -314,91 +313,94 @@ msgstr "Potwierdzanie wyłączone"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Akcja"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Akcja \"%1$s\" już istnieje."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Akcja \"%1$s\" ma nieprawidłową wartość \"esc_period\" (minimum %2$s sekund(y))."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Akcja \"%1$s\" nie ma zdefiniowanych operacji."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
-msgstr "Akcja dodana"
+msgstr "Dodano akcję"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
-msgstr "Akcja usunięta"
+msgstr "Usunięto akcję"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono akcję"
+msgstr[1] "Wyłączono akcje"
+msgstr[2] "Wyłączono akcje"
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono akcję"
+msgstr[1] "Włączono akcje"
+msgstr[2] "Włączono akcje"
 
 #: auditacts.php:27 include/screens.inc.php:31
 #: include/views/administration.auditacts.list.php:29
 #: include/views/administration.auditacts.list.php:32
 #: include/views/administration.auditlogs.list.php:29
 msgid "Action log"
-msgstr ""
+msgstr "Log akcji"
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
-msgstr "Akcja operacji"
+msgstr "Operacje akcji"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
-msgstr "Akcja uaktualniona"
+msgstr "Zaktualizowano akcję"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Akcje"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktywne"
@@ -408,80 +410,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Aktywny"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktywne od"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktywne do"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Dodaj"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
-msgstr ""
+msgstr "Dodaj dziecko"
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Dodanie komentarza przez"
 
@@ -491,33 +496,29 @@ msgstr "Dodaj element"
 
 #: include/actions.inc.php:379 include/actions.inc.php:608
 msgid "Add host"
-msgstr "Dodaj urządzenie"
+msgstr "Dodaj host"
 
 #: include/views/configuration.sysmap.constructor.php:33
 msgid "Add link"
-msgstr "Dodaj link"
-
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Dodaj brakujące"
+msgstr "Dodaj połączenie"
 
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Dodaj nowe lub istniejące aplikacje"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
-msgstr "Dodaj nową lub istniejącą grupę komputerów"
+msgstr "Dodaj nową lub istniejącą grupę hostów"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Dodaj prototyp"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Dodaj do"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Dodaj do ulubionych"
@@ -526,9 +527,9 @@ msgstr "Dodaj do ulubionych"
 msgid "Add to host group"
 msgstr "Dodaj do grupy hostów"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
-msgstr "Dodaj do grupy hostów"
+msgstr "Dodaj do grup hostów"
 
 #: auditlogs.php:128
 msgid "Added"
@@ -538,7 +539,7 @@ msgstr "Dodano"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administracja"
 
@@ -546,34 +547,34 @@ msgstr "Administracja"
 msgid "Advanced labels"
 msgstr "Zaawansowane etykiety"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Wiek"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
-msgstr "Starczy mniej niż"
+msgstr "Wiek mniej niż"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
-msgstr "Starsze mniej niż %s"
+msgstr "Wiek mniej niż %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agent"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
-msgstr ""
+msgstr "Nazwa hosta agenta zdefiniowana w pliku konfiguracyjnym. Wartość tekstowa."
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Interfejsy agenta"
@@ -582,137 +583,139 @@ msgstr "Interfejsy agenta"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Interfejs agenta, SNMP, JMX lub IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
-msgstr ""
+msgstr "Kontrole sumaryczne nie wymagają, by na monitorowanym hoście działał agent. Serwer Zabbix zbiera informacje sumaryczne tylko na podstawie danych z bazy. Więcej informacji w podręczniku Zabbix-a."
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
-msgstr "Alias"
+msgstr "Alias (Login)"
 
 #: include/views/configuration.sysmap.constructor.php:56
 msgid "Align icons"
 msgstr "Wyrównaj ikony"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Wszystkie"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Wszystkie grupy"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
-msgstr "Wszystkie linki powinny mieć określone pola \"Name\" i \"URL\""
+msgstr "Wszystkie połączenia powinny mieć określone pola \"Name\" i \"URL\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Dopuszczalne hosty"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
-msgstr ""
+msgstr "Ilość pamięci w bajtach. Jeżeli nie podano trybu, ilość ogółem."
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
-msgstr ""
+msgstr "I"
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
-msgstr ""
+msgstr "I/Lub"
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Dowolny"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Dowolny ciąg znaków zawiera"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
-msgstr "Program"
+msgstr "Aplikacja"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
-msgstr "Program \"%1$s\" istnieje."
+msgstr "Aplikacja \"%1$s\" już istnieje."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
-msgstr "Dodano program"
+msgstr "Dodano aplikację"
 
-#: applications.php:151 applications.php:186
-#, fuzzy
+#: applications.php:162 applications.php:202
 msgid "Application deleted"
 msgid_plural "Applications deleted"
-msgstr[0] "Usunięto program"
-msgstr[1] "Usunięto program"
-msgstr[2] "Usunięto program"
+msgstr[0] "Usunięto aplikację"
+msgstr[1] "Usunięto aplikacje"
+msgstr[2] "Usunięto aplikacje"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
-msgstr "Błąd programu."
+msgstr "Błąd aplikacji."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
-msgstr "Program został zaktualizowany"
+msgstr "Zaktualizowano aplikację"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
-msgstr "Program o ID \"%1$s\" nie jest dostępny na \"%2$s\"."
+msgstr "Aplikacja o ID \"%1$s\" nie jest dostępna na \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
-msgstr "Programy"
+msgstr "Aplikacje"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -721,18 +724,18 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Nadchodzące"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Kwi"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Kwiecień"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
-msgstr "Na pewno przeprowadzić tę czynność?"
+msgstr "Na pewno przeprowadzić tę akcję?"
 
 #: include/views/js/common.macros.js.php:36
 msgid "Are you sure you want to delete"
@@ -746,9 +749,9 @@ msgstr "Wielkość obszaru"
 msgid "Area type"
 msgstr "Typ obszaru"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -762,30 +765,25 @@ msgstr "Jako zwykły tekst"
 msgid "Asset tag"
 msgstr "Etykieta zasobu"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "O %1$s:%2$s %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "O %1$s:%2$s w %3$s %4$s w każdy(ą) %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "O %1$s:%2$s w %3$s w każdy(ą) %4$s"
 
-#: include/maintenances.inc.php:80
-#, fuzzy, c-format
+#: include/maintenances.inc.php:76
+#, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
-msgstr[0] "O %1$s:%2$s w każdy(ą) %3$s we wszystkie tygodnie"
-msgstr[1] "O %1$s:%2$s w każdy(ą) %3$s w każdy %4$s tydzień"
-msgstr[2] "O %1$s:%2$s w każdy(ą) %3$s w każdy %4$s tydzień"
+msgstr[0] "O %1$s:%2$s w każdy(ą) %3$s tygodnia"
+msgstr[1] "O %1$s:%2$s w każdy(ą) %3$s co %4$s tydzień"
+msgstr[2] "O %1$s:%2$s w każdy(ą) %3$s co %4$s tygodni"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
@@ -793,62 +791,66 @@ msgstr[0] "O %1$s:%2$s każdego dnia"
 msgstr[1] "O %1$s:%2$s każdego %3$s dnia"
 msgstr[2] "O %1$s:%2$s każdego %3$s dnia"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "O (godzina:minuta)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
-msgstr "Co najmniej jeden komputer lub grupa musi być zaznaczona."
+msgstr "Co najmniej jeden host lub grupa musi być zaznaczona."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Co najmniej jeden okres konserwacji musi być utworzony."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
-msgstr ""
+msgstr "Przynajmniej jedna z baz MySQL, PostgreSQL, Oracle, SQLite3 lub IBM DB2 powinna być dostępna."
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audyt"
 
 #: adm.housekeeper.php:51
 msgid "Audit data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych audytu"
 
 #: adm.housekeeper.php:110
 #, c-format
 msgid "Audit data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych audytu (w dniach) \"%1$s\"."
 
 #: auditlogs.php:27 include/views/administration.auditacts.list.php:28
 #: include/views/administration.auditlogs.list.php:28
 #: include/views/administration.auditlogs.list.php:32
 msgid "Audit log"
-msgstr ""
+msgstr "Log audytu"
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Sie"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Sierpień"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Uwierzytelnienie"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Algorytm uwierzytelniania"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -896,20 +898,20 @@ msgstr "Automatyczne wylogowanie (przynajmniej 90 sek.)"
 
 #: include/views/administration.general.housekeeper.edit.php:57
 msgid "Auto-registration data storage period (in days)"
-msgstr ""
+msgstr "Okres przechowywania danych auto-rejestracji (w dniach)"
 
 #: adm.housekeeper.php:43
 msgid "Auto-registration event and alert data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych auto-rejestracji i alarmów"
 
 #: adm.housekeeper.php:108
 #, c-format
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych auto-rejestracji i alarmów (w dniach) \"%1$s\"."
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automatycznie"
 
@@ -917,20 +919,20 @@ msgstr "Automatycznie"
 msgid "Automatic icon mapping"
 msgstr "Automatyczne mapowanie ikon"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Automatyczny wybór ikon"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Dostępność"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Raport dostępności"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Dostępne"
 
@@ -939,36 +941,36 @@ msgstr "Dostępne"
 msgid "Average"
 msgstr "Średni"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
-msgstr "Średnia przez"
+msgstr "Średnia z"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Średnia wartość w okresie T jest < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Średnia wartość w okresie T jest = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Średnia wartość w okresie T jest > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
-msgstr "Średnia wartość w okresie T jest NOT N"
+msgstr "Średnia wartość w okresie T NIE jest = N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Oś strony"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Tło"
@@ -977,7 +979,7 @@ msgstr "Tło"
 msgid "Background image"
 msgstr "Obraz tła"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Raport belkowy"
 
@@ -987,8 +989,8 @@ msgid "Base DN"
 msgstr "Podstawowe DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Podstawowe uwierzytelnienie"
+msgid "Basic"
+msgstr "Podstawowy"
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -1000,15 +1002,15 @@ msgstr "DN do dowiązania"
 msgid "Bind password"
 msgstr "Hasło dowiązania"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Bitowe AND ostatniej (najnowszej) wartości T i maski jest = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
-msgstr "Bitowe AND ostatniej (najnowszej) wartości T i maski jest NOT N"
+msgstr "Bitowe AND ostatniej (najnowszej) wartości T i maski NIE jest = N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Czerń i błękit"
 
@@ -1020,8 +1022,8 @@ msgstr "Miganie"
 msgid "Blocked"
 msgstr "Zablokowane"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Gruba linia"
 
@@ -1029,22 +1031,22 @@ msgstr "Gruba linia"
 msgid "Boolean"
 msgstr "Logiczny"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
-msgstr "Dół"
+msgstr "Na dole"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Jaśniejsza"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bułgarski (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Potwierdzenie zbiorowe"
 
@@ -1059,18 +1061,18 @@ msgstr "Wg wzorca wyzwalacza"
 #: include/views/configuration.action.edit.php:25
 #: include/views/configuration.action.list.php:29
 msgid "CONFIGURATION OF ACTIONS"
-msgstr "KONFIGURACJA CZYNNOŚCI"
+msgstr "KONFIGURACJA AKCJI"
 
 #: include/views/configuration.application.edit.php:23
 #: include/views/configuration.application.list.php:40
 msgid "CONFIGURATION OF APPLICATIONS"
-msgstr "KONFIGURACJA PROGRAMÓW"
+msgstr "KONFIGURACJA APLIKACJI"
 
 #: include/views/administration.authentication.edit.php:23
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "KONFIGURACJA UWIERZYTELNIANIA"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1098,21 +1100,21 @@ msgstr "KONFIGURACJA GRUPY HOSTÓW"
 #: include/views/configuration.host.prototype.edit.php:30
 #: include/views/configuration.host.prototype.list.php:31
 msgid "CONFIGURATION OF HOST PROTOTYPES"
-msgstr "KONFIGURACJA PROTOTYPÓW KOMPUTERA"
+msgstr "KONFIGURACJA PROTOTYPÓW HOSTÓW"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "KONFIGURACJA HOSTÓW"
 
 #: adm.housekeeper.php:141
 msgid "CONFIGURATION OF HOUSEKEEPING"
-msgstr ""
+msgstr "KONFIGURACJA PORZĄDKOWANIA"
 
 #: adm.iconmapping.php:130
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "KONFIGURACJA MAPOWANIA IKON"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "KONFIGURACJA OBRAZÓW"
 
@@ -1121,16 +1123,16 @@ msgstr "KONFIGURACJA OBRAZÓW"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "KONFIGURACJA USŁUG IT"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
-msgstr "KONFIGURACJA PROTOTYPÓW ELEMENTÓW"
+msgstr "KONFIGURACJA PROTOTYPÓW POZYCJI"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
-msgstr "KONFIGURACJA ELEMENTÓW"
+msgstr "KONFIGURACJA POZYCJI"
 
 #: adm.macros.php:173
 msgid "CONFIGURATION OF MACROS"
@@ -1157,7 +1159,7 @@ msgstr "KONFIGURACJA MAP SIECI"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "KONFIGURACJA PROXY"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "KONFIGURACJA WYRAŻEŃ REGULARNYCH"
 
@@ -1177,7 +1179,7 @@ msgstr "KONFIGURACJA SKRYPTÓW"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "KONFIGURACJA POKAZÓW SLAJDÓW"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "KONFIGURACJA SZABLONÓW"
 
@@ -1193,19 +1195,19 @@ msgstr "KONFIGURACJA POZIOMÓW WYZWALACZY"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "KONFIGURACJA WYZWALACZY"
 
 #: include/views/administration.usergroups.edit.php:23
 #: include/views/administration.usergroups.list.php:31
 msgid "CONFIGURATION OF USER GROUPS"
-msgstr ""
+msgstr "KONFIGURACJA GRUP UŻYTKOWNIKÓW"
 
 #: include/views/administration.users.edit.php:30
 #: include/views/administration.users.list.php:31
 msgid "CONFIGURATION OF USERS"
-msgstr ""
+msgstr "KONFIGURACJA UŻYTKOWNIKÓW"
 
 #: adm.valuemapping.php:147
 msgid "CONFIGURATION OF VALUE MAPPING"
@@ -1225,45 +1227,45 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "KONFIGURACJA ZABBIXA"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
-msgstr ""
+msgstr "Informacje CPU - wyświetla domyślnie wszystkie informacje o wszystkich CPU"
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
-msgstr ""
+msgstr "Obciążenie CPU. Obciążenie procesora, cpu i tryb są opcjonalne. Jeżeli cpu jest puste, przyjęte będzie wszystkie. Jeżeli tryb jest pusty, przyjęte będzie avg1. Uwaga, to nie jest skala procentowa."
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
-msgstr ""
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
+msgstr "Użycie CPU. Procentowe obciążenie procesora. cpu, typ i tryb są opcjonalne. Jeżeli cpu jest puste, przyjęte będzie all. Jeżeli typ jest pusty, przyjęty będzie user. Jeżeli tryb jest pusty, przyjęte będzie avg1."
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
-msgstr ""
+msgstr "Oblicza sumę kontrolną MD5 podanego pliku. Tekstowy skrót MD5 pliku. Może być użyte dla plików krótszych niż 64MB, dla większych niewspierane. Przykład: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 
 #: include/views/configuration.services.edit.php:66 services.php:44
 msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Oblicz SLA, dopuszczalne SLA (w %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
-msgstr ""
+msgstr "Oblicza sumę kontrolną podanego pliku. Suma kontrolna jest obliczana przy pomocy standardowego algorytmu użytego w UNIX-owym poleceniu cksum. Przykład: vfs.file.cksum[/etc/passwd]"
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
-msgstr ""
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+msgstr "Oblicz przestrzeń dyskową dla podanego wolumenu. Przestrzeń w KB. Jeżeli tryb jest pusty, przyjęte będzie total. W przypadku zamontowanych wolumenów, zwrócona zostanie wolna przestrzeń dla lokalnego systemu plików. Przykład: vfs.fs.size[/tmp,free]."
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Obliczone"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Obliczone uprawnienia"
 
@@ -1271,164 +1273,167 @@ msgstr "Obliczone uprawnienia"
 msgid "Callback"
 msgstr "Oddzwanianie"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Kanada (136 znaków)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Nie można potwierdzić zdarzenia"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Nie można dodać nienumerycznego elementu \"%1$s\" do wykresu \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Nie można dodać nienumerycznego elementu \"%1$s\" do prototypu wykresu \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Nie można dodać nienumerycznego elementu \"%1$s\"."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
-msgstr "Nie można dodać działania"
+msgstr "Nie można dodać akcji"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Nie można dodać warunku akcji"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
-msgstr "Nie można dodać programu"
+msgstr "Nie można dodać aplikacji"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Nie można utworzyć zależności szablonu od hosta."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Nie można dodać zależności od wyzwalacza \"%1$s:%2$s\" do nieistniejącego wyzwalacza \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Nie można dodać reguły wykrycia"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Nie można dodać wykresu"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
-msgstr ""
+msgstr "Nie można dodać prototypu wykresu"
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Nie można dodać grupy"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
-msgstr ""
+msgstr "Nie można dodać grupy."
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Nie można dodać hosta"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
-msgstr "Nie można dodać prototypu komputera"
+msgstr "Nie można dodać prototypu hosta"
 
 #: adm.images.php:62
 msgid "Cannot add image"
 msgstr "Nie można dodać obrazu"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Nie można dodać obrazu."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
-msgstr "Nie można dodać elementu"
+msgstr "Nie można dodać pozycji"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
-msgstr "Nie można dodać elementu \"%1$s\" z \"%2$s\" do aplikacji \"%3$s\" z \"%4$s\"."
+msgstr "Nie można dodać pozycji \"%1$s\" z \"%2$s\" do aplikacji \"%3$s\" z \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
-msgstr ""
+msgstr "Nie można dodać prototypu pozycji"
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
-msgstr "Nie można dodać elementów."
+msgstr "Nie można dodać pozycji."
 
 #: adm.macros.php:120
 msgid "Cannot add macro."
 msgstr "Nie można dodać makra."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Nie można dodać okresu utrzymania"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Nie można dodać typu mediów"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
-msgstr "Nie można dodać więcej niż jednej pozycji typu \"Graph sum\" na wykresie \"%1$s\"."
+msgstr "Nie można dodać więcej niż jednej pozycji typu \"Suma wykresu\" na wykresie \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
-msgstr "Nie można dodać więcej niż jednego elemntu typu \"Graph sum\" do prototypu wykresu \"%1$s\"."
+msgstr "Nie można dodać więcej niż jednej pozycji typu \"Suma wykresu\" do prototypu wykresu \"%1$s\"."
 
 #: sysmaps.php:175
 msgid "Cannot add network map"
 msgstr "Nie można dodać mapy sieci"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Nie można dodać nowej aplikacji \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Nie można dodać proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Nie można dodać wyrażenia regularnego"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Nie można dodać ekranu"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Nie można dodać skryptu"
 
@@ -1440,42 +1445,41 @@ msgstr "Nie można dodać usługi"
 msgid "Cannot add slide show"
 msgstr "Nie można dodać pokazu slajdów"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Nie można dodać szablonu"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Nie można dodać wyzwalacza"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
-msgstr ""
+msgstr "Nie można dodać prototypu wyzwalacza"
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Nie można dodać użytkownika"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Nie można dodać użytkownika. Oba hasła muszą być identyczne."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
-msgstr "Nie można dodać użytkownika."
+msgstr "Nie można dodać użytkowników."
 
 #: adm.valuemapping.php:72
 msgid "Cannot add value map"
 msgstr "Nie można dodać mapy wartości"
 
-#: httpconf.php:186
-#, fuzzy
+#: httpconf.php:198
 msgid "Cannot add web scenario"
-msgstr "Nie można dodać scenariusza web"
+msgstr "Nie można dodać scenariusza sieci www"
 
 #: authentication.php:135
 msgid "Cannot change authentication"
-msgstr ""
+msgstr "Nie można zmienić autoryzacji"
 
 #: authentication.php:182
 msgid "Cannot change authentication method to HTTP"
@@ -1489,65 +1493,65 @@ msgstr "Nie można zmienić metody uwierzytelniania na LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Nie można zmienić metod uwierzytelniania na wewnętrzną Zabbix'a"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Nie można wyczyścić historii"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Nie można sklonować prototypu wykresów."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
-msgstr "Nie można sklonować prototypu komputera."
+msgstr "Nie można sklonować prototypu hosta."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
-msgstr "Nie można sklonować elementów."
+msgstr "Nie można sklonować prototypów pozycji."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
-msgstr "Nie można sklonować prototypów wywoływaczy."
+msgstr "Nie można sklonować prototypów wyzwalaczy."
 
 #: scripts_exec.php:70
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
-msgstr "Nie można połączyć z portem trappera serwera ZABBIX, jednakże powinien on być dostepny aby uruchomić skrypt."
+msgstr "Nie można połączyć z portem trappera serwera ZABBIX, jednakże powinien on być dostępny aby uruchomić skrypt."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Nie można skopiować wykresów"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Nie można skopiować elementów"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Nie można skopiować wyzwalacza \"%1$s:%2$s\", ponieważ jego wyrażanie zawiera wiele hostów."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
-msgstr ""
+msgstr "Nie można utworzyć prototypu hosta na wykrytym hoście \"%1$s\"."
 
 #: include/db.inc.php:34
 msgid "Cannot create another database connection."
 msgstr "Nie można utworzyć kolejnego połączenia do bazy."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
-msgstr ""
+msgstr "Nie można utworzyć cyklicznych zależności."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
-msgstr ""
+msgstr "Nie można utworzyć zależności do tego samego wyzwalacza."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Nie można utworzyć zasady wykrywania"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Nie można utworzyć grupy hostów."
 
@@ -1555,184 +1559,183 @@ msgstr "Nie można utworzyć grupy hostów."
 msgid "Cannot create icon map"
 msgstr "Nie można utworzyć mapy ikon"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Nie można utworzyć map ikon o identycznej nazwie \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Nie można utworzyć mapy \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
-msgstr ""
+msgstr "Nie można utworzyć nowej aplikacji, scenariusz sieci www jest już powiązany z aplikacją."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Nie można utworzyć nowego elementu"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
-msgstr ""
+msgstr "Nie można utworzyć szablonu."
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Nie można usunąć wewnętrznego użytkownika Zabbix \"%1$s\", proszę spróbować wyłączyć tego użytkownika."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
-msgstr "Nie można usunąć działania"
+msgstr "Nie można usunąć akcji"
 
-#: applications.php:151 applications.php:187
-#, fuzzy
+#: applications.php:162 applications.php:203
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
-msgstr[0] "Nie można usunąć programu"
-msgstr[1] "Nie można usunąć programu"
-msgstr[2] "Nie można usunąć programu"
+msgstr[0] "Nie można usunąć aplikacji"
+msgstr[1] "Nie można usunąć aplikacji"
+msgstr[2] "Nie można usunąć aplikacji"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Nie można usunąć zależności"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Nie można usunąć reguły wykrywania"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
-msgstr ""
+msgstr "Nie można usunąć reguł wykrywania"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Nie można usunąć wykresu"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
-msgstr ""
+msgstr "Nie można usunąć prototypu wykresu"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
-msgstr ""
+msgstr "Nie można usunąć prototypów wykresów"
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Nie można usunąć wykresu."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Nie można usunąć wykresów"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
-msgstr "Nie można usunąć wykresów utworzonych przez niskopoziomowe odkrywanie."
+msgstr "Nie można usunąć wykresów utworzonych przez niskopoziomowe wykrywanie."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
 msgid "Cannot delete group"
-msgstr "Nie można usunąć grupy"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Nie można usunąć grupy"
+msgstr[1] "Nie można usunąć grup"
+msgstr[2] "Nie można usunąć grup"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Nie można usunąć hosta"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Nie można usunąć grupy hostów."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
-msgstr "Nie można usunać prototypu komputera."
+msgstr "Nie można usunąć prototypu hosta."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
-msgstr "Nie można usunać prototypów komputera"
+msgstr "Nie można usunąć prototypów hosta"
 
 #: adm.iconmapping.php:97
 msgid "Cannot delete icon map"
 msgstr "Nie można usunąć mapy ikon"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Nie można usunąć obrazu"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Nie można usunąć inwentarza."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
-msgstr "Nie można usunąć elementu"
+msgstr "Nie można usunąć pozycji"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
-msgstr ""
+msgstr "Nie można usunąć prototypu pozycji"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
-msgstr ""
+msgstr "Nie można usunąć prototypów pozycji"
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
-msgstr "Nie można usunąć elementów"
+msgstr "Nie można usunąć pozycji"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
-msgstr "Nie można usunąć elementów utworzonych przez niskopoziomowe rozpoznanie."
+msgstr "Nie można usunąć pozycji utworzonych przez niskopoziomowe wykrywanie."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Nie można usunąć okresu utrzymania"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Nie można usunąć typu mediów"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Nie można usunąć mapy sieci"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Nie można usunąć proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Nie można usunąć wyrażenia regularnego"
 msgstr[1] "Nie można usunąć wyrażeń regularnych"
 msgstr[2] "Nie można usunąć wyrażeń regularnych"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Nie można usunąć ekranu"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Nie można usunąć skryptu"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
-msgstr "Nie można usunąć skryptów. Pusty parametr wejściowy \"scriptids\"."
+msgstr "Nie można usunąć skryptów. Wyczyść parametr wejściowy \"scriptids\"."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Nie można usunąć skryptu. Skrypt \"%1$s\" jest wykoprzystywany w akcji \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Nie można usunąć skryptów. Skrypt ze scriptid \"%1$s\" nie istnieje."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Nie można usunąć wybranych akcji"
 
@@ -1740,79 +1743,80 @@ msgstr "Nie można usunąć wybranych akcji"
 msgid "Cannot delete service"
 msgstr "Nie można usunąć usługi"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Nie można usunąć pokazu slajdów"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Nie można usunąć szablonu"
 
-#: api/classes/CApplication.php:409
-#, fuzzy
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Nie można usunąć aplikacji użytych jako szablony."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
-msgstr "Nie można usunąć wykresów z szablonu."
+msgstr "Nie można usunąć wykresów użytych jako szablon."
 
-#: api/classes/CHostPrototype.php:1075
-#, fuzzy
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
-msgstr "Nie można usunąć prototypów komputera użytych jako szablony."
+msgstr "Nie można usunąć prototypów hosta użytych jako szablony."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
-msgstr "Nie można usunąć pozycji z szablonu."
+msgstr "Nie można usunąć pozycji użytej jako szablon."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
-msgstr "Nie można usunąć elementów użytych jako szablony"
+msgstr "Nie można usunąć pozycji użytych jako szablon"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
-msgstr "Nie można usunąć pozycji z szablonu."
+msgstr "Nie można usunąć pozycji użytych jako szablon."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
-msgstr "Nie można usunąć szablonu wyzwalacza \"%1$s:%2$s\"."
+msgstr "Nie można usunąć wyzwalacza użytego jako szablon \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
-msgstr "Nie można usunąć scenariusza web'owego \"%1$s\" użytego jako szablon."
+msgstr "Nie można usunąć scenariusza sieci www \"%1$s\" użytego jako szablon."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Nie można usunąć wyzwalacza"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Nie można usunąć prototypu wyzwalacza"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
-msgstr ""
+msgstr "Nie można usunąć prototypów wyzwalaczy"
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Nie można usunąć wyzwalacza."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Nie można usunąć wyzwalaczy"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Nie można usunąć wyzwalaczy utworzonych przez niskopoziomowe odkrywanie."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Nie można usunąć użytkownika"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Nie można usunąć mediów użytkownika."
 
@@ -1820,245 +1824,236 @@ msgstr "Nie można usunąć mediów użytkownika."
 msgid "Cannot delete value map"
 msgstr "Nie można usunąć mapy wartości"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
-msgstr "Nie można usunąć scenariusza web'owego"
+msgstr "Nie można usunąć scenariusza sieci www"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć akcji"
+msgstr[1] "Nie można wyłączyć akcji"
+msgstr[2] "Nie można wyłączyć akcji"
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć reguły wykrywania"
+msgstr[1] "Nie można wyłączyć reguł wykrywania"
+msgstr[2] "Nie można wyłączyć reguł wykrywania"
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć reguły wykrywania"
+msgstr[1] "Nie można wyłączyć reguł wykrywania"
+msgstr[2] "Nie można wyłączyć reguł wykrywania"
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć hosta"
+msgstr[1] "Nie można wyłączyć hostów"
+msgstr[2] "Nie można wyłączyć hostów"
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć prototypu hosta"
+msgstr[1] "Nie można wyłączyć prototypów hostów"
+msgstr[2] "Nie można wyłączyć prototypów hostów"
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć pozycji"
+msgstr[1] "Nie można wyłączyć pozycji"
+msgstr[2] "Nie można wyłączyć pozycji"
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć prototypu pozycji"
+msgstr[1] "Nie można wyłączyć prototypów pozycji"
+msgstr[2] "Nie można wyłączyć prototypów pozycji"
 
-#: media_types.php:174
-#, fuzzy
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Nie można wyłączyć typu mediów"
-msgstr[1] "Nie można wyłączyć typu mediów"
-msgstr[2] "Nie można wyłączyć typu mediów"
+msgstr[1] "Nie można wyłączyć typów mediów"
+msgstr[2] "Nie można wyłączyć typów mediów"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć wyzwalacza"
+msgstr[1] "Nie można wyłączyć wyzwalaczy"
+msgstr[2] "Nie można wyłączyć wyzwalaczy"
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć prototypu wyzwalacza"
+msgstr[1] "Nie można wyłączyć prototypów wyzwalacza"
+msgstr[2] "Nie można wyłączyć prototypów wyzwalacza"
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można wyłączyć grupy użytkowników"
+msgstr[1] "Nie można wyłączyć grup użytkowników"
+msgstr[2] "Nie można wyłączyć grup użytkowników"
 
-#: httpconf.php:340
-#, fuzzy
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
-msgstr[0] "Nie można wyłączyć scenariusza web'owego"
-msgstr[1] "Nie można wyłączyć scenariusza web'owego"
-msgstr[2] "Nie można wyłączyć scenariusza web'owego"
+msgstr[0] "Nie można wyłączyć scenariusza sieci www"
+msgstr[1] "Nie można wyłączyć scenariuszy sieci www"
+msgstr[2] "Nie można wyłączyć scenariuszy sieci www"
 
 #: queue.php:61
 msgid "Cannot display item queue."
-msgstr "Nie można wyświetlić kolejki elementów."
+msgstr "Nie można wyświetlić kolejki pozycji."
 
 #: chart7.php:78
 msgid "Cannot display more than one item with type \"Graph sum\"."
-msgstr ""
+msgstr "Nie można wyświetlić więcej niż jednej pozycji typu \"Suma wykresu\"."
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć akcji"
+msgstr[1] "Nie można włączyć akcji"
+msgstr[2] "Nie można włączyć akcji"
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć reguły wykrywania"
+msgstr[1] "Nie można włączyć reguł wykrywania"
+msgstr[2] "Nie można włączyć reguł wykrywania"
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć reguły wykrywania"
+msgstr[1] "Nie można włączyć reguł wykrywania"
+msgstr[2] "Nie można włączyć reguł wykrywania"
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć hosta"
+msgstr[1] "Nie można włączyć hostów"
+msgstr[2] "Nie można włączyć hostów"
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć prototypu hosta"
+msgstr[1] "Nie można włączyć prototypów hostów"
+msgstr[2] "Nie można włączyć prototypów hostów"
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć pozycji"
+msgstr[1] "Nie można włączyć pozycji"
+msgstr[2] "Nie można włączyć pozycji"
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć prototypu pozycji"
+msgstr[1] "Nie można włączyć prototypów pozycji"
+msgstr[2] "Nie można włączyć prototypów pozycji"
 
-#: media_types.php:173
-#, fuzzy
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Nie można włączyć typu mediów"
-msgstr[1] "Nie można włączyć typu mediów"
-msgstr[2] "Nie można włączyć typu mediów"
+msgstr[1] "Nie można włączyć typów mediów"
+msgstr[2] "Nie można włączyć typów mediów"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć wyzwalacza"
+msgstr[1] "Nie można włączyć wyzwalaczy"
+msgstr[2] "Nie można włączyć wyzwalaczy"
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć prototypu wyzwalacza"
+msgstr[1] "Nie można włączyć prototypów wyzwalacza"
+msgstr[2] "Nie można włączyć prototypów wyzwalacza"
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć grupy użytkowników"
+msgstr[1] "Nie można włączyć grup użytkowników"
+msgstr[2] "Nie można włączyć grup użytkowników"
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można włączyć scenariusza sieci www"
+msgstr[1] "Nie można włączyć scenariuszy sieci www"
+msgstr[2] "Nie można włączyć scenariuszy sieci www"
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
-msgstr ""
+msgstr "Nie można znaleźć obrazu tła \"%1$s\" użytego na mapie \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Nie można znaleźć wykresu \"%1$s\" użytego na ekranie \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Nie można znaleźć grupy \"%1$s\" użytej na mapie \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
-msgstr "Nie mogę znaleźć \"%1$s\" używaną w ekranie \"%2$s\"."
+msgstr "Nie można znaleźć grupy \"%1$s\" użytej na ekranie \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
-msgstr "Nie można znaleźć komputera \"%1$s\" użytego na mapie \"%2$s\"."
+msgstr "Nie można znaleźć hosta \"%1$s\" użytego na mapie \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
-msgstr "Nie można znaleźć komputera \"%1$s\" użytego na ekranie \"%2$s\"."
+msgstr "Nie można znaleźć hosta \"%1$s\" użytego na ekranie \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
-msgstr ""
+msgstr "Nie można znaleźć grupy hostów \"%1$s\" dla prototypu hosta \"%2$s\" dla reguły wykrywania \"%3$s\" w \"%4$s\"."
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Nie można znaleźć interfejsu hosta \"%1$s\" dla klucza pozycji \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Nie można znaleźć komputera ani szablonu\"%1$s\" użytego na wykresie \"%2$s\"."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2067,98 +2062,119 @@ msgstr "Nie można znaleźć ikony \"%1$s\" użytej na mapie \"%2$s\"."
 #: include/classes/import/importers/CMapImporter.php:180
 #, c-format
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
-msgstr "Nie można znaleźć zmapowania ikony \"%1$s\" użytej na mapie \"%2$s\"."
+msgstr "Nie można znaleźć mapy ikon \"%1$s\" użytej na mapie \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph \"%3$s\"."
-msgstr ""
+msgstr "Nie można znaleźć pozycji \"%1$s\" na \"%2$s\" użytej jako wartość MAX osi Y dla wykresu \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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 ""
+msgstr "Nie można znaleźć pozycji \"%1$s\" na \"%2$s\" użytej jako wartość MAX osi Y dla prototypu wykresu \"%3$s\" dla reguły wykrywania \"%4$s\" w \"%5$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph \"%3$s\"."
-msgstr ""
+msgstr "Nie można znaleźć pozycji \"%1$s\" na \"%2$s\" użytej jako wartość MIN osi Y dla wykresu \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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 ""
+msgstr "Nie można znaleźć pozycji \"%1$s\" na \"%2$s\" użytej jako wartość MIN osi Y dla prototypu wykresu \"%3$s\" dla reguły wykrywania \"%4$s\" w \"%5$s\"."
+
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr "Nie można znaleźć pozycji \"%1$s\" na \"%2$s\" użytej w wykresie \"%3$s\"."
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 "Nie można znaleźć pozycji \"%1$s\" na \"%2$s\" użytej w prototypie wykresu \"%3$s\" dla reguły wykrywania \"%4$s\" w \"%5$s\"."
 
-#: include/classes/import/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr "Nie można znaleźć pozycji \"%1$s\" na \"%2$s\" użytej w wyzwalaczu \"%3$s\"."
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr "Nie można znaleźć pozycji \"%1$s\" na \"%2$s\" użytej w prototypie wyzwalacza \"%3$s\" dla reguły wykrywania \"%4$s\" w \"%5$s\"."
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
-msgstr "Nie można znaleźć elementu \"%1$s\" użytego na ekranie \"%2$s\"."
+msgstr "Nie można znaleźć pozycji \"%1$s\" użytej na ekranie \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
-msgstr "Nie można znaleźć mapy \"%1$s\" użytej w wyeksportowanej mapie \"%2$s\"."
+msgstr "Nie można znaleźć mapy \"%1$s\" użytej na wyeksportowanej mapie \"%2$s\"."
 
 #: include/classes/import/importers/CMapImporter.php:201
 #, c-format
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
-msgstr ""
+msgstr "Nie można znaleźć mapy \"%1$s\" użytej na mapie \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
-msgstr ""
+msgstr "Nie można znaleźć mapy \"%1$s\" użytej na ekranie \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Nie można znaleźć obiektów o nazwie"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
-msgstr ""
+msgstr "Nie można znaleźć ekranu \"%1$s\" użytego na ekranie \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
-msgstr ""
+msgstr "Nie można znaleźć szablonu \"%1$s\" dla prototypu hosta \"%2$s\" dla reguły wykrywania \"%3$s\" w \"%4$s\"."
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
-msgstr ""
+msgstr "Nie można znaleźć wyzwalacza \"%1$s\" użytego na mapie \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
-msgstr ""
+msgstr "Nie można znaleźć mapy wartości \"%1$s\" użytej dla pozycji \"%2$s\" w \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
-msgstr ""
+msgstr "Nie można znaleźć mapy wartości \"%1$s\" użytej dla prototypu pozycji \"%2$s\" dla reguły wykrywania \"%3$s\" w \"%4$s\"."
 
 #: srv_status.php:169
 msgid "Cannot format Tree. Check logic structure in service links."
-msgstr ""
+msgstr "Nie można sformatować Drzewa. Sprawdź strukturę logiczną połączeń w usłudze."
 
 #: services.php:472
 msgid "Cannot format tree."
-msgstr ""
+msgstr "Nie można sformatować drzewa."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
-msgstr ""
+msgstr "Widoczna nazwa szablonu nie może być pusta."
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Nie można zwinąć wyrażenia \"%s\"."
@@ -2167,64 +2183,65 @@ msgstr "Nie można zwinąć wyrażenia \"%s\"."
 #, c-format
 msgid "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
 msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nie można zaimportować ekranu \"%1$s\", nie istnieje podłączony ekran \"%2$s\"."
+msgstr[1] "Nie można zaimportować ekranu \"%1$s\", nie istnieją podłączone ekrany \"%2$s\"."
+msgstr[2] "Nie można zaimportować ekranu \"%1$s\", nie istnieją podłączone ekrany \"%2$s\"."
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
-msgstr[0] "Nie można zaimportować szablonu \"%1$s\", podłączony szablon \"%2$s\" nie istnieje."
-msgstr[1] "Nie można zaimportować szablonu \"%1$s\", podłączone szablony \"%2$s\" nie istnieją."
-msgstr[2] "Nie można zaimportować szablonu \"%1$s\", podłączone szablony \"%2$s\" nie istnieją."
+msgstr[0] "Nie można zaimportować szablonu \"%1$s\", nie istnieje podłączony szablon \"%2$s\"."
+msgstr[1] "Nie można zaimportować szablonu \"%1$s\", nie istnieją podłączone szablony \"%2$s\"."
+msgstr[2] "Nie można zaimportować szablonu \"%1$s\", nie istnieją podłączone szablony \"%2$s\"."
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Nie można zawrzeć pliku widoku \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
-msgstr ""
+msgstr "Nie można dodać wyrażenia wyzwalacza"
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Nie można dodać mediów użytkownika."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Nie można połączyć szablonu"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
-msgstr ""
+msgstr "Nie można połączyć szablonu."
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
-msgstr ""
+msgstr "Nie można zalogować."
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Nie można się wylogować."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Nie można masowo zmienić nazwy hosta."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
-msgstr ""
+msgstr "Nie można zaktualizować masowo nazw szablonów."
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Nie można masowo zmienić widocznej nazwy hosta."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
-msgstr ""
+msgstr "Nie można zaktualizować masowo widocznych nazw szablonów."
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Nie można przekazać zduplikowanych identyfikatorów szablonów do połączenia: %s."
@@ -2244,32 +2261,32 @@ msgstr "Nie można wykonać zapytania UPDATE na tabeli \"%1$s\" bez podania wart
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Nie można wykonać zapytania UPDATE na tabeli \"%1$s\" bez warunku WHERE."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
-msgstr "Nie można przetworzyć aplikacji z różnych komputerów lub szablonów."
+msgstr "Nie można przetworzyć aplikacji z różnych hostów lub szablonów."
 
 #: include/classes/server/CZabbixServer.php:221
 #, c-format
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Nie można odczytać odpowiedzi, sprawdź połączenie z serwerem Zabbix'a \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
-msgstr "Nie można usuną wszystkich elementów, co najmniej jeden powinien pozostać."
+msgstr "Nie można usunąć wszystkich pozycji, co najmniej jedna powinna pozostać."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
-msgstr ""
+msgstr "Nie można usunąć grupy."
 
 #: adm.macros.php:104
 msgid "Cannot remove macro."
 msgstr "Nie można usunąć makra."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Nie można zmienić nazwy użytkownikowi - gościowi."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Nie można zapisać reguły wykrywania bez testów."
 
@@ -2278,217 +2295,226 @@ msgstr "Nie można zapisać reguły wykrywania bez testów."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Nie można wydać polecenia, sprawdź połączenie z serwerem Zabbix'a \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
-msgstr "Nie można ustawić \"%1$s\" dla elementu \"%2$s\"."
+msgstr "Nie można ustawić \"%1$s\" dla pozycji \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Nie można ustawić \"%1$s\" dla wyzwalacza \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Nie można ustawić \"templateid\" dla aplikacji \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Nie można ustawić \"templateid\" dla ekranu \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
-msgstr ""
+msgstr "Nie można ustawić \"templateid\" dla prototypu wyzwalacza \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
-msgstr ""
+msgstr "Nie można ustawić pól inwentarza dla wyłączonego inwentarza."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
-msgstr ""
+msgstr "Nie można przełączyć hosta dla interfejsu."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
-msgstr "Nie można odblokować użytkownika"
+msgstr "Nie można odblokować użytkowników"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
-msgstr ""
+msgstr "Nie można odłączyć i wyczyścić Scenariuszy sieci www."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
-msgstr ""
+msgstr "Nie można odłączyć i wyczyścić aplikacji."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Nie można odłączyć i wyczyścić reguł wykrywania"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Nie można odłączyć i wyczyścić prototypów wykresów"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Nie można odłączyć i wyczyścić wykresów."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
-msgstr "Nie można odłączyć i wyczyścić prototypów elementów"
+msgstr "Nie można odłączyć i wyczyścić prototypów pozycji"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
-msgstr "Nie można odłączyć i wyczyścić elementów"
+msgstr "Nie można odłączyć i wyczyścić pozycji"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Nie można odłączyć i wyczyścić wyzwalaczy"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
-msgstr "Nie mogę odłączyć szablonu"
+msgstr "Nie można odłączyć szablonu"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
-msgstr ""
+msgstr "Nie można odłączyć szablonu."
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Nie można odłączyć wyzwalacza \"%s\", ponieważ zawiera pozycje z szablonów, które pozostały dołączone do hosta."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
-msgstr ""
+msgstr "Nie można zaktualizować \"%1$s\" dla wykrytego hosta."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
-msgstr ""
+msgstr "Nie można zaktualizować \"%1$s\" dla wykrytej pozycji."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
-msgstr "Nie można zaktualizować \"%1$s\" dla spenetrowanego wyzwalacza."
+msgstr "Nie można zaktualizować \"%1$s\" dla wykrytego wyzwalacza."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
-msgstr ""
+msgstr "Nie można zaktualizować \"%1$s\" dla akcji \"%2$s\"."
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
-msgstr "Nie można zaktualizować \"%1$s\" dla elementu \"%2$s\"."
+msgstr "Nie można zaktualizować \"%1$s\" dla pozycji \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Nie można zaktualizować \"%1$s\" dla wyzwalacza \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr "Nie można zaktualizować \"imagetype\" dla obrazu \"%1$s\"."
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Nie można zaktualizować \"templateid\" dla aplikacji \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Nie można zaktualizować \"templateid\" dla wykresu \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Nie można zaktualizować \"templateid\" dla prototypu wykresu \"%1$s\"."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Nie można zaktualizować \"templateid\" dla ekranu \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
-msgstr ""
+msgstr "Nie można zaktualizować \"templateid\" dla ekranu szablonu \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Nie można zaktualizować \"templateid\" dla prototypu wyzwalacza \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Nie można zaktualizować wykrytego wykresu."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
-msgstr ""
+msgstr "Nie można zaktualizować grupy wykrytych hostów."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
-msgstr "Nie można uaktualnić akcji"
+msgstr "Nie można zaktualizować akcji"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
-msgstr "Nie można uaktualnić aplikacji"
-
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Nie można uaktualnić komentarza"
+msgstr "Nie można zaktualizować aplikacji"
 
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
-msgstr "Nie można uaktualnić konfiguracji"
+msgstr "Nie można zaktualizować konfiguracji"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
-msgstr "Nie można uaktualnić trybu debugowania"
+msgstr "Nie można zaktualizować trybu debugowania"
+
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr "Nie można zaktualizować opisu"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
-msgstr "Nie można uaktualnić reguły wykrycia"
+msgstr "Nie można zaktualizować reguły wykrywania"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Nie można zaktualizować dostępu do interfejsu"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
-msgstr "Nie można uaktualnić wykresu"
+msgstr "Nie można zaktualizować wykresu"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
-msgstr ""
+msgstr "Nie można zaktualizować prototypu wykresu"
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
-msgstr "Nie można uaktualnić grupy"
+msgstr "Nie można zaktualizować grupy"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Nie można zaktualizować grupy."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
-msgstr ""
+msgstr "Nie można zaktualizować grup dla wykrytego hosta \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
-msgstr "Nie można uaktualnić hosta"
+msgstr "Nie można zaktualizować hosta"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
-msgstr ""
+msgstr "Nie można zaktualizować prototypu hosta"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Nie można zaktualizować hostów"
 
@@ -2498,47 +2524,47 @@ msgstr "Nie można zaktualizować mapy ikon"
 
 #: adm.images.php:58
 msgid "Cannot update image"
-msgstr "Nie można uaktualnić obrazu"
+msgstr "Nie można zaktualizować obrazu"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
-msgstr ""
+msgstr "Nie można zaktualizować obrazu."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
-msgstr ""
+msgstr "Nie można zaktualizować interfejsu na wykrytym hoście \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
-msgstr "Nie można uaktualnić elementu"
+msgstr "Nie można zaktualizować pozycji"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
-msgstr ""
+msgstr "Nie można zaktualizować prototypu pozycji"
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
-msgstr "Nie można uaktualnić pozycji"
+msgstr "Nie można zaktualizować pozycji"
 
 #: adm.macros.php:93
 msgid "Cannot update macro."
-msgstr ""
+msgstr "Nie można zaktualizować makra."
 
 #: adm.macros.php:147
 msgid "Cannot update macros"
 msgstr "Nie można zaktualizować makr"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Nie można zaktualizować okresu utrzymania"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Nie można zaktualizować mapy \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Nie można zaktualizować typu mediów"
 
@@ -2546,89 +2572,86 @@ msgstr "Nie można zaktualizować typu mediów"
 msgid "Cannot update network map"
 msgstr "Nie można zaktualizować mapy sieci"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
-msgstr "Nie można uaktualnić proxy"
+msgstr "Nie można zaktualizować proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
-msgstr ""
+msgstr "Nie można zaktualizować proxy na wykrytym hoście \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Nie można zaktualizować wyrażenia regularnego"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
-msgstr "Nie można uaktualnić ekranu"
+msgstr "Nie można zaktualizować ekranu"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
-msgstr "Nie można uaktualnić skryptu"
+msgstr "Nie można zaktualizować skryptu"
 
 #: services.php:155
 msgid "Cannot update service"
-msgstr "Nie można uaktualnić usługi"
+msgstr "Nie można zaktualizować usługi"
 
 #: slideconf.php:100
 msgid "Cannot update slide show"
-msgstr "Nie można uaktualnić pokazu slajdów"
+msgstr "Nie można zaktualizować pokazu slajdów"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Nie można zaktualizować szablonu"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
-msgstr ""
+msgstr "Nie można zaktualizować aplikacji użytych jako szablony."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
-msgstr "Nie można zaktualizować szablonów na wykrytym komputerze \"%1$s\"."
+msgstr "Nie można zaktualizować szablonów na wykrytym hoście \"%1$s\"."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
-msgstr "Nie można uaktualnić wyzwalacza"
+msgstr "Nie można zaktualizować wyzwalacza"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
-msgstr ""
+msgstr "Nie można zaktualizować prototypu wyzwalacza"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
-msgstr ""
+msgstr "Nie można zaktualizować prototypów wyzwalaczy"
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
-msgstr "Nie można uaktualnić użytkownika"
+msgstr "Nie można zaktualizować użytkownika"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Nie można zaktualizować mediów użytkownika."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
-msgstr "Nie można uaktualnić użytkownika. Oba hasła muszą być identyczne."
+msgstr "Nie można zaktualizować użytkownika. Oba hasła muszą być identyczne."
 
 #: adm.valuemapping.php:64
 msgid "Cannot update value map"
-msgstr "Nie można uaktualnić mapy wartości"
+msgstr "Nie można zaktualizować mapy wartości"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
-msgstr "Nie można zaktualizować scenariusza web'owego"
+msgstr "Nie można zaktualizować scenariusza sieci www"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
-msgstr ""
+msgstr "Nie można skontrolować testów wykrywania: błędne zapytanie lub błąd połączenia z serwerem Zabbix."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Podpis"
 
@@ -2637,185 +2660,186 @@ msgstr "Podpis"
 msgid "Case sensitive"
 msgstr "Rozróżnianie wielkości liter"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
-msgstr ""
+msgstr "Wyłapuje wszystkie pułapki SNMP z adresów zgodnych z wyrażeniem regularnym. Domyślnie wyrażenie jest puste."
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
-msgstr ""
+msgstr "Wyłapuje wszystkie pułapki SNMP, które nie zostały wyłapane przez żadną z pozycji snmptrap[] z adresów interfejsu."
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
-msgstr "Wyrównanie do środka"
+msgstr "W środku"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Zmień"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
-msgstr ""
+msgstr "Zmiana"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Zmień hasło"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Znak"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Zawiera podany ciąg znaków"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Nie zawiera podanego ciągu znaków"
 
 #: include/hosts.inc.php:240
 msgid "Chassis"
-msgstr "Rama"
+msgstr "Obudowa"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
-msgstr ""
+msgstr "Informacje o obudowie - domyślnie zwraca wszystkie informacje"
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Test już istnieje."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Proszę sprawdzić część wyrażenia zaczynającą się od \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
-msgstr ""
+msgstr "Sprawdź czy plik istnieje. 0 - plik nie istnieje, 1 - plik istnieje"
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
-msgstr ""
+msgstr "Sprawdź czy usługa jest dostępna. 0 - usługa nie działa, 1 - usługa działa. Jeżeli <ip> jest puste, użyte zostanie IP lub nazwa DNS z definicji hosta. Jeżeli <port> jest pusty, użyty zostanie domyślny port usługi."
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
-msgstr ""
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+msgstr "Sprawdź, czy serwis jest dostępny. 0 - serwis nie działa, 1 - serwis działa. Jeżeli IP jest puste, przyjęte będzie 127.0.0.1. Jeżeli port jest pusty, użyty zostanie domyślny port serwisu. Przykład: net.tcp.service[ftp,,45]."
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
-msgstr ""
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
+msgstr "Sprawdź wydajność serwisu \"service\". 0 - serwis nie działa, sekundy - liczba sekund do podłączenia do serwisu. Jeżeli IP jest puste, przyjęte będzie 127.0.0.1. Jeżeli port jest pusty, użyty zostanie domyślny port serwisu."
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
-msgstr ""
+msgstr "Sprawdź wydajność usługi. 0 - usługa nie działa, sek - liczba sekund zużyta na połączenie do usługi. Jeżeli <ip> jest puste, użyte zostanie IP lub nazwa DNS z definicji hosta. Jeżeli <port> jest pusty, użyty zostanie domyślny port usługi."
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
-msgstr ""
+msgstr "Sprawdź użyteczność agenta. Zawsze zwraca 1. Może być użyte jako ping TCP."
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Proszę, sprawdź klucz. Wartość domyślna została podana."
 
 #: include/views/js/configuration.discovery.edit.js.php:29
 msgid "Check type"
-msgstr "Rodzaj testu"
+msgstr "Typ testu"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
-msgstr ""
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+msgstr "Sprawdź, czy możliwe jest połączenie TCP na numer portu. 0 - nie można się połączyć, 1 - można się połączyć. Adres IP jest opcjonalny. Jeżeli IP jest puste, przyjęte będzie 127.0.0.1. Przykład: net.tcp.port[,80]"
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Testy"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
-msgstr ""
+msgstr "Sprawdź czy usługa DNS działa. 0 - DNS nie działa (serwer nie odpowiada lub nie powiodło się rozwiązanie nazw DNS), 1 - DNS działa."
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
-msgstr ""
+msgstr "Sprawdź czy serwer jest dostępny dla pingów ICMP. 0 - pingi ICMP nie działają, 1 - pingi ICMP działają. Jeden z procesów zabbix_server wykonuje pingi ICMP raz na PingerFrequency sekund."
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
-msgstr ""
+msgstr "Sprawdź czy ten port jest w stanie NASŁUCHU. 0 - nie jest, 1 - jest w stanie NASŁUCHU."
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Testy powinny być unikalne."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chiński (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
-msgstr ""
+msgstr "Chiński (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
-msgstr "Nie można utworzyć zapętlonego powiązania dla elementu mapy \"%s\"."
+msgstr "Nie można utworzyć cyklicznego powiązania dla elementu mapy \"%s\"."
 
 #: include/classes/import/importers/CMapImporter.php:89
 #, c-format
 msgid "Circular reference in maps: %1$s."
-msgstr ""
+msgstr "Cykliczne odwołanie w mapach: %1$s."
 
 #: include/classes/import/importers/CScreenImporter.php:104
 #, c-format
 msgid "Circular reference in screens: %1$s."
-msgstr ""
+msgstr "Cykliczne odwołanie w ekranach: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
-msgstr ""
+msgstr "Cykliczne odwołanie w szablonach: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
-msgstr ""
+msgstr "Cykliczne połączenia szablonów są zabronione."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
-msgstr ""
+msgstr "Klasyczny"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Wyczyść historię i trendy"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Wyczyść historię wybranych elementów"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Wyczyść podczas odłączania"
 
@@ -2825,69 +2849,69 @@ msgstr "Zegar"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Powiel"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Zamknij"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Zamknij generator wyrażeń"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Kolor"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
-msgstr ""
+msgstr "Kolor \"%1$s\" jest nieprawidłowy: oczekiwano heksadecymalnego kodu koloru (6 znaków)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Kolor (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
-msgstr ""
+msgstr "Dodano kolumnę"
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
-msgstr ""
+msgstr "usunięto kolumnę"
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Rozpiętość kolumn"
 
@@ -2902,49 +2926,39 @@ msgstr "Połączony wynik"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Polecenie"
 
 #: tr_events.php:132
 msgid "Command actions"
-msgstr "Działania polecenia"
+msgstr "Akcje polecenia"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Polecenie nie może być puste."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Polecenia"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Uaktualniono komentarz"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Komentarze"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Komercyjne"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Porównanie wartości dla wielu przedziałów czasowych"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Układanie uprawnień"
 
@@ -2952,39 +2966,49 @@ msgstr "Układanie uprawnień"
 msgid "Condition"
 msgstr "Warunek"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr "Warunek \"%2$s\" nie został użyty w formule \"%3$s\" dla akcji \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Warunek \"%2$s\" nie został użyty w formule \"%3$s\" dla reguły wyszukiwania \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr "Warunek \"%2$s\" użyty w formule \"%3$s\" dla akcji \"%1$s\" nie został zdefiniowany."
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
-msgstr ""
+msgstr "Warunek \"%2$s\" użyty w formule \"%3$s\" dla reguły wyszukiwania \"%1$s\" nie jest zdefiniowany."
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Warunki"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
-msgstr ""
+msgstr "Statystyki cache'a konfiguracji. Cache - bufor (tryby: pfree, total, used, free)."
 
 #: conf.import.php:25
 msgid "Configuration import"
-msgstr ""
+msgstr "Import konfiguracji"
 
 #: adm.gui.php:24
 msgid "Configuration of GUI"
-msgstr ""
+msgstr "Konfiguracja interfejsu użytkownika"
 
 #: services.php:27
 msgid "Configuration of IT services"
@@ -2992,27 +3016,27 @@ msgstr "Konfiguracja usług IT"
 
 #: include/audit.inc.php:25
 msgid "Configuration of Zabbix"
-msgstr "Konfiguracja ZABBIXA"
+msgstr "Konfiguracja Zabbixa"
 
 #: actionconf.php:27
 msgid "Configuration of actions"
-msgstr "Konfiguracja działań"
+msgstr "Konfiguracja akcji"
 
 #: applications.php:26
 msgid "Configuration of applications"
-msgstr ""
+msgstr "Konfiguracja aplikacji"
 
 #: authentication.php:24
 msgid "Configuration of authentication"
-msgstr ""
+msgstr "Konfiguracja uwierzytelniania"
 
 #: discoveryconf.php:26 host_discovery.php:27
 msgid "Configuration of discovery rules"
-msgstr ""
+msgstr "Konfiguracja reguł wykrywania"
 
 #: graphs.php:27
 msgid "Configuration of graph prototypes"
-msgstr ""
+msgstr "Konfiguracja prototypów wykresów"
 
 #: graphs.php:27
 msgid "Configuration of graphs"
@@ -3020,47 +3044,47 @@ msgstr "Konfiguracja wykresów"
 
 #: hostgroups.php:25
 msgid "Configuration of host groups"
-msgstr ""
+msgstr "Konfiguracja grup hostów"
 
 #: host_prototypes.php:27
 msgid "Configuration of host prototypes"
-msgstr ""
+msgstr "Konfiguracja prototypów hostów"
 
 #: hosts.php:32
 msgid "Configuration of hosts"
-msgstr ""
+msgstr "Konfiguracja hostów"
 
 #: adm.housekeeper.php:24
 msgid "Configuration of housekeeping"
-msgstr ""
+msgstr "Konfiguracja porządkowania"
 
 #: adm.iconmapping.php:24
 msgid "Configuration of icon mapping"
-msgstr ""
+msgstr "Konfiguracja mapowania ikon"
 
 #: adm.images.php:25
 msgid "Configuration of images"
-msgstr ""
+msgstr "Konfiguracja obrazów"
 
 #: disc_prototypes.php:27
 msgid "Configuration of item prototypes"
-msgstr ""
+msgstr "Konfiguracja prototypów pozycji"
 
 #: items.php:27
 msgid "Configuration of items"
-msgstr "Konfiguracja elementów"
+msgstr "Konfiguracja pozycji"
 
 #: adm.macros.php:24
 msgid "Configuration of macros"
-msgstr ""
+msgstr "Konfiguracja makr"
 
 #: maintenance.php:27
 msgid "Configuration of maintenance periods"
-msgstr ""
+msgstr "Konfiguracja okresów utrzymania"
 
 #: media_types.php:26
 msgid "Configuration of media types"
-msgstr ""
+msgstr "Konfiguracja typów mediów"
 
 #: sysmap.php:26 sysmaps.php:34
 msgid "Configuration of network maps"
@@ -3068,11 +3092,11 @@ msgstr "Konfiguracja map sieci"
 
 #: proxies.php:25
 msgid "Configuration of proxies"
-msgstr ""
+msgstr "Konfiguracja proxy"
 
 #: adm.regexps.php:26
 msgid "Configuration of regular expressions"
-msgstr ""
+msgstr "Konfiguracja wyrażeń regularnych"
 
 #: screenconf.php:38 screenedit.php:27
 msgid "Configuration of screens"
@@ -3080,7 +3104,7 @@ msgstr "Konfiguracja ekranów"
 
 #: scripts.php:24
 msgid "Configuration of scripts"
-msgstr ""
+msgstr "Konfiguracja skryptów"
 
 #: slideconf.php:25
 msgid "Configuration of slide shows"
@@ -3088,19 +3112,19 @@ msgstr "Konfiguracja pokazów slajdów"
 
 #: templates.php:38
 msgid "Configuration of templates"
-msgstr ""
+msgstr "Konfiguracja szablonów"
 
 #: adm.triggerdisplayoptions.php:24
 msgid "Configuration of trigger displaying options"
-msgstr ""
+msgstr "Konfiguracja opcji wyświetlania wyzwalaczy"
 
 #: trigger_prototypes.php:27
 msgid "Configuration of trigger prototypes"
-msgstr ""
+msgstr "Konfiguracja prototypów wyzwalaczy"
 
 #: adm.triggerseverities.php:24
 msgid "Configuration of trigger severities"
-msgstr ""
+msgstr "Konfiguracja poziomów wyzwalaczy"
 
 #: triggers.php:27
 msgid "Configuration of triggers"
@@ -3108,23 +3132,23 @@ msgstr "Konfiguracja wyzwalaczy"
 
 #: usergrps.php:29
 msgid "Configuration of user groups"
-msgstr ""
+msgstr "Konfiguracja grup użytkowników"
 
 #: users.php:29
 msgid "Configuration of users"
-msgstr ""
+msgstr "Konfiguracja użytkowników"
 
 #: adm.valuemapping.php:24
 msgid "Configuration of value mapping"
-msgstr ""
+msgstr "Konfiguracja mapowań wartości"
 
 #: httpconf.php:27
 msgid "Configuration of web monitoring"
-msgstr ""
+msgstr "Konfiguracja monitoringu www"
 
 #: adm.workingtime.php:24
 msgid "Configuration of working time"
-msgstr ""
+msgstr "Konfiguracja czasu pracy"
 
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
@@ -3138,23 +3162,23 @@ msgstr "Zaktualizowano konfigurację"
 msgid "Configure (Filter %s)"
 msgstr "Konfiguruj (Filtr %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Tekst potwierdzenia"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Połącz z"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Połączony jako \"%1$s\""
@@ -3162,7 +3186,7 @@ msgstr "Połączony jako \"%1$s\""
 #: include/classes/server/CZabbixServer.php:207
 #, c-format
 msgid "Connection timeout of %1$s seconds exceeded when connecting to Zabbix server \"%2$s\"."
-msgstr ""
+msgstr "Podczas próby połączenia do serwera Zabbix \"%2$s\" przekroczono maksymalny czas połączenia %1$s sekund."
 
 #: include/classes/server/CZabbixServer.php:282
 #, c-format
@@ -3171,6 +3195,9 @@ msgid ""
 "1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
 "2. Incorrect DNS server configuration.\n"
 msgstr ""
+"Nie udało się połączenie do serwera Zabbix \"%s\". Możliwe przyczyny:\n"
+"1. Błędne IP/DNS serwera w \"zabbix.conf.php\";\n"
+"2. Błędna konfiguracja serwera DNS.\n"
 
 #: include/classes/server/CZabbixServer.php:270
 #, c-format
@@ -3181,6 +3208,11 @@ msgid ""
 "3. Zabbix server daemon not running;\n"
 "4. Firewall is blocking TCP connection.\n"
 msgstr ""
+"Odmowa połączenia do serwera Zabbix \"%s\". Możliwe przyczyny:\n"
+"1. Błędne IP/DNS serwera w \"zabbix.conf.php\";\n"
+"2. Usługa środowiska (np. SELinux) blokuje połączenie;\n"
+"3. Serwer Zabbix nie został działa;\n"
+"4. Zapora blokuje połączenia TCP.\n"
 
 #: include/classes/server/CZabbixServer.php:278
 #, c-format
@@ -3189,6 +3221,9 @@ msgid ""
 "1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
 "2. Firewall is blocking TCP connection.\n"
 msgstr ""
+"Przekroczenie czasu połączenia do serwera Zabbix \"%s\". Możliwe przyczyny:\n"
+"1. Błędne IP/DNS serwera w \"zabbix.conf.php\";\n"
+"4. Zapora blokuje połączenia TCP.\n"
 
 #: include/hosts.inc.php:215
 msgid "Contact"
@@ -3199,43 +3234,51 @@ msgstr "Kontakt"
 #: include/views/configuration.item.massupdate.php:105
 #: include/views/js/configuration.discovery.edit.js.php:50
 msgid "Context name"
-msgstr ""
+msgstr "Nazwa kontekstu"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
-msgstr ""
+msgstr "Przełączniki kontekstu."
 
 #: include/hosts.inc.php:260
 msgid "Contract number"
 msgstr "Numer kontraktu"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
-msgstr ""
+msgstr "Współrzędne"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] "Kopiuj %1$s element do..."
+msgstr[1] "Kopiuj %1$s elementy do..."
+msgstr[2] "Kopiuj %1$s elementów do..."
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Kopiuj wybrane do …"
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
-msgstr ""
+msgstr "Poprawne logowanie \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Nie można zapisać obrazu!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
-msgstr "Zliczenie"
+msgstr "Ilość"
 
 #: include/views/configuration.slideconf.list.php:42
 msgid "Count of slides"
@@ -3247,16 +3290,20 @@ msgstr "Utwórz akcję"
 
 #: include/views/configuration.application.list.php:35
 msgid "Create application"
-msgstr "Utwórz program"
+msgstr "Utwórz aplikację"
 
 #: include/views/configuration.application.list.php:30
 msgid "Create application (select host first)"
-msgstr ""
+msgstr "Utwórz aplikację (najpierw wybierz host)"
+
+#: adm.images.php:151
+msgid "Create background"
+msgstr "Utwórz tło"
 
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
-msgstr ""
+msgstr "Utwórz regułę wykrywania"
 
 #: include/views/configuration.graph.list.php:42
 msgid "Create graph"
@@ -3264,44 +3311,44 @@ msgstr "Utwórz wykres"
 
 #: include/views/configuration.graph.list.php:45
 msgid "Create graph (select host first)"
-msgstr ""
+msgstr "Utwórz wykres (najpierw wybierz host)"
 
 #: include/views/configuration.graph.list.php:29
 msgid "Create graph prototype"
-msgstr ""
+msgstr "Utwórz prototyp wykresu"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
-msgstr ""
+msgstr "Utwórz host"
 
 #: include/views/configuration.hostgroups.list.php:28
 #: include/views/configuration.hostgroups.list.php:31
 msgid "Create host group"
-msgstr ""
+msgstr "Utwórz grupę hostów"
 
 #: include/views/configuration.host.prototype.list.php:30
 msgid "Create host prototype"
-msgstr ""
+msgstr "Utwórz prototyp hosta"
+
+#: adm.images.php:151
+msgid "Create icon"
+msgstr "Utwórz ikonę"
 
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Utwórz mapę ikon"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Utwórz obraz"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Utwórz pozycję"
 
 #: include/views/configuration.item.list.php:31
 msgid "Create item (select host first)"
-msgstr ""
+msgstr "Utwórz pozycję (najpierw wybierz host)"
 
 #: include/views/configuration.item.prototype.list.php:28
 msgid "Create item prototype"
-msgstr ""
+msgstr "Utwórz prototyp pozycji"
 
 #: include/views/configuration.maintenance.list.php:27
 msgid "Create maintenance period"
@@ -3315,6 +3362,10 @@ msgstr "Utwórz mapę"
 msgid "Create media type"
 msgstr "Utwórz typ mediów"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr "Utwórz nowy"
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Utwórz proxy"
@@ -3325,7 +3376,7 @@ msgstr "Utwórz scenariusz"
 
 #: include/views/configuration.httpconf.list.php:29
 msgid "Create scenario (select host first)"
-msgstr ""
+msgstr "Utwórz scenariusz (najpierw wybierz host)"
 
 #: include/views/configuration.screen.list.php:27
 msgid "Create screen"
@@ -3339,21 +3390,21 @@ msgstr "Utwórz skrypt"
 msgid "Create slide show"
 msgstr "Utwórz pokaz slajdów"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
-msgstr ""
+msgstr "Utwórz szablon"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Utwórz wyzwalacz"
 
 #: include/views/configuration.triggers.list.php:46
 msgid "Create trigger (select host first)"
-msgstr ""
+msgstr "Utwórz wyzwalacz (najpierw wybierz host)"
 
 #: include/views/configuration.triggers.list.php:40
 msgid "Create trigger prototype"
-msgstr ""
+msgstr "Utwórz prototyp wyzwalacza"
 
 #: include/views/administration.users.list.php:30
 msgid "Create user"
@@ -3361,105 +3412,106 @@ msgstr "Utwórz użytkownika"
 
 #: include/views/administration.usergroups.list.php:30
 msgid "Create user group"
-msgstr ""
+msgstr "Utwórz grupę użytkowników"
 
 #: adm.valuemapping.php:143
 msgid "Create value map"
 msgstr "Utwórz mapę wartości"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
-msgstr "Utworzono: Program \"%1$s\" w \"%2$s\"."
+msgstr "Utworzono: Aplikacja \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Utworzono: Reguła wykrywania \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Utworzono: Prototyp hosta \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Utworzono: Pozycja \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Utworzono: Prototyp pozycji \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Utworzono: Wyzwalacz \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Utworzono: Prototyp wyzwalacza \"%1$s\" w \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Utworzono: Scenariusz sieci www \"%1$s\" w \"%2$s\"."
 
 #: include/items.inc.php:41
 msgid "Critical"
-msgstr ""
+msgstr "Krytyczny"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
-msgstr ""
+msgstr "Bieżący system operacyjny - domyślnie zwraca wszystkie informacje"
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
-msgstr ""
+msgstr "Bieżąca data jest < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
-msgstr ""
+msgstr "Bieżąca data jest = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
-msgstr ""
+msgstr "Bieżąca data jest > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
-msgstr ""
+msgstr "Bieżąca data NIE jest = N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Bieżący host"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
-msgstr ""
+msgstr "Bieżący czas jest < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
-msgstr ""
+msgstr "Bieżący czas jest = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
-msgstr ""
+msgstr "Bieżący czas jest > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
-msgstr ""
+msgstr "Bieżący czas NIE jest = N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Bieżąca wartość"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
-msgstr ""
+msgstr "Wyrażenie użytkownika"
 
 #: charts.php:26
 msgid "Custom graphs"
@@ -3467,12 +3519,12 @@ msgstr "Wykresy własne"
 
 #: include/maps.inc.php:50
 msgid "Custom label"
-msgstr "Niestandardowa etykieta"
+msgstr "Własna etykieta"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
-msgstr "Niestandardowa etykieta dla mapy \"%2$s\" elementy o typie \"%1$s\" nie mogą być puste."
+msgstr "Własna etykieta dla elementu mapy \"%2$s\" typu \"%1$s\" nie może być pusta."
 
 #: disc_prototypes.php:108 include/views/configuration.item.massupdate.php:300
 #: items.php:115
@@ -3483,9 +3535,9 @@ msgstr "Własny mnożnik"
 msgid "Custom screens"
 msgstr "Własne ekrany"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
-msgstr "Niestandardowy skrypt"
+msgstr "Własny skrypt"
 
 #: include/views/administration.general.triggerSeverity.edit.php:26
 msgid "Custom severity"
@@ -3497,61 +3549,57 @@ msgstr "Własne nazwy poziomów dotyczą wszystkich tłumaczeń i wymagają ręc
 
 #: include/views/js/configuration.sysmaps.js.php:45
 msgid "Custom size"
-msgstr "Niestandardowy rozmiar"
+msgstr "Własny rozmiar"
 
 #: slides.php:27
 msgid "Custom slides"
 msgstr "Własne slajdy"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Czeski (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
-msgstr "Konfiguracja tablicy"
+msgstr "KONFIGURACJA TABLICY"
 
 #: include/views/configuration.host.discovery.edit.php:142
 #: include/views/configuration.item.edit.php:148
 #: include/views/configuration.item.massupdate.php:170
 #: include/views/js/configuration.discovery.edit.js.php:95
 msgid "DES"
-msgstr ""
+msgstr "DES"
 
 #: httpdetails.php:116
 msgid "DETAILS OF SCENARIO"
 msgstr "SZCZEGÓŁY SCENARIUSZA"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "WYŁĄCZONE"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "WYKRYTY"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3559,25 +3607,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Nazwa DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
-msgstr "DÓŁ"
+msgstr "NIE DZIAŁA"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Dziennie"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Ciemny pomarańcz"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Ciemniejsza"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Tablica"
 
@@ -3589,24 +3637,25 @@ msgstr "Konfiguracja tablicy"
 msgid "Dashboard filter"
 msgstr "Filtr tablicy"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Linia przerywana"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Dane"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
-msgstr ""
+msgstr "Statystyki cache'a danych. Cache - jedna z wartości (tryby: all, float, uint, str, log, text), historia (tryby: pfree, total, used, free), trend (tryby: pfree, total, used, free), tekst (tryby: pfree, total, used, free)."
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
-msgstr ""
+msgstr "Dane z %1$s. Wygenerowano w %2$s sek."
 
 #: include/screens.inc.php:29
 msgid "Data overview"
@@ -3618,18 +3667,19 @@ msgstr "Przegląd danych"
 #: include/views/administration.general.housekeeper.edit.php:136
 #: include/views/administration.general.housekeeper.edit.php:157
 msgid "Data storage period (in days)"
-msgstr ""
+msgstr "Okres przechowywania danych (w dniach)"
 
 #: include/forms.inc.php:435 include/views/configuration.item.edit.php:228
 #: include/views/configuration.item.massupdate.php:227
 msgid "Data type"
 msgstr "Typ danych"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Plik bazy danych"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Host bazy danych"
 
@@ -3637,35 +3687,39 @@ msgstr "Host bazy danych"
 msgid "Database monitor"
 msgstr "Monitor bazy danych"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Hasło bazy danych"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Port bazy danych"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Schemat bazy danych"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Serwer bazy danych"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Typ bazy danych"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Data"
 
@@ -3675,7 +3729,7 @@ msgstr "Data wycofania sprzętu z użytku"
 
 #: include/hosts.inc.php:325
 msgid "Date HW installed"
-msgstr "Data montażu sprzętu"
+msgstr "Data instalacji sprzętu"
 
 #: include/hosts.inc.php:330
 msgid "Date HW maintenance expires"
@@ -3685,53 +3739,52 @@ msgstr "Data zakończenia umowy serwisowej"
 msgid "Date HW purchased"
 msgstr "Data zakupu sprzętu"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Dzień"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Dzień miesiąca"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
-msgstr ""
+msgstr "Dzień miesiąca jest < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
-msgstr ""
+msgstr "Dzień miesiąca jest = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
-msgstr ""
+msgstr "Dzień miesiąca jest > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
-msgstr ""
+msgstr "Dzień miesiąca NIE jest = N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Dzień tygodnia"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
-msgstr ""
+msgstr "Dzień tygodnia jest < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
-msgstr ""
+msgstr "Dzień tygodnia jest = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
-msgstr ""
+msgstr "Dzień tygodnia jest > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
-msgstr ""
+msgstr "Dzień tygodnia NIE jest = N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Dni"
 
@@ -3739,22 +3792,22 @@ msgstr "Dni"
 msgid "Debug"
 msgstr "Debugowanie"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Tryb debugowania"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Zaktualizowano tryb debugowania"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Gru"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Grudzień"
 
@@ -3764,15 +3817,14 @@ msgstr "Dziesiętny"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Domyślnie"
 
@@ -3785,13 +3837,13 @@ msgid "Default delay (in seconds)"
 msgstr "Domyślne opóźnienie (w sekundach)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Wiadomość domyślna"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
-msgstr ""
+msgstr "Czas trwania kroku domyślnej operacji"
 
 #: include/views/configuration.action.edit.php:47
 msgid "Default subject"
@@ -3804,7 +3856,7 @@ msgstr "Motyw domyślny"
 #: adm.gui.php:73
 #, c-format
 msgid "Default theme \"%1$s\"."
-msgstr ""
+msgstr "Motyw domyślny \"%1$s\"."
 
 #: include/views/configuration.discovery.list.php:42
 #: include/views/configuration.slideconf.edit.php:51
@@ -3812,84 +3864,88 @@ msgstr ""
 msgid "Delay"
 msgstr "Opóźnienie"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
-msgstr ""
+msgstr "Opóźnienie (w sek)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Opóźniony o"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Usuń"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr "Usunąć wszystkie elementy, których nie ma w pliku XML?"
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Usuń i wyczyść"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
-msgstr "Usunąć i wycziścić zaznaczone szablony? (Wszystkie połączone hosty zostaną wyczyszczone.)"
+msgstr "Usunąć i wyczyścić zaznaczone szablony? (Uwaga: wszystkie połączone hosty zostaną wyczyszczone!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
-msgstr "Usunąć i wyczyścić szablon? (Uwaga: wszystkie powiązane hosty zostaną wyczyszczone.)"
+msgstr "Usunąć i wyczyścić szablon? (Uwaga: wszystkie powiązane hosty zostaną wyczyszczone!)"
 
 #: include/views/configuration.application.edit.php:55
 msgid "Delete application?"
-msgstr "Usunąć program?"
+msgstr "Usunąć aplikację?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Usunąć aktualną akcję?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Usunąć regułę wykrywania?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Usunąć wyrażenie?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
-msgstr ""
+msgstr "Usunąć prototyp wykresu?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Usunąć wykres?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Usunąć historie z wybranych WEB scenariuszy?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Usunąć historię wybranych pozycji?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr "Usunąć historię wybranych scenariuszy sieci www?"
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Usunąć mapę ikon?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
-msgstr ""
+msgstr "Usunąć prototyp pozycji?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
-msgstr ""
+msgstr "Usunąć pozycję?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Usunąć słowo kluczowe?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Usunąć powiązania między zaznaczonymi elementami?"
 
@@ -3897,19 +3953,23 @@ msgstr "Usunąć powiązania między zaznaczonymi elementami?"
 msgid "Delete maintenance period?"
 msgstr "Usunąć okres utrzymania?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr "Usuń brakujące"
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Usunąć mapę sieci?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
-msgstr ""
+msgstr "Usunąć proxy?"
 
 #: include/views/administration.general.regularexpressions.edit.php:89
 msgid "Delete regular expression?"
 msgstr "Usunąć wyrażenie regularne?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Usunąć scenariusz?"
 
@@ -3917,71 +3977,67 @@ msgstr "Usunąć scenariusz?"
 msgid "Delete screen?"
 msgstr "Usunąć ekran?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Usunąć skrypt?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Usuń wybrane"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Usunąć wybrane WEB scenariusze?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Usunąć wybrane akcje?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
-msgstr "Usunąć wybrane programy?"
+msgstr "Usunąć wybrane aplikacje?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
-msgstr "Usunąć zaznaczone reguły wykrywania?"
+msgstr "Usunąć wybrane reguły wykrywania?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
-msgstr "Usunąć wybrany element?"
+msgstr "Usunąć wybrane elementy?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
-msgstr ""
+msgstr "Usunąć wybrane prototypy wykresów?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Usunąć wybrany wykres?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Usunąć wybraną grupę?"
@@ -3990,91 +4046,91 @@ msgstr "Usunąć wybraną grupę?"
 msgid "Delete selected groups?"
 msgstr "Usunąć wybrane grupy?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
-msgstr "Usunąć wybraną grupę hostów?"
+msgstr "Usunąć wybrane grupy hostów?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
-msgstr ""
+msgstr "Usunąć wybrany prototyp hosta?"
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
-msgstr ""
+msgstr "Usunąć wybrane prototypy hostów?"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Usunąć wybranego hosta?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Usunąć wybrane hosty?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Usunąć wybrany obraz?"
 
 #: include/views/configuration.item.prototype.list.php:121
 msgid "Delete selected item prototypes?"
-msgstr ""
+msgstr "Usunąć wybrane prototypy pozycji?"
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Usunąć wybrane pozycje?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
-msgstr "Usunąć wybrany okres konserwacji?"
+msgstr "Usunąć wybrane okresy utrzymania?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
-msgstr "Usunąć wybraną mapę?"
+msgstr "Usunąć wybrane mapy?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Usunąć wybrany typ mediów?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Usunąć wybrane typy mediów?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Usunąć wybrane proxy?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
-msgstr "Usunąć wybrane wyrażenie regularne?"
+msgstr "Usunąć wybrane wyrażenia regularne?"
 
 #: include/views/configuration.screen.list.php:71
 msgid "Delete selected screens?"
 msgstr "Usunąć wybrane ekrany?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Usunąć wybrane skrypty?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Usunąć wybrane pokazy slajdów?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Usunąć wybrane szablony?"
 
 #: include/views/configuration.triggers.list.php:310
 msgid "Delete selected trigger prototypes?"
-msgstr ""
+msgstr "Usunąć wybrane prototypy wyzwalaczy?"
 
 #: include/views/configuration.triggers.list.php:310
 msgid "Delete selected triggers?"
 msgstr "Usunąć wybrane wyzwalacze?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Usunąć wybranego użytkownika?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Usunąć wybranych użytkowników?"
 
@@ -4090,28 +4146,32 @@ msgstr[0] "Usunąć wybrane mapowanie wartości? Jest wykorzystywane przez %d po
 msgstr[1] "Usunąć wybrane mapowanie wartości? Jest wykorzystywane przez %d pozycje!"
 msgstr[2] "Usunąć wybrane mapowanie wartości? Jest wykorzystywane przez %d pozycji!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr "Usunąć wybrane scenariuszy sieci www?"
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
-msgstr "Usunąć wybrane z powiązanymi elementami"
+msgstr "Usuń wybrane z powiązanymi elementami"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
-msgstr ""
+msgstr "Usunąć usługę \"%1$s\"?"
 
 #: include/views/configuration.slideconf.edit.php:117
 msgid "Delete slide show?"
 msgstr "Usunąć pokaz slajdów?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
-msgstr "Usunąć szkic?"
+msgstr "Usunąć szablon?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
-msgstr ""
+msgstr "Usunąć prototyp wyzwalacza?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Usunąć wyzwalacz?"
 
@@ -4119,99 +4179,99 @@ msgstr "Usunąć wyzwalacz?"
 msgid "Deleted"
 msgstr "Usunięto"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
-msgstr "Usunięto: Program \"%1$s\" w \"%2$s\"."
+msgstr "Usunięto: Aplikacja \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Usunięto: Reguła wykrywania \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Usunięto: Wykres \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
-msgstr ""
+msgstr "Usunięto: Host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Usunięto: Prototyp hosta \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Usunięto: Pozycja \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Usunięto: Prototyp pozycji \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
-msgstr ""
+msgstr "Usunięto: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
-msgstr ""
+msgstr "Usunięto: Szablon \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Usunięto: Wyzwalacz \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Usunięto: Prototyp wyzwalacza \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Usunięto: Scenariusz sieci www \"%1$s\" w \"%2$s\"."
 
 #: include/views/administration.general.regularexpressions.edit.php:53
 msgid "Delimiter"
 msgstr "Ogranicznik"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Zmiana (prosta zmiana)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Zmiana (prędkość na sekundę)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Zabroń"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Zależności"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Zależny"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Zależy od"
 
@@ -4219,30 +4279,41 @@ msgstr "Zależy od"
 msgid "Deployment status"
 msgstr "Status instalacji"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Opis"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr "Opis dla \"%s\"."
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr "Zaktualizowano opis"
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Szczegóły"
 
@@ -4255,73 +4326,73 @@ msgid "Device"
 msgstr "Urządzenie"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
-msgstr ""
+msgstr "Przerwania sprzętowe."
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
-msgstr ""
+msgstr "Lista urządzeń - wyświetla domyślnie urządzenia PCI"
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
-msgstr ""
+msgstr "Statystyki odczytu urządzenia."
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Kryteria niepowtarzalności urządzeń"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
-msgstr ""
+msgstr "Statystyki zapisu urządzenia."
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
-msgstr ""
+msgstr "Różnica pomiędzy wartościami MAX i MIN w okresie T jest < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
-msgstr ""
+msgstr "Różnica pomiędzy wartościami MAX i MIN w okresie T jest = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
-msgstr ""
+msgstr "Różnica pomiędzy wartościami MAX i MIN w okresie T jest > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
-msgstr ""
+msgstr "Różnica pomiędzy wartościami MAX i MIN w okresie T NIE jest = N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
-msgstr ""
+msgstr "Różnica pomiędzy ostatnią i poprzednią wartością, wtedy N = 1, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
-msgstr ""
+msgstr "Różnica pomiędzy ostatnią i poprzednią wartością, wtedy N NOT 1, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
-msgstr ""
+msgstr "Różnica między ostatnią i poprzednią wartością jest < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
-msgstr ""
+msgstr "Różnica między ostatnią i poprzednią wartością jest < N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
-msgstr ""
+msgstr "Różnica między ostatnią i poprzednią wartością jest < N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
-msgstr ""
+msgstr "Różnica między ostatnią i poprzednią wartością jest NIE jest = N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
-msgstr ""
+msgstr "Różne informacje o określonym procesie (określonych procesach)"
 
 #: include/views/configuration.screen.list.php:52
 msgid "Dimension (cols x rows)"
@@ -4333,7 +4404,7 @@ msgstr "Wyłącz"
 
 #: include/views/administration.usergroups.list.php:144
 msgid "Disable debug mode"
-msgstr ""
+msgstr "Wyłącz tryb debugowania"
 
 #: include/views/administration.usergroups.list.php:145
 msgid "Disable debug mode in selected groups?"
@@ -4343,48 +4414,44 @@ msgstr "Wyłączyć tryb debugowania dla zaznaczonych grup?"
 msgid "Disable host"
 msgstr "Wyłącz hosta"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Wyłączyć hosta?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
-msgstr "Wyłączyć hosty w zaznaczonych grupach hostów?"
+msgstr "Wyłączyć hosty w wybranych grupach hostów?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Wyłączyć hosty monitorowane przez wybrane proxy?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Wyłącz wybrane"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Wyłączyć wybrane scenariusze WEB?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Wyłączyć wybrane akcje?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
-msgstr "Wyłączyć wybrane programy?"
+msgstr "Wyłączyć wybrane aplikacje?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Wyłączyć wybrane reguły wykrywania?"
 
@@ -4392,54 +4459,59 @@ msgstr "Wyłączyć wybrane reguły wykrywania?"
 msgid "Disable selected groups?"
 msgstr "Wyłączyć wybrane grupy?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
-msgstr ""
+msgstr "Wyłączyć wybrane prototypy hostów?"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Wyłączyć wybrane hosty?"
 
 #: include/views/configuration.item.prototype.list.php:117
 msgid "Disable selected item prototypes?"
-msgstr ""
+msgstr "Wyłączyć wybrane prototypy pozycji?"
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Wyłączyć wybrane pozycje?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
-msgstr ""
+msgstr "Wyłączyć wybrane typy mediów?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
-msgstr ""
+msgstr "Wyłączyć wybrane prototypy wyzwalaczy?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Wyłączyć wybrane wyzwalacze?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr "Wyłączyć wybrane scenariusze sieci www?"
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Wyłączony"
 
@@ -4452,25 +4524,25 @@ msgstr "Katastrofa"
 msgid "Discovered"
 msgstr "Wykryte"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
-msgstr ""
+msgstr "Wykryty przez"
 
 #: include/views/monitoring.discovery.php:40
 msgid "Discovered device"
 msgstr "Wykryte urządzenie"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Wykrywanie"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Wykrywanie przez proxy"
 
@@ -4478,88 +4550,91 @@ msgstr "Wykrywanie przez proxy"
 msgid "Discovery check"
 msgstr "Test wykrywania"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
-msgstr ""
+msgstr "Błąd testu wykrywania"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Testy wykrywania"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
-msgstr ""
+msgstr "Lista wykrytych"
 
 #: include/actions.inc.php:72
 msgid "Discovery object"
 msgstr "Obiekt wykrywania"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Reguła wykrywania"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
-msgstr "Reguła wykrywania \"%1$s\" istnieje w \"%2$s\", odziedziczona z innego szablonu."
+msgstr "Reguła wykrywania \"%1$s\" już istnieje w \"%2$s\", odziedziczona z innego szablonu."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Reguła wykrywania \"%1$s\" już istnieje w \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "Reguła wykrywania \"%1$s:%2$s\" ma nie poprawny czas życia: \"%3$s\". (min: %4$d, max: %5$d, makra użytkownika dozwolone)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr "Reguła wykrywania \"%1$s\" już istnieje."
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Reguła wykrywania \"%s\" istnieje."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "Reguła wykrywania \"%1$s:%2$s\" ma niepoprawny czas życia: \"%3$s\". (min: %4$d, max: %5$d, makra użytkownika dozwolone)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Utworzono regułę wykrywania"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Usunięto regułę wykrywania"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono regułę wykrywania"
+msgstr[1] "Wyłączono reguły wykrywania"
+msgstr[2] "Wyłączono reguły wykrywania"
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono regułę wykrywania"
+msgstr[1] "Włączono reguły wykrywania"
+msgstr[2] "Włączono reguły wykrywania"
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
-msgstr "Uaktualniono regułę wykrywania"
+msgstr "Zaktualizowano regułę wykrywania"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Reguły wykrywania"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Usunięto reguły wykrywania"
 
@@ -4571,74 +4646,74 @@ msgstr "Status wykrycia"
 msgid "Display OK triggers for"
 msgstr "Wyświetlanie wyzwalaczy w stanie OK przez"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Wyświetlanie"
 
 #: search.php:238 search.php:340 search.php:486
 #, c-format
 msgid "Displaying %1$s of %2$s found"
-msgstr ""
+msgstr "Wyświetlanie %1$s z %2$s znalezionych"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Rozkład wartości dla wielu pozycji"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Rozkład wartości dla wielu przedziałów czasowych"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Nie wyliczaj"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Zastąpić wyrażenie warunkowe?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Zrobione"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Kropka"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
-msgstr ""
+msgstr "Nie działa"
 
 #: include/discovery.inc.php:154
 msgctxt "discovery status"
 msgid "Down"
-msgstr ""
+msgstr "Nie działa"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Czas przerw w pracy"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Należy przeciągnąć w to miejsce, aby zmienić typ interfejsu na \"IPMI\"."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Należy przeciągnąć w to miejsce, aby zmienić typ interfejsu na \"JMX\"."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Należy przeciągnąć w to miejsce, aby zmienić typ interfejsu na \"SNMP\"."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Należy przeciągnąć w to miejsce, aby zmienić typ interfejsu na \"agent\"."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Styl rysowania"
 
@@ -4649,81 +4724,82 @@ msgstr "Pierwszy wpis menu rozwijalnego"
 #: adm.gui.php:77
 #, c-format
 msgid "Dropdown first entry \"%1$s\"."
-msgstr ""
+msgstr "Pierwszy wpis menu rozwijalnego \"%1$s\"."
 
 #: adm.gui.php:78
 #, c-format
 msgid "Dropdown remember selected \"%1$s\"."
-msgstr ""
+msgstr "Menu rozwijalne zapamiętuje wybrane \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
-msgstr ""
+msgstr "Powielone zależności w wyzwalaczu \"%1$s\""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Powielone nazwy prototypów grupy \"%2$s\" dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Powielone ID grupy hostów \"%2$s\" dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Powielony host. Host o tej samej nazwie \"%s\" już istnieje."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Powielony host. Host o tej samej widocznej nazwie \"%s\" już istnieje."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Powielona nazwa mapy dla mapy \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
-msgstr ""
+msgstr "Powielona nazwa skryptu \"%1$s\"."
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Powielona nazwa poziomu \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Powielony alias użytkownika \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
-msgstr ""
+msgstr "Czas trwania (sek)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Holenderski (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Pozycja dynamiczna"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
-msgstr ""
+msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "BŁĄD"
 
@@ -4731,13 +4807,13 @@ msgstr "BŁĄD"
 msgid "EVENTS"
 msgstr "ZDARZENIA"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Każdy adres URL powinien mieć unikalną nazwę. Należy się upewnić, że istnieje tylko jeden adres o tej nazwie"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4745,153 +4821,213 @@ msgstr "Każdy adres URL powinien mieć unikalną nazwę. Należy się upewnić,
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Edycja"
 
 #: include/views/js/configuration.sysmaps.js.php:7
 msgid "Edit map element"
-msgstr "Edycja elementy mapy"
+msgstr "Edycja elementu mapy"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
-msgstr "Edytuj wyzwalacz"
+msgstr "Edycja wyzwalacza"
 
 #: include/views/configuration.sysmap.edit.php:137
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Nazwa elementu"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Pusty"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr "Plik certyfikatu SSL dla scenariusza sieci www \"%1$s\" jest pusty."
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr "Plik klucza SSL dla scenariusza sieci www \"%1$s\" jest pusty."
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Pusty warunek akcji."
 
 #: include/classes/validators/CColorValidator.php:33
 msgid "Empty color."
-msgstr ""
+msgstr "Pusty kolor."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr "ID formuły warunku filtra dla akcji \"%1$s\" jest puste."
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "ID formuły warunku filtra dla reguły wykrywania \"%1$s\" jest puste."
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Makro warunku filtra dla reguły wykrywania \"%1$s\" jest puste."
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
-msgstr ""
+msgstr "Puste ID hosta dla prototypu hosta."
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
-msgstr ""
-
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+msgstr "Pusty host."
+
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Pusty parametr wejściowy."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
-msgstr ""
+msgstr "Puste parametry wejściowe."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Puste wejście."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
-msgstr ""
+msgstr "Puste makro."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
-msgstr ""
+msgstr "Pusta nazwa dla prototypu grupy."
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Pusta nazwa dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
-msgstr ""
+msgstr "Pusta nazwa dla skryptu \"%1$s\"."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
-msgstr ""
+msgstr "Pusta nazwa dla skryptu."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
-msgstr ""
+msgstr "Pusta nazwa."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Puste parametry"
 
 #: include/classes/server/CZabbixServer.php:231
 #, c-format
 msgid "Empty response received from Zabbix server \"%1$s\"."
-msgstr ""
+msgstr "Pusta odpowiedź otrzymana z serwera Zabbix \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
-msgstr ""
+msgstr "Puste ID ekranu dla ekranu."
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
-msgstr ""
+msgstr "Puste ID ekranu dla szablonu ekranu."
 
 #: include/classes/validators/CTimePeriodValidator.php:46
 msgid "Empty time period."
-msgstr ""
+msgstr "Pusty okres czasu."
+
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr "Puste ID scenariusza sieci www."
 
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Włącz"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Włącz potwierdzanie"
 
 #: include/views/administration.usergroups.list.php:140
 msgid "Enable debug mode"
-msgstr ""
+msgstr "Włącz tryb debugowania"
 
 #: include/views/administration.usergroups.list.php:141
 msgid "Enable debug mode in selected groups?"
@@ -4905,11 +5041,11 @@ msgstr "Włącz potwierdzanie zdarzeń"
 msgid "Enable host"
 msgstr "Włącz hosta"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Włączyć hosta?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Włączyć hosty monitorowane przez wybrane proxy?"
 
@@ -4920,123 +5056,123 @@ msgstr "Włączyć hosty monitorowane przez wybrane proxy?"
 #: include/views/administration.general.housekeeper.edit.php:125
 #: include/views/administration.general.housekeeper.edit.php:146
 msgid "Enable internal housekeeping"
-msgstr ""
+msgstr "Włącz wewnętrzne porządkowanie"
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Włącz wybrane"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Włączyć wybrane akcje?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
-msgstr ""
+msgstr "Włączyć wybrane aplikacje?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Włączyć wybrane reguły wykrywania?"
 
 #: include/views/administration.usergroups.list.php:133
 msgid "Enable selected groups?"
-msgstr "Wyłączyć wybrane grupy?"
+msgstr "Włączyć wybrane grupy?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
-msgstr ""
+msgstr "Włączyć wybrane prototypy hostów?"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
-msgstr ""
+msgstr "Włączyć wybrane hosty?"
 
 #: include/views/configuration.item.prototype.list.php:113
 msgid "Enable selected item prototypes?"
-msgstr ""
+msgstr "Włączyć wybrane prototypy pozycji?"
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Włączyć wybrane pozycje?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
-msgstr ""
+msgstr "Włączyć wybrane typy mediów?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
-msgstr ""
+msgstr "Włączyć wybrane prototypy wyzwalaczy?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Włączyć wybrane wyzwalacze?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr "Włączyć wybrane scenariusze sieci www?"
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Włączony"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Angielski (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
-msgstr ""
+msgstr "Angielski (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Błąd"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
-msgstr ""
+msgstr "Błąd w zapytaniu wyszukiwania dla tabeli \"%1$s\"."
 
 #: httpdetails.php:161 httpdetails.php:234
 #, c-format
 msgid "Error: %1$s"
-msgstr ""
+msgstr "Błąd: %1$s"
 
 #: include/events.inc.php:173
 msgid "Event"
@@ -5046,24 +5182,24 @@ msgstr "Zdarzenie"
 msgid "Event ID"
 msgstr "ID zdarzenia"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
-msgstr ""
+msgstr "ID zdarzenia ostatniego wpisu logu jest zgodne z wyrażeniem regularnym T, wtedy N = 1, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
-msgstr ""
+msgstr "ID zdarzenia ostatniego wpisu logu jest zgodne z wyrażeniem regularnym T, wtedy N NOT 1, 0 - w przeciwnym przypadku"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Zdarzenie potwierdzone"
 
 #: adm.gui.php:74
 #, c-format
 msgid "Event acknowledges \"%1$s\"."
-msgstr ""
+msgstr "Potwierdzenia zdarzenia \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Potwierdzanie zdarzeń wyłączone"
 
@@ -5071,7 +5207,7 @@ msgstr "Potwierdzanie zdarzeń wyłączone"
 msgid "Event details"
 msgstr "Szczegóły zdarzenia"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Generowanie zdarzeń"
 
@@ -5089,62 +5225,68 @@ msgstr "Szczegóły źródła zdarzenia"
 
 #: include/actions.inc.php:92
 msgid "Event type"
-msgstr ""
+msgstr "Typ zdarzenia"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Zdarzenia"
 
 #: include/views/administration.general.housekeeper.edit.php:61
 msgid "Events and alerts"
-msgstr ""
+msgstr "Zdarzenia i alarmy"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Codziennie"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Każdego tygodnia"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Wykluczyć"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
+msgstr "Błąd wykonania SQL [%1$s] w [%2$s]."
+
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr "Wykonuje zapytanie WMI i zwraca pierwszy wybrany obiekt."
 
-#: include/views/administration.script.edit.php:56
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Wykonaj na"
 
 #: include/views/administration.auditacts.list.php:84
 msgid "Executed"
-msgstr ""
+msgstr "Wykonano"
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Wykonany skrypt"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Potwierdzenie wykonania"
 
@@ -5154,9 +5296,9 @@ msgstr "Rozwiń makra"
 
 #: include/views/configuration.sysmap.edit.php:66
 msgid "Expand single problem"
-msgstr "Rozszerz pojedynczy problem"
+msgstr "Rozwiń pojedynczy problem"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Oczekiwano wersji 2.0 JSON-rpc, otrzymano wersję \"%s\"."
@@ -5164,14 +5306,14 @@ msgstr "Oczekiwano wersji 2.0 JSON-rpc, otrzymano wersję \"%s\"."
 #: include/views/configuration.maintenance.list.php:57
 msgctxt "maintenance status"
 msgid "Expired"
-msgstr ""
+msgstr "Przedawnione"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
-msgstr "Rozsunięty"
+msgstr "Rozwinięty"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Eksportuj zaznaczone"
 
@@ -5179,36 +5321,37 @@ msgstr "Eksportuj zaznaczone"
 msgid "Export to CSV"
 msgstr "Eksportuj do pliku CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Wyrażenie"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
-msgstr ""
+msgstr "Błąd składni w wyrażeniu."
 
 #: tr_testexpr.php:50
 msgid "Expression Variable Elements"
 msgstr "Wyrażenie elementów zmiennych"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Wyrażenie nie może być puste"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
-msgstr ""
+msgstr "Konstruktor wyrażeń"
 
 #: include/views/administration.general.regularexpressions.edit.php:43
 #: include/views/administration.general.regularexpressions.edit.php:52
@@ -5227,17 +5370,17 @@ msgid "External check"
 msgstr "Test zewnętrzny"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
-msgstr ""
+msgstr "P"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "FAŁSZ"
 
@@ -5246,207 +5389,211 @@ msgstr "FAŁSZ"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Niepowodzenie"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Niepowodzenie"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
-msgstr ""
+msgstr "Nie udało się zaktualizować szablonu."
 
 #: include/items.inc.php:37
 msgid "Failure Audit"
 msgstr "Audyt niepowodzeń"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Ulubione wykresy"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Ulubione mapy"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Ulubione ekrany"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
-msgstr ""
+msgstr "Ulubione proste wykresy"
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
-msgstr ""
+msgstr "Ulubione pokazy slajdów"
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Ulubione"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
-msgstr "Luty"
+msgstr "Lut"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Luty"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Pole"
 
 #: include/classes/db/DB.php:322
 #, c-format
 msgid "Field \"%1$s\" cannot be set to NULL."
-msgstr ""
+msgstr "Pole \"%1$s\" nie może być ustawione na NULL."
 
 #: include/validate.inc.php:433
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
-msgstr ""
+msgstr "Pole \"%1$s\" jest wymagane."
 
 #: include/validate.inc.php:307
 #, c-format
 msgid "Field \"%1$s\" is not IP range."
-msgstr ""
+msgstr "Pole \"%1$s\" nie zawiera zakresu IP."
 
 #: include/validate.inc.php:301
 #, c-format
 msgid "Field \"%1$s\" is not IP."
-msgstr ""
+msgstr "Pole \"%1$s\" nie zawiera IP."
 
 #: include/validate.inc.php:313
 #, c-format
 msgid "Field \"%1$s\" is not integer list or range."
-msgstr ""
+msgstr "Pole \"%1$s\" nie zawiera listy liczb całkowitych lub zakresu."
 
 #: include/validate.inc.php:319
 #, c-format
 msgid "Field \"%1$s\" is not integer."
-msgstr ""
+msgstr "Pole \"%1$s\" nie zawiera liczby całkowitej."
 
 #: include/validate.inc.php:366
 #, c-format
 msgid "Field \"%1$s\" is not string."
-msgstr ""
+msgstr "Pole \"%1$s\" nie zawiera ciągu znaków."
 
 #: include/validate.inc.php:445
 #, c-format
 msgid "Field \"%1$s\" must be missing."
-msgstr ""
+msgstr "Pole \"%1$s\" musi być puste."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Pole \"druleid\" jest wymagane."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
-msgstr ""
+msgstr "Pole \"host\" jest obowiązkowe."
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Pole \"name\" jest wymagane."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
-msgstr ""
+msgstr "Nieobsługiwany format pliku."
 
 #: include/classes/helpers/CUploadFile.php:153
 #, c-format
 msgid "File is too big, max upload size is %1$s bytes."
-msgstr ""
+msgstr "Plik jest zbyt duży, maksymalny rozmiar ładowanego pliku %1$s bajtów."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
-msgstr ""
+msgstr "Plik udostępniony do oglądania nie istnieje. Próbowano wyszukać \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
-msgstr ""
+msgstr "Informacje o czasie pliku. Liczba sekund. Tryb jest opcjonalny. Jeżeli tryb jest pusty zostanie użyte modify."
 
 #: include/graphs.inc.php:57
 msgid "Filled region"
 msgstr "Obszar wypełniony"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtr"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
-msgstr ""
+msgstr "Filtruj wg aplikacji"
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
-msgstr "Filtruj przez grupę hostów"
+msgstr "Filtruj według grupy hostów"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
-msgstr ""
+msgstr "Filtruj wg inwentarza hosta"
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filtruj po nazwie"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
-msgstr ""
+msgstr "Filtry"
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
-msgstr ""
+msgstr "Wyszukaj ciąg V w ostatniej (aktualnej) wartości. N = 1 - jeśli znaleziono, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
-msgstr ""
+msgstr "Wyszukaj ciąg V w ostatniej (aktualnej) wartości. N NOT 1 - jeśli znaleziono, 0 - w przeciwnym przypadku"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
-msgstr ""
+msgstr "Wyszukiwanie tekstu w pliku. 0 - nie znaleziono wyrażenia, 1 - znaleziono."
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
-msgstr ""
+msgstr "Wyszukiwanie tekstu w pliku. Znaleziony tekst"
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Zakończ"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
-msgstr ""
+msgstr "Fiński (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Pierwszy"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
-msgstr ""
+msgstr "Pierwsza"
 
 #: include/views/js/configuration.sysmaps.js.php:42
 msgid "Fit to map"
 msgstr "Dopasuj do mapy"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Stałe"
 
@@ -5454,197 +5601,201 @@ msgstr "Stałe"
 #: include/views/configuration.item.edit.php:290
 #: include/views/configuration.item.massupdate.php:348
 msgid "Flexible intervals"
-msgstr ""
+msgstr "Elastyczne interwały"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr "Podążaj za przekierowaniami"
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Hasło użytkownika guest musi być puste"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Formuła"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Czwarty"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Francuski (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Pt"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Piątek"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Od"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Dostęp do interfejsu użytkownika"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Zaktualizowano dostęp do interfejsu użytkownika"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Wiadomości interfejsu użytkownika"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Pełne powielenie"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Funkcja"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
-msgstr ""
+msgstr "Funkcja \"%1$s\" nie może być użyta z wybraną pozycją \"%2$s\""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
-msgstr ""
+msgstr "G"
 
 #: include/views/monitoring.charts.php:32
 #: include/views/monitoring.charts.php:41
 msgid "GRAPHS"
-msgstr ""
+msgstr "WYKRESY"
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "Modem GSM"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Dostęp do GUI wyłączony."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Ogólne"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Wygenerowano w %s sek"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Niemiecki (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
-msgstr ""
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
+msgstr "Pobierz zawartość strony www. Domyślna ścieżka to /"
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
-msgstr ""
+msgstr "Pobierz zawartość podanego pliku."
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
-msgstr ""
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
+msgstr "Pobierz pierwsze wystąpienie wyrażenia regularnego ze strony www. Domyślna ścieżka to /"
 
 #: include/page_header.php:194
 msgid "Get support"
 msgstr "Uzyskaj pomoc"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
-msgstr ""
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
+msgstr "Pobierz czas ładowania pełnej strony www. Domyślna ścieżka to /"
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Podane wyrażenie nie jest makrem"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
-msgstr ""
+msgstr "Wyrażenie globalne nie istnieje."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Skrypt globalny"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Skrypty globalne"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
-msgstr "Przejdź"
+msgstr "Wykonaj"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Przejdź do"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
-msgstr ""
+msgstr "Przejdź do tablicy"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5653,66 +5804,73 @@ msgid "Gradient line"
 msgstr "Linia gradientu"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Wykres"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
-msgstr ""
+msgstr "Wykres \"%1$s\" istnieje w \"%2$s\" (odziedziczony z innego szablonu)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
-msgstr ""
+msgstr "Wykres \"%1$s\" już istnieje w \"%2$s\" (pozycje nie są identyczne)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Wykres \"%1$s\" istnieje w \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
-msgstr ""
+msgstr "Wykres \"%1$s\" nie może dziedziczyć. Brak wymaganej pozycji dla \"%2$s\" (pozycja wartości Ymax)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
-msgstr ""
+msgstr "Wykres \"%1$s\" nie może dziedziczyć. Brak wymaganej pozycji dla \"%2$s\" (pozycja wartości Ymin)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
-msgstr ""
+msgstr "Wykres \"%1$s\" nie może dziedziczyć. Brak wymaganej pozycji dla \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
-msgstr ""
+msgstr "W szablonie \"%2$s\" nie ma wykresu \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
-msgstr ""
+msgstr "Pominięto wykres \"%1$s\" - reguła użytkownika."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
-msgstr ""
+msgstr "Wykres \"%1$s\" z pozycjami z szablonów nie może zawierać pozycji z innych hostów."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Dodano wykres"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Usunięto wykres"
 
@@ -5724,108 +5882,115 @@ msgstr "Element wykresu"
 msgid "Graph item"
 msgstr "Pozycja na wykresie"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Nazwa wykresu"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
-msgstr ""
+msgstr "Prototyp wykresu"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "Prototyp wykresu \"%1$s\" zawiera prototypy pozycji z wielu reguł wykrywania."
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
-msgstr ""
+msgstr "Prototyp wykresu \"%1$s\" musi mieć przynajmniej jeden prototyp pozycji."
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
-msgstr ""
+msgstr "Prototyp wykresu \"%1$s\" z pozycjami z szablonów nie może zawierać pozycji z innych hostów."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
-msgstr ""
+msgstr "Usunięto prototyp wykresu \"%s\"."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
-msgstr ""
+msgstr "Dodano prototyp wykresu"
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
-msgstr ""
+msgstr "Usunięto prototyp wykresu"
+
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr "Nie znaleziono prototypu wykresu."
 
-#: graphs.php:225
+#: graphs.php:230
 msgid "Graph prototype updated"
-msgstr ""
+msgstr "Zaktualizowano prototyp wykresu"
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Prototypy wykresów"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
-msgstr ""
+msgstr "Usunięto prototypy wykresów"
 
 #: include/views/configuration.graph.list.php:32
 msgid "Graph prototypes of"
-msgstr ""
+msgstr "Prototypy wykresów"
 
 #: include/views/js/configuration.graph.edit.js.php:31
 msgid "Graph sum"
 msgstr "Suma wykresu"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Typ wykresu"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
-msgstr "Uaktualniono wykres"
+msgstr "Zaktualizowano wykres"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
-msgstr ""
+msgstr "Istnieje już wykres lub prototyp wykresu o nazwie \"%1$s\"."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
-msgstr ""
+msgstr "Innego typu wykres o takiej samej nazwie już istnieje."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Wykresy"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Skopiowano wykresy"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Usunięto wykresy"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Grecki (el_GR)"
 
@@ -5834,54 +5999,58 @@ msgstr "Grecki (el_GR)"
 msgid "Grid"
 msgstr "Siatka"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Grupa"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
-msgstr ""
+msgstr "Nie można usunąć grupy \"%1$s\", jest używana przez prototyp hosta."
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
-msgstr ""
+msgstr "Grupa \"%1$s\" nie istnieje."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
-msgstr ""
+msgstr "Grupa \"%1$s\" dla hosta \"%2$s\" nie istnieje."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Dodano grupę"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr "Usunięto grupę"
+msgid_plural "Groups deleted"
+msgstr[0] "Usunięto grupę"
+msgstr[1] "Usunięto grupy"
+msgstr[2] "Usunięto grupy"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5890,42 +6059,44 @@ msgstr "Grupa dla wykrytych hostów"
 #: adm.other.php:72
 #, c-format
 msgid "Group for discovered hosts \"%1$s\"."
-msgstr ""
+msgstr "Grupa dla wykrytych hostów \"%1$s\"."
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Nazwa grupy"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
-msgstr ""
+msgstr "ID prototypu grupy nie może być puste."
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
-msgstr ""
+msgstr "Prototyp grupy nie może bazować na wykrytej grupie hostów \"%1$s\"."
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
-msgstr ""
+msgstr "Prototypy grup"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
-msgstr "Uaktualniono grupę"
+msgstr "Zaktualizowano grupę"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Grupowanie wg"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Grupy"
 
@@ -5933,45 +6104,36 @@ msgstr "Grupy"
 msgid "Groups in maintenance"
 msgstr "Grupy w okresie utrzymania"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H:i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
 #: events.php:306
 msgid "HISTORY OF EVENTS"
-msgstr ""
+msgstr "HISTORIA ZDARZEŃ"
 
 #: include/classes/screens/CScreenHostgroupTriggers.php:132
 msgid "HOST GROUP ISSUES"
-msgstr ""
+msgstr "PROBLEMY GRUPY HOSTÓW"
 
 #: include/views/inventory.host.list.php:26
 #: include/views/inventory.host.view.php:23
 msgid "HOST INVENTORY"
-msgstr ""
+msgstr "INWENTARZ HOSTA"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "PRZEGLĄD INWENTARZA HOSTÓW"
 
 #: include/classes/screens/CScreenHostTriggers.php:131
 msgid "HOST ISSUES"
-msgstr ""
+msgstr "PROBLEMY HOSTA"
 
 #: include/discovery.inc.php:60
 #: include/views/administration.authentication.edit.php:48
@@ -5983,9 +6145,10 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "Uwierzytelnianie HTTP"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
-msgstr ""
+msgstr "HTTP proxy"
 
 #: include/discovery.inc.php:71
 #: include/views/js/configuration.discovery.edit.js.php:171
@@ -6004,12 +6167,17 @@ msgstr "Sprzęt"
 msgid "Hardware (Full details)"
 msgstr "Sprzęt (wszystkie informacje)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr "Nagłówki"
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Wysokość"
@@ -6022,15 +6190,15 @@ msgstr "Pomoc"
 msgid "Hexadecimal"
 msgstr "Szesnastkowy"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Ukryj"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Ukryj wszystko"
 
@@ -6040,57 +6208,57 @@ msgstr "Ukryj wyłączone scenariusze"
 
 #: include/views/configuration.triggers.list.php:63
 msgid "Hide disabled trigger prototypes"
-msgstr ""
+msgstr "Ukryj wyłączone prototypy wyzwalaczy"
 
 #: include/views/configuration.triggers.list.php:81
 msgid "Hide disabled triggers"
 msgstr "Ukryj wyłączone wyzwalacze"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
-msgstr ""
+msgstr "Ukryj filtr"
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Ukryj wybrane"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
-msgstr ""
+msgstr "Ukryj wybrane grupy"
 
 #: adm.triggerseverities.php:62
 #: include/views/administration.general.triggerSeverity.edit.php:58
 msgid "High"
 msgstr "Wysoki"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Historia"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Wyczyszczono historię"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Czyszczenie historii może zająć dużo czasu. Kontynuować?"
 
 #: adm.housekeeper.php:59
 msgid "History data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych historycznych"
 
 #: adm.housekeeper.php:112
 #, c-format
 msgid "History data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych historii (w dniach) \"%1$s\"."
 
 #: include/screens.inc.php:32
 msgid "History of events"
@@ -6098,82 +6266,82 @@ msgstr "Historia zdarzeń"
 
 #: disc_prototypes.php:115 items.php:54
 msgid "History storage period"
-msgstr ""
+msgstr "Okres przechowywania historii"
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
-msgstr ""
+msgstr "Okres przechowywania historii (w dniach)"
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Poziome"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Ułożenie poziome"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
-msgstr[1] "Host"
-msgstr[2] "Host"
+msgstr[1] "Hosty"
+msgstr[2] "Hosty"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
-msgstr ""
+msgstr "Host \"%1$s\" już istnieje."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
-msgstr ""
+msgstr "Host \"%1$s\" jest monitorowany przez proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "Wybrano parametr \"useipmi\" dla hosta \"%s\", jednakże nie podano parametru \"ipmi_ip\"! Użyto adresu IP hosta jako adresu interfejsu IPMI."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Hosty (rosnąco)"
 
@@ -6185,71 +6353,73 @@ msgstr "Adres IP hosta"
 msgid "Host access"
 msgstr "Dostęp do hosta"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Dodano hosta"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Host nie może posiadać więcej niż jeden interfejs tego samego typu."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Liczba hostów"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Usunięto hosta"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono host"
+msgstr[1] "Wyłączono hosty"
+msgstr[2] "Wyłączono hosty"
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono host"
+msgstr[1] "Włączono hosty"
+msgstr[2] "Włączono hosty"
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Grupa hostów"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
-msgstr ""
+msgstr "Grupa hostów \"%1$s\" już istnieje."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
-msgstr ""
+msgstr "Nie można usunąć grupy hostów \"%1$s\", jest użyta w skrypcie globalnym."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
-msgstr ""
+msgstr "Nie można usunąć grupy hostów \"%1$s\", istnieją hosty, które od niej są zależne."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
-msgstr ""
+msgstr "Grupa hostów \"%1$s\" jest grupą wewnętrzną i nie można jej usunąć."
 
 #: include/views/js/configuration.sysmaps.js.php:33
 msgid "Host group elements"
@@ -6257,20 +6427,21 @@ msgstr "Elementy grupy hostów"
 
 #: include/screens.inc.php:39
 msgid "Host group issues"
-msgstr ""
+msgstr "Problemy grupy hostów"
 
 #: include/views/configuration.sysmap.edit.php:75
 msgid "Host group label type"
-msgstr "Rodzaj etykiety grupy hostów"
+msgstr "Typ etykiety grupy hostów"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
-msgstr ""
+msgstr "Nazwa grupy hostów nie może być pusta."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Grupy hostów"
 
@@ -6280,8 +6451,8 @@ msgstr "Grupy hostów"
 msgid "Host interface"
 msgstr "Interfejs hosta"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Inwentarz hosta"
 
@@ -6291,121 +6462,121 @@ msgstr "Przegląd inwentarza hosta"
 
 #: include/screens.inc.php:40
 msgid "Host issues"
-msgstr ""
+msgstr "Problemy hosta"
 
 #: include/views/configuration.sysmap.edit.php:83
 msgid "Host label type"
-msgstr "Rodzaj etykiety hosta"
+msgstr "Typ etykiety hosta"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Lista hostów"
 
 #: include/actions.inc.php:94
 msgid "Host metadata"
-msgstr ""
+msgstr "Meta-dane hosta"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Nazwa hosta"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
-msgstr ""
+msgstr "Nazwa hosta \"%1$s\" jest zbyt długa, musi mieć mniej niż %2$d znaków."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
-msgstr ""
+msgstr "Nazwa hosta dla prototypu hosta \"%1$s\" musi zawierać makra."
 
 #: include/hosts.inc.php:290
 msgid "Host networks"
 msgstr "Sieci hosta"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
-msgstr ""
+msgstr "Prototyp hosta \"%1$s\" istnieje w \"%2$s\", odziedziczony z innego szablonu."
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Prototyp hosta \"%1$s\" istnieje w \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
-msgstr ""
+msgstr "Prototyp hosta \"%1$s\" musi mieć przynajmniej jedną grupę hostów."
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
-msgstr ""
+msgstr "Dodano prototyp hosta"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
-msgstr ""
+msgstr "Usunięto prototyp hosta"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono prototyp hosta"
+msgstr[1] "Wyłączono prototypy hostów"
+msgstr[2] "Wyłączono prototypy hostów"
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono prototyp hosta"
+msgstr[1] "Włączono prototypy hostów"
+msgstr[2] "Włączono prototypy hostów"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
-msgstr ""
+msgstr "Zaktualizowano prototyp hosta"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
-msgstr ""
+msgstr "Istnieje już prototyp hosta z nazwą hosta \"%1$s\" w regule wykrywania \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
-msgstr ""
+msgstr "Prototyp hosta z nazwą hosta \"%s\" już istnieje."
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
-msgstr ""
+msgstr "Istnieje już prototyp hosta z widoczną nazwą \"%1$s\" w regule wykrywania \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
-msgstr ""
+msgstr "Prototyp hosta z widoczną nazwą hosta \"%s\" już istnieje."
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
-msgstr ""
+msgstr "Prototypy hostów"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
-msgstr ""
+msgstr "Usunięto prototypy hostów"
 
 #: include/views/configuration.host.prototype.list.php:34
 msgid "Host prototypes of"
-msgstr ""
+msgstr "Prototypy hostów"
 
 #: include/hosts.inc.php:300
 msgid "Host router"
 msgstr "Router hosta"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Ekrany hosta"
 
@@ -6417,51 +6588,52 @@ msgstr "Stan hosta"
 msgid "Host subnet mask"
 msgstr "Maska podsieci hosta"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Czas hosta"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Aktualizacja hosta się nie powiodła."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
-msgstr "Uaktualniono hosta"
+msgstr "Zaktualizowano hosta"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
-msgstr ""
+msgstr "Host o takiej samej nazwie \"%1$s\" już istnieje."
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Host o takiej samej nazwie \"%s\" już istnieje."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
-msgstr ""
+msgstr "Host o takiej samej widocznej nazwie \"%1$s\" już istnieje."
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Host o takiej samej widocznej nazwie \"%s\" już istnieje."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hosty"
 
@@ -6469,13 +6641,13 @@ msgstr "Hosty"
 msgid "Hosts & Groups"
 msgstr "Hosty i Grupy"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
-msgstr "Hosty (m/n/w)"
+msgstr "Hosty (m/n/s)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
-msgstr ""
+msgstr "Hosty / szablony"
 
 #: include/views/configuration.hostgroups.edit.php:63
 msgid "Hosts in"
@@ -6485,37 +6657,38 @@ msgstr "Hosty w"
 msgid "Hosts in maintenance"
 msgstr "Hosty w okresie utrzymania"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Informacja o hostach"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Lokalizacja hosta"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
-msgstr "Uaktualniono hosty"
+msgstr "Zaktualizowano hosty"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Godzinny"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Godziny"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
-msgstr ""
+msgstr "Porządkowanie"
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Węgierski (hu_HU)"
 
@@ -6533,22 +6706,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6556,26 +6729,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "Adres IP"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "Pola IP oraz DNS interfejsu hosta nie mogą być puste."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Zakres IP"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "Zakres IP nie może być pusty."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6583,22 +6756,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "Agent IPMI"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "Algorytm uwierzytelnienia IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Interfejsy IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "Hasło IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Poziom uprzywilejowania IPMI"
 
@@ -6608,7 +6781,7 @@ msgstr "Poziom uprzywilejowania IPMI"
 msgid "IPMI sensor"
 msgstr "Czujnik IPMI"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "Nazwa użytkownika IPMI"
 
@@ -6626,22 +6799,22 @@ msgstr "Usługa IT"
 
 #: adm.housekeeper.php:47
 msgid "IT service data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych usług IT"
 
 #: adm.housekeeper.php:109
 #, c-format
 msgid "IT service data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych usług IT (w dniach) \"%1$s\"."
 
 #: include/views/configuration.services.child.list.php:25
 msgid "IT service dependencies"
-msgstr ""
+msgstr "Zależności usługi IT"
 
 #: include/views/configuration.services.parent.list.php:25
 msgid "IT service parent"
-msgstr ""
+msgstr "Nadrzędna usługa IT"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6657,25 +6830,25 @@ msgid "ITEMS"
 msgstr "ELEMENTY"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ikona"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Ikona (domyślna)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Ikona (wyłączone)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Ikona (w okresie utrzymania)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Ikona (problem)"
 
@@ -6696,42 +6869,44 @@ msgstr "Typ etykiety ikony"
 msgid "Icon map"
 msgstr "Mapa ikon"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
-msgstr ""
+msgstr "Mapa ikon \"%1$s\" nie może być usunięta. Jest użyta w mapie \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Mapa ikon \"%1$s\" posiada mapowanie z błędnym iconid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Mapa ikon \"%1$s\" posiada mapowanie z błędnym połączeniem do inwentarza \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Mapa ikon \"%s\" już istnieje."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Mapa ikon \"%s\" nie może posiadać mapowania z pustym wyrażeniem."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Mapa ikon \"%s\" nie może posiadać mapowania zawierającego wyrażenie globalne, które nie istnieje."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Mapa ikon \"%s\" posiada błędne wyrażenie."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Mapa ikon \"%s\" musi posiadać przynajmniej jedno mapowanie."
@@ -6744,149 +6919,153 @@ msgstr "Utworzono mapę ikon"
 msgid "Icon map deleted"
 msgstr "Usunięto mapę ikon"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Nazwa mapy ikon nie może być pusta."
 
 #: adm.iconmapping.php:75
 msgid "Icon map updated"
-msgstr "Uaktualniono mapę ikon"
+msgstr "Zaktualizowano mapę ikon"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Mapa ikon o iconmapid \"%s\" nie istnieje."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Mapowanie ikon"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "Wpis mapowania ikon \"%1$s\" do \"%2$s\" istnieje."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Mapa ikon nie jest włączona"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Ikony"
 
 #: include/views/js/adm.regexprs.edit.js.php:222
 msgid "Identical expression already exists"
-msgstr ""
+msgstr "Identyczne wyrażenie już istnieje"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "W przypadku, gdy ten komunikat jest błędny należy skontaktować się z administratorami celem nadania uprawnień."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Obraz"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
-msgstr ""
+msgstr "Obraz \"%1$s\" już istnieje."
 
 #: adm.images.php:61
 msgid "Image added"
 msgstr "Dodano obraz"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Usunięto obraz"
 
 #: include/views/configuration.sysmap.edit.php:107
 msgid "Image label type"
-msgstr "Rodzaj etykiety obrazu"
+msgstr "Typ etykiety obrazu"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
+msgstr "Błąd ładowania obrazu [%1$s] w [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
-msgstr ""
+msgstr "Rozmiar obrazu musi być mniejszy ob 1MB."
 
 #: adm.images.php:57
 msgid "Image updated"
-msgstr "Uaktualniono obraz"
+msgstr "Zaktualizowano obraz"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Obrazy"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
-msgstr ""
+msgstr "Obrazy dla wszystkich map zostaną zaktualizowane!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Teraz"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Import"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Importowanie się nie powiodło"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Importowanie pliku"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Import się powiódł"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Nie można filtrować po polu inweantarzowym \"%s\", które nie istnieje."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
-msgstr ""
+msgstr "Nie można usunąć ostatniego wiersza i kolumny."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "W"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "W grupie"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "W grupach"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6899,736 +7078,835 @@ msgstr "W okresie utrzymania"
 msgid "In progress"
 msgstr "W trakcie"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Zawrzyj"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
-msgstr ""
+msgstr "Błędna wartość pola \"soft\" dla zależności usługi \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
-#, fuzzy, c-format
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
+#, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
-msgstr "Błędny rodzaj etykiety $1%s dla mapy \"%2$s\"."
+msgstr "Błędny typ etykiety %1$s dla mapy \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
-msgstr ""
+msgstr "Błędne API \"%1$s\"."
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Błędny zakres adresów IP \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Błędny OID SNMP."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
-msgstr "Błędne community SNMP."
+msgstr "Błędne hasło SNMP."
+
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr "Błędna wartość hosta weryfikacji SSL dla scenariusza sieci www \"%1$s\"."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr "Błędna wartość podmiotu weryfikacji SSL dla scenariusza sieci www \"%1$s\"."
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
-msgstr ""
+msgstr "Błędne akceptowalne SLA dla usługi \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
-msgstr "Błądny warunek akcji w tescie wykrywania."
+msgstr "Błędny test wykrywania warunku akcji."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
-msgstr "Błędny warunek akcji testu wykrywania. Test wykrywania nie istnieje lub brak praw dostępu do niego."
+msgstr "Błędny test wykrywania warunku akcji. Test wykrywania nie istnieje lub brak praw dostępu do niego."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
-msgstr ""
+msgstr "Błędny obiekt wykrywania warunku akcji."
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
-msgstr "Błędny warunek akcji reguły wykrywania. Reguła wykrywania nie istnieje lub brak praw dostępu do niej."
+msgstr "Błędna reguła wykrywania warunku akcji. Reguła wykrywania nie istnieje lub brak praw dostępu do niej."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
-msgstr "Błędny warunek akcji stanu wykrywania."
+msgstr "Błędny stan wykrywania warunku akcji."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
-msgstr ""
+msgstr "Błędny typ zdarzenia warunku akcji."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
-msgstr "Błędny warunek akcji dla grupy hostów. Grupa hostów nie istnieje lub brak praw dostępu do niej."
+msgstr "Błędna grupa hostów warunku akcji. Grupa hostów nie istnieje lub brak praw dostępu do niej."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
-msgstr "Błędny warunek akcji dla hosta. Host nie istnieje lub brak praw dostępu do niego."
+msgstr "Błędny host warunku akcji. Host nie istnieje lub brak praw dostępu do niego."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
-msgstr ""
+msgstr "Błędny IP \"%1$s\" warunku akcji."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
-msgstr ""
+msgstr "Błędny operator warunku akcji."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
-msgstr ""
+msgstr "Błędny port \"%1$s\" warunku akcji."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
-msgstr "Błedny warunek akcji proxy. Serwer proxy nie istnieje lub brak praw dostępu do niego."
+msgstr "Błędne proxy warunku akcji. Serwer proxy nie istnieje lub brak praw dostępu do niego."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
-msgstr "Błedny warunek akcji szablonu. Szablon nie istnieje lub brak praw dostępu do niego."
+msgstr "Błędny szablon warunku akcji. Szablon nie istnieje lub brak praw dostępu do niego."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
-msgstr ""
+msgstr "Błędny poziom wyzwalacza warunku akcji."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
-msgstr ""
+msgstr "Błędna wartość wyzwalacza warunku akcji."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
-msgstr "Błędny warunek wyzwalacza akcji. Wyzwalacz nie istnieje lub nie posiadasz uprawnień do niego."
+msgstr "Błędny wyzwalacz warunku akcji. Wyzwalacz nie istnieje lub brak praw dostępu do niego."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
-msgstr "Błędny rodzaj warunku akcji."
-
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
+msgstr "Błędny typ warunku akcji."
 
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
-msgstr "Błędny rodzaj polecenia dla operacji akcji."
+msgstr "Błędny typ polecenia dla operacji akcji."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
-msgstr ""
+msgstr "Błędny typ potwierdzenia warunku operacji akcji."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
-msgstr ""
+msgstr "Błędny typ warunku dla operacji akcji."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
-msgstr ""
+msgstr "Błędne wartości kolejnego kroku operacji akcji."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
-msgstr ""
+msgstr "Błędna grupa hostów dla operacji akcji. Grupa hostów nie istnieje lub brak praw dostępu do niej."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
-msgstr ""
+msgstr "Błędny host dla operacji akcji. Host nie istnieje lub brak praw dostępu do niego."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
-msgstr ""
+msgstr "Błędny port \"%s\" dla operacji akcji."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
-msgstr ""
+msgstr "Błędny czas trwania kroku operacji akcji."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
-msgstr "Nie poprawny typ operacji akcji."
+msgstr "Błędny typ operacji akcji."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
-msgstr ""
+msgstr "Błędna grupa użytkowników dla operacji akcji. Grupa użytkowników nie istnieje lub brak praw dostępu do niej."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
-msgstr ""
+msgstr "Błędny użytkownik dla operacji akcji. Użytkownik nie istnieje lub brak praw dostępu do niego."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
-msgstr ""
+msgstr "Błędne operationid akcji."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
-msgstr ""
+msgstr "Błędny algorytm dla serwisu \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Błędne argumenty przekazane do funkcji"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
-msgstr ""
+msgstr "Błędne argumenty przekazane do funkcji."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Błędne argumenty przekazane do metody."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Błędny protokół autoryzacji dla reguły wyszukiwania \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
-msgstr ""
+msgstr "Błędny protokół autoryzacji dla pozycji \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr "Błędna wartość zbiorcza dla interfejsu."
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
-msgstr ""
+msgstr "Błędna wyliczona wartość SLA dla usługi \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
-msgstr ""
+msgstr "Błędne znaki wykorzystane dla hosta \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Błędne znaki wykorzystane dla nazwy hosta \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
-msgstr ""
+msgstr "Błędne znaki wykorzystane dla nazwy proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
-msgstr ""
+msgstr "Błędne znaki wykorzystane dla nazwy szablonu \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr "Błędne warunki dla akcji \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Błędne warunki dla reguły wykrywania \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr "Błędne wyrażenie użytkownika \"%2$s\" dla akcji \"%1$s\": %3$s."
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
-msgstr ""
+msgstr "Błędne wyrażenie użytkownika \"%2$s\" dla reguły wykrywania \"%1$s\": %3$s."
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Błędne opóźnienie."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Błędne ID reguły wykrywania dla prototypu hosta \"%1$s\"."
 
 #: include/classes/validators/event/CEventSourceObjectValidator.php:66
 #, c-format
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
-msgstr ""
+msgstr "Błędny obiekt zdarzenia \"%1$s\" (%2$s) dla źródła zdarzenia \"%3$s\" (%4$s), wspierane są tylko następujące obiekty: %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
-msgstr ""
+msgstr "Błędna wartość eventobject."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
-msgstr ""
+msgstr "Błędna wartość eventsource."
 
 #: include/classes/db/DB.php:534 include/classes/db/DB.php:808
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Błędna nazwa lub wartośc pola \"%1$s\" w warunku WHERE dla tabeli \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
-msgstr ""
+msgstr "Błędne pola dla sysmap."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
-msgstr ""
+msgstr "Błędne pola dla wyzwalacza."
 
 #: include/classes/helpers/CUploadFile.php:159
 msgid "Incorrect file upload."
-msgstr ""
+msgstr "Błędne ładowanie pliku."
+
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr "Błędne ID formuły warunku filtra dla akcji \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Błędne ID formuły warunku filtra dla reguły wykrywania \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Błędne makro warunku filtra dla reguły wykrywania \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr "Błędny operator warunku filtra dla akcji \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Błędny operator warunku filtra dla reguły wykrywania \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr "Błędny typ warunku filtra dla akcji \"%1$s\"."
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
-msgstr ""
+msgstr "Błędny elastyczny interwał \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
-msgstr ""
+msgstr "Nieprawidłowy elastyczny interwał w pozycji \"%1$s\". Elastyczny interwał musi być ciągiem znaków."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr "Błędna wartość podążaj za dowiązaniami dla kroku \"%1$s\" scenariusza sieci www \"%2$s\"."
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Wykorzystano błędną funkcję"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
-msgstr ""
+msgstr "Błędne ID wykresu \"%1$s\" dla elementu ekranu."
+
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr "Błędne ID prototypu wykresu \"%1$s\" dla elementu ekranu."
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
-msgstr ""
+msgstr "Błędne ID prototypu grupy."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Błędne prototypy grupy dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
-msgstr ""
+msgstr "Błędne ID hosta \"%1$s\" dla elementu ekranu."
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
-msgstr ""
+msgstr "Błędne ID grupy hostów \"%1$s\" dla elementu ekranu."
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
-msgstr ""
+msgstr "Błędne ID grupy hostów dla prototypu grupy."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Błędna grupa hostów."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Błędne grupy hostów dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
-msgstr ""
+msgstr "Błędne ID prototypu hosta."
 
 #: image.php:46
 msgid "Incorrect image index."
-msgstr ""
+msgstr "Błędny indeks obrazu."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
-msgstr ""
+msgstr "Błędne parametry wejściowe."
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Podano błędny parametr DNS \"%s\" interfejsu."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Podano błędny parametr IP \"%s\" interfejsu."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
-msgstr ""
+msgstr "Podano błędny port interfejsu \"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
-msgstr "Podano błędne pole inwentarzowe \"%s\"."
+msgstr "Podano błędne pole inwentarza \"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
-msgstr ""
+msgstr "Błędne ID pozycji \"%1$s\" dla elementu ekranu."
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
-msgstr ""
+msgstr "Błędna pozycja dla wartości osi."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
-msgstr ""
+msgstr "Błędny klucz pozycji \"%1$s\" udostępniony dla wyrażenia wyzwalacza w \"%2$s\"."
+
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr "Błędne ID prototypu pozycji \"%1$s\" dla elementu ekranu."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
-msgstr ""
+msgstr "Błędny typ wartości pozycji \"%1$s\" udostępniony dla funkcji wyzwalacza \"%2$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Błędny klucz."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Błędna lista pozycji."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
-msgstr "Błędny okres utrzymania - data musi być z przedziału od 01.01.1970 do 18.01.2038"
+msgstr "Błędny okres utrzymania - data musi być z przedziału od 1970-01-01 do 2038-01-18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Błędna data okresu utrzymania"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Błędny przedział dnia okresu utrzymania"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Błędne dni tygodnia okresu utrzymania"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Błędny miesiąc dla okresu utrzymania"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Błędny okres utrzymania"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Błędny okres utrzymania (minimalnie 5 sekund)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Błędny tydzień dla okresu utrzymania"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
-msgstr ""
+msgstr "Błędne ID mapy \"%1$s\" dla elementu ekranu."
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Błędna wysokość mapy dla mapy \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Błędna szerokość mapy dla mapy \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr "Błędna ilość maksymalna kolumn dla elementu ekranu."
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
-msgstr ""
+msgstr "Błędna ścieżka menu dla skryptu \"%1$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
-msgstr ""
+msgstr "Błędna metoda \"%1$s.%2$s\"."
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
-msgstr ""
+msgstr "Błędna wartość obiektu."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
-msgstr ""
+msgstr "Błędny parametr dla akcji \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Błędny parametr dla operacji."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Błędny parametr wykorzystany w mapie ikon \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
-msgstr ""
+msgstr "Błędne parametry dla metody aktualizacji akcji \"%1$s\"."
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Błędne parametry dla warunku."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
-msgstr "Błędne parametry dla sposobu aktualizacji mapy ikon \"%s\"."
+msgstr "Błędne parametry dla metody aktualizacji mapy ikon \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Błędne parametry dla okresu utrzymania."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Błędne parametry dla grupy użytkowników."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
-msgstr ""
+msgstr "Błędny rodzic dla serwisu \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
-msgstr ""
+msgstr "Błędny serwis nadrzędny."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Błędny zakres portów."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Błędny protokół prywatności dla reguły wykrywania \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
-msgstr ""
+msgstr "Błędny protokół prywatności dla pozycji \"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Błędne proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr "Błędne wyrażenie regularne \"%1$s\": \"%2$s\""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Podano błędny typ zasobu dla pozycji ekranu."
 
 #: include/classes/server/CZabbixServer.php:238
 #, c-format
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
-msgstr ""
+msgstr "Otrzymano błędną odpowiedź z serwera Zabbix \"%1$s\"."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr "Błędna wartość trybu odzyskiwania dla kroku \"%1$s\" scenariusza sieci www \"%2$\"."
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
-msgstr ""
+msgstr "Błędne ID ekranu \"%1$s\" dla elementu ekranu."
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
-msgstr ""
+msgstr "Błędne ID ekranu."
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
-msgstr ""
+msgstr "Podano błędny ekran dla pokazu slajdów."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
-msgstr ""
+msgstr "Błędny czas końca usługi."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
-msgstr ""
+msgstr "Błędny czas startu usługi."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
-msgstr ""
+msgstr "Błędny typ czasu usługi."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
-msgstr ""
+msgstr "Błędna kolejność sorder dla usługi \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
-msgstr ""
+msgstr "Błędna wartość źródłowa."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
-msgstr ""
+msgstr "Błędny stan hosta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Błędny stan dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
-msgstr ""
+msgstr "Błędny stan dla serwisu \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Błędny stan."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
-msgstr ""
+msgstr "Błędny ID ekranu szablonu."
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
-msgstr ""
+msgstr "Błędny motyw dla użytkownika \"%1$s\"."
 
 #: include/classes/validators/CTimePeriodValidator.php:99
 #, c-format
 msgid "Incorrect time period \"%1$s\" start day must be less or equal to end day."
-msgstr ""
+msgstr "Błędny okres czasu \"%1$s\" dzień początkowy musi być mniejszy lub równy z dniem końcowym."
 
 #: include/classes/validators/CTimePeriodValidator.php:105
 #, c-format
 msgid "Incorrect time period \"%1$s\" start time must be less than end time."
-msgstr ""
+msgstr "Błędny okres czasu \"%1$s\" czas początkowy musi być mniejszy od czasu końcowego."
 
 #: include/classes/validators/CTimePeriodValidator.php:89
 #: include/classes/validators/CTimePeriodValidator.php:94
 #, c-format
 msgid "Incorrect time period \"%1$s\"."
-msgstr ""
+msgstr "Błędny okres czasu \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
-msgstr ""
+msgstr "Błędne ID wyzwalacza dla usługi \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Błędne wyrażenie wyzwalacza"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
-msgstr ""
+msgstr "Błędne wyrażenie wyzwalacza."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
-msgstr ""
+msgstr "Błędne wyrażenie wyzwalacza. Host \"%1$s\" nie istnieje lub nie posiadasz uprawnień dla tego hosta."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
-msgstr "Błędne wyrażenie wyzwalacza. Urządzenie \"%s\" nie istnieje lub nie posiadasz uprawnień dla tego urządzenia."
+msgstr "Błędne wyrażenie wyzwalacza. Urządzenie \"%s\" nie istnieje lub nie posiadasz uprawnień dla tego hosta."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
-msgstr "Błędne wyrażenie wyzwalacza. Elementy wyrażenia nie powinny należeć jednocześnie do szablonu i konkretnego urządzenia."
+msgstr "Błędne wyrażenie wyzwalacza. Elementy wyrażenia nie powinny należeć jednocześnie do szablonu i hosta."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
-msgstr ""
+msgstr "Błędna funkcja wyzwalacza \"%1$s\" udostępniona w wyrażeniu."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
-msgstr ""
+msgstr "Błędny typ asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr "Błędny typ obliczenia dla akcji \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Błędny typ obliczenia dla reguły wykrywania \"%1$s\"."
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Błędna grupa użytkownika."
 
 #: include/validate.inc.php:484
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
-msgstr ""
+msgstr "Błędna wartość \"%1$s\" dla pola \"%2$s\"."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
-msgstr ""
+msgstr "Błędna wartość \"%1$s\" dla pola \"%2$s\": musi być pomiędzy %3$s a %4$s."
 
 #: include/classes/db/DB.php:352
-#, fuzzy, c-format
+#, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
-msgstr "Niepoprawna wartość \"%s$s\" dla pola zmiennoprzecinkowego \"%2$s\"."
+msgstr "Błędna wartość \"%1$s\" dla pola zmiennoprzecinkowego \"%2$s\"."
 
 #: include/classes/db/DB.php:346
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
-msgstr "Niepoprawna wartość \"%1$s\" dla pola całkowitego \"%2$s\"."
+msgstr "Błędna wartość \"%1$s\" dla pola całkowitego \"%2$s\"."
 
 #: include/classes/db/DB.php:340
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
-msgstr "Niepoprawna wartość \"%1$s\" dla pola całkowitego bez znaku \"%2$s\"."
+msgstr "Błędna wartość \"%1$s\" dla pola całkowitego bez znaku \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
-msgstr ""
+msgstr "Błędna wartość dla pola \"%1$s\"."
 
 #: include/validate.inc.php:475
 #, c-format
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
-msgstr ""
+msgstr "Błędna wartość dla pola \"%1$s\": nie może być puste."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
-msgstr "Niepoprawna wartość dla setMessage(): \"%s\"."
+msgstr "Błędna wartość dla setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
-msgstr ""
+msgstr "Wykorzystano błędną wartość dla stanu proxy \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr "Błędne ID scenariusza sieci www."
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
-msgstr ""
+msgstr "Błędny czas pracy."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
-msgstr ""
+msgstr "Błędna pozycja maksymalna y dla wykresu \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
-msgstr ""
+msgstr "Błędna pozycja minimalna y dla wykresu \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
-msgstr ""
+msgstr "Indonezyjski (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Info"
 
@@ -7637,15 +7915,15 @@ msgstr "Info"
 msgid "Information"
 msgstr "Informacja"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Wprowadź"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Wprowadź makro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr "Wprowadź wyrażenie"
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Instalacja"
 
@@ -7653,292 +7931,296 @@ msgstr "Instalacja"
 msgid "Installer name"
 msgstr "Nazwa instalatora"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interfejs"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Interfejs jest połączony z pozycją \"%1$s\" w \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Interfejs jest wykorzystywany przez pozycje, które wymagają tego typu interfejsu."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
-msgstr ""
+msgstr "Interfejs z polem DNS \"%1$s\" nie może mieć pustego adresu IP."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
-msgstr ""
+msgstr "Interfejs o IP \"%1$s\" nie może mieć pustej nazwy DNS jeżeli właściwość \"Use DNS\" jest \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
-msgstr ""
+msgstr "Interfejs z polem IP \"%1$s\" nie może mieć pustej nazwy DNS."
 
 #: include/views/administration.authentication.edit.php:38
 msgctxt "authentication"
 msgid "Internal"
-msgstr ""
+msgstr "Wewnętrzna"
 
 #: include/views/configuration.action.list.php:36
 msgctxt "event source"
 msgid "Internal"
-msgstr ""
+msgstr "Wewnętrzny"
 
 #: include/users.inc.php:84
 msgctxt "user type"
 msgid "Internal"
-msgstr ""
+msgstr "Wewnętrzny"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Błąd wewnętrzny JSON-RPC."
 
 #: include/views/administration.general.housekeeper.edit.php:49
 msgid "Internal data storage period (in days)"
-msgstr ""
+msgstr "Okres przechowywania danych wewnętrznych (w dniach)"
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Błąd wewnętrzny."
 
 #: adm.housekeeper.php:37
 msgid "Internal event and alert data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych zdarzeń i alarmów wewnętrznych"
 
 #: adm.housekeeper.php:106
 #, c-format
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych zdarzeń i alarmów wewnętrznych (w dniach) \"%1$s\"."
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
-msgstr "Interwał"
+msgstr "Okres"
 
 #: include/views/configuration.host.discovery.edit.php:229
 #: include/views/configuration.item.edit.php:296
 #: include/views/configuration.item.massupdate.php:358
 msgid "Interval (in sec)"
-msgstr ""
+msgstr "Okres (w sek)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Nieprawidłowe dane JSON. Wystąpił błąd serwera podczas przetwarzania tekstu JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Nieprawidłowe żądanie."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
-msgstr ""
+msgstr "Nieprawidłowa data \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
-msgstr ""
+msgstr "Nieprawidłowy pierwszy parametr."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
-msgstr ""
+msgstr "Nieprawidłowy czwarty parametr."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
-msgstr ""
+msgstr "Nieprawidłowy hostid dla makra \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
-msgstr ""
+msgstr "Nieprawidłowy klucz \"%1$s\" dla reguły wykrywania \"%2$s\" w \"%3$s\": %4$s."
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
-msgstr ""
+msgstr "Nieprawidłowy klucz \"%1$s\" dla pozycji \"%2$s\" w \"%3$s\": %4$s."
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
-msgstr ""
+msgstr "Nieprawidłowy klucz \"%1$s\" dla prototypu pozycji \"%2$s\" w \"%3$s\": %4$s."
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
-msgstr ""
+msgstr "nieprawidłowy klucz \"%1$s\": %2$s."
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
-msgstr ""
-
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+msgstr "Nieprawidłowy okres utrzymania"
+
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Nieprawidłowe parametry metody."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
-msgstr ""
+msgstr "Nieprawidłowa liczba parametrów."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Nieprawidłowe parametry."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
-msgstr ""
+msgstr "Nieprawidłowy okres dla pola \"%1$s\"."
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
-msgstr ""
+msgstr "Nieprawidłowy kod odpowiedzi \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
-msgstr ""
+msgstr "Nieprawidłowy drugi parametr."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
-msgstr ""
+msgstr "Nieprawidłowy trzeci parametr."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
-msgstr ""
+msgstr "Nieprawidłowy okres czasu"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
-msgstr ""
+msgstr "Podano błędną nazwę widoku \"%s\". Dozwolone znaki: \"a-z\" and \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
-msgstr ""
+msgstr "Inwentarz dla hosta \"%1$s\" jest wyłączony."
 
 #: include/views/administration.general.iconmap.edit.php:41
 msgid "Inventory field"
 msgstr "Pole inwentarzowe"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Tryb inwentarzowy"
 
 #: include/views/administration.users.list.php:59
 msgid "Is online?"
-msgstr "Czy jest połączony?"
+msgstr "Czy jest włączony?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Problem"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
-msgstr ""
+msgstr "Nie można filtrować według hasła użytkownika."
 
 #: include/page_header.php:223
 msgid "It is not possible to logout from HTTP authentication."
-msgstr ""
+msgstr "Nie można się wylogować z autoryzacji HTTP."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
-msgstr ""
+msgstr "Nie można wyszukiwać według hasła użytkownika."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Włoski (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Pozycja"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
-msgstr ""
+msgstr "Pozycja \"%1$s\""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
-msgstr ""
+msgstr "Pozycja \"%1$s\" już istnieje w \"%2$s\", odziedziczona z innego szablonu."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Pozycja \"%1$s\" już istnieje w \"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Pozycja \"%1$s\" nie może wypełnić brakującego pola inwentarzowego hosta \"%2$d\". Wybór jest pomiędzy 0 (nie wypełniaj pola) do %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
-msgstr ""
+msgstr "W szablonie \"%2$s\" nie ma pozycji \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
-msgstr ""
+msgstr "Pozycja \"%1$s\" nie istnieje."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
-msgstr ""
+msgstr "Pozycja \"%1$s\" w \"%2$s\": aplikacja \"%3$s\" nie istnieje."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
-msgstr ""
+msgstr "Pominięto pozycję \"%1$s\" - reguła użytkownika."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Pozycja \"%1$s:%2$s\" posiada nieprawidłowy port: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Dodano pozycję"
 
@@ -7946,179 +8228,179 @@ msgstr "Dodano pozycję"
 msgid "Item count"
 msgstr "Ilość pozycji"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Usunięto pozycję"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono pozycję"
+msgstr[1] "Wyłączono pozycje"
+msgstr[2] "Wyłączono pozycje"
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono pozycję"
+msgstr[1] "Włączono pozycje"
+msgstr[2] "Włączono pozycje"
 
 #: include/actions.inc.php:1157
 msgid "Item in \"normal\" state"
-msgstr ""
+msgstr "Pozycja w stanie \"normalny\"."
 
 #: include/actions.inc.php:1156
 msgid "Item in \"not supported\" state"
-msgstr ""
+msgstr "Pozycja w stanie \"niewspierany\"."
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
-msgstr ""
+msgstr "Nie wybrano pozycji"
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Prototyp pozycji"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
-msgstr ""
+msgstr "Prototyp pozycji \"%1$s\" już istnieje w \"%2$s\", odziedziczony z innego szablonu."
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Prototyp pozycji \"%1$s\" już istnieje w \"%2$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
-msgstr ""
+msgstr "Dodano prototyp pozycji"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
-msgstr ""
+msgstr "Usunięto prototyp pozycji"
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono prototyp pozycji"
+msgstr[1] "Wyłączono prototypy pozycji"
+msgstr[2] "Wyłączono prototypy pozycji"
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono prototyp pozycji"
+msgstr[1] "Włączono prototypy pozycji"
+msgstr[2] "Włączono prototypy pozycji"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
-msgstr ""
+msgstr "Zaktualizowano prototyp pozycji"
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Prototypy pozycji"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
-msgstr ""
+msgstr "Usunięto prototypy pozycji"
 
 #: include/views/configuration.item.prototype.list.php:32
 msgid "Item prototypes of"
-msgstr ""
+msgstr "Prototypy pozycji"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
-msgstr "Uaktualniono pozycję"
+msgstr "Zaktualizowano pozycję"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Pozycja wykorzystuje interfejs hosta z hosta, który nie jest nadrzędny."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
-msgstr "Pozycja wykorzystuje niepoprawny rodzaj interfejsu."
+msgstr "Pozycja wykorzystuje niepoprawny typ interfejsu."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Pozycja nie zostanie odświeżona. Należy podać poprawny interwał odświeżania."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
-msgstr ""
+msgstr "Pozycja z kluczem \"%1$s\" już istnieje w \"%2$s\" jako reguła wykrywania."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
-msgstr ""
+msgstr "Pozycja z kluczem \"%1$s\" już istnieje w \"%2$s\" jako pozycja utworzona z prototypu pozycji."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
-msgstr ""
+msgstr "Pozycja z kluczem \"%1$s\" już istnieje w \"%2$s\" jako prototyp pozycji."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
-msgstr ""
+msgstr "Pozycja z kluczem \"%1$s\" już istnieje w \"%2$s\" jako pozycja."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
-msgstr ""
+msgstr "Pozycja z kluczem \"%1$s\" już istnieje w \"%2$s\" jako nieznany element pozycji."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Pozycja z kluczem \"%1$s\" już istnieje w \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
-msgstr ""
+msgstr "Pozycja z kluczem \"%1$s\" już istnieje."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Pozycje"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Pozycje (m/wył./nw)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Skopiowano pozycje"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Usunięto pozycje"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Lista pozycji"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
-msgstr "Uaktualniono pozycje"
+msgstr "Zaktualizowano pozycje"
 
 #: include/hosts.inc.php:474 include/items.inc.php:282
 msgid "JMX"
@@ -8128,114 +8410,114 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "Agent JMX"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "Interfejsy JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "JSON-rpc: wygenerowanie błędu się nie powiodło. Nie ma takiego błędu jak \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "Metoda JSON-rpc nie jest zdefiniowana."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "Parametry wywołania JSON-rpc nie są tablicą."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "Nie podano wersji JSON-rpc."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Identyfikator Jabbera"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Sty"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Styczeń"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japoński (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Lip"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Lipiec"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Cze"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Czerwiec"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
-msgstr ""
+msgstr "K"
 
 #: include/views/configuration.host.discovery.edit.php:247
 msgid "Keep lost resources period (in days)"
-msgstr ""
+msgstr "Okres przechowywania utraconych zasobów (w dniach)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Klucz"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Klucz \"%1$s\" nie pasuje do wyrażenia <grpmax|grpmin|grpsum|grpavg>[\"grupa hostów\", \"klucz pozycji\", \"<last|min|max|avg|sum|count>\", \"parametr\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
-msgstr ""
+msgstr "Hasło klucza"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Koreański (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "OSTATNIE DANE"
 
@@ -8251,79 +8533,79 @@ msgstr "Uwierzytelnianie LDAP"
 
 #: authentication.php:132
 msgid "LDAP authentication changed"
-msgstr ""
+msgstr "Zmieniono uwierzytelnianie LDAP"
 
 #: authentication.php:38
 #: include/views/administration.authentication.edit.php:67
 msgid "LDAP host"
-msgstr "Serwer LDAP"
+msgstr "Host LDAP"
 
 #: authentication.php:163
 msgid "LDAP login successful"
-msgstr ""
+msgstr "Pomyślnie zalogowano z LDAP"
 
 #: authentication.php:163
 msgid "LDAP login was not successful"
-msgstr ""
+msgstr "Logowanie LDAP nie powiodło się"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOKALNY"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "ZGUBIONE"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Etykieta"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Położenie etykiety"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Język"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Ostatnia"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
-msgstr ""
+msgstr "Ostatnia"
 
 #: dashboard.php:439
 #, c-format
 msgid "Last %1$d issue"
 msgid_plural "Last %1$d issues"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Ostatni %1$d problem"
+msgstr[1] "Ostatnie %1$d problemy"
+msgstr[2] "Ostatnie %1$d problemów"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
-msgstr ""
+msgstr "Ostatnia (najnowsza) wartość T jest < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
-msgstr ""
+msgstr "Ostatnia (najnowsza) wartość T jest = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
-msgstr ""
+msgstr "Ostatnia (najnowsza) wartość T jest > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
-msgstr ""
+msgstr "Ostatnia (najnowsza) wartość T NIE jest = N"
 
 #: srv_status.php:39
 msgid "Last 24 hours"
@@ -8341,28 +8623,28 @@ msgstr "Ostatnie 365 dni"
 msgid "Last 7 days"
 msgstr "Ostatnie 7 dni"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Ostatnia zmiana"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Ostatnia zmiana (malejąco)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Ostatnie sprawdzenie"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Wykres z ostatniej godziny"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Wykres z ostatniego miesiąca"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Ostatni z"
 
@@ -8370,161 +8652,152 @@ msgstr "Ostatni z"
 msgid "Last seen (age)"
 msgstr "Ostatnio widziane (wiek)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Ostatnia wartość"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Wykres z ostatniego tygodnia"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Ostatnie dane"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Ostatnie zdarzenia"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
-msgstr ""
+msgstr "Ostatnie wartości"
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Łotewski (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
-msgstr "Lewy"
+msgstr "Z lewej"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legenda"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
-msgstr ""
+msgstr "Długość ostatniej (najnowszej) wartości T w znakach jest < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
-msgstr ""
+msgstr "Długość ostatniej (najnowszej) wartości T w znakach jest = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
-msgstr ""
+msgstr "Długość ostatniej (najnowszej) wartości T w znakach jest > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
-msgstr ""
+msgstr "Długość ostatniej (najnowszej) wartości T w znakach NIE jest = N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Linia"
 
 #: include/views/configuration.sysmap.constructor.php:71
 msgid "Link"
-msgstr "Powiązanie"
+msgstr "Połączenie"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
-msgstr "Wskaźnik powiązania"
+msgstr "Wskaźnik połączenia"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Nazwa powiązania powinna być unikalna dla mapy \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
-msgstr ""
+msgstr "Połącz nowe szablony"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
-msgstr "Pole selementid1 powiązania wskazuje na nieistniejący identyfikator selement mapy \"%1$s\" dla mapy \"%2$s\"."
+msgstr "Pole selementid1 połączenia wskazuje na nieistniejący identyfikator selement mapy \"%1$s\" dla mapy \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
-msgstr "Pole selementid2 powiązania wskazuje na nieistniejący identyfikator selement mapy \"%1$s\" dla mapy \"%2$s\"."
+msgstr "Pole selementid2 połączenia wskazuje na nieistniejący identyfikator selement mapy \"%1$s\" dla mapy \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Powiązanie powinno posiadać wypełnione pola \"nazwa\" i \"url\" dla mapy \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
-msgstr ""
+msgstr "Połącz szablony"
 
 #: include/actions.inc.php:614
 msgid "Link to template"
-msgstr "Powiąż z szablonem"
+msgstr "Połącz z szablonem"
 
 #: include/actions.inc.php:429
 msgid "Link to templates"
-msgstr "Powiąż z szablonami"
+msgstr "Połącz z szablonami"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
-msgstr "Powiąż z szablonami"
+msgstr "Połącz z szablonami"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
-msgstr "Powiązane szablony"
+msgstr "Połączone szablony"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
-msgstr "Powiązano z"
+msgstr "Połączono z"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
-msgstr ""
+msgstr "Połączenia pomiędzy wybranymi elementami"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
-msgstr ""
+msgstr "Połączenia dla wybranego elementu"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Lista jest pusta"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
-msgstr ""
+msgstr "Lista interfejsów sieciowych. Wartość tekstowa."
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
-msgstr ""
+msgstr "Litewski (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Wczytywanie…"
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Czas lokalny"
 
@@ -8541,50 +8814,50 @@ msgid "Location longitude"
 msgstr "Wysokość geograficzna"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
-msgstr ""
+msgstr "Poziom ostatniego wpisu logu jest < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
-msgstr ""
+msgstr "Poziom ostatniego wpisu logu jest = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
-msgstr ""
+msgstr "Poziom ostatniego wpisu logu jest > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
-msgstr ""
+msgstr "Poziom ostatniego wpisu logu NIE jest = N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
-msgstr ""
+msgstr "Źródło logu ostatniego wpisu logu jest zgodne z parametrem T, wtedy N = 1, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
-msgstr ""
+msgstr "Źródło logu ostatniego wpisu logu jest zgodne z parametrem T, wtedy N NOT 1, 0 - w przeciwnym przypadku"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Format czasu dla logowania"
 
 #: include/views/administration.general.other.edit.php:38
 msgid "Log unmatched SNMP traps"
-msgstr "Logowanie niedopasowanych trapów SNMP"
+msgstr "Logowanie niedopasowanych pułapek SNMP"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Zalogowano jako"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8593,26 +8866,27 @@ msgstr "Logowanie"
 
 #: include/views/general.login.php:80
 msgid "Login as Guest"
-msgstr "Zalogowany jako Gość"
+msgstr "Zaloguj jako Gość"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
-msgstr ""
+msgstr "Logowanie się nie powiodło \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
-msgstr ""
+msgstr "Nazwa logowania \"%1$s\" nie jest zgodna z nazwą \"%2$s\" użytą do autoryzacji HTTP."
 
 #: authentication.php:122
 msgid "Login name or password is incorrect!"
-msgstr ""
+msgstr "Podany login i/lub hasło są niepoprawne!"
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
-msgstr ""
+msgstr "Podany login i/lub hasło są niepoprawne."
 
 #: auditlogs.php:140 include/page_header.php:222 include/page_header.php:226
 #: include/views/administration.auditlogs.list.php:44
@@ -8625,30 +8899,26 @@ msgstr "Stracone"
 
 #: include/actions.inc.php:1159
 msgid "Low-level discovery rule in \"normal\" state"
-msgstr ""
+msgstr "Nisko-poziomowa reguła wykrywania w stanie \"normalny\""
 
 #: include/actions.inc.php:1158
 msgid "Low-level discovery rule in \"not supported\" state"
-msgstr ""
+msgstr "Nisko-poziomowa reguła wykrywania w stanie \"niewspierany\""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
-msgstr ""
+msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
-msgstr ""
-
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M R"
+msgstr "P"
 
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
-msgstr ""
+msgstr "Adres MAC - domyślnie wyświetla wszystkie adresy MAC wraz z nazwami interfejsów"
 
 #: include/hosts.inc.php:160 include/views/inventory.host.list.php:81
 msgid "MAC address A"
@@ -8658,7 +8928,7 @@ msgstr "MAC adres A"
 msgid "MAC address B"
 msgstr "MAC adres B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "OKRES UTRZYMANIA"
 
@@ -8676,96 +8946,101 @@ msgstr "MD5"
 
 #: report5.php:51
 msgid "MOST BUSY TRIGGERS TOP 100"
-msgstr "NAJCZĘSTSZE WYZWALACZE TOP 100"
+msgstr "NAJBARDZIEJ ZAJĘTE WYZWALACZE TOP 100"
 
 #: include/audit.inc.php:49 include/views/common.macros.php:38
 #: include/views/configuration.host.discovery.edit.php:291
 msgid "Macro"
 msgstr "Makro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Makro \"%1$s\" już istnieje w \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
-msgstr ""
+msgstr "Makro \"%1$s\" już istnieje."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
-msgstr ""
+msgstr "Makro \"%1$s\" nie jest unikalne."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
-msgstr ""
+msgstr "Wartość makra \"%1$s\" jest zbyt długa, powinna być krótsza niż 255 znaków."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
-msgstr ""
+msgstr "Nazwa makra \"%1$s\" jest zbyt długa, powinna być krótsza niż 64 znaków."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
-msgstr ""
+msgstr "Makro z globalmacroid \"%1$s\" nie istnieje."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
-msgstr ""
+msgstr "Makro z hostmacroid \"%1$s\" nie istnieje."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Makra"
 
 #: adm.macros.php:141
 msgid "Macros updated"
-msgstr "Uaktualniono makra"
+msgstr "Zaktualizowano makra"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Okres utrzymania"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Okres utrzymania \"%s\" już istnieje."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr "Okres utrzymania \"%1$s\" już istnieje."
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
-msgstr ""
+msgstr "Wartość okresu utrzymania \"Aktywne od\" nie może być większa od \"Aktywne do\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
-msgstr ""
+msgstr "Wartość warunku akcji utrzymania powinna być pusta."
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Dodano okres utrzymania"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Usunięto okres utrzymania"
 
 #: include/views/configuration.maintenance.edit.php:150
 msgid "Maintenance period"
-msgstr ""
+msgstr "Okres utrzymania"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Długość okresu utrzymania"
 
@@ -8779,27 +9054,27 @@ msgstr "Stan okresu utrzymania"
 
 #: include/views/configuration.maintenance.edit.php:43
 msgid "Maintenance type"
-msgstr "Rodzaj okresu utrzymania"
+msgstr "Typ okresu utrzymania"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
-msgstr "Uaktualniono okres utrzymania"
+msgstr "Zaktualizowano okres utrzymania"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Okres utrzymania ze zbieraniem danych"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Okres utrzymania bez zbierania danych"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
-msgstr ""
+msgstr "Brak wymaganego parametru."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Ręcznie"
 
@@ -8810,75 +9085,75 @@ msgstr "Ręczne Wylogowanie"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Mapa"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
-msgstr ""
+msgstr "Pominięto mapę \"%1$s\" - reguła użytkownika."
 
 #: include/views/configuration.sysmap.constructor.php:67
 #, c-format
 msgid "Map \"%s\""
 msgstr "Mapa \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Utworzono mapę \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
-msgstr "Uaktualniono mapę \"%s\"."
+msgstr "Zaktualizowano mapę \"%s\"."
 
 #: sysmap.php:85
 msgid "Map is saved! Return?"
-msgstr "Mapa została zapisania. Powrócić?"
+msgstr "Mapa została zapisana. Powrócić?"
 
 #: include/views/configuration.sysmap.edit.php:99
 msgid "Map label type"
-msgstr "Rodzaj etykiety mapy"
+msgstr "Typ etykiety mapy"
 
 #: sysmap.php:88
 msgid "Map save operation failed."
 msgstr "Zapisywanie mapy się nie powiodło."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
-msgstr ""
+msgstr "Mapa o nazwie \"%s\" już istnieje."
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
-msgstr ""
+msgstr "Mapowanie na"
 
 #: include/valuemap.inc.php:154
 #, c-format
 msgid "Mapping value \"%1$s\" is not unique."
-msgstr ""
+msgstr "Wartość mapowania \"%1$s\" nie jest unikalna."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Mapowania"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Mapy"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Marzec"
 
@@ -8886,27 +9161,33 @@ msgstr "Marzec"
 msgid "Mark elements on trigger status change"
 msgstr "Zaznacz elementy po zmianie stanu wyzwalacza"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Zaznacz inne"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Zaznacz wybrane"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
-msgstr ""
+msgstr "Maska"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
-msgstr "Uaktualnienie masowe"
+msgstr "Aktualizacja masowa"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
-msgstr "Masowo uaktualnij pozycje"
+msgstr "Masowo aktualizuj pozycje"
+
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr "Ilość maksymalna kolumn"
 
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
@@ -8915,151 +9196,120 @@ msgstr "Maksymalna liczba pozycji do wyświetlenia w komórce tabeli"
 #: adm.gui.php:79
 #, c-format
 msgid "Max count of elements to show inside table cell \"%1$s\"."
-msgstr ""
+msgstr "Maksymalna liczba pozycji do wyświetlenia w komórce tabeli \"%1$s\"."
 
 #: adm.gui.php:38 include/views/administration.general.gui.edit.php:45
 msgid "Max count of events per trigger to show"
 msgstr "Maksymalna pokazywana liczba zdarzeń na wyzwalacz"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Zmaksymalizuj"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
 msgid "Maximum number of flexible intervals added"
-msgstr ""
+msgstr "Dodano maksymalną liczbę elastycznych interwałów"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
-msgstr ""
+msgstr "Maksymalna liczba otwartych plików wspierana przez system operacyjny."
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
-msgstr ""
+msgstr "Maksymalna liczba procesów wspierana przez system operacyjny."
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Maksymalny okres czasu do wyświetlenia to %1$s dzień."
+msgstr[1] "Maksymalny okres czasu do wyświetlenia to %1$s dni."
+msgstr[2] "Maksymalny okres czasu do wyświetlenia to %1$s dni."
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
-msgstr ""
+msgstr "Maksymalna wartość w okresie T jest < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
-msgstr ""
+msgstr "Maksymalna wartość w okresie T jest = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
-msgstr ""
+msgstr "Maksymalna wartość w okresie T jest > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
-msgstr ""
-
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr "Maksymalna wartość w okresie T NIE jest = N"
 
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Maj"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Media"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
-msgstr "Rodzaj mediów"
+msgstr "Typ mediów"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
-msgstr ""
+msgstr "Typ mediów \"%s\" już istnieje."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
-msgstr "Dodano rodzaj mediów"
+msgstr "Dodano typ mediów"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
-msgstr "Usunięto rodzaj mediów"
+msgstr "Usunięto typ mediów"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono typ mediów"
+msgstr[1] "Wyłączono typy mediów"
+msgstr[2] "Wyłączono typy mediów"
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono typ mediów"
+msgstr[1] "Włączono typy mediów"
+msgstr[2] "Włączono typy mediów"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
-msgstr "Uaktualniono rodzaj mediów"
+msgstr "Zaktualizowano typ mediów"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
-msgstr "Rodzaje mediów"
+msgstr "Typy mediów"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
-msgstr ""
+msgstr "Typy mediów użyte przez akcję \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9071,17 +9321,17 @@ msgstr "Członkowie"
 #: include/classes/debug/CProfiler.php:147
 #, c-format
 msgid "Memory limit: %s"
-msgstr ""
+msgstr "Limit pamięci: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
-msgstr ""
+msgstr "Pamięć używana przez procesy. <name> nazwa procesu (domyślnie: \"all processes\"). <user> nazwa użytkownika (domyślnie: \"all users\"). <mode> możliwe wartości: avg, max, min, sum (domyślna). <cmdline> filtr linii komend (wspiera wyrażenia regularne). Przykład: proc.mem[,root]."
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9091,7 +9341,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Wiadomość"
 
@@ -9099,161 +9349,158 @@ msgstr "Wiadomość"
 msgid "Message actions"
 msgstr "Działania komunikatu"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Ograniczenie długości komunikatu"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Czas wygaśniecia komunikatu"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Czas wygaśnięcia komunikatu (w sekundach)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Komunikaty"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Komunikacja"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Nie znaleziono metody."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Środek"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Zminimalizuj"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
-msgstr ""
+msgstr "Minimalna wymagana przez PHP ilość pamięci to %s (opcja konfiguracji \"memory_limit\")."
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
-msgstr ""
+msgstr "Minimalny wymagany przez PHP rozmiar ładowanych plików to %s (opcja konfiguracji \"upload_max_filesize\")."
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
-msgstr ""
+msgstr "Minimalna wymagana wersja PHP to %s."
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
-msgstr ""
+msgstr "Minimalny wymagany limit czasu wykonania dla skryptów PHP to %s (opcja konfiguracji \"max_execution_time\")."
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
-msgstr ""
+msgstr "Minimalny wymagany limit czasu kontroli wejścia dla skryptów PHP to %s (opcja konfiguracji \"max_input_time\")."
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
-msgstr ""
+msgstr "Minimalny wymagany rozmiar zapytania post PHP to %s (opcja konfiguracji \"post_max_size\")."
 
 #: include/views/monitoring.maps.php:40
 msgid "Minimum severity"
-msgstr ""
+msgstr "Minimalny poziom"
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Minimalny okres czasu do wyświetlenia to %1$s godzina."
+msgstr[1] "Minimalny okres czasu do wyświetlenia to %1$s godziny."
+msgstr[2] "Minimalny okres czasu do wyświetlenia to %1$s godzin."
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
-msgstr ""
+msgstr "Minimalny poziom wyzwalacza"
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
-msgstr ""
+msgstr "Minimalna wartość w okresie T jest < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
-msgstr ""
+msgstr "Minimalna wartość w okresie T jest = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
-msgstr ""
+msgstr "Minimalna wartość w okresie T jest > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
-msgstr ""
+msgstr "Minimalna wartość w okresie T NIE jest = N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Minuty"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
-msgstr ""
+msgstr "Brakujące pole \"%1$s\" dla pozycji."
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
-msgstr ""
+msgstr "Brakujące pole \"%1$s\" dla okresu."
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
-msgstr ""
+msgstr "Brakujące pole \"gitemid\" dla pozycji."
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
-msgstr ""
+msgstr "Brakujące pole \"itemid\" dla pozycji."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
-msgstr ""
+msgstr "Brakujące pole \"name\" dla prototypu wykresu."
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
-msgstr ""
+msgstr "Brakujące pole \"name\" dla wykresu."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
-msgstr ""
+msgstr "Brakująca pozycja \"%1$s\" dla hosta \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
-msgstr ""
+msgstr "Brakujące pozycje dla wykresu \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
-msgstr ""
+msgstr "Brakujące pozycje dla prototypu wykresu \"%1$s\"."
 
 #: include/graphs.inc.php:312
 #, c-format
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Brakujący klucz \"%1$s\" dla hosta \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
-msgstr ""
+msgstr "Brak parametru: usrgrpids."
 
 #: include/views/administration.proxy.list.php:41 report2.php:193
 msgid "Mode"
@@ -9263,18 +9510,18 @@ msgstr "Tryb"
 msgid "Model"
 msgstr "Model"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Pn"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Monitorowany przez proxy"
 
@@ -9282,62 +9529,62 @@ msgstr "Monitorowany przez proxy"
 msgid "Monitored host"
 msgstr "Monitorowany host"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
-msgstr "Monitoring"
+msgstr "Monitorowanie"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
-msgstr ""
+msgstr "Monitorowanie logów zdarzeń Windows. pattern, severity, eventid - wyrażenia regularne"
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
-msgstr ""
+msgstr "Monitorowanie pliku logów z rotacją. fileformat - [path][regexp], pattern - wyrażenie regularne"
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
-msgstr ""
+msgstr "Monitorowanie pliku logów. pattern - wyrażenie regularne"
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Miesiąc"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Miesięcznie"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
-msgstr ""
+msgstr "Znaleziono więcej dopasowań..."
 
 #: queue.php:107 queue.php:155
 msgid "More than 10 minutes"
 msgstr "Ponad 10 minut"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
-msgstr ""
+msgstr "Więcej niż jeden wykres o nazwie \"%1$s\" w hoście."
 
 #: report5.php:24
 msgid "Most busy triggers top 100"
-msgstr "Najczętsze wyzwalacze top 100"
+msgstr "Najbardziej zajęte wyzwalacze top 100"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
-msgstr "Wielokrotne zdarzenia rodzaju PROBLEM"
+msgstr "Wielokrotne zdarzenia typu PROBLEM"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
-msgstr ""
+msgstr "Wielokrotne generowanie zdarzenia typu PROBLEM"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Wycisz"
 
@@ -9350,60 +9597,58 @@ msgstr "MAPY SIECI"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "BRAK DANYCH"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "Uwierzytelnianie NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr "NTLM"
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9414,95 +9659,101 @@ msgstr "Uwierzytelnianie NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Nazwa"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr "Imię"
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
-msgstr ""
+msgstr "Nazwa dla prototypu grupy \"%1$s\" musi zawierać makra."
 
 #: include/views/administration.general.housekeeper.edit.php:53
 msgid "Network discovery data storage period (in days)"
-msgstr ""
+msgstr "Okres przechowywania danych wykrywania sieci (w dniach)"
 
 #: adm.housekeeper.php:40
 msgid "Network discovery event and alert data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych zdarzeń i alarmów dla wykrywania sieci"
 
 #: adm.housekeeper.php:107
 #, c-format
 msgid "Network discovery event and alert data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych zdarzeń i alarmów dla wykrywania sieci (w dniach) \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
-msgstr ""
+msgstr "Statystyki wejścia interfejsu sieciowego. Wartość całkowita. Jeżeli tryb jest pusty, użyte zostaną bajty."
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
-msgstr ""
+msgstr "Statystyki wyjścia interfejsu sieciowego. Wartość całkowita. Jeżeli tryb jest pusty, użyte zostaną bajty."
 
 #: sysmaps.php:174
 msgid "Network map added"
 msgstr "Dodano mapę sieci"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Usunięto mapę sieci"
 
 #: sysmaps.php:167
 msgid "Network map updated"
-msgstr "Uaktualniono mapę sieci"
+msgstr "Zaktualizowano mapę sieci"
 
 #: maps.php:25
 msgid "Network maps"
 msgstr "Mapy sieci"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Nigdy"
 
 #: httpdetails.php:154 httpdetails.php:228
 msgid "Never executed"
-msgstr ""
+msgstr "Nigdy nie wykonano"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Nowy"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
-msgstr "Nowa program"
+msgstr "Nowa aplikacja"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Nowy warunek"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Nowa pozycja"
 
@@ -9513,16 +9764,16 @@ msgstr "Nowa pozycja"
 msgid "New flexible interval"
 msgstr "Nowy elastyczny interwał"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Nowa grupa"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Nowa grupa hostów"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Nowy pozycja dla tego wykresu"
 
@@ -9530,115 +9781,131 @@ msgstr "Nowy pozycja dla tego wykresu"
 msgid "New media"
 msgstr "Nowe media"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Nowe wyrażenie regularne"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Nowy czas obsługi"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Następna"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
-msgstr ""
+msgstr "Dalej"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Nie"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
-msgstr ""
+msgstr "Nie podano \"%1$s\" dla prototypu wykresu."
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
-msgstr ""
+msgstr "Nie podano \"%1$s\" dla wykresu."
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
-msgstr ""
+msgstr "Nie podano \"%1$s\" dla prototypu hosta."
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
-msgstr ""
+msgstr "Nie podano \"%1$s\" dla ekranu."
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
-msgstr ""
+msgstr "Nie podano \"%1$s\" dla ekranu szablonu."
+
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr "Nie podano \"%1$s\" dla scenariusza sieci www."
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr "Nie podano \"%2$s\" dla warunku filtra akcji \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nie podano \"%2$s\" dla warunku filtra reguły wykrywania \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Nie podano \"%2$s\" dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr "Nie podano \"%2$s\" dla filtra akcji \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nie podano \"%2$s\" dla filtra reguły wykrywania \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
-msgstr ""
+msgstr "Brak pola \"ymax_type\" dla wykresu \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
-msgstr ""
+msgstr "Brak pola \"ymin_type\" dla wykresu \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
-msgstr ""
+msgstr "Nie znaleziono interfejsów IPMI."
 
 #: include/views/configuration.services.child.list.php:35
 msgid "No IT services found."
-msgstr ""
+msgstr "Nie znaleziono usług IT."
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
-msgstr ""
+msgstr "Nie znaleziono interfejsów JMX."
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
-msgstr ""
+msgstr "Nie określono OID SNMP."
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
-msgstr ""
+msgstr "Nie określono hasła SNMP."
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
-msgstr ""
+msgstr "Nie określono interfejsów SNMP."
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Nie podano adresu URL dla elementu ekranu."
 
 #: include/views/configuration.sysmap.edit.php:135
 msgid "No URLs defined."
-msgstr ""
+msgstr "Nie zdefiniowano żadnego URL."
 
 #: include/forms.inc.php:241
 msgid "No accessible resources"
@@ -9646,61 +9913,62 @@ msgstr "Brak dostępnych zasobów"
 
 #: include/acknow.inc.php:48
 msgid "No acknowledges found."
-msgstr ""
+msgstr "Nie znaleziono powiadomień."
 
 #: include/classes/screens/CScreenActions.php:126
 #: include/views/administration.auditacts.list.php:67
 msgid "No action log entries found."
-msgstr ""
+msgstr "Nie znaleziono pozycji logu akcji."
 
 #: include/actions.inc.php:817 include/actions.inc.php:913
 #: include/actions.inc.php:967 include/views/configuration.action.list.php:48
 msgid "No actions found."
-msgstr ""
+msgstr "Nie znaleziono akcji."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
-msgstr ""
+msgstr "Nie znaleziono interfejsów agenta."
 
 #: include/hosts.inc.php:577
 #, c-format
 msgid "No application with ID \"%1$s\"."
-msgstr ""
+msgstr "Brak aplikacji z ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
-msgstr ""
+msgstr "Nie znaleziono aplikacji."
 
 #: include/views/administration.auditlogs.list.php:83
 msgid "No audit log entries found."
-msgstr ""
+msgstr "Nie znaleziono pozycji logu audytu."
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
-msgstr ""
+msgstr "Nie określono typu autoryzacji dla polecenia operacji akcji \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
-msgstr ""
+msgstr "Nie określono nazwy użytkownika autoryzacji dla polecenia operacji akcji \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
-msgstr ""
+msgstr "Nie określono nazwy użytkownika do autoryzacji."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
-msgstr ""
+msgstr "Nie określono polecenia dla operacji akcji."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
-msgstr ""
+msgstr "Nie określono typu polecenia dla operacji akcji."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Nie zdefiniowano żadnych warunków."
 
@@ -9709,171 +9977,181 @@ msgstr "Nie zdefiniowano żadnych warunków."
 msgid "No data collection"
 msgstr "Bez zbierania danych"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
-msgstr ""
+msgstr "Nie otrzymano danych w okresie czasu T, wtedy N = 1, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
-msgstr ""
+msgstr "Nie otrzymano danych w okresie czasu T, wtedy N NOT 1, 0 - w przeciwnym przypadku"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
-msgstr ""
+msgstr "Brak domyślnego interfejsu dla typu \"%1$s\" w \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Nie zdefiniowano żadnych zależności."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Bez szczegółów"
 
 #: include/views/monitoring.discovery.php:36
 msgid "No discovered devices found."
-msgstr ""
+msgstr "Nie wykryto żadnych urządzeń."
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Nie podano ID reguły wykrywania dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Nie podano żadnego identifykatora reguł wykrywania."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
-msgstr ""
+msgstr "nie znaleziono reguł wykrywania."
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
-msgstr ""
+msgstr "Nie znaleziono błędów."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
-msgstr ""
+msgstr "Brak zdarzeń"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
-msgstr ""
+msgstr "Nie znaleziono zdarzeń."
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Brak zdarzeń do potwierdzenia"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
-msgstr ""
+msgstr "Nie określono celu wykonania dla polecenia operacji akcji \"%s\"."
 
 #: include/classes/helpers/CUploadFile.php:156
 msgid "No file was uploaded."
-msgstr ""
+msgstr "Nie załadowano pliku."
 
 #: include/views/configuration.host.discovery.edit.php:195
 #: include/views/configuration.item.edit.php:262
 #: include/views/configuration.item.massupdate.php:318
 msgid "No flexible intervals defined."
-msgstr ""
+msgstr "Nie zdefiniowano elastycznych interwałów."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Nie podano ID wykresu dla elementu ekranu."
 
 #: include/graphs.inc.php:274
 #, c-format
 msgid "No graph item with graphid \"%s\"."
-msgstr ""
+msgstr "Brak pozycji wykresu z graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr "Brak ID prototypu wykresu dla elementu ekranu."
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
-msgstr ""
+msgstr "Nie znaleziono prototypów wykresów."
 
 #: include/blocks.inc.php:114
 msgid "No graphs added."
-msgstr ""
+msgstr "Nie dodano wykresów."
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
-msgstr ""
+msgstr "Nie znaleziono wykresów."
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Nie ma żadnych grup dla hosta \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Nie ma żadnych grup dla hostów."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
-msgstr ""
+msgstr "Nie ma żadnych grup dla szablonu \"%1$s\"."
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
-msgstr ""
+msgstr "Nie ma żadnych grup dla szablonu."
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Nie podano identyfikatorów hosta."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
-msgstr ""
+msgstr "Nie podano hosta dla makra \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
-msgstr ""
+msgstr "Nie podano Id grupy hostów dla prototypu grupy."
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Nie podano Id grupy hostów dla elementu ekranu."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
-msgstr ""
+msgstr "Nie znaleziono grup hostów."
 
 #: include/hosts.inc.php:493
 #, c-format
 msgid "No host groups with groupid \"%s\"."
-msgstr "Nie znaleziono żadnych grup hostów o identifykatorze \"%s\"."
+msgstr "Nie znaleziono grup hostów z groupid \"%s\"."
 
 #: include/views/configuration.host.prototype.list.php:44
 msgid "No host prototypes found."
-msgstr ""
+msgstr "Nie znaleziono prototypów hostów."
+
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr "Nie wybrano hosta."
 
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Nie znaleziono hosta z hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
-msgstr ""
+msgstr "Nie znaleziono hostów."
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
-msgstr ""
+msgstr "Brak ikony dla elementu mapy \"%s\"."
 
 #: include/views/administration.general.iconmap.list.php:22
 msgid "No icon maps found."
-msgstr ""
+msgstr "Nie znaleziono mapy ikon."
 
 #: include/views/configuration.sysmap.edit.php:47
 msgid "No image"
@@ -9881,377 +10159,431 @@ msgstr "Brak obrazka"
 
 #: include/views/administration.general.image.list.php:36
 msgid "No images found."
-msgstr ""
+msgstr "Nie znaleziono obrazów."
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
-msgstr ""
+msgstr "Nie znaleziono interfejsu"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
-msgstr ""
+msgstr "Nie znaleziono interfejsu."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
-msgstr ""
+msgstr "Nie podano interfejsu dla proxy \"%s\"."
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Brak interfejsów dla hosta \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Nie podano ID pozycji dla elementu ekranu."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
-msgstr ""
+msgstr "Nie znaleziono kluczy pozycji."
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr "Brak ID prototypu pozycji dla elementu ekranu."
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
-msgstr ""
+msgstr "Nie znaleziono prototypów pozycji."
 
 #: include/items.inc.php:530
 #, c-format
 msgid "No item with itemid \"%1$s\"."
-msgstr ""
+msgstr "Nie znaleziono pozycji z itemid \"%1$s\"."
 
 #: include/items.inc.php:513
 #, c-format
 msgid "No item with itemid=\"%1$s\"."
-msgstr ""
+msgstr "Nie znaleziono pozycji z itemid=\"%1$s\"."
 
 #: chart3.php:120
 msgid "No items defined."
-msgstr "Nie zdefiniowano żadnych pozycji."
+msgstr "Nie zdefiniowano pozycji."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
-msgstr ""
+msgstr "Nie znaleziono pozycji."
 
 #: include/views/common.macros.php:27
 msgid "No macros found."
-msgstr ""
+msgstr "Nie znaleziono makr."
 
 #: include/views/configuration.maintenance.edit.php:98
 msgid "No maintenance periods defined."
-msgstr ""
+msgstr "Nie zdefiniowano okresów konserwacji."
 
 #: include/views/configuration.maintenance.list.php:41
 msgid "No maintenance periods found."
-msgstr ""
+msgstr "Nie znaleziono okresów konserwacji."
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Nie podano ID mapy dla elementu ekranu."
 
 #: include/blocks.inc.php:172
 msgid "No maps added."
-msgstr ""
+msgstr "Nie dodano map."
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
-msgstr ""
+msgstr "Nie znaleziono map."
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
-msgstr ""
+msgstr "Nie znaleziono"
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
-msgstr ""
+msgstr "Nie znaleziono medium."
 
 #: include/views/administration.mediatypes.list.php:36
 msgid "No media types found."
-msgstr ""
+msgstr "Nie znaleziono typu mediów."
 
 #: report4.php:69
 msgid "No notifications found."
-msgstr ""
+msgstr "Nie znaleziono powiadomień."
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
-msgstr ""
+msgstr "Nie zdefiniowano operacji."
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
-msgstr ""
+msgstr "Brak uprawnień dla wykresu \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
-msgstr ""
+msgstr "Brak uprawnień dla hosta \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
-msgstr ""
+msgstr "Brak uprawnień dla elementu \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
-msgstr ""
+msgstr "Brak uprawnień dla szablonu \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr ""
+msgid "No permission for trigger \"%1$s\"."
+msgstr "Brak uprawnień dla wyzwalacza \"%1$s\"."
 
 #: slides.php:91
 msgid "No permissions"
-msgstr ""
+msgstr "Brak uprawnień"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr ""
+msgid "No permissions for host group \"%1$s\"."
+msgstr "Brak uprawnień dla grupy hostów \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
-msgstr ""
+msgstr "Brak uprawnień dla mapy \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
-msgstr ""
+msgstr "Brak uprawnień dla ekranu \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Brak uprawnień dla dostępu do systemu."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Brak uprawnień do tego obiektu lub obiekt nie istnieje!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
-msgstr ""
+msgstr "Nie określono pliku klucza prywatnego dla polecenia operacji akcji \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
-msgstr ""
+msgstr "Nie określono pliku klucza prywatnego."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
-msgstr ""
+msgstr "Nie znaleziono proxy."
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Bez proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
-msgstr ""
+msgstr "Nie określono pliku klucza publicznego dla polecenia operacji akcji \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
-msgstr ""
+msgstr "Nie określono pliku klucza publicznego."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
-msgstr ""
+msgstr "Brak odbiorców dla komunikatu operacji akcji."
 
 #: include/views/administration.general.regularexpressions.list.php:28
 msgid "No regular expressions found."
-msgstr ""
+msgstr "Nie znaleziono wyrażenia regularnego."
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Nie podano ID ekranu dla elementu ekranu."
 
 #: include/blocks.inc.php:251
 msgid "No screens added."
-msgstr ""
+msgstr "Nie dodano ekranów."
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
-msgstr ""
+msgstr "Nie znaleziono ekranów."
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
-msgstr ""
+msgstr "Nie określono skryptu dla komendy operacji akcji."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
-msgstr ""
+msgstr "Nie znaleziono skryptów."
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
-msgstr ""
+msgstr "Nie znaleziono pokazów slajdów."
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
-msgstr ""
+msgstr "Nie znaleziono slajdów."
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
-msgstr ""
+msgstr "Brak statusu dla proxy."
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Nie wybrano żadnego celu"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
-msgstr ""
+msgstr "Nie wybrano żadnego celu."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
-msgstr ""
+msgstr "Nie znaleziono szablonu."
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
-msgstr ""
+msgstr "Brak powiązanego szablonu"
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Nie zdefiniowano przedziału czasowego. Pracuje 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Brak wyzwalacza"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
-msgstr ""
+msgstr "Brak wyzwalacza z triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Nie zdefiniowano żadnych wyzwalaczy."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
-msgstr ""
+msgstr "Nie znaleziono wyzwalaczy."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
-msgstr ""
+msgstr "Nie znaleziono grup użytkowników."
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
-msgstr ""
+msgstr "Nie znaleziono użytkowników."
 
 #: include/views/administration.general.valuemapping.list.php:22
 msgid "No value maps found."
-msgstr ""
+msgstr "Nie znaleziono map wartości."
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
-msgstr ""
+msgstr "Nie znaleziono wartości."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
-msgstr ""
+msgstr "Nie znaleziono scenariuszy sieci www."
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Brak"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normalny"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Widok normalny"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Nie zatw."
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Brak pozycji szablonowych"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
-msgstr ""
+msgstr "Nie wszystkie szablony są połączone z \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nie można ustawić hasła dla użytkownika \"guest\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
-msgstr ""
+msgstr "Nieautoryzowany."
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Niedostępne"
 
@@ -10260,21 +10592,21 @@ msgstr "Niedostępne"
 msgid "Not classified"
 msgstr "Nie sklasyfikowany"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Nie połączony"
 
 #: include/classes/screens/CScreenActions.php:155
 #: include/views/administration.auditacts.list.php:94
 msgid "Not sent"
-msgstr ""
+msgstr "Nie wysłano"
 
 #: include/items.inc.php:181 include/items.inc.php:206
 msgid "Not supported"
 msgstr "Niewspierane"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Notatka"
@@ -10287,184 +10619,184 @@ msgstr "Notatki"
 msgid "Nothing"
 msgstr "Nic"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
-msgstr ""
+msgstr "Nie ma nic do zrobienia.."
 
 #: report4.php:24
 msgid "Notification report"
 msgstr "Raport powiadomień"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
-msgstr "Lis."
+msgstr "Lis"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Listopad"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Teraz"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
-msgstr ""
+msgstr "Liczba dostępnych procesorów."
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
-msgstr ""
+msgstr "Liczba hostów (włączonych/wyłączonych/szablonów)"
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
-msgstr ""
+msgstr "Liczba węzłów inode dla wolumenu. Jeżeli mode jest puste zostanie użyte ogółem (total)."
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
-msgstr ""
+msgstr "Liczba pozycji (włączonych/wyłączonych/niewspieranych)"
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
-msgstr ""
+msgstr "Liczba pozycji w bazie danych Zabbix."
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
-msgstr ""
+msgstr "Liczba pozycji w historii proxy, które jeszcze nie zostały wysłane do serwera"
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
-msgstr ""
+msgstr "Liczba pozycji kolejki, które zostały opóźnione od \"od\" do \"do\" sekund włącznie."
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
-msgstr ""
+msgstr "Liczba monitorowanych hostów"
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
-msgstr ""
+msgstr "Liczba procesów. <name> i <user> takie same jak w proc.mem item. <state> all (domyślnie), run, sleep, zomb. <cmdline> filtrowanie z linii komend (wspierane wyrażenia regularne). Przykład: proc.num[apache2,www-data]. Na Windows, dostępne są tylko <name> i <user>."
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Liczba rdzeni procesora dla hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Liczba wątków procesora hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Liczba procesorów maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
-msgstr ""
+msgstr "Liczba sekund od rozpoczęcia epoki jest < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
-msgstr ""
+msgstr "Liczba sekund od rozpoczęcia epoki jest = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
-msgstr ""
+msgstr "Liczba sekund od rozpoczęcia epoki jest > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
-msgstr ""
+msgstr "Liczba sekund od rozpoczęcia epoki NIE jest = N"
 
 #: report5.php:61
 msgid "Number of status changes"
 msgstr "Liczba zmian stanu"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Liczba kroków"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
-msgstr ""
+msgstr "Liczba prawidłowo odebranych wartości V (zgodnych z operatorem O) dla okresu T jest < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
-msgstr ""
+msgstr "Liczba prawidłowo odebranych wartości V (zgodnych z operatorem O) dla okresu T jest = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
-msgstr ""
+msgstr "Liczba prawidłowo odebranych wartości V (zgodnych z operatorem O) dla okresu T jest > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
-msgstr ""
+msgstr "Liczba prawidłowo odebranych wartości V (zgodnych z operatorem O) dla okresu T NIE jest = N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
-msgstr ""
+msgstr "Liczba wyzwalaczy (włączonych/wyłączonych [problem/ok])"
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
-msgstr ""
+msgstr "Liczba wyzwalaczy w bazie danych Zabbix."
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
-msgstr ""
+msgstr "Liczba niewspieranych pozycji w bazie danych Zabbix."
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Liczba użytkowników (online)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
-msgstr ""
+msgstr "Liczba podłączonych użytkowników. Po stronie agenta używana jest komenda who."
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
-msgstr ""
+msgstr "Liczba wartości zapisanych w tabeli HISTORY."
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
-msgstr ""
+msgstr "Liczba wartości zapisanych w tabeli HISTORY_LOG."
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
-msgstr ""
+msgstr "Liczba wartości zapisanych w tabeli HISTORY_STR."
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
-msgstr ""
+msgstr "Liczba wartości zapisanych w tabeli HISTORY_TEXT."
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
-msgstr ""
+msgstr "Liczba wartości zapisanych w tabeli HISTORYUINT."
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
-msgstr ""
+msgstr "Liczba wartości zapisanych w tabeli TRENDS."
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
-msgstr ""
+msgstr "Liczba wartości zapisanych w tabeli TRENDS_UINT."
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Liczba maszyn wirtualnych hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numerycznie (zmiennoprzecinkowo)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numerycznie (liczba całkowita 64bitowa)"
 
@@ -10479,18 +10811,20 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
-msgstr ""
+msgstr "OK lub brak wyzwalacza"
 
 #: include/hosts.inc.php:305
 msgid "OOB IP address"
@@ -10504,8 +10838,7 @@ msgstr "Router OOB"
 msgid "OOB subnet mask"
 msgstr "Maska podsieci OOB"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "LUB"
 
@@ -10523,151 +10856,155 @@ msgstr "OS (W skrócie)"
 
 #: adm.other.php:124
 msgid "OTHER CONFIGURATION PARAMETERS"
-msgstr ""
+msgstr "INNE PARAMETRY KONFIGURACJI"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "PRZEGLĄD"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
-msgstr "Paź."
+msgstr "Paź"
 
 #: include/items.inc.php:137
 msgid "Octal"
 msgstr "Ósemkowo"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Październik"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
-msgstr "WYŁĄCZ"
+msgstr "Wyłączone"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
-msgstr "WŁĄCZ"
+msgstr "Włączone"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:111
 msgid "On status change triggers blink for"
-msgstr "Miganie wyzwalaczy o zmienionym stanie przez"
+msgstr "Przy zmianie stanu wyzwalacze migają przez"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Raz"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
-msgstr ""
+msgstr "Jeden z obiektów nadal nie ma grupy hostów."
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Tylko jeden raz"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Jednorazowa przerwa w pracy"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
-msgstr ""
+msgstr "Tylko Super Administratorzy mogą tworzyć makra globalne."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Tylko Super Administratorzy mogą tworzyć grupy hostów."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
-msgstr ""
+msgstr "Tylko Super Administratorzy mogą tworzyć mapy ikon."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
-msgstr ""
+msgstr "Tylko Super Administratorzy mogą tworzyć typy mediów."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
-msgstr ""
+msgstr "Tylko Super Administratorzy mogą usuwać makra globalne."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
-msgstr ""
+msgstr "Tylko Super Administratorzy mogą usuwać typy mediów."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Tylko Super Administratorzy mogą usuwać grupy użytkowników."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
-msgstr ""
+msgstr "Tylko Super Administratorzy mogą zmieniać typy mediów."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
-msgstr ""
+msgstr "Tylko Super Administratorzy mogą aktualizować makra globalne."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
-msgstr ""
+msgstr "Tylko Super Administratorzy mogą aktualizować mapy ikon."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
-msgstr ""
+msgstr "Tylko administrator Zabbixa może dodawać media użytkownika."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
-msgstr ""
+msgstr "Tylko administrator Zabbixa może zmieniać media użytkownika."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
-msgstr ""
+msgstr "Tylko administrator Zabbixa może usuwać media użytkownika."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr ""
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr "Tylko kontrole agenta Zabbix, SNMPv1, SNMPv2 i SNMPv3 mogą być unikalne."
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Liczone są tylko pozycje przypisane do włączonych hostów"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Tylko jeden test może być unikalny."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
-msgstr ""
+msgstr "Można zmienić tylko jedną nazwę grupy na raz."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
-msgstr ""
+msgstr "Wyświetlane jest tylko ostatnie 20%% wskaźników."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
-msgstr ""
+msgstr "Można powiadomić jedynie zdarzenia wyzwalaczy."
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Liczone są tylko wyzwalacze przypisane do włączonych hostów w zależności od włączonych pozycji"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Operacja \"%s\" już istnieje."
@@ -10676,28 +11013,28 @@ msgstr "Operacja \"%s\" już istnieje."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operacja nie może być wykonana z powodu nieupoważnionego żądania."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Warunek operacji"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Szczegóły operacji"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Operacja nie ma grupy, na której może działać."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Operacja nie ma szablonu, na którym może działać."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
-msgstr "Rodzaj operacji"
+msgstr "Typ operacji"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operacje"
@@ -10706,25 +11043,27 @@ msgstr "Operacje"
 msgid "Operator"
 msgstr "Operator"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
-msgstr ""
+msgstr "Lub"
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10754,88 +11093,85 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Oryginał"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Pierwotny błękit"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Inne"
 
 #: adm.other.php:24
 msgid "Other configuration parameters"
-msgstr ""
+msgstr "Inne parametry konfiguracji"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Inne grupy"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
-msgstr ""
+msgstr "Inne hosty"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
-msgstr ""
+msgstr "Inne hosty | Grupa"
 
 #: include/views/administration.general.other.edit.php:41
 msgid "Other parameters"
 msgstr "Inne parametry"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
-msgstr ""
+msgstr "Inne | grupa"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Inni"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
-msgstr ""
+msgstr "Kolizje Out-of-window. Licznik kolizji."
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
-msgstr ""
+msgstr "Nadpisane przez"
 
 #: include/views/administration.general.housekeeper.edit.php:133
 msgid "Override item history period"
-msgstr ""
+msgstr "Nadpisz okres historii pozycji"
 
 #: include/views/administration.general.housekeeper.edit.php:154
 msgid "Override item trend period"
-msgstr ""
+msgstr "Nadpisz okres trendu pozycji"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Przegląd"
 
@@ -10843,205 +11179,215 @@ msgstr "Przegląd"
 msgid "Overview by proxy"
 msgstr "Przegląd wg proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
-msgstr ""
+msgstr "P"
 
 #: dashboard.php:293
 msgid "PERSONAL DASHBOARD"
-msgstr "OSOBISTA DESKA ROZDZIELCZA"
+msgstr "OSOBISTA TABLICA"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
-msgstr ""
+msgstr "Nie znaleziono rozszerzenia PHP bcmath (parametr konfiguracji PHP --enable-bcmath)."
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
-msgstr ""
+msgstr "Nie znaleziono rozszerzenia PHP ctype (parametr konfiguracji PHP --enable-ctype)."
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Obsługa baz danych przez PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
-msgstr ""
+msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
-msgstr ""
+msgstr "Wsparcie dla PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
-msgstr ""
+msgstr "Brak wsparcia dla PHP gd FreeType."
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
-msgstr ""
+msgstr "Brak wsparcia dla PHP gd JPEG image."
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
-msgstr ""
+msgstr "Wsparcie dla PHP gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
-msgstr ""
+msgstr "Brak wsparcia dla PHP gd PNG image."
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
-msgstr ""
+msgstr "Wsparcie dla PHP gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
-msgstr ""
+msgstr "Nie znaleziono rozszerzenia PHP gd (parametr konfiguracji PHP --with-gd)."
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
-msgstr ""
+msgstr "Nie znaleziono rozszerzenia PHP gettext (parametr konfiguracji PHP --with-gettext). Tłumaczenia nie będą dostępne."
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
-msgstr ""
+msgstr "Brak rozszerzenia PHP libxml."
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
-msgstr ""
+msgstr "Nie znaleziono rozszerzenia PHP mbstring (parametr konfiguracji PHP --enable-mbstring)."
+
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr "PHP mbstring.func_overload"
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
-msgstr ""
+msgstr "Opcja PHP max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
-msgstr ""
+msgstr "Opcja PHP max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
-msgstr ""
+msgstr "Opcja PHP memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
-msgstr ""
+msgstr "Opcja PHP post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
-msgstr ""
+msgstr "Opcja PHP upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
-msgstr ""
+msgstr "Auto-start PHP session"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
-msgstr ""
+msgstr "Należy wyłączyć auto-start dla PHP session (dyrektywa PHP \"session.auto_start\")."
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
-msgstr ""
+msgstr "Nie znaleziono rozszerzenia PHP session (parametr konfiguracji PHP --enable-session)."
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
-msgstr ""
+msgstr "Nie znaleziono rozszerzenia PHP sockets (parametr konfiguracji PHP --enable-sockets)."
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr "Nadpisywanie funkcji znakowych PHP musi być wyłączone."
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "Strefa czasowa PHP"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Wersja PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
-msgstr ""
+msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
-msgstr ""
+msgstr "Brak rozszerzenia PHP xmlreader."
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
-msgstr ""
+msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
-msgstr ""
+msgstr "Brak rozszerzenia PHP xmlwriter."
 
 #: include/discovery.inc.php:61
 #: include/views/js/configuration.discovery.edit.js.php:177
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLEM"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
-msgstr ""
+msgstr "Strona zawiera nieprawidłowe dane"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Paleta"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
-msgstr ""
-
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+msgstr "Paleta #%1$s"
+
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parametr"
 
 #: include/views/configuration.host.discovery.edit.php:47
 #: include/views/configuration.host.prototype.edit.php:56
 msgid "Parent discovery rules"
-msgstr ""
+msgstr "Nadrzędne reguły wykrywania"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
-msgstr ""
+msgstr "Nadrzędne wykresy"
 
 #: include/views/configuration.item.edit.php:47
 msgid "Parent items"
-msgstr ""
+msgstr "Nadrzędne pozycje"
 
 #: include/views/configuration.services.edit.php:50
 msgid "Parent service"
@@ -11049,39 +11395,39 @@ msgstr "Usługa nadrzędna"
 
 #: include/views/configuration.triggers.edit.php:59
 msgid "Parent triggers"
-msgstr ""
+msgstr "Nadrzędne wyzwalacze"
 
 #: include/views/configuration.httpconf.edit.php:51
 msgid "Parent web scenarios"
-msgstr ""
+msgstr "Nadrzędne scenariusze sieci www"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
+msgstr "Błąd składni SQL [%1$s] w [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Błąd przetwarzania"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Pasywne"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11091,43 +11437,44 @@ msgstr "Pasywne"
 msgid "Password"
 msgstr "Hasło"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Hasło (ponownie)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
-msgstr ""
+msgstr "Hasło nie jest dostępne dla użytkowników z %1$s."
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
-msgstr ""
+msgstr "Wymagane jest hasło dla typu mediów."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Hasło nie powinno być puste"
 
 #: include/classes/debug/CProfiler.php:146
 #, c-format
 msgid "Peak memory usage: %s"
-msgstr ""
+msgstr "Chwilowe użycie pamięci: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
-msgstr ""
+msgstr "Linia procentowa (z lewej)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
-msgstr ""
+msgstr "Linia procentowa (z prawej)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
-msgstr ""
+msgstr "Wykonuje zapytanie DNS. Przy poprawnym zakończeniu zwraca ciąg znaków zawierający wymagany typ informacji."
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11135,39 +11482,39 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Okres"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
-msgstr "Rodzaj okresu"
+msgstr "Typ okresu"
 
 #: include/views/configuration.maintenance.edit.php:134
 #: include/views/configuration.maintenance.edit.php:186
 msgid "Periods"
 msgstr "Okresy"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Uprawnienia mogą być nadawane wyłącznie dla grup użytkowników."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
-msgstr ""
+msgstr "Perski (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Kołowy"
 
@@ -11179,55 +11526,56 @@ msgstr "Algorytm rozmieszczania"
 msgid "Plain text"
 msgstr "Zwykły tekst"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Odtwórz"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Odtwórz dźwięk"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Nalezy poprawić wszystkie błędy, a następnie nacisnąć przycisk \"Ponów\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Proszę podać tekst potwierdzenia."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Proszę wybrać dwa elementy"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polski (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
-msgstr ""
+msgstr "Powielaj pola inwentarza hosta"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Pole port nie może być puste dla interfejsu hosta."
 
@@ -11235,53 +11583,53 @@ msgstr "Pole port nie może być puste dla interfejsu hosta."
 msgid "Port range"
 msgstr "Zakres portów"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portugalski (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
-msgstr ""
+msgstr "Portugalski (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Pozycja"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Dane"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Podgląd"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Poprzednia"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
-msgstr ""
+msgstr "Poprzednia"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
-msgstr ""
+msgstr "Poprzednia wartość jest < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
-msgstr ""
+msgstr "Poprzednia wartość jest = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
-msgstr ""
+msgstr "Poprzednia wartość jest > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
-msgstr ""
+msgstr "Poprzednia wartość NIE jest = N"
 
 #: include/hosts.inc.php:405
 msgid "Primary POC cell"
@@ -11305,7 +11653,7 @@ msgstr "Telefon A głównego punktu kontaktu"
 
 #: include/hosts.inc.php:400
 msgid "Primary POC phone B"
-msgstr "Telefon A głównego punktu kontaktu"
+msgstr "Telefon B głównego punktu kontaktu"
 
 #: include/hosts.inc.php:410
 msgid "Primary POC screen name"
@@ -11320,38 +11668,39 @@ msgstr "Drukuj"
 #: include/views/configuration.item.massupdate.php:189
 #: include/views/js/configuration.discovery.edit.js.php:100
 msgid "Privacy passphrase"
-msgstr ""
+msgstr "Hasło prywatności"
 
 #: include/views/configuration.host.discovery.edit.php:146
 #: include/views/configuration.item.edit.php:152
 #: include/views/configuration.item.massupdate.php:179
 msgid "Privacy protocol"
-msgstr ""
+msgstr "Protokół prywatności"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Plik zawierający klucz prywatny"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Poziom uprawnień"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
-msgstr ""
+msgstr "Prawdopodobnie nie ma modułu php-ldap."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problem"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Wyświetlanie problemów"
 
@@ -11361,18 +11710,18 @@ msgstr "Problem z"
 
 #: srv_status.php:142
 msgid "Problem time"
-msgstr ""
+msgstr "Czas problemu"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
-msgstr "Problem, jeśli wszystie potomki mają problem"
+msgstr "Problem, jeśli wszyscy potomkowie mają problem"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problem, jeśli przynajmniej jeden potomek ma problem"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problemy"
 
@@ -11380,75 +11729,71 @@ msgstr "Problemy"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototypy"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Serwery proxy"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
-msgstr ""
+msgstr "Nie istnieje proxy \"%1$s\" dla hosta \"%2$s\"."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
-msgstr ""
+msgstr "Proxy \"%1$s\" jest używane przez regułę wyszukiwania \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
-msgstr ""
+msgstr "Proxy \"%1$s\" już istnieje."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Dodano proxy"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Usunięto proxy"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
-msgstr ""
+msgstr "Hosty proxy"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
-msgstr ""
+msgstr "Nie udało się utworzyć interfejsu proxy."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
-msgstr ""
+msgstr "Nie udało się zaktualizować interfejsu proxy."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Tryb serwera proxy"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Nazwa proxy"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
-msgstr "Uaktualniono proxy"
+msgstr "Zaktualizowano proxy"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Klucz publiczny"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11459,7 +11804,7 @@ msgstr "Plik klucza publicznego"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "KOLEJKA POZYCJI DO AKTUALIZACJI"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Kolejka"
 
@@ -11467,18 +11812,18 @@ msgstr "Kolejka"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Odczyt"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Tylko do odczytu"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Do odczytu i zapisu"
 
@@ -11490,21 +11835,21 @@ msgstr "Powód"
 msgid "Received value"
 msgstr "Otrzymana wartość"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
-msgstr ""
+msgstr "Znany problem"
 
 #: include/views/administration.auditacts.list.php:41
 msgid "Recipient"
 msgstr "Odbiorca"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
-msgstr ""
+msgstr "Odbiorca (rosnąco)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
-msgstr ""
+msgstr "Odbiorca (malejąco)"
 
 #: include/actions.inc.php:823 include/classes/screens/CScreenActions.php:74
 #: include/classes/screens/CScreenActions.php:80
@@ -11513,28 +11858,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "Odbiorca(y)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Odzyskiwanie"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Komunikat odzyskania"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Temat odzyskania"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Odświeżanie (w sekundach)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
-msgstr ""
+msgstr "Czas odświeżania"
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Mnożnik czasu odświeżania"
 
@@ -11545,56 +11890,59 @@ msgstr "Odświeżanie niewspieranych pozycji (w sek.)"
 #: adm.other.php:60
 #, c-format
 msgid "Refresh unsupported items (in sec) \"%1$s\"."
-msgstr ""
+msgstr "Odświeżanie niewspieranych pozycji (w sek) \"%1$s\"."
 
 #: include/audit.inc.php:46
 #: include/views/configuration.host.discovery.edit.php:291
 msgid "Regular expression"
 msgstr "Wyrażenie regularne"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
-msgstr "Wyrażenie regularne \"%s\" istnieje."
+msgstr "Wyrażenie regularne \"%s\" już istnieje."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
-msgstr ""
+msgstr "Wyrażenie regularne V jest zgodne z ostatnim wyrażeniem w okresie T, wtedy N = 1, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
-msgstr ""
+msgstr "Wyrażenie regularne V jest zgodne z ostatnim wyrażeniem w okresie T, wtedy N = 1, 0 - w przeciwnym przypadku (bez rozróżniania wielkości liter)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
-msgstr ""
+msgstr "Wyrażenie regularne V jest zgodne z ostatnim wyrażeniem w okresie T, wtedy N NOT 1, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
-msgstr ""
+msgstr "Wyrażenie regularne V jest zgodne z ostatnim wyrażeniem w okresie T, wtedy N NOT 1, 0 - w przeciwnym przypadku (bez rozróżniania wielkości liter)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Dodano wyrażenie regularne"
 
-#: adm.regexps.php:180
-#, fuzzy
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Usunięto wyrażenie regularne"
-msgstr[1] "Usunięto wyrażenie regularne"
-msgstr[2] "Usunięto wyrażenie regularne"
+msgstr[1] "Usunięto wyrażenia regularne"
+msgstr[2] "Usunięto wyrażeń regularnych"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Wyrażenie regularne nie istnieje."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr "Wyrażenie regularne musi być ciągiem znaków"
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
-msgstr "Uaktualniono wyrażenie regularne"
+msgstr "Zaktualizowano wyrażenie regularne"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11603,7 +11951,7 @@ msgstr "Wyrażenia regularne"
 
 #: include/views/general.login.php:74
 msgid "Remember me for 30 days"
-msgstr "Pamiętaj przez 30 dni"
+msgstr "Pamiętaj mnie przez 30 dni"
 
 #: include/actions.inc.php:607
 msgid "Remote command"
@@ -11611,26 +11959,28 @@ msgstr "Zdalne polecenie"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11641,33 +11991,31 @@ msgstr "Zdalne polecenie"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Usuń"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
-msgstr ""
+msgstr "Usuń wszystko"
 
 #: include/views/configuration.sysmap.constructor.php:30
 msgid "Remove element"
 msgstr "Usuń element"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Usuń z"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Usuń z ulubionych"
@@ -11676,7 +12024,7 @@ msgstr "Usuń z ulubionych"
 msgid "Remove from host group"
 msgstr "Usuń z grupy hostów"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Usuń z grup hostów"
 
@@ -11688,64 +12036,65 @@ msgstr "Usuń hosta"
 msgid "Remove link"
 msgstr "Usuń powiązanie"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Usuń zaznaczone"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Zastąp"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
-msgstr ""
+msgstr "Zamień aplikacje"
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
-msgstr ""
+msgstr "Zamień zależności"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Zastąp grupy hostów"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Raport"
 
 #: include/reports.inc.php:33
 msgid "Report 1"
-msgstr ""
+msgstr "Raport 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
-msgstr ""
+msgstr "Raport 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
-msgstr ""
+msgstr "Raport 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Raporty"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Wymagane"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Brakuje wymaganego pola \"wyrażenie\" w mapowaniu ikon."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Brakuje wymaganego pola \"iconid\" w mapowaniu ikon."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Brakuje wymaganego pola \"inventory_link\" w mapowaniu ikon."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Wymagane są uprawnienia do hosta"
 
@@ -11753,29 +12102,31 @@ msgstr "Wymagane są uprawnienia do hosta"
 msgid "Required performance (vps)"
 msgstr "Wymagana wydajność (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
-msgstr ""
+msgstr "Wymagana wydajność serwera Zabbix, podana w nowych wartościach na sekundę."
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Wymagana wydajność serwera, nowe wartości na sekundę"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Wymagane kody stanu"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
-msgstr "Wymagany ciąg tekstowy"
+msgstr "Wymagany ciąg znaków"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Przywróć"
 
@@ -11794,9 +12145,9 @@ msgstr "Przywrócić wszystkie nazwy i kolory do wartości domyślnych?"
 msgid "Reset confirmation"
 msgstr "Potwierdzenie przywracania"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11809,7 +12160,7 @@ msgstr "Rozwiązane"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Zasób"
@@ -11824,89 +12175,99 @@ msgstr "Czas odpowiedzi"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Wynik"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Wynik jest NIEPRAWDZIWY"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Wynik jest PRAWDZIWY"
 
 #: include/views/general.script.execute.php:28
 #, c-format
 msgid "Result of \"%s\""
-msgstr ""
+msgstr "Wynik \"%s\""
 
 #: tr_testexpr.php:50
 msgid "Result type"
-msgstr "Rodzaj wyniku"
+msgstr "Typ wyniku"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
-msgstr ""
+msgstr "Powtórzenia"
 
 #: include/actions.inc.php:822
 msgid "Retries left"
 msgstr "Pozostało prób"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr "Odtwórz tylko nagłówki"
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Ponów"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
-msgstr ""
+msgstr "Zwraca czas odpowiedzi na ping ICMP w sekundach. Przykład: 0.02"
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
-msgstr ""
+msgstr "Zwraca dostępność określonych typów kontroli na hoście. Wartość tej pozycji odpowiada ikonom dostępności na liście hostów. Poprawne typy to: agent, snmp, ipmi, jmx."
+
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr "Zwraca bieżący stan obsługi dla hosta."
 
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
-msgstr ""
+msgstr "Zwraca szczegółowe informacje o hoście. Ciąg znaków"
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
-msgstr ""
+msgstr "Zwraca nazwę hosta (lub nazwę NetBIOS (domyślną) w Windows). Ciąg znaków. Przykład zwracanej wartości: www.zabbix.com"
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
-msgstr ""
+msgstr "Zwraca informacje związane z bramą Java Zabbixa. Poprawne parametry to: ping, version."
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
-msgstr ""
+msgstr "Zwraca procent utraconych pakietów ping ICMP."
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
-msgstr "Prawo"
+msgstr "Z prawej"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
-msgstr ""
+msgstr "Rumuński (ro_RO)"
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
-msgstr ""
+msgstr "Dodano wiersz"
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
-msgstr ""
+msgstr "Usunięto wiersz"
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Rozpiętość wierszy"
 
@@ -11914,11 +12275,11 @@ msgstr "Rozpiętość wierszy"
 msgid "Rows"
 msgstr "Wiersze"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Wierszy na stronę"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Reguły"
 
@@ -11963,23 +12324,23 @@ msgid "Run remote commands on hosts"
 msgstr "Uruchom zdalne polecenia na hostach"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
-msgstr ""
+msgstr "Wykonaj określone polecenie na hoście."
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Rosyjski (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
-msgstr ""
+msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
-msgstr ""
+msgstr "N"
 
 #: include/views/monitoring.hostscreen.php:30
 #: include/views/monitoring.hostscreen.php:40
@@ -11992,7 +12353,7 @@ msgstr "EKRANY"
 msgid "SEARCH"
 msgstr "WYSZUKIWANIE"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERWER"
 
@@ -12001,19 +12362,19 @@ msgstr "SERWER"
 #: include/views/configuration.item.massupdate.php:142
 #: include/views/js/configuration.discovery.edit.js.php:78
 msgid "SHA"
-msgstr ""
+msgstr "SHA"
 
 #: report3.php:83 srv_status.php:143
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "POKAZY SLAJDÓW"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -12022,17 +12383,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "Poczta SMTP"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "Serwer SMTP"
@@ -12048,9 +12409,9 @@ msgstr "Klucz SNMP"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
-msgstr "SNMP OID"
+msgstr "OID SNMP"
 
 #: disc_prototypes.php:76 host_discovery.php:79 include/forms.inc.php:449
 #: include/views/configuration.host.discovery.edit.php:111
@@ -12058,22 +12419,22 @@ msgstr "SNMP OID"
 #: include/views/configuration.item.massupdate.php:95
 #: include/views/js/configuration.discovery.edit.js.php:39 items.php:85
 msgid "SNMP community"
-msgstr "Wspólnota SNMP"
+msgstr "Hasło SNMP"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "Interfejsy SNMP"
 
 #: include/items.inc.php:87
 msgid "SNMP trap"
-msgstr "Trap SNMP"
+msgstr "Pułapka SNMP"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
-msgstr ""
+msgstr "Błędny klucz pułapki SNMP."
 
 #: include/discovery.inc.php:66 include/items.inc.php:84
 #: include/views/js/configuration.discovery.edit.js.php:178
@@ -12093,27 +12454,27 @@ msgstr "Agent SNMPv3"
 #: include/classes/debug/CProfiler.php:142
 #, c-format
 msgid "SQL count: %s (selects: %s | executes: %s)"
-msgstr ""
+msgstr "Liczniki SQL: %s (select-y: %s | uruchomienia: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
-msgstr ""
+msgstr "Zapytanie SQL"
 
 #: include/classes/db/DB.php:818
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
-msgstr ""
+msgstr "Wykonanie zapytania SQL nie udało się \"%1$s\""
 
 #: include/classes/db/DB.php:441 include/classes/db/DB.php:488
 #: include/classes/db/DB.php:545
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
-msgstr ""
+msgstr "Wykonanie zapytania SQL nie udało się \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12122,15 +12483,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "Agent SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr "Plik certyfikatu SSL"
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr "Plik klucza SSL"
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr "Hasło klucza SSL"
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr "Host weryfikacji SSL"
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr "Podmiot weryfikujący SSL"
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "STAN WYKRYWANIA"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STAN WYZWALACZY"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "STAN MONITORINGU WWW"
 
@@ -12138,94 +12519,94 @@ msgstr "STAN MONITORINGU WWW"
 msgid "STATUS OF ZABBIX"
 msgstr "STAN ZABBIXA"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
-msgstr "Sob."
+msgstr "Sob"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sobota"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Zapisz"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Zapisz i wróć"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Skala"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Scenariusz"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Dodano scenariusz"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
-msgstr "Uaktualniono scenariusz"
+msgstr "Zaktualizowano scenariusz"
 
 #: include/views/configuration.httpconf.list.php:46
 msgid "Scenarios"
@@ -12235,9 +12616,9 @@ msgstr "Scenariusze"
 msgid "Schedule"
 msgstr "Harmonogram"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
-msgstr ""
+msgstr "Zaplanowane sprawdzenia"
 
 #: include/audit.inc.php:41 include/screens.inc.php:36
 #: include/views/configuration.screen.edit.php:47
@@ -12246,145 +12627,144 @@ msgstr ""
 msgid "Screen"
 msgstr "Ekran"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
-msgstr ""
+msgstr "Dodano ekran \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
-msgstr ""
+msgstr "Ekran \"%1$s\" już istnieje w szablonie \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
-msgstr ""
+msgstr "Ekran \"%1$s\" już istnieje."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
-msgstr ""
+msgstr "Komórka X - %2$s Y - %3$s ekranu \"%1$s\" jest już zajęta."
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
-msgstr ""
+msgstr "Span kolumny w komórce X - %2$s Y - %3$s ekranu \"%1$s\" jest niewłaściwy."
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
-msgstr ""
+msgstr "Span kolumny w komórce X - %2$s Y - %3$s ekranu \"%1$s\" jest zbyt duży."
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
-msgstr ""
+msgstr "Span wiersza w komórce X - %2$s Y - %3$s ekranu \"%1$s\" jest niewłaściwy."
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
-msgstr ""
+msgstr "Span wiersza w komórce X - %2$s Y - %3$s ekranu \"%1$s\" jest zbyt duży."
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
-msgstr ""
+msgstr "Pominięto ekran \"%1$s\" - reguła użytkownika."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
-msgstr ""
+msgstr "Zaktualizowano ekran \"%1$s\"."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Dodano ekran"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Konfiguracja komórki ekranu"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Usunięto ekran"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
-msgstr ""
+msgstr "Ekran powinien zawierać przynajmniej jeden wiersz i kolumnę."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
-msgstr "Uaktualniono ekran"
+msgstr "Zaktualizowano ekran"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Ekrany"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Skrypt"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
-msgstr ""
+msgstr "Skrypt \"%1$s\" już istnieje."
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Dodano skrypt"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Usunięto skrypt"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
-msgstr ""
+msgstr "Ścieżka menu skryptu \"%1$s\" została już użyta w skrypcie o nazwie \"%2$s\"."
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Nazwa skryptu"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
-msgstr ""
+msgstr "Nazwa skryptu \"%1$s\" została już użyta w ścieżce menu dla skryptu \"%2$s\"."
 
 #: include/classes/debug/CProfiler.php:126
 msgid "Script profiler"
-msgstr ""
+msgstr "Profiler skryptu"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
-msgstr "Uaktualniono skrypt"
+msgstr "Zaktualizowano skrypt"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
-msgstr ""
+msgstr "Skrypt z scriptid \"%1$s\" nie istnieje."
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Skrypty"
 
@@ -12403,9 +12783,9 @@ msgstr "Pusty wzorzec wyszukiwania"
 
 #: adm.gui.php:42 include/views/administration.general.gui.edit.php:37
 msgid "Search/Filter elements limit"
-msgstr "Wyszukaj/Filtruj wg elementów"
+msgstr "Ograniczenie wyszukiwania/filtrowania elementów"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Drugi"
 
@@ -12437,7 +12817,7 @@ msgstr "Telefon B drugiego punktu kontaktu"
 msgid "Secondary POC screen name"
 msgstr "Pseudonim drugiego punktu kontaktu"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Sekundy"
 
@@ -12446,7 +12826,7 @@ msgstr "Sekundy"
 #: include/views/configuration.item.massupdate.php:129
 #: include/views/js/configuration.discovery.edit.js.php:61
 msgid "Security level"
-msgstr ""
+msgstr "Poziom ochrony"
 
 #: include/forms.inc.php:456
 #: include/views/configuration.host.discovery.edit.php:115
@@ -12454,71 +12834,78 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:115
 #: include/views/js/configuration.discovery.edit.js.php:56
 msgid "Security name"
-msgstr ""
+msgstr "Nazwa ochrony"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Wybierz"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Wybierz prototyp"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Wybierz wiersze z wartościami jak"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Wybrane"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Usunięto wybrane akcje"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Wybrane elementy"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Wybrane grupy"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Wybrane hosty"
 
@@ -12534,7 +12921,7 @@ msgstr "Wyślij wiadomość do grup użytkowników"
 msgid "Send message to users"
 msgstr "Wyślij wiadomość do użytkowników"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Wyślij wyłącznie do"
 
@@ -12542,30 +12929,30 @@ msgstr "Wyślij wyłącznie do"
 msgid "Send to"
 msgstr "Wyślij do"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Wyślij do grup użytkowników"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Wyślij do użytkowników"
 
 #: include/actions.inc.php:988 include/classes/screens/CScreenActions.php:145
 #: include/views/administration.auditacts.list.php:83
 msgid "Sent"
-msgstr ""
+msgstr "Wysłano"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
-msgstr "Wrze."
+msgstr "Wrz"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Rozdzielone"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Wrzesień"
 
@@ -12577,7 +12964,7 @@ msgstr "Numer seryjny A"
 msgid "Serial number B"
 msgstr "Numer seryjny B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Usługa"
@@ -12586,50 +12973,50 @@ msgstr "Usługa"
 msgid "Server info"
 msgstr "Informacje o serwerze"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Czas serwera"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Usługa"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
-msgstr ""
+msgstr "Usługa \"%1$s\""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
-msgstr ""
+msgstr "Nie można usunąć usługi \"%1$s\", ponieważ zależy od innej usługi."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
-msgstr ""
+msgstr "Usługa \"%1$s\" nie może zależeć od samej siebie."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
-msgstr ""
+msgstr "Usługa \"%1$s\" nie może być podłączona do wyzwalacza i jednocześnie mieć usługi potomne."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
-msgstr ""
+msgstr "Usługa \"%1$s\" nie może mieć twardego połączenia z inną usługą."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Usługa nie może być jednocześnie elementem potomnym jak i nadrzędnym."
 
 #: services.php:161
 msgid "Service created"
-msgstr ""
+msgstr "Utworzono usługę"
 
 #: services.php:117
 msgid "Service deleted"
@@ -12639,13 +13026,13 @@ msgstr "Usunięto usługę"
 msgid "Service port"
 msgstr "Port usługi"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
-msgstr ""
+msgstr "Czas początkowy usługi musi być mniejszy od czasu końcowego."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
-msgstr "Czas obsługi"
+msgstr "Czasy usługi"
 
 #: include/actions.inc.php:76
 msgid "Service type"
@@ -12653,51 +13040,56 @@ msgstr "Typ usługi"
 
 #: services.php:154
 msgid "Service updated"
-msgstr "Uaktualniono usługę"
+msgstr "Zaktualizowano usługę"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Usługi"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
-msgstr ""
+msgstr "Usługi tworzą cykliczną zależność."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Sesja zakończona, należy się ponownie zalogować"
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Poziom"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Poziom (malejąco)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Nazwa poziomu nie może być pusta."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Wyświetl"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Wyświetl wszystko"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] "Wyświetl wszystkie (%1$s dzień)"
+msgstr[1] "Wyświetl wszystkie (%1$s dni)"
+msgstr[2] "Wyświetl wszystkie (%1$s dni)"
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Wyświetl szczegóły"
 
@@ -12707,7 +13099,7 @@ msgstr "Wyświetl wyłączone scenariusze"
 
 #: include/views/configuration.triggers.list.php:63
 msgid "Show disabled trigger prototypes"
-msgstr ""
+msgstr "Wyświetl wyłączone prototypy wyzwalaczy"
 
 #: include/views/configuration.triggers.list.php:81
 msgid "Show disabled triggers"
@@ -12716,7 +13108,7 @@ msgstr "Wyświetl wyłączone wyzwalacze"
 #: adm.gui.php:76
 #, c-format
 msgid "Show events max \"%1$s\"."
-msgstr ""
+msgstr "Wyświetl zdarzenia, maksymalnie \"%1$s\"."
 
 #: adm.gui.php:37 include/views/administration.general.gui.edit.php:43
 msgid "Show events not older than (in days)"
@@ -12725,70 +13117,75 @@ msgstr "Wyświetl zdarzenia nie starcze niż (w dniach)"
 #: adm.gui.php:75
 #, c-format
 msgid "Show events not older than (in days) \"%1$s\"."
-msgstr ""
+msgstr "Wyświetl zdarzenia nie starcze niż (w dniach) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
-msgstr ""
+msgstr "Pokaż filtr"
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Wyświetl hosty w okresie utrzymania"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Wyświetl pozycje o nazwie zbliżonej do"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Wyświetl pozycje nie zawierające danych"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Wyświetl legendę"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Wyświetl linie"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Wyświetl wybrane"
 
 #: include/views/monitoring.dashconf.php:56
 msgid "Show selected groups"
-msgstr ""
+msgstr "Wyświetl wybrane grupy"
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Wyświetl tekst jako HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Wyświetl wyzwalacze"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Wyświetl niezatwierdzone"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] "Wyświetl niepotwierdzone (%1$s dzień)"
+msgstr[1] "Wyświetl niepotwierdzone (%1$s dni)"
+msgstr[2] "Wyświetl niepotwierdzone (%1$s dni)"
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Wyświetl wartość"
 
 #: include/views/administration.general.gui.edit.php:47
 msgid "Show warning if Zabbix server is down"
-msgstr ""
+msgstr "Pokaż ostrzeżenie jeżeli serwer Zabbixa nie działa"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Wyświetl czas pracy"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Wyświetlane"
 
@@ -12808,51 +13205,55 @@ msgstr "Proste sprawdzenie"
 msgid "Simple graph"
 msgstr "Prosty wykres"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr "Prosty prototyp wykresu"
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Kod pocztowy / ZIP witryny"
 
 #: include/hosts.inc.php:340
 msgid "Site address A"
-msgstr "Adres A miejsca"
+msgstr "Adres A witryny"
 
 #: include/hosts.inc.php:345
 msgid "Site address B"
-msgstr "Adres B miejsca"
+msgstr "Adres B witryny"
 
 #: include/hosts.inc.php:350
 msgid "Site address C"
-msgstr "Adres C miejsca"
+msgstr "Adres C witryny"
 
 #: include/hosts.inc.php:355
 msgid "Site city"
-msgstr "Miasto miejsca"
+msgstr "Miasto witryny"
 
 #: include/hosts.inc.php:365
 msgid "Site country"
-msgstr "Kraj miejsca"
+msgstr "Kraj witryny"
 
 #: include/hosts.inc.php:380
 msgid "Site notes"
-msgstr "Notatki o miejscu"
+msgstr "Notatki o witrynie"
 
 #: include/hosts.inc.php:375
 msgid "Site rack location"
-msgstr "Położenie w szafie"
+msgstr "Położenie serwera witryny"
 
 #: include/hosts.inc.php:360
 msgid "Site state / province"
 msgstr "Województwo / prowincja witryny"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
-msgstr ""
+msgstr "Rozmiar podanego pliku. Rozmiar w bajtach. Plik musi mieć uprawnienia do odczytu dla użytkownika zabbix. Przykład: vfs.file.size[/var/log/syslog]"
 
 #: include/classes/server/CZabbixServer.php:212
 #, c-format
 msgid "Size of the response received from Zabbix server \"%1$s\" exceeds the allowed size of %2$s bytes. This value can be increased in the ZBX_SOCKET_BYTES_LIMIT constant in include/defines.inc.php."
-msgstr ""
+msgstr "Rozmiar odpowiedzi z serwera Zabbix \"%1$s\" przekracza dozwolony rozmiar %2$s bajtów. Wartość ta może być zwiększona w stałej ZBX_SOCKET_BYTES_LIMIT w pliku include/defines.inc.php."
 
 #: include/graphs.inc.php:360
 #, c-format
@@ -12861,42 +13262,42 @@ msgstr "Pominięto kopiowanie wykresu \"%1$s\" na hosta \"%2$s\"."
 
 #: include/views/configuration.slideconf.edit.php:102
 msgid "Slide"
-msgstr ""
+msgstr "Slajd"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Pokaz slajdów"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
-msgstr ""
+msgstr "Pokaz slajdów \"%1$s\" już istnieje."
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
-msgstr ""
+msgstr "Pokaz slajdów \"%s\" już istnieje."
 
 #: slideconf.php:106
 msgid "Slide show added"
-msgstr ""
+msgstr "Dodano pokaz slajdów"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
-msgstr ""
+msgstr "Usunięto pokaz slajdów"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
-msgstr ""
+msgstr "Pokaz slajdów musi zawierać slajdy."
 
 #: slideconf.php:99
 msgid "Slide show updated"
-msgstr ""
+msgstr "Zaktualizowano pokaz slajdów"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Pokazy slajdów"
 
@@ -12904,15 +13305,15 @@ msgstr "Pokazy slajdów"
 msgid "Slides"
 msgstr "Slajdy"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Słowacki (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Drzemka"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Miękkie"
 
@@ -12945,45 +13346,45 @@ msgid "Software application E"
 msgstr "Oprogramowanie E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
-msgstr ""
+msgstr "Architektura programowa"
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
-msgstr ""
+msgstr "Lista pakietów oprogramowania - domyślnie wyświetla wszystkie pakiety z wszystkich wspieranych menadżerów pakietów"
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Sortowanie wg"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
-msgstr ""
+msgstr "Sortuj pozycje wg"
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Porządek sortowania (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Sortowanie wyzwalaczy wg"
 
 #: include/classes/api/CApiService.php:533
 #, c-format
 msgid "Sorting by field \"%1$s\" not allowed."
-msgstr ""
+msgstr "Sortowanie według pola \"%1$s\" jest zabronione."
 
 #: events.php:339 include/classes/screens/CScreenHistory.php:166
 msgid "Source"
 msgstr "Źródło"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Hiszpański (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Podany skrypt nie istnieje lub brak uprawnień dla polecenia operacji akcji."
 
@@ -12991,65 +13392,65 @@ msgstr "Podany skrypt nie istnieje lub brak uprawnień dla polecenia operacji ak
 msgid "Speed"
 msgstr "Prędkość"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Warstwowy"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Podstawowe pozycje"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
-msgstr ""
+msgstr "Uruchom w"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
-msgstr ""
+msgstr "Czas startu serwera Zabbix. Znacznik czasu Unix (timestamp)."
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Stan"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
-msgstr ""
+msgstr "Stan usługi. 0 - uruchomiona, 1 - wstrzymana, 2 - trwa start, 3 - trwa wstrzymywanie, 4 - trwa wznawianie, 5 - trwa zatrzymywanie, 6 - zatrzymana, 7 - nieznany, 255 - nie ma takiej usługi"
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Stan"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
-msgstr ""
+msgstr "Stan (rosnąco)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
-msgstr ""
+msgstr "Stan (malejąco)"
 
 #: include/views/configuration.services.child.list.php:39
 #: include/views/configuration.services.parent.list.php:36 services.php:468
@@ -13060,7 +13461,7 @@ msgstr "Wyliczenie stanu"
 msgid "Status calculation algorithm"
 msgstr "Algorytm wyliczenia stanu"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Kody stanów"
 
@@ -13069,7 +13470,7 @@ msgid "Status of Web monitoring"
 msgstr "Stan monitoringu WWW"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "STAN ZABBIXA"
 
@@ -13086,40 +13487,40 @@ msgid "Status only"
 msgstr "Tylko stan"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Krok"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
-msgstr ""
+msgstr "Krok \"%1$s\" [%2$s z %3$s] nie powiódł się: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
-msgstr ""
+msgstr "Czas trwania kroku"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Krok scenariusza"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
-msgstr ""
+msgstr "Krok o nazwie \"%1$s\" już istnieje."
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Kroki"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Stop"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Zachowaj wartość"
@@ -13128,57 +13529,57 @@ msgstr "Zachowaj wartość"
 msgid "Straight"
 msgstr "Prosty"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Styl"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
-msgstr ""
+msgstr "Podfiltr [wpływa tylko na przefiltrowane dane!]"
 
 #: include/actions.inc.php:446 include/actions.inc.php:455
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Temat"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Podrzędna mapa"
 
 #: include/items.inc.php:39
 msgid "Success Audit"
-msgstr ""
+msgstr "Audyt udany"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
-msgstr ""
+msgstr "Suma statystyk przychodzących i wychodzących interfejsu sieciowego. Mode - jeden z: bytes (domyślnie - bajty), packets (pakiety), errors (błędy) lub dropped (utracone)"
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
-msgstr ""
+msgstr "Suma wartości z okresu T jest < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
-msgstr ""
+msgstr "Suma wartości z okresu T jest < N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
-msgstr ""
+msgstr "Suma wartości z okresu T jest < N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
-msgstr ""
+msgstr "Suma wartości z okresu T NIE jest = N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Nie"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Niedziela"
 
@@ -13186,70 +13587,70 @@ msgstr "Niedziela"
 msgid "Support"
 msgstr "Wsparcie"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Nazwisko"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
-msgstr ""
+msgstr "Swap - dane wejściowe. Jeżeli type to count - zwraca ilość zapisów do swap-u. Jeżeli type to pages - zwraca ilość zapisanych w swap stron. Jeżeli swap jest puste, użyte zostanie all."
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
-msgstr ""
+msgstr "Swap - dane wyjściowe. Jeżeli type to count - zwraca ilość odczytów ze swap-u. Jeżeli type to pages - zwraca ilość odczytanych ze swap stron. Jeżeli swap jest puste, użyte zostanie all."
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
-msgstr ""
+msgstr "Przestrzeń swap. Liczba bajtów. Jeżeli swap jest puste, użyte zostanie all. Jeżeli mode jest puste, użyte zostanie free."
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Szwedzki (sv_SE)"
 
 #: include/views/administration.authentication.edit.php:126
 msgid "Switching authentication method will reset all except this session! Continue?"
-msgstr ""
+msgstr "Zmiana metody autoryzacji spowoduje zresetowanie wszystkich sesji poza tą! Kontynuować?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Domyślny systemowy"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Błąd systemowy."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
-msgstr ""
+msgstr "Lokalny czas systemowy. Czas w sekundach."
 
 #: dashboard.php:393 include/screens.inc.php:41
 msgid "System status"
 msgstr "Stan systemu"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
-msgstr ""
+msgstr "Czas działania systemu w sekundach."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
-msgstr ""
+msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
-msgstr ""
+msgstr "C"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
-msgstr ""
+msgstr "W"
 
 #: include/discovery.inc.php:64
 #: include/views/js/configuration.discovery.edit.js.php:174
@@ -13265,36 +13666,36 @@ msgid "TOTAL"
 msgstr "OGÓŁEM"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "KOMENTARZE DO WYZWALACZA"
+msgid "TRIGGER DESCRIPTION"
+msgstr "OPIS WYZWALACZA"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "PRAWDA"
 
 #: include/classes/db/DB.php:216
 #, c-format
 msgid "Table \"%1$s\" does not exist."
-msgstr ""
+msgstr "Tabela \"%1$s\" nie istnieje."
 
 #: include/classes/db/DB.php:389
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
-msgstr ""
+msgstr "Tabela \"%1$s\" nie posiada pola o nazwie \"%2$s\"."
 
 #: include/hosts.inc.php:150 include/views/inventory.host.list.php:80
 msgid "Tag"
 msgstr "Etykieta"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Cel"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Lista celi"
 
@@ -13303,130 +13704,133 @@ msgid "Target type"
 msgstr "Typ celu"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Szablon"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
-msgstr ""
+msgstr "Szablon \"%1$s\" już istnieje."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
-msgstr ""
+msgstr "Nie istnieje szablon \"%1$s\" dla hosta \"%2$s\"."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
-msgstr ""
+msgstr "Szablon \"%1$s\" z kluczem pozycji \"%2$s\" już jest podłączony do hosta."
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
-msgstr ""
+msgstr "Dodano szablon"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
-msgstr ""
+msgstr "Szablon nie może być połączony z innym szablonem więcej niż raz nawet poprzez inne szablony."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Usunięto szablon"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Grupa szablonów"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Powiązania szablonu"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Lista szablonów"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Nazwa szablonu"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
-msgstr ""
+msgstr "Ekran szablonu \"%1$s\" już istnieje."
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
-msgstr ""
+msgstr "Ekrany szablonu"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Wyzwalacz szablonu"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
-msgstr "Uaktualniono szablon"
+msgstr "Zaktualizowano szablon"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
-msgstr ""
+msgstr "Szablon o takiej samej nazwie \"%s\" już istnieje."
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Szablon o nazwie \"%s\" już istnieje."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
-msgstr ""
+msgstr "Szablon o takiej samej widocznej nazwie \"%s\" już istnieje."
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Szablon o widocznej nazwie \"%s\" już istnieje."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Pozycje zawarte w szablonie"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Szablony"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
-msgstr ""
+msgstr "Szablony \"%1$s\" odłączone od hostów \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Test"
 
@@ -13434,105 +13838,105 @@ msgstr "Test"
 msgid "Test authentication"
 msgstr "Test uwierzytelniania"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Potwierdzenie testu"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Dane testowe"
 
 #: include/views/administration.general.regularexpressions.edit.php:69
 msgid "Test expressions"
-msgstr ""
+msgstr "Wyrażenia testowe"
 
 #: adm.regexps.php:38
 #: include/views/administration.general.regularexpressions.edit.php:66
 msgid "Test string"
-msgstr "Ciąg testowy"
+msgstr "Testowy ciąg znaków"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Tekst"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
-msgstr ""
+msgstr "Metoda \"%1$s.%2$s\" musi być wywoływana bez parametru \"auth\"."
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
-msgstr ""
+msgstr "Koordynata X elementu ekranu umieszczonego w punkcie X - %1$s i Y - %2$s ekranu \"%3$s\" jest zbyt duża."
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
-msgstr ""
+msgstr "Koordynata Y elementu ekranu umieszczonego w punkcie X - %1$s i Y - %2$s ekranu \"%3$s\" jest zbyt duża."
 
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
-msgstr ""
+msgstr "Interfejs użytkownika nie jest zgodny z bazą danych Zabbix."
 
 #: include/classes/db/DbBackend.php:48
 #, c-format
 msgid "The frontend does not match Zabbix database. Current database version (mandatory/optional): %d/%d. Required mandatory version: %d. Contact your system administrator."
-msgstr ""
+msgstr "Interfejs użytkownika nie jest zgodny z bazą danych Zabbix. Aktualna wersja bazy (wymagan/opcjonalna): %d/%d. Wymagana jest wersja: %d. Skontaktuj się z administratorem systemu."
 
 #: include/views/configuration.hostgroups.list.php:130
 #, c-format
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr ""
+msgstr "Nie można wykryć grupy hostów i zostanie ona wykasowana z %1$s (na %2$s w %3$s)."
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr ""
+msgstr "Nie można wykryć hosta i zostanie on wykasowany z %1$s (na %2$s w %3$s)."
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Obraz został użyty w mapie ikon %1$s."
+msgstr[1] "Obraz został użyty w mapach ikon %1$s."
+msgstr[2] "Obraz został użyty w mapach ikon %1$s."
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Obraz został użyty w mapie %1$s."
+msgstr[1] "Obraz został użyty w mapach %1$s."
+msgstr[2] "Obraz został użyty w mapach %1$s."
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr ""
+msgstr "Nie można wykryć pozycji i zostanie ona wykasowana z %1$s (na %2$s w %3$s)."
 
 #: queue.php:78
 msgid "The queue is empty."
-msgstr ""
+msgstr "Kolejka jest pusta."
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
-msgstr "Otrzymana dane JSON nie są poprawnym żądaniem JSON-RPC."
+msgstr "Otrzymane dane JSON nie są poprawnym żądaniem JSON-RPC."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "Żądana zdalna procedura nie istnieje / nie jest dostępna"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
-msgstr ""
+msgstr "Aplikacja scenariusza sieci www należy do innego hosta niż host scenariusza sieci www."
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Motyw"
 
@@ -13540,30 +13944,30 @@ msgstr "Motyw"
 #, c-format
 msgid "There is \"%1$d\" group with Internal GUI access."
 msgid_plural "There are \"%1$d\" groups with Internal GUI access."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Istnieje \"%1$d\" grupa z dostępem do wewnętrznego interfejsu użytkownika."
+msgstr[1] "Istnieją \"%1$d\" grupy z dostępem do wewnętrznego interfejsu użytkownika."
+msgstr[2] "Istnieje \"%1$d\" grup z dostępem do wewnętrznego interfejsu użytkownika."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Trzeci"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
-msgstr "To pole jest automatycznie uzupełnianie przez pozycję \"%s\"."
+msgstr "To pole jest automatycznie uzupełniane przez pozycję \"%s\"."
 
 #: srv_status.php:37
 msgid "This month"
 msgstr "Bieżący miesiąc"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
-msgstr ""
+msgstr "Ta kolumna ekranu nie jest pusta. Usunąć ją?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
-msgstr ""
+msgstr "Ten wiersz ekranu nie jest pusty. Usunąć go?"
 
 #: srv_status.php:36
 msgid "This week"
@@ -13573,27 +13977,27 @@ msgstr "Ten tydzień"
 msgid "This year"
 msgstr "Ten rok"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Cz"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Do"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13602,267 +14006,269 @@ msgstr "Do"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Czas"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
-msgstr ""
+msgstr "Czas (rosnąco)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
-msgstr ""
+msgstr "Czas (malejąco)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
-msgstr ""
+msgstr "Czas, jaki konkretny proces lub grupa procesów Zabbix (identyfikowany przez <type> i <num>) spędza w stanie <state> w procentach."
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
-msgstr ""
+msgstr "Czas ostatniego dostępu do proxy. Name - nazwa proxy. Param - ostatni dostęp. Znacznik czasu Unix (timestamp)."
 
 #: include/actions.inc.php:66
 msgid "Time period"
 msgstr "Okres"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Przesunięcie czasu"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Typ czasu"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
-msgstr ""
+msgstr "Nie ustawiono strefy czasowej dla PHP (parametr konfiguracji \"date.timezone\")."
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Przekroczenie czasu"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Odcisk czasowy"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
-msgstr ""
+msgstr "Nie zmienił się znacznik czasu serwera czasu Zabbix przez okres większy niż T sekund, wtedy N = 1, 0 - w przeciwnym przypadku"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
-msgstr ""
+msgstr "Nie zmienił się znacznik czasu serwera czasu Zabbix przez okres większy niż T sekund, wtedy N NOT 1, 0 - w przeciwnym przypadku"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
-msgstr ""
+msgstr "Sygnatura czasowa uruchomienia systemu."
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Tytuł"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
-msgstr ""
+msgstr "Aby ustawić interfejs hosta wybierz odpowiedni typ pozycji dla każdej pozycji"
 
 #: srv_status.php:35
 msgid "Today"
 msgstr "Dziś"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
-msgstr "Góra"
+msgstr "Na górze"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
-msgstr "Łącznie"
+msgstr "Ogółem"
 
 #: include/classes/debug/CProfiler.php:135
 #, c-format
 msgid "Total SQL time: %s"
-msgstr ""
+msgstr "Czas trwania SQL ogółem: %s"
 
 #: include/classes/debug/CProfiler.php:129
 #, c-format
 msgid "Total time: %s"
-msgstr ""
+msgstr "Czas ogółem: %s"
 
 #: include/page_footer.php:61
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Transakcja nie została zamknięta. Przerywanie…"
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Błąd przesyłu."
 
 #: adm.housekeeper.php:64
 msgid "Trend data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych trendu"
 
 #: adm.housekeeper.php:113
 #, c-format
 msgid "Trend data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych trendu (w dniach) \"%1$s\"."
 
 #: disc_prototypes.php:119 items.php:62
 msgid "Trend storage period"
-msgstr ""
+msgstr "Okres przechowywania trendu"
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
-msgstr ""
+msgstr "Okres przechowywania trendu (w dniach)"
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trendy"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Wyzwalacz"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Wyzwalacz \"%1$s\" już istnieje w \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
-msgstr ""
+msgstr "Wyzwalacz \"%1$s\" zależy od wyzwalacza \"%2$s\", którego nie ma."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
-msgstr ""
+msgstr "Pominięto wyzwalacz \"%1$s\" - reguła użytkownika."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Wyzwalacz \"%s\" należy do szablonów z różnymi połączeniami."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Dodano wyzwalacz"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
-msgstr ""
-
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Komentarze do wyzwalacza"
+msgstr "Wyzwalacz nie może zależeć od wyzwalacza, który z niego dziedziczy."
 
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
-msgstr ""
+msgstr "Okres przechowywania danych wyzwalaczy (w dniach)"
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Usunięto wyzwalacz"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr "Opis wyzwalacza"
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono wyzwalacz"
+msgstr[1] "Wyłączono wyzwalacze"
+msgstr[2] "Wyłączono wyzwalacze"
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
-msgstr "Wyświetlanie wyzwalaczy"
+msgstr "Opcje wyświetlania wyzwalaczy"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono wyzwalacz"
+msgstr[1] "Włączono wyzwalacze"
+msgstr[2] "Włączono wyzwalacze"
 
 #: adm.housekeeper.php:34
 msgid "Trigger event and alert data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych zdarzeń i alarmów dla wyzwalaczy"
 
 #: adm.housekeeper.php:105
 #, c-format
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych zdarzeń i alarmów dla wyzwalaczy (w dniach) \"%1$s\"."
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
-msgstr ""
+msgstr "Warunek wyrażenia wyzwalacza"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
-msgstr ""
+msgstr "Wyrażenie wyzwalacza musi zawierać przynajmniej jedno odwołanie postaci host:klucz."
 
 #: tr_logform.php:27
 msgid "Trigger form"
 msgstr "Formularz wyzwalaczy"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
-msgstr ""
+msgstr "Wyzwalacz posiada pozycje z szablonu \"%1$s\", które nie są połączone z hostem."
 
 #: include/actions.inc.php:1161
 msgid "Trigger in \"normal\" state"
-msgstr ""
+msgstr "Wyzwalacz w stanie \"normalny\""
 
 #: include/actions.inc.php:1160
 msgid "Trigger in \"unknown\" state"
-msgstr ""
+msgstr "Wyzwalacz w stanie \"nieznany\""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
-msgstr ""
+msgstr "Wyzwalacz w szablonie \"%1$s\" jest zależny od wyzwalacza w szablonie \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Wyzwalacz niedawno dodany. Póki co brak aktualnego stanu."
 
@@ -13874,198 +14280,208 @@ msgstr "Typ etykiety wyzwalacza"
 msgid "Trigger name"
 msgstr "Nazwa wyzwalacza"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Prototyp wyzwalacza"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "Prototyp wyzwalacza \"%1$s\" zawiera prototypy pozycji z wielu reguł wykrywania."
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
-msgstr ""
+msgstr "Prototyp wyzwalacza \"%1$s\" musi posiadać przynajmniej jeden prototyp pozycji."
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
-msgstr ""
+msgstr "Dodano prototyp wyzwalaczy"
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
-msgstr ""
+msgstr "Usunięto prototyp wyzwalaczy"
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono prototyp wyzwalacza"
+msgstr[1] "Wyłączono prototypy wyzwalacza"
+msgstr[2] "Wyłączono prototypy wyzwalacza"
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono prototyp wyzwalacza"
+msgstr[1] "Włączono prototypy wyzwalacza"
+msgstr[2] "Włączono prototypy wyzwalacza"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
-msgstr ""
+msgstr "Zaktualizowano prototyp wyzwalaczy"
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Prototypy wyzwalacza"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
-msgstr ""
+msgstr "Usunięto prototypy wyzwalaczy"
 
 #: include/views/configuration.triggers.list.php:59
 msgid "Trigger prototypes of"
-msgstr ""
+msgstr "Prototypy wyzwalaczy"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
-msgstr ""
+msgstr "Zaktualizowano prototypy wyzwalaczy"
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Poziomy wyzwalacza"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
-msgstr "Drastyczność wyzwalacza"
+msgstr "Poziom wyzwalacza"
+
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr "Stan wyzwalacza \"OK\""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr "Stan wyzwalacza \"Problem\""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
-msgstr "Uaktualniono wyzwalacz"
+msgstr "Zaktualizowano wyzwalacz"
 
 #: include/actions.inc.php:48
 msgid "Trigger value"
 msgstr "Wartość wyzwalacza"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Wyzwalacze"
 
-#: include/classes/class.cserverinfo.php:63
+# (enabled/disabled)[on/off]
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
-msgstr ""
+msgstr "Wyzwalacze (wł/wył)[on/off]"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Usunięto wyzwalacze"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Info o wyzwalaczach"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
-msgstr "Masowe uaktualnienie wyzwalaczy"
+msgstr "Masowa aktualizacja wyzwalaczy"
 
 #: include/screens.inc.php:43
 msgid "Triggers overview"
 msgstr "Przegląd wyzwalaczy"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Stan wyzwalaczy"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Top 100 wyzwalaczy"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Wyzwalacze o poziomie"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Obcięto"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
-msgstr ""
+msgstr "Próba odczytu niedostępnej właściwości \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Wt"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
-msgstr ""
+msgstr "Turecki (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Należy wybrać dwa elementy"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Dwie pozycje (\"%1$s\" oraz \"%2$s\") nie mogą wypełniać pola inwentarzowego \"%3$s\", ponieważ doprowadzi to do konfliktu."
+msgstr "Dwie pozycje (\"%1$s\" oraz \"%2$s\") nie mogą dotyczyć jednego pola inwentarzowego \"%3$s\", ponieważ doprowadzi to do konfliktu."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Typ"
 
@@ -14073,62 +14489,64 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr "Typ (szczegóły)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Typ (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
-msgstr ""
+msgstr "Typ (rosnąco)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
-msgstr ""
+msgstr "Typ (malejąco)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Typ obliczeń"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Typ informacji"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
-msgstr ""
+msgstr "Typem informacji dla klucza log musi być \"Log\"."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
-msgstr ""
+msgstr "Typem informacji dla pozycji agregowanych musi być \"Numerycznie (zmiennoprzecinkowo)\"."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Typy"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "NIEZNANE"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "DZIAŁA"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (po zalogowaniu)"
 
@@ -14144,20 +14562,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
-msgstr ""
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr "Nazwa URL powinna być unikalna dla mapy \"%s\"."
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr "Parametr URL nie może być tablicą."
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
-msgstr ""
+msgstr "Nazwa parametru URL jest pusta."
+
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr "URL powinien zawierać oba pola \"name\" i \"url\" dla mapy \"%s\"."
 
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "Adresy URL"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 znaków)"
 
@@ -14165,23 +14593,19 @@ msgstr "USA (160 znaków)"
 msgid "USER PROFILE"
 msgstr "PROFIL UŻYTKOWNIKA"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukraiński (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
-msgstr ""
+msgstr "Nie można wybrać konfiguracji."
 
 #: include/classes/helpers/CUploadFile.php:57
 msgid "Unable to upload file because \"file_uploads\" is disabled."
-msgstr ""
+msgstr "Nie można załadować pliku ponieważ jest wyłączone \"file_uploads\"."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Niepotwierdzone"
 
@@ -14194,20 +14618,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Niepotwierdzone zdarzenia w stanie PROBLEM"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Tylko niepotwierdzone"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
-msgstr ""
+msgstr "Niedostępne dla użytkowników z %1$s."
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Odblokuj zaznaczone"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Odblokować zaznaczonych użytkowników?"
 
@@ -14216,29 +14640,29 @@ msgstr "Odblokować zaznaczonych użytkowników?"
 msgid "Units"
 msgstr "Jednostki"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14248,23 +14672,20 @@ msgstr "Nieznany"
 msgid "Unknown action"
 msgstr "Nieznane działanie"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Nieznany algorytm wyliczenia stanu usługi"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
-msgstr ""
+msgstr "Nieznany błąd"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
-msgstr ""
+msgstr "Nieznana funkcja."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Nieznana pozycja hosta, taka pozycja nie istnieje na wybranym hoście"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Nieznany host, taki host nie istnieje w systemie"
 
@@ -14276,23 +14697,23 @@ msgstr "Nieznany typ interfejsu."
 msgid "Unknown resource"
 msgstr "Nieznany zasób"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
-msgstr ""
+msgstr "Nieznany krok zakończył się niepowodzeniem: %1$s"
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Nieznany typ wartości"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Odłącz"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Odłącz i wyczyść"
 
@@ -14300,194 +14721,205 @@ msgstr "Odłącz i wyczyść"
 msgid "Unlink from template"
 msgstr "Odłącz od szablonu"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Odłącz od szablonów"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Aplikacja \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Reguła wykrywania \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Wykres \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Prototyp wykresu \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Prototyp hosta \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Pozycja \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Prototyp pozycji \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Wyzwalacz \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Prototyp wyzwalacza \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Odłączono: Scenariusz sieci www \"%1$s\" w \"%2$s\"."
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Włącz głos"
 
 #: include/classes/import/readers/CImportReaderFactory.php:65
 #, c-format
 msgid "Unsupported import file extension \"%1$s\"."
-msgstr ""
+msgstr "Niewspierane rozszerzenie pliku importu \"%1$s\"."
 
 #: include/classes/import/readers/CImportReaderFactory.php:44
 #, c-format
 msgid "Unsupported import format \"%1$s\"."
-msgstr ""
+msgstr "Niewspierany format importu \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
-msgstr ""
+msgstr "Niewspierany parametr \"%1$s\" dla prototypu grupy."
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr "Niewspierany parametr \"%2$s\" dla warunku filtra akcji \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Niewspierany parametr \"%2$s\" dla warunku filtra reguły wykrywania \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
-msgstr ""
+msgstr "Niewspierany parametr \"%2$s\" dla prototypu hosta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
-msgstr ""
+msgstr "Niewspierany parametr \"%2$s\" dla prototypu hosta %1$s w inwentarzu hosta."
+
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr "Niewspierany parametr \"%2$s\" dla filtra akcji \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Niewspierany parametr \"%2$s\" dla filtra reguły wykrywania \"%1$s\"."
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
-msgstr ""
+msgstr "Działa"
 
 #: include/discovery.inc.php:153
 msgctxt "discovery status"
 msgid "Up"
-msgstr ""
+msgstr "Działa"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
-msgstr "Uaktualnij"
+msgstr "Zaktualizuj"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
-msgstr ""
+msgstr "Aktualizuj istniejące"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Okres aktualizacji"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
-msgstr "Uaktualnij okres (w sek.)"
+msgstr "Okres aktualizacji (w sek)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
-msgstr "Uaktualniono"
+msgstr "Zaktualizowano"
 
 #: include/hosts.inc.php:560
 msgid "Updated status of host"
-msgstr "Uaktualniony stan hosta"
+msgstr "Zaktualizowano stan hosta"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
-msgstr "Uaktualniono: %s"
+msgstr "Zaktualizowano: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Zaktualizowano: Aplikacja \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Zaktualizowano: Reguła wykrywania \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Zaktualizowano: Prototyp hosta \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Zaktualizowano: Pozycja \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Zaktualizowano: Prototyp pozycji \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Zaktualizowano: Wyzwalacz \"%1$s\" w \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Zaktualizowano: Prototyp wyzwalacza \"%1$s\" w \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
-msgstr ""
+msgstr "Zaktualizowano: Scenariusz sieci www \"%1$s\" w \"%2$s\"."
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Wyślij"
 
@@ -14495,25 +14927,25 @@ msgstr "Wyślij"
 msgid "Upper level maps"
 msgstr "Mapy wyższego poziomu"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Czas pracy"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
-msgstr ""
+msgstr "Czas działania serwera Zabbix w sekundach."
 
 #: include/actions.inc.php:82
 msgid "Uptime/Downtime"
 msgstr "Czas dostępności/niedostępności"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr ""
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr "Użyj żądań zbiorczych"
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14528,90 +14960,94 @@ msgid "Used in actions"
 msgstr "Wykorzystywane w akcjach"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Użytkownik"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "Użytkownik \"%s\" musi znajdować się w grupie użytkowników."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Dodano użytkownika"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Użytkownik nie może zmienić typu dla siebie samego"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
-msgstr ""
+msgstr "Użytkownik nie może dodać samego siebie do wyłączonej grupy lub do grupy z wyłączonym dostępem do interfejsu użytkownika."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
-msgstr ""
+msgstr "Użytkownik nie może zmienić sposobu dostępu do interfejsu użytkownika dla samego siebie."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Użytkownik nie może zmienić swojego własnego statusu"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
-msgstr ""
+msgstr "Użytkownik nie może zmienić swojego własnego statusu."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Usunięto użytkownika"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Grupa użytkowników"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr "Grupa użytkowników \"%1$s\" już istnieje."
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
-msgstr ""
+msgstr "Grupa użytkowników \"%1$s\" jest jedyną grupą, do której należy użytkownik \"%2$s\"."
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
-msgstr ""
+msgstr "Grupa użytkowników \"%1$s\" została użyta w konfiguracji dla komunikatów zatrzymania bazy danych."
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Grupa użytkowników \"%1$s\" jest wykorzystywana w skrypcie \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
-msgstr ""
+msgstr "Grupa użytkowników \"%s\" już istnieje."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono grupę użytkowników"
+msgstr[1] "Wyłączono grupy użytkowników"
+msgstr[2] "Wyłączono grupy użytkowników"
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono grupę użytkowników"
+msgstr[1] "Włączono grupy użytkowników"
+msgstr[2] "Włączono grupy użytkowników"
 
 #: include/views/administration.general.other.edit.php:37
 msgid "User group for database down message"
@@ -14620,40 +15056,40 @@ msgstr "Grupa użytkowników dla wiadomości o wyłączeniu bazy danych"
 #: adm.other.php:92
 #, c-format
 msgid "User group for database down message \"%1$s\"."
-msgstr ""
+msgstr "Grupa użytkowników dla wiadomości o wyłączeniu bazy danych \"%1$s\"."
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Grupy użytkowników"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Użytkownik nie może siebie usunąć."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Użytkownik nie może modyfikować dostępu GUI dla siebie samego, poprzez stanie się członkiem grupy \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Użytkownik nie może modyfikować statusu systemu dla siebie samego, poprzez stanie się członkiem grupy \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Nazwa użytkownika"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
-msgstr ""
+msgstr "Nazwa użytkownika nie jest zgodna z bazą danych"
 
 #: authentication.php:51
 #: include/views/administration.authentication.edit.php:112
@@ -14666,257 +15102,257 @@ msgstr "Profil użytkownika"
 
 #: adm.housekeeper.php:55
 msgid "User session data storage period"
-msgstr ""
+msgstr "Okres przechowywania danych sesji użytkownika"
 
 #: adm.housekeeper.php:111
 #, c-format
 msgid "User session data storage period (in days) \"%1$s\"."
-msgstr ""
+msgstr "Okres przechowywania danych sesji użytkownika (w dniach) \"%1$s\"."
 
 #: include/views/administration.general.housekeeper.edit.php:119
 msgid "User sessions"
-msgstr ""
+msgstr "Sesje użytkownika"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Typ użytkownika"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
-msgstr "Uaktualniono użytkownika"
+msgstr "Zaktualizowano użytkownika"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
-msgstr "Użytkownik o aliasie \"%s\" istnieje."
+msgstr "Użytkownik o aliasie \"%s\" już istnieje."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
-msgstr "Nazwa użytkownika"
+msgstr "Login"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Użytkownicy (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Odblokowano użytkowników"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
-msgstr ""
+msgstr "Statystyki cache'a VMware. Poprawne tryby to: total, free, pfree, used i pused."
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
-msgstr ""
+msgstr "Stan klastra VMware, <url> - URL usługi VMware, <uuid> - nazwa klastra VMware"
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
-msgstr ""
+msgstr "Log zdarzeń VMware, <url> - URL serwisu VMware"
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "uuid BIOS-u hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Rozmiar pamięci balonowej hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Nazwa klastra hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
-msgstr ""
+msgstr "Statystyki odczytu magazynu danych hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware, <datastore> - nazwa magazynu danych, <mode> - opóźnienie"
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
-msgstr ""
+msgstr "Statystyki zapisu magazynu danych hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware, <datastore> - nazwa magazynu danych, <mode> - opóźnienie"
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Model hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Nazwa hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
-msgstr ""
+msgstr "Statystyki wejścia sieci hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware, <mode> - bps"
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
-msgstr ""
+msgstr "Statystyki wyjścia sieci hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware, <mode> - bps"
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Częstotliwość procesora hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Model procesora hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Użycie procesora hipernadzorcy VMware w Hz, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Stan hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Rozmiar ogółem pamięci hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Czas działania hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Rozmiar używanej pamięci hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Nazwa dostawcy hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Wersja hipernadzorcy VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware"
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
-msgstr ""
+msgstr "Pełna nazwa serwisu VMware, <url> - URL serwisu VMware"
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
-msgstr ""
+msgstr "Wersja serwisu VMware, <url> - URL serwisu VMware"
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Rozmiar pamięci balonowej maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Używana przestrzeń danych maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Rozmiar skompresowanej pamięci maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
-msgstr ""
+msgstr "Statystyki odczytu urządzeń dyskowych maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware, <instance> - instancja urządzenia dyskowego, <mode> - bps/ops - bajty/operacje na sekundę"
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
-msgstr ""
+msgstr "Statystyki zapisu urządzeń dyskowych maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware, <instance> - instancja urządzenia dyskowego, <mode> - bps/ops - bajty/operacje na sekundę"
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
-msgstr ""
+msgstr "Statystyki systemu plików maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware, <fsname> - nazwa systemu plików, <mode> - total/free/used/pfree/pused"
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Użycie pamięci gościa maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Użycie pamięci hosta maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Nazwa hipernadzorcy maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Nazwa maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
-msgstr ""
+msgstr "Statystyki wejścia interfejsu sieciowego maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware, <instance> - instancja interfejsu sieciowego, <mode> - bps/pps - bajty/pakiety na sekundę"
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
-msgstr ""
+msgstr "Statystyki wyjścia interfejsu sieciowego maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware, <instance> - instancja interfejsu sieciowego, <mode> - bps/pps - bajty/pakiety na sekundę"
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Stan zasilania maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Rozmiar pamięci prywatnej maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Użycie procesora maszyny wirtualnej VMware w Hz, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Rozmiar pamięci współdzielonej maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Rozmiar pamięci swapowanej maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Rozmiar pamięci ogółem maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Nieużywana przestrzeń danych maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Niewspółdzielona przestrzeń danych maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Czas działania maszyny wirtualnej VMware, <url> - URL usługi VMware, <uuid> - nazwa hosta maszyny wirtualnej VMware"
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Wartość"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Nieprawidłowa wartość \"%1$s\" dla parametru \"grid_align\". Do wyboru są \"%2$s\" oraz \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
-msgstr ""
+msgstr "Nieprawidłowa wartość \"%1$s\" dla parametru \"grid_show\". Do wyboru są \"%2$s\" oraz \"%3$s\""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
-msgstr ""
+msgstr "Nieprawidłowa wartość \"%1$s\" dla parametru \"grid_show\". Do wyboru są \"%2$s\"."
 
 #: include/classes/db/DB.php:333
 #, c-format
@@ -14931,34 +15367,34 @@ msgstr "Wartość \"%1$s\" jest zbyt długa dla pola \"%2$s\" - %3$d znaków. Do
 #: include/validate.inc.php:326 include/validate.inc.php:350
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has incorrect decimal format."
-msgstr ""
+msgstr "Wartość \"%2$s\" z \"%1$s\" ma niepoprawny format dziesiętny."
 
 #: include/validate.inc.php:336 include/validate.inc.php:352
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits after the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "Wartość \"%2$s\" z \"%1$s\" ma zbyt dużo cyfr po kropce: nie może być więcej cyfr niż %3$s."
 
 #: include/validate.inc.php:332
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits before the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "Wartość \"%2$s\" z \"%1$s\" ma zbyt dużo cyfr przed kropką: nie może być więcej cyfr niż %3$s."
 
 #: include/validate.inc.php:328
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
-msgstr ""
+msgstr "Wartość \"%2$s\" z \"%1$s\" jest zbyt długa: nie może być więcej cyfr niż %3$s przed kropką i więcej cyfr niż %4$s po kropce."
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
-msgstr ""
+msgstr "Efektywność cache'a wartości. Prawidłowe parametry to: requests, hits i misses."
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
-msgstr ""
+msgstr "Statystyki cache'a wartości. Poprawne tryby to: total, free, pfree, used i pused."
 
 #: include/valuemap.inc.php:147
 msgid "Value cannot be mapped to empty string."
-msgstr ""
+msgstr "Wartość nie może być mapowana na pusty ciąg znaków."
 
 #: include/audit.inc.php:38
 #: include/views/administration.general.valuemapping.list.php:25
@@ -14968,17 +15404,17 @@ msgstr "Mapa wartości"
 #: adm.valuemapping.php:101
 #, c-format
 msgid "Value map \"%1$s\" \"%2$s\"."
-msgstr ""
+msgstr "Mapa wartości \"%1$s\" \"%2$s\"."
 
 #: include/valuemap.inc.php:40 include/valuemap.inc.php:80
 #, c-format
 msgid "Value map \"%1$s\" already exists."
-msgstr ""
+msgstr "Mapa wartości \"%s\" już istnieje."
 
 #: adm.valuemapping.php:79
 #, c-format
 msgid "Value map \"%1$s\"."
-msgstr ""
+msgstr "Mapa wartości \"%1$s\"."
 
 #: adm.valuemapping.php:71
 msgid "Value map added"
@@ -14990,40 +15426,40 @@ msgstr "Usunięto mapę wartości"
 
 #: adm.valuemapping.php:63
 msgid "Value map updated"
-msgstr "Uaktualniono mapę wartości"
+msgstr "Zaktualizowano mapę wartości"
 
 #: adm.valuemapping.php:106 include/valuemap.inc.php:70
 #, c-format
 msgid "Value map with valuemapid \"%1$s\" does not exist."
-msgstr ""
+msgstr "Mapa wartości z valuemapid \"%1$s\" nie istnieje."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Mapowanie wartości"
 
 #: include/valuemap.inc.php:142
 msgid "Value mapping must have at least one mapping."
-msgstr ""
+msgstr "Mapa wartości musi posiadać przynajmniej jedno mapowanie."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
-msgstr ""
+msgstr "Wartość licznika wydajności, przy czym \"counter\" to ścieżka do licznika a \"interval\" to liczba ostatnich sekund, przez które agent zwrócił wartość średnią."
 
 #: include/classes/graphdraw/CPieGraphDraw.php:345
 msgid "Value: no data"
-msgstr ""
+msgstr "Wartość: brak danych"
 
 #: include/views/monitoring.history.php:63
 msgid "Values"
 msgstr "Wartości"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Zmienne"
 
@@ -15033,67 +15469,72 @@ msgstr "Producent"
 
 #: include/items.inc.php:43
 msgid "Verbose"
-msgstr ""
+msgstr "Szczegółowo"
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
-msgstr ""
+msgstr "Wersja zabbix_agent(d) uruchomionego na monitorowanym hoście. Ciąg znaków. Przykład zwracanej wartości: 1.1"
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Pionowe"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Ułożenie pionowe"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr "Wietnamski (vi_VN)"
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Widok nie jest renderowany."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
-msgstr ""
+msgstr "Statystyki pamięci wirtualnej."
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Widoczna nazwa"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Widoczna nazwa nie może być pusta jeśli host nie posiada swojej nazwy."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
-msgstr ""
+msgstr "Ś"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Przepraszamy, maksymalna możliwa liczba elementów to zapamiętania została osiągnięta."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "WWW"
 
@@ -15101,67 +15542,85 @@ msgstr "WWW"
 msgid "Web monitoring"
 msgstr "Monitoring WWW"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
-msgstr ""
+msgstr "Scenariusz sieci www \"%1$s\" już istnieje na hoście \"%2$s\"."
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
-msgstr ""
+msgstr "Scenariusz sieci www \"%1$s\" już istnieje."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
-msgstr ""
+msgstr "Usunięto scenariusz sieci www"
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wyłączono scenariusz sieci www"
+msgstr[1] "Wyłączono scenariusze sieci www"
+msgstr[2] "Wyłączono scenariusze sieci www"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Włączono scenariusz sieci www"
+msgstr[1] "Włączono scenariusze sieci www"
+msgstr[2] "Włączono scenariusze sieci www"
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
-msgstr ""
+msgstr "Brakujące parametry scenariusza sieci www: %1$s"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
-msgstr ""
+msgstr "Scenariusz sieci www musi mieć przynajmniej jeden krok."
+
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr "Nazwa scenariusza sieci www nie może być pusta."
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
-msgstr ""
+msgstr "Krok scenariusza sieci www \"%1$s\" już istnieje."
+
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr "URL kroku scenariusza sieci www nie może być pusty."
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr "Nazwa kroku scenariusza sieci www nie może być pusta."
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
-msgstr ""
+msgstr "Nazwa kroku scenariusza sieci www powinna zawierać wyłącznie znaki drukowalne."
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
-msgstr ""
+msgstr "Numer kroku scenariusza sieci www nie powinien być mniejszy niż 1."
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
-msgstr ""
+msgstr "Scenariusze sieci www"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Śr"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Środa"
 
@@ -15169,9 +15628,9 @@ msgstr "Środa"
 msgid "Week"
 msgstr "Tydzień"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Tygodniowo"
 
@@ -15179,12 +15638,12 @@ msgstr "Tygodniowo"
 msgid "When active"
 msgstr "Kiedy włączone"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Szerokość"
@@ -15194,28 +15653,28 @@ msgstr "Szerokość"
 msgid "With data collection"
 msgstr "Ze zbieraniem danych"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Z ostatnim zdarzeniem niepotwierdzonym"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Z problemami"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Z wyzwalaczami"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Z niepotwierdzonymi zdarzeniami"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Bez problemów"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Bez wyzwalaczy"
 
@@ -15224,7 +15683,7 @@ msgid "Wizard"
 msgstr "Kreator"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15235,282 +15694,276 @@ msgstr "Czas pracy"
 #: adm.workingtime.php:48
 #, c-format
 msgid "Working time \"%1$s\"."
-msgstr ""
+msgstr "Czas pracy \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Zapis"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
-msgstr ""
+msgstr "Błędne pola dla zależności dla serwisu \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
-msgstr ""
+msgstr "Błędne pola dla pozycji."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Błędne pola dla hosta \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
-msgstr ""
-
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
+msgstr "Błędne pola dla obrazu \"%1$s\"."
 
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
-msgstr ""
+msgstr "Błędne pola dla usuwania linktrigger."
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
-msgstr ""
+msgstr "Błędne pola dla aktualizacji linktrigger."
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
-msgstr ""
+msgstr "Błędne pola dla linktrigger."
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
-msgstr ""
+msgstr "Błędne pola dla makra \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
-msgstr ""
+msgstr "Błędne pola dla linku mapy."
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
-msgstr ""
+msgstr "Błędne pola dla typu mediów."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
-msgstr ""
+msgstr "Błędne pola dla proxy \"%1$s\"."
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
-msgstr ""
+msgstr "Błędne pola dla skryptu."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
-msgstr ""
+msgstr "Błędne pola dla serwisu \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
-msgstr ""
+msgstr "Błędne pola dla czasu dla serwisu \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
-msgstr ""
+msgstr "Błędne pola dla wyzwalacza."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Błędne pola dla użytkownika \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
-msgstr ""
+msgstr "Błędne makro \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
-msgstr ""
+msgstr "Etykieta osi X "
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
-msgstr ""
+msgstr "Plik XML zawiera błąd %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "Plik XML zawiera błędy"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
-msgstr ""
+msgstr "Plik XML zawiera błąd krytyczny %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
-msgstr ""
+msgstr "Plik XML zawiera ostrzeżenie %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
-msgstr ""
-
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
+msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "MAX wartość osi Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
-msgstr ""
+msgstr "Wartość MAX osi Y musi być większa od wartości MIN osi Y."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "MIN wartość osi Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Strona osi Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
-msgstr ""
-
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "R-m-d G:m:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "R.M.d G:m:s"
+msgstr "Etykieta osi Y"
 
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "R.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr "Y-m-d"
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "R.m.d G:m"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr "Y-m-d H:i"
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "R.m.d G:m:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Rok"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Rocznie"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Tak"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Nie można wybrać niektórych języków, ponieważ nie zostały one zainstalowane na serwerze."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Brak praw do zmiany uprawnień użytkownika \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Nie zalogowano."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
-msgstr ""
+msgstr "Nie można przełączyć hostów dla aktualnego wyboru."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Nie podano hosta dla operacji."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Nie podano grupy hostów dla operacji."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Nie sprecyzowano celów dla operacji akcji w komendzie \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Nie określono celu dla akcji globalnego skryptu operacji \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
-msgstr ""
+msgstr "Nie masz uprawnień do wykonania tej operacji"
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
-msgstr "Brak uprawnień do tworzenia użytkowników."
+msgstr "Nie masz uprawnień do tworzenia użytkowników."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
-msgstr "Nie masz uprawnień by aktualizować dane innych użytkowników."
+msgstr "Nie masz uprawnień do aktualizacji danych innych użytkowników."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
-msgstr "Nie masz uprawnień by aktualizować dane użytkownika lub użytkownik nie istnieje."
+msgstr "Nie masz uprawnień do aktualizacji danych użytkowników lub użytkownik nie istnieje."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
-msgstr ""
+msgstr "Nie masz uprawnień do dostępu do tej strony."
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Należy się zalogować, aby zobaczyć tą stronę."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
-msgstr ""
+msgstr "Jesteś zalogowany jako"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
-msgstr ""
+msgstr "Z"
 
 #: index.php:27
 msgid "ZABBIX"
@@ -15520,11 +15973,11 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
-msgstr ""
+msgstr "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
 
 #: include/users.inc.php:55
 msgid "Zabbix Admin"
@@ -15539,8 +15992,8 @@ msgid "Zabbix User"
 msgstr "Użytkownik Zabbixa"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15556,7 +16009,7 @@ msgstr "Agregat Zabbixa"
 
 #: include/validate.inc.php:495
 msgid "Zabbix has received an incorrect request."
-msgstr "Program Zabbix otrzymał nieprawidłowe żadanie."
+msgstr "Zabbix otrzymał nieprawidłowe żądanie."
 
 #: include/items.inc.php:88
 msgid "Zabbix internal"
@@ -15566,10 +16019,11 @@ msgstr "Wewnętrzny Zabbixa"
 msgid "Zabbix internal authentication"
 msgstr "Wewnętrze uwierzytelnianie Zabbixa"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Serwer Zabbixa"
@@ -15581,37 +16035,40 @@ msgid ""
 "1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
 "2. Incorrect network configuration.\n"
 msgstr ""
+"Nie można uzyskać dostępu do serwera Zabbix \"%s\". Możliwe przyczyny:\n"
+"1. Błędne IP/DNS serwera w \"zabbix.conf.php\";\n"
+"2. Błędna konfiguracja sieci.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "Nie ustawiono adresu IP lub numeru portu serwera Zabbix'a!"
 
 #: adm.gui.php:43
 msgid "Zabbix server activity check interval"
-msgstr ""
+msgstr "Okres sprawdzania aktywności serwera Zabbix"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
-msgstr ""
+msgstr "Informacje o serwerze Zabbix"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
-msgstr ""
+msgstr "Serwer Zabbix nie działa: wyświetlane informacje mogą być nieaktualne."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Serwer Zabbixa jest uruchomiony"
 
 #: adm.gui.php:80
 #, c-format
 msgid "Zabbix server is running check interval \"%1$s\"."
-msgstr ""
+msgstr "Serwer Zabbix działa, okres sprawdzania \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Nazwa serwera Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Port serwera Zabbix"
 
@@ -15619,25 +16076,20 @@ msgstr "Port serwera Zabbix"
 msgid "Zabbix trapper"
 msgstr "Trapper Zabbixa"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Powiększenie"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[G:m:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Błedna wartość dla dnia: \"%s\"]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Błędna wartość dla miesiąca: \"%s\"]"
@@ -15646,127 +16098,89 @@ msgstr "[Błędna wartość dla miesiąca: \"%s\"]"
 msgid "agent"
 msgstr "agent"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "wszystkie"
 
 #: include/actions.inc.php:301
 msgid "all media"
-msgstr ""
-
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "już istnieje"
+msgstr "wszystkie media"
 
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "jako Niebieskie"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "jako Zielone"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "jako Czerwone"
 
 #: include/events.inc.php:36
 msgid "auto registration"
-msgstr ""
+msgstr "automatyczna rejestracja"
 
 #: include/events.inc.php:66
 msgid "auto-registered host"
-msgstr ""
+msgstr "automatycznie zarejestrowane hosty"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "śr."
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
-msgstr ""
+msgstr "sprawdź wyrażenie od \"%1$s\""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
-msgstr ""
-
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M R"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:m"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M G:m:s"
+msgstr "d"
 
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
-msgstr "d.m G:m"
+msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.r"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "dni"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15774,33 +16188,29 @@ msgstr "domyślny"
 
 #: include/views/js/adm.regexprs.edit.js.php:126
 msgid "delimiter"
-msgstr ""
+msgstr "ogranicznik"
 
 #: include/events.inc.php:64
 msgid "discovered host"
-msgstr ""
+msgstr "wykryte hostyDodaj urządzenie"
 
 #: include/events.inc.php:65
 msgid "discovered service"
-msgstr ""
+msgstr "wykryte usługi"
 
 #: include/events.inc.php:35
 msgid "discovery"
-msgstr ""
+msgstr "wykrywanie"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dynamiczny"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elementy"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "skopiuj elementy do …"
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from i esc_step_to muszą być ustawione równocześnie."
 
@@ -15812,47 +16222,49 @@ msgstr "dokładnie"
 msgid "executed"
 msgstr "wykonane"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
-msgstr ""
+msgstr "wyrażenie jest puste"
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "naprawione"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "znaleziony"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
-msgstr ""
+msgstr "globalne ustawienia porządkowania"
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
-msgstr ""
+msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
-msgstr "gg"
+msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "grupa hostów"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "ikona"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "obraz"
 
@@ -15860,119 +16272,119 @@ msgstr "obraz"
 msgid "in"
 msgstr "w"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
-msgstr ""
+msgstr "niepoprawna składnia przy \"%1$s\""
 
 #: include/events.inc.php:37
 msgctxt "event source"
 msgid "internal"
-msgstr ""
+msgstr "wewnętrzny"
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
-msgstr ""
+msgstr "jest"
 
 #: include/events.inc.php:67
 msgid "item"
-msgstr ""
+msgstr "pozycja"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
-msgstr ""
+msgstr "klucz jest pusty"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "ostatni"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "podobne"
 
 #: include/events.inc.php:68
 msgid "low-level discovery rule"
-msgstr ""
+msgstr "nisko-poziomowa reguła wykrywania"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
-msgstr ""
+msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
-msgstr ""
+msgstr "m"
 
 #: include/views/js/common.macros.js.php:36
 msgid "macro(s)"
 msgstr "makro(a)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "okres utrzymania"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "mapa"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
-msgstr ""
+msgstr "pasuje do"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
-msgstr "max"
+msgstr "maks"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
-msgstr ""
+msgstr "minimum 60 sekund"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
 #: include/views/administration.authentication.edit.php:110
 msgid "must be a valid LDAP user"
-msgstr "musi być ważnym użytkownikiem LDAP"
+msgstr "musi być poprawnym użytkownikiem LDAP"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
-msgstr ""
+msgstr "nowy"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
-msgstr ""
+msgstr "nowy"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "brak danych"
@@ -15985,12 +16397,14 @@ msgstr "nie w"
 msgid "not like"
 msgstr "niepodobne"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "nie działa"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "nie wybrane"
 
@@ -15999,84 +16413,87 @@ msgstr "nie wybrane"
 msgid "not sent"
 msgstr "nie wysłane"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "teraz"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "z"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
-msgstr ""
-
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+msgstr "wyłączone"
+
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
-msgstr "na"
+msgstr "włączone"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "inny"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "odświeżane co"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr "odświeżanie co %1$s sek."
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
-msgstr ""
+msgstr "wyrażenie regularne"
 
 #: include/views/administration.general.gui.edit.php:35
 msgid "remember selected"
 msgstr "pamiętaj zaznaczone"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "działa"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
-msgstr ""
+msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sek."
 
@@ -16089,7 +16506,7 @@ msgstr "sekundy"
 msgid "sent"
 msgstr "wysłane"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "krótki opis"
 
@@ -16097,36 +16514,36 @@ msgstr "krótki opis"
 msgid "show icon mappings"
 msgstr "pokaż mapowanie ikon"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "pokaż mapowanie wartości"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "szablon o ID \"%1$s\" został przekazany %2$s razy"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "dla"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "wyzwalacz"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
-msgstr ""
+msgstr "wpisz tekst do wyszukania"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
-msgstr ""
+msgstr "niespodziewany koniec klucza"
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "nieznany"
 
@@ -16136,13 +16553,13 @@ msgstr "wartość"
 
 #: include/actions.inc.php:321 include/actions.inc.php:333
 msgid "via"
-msgstr ""
+msgstr "przez"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
-msgstr ""
+msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyyy"
diff --git a/frontends/php/locale/pt_BR/LC_MESSAGES/frontend.po b/frontends/php/locale/pt_BR/LC_MESSAGES/frontend.po
index c1e48c95962..838c048967f 100644
--- a/frontends/php/locale/pt_BR/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/pt_BR/LC_MESSAGES/frontend.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
-"PO-Revision-Date: 2014-02-19 17:26+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
+"PO-Revision-Date: 2014-08-16 19:09+0300\n"
 "Last-Translator: Adail <the.spaww@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
 "Language: pt_BR\n"
@@ -13,31 +13,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1392823609.0\n"
+"X-POOTLE-MTIME: 1408208996.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" deve estar entre 01/01/1970 e 18/01/2038."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Exibe triggers OK\" precisa ser \"0\" ou um inteiro positivo."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Gatilhos piscam na mudança de estado\" é necessário ser \"0\" ou um inteiro positivo."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d dia"
 msgstr[1] "%1$d dias"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,24 +51,22 @@ msgstr[1] "%1$d de %2$d problemas exibidos"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (ano %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Item"
 msgstr[1] "%1$s Itens"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s dia"
 msgstr[1] "%1$s dias"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -78,10 +78,10 @@ msgstr[1] "%1$s minutos"
 #, c-format
 msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1$s tentava faltando"
+msgstr[1] "%1$s tentavas faltando"
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -102,23 +102,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d dispositivo"
 msgstr[1] "%d dispositivos"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - indefinidamente)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Apenas super administradores podem criar grupos)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(em dias)"
 
@@ -126,34 +126,34 @@ msgstr "(em dias)"
 msgid "(in sec)"
 msgstr "(em segs)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(mínimo de 60 segundos, 0 - usar a ação padrão)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(sem proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr "(com avisos)"
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[RECONHECIMENTO EM MASSA]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 ou 1"
 
@@ -169,7 +169,7 @@ msgstr "10 segundos"
 msgid "30 seconds"
 msgstr "30 segundos"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "visão 3D"
 
@@ -185,7 +185,7 @@ msgstr "5 segundos"
 msgid "500 latest values"
 msgstr "últimos 500 valores"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Sub-menu/Sub-menu.../>Script"
 
@@ -195,7 +195,7 @@ msgstr "<manual>"
 
 #: include/views/administration.auditacts.list.php:31
 msgid "ACTION LOG"
-msgstr ""
+msgstr "REGISTRO DE AÇÕES"
 
 #: include/views/configuration.host.discovery.edit.php:144
 #: include/views/configuration.item.edit.php:150
@@ -204,36 +204,35 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "RECONHECIMENTOS DE ALARME"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "E"
 
 #: include/views/administration.auditlogs.list.php:31
 msgid "AUDIT LOG"
-msgstr ""
+msgstr "LOG DE AUDITORIA"
 
 #: report2.php:163
 msgid "AVAILABILITY REPORT"
 msgstr "RELATÓRIO DE DISPONIBILIDADE"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "A diferença absoluta entre o último e o anterior é < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "A diferença absoluta entre o último e o anterior é = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "A diferença absoluta entre o último e o anterior é > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "A diferença absoluta entre o último e o anterior NÃO É N"
 
@@ -245,42 +244,42 @@ msgstr "SLA Aceitável"
 msgid "Access denied!"
 msgstr "Acesso negado!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Acesso negado."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Conta bloqueada por %s segundos"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Reconhecido"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Reconhecer"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Reconhecimento adicionado"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Alarme reconhecido por"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Reconhecer e retornar"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Estado do reconhecimento"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Reconhecido"
 
@@ -305,62 +304,65 @@ msgstr "Reconhecimento desativado"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Ação"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "A ação \"%1$s\" já existe."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Ação \"%1$s\" tem um valor incorreto para \"esc_period\" (mínimo %2$s segundos)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "A ação \"%1$s\" não possui operadores definidos."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Ação incluída"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Ação excluída"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] "Ação desativada"
 msgstr[1] "Ações desativadas"
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] "Ação ativada"
@@ -371,23 +373,23 @@ msgstr[1] "Ações ativadas"
 #: include/views/administration.auditacts.list.php:32
 #: include/views/administration.auditlogs.list.php:29
 msgid "Action log"
-msgstr ""
+msgstr "Log de ações"
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Operações da ação"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Ação atualizada"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Ações"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Ativo"
@@ -397,80 +399,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Ativo"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Ativo desde"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Ativo até"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Adicionar"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr "Adicionar filho"
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Comentário incluído por"
 
@@ -486,27 +491,23 @@ msgstr "Adicionar host"
 msgid "Add link"
 msgstr "Adicionar link"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Adicionar ausentes"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Adicionar aplicação nova ou existente"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Adicionar grupo novo ou existente"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Adicionar protótipo"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Adicionar a"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Adicionar aos favoritos"
@@ -515,7 +516,7 @@ msgstr "Adicionar aos favoritos"
 msgid "Add to host group"
 msgstr "Adicionar ao grupo de hosts"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Adicionar aos grupos de hosts"
 
@@ -527,7 +528,7 @@ msgstr "Adicionado"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administração"
 
@@ -536,34 +537,34 @@ msgstr "Administração"
 msgid "Advanced labels"
 msgstr "Textos avançados"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Idade"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Idade menor que"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Idade menor que %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agente"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr "O hostname definido no arquivo de configuração. Valor textual."
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Interfaces do agente"
@@ -572,12 +573,12 @@ msgstr "Interfaces do agente"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agente ou SNMP ou JMX ou IPMI interface"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr "Verificações agregadas não requerem nenhum agente rodando no host monitorado. O servidor Zabbix coleta a informação agregada através de consultas diretas ao banco de dados. Veja o manual do Zabbix."
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Apelido"
 
@@ -585,123 +586,125 @@ msgstr "Apelido"
 msgid "Align icons"
 msgstr "Alinhar icones"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Todos"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Todos os grupos"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos os links devem ter \"Nome\" e \"URL\" definidos"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Hosts permitidos"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr "Tamanho da memória em bytes. Se o modo estiver faltando o total será utilizado."
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
-msgstr ""
+msgstr "E"
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
-msgstr ""
+msgstr "E/OU"
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Qualquer"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Qualquer sequência de caracteres incluídos"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Aplicação"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Aplicação \"%1$s\" já existe."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Aplicação incluída"
 
-#: applications.php:151 applications.php:186
-#, fuzzy
+#: applications.php:162 applications.php:202
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Aplicação excluída"
-msgstr[1] "Aplicação excluída"
+msgstr[1] "Aplicações excluídas"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Erro na aplicação."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Aplicação atualizada"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Aplicação com ID \"%1$s\" não está disponível no \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Aplicações"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -710,16 +713,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Abordagem"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Abr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Abril"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Você tem certeza que deseja executar esta ação?"
 
@@ -735,9 +738,9 @@ msgstr "Tamanho da área"
 msgid "Area type"
 msgstr "Tipo de área"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -751,52 +754,49 @@ msgstr "Como texto puro"
 msgid "Asset tag"
 msgstr "Etiqueta de patrimônio"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "Às %1$s:%2$s em %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "Às %1$s:%2$s da %3$s %4$s de cada %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "Às %1$s:%2$s do dia %3$s de cada %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] "Às %1$s:%2$s de cada %3$s de cada semana"
 msgstr[1] "Às %1$s:%2$s de cada %3$s de cada %4$s semanas"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] "Às %1$s:%2$s de cada dia"
 msgstr[1] "Às %1$s:%2$s a cada %3$s dias"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "Às (horas:minutos)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "No mínimo um host ou grupo deve ser selecionado."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "No mínimo um período de manutenção deve ser definido."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr "No mínimo um destes bancos de dados deverá ser suportado: MySQL, PostgreSQL, Oracle, SQLite3 ou IBM DB2."
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Auditoria"
@@ -814,28 +814,30 @@ msgstr "Período de retenção da auditoria (em dias) \"%1$s\"."
 #: include/views/administration.auditlogs.list.php:28
 #: include/views/administration.auditlogs.list.php:32
 msgid "Audit log"
-msgstr ""
+msgstr "Log de auditoria"
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Ago"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Agosto"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Algoritmo de autenticação"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -894,9 +896,9 @@ msgstr "Período de retenção dos eventos e dos alertas de auto-registro"
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr "Período de retenção de eventos e alertas do auto-registro (em dias) \"%1$s\"."
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automático"
 
@@ -904,20 +906,20 @@ msgstr "Automático"
 msgid "Automatic icon mapping"
 msgstr "Mapeamento automático de icone"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Seleção automática de ícone"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Disponibilidade"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Relatório de disponibilidade"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Disponível"
 
@@ -926,36 +928,36 @@ msgstr "Disponível"
 msgid "Average"
 msgstr "Média"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Média por"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Média do valor de um período T é < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Média do valor de um período T é = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Média do valor de um período T é > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Média do valor de um período T é NÃO É N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Lado do eixo"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Fundo"
@@ -964,7 +966,7 @@ msgstr "Fundo"
 msgid "Background image"
 msgstr "Imagem de fundo"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Relatórios de barra"
 
@@ -974,8 +976,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Autenticação básica"
+msgid "Basic"
+msgstr "Basico"
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -987,15 +989,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Senha para o Bind"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Verificação (em modo AND) Bit a Bit do valor mais recente T e de sua máscara é = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Verificação (em modo AND) bit a bit do valor mais recente T e de sua máscara NÃO É N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Preto & Azul"
 
@@ -1007,8 +1009,8 @@ msgstr "Piscando"
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Linha grossa"
 
@@ -1016,22 +1018,22 @@ msgstr "Linha grossa"
 msgid "Boolean"
 msgstr "Booleano"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Abaixo"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Clarear"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Búlgaro (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Reconhecimento em massa"
 
@@ -1057,7 +1059,7 @@ msgstr "CONFIGURAÇÃO DE APLICAÇÕES"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURAÇÃO DE AUTENTICAÇÃO"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1087,7 +1089,7 @@ msgstr "CONFIGURAÇÃO DE GRUPOS DE HOSTS"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "CONFIGURAÇÃO DOS PROTÓTIPOS DE HOST"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURAÇÃO DE HOSTS"
 
@@ -1099,7 +1101,7 @@ msgstr "CONFIGURAÇÃO DE LIMPEZA DE DADOS"
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURAÇÃO DO MAPEAMENTO DE ÍCONES"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURAÇÃO DE IMAGENS"
 
@@ -1108,14 +1110,14 @@ msgstr "CONFIGURAÇÃO DE IMAGENS"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURAÇÃO DOS SERVIÇOS DE TI"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURAÇÃO DE PROTÓTIPOS DE ITENS"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURAÇÃO DE ITENS"
 
@@ -1144,7 +1146,7 @@ msgstr "CONFIGURAÇÃO DE MAPAS DE REDE"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURAÇÃO DE PROXIES"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURAÇÃO DE EXPRESSÕES REGULARES"
 
@@ -1164,7 +1166,7 @@ msgstr "CONFIGURAÇÃO DE SCRIPTS"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURAÇÃO DE APRESENTAÇÕES DE SLIDES"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURAÇÃO DE TEMPLATES"
 
@@ -1180,7 +1182,7 @@ msgstr "CONFIGURAÇÃO DAS SEVERIDADES DE TRIGGER"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURAÇÃO DE TRIGGERS"
 
@@ -1212,23 +1214,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURAÇÃO DO ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr "Informação de CPU - Apresenta informação sobre todas as CPUs por padrão"
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr "Carga da(s) CPU(s). Carga de processamento. A cpu e o modo são opcionais. Se a cpu estiver ausente, todas serão utilizadas. Se o modo estiver ausente, será apresentado a média (avg1). Observe que este parâmetro não retornará um percentual."
 
-# double space before "if" in original text:  "used. If type i"
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
-msgstr "Utilização da(s) CPU(s). Carga de processamento em percentual. O tipo, modo e a cpu são opcionais.  Se o tipo estiver ausente o usuário é utilizado. Se a CPU estiver ausente, todas serão utilizadas. Se o modo estiver ausente, será apresentado a média (avg1)."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
+msgstr "Utilização da(s) CPU(s). Carga percentual do processador. O parâmetros <cpu>, <type> e <mode> são opcionais. Se <cpu> estiver ausente, serão consideradas todas. Se o <type> estiver ausente, será usado tipo usuário. Se o <modo> estiver ausente, avg1 é utilizado."
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr "Calcula a verificação MD5 de um arquivo. Hash textual MD5 do arquivo. Não pode ser utilizado com arquivos maiores que 64MB. Exemplo: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 
@@ -1237,21 +1238,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Calcular SLA, nível aceitável de SLA (em %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr "Calcula a verificação integridade de um arquivo. A integridade do arquivo é calculada usando o algorítimo do comando cksum do UNIX. Exemplo: vfs.file.cksum[/etc/passwd]"
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
-msgstr "Calcula o espaço em disco de um determinado volume. O resultado é apresentado em KB. Se o parâmetro modo não for informado é retornado o valor total. Em caso de volume montado o espaço livre do sistema de arquivos será retornado. Exemplo: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+msgstr "Calcula o espaço em disco para determinado volume. O espaço em disco é calculado em KB. Se <mode> estiver ausente, será usado o total. No caso de um volume montado o espaço em disco não utilizado para o sistema de arquivos local é retornado. Exemplo: vfs.fs.size[/tmp,free]."
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Calculado"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Permissões calculadas"
 
@@ -1259,92 +1260,95 @@ msgstr "Permissões calculadas"
 msgid "Callback"
 msgstr "Retorno"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canadá (136 caracteres)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Não foi possível reconhecer evento"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Não é possível adicionar o item não numérico \"%1$s\" ao gráfico \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Não foi possível adicionar o item não numérico \"%1$s\" ao protótipo de gráfico \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Não é possível adicionar o item não numérico \"%1$s\"."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Ação não foi adicionada"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Não foi possível adicionar a condição na ação"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Aplicação não foi incluída"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Não é possível adicionar dependência de um host para um template."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Não foi possível adicionar dependência na trigger \"%1$s:%2$s\" para uma trigger que não existe \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Regra de autobusca não pode ser adicionada"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Gráfico não foi adicionado"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr "Não foi possível adicionar o protótipo de gráfico"
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
-msgstr "Grupo não foi incluído"
+msgstr "Não foi possível adicionar grupo"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
-msgstr ""
+msgstr "Não foi possível adicionar o grupo."
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Host não foi incluído"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Não foi possível adicionar o protótipo de host"
 
@@ -1352,24 +1356,24 @@ msgstr "Não foi possível adicionar o protótipo de host"
 msgid "Cannot add image"
 msgstr "Imagem não foi incluída"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Não foi possível adicionar a imagem."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Item não foi adicionado"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Não foi possível adicionar o item \"%1$s\" de \"%2$s\" à aplicação \"%3$s\" de \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr "Protótipo de item não adicionado"
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Não foi possível adicionar os itens."
 
@@ -1377,20 +1381,20 @@ msgstr "Não foi possível adicionar os itens."
 msgid "Cannot add macro."
 msgstr "Não foi possível adicionar macro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Não foi possível adicionar período de manutenção"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Não é possível adicionar o tipo de mídia"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Não é possível adicionar mais de um item do tipo \"Graph sum\" no gráfico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "Não é possível adicionar mais de um item com o tipo \"Sumário do gráfico\" no protótipo de gráfico \"%1$s\"."
@@ -1399,24 +1403,24 @@ msgstr "Não é possível adicionar mais de um item com o tipo \"Sumário do gr�
 msgid "Cannot add network map"
 msgstr "Não foi possível adicionar mapa de rede"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Não foi possível adicionar a aplicação \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Não foi possível adicionar proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Não foi possível atualizar expressão regular"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Tela não foi incluída"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Não foi possível adicionar script"
 
@@ -1428,27 +1432,27 @@ msgstr "Serviço não foi incluído"
 msgid "Cannot add slide show"
 msgstr "Não foi possível adicionar o slide show"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Não foi possível adicionar template"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Tigger não foi adicionada"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr "Protótipo de trigger não adicionado"
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Usuário não foi incluído"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Usuário não foi incluído. Senhas não conferem."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Não é possível adicionar usuários."
 
@@ -1456,7 +1460,7 @@ msgstr "Não é possível adicionar usuários."
 msgid "Cannot add value map"
 msgstr "Mapeamento de valor não foi incluído"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Não foi possível adicionar a apresentação de slides"
 
@@ -1476,23 +1480,23 @@ msgstr "Não foi possível alterar o método de autenticação para LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Não foi possível alterar o método de autenticação para interno Zabbix"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Histórico não foi limpado"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Não foi possível clonar o protótipo de gráfico."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Não é possível clonar protótipos de host."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Não foi possível clonar protótipos do item."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Não foi possível clonar protótipos da trigger."
 
@@ -1500,20 +1504,20 @@ msgstr "Não foi possível clonar protótipos da trigger."
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Não foi possível conectar à porta de trap do servidor zabbix, ela deverá estar disponível para executar o script."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Não foi possível copiar gráficos"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Não foi possível copiar itens"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Não foi possível copiar a trigger \"%1$s:%2$s\", por que tem vários hosts na expressão."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "Não foi possível criar um protótipo de host em uma auto-busca do host \"%1$s\"."
@@ -1522,19 +1526,19 @@ msgstr "Não foi possível criar um protótipo de host em uma auto-busca do host
 msgid "Cannot create another database connection."
 msgstr "Não foi possível criar outra conexão ao banco de dados."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Não é possível criar dependências circulares."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Não é possível criar dependência entre uma trigger e ela mesma."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Não foi possível criar a regra de discovery"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Não é possível criar o grupo de host."
 
@@ -1542,102 +1546,100 @@ msgstr "Não é possível criar o grupo de host."
 msgid "Cannot create icon map"
 msgstr "Não foi possível criar o ícone no mapa"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Não foi possível criar o ícone no mapa com nome idêntico \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Não foi possível criar o mapa \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Não foi possível criar a nova aplicação, o cenário web já possui uma aplicação."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Não foi possivel criar um novo elemento"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Não foi possível criar a tela."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
-msgstr ""
+msgstr "Não foi possível criar o template."
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Não é possível excluir o usuário interno do Zabbix \"%1$s\", tente desabilitar esse usuário."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Ação não foi excluída"
 
-#: applications.php:151 applications.php:187
-#, fuzzy
+#: applications.php:162 applications.php:203
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
-msgstr[0] "Aplicação não foi excluída"
-msgstr[1] "Aplicação não foi excluída"
+msgstr[0] "Não foi possível excluir a aplicação"
+msgstr[1] "Não foi possível excluir as aplicações"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Não é possível excluir dependência"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "A descoberta de rede não pôde ser excluída"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Não foi possível excluir a regra de descoberta"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Gráfico não foi removido"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Não foi possível excluir o protótipo de gráfico"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr "Protótipo de gráfico não excluído"
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Gráfico não foi removido."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Não foi possível remover gráficos"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Não é possível excluir gráficos criados pela auto-busca (LLD)."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
 msgid "Cannot delete group"
-msgstr "Grupo não foi removido"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Não foi possível excluir o grupo"
+msgstr[1] "Não foi possível excluir os grupos"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Host não foi removido"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Grupo de host não foi removido."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Não foi possível excluir o protótipo de host."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Não é possível excluir protótipos de hosts"
 
@@ -1645,79 +1647,79 @@ msgstr "Não é possível excluir protótipos de hosts"
 msgid "Cannot delete icon map"
 msgstr "Não foi possível remover icone do mapa"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "A imagem não foi excluída"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Não foi possível remover inventário."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Item não foi removido"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr "Protótipo de item não excluído"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr "Protótipos de item não excluídos"
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Itens não foram removidos"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Não é possível excluir itens criados pela auto-busca (LLD)."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Não foi possível remover período de manutenção"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Não foi possível remover tipo de mídia"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Não foi possível remover mapa de rede"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Não foi possível remover proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Não foi possível remover expressão regular"
 msgstr[1] "Não foi possível remover expressões regulares"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Não foi possível excluir a tela"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Não foi possível remover script"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Não é possível excluir scripts. Parâmetro \"scriptids\" está vazio."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Não foi possível excluir os scripts. Script \"%1$s\" é usado na operação de ação \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Falha ao excluir scripts. Não existe script com o scriptid \"%1$s\"."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Ações selecionadas não foram excluídas"
 
@@ -1725,77 +1727,80 @@ msgstr "Ações selecionadas não foram excluídas"
 msgid "Cannot delete service"
 msgstr "Serviço não foi removido"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Não foi possível excluir a apresentação de slides"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Não foi possível remover template"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Não foi possível excluir o template de aplicação."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Não é possível excluir uma aplicação vinda do template."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Não é possível excluir protótipos de host baseados em templates."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Não é possível excluir item do template."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Não é possível excluir itens vindos de template"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Não é possível excluir itens do template."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "A trigger \"%1$s:%2$s\" é oriunda de um template, por isso não é possível excluí-la."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Não é possível excluir cenários web vindos do template \"%1$s\"."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "A trigger não foi excluída"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Não foi possível excluir o protótipo de trigger"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr "Protótipos de trigger não excluídos"
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Trigger não foi excluída."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "As triggers não foram excluídas"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Não é possível excluir triggers criadas pela auto-busca (LLD)."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Usuário não foi removido"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Não foi possível excluir a mídia do usuário."
 
@@ -1803,78 +1808,78 @@ msgstr "Não foi possível excluir a mídia do usuário."
 msgid "Cannot delete value map"
 msgstr "Mapeamento não foi removido"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Não foi possível excluir o cenário web"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] "Não foi possível desativar a ação"
 msgstr[1] "Não foi possível desativar as ações"
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] "Não foi possível desativar a regra de descoberta"
 msgstr[1] "Não foi possível desativar as regras de descoberta"
 
 # Very similar: https://www.zabbix.org/pootle/pt_BR/Zabbix-trunk/translate.html#unit=381180
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] "Não foi possível desativar as regras de descoberta"
 msgstr[1] "Não foi possível desativar as regras de descoberta"
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "Não foi possível desativar o host"
 msgstr[1] "Não foi possível desativar os hosts"
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] "Não foi possível desativar o protótipo de host"
 msgstr[1] "Não foi possível desativar os protótipos de host"
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Não foi possível desativar o item"
 msgstr[1] "Não foi possível desativar os itens"
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] "Não foi possível desativar o protótipo de item"
 msgstr[1] "Não foi possível desativar os protótipos de itens"
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Não foi possível desabilitar o tipo de midia"
 msgstr[1] "Não foi possível desabilitar os tipos de midia"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "Não foi possível desativar a trigger"
 msgstr[1] "Não foi possível desativar as triggers"
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] "Não foi possível desativar o protótipo de trigger"
 msgstr[1] "Não foi possível desativar os protótipos de trigger"
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] "Não foi possível desativar o grupo de usuários"
 msgstr[1] "Não foi possível desativar os grupos de usuários"
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Não foi possível desativar o cenário web"
@@ -1888,134 +1893,128 @@ msgstr "Não foi possível exibir a fila de item."
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "Não é possível exibir mais de um item com o tipo \"Soma do gráfico\"."
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] "Não foi possível ativar a ação"
 msgstr[1] "Não foi possível ativar as ações"
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] "Não foi possível ativar a regra de descoberta"
 msgstr[1] "Não foi possível ativar as regras de descoberta"
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] "Não foi possível ativar as regras de descoberta"
 msgstr[1] "Não foi possível ativar as regras de descoberta"
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "Não foi possível ativar o host"
 msgstr[1] "Não foi possível ativar os hosts"
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] "Não foi possível ativar o protótipo de host"
 msgstr[1] "Não foi possível ativar os protótipos de host"
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Não foi possível ativar o item"
 msgstr[1] "Não foi possível ativar os itens"
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] "Não foi possível ativar o protótipo de item"
 msgstr[1] "Não foi possível ativar os protótipos de item"
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Não foi possível ativar o tipo de mídia"
 msgstr[1] "Não foi possível ativar os tipos de mídia"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "Não foi possível ativar a trigger"
 msgstr[1] "Não foi possível ativar as triggers"
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] "Não foi possível ativar o protótipo de trigger"
 msgstr[1] "Não foi possível ativar os protótipos de trigger"
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] "Não foi possível ativar o grupo de usuários"
 msgstr[1] "Não foi possível ativar os grupos de usuários"
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Não foi possível ativar o cenário web"
 msgstr[1] "Não foi possível ativar os cenários web"
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi possível localizar a imagem de fundo \"%1$s\" usada no mapa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi encontrado o gráfico \"%1$s\" usado na tela \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi encontrado o grupo \"%1$s\" usado no mapa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi encontrado o grupo \"%1$s\" utilizado na tela \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi encontrado o host \"%1$s\" usado no mapa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi encontrado o host \"%1$s\" usado na tela \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Não foi possível localizar o grupo de host \"%1$s\" para o protótipo de host \"%2$s\" da autobusca \"%3$s\" em \"%4$s\"."
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Não foi possível encontrar interface \"%1$s\" no host para a chave do item \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Não foi possível localizar o host ou template \"%1$s\" utilizado no gráfico \"%2$s\"."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2026,34 +2025,53 @@ msgstr "Não foi possível encontrar o ícone \"%1$s\" usado no mapa \"%2$s\"."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi possível encontrar o mapeamento de ícones \"%1$s\" usado no mapa \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph \"%3$s\"."
 msgstr "Não foi possível localizar o item \"%1$s\" em \"%2$s\" utilizado como limite MÁXIMO para o eixo Y no gráfico \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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 "Não foi possível encontrar o item \"%1$s\" em \"%2$s\" utilizado como MÁXIMO para o eixo Y no protótipo de gráfico \"%3$s\" da autobusca \"%4$s\" em \"%5$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph \"%3$s\"."
 msgstr "Não foi possível encontrar o item \"%1$s\" em \"%2$s\" utilizado como MÁXIMO para o eixo Y do gráfico \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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 "Não foi possível encontrar o item \"%1$s\" em \"%2$s\" utilizado como MÍNIMO para o eixo Y no protótipo de gráfico \"%3$s\" da autobusca \"%4$s\" em \"%5$s\"."
 
-#: include/classes/import/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi encontrado o item \"%1$s\" usado na tela \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Não foi encontrado o mapa \"%1$s\" usado no mapa exportado \"%2$s\"."
@@ -2063,41 +2081,41 @@ msgstr "Não foi encontrado o mapa \"%1$s\" usado no mapa exportado \"%2$s\"."
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi possível encontrar o mapa \"%1$s\" que é utilizado no mapa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi encontrado o mapa \"%1$s\" usado na tela \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Não foi possível localizar objetos com nome"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi encontrada a tela \"%1$s\" usada na tela \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Não foi possível localizar o template \"%1$s\" para o protótipo de host \"%2$s\" da autobusca \"%3$s\" em \"%4$s\"."
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi possível localizar a trigger \"%1$s\" que é utilizada no mapa \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr "Não foi possível localizar o mapeamento de valores \"%1$s\" utilizado para o item \"%2$s\" em \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Não foi possível localizar o mapeamento de valores \"%1$s\" utilizado para o protótipo de item \"%2$s\" da autobusca \"%3$s\" em \"%4$s\"."
@@ -2110,12 +2128,14 @@ msgstr "Não foi possível formatar a Árvore. Cheque a estrutura lógica nos li
 msgid "Cannot format tree."
 msgstr "Não foi possível formatar a árvore."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
-msgstr ""
+msgstr "Não é possível ter um template sem nome visível."
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Não foi possível implodir a expressão \"%s\"."
@@ -2127,59 +2147,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] "Não foi possível importar a tela \"%1$s\": a subtela \"%2$s\" não existe."
 msgstr[1] "Não foi possível importar a tela \"%1$s\": as subtelas \"%2$s\" não existem."
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "Não foi possível importar o template \"%1$s\", vinculado com o template \"%2$s\" que não existe."
 msgstr[1] "Não foi possível importar o template \"%1$s\", vinculado com os templates \"%2$s\" que não existem."
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Não foi possível incluir o arquivo de visualização \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
-msgstr ""
+msgstr "Não foi possível incluir a expressão de trigger"
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Não foi possível inserir a mídia do usuário."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Falha na associação do template"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
-msgstr ""
+msgstr "Não foi possível vincular ao template."
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr "Não foi possível entrar."
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Não foi possível terminar sessão."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Não foi possível atualizar em massa o nome da máquina."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
-msgstr ""
+msgstr "Não é possível atualizar em massa o nome do template."
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Não é possível atualizar em massa o nome visível do host."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
-msgstr ""
+msgstr "Não é possível atualizar em massa o nome visível do template."
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Não é possível informar um ID de template duplicado para o link: %s."
@@ -2199,7 +2220,7 @@ msgstr "Não é possível executar comando de atualização na tabela \"%1$s\" s
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Não é possível executar comando de atualização na tabela \"%1$s\" sem uma condição."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "Não é possível processar aplicações de diferentes hosts ou templates."
 
@@ -2208,23 +2229,23 @@ msgstr "Não é possível processar aplicações de diferentes hosts ou template
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Não é possível receber a resposta, verifique a comunicação com o servidor Zabbix \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Não é possível remover todos os itens, no mínimo um deverá ser mantido."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
-msgstr ""
+msgstr "Não foi possível remover o grupo."
 
 #: adm.macros.php:104
 msgid "Cannot remove macro."
 msgstr "Não foi possível remover macro."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Não é possível renomear o usuário convidado."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Não foi possível salvar as regras de descoberta sem checar."
 
@@ -2233,217 +2254,226 @@ msgstr "Não foi possível salvar as regras de descoberta sem checar."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Não foi possível enviar o comando, verifique a comunicação com o servidor Zabbix \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "Não é possível configurar \"%1$s\" para o item \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Não foi possível configurar \"%1$s\" para a trigger \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Não foi possível configurar o \"templateid\" para a aplicação \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Não foi possível definir o \"templateid\" para a tela \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Não foi possível definir o \"templateid\" para o protótipo de trigger \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Não é possível configurar campos do inventário com o inventário desativado."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Não foi possível mudar a interface do host."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Não foi possível desbloquear usuários"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Não foi possível desvincular e limpar os cenários web."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Não foi possível desvincular e limpar as aplicações."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Não foi possível desvíncular e limpar regras decobertas"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Não foi possível desvíncular e limpar protótipos de gráficos"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Não foi possível desvíncular e limpar os gráficos."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Não foi possível desvícular e limpar os protótipos de itens"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Não foi possível desvíncular e limpar os itens"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Não foi possível desvincular e limpar as triggers"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Falha na desassociação do template"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
-msgstr ""
+msgstr "Não foi possível desvincular ao template."
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Não é possível desvincular a trigger \"%s\", tem itens do template que estão vinculados ao host."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "Não é possível atualizar \"%1$s\" para a descoberta de host."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Não é possível atualizar \"%1$s\" para o item descoberto."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Não é possível atualizar \"%1$s\" para uma trigger descoberta."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr "Não foi possível atualizar \"%1$s\" para a ação \"%2$s\"."
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Não foi possível atualizar \"%1$s\" para o item \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Não foi possível atualizar \"%1$s\" para a trigger \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr "Não foi possível atualizar o \"imagetype\" para a imagem \"%1$s\"."
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Não foi possível atualizar o \"templateid\" para a aplicação \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Não foi possível atualizar o \"templateid\" para o gráfico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Não é possível atualizar o \"templateid\" para o protótipo de gráfico \"%1$s\"."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Não foi possível atualizar o \"templateid\" para a tela \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr "Não foi possível atualizar o \"templateid\" para o template de tela \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Não foi possível atualizar o \"templateid\" para o protótipo de trigger \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Não é possível atualizar um gráfico descoberto."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Não é possível atualizar um grupo de hosts descoberto."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Ação não foi atualizada"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Aplicação não foi atualizada"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Comentário não foi alterado"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Não foi possível atualizar a configuração"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Modo de depuração não foi atualizado"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr "Não foi possível atualizar a descrição"
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Regra de autobusca não foi atualizada"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Não é possível atualizar o acesso ao frontend"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Gráfico não foi atualizado"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr "Não foi possível atualizar o protótipo de gráfico"
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Grupo não foi atualizado"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Grupo não foi atualizado."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Não é possível atualizar os grupos para o host descoberto \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Host não foi atualizado"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Não foi possível atualizar o protótipo de host"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Hosts não foram atualizados"
 
@@ -2455,24 +2485,24 @@ msgstr "Ícones do mapa não foram atualizados"
 msgid "Cannot update image"
 msgstr "Imagem não foi atualizada"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Não foi possível atualizar a imagem."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Não é possível atualizar a interface para o host descoberto \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Item não foi atualizado"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr "Protótipo de item não foi atualizado"
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Não foi possível atualizar os itens"
 
@@ -2484,16 +2514,16 @@ msgstr "Não foi possível atualizar a macro."
 msgid "Cannot update macros"
 msgstr "Macros não foram atualizadas"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Não foi possível atualizar período de manutenção"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Não foi possível atualizar o mapa \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Não foi possível atualizar o tipo de mídia"
 
@@ -2501,28 +2531,24 @@ msgstr "Não foi possível atualizar o tipo de mídia"
 msgid "Cannot update network map"
 msgstr "Não foi possível atualizar mapa de rede"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Não foi possível atualizar proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Não é possível atualizar o proxy para o host descoberto \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Não foi possível atualizar expressão regular"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Tela não foi atualizada"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Não foi possível atualizar a tela."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Não foi possível atualizar script"
 
@@ -2534,40 +2560,41 @@ msgstr "Serviços não foram atualizados"
 msgid "Cannot update slide show"
 msgstr "Não é possível atualizar a apresentação de slides"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Não foi possível atualizar template"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Não é possível atualizar aplicações vindas de templates."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "Não é possível atualizar templates no host descoberto \"%1$s\"."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Trigger não foi atualizada"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr "Protótipo de trigger não foi atualizado"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr "Não foi possível atualizar os protótipos de trigger"
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Usuário não foi atualizado"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Não foi possível atualizar a mídia do usuário."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Usuário não foi atualizado. Ambas as senhas devem ser iguais."
 
@@ -2575,15 +2602,15 @@ msgstr "Usuário não foi atualizado. Ambas as senhas devem ser iguais."
 msgid "Cannot update value map"
 msgstr "Mapeamento não foi atualizado"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Não foi possível atualizar o cenário web"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "Não foi possível validar a verificação de descoberta: a requisição foi inválida ou a conexão com o servidor Zabbix falhou."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Legenda"
 
@@ -2592,47 +2619,47 @@ msgstr "Legenda"
 msgid "Case sensitive"
 msgstr "Distinguir maiúscula/minúscula"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr "Recebe todas as traps SNMP que correspondam com a expressão regular. A expressão regular padrão é um texto vazio."
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr "Recebe todas as traps SNMP que não foram aceitas pelos itens snmptrap[] de um endereço específico da interface."
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Centro"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Alterar"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Alterar"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Alterar senha"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Carácter"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Sequência de caracteres incluídos"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Sequência de caracteres não incluídos"
 
@@ -2641,50 +2668,48 @@ msgid "Chassis"
 msgstr "Chassi"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr "Informações do chassis - retorna informação detalhada por padrão"
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Verificação já existe."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Verifique a expressão a partir de \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr "Verifica se o arquivo existe. 0 - arquivo não existe, 1 - arquivo existe"
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr "Verifica se o serviço está disponível. 0 - serviço não está disponível, 1 - serviço disponível. Se <ip> estiver ausente, IP ou o nome de DNS é recuperado pela definição do host. Se <port> estiver ausente, a porta de serviço padrão é utilizada."
 
-# The FTP port number is wrong. The default numer is 21 not 45.
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
-msgstr "Verifica se o serviço está disponível. 0 - serviço não está disponível, 1 - serviço disponível. Se <ip> estiver ausente, 127.0.0.1 é utilizado. Se <port> estiver ausente, a porta de serviço padrão é utilizada. Exemplo: net.tcp.service[ftp,21]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+msgstr "Verifica se determinado serviço está disponível. 0 - serviço indisponível, 1 - serviço em execução. Se <IP> estiver ausente, é utilizado 127.0.0.1. Se <port number> estiver ausente, a porta padrão do serviço. Exemplo: net.tcp.service[ftp,,45]."
 
-# Has a double space before "If Port Number..." in original text.
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
-msgstr "Verifica a performance do serviço \"service\". 0 - serviço está fora do ar, sec - número de segundos gastos para a conexão com o serviço. Se o IP estiver faltando será utilizado 127.0.0.1. Se o número de porta estiver faltando a porta padrão será utilizada."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
+msgstr "Verifica a performance de um serviço. 0 - serviço indisponível, <sec> - número de segundos gasto para se conectar ao serviço. Se <IP> estiver ausente, 127.0.0.1 é usado. Se <port number> estiver ausente, a porta padrão do serviço."
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr "Verifica a performance do serviço. 0 - serviço está fora do ar, sec - número de segundos gastos para a conexão com o serviço. Se o <ip> estiver faltando será utilizado o IP ou o DNS da definição do host. Se <port> estiver faltando a porta padrão será utilizada."
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr "Verifica a usabilidade do agente. Sempre retorna 1. Pode ser utilizado como um ping TCP."
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Verificar a chave, por favor. Exemplo padão foi aprovado."
 
@@ -2693,44 +2718,44 @@ msgid "Check type"
 msgstr "Verificar tipo"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
-msgstr "Verifica se é possível estabelecer conexão TCP com um número de porta. 0 - não é possível conectar, 1 - é possível. O endereço de IP é opcional. Se o IP estiver ausente será utilizado 127.0.0.1. Exemplo: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+msgstr "Verifica se é possível estabelecer uma conexão TCP com determinado número de porta. 0 - não é possível conectar, 1 - é possível. Se <IP> estiver ausente, 127.0.0.1 é usado. Exemplo: net.tcp.port[,80]"
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Checagens"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr "Verifica se o serviço DNS está em execução. 0 - DNS está fora do ar (servidor não responde ou a resolução de nome falha), 1 DNS está em execução."
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr "Verifica se o servidor responde à requisições ICMP ping. 0 - ICMP ping falhou. 1 - ICMP ping bem-sucedido. Um dos processos zabbix_server executa um ping pela quantidade de segundos definida em PingerFrequency."
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr "Verifica se a porta está em estado de ESCUTA. 0 - não está, 1 - está em modo de ESCUTA."
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "As verificações devem ser unicas."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chinês (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Chinês (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Referências cruzadas não podem ser criadas para o elemento do mapa \"%s\"."
@@ -2745,34 +2770,35 @@ msgstr "Referência cruzada nos mapas: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Referência cruzada nas telas: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Referência cruzada nos templates: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Referências cruzadas entre templates não são permitidas."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Clássico"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Limpar"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Limpar histórico e médias"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Limpar histórico dos itens selecionados"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Limpar ao desassociar"
 
@@ -2782,69 +2808,69 @@ msgstr "Relógio"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Clonar"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Fechar"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Fechar construtor de expressão"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Cor"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "A cor \"%1$s\" não é correta: é esperada cor no formato hexadecimal (6 símbolos)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Cor (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
-msgstr ""
+msgstr "Coluna adicionada"
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
-msgstr ""
+msgstr "Coluna excluída"
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Sobrepor coluna"
 
@@ -2859,7 +2885,7 @@ msgstr "Resultado combinado"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Comando"
 
@@ -2867,41 +2893,31 @@ msgstr "Comando"
 msgid "Command actions"
 msgstr "Ações de comando"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "O comando não pode ser vazio."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Comandos"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Comentário atualizado"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Comentários"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Comentários para \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Comercial"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Comparar valores por múltiplos períodos"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Compondo permissões"
 
@@ -2909,29 +2925,39 @@ msgstr "Compondo permissões"
 msgid "Condition"
 msgstr "Condição"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" da ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "A condição \"%2$s\" não é utilizada pela fórmula \"%3$s\" da regra de descoberta \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para a ação \"%1$s\" não foi definida."
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
-msgstr ""
+msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" da regra de descoberta \"%1$s\" não está definida."
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Condições"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Configuração"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr "Configuração de estatísticas de cache. Cache - buffer (modos: pfree, total, used, free)."
 
@@ -3094,23 +3120,23 @@ msgstr "Configuração atualizada"
 msgid "Configure (Filter %s)"
 msgstr "Configurar (Filtro %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Mensagem de confirmação"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Connectado a"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Conectado como '%1$s'"
@@ -3168,7 +3194,7 @@ msgid "Context name"
 msgstr "Nome do contexto"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr "Mudanças de contexto."
 
@@ -3176,30 +3202,37 @@ msgstr "Mudanças de contexto."
 msgid "Contract number"
 msgstr "Número do contrato"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Coordenadas"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] "Copiar %1$s elemento para..."
+msgstr[1] "Copiar %1$s elementos para..."
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Copiar selecionados para ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Login correto \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Impossível salvar imagem!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Contador"
 
@@ -3219,6 +3252,10 @@ msgstr "Criar aplicação"
 msgid "Create application (select host first)"
 msgstr "Criar aplicação (selecione o host primeiro)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr "Criar plano de fundo"
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3236,7 +3273,7 @@ msgstr "Criar gráfico (selecione o host primeiro)"
 msgid "Create graph prototype"
 msgstr "Criar protótipo de gráfico"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Criar host"
 
@@ -3249,15 +3286,15 @@ msgstr "Criar grupo de hosts"
 msgid "Create host prototype"
 msgstr "Criar protótipo de host"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr "Criar ícone"
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Criar mapeamento de ícone"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Criar imagem"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Criar item"
 
@@ -3281,6 +3318,10 @@ msgstr "Criar mapa"
 msgid "Create media type"
 msgstr "Criar tipo de mídia"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Criar proxy"
@@ -3305,11 +3346,11 @@ msgstr "Criar script"
 msgid "Create slide show"
 msgstr "Criar apresentação de telas"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Criar template"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Criar trigger"
 
@@ -3333,42 +3374,42 @@ msgstr "Criar grupo de usuários"
 msgid "Create value map"
 msgstr "Criar mapeamento de valor"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Criada: Aplicação \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Criada: Regra de descoberta \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Protótipo de host \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Protótipo de item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Criada: Trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Protótipo de trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Cenário Web \"%1$s\" em \"%2$s\"."
@@ -3378,54 +3419,55 @@ msgid "Critical"
 msgstr "Crítico"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr "Sistema operacional atual - Retorna a informação detalhada por padrão"
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Data atual é < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Data atual é = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Data atual é > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Data atual é NÃO É N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Host atual"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Hora atual é < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Hora atual é = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Hora atual é > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Hora atual é NÃO É N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Valor atual"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
-msgstr ""
+msgstr "Expressão personalizada"
 
 #: charts.php:26
 msgid "Custom graphs"
@@ -3435,7 +3477,7 @@ msgstr "Gráficos personalizados"
 msgid "Custom label"
 msgstr "Rótulo customizado"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Rótulo customizado para o mapa \"%2$s\" em elementos do tipo \"%1$s\" não pode ser nulo."
@@ -3449,7 +3491,7 @@ msgstr "Multiplicador"
 msgid "Custom screens"
 msgstr "Telas personalizadas"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Script personalizado"
 
@@ -3469,18 +3511,14 @@ msgstr "Tamanho personalizado"
 msgid "Custom slides"
 msgstr "Slides personalizados"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Checo(cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d/M/Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "CONFIGURAÇÃO DO DASHBOARD"
@@ -3496,28 +3534,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "DETALHES DO CENÁRIO"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "DESATIVADO"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DISCOVERED"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3525,25 +3563,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Nome DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "DOWN"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Diário"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Laranja escuro"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Escurecer"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -3555,20 +3593,21 @@ msgstr "Configuração do dashboard"
 msgid "Dashboard filter"
 msgstr "Filtro de dashboard"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Linha tracejada"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Dados"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr "Estatísticas de dados em cache. Cache - um dos valores (modos: all, float, uint, str, log, text), histórico (modos: pfree, total, used, free), médias (modos: pfree, total, used, free), texto (modos: pfree, total, used, free)."
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3591,11 +3630,12 @@ msgstr "Período de armazenamento de dados (em dias)"
 msgid "Data type"
 msgstr "Tipo de dados"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Arquivo de banco de dados"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Host do banco de dados"
 
@@ -3603,35 +3643,39 @@ msgstr "Host do banco de dados"
 msgid "Database monitor"
 msgstr "Monitoração do banco de dados"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Porta do banco de dados"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Esquema do banco de dados"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Servidor de banco de dados"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Tipo de banco de dados"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Usuário do banco de dados"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Data"
 
@@ -3651,53 +3695,52 @@ msgstr "Data de fim da garantia do HW"
 msgid "Date HW purchased"
 msgstr "Data de aquisição do HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Dia"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Dia do mês"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "O dia do mês é < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "O dia do mês é = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "O dia do mês é > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "O dia do mês é NÃO É N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Dia da semana"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Dia da semana é < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Dia da semana é = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Dia da semana é > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Dia da semana é NÃO É N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Dias"
 
@@ -3705,22 +3748,22 @@ msgstr "Dias"
 msgid "Debug"
 msgstr "Depuração"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Modo de depuração"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Modo de depuração atualizado"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dez"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Dezembro"
 
@@ -3730,15 +3773,14 @@ msgstr "Decimal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Padrão"
 
@@ -3751,11 +3793,11 @@ msgid "Default delay (in seconds)"
 msgstr "Atraso padrão (em segundos)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Mensagem padrão"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Duração padrão do passo da operação"
 
@@ -3778,30 +3820,34 @@ msgstr "Tema padrão \"%1$s\"."
 msgid "Delay"
 msgstr "Espera"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Atraso (em segundos)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Atrasado por"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Remover"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Remover e limpar"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Remover e limpar templates selecionados? (Aviso: todos os hosts associados terão limpados seus elementos herdados dos templates removidos!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Remover e limpar template? (Aviso: todos os hosts associados terão limpados seus elementos herdados do template removido!)"
 
@@ -3809,53 +3855,53 @@ msgstr "Remover e limpar template? (Aviso: todos os hosts associados terão limp
 msgid "Delete application?"
 msgstr "Excluir aplicação?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Excluir a ação atual?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Excluir a regra de descoberta?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Remover expressão?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr "Excluir o protótipo de gráfico?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Remover gráfico?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Remover histórico de cenários WEB selecionados?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Remover o histórico dos itens selecionados?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr "Excluir o histórico dos cenários web selecionados?"
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Excluir o mapeamento de ícones?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr "Excluir o protótipo de item?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Excluir o item?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Remover palavra-chave?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Excluir vínculos entre os elementos selecionados?"
 
@@ -3863,11 +3909,15 @@ msgstr "Excluir vínculos entre os elementos selecionados?"
 msgid "Delete maintenance period?"
 msgstr "Remover período de manutenção?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Excluir o mapa de rede?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Excluir o proxy?"
 
@@ -3875,7 +3925,7 @@ msgstr "Excluir o proxy?"
 msgid "Delete regular expression?"
 msgstr "Remover expressão regular?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Remover cenário?"
 
@@ -3883,71 +3933,67 @@ msgstr "Remover cenário?"
 msgid "Delete screen?"
 msgstr "Remover tela?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Remover script?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Remover selecionados"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Remover cenários WEB selecionados?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Excluir ações selecionadas?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Remover aplicações selecionadas?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Remover regras de descoberta selecionadas?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Remover elementos selecionados?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr "Excluir o protótipos de gráfico selecionados?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Remover gráficos selecionados?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Remover grupo selecionado?"
@@ -3956,28 +4002,28 @@ msgstr "Remover grupo selecionado?"
 msgid "Delete selected groups?"
 msgstr "Remover grupos selecionados?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Excluir os grupos de hosts selecionados?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr "Excluir os protótipos de host selecionados?"
 
 # DUPLICATE !!!
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr "Excluir os protótipos de host selecionados?"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Remover host selecionado?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Remover hosts selecionados?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Remover imagem selecionada?"
 
@@ -3985,31 +4031,31 @@ msgstr "Remover imagem selecionada?"
 msgid "Delete selected item prototypes?"
 msgstr "Excluir o protótipos de item selecionados?"
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Remover itens selecionados?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Remover períodos de manutenção selecionados?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Remover mapas selecionados?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Excluir os tipos de mídia?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Remover tipos de mídia selecionados?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Remover proxies selecionados?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Remover expressões regulares selecionadas?"
 
@@ -4017,15 +4063,15 @@ msgstr "Remover expressões regulares selecionadas?"
 msgid "Delete selected screens?"
 msgstr "Remover telas selecionadas?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Remover scripts selecionados?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Excluir as apresentações de slides selecionadas?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Remover templates selecionados?"
 
@@ -4037,11 +4083,11 @@ msgstr "Excluir o protótipos de trigger selecionados?"
 msgid "Delete selected triggers?"
 msgstr "Remover triggers selecionadas?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Remover usuários selecionados?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Remover usuários selecionados?"
 
@@ -4056,11 +4102,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Excluir o mapeamento de valores selecionado? Ele é utilizado por %d item!"
 msgstr[1] "Excluir o mapeamento de valores selecionado? Ele é utilizado por %d itens!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr "Excluir os cenários web selecionados?"
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Remover selecionado e elementos associados"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr "Excluir o serviço \"%1$s\"?"
@@ -4069,15 +4119,15 @@ msgstr "Excluir o serviço \"%1$s\"?"
 msgid "Delete slide show?"
 msgstr "Apagar apresentação de slides?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Remover template?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr "Excluir o protótipo de trigger?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Remover trigger?"
 
@@ -4085,62 +4135,62 @@ msgstr "Remover trigger?"
 msgid "Deleted"
 msgstr "Removido"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Aplicação \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Regra de descoberta \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Gráfico \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Excluído: Host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Protótipo de host \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Protótipo de item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Excluído: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Excluído: Template \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Protótipo de trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Excluído: Cenário Web \"%1$s\" em \"%2$s\"."
@@ -4149,35 +4199,35 @@ msgstr "Excluído: Cenário Web \"%1$s\" em \"%2$s\"."
 msgid "Delimiter"
 msgstr "Delimitador"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (alterações simples)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (alterações/seg)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Nega"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Dependências"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Dependente"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Depende de"
 
@@ -4185,30 +4235,41 @@ msgstr "Depende de"
 msgid "Deployment status"
 msgstr "Status de desenvolvimento"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Descrição"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr "Descrição para \"%s\"."
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr "Descrição atualizada"
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Detalhes"
 
@@ -4221,71 +4282,71 @@ msgid "Device"
 msgstr "Dispositivo"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr "Interrupções do dispositivo."
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr "Lista de dispositivos - Lista os dispositivos PCI por padrão"
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr "Estatísticas de leitura do dispositivo."
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Critério único do dispositivo"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr "Estatísticas de gravação de dados."
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Diferença entre o valor MÁXIMO e MÍNIMO em um período T é < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Diferença entre o valor MÁXIMO e MÍNIMO em um período T é = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Diferença entre o valor MÁXIMO e MÍNIMO em um período T é > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Diferença entre o valor MÁXIMO e MÍNIMO em um período T é NÃO É N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Diferença entre o último valor e seu predecessor, então N = 1, 0 - outro caso"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Diferença entre o último valor e seu predecessor, então N NÃO É 1, 0 - outro caso"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Diferença entre o último valor e seu predecessor é < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Diferença entre o último valor e seu predecessor é = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Diferença entre o último valor e seu predecessor é > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Diferença entre o último valor e seu predecessor é NÃO É N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr "Informações diferentes sobre o processo(s) específico(s)"
 
@@ -4309,48 +4370,44 @@ msgstr "Desativar modo debug nos grupos selecionados?"
 msgid "Disable host"
 msgstr "Desativar host"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Desabilitar host?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Desabilitar os hosts nos grupos selecionados?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Desabilitar hosts monitorados pelos proxies selecionados?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Desativar selecionados"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Desativar cenários WEB selecionados?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Desabilitar as ações selecionadas?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Desabilitar aplicações selecionadas?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Desativar regras de descoberta selecionadas?"
 
@@ -4358,11 +4415,11 @@ msgstr "Desativar regras de descoberta selecionadas?"
 msgid "Disable selected groups?"
 msgstr "Desabilitar grupos selecionados?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr "Desabilitar os protótipos de host selecionados?"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Desativar hosts selecionados?"
 
@@ -4370,42 +4427,47 @@ msgstr "Desativar hosts selecionados?"
 msgid "Disable selected item prototypes?"
 msgstr "Desabilitar o protótipo de item selecionado?"
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Desativar itens selecionados?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Desabilitar os tipos de mídia selecionados?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr "Desabilitar o protótipo de trigger selecionado?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Desativar triggers selecionadas?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr "Desativar os cenários web selecionados?"
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Inativo"
 
@@ -4418,7 +4480,7 @@ msgstr "Desastre"
 msgid "Discovered"
 msgstr "Descoberto"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Descoberto por"
 
@@ -4426,17 +4488,17 @@ msgstr "Descoberto por"
 msgid "Discovered device"
 msgstr "Dispositivo descoberto"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Autobusca"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Descoberta por proxy"
 
@@ -4444,17 +4506,17 @@ msgstr "Descoberta por proxy"
 msgid "Discovery check"
 msgstr "Verificação de descoberta"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "Erro na regra de descoberta"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Verificações de descoberta"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Lista de descoberta"
 
@@ -4463,67 +4525,70 @@ msgid "Discovery object"
 msgstr "Objeto de descoberta"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Regra de autobusca"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "A autobusca \"%1$s\" já existe em \"%2$s\", importada de outro template."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "A regra de descoberta \"%1$s\" já existe em \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "A autobusca \"%1$s:%2$s\" possui tempo de vida inválido: \"%3$s\" (min: %4$d, max: %5$d, macros de usuário são aceitas)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr "A regra de descoberta \"%1$s\" já existe."
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "A regra de descoberta \"%s\" já existe."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "A autobusca \"%1$s:%2$s\" possui tempo de vida inválido: \"%3$s\" (min: %4$d, max: %5$d, macros de usuário são aceitas)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "A regra de descoberta foi criada"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "A regra de autobusca excluída"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] "Regra de descoberta desativada"
 msgstr[1] "Regras de descoberta desativadas"
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] "Regra de descoberta ativada"
 msgstr[1] "Regras de descoberta ativadas"
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Regra de autobusca atualizada"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Regras de descoberta"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "A regra de descoberta foi excluída"
 
@@ -4535,7 +4600,7 @@ msgstr "Status autobusca"
 msgid "Display OK triggers for"
 msgstr "Mostrar as triggers OK para"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Mostrando"
 
@@ -4544,32 +4609,32 @@ msgstr "Mostrando"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Exibindo %1$s de %2$s encontrados"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Distribuição de valores por múltiplos itens"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Distribuição de valores por múltiplos períodos"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Não calcular"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "A expressão condicional foi substituída?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Concluído"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Pontilhado"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Fora"
@@ -4579,30 +4644,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Fora"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Tempo offline"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Arraste para cá para mudar a interface para o tipo \"IPMI\"."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Arraste para cá para mudar o tipo da interface para \"JMX\"."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Arraste para cá para mudar o tipo da interface para \"SNMP\"."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Arraste para cá para mudar o tipo da interface para \"agente\"."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Estilo"
 
@@ -4620,74 +4685,75 @@ msgstr "Primeira entrada da caixa suspensa \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Lembrete de seleção na caixa suspensa \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Dependências duplicadas na trigger \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Nome de protótipo de grupo duplicado \"%2$s\" para o protótipo de host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr "ID de grupo duplicado \"%2$s\" para o protótipo de host \"%1$s\"."
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Host duplicado. Já existe outro com o mesmo nome de host: \"%s\"."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Host duplicado. Já existe outro com o mesmo nome visível: \"%s\"."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Nome duplicado para o mapa: \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr "Nome de script duplicado \"%1$s\"."
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Nome duplicado para a severidade: \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Apelido de usuário duplicado: \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Duração"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Duração (segundos)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Holandês (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Item dinâmico"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ERRO"
 
@@ -4695,13 +4761,13 @@ msgstr "ERRO"
 msgid "EVENTS"
 msgstr "EVENTOS"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Cada URL deverá possuir um nome único. Certifique-se que existe um nome único para cada URL"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4709,9 +4775,9 @@ msgstr "Cada URL deverá possuir um nome único. Certifique-se que existe um nom
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Editar"
 
@@ -4719,7 +4785,7 @@ msgstr "Editar"
 msgid "Edit map element"
 msgstr "Editar elemento"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Editar trigger"
 
@@ -4727,27 +4793,61 @@ msgstr "Editar trigger"
 msgid "Element"
 msgstr "Elemento"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Nome do elemento"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "E-mail"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Vazio"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr "Arquivo de certificado SSL ausente para o cenário web \"%1$s\"."
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr "Arquivo de chave SSL ausente para o cenário web \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Ação com condição vazia."
 
@@ -4755,76 +4855,98 @@ msgstr "Ação com condição vazia."
 msgid "Empty color."
 msgstr "Cor nula."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr "Condição de filtro vazia na fórmula ID da ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "O ID da condição de filtro está vazio na regra de descoberta \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "A condição da regra de descoberta \"%1$s\" está com filtro vazio."
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr "Falta o ID para o protótipo de host."
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "Host nulo."
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Parâmetro de entrada vazio."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "Parâmetros de entrada vazios."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Entrada nula."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Macro nula."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr "Falta o nome para o protótipo de grupo."
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr "Falta o nome para o protótipo de host \"%1$s\"."
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "Falta o nome para o script \"%1$s\"."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "Falta o nome do script."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Nome nulo."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Parâmetros vazios"
 
@@ -4833,23 +4955,27 @@ msgstr "Parâmetros vazios"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Recebido resposta nula do servidor Zabbix \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
-msgstr ""
+msgstr "Não foi informado o ID da tela."
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
-msgstr ""
+msgstr "Não foi informado o ID do template de tela."
 
 #: include/classes/validators/CTimePeriodValidator.php:46
 msgid "Empty time period."
 msgstr "Período de hora nulo."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr "Não foi informado o ID do cenário."
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Ativar"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Ativar configuração"
 
@@ -4869,11 +4995,11 @@ msgstr "Ativar reconhecimento dos eventos"
 msgid "Enable host"
 msgstr "Ativar host"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Ativar host?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Ativar hosts monitorados pelos proxies selecionados?"
 
@@ -4886,36 +5012,32 @@ msgstr "Ativar hosts monitorados pelos proxies selecionados?"
 msgid "Enable internal housekeeping"
 msgstr "Ativar a limpeza de dados interna"
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Ativar selecionadas"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Ativar cenários web selecionados?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Ativar as ações selecionadas?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Ativar as aplicações selecionadas?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Ativar regras de descoberta selecionadas?"
 
@@ -4923,11 +5045,11 @@ msgstr "Ativar regras de descoberta selecionadas?"
 msgid "Enable selected groups?"
 msgstr "Ativar grupos selecionados?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr "Ativar os protótipos de host selecionados?"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Ativar os hosts selecionados?"
 
@@ -4935,64 +5057,68 @@ msgstr "Ativar os hosts selecionados?"
 msgid "Enable selected item prototypes?"
 msgstr "Ativar os protótipos de item selecionados?"
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Ativar itens selecionados?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Ativar os tipos de mídia selecionados?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr "Ativar os protótipos de trigger selecionados?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Ativar triggers selecionadas?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr "Ativar os cenários web selecionados?"
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Ativo"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Inglês (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Inglês (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Erro"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erro na requisição de pesquisa pela tabela \"%1$s\"."
@@ -5010,15 +5136,15 @@ msgstr "Evento"
 msgid "Event ID"
 msgstr "Evento ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "O ID de evento da última entrada do log corresponde à expressão regular T, então N = 1, 0 - outro caso"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "O ID de evento da última entrada do log corresponde à expressão regular T, então N NÃO É 1, 0 - outro caso"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Evento reconhecido"
 
@@ -5027,7 +5153,7 @@ msgstr "Evento reconhecido"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Reconhecimento de eventos \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Reconhecimento de eventos desativado"
 
@@ -5035,7 +5161,7 @@ msgstr "Reconhecimento de eventos desativado"
 msgid "Event details"
 msgstr "Detalhes do evento"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Geração de evento"
 
@@ -5055,9 +5181,10 @@ msgstr "Detalhes da origem do evento"
 msgid "Event type"
 msgstr "Tipo do evento"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Eventos"
 
@@ -5065,50 +5192,55 @@ msgstr "Eventos"
 msgid "Events and alerts"
 msgstr "Eventos e alertas"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "A cada dia(s)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "A cada semana(s)"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Excluir"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Executar"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Erro de execução de SQL: [%1$s] em [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Executar em"
 
 #: include/views/administration.auditacts.list.php:84
 msgid "Executed"
-msgstr ""
+msgstr "Executado"
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Script executado"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Confirmação de execução"
 
@@ -5120,7 +5252,7 @@ msgstr "Expandir macros"
 msgid "Expand single problem"
 msgstr "Expandir problemas singulares"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "É esperado JSON-RPC versão 2.0, mas foi recebida versão \"%s\"."
@@ -5130,12 +5262,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Expirada"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Explodido"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Exportar selecionados"
 
@@ -5143,22 +5275,22 @@ msgstr "Exportar selecionados"
 msgid "Export to CSV"
 msgstr "Exportar para CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Expressão"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Erro de sintaxe na expressão."
 
@@ -5166,11 +5298,12 @@ msgstr "Erro de sintaxe na expressão."
 msgid "Expression Variable Elements"
 msgstr "Expressão de Elementos Variáveis"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Expressão não pode ser vazia"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Construtor de expressão"
 
@@ -5191,17 +5324,17 @@ msgid "External check"
 msgstr "Monitoramento externo"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Texto Ez"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
-msgstr "F"
+msgstr "S"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "FALSO"
 
@@ -5210,57 +5343,58 @@ msgstr "FALSO"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Falhou"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Falhou"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
-msgstr ""
+msgstr "Falha ao atualizar o template."
 
 #: include/items.inc.php:37
 msgid "Failure Audit"
 msgstr "Falha de Auditoria"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Gráficos favoritos"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Mapas favoritos"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Telas favoritas"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr "Gráficos simples favoritos"
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr "Apresentações favoritas"
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Favoritos"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Fev"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Fevereiro"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Campo"
 
@@ -5304,19 +5438,19 @@ msgstr "O campo \"%1$s\" não é um texto."
 msgid "Field \"%1$s\" must be missing."
 msgstr "O campo \"%1$s\" não é deve estar faltando."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "O campo \"druleid\" é obrigatório."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
-msgstr ""
+msgstr "O campo \"host\" é obrigatório."
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "O campo \"nome\" é obrigatório."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "O formato do arquivo não é suportado."
 
@@ -5325,13 +5459,13 @@ msgstr "O formato do arquivo não é suportado."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "O arquivo é muito grande, o tamanho máximo para upload é de %1$s bytes."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "O arquivo se referencia a uma visão que não existe. Tentou localizar \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr "Informações do horário do arquivo. Número de segundos. O modo é opcional. Se o modo não estiver presente a data de modificação é utilizada."
 
@@ -5339,68 +5473,71 @@ msgstr "Informações do horário do arquivo. Número de segundos. O modo é opc
 msgid "Filled region"
 msgstr "Região preenchida"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtrar"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
-msgstr ""
+msgstr "Filtrar por aplicação"
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Filtro por grupo de host"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
-msgstr ""
+msgstr "Filtrar por inventário de host"
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filtrar por nome"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Localizar a string V no último (mais recente) valor. N = 1 - se encontrar, 0 - outro caso"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Localizar a string V no último (mais recente) valor. N NÃO É 1 - se encontrar, 0 - outro caso"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr "Procura um texto em um arquivo. 0 - expressão não localizada, 1 - localizada"
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr "Procura um texto em um arquivo. Texto encontrado"
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Fim"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Finlandês (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Primeiro"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Primeiro"
@@ -5409,8 +5546,8 @@ msgstr "Primeiro"
 msgid "Fit to map"
 msgstr "Ajustar ao mapa"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fixo"
 
@@ -5420,76 +5557,80 @@ msgstr "Fixo"
 msgid "Flexible intervals"
 msgstr "Intervalos flexíveis"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr "Seguir redirecionamentos"
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Para convidado, senha deve ser vazia"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Fórmula"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Quarto"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Francês (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Sex"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "De"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Acesso à interface web"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Acesso à interface web atualizado"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Mensagem da interface web"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Clone completo"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Tela cheia"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Função"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
-msgstr ""
+msgstr "A função \"%1$s\" não pode ser utilizada com o item \"%2$s\""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5499,116 +5640,116 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr "GRÁFICOS"
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "Modem GSM"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Acesso à GUI desativado."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Geral"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Gerado em %s segundos"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Alemão (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
-msgstr "Recebe o conteúdo de uma página WEB. O caminho padrão é /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
+msgstr "Recupera o conteúdo de uma página web. O caminho padrão é /"
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr "Recebe o conteúdo de um arquivo."
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
-msgstr "Recebe a primeira ocorrência de uma expressão regular em uma página WEB. O caminho padrão é /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
+msgstr "Recupera a primeira ocorrência de uma expressão regular em uma página web. O caminho padrão é /"
 
 #: include/page_header.php:194
 msgid "Get support"
 msgstr "Suporte"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
-msgstr "Recebe o tempo para carga da página WEB inteira. O caminho padrão é /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
+msgstr "Recupera o tempo de carga da página web completa. O caminho padrão é /"
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Expressão informada não é uma macro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Expressão global não existe."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Script global"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Scripts globais"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Ir"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Ir para"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "Ir para o dashboard"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5617,66 +5758,73 @@ msgid "Gradient line"
 msgstr "Área gradiente"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Gráfico"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "O gráfico \"%1$s\" já existe em \"%2$s\" (herdado de outro template)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "O gráfico \"%1$s\" já existe em \"%2$s\" (com itens diferentes)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "O gráfico \"%1$s\" já existe em \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "O gráfico \"%1$s\" não pode ser herdado. Não existem itens necessários em \"%2$s\" (valor máximo do item Y)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "O gráfico \"%1$s\" não pode ser herdado. Não existem itens necessários em \"%2$s\" (valor mínimo do item Y)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "O gráfico \"%1$s\" não pode ser herdado. Não existem itens necessários em \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "O gráfico \"%1$s\" não existe no template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "O gráfico \"%1$s\" foi ignorado - regra de usuário."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "O gráfico \"%1$s\" contém itens de template, então não pode conter itens de outros hosts."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Gráfico incluído"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Gráfico removido"
 
@@ -5688,54 +5836,59 @@ msgstr "Elemento gráfico"
 msgid "Graph item"
 msgstr "Item do gráfico"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Nome do gráfico"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "Protótipo de gráfico"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "O protótipo de gráfico \"%1$s\" contêm protótipos de itens de várias regras de descoberta."
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
-msgstr ""
+msgstr "O protótipo de gráfico \"%1$s\" precisa possuir pelo menos um protótipo de item."
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "O protótipo de gráfico \"%1$s\" possui itens oriundos de template então não poderá conter itens oriundos de outros hosts."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "O protótipo de gráfico \"%s\" foi excluído."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr "Protótipo de gráfico adicionado"
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr "Protótipo de gráfico excluído"
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr "Protótipo de gráfico atualizado"
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Protótipo de gráficos"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr "Protótipos de gráfico excluídos"
 
@@ -5747,49 +5900,51 @@ msgstr "Protótipos de gráficos de"
 msgid "Graph sum"
 msgstr "Somatória do gráfico"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Tipo do gráfico"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Gráfico atualizado"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Gráfico com o nome \"%1$s\" já existe em gráficos ou protótipos de gráficos."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Já existe outro gráfico com o mesmo nome, mas com outro tipo."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Gráficos copiados"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Gráficos removidos"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Grego (el_GR)"
 
@@ -5798,54 +5953,57 @@ msgstr "Grego (el_GR)"
 msgid "Grid"
 msgstr "Grade"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Grupo"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "O grupo \"%1$s\" não pode ser excluído por ser utilizado em um protótipo de host."
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "O grupo \"%1$s\" não existe."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "O grupo \"%1$s\" para o host \"%2$s\" não existe."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Grupo incluído"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr "Grupo removido"
+msgid_plural "Groups deleted"
+msgstr[0] "Grupo removido"
+msgstr[1] "Grupos removidos"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5856,40 +6014,42 @@ msgstr "Grupo para hosts descobertos"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr "Grupo para a descoberta de hosts \"%1$s\"."
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Nome do grupo"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr "O ID do grupo não pode ser nulo."
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr "O protótipo de grupo não pode ser baseado em regra de auto-busca no host \"%1$s\"."
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr "Protótipos de grupo"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Grupo atualizado"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Agrupando por"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Grupos"
 
@@ -5897,22 +6057,13 @@ msgstr "Grupos"
 msgid "Groups in maintenance"
 msgstr "Grupos em manutenção"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5929,7 +6080,7 @@ msgstr "INCIDENTES DO GRUPO DE HOSTS"
 msgid "HOST INVENTORY"
 msgstr "INVENTÁRIO DOS HOSTS"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "VISÃO GERAL DO INVENTÁRIO DE HOSTS"
 
@@ -5947,7 +6098,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "Autenticação HTTP"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
@@ -5968,12 +6120,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr "Hardware (visão detalhada)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr "Cabeçalhos"
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Altura"
@@ -5986,15 +6143,15 @@ msgstr "Ajuda"
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Escondido"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Esconder"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Esconder tudo"
 
@@ -6010,15 +6167,15 @@ msgstr "Esconder protótipos de trigger desativado"
 msgid "Hide disabled triggers"
 msgstr "Esconder triggers inativas"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
-msgstr ""
+msgstr "Esconder filtro"
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Esconder selecionados"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "Ocultar os grupos selecionados"
 
@@ -6027,23 +6184,23 @@ msgstr "Ocultar os grupos selecionados"
 msgid "High"
 msgstr "Alta"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Histórico"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Histórico zerado"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Zerar o histórico pode levar um tempo bem longo. Continuar?"
 
@@ -6064,79 +6221,79 @@ msgstr "Histórico de eventos"
 msgid "History storage period"
 msgstr "Período de retenção do histórico"
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr "Período de retenção do histórico (em dias)"
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Alinhamento horizontal"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
 msgstr[1] "Hosts"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "O host \"%1$s\" já existe."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "O host \"%1$s\" é monitorado pelo proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "O host \"%s\" tem a opção de uso de IPMI \"useipmi\" ativado, mas não possui nenhum parâmetro \"ipmi_ip\"! Utilizando o endereço do host como endereço de monitoração IPMI."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Host (ascendente)"
 
@@ -6148,66 +6305,68 @@ msgstr "IP do Host"
 msgid "Host access"
 msgstr "Acesso ao host"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Host incluído"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "O host não pode possuir mais de uma interface padrão do mesmo tipo."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Contagem de hosts"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Host removido"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] "Host desativado"
 msgstr[1] "Hosts desativados"
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] "Host ativado"
 msgstr[1] "Hosts ativados"
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Grupo de hosts"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "O grupo de hosts \"%1$s\" já existe."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "O grupo de hosts \"%1$s\" não pode ser excluído pois é utilizado por um script global."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "O grupo de hosts \"%1$s\" não pode ser excluído pois alguns hosts dependem dele."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "O grupo de hosts \"%1$s\" é interno e não pode ser excluído."
@@ -6224,14 +6383,15 @@ msgstr "Incidentes do grupo de hosts"
 msgid "Host group label type"
 msgstr "Tipo de rótulo do grupo de hosts"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "O nome do grupo de hosts não pode ser nulo."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Grupos de hosts"
 
@@ -6241,8 +6401,8 @@ msgstr "Grupos de hosts"
 msgid "Host interface"
 msgstr "Interface do host"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Inventário do host"
 
@@ -6258,7 +6418,7 @@ msgstr "Incidentes dos hosts"
 msgid "Host label type"
 msgstr "Tipo do rótulo do host"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Lista de hosts"
 
@@ -6267,18 +6427,18 @@ msgid "Host metadata"
 msgstr "Metadados do host"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Nome do host"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "O nome de host \"%1$s\" é muito grande, ele não deve ser maior que %2$d caracteres."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr "O nome do protótipo de host \"%1$s\" deverá conter macros."
@@ -6287,72 +6447,72 @@ msgstr "O nome do protótipo de host \"%1$s\" deverá conter macros."
 msgid "Host networks"
 msgstr "Redes do host"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "O protótipo de host \"%1$s\" já existe em \"%2$s\", herdado de outro template."
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "O protótipo de host \"%1$s\" já existe em \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr "O protótipo de host \"%1$s\" deve possuir no mínimo um grupo de host."
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr "Protótipo de host adicionado"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr "Protótipo de host foi excluído"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] "Protótipo de host desativado"
 msgstr[1] "Protótipos de host desativados"
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] "Protótipo de host ativado"
 msgstr[1] "Protótipos de host ativados"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr "Protótipo de host foi atualizado"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Já existe protótipo de host com o nome \"%1$s\" na auto-busca \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr "Já existe protótipo de host com o nome \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Já existe protótipo de host com o nome visível \"%1$s\" na auto-busca \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr "Já existe protótipo de host com o nome visível \"%1$s\"."
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr "Protótipos de host"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr "Protótipos de host excluídos"
 
@@ -6364,7 +6524,7 @@ msgstr "Protótipos de host de"
 msgid "Host router"
 msgstr "Roteador de host"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Telas do host"
 
@@ -6376,51 +6536,52 @@ msgstr "Status do host"
 msgid "Host subnet mask"
 msgstr "Máscara de sub-rede do host"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Hora do host"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "A atualização do host falhou."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Host atualizado"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr "Já existe um host com o nome \"%1$s\"."
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Já existe um host com o mesmo nome: \"%s\"."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Já existe um host com o nome visível \"%1$s\"."
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Já existe um host com o mesmo nome visível: \"%s\"."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hosts"
 
@@ -6428,11 +6589,11 @@ msgstr "Hosts"
 msgid "Hosts & Groups"
 msgstr "Grupos e Hosts"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hosts (m/n/t/d)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Hosts / Templates"
 
@@ -6444,37 +6605,38 @@ msgstr "Hosts em"
 msgid "Hosts in maintenance"
 msgstr "Hosts em manutenção"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Info hosts"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Localização dos hosts"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Hosts atualizados"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Por hora"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Horas"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr "Limpeza de dados"
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Húngaro (hu_HU)"
 
@@ -6492,22 +6654,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6515,26 +6677,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "O IP e o DNS não podem ser nulos ao mesmo tempo na interface."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Intervalo de IPs"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "O range de IP não pode ser nulo."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6542,22 +6704,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "Agente IPMI"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "Algoritmo de Autenticação IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Interfaces IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "Senha IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Nível de Privilégio IPMI"
 
@@ -6567,7 +6729,7 @@ msgstr "Nível de Privilégio IPMI"
 msgid "IPMI sensor"
 msgstr "Sensor IPMI"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "Usuário IPMI"
 
@@ -6600,7 +6762,7 @@ msgstr "Dependências dos serviços de TI"
 msgid "IT service parent"
 msgstr "Serviço de TI pai"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6616,25 +6778,25 @@ msgid "ITEMS"
 msgstr "ITENS"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ícone"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Ícone (padrão)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Ícone (desativado)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Ícone (manutenção)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Ícone (problema)"
 
@@ -6655,42 +6817,44 @@ msgstr "Tipo do texto do ícone"
 msgid "Icon map"
 msgstr "Mapeamento de ícone"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "O mapeamento de ícones \"%1$s\" não pode ser excluído. Ele é usado no mapa \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "O mapeamento de ícones \"%1$s\" possui mapeamento com ID de ícone inválido: \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "O mapeamento de ícones \"%1$s\" possui mapeamento com link inválido para o inventário: \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "O mapeamento de ícones \"%s\" já existe."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "O mapeamento de ícone \"%s\" não pode possuir mapeamentos com expressão nula."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "O mapeamento de ícone \"%s\" não pode possuir mapeamento com uma expressão global que não existe."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "O mapeamento de ícone \"%s\" possui uma expressão inválida."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "O mapeamento de ícone \"%s\" deve possuir no mínimo um mapeamento."
@@ -6703,7 +6867,8 @@ msgstr "Mapeamento de ícone criado"
 msgid "Icon map deleted"
 msgstr "Mapeamento de ícone excluído"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "O nome do mapeamento de ícone não pode estar vazio."
 
@@ -6711,29 +6876,29 @@ msgstr "O nome do mapeamento de ícone não pode estar vazio."
 msgid "Icon map updated"
 msgstr "Mapeamento de ícone atualizado"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "O mapeamento de ícone com o iconmapid \"%s\" não existe."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Mapeamento de ícones"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "A entrada de mapeamento de ícone \"%1$s\" contra \"%2$s\" já existe."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "O mapeamento de ícones não está ativado"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Ícones"
 
@@ -6741,21 +6906,23 @@ msgstr "Ícones"
 msgid "Identical expression already exists"
 msgstr "Já existe uma expressão idêntica"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Se você entende que esta mensagem está errada, por favor consulte os administradores sobre como conseguir as permissões necessárias."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Imagem"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "A imagem \"%1$s\" já existe."
@@ -6764,7 +6931,7 @@ msgstr "A imagem \"%1$s\" já existe."
 msgid "Image added"
 msgstr "Imagem incluída"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Imagem excluída"
 
@@ -6772,12 +6939,13 @@ msgstr "Imagem excluída"
 msgid "Image label type"
 msgstr "Tipo do rótulo da imagem"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Erro ao carregar a imagem: [%1$s] em [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "O tamanho da imagem deve ser menor que 1MB."
 
@@ -6786,66 +6954,66 @@ msgid "Image updated"
 msgstr "Imagem atualizada"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Imagens"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "As imagens de todos os mapas serão atualizadas!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Imediatamente"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Importar"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "A importação falhou"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Importar arquivo"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "A importação foi concluída com sucesso"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Impossível filtrar pelo campo de inventário \"%s\", ele não existe."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Não é possível remover a última linha e coluna."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "Em"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "No grupo"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Nos grupos"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6858,244 +7026,282 @@ msgstr "Em manutenção"
 msgid "In progress"
 msgstr "Em andamento"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Incluir"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Valor incorreto para no campo de dependência \"leve\" para o serviço \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Tipo de rótulo incorreto: %1$s, para o mapa \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
-msgstr ""
+msgstr "API incorreta \"%1$s\"."
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Range de IPs incorreto \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Identificador do OID do SNMP está incorreto."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Comunidade SNMP incorreta."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr "Verificação SSL do host é inválida para o cenário web \"%1$s\"."
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr "Verificação de pares SSL inválida para o cenário \"%1$s\"."
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Nível de SLA aceitável incorreto para o serviço \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "A verificação de condição da ação de descoberta está incorreta."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "A verificação de condição da ação de descoberta está incorreta. A regra de descoberta não existe ou você não possui acesso à ela."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "O objeto de descoberta da ação está incorreto."
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "A verificação de condição da ação de descoberta está incorreta. A regra de descoberta não existe ou você não possui acesso à ela."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "A ação possui condição incorreta: Status da descoberta de rede."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "A ação possui condição incorreta: Tipo de evento."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "A ação possui condição incorreta: grupo de hosts. O grupo de hosts não existe ou você não possui acesso à ele."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "A ação possui condição incorreta: Host. O host não existe ou você não possui acesso à ele."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "A ação possui condição incorreta: IP \"%1$s\"."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "A ação possui operador de condição incorreto."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "A ação possui porta de condição incorreta: \"%1$s\"."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "A ação possui condição incorreta: proxy. O proxy não existe ou você não possui acesso à ele."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "A ação possui condição incorreta: template. O template não existe ou você não possui acesso à ele."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "A ação possui condição de severidade de trigger incorreta."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "A ação possui valor incorreto para a condição de trigger."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "A ação possui condição incorreta: trigger. A trigger não existe ou você não possui acesso à ela."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "A ação possui condição incorreta: tipo."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "ID de condição inválido para a ação."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "A ação \"%1$s\" possui condições incorretas."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "A ação possui operador de comando de tipo inválido."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Condição de operação incorreta para reconhecimento de tipo."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Condição de operação incorreta para tipo."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Valores incorretos para a operação de escalonamento da ação."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Ação com operação de grupo de host inválido. O grupo de hosts não existe ou você não possui acesso a este grupo."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Ação com operação de host inválido. O hosts não existe ou você não possui acesso a este host."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Ação com porta \"%s\" de operação incorreta."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Ação com operação incorreta, duração do passo."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Ação com operação incorreta, tipo."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Ação com operação de grupo de usuário inválido. O grupo de usuários não existe ou você não possui acesso a este grupo."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Ação com operação de usuário inválido. O usuário não existe ou você não possui acesso a este usuário."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "ID de operação incorreto para a ação."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Algorítimo incorreto para o serviço \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Argumentos incorretos passados para a função"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Foram informados argumentos incorretos para a função."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Foram informados argumentos incorretos para o método."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Protocolo de autenticação incorreto para a regra de descoberta \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Protocolo de autenticação incorreto para o item \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr "Valor inválido para a interface."
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Cálculo de SLA incorreto para o serviço \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "Foram informados caracteres inválidos no host \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Foram utilizados caracteres inválidos no nome do host \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "Foram utilizados caracteres inválidos no nome do proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr "Caracteres inválidos no nome do template: \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr "Condição inválida para a ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Condições incorretas para a regra de descoberta \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr "A expressão personalizada \"%2$s\" é inválida para a ação \"%1$s\": %3$s."
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
-msgstr ""
+msgstr "A expressão personalizada \"%2$s\" é inválida para a regra de descoberta \"%1$s\": %3$s."
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Atraso incorreto."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "Foi informado um ID de auto-busca inválido para o protótipo de host \"%1$s\"."
@@ -7105,11 +7311,11 @@ msgstr "Foi informado um ID de auto-busca inválido para o protótipo de host \"
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "O objeto \"%1$s\" (%2$s) é uma origem inválida de evento \"%3$s\" (%4$s), apenas os seguintes objetos são suportados: %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "Valor inválido para o objeto do evento."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "Valor inválido para a origem do evento."
 
@@ -7118,11 +7324,11 @@ msgstr "Valor inválido para a origem do evento."
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "O nome ou o valor do campo \"%1$s\" é inválido para a cláusula \"where\" da tabela \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "Campos inválidos para o mapa do sistema."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Campos inválidos para a trigger."
 
@@ -7130,74 +7336,100 @@ msgstr "Campos inválidos para a trigger."
 msgid "Incorrect file upload."
 msgstr "Upload de arquivo inválido."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr "A condição de filtro no ID da fórmula é inválida a ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "O ID de condição da formula utilizada pela regra de descoberta \"%1$s\" está incorreto."
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "O filtro de condição de macro utilizado pela regra de descoberta \"%1$s\" está incorreto."
+
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr "O operador da condição de filtro é inválido para a ação \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "O operador do filtro de condição utilizado pela regra de descoberta \"%1$s\" está incorreto."
+
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr "O tipo da condição de filtro é inválido para a ação \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Intervalo flexível inválido \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Intervalo flexível inválido no item \"%1$s\". O horário flexível deve ser um texto."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr "Redirecionamento de fluxo inválido para o passo \"%1$s\" do cenário \"%2$s\"."
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Usada função incorreta"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr "Foi informado o ID de gráfico \"%1$s\" e ele é inválido para o elemento na tela."
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "ID de protótipo de grupo inválido."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "Protótipos de grupo inválidos para o protótipo de host \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr "Foi informado o ID de host \"%1$s\" e ele é inválido para o elemento na tela."
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr "Foi informado o ID de grupo \"%1$s\" e ele é inválido para o elemento na tela."
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "Foi informado um ID de grupo de host inválido para o protótipo de grupo.Foi informado um ID de grupo de host inválido para o protótipo de grupo."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Grupo de host inválido."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "Grupos de host inválidos para o protótipo de host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "Protótipo de host com ID inválido."
 
@@ -7205,182 +7437,201 @@ msgstr "Protótipo de host com ID inválido."
 msgid "Incorrect image index."
 msgstr "Índice de imagem inválido."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr "Parâmetros de entrada incorretos."
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Foi informado um parâmetro inválido para a interface de DNS \"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Foi informado um parâmetro inválido para a interface IP \"%s\"."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Foi informada uma porta inválida para a interface: \"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "O campo de inventário \"%s\" é inválido."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr "Foi informado o ID de item \"%1$s\" e ele é inválido para o elemento na tela."
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Item inválido para o valor do eixo."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Foi informada uma chave de item inválida \"%1$s\" para a expressão da trigger em \"%2$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "Foi informado um tipo de valor inválido para o item \"%1$s\" na função \"%2$s\" da trigger."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Chave inválida."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Lista de itens inválida."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Manutenção inválida - a data deve estar entre 01/01/1970 e 18/01/2038."
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Data de manutenção inválida"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Dias de manutenção inválidos"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Dias da semana de manutenção inválidos"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Mês de manutenção inválido"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Período de manutenção inválido"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Período de manutenção inválido (o mínimo é de 5 minutos)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Semana de manutenção inválida"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr "Foi informado o ID de mapa \"%1$s\" e ele é inválido para o elemento na tela."
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Foi informada uma altura inválida para o mapa \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Foi informado um comprimento inválido para o mapa \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "O caminho para o script \"%1$s\" está incorreto no menu."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
-msgstr ""
+msgstr "Método incorreto \"%1$s.%2$s\"."
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "Valor inválido para o objeto."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "Parâmetro inválido para a ação \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Parâmetro inválido para operações."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Foi informado um parâmetro inválido para o mapeamento de ícones \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr "Parâmetros incorretos para ação de atualização no método \"%1$s\"."
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Parâmetros inválidos para a condição."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Parâmetros inválidos para o método de atualização do mapeamento de ícones \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Parâmetros inválidos para manutenção."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Parâmetros inválidos para o grupo de usuários."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Pai inválido para o serviço \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Pai inválido para o serviço."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Range de porta inválido."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "Protocolo de privacidade inválido para a regra de descoberta \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "Protocolo de privacidade inválido para o item \"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "ID de proxy inválido."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr "A expressão regular \"%1$s\": \"%2$s\" é inválida"
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Foi informado um tipo de recurso inválido para um item da tela."
 
@@ -7389,64 +7640,68 @@ msgstr "Foi informado um tipo de recurso inválido para um item da tela."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Foi recebida uma resposta inválida do servidor Zabbix \"%1$s\"."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr "Valor incorreto para o modo de recuperação usado no passo \"%1$s\" do cenário \"%2$s\"."
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr "Foi informado o ID de tela \"%1$s\" e ele é inválido para o elemento na tela."
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
-msgstr ""
+msgstr "ID de tela inválido."
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Foi informada uma tela inválida para a apresentação de slides."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Foi informado um horário de fim inválido para o serviço."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Horário de início inválido para o serviço."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Tipo incorreto de hora para o serviço."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Ordem inválida para o serviço \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "Valor de origem inválido."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr "Status incorreto para o host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr "Status inválido para o protótipo de host \"%1$s\"."
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Status inválido para o serviço \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Status inválido."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
-msgstr ""
+msgstr "ID de template de tela inválido."
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr "Tema incorreto para o usuário \"%1$s\"."
@@ -7467,53 +7722,58 @@ msgstr "Período inválido \"%1$s\" - O horário de início deve ser menor do qu
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Período incorreto \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "ID de trigger inválido para o serviço \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Expressão de trigger incorreta"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Expressão de trigger inválida."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Expressão de trigger inválida - O host \"%1$s\" não existe ou você não possui acesso a este host."
 
 # Very similar: include/triggers.inc.php:1066
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Expressão de trigger inválida - O host \"%s\" não existe ou você não possui acesso a ele."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Expressão de trigger inválida - Os elementos de uma expressão não podem se referenciar a um template e a um host simultaneamente."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Foi informada uma função de trigger inválida \"%1$s\" na expressão."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Tipo inválido de asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr "O tipo de calculo é inválido para a ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Tipo de cálculo incorreto para a regra de descoberta \"%1$s\"."
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Grupo de usuários inválido."
 
@@ -7522,7 +7782,8 @@ msgstr "Grupo de usuários inválido."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "O valor \"%1$s\" não é válido para o campo \"%2$s\"."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "O valor \"%1$s\" não é válido para o campo \"%2$s\": seu valor deve estar entre %3$s e %4$s."
@@ -7542,7 +7803,7 @@ msgstr "O valor \"%1$s\" é inválido para o campo \"%2$s\" - espera-se um núme
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o campo \"%2$s\" - espera-se um número inteiro positivo."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "Valor incorreto para o campo \"%1$s\"."
@@ -7552,43 +7813,49 @@ msgstr "Valor incorreto para o campo \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "Valor inválido para o campo \"%1$s\": ele não pode ser nulo."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Valor inválido para setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Foi utilizado um valor inválido para o status do proxy \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr "ID de cenário web inválido."
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Horário de trabalho inválido."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Foi informado um máximo de Y inválido para o gráfico \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Foi informado um mínimo de Y inválido para o gráfico \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonésio (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Informação"
 
@@ -7597,15 +7864,15 @@ msgstr "Informação"
 msgid "Information"
 msgstr "Informação"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Inserir"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Inserir macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr "Insira a expressão"
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Instalação"
 
@@ -7613,31 +7880,32 @@ msgstr "Instalação"
 msgid "Installer name"
 msgstr "Nome de instalação"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interface"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "A interface está vinculada ao item \"%1$s\" em \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "A interface é utilizada por itens que requerem este tipo de interface."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "A interface com o DNS \"%1$s\" não pode possuir endereço de IP nulo."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "A interface com o IP \"%1$s\" não pode possuir nome de DNS nulo enquanto estiver com a propriedade \"Usar DNS\" configurada como \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "A interface com IP \"%s$s\" não pode possuir nome de DNS nulo."
@@ -7659,7 +7927,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Interno"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Erro interno do JSON-RPC."
 
@@ -7667,7 +7935,7 @@ msgstr "Erro interno do JSON-RPC."
 msgid "Internal data storage period (in days)"
 msgstr "Período de retenção de dados (em dias)"
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Erro interno."
 
@@ -7680,19 +7948,19 @@ msgstr "Período de retenção de dados de eventos e alertas"
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr "Período de retenção de dados de eventos e alertas (em dias) \"%1$s\"."
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Intervalo"
 
@@ -7702,112 +7970,114 @@ msgstr "Intervalo"
 msgid "Interval (in sec)"
 msgstr "Intervalo (em segundos)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "JSON inválido. Um erro ocorreu enquanto o servidor estava analisando o texto JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Requisição inválida."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Data inválida \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "O primeiro parâmetro é inválido."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "O quarto parâmetro é inválido."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "O ID de host na macro \"%1$s\" é inválido."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "A chave \"%1$s\" é inválida para a regra de descoberta \"%2$s\" em \"%3$s\": %4$s."
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr "A chave \"%1$s\" é inválida para o item \"%2$s\" em \"%3$s\": %4$s."
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr "A chave \"%1$s\" é inválida para o protótipo de item \"%2$s\" em \"%3$s\": %4$s."
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr "Chave inválida \"%1$s\": %2$s."
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Período de manutenção inválido"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Os parâmetros do método são inválidos."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "Quantidade de parâmetros inválida."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Parâmetros inválidos."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr "Período inválido para o campo \"%1$s\"."
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Código de resposta inválido \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Código de resposta inválido no range \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "O segundo parâmetro é inválido."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "O terceiro parâmetro é inválido."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Período inválido"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Nome de visualização inválido \"%s\". Caracteres permitidos: \"a-z\" e \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventário"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr "Inventário desativado para o host: \"%1$s\"."
@@ -7816,7 +8086,7 @@ msgstr "Inventário desativado para o host: \"%1$s\"."
 msgid "Inventory field"
 msgstr "Campo de inventário"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Modo de inventário"
 
@@ -7824,12 +8094,12 @@ msgstr "Modo de inventário"
 msgid "Is online?"
 msgstr "Online?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Assunto"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Não é possível filtrar pela senha de usuário."
 
@@ -7837,72 +8107,73 @@ msgstr "Não é possível filtrar pela senha de usuário."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Não é possível terminar a sessão de autenticação HTTP."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Não é possível pesquisar pela senha de usuário."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italiano (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Item"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr "Item \"%1$s\""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "O item \"%1$s\" já existe em \"%2$s\", herdado de outro template."
 
 # Very similar string !

 # api/classes/CItemGeneral.php:100
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "O item \"%1$s\" já existe em \"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "O item \"%1$s\" não pode preencher um campo inexistente do inventário \"%2$d\". As opções são: de 0 (não popular) a %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "O item \"%1$s\" não existe no template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "O item \"%1$s\" não existe."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Item \"%1$s\" em \"%2$s\": a aplicação \"%3$s\" não existe."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "O item \"%1$s\" foi ignorado - regra de usuário."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "O item \"%1$s:%2$s\" possui uma porta inválida: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Item incluído"
 
@@ -7910,17 +8181,17 @@ msgstr "Item incluído"
 msgid "Item count"
 msgstr "Contagem de itens"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Item removido"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Item desativado"
 msgstr[1] "Itens desativados"
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Item ativado"
@@ -7934,56 +8205,56 @@ msgstr "O item está em seu estado \"normal\""
 msgid "Item in \"not supported\" state"
 msgstr "O item está como \"não suportado\""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
-msgstr ""
+msgstr "Item não selecionado"
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Protótipo de item"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "O protótipo de item \"%1$s\" já existe em \"%2$s\", foi herdado de outro template."
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "O protótipo de item \"%1$s\" já existe em \"%2$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr "Protótipo de item adicionado"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr "Protótipo de item excluído"
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] "Protótipo de item desativado"
 msgstr[1] "Protótipos de item desativados"
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] "Protótipo de item ativado"
 msgstr[1] "Protótipos de item ativados"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr "Protótipo de item atualizado"
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Protótipos de itens"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr "Protótipos de item excluídos"
 
@@ -7991,92 +8262,92 @@ msgstr "Protótipos de item excluídos"
 msgid "Item prototypes of"
 msgstr "Protótipos de itens de"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Item atualizado"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "O item utiliza uma interface de host que não é herdada."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "O item usa uma interface de tipo inválido."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Item não será atualizado. Por favor informe um intervalo de atualização correto."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "O item com a chave \"%1$s\" já existe em \"%2$s\" como um item de autobusca."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\", ele foi criado a partir de um protótipo de item."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\", ele é um protótipo de item."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\", ele é um item normal."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\", ele é um item desconhecido."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Já existe um item com a chave \"%1$s\"."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Itens"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Itens (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Itens copiados"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Itens removidos"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Lista de itens"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Itens atualizados"
 
@@ -8088,72 +8359,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "Agente JMX"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "Interfaces JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Não foi possível gerar o erro JSON-rpc. Erro não conhecido \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "Método JSON-rpc não definido."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "Os parâmetros JSON-rpc não devem ser um array."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "A versão do JSON-rpc não foi definida."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Identificador Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Janeiro"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japonês (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Jul"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Julho"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Jun"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Junho"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8165,40 +8436,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Manter dados de recursos perdidos por (em dias)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Chave"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "A chave \"%1$s\" não encontrou correspondência <grpmax|grpmin|grpsum|grpavg>[\"Grupo(s) de hosts\", \"Chave do item\", \"<last|min|max|avg|sum|count>\", \"parâmetro\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Chave de acesso"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Palavra-chave"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Quilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Coreano (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "ÚLTIMOS VALORES"
 
@@ -8229,37 +8500,37 @@ msgstr "A sessão foi iniciada com o servidor LDAP"
 msgid "LDAP login was not successful"
 msgstr "Não foi possível iniciar sessão com o servidor LDAP"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "PERDIDO"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Texto"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Localização do texto"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Língua"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Última"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Último"
@@ -8271,19 +8542,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "Último %1$d incidente"
 msgstr[1] "Últimos %1$d incidentes"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Último valor (mais recente) de T é < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Último valor (mais recente) de T é = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Último valor (mais recente) de T é > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Último valor (mais recente) de T NÃO É N"
 
@@ -8303,28 +8574,28 @@ msgstr "Últimos 365d"
 msgid "Last 7 days"
 msgstr "Últimos 7d"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Última alteração"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Última modificação (descendente)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Última checagem"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Gráfico última hora"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Gráfico último mês"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Última de"
 
@@ -8332,66 +8603,67 @@ msgstr "Última de"
 msgid "Last seen (age)"
 msgstr "Última vez visto (idade)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Gráfico última semana"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Dados recentes"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Últimos eventos"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr "Últimos valores"
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Lituâno (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Esquerda"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legenda"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Comprimento em caracteres do último (mais recente) valor de T é < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Comprimento em caracteres do último (mais recente) valor de T é = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Comprimento em caracteres do último (mais recente) valor de T é > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Comprimento em caracteres do último (mais recente) valor de T NÃO É N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Linha"
 
@@ -8399,39 +8671,29 @@ msgstr "Linha"
 msgid "Link"
 msgstr "Link"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Indicadores de link"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "O nome do link deve ser único no mapa \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr "Vincular a novos templates"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "O vínculo selementid1 está apontando para um elemento inexistente \"%1$s\" no mapa \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "O vínculo selementid2 está apontando para um elemento inexistente \"%1$s\" no mapa \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "O link deverá ter preenchido tanto o campo \"nome\" quanto o campo \"URL\" para o mapa \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Templates vinculados"
 
@@ -8443,50 +8705,50 @@ msgstr "Associar à template"
 msgid "Link to templates"
 msgstr "Vínculo para templates"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Vínculo com templates"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Associado aos templates"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Associado a"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Vínculos entre os elementos selecionados"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Vínculos para o elemento selecionado"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "A lista está vazia"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr "Lista das interfaces de rede. Valor textual."
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "Lituano (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Carregando..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Hora local"
 
@@ -8503,36 +8765,36 @@ msgid "Location longitude"
 msgstr "Longitude de localização"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "A severidade da última entrada do log é < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "A severidade da última entrada do log é = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "A severidade da última entrada do log é > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "A severidade da última entrada do log NÃO É N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "A origem de log da última entrada corresponde ao parâmetro T, então N = 1, 0 - outro caso"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "A origem de log da última entrada corresponde ao parâmetro T, então N NÃO É 1, 0 - outro caso"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Formato de data no log"
@@ -8541,12 +8803,12 @@ msgstr "Formato de data no log"
 msgid "Log unmatched SNMP traps"
 msgstr "Registrar traps SNMP não correspondentes"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Conectado como"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8557,12 +8819,12 @@ msgstr "Login"
 msgid "Login as Guest"
 msgstr "Conectado como Guest"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "A conexão falhou \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr "O nome de login \"%1$s\" não confere com o nome \"%2$s\" usado na autenticação HTTP."
@@ -8571,8 +8833,9 @@ msgstr "O nome de login \"%1$s\" não confere com o nome \"%2$s\" usado na auten
 msgid "Login name or password is incorrect!"
 msgstr "O nome de login ou senha estão incorretos!"
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "O nome de login ou a senha está incorreto."
 
@@ -8594,22 +8857,18 @@ msgid "Low-level discovery rule in \"not supported\" state"
 msgstr "A regra de auto-busca (LLD) está em estado \"não suportado\""
 
 # Duplicate jsLoader.php:126
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr "Endereço MAC - Lista todos os endereços MAC com os nomes de interfaces por padrão"
 
@@ -8621,7 +8880,7 @@ msgstr "Endereço MAC A"
 msgid "MAC address B"
 msgstr "Endereço MAC B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "MANUTENÇÃO"
 
@@ -8646,50 +8905,50 @@ msgstr "TRIGGERS MAIS ATIVAS - TOP 100"
 msgid "Macro"
 msgstr "Macro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "A macro \"%1$s\" já existe em \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "A macro \"%1$s\" já existe."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "A macro \"%1$s\" não é única."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "O valor da macro \"%1$s\" é muito grande, o limite é de 255 caracteres."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "O nome da macro \"%1$s\" é muito grande, o limite é de 64 caracteres."
 
 # globalmacroid  is a TAG (repleaceble text) ???
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "A macro com o ID global \"%1$s\" (globalmacroid) não existe."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "A macro com o ID de host \"%1$s\" (hostmacroid) não existe."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Macros"
 
@@ -8697,31 +8956,36 @@ msgstr "Macros"
 msgid "Macros updated"
 msgstr "Macros atualizadas"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Manutenção"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "A manutenção \"%s\" já existe."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr "A manutenção \"%1$s\" já existe."
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "O valor de \"ativa desde\" da manutenção não pode ser superior ao valor de \"Ativa até\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr "O valor da condição da manutenção não pode ser nulo."
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Manutenção adicionada"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Manutenção excluída"
 
@@ -8729,7 +8993,7 @@ msgstr "Manutenção excluída"
 msgid "Maintenance period"
 msgstr "Período de manutenção"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Duração do período de manutenção"
 
@@ -8745,25 +9009,25 @@ msgstr "Status de manutenção"
 msgid "Maintenance type"
 msgstr "Tipo de manutenção"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Manutenção atualizada"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Manutenção com coleta de dados"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Manutenção sem coleta de dados"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Um parâmetro obrigatório está faltando."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Manual"
 
@@ -8774,12 +9038,12 @@ msgstr "Desconexão manual"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Mapa"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "O mapa \"%1$s\" foi ignorado - regra de usuário."
@@ -8789,12 +9053,12 @@ msgstr "O mapa \"%1$s\" foi ignorado - regra de usuário."
 msgid "Map \"%s\""
 msgstr "Mapa \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "O mapa \"%s\" foi criado."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "O mapa \"%s\" foi atualizado."
@@ -8811,12 +9075,12 @@ msgstr "Tipo de rótulo no mapa"
 msgid "Map save operation failed."
 msgstr "Erro ao salvar mapa."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr "O mapa com nome \"%s\" já existe."
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Mapeado para"
 
@@ -8826,23 +9090,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "O mapeamento de valores \"%1$s\" não é único."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Mapeamentos"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Mapas"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Março"
 
@@ -8850,28 +9114,34 @@ msgstr "Março"
 msgid "Mark elements on trigger status change"
 msgstr "Destacar elementos com modificação de status em trigger"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Marcar outros"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Marcar selecionados"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr "Máscara"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Atualização em massa"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Atualização em massa de elementos"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Número máximo de elementos mostrados dentro de uma célula de tabela"
@@ -8885,32 +9155,11 @@ msgstr "O máximo de elementos a exibir dentro de uma tabela é \"%1$s\"."
 msgid "Max count of events per trigger to show"
 msgstr "Máximo de eventos por trigger a exibir"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "O tamanho máximo do nome de DNS é de %1$d caracteres, \"%2$s\" possui %3$d caracter."
-msgstr[1] "O tamanho máximo do nome de DNS é de %1$d caracteres, \"%2$s\" possui %3$d caracteres."
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "O tamanho máximo de um apelido é de %1$d caracteres, \"%2$s\" possui %3$d caracter."
-msgstr[1] "O tamanho máximo de um apelido é de %1$d caracteres, \"%2$s\" possui %3$d caracteres."
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "O nome do host deve possuir no máximo %1$d characteres, \"%2$s\" possui %3$d caracteres."
-msgstr[1] "O nome do host deve possuir no máximo %1$d characteres, \"%2$s\" possui %3$d caracteres."
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8918,105 +9167,99 @@ msgid "Maximum number of flexible intervals added"
 msgstr "A quantidade máxima de intervalos flexíveis foi alcançada"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr "Quantidade MÁXIMA de arquivos abertos suportada pelo SO."
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr "Quantidade MÁXIMA de processos suportada pelo SO."
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] "O período máximo a ser exibido é de %1$s dia."
 msgstr[1] "O período máximo a ser exibido é de %1$s dias."
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "O valor máximo para um período T é < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "O valor máximo para um período T é = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "O valor máximo para um período T é > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "O valor máximo para um período T é NÃO É N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "O nome visível do host deve possuir no máximo %1$d caracteres, \"%2$s\" possui %3$d caracteres."
-msgstr[1] "O nome visível do host deve possuir no máximo %1$d caracteres, \"%2$s\" possui %3$d caracteres."
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Maio"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Maio"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Mídia"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Tipo de mídia"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "O tipo de mídia \"%s\" já existe."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Tipo de mídia adicionado"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Tipo de mídia excluído"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Tipo de mídia desativado"
 msgstr[1] "Tipos de mídia desativados"
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Tipo de mídia ativado"
 msgstr[1] "Tipos de mídia ativados"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Mídia atualizada"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Tipos de mídias"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Tipos de mídia utilizados pela ação \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9031,14 +9274,14 @@ msgid "Memory limit: %s"
 msgstr "Limite de memória: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr "Memória utilizada por um processo. <name> nome do processo (padrão: \"todos os processos\"). <user> nome do usuário (padrão: \"todos os usuários\"). <mode> valores possíveis: avg, max, min, sum (padrão). <cmdline> filtro pela linha de comando (suporta expressão regular). Exemplo: proc.mem[,root]."
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9048,7 +9291,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Mensagem"
 
@@ -9056,66 +9299,66 @@ msgstr "Mensagem"
 msgid "Message actions"
 msgstr "Ações de mensagem"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Limite da mensagem de texto"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Expiração de mensagem"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Tempo limite para mensagem (segundos)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Mensagens"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Mensagens"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Método não encontrado."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Centro"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr "O valor mínimo para o limite de memória do PHP é %s (opção de configuração \"memory_limit\")."
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr "O valor mínimo para tamanho de arquivo enviado pelo PHP é %s (opção de configuração \"upload_max_filesize\")."
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr "A versão mínima do PHP é %s."
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr "O valor mínimo para o limite tempo de execução de scripts PHP é %s (opção de configuração \"max_execution_time\")."
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr "O tempo mínimo aceito para análise do script PHP é de %s (opção de configuração \"max_input_time\")."
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr "O tamanho mínimo requerido para o POST PHP é %s (opção de configuração \"post_max_size\")."
@@ -9124,80 +9367,77 @@ msgstr "O tamanho mínimo requerido para o POST PHP é %s (opção de configura�
 msgid "Minimum severity"
 msgstr "Severidade mínima"
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] "O período mínimo a ser exibido é de %1$s hora."
 msgstr[1] "O período mínimo a ser exibido é de %1$s horas."
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr "Severidade mínima da trigger"
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "Valor mínimo em um período T é < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "Valor mínimo em um período T é = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "Valor mínimo em um período T é > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "Valor mínimo em um período T é NÃO É N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Minutos"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr "O campo \"%1$s\" está faltando na condição da ação."
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr "Está faltando o campo \"%1$s\" para o item."
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr "Está faltando o campo \"%1$s\" para o período."
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr "Está faltando o campo \"gitemid\" para o item."
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Está faltando o campo \"itemid\" para o item."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr "Está faltando o campo \"name\" para o protótipo de gráfico."
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Está faltando o campo \"name\" para o gráfico."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "O item \"%1$s\" está faltando no host \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Estão faltando itens no gráfico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr "Estão faltando itens no protótipo de gráfico \"%1$s\"."
@@ -9207,7 +9447,7 @@ msgstr "Estão faltando itens no protótipo de gráfico \"%1$s\"."
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Está faltando a chave \"%1$s\" para o host \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Parâmetro ausente: usrgrpids."
 
@@ -9219,18 +9459,18 @@ msgstr "Modo"
 msgid "Model"
 msgstr "Modelo"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Seg"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Monitorado por proxy"
 
@@ -9238,33 +9478,33 @@ msgstr "Monitorado por proxy"
 msgid "Monitored host"
 msgstr "Host monitorado"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Monitoramento"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr "Monitoramento de eventos de log do Windows. pattern, severity, eventid - expressões regulares"
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr "Monitoramento de log com rotação. fileformat - [caminho][expressão regular], pattern - expressão regular"
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr "Monitoramento de log. pattern - expressão regular"
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Mês"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Mensal"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr "Mais correspondentes encontrados..."
 
@@ -9272,7 +9512,7 @@ msgstr "Mais correspondentes encontrados..."
 msgid "More than 10 minutes"
 msgstr "Mais de 10 minutos"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Mais de um gráfico com o nome \"%1$s\" no mesmo host."
@@ -9281,19 +9521,19 @@ msgstr "Mais de um gráfico com o nome \"%1$s\" no mesmo host."
 msgid "Most busy triggers top 100"
 msgstr "Triggers mais ativados - top 100"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Multiplos eventos de PROBLEMA"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Geração de múltiplos eventos de INCIDENTE"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Sem som"
 
@@ -9306,60 +9546,58 @@ msgstr "MAPAS DE REDE"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "SEM DADOS"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "Autenticação NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr "NTLM"
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9370,26 +9608,32 @@ msgstr "Autenticação NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
+msgid "Name"
+msgstr "Nome"
+
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
 msgid "Name"
 msgstr "Nome"
 
-#: api/classes/CHostPrototype.php:223
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr "O nome do protótipo de grupo \"%1$s\" deve conter macros."
@@ -9408,12 +9652,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr "Período de retenção de dados de eventos e alertas da descoberta de rede (em dias) \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr "Estatísticas de entrada da interface de rede. Valor inteiro. Se o <mode> estiver ausente será utilizado bytes."
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr "Estatísticas de saída de dados da interface de rede. Valor inteiro. Se o modo estiver ausente bytes serão utilizados."
 
@@ -9421,7 +9665,7 @@ msgstr "Estatísticas de saída de dados da interface de rede. Valor inteiro. Se
 msgid "Network map added"
 msgstr "Mapa de rede adicionado"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Mapa de rede removido"
 
@@ -9433,7 +9677,7 @@ msgstr "Mapa de rede atualizado"
 msgid "Network maps"
 msgstr "Mapas de rede"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Nunca"
 
@@ -9441,24 +9685,24 @@ msgstr "Nunca"
 msgid "Never executed"
 msgstr "Nunca executado"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Nova"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Nova aplicação"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Nova condição"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Novo elemento"
 
@@ -9469,16 +9713,16 @@ msgstr "Novo elemento"
 msgid "New flexible interval"
 msgstr "Novo intervalo flexível"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Novo grupo"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Novo grupo de hosts"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Novo item de gráfico"
 
@@ -9486,83 +9730,99 @@ msgstr "Novo item de gráfico"
 msgid "New media"
 msgstr "Nova mídia"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Nova expressão regular"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Novo horário de serviço"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Próximo"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Próximo"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Não"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr "Falta o dado \"%1$s\" para o protótipo do gráfico."
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr "Falta o dado \"%1$s\" para o gráfico."
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr "Não foi encontrado \"%1$s\" para o protótipo de host."
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
-msgstr ""
+msgstr "Sem \"%1$s\" encontrado para a tela."
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
-msgstr ""
+msgstr "Sem \"%1$s\" encontrado no template de tela."
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr "Sem \"%1$s\" encontrado para o cenário web."
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr "Não foi encontrado \"%2$s\" para a condição de filtro da ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Sem \"%2$s\" localizado para uma condição de filtro da regra de descoberta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr "Não foi encontrado \"%2$s\" para o protótipo de host \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr "Não foi informado \"%2$s\" para o filtro da ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Sem \"%2$s\" localizado para o filtro da regra de descoberta \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Falta o campo \"ymax_type\" para o gráfico \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Falta o campo \"ymin_type\" para o gráfico \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr "Nenhuma interface IPMI encontrada."
 
@@ -9570,25 +9830,25 @@ msgstr "Nenhuma interface IPMI encontrada."
 msgid "No IT services found."
 msgstr "Nenhum serviço de TI encontrado."
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr "Nenhuma interface JMX encontrada."
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr "Não foi especificado o OID SNMP."
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr "Não foi especificada a comunidade SNMP."
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr "Nenhuma interface SNMP encontrada."
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Não foi informada uma URL para o elemento da tela."
 
@@ -9607,15 +9867,15 @@ msgstr "Nenhum reconhecimento encontrado."
 #: include/classes/screens/CScreenActions.php:126
 #: include/views/administration.auditacts.list.php:67
 msgid "No action log entries found."
-msgstr ""
+msgstr "Não foram encontradas entradas de log de auditoria."
 
 #: include/actions.inc.php:817 include/actions.inc.php:913
 #: include/actions.inc.php:967 include/views/configuration.action.list.php:48
 msgid "No actions found."
 msgstr "Nenhuma ação localizada."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr "Nenhuma interface de agente encontrada."
 
@@ -9625,38 +9885,39 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Nenhuma aplicação com o ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr "Nenhuma aplicação encontrada."
 
 #: include/views/administration.auditlogs.list.php:83
 msgid "No audit log entries found."
-msgstr ""
+msgstr "Não foi encontrada entrada no log de auditoria."
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "Não foi especificado o tipo de autenticação para o comando de operação \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "Não foi informado o nome de usuário para o comando de operação \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Não foi especificado o nome de usuário."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Nenhum comando definido para a operação da ação."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Não foi especificado o tipo de comando para a operação da ação."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Nenhuma condição definida."
 
@@ -9665,27 +9926,27 @@ msgstr "Nenhuma condição definida."
 msgid "No data collection"
 msgstr "Sem coleta de dados"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "Nenhum dado recebido durante um período de tempo T, então N = 1, 0 - outro caso"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "Nenhum dado recebido durante um período de tempo T, então N NÃO É 1, 0 - outro caso"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Não foi definida a interface padrão para o tipo \"%1$s\" em \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Não foram definidas dependências."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Sem detalhes"
 
@@ -9693,39 +9954,39 @@ msgstr "Sem detalhes"
 msgid "No discovered devices found."
 msgstr "Nenhum dispositivo encontrado."
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr "Não foi encontrado o ID da regra de auto-busca para o protótipo de host \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Não foram informados os IDs de regra de descoberta."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr "Nenhuma regra de descoberta encontrada."
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Não foram localizados erros."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Sem eventos"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr "Nenhum evento encontrado."
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Não há eventos para reconhecer"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Não foi definido o alvo de execução para a o comando \"%s\"."
@@ -9740,7 +10001,7 @@ msgstr "Nenhum arquivo foi enviado."
 msgid "No flexible intervals defined."
 msgstr "Não foram definidos intervalos flexíveis."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Não foi informado um ID de gráfico para um elemento da tela."
 
@@ -9749,7 +10010,11 @@ msgstr "Não foi informado um ID de gráfico para um elemento da tela."
 msgid "No graph item with graphid \"%s\"."
 msgstr "Não foi localizado um gráfico com o graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr "Nenhum protótipo de gráfico encontrado."
 
@@ -9758,48 +10023,49 @@ msgid "No graphs added."
 msgstr "Nenhum gráfico adicionado."
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr "Nenhum gráfico encontrado."
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Nenhum grupo para o host \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Nenhum grupo para hosts."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr "Sem grupos para o template \"%1$s\"."
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
-msgstr ""
+msgstr "Sem grupos para o template."
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Não foram informados IDs de host."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Não foi localizado host para a macro \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr "Não foi encontrado grupo de host com o ID informado no protótipo."
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Não foi informado o ID do grupo para um elemento da tela."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr "Nenhum grupo de hosts encontrado."
 
@@ -9812,17 +10078,22 @@ msgstr "Não existem grupos de hosts com o groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr "Nenhum protótipo de host encontrado."
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr "Nenhum host selecionado."
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Não existe host com o hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr "Nenhum host encontrado."
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Nenhum ícone para o elemento do mapa \"%s\"."
@@ -9841,35 +10112,42 @@ msgstr "Nenhuma imagem encontrada."
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Nenhuma interface encontrada"
 
 # very similary

 # include/views/configuration.item.edit.php:112 include/views/configuration.item.massupdate.php:77 include/views/js/configuration.item.edit.js.php:84
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Nenhuma interface encontrada."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr "Nenhuma interface informada para o proxy \"%s\"."
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Nenhuma interface para o host \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Não foi definido um ID de item para um elemento da tela."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr "Nenhuma chave de item encontrada."
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr "Nenhum protótipo de item encontrado."
 
@@ -9890,7 +10168,7 @@ msgid "No items defined."
 msgstr "Nenhum item definido."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr "Nenhum item encontrado."
 
@@ -9906,7 +10184,7 @@ msgstr "Nenhum período de manutenção definido."
 msgid "No maintenance periods found."
 msgstr "Nenhum período de manutenção encontrado."
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Não foi informado um ID de mapa para um elemento da tela."
 
@@ -9915,15 +10193,15 @@ msgid "No maps added."
 msgstr "Nenhum mapa adicionado."
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr "Nenhum mapa encontrado."
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr "Nenhuma mídia encontrada."
 
@@ -9935,133 +10213,178 @@ msgstr "Nenhum tipo de mídia encontrado."
 msgid "No notifications found."
 msgstr "Nenhuma notificação encontrada."
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr "Nenhuma operação definida."
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Sem permissão para o gráfico \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Sem permissão para o host \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Sem permissão para o item \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Sem permissão para o template \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Sem permissão para a trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr "Sem permissão para a trigger \"%1$s\"."
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Sem permissões"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Sem permissão para o grupo \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr "Sem permissões para o grupo de host \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Sem permissão para o mapa \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Sem permissão para a tela \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Sem permissão de acesso ao sistema."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Sem permissão para o objeto referenciado ou ele não existe!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Não foi informado o arquivo de chave privada para o comando de operação \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Não foi informado o arquivo de chave privada."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr "Nenhum proxy encontrado."
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Não foi informado o arquivo de chave pública para o comando \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Não foi informado o arquivo de chave pública."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Sem destinatários para a operação de mensagem da ação."
 
@@ -10069,7 +10392,7 @@ msgstr "Sem destinatários para a operação de mensagem da ação."
 msgid "No regular expressions found."
 msgstr "Nenhuma expressão regular encontrada."
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Não foi informado um ID de tela para um elemento da tela."
 
@@ -10077,82 +10400,83 @@ msgstr "Não foi informado um ID de tela para um elemento da tela."
 msgid "No screens added."
 msgstr "Nenhuma tela adicionada."
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr "Nenhuma tela encontrada."
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Nenhum script definido para a ação de comando."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr "Nenhum script encontrado."
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr "Nenhum slide show encontrado."
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr "Nenhum slide encontrado."
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr "Sem status do proxy."
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Nenhum alvo selecionado"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Nenhum alvo selecionado."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr "Nenhum template encontrado."
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr "Nenhum template vinculado."
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Nenhum horário definido. Trabalhando 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Sem trigger"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Nenhuma trigger com o triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Nenhuma trigger definida."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Nenhuma trigger localizada."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr "Nenhum grupo de usuários encontrado."
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr "Nenhum usuário encontrado."
 
@@ -10161,57 +10485,58 @@ msgid "No value maps found."
 msgstr "Nenhum mapeamento de valores encontrado."
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Nenhum valor encontrado."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr "Nenhum cenário web encontrado."
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Nenhum"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normal"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Visão normal"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Não reconhecer"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Itens fora do emplate"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Nem todos os templates estão vinculados ao \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Não autorizado para definir a senha do usuário \"guest\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
-msgstr ""
+msgstr "Não autorizado."
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Indisponível"
 
@@ -10220,21 +10545,21 @@ msgstr "Indisponível"
 msgid "Not classified"
 msgstr "Não classificada"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Não conectado"
 
 #: include/classes/screens/CScreenActions.php:155
 #: include/views/administration.auditacts.list.php:94
 msgid "Not sent"
-msgstr ""
+msgstr "Não enviado"
 
 #: include/items.inc.php:181 include/items.inc.php:206
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Nota"
@@ -10247,7 +10572,7 @@ msgstr "Notas"
 msgid "Nothing"
 msgstr "Nada"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Nada a fazer."
 
@@ -10255,87 +10580,87 @@ msgstr "Nada a fazer."
 msgid "Notification report"
 msgstr "Relatório de notificações"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notificações"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Novembro"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Agora"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr "Número de processadores disponíveis."
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
-msgstr ""
+msgstr "Quantidade de hosts (habilitados/desabilitados/templates)"
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr "Número de inodes para um volume específico. Se o modo estiver ausente o total é utilizado."
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
-msgstr ""
+msgstr "Quantidade de itens (habilitados/desabilitados/não suportados)"
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr "Número de itens no banco de dados do Zabbix."
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr "Número de items no histórico do proxy que ainda não foram enviados para o servidor"
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr "Número de itens na fila que estão atrasados em segundos."
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr "Quantidade de hosts monitorados"
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr "Número de processos. <name> e <user> mesmo que o item proc.mem. <state> all (padrão), run, sleep, zomb. <cmdline> filtra pela linha de comando (suporta expressão regular). Exemplo: proc.num[apache2,www-data]. Em Windows, apenas <name> e <user> são suportados."
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Número de cores de processamento em um hypervisor VMware, <url> - URL de serviço do VMware, <uuid> - Nome do host hypervisor do VMware"
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Número de threads do processador hypervisor VMware, <url> - URL de serviço VMware, <uuid> - nome do host hypervisor VMware"
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Número de processadores na máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - nome do host virtual no VMware"
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Número de segundos desde a época é < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Número de segundos desde a época é = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Número de segundos desde a época é > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Número de segundos desde a época é NÃO É N"
 
@@ -10343,88 +10668,88 @@ msgstr "Número de segundos desde a época é NÃO É N"
 msgid "Number of status changes"
 msgstr "Alterações no status"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Número de passos"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Número de valores V localizados com sucesso (correspondentes ao operador O) num período T é < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Número de valores V localizados com sucesso (correspondentes ao operador O) num período T é = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Número de valores V localizados com sucesso (correspondentes ao operador O) num período T é > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Número de valores V localizados com sucesso (correspondentes ao operador O) num período T NÃO É N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
-msgstr ""
+msgstr "Quantidade de triggers (habilitadas/desabilitadas [incidente/ok])"
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr "Número de triggers no banco de dados Zabbix."
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr "Número de itens não suportados no banco de dados Zabbix."
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Número de usuários (online)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr "Número de usuários conectado. O comando who é usado no lado do agente."
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr "Número de valores armazenados na tabela HISTORY."
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr "Número de valores armazenados na tabela HISTORY_LOG."
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr "Número de valores armazenados na tabela HISTORY_STR."
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr "Número de valores armazenados na tabela HISTORY_TEXT."
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr "Número de valores armazenados na tabela HISTORY_UINT."
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr "Número de valores armazenados na tabela TRENDS."
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr "Número de valores armazenados na tabela TRENDS_UINT."
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Número de máquinas virtuais no hypervisor VMware, <url> - URL de serviço do VMware, <uuid> - Nome do host hypervisor do VMware"
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numérico (fracionário)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numérico (inteiro 64bits)"
 
@@ -10439,16 +10764,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr "OK ou nenhuma trigger"
 
@@ -10464,8 +10791,7 @@ msgstr "Roteador OOB"
 msgid "OOB subnet mask"
 msgstr "Máscara de subnet OOB"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "OU"
 
@@ -10485,11 +10811,12 @@ msgstr "SO (Curto)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "OUTROS PARÂMETROS DE CONFIGURAÇÃO"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "VISÃO GERAL"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Out"
 
@@ -10497,25 +10824,25 @@ msgstr "Out"
 msgid "Octal"
 msgstr "Octal"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Outubro"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Inativo"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Ativo"
 
@@ -10523,111 +10850,114 @@ msgstr "Ativo"
 msgid "On status change triggers blink for"
 msgstr "Ao mudar o status da trigger piscar por"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Uma vez"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr "Um dos objetos está sem um grupo de hosts."
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Apenas uma vez"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Downtime único"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Apenas os super administradores podem criar macros."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Apenas os super administradores podem criar grupos de hosts."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Apenas os super administradores podem criar mapeamentos de ícones."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Apenas os super administradores podem criar tipos de mídia."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Apenas os super administradores podem criar macros globais."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Apenas os super administradores podem apagar tipos de mídia."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Apenas os super administradores podem apagar grupos de usuários."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Apenas os super administradores podem editar tipos de mídia."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Apenas os super administradores podem atualizar macros globais."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Apenas os super administradores podem atualizar mapeamento de ícones."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Apenas os administradores podem adicionar mídia de usuário."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Apenas os administradores podem mudar mídia de usuário."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Apenas os administradores podem remover mídia de usuário."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Apenas caracteres são permitidos."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr "Apenas através de verificações com o agente Zabbix, SNMPv1, SNMPv2 e SNMPv3 pode ser feita a verificação de unicidade."
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Somente itens de hosts habilitados são contados"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Apenas uma verificação pode ser única."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Apenas um nome de grupo de usuário pode ser modificado por vez."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Apenas os últimos 20%% dos indicadores são exibidos."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr "Apenas os eventos de triggers podem ser reconhecidos."
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Somente triggers de hosts ativados e dependentes de itens ativados são contadas"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Ópera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "A operação \"%s\" já existe."
@@ -10636,28 +10966,28 @@ msgstr "A operação \"%s\" já existe."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "A operação não pode ser executada devido a requisição não autorizada."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Condição da operação"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Detalhes da operação"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "A operação não possui grupo para operar."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "A operação não possui template para operar."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Tipo da operação"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Ações"
@@ -10666,25 +10996,27 @@ msgstr "Ações"
 msgid "Operator"
 msgstr "Operador"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
-msgstr ""
+msgstr "Ou"
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10714,24 +11046,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Original"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Azul original"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Outros"
 
@@ -10739,19 +11071,19 @@ msgstr "Outros"
 msgid "Other configuration parameters"
 msgstr "Outros parâmetros de configuração"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Outros grupos"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Outros Hosts"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10761,21 +11093,21 @@ msgstr "Outro host | grupo"
 msgid "Other parameters"
 msgstr "Outros parâmetros"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Outro | grupo"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Outros"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr "Colisão fora de janela. Contador de colisões."
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Sobrescrito por"
@@ -10788,14 +11120,11 @@ msgstr "Substituir o período de histórico do item"
 msgid "Override item trend period"
 msgstr "Substituir o período de histórico da média"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr "Sobreposto pela configuração global de limpeza de dados"
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Visão geral"
 
@@ -10803,7 +11132,7 @@ msgstr "Visão geral"
 msgid "Overview by proxy"
 msgstr "Visão geral por proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10812,147 +11141,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "DASHBOARD PESSOAL"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr "Está ausente a extensão bcmath do PHP (parâmetro de configuração PHP --enable-bcmath)."
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr "Está ausente a extensão ctype do PHP (parâmetro de configuração PHP --enable-ctype)."
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Suporte de banco de dados no PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PGP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Suporte ao FreeType do PHP gd"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr "Está ausente o suporte ao PHP gd FreeType."
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr "O suporte do PHP à imagens JPEG (gd) está ausente."
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Suporte ao PHP gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr "O suporte do PHP à imagens PNG (gd) está ausente."
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Suporte PHP gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr "A extensão PHP gd está ausente (parâmetro de configuração PHP --with-gd)."
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr "A extensão PHP gettext está ausente (parâmetro de configuração PHP --with-gettext). Traduções não estarão disponíveis."
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr "A extensão PHP libxml está ausente."
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr "A extensão PHP mbstring está ausente (parâmetro de configuração do PHP --enable-mbstring)."
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr "Sobrecarga da função mbstring do PHP"
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "Opção PHP max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "Opção PHP max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "Opção PHP memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "Opção PHP post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "Opção PHP upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "Sessão PHP"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "Início automático de sessão PHP"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr "O início automático de sessão do PHP deverá estar desativado (diretiva PHP \"session.auto_start\")."
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr "A extensão PHP session está ausente (parâmetro de configuração PHP --enable-session)."
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr "A extensão PHP sockets está ausente (parâmetro de configuração PHP --enable-sockets)."
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr "A função de sobrecarga do PHP deverá ser desabilitada."
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP time zone"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Versão PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr "Está ausente a extensão xmlreader do PHP."
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr "Está ausente a extensão xmlwriter do PHP."
 
@@ -10961,32 +11298,34 @@ msgstr "Está ausente a extensão xmlwriter do PHP."
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLEMA"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "A página recebeu dados inválidos"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Paleta"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palheta #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parâmetro"
 
@@ -10995,7 +11334,7 @@ msgstr "Parâmetro"
 msgid "Parent discovery rules"
 msgstr "Autobusca herdada"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr "Gráficos herdados"
 
@@ -11015,33 +11354,33 @@ msgstr "Triggers herdadas"
 msgid "Parent web scenarios"
 msgstr "Cenários web herdados"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Erro de análise SQL [%1$s] em [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Erro de análise"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Passivo"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11051,20 +11390,21 @@ msgstr "Passivo"
 msgid "Password"
 msgstr "Senha"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Senha (novamente)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
-msgstr ""
+msgstr "A senha está indisponível para usuários com %1$s."
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Senha necessária para o tipo de mídia."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Senha não pode ser vazia"
 
@@ -11073,21 +11413,21 @@ msgstr "Senha não pode ser vazia"
 msgid "Peak memory usage: %s"
 msgstr "Pico de utilização de memória: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Linha percentual (esquerda)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Linha percentual (direita)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr "Executa uma consulta DNS. Caso seja bem sucedida retorna uma sequência de caracteres com o tipo da informação requisitada."
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11095,12 +11435,12 @@ msgstr "Executa uma consulta DNS. Caso seja bem sucedida retorna uma sequência
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Período"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Tipo de período"
@@ -11110,24 +11450,24 @@ msgstr "Tipo de período"
 msgid "Periods"
 msgstr "Períodos"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Permissões"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Permissões devem ser definidas para grupos de usuários apenas."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persa (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Torta"
 
@@ -11139,55 +11479,56 @@ msgstr "Informar algorítimo"
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Executar"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Executar som"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Por favor corrija todas as observações e pressione o botão \"Tentar\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Informe o texto de confirmação."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Favor selecionar dois elementos"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polonês (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Preencha o campo do inventário do host"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Porta"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "A porta não pode ser nula na interface do host."
 
@@ -11195,51 +11536,51 @@ msgstr "A porta não pode ser nula na interface do host."
 msgid "Port range"
 msgstr "Range de portas"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Português Brasileiro (PT_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Português de Portugal (pt_BR)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Posição"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Post"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Visualizar"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Anterior"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Anterior"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "O valor anterior é < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "O valor anterior é = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "O valor anterior é > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "O valor anterior é NÃO É N"
 
@@ -11288,30 +11629,31 @@ msgstr "Frase privada"
 msgid "Privacy protocol"
 msgstr "Protocolo de privacidade"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Arquivo de chave privada"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Nível de acesso"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Provavelmente o módulo php-ldap está ausente."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problema"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Exibição de problemas"
 
@@ -11323,16 +11665,16 @@ msgstr "Problema em"
 msgid "Problem time"
 msgstr "Problema de hora"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Problema, se todos os filhos tem problemas"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problema, se pelo menos um filho tem problema"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problemas"
 
@@ -11340,75 +11682,71 @@ msgstr "Problemas"
 msgid "Profile"
 msgstr "Configurações"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Protótipos"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxies"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "O proxy \"%1$s\" para o host \"%2$s\" não existe."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "O proxy \"%1$s\" é utilizado pela regra de descoberta \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "O proxy \"%s\" já existe."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy adicionado"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy removido"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Hosts do proxy"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Falha ao criar a interface do proxy."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Falha ao atualizar a interface do proxy."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Modo do proxy"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Nome do proxy"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy atualizado"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Chave pública"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11419,7 +11757,7 @@ msgstr "Arquivo de chave pública"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "FILA DE ITENS A SEREM ATUALIZADOS"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Fila"
 
@@ -11427,18 +11765,18 @@ msgstr "Fila"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Leitura"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Somente leitura"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Leitura-escrita"
 
@@ -11450,19 +11788,19 @@ msgstr "Razão"
 msgid "Received value"
 msgstr "Valor recebido"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
-msgstr ""
+msgstr "Incidentes recentes"
 
 #: include/views/administration.auditacts.list.php:41
 msgid "Recipient"
 msgstr "Destinatário"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Recipiente (ascendente)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Recipiente (descendente)"
 
@@ -11473,28 +11811,28 @@ msgstr "Recipiente (descendente)"
 msgid "Recipient(s)"
 msgstr "Destinatário(s)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Recuperação"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Mensagem da recuperação"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Assunto da recuperação"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Atualização da tela (em seg.)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr "Tempo para atualização"
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Multiplicador de tempo de refresh"
 
@@ -11512,47 +11850,51 @@ msgstr "Atualização de itens não suportados (em segundos) \"%1$s\"."
 msgid "Regular expression"
 msgstr "Expressão regular"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "A expressão regular \"%s\" já existe."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "Expressão regular V corresponde ao último valor num período T, então N = 1, 0 - outro caso"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "Expressão regular V corresponde ao último valor num período T, então N = 1, 0 - outro caso (não sensível ao CAPS)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "Expressão regular V corresponde ao último valor em um período T, então N NÃO É 1, 0 - outro caso"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "Expressão regular V corresponde ao último valor num período T, então N NÃO É 1, 0 - outro caso (não sensível ao CAPS)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Expressão regular adicionada"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Expressão regular excluída"
 msgstr[1] "Expressões regulares excluídas"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "A expressão regular não existe."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr "A expressão regular precisa ser um texto"
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Expressão regular atualizada"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11569,26 +11911,28 @@ msgstr "Comando remoto"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11599,21 +11943,19 @@ msgstr "Comando remoto"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Remover"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr "Remover todos"
 
@@ -11621,11 +11963,11 @@ msgstr "Remover todos"
 msgid "Remove element"
 msgstr "Remover elemento"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Remover de"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Remover dos favoritos"
@@ -11634,7 +11976,7 @@ msgstr "Remover dos favoritos"
 msgid "Remove from host group"
 msgstr "Remover do grupo de hosts"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Remover dos grupos de hosts"
 
@@ -11646,28 +11988,28 @@ msgstr "Remover servidor"
 msgid "Remove link"
 msgstr "Remover link"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Remover selecionado"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Substituir"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr "Substituir aplicações"
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Substituir dependências"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Substituir grupos de hosts"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Relatório"
 
@@ -11675,35 +12017,36 @@ msgstr "Relatório"
 msgid "Report 1"
 msgstr "Relatório 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Relatório 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Relatório 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Relatórios"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Requerido"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "O campo obrigatório \"expression\" está ausente no mapeamento de ícones."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "O campo obrigatório \"iconid\" está ausente no mapeamento de ícones."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "O campo obrigatório \"inventory_link\" está ausente no mapeamento de ícones."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Permissões de host necessárias"
 
@@ -11711,29 +12054,31 @@ msgstr "Permissões de host necessárias"
 msgid "Required performance (vps)"
 msgstr "Performance requerida (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr "Performance requerida do servidor Zabbix, em novos valores por segundo."
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Desempenho requerido do servidor, novos valores por segundo"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Código de status requerido"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Texto requerido"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Limpar"
 
@@ -11752,9 +12097,9 @@ msgstr "Restaurar todos os nomes e cores aos seus valores originais?"
 msgid "Reset confirmation"
 msgstr "Confirmação de restauração"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11767,7 +12112,7 @@ msgstr "Resolvido"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Recurso"
@@ -11782,15 +12127,15 @@ msgstr "Tempo de resposta"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Resultado"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Resultado é FALSO"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Resultado VERDADEIRO"
 
@@ -11803,7 +12148,8 @@ msgstr "Resultado de \"%s\""
 msgid "Result type"
 msgstr "Tipo de resultado"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr "Tentativas"
 
@@ -11811,60 +12157,69 @@ msgstr "Tentativas"
 msgid "Retries left"
 msgstr "Tentativas restantes"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr "Receber apenas cabeçalho"
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Tentar"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr "Tempo de resposta do ICMP ping. Exemplo: 0,02"
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr "Retorna a disponibilidade de um tipo particular de verificações no host. O valor deste item corresponde a disponibilidade de ícones na lista do host. Os valores válidos são: agente, snmp, ipmi, jmx."
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr "Retorna o status atual de manutenção do host."
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr "Retorna a informação detalhada do host. Valor textual"
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr "Retorna o hostname (ou nome NetBIOS (por padrão) no windows). Valor textual. Exemplo de valor retornado: www.zabbix.com"
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr "Retorna a informação associada ao gateway java do Zabbix. Os parâmetros válidos são: ping, version."
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr "Retorna o percentual de perda de pacotes ICMP."
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Direita"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr "Romênio (ro_RO)"
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
-msgstr ""
+msgstr "Linha adicionada"
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
-msgstr ""
+msgstr "Linha excluída"
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Sobrepor linha"
 
@@ -11872,11 +12227,11 @@ msgstr "Sobrepor linha"
 msgid "Rows"
 msgstr "Linhas"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Registros por página"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Regras"
 
@@ -11921,20 +12276,20 @@ msgid "Run remote commands on hosts"
 msgstr "Executar comandos remotos nos hosts"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr "Executar comando específico no host."
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -11950,7 +12305,7 @@ msgstr "TELAS"
 msgid "SEARCH"
 msgstr "PESQUISA"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVIDOR"
 
@@ -11965,13 +12320,13 @@ msgstr "SHA"
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "SLIDESHOWS"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11980,17 +12335,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "Email SMTP"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "Servidor SMTP"
@@ -12006,7 +12361,7 @@ msgstr "Chave SNMP"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12018,9 +12373,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "Comunidade SNMP"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "Interfaces SNMP"
@@ -12029,7 +12384,7 @@ msgstr "Interfaces SNMP"
 msgid "SNMP trap"
 msgstr "Trap SNMP"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "A chave da trap SNMP é inválida."
 
@@ -12053,7 +12408,7 @@ msgstr "Agente SNMPv3"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Contador SQL: %s (pesquisas: %s | execuções: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12071,7 +12426,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "A execução do comando SQL falhou \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12080,15 +12435,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "Agente SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr "Arquivo de certificado SSL"
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr "Arquivo de chave SSL"
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr "Senha do SSL"
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr "Verificação SSL do host"
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr "Verificação de par SSL"
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "STATUS DA DESCOBERTA"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STATUS DE TRIGGERS"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "STATUS DA MONITORAÇÃO WEB"
 
@@ -12096,92 +12471,92 @@ msgstr "STATUS DA MONITORAÇÃO WEB"
 msgid "STATUS OF ZABBIX"
 msgstr "STATUS DO ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Sab"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sábado"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Salvar"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Salvar e retornar"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Escala"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Cenário"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Cenário adicionado"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Cenário atualizado"
 
@@ -12193,7 +12568,7 @@ msgstr "Cenários"
 msgid "Schedule"
 msgstr "Agendamento"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr "Verificação agendada"
 
@@ -12204,128 +12579,127 @@ msgstr "Verificação agendada"
 msgid "Screen"
 msgstr "Tela"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "A tela \"%1$s\" foi adicionada."
 
 # Maybe a wrong standard here ? 

 # "%2$2" instead "%2$s" ??
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "A tela \"%1$s\" já existe no template \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "A tela \"%1$s\" já existe."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr "Na tela \"%1$s\" a célula X - %2$s Y - %3$s já foi utilizada."
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr "Na tela \"%1$s\" a extensão de coluna X - %2$s Y - %3$s já é inválida."
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr "Na tela \"%1$s\" extensão de coluna X - %2$s Y - %3$s é muito grande."
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr "Na tela \"%1$s\" extensão de linha na célula X - %2$s Y - %3$s é inválida."
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr "Na tela \"%1$s\" extensão de linha na célula X - %2$s Y - %3$s é muito grande."
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "A tela \"%1$s\" foi ignorada - regra de usuário."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "A tela \"%1$s\" foi atualizada."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Tela incluída"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Configuração de célula de tela"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "A tela foi excluída"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Uma tela deve conter, no mínimo, uma linha e uma coluna."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Tela atualizada"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Telas"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Script"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "O scritp \"%1$s\" já existe."
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Script adicionado"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Script removido"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr "O caminho para o script \"%1$s\" já é utilizado para o script \"%2$s\"."
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Nome script"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr "O nome de script \"%1$s\" já é utilizado no menu para o script \"%2$s\"."
@@ -12334,17 +12708,17 @@ msgstr "O nome de script \"%1$s\" já é utilizado no menu para o script \"%2$s\
 msgid "Script profiler"
 msgstr "Perfil do script"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Script atualizado"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr "Não existe script com o scriptid \"%1$s\"."
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -12365,7 +12739,7 @@ msgstr "Padrão de busca está vazio"
 msgid "Search/Filter elements limit"
 msgstr "Limite de Busca/Filtragem de elementos"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Segundo"
 
@@ -12397,7 +12771,7 @@ msgstr "POC - Telefone B secundário"
 msgid "Secondary POC screen name"
 msgstr "POC - Nome secundário da tela"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Segundos"
 
@@ -12416,69 +12790,76 @@ msgstr "Nível de segurança"
 msgid "Security name"
 msgstr "Nome de segurança"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Selecionar"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Selecione o protótipo"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Selecionar registros com valores como"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Selecionado"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "A ação selecionada foi excluída"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Elementos selecionados"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Grupos selecionados"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Hosts selecionados"
 
@@ -12494,7 +12875,7 @@ msgstr "Enviar mensagem para o grupo de usuários"
 msgid "Send message to users"
 msgstr "Enviar mensagem para os usuários"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Enviar apenas para"
 
@@ -12502,11 +12883,11 @@ msgstr "Enviar apenas para"
 msgid "Send to"
 msgstr "Enviar para"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Enviar para grupos de usuários"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Enviar para usuários"
 
@@ -12515,17 +12896,17 @@ msgstr "Enviar para usuários"
 msgid "Sent"
 msgstr "Enviado"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Set"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Separados"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Setembro"
 
@@ -12537,7 +12918,7 @@ msgstr "Número serial A"
 msgid "Serial number B"
 msgstr "Número serial B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Servidor"
@@ -12546,44 +12927,44 @@ msgstr "Servidor"
 msgid "Server info"
 msgstr "Info servidor"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Hora do servidor"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Serviços"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr "Serviço \"%1$s\""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "O serviço \"%1$s\" não pode ser excluído pois existem outros serviços que dependem dele."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "O serviço \"%1$s\" não pode depender dele mesmo."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "O serviço \"%1$s\" não pode possuir vínculo com trigger e possuir um filho ao mesmo tempo."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "O serviço \"%1$s\" já possui vínculo forte com outro serviço."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "O serviço não pode ser pai e filho ao mesmo tempo."
 
@@ -12599,11 +12980,11 @@ msgstr "Serviço removido"
 msgid "Service port"
 msgstr "Porta"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "O horário de início do serviço deve ser menor que o horário de fim."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Horário de serviço"
 
@@ -12615,49 +12996,53 @@ msgstr "Tipo de serviço"
 msgid "Service updated"
 msgstr "Serviços atualizados"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Serviços"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Os serviços formam uma dependência circular."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Sessão terminada, conecte-se novamente por favor."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Risco"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Severidade (descedente)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "O nome da severidade não pode ser nulo."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Mostrar"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Mostrar todos"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] "Exibir todos (%1$s dia)"
+msgstr[1] "Exibir todos (%1$s dias)"
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Mostrar detalhes"
 
@@ -12689,35 +13074,36 @@ msgstr "Não exibir eventos mais antigos que (em dias)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Não exibir eventos mais antigos que (em dias) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
-msgstr ""
+msgstr "Exibir filtro"
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Mostrar hosts em manutenção"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Exibir itens com nome parecido"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Exibir itens sem dados"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Mostrar legenda"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Mostrar linhas"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Mostrar selecionados"
 
@@ -12725,19 +13111,22 @@ msgstr "Mostrar selecionados"
 msgid "Show selected groups"
 msgstr "Exibir grupos selecionados"
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Mostrar texto como HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Mostrar triggers"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Exibir não reconhecido"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] "Exibir não reconhecidos (%1$s dia)"
+msgstr[1] "Exibir não reconhecidos (%1$s dias)"
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Mostrar valor"
@@ -12746,11 +13135,11 @@ msgstr "Mostrar valor"
 msgid "Show warning if Zabbix server is down"
 msgstr "Exibir alertas se o servidor Zabbix estiver fora do ar"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Mostrar horário comercial"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Mostrar"
 
@@ -12770,6 +13159,10 @@ msgstr "Monitoração simples"
 msgid "Simple graph"
 msgstr "Gráfico simples"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Site - CEP / postal"
@@ -12807,7 +13200,7 @@ msgid "Site state / province"
 msgstr "Site - Estado / Província"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr "Tamanho de um arquivo. Tamanho em bytes. O arquivo deve possuir permissão de leitura para o usuário zabbix. Exemplo: vfs.file.size[/var/log/syslog]"
 
@@ -12825,16 +13218,16 @@ msgstr "Foi ignorada a cópia do gráfico \"%1$s\" para o host \"%2$s\"."
 msgid "Slide"
 msgstr "Slide"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Slideshow"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr "A apresentação de slides \"%1$s\" já existe."
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "A apresentação de slides \"%s\" já existe."
@@ -12843,11 +13236,11 @@ msgstr "A apresentação de slides \"%s\" já existe."
 msgid "Slide show added"
 msgstr "Apresentação de slides adicionada"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Apresentação de slides excluída"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Uma apresentação de slides precisa conter slides."
 
@@ -12855,10 +13248,10 @@ msgstr "Uma apresentação de slides precisa conter slides."
 msgid "Slide show updated"
 msgstr "Apresentação de slides atualizada"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Slideshows"
 
@@ -12866,15 +13259,15 @@ msgstr "Slideshows"
 msgid "Slides"
 msgstr "Slides"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Eslovaco (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Soneca"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Soft"
 
@@ -12907,28 +13300,28 @@ msgid "Software application E"
 msgstr "Software - Aplicação E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr "Arquitetura de software"
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr "Lista de pacotes de software - lista todos os pacotes de todos os gerenciadores de pacote suportados por padrão"
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
-msgstr ""
+msgstr "Ordenar entradas por"
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Posicionar em (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Ordenar as triggers por"
 
@@ -12941,11 +13334,11 @@ msgstr "Ordenação pelo campo \"%1$s\" não é suportada."
 msgid "Source"
 msgstr "Origem"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Espanhol (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "O script informado não existe ou você não possui privilégios para executa-lo."
 
@@ -12953,63 +13346,63 @@ msgstr "O script informado não existe ou você não possui privilégios para ex
 msgid "Speed"
 msgstr "Velocidade"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Pilha"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Itens padrões"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Iniciar em"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr "Horário de início do servidor Zabbix, padrão de hora do UNIX."
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Status"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr "Estado do serviço. 0 - executando, 1 - pausado, 2 - início pendente, 3 - pausa pendente, 4 - continuação pendente, 5 - parada pendente, 6 - parado, 7 - desconhecido, 255 - serviço desconhecido"
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Status"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Status (ascendente)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Status (descendente)"
 
@@ -13022,7 +13415,7 @@ msgstr "Cálculo do status"
 msgid "Status calculation algorithm"
 msgstr "Algoritmo de cálculo do status"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Códigos de status"
 
@@ -13031,7 +13424,7 @@ msgid "Status of Web monitoring"
 msgstr "Status da monitoração Web"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Status do Zabbix"
 
@@ -13048,40 +13441,40 @@ msgid "Status only"
 msgstr "Somente status"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Passo"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "O passo \"%1$s\" [%2$s de %3$s] falhou: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Duração do passo"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Passo do cenário"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr "Já existe um passo com o nome \"%1$s\"."
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Passos"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Parar"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Armazenar valor"
@@ -13090,11 +13483,11 @@ msgstr "Armazenar valor"
 msgid "Straight"
 msgstr "Direto"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Estilo"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Subfiltro [afeta apenas os dados filtrados!]"
 
@@ -13102,11 +13495,11 @@ msgstr "Subfiltro [afeta apenas os dados filtrados!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Assunto"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Submapa"
 
@@ -13115,32 +13508,32 @@ msgid "Success Audit"
 msgstr "Sucesso na Auditoria"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr "Total de entrada e saída das estatísticas da interface de rede. Valor inteiro. Mode - bytes (padrão), packets, errors ou dropped"
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "Total dos valores de um período T é < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Total dos valores de um período T é = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Total dos valores de um período T é > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "Total dos valores de um período T é NÃO É N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Dom"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -13148,27 +13541,27 @@ msgstr "Domingo"
 msgid "Support"
 msgstr "Suporte"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Sobrenome"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr "Entradas de Swap. Se o tipo for <count> - as entradas de swap são retornadas. Se o tipo for <pages> - as trocas de página no swap são retornadas. Se <swap> estiver ausente, todos são retornados."
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr "Saídas de Swap. Se o tipo for <count> - as saídas de swap são retornadas. Se o tipo for <pages> - as trocas de página no swap são retornadas. Se <swap> estiver ausente, todos são retornados."
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr "Tamanho do swap. Número de Bytes. Se <swap> estiver ausente, será totalizado todos os existentes. Se <mode> estiver ausente será utilizado o livre."
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Sueco (sv_SE)"
 
@@ -13176,16 +13569,16 @@ msgstr "Sueco (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "A mudança do método de autenticação irá invalidar todas as sessões, exceto esta! Continuar?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Padrão do sistema"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Erro de sistema."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr "Horário local do sistema. Horário em segundos."
 
@@ -13194,21 +13587,21 @@ msgid "System status"
 msgstr "Status do sistema"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr "Tempo em segundos desde a inicialização."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -13227,11 +13620,11 @@ msgid "TOTAL"
 msgstr "TOTAL"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "COMENTÁRIOS DA TRIGGER"
+msgid "TRIGGER DESCRIPTION"
+msgstr "DESCRIÇÃO DE TRIGGER"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "VERDADEIRO"
 
@@ -13249,14 +13642,14 @@ msgstr "A tabela \"%1$s\" não possui um campo chamado \"%2$s\"."
 msgid "Tag"
 msgstr "Plaqueta"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Destino"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Lista alvo"
 
@@ -13265,130 +13658,133 @@ msgid "Target type"
 msgstr "Tipo do destino"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Template"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "O template \"%1$s\" já existe."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "O template \"%1$s\" no host \"%2$s\" não existe."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr "O template \"%1$s\" com a chave \"%2$s\" já possui vínculo com o host."
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Template adicionado"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "O template não pode ser vinculado a outro template mais de uma vez, mesmo que através de outros templates."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Template removido"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Grupo de templates"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Associação a templates"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Lista de templates"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Nome do template"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr "O template de tela \"%1$s\" já existe."
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Telas do template"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Trigger do template"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Template atualizado"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr "Já existe template com o nome \"%1$s\"."
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Já existe template com o nome \"%s\"."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr "Já existe template com o nome visível \"%1$s\"."
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Já existe template com o nome visível \"%s\"."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Itens no template"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Templates"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Os templates \"%1$s\" foram desvinculados dos hosts \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Testar"
 
@@ -13396,11 +13792,11 @@ msgstr "Testar"
 msgid "Test authentication"
 msgstr "Teste de autenticação"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Confirmação do teste"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Testar dados"
 
@@ -13414,22 +13810,22 @@ msgid "Test string"
 msgstr "Sequência de texto para teste"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Texto"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
-msgstr ""
+msgstr "O método \"%1$s.%2$s\" precisa ser invocado sem o parâmetro <auth>."
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr "A coordenada X do elemento localizado entre X - %1$s  e Y - %2$s na tela \"%3$s\" é muito grande."
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr "A coordenada Y do elemento localizado entre X - %1$s  e Y - %2$s na tela \"%3$s\" é muito grande."
@@ -13437,7 +13833,7 @@ msgstr "A coordenada Y do elemento localizado entre X - %1$s  e Y - %2$s na tela
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "A interface web não consegue se conectar ao banco de dados do Zabbix."
@@ -13452,26 +13848,26 @@ msgstr "A interface web não consegue se conectar ao banco de dados do Zabbix. V
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "O grupo de host não foi mais descoberto e será excluído em %1$s (às %2$s de %3$s)."
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "O host não foi mais descoberto e será excluído em %1$s (às %2$s de %3$s)."
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "A imagem é utilizada no mapeamento de ícones %1$s."
 msgstr[1] "A imagem é utilizada no mapeamento de ícones %1$s."
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] "A imagem é utilizada no mapa %1$s."
 msgstr[1] "A imagem é utilizada nos mapas %1$s."
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "O item não foi mais encontrado e será excluído em %1$s (às %2$s de %3$s)."
@@ -13480,19 +13876,19 @@ msgstr "O item não foi mais encontrado e será excluído em %1$s (às %2$s de %
 msgid "The queue is empty."
 msgstr "A fila está vazia."
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "O JSON recebido não é uma requisição JSON-RPC válida."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "O procedimento remoto solicitado não existe / não está disponível"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr "A aplicação do cenário web pertence à um host diferente do que o do cenário web."
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Tema"
 
@@ -13504,11 +13900,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "Existe \"%1$d\" grupo com acesso interno à interface web."
 msgstr[1] "Existem \"%1$d\" grupos com acesso interno à interface web."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Terceiro"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Este campo é automaticamente preenchido pelo item \"%s\"."
@@ -13517,11 +13913,11 @@ msgstr "Este campo é automaticamente preenchido pelo item \"%s\"."
 msgid "This month"
 msgstr "Este mês"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Esta coluna da tela não está vazia. Excluir ela?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Esta linha da tela não está vazia. Excluir ela?"
 
@@ -13533,27 +13929,27 @@ msgstr "Esta semana"
 msgid "This year"
 msgstr "Este ano"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Qui"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Até"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13562,28 +13958,28 @@ msgstr "Até"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Data"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Hora (ascendente)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Hora (descendente)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr "Horário de um processo Zabbix em particular ou de um grupo de processos (identificado por <type> e <num>) gasto em <state> - retorno em percentual."
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr "Horário do último acesso do proxy. Nome - nome do proxy. Param - último acesso. Formato de hora do UNIX."
 
@@ -13591,54 +13987,54 @@ msgstr "Horário do último acesso do proxy. Nome - nome do proxy. Param - últi
 msgid "Time period"
 msgstr "Intervalo"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Deslocamento de tempo"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Tipo de horário"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr "O timezone do PHP não está configurado (parâmetro de configuração \"date.timezone\")."
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Tempo limite"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Hora"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "A diferença de hora contra o servidor Zabbix é de mais do que T segundos, então N = 1, 0 - outro caso"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "A diferença de hora contra o servidor Zabbix é maior que T segundos, então N NÃO É 1, 0 - outro caso"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr "Horário de carga do sistema."
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Título"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Para"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Para configurar a interface do host selecione somente itens do mesmo tipo"
 
@@ -13646,17 +14042,18 @@ msgstr "Para configurar a interface do host selecione somente itens do mesmo tip
 msgid "Today"
 msgstr "Hoje"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Acima"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Total"
 
@@ -13674,7 +14071,7 @@ msgstr "Tempo total: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "A transação não foi fechada. Abortando..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Erro de transporte."
 
@@ -13691,91 +14088,91 @@ msgstr "Período de retenção das estatísticas (em dias) \"%1$s\"."
 msgid "Trend storage period"
 msgstr "Período de retenção das estatísticas"
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr "Período de retenção das estatísticas (em dias)"
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Estatísticas"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Trigger"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "A trigger \"%1$s\" já existe em \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "A trigger \"%1$s\" depende da trigger \"%2$s\", que não existe."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "A trigger \"%1$s\" foi ignorada - regra de usuário."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "A trigger \"%s\" pertence a templates com vínculos diferentes."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Trigger adicionada"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr "A trigger não pode depender de uma trigger com a qual possua vínculos."
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Comentários"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr "Período de retenção das triggers (em dias)"
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "A trigger foi excluída"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr "Descrição de trigger"
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] "Trigger desativada"
 msgstr[1] "Triggers desativadas"
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Opções de exibição de trigger"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] "Trigger ativada"
@@ -13790,11 +14187,12 @@ msgstr "Período de retenção dos eventos e alertas de triggers"
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr "Período de retenção dos eventos e alertas de triggers (em dias) \"%1$s\"."
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Condição de expressão de trigger"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "A expressão da trigger precisa possuir pelo menos uma referência host:chave."
 
@@ -13802,7 +14200,7 @@ msgstr "A expressão da trigger precisa possuir pelo menos uma referência host:
 msgid "Trigger form"
 msgstr "Formulário de trigger"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "A trigger possui itens do template \"%1$s\" que não é vinculado ao host."
@@ -13815,12 +14213,12 @@ msgstr "A trigger está no estado \"normal\""
 msgid "Trigger in \"unknown\" state"
 msgstr "A trigger está no estado \"não suportado\""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "Existe trigger no template \"%1$s\" que possui dependência com trigger no template \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "A trigger foi adicionada. Aguardando atualização de status para calcula-la."
 
@@ -13832,52 +14230,52 @@ msgstr "Tipo de rótulo de trigger"
 msgid "Trigger name"
 msgstr "Nome da trigger"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Protótipo de trigger"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "O protótipo de trigger \"%1$s\" contêm protótipos de item de múltiplas regras de descoberta."
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
-msgstr ""
+msgstr "O protótipo de trigger \"%1$s\" precisa conter pelo menos um protótipo de item."
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr "Protótipo de trigger adicionado"
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr "Protótipo de trigger excluído"
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] "Protótipo de trigger desativado"
 msgstr[1] "Protótipos de trigger desativados"
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] "Protótipo de trigger ativado"
 msgstr[1] "Protótipos de trigger ativados"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr "Protótipo de trigger atualizado"
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Protótipos de trigger"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr "Protótipos de trigger excluídos"
 
@@ -13885,23 +14283,31 @@ msgstr "Protótipos de trigger excluídos"
 msgid "Trigger prototypes of"
 msgstr "Protótipos de trigger de"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr "Protótipos de trigger atualizados"
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Severidades de trigger"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Severidade da trigger"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr "Status da trigger \"OK\""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr "Status da trigger \"Incidente\""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Trigger atualizada"
 
@@ -13909,40 +14315,41 @@ msgstr "Trigger atualizada"
 msgid "Trigger value"
 msgstr "Valor da trigger"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Triggers"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr "Triggers (e/d)[p/o]"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "As triggers foram excluídas"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Info triggers"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Atualização em grupo de triggers"
 
@@ -13950,78 +14357,78 @@ msgstr "Atualização em grupo de triggers"
 msgid "Triggers overview"
 msgstr "Visão geral triggers"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Estado das triggers"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Top 100 de triggers"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Triggers com severidade"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Truncado"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Tentativa de leitura de propriedade inacessível \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Ter"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Turco (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Dois elementos devem estar selecionados"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Dois itens (\"%1$s\" e \"%2$s\") não podem popular um mesmo campo \"%3$s\" no inventário, isto pode gerar um conflito."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Tipo"
 
@@ -14029,63 +14436,65 @@ msgstr "Tipo"
 msgid "Type (Full details)"
 msgstr "Tipo (visão detalhada)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Tipo (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Tipo (ascedente)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Tipo (descedente)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Tipo do cálculo"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Tipo de informação"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "O tipo de informação deve ser \"Log\" para uma chave de log."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "O tipo da informação deverá ser \"Numérico (real)\" para itens agregados."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Tipos"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "DESCONHECIDO"
 
 # need a context...
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "ATIVA"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (ao sair)"
 
@@ -14101,20 +14510,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr "O nome de URL deve ser único no mapa \"%s\"."
+
+#: include/html.inc.php:112
 msgid "URL parameter cannot be array."
 msgstr "O parâmetro URL não pode ser um array."
 
-#: include/html.inc.php:112
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr "O parâmetro URL está vazio."
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr "Uma URL deve possuir tanto o campo \"nome\" quanto \"url\" no mapa \"%s\"."
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "EUA (160 caracteres)"
 
@@ -14122,15 +14541,11 @@ msgstr "EUA (160 caracteres)"
 msgid "USER PROFILE"
 msgstr "PERFIL DO USUÁRIO"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ucraniano (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Não foi possível selecionar a configuração."
 
@@ -14138,7 +14553,7 @@ msgstr "Não foi possível selecionar a configuração."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "Não é possível enviar arquivos pois a opção \"file_uploads\" está desabilitada."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Não reconhecido"
 
@@ -14151,20 +14566,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Eventos com status INCIDENTE e não reconhecidos"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Somente não reconhecidos"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
-msgstr ""
+msgstr "Indisponível para usuários com %1$s."
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Desbloquear selecionados"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Desbloquear usuários selecionados?"
 
@@ -14173,29 +14588,29 @@ msgstr "Desbloquear usuários selecionados?"
 msgid "Units"
 msgstr "Unidades"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14205,23 +14620,20 @@ msgstr "Desconhecido"
 msgid "Unknown action"
 msgstr "Ação desconhecida"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Algoritmo de cálculo de status de serviço desconhecido"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
-msgstr ""
+msgstr "Erro desconhecido"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Função desconhecida."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item de host desconhecido; não existe este item no host selecionado"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Host desconhecido; não existe este host no sistema"
 
@@ -14233,23 +14645,23 @@ msgstr "Tipo de interface desconhecido."
 msgid "Unknown resource"
 msgstr "Recurso desconhecido"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
-msgstr ""
+msgstr "Passo desconhecido falhou: %1$s"
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Tipo de valor desconhecido"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Desassociar"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Desassociar e limpar"
 
@@ -14257,61 +14669,61 @@ msgstr "Desassociar e limpar"
 msgid "Unlink from template"
 msgstr "Desassociar da template"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Desvincular dos templates"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Aplicação \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Regra de descoberta \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Gráfico \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Protótipo de gráfico \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Protótipo de host \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Protótipo de item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Protótipo de trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Desvinculado: Cenário web \"%1$s\" em \"%2$s\"."
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Som"
 
@@ -14325,32 +14737,43 @@ msgstr "A extensão de arquivo \"%1$s\" não é suportada para importação."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "O formato de arquivo \"%1$s\" não é suportado."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr "O parâmetro \"%1$s\" não é suportado para o protótipo de grupo."
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr "Parâmetro não suportado \"%2$s\" para uma condição de filtro na ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "O parâmetro \"%2$s\" não é suportado para condição de filtro na regra de descoberta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr "O parâmetro \"%2$s\" não é suportado para o protótipo de host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
-msgstr "Parâmetro não suportado \"%2$s\" para o protótipo de host %1$s no inventário do host."
+msgstr "O parâmetro \"%2$s\" não é suportado no protótipo de host %1$s no inventário do host."
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr "O parâmetro \"%2$s\" não é suportado para o filtro da ação \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "O parâmetro \"%2$s\" não é suportado para o filtro na regra de descoberta \"%1$s\"."
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Online"
@@ -14361,34 +14784,34 @@ msgid "Up"
 msgstr "Ligado"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Atualiza"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Atualizar existente"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Intervalo de atualização"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Intervalo atualização (em seg)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Atualizado"
 
@@ -14396,55 +14819,55 @@ msgstr "Atualizado"
 msgid "Updated status of host"
 msgstr "Atualizar status do host"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Atualizado: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Atualizado: Aplicação \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Atualizado: Regra de descoberta \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Atualizado: Protótipo de host \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Atualizado: Item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Atualizado: Protótipo de item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Atualizado: Trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Atualizado: Protótipo de trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Atualizado: Cenário Web \"%1$s\" em \"%2$s\"."
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Enviar"
 
@@ -14452,14 +14875,14 @@ msgstr "Enviar"
 msgid "Upper level maps"
 msgstr "Mapas de nível superior"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Uptime"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr "Tempo em execução em segudos do processo do Zabbix."
 
@@ -14467,10 +14890,10 @@ msgstr "Tempo em execução em segudos do processo do Zabbix."
 msgid "Uptime/Downtime"
 msgstr "Uptime/Downtime"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "URL"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr "Usar requisições em lote"
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14485,84 +14908,88 @@ msgid "Used in actions"
 msgstr "Usado nas ações"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Usuário"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "O usuário \"%s\" deve possuir, no mínimo, um grupo de usuários."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Usuário incluído"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Um usuário não pode mudar seu próprio tipo"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Um usuário não pode se adicionar em um grupo desativado ou em um grupo com acesso à interface web desativado."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Um usuário não pode mudar o seu acesso à GUI."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Usuário não pode alterar seu próprio status"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Um usuário não pode modificar seu próprio status."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Usuário removido"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Grupo de usuários"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr "O grupo \"%1$s\" já existe."
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr "O grupo de usuários \"%1$s\" é o único grupo ao qual o usuário \"%2$s\" pertence."
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "O grupo de usuários \"%1$s\" está configurado para alerta de quedas de banco de dados."
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "O grupo de usuários \"%1$s\" é utilizado pelo script \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "O grupo de usuários \"%s\" já existe."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] "Grupo de usuários desativado"
 msgstr[1] "Grupos de usuários desativados"
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] "Grupo de usuários ativado"
@@ -14579,34 +15006,34 @@ msgstr "Grupo para mensagens de problemas com o banco de dados \"%1$s\"."
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Grupos de usuários"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Um usuário não pode excluir a sí próprio."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Um usuário não pode modificar o seu acesso à GUI ao colocar-se como membro do grupo de usuários \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Um usuário não pode modificar o seu acesso ao sistema ao colocar-se como membro do grupo de usuários \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Nome do usuário"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "O nome de usuário não foi encontrado no BD"
 
@@ -14632,243 +15059,243 @@ msgstr "Período de retenção de dados de sessão de usuários (em dias) \"%1$s
 msgid "User sessions"
 msgstr "Sessões de usuários"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Tipo de usuário"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Usuário atualizado"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Já existe um usuário com o apelido \"%s\"."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Usuário"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Usuários"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Usuários (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Usuários desbloqueados"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr "Estatísticas de cache do VMware. Modos válidos: total, free, pfree, used and pused."
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr "Status do cluster VMware, <url> URL de serviço do VMware, <name> nome do cluster VMware"
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr "Evento de log VMware, <url> - url de serviço do VMware"
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "UUID da BIOS do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Hypervisor VMware que aumentou o uso de memória, <url> - URL de serviço VMware, <uuid> - hostname do hypervisor VMware"
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Nome do cluster do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr "Estatísticas de leitura do datastore do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor, <datastore> - nome do datastore, <mode> - latência"
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr "Estatísticas de gravação do armazenamento de dados do hypervisor VMware, <url> URL de serviço do VMware, <uuid> - hostname do hypervisor VMware, <datastore> - nome do datastore, <mode> - latência"
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Modelo do hypervisor VMware, <url> URL de serviço do VMware, <uuid> - hostname do hypervisor VMware"
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Nome do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr "Estatísticas de entrada de rede do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor, <mode> - bps"
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr "Estatísticas de saída de rede do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor, <mode> - bps"
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Frequência do processador do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Modelo do processador do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Utilização do processador do hypervisor VMware em Hz, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Status do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Total de memória do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Tempo desde o ultimo boot do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Total de memória utilizada no hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Fornecedor do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Versão do hypervisor VMware, <url> - url de serviço do VMware, <uuid> - hostname do hypervisor"
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr "Nome completo do serviço do hypervisor VMware, <url> - url de serviço do VMware"
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr "Versão do serviço do VMware, <url> - url de serviço do VMware"
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Máquina virtual VMware que aumentou o uso de memória, <url> - URL de serviço VMware, <uuid> - hostname do máquina virtual"
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Espaço de armazenamento comprometido com a máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Tamanho comprimido da memória comprometida com a máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr "Estatísticas de leitura de disco da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual, <instance> - Instância de disco, <mode> - bps/ops - bytes/operations per second"
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr "Estatísticas de gravação de disco da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual, <instance> - Instância de disco, <mode> - bps/ops - bytes/operations per second"
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr "Estatísticas do sistema de arquivos da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual, <fsname> - Nome do sistema de arquivos, <mode> - total/free/used/pfree/pused"
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Memória utilizada pelo agente de monitoração VMware na máquina virtual, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Utilização de memória pela máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Nome do hypervisor da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Nome da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr "Estatísticas de entrada de rede da interface na máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual, <instance> - interface de rede, <mode> - bps/pps - bytes/pacotes por segundo"
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr "Estatísticas de saída de rede da interface na máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual, <instance> - interface de rede, <mode> - bps/pps - bytes/pacotes por segundo"
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Estado de carga da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Tamanho da memória privada da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Utilização de processador pela máquina virtual VMware em Hz, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Tamanho da memória compartilhada da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Tamanho da memória da máquina virtual VMware que está em swap, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Tamanho total da memória da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Espaço de armazenamento alocado mas não utilizado pela máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Espaço de armazenamento não compartilhado pela máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname da máquina virtual"
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Tempo de carga da máquina virtual VMware, <url> - URL de serviço VMware, <uuid> - hostname do VMware"
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Valor"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_align\". As opções são: \"%2$s\" e \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_show\". As opções são: \"%2$s\" e \"%3$s\"."
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_show\". As opções são: \"%2$s\"."
@@ -14886,28 +15313,28 @@ msgstr "O valor \"%1$s\" é muito grande para o campo \"%2$s\" - %3$d caracteres
 #: include/validate.inc.php:326 include/validate.inc.php:350
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has incorrect decimal format."
-msgstr ""
+msgstr "O valor \"%2$s\" de \"%1$s\" possui formato decimal incorreto."
 
 #: include/validate.inc.php:336 include/validate.inc.php:352
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits after the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "O valor \"%2$s\" de \"%1$s\" possui muitos dígitos depois do ponto decimal: não é possível ter mais que %3$s dígitos."
 
 #: include/validate.inc.php:332
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits before the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "O valor \"%2$s\" de \"%1$s\" possui muitos dígitos antes do ponto decimal: não é possível ter mais que %3$s dígitos."
 
 #: include/validate.inc.php:328
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
-msgstr ""
+msgstr "O valor \"%2$s\" de \"%1$s\" é muito grande: não é possível ter mais que %3$s dígitos antes do ponto decimal, nem mais de %4$s após."
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr "Efetividade do cache de valores. Parâmetros válidos: requests, hits e misses."
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr "Estatísticas do cache de valores. Modos válidos: total, free, pfree, used e pused."
 
@@ -14953,10 +15380,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Não existe mapeamento de valor com o valuemapid \"%1$s\"."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Mapeamento de valor"
 
@@ -14965,7 +15392,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "Um mapeamento de valores deve possuir, no mínimo, um mapeamento."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr "Valor de qualquer contador de performance, onde \"counter\" é o parâmetro que contêm o caminho e \"interval\" é o parâmetro com a intervalo de segundos que o agente deverá retornar com a média."
 
@@ -14977,8 +15404,8 @@ msgstr "Valor: sem dados"
 msgid "Values"
 msgstr "Valores"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Variáveis"
 
@@ -14991,64 +15418,69 @@ msgid "Verbose"
 msgstr "Detalhado"
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr "Versão do agente zabbix (zabbix_agent ou zabbix_agentd) sendo executado no host. Valor textual. Exemplo de valor retornado: 1.1"
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Alinhamento vertical"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr "Vietnamita (vi_VN)"
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "A visão não foi apresentada."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr "Estatísticas de memória virtual."
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Nome visível"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "O nome visível não pode ser vazio se o nome do host não for informado."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Atenção"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr "Aviso"
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Desculpe, mas o número máximo de elementos a recordar foi atingido."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15056,65 +15488,83 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitoramento web"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr "Já existe o cenário web \"%1$s\" no host \"%2$s\"."
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "O cenário web \"%1$s\" já existe."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Cenário web excluído"
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Cenário web desativado"
 msgstr[1] "Cenários web desativados"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Cenário web ativado"
 msgstr[1] "Cenários web ativados"
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr "Parâmetros faltando para o cenário web: %1$s"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr "Um cenário web deve possuir, no mínimo, um passo."
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr "O nome do cenário web não pode ser vazio."
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr "O passo \"%1$s\" já existe no cenário web."
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr "A URL do passo no cenário web não pode ser vazia."
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr "O nome do passo no cenário web não pode ficar vazio."
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr "O nome do cenário web só pode conter caracteres imprimíveis."
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr "O número de um cenário web não pode ser menor do que 1."
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Cenários web"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Qua"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -15122,9 +15572,9 @@ msgstr "Quarta-feira"
 msgid "Week"
 msgstr "Semana"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Semanal"
 
@@ -15132,12 +15582,12 @@ msgstr "Semanal"
 msgid "When active"
 msgstr "Quando ativo"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Largura"
@@ -15147,28 +15597,28 @@ msgstr "Largura"
 msgid "With data collection"
 msgstr "Com coleta de dados"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Com últimos eventos não reconhecidos"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Com problemas"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Com triggers"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Com eventos não reconhecidos"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Sem problemas"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Sem triggers"
 
@@ -15177,7 +15627,7 @@ msgid "Wizard"
 msgstr "Assistente"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15190,278 +15640,272 @@ msgstr "Horário comercial"
 msgid "Working time \"%1$s\"."
 msgstr "Horário de trabalho \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Escrita"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Campos errados para a dependência do serviço \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Campos errados para o elemento."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Campos errado para o host \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr "Campos errados para a imagem \"%1$s\"."
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr "Campos errados para uma imagem."
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr "Campos errados para exclusão do vínculo de trigger."
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr "Campos errados para a atualização de vínculo de trigger."
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr "Campos errados para vínculo de trigger."
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Campos errados para a macro \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr "Campos errados para o link no mapa."
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Campos errados para o tipo de mídia."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr "Campos errados para o proxy \"%1$s\"."
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Campos errados para o script."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Campos errados para o serviço \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Campos errados para o horário do serviço \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Campos errados para a trigger."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Campos incorretos para o usuário \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Macro errada \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Rótulo X"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "O arquivo XML contêm o erro %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "Arquivo XML contêm erros"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "O arquivo XML contêm um erro fatal %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "O arquivo XML contêm o alerta %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "A"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Valor MÁXIMO no eixo Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "O valor MÁXIMO do eixo Y deve ser superior ao valor configurado para o MÍNIMO."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Valor MÍNIMO no eixo Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Lado do eixo Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Rótulo Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "d-m-Y H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "d.M.Y H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "d.m.Y"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr "d/m/Y"
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "d.m.Y H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr "d/m/Y H:i"
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "d.m.Y H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "d-m-Y H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Ano"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Anual"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Sim"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Não é possível selecionar alguns idiomas, o suporte aos idiomas adicionais necessita da instalação do pacote \"locale\" em seu servidor web."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Você não tem permissão para alterar os privilégios para o usuário \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Você não está logado."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Você não pode modificar os hosts atualmente selecionados."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Você não especificou um host para operação."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Você não especificou um grupo de host para operação."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Você não especificou um alvo para a ação de operação do comando \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Você não especificou o alvo da operação do script global \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "Você não tem permissão para executar esta operação."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Você não tem permissão para criar usuários."
 
 # Você estava escrito incorreto (Voucê) e permissões estava sem acento
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Você não tem permissão para alterar outros usuários."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Você não tem permissão para atualizar o usuário ou o usuário não existe."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr "Você não possui permissão para acessar esta página."
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Você deve logar para ver esta página."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr "Você está conectado como"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15474,7 +15918,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15493,8 +15937,8 @@ msgid "Zabbix User"
 msgstr "Usuário Zabbix"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15520,10 +15964,11 @@ msgstr "Zabbix interno"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix autenticação interna"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Servidor Zabbix"
@@ -15539,7 +15984,7 @@ msgstr ""
 "1. Configuração incorreta do IP/DNS no arquivo \"zabbix.conf.php\";\n"
 "2. Configuração incorreta de rede.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "Zabbix Server IP ou porta não estão definidas!"
 
@@ -15547,15 +15992,15 @@ msgstr "Zabbix Server IP ou porta não estão definidas!"
 msgid "Zabbix server activity check interval"
 msgstr "Intervalo de verificação de atividade do servidor Zabbix"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Informação do servidor Zabbix"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "O servidor Zabbix não está rodando: a informação apresentada pode não ser atual."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix está rodando"
 
@@ -15564,11 +16009,11 @@ msgstr "Zabbix está rodando"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "A verificação de execução do servidor Zabbix está sendo executada com o intervalo \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Nome do servidor Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Porta do servidor Zabbix"
 
@@ -15576,25 +16021,20 @@ msgstr "Porta do servidor Zabbix"
 msgid "Zabbix trapper"
 msgstr "Zabbix trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zoom"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Valor errado para o dia: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Valor errado para o mês: \"%s\" ]"
@@ -15603,19 +16043,19 @@ msgstr "[Valor errado para o mês: \"%s\" ]"
 msgid "agent"
 msgstr "agente"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "todos"
 
@@ -15623,19 +16063,15 @@ msgstr "todos"
 msgid "all media"
 msgstr "todas as mídias"
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "já existe"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "em Azul"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "em Verde"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "em Vermelho"
 
@@ -15647,83 +16083,49 @@ msgstr "auto-registro"
 msgid "auto-registered host"
 msgstr "host auto-registrado"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "méd"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
-msgstr ""
+msgstr "verifique a expressão a partir de \"%1$s\""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d/M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d/m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d/m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.a"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "dias"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15745,19 +16147,15 @@ msgstr "serviço descoberto"
 msgid "discovery"
 msgstr "descoberta"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dinâmico"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elementos"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "copiar elementos para ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from e esc_step_to devem ser definidos em conjunto."
 
@@ -15769,47 +16167,49 @@ msgstr "exatamente"
 msgid "executed"
 msgstr "executado"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
-msgstr ""
+msgstr "a expressão está vazia"
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "corrigido"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "encontrados"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "configurações globais de limpeza de dados"
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "grupo de hosts"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "ícone"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "imagem"
 
@@ -15817,7 +16217,7 @@ msgstr "imagem"
 msgid "in"
 msgstr "em"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "sintaxe incorreta próximo de \"%1$s\""
@@ -15829,7 +16229,7 @@ msgid "internal"
 msgstr "interno"
 
 # realy need a context...
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "é"
 
@@ -15837,20 +16237,20 @@ msgstr "é"
 msgid "item"
 msgstr "item"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr "a chave está vazia"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "último"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "como"
@@ -15859,12 +16259,12 @@ msgstr "como"
 msgid "low-level discovery rule"
 msgstr "regra de auto-descoberta (LLD)"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15873,46 +16273,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "macro(s)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "manutenção"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "mapa"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
-msgstr ""
+msgstr "correspondências"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "máx"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "mín"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "mínimo de 60 segundos"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15921,17 +16321,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "necessário um usuário LDAP válido"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr "novo"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
-msgstr ""
+msgstr "novo"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "não há dados"
@@ -15944,12 +16344,14 @@ msgstr "não em"
 msgid "not like"
 msgstr "diferente"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "parado"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "não selecionado"
 
@@ -15958,84 +16360,87 @@ msgstr "não selecionado"
 msgid "not sent"
 msgstr "não enviado"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "agora"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "de"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr "off"
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "em"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "outro"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "atualizado a cada"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr "atualizado a cada %1$s segundo."
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
-msgstr ""
+msgstr "expressão regular"
 
 #: include/views/administration.general.gui.edit.php:35
 msgid "remember selected"
 msgstr "lembrar selecionado"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "raiz"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "rodando"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "seg"
 
@@ -16048,7 +16453,7 @@ msgstr "segundos"
 msgid "sent"
 msgstr "enviado"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "descrição curta"
 
@@ -16056,36 +16461,36 @@ msgstr "descrição curta"
 msgid "show icon mappings"
 msgstr "mostrar mapeamento de ícones"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "mostrar mapeamento de valores"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "template ID \"%1$s\" foi definido %2$s vezes"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "para"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "trigger"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr "informe aqui o argumento para pesquisa"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr "final inesperado da chave"
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -16098,11 +16503,11 @@ msgstr "valor"
 msgid "via"
 msgstr "via"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyyy"
diff --git a/frontends/php/locale/pt_PT/LC_MESSAGES/frontend.po b/frontends/php/locale/pt_PT/LC_MESSAGES/frontend.po
index 1ffce08f49a..d43a5eaaef2 100644
--- a/frontends/php/locale/pt_PT/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/pt_PT/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-10-10 08:35+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -14,29 +14,31 @@ msgstr ""
 "X-Generator: Pootle 2.5.0\n"
 "X-POOTLE-MTIME: 1381386929.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" deve estar entre 1970.01.01 e 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Mostrar triggers OK\" precisa de ser \"0\" ou um inteiro positivo."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
-msgstr "\"Os triggers piscam ao mudar de estado\" precisa de ser \"0\" ou um inteiro positivo.\"Os triggers piscam ao mudar de estado\" precisa de ser \"0\" ou um inteiro positivo.\"Os triggers piscam ao mudar de estado\" precisa de ser \"0\" ou um inteiro positivo.\"Os triggers piscam ao mudar de estado\" precisa de ser \"0\" ou um inteiro positivo.\"Os triggers piscam ao mudar de estado\" precisa de ser \"0\" ou um inteiro positivo."
+msgstr "\"Os triggers piscam ao mudar de estado\" precisa de ser \"0\" ou um inteiro positivo."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -48,24 +50,22 @@ msgstr[1] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (ano %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s Item"
 msgstr[1] "%1$s Itens"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -80,7 +80,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -101,23 +101,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d dispositivo"
 msgstr[1] "%d dispositivos"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - infinitamente)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(em dias)"
 
@@ -125,34 +125,34 @@ msgstr "(em dias)"
 msgid "(in sec)"
 msgstr "(em seg)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(mínimo 60 segundos, 0 - utilizar a acção padrão)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(sem proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[RECONHECIMENTO EM MASSA]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 ou 1"
 
@@ -168,7 +168,7 @@ msgstr "10 segundos"
 msgid "30 seconds"
 msgstr "30 segundos"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "Vista 3D"
 
@@ -184,7 +184,7 @@ msgstr "5 segundos"
 msgid "500 latest values"
 msgstr "últimos 500 valores"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -203,12 +203,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "RECONHECIMENTO DE ALARMES"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "E"
 
@@ -220,19 +219,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "RELATÓRIO DE DISPONIBILIDADE"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "A diferença absoluta entre o último valor e o anterior é < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "A diferença absoluta entre o último valor e o anterior é = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "A diferença absoluta entre o último valor e o anterior é > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "A diferença absoluta entre o último valor e o anterior é != N"
 
@@ -244,42 +243,42 @@ msgstr "SLA aceitável"
 msgid "Access denied!"
 msgstr "Acesso negado!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "A conta está bloqueada durante %s segundos"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Reconhecido"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Reconhecer"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Adicionado reconhecimento"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Alarme reconhecido por"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Reconhecer e voltar"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Estado do reconhecimento"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Reconhecido"
 
@@ -304,62 +303,65 @@ msgstr "Reconhecimento desactivado"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Acção"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
-msgstr "Acção \"%1$s\" tem um valor incorrecto para \"esc_period\" (mínimo %2$s segundos).Acção \"%1$s\" tem um valor incorrecto para \"esc_period\" (mínimo %2$s segundos).Acção \"%1$s\" tem um valor incorrecto para \"esc_period\" (mínimo %2$s segundos).Acção \"%1$s\" tem um valor incorrecto para \"esc_period\" (mínimo %2$s segundos).Acção \"%1$s\" tem um valor incorrecto para \"esc_period\" (mínimo %2$s segundos)."
+msgstr "Acção \"%1$s\" tem um valor incorrecto para \"esc_period\" (mínimo %2$s segundos)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Acção adicionada"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Acção eliminada"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -372,21 +374,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Operações da acção"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Acção actualizada"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Acções"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Activo"
@@ -396,80 +398,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Activo"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Activo desde"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Activo até"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Adicionar"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Comentário adicionado por"
 
@@ -485,27 +490,23 @@ msgstr "Adicionar host"
 msgid "Add link"
 msgstr "Adicionar link"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Adicionar em falta"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Adicionar protótipo"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Adicionar a"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Adicionar aos favoritos"
@@ -514,7 +515,7 @@ msgstr "Adicionar aos favoritos"
 msgid "Add to host group"
 msgstr "Adicionar ao grupo de hosts"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Adicionar aos grupos de hosts"
 
@@ -526,7 +527,7 @@ msgstr "Adicionado"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administração"
 
@@ -534,34 +535,34 @@ msgstr "Administração"
 msgid "Advanced labels"
 msgstr "Etiquetas avançadas"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Idade"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Idade menor que"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Idade menor que %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agente"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Interfaces do agente"
@@ -570,12 +571,12 @@ msgstr "Interfaces do agente"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agente ou SNMP ou JMX ou interface IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -583,123 +584,126 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Alinhar ícones"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Tudo"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Todos os grupos"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos os links devem ter \"Nome\" e \"URL\" definidos"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Hosts permitidos"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Qualquer"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Qualquer sequência de caracteres incluídos"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Aplicação"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Aplicação \"%1$s\" já existe."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Aplicação adicionada"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Aplicação eliminada"
 msgstr[1] "Aplicação eliminada"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Erro na aplicação."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Aplicação actualizada"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Aplicação com ID \"%1$s\" não está disponível no \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Aplicações"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -708,16 +712,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Aproximando"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Abr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Abril"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Tem certeza que deseja realizar esta acção?"
 
@@ -733,9 +737,9 @@ msgstr "Tamanho da área"
 msgid "Area type"
 msgstr "Tipo de área"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -749,52 +753,49 @@ msgstr "Como texto simples"
 msgid "Asset tag"
 msgstr "Etiqueta do activo"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "Às (horas:minutos)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Tem de seleccionar pelo menos um host ou grupo."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Tem de ser criado pelo menos um período de manutenção."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Auditoria"
@@ -814,26 +815,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Ago"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Agosto"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Algoritmo de autenticação"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -892,9 +895,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automático"
 
@@ -902,20 +905,20 @@ msgstr "Automático"
 msgid "Automatic icon mapping"
 msgstr "Mapeamento automático de icones"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Selecção automática de ícones"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Disponibilidade"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Relatório de disponibilidade"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Disponível"
 
@@ -924,36 +927,36 @@ msgstr "Disponível"
 msgid "Average"
 msgstr "Média"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Média por"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "O valor médio do período T é < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "O valor médio do período T é = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "O valor médio do período T é > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "O valor médio do período T é != N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Eixo horizontal"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Fundo"
@@ -962,7 +965,7 @@ msgstr "Fundo"
 msgid "Background image"
 msgstr "Imagem de fundo"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Gráficos de barras"
 
@@ -972,8 +975,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Autenticação básica"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -985,15 +988,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind password"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Preto e Azul"
 
@@ -1005,8 +1008,8 @@ msgstr "A piscar"
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Linha em negrito"
 
@@ -1014,22 +1017,22 @@ msgstr "Linha em negrito"
 msgid "Boolean"
 msgstr "Booleano"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Abaixo"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Aclarar"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Búlgaro (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Reconhecimento em massa"
 
@@ -1055,7 +1058,7 @@ msgstr "CONFIGURAÇÃO DE APLICAÇÕES"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURAÇÃO DE AUTENTICAÇÃO"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1085,7 +1088,7 @@ msgstr "CONFIGURAÇÃO DE GRUPOS DE HOSTS"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURAÇÃO DE HOSTS"
 
@@ -1097,7 +1100,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURAÇÃO DE MAPEAMENTO DE ÍCONES"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURAÇÃO DE IMAGENS"
 
@@ -1106,14 +1109,14 @@ msgstr "CONFIGURAÇÃO DE IMAGENS"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURAÇÃO DE SERVIÇOS IT"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURAÇÃO DE PROTÓTIPOS DE ITENS"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURAÇÃO DE ITENS"
 
@@ -1142,7 +1145,7 @@ msgstr "CONFIGURAÇÃO DE MAPAS DE REDE"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURAÇÃO DE PROXIES"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURAÇÃO DE EXPRESSÕES REGULARES"
 
@@ -1162,7 +1165,7 @@ msgstr "CONFIGURAÇÃO DE SCRIPTS"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURAÇÃO DE SLIDESHOWS"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURAÇÃO DE TEMPLATES"
 
@@ -1178,7 +1181,7 @@ msgstr "CONFIGURAÇÃO DE SEVERIDADES DE TRIGGERS"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURAÇÃO DE TRIGGERS"
 
@@ -1210,22 +1213,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURAÇÃO DO ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1234,21 +1237,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Calcular SLA, SLA aceitável (em %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Calculado"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Permissões calculadas"
 
@@ -1256,92 +1259,95 @@ msgstr "Permissões calculadas"
 msgid "Callback"
 msgstr "Callback"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canadá (136 caracteres)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Não foi possível reconhecer evento"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Não foi possível adicionar acção"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Não foi possível adicionar aplicação"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Não foi possível adicionar dependência de um host para um template."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
-msgstr "Não foi possível adicionar dependência no trigger \"%1$s:%2$s\" para um trigger inexistente \"%3$s:%4$s\".Não foi possível adicionar dependência no trigger \"%1$s:%2$s\" para um trigger inexistente \"%3$s:%4$s\".Não foi possível adicionar dependência no trigger \"%1$s:%2$s\" para um trigger inexistente \"%3$s:%4$s\".Não foi possível adicionar dependência no trigger \"%1$s:%2$s\" para um trigger inexistente \"%3$s:%4$s\".Não foi possível adicionar dependência no trigger \"%1$s:%2$s\" para um trigger inexistente \"%3$s:%4$s\"."
+msgstr "Não foi possível adicionar dependência no trigger \"%1$s:%2$s\" para um trigger inexistente \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Não foi possível adicionar regra de descoberta"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Não foi possível adicionar gráfico"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Não foi possível adicionar grupo"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Não foi possível adicionar host"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1349,24 +1355,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Não foi possível adicionar imagem"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Não foi possível adicionar imagem."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Não foi possível adicionar item"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1374,20 +1380,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr "Não foi possível adicionar macro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Não foi possível adicionar período de manutenção"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Não foi possível adicionar tipo de média"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
-msgstr "Não é possível adicionar mais de um item do tipo \"Graph sum\" no gráfico \"%1$s\".Não é possível adicionar mais de um item do tipo \"Graph sum\" no gráfico \"%1$s\".Não é possível adicionar mais de um item do tipo \"Graph sum\" no gráfico \"%1$s\".Não é possível adicionar mais de um item do tipo \"Graph sum\" no gráfico \"%1$s\".Não é possível adicionar mais de um item do tipo \"Graph sum\" no gráfico \"%1$s\"."
+msgstr "Não é possível adicionar mais de um item do tipo \"Graph sum\" no gráfico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1396,24 +1402,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Não foi possível adicionar mapa de rede"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Não foi possível adicionar proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Não foi possível adicionar expressão regular"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Não foi possível adicionar ecrã"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Não foi possível adicionar script"
 
@@ -1425,27 +1431,27 @@ msgstr "Não foi possível adicionar serviço"
 msgid "Cannot add slide show"
 msgstr "Não foi possível adicionar slideshow"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Não foi possível adicionar template"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Não foi possível adicionar trigger"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Não foi possível adicionar utilizador"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Não foi possível adicionar utilizador. As palavras-passe não coincidem."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Não foi possível adicionar utilizadores."
 
@@ -1453,7 +1459,7 @@ msgstr "Não foi possível adicionar utilizadores."
 msgid "Cannot add value map"
 msgstr "Não foi possível adicionar mapeamento de valor"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1473,44 +1479,44 @@ msgstr "Não foi possível alterar o método de autenticação para LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Não foi possível alterar o método de autenticação para Zabbix interno"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Não foi possível limpar o histórico"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Não foi possível clonar protótipos do gráfico."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Não foi possível clonar protótipos do item."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Não foi possível clonar protótipos do trigger."
 
 #: scripts_exec.php:70
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
-msgstr "Não foi possível ligar ao porto de trapper do daemon do servidor zabbix, mas deve estar disponível para executar o script.Não foi possível ligar ao porto de trapper do daemon do servidor zabbix, mas deve estar disponível para executar o script.Não foi possível ligar ao porto de trapper do daemon do servidor zabbix, mas deve estar disponível para executar o script.Não foi possível ligar ao porto de trapper do daemon do servidor zabbix, mas deve estar disponível para executar o script.Não foi possível ligar ao porto de trapper do daemon do servidor zabbix, mas deve estar disponível para executar o script."
+msgstr "Não foi possível ligar ao porto de trapper do daemon do servidor zabbix, mas deve estar disponível para executar o script."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Não foi possível copiar gráficos"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Não foi possível copiar itens"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
-msgstr "Não foi possível copiar trigger \"%1$s:%2$s\", porque tem vários hosts na expressão.Não foi possível copiar trigger \"%1$s:%2$s\", porque tem vários hosts na expressão.Não foi possível copiar trigger \"%1$s:%2$s\", porque tem vários hosts na expressão.Não foi possível copiar trigger \"%1$s:%2$s\", porque tem vários hosts na expressão.Não foi possível copiar trigger \"%1$s:%2$s\", porque tem vários hosts na expressão."
+msgstr "Não foi possível copiar trigger \"%1$s:%2$s\", porque tem vários hosts na expressão."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1519,19 +1525,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "Não foi possível criar outra ligação à base de dados."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Não é possível criar uma dependência circular."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Não é possível criar uma dependência de um trigger com ele mesmo."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Não foi possível criar regra de descoberta"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Não foi possível criar o grupo de hosts."
 
@@ -1539,102 +1545,102 @@ msgstr "Não foi possível criar o grupo de hosts."
 msgid "Cannot create icon map"
 msgstr "Não foi possível criar o mapa de ícones"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Não é possível criar mapa de ícones com nome idêntico \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Não foi possível criar o mapa \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Não foi possivel criar novo elemento"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Não foi possível criar ecrã."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
-msgstr "Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tente desactivar esse utilizador.Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tente desactivar esse utilizador.Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tente desactivar esse utilizador.Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tente desactivar esse utilizador.Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tente desactivar esse utilizador."
+msgstr "Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tente desactivar esse utilizador."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Não foi possível eliminar acção"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Não foi possível eliminar aplicação"
 msgstr[1] "Não foi possível eliminar aplicação"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Não foi possível eliminar dependência"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Não foi possível eliminar regra de descoberta"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Não foi possível eliminar regras de descoberta"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Não foi possível eliminar gráfico"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Não foi possível eliminar protótipo de gráfico"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Não foi possível eliminar gráfico."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Não foi possível eliminar gráficos"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
-msgstr "Não é possível eliminar gráficos criados pela descoberta de baixo nível (LLD).Não é possível eliminar gráficos criados pela descoberta de baixo nível (LLD).Não é possível eliminar gráficos criados pela descoberta de baixo nível (LLD).Não é possível eliminar gráficos criados pela descoberta de baixo nível (LLD).Não é possível eliminar gráficos criados pela descoberta de baixo nível (LLD)."
+msgstr "Não é possível eliminar gráficos criados pela descoberta de baixo nível (LLD)."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Não foi possível eliminar grupo"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Não foi possível eliminar grupo"
+msgstr[1] "Não foi possível eliminar grupo"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Não foi possível eliminar host"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Não foi possível eliminar grupo de hosts."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1642,79 +1648,79 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "Não foi possível eliminar mapa de ícones"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Não foi possível eliminar imagem"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Não foi possível eliminar inventário."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Não foi possível eliminar item"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Não foi possível eliminar itens"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
-msgstr "Não é possível eliminar itens criados pela descoberta de baixo nível (LLD).Não é possível eliminar itens criados pela descoberta de baixo nível (LLD).Não é possível eliminar itens criados pela descoberta de baixo nível (LLD).Não é possível eliminar itens criados pela descoberta de baixo nível (LLD).Não é possível eliminar itens criados pela descoberta de baixo nível (LLD)."
+msgstr "Não é possível eliminar itens criados pela descoberta de baixo nível (LLD)."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Não foi possível eliminar período de manutenção"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Não foi possível eliminar tipo de média"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Não foi possível eliminar mapa de rede"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Não foi possível eliminar proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Não foi possível eliminar expressão regular"
 msgstr[1] "Não foi possível eliminar expressões regulares"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Não foi possível eliminar ecrã"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Não foi possível eliminar script"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
-msgstr "Não foi possível eliminar scripts. Parâmetro de entrada \"scriptids\" vazio.Não foi possível eliminar scripts. Parâmetro de entrada \"scriptids\" vazio.Não foi possível eliminar scripts. Parâmetro de entrada \"scriptids\" vazio.Não foi possível eliminar scripts. Parâmetro de entrada \"scriptids\" vazio.Não foi possível eliminar scripts. Parâmetro de entrada \"scriptids\" vazio."
+msgstr "Não foi possível eliminar scripts. Parâmetro de entrada \"scriptids\" vazio."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
-msgstr "Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\".Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\".Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\".Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\".Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\"."
+msgstr "Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Não foi possível eliminar as acções seleccionadas"
 
@@ -1722,77 +1728,80 @@ msgstr "Não foi possível eliminar as acções seleccionadas"
 msgid "Cannot delete service"
 msgstr "Não foi possível eliminar serviço"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Não foi possível eliminar slideshow"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Não foi possível eliminar template"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Não foi possível eliminar gráficos do template."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Não foi possível eliminar item do template."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Não foi possível eliminar itens do template"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Não foi possível eliminar itens do template."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Não foi possível eliminar trigger \"%1$s:%2$s\" do template."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Não foi possível eliminar trigger"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Não foi possível eliminar protótipo de trigger"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Não foi possível eliminar trigger."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Não foi possível eliminar triggers"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
-msgstr "Não é possível eliminar triggers criados pela descoberta de baixo nível (LLD).Não é possível eliminar triggers criados pela descoberta de baixo nível (LLD).Não é possível eliminar triggers criados pela descoberta de baixo nível (LLD).Não é possível eliminar triggers criados pela descoberta de baixo nível (LLD).Não é possível eliminar triggers criados pela descoberta de baixo nível (LLD)."
+msgstr "Não é possível eliminar triggers criados pela descoberta de baixo nível (LLD)."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Não foi possível eliminar o utilizador"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Não foi possível eliminar média do utilizador."
 
@@ -1800,78 +1809,78 @@ msgstr "Não foi possível eliminar média do utilizador."
 msgid "Cannot delete value map"
 msgstr "Não foi possível eliminar mapeamento de valores"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Não foi possível desactivar tipo de média"
 msgstr[1] "Não foi possível desactivar tipo de média"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1885,135 +1894,129 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Não foi possível activar tipo de média"
 msgstr[1] "Não foi possível activar tipo de média"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
-msgstr "Não foi possível encontrar imagem de fundo \"%1$s\" utilizada no mapa \"%2$s\".Não foi possível encontrar imagem de fundo \"%1$s\" utilizada no mapa \"%2$s\".Não foi possível encontrar imagem de fundo \"%1$s\" utilizada no mapa \"%2$s\".Não foi possível encontrar imagem de fundo \"%1$s\" utilizada no mapa \"%2$s\".Não foi possível encontrar imagem de fundo \"%1$s\" utilizada no mapa \"%2$s\"."
+msgstr "Não foi possível encontrar imagem de fundo \"%1$s\" utilizada no mapa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi possível encontrar gráfico \"%1$s\" utilizado no ecrã \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi possível encontrar grupo \"%1$s\" utilizado no mapa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi possível encontrar grupo \"%1$s\" utilizado no ecrã \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi possível encontrar host \"%1$s\" utilizado no mapa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi possível encontrar host \"%1$s\" utilizado no ecrã \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
-msgstr "Não foi possível encontrar interface do host em \"%1$s\" para a chave do item \"%2$s\".Não foi possível encontrar interface do host em \"%1$s\" para a chave do item \"%2$s\".Não foi possível encontrar interface do host em \"%1$s\" para a chave do item \"%2$s\".Não foi possível encontrar interface do host em \"%1$s\" para a chave do item \"%2$s\".Não foi possível encontrar interface do host em \"%1$s\" para a chave do item \"%2$s\"."
-
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
+msgstr "Não foi possível encontrar interface do host em \"%1$s\" para a chave do item \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2022,98 +2025,119 @@ msgstr "Não foi possível encontrar ícone \"%1$s\" utilizado no mapa \"%2$s\".
 #: include/classes/import/importers/CMapImporter.php:180
 #, c-format
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
-msgstr "Não foi possível encontrar o mapeamento de ícones \"%1$s\" utilizado no mapa \"%2$s\".Não foi possível encontrar o mapeamento de ícones \"%1$s\" utilizado no mapa \"%2$s\".Não foi possível encontrar o mapeamento de ícones \"%1$s\" utilizado no mapa \"%2$s\".Não foi possível encontrar o mapeamento de ícones \"%1$s\" utilizado no mapa \"%2$s\".Não foi possível encontrar o mapeamento de ícones \"%1$s\" utilizado no mapa \"%2$s\"."
+msgstr "Não foi possível encontrar o mapeamento de ícones \"%1$s\" utilizado no mapa \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi possível encontrar item \"%1$s\" utilizado no ecrã \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
-msgstr "Não foi possível encontrar mapa \"%1$s\" utilizado no mapa exportado \"%2$s\".Não foi possível encontrar mapa \"%1$s\" utilizado no mapa exportado \"%2$s\".Não foi possível encontrar mapa \"%1$s\" utilizado no mapa exportado \"%2$s\".Não foi possível encontrar mapa \"%1$s\" utilizado no mapa exportado \"%2$s\".Não foi possível encontrar mapa \"%1$s\" utilizado no mapa exportado \"%2$s\"."
+msgstr "Não foi possível encontrar mapa \"%1$s\" utilizado no mapa exportado \"%2$s\"."
 
 #: include/classes/import/importers/CMapImporter.php:201
 #, c-format
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi possível encontrar mapa \"%1$s\" utilizado no mapa \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi possível encontrar mapa \"%1$s\" utilizado no ecrã \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Não foi possível encontrar objectos com nome"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Não foi possível encontrar ecrã \"%1$s\" utilizado no ecrã \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Não foi possível encontrar trigger \"%1$s\" utilizado no mapa \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
 #: srv_status.php:169
 msgid "Cannot format Tree. Check logic structure in service links."
-msgstr "Não foi possível formatar a estrutura em árvore. Verifique a estrutura lógica nos links de serviço.Não foi possível formatar a estrutura em árvore. Verifique a estrutura lógica nos links de serviço.Não foi possível formatar a estrutura em árvore. Verifique a estrutura lógica nos links de serviço.Não foi possível formatar a estrutura em árvore. Verifique a estrutura lógica nos links de serviço.Não foi possível formatar a estrutura em árvore. Verifique a estrutura lógica nos links de serviço."
+msgstr "Não foi possível formatar a estrutura em árvore. Verifique a estrutura lógica nos links de serviço."
 
 #: services.php:472
 msgid "Cannot format tree."
 msgstr "Não foi possível formatar a estrutura em árvore."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Não foi possível agrupar a expressão \"%s\"."
@@ -2125,59 +2149,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Não foi possível incluir o ficheiro de visualização \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Não foi possível inserir média do utilizador."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Não foi possível associar template"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Não foi possível terminar sessão."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Não foi possível actualizar em massa o nome do host."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Não foi possível actualizar em massa o nome visível do host."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Não é possível passar IDs de template duplicados para o link: %s."
@@ -2185,19 +2210,19 @@ msgstr "Não é possível passar IDs de template duplicados para o link: %s."
 #: include/classes/db/DB.php:801
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
-msgstr "Não é possível executar uma operação DELETE na tabela \"%1$s\" sem uma condição WHERE.Não é possível executar uma operação DELETE na tabela \"%1$s\" sem uma condição WHERE.Não é possível executar uma operação DELETE na tabela \"%1$s\" sem uma condição WHERE.Não é possível executar uma operação DELETE na tabela \"%1$s\" sem uma condição WHERE.Não é possível executar uma operação DELETE na tabela \"%1$s\" sem uma condição WHERE."
+msgstr "Não é possível executar uma operação DELETE na tabela \"%1$s\" sem uma condição WHERE."
 
 #: include/classes/db/DB.php:516
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
-msgstr "Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem valores.Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem valores.Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem valores.Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem valores.Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem valores."
+msgstr "Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem valores."
 
 #: include/classes/db/DB.php:527
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
-msgstr "Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem uma condição WHERE.Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem uma condição WHERE.Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem uma condição WHERE.Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem uma condição WHERE.Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem uma condição WHERE."
+msgstr "Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem uma condição WHERE."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2206,11 +2231,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2218,11 +2243,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Não foi possível eliminar macro."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Não é possível renomear o utilizador guest."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Não é possível guardar as regras de descoberta sem verificações."
 
@@ -2231,217 +2256,226 @@ msgstr "Não é possível guardar as regras de descoberta sem verificações."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Não foi possível definir \"templateid\" para a aplicação \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Não foi possível definir \"templateid\" para o ecrã \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
-msgstr "Não foi possível definir \"templateid\" para o protótipo de trigger \"%1$s\".Não foi possível definir \"templateid\" para o protótipo de trigger \"%1$s\".Não foi possível definir \"templateid\" para o protótipo de trigger \"%1$s\".Não foi possível definir \"templateid\" para o protótipo de trigger \"%1$s\".Não foi possível definir \"templateid\" para o protótipo de trigger \"%1$s\"."
+msgstr "Não foi possível definir \"templateid\" para o protótipo de trigger \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Não foi possível trocar a interface do host."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Não foi possível desbloquear utilizadores"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Não foi possível desvincular e limpar regras de decoberta"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Não foi possível desvincular e limpar protótipos de gráficos"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Não foi possível desvincular e limpar os gráficos."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Não foi possível desvincular e limpar os protótipos de itens"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Não foi possível desvincular e limpar os itens"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Não foi possível desvincular e limpar os triggers"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Não foi possível desvincular o template"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, fuzzy, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
-msgstr "Não é possível desvincular o trigger \"%s\", existem itens do template que estão vinculados ao host.Não é possível desvincular o trigger \"%s\", existem itens do template que estão vinculados ao host.Não é possível desvincular o trigger \"%s\", existem itens do template que estão vinculados ao host.Não é possível desvincular o trigger \"%s\", existem itens do template que estão vinculados ao host.Não é possível desvincular o trigger \"%s\", existem itens do template que estão vinculados ao host."
+msgstr "Não é possível desvincular o trigger \"%s\", existem itens do template que estão vinculados ao host."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Não foi possível actualizar \"templateid\" para a aplicação \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Não foi possível actualizar \"templateid\" para o gráfico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Não foi possível actualizar \"templateid\" para o ecrã \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
-msgstr "Não foi possível actualizar \"templateid\" para o protótipo de trigger \"%1$s\".Não foi possível actualizar \"templateid\" para o protótipo de trigger \"%1$s\".Não foi possível actualizar \"templateid\" para o protótipo de trigger \"%1$s\".Não foi possível actualizar \"templateid\" para o protótipo de trigger \"%1$s\".Não foi possível actualizar \"templateid\" para o protótipo de trigger \"%1$s\"."
+msgstr "Não foi possível actualizar \"templateid\" para o protótipo de trigger \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Não foi possível actualizar a acção"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Não foi possível actualizar a aplicação"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Não foi possível actualizar o comentário"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Não foi possível actualizar a configuração"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Não foi possível actualizar o modo de debug"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Não foi possível actualizar a regra de descoberta"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Não foi possível actualizar o acesso ao frontend"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Não foi possível actualizar o gráfico"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Não foi possível actualizar o grupo"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Não foi possível actualizar o grupo."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Não foi possível actualizar o host"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Não foi possível actualizar os hosts"
 
@@ -2453,24 +2487,24 @@ msgstr "Não foi possível actualizar o mapeamento de ícones"
 msgid "Cannot update image"
 msgstr "Não foi possível actualizar a imagem"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Não foi possível actualizar a imagem."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Não foi possível actualizar o item"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Não foi possível actualizar os itens"
 
@@ -2482,16 +2516,16 @@ msgstr "Não foi possível actualizar a macro."
 msgid "Cannot update macros"
 msgstr "Não foi possível actualizar as macros"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Não foi possível actualizar o período de manutenção"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Não foi possível actualizar o mapa \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Não foi possível actualizar o tipo de média"
 
@@ -2499,28 +2533,24 @@ msgstr "Não foi possível actualizar o tipo de média"
 msgid "Cannot update network map"
 msgstr "Não foi possível actualizar o mapa de rede"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Não foi possível actualizar o proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Não foi possível actualizar a expressão regular"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Não foi possível actualizar o ecrã"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Não foi possível actualizar o ecrã."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Não foi possível actualizar o script"
 
@@ -2532,56 +2562,57 @@ msgstr "Não foi possível actualizar o serviço"
 msgid "Cannot update slide show"
 msgstr "Não foi possível actualizar o slideshow"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Não foi possível actualizar o template"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Não foi possível actualizar o trigger"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Não foi possível actualizar o utilizador"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Não foi possível actualizar o média do utilizador."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
-msgstr "Não foi possível actualizar o utilizador. As palavras-passe não coincidem.Não foi possível actualizar o utilizador. As palavras-passe não coincidem.Não foi possível actualizar o utilizador. As palavras-passe não coincidem.Não foi possível actualizar o utilizador. As palavras-passe não coincidem.Não foi possível actualizar o utilizador. As palavras-passe não coincidem."
+msgstr "Não foi possível actualizar o utilizador. As palavras-passe não coincidem."
 
 #: adm.valuemapping.php:64
 msgid "Cannot update value map"
 msgstr "Não foi possível actualizar o mapeamento de valores"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Legenda"
 
@@ -2590,47 +2621,47 @@ msgstr "Legenda"
 msgid "Case sensitive"
 msgstr "Distinguir maiúscula/minúscula"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Centrar"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Variação face ao valor anterior"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Alterar"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Alterar palavra-passe"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Carácter"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Sequência de caracteres incluídos"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Sequência de caracteres não incluídos"
 
@@ -2639,48 +2670,48 @@ msgid "Chassis"
 msgstr "Chassis"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Verificação já existe."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Verifique a parte da expressão que começa com \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Verifique a chave, por favor. O exemple padrão foi aprovado."
 
@@ -2689,44 +2720,44 @@ msgid "Check type"
 msgstr "Tipo de verificação"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Verificações"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "As verificações devem ser únicas."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chinês (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Chinês (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Não é possível criar link circular para o elemento do mapa \"%s\"."
@@ -2741,34 +2772,35 @@ msgstr "Existe uma referência circular nos mapas: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Existe uma referência circular nos ecrãs: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Existe uma referência circular nos templates: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Não é possível criar link circular entre templates."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Clássico"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Limpar"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Limpar histórico e tendências"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Limpar histórico dos itens seleccionados"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Limpar ao desvincular"
 
@@ -2778,69 +2810,69 @@ msgstr "Relógio"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Clonar"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Fechar"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Fechar o construtor de expressões"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Cor"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Cor (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Sobrepor coluna"
 
@@ -2855,7 +2887,7 @@ msgstr "Resultado combinado"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Comando"
 
@@ -2863,41 +2895,31 @@ msgstr "Comando"
 msgid "Command actions"
 msgstr "Acções do comando"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "O comando não pode estar vazio."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Comandos"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Comentário actualizado"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Comentários"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Comercial"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Comparar valores para múltiplos períodos"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Permissões de composição"
 
@@ -2905,29 +2927,39 @@ msgstr "Permissões de composição"
 msgid "Condition"
 msgstr "Condição"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Condições"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Configuração"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3090,23 +3122,23 @@ msgstr "Configuração actualizada"
 msgid "Configure (Filter %s)"
 msgstr "Configurar (Filtro %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Texto de confirmação"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Ligado a"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Ligado como '%1$s'"
@@ -3165,7 +3197,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3173,30 +3205,37 @@ msgstr ""
 msgid "Contract number"
 msgstr "Número de contrato"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Coordenadas"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Copiar seleccionados para ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Login correcto \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Não foi possível guardar a imagem!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Contador"
 
@@ -3216,6 +3255,10 @@ msgstr "Criar aplicação"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3233,7 +3276,7 @@ msgstr "Criar gráfico (seleccionar o host primeiro)"
 msgid "Create graph prototype"
 msgstr "Criar protótipo de gráfico"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Criar host"
 
@@ -3246,15 +3289,15 @@ msgstr "Criar grupo de hosts"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Criar mapa de ícones"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Criar imagem"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Criar item"
 
@@ -3278,6 +3321,10 @@ msgstr "Criar mapa"
 msgid "Create media type"
 msgstr "Criar tipo de média"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Criar proxy"
@@ -3302,11 +3349,11 @@ msgstr "Criar script"
 msgid "Create slide show"
 msgstr "Criar slideshow"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Criar template"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Criar trigger"
 
@@ -3330,42 +3377,42 @@ msgstr "Criar grupo de utilizadores"
 msgid "Create value map"
 msgstr "Criar mapeamento de valores"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Criada: Aplicação \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Criada: Regra de descoberta \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Protótipo de item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Criado: Protótipo de trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3375,51 +3422,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "A data actual é < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "A data actual é = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "A data actual é > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "A data actual é != N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Host actual"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "A hora actual é < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "A hora actual é = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "A hora actual é > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "A hora actual é != N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Valor actual"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3432,10 +3480,10 @@ msgstr "Gráficos personalizados"
 msgid "Custom label"
 msgstr "Etiqueta personalizada"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
-msgstr "A etiqueta personalizada no mapa \"%2$s\" para elementos do tipo \"%1$s\" não pode estar vazia.A etiqueta personalizada no mapa \"%2$s\" para elementos do tipo \"%1$s\" não pode estar vazia.A etiqueta personalizada no mapa \"%2$s\" para elementos do tipo \"%1$s\" não pode estar vazia.A etiqueta personalizada no mapa \"%2$s\" para elementos do tipo \"%1$s\" não pode estar vazia.A etiqueta personalizada no mapa \"%2$s\" para elementos do tipo \"%1$s\" não pode estar vazia."
+msgstr "A etiqueta personalizada no mapa \"%2$s\" para elementos do tipo \"%1$s\" não pode estar vazia."
 
 #: disc_prototypes.php:108 include/views/configuration.item.massupdate.php:300
 #: items.php:115
@@ -3446,7 +3494,7 @@ msgstr "Multiplicador personalizado"
 msgid "Custom screens"
 msgstr "Ecrãs personalizados"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Script personalizado"
 
@@ -3456,7 +3504,7 @@ msgstr "Severidade personalizada"
 
 #: include/views/administration.general.triggerSeverity.edit.php:67
 msgid "Custom severity names affect all locales and require manual translation!"
-msgstr "Nomes personalizados de severidade afectam todas as traduções e exigem tradução manual!Nomes personalizados de severidade afectam todas as traduções e exigem tradução manual!Nomes personalizados de severidade afectam todas as traduções e exigem tradução manual!Nomes personalizados de severidade afectam todas as traduções e exigem tradução manual!Nomes personalizados de severidade afectam todas as traduções e exigem tradução manual!"
+msgstr "Nomes personalizados de severidade afectam todas as traduções e exigem tradução manual!"
 
 #: include/views/js/configuration.sysmaps.js.php:45
 msgid "Custom size"
@@ -3466,18 +3514,14 @@ msgstr "Tamanho personalizado"
 msgid "Custom slides"
 msgstr "Slides personalizados"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Checo (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "CONFIGURAÇÃO DE DASHBOARD"
@@ -3493,28 +3537,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "DETALHES DO CENÁRIO"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "DESACTIVADO"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DESCOBERTO"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3522,25 +3566,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Nome DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "ABAIXO"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Diário"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Laranja escuro"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Escurecer"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -3552,20 +3596,21 @@ msgstr "Configuração do dashboard"
 msgid "Dashboard filter"
 msgstr "Filtro de dashboard"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Linha tracejada"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Dados"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3588,11 +3633,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Tipo de dados"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Ficheiro de base de dados"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Servidor de base de dados"
 
@@ -3600,35 +3646,39 @@ msgstr "Servidor de base de dados"
 msgid "Database monitor"
 msgstr "Monitor de base de dados"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Palavra-passe da base de dados"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Porto da base de dados"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Schema da base de dados"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Servidor de base de dados"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Tipo de base de dados"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Data"
 
@@ -3648,53 +3698,52 @@ msgstr "Período de manutenção do HW expira"
 msgid "Date HW purchased"
 msgstr "Data de aquisição do HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Dia"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Dia do mês"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "O dia do mês é < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "O dia do mês é = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "O dia do mês é > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "O dia do mês é != N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Dia da semana"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "O dia da semana é < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "O dia da semana é = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "O dia da semana é > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "O dia da semana é != N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Dias"
 
@@ -3702,22 +3751,22 @@ msgstr "Dias"
 msgid "Debug"
 msgstr "Debug"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Modo de debug"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Actualizado o debug mode"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dez"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Dezembro"
 
@@ -3727,15 +3776,14 @@ msgstr "Decimal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Por omissão"
 
@@ -3748,11 +3796,11 @@ msgid "Default delay (in seconds)"
 msgstr "Atraso por omissão (em segundos)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Mensagem por omissão"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Duração por omissão de cada passo da operação"
 
@@ -3775,84 +3823,88 @@ msgstr "Tema por omissão \"%1$s\"."
 msgid "Delay"
 msgstr "Atraso"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Atraso (em seg)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Atrasado em"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Eliminar"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Eliminar e limpar"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
-msgstr "Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts associados serão limpos!)Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts associados serão limpos!)Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts associados serão limpos!)Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts associados serão limpos!)Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts associados serão limpos!)"
+msgstr "Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts associados serão limpos!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
-msgstr "Eliminar e limpar template? (Atenção: todos os hosts associados serão limpos!)Eliminar e limpar template? (Atenção: todos os hosts associados serão limpos!)Eliminar e limpar template? (Atenção: todos os hosts associados serão limpos!)Eliminar e limpar template? (Atenção: todos os hosts associados serão limpos!)Eliminar e limpar template? (Atenção: todos os hosts associados serão limpos!)"
+msgstr "Eliminar e limpar template? (Atenção: todos os hosts associados serão limpos!)"
 
 #: include/views/configuration.application.edit.php:55
 msgid "Delete application?"
 msgstr "Eliminar aplicação?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Eliminar acção actual?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Eliminar regra de descoberta?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Eliminar expressão?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Eliminar gráfico?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Eliminar histórico dos cenários WEB seleccionados?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Eliminar histórico dos itens seleccionados?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Eliminar mapa de ícones?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Eliminar item?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Eliminar palavra chave?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Eliminar associações entre os elementos seleccionados?"
 
@@ -3860,11 +3912,15 @@ msgstr "Eliminar associações entre os elementos seleccionados?"
 msgid "Delete maintenance period?"
 msgstr "Eliminar período de manutenção?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Eliminar mapa de rede?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Eliminar proxy?"
 
@@ -3872,7 +3928,7 @@ msgstr "Eliminar proxy?"
 msgid "Delete regular expression?"
 msgstr "Eliminar expressão regular?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Eliminar cenário?"
 
@@ -3880,71 +3936,67 @@ msgstr "Eliminar cenário?"
 msgid "Delete screen?"
 msgstr "Eliminar ecrã?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Eliminar script?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Eliminar seleccionados"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Eliminar cenários WEB seleccionados?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Eliminar acções seleccionadas?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Eliminar aplicações seleccionadas?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Eliminar regras de descoberta seleccionadas?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Eliminar elementos seleccionados?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Eliminar gráficos seleccionados?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Eliminar grupo seleccionado?"
@@ -3953,27 +4005,27 @@ msgstr "Eliminar grupo seleccionado?"
 msgid "Delete selected groups?"
 msgstr "Eliminar grupos seleccionados?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Eliminar grupos de hosts seleccionados?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Eliminar host seleccionado?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Eliminar hosts seleccionados?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Eliminar imagem seleccionada?"
 
@@ -3981,31 +4033,31 @@ msgstr "Eliminar imagem seleccionada?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Eliminar itens seleccionados?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Eliminar períodos de manutenção seleccionados?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Eliminar mapas seleccionados?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Eliminar tipo de média seleccionado?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Eliminar tipos de média seleccionados?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Eliminar proxies seleccionados?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Eliminar expressões regulares seleccionadas?"
 
@@ -4013,15 +4065,15 @@ msgstr "Eliminar expressões regulares seleccionadas?"
 msgid "Delete selected screens?"
 msgstr "Eliminar ecrãs seleccionados?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Eliminar scripts seleccionados?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Eliminar slideshows seleccionados?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Eliminar templates seleccionados?"
 
@@ -4033,11 +4085,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Eliminar triggers seleccionados?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Eliminar utilizador seleccionado?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Eliminar utilizadores seleccionados?"
 
@@ -4050,13 +4102,17 @@ msgstr "Eliminar mapeamento de valor seleccionado?"
 msgid "Delete selected value mapping? It is used for %d item!"
 msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Eliminar o mapeamento de valor seleccionado? Está a ser utilizado pelo item %d!"
-msgstr[1] "Eliminar o mapeamento de valor seleccionado? Está a ser utilizado pelos itens %d!Eliminar o mapeamento de valor seleccionado? Está a ser utilizado pelos itens %d!Eliminar o mapeamento de valor seleccionado? Está a ser utilizado pelos itens %d!Eliminar o mapeamento de valor seleccionado? Está a ser utilizado pelos itens %d!Eliminar o mapeamento de valor seleccionado? Está a ser utilizado pelos itens %d!"
+msgstr[1] "Eliminar o mapeamento de valor seleccionado? Está a ser utilizado pelos itens %d!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Eliminar seleccionado e elementos associados"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4065,15 +4121,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Eliminar slideshow?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Eliminar template?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Eliminar trigger?"
 
@@ -4081,62 +4137,62 @@ msgstr "Eliminar trigger?"
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Eliminado: Aplicação \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Eliminado: Regra de descoberta \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Eliminado: Gráfico \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Eliminado: Host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Eliminado: Item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Eliminado: Protótipo de item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Eliminado: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Eliminado: Template \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Eliminado: Trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Eliminado: Protótipo de trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4145,35 +4201,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Delimitador"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (alterações simples)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (alterações/seg)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Negar"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Dependências"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Dependente"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Depende de"
 
@@ -4181,30 +4237,41 @@ msgstr "Depende de"
 msgid "Deployment status"
 msgstr "Estado de deployment"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Descrição"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Detalhes"
 
@@ -4217,71 +4284,71 @@ msgid "Device"
 msgstr "Dispositivo"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Critério único para dispositivos"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "A diferença entre o valor MÁX e o valor MÍN do período T é < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "A diferença entre o valor MÁX e o valor MÍN do período T é = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "A diferença entre o valor MÁX e o valor MÍN do período T é > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "A diferença entre o valor MÁX e o valor MÍN do período T é != N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
-msgstr "Diferença entre último valor e o anterior, então N = 1, 0 - caso contrárioDiferença entre último valor e o anterior, então N = 1, 0 - caso contrárioDiferença entre último valor e o anterior, então N = 1, 0 - caso contrárioDiferença entre último valor e o anterior, então N = 1, 0 - caso contrárioDiferença entre último valor e o anterior, então N = 1, 0 - caso contrário"
+msgstr "Diferença entre último valor e o anterior, então N = 1, 0 - caso contrário"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
-msgstr "Diferença entre último valor e o anterior, então N != 1, 0 - caso contrárioDiferença entre último valor e o anterior, então N != 1, 0 - caso contrárioDiferença entre último valor e o anterior, então N != 1, 0 - caso contrárioDiferença entre último valor e o anterior, então N != 1, 0 - caso contrárioDiferença entre último valor e o anterior, então N != 1, 0 - caso contrário"
+msgstr "Diferença entre último valor e o anterior, então N != 1, 0 - caso contrário"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Diferença entre último valor e o anterior é < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Diferença entre último valor e o anterior é = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Diferença entre último valor e o anterior é > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Diferença entre último valor e o anterior é != N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4305,48 +4372,44 @@ msgstr "Desactivar modo debug para os grupos seleccionados?"
 msgid "Disable host"
 msgstr "Desactivar host"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Desactivar host?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Desactivar hosts nos grupos de hosts seleccionados?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Desactivar hosts monitorizados pelos proxies seleccionados?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Desactivar seleccionados"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Desactivar cenários WEB seleccionados?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Desactivar acções seleccionadas?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Desactivar aplicações seleccionadas?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Desactivar regras de descoberta seleccionadas?"
 
@@ -4354,11 +4417,11 @@ msgstr "Desactivar regras de descoberta seleccionadas?"
 msgid "Disable selected groups?"
 msgstr "Desactivar grupos seleccionados?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Desactivar hosts seleccionados?"
 
@@ -4366,42 +4429,47 @@ msgstr "Desactivar hosts seleccionados?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Desactivar items seleccionados?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Desactivar tipos de média seleccionados?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Desactivar triggers seleccionados?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -4414,7 +4482,7 @@ msgstr "Desastre"
 msgid "Discovered"
 msgstr "Descoberto"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4422,17 +4490,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "Dispositivo descoberto"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Descoberta"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Descoberta por proxy"
 
@@ -4440,17 +4508,17 @@ msgstr "Descoberta por proxy"
 msgid "Discovery check"
 msgstr "Verificação de descoberta"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Verificações de descoberta"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Lista de descobertas"
 
@@ -4459,67 +4527,70 @@ msgid "Discovery object"
 msgstr "Objecto de descoberta"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Regra de descoberta"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
-msgstr "Regra de descoberta \"%1$s\" já existe em \"%2$s\", herdada de outro template.Regra de descoberta \"%1$s\" já existe em \"%2$s\", herdada de outro template.Regra de descoberta \"%1$s\" já existe em \"%2$s\", herdada de outro template.Regra de descoberta \"%1$s\" já existe em \"%2$s\", herdada de outro template.Regra de descoberta \"%1$s\" já existe em \"%2$s\", herdada de outro template."
+msgstr "Regra de descoberta \"%1$s\" já existe em \"%2$s\", herdada de outro template."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "Regra de descoberta \"%1$s:%2$s\" tem um tempo de vida inválido: \"%3$s\". (mín: %4$d, máx: %5$d, macro de utilizador permitida)Regra de descoberta \"%1$s:%2$s\" tem um tempo de vida inválido: \"%3$s\". (mín: %4$d, máx: %5$d, macro de utilizador permitida)Regra de descoberta \"%1$s:%2$s\" tem um tempo de vida inválido: \"%3$s\". (mín: %4$d, máx: %5$d, macro de utilizador permitida)Regra de descoberta \"%1$s:%2$s\" tem um tempo de vida inválido: \"%3$s\". (mín: %4$d, máx: %5$d, macro de utilizador permitida)Regra de descoberta \"%1$s:%2$s\" tem um tempo de vida inválido: \"%3$s\". (mín: %4$d, máx: %5$d, macro de utilizador permitida)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Regra de descoberta \"%s\" já existe."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "Regra de descoberta \"%1$s:%2$s\" tem um tempo de vida inválido: \"%3$s\". (mín: %4$d, máx: %5$d, macro de utilizador permitida)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Regra de descoberta criada"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Regra de descoberta eliminada"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Regra de descoberta actualizada"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Regras de descoberta"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Regras de descoberta eliminadas"
 
@@ -4531,7 +4602,7 @@ msgstr "Estado da descoberta"
 msgid "Display OK triggers for"
 msgstr "Mostrar triggers OK para"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "A mostrar"
 
@@ -4540,32 +4611,32 @@ msgstr "A mostrar"
 msgid "Displaying %1$s of %2$s found"
 msgstr "A mostrar %1$s de %2$s encontrados"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Distribuição de valores por múltiplos itens"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Distribuição de valores por múltiplos períodos"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Não calcular"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Deseja substituir a expressão condicional?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Concluído"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Pontilhado"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Descer"
@@ -4575,30 +4646,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Descer"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Downtime"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Arraste para aqui para alterar o tipo de interface para \"IPMI\"."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Arraste para aqui para alterar o tipo de interface para \"JMX\"."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Arraste para aqui para alterar o tipo de interface para \"SNMP\"."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Arraste para aqui para alterar o tipo de interface para \"agente\"."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Estilo de desenho"
 
@@ -4616,74 +4687,75 @@ msgstr "Primeira entrada \"%1$s\" de listas dropdown."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Lembrar selecção \"%1$s\" em listas dropdown."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Dependências duplicadas no trigger \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Host duplicado. Já existe um host com o mesmo nome \"%s\"."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Host duplicado. Já existe um host com o mesmo nome visível \"%s\"."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Nome de mapa duplicado para o mapa \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Nome de severidade duplicado \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Alias de utilizador duplicado \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Duração"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Duração (seg)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Holandês (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Item dinâmico"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ERRO"
 
@@ -4691,13 +4763,13 @@ msgstr "ERRO"
 msgid "EVENTS"
 msgstr "EVENTOS"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
-msgstr "Cada URL deve ter um nome único. Certifique-se que existe apenas um URL com esse nomeCada URL deve ter um nome único. Certifique-se que existe apenas um URL com esse nomeCada URL deve ter um nome único. Certifique-se que existe apenas um URL com esse nomeCada URL deve ter um nome único. Certifique-se que existe apenas um URL com esse nomeCada URL deve ter um nome único. Certifique-se que existe apenas um URL com esse nome"
+msgstr "Cada URL deve ter um nome único. Certifique-se que existe apenas um URL com esse nome"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4705,9 +4777,9 @@ msgstr "Cada URL deve ter um nome único. Certifique-se que existe apenas um URL
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Editar"
 
@@ -4715,7 +4787,7 @@ msgstr "Editar"
 msgid "Edit map element"
 msgstr "Editar elemento do mapa"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Editar trigger"
 
@@ -4723,27 +4795,61 @@ msgstr "Editar trigger"
 msgid "Element"
 msgstr "Elemento"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Nome do elemento"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "E-mail"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Vazio"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Condição da acção vazia."
 
@@ -4751,76 +4857,98 @@ msgstr "Condição da acção vazia."
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Parâmetro de entrada vazio."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Entrada vazia."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Macro vazia."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Nome vazio."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Parâmetros vazios"
 
@@ -4829,11 +4957,11 @@ msgstr "Parâmetros vazios"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4841,11 +4969,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Período de tempo vazio."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Activar"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Activar confirmação"
 
@@ -4865,11 +4997,11 @@ msgstr "Activar reconhecimento de eventos"
 msgid "Enable host"
 msgstr "Activar host"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Activar host?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Activar hosts monitorizados pelos proxies seleccionados?"
 
@@ -4882,36 +5014,32 @@ msgstr "Activar hosts monitorizados pelos proxies seleccionados?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Activar seleccionados"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Activar cenários WEB seleccionados?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Activar acções seleccionadas?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Activar aplicações seleccionadas?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Activar regras de descoberta seleccionadas?"
 
@@ -4919,11 +5047,11 @@ msgstr "Activar regras de descoberta seleccionadas?"
 msgid "Enable selected groups?"
 msgstr "Activar grupos seleccionados?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Activar hosts seleccionados?"
 
@@ -4931,64 +5059,68 @@ msgstr "Activar hosts seleccionados?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Activar os itens seleccionados?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Activar tipos de média seleccionados?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Activar triggers seleccionados?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Activado"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Inglês (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Inglês (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Erro"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erro no pedido de pesquisa para a tabela \"%1$s\"."
@@ -5006,15 +5138,15 @@ msgstr "Evento"
 msgid "Event ID"
 msgstr "ID do evento"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
-msgstr "ID do evento do último registo de log faz match com a expressão regular T, então N = 1, 0 - caso contrárioID do evento do último registo de log faz match com a expressão regular T, então N = 1, 0 - caso contrárioID do evento do último registo de log faz match com a expressão regular T, então N = 1, 0 - caso contrárioID do evento do último registo de log faz match com a expressão regular T, então N = 1, 0 - caso contrárioID do evento do último registo de log faz match com a expressão regular T, então N = 1, 0 - caso contrário"
+msgstr "ID do evento do último registo de log faz match com a expressão regular T, então N = 1, 0 - caso contrário"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
-msgstr "ID do evento do último registo de log faz match com a expressão regular T, então N != 1, 0 - caso contrárioID do evento do último registo de log faz match com a expressão regular T, então N != 1, 0 - caso contrárioID do evento do último registo de log faz match com a expressão regular T, então N != 1, 0 - caso contrárioID do evento do último registo de log faz match com a expressão regular T, então N != 1, 0 - caso contrárioID do evento do último registo de log faz match com a expressão regular T, então N != 1, 0 - caso contrário"
+msgstr "ID do evento do último registo de log faz match com a expressão regular T, então N != 1, 0 - caso contrário"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Evento reconhecido"
 
@@ -5023,7 +5155,7 @@ msgstr "Evento reconhecido"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Reconhece evento \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Reconhecimento de eventos desactivado"
 
@@ -5031,7 +5163,7 @@ msgstr "Reconhecimento de eventos desactivado"
 msgid "Event details"
 msgstr "Detalhes do evento"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Geração de eventos"
 
@@ -5051,9 +5183,10 @@ msgstr "Detalhes da origem do evento"
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Eventos"
 
@@ -5061,36 +5194,41 @@ msgstr "Eventos"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Diariamente"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Semanalmente"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Excluir"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Executar"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Erro de execução SQL [%1$s] em [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Executar em"
 
@@ -5098,13 +5236,13 @@ msgstr "Executar em"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Script executado"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Confirmação de execução"
 
@@ -5116,7 +5254,7 @@ msgstr "Expandir macros"
 msgid "Expand single problem"
 msgstr "Expandir problemas singulares"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "À espera de receber JSON-rpc versão 2.0, \"%s\" foi enviada."
@@ -5126,12 +5264,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Expirado"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Expandido"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Exportar seleccionados"
 
@@ -5139,22 +5277,22 @@ msgstr "Exportar seleccionados"
 msgid "Export to CSV"
 msgstr "Exportar para CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Expressão"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Erro de sintaxe na expressão."
 
@@ -5162,11 +5300,12 @@ msgstr "Erro de sintaxe na expressão."
 msgid "Expression Variable Elements"
 msgstr "Elementos variáveis na expressão"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Expressão não pode ser vazia"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Construtor de expressões"
 
@@ -5187,17 +5326,17 @@ msgid "External check"
 msgstr "Verificação externa"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Mensagem de texto Ez"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "FALSO"
 
@@ -5206,16 +5345,17 @@ msgstr "FALSO"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Falha"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Falhou"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5223,40 +5363,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Auditoria de falhas"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Gráficos favoritos"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Mapas favoritos"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Ecrãs favoritos"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Favoritos"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Fev"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Fevereiro"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Campo"
 
@@ -5300,34 +5440,34 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "O campo \"druleid\" é obrigatório."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "O campo \"name\" é obrigatório."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "O formato do ficheiro não é suportado."
 
 #: include/classes/helpers/CUploadFile.php:153
 #, c-format
 msgid "File is too big, max upload size is %1$s bytes."
-msgstr "O ficheiro é demasiado grande, o tamanho máximo para upload é de %1$s bytes.O ficheiro é demasiado grande, o tamanho máximo para upload é de %1$s bytes.O ficheiro é demasiado grande, o tamanho máximo para upload é de %1$s bytes.O ficheiro é demasiado grande, o tamanho máximo para upload é de %1$s bytes.O ficheiro é demasiado grande, o tamanho máximo para upload é de %1$s bytes."
+msgstr "O ficheiro é demasiado grande, o tamanho máximo para upload é de %1$s bytes."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, fuzzy, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
-msgstr "O ficheiro fornecido para uma vista não existe. Tentativa de encontrar \"%s\".O ficheiro fornecido para uma vista não existe. Tentativa de encontrar \"%s\".O ficheiro fornecido para uma vista não existe. Tentativa de encontrar \"%s\".O ficheiro fornecido para uma vista não existe. Tentativa de encontrar \"%s\".O ficheiro fornecido para uma vista não existe. Tentativa de encontrar \"%s\"."
+msgstr "O ficheiro fornecido para uma vista não existe. Tentativa de encontrar \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5335,68 +5475,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Região preenchida"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtro"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Filtrar por grupo de hosts"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filtrar por nome"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
-msgstr "Encontrar a string V no último (mais recente) valor. N = 1 - se encontrado, 0 - caso contrárioEncontrar a string V no último (mais recente) valor. N = 1 - se encontrado, 0 - caso contrárioEncontrar a string V no último (mais recente) valor. N = 1 - se encontrado, 0 - caso contrárioEncontrar a string V no último (mais recente) valor. N = 1 - se encontrado, 0 - caso contrárioEncontrar a string V no último (mais recente) valor. N = 1 - se encontrado, 0 - caso contrário"
+msgstr "Encontrar a string V no último (mais recente) valor. N = 1 - se encontrado, 0 - caso contrário"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
-msgstr "Encontrar a string V no último (mais recente) valor. N != 1 - se encontrado, 0 - caso contrárioEncontrar a string V no último (mais recente) valor. N != 1 - se encontrado, 0 - caso contrárioEncontrar a string V no último (mais recente) valor. N != 1 - se encontrado, 0 - caso contrárioEncontrar a string V no último (mais recente) valor. N != 1 - se encontrado, 0 - caso contrárioEncontrar a string V no último (mais recente) valor. N != 1 - se encontrado, 0 - caso contrário"
+msgstr "Encontrar a string V no último (mais recente) valor. N != 1 - se encontrado, 0 - caso contrário"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Terminar"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Finlandês (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Primeiro"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Primeiro"
@@ -5405,8 +5548,8 @@ msgstr "Primeiro"
 msgid "Fit to map"
 msgstr "Ajustar ao mapa"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fixo"
 
@@ -5416,76 +5559,80 @@ msgstr "Fixo"
 msgid "Flexible intervals"
 msgstr "Intervalos flexíveis"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Para guest, a palavra-passe deverá ser vazia"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Fórmula"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Quarto"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Francês (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Sex"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "De"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Acesso ao frontend"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Actualizado acesso ao frontend"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Mensagem do frontend"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Clone completo"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Ecrã completo"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Função"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5495,50 +5642,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "Modem GSM"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Acesso ao GUI desactivado."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Geral"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Gerado em %s seg"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Alemão (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5546,65 +5693,65 @@ msgid "Get support"
 msgstr "Suporte"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "A expressão fornecida não é uma macro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "A expressão global não existe."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Script global"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Scripts globais"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Ir"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Ir para"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5613,66 +5760,73 @@ msgid "Gradient line"
 msgstr "Linha de gradiente"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Gráfico"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "O gráfico \"%1$s\" já existe em \"%2$s\" (herdado de outro template)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "O gráfico \"%1$s\" já existe em \"%2$s\" (os itens não são idênticos)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "O gráfico \"%1$s\" já existe em \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
-msgstr "O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymax).O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymax).O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymax).O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymax).O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymax)."
+msgstr "O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymax)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
-msgstr "O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymin).O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymin).O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymin).O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymin).O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymin)."
+msgstr "O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\" (item para o Ymin)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
-msgstr "O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\".O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\".O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\".O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\".O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\"."
+msgstr "O gráfico \"%1$s\" não pode herdar. Não existem os itens necessários em \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "O gráfico \"%1$s\" não existe no template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Gráfico \"%1$s\" ignorado - regra de utilizador."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
-msgstr "O gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts.O gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts.O gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts.O gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts.O gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts."
+msgstr "O gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Gráfico adicionado"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Gráfico eliminado"
 
@@ -5684,54 +5838,59 @@ msgstr "Elemento do gráfico"
 msgid "Graph item"
 msgstr "Item do gráfico"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Nome do gráfico"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
-msgstr "O protótipo de gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts.O protótipo de gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts.O protótipo de gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts.O protótipo de gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts.O protótipo de gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts."
+msgstr "O protótipo de gráfico \"%1$s\" contém itens de template. Nesta situação não é possível adicionar itens de outros hosts."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Protótipo de gráfico \"%s\" eliminado."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Protótipos de gráfico"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5743,49 +5902,51 @@ msgstr "Protótipos de gráfico de"
 msgid "Graph sum"
 msgstr "Somatório do gráfico"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Tipo de gráfico"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Gráfico actualizado"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
-msgstr "Já existe um gráfico com o nome \"%1$s\" em gráficos ou protótipos de gráficos.Já existe um gráfico com o nome \"%1$s\" em gráficos ou protótipos de gráficos.Já existe um gráfico com o nome \"%1$s\" em gráficos ou protótipos de gráficos.Já existe um gráfico com o nome \"%1$s\" em gráficos ou protótipos de gráficos.Já existe um gráfico com o nome \"%1$s\" em gráficos ou protótipos de gráficos."
+msgstr "Já existe um gráfico com o nome \"%1$s\" em gráficos ou protótipos de gráficos."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Já existe um gráfico com o mesmo nome, mas de outro tipo."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Gráficos copiados"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Gráficos eliminados"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Grego (el_GR)"
 
@@ -5794,54 +5955,58 @@ msgstr "Grego (el_GR)"
 msgid "Grid"
 msgstr "Grelha"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Grupo"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "O grupo \"%1$s\" não existe."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "O grupo \"%1$s\" fornecido no host \"%2$s\" não existe."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Grupo adicionado"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Grupo eliminado"
+msgid_plural "Groups deleted"
+msgstr[0] "Grupo eliminado"
+msgstr[1] "Grupo eliminado"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5852,40 +6017,42 @@ msgstr "Grupo para hosts descobertos"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Nome do grupo"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Grupo actualizado"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Agrupar por"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Grupos"
 
@@ -5893,22 +6060,13 @@ msgstr "Grupos"
 msgid "Groups in maintenance"
 msgstr "Grupos em manutenção"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H.i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5925,7 +6083,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "VISTA GLOBAL DO INVENTÁRIO DE HOSTS"
 
@@ -5943,7 +6101,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "Autenticação HTTP"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5964,12 +6123,17 @@ msgstr "Hardware"
 msgid "Hardware (Full details)"
 msgstr "Hardware (Mais detalhes)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Altura"
@@ -5982,15 +6146,15 @@ msgstr "Ajuda"
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Oculto"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Ocultar"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Ocultar tudo"
 
@@ -6006,15 +6170,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Ocultar triggers desactivados"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Ocultar seleccionados"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6023,23 +6187,23 @@ msgstr ""
 msgid "High"
 msgstr "Alta"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Histórico"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Histórico eliminado"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Eliminar o histórico pode demorar bastante tempo. Continuar?"
 
@@ -6060,79 +6224,79 @@ msgstr "Histórico de eventos"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Alinhamento horizontal"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
 msgstr[1] "Host"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "O host \"%1$s\" já existe."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "O host \"%1$s\" é monitorizado pelo proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
-msgstr "O host \"%1$s\" tem o parâmetro \"useipmi\" habilitado, mas não tem o parâmetro \"impi_ip\" definido! Será utilizado o IP do host como endereço IPMI.O host \"%1$s\" tem o parâmetro \"useipmi\" habilitado, mas não tem o parâmetro \"impi_ip\" definido! Será utilizado o IP do host como endereço IPMI.O host \"%1$s\" tem o parâmetro \"useipmi\" habilitado, mas não tem o parâmetro \"impi_ip\" definido! Será utilizado o IP do host como endereço IPMI.O host \"%1$s\" tem o parâmetro \"useipmi\" habilitado, mas não tem o parâmetro \"impi_ip\" definido! Será utilizado o IP do host como endereço IPMI.O host \"%1$s\" tem o parâmetro \"useipmi\" habilitado, mas não tem o parâmetro \"impi_ip\" definido! Será utilizado o IP do host como endereço IPMI."
+msgstr "O host \"%1$s\" tem o parâmetro \"useipmi\" habilitado, mas não tem o parâmetro \"impi_ip\" definido! Será utilizado o IP do host como endereço IPMI."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Host (crescente)"
 
@@ -6144,66 +6308,68 @@ msgstr "IP do host"
 msgid "Host access"
 msgstr "Acesso ao host"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Host adicionado"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "O host não pode ter mais do que uma interface padrão do mesmo tipo."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Contagem de hosts"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Host eliminado"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Grupo de hosts"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Grupo de hosts \"%1$s\" já existe."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6220,14 +6386,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "Tipo de etiqueta do grupo de hosts"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Grupos de hosts"
 
@@ -6237,8 +6404,8 @@ msgstr "Grupos de hosts"
 msgid "Host interface"
 msgstr "Interface do host"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Inventário do host"
 
@@ -6254,7 +6421,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "Tipo de etiqueta do host"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Lista de hosts"
 
@@ -6263,18 +6430,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Nome do host"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6283,72 +6450,72 @@ msgstr ""
 msgid "Host networks"
 msgstr "Redes do host"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6360,7 +6527,7 @@ msgstr ""
 msgid "Host router"
 msgstr "Router do host"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Ecrãs do host"
 
@@ -6372,51 +6539,52 @@ msgstr "Estado do host"
 msgid "Host subnet mask"
 msgstr "Máscara de rede do host"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Hora do host"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Não foi possível actualizar o host."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Host actualizado"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Já existe um host com o nome \"%s\"."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Já existe um host com o nome visível \"%s\"."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hosts"
 
@@ -6424,11 +6592,11 @@ msgstr "Hosts"
 msgid "Hosts & Groups"
 msgstr "Hosts e Grupos"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hosts (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Hosts / templates"
 
@@ -6440,37 +6608,38 @@ msgstr "Hosts em"
 msgid "Hosts in maintenance"
 msgstr "Hosts em manutenção"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Informação de hosts"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Localização dos hosts"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Hosts actualizados"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Por hora"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Horas"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Húngaro (hu_HU)"
 
@@ -6488,22 +6657,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6511,26 +6680,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "O campo IP e DNS não podem ficar em branco para a interface do host."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Gama de IPs"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "Gama de IPs não pode estar vazia."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6538,22 +6707,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "Agente IPMI"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "Algoritmo de autenticação IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Interfaces IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "Palavra-passe IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Nível de privilégios IPMI"
 
@@ -6563,7 +6732,7 @@ msgstr "Nível de privilégios IPMI"
 msgid "IPMI sensor"
 msgstr "Sensor IPMI"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "Utilizador IPMI"
 
@@ -6596,7 +6765,7 @@ msgstr "Dependências do serviço IT"
 msgid "IT service parent"
 msgstr "Pai do serviço IT"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6612,25 +6781,25 @@ msgid "ITEMS"
 msgstr "ITENS"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ícone"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Ícone (por omissão)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Ícone (desactivado)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Ícone (manutenção)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Ícone (problema)"
 
@@ -6651,42 +6820,44 @@ msgstr "Tipo de etiqueta do ícone"
 msgid "Icon map"
 msgstr "Mapeamento de ícone"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
-msgstr "O mapeamento de ícone \"%1$s\" não pode ser eliminado. Está a ser utilizado no mapa \"%2$s\".O mapeamento de ícone \"%1$s\" não pode ser eliminado. Está a ser utilizado no mapa \"%2$s\".O mapeamento de ícone \"%1$s\" não pode ser eliminado. Está a ser utilizado no mapa \"%2$s\".O mapeamento de ícone \"%1$s\" não pode ser eliminado. Está a ser utilizado no mapa \"%2$s\".O mapeamento de ícone \"%1$s\" não pode ser eliminado. Está a ser utilizado no mapa \"%2$s\"."
+msgstr "O mapeamento de ícone \"%1$s\" não pode ser eliminado. Está a ser utilizado no mapa \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
-msgstr "O mapa de ícone \"%1$s\" tem um mapeamento com um iconid \"%2$s\" incorrecto.O mapa de ícone \"%1$s\" tem um mapeamento com um iconid \"%2$s\" incorrecto.O mapa de ícone \"%1$s\" tem um mapeamento com um iconid \"%2$s\" incorrecto.O mapa de ícone \"%1$s\" tem um mapeamento com um iconid \"%2$s\" incorrecto.O mapa de ícone \"%1$s\" tem um mapeamento com um iconid \"%2$s\" incorrecto."
+msgstr "O mapa de ícone \"%1$s\" tem um mapeamento com um iconid \"%2$s\" incorrecto."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
-msgstr "O mapeamento de ícone \"%1$s\" tem um mapeamento com um link de inventário \"%2$s\" incorrecto.O mapeamento de ícone \"%1$s\" tem um mapeamento com um link de inventário \"%2$s\" incorrecto.O mapeamento de ícone \"%1$s\" tem um mapeamento com um link de inventário \"%2$s\" incorrecto.O mapeamento de ícone \"%1$s\" tem um mapeamento com um link de inventário \"%2$s\" incorrecto.O mapeamento de ícone \"%1$s\" tem um mapeamento com um link de inventário \"%2$s\" incorrecto."
+msgstr "O mapeamento de ícone \"%1$s\" tem um mapeamento com um link de inventário \"%2$s\" incorrecto."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "O mapeamento de ícone \"%s\" já existe."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, fuzzy, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
-msgstr "O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão vazia.O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão vazia.O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão vazia.O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão vazia.O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão vazia."
+msgstr "O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão vazia."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, fuzzy, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
-msgstr "O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão global que não exista.O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão global que não exista.O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão global que não exista.O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão global que não exista.O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão global que não exista."
+msgstr "O mapeamento de ícone \"%s\" não pode ter um mapeamento com uma expressão global que não exista."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "O mapeamento de ícone \"%s\" tem uma expressão incorrecta."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "O mapeamento de ícone \"%s\" tem de ter pelo menos um mapeamento."
@@ -6699,7 +6870,8 @@ msgstr "O mapeamento de ícone criado"
 msgid "Icon map deleted"
 msgstr "O mapeamento de ícone eliminado"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "O mapeamento de ícone não pode ser vazio."
 
@@ -6707,29 +6879,29 @@ msgstr "O mapeamento de ícone não pode ser vazio."
 msgid "Icon map updated"
 msgstr "O mapeamento de ícone actualizado"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "O mapeamento de ícone com iconmapid \"%s\" não existe."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "O mapeamento de ícone"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "A entrada \"%1$s\" de mapeamento de ícone contra \"%2$s\" já existe."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "O mapeamento de ícone não está activado"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Ícones"
 
@@ -6737,21 +6909,23 @@ msgstr "Ícones"
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
-msgstr "Se acha que esta mensagem está errada, por favor consulte os administradores a fim de conseguir as permissões necessárias.Se acha que esta mensagem está errada, por favor consulte os administradores a fim de conseguir as permissões necessárias.Se acha que esta mensagem está errada, por favor consulte os administradores a fim de conseguir as permissões necessárias.Se acha que esta mensagem está errada, por favor consulte os administradores a fim de conseguir as permissões necessárias.Se acha que esta mensagem está errada, por favor consulte os administradores a fim de conseguir as permissões necessárias."
+msgstr "Se acha que esta mensagem está errada, por favor consulte os administradores a fim de conseguir as permissões necessárias."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Imagem"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6760,7 +6934,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Imagem adicionada"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Imagem eliminada"
 
@@ -6768,12 +6942,13 @@ msgstr "Imagem eliminada"
 msgid "Image label type"
 msgstr "Tipo de etiqueta da imagem"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Erro ao carregar a imagem [%1$s] em [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "A imagem deverá ocupar menos que 1MB."
 
@@ -6782,66 +6957,66 @@ msgid "Image updated"
 msgstr "Imagem actualizada"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Imagens"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Irão ser actualizadas as imagens de todos os mapas!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Imediatamente"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Importar"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Importação falhou"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Importar fisheiro"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Importado com sucesso"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Impossível filtrar pelo campo de inventário \"%s\", pois este não existe."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Impossível remover a última linha e coluna."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "Em"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "Em grupo"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Nos grupos"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6854,244 +7029,282 @@ msgstr "Em manutenção"
 msgid "In progress"
 msgstr "Em progresso"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Incluir"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Valor do campo \"soft\" incorrecto para a dependência do serviço \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "A etiqueta do tipo %1$s não é válida para o mapa \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Gama de IPs \"%s\" inválida."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "OID SNMP inválido."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Community SNMP incorrecta."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Valor de SLA aceitável incorrecto para o serviço \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "A verificação de descoberta é invalida para esta acção."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
-msgstr "A acção tem uma condição de descoberta inválida. A verificação de descoberta não existe ou o utilizador não tem acesso a ela.A acção tem uma condição de descoberta inválida. A verificação de descoberta não existe ou o utilizador não tem acesso a ela.A acção tem uma condição de descoberta inválida. A verificação de descoberta não existe ou o utilizador não tem acesso a ela.A acção tem uma condição de descoberta inválida. A verificação de descoberta não existe ou o utilizador não tem acesso a ela.A acção tem uma condição de descoberta inválida. A verificação de descoberta não existe ou o utilizador não tem acesso a ela."
+msgstr "A acção tem uma condição de descoberta inválida. A verificação de descoberta não existe ou o utilizador não tem acesso a ela."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
-msgstr "A acção tem uma condição de descoberta inválida. A regra de descoberta não existe ou o utilizador não tem acesso a ela.A acção tem uma condição de descoberta inválida. A regra de descoberta não existe ou o utilizador não tem acesso a ela.A acção tem uma condição de descoberta inválida. A regra de descoberta não existe ou o utilizador não tem acesso a ela.A acção tem uma condição de descoberta inválida. A regra de descoberta não existe ou o utilizador não tem acesso a ela.A acção tem uma condição de descoberta inválida. A regra de descoberta não existe ou o utilizador não tem acesso a ela."
+msgstr "A acção tem uma condição de descoberta inválida. A regra de descoberta não existe ou o utilizador não tem acesso a ela."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "A acção tem uma condição de descoberta com um estado inválido."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
-msgstr "A acção tem uma condição de grupo de hosts inválida. O grupo de hosts não existe ou o utilizador não tem acesso a ele.A acção tem uma condição de grupo de hosts inválida. O grupo de hosts não existe ou o utilizador não tem acesso a ele.A acção tem uma condição de grupo de hosts inválida. O grupo de hosts não existe ou o utilizador não tem acesso a ele.A acção tem uma condição de grupo de hosts inválida. O grupo de hosts não existe ou o utilizador não tem acesso a ele.A acção tem uma condição de grupo de hosts inválida. O grupo de hosts não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma condição de grupo de hosts inválida. O grupo de hosts não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
-msgstr "A acção tem uma condição de host inválida. O host não existe ou o utilizador não tem acesso a ele.A acção tem uma condição de host inválida. O host não existe ou o utilizador não tem acesso a ele.A acção tem uma condição de host inválida. O host não existe ou o utilizador não tem acesso a ele.A acção tem uma condição de host inválida. O host não existe ou o utilizador não tem acesso a ele.A acção tem uma condição de host inválida. O host não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma condição de host inválida. O host não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
-msgstr "A acção tem uma condição com proxy inválido. O proxy não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com proxy inválido. O proxy não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com proxy inválido. O proxy não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com proxy inválido. O proxy não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com proxy inválido. O proxy não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma condição com proxy inválido. O proxy não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
-msgstr "A acção tem uma condição com template inválido. O template não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com template inválido. O template não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com template inválido. O template não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com template inválido. O template não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com template inválido. O template não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma condição com template inválido. O template não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
-msgstr "A acção tem uma condição com trigger inválido. O trigger não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com trigger inválido. O trigger não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com trigger inválido. O trigger não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com trigger inválido. O trigger não existe ou o utilizador não tem acesso a ele.A acção tem uma condição com trigger inválido. O trigger não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma condição com trigger inválido. O trigger não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "A acção tem uma condição com tipo inválido."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "A acção tem uma condição com conditionid inválido."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "A acção tem uma condição de operação com tipo de comando inválido."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
-msgstr "A acção tem uma condição de operação com tipo de reconhecimento inválido.A acção tem uma condição de operação com tipo de reconhecimento inválido.A acção tem uma condição de operação com tipo de reconhecimento inválido.A acção tem uma condição de operação com tipo de reconhecimento inválido.A acção tem uma condição de operação com tipo de reconhecimento inválido."
+msgstr "A acção tem uma condição de operação com tipo de reconhecimento inválido."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "A acção tem uma condição de operação com tipo inválido."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
-msgstr "A acção tem uma condição de operação com valor de passo de escalonamento inválido.A acção tem uma condição de operação com valor de passo de escalonamento inválido.A acção tem uma condição de operação com valor de passo de escalonamento inválido.A acção tem uma condição de operação com valor de passo de escalonamento inválido.A acção tem uma condição de operação com valor de passo de escalonamento inválido."
+msgstr "A acção tem uma condição de operação com valor de passo de escalonamento inválido."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
-msgstr "A acção tem uma operação com grupo de hosts inválido. O grupo de hosts não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com grupo de hosts inválido. O grupo de hosts não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com grupo de hosts inválido. O grupo de hosts não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com grupo de hosts inválido. O grupo de hosts não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com grupo de hosts inválido. O grupo de hosts não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma operação com grupo de hosts inválido. O grupo de hosts não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
-msgstr "A acção tem uma operação com host inválido. O host não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com host inválido. O host não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com host inválido. O host não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com host inválido. O host não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com host inválido. O host não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma operação com host inválido. O host não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "A acção tem uma operação com porto inválido \"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "A acção tem um passo de operação com duração inválida."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "A acção tem uma operação com tipo inválido."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
-msgstr "A acção tem uma operação com grupo de utilizadores inválido. O grupo de utilizadores não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com grupo de utilizadores inválido. O grupo de utilizadores não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com grupo de utilizadores inválido. O grupo de utilizadores não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com grupo de utilizadores inválido. O grupo de utilizadores não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com grupo de utilizadores inválido. O grupo de utilizadores não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma operação com grupo de utilizadores inválido. O grupo de utilizadores não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
-msgstr "A acção tem uma operação com utilizador inválido. O utilizador não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com utilizador inválido. O utilizador não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com utilizador inválido. O utilizador não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com utilizador inválido. O utilizador não existe ou o utilizador não tem acesso a ele.A acção tem uma operação com utilizador inválido. O utilizador não existe ou o utilizador não tem acesso a ele."
+msgstr "A acção tem uma operação com utilizador inválido. O utilizador não existe ou o utilizador não tem acesso a ele."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "A acção tem uma operação com operationid inválido."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Algoritmo incorrecto para o serviço \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Argumentos incorrectos passados para a função"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Argumentos incorrectos passados para a função."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Argumentos incorrectos passados para o método."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Valor de cálculo de SLA incorrecto para o serviço \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Foram utilizados caracteres inválidos para o nome do host \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Atraso inválido."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7101,24 +7314,24 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
 #: include/classes/db/DB.php:534 include/classes/db/DB.php:808
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
-msgstr "O nome para o campo \"%1$s\" é inválido ou o valor é incorrecto para a tabela \"%2$s\".O nome para o campo \"%1$s\" é inválido ou o valor é incorrecto para a tabela \"%2$s\".O nome para o campo \"%1$s\" é inválido ou o valor é incorrecto para a tabela \"%2$s\".O nome para o campo \"%1$s\" é inválido ou o valor é incorrecto para a tabela \"%2$s\".O nome para o campo \"%1$s\" é inválido ou o valor é incorrecto para a tabela \"%2$s\"."
+msgstr "O nome para o campo \"%1$s\" é inválido ou o valor é incorrecto para a tabela \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Campos inválidos para o trigger."
 
@@ -7126,74 +7339,100 @@ msgstr "Campos inválidos para o trigger."
 msgid "Incorrect file upload."
 msgstr "Ficheiro de upload inválido."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "O intervalo flexível \"%1$s\" é inválido."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
-msgstr "O intervalo flexível do campo \"%1$s\" é inválido. O intervalo flexível tem se ser uma string.O intervalo flexível do campo \"%1$s\" é inválido. O intervalo flexível tem se ser uma string.O intervalo flexível do campo \"%1$s\" é inválido. O intervalo flexível tem se ser uma string.O intervalo flexível do campo \"%1$s\" é inválido. O intervalo flexível tem se ser uma string.O intervalo flexível do campo \"%1$s\" é inválido. O intervalo flexível tem se ser uma string."
+msgstr "O intervalo flexível do campo \"%1$s\" é inválido. O intervalo flexível tem se ser uma string."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Usada função incorrecta"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Grupo de hosts inválido."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7201,182 +7440,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr "Índice de imagem inválido."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Foi fornecido um parâmetro DNS inválido \"%s\" para a interface."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Foi fornecido um parâmetro IP inválido \"%s\" para a interface."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Foi fornecido um porto inválido \"%s\" para a interface."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Campo de inventário \"%s\" inválido."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Item inválido para o valor eixo."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
-msgstr "Está a ser utilizada uma chave de item inválida \"%1$s\" na expressão do trigger em \"%2$s\".Está a ser utilizada uma chave de item inválida \"%1$s\" na expressão do trigger em \"%2$s\".Está a ser utilizada uma chave de item inválida \"%1$s\" na expressão do trigger em \"%2$s\".Está a ser utilizada uma chave de item inválida \"%1$s\" na expressão do trigger em \"%2$s\".Está a ser utilizada uma chave de item inválida \"%1$s\" na expressão do trigger em \"%2$s\"."
+msgstr "Está a ser utilizada uma chave de item inválida \"%1$s\" na expressão do trigger em \"%2$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Chave inválida."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Lista de itens incorrecta."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
-msgstr "Período de manutenção inválido - a data deve estar entre 01/01/1970 e 18/01/2038Período de manutenção inválido - a data deve estar entre 01/01/1970 e 18/01/2038Período de manutenção inválido - a data deve estar entre 01/01/1970 e 18/01/2038Período de manutenção inválido - a data deve estar entre 01/01/1970 e 18/01/2038Período de manutenção inválido - a data deve estar entre 01/01/1970 e 18/01/2038"
+msgstr "Período de manutenção inválido - a data deve estar entre 01/01/1970 e 18/01/2038"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Data de manutenção incorrecta"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Dias de manutenção incorrectos"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Dias da semana de manutenção incorrectos"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Mês de manutenção incorrecto"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Período de manutenção incorrecto"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Período de manutenção inválido (o mínimo é de 5 minutos)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Semana de manutenção incorrecta"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "A altura do mapa \"%s\" é inválida."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "A largura do mapa \"%s\" é inválida."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Parâmetro inválido para operações."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Parâmetro inválido utilizado no mapeamento de ícone \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Parâmetros inválidos para a condição."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, fuzzy, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
-msgstr "Parâmetros inválidos para o método de actualização do mapeamento de ícone \"%s\".Parâmetros inválidos para o método de actualização do mapeamento de ícone \"%s\".Parâmetros inválidos para o método de actualização do mapeamento de ícone \"%s\".Parâmetros inválidos para o método de actualização do mapeamento de ícone \"%s\".Parâmetros inválidos para o método de actualização do mapeamento de ícone \"%s\"."
+msgstr "Parâmetros inválidos para o método de actualização do mapeamento de ícone \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Parâmetros inválidos para manutenção."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Parâmetros inválidos para grupo de utilizadores."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Parâmetros inválidos para o serviço pai \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Serviço pai inválido."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Gama de portos incorrecto."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Valor de proxyid inválido."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Tipo de recurso fornecido para o item do ecrã."
 
@@ -7385,64 +7643,68 @@ msgstr "Tipo de recurso fornecido para o item do ecrã."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Foi fornecido um ecrã inválido para a apresentação do slideshow."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "O horário final do serviço é inválido."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "O horário inicial do serviço é inválido."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "O tipo de hora do serviço é inválido."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "A ordenação do serviço \"%1$s\" é inválida."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "O estado do serviço \"%1$s\" é inválido."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Estado inválido."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7450,12 +7712,12 @@ msgstr ""
 #: include/classes/validators/CTimePeriodValidator.php:99
 #, c-format
 msgid "Incorrect time period \"%1$s\" start day must be less or equal to end day."
-msgstr "A data de início fornecida \"%1$s\" é inválida, deverá ser igual ou superior ao dia final.A data de início fornecida \"%1$s\" é inválida, deverá ser igual ou superior ao dia final.A data de início fornecida \"%1$s\" é inválida, deverá ser igual ou superior ao dia final.A data de início fornecida \"%1$s\" é inválida, deverá ser igual ou superior ao dia final.A data de início fornecida \"%1$s\" é inválida, deverá ser igual ou superior ao dia final."
+msgstr "A data de início fornecida \"%1$s\" é inválida, deverá ser igual ou superior ao dia final."
 
 #: include/classes/validators/CTimePeriodValidator.php:105
 #, c-format
 msgid "Incorrect time period \"%1$s\" start time must be less than end time."
-msgstr "O horário de início fornecido \"%1$s\" é inválido, deverá ser igual ou superior ao horário final.O horário de início fornecido \"%1$s\" é inválido, deverá ser igual ou superior ao horário final.O horário de início fornecido \"%1$s\" é inválido, deverá ser igual ou superior ao horário final.O horário de início fornecido \"%1$s\" é inválido, deverá ser igual ou superior ao horário final.O horário de início fornecido \"%1$s\" é inválido, deverá ser igual ou superior ao horário final."
+msgstr "O horário de início fornecido \"%1$s\" é inválido, deverá ser igual ou superior ao horário final."
 
 #: include/classes/validators/CTimePeriodValidator.php:89
 #: include/classes/validators/CTimePeriodValidator.php:94
@@ -7463,52 +7725,57 @@ msgstr "O horário de início fornecido \"%1$s\" é inválido, deverá ser igual
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Período de tempo \"%1$s\" inválido."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "O serviço \"%1$s\" tem um trigger ID inválido."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Expressão de trigger incorrecta"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Trigger com expressão inválida."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
-msgstr "Trigger com expressão inválida. O host \"%1$s\" não existe ou o utilizador não acesso a ele.Trigger com expressão inválida. O host \"%1$s\" não existe ou o utilizador não acesso a ele.Trigger com expressão inválida. O host \"%1$s\" não existe ou o utilizador não acesso a ele.Trigger com expressão inválida. O host \"%1$s\" não existe ou o utilizador não acesso a ele.Trigger com expressão inválida. O host \"%1$s\" não existe ou o utilizador não acesso a ele."
+msgstr "Trigger com expressão inválida. O host \"%1$s\" não existe ou o utilizador não acesso a ele."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, fuzzy, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
-msgstr "Trigger com expressão inválida. O host \"%s\" não existe ou o utilizador não acesso a ele.Trigger com expressão inválida. O host \"%s\" não existe ou o utilizador não acesso a ele.Trigger com expressão inválida. O host \"%s\" não existe ou o utilizador não acesso a ele.Trigger com expressão inválida. O host \"%s\" não existe ou o utilizador não acesso a ele.Trigger com expressão inválida. O host \"%s\" não existe ou o utilizador não acesso a ele."
+msgstr "Trigger com expressão inválida. O host \"%s\" não existe ou o utilizador não acesso a ele."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
-msgstr "Trigger com expressão inválida. Os elementos da expressão não podem fazer referência a um template e a um host em simultâneo.Trigger com expressão inválida. Os elementos da expressão não podem fazer referência a um template e a um host em simultâneo.Trigger com expressão inválida. Os elementos da expressão não podem fazer referência a um template e a um host em simultâneo.Trigger com expressão inválida. Os elementos da expressão não podem fazer referência a um template e a um host em simultâneo.Trigger com expressão inválida. Os elementos da expressão não podem fazer referência a um template e a um host em simultâneo."
+msgstr "Trigger com expressão inválida. Os elementos da expressão não podem fazer referência a um template e a um host em simultâneo."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "A expressão do trigger possui uma função inválida \"%1$s\"."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Tipo incorrecto de asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Grupo de utilizadores inválido."
 
@@ -7517,7 +7784,8 @@ msgstr "Grupo de utilizadores inválido."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7537,7 +7805,7 @@ msgstr "O valor \"%1$s\" é inválido para o campo int \"%2$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o campo unsigned int \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7547,43 +7815,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Valor inválido para setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Horário de trabalho inválido."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Ponto máximo Y inválido para o gráfico \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Ponto mínimo Y inválido para o gráfico \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonésio (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Informação"
 
@@ -7592,15 +7866,15 @@ msgstr "Informação"
 msgid "Information"
 msgstr "Informação"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Inserir"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Inserir macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Instalação"
 
@@ -7608,31 +7882,32 @@ msgstr "Instalação"
 msgid "Installer name"
 msgstr "Nome do instalador"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Interface"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "A interface está associada ao item \"%1$s\" em \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
-msgstr "A interface está a ser utilizada por itens que requerem este tipo de interface.A interface está a ser utilizada por itens que requerem este tipo de interface.A interface está a ser utilizada por itens que requerem este tipo de interface.A interface está a ser utilizada por itens que requerem este tipo de interface.A interface está a ser utilizada por itens que requerem este tipo de interface."
+msgstr "A interface está a ser utilizada por itens que requerem este tipo de interface."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "A interface com o DNS \"%1$s\" não pode ter o campo IP vazio."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
-msgstr "A interface com o IP \"%1$s\" não pode ter o DNS vazio enquanto a propriedade \"Utilizar DNS\" estiver seleccionada em \"%2$s\".A interface com o IP \"%1$s\" não pode ter o DNS vazio enquanto a propriedade \"Utilizar DNS\" estiver seleccionada em \"%2$s\".A interface com o IP \"%1$s\" não pode ter o DNS vazio enquanto a propriedade \"Utilizar DNS\" estiver seleccionada em \"%2$s\".A interface com o IP \"%1$s\" não pode ter o DNS vazio enquanto a propriedade \"Utilizar DNS\" estiver seleccionada em \"%2$s\".A interface com o IP \"%1$s\" não pode ter o DNS vazio enquanto a propriedade \"Utilizar DNS\" estiver seleccionada em \"%2$s\"."
+msgstr "A interface com o IP \"%1$s\" não pode ter o DNS vazio enquanto a propriedade \"Utilizar DNS\" estiver seleccionada em \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "A interface com o IP \"%1$s\" não pode ter o nome de DNS vazio."
@@ -7652,7 +7927,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Erro interno no JSON-RPC."
 
@@ -7660,7 +7935,7 @@ msgstr "Erro interno no JSON-RPC."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Erro interno."
 
@@ -7673,19 +7948,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Intervalo"
 
@@ -7695,112 +7970,114 @@ msgstr "Intervalo"
 msgid "Interval (in sec)"
 msgstr "Intervalo (em seg)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
-msgstr "JSON inválido. Ocorreu um erro quando o servidor processava o texto JSON.JSON inválido. Ocorreu um erro quando o servidor processava o texto JSON.JSON inválido. Ocorreu um erro quando o servidor processava o texto JSON.JSON inválido. Ocorreu um erro quando o servidor processava o texto JSON.JSON inválido. Ocorreu um erro quando o servidor processava o texto JSON."
+msgstr "JSON inválido. Ocorreu um erro quando o servidor processava o texto JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Pedido inválido."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Data inválida \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "hostid inválido para a macro \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Período de manutenção inválido"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Parâmetros inválidos para o método."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Parâmetros inválidos."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Código de resposta inválido \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Gama de códigos de resposta inválida \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Horário inválido"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Nome inválido para a vista \"%s\". Caracteres permitidos: \"a-z\" e \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventário"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7809,7 +8086,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Campo do inventário"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Modo de inventário"
 
@@ -7817,12 +8094,12 @@ msgstr "Modo de inventário"
 msgid "Is online?"
 msgstr "Online?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Assunto"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Não é possível filtrar pela palavra-passe do utilizador."
 
@@ -7830,70 +8107,71 @@ msgstr "Não é possível filtrar pela palavra-passe do utilizador."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Não é possível terminar sessão quando autenticado por HTTP."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Não é possível pesquisar pela palavra-passe do utilizador."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italiano (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Item"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "O item \"%1$s\" já existe em \"%2$s\", herdado de outro template."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "O item \"%1$s\" não pode popular um campo em falta num host \"%2$d\". As opções são: de 0 (não popular) até %3$d.O item \"%1$s\" não pode popular um campo em falta num host \"%2$d\". As opções são: de 0 (não popular) até %3$d.O item \"%1$s\" não pode popular um campo em falta num host \"%2$d\". As opções são: de 0 (não popular) até %3$d.O item \"%1$s\" não pode popular um campo em falta num host \"%2$d\". As opções são: de 0 (não popular) até %3$d.O item \"%1$s\" não pode popular um campo em falta num host \"%2$d\". As opções são: de 0 (não popular) até %3$d."
+msgstr "O item \"%1$s\" não pode popular um campo em falta num host \"%2$d\". As opções são: de 0 (não popular) até %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "O item \"%1$s\" não existe no template \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "O item \"%1$s\" não existe."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "O item \"%1$s\" em \"%2$s\": a aplicação \"%3$s\" não existe."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "O item \"%1$s\" foi ignorado - regra de utilizador."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "O item \"%1$s:%2$s\" tem um porto inválido: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Item adicionado"
 
@@ -7901,17 +8179,17 @@ msgstr "Item adicionado"
 msgid "Item count"
 msgstr "Contagem de itens"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Item eliminado"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7925,56 +8203,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Protótipo de item"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Protótipos de itens"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7982,92 +8260,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Protótipos de item de"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Item actualizado"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "O item utiliza uma interface inexistente no host de origem."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "O item utiliza um tipo de interface inválido."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
-msgstr "O item não será actualizado. Por favor especifique um intervalo de actualização correcto.O item não será actualizado. Por favor especifique um intervalo de actualização correcto.O item não será actualizado. Por favor especifique um intervalo de actualização correcto.O item não será actualizado. Por favor especifique um intervalo de actualização correcto.O item não será actualizado. Por favor especifique um intervalo de actualização correcto."
+msgstr "O item não será actualizado. Por favor especifique um intervalo de actualização correcto."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
-msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como uma regra de descoberta.Já existe um item com a chave \"%1$s\" em \"%2$s\" como uma regra de descoberta.Já existe um item com a chave \"%1$s\" em \"%2$s\" como uma regra de descoberta.Já existe um item com a chave \"%1$s\" em \"%2$s\" como uma regra de descoberta.Já existe um item com a chave \"%1$s\" em \"%2$s\" como uma regra de descoberta."
+msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como uma regra de descoberta."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
-msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item criado a partir de um protótipo de item.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item criado a partir de um protótipo de item.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item criado a partir de um protótipo de item.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item criado a partir de um protótipo de item.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item criado a partir de um protótipo de item."
+msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item criado a partir de um protótipo de item."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
-msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como um protótipo de item.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um protótipo de item.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um protótipo de item.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um protótipo de item.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um protótipo de item."
+msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como um protótipo de item."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
-msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item desconhecido.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item desconhecido.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item desconhecido.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item desconhecido.Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item desconhecido."
+msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\" como um item desconhecido."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Itens"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Itens (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Itens copiados"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Itens eliminados"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Lista de itens"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Itens actualizados"
 
@@ -8079,72 +8357,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "Agente JMX"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "Interfaces JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Falha ao gerar o erro JSON-rpc. O erro \"%s\" não existe."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "O método JSON-rpc não está definido."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "Os parâmetros JSON-rpc não são um Array."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "A versão do JSON-rpc não foi especificada."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Identificador Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Janeiro"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japonês (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Jul"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Julho"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Jun"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Junho"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8153,40 +8431,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Período de retenção de recursos perdidos (em dias)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Chave"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
-msgstr "A chave \"%1$s\" não faz corresponde <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"].A chave \"%1$s\" não faz corresponde <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"].A chave \"%1$s\" não faz corresponde <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"].A chave \"%1$s\" não faz corresponde <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"].A chave \"%1$s\" não faz corresponde <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
+msgstr "A chave \"%1$s\" não faz corresponde <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Frase chave"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Palavra-chave"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Coreano (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "ÚLTIMOS DADOS"
 
@@ -8217,37 +8495,37 @@ msgstr "Sucesso na autenticação LDAP"
 msgid "LDAP login was not successful"
 msgstr "Insucesso na autenticação LDAP"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "PERDIDO"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Etiqueta"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Localização da etiqueta"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Língua"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Último"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Último"
@@ -8259,19 +8537,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] "Último %1$d problema"
 msgstr[1] "Últimos %1$d problemas"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Último (mais recente) valor de T é < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Último (mais recente) valor de T é = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Último (mais recente) valor de T é > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Último (mais recente) valor de T é != N"
 
@@ -8291,28 +8569,28 @@ msgstr "Últimos 365d"
 msgid "Last 7 days"
 msgstr "Últimos 7d"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Última alteração"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Última modificação (decrescente)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Última verificação"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Gráfico da última hora"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Gráfico do último mês"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Último de"
 
@@ -8320,66 +8598,67 @@ msgstr "Último de"
 msgid "Last seen (age)"
 msgstr "Última vez visto (idade)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Gráfico da última semana"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Dados recentes"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Últimos eventos"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Lituâno (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Esquerda"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legenda"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Tamanho do último (mais recente) valor de T em caracteres é < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Tamanho do último (mais recente) valor de T em caracteres é = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Tamanho do último (mais recente) valor de T em caracteres é > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Tamanho do último (mais recente) valor de T em caracteres é != N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Linha"
 
@@ -8387,39 +8666,29 @@ msgstr "Linha"
 msgid "Link"
 msgstr "Ligação"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Indicadores de ligação"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "O nome da ligação deve ser único para o mapa \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
-msgstr "O campo selementid1 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\".O campo selementid1 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\".O campo selementid1 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\".O campo selementid1 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\".O campo selementid1 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\"."
+msgstr "O campo selementid1 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
-msgstr "O campo selementid2 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\".O campo selementid2 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\".O campo selementid2 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\".O campo selementid2 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\".O campo selementid2 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\"."
-
-#: api/classes/CMap.php:452
-#, fuzzy, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "A ligação precisa ter os campos \"nome\" e \"url\" preenchidos para o mapa \"%s\".A ligação precisa ter os campos \"nome\" e \"url\" preenchidos para o mapa \"%s\".A ligação precisa ter os campos \"nome\" e \"url\" preenchidos para o mapa \"%s\".A ligação precisa ter os campos \"nome\" e \"url\" preenchidos para o mapa \"%s\".A ligação precisa ter os campos \"nome\" e \"url\" preenchidos para o mapa \"%s\"."
+msgstr "O campo selementid2 tem uma ligação que aponta para um selement ID \"%1$s\" inexistente para o mapa \"%2$s\"."
 
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Ligação entre templates"
 
@@ -8431,50 +8700,50 @@ msgstr "Ligar a template"
 msgid "Link to templates"
 msgstr "Ligar a templates"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Ligar com templates"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Templates associados"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Associado a"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Associações entre os elementos selecionados"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Associações para o elemento selecionado"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "A lista está vazia"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "A carregar..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Hora local"
 
@@ -8491,36 +8760,36 @@ msgid "Location longitude"
 msgstr "Longitude da localização"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "A severidade da última entrada do log é < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "A severidade da última entrada do log é = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "A severidade da última entrada do log é > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "A severidade da última entrada do log é != N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
-msgstr "A origem da última entrada do log que corresponde ao parâmetro T, então N = 1, 0 - caso contrárioA origem da última entrada do log que corresponde ao parâmetro T, então N = 1, 0 - caso contrárioA origem da última entrada do log que corresponde ao parâmetro T, então N = 1, 0 - caso contrárioA origem da última entrada do log que corresponde ao parâmetro T, então N = 1, 0 - caso contrárioA origem da última entrada do log que corresponde ao parâmetro T, então N = 1, 0 - caso contrário"
+msgstr "A origem da última entrada do log que corresponde ao parâmetro T, então N = 1, 0 - caso contrário"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
-msgstr "A origem da última entrada do log que corresponde ao parâmetro T, então N != 1, 0 - caso contrárioA origem da última entrada do log que corresponde ao parâmetro T, então N != 1, 0 - caso contrárioA origem da última entrada do log que corresponde ao parâmetro T, então N != 1, 0 - caso contrárioA origem da última entrada do log que corresponde ao parâmetro T, então N != 1, 0 - caso contrárioA origem da última entrada do log que corresponde ao parâmetro T, então N != 1, 0 - caso contrário"
+msgstr "A origem da última entrada do log que corresponde ao parâmetro T, então N != 1, 0 - caso contrário"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Formato de data no log"
@@ -8529,12 +8798,12 @@ msgstr "Formato de data no log"
 msgid "Log unmatched SNMP traps"
 msgstr "Registar traps SNMP sem correspondência"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Sessão iniciada como"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8545,12 +8814,12 @@ msgstr "Iniciar sessão"
 msgid "Login as Guest"
 msgstr "Entrar como Guest"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Falha no início de sessão \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8559,8 +8828,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Utilizador ou palavra-passe erradas."
 
@@ -8581,22 +8851,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8608,7 +8874,7 @@ msgstr "Endereço MAC A"
 msgid "MAC address B"
 msgstr "Endereço MAC B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "MANUTENÇÃO"
 
@@ -8633,49 +8899,49 @@ msgstr "TRIGGERS MAIS ACTIVOS - TOP 100"
 msgid "Macro"
 msgstr "Macro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "A macro \"%1$s\" já existe em \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "A macro \"%1$s\" já existe."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "A macro \"%1$s\" não é única."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
-msgstr "O valor para a macro \"%1$s\" é muito longo, o valor não deve exceder 255 caracteres.O valor para a macro \"%1$s\" é muito longo, o valor não deve exceder 255 caracteres.O valor para a macro \"%1$s\" é muito longo, o valor não deve exceder 255 caracteres.O valor para a macro \"%1$s\" é muito longo, o valor não deve exceder 255 caracteres.O valor para a macro \"%1$s\" é muito longo, o valor não deve exceder 255 caracteres."
+msgstr "O valor para a macro \"%1$s\" é muito longo, o valor não deve exceder 255 caracteres."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
-msgstr "O nome da macro \"%1$s\" é muito longo, o valor não deve exceder 64 caracteres.O nome da macro \"%1$s\" é muito longo, o valor não deve exceder 64 caracteres.O nome da macro \"%1$s\" é muito longo, o valor não deve exceder 64 caracteres.O nome da macro \"%1$s\" é muito longo, o valor não deve exceder 64 caracteres.O nome da macro \"%1$s\" é muito longo, o valor não deve exceder 64 caracteres."
+msgstr "O nome da macro \"%1$s\" é muito longo, o valor não deve exceder 64 caracteres."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "Não existe uma macro com globalmacroid \"%1$s\"."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Não existe uma macro com hostmacroid \"%1$s\"."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Macros"
 
@@ -8683,31 +8949,36 @@ msgstr "Macros"
 msgid "Macros updated"
 msgstr "Macros actualizadas"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Manutenção"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "A manutenção \"%s\" já existe."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
-msgstr "O valor fornecido no campo \"Activo a partir de\" não pode ser superior ao valor definido para \"Activo até\" na manutenção programada.O valor fornecido no campo \"Activo a partir de\" não pode ser superior ao valor definido para \"Activo até\" na manutenção programada.O valor fornecido no campo \"Activo a partir de\" não pode ser superior ao valor definido para \"Activo até\" na manutenção programada.O valor fornecido no campo \"Activo a partir de\" não pode ser superior ao valor definido para \"Activo até\" na manutenção programada.O valor fornecido no campo \"Activo a partir de\" não pode ser superior ao valor definido para \"Activo até\" na manutenção programada."
+msgstr "O valor fornecido no campo \"Activo a partir de\" não pode ser superior ao valor definido para \"Activo até\" na manutenção programada."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Manutenção adicionada"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Manutenção eliminada"
 
@@ -8715,7 +8986,7 @@ msgstr "Manutenção eliminada"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Duração do período de manutenção"
 
@@ -8731,25 +9002,25 @@ msgstr "Estado de manutenção"
 msgid "Maintenance type"
 msgstr "Tipo de manutenção"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Manutenção actualizada"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Período de manutenção com recolha de dados"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Período de manutenção sem recolha de dados"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Parâmetro obrigatório está em falta."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Manual"
 
@@ -8760,12 +9031,12 @@ msgstr "Término de sessão manual"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Mapa"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "O mapa \"%1$s\" foi ignorado - regra de utilizador."
@@ -8775,12 +9046,12 @@ msgstr "O mapa \"%1$s\" foi ignorado - regra de utilizador."
 msgid "Map \"%s\""
 msgstr "Mapa \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Mapa \"%s\" criado."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Mapa \"%s\" actualizado."
@@ -8797,12 +9068,12 @@ msgstr "Tipo de etiqueta do mapa"
 msgid "Map save operation failed."
 msgstr "Erro ao guardar mapa."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Mapeado para"
 
@@ -8812,23 +9083,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "O valor de mapeamento \"%1$s\" não é único."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Mapeamentos"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Mapas"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Março"
 
@@ -8836,28 +9107,34 @@ msgstr "Março"
 msgid "Mark elements on trigger status change"
 msgstr "Realçar elementos com modificação de estado do trigger"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Marcar outros"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Marcar seleccionados"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Actualização em massa"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Actualização de elementos em massa"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Número máximo de elementos mostrados dentro de uma célula de tabela"
@@ -8871,32 +9148,11 @@ msgstr "Contagem máxima de elementos a mostrar numa célula da tabela \"%1$s\".
 msgid "Max count of events per trigger to show"
 msgstr "Máximo de eventos por trigger a mostrar"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8904,107 +9160,101 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "O valor máximo para o período T é < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "O valor máximo para o período T é = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "O valor máximo para o período T é > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "O valor máximo para o período T é != N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Mai"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Maio"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Média"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Tipo de média"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "O tipo de média \"%s\" já existe."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Tipo de média adicionado"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Tipo de média eliminado"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Tipo de média desactivado"
 msgstr[1] "Tipo de média desactivado"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Tipo de média activado"
 msgstr[1] "Tipo de média activado"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Tipo de média actualizado"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Tipos de média"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Tipos de média utilizados na acção \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9019,14 +9269,14 @@ msgid "Memory limit: %s"
 msgstr "Limite de memória: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9036,7 +9286,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Mensagem"
 
@@ -9044,66 +9294,66 @@ msgstr "Mensagem"
 msgid "Message actions"
 msgstr "Acções de mensagem"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Limite da mensagem de texto"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Expiração da mensagem"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Expiração da mensagem (segundos)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Mensagens"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Mensagens"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Método não encontrado."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Centro"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9112,80 +9362,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "O valor mínimo para o período T é < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "O valor mínimo para o período T é = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "O valor mínimo para o período T é > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "O valor mínimo para o período T é != N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Minutos"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "O campo \"itemid\" está em falta para o item."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "O campo \"name\" está em falta para o gráfico."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "O item \"%1$s\" está em falta para o host \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Alguns itens estão em falta para o gráfico \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9195,7 +9442,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "A chave \"%1$s\" está em falta para o host \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Parâmetro em falta: usrgrpids."
 
@@ -9207,18 +9454,18 @@ msgstr "Modo"
 msgid "Model"
 msgstr "Modelo"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Seg"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Monitorizado por proxy"
 
@@ -9226,33 +9473,33 @@ msgstr "Monitorizado por proxy"
 msgid "Monitored host"
 msgstr "Host monitorizado"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Em monitoria"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Mês"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Mensal"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9260,7 +9507,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Mais de 10 minutos"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Mais de um gráfico com o nome \"%1$s\" no mesmo host."
@@ -9269,19 +9516,19 @@ msgstr "Mais de um gráfico com o nome \"%1$s\" no mesmo host."
 msgid "Most busy triggers top 100"
 msgstr "Triggers mais activados top 100"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Múltiplos eventos de PROBLEMA"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Geração de múltiplos eventos de PROBLEMA"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -9294,60 +9541,58 @@ msgstr "MAPAS DE REDE"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "SEM DADOS"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "Autenticação NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9358,26 +9603,32 @@ msgstr "Autenticação NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Nome"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9396,12 +9647,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9409,7 +9660,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Mapa de rede adicionado"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Mapa de rede eliminado"
 
@@ -9421,7 +9672,7 @@ msgstr "Mapa de rede actualizado"
 msgid "Network maps"
 msgstr "Mapas de rede"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Nunca"
 
@@ -9429,24 +9680,24 @@ msgstr "Nunca"
 msgid "Never executed"
 msgstr "Nunca executado"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Novo"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Nova aplicação"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Nova condição"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Novo elemento"
 
@@ -9457,16 +9708,16 @@ msgstr "Novo elemento"
 msgid "New flexible interval"
 msgstr "Novo intervalo flexível"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Novo grupo"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Novo grupo de hosts"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Novo item para o gráfico"
 
@@ -9474,83 +9725,99 @@ msgstr "Novo item para o gráfico"
 msgid "New media"
 msgstr "Novo média"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Nova expressão regular"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Novo horário de serviço"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Seguinte"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Seguinte"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Não"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "O campo \"ymax_type\" está em falta para o gráfico \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "O campo \"ymin_type\" está em falta para o gráfico \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9558,25 +9825,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Não foi fornecido um URL para o elemento do ecrã."
 
@@ -9602,8 +9869,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Não existem acções."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9613,7 +9880,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Não foi encontrada a aplicação com ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9621,30 +9888,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, fuzzy, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
-msgstr "Não foi definido o tipo de autenticação para a operação do comando da acção \"%s\".Não foi definido o tipo de autenticação para a operação do comando da acção \"%s\".Não foi definido o tipo de autenticação para a operação do comando da acção \"%s\".Não foi definido o tipo de autenticação para a operação do comando da acção \"%s\".Não foi definido o tipo de autenticação para a operação do comando da acção \"%s\"."
+msgstr "Não foi definido o tipo de autenticação para a operação do comando da acção \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, fuzzy, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
-msgstr "Não foi definido um utilizador para autenticação para a operação do comando da acção \"%s\".Não foi definido um utilizador para autenticação para a operação do comando da acção \"%s\".Não foi definido um utilizador para autenticação para a operação do comando da acção \"%s\".Não foi definido um utilizador para autenticação para a operação do comando da acção \"%s\".Não foi definido um utilizador para autenticação para a operação do comando da acção \"%s\"."
+msgstr "Não foi definido um utilizador para autenticação para a operação do comando da acção \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Não foi definido um nome de utilizador para autenticação."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Não foi definido nenhum comando para a operação da acção."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Não foi definido o tipo de comando para a operação da acção."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Sem condições definidas."
 
@@ -9653,27 +9921,27 @@ msgstr "Sem condições definidas."
 msgid "No data collection"
 msgstr "Não foram recolhidos dados"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
-msgstr "Sem dados recebidos durante um período de tempo T, então N = 1, 0 - caso contrárioSem dados recebidos durante um período de tempo T, então N = 1, 0 - caso contrárioSem dados recebidos durante um período de tempo T, então N = 1, 0 - caso contrárioSem dados recebidos durante um período de tempo T, então N = 1, 0 - caso contrárioSem dados recebidos durante um período de tempo T, então N = 1, 0 - caso contrário"
+msgstr "Sem dados recebidos durante um período de tempo T, então N = 1, 0 - caso contrário"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
-msgstr "Sem dados recebidos durante um período de tempo T, então N != 1, 0 - caso contrárioSem dados recebidos durante um período de tempo T, então N != 1, 0 - caso contrárioSem dados recebidos durante um período de tempo T, então N != 1, 0 - caso contrárioSem dados recebidos durante um período de tempo T, então N != 1, 0 - caso contrárioSem dados recebidos durante um período de tempo T, então N != 1, 0 - caso contrário"
+msgstr "Sem dados recebidos durante um período de tempo T, então N != 1, 0 - caso contrário"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Não existe interface padrão para o tipo \"%1$s\" em \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Sem dependências definidas."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Sem detalhes"
 
@@ -9681,39 +9949,39 @@ msgstr "Sem detalhes"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Não foram fornecidos IDs de regras de descoberta."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Não foram encontrados erros."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Sem eventos"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Não há eventos para reconhecer"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Não foi definido nenhum alvo para execução do comando da operação \"%s\"."
@@ -9728,7 +9996,7 @@ msgstr "Não foi feito upload do ficheiro."
 msgid "No flexible intervals defined."
 msgstr "Não foram definidos intervalos flexíveis."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Não foi fornecido o ID do gráfico para o elemento no ecrã."
 
@@ -9737,7 +10005,11 @@ msgstr "Não foi fornecido o ID do gráfico para o elemento no ecrã."
 msgid "No graph item with graphid \"%s\"."
 msgstr "Não existe nenhum gráfico com graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9746,48 +10018,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Não foram encontrados grupos para o host \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Não foram encontrados grupos para os hosts."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Não foram fornecidos host IDs."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Não foi fornecido host para a macro \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Não foi fornecido ID de grupo para o elemento do ecrã."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9800,17 +10073,22 @@ msgstr "Não foram encontrados grupos de hosts com groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Não foi encontrado nenhum host com hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Não foi encontrado o ícone para o elemento do mapa \"%s\"."
@@ -9829,33 +10107,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Interface não encontrado"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Interface não encontrado."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Não existem interfaces para o host \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Não foi fornecido um ID de item para o elemento do ecrã."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9874,7 +10159,7 @@ msgid "No items defined."
 msgstr "Não foram definidos itens."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9890,7 +10175,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Não foi fornecido nenhum ID de mapa para o elemento do ecrã."
 
@@ -9899,15 +10184,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9919,133 +10204,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Sem permissões para o gráfico \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Sem permissões para o host \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Sem permissões para o item \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Sem permissões para o template \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Sem permissões o trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Sem permissões"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Sem permissões para o grupo \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Sem permissões para o mapa \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Sem permissões para o ecrã \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Sem permissões para acesso ao sistema."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Sem permissões para o objecto referenciado ou o objecto não existe!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, fuzzy, c-format
 msgid "No private key file specified for action operation command \"%s\"."
-msgstr "Não foi especificado o ficheiro de chave privada para a operação comando da acção \"%s\".Não foi especificado o ficheiro de chave privada para a operação comando da acção \"%s\".Não foi especificado o ficheiro de chave privada para a operação comando da acção \"%s\".Não foi especificado o ficheiro de chave privada para a operação comando da acção \"%s\".Não foi especificado o ficheiro de chave privada para a operação comando da acção \"%s\"."
+msgstr "Não foi especificado o ficheiro de chave privada para a operação comando da acção \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Não foi especificado o ficheiro de chave privada."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Sem proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, fuzzy, c-format
 msgid "No public key file specified for action operation command \"%s\"."
-msgstr "Não foi especificado o ficheiro de chave pública para a operação comando acção \"%s\".Não foi especificado o ficheiro de chave pública para a operação comando acção \"%s\".Não foi especificado o ficheiro de chave pública para a operação comando acção \"%s\".Não foi especificado o ficheiro de chave pública para a operação comando acção \"%s\".Não foi especificado o ficheiro de chave pública para a operação comando acção \"%s\"."
+msgstr "Não foi especificado o ficheiro de chave pública para a operação comando acção \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Não foi especificado o ficheiro de chave pública."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Não existem destinos para a operação mensagem da acção."
 
@@ -10053,7 +10383,7 @@ msgstr "Não existem destinos para a operação mensagem da acção."
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Não foi fornecido nenhum ID de ecrã para o elemento do ecrã."
 
@@ -10061,82 +10391,83 @@ msgstr "Não foi fornecido nenhum ID de ecrã para o elemento do ecrã."
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Não foi especificado nenhum script para a operação comando da acção."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Não foi seleccionado nenhum destino"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Não foi seleccionado nenhum destino."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
-msgstr "Não foram definidos horários. O horário de trabalho será considerado 24x7.Não foram definidos horários. O horário de trabalho será considerado 24x7.Não foram definidos horários. O horário de trabalho será considerado 24x7.Não foram definidos horários. O horário de trabalho será considerado 24x7.Não foram definidos horários. O horário de trabalho será considerado 24x7."
+msgstr "Não foram definidos horários. O horário de trabalho será considerado 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Sem triggers"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Não existe nenhum trigger com triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Não existem triggers definidos."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Não foram encontrados triggers."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10145,57 +10476,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Não foram encontrados valores."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Nenhum"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normal"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Vista normal"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Por Reconher"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Itens não pertencem a nenhum template"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Nem todos os templates estão ligados a \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Não é possível definir uma palavra-passe para o utilizador \"guest\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Não disponível"
 
@@ -10204,7 +10536,7 @@ msgstr "Não disponível"
 msgid "Not classified"
 msgstr "Sem classificação"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Sem ligação"
 
@@ -10217,8 +10549,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Nota"
@@ -10231,7 +10563,7 @@ msgstr "Notas"
 msgid "Nothing"
 msgstr "Nada"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Sem tarefas a realizar."
 
@@ -10239,87 +10571,87 @@ msgstr "Sem tarefas a realizar."
 msgid "Notification report"
 msgstr "Relatório de notificações"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notificações"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Novembro"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Agora"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Número de segundos desde Epoch é < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Número de segundos desde Epoch é = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Número de segundos desde Epoch é > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Número de segundos desde Epoch é != N"
 
@@ -10327,88 +10659,88 @@ msgstr "Número de segundos desde Epoch é != N"
 msgid "Number of status changes"
 msgstr "Número de alterações de estado"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Número de passos"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
-msgstr "Número de valores obtidos com sucesso V (que cumprem o operador O) para o período T é < NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é < NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é < NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é < NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é < N"
+msgstr "Número de valores obtidos com sucesso V (que cumprem o operador O) para o período T é < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
-msgstr "Número de valores obtidos com sucesso V (que cumprem o operador O) para o período T é = NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é = NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é = NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é = NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é = N"
+msgstr "Número de valores obtidos com sucesso V (que cumprem o operador O) para o período T é = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
-msgstr "Número de valores obtidos com sucesso V (que cumprem o operador O) para o período T é > NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é > NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é > NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é > NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é > N"
+msgstr "Número de valores obtidos com sucesso V (que cumprem o operador O) para o período T é > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
-msgstr "Número de valores obtidos com sucesso V (que cumprem o operador O) para o período T é != NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é != NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é != NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é != NNúmero de valores obtidos com sucesso V (que cumprem o operador O) para o período T é != N"
+msgstr "Número de valores obtidos com sucesso V (que cumprem o operador O) para o período T é != N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Número de utilizadores (online)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Númerico (float)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Numérico (integer 64bit)"
 
@@ -10423,16 +10755,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10448,8 +10782,7 @@ msgstr "Router OOB"
 msgid "OOB subnet mask"
 msgstr "Máscara de rede OOB"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "OU"
 
@@ -10469,11 +10802,12 @@ msgstr "SO (Vista sumária)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "OUTROS PARÂMETROS DE CONFIGURAÇÃO"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "VISTA GERAL"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Out"
 
@@ -10481,25 +10815,25 @@ msgstr "Out"
 msgid "Octal"
 msgstr "Octal"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Outubro"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Inactivo"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Activo"
 
@@ -10507,111 +10841,114 @@ msgstr "Activo"
 msgid "On status change triggers blink for"
 msgstr "Em alterações de estado os triggers piscam para"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Uma vez"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Apenas uma vez"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Downtime único"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Apenas os Super Admins podem criar macros globais."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Apenas os Super Admins podem criar grupos de hosts."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Apenas os Super Admins podem criar mapas de ícones."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Apenas os Super Admins podem criar tipos de média."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Apenas os Super Admins podem eliminar macros globais."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Apenas os Super Admins podem eliminar tipos de média."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Apenas os Super Admins podem eliminar grupos de utilizadores."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Apenas os Super Admins podem editar tipos de média."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Apenas os Super Admins podem editar macros globais."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Apenas os Super Admins podem actualizar mapas de ícones."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Apenas os Zabbix Admins podem adicionar médias ao utilizador."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Apenas os Zabbix Admins podem alterar médias do utilizador."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Apenas os Zabbix Admins podem eliminar médias do utilizador."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "São permitidos apenas caracteres."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Apenas são contabilizados os itens associados a hosts activos"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Apenas uma verificação pode ser única."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "O nome do grupo de utilizadores tem de ser alterado um de cada vez."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "São mostrados apenas os últimos 20%% do indicador."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
-msgstr "Apenas são contabilizados triggers associados a hosts activos e que dependam de items activosApenas são contabilizados triggers associados a hosts activos e que dependam de items activosApenas são contabilizados triggers associados a hosts activos e que dependam de items activosApenas são contabilizados triggers associados a hosts activos e que dependam de items activosApenas são contabilizados triggers associados a hosts activos e que dependam de items activos"
+msgstr "Apenas são contabilizados triggers associados a hosts activos e que dependam de items activos"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "A operação \"%s\" já existe."
@@ -10620,28 +10957,28 @@ msgstr "A operação \"%s\" já existe."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Não foi possível realizar a operação devido a um pedido não autorizado."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Condição da operação"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Detalhes da operação"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "A operação não tem nenhum grupo para operar."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "A operação não tem nenhum template para operar."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Tipo de operação"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operações"
@@ -10650,25 +10987,27 @@ msgstr "Operações"
 msgid "Operator"
 msgstr "Operador"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10698,24 +11037,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Original"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Azul original"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Outras"
 
@@ -10723,19 +11062,19 @@ msgstr "Outras"
 msgid "Other configuration parameters"
 msgstr "Outros parâmetros de configuração"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Outros grupos"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Outros hosts"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10745,21 +11084,21 @@ msgstr "Outros hosts | Grupo"
 msgid "Other parameters"
 msgstr "Outros parâmetros"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Outro | grupo"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Outros"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10772,14 +11111,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Vista geral"
 
@@ -10787,7 +11123,7 @@ msgstr "Vista geral"
 msgid "Overview by proxy"
 msgstr "Vista geral por proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10796,147 +11132,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "DASHBOARD PESSOAL"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Suporte a bases de dados PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Suporte a PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Suporte a PHP gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Suporte a PHP gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "Opção do PHP max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "Opção do PHP max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "Opção do PHP memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "Opção do PHP post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "Opção do PHP upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP session auto start"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP time zone"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP version"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10945,32 +11289,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLEMA"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "A página recebeu dados incorrectos"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palete"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palete #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parâmetro"
 
@@ -10979,7 +11325,7 @@ msgstr "Parâmetro"
 msgid "Parent discovery rules"
 msgstr "Regras de descoberta pai"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10999,33 +11345,33 @@ msgstr "Triggers pai"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Erro ao processar SQL [%1$s] em [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Erro de processamento"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Passivo"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11035,20 +11381,21 @@ msgstr "Passivo"
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Palavra-passe (novamente)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "A palavra-passe é obrigatória para o tipo de média."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "A palavra-passe não pode estar vazia"
 
@@ -11057,21 +11404,21 @@ msgstr "A palavra-passe não pode estar vazia"
 msgid "Peak memory usage: %s"
 msgstr "Pico de utilização de memória: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Linha percentual (esquerda)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Linha percentual (direita)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11079,12 +11426,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Período"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Tipo de período"
@@ -11094,24 +11441,24 @@ msgstr "Tipo de período"
 msgid "Periods"
 msgstr "Períodos"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Permissões"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "As permissões apenas podem ser atribuídas a grupos de utilizadores."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persa (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Pie"
 
@@ -11123,55 +11470,56 @@ msgstr "Algoritmo de colocação"
 msgid "Plain text"
 msgstr "Texto simples"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Tocar"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Tocar som"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
-msgstr "Por favor corrija todos os problemas e pressione o botão \"Tentar novamente\"Por favor corrija todos os problemas e pressione o botão \"Tentar novamente\"Por favor corrija todos os problemas e pressione o botão \"Tentar novamente\"Por favor corrija todos os problemas e pressione o botão \"Tentar novamente\"Por favor corrija todos os problemas e pressione o botão \"Tentar novamente\""
+msgstr "Por favor corrija todos os problemas e pressione o botão \"Tentar novamente\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Por favor introduza o texto de confirmação."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Por favor seleccione dois elementos"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polaco (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Preenche o campo inventário do host"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Porto"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "O porto não pode ser vazio para o interface do host."
 
@@ -11179,51 +11527,51 @@ msgstr "O porto não pode ser vazio para o interface do host."
 msgid "Port range"
 msgstr "Gama de portos"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Português (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Português (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Posição"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Pós"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Prévisualizar"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Anterior"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Anterior"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Valor anterior é < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Valor anterior é = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Valor anterior é > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Valor anterior é != N"
 
@@ -11272,30 +11620,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Ficheiro de chave privada"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Nível de privilégios"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Provavelmente o módulo php-ldap está em falta."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problema"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Vista de problemas"
 
@@ -11307,16 +11656,16 @@ msgstr "Problema em"
 msgid "Problem time"
 msgstr "Hora do problema"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Problema, se todos os filhos tiverem problemas"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problema, se pelo menos um dos filhos tiver um problema"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problemas"
 
@@ -11324,75 +11673,71 @@ msgstr "Problemas"
 msgid "Profile"
 msgstr "Perfil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Protótipos"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxies"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "O proxy \"%1$s\" para o host \"%2$s\" não existe."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "O proxy \"%1$s\" está a ser utilizado pela regra de descoberta \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "O proxy \"%s\" já existe."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy adicionado"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy eliminado"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Hosts proxy"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "A criação da interface do proxy falhou."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "A actualização da interface do proxy falhou."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Modo do proxy"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Nome do proxy"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy actualizado"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Chave pública"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11403,7 +11748,7 @@ msgstr "Ficheiro de chave pública"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "FILA DE ITENS A SER ACTUALIZADOS"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Fila"
 
@@ -11411,18 +11756,18 @@ msgstr "Fila"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Leitura"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Só leitura"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Leitura e escrita"
 
@@ -11434,7 +11779,7 @@ msgstr "Causa"
 msgid "Received value"
 msgstr "Valor recebido"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11442,11 +11787,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Destinatário"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Destinatário (crescente)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Destinatário (decrescente)"
 
@@ -11457,28 +11802,28 @@ msgstr "Destinatário (decrescente)"
 msgid "Recipient(s)"
 msgstr "Destinatário(s)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Recuperação"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Mensagem de recuperação"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Assunto de recuperação"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Actualizar (em segundos)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Multiplicador do tempo de actualização"
 
@@ -11496,47 +11841,51 @@ msgstr "Tempo de actualização de itens não suportados (em seg) \"%1$s\"."
 msgid "Regular expression"
 msgstr "Expressão regular"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "A expressão regular \"%s\" já existe."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
-msgstr "A expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrárioA expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrárioA expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrárioA expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrárioA expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrário"
+msgstr "A expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrário"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
-msgstr "A expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)A expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)A expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)A expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)A expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)"
+msgstr "A expressão regular V faz correspondência com o último valor no período T, então N = 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
-msgstr "A expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrárioA expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrárioA expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrárioA expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrárioA expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrário"
+msgstr "A expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrário"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
-msgstr "A expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)A expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)A expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)A expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)A expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)"
+msgstr "A expressão regular V faz correspondência com o último valor no período T, então N != 1, 0 - caso contrário (sem distinção de maiúsculas e minúsculas)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Expressão regular adicionada"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Expressão regular eliminada"
 msgstr[1] "Expressões regulares eliminadas"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "A expressão regular não existe."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Expressão regular actualizada"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11553,26 +11902,28 @@ msgstr "Comando remoto"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11583,21 +11934,19 @@ msgstr "Comando remoto"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Eliminar"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11605,11 +11954,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Eliminar elemento"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Eliminar de"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Eliminar dos favoritos"
@@ -11618,7 +11967,7 @@ msgstr "Eliminar dos favoritos"
 msgid "Remove from host group"
 msgstr "Eliminar do grupo de hosts"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Eliminar dos grupos de hosts"
 
@@ -11630,28 +11979,28 @@ msgstr "Eliminar host"
 msgid "Remove link"
 msgstr "Eliminar ligação"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Eliminar seleccionados"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Substituir"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Substituir dependências"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Substituir grupos de hosts"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Relatório"
 
@@ -11659,35 +12008,36 @@ msgstr "Relatório"
 msgid "Report 1"
 msgstr "Relatório 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Relatório 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Relatório 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Relatórios"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Obrigatório"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "O campo obrigatório \"expression\" está em falta no mapeamento de ícones."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "O campo obrigatório \"iconid\" está em falta no mapeamento de ícones."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
-msgstr "O campo obrigatório \"inventory_link\" está em falta no mapeamento de ícones.O campo obrigatório \"inventory_link\" está em falta no mapeamento de ícones.O campo obrigatório \"inventory_link\" está em falta no mapeamento de ícones.O campo obrigatório \"inventory_link\" está em falta no mapeamento de ícones.O campo obrigatório \"inventory_link\" está em falta no mapeamento de ícones."
+msgstr "O campo obrigatório \"inventory_link\" está em falta no mapeamento de ícones."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Permissões de host necessárias"
 
@@ -11695,29 +12045,31 @@ msgstr "Permissões de host necessárias"
 msgid "Required performance (vps)"
 msgstr "Performance (vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Performance necessária do servidor, novos valores por segundo"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Códigos de estado necessários"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "String obrigatória"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Reinicializar"
 
@@ -11736,9 +12088,9 @@ msgstr "Reinicializar todos os nomes e cores para valores por omissão?"
 msgid "Reset confirmation"
 msgstr "Confirmação de reinicialização"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11751,7 +12103,7 @@ msgstr "Resolvido"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Recurso"
@@ -11766,15 +12118,15 @@ msgstr "Tempo de resposta"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Resultado"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Resultado é FALSO"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Resultado é VERDADEIRO"
 
@@ -11787,7 +12139,8 @@ msgstr "Resultado de \"%s\""
 msgid "Result type"
 msgstr "Tipo de resultado"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11795,60 +12148,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Tentativas restantes"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Tentar novamente"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Direita"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Separação entre linhas"
 
@@ -11856,11 +12218,11 @@ msgstr "Separação entre linhas"
 msgid "Rows"
 msgstr "Linhas"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Linhas por página"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Regras"
 
@@ -11905,20 +12267,20 @@ msgid "Run remote commands on hosts"
 msgstr "Executar comandos remotos nos hosts"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -11934,7 +12296,7 @@ msgstr "ECRÃS"
 msgid "SEARCH"
 msgstr "PESQUISAR"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVIDOR"
 
@@ -11949,13 +12311,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "SLIDESHOWS"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11964,17 +12326,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "E-mail SMTP"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "Servidor SMTP"
@@ -11990,7 +12352,7 @@ msgstr "Chave SNMP"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "OID SNMP"
 
@@ -12002,9 +12364,9 @@ msgstr "OID SNMP"
 msgid "SNMP community"
 msgstr "Comunidade SNMP"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "Interfaces SNMP"
@@ -12013,7 +12375,7 @@ msgstr "Interfaces SNMP"
 msgid "SNMP trap"
 msgstr "Trap SNMP"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "A chave do trap SNMP é inválida."
 
@@ -12037,7 +12399,7 @@ msgstr "Agente SNMPv3"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Contagem de SQL: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12055,7 +12417,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Falha na execução do statement SQL \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12064,15 +12426,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "Agente SSH"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "ESTADO DA DESCOBERTA"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "ESTADO DOS TRIGGERS"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "ESTADO DA MONITORIA WEB"
 
@@ -12080,92 +12462,92 @@ msgstr "ESTADO DA MONITORIA WEB"
 msgid "STATUS OF ZABBIX"
 msgstr "ESTADO DO ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Sáb"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sábado"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Guardar"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Guardar e voltar"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Escala"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Cenário"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Cenário adicionado"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Cenário actualizado"
 
@@ -12177,7 +12559,7 @@ msgstr "Cenários"
 msgid "Schedule"
 msgstr "Agendar"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12188,126 +12570,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Ecrã"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Ecrã \"%1$s\" adicionado."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "O ecrã \"%1$s\" já existe no template \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "O ecrã \"%1$s\" já existe."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Ecrã \"%1$s\" ignorado - regra de utilizador."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Ecrã \"%1$s\" actualizado."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Ecrã adicionado"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Configuração de célula do ecrã"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Ecrã eliminado"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Um ecrã deve conter pelo menos uma linha e uma coluna."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Ecrã actualizado"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Ecrãs"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Script"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Script adicionado"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Script eliminado"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Nome do script"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12316,17 +12697,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "Script profiler"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Script actualizado"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -12347,7 +12728,7 @@ msgstr "O padrão de pesquisa está vazio"
 msgid "Search/Filter elements limit"
 msgstr "Limite de elementos de Pesquisa/Filtragem"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Segundo"
 
@@ -12379,7 +12760,7 @@ msgstr "Telefone B POC secundário"
 msgid "Secondary POC screen name"
 msgstr "Nome visível POC secundário"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Segundos"
 
@@ -12398,69 +12779,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Seleccionar"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Seleccionar protótipos"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Seleccionar linhas com valor"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Acções seleccionadas eliminadas"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Elementos seleccionados"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Grupos seleccionados"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Hosts seleccionados"
 
@@ -12476,7 +12864,7 @@ msgstr "Enviar mensagem para grupos de utilizadores"
 msgid "Send message to users"
 msgstr "Enviar mensagem para utilizadores"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Enviar apenas para"
 
@@ -12484,11 +12872,11 @@ msgstr "Enviar apenas para"
 msgid "Send to"
 msgstr "Enviar para"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Enviar para grupos de utilizadores"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Enviar para utilizadores"
 
@@ -12497,17 +12885,17 @@ msgstr "Enviar para utilizadores"
 msgid "Sent"
 msgstr "Enviado"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Set"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Separado"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Setembro"
 
@@ -12519,7 +12907,7 @@ msgstr "Número de série A"
 msgid "Serial number B"
 msgstr "Número de série B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Servidor"
@@ -12528,44 +12916,44 @@ msgstr "Servidor"
 msgid "Server info"
 msgstr "Informação do servidor"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Hora do servidor"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Serviço"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
-msgstr "Não foi possível eliminar o serviço \"%1$s\", porque depende de outro serviço.Não foi possível eliminar o serviço \"%1$s\", porque depende de outro serviço.Não foi possível eliminar o serviço \"%1$s\", porque depende de outro serviço.Não foi possível eliminar o serviço \"%1$s\", porque depende de outro serviço.Não foi possível eliminar o serviço \"%1$s\", porque depende de outro serviço."
+msgstr "Não foi possível eliminar o serviço \"%1$s\", porque depende de outro serviço."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "O serviço \"%1$s\" não pode depender dele próprio."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
-msgstr "O serviço \"%1$s\" não pode estar associado a um trigger e ter um filho ao mesmo tempo.O serviço \"%1$s\" não pode estar associado a um trigger e ter um filho ao mesmo tempo.O serviço \"%1$s\" não pode estar associado a um trigger e ter um filho ao mesmo tempo.O serviço \"%1$s\" não pode estar associado a um trigger e ter um filho ao mesmo tempo.O serviço \"%1$s\" não pode estar associado a um trigger e ter um filho ao mesmo tempo."
+msgstr "O serviço \"%1$s\" não pode estar associado a um trigger e ter um filho ao mesmo tempo."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "O serviço \"%1$s\" já se encontra associado a um serviço diferente."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Um serviço não pode ser pai e filho ao mesmo tempo."
 
@@ -12581,11 +12969,11 @@ msgstr "Serviço eliminado"
 msgid "Service port"
 msgstr "Porto do serviço"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "A hora de início do serviço tem de ser inferior à hora de fim."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Tempos do serviço"
 
@@ -12597,49 +12985,53 @@ msgstr "Tipo de serviço"
 msgid "Service updated"
 msgstr "Serviço actualizado"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Serviços"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Os serviços formam uma dependência circular."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "A sessão foi terminada, por favor, inicie a sessão novamente."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Severidade"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Severidade (decrescente)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "O nome da severidade não pode ser vazio."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Mostrar"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Mostrar tudo"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Mostrar detalhes"
 
@@ -12669,35 +13061,36 @@ msgstr "Não mostrar eventos com mais de (em dias)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Não mostrar eventos com mais de (em dias) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Mostrar hosts em manutenção"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Mostrar itens com nome"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Mostrar itens sem dados"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Mostrar legenda"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Mostrar linhas"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Mostrar seleccionados"
 
@@ -12705,19 +13098,22 @@ msgstr "Mostrar seleccionados"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Mostrar texto como HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Mostrar triggers"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Mostrar não reconhecidos"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Mostrar valor"
@@ -12726,11 +13122,11 @@ msgstr "Mostrar valor"
 msgid "Show warning if Zabbix server is down"
 msgstr "Mostrar aviso se o Zabbix Server estiver offline"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Mostrar horário de trabalho"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Exibido"
 
@@ -12750,6 +13146,10 @@ msgstr "Verificação simples"
 msgid "Simple graph"
 msgstr "Gráfico simples"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Código postal / ZIP"
@@ -12787,7 +13187,7 @@ msgid "Site state / province"
 msgstr "Estado / Província"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12805,16 +13205,16 @@ msgstr "Ignorada a cópia do gráfico \"%1$s\" para o host \"%2$s\"."
 msgid "Slide"
 msgstr "Slide"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Slideshow"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "O slideshow \"%s\" já existe."
@@ -12823,11 +13223,11 @@ msgstr "O slideshow \"%s\" já existe."
 msgid "Slide show added"
 msgstr "Slideshow adicionado"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Slideshow eliminado"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Um slideshow tem de conter slides."
 
@@ -12835,10 +13235,10 @@ msgstr "Um slideshow tem de conter slides."
 msgid "Slide show updated"
 msgstr "Slideshow actualizado"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Slideshows"
 
@@ -12846,15 +13246,15 @@ msgstr "Slideshows"
 msgid "Slides"
 msgstr "Slides"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Eslovaco (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Adiar"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Soft"
 
@@ -12887,28 +13287,28 @@ msgid "Software application E"
 msgstr "Aplicação de software E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Sequência de ordenação (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Ordenar triggers por"
 
@@ -12921,75 +13321,75 @@ msgstr "Não é permitido ordenar pelo campo \"%1$s\"."
 msgid "Source"
 msgstr "Origem"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Espanhol (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
-msgstr "O script especificado não existe ou o utilizador não tem permissões para realizar a operação comando da acção.O script especificado não existe ou o utilizador não tem permissões para realizar a operação comando da acção.O script especificado não existe ou o utilizador não tem permissões para realizar a operação comando da acção.O script especificado não existe ou o utilizador não tem permissões para realizar a operação comando da acção.O script especificado não existe ou o utilizador não tem permissões para realizar a operação comando da acção."
+msgstr "O script especificado não existe ou o utilizador não tem permissões para realizar a operação comando da acção."
 
 #: httpdetails.php:131 httpdetails.php:296
 msgid "Speed"
 msgstr "Velocidade"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Empilhado"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Itens padrão"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Começar em"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Estado"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Estado"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Estado (crescente)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Estado (decrescente)"
 
@@ -13002,7 +13402,7 @@ msgstr "Cálculo do estado"
 msgid "Status calculation algorithm"
 msgstr "Algoritmo de cálculo do estado"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Códigos de estado"
 
@@ -13011,7 +13411,7 @@ msgid "Status of Web monitoring"
 msgstr "Estado da monitoria Web"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Estado do Zabbix"
 
@@ -13028,40 +13428,40 @@ msgid "Status only"
 msgstr "Apenas o estado"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Passo"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Passo \"%1$s\" [%2$s of %3$s] falhou: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Duração do passo"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Passo do cenário"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Passos"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Parar"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Guardar valor"
@@ -13070,11 +13470,11 @@ msgstr "Guardar valor"
 msgid "Straight"
 msgstr "Directo"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Estilo"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Subfiltro [afecta apenas os dados filtrados!]"
 
@@ -13082,11 +13482,11 @@ msgstr "Subfiltro [afecta apenas os dados filtrados!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Assunto"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Submapa"
 
@@ -13095,32 +13495,32 @@ msgid "Success Audit"
 msgstr "Auditoria de sucesso"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "O somatório de valores de um período T é < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Somatório dos valores para o período de tempo T é = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Somatório dos valores para o período de tempo T é > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "O somatório de valores de um período T é != N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Dom"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -13128,44 +13528,44 @@ msgstr "Domingo"
 msgid "Support"
 msgstr "Suporte"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Apelido"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Sueco (sv_SE)"
 
 #: include/views/administration.authentication.edit.php:126
 msgid "Switching authentication method will reset all except this session! Continue?"
-msgstr "Ao alterar o método de autenticação irá terminar todas as sessões com excepção da actual! Continuar?Ao alterar o método de autenticação irá terminar todas as sessões com excepção da actual! Continuar?Ao alterar o método de autenticação irá terminar todas as sessões com excepção da actual! Continuar?Ao alterar o método de autenticação irá terminar todas as sessões com excepção da actual! Continuar?Ao alterar o método de autenticação irá terminar todas as sessões com excepção da actual! Continuar?"
+msgstr "Ao alterar o método de autenticação irá terminar todas as sessões com excepção da actual! Continuar?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Por omissão do sistema"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Erro de sistema."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13174,21 +13574,21 @@ msgid "System status"
 msgstr "Estado do sistema"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -13207,11 +13607,11 @@ msgid "TOTAL"
 msgstr "TOTAL"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "COMENTÁRIOS DO TRIGGER"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "VERDADEIRO"
 
@@ -13229,14 +13629,14 @@ msgstr "A tabela \"%1$s\" não tem nenhum campo com nome \"%2$s\"."
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Destino"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Lista de destinos"
 
@@ -13245,130 +13645,133 @@ msgid "Target type"
 msgstr "Tipo de destino"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Template"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "O template \"%1$s\" já existe."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "O template \"%1$s\" para o host \"%2$s\" não existe."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Template adicionado"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
-msgstr "Um template não pode ser associado a outro template mais do que uma vez mesmo que através de outros templates.Um template não pode ser associado a outro template mais do que uma vez mesmo que através de outros templates.Um template não pode ser associado a outro template mais do que uma vez mesmo que através de outros templates.Um template não pode ser associado a outro template mais do que uma vez mesmo que através de outros templates.Um template não pode ser associado a outro template mais do que uma vez mesmo que através de outros templates."
+msgstr "Um template não pode ser associado a outro template mais do que uma vez mesmo que através de outros templates."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Template eliminado"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Grupo de templates"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Associação de templates"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Lista de templates"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Nome do template"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Ecrãs do template"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Triggers do template"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Template actualizado"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Já existe um template com o mesmo nome \"%s\"."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Já existe um template com o mesmo nome visível \"%s\"."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Itens templated"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Templates"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Templates \"%1$s\" desassociados dos hosts \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Teste"
 
@@ -13376,11 +13779,11 @@ msgstr "Teste"
 msgid "Test authentication"
 msgstr "Testar autenticação"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Confirmação do teste"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Dados do teste"
 
@@ -13394,22 +13797,22 @@ msgid "Test string"
 msgstr "String de teste"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Texto"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13417,7 +13820,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13432,47 +13835,47 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr "O item não foi descoberto mais nenhuma vez e será eliminado em %1$s (em %2$s às %3$s).O item não foi descoberto mais nenhuma vez e será eliminado em %1$s (em %2$s às %3$s).O item não foi descoberto mais nenhuma vez e será eliminado em %1$s (em %2$s às %3$s).O item não foi descoberto mais nenhuma vez e será eliminado em %1$s (em %2$s às %3$s).O item não foi descoberto mais nenhuma vez e será eliminado em %1$s (em %2$s às %3$s)."
+msgstr "O item não foi descoberto mais nenhuma vez e será eliminado em %1$s (em %2$s às %3$s)."
 
 #: queue.php:78
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "O JSON recebido não é um pedido JSON-RPC válido."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "O procedimento remoto pedido não existe / não está disponível"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Tema"
 
@@ -13483,11 +13886,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "Existe um grupo \"%1$d\" com acesso ao GUI Interno."
 msgstr[1] "Existem grupos \"%1$d\" com acesso ao GUI Interno."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Terceira"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Este campo é preenchido automaticamente pelo item \"%s\"."
@@ -13496,11 +13899,11 @@ msgstr "Este campo é preenchido automaticamente pelo item \"%s\"."
 msgid "This month"
 msgstr "Este mês"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Esta coluna do ecrã não está vazia. Deseja eliminá-la?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Esta linha do ecrã não está vazia. Deseja eliminá-la?"
 
@@ -13512,27 +13915,27 @@ msgstr "Esta semana"
 msgid "This year"
 msgstr "Este ano"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Qui"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Até"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13541,28 +13944,28 @@ msgstr "Até"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Data e hora"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Data e hora (crescente)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Data e hora (decrescente)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13570,72 +13973,73 @@ msgstr ""
 msgid "Time period"
 msgstr "Período de tempo"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Desvio de tempo"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Tipo de tempo"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Timeout"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
-msgstr "Timestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N = 1, 0 caso contrárioTimestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N = 1, 0 caso contrárioTimestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N = 1, 0 caso contrárioTimestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N = 1, 0 caso contrárioTimestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N = 1, 0 caso contrário"
+msgstr "Timestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N = 1, 0 caso contrário"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
-msgstr "Timestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N != 1, 0 caso contrárioTimestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N != 1, 0 caso contrárioTimestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N != 1, 0 caso contrárioTimestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N != 1, 0 caso contrárioTimestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N != 1, 0 caso contrário"
+msgstr "Timestamp com desvio não superior a T segundos em relação ao Zabbix Server, então N != 1, 0 caso contrário"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Título"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Para"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
-msgstr "Para definir uma interface do host seleccionar um tipo de item único para todos os itensPara definir uma interface do host seleccionar um tipo de item único para todos os itensPara definir uma interface do host seleccionar um tipo de item único para todos os itensPara definir uma interface do host seleccionar um tipo de item único para todos os itensPara definir uma interface do host seleccionar um tipo de item único para todos os itens"
+msgstr "Para definir uma interface do host seleccionar um tipo de item único para todos os itens"
 
 #: srv_status.php:35
 msgid "Today"
 msgstr "Hoje"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Top"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Total"
 
@@ -13653,7 +14057,7 @@ msgstr "Tempo total: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "A transacção não foi fechada. A abortar..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Erro de transporte."
 
@@ -13670,91 +14074,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Tendências"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Trigger"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Trigger \"%1$s\" já existe em \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "O trigger \"%1$s\" depende do trigger \"%2$s\", que não existe."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "O trigger \"%1$s\" foi ignorado - regra de utilizador."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "O trigger \"%s\" pertence a templates com diferentes associações."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Trigger adicionado"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Comentários do trigger"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Trigger eliminado"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Opções de visualização do trigger"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13769,19 +14173,20 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Expressão de condição do trigger"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
-msgstr "A expressão do trigger tem de conter pelo menos uma referência host:key.A expressão do trigger tem de conter pelo menos uma referência host:key.A expressão do trigger tem de conter pelo menos uma referência host:key.A expressão do trigger tem de conter pelo menos uma referência host:key.A expressão do trigger tem de conter pelo menos uma referência host:key."
+msgstr "A expressão do trigger tem de conter pelo menos uma referência host:key."
 
 #: tr_logform.php:27
 msgid "Trigger form"
 msgstr "Forma do trigger"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "O trigger tem itens do template \"%1$s\" que não está associado ao host."
@@ -13794,14 +14199,14 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
-msgstr "O trigger no template \"%1$s\" tem um dependência com o trigger no template \"%2$s\".O trigger no template \"%1$s\" tem um dependência com o trigger no template \"%2$s\".O trigger no template \"%1$s\" tem um dependência com o trigger no template \"%2$s\".O trigger no template \"%1$s\" tem um dependência com o trigger no template \"%2$s\".O trigger no template \"%1$s\" tem um dependência com o trigger no template \"%2$s\"."
+msgstr "O trigger no template \"%1$s\" tem um dependência com o trigger no template \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
-msgstr "O trigger acabou de ser adicionado. Não existem actualizações de estado até agora.O trigger acabou de ser adicionado. Não existem actualizações de estado até agora.O trigger acabou de ser adicionado. Não existem actualizações de estado até agora.O trigger acabou de ser adicionado. Não existem actualizações de estado até agora.O trigger acabou de ser adicionado. Não existem actualizações de estado até agora."
+msgstr "O trigger acabou de ser adicionado. Não existem actualizações de estado até agora."
 
 #: include/views/configuration.sysmap.edit.php:91
 msgid "Trigger label type"
@@ -13811,52 +14216,52 @@ msgstr "Tipo de etiqueta do trigger"
 msgid "Trigger name"
 msgstr "Nome do trigger"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Protótipo de trigger"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Protótipos de triggers"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13864,23 +14269,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Protótipos de triggers de"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Severidades do trigger"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Severidade do trigger"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Trigger actualizado"
 
@@ -13888,40 +14301,41 @@ msgstr "Trigger actualizado"
 msgid "Trigger value"
 msgstr "Valor do trigger"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Triggers"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Triggers eliminados"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Informação de triggers"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Actualização em massa de triggers"
 
@@ -13929,78 +14343,78 @@ msgstr "Actualização em massa de triggers"
 msgid "Triggers overview"
 msgstr "Vista geral de triggers"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Estado dos triggers"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Top 100 triggers"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Triggers com severidade"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Truncado"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Tentativa de leitura de uma propriedade inacessível \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Ter"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Turco (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Deverão ser seleccionados dois elementos"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Dois itens (\"%1$s\" e \"%2$s\") não podem preencher o campo de inventário \"%3$s\" de um host, isto levaria a um conflito.Dois itens (\"%1$s\" e \"%2$s\") não podem preencher o campo de inventário \"%3$s\" de um host, isto levaria a um conflito.Dois itens (\"%1$s\" e \"%2$s\") não podem preencher o campo de inventário \"%3$s\" de um host, isto levaria a um conflito.Dois itens (\"%1$s\" e \"%2$s\") não podem preencher o campo de inventário \"%3$s\" de um host, isto levaria a um conflito.Dois itens (\"%1$s\" e \"%2$s\") não podem preencher o campo de inventário \"%3$s\" de um host, isto levaria a um conflito."
+msgstr "Dois itens (\"%1$s\" e \"%2$s\") não podem preencher o campo de inventário \"%3$s\" de um host, isto levaria a um conflito."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Tipo"
 
@@ -14008,62 +14422,64 @@ msgstr "Tipo"
 msgid "Type (Full details)"
 msgstr "Tipo (detalhes completos)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Tipo (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Tipo (crescente)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Tipo (decrescente)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Tipo de cálculo"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Tipo de informação"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "O tipo de informação tem de ser \"Log\" para a chave de log."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
-msgstr "O tipo de informação tem de ser \"Numérico (float)\" para itens agregados.O tipo de informação tem de ser \"Numérico (float)\" para itens agregados.O tipo de informação tem de ser \"Numérico (float)\" para itens agregados.O tipo de informação tem de ser \"Numérico (float)\" para itens agregados.O tipo de informação tem de ser \"Numérico (float)\" para itens agregados."
+msgstr "O tipo de informação tem de ser \"Numérico (float)\" para itens agregados."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Tipos"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "DESCONHECIDO"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "SUBIR"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (depois de iniciar sessão)"
 
@@ -14079,20 +14495,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 caracteres)"
 
@@ -14100,15 +14526,11 @@ msgstr "USA (160 caracteres)"
 msgid "USER PROFILE"
 msgstr "PERFIL DO UTILIZADOR"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ucraniano (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Não foi possível seleccionar a configuração."
 
@@ -14116,7 +14538,7 @@ msgstr "Não foi possível seleccionar a configuração."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Por reconhecer"
 
@@ -14129,20 +14551,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Eventos PROBLEMA por reconhecer"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Apenas por reconhecer"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Desbloquear seleccionados"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Desbloquear utilizadores seleccionados?"
 
@@ -14151,29 +14573,29 @@ msgstr "Desbloquear utilizadores seleccionados?"
 msgid "Units"
 msgstr "Unidades"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14183,23 +14605,20 @@ msgstr "Desconhecido"
 msgid "Unknown action"
 msgstr "Acção desconhecida"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Algoritmo de cálculo do estado do serviço desconhecido"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Função desconhecida."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item do host desconhecido, não existe esse item no host seleccionado"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Host desconhecido, não existe esse host no sistema"
 
@@ -14211,23 +14630,23 @@ msgstr "Tipo de interface desconhecido."
 msgid "Unknown resource"
 msgstr "Recurso desconhecido"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Tipo de valor desconhecido"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Desassociar"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Desassociar e eliminar"
 
@@ -14235,61 +14654,61 @@ msgstr "Desassociar e eliminar"
 msgid "Unlink from template"
 msgstr "Desassociar do template"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Desassociar dos templates"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Desassociada: Aplicação \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Desassociada: Regra de descoberta \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Desassociado: Gráfico \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Desassociado: Protótipo de gráfico \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Desassociado: Item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Desassociado: Protótipo de item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Desassociado: Trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Desassociado: Protótipo de trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Reactivar"
 
@@ -14303,32 +14722,43 @@ msgstr "Extensão de ficheiro a importar não suportada \"%1$s\"."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Formato de importação não suportado \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Em cima"
@@ -14339,34 +14769,34 @@ msgid "Up"
 msgstr "Em cima"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Actualizar"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Actualizar existentes"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Intervalo de actualização"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Intervalo de actualização (em seg)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Actualizado"
 
@@ -14374,55 +14804,55 @@ msgstr "Actualizado"
 msgid "Updated status of host"
 msgstr "Actualizado o estado do host"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Actualizado: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Actualizada: Aplicação \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Actualizada: Regra de descoberta \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Actualizado: Item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Actualizado: Protótipo de item \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Actualizado: Trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Actualizado: Protótipo de trigger \"%1$s\" em \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Carregar"
 
@@ -14430,14 +14860,14 @@ msgstr "Carregar"
 msgid "Upper level maps"
 msgstr "Mapas de nível superior"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Uptime"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14445,10 +14875,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Uptime/Downtime"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14463,84 +14893,88 @@ msgid "Used in actions"
 msgstr "Utilizado nas acções"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Utilizador"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "O utilizador \"%s\" tem de pertencer a um grupo de utilizadores."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Utilizador adicionado"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Um utilizador não pode alterar o tipo dele próprio"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
-msgstr "Um utilizador não pode adicionar-se a si próprio a um grupo desactivado ou a um grupo com acesso à GUI desactivado.Um utilizador não pode adicionar-se a si próprio a um grupo desactivado ou a um grupo com acesso à GUI desactivado.Um utilizador não pode adicionar-se a si próprio a um grupo desactivado ou a um grupo com acesso à GUI desactivado.Um utilizador não pode adicionar-se a si próprio a um grupo desactivado ou a um grupo com acesso à GUI desactivado.Um utilizador não pode adicionar-se a si próprio a um grupo desactivado ou a um grupo com acesso à GUI desactivado."
+msgstr "Um utilizador não pode adicionar-se a si próprio a um grupo desactivado ou a um grupo com acesso à GUI desactivado."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Um utilizador não pode alterar o acesso GUI dele próprio."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Um utilizador não pode alterar o estado dele próprio"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Um utilizador não pode alterar o estado dele próprio."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Utilizador eliminado"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Grupo de utilizadores"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "O grupo de utilizadores \"%1$s\" está a ser utilizado no script \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "O grupo de utilizadores \"%s\" já existe."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14557,34 +14991,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Grupos de utilizadores"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Um utilizador não pode eliminar-se a si próprio."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, fuzzy, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
-msgstr "Um utilizador não pode alterar o acesso à GUI dele próprio tornando-se membro do grupo de utilizadores \"%s\".Um utilizador não pode alterar o acesso à GUI dele próprio tornando-se membro do grupo de utilizadores \"%s\".Um utilizador não pode alterar o acesso à GUI dele próprio tornando-se membro do grupo de utilizadores \"%s\".Um utilizador não pode alterar o acesso à GUI dele próprio tornando-se membro do grupo de utilizadores \"%s\".Um utilizador não pode alterar o acesso à GUI dele próprio tornando-se membro do grupo de utilizadores \"%s\"."
+msgstr "Um utilizador não pode alterar o acesso à GUI dele próprio tornando-se membro do grupo de utilizadores \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, fuzzy, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
-msgstr "Um utilizador não pode alterar o estado de sistema dele próprio tornando-se membro do grupo de utilizadores \"%s\".Um utilizador não pode alterar o estado de sistema dele próprio tornando-se membro do grupo de utilizadores \"%s\".Um utilizador não pode alterar o estado de sistema dele próprio tornando-se membro do grupo de utilizadores \"%s\".Um utilizador não pode alterar o estado de sistema dele próprio tornando-se membro do grupo de utilizadores \"%s\".Um utilizador não pode alterar o estado de sistema dele próprio tornando-se membro do grupo de utilizadores \"%s\"."
+msgstr "Um utilizador não pode alterar o estado de sistema dele próprio tornando-se membro do grupo de utilizadores \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Nome do utilizador"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "O nome de utilizador não coincide com o da base de dados"
 
@@ -14610,243 +15044,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Tipo de utilizador"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Utilizador actualizado"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Já existe um utilizador com alias \"%s\"."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Nome de utilizador"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Utilizadores"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Utilizadores (online)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Utilizadores desbloqueados"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Valor"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
-msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_align\". As opções são: \"%2$s\" e \"%3$s\"O valor \"%1$s\" é inválido para o parâmetro \"grid_align\". As opções são: \"%2$s\" e \"%3$s\"O valor \"%1$s\" é inválido para o parâmetro \"grid_align\". As opções são: \"%2$s\" e \"%3$s\"O valor \"%1$s\" é inválido para o parâmetro \"grid_align\". As opções são: \"%2$s\" e \"%3$s\"O valor \"%1$s\" é inválido para o parâmetro \"grid_align\". As opções são: \"%2$s\" e \"%3$s\""
+msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_align\". As opções são: \"%2$s\" e \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14854,12 +15288,12 @@ msgstr ""
 #: include/classes/db/DB.php:333
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
-msgstr "O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de %4$d caracteres.O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de %4$d caracteres.O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de %4$d caracteres.O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de %4$d caracteres.O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de %4$d caracteres."
+msgstr "O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de %4$d caracteres."
 
 #: include/classes/db/DB.php:362
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is 2048 characters."
-msgstr "O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de 2048 caracteres.O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de 2048 caracteres.O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de 2048 caracteres.O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de 2048 caracteres.O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de 2048 caracteres."
+msgstr "O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de 2048 caracteres."
 
 #: include/validate.inc.php:326 include/validate.inc.php:350
 #, c-format
@@ -14881,11 +15315,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14931,10 +15365,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "O mapa de valores com valuemapid \"%1$s\" não existe."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Mapeamento de valores"
 
@@ -14943,7 +15377,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "O mapeamento de valores tem de ter pelo menos um mapeamento."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14955,8 +15389,8 @@ msgstr "Valor: sem dados"
 msgid "Values"
 msgstr "Valores"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Variáveis"
 
@@ -14969,64 +15403,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Alinhamento vertical"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "A vista não é representada."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Nome visível"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
-msgstr "O nome visível não pode estar vazio se não estiver definido o nome do host.O nome visível não pode estar vazio se não estiver definido o nome do host.O nome visível não pode estar vazio se não estiver definido o nome do host.O nome visível não pode estar vazio se não estiver definido o nome do host.O nome visível não pode estar vazio se não estiver definido o nome do host."
+msgstr "O nome visível não pode estar vazio se não estiver definido o nome do host."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Q"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Warning"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Pedimos desculpa, foi atingido o número máximo possível de elementos."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15034,65 +15473,83 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitoria web"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Qua"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -15100,9 +15557,9 @@ msgstr "Quarta-feira"
 msgid "Week"
 msgstr "Semana"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Semanalmente"
 
@@ -15110,12 +15567,12 @@ msgstr "Semanalmente"
 msgid "When active"
 msgstr "Quando activado"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Largura"
@@ -15125,28 +15582,28 @@ msgstr "Largura"
 msgid "With data collection"
 msgstr "Com recolha de dados"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Com o último evento por reconhecer"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Com problemas"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Com triggers"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Com eventos por reconhecer"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Sem problemas"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Sem triggers"
 
@@ -15155,7 +15612,7 @@ msgid "Wizard"
 msgstr "Assistente"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15168,277 +15625,271 @@ msgstr "Horário de trabalho"
 msgid "Working time \"%1$s\"."
 msgstr "Horário de trabalho \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Escrever"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Campos errados para a dependência do serviço \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Campos errados para o elemento."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Campos errados para o host \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Campos errados para a macro \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Campos errados para o tipo de média."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Campos errados para o script."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Campos errados para o serviço \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Campos errados para o tempo do serviço \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Campos errados para o trigger."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Campos errados para o utilizador \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Macro errada \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Etiqueta X"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "O ficheiro XML contém um erro %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "O ficheiro XML contém erros"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "O ficheiro XML contém um erro fatal %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "O ficheiro XML contém um aviso %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Valor MÁX para o eixo Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "O valor MÁX para o eixo Y tem de ser maior que o valor MÍN."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Valor MÍN para o eixo Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Lado do eixo Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Etiqueta Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Ano"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Anualmente"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Sim"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
-msgstr "Não é possível seleccionar algumas das línguas, porque os locales para estas não estão instaladas no servidor web.Não é possível seleccionar algumas das línguas, porque os locales para estas não estão instaladas no servidor web.Não é possível seleccionar algumas das línguas, porque os locales para estas não estão instaladas no servidor web.Não é possível seleccionar algumas das línguas, porque os locales para estas não estão instaladas no servidor web.Não é possível seleccionar algumas das línguas, porque os locales para estas não estão instaladas no servidor web."
+msgstr "Não é possível seleccionar algumas das línguas, porque os locales para estas não estão instaladas no servidor web."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, fuzzy, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
-msgstr "O utilizador actual não tem permissões para alterar os privilégios para o utilizador \"%s\".O utilizador actual não tem permissões para alterar os privilégios para o utilizador \"%s\".O utilizador actual não tem permissões para alterar os privilégios para o utilizador \"%s\".O utilizador actual não tem permissões para alterar os privilégios para o utilizador \"%s\".O utilizador actual não tem permissões para alterar os privilégios para o utilizador \"%s\"."
+msgstr "O utilizador actual não tem permissões para alterar os privilégios para o utilizador \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Sem sessão iniciada."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Não é possível alterar entre hosts para a selecção actual."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Não foi especificado nenhum host para esta operação."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Não foi especificado nenhum grupo de hosts para esta operação."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, fuzzy, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
-msgstr "Não foi especificado nenhum destino para a operação comando da acção \"%s\".Não foi especificado nenhum destino para a operação comando da acção \"%s\".Não foi especificado nenhum destino para a operação comando da acção \"%s\".Não foi especificado nenhum destino para a operação comando da acção \"%s\".Não foi especificado nenhum destino para a operação comando da acção \"%s\"."
+msgstr "Não foi especificado nenhum destino para a operação comando da acção \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, fuzzy, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
-msgstr "Não foi especificado nenhum destino para a operação script global da acção \"%s\".Não foi especificado nenhum destino para a operação script global da acção \"%s\".Não foi especificado nenhum destino para a operação script global da acção \"%s\".Não foi especificado nenhum destino para a operação script global da acção \"%s\".Não foi especificado nenhum destino para a operação script global da acção \"%s\"."
-
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+msgstr "Não foi especificado nenhum destino para a operação script global da acção \"%s\"."
+
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "O utilizador actual não tem permissões para realizar esta operação."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "O utilizador actual não tem permissões para criar utilizadores."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
-msgstr "O utilizador actual não tem permissões para actualizar outros utilizadores.O utilizador actual não tem permissões para actualizar outros utilizadores.O utilizador actual não tem permissões para actualizar outros utilizadores.O utilizador actual não tem permissões para actualizar outros utilizadores.O utilizador actual não tem permissões para actualizar outros utilizadores."
+msgstr "O utilizador actual não tem permissões para actualizar outros utilizadores."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
-msgstr "O utilizador actual não tem permissões para actualizar o utilizador ou o utilizador não existe.O utilizador actual não tem permissões para actualizar o utilizador ou o utilizador não existe.O utilizador actual não tem permissões para actualizar o utilizador ou o utilizador não existe.O utilizador actual não tem permissões para actualizar o utilizador ou o utilizador não existe.O utilizador actual não tem permissões para actualizar o utilizador ou o utilizador não existe."
+msgstr "O utilizador actual não tem permissões para actualizar o utilizador ou o utilizador não existe."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Terá que iniciar sessão para poder ver esta página."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15451,7 +15902,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15470,8 +15921,8 @@ msgid "Zabbix User"
 msgstr "Zabbix User"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15497,10 +15948,11 @@ msgstr "Zabbix Interno"
 msgid "Zabbix internal authentication"
 msgstr "Autenticação interna do Zabbix"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Servidor Zabbix"
@@ -15516,7 +15968,7 @@ msgstr ""
 "1. IP/DNS do servidor incorrectos no ficheiro \"zabbix.conf.php\";\n"
 "2. Configuração de rede incorrecta.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "O IP ou o porto do servidor Zabbix não estão configurados!"
 
@@ -15524,28 +15976,28 @@ msgstr "O IP ou o porto do servidor Zabbix não estão configurados!"
 msgid "Zabbix server activity check interval"
 msgstr "Intervalo de verificação de actividade do servidor Zabbix"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Informação do servidor Zabbix"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
-msgstr "O servidor Zabbix não está em execução: a informação mostrada poderá não estar actualizada.O servidor Zabbix não está em execução: a informação mostrada poderá não estar actualizada.O servidor Zabbix não está em execução: a informação mostrada poderá não estar actualizada.O servidor Zabbix não está em execução: a informação mostrada poderá não estar actualizada.O servidor Zabbix não está em execução: a informação mostrada poderá não estar actualizada."
+msgstr "O servidor Zabbix não está em execução: a informação mostrada poderá não estar actualizada."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "O servidor Zabbix está em execução"
 
 #: adm.gui.php:80
 #, c-format
 msgid "Zabbix server is running check interval \"%1$s\"."
-msgstr "O servidor Zabbix está em execução com um intervalo de verificação de \"%1$s\".O servidor Zabbix está em execução com um intervalo de verificação de \"%1$s\".O servidor Zabbix está em execução com um intervalo de verificação de \"%1$s\".O servidor Zabbix está em execução com um intervalo de verificação de \"%1$s\".O servidor Zabbix está em execução com um intervalo de verificação de \"%1$s\"."
+msgstr "O servidor Zabbix está em execução com um intervalo de verificação de \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Nome do servidor Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Porto do servidor Zabbix"
 
@@ -15553,25 +16005,20 @@ msgstr "Porto do servidor Zabbix"
 msgid "Zabbix trapper"
 msgstr "Trapper Zabbix"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zoom"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Valor errado para o dia: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Valor errado para o mês: \"%s\" ]"
@@ -15580,19 +16027,19 @@ msgstr "[Valor errado para o mês: \"%s\" ]"
 msgid "agent"
 msgstr "agente"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "tudo"
 
@@ -15600,19 +16047,15 @@ msgstr "tudo"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "já existe"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "como Azul"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "como Verde"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "como Vermelho"
 
@@ -15624,83 +16067,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "média"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "dias"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15722,19 +16131,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dinâmico"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elementos"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "elementos copiados para ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from e esc_step_to têm de ser configurados em conjunto."
 
@@ -15746,47 +16151,49 @@ msgstr "exactemente"
 msgid "executed"
 msgstr "executado"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "fixo"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "encontrado"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "grupo de hosts"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "ícone"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "imagem"
 
@@ -15794,7 +16201,7 @@ msgstr "imagem"
 msgid "in"
 msgstr "contido em"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15804,7 +16211,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "é"
 
@@ -15812,20 +16219,20 @@ msgstr "é"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "último"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "como"
@@ -15834,12 +16241,12 @@ msgstr "como"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15848,46 +16255,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "macro(s)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "manutenção"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "mapa"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "máx"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "mín"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "mínimo 60 segundos"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15896,17 +16303,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "tem de ser um utilizador LDAP válido"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "sem dados"
@@ -15919,12 +16326,14 @@ msgstr "não contido em"
 msgid "not like"
 msgstr "diferente de"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "não está em execução"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "não seleccionada"
 
@@ -15933,57 +16342,61 @@ msgstr "não seleccionada"
 msgid "not sent"
 msgstr "não enviada"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "agora"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "de"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "sobre"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "outro"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "actualizar a cada"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15992,25 +16405,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "relembrar selecção"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "em execução"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "seg"
 
@@ -16023,7 +16435,7 @@ msgstr "segundos"
 msgid "sent"
 msgstr "enviada"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "descrição sumária"
 
@@ -16031,36 +16443,36 @@ msgstr "descrição sumária"
 msgid "show icon mappings"
 msgstr "mostrar mapeamento de ícones"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "mostrar mapeamento de valores"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "o ID de template \"%1$s\" é passado %2$s vezes"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "para"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "trigger"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -16072,11 +16484,11 @@ msgstr "valor"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyyy"
diff --git a/frontends/php/locale/ro/LC_MESSAGES/frontend.po b/frontends/php/locale/ro/LC_MESSAGES/frontend.po
index eda130066ce..4d2a6d4b6d6 100644
--- a/frontends/php/locale/ro/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/ro/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-09-11 18:19+0300\n"
 "Last-Translator: altmir <rmircea@birotec.ro>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -15,22 +15,24 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1378916396.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" trebuie să fie între 1970.01.01 și 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Afișează triggeri OK\" trebuie să fie \"0\" sau un întreg pozitiv."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Afișarea intermitentă a triggeri-lor la schimbarea statusului\" trebuie sa fie \"0\" sau o variabila pozitiva de tip int."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -38,7 +40,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -51,7 +53,7 @@ msgstr[2] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (anul %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
@@ -59,10 +61,8 @@ msgstr[0] "%1$s Element"
 msgstr[1] "%1$s Elemente"
 msgstr[2] "%1$s Elemente"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
@@ -70,7 +70,7 @@ msgstr[0] "%1$s zi"
 msgstr[1] "%1$s zile"
 msgstr[2] "%1$s zile"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -87,7 +87,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -111,23 +111,23 @@ msgstr[0] "%d echipament"
 msgstr[1] "%d echipamente"
 msgstr[2] "%d echipamente"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - infinit)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Numai super administratorii pot creea grupuri)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(în zile)"
 
@@ -135,34 +135,34 @@ msgstr "(în zile)"
 msgid "(in sec)"
 msgstr "(în sec)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minim 60 secunde, 0 - foloseste acțiunea implicită)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(fără proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[CONFIRMARE MULTIPLĂ]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 sau 1"
 
@@ -178,7 +178,7 @@ msgstr "10 secunde"
 msgid "30 seconds"
 msgstr "30 secunde"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "Vedere 3D"
 
@@ -194,7 +194,7 @@ msgstr "5 secunde"
 msgid "500 latest values"
 msgstr "500 ultimele valori"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -213,12 +213,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "CONFIRMĂRI ALARME"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "ȘI"
 
@@ -230,19 +229,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "RAPORT DISPONIBILITATE"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Diferența absolută dintre ultima și valoarea anterioară este < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Diferența absolută dintre ultima și valoarea anterioară este = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Diferența absolută dintre ultima și valoarea anterioară este > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Diferența absolută dintre ultima și valoarea anterioară NU este = N"
 
@@ -254,42 +253,42 @@ msgstr "SLA acceptabil"
 msgid "Access denied!"
 msgstr "Acces refuzat!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Acces refuzat."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Contul este blocat pentru %s secunde"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Cnf"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Confirmare"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Confirmare adăugată"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Confirmă alarma prin"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Confirmare și return"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Status confirmare"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Confirmat"
 
@@ -314,63 +313,66 @@ msgstr "Confirmarea dezactivată"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Acțiune"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Acțiunea \"%s\" există deja."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Acțiunea \"%1$s\" are valoarea incorectă pentru \"esc_period\" (minim %2$s secunde)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Acțiunea \"%1$s\" nu are operațiuni definite."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Acțiune adăugată"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Acțiune ștearsă"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -384,21 +386,21 @@ msgstr[2] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Operațiuni acțiune"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Acțiune actualizată"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Acțiuni"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Activ"
@@ -408,80 +410,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Activ"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Activ de la"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Activ până la"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Adaugă"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Adaugă comentariu de"
 
@@ -497,27 +502,23 @@ msgstr "Adaugă server"
 msgid "Add link"
 msgstr "Adaugă link"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Adaugă lipsă"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Adaugă aplicații noi sau existente"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Adaugă grupuri de servere noi sau existente"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Adaugă prototip"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Adaugă la"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Adaugă la favorite"
@@ -526,7 +527,7 @@ msgstr "Adaugă la favorite"
 msgid "Add to host group"
 msgstr "Adaugă la grupul de servere"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Adaugă la grupurile de servere"
 
@@ -538,7 +539,7 @@ msgstr "Adăugat"
 msgid "Admin"
 msgstr "Admin"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administrare"
 
@@ -546,34 +547,34 @@ msgstr "Administrare"
 msgid "Advanced labels"
 msgstr "Etichete avansate"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Vechime"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Vechime mai mică decât"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Vechime mai mică decât %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agent"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Interfețe agent"
@@ -582,12 +583,12 @@ msgstr "Interfețe agent"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agent sau SNMP sau JMX sau interfață IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -595,87 +596,90 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Aliniază icon-uri"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Tot"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Toate grupurile"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Toate linkurile trebuie sa aibă \"Nume\" și \"URL\" specificat"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Servere permise"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Orice"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Orice șir de caractere inclus"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Aplicație"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Aplicația \"%1$s\" există deja."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Aplicație adăugată"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
@@ -683,36 +687,36 @@ msgstr[0] "Aplicație stearsă"
 msgstr[1] "Aplicație stearsă"
 msgstr[2] "Aplicație stearsă"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Eroare aplicație."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Aplicație actualizată"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Aplicația cu ID \"%1$s\" nu este disponibilă pe \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Aplicații"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Aplică"
 
@@ -721,16 +725,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Abordare"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Apr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Aprilie"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Sunteti sigur că vreți sa efectuați această acțiune ?"
 
@@ -746,9 +750,9 @@ msgstr "Dimensiunea suprafeței"
 msgid "Area type"
 msgstr "Tipul suprafeței"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -762,22 +766,17 @@ msgstr "Ca text simplu"
 msgid "Asset tag"
 msgstr "Eticheta activului"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "La %1$s:%2$s în %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "La %1$s:%2$s în %3$s %4$s în fiecare %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "La %1$s:%2$s în ziua %3$s în fiecare %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
@@ -785,7 +784,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
@@ -793,23 +792,25 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "La (oră:minut)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Cel puțin un server sau un grup trebuie să fie selectat."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Cel puțin o perioadă de mentenanță trebuie creată."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audit"
@@ -829,26 +830,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Aug"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "August"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Algoritm de autentificare"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -907,9 +910,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automată"
 
@@ -917,20 +920,20 @@ msgstr "Automată"
 msgid "Automatic icon mapping"
 msgstr "Maparea icon automată"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Selectarea automată icon"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Disponibilitate"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Raport disponibilitate"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Disponibil"
 
@@ -939,36 +942,36 @@ msgstr "Disponibil"
 msgid "Average"
 msgstr "Mediu"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Mediu de"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Valoarea medie a unei perioade T este < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Valoarea medie a unei perioade T este = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Valoarea medie a unei perioade T este > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Valoarea medie a unei perioade T NU este = N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Partea axei"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Fundal"
@@ -977,7 +980,7 @@ msgstr "Fundal"
 msgid "Background image"
 msgstr "Imagine de fundal"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Rapoarte bară"
 
@@ -987,8 +990,8 @@ msgid "Base DN"
 msgstr "Bază DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Autentificare de bază"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -1000,15 +1003,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Parolă asociată"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Operațiunea ȘI a ultimei (cea mai recentă) valori T și mască este = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Operațiunea ȘI a ultimei (cea mai recentă) valori T și mască NU este = N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Negru & Albastru"
 
@@ -1020,8 +1023,8 @@ msgstr "Intermitent"
 msgid "Blocked"
 msgstr "Blocat"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Linie îngroșate"
 
@@ -1029,22 +1032,22 @@ msgstr "Linie îngroșate"
 msgid "Boolean"
 msgstr "Boolean"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Jos"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Luminozitate"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulgară (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Confirmare multiplă"
 
@@ -1070,7 +1073,7 @@ msgstr "CONFIGURARE APLICAȚII"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "CONFIGURARE AUTENTIFICARE"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1100,7 +1103,7 @@ msgstr "CONFIGURARE GRUPURI DE SERVERE"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "CONFIGURARE PROTOTIPURI DE SERVERE"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "CONFIGURARE SERVERE"
 
@@ -1112,7 +1115,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "CONFIGURARE MAPARE ICON"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "CONFIGURARE IMAGINI"
 
@@ -1121,14 +1124,14 @@ msgstr "CONFIGURARE IMAGINI"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "CONFIGURARE SERVICII IT"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "CONFIGURARE PROTOTIPURI ELEMENT"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "CONFIGURARE ELEMENTE"
 
@@ -1157,7 +1160,7 @@ msgstr "CONFIGURARE HĂRȚI DE REȚEA"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "CONFIGURARE PROXY-URI"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "CONFIGURARE EXPRESII REGULATE"
 
@@ -1177,7 +1180,7 @@ msgstr "CONFIGURARE SCRIPTURI"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "CONFIGURARE SLIDE SHOW-URI"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "CONFIGURARE ȘABLOANE"
 
@@ -1193,7 +1196,7 @@ msgstr "CONFIGURARE SEVERITATE TRIGGER"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "CONFIGURARE TRIGGERI"
 
@@ -1225,22 +1228,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "CONFIGURARE ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1249,21 +1252,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Calculul SLA, SLA acceptabil (în %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Calculat"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Permisiuni calculate"
 
@@ -1271,92 +1274,95 @@ msgstr "Permisiuni calculate"
 msgid "Callback"
 msgstr "Apelare inversă"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canada (136 caractere)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Anulează"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Nu se poate confirma evenimentul"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Nu se poate adăuga elementul non-numeric \"%1$s\" la graficul \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Nu se poate adăuga acțiunea"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Nu se poate adăuga condiția acțiunii"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Nu se poate adăuga aplicația"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Nu se poate adăuga dependința server - șablon"
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Nu se poate adăuga dependința trigger \"%1$s:%2$s\" la trigger nonexistent \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Nu se poate adăuga regula de detecție"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Nu se poate adăuga graficul"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Nu se poate adăuga grupul"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Nu se poate adăuga serverul"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Nu se poate adăuga prototipul serverului"
 
@@ -1364,24 +1370,24 @@ msgstr "Nu se poate adăuga prototipul serverului"
 msgid "Cannot add image"
 msgstr "Nu se poate adăuga imaginea"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Nu se poate adăuga imaginea."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Nu se poate adăuga elementul"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Nu se pot adăuga elementele."
 
@@ -1389,20 +1395,20 @@ msgstr "Nu se pot adăuga elementele."
 msgid "Cannot add macro."
 msgstr "Nu se poate adăuga macro-ul."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Nu se poate adăuga mentenanța"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Nu se poate adăuga tipul de media"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Nu se pot adăuga mai mult de un element de tipul \"Sum grafic\" la graficul \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1411,24 +1417,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Nu se poate adăuga harta rețea"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Nu se poate adăuga aplicație nouă \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Nu se poate adăuga proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Nu se poate adăuga expresia regulată"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Nu se poate adăuga ecranul"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Nu se poate adăuga scriptul"
 
@@ -1440,27 +1446,27 @@ msgstr "Nu se poate adăuga serviciul"
 msgid "Cannot add slide show"
 msgstr "Nu se poate adăuga slide show"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Nu se poate adăuga șablonul"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Nu se poate adăuga trigger-ul"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Nu se poate adăuga utilizatorul"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Nu se poate adăuga utilizatorul. Ambele parole trebuie să fie egale."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Nu se pot adăuga utilizatorii."
 
@@ -1468,7 +1474,7 @@ msgstr "Nu se pot adăuga utilizatorii."
 msgid "Cannot add value map"
 msgstr "Nu se poate adăuga valoarea mapată"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Nu se pate adăuga scenariul web"
 
@@ -1488,23 +1494,23 @@ msgstr "Nu se poate schimba metoda de autentificare la LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Nu se poate schimba metoda de autentificare la Zabbix intern"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Nu se poate șterge istoricul"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Nu se pot clona prototipurile de grafic."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Nu se pot clona prototipurile de server."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Nu se pot clona prototipurile de element."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Nu se pot clona prototipurile de trigger."
 
@@ -1512,20 +1518,20 @@ msgstr "Nu se pot clona prototipurile de trigger."
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Nu se poate conecta la portul de trapp al demonului zabbix, ar trebui să fie disponibil pentru a putea rula scriptul."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Nu se pot copia graficele"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Nu se pot copia elementele"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Nu se poate copia trigge-rul \"%1$s:%2$s\", deoarece are servere multiple in expresie."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "Nu se poate crea un prototip de server pe serverul detectat \"%1$s\"."
@@ -1534,19 +1540,19 @@ msgstr "Nu se poate crea un prototip de server pe serverul detectat \"%1$s\"."
 msgid "Cannot create another database connection."
 msgstr "Nu se poate crea o altă conexiune la baza de date."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Nu se pot crea dependințe circulare."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Nu se poate crea dependință cu trigger-ul însuși."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Nu se poate crea regula de detecție"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Nu se poate crea grupul de servere."
 
@@ -1554,42 +1560,39 @@ msgstr "Nu se poate crea grupul de servere."
 msgid "Cannot create icon map"
 msgstr "Nu se poate crea maparea icon-ului."
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Nu se pot crea mapări de icon-uri cu nume identice \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Nu se poate crea harta \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Nu se poate crea o aplicație nouă, scenariul web este deja asignat unei aplicații."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Nu se poate crea un element nou"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Nu se poate crea ecranul."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Nu se poate șterge utilizatorul intern Zabbix \"%1$s\", încercați să dezactivați acest utilizator."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Nu se poate șterge acțiunea"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
@@ -1597,60 +1600,64 @@ msgstr[0] "Nu se poate șterge aplicația"
 msgstr[1] "Nu se poate șterge aplicația"
 msgstr[2] "Nu se poate șterge aplicația"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Nu se poate șterge dependința"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Nu se poate șterge regula de detecție"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Nu se pot șterge regulile de detecție"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Nu se poate șterge graficul"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Nu se poate șterge prototipul graficului"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Nu se poate șterge graficul."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Nu se pot șterge graficele"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Nu se pot șterge graficele create de detecția automată."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Nu se poate șterge grupul"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Nu se poate șterge grupul"
+msgstr[1] "Nu se poate șterge grupul"
+msgstr[2] "Nu se poate șterge grupul"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Nu se poate șterge serverul"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Nu se poate șterge grupul de servere."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Nu se poate șterge prototipul de server."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Nu se pot șterge prototipurile de server"
 
@@ -1658,80 +1665,80 @@ msgstr "Nu se pot șterge prototipurile de server"
 msgid "Cannot delete icon map"
 msgstr "Nu se poate șterge maparea icon-ului"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Nu se poate șterge imaginea"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Nu se poate șterge inventarul."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Nu se poate șterge elementul"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Nu se pot șterge elementele"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Nu se pot șterge elementele create de detecția automată."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Nu se poate șterge mentenanța"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Nu se poate șterge tipul media"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Nu se poate șterge harta rețea"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Nu se poate șterge proxy-ul"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Nu se poate șterge expresia regulată"
 msgstr[1] "Nu se pot șterge expresiile regulate"
 msgstr[2] "Nu se pot șterge expresiile regulate"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Nu se poate șterge ecranul"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Nu se poate șterge scriptul"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Nu se pot șterge scripturile. Parametrul \"scriptids\" este gol."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Nu se pot șterge scripturile. Scriptul \"%1$s\" este folosit in acțiunea \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Nu se pot șterge acțiunile selectate"
 
@@ -1739,77 +1746,80 @@ msgstr "Nu se pot șterge acțiunile selectate"
 msgid "Cannot delete service"
 msgstr "Nu se poate șterge serviciul"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Nu se poate șterge slide show-ul"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Nu se poate șterge șablonul"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Nu se poate șterge o aplicație bazată pe un șablon."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Nu se pot șterge graficele bazate pe un șablon."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Nu se poate șterge prototipul de server bazat pe un șablon."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Nu se pote șterge un element bazat pe un șablon."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Nu se pot șterge elementele bazate pe șabloane"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Nu se pot șterge elementele bazate pe șabloane."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Nu se poate șterge trigger-ul \"%1$s:%2$s\" bazat pe un șablon."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Nu se poate șterge scenariul web \"%1$s\" bazat pe un șablon."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Nu se poate șterge trigger-ul"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Nu se poate șterge prototipul trigger-ului"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Nu se poate șterge trigger-ul."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Nu se pot șterge triggerii"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Nu se pot șterge trigerii creați de detecția automată."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Nu se poate șterge utilizatorul"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Nu se poate șterge media utilizator."
 
@@ -1817,60 +1827,60 @@ msgstr "Nu se poate șterge media utilizator."
 msgid "Cannot delete value map"
 msgstr "Nu se poate șterge maparea valorii"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Nu se poate șterge scenariul web"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
@@ -1878,28 +1888,28 @@ msgstr[0] "Nu se poate dezactiva tipul media"
 msgstr[1] "Nu se poate dezactiva tipul media"
 msgstr[2] "Nu se poate dezactiva tipul media"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1915,56 +1925,56 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "Nu se poate afișa mai mult de un element de tipul \"Sum grafic\"."
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
@@ -1972,90 +1982,84 @@ msgstr[0] "Nu se poate activa tipul media"
 msgstr[1] "Nu se poate activa tipul media"
 msgstr[2] "Nu se poate activa tipul media"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Nu se poate găsi imaginea de fundal \"%1$s\" folosită în harta \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Nu se poate găsi graficul \"%1$s\" folosit în ecranul \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Nu se poate găsi grupul \"%1$s\" folosit în harta \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Nu se poate găsi grupul \"%1$s\" folosit în ecranul \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Nu se poate găsi serverul \"%1$s\" folosit în harta \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Nu se poate găsi serverul \"%1$s\" folosit în ecranul \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Nu se poate găsi interfața serverului în \"%1$s\" pentru elementul \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2066,34 +2070,53 @@ msgstr "Nu se poate găsi icon-ul \"%1$s\" folosit în harta \"%2$s\"."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Nu se poate găsi maparea icon-ului \"%1$s\" folosit în harta \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Nu se poate găsi elementul \"%1$s\" folosit în ecranul \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Nu se poate găsi harta \"%1$s\" folosită în harta exportată \"%2$s\"."
@@ -2103,41 +2126,41 @@ msgstr "Nu se poate găsi harta \"%1$s\" folosită în harta exportată \"%2$s\"
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Nu se poate găsi harta \"%1$s\" folosită în harta \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Nu se poate găsi harta \"%1$s\" folosită în ecranul \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Nu se pot găsi obiectele cu numele"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Nu se poate găsi ecranul \"%1$s\" folosit în ecranul \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Nu se poate găsi trigger-ul \"%1$s\" folosit în harta \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2150,12 +2173,14 @@ msgstr "Nu se poate formata arborele. Verificați structura logică în legătur
 msgid "Cannot format tree."
 msgstr "Nu se poate formata arborele."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Nu se poate compacta expresia \"%s\"."
@@ -2168,7 +2193,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
@@ -2176,52 +2201,53 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Nu se poate include vezi fișier \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Nu se poate insera media utilizator."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Nu se poate asocia șablonul"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Nu se poate face logout."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Nu se poate face actualizare în masă a numelui serverului."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Nu se poate face actualizare în masă a numelui vizibil al serverului."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Nu se pot valida ID-urile duplicat pentru asocierea: %s."
@@ -2241,7 +2267,7 @@ msgstr "Nu se poate efectua instrucțiunea de actualizare în tabela \"%1$s\" f�
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Nu se poate efectua instrucțiunea de actualizare în tabela \"%1$s\" fără condiția \"where\"."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2250,11 +2276,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Nu se poate citi răspunsul, verificați conexiunea cu serverul Zabbix \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Nu se pot șterge toate elementele, cel puțin un element trebuie să rămână."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2262,11 +2288,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Nu se poate șterge macro-ul."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Nu se poate redenumi utilizatorul guest."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Nu se poate salva regula de detecție fără verificări."
 
@@ -2275,217 +2301,226 @@ msgstr "Nu se poate salva regula de detecție fără verificări."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Nu se poate trimite comanda, verificați conexiunea cu serverul Zabbix \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "Nu se poate seta \"%1$s\" pentru elementul \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Nu se poate seta \"%1$s\" pentru trigger-ul \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Nu se poate seta \"templateid\" pentru aplicația \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Nu se poate seta \"templateid\" pentru ecranul \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Nu se poate seta \"templateid\" pentru prototipul trigger-ului \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Nu se pot seta câmpurile inventarului pentru un inventar dezactivat."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Nu se poate schimba serverul pentru interfață."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Nu se pot debloca utilizatorii"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Nu se pot deconecta și șterge scenariile Web."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Nu se pot deconecta și șterge aplicațiile."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Nu se pot deconecta și șterge regulile de detecție"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Nu se pot deconecta și șterge prototipurile graficului"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Nu se pot deconecta și șterge graficele"
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Nu se pot deconecta și șterge prototipurile elementului"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Nu se pot deconecta și șterge elementele"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Nu se pot deconecta și șterge trigerii"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Nu se poate deconecta șablonul"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Nu se poate deconecta trigger-ul \"%s\", el are elemente din șablonul care este lăsat asociat la server."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "Nu se poate actualiza \"%1$s\" pentru un server detectat."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Nu se poate actualiza \"%1$s\" pentru un element detectat."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Nu se poate actualiza \"%1$s\" pentru un trigger detectat."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Nu se poate actualiza \"%1$s\" pentru elementul \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Nu se poate actualiza \"%1$s\" pentru trigger-ul \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Nu se poate actualiza \"templateid\" pentru aplicația \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Nu se poate actualiza \"templateid\" pentru graficul \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Nu se poate actualiza \"templateid\" pentru ecranul \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Nu se poate actualiza \"templateid\" pentru prototipul trigger-ului \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Nu se poate actualiza un grafic bazat pe detecție."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Nu se poate actualiza un grup de servere bazat pe detecție."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Nu se poate actualiza acțiunea"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Nu se poate actualiza aplicația"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Nu se poate actualiza comentariul"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Nu se poate actualiza configurația"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Nu se poate actualiza modul de depanare"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Nu se poate actualiza regula de detecție"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Nu se poate actualiza accesul la frontend"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Nu se poate actualiza graficul"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Nu se poate actualiza grupul"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Nu se poate actualiza grupul."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Nu se pot actualiza grupurile pentru serverul detectat \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Nu se poate actualiza serverul"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Nu se poate actualiza prototipul de server"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Nu se pot actualiza serverele"
 
@@ -2497,24 +2532,24 @@ msgstr "Nu se poate actualiza maparea icon-ului"
 msgid "Cannot update image"
 msgstr "Nu se poate actualiza imaginea"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Nu se poate actualiza imaginea."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Nu se poate actualiza interfața pentru serverul detectat \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Nu se poate actualiza elementul"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Nu se pot actualiza elementele"
 
@@ -2526,16 +2561,16 @@ msgstr "Nu se poate actualiza macro-ul."
 msgid "Cannot update macros"
 msgstr "Nu se pot actualiza macro-urile"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Nu se poate actualiza mentenanța"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Nu se poate actualiza harta \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Nu se poate actualiza tipul media"
 
@@ -2543,28 +2578,24 @@ msgstr "Nu se poate actualiza tipul media"
 msgid "Cannot update network map"
 msgstr "Nu se poate actualiza harta rețea"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Nu se poate actualiza proxy-ul"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Nu se poate actualiza proxy-ul pentru serverul detectat \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Nu se poate actualiza expresia regulată"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Nu se poate actualiza ecranul"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Nu se poate actualiza ecranul."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Nu se poate actualiza scriptul"
 
@@ -2576,40 +2607,41 @@ msgstr "Nu se poate actualiza serviciul"
 msgid "Cannot update slide show"
 msgstr "Nu se poate actualiza slide show-ul"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Nu se poate actualiza șablonul"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Nu se pot actualiza aplicațiile bazate pe un șablon."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "Nu se poate actualiza șablonul pentru serverul detectat \"%1$s\"."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Nu se poate actualiza trigger-ul"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Nu se poate actualiza utilizatorul"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Nu se poate actualiza media utilizator."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Nu se poate actualiza utilizatorul. Ambele parole trebuie să fie egale."
 
@@ -2617,15 +2649,15 @@ msgstr "Nu se poate actualiza utilizatorul. Ambele parole trebuie să fie egale.
 msgid "Cannot update value map"
 msgstr "Nu se poate actualiza valoarea mapată"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Nu se poate actualiza scenariul web"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Titlu"
 
@@ -2634,47 +2666,47 @@ msgstr "Titlu"
 msgid "Case sensitive"
 msgstr "Majuscule semnificative"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Centrat"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Schimbă"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Schimbă"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Modifică parola"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Caracter"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Șir de caractere inclus"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Șir de caractere neinclus"
 
@@ -2683,48 +2715,48 @@ msgid "Chassis"
 msgstr "Șasiu"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Verificarea există deja."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Verifică partea din expresie care începe de la \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Vă rugăm să verificați cheia. A fost folosit exemplul implicit."
 
@@ -2733,44 +2765,44 @@ msgid "Check type"
 msgstr "Verificați tipul"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Verificări"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Verificările trebuie să fie unice."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chineză (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Chineză (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Legătura circulară nu poate fi creată pentru elementul de hartă \"%s\"."
@@ -2785,34 +2817,35 @@ msgstr "Refefință circulară în hărțile: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Refefință circulară în ecranele: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Refefință circulară în șabloanele: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Legătura circulară în șabloane nu este permisă."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Clasic"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Șterge"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Șterge istoric și tendințe"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Șterge istoric pentru selecția"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Șterge la deconectare"
 
@@ -2822,69 +2855,69 @@ msgstr "Ceas"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Clonă"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Închide"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Închide constructorul de expresii"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Culoare"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "Culoarea \"%1$s\" nu este corectă: trebuie un cod hexadecimal (6 simboluri)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Culoare (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Expansiune coloană"
 
@@ -2899,7 +2932,7 @@ msgstr "Rezultat combinat"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Comandă"
 
@@ -2907,41 +2940,31 @@ msgstr "Comandă"
 msgid "Command actions"
 msgstr "Acțiuni comandă"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Comanda nu poate fi goală."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Comenzi"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Comentariu actualizat"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Comentarii"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Comentarii pentru \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Comercial"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Compară valori pentru perioade multiple."
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Permisiuni compuse"
 
@@ -2949,29 +2972,39 @@ msgstr "Permisiuni compuse"
 msgid "Condition"
 msgstr "Condiție"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Condiții"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Configurare"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3134,23 +3167,23 @@ msgstr "Configuraţie actualizată"
 msgid "Configure (Filter %s)"
 msgstr "Configurează (Filtrează %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Text de confirmare"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Conectare la"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Conectat ca și '%1$s'"
@@ -3209,7 +3242,7 @@ msgid "Context name"
 msgstr "Nume context"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3217,30 +3250,38 @@ msgstr ""
 msgid "Contract number"
 msgstr "Numărul contractului"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Coordonate"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Copiază"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Copiază selecția în ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Login corect \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Nu s-a putut salva imaginea!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Număr"
 
@@ -3260,6 +3301,10 @@ msgstr "Creează aplicație"
 msgid "Create application (select host first)"
 msgstr "Creează aplicație (selectați serverul prima dată)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3277,7 +3322,7 @@ msgstr "Creează grafic (selectați serverul prima dată)"
 msgid "Create graph prototype"
 msgstr "Creează prototip de grafic"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Creează server"
 
@@ -3290,15 +3335,15 @@ msgstr "Creează grup de servere"
 msgid "Create host prototype"
 msgstr "Creează prototip de server"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Creează mapare icon"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Creează imagine"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Creează element"
 
@@ -3322,6 +3367,10 @@ msgstr "Creează hartă"
 msgid "Create media type"
 msgstr "Creează tip media"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Creează proxy"
@@ -3346,11 +3395,11 @@ msgstr "Creează script"
 msgid "Create slide show"
 msgstr "Creează slide show"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Creează șablon"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Creează trigger"
 
@@ -3374,42 +3423,42 @@ msgstr "Creează grup utilizatori"
 msgid "Create value map"
 msgstr "Creează mapare valoare"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Creat: Aplicația \"%1$s\" pe \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Creat: Regulă de detecție \"%1$s\" pe \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Creat: Prototip server \"%1$s\" pe \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Creat: Element \"%1$s\" pe \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Creat: Prototip element \"%1$s\" pe \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Creat: Trigger \"%1$s\" pe \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Creat: Prototip trigger \"%1$s\" pe \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Creat: Scenariu web \"%1$s\" pe \"%2$s\"."
@@ -3419,51 +3468,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Data curentă este < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Data curentă este = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Data curentă este > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Data curentă NU este N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Serverul curent"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Timpul curent este < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Timpul curent este = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Timpul curent NU este N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Valoare curentă"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3476,7 +3526,7 @@ msgstr "Grafice personalizate"
 msgid "Custom label"
 msgstr "Etichetă personalizată"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Eticheta personalizată pentru harta \"%2$s\" elementele de tipul \"%1$s\" nu poate fi vidă."
@@ -3490,7 +3540,7 @@ msgstr "Multiplicator personalizat"
 msgid "Custom screens"
 msgstr "Ecrane personalizate"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Script personalizat"
 
@@ -3510,18 +3560,14 @@ msgstr "Dimensiune personalizată"
 msgid "Custom slides"
 msgstr "Slide-uri personalizate"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Cehă (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "Configurare panou de supraveghere."
@@ -3537,28 +3583,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "DETALII SCENARIU"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "DEZACTIVAT"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DETECTAT"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3566,25 +3612,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "Nume DNS"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "INACTIV"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Zilnic"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Portocaliu închis"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Întunecat"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Panou de supraveghere"
 
@@ -3596,20 +3642,21 @@ msgstr "Configurare panou de supraveghere"
 msgid "Dashboard filter"
 msgstr "Filtru panou de supraveghere"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Linie întreruptă"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Date"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3632,11 +3679,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Tip date"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Fișier bază de date"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Server bază de date"
 
@@ -3644,35 +3692,39 @@ msgstr "Server bază de date"
 msgid "Database monitor"
 msgstr "Monitor bază de date"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Nume bază de date"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Parolă bază de date"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Port bază de date"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Schema bazei de date"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Server baze de date"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Tipul bazei de date"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Utilizator bază de date"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Dată"
 
@@ -3692,53 +3744,52 @@ msgstr "Data de mentenanță HW expiră"
 msgid "Date HW purchased"
 msgstr "Data achiziției HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Zi"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Ziua lunii"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Ziua din lună este < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Ziua din lună este = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Ziua din lună este > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Ziua din lună NU este N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Ziua săptămânii"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Ziua săptămânii este < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Ziua săptămânii este = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Ziua săptămânii este > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Ziua săptămânii NU este N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Zile"
 
@@ -3746,22 +3797,22 @@ msgstr "Zile"
 msgid "Debug"
 msgstr "Depanare"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Mod depanare"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Modu depanare actualizat"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dec"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Decembrie"
 
@@ -3771,15 +3822,14 @@ msgstr "Zecimal"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Implicit"
 
@@ -3792,11 +3842,11 @@ msgid "Default delay (in seconds)"
 msgstr "Întârziere implicită (în secunde)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Mesaj implicit"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3819,30 +3869,34 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr ""
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr ""
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr ""
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3850,53 +3904,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
+#: include/views/configuration.item.list.php:278
+msgid "Delete history of selected items?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:274
-msgid "Delete history of selected items?"
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3904,11 +3958,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3916,7 +3974,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr ""
 
@@ -3924,71 +3982,67 @@ msgstr ""
 msgid "Delete screen?"
 msgstr ""
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr ""
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr ""
@@ -3997,27 +4051,27 @@ msgstr ""
 msgid "Delete selected groups?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr ""
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr ""
 
@@ -4025,31 +4079,31 @@ msgstr ""
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr ""
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr ""
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr ""
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr ""
 
@@ -4057,15 +4111,15 @@ msgstr ""
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr ""
 
@@ -4077,11 +4131,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr ""
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr ""
 
@@ -4097,11 +4151,15 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4110,15 +4168,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr ""
 
@@ -4126,62 +4184,62 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4190,35 +4248,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr ""
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr ""
 
@@ -4226,30 +4284,41 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr ""
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr ""
 
@@ -4262,71 +4331,71 @@ msgid "Device"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4350,48 +4419,44 @@ msgstr ""
 msgid "Disable host"
 msgstr ""
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr ""
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr ""
 
@@ -4399,11 +4464,11 @@ msgstr ""
 msgid "Disable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr ""
 
@@ -4411,42 +4476,47 @@ msgstr ""
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr ""
 
@@ -4459,7 +4529,7 @@ msgstr ""
 msgid "Discovered"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4467,17 +4537,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr ""
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr ""
 
@@ -4485,17 +4555,17 @@ msgstr ""
 msgid "Discovery check"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4504,69 +4574,72 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr ""
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr ""
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr ""
 
@@ -4578,7 +4651,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr ""
 
@@ -4587,32 +4660,32 @@ msgstr ""
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr ""
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr ""
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr ""
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr ""
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4622,30 +4695,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr ""
 
@@ -4663,74 +4736,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr ""
 
@@ -4738,13 +4812,13 @@ msgstr ""
 msgid "EVENTS"
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4752,9 +4826,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr ""
 
@@ -4762,7 +4836,7 @@ msgstr ""
 msgid "Edit map element"
 msgstr ""
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4770,27 +4844,61 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr ""
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr ""
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr ""
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4798,76 +4906,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4876,11 +5006,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4888,11 +5018,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr ""
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4912,11 +5046,11 @@ msgstr ""
 msgid "Enable host"
 msgstr ""
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr ""
 
@@ -4929,36 +5063,32 @@ msgstr ""
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr ""
 
@@ -4966,11 +5096,11 @@ msgstr ""
 msgid "Enable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4978,64 +5108,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr ""
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr ""
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr ""
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -5053,15 +5187,15 @@ msgstr ""
 msgid "Event ID"
 msgstr ""
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr ""
 
@@ -5070,7 +5204,7 @@ msgstr ""
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr ""
 
@@ -5078,7 +5212,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr ""
 
@@ -5098,9 +5232,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr ""
 
@@ -5108,36 +5243,41 @@ msgstr ""
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr ""
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr ""
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr ""
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr ""
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5145,13 +5285,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5163,7 +5303,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5173,12 +5313,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr ""
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr ""
 
@@ -5186,22 +5326,22 @@ msgstr ""
 msgid "Export to CSV"
 msgstr ""
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr ""
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5209,11 +5349,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr ""
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5234,17 +5375,17 @@ msgid "External check"
 msgstr ""
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr ""
 
@@ -5253,16 +5394,17 @@ msgstr ""
 msgid "FTP"
 msgstr ""
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr ""
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr ""
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5270,40 +5412,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr ""
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr ""
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr ""
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr ""
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr ""
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr ""
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr ""
 
@@ -5347,19 +5489,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5368,13 +5510,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5382,68 +5524,71 @@ msgstr ""
 msgid "Filled region"
 msgstr ""
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr ""
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr ""
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr ""
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5452,8 +5597,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr ""
 
@@ -5463,76 +5608,80 @@ msgstr ""
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr ""
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr ""
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr ""
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr ""
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr ""
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr ""
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr ""
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5542,50 +5691,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr ""
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr ""
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr ""
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr ""
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5593,65 +5742,65 @@ msgid "Get support"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr ""
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr ""
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5660,66 +5809,73 @@ msgid "Gradient line"
 msgstr ""
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr ""
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr ""
 
@@ -5731,54 +5887,59 @@ msgstr ""
 msgid "Graph item"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5790,49 +5951,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr ""
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr ""
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5841,54 +6004,58 @@ msgstr ""
 msgid "Grid"
 msgstr ""
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr ""
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr ""
+msgid_plural "Groups deleted"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5899,40 +6066,42 @@ msgstr ""
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr ""
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr ""
 
@@ -5940,22 +6109,13 @@ msgstr ""
 msgid "Groups in maintenance"
 msgstr ""
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5972,7 +6132,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5990,7 +6150,8 @@ msgstr ""
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -6011,12 +6172,17 @@ msgstr ""
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr ""
@@ -6029,15 +6195,15 @@ msgstr ""
 msgid "Hexadecimal"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr ""
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr ""
 
@@ -6053,15 +6219,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr ""
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6070,23 +6236,23 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -6107,80 +6273,80 @@ msgstr ""
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr ""
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6192,31 +6358,31 @@ msgstr ""
 msgid "Host access"
 msgstr ""
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr ""
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr ""
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
@@ -6224,36 +6390,38 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr ""
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6270,14 +6438,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr ""
 
@@ -6287,8 +6456,8 @@ msgstr ""
 msgid "Host interface"
 msgstr ""
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6304,7 +6473,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6313,18 +6482,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6333,74 +6502,74 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6412,7 +6581,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6424,51 +6593,52 @@ msgstr ""
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr ""
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr ""
 
@@ -6476,11 +6646,11 @@ msgstr ""
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6492,37 +6662,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr ""
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr ""
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr ""
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr ""
 
@@ -6540,22 +6711,22 @@ msgstr ""
 msgid "IMAP"
 msgstr ""
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr ""
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6563,26 +6734,26 @@ msgstr ""
 msgid "IP address"
 msgstr ""
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr ""
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6590,22 +6761,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr ""
 
@@ -6615,7 +6786,7 @@ msgstr ""
 msgid "IPMI sensor"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr ""
 
@@ -6648,7 +6819,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6664,25 +6835,25 @@ msgid "ITEMS"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr ""
 
@@ -6703,42 +6874,44 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6751,7 +6924,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6759,29 +6933,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6789,21 +6963,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr ""
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6812,7 +6988,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr ""
 
@@ -6820,12 +6996,13 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6834,66 +7011,66 @@ msgid "Image updated"
 msgstr ""
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr ""
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr ""
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr ""
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr ""
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr ""
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6906,244 +7083,282 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr ""
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr ""
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7153,11 +7368,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7166,11 +7381,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7178,74 +7393,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr ""
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7253,182 +7494,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr ""
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr ""
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr ""
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr ""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr ""
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr ""
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7437,64 +7697,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7515,52 +7779,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7569,7 +7838,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7589,7 +7859,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7599,43 +7869,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7644,15 +7920,15 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr ""
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
 msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr ""
 
@@ -7660,31 +7936,32 @@ msgstr ""
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr ""
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7704,7 +7981,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7712,7 +7989,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7725,19 +8002,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr ""
 
@@ -7747,112 +8024,114 @@ msgstr ""
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr ""
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7861,7 +8140,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7869,12 +8148,12 @@ msgstr ""
 msgid "Is online?"
 msgstr ""
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr ""
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7882,70 +8161,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr ""
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr ""
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr ""
 
@@ -7953,18 +8233,18 @@ msgstr ""
 msgid "Item count"
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr ""
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7979,58 +8259,58 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -8038,92 +8318,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr ""
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr ""
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr ""
 
@@ -8135,72 +8415,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr ""
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr ""
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr ""
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr ""
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr ""
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr ""
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr ""
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr ""
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8209,40 +8489,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr ""
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr ""
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr ""
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr ""
 
@@ -8273,37 +8553,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr ""
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr ""
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr ""
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr ""
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr ""
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8316,19 +8596,19 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8348,28 +8628,28 @@ msgstr ""
 msgid "Last 7 days"
 msgstr ""
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr ""
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr ""
 
@@ -8377,66 +8657,67 @@ msgstr ""
 msgid "Last seen (age)"
 msgstr ""
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr ""
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr ""
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr ""
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr ""
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr ""
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr ""
 
@@ -8444,39 +8725,29 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr ""
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8488,50 +8759,50 @@ msgstr ""
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr ""
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr ""
 
@@ -8548,36 +8819,36 @@ msgid "Location longitude"
 msgstr ""
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr ""
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr ""
@@ -8586,12 +8857,12 @@ msgstr ""
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8602,12 +8873,12 @@ msgstr ""
 msgid "Login as Guest"
 msgstr ""
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8616,8 +8887,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8638,22 +8910,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8665,7 +8933,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr ""
 
@@ -8690,49 +8958,49 @@ msgstr ""
 msgid "Macro"
 msgstr ""
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr ""
 
@@ -8740,31 +9008,36 @@ msgstr ""
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr ""
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr ""
 
@@ -8772,7 +9045,7 @@ msgstr ""
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr ""
 
@@ -8788,25 +9061,25 @@ msgstr ""
 msgid "Maintenance type"
 msgstr ""
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr ""
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8817,12 +9090,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8832,12 +9105,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8854,12 +9127,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr ""
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8869,23 +9142,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr ""
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr ""
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr ""
 
@@ -8893,28 +9166,34 @@ msgstr ""
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr ""
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr ""
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr ""
@@ -8928,35 +9207,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr ""
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8964,16 +9219,16 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
@@ -8981,92 +9236,85 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr ""
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr ""
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr ""
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr ""
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr ""
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr ""
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr ""
 
@@ -9081,14 +9329,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr ""
 
@@ -9098,7 +9346,7 @@ msgstr ""
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr ""
 
@@ -9106,66 +9354,66 @@ msgstr ""
 msgid "Message actions"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr ""
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9174,7 +9422,7 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
@@ -9182,73 +9430,70 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr ""
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9258,7 +9503,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9270,18 +9515,18 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr ""
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr ""
 
@@ -9289,33 +9534,33 @@ msgstr ""
 msgid "Monitored host"
 msgstr ""
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr ""
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9323,7 +9568,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9332,19 +9577,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr ""
 
@@ -9357,60 +9602,58 @@ msgstr ""
 msgid "NNTP"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr ""
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
+msgid "NTLM"
 msgstr ""
 
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9421,26 +9664,32 @@ msgstr ""
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
+msgid "Name"
+msgstr ""
+
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
 msgid "Name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:223
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9459,12 +9708,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9472,7 +9721,7 @@ msgstr ""
 msgid "Network map added"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr ""
 
@@ -9484,7 +9733,7 @@ msgstr ""
 msgid "Network maps"
 msgstr ""
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr ""
 
@@ -9492,24 +9741,24 @@ msgstr ""
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr ""
 
@@ -9520,16 +9769,16 @@ msgstr ""
 msgid "New flexible interval"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr ""
 
@@ -9537,83 +9786,99 @@ msgstr ""
 msgid "New media"
 msgstr ""
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr ""
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr ""
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9621,25 +9886,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9665,8 +9930,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9676,7 +9941,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9684,30 +9949,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9716,27 +9982,27 @@ msgstr ""
 msgid "No data collection"
 msgstr ""
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9744,39 +10010,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9791,7 +10057,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9800,7 +10066,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9809,48 +10079,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9863,17 +10134,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9892,33 +10168,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9937,7 +10220,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9953,7 +10236,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9962,15 +10245,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9982,133 +10265,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr ""
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10116,7 +10444,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10124,82 +10452,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr ""
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10208,57 +10537,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr ""
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr ""
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr ""
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr ""
 
@@ -10267,7 +10597,7 @@ msgstr ""
 msgid "Not classified"
 msgstr ""
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr ""
 
@@ -10280,8 +10610,8 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr ""
@@ -10294,7 +10624,7 @@ msgstr ""
 msgid "Nothing"
 msgstr ""
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10302,87 +10632,87 @@ msgstr ""
 msgid "Notification report"
 msgstr ""
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr ""
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr ""
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10390,88 +10720,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr ""
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr ""
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr ""
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr ""
 
@@ -10486,16 +10816,18 @@ msgid "OEM"
 msgstr ""
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr ""
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10511,8 +10843,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr ""
 
@@ -10532,11 +10863,12 @@ msgstr ""
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr ""
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10544,25 +10876,25 @@ msgstr ""
 msgid "Octal"
 msgstr ""
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr ""
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr ""
 
@@ -10570,111 +10902,114 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr ""
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10683,28 +11018,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr ""
@@ -10713,25 +11048,27 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10761,24 +11098,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr ""
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr ""
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr ""
 
@@ -10786,19 +11123,19 @@ msgstr ""
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10808,21 +11145,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10835,14 +11172,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr ""
 
@@ -10850,7 +11184,7 @@ msgstr ""
 msgid "Overview by proxy"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10859,147 +11193,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -11008,32 +11350,34 @@ msgstr ""
 msgid "POP"
 msgstr ""
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr ""
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr ""
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr ""
 
@@ -11042,7 +11386,7 @@ msgstr ""
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11062,33 +11406,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11098,20 +11442,21 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr ""
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr ""
 
@@ -11120,21 +11465,21 @@ msgstr ""
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11142,12 +11487,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr ""
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr ""
@@ -11157,24 +11502,24 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr ""
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr ""
 
@@ -11186,55 +11531,56 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr ""
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr ""
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11242,51 +11588,51 @@ msgstr ""
 msgid "Port range"
 msgstr ""
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr ""
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr ""
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr ""
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11335,30 +11681,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11370,16 +11717,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr ""
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr ""
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr ""
 
@@ -11387,75 +11734,71 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr ""
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr ""
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11466,7 +11809,7 @@ msgstr ""
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr ""
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr ""
 
@@ -11474,18 +11817,18 @@ msgstr ""
 msgid "RMCP+"
 msgstr ""
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr ""
 
@@ -11497,7 +11840,7 @@ msgstr ""
 msgid "Received value"
 msgstr ""
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11505,11 +11848,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11520,28 +11863,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr ""
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr ""
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr ""
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr ""
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr ""
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr ""
 
@@ -11559,48 +11902,52 @@ msgstr ""
 msgid "Regular expression"
 msgstr ""
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11617,26 +11964,28 @@ msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11647,21 +11996,19 @@ msgstr ""
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr ""
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11669,11 +12016,11 @@ msgstr ""
 msgid "Remove element"
 msgstr ""
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr ""
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11682,7 +12029,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11694,28 +12041,28 @@ msgstr ""
 msgid "Remove link"
 msgstr ""
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr ""
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr ""
 
@@ -11723,35 +12070,36 @@ msgstr ""
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr ""
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr ""
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11759,29 +12107,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr ""
 
@@ -11800,9 +12150,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11815,7 +12165,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr ""
@@ -11830,15 +12180,15 @@ msgstr ""
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr ""
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr ""
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr ""
 
@@ -11851,7 +12201,8 @@ msgstr ""
 msgid "Result type"
 msgstr ""
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11859,60 +12210,69 @@ msgstr ""
 msgid "Retries left"
 msgstr ""
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr ""
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr ""
 
@@ -11920,11 +12280,11 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr ""
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr ""
 
@@ -11969,20 +12329,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11998,7 +12358,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr ""
 
@@ -12013,13 +12373,13 @@ msgstr ""
 msgid "SLA"
 msgstr ""
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr ""
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr ""
 
@@ -12028,17 +12388,17 @@ msgstr ""
 msgid "SMTP"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr ""
@@ -12054,7 +12414,7 @@ msgstr ""
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr ""
 
@@ -12066,9 +12426,9 @@ msgstr ""
 msgid "SNMP community"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -12077,7 +12437,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12101,7 +12461,7 @@ msgstr ""
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12119,7 +12479,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr ""
@@ -12128,15 +12488,35 @@ msgstr ""
 msgid "SSH agent"
 msgstr ""
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr ""
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr ""
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr ""
 
@@ -12144,92 +12524,92 @@ msgstr ""
 msgid "STATUS OF ZABBIX"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr ""
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr ""
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr ""
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr ""
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr ""
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr ""
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr ""
 
@@ -12241,7 +12621,7 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12252,126 +12632,125 @@ msgstr ""
 msgid "Screen"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr ""
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr ""
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr ""
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr ""
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr ""
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr ""
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12380,17 +12759,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr ""
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr ""
 
@@ -12411,7 +12790,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr ""
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr ""
 
@@ -12443,7 +12822,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr ""
 
@@ -12462,69 +12841,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr ""
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr ""
 
@@ -12540,7 +12926,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr ""
 
@@ -12548,11 +12934,11 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12561,17 +12947,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr ""
 
@@ -12583,7 +12969,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr ""
@@ -12592,44 +12978,44 @@ msgstr ""
 msgid "Server info"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr ""
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr ""
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12645,11 +13031,11 @@ msgstr ""
 msgid "Service port"
 msgstr ""
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr ""
 
@@ -12661,49 +13047,54 @@ msgstr ""
 msgid "Service updated"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr ""
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr ""
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr ""
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr ""
 
@@ -12733,35 +13124,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr ""
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr ""
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr ""
 
@@ -12769,19 +13161,23 @@ msgstr ""
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr ""
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr ""
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr ""
@@ -12790,11 +13186,11 @@ msgstr ""
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr ""
 
@@ -12814,6 +13210,10 @@ msgstr ""
 msgid "Simple graph"
 msgstr ""
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12851,7 +13251,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12869,16 +13269,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr ""
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12887,11 +13287,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12899,10 +13299,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr ""
 
@@ -12910,15 +13310,15 @@ msgstr ""
 msgid "Slides"
 msgstr ""
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr ""
 
@@ -12951,28 +13351,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12985,11 +13385,11 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr ""
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12997,63 +13397,63 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr ""
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -13066,7 +13466,7 @@ msgstr ""
 msgid "Status calculation algorithm"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr ""
 
@@ -13075,7 +13475,7 @@ msgid "Status of Web monitoring"
 msgstr ""
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr ""
 
@@ -13092,40 +13492,40 @@ msgid "Status only"
 msgstr ""
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr ""
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr ""
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr ""
@@ -13134,11 +13534,11 @@ msgstr ""
 msgid "Straight"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr ""
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13146,11 +13546,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13159,32 +13559,32 @@ msgid "Success Audit"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr ""
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr ""
 
@@ -13192,27 +13592,27 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr ""
 
@@ -13220,16 +13620,16 @@ msgstr ""
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13238,21 +13638,21 @@ msgid "System status"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13271,11 +13671,11 @@ msgid "TOTAL"
 msgstr ""
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
+msgid "TRIGGER DESCRIPTION"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr ""
 
@@ -13293,14 +13693,14 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13309,130 +13709,133 @@ msgid "Target type"
 msgstr ""
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr ""
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr ""
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr ""
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr ""
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr ""
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr ""
 
@@ -13440,11 +13843,11 @@ msgstr ""
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr ""
 
@@ -13458,22 +13861,22 @@ msgid "Test string"
 msgstr ""
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13481,7 +13884,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13496,12 +13899,12 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -13509,7 +13912,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -13517,7 +13920,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13526,19 +13929,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr ""
 
@@ -13550,11 +13953,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13563,11 +13966,11 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13579,27 +13982,27 @@ msgstr ""
 msgid "This year"
 msgstr ""
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr ""
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr ""
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr ""
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13608,28 +14011,28 @@ msgstr ""
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13637,54 +14040,54 @@ msgstr ""
 msgid "Time period"
 msgstr ""
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr ""
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13692,17 +14095,18 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr ""
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr ""
 
@@ -13720,7 +14124,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13737,77 +14141,77 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr ""
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr ""
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr ""
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr ""
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr ""
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
@@ -13815,14 +14219,14 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13838,11 +14242,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13850,7 +14255,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13863,12 +14268,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13880,54 +14285,54 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13935,23 +14340,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr ""
 
@@ -13959,40 +14372,41 @@ msgstr ""
 msgid "Trigger value"
 msgstr ""
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr ""
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr ""
 
@@ -14000,78 +14414,78 @@ msgstr ""
 msgid "Triggers overview"
 msgstr ""
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr ""
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr ""
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr ""
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr ""
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr ""
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr ""
 
@@ -14079,62 +14493,64 @@ msgstr ""
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr ""
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr ""
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr ""
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr ""
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr ""
 
@@ -14150,20 +14566,30 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr ""
 
@@ -14171,15 +14597,11 @@ msgstr ""
 msgid "USER PROFILE"
 msgstr ""
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr ""
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr ""
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14187,7 +14609,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr ""
 
@@ -14200,20 +14622,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr ""
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr ""
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr ""
 
@@ -14222,29 +14644,29 @@ msgstr ""
 msgid "Units"
 msgstr ""
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14254,23 +14676,20 @@ msgstr ""
 msgid "Unknown action"
 msgstr ""
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr ""
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14282,23 +14701,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr ""
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr ""
 
@@ -14306,61 +14725,61 @@ msgstr ""
 msgid "Unlink from template"
 msgstr ""
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14374,32 +14793,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14410,34 +14840,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr ""
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr ""
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr ""
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr ""
 
@@ -14445,55 +14875,55 @@ msgstr ""
 msgid "Updated status of host"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr ""
 
@@ -14501,14 +14931,14 @@ msgstr ""
 msgid "Upper level maps"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14516,9 +14946,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr ""
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14534,85 +14964,89 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr ""
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr ""
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr ""
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14630,34 +15064,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr ""
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr ""
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14683,243 +15117,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr ""
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr ""
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr ""
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14954,11 +15388,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -15004,10 +15438,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr ""
 
@@ -15016,7 +15450,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -15028,8 +15462,8 @@ msgstr ""
 msgid "Values"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr ""
 
@@ -15042,64 +15476,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr ""
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr ""
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr ""
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr ""
 
@@ -15107,67 +15546,85 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr ""
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr ""
 
@@ -15175,9 +15632,9 @@ msgstr ""
 msgid "Week"
 msgstr ""
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr ""
 
@@ -15185,12 +15642,12 @@ msgstr ""
 msgid "When active"
 msgstr ""
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr ""
@@ -15200,28 +15657,28 @@ msgstr ""
 msgid "With data collection"
 msgstr ""
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr ""
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr ""
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr ""
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr ""
 
@@ -15230,7 +15687,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15243,180 +15700,165 @@ msgstr ""
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr ""
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr ""
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr ""
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr ""
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr ""
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr ""
 
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr ""
-
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr ""
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15424,96 +15866,105 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr ""
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr ""
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr ""
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr ""
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr ""
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr ""
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr ""
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr ""
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15526,7 +15977,7 @@ msgstr ""
 msgid "Zabbix"
 msgstr ""
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15545,8 +15996,8 @@ msgid "Zabbix User"
 msgstr ""
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15572,10 +16023,11 @@ msgstr ""
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr ""
@@ -15588,7 +16040,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15596,15 +16048,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr ""
 
@@ -15613,11 +16065,11 @@ msgstr ""
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr ""
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr ""
 
@@ -15625,25 +16077,20 @@ msgstr ""
 msgid "Zabbix trapper"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr ""
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr ""
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr ""
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15652,19 +16099,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr ""
 
@@ -15672,19 +16119,15 @@ msgstr ""
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr ""
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr ""
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr ""
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr ""
 
@@ -15696,83 +16139,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr ""
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr ""
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr ""
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr ""
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr ""
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr ""
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15794,19 +16203,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr ""
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15818,47 +16223,49 @@ msgstr ""
 msgid "executed"
 msgstr ""
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr ""
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr ""
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr ""
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr ""
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr ""
 
@@ -15866,7 +16273,7 @@ msgstr ""
 msgid "in"
 msgstr ""
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15876,7 +16283,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15884,20 +16291,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr ""
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr ""
@@ -15906,12 +16313,12 @@ msgstr ""
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15920,46 +16327,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr ""
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr ""
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15968,17 +16375,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr ""
@@ -15991,12 +16398,14 @@ msgstr ""
 msgid "not like"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr ""
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr ""
 
@@ -16005,57 +16414,61 @@ msgstr ""
 msgid "not sent"
 msgstr ""
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr ""
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr ""
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr ""
 
-#: include/page_header.php:114
-msgid "refreshed every"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16064,25 +16477,24 @@ msgstr ""
 msgid "remember selected"
 msgstr ""
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr ""
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr ""
 
@@ -16095,7 +16507,7 @@ msgstr ""
 msgid "sent"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr ""
 
@@ -16103,36 +16515,36 @@ msgstr ""
 msgid "show icon mappings"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr ""
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr ""
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr ""
 
@@ -16144,11 +16556,11 @@ msgstr ""
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr ""
diff --git a/frontends/php/locale/ru/LC_MESSAGES/frontend.po b/frontends/php/locale/ru/LC_MESSAGES/frontend.po
index af0ebdf84a8..b7eac54add3 100644
--- a/frontends/php/locale/ru/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/ru/LC_MESSAGES/frontend.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
-"PO-Revision-Date: 2014-02-01 22:57+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
+"PO-Revision-Date: 2014-06-05 14:47+0300\n"
 "Last-Translator: dotneft <dotneft@gmail.com>\n"
 "Language-Team: Zabbix translation team\n"
 "Language: ru\n"
@@ -13,24 +13,26 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1391288271.0\n"
+"X-POOTLE-MTIME: 1401972461.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" должно быть между 1970.01.01 и 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Отображать триггеры ОК\" должно быть \"0\" или положительным целым числом."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Мигание триггеров при изменении состояния\" должно быть \"0\" или положительным целым числом."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -38,7 +40,7 @@ msgstr[0] "%1$d день"
 msgstr[1] "%1$d дня"
 msgstr[2] "%1$d дней"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -51,7 +53,7 @@ msgstr[2] "отображено %1$d из %2$d событий"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (год %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
@@ -59,10 +61,8 @@ msgstr[0] "%1$s элемент данных"
 msgstr[1] "%1$s элемента данных"
 msgstr[2] "%1$s элементов данных"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
@@ -70,7 +70,7 @@ msgstr[0] "%1$s день"
 msgstr[1] "%1$s дня"
 msgstr[2] "%1$s дней"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -83,11 +83,11 @@ msgstr[2] "%1$s минут"
 #, c-format
 msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%1$s попытка осталась"
+msgstr[1] "%1$s попытки осталось"
+msgstr[2] "%1$s попыток осталось"
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -111,23 +111,23 @@ msgstr[0] "%d устройство"
 msgstr[1] "%d устройства"
 msgstr[2] "%d устройств"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - бесконечно)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Только Супер-Администраторы могут создавать группы)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(в днях)"
 
@@ -135,34 +135,34 @@ msgstr "(в днях)"
 msgid "(in sec)"
 msgstr "(в сек)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(минимум 60 секунд, 0 - использовать из настроек действия)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(без прокси)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr "(с предупреждениями)"
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[ВВЕДЕНО КАК МАССОВОЕ ПОДТВЕРЖДЕНИЕ]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 или 1"
 
@@ -178,7 +178,7 @@ msgstr "10 секунд"
 msgid "30 seconds"
 msgstr "30 секунд"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D вид"
 
@@ -194,7 +194,7 @@ msgstr "5 секунд"
 msgid "500 latest values"
 msgstr "500 последних значений"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Подменю/Подменю.../>Скрипт"
 
@@ -204,7 +204,7 @@ msgstr "<вручную>"
 
 #: include/views/administration.auditacts.list.php:31
 msgid "ACTION LOG"
-msgstr ""
+msgstr "ЖУРНАЛ ДЕЙСТВИЙ"
 
 #: include/views/configuration.host.discovery.edit.php:144
 #: include/views/configuration.item.edit.php:150
@@ -213,36 +213,35 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ПОДТВЕРЖДЕНИЯ ОПОВЕЩЕНИЙ"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "И"
 
 #: include/views/administration.auditlogs.list.php:31
 msgid "AUDIT LOG"
-msgstr ""
+msgstr "ЖУРНАЛ АУДИТА"
 
 #: report2.php:163
 msgid "AVAILABILITY REPORT"
 msgstr "ОТЧЕТ О ДОСТУПНОСТИ"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Абсолютная разница между последним и предыдущими значениями < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Абсолютная разница между последним и предыдущими значениями = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Абсолютная разница между последним и предыдущими значениями > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Абсолютная разница между последним и предыдущими значениями NOT N"
 
@@ -254,42 +253,42 @@ msgstr "Допустимый уровень SLA"
 msgid "Access denied!"
 msgstr "Доступ запрещен!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Доступ запрещен."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Аккаунт заблокирован на %s секунд"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Подтверждено"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Подтвердить"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Подтверждение добавлено"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Подтверждение тревоги от имени"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Подтвердить и вернуться"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Состояние подтверждения"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Подтверждено"
 
@@ -314,63 +313,66 @@ msgstr "Подтверждение отключено"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Действие"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Действие \"%1$s\" уже существует."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "В действии \"%1$s\" задано некорректное значение для \"esc_period\" (минимально %2$s секунд)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "В действии \"%1$s\" нет заданных операций."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Действие добавлено"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Действие удалено"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] "Действие деактивировано"
 msgstr[1] "Действий деактивировано"
 msgstr[2] "Действия деактивированы"
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] "Действие активировано"
@@ -382,23 +384,23 @@ msgstr[2] "Действия активированы"
 #: include/views/administration.auditacts.list.php:32
 #: include/views/administration.auditlogs.list.php:29
 msgid "Action log"
-msgstr ""
+msgstr "Журнал действий"
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Операции действия"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Действие обновлено"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Действия"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Активный"
@@ -408,80 +410,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Активно"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Активно с"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Активно до"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Добавить"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr "Добавить потомка"
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Добавление комментария от"
 
@@ -497,27 +502,23 @@ msgstr "Добавить узел сети"
 msgid "Add link"
 msgstr "Добавить соединитель"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Добавить отсутствующее"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Добавить новые или существующие группы элементов данных"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Добавить новые или существующие группы узлов сети"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Добавить прототип"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Добавить в"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Добавить в избранное"
@@ -526,7 +527,7 @@ msgstr "Добавить в избранное"
 msgid "Add to host group"
 msgstr "Добавить в группу узлов сети"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Добавить в группы узлов сети"
 
@@ -538,7 +539,7 @@ msgstr "Добавлено"
 msgid "Admin"
 msgstr "Администратор"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Администрирование"
 
@@ -546,34 +547,34 @@ msgstr "Администрирование"
 msgid "Advanced labels"
 msgstr "Расширенные подписи"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Возраст"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Возраст менее чем"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Возраст менее чем %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Агент"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
-msgstr ""
+msgstr "Имя хоста агента указанное в файле конфигурации. Строковое значение."
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Интерфейсы агента"
@@ -582,12 +583,12 @@ msgstr "Интерфейсы агента"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Интерфейс Агента или SNMP или JMX или IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
-msgstr ""
+msgstr "Аггрегативные проверки не требуют наличия агента на наблюдаемом узле сети. Zabbix сервер собирает аггреративную информацию с помощью прямых запросов в базу данных. Смотрите документацию по Zabbix."
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Псевдоним"
 
@@ -595,124 +596,126 @@ msgstr "Псевдоним"
 msgid "Align icons"
 msgstr "Привязать иконки"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Все"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Все группы"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "У всех ссылок должны быть указаны \"Имя\" и \"URL\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Разрешенные узлы сети"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
-msgstr ""
+msgstr "Объем памяти в байтах. Если режим не указан, используется total."
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
-msgstr ""
+msgstr "И"
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
-msgstr ""
+msgstr "И/Или"
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Любое"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Любая строка символов включена"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Группа элементов данных"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Группа элементов данных \"%1$s\" уже существует."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Группа элементов данных добавлена"
 
-#: applications.php:151 applications.php:186
-#, fuzzy
+#: applications.php:162 applications.php:202
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Группа элементов данных удалена"
-msgstr[1] "Группа элементов данных удалена"
-msgstr[2] "Группа элементов данных удалена"
+msgstr[1] "Группа элементов данных удалены"
+msgstr[2] "Группы элементов данных удалены"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Ошибка приложения."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Группа элементов данных обновлена"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Группа элементов данных с ID \"%1$s\" недоступна для \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Группы элементов данных"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Применить"
 
@@ -721,16 +724,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Близится"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Апр"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Апрель"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Вы уверены, что хотите выполнить это действие?"
 
@@ -746,9 +749,9 @@ msgstr "Размер области"
 msgid "Area type"
 msgstr "Тип области"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -762,22 +765,17 @@ msgstr "Как простой текст"
 msgid "Asset tag"
 msgstr "Этикетка владельца"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "В %1$s:%2$s %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "В %1$s:%2$s %3$s %4$s каждый %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "В %1$s:%2$s на %3$s день каждый %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
@@ -785,7 +783,7 @@ msgstr[0] "В %1$s:%2$s каждый %3$s каждую неделю"
 msgstr[1] "В %1$s:%2$s каждый %3$s каждые %4$s недели"
 msgstr[2] "В %1$s:%2$s каждый %3$s каждые %4$s недель"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
@@ -793,23 +791,25 @@ msgstr[0] "В %1$s:%2$s каждый день"
 msgstr[1] "В %1$s:%2$s каждые %3$s дня"
 msgstr[2] "В %1$s:%2$s каждые %3$s дней"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "В (час:минута)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Должен быть выбран по крайней мере один узел сети или одна группа."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Должен быть создан по крайней мере один период обслуживания."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Аудит"
@@ -829,26 +829,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Авг"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Август"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Алгоритм аутентификации"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -907,9 +909,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -917,20 +919,20 @@ msgstr "Автоматически"
 msgid "Automatic icon mapping"
 msgstr "Автоматическое соответствие иконок"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Автоматический выбор иконки"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Доступность"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Отчет о доступности"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Доступен"
 
@@ -939,36 +941,36 @@ msgstr "Доступен"
 msgid "Average"
 msgstr "Средняя"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Среднее по"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Среднее значение за период T < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Среднее значение за период T = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Среднее значение за период T > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Среднее значение за период T NOT N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Расположение оси X"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "Б"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Фон"
@@ -977,7 +979,7 @@ msgstr "Фон"
 msgid "Background image"
 msgstr "Фоновое изображение"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Гистограммные отчеты"
 
@@ -987,8 +989,8 @@ msgid "Base DN"
 msgstr "База для поиска (BaseDN)"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Простая аутентификация"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -1000,15 +1002,15 @@ msgstr "Имя для подключения (Bind DN)"
 msgid "Bind password"
 msgstr "Пароль подключения (Bind password)"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Побитовое AND последнего (наиболее нового) значения T и маска = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Побитовое AND последнего (наиболее нового) значения T и маска NOT N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Черная & Синяя"
 
@@ -1020,8 +1022,8 @@ msgstr "Мигание"
 msgid "Blocked"
 msgstr "Заблокирован"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Жирная линия"
 
@@ -1029,22 +1031,22 @@ msgstr "Жирная линия"
 msgid "Boolean"
 msgstr "Логический"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "По нижнему краю"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Светлее"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Болгарский (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Массовое подтверждение"
 
@@ -1070,7 +1072,7 @@ msgstr "НАСТРОЙКА ГРУПП ЭЛЕМЕНТОВ ДАННЫХ"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "НАСТРОЙКА АУТЕНТИФИКАЦИИ"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1100,7 +1102,7 @@ msgstr "НАСТРОЙКА ГРУПП УЗЛОВ СЕТИ"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "НАСТРОЙКА ПРОТОТИПОВ УЗЛОВ СЕТИ"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "НАСТРОЙКА УЗЛОВ СЕТИ"
 
@@ -1112,7 +1114,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "НАСТРОЙКА СООТВЕТСТВИЯ ИКОНОК"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "НАСТРОЙКА ИЗОБРАЖЕНИЙ"
 
@@ -1121,14 +1123,14 @@ msgstr "НАСТРОЙКА ИЗОБРАЖЕНИЙ"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "НАСТРОЙКА УСЛУГ IT"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "НАСТРОЙКА ПРОТОТИПОВ ЭЛЕМЕНТОВ ДАННЫХ"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "НАСТРОЙКА ЭЛЕМЕНТОВ ДАННЫХ"
 
@@ -1157,7 +1159,7 @@ msgstr "НАСТРОЙКА КАРТ СЕТЕЙ"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "НАСТРОЙКА ПРОКСИ"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "НАСТРОЙКА РЕГУЛЯРНЫХ ВЫРАЖЕНИЙ"
 
@@ -1177,7 +1179,7 @@ msgstr "НАСТРОЙКА СКРИПТОВ"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "НАСТРОЙКИ СЛАЙД-ШОУ"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "НАСТРОЙКА ШАБЛОНОВ"
 
@@ -1193,7 +1195,7 @@ msgstr "НАСТРОЙКА ВАЖНОСТЕЙ ТРИГГЕРОВ"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "НАСТРОЙКА ТРИГГЕРОВ"
 
@@ -1225,22 +1227,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "НАСТРОЙКА ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1249,21 +1251,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Вычислять SLA, допустимый уровень SLA (в %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Вычисляемое"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Итоговые права доступа"
 
@@ -1271,92 +1273,95 @@ msgstr "Итоговые права доступа"
 msgid "Callback"
 msgstr "Callback"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Канада (136 символов)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Отмена"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Не удалось подтвердить событие"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Не удалось добавить не числовой элемент данных \"%1$s\" на график \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Не удалось добавить не числовой элемент данных \"%1$s\" к прототипу графика \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Не удалось добавить не числовой элемент данных \"%1$s\"."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Не удалось добавить действие"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Не удалось добавить условие действия"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Не удалось добавить группу элементов данных"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Не удалось добавить зависимость от узла сети к шаблону."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Не удалось добавить зависимость от триггера \"%1$s:%2$s\" к несуществующему триггеру \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Не удалось добавить правило обнаружения"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Не удалось добавить график"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Не удалось добавить группу"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Не удалось добавить узел сети"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Не удалось добавить прототип узла сети"
 
@@ -1364,24 +1369,24 @@ msgstr "Не удалось добавить прототип узла сети"
 msgid "Cannot add image"
 msgstr "Не удалось добавить изображение"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Не удалось добавить изображение."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Не удалось добавить элемент данных"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Не удалось добавить элемент данных \"%1$s\" из \"%2$s\" в группу элементов данных \"%3$s\" из \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Не удалось добавить элементы данных."
 
@@ -1389,46 +1394,46 @@ msgstr "Не удалось добавить элементы данных."
 msgid "Cannot add macro."
 msgstr "Не удалось добавить макрос."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Не удалось добавить обслуживание"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Не удалось добавить способ оповещения"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Невозможно добавить более одного элемента данных с типом \"Сумма графика\" в график \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
-msgstr "Не удалось добавить более одного элемента данных с типом 'Суммарный график' к прототипу графика \"%1$s\"."
+msgstr "Невозможно добавить более одного элемента данных с типом 'Суммарный график' к прототипу графика \"%1$s\"."
 
 #: sysmaps.php:175
 msgid "Cannot add network map"
 msgstr "Не удалось добавить карту сети"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Не удалось добавить новую группу элементов данных \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Не удалось добавить прокси"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Не удалось добавить регулярное выражение"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Не удалось добавить комплексный экран"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Не удалось добавить скрипт"
 
@@ -1440,27 +1445,27 @@ msgstr "Невозможно добавить услугу"
 msgid "Cannot add slide show"
 msgstr "Не удалось добавить слайд-шоу"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Не удалось добавить шаблон"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Не удалось добавить триггер"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Не удалось добавить пользователя"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Невозможно добавить пользователя. Оба пароля должны совпадать."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Не удалось добавить пользователей."
 
@@ -1468,7 +1473,7 @@ msgstr "Не удалось добавить пользователей."
 msgid "Cannot add value map"
 msgstr "Не удалось добавить преобразование значения"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Не удалось добавить веб-сценарий"
 
@@ -1488,23 +1493,23 @@ msgstr "Не удалось изменить метод аутентификац
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Не удалось изменить метод аутентификации на внутренний Zabbix"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Не удалось очистить историю"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Не удалось клонировать прототипы графиков."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Не удалось клонировать прототипы узлов сети."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Не удалось клонировать прототипы элементов данных."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Не удалось клонировать прототипы триггеров."
 
@@ -1512,41 +1517,41 @@ msgstr "Не удалось клонировать прототипы тригг
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Не удалось подключиться на порт траппера демона Zabbix сервера, но он должен быть доступен для выполнения скрипта."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Не удалось скопировать графики"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Не удалось скопировать элементы данных"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Не удалось скопировать триггер \"%1$s:%2$s\", потому что он содержит несколько узлов сети в выражении."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
-msgstr "Не удалось создать прототип узла сети от обнаруженного узла сети \"%1$s\"."
+msgstr "Не удалось создать прототип узла сети у обнаруженного узла сети \"%1$s\"."
 
 #: include/db.inc.php:34
 msgid "Cannot create another database connection."
 msgstr "Не удалось создать другое подключение к базе данных."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Не удалось создать закольцованные зависимости."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Невозможно создать зависимость триггера от самого себя."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Не удалось создать правило обнаружения"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Не удалось создать группу узлов сети."
 
@@ -1554,42 +1559,39 @@ msgstr "Не удалось создать группу узлов сети."
 msgid "Cannot create icon map"
 msgstr "Не удалось создать соответствие иконок"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Невозможно создать соответствие иконок с таким же именем \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Не удалось создать карту сети \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Не удалось создать новую группу элементов данных, веб-сценарий уже присоединен к группе элементов данных."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Не удалось создать новый элемент"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Не удалось создать комплексный экран."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Не удалось удалить внутреннего пользователя Zabbix \"%1$s\", попробуйте отключить его."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Не удалось удалить действие"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
@@ -1597,60 +1599,64 @@ msgstr[0] "Невозможно удалить группу элементов �
 msgstr[1] "Невозможно удалить группу элементов данных"
 msgstr[2] "Невозможно удалить группу элементов данных"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Не удалось удалить зависимость"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Не удалось удалить правило обнаружения"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Не удалось удалить правила обнаружения"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Не удалось удалить график"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Не удалось удалить прототип графика"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Не удалось удалить график."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Не удалось удалить график"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Невозможно удалить графики созданные низкоуровневым обнаружением."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Не удалось удалить группу"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Не удалось удалить группу"
+msgstr[1] "Не удалось удалить группу"
+msgstr[2] "Не удалось удалить группу"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Не удалось удалить узел сети"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Не удалось удалить группу узлов сети."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Не удалось удалить прототип узла сети."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Не удалось удалить прототипы узлов сети"
 
@@ -1658,80 +1664,80 @@ msgstr "Не удалось удалить прототипы узлов сет�
 msgid "Cannot delete icon map"
 msgstr "Не удалось удалить соответствие иконок"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Не удалось удалить изображение"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Не удалось удалить инвентарные данные."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Не удалось удалить элемент данных"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Не удалось удалить элементы данных"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Невозможно удалить элементы данных созданные низкоуровневым обнаружением."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Не удалось удалить обслуживание"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Не удалось удалить способ оповещения"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Не удалось удалить карту сети"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Не удалось удалить прокси"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Не удалось удалить регулярное выражение"
 msgstr[1] "Не удалось удалить регулярные выражения"
 msgstr[2] "Не удалось удалить регулярные выражения"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Не удалось удалить комплексный экран"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Не удалось удалить скрипт"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Не удалось удалить скрипты. Пустой входящий параметр \"scriptids\"."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Не удалось удалить скрипты. Скрипт \"%1$s\" используется в операции действия \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Не удалось удалить скрипты. Скрипт с scriptid \"%1$s\" не существует."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Не удалось удалить выбранные действия"
 
@@ -1739,77 +1745,80 @@ msgstr "Не удалось удалить выбранные действия"
 msgid "Cannot delete service"
 msgstr "Не удалось удалить услугу"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Не удалось удалить слайд-шоу"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Не удалось удалить шаблон"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Не удалось удалить шаблонную группу элементов данных."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Не удалось удалить шаблонные графики."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Не удалось удалить шаблонный прототип узла сети."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Не удалось удалить шаблонный элемент данных."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Не удалось удалить шаблонные элементы данных"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Не удалось удалить шаблонные элементы данных."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Не удалось удалить шаблонный триггер \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Не удалось удалить шаблонный веб-сценарий \"%1$s\"."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Не удалось удалить триггер"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Не удалось удалить прототип триггера"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Не удалось удалить триггер."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Не удалось удалить триггеры"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Невозможно удалить триггеры созданные низкоуровневым обнаружением."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Не удалось удалить пользователя"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Не удалось удалить оповещение пользователя."
 
@@ -1817,60 +1826,60 @@ msgstr "Не удалось удалить оповещение пользова
 msgid "Cannot delete value map"
 msgstr "Не удалось удалить преобразование значения"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Не удалось удалить веб-сценарий"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
@@ -1878,28 +1887,28 @@ msgstr[0] "Не удалось отключить способ оповещен�
 msgstr[1] "Не удалось отключить способ оповещения"
 msgstr[2] "Не удалось отключить способ оповещения"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1913,58 +1922,58 @@ msgstr "Не удалось отобразить очередь элементо
 
 #: chart7.php:78
 msgid "Cannot display more than one item with type \"Graph sum\"."
-msgstr "Не удалось отобразить более одного элемента данных с типом \"Сумма графика\".Не удалось отобразить более одного элемента данных с типом \"Сумма графика\"."
+msgstr "Не удалось отобразить более одного элемента данных с типом \"Суммарный график\""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
@@ -1972,90 +1981,84 @@ msgstr[0] "Не удалось включить способ оповещени�
 msgstr[1] "Не удалось включить способ оповещения"
 msgstr[2] "Не удалось включить способ оповещения"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Не удалось найти фоновое изображение \"%1$s\" используемое на карте сети \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не удалось найти график \"%1$s\" используемый в комплексном экране \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Не удалось найти группу \"%1$s\" используемую на карте сети \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не удалось найти группу \"%1$s\" используемую в комплексном экране \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Не удалось найти узел сети \"%1$s\" используемый на карте сети \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не удалось найти узел сети \"%1$s\" используемый в комплексном экране \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Не удалось найти интерфейс у узла сети \"%1$s\" для ключа элемента данных \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Не удалось найти узел сети или шаблон \"%1$s\" указанный в графике \"%2$s\"."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2066,34 +2069,53 @@ msgstr "Не удалось найти иконку \"%1$s\" используе�
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Не удалось найти иконку \"%1$s\" используемую на карте сети \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не удалось найти элемент данных \"%1$s\" используемый в комплексном экране \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Не удалось найти карту сети \"%1$s\" используемую в экспортированной карте сети \"%2$s\"."
@@ -2103,41 +2125,41 @@ msgstr "Не удалось найти карту сети \"%1$s\" исполь
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Не удалось найти карту сети \"%1$s\" используемую на карте сети \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не удалось найти карту сети \"%1$s\" используемую в комплексном экране \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Не удалось найти объекты с именем"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не удалось найти комплексный экран \"%1$s\" используемый в комплексном экране \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Не удалось найти триггер \"%1$s\" используемый на карте сети \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2150,12 +2172,14 @@ msgstr "Не удалось построить дерево. Проверьте
 msgid "Cannot format tree."
 msgstr "Не удалось построить дерево."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Не удалось раскрыть выражение \"%s\"."
@@ -2168,7 +2192,7 @@ msgstr[0] "Не удалось импортировать комплексный
 msgstr[1] "Не удалось импортировать комплексный экран \"%1$s\": подэкраны \"%2$s\" не существуют."
 msgstr[2] "Не удалось импортировать комплексный экран \"%1$s\": подэкраны \"%2$s\" не существуют."
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
@@ -2176,52 +2200,53 @@ msgstr[0] "Не удалось импортировать шаблон \"%1$s\",
 msgstr[1] "Не удалось импортировать шаблон \"%1$s\", соединенные шаблоны \"%2$s\" не существуют."
 msgstr[2] "Не удалось импортировать шаблон \"%1$s\", соединенные шаблоны \"%2$s\" не существуют."
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Не удалось подключить \"view file\" \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Не удалось добавить оповещение пользователя."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Не удалось присоединить шаблон"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Не удалось выполнить выход."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Невозможно массово обновить имя узла сети."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Невозможно массово обновить видимое имя узла сети."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Невозможно передать одинаковые ID шаблонов для присоединения: %s."
@@ -2241,7 +2266,7 @@ msgstr "Невозможно выполнить запрос обновлени�
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Невозможно выполнить запрос обновления таблицы \"%1$s\" без выражения where."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "Не удалось обработать группы элементов данных из разных узлов сети или шаблонов.Не удалось обработать группы элементов данных из разных узлов сети или шаблонов."
 
@@ -2250,11 +2275,11 @@ msgstr "Не удалось обработать группы элементов
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Не удалось прочитать ответ, проверьте соединение с Zabbix сервером \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Не удалось удалить все элементы данных, по крайней мере один элемент данных должен остаться."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2262,11 +2287,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Не удалось удалить макрос."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Не удалось переименовать гостевого пользователя."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Невозможно сохранить правило обнаружения без проверок."
 
@@ -2275,217 +2300,226 @@ msgstr "Невозможно сохранить правило обнаруже�
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Не удалось отправить команду, проверьте соединение с Zabbix сервером \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "Не удалось установить \"%1$s\" для элемента данных \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Не удалось установить \"%1$s\" для триггера \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Не удалось установить \"templateid\" для группы элементов данных \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Не удалось установить \"templateid\" для комплексного экрана \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Не удалось установить \"templateid\" для прототипа триггера \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Не удалось задать поля инвентарных данных при отключенной инвентаризации."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Не удалось переключить узел сети на интерфейс."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Не удалось разблокировать пользователей"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Не удалось отсоединить и очистить Веб-сценарии."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Не удалось отсоединить и очистить группы элементов данных."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Не удалось отсоединить и очистить правила обнаружения"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Не удалось отсоединить и очистить прототипы графиков"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Не удалось отсоединить и очистить графики."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Не удалось отсоединить и очистить прототипы элементов данных"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Не удалось отсоединить и очистить элементы данных"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Не удалось отсоединить и очистить триггеры"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Не удалось отсоединить шаблон"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Не удалось отсоединить триггер \"%s\", он содержит элементы данных из шаблона, который остается присоединенным к узлу сети."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "Не удалось обновить \"%1$s\" для обнаруженного узла сети."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Не удалось обновить \"%1$s\" для обнаруженного элемента данных."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Не удалось обновить \"%1$s\" для обнаруженного триггера."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Не удалось обновить \"%1$s\" для элемента данных \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Не удалось обновить \"%1$s\" для триггера \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Не удалось обновить \"templateid\" для группы элементов данных \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Не удалось обновить \"templateid\" для графика \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Не удалось обновить \"templateid\" у прототипа графика \"%1$s\"."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Не удалось обновить \"templateid\" для комплексного экрана \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Не удалось обновить \"templateid\" для прототипа триггера \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Не удалось обновить обнаруженный график."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Не удалось обновить обнаруженную группу узлов сети."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Не удалось обновить действие"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Не удалось обновить группу элементов данных"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Не удалось обновить комментарий"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Не удалось обновить настройки"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Не удалось обновить режим отладки"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Не удалось обновить правило обнаружения"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Не удалось обновить доступ к веб-интерфейсу"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Не удалось обновить график"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Не удалось обновить группу"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Не удалось обновить группу."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Не удалось обновить группы для обнаруженного узла сети \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Не удалось обновить узел сети"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Не удалось обновить прототип узла сети"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Не удалось обновить узлы сети"
 
@@ -2497,24 +2531,24 @@ msgstr "Не удалось обновить соответствие иконо
 msgid "Cannot update image"
 msgstr "Не удалось обновить изображение"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Не удалось обновить изображение."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Не удалось обновить интерфейс для обнаруженного узла сети \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Не удалось обновить элемент данных"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Не удалось обновить элементы данных"
 
@@ -2526,16 +2560,16 @@ msgstr "Не удалось обновить макрос."
 msgid "Cannot update macros"
 msgstr "Не удалось обновить макросы"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Не удалось обновить обслуживание"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Не удалось обновить карту сети \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Не удалось обновить способ оповещения"
 
@@ -2543,28 +2577,24 @@ msgstr "Не удалось обновить способ оповещения"
 msgid "Cannot update network map"
 msgstr "Не удалось обновить карту сети"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Не удалось обновить прокси"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Не удалось обновить прокси для обнаруженного узла сети \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Не удалось обновить регулярное выражение"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Не удалось обновить комплексный экран"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Не удалось обновить комплексный экран."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Не удалось обновить скрипт"
 
@@ -2576,40 +2606,41 @@ msgstr "Невозможно обновить услугу"
 msgid "Cannot update slide show"
 msgstr "Не удалось обновить слайд-шоу"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Не удалось обновить шаблон"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Не удалось обновить шаблонные группы элементов данных."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "Не удалось обновить шаблоны для обнаруженного узла сети \"%1$s\"."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Не удалось обновить триггер"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Не удалось обновить данные пользователя"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Не удалось обновить оповещение пользователя."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Невозможно обновить данные пользователя. Оба пароля должны совпадать."
 
@@ -2617,15 +2648,15 @@ msgstr "Невозможно обновить данные пользовате�
 msgid "Cannot update value map"
 msgstr "Не удалось обновить преобразование значения"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Не удалось обновить веб-сценарий"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "Не удалось проверить проверку обнаружения: ошибочный запрос или не удалось подключиться к Zabbix серверу.Не удалось проверить проверку обнаружения: ошибочный запрос или не удалось подключиться к Zabbix серверу.Не удалось проверить проверку обнаружения: ошибочный запрос или не удалось подключиться к Zabbix серверу.Не удалось проверить проверку обнаружения: ошибочный запрос или не удалось подключиться к Zabbix серверу.Не удалось проверить проверку обнаружения: ошибочный запрос или не удалось подключиться к Zabbix серверу.Не удалось проверить проверку обнаружения: ошибочный запрос или не удалось подключиться к Zabbix серверу."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Заголовок"
 
@@ -2634,47 +2665,47 @@ msgstr "Заголовок"
 msgid "Case sensitive"
 msgstr "Регистрозависимое"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "По центру"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Изменить"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Изменение"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Изменить пароль"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Символ"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Строка символов включена"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Строка символов не включена"
 
@@ -2683,48 +2714,48 @@ msgid "Chassis"
 msgstr "Шасси"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Проверка уже существует."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Проверьте часть выражения начиная с \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Пожалуйста, проверьте ключ. Пример по умолчанию показан."
 
@@ -2733,44 +2764,44 @@ msgid "Check type"
 msgstr "Тип проверки"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Проверки"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Проверки должны быть уникальными."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Chinese (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Китайский (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Закольцовывающая связь не может быть создана для элемента карты сети \"%s\"."
@@ -2785,34 +2816,35 @@ msgstr "Закольцованная ссылка в картах сети: %1$s
 msgid "Circular reference in screens: %1$s."
 msgstr "Закольцованная ссылка в комплексных экранах: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Закольцованная ссылка в шаблонах: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Закольцованное соединение шаблонов не допускается."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Классическая"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Очистить"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Очистить историю и динамику изменений"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Очистить историю для выбранного"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Очистить при отсоединении"
 
@@ -2822,69 +2854,69 @@ msgstr "Часы"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Клонировать"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Закрыть"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Закрыть конструктор выражения"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Цвет"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "Цвет \"%1$s\" не корректный: ожидается шестнадцатеричный код цвета (6 символов)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Цвет (ОК)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Объединение столбцов"
 
@@ -2899,7 +2931,7 @@ msgstr "Комбинированный результат"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Команда"
 
@@ -2907,41 +2939,31 @@ msgstr "Команда"
 msgid "Command actions"
 msgstr "Команды действий"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Команда не может быть пустой."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Команды"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Комментарий обновлен"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Комментарии"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Комментарии по \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Коммерческие"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Сравнение значений для нескольких периодов"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Компоновка прав доступа"
 
@@ -2949,29 +2971,39 @@ msgstr "Компоновка прав доступа"
 msgid "Condition"
 msgstr "Условие"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Условия"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Настройка"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3134,23 +3166,23 @@ msgstr "Настройки обновлены"
 msgid "Configure (Filter %s)"
 msgstr "Настройка (Фильтр %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Текст подтверждения"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Подключаться через"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Подключен как '%1$s'"
@@ -3209,7 +3241,7 @@ msgid "Context name"
 msgstr "Имя контекста"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3217,30 +3249,38 @@ msgstr ""
 msgid "Contract number"
 msgstr "Номер контракта"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Координаты"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Копировать"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Копировать выбранное в..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Корректный вход \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Не удалось сохранить изображение!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Количество"
 
@@ -3260,6 +3300,10 @@ msgstr "Создать группу элементов данных"
 msgid "Create application (select host first)"
 msgstr "Создать группу элементов данных (выберите узел сети сначала)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3277,7 +3321,7 @@ msgstr "Создать график (сначала выберите узел с
 msgid "Create graph prototype"
 msgstr "Создать прототип графика"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Создать узел сети"
 
@@ -3290,15 +3334,15 @@ msgstr "Создать группу узлов сети"
 msgid "Create host prototype"
 msgstr "Создать прототип узла сети"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Создать соответствие иконок"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Создать изображение"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Создать элемент данных"
 
@@ -3322,6 +3366,10 @@ msgstr "Создать карту сети"
 msgid "Create media type"
 msgstr "Создать способ оповещения"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Создать прокси"
@@ -3346,11 +3394,11 @@ msgstr "Создать скрипт"
 msgid "Create slide show"
 msgstr "Создать слайд-шоу"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Создать шаблон"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Создать триггер"
 
@@ -3374,96 +3422,97 @@ msgstr "Создать группу пользователей"
 msgid "Create value map"
 msgstr "Создать преобразование значения"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Создано: Группа элементов данных \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Создано: Правило обнаружения \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Создано: Прототип узла сети \"%1$s\" у \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Создано: Элемент данных \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Создано: Прототип элемента данных \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Создано: Триггер \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Создано: Прототип триггера \"%1$s\" в \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
-msgstr "Создано: Веб-сценарий \"%1$s\" в \"%2$s\"."
+msgstr "Создано: Веб-сценарий \"%1$s\" у \"%2$s\"."
 
 #: include/items.inc.php:41
 msgid "Critical"
 msgstr "Критичная"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Текущая дата < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Текущая дата = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Текущая дата > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Текущая дата NOT N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Текущий узел сети"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Текущее время < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Текущее время = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Текущее время > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Текущее время NOT N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Текущее значение"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3476,7 +3525,7 @@ msgstr "Пользовательские графики"
 msgid "Custom label"
 msgstr "Пользовательская подпись"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Пользовательская подпись для карты сети \"%2$s\" у элементов с типом \"%1$s\" не может быть пустой."
@@ -3490,7 +3539,7 @@ msgstr "Пользовательский множитель"
 msgid "Custom screens"
 msgstr "Пользовательские комплексные экраны"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Пользовательский скрипт"
 
@@ -3510,18 +3559,14 @@ msgstr "Пользовательский размер"
 msgid "Custom slides"
 msgstr "Пользовательские слайды"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Czech (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "НАСТРОЙКА ПАНЕЛИ"
@@ -3537,28 +3582,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "ДЕТАЛИ СЦЕНАРИЯ"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "ОТКЛЮЧЕНО"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "ОБНАРУЖЕНО"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3566,25 +3611,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS имя"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "НЕДОСТУПНО"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Темно-оранжевая"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Темнее"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "ПАНЕЛЬ"
 
@@ -3596,20 +3641,21 @@ msgstr "Настройка ПАНЕЛИ"
 msgid "Dashboard filter"
 msgstr "Фильтр ПАНЕЛИ"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Пунктирная линия"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Данные"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3632,11 +3678,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Тип данных"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Файл базы данных"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Хост базы данных"
 
@@ -3644,35 +3691,39 @@ msgstr "Хост базы данных"
 msgid "Database monitor"
 msgstr "Монитор баз данных"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Имя базы данных"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Пароль от базы данных"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Порт базы данных"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Схема базы данных"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Сервер базы данных"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Тип базы данных"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Имя пользователя от базы данных"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Дата"
 
@@ -3692,53 +3743,52 @@ msgstr "Дата окончания обслуживания HW"
 msgid "Date HW purchased"
 msgstr "Дата покупки HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "День"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "День месяца"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "День месяца < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "День месяца = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "День месяца > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "День месяца NOT N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "День недели"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "День недели < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "День недели = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "День недели > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "День недели NOT N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Дни"
 
@@ -3746,22 +3796,22 @@ msgstr "Дни"
 msgid "Debug"
 msgstr "Отладка"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Режим отладки"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Режим отладки обновлен"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Дек"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Декабрь"
 
@@ -3771,15 +3821,14 @@ msgstr "Десятичный"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -3792,11 +3841,11 @@ msgid "Default delay (in seconds)"
 msgstr "Задержка по умолчанию (в сек)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Сообщение по умолчанию"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Длительность шага операции по умолчанию"
 
@@ -3819,30 +3868,34 @@ msgstr "Тема по умолчанию \"%1$s\"."
 msgid "Delay"
 msgstr "Задержка"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Задержка (в сек)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Задерживается на"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Удалить"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Удалить и очистить"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Удалить и очистить выбранные шаблоны? (Внимание: все присоединенные к ним узлы сети будут очищены!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Удалить и очистить шаблон? (Внимание: все присоединенные к нему узлы сети будут очищены!)"
 
@@ -3850,53 +3903,53 @@ msgstr "Удалить и очистить шаблон? (Внимание: вс
 msgid "Delete application?"
 msgstr "Удалить группу элементов данных?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Удалить текущее действие?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Удалить правило обнаружения?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Удалить выражение?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Удалить график?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Удалить историю у выбранных веб-сценариев?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Удалить историю выбранных элементов данных?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Удалить соответствие иконок?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Удалить элемент данных?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Удалить ключевое слово?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Удалить связи между выбранными элементами?"
 
@@ -3904,11 +3957,15 @@ msgstr "Удалить связи между выбранными элемент
 msgid "Delete maintenance period?"
 msgstr "Удалить период обслуживания?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Удалить карту сети?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Удалить прокси?"
 
@@ -3916,7 +3973,7 @@ msgstr "Удалить прокси?"
 msgid "Delete regular expression?"
 msgstr "Удалить регулярное выражение?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Удалить сценарий?"
 
@@ -3924,71 +3981,67 @@ msgstr "Удалить сценарий?"
 msgid "Delete screen?"
 msgstr "Удалить комплексный экран?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Удалить скрипт?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Удалить выбранное"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Удалить выбранные веб-сценарии?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Удалить выбранные действия?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Удалить выбранные группы элементов данных?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Удалить выбранные правила обнаружения?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Удалить выбранные элементы?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Удалить выбранные графики?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Удалить выбранную группу?"
@@ -3997,27 +4050,27 @@ msgstr "Удалить выбранную группу?"
 msgid "Delete selected groups?"
 msgstr "Удалить выбранные группы?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Удалить выбранные группы узлов сети?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr "Удалить выбранный прототип узла сети?"
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr "Удалить выбранные прототипы узлов сети?"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Удалить выбранный узел сети?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Удалить выбранные узлы сети?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Удалить выбранное изображение?"
 
@@ -4025,31 +4078,31 @@ msgstr "Удалить выбранное изображение?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Удалить выбранные элементы данных?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Удалить выбранные периоды обслуживания?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Удалить выбранные карты сети?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Удалить выбранный способ оповещения?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Удалить выбранные способы оповещений?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Удалить выбранные прокси?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Удалить выбранные регулярные выражения?"
 
@@ -4057,15 +4110,15 @@ msgstr "Удалить выбранные регулярные выражени�
 msgid "Delete selected screens?"
 msgstr "Удалить выбранные комплексные экраны?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Удалить выбранные скрипты?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Удалить выбранные слайд-шоу?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Удалить выбранные шаблоны?"
 
@@ -4077,11 +4130,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Удалить выбранные триггеры?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Удалить выбранного пользователя?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Удалить выбранных пользователей?"
 
@@ -4097,11 +4150,15 @@ msgstr[0] "Удалить выбранное преобразование зна
 msgstr[1] "Удалить выбранное преобразование значений? Оно используется для %d элементов данных!"
 msgstr[2] "Удалить выбранное преобразование значений? Оно используется для %d элементов данных!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Удалить выбранное с присоединенными элементами"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4110,15 +4167,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Удалить слайд-шоу?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Удалить шаблон?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Удалить триггер?"
 
@@ -4126,62 +4183,62 @@ msgstr "Удалить триггер?"
 msgid "Deleted"
 msgstr "Удален"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: Группа элементов данных \"%1$s\" из \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: Правило обнаружения \"%1$s\" из \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: График \"%1$s\" из \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Удалено: Узел сети \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: Прототип узла сети \"%1$s\" из \"%2$s\"."
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: Элемент данных \"%1$s\" из \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: Прототип элемента данных \"%1$s\" из \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Удалено: Прокси \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Удалено: Шаблон \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: Триггер \"%1$s\" из \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: Прототип триггера \"%1$s\" из \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Удалено: Веб-сценарий \"%1$s\" из \"%2$s\"."
@@ -4190,35 +4247,35 @@ msgstr "Удалено: Веб-сценарий \"%1$s\" из \"%2$s\"."
 msgid "Delimiter"
 msgstr "Разделитель"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Дельта (простое изменение)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Дельта (скорость в секунду)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Запрещено"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Зависимости"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Зависимость"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Зависит от"
 
@@ -4226,30 +4283,41 @@ msgstr "Зависит от"
 msgid "Deployment status"
 msgstr "Состояние развертывания"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Описание"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Детали"
 
@@ -4262,71 +4330,71 @@ msgid "Device"
 msgstr "Устройство"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Критерий уникальности устройства"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Разница между МАКС и МИН значениями за период T < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Разница между МАКС и МИН значениями за период T = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Разница между МАКС и МИН значениями за период T > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Разница между МАКС и МИН значениями за период T NOT N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Разница между последним и предыдущим значениями, тогда N = 1, 0 - в противном случае"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Разница между последним и предыдущим значениями, тогда N NOT 1, 0 - в противном случае"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Разница между последним и предыдущим значениями < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Разница между последним и предыдущим значениями = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Разница между последним и предыдущим значениями > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Разница между последним и предыдущим значениями NOT N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4350,48 +4418,44 @@ msgstr "Отключить режим отладки у выбранных гр�
 msgid "Disable host"
 msgstr "Деактивировать узел сети"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Деактивировать узел сети?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Деактивировать узлы сети в выбранных группах узлов сети?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Деактивировать узлы сети наблюдаемые выбранными прокси?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Деактивировать выбранное"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Деактивировать выбранные веб-сценарии?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Деактивировать выбранные действия?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Деактивировать выбранные группы элементов данных?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Деактивировать выбранные правила обнаружения?"
 
@@ -4399,11 +4463,11 @@ msgstr "Деактивировать выбранные правила обна�
 msgid "Disable selected groups?"
 msgstr "Деактивировать выбранные группы?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr "Деактивировать выбранные прототипы узлов сети?"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Деактивировать выбранные узлы сети?"
 
@@ -4411,42 +4475,47 @@ msgstr "Деактивировать выбранные узлы сети?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Деактивировать выбранные элементы данных?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Деактивировать выбранные способы оповещения?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Деактивировать выбранные триггеры?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Деактивировано"
 
@@ -4459,7 +4528,7 @@ msgstr "Чрезвычайная"
 msgid "Discovered"
 msgstr "Обнаружен"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Обнаружено"
 
@@ -4467,17 +4536,17 @@ msgstr "Обнаружено"
 msgid "Discovered device"
 msgstr "Обнаруженное устройство"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Обнаружение"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Обнаружение через прокси"
 
@@ -4485,17 +4554,17 @@ msgstr "Обнаружение через прокси"
 msgid "Discovery check"
 msgstr "Проверка обнаружения"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "Ошибка проверки обнаружения"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Проверки обнаружения"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Список обнаружений"
 
@@ -4504,69 +4573,72 @@ msgid "Discovery object"
 msgstr "Объект обнаружения"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Правило обнаружения"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Правило обнаружения \"%1$s\" уже существует у \"%2$s\", наследуется из другого шаблона."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "У правила обнаружения \"%1$s:%2$s\" некорректный период хранения потерянных ресурсов: \"%3$s\". (мин: %4$d, макс: %5$d, допускается пользовательский макрос)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Правило обнаружения \"%s\" уже существует."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "У правила обнаружения \"%1$s:%2$s\" некорректный период хранения потерянных ресурсов: \"%3$s\". (мин: %4$d, макс: %5$d, допускается пользовательский макрос)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Правило обнаружения создано"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Правило обнаружения удалено"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Правило обнаружения обновлено"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Правила обнаружения"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Правила обнаружения удалены"
 
@@ -4578,7 +4650,7 @@ msgstr "Состояние обнаружения"
 msgid "Display OK triggers for"
 msgstr "Отображать триггеры ОК в течении"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Отображено"
 
@@ -4587,32 +4659,32 @@ msgstr "Отображено"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Отображено %1$s из %2$s найденых"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Распределение значений для нескольких элементов"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Распределение значений для нескольких периодов"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Без вычисления"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Вы хотите заменить условие выражения?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Готово"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Точечная линия"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Недоступно"
@@ -4622,30 +4694,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недоступен"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Недоступен"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Перетащите сюда для изменения типа интерфейса на \"IPMI\" тип."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Перетащите сюда для изменения типа интерфейса на \"JMX\" тип."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Перетащите сюда для изменения типа интерфейса на \"SNMP\" тип."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Перетащите сюда для изменения типа интерфейса на \"агент\" тип."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Стиль отрисовки"
 
@@ -4663,74 +4735,75 @@ msgstr "Первая запись в выпадающем меню \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Запоминать выбранное в выпадающем списке \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Дублирующиеся зависимости в триггере \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Дубликат имени прототипа группы \"%2$s\" у прототипа узла сети \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Дубликат ID группы узлов сети \"%2$s\" у прототипа узла сети \"%1$s\"."
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Дубликат узла сети. Узел сети с таким же именем \"%s\" уже существует в данных."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Дубликат узла сети. Узел сети с таким же видимым именем \"%s\" уже существует в данных."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Дублированное имя карты сети для карты сети \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr "Дублированное имя скрипта \"%1$s\"."
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Дублированное имя важности \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Дубликат псевдонима пользователя \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Длительность"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Длительность (сек)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Dutch (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Динамический элемент"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "Э"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ОШИБКА"
 
@@ -4738,13 +4811,13 @@ msgstr "ОШИБКА"
 msgid "EVENTS"
 msgstr "СОБЫТИЯ"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "У каждого URL должно быть уникальное имя. Пожалуйста, удостоверьтесь, что есть только один URL с этим именем."
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4752,9 +4825,9 @@ msgstr "У каждого URL должно быть уникальное имя.
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Изменить"
 
@@ -4762,7 +4835,7 @@ msgstr "Изменить"
 msgid "Edit map element"
 msgstr "Изменение элемента карты сети"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Изменить триггер"
 
@@ -4770,27 +4843,61 @@ msgstr "Изменить триггер"
 msgid "Element"
 msgstr "Элемент"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Название элемента"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Пусто"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Условие действия пустое."
 
@@ -4798,76 +4905,98 @@ msgstr "Условие действия пустое."
 msgid "Empty color."
 msgstr "Пустой цвет."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr "Пустой ID узла сети у прототипа узла сети."
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "Пустое имя узла сети."
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Пустой входной параметр."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "Пустые входные параметры."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Ничего не введено."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Пустой макрос."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr "Пустое имя у прототипа группы."
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr "Пустое имя у прототипа узла сети \"%1$s\"."
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "Пустое имя для скрипта \"%1$s\"."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "Пустое имя для скрипта."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Пустое имя."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Пустые параметры"
 
@@ -4876,11 +5005,11 @@ msgstr "Пустые параметры"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Получен пустой ответ от Zabbix сервера \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4888,11 +5017,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Пустой период времени."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Активировать"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Включить подтверждение"
 
@@ -4912,11 +5045,11 @@ msgstr "Активировать подтверждения событий"
 msgid "Enable host"
 msgstr "Активировать узел сети"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Активировать узел сети?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Активировать узлы сети наблюдаемые выбранными прокси?"
 
@@ -4929,36 +5062,32 @@ msgstr "Активировать узлы сети наблюдаемые выб
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Активировать выбранное"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Активировать выбранные веб-сценарии?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Активировать выбранные действия?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Активировать выбранные группы элементов данных?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Активировать выбранные правила обнаружения?"
 
@@ -4966,11 +5095,11 @@ msgstr "Активировать выбранные правила обнару�
 msgid "Enable selected groups?"
 msgstr "Активировать выбранные группы?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr "Активировать выбранные прототипы узлов сети?"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Активировать выбранные узлы сети?"
 
@@ -4978,64 +5107,68 @@ msgstr "Активировать выбранные узлы сети?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Активировать выбранные элементы данных?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Активировать выбранные способы оповещения?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Активировать выбранные триггеры?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Активировано"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "English (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Английский (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Ошибка"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Ошибка в запросе поиска в таблице \"%1$s\"."
@@ -5053,15 +5186,15 @@ msgstr "Событие"
 msgid "Event ID"
 msgstr "ID события"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "Event ID последней записи в журнале соответствует регулярному выражению T, тогда N = 1, 0 - в противном случае"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "Event ID последней записи в журнале соответствует регулярному выражению T, тогда N NOT 1, 0 - в противном случае"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Событие подтверждено"
 
@@ -5070,7 +5203,7 @@ msgstr "Событие подтверждено"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Подтверждение событий \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Подтверждение событий отключено"
 
@@ -5078,7 +5211,7 @@ msgstr "Подтверждение событий отключено"
 msgid "Event details"
 msgstr "Детали события"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Генерация события"
 
@@ -5098,9 +5231,10 @@ msgstr "Детали источника события"
 msgid "Event type"
 msgstr "Тип события"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "События"
 
@@ -5108,36 +5242,41 @@ msgstr "События"
 msgid "Events and alerts"
 msgstr "События и оповещения"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Каждый день(и)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Каждую неделю(и)"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Экза"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Исключено"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Выполнить"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Ошибка выполнения SQL [%1$s] в [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Выполнять на"
 
@@ -5145,13 +5284,13 @@ msgstr "Выполнять на"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Выполняемый скрипт"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Подтверждение выполнения"
 
@@ -5163,7 +5302,7 @@ msgstr "Раскрытие макросов"
 msgid "Expand single problem"
 msgstr "Развертывание одиночной проблемы"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Ожидался JSON-rpc версии 2.0, а получена \"%s\"."
@@ -5173,12 +5312,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Завершено"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Расширенный круговой"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Экспортировать выбранное"
 
@@ -5186,22 +5325,22 @@ msgstr "Экспортировать выбранное"
 msgid "Export to CSV"
 msgstr "Экспорт в CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Выражение"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Ошибка в синтаксисе выражения."
 
@@ -5209,11 +5348,12 @@ msgstr "Ошибка в синтаксисе выражения."
 msgid "Expression Variable Elements"
 msgstr "Переменные элементов выражения"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Выражение не может быть пустым"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Конструктор выражения"
 
@@ -5234,17 +5374,17 @@ msgid "External check"
 msgstr "Внешняя проверка"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "ЛОЖЬ"
 
@@ -5253,16 +5393,17 @@ msgstr "ЛОЖЬ"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Ошибка"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Неудачно"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5270,40 +5411,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Аудит отказа"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Избранные графики"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Избранные карты сетей"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Избранные комплексные экраны"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Избранные"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Фев"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Февраль"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Поле"
 
@@ -5347,19 +5488,19 @@ msgstr "Поле \"%1$s\" не строка."
 msgid "Field \"%1$s\" must be missing."
 msgstr "Поле \"%1$s\" должно быть пропущено."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Поле \"druleid\" является обязательным."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Поле \"name\" является обязательным."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Формат файла не поддерживается."
 
@@ -5368,13 +5509,13 @@ msgstr "Формат файла не поддерживается."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Файл слишком большой, максимальный размер загружаемого файла %1$s байт."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Файл указанный как представление не существует. Была попытка найти \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5382,68 +5523,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Заполнение"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Фильтр"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Фильтр по группе узлов сети"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Фильтр по имени"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Искать строку V в последнем (самом новом) значении. N = 1 - если найдено, 0 - в противном случае"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Искать строку V в последнем (самом новом) значении. N NOT 1 - если найдено, 0 - в противном случае"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Финиш"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Финский (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Первый"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Первая"
@@ -5452,8 +5596,8 @@ msgstr "Первая"
 msgid "Fit to map"
 msgstr "Вписать в карту сети"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Фиксированное"
 
@@ -5463,76 +5607,80 @@ msgstr "Фиксированное"
 msgid "Flexible intervals"
 msgstr "Переменные интервалы"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Пароль для Гостя должен быть пустым"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Формула"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Четвертый"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "French (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Пт"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Пятница"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "От"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Доступ к веб-интерфейсу"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Доступ к веб-интерфейсу обновлен"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Сообщения в веб-интерфейсе"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Полное клонирование"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Во весь экран"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Функция"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "Г"
@@ -5542,50 +5690,50 @@ msgstr "Г"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM модем"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "Веб-интерфейс"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Доступ к GUI отключен."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Общие"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Сгенерировано за %s сек."
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "German (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5593,65 +5741,65 @@ msgid "Get support"
 msgstr "Поддержка"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Гига"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Заданное выражение не является макросом"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Глобальное выражение не существует."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Глобальный скрипт"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Глобальные скрипты"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Выполнить"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Перейти к"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "Перейти на ПАНЕЛЬ"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5660,66 +5808,73 @@ msgid "Gradient line"
 msgstr "Градиентная линия"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "График"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "График \"%1$s\" уже существует в \"%2$s\" (унаследован из другого шаблона)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "График \"%1$s\" уже существует в \"%2$s\" (элементы данных не идентичны)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "График \"%1$s\" уже существует в \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "График \"%1$s\" не может быть унаследован. Не хватает обязательных элементов данных у \"%2$s\" (элемента данных для макс значения оси Y)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "График \"%1$s\" не может быть унаследован. Не хватает обязательных элементов данных у \"%2$s\" (элемента данных для мин значения оси Y)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "График \"%1$s\" не может быть унаследован. Не хватает обязательных элементов данных у \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "График \"%1$s\" не существует у шаблона \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "График \"%1$s\" пропущен - правило пользователя."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "График \"%1$s\" с элементами данных из шаблона не может содержать элементы данных из других узлов сети."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "График добавлен"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "График удален"
 
@@ -5731,54 +5886,59 @@ msgstr "Элемент графика"
 msgid "Graph item"
 msgstr "Элемент графика"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Имя графика"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "Прототип графиков"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Прототип графика \"%1$s\" с элементами данных из шаблона не может содержать элементы данных из других узлов сети."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Прототип графика \"%s\" удален."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Прототипы графиков"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5790,49 +5950,51 @@ msgstr "Прототипы графиков для"
 msgid "Graph sum"
 msgstr "Суммарный график"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Тип графика"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "График обновлен"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "График с именем \"%1$s\" уже существует в графиках или в прототипах графиков."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "График с таким же именем, но другого типа, уже существует."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Графики"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Графики скопированы"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "График удален"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Greek (el_GR)"
 
@@ -5841,54 +6003,59 @@ msgstr "Greek (el_GR)"
 msgid "Grid"
 msgstr "Сетка"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Группа"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Группа \"%1$s\" не может быть удалена, так как используется прототипом узла сети."
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Группа \"%1$s\" не существует."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Группа \"%1$s\" для узла сети \"%2$s\" не существует."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Группа добавлена"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Группа удалена"
+msgid_plural "Groups deleted"
+msgstr[0] "Группа удалена"
+msgstr[1] "Группа удалена"
+msgstr[2] "Группа удалена"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5899,40 +6066,42 @@ msgstr "Группа для обнаруженных узлов сети"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr "Группа для обнаруженных узлов сети \"%1$s\"."
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Имя группы"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr "ID прототипа группы не может быть пустым."
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr "Прототип группы не может основываться на обнаруженной группе узлов сети \"%1$s\"."
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr "Прототипы групп"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Прототипы групп"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Сгруппировать по"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Группы"
 
@@ -5940,22 +6109,13 @@ msgstr "Группы"
 msgid "Groups in maintenance"
 msgstr "Группы в обслуживании"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5972,7 +6132,7 @@ msgstr "СОБЫТИЯ В ГРУППАХ УЗЛОВ СЕТИ"
 msgid "HOST INVENTORY"
 msgstr "ИНВЕНТАРНЫЕ ДАННЫЕ УЗЛА СЕТИ"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "ОБЗОР ИНВЕНТАРНЫХ ДАННЫХ УЗЛА СЕТИ"
 
@@ -5990,7 +6150,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP аутентификация"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
@@ -6011,12 +6172,17 @@ msgstr "Аппаратные средства"
 msgid "Hardware (Full details)"
 msgstr "Аппаратные средства (полная детализация)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Высота"
@@ -6029,15 +6195,15 @@ msgstr "Помощь"
 msgid "Hexadecimal"
 msgstr "Шестнадцатеричный"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Скрыта"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Скрыть"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Скрыть все"
 
@@ -6053,15 +6219,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Скрывать деактивированные триггеры"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Скрыть выбранное"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "Скрыть выбранные группы"
 
@@ -6070,23 +6236,23 @@ msgstr "Скрыть выбранные группы"
 msgid "High"
 msgstr "Высокая"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "История"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "История очищена"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Очистка истории может занять продолжительное время. Продолжить?"
 
@@ -6107,80 +6273,80 @@ msgstr "История событий"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Горизонтальный"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Выравнивание по горизонтали"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Узел сети"
 msgstr[1] "Узел сети"
 msgstr[2] "Узел сети"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Узел сети \"%1$s\" уже существует."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Узел сети \"%1$s\" наблюдается через прокси \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "У узла сети \"%s\" выбран параметр \"useipmi\", но не указан параметр \"ipmi_ip\"! Будет использован IP адрес узла сети, как адрес для IPMI интерфейса."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Узел сети (в порядке возрастания)"
 
@@ -6192,31 +6358,31 @@ msgstr "IP адрес узла сети"
 msgid "Host access"
 msgstr "Доступ к узлу сети"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Узел сети добавлен"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "У узла сети не может быть более одного интерфейса по умолчанию с одинаковым типом."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Количество узлов сети"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Узел сети удален"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
@@ -6224,36 +6390,38 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Группа узлов сети"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Группа узлов сети \"%1$s\" уже существует."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как используется в глобальном скрипте."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как некоторые узлы сети принадлежат этой группе."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "Группа узлов сети \"%1$s\" является внутренней и не может быть удалена."
@@ -6270,14 +6438,15 @@ msgstr "События в группах узлов сети"
 msgid "Host group label type"
 msgstr "Тип подписи к группе узлов сети"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "Имя группы узлов сети не может быть пустым."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Группы узлов сети"
 
@@ -6287,8 +6456,8 @@ msgstr "Группы узлов сети"
 msgid "Host interface"
 msgstr "Интерфейс узла сети"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Инвентарные данные узла сети"
 
@@ -6304,7 +6473,7 @@ msgstr "События у узла сети"
 msgid "Host label type"
 msgstr "Тип подписи к узлу сети"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Список узлов сети"
 
@@ -6313,18 +6482,18 @@ msgid "Host metadata"
 msgstr "Метаданные узлов сети"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Имя узла сети"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "Имя узла сети \"%1$s\" слишком длинное, оно не должно быть длиннее чем %2$d символов."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr "Имя узла сети для прототипа узла сети \"%1$s\" должно содержать макросы."
@@ -6333,74 +6502,74 @@ msgstr "Имя узла сети для прототипа узла сети \"%
 msgid "Host networks"
 msgstr "Сети узла сети"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Прототип узла сети \"%1$s\" уже существует у \"%2$s\", унаследованный из другого шаблона."
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "Прототип узла сети \"%1$s\" уже существует у \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr "Прототип узла сети \"%1$s\" должен иметь по крайней мере одну группу узлов сети."
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr "Прототип узла сети добавлен"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr "Прототип узла сети удален"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr "Прототип узла сети обновлен"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Прототип узла сети с именем узла сети \"%1$s\" уже существует в правиле обнаружения \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr "Прототип узла сети с именем узла сети \"%1$s\" уже существует."
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Прототип узла сети с видимым именем \"%1$s\" уже существует в правиле обнаружения \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr "Прототип узла сети с видимым именем \"%1$s\" уже существует."
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr "Прототипы узлов сети"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr "Прототипы узлов сети удалены"
 
@@ -6412,7 +6581,7 @@ msgstr "Прототипы узлов сети"
 msgid "Host router"
 msgstr "Роутер узла сети"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Комплексные экраны узла сети"
 
@@ -6424,51 +6593,52 @@ msgstr "Состояние узлов сети"
 msgid "Host subnet mask"
 msgstr "Маска подсети узла сети"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Время на узле сети"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Ошибка при обновлении узла сети."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Узел сети обновлен"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Узел сети с таким же именем \"%s\" уже существует."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Узел сети с таким же видимым именем \"%s\" уже существует."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Узлы сети"
 
@@ -6476,11 +6646,11 @@ msgstr "Узлы сети"
 msgid "Hosts & Groups"
 msgstr "Узлы сети & Группы узлов сети"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Узлы сети (пн/бн/ш)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Узлы сети / шаблоны"
 
@@ -6492,37 +6662,38 @@ msgstr "Узлы сети в"
 msgid "Hosts in maintenance"
 msgstr "Узлы сети в обслуживании"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Информация об узлах сети"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Расположение узлов сети"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Узлы сети обновлены"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Ежечасно"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Часы"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Hungary (hu_HU)"
 
@@ -6540,22 +6711,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6563,26 +6734,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP адрес"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP и DNS не могут быть пустыми для интерфейса узла сети."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Диапазон IP адресов"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "Диапазон IP адресов не может быть пустым."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6590,22 +6761,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI агент"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "Алгоритм авторизации IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Интерфейсы IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "Пароль IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Уровень привилегии IPMI"
 
@@ -6615,7 +6786,7 @@ msgstr "Уровень привилегии IPMI"
 msgid "IPMI sensor"
 msgstr "Сенсор IPMI"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "Имя пользователя IPMI"
 
@@ -6648,7 +6819,7 @@ msgstr "Зависимости услуги IT"
 msgid "IT service parent"
 msgstr "Родительская услуга IT"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6664,25 +6835,25 @@ msgid "ITEMS"
 msgstr "ЭЛЕМЕНТЫ ДАННЫХ"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Иконка"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Иконка (по умолчанию)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Иконка (отключен)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Иконка (обслуживание)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Иконка (проблема)"
 
@@ -6703,42 +6874,44 @@ msgstr "Тип подписи к иконке"
 msgid "Icon map"
 msgstr "Соответствие иконок"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Соответствие иконок \"%1$s\" не может быть удалено. Используется в карте сети \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Соответствие иконок \"%1$s\" ссылается на некорректный iconid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Соответствие иконок \"%1$s\" ссылается на некорректную связь \"%2$s\" с инвентарными данными."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Соответствие иконок \"%s\" уже существует."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Соответствие иконок \"%s\" не может ссылаться на пустое выражение."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Соответствие иконок \"%s\" не может ссылаться на глобальное выражение которого не существует."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Соответствие иконок \"%s\" имеет некорректное выражение."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "У соответствия иконок \"%s\" должно быть по крайней мере одно соответствие."
@@ -6751,7 +6924,8 @@ msgstr "Соответствие иконок создано"
 msgid "Icon map deleted"
 msgstr "Соответствие иконок удалено"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Имя соответствия иконок не может быть пустым."
 
@@ -6759,29 +6933,29 @@ msgstr "Имя соответствия иконок не может быть п
 msgid "Icon map updated"
 msgstr "Соответствие иконок обновлено"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Соответствия иконок с iconmapid \"%s\" не существует."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Сответствия иконок"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "В соответствии иконок запись \"%1$s\" для \"%2$s\" уже существует."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Соответствие иконок не активировано"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Иконки"
 
@@ -6789,21 +6963,23 @@ msgstr "Иконки"
 msgid "Identical expression already exists"
 msgstr "Идентичное выражение уже существует"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Если вы считаете это сообщение ошибкой, пожалуйста, свяжитесь с вашими администраторами для получения прав доступа."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Изображение"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Изображение \"%1$s\" уже существует."
@@ -6812,7 +6988,7 @@ msgstr "Изображение \"%1$s\" уже существует."
 msgid "Image added"
 msgstr "Изображение добавлено"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Изображение удалено"
 
@@ -6820,12 +6996,13 @@ msgstr "Изображение удалено"
 msgid "Image label type"
 msgstr "Тип подписи к изображению"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Ошибка при загрузке изображения [%1$s] в [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "Размер изображения должен быть меньше 1МБ."
 
@@ -6834,66 +7011,66 @@ msgid "Image updated"
 msgstr "Изображение обновлено"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Изображения"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Изображения для всех карт сетей будут обновлены!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Незамедлительно"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Импорт"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Ошибка при импортировании"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Импортировать файл"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Импортировано успешно"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Невозможно отфильтровать по несуществующему полю инвентарных данных \"%s\"."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Невозможно удалить последнюю строку и колонку."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "В"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "В группе"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "В группах"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6906,244 +7083,282 @@ msgstr "В обслуживании"
 msgid "In progress"
 msgstr "В работе"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Включено"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Некорректное значение поля \"нежесткая\" для зависимости у услуги \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Некорректное значение %1$s типа подписи для карты сети \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Некорректный диапазон IP адресов \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Некорректный SNMP OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Некорректное SNMP community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Некорректное допустимое SLA для услуги \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Некорректная проверка обнаружения в условии действия."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Некорректная проверка обнаружения в условии действия. Проверка обнаружения не существует или у вас нет прав доступа к ней."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "Некорректный объект обнаружения в условии действия"
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Некорректное правило обнаружения в условии действия. Правило обнаружения не существует или у вас нет прав доступа к нему."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Некорректное состояние обнаружения в условии действия."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "Некорректный тип события в условии действия."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Некорректная группа узлов сети в условии действия. Группа узлов сети не существует или у вас нет прав доступа к ней."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Некорректный узел сети в условии действия. Узел сети не существует или у вас нет прав доступа к нему."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "Некорректный ip \"%1$s\" в условии действия."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "Некорректный оператор в условии действия."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "Некорректный порт \"%1$s\" в условии действия."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Некорректный прокси в условии действия. Прокси не существует или у вас нет прав доступа к нему."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Некорректный шаблон в условии действия. Шаблон не существует или у вас нет прав доступа к нему."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "Некорректная важность триггера в условии действия."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "Некорректное значение триггера в условии действия."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Некорректный триггер в условии действия. Триггер не существует или у вас нет прав доступа к нему."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Некорректный тип условия действия."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Некорректный conditionid действия."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "Некорректные условия действия для действия \"%1$s\"."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Некорректный тип команды в операции действия."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Некорректный тип подтверждения для условия в операции действия."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Некорректный тип условия в операции действия."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Некорректные значения шага эскалации для операции действия."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Некорректная группа узлов сети в операции действия. Группа узлов сети не существует или у вас нет прав доступа к этой группе узлов сети."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Некорректный узел сети для операции действия. Узел сети не существует или у вас нет к нему доступа."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Некорректный порт \"%s\" в операции действия."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Некорректная длительность шага операции действия."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Некорректный тип операции действия."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Некорректная группа пользователей для операции действия. Группа пользователей не существует или у вас нет к ней доступа."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Некорректный пользователь для операции действия. Пользователь не существует или у вас нет к нему доступа."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Некорректный operationid действия."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Некорректный алгоритм для услуги \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "В функцию переданы некорректные аргументы"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "В функцию переданы некорректные аргументы."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Для метода предоставлены некорректные аргументы."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Некорректный протокол аутентификации для правила обнаружения \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Некорректный протокол аутентификации для элемента данных \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Некорректное вычисляемое значение SLA для услуги \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "Использованы некорректные символы в узле сети \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Использованы некорректные символы в имени узла сети \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "Использованы некорректные символы в имени прокси \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Некорректная задержка."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "Некорректный ID правила обнаружения для прототипа узла сети \"%1$s\"."
@@ -7153,11 +7368,11 @@ msgstr "Некорректный ID правила обнаружения для
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "Некорректный \"%1$s\" (%2$s) объект события для \"%3$s\" (%4$s) источника события, поддерживаются только следующие объекты: %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "Некорректное значение eventobject."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "Некорректное значение eventsource."
 
@@ -7166,11 +7381,11 @@ msgstr "Некорректное значение eventsource."
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Некорректное имя поля \"%1$s\" или значение в выражении where для таблицы \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "Некорректные поля для карты сети."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Некорректные поля для триггера."
 
@@ -7178,74 +7393,100 @@ msgstr "Некорректные поля для триггера."
 msgid "Incorrect file upload."
 msgstr "Некорректный загружаемый файл."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Некорректный переменный интервал \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Некорректный переменный интервал у элемента данных \"%1$s\". Переменный интервал должен быть строкой."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Использована некорректная функция"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "Некорректный ID прототипа группы."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "Некорректные прототипы групп для прототипа узла сети \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "Некорректный ID группы узлов сети для прототипа группы."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Некорректная группа узлов сети."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "Некорректные группы узлов сети у прототипа узла сети \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "Некорректный ID прототипа узла сети."
 
@@ -7253,182 +7494,201 @@ msgstr "Некорректный ID прототипа узла сети."
 msgid "Incorrect image index."
 msgstr "Некорректный номер изображения."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Для интерфейса указан некорректный параметр DNS \"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Указан некорректный параметр IP адреса \"%s\" для интерфейса."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Для интерфейса указан некорректный порт \"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Некорректное поле \"%s\" инвентарных данных."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Некорректный элемент данных для значения оси."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "В выражении триггера \"%2$s\" указан некорректный ключ элемента данных \"%1$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "Указан некорректный тип элемента данных \"%1$s\" для функции триггера \"%2$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Некорректный ключ."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Некорректный список элементов данных."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Некорректное обслуживание - дата должна быть между 1970.01.01 и 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Некорректная дата обслуживания"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Некорректный день периода обслуживания"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Некорректный день недели обслуживания"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Некорректный месяц периода обслуживания"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Некорректный период обслуживания"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Некорректный период обслуживания (минимум 5 минут)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Некорректная неделя периода обслуживания"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Некорректное значение высоты для карты сети \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Некорректное значение ширины для карты сети \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "Некорректный путь меню для скрипта \"%1$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "Некорректное значение объекта."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "Некорректный параметр для действия \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Некорректный параметр для операций."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Использован некорректный параметр для соответствия иконок \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Некорректные параметры для условии."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Некорректные параметры для метода обновления соответствия иконок \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Некорректные параметры для обслуживания."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Некорректные параметры для группы пользователей."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Некорректный родитель для услуги \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Некорректная родительская услуга."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Некорректный диапазон портов."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "Некорректный приватный протокол для правила обнаружения \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "Некорректный приватный протокол для элемента данных \"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Некорректный proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Указан некорректный тип ресурса для элемента комплексного экрана."
 
@@ -7437,64 +7697,68 @@ msgstr "Указан некорректный тип ресурса для эл�
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Получен некорректный ответ от Zabbix сервера \"%1$s\"."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Для слайд-шоу указан некорректный комплексный экран."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Некорректное время завершения услуги."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Некорректное время начала услуги."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Некорректный тип времени услуги."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Некорректный порядок сортировки для услуги \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "Некорректное значение источника."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr "Некорректное состояние прототипа узла сети \"%1$s\"."
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Некорректное состояние для услуги \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Некорректное состояние."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr "Некорректная тема для пользователя \"%1$s\"."
@@ -7515,52 +7779,57 @@ msgstr "Некорректный период времени \"%1$s\". Врем�
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Некорректный период времени \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Некорректный ID триггера для услуги \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Некорректное выражение триггера"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Некорректное выражение триггера."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Некорректное выражение триггера. Узел сети \"%1$s\" не существует или у вас нет прав доступа к этому узлу сети."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Некорректное выражение триггера. Узел сети \"%s\" не существует или у вас нет прав доступа к этому узлу сети."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Некорректное выражение у триггера. Элементы выражения триггера не должны принадлежать шаблону и узлу сети одновременно."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "В выражении указана некорректная функция триггера \"%1$s\"."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Некорректный тип asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Некорректная группа пользователей."
 
@@ -7569,7 +7838,8 @@ msgstr "Некорректная группа пользователей."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "Некорректное значение \"%1$s\" для \"%2$s\" поля."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Некорректное значение \"%1$s\" для \"%2$s\" поля: должно быть между %3$s и %4$s."
@@ -7589,7 +7859,7 @@ msgstr "Некорректное значение \"%1$s\" для поля це�
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Некорректное значение \"%1$s\" для поля целого положительного числа \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "Некорректное значение поля \"%1$s\"."
@@ -7599,43 +7869,49 @@ msgstr "Некорректное значение поля \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "Некорректное значение для поля \"%1$s\": не может быть пустым."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Некорректное значение для setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Использовано некорректное значение для состояния прокси \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Некорректное рабочее время."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Некорректный y макс элемент данных для графика \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Некорректный y мин элемент данных для графика \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Индонезийский (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Инфо"
 
@@ -7644,15 +7920,15 @@ msgstr "Инфо"
 msgid "Information"
 msgstr "Информация"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Вставить"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Вставить макрос"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Инсталляция"
 
@@ -7660,31 +7936,32 @@ msgstr "Инсталляция"
 msgid "Installer name"
 msgstr "Имя установщика"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Интерфейс связан с элементом данных \"%1$s\" в \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Интерфейс используется элементами данных, которые требуют этот тип интерфейса."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "У интерфейса с DNS именем \"%1$s\" не может быть пустого IP адреса."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "У интерфейса с IP адресом \"%1$s\" не может быть пустого DNS имени, при наличии свойства \"Использовать DNS\" у \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "У интерфейса с IP адресом \"%1$s\" не может быть пустого DNS имени."
@@ -7704,7 +7981,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Внутренний"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Внутренняя ошибка JSON-RPC."
 
@@ -7712,7 +7989,7 @@ msgstr "Внутренняя ошибка JSON-RPC."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Внутренняя ошибка."
 
@@ -7725,19 +8002,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Интервал"
 
@@ -7747,112 +8024,114 @@ msgstr "Интервал"
 msgid "Interval (in sec)"
 msgstr "Интервал (в сек)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Ошибочный JSON. На сервере произошла ошибка при разборе текста JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Ошибочный запрос."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Ошибочная дата \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "Ошибочный первый параметр."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "Ошибочный четвертый параметр."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Ошибочный hostid для макроса \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Ошибочный период обслуживания"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Ошибочные параметры метода."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "Ошибочное количество параметров."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Ошибочные параметры."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr "Некорректный период для поля \"%1$s\"."
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Ошибочный код ответа \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Ошибочный диапазон кода ответа \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "Ошибочный второй параметр."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "Ошибочный третий параметр."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Ошибочный период времени"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Получено ошибочное имя представления \"%s\". Разрешенные символы : \"a-z\" и \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Инвентаризация"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7861,7 +8140,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Поле инвентарных данных"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Режим инвентарных данных"
 
@@ -7869,12 +8148,12 @@ msgstr "Режим инвентарных данных"
 msgid "Is online?"
 msgstr "В системе?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Проблема"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Невозможно отфильтровать по паролям пользователей."
 
@@ -7882,70 +8161,71 @@ msgstr "Невозможно отфильтровать по паролям по
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Невозможно выполнить выход с HTTP аутентификацией."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Невозможно выполнить поиск по паролям пользователей."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italian (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Элемент данных"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Элемент данных \"%1$s\" уже существует у \"%2$s\", унаследован из другого шаблона."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "Элемент данных \"%1$s\" уже существует у \"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Элемент данных \"%1$s\" не может заполнять отсутствующее поле под номером \"%2$d\" инвентарных данных узла сети. Выберите из: от 0 (не заполнять) до %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Элемент данных \"%1$s\" не существует у шаблона \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Элемент данных \"%1$s\" не существует."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Элемент данных \"%1$s\" в \"%2$s\": группа элементов данных \"%3$s\" не существует."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Элемент данных \"%1$s\" пропущен - правило пользователя."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "У элемента данных \"%1$s:%2$s\" ошибочный порт \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Элемент добавлен"
 
@@ -7953,18 +8233,18 @@ msgstr "Элемент добавлен"
 msgid "Item count"
 msgstr "Количество элементов данных"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Элемент данных удален"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7979,58 +8259,58 @@ msgstr "Элемент данных в \"нормальном\" состояни
 msgid "Item in \"not supported\" state"
 msgstr "Элемент данных в \"неподдерживаемом\" состоянии"
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Прототип элемента данных"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Прототип элемента данных \"%1$s\" уже существует у \"%2$s\", унаследован из другого шаблона."
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Прототипы элементов данных"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -8038,92 +8318,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Прототипы элементов данных для"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Элемент обновлен"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Элемент данных использует интерфейс не от родительского узла сети."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Элемент данных использует некорректный тип интерфейса."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Элемент данных не обновлен. Пожалуйста, введите корректный интервал обновления."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как правило обнаружения."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как элемент данных созданный из прототипа элемента данных."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как прототип элемента данных."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как элемент данных."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как неизвестный элемент данных."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Элемент данных с ключом \"%1$s\" уже существует у \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Элемент данных с ключем \"%1$s\" уже существует."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Элементы данных"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Элементы данных (а/д/нп)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Элементы данных скопированы"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Элементы данных удалены"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Список элементов данных"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Элементы данных обновлены"
 
@@ -8135,72 +8415,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX агент"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "Интерфейсы JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Не удалось сгенерировать JSON-rpc ошибку. Нет такой ошибки \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "Метож JSON-rpc не задан."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "Параметры JSON-rpc не являются массивом."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "Версия JSON-rpc не указана."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Идентификатор Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Янв"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Январь"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japanese (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Июл"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Июль"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Июн"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Июнь"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "К"
@@ -8209,40 +8489,40 @@ msgstr "К"
 msgid "Keep lost resources period (in days)"
 msgstr "Период сохранения потерянных ресурсов (дней)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Ключ"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Ключ \"%1$s\" не совпадает с <grpmax|grpmin|grpsum|grpavg>[\"Группы узлов сети\", \"Ключ элемента данных\", \"<last|min|max|avg|sum|count>\", \"параметр\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Фраза-пароль ключа"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Ключевое слово"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Кило"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Korean (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "ПОСЛЕДНИЕ ДАННЫЕ"
 
@@ -8274,37 +8554,37 @@ msgid "LDAP login was not successful"
 msgstr "Неуспешный вход через LDAP"
 
 # имеется ввиду время - проверено
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "ЛОКАЛЬНОЕ"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "ПОТЕРЯН"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Подпись"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Расположение подписи"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Язык"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Последний"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Последняя"
@@ -8317,19 +8597,19 @@ msgstr[0] "Последнее %1$d событие"
 msgstr[1] "Последние %1$d события"
 msgstr[2] "Последние %1$d событий"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Последнее (самое новое) T значение < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Последнее (самое новое) T значение = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Последнее (самое новое) T значение > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Последнее (самое новое) T значение NOT N"
 
@@ -8349,28 +8629,28 @@ msgstr "Последние 365 дней"
 msgid "Last 7 days"
 msgstr "Последние 7 дней"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Последнее изменение"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Последнее изменение (в порядке убывания)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Последняя проверка"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "График за последний час"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "График за последний месяц"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "За последние"
 
@@ -8378,66 +8658,67 @@ msgstr "За последние"
 msgid "Last seen (age)"
 msgstr "Последний раз был доступен (возраст)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Последнее значение"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "График за последнюю неделю"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Последние данные"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Последние события"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr "Последние значения"
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Latvian (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "По левой стороне"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Легенда"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Длина в символах последнего (самого нового) T значения < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Длина в символах последнего (самого нового) T значения = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Длина в символах последнего (самого нового) T значения > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Длина в символах последнего (самого нового) T значения NOT N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Линия"
 
@@ -8445,39 +8726,29 @@ msgstr "Линия"
 msgid "Link"
 msgstr "Связь"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Индикаторы связи"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Имя ссылки должно быть уникальным для карты сети \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr "Соединить с новыми шаблонами"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Поле связи selementid1 указывает на не существующий selement ID \"%1$s\" для карты сети \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Поле связи selementid2 указывает на не существующий selement ID \"%1$s\" для карты сети \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "У связи должны быть заполнены оба поля \"имя\" и \"url\" для карты сети \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Присоединить шаблоны"
 
@@ -8489,50 +8760,50 @@ msgstr "Присоединить к шаблону"
 msgid "Link to templates"
 msgstr "Присоединить к шаблонам"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Соединения с шаблонами"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Присоединенные шаблоны"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Присоединен к"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Индикаторы связей между выбранными элементами"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Индикаторы связей для выбранного элемента"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Список пустой"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "Литовский (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Местное время"
 
@@ -8549,36 +8820,36 @@ msgid "Location longitude"
 msgstr "Размещение (долгота)"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Журнал (лог)"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "Важность последней записи в журнале < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "Важность последней записи в журнале = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "Важность последней записи в журнале > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "Важность последней записи в журнале NOT N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "Источник события последней записи в журнале соответствует параметру T, тогда N = 1, 0 - в противном случае"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "Источник события последней записи в журнале соответствует параметру T, тогда N NOT 1, 0 - в противном случае"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Формат времени в журнале (логе)"
@@ -8587,12 +8858,12 @@ msgstr "Формат времени в журнале (логе)"
 msgid "Log unmatched SNMP traps"
 msgstr "Записывать не совпадающие SNMP трапы"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Вход выполнен под"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8603,12 +8874,12 @@ msgstr "Вход в систему"
 msgid "Login as Guest"
 msgstr "Войти как Гость"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Ошибка входа \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8617,8 +8888,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Имя пользователя или пароль некорректные."
 
@@ -8639,22 +8911,18 @@ msgstr "Правило низкоуровневого обнаружения в
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr "Правило низкоуровневого обнаружения в \"неподдерживаемом\" состоянии"
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "М"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8666,7 +8934,7 @@ msgstr "MAC адрес A"
 msgid "MAC address B"
 msgstr "MAC адрес B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "ОБСЛУЖИВАНИЕ"
 
@@ -8691,49 +8959,49 @@ msgstr "100 НАИБОЛЕЕ АКТИВНЫХ ТРИГГЕРОВ"
 msgid "Macro"
 msgstr "Макрос"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Макрос \"%1$s\" уже существует у \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Макрос \"%1$s\" уже существует."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "Макрос \"%1$s\" не уникален."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Значение макроса \"%1$s\" слишком длинное, оно не должно превышать 255 символов."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Имя макроса \"%1$s\" слишком длинное, оно не должно превышать 64 символа."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "Макрос с globalmacroid \"%1$s\" не существует."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Макроса с hostmacroid \"%1$s\" не существует."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Макросы"
 
@@ -8741,31 +9009,36 @@ msgstr "Макросы"
 msgid "Macros updated"
 msgstr "Макросы обновлены"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Обслуживание"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Обслуживание \"%s\" уже существует."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "Значение обслуживания \"Активно с\" не может быть больше чем \"Активно до\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr "Значение обслуживания в условии действия должно быть пустым."
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Обслуживание добавлено"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Обслуживание удалено"
 
@@ -8773,7 +9046,7 @@ msgstr "Обслуживание удалено"
 msgid "Maintenance period"
 msgstr "Период обслуживания"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Длительность периода обслуживания"
 
@@ -8789,25 +9062,25 @@ msgstr "Состояние обслуживания"
 msgid "Maintenance type"
 msgstr "Тип обслуживания"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Обслуживание обновлено"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Обслуживание со сбором данных"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Обслуживание без сбора данных"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Пропущен обязательный параметр."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Вручную"
 
@@ -8818,12 +9091,12 @@ msgstr "Принудительный выход"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Карта сети"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Карта сети \"%1$s\" пропущена - правило пользователя."
@@ -8833,12 +9106,12 @@ msgstr "Карта сети \"%1$s\" пропущена - правило пол�
 msgid "Map \"%s\""
 msgstr "Карта сети \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Карта сети \"%s\" создана."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Карта сети \"%s\" обновлена."
@@ -8855,12 +9128,12 @@ msgstr "Тип подписи к карте сети"
 msgid "Map save operation failed."
 msgstr "Не удалось выполнить операцию сохранения карты сети."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr "Карта сети с именем \"%s\" уже существует."
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Преобразуется в"
 
@@ -8870,23 +9143,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Преобразование значения \"%1$s\" не уникально."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Соответствия"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Карты сетей"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Мар"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Март"
 
@@ -8894,28 +9167,34 @@ msgstr "Март"
 msgid "Mark elements on trigger status change"
 msgstr "Помечать элементы при изменении состояния триггера"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Пометить остальное"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Пометить выбранное"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr "Маска"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Массовое обновление"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Массовое обновление элементов"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Макс. количество элементов в ячейке таблицы"
@@ -8929,35 +9208,11 @@ msgstr "Макс. количество элементов для отображ�
 msgid "Max count of events per trigger to show"
 msgstr "Макс. количество отображаемых событий у триггера"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Развернуть"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Максимальная длина DNS имени %1$d символов, \"%2$s\" - %3$d символ."
-msgstr[1] "Максимальная длина DNS имени %1$d символов, \"%2$s\" - %3$d символа."
-msgstr[2] "Максимальная длина DNS имени %1$d символов, \"%2$s\" - %3$d символов."
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Максимальная длина алиаса %1$d символов, \"%2$s\" - %3$d символ."
-msgstr[1] "Максимальная длина алиаса %1$d символов, \"%2$s\" - %3$d символа."
-msgstr[2] "Максимальная длина алиаса %1$d символов, \"%2$s\" - %3$d символов."
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Максимальная длина имени узла сети %1$d символов, \"%2$s\" - %3$d символ."
-msgstr[1] "Максимальная длина имени узла сети %1$d символов, \"%2$s\" - %3$d символа."
-msgstr[2] "Максимальная длина имени узла сети %1$d символов, \"%2$s\" - %3$d символов."
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8965,16 +9220,16 @@ msgid "Maximum number of flexible intervals added"
 msgstr "Добавлено максимальное количество переменных интервалов"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
@@ -8982,64 +9237,57 @@ msgstr[0] "Максимальный период времени отображе
 msgstr[1] "Максимальный период времени отображения %1$s дней."
 msgstr[2] "Максимальный период времени отображения %1$s дня."
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "Максимальное значение за период T < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "Максимальное значение за период T = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "Максимальное значение за период T > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "Максимальное значение за период T NOT N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Максимальная длина видимого имени узла сети %1$d символов, \"%2$s\" - %3$d символ."
-msgstr[1] "Максимальная длина видимого имени узла сети %1$d символов, \"%2$s\" - %3$d символа."
-msgstr[2] "Максимальная длина видимого имени узла сети %1$d символов, \"%2$s\" - %3$d символов."
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Май"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Май"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Оповещения"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Способ оповещений"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Способ оповещения \"%s\" уже существует."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Способ оповещения добавлен"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Способ оповещения удален"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
@@ -9047,7 +9295,7 @@ msgstr[0] "Способ оповещения деактивирован"
 msgstr[1] "Способ оповещения деактивирован"
 msgstr[2] "Способ оповещения деактивирован"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
@@ -9055,21 +9303,21 @@ msgstr[0] "Способ оповещения активирован"
 msgstr[1] "Способ оповещения активирован"
 msgstr[2] "Способ оповещения активирован"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Способ оповещения обновлен"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Способы оповещений"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Способы оповещения используются в действии \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Мега"
 
@@ -9084,14 +9332,14 @@ msgid "Memory limit: %s"
 msgstr "Лимит памяти: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Меню"
 
@@ -9101,7 +9349,7 @@ msgstr "Меню"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Сообщение"
 
@@ -9109,66 +9357,66 @@ msgstr "Сообщение"
 msgid "Message actions"
 msgstr "Сообщения действий"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Лимит текста сообщения"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Таймаут сообщения"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Таймаут сообщения (секунды)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Сообщения"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Сообщения"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Метод не найден."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "По середине"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Свернуть"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9177,7 +9425,7 @@ msgstr ""
 msgid "Minimum severity"
 msgstr "Минимальная важность"
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
@@ -9185,73 +9433,70 @@ msgstr[0] "Максимальный период времени отображе
 msgstr[1] "Максимальный период времени отображения %1$s часов."
 msgstr[2] "Максимальный период времени отображения %1$s часа."
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr "Минимальная важность триггеров"
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "Минимальное значение за период T < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "Минимальное значение за период T = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "Минимальное значение за период T > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "Минимальное значение за период T NOT N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Минут"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr "Пропущено поле \"%1$s\" для условия действия."
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr "Пропущенное \"%1$s\" поле для элемента данных."
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr "Пропущенное \"%1$s\" поле для периода."
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr "Пропущено \"gitemid\" поле для элемента данных."
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Пропущено поле \"itemid\" для элемента данных."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr "Пропущено \"name\" поле для прототипа графика."
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Пропущено поле \"name\" для графика."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Отсутствует элемент данных \"%1$s\" для узла сети \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Отсутствуют элементы данных у графика \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr "Отсутствуют элементы данных для прототипа графика \"%1$s\"."
@@ -9261,7 +9506,7 @@ msgstr "Отсутствуют элементы данных для протот
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Отсутствует ключ \"%1$s\" для узла сети \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Пропущенный параметр: usrgrpids."
 
@@ -9273,18 +9518,18 @@ msgstr "Режим"
 msgid "Model"
 msgstr "Модель"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Пн"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Понедельник"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Наблюдение через прокси"
 
@@ -9292,33 +9537,33 @@ msgstr "Наблюдение через прокси"
 msgid "Monitored host"
 msgstr "Наблюдаемый узел сети"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Месяц"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Ежемесячно"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr "Найдено больше совпадений..."
 
@@ -9326,7 +9571,7 @@ msgstr "Найдено больше совпадений..."
 msgid "More than 10 minutes"
 msgstr "Более 10 минут"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Более чем один график с именем \"%1$s\" у узла сети."
@@ -9335,19 +9580,19 @@ msgstr "Более чем один график с именем \"%1$s\" у уз
 msgid "Most busy triggers top 100"
 msgstr "100 наиболее активных триггеров"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Множественные события ПРОБЛЕМА"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Многократная генерация событий ПРОБЛЕМА"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Отключить звук"
 
@@ -9360,60 +9605,58 @@ msgstr "КАРТЫ СЕТЕЙ"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "НЕТ ДАННЫХ"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "Аутентификация NTLM"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9424,26 +9667,32 @@ msgstr "Аутентификация NTLM"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Имя"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr "Имя прототипа группы \"%1$s\" должно содержать макросы."
@@ -9462,12 +9711,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9475,7 +9724,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Карта сети добавлена"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Карта сети удалена"
 
@@ -9487,7 +9736,7 @@ msgstr "Карта сети обновлена"
 msgid "Network maps"
 msgstr "Карты сетей"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Никогда"
 
@@ -9495,24 +9744,24 @@ msgstr "Никогда"
 msgid "Never executed"
 msgstr "Никогда не выполнялось"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Новый"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Новая группа элементов данных"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Новое условие"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Новый элемент"
 
@@ -9523,16 +9772,16 @@ msgstr "Новый элемент"
 msgid "New flexible interval"
 msgstr "Новый переменный интервал"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Новая группа"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Новая группа узлов сети"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Новый элемент данных для графика"
 
@@ -9540,83 +9789,99 @@ msgstr "Новый элемент данных для графика"
 msgid "New media"
 msgstr "Новое оповещение"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Новое регулярное выражение"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Новый интервал времени услуги"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Далее"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Следующая"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Нет"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr "Не задано \"%1$s\" для прототипа графика."
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr "Не задано \"%1$s\" для графика."
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr "Не задано \"%1$s\" для прототипа узла сети."
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr "Не задано \"%2$s\" для прототипа узла сети \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Нет поля \"ymax_type\" для графика \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Нет поля \"ymin_type\" для графика \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr "Интерфейсы IMPI не найдены."
 
@@ -9624,25 +9889,25 @@ msgstr "Интерфейсы IMPI не найдены."
 msgid "No IT services found."
 msgstr "Услуги IT не найдены."
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr "Интерфейсы JMX не найдены."
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr "SNMP OID не указан."
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr "SNMP community не указан."
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr "Интерфейсы SNMP не найдены."
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Для элемента комплексного экрана не указан URL."
 
@@ -9668,8 +9933,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Действия не найдены."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr "Интерфейсы агента не найдены."
 
@@ -9679,7 +9944,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Нет группы элементов данных с ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr "Группы элементов данных не найдены."
 
@@ -9687,30 +9952,31 @@ msgstr "Группы элементов данных не найдены."
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "В операции действия для команды \"%s\" не указан тип аутентификации."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "В операции действия для команды \"%s\" не указано имя пользователя для аутентификации."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Для аутентификации не указано имя пользователя."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Для операции действия не указана команда."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Для операции действия не указан тип команды."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Условия не заданы."
 
@@ -9719,27 +9985,27 @@ msgstr "Условия не заданы."
 msgid "No data collection"
 msgstr "Без сбора данных"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "Не получено данных в течении T периода времени, тогда N = 1, 0 - в противном случае"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "Не получено данных в течении T периода времени, тогда N NOT 1, 0 - в противном случае"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Нет интерфейса по умолчанию для \"%1$s\" типа у \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Зависимости не заданы."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Без деталей"
 
@@ -9747,39 +10013,39 @@ msgstr "Без деталей"
 msgid "No discovered devices found."
 msgstr "Обнаруженных устройств не найдено."
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr "Не задан ID правила обнаружения для прототипа узла сети \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "ID правил обнаружения не указаны."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr "Правила обнаружения не найдены."
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Ошибки не найдены."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Нет событий"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr "События не найдены."
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Нет событий для подтверждения"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Не указана цель выполнения для команды \"%s\" в операции действия."
@@ -9794,7 +10060,7 @@ msgstr "Файл не был загружен."
 msgid "No flexible intervals defined."
 msgstr "Переменные интервалы не заданы."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Для элемента комплексного экрана не указан ID графика."
 
@@ -9803,7 +10069,11 @@ msgstr "Для элемента комплексного экрана не ук�
 msgid "No graph item with graphid \"%s\"."
 msgstr "Нет элемента графика с graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr "Прототипы графиков не найдены."
 
@@ -9812,48 +10082,49 @@ msgid "No graphs added."
 msgstr "Графики не добавлены."
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr "Графики не найдены."
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Нет групп для узла сети \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Нет групп для узлов сети."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Не указаны ID узлов сети."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Узел сети не задан для макроса \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr "Не задан ID группы узлов сети для прототипа группы."
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Не указан ID группы узлов сети для элемента комплексного экрана."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr "Группы узлов сети не найдены."
 
@@ -9866,17 +10137,22 @@ msgstr "Нет групп узлов сети с groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr "Прототипы узлов сети не найдены."
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Нет узла сети с hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr "Узлы сети не найдены."
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Нет иконки для элемента карты сети \"%s\"."
@@ -9895,33 +10171,40 @@ msgstr "Изображения не найдены."
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Интерфейс не найден"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Интерфейс не найден."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr "Не указан интерфейс для прокси \"%s\"."
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Нет интерфейсов для узла сети \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Не указан ID элемента данных для элемента комплексного экрана."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr "Ключи элементов данных не найдены."
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr "Прототипы элементов данных не найдены."
 
@@ -9940,9 +10223,9 @@ msgid "No items defined."
 msgstr "Элементы данных не заданы."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
-msgstr "Элементы данныз не найдены."
+msgstr "Элементы данных не найдены."
 
 #: include/views/common.macros.php:27
 msgid "No macros found."
@@ -9956,7 +10239,7 @@ msgstr "Периоды обслуживания не заданы."
 msgid "No maintenance periods found."
 msgstr "Периоды обслуживания не найдены."
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Не указан ID карты сети для элемента комплексного экрана."
 
@@ -9965,15 +10248,15 @@ msgid "No maps added."
 msgstr "Карты сети не добавлены."
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr "Карты сети не найдены."
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr "Совпадения не найдены"
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr "Способы оповещения не найдены."
 
@@ -9985,133 +10268,178 @@ msgstr "Способы оповещения не найдены."
 msgid "No notifications found."
 msgstr "Оповещения не найдены."
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr "Операторы не заданы."
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Нет прав доступа к графику \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Нет прав доступа к узлу сети \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Нет прав доступа к элементу данных \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Нет прав доступа к шаблону \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Нет прав доступа к триггеру \"%1$s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Нет прав доступа"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Нет прав доступа к группе \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Нет прав доступа к карте сети \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Нет прав доступа к комплексному экрану \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Нет прав доступа в систему."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Нет прав доступа к запрашиваемому объекту или он не существует!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Не указан файл приватного ключа для команды \"%s\" в операции действия."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Файл приватного ключа не указан."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr "Прокси не найдены."
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Без прокси"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Не указан файл публичного ключа для команды \"%s\" в операции действия."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Файл публичного ключа не указан."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Нет получателей сообщения в операции действия."
 
@@ -10119,7 +10447,7 @@ msgstr "Нет получателей сообщения в операции д�
 msgid "No regular expressions found."
 msgstr "Регулярные выражения не найдены."
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Не указан ID комплексного экрана для элемента комплексного экрана."
 
@@ -10127,82 +10455,83 @@ msgstr "Не указан ID комплексного экрана для эле
 msgid "No screens added."
 msgstr "Комплексные экраны не добавлены."
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr "Комплексные экраны не найдены."
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Не указан скрипт для команды в операции действия."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr "Скрипты не найдены."
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr "Слайд-шоу не найдены."
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr "Слайды не найдены."
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr "Нет состояния для прокси."
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Цель не выбрана"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Цель не выбрана."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr "Шаблоны не найдены."
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr "Нет присоединенных шаблонов."
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Интервалы не заданы. Работа 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Без триггера"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Нет триггера с triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Триггеры не заданы."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Триггеры не найдены."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr "Группы пользователей не найдены."
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr "Пользователи не найдены."
 
@@ -10211,57 +10540,58 @@ msgid "No value maps found."
 msgstr "Преобразования значений не найдены."
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Значения не найдены."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr "Веб-сценарии не найдены."
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Пусто"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Нормальный"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Нормальный вид"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Не подтверждено"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Без элементов данных из шаблона"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Не все шаблоны соединены с \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Не разрешено устанавливать пароль для пользователя \"гость\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Недоступен"
 
@@ -10270,7 +10600,7 @@ msgstr "Недоступен"
 msgid "Not classified"
 msgstr "Не классифицировано"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Не подключен"
 
@@ -10283,8 +10613,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Заметка"
@@ -10297,7 +10627,7 @@ msgstr "Примечания"
 msgid "Nothing"
 msgstr "Ничего"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Нечего делать."
 
@@ -10305,87 +10635,87 @@ msgstr "Нечего делать."
 msgid "Notification report"
 msgstr "Отчет об оповещениях"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Оповещения"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Ноя"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Ноябрь"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Сейчас"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Количество секунд с начала Эпохи < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Количество секунд с начала Эпохи = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Количество секунд с начала Эпохи > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Количество секунд с начала Эпохи NOT N"
 
@@ -10393,88 +10723,88 @@ msgstr "Количество секунд с начала Эпохи NOT N"
 msgid "Number of status changes"
 msgstr "Количество изменений состояния"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Количество шагов"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Количество успешно полученных значений V (которые удовлетворяют оператору O) за период T < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Количество успешно полученных значений V (которые удовлетворяют оператору O) за период T = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Количество успешно полученных значений V (которые удовлетворяют оператору O) за период T > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Количество успешно полученных значений V (которые удовлетворяют оператору O) за период T NOT N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Количество пользователей (в сети)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Числовой (с плавающей точкой)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Числовой (целое 64бит)"
 
@@ -10489,16 +10819,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr "OK или без триггера"
 
@@ -10514,8 +10846,7 @@ msgstr "OOB роутер"
 msgid "OOB subnet mask"
 msgstr "OOB маска подсети"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "ИЛИ"
 
@@ -10535,11 +10866,12 @@ msgstr "ОС (Короткое описание)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "ДРУГИЕ ПАРАМЕТРЫ НАСТРОЕК"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "ОБЗОР"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Окт"
 
@@ -10547,25 +10879,25 @@ msgstr "Окт"
 msgid "Octal"
 msgstr "Восьмеричный"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Октябрь"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Выкл"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Вкл"
 
@@ -10573,111 +10905,114 @@ msgstr "Вкл"
 msgid "On status change triggers blink for"
 msgstr "Мигание триггеров при изменении состояния"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Один раз"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr "Один из объектов остался без группы узлов сети."
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Единовременно"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Однократная недоступность"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Только Супер-Администраторы могут создавать глобальные макросы."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Только Супер-Администраторы могут создавать группы узлов сети."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Только Супер-Администраторы могут создавать соответствия иконок."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Только Супер-Администраторы могут создавать способы оповещения."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Только Супер-Администраторы могут удалять глобальные макросы."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Только Супер-Администраторы могут удалять способы оповещения."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Только Супер-Администраторы могут удалять группы пользователей."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Только Супер-Администраторы могут менять способы оповещения."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Только Супер-Администраторы могут изменять глобальные макросы."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Только Супер-Администраторы могут обновлять соответствия иконок."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Только Супер-Администраторы могут добавлять пользователям оповещения."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Только Супер-Администраторы могут изменять оповещения пользователей."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Только Супер-Администраторы могут удалять оповещения пользователей."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Разрешены только символы."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Подсчитываются только элементы данных у узлов сети Под наблюдением"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Только одна проверка может быть уникальной."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Только одно имя группы пользователей может быть изменено единовременно."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Индикатор отображает только последние 20%%."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr "Могут быть подтверждены только события триггеров."
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Подсчитываются только триггеры у узлов сети Под наблюдением и которые зависят от активных элементов данных"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Операция \"%s\" уже существует."
@@ -10686,28 +11021,28 @@ msgstr "Операция \"%s\" уже существует."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Операция не может быть выполнена из-за несанкционированного запроса."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Условие операции"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Детали операции"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Операция не имеет группу для функционирования."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Операция не имеет шаблон для функционирования."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Тип операции"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Операции"
@@ -10716,25 +11051,27 @@ msgstr "Операции"
 msgid "Operator"
 msgstr "Оператор"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10764,24 +11101,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Оригинальное"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Оригинальная синяя"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Прочие"
 
@@ -10789,19 +11126,19 @@ msgstr "Прочие"
 msgid "Other configuration parameters"
 msgstr "Другие параметры настроек"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Другие группы"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Другие узлы сети"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10811,21 +11148,21 @@ msgstr "Другие узлы сети | Группа"
 msgid "Other parameters"
 msgstr "Прочие параметры"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Другие | группа"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Другие"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Переопределено "
@@ -10838,14 +11175,11 @@ msgstr "Переопределить периоды хранения истор�
 msgid "Override item trend period"
 msgstr "Переопредлять период хранения динамики изменения элементов данных"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Обзор"
 
@@ -10853,7 +11187,7 @@ msgstr "Обзор"
 msgid "Overview by proxy"
 msgstr "Обзор по прокси"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "П"
@@ -10862,147 +11196,155 @@ msgstr "П"
 msgid "PERSONAL DASHBOARD"
 msgstr "ПЕРСОНАЛЬНАЯ ПАНЕЛЬ"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Поддержка баз данных PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Поддержка PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Поддержка PHP gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Поддержка PHP gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP опция max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP опция max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP опция memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP опция post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP опция upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP session auto start"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "Часовой пояс PHP"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Версия PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -11011,32 +11353,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМА"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "Страница получила некорректные данные"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Палитра"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Палитра #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Параметр"
 
@@ -11045,7 +11389,7 @@ msgstr "Параметр"
 msgid "Parent discovery rules"
 msgstr "Родительские правила обнаружения"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr "Родительские графики"
 
@@ -11065,33 +11409,33 @@ msgstr "Родительские триггеры"
 msgid "Parent web scenarios"
 msgstr "Родительские веб-сценарии"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Ошибка анализа SQL [%1$s] в [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Ошибка разбора"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Пассивный"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11101,20 +11445,21 @@ msgstr "Пассивный"
 msgid "Password"
 msgstr "Пароль"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Пароль (подтверждение)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Для способа оповещения требуется пароль."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Пароль не может быть пустым"
 
@@ -11123,21 +11468,21 @@ msgstr "Пароль не может быть пустым"
 msgid "Peak memory usage: %s"
 msgstr "Пик использования памяти: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Процентная линия (слева)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Процентная линия (справа)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11145,12 +11490,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Период"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Тип периода"
@@ -11160,24 +11505,24 @@ msgstr "Тип периода"
 msgid "Periods"
 msgstr "Периоды"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Права доступа"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права доступа могут быть назначены только группам пользователей."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Персидский (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Пета"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Круговой"
 
@@ -11189,55 +11534,56 @@ msgstr "Алгоритм размещения"
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Воспроизводить звуковой сигнал"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Пожалуйста, исправьте все замечания и нажмите кнопку \"Повтор\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Пожалуйста, введите текст подтверждения."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Пожалуйста, выберите два элемента"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polish (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Заполнение поля инвентаря узла сети"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Порт"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Порт не может быть пустым у интерфейса узла сети."
 
@@ -11245,51 +11591,51 @@ msgstr "Порт не может быть пустым у интерфейса �
 msgid "Port range"
 msgstr "Диапазон портов"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portuguese (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Португальский (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Позиция"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Post"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Назад"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Предыдущая"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Предыдущее значение < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Предыдущее значение = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Предыдущее значение > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Предыдущее значение NOT N"
 
@@ -11338,30 +11684,31 @@ msgstr "Пароль безопасности"
 msgid "Privacy protocol"
 msgstr "Протокол безопасности"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Файл приватного ключа"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Уровень привилегий"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Возможно отсутствует модуль php-ldap."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Проблема"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Отображение проблем"
 
@@ -11373,16 +11720,16 @@ msgstr "Проблема с"
 msgid "Problem time"
 msgstr "Продолжительность проблем"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Проблема, если все подчиненные имеют проблемы"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Проблема, если хотя бы у одного из подчиненных имеется проблема"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Проблемы"
 
@@ -11390,75 +11737,71 @@ msgstr "Проблемы"
 msgid "Profile"
 msgstr "Профиль"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Прототипы"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Прокси"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Прокси"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Прокси \"%1$s\" для узла сети \"%2$s\" не существует."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Прокси \"%1$s\" используется в правиле обнаружения \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Прокси \"%s\" уже существует."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Прокси добавлен"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Прокси удален"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Узлы сети прокси"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Ошибка при создании интерфейса прокси."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Ошибка при обновлении интерфейса прокси."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Режим прокси"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Имя прокси"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Прокси обновлен"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Публичный ключ"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11469,7 +11812,7 @@ msgstr "Файл публичного ключа"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "ОЧЕРЕДЬ ЭЛЕМЕНТОВ ДАННЫХ, ОЖИДАЮЩИХ ОБНОВЛЕНИЯ"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Очередь"
 
@@ -11477,18 +11820,18 @@ msgstr "Очередь"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Чтение"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Только чтение"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Чтение-запись"
 
@@ -11500,7 +11843,7 @@ msgstr "Причина"
 msgid "Received value"
 msgstr "Полученное значение"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11508,11 +11851,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Получатель"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Получатель (в порядке возрастания)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Получатель (в порядке убывания)"
 
@@ -11523,29 +11866,29 @@ msgstr "Получатель (в порядке убывания)"
 msgid "Recipient(s)"
 msgstr "Получатель(и)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Восстановление"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Сообщение о восстановлении"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Тема восстановления"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Обновление (в секундах)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
 # это в поп-апе при просмотре слайдшоу
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Множитель интервала обновления"
 
@@ -11563,48 +11906,52 @@ msgstr "Обновлять неподдерживаемые элементы д�
 msgid "Regular expression"
 msgstr "Регулярное выражение"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "Регулярное выражение \"%s\" уже существует."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "Регулярное выражение V соответствует последнему значений за период T, тогда N = 1, 0 - в противном случае"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "Регулярное выражение V соответствует последнему значений за период T, тогда N = 1, 0 - в противном случае (не регистрозависимо)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "Регулярное выражение V соответствует последнему значений за период T, тогда N NOT 1, 0 - в противном случае"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "Регулярное выражение V соответствует последнему значений за период T, тогда N NOT 1, 0 - в противном случае (не регистрозависимо)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Регулярное выражение добавлено"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Регулярное выражение удалено"
 msgstr[1] "Регулярные выражения удалены"
 msgstr[2] "Регулярные выражения удалены"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Регулярное выражение не существует."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Регулярное выражение обновлено"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11621,26 +11968,28 @@ msgstr "Удаленная команда"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11651,21 +12000,19 @@ msgstr "Удаленная команда"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Удалить"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11673,11 +12020,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Удалить элемент"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Удалить из"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Удалить из избранного"
@@ -11686,7 +12033,7 @@ msgstr "Удалить из избранного"
 msgid "Remove from host group"
 msgstr "Удалить из группы узлов сети"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Удалить из групп узлов сети"
 
@@ -11698,28 +12045,28 @@ msgstr "Удалить узел сети"
 msgid "Remove link"
 msgstr "Удалить связь"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Удалить выбранное"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Заменить"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr "Заменить группы элементов данных"
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Заменить зависимости"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Заменить группы узла сети"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Отчет"
 
@@ -11727,35 +12074,36 @@ msgstr "Отчет"
 msgid "Report 1"
 msgstr "Отчет 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Отчет 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Отчет 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Отчеты"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Требуется"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "В соответствии иконок пропущено требуемое поле \"expression\"."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "В соответствии иконок пропущено требуемое поле \"iconid\"."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "В соответствии иконок пропущено требуемое поле \"inventory_link\"."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Требуемые права доступа к узлу сети"
 
@@ -11763,29 +12111,31 @@ msgstr "Требуемые права доступа к узлу сети"
 msgid "Required performance (vps)"
 msgstr "Требуемое быстродействие (знч/сек)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Требуемое быстродействие сервера, новые значения в секунду"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Требуемые коды состояния"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Требуемая строка"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -11804,9 +12154,9 @@ msgstr "Сбросить все имена и цвета в значения п�
 msgid "Reset confirmation"
 msgstr "Сбросить подтверждение"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11819,7 +12169,7 @@ msgstr "Решено"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Ресурс"
@@ -11834,15 +12184,15 @@ msgstr "Время ответа"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Результат"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Результат ЛОЖЬ"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Результат ИСТИНА"
 
@@ -11855,7 +12205,8 @@ msgstr "Результат для \"%s\""
 msgid "Result type"
 msgstr "Тип результата"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr "Попыток"
 
@@ -11863,60 +12214,69 @@ msgstr "Попыток"
 msgid "Retries left"
 msgstr "Попыток"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Повтор"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "По правой стороне"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr "Румынский (ro_RO)"
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Объединение строк"
 
@@ -11924,11 +12284,11 @@ msgstr "Объединение строк"
 msgid "Rows"
 msgstr "Строк"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Строк на странице"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Правила"
 
@@ -11973,20 +12333,20 @@ msgid "Run remote commands on hosts"
 msgstr "Выполнять удаленные команды на узлах сети"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Вс"
@@ -12002,7 +12362,7 @@ msgstr "КОМПЛЕКСНЫЕ ЭКРАНЫ"
 msgid "SEARCH"
 msgstr "ПОИСК"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "СЕРВЕР"
 
@@ -12017,13 +12377,13 @@ msgstr "SHA"
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "СЛАЙД-ШОУ"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -12032,17 +12392,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP email"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP сервер"
@@ -12058,7 +12418,7 @@ msgstr "SNMP Key"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12070,9 +12430,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "Интерфейсы SNMP"
@@ -12081,7 +12441,7 @@ msgstr "Интерфейсы SNMP"
 msgid "SNMP trap"
 msgstr "SNMP trap"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "Ключ SNMP trap ошибочный."
 
@@ -12105,7 +12465,7 @@ msgstr "SNMPv3 агент"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Количество SQL: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12123,7 +12483,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Ошибка при выполнении SQL запроса \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12132,15 +12492,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH агент"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "СОСТОЯНИЕ ОБНАРУЖЕНИЯ"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "СОСТОЯНИЕ ТРИГГЕРОВ"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "СОСТОЯНИЕ ВЕБ-МОНИТОРИНГА"
 
@@ -12148,92 +12528,92 @@ msgstr "СОСТОЯНИЕ ВЕБ-МОНИТОРИНГА"
 msgid "STATUS OF ZABBIX"
 msgstr "СОСТОЯНИЕ ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Сб"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Суббота"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Сохранить"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Сохранить и вернуться"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Период"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Сценарий"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Сценарий добавлен"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Сценарий обновлен"
 
@@ -12245,7 +12625,7 @@ msgstr "Сценарии"
 msgid "Schedule"
 msgstr "Запланировано"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr "Запланированная проверка"
 
@@ -12256,126 +12636,125 @@ msgstr "Запланированная проверка"
 msgid "Screen"
 msgstr "Комплексный экран"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Комплексный экран \"%1$s\" добавлен."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "Комплексный экран \"%1$s\" уже существует у шаблона \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "Комплексный экран \"%1$s\" уже существует."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Комплексный экран \"%1$s\" пропущен - правило пользователя."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Комплексный экран \"%1$s\" обновлен."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Комплексный экран добавлен"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Настройка элемента комплексного экрана"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Комплексный экран удален"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Комплексный экран должен содержать по крайней мере одну строку и колонку."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Комплексный экран обновлен"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Комплексные экраны"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Скрипт"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Скрипт \"%1$s\" уже существует."
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Скрипт добавлен"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Скрипт удален"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr "Путь \"%1$s\" меню скрипта  уже используется в имени скрипта \"%2$s\"."
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Имя скрипта"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr "Имя скрипта \"%1$s\" уже используется в пути меню для скрипта \"%2$s\"."
@@ -12384,17 +12763,17 @@ msgstr "Имя скрипта \"%1$s\" уже используется в пут
 msgid "Script profiler"
 msgstr "Профилировщик сценария"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Скрипт обновлен"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr "Скрипт с scriptid \"%1$s\" не существует."
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Скрипты"
 
@@ -12415,7 +12794,7 @@ msgstr "Шаблон поиска пустой"
 msgid "Search/Filter elements limit"
 msgstr "Лимит элементов в поиске/фильтре"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Секунда"
 
@@ -12447,7 +12826,7 @@ msgstr "Вторичный телефон B для контакта"
 msgid "Secondary POC screen name"
 msgstr "Вторичное ник-имя для контакта"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Секунд"
 
@@ -12466,69 +12845,76 @@ msgstr "Уровень безопасности"
 msgid "Security name"
 msgstr "Имя безопасности"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Выбрать"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Выбрать прототип"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Выбрать строки, содержащие в описании"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Выбранные"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Выбранные действия удалены"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Выбранные элементы"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Выбранные группы"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Выбранные узлы сети"
 
@@ -12544,7 +12930,7 @@ msgstr "Отправлять сообщение группам пользова�
 msgid "Send message to users"
 msgstr "Отправлять сообщение пользователям"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Отправлять только"
 
@@ -12552,11 +12938,11 @@ msgstr "Отправлять только"
 msgid "Send to"
 msgstr "Отправлять на"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Отправлять группам пользователей"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Отправлять пользователям"
 
@@ -12565,17 +12951,17 @@ msgstr "Отправлять пользователям"
 msgid "Sent"
 msgstr "Отправлено"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Сен"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Неподтвержденные отдельно"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Сентябрь"
 
@@ -12587,7 +12973,7 @@ msgstr "Серийный номер A"
 msgid "Serial number B"
 msgstr "Серийный номер B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Сервер"
@@ -12596,44 +12982,44 @@ msgstr "Сервер"
 msgid "Server info"
 msgstr "Информация о сервере"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Время на сервере"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Услуга"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Услуга \"%1$s\" не может быть удалена, потому что другая услуга зависит от неё."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Услуга \"%1$s\" не может зависеть сама от себя."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Услуга \"%1$s\" не может быть связана с триггером и быть подчиненной одновременно."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Услуга \"%1$s\" уже жестко связана с другой услугой."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Услуга не может быть родительской и подчиненной одновременно."
 
@@ -12649,11 +13035,11 @@ msgstr "Услуга удалена"
 msgid "Service port"
 msgstr "Порт сервиса"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "Время начала услуги должно быть меньше чем время окончания."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Интервалы времени услуги"
 
@@ -12665,49 +13051,54 @@ msgstr "Тип сервиса"
 msgid "Service updated"
 msgstr "Услуга обновлена"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Услуги"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Услуги образуют круговую зависимость."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Сессия завершена, пожалуйста, зайдите повторно в систему."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Важность"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Важность (в порядке убывания)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Имя важности не может быть пустым."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Показать"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Показать все"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Показывать подробности"
 
@@ -12737,35 +13128,36 @@ msgstr "Отображать события не старше чем (в дня�
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Отображать события не старше чем (в днях) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Отображать узлы сети в обслуживании"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Показывать элементы данных, содержащие в имени"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Показывать элементы данных без истории"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Показывать легенду"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Отображать строк"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Показать выбранное"
 
@@ -12773,19 +13165,23 @@ msgstr "Показать выбранное"
 msgid "Show selected groups"
 msgstr "Показать выбранные группы"
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Показать текст в виде HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Показывать триггеры"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Показывать только неподтвержденные"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Отображение значения"
@@ -12794,11 +13190,11 @@ msgstr "Отображение значения"
 msgid "Show warning if Zabbix server is down"
 msgstr "Показывать предупреждение, если Zabbix сервер недоступен"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Показывать рабочее время"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Показана"
 
@@ -12818,6 +13214,10 @@ msgstr "Простая проверка"
 msgid "Simple graph"
 msgstr "Простой график"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Почтовый индекс"
@@ -12855,7 +13255,7 @@ msgid "Site state / province"
 msgstr "Область / район"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12873,16 +13273,16 @@ msgstr "Пропущено копирование графика \"%1$s\" в у�
 msgid "Slide"
 msgstr "Слайд"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Слайд-шоу"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Слайд-шоу \"%s\" уже существует."
@@ -12891,11 +13291,11 @@ msgstr "Слайд-шоу \"%s\" уже существует."
 msgid "Slide show added"
 msgstr "Слайд-шоу добавлено"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Слайд-шоу удалено"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Слайд-шоу должно содержать слайды."
 
@@ -12903,10 +13303,10 @@ msgstr "Слайд-шоу должно содержать слайды."
 msgid "Slide show updated"
 msgstr "Слайд-шоу обновлено"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Слайд-шоу"
 
@@ -12914,15 +13314,15 @@ msgstr "Слайд-шоу"
 msgid "Slides"
 msgstr "Слайды"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Заснуть"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Нежесткая"
 
@@ -12955,28 +13355,28 @@ msgid "Software application E"
 msgstr "Программное обеспечение E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Сортировать по"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Порядок сортировки (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Сортировать триггеры по"
 
@@ -12989,11 +13389,11 @@ msgstr "Сортировка по полю \"%1$s\" не разрешена."
 msgid "Source"
 msgstr "Источник"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spanish (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Указанный скрипт не существует или вы не имеете к нему прав доступа для команды операции действия."
 
@@ -13001,63 +13401,63 @@ msgstr "Указанный скрипт не существует или вы н
 msgid "Speed"
 msgstr "Скорость"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Стэкируемый"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Стандартные элементы данных"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Начинать в"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Состояние"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Состояние"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Состояние (в порядке возрастания)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Состояние (в порядке убывания)"
 
@@ -13070,7 +13470,7 @@ msgstr "Вычисление состояния"
 msgid "Status calculation algorithm"
 msgstr "Алгоритм вычисления состояния"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Коды состояний"
 
@@ -13079,7 +13479,7 @@ msgid "Status of Web monitoring"
 msgstr "Состояние веб-мониторинга"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Состояние Zabbix"
 
@@ -13096,40 +13496,40 @@ msgid "Status only"
 msgstr "Только состояние"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Шаг"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Шаг \"%1$s\" [%2$s из %3$s] ошибочный: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Длительность шага"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Шаг сценария"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr "Шаг с именем \"%1$s\" уже существует."
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Шаги"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Остановить"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Хранение значения"
@@ -13138,11 +13538,11 @@ msgstr "Хранение значения"
 msgid "Straight"
 msgstr "Straight"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Стиль"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Подфильтр [влияет только на отфильтрованные данные!]"
 
@@ -13150,11 +13550,11 @@ msgstr "Подфильтр [влияет только на отфильтров�
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Тема"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Подкарта"
 
@@ -13163,32 +13563,32 @@ msgid "Success Audit"
 msgstr "Аудит успеха"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "Сумма значений за период T < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Сумма значений за период T = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Сумма значений за период T > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "Сумма значений за период T NOT N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Вс"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -13196,27 +13596,27 @@ msgstr "Воскресенье"
 msgid "Support"
 msgstr "Поддержка"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Фамилия"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Swedish (sv_SE)"
 
@@ -13224,16 +13624,16 @@ msgstr "Swedish (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "Переключение метода аутентификации сбросит все сессии исключая эту! Продолжить?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Системная по умолчанию"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Системная ошибка."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13242,21 +13642,21 @@ msgid "System status"
 msgstr "Состояние системы"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "Т"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -13275,11 +13675,11 @@ msgid "TOTAL"
 msgstr "ВСЕГО"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "КОММЕНТАРИИ К ТРИГГЕРУ"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "ИСТИНА"
 
@@ -13297,14 +13697,14 @@ msgstr "У таблицы \"%1$s\" нет поля с именем \"%2$s\"."
 msgid "Tag"
 msgstr "Этикетка"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Цель"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Список целей"
 
@@ -13313,130 +13713,133 @@ msgid "Target type"
 msgstr "Тип цели"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Шаблон"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Шаблон \"%1$s\" уже существует."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Шаблон \"%1$s\" для узла сети \"%2$s\" не существует."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr "Шаблон \"%1$s\" с ключем элемента данных \"%2$s\" уже присоединен к узлу сети."
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Шаблон добавлен"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Шаблон не может быть соединен с другим шаблоном несколько раз, даже через другие шаблоны."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Шаблон удален"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Группа шаблона"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Соединения с шаблонами"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Список шаблонов"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Имя шаблона"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Шаблоны комплексных экранов"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Шаблонный триггер"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Шаблон обновлен"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Шаблон с таким же именем \"%s\" уже существует."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Шаблон с таким же видимым именем \"%s\" уже существует."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Шаблонные элементы данных"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Шаблоны \"%1$s\" отсоединены от узлов сети \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Тера"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Тест"
 
@@ -13444,11 +13847,11 @@ msgstr "Тест"
 msgid "Test authentication"
 msgstr "Тест аутентификации"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Тест подтверждения"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Тестовые данные"
 
@@ -13462,22 +13865,22 @@ msgid "Test string"
 msgstr "Тестовая строка"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Текст"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13485,7 +13888,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "Веб-интерфейс не соответствует базе данных Zabbix."
@@ -13500,12 +13903,12 @@ msgstr "Веб-интерфейс не соответствует базе да�
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Группа узлов сети более не обнаруживается и будет удалена в %1$s (через %2$s %3$s)."
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Узел сети более не обнаруживается и будет удален в %1$s (через %2$s %3$s)."
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -13513,7 +13916,7 @@ msgstr[0] "Изображение используется в соответст
 msgstr[1] "Изображение используется в соответствиях иконок %1$s."
 msgstr[2] "Изображение используется в соответствиях иконок %1$s."
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -13521,7 +13924,7 @@ msgstr[0] "Изображение используется на карте се�
 msgstr[1] "Изображение используется на картах сети %1$s."
 msgstr[2] "Изображение используется на картах сети %1$s."
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Элемент данных более не обнаруживается и будет удален в %1$s (из %2$s в %3$s)."
@@ -13530,19 +13933,19 @@ msgstr "Элемент данных более не обнаруживается
 msgid "The queue is empty."
 msgstr "Очередь пуста."
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Полученный JSON не является правильным запросом JSON-RPC."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "Запрашиваемая удаленная процедура не существует / недоступна"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr "Группа элементов данных веб-сценария принадлежит отличному узлу сети от узла сети веб-сценария."
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Тема"
 
@@ -13554,11 +13957,11 @@ msgstr[0] "Существует \"%1$d\" группа с внутренним д
 msgstr[1] "Существует \"%1$d\" группы с внутренним доступом к GUI."
 msgstr[2] "Существует \"%1$d\" групп с внутренним доступом к GUI."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Третий"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Это поле автоматически заполняется элементом данных \"%s\"."
@@ -13567,11 +13970,11 @@ msgstr "Это поле автоматически заполняется эле
 msgid "This month"
 msgstr "Этот месяц"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Колонка комплексного экрана не пустая. Удалить её?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Строка комплексного экрана не пустая. Удалить её?"
 
@@ -13583,27 +13986,27 @@ msgstr "Эта неделя"
 msgid "This year"
 msgstr "Этот год"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Чт"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Четверг"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "До"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13612,28 +14015,28 @@ msgstr "До"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Время"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Время (в порядке возрастания)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Время (в порядке убывания)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13641,54 +14044,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Период времени"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Сдвиг по времени"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Тип времени"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Время ожидания"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Отметка времени"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "Штамп времени не отличается от времени на Zabbix сервере более чем на T секунд, тогда N = 1, 0 - в противном случае"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "Штамп времени не отличается от времени на Zabbix сервере более чем на T секунд, тогда N NOT 1, 0 - в противном случае"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Заголовок"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "К"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Для установки интерфейса узла сети выберите один тип элемента данных из всех элементов данных"
 
@@ -13696,17 +14099,18 @@ msgstr "Для установки интерфейса узла сети выб�
 msgid "Today"
 msgstr "Сегодня"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "По верхнему краю"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Всего"
 
@@ -13724,7 +14128,7 @@ msgstr "Всего затрачено времени: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Транзакция не была закрыта. Отмена..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Ошибка транспорта."
 
@@ -13741,77 +14145,77 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Динамика изменений"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Триггер"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Триггер \"%1$s\" уже существует у \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Триггер \"%1$s\" зависит от триггера \"%2$s\", который не существует."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Триггер \"%1$s\" пропущен - правило пользователя."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Триггер \"%s\" принадлежит шаблонам с разными связями."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Триггер добавлен"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr "Триггер не может зависеть от триггера, который наследуется от него."
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Комментарии к триггеру"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Триггер удален"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
@@ -13819,14 +14223,14 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Опции отображения триггера"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13842,11 +14246,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Условие выражения триггера"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "Выражение триггера должно содержать по крайней мере одну ссылку узел_сети:ключ."
 
@@ -13854,7 +14259,7 @@ msgstr "Выражение триггера должно содержать по
 msgid "Trigger form"
 msgstr "Форма триггера для журнала"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "У триггера есть элементы данных из шаблона \"%1$s\", которые не соединены с узлом сети."
@@ -13867,12 +14272,12 @@ msgstr "Триггер в \"нормальном\" состоянии"
 msgid "Trigger in \"unknown\" state"
 msgstr "Триггер в \"неизвестном\" состоянии"
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "У триггера из шаблона \"%1$s\" есть зависимость от триггера из шаблона \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Триггер только добавлен. До сих пор нет обновления состояния."
 
@@ -13884,54 +14289,54 @@ msgstr "Тип подписи к триггеру"
 msgid "Trigger name"
 msgstr "Имя триггера"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Прототип триггера"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Прототипы триггеров"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13939,23 +14344,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Прототипы триггеров для"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Важности триггеров"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Важность триггера"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Триггер обновлен"
 
@@ -13963,40 +14376,41 @@ msgstr "Триггер обновлен"
 msgid "Trigger value"
 msgstr "Значение триггера"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Триггеры"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr "Триггеры (а/д)[п/о]"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Триггеры удалены"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Информация о триггерах"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Массовое обновление триггеров"
 
@@ -14004,78 +14418,78 @@ msgstr "Массовое обновление триггеров"
 msgid "Triggers overview"
 msgstr "Обзор триггеров"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Состояние триггера"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "100 наиболее активных триггеров"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Триггеры с важностью"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Укорочено"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Попытка чтения недоступного свойства \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Вт"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Турецкий (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Должны быть выбраны два элемента"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Два элемента данных (\"%1$s\" и \"%2$s\") не могут заполнять одно поле \"%3$s\" инвентарных данных узла сети, это может привести к конфликту."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Тип"
 
@@ -14083,62 +14497,64 @@ msgstr "Тип"
 msgid "Type (Full details)"
 msgstr "Тип (полная детализация)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Тип (ОК)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Тип (в порядке возрастания)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Тип (в порядке убывания)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Тип вычисления"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Тип информации"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "Для ключа журнала тип информации должен быть \"Журнал (лог)\"."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "Для агрегатных элементов данных тип информации должен быть \"Числовой (с плавающей точкой)\"."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Типы"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "НЕИЗВЕСТНО"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "ДОСТУПЕН"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (после входа в систему)"
 
@@ -14154,20 +14570,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr ""
+
+#: include/html.inc.php:112
 msgid "URL parameter cannot be array."
 msgstr "Параметр URL не может быть массивом."
 
-#: include/html.inc.php:112
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr "Параметр URL не может быть пустым."
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLы"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "США (160 символов)"
 
@@ -14175,15 +14601,11 @@ msgstr "США (160 символов)"
 msgid "USER PROFILE"
 msgstr "ПРОФИЛЬ ПОЛЬЗОВАТЕЛЯ"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukrainian (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Не удалось выбрать конфигурацию."
 
@@ -14191,7 +14613,7 @@ msgstr "Не удалось выбрать конфигурацию."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "Не удалось загрузить файл, так как \"file_uploads\" отключено."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Неподтверждено"
 
@@ -14204,20 +14626,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Неподтвержденные события ПРОБЛЕМА"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Только неподтвержденные"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Разблокировать выбранных"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Разблокировать выбранных пользователей?"
 
@@ -14226,29 +14648,29 @@ msgstr "Разблокировать выбранных пользователе
 msgid "Units"
 msgstr "Единица измерения"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14258,23 +14680,20 @@ msgstr "Неизвестно"
 msgid "Unknown action"
 msgstr "Неизвестное действие"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Неизвестный алгоритм вычисления состояния услуги"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Неизвестная функция."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Неизвестный элемент данных узла сети, такого элемента данных нет у выбранного узла сети"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Неизвестный узел сети, такого узла сети нет в системе"
 
@@ -14286,23 +14705,23 @@ msgstr "Неизвестный тип интерфейса."
 msgid "Unknown resource"
 msgstr "Неизвестный ресурс"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Неизвестный тип значения"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Отсоединить"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Отсоединить и очистить"
 
@@ -14310,61 +14729,61 @@ msgstr "Отсоединить и очистить"
 msgid "Unlink from template"
 msgstr "Отсоединить от шаблона"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Отсоединить от шаблонов"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Группа элементов данных \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Правило обнаружения \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: График \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Прототип графика \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Прототип узла сети \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Элемент данных \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Прототип элемента данных \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Триггер \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Прототип триггера \"%1$s\" от \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Отсоединено: Веб-сценарий \"%1$s\" от \"%2$s\"."
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Включить звук"
 
@@ -14378,32 +14797,43 @@ msgstr "Неподдерживаемое расширение файла имп�
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Неподдерживаемый формат импорта \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr "Неподдерживаемый параметр \"%1$s\" для прототипа группы."
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Неподдерживаемый параметр \"%2$s\" для прототипа узла сети \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr "Неподдерживаемый параметр \"%2$s\" для прототипа узла сети %1$s инвентарных данных."
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Доступно"
@@ -14414,34 +14844,34 @@ msgid "Up"
 msgstr "Доступен"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Обновить"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Обновить существующее"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Интервал обновления"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Интервал обновления (в сек)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Обновлено"
 
@@ -14449,55 +14879,55 @@ msgstr "Обновлено"
 msgid "Updated status of host"
 msgstr "Состояние узла сети обновлено"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Обновлено: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Обновлено: Группа элементов данных \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Обновлено: Правило обнаружения \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Обновлено: Прототип узла сети \"%1$s\" у \"%2$s\"."
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Обновлено: Элемент данных \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Обновлено: Прототип элемента данных \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Обновлено: Триггер \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Обновлено: Прототип триггера \"%1$s\" в \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Обновлено: Веб-сценарий \"%1$s\" в \"%2$s\"."
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -14505,14 +14935,14 @@ msgstr "Загрузить"
 msgid "Upper level maps"
 msgstr "Карты верхнего уровня"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Доступен"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14520,10 +14950,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Доступен/Недоступен"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14538,85 +14968,89 @@ msgid "Used in actions"
 msgstr "Используется в действиях"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Пользователь"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "Пользователь \"%s\" не может существовать без группы пользователей."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Пользователь добавлен"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Пользователь не может изменить тип самому себе"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Пользователь не может добавить себя в отключенную группу или в группу с отключенным доступом к Веб-интерфейсу."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Пользователь не может изменить доступ к веб-интерфейсу для себя."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Пользователь не может изменить статус для себя"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Пользователь не может изменить свое состояние."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Пользователь удален"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Группа пользователей"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Группа пользователей \"%1$s\" используется в скрипте \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "Группа пользователей \"%s\" уже существует."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14634,34 +15068,34 @@ msgstr "Группы пользователей для сообщения при
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Группы пользователей"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Пользователю не разрешается удалять самого себя."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Пользователь не может изменять доступ к GUI для самого себя путем введения в группу пользователей \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Пользователь не может изменять системный статус для самого себя путем введения в группу пользователей \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "Имя пользователя не совпадает с БД"
 
@@ -14687,243 +15121,243 @@ msgstr ""
 msgid "User sessions"
 msgstr "Сессии пользователей"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Тип пользователя"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Пользователь обновлен"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Пользователь с псевдонимом \"%s\" уже существует."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Пользователи"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Пользователи (в сети)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Разблокированные пользователи"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Значение"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Значение \"%1$s\" является недопустимым для параметра \"grid_align\". Варианты: \"%2$s\" и \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr "Значение \"%1$s\" является недопустимым для параметра \"grid_show\". Варианты: \"%2$s\" и \"%3$s\"."
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Значение \"%1$s\" является недопустимым для параметра \"grid_show\". Варианты: \"%2$s\"."
@@ -14958,11 +15392,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -15008,10 +15442,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Преобразования значений с valuemapid \"%1$s\" не существует."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Преобразование значений"
 
@@ -15020,7 +15454,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "У преобразования значений должно быть по крайней мере одно преобразование."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -15032,8 +15466,8 @@ msgstr "Значение: нет данных"
 msgid "Values"
 msgstr "Значения"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Переменные"
 
@@ -15046,64 +15480,69 @@ msgid "Verbose"
 msgstr "Подробно"
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Вертикальный"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Выравнивание по вертикали"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Вид не отображается."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Видимое имя"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Видимое имя не может быть пустым, если имя узла сети не заполнено."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Приносим свои извинения, достигнуто максимально возможное количество элементов."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Веб"
 
@@ -15111,22 +15550,24 @@ msgstr "Веб"
 msgid "Web monitoring"
 msgstr "Веб-мониторинг"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr "Веб-сценарий \"%1$s\" уже существует у узла сети \"%2$s\"."
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Веб-сценарий \"%1$s\" уже существует."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Веб-сценарий удален"
 
-#: httpconf.php:337
+#: httpconf.php:365
 #, fuzzy
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
@@ -15134,45 +15575,61 @@ msgstr[0] "Веб-сценарий деактивирован"
 msgstr[1] "Веб-сценарий деактивирован"
 msgstr[2] "Веб-сценарий деактивирован"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr "У веб-сценария отсутствуют параметры: %1$s"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr "Веб-сценарий должен иметь по крайней мере один шаг."
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr "Шаг веб-сценария \"%1$s\" уже существует."
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr "Имя шага веб-сценария должно содержать только печатаемые символы."
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr "Номер шага веб-сценария не может быть меньше 1."
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Веб-сценарии"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Ср"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -15180,9 +15637,9 @@ msgstr "Среда"
 msgid "Week"
 msgstr "Неделя"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Еженедельно"
 
@@ -15190,12 +15647,12 @@ msgstr "Еженедельно"
 msgid "When active"
 msgstr "Когда активен"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Ширина"
@@ -15205,28 +15662,28 @@ msgstr "Ширина"
 msgid "With data collection"
 msgstr "Со cбором данных"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "С последним неподтвержденным событием"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "С проблемами"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "С триггерами"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "С неподтвержденными событиями"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Без проблем"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Без триггерами"
 
@@ -15235,7 +15692,7 @@ msgid "Wizard"
 msgstr "Мастер"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15248,277 +15705,271 @@ msgstr "Рабочее время"
 msgid "Working time \"%1$s\"."
 msgstr "Рабочее время \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Запись"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Ошибочные поля для зависимости услуги \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Ошибочные поля для элемента."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Ошибочные поля для узла сети \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr "Ошибочные поля для изображения \"%1$s\"."
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr "Ошибочные поля для изображения."
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr "Ошибочные поля для удаления linktrigger."
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr "Ошибочные поля для обновления linktrigger."
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr "Ошибочные поля для linktrigger."
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Ошибочные поля для макроса \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr "Ошибочные поля для связи на карте сети."
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Ошибочные поля для способа оповещения."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr "Ошибочные поля для прокси \"%1$s\"."
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Ошибочные поля для скрипта."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Ошибочные поля для услуги \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Ошибочные поля для времени услуги \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Ошибочные поля для триггера."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Ошибочные поля для пользователя \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Ошибочный макрос \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Подпись к оси X"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "Файл XML содержит ошибку %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML файл содержит ошибки"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML файл содержит фатальную ошибку %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML файл содержит предупреждение %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Й"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "МАКС значение оси Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "МАКС значение оси Y должно быть больше чем МИН значение оси Y."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "МИН значение оси Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Расположение оси Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Подпись к оси Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "d-m-Y H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "d.M.Y H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "d.m.Y H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "d-m-Y H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Год"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Ежегодно"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Да"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Йотта"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Вы не можете выбрать некоторые языки, т.к. локали для них не установлены на вашем веб-сервере."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Вам не разрешено менять привилегии пользователя \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Вы не вошли в систему."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Вы не можете переключить узлы сети для текущего выбора."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Вы не указали узел сети для операции."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Вы не указали группу узлов сети для операции."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Вы не указали цели для команды \"%s\" в операции действия."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Вы не указали цели глобального скрипта \"%s\" в операции действия."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "У вас нет полномочий для выполнения этой операции."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "У вас нет полномочий для создания пользователей."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "У вас нет полномочий для обновления других пользователей."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "У вас нет полномочий для обновления пользователя или он не существует."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr "У вас нет полномочий для доступа к этой странице."
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Для просмотра этой страницы вы должны войти в систему."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr "Вы подключены как"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "З"
@@ -15531,7 +15982,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15550,8 +16001,8 @@ msgid "Zabbix User"
 msgstr "Zabbix Пользователь"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15577,10 +16028,11 @@ msgstr "Внутренний Zabbix"
 msgid "Zabbix internal authentication"
 msgstr "Внутренняя аутентификация Zabbix"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix сервер"
@@ -15596,7 +16048,7 @@ msgstr ""
 "1. Некорректные IP/DNS сервера в \"zabbix.conf.php\";\n"
 "2. Некорректная настройка сети.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "IP адрес или порт Zabbix сервера не установлены!"
 
@@ -15604,15 +16056,15 @@ msgstr "IP адрес или порт Zabbix сервера не установ�
 msgid "Zabbix server activity check interval"
 msgstr "Интервал проверки активности Zabbix сервера"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Инфо о Zabbix сервере"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix сервер не запущен: отображаемая информация может быть не актуальной."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix сервер запущен"
 
@@ -15621,11 +16073,11 @@ msgstr "Zabbix сервер запущен"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Интервал проверки работы Zabbix сервера составляет \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Имя сервера Zabbix"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Порт Zabbix сервера"
 
@@ -15633,25 +16085,20 @@ msgstr "Порт Zabbix сервера"
 msgid "Zabbix trapper"
 msgstr "Zabbix траппер"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Зетта"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Масштаб"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Неправильное значение дня: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Неправильное значение месяца: \"%s\" ]"
@@ -15660,19 +16107,19 @@ msgstr "[Неправильное значение месяца: \"%s\" ]"
 msgid "agent"
 msgstr "агент"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "все"
 
@@ -15680,19 +16127,15 @@ msgstr "все"
 msgid "all media"
 msgstr "все способы оповещения"
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "уже существует"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "синим"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "зеленым"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "красным"
 
@@ -15704,83 +16147,49 @@ msgstr "авто регистрация"
 msgid "auto-registered host"
 msgstr "автоматически зарегистрированный узел сети"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "сред"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "д"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "дней"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "дд"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15802,19 +16211,15 @@ msgstr "обнаруженный сервис"
 msgid "discovery"
 msgstr "обнаружение"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "динам"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "элементы"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "копировать элементы в ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from и esc_step_to должны устанавливаться одновременно."
 
@@ -15826,47 +16231,49 @@ msgstr "ровно"
 msgid "executed"
 msgstr "выполнено"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "фикс"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "найденных"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "ч"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "чч"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "узел сети"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "группа узла сети"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "иконка"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "изображение"
 
@@ -15874,7 +16281,7 @@ msgstr "изображение"
 msgid "in"
 msgstr "внутреннее"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15884,7 +16291,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr "внутренний"
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "-"
 
@@ -15892,20 +16299,20 @@ msgstr "-"
 msgid "item"
 msgstr "элемент данных"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "посл"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "содержит"
@@ -15914,12 +16321,12 @@ msgstr "содержит"
 msgid "low-level discovery rule"
 msgstr "правило низкоуровневого обнаружения"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "м"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -15928,46 +16335,46 @@ msgstr "м"
 msgid "macro(s)"
 msgstr "макрос(ы)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "обслуживании"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "карта сети"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "макс"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "мин"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "минимум 60 секунд"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "мм"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "мс"
@@ -15976,17 +16383,17 @@ msgstr "мс"
 msgid "must be a valid LDAP user"
 msgstr "должен быть действительным пользователем LDAP"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr "новый"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "нет данных"
@@ -15999,12 +16406,14 @@ msgstr "не в"
 msgid "not like"
 msgstr "не содержит"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "не запущен"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "не выбрано"
 
@@ -16013,57 +16422,61 @@ msgstr "не выбрано"
 msgid "not sent"
 msgstr "не отправлено"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "сейчас"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "из"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr "выкл"
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "в"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "другое"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "обновление каждые"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16072,25 +16485,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "запоминать выбранное"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "запущен"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "с"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "сек"
 
@@ -16103,7 +16515,7 @@ msgstr "секунд"
 msgid "sent"
 msgstr "отправлено"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "краткое описание"
 
@@ -16111,36 +16523,36 @@ msgstr "краткое описание"
 msgid "show icon mappings"
 msgstr "показать соответствия иконок"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "преобразования значений"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "до"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "триггер"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr "начните печатать здесь для поиска"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -16152,11 +16564,11 @@ msgstr "значение"
 msgid "via"
 msgstr "через"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "Г"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "гггг"
diff --git a/frontends/php/locale/sk/LC_MESSAGES/frontend.po b/frontends/php/locale/sk/LC_MESSAGES/frontend.po
index 8d0674e47e2..78c0a4de30b 100644
--- a/frontends/php/locale/sk/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/sk/LC_MESSAGES/frontend.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
-"PO-Revision-Date: 2014-03-25 05:30+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
+"PO-Revision-Date: 2014-08-17 12:32+0300\n"
 "Last-Translator: Jan <jan.garaj@gmail.com>\n"
 "Language-Team: Zabbix translation team\n"
 "Language: sk\n"
@@ -13,24 +13,26 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.5.0\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1395718225.0\n"
+"X-POOTLE-MTIME: 1408271539.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" musí byť v intervale od 1970.01.01 do 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Ukáž OK spúšťače\" musí byť nastavené na \"0\" alebo akékoľvek iné kladné celé číslo."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Blikanie spúšťača pri zmene stavu\" musí byť \"0\" alebo kladné celé číslo."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -38,20 +40,20 @@ msgstr[0] "%1$d dni"
 msgstr[1] "%1$d dní"
 msgstr[2] "%1$d dní"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
-msgstr[0] "%1$d z %2$d problému je zobrazený"
-msgstr[1] "%1$d z %2$d problémov sú zobrazené"
-msgstr[2] "%1$d z %2$d problémov sú zobrazené"
+msgstr[0] "Zobrazený %1$d z %2$d problémov"
+msgstr[1] "Zobrazené %1$d z %2$d problémov"
+msgstr[2] "Zobrazené %1$d z %2$d problémov"
 
 #: chart4.php:89 chart5.php:83
 #, c-format
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (rok %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
@@ -59,10 +61,8 @@ msgstr[0] "%1$s Položka"
 msgstr[1] "%1$s Položky"
 msgstr[2] "%1$s Položiek"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
@@ -70,7 +70,7 @@ msgstr[0] "%1$s deň"
 msgstr[1] "%1$s dni"
 msgstr[2] "%1$s dní"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -87,7 +87,7 @@ msgstr[0] "ostáva %1$s pokus"
 msgstr[1] "ostávajú %1$s pokusy"
 msgstr[2] "ostáva %1$s pokusov"
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -111,23 +111,23 @@ msgstr[0] "%d zariadenie"
 msgstr[1] "%d zariadenia"
 msgstr[2] "%d zariadení"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - donekonečna)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Skupiny môžu vytvárať iba super administrátori)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(v dňoch)"
 
@@ -135,34 +135,34 @@ msgstr "(v dňoch)"
 msgid "(in sec)"
 msgstr "(v sek)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimálne 60 sekúnd, 0 - predvolená hodnota pre akciu)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(bez proxy)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr "(s varovaniami)"
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[HROMADNÉ POTVRDENIE]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 alebo 1"
 
@@ -178,7 +178,7 @@ msgstr "10 sekúnd"
 msgid "30 seconds"
 msgstr "30 sekúnd"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D pohľad"
 
@@ -194,7 +194,7 @@ msgstr "5 sekúnd"
 msgid "500 latest values"
 msgstr "500 posledných hodnôt"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Sub-menu/Sub-menu.../>Skript"
 
@@ -213,12 +213,11 @@ msgstr "LOG AKCIÍ"
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "POTVRDENIE ALARMOV"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "A"
 
@@ -230,19 +229,19 @@ msgstr "AUDIT LOG"
 msgid "AVAILABILITY REPORT"
 msgstr "REPORT DOSTUPNOSTI"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Absolútny rozdiel medzi poslednou a predchádzajúcou hodnotou je < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Absolútny rozdiel medzi poslednou a predchádzajúcou hodnotou je = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Absolútny rozdiel medzi poslednou a predchádzajúcou hodnotou je > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Absolútny rozdiel medzi poslednou a predchádzajúcou hodnotou NIE JE N"
 
@@ -254,42 +253,42 @@ msgstr "Akceptovateľná SLA"
 msgid "Access denied!"
 msgstr "Prístup zamietnutý!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Prístup zamietnutý."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Konto je zablokované na %s sekúnd"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Potvrdenie"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Potvrdiť"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Potvrdenie pridané"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Potvrdiť alarm od"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Potvrdiť a návrat"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Stav potvrdenia"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Potvrdenie"
 
@@ -314,63 +313,66 @@ msgstr "Potvrdzovanie vypnuté"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Akcia"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Akcia \"%1$s\" už existuje."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "Akcia \"%1$s\" má nesprávnu hodnotu pre \"esc_period\" (minimum %2$s sekúnd)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Pre akciu \"%1$s\" nie je definovaná operácia."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Akcia bola pridaná"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Akcia bola zmazaná"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] "Akcia vypnutá"
 msgstr[1] "Akcie vypnuté"
 msgstr[2] "Akcie vypnuté"
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] "Akcia povolená"
@@ -384,21 +386,21 @@ msgstr[2] "Akcie povolené"
 msgid "Action log"
 msgstr "Log akcií"
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Operácie akcie"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Akcia bola aktualizovaná"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Akcie"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktívny"
@@ -408,80 +410,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Aktívny"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Aktívny od"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Aktívny do"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Pridať"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr "Pridať potomka"
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Pridať komentár od"
 
@@ -497,27 +502,23 @@ msgstr "Pridať hosta"
 msgid "Add link"
 msgstr "Pridať linku"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Pridať chýbajuce"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Pridať novú alebo existujúcu aplikáciu"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Pridať novú alebo existujúcu skupinu zariadení"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Pridať prototyp"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Pridať do"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Pridať do obľúbených"
@@ -526,19 +527,19 @@ msgstr "Pridať do obľúbených"
 msgid "Add to host group"
 msgstr "Pridať do skupiny"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Pridať do skupín"
 
 #: auditlogs.php:128
 msgid "Added"
-msgstr "Pridané"
+msgstr "Pridanie"
 
 #: include/hosts.inc.php:69
 msgid "Admin"
 msgstr "Administrátor"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Administrácia"
 
@@ -546,34 +547,34 @@ msgstr "Administrácia"
 msgid "Advanced labels"
 msgstr "Rozšírené poznámky"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Trvanie"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Trvanie menšie ako"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "Trvanie menšie ako %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Agent"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr "Agentovo hostovo meno je definované v konfiguračnom súbore. Hodnota reťazca."
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Rozhrania agenta"
@@ -582,12 +583,12 @@ msgstr "Rozhrania agenta"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Agent alebo SNMP alebo JMX alebo IPMI rozhranie"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr "Agregované kontroly nevyžadujú spustenie agenta na monitorovanom hostovi. Zabbix server zhromažďuje agregované informácie priamymi databázovými dotazmi. Pozri Zabbix manuál."
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -595,123 +596,126 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr "Zarovnať ikonky"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Všetky"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Všetky skupiny"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Všetky linky by mali mať zadefinované \"Meno\" a \"URL\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Povolené hosty"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr "Veľkosť pamäte v bytoch. Ak mode chýba, je použitý total."
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr "A"
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr "A/Alebo"
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Akékoľvek"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Obsahuje ktorýkoľvek reťazec"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Aplikácia"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Aplikácia \"%1$s\" už existuje."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Aplikácia bola pridaná"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Aplikácia bola zmazaná"
 msgstr[1] "Aplikácia bola zmazaná"
 msgstr[2] "Aplikácia bola zmazaná"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Chyba aplikácie."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Aplikácia bola aktualizovaná"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Aplikácia s ID \"%1$s\" nie je na \"%2$s\" dostupná."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Aplikácie"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Použiť"
 
@@ -720,16 +724,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Budúca"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Apr"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Apríl"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Ste si istý, že chcete spustiť túto akciu?"
 
@@ -745,9 +749,9 @@ msgstr "Veľkosť plochy"
 msgid "Area type"
 msgstr "Typ plochy"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -761,22 +765,17 @@ msgstr "Ako obyčajný text"
 msgid "Asset tag"
 msgstr "Inventárne číslo"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "V %1$s:%2$s na %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "V %1$s:%2$s na %3$s %4$s každý %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "V %1$s:%2$s dňa %3$s každý %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
@@ -784,7 +783,7 @@ msgstr[0] "O %1$s:%2$s každý %3$s každý týždeň"
 msgstr[1] "O %1$s:%2$s každý %3$s každý %4$s týždeň"
 msgstr[2] "O %1$s:%2$s každý %3$s každý %4$s týždeň"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
@@ -792,23 +791,25 @@ msgstr[0] "O %1$s:%2$s každý deň"
 msgstr[1] "O %1$s:%2$s každý %3$s deň"
 msgstr[2] "O %1$s:%2$s každý %3$s deň"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "O (hodina:minúta)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Minimálne jeden host alebo skupina musia byť označené."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Minimálne jedna plánovaná odstávka musí byť vytvorená."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr "Najmenej jedna databáza z MySQL, PostgreSQL, Oracle, SQLite3 alebo IBM DB2 by mala byť podporovaná."
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Audit"
@@ -828,26 +829,28 @@ msgstr "Perióda uloženia audit údajov (v dňoch) \"%1$s\"."
 msgid "Audit log"
 msgstr "Audit log"
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Aug"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "August"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Autentifikácia"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Autentifikačný algoritmus"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -906,9 +909,9 @@ msgstr "Perióda uloženia auto-registračných údajov udalostí a poplachov"
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr "Perióda uloženia auto-registračných údajov udalostí a poplachov (v dňoch) \"%1$s\"."
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -916,20 +919,20 @@ msgstr "Automaticky"
 msgid "Automatic icon mapping"
 msgstr "Automatické mapovanie ikoniek"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Automatický výber ikoniek"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Dostupnosť"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Report dostupnosti"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Dostupný"
 
@@ -938,36 +941,36 @@ msgstr "Dostupný"
 msgid "Average"
 msgstr "Priemerná"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Priemer za"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Priemerná hodnota za čas T je < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Priemerná hodnota za čas T je = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Priemerná hodnota za čas T je > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Priemerná hodnota za čas T NIE JE N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Umiestnenie osi"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Pozadie"
@@ -976,7 +979,7 @@ msgstr "Pozadie"
 msgid "Background image"
 msgstr "Obrázok pozadia"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Stĺpcové grafy"
 
@@ -986,8 +989,8 @@ msgid "Base DN"
 msgstr "Koreňový DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Základné prihlasovanie"
+msgid "Basic"
+msgstr "Zakladná"
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -999,15 +1002,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind heslo"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Bitové A poslednej hodnoty T a maska je = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Bitové A poslednej hodnoty T a maska NIE JE N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Čierna a modrá"
 
@@ -1019,8 +1022,8 @@ msgstr "Blikajúci"
 msgid "Blocked"
 msgstr "Blokovaný"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Hrubá čiara"
 
@@ -1028,22 +1031,22 @@ msgstr "Hrubá čiara"
 msgid "Boolean"
 msgstr "Logická hodnota"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Dole"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Zosvetliť"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Bulharsky (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Hromadné potvrdenie"
 
@@ -1069,7 +1072,7 @@ msgstr "NASTAVENIE APLIKÁCIÍ"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "NASTAVENIE PRIHLASOVANIA"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1099,7 +1102,7 @@ msgstr "NASTAVENIE SKUPÍN HOSTOV"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "NASTAVENIE PROTOTYPOV HOSTOV"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "NASTAVENIE HOSTOV"
 
@@ -1111,7 +1114,7 @@ msgstr "NASTAVENIE ÚDRŽBY"
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "NASTAVENIE MAPOVANIA IKON"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "NASTAVENIE OBRÁZKOV"
 
@@ -1120,14 +1123,14 @@ msgstr "NASTAVENIE OBRÁZKOV"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "NASTAVENIE IT SLUŽIEB"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "NASTAVENIE PROTOTYPOV POLOŽIEK"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "NASTAVENIE POLOŽIEK"
 
@@ -1156,7 +1159,7 @@ msgstr "NASTAVENIE SIEŤOVÝCH MÁP"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "NASTAVENIE PROXY"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "NASTAVENIE REGULÁRNYCH VÝRAZOV"
 
@@ -1176,7 +1179,7 @@ msgstr "NASTAVENIE SKRIPTOV"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "NASTAVENIE PREZENTÁCIÍ"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "NASTAVENIE ŠABLÓN"
 
@@ -1192,7 +1195,7 @@ msgstr "NASTAVENIE ZÁVAŽNOSTÍ SPÚŠŤAČOV"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "NASTAVENIE SPÚŠŤAČOV"
 
@@ -1224,22 +1227,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "NASTAVENIE ZABBIXU"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr "CPU informácie - zoznam úplných informácií všetkých CPU"
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr "Vyťaženie CPU. Vyťaženie procesora. cpu a mode sú nepovinné. Ak cpu chýba, je použité all. Ak mode chýba, je použité avg1. Poznámka: nie je to v percentách."
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
-msgstr "Využitie CPU. Vyťaženie procesora v percentách. cpu, type a mode sú nepovinné. Ak cpu chýba, je použité all. Ak type chýba, je použité user. Ak mode chýba, je použité avg1."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
+msgstr "Využitie CPU. Využitie procesora v percentách. cpu, type a mode sú voliteľné. Ak cpu chýba, je použité all. Ak type chýba, je použitý user. Ak mode chýba, je použité avg1."
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr "Vypočíta MD5 kontrolný súčet súboru. Reťazec MD5 hash súboru. Môže byť použitý len na súbory menšie ako 64MB. Príklad: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 
@@ -1248,21 +1251,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Výpočet SLA, akceptovateľná SLA (v %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr "Vypočíta kontrolný súčet súboru. Kontrolný súčet súboru je vypočítaný štandardným algoritmom používaným UNIX programom cksum. Príklad: vfs.file.cksum[/etc/passwd]"
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
-msgstr "Vypočíta priestor diskového oddielu. Priestor je v KB. Ak mode chýba, je použitý total. V prípade pripojeného oddielu je vypočítané nepoužité miesto súborového systému. Príklad: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+msgstr "Vypočíta veľkosť diskového priestoru daného diskového oddielu. Veľkosť je v KB. Ak mode chýba, je použitý total. V prípade pripojeného oddielu je vrátená veľkosť voľného priestoru. Príklad: vfs.fs.size[/tmp,free]."
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Vypočítaná"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Vypočítané práva"
 
@@ -1270,92 +1273,95 @@ msgstr "Vypočítané práva"
 msgid "Callback"
 msgstr "Callback úroveň"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Kanada (136 znakov)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Nie je možné potvrdiť udalosť"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Nie je možné pridať nečíselnú položku \"%1$s\" do grafu \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Nie je možné pridať nečíselnú položku \"%1$s\" k prototypu grafu \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Nie je možné pridať nečíslenú položku \"%1$s\"."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Nie je možné pridať akciu"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Nie je možné pridať podmienku akcie"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Nie je možné pridať aplikáciu"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Šablóna nemôže závisieť na hostovi."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Nie je možné pridať závislosť zo spúšťača \"%1$s:%2$s\" pre neexistujúci spúšťač \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Nie je možné pridať pravidlo pre pátrača"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Nie je možné pridať graf"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr "Nie je možné pridať prototyp grafu"
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Nie je možné pridať skupinu"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr "Nie je možné pridať skupinu."
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Nie je možné pridať host"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Nie je možné pridať prototyp hosta"
 
@@ -1363,24 +1369,24 @@ msgstr "Nie je možné pridať prototyp hosta"
 msgid "Cannot add image"
 msgstr "Nie je možné pridať obrázok"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Nie je možné pridať obrázok."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Nie je možné pridať položku"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Nie je možné pridať položku \"%1$s\" z \"%2$s\" k aplikácii \"%3$s\" z \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr "Nie je možné pridať prototyp položky"
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Nie je možné pridať položky."
 
@@ -1388,20 +1394,20 @@ msgstr "Nie je možné pridať položky."
 msgid "Cannot add macro."
 msgstr "Nie je možné pridať makro."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Nie je možné pridať plánovanú odstávku"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Nie je možné pridať tento typ média"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Nie je možné pridať viac než jednu položku typu \"Súhrn grafu\" k prototypu grafu \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "Nie je možné pridať viac ako jednu položku \"Súhrn grafu\" k prototypu grafu \"%1$s\"."
@@ -1410,24 +1416,24 @@ msgstr "Nie je možné pridať viac ako jednu položku \"Súhrn grafu\" k protot
 msgid "Cannot add network map"
 msgstr "Nie je možné pridať mapu siete"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Nie je možné pridať novú aplikáciu \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Nie je možné pridať proxy"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Nie je možné pridať regulárny výraz"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Nie je možné pridať obrazovku"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Nie je možné pridať skript"
 
@@ -1439,27 +1445,27 @@ msgstr "Nie je možné pridať službu"
 msgid "Cannot add slide show"
 msgstr "Nie je možné pridať prezentáciu"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Nie je možné pridať šablónu"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Nie je možné pridať spúšťač"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr "Nie je možné pridať prototyp spúšťača"
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Nie je možné pridať používateľa"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Nie je možné pridať používateľa. Obe heslá musia byť rovnaké."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Nie je možné pridávať používateľov."
 
@@ -1467,7 +1473,7 @@ msgstr "Nie je možné pridávať používateľov."
 msgid "Cannot add value map"
 msgstr "Nie je možné pridať mapu hodnôt"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Nie je možné pridať scenár"
 
@@ -1487,23 +1493,23 @@ msgstr "Nie je možné zmeniť metódu prihlasovania na LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Nie je možné zmeniť metódu prihlasovania na Zabbix-internal"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Nie je možné zmazať históriu"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Nie je možné klonovať prototypy grafov."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Nie je možné klonovať prototypy hostov."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Nie je možné klonovať prototypy položiek."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Nie je možné klonovať prototypy spúšťačov."
 
@@ -1511,20 +1517,20 @@ msgstr "Nie je možné klonovať prototypy spúšťačov."
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Pripojenie na trapper port Zabbix servera zlyhalo. Pre spustenie skriptu musí byť port dostupný."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Nie je možné kopírovať grafy"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Nie je možné skopírovať položky"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Nie je možné skopírovať spúšťač \"%1$s:%2$s\", pretože jeho definícia obsahuje viac hostov."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "Nie je možné vytvoriť prototyp grafu pre zisteného hosta \"%1$s\"."
@@ -1533,19 +1539,19 @@ msgstr "Nie je možné vytvoriť prototyp grafu pre zisteného hosta \"%1$s\"."
 msgid "Cannot create another database connection."
 msgstr "Nie je možné otvoriť ďalšie pripojenie k databáze."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Nie je možné vytvoriť zacyklené závislosti."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Nie je možné vytvoriť závislosť spúšťača na sebe samom."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Nie je možné vytvoriť pravidlo zisťovania"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Nie je možné vytvoriť skupinu hostov."
 
@@ -1553,102 +1559,102 @@ msgstr "Nie je možné vytvoriť skupinu hostov."
 msgid "Cannot create icon map"
 msgstr "Nie je možné vytvoriť mapu ikon"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Nie je možné vytvoriť mapu ikon s rovnakým menom \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Nie je možné vytvoriť mapu \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Nie je možné vytvoriť novú aplikáciu, web scenár je už priradený k aplikácii."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Nie je možné vytvoriť nový prvok"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Nie možné vytvoriť obrazovku."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr "Nie je možné vytvoriť šablónu."
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Nie je možné zmazať interného Zabbix používateľa \"%1$s\", skúste ho vypnúť."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Nie je možné zmazať akciu"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Nie je možné zmazať aplikáciu"
 msgstr[1] "Nie je možné zmazať aplikáciu"
 msgstr[2] "Nie je možné zmazať aplikáciu"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Nie je možné zmazať závislosť"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Nie je možné zmazať zisťovacie pravidlo"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Nie je možné zmazať zisťovacie pravidlá"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Nie je možné zmazať graf"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Nie je možné zmazať prototyp grafu"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr "Nie je možné zmazať prototypy grafov"
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Nie je možné zmazať graf."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Nie je možné zmazať grafy"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Nie je možné zmazať grafy vytvorené nízkourovňovým zisťovaním."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
 msgid "Cannot delete group"
-msgstr "Nie je možné zmazať skupinu"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Nie je možné zmazať skupinu"
+msgstr[1] "Nie je možné zmazať skupinu"
+msgstr[2] "Nie je možné zmazať skupinu"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Nie je možné zmazať hosta"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Nie je možné zmazať skupinu hostov."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Nie je možné zmazať prototyp hosta."
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Nie je možné zmazať prototypy hosta"
 
@@ -1656,80 +1662,80 @@ msgstr "Nie je možné zmazať prototypy hosta"
 msgid "Cannot delete icon map"
 msgstr "Nie je možné zmazať mapu ikon"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Nie je možné zmazať obrázok"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Nie je možné zmazať inventár."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Nie je možné zmazať položku"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr "Nie je možné zmazať prototyp položky"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr "Nie je možné zmazať prototypy položiek"
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Nie je možné zmazať položky"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Nie je možné zmazať položky vytvorené nízkoúrovňovým zisťovaním."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Nie je možné zmazať plánovanú odstávku"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Nie je možné zmazať typ média"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Nie je možné zmazať mapu siete"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Nie je možné zmazať proxy"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Nie je možné zmazať regulárny výraz"
 msgstr[1] "Nie je možné zmazať regulárne výrazy"
 msgstr[2] "Nie je možné zmazať regulárne výrazy"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Nie je možné zmazať obrazovku"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Nie je možné zmazať skript"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Nie je možné zmazať skripty. Parameter \"scriptids\" je prázdny."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Nie je možné zmazať skripty. Skript \"%1$s\" sa používa v operácii akcie \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Nie je možné zmazať skripty. Skript so scriptid \"%1$s\" neexistuje."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Nie je možné zmazať označené akcie"
 
@@ -1737,78 +1743,81 @@ msgstr "Nie je možné zmazať označené akcie"
 msgid "Cannot delete service"
 msgstr "Nie je možné zmazať službu"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Nie je možné zmazať prezentáciu"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Nie je možné zmazať šablónu"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Nie je možné zmazať aplikáciu patriacu šablóne."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Nie je možné zmazať grafy patriace šablóne."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Nie je možné zmazať prototyp hosta patriaci šablóne."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Nie je možné zmazať položku patriacu šablóne."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Nie je možné zmazať položky patriace šablóne"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Nie je možné zmazať položky patriace šablóne."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Nie je možné zmazať spúšťač \"%1$s:%2$s\" patriaci šablóne."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Nie je možné zmazať web scenár \"%1$s\" patriaci šablóne."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Nie je možné zmazať spúštač"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Nie je možné zmazať prototyp spúšťača"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr "Nie je možné zmazať prototypy spúšťačov"
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Nie je možné zmazať spúšťač."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Nie je možné zmazať spúšťače"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Nie je možné zmazať spúštače vytvorené nízkoúrovňovným zisťovaním."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Nie je možné zmazať používateľa"
 
 # užívateľ!=používateľ
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Nie je možné zmazať médium používateľa."
 
@@ -1816,88 +1825,88 @@ msgstr "Nie je možné zmazať médium používateľa."
 msgid "Cannot delete value map"
 msgstr "Nie je možné zmazať mapu hodnôt"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Nie je možné zmazať web scenár"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] "Nie je možné vypnúť akciu"
 msgstr[1] "Nie je možné vypnúť akcie"
 msgstr[2] "Nie je možné vypnúť akcie"
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] "Nie je možné vypnúť zisťovacie pravidlo"
 msgstr[1] "Nie je možné vypnúť zisťovacie pravidlá"
 msgstr[2] "Nie je možné vypnúť zisťovacie pravidlá"
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] "Nie je možné vypnúť zisťovacie pravidlá"
 msgstr[1] "Nie je možné vypnúť zisťovacie pravidlá"
 msgstr[2] "Nie je možné vypnúť zisťovacie pravidlá"
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "Nie je možné vypnúť hosta"
 msgstr[1] "Nie je možné vypnúť hostov"
 msgstr[2] "Nie je možné vypnúť hostov"
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] "Nie je možné vypnúť prototyp hosta"
 msgstr[1] "Nie je možné vypnúť prototypy hosta"
 msgstr[2] "Nie je možné vypnúť prototypy hosta"
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Nie je možné vypnúť položku"
 msgstr[1] "Nie je možné vypnúť položky"
 msgstr[2] "Nie je možné vypnúť položky"
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] "Nie je možné vypnúť prototyp položky"
 msgstr[1] "Nie je možné vypnúť prototypy položky"
 msgstr[2] "Nie je možné vypnúť prototypy položky"
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "Nie je možné zakázať typ média"
 msgstr[1] "Nie je možné zakázať typ média"
 msgstr[2] "Nie je možné zakázať typ média"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "Nie je možné vypnúť spúšťač"
 msgstr[1] "Nie je možné vypnúť spúšťače"
 msgstr[2] "Nie je možné vypnúť spúšťače"
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] "Nie je možné vypnúť prototyp spúšťača"
 msgstr[1] "Nie je možné vypnúť prototypy spúšťača"
 msgstr[2] "Nie je možné vypnúť prototypy spúšťača"
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] "Nie je možné vypnúť používateľskú skupinu"
 msgstr[1] "Nie je možné vypnúť používateľské skupiny"
 msgstr[2] "Nie je možné vypnúť používateľské skupiny"
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Nie je možné zakázať web scenár"
@@ -1912,146 +1921,140 @@ msgstr "Nie je možné zobraziť frontu položiek."
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "Nie je možné zobraziť viac ako jednu položku s typom \"Súhrn grafu\"."
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] "Nie je možné vypnúť akciu"
 msgstr[1] "Nie je možné vypnúť akcie"
 msgstr[2] "Nie je možné vypnúť akcie"
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] "Nie je možné povoliť zisťovacie pravidlo"
 msgstr[1] "Nie je možné povoliť zisťovacie pravidlá"
 msgstr[2] "Nie je možné povoliť zisťovacie pravidlá"
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] "Nie je možné povoliť zisťovacie pravidlá"
 msgstr[1] "Nie je možné povoliť zisťovacie pravidlá"
 msgstr[2] "Nie je možné povoliť zisťovacie pravidlá"
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "Nie je možné povoliť hosta"
 msgstr[1] "Nie je možné povoliť hostov"
 msgstr[2] "Nie je možné povoliť hostov"
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] "Nie je možné povoliť prototyp hosta"
 msgstr[1] "Nie je možné povoliť prototypy hosta"
 msgstr[2] "Nie je možné povoliť prototypy hosta"
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Nie je možné povoliť položku"
 msgstr[1] "Nie je možné povoliť položky"
 msgstr[2] "Nie je možné povoliť položky"
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] "Nie je možné povoliť prototyp položky"
 msgstr[1] "Nie je možné povoliť prototypy položky"
 msgstr[2] "Nie je možné povoliť prototypy položky"
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "Nie je možné povoliť typ média"
 msgstr[1] "Nie je možné povoliť typ média"
 msgstr[2] "Nie je možné povoliť typ média"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "Nie je možné povoliť spúšťač"
 msgstr[1] "Nie je možné povoliť spúšťače"
 msgstr[2] "Nie je možné povoliť spúšťače"
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] "Nie je možné povoliť prototyp spúšťača"
 msgstr[1] "Nie je možné povoliť prototypy spúšťača"
 msgstr[2] "Nie je možné povoliť prototypy spúšťača"
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] "Nie je možné povoliť používateľskú skupinu"
 msgstr[1] "Nie je možné povoliť používateľské skupiny"
 msgstr[2] "Nie je možné povoliť používateľské skupiny"
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Nie je možné povoliť scenár"
 msgstr[1] "Nie je možné povoliť scenáre"
 msgstr[2] "Nie je možné povoliť scenáre"
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Obrázok pozadia \"%1$s\" použitý v mape \"%2$s\" nebol nájdený."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Graf \"%1$s\" použitý v obrazovke \"%2$s\" nebol nájdený."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Skupina \"%1$s\" použitá v mape \"%2$s\" nebola nájdená."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Skupina \"%1$s\" použitá v obrazovke \"%2$s\" nebola nájdená."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Host \"%1$s\" použitý v mape \"%2$s\" nebol nájdený."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Host \"%1$s\" použitý v obrazovke \"%2$s\" nebol nájdený."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nemôžem nájsť skupinu \"%1$s\" pre prototyp hosta \"%2$s\" zisťovacieho pravidla \"%3$s\" na \"%4$s\"."
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Nemôžem nájsť hostiteľské rozhranie na \"%1$s\" pre kľúč položky \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr "Nemôžem nájsť hosta alebo šablónu \"%1$s\" použitú v grafe \"%2$s\"."
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2062,34 +2065,53 @@ msgstr "Ikona \"%1$s\" použitá v mape \"%2$s\" nebola nájdená."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Mapa ikon \"%1$s\" použitá v mape \"%2$s\" nebola nájdená."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph \"%3$s\"."
 msgstr "Nemôžem nájsť položku \"%1$s\" na \"%2$s\" použitú ako maximálna hodnota Y osi grafu \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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 "Nemôžem nájsť položku \"%1$s\" na \"%2$s\" použitú ako maximálna hodnota Y osi prototypu grafu \"%3$s\" zisťovacieho pravidla \"%4$s\" na \"%5$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, c-format
 msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph \"%3$s\"."
 msgstr "Nemôžem nájsť položku \"%1$s\" na \"%2$s\" použitú ako minimálna hodnota Y osi grafu \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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 "Nemôžem nájsť položku \"%1$s\" na \"%2$s\" použitú ako minimálna hodnota Y osi prototypu grafu \"%3$s\" zisťovacieho pravidla \"%4$s\" na \"%5$s\"."
 
-#: include/classes/import/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr "Nemôžem nájsť položku \"%1$s\" na \"%2$s\" použitú v grafe \"%3$s\"."
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 "Nemôžem nájsť položku \"%1$s\" na \"%2$s\" použitú v prototype grafu \"%3$s\" zisťovacieho pravidla \"%4$s\" na \"%5$s\"."
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr "Nemôžem nájsť položku \"%1$s\" na \"%2$s\" použitú v spúšťači \"%3$s\"."
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr "Nemôžem nájsť položku \"%1$s\" na \"%2$s\" použitú v prototype spúšťača \"%3$s\" zisťovacieho pravidla \"%4$s\" na \"%5$s\"."
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Položka \"%1$s\" použitá v obrazovke \"%2$s\" nebola nájdená."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Položka \"%1$s\" použitá v exportovanej mape \"%2$s\" nebola nájdená."
@@ -2099,41 +2121,41 @@ msgstr "Položka \"%1$s\" použitá v exportovanej mape \"%2$s\" nebola nájden�
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Mapa \"%1$s\" použitá v mape \"%2$s\" nebola nájdená."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Mapa \"%1$s\" použitá v obrazovke \"%2$s\" nebola nájdená."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Nemôžem nájsť objekt s menom"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Obrazovka \"%1$s\" použitá v obrazovke \"%2$s\" nebola nájdená."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nemôžem nájsť šablónu \"%1$s\" pre prototyp hosta \"%2$s\" zisťovacieho pravidla \"%3$s\" na \"%4$s\"."
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Spúšťač \"%1$s\" použitý v mape \"%2$s\" nebol nájdený."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr "Nemôžem nájsť mapu hodnôt \"%1$s\" použitú pre položku \"%2$s\" na \"%3$s\"."
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nemôžem nájsť mapu hodnôt \"%1$s\" použitú pre prototyp položky \"%2$s\" zisťovacieho pravidla \"%3$s\" na \"%4$s\"."
@@ -2146,12 +2168,14 @@ msgstr "Nemôžem formátovať strom. Skontrolujte logickú štruktúru v servis
 msgid "Cannot format tree."
 msgstr "Nemôžem formátovať strom."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr "Nie je možné mať prázdne zobrazované meno šablóny."
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Nie je možné spracovať výraz \"%s\"."
@@ -2164,7 +2188,7 @@ msgstr[0] "Nie je možné importovať obrazovku \"%1$s\": subobrazovka \"%2$s\"
 msgstr[1] "Nie je možné importovať obrazovku \"%1$s\": subobrazovky \"%2$s\" neexistujú."
 msgstr[2] "Nie je možné importovať obrazovku \"%1$s\": subobrazovky \"%2$s\" neexistujú."
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
@@ -2172,52 +2196,53 @@ msgstr[0] "Nie je možné importovať šablónu \"%1$s\", prepojená šablóna \
 msgstr[1] "Nie je možné importovať šablónu \"%1$s\", prepojené šablóny \"%2$s\" neexistujú."
 msgstr[2] "Nie je možné importovať šablónu \"%1$s\", prepojené šablóny \"%2$s\" neexistujú."
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Nie je možné vložiť view súbor \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr "Nie je možné vložiť výraz spúšťača"
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Nie je možné vložiť médium používateľa."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Nie je možné nalinkovať šablónu"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr "Nie je možné nalinkovať šablónu."
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr "Nie je možné Vás prihlásiť."
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Odhlásenie nie je možné."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Nie je možné hromadne aktualizovať meno hosta."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr "Nie je možné hromadne aktualizovať meno šablóny."
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Nie je možné hromadne aktualizovať zobrazované meno hosta."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr "Nie je možné hromadne aktualizovať zobrazované meno šablóny."
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Nie je možné vykonať viacnásobné linkovanie šablón s ID: %s."
@@ -2237,7 +2262,7 @@ msgstr "Nie je možné vykonať update príkaz nad tabuľkou \"%1$s\" bez hodnô
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Nie je možné vykonať update príkaz nad tabuľkou \"%1$s\" bez where podmienky."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr "Nie je možné spracovať aplikácie z rôznych hostov alebo šablón."
 
@@ -2246,11 +2271,11 @@ msgstr "Nie je možné spracovať aplikácie z rôznych hostov alebo šablón."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Nie je možné čítať odpoveď, skontrolujte spojenie so Zabbix serverom \"%1$s\"."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "Nie je možné zmazať všetky položky, najmenej jedna musí ostať."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr "Nie je možné zmazať skupinu."
 
@@ -2258,11 +2283,11 @@ msgstr "Nie je možné zmazať skupinu."
 msgid "Cannot remove macro."
 msgstr "Nie je možné zmazať makro."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Nie je možné premenovať používateľa guest."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Nie je možné uložiť zisťovacie pravidlo bez kontroly."
 
@@ -2271,217 +2296,226 @@ msgstr "Nie je možné uložiť zisťovacie pravidlo bez kontroly."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Nie je možné poslať príkaz, skontrolujte spojenie so Zabbix serverom \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "Nie je možné nastaviť \"%1$s\" pre položku \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "Nie je možné nastaviť \"%1$s\" pre spúšťač \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Nie je možné nastaviť \"templateid\" pre aplikáciu \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Nie je možné nastaviť \"templateid\" pre obrazovku \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Nie je možné nastaviť \"templateid\" pre prototyp spúšťača \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "Nie je možné nastaviť inventárne polia pre zakázaný inventár."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Nie je môžné prepnúť hosta pre interface."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Nie je možné odblokovať používateľov"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Nie je možné zrušiť prepojenie a zmazať web scenár."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "Nie je možné zrušiť prepojenie a zmazať aplikácie."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Nie je možné zrušiť prepojenie a zmazať zisťovacie pravidlá"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Nie je možné zrušiť prepojenie a zmazať grafové prototypy"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Nie je možné zrušiť prepojenie a zmazať grafy."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Nie je možné zrušiť prepojenie a zmazať položkové prototypy"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Nie je možné zrušiť prepojenie a zmazať položky"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Nie je možné zrušiť prepojenie a zmazať spúšťače"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Nie je možné zrušiť prepojenie šablóny"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr "Nie je možné zrušiť prepojenie šablóny."
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Nie je možné zrušiť prepojenie spúšťača \"%s\", pretože obsahuje položky zo šablóny, ktorá je prepojená s hostom."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr "Nie je možné aktualizovať \"%1$s\" pre zisteného hosta."
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Nie je možné aktualizovať \"%1$s\" pre zistenú položku."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Nie je možné aktualizovať \"%1$s\" pre zistený spúšťač."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr "Nie je možné aktualizovať \"%1$s\" pre akciu \"%2$s\"."
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Nie je možné aktualizovať \"%1$s\" pre položku \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Nie je možné aktualizovať \"%1$s\" pre spúšťač \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr "Nie je možné aktualizovať \"imagetype\" pre obrázok \"%1$s\"."
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Nie je možné aktualizovať \"templateid\" pre aplikáciu \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Nie je možné aktualizovať \"templateid\" pre graf \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Nie je možné aktualizovať \"templateid\" pre prototyp grafu \"%1$s\"."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Nie je možné aktualizovať \"templateid\" pre obrazovku \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr "Nie je možné aktualizovať \"templateid\" pre šablónu obrazovky \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Nie je možné aktualizovať \"templateid\" pre prototyp spúšťača \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Nie je možné aktualizovať zistený graf."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Nie je možné aktualizovať zistenú skupinu hostov."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Nie je možné aktualizovať akciu"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Nie je možné aktualizovať aplikáciu"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Nie je možné aktualizovať komentár"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Nie je možné aktualizovať nastavenia"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Nie je možné aktualizovať nastavenia ladiaceho módu"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr "Nie je možné aktualizovať poznámku"
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Nie je možné aktualizovať zisťovacie pravidlo"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Nie je možné aktualizovať frontend prístup"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Nie je možné aktualizovať graf"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr "Nie je možné aktualizovať prototyp grafu"
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Nie je možné aktualizovať skupinu"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Nie je možné aktualizovať skupinu."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Nie je možné aktualizovať skupiny pre zisteného hosta \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Nie je možné aktualizovať hosta"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Nie je možné aktualizovať prototyp hosta"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Nie je možné aktualizovať hostov"
 
@@ -2493,24 +2527,24 @@ msgstr "Nie je možné aktualizovať mapu ikon"
 msgid "Cannot update image"
 msgstr "Nie je možné aktualizovať obrázok"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Nie je možné aktualizovať obrázok."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Nie je možné aktualizovať rozhranie pre zisteného hosta \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Nie je možné aktualizovať prototyp položky"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr "Nie je možné aktualizovať prototyp položky"
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Nie je možné aktualizovať položky"
 
@@ -2522,16 +2556,16 @@ msgstr "Nie je možné aktualizovať makro."
 msgid "Cannot update macros"
 msgstr "Nie je možné aktualizovať makrá"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Nie je možné aktualizovať údržbu"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Nie je možné aktualizovať mapu \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Nie je možné aktualizovať typ média"
 
@@ -2539,28 +2573,24 @@ msgstr "Nie je možné aktualizovať typ média"
 msgid "Cannot update network map"
 msgstr "Nie je možné aktualizovať mapu siete"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Nie je možné aktualizovať proxy"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Nie je možné aktualizovať proxy pre zisteného hosta \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Nie je možné aktualizovať regulárny výraz"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Nie je možné aktualizovať obrazovku"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Nie je možné aktualizovať obrazovku."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Nie je možné aktualizovať skript"
 
@@ -2572,40 +2602,41 @@ msgstr "Nie je možné aktualizovať službu"
 msgid "Cannot update slide show"
 msgstr "Nie je možné aktualizovať prezentáciu"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Nie je možné aktualizovať šablónu"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Nie je možné aktualizovať aplikácie patriace šablóne."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr "Nie je možné aktualizovať šablóny pre zisteného hosta \"%1$s\"."
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Nie je možné aktualizovať spúšťač"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr "Nie je možné aktualizovať prototyp spúšťača"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr "Nie je možné aktualizovať prototypy spúšťačov"
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Nie je možné aktualizovať používateľa"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Nie je možné aktualizovať médiá používateľa."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Nie je možné aktualizovať používateľa. Heslá musia byť rovnaké."
 
@@ -2613,15 +2644,15 @@ msgstr "Nie je možné aktualizovať používateľa. Heslá musia byť rovnaké.
 msgid "Cannot update value map"
 msgstr "Nie je možné aktualizovať mapu hodnôt"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "Nie je možné aktualizovať web scenár"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr "Nie je možné skontrolovať zisťovaciu kontrolu: neplatná požiadavka alebo problémové pripojenie k Zabbix serveru."
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Titulok"
 
@@ -2630,47 +2661,47 @@ msgstr "Titulok"
 msgid "Case sensitive"
 msgstr "Rozlišovať veľkosť písmen"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr "Zachytávať všetky SNMP oznámenia z IP adries, ktoré vyberie regulárny výraz. Predvolený regulárny výraz je prázdny reťazec."
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr "Zachytávať všetky SNMP oznámenia, ktoré nie sú zachytené snmptrap[] z príslušných adries rozhrania."
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "Stred"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Zmeniť"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Zmena"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Znak"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Obsahuje reťazec"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Neobsahuje reťazec"
 
@@ -2679,48 +2710,48 @@ msgid "Chassis"
 msgstr "Šasi"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr "Šasi informácie - vráti všetky informácie"
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Kontrola už existuje."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Skontrolujte časť výrazu začínajúcu od \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr "Kontrola či súbor existuje. 0 - súbor neexistuje, 1 - súbor existuje"
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr "Kontrola či je služba dostupná. 0 - služba je nedostupná, 1 - služba je dostupná. Ak <ip> chýba, potom je použitá IP alebo DNS meno z nastavenia hosta. Ak <port> chýba, potom je použitý predvolený port služby."
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
-msgstr "Kontrola či je služba dostupná. 0 - služba je nedostupná, 1 - služba je dostupná. Ak chýba IP, potom je použité 127.0.0.1. Ak chýba port, potom je použitý predvolený port služby. Príklad: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+msgstr "Kontrola či je služba dostupná. 0 - služba je nedostupná, 1 - služba je dostupná. Ak IP chýba, potom je použitá 127.0.0.1. Ak port chýba, potom je použitý predvolený port služby. Príklad: net.tcp.service[ftp,,45]."
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
-msgstr "Kontrola výkonnosti služby. 0 - služba je nedostupná, sec - počet sekúnd potrebných k spojenia ku službe. Ak chýba IP, potom je použité 127.0.0.1. Ak chýba port, potom je použitý predvolený port služby."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
+msgstr "Kontrola výkonnosti služby. 0 - služba je nedostupná, sec - počet sekúnd potrebných k spojeniu ku službe. Ak IP chýba, potom je použitá 127.0.0.1. Ak port chýba, potom je použitý predvolený port služby."
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
-msgstr "Kontrola výkonnosti služby. 0 - služba je nedostupná, sec - počet sekúnd potrebných k spojenia ku službe. Ak chýba <ip>, potom je použitá IP alebo DNS meno z nastavenia hosta. Ak chýba <port>, potom je použitý predvolený port služby."
+msgstr "Kontrola výkonnosti služby. 0 - služba je nedostupná, sec - počet sekúnd potrebných k spojeniu ku službe. Ak chýba <ip>, potom je použitá IP alebo DNS meno z nastavenia hosta. Ak chýba <port>, potom je použitý predvolený port služby."
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr "Kontrola dostupnosti agenta. Vždy vráti 1. Môže byť použitá ako TCP ping."
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Skontrolujte prosím kľúč. Bol zadaný predvolený kľúč z príkladu."
 
@@ -2729,44 +2760,44 @@ msgid "Check type"
 msgstr "Typ kontroly"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
-msgstr "Kontrola, či je možné vytvoriť TCP spojenie na zadaný port. 0 - nie je možné spojenie, 1 - je možné spojenie. IP adresa je voliteľná. Ak IP chýba, potom je použitá 127.0.0.1. Príklad: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+msgstr "Kontrola či je možné urobiť TCP spojenie na daný port. 0 - spojenie je nedostupné, 1 - spojenie je možné. IP je voliteľná. Ak chýba IP, potom je použitá 127.0.0.1. Príklad: net.tcp.port[,80]"
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Kontroly"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr "Kontrola, či je DNS služba dostupná. 0 - DNS je nedostupný (server neodpovedal alebo DNS preklad zlyhal), 1 - DNS je dostupný."
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr "Kontrola, či je server dostupný cez ICMP ping. 0 - ICMP ping zlyhal. 1 - ICMP ping úspešný. Jeden zo zabbix_server procesov vykonáva ICMP pingy raz za PingerFrequency sekúnd."
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr "Kontrola, či port je v LISTEN stave. 0 - nie je, 1 - je v LISTEN stave."
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Kontroly musia byť jedinečné."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Čínsky (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Čínsky (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Nie je možné vytvoriť kruhový odkaz pre prvok mapy \"%s\"."
@@ -2781,34 +2812,35 @@ msgstr "Kruhový odkaz v mapách: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "Kruhový odkaz v obrazovkách: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Kruhový odkaz v šablónach: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Kruhové odkazovanie šablón nie je povolené."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Klasická"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Vyčistiť"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Vyčistiť históriu a trendy"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Vyčistiť históriu označených"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Vyčistiť pri odpojení"
 
@@ -2818,69 +2850,69 @@ msgstr "Hodiny"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Klonovať"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Zavrieť konštruktéra výrazu"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Farba"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "Farba \"%1$s\" nie je v správnom formáte: očakávaný je kód farby v 16-kovej sústave (6 znakov)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Farba (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr "Stĺpec pridaný"
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr "Stĺpec zmazaný"
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Rozsah stĺpcov"
 
@@ -2895,7 +2927,7 @@ msgstr "Kombinovaný výsledok"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Príkaz"
 
@@ -2903,41 +2935,31 @@ msgstr "Príkaz"
 msgid "Command actions"
 msgstr "Akcie príkazov"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Príkaz nemôže byť prázdny."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Príkazy"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Komentár bol aktulizovaný"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Komentáre"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "Komentáre pre \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Komerčné"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Porovnanie hodnôt pre viac časových období"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Definícia oprávnení"
 
@@ -2945,29 +2967,39 @@ msgstr "Definícia oprávnení"
 msgid "Condition"
 msgstr "Podmienka"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr "Podmienka \"%2$s\" nie je použitá vo formule \"%3$s\" pre akciu \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
-msgstr "Podmienka \"%2$s\" nie je použitá vo formule \"%3$s\" pre zisťovacie pravidlo \"%1$s\"."
+msgstr "Podmienka \"%2$s\" použitá vo formule \"%3$s\" pre akciu \"%1$s\" nie je definovaná."
+
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr "Podmienka \"%2$s\" použitá vo formule \"%3$s\" pre akciu \"%1$s\" nie je definovaná."
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Podmienka \"%2$s\" použitá vo formule \"%3$s\" pre zisťovacie pravidlo \"%1$s\" nie je definovaná."
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Podmienky"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Nastavenie"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr "Nastavenie cache štatistík. Cache - buffer (módy: pfree, total, used, free)."
 
@@ -3130,23 +3162,23 @@ msgstr "Nastavenie bolo aktulizované"
 msgid "Configure (Filter %s)"
 msgstr "Nastavenie (Filter %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Potvrdzujúci text"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Pripojiť k"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "Prihlásený ako '%1$s'"
@@ -3205,7 +3237,7 @@ msgid "Context name"
 msgstr "Meno kontextu"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr "Prepnutia kontextu."
 
@@ -3213,30 +3245,38 @@ msgstr "Prepnutia kontextu."
 msgid "Contract number"
 msgstr "Číslo zmluvy"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Poloha"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] "Kopírovať %1$s prvok do ..."
+msgstr[1] "Kopírovať %1$s prvky do ..."
+msgstr[2] "Kopírovať %1$s prvkov do ..."
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Kopírovať vybrané do ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Správny login \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Nie je možné uložiť obrázok!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Počet"
 
@@ -3256,6 +3296,10 @@ msgstr "Vytvoriť aplikáciu"
 msgid "Create application (select host first)"
 msgstr "Vytvoriť aplikáciu (najskôr vyberte hosta)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr "Vytvoriť pozadie"
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3273,7 +3317,7 @@ msgstr "Vytvoriť graf (najskôr vyberte hosta)"
 msgid "Create graph prototype"
 msgstr "Vytvoriť prototyp grafu"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Vytvoriť hosta"
 
@@ -3286,15 +3330,15 @@ msgstr "Vytvoriť skupinu hostov"
 msgid "Create host prototype"
 msgstr "Vytvoriť prototyp hosta"
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr "Vytvoriť ikonu"
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Vytvoriť mapu ikon"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Vytvoriť obrázok"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Vytvoriť položku"
 
@@ -3318,6 +3362,11 @@ msgstr "Vytvoriť mapu"
 msgid "Create media type"
 msgstr "Vytvoriť typ média"
 
+#: include/views/conf.import.php:24
+#, fuzzy
+msgid "Create new"
+msgstr "Vytvoriť nový"
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Vytvoriť proxy"
@@ -3342,11 +3391,11 @@ msgstr "Vytvoriť skript"
 msgid "Create slide show"
 msgstr "Vytvoriť prezentáciu"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Vytvoriť šablónu"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Vytvoriť spúšťač"
 
@@ -3370,42 +3419,42 @@ msgstr "Vytvoriť používateľskú skupinu"
 msgid "Create value map"
 msgstr "Vytvoriť mapu hodnôt"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Vytvorené: Aplikácia \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Vytvorené: Zisťovacie pravidlo \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Vytvorené: Prototyp hosta \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Vytvorené: Položka \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Vytvorené: Prototyp položky \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Vytvorené: Spúšťač \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Vytvorené: Prototyp spúšťača \"%1$s\" na \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Vytvorené: Web scenár \"%1$s\" na \"%2$s\"."
@@ -3415,51 +3464,52 @@ msgid "Critical"
 msgstr "Kritický"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr "Aktuálny OS - vráti uplné informácie"
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Aktuálny dátum je < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Aktuálny dátum je = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Aktuálny dátum je > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Aktuálny dátum NIE JE N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Aktuálny host"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Aktuálny čas je < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Aktuálny čas je = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Aktuálny čas je > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Aktuálny čas NIE JE N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Aktuálna hodnota"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr "Osobitný výraz"
@@ -3472,7 +3522,7 @@ msgstr "Vlastné grafy"
 msgid "Custom label"
 msgstr "Vlastný popis"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Vlastný popis pre elementy typu \"%1$s\" v mape \"%2$s\" nemôže byť prázdny."
@@ -3486,7 +3536,7 @@ msgstr "Vlastný multiplikátor"
 msgid "Custom screens"
 msgstr "Vlastné obrazovky"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Vlastný skript"
 
@@ -3506,19 +3556,14 @@ msgstr "Vlastná veľkosť"
 msgid "Custom slides"
 msgstr "Vlastné prezentácie"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Česky (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-# According to source file translateDefines.inc.php this should not be translated.
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "NASTAVENIE KONZOLY"
@@ -3534,28 +3579,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "PODROBNOSTI SCENÁRA"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "VYPNUTÉ"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "DISCOVERED"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3563,25 +3608,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS meno"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "DOWN"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Denne"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Tmavo oranžová"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Stmaviť"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Nástenka"
 
@@ -3593,20 +3638,21 @@ msgstr "Nastavenie konzoly"
 msgid "Dashboard filter"
 msgstr "Filter panelov"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Čiarkovaná čiara"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Údaje"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr "Cache štatistiky. Cache - jedna z hodnôt (módy: all, float, uint, str, log, text), história (módy: pfree, total, used, free), trend (módy: pfree, total, used, free), text (módy: pfree, total, used, free)."
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3629,11 +3675,12 @@ msgstr "Perióda uloženia údajov (v dňoch)"
 msgid "Data type"
 msgstr "Dátový typ"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Databázový súbor"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Databázový server"
 
@@ -3641,35 +3688,39 @@ msgstr "Databázový server"
 msgid "Database monitor"
 msgstr "Databázový monitor"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Meno databázy"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Heslo databázy"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Port databázy"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Databázová schéma"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Databázový server"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Typ databázy"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Databázový používateľ"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Dátum"
 
@@ -3689,53 +3740,52 @@ msgstr "Dátum vypršania kontraktu podpory HW"
 msgid "Date HW purchased"
 msgstr "Dátum kúpy HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Deň"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Deň v mesiaci"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "Deň v mesiaci je < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "Deň v mesiaci je = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "Deň v mesiaci je > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "Deň v mesiaci NIE JE N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Deň v týždni"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "Deň v týždni je < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "Deň v týždni je = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "Deň v týždni je > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "Deň v týždni NIE JE N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "dní"
 
@@ -3743,22 +3793,22 @@ msgstr "dní"
 msgid "Debug"
 msgstr "Ladenie"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Ladiaci režim"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Ladiaci režim aktualizovaný"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Dec"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "December"
 
@@ -3768,15 +3818,14 @@ msgstr "Desiatkový"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Predvolený"
 
@@ -3789,11 +3838,11 @@ msgid "Default delay (in seconds)"
 msgstr "Predvolené oneskorenie (v sekundách)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Predvolený text správy"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Predvolené trvanie prevádzkového kroku"
 
@@ -3816,30 +3865,35 @@ msgstr "Predvolená téma \"%1$s\"."
 msgid "Delay"
 msgstr "Oneskorenie"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Oneskorenie (v sekundách)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Oneskorené o"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Zmazať"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+#, fuzzy
+msgid "Delete all elements that are not present in the XML file?"
+msgstr "Zmazať všetky elementy, ktoré nie sú prítomné v XML súbore?"
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Zmazať a vyčistiť"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Zmazať a vyčistiť zvolené šablóny? (Pozor: všetky prepojené hosty budú tiež vyčistené!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Zmazať a vyčistiť šablónu? (Pozor: všetky prepojené hosty budú tiež vyčistené!)"
 
@@ -3847,53 +3901,53 @@ msgstr "Zmazať a vyčistiť šablónu? (Pozor: všetky prepojené hosty budú t
 msgid "Delete application?"
 msgstr "Zmazať aplikáciu?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Zmazať aktuálnu akciu?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Zmazať zisťovacie pravidlo?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Zmazať výraz?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr "Zmazať prototyp grafu?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Zmazať graf?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Zmazať históriu označených WEB scenárov?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Zmazať históriu označených položiek?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr "Zmazať históriu označených scenárov?"
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Zmazať mapovú ikonu?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr "Zmazať prototyp položky?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Zmazať položku?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Zmazať kľúčové slovo?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Zmazať prepojenia medzi označenými elementmi?"
 
@@ -3901,11 +3955,15 @@ msgstr "Zmazať prepojenia medzi označenými elementmi?"
 msgid "Delete maintenance period?"
 msgstr "Zmazať servisné okno?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr "Zmazať chýbajúce"
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Zmazať mapu siete?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Zmazať proxy?"
 
@@ -3913,7 +3971,7 @@ msgstr "Zmazať proxy?"
 msgid "Delete regular expression?"
 msgstr "Zmazať regulárny výraz?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Zmazať scenár?"
 
@@ -3921,71 +3979,67 @@ msgstr "Zmazať scenár?"
 msgid "Delete screen?"
 msgstr "Zmazať obrazovku?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Zmazať skript?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Zmazať označené"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Zmazať označené WEB scenáre?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Zmazať označené akcie?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Zmazať označené aplikácie?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Zmazať označené zisťovacie pravidlá?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Zmazať označené elementy?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr "Zmazať označené prototypy grafov?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Zmazať označené grafy?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Zmazať označenú skupinu?"
@@ -3994,27 +4048,27 @@ msgstr "Zmazať označenú skupinu?"
 msgid "Delete selected groups?"
 msgstr "Zmazať označené skupiny?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Zmazať označené skupiny?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr "Zmazať označený prototyp hosta?"
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr "Zmazať označené prototypy hosta?"
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Zmazať označeného hosta?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Zmazať označené hosty?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Zmazať označený obrázok?"
 
@@ -4022,31 +4076,31 @@ msgstr "Zmazať označený obrázok?"
 msgid "Delete selected item prototypes?"
 msgstr "Zmazať označené prototypy položiek?"
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Zmazať označené položky?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Zmazať označené plánované odstávky?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Zmazať označené mapy?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Zmazať označený typ média?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Zmazať označené typy médií?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Zmazať označené proxy?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Zmazať označené regulárne výrazy?"
 
@@ -4054,15 +4108,15 @@ msgstr "Zmazať označené regulárne výrazy?"
 msgid "Delete selected screens?"
 msgstr "Zmazať označené obrazovky?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Zmazať označené skripty?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Zmazať označené prezentácie?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Zmazať označené šablóny?"
 
@@ -4074,11 +4128,11 @@ msgstr "Zmazať označené prototypy spúšťačov?"
 msgid "Delete selected triggers?"
 msgstr "Zmazať označené spúšťače?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Zmazať označeného používateľa?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Zmazať označených používateľov?"
 
@@ -4094,11 +4148,15 @@ msgstr[0] "Zmazať označené mapovanie hodnôt? Je použité pre %d položku!"
 msgstr[1] "Zmazať označené mapovanie hodnôt? Je použité pre %d položky!"
 msgstr[2] "Zmazať označené mapovanie hodnôt? Je použité pre %d položiek!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr "Zmazať označené scenáre?"
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Zmazať označené s pripojenými elementami"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr "Zmazať službu \"%1$s\"?"
@@ -4107,15 +4165,15 @@ msgstr "Zmazať službu \"%1$s\"?"
 msgid "Delete slide show?"
 msgstr "Zmazať prezentáciu?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Zmazať šablónu?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr "Zmazať prototyp spúšťača?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Zmazať spúšťač?"
 
@@ -4123,62 +4181,62 @@ msgstr "Zmazať spúšťač?"
 msgid "Deleted"
 msgstr "Zmazaný"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Aplikácia \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Zisťovacie pravidlo \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Graf \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Zmazané: Host \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Prototyp hosta \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Položka \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Prototyp položky \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Zmazané: Proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Zmazané: Šablóna \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Spúšťač \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Prototyp spúšťača \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Zmazané: Web scenár \"%1$s\" na \"%2$s\"."
@@ -4187,35 +4245,35 @@ msgstr "Zmazané: Web scenár \"%1$s\" na \"%2$s\"."
 msgid "Delimiter"
 msgstr "Oddeľovač"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Rozdiel (jednoduchá zmena)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Rozdiel (rýchlosť za sekundu)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Zakázať"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Závislosti"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Podradená závislosť (tento ovplyvňuje)"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Nadradená závislosť (tento je ovplyvnený)"
 
@@ -4223,30 +4281,41 @@ msgstr "Nadradená závislosť (tento je ovplyvnený)"
 msgid "Deployment status"
 msgstr "Stav nasadenia"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Poznámka"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr "Poznámka pre \"%s\"."
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr "Poznámka bola aktualizovaná"
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -4259,71 +4328,71 @@ msgid "Device"
 msgstr "Zariadenie"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr "Prerušenia zariadenia."
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr "Zoznam zariadení - zoznam PCI zariadení"
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr "Štatistiky čítania zariadenia."
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Unikátny identifikátor zariadenia"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr "Štatistiky zápisov zariadenia."
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Rozdiel medzi MAX a MIN hodnotou v perióde T je < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Rozdiel medzi MAX a MIN hodnotou v perióde T je = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Rozdiel medzi MAX a MIN hodnotou v perióde T je > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Rozdiel medzi MAX a MIN hodnotou v perióde T je NOT N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Rozdiel medzi poslednou a jej predchádzajúcou hodnotou, potom N = 1, 0 - inak"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Rozdiel medzi poslednou a jej predchádzajúcou hodnotou, potom N NOT 1, 0 - inak"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Rozdiel medzi poslednou a jej predchádzajúcou hodnotou je < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Rozdiel medzi poslednou a jej predchádzajúcou hodnotou je = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Rozdiel medzi poslednou a jej predchádzajúcou hodnotou je > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Rozdiel medzi poslednou a jej predchádzajúcou hodnotou je NOT N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr "Rôzne informácie o konkrétnom procese(och)"
 
@@ -4347,48 +4416,44 @@ msgstr "Zakázať ladiaci režim pre označené skupiny?"
 msgid "Disable host"
 msgstr "Zakázať host"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Zakázať host?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Zakázať hostov v označených skupinách?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Zakázať hostov monitorovaných cez označené proxy?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Zakázať označené"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Zakázať označené WEB scenáre?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Zakázať označené akcie?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Zakázať označené aplikácie?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Zakázať označené zisťovacie pravidlá?"
 
@@ -4396,11 +4461,11 @@ msgstr "Zakázať označené zisťovacie pravidlá?"
 msgid "Disable selected groups?"
 msgstr "Zakázať označené skupiny?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr "Zakázať označené prototypy hosta?"
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Zakázať označené hosty?"
 
@@ -4408,42 +4473,47 @@ msgstr "Zakázať označené hosty?"
 msgid "Disable selected item prototypes?"
 msgstr "Zakázať označené prototypy položiek?"
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Zakázať označené položky?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Zakázať označené média typy?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr "Zakázať označené prototypy spúšťačov?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Zakázať označené spúšťače?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr "Zakázať označené scenáre?"
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Vypnuté"
 
@@ -4456,7 +4526,7 @@ msgstr "Katastrofálna"
 msgid "Discovered"
 msgstr "Zistené"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr "Zistené"
 
@@ -4464,17 +4534,17 @@ msgstr "Zistené"
 msgid "Discovered device"
 msgstr "Zistené zariadenie"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Zisťovania"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Zisťovanie cez proxy"
 
@@ -4482,17 +4552,17 @@ msgstr "Zisťovanie cez proxy"
 msgid "Discovery check"
 msgstr "Kontrola zisťovania"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr "Chyba zisťovacej kontroly"
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Kontroly zisťovania"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Zisťovací zoznam"
 
@@ -4501,69 +4571,72 @@ msgid "Discovery object"
 msgstr "Objekt zisťovania"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Pravidlá zisťovania"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Zisťovacie pravidlo \"%1$s\" už existuje na \"%2$s\", zdedené z inej šablóny."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Zisťovacie pravidlo \"%1$s\" už existuje na \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "Zisťovacie pravidlo \"%1$s:%2$s\" ma nesprávny lifetime: \"%3$s\". (min: %4$d, max: %5$d, používateľské makro povolené)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr "Zisťovacie pravidlo \"%1$s\" už existuje."
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Zisťovacie pravidlo \"%s\" už existuje."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "Zisťovacie pravidlo \"%1$s:%2$s\" ma nesprávny lifetime: \"%3$s\". (min: %4$d, max: %5$d, používateľské makro povolené)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Zisťovacie pravidlo vytvorené"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Zisťovacie pravidlo vymazané"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] "Zisťovacie pravidlo vypnuté"
 msgstr[1] "Zisťovacie pravidlá vypnuté"
 msgstr[2] "Zisťovacie pravidlá vypnuté"
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] "Zisťovacie pravidlo povolené"
 msgstr[1] "Zisťovacie pravidlá povolené"
 msgstr[2] "Zisťovacie pravidlá povolené"
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Zisťovacie pravidlo aktualizované"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Zisťovacie pravidlá"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Zisťovacie pravidlá vymazané"
 
@@ -4575,7 +4648,7 @@ msgstr "Stav zisťovania"
 msgid "Display OK triggers for"
 msgstr "Zobrazovať spúšťače v stave OK po dobu"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Zobrazujem"
 
@@ -4584,32 +4657,32 @@ msgstr "Zobrazujem"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Zobrazujem %1$s z %2$s nájdených"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Rozloženie hodnôt pre viac položiek"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Rozloženie hodnôt pre viac časových období"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Nevypočítavať"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Prajete si zameniť podmienkový výraz?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Hotovo"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Bodka"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Nedostupné"
@@ -4619,30 +4692,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nedostupné"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Prestoj"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Ťahajte sem pre zmenu typu rozhrania na typ \"IPMI\"."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Ťahajte sem pre zmenu typu rozhrania na typ \"JMX\"."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Ťahajte sem pre zmenu typu rozhrania na typ \"SNMP\"."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Ťahajte sem pre zmenu typu rozhrania na typ \"agent\"."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Štýl vykreslenia"
 
@@ -4660,74 +4733,75 @@ msgstr "Prvá položka z rozbaľovacieho zoznamu \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Zapamätať označený výber \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Kopírovať závislosti v spúšťači \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Duplicitné meno prototypu skupiny \"%2$s\" pre prototyp hosta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Duplicitné ID skupiny hostov \"%2$s\" pre prototyp hosta \"%1$s\"."
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Kopírovanie hosta. Host s rovnakým host menom \"%s\" už existuje."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Kopírovanie hosta. Host s rovnakým zobrazovaným menom \"%s\" už existuje v dátach."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Kopírovanie mena mapy pre mapu \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr "Kopírovanie mena skriptu \"%1$s\"."
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Kopírovanie mena závažnosti \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Kopírovanie používateľského aliasu \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Trvanie"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Trvanie (sekundy)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Holandsky (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Dynamická položka"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "CHYBA"
 
@@ -4735,13 +4809,13 @@ msgstr "CHYBA"
 msgid "EVENTS"
 msgstr "UDALOSTI"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Každá URL by mala mať jedinečné meno. Prosim uistite sa, že existuje len jedna URL s takýmto menom"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4749,9 +4823,9 @@ msgstr "Každá URL by mala mať jedinečné meno. Prosim uistite sa, že existu
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Aktualizovať"
 
@@ -4759,7 +4833,7 @@ msgstr "Aktualizovať"
 msgid "Edit map element"
 msgstr "Aktualizovať mapový element"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Aktualizovať spúštač"
 
@@ -4767,27 +4841,61 @@ msgstr "Aktualizovať spúštač"
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Meno elementu"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Prázdny"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr "Prázdny súbor SSL certifikátu pre web scenár \"%1$s\"."
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr "Prázdny súbor SSL kľúča pre web scenár \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Prázdna podmienka akcie."
 
@@ -4795,76 +4903,98 @@ msgstr "Prázdna podmienka akcie."
 msgid "Empty color."
 msgstr "Prázdna farba."
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr "Prázdna filtrovacia podmienka ID vzorca pre akciu \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Prázdna filtrovacia podmienka ID vzorca pre zisťovacie pravidlo \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Prázdna filtrovacia podmienka makra pre zisťovacie pravidlo \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr "Prázdne ID hosta pre prototyp hosta."
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr "Prázdny host."
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Prázdny vstupný parameter."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr "Prázdne vstupné parametre."
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Prázdny vstup."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Prázdne makro."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr "Prázdne meno pre prototyp skupiny."
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr "Prázdne meno pre prototyp hosta \"%1$s\"."
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr "Prázdne meno pre skript \"%1$s\"."
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr "Prázdne meno pre skript."
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Prázdne meno."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Prázdne parametre"
 
@@ -4873,23 +5003,27 @@ msgstr "Prázdne parametre"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "Prázdna odpoveď prijatá zo Zabbix servera \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
-msgstr ""
+msgstr "Prázdne ID obrazovky pre obrazovku."
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
-msgstr ""
+msgstr "Prázdne ID obrazovky pre šablónu obrazovky."
 
 #: include/classes/validators/CTimePeriodValidator.php:46
 msgid "Empty time period."
 msgstr "Prázdna časová perióda."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr "Prázdne ID web scenára."
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Povoliť"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Povoliť potvrdenia"
 
@@ -4909,11 +5043,11 @@ msgstr "Povoliť potvrdzovanie udalostí"
 msgid "Enable host"
 msgstr "Povoliť hosta"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Povoliť hosta?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Povoliť hostov monitorovaných cez označené proxy?"
 
@@ -4926,36 +5060,32 @@ msgstr "Povoliť hostov monitorovaných cez označené proxy?"
 msgid "Enable internal housekeeping"
 msgstr "Povoliť internú údržbu"
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Povoliť označené"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Povoliť označené WEB scenáre?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Povoliť označené akcie?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Povoliť označené aplikácie?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Povoliť označené zisťovacie pravidlá?"
 
@@ -4963,11 +5093,11 @@ msgstr "Povoliť označené zisťovacie pravidlá?"
 msgid "Enable selected groups?"
 msgstr "Povoliť označené skupiny?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr "Povoliť označené prototypy hostov?"
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Povoliť označených hostov?"
 
@@ -4975,64 +5105,68 @@ msgstr "Povoliť označených hostov?"
 msgid "Enable selected item prototypes?"
 msgstr "Povoliť označené prototypy položiek?"
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Povoliť označené položky?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Povoliť označené typy médií?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr "Povoliť označené prototypy spúšťačov?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Povoliť označené spúšťače?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr "Povoliť označené scenáre?"
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Povolené"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Anglicky (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Anglicky (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Chyba"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Chyba vo vyhľadávacej požiadavke nad tabuľkou \"%1$s\"."
@@ -5050,15 +5184,15 @@ msgstr "Udalosť"
 msgid "Event ID"
 msgstr "ID udalosti"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "ID udalosti posledného log záznamu vybraného regulárnym výrazom T, potom N = 1, 0 - inak"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "ID udalosti posledného log záznamu vybraného regulárnym výrazom T, potom N NOT 1, 0 - inak"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Udalosť potvrdená"
 
@@ -5067,7 +5201,7 @@ msgstr "Udalosť potvrdená"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Potvrdenia udalosti \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Potvrdzovanie udalostí je vypnuté"
 
@@ -5075,7 +5209,7 @@ msgstr "Potvrdzovanie udalostí je vypnuté"
 msgid "Event details"
 msgstr "Podrobnosti udalosti"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Generovanie udalosti"
 
@@ -5095,9 +5229,10 @@ msgstr "Podrobnosti zdroju udalostí"
 msgid "Event type"
 msgstr "Typ udalosti"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Udalosti"
 
@@ -5105,50 +5240,55 @@ msgstr "Udalosti"
 msgid "Events and alerts"
 msgstr "Udalosti a poplachy"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Každý deň(dni)"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Každý týždeň(e)"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Vylúčiť"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Vykonať"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "SQL chyba pri spustení [%1$s] v [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr "Spustiť WMI dotaz a vrátiť prvý vybraný objekt."
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Vykonávať na"
 
 #: include/views/administration.auditacts.list.php:84
 msgid "Executed"
-msgstr ""
+msgstr "Vykonané"
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Vykonaný skript"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Potvrdenie vykonania"
 
@@ -5160,7 +5300,7 @@ msgstr "Rozbaliť makrá"
 msgid "Expand single problem"
 msgstr "Rozbaliť jeden problém"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Očakávaná bola JSON-rpc verzia 2.0, ale použitá je \"%s\"."
@@ -5170,12 +5310,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Uplynutý"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Koláčový"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Export označených"
 
@@ -5183,22 +5323,22 @@ msgstr "Export označených"
 msgid "Export to CSV"
 msgstr "Export do CSV súboru"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Výraz"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Syntaktická chyba vo výraze."
 
@@ -5206,11 +5346,12 @@ msgstr "Syntaktická chyba vo výraze."
 msgid "Expression Variable Elements"
 msgstr "Premenné výrazu"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Výraz nemôže byť prázdny"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Konštruktér výrazu"
 
@@ -5231,17 +5372,17 @@ msgid "External check"
 msgstr "Externá kontrola"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "Pi"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "NEPRAVDA"
 
@@ -5250,57 +5391,58 @@ msgstr "NEPRAVDA"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Zlyhalo"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
-msgstr "Zlyhalo"
+msgstr "Zlyhanie"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
-msgstr ""
+msgstr "Zlyhanie aktualizácie šablóny."
 
 #: include/items.inc.php:37
 msgid "Failure Audit"
 msgstr "Neúspešný audit"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Obľúbené grafy"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Obľúbené mapy"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Obľúbené obrazovky"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr "Obľúbené jednoduché grafy"
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr "Obľúbené prezentácie"
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Obľúbené"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Feb"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Február"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Pole"
 
@@ -5344,19 +5486,19 @@ msgstr "Pole \"%1$s\" nie je reťazec."
 msgid "Field \"%1$s\" must be missing."
 msgstr "Pole \"%1$s\" musí chýbať."
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Pole \"druleid\" je vyžadované."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
-msgstr ""
+msgstr "Pole \"host\" je vyžadované."
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Pole \"name\" je vyžadované."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Formát súboru nie je podporovaný."
 
@@ -5365,13 +5507,13 @@ msgstr "Formát súboru nie je podporovaný."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Súbor je príliš veľký, maximálna veľkosť je %1$s bytov."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Súbor poskytnutý pre pohľad neexistuje. Nenašiel som \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr "Informácia o čase súboru. Počet sekúnd. Mode je voliteľný. Ak mode chýba, je použitý modify."
 
@@ -5379,68 +5521,71 @@ msgstr "Informácia o čase súboru. Počet sekúnd. Mode je voliteľný. Ak mod
 msgid "Filled region"
 msgstr "Oblasť výplne"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtrovať"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
-msgstr ""
+msgstr "Filtrovať podľa aplikácie"
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Filter podľa skupiny"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
-msgstr ""
+msgstr "Filtrovať podľa inventára hosta"
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Filtrovať podľa mena"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
-msgstr ""
+msgstr "Filtre"
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Nájdi reťazec V v poslednej hodnote. N = 1 - ak sa nájde, 0 - inak"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Nájdi reťazec V v poslednej hodnote. N NOT 1 - ak sa nájde, 0 - inak"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr "Nájdi reťazec v súbore. 0 - výraz nenájdený, 1 - nájdený"
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr "Nájdi reťazec v súbore. Vybraný reťazec"
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Ukončiť"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Fínsky (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Prvý"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Prvá"
@@ -5449,8 +5594,8 @@ msgstr "Prvá"
 msgid "Fit to map"
 msgstr "Prispôsobiť mape"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Pevná"
 
@@ -5460,76 +5605,80 @@ msgstr "Pevná"
 msgid "Flexible intervals"
 msgstr "Flexibilné intervaly"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr "Nasledovať presmerovania"
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Heslo účtu guest musí byť prázdne"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Vzorec"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Štvrtý"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Francúzsky (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Pi"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Piatok"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Od"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Frontend prístup"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Frontend prístup aktualizovaný"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
-msgstr "Frontend správy"
+msgstr "Povoliť frontend správy"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Vytvoriť úplnú kópiu"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Funkcia"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
-msgstr ""
+msgstr "Funkcia \"%1$s\" nemôže byť použitá s vybranou položkou \"%2$s\""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5539,116 +5688,116 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr "GRAFY"
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "GUI prístup vypnutý."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Všeobecne"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Vygenerované za %s sekúnd"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Nemecky (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
-msgstr "Získať obsah web stránky. Predvolená cesta je /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
+msgstr "Získať obsah danej web stránky. Predvolená cesta je /"
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr "Získať obsah daného súboru."
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
-msgstr "Získať prvý výber regulárnym výrazom na web stránke. Predvolená cesta je /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
+msgstr "Vráť prvý výber regulárneho výrazu na web stránke. Predvolená cesta je /"
 
 #: include/page_header.php:194
 msgid "Get support"
 msgstr "Získať podporu"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
-msgstr "Získať čas načítania úplnej web stránky. Predvolená cesta je /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
+msgstr "Vráť čas načítania celej web stránky. Predvolená cesta je /"
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Zadaný výraz nie je makro"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Globálny výraz neexistuje."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Globálny skript"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Globálne skripty"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Vykonať"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Choď na"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "Choď na konzolu"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5657,66 +5806,73 @@ msgid "Gradient line"
 msgstr "Gradientová čiara"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Graf"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Graf \"%1$s\" už existuje na \"%2$s\" (zdedený z inej šablóny)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Graf \"%1$s\" už existuje na \"%2$s\" (položky grafu nie sú totožné)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Graf \"%1$s\" už existuje na \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Graf \"%1$s\" nemôže dediť. Na \"%2$s\" nie sú požadované položky (položka hodnoty Ymax)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Graf \"%1$s\" nemôže dediť. Na \"%2$s\" nie sú požadované položky (položka hodnoty Ymin)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Graf \"%1$s\" nemôže dediť. Na \"%2$s\" nie sú požadované položky."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Graf \"%1$s\" neexistuje v šablóne \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Graf \"%1$s\" preskočený - používateľovo pravidlo."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Graph \"%1$s\" so šablónovými položkami nemôže obsahovať položky z iných hostov."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Graf pridaný"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Graf zmazaný"
 
@@ -5728,54 +5884,59 @@ msgstr "Element grafu"
 msgid "Graph item"
 msgstr "Položka grafu"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Meno grafu"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "Prototyp grafu"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "Prototyp grafu \"%1$s\" obsahuje prototypy položiek z rôznych zisťovacích pravidiel."
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
-msgstr ""
+msgstr "Prototyp grafu \"%1$s\" musí obsahovať najmenej jeden prototyp položky."
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Prototyp grafu \"%1$s\" so šablónovými položkami nemôže obsahovať položky z iných hostov."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Prototyp grafu \"%s\" zmazaný."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr "Prototyp grafu pridaný"
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr "Prototyp grafu zmazaný"
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr "Prototyp grafu aktualizovaný"
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Prototypy grafov"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr "Prototypy grafov zmazané"
 
@@ -5787,49 +5948,51 @@ msgstr "Prototypy grafov pre"
 msgid "Graph sum"
 msgstr "Sumár grafov"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Typ grafu"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Graf aktualizovaný"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Graf s menom \"%1$s\" už existuje v grafoch alebo prototypoch grafov."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Graf s totožným menom, ale iným typom už existuje."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Grafy"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Grafy skopírované"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Grafy zmazané"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Grécky (el_GR)"
 
@@ -5838,54 +6001,58 @@ msgstr "Grécky (el_GR)"
 msgid "Grid"
 msgstr "Mriežka"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Skupina"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Skupinu \"%1$s\" nie je možné zmazať, pretože je používaná prototypom hosta."
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Skupina \"%1$s\" neexistuje."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Skupina \"%1$s\" pre host \"%2$s\" neexistuje."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Skupina pridaná"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
 msgid "Group deleted"
-msgstr "Skupina zmazaná"
+msgid_plural "Groups deleted"
+msgstr[0] "Skupina zmazaná"
+msgstr[1] "Skupina zmazaná"
+msgstr[2] "Skupina zmazaná"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5896,40 +6063,42 @@ msgstr "Skupina pre zistených hostov"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr "Skupina pre zistené hosty \"%1$s\"."
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Meno skupiny"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr "ID prototypu skupiny nemôže byť prázdne."
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr "Prototyp skupiny nemôže byť založený na zistenej skupine hostov \"%1$s\"."
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr "Prototypy skupiny"
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Skupina aktualizovaná"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Zoskupovať podľa"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -5937,22 +6106,13 @@ msgstr "Skupiny"
 msgid "Groups in maintenance"
 msgstr "Skupiny hostov v údržbe"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5969,7 +6129,7 @@ msgstr "PROBLÉMY SKUPINY"
 msgid "HOST INVENTORY"
 msgstr "INVENTÁR HOSTA"
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "PREHĽAD INVENTÁRA HOSTU"
 
@@ -5987,7 +6147,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP autentifikácia"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
@@ -6006,14 +6167,19 @@ msgstr "Hardvér"
 
 #: include/hosts.inc.php:175
 msgid "Hardware (Full details)"
-msgstr "Hardvér (podrobnosti)"
+msgstr "Hardvér (podrobne)"
+
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr "HTTP hlavičky"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Výška"
@@ -6026,15 +6192,15 @@ msgstr "Pomoc"
 msgid "Hexadecimal"
 msgstr "Hexadecimálny"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Skryť"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Skryť všetky"
 
@@ -6050,15 +6216,15 @@ msgstr "Skryť vypnuté prototypy spúšťačov"
 msgid "Hide disabled triggers"
 msgstr "Skryť vypnuté spúšťače"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
-msgstr ""
+msgstr "Skryť filter"
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Skryť označené"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "Skryť označené skupiny"
 
@@ -6067,23 +6233,23 @@ msgstr "Skryť označené skupiny"
 msgid "High"
 msgstr "Kritická"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "História"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "História vyčistená"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Čistenie histórie môže trvať dlhší čas. Pokračovať?"
 
@@ -6104,80 +6270,80 @@ msgstr "História udalostí"
 msgid "History storage period"
 msgstr "Perióda uloženia histórie"
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr "Perióda uloženia histórie (v dňoch)"
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Vodorovný"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Vodorovné zarovnanie"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Host"
 msgstr[1] "Hosty"
 msgstr[2] "Hostov"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" už existuje."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Host \"%1$s\" je monitorovaný s proxy \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "Host \"%s\" má nastavený parameter \"useipmi\", ale nemá parameter \"ipmi_ip\". Použijem IP adresu hosta ako adresu pre IPMI rozhranie."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Host (vzostupne)"
 
@@ -6189,31 +6355,31 @@ msgstr "Hostova IP"
 msgid "Host access"
 msgstr "Hostov prístup"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Host pridaný"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "Host nemôže mať viac ako jedno predvolené rozhranie toho istého typu."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Počet hostov"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Host zmazaný"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] "Host vypnutý"
 msgstr[1] "Hosty vypnuté"
 msgstr[2] "Hosty vypnuté"
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] "Host povolený"
@@ -6221,36 +6387,38 @@ msgstr[1] "Hosty povolené"
 msgstr[2] "Hosty povolené"
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Skupina hostov"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Skupina hostov \"%1$s\" už existuje."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Skupinu hostov \"%1$s\" nie je možné zmazať, pretože je použitá v globálnom skripte."
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "Skupinu hostov \"%1$s\" nie je možné zmazať, pretože niektoré hosty závisia na nej."
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "Skupina hostov \"%1$s\" je interná a nemôže byť zmazaná."
@@ -6267,14 +6435,15 @@ msgstr "Problémy skupiny"
 msgid "Host group label type"
 msgstr "Typ popisku skupiny"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "Meno skupiny hostov nemôže byť prázdne."
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Skupiny hostov"
 
@@ -6284,8 +6453,8 @@ msgstr "Skupiny hostov"
 msgid "Host interface"
 msgstr "Rozhranie hosta"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Hostov inventár"
 
@@ -6301,7 +6470,7 @@ msgstr "Problémy hosta"
 msgid "Host label type"
 msgstr "Typ popisu hosta"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Zoznam hostov"
 
@@ -6310,18 +6479,18 @@ msgid "Host metadata"
 msgstr "Hostove metaúdaje"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Meno hosta"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr "Meno hosta \"%1$s\" je príliš dlhé, nesmie byť dlhšie ako %2$d znakov."
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr "Meno hosta pre prototyp hosta \"%1$s\" musí obsahovať makrá."
@@ -6330,74 +6499,74 @@ msgstr "Meno hosta pre prototyp hosta \"%1$s\" musí obsahovať makrá."
 msgid "Host networks"
 msgstr "Siete hosta"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Prototyp hosta \"%1$s\" už existuje na \"%2$s\", zdedený z inej šablóny."
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "Prototyp hosta \"%1$s\" už existuje na \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr "Prototyp hosta \"%1$s\" musí mať najmenej jednu skupinu hostov."
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr "Prototyp hosta pridaný"
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr "Prototyp hosta zmazaný"
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] "Prototyp hosta vypnutý"
 msgstr[1] "Prototypy hosta vypnuté"
 msgstr[2] "Prototypy hosta vypnuté"
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] "Prototyp hosta povolený"
 msgstr[1] "Prototypy hosta povolené"
 msgstr[2] "Prototypy hosta povolené"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr "Prototyp hosta aktualizovaný"
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Prototyp hosta s menom \"%1$s\" už existuje v zisťovacom pravidle \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr "Prototyp hosta s menom \"%1$s\" už existuje."
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr "Prototyp hosta so zobrazovaným menom \"%1$s\" už existuje v zisťovacom pravidle \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr "Prototyp hosta so zobrazovaným menom \"%1$s\" už existuje."
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr "Prototypy hostov"
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr "Prototypy hostov zmazané"
 
@@ -6409,7 +6578,7 @@ msgstr "Prototypy hosta"
 msgid "Host router"
 msgstr "Hostov smerovač"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Hostove obrazovky"
 
@@ -6421,51 +6590,52 @@ msgstr "Stav hosta"
 msgid "Host subnet mask"
 msgstr "Hostova maska podsiete"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Hostov čas"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Aktualizácia hosta zlyhala."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Host aktualizovaný"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr "Host s rovnakým menom\"%1$s\" už existuje."
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Host s rovnakým menom\"%s\" už existuje."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host s rovnakým zobrazovaným menom \"%1$s\" už existuje."
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Host s rovnakým zobrazovaným menom\"%s\" už existuje."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Hosty"
 
@@ -6473,11 +6643,11 @@ msgstr "Hosty"
 msgid "Hosts & Groups"
 msgstr "Hosty a skupiny"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Hosty (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Hosty / šablóny"
 
@@ -6489,37 +6659,38 @@ msgstr "Hosty v"
 msgid "Hosts in maintenance"
 msgstr "Hosty v údržbe"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Info o hostovi"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Umiestnenie hostov"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Hosty aktualizované"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Hodinovo"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "hodín"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr "Údržba"
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Maďarsky (hu_HU)"
 
@@ -6537,22 +6708,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6560,26 +6731,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP adresa"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP a DNS nemôže byť prázdne pre hostovo rozhranie."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Rozsah IP"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "Rozsah IP nemôže byť prázdny."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6587,22 +6758,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI agent"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI autentifikačný algoritmus"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "IPMI rozhrania"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI heslo"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI úroveň oprávnania"
 
@@ -6612,7 +6783,7 @@ msgstr "IPMI úroveň oprávnania"
 msgid "IPMI sensor"
 msgstr "IPMI senzor"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI používateľské meno"
 
@@ -6645,7 +6816,7 @@ msgstr "Závislosti IT služby"
 msgid "IT service parent"
 msgstr "Nadradený IT služby"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6661,25 +6832,25 @@ msgid "ITEMS"
 msgstr "POLOŽKY"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ikona"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Ikona (predvolená)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Ikona (vypnuté)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Ikona (údržba)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Ikona (problém)"
 
@@ -6700,42 +6871,44 @@ msgstr "Typ popisku ikony"
 msgid "Icon map"
 msgstr "Mapová ikona"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Mapová ikona \"%1$s\" nemôže byť zmazaná. Je použitá v mape \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Mapová ikona \"%1$s\" je mapovaná s nesprávnym iconid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Mapová ikona \"%1$s\" je mapovaná s nesprávnou inventárnou spojnicou \"%2$s\"."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Mapová ikona \"%s\" už existuje."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Mapová ikona \"%s\" nemôže byť mapovaná s prázdnym výrazom."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Mapová ikona \"%s\" nemôže byť mapovaná s globálnym výrazom, ktorý neexistuje."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Mapová ikona \"%s\" má neplatný výraz."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Mapová ikona \"%s\" musí mať najmenej jedno mapovanie."
@@ -6748,7 +6921,8 @@ msgstr "Mapová ikona vytvorená"
 msgid "Icon map deleted"
 msgstr "Mapová ikona zmazaná"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Meno mapovej ikony nemôže byť prázdne."
 
@@ -6756,29 +6930,29 @@ msgstr "Meno mapovej ikony nemôže byť prázdne."
 msgid "Icon map updated"
 msgstr "Mapová ikona aktualizovaná"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Mapová ikona s iconmapid \"%s\" neexistuje."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Mapovanie ikon"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "Mapovanie ikony \"%1$s\" na \"%2$s\" už existuje."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Mapa ikon nie je povolená"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Ikony"
 
@@ -6786,21 +6960,23 @@ msgstr "Ikony"
 msgid "Identical expression already exists"
 msgstr "Identický výraz už existuje"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Pokiaľ si myslíte, že táto správa je zlá, prosím kontaktuje vášho administrátora pre pridelenie potrebných oprávnení."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Obrázok"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Obrázok \"%1$s\" už existuje."
@@ -6809,7 +6985,7 @@ msgstr "Obrázok \"%1$s\" už existuje."
 msgid "Image added"
 msgstr "Obrázok pridaný"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Obrázok zmazaný"
 
@@ -6817,12 +6993,13 @@ msgstr "Obrázok zmazaný"
 msgid "Image label type"
 msgstr "Typ popisku obrázka"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Chyba načítania obrázku [%1$s] v [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "Veľkosť obrázka musí byť menšia ako 1MB."
 
@@ -6831,66 +7008,66 @@ msgid "Image updated"
 msgstr "Obrázok aktualizovaný"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Obrázky"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Obrázky pre všetky mapy budú aktualizované!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Hneď"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
-msgstr "Import"
+msgstr "Importovať"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Import zlyhal"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
-msgstr "Importovať súbor"
+msgstr "Importovaný súbor"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Import úspešný"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Nie je možné filtrovať podľa inventárneho pola \"%s\", ktoré neexistuje."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Nie je možné zmazať posledný riadok a stĺpec."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "V"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "V skupine"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "V skupinách"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6903,244 +7080,283 @@ msgstr "Plánovaná odstávka"
 msgid "In progress"
 msgstr "V priebehu"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Vrátane"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Neplatná hodnota pola \"soft\" pre závislosť na službe \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Neplatná hodnota %1$s typu popisku pre mapu \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
-msgstr ""
+msgstr "Neplatné API \"%1$s\"."
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Neplatný IP rozsah \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Nesprávna hodnota SNMP OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Nesprávna SNMP komunita."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr "Nesprávna hodnota SSL verifikácie mena hosta pre web scenár \"%1$s\"."
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr "Nesprávna hodnota SSL verifikácie certifikátu hosta pre web scenár \"%1$s\"."
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Neplatná akceptovateľná SLA pre službu \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Neplatná podmienka akcie zisťovacej kontroly."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Neplatná podmienka akcie zisťovacej kontroly. Zisťovacia kontrola neexistuje alebo nemáte k nej prístup."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "Neplatná podmienka akcie zisťovacieho pravidla."
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Neplatná podmienka akcie zisťovacieho pravidla. Zisťovacie pravidlo neexituje alebo nemáte k nemu prístup."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Neplatná podmienka akcie zisťovacieho stavu."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "Neplatná podmienka akcie typu udalosti."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Neplatná podmienka akcie skupiny. Skupina neexistuje alebo nemáte k nej prístup."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Neplatná podmienka akcie hosta. Host neexistuje alebo nemáte k nemu prístup."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "Neplatná podmienka akcie skupiny ip \"%1$s\"."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "Neplatná podmienka akcie operátora."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "Neplatná podmienka akcie portu \"%1$s\"."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Neplatná podmienka akcie proxy. Proxy neexistuje alebo nemáte k nej prístup."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Neplatná podmienka akcie šablóny. Šablóna neexistuje alebo nemáte k nej prístup."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "Neplatná podmienka akcie závažnosti spúšťača."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "Neplatná podmienka akcie hodnoty spúšťača."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Neplatná podmienka akcie spúšťača. Spúšťač neexistuje alebo nemáte k nemu prístup."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Neplatná podmienka akcie typu."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Neplatná podmienka akcie conditionid."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "Neplatná podmienka akcie pre akciu \"%1$s\"."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Neplatná podmienka akcie typu príkazu."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Neplatná prevádzková podmienka akcie typu potvrdenia."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Neplatná prevádzková podmienka akcie typu."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Neplatné hodnoty eskalačného kroku v prevádzkovej akcii."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Neplatná prevádzková akcia skupiny. Skupina neexistuje alebo nemáte k nej prístup."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Neplatná prevádzková akcia hosta. Host neexistuje alebo nemáte k nemu prístup."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Neplatná prevádzková akcia portu \"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Neplatná prevádzková akcia trvania kroku."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Neplatná prevádzková akcia typu."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Neplatná prevádzková akcia používateľskej skupiny. Skupina neexistuje alebo nemáte k nej prístup."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Neplatná prevádzková akcia používateľa. Používateľ neexistuje alebo nemáte k nemu prístup."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Neplatný operationid akcie."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Neplatný algoritmus pre službu \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Funkcii boli predané neplatné argumenty"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Funkcii boli predané neplatné argumenty."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Metóde boli predané neplatné argumenty."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "Neplatný protokol prihlasovania pre zisťovacie pravidlo \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "Neplatný protokol prihlasovania pre položku \"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+#, fuzzy
+msgid "Incorrect bulk value for interface."
+msgstr "Neplatná hromadná hodnota pre rozhranie."
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Neplatná hodnota SLA vypočítaná pre službu \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr "Nepovolené znaky použité pre host \"%1$s\"."
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Nepovolené znaky použité pre meno hosta \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "Nepovolené znaky použité pre meno proxy \"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
-msgstr "Nepovolené znaky použité pre meno šablóny \"%1$s\"."
+msgstr "Nesprávne podmienky pre zisťovacie pravidlo \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr "Nesprávne podmienky pre akciu \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nesprávne podmienky pre zisťovacie pravidlo \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr "Nesprávny vlastný výraz \"%2$s\" pre akciu \"%1$s\": %3$s."
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
-msgstr ""
+msgstr "Nesprávny vlastný výraz \"%2$s\" pre zisťovacie pravidlo \"%1$s\": %3$s."
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Neplatné oneskorenie."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr "Neplatné ID pravidla zisťovania pre prototyp hosta \"%1$s\"."
@@ -7150,11 +7366,11 @@ msgstr "Neplatné ID pravidla zisťovania pre prototyp hosta \"%1$s\"."
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "Neplatný objekt udalosti \"%1$s\" (%2$s) pre zdroj udalosti \"%3$s\" (%4$s), len nasledujúce objekty su podporované: %5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "Neplatná hodnota eventobject."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "Neplatná hodnota eventsource."
 
@@ -7163,11 +7379,11 @@ msgstr "Neplatná hodnota eventsource."
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Neplatné pole \"%1$s\" meno alebo hodnota vo where podmienke pre tabuľku \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "Neplatné polia pre sysmap."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Neplatné polia pre spúšťač."
 
@@ -7175,74 +7391,100 @@ msgstr "Neplatné polia pre spúšťač."
 msgid "Incorrect file upload."
 msgstr "Nahraný neplatný súbor."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr "Nesprávna filtrovacia podmienka ID vzorca pre akciu \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nesprávna filtrovacia podmienka ID vzorca pre zisťovacie pravidlo \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nesprávna filtrovacia podmienka makra pre zisťovacie pravidlo \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr "Nesprávna filtrovacia podmienka operátora pre akciu \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nesprávna filtrovacia podmienka operátora pre zisťovacie pravidlo \"%1$s\"."
+
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr "Nesprávny typ filtrovacej podmienky pre akciu \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Neplatný flexibilný interval \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Neplatný flexibilný interval v položke \"%1$s\". Flexibilný interval musí byť reťazec."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr "Nesprávna hodnota Nasledovania presmerovaní pre krok \"%1$s\" scenára \"%2$s\"."
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Nie je použitá platná funkcia"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr "Neplatné ID grafu \"%1$s\" v prvku obrazovky."
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr "Neplatné ID prototypu skupiny."
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr "Neplatné prototypy skupiny pre prototyp hosta \"%1$s\"."
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr "Neplatné ID hosta \"%1$s\" v prvku obrazovky."
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr "Neplatné ID skupiny \"%1$s\" v prvku obrazovky."
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr "Neplatné ID skupiny hostov pre prototyp skupiny."
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Neplatná skupina."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr "Neplatná skupina pre prototyp hosta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr "Neplatné ID prototypu hosta."
 
@@ -7250,182 +7492,201 @@ msgstr "Neplatné ID prototypu hosta."
 msgid "Incorrect image index."
 msgstr "Neplatný obrázkový index."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr "Neplatné vstupné parametre."
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Neplatný parameter DNS pre rozhranie \"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Neplatný parameter IP pre rozhranie \"%s\"."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Neplatný parameter port pre rozhranie \"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Neplatné inventárne pole \"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr "Neplatné ID položky \"%1$s\" v prvku obrazovky."
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Neplatná položka pre hodnotu osi."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "Neplatný kľúč položky \"%1$s\" pre spúšťač na \"%2$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "Neplatná hodnota typu položky \"%1$s\" poskytnutá pre spúšťaciu funkciu \"%2$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Neplatný kľúč."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Neplatný zoznam položiek."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Neplatná dátum údržby - dátum musí byť medzi 1970.01.01 a 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Neplatný dátum údržby"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Neplatná perióda dní údržby"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Neplatný deň údržby v týždni"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Neplatná perióda mesiacov údržby"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Neplatná perióda údržby"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Neplatná perióda údržby (minimálne 5 minút)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Neplatná týždňová perióda údržby"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr "Neplatné ID mapy \"%1$s\" v prvku obrazovky."
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Neplatná výška mapy pre mapu \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Neplatná šírka mapy pre mapu \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr "Neplatná menu cesta pre skriptu \"%1$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
-msgstr ""
+msgstr "Neplatná metóda \"%1$s.%2$s\"."
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "Neplatná hodnota objektu."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "Neplatný parameter pre akciu \"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Neplatný parameter pre operáciu."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Neplatný parameter je použitý pre mapovú ikonu \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr "Neplatné parametre pre aktulizačnú metódu \"%1$s\"."
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Neplatné parametre pre podmienku."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Neplatné parametre pre metódu aktualizácie mapove ikony \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Neplatné parametre pre údržbu."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Neplatné parametre pre používateľskú skupinu."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Neplatný nadriadený pre službu \"%1$s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Neplatná nadriadená služba."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Neplatný rozsah portov."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "Neplatný protokol utajenia pre zisťovacie pravidlo \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "Neplatný protokol utajenia pre položku \"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Neplatné proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr "Nesprávny regulárny výraz \"%1$s\": \"%2$s\""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Neplatný typ zdroja pre obrazovkovú položku."
 
@@ -7434,64 +7695,68 @@ msgstr "Neplatný typ zdroja pre obrazovkovú položku."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Neplatná odpoveď prijatá od Zabbix servera \"%1$s\"."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr "Nesprávna hodnota Typu sťahovania pre krok \"%1$s\" scenára \"%2$\"."
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr "Neplatné ID obrazovky \"%1$s\" v prvku obrazovky."
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
-msgstr ""
+msgstr "Neplatné ID obrazovky."
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Neplatná obrazovka pre prezentáciu."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Neplatný čas ukončenia služby."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Neplatný čas začiatku služby."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Neplatný typ času služby."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Neplatné poradie sorder pre službu \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "Neplatná zdrojová hodnota."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr "Neplatný stav pre hosta \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr "Neplatný status pre hosta \"%1$s\"."
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Neplatný stav pre host \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Neplatný stav."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
-msgstr ""
+msgstr "Neplatné ID šablóny obrazovky."
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr "Neplatná téma pre používateľa \"%1$s\"."
@@ -7512,52 +7777,57 @@ msgstr "Neplatná časová perióda \"%1$s\" začiatočný čas musí byť menš
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Neplatná časová perióda \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Neplatné ID spúšťača pre službu \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Neplatný výraz spúšťača"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Neplatný výraz spúšťača."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Neplatný výraz spúšťača. Host \"%1$s\" neexistuje alebo nemáte prístup k tomuto hostu."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Neplatný výraz spúšťača. Host \"%s\" neexistuje alebo nemáte prístup k tomuto hostu."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Neplatný výraz spúšťača. Elementy výrazu spúšťača by nemali patriť k šablónam a hostom zároveň."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "Neplatná funkcia spúšťača \"%1$s\" pre výraz."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Neplatný typ asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr "Nesprávny typ kalkulácie pre akciu \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nesprávny typ výpočtu pre zisťovacie pravidlo \"%1$s\"."
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Neplatná používateľská skupina."
 
@@ -7566,7 +7836,8 @@ msgstr "Neplatná používateľská skupina."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr "Neplatná hodnota \"%1$s\" pre pole \"%2$s\"."
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Neplatná hodnota \"%1$s\" pre \"%2$s\" pole: musí byť medzi %3$s a %4$s."
@@ -7586,7 +7857,7 @@ msgstr "Neplatná hodnota \"%1$s\" pre int pole \"%2$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Neplatná hodnota \"%1$s\" pre unsigned int pole \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr "Neplatná hodnota pre pole \"%1$s\"."
@@ -7596,43 +7867,49 @@ msgstr "Neplatná hodnota pre pole \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr "Neplatná hodnota pre pole \"%1$s\": nemôže byť prázdna."
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Neplatná hodnota pre setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "Neplatná hodnota použitá pre proxy stav \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr "Neplatné ID web scenára."
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Neplatný pracovný čas."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Neplatná položka y max pre graf \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Neplatná položka y min pre graf \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Indonézsky (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Info"
 
@@ -7641,15 +7918,15 @@ msgstr "Info"
 msgid "Information"
 msgstr "Informatívna"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Vložiť"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Vložiť makro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr "Vložiť výraz"
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Inštalácia"
 
@@ -7657,31 +7934,32 @@ msgstr "Inštalácia"
 msgid "Installer name"
 msgstr "Meno technika"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Rozhranie"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Rozhranie je pripojené na položku \"%1$s\" na \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Rozhranie je používané položkami, ktoré požadujú tento typ rozhrania."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "Rozhranie s DNS \"%1$s\" nemôže mať prázdnu IP adresu."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "Rozhranie s IP \"%1$s\" nemôže mať prázdne DNS meno, pokiaľ používa nastavenie \"Používaj DNS\" na \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "Rozhranie s IP \"%1$s\" nemôže mať prázdne DNS meno."
@@ -7701,7 +7979,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr "Interný"
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Interná JSON-RPC chyba."
 
@@ -7709,7 +7987,7 @@ msgstr "Interná JSON-RPC chyba."
 msgid "Internal data storage period (in days)"
 msgstr "Perióda uloženia interných údajov (v dňoch)"
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Interná chyba."
 
@@ -7722,19 +8000,19 @@ msgstr "Perióda uloženia údajov interných udalostí a poplachov"
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr "Perióda uloženia údajov interných udalostí a poplachov (v dňoch) \"%1$s\"."
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Interval"
 
@@ -7744,112 +8022,114 @@ msgstr "Interval"
 msgid "Interval (in sec)"
 msgstr "Interval (v sekundách)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Neplatný JSON. Chyba sa vyskytla na servery počas spracovávania JSON textu."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Neplatná požiadavka."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Neplatný dátum \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "Neplatný prvý parameter."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "Neplatný štvrtý parameter."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Neplatné hostid pre makro \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Neplatný kľúč \"%1$s\" pre zisťovacie pravidlo \"%2$s\" na \"%3$s\": %4$s."
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Neplatný kľúč \"%1$s\" pre položku \"%2$s\" na \"%3$s\": %4$s."
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Neplatný kľúč \"%1$s\" pre prototyp \"%2$s\" na \"%3$s\": %4$s."
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr "Neplatný kľúč \"%1$s\": %2$s."
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Neplatná perióda údržby"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Neplatné parametre metódy."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "Neplatný počet parametrov."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Neplatné parametre."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr "Neplatná perióda pre pole \"%1$s\"."
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Neplatný návratový kód \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Neplatný rozsah návratového kódu \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "Neplatný druhý parameter."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "Neplatný tretí parameter."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Neplatná časová perióda"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Neplatné view meno pre \"%s\". Povolené znaky: \"a-z\" a \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventár"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr "Inventár vypnutý pre hosta \"%1$s\"."
@@ -7858,7 +8138,7 @@ msgstr "Inventár vypnutý pre hosta \"%1$s\"."
 msgid "Inventory field"
 msgstr "Pole inventára"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Režim inventára"
 
@@ -7866,12 +8146,12 @@ msgstr "Režim inventára"
 msgid "Is online?"
 msgstr "Ste prihlásený?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Problém"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Nie je možné filtrovať cez heslo používateľa."
 
@@ -7879,70 +8159,71 @@ msgstr "Nie je možné filtrovať cez heslo používateľa."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Nie je možné sa odhlásiť od HTTP autentifikácie."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Nie je možné nájsť používateľské heslo."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Taliansky (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Položka"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr "Položka \"%1$s\""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Položka \"%1$s\" už existuje na \"%2$s\", zdedená z inej šablóny."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "Položka \"%1$s\" už existuje na \"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Položka \"%1$s\" nemôže byť naplnená chýbajúcim inventárnym polom číslo \"%2$d\". Možnosti: od 0 (nenapĺňať) do %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Položka \"%1$s\" neexistuje v šablóne \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Položka \"%1$s\" neexistuje."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Položka \"%1$s\" na \"%2$s\": aplikácia \"%3$s\" neexistuje."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Položka \"%1$s\" preskočená - používateľské pravidlo."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Položka \"%1$s:%2$s\" má neplatný port: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Položka pridaná"
 
@@ -7950,18 +8231,18 @@ msgstr "Položka pridaná"
 msgid "Item count"
 msgstr "Počet položiek"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Položka zmazaná"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Položka vypnutá"
 msgstr[1] "Položky vypnuté"
 msgstr[2] "Položky vypnuté"
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Položka povolená"
@@ -7976,58 +8257,58 @@ msgstr "Položka je v \"normal\" stave"
 msgid "Item in \"not supported\" state"
 msgstr "Položka je v \"not supported\" stave"
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
-msgstr ""
+msgstr "Položka nie je vybraná"
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Prototyp položky"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Prototyp položky \"%1$s\" už existuje na \"%2$s\", zdedený z inej šablóny."
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr "Prototyp položky \"%1$s\" už existuje na \"%2$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr "Prototyp položky pridaný"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr "Prototyp položky zmazaný"
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] "Prototyp položky vypnutý"
 msgstr[1] "Prototypy položky vypnuté"
 msgstr[2] "Prototypy položky vypnuté"
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] "Prototyp položky povolený"
 msgstr[1] "Prototypy položky povolené"
 msgstr[2] "Prototypy položky povolené"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr "Prototyp položky aktualizovaný"
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Prototypy položky"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr "Prototypu položiek zmazané"
 
@@ -8035,92 +8316,92 @@ msgstr "Prototypu položiek zmazané"
 msgid "Item prototypes of"
 msgstr "Prototypy položiek pre"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Položka aktualizovaná"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Položka používa rozhranie z nie nadriadeného hosta."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Položka používa neplatný typ rozhrania."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Položka nebude akutalizovaná. Zadajte prosím správny interval aktualizacií."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Položka s kľúčom \"%1$s\" už existuje na \"%2$s\" ako zisťovacie pravidlo."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Položka s kľúčom \"%1$s\" už existuje na \"%2$s\" ako položka vytvorená z prototypu položky."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Položka s kľúčom \"%1$s\" už existuje na \"%2$s\" ako prototyp položky."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Položka s kľúčom \"%1$s\" už existuje na \"%2$s\" ako položka."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Položka s kľúčom \"%1$s\" už existuje na \"%2$s\" ako neznámy element položky."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Položka s kľúčom \"%1$s\" už existuje na \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "Položka s kľúčom \"%1$s\" už existuje."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Položky"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Položky (mon/zak/nep)[šab]"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Položka skopírovaná"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Položky zmazané"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Zoznam položiek"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Položky aktualizované"
 
@@ -8132,72 +8413,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX agent"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX rozhrania"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Generovanie chyby JSON-rpc zlyhalo. Žiadna chyba \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "Metóda JSON-rpc nie je definovaná."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpc parametre nie sú Array."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "JSON-rpc verzia nie je špecifikovaná."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber účet"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Jan"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Január"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japonsky (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Júl"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Júl"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Jún"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Jún"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8206,40 +8487,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "Ponechať stratené zdroje (v dňoch)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Kľúč"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Kľúč \"%1$s\" nevybral <grpmax|grpmin|grpsum|grpavg>[\"Skupina(y)\", \"Kľúč položky\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Fráza kľúča"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Kľúčové slovo"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Kórejsky (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "POSLEDNÉ ÚDAJE"
 
@@ -8270,37 +8551,37 @@ msgstr "LDAP prihlásenie úspešné"
 msgid "LDAP login was not successful"
 msgstr "LDAP prihlásenie neúspešné"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOKÁLNY"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "STRATENÝ"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Popisok"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Umiestnenie popisku"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Jazyk"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Posledný"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Posledná"
@@ -8313,19 +8594,19 @@ msgstr[0] "Posledný %1$d problém"
 msgstr[1] "Posledné %1$d problémy"
 msgstr[2] "Posledných %1$d problémov"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Posledná (nedávna) hodnota T je < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Posledná (nedávna) hodnota T je = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Posledná (nedávna) hodnota T je > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Posledná (nedávna) hodnota T NIE JE N"
 
@@ -8345,28 +8626,28 @@ msgstr "Posledných 365 dní"
 msgid "Last 7 days"
 msgstr "Posledných 7 dní"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Posledná zmena"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Posledná zmena (vzostupne)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Posledná kontrola"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Graf poslednej hodiny"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Graf posledného mesiaca"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Posledných"
 
@@ -8374,66 +8655,67 @@ msgstr "Posledných"
 msgid "Last seen (age)"
 msgstr "Posledný kontakt (trvanie)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Posledná hodnota"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Graf posledného týždňa"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Posledné údaje"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Posledné udalosti"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr "Posledné hodnoty"
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Litovsky (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Vľavo"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Legenda"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Dĺžka poslednej (nedávnej) hodnoty T v znakoch je < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Dĺžka poslednej (nedávnej) hodnoty T v znakoch je = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Dĺžka poslednej (nedávnej) hodnoty T v znakoch je > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Dĺžka poslednej (nedávnej) hodnoty T v znakoch NIE JE N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Čiara"
 
@@ -8441,39 +8723,29 @@ msgstr "Čiara"
 msgid "Link"
 msgstr "Spojnica"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Ukazovateľ stavu spojnice"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Meno spojnice musí byť jedinečné v rámci mapy \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr "Pripojiť nové šablóny"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Pole spojnice selementid1 odkazuje na neexistujúci mapový element s ID \"%1$s\" pre mapu \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Pole spojnice selementid2 odkazuje na neexistujúci mapový element s ID \"%1$s\" pre mapu \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "Spojnica musí mať vyplnené polia \"name\" aj \"url\" pre mapu \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Pripojiť šablóny"
 
@@ -8485,50 +8757,50 @@ msgstr "Pripojiť k šablóne"
 msgid "Link to templates"
 msgstr "Pripojiť k šablónam"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Prepojiť so šablónami"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Pripojené šablóny"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Pripojené k"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Prepojenia medzi označenými elementami"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Prepojenia pre označený element"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Zoznam je prázdny"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr "Zoznam sieťových rozhraní. Textová hodnota."
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "Litovsky (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Nahrávam..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Lokálny čas"
 
@@ -8545,36 +8817,36 @@ msgid "Location longitude"
 msgstr "Zemepisná dĺžka umiestnenia"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Log"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "Závažnosť posledného záznamu v logu je < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "Závažnosť posledného záznamu v logu je = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "Závažnosť posledného záznamu v logu je > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "Závažnosť posledného záznamu v logu NIE JE N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "Zdroj logu posledného záznamu v logu vybraného parametrom T, potom N = 1, 0 - inak"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "Zdroj logu posledného záznamu v logu vybraného parametrom T, potom N NIE JE 1, 0 - inak"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Formát času pre logovanie"
@@ -8583,28 +8855,28 @@ msgstr "Formát času pre logovanie"
 msgid "Log unmatched SNMP traps"
 msgstr "Logovať aj nenastavené SNMP trapy"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Prihlásený ako"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
 msgid "Login"
-msgstr "Prihlásiť"
+msgstr "Prihlásenie"
 
 #: include/views/general.login.php:80
 msgid "Login as Guest"
 msgstr "Prihlásiť ako Hosť"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Prihlásenie zlyhalo \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr "Prihlasovacie meno \"%1$s\" sa nezhoduje s menom \"%2$s\" použitým v HTTP autentifikácii."
@@ -8613,15 +8885,16 @@ msgstr "Prihlasovacie meno \"%1$s\" sa nezhoduje s menom \"%2$s\" použitým v H
 msgid "Login name or password is incorrect!"
 msgstr "Nesprávne prihlasovacie meno alebo heslo!"
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Nesprávne prihlasovacie meno alebo heslo."
 
 #: auditlogs.php:140 include/page_header.php:222 include/page_header.php:226
 #: include/views/administration.auditlogs.list.php:44
 msgid "Logout"
-msgstr "Odhlásiť"
+msgstr "Odhlásenie"
 
 #: include/discovery.inc.php:156
 msgid "Lost"
@@ -8635,22 +8908,18 @@ msgstr "Nízko úrovňové zisťovacie pravidlo v \"normal\" stave"
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr "Nízko úrovňové zisťovacie pravidlo v \"not supported\" stave"
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "Po"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr "MAC adresy - zoznam všetkých MAC adries s menom rozhrania"
 
@@ -8662,7 +8931,7 @@ msgstr "MAC adresa A"
 msgid "MAC address B"
 msgstr "MAC adresa B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "ÚDRŽBA"
 
@@ -8687,49 +8956,49 @@ msgstr "100 NAJAKTÍVNEJŠÍCH SPÚŠŤAČOV"
 msgid "Macro"
 msgstr "Makro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" už existuje na \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" už existuje."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "Makro \"%1$s\" nie je jedinečné."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Makro \"%1$s\" má príliš dlhú hodnotu, nemôže presiahnuť dĺžku 255 znakov."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Meno makra \"%1$s\" je príliš dlhé, nemôže presiahnuť dĺžku 64 znakov."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "Makro s globalmacroid \"%1$s\" neexistuje."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Makro s hostmacroid \"%1$s\" neexistuje."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Makrá"
 
@@ -8737,31 +9006,36 @@ msgstr "Makrá"
 msgid "Macros updated"
 msgstr "Makrá aktualizované"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Údržba"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Údržba \"%s\" už existuje."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr "Údržba \"%1$s\" už existuje."
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "Hodnota \"Aktívne od\" pre údržbu nemôže byť väčšia ako hodnota \"Aktívne do\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr "Hodnota akcie údržby musí byť prázdna."
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Údržba pridaná"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Údržba zmazaná"
 
@@ -8769,7 +9043,7 @@ msgstr "Údržba zmazaná"
 msgid "Maintenance period"
 msgstr "Perióda údržby"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Dĺžka periódy údržby"
 
@@ -8785,25 +9059,25 @@ msgstr "Stav údržby"
 msgid "Maintenance type"
 msgstr "Typ údržby"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Údržba aktualizovaná"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Údržba so zbieraním údajov"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Údržba bez zbierania údajov"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Povinný parameter chýba."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Manuál"
 
@@ -8814,12 +9088,12 @@ msgstr "Manuálne odhlásenie"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Mapa"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Mapa \"%1$s\" preskočená - používateľské pravidlo."
@@ -8829,12 +9103,12 @@ msgstr "Mapa \"%1$s\" preskočená - používateľské pravidlo."
 msgid "Map \"%s\""
 msgstr "Mapa \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Mapa \"%s\" vytvorená."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Mapa \"%s\" aktualizovaná."
@@ -8851,12 +9125,12 @@ msgstr "Typ popisku mapy"
 msgid "Map save operation failed."
 msgstr "Ukladanie mapy zlyhalo."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr "Mapa s menom \"%s\" už existuje."
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Mapované k"
 
@@ -8866,23 +9140,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Mapovaná hodnota \"%1$s\" nie je jedinečná."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Mapovanie"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Mapy"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Marec"
 
@@ -8890,28 +9164,34 @@ msgstr "Marec"
 msgid "Mark elements on trigger status change"
 msgstr "Označ elementy pri zmene stavu spúšťača"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Označiť ostatné"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Označiť vybrané"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr "Maska"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Hromadná aktualizácia"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Hromadná aktualizácia elementov"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Maximálny počet zobrazovaných položiek v tabuľke"
@@ -8925,35 +9205,11 @@ msgstr "Maximálny počet zobrazovaných položiek v tabuľke \"%1$s\"."
 msgid "Max count of events per trigger to show"
 msgstr "Maximálny počet zobrazovaných udalostí spúšťača"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Maximalizovať"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maximálna dĺžka DNS mena je %1$d znakov, \"%2$s\" má %3$d znak."
-msgstr[1] "Maximálna dĺžka DNS mena je %1$d znakov, \"%2$s\" má %3$d znaky."
-msgstr[2] "Maximálna dĺžka DNS mena je %1$d znakov, \"%2$s\" má %3$d znakov."
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maximálna dĺžka aliasu je %1$d znakov, \"%2$s\" má %3$d znak."
-msgstr[1] "Maximálna dĺžka aliasu je %1$d znakov, \"%2$s\" má %3$d znaky."
-msgstr[2] "Maximálna dĺžka aliasu je %1$d znakov, \"%2$s\" má %3$d znakov."
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maximálna dĺžka mena hostu je %1$d znakov, \"%2$s\" má %3$d znak."
-msgstr[1] "Maximálna dĺžka mena hostu je %1$d znakov, \"%2$s\" má %3$d znaky."
-msgstr[2] "Maximálna dĺžka mena hostu je %1$d znakov, \"%2$s\" má %3$d znakov."
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8961,16 +9217,16 @@ msgid "Maximum number of flexible intervals added"
 msgstr "Maximálne číslo flexibilných intervalov bolo pridané"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr "Maximálny počet otvorených súborov podporovaných OS."
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr "Maximálny počet procesov podporovaných OS."
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
@@ -8978,92 +9234,85 @@ msgstr[0] "Maximálna časová perióda na zobrazenie je %1$s deň."
 msgstr[1] "Maximálna časová perióda na zobrazenie je %1$s dni."
 msgstr[2] "Maximálna časová perióda na zobrazenie je %1$s dní."
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "Maximálna hodnota v perióde T je < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "Maximálna hodnota v perióde T je = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "Maximálna hodnota v perióde T je > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "Maximálna hodnota v perióde T NIE JE N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] "Maximálna zobrazovaná dĺžka mena hostu je %1$d znakov, \"%2$s\" má %3$d znak."
-msgstr[1] "Maximálna zobrazovaná dĺžka mena hostu je %1$d znakov, \"%2$s\" má %3$d znaky."
-msgstr[2] "Maximálna zobrazovaná dĺžka mena hostu je %1$d znakov, \"%2$s\" má %3$d znakov."
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Máj"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Máj"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Médiá"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Typ média"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Typ média \"%s\" už existuje."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Typ média pridaný"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Typ média zmazaný"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "Typ média zakázaný"
 msgstr[1] "Typ média zakázaný"
 msgstr[2] "Typ média zakázaný"
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Typ média povolený"
 msgstr[1] "Typ média povolený"
 msgstr[2] "Typ média povolený"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Typ média aktualizovaný"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Typy médií"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Typy médií používané akciou \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9078,14 +9327,14 @@ msgid "Memory limit: %s"
 msgstr "Pamäťový limit: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr "Pamäť používaná procesom. <name> meno procesu (predvolene: \"all processes\"). <user> meno používateľa (predvolene: \"all users\"). <mode> možné hodnoty: avg, max, min, sum (predvolene). <cmdline> filterovanie príkazového riadku (podporuje regulárne výrazy). Príklad: proc.mem[,root]."
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menu"
 
@@ -9095,7 +9344,7 @@ msgstr "Menu"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Správa"
 
@@ -9103,66 +9352,66 @@ msgstr "Správa"
 msgid "Message actions"
 msgstr "Akcie správ"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Limit na text správy"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Časový limit správy"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Časový limit správy (sekundy)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Správy"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Správy"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Metóda nenájdená."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Stred"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Minimimalizovať"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr "Minimálny požadovaný PHP pamäťový limit je %s (nastavenie \"memory_limit\")."
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr "Minimálny požadovaný PHP upload limit je %s (nastavenie \"upload_max_filesize\")."
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr "Minimálna požadovaná PHP verzia je %s."
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr "Minimálny požadovaný limit spúšťania PHP skriptov je %s (nastavenie \"max_execution_time\")."
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr "Minimálny požadovaný limit vstupného spracovania PHP skriptov je %s (nastavenie \"max_input_time\")."
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr "Minimálna požadovaná velkosť PHP postov je %s (nastavenie \"post_max_size\")."
@@ -9171,7 +9420,7 @@ msgstr "Minimálna požadovaná velkosť PHP postov je %s (nastavenie \"post_max
 msgid "Minimum severity"
 msgstr "Minimálna závažnosť"
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
@@ -9179,73 +9428,70 @@ msgstr[0] "Minimálna časová perióda na zobrazenie je %1$s hodina."
 msgstr[1] "Minimálna časová perióda na zobrazenie je %1$s hodiny."
 msgstr[2] "Minimálna časová perióda na zobrazenie je %1$s hodín."
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr "Minimálna závažnosť spúšťača"
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "Minimálna hodnota pre periódu T je < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "Minimálna hodnota pre periódu T je = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "Minimálna hodnota pre periódu T je > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "Minimálna hodnota pre periódu T je NOT N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "minút"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr "Chýbajúce\"%1$s\" pole pre podmienku akcie."
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr "Chýbajúce\"%1$s\" pole pre položku."
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr "Chýbajúce\"%1$s\" pole pre periódu."
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr "Chýbajúce \"gitemid\" pole pre položku."
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Chýbajúce \"itemid\" pole pre položku."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr "Chýbajúce pole \"name\" pre prototyp grafu."
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Chýbajúce pole \"name\" pre graf."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Chýbajúca položka \"%1$s\" pre host \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Chýbajúce položky pre graf \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr "Chýbajúce položky pre prototyp grafu \"%1$s\"."
@@ -9255,7 +9501,7 @@ msgstr "Chýbajúce položky pre prototyp grafu \"%1$s\"."
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Chýbajúci kľúč \"%1$s\" pre host \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Chýbajúci parameter: usrgrpids."
 
@@ -9267,18 +9513,18 @@ msgstr "Režim"
 msgid "Model"
 msgstr "Model"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Po"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Pondelok"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Monitorovanie cez proxy"
 
@@ -9286,33 +9532,33 @@ msgstr "Monitorovanie cez proxy"
 msgid "Monitored host"
 msgstr "Monitorovaný host"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Monitorovanie"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr "Monitorovanie Windows udalostí. pattern, severity, eventid - regulárne výrazy"
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr "Monitorovanie logovacieho súboru s rotovaním. fileformat - [path][regexp], pattern - regulárny výraz"
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr "Monitorovanie logovacieho súboru s rotovaním. pattern - regulárny výraz"
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Mesiac"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Mesačne"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr "Viacero výberov bolo nájdených..."
 
@@ -9320,7 +9566,7 @@ msgstr "Viacero výberov bolo nájdených..."
 msgid "More than 10 minutes"
 msgstr "Viac ako 10 minút"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Viac ako jeden graf s menom \"%1$s\" pre host."
@@ -9329,19 +9575,19 @@ msgstr "Viac ako jeden graf s menom \"%1$s\" pre host."
 msgid "Most busy triggers top 100"
 msgstr "100 najaktívnejších spúšťačov"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Viacnásobné PROBLÉMOVÉ udalosti"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Viacnásobné generovanie PROBLÉMOVÝCH udalostí"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Stlmiť"
 
@@ -9354,60 +9600,58 @@ msgstr "SIEŤOVÉ MAPY"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "BEZ ÚDAJOV"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM autentifikácia"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr "NTLM"
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9418,26 +9662,32 @@ msgstr "NTLM autentifikácia"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Meno"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr "Meno"
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr "Meno pre prototyp skupiny \"%1$s\" musí obsahovať makrá."
@@ -9456,12 +9706,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr "Perióda uloženia údajov udalostí a poplachov zisťovania sietí (v dňoch) \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr "Štatistika vstupov sieťového rozhrania. Celočíselná hodnota. Ak mode chýba, je použitý bytes."
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr "Štatistika výstupov sieťového rozhrania. Celočíselná hodnota. Ak mode chýba, je použitý bytes."
 
@@ -9469,7 +9719,7 @@ msgstr "Štatistika výstupov sieťového rozhrania. Celočíselná hodnota. Ak
 msgid "Network map added"
 msgstr "Sieťová mapa bola pridaná"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Sieťová mapa bola zmazaná"
 
@@ -9481,7 +9731,7 @@ msgstr "Sieťová mapa bola aktualizovaná"
 msgid "Network maps"
 msgstr "Sieťové mapy"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Nikdy"
 
@@ -9489,24 +9739,24 @@ msgstr "Nikdy"
 msgid "Never executed"
 msgstr "Nikdy nevykonané"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Nová"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Nová aplikácia"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Nová podmienka"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Nový element"
 
@@ -9517,16 +9767,16 @@ msgstr "Nový element"
 msgid "New flexible interval"
 msgstr "Nový flexibilný interval"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Nová skupina"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Nová skupina"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Nová položka grafu"
 
@@ -9534,83 +9784,99 @@ msgstr "Nová položka grafu"
 msgid "New media"
 msgstr "Nové médium"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Nový regulárny výraz"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Nový čas služby"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Nasledujúce"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Nasledujúce"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Nie"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr "Žiadne \"%1$s\" dané pre prototyp grafu."
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr "Žiadne \"%1$s\" dané pre graf."
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr "Žiadne \"%1$s\" dané pre prototyp hosta."
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
-msgstr ""
+msgstr "Žiadne \"%1$s\" dané pre obrazovku."
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
-msgstr ""
+msgstr "Žiadne \"%1$s\" dané pre šablónu obrazovky."
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr "Žiadne \"%1$s\" dané pre web scenár."
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr "Žiadne \"%2$s\" dané pre filtrovaciu podmienku akcie \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Žiadne \"%2$s\" dané pre filtrovaciu podmienku zisťovacieho pravidla \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr "Žiadne \"%2$s\" dané pre prototyp hosta \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr "Žiadne \"%2$s\" dané pre filter akcie \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Žiadne \"%2$s\" dané pre filter zisťovacieho pravidla \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Žiadne pole \"ymax_type\" pre graf \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Žiadne pole \"ymin_type\" pre graf \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr "Nenájdené žiadne IPMI rozhrania."
 
@@ -9618,25 +9884,25 @@ msgstr "Nenájdené žiadne IPMI rozhrania."
 msgid "No IT services found."
 msgstr "Nenájdené žiadne IT služby."
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr "Nenájdené žiadne JMX rozhrania."
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr "Nie je špecifikované žiadne SNMP OID."
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr "Nie je špecifikované žiadne SNMP community."
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr "Nenájdené žiadne SNMP rozhrania."
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Neposkytnutá URL pre obrazovkový element."
 
@@ -9655,15 +9921,15 @@ msgstr "Nenájdené žiadne potvrdenia."
 #: include/classes/screens/CScreenActions.php:126
 #: include/views/administration.auditacts.list.php:67
 msgid "No action log entries found."
-msgstr ""
+msgstr "Žiadne záznamy akcií neboli nájdené."
 
 #: include/actions.inc.php:817 include/actions.inc.php:913
 #: include/actions.inc.php:967 include/views/configuration.action.list.php:48
 msgid "No actions found."
 msgstr "Nenájdená žiadna akcia."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr "Nenájdené žiadne rozhrania agenta."
 
@@ -9673,38 +9939,39 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Nenájdená aplikácia s ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr "Nenájdené žiadne aplikácie."
 
 #: include/views/administration.auditlogs.list.php:83
 msgid "No audit log entries found."
-msgstr ""
+msgstr "Žiadne záznamy auditu neboli nájdené."
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "Nie je špecifikovaný typ autentifikácie pre príkaz akcie \"%s\"."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "Nie je špecifikované používateľské meno autentifikácie pre príkaz akcie \"%s\"."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Nie je špecifikované používateľské meno autentifikácie."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Nie je špecifikovaný príkaz akcie."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Nie je špecifikovaný typ akcie."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Nie sú definované podmienky."
 
@@ -9713,27 +9980,27 @@ msgstr "Nie sú definované podmienky."
 msgid "No data collection"
 msgstr "Bez zbierania údajov"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "Žiadne údaje neboli prijaté počas doby T, then N = 1, 0 - inak"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "Žiadne údaje neboli prijaté počas doby T, then N NOT 1, 0 - inak"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Žiadne predvolené rozhranie pre \"%1$s\" typu na \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Žiadne závislosti nie sú definované."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Bez podrobností"
 
@@ -9741,39 +10008,39 @@ msgstr "Bez podrobností"
 msgid "No discovered devices found."
 msgstr "Nenájdené žiadne zistené zariadenia."
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr "Žiadne ID zisťovacieho pravidla dané pre prototyp hosta \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "Žiadne stanovené ID zisťovacích pravidiel."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr "Nenájdené žiadne pravidlá zisťovania."
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Nenašli sa žiadne chyby."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Žiadne udalosti"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr "Nenájdené žiadne udalosti."
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Žiadne udalosti bez potvrdenia"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Žiadny cieľ spustenia nie je špecifikovaný pre akciu príkazu \"%s\"."
@@ -9788,7 +10055,7 @@ msgstr "Žiaden súbor nebol nahratý."
 msgid "No flexible intervals defined."
 msgstr "Žiadne definované flexibilné intervaly."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Žiadne ID grafu nebolo poskytnuté pre element obrazovky."
 
@@ -9797,7 +10064,11 @@ msgstr "Žiadne ID grafu nebolo poskytnuté pre element obrazovky."
 msgid "No graph item with graphid \"%s\"."
 msgstr "Žiadna položka grafu s graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr "Nenájdené žiadne prototypy grafov."
 
@@ -9806,48 +10077,49 @@ msgid "No graphs added."
 msgstr "Žiadne grafy neboli pridané."
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr "Nenájdené žiadne grafy."
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Žiadne skupiny pre host \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Žiadne skupiny pre hostov."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr "Žiadne skupiny pre šablónu \"%1$s\"."
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
-msgstr ""
+msgstr "Žiadne skupiny pre šablóny."
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Žiadne neposkytnuté IDčka hostov."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Žiadny neposkytnutý host pre makro \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr "Žiadny ID skupiny pre prototyp skupiny."
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Žiadne neposkytnuté ID skupiny pre obrazovkový element."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr "Nenájdené žiadne skupiny."
 
@@ -9860,17 +10132,22 @@ msgstr "Žiadna skupina s groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr "Nenájdené žiadne prototypy hostov."
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr "Žiaden host nie je označený."
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Žiaden host s hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr "Nenájdené žiadne hosty."
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Žiadna ikona pre element mapy \"%s\"."
@@ -9889,33 +10166,40 @@ msgstr "Nenájdené žiadne obrázky."
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Nenájdené žiadne rozhranie"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Nenájdené žiadne rozhranie."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr "Žiadne neposkytnuté rozhranie pre proxy \"%s\"."
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Žiadne rozhrania pre host \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Žiadne ID položiek pre obrázovkový element."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr "Nenájdené žiadne kľúče položiek."
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr "Nenájdené žiadne prototypy položiek."
 
@@ -9934,7 +10218,7 @@ msgid "No items defined."
 msgstr "Žiadna definovaná položka."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr "Nenájdené žiadne položky."
 
@@ -9950,7 +10234,7 @@ msgstr "Nedefinované žiadne plánované odstávky."
 msgid "No maintenance periods found."
 msgstr "Nenájdené žiadne plánované odstávky."
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Žiadne ID mapy pre obrazovkový element."
 
@@ -9959,15 +10243,15 @@ msgid "No maps added."
 msgstr "Žiadne mapy neboli pridané."
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr "Nenájdené žiadne mapy."
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr "Žiadne výbery nenájdené"
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr "Nenájdené žiadne médiá."
 
@@ -9979,133 +10263,178 @@ msgstr "Nenájdené žiadne typy médií."
 msgid "No notifications found."
 msgstr "Nenájdené žiadne hlásenia."
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr "Nedefinované žiadne operácie."
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Nemáte oprávnenie pre graf \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Nemáte oprávnenie pre host \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Nemáte oprávnenie pre položku \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Nemáte oprávnenie pre šablónu \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Nemáte oprávnenie pre spúšťač \"%1$s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr "Žiadne práva pre spúšťač \"%1$s\"."
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Nemáte oprávnenia"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Žiadne oprávnenia pre skupinu \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr "Žiadne práva pre skupinu hostov \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Žiadne oprávnenia pre mapu \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Žiadne oprávnenia pre obrazovku \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Žiadne oprávnenia pre prístup do systému."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Žiadne oprávnenia k odkazovanému objektu alebo objekt neexistuje!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Žiaden špecifikovaný súbor so súkromným kľúčom pre akciu príkazu \"%s\"."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Žiaden špecifikovaný súbor so súkromným kľúčom."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr "Nenájdené žiadne proxy."
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Žiadne proxy"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Žiadny špecifikovaný súbor s verejným kľúčom pre akciu príkazu \"%s\"."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Žiadny špecifikovaný súbor s verejným kľúčom."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Žiadny príjemcovia pre operáciu odoslania správy."
 
@@ -10113,7 +10442,7 @@ msgstr "Žiadny príjemcovia pre operáciu odoslania správy."
 msgid "No regular expressions found."
 msgstr "Nenájdené žiadne regulárne výrazy."
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Žiadne ID obrazovky pre obrazovkový element."
 
@@ -10121,82 +10450,83 @@ msgstr "Žiadne ID obrazovky pre obrazovkový element."
 msgid "No screens added."
 msgstr "Žiadne obrazovky neboli pridané."
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr "Nenájdené žiadne obrazovky."
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Nie je špecifikovany skript pre akciu príkazu."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr "Nenájdené žiadne skripty."
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr "Nenájdené žiadne prezentácie."
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr "Nenájdené žiadne slajdy."
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr "Žiaden stav pre proxy."
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Nie je vybraný cieľ"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Nie je vybraný cieľ."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr "Nenájdené žiadne šablóny."
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr "Žiadne pripojené šablóny."
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Žiadne definované časy. Prevádzkový stav služby je 24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Žiaden spúšťač"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Žiaden spúšťač s triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Žiadne definované spúšťače."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Nenájdené žiadne spúšťače."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr "Nenájdené žiadne skupiny používateľov."
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr "Nenájdení žiadni používatelia."
 
@@ -10205,57 +10535,58 @@ msgid "No value maps found."
 msgstr "Nenájdené žiadne mapovania hodnôt."
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Nenájdené žiadne hodnoty."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr "Nenájdené žiadne scenáre."
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
-msgstr "Žiadne"
+msgstr "Žiadna"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normálny"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Normálne zobrazenie"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Nepotvrdené"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Položky bez šablóny"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Nie všetky šablóny sú pripojené k \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nie je povolené nastavenie hesla pre používateľa \"guest\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
-msgstr ""
+msgstr "Neautorizovaný."
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Nedostupný"
 
@@ -10264,21 +10595,21 @@ msgstr "Nedostupný"
 msgid "Not classified"
 msgstr "Neurčená"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Nepripojený"
 
 #: include/classes/screens/CScreenActions.php:155
 #: include/views/administration.auditacts.list.php:94
 msgid "Not sent"
-msgstr ""
+msgstr "Neposlaný"
 
 #: include/items.inc.php:181 include/items.inc.php:206
 msgid "Not supported"
 msgstr "Nepodporované"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Poznámka"
@@ -10291,7 +10622,7 @@ msgstr "Poznámky"
 msgid "Nothing"
 msgstr "Nič"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Nič na vykonanie."
 
@@ -10299,87 +10630,87 @@ msgstr "Nič na vykonanie."
 msgid "Notification report"
 msgstr "Report hlásení"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Hlásenia"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Nov"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "November"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Teraz"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr "Počet dostupných procesorov."
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
-msgstr ""
+msgstr "Počet hostov (povolených/zakázaných/šablóny)"
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr "Počet inodov daného oddielu. Ak mode chýba, potom je použitý total."
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
-msgstr ""
+msgstr "Počet položiek (povolených/zakázaných/nepodporovaných)"
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr "Počet položiek v Zabbix databáze."
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr "Počet položiek v histórii proxy, ktoré ešte neboli odoslané serveru"
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr "Počet položiek vo fronte, ktoré meškajú od do sekúnd vrátane."
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr "Počet monitorovaných hostov"
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr "Počet procesov. <name> a <user> také isté ako v proc.mem položke. <state> all (predvolene), run, sleep, zomb. <cmdline> filter príkazového riadku (podporuje regulárny výraz). Príklad: proc.num[apache2,www-data]. Na Windows len <name> a <user> sú podporované."
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Počet procesorových jadier na VMware, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Počet procesorových threadov na VMware, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "Počet procesorov na virtuálnom stroji VMware, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Počet sekúnd od začiatky epochy je < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Počet sekúnd od začiatky epochy je = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Počet sekúnd od začiatky epochy je > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Počet sekúnd od začiatky epochy je NOT N"
 
@@ -10387,88 +10718,88 @@ msgstr "Počet sekúnd od začiatky epochy je NOT N"
 msgid "Number of status changes"
 msgstr "Počet zmien stavu"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Počet krokov"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Počet úspešne načítaných hodnôt V (ktoré spĺňajú operátor O) pre periódu T je < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Počet úspešne načítaných hodnôt V (ktoré spĺňajú operátor O) pre periódu T je = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Počet úspešne načítaných hodnôt V (ktoré spĺňajú operátor O) pre periódu T je > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Počet úspešne načítaných hodnôt V (ktoré spĺňajú operátor O) pre periódu T NIE JE N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
-msgstr ""
+msgstr "Počet spúšťačov (povolených/zakázaných [problémových/ok])"
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr "Počet spúšťačov v Zabbix databáze."
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr "Počet nepodporovaných položiek v Zabbix databáze."
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
-msgstr "Počet používateľov (online)"
+msgstr "Počet používateľov (prihlásených)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr "Počet pripojených používateľov. Príkaz who je použitý na strane agenta."
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr "Počet hodnôt uložených v tabuľke HISTORY."
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr "Počet hodnôt uložených v tabuľke HISTORY_LOG."
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr "Počet hodnôt uložených v tabuľke HISTORY_STR."
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr "Počet hodnôt uložených v tabuľke HISTORY_TEXT."
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr "Počet hodnôt uložených v tabuľke HISTORY_UINT."
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr "Počet hodnôt uložených v tabuľke TRENDS."
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr "Počet hodnôt uložených v tabuľke TRENDS_UINT."
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "Počet virtuálnych serverov na VMware hypervízorovi, <url> - URL VMware služby , <uuid> - VMware hypervízor host meno"
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Číslo (float)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Číslo (integer 64bit)"
 
@@ -10483,16 +10814,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr "OK alebo žiaden spúšťač"
 
@@ -10508,8 +10841,7 @@ msgstr "OOB smerovač"
 msgid "OOB subnet mask"
 msgstr "OOB sieťová maska"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "ALEBO"
 
@@ -10519,21 +10851,22 @@ msgstr "OS"
 
 #: include/hosts.inc.php:130
 msgid "OS (Full details)"
-msgstr "OS (podrobnosti)"
+msgstr "OS (podrobne)"
 
 #: include/hosts.inc.php:135
 msgid "OS (Short)"
-msgstr "OS (Krátko)"
+msgstr "OS (skrátene)"
 
 #: adm.other.php:124
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "OSTATNÉ KONFIGURAČNÉ PARAMETRE"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "PREHĽAD"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Okt"
 
@@ -10541,25 +10874,25 @@ msgstr "Okt"
 msgid "Octal"
 msgstr "Osmičkový"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Október"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Vypnuté"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Zapnuté"
 
@@ -10567,111 +10900,114 @@ msgstr "Zapnuté"
 msgid "On status change triggers blink for"
 msgstr "Pri zmena stavu spúšťača blikať po dobu"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Raz"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr "Jeden z objekov je bez skupiny hostov."
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Jednorázovo"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Jednorázový prestoj"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Len super administrátori môžu vytvoriť globálne makrá."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Len super administrátori môžu vytvoriť skupiny."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Len super administrátori môžu vytvoriť mapové ikony."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Len super administrátori môžu vytvoriť typy médií."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Len super administrátori môžu zmazať globálne makrá."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Len super administrátori môžu zmazať typy médií."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Len super administrátori môžu zmazať používateľské skupiny."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Len super administrátori môžu upravovať typy médií."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Len super administrátori môžu upravovať globálne makrá."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Len super administrátori môžu aktualizovať mapové ikony."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Len Zabbix administrátori môžu pridať používateľské médiá."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Len Zabbix administrátori môžu zmeniť používateľské médiá."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Len Zabbix administrátori môžu zmazať používateľské médiá."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Len písmená sú povolené."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr "Len kontroly typu Zabbix agent, SNMPv1, SNMPv2 alebo SNMPv3 môžu byť unikátne."
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Len položky priradené k monitorovaným hostom sú započítané"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Len jedna kontrola môže byť unikátna."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Len jedna používateľská skupina môže byť zmenená naraz."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Len posledných 20%% indikátorov je zobrazených."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr "Len udalosti spúšťača môžu byť potvrdené."
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Len spúšťače priradené k monitorovaným hostom alebo závislé na monitorovaných položkách sú započítané"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Operácia \"%s\" už existuje."
@@ -10680,28 +11016,28 @@ msgstr "Operácia \"%s\" už existuje."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operácia nemôže byť vykonaná vzhľadom k neoprávnenej požiadavke."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Podmienka operácie"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Podrobnosti operácie"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Operácia nemá skupinu na vykonanie."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Operácia nemá šablónu na vykonanie."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Typ operácie"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Operácie"
@@ -10710,25 +11046,27 @@ msgstr "Operácie"
 msgid "Operator"
 msgstr "Operátor"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
-msgstr ""
+msgstr "Alebo"
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10758,24 +11096,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Originálny"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Pôvodná modrá"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Ostatné"
 
@@ -10783,19 +11121,19 @@ msgstr "Ostatné"
 msgid "Other configuration parameters"
 msgstr "Ďalšie konfiguračné parametre"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Ďalšie skupiny"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Ďalšie hosty"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10805,21 +11143,21 @@ msgstr "Ďalšie hosty | Skupiny"
 msgid "Other parameters"
 msgstr "Ďalšie parametre"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Ďalšie | skupina"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Ďalšie"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr "Out-of-window kolízie. Počet kolízií."
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Prepísané"
@@ -10832,14 +11170,11 @@ msgstr "Prepísaná položka historickej periódy"
 msgid "Override item trend period"
 msgstr "Prepísaná položka trendovej periódy"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr "Prepísané globálnymi nastaveniami údržby"
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Prehľad"
 
@@ -10847,7 +11182,7 @@ msgstr "Prehľad"
 msgid "Overview by proxy"
 msgstr "Prehľad podľa proxy"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10856,147 +11191,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "OSOBNÁ NÁSTENKA"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP modul bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr "PHP rozšírenie bcmath chýba (PHP parameter --enable-bcmath)."
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP modul ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr "PHP rozšírenie ctype chýba (PHP parameter --enable-ctype)."
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHP podpora databáz"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP modul gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "PHP podpora gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr "PHP gd FreeType podpora chýba."
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr "PHP gd JPEG image podpora chýba."
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "PHP podpora gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr "PHP gd PNG image podpora chýba."
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "PHP podpora gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr "PHP rozšírenie gd chýba (PHP parameter --with-gd)."
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP modul gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr "PHP rozšírenie gettext chýba (PHP parameter --with-gettext). Preklady nebudú dostupné."
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP modul libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr "PHP rozšírenie libxml chýba."
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP modul mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr "PHP rozšírenie mbstring chýba (PHP parameter --enable-mbstring)."
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr "PHP mbstring.func_overload"
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
-msgstr "PHP nastavenie max_execution_time"
+msgstr "PHP mbstring.func_overload"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP nastavenie max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP nastavenie memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP nastavenie post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP nastavenie upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP modul session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP modul session auto start"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr "PHP session auto start musí byť vypnuté (PHP nastavenie \"session.auto_start\")."
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr "PHP rozšírenie session chýba (PHP parameter --enable-session)."
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP modul sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr "PHP rozšírenie sockets chýba (PHP parameter --enable-sockets)."
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr "PHP funkcia mbstring overloading musí byť zakázaná."
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP časová zóna"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP verzia"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP modul xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr "PHP rozšírenie xmlreader chýba."
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP modul xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr "PHP rozšírenie xmlwriter chýba."
 
@@ -11005,32 +11348,34 @@ msgstr "PHP rozšírenie xmlwriter chýba."
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "PROBLÉM"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "Stránka prijala nesprávne údaje"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Farebná paleta"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Farebná paleta #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -11039,7 +11384,7 @@ msgstr "Parameter"
 msgid "Parent discovery rules"
 msgstr "Nadradené zisťovacie pravidlá"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr "Nadradené grafy"
 
@@ -11059,33 +11404,33 @@ msgstr "Nadradené spúšťače"
 msgid "Parent web scenarios"
 msgstr "Nadradené web scenáre"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Parsovacia SQL chyba [%1$s] v [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Parsovacia chyba"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Pasívny"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11095,20 +11440,21 @@ msgstr "Pasívny"
 msgid "Password"
 msgstr "Heslo"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Heslo (ešte raz)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
-msgstr ""
+msgstr "Heslo nie je dostupné pre používateľov s %1$s."
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Heslo je požadované pre daný typ média."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Heslo nemôže byť prázdne"
 
@@ -11117,21 +11463,21 @@ msgstr "Heslo nemôže byť prázdne"
 msgid "Peak memory usage: %s"
 msgstr "Špičkové využitie pamäte: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Percentilová čiara (vľavo)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Percentilová čiara (vpravo)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr "Vykoná DNS dotaz. V prípade úspechu vráti a reťazec s požadovaným typom informácie."
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11139,12 +11485,12 @@ msgstr "Vykoná DNS dotaz. V prípade úspechu vráti a reťazec s požadovaným
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Perióda"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Typ periódy"
@@ -11154,24 +11500,24 @@ msgstr "Typ periódy"
 msgid "Periods"
 msgstr "Periódy"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Oprávnenia"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Oprávnenia môžu byť priradené len používateľskej skupine, nie k používateľovi."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Persky (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Koláčový"
 
@@ -11183,55 +11529,56 @@ msgstr "Algoritmus umiestňovania"
 msgid "Plain text"
 msgstr "Jednoduchý text"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Prehrať"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
-msgstr "Prehrať zvuk"
+msgstr "Prehrávať zvuk"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Prosím opravte všetky problémy a stlačte tlačidlo \"Opakovať\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Prosím zadajte potvrdzovací text."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Označte prosím dva elementy"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Polsky (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Vypĺňa polia hostovho inventára"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Port nemôže byť prázdny pre rozhranie hosta."
 
@@ -11239,51 +11586,51 @@ msgstr "Port nemôže byť prázdny pre rozhranie hosta."
 msgid "Port range"
 msgstr "Rozsah portov"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Portugalsky (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Portugalsky (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Pozícia"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "POST"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Náhľad"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Predchádzajúce"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Predchádzajúca"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Predchádzajúca hodnota je < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Predchádzajúca hodnota je = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Predchádzajúca hodnota je > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Predchádzajúca hodnota NIE JE N"
 
@@ -11332,30 +11679,31 @@ msgstr "Fráza utajenia"
 msgid "Privacy protocol"
 msgstr "Protokol utajenia"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Súbor so súkromným kľúčom"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Úroveň oprávnenia"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Pravdepodobne chýba php-ldap modul."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Problém"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Zobraziť problémy"
 
@@ -11367,16 +11715,16 @@ msgstr "Problém na"
 msgid "Problem time"
 msgstr "Čas problému"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Problém, ak všetci podriadení majú problém"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Problém, ak najmenej jeden podriadený má problém"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problémy"
 
@@ -11384,75 +11732,71 @@ msgstr "Problémy"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Prototypy"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Proxy"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" pre host \"%2$s\" neexistuje."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\" je použitá zisťovacím pravidlom \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Proxy \"%s\" už existuje."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Proxy pridaná"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Proxy zmazaná"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Proxy hosty"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Vytváranie proxy rozhrania zlyhalo."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Aktualizácia rozhrania proxy zlyhala."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Proxy režim"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Meno proxy"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Proxy aktualizovaná"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Verejný kľúč"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11463,7 +11807,7 @@ msgstr "Súbor s verejným kľúčom"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "FRONTA POLOŽIEK K AKTUALIZÁCII"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Fronta"
 
@@ -11471,18 +11815,18 @@ msgstr "Fronta"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Čítanie"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Len čítanie"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Čítanie a zápis"
 
@@ -11494,19 +11838,19 @@ msgstr "Dôvod"
 msgid "Received value"
 msgstr "Prijatá hodnota"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
-msgstr ""
+msgstr "Posledný problém"
 
 #: include/views/administration.auditacts.list.php:41
 msgid "Recipient"
 msgstr "Prijímateľ"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Prijímateľ (vzostupne)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Prijímateľ (zostupne)"
 
@@ -11517,28 +11861,28 @@ msgstr "Prijímateľ (zostupne)"
 msgid "Recipient(s)"
 msgstr "Prijímateľ(ia)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Zotavenie"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Text správy po zotavení"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Predmet správy po zotavení"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Obnoviť (v sekundách)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr "Čas obnovania"
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Násobok obnovovacieho času"
 
@@ -11556,48 +11900,52 @@ msgstr "Obnoviť nepodporované položky (v sekundách) \"%1$s\"."
 msgid "Regular expression"
 msgstr "Regulárny výraz"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "Regulárny výraz \"%s\" už existuje."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "Regulárny výraz V nájdený v poslednej hodnote periódy T, poton N=1, ináč 0"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "Regulárny výraz V nájdený v poslednej hodnote periódy T, poton N=1, ináč 0 (bez rozlíšenia veľkosti písmen)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "Regulárny výraz V nájdený v poslednej hodnote periódy T, poton N nie je 1, ináč 0"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "Regulárny výraz V nájdený v poslednej hodnote periódy T, poton N nie je 1, ináč 0 (bez rozlíšenia veľkosti písmen)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Regulárny výraz pridaný"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Regulárny výraz zmazaný"
 msgstr[1] "Regulárne výrazy zmazané"
 msgstr[2] "Regulárne výrazy zmazané"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Regulárny výraz neexistuje."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr "Regulárny výraz musí byť reťazec"
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Regulárny výraz aktualizovaný"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11614,26 +11962,28 @@ msgstr "Vzdialený príkaz"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11644,21 +11994,19 @@ msgstr "Vzdialený príkaz"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Zmazať"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr "Zmazať všetko"
 
@@ -11666,11 +12014,11 @@ msgstr "Zmazať všetko"
 msgid "Remove element"
 msgstr "Zmazať element"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Odobrať z"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Zmazať z obľúbených"
@@ -11679,7 +12027,7 @@ msgstr "Zmazať z obľúbených"
 msgid "Remove from host group"
 msgstr "Zmazať zo skupiny"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Zmazať zo skupín"
 
@@ -11691,28 +12039,28 @@ msgstr "Zmazať host"
 msgid "Remove link"
 msgstr "Zmazať linku"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Zmazať označené"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Nahradiť"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr "Nahradiť aplikácie"
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Nahradiť závislosti"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Nahradiť skupiny"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Report"
 
@@ -11720,35 +12068,36 @@ msgstr "Report"
 msgid "Report 1"
 msgstr "Report 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Report 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Report 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Reporty"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Požadované"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "Požadované pole \"expression\" chýba v mapovaní ikon."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "Požadované pole \"iconid\" chýba v mapovaní ikon."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "Požadované pole \"inventory_link\" chýba v mapovaní ikôn."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Požadované oprávnenia na hosta"
 
@@ -11756,29 +12105,31 @@ msgstr "Požadované oprávnenia na hosta"
 msgid "Required performance (vps)"
 msgstr "Požadovaný výkon (hodnoty za sekundu)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr "Požadovaný výkon Zabbix servera, očakávaná hodnota v nových údajoch za sekundu."
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Požadovaný výkon servera, počet nových hodnôt za sekundu"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Požadovaný stavový kód"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Požadovaný reťazec"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Reset"
 
@@ -11797,9 +12148,9 @@ msgstr "Nastaviť všetky mená a farby na predvolené hodnoty?"
 msgid "Reset confirmation"
 msgstr "Potvrdenie obnovenia"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11812,7 +12163,7 @@ msgstr "Vyriešené"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Zdroj"
@@ -11827,15 +12178,15 @@ msgstr "Čas odozvy"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Výsledok"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Výsledok je NEPRAVDA"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Výsledok je PRAVDA"
 
@@ -11848,7 +12199,8 @@ msgstr "Výsledok z \"%s\""
 msgid "Result type"
 msgstr "Typ výsledku"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr "Pokusov"
 
@@ -11856,60 +12208,69 @@ msgstr "Pokusov"
 msgid "Retries left"
 msgstr "Ostáva pokusov"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr "Sťahovať len hlavičky"
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Opakovať"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr "Vráti ICMP ping čas v sekundách. Príklad: 0.02"
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr "Vráti dostupnosť konkrétneho typu kontroly na hostovi. Hodnoty položky zodpovedajú ikonám dostupnosti v zozname hostov. Platné typy sú: agent, snmp, ipmi, jmx."
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr "Vráti aktuálny stav odstávky pre hosta."
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr "Vráti detailné informácie o hostovi. Reťazec"
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr "Vráti hostname (alebo NetBIOS meno (predvolene) na Windows). Reťazec. Príklad vrátenej hodnoty: www.zabbix.com"
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr "Vráti informácie príslušné k Zabbix Java gateway. Platné parametre sú: ping, version."
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr "Vrátí percento stratených ICMP ping paketov."
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Vpravo"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr "Rumunsky (ro_RO)"
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
-msgstr ""
+msgstr "Riadok pridaný"
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
-msgstr ""
+msgstr "Riadok zmazaný"
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Rozsah riadkov"
 
@@ -11917,11 +12278,11 @@ msgstr "Rozsah riadkov"
 msgid "Rows"
 msgstr "Riadky"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Počet riadkov na stránku"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Pravidlá"
 
@@ -11966,20 +12327,20 @@ msgid "Run remote commands on hosts"
 msgstr "Spusti vzdialené príkazy na hostoch"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr "Spustí zadaný príkaz na hostovi."
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Rusky (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "So"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Ne"
@@ -11995,7 +12356,7 @@ msgstr "OBRAZOVKY"
 msgid "SEARCH"
 msgstr "HĽADAŤ"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SERVER"
 
@@ -12010,13 +12371,13 @@ msgstr "SHA"
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "PREZENTÁCIE"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -12025,17 +12386,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP email"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP server"
@@ -12051,7 +12412,7 @@ msgstr "SNMP kľúč"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12063,9 +12424,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP komunita"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMP rozhrania"
@@ -12074,7 +12435,7 @@ msgstr "SNMP rozhrania"
 msgid "SNMP trap"
 msgstr "SNMP trap"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "SNMP trap kľúč je neplatný."
 
@@ -12098,7 +12459,7 @@ msgstr "SNMPv3 agent"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "SQL počet: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12116,7 +12477,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Vykonanie SQL dotazu zlyhalo \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12125,15 +12486,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH agent"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr "Súbor SSL certifikátu"
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr "Súbor SSL kľúča"
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr "Heslo k SSL kľúču"
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr "SSL verifikácia mena hosta"
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr "SSL verifikácia certifikátu hosta"
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "ZISŤOVANIE"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STAV SPÚŠŤAČOV"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "STAV MONITOROVANIA WEBOV"
 
@@ -12141,92 +12522,92 @@ msgstr "STAV MONITOROVANIA WEBOV"
 msgid "STATUS OF ZABBIX"
 msgstr "STAV ZABBIXU"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "So"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Sobota"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Uložiť"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Uložiť a návrat"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Mierka"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Scenár"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Scenár pridaný"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Scenár aktualizovaný"
 
@@ -12238,7 +12619,7 @@ msgstr "Scenáre"
 msgid "Schedule"
 msgstr "Termín"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr "Naplánovaná kontrola"
 
@@ -12249,126 +12630,125 @@ msgstr "Naplánovaná kontrola"
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Obrazovka \"%1$s\" pridaná."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "Obrazovka \"%1$s\" už existuje v šablóne \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "Obrazovka \"%1$s\" už existuje."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr "Obrazovka \"%1$s\" bunka X - %2$s Y - %3$s je uz obsadená."
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr "Obrazovka \"%1$s\" rozsah stĺpca v bunke X - %2$s Y - %3$s je neplatný."
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr "Obrazovka \"%1$s\" rozsah stĺpca v bunke X - %2$s Y - %3$s je príliš veľký."
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr "Obrazovka \"%1$s\" rozsah riadku v bunke X - %2$s Y - %3$s je neplatný."
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr "Obrazovka \"%1$s\" rozsah riadku v bunke X - %2$s Y - %3$s je príliš veľký."
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Obrazovka \"%1$s\" preskočená - používateľské pravidlo."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Obrazovka \"%1$s\" aktualizovaná."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Obrazovka pridaná"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Nastavenie bunky obrazovky"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Obrazovka zmazaná"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Obrazovka musí obsahovať najmenej jeden riadok a stĺpec."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Obrazovka aktualizovaná"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Obrazovky"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Skript"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Skript \"%1$s\" už existuje."
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Skript pridaný"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Skript zmazaný"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr "Menu cesta skriptu \"%1$s\" už existuje v skripte s menom \"%2$s\"."
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Meno skriptu"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr "Skript s menom \"%1$s\" už existuje v menu ceste pre skript \"%2$s\"."
@@ -12377,17 +12757,17 @@ msgstr "Skript s menom \"%1$s\" už existuje v menu ceste pre skript \"%2$s\"."
 msgid "Script profiler"
 msgstr "Profiler skriptov"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Skript aktualizovaný"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr "Skript so scriptid \"%1$s\" neexistuje."
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Skripty"
 
@@ -12408,7 +12788,7 @@ msgstr "Vyhľadávací vzor je prázdny"
 msgid "Search/Filter elements limit"
 msgstr "Obmedzenie počtu položiek pre vyhľadávanie/filter"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Druhý"
 
@@ -12440,7 +12820,7 @@ msgstr "Sekundárny POC telefón B"
 msgid "Secondary POC screen name"
 msgstr "Sekundárne POC meno obrazovky"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "sekúnd"
 
@@ -12459,69 +12839,76 @@ msgstr "Bezpečnostná úroveň"
 msgid "Security name"
 msgstr "Bezpečnostné meno"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Vybrať"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Označ prototyp"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Označ riadky s hodnotou obsahujúcou"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Označené"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Označené akcie zmazané"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Označené elementy"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Označené skupiny"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Označené hosty"
 
@@ -12537,7 +12924,7 @@ msgstr "Poslať správu používateľským skupinám"
 msgid "Send message to users"
 msgstr "Poslať správu používateľom"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Poslať len na"
 
@@ -12545,11 +12932,11 @@ msgstr "Poslať len na"
 msgid "Send to"
 msgstr "Posielať na"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Poslať používateľským skupinám"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Poslať používateľom"
 
@@ -12558,17 +12945,17 @@ msgstr "Poslať používateľom"
 msgid "Sent"
 msgstr "Poslať"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Sep"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Oddelene"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "September"
 
@@ -12580,7 +12967,7 @@ msgstr "Sériové číslo A"
 msgid "Serial number B"
 msgstr "Sériové číslo B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Server"
@@ -12589,44 +12976,44 @@ msgstr "Server"
 msgid "Server info"
 msgstr "Server info"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Čas na servery"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Služba"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr "Služba \"%1$s\""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Služba \"%1$s\" nemôže byť zmazaná, pretože na nej závisí iná služba."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Služba \"%1$s\" nemôže závisieť sama na sebe."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Služba \"%1$s\" nemôže byť pripojená k spúšťaču a mať zároveň podriadené služby."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Služba \"%1$s\" je už pripojená k ďalším službám."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Služba nemôže byť nadriadená aj podriadená zároveň."
 
@@ -12642,11 +13029,11 @@ msgstr "Služba zmazaná"
 msgid "Service port"
 msgstr "Port služby"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "Čas štartu služby musi byť menší ako jej koniec."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Časy služby"
 
@@ -12658,49 +13045,54 @@ msgstr "Typ služby"
 msgid "Service updated"
 msgstr "Služba aktualizovaná"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Služby"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Služby tvoria kruhovú závislosť."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Sedenie ukončené, prosím prihláste sa znovu."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Závažnosť"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Závažnosť (vzostupne)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Meno závažnosti nemôže byť prázdne."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Zobraziť"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Zobraziť všetky"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] "Zobraziť všetky (%1$s deň)"
+msgstr[1] "Zobraziť všetky (%1$s dni)"
+msgstr[2] "Zobraziť všetky (%1$s dní)"
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Zobraziť podrobnosti"
 
@@ -12730,35 +13122,36 @@ msgstr "Zobraziť udalosti nie staršie ako (v dňoch)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Zobraziť udalosti nie staršie ako (v dňoch) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
-msgstr ""
+msgstr "Zobraziť filter"
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Zobraziť hostov v údržbe"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Zobraziť položky s menom obsahujúcim"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Zobraziť aj položky bez údajov"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Zobraziť legendu"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Zobraziť riadky"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Zobraziť označené"
 
@@ -12766,19 +13159,23 @@ msgstr "Zobraziť označené"
 msgid "Show selected groups"
 msgstr "Zobraziť označené skupiny"
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Zobraziť text ako HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Zobraziť spúšťače"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Zobraziť len nepotvrdené"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] "Zobraziť nepotvrdené (%1$s deň)"
+msgstr[1] "Zobraziť nepotvrdené (%1$s dni)"
+msgstr[2] "Zobraziť nepotvrdené (%1$s dní)"
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Zobraziť hodnotu"
@@ -12787,11 +13184,11 @@ msgstr "Zobraziť hodnotu"
 msgid "Show warning if Zabbix server is down"
 msgstr "Zobraziť varovanie ak je Zabbix server vypnutý"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Zobraziť pracovný čas"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Zobraz"
 
@@ -12811,6 +13208,10 @@ msgstr "Jednoduchá kontrola"
 msgid "Simple graph"
 msgstr "Jednoduchý graf"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "PSČ miesta"
@@ -12848,7 +13249,7 @@ msgid "Site state / province"
 msgstr "Umiestnenie štát / provincia"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr "Veľkosť daného súboru. Veľkosť v bytoch. Súbor musí byť čitatelný používateľom zabbix. Príklad: vfs.file.size[/var/log/syslog]"
 
@@ -12866,16 +13267,16 @@ msgstr "Preskočené kopírovanie grafu \"%1$s\" na host \"%2$s\"."
 msgid "Slide"
 msgstr "Slajd"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Prezentácia"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr "Prezentácia \"%1$s\" už existuje."
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Prezentácia \"%s\" už existuje."
@@ -12884,11 +13285,11 @@ msgstr "Prezentácia \"%s\" už existuje."
 msgid "Slide show added"
 msgstr "Prezentácia pridaná"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Prezentácia zmazaná"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Prezentácia musí obsahovať slajdy."
 
@@ -12896,10 +13297,10 @@ msgstr "Prezentácia musí obsahovať slajdy."
 msgid "Slide show updated"
 msgstr "Prezentácia aktualizovaná"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Prezentácie"
 
@@ -12907,15 +13308,15 @@ msgstr "Prezentácie"
 msgid "Slides"
 msgstr "Slajdy"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Slovensky (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Odložiť"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Soft"
 
@@ -12925,7 +13326,7 @@ msgstr "Softvér"
 
 #: include/hosts.inc.php:185
 msgid "Software (Full details)"
-msgstr "Softvér (podrobnosti)"
+msgstr "Softvér (podrobne)"
 
 #: include/hosts.inc.php:190
 msgid "Software application A"
@@ -12948,28 +13349,28 @@ msgid "Software application E"
 msgstr "Softvér aplikácia E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr "Softvérová architektúra"
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr "Zoznam softvérových balíčkov - zoznam všetkých balíčkov podporovaných balíčkovacími manažérmi"
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Zoradiť podľa"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
-msgstr ""
+msgstr "Zoradiť záznamy podľa"
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Radenie (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Zoradiť spúšťače podľa"
 
@@ -12982,11 +13383,11 @@ msgstr "Zoradenie podľa pola \"%1$s\" nie je dovolené."
 msgid "Source"
 msgstr "Zdroj"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Španielsky (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Špecifikovaný skript neexistuje alebo nemáte práva na jeho vykonanie."
 
@@ -12994,63 +13395,63 @@ msgstr "Špecifikovaný skript neexistuje alebo nemáte práva na jeho vykonanie
 msgid "Speed"
 msgstr "Rýchlosť"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Skladaný"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Štandardné položky"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Začiatok v"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr "Čas štartu Zabbix servera, Unix timestamp."
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Stav"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr "Stav služby. 0 - beží, 1 - pozastavená, 2 - štartovaná, 3 - pozastavovaná, 4 - neurčitá, 5 - zastavovaná, 6 - zastavená, 7 - neznáme, 255 - žiadna taká služba"
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Stav"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Stav (vzostupne)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Stav (zostupne)"
 
@@ -13063,7 +13464,7 @@ msgstr "Výpočet stavu"
 msgid "Status calculation algorithm"
 msgstr "Algoritmus výpočtu stavu"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Stavové kódy"
 
@@ -13072,7 +13473,7 @@ msgid "Status of Web monitoring"
 msgstr "Stav monitorovania webov"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Stav Zabbixu"
 
@@ -13089,40 +13490,40 @@ msgid "Status only"
 msgstr "Len stav"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Krok"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Krok \"%1$s\" [%2$s z %3$s] zlyhal: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Trvanie kroku"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Krok scenára"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr "Krok s menom \"%1$s\" už existuje."
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Kroky"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Uložiť hodnotu"
@@ -13131,11 +13532,11 @@ msgstr "Uložiť hodnotu"
 msgid "Straight"
 msgstr "Priamy"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Štýl"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Subfilter [ovplyvňuje len filtrované údaje!]"
 
@@ -13143,11 +13544,11 @@ msgstr "Subfilter [ovplyvňuje len filtrované údaje!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Predmet"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Podmapa"
 
@@ -13156,32 +13557,32 @@ msgid "Success Audit"
 msgstr "Audit úspešný"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr "Súhrnná štatistika sieťového rozhrania. Celočíselná hodnota. Mode - jeden z bytes (prevolene), packets, errors alebo dropped"
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "Súčet hodnôt v periode T je < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Súčet hodnôt v periode T je = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Súčet hodnôt v periode T je > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "Súčet hodnôt v periode T NIE JE N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Ne"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Nedeľa"
 
@@ -13189,27 +13590,27 @@ msgstr "Nedeľa"
 msgid "Support"
 msgstr "Podpora"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Priezvisko"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr "Swap in. Ak type je count - počet swapov je vrátený. Ak type je pages - počet swapovaných stránok je vrátený. Ak swap chýba, potom all je použitý."
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr "Swap out. Ak type je count - počet swapov je vrátený. Ak type je pages - počet swapovaných stránok je vrátený. Ak swap chýba, potom all je použitý."
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr "Swapovací priestor. Hodnota v bytoch. Ak swap chýba, je použitý all. Ak mode chýba, je použitý used."
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Švédsky (sv_SE)"
 
@@ -13217,16 +13618,16 @@ msgstr "Švédsky (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "Prepnutie autentifikačnej metódy spôsobí ukončenie všetkých sedeni okrem Vásho! Pokračovať?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Predvolené nastavenie systémom"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Sytémová chyba."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr "Systémový lokálny čas. Čas v sekundách."
 
@@ -13235,21 +13636,21 @@ msgid "System status"
 msgstr "Stav systému"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr "Systémový čas prevádzky v sekundách."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Št"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Št"
@@ -13268,11 +13669,11 @@ msgid "TOTAL"
 msgstr "SPOLU"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "KOMENTÁRE K SPÚŠŤAČU"
+msgid "TRIGGER DESCRIPTION"
+msgstr "POZNÁMKA SPÚŠŤAČA"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "PRAVDA"
 
@@ -13290,14 +13691,14 @@ msgstr "Tabuľka \"%1$s\" neobsahuje pole s menom \"%2$s\"."
 msgid "Tag"
 msgstr "Označenie"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Cieľ"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Zoznam cieľov"
 
@@ -13306,130 +13707,133 @@ msgid "Target type"
 msgstr "Typ cieľa"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Šablóna"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Šablóna \"%1$s\" už existuje."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Šablóna \"%1$s\" pre host \"%2$s\" neexistuje."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr "Šablóna \"%1$s\" s kľúčom položky \"%2$s\" je už pripojená k hostovi."
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Šablóna pridaná"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Šablóna nemôže byť pripojená k inej šablóne viac ako raz, vrátanie prepojenia cez iné šablóny."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Šablóna zmazaná"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Skupina šablón"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Pripojenia šablón"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Zoznam šablón"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Meno šablóny"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr "Šablóna obrazovky \"%1$s\" už existuje."
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Šablóna obrazoviek"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Šablóna spúšťača"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Šablóna aktualizovaná"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr "Šablóna s rovnakým menom \"%1$s\" už existuje."
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Šablóna s rovnakým menom \"%s\" už existuje."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr "Šablóna s rovnakým viditeľným menom \"%1$s\" už existuje."
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Šablóna s rovnakým zobrazovaným menom \"%s\" už existuje."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Položky šablóny"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Šablóny"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Šablóny \"%1$s\" odpojené od hostov \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Test"
 
@@ -13437,11 +13841,11 @@ msgstr "Test"
 msgid "Test authentication"
 msgstr "Test autentifikácie"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Test potvrdenia"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Testovacie údaje"
 
@@ -13455,22 +13859,22 @@ msgid "Test string"
 msgstr "Testovací reťazec"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Text"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
-msgstr ""
+msgstr "\"%1$s.%2$s\" metóda musí byť volaná bez \"auth\" parametra."
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr "Súradnica X prvku obrazovky umiestneného na X - %1$s a Y - %2$s obrazovky \"%3$s\" je príliš veľká."
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr "Súradnica Y prvku obrazovky umiestneného na X - %1$s a Y - %2$s obrazovky \"%3$s\" je príliš veľká."
@@ -13478,7 +13882,7 @@ msgstr "Súradnica Y prvku obrazovky umiestneného na X - %1$s a Y - %2$s obrazo
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "Frontend nevybral Zabbix databázu."
@@ -13493,12 +13897,12 @@ msgstr "Frontend nevybral Zabbix databázu. Aktuálna verzia databázy (povinná
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Skupina už nie je zisťovaná a bude zmazaná %1$s (na %2$s v %3$s)."
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Host už nie je zisťovaný a bude zmazaný %1$s (na %2$s v %3$s)."
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -13506,7 +13910,7 @@ msgstr[0] "Obrázok je použitý v mape ikon %1$s."
 msgstr[1] "Obrázok je použitý v mapách ikon %1$s."
 msgstr[2] "Obrázok je použitý v mapách ikon %1$s."
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -13514,7 +13918,7 @@ msgstr[0] "Obrázok je použitý v mape %1$s."
 msgstr[1] "Obrázok je použitý v mapách %1$s."
 msgstr[2] "Obrázok je použitý v mapách %1$s."
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Položka už nie je zistená a bude zmazaná v %1$s (%2$s na %3$s)."
@@ -13523,19 +13927,19 @@ msgstr "Položka už nie je zistená a bude zmazaná v %1$s (%2$s na %3$s)."
 msgid "The queue is empty."
 msgstr "Fronta je prázdna."
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Prijatý JSON nie je platná JSON-RPC požiadavka."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "Požadovaná vzdialená procedúra neexistuje / nie je dostupná"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr "Aplikácia web scenára patrí k inému hostovi, ako je host web scenára."
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Téma"
 
@@ -13547,11 +13951,11 @@ msgstr[0] "Tam je \"%1$d\" skupina s interným GUI prístupom."
 msgstr[1] "Tam sú \"%1$d\" skupiny s interným GUI prístupom."
 msgstr[2] "Tam je \"%1$d\" skupín s interným GUI prístupom."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Tretí"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Toto pole je automaticky vyplnené položkou \"%s\"."
@@ -13560,11 +13964,11 @@ msgstr "Toto pole je automaticky vyplnené položkou \"%s\"."
 msgid "This month"
 msgstr "Tento mesiac"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Tento stĺpec obrazovky nie je prázdny. Aj tak zmazať?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Tento riadok obrazovky nie je prázdny. Aj tak zmazať?"
 
@@ -13576,27 +13980,27 @@ msgstr "Tento týždeň"
 msgid "This year"
 msgstr "Tento rok"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Št"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Do"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13605,28 +14009,28 @@ msgstr "Do"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Čas"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Čas (vzostupne)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Čas (zostupne)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr "Čas určitého Zabbix procesu alebo skupiny procesov (identifikované <type> a <num>) strávené v <state> v percentách."
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr "Posledný čas prístupu proxy. Name - meno proxy. Param - posledný prístup. Unix timestamp."
 
@@ -13634,54 +14038,54 @@ msgstr "Posledný čas prístupu proxy. Name - meno proxy. Param - posledný pr�
 msgid "Time period"
 msgstr "Časová perióda"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Časový posun"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Typ času"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr "Časová zóna pre PHP nie je nastavená (nastavenie \"date.timezone\")."
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Časový limit"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Časová značka"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "Časová značka nie je odlišná od serverového Zabbix času o viac ako T sekúnd, potom N = 1, 0 - inak"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "Časová značka nie je odlišná od serverového Zabbix času o viac ako T sekúnd, potom N NIE JE 1, 0 - inak"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr "Timestamp štartu systému."
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Titulok"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Na nastavenie rozhrania hosta označte jeden typ položky pre všetky položky"
 
@@ -13689,17 +14093,18 @@ msgstr "Na nastavenie rozhrania hosta označte jeden typ položky pre všetky po
 msgid "Today"
 msgstr "Dnes"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Hore"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Celkom"
 
@@ -13717,7 +14122,7 @@ msgstr "Celkový čas: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Operácia nebola ukončená. Ukončujem ju..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Prenosová chyba."
 
@@ -13734,77 +14139,77 @@ msgstr "Perióda uloženia trendových údajov (v dňoch) \"%1$s\"."
 msgid "Trend storage period"
 msgstr "Perióda uloženia trendov"
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr "Perióda uloženia trendov (v dňoch)"
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trendy"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Spúšťač"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Spúšťač \"%1$s\" už existuje na \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Spúšťač \"%1$s\" závisí na inom spúšťači \"%2$s\", ktorý neexistuje."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Spúšťač \"%1$s\" preskočený - používateľské pravidlo."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Spúšťač \"%s\" patrí k šablónam s rôznymi spojeniami."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Spúšťač pridaný"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr "Spúšťač nemôže závisieť na spúšťači, ktorý je z neho zdedený."
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Poznámky k spúšťaču"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr "Perióda uloženia údajov spúšťačov (v dňoch)"
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Spúšťač zmazaný"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr "Poznámka spúšťača"
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] "Spúštač vypnutý"
@@ -13812,14 +14217,14 @@ msgstr[1] "Spúštače vypnuté"
 msgstr[2] "Spúštače vypnuté"
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Zobrazovacie možnosti spúšťačov"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] "Spúštač povolený"
@@ -13835,11 +14240,12 @@ msgstr "Perióda uloženia údajov udalostí a poplachov spúšťačov"
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr "Perióda uloženia údajov udalostí a poplachov spúšťačov (v dňoch) \"%1$s\"."
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Výraz podmienky spúšťača"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "Výraz podmienky musí obsahovať najmenej jednu referenciu na host:kľúč."
 
@@ -13847,7 +14253,7 @@ msgstr "Výraz podmienky musí obsahovať najmenej jednu referenciu na host:kľ�
 msgid "Trigger form"
 msgstr "Formulár spúšťača"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "Spúšťač má položky zo šablóny \"%1$s\" ktorá nie je pripojená k hostu."
@@ -13860,12 +14266,12 @@ msgstr "Spúšťač je v \"normal\" stave"
 msgid "Trigger in \"unknown\" state"
 msgstr "Spúšťač je v \"unknown\" stave"
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "Spúšťač v šablóne \"%1$s\" má závislosť na spúšťači v šablóne \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Spúšťač práve pridaný. Zatiaľ je bez aktuálneho stavu."
 
@@ -13877,54 +14283,54 @@ msgstr "Typ popisku spúšťača"
 msgid "Trigger name"
 msgstr "Meno spúšťača"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Prototyp spúšťača"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "Prototyp spúšťača \"%1$s\" obsahuje prototypy položiek z rôznych zisťovacích pravidiel."
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
-msgstr ""
+msgstr "Prototyp spúšťača \"%1$s\" musí obsahovať najmenej jeden prototyp položky."
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr "Prototyp spúšťača pridaný"
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr "Prototyp spúšťača zmazaný"
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] "Prototyp spúštača vypnutý"
 msgstr[1] "Prototypy spúštača vypnuté"
 msgstr[2] "Prototypy spúštača vypnuté"
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] "Prototyp spúštača povolený"
 msgstr[1] "Prototypy spúštača povolené"
 msgstr[2] "Prototypy spúštača povolené"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr "Prototyp spúšťača aktualizovaný"
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Prototypy spúšťačov"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr "Prototypy spúšťačov zmazané"
 
@@ -13932,23 +14338,31 @@ msgstr "Prototypy spúšťačov zmazané"
 msgid "Trigger prototypes of"
 msgstr "Prototypy spúšťačov pre"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr "Prototypy spúšťačov aktualizované"
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Závažnosti spúšťačov"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Závažnosť spúšťača"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr "\"OK\" status spúšťača"
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr "\"Problém\" status spúšťača"
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Spúšťač aktualizovaný"
 
@@ -13956,40 +14370,41 @@ msgstr "Spúšťač aktualizovaný"
 msgid "Trigger value"
 msgstr "Hodnota spúšťača"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Spúšťače"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr "Spúšťače (pov./zak.)[p/o]"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Spúšťače zmazané"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Informácie o spúšťačoch"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Hromadná aktualizácia spúšťačov"
 
@@ -13997,141 +14412,143 @@ msgstr "Hromadná aktualizácia spúšťačov"
 msgid "Triggers overview"
 msgstr "Prehľad spúšťačov"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Stav spúšťačov"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "100 najaktívnejších spúšťačov"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Spúšťače so závažnosťou"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Skrátené"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Pokus o čítanie nedostupnej vlastnosti \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Ut"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Turecky (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Musia byť označené dva elementy"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Dve položky (\"%1$s\" and \"%2$s\") nie je možné naplniť jedným inventárnym polom \"%3$s\", viedlo by to ku sporu."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Typ"
 
 #: include/hosts.inc.php:110
 msgid "Type (Full details)"
-msgstr "Typ (podrobnosti)"
+msgstr "Typ (podrobne)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Typ (OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Typ (vzostupne)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Typ (zostupne)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Typ kalkulácie"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Typ informácií"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "Typ informácie musí byť \"Log\" pre log kľúč."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "Typ informácie musí byť \"Numeric (float)\" pre agregované položky."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Typy"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "NEZNÁMY"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "UP"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (po prihlásení)"
 
@@ -14147,20 +14564,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr "URL meno by malo byť unikátne pre mapu \"%s\"."
+
+#: include/html.inc.php:112
 msgid "URL parameter cannot be array."
 msgstr "URL parameter nemôže byť pole."
 
-#: include/html.inc.php:112
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr "URL parameter meno je prázdny."
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr "URL by malo mať \"meno\" aj \"url\" pre mapu \"%s\"."
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLky"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160 znakov)"
 
@@ -14168,15 +14595,11 @@ msgstr "USA (160 znakov)"
 msgid "USER PROFILE"
 msgstr "POUŽÍVATEĽSKÝ PROFIL"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Ukrajinsky (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Nie je možné vybrať konfiguráciu."
 
@@ -14184,7 +14607,7 @@ msgstr "Nie je možné vybrať konfiguráciu."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "Nie je možné nahrať súbor, pretože \"file_uploads\" je zakázaný."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Nepotvrdené"
 
@@ -14197,20 +14620,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Nepotvrdené PROBLÉMOVÉ udalosti"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Len nepotvrdené"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
-msgstr ""
+msgstr "Nedostupné pre používateľov s %1$s."
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Odblokovať označené"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Odblokovať označených používateľov?"
 
@@ -14219,29 +14642,29 @@ msgstr "Odblokovať označených používateľov?"
 msgid "Units"
 msgstr "Jednotky"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14251,23 +14674,20 @@ msgstr "Neznámy"
 msgid "Unknown action"
 msgstr "Neznáma akcia"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Neznámy algoritmus výpočtu stavu služby"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
-msgstr ""
+msgstr "Neznáma chyba"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Neznáma funkcia."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Neznáme položky hosta, nenájdené položky na vybranom hostovi"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Neznámy host, nie je prítomný v systéme"
 
@@ -14279,23 +14699,23 @@ msgstr "Neznámy typ rozhrania."
 msgid "Unknown resource"
 msgstr "Neznámy zdroj"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
-msgstr ""
+msgstr "Neznámy krok zlyhal: %1$s"
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Neznámy typ hodnoty"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Odpojiť"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Odpojiť a vyčistiť"
 
@@ -14303,61 +14723,61 @@ msgstr "Odpojiť a vyčistiť"
 msgid "Unlink from template"
 msgstr "Odpojiť od šablóny"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Odpojiť od šablón"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Aplikácia \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Zisťovacie pravidlo \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Graf \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Prototyp grafu \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Prototyp hosta \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Položka \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Prototyp položky \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Spúšťač \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Prototyp spúšťača \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Odpojené: Web scenár \"%1$s\" na \"%2$s\"."
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Povoliť zvuky"
 
@@ -14371,32 +14791,43 @@ msgstr "Neplatný typ súboru na import \"%1$s\"."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Neplatný formát importu \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr "Nepodporovaný parameter \"%1$s\" pre prototyp skupiny."
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr "Nepodporovaný parameter \"%2$s\" pre filtrovaciu podmienku akcie \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nepodporovaný parameter \"%2$s\" pre filtrovaciu podmienku zisťovacieho pravidla \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr "Nepodporovaný parameter \"%2$s\" pre prototyp skupiny \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr "Nepodporovaný parameter \"%2$s\" pre prototyp hosta %1$s inventár hosta."
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr "Nepodporovaný parameter \"%2$s\" pre filter akcie \"%1$s\"."
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Nepodporovaný parameter \"%2$s\" pre filter akcie \"%1$s\"."
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Dostupný"
@@ -14407,90 +14838,90 @@ msgid "Up"
 msgstr "Dostupný"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
-msgstr "Aktulizovať existujúce"
+msgstr "Aktualizovať existujúce"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Interval obnovovania"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Interval obnovovania (v sekundách)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
-msgstr "Aktualizované"
+msgstr "Aktualizácia"
 
 #: include/hosts.inc.php:560
 msgid "Updated status of host"
 msgstr "Aktualizovaný stav hosta"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Aktualizované: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Aktualizované: Aplikácia \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Aktualizované: Pravidlo zisťovania \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Aktualizované: Prototyp hosta \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Aktualizované: Položka \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Aktualizované: Prototyp položky \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Aktualizované: Spúšťač \"%1$s\" na \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Aktualizované: Prototyp spúšťača \"%1$s\" na \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "Aktualizované: Web scenár \"%1$s\" na \"%2$s\"."
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Nahrať"
 
@@ -14498,14 +14929,14 @@ msgstr "Nahrať"
 msgid "Upper level maps"
 msgstr "Mapa najvyššej úrovne"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Doba prevádzky"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr "Doba prevádzky Zabbix server procesov v sekundách."
 
@@ -14513,10 +14944,11 @@ msgstr "Doba prevádzky Zabbix server procesov v sekundách."
 msgid "Uptime/Downtime"
 msgstr "Doba dostupnosti/nedostupnosti"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+#, fuzzy
+msgid "Use bulk requests"
+msgstr "Použiť hromadné požiadavky"
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14531,85 +14963,89 @@ msgid "Used in actions"
 msgstr "Používané v akciách"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Používateľ"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "Používateľ \"%s\" nemôže byť bez používateľskej skupiny."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Používateľ pridaný"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Používateľ si nemôže sám sebe zmeniť typ"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Používateľ nemôže sám seba pridať do vypnutej skupiny alebo do skupiny s vypnutým GUI prístupom."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Používateľ nemôže sám sebe zmeniť GUI prístup."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Používateľ nemôže sám sebe meniť stav"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Používateľ nemôže sám sebe meniť stav."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Používateľ zmazaný"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Používateľská skupina"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr "Používateľská skupina \"%1$s\" už existuje."
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr "Skupina \"%1$s\" je jediná skupina, kde patrí používateľ \"%2$s\"."
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Skupina \"%1$s\" je použitá v nastavení skupiny pre správu o nefunčnej databáze."
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Používateľská skupina \"%1$s\" je použitá v skripte \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "Používateľská skupina \"%s\" už existuje."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] "Skupina vypnutá"
 msgstr[1] "Skupiny vypnuté"
 msgstr[2] "Skupiny vypnuté"
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] "Skupina povolená"
@@ -14627,34 +15063,34 @@ msgstr "Používateľská skupina pre správu o nedostupnej databáze \"%1$s\"."
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Používateľské skupiny"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Používateľ nemá dovolené zmazať sám seba."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Používateľ nemôže meniť svoj prístup ku GUI, tým že sa stane členom používateľskej skupiny \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Používateľ nemôže meniť svoj systémový stav, tým že sa stane členom používateľskej skupiny \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Používateľské meno"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "Používateľské meno nesúhlasí s údajmi v databáze"
 
@@ -14680,243 +15116,243 @@ msgstr "Perióda uloženia údajov používateľských sedení (v dňoch) \"%1$s
 msgid "User sessions"
 msgstr "Používateľské sedenia"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Typ používateľa"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Používateľ aktualizovaný"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Používateľ s aliasom \"%s\" už existuje."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Používateľské meno"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Používatelia"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
-msgstr "Používatelia (online)"
+msgstr "Používatelia (prihlásení)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Používatelia odblokovaní"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr "VMware štatistiky cache. Platné módy sú: total, free, pfree, used a pused."
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr "VMware stav klustra, <url> - URL VMware služby, <name> - VMware kluster meno"
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr "VMware protokol udalostí, <url> - URL VMware služby"
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware BIOS uuid, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware veľkosť balloned pamäti, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware kluster meno, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr "VMware štatistika čítania datastore, <url> - URL VMware služby, <uuid> - VMware host meno, <datastore> - datastore meno, <mode> - latencia"
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr "VMware štatistika zápisov datastore, <url> - URL VMware služby, <uuid> - VMware host meno, <datastore> - datastore meno, <mode> - latencia"
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware model, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware meno, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr "VMware vstupné sieťové štatistiky, <url> - URL VMware služby, <uuid> - VMware host meno, <mode> - bps"
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr "VMware výstupné sieťové štatistiky, <url> - URL VMware služby, <uuid> - VMware host meno, <mode> - bps"
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware frekvencia procesora, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware model procesora, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware využitie procesora v Hz, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware status, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware celková veľkosť pamäte, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware prevádzkový čas, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware veľkosť použitej pamäte, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware meno predajcu, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr "VMware verzia, <url> - URL VMware služby, <uuid> - VMware host meno"
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr "VMware plné meno služby, <url> - URL VMware služby"
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr "VMware verzia, <url> - URL VMware služby"
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware veľkosť balloned pamäti virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware použitý úložný priestor virtuálnym strojom, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware veľkosť komprimovanej pamäte virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr "VMware štatistika čítania diskov virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja, <instance> - inštancia disku, <mode> - bps/ops - bytes/operations za sekundu"
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr "VMware štatistika zápisov diskov virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja, <instance> - inštancia disku, <mode> - bps/ops - bytes/operations za sekundu"
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr "VMware štatistika súborového systému virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja, <fsname> - meno súborového systému, <mode> - total/free/used/pfree/pused"
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware využitie hostiteľskej pamäti virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware využitie hostovej pamäti virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware meno hypervízora virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware meno virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr "VMware štatistika vstupov sieťového rozhrania virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja, <instance> - sieťové rozhranie, <mode> - bps/pps - bytes/packets za sekundu"
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr "VMware štatistika výstupov sieťového rozhrania virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja, <instance> - sieťové rozhranie, <mode> - bps/pps - bytes/packets za sekundu"
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware stav napájania virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware veľkosť privátnej pamäte virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware využitie procesora virtuálneho stroja v Hz, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware veľkosť zdielanej pamäte virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware veľkosť swapovanej pamäte virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware celková veľkosť pamäte virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware nevyužitý priestor virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware nezdieľaný priestor virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr "VMware čas prevádzky virtuálneho stroja, <url> - URL VMware služby, <uuid> - VMware host meno virtuálneho stroja"
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Hodnota"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Hodnota \"%1$s\" je neplatná pre parameter \"grid_align\". Možnosti: \"%2$s\" a \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr "Hodnota \"%1$s\" je neplatná pre parameter \"grid_show\". Možnosti: \"%2$s\" a \"%3$s\"."
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Hodnota \"%1$s\" je neplatná pre parameter \"grid_show\". Možnosti: \"%2$s\"."
@@ -14934,28 +15370,28 @@ msgstr "Hodnota \"%1$s\" je príliš dlhá pre pole \"%2$s\" - %3$d znakov. Povo
 #: include/validate.inc.php:326 include/validate.inc.php:350
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has incorrect decimal format."
-msgstr ""
+msgstr "Hodnota \"%2$s\" z \"%1$s\" má nesprávny desiatkový formát."
 
 #: include/validate.inc.php:336 include/validate.inc.php:352
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits after the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "Hodnota \"%2$s\" z \"%1$s\" má príliš veľa číslic po desatinnej čiarke. Nemôže ich mať viac ako %3$s."
 
 #: include/validate.inc.php:332
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" has too many digits before the decimal point: it cannot have more than %3$s digits."
-msgstr ""
+msgstr "Hodnota \"%2$s\" z \"%1$s\" má príliš veľa číslic pred desatinnou čiarkou. Nemôže ich mať viac ako %3$s."
 
 #: include/validate.inc.php:328
 #, c-format
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
-msgstr ""
+msgstr "Hodnota \"%2$s\" z \"%1$s\" je príliš dlhá. Nemôže mať viac ako %3$s číslic pred a viac ako %4$s číslic po desatinnej čiarke."
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr "Využitie cache hodnôt. Platné parametre sú: requests, hits a misses."
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr "Štatistiky cache hodnôt. Platné módy sú: total, free, pfree, used a pused."
 
@@ -15001,10 +15437,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Mapa hodnôt s valuemapid \"%1$s\" neexistuje."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Mapovanie hodnôt"
 
@@ -15013,7 +15449,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "Mapovanie hodnôt musí mať najmenej jedno mapovanie."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr "Hodnota nejakého počítadla výkonu, kde parameter \"counter\" je počítadlova cesta a parameter \"interval\" je počet posledných sekúnd, pre ktoré agent vráti priemernú hodnotu."
 
@@ -15025,8 +15461,8 @@ msgstr "Hodnota: bez údajov"
 msgid "Values"
 msgstr "Hodnoty"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Premenné"
 
@@ -15039,64 +15475,69 @@ msgid "Verbose"
 msgstr "Rozvláčny"
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr "Verzia zabbix_agent(d)a bežiaceho na monitorovanom hoste. Reťazec. Príklad vrátenej hodnoty: 1.1"
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertikálny"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Vertikálne zarovnanie"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr "Vietnamsky (vi_VN)"
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Pohľad nie je vykresľovaný."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr "Štatistiky virtuálnej pamäti."
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Zobrazované meno"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Zobrazované meno nemôže byť prázdne ak meno hostu chýba."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "St"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Varovná"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Je nám ľúto, maximálný počet elementov na zapamätanie bol už dosiahnutý."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15104,67 +15545,85 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitorovanie webov"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr "Web scenár \"%1$s\" už existuje na hoste \"%2$s\"."
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Web scenár \"%1$s\" už existuje."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Web scenár zmazaný"
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web scenár zakázaný"
 msgstr[1] "Web scenár zakázaný"
 msgstr[2] "Web scenár zakázaný"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Scenár povolený"
 msgstr[1] "Scenáre povolené"
 msgstr[2] "Scenáre povolené"
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr "Chýbajúce parametre vo web scenári: %1$s"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr "Web scenár musí mať najmenej jeden krok."
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr "Meno web scenára nemôže byť prázdne."
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr "Krok web scenára \"%1$s\" už existuje."
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr "URL web scenára nemôže byť prázdna."
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr "Meno kroku web scenára nemôže byť prázdne."
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr "Meno kroku web scenára by malo obsahovať len tlačiteľné znaky."
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr "Číslo kroku web scenára nemôže byť menšie ako 1."
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Web scenáre"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "St"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -15172,9 +15631,9 @@ msgstr "Streda"
 msgid "Week"
 msgstr "Týždeň"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Týždenne"
 
@@ -15182,12 +15641,12 @@ msgstr "Týždenne"
 msgid "When active"
 msgstr "Iba v dňoch/časoch"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Šírka"
@@ -15195,30 +15654,30 @@ msgstr "Šírka"
 #: include/views/configuration.maintenance.edit.php:41
 #: include/views/configuration.maintenance.list.php:70
 msgid "With data collection"
-msgstr "So zberom údajov"
+msgstr "So zbieraním údajov"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "S poslednou udalosťou nepotvrdenou"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "S problémami"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "So spúšťačmi"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "S nepotvrdenými udalosťami"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Bez problémov"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Bez spúšťačov"
 
@@ -15227,7 +15686,7 @@ msgid "Wizard"
 msgstr "Pomocník"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15240,180 +15699,165 @@ msgstr "Pracovný čas"
 msgid "Working time \"%1$s\"."
 msgstr "Pracovný čas\"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Zápis"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Nesprávne polia pre závislosť na službe \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Nesprávne polia pre element."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Nesprávne polia pre hosta \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr "Nesprávne polia pre obrázok \"%1$s\"."
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr "Nesprávne polia pre obrázok."
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr "Nesprávne polia pre linktrigger delete."
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr "Nesprávne polia pre linktrigger update."
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr "Nesprávne polia pre linktrigger."
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Nesprávne polia pre makro \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr "Nesprávne polia pre linku mapy."
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Nesprávne polia pre typ média."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr "Nesprávne polia pre proxy \"%1$s\"."
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Nesprávne polia pre skript."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Nesprávne polia pre službu \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Nesprávne polia pre čas služby \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Nesprávne polia pre spúšťač."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Nesprávne polia pre používateľa \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Nesprávne makro \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Označenie osi X"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML súbor obsahuje chybu %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML súbor obsahuje chyby"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML súbor obsahuje fatálnu chybu %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML súbor obsahuje varovania %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Maximálna hodnota osy Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Maximálna hodnota pre os Y musí byť väčšia ako minimálna hodnota pre túto os."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Minimálna hodnota osy Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Strana osi Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Označenie osi Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "d-m-Y H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "d.M.Y H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr "d.m.Y"
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr "d.m.Y H:i"
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr "d.m.Y H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15421,96 +15865,105 @@ msgstr "d.m.Y H:i:s"
 msgid "Year"
 msgstr "Rok"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Ročne"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Áno"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Nemôžete si vybrať niektoré jazyky pretože locales pre ne nie sú nainštalované na web servery."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Nie je Vám dovolené meniť privilégiá pre používateľa \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Nie ste prihlásený."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Nemôžete zmeniť hostov pre aktuálne označenie."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Nešpecifikovali ste hosta pre operáciu."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Nešpecifikovali ste skupinu pre operáciu."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Nešpecifikovali ste ciele pre akciu príkazu \"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Nešpecifikovali ste ciele pre akciu globálneho skriptu \"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "Nemáte oprávnenie na vykonanie tejto operácie."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Nemáte oprávnenia na vytváranie používateľov."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Nemáte oprávnenia na aktualizáciu iných používateľov."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Nemáte oprávnenia na aktulizáciu používateľa alebo používateľ neexistuje."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr "Nemáte oprávnenia k prístupu k tejto stránke."
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Musíte byť prihlásený pre zobrazenie tejto stránky."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr "Ste prihlásený ako"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15523,7 +15976,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15542,8 +15995,8 @@ msgid "Zabbix User"
 msgstr "Zabbix používateľ"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15569,10 +16022,11 @@ msgstr "Zabbix interne"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix interná autentifikácia"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix server"
@@ -15588,7 +16042,7 @@ msgstr ""
 "1. Nesprávna hodnota IP/DNS pre server v \"zabbix.conf.php\";\n"
 "2. Nesprávne sieťové nastavenie.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "IP alebo port pre Zabbix server nie je nastavené!"
 
@@ -15596,15 +16050,15 @@ msgstr "IP alebo port pre Zabbix server nie je nastavené!"
 msgid "Zabbix server activity check interval"
 msgstr "Interval aktívnej kontroly zo strany Zabbix servera"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Zabbix server informácie"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix server nie je v prevádzke: zobrazované informácie nemusia byť aktuálne."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix server v prevádzke"
 
@@ -15613,11 +16067,11 @@ msgstr "Zabbix server v prevádzke"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Zabbix server používa kontrolný interval \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Zabbix server meno"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Port Zabbix servera"
 
@@ -15625,25 +16079,20 @@ msgstr "Port Zabbix servera"
 msgid "Zabbix trapper"
 msgstr "Zabbix trapper"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Zväčšenie"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Nesprávna hodnota pre deň: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Nesprávna hodnota pre mesiac: \"%s\" ]"
@@ -15652,19 +16101,19 @@ msgstr "[Nesprávna hodnota pre mesiac: \"%s\" ]"
 msgid "agent"
 msgstr "agent"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "všetky"
 
@@ -15672,19 +16121,15 @@ msgstr "všetky"
 msgid "all media"
 msgstr "všetky médiá"
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "už existuje"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "na modro"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "na zeleno"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "na červeno"
 
@@ -15696,83 +16141,49 @@ msgstr "automatická registrácia"
 msgid "auto-registered host"
 msgstr "automaticky registrovaný host"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "priemer"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
-msgstr ""
+msgstr "skontroluj výraz začínajúci od \"%1$s\""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "dní"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15794,19 +16205,15 @@ msgstr "zistené služby"
 msgid "discovery"
 msgstr "zisťovanie"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dynamický"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "elementy"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "elementy kopírovať do ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from a esc_step_to musia byť nastavené naraz."
 
@@ -15818,47 +16225,49 @@ msgstr "presne"
 msgid "executed"
 msgstr "vykonané"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
-msgstr ""
+msgstr "výraz je prázdny"
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "pevný"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "nájdených"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "globálne nastavenia údržby"
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "host"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "skupina"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "ikonka"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "obrázok"
 
@@ -15866,7 +16275,7 @@ msgstr "obrázok"
 msgid "in"
 msgstr "v"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "nesprávna syntax pri \"%1$s\""
@@ -15876,7 +16285,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr "interný"
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "je"
 
@@ -15884,20 +16293,20 @@ msgstr "je"
 msgid "item"
 msgstr "položka"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr "kľúč je prázdny"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "naposledy"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "obsahuje"
@@ -15906,12 +16315,12 @@ msgstr "obsahuje"
 msgid "low-level discovery rule"
 msgstr "nízko úrovňové zisťovacie pravidlo"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15920,46 +16329,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "makro(á)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "údržba"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "mapa"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
-msgstr ""
+msgstr "zhody"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "minimálne 60 sekúnd"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
@@ -15968,17 +16377,17 @@ msgstr "ms"
 msgid "must be a valid LDAP user"
 msgstr "musí byť platný LDAP používateľ"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr "nový"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
-msgstr ""
+msgstr "nový"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "nenájdené dáta"
@@ -15991,12 +16400,14 @@ msgstr "mimo"
 msgid "not like"
 msgstr "nie ako"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "nebeží"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "nie je vybratý"
 
@@ -16005,84 +16416,87 @@ msgstr "nie je vybratý"
 msgid "not sent"
 msgstr "neposlané"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "teraz"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "z"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr "off"
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "v"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "iné"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "obnovené každých"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr "obnovované každých %1$s sek."
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
-msgstr ""
+msgstr "regulárny výraz"
 
 #: include/views/administration.general.gui.edit.php:35
 msgid "remember selected"
 msgstr "zapamätať si výbery"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "koreň"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "beží"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "sek"
 
@@ -16095,7 +16509,7 @@ msgstr "sekúnd"
 msgid "sent"
 msgstr "poslané"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "krátky popis"
 
@@ -16103,36 +16517,36 @@ msgstr "krátky popis"
 msgid "show icon mappings"
 msgstr "zobraziť mapovanie ikon"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "zobraziť párovanie hodnôt"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "šablóna ID \"%1$s\" je použitá %2$s krát"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "do"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "spúšťač"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr "píšte sem pre hľadanie"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr "neočakávaný koniec kľúča"
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "neznámy"
 
@@ -16144,11 +16558,11 @@ msgstr "hodnota"
 msgid "via"
 msgstr "cez"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "r"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "rrrr"
diff --git a/frontends/php/locale/sv/LC_MESSAGES/frontend.po b/frontends/php/locale/sv/LC_MESSAGES/frontend.po
index ade09945d1d..97bc8cd6704 100644
--- a/frontends/php/locale/sv/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/sv/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2014-02-02 00:19+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -15,29 +15,31 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1391293183.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr ""
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,24 +51,22 @@ msgstr[1] ""
 msgid "%1$s (year %2$s)"
 msgstr ""
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -81,7 +81,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -102,23 +102,23 @@ msgid_plural "%d devices"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr ""
 
@@ -126,34 +126,34 @@ msgstr ""
 msgid "(in sec)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr ""
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr ""
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr ""
 
@@ -169,7 +169,7 @@ msgstr "10 sekunder"
 msgid "30 seconds"
 msgstr "30 sekunder"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr ""
 
@@ -185,7 +185,7 @@ msgstr "5 sekunder"
 msgid "500 latest values"
 msgstr "500 senaste värdena"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -204,12 +204,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ALARMBEKRÄFTELSER"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr ""
 
@@ -221,19 +220,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "TILLGÄNGLIGHETSRAPPORT"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -245,42 +244,42 @@ msgstr ""
 msgid "Access denied!"
 msgstr ""
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr ""
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Bekräfta"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Bekräfta"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr ""
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Bekräfta alarm för"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr ""
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr ""
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Bekräftade"
 
@@ -305,62 +304,65 @@ msgstr ""
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Åtgärd"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr ""
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Åtgärd lades till"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Åtgärd borttagen"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -373,21 +375,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr ""
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Åtgärd uppdaterad"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Aktiv"
@@ -397,80 +399,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr ""
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr ""
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr ""
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Lägg till"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Lägg till kommentar av"
 
@@ -486,27 +491,23 @@ msgstr ""
 msgid "Add link"
 msgstr ""
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr ""
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr ""
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr ""
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr ""
@@ -515,7 +516,7 @@ msgstr ""
 msgid "Add to host group"
 msgstr ""
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr "Lades till"
 msgid "Admin"
 msgstr ""
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr ""
 
@@ -535,34 +536,34 @@ msgstr ""
 msgid "Advanced labels"
 msgstr ""
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr ""
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr ""
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr ""
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr ""
@@ -571,12 +572,12 @@ msgstr ""
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Alias"
 
@@ -584,123 +585,126 @@ msgstr "Alias"
 msgid "Align icons"
 msgstr ""
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Tillåtna värdar"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr ""
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr ""
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Program"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr ""
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Program lades till"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Program togs bort"
 msgstr[1] "Program togs bort"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr ""
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Program uppdaterat"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr ""
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Program"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr ""
 
@@ -709,16 +713,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr ""
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr ""
 
@@ -734,9 +738,9 @@ msgstr ""
 msgid "Area type"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -750,52 +754,49 @@ msgstr "Som ren text"
 msgid "Asset tag"
 msgstr ""
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr ""
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr ""
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Granskning"
@@ -815,26 +816,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr ""
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr ""
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -893,9 +896,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr ""
 
@@ -903,20 +906,20 @@ msgstr ""
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr ""
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Tillgänglighet"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Tillgänglighetsrapport"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Tillgänglig"
 
@@ -925,36 +928,36 @@ msgstr "Tillgänglig"
 msgid "Average"
 msgstr "Medel"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr ""
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr ""
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr ""
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Bakgrund"
@@ -963,7 +966,7 @@ msgstr "Bakgrund"
 msgid "Background image"
 msgstr "Bakgrundsbild"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr ""
 
@@ -973,7 +976,7 @@ msgid "Base DN"
 msgstr ""
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
+msgid "Basic"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
@@ -986,15 +989,15 @@ msgstr ""
 msgid "Bind password"
 msgstr ""
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr ""
 
@@ -1006,8 +1009,8 @@ msgstr ""
 msgid "Blocked"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr ""
 
@@ -1015,22 +1018,22 @@ msgstr ""
 msgid "Boolean"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Nederkant"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr ""
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr ""
 
@@ -1056,7 +1059,7 @@ msgstr ""
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr ""
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1086,7 +1089,7 @@ msgstr ""
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr ""
 
@@ -1098,7 +1101,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr ""
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr ""
 
@@ -1107,14 +1110,14 @@ msgstr ""
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr ""
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr ""
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "KONFIGURATION AV OBJEKT"
 
@@ -1143,7 +1146,7 @@ msgstr ""
 msgid "CONFIGURATION OF PROXIES"
 msgstr ""
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr ""
 
@@ -1163,7 +1166,7 @@ msgstr ""
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr ""
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr ""
 
@@ -1179,7 +1182,7 @@ msgstr ""
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "KONFIGURATION AV UTLÖSARE"
 
@@ -1211,22 +1214,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "KONFIGURATION AV ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1235,21 +1238,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Beräknade"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr ""
 
@@ -1257,92 +1260,95 @@ msgstr ""
 msgid "Callback"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr ""
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr ""
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Kan inte lägga till åtgärd"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Kan inte lägga till program"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr ""
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Kan inte lägga till diagram"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Kan inte lägga till grupp"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Kan inte lägga till värd"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1350,24 +1356,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Kan inte lägga till bild"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr ""
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Kan inte lägga till objekt"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1375,20 +1381,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr ""
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr ""
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr ""
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1397,24 +1403,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr ""
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr ""
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr ""
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Kan inte lägga till skärm"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr ""
 
@@ -1426,27 +1432,27 @@ msgstr "Kan inte lägga till tjänst"
 msgid "Cannot add slide show"
 msgstr ""
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Kan inte lägga till utlösare"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Kan inte lägga till användare"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Kan inte lägga till användare. Båda lösenorden måste vara samma."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr ""
 
@@ -1454,7 +1460,7 @@ msgstr ""
 msgid "Cannot add value map"
 msgstr "Kan inte lägga till värdeskarta"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1474,23 +1480,23 @@ msgstr ""
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Kan inte rensa historik"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -1498,20 +1504,20 @@ msgstr ""
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr ""
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr ""
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1520,19 +1526,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr ""
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr ""
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr ""
 
@@ -1540,102 +1546,102 @@ msgstr ""
 msgid "Cannot create icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr ""
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Kan inte ta bort åtgärd"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Kan inte ta bort program"
 msgstr[1] "Kan inte ta bort program"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Kan inte ta bort diagram"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Kan inte ta bort grupp"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Kan inte ta bort grupp"
+msgstr[1] "Kan inte ta bort grupp"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Kan inte ta bort värd"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1643,79 +1649,79 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Kan inte ta bort bild"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Kan inte ta bort objekt"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Kan inte ta bort objekt"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr ""
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr ""
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr ""
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr ""
 
@@ -1723,77 +1729,80 @@ msgstr ""
 msgid "Cannot delete service"
 msgstr "Kan inte ta bort tjänst"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr ""
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Kan inte ta bort utlösare"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Kan inte ta bort utlösare"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Kan inte ta bort användare"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1801,77 +1810,77 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr "Kan inte ta bort värdeskarta"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] ""
 msgstr[1] ""
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1885,134 +1894,128 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] ""
 msgstr[1] ""
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2023,34 +2026,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2060,41 +2082,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2107,12 +2129,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr ""
@@ -2124,59 +2148,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr ""
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr ""
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2196,7 +2221,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2205,11 +2230,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2217,11 +2242,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr ""
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr ""
 
@@ -2230,217 +2255,226 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr ""
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr ""
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Kan inte uppdatera åtgärd"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Kan inte uppdatera program"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Kan inte uppdatera kommentar"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr ""
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Kan inte uppdatera diagram"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Kan inte uppdatera grupp"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr ""
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Kan inte uppdatera värd"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr ""
 
@@ -2452,24 +2486,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr "Kan inte uppdatera bild"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Kan inte uppdatera objekt"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr ""
 
@@ -2481,16 +2515,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr ""
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr ""
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2498,28 +2532,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr ""
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr ""
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr ""
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Kan inte uppdatera skärm"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr ""
 
@@ -2531,40 +2561,41 @@ msgstr "Kan inte uppdatera tjänst"
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr ""
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Kan inte uppdatera utlösare"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Kan inte uppdatera användare"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Kan inte uppdatera användare. Båda lösenorden måste vara samma."
 
@@ -2572,15 +2603,15 @@ msgstr "Kan inte uppdatera användare. Båda lösenorden måste vara samma."
 msgid "Cannot update value map"
 msgstr "Kan inte uppdatera värdeskarta"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr ""
 
@@ -2589,47 +2620,47 @@ msgstr ""
 msgid "Case sensitive"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Ändra"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr ""
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Tecken"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr ""
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr ""
 
@@ -2638,48 +2669,48 @@ msgid "Chassis"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr ""
 
@@ -2688,44 +2719,44 @@ msgid "Check type"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr ""
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Kinesiska (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr ""
@@ -2740,34 +2771,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr ""
 
@@ -2777,69 +2809,69 @@ msgstr "Klocka"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Färg"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr ""
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Kolumnspann"
 
@@ -2854,7 +2886,7 @@ msgstr ""
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr ""
 
@@ -2862,41 +2894,31 @@ msgstr ""
 msgid "Command actions"
 msgstr ""
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr ""
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr ""
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Kommentar uppdaterades"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr ""
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2904,29 +2926,39 @@ msgstr ""
 msgid "Condition"
 msgstr "Villkor"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Villkor"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3089,23 +3121,23 @@ msgstr "Konfiguration uppdaterad"
 msgid "Configure (Filter %s)"
 msgstr ""
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr ""
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr ""
@@ -3153,7 +3185,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3161,30 +3193,37 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr ""
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr ""
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Antal"
 
@@ -3204,6 +3243,10 @@ msgstr "Skapa program"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3221,7 +3264,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3234,15 +3277,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
-#: adm.iconmapping.php:126
-msgid "Create icon map"
+#: adm.images.php:151
+msgid "Create icon"
 msgstr ""
 
-#: adm.images.php:149
-msgid "Create image"
+#: adm.iconmapping.php:126
+msgid "Create icon map"
 msgstr ""
 
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr ""
 
@@ -3266,6 +3309,10 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr ""
@@ -3290,11 +3337,11 @@ msgstr ""
 msgid "Create slide show"
 msgstr ""
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr ""
 
@@ -3318,42 +3365,42 @@ msgstr ""
 msgid "Create value map"
 msgstr "Skapa värdeskarta"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3363,51 +3410,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr ""
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr ""
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3420,7 +3468,7 @@ msgstr "Anpassade diagram"
 msgid "Custom label"
 msgstr ""
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr ""
@@ -3434,7 +3482,7 @@ msgstr "Anpassad faktor"
 msgid "Custom screens"
 msgstr "Anpassade skärmar"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr ""
 
@@ -3454,18 +3502,14 @@ msgstr ""
 msgid "Custom slides"
 msgstr ""
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr ""
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr ""
@@ -3481,28 +3525,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr ""
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr ""
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr ""
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3510,25 +3554,25 @@ msgstr ""
 msgid "DNS name"
 msgstr ""
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr ""
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Dagligen"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr ""
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr ""
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr ""
 
@@ -3540,20 +3584,21 @@ msgstr ""
 msgid "Dashboard filter"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr ""
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Data"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3576,11 +3621,12 @@ msgstr ""
 msgid "Data type"
 msgstr ""
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr ""
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr ""
 
@@ -3588,35 +3634,39 @@ msgstr ""
 msgid "Database monitor"
 msgstr ""
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr ""
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr ""
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr ""
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr ""
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr ""
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr ""
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr ""
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr ""
 
@@ -3636,53 +3686,52 @@ msgstr ""
 msgid "Date HW purchased"
 msgstr ""
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Dag"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr ""
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr ""
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr ""
 
@@ -3690,22 +3739,22 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr ""
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr ""
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr ""
 
@@ -3715,15 +3764,14 @@ msgstr ""
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Standard"
 
@@ -3736,11 +3784,11 @@ msgid "Default delay (in seconds)"
 msgstr ""
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr ""
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3763,30 +3811,34 @@ msgstr ""
 msgid "Delay"
 msgstr "Fördröjning"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr ""
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr ""
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Ta bort"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr ""
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -3794,53 +3846,53 @@ msgstr ""
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Ta bort diagram?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
+#: include/views/configuration.item.list.php:278
+msgid "Delete history of selected items?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:274
-msgid "Delete history of selected items?"
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3848,11 +3900,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3860,7 +3916,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr ""
 
@@ -3868,71 +3924,67 @@ msgstr ""
 msgid "Delete screen?"
 msgstr "Ta bort skärm?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr ""
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr ""
@@ -3941,27 +3993,27 @@ msgstr ""
 msgid "Delete selected groups?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Ta bort markerad värd?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Ta bort markerade värdar?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Ta bort markerad bild?"
 
@@ -3969,31 +4021,31 @@ msgstr "Ta bort markerad bild?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr ""
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr ""
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr ""
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr ""
 
@@ -4001,15 +4053,15 @@ msgstr ""
 msgid "Delete selected screens?"
 msgstr ""
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr ""
 
@@ -4021,11 +4073,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr ""
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr ""
 
@@ -4040,11 +4092,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4053,15 +4109,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr ""
 
@@ -4069,62 +4125,62 @@ msgstr ""
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4133,35 +4189,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (enkel ändring)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (hastighet per sekund)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr ""
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Beroende av"
 
@@ -4169,30 +4225,41 @@ msgstr "Beroende av"
 msgid "Deployment status"
 msgstr ""
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Beskrivning"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Detaljer"
 
@@ -4205,71 +4272,71 @@ msgid "Device"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4293,48 +4360,44 @@ msgstr ""
 msgid "Disable host"
 msgstr ""
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr ""
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr ""
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr ""
 
@@ -4342,11 +4405,11 @@ msgstr ""
 msgid "Disable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr ""
 
@@ -4354,42 +4417,47 @@ msgstr ""
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Inaktiverad"
 
@@ -4402,7 +4470,7 @@ msgstr "Allvarlig"
 msgid "Discovered"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4410,17 +4478,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr ""
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr ""
 
@@ -4428,17 +4496,17 @@ msgstr ""
 msgid "Discovery check"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4447,67 +4515,70 @@ msgid "Discovery object"
 msgstr ""
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr ""
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr ""
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr ""
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr ""
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr ""
 
@@ -4519,7 +4590,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr ""
 
@@ -4528,32 +4599,32 @@ msgstr ""
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr ""
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr ""
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Beräkna inte"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr ""
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4563,30 +4634,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Ritstil"
 
@@ -4604,74 +4675,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr ""
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Längd"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr ""
 
@@ -4679,13 +4751,13 @@ msgstr ""
 msgid "EVENTS"
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4693,9 +4765,9 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Redigera"
 
@@ -4703,7 +4775,7 @@ msgstr "Redigera"
 msgid "Edit map element"
 msgstr ""
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4711,27 +4783,61 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Elementnamn"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "E-post"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Tom"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4739,76 +4845,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr ""
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr ""
 
@@ -4817,11 +4945,11 @@ msgstr ""
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4829,11 +4957,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr ""
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr ""
 
@@ -4853,11 +4985,11 @@ msgstr ""
 msgid "Enable host"
 msgstr ""
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr ""
 
@@ -4870,36 +5002,32 @@ msgstr ""
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr ""
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr ""
 
@@ -4907,11 +5035,11 @@ msgstr ""
 msgid "Enable selected groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4919,64 +5047,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr ""
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Engelska (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Fel"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -4994,15 +5126,15 @@ msgstr ""
 msgid "Event ID"
 msgstr ""
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr ""
 
@@ -5011,7 +5143,7 @@ msgstr ""
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr ""
 
@@ -5019,7 +5151,7 @@ msgstr ""
 msgid "Event details"
 msgstr ""
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr ""
 
@@ -5039,9 +5171,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Händelser"
 
@@ -5049,36 +5182,41 @@ msgstr "Händelser"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr ""
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr ""
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr ""
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr ""
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr ""
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5086,13 +5224,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5104,7 +5242,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5114,12 +5252,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr ""
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr ""
 
@@ -5127,22 +5265,22 @@ msgstr ""
 msgid "Export to CSV"
 msgstr ""
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Uttryck"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5150,11 +5288,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr ""
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5175,17 +5314,17 @@ msgid "External check"
 msgstr ""
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr ""
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "FALSKT"
 
@@ -5194,16 +5333,17 @@ msgstr "FALSKT"
 msgid "FTP"
 msgstr ""
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr ""
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr ""
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5211,40 +5351,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr ""
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr ""
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr ""
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr ""
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr ""
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr ""
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr ""
 
@@ -5288,19 +5428,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr ""
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr ""
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5309,13 +5449,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5323,68 +5463,71 @@ msgstr ""
 msgid "Filled region"
 msgstr ""
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filter"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr ""
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr ""
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr ""
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5393,8 +5536,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Fast"
 
@@ -5404,76 +5547,80 @@ msgstr "Fast"
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr ""
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr ""
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr ""
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Franska (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr ""
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr ""
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Från"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Funktion"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5483,50 +5630,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM-modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr ""
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr ""
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Allmänt"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr ""
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Tyska (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5534,65 +5681,65 @@ msgid "Get support"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr ""
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr ""
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr ""
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr ""
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5601,66 +5748,73 @@ msgid "Gradient line"
 msgstr ""
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Diagram"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Diagram lades till"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Diagram togs bort"
 
@@ -5672,54 +5826,59 @@ msgstr "Diagramelement"
 msgid "Graph item"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Diagramnamn"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5731,49 +5890,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr ""
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Diagram uppdaterades"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Diagram"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr ""
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5782,54 +5943,58 @@ msgstr ""
 msgid "Grid"
 msgstr ""
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Grupp"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Grupp lades till"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Grupp togs bort"
+msgid_plural "Groups deleted"
+msgstr[0] "Grupp togs bort"
+msgstr[1] "Grupp togs bort"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5840,40 +6005,42 @@ msgstr ""
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Gruppnamn"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Grupp har uppdaterats"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Grupper"
 
@@ -5881,22 +6048,13 @@ msgstr "Grupper"
 msgid "Groups in maintenance"
 msgstr ""
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr ""
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr ""
 
@@ -5913,7 +6071,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5931,7 +6089,8 @@ msgstr ""
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5952,12 +6111,17 @@ msgstr "Hårdvara"
 msgid "Hardware (Full details)"
 msgstr ""
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Höjd"
@@ -5970,15 +6134,15 @@ msgstr "Hjälp"
 msgid "Hexadecimal"
 msgstr ""
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Dölj"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr ""
 
@@ -5994,15 +6158,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr ""
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Dölj markerade"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6011,23 +6175,23 @@ msgstr ""
 msgid "High"
 msgstr "Hög"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Historik"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Historik rensad"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -6048,79 +6212,79 @@ msgstr "Historik för händelser"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Horisontell justering"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Värd"
 msgstr[1] "Värd"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6132,66 +6296,68 @@ msgstr ""
 msgid "Host access"
 msgstr ""
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Värd lades till"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr ""
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Värd togs bort"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Värdgrupp"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6208,14 +6374,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Värdgrupper"
 
@@ -6225,8 +6392,8 @@ msgstr "Värdgrupper"
 msgid "Host interface"
 msgstr ""
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6242,7 +6409,7 @@ msgstr ""
 msgid "Host label type"
 msgstr ""
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6251,18 +6418,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6271,72 +6438,72 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6348,7 +6515,7 @@ msgstr ""
 msgid "Host router"
 msgstr ""
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr ""
 
@@ -6360,51 +6527,52 @@ msgstr ""
 msgid "Host subnet mask"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr ""
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Värd uppdaterades"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Värdar"
 
@@ -6412,11 +6580,11 @@ msgstr "Värdar"
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Värdar (ö/i/m)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6428,37 +6596,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Info om värdar"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr ""
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr ""
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr ""
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr ""
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr ""
 
@@ -6476,22 +6645,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr ""
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6499,26 +6668,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP-adress"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr ""
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr ""
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr ""
 
@@ -6526,22 +6695,22 @@ msgstr ""
 msgid "IPMI agent"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr ""
 
@@ -6551,7 +6720,7 @@ msgstr ""
 msgid "IPMI sensor"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr ""
 
@@ -6584,7 +6753,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6600,25 +6769,25 @@ msgid "ITEMS"
 msgstr "OBJEKT"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Ikon"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr ""
 
@@ -6639,42 +6808,44 @@ msgstr "Typ av ikonetikett"
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6687,7 +6858,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6695,29 +6867,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6725,21 +6897,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr ""
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Bild"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6748,7 +6922,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Bild lades till"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Bild togs bort"
 
@@ -6756,12 +6930,13 @@ msgstr "Bild togs bort"
 msgid "Image label type"
 msgstr ""
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6770,66 +6945,66 @@ msgid "Image updated"
 msgstr "Bild uppdaterades"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Bilder"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr ""
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr ""
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr ""
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr ""
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr ""
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr ""
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6842,244 +7017,282 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr ""
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr ""
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr ""
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr ""
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr ""
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr ""
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr ""
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr ""
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr ""
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr ""
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr ""
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7089,11 +7302,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7102,11 +7315,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7114,74 +7327,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr ""
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7189,182 +7428,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr ""
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr ""
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr ""
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr ""
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr ""
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr ""
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr ""
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr ""
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr ""
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr ""
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr ""
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7373,64 +7631,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7451,52 +7713,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr ""
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7505,7 +7772,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7525,7 +7793,7 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7535,43 +7803,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr ""
 
@@ -7580,15 +7854,15 @@ msgstr ""
 msgid "Information"
 msgstr "Information"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr ""
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
 msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr ""
 
@@ -7596,31 +7870,32 @@ msgstr ""
 msgid "Installer name"
 msgstr ""
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr ""
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7640,7 +7915,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr ""
 
@@ -7648,7 +7923,7 @@ msgstr ""
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr ""
 
@@ -7661,19 +7936,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr ""
 
@@ -7683,112 +7958,114 @@ msgstr ""
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr ""
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr ""
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Inventarier"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7797,7 +8074,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7805,12 +8082,12 @@ msgstr ""
 msgid "Is online?"
 msgstr "Är ansluten?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr ""
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7818,70 +8095,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Italienska (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Objekt"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr ""
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Objekt lades till"
 
@@ -7889,17 +8167,17 @@ msgstr "Objekt lades till"
 msgid "Item count"
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Objekt togs bort"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7913,56 +8191,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr ""
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7970,92 +8248,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Objekt uppdaterades"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Objekt"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Objekt (ö/i/s)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Objekt borttagna"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr ""
 
@@ -8067,72 +8345,72 @@ msgstr ""
 msgid "JMX agent"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr ""
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr ""
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr ""
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Japanska (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr ""
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr ""
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr ""
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr ""
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8141,40 +8419,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Nyckel"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr ""
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr ""
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr ""
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "SENASTE DATA"
 
@@ -8205,37 +8483,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr ""
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr ""
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Etikett"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Etikettposition"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Språk"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Senaste"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8247,19 +8525,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8279,28 +8557,28 @@ msgstr ""
 msgid "Last 7 days"
 msgstr ""
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Senaste ändring"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Senaste kontroll"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Diagram för senaste timmen"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr ""
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr ""
 
@@ -8308,66 +8586,67 @@ msgstr ""
 msgid "Last seen (age)"
 msgstr ""
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Senaste värde"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr ""
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Senaste data"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Senaste händelser"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Lettiska (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Vänster"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr ""
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr ""
 
@@ -8375,39 +8654,29 @@ msgstr ""
 msgid "Link"
 msgstr "Länk"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr ""
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr ""
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8419,50 +8688,50 @@ msgstr ""
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr ""
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Lokal tid"
 
@@ -8479,36 +8748,36 @@ msgid "Location longitude"
 msgstr ""
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Logg"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Tidsformat för logg"
@@ -8517,12 +8786,12 @@ msgstr "Tidsformat för logg"
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr ""
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8533,12 +8802,12 @@ msgstr "Inloggning"
 msgid "Login as Guest"
 msgstr ""
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8547,8 +8816,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8569,22 +8839,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8596,7 +8862,7 @@ msgstr ""
 msgid "MAC address B"
 msgstr ""
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr ""
 
@@ -8621,49 +8887,49 @@ msgstr "MEST ANVÄNDA UTLÖSARE - TOPP 100"
 msgid "Macro"
 msgstr ""
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr ""
 
@@ -8671,31 +8937,36 @@ msgstr ""
 msgid "Macros updated"
 msgstr ""
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr ""
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr ""
 
@@ -8703,7 +8974,7 @@ msgstr ""
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr ""
 
@@ -8719,25 +8990,25 @@ msgstr ""
 msgid "Maintenance type"
 msgstr ""
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr ""
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8748,12 +9019,12 @@ msgstr ""
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Karta"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8763,12 +9034,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr ""
@@ -8785,12 +9056,12 @@ msgstr ""
 msgid "Map save operation failed."
 msgstr ""
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8800,23 +9071,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Kartor"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr ""
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr ""
 
@@ -8824,28 +9095,34 @@ msgstr ""
 msgid "Mark elements on trigger status change"
 msgstr ""
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Markera övriga"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Markera markerade"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr ""
@@ -8859,32 +9136,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr ""
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8892,105 +9148,99 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr ""
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Media"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Mediatyp"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Mediatyp borttagen"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Mediatyp uppdaterad"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Mediatyper"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr ""
 
@@ -9005,14 +9255,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr ""
 
@@ -9022,7 +9272,7 @@ msgstr ""
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Meddelande"
 
@@ -9030,66 +9280,66 @@ msgstr "Meddelande"
 msgid "Message actions"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr ""
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr ""
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr ""
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr ""
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Mitten"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9098,80 +9348,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr ""
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9181,7 +9428,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9193,18 +9440,18 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr ""
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr ""
 
@@ -9212,33 +9459,33 @@ msgstr ""
 msgid "Monitored host"
 msgstr ""
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Övervakning"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Månad"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Månatligen"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9246,7 +9493,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9255,19 +9502,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "Mest använda utlösare - topp 100"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr ""
 
@@ -9280,60 +9527,58 @@ msgstr "NÄTVERKSKARTOR"
 msgid "NNTP"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr ""
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
+msgid "NTLM"
 msgstr ""
 
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9344,26 +9589,32 @@ msgstr ""
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Namn"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9382,12 +9633,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9395,7 +9646,7 @@ msgstr ""
 msgid "Network map added"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr ""
 
@@ -9407,7 +9658,7 @@ msgstr ""
 msgid "Network maps"
 msgstr "Nätverkskartor"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr ""
 
@@ -9415,24 +9666,24 @@ msgstr ""
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr ""
 
@@ -9443,16 +9694,16 @@ msgstr ""
 msgid "New flexible interval"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Ny grupp"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Nytt objekt för diagrammet"
 
@@ -9460,83 +9711,99 @@ msgstr "Nytt objekt för diagrammet"
 msgid "New media"
 msgstr "Nytt media"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr ""
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr ""
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Nej"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9544,25 +9811,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9588,8 +9855,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9599,7 +9866,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9607,30 +9874,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr ""
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr ""
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9639,27 +9907,27 @@ msgstr ""
 msgid "No data collection"
 msgstr ""
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr ""
 
@@ -9667,39 +9935,39 @@ msgstr ""
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr ""
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9714,7 +9982,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9723,7 +9991,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9732,48 +10004,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9786,17 +10059,22 @@ msgstr ""
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr ""
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9815,33 +10093,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9860,7 +10145,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9876,7 +10161,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9885,15 +10170,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9905,133 +10190,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr ""
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr ""
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr ""
 
@@ -10039,7 +10369,7 @@ msgstr ""
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10047,82 +10377,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr ""
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr ""
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10131,57 +10462,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Ingen"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr ""
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr ""
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr ""
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Inte tillgänglig"
 
@@ -10190,7 +10522,7 @@ msgstr "Inte tillgänglig"
 msgid "Not classified"
 msgstr "Inte klassifierad"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr ""
 
@@ -10203,8 +10535,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Stöds inte"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr ""
@@ -10217,7 +10549,7 @@ msgstr "Anteckningar"
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10225,87 +10557,87 @@ msgstr ""
 msgid "Notification report"
 msgstr "Notifieringsrapport"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr ""
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr ""
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10313,88 +10645,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "Antal statusändringar"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr ""
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Antal användare (anslutna)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Numerisk (flyttal)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr ""
 
@@ -10409,16 +10741,18 @@ msgid "OEM"
 msgstr ""
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10434,8 +10768,7 @@ msgstr ""
 msgid "OOB subnet mask"
 msgstr ""
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr ""
 
@@ -10455,11 +10788,12 @@ msgstr ""
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "ÖVERSIKT"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr ""
 
@@ -10467,25 +10801,25 @@ msgstr ""
 msgid "Octal"
 msgstr ""
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr ""
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "AV"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ok"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "P"
 
@@ -10493,111 +10827,114 @@ msgstr "P"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr ""
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr ""
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr ""
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr ""
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr ""
@@ -10606,28 +10943,28 @@ msgstr ""
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr ""
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr ""
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr ""
@@ -10636,25 +10973,27 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10684,24 +11023,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr ""
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr ""
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Övrigt"
 
@@ -10709,19 +11048,19 @@ msgstr "Övrigt"
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10731,21 +11070,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Övriga parametrar"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10758,14 +11097,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Översikt"
 
@@ -10773,7 +11109,7 @@ msgstr "Översikt"
 msgid "Overview by proxy"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10782,147 +11118,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10931,32 +11275,34 @@ msgstr ""
 msgid "POP"
 msgstr ""
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr ""
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr ""
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parameter"
 
@@ -10965,7 +11311,7 @@ msgstr "Parameter"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10985,33 +11331,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr ""
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11021,20 +11367,21 @@ msgstr ""
 msgid "Password"
 msgstr "Lösenord"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Lösenord (en gång till)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr ""
 
@@ -11043,21 +11390,21 @@ msgstr ""
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11065,12 +11412,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Period"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr ""
@@ -11080,24 +11427,24 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr ""
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr ""
 
@@ -11109,55 +11456,56 @@ msgstr ""
 msgid "Plain text"
 msgstr "Ren text"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr ""
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr ""
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr ""
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11165,51 +11513,51 @@ msgstr ""
 msgid "Port range"
 msgstr ""
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr ""
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr ""
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr ""
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11258,30 +11606,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr ""
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr ""
 
@@ -11293,16 +11642,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr ""
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr ""
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problem"
 
@@ -11310,75 +11659,71 @@ msgstr "Problem"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr ""
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr ""
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr ""
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11389,7 +11734,7 @@ msgstr ""
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "UPPDATERINGSKÖ FÖR OBJEKT"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "K"
 
@@ -11397,18 +11742,18 @@ msgstr "K"
 msgid "RMCP+"
 msgstr ""
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr ""
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Endast läs"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Läs-skriv"
 
@@ -11420,7 +11765,7 @@ msgstr "Anledning"
 msgid "Received value"
 msgstr ""
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11428,11 +11773,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11443,28 +11788,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "Mottagare"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr ""
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr ""
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr ""
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Uppdatera (i sekunder)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr ""
 
@@ -11482,47 +11827,51 @@ msgstr ""
 msgid "Regular expression"
 msgstr ""
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr ""
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr ""
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11539,26 +11888,28 @@ msgstr "Fjärrkommando"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11569,21 +11920,19 @@ msgstr "Fjärrkommando"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr ""
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11591,11 +11940,11 @@ msgstr ""
 msgid "Remove element"
 msgstr ""
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr ""
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11604,7 +11953,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr ""
 
@@ -11616,28 +11965,28 @@ msgstr ""
 msgid "Remove link"
 msgstr ""
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr ""
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr ""
 
@@ -11645,35 +11994,36 @@ msgstr ""
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Rapporter"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr ""
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr ""
 
@@ -11681,29 +12031,31 @@ msgstr ""
 msgid "Required performance (vps)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr ""
 
@@ -11722,9 +12074,9 @@ msgstr ""
 msgid "Reset confirmation"
 msgstr ""
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11737,7 +12089,7 @@ msgstr ""
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Resurs"
@@ -11752,15 +12104,15 @@ msgstr ""
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr ""
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr ""
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr ""
 
@@ -11773,7 +12125,8 @@ msgstr ""
 msgid "Result type"
 msgstr ""
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11781,60 +12134,69 @@ msgstr ""
 msgid "Retries left"
 msgstr ""
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Rättighet"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Radspann"
 
@@ -11842,11 +12204,11 @@ msgstr "Radspann"
 msgid "Rows"
 msgstr "Rader"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr ""
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr ""
 
@@ -11891,20 +12253,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Ryska (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11920,7 +12282,7 @@ msgstr ""
 msgid "SEARCH"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr ""
 
@@ -11935,13 +12297,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr ""
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11950,17 +12312,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP email"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP-server"
@@ -11976,7 +12338,7 @@ msgstr ""
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11988,9 +12350,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -11999,7 +12361,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12023,7 +12385,7 @@ msgstr "SNMPv3-agent"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12041,7 +12403,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr ""
@@ -12050,15 +12412,35 @@ msgstr ""
 msgid "SSH agent"
 msgstr ""
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr ""
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "STATUS FÖR UTLÖSARE"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr ""
 
@@ -12066,92 +12448,92 @@ msgstr ""
 msgid "STATUS OF ZABBIX"
 msgstr "STATUS FÖR ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr ""
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr ""
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Spara"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr ""
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr ""
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr ""
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr ""
 
@@ -12163,7 +12545,7 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12174,126 +12556,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Skärm"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Skärm lades till"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Konfiguration av skärmcell"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Skärm togs bort"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Skärm uppdaterades"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Skärmar"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Skript"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr ""
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Skriptnamn"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12302,17 +12683,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr ""
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr ""
 
@@ -12333,7 +12714,7 @@ msgstr ""
 msgid "Search/Filter elements limit"
 msgstr ""
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr ""
 
@@ -12365,7 +12746,7 @@ msgstr ""
 msgid "Secondary POC screen name"
 msgstr ""
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr ""
 
@@ -12384,69 +12765,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Välj"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr ""
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr ""
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr ""
 
@@ -12462,7 +12850,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr ""
 
@@ -12470,11 +12858,11 @@ msgstr ""
 msgid "Send to"
 msgstr "Skicka till"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr ""
 
@@ -12483,17 +12871,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr ""
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr ""
 
@@ -12505,7 +12893,7 @@ msgstr ""
 msgid "Serial number B"
 msgstr ""
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Server"
@@ -12514,44 +12902,44 @@ msgstr "Server"
 msgid "Server info"
 msgstr "Serverinfo"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Servertid"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Tjänst"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr ""
 
@@ -12567,11 +12955,11 @@ msgstr "Tjänst togs bort"
 msgid "Service port"
 msgstr ""
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr ""
 
@@ -12583,49 +12971,53 @@ msgstr ""
 msgid "Service updated"
 msgstr "Tjänst uppdaterad"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr ""
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr ""
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Allvarlighetsgrad"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr ""
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Visa"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Visa alla"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Visa detaljer"
 
@@ -12655,35 +13047,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr ""
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr ""
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Visa linjer"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Visa markerade"
 
@@ -12691,19 +13084,22 @@ msgstr "Visa markerade"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Visa utlösare"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr ""
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Visa värde"
@@ -12712,11 +13108,11 @@ msgstr "Visa värde"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Visa arbetstid"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr ""
 
@@ -12736,6 +13132,10 @@ msgstr "Enkel kontroll"
 msgid "Simple graph"
 msgstr "Enkelt diagram"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr ""
@@ -12773,7 +13173,7 @@ msgid "Site state / province"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12791,16 +13191,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr ""
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12809,11 +13209,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12821,10 +13221,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr ""
 
@@ -12832,15 +13232,15 @@ msgstr ""
 msgid "Slides"
 msgstr ""
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Mjuk"
 
@@ -12873,28 +13273,28 @@ msgid "Software application E"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Sorteringsordning (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12907,11 +13307,11 @@ msgstr ""
 msgid "Source"
 msgstr "Källa"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Spanska (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr ""
 
@@ -12919,63 +13319,63 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr ""
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Status"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -12988,7 +13388,7 @@ msgstr "Statusberäkning"
 msgid "Status calculation algorithm"
 msgstr "Algoritm för statusberäkning"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr ""
 
@@ -12997,7 +13397,7 @@ msgid "Status of Web monitoring"
 msgstr ""
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Status för ZABBIX"
 
@@ -13014,40 +13414,40 @@ msgid "Status only"
 msgstr "Endast status"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr ""
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr ""
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Lagra värde"
@@ -13056,11 +13456,11 @@ msgstr "Lagra värde"
 msgid "Straight"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Stil"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13068,11 +13468,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Ämne"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr ""
 
@@ -13081,32 +13481,32 @@ msgid "Success Audit"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr ""
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr ""
 
@@ -13114,27 +13514,27 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Efternamn"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr ""
 
@@ -13142,16 +13542,16 @@ msgstr ""
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13160,21 +13560,21 @@ msgid "System status"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13193,11 +13593,11 @@ msgid "TOTAL"
 msgstr ""
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "KOMMENTARER FÖR UTLÖSARE"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "SANT"
 
@@ -13215,14 +13615,14 @@ msgstr ""
 msgid "Tag"
 msgstr "Tagg"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr ""
 
@@ -13231,130 +13631,133 @@ msgid "Target type"
 msgstr ""
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr ""
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Mall"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr ""
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr ""
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Mallkoppling"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr ""
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr ""
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr ""
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr ""
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Mallar"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr ""
 
@@ -13362,11 +13765,11 @@ msgstr ""
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr ""
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr ""
 
@@ -13380,22 +13783,22 @@ msgid "Test string"
 msgstr ""
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Text"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13403,7 +13806,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13418,26 +13821,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13446,19 +13849,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr ""
 
@@ -13469,11 +13872,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr ""
@@ -13482,11 +13885,11 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13498,27 +13901,27 @@ msgstr ""
 msgid "This year"
 msgstr ""
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr ""
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr ""
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Till"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13527,28 +13930,28 @@ msgstr "Till"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Tid"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13556,54 +13959,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Tidsperiod"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Tidstyp"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Tidsstämpel"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13611,17 +14014,18 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Överkant"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Totalt"
 
@@ -13639,7 +14043,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr ""
 
@@ -13656,91 +14060,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Trender"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Utlösare"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Utlösare lades till"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Kommentarer för utlösare"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Utlösare togs bort"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13755,11 +14159,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13767,7 +14172,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr ""
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13780,12 +14185,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr ""
 
@@ -13797,52 +14202,52 @@ msgstr ""
 msgid "Trigger name"
 msgstr ""
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13850,23 +14255,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr ""
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Allvarlighetsgrad för utlösare"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Utlösare uppdaterades"
 
@@ -13874,40 +14287,41 @@ msgstr "Utlösare uppdaterades"
 msgid "Trigger value"
 msgstr "Värde för utlösare"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Utlösare"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Utlösare togs bort"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Info om utlösare"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr ""
 
@@ -13915,78 +14329,78 @@ msgstr ""
 msgid "Triggers overview"
 msgstr "Översikt över utlösare"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr ""
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr ""
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr ""
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr ""
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr ""
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Typ"
 
@@ -13994,62 +14408,64 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr ""
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Typ av information"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr ""
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "OKÄNT"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (efter inloggning)"
 
@@ -14065,20 +14481,30 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr ""
 
@@ -14086,15 +14512,11 @@ msgstr ""
 msgid "USER PROFILE"
 msgstr "ANVÄNDARPROFIL"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr ""
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14102,7 +14524,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr ""
 
@@ -14115,20 +14537,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr ""
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr ""
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr ""
 
@@ -14137,29 +14559,29 @@ msgstr ""
 msgid "Units"
 msgstr "Enheter"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14169,23 +14591,20 @@ msgstr "Okänd"
 msgid "Unknown action"
 msgstr "Okänd åtgärd"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr ""
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr ""
 
@@ -14197,23 +14616,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr "Okänd resurs"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr ""
 
@@ -14221,61 +14640,61 @@ msgstr ""
 msgid "Unlink from template"
 msgstr ""
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr ""
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr ""
 
@@ -14289,32 +14708,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14325,34 +14755,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Uppdatera"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Uppdateringsintervall"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Uppdateringsintervall (i sekunder)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Uppdaterad"
 
@@ -14360,55 +14790,55 @@ msgstr "Uppdaterad"
 msgid "Updated status of host"
 msgstr ""
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr ""
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Skicka upp"
 
@@ -14416,14 +14846,14 @@ msgstr "Skicka upp"
 msgid "Upper level maps"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14431,9 +14861,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr ""
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14449,84 +14879,88 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Användare"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr ""
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Användare lades till"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr ""
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Användare togs bort"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Användargrupp"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14543,34 +14977,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Användargrupper"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr ""
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr ""
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr ""
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14596,243 +15030,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr ""
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Användare uppdaterades"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr ""
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Användare"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Användare (anslutna)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Värde"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr ""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14867,11 +15301,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14917,10 +15351,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Värdesmappning"
 
@@ -14929,7 +15363,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14941,8 +15375,8 @@ msgstr ""
 msgid "Values"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr ""
 
@@ -14955,64 +15389,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Vertikal justering"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr ""
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Varning"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr ""
 
@@ -15020,65 +15459,83 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr ""
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr ""
 
@@ -15086,9 +15543,9 @@ msgstr ""
 msgid "Week"
 msgstr "Vecka"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Veckovis"
 
@@ -15096,12 +15553,12 @@ msgstr "Veckovis"
 msgid "When active"
 msgstr "När aktiv"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Bredd"
@@ -15111,28 +15568,28 @@ msgstr "Bredd"
 msgid "With data collection"
 msgstr ""
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr ""
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr ""
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr ""
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr ""
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr ""
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr ""
 
@@ -15141,7 +15598,7 @@ msgid "Wizard"
 msgstr ""
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15154,180 +15611,165 @@ msgstr "Arbetstid"
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr ""
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "MAX-värde för Y-axel"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "MIN-värde för Y-axel"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Y-axel"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr ""
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
 msgstr ""
 
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr ""
-
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr ""
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15335,96 +15777,105 @@ msgstr ""
 msgid "Year"
 msgstr "År"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Årligen"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Ja"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr ""
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr ""
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr ""
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr ""
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr ""
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr ""
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr ""
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr ""
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15437,7 +15888,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr ""
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15456,8 +15907,8 @@ msgid "Zabbix User"
 msgstr ""
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15483,10 +15934,11 @@ msgstr "ZABBIX internt"
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr ""
@@ -15499,7 +15951,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15507,15 +15959,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "ZABBIX-server kör"
 
@@ -15524,11 +15976,11 @@ msgstr "ZABBIX-server kör"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr ""
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr ""
 
@@ -15536,25 +15988,20 @@ msgstr ""
 msgid "Zabbix trapper"
 msgstr "ZABBIX-fångare"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr ""
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr ""
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr ""
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15563,19 +16010,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "alla"
 
@@ -15583,19 +16030,15 @@ msgstr "alla"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr ""
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "som Bl"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "som Grön"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "som Röd"
 
@@ -15607,83 +16050,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "medel"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "Y M d"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr ""
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr ""
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr ""
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr ""
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15705,19 +16114,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr ""
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr ""
 
@@ -15729,47 +16134,49 @@ msgstr ""
 msgid "executed"
 msgstr ""
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr ""
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr ""
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr ""
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr ""
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr ""
 
@@ -15777,7 +16184,7 @@ msgstr ""
 msgid "in"
 msgstr ""
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15787,7 +16194,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15795,20 +16202,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr ""
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr ""
@@ -15817,12 +16224,12 @@ msgstr ""
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15831,46 +16238,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr ""
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr ""
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "max"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15879,17 +16286,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr ""
@@ -15902,12 +16309,14 @@ msgstr ""
 msgid "not like"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "kör inte"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr ""
 
@@ -15916,57 +16325,61 @@ msgstr ""
 msgid "not sent"
 msgstr "inte skickat"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr ""
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr ""
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr ""
 
-#: include/page_header.php:114
-msgid "refreshed every"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
 msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15975,25 +16388,24 @@ msgstr ""
 msgid "remember selected"
 msgstr ""
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "kör"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr ""
 
@@ -16006,7 +16418,7 @@ msgstr ""
 msgid "sent"
 msgstr "skickat"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr ""
 
@@ -16014,36 +16426,36 @@ msgstr ""
 msgid "show icon mappings"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr ""
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr ""
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr ""
 
@@ -16055,11 +16467,11 @@ msgstr ""
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr ""
diff --git a/frontends/php/locale/tr/LC_MESSAGES/frontend.po b/frontends/php/locale/tr/LC_MESSAGES/frontend.po
index 8799fd1faa4..679dfec7ddb 100644
--- a/frontends/php/locale/tr/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/tr/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2014-02-02 00:22+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix translation team\n"
@@ -15,29 +15,31 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1391293363.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr ""
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr ""
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,24 +51,22 @@ msgstr[1] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (yıl %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -81,7 +81,7 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -102,23 +102,23 @@ msgid_plural "%d devices"
 msgstr[0] "%d aygıt"
 msgstr[1] "%d aygıtlar"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - belirsiz)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(gün)"
 
@@ -126,34 +126,34 @@ msgstr "(gün)"
 msgid "(in sec)"
 msgstr "(saniye)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(minimum 60 saniye, 0 - eylemin öntanımlı değerini kullan)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(vekil yok)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[TOPLU ONAY]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 veya 1"
 
@@ -169,7 +169,7 @@ msgstr "10 saniye"
 msgid "30 seconds"
 msgstr "30 saniye"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3B görünüm"
 
@@ -185,7 +185,7 @@ msgstr "5 saniye"
 msgid "500 latest values"
 msgstr "son 500 değer"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -204,12 +204,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ALARM ONAYLARI"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "VE"
 
@@ -221,19 +220,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "KULLANILIRLILIK RAPORU"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr ""
 
@@ -245,42 +244,42 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Erişim reddedildi!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Hesap %s saniye için bloklandı"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Onay"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Onay"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Onay eklendi"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Alarmın onaylandığı"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Onayla ve dön"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Onay durumu"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Onaylandı"
 
@@ -305,62 +304,65 @@ msgstr "Onaylama etkisizleştirilmiş"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Eylem"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr ""
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Eylem eklendi"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Eylem silindi"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -373,21 +375,21 @@ msgstr[1] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Eylem işlemleri"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Eylem güncellendi"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Eylemler"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Etkin"
@@ -397,80 +399,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr ""
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "den beri etkin"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "dene kadar etkin"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Ekle"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Yorumun eklendiği"
 
@@ -486,27 +491,23 @@ msgstr "Konak ekle"
 msgid "Add link"
 msgstr "Bağlantı ekle"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr ""
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Prototip ekle"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "e ekle"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr ""
@@ -515,7 +516,7 @@ msgstr ""
 msgid "Add to host group"
 msgstr "Konak grubuna ekle"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Konak gruplarına ekle"
 
@@ -527,7 +528,7 @@ msgstr "Eklendi"
 msgid "Admin"
 msgstr "Yönetici"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Yönetim"
 
@@ -535,34 +536,34 @@ msgstr "Yönetim"
 msgid "Advanced labels"
 msgstr "Gelişmiş etiket"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Süre"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "Yaşı dan küçük"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr ""
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Aracı"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Aracı arabilirimleri"
@@ -571,12 +572,12 @@ msgstr "Aracı arabilirimleri"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Rumuz"
 
@@ -584,123 +585,126 @@ msgstr "Rumuz"
 msgid "Align icons"
 msgstr "Simgeleri hizala"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Bütün"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Bütün gruplar"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Bütün bağlantılarda \"İsim\" ve \"URL\" tanımlanmış olmalıdır"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "İzin verilen konaklar"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Herhangi"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Herhangi karakter dizgisini içeren"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Uygulama"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr ""
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Uygulama eklendi"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "Uygulama silindi"
 msgstr[1] "Uygulama silindi"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Uygulama hatası."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Uygulama güncellendi"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr ""
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Uygulamalar"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Uygula"
 
@@ -709,16 +713,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr ""
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Nis"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Nisan"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr ""
 
@@ -734,9 +738,9 @@ msgstr ""
 msgid "Area type"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -750,52 +754,49 @@ msgstr "Düz metin olarak"
 msgid "Asset tag"
 msgstr "Varlık etiketi"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr ""
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr ""
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Denetim"
@@ -815,26 +816,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Ağu"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Ağustos"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Kimlik Doğrulama"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Kimlik doğrulama algoritması"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -893,9 +896,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -903,20 +906,20 @@ msgstr "Otomatik"
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr ""
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Erişilebilirlilik"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Kullanılırlık raporu"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Kullanılır"
 
@@ -925,36 +928,36 @@ msgstr "Kullanılır"
 msgid "Average"
 msgstr "Ortalama"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Ortalamanın alındığı"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr ""
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Eksen yanı"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Arkaplan"
@@ -963,7 +966,7 @@ msgstr "Arkaplan"
 msgid "Background image"
 msgstr "Arkaplan resmi"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Çubuk raporlar"
 
@@ -973,8 +976,8 @@ msgid "Base DN"
 msgstr "Taban DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Temel kimlik doğrulama"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -986,15 +989,15 @@ msgstr "Bağlama DN"
 msgid "Bind password"
 msgstr ""
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Siyah & Mavi"
 
@@ -1006,8 +1009,8 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bloklu"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Kalın çizgi"
 
@@ -1015,22 +1018,22 @@ msgstr "Kalın çizgi"
 msgid "Boolean"
 msgstr "Boole"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "Alt"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Parlaklaştır"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Toplu onay"
 
@@ -1056,7 +1059,7 @@ msgstr "UYGULAMALARIN YAPILANDIRMASI"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr ""
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1086,7 +1089,7 @@ msgstr "KONAK GRUPLARININ YAPILANDIRMASI"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr ""
 
@@ -1098,7 +1101,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr ""
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr ""
 
@@ -1107,14 +1110,14 @@ msgstr ""
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr ""
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "ÖĞE PROTOTİPLERİNİN YAPILANDIRMASI"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "ÖĞELERİN YAPILANDIRMASI"
 
@@ -1143,7 +1146,7 @@ msgstr "AĞ HARİTALARININ YAPILANDIRMASI"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "VEKİLLERİN YAPILANDIRMASI"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr ""
 
@@ -1163,7 +1166,7 @@ msgstr "BETİKLERİN YAPILANDIRMASI"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "SLAYT GÖSTERİLERİN YAPILANDIRMASI"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr ""
 
@@ -1179,7 +1182,7 @@ msgstr ""
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "TETİKLERİN YAPILANDIRMASI"
 
@@ -1211,22 +1214,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "ZABBIX YAPILANDIRMASI"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1235,21 +1238,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Hesaplanmış"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr ""
 
@@ -1257,92 +1260,95 @@ msgstr ""
 msgid "Callback"
 msgstr "Geri arama"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Canada (136 karakter)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "İptal"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Olay onaylamıyor"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Eylem eklenemedi"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Uygulama eklenemedi"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr ""
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Keşif kuralı eklenemedi"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Grafik eklenemedi"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Grup eklenemedi"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Konak eklenemedi"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1350,24 +1356,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "Resim eklenemedi"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr ""
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Öğe eklenemedi"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1375,20 +1381,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr ""
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Bakım eklenemedi"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr ""
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1397,24 +1403,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "Ağ haritası eklenemedi"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Vekil eklenemedi"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Düzenli ifade eklenemedi"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Ekran eklenemedi"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Betik eklenemedi"
 
@@ -1426,27 +1432,27 @@ msgstr "Servis eklenemedi"
 msgid "Cannot add slide show"
 msgstr ""
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Şablon eklenemedi"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Tetik eklenemedi"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Kullanıcı eklenemedi"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Kullanıcı eklenemedi. Her iki parola da aynı olmalı."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr ""
 
@@ -1454,7 +1460,7 @@ msgstr ""
 msgid "Cannot add value map"
 msgstr "Değer haritası eklenemedi"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1474,23 +1480,23 @@ msgstr ""
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr ""
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Geçmiş temizlenemedi"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -1498,20 +1504,20 @@ msgstr ""
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr ""
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Grafikler kopyalanamadı"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Öğeler kopyalanamadı"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1520,19 +1526,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "Başka bir veritabanı bağlantısı oluşturulamadı"
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr ""
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr ""
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr ""
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr ""
 
@@ -1540,102 +1546,102 @@ msgstr ""
 msgid "Cannot create icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "\"%s\" haritası oluşturulamadı."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr ""
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr ""
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Eylem silinemedi"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "Uygulama silinemedi"
 msgstr[1] "Uygulama silinemedi"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Keşif kuralı silienemedi"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr ""
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Grafik silinemedi"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr ""
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr ""
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Grafikler silienemedi"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr ""
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Grup silinemedi"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Grup silinemedi"
+msgstr[1] "Grup silinemedi"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Konak silienemedi"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1643,80 +1649,80 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Resim silienemedi"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr ""
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Öğe silienemedi"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Öğeler silinemedi"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr ""
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Bakım silinemedi"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr ""
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Ağ haritası silinemedi"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Vekil silinemedi"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 #, fuzzy
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Düzenli ifade silienemedi"
 msgstr[1] "Düzenli ifade silienemedi"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr ""
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Betik silienemedi"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr ""
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Betikler silinemedi. \"%1$s\"  betiği \"%2$s\" eylem işleminde kullanılıyor."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Seçilen eylemler silinemedi."
 
@@ -1724,77 +1730,80 @@ msgstr "Seçilen eylemler silinemedi."
 msgid "Cannot delete service"
 msgstr "Servis silienemedi"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Şablon silienemedi"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr ""
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Tetik silienemedi"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Tetikler silinemedi"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Kullanıcı silinemedi"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr ""
 
@@ -1802,77 +1811,77 @@ msgstr ""
 msgid "Cannot delete value map"
 msgstr "Değer haritası silinemedi"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:174
+#: media_types.php:184
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] ""
 msgstr[1] ""
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1886,134 +1895,128 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:173
+#: media_types.php:183
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] ""
 msgstr[1] ""
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2024,34 +2027,53 @@ msgstr ""
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr ""
@@ -2061,41 +2083,41 @@ msgstr ""
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2108,12 +2130,14 @@ msgstr ""
 msgid "Cannot format tree."
 msgstr ""
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "\"%s\" ifadesi genişletilemedi."
@@ -2125,59 +2149,60 @@ msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr ""
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr ""
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Şablon bağlantısı yapılamaz"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Oturum kapatılamadı."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr ""
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr ""
@@ -2197,7 +2222,7 @@ msgstr ""
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2206,11 +2231,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2218,11 +2243,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr ""
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr ""
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Kontroller olmaksızın keşif kuralları saklanamadı"
 
@@ -2231,217 +2256,226 @@ msgstr "Kontroller olmaksızın keşif kuralları saklanamadı"
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr ""
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Kullanıcıların bloklaması kaldırılamadı"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Keşif kurallarının bağlantısı kaldırılıp, temizlenemiyor"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Grafik prototi̇pleri̇ni̇n bağlantısı kaldırılıp, temizlenemiyor"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Grafiklerin bağlantısı kaldırılıp, temizlenemiyor"
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Öğe prototi̇pleri̇ni̇n bağlantısı kaldırılıp, temizlenemiyor"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Öğelerin bağlantısı kaldırılıp, temizlenemiyor"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Tetiklerin bağlantısı kaldırılıp, temizlenemiyor"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Şablonun bağlantısı kaldırılamadı"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr ""
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Eylem güncellenemedi"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Uygulama güncellenemedi"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Yorum güncellenemedi"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr ""
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Hata ayıklama modu güncellenemedi"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Keşif kuralı güncellenemedi"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr ""
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Grafik güncellenemedi"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Grup güncellenemedi"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr ""
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Konak güncellenemedi"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Konaklar güncellenemedi"
 
@@ -2453,24 +2487,24 @@ msgstr ""
 msgid "Cannot update image"
 msgstr "Resim güncellenemedi"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr ""
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Öğe güncellenemedi"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr ""
 
@@ -2482,16 +2516,16 @@ msgstr ""
 msgid "Cannot update macros"
 msgstr "Makrolar güncellenemedi"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Bakım güncellenemedi"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "\"%s\" haritası güncellenemedi."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr ""
 
@@ -2499,28 +2533,24 @@ msgstr ""
 msgid "Cannot update network map"
 msgstr "Ağ haritası güncellenemedi"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Vekil güncellenemedi"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Düzenli ifade güncellenemedi"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Ekran güncellenemedi"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr ""
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Betik güncellenemedi"
 
@@ -2532,40 +2562,41 @@ msgstr "Servis güncellenemedi"
 msgid "Cannot update slide show"
 msgstr ""
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Şablon güncellenemedi"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Tetik güncellenemedi"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Kullanıcı güncellenemedi"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr ""
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Kullanıcı güncellenemedi. Her iki parola da aynı olmalıdır."
 
@@ -2573,15 +2604,15 @@ msgstr "Kullanıcı güncellenemedi. Her iki parola da aynı olmalıdır."
 msgid "Cannot update value map"
 msgstr "Değer haritası güncellenemedi"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Başlık"
 
@@ -2590,47 +2621,47 @@ msgstr "Başlık"
 msgid "Case sensitive"
 msgstr "Büyük/Küçük harf duyarlı"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Değişim"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr ""
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Karakter"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Karakter dizgisi içeriliyor"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Karakter dizgisi içerilmiyor"
 
@@ -2639,48 +2670,48 @@ msgid "Chassis"
 msgstr "Şasi"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Zaten var olanı kontrol et."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Anahtarı kontrol edin lütfen.Öntanımlı örnek kullanıldı."
 
@@ -2689,44 +2720,44 @@ msgid "Check type"
 msgstr "Tipi kontrol et"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Kontroller"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Kontroller tekil olmalıdır."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr ""
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr ""
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr ""
@@ -2741,34 +2772,35 @@ msgstr ""
 msgid "Circular reference in screens: %1$s."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr ""
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Temizle"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr ""
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Seçilen için geçmişi temizle"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Bağlantı kaldırılırken temizle"
 
@@ -2778,69 +2810,69 @@ msgstr "Saat"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Klon"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Kapat"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr ""
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Renk"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Renk(TAMAM)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Kolon kapsamı"
 
@@ -2855,7 +2887,7 @@ msgstr "Birleşik sonuç"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Komut"
 
@@ -2863,41 +2895,31 @@ msgstr "Komut"
 msgid "Command actions"
 msgstr "Komut eylemleri"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Komut boş olamaz."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Komutlar"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Komut güncellendi"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Yorumlar"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Ticari"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Değerleri birden çok dönem için karşılaştır"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr ""
 
@@ -2905,29 +2927,39 @@ msgstr ""
 msgid "Condition"
 msgstr "Koşul"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Koşullar"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3090,23 +3122,23 @@ msgstr "Yapılandırma güncellendi"
 msgid "Configure (Filter %s)"
 msgstr ""
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Onaylama metni"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Bağlan"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "'%1$s' olarak oturum açıldı"
@@ -3154,7 +3186,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3162,30 +3194,37 @@ msgstr ""
 msgid "Contract number"
 msgstr "Kontak numarası"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Kopyala"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Seçilenleri kopyalanacağı ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Resim kaydedilemedi!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Sayı"
 
@@ -3205,6 +3244,10 @@ msgstr "Uygulama oluştur"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3222,7 +3265,7 @@ msgstr ""
 msgid "Create graph prototype"
 msgstr ""
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr ""
 
@@ -3235,15 +3278,15 @@ msgstr ""
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr ""
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Resim oluştur"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr ""
 
@@ -3267,6 +3310,10 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr ""
@@ -3291,11 +3338,11 @@ msgstr "Betik oluştur"
 msgid "Create slide show"
 msgstr ""
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Tetik oluştur"
 
@@ -3319,42 +3366,42 @@ msgstr ""
 msgid "Create value map"
 msgstr "Değer haritası oluştur"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3364,51 +3411,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr ""
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr ""
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr ""
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr ""
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Geçerli konak"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr ""
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr ""
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr ""
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr ""
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr ""
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3421,7 +3469,7 @@ msgstr "Özel grafikler"
 msgid "Custom label"
 msgstr "Özel etiketler"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "\"%2$s\" haritası için özel etiket \"%1$s\" tipi elemanları boş olamaz."
@@ -3435,7 +3483,7 @@ msgstr "Özel çarpan"
 msgid "Custom screens"
 msgstr "Özel ekranlar"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Özel betik"
 
@@ -3455,18 +3503,14 @@ msgstr ""
 msgid "Custom slides"
 msgstr "Özel slaytlar"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr ""
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "PANO YAPILANDIRMASI"
@@ -3482,28 +3526,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "SENARYONUN DETAYLARI"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "ETKİSİZLEŞTİRİLMİŞ"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "KEŞFEDİLMİŞ"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3511,25 +3555,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS ismi"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "AŞAĞI"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Günlük"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Koyu portakal"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Koyulaştır"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "Pano"
 
@@ -3541,20 +3585,21 @@ msgstr "Pano yapılandırması"
 msgid "Dashboard filter"
 msgstr "Pano filtreleri"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Kesikli çizgi"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Veri"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3577,11 +3622,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Veri tipi"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Veritabanı dosyası"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Veritabanı konağı"
 
@@ -3589,35 +3635,39 @@ msgstr "Veritabanı konağı"
 msgid "Database monitor"
 msgstr "Veritabanı gözeti"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Veritabanı ismi"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Veritabanı parolası"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Veritabanı portu"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Veritabanı şeması"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Veritabanı sunucusu"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Veritabanı tipi"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Veritabanı kullanıcısı"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Tarih"
 
@@ -3637,53 +3687,52 @@ msgstr "HW'nin bakım zamanının bittiği tarih"
 msgid "Date HW purchased"
 msgstr "HW'nin alındığı tarih"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "Gün"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "Ayın günü"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr ""
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr ""
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr ""
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "Haftanın günü"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr ""
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr ""
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr ""
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Günler"
 
@@ -3691,22 +3740,22 @@ msgstr "Günler"
 msgid "Debug"
 msgstr "Hata Ayıklama"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Hata ayıklama modu"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Hata ayıklama modu güncellendi"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Ara"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Aralık"
 
@@ -3716,15 +3765,14 @@ msgstr "Ondalık"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "Öntanımlı"
 
@@ -3737,11 +3785,11 @@ msgid "Default delay (in seconds)"
 msgstr ""
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Öntanımlı mesaj"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr ""
 
@@ -3764,30 +3812,34 @@ msgstr ""
 msgid "Delay"
 msgstr "Geçikme"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr ""
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Geçikmenin yapıldığı"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Sil"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Sil ve temizle"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Seçilen şablonlar silinsin ve temizlensin mi? (Uyarı: bütün bağlantılı konaklar temizlenecektir!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Seçilen şablon silinsin ve temizlensin mi? (Uyarı: bütün bağlantılı konaklar temizlenecektir!)"
 
@@ -3795,53 +3847,53 @@ msgstr "Seçilen şablon silinsin ve temizlensin mi? (Uyarı: bütün bağlantı
 msgid "Delete application?"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Şu anki eylem silinsin mi?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Keşif kuralı silinsin mi?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "İfade silinsin mi?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Grafik silinsin mi?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Seçilen WEB senaryolarının geçmişi silinsin mi?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Seçilen öğelerin geçmişi silinsin mi?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Anahtar kelime silinsin mi?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -3849,11 +3901,15 @@ msgstr ""
 msgid "Delete maintenance period?"
 msgstr "Bakım dönemi silinsin mi?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr ""
 
@@ -3861,7 +3917,7 @@ msgstr ""
 msgid "Delete regular expression?"
 msgstr "Düzenli ifade silinsin mi?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Senaryo silinsin mi?"
 
@@ -3869,71 +3925,67 @@ msgstr "Senaryo silinsin mi?"
 msgid "Delete screen?"
 msgstr "Ekran silinsin mi?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Betik silinsin mi?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Seçilenleri sil"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Seçilen WEB senaryoları silinsin mi?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Seçilen eylemler silinsin mi?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Seçilen uygulamalar silinsin mi?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Seçilen keşif kuralları silinsin mi?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Seçilen elemanlar silinsin mi?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Seçilen grafikler silinsin mi?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Seçilen grup silinsin mi?"
@@ -3942,27 +3994,27 @@ msgstr "Seçilen grup silinsin mi?"
 msgid "Delete selected groups?"
 msgstr "Seçilen gruplar silinsin mi?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Seçilen konak silinsin mi?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Seçilen konaklar silinsin mi?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Seçilen resim silinsin mi?"
 
@@ -3970,31 +4022,31 @@ msgstr "Seçilen resim silinsin mi?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Seçilen öğeler silinsin mi?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Seçilen bakım dönemleri silinsin mi?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Seçilen haritalar silinsin mi?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr ""
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Seçilen iletişim aracı tipleri silinsin mi?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Seçilen vekiller silinsin mi?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Seçilen düzenli ifadeler silinsin mi?"
 
@@ -4002,15 +4054,15 @@ msgstr "Seçilen düzenli ifadeler silinsin mi?"
 msgid "Delete selected screens?"
 msgstr "Seçilen ekranlar silinsin mi?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Seçilen betikler silinsin mi?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr ""
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Seçilen şablonlar silinsin mi?"
 
@@ -4022,11 +4074,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Seçilen tetikler silinsin mi?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Seçilen kullanıcı silinsin mi?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Seçilen kullanıcılar silinsin mi?"
 
@@ -4041,11 +4093,15 @@ msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "Seçilen değer eşlemesi silinsin mi? %d öğe bunu kullanıyor."
 msgstr[1] "Seçilen değer eşlemesi silinsin mi? %d öğe bunu kullanıyor."
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Seçilen bağlı elemanları sil"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4054,15 +4110,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Şablon silinsin mi?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Tetik silinsin mi?"
 
@@ -4070,62 +4126,62 @@ msgstr "Tetik silinsin mi?"
 msgid "Deleted"
 msgstr "Silindi"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4134,35 +4190,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Sınırlayıcı"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Delta (Basit değişim)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Delta (saniyedeki hız)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Reddet"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Bağımlı"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Bağımlılığın olduğu"
 
@@ -4170,30 +4226,41 @@ msgstr "Bağımlılığın olduğu"
 msgid "Deployment status"
 msgstr "Dağıtım durumu"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Açıklama"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Detaylar"
 
@@ -4206,71 +4273,71 @@ msgid "Device"
 msgstr "Aygıt"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Aygıt teklik kıstası"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4294,48 +4361,44 @@ msgstr "Seçilen grupların hata ayıklama modu etkisizleştirilsin mi?"
 msgid "Disable host"
 msgstr "Konağı etkisizleştir"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Konak etkisizleştirilsin mi?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr ""
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Seçilen vekiller tarafından gözetlenen konaklar etkisizleştirilsin mi?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Seçileni etkisizleştir"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Seçilen WEB senaryoları etkisizleştirilsin mi?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Seçilen eylemler etkisizleştirilsin mi?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Seçilen uygulamalar etkisizleştirilsin mi?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Seçilen keşif kuralları etkisizleştirilsin mi?"
 
@@ -4343,11 +4406,11 @@ msgstr "Seçilen keşif kuralları etkisizleştirilsin mi?"
 msgid "Disable selected groups?"
 msgstr "Seçilen gruplar etkisizleştirilsin mi?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Seçilen konaklar etkisizleştirilsin mi?"
 
@@ -4355,42 +4418,47 @@ msgstr "Seçilen konaklar etkisizleştirilsin mi?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Seçilen öğeler etkisizleştirilsin mi?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Seçilen tetikler etkisizleştirilsin mi?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Etkisizleştirilmiş"
 
@@ -4403,7 +4471,7 @@ msgstr "Felaket"
 msgid "Discovered"
 msgstr "Keşfedilmiş"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4411,17 +4479,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "Keşfedilmiş aygıt"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Keşif"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Vekil aracılığı ile keşif"
 
@@ -4429,17 +4497,17 @@ msgstr "Vekil aracılığı ile keşif"
 msgid "Discovery check"
 msgstr "Keşif kontrolü"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr ""
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr ""
 
@@ -4448,67 +4516,70 @@ msgid "Discovery object"
 msgstr "Keşif objesi"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Keşif kuralı"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
 msgstr ""
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Keşif kuralı oluşturuldu"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Keşif kuralı silindi"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Keşif kuralı güncellendi"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Keşif kuralları"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr ""
 
@@ -4520,7 +4591,7 @@ msgstr "Keşif Durumu"
 msgid "Display OK triggers for"
 msgstr ""
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Gösteriliyor"
 
@@ -4529,32 +4600,32 @@ msgstr "Gösteriliyor"
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Değerlerin birden çok öğe için dağılımı"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Değerlerin birden çok dönem için dağılımı"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Hesaplama yapma"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Koşulsal ifadeyi değiştirmek ister misiniz?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Nokta"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr ""
@@ -4564,30 +4635,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Aksama Süresi"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Çizim stili"
 
@@ -4605,74 +4676,75 @@ msgstr ""
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr ""
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "\"%s\" haritası için çift kopya harita ismi"
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Çift kopya \"%s\" önem derecesi ismi"
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Çift kopya \"%s\"  kullanıcı rumuzu"
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Süre"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr ""
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Dinamik öğe"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr ""
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "HATA"
 
@@ -4680,13 +4752,13 @@ msgstr "HATA"
 msgid "EVENTS"
 msgstr "OLAYLAR"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Her URL tekil bir isme sahip olmalıdır. Lütfen URL'in yalnızca bir isme sahip olduğundan emin olun."
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4694,9 +4766,9 @@ msgstr "Her URL tekil bir isme sahip olmalıdır. Lütfen URL'in yalnızca bir i
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Düzenle"
 
@@ -4704,7 +4776,7 @@ msgstr "Düzenle"
 msgid "Edit map element"
 msgstr "Harita elemanını düzenle"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr ""
 
@@ -4712,27 +4784,61 @@ msgstr ""
 msgid "Element"
 msgstr "Eleman"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Eleman ismi"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "E-posta"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Boş"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr ""
 
@@ -4740,76 +4846,98 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr ""
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Boş girdi."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr ""
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Boş parametreler"
 
@@ -4818,11 +4946,11 @@ msgstr "Boş parametreler"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4830,11 +4958,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr ""
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Etkinleştir"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Onaylamayı etkinleştir"
 
@@ -4854,11 +4986,11 @@ msgstr ""
 msgid "Enable host"
 msgstr "Konağı etkinleştir"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Konak etkinleştirilsin mi?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Seçilen vekiller tarafından gözetlenen konaklar etkinleştirilsin mi?"
 
@@ -4871,36 +5003,32 @@ msgstr "Seçilen vekiller tarafından gözetlenen konaklar etkinleştirilsin mi?
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Seçileni etkinleştir"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr ""
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Seçilen eylemler etkinleştirilsin mi?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr ""
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Seçilen keşif kuralları etkinleştirilsin mi?"
 
@@ -4908,11 +5036,11 @@ msgstr "Seçilen keşif kuralları etkinleştirilsin mi?"
 msgid "Enable selected groups?"
 msgstr "Seçilen konaklar etkinleştirilsin mi?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr ""
 
@@ -4920,64 +5048,68 @@ msgstr ""
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Seçilen öğeler etkinleştirilsin mi?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Seçilen tetikler etkinleştirilsin mi?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Etkinleştirilmiş"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr ""
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr ""
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Hata"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
@@ -4995,15 +5127,15 @@ msgstr "Olay"
 msgid "Event ID"
 msgstr "Olay ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Olay onaylandı"
 
@@ -5012,7 +5144,7 @@ msgstr "Olay onaylandı"
 msgid "Event acknowledges \"%1$s\"."
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Olay onaylaması etkisizleştirilmiş"
 
@@ -5020,7 +5152,7 @@ msgstr "Olay onaylaması etkisizleştirilmiş"
 msgid "Event details"
 msgstr "Olay detayları"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr ""
 
@@ -5040,9 +5172,10 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Olaylar"
 
@@ -5050,36 +5183,41 @@ msgstr "Olaylar"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Her gün"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Her hafta"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Dışla"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr ""
 
@@ -5087,13 +5225,13 @@ msgstr ""
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Çalıştırılmış betik"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr ""
 
@@ -5105,7 +5243,7 @@ msgstr ""
 msgid "Expand single problem"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr ""
@@ -5115,12 +5253,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr ""
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Ayrılmış"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Seçileni dışa aktar"
 
@@ -5128,22 +5266,22 @@ msgstr "Seçileni dışa aktar"
 msgid "Export to CSV"
 msgstr "CSV'e aktar"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "İfade"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr ""
 
@@ -5151,11 +5289,12 @@ msgstr ""
 msgid "Expression Variable Elements"
 msgstr "İfade Değer Elemanları"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "İfade boş olamaz"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr ""
 
@@ -5176,17 +5315,17 @@ msgid "External check"
 msgstr "Dış kontrol"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Mesajlaşma"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "YANLIŞ"
 
@@ -5195,16 +5334,17 @@ msgstr "YANLIŞ"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Başarısız"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Başarısız"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5212,40 +5352,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Başarısızlık denetimi"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Favori grafikler"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Favori haritalar"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Favori ekranlar"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "favoriler"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Şub"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Şubat"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Alan"
 
@@ -5289,19 +5429,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "\"druleid\" alanı gerekiyor."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "\"isim\" alanı gerekiyor."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5310,13 +5450,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr ""
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5324,68 +5464,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Dolu bölge"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Filtre"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Konak gruplarına göre filtrele"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "İsme göre filtrele"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Bitir"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr ""
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "İlk"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr ""
@@ -5394,8 +5537,8 @@ msgstr ""
 msgid "Fit to map"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Sabit"
 
@@ -5405,76 +5548,80 @@ msgstr "Sabit"
 msgid "Flexible intervals"
 msgstr ""
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Misafir için parola boş olmak zorunda"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Formül"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Dördüncü"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr ""
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "Cum"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "Cuma"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "Kimden"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr ""
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr ""
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Tüm klon"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "Tam ekran"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Fonksiyon"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr ""
@@ -5484,50 +5631,50 @@ msgstr ""
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "GUI"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "GUI erişimi etkisizleştirildi."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Genel"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "%s sn'de oluşturuldu"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5535,65 +5682,65 @@ msgid "Get support"
 msgstr "Destek Al"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Verilen ifade bir makro değil"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Genel betik"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Genel betikler"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Git"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr ""
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr ""
 
@@ -5602,66 +5749,73 @@ msgid "Gradient line"
 msgstr "Gradyan çizgi"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Grafik"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr ""
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr ""
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr ""
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Grafik ekendi"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Grafil silindi"
 
@@ -5673,54 +5827,59 @@ msgstr "Grafik elemanı"
 msgid "Graph item"
 msgstr "Grafik öğesi"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Grafik ismi"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr ""
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Grafik prototipi"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5732,49 +5891,51 @@ msgstr ""
 msgid "Graph sum"
 msgstr "Grafik özeti"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Grafik tipi"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Grafik güncellendi"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr ""
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr ""
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Grafikler"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Grafikler kopyalandı"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Grafikler silindi"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr ""
 
@@ -5783,54 +5944,58 @@ msgstr ""
 msgid "Grid"
 msgstr "Izgara"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Grup"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Grup eklendi"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Grup silindi"
+msgid_plural "Groups deleted"
+msgstr[0] "Grup silindi"
+msgstr[1] "Grup silindi"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5841,40 +6006,42 @@ msgstr "Keşfedilmiş konaklar için grup"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Grup ismi"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Grup güncellendi"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr ""
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Gruplar"
 
@@ -5882,22 +6049,13 @@ msgstr "Gruplar"
 msgid "Groups in maintenance"
 msgstr "Bakımdaki gruplar"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H.i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5914,7 +6072,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr ""
 
@@ -5932,7 +6090,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5953,12 +6112,17 @@ msgstr "Donanım"
 msgid "Hardware (Full details)"
 msgstr "Donanım(Tüm detaylar)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Yükseklik"
@@ -5971,15 +6135,15 @@ msgstr "Yardım"
 msgid "Hexadecimal"
 msgstr "Onaltılık"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Gizli"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Gizle"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Hepsini gizle"
 
@@ -5995,15 +6159,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Etkisizleştirilmiş tetikleri gizle"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Seçileni gizle"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6012,23 +6176,23 @@ msgstr ""
 msgid "High"
 msgstr "Yüksek"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Geçmiş"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Geçmiş temizlendi"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Geçmişi temizlemek uzun zaman alabilir. Devam edilsin mi?"
 
@@ -6049,79 +6213,79 @@ msgstr "Olay Geçmişi"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Yatay"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Yatay hizalama"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "Konak"
 msgstr[1] "Konak"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr ""
 
@@ -6133,66 +6297,68 @@ msgstr "Konak IP"
 msgid "Host access"
 msgstr "Konak erişimi"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Konak eklendi"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr ""
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Konak sayısı"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Konak silindi"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Konak grubu"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6209,14 +6375,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Konak grupları"
 
@@ -6226,8 +6393,8 @@ msgstr "Konak grupları"
 msgid "Host interface"
 msgstr "Konak arabirimi"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr ""
 
@@ -6243,7 +6410,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "Konak etiket tipi"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr ""
 
@@ -6252,18 +6419,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Konak ismi"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6272,72 +6439,72 @@ msgstr ""
 msgid "Host networks"
 msgstr "Konak ağları"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6349,7 +6516,7 @@ msgstr ""
 msgid "Host router"
 msgstr "Konak yöndendiricisi"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Konak ekranları"
 
@@ -6361,51 +6528,52 @@ msgstr "Konak Durumu"
 msgid "Host subnet mask"
 msgstr "Konak alt ağ maskesi"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Konak zamanı"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr ""
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Konak güncellendi"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "\"%s\" ismli konak zaten var."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "\"%s\" görünen ismi ile konak zaten var."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Konaklar"
 
@@ -6413,11 +6581,11 @@ msgstr "Konaklar"
 msgid "Hosts & Groups"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Konaklar(gözetlenen/gözetlenmeyen/şablon)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr ""
 
@@ -6429,37 +6597,38 @@ msgstr ""
 msgid "Hosts in maintenance"
 msgstr "Bakımdaki konaklar"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Konak bilgisi"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Konakların konumu"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Konaklar güncellendi"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Saatlik"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Saat"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr ""
 
@@ -6477,22 +6646,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6500,26 +6669,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP adresi"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "Konak arabirimi için IP ve DNS boş olamaz"
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP aralığı"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "IP aralığı boş olamaz."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6527,22 +6696,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI aracı"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI kimlik doğrulama algoritması"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI parolası"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI öncelik seviyesi"
 
@@ -6552,7 +6721,7 @@ msgstr "IPMI öncelik seviyesi"
 msgid "IPMI sensor"
 msgstr "IPMI algılayıcısı"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI kullanıcı ismi"
 
@@ -6585,7 +6754,7 @@ msgstr ""
 msgid "IT service parent"
 msgstr ""
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6601,25 +6770,25 @@ msgid "ITEMS"
 msgstr "ÖĞELER"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Simge"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Simge(Varsayılan)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Simge(etkisizleştirilmiş)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Simge(bakım)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Simge(sorun)"
 
@@ -6640,42 +6809,44 @@ msgstr "Simge etiket tipi"
 msgid "Icon map"
 msgstr ""
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr ""
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr ""
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr ""
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr ""
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr ""
@@ -6688,7 +6859,8 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr ""
 
@@ -6696,29 +6868,29 @@ msgstr ""
 msgid "Icon map updated"
 msgstr ""
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr ""
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr ""
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr ""
 
@@ -6726,21 +6898,23 @@ msgstr ""
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Eğer bu mesajın yanlış olduğunu düşünüyorsanız gerekli izinlerin alınması için lütfen yöneticilerinize danışın."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Resim"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6749,7 +6923,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Resim eklendi"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Resim silindi"
 
@@ -6757,12 +6931,13 @@ msgstr "Resim silindi"
 msgid "Image label type"
 msgstr "Resim etiket tipi"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6771,66 +6946,66 @@ msgid "Image updated"
 msgstr "Resim güncellendi"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Resimler"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Hemen"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "İçe aktar"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "İçe aktarma başarısız"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Dosyayı içe aktar"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "İçe aktarma başarılı"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr ""
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr ""
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "İçinde"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "Gruplarda"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6843,244 +7018,282 @@ msgstr "Bakımda"
 msgid "In progress"
 msgstr "İşlemde"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "İçer"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "\"%2$s\" haritası için geçersiz %1$s etiket tipi değeri ."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Geçersiz IP aralığı \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Geçersiz SNMP OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr ""
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Geçersiz eylem koşul keşif kontrolü."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Geçersiz eylem koşul keşif durumu."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr ""
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr ""
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr ""
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Geçersiz eylem işlem komut tipi"
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Geçersiz işlem koşul onay tipi."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr ""
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Geçersiz eylem işlem eskalasyon adım değerleri."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr ""
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Geçersiz eylem işlem knağı. Konak mevcut değil veya sizin bu konağa erişiminiz yok."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Geçersiz eylem işlem portu\"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr ""
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Geçersiz eylem işlem tipi"
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Geçersiz eylem işlem kullanıcı grubu. Kullanıcı grubu mevcut değil veya sizin bu kullanıcı grubuna erişiminiz yok."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Geçersiz eylem işlem kullanıcısı. Kullanıcı mevcut değil veta sizin bu kullanıcıya erişiminiz yok."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr ""
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr ""
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Fonksiyona geçersiz değişkenler geçirildi."
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Yönteme geçersiz değişkenler geçirildi."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Geçersiz geçikme."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7090,11 +7303,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7103,11 +7316,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "\"%2$s\" tablosu için where komutunda geçersiz  alan ismi \"%1$s\" veya değeri."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr ""
 
@@ -7115,74 +7328,100 @@ msgstr ""
 msgid "Incorrect file upload."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr ""
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Geçersiz fonksiyon kullanıldı"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7190,182 +7429,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr ""
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr ""
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr ""
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Geçersiz anahtar."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Geçersiz öğelerin listesi."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr ""
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Geçersiz bakım zamanı"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Geçersiz bakım günü dönemi"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Geçersiz bakım haftası günleri"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Geçersiz bakım ayı dönemi"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Geçersiz bakım dönemi"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr ""
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Geçersiz bakım haftası dönemi"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "\"%s\" haritası için geçersiz harita yükseklik değeri."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "\"%s\" haritası için geçersiz harita genişlik değeri."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr ""
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr ""
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Koşul için geçersiz parametreler"
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr ""
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr ""
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr ""
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr ""
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Geçersiz port aralığı."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Geçersiz proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr ""
 
@@ -7374,64 +7632,68 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr ""
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr ""
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr ""
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr ""
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Geçersiz durum."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7452,52 +7714,57 @@ msgstr ""
 msgid "Incorrect time period \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr ""
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Geçersiz tetik ifadesi"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr ""
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr ""
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Geçersiz tetik ifadesi. \"%s\" konağı mevcut değil veya sizin bu konağa erişiminiz yok."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr ""
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr ""
 
@@ -7506,7 +7773,8 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7526,7 +7794,7 @@ msgstr "\"%2$s\" tamsayı alanı için geçersiz değer \"%1$s\"."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "\"%2$s\" işaretsiz tamsayı alanı için geçersiz değer \"%1$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7536,43 +7804,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr ""
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr ""
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Bilgi"
 
@@ -7581,15 +7855,15 @@ msgstr "Bilgi"
 msgid "Information"
 msgstr "Bilgi"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Ekle"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Makro ekle"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Kurulum"
 
@@ -7597,31 +7871,32 @@ msgstr "Kurulum"
 msgid "Installer name"
 msgstr "Yükleyici ismi"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Arabirim"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr ""
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr ""
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr ""
@@ -7641,7 +7916,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "JSON-RPC iç hatası"
 
@@ -7649,7 +7924,7 @@ msgstr "JSON-RPC iç hatası"
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "İç hata."
 
@@ -7662,19 +7937,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr ""
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Zaman aralığı"
 
@@ -7684,112 +7959,114 @@ msgstr "Zaman aralığı"
 msgid "Interval (in sec)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Geçersiz JSON. JSON metni çözümlenirken sunucuda bir hata meydana geldi."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Geçersiz İstek."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Geçersiz yöntem parametreleri."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Geçersiz params."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr ""
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr ""
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr ""
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Envanter"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7798,7 +8075,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr ""
 
@@ -7806,12 +8083,12 @@ msgstr ""
 msgid "Is online?"
 msgstr "Çevrimiçi mi?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Sorun"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr ""
 
@@ -7819,70 +8096,71 @@ msgstr ""
 msgid "It is not possible to logout from HTTP authentication."
 msgstr ""
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr ""
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr ""
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Öğe"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 ""
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "\"%1$s:%2$s\" öğesi geçersiz porta sahip: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Öğe eklendi"
 
@@ -7890,17 +8168,17 @@ msgstr "Öğe eklendi"
 msgid "Item count"
 msgstr "Öğe sayısı"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Öğe silindi"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7914,56 +8192,56 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Öğe ptototipi"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Öğe prototipleri"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7971,92 +8249,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr ""
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Öğe güncellendi"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Öğe yenilenmeyecek. Lütfen doğru bir güncelleme zaman aralığı giriniz."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Öğe"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Öğeler (m/e/d)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Öğeler kopyalandı"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Öğeler silindi"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Öğe listesi"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Öğeler güncellendi"
 
@@ -8068,72 +8346,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX aracı"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr ""
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber tanımlayıcısı"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Oca"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Ocak"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr ""
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Tem"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Temmuz"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Haz"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Haziran"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr ""
@@ -8142,40 +8420,40 @@ msgstr ""
 msgid "Keep lost resources period (in days)"
 msgstr ""
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Anahtar"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr ""
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Anahtar Kelime"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr ""
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "EN SON VERİLER"
 
@@ -8206,37 +8484,37 @@ msgstr ""
 msgid "LDAP login was not successful"
 msgstr ""
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "YEREL"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "KAYIP"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Etiket"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Etiket konumu"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Dil"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Son"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr ""
@@ -8248,19 +8526,19 @@ msgid_plural "Last %1$d issues"
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr ""
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr ""
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr ""
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr ""
 
@@ -8280,28 +8558,28 @@ msgstr "Son 365 gün"
 msgid "Last 7 days"
 msgstr "Son 7 gün"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Son değişiklik"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr ""
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Son kontrol"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Son saat grafiği"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Son ayın grafiği"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr ""
 
@@ -8309,66 +8587,67 @@ msgstr ""
 msgid "Last seen (age)"
 msgstr "En son görüldüğü (dönem)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Son değer"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Son haftanın grafiği"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "En Son Veriler"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Son Olaylar"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "Sol"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Gösterge"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr ""
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr ""
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr ""
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr ""
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Satır"
 
@@ -8376,39 +8655,29 @@ msgstr "Satır"
 msgid "Link"
 msgstr "Bağlantı"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Bağlantı göstergeleri"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "\"%s\" haritası için bağlantı adı tekil olmalıdır."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "\"%s\" haritası için bağlantı \"name\" ve \"url\" alanlarının ikisine de sahip olmalıdır."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr ""
 
@@ -8420,50 +8689,50 @@ msgstr "Şablona bağlantı"
 msgid "Link to templates"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Şablonlara bağlantı"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Bağlantılı olduğu şablonlar"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Bağlantılı olduğu"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr ""
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Liste boş"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Yerel zaman"
 
@@ -8480,36 +8749,36 @@ msgid "Location longitude"
 msgstr "Konum boylamı"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Günlük"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr ""
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr ""
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr ""
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr ""
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Günlük zaman biçimi"
@@ -8518,12 +8787,12 @@ msgstr "Günlük zaman biçimi"
 msgid "Log unmatched SNMP traps"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "olarak oturum açıldı"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8534,12 +8803,12 @@ msgstr "Oturum aç"
 msgid "Login as Guest"
 msgstr "Misafir Olarak Oturum Aç"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8548,8 +8817,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr ""
 
@@ -8570,22 +8840,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8597,7 +8863,7 @@ msgstr "MAC adresi A"
 msgid "MAC address B"
 msgstr "MAC adresi B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "BAKIM"
 
@@ -8622,49 +8888,49 @@ msgstr "EN ÇOK MEŞGUL EDEN 100 TETİK"
 msgid "Macro"
 msgstr "Makro"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr ""
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr ""
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr ""
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Makrolar"
 
@@ -8672,31 +8938,36 @@ msgstr "Makrolar"
 msgid "Macros updated"
 msgstr "Makrolar güncellendi"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Bakım"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
+msgid "Maintenance \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr ""
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Bakım eklendi"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Bakım silindi"
 
@@ -8704,7 +8975,7 @@ msgstr "Bakım silindi"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Bakım dönemi uzunluğu"
 
@@ -8720,25 +8991,25 @@ msgstr "Bakım durumu"
 msgid "Maintenance type"
 msgstr "Bakım tipi"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Bakım güncellendi"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr ""
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr ""
 
@@ -8749,12 +9020,12 @@ msgstr "Manuel Oturum Kapat"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Harita"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr ""
@@ -8764,12 +9035,12 @@ msgstr ""
 msgid "Map \"%s\""
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "\"%s\"  haritası oluştur."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "\"%s\" haritası güncellendi."
@@ -8786,12 +9057,12 @@ msgstr "Harita etiket tipi"
 msgid "Map save operation failed."
 msgstr "Harita kaydetme işlemi başarısız oldu."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr ""
 
@@ -8801,23 +9072,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr ""
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr ""
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Haritalar"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Mar"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Mart"
 
@@ -8825,28 +9096,34 @@ msgstr "Mart"
 msgid "Mark elements on trigger status change"
 msgstr "Tetik durumu değişiminde elemanları işaretle"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Diğerlerini işaretle"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Seçileni işaretle"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Toplu güncelleme"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr ""
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Table hücresi içerisinde gösterilecek maksimum eleman sayısı"
@@ -8860,32 +9137,11 @@ msgstr ""
 msgid "Max count of events per trigger to show"
 msgstr ""
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Ekranı kapla"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8893,105 +9149,99 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 msgstr[1] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Mayıs"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr ""
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "İletişim Aracı"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "İletişim aracı tipi"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr ""
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr ""
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "İletişim aracı tipi silindi"
 
-#: media_types.php:171
+#: media_types.php:181
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:170
+#: media_types.php:180
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "İletişim aracı tipi güncellendi"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "İletişim aracı tipleri"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -9006,14 +9256,14 @@ msgid "Memory limit: %s"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Menü"
 
@@ -9023,7 +9273,7 @@ msgstr "Menü"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Mesaj"
 
@@ -9031,66 +9281,66 @@ msgstr "Mesaj"
 msgid "Message actions"
 msgstr "Mesaj eylemleri"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Mesaj metin sınırı"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Mesaj zamanaşımı"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Mesajlar"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Yöntem bulunamadı."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Orta"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Küçült"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9099,80 +9349,77 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Dakika"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9182,7 +9429,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr ""
 
@@ -9194,18 +9441,18 @@ msgstr "Mod"
 msgid "Model"
 msgstr "Model"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Pzt"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Vekil tarafından gözetlenen"
 
@@ -9213,33 +9460,33 @@ msgstr "Vekil tarafından gözetlenen"
 msgid "Monitored host"
 msgstr "Gözetlenen konak"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Gözetleme"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Ay"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Aylık"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9247,7 +9494,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "10 dakikadan fazla"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr ""
@@ -9256,19 +9503,19 @@ msgstr ""
 msgid "Most busy triggers top 100"
 msgstr "En çok meşgul eden 100 tetik"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Birden çok SORUNLU olay"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr ""
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Sesi Kapat"
 
@@ -9281,60 +9528,58 @@ msgstr "AĞ HARİTALARI"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "VERİ YOK"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM Kimlik Doğrulama"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9345,26 +9590,32 @@ msgstr "NTLM Kimlik Doğrulama"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "İsim"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9383,12 +9634,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9396,7 +9647,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Ağ haritası eklendi"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Ağ haritası silindi"
 
@@ -9408,7 +9659,7 @@ msgstr "Ağ haritası güncellendi"
 msgid "Network maps"
 msgstr "Ağ Haritaları"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Asla"
 
@@ -9416,24 +9667,24 @@ msgstr "Asla"
 msgid "Never executed"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Yeni"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Yeni uygulama"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Yeni koşul"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Yeni eleman"
 
@@ -9444,16 +9695,16 @@ msgstr "Yeni eleman"
 msgid "New flexible interval"
 msgstr "Yeni esnek zaman aralığı"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Yeni grup"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr ""
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Grafik için yeni öğe"
 
@@ -9461,83 +9712,99 @@ msgstr "Grafik için yeni öğe"
 msgid "New media"
 msgstr "Yeni iletişim aracı"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Yeni düzenli ifade"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Yeni servis zamanı"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Sonraki"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr ""
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Hayır"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9545,25 +9812,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr ""
 
@@ -9589,8 +9856,8 @@ msgstr ""
 msgid "No actions found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9600,7 +9867,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr ""
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9608,30 +9875,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "Eylem işlem komutu \"%s\" için hiçbir kimlik doğrulama tipi belirtilmemiş."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "Eylem işlem komutu \"%s\" için hiçbir kimlik doğrulama kullanıcı ismi belirtilmemiş."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr ""
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Eylem işlemi için hiçbir komut belirtilmemiş."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Eylem işlemi için hiçbir komut tipi belirtilmemiş."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr ""
 
@@ -9640,27 +9908,27 @@ msgstr ""
 msgid "No data collection"
 msgstr "Veri toplama yok"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Hiçbir detay yok"
 
@@ -9668,39 +9936,39 @@ msgstr "Hiçbir detay yok"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr ""
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr ""
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr ""
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Hiçbir onaylanacak olay yok"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr ""
@@ -9715,7 +9983,7 @@ msgstr ""
 msgid "No flexible intervals defined."
 msgstr ""
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr ""
 
@@ -9724,7 +9992,11 @@ msgstr ""
 msgid "No graph item with graphid \"%s\"."
 msgstr ""
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9733,48 +10005,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr ""
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr ""
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr ""
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9787,17 +10060,22 @@ msgstr "\"%s\" groupid'sine sahip hiçbir konak grubu yok."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "\"%s\" hostid'sine sahip hiçbir konak yok"
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr ""
@@ -9816,33 +10094,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr ""
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr ""
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9861,7 +10146,7 @@ msgid "No items defined."
 msgstr ""
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9877,7 +10162,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr ""
 
@@ -9886,15 +10171,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9906,133 +10191,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
 msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Sistem erişimi için izin yok."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Refere edilen obje için izin yk veya mevcut değil!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Eylem işlem komutu \"%s\" için hiçbir özel anahtar dosyası belirtilmemiş."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr ""
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Vekil yok"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Eylem işlem komutu \"%s\" için hiçbir genel anahtar dosyası belirtilmemiş."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr ""
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Eylem işlem mesajı için hiçbir alıcı yok."
 
@@ -10040,7 +10370,7 @@ msgstr "Eylem işlem mesajı için hiçbir alıcı yok."
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr ""
 
@@ -10048,82 +10378,83 @@ msgstr ""
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Eylem işlem komutu için hiçbir betik belirtilmemiş."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Hiçbir hedef seçilmemiş"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr ""
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr ""
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Tetik yok"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr ""
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr ""
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr ""
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10132,57 +10463,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr ""
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Hiçbiri"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Normal"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr ""
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Onaysız"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Şablonlanmamış öğeler"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr ""
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "\"guest\" kullanıcısı için parola konulmasına izin yok"
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Mevcut değil"
 
@@ -10191,7 +10523,7 @@ msgstr "Mevcut değil"
 msgid "Not classified"
 msgstr "Sınıflandırılmamış"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Bağlanmamış"
 
@@ -10204,8 +10536,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Desteklenmiyor"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Not"
@@ -10218,7 +10550,7 @@ msgstr "Notlar"
 msgid "Nothing"
 msgstr "Hiçbirşey"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr ""
 
@@ -10226,87 +10558,87 @@ msgstr ""
 msgid "Notification report"
 msgstr "Bildirim raporu"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Kas"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Kasım"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr ""
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr ""
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr ""
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr ""
 
@@ -10314,88 +10646,88 @@ msgstr ""
 msgid "Number of status changes"
 msgstr "Durum değişikliği sayısı"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Adımların sayısı"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Kullanıcıların sayısı(çevrimiçi)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Sayısal(kayan noktalı)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Sayısal(tamsayı 64bit)"
 
@@ -10410,16 +10742,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "Tamam"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10435,8 +10769,7 @@ msgstr "OOB yönlendiricisi"
 msgid "OOB subnet mask"
 msgstr "OOB alt ağ maskesi"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "VEYA"
 
@@ -10456,11 +10789,12 @@ msgstr "İS(Kısa)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr ""
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "GENEL BAKIŞ"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Eki"
 
@@ -10468,25 +10802,25 @@ msgstr "Eki"
 msgid "Octal"
 msgstr "Sekizlik"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Ekim"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Kapalı"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Tamam"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Açık"
 
@@ -10494,111 +10828,114 @@ msgstr "Açık"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Birkere"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Yalnızca bir kere"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Bir kerelik aksama süresi"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr ""
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr ""
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr ""
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr ""
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr ""
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr ""
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr ""
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr ""
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr ""
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr ""
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr ""
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr ""
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Yalnızca etkinleştirilmiş konaklara atanmış olan öğeler sayıldı"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Yalnızca bir kontrol tekil olabilir."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr ""
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr ""
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Yalnızca etkinleştirilmiş konaklara atanmış ve etkinleştirilmiş öğeler bağımlılığı olan tetikler sayıldı"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr ""
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "\"%s\" işlemi zaten var."
@@ -10607,28 +10944,28 @@ msgstr "\"%s\" işlemi zaten var."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "İşlem koşulu"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "İşlem detayları"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "İşlem, işlem yapılacak hiçbir gruba sahip değil. "
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "İşlem, işlem yapacak şablona sahip değil."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "İşlem tipi"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "İşlemler"
@@ -10637,25 +10974,27 @@ msgstr "İşlemler"
 msgid "Operator"
 msgstr "İşlemci"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10685,24 +11024,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Orjinal"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Orjinal mavi"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Diğer"
 
@@ -10710,19 +11049,19 @@ msgstr "Diğer"
 msgid "Other configuration parameters"
 msgstr ""
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Diğer gruplar"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr ""
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10732,21 +11071,21 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Diğer parametreler"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10759,14 +11098,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Genel bakış"
 
@@ -10774,7 +11110,7 @@ msgstr "Genel bakış"
 msgid "Overview by proxy"
 msgstr "Vekil aracılığı ile genel bakış"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr ""
@@ -10783,147 +11119,155 @@ msgstr ""
 msgid "PERSONAL DASHBOARD"
 msgstr "KİŞİSEL PANO"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHP veritabanı desteği"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP sürümü"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10932,32 +11276,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "SORUN"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr ""
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palet"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr ""
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Parametre"
 
@@ -10966,7 +11312,7 @@ msgstr "Parametre"
 msgid "Parent discovery rules"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10986,33 +11332,33 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Ayrıştırma hatası"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Pasif"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11022,20 +11368,21 @@ msgstr "Pasif"
 msgid "Password"
 msgstr "Parola"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Parola (Tekrar)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr ""
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Parola boş olmamalı"
 
@@ -11044,21 +11391,21 @@ msgstr "Parola boş olmamalı"
 msgid "Peak memory usage: %s"
 msgstr ""
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr ""
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11066,12 +11413,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Dönem"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Dönem tipi"
@@ -11081,24 +11428,24 @@ msgstr "Dönem tipi"
 msgid "Periods"
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr ""
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Dilim"
 
@@ -11110,55 +11457,56 @@ msgstr ""
 msgid "Plain text"
 msgstr "Düz metin"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Oynat"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Ses Oynat"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr ""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Lütfen onay metnini giriniz."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Lütfen iki eleman seçiniz"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr ""
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Port"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr ""
 
@@ -11166,51 +11514,51 @@ msgstr ""
 msgid "Port range"
 msgstr "Port aralığı"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr ""
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Konum"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Gönder"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Önizleme"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Önceki"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr ""
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr ""
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr ""
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr ""
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr ""
 
@@ -11259,30 +11607,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Özel anahtar dosyası"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Öncelik seviyesi"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr ""
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Sorun"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Sorun gösterimi"
 
@@ -11294,16 +11643,16 @@ msgstr ""
 msgid "Problem time"
 msgstr ""
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Sorun, eğer bütün altlarda sorun varsa"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Sorun, eğer en az alttakilerden birinde sorun varsa"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Problemler"
 
@@ -11311,75 +11660,71 @@ msgstr "Problemler"
 msgid "Profile"
 msgstr "Profil"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr ""
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Vekiller"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Vekil"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr ""
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Vekil eklendi"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Vekil silindi"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr ""
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr ""
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr ""
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Vekil modu"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Vekil ismi"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Vekil güncellendi"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Genel anahtar"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11390,7 +11735,7 @@ msgstr "Genel anahktar dosyası"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "GÜNCELLENECEK ÖĞE KUYRUĞU"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Kuyruk"
 
@@ -11398,18 +11743,18 @@ msgstr "Kuyruk"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Okuma"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Yalnızca okuma"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Okuma-Yazma"
 
@@ -11421,7 +11766,7 @@ msgstr "Sebep"
 msgid "Received value"
 msgstr "Alınan değer"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11429,11 +11774,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Alıcı"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr ""
 
@@ -11444,28 +11789,28 @@ msgstr ""
 msgid "Recipient(s)"
 msgstr "Alıcı(lar)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Düzelme"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Düzelme mesajı"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Düzelme başlığı"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Yenileme(saniye olarak)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Yenileme zaman çarpanı"
 
@@ -11483,48 +11828,52 @@ msgstr ""
 msgid "Regular expression"
 msgstr "Düzenli ifade"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr ""
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr ""
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Düzenli ifade eklendi"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 #, fuzzy
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Düzenli ifade silindi"
 msgstr[1] "Düzenli ifade silindi"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr ""
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Düzenli ifade güncellendi"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11541,26 +11890,28 @@ msgstr "Uzak komut"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11571,21 +11922,19 @@ msgstr "Uzak komut"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Kaldır"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11593,11 +11942,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Elemanı kaldır"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr ""
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr ""
@@ -11606,7 +11955,7 @@ msgstr ""
 msgid "Remove from host group"
 msgstr ""
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Konak gruplarından kaldır"
 
@@ -11618,28 +11967,28 @@ msgstr "Konağı kaldır"
 msgid "Remove link"
 msgstr "Bağlantıyı sil"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Seçileni kaldır"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Değiştir"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr ""
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Rapor"
 
@@ -11647,35 +11996,36 @@ msgstr "Rapor"
 msgid "Report 1"
 msgstr ""
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr ""
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr ""
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Raporlar"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Gerekli"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr ""
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr ""
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Konak izinleri gerekli"
 
@@ -11683,29 +12033,31 @@ msgstr "Konak izinleri gerekli"
 msgid "Required performance (vps)"
 msgstr "Gerekli performans(vps) "
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Gereki sunucu performansı, saniye başına yeni değerler"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr ""
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -11724,9 +12076,9 @@ msgstr "Bütün isim ve renkler öntanımlı değerlerine sıfırlansın mı?"
 msgid "Reset confirmation"
 msgstr "Onayı sıfırla"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11739,7 +12091,7 @@ msgstr "Çözüldü"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Kaynak"
@@ -11754,15 +12106,15 @@ msgstr "Yanıt süresi"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Sonuç"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Sonuç YANLIŞ"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Sonuç DOĞRU"
 
@@ -11775,7 +12127,8 @@ msgstr ""
 msgid "Result type"
 msgstr "Sonuç tipi"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11783,60 +12136,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Kalan tekrar deneme"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Tekrar dene"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "Hak"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Satır kapsamı"
 
@@ -11844,11 +12206,11 @@ msgstr "Satır kapsamı"
 msgid "Rows"
 msgstr "Satır"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Sayfa başına satır"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Kurallar"
 
@@ -11893,20 +12255,20 @@ msgid "Run remote commands on hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -11922,7 +12284,7 @@ msgstr "EKRANLAR"
 msgid "SEARCH"
 msgstr "ARA"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "SUNUCU"
 
@@ -11937,13 +12299,13 @@ msgstr ""
 msgid "SLA"
 msgstr "HSS"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "SLAYT GÖSTERİLERİ"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -11952,17 +12314,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP e-posta"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP helo"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP sunucusu"
@@ -11978,7 +12340,7 @@ msgstr "SNMP Anahtarı"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11990,9 +12352,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP topluluğu"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr ""
@@ -12001,7 +12363,7 @@ msgstr ""
 msgid "SNMP trap"
 msgstr ""
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr ""
 
@@ -12025,7 +12387,7 @@ msgstr "SNMPv3 aracı"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr ""
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12043,7 +12405,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12052,15 +12414,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH aracı"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "KEŞİF DURUMU"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "TETİKLERİN DURUMU"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "WEB GÖZETLEME DURUMU"
 
@@ -12068,92 +12450,92 @@ msgstr "WEB GÖZETLEME DURUMU"
 msgid "STATUS OF ZABBIX"
 msgstr "ZABBIX'İN DURUMU"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr ""
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Cts"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Kaydet"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr ""
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Ölçekle"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Senaryo"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Senaryo eklendi"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Senaryuo güncellendi"
 
@@ -12165,7 +12547,7 @@ msgstr "Senaryolar"
 msgid "Schedule"
 msgstr "Çizelge"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12176,126 +12558,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Ekran"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr ""
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr ""
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Ekran eklendi"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Ekran hücre yapılandırması"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Ekran silindi"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr ""
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Ekran güncellendi"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Ekranlar"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Betik"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Betik eklendi"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Betik silindi"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Betik ismi"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12304,17 +12685,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr ""
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Betik güncellendi"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Betikler"
 
@@ -12335,7 +12716,7 @@ msgstr "Arama şekil düzeni boş"
 msgid "Search/Filter elements limit"
 msgstr "Ara/Filtrele elemanları limiti"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "İkinci"
 
@@ -12367,7 +12748,7 @@ msgstr "İkincili İKK telefon B"
 msgid "Secondary POC screen name"
 msgstr "İkincil İKK ekran ismi"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Saniye"
 
@@ -12386,69 +12767,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Seç"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Prototip seç"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr ""
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Seçilen"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Seçilen eylemler silindi"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr ""
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Seçilen gruplar"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Seçilen konaklar"
 
@@ -12464,7 +12852,7 @@ msgstr ""
 msgid "Send message to users"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr ""
 
@@ -12472,11 +12860,11 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Kullanıcı gruplarına Gönder"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Kullanıcılar Gönder"
 
@@ -12485,17 +12873,17 @@ msgstr "Kullanıcılar Gönder"
 msgid "Sent"
 msgstr ""
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Eyl"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Ayrılmış"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Eylül"
 
@@ -12507,7 +12895,7 @@ msgstr "Seri numarası A "
 msgid "Serial number B"
 msgstr "Seri numarası B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Sunucu"
@@ -12516,44 +12904,44 @@ msgstr "Sunucu"
 msgid "Server info"
 msgstr "Sunucu bilgisi"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Sunucu zamanı"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Servis"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr ""
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr ""
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr ""
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr ""
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Servis aynı zamanda hem üst hem de alt olamaz"
 
@@ -12569,11 +12957,11 @@ msgstr "Servis silindi"
 msgid "Service port"
 msgstr "Servis portu"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Servis zamanları"
 
@@ -12585,49 +12973,53 @@ msgstr "Servis tipi"
 msgid "Service updated"
 msgstr "Servis güncellendi"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Servisler"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr ""
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Oturum sonlandı, lütfen tekrar oturum açın."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Önem Derecesi"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr ""
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Önem derecesi ismi boş olamaz."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Göster"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Hepsini göster"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Detayları göster"
 
@@ -12657,35 +13049,36 @@ msgstr ""
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr ""
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Bakımdaki konakları göster"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "İsmi benzer olan öğeleri göster"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Gösterge göster"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Satırları göster"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Seçilenleri göster"
 
@@ -12693,19 +13086,22 @@ msgstr "Seçilenleri göster"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Metni HTML olarak göster"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Tetikleri göster"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Onaylanmamışları göster"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Değeri göster"
@@ -12714,11 +13110,11 @@ msgstr "Değeri göster"
 msgid "Show warning if Zabbix server is down"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Çalışma zamanlarını göster"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Gösterilen"
 
@@ -12738,6 +13134,10 @@ msgstr "Basit kontrol"
 msgid "Simple graph"
 msgstr "Basit grafik"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Site ZIP/posta kodu"
@@ -12775,7 +13175,7 @@ msgid "Site state / province"
 msgstr "Site eyalet/il"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12793,16 +13193,16 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Slayt gösterisi"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr ""
@@ -12811,11 +13211,11 @@ msgstr ""
 msgid "Slide show added"
 msgstr ""
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr ""
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr ""
 
@@ -12823,10 +13223,10 @@ msgstr ""
 msgid "Slide show updated"
 msgstr ""
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Slayt gösterileri"
 
@@ -12834,15 +13234,15 @@ msgstr "Slayt gösterileri"
 msgid "Slides"
 msgstr "Slaytlar"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Ertele"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Yumuşak"
 
@@ -12875,28 +13275,28 @@ msgid "Software application E"
 msgstr "Yazılım uygulama E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Sıralamanın yapıldığı"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Sıralama düzeni (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr ""
 
@@ -12909,11 +13309,11 @@ msgstr ""
 msgid "Source"
 msgstr "Kaynak"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr ""
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Belirtilen betik mevcut değil veya eylem işlem komutu için üzerinde hakkınız yok."
 
@@ -12921,63 +13321,63 @@ msgstr "Belirtilen betik mevcut değil veya eylem işlem komutu için üzerinde
 msgid "Speed"
 msgstr "Hız"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Yığılı"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Aşama"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Durum"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr ""
 
@@ -12990,7 +13390,7 @@ msgstr "Durum hesaplaması"
 msgid "Status calculation algorithm"
 msgstr "Durum hesaplama algortiması"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Durum kodları"
 
@@ -12999,7 +13399,7 @@ msgid "Status of Web monitoring"
 msgstr "Web gözetleme durumu"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Zabbix'in durumu"
 
@@ -13016,40 +13416,40 @@ msgid "Status only"
 msgstr "Yalnızca durum"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Adım"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr ""
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Senaryonun adımı"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Adımlar"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Dur"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Saklama değeri"
@@ -13058,11 +13458,11 @@ msgstr "Saklama değeri"
 msgid "Straight"
 msgstr "Düz"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Stil"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr ""
 
@@ -13070,11 +13470,11 @@ msgstr ""
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Başlık"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Altharita"
 
@@ -13083,32 +13483,32 @@ msgid "Success Audit"
 msgstr "Başarı denetimi"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Paz"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -13116,27 +13516,27 @@ msgstr "Pazar"
 msgid "Support"
 msgstr "Destek"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Soyad"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr ""
 
@@ -13144,16 +13544,16 @@ msgstr ""
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr ""
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Sistem öntanımı"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Sistem hatası."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13162,21 +13562,21 @@ msgid "System status"
 msgstr "Sistem Durumu"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -13195,11 +13595,11 @@ msgid "TOTAL"
 msgstr "TOPLAM"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "TETİK YORUMLARI"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "DOĞRU"
 
@@ -13217,14 +13617,14 @@ msgstr ""
 msgid "Tag"
 msgstr "Künye"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Hedef"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Hedef listesi"
 
@@ -13233,130 +13633,133 @@ msgid "Target type"
 msgstr "Hedef tipi"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Şablon"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr ""
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Şablon silindi"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Şablon grubu"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Şablon bağlantısı"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr ""
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Şablon ismi"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr ""
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Şablon tetik"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Şablon güncellendi"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "\"%s\" ile aynı isimli şablon zaten var."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "\"%s\" ile aynı görünen isimli şablon zaten var"
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Şablonlanmış öğeler"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Test"
 
@@ -13364,11 +13767,11 @@ msgstr "Test"
 msgid "Test authentication"
 msgstr ""
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Test onayı"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Test verisi"
 
@@ -13382,22 +13785,22 @@ msgid "Test string"
 msgstr "Test dizgisi"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Metin"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13405,7 +13808,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13420,26 +13823,26 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
@@ -13448,19 +13851,19 @@ msgstr ""
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr ""
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Tema"
 
@@ -13471,11 +13874,11 @@ msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Üçüncü"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Bu alan  \"%s\" öğesi tarafında otomatik doldurulmuş."
@@ -13484,11 +13887,11 @@ msgstr "Bu alan  \"%s\" öğesi tarafında otomatik doldurulmuş."
 msgid "This month"
 msgstr "Bu ay"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr ""
 
@@ -13500,27 +13903,27 @@ msgstr "Bu hafta"
 msgid "This year"
 msgstr "Bu sene"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Per"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "Kadar"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13529,28 +13932,28 @@ msgstr "Kadar"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Zaman"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13558,54 +13961,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Zaman dönemi"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Zaman ötelemesi"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Zaman tipi"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Zamanaşımı"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Zaman damgası"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Başlık"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Kime"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
@@ -13613,17 +14016,18 @@ msgstr ""
 msgid "Today"
 msgstr "Bugün"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "Üst"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Toplam"
 
@@ -13641,7 +14045,7 @@ msgstr ""
 msgid "Transaction has not been closed. Aborting..."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Aktarım hatası."
 
@@ -13658,91 +14062,91 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Yönelimler"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Tetik"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr ""
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr ""
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Tetik eklendi"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Tetik Yorumları"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Tetik silindi"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 msgstr[1] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr ""
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13757,11 +14161,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr ""
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr ""
 
@@ -13769,7 +14174,7 @@ msgstr ""
 msgid "Trigger form"
 msgstr "tetik biçimi"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr ""
@@ -13782,12 +14187,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Tetik yeni eklendi. Şu zamana kadar durum güncellemesi yok."
 
@@ -13799,52 +14204,52 @@ msgstr "Tetik etiket tipi"
 msgid "Trigger name"
 msgstr "Tetik ismi"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Tetik prototipleri"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13852,23 +14257,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Tetik önem dereceleri"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Tetik önem derecesi"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Tetik güncellendi"
 
@@ -13876,40 +14289,41 @@ msgstr "Tetik güncellendi"
 msgid "Trigger value"
 msgstr "Tetik değeri"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Tetikler"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Tetikler silindi"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Tetiklerin bilgisi"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Tetik toptan güncelleme"
 
@@ -13917,78 +14331,78 @@ msgstr "Tetik toptan güncelleme"
 msgid "Triggers overview"
 msgstr "Tetiklere genel bakış"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Tetiklerin durumu"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "En üstteki 100 tetik"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Önem derecesi ile tetikler"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Kesilmiş"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr ""
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Sal"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Salı"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "İki eleman seçilmeli"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 ""
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Tip"
 
@@ -13996,62 +14410,64 @@ msgstr "Tip"
 msgid "Type (Full details)"
 msgstr "Tip(Bütün detaylar)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Tip(TAMAM)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Hesaplamanın tipi"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Bilginin tipi"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr ""
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Tipler"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "BİLİNMEYEN"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "YUKARI"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL(oturum açtıktan sonra)"
 
@@ -14067,20 +14483,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA(160 karakter)"
 
@@ -14088,15 +14514,11 @@ msgstr "USA(160 karakter)"
 msgid "USER PROFILE"
 msgstr "KULLANICI PROFİLİ"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr ""
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr ""
 
@@ -14104,7 +14526,7 @@ msgstr ""
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Onaylanmamış"
 
@@ -14117,20 +14539,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr ""
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Sadece onaylanmamışlar"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Seçilenlerin bloklamasını kaldır"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Seçilenlerin bloklaması kaldırılsın mı?"
 
@@ -14139,29 +14561,29 @@ msgstr "Seçilenlerin bloklaması kaldırılsın mı?"
 msgid "Units"
 msgstr "Birim"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14171,23 +14593,20 @@ msgstr "Bilinmeyen"
 msgid "Unknown action"
 msgstr "Bilinmeyen eylem"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Servis durumu için bilinmeyen hesaplama algoritması"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr ""
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Bilinmeyen konak öğesi, seçilen konakta böyle bir öğe yok"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Bilinmeyen konak, sistemde böyle bir konak bulunmuyor"
 
@@ -14199,23 +14618,23 @@ msgstr ""
 msgid "Unknown resource"
 msgstr "Bilinmeyen kaynak"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Bilinmeyen değer tipi"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Bağlantıyı kaldır"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Bağlantıyı kaldır ve temizle"
 
@@ -14223,61 +14642,61 @@ msgstr "Bağlantıyı kaldır ve temizle"
 msgid "Unlink from template"
 msgstr "Şablon ile bağlantıyı kaldır"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Şablonlar ile bağlantıyı kaldır"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "Sesi Aç"
 
@@ -14291,32 +14710,43 @@ msgstr ""
 msgid "Unsupported import format \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr ""
@@ -14327,34 +14757,34 @@ msgid "Up"
 msgstr ""
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Güncelle"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr ""
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Güncelleme zaman aralığı"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Güncelleme zaman aralığı (sn olarak)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Güncellendi"
 
@@ -14362,55 +14792,55 @@ msgstr "Güncellendi"
 msgid "Updated status of host"
 msgstr "Konağın durumunu güncelle"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Güncelleme: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Karşıya yükle"
 
@@ -14418,14 +14848,14 @@ msgstr "Karşıya yükle"
 msgid "Upper level maps"
 msgstr "Daha üst seviye haritalar"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Çalışma Süresi"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14433,9 +14863,9 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Çalışma Süresi/Aksama Süresi"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
 msgstr ""
 
 #: include/views/configuration.item.edit.php:257
@@ -14451,84 +14881,88 @@ msgid "Used in actions"
 msgstr ""
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Kullanıcı"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "\"%s\" kullanıcısı kullanıcı grubu olmadan olamaz."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Kullanıcı eklendi"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr ""
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr ""
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Kullanıcı kendi durumunu değiştiremez"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr ""
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Kullanıcı silindi"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Kullanıcı Grubu"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "\"%1$s\" kullanıcı grubu \"%2$s\" betiği içinde kullanılmış."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr ""
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14545,34 +14979,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Kullanıcı Grupları"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Kullanıcının kendini silmesine izin verilmez"
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "\"%s\" kullanıcı grubunun üyesi olarak kullanıcı kendisi için GUI erişimini düzenleyemeyebilir."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "\"%s\" kullanıcı grubunun üyesi olarak kullanıcı kendisi için sistem durumunu düzenleyemeyebilir."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Kullanıcı ismi"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr ""
 
@@ -14598,243 +15032,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Kullanıcı tipi"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Kullanıcı güncellendi"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "\"%s\" rumuzlu kullanıcı zaten var."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Kullanıcı İsmi"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Kullanıcılar(çevrimiçi)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Bloklaması kaldırılmış kullanıcılar"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Değer"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "\"grid_align\" parametresi için \"%1$s\" değeri geçersiz. Seçenekler: \"%2$s\" ve \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14869,11 +15303,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14919,10 +15353,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr ""
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Değer eşlemesi"
 
@@ -14931,7 +15365,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14943,8 +15377,8 @@ msgstr ""
 msgid "Values"
 msgstr "Değerler"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Değişkenler"
 
@@ -14957,64 +15391,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Dikey"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Dikey hizalama"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Görünüm işlenmemiş"
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Görünen isim"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr ""
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Uyarı"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Özür dileriz, hatırlamak için olası maksimum eleman sayısına ulaşıldı."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -15022,65 +15461,83 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web gözetleme"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Pts"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Çarşamba"
 
@@ -15088,9 +15545,9 @@ msgstr "Çarşamba"
 msgid "Week"
 msgstr "Hafta"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Haftalık"
 
@@ -15098,12 +15555,12 @@ msgstr "Haftalık"
 msgid "When active"
 msgstr "Etkin olduğunda"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Genişlik"
@@ -15113,28 +15570,28 @@ msgstr "Genişlik"
 msgid "With data collection"
 msgstr "Veri toplama ile"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "Son onaylanmamış olay ile"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "Problemli"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "Tetikli"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "Onaylanmamış olaylar ile"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Problemsiz"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Tetiksiz"
 
@@ -15143,7 +15600,7 @@ msgid "Wizard"
 msgstr "Sihirbaz"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15156,277 +15613,271 @@ msgstr "Çalışma zamanı"
 msgid "Working time \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Yaz"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr ""
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr ""
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr ""
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr ""
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr ""
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr ""
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "\"%s\" kullanıcısı için yanlış alanlar."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML dosyası hatalar içeriyor"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr ""
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr ""
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr ""
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Y ekseni MAKS değer"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Y ekseni MIN değer"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Y ekseni tarafı"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr ""
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "Yıl"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Yıllık"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Evet"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Web sunucu üzerinde yerelleştirme ayarları yapılmamış olan bazı diller seçilemeyecektir."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "\"%s\" kullanıcısının önceliklerini değiştirmenize izin verilmiyor."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Oturum açmamışsınız."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr ""
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "İşlem için konak belirtmemişsiniz."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "İşlem için konak grubu belirtmemişsiniz."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "\"%s\" eylem işlem komutu için hedef belirtmemişsiniz."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "\"%s\" eylem işlem genel betiği için hedef belirtmemişsiniz."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "Kullanıcıları oluşturmak için izniniz yok."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "Diğer kullanıcıları güncellemek için izniniz yok."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "Kullanıcı güncellemek için izniniz yok veya kullanıcı mevcut değil."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Bu sayfayı görmek için oturup açmak zorundasınız."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr ""
@@ -15439,7 +15890,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15458,8 +15909,8 @@ msgid "Zabbix User"
 msgstr "Zabbix Kullanıcı"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15485,10 +15936,11 @@ msgstr "Zabbix iç"
 msgid "Zabbix internal authentication"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix sunucu"
@@ -15501,7 +15953,7 @@ msgid ""
 "2. Incorrect network configuration.\n"
 msgstr ""
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr ""
 
@@ -15509,15 +15961,15 @@ msgstr ""
 msgid "Zabbix server activity check interval"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr ""
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr ""
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix sunucu çalışıyor"
 
@@ -15526,11 +15978,11 @@ msgstr "Zabbix sunucu çalışıyor"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr ""
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Zabbix sunucu ismi"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Zabbix sunucu portu"
 
@@ -15538,25 +15990,20 @@ msgstr "Zabbix sunucu portu"
 msgid "Zabbix trapper"
 msgstr "Zabbix yakalayıcısı"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Yakınlaştır"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr ""
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr ""
@@ -15565,19 +16012,19 @@ msgstr ""
 msgid "agent"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "hepsi"
 
@@ -15585,19 +16032,15 @@ msgstr "hepsi"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "zaten var"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "Mavi olatak"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "Yeşil olarak"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "Kırmızı olarak"
 
@@ -15609,83 +16052,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "ort"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr ""
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "gün"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr ""
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15707,19 +16116,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "dinamik"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr ""
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "elemanları kopyala ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from ve esc_step_to ikisi beraber tanımlanmak zorunda."
 
@@ -15731,47 +16136,49 @@ msgstr ""
 msgid "executed"
 msgstr "çalıştırılmış"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "sabit"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "bulunan"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr ""
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr ""
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "konak"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "konak grubu"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "simge"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "resim"
 
@@ -15779,7 +16186,7 @@ msgstr "resim"
 msgid "in"
 msgstr "içinde"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15789,7 +16196,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr ""
 
@@ -15797,20 +16204,20 @@ msgstr ""
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "son"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "benzer"
@@ -15819,12 +16226,12 @@ msgstr "benzer"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -15833,46 +16240,46 @@ msgstr ""
 msgid "macro(s)"
 msgstr "makro(lar)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "bakım"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "harita"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "maks"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "min"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr ""
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr ""
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
@@ -15881,17 +16288,17 @@ msgstr ""
 msgid "must be a valid LDAP user"
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "veri yok"
@@ -15904,12 +16311,14 @@ msgstr "içinde değil"
 msgid "not like"
 msgstr "benzer değil"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "çalışmayan"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "Seçilmeyen"
 
@@ -15918,57 +16327,61 @@ msgstr "Seçilmeyen"
 msgid "not sent"
 msgstr "gönderilmedi"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "şimdi"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "un"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "de"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "diğer"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "her yenileme zamanı"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15977,25 +16390,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "seçileni hatırla"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "kök"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "çalışıyor"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr ""
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "saniye"
 
@@ -16008,7 +16420,7 @@ msgstr "saniye"
 msgid "sent"
 msgstr "gönderildi"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr ""
 
@@ -16016,36 +16428,36 @@ msgstr ""
 msgid "show icon mappings"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "değer eşlemelerini göster"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "\"%1$s\" şablon ismi  %2$s defa geçti"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "e"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "tetik"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr ""
 
@@ -16057,11 +16469,11 @@ msgstr ""
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr ""
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr ""
diff --git a/frontends/php/locale/uk/LC_MESSAGES/frontend.po b/frontends/php/locale/uk/LC_MESSAGES/frontend.po
index 385ad828656..2f86be99967 100644
--- a/frontends/php/locale/uk/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/uk/LC_MESSAGES/frontend.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-11-05 18:31+0300\n"
 "Last-Translator: Oleksiy <zalex_ua@i.ua>\n"
 "Language-Team: Zabbix translation team\n"
@@ -15,22 +15,24 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1384234602.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" має бути між 1970.01.01 та 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"Відображати тригери ОК\" має бути \"0\" або цілим додатним числом."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"Мигання тригера при зміні статусу\" має бути \"0\" або цілим додатним числом."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
@@ -39,7 +41,7 @@ msgstr[1] "%1$d день"
 msgstr[2] "%1$d дні"
 msgstr[3] "%1$d днів"
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -53,7 +55,7 @@ msgstr[3] "відображено %1$d з %2$d проблем"
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (рік %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
@@ -62,10 +64,8 @@ msgstr[1] "%1$s елемент даних"
 msgstr[2] "%1$s елемента даних"
 msgstr[3] "%1$s елементів даних"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
@@ -74,7 +74,7 @@ msgstr[1] "%1$s день"
 msgstr[2] "%1$s дні"
 msgstr[3] "%1$s днів"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -93,7 +93,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -120,23 +120,23 @@ msgstr[1] "%d пристрій"
 msgstr[2] "%d пристрої"
 msgstr[3] "%d пристроїв"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr "(%1$s %2$s)"
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - нескінченно)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(Тільки супер адміністратори можуть створювати групи)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(в днях)"
 
@@ -144,34 +144,34 @@ msgstr "(в днях)"
 msgid "(in sec)"
 msgstr "(в сек)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(мінімум 60 секунд, 0 - використовувати замовчування з властивостей дії)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(без проксі)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[ВВЕДЕНО ЯК МАСОВЕ ПІДТВЕРДЖЕННЯ]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 або 1"
 
@@ -187,7 +187,7 @@ msgstr "10 секунд"
 msgid "30 seconds"
 msgstr "30 секунд"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D вид"
 
@@ -203,7 +203,7 @@ msgstr "5 секунд"
 msgid "500 latest values"
 msgstr "500 останніх значень"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr "<Підменю/Підменю.../>Скрипт"
 
@@ -222,12 +222,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "ПІДТВЕРДЖЕННЯ ТРИВОГИ"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "ТА"
 
@@ -239,19 +238,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "ЗВІТ ПРО ДОСТУПНІСТЬ"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "Абсолютна різниця між останнім і попереднім значенням < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "Абсолютна різниця між останнім і попереднім значенням = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "Абсолютна різниця між останнім і попереднім значенням > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "Абсолютна різниця між останнім і попереднім значенням НЕ є N"
 
@@ -263,42 +262,42 @@ msgstr "Допустимий рівень SLA"
 msgid "Access denied!"
 msgstr "Доступ заборонено!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "Доступ заборонено."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "Обліковий запис заблоковано на %s секунд"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "Підтверджено"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "Підтвердити"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "Підтвердження додано"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "Підтвердження тривоги від імені"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "Підтвердити та повернутись"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "Статус підтвердження"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "Підтверджено"
 
@@ -323,56 +322,59 @@ msgstr "Підтвердження відключено"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "Дія"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "Дія \"%1$s\" вже існує."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "В дії \"%1$s\" вказано некоректне значення для \"esc_period\" (мінімум %2$s секунд)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "В дії \"%1$s\" не вказано операцій."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "Дію додано"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "Дію видалено"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
@@ -380,7 +382,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -395,21 +397,21 @@ msgstr[3] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "Операції дії"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "Дію оновлено"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "Дії"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "Активний"
@@ -419,80 +421,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "Активний"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "Активно із"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "Активно до"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "Додати"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "Додати коментар"
 
@@ -508,27 +513,23 @@ msgstr "Додати вузел мережі"
 msgid "Add link"
 msgstr "Додати лінк"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "Додати відсутнє"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "Додати нові або існуючі групи елементів даних"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "Додати нові або існуючі групи вузлів мережі"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "Додати прототип"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "Додати до"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "Додати до обраного"
@@ -537,7 +538,7 @@ msgstr "Додати до обраного"
 msgid "Add to host group"
 msgstr "Додати до групи вузлів мережі"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "Додати до груп вузлів мережі"
 
@@ -549,7 +550,7 @@ msgstr "Додано"
 msgid "Admin"
 msgstr "Адміністратор"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "Адміністрування"
 
@@ -557,34 +558,34 @@ msgstr "Адміністрування"
 msgid "Advanced labels"
 msgstr "Розширені ярлики"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "Вік"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "З віком менше ніж"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "З віком менше ніж %s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "Агент"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "Інтерфейси агента"
@@ -593,12 +594,12 @@ msgstr "Інтерфейси агента"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "Інтерфейс Агента або SNMP або JMX або IPMI"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "Аліас"
 
@@ -606,87 +607,90 @@ msgstr "Аліас"
 msgid "Align icons"
 msgstr "Вирівняти іконки"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "Все"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "Всі групи"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Всі посилання повинні мати вказані \"І'мя\" та \"URL-запит\""
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "Дозволені вузли мережі"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "Будь-який"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "Містить будь-який рядок символів"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "Група елементів даних"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "Група елементів даних \"%1$s\" вже існує."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "Групу елементів даних додано"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
@@ -695,36 +699,36 @@ msgstr[1] "Групу елементів даних видалено"
 msgstr[2] "Групу елементів даних видалено"
 msgstr[3] "Групу елементів даних видалено"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "Помилка програми."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "Групу елементів даних оновлено"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "Група елементів даних з ID \"%1$s\" недоступна для \"%2$s\"."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "Групи елементів даних"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "Задіяти"
 
@@ -733,16 +737,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "Наближається"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "Кві"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "Квітень"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "Ви дійсно хочете виконати цю дію?"
 
@@ -758,9 +762,9 @@ msgstr "Розмір області"
 msgid "Area type"
 msgstr "Тип області"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -774,22 +778,17 @@ msgstr "Як простий текст"
 msgid "Asset tag"
 msgstr "Етикетка власника"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "О %1$s:%2$s %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "О %1$s:%2$s %3$s %4$s кожний %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "О %1$s:%2$s на %3$s день кожний %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
@@ -798,7 +797,7 @@ msgstr[1] "О %1$s:%2$s кожний %3$s кожний тиждень"
 msgstr[2] "О %1$s:%2$s кожний %3$s кожні %4$s тижні"
 msgstr[3] "О %1$s:%2$s кожний %3$s кожні %4$s тижнів"
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
@@ -807,23 +806,25 @@ msgstr[1] "О %1$s:%2$s кожний день"
 msgstr[2] "О %1$s:%2$s кожні %3$s дні"
 msgstr[3] "О %1$s:%2$s кожні %3$s днів"
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "В (час:хвилина)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "Має бути вибрано як мінімум один вузел мережі або група вузлів мережі."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "Має бути створено як мінімум один період обслуговування."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "Аудит"
@@ -843,26 +844,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "Сер"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "Серпень"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "Аутентиф."
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "Алгоритм аутентифікації"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -921,9 +924,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -931,20 +934,20 @@ msgstr "Автоматично"
 msgid "Automatic icon mapping"
 msgstr "Автоматичне призначення іконок"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "Автоматичний вибір іконок"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "Доступність"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "Звіт про доступність"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "Доступний"
 
@@ -953,36 +956,36 @@ msgstr "Доступний"
 msgid "Average"
 msgstr "Середня"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "Середнє по"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "Середнє значення за період T < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "Середнє значення за період T = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "Середнє значення за період T > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "Середнє значення за період T НЕ є N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "Розміщення вісі X"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "Б"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "Фонове зображення"
@@ -991,7 +994,7 @@ msgstr "Фонове зображення"
 msgid "Background image"
 msgstr "Фонове зображення"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "Гістограмні звіти"
 
@@ -1001,8 +1004,8 @@ msgid "Base DN"
 msgstr "База для пошуку (BaseDN)"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "Звичайна аутентифікація"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -1014,15 +1017,15 @@ msgstr "Ім'я для підключення (BindDN)"
 msgid "Bind password"
 msgstr "Пароль підключення (Bind password)"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "Побітове AND останнього (найбільш свіжого) значення T та маска = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "Побітове AND останнього (найбільш свіжого) значення T та маска НЕ є N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "Бірюзові сутінки"
 
@@ -1034,8 +1037,8 @@ msgstr "Мигання"
 msgid "Blocked"
 msgstr "Заблоковано"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "Товста лінія"
 
@@ -1043,22 +1046,22 @@ msgstr "Товста лінія"
 msgid "Boolean"
 msgstr "Булеан"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "По нижньому краю"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "Світліше"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "Болгарська (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "Масове підтвердження"
 
@@ -1084,7 +1087,7 @@ msgstr "НАЛАШТУВАННЯ ГРУП ЕЛЕМЕНТІВ ДАНИХ"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "НАЛАШТУВАННЯ АУТЕНТИФІКАЦІЇ"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1114,7 +1117,7 @@ msgstr "НАЛАШТУВАННЯ ГРУП ВУЗЛІВ МЕРЕЖІ"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr "НАЛАШТУВАННЯ ПРОТОТИПІВ ВУЗЛІВ МЕРЕЖІ"
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "НАЛАШТУВАННЯ ВУЗЛІВ МЕРЕЖІ"
 
@@ -1126,7 +1129,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "НАЛАШТУВАННЯ ПРИЗНАЧЕННЯ ІКОНОК"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "НАЛАШТУВАННЯ КАРТИНОК"
 
@@ -1135,14 +1138,14 @@ msgstr "НАЛАШТУВАННЯ КАРТИНОК"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "НАЛАШТУВАННЯ ПОСЛУГ ІТ"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "НАЛАШТУВАННЯ ПРОТОТИПІВ ЕЛЕМЕНТІВ ДАННИХ"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "НАЛАШТУВАННЯ ЕЛЕМЕНТІВ ДАНИХ"
 
@@ -1171,7 +1174,7 @@ msgstr "НАЛАШТУВАННЯ КАРТ МЕРЕЖ"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "НАЛАШТУВАННЯ ПРОКСІ"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "НАЛАШТУВАННЯ РЕГУЛЯРНИХ ВИРАЗІВ"
 
@@ -1191,7 +1194,7 @@ msgstr "КОНФІГУРАЦІЯ СКРИПТІВ"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "НАЛАШТУВАННЯ СЛАЙДШОУ"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "НАЛАШТУВАННЯ ШАБЛОНІВ"
 
@@ -1207,7 +1210,7 @@ msgstr "НАЛАШТУВАННЯ ВАЖЛИВОСТЕЙ ТРИГЕРІВ"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "НАЛАШТУВАННЯ ТРИГЕРІВ"
 
@@ -1239,22 +1242,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "НАЛАШТУВАННЯ ZABBIX"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1263,21 +1266,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "Вираховувати SLA, допустимий рівень SLA (у %)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "Вираховується автоматично"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "Підсумкові права доступу"
 
@@ -1285,92 +1288,95 @@ msgstr "Підсумкові права доступу"
 msgid "Callback"
 msgstr "Зворотній виклик"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "Канада (136 символів)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "Скасувати та повернутись"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "Не вдалося підтвердити подію"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "Не вдалося додати не числовий елемент даних \"%1$s\" на графік \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr "Не вдалося додати не числовий елемент даних \"%1$s\" до прототипу графіка \"%2$s\"."
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr "Не вдалося додати не числовий елемент даних \"%1$s\"."
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "Не вдалося додати дію"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "Не вдалося додати умову дії."
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "Не вдалося додати групу елементів даних"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "Не вдалося додати залежність від вузла мережі до шаблону."
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "Не вдалось додати залежність від тригера \"%1$s:%2$s\" до неіснуючого тригера \"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "Не вдалося додати правило виявлення"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "Не вдалося додати графік"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "Не вдалося додати групу"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "Не вдалося додати вузел мережі"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr "Не вдалося додати прототип вузла мережі"
 
@@ -1378,24 +1384,24 @@ msgstr "Не вдалося додати прототип вузла мереж�
 msgid "Cannot add image"
 msgstr "Не вдалося додати картинку"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "Не вдалось додати картинку."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "Не вдалося додати елемент даних"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr "Не вдалося додати елемент даних \"%1$s\" з \"%2$s\" в групу елементів даних \"%3$s\" з \"%4$s\"."
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "Не вдалося додати елементи даних."
 
@@ -1403,20 +1409,20 @@ msgstr "Не вдалося додати елементи даних."
 msgid "Cannot add macro."
 msgstr "Не вдалось додати макрос."
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "Не вдалося додати період сервісу"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "Не вдалося додати метод повідомлень"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "Не вдалося додати більше одного елементу даних з типом \"Сума графіку\" до графіку \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr "Неможливо додати більше одного елемента даних з типом 'Сумарний графік' до прототипу графіка \"%1$s\"."
@@ -1425,24 +1431,24 @@ msgstr "Неможливо додати більше одного елемент
 msgid "Cannot add network map"
 msgstr "Не вдалося додати карту мережі"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "Не вдалося додати нову групу елементів даних \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "Не вдалося додати проксі"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "Не вдалося додати регулярний вираз"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "Не вдалося додати комплексний екран"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "Не вдалося додати скрипт"
 
@@ -1454,27 +1460,27 @@ msgstr "Не вдалося додати послугу"
 msgid "Cannot add slide show"
 msgstr "Не вдалося додати слайд-шоу"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "Не вдалося додати шаблон"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "Не вдалося додати тригер"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "Не вдалося додати користувача"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "Не вдалося додати користувача. Обидва паролі мають співпадати."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "Не вдалося додати користувачів."
 
@@ -1482,7 +1488,7 @@ msgstr "Не вдалося додати користувачів."
 msgid "Cannot add value map"
 msgstr "Не вдалося додати перетворення значення"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "Не вдалося додати веб-сценарій"
 
@@ -1502,23 +1508,23 @@ msgstr "Не вдалося змінити метод аутентифікаці
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "Не вдалося змінити метод аутентифікації на внутрішній Zabbix"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "Не вдалося очистити історію"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "Не вдалося клонувати прототипи графіків."
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr "Не вдалося клонувати прототипи вузлів мережі."
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "Не вдалося клонувати прототипи елементів даних."
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "Не вдалося клонувати прототипи тригерів."
 
@@ -1526,20 +1532,20 @@ msgstr "Не вдалося клонувати прототипи тригері
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "Не вдалося під'єднатись до порту трапера демона zabbix сервера, але він повинен бути доступний для запуску скрипта."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "Не вдалось скопіювати графіки"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "Не вдалося скопіювати елементи даних"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "Не вдалося скопіювати тригер \"%1$s:%2$s\", тому що він містить декілька вузлів мережі у виразі."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr "Не вдалося створити прототип вузла мережі у виявленого вузла мережі \"%1$s\"."
@@ -1548,19 +1554,19 @@ msgstr "Не вдалося створити прототип вузла мер�
 msgid "Cannot create another database connection."
 msgstr "Не вдалося сворити інше з'єднання з базою даних."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "Не вдалося створити залежності утворюючі кільце."
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "Неможливо створити залежність тригера самого від себе."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "Не вдалося створити правило виявлення"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "Не вдалося створити групу вузлів мережі."
 
@@ -1568,42 +1574,39 @@ msgstr "Не вдалося створити групу вузлів мереж�
 msgid "Cannot create icon map"
 msgstr "Не вдалося створити призначення іконок"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "Не вдалося створити призначення іконок з ідентичним ім'ям \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "Не вдалося створити карту мережі \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "Не вдалося створити нову групу елементів даних, веб-сценарій вже приєднано до групи елементів даних."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "Не вдалося створити новий елемент"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "Не вдалось додати комплексний екран."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "Не вдалося видалити внутрішнього користувача Zabbix \"%1$s\", спробуйте відключити цього користувача."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "Не вдалося видалити дію"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
@@ -1612,60 +1615,65 @@ msgstr[1] "Не вдалося видалити групу елементів д
 msgstr[2] "Не вдалося видалити групу елементів даних"
 msgstr[3] "Не вдалося видалити групу елементів даних"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "Не вдалося видалити залежність"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "Не вдалося видалити правило виявлення"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "Не вдалося видалити плавила виявлення"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "Не вдалося видалити графік"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "Не вдалося видалити прототип графіка"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "Не вдалося видалити графік."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "Не вдалося видалити графіки"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "Неможливо видалити графіки створені низькорівневим виявленням."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "Не вдалося видалити групу"
+msgid_plural "Cannot delete groups"
+msgstr[0] "Не вдалося видалити групу"
+msgstr[1] "Не вдалося видалити групу"
+msgstr[2] "Не вдалося видалити групу"
+msgstr[3] "Не вдалося видалити групу"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "Не вдалося видалити вузел мережі"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "Не вдалося видалити групу вузлів мережі."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr "Не вдалося видалити прототип вузла мережі. "
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr "Не вдалося видалити прототипи вузлів мережі"
 
@@ -1673,51 +1681,51 @@ msgstr "Не вдалося видалити прототипи вузлів м�
 msgid "Cannot delete icon map"
 msgstr "Не вдалося видалити призначення іконок"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "Не вдалося видалити картинку"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "Не вдалося видалити інвентарні дані."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "Не вдалося видалити елемент даних"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "Не вдалося видалити елементи даних"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "Неможливо видалити елементи даних створені низькорівневим виявленням."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "Не вдалося видалити період сервісу"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "Не вдалося видалити метод повідомлень"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "Не вдалося видалити карту мережі"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "Не вдалося видалити проксі"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "Не вдалося видалити регулярний вираз"
@@ -1725,29 +1733,29 @@ msgstr[1] "Не вдалося видалити регулярний вираз"
 msgstr[2] "Не вдалося видалити регулярний вираз"
 msgstr[3] "Не вдалося видалити регулярний вираз"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "Не вдалося видалити комплексний екран"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "Не вдалося видалити скрипт"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "Не вдалося видалити скрипти. Вхідний параметр \"scriptids\" пустий."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Не вдалося видалити скрипт. Скрипт \"%1$s\" використовується в операції дії \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr "Не вдалося видалити скрипти. Скрипт з scriptid \"%1$s\" не існує."
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "Не вдалося видалити вибрані дії"
 
@@ -1755,77 +1763,80 @@ msgstr "Не вдалося видалити вибрані дії"
 msgid "Cannot delete service"
 msgstr "Не вдалося видалити послугу"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "Не вдалося видалити слайд-шоу"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "Не вдалося видалити шаблон"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "Не вдалося видалити шаблонну групу елементів даних."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "Не вдалося видалити шаблонний графік."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr "Не вдалося видалити шаблонний прототип вузла мережі."
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "Не вдалося видалити шаблонний елемент даних."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "Не вдалося видалити шаблонні елементи даних"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "Не вдалося видалити шаблонні елементи даних."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "Не вдалося видалити шаблонний тригер \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "Не вдалося видалити шаблонний веб-сценарій \"%1$s\"."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "Не вдалося видалити тригер"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "Не вдалося видалити прототип тригера"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "Не вдалося видалити тригер."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "Не вдалося видалити тригери"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "Неможливо видалити тригери створені низькорівневим виявленням."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "Не вдалося видалити користувача"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "Не вдалось видалити метод повідомлень."
 
@@ -1833,11 +1844,11 @@ msgstr "Не вдалось видалити метод повідомлень."
 msgid "Cannot delete value map"
 msgstr "Не вдалося видалити перетворення значення"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "Не вдалося видалити веб-сценарій"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
@@ -1845,7 +1856,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
@@ -1853,7 +1864,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
@@ -1861,7 +1872,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
@@ -1869,7 +1880,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
@@ -1877,7 +1888,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -1885,7 +1896,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
@@ -1893,7 +1904,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
@@ -1902,7 +1913,7 @@ msgstr[1] "Не вдалося дезактивувати метод повід�
 msgstr[2] "Не вдалося дезактивувати метод повідомлень"
 msgstr[3] "Не вдалося дезактивувати метод повідомлень"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
@@ -1910,7 +1921,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
@@ -1918,7 +1929,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
@@ -1926,7 +1937,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1943,7 +1954,7 @@ msgstr "Не вдалося відобразити чергу елементів
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr "Не удалось відобразити більше одного елемента даних з типом \"Сума графіку\". "
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
@@ -1951,7 +1962,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
@@ -1959,7 +1970,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
@@ -1967,7 +1978,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
@@ -1975,7 +1986,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
@@ -1983,7 +1994,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -1991,7 +2002,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
@@ -1999,7 +2010,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
@@ -2008,7 +2019,7 @@ msgstr[1] "Не вдалося активувати метод повідомл�
 msgstr[2] "Не вдалося активувати метод повідомлень"
 msgstr[3] "Не вдалося активувати метод повідомлень"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
@@ -2016,7 +2027,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
@@ -2024,7 +2035,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
@@ -2032,7 +2043,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2040,62 +2051,56 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "Не вдалось знайти фонове зображення \"%1$s\" використовуване в карті мережі \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не вдалося знайти графік \"%1$s\" використовуваний в комплексному екрані \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "Не вдалося знайти групу \"%1$s\" використовувану в карті мережі \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не вдалося знайти групу \"%1$s\" використовувану в комплексному екрані \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "Не вдалося знайти вузел мережі \"%1$s\" використовуваний в карті мережі \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не вдалося знайти вузел мережі \"%1$s\" використовуваний в комплексному екрані \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "Не вдалося знайти інтерфейс вузла мережі \"%1$s\" для ключа елемента даних \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -2106,34 +2111,53 @@ msgstr "Не вдалось знайти іконку \"%1$s\" використ�
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "Не вдалось знайти призначення іконок \"%1$s\" використовуване в карті мережі \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не вдалося знайти елемент даних \"%1$s\" використовуваний в комплексному екрані \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "Не вдалося знайти карту мережі \"%1$s\" використовувану в експорті карти мережі \"%2$s\"."
@@ -2143,41 +2167,41 @@ msgstr "Не вдалося знайти карту мережі \"%1$s\" вик
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "Не вдалось знайти карту мережі \"%1$s\" використовувану в карті мережі \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не вдалося знайти карту мережі \"%1$s\" використовувану в комплексному екрані \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "Не вдалося знайти об'єкти з іменем"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "Не вдалося знайти комплексний екран \"%1$s\" використовуваний в комплексному екрані \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "Не вдалось знайти тригер \"%1$s\" використовуваний в карті мережі \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2190,12 +2214,14 @@ msgstr "Не вдалося побудувати дерево. Перевірт�
 msgid "Cannot format tree."
 msgstr "Не вдалося побудувати дерево."
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "Не вдалося розкрити вираз \"%s\"."
@@ -2209,7 +2235,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
@@ -2218,52 +2244,53 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "Не вдалося включити файлу вигляду \"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "Не вдалось вставити метод повідомлення користувача."
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "Не вдалося приєднати шаблон"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "Не вдалося виконати вихід."
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "Неможливо масово оновити ім'я вузла мережі."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "Неможливо масово оновити видиме ім'я вузла мережі."
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "Неможливо передати одинакові ID шаблонів для приєднання: %s."
@@ -2283,7 +2310,7 @@ msgstr "Неможливо виконати запит оновлення таб
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Неможливо виконати запит оновлення таблиці \"%1$s\" без виразу where."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2292,11 +2319,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2304,11 +2331,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "Не вдалося видалити макрос."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "Не вдалось перейменувати гостьового користувача."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "Не вдалось зберегти правило виявлення без перевірок."
 
@@ -2317,217 +2344,226 @@ msgstr "Не вдалось зберегти правило виявлення �
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "Не вдалося встановити \"templateid\" для групи елементів даних \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "Не вдалося встановити \"templateid\" для комплексного екрану \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Не вдалося встановити \"templateid\" для прототипа тригера \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "Не вдалося переключити вузел мережі на інтерфейс."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "Не вдалося розблокувати користувачів"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "Не вдалося від'єднати та очистити правила виявлення"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "Не вдалося від'єднати та очистити прототипи графіків"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "Не вдалося від'єднати та очистити графіки."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "Не вдалося від'єднати та очистити прототипи елементів даних"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "Не вдалося від'єднати та очистити елементи даних"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "Не вдалося від'єднати та очистити тригери"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "Не вдалося від'єднати шаблон"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "Не вдалося від'єднати тригер \"%s\", він містить елементи даних із шаблону, який залишається приєднаним до вузла мережі."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr "Не вдалося оновити \"%1$s\" для виявленого елемента даних."
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr "Не вдалося оновити \"%1$s\" для виявленого тригера."
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "Не вдалося оновити \"%1$s\" для елемента даних \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "Не вдалося оновити \"%1$s\" для тригера \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "Не вдалося оновити \"templateid\" для групи елементів даних \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "Не вдалося оновити \"templateid\" для графіка \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr "Не вдалося оновити \"templateid\" у прототипа графіка \"%1$s\"."
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "Не вдалося оновити \"templateid\" для комплексного екрану \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "Не вдалося оновити \"templateid\" для прототипу тригера \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr "Не вдалося оновити виявлений графік."
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr "Не вдалося оновити виявлену групу вузлів мережі."
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "Не вдалося оновити дію"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "Не вдалося оновити групу елементів даних"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "Не вдалося оновити коментарій"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "Не вдалося оновити налаштування"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "Не вдалося оновити режим дебаг"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "Не вдалося оновити правило виявлення"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "Не вдалося оновити доступ до веб-інтерфейсу"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "Не вдалося оновити графік"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "Не вдалося оновити групу"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "Не вдалося оновити групу."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Не вдалося оновити групи для виявленого вузла мережі \"%1$s\"."
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "Не вдалося оновити вузел мережі"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr "Не вдалося оновити прототип вузла мережі"
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "Не вдалося оновити вузли мережі"
 
@@ -2539,24 +2575,24 @@ msgstr "Не вдалося оновити призначення іконок"
 msgid "Cannot update image"
 msgstr "Не вдалося оновити картинку"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "Не вдалось оновити фонове зображення."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr "Не вдалося оновити інтерфейс для виявленого вузла мережі \"%1$s\"."
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "Не вдалося оновити елемент даних"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "Не вдалося оновити елементи даних"
 
@@ -2568,16 +2604,16 @@ msgstr "Не вдалось оновити макрос."
 msgid "Cannot update macros"
 msgstr "Не вдалося оновити макроси"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "Не вдалося оновити період сервісу"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "Не вдалося оновити карту мережі \"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "Не вдалося оновити метод повідомлень"
 
@@ -2585,28 +2621,24 @@ msgstr "Не вдалося оновити метод повідомлень"
 msgid "Cannot update network map"
 msgstr "Не вдалося оновити карту мережі"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "Не вдалося оновити проксі"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Не вдалося оновити проксі для виявленого вузла мережі \"%1$s\"."
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "Не вдалося оновити регулярний вираз"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "Не вдалося оновити комплексний екран"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "Не вдалось оновити комплексний екран."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "Не вдалося оновити скрипт"
 
@@ -2618,40 +2650,41 @@ msgstr "Не вдалося оновити послугу"
 msgid "Cannot update slide show"
 msgstr "Не вдалося оновити слайд-шоу"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "Не вдалося оновити шаблон"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "Не вдалося оновити шаблоні групи елементів даних."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "Не вдалося оновити тригер"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "Не вдалося оновити дані користувача"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "Не вдалось оновити метод повідомлень користувача."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "Не вдалося оновити дані користувача. Обидва паролі мають співпадати."
 
@@ -2659,15 +2692,15 @@ msgstr "Не вдалося оновити дані користувача. Об
 msgid "Cannot update value map"
 msgstr "Не вдалося оновити перетворення значення"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "Заголовок"
 
@@ -2676,47 +2709,47 @@ msgstr "Заголовок"
 msgid "Case sensitive"
 msgstr "Чутливий до регістру"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "По центру"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "Змінити"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "Зміна"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "Змінити пароль"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "Символ"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "Містить рядок символів"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "Не містить рядок символів"
 
@@ -2725,48 +2758,48 @@ msgid "Chassis"
 msgstr "Шассі"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "Перевірка вже існує."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "Перевірте частину виразу починаючи з \"%1$s\"."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "Будь ласка, перевірте ключ. Приклад по замовчуванню показано."
 
@@ -2775,44 +2808,44 @@ msgid "Check type"
 msgstr "Тип перевірки"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "Перевірки"
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "Перевірки повинні бути унікальними."
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "Китайська (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "Китайська (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "Утворюючий кільце зв'язок не може бути створений для елемента карти мережі \"%s\"."
@@ -2827,34 +2860,35 @@ msgstr "Посилання, утворююче кільце, в картах м�
 msgid "Circular reference in screens: %1$s."
 msgstr "Посилання, утворююче кільце, в комплексних екранах: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "Посилання, утворююче кільце, в шаблонах: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "Приєднання шаблону, утворююче кільце, не дозволено."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "Класична"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "Очистити"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "Очистити історію та динаміку змін"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "Очистити історію для вибраних"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "Очистити при від'єднанні"
 
@@ -2864,69 +2898,69 @@ msgstr "Годинник"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "Клонувати"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "Закрити"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "Закрити конструктор виразу"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "Колір"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "Колір (ОК)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "Об'єднати стовпчики"
 
@@ -2941,7 +2975,7 @@ msgstr "Комбінований результат"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "Команда"
 
@@ -2949,41 +2983,31 @@ msgstr "Команда"
 msgid "Command actions"
 msgstr "Команди дій"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "Команда не може бути пустою."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "Команди"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "Коментарій оновлено"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "Коментарі"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "Комерційні"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "Порівняння значень для кількох періодів"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "Компонування прав доступу"
 
@@ -2991,29 +3015,39 @@ msgstr "Компонування прав доступу"
 msgid "Condition"
 msgstr "Умова"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "Умови"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "Налаштування"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3176,23 +3210,23 @@ msgstr "Налаштування оновлено"
 msgid "Configure (Filter %s)"
 msgstr "Налаштування (Фільтр %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "Текст підтвердження"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "Підключатись використовуючи"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "В системі як '%1$s'"
@@ -3251,7 +3285,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3259,30 +3293,39 @@ msgstr ""
 msgid "Contract number"
 msgstr "Номер контракту"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "Координати"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "Копіювати"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "Копіювати вибране в ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "Коректний вхід \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "Не вдалося зберегти картинку!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "Кількість"
 
@@ -3302,6 +3345,10 @@ msgstr "Створити групу елементів даних"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3319,7 +3366,7 @@ msgstr "Створити графік (спочатку оберіть вузе�
 msgid "Create graph prototype"
 msgstr "Створити прототип графіка"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "Створити вузел мережі"
 
@@ -3332,15 +3379,15 @@ msgstr "Створити групу вузлів мережі"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "Створити призначення іконок"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "Створити картинку"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "Створити елемент даних"
 
@@ -3364,6 +3411,10 @@ msgstr "Створити карту мережі"
 msgid "Create media type"
 msgstr "Створити метод повідомлень"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "Створити проксі"
@@ -3388,11 +3439,11 @@ msgstr "Створити скрипт"
 msgid "Create slide show"
 msgstr "Створити слайд-шоу"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "Створити шаблон"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "Створити тригер"
 
@@ -3416,42 +3467,42 @@ msgstr "Створити групу користувачів"
 msgid "Create value map"
 msgstr "Створити перетворення значення"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "Створено: Група елементів даних \"%1$s\" у \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Створено: Правило виявлення\"%1$s\" у \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr "Створено: Прототип вузла мережі \"%1$s\" у \"%2$s\"."
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "Створено: Елемент даних \"%1$s\" у \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Створено: Прототип елемента даних \"%1$s\" у \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Створено: Тригер \"%1$s\" у \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Створено: Прототип тригера \"%1$s\" у \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "СтворитиВеб-сценарій \"%1$s\" у \"%2$s\"."
@@ -3461,51 +3512,52 @@ msgid "Critical"
 msgstr "Критична"
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "Поточна дата < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "Поточна дата = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "Поточна дата > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "Поточна дата НЕ є N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "Поточний вузел мережі"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "Поточний час < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "Поточний час = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "Поточний час > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "Поточний час НЕ є N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "Поточне значення"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3518,7 +3570,7 @@ msgstr "Графіки користувача"
 msgid "Custom label"
 msgstr "Ярлик користувача"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "Ярлик користувача для елементів карти мережі \"%2$s\" типу \"%1$s\" не може бути пустим."
@@ -3532,7 +3584,7 @@ msgstr "Користувацький множник"
 msgid "Custom screens"
 msgstr "Комплексні екрани користувачів"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "Користувацький скрипт"
 
@@ -3552,18 +3604,14 @@ msgstr "Користувацький розмір"
 msgid "Custom slides"
 msgstr "Слайдшоу користувачів"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "Чеська (cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "ПАРАМЕТРИ ПАНЕЛІ"
@@ -3579,28 +3627,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "ДЕТАЛІ СЦЕНАРІЮ"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "ДЕЗАКТИВОВАНО"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "ВИЯВЛЕНО"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3608,25 +3656,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS ім'я"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "НЕДОСТУПНИЙ"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "Щодня"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "Помаранчева ніч"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "Темніше"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "ПАНЕЛЬ"
 
@@ -3638,20 +3686,21 @@ msgstr "Параметри ПЕНЕЛІ"
 msgid "Dashboard filter"
 msgstr "Фільтрування ПАНЕЛІ"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "Пунктирна лінія"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "Дані"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3674,11 +3723,12 @@ msgstr ""
 msgid "Data type"
 msgstr "Тип даних"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "Файл бази даних"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "Хост бази даних"
 
@@ -3686,35 +3736,39 @@ msgstr "Хост бази даних"
 msgid "Database monitor"
 msgstr "Монітор бази даних"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "Ім'я бази даних"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "Пароль до бази даних"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "Порт бази даних"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "Схема бази даних"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "Сервер бази даних"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "Тип бази даних"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "Користувач бази даних"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "Дата"
 
@@ -3734,53 +3788,52 @@ msgstr "Дата закінчення гарантії HW"
 msgid "Date HW purchased"
 msgstr "Дата придбання HW"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "День"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "День в місяць"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "День місяця < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "День місяця = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "День місяця > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "День місяця НЕ є N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "День в тиждень"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "День тижня < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "День тижня = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "День тижня > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "День тижня НЕ є N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "Днів"
 
@@ -3788,22 +3841,22 @@ msgstr "Днів"
 msgid "Debug"
 msgstr "Дебаг"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "Режим ДЕБАГ"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "Режим ДЕБАГ оновлено"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "Гру"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "Грудень"
 
@@ -3813,15 +3866,14 @@ msgstr "Десятковий"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "По замовчуванню"
 
@@ -3834,11 +3886,11 @@ msgid "Default delay (in seconds)"
 msgstr "Затримка по замовчуванню (в секундах)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "Повідомлення по замовчуванню"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "Тривалість кроку операції по замовчуванню"
 
@@ -3861,30 +3913,34 @@ msgstr "Тема по замовчуванню \"%1$s\"."
 msgid "Delay"
 msgstr "Затримка"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "Затримка (в сек)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "Затримується на"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "Видалити"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "Видалити та очистити"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Видалити та очистити вибрані шаблони? (УВАГА: всі приєднані вузли мережі буде очищено!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Видалити та очистити шаблон? (УВАГА: всі приєднані вузли мережі буде очищено!)"
 
@@ -3892,53 +3948,53 @@ msgstr "Видалити та очистити шаблон? (УВАГА: всі
 msgid "Delete application?"
 msgstr "Видалити групу елементів даних?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "Видалити поточну дію?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "Видалити правило виявлення?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "Видалити вираз?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "Видалити графік?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "Видалити історію вибраних ВЕБ сценаріїв?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "Видалити історію вибраних елементів даних?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "Видалити призначення іконок?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "Видалити елемент даних?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "Видалити ключове слово?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "Видалити лінки між обраними елементами?"
 
@@ -3946,11 +4002,15 @@ msgstr "Видалити лінки між обраними елементами
 msgid "Delete maintenance period?"
 msgstr "Видалити період сервісу?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "Видалити карту мережі?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "Видалити проксі?"
 
@@ -3958,7 +4018,7 @@ msgstr "Видалити проксі?"
 msgid "Delete regular expression?"
 msgstr "Видалити регулярний вираз?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "Видалити сценарій?"
 
@@ -3966,71 +4026,67 @@ msgstr "Видалити сценарій?"
 msgid "Delete screen?"
 msgstr "Видалити комплексний екран?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "Видалити скрипт?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "Видалити вибрані"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "Видалити вибрані ВЕБ сценарії?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "Видалити вибрані дії?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "Видалити вибрані групи елементів даних?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "Видалити вибрані правила виявлення?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "Видалити вибрані елементи?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "Видалити вибрані графіки?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "Видалити вибрану групу?"
@@ -4039,27 +4095,27 @@ msgstr "Видалити вибрану групу?"
 msgid "Delete selected groups?"
 msgstr "Видалити вибрані групи?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "Видалити вибрані групи вузлів мережі?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "Видалити вибраний вузел мережі?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "Видалити вибрані вузли мережі?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "Видалити вибрані картинки?"
 
@@ -4067,31 +4123,31 @@ msgstr "Видалити вибрані картинки?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "Видалити вибрані елементи даних?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "Видалити вибрані періоди сервісу?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "Видалити вибрані карти?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "Видалити вибраний метод повідомлень?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "Видалити вибрані методи повідомлень?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "Видалити вибрані проксі?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "Видалити вибрані регулярні вирази?"
 
@@ -4099,15 +4155,15 @@ msgstr "Видалити вибрані регулярні вирази?"
 msgid "Delete selected screens?"
 msgstr "Видалити вибрані комплексні екрани?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "Видалити вибрані скрипти?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "Видалити вибрані слайд-шоу?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "Видалити вибрані шаблони?"
 
@@ -4119,11 +4175,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "Видалити вибрані тригери?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "Видалити обраного користувача?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "Видалити вибраних користувачів?"
 
@@ -4140,11 +4196,15 @@ msgstr[1] "Видалити вибране перетворення значен
 msgstr[2] "Видалити вибране перетворення значення? Воно використовується в %d елементах даних!"
 msgstr[3] "Видалити вибране перетворення значення? Воно використовується в %d елементах даних!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "Видалити вибране із приєднаними елементами"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4153,15 +4213,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "Видалити слайд-шоу?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "Видалити шаблон?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "Видалити тригер?"
 
@@ -4169,62 +4229,62 @@ msgstr "Видалити тригер?"
 msgid "Deleted"
 msgstr "Видалено"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "Видалено: Група елементів даних \"%1$s\" із \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Видалено: Правило виявлення \"%1$s\" із \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Видалено: Графік \"%1$s\" із \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "Видалено: Вузел мережі \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "Видалено: Елемент даних \"%1$s\" із \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Видалено: Прототип елемента даних \"%1$s\" із \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "Видалено: Проксі \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "Видалено: Шаблон \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Видалено: Тригер \"%1$s\" із \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Видалено: Прототип тригера \"%1$s\" із \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4233,35 +4293,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Розділювач"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "Дельта (проста зміна)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "Дельта (швидкість в секунду)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "Заборонено"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "Залежності"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "Залежність"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "Залежить від"
 
@@ -4269,30 +4329,41 @@ msgstr "Залежить від"
 msgid "Deployment status"
 msgstr "Статус розгортання"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "Опис"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "Деталі"
 
@@ -4305,71 +4376,71 @@ msgid "Device"
 msgstr "Пристрій"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "Критерій унікальності пристрою"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "Різниця між МАКС і МІН значеннями за період T < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "Різниця між МАКС і МІН значеннями за період T = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "Різниця між МАКС і МІН значеннями за період T > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "Різниця між МАКС і МІН значеннями за період T НЕ є N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "Різниця між останнім і попереднім значеннями, тоді N = 1, 0 - в іншому випадку"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "Різниця між останнім і попереднім значеннями, тоді N НЕ є 1, 0 - в іншому випадку"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "Різниця між останнім і попереднім значенням < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "Різниця між останнім і попереднім значенням = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "Різниця між останнім і попереднім значенням > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "Різниця між останнім і попереднім значенням НЕ є N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4393,48 +4464,44 @@ msgstr "Дезактивувати режим ДЕБАГ у вибраних г�
 msgid "Disable host"
 msgstr "Дезактивувати вузел мережі"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "Дезактивувати вузел мережі?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "Дезактивувати вузли мережі у вибраних групах вузлів мережі?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "Дезактивувати вузли мережі, які моніторяться обраними проксі?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "Дезактивувати вибране"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "Дезактивувати вибрані ВЕБ сценарії?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "Дезактивувати вибрані дії?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "Дезактивувати вибрані групи елементів даних?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "Дезактивувати вибрані правила виявлення?"
 
@@ -4442,11 +4509,11 @@ msgstr "Дезактивувати вибрані правила виявлен�
 msgid "Disable selected groups?"
 msgstr "Дезактивувати вибрані групи?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "Дезактивувати вибрані вузли мережі?"
 
@@ -4454,42 +4521,47 @@ msgstr "Дезактивувати вибрані вузли мережі?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "Дезактивувати вибрані елементи даних?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "Дезактивувати вибрані методи повідомлень?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "Дезактивувати вибрані тригери?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "Дезактивовано"
 
@@ -4502,7 +4574,7 @@ msgstr "Критична"
 msgid "Discovered"
 msgstr "Виявлено"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4510,17 +4582,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "Виявлений пристрій"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "Виявлення"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "Виявлення через проксі"
 
@@ -4528,17 +4600,17 @@ msgstr "Виявлення через проксі"
 msgid "Discovery check"
 msgstr "Перевірка виявлення"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "Перевірки виявлення"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "Список виявлення"
 
@@ -4547,42 +4619,45 @@ msgid "Discovery object"
 msgstr "Об'єкт виявлення"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "Правило виявлення"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Правило виявлення \"%1$s\" вже існує у \"%2$s\", успадковано з іншого шаблону."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "У правила виявлення \"%1$s:%2$s\" некоректний період зберігання втрачених ресурсів: \"%3$s\". (мін: %4$d, макс: %5$d, допускається макрос користувача)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "Правило виявлення \"%s\" вже існує."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "У правила виявлення \"%1$s:%2$s\" некоректний період зберігання втрачених ресурсів: \"%3$s\". (мін: %4$d, макс: %5$d, допускається макрос користувача)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "Правило виявлення створено"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "Правило виявлення видалено"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
@@ -4590,7 +4665,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
@@ -4598,20 +4673,20 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "Правило виявлення оновлено"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "Правила виявлення"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "Правила виявлення видалено"
 
@@ -4623,7 +4698,7 @@ msgstr "Стан виявлення"
 msgid "Display OK triggers for"
 msgstr "Відображати тригери ОК протягом"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "Відображено"
 
@@ -4632,32 +4707,32 @@ msgstr "Відображено"
 msgid "Displaying %1$s of %2$s found"
 msgstr "Відображено %1$s із %2$s знайдених"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "Розподіл значень для кількох елементів"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "Розподіл значень для кількох періодів"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "Не підраховувати"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Ви дійсно хочете замінити умовний вираз?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "Готово"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "Лінія з крапок"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "Недоступно"
@@ -4667,30 +4742,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недоступний"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "Недоступний"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "Перетягніть сюди для зміни типу інтерфейсу на \"IPMI\" тип."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "Перетягніть сюди для зміни типу інтерфейсу на \"JMX\" тип."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "Перетягніть сюди для зміни типу інтерфейсу на \"SNMP\" тип."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "Перетягніть сюди для зміни типу інтерфейсу на \"агент\" тип."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "Стиль креслення"
 
@@ -4708,74 +4783,75 @@ msgstr "Перший запис у випадаючому списку \"%1$s\".
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "Запам'ятовувати вибране у випадаючому списку \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "Дублюючі залежності в тригері \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "Дублікат вузла мережі. Вузел мережі з таким же ім'ям \"%s\" вже існує в даних."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "Дублікат вузла мережі. Вузел мережі з таким же видимим ім'ям \"%s\" вже існує в даних."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "Дублікат імені карти мережі для карти \"%s\"."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "Дублікат назви важливості \"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "Дублікат імені користувача \"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "Тривалість"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "Тривалість (сек)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "Голландська (nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "Динамічний елемент"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "Е"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "ПОМИЛКА"
 
@@ -4783,13 +4859,13 @@ msgstr "ПОМИЛКА"
 msgid "EVENTS"
 msgstr "ПОДІЇ"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Кожнен URL-запит повинен мати унікальне ім'я. Будь ласка переконайтесь що це тільки один URL-запит з таким іменем"
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4797,9 +4873,9 @@ msgstr "Кожнен URL-запит повинен мати унікальне �
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "Змінити"
 
@@ -4807,7 +4883,7 @@ msgstr "Змінити"
 msgid "Edit map element"
 msgstr "Редагування елемента карти мережі"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "Редагувати тригер"
 
@@ -4815,27 +4891,61 @@ msgstr "Редагувати тригер"
 msgid "Element"
 msgstr "Елемент"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "Назва елемента"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "Email"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "Пусто"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "Умова дії пуста."
 
@@ -4843,76 +4953,98 @@ msgstr "Умова дії пуста."
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "Вхідний параметр пустий."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "Нічого не введено."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "Пустий макрос."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "Пусте ім'я."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "Пусті параметри"
 
@@ -4921,11 +5053,11 @@ msgstr "Пусті параметри"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4933,11 +5065,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "Пустий період часу."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "Активувати"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "Задіяти підтвердження"
 
@@ -4957,11 +5093,11 @@ msgstr "Активувати підтвердження подій"
 msgid "Enable host"
 msgstr "Активувати вузел мережі"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "Активувати вузел мережі?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "Активувати вузли мережі, які моніторяться обраними проксі?"
 
@@ -4974,36 +5110,32 @@ msgstr "Активувати вузли мережі, які моніторят�
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "Активувати вибрані"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "Активувати вибрані веб-сценарії?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "Активувати вибрані дії?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "Активувати вибрані групи елементів даних?"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "Активувати вибрані правила виявлення?"
 
@@ -5011,11 +5143,11 @@ msgstr "Активувати вибрані правила виявлення?"
 msgid "Enable selected groups?"
 msgstr "Активувати вибрані групи?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "Активувати вибрані вузли мережі?"
 
@@ -5023,64 +5155,68 @@ msgstr "Активувати вибрані вузли мережі?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "Активувати вибрані елементи даних?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "Активувати вибрані методи повідомлень?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "Активувати вибрані тригери?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "Активовано"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "Англійська (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "Англійська (en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "Помилка"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Помилка в запиті пошуку в таблиці \"%1$s\"."
@@ -5098,15 +5234,15 @@ msgstr "Подія"
 msgid "Event ID"
 msgstr "ID події"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "Event ID останнього запису в журналі відповідає регулярному виразу T, тоді N = 1, 0 - в іншому випадку"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "Event ID останнього запису в журналі відповідає регулярному виразу T, тоді N НЕ є 1, 0 - в іншому випадку"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "Підтвердження події"
 
@@ -5115,7 +5251,7 @@ msgstr "Підтвердження події"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "Підтвердження подій \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "Підтвердження подій дезактивовано"
 
@@ -5123,7 +5259,7 @@ msgstr "Підтвердження подій дезактивовано"
 msgid "Event details"
 msgstr "Подробиці події"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "Генерація події"
 
@@ -5143,9 +5279,10 @@ msgstr "Деталі джерела події"
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "Події"
 
@@ -5153,36 +5290,41 @@ msgstr "Події"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "Щодня"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "Щотижня"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Екса"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "Виключено"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "Виконати"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "Помилка виконання SQL [%1$s] у [%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "Виконати на"
 
@@ -5190,13 +5332,13 @@ msgstr "Виконати на"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "Скрипт для виконання"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "Підтвердження виконання"
 
@@ -5208,7 +5350,7 @@ msgstr "Розкривання макросів"
 msgid "Expand single problem"
 msgstr "Розгортати одиночну проблему"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "Очікувався JSON-rpc версії 2.0, а отримано \"%s\"."
@@ -5218,12 +5360,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "Завершено"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Розширений круговий"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "Експортувати вибране"
 
@@ -5231,22 +5373,22 @@ msgstr "Експортувати вибране"
 msgid "Export to CSV"
 msgstr "Експортувати в CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "Вираз"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "Помилка в синтаксисі виразу."
 
@@ -5254,11 +5396,12 @@ msgstr "Помилка в синтаксисі виразу."
 msgid "Expression Variable Elements"
 msgstr "Значення елементів Виразу"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "Вираз не може бути пустим"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "Конструктор виразу"
 
@@ -5279,17 +5422,17 @@ msgid "External check"
 msgstr "Зовнішня перевірка"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez Texting"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "БРЕХНЯ"
 
@@ -5298,16 +5441,17 @@ msgstr "БРЕХНЯ"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "Помилка"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "Помилковий"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5315,40 +5459,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "Аудит відмов"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "Обрані графіки"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "Обрані карти мереж"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "Обрані комплексні екрани"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "Обрані"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "Лют"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "Лютий"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "Поле"
 
@@ -5392,19 +5536,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "Поле \"druleid\" є обов'язковим."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "Поле \"name\" є обов'язковим."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Формат файлу не підтримується."
 
@@ -5413,13 +5557,13 @@ msgstr "Формат файлу не підтримується."
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "Файл занадто великий, максимальний розмір файлу для завантаження %1$s байт."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "Файл вказаний для відображення не існує. Була спроба знайти \"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5427,68 +5571,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "Заповнений регіон"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "Фільтрувати"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "Фільтр по групі вузлів мережі"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "Фільтр по імені"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "Шукати рядок V в останньому (найновішому) значенні. N = 1 - якщо знайдено, 0 - в іншому випадку"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "Шукати рядок V в останньому (найновішому) значенні. N НЕ є 1 - якщо знайдено, 0 - в іншому випадку"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "Завершити"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "Фінська (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "Перший"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "Перша"
@@ -5497,8 +5644,8 @@ msgstr "Перша"
 msgid "Fit to map"
 msgstr "Вписати в карту мережі"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "Фіксоване"
 
@@ -5508,76 +5655,80 @@ msgstr "Фіксоване"
 msgid "Flexible intervals"
 msgstr "Гнучкі інтервали"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "Для Гостя пароль повинен бути пустим"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "Формула"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "Четвертий"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "Французька (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "П'ят"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "З"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "Доступ до веб-інтерфейсу"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "Доступ до веб-інтерфейсу оновлено"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "Повідомлення у веб-інтерфейсі"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "Клонувати повністю"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "На весь екран"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "Функція"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "Г"
@@ -5587,50 +5738,50 @@ msgstr "Г"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM модем"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "Веб інтерфейс"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "Доступ до GUI відключено."
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "Загальні парам."
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "Згенеровано за %s сек."
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "Німецька (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5638,65 +5789,65 @@ msgid "Get support"
 msgstr "Підтримка"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Гіга"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "Наданий вираз це не макрос"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "Глобальний вираз не існує."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "Глобальний скрипт"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "Глобальні скрипти"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "Виконати"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "Перейти до"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5705,66 +5856,73 @@ msgid "Gradient line"
 msgstr "Градієнтна лінія"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "Графік"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "Графік \"%1$s\" вже існує у \"%2$s\" (успадковано із іншого шаблону)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "Графік \"%1$s\" вже існує у \"%2$s\" (елементи даних не ідентичні)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "Графік \"%1$s\" вже існує у \"%2$s\"."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "Графік \"%1$s\" не може бути успадковано. Не вистачає обов'язкових елементів даних у \"%2$s\" (елемента даних для макс. значення вісі Y)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "Графік \"%1$s\" не може бути успадковано. Не вистачає обов'язкових елементів даних у \"%2$s\" (елемента даних для мін. значення вісі Y)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "Графік \"%1$s\" не може бути успадковано. Не вистачає обов'язкових елементів даних у \"%2$s\"."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Графік \"%1$s\" не існує в шаблоні \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "Графік \"%1$s\" пропущено - правило користувача."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Графік \"%1$s\" з елементами даних із шаблону не може містити елементи даних з інших вузлів мережі."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "Графік додано"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "Графік видалено"
 
@@ -5776,54 +5934,59 @@ msgstr "Елемент графіка"
 msgid "Graph item"
 msgstr "Елемент графіка"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "Назва графіку"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "Прототип графіку \"%1$s\" з елементами даних із шаблону не може містити елементи даних з інших вузлів мережі."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "Прототип графіка \"%s\" видалено."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "Прототипи графіків"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5835,49 +5998,51 @@ msgstr "Прототипи графіків для"
 msgid "Graph sum"
 msgstr "Сума графіку"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "Тип графіка"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "Графік оновлено"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "Графік з іменем \"%1$s\" вже існує в графіках або в прототипах графіків."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "Графік з таким же іменем, але іншого типу, вже існує."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "Графіки"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "Графіки скопійовано"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "Графіки видалено"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "Грецька (el_GR)"
 
@@ -5886,54 +6051,60 @@ msgstr "Грецька (el_GR)"
 msgid "Grid"
 msgstr "Сітка"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "Група"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "Група \"%1$s\" не існує."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Група \"%1$s\" для вузла мережі \"%2$s\" не існує."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "Групу додано"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "Групу видалено"
+msgid_plural "Groups deleted"
+msgstr[0] "Групу видалено"
+msgstr[1] "Групу видалено"
+msgstr[2] "Групу видалено"
+msgstr[3] "Групу видалено"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5944,40 +6115,42 @@ msgstr "Група для виявлених вузлів"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "Назва групи"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "Групу оновлено"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "Згруповано по"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "Групи"
 
@@ -5985,22 +6158,13 @@ msgstr "Групи"
 msgid "Groups in maintenance"
 msgstr "Групи, в яких проводиться сервіс"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -6017,7 +6181,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "ОГЛЯД ІНВЕНТАРНИХ ДАНИХ ВУЗЛА МЕРЕЖІ"
 
@@ -6035,7 +6199,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP аутентифікація"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -6056,12 +6221,17 @@ msgstr "Апаратна конфігурація"
 msgid "Hardware (Full details)"
 msgstr "Апаратна частина (повні деталі)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "Висота"
@@ -6074,15 +6244,15 @@ msgstr "Допомога"
 msgid "Hexadecimal"
 msgstr "Шістнадцятковий"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "Прихована"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "Приховати"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "Приховати все"
 
@@ -6098,15 +6268,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "Приховати дезактивовані тригери"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "Не відображувати тільки відібрані"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -6115,23 +6285,23 @@ msgstr ""
 msgid "High"
 msgstr "Висока"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "Історія"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "Історію очищено"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "Очистка журналу може забрати багато часу. Продовжувати?"
 
@@ -6152,58 +6322,57 @@ msgstr "Історія подій"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "Горизонтальний"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "Вирівнювання по горизонталі"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
@@ -6212,22 +6381,23 @@ msgstr[1] "Вузел мережі"
 msgstr[2] "Вузел мережі"
 msgstr[3] "Вузел мережі"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "Вузел мережі \"%1$s\" вже існує."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "Вузел мережі \"%1$s\" під спостереженням через проксі \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "У вузла мережі \"%s\" вибрано параметр \"useipmi\", але не вказано параметр \"ipmi_ip\"! Буде використано IP адреса вузла мережі, як адреса для IPMI інтерфейсу."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "Вузел мережі (в порядку зростання)"
 
@@ -6239,24 +6409,24 @@ msgstr "IP адреса вузла мережі"
 msgid "Host access"
 msgstr "Доступ до вузла мережі"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "Вузел мережі додано"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "У вузла мережі не може бути більше одного інтерфейсу по замовчуванню однакового типу."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "Кількість вузлів мережі"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "Вузел мережі видалено"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
@@ -6264,7 +6434,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
@@ -6273,36 +6443,38 @@ msgstr[2] ""
 msgstr[3] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "Група вузлів мережі"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Група вузлів мережі \"%1$s\" вже існує."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6319,14 +6491,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "Тип ярлика до групи вузлів мережі"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "Групи вузлів мережі"
 
@@ -6336,8 +6509,8 @@ msgstr "Групи вузлів мережі"
 msgid "Host interface"
 msgstr "Інтерфейс вузла мережі"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "Інвентарні дані вузла мережі"
 
@@ -6353,7 +6526,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "Тип ярлика до вузла мережі"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "Список вузлів мережі"
 
@@ -6362,18 +6535,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "Ім'я вузла мережі"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6382,30 +6555,30 @@ msgstr ""
 msgid "Host networks"
 msgstr "Мережі вузла мережі"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
@@ -6413,7 +6586,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
@@ -6421,37 +6594,37 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6463,7 +6636,7 @@ msgstr ""
 msgid "Host router"
 msgstr "Шлюз вузла мережі"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "Комплексні екрани вузла мережі"
 
@@ -6475,51 +6648,52 @@ msgstr "Стан вузла мережі"
 msgid "Host subnet mask"
 msgstr "Маска підмережі вузла мережі"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "Час вузла мережі"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "Помилка при оновленні вузла мережі."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "Вузел мережі оновлено"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "Вузел мережі з цим самим іменем \"%s\" вже існує."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "Вузел мережі з цим самим видимим іменем \"%s\" вже існує."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "Вузли мережі"
 
@@ -6527,11 +6701,11 @@ msgstr "Вузли мережі"
 msgid "Hosts & Groups"
 msgstr "Вузли мережі & Групи вузлів мережі"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "Вузли мережі (Пс/Бс/ш)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "Вузли мережі / шаблони"
 
@@ -6543,37 +6717,38 @@ msgstr "Вузли мережі в"
 msgid "Hosts in maintenance"
 msgstr "Вузли, в яких проводиться сервіс"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "Інформація по вузлах мережі"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "Розміщення вузлів"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "Вузли мережі оновлено"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "Щогодини"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "Годин"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "Угорська (hu_HU)"
 
@@ -6591,22 +6766,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6614,26 +6789,26 @@ msgstr "IP"
 msgid "IP address"
 msgstr "IP-адрес"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "IP та DNS не можуть бути пустими для інтерфейсу вузла мережі."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "Діапазон IP адрес"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "Діапазон IP не може бути пустим."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6641,22 +6816,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI агент"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "Алгоритм аутентифікації IPMI"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "Інтерфейси IPMI"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "Пароль IPMI"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "Рівень привілеїв IPMI"
 
@@ -6666,7 +6841,7 @@ msgstr "Рівень привілеїв IPMI"
 msgid "IPMI sensor"
 msgstr "IPMI датчик"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "Ім'я користувача IPMI"
 
@@ -6699,7 +6874,7 @@ msgstr "Залежності послуги ІТ"
 msgid "IT service parent"
 msgstr "Батьківська послуга ІТ"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6715,25 +6890,25 @@ msgid "ITEMS"
 msgstr "ЕЛЕМЕНТИ ДАНИХ"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "Іконка"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "Іконка (по замовчуванню)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "Іконка (відключено)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "Іконка (обслуговування)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "Іконка (проблема)"
 
@@ -6754,42 +6929,44 @@ msgstr "Тип ярлика у іконці"
 msgid "Icon map"
 msgstr "Призначення іконок"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Призначення іконок \"%1$s\" не може бути видалено. Використовується в карті мережі \"%2$s\"."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "Призначення іконок \"%1$s\" посилається на некоректний iconid \"%2$s\"."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "Призначення іконок \"%1$s\" посилається на некоректний зв'язок \"%2$s\" з інвентарними даними."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "Призначення іконок \"%s\" вже існує."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "Призначення іконок \"%s\" не може посилатись на пустий вираз."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "Призначення іконок \"%s\" не може посилатись на глобальний вираз якого не існує."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "Призначення іконок \"%s\" має некоректний вираз."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "Призначення іконок \"%s\" повинно мати як мінімум одне призначення."
@@ -6802,7 +6979,8 @@ msgstr "Призначення іконок створено"
 msgid "Icon map deleted"
 msgstr "Призначення іконок видалено"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "Ім'я призначення іконок не може бути пустим."
 
@@ -6810,29 +6988,29 @@ msgstr "Ім'я призначення іконок не може бути пу�
 msgid "Icon map updated"
 msgstr "Призначення іконок оновлено"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "Призначення іконок з iconmapid \"%s\" не існує."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "Призначення іконок"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "В призначенні іконок запис \"%1$s\" для \"%2$s\" вже існує."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "Призначення іконок не активовано"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "Іконки"
 
@@ -6840,21 +7018,23 @@ msgstr "Іконки"
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "Якщо Ви вважаєте це повідомлення помилковим, то зверніться до Вашого адміністратора для отримання необхідних прав доступу."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "Картинка"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6863,7 +7043,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Картинку додано"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "Картинку видалено"
 
@@ -6871,12 +7051,13 @@ msgstr "Картинку видалено"
 msgid "Image label type"
 msgstr "Тип ярлика до картинки"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "Помилка завантаження зображення [%1$s] в [%2$s]."
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "Розмір зображення має бути менше 1МБ."
 
@@ -6885,66 +7066,66 @@ msgid "Image updated"
 msgstr "Картинку оновлено"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "Картинки"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "Картинки для всіх карт мереж буде оновлено!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "Негайно"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "Імпорт"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "Імпорт не вдався"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "Імпорт файлу"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "Імпортовано успішно"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "Неможливо фільтрувати по неіснуючому полю інвентарних даних \"%s\"."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "Неможливо видалити останній рядок та стовпчик."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "В"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "В групі"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "В групах"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6957,244 +7138,282 @@ msgstr "В періоді сервісу"
 msgid "In progress"
 msgstr "В роботі"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "Включено"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "Некоректне значення поля \"не жорстка\" для залежності у послуги \"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "Некоректне значення %1$s типу підпису для карти мережі \"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "Некоректний діапазон IP \"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "Некоректний SNMP OID."
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "Некоректне SNMP community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "Некоректне допустиме SLA для послуги \"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "Некоректна перевірка виявлення в умові дії."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "Некоректна перевірка виявлення в умові дії. Перевірка виявлення не існує або у вас немає прав доступу до неї."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "Некоректна правило виявлення в умові дії. Правило виявлення не існує або у вас немає прав доступу до нього."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "Некоректний стан виявлення в умові дії."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "Некоректна група вузлів мережі в умові дії. Група вузлів мережі не існує або у вас немає прав доступу до неї."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "Некоректний вузел мережі в умові дії. Вузел мережі не існує або у вас немає прав доступу до нього."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "Некоректний проксі в умові дії. Проксі не існує або у вас немає прав доступу до нього."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "Некоректний шаблон в умові дії. Шаблон не існує або у вас немає прав доступу до нього."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "Некоректний тригер в умові дії. Тригер не існує або у вас немає прав доступу до нього."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "Некоректний тип умови дії."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "Некоректний id умови дії."
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "Некоректний тип команди в операції дії."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "Некоректний тип підтвердження для умови в операції дії."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "Некоректний тип умови в операції дії."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "Некоректні значення кроку ескалації для операції дії."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "Некоректна група вузлів мережі в операції дії. Група вузлів мережі не існує або у вас немає прав доступу до цієї групи вузлів мережі."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "Некоректний вузел мережі для операції дії. Вузел мережі не існує або ви не маєте до нього доступу."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "Некоректний порт \"%s\" для операції дії."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "Некоректна тривалість кроку операції дії."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "Некоректний тип операції дії."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "Некоректна група користувачів для операції дії. Група користувачів не існує або ви не маєте до неї доступу."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Некоректний користувач для операції дії. Користувач не існує або ви не маєте до нього доступу."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "Некоректний id операції дії."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "Некоректний алгоритм для послуги \"%1$s\"."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "Функції передано некоректні параметри"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "Функції передано некоректні параметри."
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "Некоректні параметри передано методу."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "Некоректне значення для вирахування SLA для послуги \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "Використано некоректні символи в імені вузла мережі \"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "Некоректна затримка."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7204,11 +7423,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7217,11 +7436,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Некоректне ім'я або значення поля \"%1$s\" в операторі where для таблиці \"%2$s\"."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "Некоректні поля для тригера."
 
@@ -7229,74 +7448,100 @@ msgstr "Некоректні поля для тригера."
 msgid "Incorrect file upload."
 msgstr "Некоректний завантажуваний файл."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "Некоректний гнучкий інтервал \"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "Некоректний гнучкий інтервал в елементі даних \"%1$s\". Гнучкий інтервал має бути рядком."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "Використано некоректну функцію"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "Некоректна група вузлів мережі."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7304,182 +7549,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr "Некоректний номер картинки."
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "Для інтерфейсу вказано некоректний параметр DNS \"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "Для інтерфейсу вказано некоректний параметр IP адреси \"%s\"."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "Для інтерфейсу вказано некоректний порт \"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "Некоректне поле \"%s\" інвентарних даних."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "Некоректний елемент даних для значення вісі."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "У виразі тригера \"%2$s\" вказано некоректний ключ елемента даних \"%1$s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "Некоректний ключ."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "Некоректний список елементів даних."
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "Некоректний сервіс - дата має бути між 1970.01.01 та 2038.01.18"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "Некоректна дата періоду сервісу"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "Некоректний день періоду сервісу"
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "Некоректний день тижня періоду сервісу"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "Некоректний місяць періоду сервісу"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "Некоректний період сервісу"
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "Некоректний період сервісу (мінімум 5 хвилин)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "Некоректний тиждень періоду сервісу"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "Некоректне значення висоти для карти мережі \"%s\"."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "Некоректне значення ширини для карти мережі \"%s\"."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "Некоректний параметр для операцій."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "Використано некоректний параметр для призначення іконок \"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "Некоректні параметри для умови."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "Некоректні параметри для методу оновлення призначення іконок \"%s\"."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "Некоректні параметри для сервісу."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "Некоректні параметри для групи користувачів."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "Некоректна батьківська для послуги \"%s\"."
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "Некоректна батьківська послуга."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "Некоректний діапазон портів."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "Некоректний proxyid."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "Вказано некоректний тип ресурсу для елементу комплексного екрану."
 
@@ -7488,64 +7752,68 @@ msgstr "Вказано некоректний тип ресурсу для ел�
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "Некоректний комплексний екран вказано для слайд-шоу."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "Некоректний час завершення послуги."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "Некоректний час початку послуги."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "Некоректний тип часу послуги."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "Некоректний порядок сортування для послуги \"%1$s\"."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "Некоректний стан для послуги \"%1$s\"."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "Некоректний статус."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7566,52 +7834,57 @@ msgstr "Некоректний період часу \"%1$s\". Час почат
 msgid "Incorrect time period \"%1$s\"."
 msgstr "Некоректний період часу \"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "Некоректний ID тригера для послуги \"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "Некоректний вираз тригера"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "Некоректний вираз тригера."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "Некоректний вираз тригера. Вузел мережі \"%1$s\" не існує або ви не маєте до цього вузла мережі."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "Некоректний вираз тригера. Вузел мережі \"%s\" не існує або ви не маєте до нього доступу."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "Некоректний вираз тригера. Елементи виразу тригера не повинні належати шаблону та вузлу мережі одночасно."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "У виразі вказано некоректну функцію тригера \"%1$s\"."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "Некоректний тип asort_by_key."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "Некоректна група користувачів."
 
@@ -7620,7 +7893,8 @@ msgstr "Некоректна група користувачів."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7640,7 +7914,7 @@ msgstr "Значення \"%1$s\" є некоректним для поля ці
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Значення \"%1$s\" є некоректним для поля числа без знаку \"%2$s\"."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7650,43 +7924,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "Значення \"%s\" є некоректним для setMessage()."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "Некоректний робочий час."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "Некоректний елемент даних для Y макс. у графіка \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "Некоректний елемент даних для Y мін. у графіка \"%1$s\"."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "Індонезійська (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "Інфо"
 
@@ -7695,15 +7975,15 @@ msgstr "Інфо"
 msgid "Information"
 msgstr "Інформація"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "Вставити"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "Вставити макрос"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "Інсталяція"
 
@@ -7711,31 +7991,32 @@ msgstr "Інсталяція"
 msgid "Installer name"
 msgstr "Ім'я інсталятора"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "Інтерфейс зв'язаний з елементом даних \"%1$s\" у \"%2$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "Інтерфейс використовується елементами даних, яким потрібен цей тип інтерфейсу."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "У інтерфейсу з DNS іменем \"%1$s\" не може бути пуста IP адреса."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr "У інтерфейсу з IP адресою \"%1$s\" не може бути пусте DNS ім'я, коли встановлено \"Використовувати DNS\" у \"%2$s\"."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "У інтерфейсу з IP адресою \"%1$s\" не може бути пусте DNS ім'я."
@@ -7755,7 +8036,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "Внутрішня помилка JSON-RPC."
 
@@ -7763,7 +8044,7 @@ msgstr "Внутрішня помилка JSON-RPC."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "Внутрішня помилка."
 
@@ -7776,19 +8057,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "Інтервал"
 
@@ -7798,112 +8079,114 @@ msgstr "Інтервал"
 msgid "Interval (in sec)"
 msgstr "Інтервал (в сек)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "Помилковий JSON. На сервері виникла помилка при аналізі тексту JSON."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "Помилковий запит."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "Помилкова дата \"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "Помилковий hostid для макросу \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "Помилковий період обслуговування"
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "Помилкові параметри методу."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "Помилкові параметри."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "Помилковий код відповіді \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "Помилковий діапазон коду відповіді \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "Помилковий період часу"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "Отримано помилкове ім'я вигляду \"%s\". Дозволені символи : \"a-z\" та \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "Інвентаризація"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7912,7 +8195,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "Поле інвентарних даних"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "Режим інвентарних даних"
 
@@ -7920,12 +8203,12 @@ msgstr "Режим інвентарних даних"
 msgid "Is online?"
 msgstr "В системі?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "Проблема"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "Неможливо фільтрувати по паролю користувача."
 
@@ -7933,70 +8216,71 @@ msgstr "Неможливо фільтрувати по паролю корист
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "Неможливо виконувати вихід з HTTP аутентифікацією."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "Неможливо виконувати пошук по паролю користувача."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "Італійська (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "Елемент даних"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Елемент даних \"%1$s\" вже існує в \"%2$s\", успадковано з іншого шаблону."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "Елемент даних \"%1$s\" не може заповнювати відсутнє поле під номером \"%2$d\" інвентарних даних вузла мережі. Оберіть з: від 0 (не заповнювати) до %3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "Елемент даних \"%1$s\" не існує в шаблоні \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "Елемент даних \"%1$s\" не існує."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "Елемент даних \"%1$s\" в \"%2$s\": група елементів даних \"%3$s\" не існує."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "Елемент даних \"%1$s\" пропущено - правило користувача."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "Елемент даних \"%1$s:%2$s\" має неправильний порт: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "Елемент додано"
 
@@ -8004,11 +8288,11 @@ msgstr "Елемент додано"
 msgid "Item count"
 msgstr "Кількість елементів даних"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "Елемент даних видалено"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
@@ -8016,7 +8300,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -8032,33 +8316,33 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "Прототип елемента даних"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
@@ -8066,7 +8350,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
@@ -8074,18 +8358,18 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "Прототипи елементів даних"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -8093,92 +8377,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "Прототипи елементів даних для"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "Елемент оновлено"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "Елемент даних використовує інтерфейс не від батьківського вузла мережі."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "Елемент даних використовує некоректний тип інтерфейсу."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "Елемент не було оновлено. Будь ласка введіть коректний інтервал оновлення."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "Елемент даних з ключем \"%1$s\" вже існує в \"%2$s\" як правило виявлення."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "Елемент даних з ключем \"%1$s\" вже існує в \"%2$s\" як елемент даних створений з прототипу елемента даних."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "Елемент даних з ключем \"%1$s\" вже існує в \"%2$s\" як прототип елемента даних."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "Елемент даних з ключем \"%1$s\" вже існує в \"%2$s\" як елемент даних."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "Елемент даних з ключем \"%1$s\" вже існує в \"%2$s\" як невідомий елемент даних."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "Елемент даних з ключем \"%1$s\" вже існує в \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "Елементи даних"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "Елементи даних (а/д/нп)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "Елементи даних скопійовано"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "Елементи даних видалено"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "Список елементів"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "Елементи оновлено"
 
@@ -8190,72 +8474,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX агент"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "Інтерфейси JMX"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "Не вдалось згенерувати JSON-rpc помилку. Немає такої помилки \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpc метод не визначено."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpc параметри не являються масивом."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "Версію JSON-rpc не вказано."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Ідентифікатор Jabber"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "Січ"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "Січень"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "Японська (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "Лип"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "Липень"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "Чер"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "Червень"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "К"
@@ -8264,40 +8548,40 @@ msgstr "К"
 msgid "Keep lost resources period (in days)"
 msgstr "Період збереження втрачених ресурсів (дні)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "Ключ"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "Ключ \"%1$s\" не співпадає з <grpmax|grpmin|grpsum|grpavg>[\"Група вузлів мережі\", \"Ключ елемента даних\", \"<last|min|max|avg|sum|count>\", \"параметр\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "Фраза-пароль ключа"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "Ключове слово"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Кіло"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "Корейська (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "ОСТАННІ ДАНІ"
 
@@ -8328,37 +8612,37 @@ msgstr "Вдалий вхід через LDAP"
 msgid "LDAP login was not successful"
 msgstr "Невдалий вхід через LDAP"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "ЛОКАЛЬНИЙ"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "ВТРАЧЕНО"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "Ярлик"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "Розміщення ярлика"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "Мова"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "Останній"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "Остання"
@@ -8372,19 +8656,19 @@ msgstr[1] "Остання %1$d подія"
 msgstr[2] "Останні %1$d події"
 msgstr[3] "Останні %1$d подій"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "Останнє (найновіше) T значення < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "Останнє (найновіше) T значення = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "Останнє (найновіше) T значення > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "Останнє (найновіше) T значення НЕ є N"
 
@@ -8404,28 +8688,28 @@ msgstr "Останні 365 днів"
 msgid "Last 7 days"
 msgstr "Останні 7 днів"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "Остання зміна"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "Остання зміна (в порядку спадання)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "Остання перевірка"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "Графік за останню годину"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "Графік за останній місяць"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "За останні"
 
@@ -8433,66 +8717,67 @@ msgstr "За останні"
 msgid "Last seen (age)"
 msgstr "Востаннє помітний (вік)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "Останнє значення"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "Графік за останній тиждень"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "Останні дані"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "Останні події"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "Латвійська (lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "З лівого боку"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "Легенда"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "Довжина в символах останнього (найновішого) T значення < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "Довжина в символах останнього (найновішого) T значення = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "Довжина в символах останнього (найновішого) T значення > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "Довжина в символах останнього (найновішого) T значення НЕ є N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "Лінія"
 
@@ -8500,39 +8785,29 @@ msgstr "Лінія"
 msgid "Link"
 msgstr "Лінк"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "Індикатори лінка"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "Ім'я посилання має бути унікальним для карти мережі \"%s\"."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Поле лінку selementid1 вказує на не існуючий selement ID \"%1$s\" для карти мережі \"%2$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Поле лінку selementid2 вказує на не існуючий selement ID \"%1$s\" для карти мережі \"%2$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "У посилання мають бути заповнені обидва поля \"Ім'я\" та \"URL-запит\" для карти мережі \"%s\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "Приєднати шаблони"
 
@@ -8544,50 +8819,50 @@ msgstr "Приєднати до шаблону"
 msgid "Link to templates"
 msgstr "Приєднати до шаблонів"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "Зв'язок з шаблонами"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "Приєднані шаблони"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "Приєднаний до"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "Лінки між вибраними елементами"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "Лінки для вибраного елемента"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "Список пустий"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "Литовський (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "Завантаження..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "Локальний (дійсний) час"
 
@@ -8604,36 +8879,36 @@ msgid "Location longitude"
 msgstr "Розміщення (довгота)"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "Лог (багато полів)"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "Важливість останнього запису в журналі < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "Важливість останнього запису в журналі = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "Важливість останнього запису в журналі > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "Важливість останнього запису в журналі НЕ є N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "Джерело події останнього запису в журналі відповідає параметру T, тоді N = 1, 0 - в іншому випадку"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "Джерело події останнього запису в журналі відповідає параметру T, тоді N НЕ є 1, 0 - в іншому випадку"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "Формат часу в журналі"
@@ -8642,12 +8917,12 @@ msgstr "Формат часу в журналі"
 msgid "Log unmatched SNMP traps"
 msgstr "Записувати не співпадаючі SNMP трапи"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "Підключено до системи як"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8658,12 +8933,12 @@ msgstr "Вхід в систему"
 msgid "Login as Guest"
 msgstr "Увійти як Гість"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "Помилка входу \"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8672,8 +8947,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "Некоректне ім'я користувача або пароль."
 
@@ -8694,22 +8970,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "М"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8721,7 +8993,7 @@ msgstr "MAC адреса A"
 msgid "MAC address B"
 msgstr "MAC адреса B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "В СТАНІ СЕРВІСУ"
 
@@ -8746,49 +9018,49 @@ msgstr "100 НАЙБІЛЬШ АКТИВНИХ ТРИГЕРІВ"
 msgid "Macro"
 msgstr "Макро"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Макрос \"%1$s\" вже існує в \"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Макрос \"%1$s\" вже існує."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "Макрос \"%1$s\" не унікальний."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "Значення макросу \"%1$s\" занадто довге, воно не має перевищувати 255 символів."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "Ім'я макросу \"%1$s\" занадто довге, воно не має перевищувати 64 символи."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "Макросу з globalmacroid \"%1$s\" не існує."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "Макросу з hostmacroid \"%1$s\" не існує."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "Макроси"
 
@@ -8796,31 +9068,36 @@ msgstr "Макроси"
 msgid "Macros updated"
 msgstr "Макроси оновлено"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "Сервіс"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "Сервіс \"%s\" вже існує."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "Значення \"Активно з\" в сервісі не може бути більше ніж \"Активно до\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "Період сервісу додано"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "Сервіс видалено"
 
@@ -8828,7 +9105,7 @@ msgstr "Сервіс видалено"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "Тривалість періоду сервісу"
 
@@ -8844,25 +9121,25 @@ msgstr "Стан сервісу"
 msgid "Maintenance type"
 msgstr "Тип сервісу"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "Сервіс оновлено"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "Сервіс зі збором даних"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "Сервіс без збору даних"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "Пропущено обов'язковий параметр."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "Вручну"
 
@@ -8873,12 +9150,12 @@ msgstr "Примусовий вихід"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "Карта мережі"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "Карту мережі \"%1$s\" пропущено - правило користувача."
@@ -8888,12 +9165,12 @@ msgstr "Карту мережі \"%1$s\" пропущено - правило к�
 msgid "Map \"%s\""
 msgstr "Карта мережі \"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "Карту мережі \"%s\" створено."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "Карту мережі \"%s\" оновлено."
@@ -8910,12 +9187,12 @@ msgstr "Тип позначки карти мережі"
 msgid "Map save operation failed."
 msgstr "Помилка в операції збережнення карти."
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "Перетворюється на"
 
@@ -8925,23 +9202,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "Значення \"%1$s\" не є унікальним у перетворенні."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "Призначення"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "Карти мереж"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "Бер"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "Березень"
 
@@ -8949,28 +9226,34 @@ msgstr "Березень"
 msgid "Mark elements on trigger status change"
 msgstr "Відмічати елементи при зміні стану тригера"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "Не помічати тільки відібрані"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "Помітити тільки відібрані"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "Масове оновлення"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "Масове оновлення елементів"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "Макс. кількість елементів для відображення в комірці таблиці"
@@ -8984,38 +9267,11 @@ msgstr "Макс. кількість елементів для відображ�
 msgid "Max count of events per trigger to show"
 msgstr "Макс. кількість подій у тригера для відображення"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "Розгорнути"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -9023,16 +9279,16 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
@@ -9041,65 +9297,57 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "Максимальне значення за період T є < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "Максимальне значення за період T є = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "Максимальне значення за період T є > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "Максимальне значення за період T НЕ є N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "Тра"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "Травень"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "Метод повідомлення"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "Тип засобу передачі"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "Метод повідомлень \"%s\" вже існує."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "Метод повідомлень додано"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "Метод повідомлень видалено"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
@@ -9108,7 +9356,7 @@ msgstr[1] "Метод повідомлень дезактивовано"
 msgstr[2] "Метод повідомлень дезактивовано"
 msgstr[3] "Метод повідомлень дезактивовано"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
@@ -9117,21 +9365,21 @@ msgstr[1] "Метод повідомлень активовано"
 msgstr[2] "Метод повідомлень активовано"
 msgstr[3] "Метод повідомлень активовано"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "Метод повідомлень оновлено"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "Методи повідомлень"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "Методи повідомлень використовуються у дії \"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Мега"
 
@@ -9146,14 +9394,14 @@ msgid "Memory limit: %s"
 msgstr "Ліміт пам'яті: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "Меню"
 
@@ -9163,7 +9411,7 @@ msgstr "Меню"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "Повідомлення"
 
@@ -9171,66 +9419,66 @@ msgstr "Повідомлення"
 msgid "Message actions"
 msgstr "Повідомлення дій"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "Обреження тексту повідомлення"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "Таймаут повідомлення"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "Таймаут повідомлення (секунди)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "Повідомлення"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "Метод не знайдено."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "Посередині"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "Згорнути"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9239,7 +9487,7 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
@@ -9248,73 +9496,70 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "Мінімальне значення за період T є < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "Мінімальне значення за період T є = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "Мінімальне значення за період T є > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "Мінімальне значення за період T НЕ є N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "Хвилин"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "Відсутнє поле \"itemid\" для елемента даних."
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "Відсутнє поле \"name\" для графіку."
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "Відсутній елемент даних \"%1$s\" для вузла мережі \"%2$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "Відсутні елементи даних для графіку \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9324,7 +9569,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "Відсутній ключ \"%1$s\" для вузла мережі \"%2$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "Відсутній параметр: usrgrpids."
 
@@ -9336,18 +9581,18 @@ msgstr "Режим"
 msgid "Model"
 msgstr "Модель"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "Пн"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "Понеділок"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "Спостерігається через проксі"
 
@@ -9355,33 +9600,33 @@ msgstr "Спостерігається через проксі"
 msgid "Monitored host"
 msgstr "Вузел мережі під спостереженням"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "Моніторинг"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "Місяць"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "Щомісяця"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9389,7 +9634,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "Більше 10 хвилин"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "Більше ніж один графік з ім'ям \"%1$s\" у вузла мережі."
@@ -9398,19 +9643,19 @@ msgstr "Більше ніж один графік з ім'ям \"%1$s\" у ву�
 msgid "Most busy triggers top 100"
 msgstr "100 найбільш активних тригерів"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "Багатократні події ПРОБЛЕМА"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "Багатократна генерація подій ПРОБЛЕМА"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "Вимкнути звук"
 
@@ -9423,60 +9668,58 @@ msgstr "КАРТИ МЕРЕЖ"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "НЕМАЄ ДАНИХ"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM аутентифікація"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9487,26 +9730,32 @@ msgstr "NTLM аутентифікація"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "Ім'я"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9525,12 +9774,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9538,7 +9787,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "Карту мережі додано"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "Карту мережі видалено"
 
@@ -9550,7 +9799,7 @@ msgstr "Карту мережі оновлено"
 msgid "Network maps"
 msgstr "Карти мереж"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "Ніколи"
 
@@ -9558,24 +9807,24 @@ msgstr "Ніколи"
 msgid "Never executed"
 msgstr "Ніколи не виконувалось"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "Новий"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "Нова група елементів даних"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "Нова умова"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "Новий елемент"
 
@@ -9586,16 +9835,16 @@ msgstr "Новий елемент"
 msgid "New flexible interval"
 msgstr "Створення гнучкого інтервалу"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "Нова група"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "Нова група вузлів мережі"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "Новий елемент для графіка"
 
@@ -9603,83 +9852,99 @@ msgstr "Новий елемент для графіка"
 msgid "New media"
 msgstr "Новий метод повідомлення"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "Новий регулярний вираз"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "Новий період послуги"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "Далі"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "Наступна"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "Ні"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "Немає поля \"ymax_type\" для графіка \"%s\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "Немає поля \"ymin_type\" для графіка \"%s\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9687,25 +9952,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "Для елемента комплексного екрану не вказано URL."
 
@@ -9731,8 +9996,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "Дій не знайдено."
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9742,7 +10007,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "Немає групи елементів даних з ID \"%1$s\"."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9750,30 +10015,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "Не вказано тип аутентифікації для команди \"%s\" в операції дії."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "Не вказано імені користувача аутентифікації для команди \"%s\" в операції дії."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "Для аутентифікації не вказано ім'я користувача."
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "Не вказано команди в операції дії."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "Не вказано тип команди в операції дії."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "Умов не визначено."
 
@@ -9782,27 +10048,27 @@ msgstr "Умов не визначено."
 msgid "No data collection"
 msgstr "Без збору даних"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "Не отримано даних за період часу T, тоді N = 1, 0 - в іншому випадку"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "Не отримано даних за період часу T, тоді N НЕ 1, 0 - в іншому випадку"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "Відсутній інтерфейс по замовчуванню \"%1$s\" типу у вузла мережі \"%2$s\"."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "Залежностей не визначено."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "Подробиці відсутні"
 
@@ -9810,39 +10076,39 @@ msgstr "Подробиці відсутні"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "ID правил виявлення не вказано."
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "Помилок не знайдено."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "Подій немає"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "Немає подій для підтвердження"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "Не вказано ціль виконання для команди \"%s\" в операції дії."
@@ -9857,7 +10123,7 @@ msgstr "Файл не було завантажено."
 msgid "No flexible intervals defined."
 msgstr "Змінних інтервалів не визначено."
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "Для елемента комплексного екрану не вказано ID графіка."
 
@@ -9866,7 +10132,11 @@ msgstr "Для елемента комплексного екрану не вк�
 msgid "No graph item with graphid \"%s\"."
 msgstr "Немає елемента графіку з graphid \"%s\"."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9875,48 +10145,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "Немає груп для вузла мережі \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "Немає груп для вузлів мережі."
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "Не вказано ID вузлів мережі."
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "Не вказано вузел мережі для макросу \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "Не вказано ID групи вузлів мережі для елемента комплексного екрану."
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9929,17 +10200,22 @@ msgstr "Немає груп вузлів мережі з groupid \"%s\"."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "Немає вузла мережі з hostid \"%s\"."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "Немає іконки для елемента карти мережі \"%s\"."
@@ -9958,33 +10234,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "Інтерфейсу не знайдено"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "Інтерфейсу не знайдено."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "Немає інтерфейсів для вузла мережі \"%s\"."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "Не вказано ID елемента даних для елемента комплексного екрану."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -10003,7 +10286,7 @@ msgid "No items defined."
 msgstr "Елементів даних не визначено."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -10019,7 +10302,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "Не вказано ID карти мережі для елемента комплексного екрану."
 
@@ -10028,15 +10311,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -10048,133 +10331,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "Немає прав доступу до графіка \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "Немає прав доступу до вузла мережі \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "Немає прав доступу до елемента даних \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "Немає прав доступу до шаблону \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "Немає прав доступу до тригера \"%s\"."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "Немає прав доступу"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "Немає прав доступу до групи \"%1$s\"."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "Немає прав доступу до карти мережі \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "Немає прав доступу до комплексного екрану \"%1$s\"."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "Немає прав доступу до системи."
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Немає прав доступу до запитуваного об'єкту або він не існує!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "Не вказано файл приватного ключа для команди \"%s\" в операції дії."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "Файл приватного ключа не вказано."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "Без проксі"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "Не вказано файл публічного ключа для команди \"%s\" в операції дії."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "Файл публічного ключа не вказано."
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "Немає отримувачів повідомлення в операції дії."
 
@@ -10182,7 +10510,7 @@ msgstr "Немає отримувачів повідомлення в опера
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "Не вказано ID комплексного екрану для елемента комплексного екрану."
 
@@ -10190,82 +10518,83 @@ msgstr "Не вказано ID комплексного екрану для ел
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "Не вказано скрипт для команди в операції дії."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "Ціль не обрано"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "Ціль не обрано."
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "Інтервалів не визначено. Робота 24х7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "Немає тригера"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "Немає тригера з triggerid \"%1$s\"."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "Тригерів не визначено."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "Тригери не знайдено."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10274,57 +10603,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "Значень не знайдено."
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "Нічого"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "Звичайний"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "Звичайний вигляд"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "Не підтверджено"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "Немає елементів даних з шаблону"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "Не всі шаблони приєднані до \"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Забороняється встановлювати пароль для користувача \"гість\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "Недоступний"
 
@@ -10333,7 +10663,7 @@ msgstr "Недоступний"
 msgid "Not classified"
 msgstr "Не класифіковано"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "Не підключено"
 
@@ -10346,8 +10676,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "Не підтримується"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "Примітка"
@@ -10360,7 +10690,7 @@ msgstr "Примітки"
 msgid "Nothing"
 msgstr "Нічого"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "Нічого робити."
 
@@ -10368,87 +10698,87 @@ msgstr "Нічого робити."
 msgid "Notification report"
 msgstr "Звіт про повідомлення"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "Повідомлення"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "Лис"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "Листопад"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "Зараз"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "Кількість секунд з початку Епохи < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "Кількість секунд з початку Епохи = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "Кількість секунд з початку Епохи > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "Кількість секунд з початку Епохи НЕ є N"
 
@@ -10456,88 +10786,88 @@ msgstr "Кількість секунд з початку Епохи НЕ є N"
 msgid "Number of status changes"
 msgstr "Кількість змін стану"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Кількість кроків"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "Кількість успішно отриманих значень V (які задовольняють оператор O) за період T є < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "Кількість успішно отриманих значень V (які задовольняють оператор O) за період T є = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "Кількість успішно отриманих значень V (які задовольняють оператор O) за період T є > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "Кількість успішно отриманих значень V (які задовольняють оператор O) за період T НЕ є N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "Кількість користувачів (підключених в даний момент)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "Числовий (дробове)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "Числовий (64 біти)"
 
@@ -10552,16 +10882,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "OK"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10577,8 +10909,7 @@ msgstr "OOB роутер"
 msgid "OOB subnet mask"
 msgstr "OOB маска підмережі"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "АБО"
 
@@ -10598,11 +10929,12 @@ msgstr "ОС (Короткий опис)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "ІНШІ ПАРАМЕТРИ НАЛАШТУВАНЬ"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "ОГЛЯД"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "Жов"
 
@@ -10610,25 +10942,25 @@ msgstr "Жов"
 msgid "Octal"
 msgstr "Вісімковий"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "Жовтень"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "Вимкн"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "Ок"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "Увімк"
 
@@ -10636,111 +10968,114 @@ msgstr "Увімк"
 msgid "On status change triggers blink for"
 msgstr "Мигання тригерів при зміні стану протягом"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "Один раз"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "Одноразово"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr "Однократна недоступність"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "Тільки Супер-Адміністратори можуть створювати глобальні макроси."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "Тільки Супер-Адміністратори можуть створювати групи вузлів мережі."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "Тільки Супер-Адміністратори можуть створювати призначення іконок."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "Тільки Супер-Адміністратори можуть створювати методи повідомлень."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "Тільки Супер-Адміністратори можуть видаляти глобальні макроси."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "Тільки Супер-Адміністратори можуть видаляти методи повідомлень."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "Тільки Супер-Адміністратори можуть видаляти групи користувачів."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "Тільки Супер-Адміністратори можуть редагувати методи повідомлень."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "Тільки Супер-Адміністратори можуть редагувати глобальні макроси."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "Тільки Супер-Адміністратори можуть редагувати призначення іконок."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "Тільки Zabbix Адміністратори можуть додавати оповіщення користувачам."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "Тільки Zabbix Адміністратори можуть змінювати оповіщення користувачам."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "Тільки Zabbix Адміністратори можуть видаляти оповіщення користувачам."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "Дозволено тільки символи."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "Підраховуються елементи даних тільки у вузлів мережі Під спостереженням"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "Тільки одна перевірка може бути унікальною."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "Тільки одне ім'я групи користувачів може бути змінено одночасно."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "Індикатор відображує тільки останні 20%%."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Підраховуються тригери тільки у вузлів мережі Під спостереженням та які залежать від активних елементів даних"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "Операція \"%s\" вже існує."
@@ -10749,28 +11084,28 @@ msgstr "Операція \"%s\" вже існує."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Операцію не може бути виконано через несанкціонований запит."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "Умова операції"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "Деталі операції"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "Операція не має групи для функціонування."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "Операція не має шаблону для функціонування."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "Тип операції"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "Операції"
@@ -10779,25 +11114,27 @@ msgstr "Операції"
 msgid "Operator"
 msgstr "Оператор"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10827,24 +11164,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "Оригінальне"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "Оригінальна блакитна"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "Інші"
 
@@ -10852,19 +11189,19 @@ msgstr "Інші"
 msgid "Other configuration parameters"
 msgstr "Інші параметри налаштувань"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "Інші групи"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "Інші вузли мережі"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10874,21 +11211,21 @@ msgstr "Інші вузли мережі | Група"
 msgid "Other parameters"
 msgstr "Інші параметри"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "Інші | Група"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "Інші"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10901,14 +11238,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "Огляд"
 
@@ -10916,7 +11250,7 @@ msgstr "Огляд"
 msgid "Overview by proxy"
 msgstr "Огляд по проксі"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "П"
@@ -10925,147 +11259,155 @@ msgstr "П"
 msgid "PERSONAL DASHBOARD"
 msgstr "ПЕРСОНАЛЬНА ПАНЕЛЬ"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "Підтримка баз даних PHP"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "Підтримка PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "Підтримка JPEG в PHP gd"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "Підтримка PNG в PHP gd"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP опція max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP опція max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP опція memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP опція post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP опція upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP session auto start"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "Часовий пояс PHP"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "Версія PHP"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -11074,32 +11416,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМА"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "Сторінка отримала некоректні дані"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Палітра"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Палітра #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "Параметр"
 
@@ -11108,7 +11452,7 @@ msgstr "Параметр"
 msgid "Parent discovery rules"
 msgstr "Батьківські правила виявлення"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -11128,33 +11472,33 @@ msgstr "Батьківські тригери"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "Помилка аналізу SQL [%1$s] у [%2$s]."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "Помилка розбору"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "Пасивний"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -11164,20 +11508,21 @@ msgstr "Пасивний"
 msgid "Password"
 msgstr "Пароль"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "Пароль (підтвердження)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "Для методу повідомлень потрібен пароль."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "Пароль не може бути пустим"
 
@@ -11186,21 +11531,21 @@ msgstr "Пароль не може бути пустим"
 msgid "Peak memory usage: %s"
 msgstr "Пік використання пам'яті: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "Процентна лінія (зліва)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "Процентна лінія (справа)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11208,12 +11553,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "Період"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "Тип періоду"
@@ -11223,24 +11568,24 @@ msgstr "Тип періоду"
 msgid "Periods"
 msgstr "Періоди"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "Права доступу"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права доступу можуть бути призначені тільки групам користувачів."
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "Персидська (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Пета"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Круговий"
 
@@ -11252,55 +11597,56 @@ msgstr "Алгоритм розміщення"
 msgid "Plain text"
 msgstr "Текст"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "Грати"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "Програвати звуковий сигнал"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "Виправте будь-ласка всі зауваження та натисніть кнопку \"Повтор\""
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "Будь-ласка введіть текст підтвердження."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "Будь-ласка, оберіть два елементи"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "Польська (pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "Заповнює поле інвентарних даних вузла мережі"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "Порт"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "Порт не може бути порожнім для інтерфейсу вузла мережі."
 
@@ -11308,51 +11654,51 @@ msgstr "Порт не може бути порожнім для інтерфей
 msgid "Port range"
 msgstr "Діапазон портів"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "Португальська (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "Португальська (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "Позиція"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "Змінні і дані для HTTP Post"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "Попередній перегляд"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "Назад"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "Попередня"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "Попереднє значення < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "Попереднє значення = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "Попереднє значення > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "Попереднє значення НЕ є N"
 
@@ -11401,30 +11747,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "Файл приватного ключа"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "Рівень привілеїв"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "Можливо відсутній модуль php-ldap."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "Проблема"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "Відображення Проблем"
 
@@ -11436,16 +11783,16 @@ msgstr "Проблема на"
 msgid "Problem time"
 msgstr "Тривалість проблем"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "Проблема, якщо всі підлеглі мають проблеми"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "Проблема, якщо хоча б у одного із підлеглих наявна проблема"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "Проблеми"
 
@@ -11453,75 +11800,71 @@ msgstr "Проблеми"
 msgid "Profile"
 msgstr "Профіль"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "Прототипи"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "Проксі"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "Проксі"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Проксі \"%1$s\" для вузла мережі \"%2$s\" не існує."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Проксі \"%1$s\" використовується в правилі виявлення \"%2$s\"."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "Проксі \"%s\" вже існує."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "Проксі додано"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "Проксі видалено"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "Вузли мережі проксі"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "Помилка при створенні інтерфейсу проксі."
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "Помилка при оновленні інтерфейсу проксі."
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "Режим Проксі"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "Ім'я проксі"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "Проксі оновлено"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "Публічний ключ"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11532,7 +11875,7 @@ msgstr "Файл публічного ключа"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "ЧЕРГА ЕЛЕМЕНТІВ ДАНИХ, ЯКІ ОЧІКУЮТЬ ОНОВЛЕННЯ"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "Черга"
 
@@ -11540,18 +11883,18 @@ msgstr "Черга"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "Читання"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "Тільки читання"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "Читання-запис"
 
@@ -11563,7 +11906,7 @@ msgstr "Причина"
 msgid "Received value"
 msgstr "Отримане значення"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11571,11 +11914,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "Отримувач"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "Отримувач (у порядку зростання)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "Отримувач (в порядку спадання)"
 
@@ -11586,28 +11929,28 @@ msgstr "Отримувач (в порядку спадання)"
 msgid "Recipient(s)"
 msgstr "Отримувачі"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "Відновлення"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "Повідомлення про відновлення"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "Тема про відновлення"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "Оновлювати екран (секунди)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "Множник інтервалу оновлення"
 
@@ -11625,32 +11968,32 @@ msgstr "Оновлювати непідтримувані елементи да�
 msgid "Regular expression"
 msgstr "Регулярний вираз"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "Регулярний вираз \"%s\" вже існує."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "Регулярний вираз V відповідає останньому значенню за період T, тоді N = 1, 0 - в іншому випадку"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "Регулярний вираз V відповідає останньому значенню за період T, тоді N = 1, 0 - в іншому випадку (не чутливий до регістру)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "Регулярний вираз V відповідає останньому значенню за період T, тоді N НЕ є 1, 0 - в іншому випадку"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "Регулярний вираз V відповідає останньому значенню за період T, тоді N НЕ є 1, 0 - в іншому випадку (не чутливий до регістру)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "Регулярний вираз додано"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "Регулярний вираз видалено"
@@ -11658,16 +12001,20 @@ msgstr[1] "Регулярний вираз видалено"
 msgstr[2] "Регулярні вирази видалено"
 msgstr[3] "Регулярні вирази видалено"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "Регулярний вираз не існує."
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "Регулярний вираз оновлено"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11684,26 +12031,28 @@ msgstr "Віддалена команда"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11714,21 +12063,19 @@ msgstr "Віддалена команда"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "Видалити"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11736,11 +12083,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "Видалити елемент"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "Видалити з"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "Вилучити з обраного"
@@ -11749,7 +12096,7 @@ msgstr "Вилучити з обраного"
 msgid "Remove from host group"
 msgstr "Видалити з групи вузлів мережі"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "Видалити із груп вузлів мережі"
 
@@ -11761,28 +12108,28 @@ msgstr "Видалити вузел мережі"
 msgid "Remove link"
 msgstr "Видалити лінк"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "Прибрати вибране"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "Замінити"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "Замінити залежності"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "Замінити групи вузла мережі"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "Звіт"
 
@@ -11790,35 +12137,36 @@ msgstr "Звіт"
 msgid "Report 1"
 msgstr "Звіт 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "Звіт 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "Звіт 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "Звіти"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "Вимагається текст-відповідь"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "В призначенні іконок пропущено необхідне поле \"expression\"."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "В призначенні іконок пропущено необхідне поле \"iconid\"."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "В призначенні іконок пропущено необхідне поле \"inventory_link\"."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "Необхідні права на вузел мережі"
 
@@ -11826,29 +12174,31 @@ msgstr "Необхідні права на вузел мережі"
 msgid "Required performance (vps)"
 msgstr "Необхідна продуктивність (знач/сек)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "Необхідна потужність сервера, нових значень в секунду"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "Необхідні коди статусу"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "Необхідна строка"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "Скинути"
 
@@ -11867,9 +12217,9 @@ msgstr "Скинути всі імена та кольори на значенн
 msgid "Reset confirmation"
 msgstr "Скинути підтвердження"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11882,7 +12232,7 @@ msgstr "Вирішено"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "Ресурс"
@@ -11897,15 +12247,15 @@ msgstr "Час відповіді"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "Результат"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "Результат БРЕХНЯ"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "Результат ПРАВДА"
 
@@ -11918,7 +12268,8 @@ msgstr "Результат для \"%s\""
 msgid "Result type"
 msgstr "Тип результату"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11926,60 +12277,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "Залишилось повторних спроб"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "Повторити"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "З правого боку"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "Об'єднати рядки"
 
@@ -11987,11 +12347,11 @@ msgstr "Об'єднати рядки"
 msgid "Rows"
 msgstr "Рядків"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "Рядків на сторінку"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "Правила"
 
@@ -12036,20 +12396,20 @@ msgid "Run remote commands on hosts"
 msgstr "Виконати віддалені команди на вузлах мережі"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "Російська (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Нд"
@@ -12065,7 +12425,7 @@ msgstr "КОМПЛЕКСНІ ЕКРАНИ"
 msgid "SEARCH"
 msgstr "ПОШУК"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "СЕРВЕР"
 
@@ -12080,13 +12440,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "СЛАЙДШОУ"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "SMS"
 
@@ -12095,17 +12455,17 @@ msgstr "SMS"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP адрес електронної пошти"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP привітання (helo)"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP сервер"
@@ -12121,7 +12481,7 @@ msgstr "SNMP Key"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -12133,9 +12493,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMP інтерфейси"
@@ -12144,7 +12504,7 @@ msgstr "SNMP інтерфейси"
 msgid "SNMP trap"
 msgstr "SNMP трап"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "Ключ SNMP trap помилковий."
 
@@ -12168,7 +12528,7 @@ msgstr "SNMPv3 агент"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "Кількість SQL: %s (selects: %s | executes: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -12186,7 +12546,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Помилка при виконанні SQL запиту \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12195,15 +12555,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH агент"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "СТАН ВИЯВЛЕННЯ"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "СТАН ТРИГЕРІВ"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "СТАН ВЕБ МОНІТОРИНГУ"
 
@@ -12211,92 +12591,92 @@ msgstr "СТАН ВЕБ МОНІТОРИНГУ"
 msgid "STATUS OF ZABBIX"
 msgstr "СТАН ZABBIX"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "Суб"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "Субота"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "Зберегти"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "Зберегти і повернутися"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Період"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "Сценарій"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "Сценарій додано"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "Сценарій оновлено"
 
@@ -12308,7 +12688,7 @@ msgstr "Сценарії"
 msgid "Schedule"
 msgstr "Заплановано"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12319,126 +12699,125 @@ msgstr ""
 msgid "Screen"
 msgstr "Комплексний екран"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "Комплексний екран \"%1$s\" додано."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "Комплексний екран \"%1$s\" вже існує в шаблоні \"%2$2\"."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "Комплексний екран \"%1$s\" вже існує."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "Комплексний екран \"%1$s\" пропущено - правило користувача."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "Комплексний екран \"%1$s\" оновлено."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "Комплексний екран додано"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "Налаштування елемента комплексного екрану"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "Комплексний екран видалено"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "Комплексний екран повинен містити як мінімум один рядок та стовпчик."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "Комплексний екран оновлено"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "Комплексні екрани"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "Скрипт"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "Скрипт додано"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "Скрипт видалено"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "Назва скрипта"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12447,17 +12826,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "Профілювання скрипта"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "Скрипт оновлено"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "Скрипти"
 
@@ -12478,7 +12857,7 @@ msgstr "Шаблон пошуку пустий"
 msgid "Search/Filter elements limit"
 msgstr "Ліміт елементів в пошуку/фільтрі"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "Другий"
 
@@ -12510,7 +12889,7 @@ msgstr "Другорядний телефон B для контакту"
 msgid "Secondary POC screen name"
 msgstr "Другорядне нік-ім'я для контакту"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "Секунд"
 
@@ -12529,69 +12908,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "Вибрати"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "Обрати прототип"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "Відібрати рядки, які В ЗНАЧЕННІ містять"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "Відібрані"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "Вибрані дії видалено"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "Вибрані елементи"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "Вибрані групи"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "Вибрані вузли мережі"
 
@@ -12607,7 +12993,7 @@ msgstr "Надіслати повідомлення групі користув�
 msgid "Send message to users"
 msgstr "Надіслати повідомлення користувачам"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "Надіслати тільки на"
 
@@ -12615,11 +13001,11 @@ msgstr "Надіслати тільки на"
 msgid "Send to"
 msgstr "Надіслати"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "Надіслати групі користувачів"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "Надіслати користувачам"
 
@@ -12628,17 +13014,17 @@ msgstr "Надіслати користувачам"
 msgid "Sent"
 msgstr "Надіслано"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "Вер"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "Непідтверджені окремо"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "Вересень"
 
@@ -12650,7 +13036,7 @@ msgstr "Серійний номер А"
 msgid "Serial number B"
 msgstr "Серійний номер Б"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "Сервер"
@@ -12659,44 +13045,44 @@ msgstr "Сервер"
 msgid "Server info"
 msgstr "Інформація про сервер"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "Час на сервері"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "Послуга"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "Послуга \"%1$s\" не може бути видалена, тому що інша послуга залежить від неї."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "Послуга \"%1$s\" не може залежати сама від себе."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "Послуга \"%1$s\" не може бути пов'язана з тригером і бути підлеглою одночасно."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "Послуга \"%1$s\" вже жорстко з'єднана з іншою послугою."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "Послуга не може бути батьківською та підлеглою одночасно."
 
@@ -12712,11 +13098,11 @@ msgstr "Послугу видалено"
 msgid "Service port"
 msgstr "Порт сервісу"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "Час початку послуги має бути меншим за час закінчення."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "Періоди послуги"
 
@@ -12728,49 +13114,55 @@ msgstr "Тип сервісу"
 msgid "Service updated"
 msgstr "Послугу оновлено"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "Послуги"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "Послуги утворюють кільцеву залежність."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "Сесія завершилась, будь-ласка повторно увійдіть в систему."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "Важливість"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "Важливість (в порядку спадання)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "Ім'я важливості не може бути пустим."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "Відобразити"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "Відображувати все"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "Відображувати деталі"
 
@@ -12800,35 +13192,36 @@ msgstr "Відображувати події не старше ніж (в дн�
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "Відображувати події не старше ніж (в днях) \"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "Відображувати вузли мережі в періодах сервісу"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "Відображувати елементи даних, які в імені містять"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "Відображувати елементи даних без історії"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "Відображувати легенду"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "Відображувати лінії"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "Відобразити тільки відібрані"
 
@@ -12836,19 +13229,24 @@ msgstr "Відобразити тільки відібрані"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "Відобразити текст у вигляді HTML"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "Відображувати тригери"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "Відображувати тільки не підтверджені"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "Відображувати значення"
@@ -12857,11 +13255,11 @@ msgstr "Відображувати значення"
 msgid "Show warning if Zabbix server is down"
 msgstr "Відображувати попередження, якщо Zabbix сервер недоступний"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "Відображувати робочий час"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "Показана"
 
@@ -12881,6 +13279,10 @@ msgstr "Проста перевірка"
 msgid "Simple graph"
 msgstr "Простий графік"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "Поштовий індекс"
@@ -12918,7 +13320,7 @@ msgid "Site state / province"
 msgstr "Область / район"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12936,16 +13338,16 @@ msgstr "Пропущено копіювання графіку \"%1$s\" у ву�
 msgid "Slide"
 msgstr "Слайд"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "Слайдшоу"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "Слайдшоу \"%s\" вже існує."
@@ -12954,11 +13356,11 @@ msgstr "Слайдшоу \"%s\" вже існує."
 msgid "Slide show added"
 msgstr "Слайдшоу додано"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "Слайдшоу видалено"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "Слайдшоу повинно містити слайди."
 
@@ -12966,10 +13368,10 @@ msgstr "Слайдшоу повинно містити слайди."
 msgid "Slide show updated"
 msgstr "Слайдшоу оновлено"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "Слайдшоу"
 
@@ -12977,15 +13379,15 @@ msgstr "Слайдшоу"
 msgid "Slides"
 msgstr "Слайди"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "Словацька (sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Подрімати"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "Не жорстка"
 
@@ -13018,28 +13420,28 @@ msgid "Software application E"
 msgstr "Програмне забезпечення E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "Сортування за"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "Порядок сортування (0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "Сортувати тригери за"
 
@@ -13052,11 +13454,11 @@ msgstr "Сортування по полю \"%1$s\" не дозволено."
 msgid "Source"
 msgstr "Джерело"
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "Іспанська (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "Вказаний скрипт не існує або ви не маєте до нього доступу для команди операції дії."
 
@@ -13064,63 +13466,63 @@ msgstr "Вказаний скрипт не існує або ви не маєт�
 msgid "Speed"
 msgstr "Швидкість"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "Накладається шарами в стек"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "Стандартні елементи даних"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "Початок в"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "Стан"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "Стан"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "Статус (в порядку зростання)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "Статус (в порядку спадання)"
 
@@ -13133,7 +13535,7 @@ msgstr "Підрахунок статусу"
 msgid "Status calculation algorithm"
 msgstr "Алгоритм підрахунку статусу"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "Коди станів"
 
@@ -13142,7 +13544,7 @@ msgid "Status of Web monitoring"
 msgstr "Стан Веб моніторингу"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Стан Zabbix"
 
@@ -13159,40 +13561,40 @@ msgid "Status only"
 msgstr "Тільки статус"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "Крок"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "Крок \"%1$s\" [%2$s з %3$s] помилковий: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "Тривалість кроку"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "Крок сценарію"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "Кроки"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "Стоп"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "Зберігати значення"
@@ -13201,11 +13603,11 @@ msgstr "Зберігати значення"
 msgid "Straight"
 msgstr "Straight"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "Спосіб"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "Суб-фільтр [впливає тільки на відфільтровані дані!]"
 
@@ -13213,11 +13615,11 @@ msgstr "Суб-фільтр [впливає тільки на відфільтр
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "Тема"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "Суб-карта"
 
@@ -13226,32 +13628,32 @@ msgid "Success Audit"
 msgstr "Аудит успіхів"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "Сума значень за період T є < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "Сума значень за період T = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "Сума значень за період T > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "Сума значень за період T НЕ є N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "Нед"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "Неділя"
 
@@ -13259,27 +13661,27 @@ msgstr "Неділя"
 msgid "Support"
 msgstr "Підтримка"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "Прізвище"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "Шведська (sv_SE)"
 
@@ -13287,16 +13689,16 @@ msgstr "Шведська (sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "Переключення методу аутентифікації скине всі сесії за виключенням цієї! Продовжити?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "Системна по замовчуванню"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "Системна помилка."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13305,21 +13707,21 @@ msgid "System status"
 msgstr "Стан системи"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "Т"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -13338,11 +13740,11 @@ msgid "TOTAL"
 msgstr "ВСЬОГО"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "КОМЕНТАРІ ДО ТРИГЕРА"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "ПРАВДА"
 
@@ -13360,14 +13762,14 @@ msgstr "Таблиця \"%1$s\" не має поля з ім'ям \"%2$s\"."
 msgid "Tag"
 msgstr "Тег"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "Ціль"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "Список цілей"
 
@@ -13376,130 +13778,133 @@ msgid "Target type"
 msgstr "Тип цілі"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "Шаблон"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "Шаблон \"%1$s\" вже існує."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Шаблон \"%1$s\" для вузла мережі \"%2$s\" не існує."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "Шаблон додано"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Шаблон не може бути приєднано до іншого шаблону більше ніж один раз, навіть через інші шаблони."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "Шаблон видалено"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "Група шаблону"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "Зв'язки з шаблонами"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "Список шаблонів"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "Ім'я шаблону"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "Комплексні екрани з шаблону"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "Тригер з шаблону"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "Шаблон оновлено"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "Шаблон із цим самим ім'ям \"%s\" вже існує."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "Шаблон із цим самим видимим ім'ям \"%s\" вже існує."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "Елементи даних з шаблону"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "Шаблони"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "Шаблони \"%1$s\" від'єднано від вузлів мережі \"%2$s\"."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Тера"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "Тест"
 
@@ -13507,11 +13912,11 @@ msgstr "Тест"
 msgid "Test authentication"
 msgstr "Тест аутентифікації"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "Тест підтвердження"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "Тестові дані"
 
@@ -13525,22 +13930,22 @@ msgid "Test string"
 msgstr "Тестовий рядок"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "Текст (одне поле)"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13548,7 +13953,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13563,12 +13968,12 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -13577,7 +13982,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -13586,7 +13991,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "Елемент даних більш не виявляється і буде видалений через %1$s (%2$s о %3$s)."
@@ -13595,19 +14000,19 @@ msgstr "Елемент даних більш не виявляється і бу
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "Отриманий JSON не являється правильним запитом JSON-RPC."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "Запитувана віддалена процедура не існує / недоступна"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "Тема інтерфейсу"
 
@@ -13620,11 +14025,11 @@ msgstr[1] "Існує \"%1$d\" група з Внутрішнім доступо
 msgstr[2] "Існує \"%1$d\" групи з Внутрішнім доступом до GUI."
 msgstr[3] "Існує \"%1$d\" груп з Внутрішнім доступом до GUI."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "Третій"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "Це поле автоматично заповнюється елементом даних \"%s\"."
@@ -13633,11 +14038,11 @@ msgstr "Це поле автоматично заповнюється елеме
 msgid "This month"
 msgstr "Цей місяць"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "Стовпчик комплексного екрану не порожній. Видалити його?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "Рядок комплексного екрану не порожній. Видалити його?"
 
@@ -13649,27 +14054,27 @@ msgstr "Цей тиждень"
 msgid "This year"
 msgstr "Цей рік"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "Чет"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "Четвер"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "До"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13678,28 +14083,28 @@ msgstr "До"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "Час"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "Час (в порядку зростання)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "Час (в порядку спадання)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13707,54 +14112,54 @@ msgstr ""
 msgid "Time period"
 msgstr "Період часу"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "Зсув часу"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "Тип часу"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "Час очікування"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "Час виникнення (штамп)"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "Штамп часу не відрізняється від часу на Zabbix сервері більш ніж на T секунд, тоді N = 1, 0 - в іншому випадку"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "Штамп часу не відрізняється від часу на Zabbix сервері більш ніж на T секунд, тоді N НЕ є 1, 0 - в іншому випадку"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "Заголовок"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "Для"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "Для встановлення інтерфейсу вузла мережі виберіть один тип елемента даних для всіх елементів даних"
 
@@ -13762,17 +14167,18 @@ msgstr "Для встановлення інтерфейсу вузла мере
 msgid "Today"
 msgstr "Сьогодні"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "По верхньому краю"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "Всього"
 
@@ -13790,7 +14196,7 @@ msgstr "Всього витрачено часу: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "Транзакція не була закрита. Скасування..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "Помилка транспорту."
 
@@ -13807,77 +14213,77 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "Динаміка"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "Тригер"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "Тригер \"%1$s\" вже існує у \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "Тригер \"%1$s\" залежить від тригера \"%2$s\", який не існує."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "Тригер \"%1$s\" пропущено - правило користувача."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "Тригер \"%s\" належить шаблонам з різними приєднаннями."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "Тригер додано"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "Коментарі до тригера"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "Тригер видалено"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
@@ -13886,14 +14292,14 @@ msgstr[2] ""
 msgstr[3] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "Параметри відображення тригера"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13910,11 +14316,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "Умова виразу тригера"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "Вираз тригера повинен містити принаймні одне посилання вузел_мережі:ключ."
 
@@ -13922,7 +14329,7 @@ msgstr "Вираз тригера повинен містити принаймн
 msgid "Trigger form"
 msgstr "Форма тригера"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "Тригер має елементи даних з шаблону \"%1$s\", який не приєднано до вузла мережі."
@@ -13935,12 +14342,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "Тригер з шаблону \"%1$s\" має залежність від тригера з шаблону \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "Трігер щойно було додано. Статус поки що не оновлювався."
 
@@ -13952,29 +14359,29 @@ msgstr "Тип ярлика до тригера"
 msgid "Trigger name"
 msgstr "Ім'я тригера"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "Прототип тригера"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
@@ -13982,7 +14389,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
@@ -13990,18 +14397,18 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "Прототипи тригерів"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -14009,23 +14416,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "Прототипи тригерів для"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "Важливість тригера"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "Важливість тригера"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "Тригер оновлено"
 
@@ -14033,40 +14448,41 @@ msgstr "Тригер оновлено"
 msgid "Trigger value"
 msgstr "Значення тригера"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "Тригери"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "Тригери видалено"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "Інформація по тригерам"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "Масове оновлення"
 
@@ -14074,78 +14490,78 @@ msgstr "Масове оновлення"
 msgid "Triggers overview"
 msgstr "Огляд тригерів"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "Статус тригерів"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "Найбільш активні 100 тригерів"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "Тригери із важливістю"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "Скорочено"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "Спроба читання недоступної властивості \"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "Вів"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "Турецька (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "Має бути обрано два елементи"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "Два елементи даних (\"%1$s\" та \"%2$s\") не можуть заповнювати одне поле \"%3$s\" інвентарних даних вузла мережі, це призвело б до конфлікту."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "Тип"
 
@@ -14153,62 +14569,64 @@ msgstr "Тип"
 msgid "Type (Full details)"
 msgstr "Тип (повні деталі)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "Тип (ОК)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "Тип (в порядку зростання)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "Тип (в порядку спадання)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "Тип калькуляції"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "Тип інформації"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "Тип інформації повинен бути \"Журнал (лог)\" для ключа журналу."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "Тип інформації повинен бути \"Числовий (дробове)\" для агрегованих елементів даних."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "Типи"
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "НЕВІДОМО"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "ДОСТУПНИЙ"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL-запит"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (після входу в систему)"
 
@@ -14224,20 +14642,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLи"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "США (160 символів)"
 
@@ -14245,15 +14673,11 @@ msgstr "США (160 символів)"
 msgid "USER PROFILE"
 msgstr "ПРОФІЛЬ КОРИСТУВАЧА"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "Українська (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "Неможливо вибрати конфігурацію."
 
@@ -14261,7 +14685,7 @@ msgstr "Неможливо вибрати конфігурацію."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "Неможливо завантажити файл, так як \"file_uploads\" відімкнено."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "Непідтверджено"
 
@@ -14274,20 +14698,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "Непідтверджені події ПРОБЛЕМА"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "Тільки непідтверджені"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "Розблокувати вибране"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "Розблокувати вибраних користувачів?"
 
@@ -14296,29 +14720,29 @@ msgstr "Розблокувати вибраних користувачів?"
 msgid "Units"
 msgstr "Одиниця виміру"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14328,23 +14752,20 @@ msgstr "Невідомо"
 msgid "Unknown action"
 msgstr "Невідома дія"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "Невідомий алгоритм розрахунку статусу послуги"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "Невідома функція."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "Невідомий елемент даних вузла мережі, немає цього елемента в обраному вузлі"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "Невідомий вузел мережі, його не представлено в системі"
 
@@ -14356,23 +14777,23 @@ msgstr "Невідомий тип інтерфейсу."
 msgid "Unknown resource"
 msgstr "Невідомий ресурс"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "Невідомий тип"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "Від'єднати"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "Від'єднати та очистити"
 
@@ -14380,61 +14801,61 @@ msgstr "Від'єднати та очистити"
 msgid "Unlink from template"
 msgstr "Від'єднати від шаблону"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "Від'єднати від шаблонів"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "Від'єднано: Група елементів даних \"%1$s\" від \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Від'єднано: Правило виявлення \"%1$s\" від \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "Від'єднано: Графік \"%1$s\" від \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "Від'єднано: Прототип графіка \"%1$s\" від \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "Від'єднано: Елемент даних \"%1$s\" від \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Від'єднано: Прототип елемента даних \"%1$s\" від \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Від'єднано: Тригер \"%1$s\" від \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Від'єднано: Прототип тригера \"%1$s\" від \"%2$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "УВІМК звук"
 
@@ -14448,32 +14869,43 @@ msgstr "Непідтримуване розширення файлу імпор�
 msgid "Unsupported import format \"%1$s\"."
 msgstr "Непідтримуваний формат імпорту \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "Доступно"
@@ -14484,34 +14916,34 @@ msgid "Up"
 msgstr "Доступний"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "Оновити"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "Оновити існуюче"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "Інтервал оновлення"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "Інтервал оновлення (секунди)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "Оновлено"
 
@@ -14519,55 +14951,55 @@ msgstr "Оновлено"
 msgid "Updated status of host"
 msgstr "Оновлено статус вузла мережі"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "Оновлено: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "Оновлено: Група елементів даних \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "Оновлено: Правило виявлення \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "Оновлено: Елемент даних \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "Оновлено: Прототип елемента даних \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "Оновлено: Тригер \"%1$s\" в \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "Оновлено: Прототип тригера \"%1$s\" в \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "Завантажити"
 
@@ -14575,14 +15007,14 @@ msgstr "Завантажити"
 msgid "Upper level maps"
 msgstr "Карти верхнього рівня"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "Доступний"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14590,10 +15022,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "Доступний/Недоступний"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14608,78 +15040,82 @@ msgid "Used in actions"
 msgstr "Використовується в діях"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "Користувач"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "Користувач \"%s\" не може існувати без групи користувачів."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "Користувача додано"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "Користувач не може змінювати тип сам собі"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Користувач не може додати сам себе у відключену групу або в групу з відключеним доступом до Веб-інтерфейсу."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "Користувач не може сам собі змінити доступ до веб-інтерфейсу."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "Користувач не може змінити статус для себе"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "Користувач не може змінити статус сам собі."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "Користувача видалено"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "Група користувачів"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Група користувачів \"%1$s\" використовується в скрипті \"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "Група користувачів \"%s\" вже існує."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
@@ -14687,7 +15123,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14706,34 +15142,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "Групи користувачів"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "Користувачу не дозволено видалити самого себе."
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "Користувач не може модифікувати доступ до GUI для самого себе шляхом введення в групу користувачів \"%s\"."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "Користувач не може модифікувати системний статус для самого себе шляхом введення в групу користувачів \"%s\"."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "Ім'я користувача"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "Ім'я користувача не співпадає з БД"
 
@@ -14759,243 +15195,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "Тип користувача"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "Дані користувача оновлено"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "Користувач з псевдонімом \"%s\" вже існує."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "Користувачі"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "Користувачі (підключені в даний момент)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "Розблоковані користувачі"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "Значення"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "Значення \"%1$s\" являється недопустимим для параметра \"grid_align\". Варіанти: \"%2$s\" та \"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -15030,11 +15466,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -15080,10 +15516,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "Перетворення значень з valuemapid \"%1$s\" не існує."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "Перетворення значень"
 
@@ -15092,7 +15528,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "Перетворення значень повинне мати принаймні одне перетворення."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -15104,8 +15540,8 @@ msgstr "Значення: немає даних"
 msgid "Values"
 msgstr "Значення"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "Змінні"
 
@@ -15118,64 +15554,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "Вертикальний"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "Вирівнювання по вертикалі"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "Перегляд не відтворено."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "Видиме ім'я"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "Видиме ім'я не може бути пустим, якщо ім'я вузла мережі відсутнє."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "Попередження"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Вибачте, але досягнуто максимум для запам'ятовування елементів."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Веб"
 
@@ -15183,22 +15624,24 @@ msgstr "Веб"
 msgid "Web monitoring"
 msgstr "Веб моніторинг"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
@@ -15206,7 +15649,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
@@ -15214,38 +15657,54 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "Сер"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "Середа"
 
@@ -15253,9 +15712,9 @@ msgstr "Середа"
 msgid "Week"
 msgstr "Тиждень"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "Щотижня"
 
@@ -15263,12 +15722,12 @@ msgstr "Щотижня"
 msgid "When active"
 msgstr "Коли активно"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "Ширина"
@@ -15278,28 +15737,28 @@ msgstr "Ширина"
 msgid "With data collection"
 msgstr "Зі збором даних"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "З останньою непідтвердженою подією"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "З проблемами"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "З тригерами"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "З непідтвердженими подіями"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "Без проблем"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "Без тригерів"
 
@@ -15308,7 +15767,7 @@ msgid "Wizard"
 msgstr "Майстер"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15321,180 +15780,165 @@ msgstr "Робочий час"
 msgid "Working time \"%1$s\"."
 msgstr "Робочий час \"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "Запис"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "Помилкові поля для залежності послуги \"%1$s\"."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "Помилкові поля для елемента."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "Помилкові поля для вузла мережі \"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "Помилкові поля для макросу \"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "Помилкові поля для методу повідомлень."
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "Помилкові поля для скрипта."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "Помилкові поля для послуги \"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "Помилкові поля для часу послуги \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "Помилкові поля для тригера."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "Помилкові поля для користувача \"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "Помилковий макрос \"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "Підпис вісі X"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML файл містить помилку %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML файл містить помилки"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML файл містить фатальну помилку %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML файл містить попередження %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Й"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "Максимальне значення вісі Y"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "МАКС значення вісі Y має бути більшим ніж МІН значення вісі Y."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "Мінімальне значення вісі Y"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "Розміщення вісі Y"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Підпис вісі Y"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "d.m.Y H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "d.m.Y H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "d.m.Y"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "d.m.Y H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
 msgstr "d.m.Y H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
@@ -15502,96 +15946,105 @@ msgstr "d.m.Y H:i:s"
 msgid "Year"
 msgstr "Рік"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "Щороку"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "Так"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Йота"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "Ви не можете вибрати деякі з мов, тому що їх локалі не встановлено на веб-сервері."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "Вам не дозволено змінювати привілеї користувача \"%s\"."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "Ви не увійшли в систему."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "Ви не можете перемкнути вузли мережі для поточного вибору."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "Ви не вказали вузел мережі для операції."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "Ви не вказали групу вузлів мережі для операції."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "Ви не вказали цілі для команди \"%s\" в операції дії."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "Ви не вказали цілі глобального скрипта \"%s\" в операції дії."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "У вас немає повноважень для виконання цієї операції."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "У вас немає повноважень для створення користувачів."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "У вас немає повноважень для оновлення інших користувачів."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "У вас немає повноважень для оновлення користувача або користувач не існує."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "Ви маєте увійти в систему для перегляду цієї сторінки."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "З"
@@ -15604,7 +16057,7 @@ msgstr "ZABBIX"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15623,8 +16076,8 @@ msgid "Zabbix User"
 msgstr "Zabbix Користувач"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15650,10 +16103,11 @@ msgstr "Zabbix внутрішні"
 msgid "Zabbix internal authentication"
 msgstr "Внутрішня аутентифікація Zabbix"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "Zabbix сервер"
@@ -15669,7 +16123,7 @@ msgstr ""
 "1. Некоректний IP/DNS сервера в \"zabbix.conf.php\";\n"
 "2. Некоректне налаштування мережі.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "IP адресу або порт Zabbix сервера не задано!"
 
@@ -15677,15 +16131,15 @@ msgstr "IP адресу або порт Zabbix сервера не задано!
 msgid "Zabbix server activity check interval"
 msgstr "Інтервал перевірки активності Zabbix сервера"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Інформація про Zabbix сервер"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix сервер не запущено: відображувана інформація може бути не актуальною."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix сервер в запущеному стані"
 
@@ -15694,11 +16148,11 @@ msgstr "Zabbix сервер в запущеному стані"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Інтервал перевірки працездатності Zabbix сервера \"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Ім'я Zabbix сервера"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Порт Zabbix сервера"
 
@@ -15706,25 +16160,20 @@ msgstr "Порт Zabbix сервера"
 msgid "Zabbix trapper"
 msgstr "Zabbix трапер"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Зетта"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "Період"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[Неправильне значення дня: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[Неправильне значення місяця: \"%s\" ]"
@@ -15733,19 +16182,19 @@ msgstr "[Неправильне значення місяця: \"%s\" ]"
 msgid "agent"
 msgstr "агент"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "всі"
 
@@ -15753,19 +16202,15 @@ msgstr "всі"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "вже існує"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "синім"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "зеленим"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "червоним"
 
@@ -15777,83 +16222,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "сер."
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "д"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d.m.Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d.m.Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d.m.Y H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "днів"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "дд"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15875,19 +16286,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "динаміч."
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "елементи"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "копіювати елементи в ..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from та esc_step_to повинні встановлюватись одночасно."
 
@@ -15899,47 +16306,49 @@ msgstr "точно"
 msgid "executed"
 msgstr "виконано"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "фіксов."
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "знайдених"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "г"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "гг"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "вузел мережі"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "група вузлів мережі"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "іконка"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "картинка"
 
@@ -15947,7 +16356,7 @@ msgstr "картинка"
 msgid "in"
 msgstr "в"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15957,7 +16366,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "є"
 
@@ -15965,20 +16374,20 @@ msgstr "є"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "ост."
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "містить"
@@ -15987,12 +16396,12 @@ msgstr "містить"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "м"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -16001,46 +16410,46 @@ msgstr "м"
 msgid "macro(s)"
 msgstr "макрос(и)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "сервіс"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "карта мережі"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "макс."
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "мін."
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "мінімум 60 секунд"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "мм"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "мс"
@@ -16049,17 +16458,17 @@ msgstr "мс"
 msgid "must be a valid LDAP user"
 msgstr "має бути дійсним користувачем LDAP"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "немає даних"
@@ -16072,12 +16481,14 @@ msgstr "не в"
 msgid "not like"
 msgstr "не містить"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "не запущено"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "не обрано"
 
@@ -16086,57 +16497,61 @@ msgstr "не обрано"
 msgid "not sent"
 msgstr "не надіслано"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "зараз"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "із"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "в"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "інший"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "оновлення кожні"
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -16145,25 +16560,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "запам'ятати обране"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "корінь"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "запущено"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "с"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "сек."
 
@@ -16176,7 +16590,7 @@ msgstr "секунд"
 msgid "sent"
 msgstr "надіслано"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "короткий опис"
 
@@ -16184,36 +16598,36 @@ msgstr "короткий опис"
 msgid "show icon mappings"
 msgstr "показати призначення іконок"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "перетворення значень"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "шаблон з ID \"%1$s\" передано %2$s разів"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "до"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "тригер"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "невідомо"
 
@@ -16225,11 +16639,11 @@ msgstr "значення"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "р"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "рррр"
diff --git a/frontends/php/locale/vi/LC_MESSAGES/frontend.po b/frontends/php/locale/vi/LC_MESSAGES/frontend.po
new file mode 100644
index 00000000000..bdead640d1c
--- /dev/null
+++ b/frontends/php/locale/vi/LC_MESSAGES/frontend.po
@@ -0,0 +1,16395 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Zabbix 2.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
+"PO-Revision-Date: 2013-11-04 19:10+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: Zabbix <info@zabbix.com>\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Basepath: ../../\n"
+
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
+#, c-format
+msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
+msgstr ""
+
+#: include/profiles.inc.php:97
+msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
+msgstr ""
+
+#: include/profiles.inc.php:102
+msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
+msgstr ""
+
+#: include/func.inc.php:453
+#, c-format
+msgid "%1$d day"
+msgid_plural "%1$d days"
+msgstr[0] ""
+
+#: include/blocks.inc.php:1125
+#, c-format
+msgid "%1$d of %2$d issue is shown"
+msgid_plural "%1$d of %2$d issues are shown"
+msgstr[0] ""
+
+#: chart4.php:89 chart5.php:83
+#, c-format
+msgid "%1$s (year %2$s)"
+msgstr ""
+
+#: latest.php:559 latest.php:731
+#, c-format
+msgid "%1$s Item"
+msgid_plural "%1$s Items"
+msgstr[0] ""
+
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
+#, c-format
+msgid "%1$s day"
+msgid_plural "%1$s days"
+msgstr[0] ""
+
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
+#, c-format
+msgid "%1$s minute"
+msgid_plural "%1$s minutes"
+msgstr[0] ""
+
+#: include/classes/screens/CScreenActions.php:151
+#: include/views/administration.auditacts.list.php:90
+#, c-format
+msgid "%1$s retry left"
+msgid_plural "%1$s retries left"
+msgstr[0] ""
+
+#: jsLoader.php:222 jsLoader.php:223
+#, c-format
+msgid "%1$s second"
+msgid_plural "%1$s seconds"
+msgstr[0] ""
+
+#: include/page_header.php:344
+#, c-format
+msgid "%4$s failed login attempt logged. Last failed attempt was from %1$s on %2$s at %3$s."
+msgid_plural "%4$s failed login attempts logged. Last failed attempt was from %1$s on %2$s at %3$s."
+msgstr[0] ""
+
+#: include/views/monitoring.discovery.php:130
+#, c-format
+msgid "%d device"
+msgid_plural "%d devices"
+msgstr[0] ""
+
+#: include/users.inc.php:247
+#, c-format
+msgctxt "user fullname"
+msgid "(%1$s %2$s)"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:484
+msgid "(0 - infinitely)"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:217
+#: include/views/configuration.hostgroups.list.php:31
+#: include/views/configuration.template.edit.php:121
+msgid "(Only super admins can create groups)"
+msgstr ""
+
+#: include/forms.inc.php:580 include/forms.inc.php:595
+msgid "(in days)"
+msgstr ""
+
+#: include/forms.inc.php:428
+msgid "(in sec)"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:495
+msgid "(minimum 60 seconds, 0 - use action default)"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
+msgid "(no proxy)"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:244
+msgid "(with warnings)"
+msgstr ""
+
+#: include/blocks.inc.php:1326
+msgid "-"
+msgstr ""
+
+#: acknow.php:134
+msgid "----[BULK ACKNOWLEDGE]----"
+msgstr ""
+
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
+msgid "0 or 1"
+msgstr ""
+
+#: queue.php:105 queue.php:153
+msgid "1 minute"
+msgstr ""
+
+#: queue.php:103 queue.php:151
+msgid "10 seconds"
+msgstr ""
+
+#: queue.php:104 queue.php:152
+msgid "30 seconds"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:221
+msgid "3D view"
+msgstr ""
+
+#: queue.php:106 queue.php:154
+msgid "5 minutes"
+msgstr ""
+
+#: queue.php:102 queue.php:150
+msgid "5 seconds"
+msgstr ""
+
+#: include/views/monitoring.history.php:64
+msgid "500 latest values"
+msgstr ""
+
+#: include/views/administration.script.edit.php:40
+msgid "<Sub-menu/Sub-menu.../>Script"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:55
+msgid "<manual>"
+msgstr ""
+
+#: include/views/administration.auditacts.list.php:31
+msgid "ACTION LOG"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:144
+#: include/views/configuration.item.edit.php:150
+#: include/views/configuration.item.massupdate.php:172
+#: include/views/js/configuration.discovery.edit.js.php:95
+msgid "AES"
+msgstr ""
+
+#: acknow.php:194
+msgid "ALARM ACKNOWLEDGES"
+msgstr ""
+
+#: tr_logform.php:262
+msgid "AND"
+msgstr ""
+
+#: include/views/administration.auditlogs.list.php:31
+msgid "AUDIT LOG"
+msgstr ""
+
+#: report2.php:163
+msgid "AVAILABILITY REPORT"
+msgstr ""
+
+#: popup_trexpr.php:129
+msgid "Absolute difference between last and previous value is < N"
+msgstr ""
+
+#: popup_trexpr.php:137
+msgid "Absolute difference between last and previous value is = N"
+msgstr ""
+
+#: popup_trexpr.php:133
+msgid "Absolute difference between last and previous value is > N"
+msgstr ""
+
+#: popup_trexpr.php:141
+msgid "Absolute difference between last and previous value is NOT N"
+msgstr ""
+
+#: report3.php:83 srv_status.php:143
+msgid "Acceptable SLA"
+msgstr ""
+
+#: sysmap.php:76
+msgid "Access denied!"
+msgstr ""
+
+#: include/func.inc.php:1665
+msgid "Access denied."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:988
+#, c-format
+msgid "Account is blocked for %s seconds"
+msgstr ""
+
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
+msgid "Ack"
+msgstr ""
+
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
+msgid "Acknowledge"
+msgstr ""
+
+#: acknow.php:160
+msgid "Acknowledge added"
+msgstr ""
+
+#: acknow.php:199 acknow.php:232
+msgid "Acknowledge alarm by"
+msgstr ""
+
+#: acknow.php:200 acknow.php:234
+msgid "Acknowledge and return"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:45
+msgid "Acknowledge status"
+msgstr ""
+
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
+msgid "Acknowledged"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:83
+msgid "Acknowledged OK events"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:49
+msgid "Acknowledged PROBLEM events"
+msgstr ""
+
+#: acknow.php:27 tr_events.php:118
+msgid "Acknowledges"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:127
+msgid "Acknowledging disabled"
+msgstr ""
+
+#: include/audit.inc.php:28 include/classes/screens/CScreenActions.php:129
+#: include/views/administration.auditacts.list.php:70
+#: include/views/administration.auditlogs.list.php:62
+#: include/views/administration.auditlogs.list.php:89
+#: include/views/configuration.action.edit.php:72
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
+#: include/views/configuration.host.discovery.edit.php:198
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.item.edit.php:265
+#: include/views/configuration.item.massupdate.php:321
+#: include/views/configuration.maintenance.edit.php:103
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.slideconf.edit.php:52
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
+msgid "Action"
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
+#, c-format
+msgid "Action \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
+#, c-format
+msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2317
+#, c-format
+msgid "Action \"%1$s\" no operations defined."
+msgstr ""
+
+#: actionconf.php:162
+msgid "Action added"
+msgstr ""
+
+#: actionconf.php:186
+msgid "Action deleted"
+msgstr ""
+
+#: actionconf.php:338
+msgid "Action disabled"
+msgid_plural "Actions disabled"
+msgstr[0] ""
+
+#: actionconf.php:337
+msgid "Action enabled"
+msgid_plural "Actions enabled"
+msgstr[0] ""
+
+#: auditacts.php:27 include/screens.inc.php:31
+#: include/views/administration.auditacts.list.php:29
+#: include/views/administration.auditacts.list.php:32
+#: include/views/administration.auditlogs.list.php:29
+msgid "Action log"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:453
+msgid "Action operations"
+msgstr ""
+
+#: actionconf.php:151
+msgid "Action updated"
+msgstr ""
+
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
+#: include/views/configuration.action.list.php:40
+msgid "Actions"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:41
+#: include/views/administration.proxy.list.php:90
+msgid "Active"
+msgstr ""
+
+#: include/views/configuration.maintenance.list.php:63
+msgctxt "maintenance status"
+msgid "Active"
+msgstr ""
+
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
+#: include/views/configuration.maintenance.edit.php:89
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
+msgid "Active since"
+msgstr ""
+
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
+#: include/views/configuration.maintenance.edit.php:90
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
+msgid "Active till"
+msgstr ""
+
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
+#: include/views/administration.auditlogs.list.php:45
+#: include/views/administration.general.iconmap.edit.php:119
+#: include/views/administration.general.regularexpressions.edit.php:47
+#: include/views/administration.general.regularexpressions.edit.php:56
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
+#: include/views/common.macros.php:69
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
+#: include/views/configuration.host.discovery.edit.php:237
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.edit.php:304
+#: include/views/configuration.item.massupdate.php:366
+#: include/views/configuration.maintenance.edit.php:141
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
+#: include/views/configuration.slideconf.edit.php:87
+#: include/views/configuration.sysmap.edit.php:173
+#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.triggers.edit.php:81
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
+#: include/views/js/adm.regexprs.edit.js.php:249
+#: include/views/js/configuration.action.edit.js.php:313
+#: include/views/js/configuration.discovery.edit.js.php:110
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
+msgid "Add"
+msgstr ""
+
+#: jsLoader.php:182
+msgid "Add child"
+msgstr ""
+
+#: acknow.php:227
+msgid "Add comment by"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:28
+msgid "Add element"
+msgstr ""
+
+#: include/actions.inc.php:379 include/actions.inc.php:608
+msgid "Add host"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:33
+msgid "Add link"
+msgstr ""
+
+#: include/views/configuration.item.massupdate.php:546
+msgid "Add new or existing applications"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:119
+msgid "Add new or existing host groups"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:251
+msgid "Add prototype"
+msgstr ""
+
+#: slides.php:159
+msgid "Add to"
+msgstr ""
+
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
+#: screens.php:117
+msgid "Add to favourites"
+msgstr ""
+
+#: include/actions.inc.php:612
+msgid "Add to host group"
+msgstr ""
+
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
+msgid "Add to host groups"
+msgstr ""
+
+#: auditlogs.php:128
+msgid "Added"
+msgstr ""
+
+#: include/hosts.inc.php:69
+msgid "Admin"
+msgstr ""
+
+#: include/menu.inc.php:212
+msgid "Administration"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:67
+msgid "Advanced labels"
+msgstr ""
+
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
+#: include/events.inc.php:196 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:305
+msgid "Age"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:92
+msgid "Age less than"
+msgstr ""
+
+#: include/views/monitoring.overview.triggers.php:58
+#, c-format
+msgid "Age less than %s"
+msgstr ""
+
+#: include/items.inc.php:280 include/views/administration.script.list.php:63
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
+msgid "Agent"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:65
+#: include/classes/items/CHelpItems.php:315
+msgid "Agent host name defined in the configuration file. String value."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
+#: include/views/inventory.host.view.php:103
+msgid "Agent interfaces"
+msgstr ""
+
+#: hosts.php:59
+msgid "Agent or SNMP or JMX or IPMI interface"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:577
+msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
+msgstr ""
+
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
+msgid "Alias"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:56
+msgid "Align icons"
+msgstr ""
+
+#: include/reports.inc.php:329
+#: include/views/administration.auditlogs.list.php:42
+#: include/views/administration.auditlogs.list.php:52
+#: include/views/administration.general.gui.edit.php:28
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
+#: include/views/administration.script.list.php:80
+#: include/views/administration.script.list.php:81
+#: include/views/administration.usergroups.edit.php:44
+#: include/views/administration.users.list.php:36
+#: include/views/configuration.action.edit.php:604
+#: include/views/configuration.hostgroups.edit.php:44
+#: include/views/configuration.sysmap.edit.php:121
+#: include/views/monitoring.dashconf.php:48
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
+msgid "All"
+msgstr ""
+
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
+msgid "All groups"
+msgstr ""
+
+#: jsLoader.php:152
+msgid "All links should have \"Name\" and \"URL\" specified"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:249
+#: include/views/configuration.item.edit.php:387
+#: include/views/configuration.item.massupdate.php:457
+msgid "Allowed hosts"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:293
+#: include/classes/items/CHelpItems.php:555
+msgid "Amount of memory size in bytes. If mode is missing total is used."
+msgstr ""
+
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
+msgid "And"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
+#: include/views/configuration.host.discovery.edit.php:277
+msgid "And/Or"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
+msgid "Any"
+msgstr ""
+
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
+msgid "Any character string included"
+msgstr ""
+
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
+#: include/views/configuration.application.edit.php:46
+#: include/views/configuration.application.list.php:61
+#: include/views/configuration.httpconf.edit.php:64
+#: include/views/configuration.httpconf.edit.php:69
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
+msgid "Application"
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:350
+#, c-format
+msgid "Application \"%1$s\" already exists."
+msgstr ""
+
+#: applications.php:110
+msgid "Application added"
+msgstr ""
+
+#: applications.php:162 applications.php:202
+msgid "Application deleted"
+msgid_plural "Applications deleted"
+msgstr[0] ""
+
+#: include/classes/core/CJsonRpc.php:194
+msgid "Application error."
+msgstr ""
+
+#: applications.php:103
+msgid "Application updated"
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:397
+#, c-format
+msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
+msgstr ""
+
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
+#: include/views/configuration.application.list.php:47
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
+#: include/views/configuration.item.list.php:70
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
+msgid "Applications"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
+msgid "Apply"
+msgstr ""
+
+#: include/views/configuration.maintenance.list.php:60
+msgctxt "maintenance status"
+msgid "Approaching"
+msgstr ""
+
+#: include/func.inc.php:240
+msgid "Apr"
+msgstr ""
+
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
+msgid "April"
+msgstr ""
+
+#: include/classes/html/CButtonQMessage.php:48
+msgid "Are you sure you want perform this action?"
+msgstr ""
+
+#: include/views/js/common.macros.js.php:36
+msgid "Are you sure you want to delete"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:50
+msgid "Area size"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:38
+msgid "Area type"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
+#: include/views/configuration.item.massupdate.php:424
+#: include/views/configuration.item.massupdate.php:438
+msgid "As is"
+msgstr ""
+
+#: include/views/monitoring.history.php:68
+msgid "As plain text"
+msgstr ""
+
+#: include/hosts.inc.php:155
+msgid "Asset tag"
+msgstr ""
+
+#: include/maintenances.inc.php:118
+#, c-format
+msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
+msgstr ""
+
+#: include/maintenances.inc.php:127
+#, c-format
+msgid "At %1$s:%2$s on day %3$s of every %4$s"
+msgstr ""
+
+#: include/maintenances.inc.php:76
+#, c-format
+msgid "At %1$s:%2$s on every %3$s of every week"
+msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
+msgstr[0] ""
+
+#: include/maintenances.inc.php:56
+#, c-format
+msgid "At %1$s:%2$s on every day"
+msgid_plural "At %1$s:%2$s on every %3$s days"
+msgstr[0] ""
+
+#: include/forms.inc.php:1765
+msgid "At (hour:minute)"
+msgstr ""
+
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
+msgid "At least one host or group should be selected."
+msgstr ""
+
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
+msgid "At least one maintenance period must be created."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:228
+msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
+msgstr ""
+
+#: include/menu.inc.php:255
+#: include/views/administration.general.housekeeper.edit.php:100
+msgid "Audit"
+msgstr ""
+
+#: adm.housekeeper.php:51
+msgid "Audit data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:110
+#, c-format
+msgid "Audit data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: auditlogs.php:27 include/views/administration.auditacts.list.php:28
+#: include/views/administration.auditlogs.list.php:28
+#: include/views/administration.auditlogs.list.php:32
+msgid "Audit log"
+msgstr ""
+
+#: include/func.inc.php:244
+msgid "Aug"
+msgstr ""
+
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
+msgid "August"
+msgstr ""
+
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
+msgid "Authentication"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
+msgid "Authentication algorithm"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:757
+#: include/views/configuration.host.discovery.edit.php:166
+#: include/views/configuration.item.edit.php:172
+#: include/views/configuration.item.massupdate.php:250
+msgid "Authentication method"
+msgstr ""
+
+#: authentication.php:181
+msgid "Authentication method changed to HTTP"
+msgstr ""
+
+#: authentication.php:131
+msgid "Authentication method changed to LDAP"
+msgstr ""
+
+#: authentication.php:77
+msgid "Authentication method changed to Zabbix internal"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:136
+#: include/views/configuration.item.edit.php:142
+#: include/views/configuration.item.massupdate.php:159
+#: include/views/js/configuration.discovery.edit.js.php:83
+msgid "Authentication passphrase"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:132
+#: include/views/configuration.item.edit.php:138
+#: include/views/configuration.item.massupdate.php:149
+#: include/views/js/configuration.discovery.edit.js.php:71
+#: include/views/js/configuration.discovery.edit.js.php:88
+msgid "Authentication protocol"
+msgstr ""
+
+#: include/views/configuration.action.list.php:35
+msgid "Auto registration"
+msgstr ""
+
+#: include/views/administration.users.edit.php:164
+msgid "Auto-login"
+msgstr ""
+
+#: include/views/administration.users.edit.php:165 profile.php:50 users.php:61
+msgid "Auto-logout (min 90 seconds)"
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:57
+msgid "Auto-registration data storage period (in days)"
+msgstr ""
+
+#: adm.housekeeper.php:43
+msgid "Auto-registration event and alert data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:108
+#, c-format
+msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
+msgid "Automatic"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:61
+msgid "Automatic icon mapping"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
+msgid "Automatic icon selection"
+msgstr ""
+
+#: hosts.php:871
+msgid "Availability"
+msgstr ""
+
+#: include/menu.inc.php:125 report2.php:26
+msgid "Availability report"
+msgstr ""
+
+#: include/classes/html/CHostsInfo.php:118
+msgid "Available"
+msgstr ""
+
+#: adm.triggerseverities.php:60
+#: include/views/administration.general.triggerSeverity.edit.php:52
+msgid "Average"
+msgstr ""
+
+#: include/reports.inc.php:398
+msgid "Average by"
+msgstr ""
+
+#: popup_trexpr.php:145
+msgid "Average value of a period T is < N"
+msgstr ""
+
+#: popup_trexpr.php:155
+msgid "Average value of a period T is = N"
+msgstr ""
+
+#: popup_trexpr.php:150
+msgid "Average value of a period T is > N"
+msgstr ""
+
+#: popup_trexpr.php:160
+msgid "Average value of a period T is NOT N"
+msgstr ""
+
+#: popup_bitem.php:166
+msgid "Axis side"
+msgstr ""
+
+#: include/func.inc.php:421
+msgctxt "Byte short"
+msgid "B"
+msgstr ""
+
+#: include/views/administration.general.image.edit.php:46
+#: include/views/administration.general.image.list.php:25
+msgid "Background"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:51
+msgid "Background image"
+msgstr ""
+
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
+msgid "Bar reports"
+msgstr ""
+
+#: authentication.php:42
+#: include/views/administration.authentication.edit.php:75
+msgid "Base DN"
+msgstr ""
+
+#: include/httptest.inc.php:28
+msgid "Basic"
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:91
+msgid "Bind DN"
+msgstr ""
+
+#: authentication.php:45
+#: include/views/administration.authentication.edit.php:99
+#: include/views/administration.authentication.edit.php:105
+msgid "Bind password"
+msgstr ""
+
+#: popup_trexpr.php:511
+msgid "Bitwise AND of last (most recent) T value and mask is = N"
+msgstr ""
+
+#: popup_trexpr.php:516
+msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
+msgstr ""
+
+#: include/classes/core/ZBase.php:251
+msgid "Black & Blue"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:28
+msgid "Blinking"
+msgstr ""
+
+#: include/views/administration.users.list.php:84
+msgid "Blocked"
+msgstr ""
+
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
+msgid "Bold line"
+msgstr ""
+
+#: include/items.inc.php:136
+msgid "Boolean"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:714
+#: include/views/configuration.sysmap.edit.php:115
+#: include/views/js/configuration.sysmaps.js.php:83
+#: include/views/js/configuration.sysmaps.js.php:248
+msgid "Bottom"
+msgstr ""
+
+#: include/reports.inc.php:436
+msgid "Brighten"
+msgstr ""
+
+#: include/locales.inc.php:56
+msgid "Bulgarian (bg_BG)"
+msgstr ""
+
+#: tr_status.php:829
+msgid "Bulk acknowledge"
+msgstr ""
+
+#: report2.php:187
+msgid "By host"
+msgstr ""
+
+#: report2.php:188
+msgid "By trigger template"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:25
+#: include/views/configuration.action.list.php:29
+msgid "CONFIGURATION OF ACTIONS"
+msgstr ""
+
+#: include/views/configuration.application.edit.php:23
+#: include/views/configuration.application.list.php:40
+msgid "CONFIGURATION OF APPLICATIONS"
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:23
+msgid "CONFIGURATION OF AUTHENTICATION"
+msgstr ""
+
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
+#: include/views/configuration.discovery.list.php:28
+#: include/views/configuration.host.discovery.list.php:29
+msgid "CONFIGURATION OF DISCOVERY RULES"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:25
+#: include/views/configuration.graph.list.php:31
+msgid "CONFIGURATION OF GRAPH PROTOTYPES"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:29
+#: include/views/configuration.graph.list.php:50
+msgid "CONFIGURATION OF GRAPHS"
+msgstr ""
+
+#: adm.gui.php:110
+msgid "CONFIGURATION OF GUI"
+msgstr ""
+
+#: include/views/configuration.hostgroups.edit.php:23
+#: include/views/configuration.hostgroups.list.php:36
+msgid "CONFIGURATION OF HOST GROUPS"
+msgstr ""
+
+#: include/views/configuration.host.prototype.edit.php:30
+#: include/views/configuration.host.prototype.list.php:31
+msgid "CONFIGURATION OF HOST PROTOTYPES"
+msgstr ""
+
+#: hosts.php:701 hosts.php:766 hosts.php:818
+msgid "CONFIGURATION OF HOSTS"
+msgstr ""
+
+#: adm.housekeeper.php:141
+msgid "CONFIGURATION OF HOUSEKEEPING"
+msgstr ""
+
+#: adm.iconmapping.php:130
+msgid "CONFIGURATION OF ICON MAPPING"
+msgstr ""
+
+#: adm.images.php:155
+msgid "CONFIGURATION OF IMAGES"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:30
+#: include/views/configuration.services.list.php:23
+msgid "CONFIGURATION OF IT SERVICES"
+msgstr ""
+
+#: disc_prototypes.php:366
+#: include/views/configuration.item.prototype.list.php:29
+msgid "CONFIGURATION OF ITEM PROTOTYPES"
+msgstr ""
+
+#: include/views/configuration.item.list.php:39
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
+msgid "CONFIGURATION OF ITEMS"
+msgstr ""
+
+#: adm.macros.php:173
+msgid "CONFIGURATION OF MACROS"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:23
+#: include/views/configuration.maintenance.list.php:28
+msgid "CONFIGURATION OF MAINTENANCE PERIODS"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:23
+#: include/views/administration.mediatypes.list.php:27
+msgid "CONFIGURATION OF MEDIA TYPES"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:25
+#: include/views/configuration.sysmap.edit.php:25
+#: include/views/configuration.sysmap.list.php:30
+msgid "CONFIGURATION OF NETWORK MAPS"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:23
+#: include/views/administration.proxy.list.php:28
+msgid "CONFIGURATION OF PROXIES"
+msgstr ""
+
+#: adm.regexps.php:220
+msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.list.php:23
+#: include/views/configuration.screen.edit.php:23
+#: include/views/configuration.screen.list.php:35
+msgid "CONFIGURATION OF SCREENS"
+msgstr ""
+
+#: include/views/administration.script.edit.php:25
+#: include/views/administration.script.list.php:27
+msgid "CONFIGURATION OF SCRIPTS"
+msgstr ""
+
+#: include/views/configuration.slideconf.edit.php:25
+#: include/views/configuration.slideconf.list.php:28
+msgid "CONFIGURATION OF SLIDE SHOWS"
+msgstr ""
+
+#: templates.php:435 templates.php:495
+msgid "CONFIGURATION OF TEMPLATES"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:37
+#: include/views/configuration.triggers.list.php:42
+#: include/views/configuration.triggers.massupdate.php:39
+msgid "CONFIGURATION OF TRIGGER PROTOTYPES"
+msgstr ""
+
+#: adm.triggerseverities.php:96
+msgid "CONFIGURATION OF TRIGGER SEVERITIES"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:40
+#: include/views/configuration.triggers.list.php:54
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
+msgid "CONFIGURATION OF TRIGGERS"
+msgstr ""
+
+#: include/views/administration.usergroups.edit.php:23
+#: include/views/administration.usergroups.list.php:31
+msgid "CONFIGURATION OF USER GROUPS"
+msgstr ""
+
+#: include/views/administration.users.edit.php:30
+#: include/views/administration.users.list.php:31
+msgid "CONFIGURATION OF USERS"
+msgstr ""
+
+#: adm.valuemapping.php:147
+msgid "CONFIGURATION OF VALUE MAPPING"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:25
+#: include/views/configuration.httpconf.list.php:39
+msgid "CONFIGURATION OF WEB MONITORING"
+msgstr ""
+
+#: adm.workingtime.php:77
+msgid "CONFIGURATION OF WORKING TIME"
+msgstr ""
+
+#: adm.triggerdisplayoptions.php:91
+msgid "CONFIGURATION OF ZABBIX"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:185
+#: include/classes/items/CHelpItems.php:447
+msgid "CPU info - lists full info for all CPUs by default"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:161
+#: include/classes/items/CHelpItems.php:423
+msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:173
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:265
+#: include/classes/items/CHelpItems.php:527
+msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:66 services.php:44
+msgid "Calculate SLA, acceptable SLA (in %)"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:253
+#: include/classes/items/CHelpItems.php:515
+msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:289
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+msgstr ""
+
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
+msgid "Calculated"
+msgstr ""
+
+#: include/views/administration.usergroups.edit.php:119
+msgid "Calculated permissions"
+msgstr ""
+
+#: include/hosts.inc.php:66
+msgid "Callback"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:89
+msgid "Canada (136 characters)"
+msgstr ""
+
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
+#: include/views/administration.general.regularexpressions.edit.php:58
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
+#: include/views/configuration.maintenance.edit.php:147
+#: include/views/configuration.services.parent.list.php:62
+#: include/views/js/administration.general.housekeeper.edit.js.php:127
+#: include/views/js/administration.general.triggerDisplayOptions.js.php:55
+#: include/views/js/administration.general.triggerSeverity.js.php:38
+#: include/views/js/configuration.action.edit.js.php:102
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
+msgid "Cancel"
+msgstr ""
+
+#: acknow.php:167
+msgid "Cannot acknowledge event"
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
+#, c-format
+msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
+#, c-format
+msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
+msgstr ""
+
+#: include/reports.inc.php:492
+#, c-format
+msgid "Cannot add a non-numeric item \"%1$s\"."
+msgstr ""
+
+#: actionconf.php:163
+msgid "Cannot add action"
+msgstr ""
+
+#: actionconf.php:248
+msgid "Cannot add action condition"
+msgstr ""
+
+#: applications.php:111
+msgid "Cannot add application"
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1373
+msgid "Cannot add dependency from a host to a template."
+msgstr ""
+
+#: include/triggers.inc.php:493
+#, c-format
+msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
+msgstr ""
+
+#: host_discovery.php:297
+msgid "Cannot add discovery rule"
+msgstr ""
+
+#: graphs.php:255
+msgid "Cannot add graph"
+msgstr ""
+
+#: graphs.php:237
+msgid "Cannot add graph prototype"
+msgstr ""
+
+#: hostgroups.php:120 usergrps.php:195
+msgid "Cannot add group"
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
+msgid "Cannot add group."
+msgstr ""
+
+#: hosts.php:394
+msgid "Cannot add host"
+msgstr ""
+
+#: host_prototypes.php:208
+msgid "Cannot add host prototype"
+msgstr ""
+
+#: adm.images.php:62
+msgid "Cannot add image"
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:649
+msgid "Cannot add image."
+msgstr ""
+
+#: items.php:493
+msgid "Cannot add item"
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:522
+#, c-format
+msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
+msgstr ""
+
+#: disc_prototypes.php:301
+msgid "Cannot add item prototype"
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:575
+msgid "Cannot add items."
+msgstr ""
+
+#: adm.macros.php:120
+msgid "Cannot add macro."
+msgstr ""
+
+#: maintenance.php:131
+msgid "Cannot add maintenance"
+msgstr ""
+
+#: media_types.php:134
+msgid "Cannot add media type"
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:43
+#, c-format
+msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:43
+#, c-format
+msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
+msgstr ""
+
+#: sysmaps.php:175
+msgid "Cannot add network map"
+msgstr ""
+
+#: httpconf.php:261
+#, c-format
+msgid "Cannot add new application \"%1$s\"."
+msgstr ""
+
+#: proxies.php:120
+msgid "Cannot add proxy"
+msgstr ""
+
+#: adm.regexps.php:141
+msgid "Cannot add regular expression"
+msgstr ""
+
+#: screenconf.php:168
+msgid "Cannot add screen"
+msgstr ""
+
+#: scripts.php:89 scripts.php:93 scripts.php:122
+msgid "Cannot add script"
+msgstr ""
+
+#: services.php:162
+msgid "Cannot add service"
+msgstr ""
+
+#: slideconf.php:107
+msgid "Cannot add slide show"
+msgstr ""
+
+#: templates.php:245
+msgid "Cannot add template"
+msgstr ""
+
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
+msgid "Cannot add trigger"
+msgstr ""
+
+#: trigger_prototypes.php:175
+msgid "Cannot add trigger prototype"
+msgstr ""
+
+#: users.php:248
+msgid "Cannot add user"
+msgstr ""
+
+#: users.php:191
+msgid "Cannot add user. Both passwords must be equal."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:263
+msgid "Cannot add users."
+msgstr ""
+
+#: adm.valuemapping.php:72
+msgid "Cannot add value map"
+msgstr ""
+
+#: httpconf.php:198
+msgid "Cannot add web scenario"
+msgstr ""
+
+#: authentication.php:135
+msgid "Cannot change authentication"
+msgstr ""
+
+#: authentication.php:182
+msgid "Cannot change authentication method to HTTP"
+msgstr ""
+
+#: authentication.php:127 authentication.php:134
+msgid "Cannot change authentication method to LDAP"
+msgstr ""
+
+#: authentication.php:78
+msgid "Cannot change authentication method to Zabbix internal"
+msgstr ""
+
+#: httpconf.php:186 httpconf.php:407 items.php:520
+msgid "Cannot clear history"
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:1195
+msgid "Cannot clone graph prototypes."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:1243
+msgid "Cannot clone host prototypes."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:1079
+msgid "Cannot clone item prototypes."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:622
+msgid "Cannot clone trigger prototypes."
+msgstr ""
+
+#: scripts_exec.php:70
+msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
+msgstr ""
+
+#: graphs.php:374
+msgid "Cannot copy graphs"
+msgstr ""
+
+#: items.php:743
+msgid "Cannot copy items"
+msgstr ""
+
+#: include/triggers.inc.php:400
+#, c-format
+msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:151
+#, c-format
+msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
+msgstr ""
+
+#: include/db.inc.php:34
+msgid "Cannot create another database connection."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1407
+msgid "Cannot create circular dependencies."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1379
+msgid "Cannot create dependency on trigger itself."
+msgstr ""
+
+#: discoveryconf.php:154
+msgid "Cannot create discovery rule"
+msgstr ""
+
+#: include/classes/api/services/CHost.php:1063
+msgid "Cannot create host group."
+msgstr ""
+
+#: adm.iconmapping.php:81
+msgid "Cannot create icon map"
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
+#, c-format
+msgid "Cannot create icon maps with identical name \"%s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:835
+#, c-format
+msgid "Cannot create map \"%s\"."
+msgstr ""
+
+#: httpconf.php:205
+msgid "Cannot create new application, web scenario is already assigned to application."
+msgstr ""
+
+#: include/js.inc.php:258
+msgid "Cannot create new element"
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:389
+msgid "Cannot create template."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:1317
+#, c-format
+msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
+msgstr ""
+
+#: actionconf.php:186
+msgid "Cannot delete action"
+msgstr ""
+
+#: applications.php:162 applications.php:203
+msgid "Cannot delete application"
+msgid_plural "Cannot delete applications"
+msgstr[0] ""
+
+#: include/classes/api/services/CTrigger.php:1035
+msgid "Cannot delete dependency"
+msgstr ""
+
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
+msgid "Cannot delete discovery rule"
+msgstr ""
+
+#: discoveryconf.php:220 host_discovery.php:334
+msgid "Cannot delete discovery rules"
+msgstr ""
+
+#: graphs.php:298
+msgid "Cannot delete graph"
+msgstr ""
+
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
+msgid "Cannot delete graph prototype"
+msgstr ""
+
+#: graphs.php:314
+msgid "Cannot delete graph prototypes"
+msgstr ""
+
+#: include/classes/api/services/CItem.php:669
+msgid "Cannot delete graph."
+msgstr ""
+
+#: graphs.php:322
+msgid "Cannot delete graphs"
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:581
+msgid "Cannot delete graphs created by low level discovery."
+msgstr ""
+
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+msgid "Cannot delete group"
+msgid_plural "Cannot delete groups"
+msgstr[0] ""
+
+#: hosts.php:634 hosts.php:647
+msgid "Cannot delete host"
+msgstr ""
+
+#: include/classes/api/services/CHost.php:1074
+msgid "Cannot delete host group."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:442
+msgid "Cannot delete host prototype."
+msgstr ""
+
+#: host_prototypes.php:128 host_prototypes.php:257
+msgid "Cannot delete host prototypes"
+msgstr ""
+
+#: adm.iconmapping.php:97
+msgid "Cannot delete icon map"
+msgstr ""
+
+#: adm.images.php:123
+msgid "Cannot delete image"
+msgstr ""
+
+#: include/classes/api/services/CHost.php:1160
+msgid "Cannot delete inventory."
+msgstr ""
+
+#: items.php:382
+msgid "Cannot delete item"
+msgstr ""
+
+#: disc_prototypes.php:202
+msgid "Cannot delete item prototype"
+msgstr ""
+
+#: disc_prototypes.php:342
+msgid "Cannot delete item prototypes"
+msgstr ""
+
+#: items.php:800
+msgid "Cannot delete items"
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:528
+msgid "Cannot delete items created by low level discovery."
+msgstr ""
+
+#: maintenance.php:251
+msgid "Cannot delete maintenance"
+msgstr ""
+
+#: media_types.php:157 media_types.php:194
+msgid "Cannot delete media type"
+msgstr ""
+
+#: sysmaps.php:220
+msgid "Cannot delete network map"
+msgstr ""
+
+#: proxies.php:144 proxies.php:205
+msgid "Cannot delete proxy"
+msgstr ""
+
+#: adm.regexps.php:191
+msgid "Cannot delete regular expression"
+msgid_plural "Cannot delete regular expressions"
+msgstr[0] ""
+
+#: screenconf.php:239
+msgid "Cannot delete screen"
+msgstr ""
+
+#: scripts.php:158 scripts.php:179
+msgid "Cannot delete script"
+msgstr ""
+
+#: include/classes/api/services/CScript.php:491
+msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:523
+#, c-format
+msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:506
+#, c-format
+msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
+msgstr ""
+
+#: actionconf.php:356
+msgid "Cannot delete selected actions"
+msgstr ""
+
+#: services.php:117
+msgid "Cannot delete service"
+msgstr ""
+
+#: slideconf.php:138 slideconf.php:159
+msgid "Cannot delete slide show"
+msgstr ""
+
+#: templates.php:375 templates.php:389 templates.php:414
+msgid "Cannot delete template"
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:419
+msgid "Cannot delete templated application."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
+msgid "Cannot delete templated graphs."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:1075
+msgid "Cannot delete templated host prototype."
+msgstr ""
+
+#: include/classes/api/services/CItem.php:633
+msgid "Cannot delete templated item."
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:472
+msgid "Cannot delete templated items"
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:390
+msgid "Cannot delete templated items."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
+#, c-format
+msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:366
+#, c-format
+msgid "Cannot delete templated web scenario \"%1$s\"."
+msgstr ""
+
+#: triggers.php:208
+msgid "Cannot delete trigger"
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
+msgid "Cannot delete trigger prototype"
+msgstr ""
+
+#: trigger_prototypes.php:268
+msgid "Cannot delete trigger prototypes"
+msgstr ""
+
+#: include/classes/api/services/CItem.php:685
+msgid "Cannot delete trigger."
+msgstr ""
+
+#: triggers.php:332
+msgid "Cannot delete triggers"
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:635
+msgid "Cannot delete triggers created by low level discovery."
+msgstr ""
+
+#: users.php:298 users.php:358
+msgid "Cannot delete user"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:888
+msgid "Cannot delete user media."
+msgstr ""
+
+#: adm.valuemapping.php:88
+msgid "Cannot delete value map"
+msgstr ""
+
+#: httpconf.php:153 httpconf.php:415
+msgid "Cannot delete web scenario"
+msgstr ""
+
+#: actionconf.php:341
+msgid "Cannot disable action"
+msgid_plural "Cannot disable actions"
+msgstr[0] ""
+
+#: discoveryconf.php:205
+msgid "Cannot disable discovery rule"
+msgid_plural "Cannot disable discovery rules"
+msgstr[0] ""
+
+#: host_discovery.php:324
+msgid "Cannot disable discovery rules"
+msgid_plural "Cannot disable discovery rules"
+msgstr[0] ""
+
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
+msgid "Cannot disable host"
+msgid_plural "Cannot disable hosts"
+msgstr[0] ""
+
+#: host_prototypes.php:242
+msgid "Cannot disable host prototype"
+msgid_plural "Cannot disable host prototypes"
+msgstr[0] ""
+
+#: applications.php:236 items.php:708
+msgid "Cannot disable item"
+msgid_plural "Cannot disable items"
+msgstr[0] ""
+
+#: disc_prototypes.php:326
+msgid "Cannot disable item prototype"
+msgid_plural "Cannot disable item prototypes"
+msgstr[0] ""
+
+#: media_types.php:184
+msgid "Cannot disable media type"
+msgid_plural "Cannot disable media types"
+msgstr[0] ""
+
+#: triggers.php:281
+msgid "Cannot disable trigger"
+msgid_plural "Cannot disable triggers"
+msgstr[0] ""
+
+#: trigger_prototypes.php:258
+msgid "Cannot disable trigger prototype"
+msgid_plural "Cannot disable trigger prototypes"
+msgstr[0] ""
+
+#: usergrps.php:369
+msgid "Cannot disable user group"
+msgid_plural "Cannot disable user groups"
+msgstr[0] ""
+
+#: httpconf.php:368
+msgid "Cannot disable web scenario"
+msgid_plural "Cannot disable web scenarios"
+msgstr[0] ""
+
+#: queue.php:61
+msgid "Cannot display item queue."
+msgstr ""
+
+#: chart7.php:78
+msgid "Cannot display more than one item with type \"Graph sum\"."
+msgstr ""
+
+#: actionconf.php:340
+msgid "Cannot enable action"
+msgid_plural "Cannot enable actions"
+msgstr[0] ""
+
+#: discoveryconf.php:204
+msgid "Cannot enable discovery rule"
+msgid_plural "Cannot enable discovery rules"
+msgstr[0] ""
+
+#: host_discovery.php:323
+msgid "Cannot enable discovery rules"
+msgid_plural "Cannot enable discovery rules"
+msgstr[0] ""
+
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
+msgid "Cannot enable host"
+msgid_plural "Cannot enable hosts"
+msgstr[0] ""
+
+#: host_prototypes.php:241
+msgid "Cannot enable host prototype"
+msgid_plural "Cannot enable host prototypes"
+msgstr[0] ""
+
+#: applications.php:235 items.php:707
+msgid "Cannot enable item"
+msgid_plural "Cannot enable items"
+msgstr[0] ""
+
+#: disc_prototypes.php:325
+msgid "Cannot enable item prototype"
+msgid_plural "Cannot enable item prototypes"
+msgstr[0] ""
+
+#: media_types.php:183
+msgid "Cannot enable media type"
+msgid_plural "Cannot enable media types"
+msgstr[0] ""
+
+#: triggers.php:280
+msgid "Cannot enable trigger"
+msgid_plural "Cannot enable triggers"
+msgstr[0] ""
+
+#: trigger_prototypes.php:257
+msgid "Cannot enable trigger prototype"
+msgid_plural "Cannot enable trigger prototypes"
+msgstr[0] ""
+
+#: usergrps.php:368
+msgid "Cannot enable user group"
+msgid_plural "Cannot enable user groups"
+msgstr[0] ""
+
+#: httpconf.php:367
+msgid "Cannot enable web scenario"
+msgid_plural "Cannot enable web scenarios"
+msgstr[0] ""
+
+#: include/classes/import/CXmlImport18.php:698
+#: include/classes/import/importers/CMapImporter.php:188
+#, c-format
+msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
+#, c-format
+msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:743
+#: include/classes/import/importers/CMapImporter.php:209
+#, c-format
+msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#, c-format
+msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:754
+#: include/classes/import/importers/CMapImporter.php:217
+#, c-format
+msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#, c-format
+msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:877
+#, 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:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
+#: include/items.inc.php:431
+#, c-format
+msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:787
+#: include/classes/import/importers/CMapImporter.php:250
+#, c-format
+msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/importers/CMapImporter.php:180
+#, c-format
+msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1153
+#, 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:1053
+#, 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:1137
+#, 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:1033
+#, 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:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
+#, c-format
+msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:732
+#, c-format
+msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/importers/CMapImporter.php:201
+#, c-format
+msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
+#, c-format
+msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
+msgstr ""
+
+#: include/js.inc.php:241
+msgid "Cannot find objects with name"
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
+#, c-format
+msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:900
+#, c-format
+msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
+#: include/classes/import/importers/CMapImporter.php:228
+#: include/classes/import/importers/CMapImporter.php:271
+#, c-format
+msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:686
+#, c-format
+msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:844
+#, c-format
+msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
+msgstr ""
+
+#: srv_status.php:169
+msgid "Cannot format Tree. Check logic structure in service links."
+msgstr ""
+
+#: services.php:472
+msgid "Cannot format tree."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:791
+msgid "Cannot have empty visible template name."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
+#, c-format
+msgid "Cannot implode expression \"%s\"."
+msgstr ""
+
+#: include/classes/import/importers/CScreenImporter.php:78
+#, c-format
+msgid "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
+msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
+msgstr[0] ""
+
+#: include/classes/import/importers/CTemplateImporter.php:122
+#, c-format
+msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
+msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
+msgstr[0] ""
+
+#: include/classes/core/CView.php:113
+#, c-format
+msgid "Cannot include view file \"%s\"."
+msgstr ""
+
+#: popup_trexpr.php:774
+msgid "Cannot insert trigger expression"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:677
+msgid "Cannot insert user media."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:1138
+msgid "Cannot link template"
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
+msgid "Cannot link template."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:1029
+msgid "Cannot login."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:954
+msgid "Cannot logout."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:959
+msgid "Cannot mass update host name."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:1017
+msgid "Cannot mass update template name."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:949
+msgid "Cannot mass update visible host name."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:982
+msgid "Cannot mass update visible template name."
+msgstr ""
+
+#: include/classes/api/services/CHostBase.php:57
+#, c-format
+msgid "Cannot pass duplicate template IDs for the linkage: %s."
+msgstr ""
+
+#: include/classes/db/DB.php:801
+#, c-format
+msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
+msgstr ""
+
+#: include/classes/db/DB.php:516
+#, c-format
+msgid "Cannot perform update statement on table \"%1$s\" without values."
+msgstr ""
+
+#: include/classes/db/DB.php:527
+#, c-format
+msgid "Cannot perform update statement on table \"%1$s\" without where condition."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:511
+msgid "Cannot process applications from different hosts or templates."
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:221
+#, c-format
+msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
+msgstr ""
+
+#: include/views/js/monitoring.history.js.php:38
+msgid "Cannot remove all items, at least one item should remain."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:839
+msgid "Cannot remove group."
+msgstr ""
+
+#: adm.macros.php:104
+msgid "Cannot remove macro."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:273
+msgid "Cannot rename guest user."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:223
+msgid "Cannot save discovery rule without checks."
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:191
+#, c-format
+msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:242
+#, c-format
+msgid "Cannot set \"%1$s\" for item \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:616
+#, c-format
+msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:320
+#, c-format
+msgid "Cannot set \"templateid\" for application \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreen.php:365
+#, c-format
+msgid "Cannot set \"templateid\" for screen \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:458
+#, c-format
+msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
+msgid "Cannot set inventory fields for disabled inventory."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:269
+msgid "Cannot switch host for interface."
+msgstr ""
+
+#: users.php:324
+msgid "Cannot unblock users"
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:512
+msgid "Cannot unlink and clear Web scenarios."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:565
+msgid "Cannot unlink and clear applications."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:339
+msgid "Cannot unlink and clear discovery rules"
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:456
+msgid "Cannot unlink and clear graph prototypes"
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:473
+msgid "Cannot unlink and clear graphs."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:373
+msgid "Cannot unlink and clear item prototypes"
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:356
+msgid "Cannot unlink and clear items"
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
+msgid "Cannot unlink and clear triggers"
+msgstr ""
+
+#: include/classes/api/services/CHost.php:1113
+msgid "Cannot unlink template"
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
+msgid "Cannot unlink template."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:234
+#, c-format
+msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:581
+#, c-format
+msgid "Cannot update \"%1$s\" for a discovered host."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:175
+#, c-format
+msgid "Cannot update \"%1$s\" for a discovered item."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:588
+#, c-format
+msgid "Cannot update \"%1$s\" for a discovered trigger."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2250
+#, c-format
+msgid "Cannot update \"%1$s\" for action \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:206
+#, c-format
+msgid "Cannot update \"%1$s\" for item \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:616
+#, c-format
+msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
+#, c-format
+msgid "Cannot update \"templateid\" for application \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:42
+#, c-format
+msgid "Cannot update \"templateid\" for graph \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:42
+#, c-format
+msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreen.php:440
+#, c-format
+msgid "Cannot update \"templateid\" for screen \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTemplateScreen.php:630
+#, c-format
+msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:514
+#, c-format
+msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraphGeneral.php:60
+msgid "Cannot update a discovered graph."
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:489
+msgid "Cannot update a discovered host group."
+msgstr ""
+
+#: actionconf.php:152
+msgid "Cannot update action"
+msgstr ""
+
+#: applications.php:104
+msgid "Cannot update application"
+msgstr ""
+
+#: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
+#: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
+#: adm.workingtime.php:52
+msgid "Cannot update configuration"
+msgstr ""
+
+#: usergrps.php:331
+msgid "Cannot update debug mode"
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
+msgid "Cannot update discovery rule"
+msgstr ""
+
+#: usergrps.php:294
+msgid "Cannot update frontend access"
+msgstr ""
+
+#: graphs.php:249
+msgid "Cannot update graph"
+msgstr ""
+
+#: graphs.php:231
+msgid "Cannot update graph prototype"
+msgstr ""
+
+#: hostgroups.php:71 usergrps.php:188
+msgid "Cannot update group"
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:296
+msgid "Cannot update group."
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
+#, c-format
+msgid "Cannot update groups for discovered host \"%1$s\"."
+msgstr ""
+
+#: hosts.php:381
+msgid "Cannot update host"
+msgstr ""
+
+#: host_prototypes.php:194
+msgid "Cannot update host prototype"
+msgstr ""
+
+#: hosts.php:367
+msgid "Cannot update hosts"
+msgstr ""
+
+#: adm.iconmapping.php:76
+msgid "Cannot update icon map"
+msgstr ""
+
+#: adm.images.php:58
+msgid "Cannot update image"
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:656
+msgid "Cannot update image."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:342
+#, c-format
+msgid "Cannot update interface for discovered host \"%1$s\"."
+msgstr ""
+
+#: items.php:490
+msgid "Cannot update item"
+msgstr ""
+
+#: disc_prototypes.php:297
+msgid "Cannot update item prototype"
+msgstr ""
+
+#: items.php:687
+msgid "Cannot update items"
+msgstr ""
+
+#: adm.macros.php:93
+msgid "Cannot update macro."
+msgstr ""
+
+#: adm.macros.php:147
+msgid "Cannot update macros"
+msgstr ""
+
+#: maintenance.php:126
+msgid "Cannot update maintenance"
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:826
+#, c-format
+msgid "Cannot update map \"%s\"."
+msgstr ""
+
+#: media_types.php:126
+msgid "Cannot update media type"
+msgstr ""
+
+#: sysmaps.php:168
+msgid "Cannot update network map"
+msgstr ""
+
+#: proxies.php:113
+msgid "Cannot update proxy"
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:289
+#, c-format
+msgid "Cannot update proxy for discovered host \"%1$s\"."
+msgstr ""
+
+#: adm.regexps.php:135
+msgid "Cannot update regular expression"
+msgstr ""
+
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
+msgid "Cannot update screen"
+msgstr ""
+
+#: scripts.php:115
+msgid "Cannot update script"
+msgstr ""
+
+#: services.php:155
+msgid "Cannot update service"
+msgstr ""
+
+#: slideconf.php:100
+msgid "Cannot update slide show"
+msgstr ""
+
+#: templates.php:235
+msgid "Cannot update template"
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:328
+msgid "Cannot update templated applications."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
+#, c-format
+msgid "Cannot update templates on discovered host \"%1$s\"."
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
+msgid "Cannot update trigger"
+msgstr ""
+
+#: trigger_prototypes.php:170
+msgid "Cannot update trigger prototype"
+msgstr ""
+
+#: trigger_prototypes.php:219
+msgid "Cannot update trigger prototypes"
+msgstr ""
+
+#: profile.php:180 users.php:241
+msgid "Cannot update user"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:757
+msgid "Cannot update user media."
+msgstr ""
+
+#: profile.php:114 users.php:188
+msgid "Cannot update user. Both passwords must be equal."
+msgstr ""
+
+#: adm.valuemapping.php:64
+msgid "Cannot update value map"
+msgstr ""
+
+#: httpconf.php:193
+msgid "Cannot update web scenario"
+msgstr ""
+
+#: include/views/js/configuration.discovery.edit.js.php:611
+msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
+msgstr ""
+
+#: popup_bitem.php:125 popup_period.php:120
+msgid "Caption"
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.edit.php:44
+#: include/views/administration.general.regularexpressions.edit.php:54
+msgid "Case sensitive"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:797
+msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:793
+msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:698
+msgid "Center"
+msgstr ""
+
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
+#: include/classes/screens/CScreenMap.php:61
+#: include/views/configuration.services.edit.php:52
+msgid "Change"
+msgstr ""
+
+#: latest.php:346 latest.php:347
+msgctxt "noun in latest data"
+msgid "Change"
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:106
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
+msgid "Change password"
+msgstr ""
+
+#: include/forms.inc.php:403 include/items.inc.php:125
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
+#: include/views/configuration.item.massupdate.php:210
+msgid "Character"
+msgstr ""
+
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
+msgid "Character string included"
+msgstr ""
+
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
+msgid "Character string not included"
+msgstr ""
+
+#: include/hosts.inc.php:240
+msgid "Chassis"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:181
+#: include/classes/items/CHelpItems.php:443
+msgid "Chassis info - returns full info by default"
+msgstr ""
+
+#: include/views/js/configuration.discovery.edit.js.php:547
+msgid "Check already exists."
+msgstr ""
+
+#: include/classes/parsers/CTriggerExpression.php:461
+#, c-format
+msgid "Check expression part starting from \"%1$s\"."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:261
+#: include/classes/items/CHelpItems.php:523
+msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:599
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:121
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:125
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:595
+msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:69
+#: include/classes/items/CHelpItems.php:319
+msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:282
+msgid "Check the key, please. Default example was passed."
+msgstr ""
+
+#: include/views/js/configuration.discovery.edit.js.php:29
+msgid "Check type"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:117
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+msgstr ""
+
+#: include/views/configuration.discovery.edit.php:62
+#: include/views/configuration.discovery.list.php:43
+msgid "Checks"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:89
+#: include/classes/items/CHelpItems.php:351
+msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:583
+msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:113
+#: include/classes/items/CHelpItems.php:129
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
+msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:372
+msgid "Checks should be unique."
+msgstr ""
+
+#: include/locales.inc.php:57
+msgid "Chinese (zh_CN)"
+msgstr ""
+
+#: include/locales.inc.php:58
+msgid "Chinese (zh_TW)"
+msgstr ""
+
+#: include/classes/api/services/CMapElement.php:74
+#, c-format
+msgid "Circular link cannot be created for map element \"%s\"."
+msgstr ""
+
+#: include/classes/import/importers/CMapImporter.php:89
+#, c-format
+msgid "Circular reference in maps: %1$s."
+msgstr ""
+
+#: include/classes/import/importers/CScreenImporter.php:104
+#, c-format
+msgid "Circular reference in screens: %1$s."
+msgstr ""
+
+#: include/classes/import/importers/CTemplateImporter.php:156
+#, c-format
+msgid "Circular reference in templates: %1$s."
+msgstr ""
+
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
+msgid "Circular template linkage is not allowed."
+msgstr ""
+
+#: include/classes/core/ZBase.php:249
+msgid "Classic"
+msgstr ""
+
+#: jsLoader.php:163
+msgid "Clear"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
+msgid "Clear history and trends"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
+msgid "Clear history for selected"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:219
+msgid "Clear when unlinking"
+msgstr ""
+
+#: include/screens.inc.php:28
+msgid "Clock"
+msgstr ""
+
+#: include/views/administration.general.iconmap.edit.php:145
+#: include/views/administration.general.regularexpressions.edit.php:88
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
+#: include/views/configuration.application.edit.php:54
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
+#: include/views/configuration.hostgroups.edit.php:86
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
+#: include/views/configuration.maintenance.edit.php:201
+#: include/views/configuration.screen.edit.php:54
+#: include/views/configuration.slideconf.edit.php:116
+#: include/views/configuration.sysmap.edit.php:190
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
+msgid "Clone"
+msgstr ""
+
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
+msgid "Close"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:241
+msgid "Close expression constructor"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:26
+#: include/views/administration.general.triggerSeverity.edit.php:28
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
+msgid "Colour"
+msgstr ""
+
+#: include/classes/validators/CColorValidator.php:32
+#: include/validate.inc.php:376 jsLoader.php:157
+#, c-format
+msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:381
+msgid "Colour (OK)"
+msgstr ""
+
+#: screenedit.php:286
+msgid "Column added"
+msgstr ""
+
+#: screenedit.php:361
+msgid "Column deleted"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
+msgid "Column span"
+msgstr ""
+
+#: include/views/configuration.screen.edit.php:42 screenconf.php:51
+msgid "Columns"
+msgstr ""
+
+#: include/views/js/adm.regexprs.edit.js.php:23
+msgid "Combined result"
+msgstr ""
+
+#: include/actions.inc.php:917 include/actions.inc.php:958
+#: include/actions.inc.php:1002
+#: include/views/administration.auditacts.list.php:109
+#: include/views/administration.script.edit.php:65
+msgid "Command"
+msgstr ""
+
+#: tr_events.php:132
+msgid "Command actions"
+msgstr ""
+
+#: scripts.php:92
+msgid "Command cannot be empty."
+msgstr ""
+
+#: include/views/administration.script.edit.php:60
+#: include/views/administration.script.list.php:41
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
+msgid "Commands"
+msgstr ""
+
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
+msgid "Comments"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:45
+msgid "Commercial"
+msgstr ""
+
+#: report6.php:238
+msgid "Compare values for multiple periods"
+msgstr ""
+
+#: include/views/administration.usergroups.edit.php:118
+msgid "Composing permissions"
+msgstr ""
+
+#: popup_trexpr.php:25
+msgid "Condition"
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
+msgstr ""
+
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
+#: include/views/configuration.action.list.php:52
+msgid "Conditions"
+msgstr ""
+
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
+msgid "Configuration"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:867
+msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
+msgstr ""
+
+#: conf.import.php:25
+msgid "Configuration import"
+msgstr ""
+
+#: adm.gui.php:24
+msgid "Configuration of GUI"
+msgstr ""
+
+#: services.php:27
+msgid "Configuration of IT services"
+msgstr ""
+
+#: include/audit.inc.php:25
+msgid "Configuration of Zabbix"
+msgstr ""
+
+#: actionconf.php:27
+msgid "Configuration of actions"
+msgstr ""
+
+#: applications.php:26
+msgid "Configuration of applications"
+msgstr ""
+
+#: authentication.php:24
+msgid "Configuration of authentication"
+msgstr ""
+
+#: discoveryconf.php:26 host_discovery.php:27
+msgid "Configuration of discovery rules"
+msgstr ""
+
+#: graphs.php:27
+msgid "Configuration of graph prototypes"
+msgstr ""
+
+#: graphs.php:27
+msgid "Configuration of graphs"
+msgstr ""
+
+#: hostgroups.php:25
+msgid "Configuration of host groups"
+msgstr ""
+
+#: host_prototypes.php:27
+msgid "Configuration of host prototypes"
+msgstr ""
+
+#: hosts.php:32
+msgid "Configuration of hosts"
+msgstr ""
+
+#: adm.housekeeper.php:24
+msgid "Configuration of housekeeping"
+msgstr ""
+
+#: adm.iconmapping.php:24
+msgid "Configuration of icon mapping"
+msgstr ""
+
+#: adm.images.php:25
+msgid "Configuration of images"
+msgstr ""
+
+#: disc_prototypes.php:27
+msgid "Configuration of item prototypes"
+msgstr ""
+
+#: items.php:27
+msgid "Configuration of items"
+msgstr ""
+
+#: adm.macros.php:24
+msgid "Configuration of macros"
+msgstr ""
+
+#: maintenance.php:27
+msgid "Configuration of maintenance periods"
+msgstr ""
+
+#: media_types.php:26
+msgid "Configuration of media types"
+msgstr ""
+
+#: sysmap.php:26 sysmaps.php:34
+msgid "Configuration of network maps"
+msgstr ""
+
+#: proxies.php:25
+msgid "Configuration of proxies"
+msgstr ""
+
+#: adm.regexps.php:26
+msgid "Configuration of regular expressions"
+msgstr ""
+
+#: screenconf.php:38 screenedit.php:27
+msgid "Configuration of screens"
+msgstr ""
+
+#: scripts.php:24
+msgid "Configuration of scripts"
+msgstr ""
+
+#: slideconf.php:25
+msgid "Configuration of slide shows"
+msgstr ""
+
+#: templates.php:38
+msgid "Configuration of templates"
+msgstr ""
+
+#: adm.triggerdisplayoptions.php:24
+msgid "Configuration of trigger displaying options"
+msgstr ""
+
+#: trigger_prototypes.php:27
+msgid "Configuration of trigger prototypes"
+msgstr ""
+
+#: adm.triggerseverities.php:24
+msgid "Configuration of trigger severities"
+msgstr ""
+
+#: triggers.php:27
+msgid "Configuration of triggers"
+msgstr ""
+
+#: usergrps.php:29
+msgid "Configuration of user groups"
+msgstr ""
+
+#: users.php:29
+msgid "Configuration of users"
+msgstr ""
+
+#: adm.valuemapping.php:24
+msgid "Configuration of value mapping"
+msgstr ""
+
+#: httpconf.php:27
+msgid "Configuration of web monitoring"
+msgstr ""
+
+#: adm.workingtime.php:24
+msgid "Configuration of working time"
+msgstr ""
+
+#: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
+#: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
+#: adm.workingtime.php:52
+msgid "Configuration updated"
+msgstr ""
+
+#: dashboard.php:295
+#, c-format
+msgid "Configure (Filter %s)"
+msgstr ""
+
+#: include/views/administration.script.edit.php:104
+msgid "Confirmation text"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/inventory.host.view.php:96
+#: include/views/inventory.host.view.php:115
+#: include/views/inventory.host.view.php:135
+#: include/views/inventory.host.view.php:154
+#: include/views/js/configuration.sysmaps.js.php:360
+msgid "Connect to"
+msgstr ""
+
+#: include/page_footer.php:80
+#, c-format
+msgid "Connected as '%1$s'"
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:207
+#, c-format
+msgid "Connection timeout of %1$s seconds exceeded when connecting to Zabbix server \"%2$s\"."
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:282
+#, c-format
+msgid ""
+"Connection to Zabbix server \"%s\" failed. Possible reasons:\n"
+"1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
+"2. Incorrect DNS server configuration.\n"
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:270
+#, c-format
+msgid ""
+"Connection to Zabbix server \"%s\" refused. Possible reasons:\n"
+"1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
+"2. Security environment (for example, SELinux) is blocking the connection;\n"
+"3. Zabbix server daemon not running;\n"
+"4. Firewall is blocking TCP connection.\n"
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:278
+#, c-format
+msgid ""
+"Connection to Zabbix server \"%s\" timed out. Possible reasons:\n"
+"1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
+"2. Firewall is blocking TCP connection.\n"
+msgstr ""
+
+#: include/hosts.inc.php:215
+msgid "Contact"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:107
+#: include/views/configuration.item.edit.php:113
+#: include/views/configuration.item.massupdate.php:105
+#: include/views/js/configuration.discovery.edit.js.php:50
+msgid "Context name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:169
+#: include/classes/items/CHelpItems.php:431
+msgid "Context switches."
+msgstr ""
+
+#: include/hosts.inc.php:260
+msgid "Contract number"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:168
+msgid "Coordinates"
+msgstr ""
+
+#: include/views/configuration.copy.elements.php:118
+msgid "Copy"
+msgstr ""
+
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
+#: include/views/configuration.triggers.list.php:303
+msgid "Copy selected to ..."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:1076
+#, c-format
+msgid "Correct login \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CImage.php:389
+msgid "Could not save image!"
+msgstr ""
+
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
+msgid "Count"
+msgstr ""
+
+#: include/views/configuration.slideconf.list.php:42
+msgid "Count of slides"
+msgstr ""
+
+#: include/views/configuration.action.list.php:28
+msgid "Create action"
+msgstr ""
+
+#: include/views/configuration.application.list.php:35
+msgid "Create application"
+msgstr ""
+
+#: include/views/configuration.application.list.php:30
+msgid "Create application (select host first)"
+msgstr ""
+
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
+#: include/views/configuration.discovery.list.php:27
+#: include/views/configuration.host.discovery.list.php:28
+msgid "Create discovery rule"
+msgstr ""
+
+#: include/views/configuration.graph.list.php:42
+msgid "Create graph"
+msgstr ""
+
+#: include/views/configuration.graph.list.php:45
+msgid "Create graph (select host first)"
+msgstr ""
+
+#: include/views/configuration.graph.list.php:29
+msgid "Create graph prototype"
+msgstr ""
+
+#: hosts.php:813
+msgid "Create host"
+msgstr ""
+
+#: include/views/configuration.hostgroups.list.php:28
+#: include/views/configuration.hostgroups.list.php:31
+msgid "Create host group"
+msgstr ""
+
+#: include/views/configuration.host.prototype.list.php:30
+msgid "Create host prototype"
+msgstr ""
+
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
+#: adm.iconmapping.php:126
+msgid "Create icon map"
+msgstr ""
+
+#: include/views/configuration.item.list.php:37 items.php:806
+msgid "Create item"
+msgstr ""
+
+#: include/views/configuration.item.list.php:31
+msgid "Create item (select host first)"
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:28
+msgid "Create item prototype"
+msgstr ""
+
+#: include/views/configuration.maintenance.list.php:27
+msgid "Create maintenance period"
+msgstr ""
+
+#: include/views/configuration.sysmap.list.php:27
+msgid "Create map"
+msgstr ""
+
+#: include/views/administration.mediatypes.list.php:26
+msgid "Create media type"
+msgstr ""
+
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
+#: include/views/administration.proxy.list.php:27
+msgid "Create proxy"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:34
+msgid "Create scenario"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:29
+msgid "Create scenario (select host first)"
+msgstr ""
+
+#: include/views/configuration.screen.list.php:27
+msgid "Create screen"
+msgstr ""
+
+#: include/views/administration.script.list.php:25
+msgid "Create script"
+msgstr ""
+
+#: include/views/configuration.slideconf.list.php:27
+msgid "Create slide show"
+msgstr ""
+
+#: templates.php:490
+msgid "Create template"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
+msgid "Create trigger"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:46
+msgid "Create trigger (select host first)"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:40
+msgid "Create trigger prototype"
+msgstr ""
+
+#: include/views/administration.users.list.php:30
+msgid "Create user"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:30
+msgid "Create user group"
+msgstr ""
+
+#: adm.valuemapping.php:143
+msgid "Create value map"
+msgstr ""
+
+#: include/classes/api/managers/CApplicationManager.php:73
+#, c-format
+msgid "Created: Application \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:678
+#, c-format
+msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:364
+#, c-format
+msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItem.php:531
+#, c-format
+msgid "Created: Item \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:371
+#, c-format
+msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1102
+#, c-format
+msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:686
+#, c-format
+msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/managers/CHttpTestManager.php:124
+#, c-format
+msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/items.inc.php:41
+msgid "Critical"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:213
+#: include/classes/items/CHelpItems.php:475
+msgid "Current OS - returns full info by default"
+msgstr ""
+
+#: popup_trexpr.php:355
+msgid "Current date is < N"
+msgstr ""
+
+#: popup_trexpr.php:363
+msgid "Current date is = N"
+msgstr ""
+
+#: popup_trexpr.php:359
+msgid "Current date is > N"
+msgstr ""
+
+#: popup_trexpr.php:367
+msgid "Current date is NOT N"
+msgstr ""
+
+#: include/views/js/configuration.action.edit.js.php:87
+#: include/views/js/configuration.action.edit.js.php:215
+msgid "Current host"
+msgstr ""
+
+#: popup_trexpr.php:485
+msgid "Current time is < N"
+msgstr ""
+
+#: popup_trexpr.php:493
+msgid "Current time is = N"
+msgstr ""
+
+#: popup_trexpr.php:489
+msgid "Current time is > N"
+msgstr ""
+
+#: popup_trexpr.php:497
+msgid "Current time is NOT N"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:186
+msgid "Current value"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:122
+#: include/views/configuration.host.discovery.edit.php:280
+msgid "Custom expression"
+msgstr ""
+
+#: charts.php:26
+msgid "Custom graphs"
+msgstr ""
+
+#: include/maps.inc.php:50
+msgid "Custom label"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:419
+#, c-format
+msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
+msgstr ""
+
+#: disc_prototypes.php:108 include/views/configuration.item.massupdate.php:300
+#: items.php:115
+msgid "Custom multiplier"
+msgstr ""
+
+#: screens.php:27
+msgid "Custom screens"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:730
+msgid "Custom script"
+msgstr ""
+
+#: include/views/administration.general.triggerSeverity.edit.php:26
+msgid "Custom severity"
+msgstr ""
+
+#: include/views/administration.general.triggerSeverity.edit.php:67
+msgid "Custom severity names affect all locales and require manual translation!"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:45
+msgid "Custom size"
+msgstr ""
+
+#: slides.php:27
+msgid "Custom slides"
+msgstr ""
+
+#: include/locales.inc.php:59
+msgid "Czech (cs_CZ)"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
+msgid "D"
+msgstr ""
+
+#: include/views/monitoring.dashconf.php:24
+msgid "DASHBOARD CONFIGURATION"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:142
+#: include/views/configuration.item.edit.php:148
+#: include/views/configuration.item.massupdate.php:170
+#: include/views/js/configuration.discovery.edit.js.php:95
+msgid "DES"
+msgstr ""
+
+#: httpdetails.php:116
+msgid "DETAILS OF SCENARIO"
+msgstr ""
+
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
+msgid "DISABLED"
+msgstr ""
+
+#: include/triggers.inc.php:173
+msgid "DISCOVERED"
+msgstr ""
+
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
+#: include/views/inventory.host.view.php:57
+#: include/views/inventory.host.view.php:66
+#: include/views/inventory.host.view.php:75
+#: include/views/inventory.host.view.php:84
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
+msgid "DNS"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
+#: include/views/inventory.host.view.php:96
+#: include/views/inventory.host.view.php:115
+#: include/views/inventory.host.view.php:135
+#: include/views/inventory.host.view.php:154
+msgid "DNS name"
+msgstr ""
+
+#: include/triggers.inc.php:172
+msgid "DOWN"
+msgstr ""
+
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
+msgid "Daily"
+msgstr ""
+
+#: include/classes/core/ZBase.php:252
+msgid "Dark orange"
+msgstr ""
+
+#: include/reports.inc.php:435
+msgid "Darken"
+msgstr ""
+
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
+msgid "Dashboard"
+msgstr ""
+
+#: dashconf.php:27
+msgid "Dashboard configuration"
+msgstr ""
+
+#: include/views/monitoring.dashconf.php:44
+msgid "Dashboard filter"
+msgstr ""
+
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
+msgid "Dashed line"
+msgstr ""
+
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
+msgid "Data"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:903
+msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
+#: include/classes/graphdraw/CPieGraphDraw.php:750
+#, c-format
+msgid "Data from %1$s. Generated in %2$s sec."
+msgstr ""
+
+#: include/screens.inc.php:29
+msgid "Data overview"
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:77
+#: include/views/administration.general.housekeeper.edit.php:96
+#: include/views/administration.general.housekeeper.edit.php:115
+#: include/views/administration.general.housekeeper.edit.php:136
+#: include/views/administration.general.housekeeper.edit.php:157
+msgid "Data storage period (in days)"
+msgstr ""
+
+#: include/forms.inc.php:435 include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.massupdate.php:227
+msgid "Data type"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
+msgid "Database file"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:283
+msgid "Database host"
+msgstr ""
+
+#: include/items.inc.php:92
+msgid "Database monitor"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
+msgid "Database name"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:424
+msgid "Database password"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
+msgid "Database port"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
+msgid "Database schema"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:416
+msgid "Database server"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
+msgid "Database type"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:423
+msgid "Database user"
+msgstr ""
+
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
+msgid "Date"
+msgstr ""
+
+#: include/hosts.inc.php:335
+msgid "Date HW decommissioned"
+msgstr ""
+
+#: include/hosts.inc.php:325
+msgid "Date HW installed"
+msgstr ""
+
+#: include/hosts.inc.php:330
+msgid "Date HW maintenance expires"
+msgstr ""
+
+#: include/hosts.inc.php:320
+msgid "Date HW purchased"
+msgstr ""
+
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
+msgid "Day"
+msgstr ""
+
+#: include/forms.inc.php:1734
+msgid "Day of month"
+msgstr ""
+
+#: popup_trexpr.php:387
+msgid "Day of month is < N"
+msgstr ""
+
+#: popup_trexpr.php:395
+msgid "Day of month is = N"
+msgstr ""
+
+#: popup_trexpr.php:391
+msgid "Day of month is > N"
+msgstr ""
+
+#: popup_trexpr.php:399
+msgid "Day of month is NOT N"
+msgstr ""
+
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
+msgid "Day of week"
+msgstr ""
+
+#: popup_trexpr.php:371
+msgid "Day of week is < N"
+msgstr ""
+
+#: popup_trexpr.php:379
+msgid "Day of week is = N"
+msgstr ""
+
+#: popup_trexpr.php:375
+msgid "Day of week is > N"
+msgstr ""
+
+#: popup_trexpr.php:383
+msgid "Day of week is NOT N"
+msgstr ""
+
+#: include/forms.inc.php:1778
+msgid "Days"
+msgstr ""
+
+#: include/page_header.php:206
+msgid "Debug"
+msgstr ""
+
+#: include/views/administration.usergroups.edit.php:72
+#: include/views/administration.usergroups.list.php:49
+#: include/views/administration.users.list.php:62
+msgid "Debug mode"
+msgstr ""
+
+#: usergrps.php:331
+msgid "Debug mode updated"
+msgstr ""
+
+#: include/func.inc.php:248
+msgid "Dec"
+msgstr ""
+
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
+msgid "December"
+msgstr ""
+
+#: include/items.inc.php:138
+msgid "Decimal"
+msgstr ""
+
+#: include/hosts.inc.php:37
+#: include/views/administration.general.iconmap.edit.php:133
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/js/configuration.sysmaps.js.php:82
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
+msgid "Default"
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:50
+msgid "Default authentication"
+msgstr ""
+
+#: include/views/configuration.slideconf.edit.php:41 slideconf.php:37
+msgid "Default delay (in seconds)"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:48
+#: include/views/configuration.action.edit.php:617
+msgid "Default message"
+msgstr ""
+
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
+msgid "Default operation step duration"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:47
+msgid "Default subject"
+msgstr ""
+
+#: include/views/administration.general.gui.edit.php:31
+msgid "Default theme"
+msgstr ""
+
+#: adm.gui.php:73
+#, c-format
+msgid "Default theme \"%1$s\"."
+msgstr ""
+
+#: include/views/configuration.discovery.list.php:42
+#: include/views/configuration.slideconf.edit.php:51
+#: include/views/configuration.slideconf.list.php:41
+msgid "Delay"
+msgstr ""
+
+#: include/views/configuration.discovery.edit.php:49
+msgid "Delay (in sec)"
+msgstr ""
+
+#: queue.php:228
+msgid "Delayed by"
+msgstr ""
+
+#: include/classes/html/CButtonDelete.php:25
+#: include/views/administration.auditlogs.list.php:47
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
+msgid "Delete"
+msgstr ""
+
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
+msgid "Delete and clear"
+msgstr ""
+
+#: templates.php:675
+msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
+msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
+msgstr ""
+
+#: include/views/configuration.application.edit.php:55
+msgid "Delete application?"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:1078
+msgid "Delete current action?"
+msgstr ""
+
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
+msgid "Delete discovery rule?"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
+msgid "Delete expression?"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:312
+msgid "Delete graph prototype?"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:312
+msgid "Delete graph?"
+msgstr ""
+
+#: include/views/configuration.item.list.php:278
+msgid "Delete history of selected items?"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
+#: include/views/administration.general.iconmap.edit.php:146
+msgid "Delete icon map?"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:454
+msgid "Delete item prototype?"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:454
+msgid "Delete item?"
+msgstr ""
+
+#: jsLoader.php:108 tr_logform.php:317
+msgid "Delete keyword?"
+msgstr ""
+
+#: jsLoader.php:154
+msgid "Delete links between selected elements?"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:202
+msgid "Delete maintenance period?"
+msgstr ""
+
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:191
+msgid "Delete network map?"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:101
+msgid "Delete proxy?"
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.edit.php:89
+msgid "Delete regular expression?"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:292
+msgid "Delete scenario?"
+msgstr ""
+
+#: include/views/configuration.screen.edit.php:55
+msgid "Delete screen?"
+msgstr ""
+
+#: include/views/administration.script.edit.php:119
+msgid "Delete script?"
+msgstr ""
+
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
+#: include/views/administration.usergroups.list.php:148
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
+#: include/views/configuration.item.prototype.list.php:120
+#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.screen.list.php:70
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
+msgid "Delete selected"
+msgstr ""
+
+#: include/views/configuration.action.list.php:105
+msgid "Delete selected actions?"
+msgstr ""
+
+#: include/views/configuration.application.list.php:120
+msgid "Delete selected applications?"
+msgstr ""
+
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
+msgid "Delete selected discovery rules?"
+msgstr ""
+
+#: jsLoader.php:150
+msgid "Delete selected elements?"
+msgstr ""
+
+#: include/views/configuration.graph.list.php:162
+msgid "Delete selected graph prototypes?"
+msgstr ""
+
+#: include/views/configuration.graph.list.php:162
+msgid "Delete selected graphs?"
+msgstr ""
+
+#: include/views/administration.usergroups.edit.php:144
+#: include/views/configuration.hostgroups.edit.php:78
+msgid "Delete selected group?"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:149
+msgid "Delete selected groups?"
+msgstr ""
+
+#: include/views/configuration.hostgroups.list.php:165
+msgid "Delete selected host groups?"
+msgstr ""
+
+#: include/views/configuration.host.prototype.edit.php:331
+msgid "Delete selected host prototype?"
+msgstr ""
+
+#: include/views/configuration.host.prototype.list.php:129
+msgid "Delete selected host prototypes?"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:888
+msgid "Delete selected host?"
+msgstr ""
+
+#: hosts.php:1078
+msgid "Delete selected hosts?"
+msgstr ""
+
+#: include/views/administration.general.image.edit.php:57
+msgid "Delete selected image?"
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:121
+msgid "Delete selected item prototypes?"
+msgstr ""
+
+#: include/views/configuration.item.list.php:282
+msgid "Delete selected items?"
+msgstr ""
+
+#: include/views/configuration.maintenance.list.php:82
+msgid "Delete selected maintenance periods?"
+msgstr ""
+
+#: include/views/configuration.sysmap.list.php:65
+msgid "Delete selected maps?"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:109
+msgid "Delete selected media type?"
+msgstr ""
+
+#: include/views/administration.mediatypes.list.php:125
+msgid "Delete selected media types?"
+msgstr ""
+
+#: include/views/administration.proxy.list.php:111
+msgid "Delete selected proxies?"
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.list.php:67
+msgid "Delete selected regular expressions?"
+msgstr ""
+
+#: include/views/configuration.screen.list.php:71
+msgid "Delete selected screens?"
+msgstr ""
+
+#: include/views/administration.script.list.php:90
+msgid "Delete selected scripts?"
+msgstr ""
+
+#: include/views/configuration.slideconf.list.php:58
+msgid "Delete selected slide shows?"
+msgstr ""
+
+#: templates.php:671
+msgid "Delete selected templates?"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:310
+msgid "Delete selected trigger prototypes?"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:310
+msgid "Delete selected triggers?"
+msgstr ""
+
+#: include/views/administration.users.edit.php:389
+msgid "Delete selected user?"
+msgstr ""
+
+#: include/views/administration.users.list.php:156
+msgid "Delete selected users?"
+msgstr ""
+
+#: adm.valuemapping.php:181
+msgid "Delete selected value mapping?"
+msgstr ""
+
+#: adm.valuemapping.php:179
+#, c-format
+msgid "Delete selected value mapping? It is used for %d item!"
+msgid_plural "Delete selected value mapping? It is used for %d items!"
+msgstr[0] ""
+
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
+msgid "Delete selected with linked elements"
+msgstr ""
+
+#: jsLoader.php:186
+#, c-format
+msgid "Delete service \"%1$s\"?"
+msgstr ""
+
+#: include/views/configuration.slideconf.edit.php:117
+msgid "Delete slide show?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:481
+msgid "Delete template?"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:343
+msgid "Delete trigger prototype?"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:343
+msgid "Delete trigger?"
+msgstr ""
+
+#: auditlogs.php:134
+msgid "Deleted"
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:454
+#, c-format
+msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:452
+#, c-format
+msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:580
+#, c-format
+msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:1441
+#, c-format
+msgid "Deleted: Host \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:970
+#, c-format
+msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItem.php:724
+#, c-format
+msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:560
+#, c-format
+msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:457
+#, c-format
+msgid "Deleted: Proxy \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:712
+#, c-format
+msgid "Deleted: Template \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:812
+#, c-format
+msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:641
+#, c-format
+msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:426
+#, c-format
+msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.edit.php:53
+msgid "Delimiter"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.massupdate.php:426
+msgid "Delta (simple change)"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:355
+#: include/views/configuration.item.massupdate.php:425
+msgid "Delta (speed per second)"
+msgstr ""
+
+#: include/forms.inc.php:243 include/perm.inc.php:33
+#: include/views/administration.usergroups.edit.php:81
+msgid "Deny"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
+msgid "Dependencies"
+msgstr ""
+
+#: include/triggers.inc.php:1237 tr_status.php:588
+msgid "Dependent"
+msgstr ""
+
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
+msgid "Depends on"
+msgstr ""
+
+#: include/hosts.inc.php:270
+msgid "Deployment status"
+msgstr ""
+
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
+#: include/views/administration.auditlogs.list.php:91
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
+#: include/views/configuration.host.discovery.edit.php:256
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.maintenance.edit.php:92
+#: include/views/configuration.maintenance.list.php:49
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
+msgid "Description"
+msgstr ""
+
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
+#: include/views/administration.auditlogs.list.php:92
+#: include/views/administration.mediatypes.list.php:43
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
+msgid "Details"
+msgstr ""
+
+#: httpdetails.php:27
+msgid "Details of scenario"
+msgstr ""
+
+#: include/actions.inc.php:102
+msgid "Device"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:157
+#: include/classes/items/CHelpItems.php:419
+msgid "Device interrupts."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:189
+#: include/classes/items/CHelpItems.php:451
+msgid "Device list - lists PCI devices by default"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:245
+#: include/classes/items/CHelpItems.php:507
+msgid "Device read statistics."
+msgstr ""
+
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
+msgid "Device uniqueness criteria"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:249
+#: include/classes/items/CHelpItems.php:511
+msgid "Device write statistics."
+msgstr ""
+
+#: popup_trexpr.php:165
+msgid "Difference between MAX and MIN value of a period T is < N"
+msgstr ""
+
+#: popup_trexpr.php:175
+msgid "Difference between MAX and MIN value of a period T is = N"
+msgstr ""
+
+#: popup_trexpr.php:170
+msgid "Difference between MAX and MIN value of a period T is > N"
+msgstr ""
+
+#: popup_trexpr.php:180
+msgid "Difference between MAX and MIN value of a period T is NOT N"
+msgstr ""
+
+#: popup_trexpr.php:221
+msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:225
+msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:185
+msgid "Difference between last and previous value is < N"
+msgstr ""
+
+#: popup_trexpr.php:193
+msgid "Difference between last and previous value is = N"
+msgstr ""
+
+#: popup_trexpr.php:189
+msgid "Difference between last and previous value is > N"
+msgstr ""
+
+#: popup_trexpr.php:197
+msgid "Difference between last and previous value is NOT N"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:145
+#: include/classes/items/CHelpItems.php:407
+msgid "Different information about specific process(es)"
+msgstr ""
+
+#: include/views/configuration.screen.list.php:52
+msgid "Dimension (cols x rows)"
+msgstr ""
+
+#: include/views/administration.auditlogs.list.php:49
+msgid "Disable"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:144
+msgid "Disable debug mode"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:145
+msgid "Disable debug mode in selected groups?"
+msgstr ""
+
+#: include/actions.inc.php:388 include/actions.inc.php:611
+msgid "Disable host"
+msgstr ""
+
+#: hosts.php:991
+msgid "Disable host?"
+msgstr ""
+
+#: include/views/configuration.hostgroups.list.php:161
+msgid "Disable hosts in the selected host groups?"
+msgstr ""
+
+#: include/views/administration.proxy.list.php:107
+msgid "Disable hosts monitored by selected proxies?"
+msgstr ""
+
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
+#: include/views/administration.usergroups.list.php:136
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
+#: include/views/configuration.item.prototype.list.php:116
+#: include/views/configuration.triggers.list.php:292
+msgid "Disable selected"
+msgstr ""
+
+#: include/views/configuration.action.list.php:101
+msgid "Disable selected actions?"
+msgstr ""
+
+#: include/views/configuration.application.list.php:116
+msgid "Disable selected applications?"
+msgstr ""
+
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
+msgid "Disable selected discovery rules?"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:137
+msgid "Disable selected groups?"
+msgstr ""
+
+#: include/views/configuration.host.prototype.list.php:125
+msgid "Disable selected host prototypes?"
+msgstr ""
+
+#: hosts.php:1074
+msgid "Disable selected hosts?"
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:117
+msgid "Disable selected item prototypes?"
+msgstr ""
+
+#: include/views/configuration.item.list.php:268
+msgid "Disable selected items?"
+msgstr ""
+
+#: include/views/administration.mediatypes.list.php:121
+msgid "Disable selected media types?"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:295
+msgid "Disable selected trigger prototypes?"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:295
+msgid "Disable selected triggers?"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
+#: include/httptest.inc.php:46 include/items.inc.php:155
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
+#: include/views/administration.usergroups.list.php:58
+#: include/views/administration.usergroups.list.php:83
+#: include/views/administration.usergroups.list.php:87
+#: include/views/administration.users.edit.php:187
+#: include/views/administration.users.list.php:143
+#: include/views/administration.users.list.php:144
+#: include/views/configuration.action.list.php:72
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
+#: include/views/configuration.item.massupdate.php:300
+#: include/views/js/configuration.sysmaps.js.php:156
+#: include/views/monitoring.dashconf.php:41 popup_media.php:133
+#: tr_logform.php:341
+msgid "Disabled"
+msgstr ""
+
+#: adm.triggerseverities.php:64
+#: include/views/administration.general.triggerSeverity.edit.php:64
+msgid "Disaster"
+msgstr ""
+
+#: include/discovery.inc.php:155
+msgid "Discovered"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:184
+msgid "Discovered by"
+msgstr ""
+
+#: include/views/monitoring.discovery.php:40
+msgid "Discovered device"
+msgstr ""
+
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
+#: include/views/configuration.action.list.php:34
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
+#: search.php:201 search.php:399 search.php:442 search.php:459
+#: templates.php:515 templates.php:578
+msgid "Discovery"
+msgstr ""
+
+#: include/views/configuration.discovery.edit.php:47
+msgid "Discovery by proxy"
+msgstr ""
+
+#: include/actions.inc.php:70
+msgid "Discovery check"
+msgstr ""
+
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
+msgid "Discovery check error"
+msgstr ""
+
+#: popup.php:111
+msgid "Discovery checks"
+msgstr ""
+
+#: include/html.inc.php:349
+msgid "Discovery list"
+msgstr ""
+
+#: include/actions.inc.php:72
+msgid "Discovery object"
+msgstr ""
+
+#: include/actions.inc.php:68 include/audit.inc.php:43
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
+#: include/views/configuration.discovery.list.php:29
+#: include/views/monitoring.discovery.php:32
+msgid "Discovery rule"
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:40
+#, c-format
+msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:41
+#, c-format
+msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
+#, c-format
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:903
+#, c-format
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr ""
+
+#: discoveryconf.php:153 host_discovery.php:297
+msgid "Discovery rule created"
+msgstr ""
+
+#: discoveryconf.php:178 host_discovery.php:185
+msgid "Discovery rule deleted"
+msgstr ""
+
+#: discoveryconf.php:202 host_discovery.php:321
+msgid "Discovery rule disabled"
+msgid_plural "Discovery rules disabled"
+msgstr[0] ""
+
+#: discoveryconf.php:201 host_discovery.php:320
+msgid "Discovery rule enabled"
+msgid_plural "Discovery rules enabled"
+msgstr[0] ""
+
+#: discoveryconf.php:146 host_discovery.php:293
+msgid "Discovery rule updated"
+msgstr ""
+
+#: include/html.inc.php:472 include/html.inc.php:476
+#: include/views/configuration.host.discovery.list.php:32
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
+msgid "Discovery rules"
+msgstr ""
+
+#: discoveryconf.php:220 host_discovery.php:334
+msgid "Discovery rules deleted"
+msgstr ""
+
+#: dashboard.php:492 include/actions.inc.php:80
+msgid "Discovery status"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:105
+msgid "Display OK triggers for"
+msgstr ""
+
+#: include/func.inc.php:1559
+msgid "Displaying"
+msgstr ""
+
+#: search.php:238 search.php:340 search.php:486
+#, c-format
+msgid "Displaying %1$s of %2$s found"
+msgstr ""
+
+#: report6.php:237
+msgid "Distribution of values for multiple items"
+msgstr ""
+
+#: report6.php:236
+msgid "Distribution of values for multiple periods"
+msgstr ""
+
+#: include/services.inc.php:26
+msgid "Do not calculate"
+msgstr ""
+
+#: jsLoader.php:187
+msgid "Do you wish to replace the conditional expression?"
+msgstr ""
+
+#: jsLoader.php:132
+msgid "Done"
+msgstr ""
+
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
+msgid "Dot"
+msgstr ""
+
+#: include/blocks.inc.php:1258
+msgctxt "discovery results in dashboard"
+msgid "Down"
+msgstr ""
+
+#: include/discovery.inc.php:154
+msgctxt "discovery status"
+msgid "Down"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
+#: include/views/monitoring.discovery.php:42
+#: include/views/monitoring.discovery.php:164 report3.php:83
+msgid "Downtime"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:306
+msgid "Drag here to change the type of the interface to \"IPMI\" type."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:291
+msgid "Drag here to change the type of the interface to \"JMX\" type."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:275
+msgid "Drag here to change the type of the interface to \"SNMP\" type."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:258
+msgid "Drag here to change the type of the interface to \"agent\" type."
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:235
+msgid "Draw style"
+msgstr ""
+
+#: include/views/administration.general.gui.edit.php:32
+msgid "Dropdown first entry"
+msgstr ""
+
+#: adm.gui.php:77
+#, c-format
+msgid "Dropdown first entry \"%1$s\"."
+msgstr ""
+
+#: adm.gui.php:78
+#, c-format
+msgid "Dropdown remember selected \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1549
+#, c-format
+msgid "Duplicate dependencies in trigger \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:197
+#, c-format
+msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:191
+#, c-format
+msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:626
+#, c-format
+msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:644
+#, c-format
+msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:378
+#, c-format
+msgid "Duplicate map name for map \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
+#, c-format
+msgid "Duplicate script name \"%1$s\"."
+msgstr ""
+
+#: include/profiles.inc.php:122
+#, c-format
+msgid "Duplicate severity name \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:281
+#, c-format
+msgid "Duplicate user alias \"%s\"."
+msgstr ""
+
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
+msgid "Duration"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:370
+msgid "Duration (sec)"
+msgstr ""
+
+#: include/locales.inc.php:60
+msgid "Dutch (nl_NL)"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:730
+msgid "Dynamic item"
+msgstr ""
+
+#: include/func.inc.php:669
+msgctxt "Exa short"
+msgid "E"
+msgstr ""
+
+#: include/func.inc.php:1750
+msgid "ERROR"
+msgstr ""
+
+#: tr_events.php:102
+msgid "EVENTS"
+msgstr ""
+
+#: jsLoader.php:153
+msgid "Each URL should have a unique name. Please make sure there is only one URL named"
+msgstr ""
+
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.maintenance.edit.php:112
+#: include/views/configuration.screen.list.php:61
+#: include/views/configuration.sysmap.list.php:46
+#: include/views/configuration.sysmap.list.php:55
+#: include/views/configuration.triggers.edit.php:81
+#: include/views/js/adm.regexprs.edit.js.php:7
+#: include/views/js/configuration.discovery.edit.js.php:7
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
+msgid "Edit"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:7
+msgid "Edit map element"
+msgstr ""
+
+#: jsLoader.php:189
+msgid "Edit trigger"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:137
+msgid "Element"
+msgstr ""
+
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
+msgid "Element name"
+msgstr ""
+
+#: include/media.inc.php:24
+#: include/views/administration.mediatypes.edit.php:40
+msgid "Email"
+msgstr ""
+
+#: popup.php:516
+msgid "Empty"
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
+msgid "Empty action condition."
+msgstr ""
+
+#: include/classes/validators/CColorValidator.php:33
+msgid "Empty color."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
+#, c-format
+msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:878
+#, c-format
+msgid "Empty filter condition macro for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:458
+msgid "Empty host ID for host prototype."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:173
+msgid "Empty host."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
+msgid "Empty input parameter."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
+msgid "Empty input parameters."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:198
+msgid "Empty input."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:601
+msgid "Empty macro."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:222
+msgid "Empty name for group prototype."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:181
+#, c-format
+msgid "Empty name for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:556
+#, c-format
+msgid "Empty name for script \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
+msgid "Empty name for script."
+msgstr ""
+
+#: include/classes/api/services/CService.php:907
+msgid "Empty name."
+msgstr ""
+
+#: include/classes/api/services/CImage.php:406
+msgid "Empty parameters"
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:231
+#, c-format
+msgid "Empty response received from Zabbix server \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreen.php:471
+msgid "Empty screen ID for screen."
+msgstr ""
+
+#: include/classes/api/services/CTemplateScreen.php:597
+msgid "Empty screen ID for template screen."
+msgstr ""
+
+#: include/classes/validators/CTimePeriodValidator.php:46
+msgid "Empty time period."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
+#: include/views/administration.auditlogs.list.php:48
+msgid "Enable"
+msgstr ""
+
+#: include/views/administration.script.edit.php:101
+msgid "Enable confirmation"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:140
+msgid "Enable debug mode"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:141
+msgid "Enable debug mode in selected groups?"
+msgstr ""
+
+#: include/views/administration.general.gui.edit.php:41
+msgid "Enable event acknowledges"
+msgstr ""
+
+#: include/actions.inc.php:385 include/actions.inc.php:610
+msgid "Enable host"
+msgstr ""
+
+#: hosts.php:997
+msgid "Enable host?"
+msgstr ""
+
+#: include/views/administration.proxy.list.php:103
+msgid "Enable hosts monitored by selected proxies?"
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:30
+#: include/views/administration.general.housekeeper.edit.php:68
+#: include/views/administration.general.housekeeper.edit.php:87
+#: include/views/administration.general.housekeeper.edit.php:106
+#: include/views/administration.general.housekeeper.edit.php:125
+#: include/views/administration.general.housekeeper.edit.php:146
+msgid "Enable internal housekeeping"
+msgstr ""
+
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
+#: include/views/administration.usergroups.list.php:132
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
+#: include/views/configuration.item.prototype.list.php:112
+#: include/views/configuration.triggers.list.php:285
+msgid "Enable selected"
+msgstr ""
+
+#: include/views/configuration.action.list.php:97
+msgid "Enable selected actions?"
+msgstr ""
+
+#: include/views/configuration.application.list.php:112
+msgid "Enable selected applications?"
+msgstr ""
+
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
+msgid "Enable selected discovery rules?"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:133
+msgid "Enable selected groups?"
+msgstr ""
+
+#: include/views/configuration.host.prototype.list.php:121
+msgid "Enable selected host prototypes?"
+msgstr ""
+
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
+msgid "Enable selected hosts?"
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:113
+msgid "Enable selected item prototypes?"
+msgstr ""
+
+#: include/views/configuration.item.list.php:264
+msgid "Enable selected items?"
+msgstr ""
+
+#: include/views/administration.mediatypes.list.php:117
+msgid "Enable selected media types?"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:288
+msgid "Enable selected trigger prototypes?"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:288
+msgid "Enable selected triggers?"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
+#: include/httptest.inc.php:45 include/items.inc.php:154
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.list.php:57
+#: include/views/administration.usergroups.list.php:82
+#: include/views/administration.usergroups.list.php:87
+#: include/views/administration.users.edit.php:183
+#: include/views/administration.users.list.php:143
+#: include/views/administration.users.list.php:144
+#: include/views/configuration.action.edit.php:61
+#: include/views/configuration.action.list.php:78
+#: include/views/configuration.discovery.edit.php:76
+#: include/views/configuration.host.discovery.edit.php:260
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
+#: include/views/monitoring.dashconf.php:37 popup_media.php:132
+msgid "Enabled"
+msgstr ""
+
+#: include/locales.inc.php:54
+msgid "English (en_GB)"
+msgstr ""
+
+#: include/locales.inc.php:55
+msgid "English (en_US)"
+msgstr ""
+
+#: include/actions.inc.php:918 include/items.inc.php:35
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
+msgid "Error"
+msgstr ""
+
+#: include/db.inc.php:749
+#, c-format
+msgid "Error in search request for table \"%1$s\"."
+msgstr ""
+
+#: httpdetails.php:161 httpdetails.php:234
+#, c-format
+msgid "Error: %1$s"
+msgstr ""
+
+#: include/events.inc.php:173
+msgid "Event"
+msgstr ""
+
+#: include/classes/screens/CScreenHistory.php:168
+msgid "Event ID"
+msgstr ""
+
+#: popup_trexpr.php:433
+msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:438
+msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
+msgstr ""
+
+#: acknow.php:167 include/actions.inc.php:86
+msgid "Event acknowledged"
+msgstr ""
+
+#: adm.gui.php:74
+#, c-format
+msgid "Event acknowledges \"%1$s\"."
+msgstr ""
+
+#: include/views/monitoring.dashconf.php:110
+msgid "Event acknowledging disabled"
+msgstr ""
+
+#: tr_events.php:30 tr_events.php:112
+msgid "Event details"
+msgstr ""
+
+#: include/triggers.inc.php:1484
+msgid "Event generation"
+msgstr ""
+
+#: tr_events.php:137
+msgid "Event list [previous 20]"
+msgstr ""
+
+#: include/views/configuration.action.list.php:38
+msgid "Event source"
+msgstr ""
+
+#: tr_events.php:108
+msgid "Event source details"
+msgstr ""
+
+#: include/actions.inc.php:92
+msgid "Event type"
+msgstr ""
+
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
+msgid "Events"
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:61
+msgid "Events and alerts"
+msgstr ""
+
+#: include/forms.inc.php:1645
+msgid "Every day(s)"
+msgstr ""
+
+#: include/forms.inc.php:1652
+msgid "Every week(s)"
+msgstr ""
+
+#: include/func.inc.php:669
+msgid "Exa"
+msgstr ""
+
+#: tr_logform.php:256 tr_logform.php:298
+msgid "Exclude"
+msgstr ""
+
+#: jsLoader.php:105
+msgid "Execute"
+msgstr ""
+
+#: include/classes/api/services/CImage.php:244
+#, c-format
+msgid "Execute SQL error [%1$s] in [%2$s]."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
+#: include/views/administration.script.list.php:40
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
+msgid "Execute on"
+msgstr ""
+
+#: include/views/administration.auditacts.list.php:84
+msgid "Executed"
+msgstr ""
+
+#: include/items.inc.php:1315
+#: include/views/configuration.host.discovery.edit.php:179
+#: include/views/configuration.item.edit.php:185
+msgid "Executed script"
+msgstr ""
+
+#: jsLoader.php:106
+msgid "Execution confirmation"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:73
+msgid "Expand macros"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:66
+msgid "Expand single problem"
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:90
+#, c-format
+msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
+msgstr ""
+
+#: include/views/configuration.maintenance.list.php:57
+msgctxt "maintenance status"
+msgid "Expired"
+msgstr ""
+
+#: include/graphs.inc.php:27 popup.php:1379
+msgid "Exploded"
+msgstr ""
+
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
+msgid "Export selected"
+msgstr ""
+
+#: events.php:303
+msgid "Export to CSV"
+msgstr ""
+
+#: include/triggers.inc.php:1481
+#: include/views/administration.general.iconmap.edit.php:41
+#: include/views/administration.general.regularexpressions.edit.php:42
+#: include/views/administration.general.regularexpressions.edit.php:51
+#: include/views/administration.general.regularexpressions.edit.php:73
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
+msgid "Expression"
+msgstr ""
+
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
+msgid "Expression Syntax Error."
+msgstr ""
+
+#: tr_testexpr.php:50
+msgid "Expression Variable Elements"
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
+msgid "Expression cannot be empty"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:134
+msgid "Expression constructor"
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.edit.php:43
+#: include/views/administration.general.regularexpressions.edit.php:52
+#: include/views/administration.general.regularexpressions.edit.php:73
+msgid "Expression type"
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.edit.php:48
+#: include/views/administration.general.regularexpressions.edit.php:80
+#: include/views/administration.general.regularexpressions.list.php:32
+msgid "Expressions"
+msgstr ""
+
+#: include/items.inc.php:91
+msgid "External check"
+msgstr ""
+
+#: include/media.inc.php:28
+#: include/views/administration.mediatypes.edit.php:45
+msgid "Ez Texting"
+msgstr ""
+
+#: jsLoader.php:128
+msgctxt "Friday short"
+msgid "F"
+msgstr ""
+
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
+msgid "FALSE"
+msgstr ""
+
+#: include/discovery.inc.php:59
+#: include/views/js/configuration.discovery.edit.js.php:169
+msgid "FTP"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
+msgid "Fail"
+msgstr ""
+
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
+msgid "Failed"
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:536
+msgid "Failed to update template."
+msgstr ""
+
+#: include/items.inc.php:37
+msgid "Failure Audit"
+msgstr ""
+
+#: dashboard.php:316 jsLoader.php:191
+msgid "Favourite graphs"
+msgstr ""
+
+#: dashboard.php:330 jsLoader.php:192
+msgid "Favourite maps"
+msgstr ""
+
+#: dashboard.php:344 jsLoader.php:193
+msgid "Favourite screens"
+msgstr ""
+
+#: jsLoader.php:194
+msgid "Favourite simple graphs"
+msgstr ""
+
+#: jsLoader.php:195
+msgid "Favourite slide shows"
+msgstr ""
+
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
+msgid "Favourites"
+msgstr ""
+
+#: include/func.inc.php:238
+msgid "Feb"
+msgstr ""
+
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
+msgid "February"
+msgstr ""
+
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
+msgid "Field"
+msgstr ""
+
+#: include/classes/db/DB.php:322
+#, c-format
+msgid "Field \"%1$s\" cannot be set to NULL."
+msgstr ""
+
+#: include/validate.inc.php:433
+#, c-format
+msgid "Field \"%1$s\" is mandatory."
+msgstr ""
+
+#: include/validate.inc.php:307
+#, c-format
+msgid "Field \"%1$s\" is not IP range."
+msgstr ""
+
+#: include/validate.inc.php:301
+#, c-format
+msgid "Field \"%1$s\" is not IP."
+msgstr ""
+
+#: include/validate.inc.php:313
+#, c-format
+msgid "Field \"%1$s\" is not integer list or range."
+msgstr ""
+
+#: include/validate.inc.php:319
+#, c-format
+msgid "Field \"%1$s\" is not integer."
+msgstr ""
+
+#: include/validate.inc.php:366
+#, c-format
+msgid "Field \"%1$s\" is not string."
+msgstr ""
+
+#: include/validate.inc.php:445
+#, c-format
+msgid "Field \"%1$s\" must be missing."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:341
+msgid "Field \"druleid\" is required."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:439
+msgid "Field \"host\" is mandatory."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:348
+msgid "Field \"name\" is required."
+msgstr ""
+
+#: include/classes/api/services/CImage.php:599
+msgid "File format is unsupported."
+msgstr ""
+
+#: include/classes/helpers/CUploadFile.php:153
+#, c-format
+msgid "File is too big, max upload size is %1$s bytes."
+msgstr ""
+
+#: include/classes/core/CView.php:68
+#, c-format
+msgid "File provided to a view does not exist. Tried to find \"%s\"."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:281
+#: include/classes/items/CHelpItems.php:543
+msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
+msgstr ""
+
+#: include/graphs.inc.php:57
+msgid "Filled region"
+msgstr ""
+
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
+#: include/views/administration.auditacts.list.php:49
+#: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
+#: include/views/inventory.host.list.php:52
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
+msgid "Filter"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
+msgid "Filter by application"
+msgstr ""
+
+#: report2.php:323
+msgid "Filter by host group"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:134
+msgid "Filter by host inventory"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:95
+msgid "Filter by name"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
+msgid "Filters"
+msgstr ""
+
+#: popup_trexpr.php:305
+msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:310
+msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:273
+#: include/classes/items/CHelpItems.php:535
+msgid "Find string in a file. 0 - expression not found, 1 - found"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:269
+#: include/classes/items/CHelpItems.php:531
+msgid "Find string in a file. Matched string"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:121
+msgid "Finish"
+msgstr ""
+
+#: include/locales.inc.php:61
+msgid "Finnish (fi_FI)"
+msgstr ""
+
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
+msgid "First"
+msgstr ""
+
+#: include/func.inc.php:1504
+msgctxt "page navigation"
+msgid "First"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:42
+msgid "Fit to map"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
+msgid "Fixed"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:223
+#: include/views/configuration.item.edit.php:290
+#: include/views/configuration.item.massupdate.php:348
+msgid "Flexible intervals"
+msgstr ""
+
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
+msgid "For guest, password must be empty"
+msgstr ""
+
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
+msgid "Formula"
+msgstr ""
+
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
+msgid "Fourth"
+msgstr ""
+
+#: include/locales.inc.php:62
+msgid "French (fr_FR)"
+msgstr ""
+
+#: include/func.inc.php:218
+msgid "Fri"
+msgstr ""
+
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
+msgid "Friday"
+msgstr ""
+
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
+#: services.php:193
+msgid "From"
+msgstr ""
+
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
+#: include/views/administration.usergroups.list.php:48
+#: include/views/administration.users.list.php:61
+msgid "Frontend access"
+msgstr ""
+
+#: usergrps.php:294
+msgid "Frontend access updated"
+msgstr ""
+
+#: include/views/administration.users.edit.php:232
+msgid "Frontend messaging"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
+msgid "Full clone"
+msgstr ""
+
+#: include/html.inc.php:203
+msgid "Fullscreen"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
+msgid "Function"
+msgstr ""
+
+#: popup_trexpr.php:695
+#, c-format
+msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
+msgstr ""
+
+#: include/func.inc.php:666
+msgctxt "Giga short"
+msgid "G"
+msgstr ""
+
+#: include/views/monitoring.charts.php:32
+#: include/views/monitoring.charts.php:41
+msgid "GRAPHS"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:61
+#: include/views/administration.mediatypes.list.php:60
+msgid "GSM modem"
+msgstr ""
+
+#: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
+#: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
+#: adm.valuemapping.php:126 adm.workingtime.php:62
+#: include/views/administration.general.gui.edit.php:51
+msgid "GUI"
+msgstr ""
+
+#: include/classes/user/CWebUser.php:51
+msgid "GUI access disabled."
+msgstr ""
+
+#: include/menu.inc.php:218
+msgid "General"
+msgstr ""
+
+#: chart4.php:168 chart5.php:200
+#: include/classes/graphdraw/CBarGraphDraw.php:797
+#, c-format
+msgid "Generated in %s sec"
+msgstr ""
+
+#: include/locales.inc.php:63
+msgid "German (de_DE)"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:297
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:257
+#: include/classes/items/CHelpItems.php:519
+msgid "Get contents of a given file."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:305
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
+msgstr ""
+
+#: include/page_header.php:194
+msgid "Get support"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:301
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
+msgstr ""
+
+#: include/func.inc.php:666
+msgid "Giga"
+msgstr ""
+
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
+msgid "Given expression is not a macro"
+msgstr ""
+
+#: include/classes/regexp/CGlobalRegexp.php:78
+msgid "Global expression does not exist."
+msgstr ""
+
+#: include/views/configuration.action.edit.php:733
+msgid "Global script"
+msgstr ""
+
+#: popup.php:115
+msgid "Global scripts"
+msgstr ""
+
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
+#: include/views/administration.usergroups.list.php:152
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
+#: include/views/configuration.item.prototype.list.php:124
+#: include/views/configuration.maintenance.list.php:85
+#: include/views/configuration.screen.list.php:74
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
+msgid "Go"
+msgstr ""
+
+#: jsLoader.php:200
+msgid "Go to"
+msgstr ""
+
+#: include/func.inc.php:1683
+msgid "Go to dashboard"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:113
+msgid "Google Chrome"
+msgstr ""
+
+#: include/graphs.inc.php:65
+msgid "Gradient line"
+msgstr ""
+
+#: include/audit.inc.php:29 include/screens.inc.php:30
+#: include/views/configuration.graph.edit.php:293
+#: include/views/monitoring.charts.php:27
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
+msgid "Graph"
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
+#, c-format
+msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
+#, c-format
+msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
+#: include/graphs.inc.php:345
+#, c-format
+msgid "Graph \"%1$s\" already exists on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
+#, c-format
+msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
+#, c-format
+msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
+#, c-format
+msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTemplateScreen.php:494
+#, c-format
+msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
+#, c-format
+msgid "Graph \"%1$s\" skipped - user rule."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:38
+#, c-format
+msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
+msgstr ""
+
+#: graphs.php:254
+msgid "Graph added"
+msgstr ""
+
+#: graphs.php:298
+msgid "Graph deleted"
+msgstr ""
+
+#: include/audit.inc.php:30
+msgid "Graph element"
+msgstr ""
+
+#: popup_bitem.php:28
+msgid "Graph item"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
+msgid "Graph name"
+msgstr ""
+
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
+msgid "Graph prototype"
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:785
+#, c-format
+msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:791
+#, c-format
+msgid "Graph prototype \"%1$s\" must have at least one item prototype."
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:38
+#, c-format
+msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:593
+#, c-format
+msgid "Graph prototype \"%s\" deleted."
+msgstr ""
+
+#: graphs.php:236
+msgid "Graph prototype added"
+msgstr ""
+
+#: graphs.php:290
+msgid "Graph prototype deleted"
+msgstr ""
+
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
+msgid "Graph prototype updated"
+msgstr ""
+
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
+msgid "Graph prototypes"
+msgstr ""
+
+#: graphs.php:314
+msgid "Graph prototypes deleted"
+msgstr ""
+
+#: include/views/configuration.graph.list.php:32
+msgid "Graph prototypes of"
+msgstr ""
+
+#: include/views/js/configuration.graph.edit.js.php:31
+msgid "Graph sum"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
+msgid "Graph type"
+msgstr ""
+
+#: graphs.php:248
+msgid "Graph updated"
+msgstr ""
+
+#: include/classes/api/services/CGraphGeneral.php:758
+#, c-format
+msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
+msgid "Graph with same name but other type exist."
+msgstr ""
+
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
+#: include/views/configuration.graph.list.php:56
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
+#: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
+#: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
+#: templates.php:513 templates.php:574
+msgid "Graphs"
+msgstr ""
+
+#: graphs.php:374
+msgid "Graphs copied"
+msgstr ""
+
+#: graphs.php:322
+msgid "Graphs deleted"
+msgstr ""
+
+#: include/locales.inc.php:64
+msgid "Greek (el_GR)"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:75
+#: include/views/js/configuration.sysmaps.js.php:64
+msgid "Grid"
+msgstr ""
+
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
+#: include/classes/screens/CScreenHostgroupTriggers.php:66
+#: include/classes/screens/CScreenHostgroupTriggers.php:125
+#: include/classes/screens/CScreenHostTriggers.php:126
+#: include/reports.inc.php:334 include/screens.inc.php:348
+#: include/views/configuration.application.list.php:44
+#: include/views/configuration.copy.elements.php:60
+#: include/views/configuration.graph.list.php:53
+#: include/views/configuration.httpconf.list.php:43
+#: include/views/configuration.maintenance.list.php:32
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
+#: include/views/configuration.triggers.list.php:74
+#: include/views/inventory.host.list.php:25
+#: include/views/inventory.host.list.php:75
+#: include/views/monitoring.charts.php:25
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
+#: include/views/monitoring.screen.php:96
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
+msgid "Group"
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:564
+#, c-format
+msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
+msgstr ""
+
+#: include/classes/import/importers/CTemplateImporter.php:250
+#, c-format
+msgid "Group \"%1$s\" does not exist."
+msgstr ""
+
+#: include/classes/import/importers/CHostImporter.php:153
+#, c-format
+msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
+msgstr ""
+
+#: hostgroups.php:119 usergrps.php:194
+msgid "Group added"
+msgstr ""
+
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+msgid "Group deleted"
+msgid_plural "Groups deleted"
+msgstr[0] ""
+
+#: include/views/administration.general.other.edit.php:36
+msgid "Group for discovered hosts"
+msgstr ""
+
+#: adm.other.php:72
+#, c-format
+msgid "Group for discovered hosts \"%1$s\"."
+msgstr ""
+
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
+msgid "Group name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
+msgid "Group prototype ID cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
+#, c-format
+msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
+msgstr ""
+
+#: include/views/configuration.host.prototype.edit.php:205
+msgid "Group prototypes"
+msgstr ""
+
+#: hostgroups.php:70 usergrps.php:187
+msgid "Group updated"
+msgstr ""
+
+#: hostinventoriesoverview.php:91
+msgid "Grouping by"
+msgstr ""
+
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
+#: include/views/administration.users.list.php:58
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
+msgid "Groups"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:178
+msgid "Groups in maintenance"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
+msgid "H:i"
+msgstr ""
+
+#: include/translateDefines.inc.php:33
+msgid "H:i:s"
+msgstr ""
+
+#: events.php:306
+msgid "HISTORY OF EVENTS"
+msgstr ""
+
+#: include/classes/screens/CScreenHostgroupTriggers.php:132
+msgid "HOST GROUP ISSUES"
+msgstr ""
+
+#: include/views/inventory.host.list.php:26
+#: include/views/inventory.host.view.php:23
+msgid "HOST INVENTORY"
+msgstr ""
+
+#: hostinventoriesoverview.php:72
+msgid "HOST INVENTORY OVERVIEW"
+msgstr ""
+
+#: include/classes/screens/CScreenHostTriggers.php:131
+msgid "HOST ISSUES"
+msgstr ""
+
+#: include/discovery.inc.php:60
+#: include/views/administration.authentication.edit.php:48
+#: include/views/js/configuration.discovery.edit.js.php:170
+msgid "HTTP"
+msgstr ""
+
+#: include/perm.inc.php:50
+msgid "HTTP authentication"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
+msgid "HTTP proxy"
+msgstr ""
+
+#: include/discovery.inc.php:71
+#: include/views/js/configuration.discovery.edit.js.php:171
+msgid "HTTPS"
+msgstr ""
+
+#: include/hosts.inc.php:250
+msgid "HW architecture"
+msgstr ""
+
+#: include/hosts.inc.php:170
+msgid "Hardware"
+msgstr ""
+
+#: include/hosts.inc.php:175
+msgid "Hardware (Full details)"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
+#: include/views/configuration.graph.list.php:79
+#: include/views/configuration.screen.constructor.edit.php:677
+#: include/views/configuration.sysmap.edit.php:43
+#: include/views/configuration.sysmap.list.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
+#: sysmaps.php:50
+msgid "Height"
+msgstr ""
+
+#: include/page_header.php:192 include/views/general.login.php:38
+msgid "Help"
+msgstr ""
+
+#: include/items.inc.php:139
+msgid "Hexadecimal"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+msgid "Hidden"
+msgstr ""
+
+#: include/classes/html/CCollapsibleUiWidget.php:48
+msgid "Hide"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:55
+msgid "Hide all"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:49
+msgid "Hide disabled scenarios"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:63
+msgid "Hide disabled trigger prototypes"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:81
+msgid "Hide disabled triggers"
+msgstr ""
+
+#: include/classes/html/widget/CWidget.php:128
+msgid "Hide filter"
+msgstr ""
+
+#: include/views/monitoring.history.php:116
+msgid "Hide selected"
+msgstr ""
+
+#: include/views/monitoring.dashconf.php:68
+msgid "Hide selected groups"
+msgstr ""
+
+#: adm.triggerseverities.php:62
+#: include/views/administration.general.triggerSeverity.edit.php:58
+msgid "High"
+msgstr ""
+
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
+#: include/page_header.php:323
+#: include/views/administration.general.housekeeper.edit.php:140
+#: include/views/configuration.item.list.php:67
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
+msgid "History"
+msgstr ""
+
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
+msgid "History cleared"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
+msgid "History clearing can take a long time. Continue?"
+msgstr ""
+
+#: adm.housekeeper.php:59
+msgid "History data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:112
+#, c-format
+msgid "History data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: include/screens.inc.php:32
+msgid "History of events"
+msgstr ""
+
+#: disc_prototypes.php:115 items.php:54
+msgid "History storage period"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.massupdate.php:381
+msgid "History storage period (in days)"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:641
+msgid "Horizontal"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:702
+msgid "Horizontal align"
+msgstr ""
+
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
+#: include/actions.inc.php:64 include/audit.inc.php:27
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
+#: include/classes/screens/CScreenHostgroupTriggers.php:126
+#: include/classes/screens/CScreenHostTriggers.php:67
+#: include/classes/screens/CScreenHostTriggers.php:127
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
+#: include/views/configuration.application.list.php:45
+#: include/views/configuration.application.list.php:60
+#: include/views/configuration.graph.list.php:54
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
+#: include/views/configuration.httpconf.list.php:44
+#: include/views/configuration.httpconf.list.php:62
+#: include/views/configuration.item.list.php:62
+#: include/views/configuration.screen.constructor.edit.php:415
+#: include/views/configuration.triggers.list.php:75
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
+#: include/views/inventory.host.list.php:74
+#: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
+#: include/views/js/configuration.action.edit.js.php:88
+#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.sysmaps.js.php:17
+#: include/views/js/configuration.sysmaps.js.php:97
+#: include/views/monitoring.charts.php:26
+#: include/views/monitoring.screen.php:97
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
+msgid "Host"
+msgid_plural "Hosts"
+msgstr[0] ""
+
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
+#, c-format
+msgid "Host \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:576
+#, c-format
+msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:968
+#, c-format
+msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:437
+msgid "Host (ascending)"
+msgstr ""
+
+#: include/actions.inc.php:74
+msgid "Host IP"
+msgstr ""
+
+#: include/views/administration.script.list.php:44
+msgid "Host access"
+msgstr ""
+
+#: hosts.php:393
+msgid "Host added"
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:815
+msgid "Host cannot have more than one default interface of the same type."
+msgstr ""
+
+#: hostinventoriesoverview.php:101
+#: include/views/administration.proxy.list.php:43
+msgid "Host count"
+msgstr ""
+
+#: hosts.php:634 hosts.php:647
+msgid "Host deleted"
+msgstr ""
+
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
+msgid "Host disabled"
+msgid_plural "Hosts disabled"
+msgstr[0] ""
+
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
+msgid "Host enabled"
+msgid_plural "Hosts enabled"
+msgstr[0] ""
+
+#: include/actions.inc.php:60 include/audit.inc.php:35
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
+#: include/views/administration.script.list.php:43
+#: include/views/configuration.hostgroups.edit.php:67
+#: include/views/js/configuration.action.edit.js.php:89
+#: include/views/js/configuration.action.edit.js.php:200
+#: include/views/js/configuration.sysmaps.js.php:20
+#: include/views/js/configuration.sysmaps.js.php:30
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
+msgid "Host group"
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
+#, c-format
+msgid "Host group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:596
+#, 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:577
+#, c-format
+msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:551
+#, c-format
+msgid "Host group \"%1$s\" is internal and can not be deleted."
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:33
+msgid "Host group elements"
+msgstr ""
+
+#: include/screens.inc.php:39
+msgid "Host group issues"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:75
+msgid "Host group label type"
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
+msgid "Host group name cannot be empty."
+msgstr ""
+
+#: include/forms.inc.php:176 include/menu.inc.php:154
+#: include/views/configuration.copy.elements.php:48
+#: include/views/configuration.hostgroups.list.php:39
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
+msgid "Host groups"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:100
+#: include/views/configuration.item.edit.php:106
+#: include/views/configuration.item.massupdate.php:84
+msgid "Host interface"
+msgstr ""
+
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
+msgid "Host inventory"
+msgstr ""
+
+#: hostinventoriesoverview.php:26
+msgid "Host inventory overview"
+msgstr ""
+
+#: include/screens.inc.php:40
+msgid "Host issues"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:83
+msgid "Host label type"
+msgstr ""
+
+#: include/html.inc.php:307
+msgid "Host list"
+msgstr ""
+
+#: include/actions.inc.php:94
+msgid "Host metadata"
+msgstr ""
+
+#: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
+#: include/views/configuration.host.edit.php:194
+#: include/views/configuration.host.prototype.edit.php:66
+#: include/views/inventory.host.view.php:41
+msgid "Host name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:174
+#, c-format
+msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:176
+#, c-format
+msgid "Host name for host prototype \"%1$s\" must contain macros."
+msgstr ""
+
+#: include/hosts.inc.php:290
+msgid "Host networks"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:785
+#, c-format
+msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:773
+#, c-format
+msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:189
+#, c-format
+msgid "Host prototype \"%1$s\" must have at least one host group."
+msgstr ""
+
+#: host_prototypes.php:208
+msgid "Host prototype added"
+msgstr ""
+
+#: host_prototypes.php:128
+msgid "Host prototype deleted"
+msgstr ""
+
+#: host_prototypes.php:239
+msgid "Host prototype disabled"
+msgid_plural "Host prototypes disabled"
+msgstr[0] ""
+
+#: host_prototypes.php:238
+msgid "Host prototype enabled"
+msgid_plural "Host prototypes enabled"
+msgstr[0] ""
+
+#: host_prototypes.php:194
+msgid "Host prototype updated"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:1099
+#, c-format
+msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:1095
+#, c-format
+msgid "Host prototype with host name \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:1107
+#, c-format
+msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:1104
+#, c-format
+msgid "Host prototype with visible name \"%1$s\" already exists."
+msgstr ""
+
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
+msgid "Host prototypes"
+msgstr ""
+
+#: host_prototypes.php:257
+msgid "Host prototypes deleted"
+msgstr ""
+
+#: include/views/configuration.host.prototype.list.php:34
+msgid "Host prototypes of"
+msgstr ""
+
+#: include/hosts.inc.php:300
+msgid "Host router"
+msgstr ""
+
+#: host_screen.php:27 jsLoader.php:204
+msgid "Host screens"
+msgstr ""
+
+#: dashboard.php:416
+msgid "Host status"
+msgstr ""
+
+#: include/hosts.inc.php:295
+msgid "Host subnet mask"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:605
+msgid "Host time"
+msgstr ""
+
+#: include/classes/api/services/CHost.php:846
+msgid "Host update failed."
+msgstr ""
+
+#: hosts.php:380
+msgid "Host updated"
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:1043
+#, c-format
+msgid "Host with the same name \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:674
+#, c-format
+msgid "Host with the same name \"%s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
+#, c-format
+msgid "Host with the same visible name \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:680
+#, c-format
+msgid "Host with the same visible name \"%s\" already exists."
+msgstr ""
+
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
+#: include/views/administration.proxy.list.php:46
+#: include/views/configuration.copy.elements.php:46
+#: include/views/configuration.graph.list.php:76
+#: include/views/configuration.host.discovery.list.php:50
+#: include/views/configuration.hostgroups.edit.php:63
+#: include/views/configuration.hostgroups.list.php:146
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
+msgid "Hosts"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:187
+msgid "Hosts & Groups"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:45
+msgid "Hosts (m/n/t)"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:170
+msgid "Hosts / templates"
+msgstr ""
+
+#: include/views/configuration.hostgroups.edit.php:63
+msgid "Hosts in"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:169
+msgid "Hosts in maintenance"
+msgstr ""
+
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
+msgid "Hosts info"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
+msgid "Hosts location"
+msgstr ""
+
+#: hosts.php:361
+msgid "Hosts updated"
+msgstr ""
+
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
+msgid "Hourly"
+msgstr ""
+
+#: include/forms.inc.php:1780
+msgid "Hours"
+msgstr ""
+
+#: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
+#: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
+#: adm.valuemapping.php:127 adm.workingtime.php:63
+#: include/views/administration.general.housekeeper.edit.php:164
+msgid "Housekeeping"
+msgstr ""
+
+#: include/locales.inc.php:65
+msgid "Hungarian (hu_HU)"
+msgstr ""
+
+#: include/discovery.inc.php:69
+#: include/views/js/configuration.discovery.edit.js.php:172
+msgid "ICMP ping"
+msgstr ""
+
+#: include/views/administration.auditlogs.list.php:90
+msgid "ID"
+msgstr ""
+
+#: include/discovery.inc.php:63
+#: include/views/js/configuration.discovery.edit.js.php:173
+msgid "IMAP"
+msgstr ""
+
+#: events.php:460 hosts.php:832
+#: include/views/administration.auditlogs.list.php:87
+#: include/views/administration.proxy.edit.php:60
+#: include/views/inventory.host.view.php:57
+#: include/views/inventory.host.view.php:66
+#: include/views/inventory.host.view.php:75
+#: include/views/inventory.host.view.php:84
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
+msgid "IP"
+msgstr ""
+
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
+#: include/views/inventory.host.view.php:96
+#: include/views/inventory.host.view.php:115
+#: include/views/inventory.host.view.php:135
+#: include/views/inventory.host.view.php:154
+msgid "IP address"
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:292
+msgid "IP and DNS cannot be empty for host interface."
+msgstr ""
+
+#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.list.php:41
+msgid "IP range"
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:208
+msgid "IP range cannot be empty."
+msgstr ""
+
+#: include/hosts.inc.php:477 include/items.inc.php:283
+#: include/views/administration.script.edit.php:45
+#: include/views/administration.script.list.php:53
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
+msgid "IPMI"
+msgstr ""
+
+#: include/items.inc.php:93
+msgid "IPMI agent"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:242
+msgid "IPMI authentication algorithm"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
+#: include/views/inventory.host.view.php:162
+msgid "IPMI interfaces"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:271
+msgid "IPMI password"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:253
+msgid "IPMI privilege level"
+msgstr ""
+
+#: disc_prototypes.php:100 host_discovery.php:103
+#: include/views/configuration.host.discovery.edit.php:157
+#: include/views/configuration.item.edit.php:163 items.php:107
+msgid "IPMI sensor"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:262
+msgid "IPMI username"
+msgstr ""
+
+#: srv_status.php:162
+msgid "IT SERVICES"
+msgstr ""
+
+#: report3.php:74
+msgid "IT SERVICES AVAILABILITY REPORT"
+msgstr ""
+
+#: include/audit.inc.php:39
+msgid "IT service"
+msgstr ""
+
+#: adm.housekeeper.php:47
+msgid "IT service data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:109
+#, c-format
+msgid "IT service data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: include/views/configuration.services.child.list.php:25
+msgid "IT service dependencies"
+msgstr ""
+
+#: include/views/configuration.services.parent.list.php:25
+msgid "IT service parent"
+msgstr ""
+
+#: include/menu.inc.php:81 include/menu.inc.php:207
+#: include/views/administration.general.housekeeper.edit.php:81
+#: include/views/configuration.services.list.php:24 srv_status.php:26
+#: srv_status.php:163
+msgid "IT services"
+msgstr ""
+
+#: report3.php:25
+msgid "IT services availability report"
+msgstr ""
+
+#: include/views/monitoring.history.php:26
+msgid "ITEMS"
+msgstr ""
+
+#: include/views/administration.general.iconmap.edit.php:41
+#: include/views/administration.general.image.edit.php:46
+#: include/views/administration.general.image.list.php:24
+#: include/views/configuration.sysmap.constructor.php:69
+msgid "Icon"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:267
+msgid "Icon (default)"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:294
+msgid "Icon (disabled)"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:285
+msgid "Icon (maintenance)"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:276
+msgid "Icon (problem)"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:64
+msgid "Icon highlight"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:116
+msgid "Icon label location"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:111
+msgid "Icon label type"
+msgstr ""
+
+#: include/views/administration.general.iconmap.edit.php:138
+#: include/views/administration.general.iconmap.list.php:25
+msgid "Icon map"
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:313
+#, c-format
+msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:416
+#, c-format
+msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:412
+#, c-format
+msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
+#, c-format
+msgid "Icon map \"%s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:426
+#, c-format
+msgid "Icon map \"%s\" cannot have mapping with empty expression."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:430
+#, c-format
+msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:434
+#, c-format
+msgid "Icon map \"%s\" has incorrect expression."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
+#, c-format
+msgid "Icon map \"%s\" must have at least one mapping."
+msgstr ""
+
+#: adm.iconmapping.php:80
+msgid "Icon map created"
+msgstr ""
+
+#: adm.iconmapping.php:97
+msgid "Icon map deleted"
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
+msgid "Icon map name cannot be empty."
+msgstr ""
+
+#: adm.iconmapping.php:75
+msgid "Icon map updated"
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:248
+#, c-format
+msgid "Icon map with iconmapid \"%s\" does not exist."
+msgstr ""
+
+#: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
+#: adm.triggerseverities.php:84 adm.valuemapping.php:129
+#: adm.workingtime.php:65
+msgid "Icon mapping"
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:440
+#, c-format
+msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
+msgstr ""
+
+#: jsLoader.php:156
+msgid "Iconmap is not enabled"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:128
+msgid "Icons"
+msgstr ""
+
+#: include/views/js/adm.regexprs.edit.js.php:222
+msgid "Identical expression already exists"
+msgstr ""
+
+#: include/func.inc.php:1673 include/func.inc.php:1693
+msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
+msgstr ""
+
+#: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
+#: map.php:144
+msgid "Image"
+msgstr ""
+
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
+#, c-format
+msgid "Image \"%1$s\" already exists."
+msgstr ""
+
+#: adm.images.php:61
+msgid "Image added"
+msgstr ""
+
+#: adm.images.php:123
+msgid "Image deleted"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:107
+msgid "Image label type"
+msgstr ""
+
+#: include/classes/api/services/CImage.php:248
+#, c-format
+msgid "Image load error [%1$s] in [%2$s]."
+msgstr ""
+
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
+msgid "Image size must be less than 1MB."
+msgstr ""
+
+#: adm.images.php:57
+msgid "Image updated"
+msgstr ""
+
+#: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
+#: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
+#: adm.valuemapping.php:128 adm.workingtime.php:64
+#: include/views/administration.general.image.list.php:29
+#: include/views/conf.import.php:39
+msgid "Images"
+msgstr ""
+
+#: include/views/conf.import.php:55
+msgid "Images for all maps will be updated!"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:410
+msgid "Immediately"
+msgstr ""
+
+#: hosts.php:814 include/views/configuration.screen.list.php:33
+#: include/views/configuration.sysmap.list.php:28
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
+msgid "Import"
+msgstr ""
+
+#: conf.import.php:196
+msgid "Import failed"
+msgstr ""
+
+#: include/views/conf.import.php:78
+msgid "Import file"
+msgstr ""
+
+#: conf.import.php:196
+msgid "Imported successfully"
+msgstr ""
+
+#: hostinventories.php:192
+#, c-format
+msgid "Impossible to filter by inventory field \"%s\", which does not exist."
+msgstr ""
+
+#: screenedit.php:329 screenedit.php:369
+msgid "Impossible to remove last row and column."
+msgstr ""
+
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
+msgid "In"
+msgstr ""
+
+#: include/views/administration.usergroups.edit.php:54
+msgid "In group"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
+msgid "In groups"
+msgstr ""
+
+#: hosts.php:983 include/html.inc.php:329
+#: include/views/configuration.maintenance.edit.php:168
+#: include/views/configuration.maintenance.edit.php:176
+msgid "In maintenance"
+msgstr ""
+
+#: include/actions.inc.php:853 include/actions.inc.php:945
+#: include/actions.inc.php:991 include/actions.inc.php:1073
+#: include/classes/screens/CScreenActions.php:149
+#: include/views/administration.auditacts.list.php:88
+msgid "In progress"
+msgstr ""
+
+#: tr_logform.php:255 tr_logform.php:298
+msgid "Include"
+msgstr ""
+
+#: include/classes/api/services/CService.php:1129
+#, c-format
+msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
+#, c-format
+msgid "Incorrect %1$s label type value for map \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/clients/CLocalApiClient.php:61
+#, c-format
+msgid "Incorrect API \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:211
+#, c-format
+msgid "Incorrect IP range \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
+msgid "Incorrect SNMP OID."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
+msgid "Incorrect SNMP community."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
+#, c-format
+msgid "Incorrect acceptable SLA for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
+msgid "Incorrect action condition discovery check."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
+msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
+msgid "Incorrect action condition discovery object."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
+msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
+msgid "Incorrect action condition discovery status."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
+msgid "Incorrect action condition event type."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
+msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
+msgid "Incorrect action condition host. Host does not exist or you have no access to it."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
+#, c-format
+msgid "Incorrect action condition ip \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1504
+msgid "Incorrect action condition operator."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
+#, c-format
+msgid "Incorrect action condition port \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
+msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
+msgid "Incorrect action condition template. Template does not exist or you have no access to it."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
+msgid "Incorrect action condition trigger severity."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
+msgid "Incorrect action condition trigger value."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
+msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
+msgid "Incorrect action condition type."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1368
+msgid "Incorrect action operation command type."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1710
+msgid "Incorrect action operation condition acknowledge type."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1715
+msgid "Incorrect action operation condition type."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
+msgid "Incorrect action operation escalation step values."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1439
+msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1442
+msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
+#, c-format
+msgid "Incorrect action operation port \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1293
+msgid "Incorrect action operation step duration."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1434
+msgid "Incorrect action operation type."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1448
+msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1445
+msgid "Incorrect action operation user. User does not exist or you have no access to this user."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2330
+msgid "Incorrect action operationid."
+msgstr ""
+
+#: include/classes/api/services/CService.php:922
+#, c-format
+msgid "Incorrect algorithm for service \"%1$s\"."
+msgstr ""
+
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
+msgid "Incorrect arguments passed to function"
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
+msgid "Incorrect arguments passed to function."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:287
+msgid "Incorrect arguments passed to method."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:315
+#, c-format
+msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:378
+#, c-format
+msgid "Incorrect authentication protocol for item \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
+#, c-format
+msgid "Incorrect calculate SLA value for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:175
+#, c-format
+msgid "Incorrect characters used for host \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
+#, c-format
+msgid "Incorrect characters used for host name \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:230
+#, c-format
+msgid "Incorrect characters used for proxy name \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
+#, c-format
+msgid "Incorrect characters used for template name \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
+#, c-format
+msgid "Incorrect conditions for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:215
+msgid "Incorrect delay."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:113
+#, c-format
+msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/validators/event/CEventSourceObjectValidator.php:66
+#, c-format
+msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
+msgstr ""
+
+#: include/classes/api/services/CAlert.php:342
+msgid "Incorrect eventobject value."
+msgstr ""
+
+#: include/classes/api/services/CAlert.php:335
+msgid "Incorrect eventsource value."
+msgstr ""
+
+#: include/classes/db/DB.php:534 include/classes/db/DB.php:808
+#, c-format
+msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:362
+msgid "Incorrect fields for sysmap."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:621
+msgid "Incorrect fields for trigger."
+msgstr ""
+
+#: include/classes/helpers/CUploadFile.php:159
+msgid "Incorrect file upload."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
+#, c-format
+msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:879
+#, c-format
+msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
+#, c-format
+msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
+#, c-format
+msgid "Incorrect flexible interval \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:827
+#, c-format
+msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
+msgid "Incorrect function is used"
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:643
+#, c-format
+msgid "Incorrect graph ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
+msgid "Incorrect group prototype ID."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:196
+#, c-format
+msgid "Incorrect group prototypes for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:625
+#, c-format
+msgid "Incorrect host ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:607
+#, c-format
+msgid "Incorrect host group ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:241
+msgid "Incorrect host group ID for group prototype."
+msgstr ""
+
+#: include/profiles.inc.php:68
+msgid "Incorrect host group."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:190
+#, c-format
+msgid "Incorrect host groups for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:459
+msgid "Incorrect host prototype ID."
+msgstr ""
+
+#: image.php:46
+msgid "Incorrect image index."
+msgstr ""
+
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
+msgid "Incorrect input parameters."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:595
+#, c-format
+msgid "Incorrect interface DNS parameter \"%s\" provided."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:610
+#, c-format
+msgid "Incorrect interface IP parameter \"%s\" provided."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:626
+#, c-format
+msgid "Incorrect interface port \"%s\" provided."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:574
+#, c-format
+msgid "Incorrect inventory field \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:680
+#, c-format
+msgid "Incorrect item ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CGraphGeneral.php:326
+msgid "Incorrect item for axis value."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
+#, c-format
+msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
+#, c-format
+msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:268
+msgid "Incorrect key."
+msgstr ""
+
+#: include/forms.inc.php:1259
+msgid "Incorrect list of items."
+msgstr ""
+
+#: maintenance.php:329
+msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
+msgstr ""
+
+#: maintenance.php:357
+msgid "Incorrect maintenance date"
+msgstr ""
+
+#: maintenance.php:336
+msgid "Incorrect maintenance day period"
+msgstr ""
+
+#: maintenance.php:343 maintenance.php:354
+msgid "Incorrect maintenance days of week"
+msgstr ""
+
+#: maintenance.php:351
+msgid "Incorrect maintenance month period"
+msgstr ""
+
+#: maintenance.php:316
+msgid "Incorrect maintenance period"
+msgstr ""
+
+#: maintenance.php:313
+msgid "Incorrect maintenance period (minimum 5 minutes)"
+msgstr ""
+
+#: maintenance.php:340
+msgid "Incorrect maintenance week period"
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:716
+#, c-format
+msgid "Incorrect map ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:390
+#, c-format
+msgid "Incorrect map height value for map \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:386
+#, c-format
+msgid "Incorrect map width value for map \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
+#, c-format
+msgid "Incorrect menu path for script \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/clients/CLocalApiClient.php:69
+#, c-format
+msgid "Incorrect method \"%1$s.%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CEvent.php:370
+msgid "Incorrect object value."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
+#, c-format
+msgid "Incorrect parameter for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:788
+msgid "Incorrect parameter for operations."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:160
+#, c-format
+msgid "Incorrect parameter is used for icon map \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2232
+#, c-format
+msgid "Incorrect parameters for action update method \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:750
+msgid "Incorrect parameters for condition."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:218
+#, c-format
+msgid "Incorrect parameters for icon map update method \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
+msgid "Incorrect parameters for maintenance."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
+msgid "Incorrect parameters for user group."
+msgstr ""
+
+#: include/classes/api/services/CService.php:1007
+#, c-format
+msgid "Incorrect parent for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:1010
+msgid "Incorrect parent service."
+msgstr ""
+
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
+msgid "Incorrect port range."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:324
+#, c-format
+msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:387
+#, c-format
+msgid "Incorrect privacy protocol for item \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:241
+msgid "Incorrect proxyid."
+msgstr ""
+
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
+msgid "Incorrect resource type provided for screen item."
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:238
+#, c-format
+msgid "Incorrect response received from Zabbix server \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
+#, c-format
+msgid "Incorrect screen ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScreen.php:472
+msgid "Incorrect screen ID."
+msgstr ""
+
+#: include/screens.inc.php:172 include/screens.inc.php:232
+msgid "Incorrect screen provided for slide show."
+msgstr ""
+
+#: include/services.inc.php:485 include/services.inc.php:494
+msgid "Incorrect service end time."
+msgstr ""
+
+#: include/services.inc.php:482 include/services.inc.php:491
+msgid "Incorrect service start time."
+msgstr ""
+
+#: include/services.inc.php:476
+msgid "Incorrect service time type."
+msgstr ""
+
+#: include/classes/api/services/CService.php:976
+#, c-format
+msgid "Incorrect sorder order for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CEvent.php:363
+msgid "Incorrect source value."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:549
+#, c-format
+msgid "Incorrect status for host \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:185
+#, c-format
+msgid "Incorrect status for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:1030
+#, c-format
+msgid "Incorrect status for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:219
+msgid "Incorrect status."
+msgstr ""
+
+#: include/classes/api/services/CTemplateScreen.php:598
+msgid "Incorrect template screen ID."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:312
+#, c-format
+msgid "Incorrect theme for user \"%1$s\"."
+msgstr ""
+
+#: include/classes/validators/CTimePeriodValidator.php:99
+#, c-format
+msgid "Incorrect time period \"%1$s\" start day must be less or equal to end day."
+msgstr ""
+
+#: include/classes/validators/CTimePeriodValidator.php:105
+#, c-format
+msgid "Incorrect time period \"%1$s\" start time must be less than end time."
+msgstr ""
+
+#: include/classes/validators/CTimePeriodValidator.php:89
+#: include/classes/validators/CTimePeriodValidator.php:94
+#, c-format
+msgid "Incorrect time period \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:991
+#, c-format
+msgid "Incorrect trigger ID for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:126
+msgid "Incorrect trigger expression"
+msgstr ""
+
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
+msgid "Incorrect trigger expression."
+msgstr ""
+
+#: include/triggers.inc.php:986
+#, c-format
+msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:669
+#, c-format
+msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:675
+msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
+#, c-format
+msgid "Incorrect trigger function \"%1$s\" provided in expression."
+msgstr ""
+
+#: include/func.inc.php:995
+msgid "Incorrect type of asort_by_key."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
+#, c-format
+msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/profiles.inc.php:56
+msgid "Incorrect user group."
+msgstr ""
+
+#: include/validate.inc.php:484
+#, c-format
+msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
+#, c-format
+msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
+msgstr ""
+
+#: include/classes/db/DB.php:352
+#, c-format
+msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
+msgstr ""
+
+#: include/classes/db/DB.php:346
+#, c-format
+msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
+msgstr ""
+
+#: include/classes/db/DB.php:340
+#, c-format
+msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
+msgstr ""
+
+#: include/reports.inc.php:527 include/reports.inc.php:531
+#, c-format
+msgid "Incorrect value for field \"%1$s\"."
+msgstr ""
+
+#: include/validate.inc.php:475
+#, c-format
+msgid "Incorrect value for field \"%1$s\": cannot be empty."
+msgstr ""
+
+#: include/classes/html/CButtonQMessage.php:51
+#, c-format
+msgid "Incorrect value for setMessage(): \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
+#, c-format
+msgid "Incorrect value used for proxy status \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
+msgid "Incorrect working time."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1903
+#, c-format
+msgid "Incorrect y max item for graph \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1890
+#, c-format
+msgid "Incorrect y min item for graph \"%1$s\"."
+msgstr ""
+
+#: include/locales.inc.php:66
+msgid "Indonesian (id_ID)"
+msgstr ""
+
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
+#: include/classes/screens/CScreenActions.php:134
+#: include/views/administration.auditacts.list.php:75
+#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
+#: include/views/configuration.item.list.php:72
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
+msgid "Info"
+msgstr ""
+
+#: adm.triggerseverities.php:56 include/items.inc.php:31
+#: include/views/administration.general.triggerSeverity.edit.php:40
+msgid "Information"
+msgstr ""
+
+#: include/views/configuration.triggers.expression.php:124
+msgid "Insert"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
+
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
+msgid "Installation"
+msgstr ""
+
+#: include/hosts.inc.php:265
+msgid "Installer name"
+msgstr ""
+
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
+msgid "Interface"
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:835
+#, c-format
+msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/views/js/configuration.host.edit.js.php:143
+msgid "Interface is used by items that require this type of the interface."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:296
+#, c-format
+msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
+#, c-format
+msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:315
+#, c-format
+msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:38
+msgctxt "authentication"
+msgid "Internal"
+msgstr ""
+
+#: include/views/configuration.action.list.php:36
+msgctxt "event source"
+msgid "Internal"
+msgstr ""
+
+#: include/users.inc.php:84
+msgctxt "user type"
+msgid "Internal"
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:190
+msgid "Internal JSON-RPC error."
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:49
+msgid "Internal data storage period (in days)"
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:189
+msgid "Internal error."
+msgstr ""
+
+#: adm.housekeeper.php:37
+msgid "Internal event and alert data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:106
+#, c-format
+msgid "Internal event and alert data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:85
+msgid "Internet Explorer"
+msgstr ""
+
+#: include/forms.inc.php:934
+#: include/views/configuration.host.discovery.edit.php:198
+#: include/views/configuration.host.discovery.list.php:52
+#: include/views/configuration.item.edit.php:265
+#: include/views/configuration.item.list.php:66
+#: include/views/configuration.item.massupdate.php:321
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
+msgid "Interval"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:229
+#: include/views/configuration.item.edit.php:296
+#: include/views/configuration.item.massupdate.php:358
+msgid "Interval (in sec)"
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:170
+msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:174
+msgid "Invalid Request."
+msgstr ""
+
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
+#, c-format
+msgid "Invalid date \"%s\"."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:266
+msgid "Invalid first parameter."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:269
+msgid "Invalid fourth parameter."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:636
+#, c-format
+msgid "Invalid hostid for macro \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:42
+#, c-format
+msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
+msgstr ""
+
+#: include/classes/api/services/CItem.php:39
+#, c-format
+msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:39
+#, c-format
+msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
+msgstr ""
+
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
+#, c-format
+msgid "Invalid key \"%1$s\": %2$s."
+msgstr ""
+
+#: maintenance.php:324
+msgid "Invalid maintenance period"
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
+msgid "Invalid method parameters."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:261
+msgid "Invalid number of parameters."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:184
+msgid "Invalid params."
+msgstr ""
+
+#: include/reports.inc.php:577 include/reports.inc.php:581
+#, c-format
+msgid "Invalid period for field \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
+#, c-format
+msgid "Invalid response code \"%1$s\"."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:267
+msgid "Invalid second parameter."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:268
+msgid "Invalid third parameter."
+msgstr ""
+
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
+msgid "Invalid time period"
+msgstr ""
+
+#: include/classes/core/CView.php:62
+#, c-format
+msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
+msgstr ""
+
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
+msgid "Inventory"
+msgstr ""
+
+#: include/classes/api/services/CHost.php:1179
+#, c-format
+msgid "Inventory disabled for host \"%1$s\"."
+msgstr ""
+
+#: include/views/administration.general.iconmap.edit.php:41
+msgid "Inventory field"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:287
+msgid "Inventory mode"
+msgstr ""
+
+#: include/views/administration.users.list.php:59
+msgid "Is online?"
+msgstr ""
+
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
+msgid "Issue"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:141
+msgid "It is not possible to filter by user password."
+msgstr ""
+
+#: include/page_header.php:223
+msgid "It is not possible to logout from HTTP authentication."
+msgstr ""
+
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
+msgid "It is not possible to search by user password."
+msgstr ""
+
+#: include/locales.inc.php:67
+msgid "Italian (it_IT)"
+msgstr ""
+
+#: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
+msgid "Item"
+msgstr ""
+
+#: jsLoader.php:199
+#, c-format
+msgid "Item \"%1$s\""
+msgstr ""
+
+#: include/classes/api/services/CItem.php:37
+#, c-format
+msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
+msgstr ""
+
+#: include/classes/api/services/CItem.php:38
+#, c-format
+msgid "Item \"%1$s\" already exists on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItem.php:900
+#, 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 ""
+
+#: include/classes/api/services/CTemplateScreen.php:512
+#, c-format
+msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1832
+#, c-format
+msgid "Item \"%1$s\" does not exist."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:669
+#, c-format
+msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
+#, c-format
+msgid "Item \"%1$s\" skipped - user rule."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:369
+#, c-format
+msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
+msgstr ""
+
+#: items.php:493
+msgid "Item added"
+msgstr ""
+
+#: include/views/administration.proxy.list.php:44
+msgid "Item count"
+msgstr ""
+
+#: items.php:382
+msgid "Item deleted"
+msgstr ""
+
+#: applications.php:233 items.php:705
+msgid "Item disabled"
+msgid_plural "Items disabled"
+msgstr[0] ""
+
+#: applications.php:232 items.php:704
+msgid "Item enabled"
+msgid_plural "Items enabled"
+msgstr[0] ""
+
+#: include/actions.inc.php:1157
+msgid "Item in \"normal\" state"
+msgstr ""
+
+#: include/actions.inc.php:1156
+msgid "Item in \"not supported\" state"
+msgstr ""
+
+#: popup_trexpr.php:769
+msgid "Item not selected"
+msgstr ""
+
+#: include/forms.inc.php:1093
+msgid "Item prototype"
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:37
+#, c-format
+msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:38
+#, c-format
+msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
+msgstr ""
+
+#: disc_prototypes.php:301
+msgid "Item prototype added"
+msgstr ""
+
+#: disc_prototypes.php:202
+msgid "Item prototype deleted"
+msgstr ""
+
+#: disc_prototypes.php:323
+msgid "Item prototype disabled"
+msgid_plural "Item prototypes disabled"
+msgstr[0] ""
+
+#: disc_prototypes.php:322
+msgid "Item prototype enabled"
+msgid_plural "Item prototypes enabled"
+msgstr[0] ""
+
+#: disc_prototypes.php:297
+msgid "Item prototype updated"
+msgstr ""
+
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
+msgid "Item prototypes"
+msgstr ""
+
+#: disc_prototypes.php:342
+msgid "Item prototypes deleted"
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:32
+msgid "Item prototypes of"
+msgstr ""
+
+#: items.php:490
+msgid "Item updated"
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:266
+msgid "Item uses host interface from non-parent host."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:269
+msgid "Item uses incorrect interface type."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:327
+msgid "Item will not be refreshed. Please enter a correct update interval."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:440
+#, c-format
+msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:446
+#, 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:443
+#, c-format
+msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:437
+#, c-format
+msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:449
+#, c-format
+msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:804
+#, c-format
+msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
+#, c-format
+msgid "Item with key \"%1$s\" already exists."
+msgstr ""
+
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
+#: include/views/configuration.application.list.php:97
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
+#: include/views/configuration.item.list.php:42
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
+#: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
+msgid "Items"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:54
+msgid "Items (m/d/n)"
+msgstr ""
+
+#: items.php:743
+msgid "Items copied"
+msgstr ""
+
+#: items.php:800
+msgid "Items deleted"
+msgstr ""
+
+#: include/views/monitoring.history.php:109
+msgid "Items list"
+msgstr ""
+
+#: items.php:687
+msgid "Items updated"
+msgstr ""
+
+#: include/hosts.inc.php:474 include/items.inc.php:282
+msgid "JMX"
+msgstr ""
+
+#: include/items.inc.php:96
+msgid "JMX agent"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
+#: include/views/inventory.host.view.php:142
+msgid "JMX interfaces"
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:142
+#, c-format
+msgid "JSON-rpc error generation failed. No such error \"%s\"."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:95
+msgid "JSON-rpc method is not defined."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:100
+msgid "JSON-rpc params is not an Array."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:85
+msgid "JSON-rpc version is not specified."
+msgstr ""
+
+#: include/media.inc.php:27
+#: include/views/administration.mediatypes.edit.php:43
+msgid "Jabber"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:80
+#: include/views/administration.mediatypes.list.php:64
+msgid "Jabber identifier"
+msgstr ""
+
+#: include/func.inc.php:237
+msgid "Jan"
+msgstr ""
+
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
+msgid "January"
+msgstr ""
+
+#: include/locales.inc.php:69
+msgid "Japanese (ja_JP)"
+msgstr ""
+
+#: include/func.inc.php:243
+msgid "Jul"
+msgstr ""
+
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
+msgid "July"
+msgstr ""
+
+#: include/func.inc.php:242
+msgid "Jun"
+msgstr ""
+
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
+msgid "June"
+msgstr ""
+
+#: include/func.inc.php:428 include/func.inc.php:664
+msgctxt "Kilo short"
+msgid "K"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:247
+msgid "Keep lost resources period (in days)"
+msgstr ""
+
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
+#: include/views/configuration.host.discovery.edit.php:68
+#: include/views/configuration.host.discovery.list.php:51
+#: include/views/configuration.item.edit.php:68
+#: include/views/configuration.item.list.php:65
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
+msgid "Key"
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:306
+#, c-format
+msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
+msgstr ""
+
+#: include/views/configuration.action.edit.php:794
+#: include/views/js/common.item.edit.js.php:179
+msgid "Key passphrase"
+msgstr ""
+
+#: tr_logform.php:272
+msgid "Keyword"
+msgstr ""
+
+#: include/func.inc.php:664
+msgid "Kilo"
+msgstr ""
+
+#: include/locales.inc.php:68
+msgid "Korean (ko_KR)"
+msgstr ""
+
+#: latest.php:319
+msgid "LATEST DATA"
+msgstr ""
+
+#: include/discovery.inc.php:57
+#: include/views/administration.authentication.edit.php:43
+#: include/views/js/configuration.discovery.edit.js.php:175
+msgid "LDAP"
+msgstr ""
+
+#: include/perm.inc.php:49
+msgid "LDAP authentication"
+msgstr ""
+
+#: authentication.php:132
+msgid "LDAP authentication changed"
+msgstr ""
+
+#: authentication.php:38
+#: include/views/administration.authentication.edit.php:67
+msgid "LDAP host"
+msgstr ""
+
+#: authentication.php:163
+msgid "LDAP login successful"
+msgstr ""
+
+#: authentication.php:163
+msgid "LDAP login was not successful"
+msgstr ""
+
+#: include/classes/screens/CScreenClock.php:81
+msgid "LOCAL"
+msgstr ""
+
+#: include/triggers.inc.php:174
+msgid "LOST"
+msgstr ""
+
+#: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.host.discovery.edit.php:291
+#: include/views/js/configuration.sysmaps.js.php:70
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
+msgid "Label"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:78
+#: include/views/js/configuration.sysmaps.js.php:243
+msgid "Label location"
+msgstr ""
+
+#: include/views/administration.users.edit.php:144
+msgid "Language"
+msgstr ""
+
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
+msgid "Last"
+msgstr ""
+
+#: include/func.inc.php:1544
+msgctxt "page navigation"
+msgid "Last"
+msgstr ""
+
+#: dashboard.php:439
+#, c-format
+msgid "Last %1$d issue"
+msgid_plural "Last %1$d issues"
+msgstr[0] ""
+
+#: popup_trexpr.php:229
+msgid "Last (most recent) T value is < N"
+msgstr ""
+
+#: popup_trexpr.php:239
+msgid "Last (most recent) T value is = N"
+msgstr ""
+
+#: popup_trexpr.php:234
+msgid "Last (most recent) T value is > N"
+msgstr ""
+
+#: popup_trexpr.php:244
+msgid "Last (most recent) T value is NOT N"
+msgstr ""
+
+#: srv_status.php:39
+msgid "Last 24 hours"
+msgstr ""
+
+#: srv_status.php:41
+msgid "Last 30 days"
+msgstr ""
+
+#: srv_status.php:42
+msgid "Last 365 days"
+msgstr ""
+
+#: srv_status.php:40
+msgid "Last 7 days"
+msgstr ""
+
+#: include/blocks.inc.php:1002 tr_status.php:304
+msgid "Last change"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:435
+msgid "Last change (descending)"
+msgstr ""
+
+#: httpmon.php:94 latest.php:339 latest.php:341
+msgid "Last check"
+msgstr ""
+
+#: jsLoader.php:208
+msgid "Last hour graph"
+msgstr ""
+
+#: jsLoader.php:209
+msgid "Last month graph"
+msgstr ""
+
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
+msgid "Last of"
+msgstr ""
+
+#: include/views/administration.proxy.list.php:42
+msgid "Last seen (age)"
+msgstr ""
+
+#: latest.php:343 latest.php:344
+msgid "Last value"
+msgstr ""
+
+#: jsLoader.php:210
+msgid "Last week graph"
+msgstr ""
+
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
+msgid "Latest data"
+msgstr ""
+
+#: events.php:41 jsLoader.php:206
+msgid "Latest events"
+msgstr ""
+
+#: jsLoader.php:207
+msgid "Latest values"
+msgstr ""
+
+#: include/locales.inc.php:70
+msgid "Latvian (lv_LV)"
+msgstr ""
+
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
+#: include/views/configuration.sysmap.edit.php:115
+#: include/views/js/configuration.graph.edit.js.php:72
+#: include/views/js/configuration.sysmaps.js.php:84
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
+msgid "Left"
+msgstr ""
+
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
+msgid "Legend"
+msgstr ""
+
+#: popup_trexpr.php:315
+msgid "Length of last (most recent) T value in characters is < N"
+msgstr ""
+
+#: popup_trexpr.php:325
+msgid "Length of last (most recent) T value in characters is = N"
+msgstr ""
+
+#: popup_trexpr.php:320
+msgid "Length of last (most recent) T value in characters is > N"
+msgstr ""
+
+#: popup_trexpr.php:330
+msgid "Length of last (most recent) T value in characters is NOT N"
+msgstr ""
+
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
+msgid "Line"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:71
+msgid "Link"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
+msgid "Link indicators"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
+msgid "Link new templates"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:484
+#, c-format
+msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:491
+#, c-format
+msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:228
+msgid "Link templates"
+msgstr ""
+
+#: include/actions.inc.php:614
+msgid "Link to template"
+msgstr ""
+
+#: include/actions.inc.php:429
+msgid "Link to templates"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:926
+msgid "Link with templates"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
+msgid "Linked templates"
+msgstr ""
+
+#: templates.php:518
+msgid "Linked to"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:333
+msgid "Links between the selected elements"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:322
+msgid "Links for the selected element"
+msgstr ""
+
+#: include/classes/html/CList.php:40
+msgid "List is empty"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:101
+#: include/classes/items/CHelpItems.php:363
+msgid "List of network interfaces. Text value."
+msgstr ""
+
+#: include/locales.inc.php:71
+msgid "Lithuanian (lt_LT)"
+msgstr ""
+
+#: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
+msgid "Loading..."
+msgstr ""
+
+#: include/classes/screens/CScreenHistory.php:165
+#: include/views/configuration.screen.constructor.edit.php:603
+msgid "Local time"
+msgstr ""
+
+#: include/hosts.inc.php:220
+msgid "Location"
+msgstr ""
+
+#: include/hosts.inc.php:225
+msgid "Location latitude"
+msgstr ""
+
+#: include/hosts.inc.php:230
+msgid "Location longitude"
+msgstr ""
+
+#: include/forms.inc.php:404 include/items.inc.php:127
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
+#: include/views/configuration.item.massupdate.php:211
+msgid "Log"
+msgstr ""
+
+#: popup_trexpr.php:443
+msgid "Log severity of the last log entry is < N"
+msgstr ""
+
+#: popup_trexpr.php:451
+msgid "Log severity of the last log entry is = N"
+msgstr ""
+
+#: popup_trexpr.php:447
+msgid "Log severity of the last log entry is > N"
+msgstr ""
+
+#: popup_trexpr.php:455
+msgid "Log severity of the last log entry is NOT N"
+msgstr ""
+
+#: popup_trexpr.php:459
+msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:464
+msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:347
+#: include/views/configuration.item.massupdate.php:415
+msgid "Log time format"
+msgstr ""
+
+#: include/views/administration.general.other.edit.php:38
+msgid "Log unmatched SNMP traps"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:42
+msgid "Logged in as"
+msgstr ""
+
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
+#: include/views/administration.auditlogs.list.php:43
+#: include/views/administration.authentication.edit.php:111
+#: include/views/administration.users.list.php:60
+msgid "Login"
+msgstr ""
+
+#: include/views/general.login.php:80
+msgid "Login as Guest"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:1066
+#, c-format
+msgid "Login failed \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:1034
+#, c-format
+msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
+msgstr ""
+
+#: authentication.php:122
+msgid "Login name or password is incorrect!"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
+msgid "Login name or password is incorrect."
+msgstr ""
+
+#: auditlogs.php:140 include/page_header.php:222 include/page_header.php:226
+#: include/views/administration.auditlogs.list.php:44
+msgid "Logout"
+msgstr ""
+
+#: include/discovery.inc.php:156
+msgid "Lost"
+msgstr ""
+
+#: include/actions.inc.php:1159
+msgid "Low-level discovery rule in \"normal\" state"
+msgstr ""
+
+#: include/actions.inc.php:1158
+msgid "Low-level discovery rule in \"not supported\" state"
+msgstr ""
+
+#: include/func.inc.php:424 include/func.inc.php:665
+msgctxt "Mega short"
+msgid "M"
+msgstr ""
+
+#: jsLoader.php:124
+msgctxt "Monday short"
+msgid "M"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:193
+#: include/classes/items/CHelpItems.php:455
+msgid "MAC address - lists all MAC addresses with interface names by default"
+msgstr ""
+
+#: include/hosts.inc.php:160 include/views/inventory.host.list.php:81
+msgid "MAC address A"
+msgstr ""
+
+#: include/hosts.inc.php:165
+msgid "MAC address B"
+msgstr ""
+
+#: include/maps.inc.php:536
+msgid "MAINTENANCE"
+msgstr ""
+
+#: include/hosts.inc.php:39
+msgid "MD2"
+msgstr ""
+
+#: include/hosts.inc.php:40
+#: include/views/configuration.host.discovery.edit.php:128
+#: include/views/configuration.item.edit.php:134
+#: include/views/configuration.item.massupdate.php:140
+#: include/views/js/configuration.discovery.edit.js.php:78
+msgid "MD5"
+msgstr ""
+
+#: report5.php:51
+msgid "MOST BUSY TRIGGERS TOP 100"
+msgstr ""
+
+#: include/audit.inc.php:49 include/views/common.macros.php:38
+#: include/views/configuration.host.discovery.edit.php:291
+msgid "Macro"
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:708
+#, c-format
+msgid "Macro \"%1$s\" already exists on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:753
+#, c-format
+msgid "Macro \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:669
+#, c-format
+msgid "Macro \"%1$s\" is not unique."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:620
+#, c-format
+msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:604
+#, c-format
+msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:788
+#, c-format
+msgid "Macro with globalmacroid \"%1$s\" does not exist."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:728
+#, c-format
+msgid "Macro with hostmacroid \"%1$s\" does not exist."
+msgstr ""
+
+#: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
+#: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
+#: adm.valuemapping.php:131 adm.workingtime.php:67
+#: include/views/administration.general.macros.edit.php:31
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
+msgid "Macros"
+msgstr ""
+
+#: adm.macros.php:141
+msgid "Macros updated"
+msgstr ""
+
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
+#: include/views/configuration.maintenance.edit.php:185
+#: include/views/js/configuration.sysmaps.js.php:151
+msgid "Maintenance"
+msgstr ""
+
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
+#, c-format
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
+msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
+msgid "Maintenance action condition value must be empty."
+msgstr ""
+
+#: maintenance.php:130
+msgid "Maintenance added"
+msgstr ""
+
+#: maintenance.php:251
+msgid "Maintenance deleted"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:150
+msgid "Maintenance period"
+msgstr ""
+
+#: include/forms.inc.php:1775
+msgid "Maintenance period length"
+msgstr ""
+
+#: include/views/configuration.maintenance.list.php:33
+msgid "Maintenance periods"
+msgstr ""
+
+#: include/actions.inc.php:50
+msgid "Maintenance status"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:43
+msgid "Maintenance type"
+msgstr ""
+
+#: maintenance.php:125
+msgid "Maintenance updated"
+msgstr ""
+
+#: include/blocks.inc.php:1033 tr_status.php:638
+msgid "Maintenance with data collection"
+msgstr ""
+
+#: include/blocks.inc.php:1032 tr_status.php:637
+msgid "Maintenance without data collection"
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:276
+msgid "Mandatory parameter is missing."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
+msgid "Manual"
+msgstr ""
+
+#: index.php:45
+msgid "Manual Logout"
+msgstr ""
+
+#: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
+#: include/views/configuration.sysmap.edit.php:184
+#: include/views/js/configuration.sysmaps.js.php:18
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
+#: map.php:25
+msgid "Map"
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:689
+#, c-format
+msgid "Map \"%1$s\" skipped - user rule."
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:67
+#, c-format
+msgid "Map \"%s\""
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:838
+#, c-format
+msgid "Map \"%s\" created."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:829
+#, c-format
+msgid "Map \"%s\" updated."
+msgstr ""
+
+#: sysmap.php:85
+msgid "Map is saved! Return?"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:99
+msgid "Map label type"
+msgstr ""
+
+#: sysmap.php:88
+msgid "Map save operation failed."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:509
+#, c-format
+msgid "Map with name \"%s\" already exists."
+msgstr ""
+
+#: include/views/administration.general.valuemapping.edit.php:40
+msgid "Mapped to"
+msgstr ""
+
+#: include/valuemap.inc.php:154
+#, c-format
+msgid "Mapping value \"%1$s\" is not unique."
+msgstr ""
+
+#: include/views/administration.general.iconmap.edit.php:136
+#: include/views/administration.general.valuemapping.edit.php:42
+msgid "Mappings"
+msgstr ""
+
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
+#: include/views/configuration.sysmap.list.php:36
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
+msgid "Maps"
+msgstr ""
+
+#: include/func.inc.php:239
+msgid "Mar"
+msgstr ""
+
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
+msgid "March"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:65
+msgid "Mark elements on trigger status change"
+msgstr ""
+
+#: include/views/monitoring.history.php:118
+msgid "Mark others"
+msgstr ""
+
+#: include/views/monitoring.history.php:117
+msgid "Mark selected"
+msgstr ""
+
+#: popup_trexpr.php:96
+msgid "Mask"
+msgstr ""
+
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
+msgid "Mass update"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:217
+msgid "Mass update elements"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
+#: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
+msgid "Max count of elements to show inside table cell"
+msgstr ""
+
+#: adm.gui.php:79
+#, c-format
+msgid "Max count of elements to show inside table cell \"%1$s\"."
+msgstr ""
+
+#: adm.gui.php:38 include/views/administration.general.gui.edit.php:45
+msgid "Max count of events per trigger to show"
+msgstr ""
+
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
+msgid "Maximize"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:241
+#: include/views/configuration.item.edit.php:308
+#: include/views/configuration.item.massupdate.php:372
+msgid "Maximum number of flexible intervals added"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:77
+#: include/classes/items/CHelpItems.php:331
+msgid "Maximum number of opened files supported by OS."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:81
+#: include/classes/items/CHelpItems.php:335
+msgid "Maximum number of processes supported by OS."
+msgstr ""
+
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
+#, c-format
+msgid "Maximum time period to display is %1$s day."
+msgid_plural "Maximum time period to display is %1$s days."
+msgstr[0] ""
+
+#: popup_trexpr.php:249
+msgid "Maximum value for period T is < N"
+msgstr ""
+
+#: popup_trexpr.php:259
+msgid "Maximum value for period T is = N"
+msgstr ""
+
+#: popup_trexpr.php:254
+msgid "Maximum value for period T is > N"
+msgstr ""
+
+#: popup_trexpr.php:264
+msgid "Maximum value for period T is NOT N"
+msgstr ""
+
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
+msgid "May"
+msgstr ""
+
+#: include/func.inc.php:241
+msgctxt "May short"
+msgid "May"
+msgstr ""
+
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
+msgid "Media"
+msgstr ""
+
+#: include/audit.inc.php:26
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
+msgid "Media type"
+msgstr ""
+
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
+#, c-format
+msgid "Media type \"%s\" already exists."
+msgstr ""
+
+#: media_types.php:133
+msgid "Media type added"
+msgstr ""
+
+#: media_types.php:157 media_types.php:194
+msgid "Media type deleted"
+msgstr ""
+
+#: media_types.php:181
+msgid "Media type disabled"
+msgid_plural "Media types disabled"
+msgstr[0] ""
+
+#: media_types.php:180
+msgid "Media type enabled"
+msgid_plural "Media types enabled"
+msgstr[0] ""
+
+#: media_types.php:125
+msgid "Media type updated"
+msgstr ""
+
+#: include/menu.inc.php:247
+#: include/views/administration.mediatypes.list.php:28
+msgid "Media types"
+msgstr ""
+
+#: include/classes/api/services/CMediatype.php:305
+#, c-format
+msgid "Media types used by action \"%s\"."
+msgstr ""
+
+#: include/func.inc.php:665
+msgid "Mega"
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:47
+#: include/views/configuration.hostgroups.list.php:52
+msgid "Members"
+msgstr ""
+
+#: include/classes/debug/CProfiler.php:147
+#, c-format
+msgid "Memory limit: %s"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:137
+#: include/classes/items/CHelpItems.php:399
+msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
+msgstr ""
+
+#: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
+#: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
+msgid "Menu"
+msgstr ""
+
+#: acknow.php:273 include/actions.inc.php:447 include/actions.inc.php:456
+#: include/actions.inc.php:462 include/actions.inc.php:824
+#: include/actions.inc.php:871 include/classes/screens/CScreenActions.php:132
+#: include/classes/screens/CScreenActions.php:168
+#: include/views/administration.auditacts.list.php:73
+#: include/views/administration.auditacts.list.php:104
+#: include/views/configuration.action.edit.php:629
+msgid "Message"
+msgstr ""
+
+#: tr_events.php:127
+msgid "Message actions"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:91
+msgid "Message text limit"
+msgstr ""
+
+#: include/views/administration.users.edit.php:238
+msgid "Message timeout"
+msgstr ""
+
+#: include/views/administration.users.edit.php:233
+msgid "Message timeout (seconds)"
+msgstr ""
+
+#: jsLoader.php:162
+msgid "Messages"
+msgstr ""
+
+#: include/views/administration.users.edit.php:374
+msgid "Messaging"
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:179
+msgid "Method not found."
+msgstr ""
+
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
+msgid "Middle"
+msgstr ""
+
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
+msgid "Minimize"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:120
+#, c-format
+msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:154
+#, c-format
+msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:102
+#, c-format
+msgid "Minimum required PHP version is %s."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:171
+#, c-format
+msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:188
+#, c-format
+msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:137
+#, c-format
+msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
+msgstr ""
+
+#: include/views/monitoring.maps.php:40
+msgid "Minimum severity"
+msgstr ""
+
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
+#, c-format
+msgid "Minimum time period to display is %1$s hour."
+msgid_plural "Minimum time period to display is %1$s hours."
+msgstr[0] ""
+
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
+msgid "Minimum trigger severity"
+msgstr ""
+
+#: popup_trexpr.php:269
+msgid "Minimum value for period T is < N"
+msgstr ""
+
+#: popup_trexpr.php:279
+msgid "Minimum value for period T is = N"
+msgstr ""
+
+#: popup_trexpr.php:274
+msgid "Minimum value for period T is > N"
+msgstr ""
+
+#: popup_trexpr.php:284
+msgid "Minimum value for period T is NOT N"
+msgstr ""
+
+#: include/forms.inc.php:1782
+msgid "Minutes"
+msgstr ""
+
+#: include/reports.inc.php:470
+#, c-format
+msgid "Missing \"%1$s\" field for item."
+msgstr ""
+
+#: include/reports.inc.php:567
+#, c-format
+msgid "Missing \"%1$s\" field for period."
+msgstr ""
+
+#: include/classes/api/services/CGraphGeneral.php:76
+msgid "Missing \"gitemid\" field for item."
+msgstr ""
+
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
+msgid "Missing \"itemid\" field for item."
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:39
+msgid "Missing \"name\" field for graph prototype."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:39
+msgid "Missing \"name\" field for graph."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
+#, c-format
+msgid "Missing item \"%1$s\" for host \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:40
+#, c-format
+msgid "Missing items for graph \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:40
+#, c-format
+msgid "Missing items for graph prototype \"%1$s\"."
+msgstr ""
+
+#: include/graphs.inc.php:312
+#, c-format
+msgid "Missing key \"%1$s\" for host \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:406
+msgid "Missing parameter: usrgrpids."
+msgstr ""
+
+#: include/views/administration.proxy.list.php:41 report2.php:193
+msgid "Mode"
+msgstr ""
+
+#: include/hosts.inc.php:245
+msgid "Model"
+msgstr ""
+
+#: include/func.inc.php:214
+msgid "Mon"
+msgstr ""
+
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
+msgid "Monday"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
+msgid "Monitored by proxy"
+msgstr ""
+
+#: include/views/monitoring.discovery.php:41
+msgid "Monitored host"
+msgstr ""
+
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
+msgid "Monitoring"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:327
+msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:343
+msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:339
+msgid "Monitoring of log file. pattern - regular expression"
+msgstr ""
+
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
+msgid "Month"
+msgstr ""
+
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
+msgid "Monthly"
+msgstr ""
+
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
+msgid "More matches found..."
+msgstr ""
+
+#: queue.php:107 queue.php:155
+msgid "More than 10 minutes"
+msgstr ""
+
+#: include/classes/api/services/CGraphGeneral.php:771
+#, c-format
+msgid "More than one graph with name \"%1$s\" within host."
+msgstr ""
+
+#: report5.php:24
+msgid "Most busy triggers top 100"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:92
+msgid "Mozilla Firefox"
+msgstr ""
+
+#: include/triggers.inc.php:1485
+msgid "Multiple PROBLEM events"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:250
+msgid "Multiple PROBLEM events generation"
+msgstr ""
+
+#: jsLoader.php:160
+msgid "Mute"
+msgstr ""
+
+#: include/views/monitoring.maps.php:75
+msgid "NETWORK MAPS"
+msgstr ""
+
+#: include/discovery.inc.php:62
+#: include/views/js/configuration.discovery.edit.js.php:176
+msgid "NNTP"
+msgstr ""
+
+#: include/classes/screens/CScreenClock.php:70
+msgid "NO DATA"
+msgstr ""
+
+#: include/httptest.inc.php:29
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
+#: include/views/administration.general.iconmap.edit.php:29
+#: include/views/administration.general.iconmap.list.php:24
+#: include/views/administration.general.image.edit.php:32
+#: include/views/administration.general.regularexpressions.edit.php:37
+#: include/views/administration.general.regularexpressions.list.php:31
+#: include/views/administration.general.valuemapping.edit.php:35
+#: include/views/administration.general.valuemapping.list.php:24
+#: include/views/administration.mediatypes.edit.php:35
+#: include/views/administration.mediatypes.list.php:39
+#: include/views/administration.proxy.list.php:40
+#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.list.php:38
+#: include/views/administration.usergroups.list.php:45
+#: include/views/configuration.action.edit.php:45
+#: include/views/configuration.action.edit.php:72
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.list.php:51
+#: include/views/configuration.application.edit.php:42
+#: include/views/configuration.discovery.edit.php:39
+#: include/views/configuration.discovery.list.php:40
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
+#: include/views/configuration.graph.list.php:77
+#: include/views/configuration.host.discovery.edit.php:52
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
+#: include/views/configuration.hostgroups.list.php:50
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
+#: include/views/configuration.httpconf.edit.php:59
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
+#: include/views/configuration.item.edit.php:52
+#: include/views/configuration.item.list.php:63
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
+#: include/views/configuration.maintenance.edit.php:39
+#: include/views/configuration.maintenance.list.php:44
+#: include/views/configuration.screen.edit.php:41
+#: include/views/configuration.screen.list.php:51
+#: include/views/configuration.services.edit.php:47
+#: include/views/configuration.slideconf.edit.php:40
+#: include/views/configuration.slideconf.list.php:40
+#: include/views/configuration.sysmap.edit.php:41
+#: include/views/configuration.sysmap.edit.php:137
+#: include/views/configuration.sysmap.list.php:43
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:63
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
+#: include/views/inventory.host.list.php:76
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
+#: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
+msgid "Name"
+msgstr ""
+
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
+#, c-format
+msgid "Name for group prototype \"%1$s\" must contain macros."
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:53
+msgid "Network discovery data storage period (in days)"
+msgstr ""
+
+#: adm.housekeeper.php:40
+msgid "Network discovery event and alert data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:107
+#, c-format
+msgid "Network discovery event and alert data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:97
+#: include/classes/items/CHelpItems.php:359
+msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:105
+#: include/classes/items/CHelpItems.php:367
+msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
+msgstr ""
+
+#: sysmaps.php:174
+msgid "Network map added"
+msgstr ""
+
+#: sysmaps.php:220
+msgid "Network map deleted"
+msgstr ""
+
+#: sysmaps.php:167
+msgid "Network map updated"
+msgstr ""
+
+#: maps.php:25
+msgid "Network maps"
+msgstr ""
+
+#: httpmon.php:173 include/func.inc.php:208
+msgid "Never"
+msgstr ""
+
+#: httpdetails.php:154 httpdetails.php:228
+msgid "Never executed"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
+#: include/views/configuration.maintenance.edit.php:132
+msgid "New"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:73
+#: include/views/configuration.item.edit.php:392
+msgid "New application"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:352
+msgid "New condition"
+msgstr ""
+
+#: jsLoader.php:151
+msgid "New element"
+msgstr ""
+
+#: disc_prototypes.php:49 host_discovery.php:58
+#: include/views/configuration.host.discovery.edit.php:245
+#: include/views/configuration.item.edit.php:312
+#: include/views/configuration.item.massupdate.php:376 items.php:51
+msgid "New flexible interval"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
+msgid "New group"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:142
+msgid "New host group"
+msgstr ""
+
+#: popup_bitem.php:102
+msgid "New item for the graph"
+msgstr ""
+
+#: popup_media.php:105
+msgid "New media"
+msgstr ""
+
+#: adm.regexps.php:216
+msgid "New regular expression"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:264
+msgid "New service time"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:118
+msgid "Next"
+msgstr ""
+
+#: include/func.inc.php:1537
+msgctxt "page navigation"
+msgid "Next"
+msgstr ""
+
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
+#: include/views/administration.users.list.php:76
+#: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
+#: include/views/js/adm.regexprs.edit.js.php:142
+msgid "No"
+msgstr ""
+
+#: include/classes/api/services/CGraphPrototype.php:41
+#, c-format
+msgid "No \"%1$s\" given for graph prototype."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:41
+#, c-format
+msgid "No \"%1$s\" given for graph."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:457
+#, c-format
+msgid "No \"%1$s\" given for host prototype."
+msgstr ""
+
+#: include/classes/api/services/CScreen.php:470
+#, c-format
+msgid "No \"%1$s\" given for screen."
+msgstr ""
+
+#: include/classes/api/services/CTemplateScreen.php:596
+#, c-format
+msgid "No \"%1$s\" given for template screen."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:208
+#, c-format
+msgid "No \"%2$s\" given for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
+#, c-format
+msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1884
+#, c-format
+msgid "No \"ymax_type\" field for graph \"%s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1880
+#, c-format
+msgid "No \"ymin_type\" field for graph \"%s\"."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
+msgid "No IPMI interfaces found."
+msgstr ""
+
+#: include/views/configuration.services.child.list.php:35
+msgid "No IT services found."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
+msgid "No JMX interfaces found."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:357
+msgid "No SNMP OID specified."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:363
+msgid "No SNMP community specified."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
+msgid "No SNMP interfaces found."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:557
+msgid "No URL provided for screen element."
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:135
+msgid "No URLs defined."
+msgstr ""
+
+#: include/forms.inc.php:241
+msgid "No accessible resources"
+msgstr ""
+
+#: include/acknow.inc.php:48
+msgid "No acknowledges found."
+msgstr ""
+
+#: include/classes/screens/CScreenActions.php:126
+#: include/views/administration.auditacts.list.php:67
+msgid "No action log entries found."
+msgstr ""
+
+#: include/actions.inc.php:817 include/actions.inc.php:913
+#: include/actions.inc.php:967 include/views/configuration.action.list.php:48
+msgid "No actions found."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
+msgid "No agent interfaces found."
+msgstr ""
+
+#: include/hosts.inc.php:577
+#, c-format
+msgid "No application with ID \"%1$s\"."
+msgstr ""
+
+#: include/views/configuration.application.list.php:57
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
+msgid "No applications found."
+msgstr ""
+
+#: include/views/administration.auditlogs.list.php:83
+msgid "No audit log entries found."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1333
+#, c-format
+msgid "No authentication type specified for action operation command \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
+#, c-format
+msgid "No authentication user name specified for action operation command \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:334
+msgid "No authentication user name specified."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1320
+msgid "No command specified for action operation."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1315
+msgid "No command type specified for action operation."
+msgstr ""
+
+#: include/views/configuration.action.edit.php:69
+#: include/views/configuration.action.edit.php:945
+msgid "No conditions defined."
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:42
+#: include/views/configuration.maintenance.list.php:70
+msgid "No data collection"
+msgstr ""
+
+#: popup_trexpr.php:501
+msgid "No data received during period of time T, then N = 1, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:506
+msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:811
+#, c-format
+msgid "No default interface for \"%1$s\" type on \"%2$s\"."
+msgstr ""
+
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
+msgid "No dependencies defined."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
+msgid "No details"
+msgstr ""
+
+#: include/views/monitoring.discovery.php:36
+msgid "No discovered devices found."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:112
+#, c-format
+msgid "No discovery rule ID given for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:473
+msgid "No discovery rule IDs given."
+msgstr ""
+
+#: include/views/configuration.discovery.list.php:37
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
+msgid "No discovery rules found."
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:178
+msgid "No errors found."
+msgstr ""
+
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
+msgid "No events"
+msgstr ""
+
+#: events.php:410 include/blocks.inc.php:998
+#: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
+msgid "No events found."
+msgstr ""
+
+#: acknow.php:82
+msgid "No events to acknowledge"
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1328
+#, c-format
+msgid "No execution target specified for action operation command \"%s\"."
+msgstr ""
+
+#: include/classes/helpers/CUploadFile.php:156
+msgid "No file was uploaded."
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:195
+#: include/views/configuration.item.edit.php:262
+#: include/views/configuration.item.massupdate.php:318
+msgid "No flexible intervals defined."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:492
+msgid "No graph ID provided for screen element."
+msgstr ""
+
+#: include/graphs.inc.php:274
+#, c-format
+msgid "No graph item with graphid \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
+msgid "No graph prototypes found."
+msgstr ""
+
+#: include/blocks.inc.php:114
+msgid "No graphs added."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73
+#: include/views/monitoring.charts.php:77 popup.php:1300
+msgid "No graphs found."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
+#, c-format
+msgid "No groups for host \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:941
+msgid "No groups for hosts."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:407
+#, c-format
+msgid "No groups for template \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:976
+msgid "No groups for template."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:476
+msgid "No host IDs given."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:633
+#, c-format
+msgid "No host given for macro \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:240
+msgid "No host group ID for group prototype."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:474
+msgid "No host group ID provided for screen element."
+msgstr ""
+
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
+msgid "No host groups found."
+msgstr ""
+
+#: include/hosts.inc.php:493
+#, c-format
+msgid "No host groups with groupid \"%s\"."
+msgstr ""
+
+#: include/views/configuration.host.prototype.list.php:44
+msgid "No host prototypes found."
+msgstr ""
+
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
+#: include/hosts.inc.php:536
+#, c-format
+msgid "No host with hostid \"%s\"."
+msgstr ""
+
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
+msgid "No hosts found."
+msgstr ""
+
+#: include/classes/api/services/CMapElement.php:70
+#, c-format
+msgid "No icon for map element \"%s\"."
+msgstr ""
+
+#: include/views/administration.general.iconmap.list.php:22
+msgid "No icon maps found."
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:47
+msgid "No image"
+msgstr ""
+
+#: include/views/administration.general.image.list.php:36
+msgid "No images found."
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:96
+#: include/views/configuration.item.edit.php:102
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
+msgid "No interface found"
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:263
+msgid "No interface found."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
+#, c-format
+msgid "No interface provided for proxy \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
+#, c-format
+msgid "No interfaces for host \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
+msgid "No item ID provided for screen element."
+msgstr ""
+
+#: popup.php:953
+msgid "No item keys found."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
+msgid "No item prototypes found."
+msgstr ""
+
+#: include/items.inc.php:530
+#, c-format
+msgid "No item with itemid \"%1$s\"."
+msgstr ""
+
+#: include/items.inc.php:513
+#, c-format
+msgid "No item with itemid=\"%1$s\"."
+msgstr ""
+
+#: chart3.php:120
+msgid "No items defined."
+msgstr ""
+
+#: include/items.inc.php:697 include/views/configuration.item.list.php:58
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
+msgid "No items found."
+msgstr ""
+
+#: include/views/common.macros.php:27
+msgid "No macros found."
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:98
+msgid "No maintenance periods defined."
+msgstr ""
+
+#: include/views/configuration.maintenance.list.php:41
+msgid "No maintenance periods found."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:539
+msgid "No map ID provided for screen element."
+msgstr ""
+
+#: include/blocks.inc.php:172
+msgid "No maps added."
+msgstr ""
+
+#: include/views/configuration.sysmap.list.php:40
+#: include/views/monitoring.maps.php:23 popup.php:1413
+msgid "No maps found."
+msgstr ""
+
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
+msgid "No matches found"
+msgstr ""
+
+#: include/views/administration.users.edit.php:179
+msgid "No media found."
+msgstr ""
+
+#: include/views/administration.mediatypes.list.php:36
+msgid "No media types found."
+msgstr ""
+
+#: report4.php:69
+msgid "No notifications found."
+msgstr ""
+
+#: include/views/configuration.action.edit.php:367
+msgid "No operations defined."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1865
+#, c-format
+msgid "No permission for graph \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1003
+#, c-format
+msgid "No permission for host \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1823
+#, c-format
+msgid "No permission for item \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1482
+#, c-format
+msgid "No permission for template \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1731
+#, c-format
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
+
+#: slides.php:91
+msgid "No permissions"
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1097
+#, c-format
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:682
+#, c-format
+msgid "No permissions for map \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:441
+#, c-format
+msgid "No permissions for screen \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
+msgid "No permissions for system access."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
+msgid "No permissions to referred object or it does not exist!"
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1345
+#, c-format
+msgid "No private key file specified for action operation command \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:342
+msgid "No private key file specified."
+msgstr ""
+
+#: include/views/administration.proxy.list.php:37 popup.php:1677
+msgid "No proxies found."
+msgstr ""
+
+#: include/views/configuration.discovery.edit.php:43
+msgid "No proxy"
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1342
+#, c-format
+msgid "No public key file specified for action operation command \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:339
+msgid "No public key file specified."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1307
+msgid "No recipients for action operation message."
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.list.php:28
+msgid "No regular expressions found."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:547
+msgid "No screen ID provided for screen element."
+msgstr ""
+
+#: include/blocks.inc.php:251
+msgid "No screens added."
+msgstr ""
+
+#: include/classes/screens/CScreenBuilder.php:299
+#: include/views/configuration.screen.list.php:48
+#: include/views/monitoring.hostscreen.php:32
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
+msgid "No screens found."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1356
+msgid "No script specified for action operation command."
+msgstr ""
+
+#: include/views/administration.script.list.php:35 popup.php:1703
+msgid "No scripts found."
+msgstr ""
+
+#: include/views/configuration.slideconf.list.php:37
+#: include/views/monitoring.slides.php:106
+msgid "No slide shows found."
+msgstr ""
+
+#: include/views/monitoring.slides.php:93 popup.php:1483
+msgid "No slides found."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:216
+msgid "No status for proxy."
+msgstr ""
+
+#: triggers.php:323
+msgid "No target selected"
+msgstr ""
+
+#: graphs.php:377 items.php:746
+msgid "No target selected."
+msgstr ""
+
+#: popup.php:660 search.php:403 templates.php:506
+msgid "No templates found."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
+msgid "No templates linked."
+msgstr ""
+
+#: include/views/configuration.services.edit.php:129
+msgid "No times defined. Work 24x7."
+msgstr ""
+
+#: include/views/monitoring.overview.triggers.php:61
+msgid "No trigger"
+msgstr ""
+
+#: include/triggers.inc.php:259
+#, c-format
+msgid "No trigger with triggerid \"%1$s\"."
+msgstr ""
+
+#: chart4.php:40 tr_comments.php:42
+msgid "No triggers defined."
+msgstr ""
+
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
+msgid "No triggers found."
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:42 popup.php:534
+#: popup_usrgrp.php:86
+msgid "No user groups found."
+msgstr ""
+
+#: include/views/administration.users.list.php:51 popup.php:591
+msgid "No users found."
+msgstr ""
+
+#: include/views/administration.general.valuemapping.list.php:22
+msgid "No value maps found."
+msgstr ""
+
+#: include/classes/screens/CScreenHistory.php:160
+#: include/classes/screens/CScreenHistory.php:270
+#: include/classes/screens/CScreenPlainText.php:41
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
+msgid "No values found."
+msgstr ""
+
+#: httpmon.php:89 include/blocks.inc.php:1166
+#: include/views/configuration.httpconf.list.php:58
+msgid "No web scenarios found."
+msgstr ""
+
+#: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
+#: include/services.inc.php:274
+#: include/views/administration.general.gui.edit.php:27
+#: include/views/administration.general.other.edit.php:30
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
+msgid "None"
+msgstr ""
+
+#: include/graphs.inc.php:24 include/items.inc.php:180
+#: include/triggers.inc.php:1484 popup.php:1382
+msgid "Normal"
+msgstr ""
+
+#: include/html.inc.php:203
+msgid "Normal view"
+msgstr ""
+
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
+msgid "Not Ack"
+msgstr ""
+
+#: include/forms.inc.php:601 include/forms.inc.php:782
+msgid "Not Templated items"
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1452
+#, c-format
+msgid "Not all templates are linked to \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:334
+msgid "Not allowed to set password for user \"guest\"."
+msgstr ""
+
+#: include/classes/api/clients/CLocalApiClient.php:146
+msgid "Not authorised."
+msgstr ""
+
+#: include/classes/html/CHostsInfo.php:119
+msgid "Not available"
+msgstr ""
+
+#: adm.triggerseverities.php:54
+#: include/views/administration.general.triggerSeverity.edit.php:34
+msgid "Not classified"
+msgstr ""
+
+#: include/page_footer.php:79
+msgid "Not connected"
+msgstr ""
+
+#: include/classes/screens/CScreenActions.php:155
+#: include/views/administration.auditacts.list.php:94
+msgid "Not sent"
+msgstr ""
+
+#: include/items.inc.php:181 include/items.inc.php:206
+msgid "Not supported"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.parent.list.php:48
+msgid "Note"
+msgstr ""
+
+#: include/hosts.inc.php:235
+msgid "Notes"
+msgstr ""
+
+#: include/maps.inc.php:49
+msgid "Nothing"
+msgstr ""
+
+#: include/profiles.inc.php:142
+msgid "Nothing to do."
+msgstr ""
+
+#: report4.php:24
+msgid "Notification report"
+msgstr ""
+
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
+msgid "Notifications"
+msgstr ""
+
+#: include/func.inc.php:247
+msgid "Nov"
+msgstr ""
+
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
+msgid "November"
+msgstr ""
+
+#: jsLoader.php:131
+msgid "Now"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:165
+#: include/classes/items/CHelpItems.php:427
+msgid "Number of available proccessors."
+msgstr ""
+
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
+msgid "Number of hosts (enabled/disabled/templates)"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:285
+#: include/classes/items/CHelpItems.php:547
+msgid "Number of inodes for a given volume. If mode is missing total is used."
+msgstr ""
+
+#: include/blocks.inc.php:826
+msgid "Number of items (enabled/disabled/not supported)"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:839
+msgid "Number of items in Zabbix database."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:859
+msgid "Number of items in proxy history that are not yet sent to the server"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:863
+msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:835
+msgid "Number of monitored hosts"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:141
+#: include/classes/items/CHelpItems.php:403
+msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:647
+msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:651
+msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:707
+msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: popup_trexpr.php:469
+msgid "Number of seconds since the Epoch is < N"
+msgstr ""
+
+#: popup_trexpr.php:477
+msgid "Number of seconds since the Epoch is = N"
+msgstr ""
+
+#: popup_trexpr.php:473
+msgid "Number of seconds since the Epoch is > N"
+msgstr ""
+
+#: popup_trexpr.php:481
+msgid "Number of seconds since the Epoch is NOT N"
+msgstr ""
+
+#: report5.php:61
+msgid "Number of status changes"
+msgstr ""
+
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
+msgid "Number of steps"
+msgstr ""
+
+#: popup_trexpr.php:201
+msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
+msgstr ""
+
+#: popup_trexpr.php:211
+msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
+msgstr ""
+
+#: popup_trexpr.php:206
+msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
+msgstr ""
+
+#: popup_trexpr.php:216
+msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
+msgstr ""
+
+#: include/blocks.inc.php:835
+msgid "Number of triggers (enabled/disabled [problem/ok])"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:883
+msgid "Number of triggers in Zabbix database."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:843
+msgid "Number of unsupported items in Zabbix database."
+msgstr ""
+
+#: include/blocks.inc.php:845
+msgid "Number of users (online)"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:241
+#: include/classes/items/CHelpItems.php:503
+msgid "Number of users connected. Command who is used on agent side."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:807
+msgid "Number of values stored in table HISTORY."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:811
+msgid "Number of values stored in table HISTORY_LOG."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:815
+msgid "Number of values stored in table HISTORY_STR."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:819
+msgid "Number of values stored in table HISTORY_TEXT."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:823
+msgid "Number of values stored in table HISTORY_UINT."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:875
+msgid "Number of values stored in table TRENDS."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:879
+msgid "Number of values stored in table TRENDS_UINT."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:699
+msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/forms.inc.php:402 include/items.inc.php:123
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
+#: include/views/configuration.item.massupdate.php:209
+msgid "Numeric (float)"
+msgstr ""
+
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
+msgid "Numeric (integer 64bit)"
+msgstr ""
+
+#: include/forms.inc.php:401 include/items.inc.php:121
+#: include/views/configuration.item.edit.php:211
+#: include/views/configuration.item.massupdate.php:208
+msgid "Numeric (unsigned)"
+msgstr ""
+
+#: include/hosts.inc.php:42 include/hosts.inc.php:70
+msgid "OEM"
+msgstr ""
+
+#: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
+msgid "OK"
+msgstr ""
+
+#: include/views/monitoring.overview.items.php:39
+msgid "OK or no trigger"
+msgstr ""
+
+#: include/hosts.inc.php:305
+msgid "OOB IP address"
+msgstr ""
+
+#: include/hosts.inc.php:315
+msgid "OOB router"
+msgstr ""
+
+#: include/hosts.inc.php:310
+msgid "OOB subnet mask"
+msgstr ""
+
+#: tr_logform.php:263
+msgid "OR"
+msgstr ""
+
+#: include/hosts.inc.php:125 include/views/inventory.host.list.php:78
+msgid "OS"
+msgstr ""
+
+#: include/hosts.inc.php:130
+msgid "OS (Full details)"
+msgstr ""
+
+#: include/hosts.inc.php:135
+msgid "OS (Short)"
+msgstr ""
+
+#: adm.other.php:124
+msgid "OTHER CONFIGURATION PARAMETERS"
+msgstr ""
+
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
+msgid "OVERVIEW"
+msgstr ""
+
+#: include/func.inc.php:246
+msgid "Oct"
+msgstr ""
+
+#: include/items.inc.php:137
+msgid "Octal"
+msgstr ""
+
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
+msgid "October"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:38
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
+msgid "Off"
+msgstr ""
+
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
+#: report3.php:83
+msgid "Ok"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:38
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+msgid "On"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:111
+msgid "On status change triggers blink for"
+msgstr ""
+
+#: include/views/administration.users.edit.php:236
+msgid "Once"
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
+msgid "One of the objects is left without a host group."
+msgstr ""
+
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
+msgid "One time only"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
+msgid "One-time downtime"
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:250
+msgid "Only Super Admins can create global macros."
+msgstr ""
+
+#: include/classes/api/services/CHostGroup.php:415
+msgid "Only Super Admins can create host groups."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:151
+msgid "Only Super Admins can create icon maps."
+msgstr ""
+
+#: include/classes/api/services/CMediatype.php:182
+msgid "Only Super Admins can create media types."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:350
+msgid "Only Super Admins can delete global macros."
+msgstr ""
+
+#: include/classes/api/services/CMediatype.php:295
+msgid "Only Super Admins can delete media types."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
+msgid "Only Super Admins can delete user groups."
+msgstr ""
+
+#: include/classes/api/services/CMediatype.php:233
+msgid "Only Super Admins can edit media types."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:288
+msgid "Only Super Admins can update global macros."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:207
+msgid "Only Super Admins can update icon maps."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:608
+msgid "Only Zabbix Admins can add user media."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:786
+msgid "Only Zabbix Admins can change user media."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:867
+msgid "Only Zabbix Admins can remove user media."
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
+
+#: include/blocks.inc.php:827
+msgid "Only items assigned to enabled hosts are counted"
+msgstr ""
+
+#: include/classes/api/services/CDRule.php:333
+msgid "Only one check can be unique."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:413
+msgid "Only one user group name can be changed at a time."
+msgstr ""
+
+#: include/services.inc.php:256
+#, c-format
+msgid "Only the last 20%% of the indicator is displayed."
+msgstr ""
+
+#: include/classes/api/services/CEvent.php:636
+msgid "Only trigger events can be acknowledged."
+msgstr ""
+
+#: include/blocks.inc.php:836
+msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:101
+msgid "Opera"
+msgstr ""
+
+#: actionconf.php:273
+#, c-format
+msgid "Operation \"%s\" already exists."
+msgstr ""
+
+#: include/validate.inc.php:457
+msgid "Operation cannot be performed due to unauthorized request."
+msgstr ""
+
+#: include/views/configuration.action.edit.php:1053
+msgid "Operation condition"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:1061
+msgid "Operation details"
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1416
+msgid "Operation has no group to operate."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1424
+msgid "Operation has no template to operate."
+msgstr ""
+
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
+msgid "Operation type"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:1071
+#: include/views/configuration.action.list.php:53
+msgid "Operations"
+msgstr ""
+
+#: include/hosts.inc.php:68
+msgid "Operator"
+msgstr ""
+
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
+#: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
+msgid "Or"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
+#: include/views/configuration.item.massupdate.php:47
+#: include/views/configuration.item.massupdate.php:81
+#: include/views/configuration.item.massupdate.php:97
+#: include/views/configuration.item.massupdate.php:107
+#: include/views/configuration.item.massupdate.php:117
+#: include/views/configuration.item.massupdate.php:131
+#: include/views/configuration.item.massupdate.php:151
+#: include/views/configuration.item.massupdate.php:161
+#: include/views/configuration.item.massupdate.php:181
+#: include/views/configuration.item.massupdate.php:191
+#: include/views/configuration.item.massupdate.php:201
+#: include/views/configuration.item.massupdate.php:217
+#: include/views/configuration.item.massupdate.php:229
+#: include/views/configuration.item.massupdate.php:239
+#: include/views/configuration.item.massupdate.php:252
+#: include/views/configuration.item.massupdate.php:262
+#: include/views/configuration.item.massupdate.php:272
+#: include/views/configuration.item.massupdate.php:282
+#: include/views/configuration.item.massupdate.php:292
+#: include/views/configuration.item.massupdate.php:302
+#: include/views/configuration.item.massupdate.php:312
+#: include/views/configuration.item.massupdate.php:350
+#: include/views/configuration.item.massupdate.php:383
+#: include/views/configuration.item.massupdate.php:393
+#: include/views/configuration.item.massupdate.php:407
+#: include/views/configuration.item.massupdate.php:417
+#: include/views/configuration.item.massupdate.php:431
+#: include/views/configuration.item.massupdate.php:449
+#: include/views/configuration.item.massupdate.php:459
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
+msgid "Original"
+msgstr ""
+
+#: include/classes/core/ZBase.php:250
+msgid "Original blue"
+msgstr ""
+
+#: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
+#: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
+#: adm.valuemapping.php:136 adm.workingtime.php:72
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
+msgid "Other"
+msgstr ""
+
+#: adm.other.php:24
+msgid "Other configuration parameters"
+msgstr ""
+
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.maintenance.edit.php:176
+#: include/views/configuration.template.edit.php:114
+msgid "Other groups"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:87
+msgid "Other hosts"
+msgstr ""
+
+#: include/reports.inc.php:369
+#: include/views/configuration.hostgroups.edit.php:63
+#: include/views/configuration.maintenance.edit.php:168
+msgid "Other hosts | Group"
+msgstr ""
+
+#: include/views/administration.general.other.edit.php:41
+msgid "Other parameters"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:171
+msgid "Other | group"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:121
+msgid "Others"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:93
+#: include/classes/items/CHelpItems.php:355
+msgid "Out-of-window collision. Collisions count."
+msgstr ""
+
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
+msgctxt "item_form"
+msgid "Overridden by"
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:133
+msgid "Override item history period"
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:154
+msgid "Override item trend period"
+msgstr ""
+
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
+msgid "Overview"
+msgstr ""
+
+#: queue.php:70
+msgid "Overview by proxy"
+msgstr ""
+
+#: include/func.inc.php:668
+msgctxt "Peta short"
+msgid "P"
+msgstr ""
+
+#: dashboard.php:293
+msgid "PERSONAL DASHBOARD"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:286
+msgid "PHP bcmath"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:290
+msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:521
+msgid "PHP ctype"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:525
+msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:224
+msgid "PHP databases support"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:366
+msgid "PHP gd"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:437
+msgid "PHP gd FreeType support"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:441
+msgid "PHP gd FreeType support missing."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:418
+msgid "PHP gd JPEG image support missing."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:414
+msgid "PHP gd JPEG support"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:393
+msgid "PHP gd PNG image support missing."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:389
+msgid "PHP gd PNG support"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:370
+msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:572
+msgid "PHP gettext"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:576
+msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:460
+msgid "PHP libxml"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:464
+msgid "PHP libxml extension missing."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:303
+msgid "PHP mbstring"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:307
+msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
+msgid "PHP option max_execution_time"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:184
+msgid "PHP option max_input_time"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:116
+msgid "PHP option memory_limit"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:133
+msgid "PHP option post_max_size"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:150
+msgid "PHP option upload_max_filesize"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:538
+msgid "PHP session"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:555
+msgid "PHP session auto start"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:559
+msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:542
+msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:341
+msgid "PHP sockets"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:345
+msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
+msgid "PHP time zone"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:98
+msgid "PHP version"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:494
+msgid "PHP xmlreader"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:498
+msgid "PHP xmlreader extension missing."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:477
+msgid "PHP xmlwriter"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:481
+msgid "PHP xmlwriter extension missing."
+msgstr ""
+
+#: include/discovery.inc.php:61
+#: include/views/js/configuration.discovery.edit.js.php:177
+msgid "POP"
+msgstr ""
+
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
+msgid "PROBLEM"
+msgstr ""
+
+#: include/validate.inc.php:545
+msgid "Page received incorrect data"
+msgstr ""
+
+#: include/reports.inc.php:438
+msgid "Palette"
+msgstr ""
+
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
+#, c-format
+msgid "Palette #%1$s"
+msgstr ""
+
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
+msgid "Parameter"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:47
+#: include/views/configuration.host.prototype.edit.php:56
+msgid "Parent discovery rules"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:50
+msgid "Parent graphs"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:47
+msgid "Parent items"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:50
+msgid "Parent service"
+msgstr ""
+
+#: include/views/configuration.triggers.edit.php:59
+msgid "Parent triggers"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:51
+msgid "Parent web scenarios"
+msgstr ""
+
+#: include/classes/api/services/CImage.php:238
+#, c-format
+msgid "Parse SQL error [%1$s] in [%2$s]."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:169
+msgid "Parse error"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.list.php:90
+msgid "Passive"
+msgstr ""
+
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
+#: include/views/configuration.host.discovery.edit.php:164
+#: include/views/configuration.host.discovery.edit.php:176
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
+#: include/views/configuration.item.edit.php:170
+#: include/views/configuration.item.edit.php:182
+#: include/views/configuration.item.massupdate.php:246
+#: include/views/configuration.item.massupdate.php:290
+#: include/views/general.login.php:69
+#: include/views/js/common.item.edit.js.php:182
+msgid "Password"
+msgstr ""
+
+#: include/views/administration.users.edit.php:87
+msgid "Password (once again)"
+msgstr ""
+
+#: users.php:166
+#, c-format
+msgid "Password is unavailable for users with %1$s."
+msgstr ""
+
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
+msgid "Password required for media type."
+msgstr ""
+
+#: profile.php:120 users.php:202
+msgid "Password should not be empty"
+msgstr ""
+
+#: include/classes/debug/CProfiler.php:146
+#, c-format
+msgid "Peak memory usage: %s"
+msgstr ""
+
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
+msgid "Percentile line (left)"
+msgstr ""
+
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
+msgid "Percentile line (right)"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:85
+#: include/classes/items/CHelpItems.php:347
+msgid "Performs a DNS query. On success returns a character string with the required type of information."
+msgstr ""
+
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
+#: include/views/configuration.host.discovery.edit.php:198
+#: include/views/configuration.host.discovery.edit.php:233
+#: include/views/configuration.item.edit.php:265
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.massupdate.php:321
+#: include/views/configuration.item.massupdate.php:362
+#: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
+#: report4.php:102 report6.php:56 srv_status.php:159
+msgid "Period"
+msgstr ""
+
+#: include/forms.inc.php:1637
+#: include/views/configuration.maintenance.edit.php:100
+msgid "Period type"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:134
+#: include/views/configuration.maintenance.edit.php:186
+msgid "Periods"
+msgstr ""
+
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
+msgid "Permissions"
+msgstr ""
+
+#: include/views/administration.users.edit.php:369
+msgid "Permissions can be assigned for user groups only."
+msgstr ""
+
+#: include/locales.inc.php:72
+msgid "Persian (fa_IR)"
+msgstr ""
+
+#: include/func.inc.php:668
+msgid "Peta"
+msgstr ""
+
+#: include/graphs.inc.php:26 popup.php:1376
+msgid "Pie"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:60
+msgid "Placing algorithm"
+msgstr ""
+
+#: include/screens.inc.php:35
+msgid "Plain text"
+msgstr ""
+
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
+msgid "Play"
+msgstr ""
+
+#: include/views/administration.users.edit.php:239
+msgid "Play sound"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:231
+msgid "Please correct all issues and press \"Retry\" button"
+msgstr ""
+
+#: scripts.php:88
+msgid "Please enter confirmation text."
+msgstr ""
+
+#: jsLoader.php:147
+msgid "Please select two elements"
+msgstr ""
+
+#: include/locales.inc.php:73
+msgid "Polish (pl_PL)"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:425
+msgid "Populates host inventory field"
+msgstr ""
+
+#: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
+#: include/views/administration.authentication.edit.php:71
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
+#: include/views/configuration.host.discovery.edit.php:154
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/configuration.item.edit.php:160
+#: include/views/configuration.item.massupdate.php:199
+#: include/views/inventory.host.view.php:96
+#: include/views/inventory.host.view.php:115
+#: include/views/inventory.host.view.php:135
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
+msgid "Port"
+msgstr ""
+
+#: include/classes/api/services/CHostInterface.php:623
+msgid "Port cannot be empty for host interface."
+msgstr ""
+
+#: include/views/js/configuration.discovery.edit.js.php:33
+msgid "Port range"
+msgstr ""
+
+#: include/locales.inc.php:74
+msgid "Portuguese (pt_BR)"
+msgstr ""
+
+#: include/locales.inc.php:75
+msgid "Portuguese (pt_PT)"
+msgstr ""
+
+#: tr_logform.php:276
+msgid "Position"
+msgstr ""
+
+#: include/views/configuration.httpconf.popup.php:88
+msgid "Post"
+msgstr ""
+
+#: include/views/administration.general.iconmap.edit.php:64
+#: include/views/administration.general.iconmap.edit.php:102
+#: include/views/administration.general.iconmap.edit.php:130
+#: include/views/configuration.graph.edit.php:304
+msgid "Preview"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:138
+msgid "Previous"
+msgstr ""
+
+#: include/func.inc.php:1510
+msgctxt "page navigation"
+msgid "Previous"
+msgstr ""
+
+#: popup_trexpr.php:289
+msgid "Previous value is < N"
+msgstr ""
+
+#: popup_trexpr.php:297
+msgid "Previous value is = N"
+msgstr ""
+
+#: popup_trexpr.php:293
+msgid "Previous value is > N"
+msgstr ""
+
+#: popup_trexpr.php:301
+msgid "Previous value is NOT N"
+msgstr ""
+
+#: include/hosts.inc.php:405
+msgid "Primary POC cell"
+msgstr ""
+
+#: include/hosts.inc.php:390
+msgid "Primary POC email"
+msgstr ""
+
+#: include/hosts.inc.php:385
+msgid "Primary POC name"
+msgstr ""
+
+#: include/hosts.inc.php:415
+msgid "Primary POC notes"
+msgstr ""
+
+#: include/hosts.inc.php:395
+msgid "Primary POC phone A"
+msgstr ""
+
+#: include/hosts.inc.php:400
+msgid "Primary POC phone B"
+msgstr ""
+
+#: include/hosts.inc.php:410
+msgid "Primary POC screen name"
+msgstr ""
+
+#: include/page_header.php:197
+msgid "Print"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:150
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.massupdate.php:189
+#: include/views/js/configuration.discovery.edit.js.php:100
+msgid "Privacy passphrase"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:146
+#: include/views/configuration.item.edit.php:152
+#: include/views/configuration.item.massupdate.php:179
+msgid "Privacy protocol"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:778
+#: include/views/configuration.host.discovery.edit.php:173
+#: include/views/configuration.item.edit.php:179
+#: include/views/configuration.item.massupdate.php:280
+msgid "Private key file"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
+msgid "Privilege level"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:914
+msgid "Probably php-ldap module is missing."
+msgstr ""
+
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
+msgid "Problem"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:129
+#: include/views/monitoring.dashconf.php:112
+msgid "Problem display"
+msgstr ""
+
+#: jsrpc.php:117
+msgid "Problem on"
+msgstr ""
+
+#: srv_status.php:142
+msgid "Problem time"
+msgstr ""
+
+#: include/services.inc.php:25
+msgid "Problem, if all children have problems"
+msgstr ""
+
+#: include/services.inc.php:24
+msgid "Problem, if at least one child has a problem"
+msgstr ""
+
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
+msgid "Problems"
+msgstr ""
+
+#: include/page_header.php:202
+msgid "Profile"
+msgstr ""
+
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
+msgid "Proxies"
+msgstr ""
+
+#: include/actions.inc.php:90 include/audit.inc.php:45
+#: include/views/administration.proxy.edit.php:92 queue.php:149
+msgid "Proxy"
+msgstr ""
+
+#: include/classes/import/importers/CHostImporter.php:165
+#, c-format
+msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:556
+#, c-format
+msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:239
+#, c-format
+msgid "Proxy \"%s\" already exists."
+msgstr ""
+
+#: proxies.php:119
+msgid "Proxy added"
+msgstr ""
+
+#: proxies.php:144 proxies.php:205
+msgid "Proxy deleted"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:87
+msgid "Proxy hosts"
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:323
+msgid "Proxy interface creation failed."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:395
+msgid "Proxy interface update failed."
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:43
+msgid "Proxy mode"
+msgstr ""
+
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
+msgid "Proxy name"
+msgstr ""
+
+#: proxies.php:112
+msgid "Proxy updated"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:753
+#: include/views/configuration.host.discovery.edit.php:165
+#: include/views/configuration.item.edit.php:171
+#: include/views/configuration.item.massupdate.php:247
+msgid "Public key"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:771
+#: include/views/configuration.host.discovery.edit.php:170
+#: include/views/configuration.item.edit.php:176
+#: include/views/configuration.item.massupdate.php:270
+msgid "Public key file"
+msgstr ""
+
+#: queue.php:76
+msgid "QUEUE OF ITEMS TO BE UPDATED"
+msgstr ""
+
+#: include/menu.inc.php:260 queue.php:25
+msgid "Queue"
+msgstr ""
+
+#: include/hosts.inc.php:43
+msgid "RMCP+"
+msgstr ""
+
+#: include/views/administration.script.edit.php:98
+#: include/views/administration.script.list.php:82
+msgid "Read"
+msgstr ""
+
+#: include/forms.inc.php:243 include/perm.inc.php:32
+#: include/views/administration.usergroups.edit.php:81
+msgid "Read only"
+msgstr ""
+
+#: include/forms.inc.php:243 include/perm.inc.php:31
+#: include/views/administration.usergroups.edit.php:81
+msgid "Read-write"
+msgstr ""
+
+#: srv_status.php:141
+msgid "Reason"
+msgstr ""
+
+#: include/actions.inc.php:84
+msgid "Received value"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:39
+msgid "Recent problem"
+msgstr ""
+
+#: include/views/administration.auditacts.list.php:41
+msgid "Recipient"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:457
+msgid "Recipient (ascending)"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:456
+msgid "Recipient (descending)"
+msgstr ""
+
+#: include/actions.inc.php:823 include/classes/screens/CScreenActions.php:74
+#: include/classes/screens/CScreenActions.php:80
+#: include/classes/screens/CScreenActions.php:131
+#: include/views/administration.auditacts.list.php:72
+msgid "Recipient(s)"
+msgstr ""
+
+#: include/views/administration.users.edit.php:248
+msgid "Recovery"
+msgstr ""
+
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
+#: include/views/configuration.action.edit.php:54
+msgid "Recovery message"
+msgstr ""
+
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
+msgid "Recovery subject"
+msgstr ""
+
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
+msgid "Refresh (in seconds)"
+msgstr ""
+
+#: jsLoader.php:211
+msgid "Refresh time"
+msgstr ""
+
+#: jsLoader.php:212
+msgid "Refresh time multiplier"
+msgstr ""
+
+#: adm.other.php:33 include/views/administration.general.other.edit.php:35
+msgid "Refresh unsupported items (in sec)"
+msgstr ""
+
+#: adm.other.php:60
+#, c-format
+msgid "Refresh unsupported items (in sec) \"%1$s\"."
+msgstr ""
+
+#: include/audit.inc.php:46
+#: include/views/configuration.host.discovery.edit.php:291
+msgid "Regular expression"
+msgstr ""
+
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
+#, c-format
+msgid "Regular expression \"%s\" already exists."
+msgstr ""
+
+#: popup_trexpr.php:413
+msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:423
+msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
+msgstr ""
+
+#: popup_trexpr.php:418
+msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:428
+msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
+msgstr ""
+
+#: adm.regexps.php:140
+msgid "Regular expression added"
+msgstr ""
+
+#: adm.regexps.php:190
+msgid "Regular expression deleted"
+msgid_plural "Regular expressions deleted"
+msgstr[0] ""
+
+#: include/regexp.inc.php:83
+msgid "Regular expression does not exist."
+msgstr ""
+
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
+msgid "Regular expression updated"
+msgstr ""
+
+#: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
+#: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
+#: adm.valuemapping.php:130 adm.workingtime.php:66
+#: include/views/administration.general.regularexpressions.list.php:22
+msgid "Regular expressions"
+msgstr ""
+
+#: include/views/general.login.php:74
+msgid "Remember me for 30 days"
+msgstr ""
+
+#: include/actions.inc.php:607
+msgid "Remote command"
+msgstr ""
+
+#: include/views/administration.general.iconmap.edit.php:74
+#: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
+#: include/views/common.macros.php:53
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
+#: include/views/configuration.host.discovery.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
+#: include/views/configuration.item.edit.php:278
+#: include/views/configuration.item.massupdate.php:334
+#: include/views/configuration.maintenance.edit.php:114
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
+#: include/views/configuration.slideconf.edit.php:68
+#: include/views/configuration.sysmap.edit.php:147
+#: include/views/configuration.sysmap.edit.php:165
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
+#: include/views/js/administration.general.valuemapping.edit.js.php:11
+#: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
+#: include/views/js/common.macros.js.php:15
+#: 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:34
+#: include/views/js/configuration.action.edit.js.php:46
+#: include/views/js/configuration.action.edit.js.php:60
+#: include/views/js/configuration.action.edit.js.php:74
+#: include/views/js/configuration.discovery.edit.js.php:11
+#: include/views/js/configuration.graph.edit.js.php:90
+#: include/views/js/configuration.host.discovery.edit.js.php:31
+#: include/views/js/configuration.host.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:8
+#: include/views/js/configuration.services.edit.js.php:75
+#: include/views/js/configuration.slideconf.edit.js.php:19
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
+msgid "Remove"
+msgstr ""
+
+#: jsLoader.php:214
+msgid "Remove all"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:30
+msgid "Remove element"
+msgstr ""
+
+#: slides.php:152
+msgid "Remove from"
+msgstr ""
+
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
+#: screens.php:110
+msgid "Remove from favourites"
+msgstr ""
+
+#: include/actions.inc.php:613
+msgid "Remove from host group"
+msgstr ""
+
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
+msgid "Remove from host groups"
+msgstr ""
+
+#: include/actions.inc.php:382 include/actions.inc.php:609
+msgid "Remove host"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:35
+msgid "Remove link"
+msgstr ""
+
+#: include/views/monitoring.history.php:106
+msgid "Remove selected"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
+msgid "Replace"
+msgstr ""
+
+#: include/views/configuration.item.massupdate.php:495
+msgid "Replace applications"
+msgstr ""
+
+#: include/views/configuration.triggers.massupdate.php:144
+msgid "Replace depenencies"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:66
+msgid "Replace host groups"
+msgstr ""
+
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
+msgid "Report"
+msgstr ""
+
+#: include/reports.inc.php:33
+msgid "Report 1"
+msgstr ""
+
+#: include/reports.inc.php:143
+msgid "Report 2"
+msgstr ""
+
+#: include/reports.inc.php:273
+msgid "Report 3"
+msgstr ""
+
+#: include/menu.inc.php:114 report6.php:240
+msgid "Reports"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
+msgid "Required"
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:402
+msgid "Required field \"expression\" is missing in icon mapping."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:408
+msgid "Required field \"iconid\" is missing in icon mapping."
+msgstr ""
+
+#: include/classes/api/services/CIconMap.php:405
+msgid "Required field \"inventory_link\" is missing in icon mapping."
+msgstr ""
+
+#: include/views/administration.script.edit.php:100
+msgid "Required host permissions"
+msgstr ""
+
+#: include/views/administration.proxy.list.php:45
+msgid "Required performance (vps)"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:871
+msgid "Required performance of the Zabbix server, in new values per second expected."
+msgstr ""
+
+#: include/blocks.inc.php:846
+msgid "Required server performance, new values per second"
+msgstr ""
+
+#: include/views/configuration.httpconf.popup.php:99
+msgid "Required status codes"
+msgstr ""
+
+#: include/views/configuration.httpconf.popup.php:98
+msgid "Required string"
+msgstr ""
+
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
+#: include/views/administration.auditacts.list.php:51
+#: include/views/administration.auditlogs.list.php:67
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
+msgid "Reset"
+msgstr ""
+
+#: include/views/js/administration.general.housekeeper.edit.js.php:38
+#: include/views/js/administration.general.triggerDisplayOptions.js.php:12
+msgid "Reset all fields to default values?"
+msgstr ""
+
+#: include/views/js/administration.general.triggerSeverity.js.php:12
+msgid "Reset all names and colours to default values?"
+msgstr ""
+
+#: include/views/js/administration.general.housekeeper.edit.js.php:137
+#: include/views/js/administration.general.triggerDisplayOptions.js.php:65
+#: include/views/js/administration.general.triggerSeverity.js.php:48
+msgid "Reset confirmation"
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/js/administration.general.housekeeper.edit.js.php:43
+#: include/views/js/administration.general.triggerDisplayOptions.js.php:17
+#: include/views/js/administration.general.triggerSeverity.js.php:17
+msgid "Reset defaults"
+msgstr ""
+
+#: jsrpc.php:112
+msgid "Resolved"
+msgstr ""
+
+#: include/views/administration.auditlogs.list.php:63
+#: include/views/administration.auditlogs.list.php:88
+#: include/views/configuration.screen.constructor.edit.php:94
+#: popup_right.php:24
+msgid "Resource"
+msgstr ""
+
+#: httpdetails.php:133
+msgid "Response code"
+msgstr ""
+
+#: httpdetails.php:132 httpdetails.php:337
+msgid "Response time"
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.edit.php:73
+#: include/views/administration.general.regularexpressions.edit.php:74
+#: tr_testexpr.php:138 tr_testexpr.php:182
+msgid "Result"
+msgstr ""
+
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
+msgid "Result is FALSE"
+msgstr ""
+
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
+msgid "Result is TRUE"
+msgstr ""
+
+#: include/views/general.script.execute.php:28
+#, c-format
+msgid "Result of \"%s\""
+msgstr ""
+
+#: tr_testexpr.php:50
+msgid "Result type"
+msgstr ""
+
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
+msgid "Retries"
+msgstr ""
+
+#: include/actions.inc.php:822
+msgid "Retries left"
+msgstr ""
+
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
+msgid "Retry"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:591
+msgid "Returns ICMP ping response time in seconds. Example: 0.02"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:831
+msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:233
+#: include/classes/items/CHelpItems.php:495
+msgid "Returns detailed host information. String value"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:177
+#: include/classes/items/CHelpItems.php:439
+msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:847
+msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:587
+msgid "Returns percentage of lost ICMP ping packets."
+msgstr ""
+
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
+#: include/views/configuration.sysmap.edit.php:115
+#: include/views/js/configuration.graph.edit.js.php:73
+#: include/views/js/configuration.sysmaps.js.php:85
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
+msgid "Right"
+msgstr ""
+
+#: include/locales.inc.php:76
+msgid "Romanian (ro_RO)"
+msgstr ""
+
+#: screenedit.php:263
+msgid "Row added"
+msgstr ""
+
+#: screenedit.php:321
+msgid "Row deleted"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
+msgid "Row span"
+msgstr ""
+
+#: include/views/configuration.screen.edit.php:43 screenconf.php:52
+msgid "Rows"
+msgstr ""
+
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
+msgid "Rows per page"
+msgstr ""
+
+#: include/views/conf.import.php:79
+msgid "Rules"
+msgstr ""
+
+#: include/actions.inc.php:469
+msgid "Run IPMI command"
+msgstr ""
+
+#: include/actions.inc.php:472
+msgid "Run SSH commands"
+msgstr ""
+
+#: include/actions.inc.php:475
+msgid "Run TELNET commands"
+msgstr ""
+
+#: include/actions.inc.php:495
+msgid "Run commands"
+msgstr ""
+
+#: include/actions.inc.php:479
+msgid "Run custom commands on Zabbix agent"
+msgstr ""
+
+#: include/actions.inc.php:482
+msgid "Run custom commands on Zabbix server"
+msgstr ""
+
+#: include/actions.inc.php:492
+msgid "Run global script"
+msgstr ""
+
+#: include/actions.inc.php:355
+msgid "Run remote commands on current host"
+msgstr ""
+
+#: include/actions.inc.php:374
+msgid "Run remote commands on host groups"
+msgstr ""
+
+#: include/actions.inc.php:362
+msgid "Run remote commands on hosts"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:201
+#: include/classes/items/CHelpItems.php:463
+msgid "Run specified command on the host."
+msgstr ""
+
+#: include/locales.inc.php:77
+msgid "Russian (ru_RU)"
+msgstr ""
+
+#: jsLoader.php:129
+msgctxt "Saturday short"
+msgid "S"
+msgstr ""
+
+#: jsLoader.php:130
+msgctxt "Sunday short"
+msgid "S"
+msgstr ""
+
+#: include/views/monitoring.hostscreen.php:30
+#: include/views/monitoring.hostscreen.php:40
+#: include/views/monitoring.screen.php:33
+#: include/views/monitoring.screen.php:58
+msgid "SCREENS"
+msgstr ""
+
+#: search.php:74
+msgid "SEARCH"
+msgstr ""
+
+#: include/classes/screens/CScreenClock.php:75
+msgid "SERVER"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:130
+#: include/views/configuration.item.edit.php:136
+#: include/views/configuration.item.massupdate.php:142
+#: include/views/js/configuration.discovery.edit.js.php:78
+msgid "SHA"
+msgstr ""
+
+#: report3.php:83 srv_status.php:143
+msgid "SLA"
+msgstr ""
+
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
+msgid "SLIDE SHOWS"
+msgstr ""
+
+#: include/media.inc.php:26
+#: include/views/administration.mediatypes.edit.php:42
+msgid "SMS"
+msgstr ""
+
+#: include/discovery.inc.php:58
+#: include/views/js/configuration.discovery.edit.js.php:181
+msgid "SMTP"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.list.php:52
+msgid "SMTP email"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.list.php:51
+msgid "SMTP helo"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:56
+#: include/views/administration.mediatypes.list.php:50
+msgid "SMTP server"
+msgstr ""
+
+#: include/hosts.inc.php:471 include/items.inc.php:281
+msgid "SNMP"
+msgstr ""
+
+#: include/views/js/configuration.discovery.edit.js.php:44
+msgid "SNMP Key"
+msgstr ""
+
+#: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
+#: include/views/configuration.host.discovery.edit.php:103
+#: include/views/configuration.item.edit.php:109
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
+msgid "SNMP OID"
+msgstr ""
+
+#: disc_prototypes.php:76 host_discovery.php:79 include/forms.inc.php:449
+#: include/views/configuration.host.discovery.edit.php:111
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.massupdate.php:95
+#: include/views/js/configuration.discovery.edit.js.php:39 items.php:85
+msgid "SNMP community"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
+#: include/views/inventory.host.view.php:123
+msgid "SNMP interfaces"
+msgstr ""
+
+#: include/items.inc.php:87
+msgid "SNMP trap"
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:351
+msgid "SNMP trap key is invalid."
+msgstr ""
+
+#: include/discovery.inc.php:66 include/items.inc.php:84
+#: include/views/js/configuration.discovery.edit.js.php:178
+msgid "SNMPv1 agent"
+msgstr ""
+
+#: include/discovery.inc.php:67 include/items.inc.php:85
+#: include/views/js/configuration.discovery.edit.js.php:179
+msgid "SNMPv2 agent"
+msgstr ""
+
+#: include/discovery.inc.php:68 include/items.inc.php:86
+#: include/views/js/configuration.discovery.edit.js.php:180
+msgid "SNMPv3 agent"
+msgstr ""
+
+#: include/classes/debug/CProfiler.php:142
+#, c-format
+msgid "SQL count: %s (selects: %s | executes: %s)"
+msgstr ""
+
+#: include/items.inc.php:1317
+#: include/views/configuration.host.discovery.edit.php:183
+#: include/views/configuration.item.edit.php:189
+msgid "SQL query"
+msgstr ""
+
+#: include/classes/db/DB.php:818
+#, c-format
+msgid "SQL statement execution has failed \"%1$s\""
+msgstr ""
+
+#: include/classes/db/DB.php:441 include/classes/db/DB.php:488
+#: include/classes/db/DB.php:545
+#, c-format
+msgid "SQL statement execution has failed \"%1$s\"."
+msgstr ""
+
+#: include/discovery.inc.php:56
+#: include/views/configuration.action.edit.php:731
+#: include/views/js/configuration.discovery.edit.js.php:182
+msgid "SSH"
+msgstr ""
+
+#: include/items.inc.php:94
+msgid "SSH agent"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
+#: include/views/monitoring.discovery.php:28
+msgid "STATUS OF DISCOVERY"
+msgstr ""
+
+#: tr_status.php:235
+msgid "STATUS OF TRIGGERS"
+msgstr ""
+
+#: httpmon.php:82
+msgid "STATUS OF WEB MONITORING"
+msgstr ""
+
+#: report1.php:32
+msgid "STATUS OF ZABBIX"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:107
+msgid "Safari"
+msgstr ""
+
+#: include/func.inc.php:219
+msgid "Sat"
+msgstr ""
+
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
+msgid "Saturday"
+msgstr ""
+
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
+#: include/views/administration.general.image.edit.php:55
+#: include/views/administration.general.macros.edit.php:33
+#: include/views/administration.general.other.edit.php:46
+#: include/views/administration.general.regularexpressions.edit.php:92
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
+#: include/views/configuration.application.edit.php:52
+#: include/views/configuration.application.edit.php:62
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
+#: include/views/configuration.hostgroups.edit.php:73
+#: include/views/configuration.hostgroups.edit.php:84
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.maintenance.edit.php:138
+#: include/views/configuration.maintenance.edit.php:193
+#: include/views/configuration.maintenance.edit.php:199
+#: include/views/configuration.screen.constructor.edit.php:746
+#: include/views/configuration.screen.edit.php:52
+#: include/views/configuration.services.edit.php:293
+#: include/views/configuration.slideconf.edit.php:108
+#: include/views/configuration.slideconf.edit.php:114
+#: include/views/configuration.sysmap.constructor.php:62
+#: include/views/configuration.sysmap.edit.php:195
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
+msgid "Save"
+msgstr ""
+
+#: acknow.php:229
+msgid "Save and return"
+msgstr ""
+
+#: include/reports.inc.php:66 include/reports.inc.php:390
+msgid "Scale"
+msgstr ""
+
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
+msgid "Scenario"
+msgstr ""
+
+#: httpconf.php:197
+msgid "Scenario added"
+msgstr ""
+
+#: httpconf.php:192
+msgid "Scenario updated"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:46
+msgid "Scenarios"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:101
+msgid "Schedule"
+msgstr ""
+
+#: queue.php:227
+msgid "Scheduled check"
+msgstr ""
+
+#: include/audit.inc.php:41 include/screens.inc.php:36
+#: include/views/configuration.screen.edit.php:47
+#: include/views/configuration.screen.list.php:53
+#: include/views/configuration.slideconf.edit.php:50
+msgid "Screen"
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:603
+#, c-format
+msgid "Screen \"%1$s\" added."
+msgstr ""
+
+#: include/classes/api/services/CTemplateScreen.php:699
+msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
+msgstr ""
+
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
+#, c-format
+msgid "Screen \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
+#, c-format
+msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:793
+#, c-format
+msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:842
+#, c-format
+msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:779
+#, c-format
+msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:829
+#, c-format
+msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:449
+#, c-format
+msgid "Screen \"%1$s\" skipped - user rule."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:600
+#, c-format
+msgid "Screen \"%1$s\" updated."
+msgstr ""
+
+#: screenconf.php:167
+msgid "Screen added"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:736
+msgid "Screen cell configuration"
+msgstr ""
+
+#: screenconf.php:239
+msgid "Screen deleted"
+msgstr ""
+
+#: screenedit.php:328 screenedit.php:368
+msgid "Screen should contain at least one row and column."
+msgstr ""
+
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
+msgid "Screen updated"
+msgstr ""
+
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
+#: include/views/configuration.screen.list.php:38
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
+#: include/views/monitoring.screen.php:27
+#: include/views/monitoring.screen.php:77
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
+#: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
+#: templates.php:514 templates.php:576
+msgid "Screens"
+msgstr ""
+
+#: include/audit.inc.php:48 include/media.inc.php:25
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
+msgid "Script"
+msgstr ""
+
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
+#, c-format
+msgid "Script \"%1$s\" already exists."
+msgstr ""
+
+#: scripts.php:121
+msgid "Script added"
+msgstr ""
+
+#: scripts.php:158 scripts.php:179
+msgid "Script deleted"
+msgstr ""
+
+#: include/classes/api/services/CScript.php:596
+#, c-format
+msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:64
+#: include/views/administration.mediatypes.list.php:56
+msgid "Script name"
+msgstr ""
+
+#: include/classes/api/services/CScript.php:583
+#, c-format
+msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
+msgstr ""
+
+#: include/classes/debug/CProfiler.php:126
+msgid "Script profiler"
+msgstr ""
+
+#: scripts.php:114
+msgid "Script updated"
+msgstr ""
+
+#: include/classes/api/services/CScript.php:446
+#, c-format
+msgid "Script with scriptid \"%1$s\" does not exist."
+msgstr ""
+
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
+msgid "Scripts"
+msgstr ""
+
+#: include/views/general.search.php:29 search.php:26
+msgid "Search"
+msgstr ""
+
+#: authentication.php:47
+#: include/views/administration.authentication.edit.php:79
+msgid "Search attribute"
+msgstr ""
+
+#: search.php:70
+msgid "Search pattern is empty"
+msgstr ""
+
+#: adm.gui.php:42 include/views/administration.general.gui.edit.php:37
+msgid "Search/Filter elements limit"
+msgstr ""
+
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
+msgid "Second"
+msgstr ""
+
+#: include/hosts.inc.php:440
+msgid "Secondary POC cell"
+msgstr ""
+
+#: include/hosts.inc.php:425
+msgid "Secondary POC email"
+msgstr ""
+
+#: include/hosts.inc.php:420
+msgid "Secondary POC name"
+msgstr ""
+
+#: include/hosts.inc.php:450
+msgid "Secondary POC notes"
+msgstr ""
+
+#: include/hosts.inc.php:430
+msgid "Secondary POC phone A"
+msgstr ""
+
+#: include/hosts.inc.php:435
+msgid "Secondary POC phone B"
+msgstr ""
+
+#: include/hosts.inc.php:445
+msgid "Secondary POC screen name"
+msgstr ""
+
+#: include/views/administration.users.edit.php:237
+msgid "Seconds"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:125
+#: include/views/configuration.item.edit.php:131
+#: include/views/configuration.item.massupdate.php:129
+#: include/views/js/configuration.discovery.edit.js.php:61
+msgid "Security level"
+msgstr ""
+
+#: include/forms.inc.php:456
+#: include/views/configuration.host.discovery.edit.php:115
+#: include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.massupdate.php:115
+#: include/views/js/configuration.discovery.edit.js.php:56
+msgid "Security name"
+msgstr ""
+
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
+#: include/views/administration.auditacts.list.php:44
+#: include/views/administration.auditlogs.list.php:59
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
+#: include/views/configuration.item.edit.php:71
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
+#: include/views/configuration.services.child.list.php:63
+#: include/views/configuration.services.edit.php:71
+#: include/views/configuration.triggers.expression.php:43
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
+msgid "Select"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
+#: include/views/configuration.triggers.expression.php:50
+msgid "Select prototype"
+msgstr ""
+
+#: include/views/monitoring.history.php:110
+msgid "Select rows with value like"
+msgstr ""
+
+#: include/views/administration.script.edit.php:82
+#: include/views/monitoring.dashconf.php:49
+#: include/views/monitoring.history.php:131
+msgid "Selected"
+msgstr ""
+
+#: actionconf.php:356
+msgid "Selected actions deleted"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:223
+msgid "Selected elements"
+msgstr ""
+
+#: include/reports.inc.php:325
+msgid "Selected groups"
+msgstr ""
+
+#: include/reports.inc.php:368
+msgid "Selected hosts"
+msgstr ""
+
+#: include/actions.inc.php:606
+msgid "Send message"
+msgstr ""
+
+#: include/actions.inc.php:332
+msgid "Send message to user groups"
+msgstr ""
+
+#: include/actions.inc.php:320
+msgid "Send message to users"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:614
+msgid "Send only to"
+msgstr ""
+
+#: popup_media.php:118
+msgid "Send to"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:600
+msgid "Send to User groups"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:601
+msgid "Send to Users"
+msgstr ""
+
+#: include/actions.inc.php:988 include/classes/screens/CScreenActions.php:145
+#: include/views/administration.auditacts.list.php:83
+msgid "Sent"
+msgstr ""
+
+#: include/func.inc.php:245
+msgid "Sep"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:122
+#: include/views/monitoring.dashconf.php:105
+msgid "Separated"
+msgstr ""
+
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
+msgid "September"
+msgstr ""
+
+#: include/hosts.inc.php:140 include/views/inventory.host.list.php:79
+msgid "Serial number A"
+msgstr ""
+
+#: include/hosts.inc.php:145
+msgid "Serial number B"
+msgstr ""
+
+#: include/views/administration.script.list.php:66 popup.php:1759
+#: queue.php:146
+msgid "Server"
+msgstr ""
+
+#: include/screens.inc.php:37
+msgid "Server info"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:604
+msgid "Server time"
+msgstr ""
+
+#: events.php:590 include/actions.inc.php:103
+#: include/views/configuration.services.child.list.php:38
+#: include/views/configuration.services.edit.php:280
+#: include/views/configuration.services.parent.list.php:36 services.php:467
+#: srv_status.php:139
+msgid "Service"
+msgstr ""
+
+#: jsLoader.php:216
+#, c-format
+msgid "Service \"%1$s\""
+msgstr ""
+
+#: include/classes/api/services/CService.php:1097
+#, c-format
+msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
+msgstr ""
+
+#: include/classes/api/services/CService.php:1118
+#, c-format
+msgid "Service \"%1$s\" cannot be dependent on itself."
+msgstr ""
+
+#: include/classes/api/services/CService.php:1197
+#, c-format
+msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
+msgstr ""
+
+#: include/classes/api/services/CService.php:1172
+#, c-format
+msgid "Service \"%1$s\" is already hardlinked to a different service."
+msgstr ""
+
+#: include/classes/api/services/CService.php:1015
+msgid "Service cannot be parent and child at the same time."
+msgstr ""
+
+#: services.php:161
+msgid "Service created"
+msgstr ""
+
+#: services.php:117
+msgid "Service deleted"
+msgstr ""
+
+#: include/actions.inc.php:78
+msgid "Service port"
+msgstr ""
+
+#: include/services.inc.php:499
+msgid "Service start time must be less than end time."
+msgstr ""
+
+#: include/views/configuration.services.edit.php:169
+msgid "Service times"
+msgstr ""
+
+#: include/actions.inc.php:76
+msgid "Service type"
+msgstr ""
+
+#: services.php:154
+msgid "Service updated"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:92
+msgid "Services"
+msgstr ""
+
+#: include/classes/api/services/CService.php:1248
+msgid "Services form a circular dependency."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:1119
+msgid "Session terminated, re-login, please."
+msgstr ""
+
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
+#: include/classes/screens/CScreenHistory.php:167
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
+msgid "Severity"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:436
+msgid "Severity (descending)"
+msgstr ""
+
+#: include/profiles.inc.php:117
+msgid "Severity name cannot be empty."
+msgstr ""
+
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
+#: include/views/configuration.application.list.php:62
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
+msgid "Show"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
+
+#: include/views/common.filter.trigger.php:143 latest.php:314
+msgid "Show details"
+msgstr ""
+
+#: include/views/configuration.httpconf.list.php:49
+msgid "Show disabled scenarios"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:63
+msgid "Show disabled trigger prototypes"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:81
+msgid "Show disabled triggers"
+msgstr ""
+
+#: adm.gui.php:76
+#, c-format
+msgid "Show events max \"%1$s\"."
+msgstr ""
+
+#: adm.gui.php:37 include/views/administration.general.gui.edit.php:43
+msgid "Show events not older than (in days)"
+msgstr ""
+
+#: adm.gui.php:75
+#, c-format
+msgid "Show events not older than (in days) \"%1$s\"."
+msgstr ""
+
+#: include/classes/html/widget/CWidget.php:129
+msgid "Show filter"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
+msgid "Show hosts in maintenance"
+msgstr ""
+
+#: latest.php:312
+msgid "Show items with name like"
+msgstr ""
+
+#: latest.php:313
+msgid "Show items without data"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:63
+msgid "Show legend"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
+msgid "Show lines"
+msgstr ""
+
+#: include/views/monitoring.history.php:115
+msgid "Show selected"
+msgstr ""
+
+#: include/views/monitoring.dashconf.php:56
+msgid "Show selected groups"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:365
+msgid "Show text as HTML"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:68
+msgid "Show triggers"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
+
+#: include/views/configuration.item.edit.php:386
+#: include/views/configuration.item.massupdate.php:447
+msgid "Show value"
+msgstr ""
+
+#: include/views/administration.general.gui.edit.php:47
+msgid "Show warning if Zabbix server is down"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:67
+msgid "Show working time"
+msgstr ""
+
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
+msgid "Shown"
+msgstr ""
+
+#: include/views/general.login.php:77 index.php:55 index.php:64
+msgid "Sign in"
+msgstr ""
+
+#: include/views/js/configuration.graph.edit.js.php:30
+msgid "Simple"
+msgstr ""
+
+#: include/items.inc.php:83
+msgid "Simple check"
+msgstr ""
+
+#: include/screens.inc.php:38
+msgid "Simple graph"
+msgstr ""
+
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
+#: include/hosts.inc.php:370
+msgid "Site ZIP / postal"
+msgstr ""
+
+#: include/hosts.inc.php:340
+msgid "Site address A"
+msgstr ""
+
+#: include/hosts.inc.php:345
+msgid "Site address B"
+msgstr ""
+
+#: include/hosts.inc.php:350
+msgid "Site address C"
+msgstr ""
+
+#: include/hosts.inc.php:355
+msgid "Site city"
+msgstr ""
+
+#: include/hosts.inc.php:365
+msgid "Site country"
+msgstr ""
+
+#: include/hosts.inc.php:380
+msgid "Site notes"
+msgstr ""
+
+#: include/hosts.inc.php:375
+msgid "Site rack location"
+msgstr ""
+
+#: include/hosts.inc.php:360
+msgid "Site state / province"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:277
+#: include/classes/items/CHelpItems.php:539
+msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:212
+#, c-format
+msgid "Size of the response received from Zabbix server \"%1$s\" exceeds the allowed size of %2$s bytes. This value can be increased in the ZBX_SOCKET_BYTES_LIMIT constant in include/defines.inc.php."
+msgstr ""
+
+#: include/graphs.inc.php:360
+#, c-format
+msgid "Skipped copying of graph \"%1$s\" to host \"%2$s\"."
+msgstr ""
+
+#: include/views/configuration.slideconf.edit.php:102
+msgid "Slide"
+msgstr ""
+
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
+msgid "Slide show"
+msgstr ""
+
+#: include/screens.inc.php:245
+#, c-format
+msgid "Slide show \"%1$s\" already exists."
+msgstr ""
+
+#: include/screens.inc.php:183
+#, c-format
+msgid "Slide show \"%s\" already exists."
+msgstr ""
+
+#: slideconf.php:106
+msgid "Slide show added"
+msgstr ""
+
+#: slideconf.php:138 slideconf.php:159
+msgid "Slide show deleted"
+msgstr ""
+
+#: include/screens.inc.php:159 include/screens.inc.php:219
+msgid "Slide show must contain slides."
+msgstr ""
+
+#: slideconf.php:99
+msgid "Slide show updated"
+msgstr ""
+
+#: dashboard.php:351 include/menu.inc.php:194
+#: include/views/configuration.slideconf.list.php:29
+#: include/views/monitoring.screen.php:28
+#: include/views/monitoring.slides.php:30 popup.php:83
+msgid "Slide shows"
+msgstr ""
+
+#: include/views/configuration.slideconf.edit.php:98
+msgid "Slides"
+msgstr ""
+
+#: include/locales.inc.php:78
+msgid "Slovak (sk_SK)"
+msgstr ""
+
+#: jsLoader.php:164
+msgid "Snooze"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:92
+msgid "Soft"
+msgstr ""
+
+#: include/hosts.inc.php:180
+msgid "Software"
+msgstr ""
+
+#: include/hosts.inc.php:185
+msgid "Software (Full details)"
+msgstr ""
+
+#: include/hosts.inc.php:190
+msgid "Software application A"
+msgstr ""
+
+#: include/hosts.inc.php:195
+msgid "Software application B"
+msgstr ""
+
+#: include/hosts.inc.php:200
+msgid "Software application C"
+msgstr ""
+
+#: include/hosts.inc.php:205
+msgid "Software application D"
+msgstr ""
+
+#: include/hosts.inc.php:210
+msgid "Software application E"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:209
+#: include/classes/items/CHelpItems.php:471
+msgid "Software architecture"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:217
+#: include/classes/items/CHelpItems.php:479
+msgid "Software package list - lists all packages for all supported package managers by default"
+msgstr ""
+
+#: include/reports.inc.php:172
+msgid "Sort by"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:448
+msgid "Sort entries by"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:84 services.php:45
+msgid "Sort order (0->999)"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:433
+msgid "Sort triggers by"
+msgstr ""
+
+#: include/classes/api/CApiService.php:533
+#, c-format
+msgid "Sorting by field \"%1$s\" not allowed."
+msgstr ""
+
+#: events.php:339 include/classes/screens/CScreenHistory.php:166
+msgid "Source"
+msgstr ""
+
+#: include/locales.inc.php:79
+msgid "Spanish (es_ES)"
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1364
+msgid "Specified script does not exist or you do not have rights on it for action operation command."
+msgstr ""
+
+#: httpdetails.php:131 httpdetails.php:296
+msgid "Speed"
+msgstr ""
+
+#: include/graphs.inc.php:25 popup.php:1373
+msgid "Stacked"
+msgstr ""
+
+#: popup.php:75
+msgid "Standard items"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:370
+msgid "Start in"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:803
+msgid "Startup time of Zabbix server, Unix timestamp."
+msgstr ""
+
+#: include/forms.inc.php:516 include/forms.inc.php:909
+#: include/views/configuration.maintenance.list.php:48
+msgid "State"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:149
+#: include/classes/items/CHelpItems.php:411
+msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
+msgstr ""
+
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
+#: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
+#: include/classes/screens/CScreenActions.php:68
+#: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
+#: include/events.inc.php:272 include/events.inc.php:275
+#: include/forms.inc.php:561 include/forms.inc.php:904
+#: include/views/administration.auditacts.list.php:74
+#: include/views/administration.mediatypes.list.php:41
+#: include/views/administration.usergroups.list.php:50
+#: include/views/administration.users.list.php:63
+#: include/views/configuration.action.list.php:54
+#: include/views/configuration.discovery.list.php:44
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
+#: include/views/configuration.item.list.php:71
+#: include/views/configuration.item.list.php:149
+#: include/views/configuration.item.massupdate.php:405
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
+msgid "Status"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:455
+msgid "Status (ascending)"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:454
+msgid "Status (descending)"
+msgstr ""
+
+#: include/views/configuration.services.child.list.php:39
+#: include/views/configuration.services.parent.list.php:36 services.php:468
+msgid "Status calculation"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:58
+msgid "Status calculation algorithm"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:202
+msgid "Status codes"
+msgstr ""
+
+#: httpmon.php:24
+msgid "Status of Web monitoring"
+msgstr ""
+
+#: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
+#: include/menu.inc.php:120 report1.php:25
+msgid "Status of Zabbix"
+msgstr ""
+
+#: discovery.php:25
+msgid "Status of discovery"
+msgstr ""
+
+#: tr_status.php:25
+msgid "Status of triggers"
+msgstr ""
+
+#: include/maps.inc.php:48
+msgid "Status only"
+msgstr ""
+
+#: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
+#: include/views/configuration.action.edit.php:501
+msgid "Step"
+msgstr ""
+
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
+#, c-format
+msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:491
+msgid "Step duration"
+msgstr ""
+
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
+msgid "Step of scenario"
+msgstr ""
+
+#: include/views/configuration.httpconf.popup.php:33
+#, c-format
+msgid "Step with name \"%1$s\" already exists."
+msgstr ""
+
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
+msgid "Steps"
+msgstr ""
+
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
+msgid "Stop"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.massupdate.php:429
+msgid "Store value"
+msgstr ""
+
+#: include/hosts.inc.php:41
+msgid "Straight"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:645
+msgid "Style"
+msgstr ""
+
+#: include/forms.inc.php:937
+msgid "Subfilter [affects only filtered data!]"
+msgstr ""
+
+#: include/actions.inc.php:446 include/actions.inc.php:455
+#: include/actions.inc.php:461 include/actions.inc.php:866
+#: include/classes/screens/CScreenActions.php:163
+#: include/views/administration.auditacts.list.php:99
+#: include/views/configuration.action.edit.php:625
+msgid "Subject"
+msgstr ""
+
+#: jsLoader.php:217
+msgid "Submap"
+msgstr ""
+
+#: include/items.inc.php:39
+msgid "Success Audit"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:109
+#: include/classes/items/CHelpItems.php:371
+msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
+msgstr ""
+
+#: popup_trexpr.php:335
+msgid "Sum of values of a period T is < N"
+msgstr ""
+
+#: popup_trexpr.php:345
+msgid "Sum of values of a period T is = N"
+msgstr ""
+
+#: popup_trexpr.php:340
+msgid "Sum of values of a period T is > N"
+msgstr ""
+
+#: popup_trexpr.php:350
+msgid "Sum of values of a period T is NOT N"
+msgstr ""
+
+#: include/func.inc.php:213
+msgid "Sun"
+msgstr ""
+
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
+msgid "Sunday"
+msgstr ""
+
+#: include/views/general.login.php:40
+msgid "Support"
+msgstr ""
+
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
+msgid "Surname"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:221
+#: include/classes/items/CHelpItems.php:483
+msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:225
+#: include/classes/items/CHelpItems.php:487
+msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:229
+#: include/classes/items/CHelpItems.php:491
+msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
+msgstr ""
+
+#: include/locales.inc.php:80
+msgid "Swedish (sv_SE)"
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:126
+msgid "Switching authentication method will reset all except this session! Continue?"
+msgstr ""
+
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
+msgid "System default"
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:199
+msgid "System error."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:197
+#: include/classes/items/CHelpItems.php:459
+msgid "System local time. Time in seconds."
+msgstr ""
+
+#: dashboard.php:393 include/screens.inc.php:41
+msgid "System status"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:237
+#: include/classes/items/CHelpItems.php:499
+msgid "System uptime in seconds."
+msgstr ""
+
+#: include/func.inc.php:667
+msgctxt "Tera short"
+msgid "T"
+msgstr ""
+
+#: jsLoader.php:127
+msgctxt "Thursday short"
+msgid "T"
+msgstr ""
+
+#: jsLoader.php:125
+msgctxt "Tuesday short"
+msgid "T"
+msgstr ""
+
+#: include/discovery.inc.php:64
+#: include/views/js/configuration.discovery.edit.js.php:174
+msgid "TCP"
+msgstr ""
+
+#: include/items.inc.php:95
+msgid "TELNET agent"
+msgstr ""
+
+#: httpdetails.php:243
+msgid "TOTAL"
+msgstr ""
+
+#: include/views/monitoring.triggerComment.php:25
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
+
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
+msgid "TRUE"
+msgstr ""
+
+#: include/classes/db/DB.php:216
+#, c-format
+msgid "Table \"%1$s\" does not exist."
+msgstr ""
+
+#: include/classes/db/DB.php:389
+#, c-format
+msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
+msgstr ""
+
+#: include/hosts.inc.php:150 include/views/inventory.host.list.php:80
+msgid "Tag"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.copy.elements.php:105
+#: include/views/configuration.triggers.edit.php:152
+#: include/views/js/configuration.action.edit.js.php:84
+msgid "Target"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:725
+msgid "Target list"
+msgstr ""
+
+#: include/views/configuration.copy.elements.php:49
+msgid "Target type"
+msgstr ""
+
+#: include/discovery.inc.php:70
+#: include/views/configuration.action.edit.php:732
+#: include/views/js/configuration.discovery.edit.js.php:183
+msgid "Telnet"
+msgstr ""
+
+#: include/actions.inc.php:62 include/audit.inc.php:50
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
+#: search.php:393
+msgid "Template"
+msgstr ""
+
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
+#, c-format
+msgid "Template \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/import/importers/CHostImporter.php:46
+#, c-format
+msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
+msgstr ""
+
+#: include/classes/api/services/CHostBase.php:94
+#, c-format
+msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
+msgstr ""
+
+#: templates.php:244
+msgid "Template added"
+msgstr ""
+
+#: include/classes/api/services/CHostBase.php:294
+msgid "Template cannot be linked to another template more than once even through other templates."
+msgstr ""
+
+#: templates.php:375 templates.php:389 templates.php:414
+msgid "Template deleted"
+msgstr ""
+
+#: report2.php:249
+msgid "Template group"
+msgstr ""
+
+#: include/views/conf.import.php:31
+msgid "Template linkage"
+msgstr ""
+
+#: include/html.inc.php:296
+msgid "Template list"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:96 templates.php:55
+msgid "Template name"
+msgstr ""
+
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
+#, c-format
+msgid "Template screen \"%1$s\" already exists."
+msgstr ""
+
+#: include/views/conf.import.php:30
+msgid "Template screens"
+msgstr ""
+
+#: report2.php:301
+msgid "Template trigger"
+msgstr ""
+
+#: templates.php:234
+msgid "Template updated"
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:1030
+#, c-format
+msgid "Template with the same name \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:690
+#, c-format
+msgid "Template with the same name \"%s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
+#, c-format
+msgid "Template with the same visible name \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:696
+#, c-format
+msgid "Template with the same visible name \"%s\" already exists."
+msgstr ""
+
+#: include/forms.inc.php:600 include/forms.inc.php:785
+msgid "Templated items"
+msgstr ""
+
+#: hosts.php:869 include/menu.inc.php:158
+#: include/views/configuration.copy.elements.php:47
+#: include/views/configuration.host.edit.php:747
+#: include/views/configuration.hostgroups.list.php:144
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
+msgid "Templates"
+msgstr ""
+
+#: include/classes/api/services/CHostBase.php:272
+#, c-format
+msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
+msgstr ""
+
+#: include/func.inc.php:667
+msgid "Tera"
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:136
+#: include/views/administration.general.regularexpressions.edit.php:81
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
+msgid "Test"
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:110
+msgid "Test authentication"
+msgstr ""
+
+#: include/views/administration.script.edit.php:108
+msgid "Test confirmation"
+msgstr ""
+
+#: tr_testexpr.php:132
+msgid "Test data"
+msgstr ""
+
+#: include/views/administration.general.regularexpressions.edit.php:69
+msgid "Test expressions"
+msgstr ""
+
+#: adm.regexps.php:38
+#: include/views/administration.general.regularexpressions.edit.php:66
+msgid "Test string"
+msgstr ""
+
+#: include/forms.inc.php:405 include/items.inc.php:129
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
+#: include/views/configuration.item.massupdate.php:212
+msgid "Text"
+msgstr ""
+
+#: include/classes/api/clients/CLocalApiClient.php:79
+#, c-format
+msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:941
+#, c-format
+msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:953
+#, c-format
+msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
+msgstr ""
+
+#: include/classes/db/Db2DbBackend.php:41
+#: include/classes/db/MysqlDbBackend.php:35
+#: include/classes/db/OracleDbBackend.php:36
+#: include/classes/db/PostgresqlDbBackend.php:44
+#: include/classes/db/SqliteDbBackend.php:34
+msgid "The frontend does not match Zabbix database."
+msgstr ""
+
+#: include/classes/db/DbBackend.php:48
+#, c-format
+msgid "The frontend does not match Zabbix database. Current database version (mandatory/optional): %d/%d. Required mandatory version: %d. Contact your system administrator."
+msgstr ""
+
+#: include/views/configuration.hostgroups.list.php:130
+#, c-format
+msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
+msgstr ""
+
+#: include/html.inc.php:556
+#, c-format
+msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
+msgstr ""
+
+#: include/classes/api/services/CImage.php:429
+#, c-format
+msgid "The image is used in icon map %1$s."
+msgid_plural "The image is used in icon maps %1$s."
+msgstr[0] ""
+
+#: include/classes/api/services/CImage.php:455
+#, c-format
+msgid "The image is used in map %1$s."
+msgid_plural "The image is used in maps %1$s."
+msgstr[0] ""
+
+#: include/views/configuration.item.list.php:126
+#, c-format
+msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
+msgstr ""
+
+#: queue.php:78
+msgid "The queue is empty."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:175
+msgid "The received JSON is not a valid JSON-RPC Request."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:180
+msgid "The requested remote-procedure does not exist / is not available"
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:625
+msgid "The web scenario application belongs to a different host than the web scenario host."
+msgstr ""
+
+#: include/views/administration.users.edit.php:151
+msgid "Theme"
+msgstr ""
+
+#: authentication.php:175
+#, c-format
+msgid "There is \"%1$d\" group with Internal GUI access."
+msgid_plural "There are \"%1$d\" groups with Internal GUI access."
+msgstr[0] ""
+
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
+msgid "Third"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:851
+#, c-format
+msgid "This field is automatically populated by item \"%s\"."
+msgstr ""
+
+#: srv_status.php:37
+msgid "This month"
+msgstr ""
+
+#: include/classes/screens/CScreenBuilder.php:524
+msgid "This screen-column is not empty. Delete it?"
+msgstr ""
+
+#: include/classes/screens/CScreenBuilder.php:504
+msgid "This screen-row is not empty. Delete it?"
+msgstr ""
+
+#: srv_status.php:36
+msgid "This week"
+msgstr ""
+
+#: srv_status.php:38
+msgid "This year"
+msgstr ""
+
+#: include/func.inc.php:217
+msgid "Thu"
+msgstr ""
+
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
+msgid "Thursday"
+msgstr ""
+
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
+#: services.php:207
+msgid "Till"
+msgstr ""
+
+#: events.php:459 events.php:475 include/acknow.inc.php:49
+#: include/actions.inc.php:819 include/actions.inc.php:842
+#: include/actions.inc.php:915 include/actions.inc.php:933
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
+#: include/classes/screens/CScreenActions.php:38
+#: include/classes/screens/CScreenActions.php:44
+#: include/classes/screens/CScreenActions.php:128
+#: include/classes/screens/CScreenEvents.php:39 include/events.inc.php:176
+#: include/events.inc.php:193 include/events.inc.php:272
+#: include/events.inc.php:275
+#: include/views/administration.auditacts.list.php:69
+#: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
+#: include/views/configuration.services.edit.php:255
+#: include/views/configuration.services.edit.php:282
+#: include/views/configuration.triggers.expression.php:86
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
+msgid "Time"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:451
+msgid "Time (ascending)"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:450
+msgid "Time (descending)"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:851
+msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:855
+msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
+msgstr ""
+
+#: include/actions.inc.php:66
+msgid "Time period"
+msgstr ""
+
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
+msgid "Time shift"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:606
+msgid "Time type"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:205
+msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
+msgid "Timeout"
+msgstr ""
+
+#: include/classes/screens/CScreenHistory.php:163
+#: include/classes/screens/CScreenHistory.php:271
+#: include/classes/screens/CScreenPlainText.php:42
+#: include/classes/screens/CScreenPlainText.php:64
+msgid "Timestamp"
+msgstr ""
+
+#: popup_trexpr.php:403
+msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
+msgstr ""
+
+#: popup_trexpr.php:408
+msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:153
+#: include/classes/items/CHelpItems.php:415
+msgid "Timestamp of system boot."
+msgstr ""
+
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
+msgid "Title"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
+msgid "To"
+msgstr ""
+
+#: jsLoader.php:230
+msgid "To set a host interface select a single item type for all items"
+msgstr ""
+
+#: srv_status.php:35
+msgid "Today"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
+#: include/views/configuration.sysmap.edit.php:115
+#: include/views/js/configuration.sysmaps.js.php:86
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
+msgid "Top"
+msgstr ""
+
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
+msgid "Total"
+msgstr ""
+
+#: include/classes/debug/CProfiler.php:135
+#, c-format
+msgid "Total SQL time: %s"
+msgstr ""
+
+#: include/classes/debug/CProfiler.php:129
+#, c-format
+msgid "Total time: %s"
+msgstr ""
+
+#: include/page_footer.php:61
+msgid "Transaction has not been closed. Aborting..."
+msgstr ""
+
+#: include/classes/core/CJsonRpc.php:204
+msgid "Transport error."
+msgstr ""
+
+#: adm.housekeeper.php:64
+msgid "Trend data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:113
+#, c-format
+msgid "Trend data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: disc_prototypes.php:119 items.php:62
+msgid "Trend storage period"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:346
+#: include/views/configuration.item.massupdate.php:391
+msgid "Trend storage period (in days)"
+msgstr ""
+
+#: include/forms.inc.php:595 include/forms.inc.php:929
+#: include/views/administration.general.housekeeper.edit.php:161
+#: include/views/configuration.item.list.php:68
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
+msgid "Trends"
+msgstr ""
+
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
+#: include/views/configuration.services.child.list.php:40
+#: include/views/configuration.services.edit.php:69
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.parent.list.php:36
+#: include/views/configuration.triggers.edit.php:271
+#: include/views/js/configuration.sysmaps.js.php:19
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
+msgid "Trigger"
+msgstr ""
+
+#: include/classes/api/services/CTriggerGeneral.php:283
+#, c-format
+msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
+#, c-format
+msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
+#, c-format
+msgid "Trigger \"%1$s\" skipped - user rule."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1591
+#, c-format
+msgid "Trigger \"%s\" belongs to templates with different linkages."
+msgstr ""
+
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
+msgid "Trigger added"
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1495
+msgid "Trigger cannot be dependent on a trigger that is inherited from it."
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:45
+msgid "Trigger data storage period (in days)"
+msgstr ""
+
+#: triggers.php:208
+msgid "Trigger deleted"
+msgstr ""
+
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
+msgid "Trigger disabled"
+msgid_plural "Triggers disabled"
+msgstr[0] ""
+
+#: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
+#: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
+#: adm.valuemapping.php:135 adm.workingtime.php:71
+#: include/views/administration.general.triggerDisplayOptions.edit.php:114
+msgid "Trigger displaying options"
+msgstr ""
+
+#: triggers.php:277
+msgid "Trigger enabled"
+msgid_plural "Triggers enabled"
+msgstr[0] ""
+
+#: adm.housekeeper.php:34
+msgid "Trigger event and alert data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:105
+#, c-format
+msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: include/views/configuration.triggers.expression.php:119
+msgid "Trigger expression condition"
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
+msgid "Trigger expression must contain at least one host:key reference."
+msgstr ""
+
+#: tr_logform.php:27
+msgid "Trigger form"
+msgstr ""
+
+#: include/classes/api/services/CHostBase.php:187
+#, c-format
+msgid "Trigger has items from template \"%1$s\" that is not linked to host."
+msgstr ""
+
+#: include/actions.inc.php:1161
+msgid "Trigger in \"normal\" state"
+msgstr ""
+
+#: include/actions.inc.php:1160
+msgid "Trigger in \"unknown\" state"
+msgstr ""
+
+#: include/classes/api/services/CHostBase.php:143
+#, c-format
+msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:449
+msgid "Trigger just added. No status update so far."
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:91
+msgid "Trigger label type"
+msgstr ""
+
+#: include/actions.inc.php:52
+msgid "Trigger name"
+msgstr ""
+
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
+msgid "Trigger prototype"
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:872
+#, c-format
+msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:878
+#, c-format
+msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
+msgstr ""
+
+#: trigger_prototypes.php:175
+msgid "Trigger prototype added"
+msgstr ""
+
+#: trigger_prototypes.php:192
+msgid "Trigger prototype deleted"
+msgstr ""
+
+#: trigger_prototypes.php:255
+msgid "Trigger prototype disabled"
+msgid_plural "Trigger prototypes disabled"
+msgstr[0] ""
+
+#: trigger_prototypes.php:254
+msgid "Trigger prototype enabled"
+msgid_plural "Trigger prototypes enabled"
+msgstr[0] ""
+
+#: trigger_prototypes.php:170
+msgid "Trigger prototype updated"
+msgstr ""
+
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
+msgid "Trigger prototypes"
+msgstr ""
+
+#: trigger_prototypes.php:268
+msgid "Trigger prototypes deleted"
+msgstr ""
+
+#: include/views/configuration.triggers.list.php:59
+msgid "Trigger prototypes of"
+msgstr ""
+
+#: trigger_prototypes.php:219
+msgid "Trigger prototypes updated"
+msgstr ""
+
+#: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
+#: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
+#: adm.valuemapping.php:134 adm.workingtime.php:70
+#: include/views/administration.general.triggerSeverity.edit.php:70
+msgid "Trigger severities"
+msgstr ""
+
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
+msgid "Trigger severity"
+msgstr ""
+
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
+msgid "Trigger updated"
+msgstr ""
+
+#: include/actions.inc.php:48
+msgid "Trigger value"
+msgstr ""
+
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
+#: include/views/configuration.action.list.php:33
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
+#: include/views/configuration.item.list.php:64
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
+#: include/views/configuration.triggers.list.php:77
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
+msgid "Triggers"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:63
+msgid "Triggers (e/d)[p/o]"
+msgstr ""
+
+#: triggers.php:332
+msgid "Triggers deleted"
+msgstr ""
+
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
+msgid "Triggers info"
+msgstr ""
+
+#: include/views/configuration.triggers.massupdate.php:159
+msgid "Triggers massupdate"
+msgstr ""
+
+#: include/screens.inc.php:43
+msgid "Triggers overview"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:37
+msgid "Triggers status"
+msgstr ""
+
+#: include/menu.inc.php:129
+msgid "Triggers top 100"
+msgstr ""
+
+#: include/views/monitoring.dashconf.php:99
+msgid "Triggers with severity"
+msgstr ""
+
+#: queue.php:269
+msgid "Truncated"
+msgstr ""
+
+#: include/classes/pagefilter/CPageFilter.php:188
+#, c-format
+msgid "Try to read inaccessible property \"%s\"."
+msgstr ""
+
+#: include/func.inc.php:215
+msgid "Tue"
+msgstr ""
+
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
+msgid "Tuesday"
+msgstr ""
+
+#: include/locales.inc.php:81
+msgid "Turkish (tr_TR)"
+msgstr ""
+
+#: jsLoader.php:149
+msgid "Two elements should be selected"
+msgstr ""
+
+#: include/classes/api/services/CItem.php:961
+#, 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 ""
+
+#: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
+#: include/classes/screens/CScreenActions.php:56
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
+#: include/hosts.inc.php:105
+#: include/views/administration.auditacts.list.php:71
+#: include/views/administration.general.image.list.php:27
+#: include/views/administration.mediatypes.edit.php:52
+#: include/views/administration.mediatypes.list.php:40
+#: include/views/administration.script.edit.php:47
+#: include/views/administration.script.list.php:39
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
+#: include/views/configuration.host.discovery.edit.php:57
+#: include/views/configuration.host.discovery.edit.php:64
+#: include/views/configuration.host.discovery.list.php:53
+#: include/views/configuration.item.edit.php:57
+#: include/views/configuration.item.edit.php:64
+#: include/views/configuration.item.list.php:69
+#: include/views/configuration.item.massupdate.php:45
+#: include/views/configuration.item.prototype.list.php:52
+#: include/views/configuration.maintenance.list.php:45
+#: include/views/configuration.services.edit.php:131
+#: include/views/inventory.host.list.php:77
+#: include/views/js/configuration.sysmaps.js.php:13
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
+msgid "Type"
+msgstr ""
+
+#: include/hosts.inc.php:110
+msgid "Type (Full details)"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:368
+msgid "Type (OK)"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:453
+msgid "Type (ascending)"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:452
+msgid "Type (descending)"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
+#: include/views/configuration.host.discovery.edit.php:274
+msgid "Type of calculation"
+msgstr ""
+
+#: include/forms.inc.php:514 include/forms.inc.php:899
+#: include/views/configuration.item.edit.php:205
+#: include/views/configuration.item.edit.php:216
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
+msgid "Type of information"
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:319
+msgid "Type of information must be \"Log\" for log key."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:314
+msgid "Type of information must be \"Numeric (float)\" for aggregate items."
+msgstr ""
+
+#: include/forms.inc.php:894
+msgid "Types"
+msgstr ""
+
+#: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
+msgid "UNKNOWN"
+msgstr ""
+
+#: include/triggers.inc.php:171
+msgid "UP"
+msgstr ""
+
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
+#: include/views/configuration.sysmap.edit.php:137
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
+msgid "URL"
+msgstr ""
+
+#: include/views/administration.users.edit.php:170
+msgid "URL (after login)"
+msgstr ""
+
+#: include/hosts.inc.php:275
+msgid "URL A"
+msgstr ""
+
+#: include/hosts.inc.php:280
+msgid "URL B"
+msgstr ""
+
+#: include/hosts.inc.php:285
+msgid "URL C"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr ""
+
+#: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
+msgid "URL parameter name is empty."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:180
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
+msgid "URLs"
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:88
+msgid "USA (160 characters)"
+msgstr ""
+
+#: include/views/administration.users.edit.php:27
+msgid "USER PROFILE"
+msgstr ""
+
+#: include/locales.inc.php:82
+msgid "Ukrainian (uk_UA)"
+msgstr ""
+
+#: include/profiles.inc.php:38
+msgid "Unable to select configuration."
+msgstr ""
+
+#: include/classes/helpers/CUploadFile.php:57
+msgid "Unable to upload file because \"file_uploads\" is disabled."
+msgstr ""
+
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
+msgid "Unacknowledged"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:66
+msgid "Unacknowledged OK events"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:32
+msgid "Unacknowledged PROBLEM events"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:123
+#: include/views/monitoring.dashconf.php:106
+msgid "Unacknowledged only"
+msgstr ""
+
+#: include/views/administration.users.edit.php:106
+#, c-format
+msgid "Unavailable for users with %1$s."
+msgstr ""
+
+#: include/views/administration.users.list.php:151
+msgid "Unblock selected"
+msgstr ""
+
+#: include/views/administration.users.list.php:152
+msgid "Unblock selected users?"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:229
+#: include/views/configuration.item.massupdate.php:237
+msgid "Units"
+msgstr ""
+
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
+#: include/actions.inc.php:41 include/actions.inc.php:96
+#: include/actions.inc.php:113 include/actions.inc.php:132
+#: include/actions.inc.php:151 include/actions.inc.php:160
+#: include/actions.inc.php:185 include/actions.inc.php:199
+#: include/actions.inc.php:210 include/actions.inc.php:241
+#: include/actions.inc.php:625 include/actions.inc.php:1171
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
+#: include/discovery.inc.php:131 include/discovery.inc.php:168
+#: include/events.inc.php:47 include/events.inc.php:78
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
+#: include/httptest.inc.php:39 include/httptest.inc.php:56
+#: include/items.inc.php:45 include/items.inc.php:107
+#: include/items.inc.php:131 include/items.inc.php:148
+#: include/items.inc.php:164 include/items.inc.php:191
+#: include/items.inc.php:212 include/maintenances.inc.php:39
+#: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
+#: include/users.inc.php:66 include/users.inc.php:88
+#: include/views/js/configuration.discovery.edit.js.php:192
+msgid "Unknown"
+msgstr ""
+
+#: auditlogs.php:149
+msgid "Unknown action"
+msgstr ""
+
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
+msgid "Unknown error"
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:249
+msgid "Unknown function."
+msgstr ""
+
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
+msgid "Unknown host item, no such item in selected host"
+msgstr ""
+
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
+msgid "Unknown host, no such host present in system"
+msgstr ""
+
+#: include/hosts.inc.php:480
+msgid "Unknown interface type."
+msgstr ""
+
+#: include/audit.inc.php:61
+msgid "Unknown resource"
+msgstr ""
+
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
+#, c-format
+msgid "Unknown step failed: %1$s"
+msgstr ""
+
+#: include/items.inc.php:896
+msgid "Unknown value type"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
+msgid "Unlink"
+msgstr ""
+
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
+msgid "Unlink and clear"
+msgstr ""
+
+#: include/actions.inc.php:615
+msgid "Unlink from template"
+msgstr ""
+
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
+msgid "Unlink from templates"
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:570
+#, c-format
+msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:348
+#, c-format
+msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:482
+#, c-format
+msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:465
+#, c-format
+msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:413
+#, c-format
+msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:365
+#, c-format
+msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:382
+#, c-format
+msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:288
+#, c-format
+msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:305
+#, c-format
+msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostGeneral.php:521
+#, c-format
+msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: jsLoader.php:161
+msgid "Unmute"
+msgstr ""
+
+#: include/classes/import/readers/CImportReaderFactory.php:65
+#, c-format
+msgid "Unsupported import file extension \"%1$s\"."
+msgstr ""
+
+#: include/classes/import/readers/CImportReaderFactory.php:44
+#, c-format
+msgid "Unsupported import format \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
+#, c-format
+msgid "Unsupported parameter \"%1$s\" for group prototype."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:209
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:203
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
+msgstr ""
+
+#: include/blocks.inc.php:1257
+msgctxt "discovery results in dashboard"
+msgid "Up"
+msgstr ""
+
+#: include/discovery.inc.php:153
+msgctxt "discovery status"
+msgid "Up"
+msgstr ""
+
+#: include/views/administration.auditlogs.list.php:46
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
+#: include/views/js/adm.regexprs.edit.js.php:255
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
+msgid "Update"
+msgstr ""
+
+#: include/views/conf.import.php:24
+msgid "Update existing"
+msgstr ""
+
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
+msgid "Update interval"
+msgstr ""
+
+#: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
+#: include/views/configuration.host.discovery.edit.php:192
+#: include/views/configuration.httpconf.edit.php:78
+#: include/views/configuration.item.edit.php:259
+#: include/views/configuration.item.massupdate.php:310 items.php:49
+msgid "Update interval (in sec)"
+msgstr ""
+
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
+msgid "Updated"
+msgstr ""
+
+#: include/hosts.inc.php:560
+msgid "Updated status of host"
+msgstr ""
+
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
+#: include/classes/screens/CScreenSystemStatus.php:47
+#, c-format
+msgid "Updated: %s"
+msgstr ""
+
+#: include/classes/api/managers/CApplicationManager.php:122
+#, c-format
+msgid "Updated: Application \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:762
+#, c-format
+msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:615
+#, c-format
+msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItem.php:583
+#, c-format
+msgid "Updated: Item \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemPrototype.php:421
+#, c-format
+msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTrigger.php:1241
+#, c-format
+msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:763
+#, c-format
+msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/managers/CHttpTestManager.php:264
+#, c-format
+msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
+msgstr ""
+
+#: include/views/administration.general.image.edit.php:33
+msgid "Upload"
+msgstr ""
+
+#: include/views/monitoring.maps.php:54
+msgid "Upper level maps"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
+#: include/views/monitoring.discovery.php:42
+#: include/views/monitoring.discovery.php:161
+msgid "Uptime"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:887
+msgid "Uptime of Zabbix server process in seconds."
+msgstr ""
+
+#: include/actions.inc.php:82
+msgid "Uptime/Downtime"
+msgstr ""
+
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:257
+msgid "Use custom multiplier"
+msgstr ""
+
+#: popup_media.php:129
+msgid "Use if severity"
+msgstr ""
+
+#: include/views/administration.mediatypes.list.php:42
+msgid "Used in actions"
+msgstr ""
+
+#: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
+#: include/views/administration.auditlogs.list.php:86
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
+msgid "User"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:288
+#, c-format
+msgid "User \"%s\" cannot be without user group."
+msgstr ""
+
+#: users.php:247
+msgid "User added"
+msgstr ""
+
+#: include/views/administration.users.edit.php:361
+msgid "User can't change type for himself"
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:455
+msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
+msgstr ""
+
+#: include/users.inc.php:212
+msgid "User cannot change GUI access for himself."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:322
+msgid "User cannot change status of himself"
+msgstr ""
+
+#: include/users.inc.php:187
+msgid "User cannot change status of himself."
+msgstr ""
+
+#: users.php:298 users.php:358
+msgid "User deleted"
+msgstr ""
+
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
+#: include/views/administration.script.list.php:42
+#: include/views/administration.usergroups.edit.php:127
+#: include/views/administration.users.list.php:41
+#: include/views/configuration.action.edit.php:553
+msgid "User group"
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
+#, c-format
+msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:661
+#, c-format
+msgid "User group \"%1$s\" is used in configuration for database down messages."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:650
+#, c-format
+msgid "User group \"%1$s\" is used in script \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:424
+#, c-format
+msgid "User group \"%s\" already exists."
+msgstr ""
+
+#: usergrps.php:366
+msgid "User group disabled"
+msgid_plural "User groups disabled"
+msgstr[0] ""
+
+#: usergrps.php:365
+msgid "User group enabled"
+msgid_plural "User groups enabled"
+msgstr[0] ""
+
+#: include/views/administration.general.other.edit.php:37
+msgid "User group for database down message"
+msgstr ""
+
+#: adm.other.php:92
+#, c-format
+msgid "User group for database down message \"%1$s\"."
+msgstr ""
+
+#: include/views/administration.usergroups.list.php:28
+#: include/views/administration.usergroups.list.php:34
+#: include/views/administration.users.list.php:28 popup.php:63
+#: popup_usrgrp.php:25 popup_usrgrp.php:46
+msgid "User groups"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:1295
+msgid "User is not allowed to delete himself."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:301
+#, c-format
+msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:305
+#, c-format
+msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
+msgstr ""
+
+#: disc_prototypes.php:66 host_discovery.php:67
+#: include/views/configuration.action.edit.php:764
+#: include/views/configuration.host.discovery.edit.php:167
+#: include/views/configuration.item.edit.php:173
+#: include/views/configuration.item.massupdate.php:260 items.php:73
+msgid "User name"
+msgstr ""
+
+#: index.php:102
+msgid "User name does not match with DB"
+msgstr ""
+
+#: authentication.php:51
+#: include/views/administration.authentication.edit.php:112
+msgid "User password"
+msgstr ""
+
+#: profile.php:27
+msgid "User profile"
+msgstr ""
+
+#: adm.housekeeper.php:55
+msgid "User session data storage period"
+msgstr ""
+
+#: adm.housekeeper.php:111
+#, c-format
+msgid "User session data storage period (in days) \"%1$s\"."
+msgstr ""
+
+#: include/views/administration.general.housekeeper.edit.php:119
+msgid "User sessions"
+msgstr ""
+
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
+#: include/views/administration.users.list.php:57
+msgid "User type"
+msgstr ""
+
+#: profile.php:180 users.php:240
+msgid "User updated"
+msgstr ""
+
+#: include/classes/api/services/CUser.php:349
+#, c-format
+msgid "User with alias \"%s\" already exists."
+msgstr ""
+
+#: include/views/administration.mediatypes.edit.php:84
+#: include/views/administration.mediatypes.list.php:68
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
+#: include/views/general.login.php:66 index.php:32
+msgid "Username"
+msgstr ""
+
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/administration.usergroups.list.php:29
+#: include/views/administration.usergroups.list.php:121
+#: include/views/administration.users.list.php:29
+#: include/views/administration.users.list.php:43 popup.php:67
+msgid "Users"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:41
+msgid "Users (online)"
+msgstr ""
+
+#: users.php:324
+msgid "Users unblocked"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:899
+msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:603
+msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:607
+msgid "VMware event log, <url> - VMware service URL"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:663
+msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:671
+msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:619
+msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:627
+msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:631
+msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:659
+msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:635
+msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:679
+msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:683
+msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:639
+msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:643
+msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:623
+msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:687
+msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:655
+msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:691
+msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:675
+msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:667
+msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:695
+msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:611
+msgid "VMware service full name, <url> - VMware service URL"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:615
+msgid "VMware service version, <url> - VMware service URL"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:719
+msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:763
+msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:723
+msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:779
+msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:783
+msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:787
+msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:739
+msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:743
+msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:715
+msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:703
+msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:751
+msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:755
+msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:759
+msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:727
+msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:711
+msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:731
+msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:735
+msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:747
+msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:767
+msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:771
+msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:775
+msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
+msgstr ""
+
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/classes/screens/CScreenEvents.php:42
+#: include/classes/screens/CScreenHistory.php:169
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
+#: include/views/common.macros.php:38 tr_testexpr.php:50
+#, c-format
+msgid "Value"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:447
+#, c-format
+msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
+msgstr ""
+
+#: include/classes/api/services/CMap.php:452
+#, c-format
+msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
+msgstr ""
+
+#: include/classes/api/services/CMap.php:442
+#, c-format
+msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
+msgstr ""
+
+#: include/classes/db/DB.php:333
+#, c-format
+msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
+msgstr ""
+
+#: include/classes/db/DB.php:362
+#, c-format
+msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is 2048 characters."
+msgstr ""
+
+#: include/validate.inc.php:326 include/validate.inc.php:350
+#, c-format
+msgid "Value \"%2$s\" of \"%1$s\" has incorrect decimal format."
+msgstr ""
+
+#: include/validate.inc.php:336 include/validate.inc.php:352
+#, c-format
+msgid "Value \"%2$s\" of \"%1$s\" has too many digits after the decimal point: it cannot have more than %3$s digits."
+msgstr ""
+
+#: include/validate.inc.php:332
+#, c-format
+msgid "Value \"%2$s\" of \"%1$s\" has too many digits before the decimal point: it cannot have more than %3$s digits."
+msgstr ""
+
+#: include/validate.inc.php:328
+#, c-format
+msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:895
+msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:891
+msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
+msgstr ""
+
+#: include/valuemap.inc.php:147
+msgid "Value cannot be mapped to empty string."
+msgstr ""
+
+#: include/audit.inc.php:38
+#: include/views/administration.general.valuemapping.list.php:25
+msgid "Value map"
+msgstr ""
+
+#: adm.valuemapping.php:101
+#, c-format
+msgid "Value map \"%1$s\" \"%2$s\"."
+msgstr ""
+
+#: include/valuemap.inc.php:40 include/valuemap.inc.php:80
+#, c-format
+msgid "Value map \"%1$s\" already exists."
+msgstr ""
+
+#: adm.valuemapping.php:79
+#, c-format
+msgid "Value map \"%1$s\"."
+msgstr ""
+
+#: adm.valuemapping.php:71
+msgid "Value map added"
+msgstr ""
+
+#: adm.valuemapping.php:87
+msgid "Value map deleted"
+msgstr ""
+
+#: adm.valuemapping.php:63
+msgid "Value map updated"
+msgstr ""
+
+#: adm.valuemapping.php:106 include/valuemap.inc.php:70
+#, c-format
+msgid "Value map with valuemapid \"%1$s\" does not exist."
+msgstr ""
+
+#: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
+#: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
+#: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
+#: include/views/administration.general.valuemapping.edit.php:54
+msgid "Value mapping"
+msgstr ""
+
+#: include/valuemap.inc.php:142
+msgid "Value mapping must have at least one mapping."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:133
+#: include/classes/items/CHelpItems.php:395
+msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
+msgstr ""
+
+#: include/classes/graphdraw/CPieGraphDraw.php:345
+msgid "Value: no data"
+msgstr ""
+
+#: include/views/monitoring.history.php:63
+msgid "Values"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
+msgid "Variables"
+msgstr ""
+
+#: include/hosts.inc.php:255
+msgid "Vendor"
+msgstr ""
+
+#: include/items.inc.php:43
+msgid "Verbose"
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:73
+#: include/classes/items/CHelpItems.php:323
+msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:643
+msgid "Vertical"
+msgstr ""
+
+#: include/views/configuration.screen.constructor.edit.php:716
+msgid "Vertical align"
+msgstr ""
+
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
+msgid "View is not rendered."
+msgstr ""
+
+#: include/classes/items/CHelpItems.php:205
+#: include/classes/items/CHelpItems.php:467
+msgid "Virtual memory statistics."
+msgstr ""
+
+#: include/views/configuration.host.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:71
+#: include/views/configuration.template.edit.php:99
+#: include/views/inventory.host.view.php:44
+msgid "Visible name"
+msgstr ""
+
+#: include/classes/api/services/CHost.php:637
+msgid "Visible name cannot be empty if host name is missing."
+msgstr ""
+
+#: jsLoader.php:126
+msgctxt "Wednesday short"
+msgid "W"
+msgstr ""
+
+#: adm.triggerseverities.php:58 include/items.inc.php:33
+#: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
+msgid "Warning"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:203
+msgctxt "setup"
+msgid "Warning"
+msgstr ""
+
+#: jsLoader.php:167
+msgid "We are sorry, the maximum possible number of elements to remember has been reached."
+msgstr ""
+
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
+#: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
+msgid "Web"
+msgstr ""
+
+#: dashboard.php:462 include/items.inc.php:98
+msgid "Web monitoring"
+msgstr ""
+
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
+#, c-format
+msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
+#, c-format
+msgid "Web scenario \"%1$s\" already exists."
+msgstr ""
+
+#: httpconf.php:153 httpconf.php:415
+msgid "Web scenario deleted"
+msgstr ""
+
+#: httpconf.php:365
+msgid "Web scenario disabled"
+msgid_plural "Web scenarios disabled"
+msgstr[0] ""
+
+#: httpconf.php:364
+msgid "Web scenario enabled"
+msgid_plural "Web scenarios enabled"
+msgstr[0] ""
+
+#: include/classes/api/services/CHttpTest.php:445
+#, c-format
+msgid "Web scenario missing parameters: %1$s"
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
+msgid "Web scenario must have at least one step."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
+#, c-format
+msgid "Web scenario step \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
+msgid "Web scenario step name should contain only printable characters."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:675
+msgid "Web scenario step number cannot be less than 1."
+msgstr ""
+
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
+msgid "Web scenarios"
+msgstr ""
+
+#: include/func.inc.php:216
+msgid "Wed"
+msgstr ""
+
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
+msgid "Wednesday"
+msgstr ""
+
+#: report5.php:45
+msgid "Week"
+msgstr ""
+
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
+msgid "Weekly"
+msgstr ""
+
+#: popup_media.php:119
+msgid "When active"
+msgstr ""
+
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
+#: include/views/configuration.graph.list.php:78
+#: include/views/configuration.screen.constructor.edit.php:676
+#: include/views/configuration.sysmap.edit.php:42
+#: include/views/configuration.sysmap.list.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
+#: sysmaps.php:49
+msgid "Width"
+msgstr ""
+
+#: include/views/configuration.maintenance.edit.php:41
+#: include/views/configuration.maintenance.list.php:70
+msgid "With data collection"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:48
+msgid "With last event unacknowledged"
+msgstr ""
+
+#: include/blocks.inc.php:468
+msgid "With problems"
+msgstr ""
+
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
+msgid "With triggers"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:47
+msgid "With unacknowledged events"
+msgstr ""
+
+#: include/blocks.inc.php:467
+msgid "Without problems"
+msgstr ""
+
+#: include/forms.inc.php:586 include/forms.inc.php:807
+msgid "Without triggers"
+msgstr ""
+
+#: include/views/configuration.item.list.php:61
+msgid "Wizard"
+msgstr ""
+
+#: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
+#: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
+#: adm.valuemapping.php:133 adm.workingtime.php:69
+#: include/views/administration.general.workingtime.edit.php:25
+#: include/views/administration.general.workingtime.edit.php:28
+msgid "Working time"
+msgstr ""
+
+#: adm.workingtime.php:48
+#, c-format
+msgid "Working time \"%1$s\"."
+msgstr ""
+
+#: include/views/administration.script.edit.php:99
+#: include/views/administration.script.list.php:82
+msgid "Write"
+msgstr ""
+
+#: include/classes/api/services/CService.php:396
+#, c-format
+msgid "Wrong fields for dependency for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CMapElement.php:55
+msgid "Wrong fields for element."
+msgstr ""
+
+#: include/classes/api/services/CHost.php:556
+#, c-format
+msgid "Wrong fields for host \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CImage.php:494
+#, c-format
+msgid "Wrong fields for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CMapElement.php:497
+msgid "Wrong fields for linktrigger delete."
+msgstr ""
+
+#: include/classes/api/services/CMapElement.php:472
+msgid "Wrong fields for linktrigger update."
+msgstr ""
+
+#: include/classes/api/services/CMapElement.php:437
+msgid "Wrong fields for linktrigger."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
+#, c-format
+msgid "Wrong fields for macro \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CMapElement.php:181
+msgid "Wrong fields for map link."
+msgstr ""
+
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
+msgid "Wrong fields for media type."
+msgstr ""
+
+#: include/classes/api/services/CProxy.php:196
+#, c-format
+msgid "Wrong fields for proxy \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:392
+msgid "Wrong fields for script."
+msgstr ""
+
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
+#, c-format
+msgid "Wrong fields for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:480
+#, c-format
+msgid "Wrong fields for time for service \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
+msgid "Wrong fields for trigger."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:246
+#, c-format
+msgid "Wrong fields for user \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CUserMacro.php:607
+#, c-format
+msgid "Wrong macro \"%1$s\"."
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:170
+msgid "X"
+msgstr ""
+
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
+msgid "X label"
+msgstr ""
+
+#: include/classes/import/readers/CXmlImportReader.php:49
+#, c-format
+msgid "XML file contains error %1$s:"
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
+msgid "XML file contains errors"
+msgstr ""
+
+#: include/classes/import/readers/CXmlImportReader.php:52
+#, c-format
+msgid "XML file contains fatal error %1$s:"
+msgstr ""
+
+#: include/classes/import/readers/CXmlImportReader.php:46
+#, c-format
+msgid "XML file contains warning %1$s:"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:172
+msgid "Y"
+msgstr ""
+
+#: include/func.inc.php:671
+msgctxt "Yotta short"
+msgid "Y"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:218
+msgid "Y axis MAX value"
+msgstr ""
+
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
+msgid "Y axis MAX value must be greater than Y axis MIN value."
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:160
+msgid "Y axis MIN value"
+msgstr ""
+
+#: include/views/configuration.graph.edit.php:237
+msgid "Y axis side"
+msgstr ""
+
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
+msgid "Y label"
+msgstr ""
+
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
+
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr ""
+
+#: report3.php:70 report3.php:89 report4.php:111 report4.php:134
+#: report5.php:47
+msgid "Year"
+msgstr ""
+
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
+msgid "Yearly"
+msgstr ""
+
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
+#: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
+#: include/views/js/adm.regexprs.edit.js.php:139
+msgid "Yes"
+msgstr ""
+
+#: include/func.inc.php:671
+msgid "Yotta"
+msgstr ""
+
+#: include/views/administration.users.edit.php:140
+msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:317
+#, c-format
+msgid "You are not allowed to alter privileges for user \"%s\"."
+msgstr ""
+
+#: include/func.inc.php:1689
+msgid "You are not logged in."
+msgstr ""
+
+#: popup.php:474
+msgid "You can not switch hosts for current selection."
+msgstr ""
+
+#: include/views/js/configuration.action.edit.js.php:375
+msgid "You did not specify host for operation."
+msgstr ""
+
+#: include/views/js/configuration.action.edit.js.php:341
+msgid "You did not specify host group for operation."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1405
+#, c-format
+msgid "You did not specify targets for action operation command \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1402
+#, c-format
+msgid "You did not specify targets for action operation global script \"%s\"."
+msgstr ""
+
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
+msgid "You do not have permission to perform this operation."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:252
+msgid "You do not have permissions to create users."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:263
+msgid "You do not have permissions to update other users."
+msgstr ""
+
+#: include/classes/api/services/CUser.php:259
+msgid "You do not have permissions to update user or user does not exist."
+msgstr ""
+
+#: include/func.inc.php:1671
+msgid "You have no permissions to access this page."
+msgstr ""
+
+#: include/func.inc.php:1691
+msgid "You must login to view this page."
+msgstr ""
+
+#: include/func.inc.php:1667
+msgid "Your are logged in as"
+msgstr ""
+
+#: include/func.inc.php:670
+msgctxt "Zetta short"
+msgid "Z"
+msgstr ""
+
+#: index.php:27
+msgid "ZABBIX"
+msgstr ""
+
+#: include/page_header.php:111
+msgid "Zabbix"
+msgstr ""
+
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
+#: include/views/general.login.php:48
+#, c-format
+msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
+msgstr ""
+
+#: include/users.inc.php:55
+msgid "Zabbix Admin"
+msgstr ""
+
+#: include/users.inc.php:56
+msgid "Zabbix Super Admin"
+msgstr ""
+
+#: include/users.inc.php:54
+msgid "Zabbix User"
+msgstr ""
+
+#: include/discovery.inc.php:65 include/items.inc.php:81
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
+#: include/views/js/configuration.action.edit.js.php:118
+#: include/views/js/configuration.discovery.edit.js.php:184
+msgid "Zabbix agent"
+msgstr ""
+
+#: include/items.inc.php:82
+msgid "Zabbix agent (active)"
+msgstr ""
+
+#: include/items.inc.php:90
+msgid "Zabbix aggregate"
+msgstr ""
+
+#: include/validate.inc.php:495
+msgid "Zabbix has received an incorrect request."
+msgstr ""
+
+#: include/items.inc.php:88
+msgid "Zabbix internal"
+msgstr ""
+
+#: include/perm.inc.php:48
+msgid "Zabbix internal authentication"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
+#: include/views/js/configuration.action.edit.js.php:122
+msgid "Zabbix server"
+msgstr ""
+
+#: include/classes/server/CZabbixServer.php:274
+#, c-format
+msgid ""
+"Zabbix server \"%s\" can not be reached. Possible reasons:\n"
+"1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
+"2. Incorrect network configuration.\n"
+msgstr ""
+
+#: include/blocks.inc.php:815
+msgid "Zabbix server IP or port is not set!"
+msgstr ""
+
+#: adm.gui.php:43
+msgid "Zabbix server activity check interval"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:39
+msgid "Zabbix server info"
+msgstr ""
+
+#: jsrpc.php:174
+msgid "Zabbix server is not running: the information displayed may not be current."
+msgstr ""
+
+#: include/blocks.inc.php:813
+msgid "Zabbix server is running"
+msgstr ""
+
+#: adm.gui.php:80
+#, c-format
+msgid "Zabbix server is running check interval \"%1$s\"."
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:434
+msgid "Zabbix server name"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:433
+msgid "Zabbix server port"
+msgstr ""
+
+#: include/items.inc.php:89
+msgid "Zabbix trapper"
+msgstr ""
+
+#: include/func.inc.php:670
+msgid "Zetta"
+msgstr ""
+
+#: jsLoader.php:93
+msgid "Zoom"
+msgstr ""
+
+#: include/func.inc.php:146
+#, c-format
+msgid "[Wrong value for day: \"%s\" ]"
+msgstr ""
+
+#: include/func.inc.php:131
+#, c-format
+msgid "[Wrong value for month: \"%s\" ]"
+msgstr ""
+
+#: include/hosts.inc.php:468
+msgid "agent"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
+#: include/classes/screens/CScreenHostgroupTriggers.php:109
+#: include/classes/screens/CScreenHostgroupTriggers.php:115
+#: include/classes/screens/CScreenHostTriggers.php:110
+#: include/classes/screens/CScreenHostTriggers.php:116
+#: include/forms.inc.php:357 include/forms.inc.php:400
+#: include/forms.inc.php:415 include/forms.inc.php:422
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
+msgid "all"
+msgstr ""
+
+#: include/actions.inc.php:301
+msgid "all media"
+msgstr ""
+
+#: include/views/monitoring.history.php:125
+msgid "as Blue"
+msgstr ""
+
+#: include/views/monitoring.history.php:124
+msgid "as Green"
+msgstr ""
+
+#: include/views/monitoring.history.php:123
+msgid "as Red"
+msgstr ""
+
+#: include/events.inc.php:36
+msgid "auto registration"
+msgstr ""
+
+#: include/events.inc.php:66
+msgid "auto-registered host"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
+#: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
+#: include/views/js/configuration.graph.edit.js.php:41
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
+msgid "avg"
+msgstr ""
+
+#: include/classes/parsers/CConditionFormula.php:188
+#, c-format
+msgid "check expression starting from \"%1$s\""
+msgstr ""
+
+#: include/func.inc.php:552 jsLoader.php:99
+msgctxt "day short"
+msgid "d"
+msgstr ""
+
+#: chart4.php:124 chart5.php:137
+msgid "d.M"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
+msgid "d.m"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
+msgid "d.m H:i"
+msgstr ""
+
+#: include/views/common.filter.trigger.php:90
+msgid "days"
+msgstr ""
+
+#: include/html.inc.php:602
+msgid "dd"
+msgstr ""
+
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
+#: include/views/configuration.slideconf.edit.php:66
+#: include/views/js/configuration.slideconf.edit.js.php:14
+msgid "default"
+msgstr ""
+
+#: include/views/js/adm.regexprs.edit.js.php:126
+msgid "delimiter"
+msgstr ""
+
+#: include/events.inc.php:64
+msgid "discovered host"
+msgstr ""
+
+#: include/events.inc.php:65
+msgid "discovered service"
+msgstr ""
+
+#: include/events.inc.php:35
+msgid "discovery"
+msgstr ""
+
+#: jsLoader.php:95
+msgid "dynamic"
+msgstr ""
+
+#: include/views/js/configuration.sysmaps.js.php:218
+msgid "elements"
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1278
+msgid "esc_step_from and esc_step_to must be set together."
+msgstr ""
+
+#: include/views/inventory.host.list.php:41
+msgid "exactly"
+msgstr ""
+
+#: include/actions.inc.php:941
+msgid "executed"
+msgstr ""
+
+#: include/classes/parsers/CConditionFormula.php:183
+msgid "expression is empty"
+msgstr ""
+
+#: jsLoader.php:94
+msgid "fixed"
+msgstr ""
+
+#: include/func.inc.php:1569
+msgid "found"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
+msgctxt "item_form"
+msgid "global housekeeping settings"
+msgstr ""
+
+#: include/func.inc.php:553 jsLoader.php:100
+msgctxt "hour short"
+msgid "h"
+msgstr ""
+
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
+msgid "hh"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:398
+msgid "host"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:397
+msgid "host group"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:394
+msgid "icon"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:401
+msgid "image"
+msgstr ""
+
+#: include/actions.inc.php:33
+msgid "in"
+msgstr ""
+
+#: include/classes/parsers/CItemKey.php:76
+#, c-format
+msgid "incorrect syntax near \"%1$s\""
+msgstr ""
+
+#: include/events.inc.php:37
+msgctxt "event source"
+msgid "internal"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:43
+msgid "is"
+msgstr ""
+
+#: include/events.inc.php:67
+msgid "item"
+msgstr ""
+
+#: include/classes/parsers/CItemKey.php:62
+msgid "key is empty"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
+#: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
+#: include/views/js/configuration.graph.edit.js.php:43
+msgid "last"
+msgstr ""
+
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
+#: include/forms.inc.php:449 include/forms.inc.php:456
+#: include/forms.inc.php:463 include/forms.inc.php:470
+#: include/forms.inc.php:591 include/forms.inc.php:606
+#: include/views/inventory.host.list.php:40
+msgid "like"
+msgstr ""
+
+#: include/events.inc.php:68
+msgid "low-level discovery rule"
+msgstr ""
+
+#: include/func.inc.php:554
+msgctxt "minute short"
+msgid "m"
+msgstr ""
+
+#: include/func.inc.php:551 jsLoader.php:98
+msgctxt "month short"
+msgid "m"
+msgstr ""
+
+#: include/views/js/common.macros.js.php:36
+msgid "macro(s)"
+msgstr ""
+
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
+msgid "maintenance"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:400
+msgid "map"
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:322
+#: include/views/js/configuration.host.discovery.edit.js.php:23
+msgid "matches"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
+#: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
+#: include/views/js/configuration.graph.edit.js.php:42
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
+msgid "max"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
+#: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
+#: include/views/js/configuration.graph.edit.js.php:40
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
+msgid "min"
+msgstr ""
+
+#: include/views/configuration.action.edit.php:362
+msgid "minimum 60 seconds"
+msgstr ""
+
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
+msgid "mm"
+msgstr ""
+
+#: include/func.inc.php:556
+msgctxt "millisecond short"
+msgid "ms"
+msgstr ""
+
+#: include/views/administration.authentication.edit.php:110
+msgid "must be a valid LDAP user"
+msgstr ""
+
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
+msgid "new"
+msgstr ""
+
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
+msgctxt "new element in multiselect"
+msgid "new"
+msgstr ""
+
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
+#: include/classes/graphdraw/CPieGraphDraw.php:347
+msgid "no data"
+msgstr ""
+
+#: include/actions.inc.php:39
+msgid "not in"
+msgstr ""
+
+#: include/actions.inc.php:31
+msgid "not like"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:34
+msgid "not running"
+msgstr ""
+
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
+msgid "not selected"
+msgstr ""
+
+#: include/actions.inc.php:857 include/actions.inc.php:949
+#: include/actions.inc.php:994
+msgid "not sent"
+msgstr ""
+
+#: jsLoader.php:96
+msgid "now"
+msgstr ""
+
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
+msgid "of"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
+msgid "off"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
+#: include/views/monitoring.hostscreen.php:54
+msgid "on"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:129
+msgid "other"
+msgstr ""
+
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
+
+#: include/views/configuration.host.discovery.edit.php:317
+#: include/views/js/configuration.host.discovery.edit.js.php:27
+msgid "regular expression"
+msgstr ""
+
+#: include/views/administration.general.gui.edit.php:35
+msgid "remember selected"
+msgstr ""
+
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
+#: include/views/configuration.services.parent.list.php:41
+#: include/views/configuration.services.parent.list.php:42
+#: include/views/configuration.services.parent.list.php:43
+msgid "root"
+msgstr ""
+
+#: include/classes/html/CServerInfo.php:33
+msgid "running"
+msgstr ""
+
+#: include/func.inc.php:555
+msgctxt "second short"
+msgid "s"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:258
+msgid "sec"
+msgstr ""
+
+#: include/views/administration.general.triggerDisplayOptions.edit.php:105
+#: include/views/administration.general.triggerDisplayOptions.edit.php:111
+msgid "seconds"
+msgstr ""
+
+#: include/actions.inc.php:849
+msgid "sent"
+msgstr ""
+
+#: include/views/configuration.services.edit.php:226
+msgid "short description"
+msgstr ""
+
+#: include/views/configuration.sysmap.edit.php:59
+msgid "show icon mappings"
+msgstr ""
+
+#: include/views/configuration.item.edit.php:384
+#: include/views/configuration.item.massupdate.php:442
+msgid "show value mappings"
+msgstr ""
+
+#: include/classes/api/services/CHostBase.php:53
+#, c-format
+msgid "template ID \"%1$s\" is passed %2$s times"
+msgstr ""
+
+#: include/func.inc.php:1562
+msgid "to"
+msgstr ""
+
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
+#: include/events.inc.php:63
+msgid "trigger"
+msgstr ""
+
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
+msgid "type here to search"
+msgstr ""
+
+#: include/classes/parsers/CItemKey.php:62
+msgid "unexpected end of key"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
+msgid "unknown"
+msgstr ""
+
+#: include/views/common.macros.php:46
+msgid "value"
+msgstr ""
+
+#: include/actions.inc.php:321 include/actions.inc.php:333
+msgid "via"
+msgstr ""
+
+#: include/func.inc.php:550 jsLoader.php:97
+msgctxt "year short"
+msgid "y"
+msgstr ""
+
+#: include/html.inc.php:606
+msgid "yyyy"
+msgstr ""
diff --git a/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po b/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po
index 582033bdb21..5eef362a3bb 100644
--- a/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po
@@ -3,9 +3,9 @@
 # 20120720T0924
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2013-08-25 15:11+0300\n"
 "Last-Translator: solutionware <shiys@solutionware.com.cn>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -18,28 +18,30 @@ msgstr ""
 "X-Poedit-Basepath: ../../\n"
 "X-POOTLE-MTIME: 1377436299.0\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\" 必须位于 1970.01.01 和 2038.01.18."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"显示 正常 的触发器\" 必须为 \"0\" 或一个正整数."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"触发器闪烁状态改变时\" 必须为 \"0\" 或一个正整数."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -50,22 +52,20 @@ msgstr[0] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s (年 %2$s)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s 监控项"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] "%1$s 天"
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -78,7 +78,7 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -96,23 +96,23 @@ msgid "%d device"
 msgid_plural "%d devices"
 msgstr[0] "%d个装置"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 - 无限地)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr "(只有超级管理员能创建群组)"
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(日计)"
 
@@ -120,34 +120,34 @@ msgstr "(日计)"
 msgid "(in sec)"
 msgstr "(秒计)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(最少 60 秒, 0 为预设值)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(无系统代理程式)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr "-"
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[整批知悉]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 或 1"
 
@@ -163,7 +163,7 @@ msgstr "10秒"
 msgid "30 seconds"
 msgstr "30秒"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D 检视"
 
@@ -179,7 +179,7 @@ msgstr "5秒"
 msgid "500 latest values"
 msgstr "最近500个值"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -198,12 +198,11 @@ msgstr ""
 msgid "AES"
 msgstr "AES"
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "警报知悉"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "与"
 
@@ -215,19 +214,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "可用性统计"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "最末和前一个值之前的绝对差异是 < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "最末和前一个值之前的绝对差异是 = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "最末和前一个值之前的绝对差异是 > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "最末和前一个值之前的绝对差异不是 N"
 
@@ -239,42 +238,42 @@ msgstr "可接受的SLA"
 msgid "Access denied!"
 msgstr "存取被拒!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr "访问被拒绝."
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "帐号被封锁%s秒"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "知悉"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "知悉"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "已加知悉"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "知悉警报以"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "知悉并返回"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "知悉状态"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "已知悉"
 
@@ -299,61 +298,64 @@ msgstr "无权知悉"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "动作"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr "动作 \"%1$s\" 已经存在."
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "动作 \"%1$s\" 已有不正确值达 \"esc_period\" (最少%2$s秒)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr "动作 \"%1$s\" 没有定义操作."
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "动作已添加"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "动作已删除"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -365,21 +367,21 @@ msgstr[0] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "动作操作"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "动作已更新"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "动作"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "主动式"
@@ -389,80 +391,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "作用中"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "作用中自从"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "作用中直到"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "添加"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "添加评论由"
 
@@ -478,27 +483,23 @@ msgstr "添加主机"
 msgid "Add link"
 msgstr "添加连结"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "添加缺少的"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr "添加新的或者已经存在的应用"
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr "添加新的或者已经存在的主机组"
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "添加原型"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "添加到"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "添加到常用"
@@ -507,7 +508,7 @@ msgstr "添加到常用"
 msgid "Add to host group"
 msgstr "添加到主机群组"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "添加到主机群组"
 
@@ -519,7 +520,7 @@ msgstr "已添加"
 msgid "Admin"
 msgstr "管理者"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "管理"
 
@@ -527,34 +528,34 @@ msgstr "管理"
 msgid "Advanced labels"
 msgstr "进阶标示"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "历时"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "历时少于"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "历时少于%s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "端点代理程式"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "端点代理程式的介面"
@@ -563,12 +564,12 @@ msgstr "端点代理程式的介面"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "端点代理程式或SNMP或JMX或IPMI的介面"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "别名"
 
@@ -576,122 +577,125 @@ msgstr "别名"
 msgid "Align icons"
 msgstr "对齐图示"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "所有"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "所有群组"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "所有的连结应含 特定的名称和URL"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "容许的主机"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "任何"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "包括任何字元字串"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "应用集"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "应用集 \"%1$s\" 已存在."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "应用集已添加"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "应用集已删除"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "应用集 错误."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "应用集已更新"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "ID为 \"%1$s\"的应用集不在 \"%2$s\" 之中."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "应用集"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "适用"
 
@@ -700,16 +704,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "接近中"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "四月"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "四月"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "您确定要完成这个动作吗?"
 
@@ -725,9 +729,9 @@ msgstr "区域尺寸"
 msgid "Area type"
 msgstr "区域类型"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -741,50 +745,47 @@ msgstr "纯文字"
 msgid "Asset tag"
 msgstr "区域标籤"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr "在 %1$s:%2$s 的 %3$s"
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr "在 %1$s:%2$s 的 %3$s %4$s 的每个 %5$s"
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr "在 %1$s:%2$s 的天 %3$s 的每个 %4$s"
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "于(时:分)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "应该选择至少一个主机或群组."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "必须创建至少一个维修期间."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "审计"
@@ -804,26 +805,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "八月"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "八月"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "认证"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "认证法则"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -882,9 +885,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "自动地"
 
@@ -892,20 +895,20 @@ msgstr "自动地"
 msgid "Automatic icon mapping"
 msgstr "自动的图示对应"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "自动的图示选择"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "可用性"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "可用性报表"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "可用"
 
@@ -914,36 +917,36 @@ msgstr "可用"
 msgid "Average"
 msgstr "一般严重"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "平均之"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "一个期间T的平均值是 < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "一个期间T的平均值是 = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "一个期间T的平均值是 > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "一个期间T的平均值不是 N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "轴侧"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "背景"
@@ -952,7 +955,7 @@ msgstr "背景"
 msgid "Background image"
 msgstr "背景图片"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "条状图报表"
 
@@ -962,8 +965,8 @@ msgid "Base DN"
 msgstr "基于 DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "基本认证方式"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -975,15 +978,15 @@ msgstr "绑定 DN"
 msgid "Bind password"
 msgstr "Bind密码"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr "按位与最后一个(最近的) T值和掩码是 = N"
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr "按位与最后一个(最近的) T值和掩码不是 N"
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "黑&蓝"
 
@@ -995,8 +998,8 @@ msgstr "闪烁中"
 msgid "Blocked"
 msgstr "封锁的"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "粗线"
 
@@ -1004,22 +1007,22 @@ msgstr "粗线"
 msgid "Boolean"
 msgstr "二元逻辑"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "底部"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "转亮"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr "保加利亚语 (bg_BG)"
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "整批知悉"
 
@@ -1045,7 +1048,7 @@ msgstr "应用集的组态"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "授权的组态"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1075,7 +1078,7 @@ msgstr "主机群组的组态"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "主机的组态"
 
@@ -1087,7 +1090,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "图示对应的组态"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "图片的组态"
 
@@ -1096,14 +1099,14 @@ msgstr "图片的组态"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "IT服务的组态"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "项目原型的组态"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "项目的组态"
 
@@ -1132,7 +1135,7 @@ msgstr "网络拓墣图的组态"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "系统代理程式的组态"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "正规表示法的组态"
 
@@ -1152,7 +1155,7 @@ msgstr "脚本的组态"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "简报片展示的组态"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "模板的组态"
 
@@ -1168,7 +1171,7 @@ msgstr "触发器严重性的组态"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "触发器的组态"
 
@@ -1200,22 +1203,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "Zabbix的组态"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1224,21 +1227,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "计算SLA, 可接受的SAL(%计)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "计算的"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "已计许可权"
 
@@ -1246,92 +1249,95 @@ msgstr "已计许可权"
 msgid "Callback"
 msgstr "回呼"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "加拿大 (136 字元)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "取消"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "无法知悉事件"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr "不能添加一个非数字监控项 \"%1$s\" 到图表 \"%2$s\"."
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "无法添加操作"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr "不能添加动作条件"
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "无法添加应用集"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "无法添加自主机到模板的相依关係"
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "无法自触发器\"%1$s:%2$s\" 添加相依关係到不存在的触发器\"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "无法添加自动探索的规则"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "无法添加图表"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "无法添加群组"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "无法添加主机"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1339,24 +1345,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "无法添加图片"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "无法添加图片."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "无法添加项目"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr "不能添加监控项."
 
@@ -1364,20 +1370,20 @@ msgstr "不能添加监控项."
 msgid "Cannot add macro."
 msgstr "无法添加巨集"
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "无法添加维修"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "无法添加示警媒介类型"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "无法添加超过一个 \"图形总计\" 类型的项目于图形 \"%1$s\"上."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1386,24 +1392,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "无法添加网路拓墣图"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr "不能添加新的应用 \"%1$s\"."
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "无法添加系统代理程式"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "无法添加正规表示式"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "无法添加筛选"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "无法添加脚本"
 
@@ -1415,27 +1421,27 @@ msgstr "无法添加服务"
 msgid "Cannot add slide show"
 msgstr "无法添加简报片展示"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "无法添加模板"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "无法添加触发器"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "无法添加用户"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "无法添加用户. 两次输入的密码必须一致."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "无法添加用户"
 
@@ -1443,7 +1449,7 @@ msgstr "无法添加用户"
 msgid "Cannot add value map"
 msgstr "无法添加值对应"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr "不能添加web场景"
 
@@ -1463,23 +1469,23 @@ msgstr "无法改变授权方式为LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "无法改变授权方式为Zabbix内部"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "无法清除历史"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "无法克隆图形原型"
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "无法克隆项目原型"
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "无法克隆触发器原型"
 
@@ -1487,20 +1493,20 @@ msgstr "无法克隆触发器原型"
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "无法连接到系统主机主控程序的捉捕器的埠, 但是它应该可用的..."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "无法複製图形"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "无法複製项目"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "无法複製触发器 \"%1$s:%2$s\", 因为在其表示式中有多重主机."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1509,19 +1515,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "无法创建另外资料库连线."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "不能创建循环依赖关系。"
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "不能创建触发器本身的依赖."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "无法创建探索规则"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "无法创建主机群组."
 
@@ -1529,101 +1535,100 @@ msgstr "无法创建主机群组."
 msgid "Cannot create icon map"
 msgstr "无法创建图示对应"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "无法创建同名为\"%s\"的图示对应."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "无法创建拓墣图 \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr "无法创建新的应用程序, web 场景已分配给应用程序."
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "无法创建新组件"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "无法创建筛选."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "无法删除Zabbix内部用户 \"%1$s\", 试试停用那用户."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "无法删除动作"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "无法删除应用集"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "无法删除相依关係"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "无法删除探索规则"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "无法删除探索规则"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "无法删除图形"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "无法删除图表原型"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "无法删除图形."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "无法删除图形"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "无法删除与底层发现创建的图标."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "无法删除群组"
+msgid_plural "Cannot delete groups"
+msgstr[0] "无法删除群组"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "无法删除主机"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "无法删除主机群组."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1631,78 +1636,78 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "无法删除图示对应"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "无法删除图片"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "无法删除资产纪录."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "无法删除项目"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "无法删除项目"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "不能删除由底层发现创建的监控项."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "无法删除维修"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "无法删除示警媒介类型"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "无法删除网路拓墣图"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "无法删除系统代理程式"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "无法删除正规表示式 "
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "无法删除筛选"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "无法删除脚本"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "无法删除脚本. 空白的输入参数 \"scriptids\"."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "无法删除脚本. 脚本 \"%1$s\" 用于动作操作 \"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "无法删除所选的动作"
 
@@ -1710,77 +1715,80 @@ msgstr "无法删除所选的动作"
 msgid "Cannot delete service"
 msgstr "无法删除服务"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "无法删除简报片展示"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "无法删除模板"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr "无法删除模板的应用程序."
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "无法删除模板图形."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "无法删除样本项目."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "无法删除模板的监控项"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "无法删除模板项目."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "无法删除模板化触发器 \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr "无法删除模板的 web 场景 \"%1$s\"."
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "无法删除触发器"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "无法删除触发器原型"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "无法删除触发器."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "无法删除触发器"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "无法删除由底层发现创建的触发器."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "无法删除用户"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "无法删除用户示警媒介."
 
@@ -1788,67 +1796,67 @@ msgstr "无法删除用户示警媒介."
 msgid "Cannot delete value map"
 msgstr "无法删除值对应"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr "无法删除 web 场景"
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "无法关闭示警媒介类型"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -1862,123 +1870,117 @@ msgstr "无法显示监控项队列."
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "无法删除示警媒介类型"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "无法找到用在筛选 \"%2$s\" 中的群组 \"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "无法找到图表 \"%1$s\" 用于屏幕 \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "无法找到群组 \"%1$s\" 用于地图 \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "无法找到群组 \"%1$s\" 用于屏幕 \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "无法找到主机 \"%1$s\" 用于地图 \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "无法找到主机 \"%1$s\" 用于屏幕 \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "找不到用于项目键\"%2$s\"的主机介面于 \"%1$s\" ."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -1989,34 +1991,53 @@ msgstr "无法找到图标 \"%1$s\" 用于地图 \"%2$s\"."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "无法找到地图图标 \"%1$s\" 用于地图 \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "无法找到监控项 \"%1$s\" 用于屏幕 \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "无法找到地图 \"%1$s\" 用于被导出的地图 \"%2$s\"."
@@ -2026,41 +2047,41 @@ msgstr "无法找到地图 \"%1$s\" 用于被导出的地图 \"%2$s\"."
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "无法找到地图 \"%1$s\" 用于地图 \"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "无法找到地图 \"%1$s\" 用于屏幕 \"%2$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "无法找到有名称的物件"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "无法找到屏幕 \"%1$s\" 用于屏幕 \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "无法找到触发器 \"%1$s\" 用于地图 \"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2073,12 +2094,14 @@ msgstr "无法形成树状格式. 检查服务连结的逻辑结构."
 msgid "Cannot format tree."
 msgstr "无法形成树状格式"
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "不能合併表示式 \"%s\"."
@@ -2089,58 +2112,59 @@ msgid "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
 msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "不能包含检视档桉\"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "不能插入用户示警媒介"
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "无法连结模板"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "不能登出"
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "不能大量更新主机名称."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "不能大量更新可见主机名称"
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "不能传递重複的模板IDs给连结: %s."
@@ -2160,7 +2184,7 @@ msgstr "不能完成没有值的更新表达式料表 \"%1$s\" 上."
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "不能完成没有条件的更新陈述式在表 \"%1$s\" 上."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2169,11 +2193,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "不能读取响应, 检查与Zabbix服务器 \"%1$s\" 的连接."
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr "无法删除所有的监控项，至少一个监控项应该保留."
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2181,11 +2205,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "无法移除巨集."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "无法重新命名访客用户."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "无法储存未检验的探索规则"
 
@@ -2194,217 +2218,226 @@ msgstr "无法储存未检验的探索规则"
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "无法发送命令, 检查于Zabbix 服务器 \"%1$s\" 的连接."
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr "无法设置 \"%1$s\" 为监控项 \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr "无法设置 \"%1$s\" 为触发器 \"%2$s\"."
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "无法设置 \"模板序列号\" 为应用 \"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "无法设置 \"模板序列号\" 为屏幕 \"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "无法设置 \"模板序列号\" 为触发器原型 \"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr "无法设置审计字段为已经禁止的审计."
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "无法为介面切换主机."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "无法解除阻挡用户"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "无法删除和清除 Web 场景."
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr "无法删除和清除应用程序."
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "无法断连和清除探索规则"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "无法断连和清除图形原型"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "无法断连和清除图形."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "无法断连和清除项目原型"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "无法断连和清除项目"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "无法断连和清除触发器"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "无法断连模板"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "不能断连触发器\"%s\", 其已有项目来自于留存连到主机的模板."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr "无法更新 \"%1$s\" 为监控项 \"%2$s\"."
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr "无法更新 \"%1$s\" 为触发器 \"%2$s\"."
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "无法更新 \"模板序列号\" 为应用程序 \"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "无法更新 \"模板序列号\" 为图表 \"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "无法更新 \"模板序列号\" 为屏幕 \"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "无法更新 \"模板序列号\" 为触发器原型 \"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "无法更新操作"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "无法更新应用集"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "无法更新评论"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "无法更新组态"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "无法更新调试模式"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "无法更新探索规则"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "无法更新前端存取"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "无法更新图形"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "无法更新群组"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "无法更新群组."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "无法更新主机"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "无法更新主机"
 
@@ -2416,24 +2449,24 @@ msgstr "无法更新图示对应"
 msgid "Cannot update image"
 msgstr "无法更新图片"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "无法更新图片."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "无法更新项目"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "无法更新项目"
 
@@ -2445,16 +2478,16 @@ msgstr "无法更新巨集."
 msgid "Cannot update macros"
 msgstr "无法更新巨集"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "无法更新维修"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "无法更新拓拓墣图\"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "无法更新媒介型态"
 
@@ -2462,28 +2495,24 @@ msgstr "无法更新媒介型态"
 msgid "Cannot update network map"
 msgstr "无法更新网路拓墣图"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "无法更新系统代理程式"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "无法更新正规表示式"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "无法更新筛选"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "无法更新筛选."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "无法更新脚本"
 
@@ -2495,40 +2524,41 @@ msgstr "无法更新服务"
 msgid "Cannot update slide show"
 msgstr "无法更新简报片展示"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "无法更新模板"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr "无法更新被模板化的应用程序."
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "无法更新触发器"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "无法更新用户"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "无法更新用户媒介."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "无法更新用户. 两次输入的密码必须一致."
 
@@ -2536,15 +2566,15 @@ msgstr "无法更新用户. 两次输入的密码必须一致."
 msgid "Cannot update value map"
 msgstr "无法更新值对应"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr "无法更新 web 场景"
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "提示"
 
@@ -2553,47 +2583,47 @@ msgstr "提示"
 msgid "Case sensitive"
 msgstr "区分大小写"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "中"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "更改"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "更改"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "修改密码"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "字元"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "字元字串已包含"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "字元字串未包含"
 
@@ -2602,48 +2632,48 @@ msgid "Chassis"
 msgstr "机壳"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "检查已存在."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "检查开始于\"%1$s\"的表示式部份."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "检查键值, 请. 用的是预设的例子."
 
@@ -2652,44 +2682,44 @@ msgid "Check type"
 msgstr "检查类型"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "检查 "
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "检查必需是唯一的"
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "中文 (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "中文 (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "无法创建拓墣图组件 \"%s\"的循环式连结"
@@ -2704,34 +2734,35 @@ msgstr "拓朴图中的循环式引用: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "筛选中的循环式引用: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "模板中的循环式引用: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "循环式模板连结是不允许的."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "典型的"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "清除"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "清除历史和趋势"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "清除所选的历史"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "清除当无连结时"
 
@@ -2741,69 +2772,69 @@ msgstr "时钟"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "克隆"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "关闭"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "关闭表示式建构"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "颜色"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr "颜色 \"%1$s\" 是不正确的: 期望十六进制的颜色代码(6 个符号)."
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "颜色 (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "列跨幅"
 
@@ -2818,7 +2849,7 @@ msgstr "合併的结果"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "命令"
 
@@ -2826,41 +2857,31 @@ msgstr "命令"
 msgid "Command actions"
 msgstr "命令动作"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "命令不能是空白."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "命令"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "评论已更新"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "评论"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr "评论对于 \"%s\"."
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "商业的"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "比较数期的值"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "组合许可权"
 
@@ -2868,29 +2889,39 @@ msgstr "组合许可权"
 msgid "Condition"
 msgstr "条件"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "条件"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "组态"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3053,23 +3084,23 @@ msgstr "配置已更新"
 msgid "Configure (Filter %s)"
 msgstr "组态(过滤器 %s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "确认文字"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "连接到"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "连接为 '%1$s'"
@@ -3128,7 +3159,7 @@ msgid "Context name"
 msgstr "上下文名称"
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3136,30 +3167,36 @@ msgstr ""
 msgid "Contract number"
 msgstr "联系号码"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "座标"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "复制"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "复制所选的到 ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "正确登录 \"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "不能储存图片!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "计数"
 
@@ -3179,6 +3216,10 @@ msgstr "创建应用集"
 msgid "Create application (select host first)"
 msgstr "创建应用程序 (先选择主机)"
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3196,7 +3237,7 @@ msgstr "创建图形(先选择主机)"
 msgid "Create graph prototype"
 msgstr "创建图形原型"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "创建主机"
 
@@ -3209,15 +3250,15 @@ msgstr "创建主机群组"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "创建图标映射"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "创建图像"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "创建监控项"
 
@@ -3241,6 +3282,10 @@ msgstr "创建地图"
 msgid "Create media type"
 msgstr "创建媒体类型"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "创建代理"
@@ -3265,11 +3310,11 @@ msgstr "创建脚本"
 msgid "Create slide show"
 msgstr "创建幻灯片播放"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "创建模板"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "创建触发器"
 
@@ -3293,42 +3338,42 @@ msgstr "创建用户群组"
 msgid "Create value map"
 msgstr "创建值映射"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "已创建: 应用集 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "已创建: 发现规则 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "已创建: 监控项 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "已创建: 监控项原型 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "已创建: 触发器 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "已创建: 触发器原型 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "已创建: Web 场景 \"%1$s\" 于 \"%2$s\"."
@@ -3338,51 +3383,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "当前日期是 < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "当前日期是 = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "当前日期是 > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "当前日期不是 N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "当前主机"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "当前时间是 < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "当前时间是 = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "当前时间是 > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "当前时间不是 N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "当前值"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3395,7 +3441,7 @@ msgstr "自定义图表"
 msgid "Custom label"
 msgstr "自定义标签"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "自定义标签地图 \"%2$s\" 类型元素 \"%1$s\" 不能为空."
@@ -3409,7 +3455,7 @@ msgstr "自定义倍数"
 msgid "Custom screens"
 msgstr "自定义屏幕"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "自定义脚本"
 
@@ -3429,18 +3475,14 @@ msgstr "自定义大小"
 msgid "Custom slides"
 msgstr "自定义幻灯片"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "捷克(cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "天, 天 月 年 时:分:秒 O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "仪表板配置"
@@ -3456,28 +3498,28 @@ msgstr "DES"
 msgid "DETAILS OF SCENARIO"
 msgstr "场景细节"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "禁用"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "被发现"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3485,25 +3527,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS名称"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "断线"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "每日"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "暗橘色"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "转暗"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "仪表板"
 
@@ -3515,20 +3557,21 @@ msgstr "仪表板配置"
 msgid "Dashboard filter"
 msgstr "仪表板过滤器"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "虚线"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "数据"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3551,11 +3594,12 @@ msgstr ""
 msgid "Data type"
 msgstr "数据类型"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "数据库文件"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "数据库主机"
 
@@ -3563,35 +3607,39 @@ msgstr "数据库主机"
 msgid "Database monitor"
 msgstr "数据库监视"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "数据库名称"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "数据库密码"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "数据端口"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "数据库概要"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "数据库服务器"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "数据库类型"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "数据库用户"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "日期"
 
@@ -3611,53 +3659,52 @@ msgstr "硬件维修过期日期"
 msgid "Date HW purchased"
 msgstr "硬件购买日期"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "日"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "月中第几日"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "月中第几日是 < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "月中第几日是 = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "月中第几日是 > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "月中第几日不是 N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "星期中第几日"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "星期中第几日是 < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "星期中第几日是 = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "星期中第几日是 > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "星期中第几日不是 N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "天数"
 
@@ -3665,22 +3712,22 @@ msgstr "天数"
 msgid "Debug"
 msgstr "调试"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "调试模式"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "调试模式已更新"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "十二"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "十二"
 
@@ -3690,15 +3737,14 @@ msgstr "十进位数字"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "默认"
 
@@ -3711,11 +3757,11 @@ msgid "Default delay (in seconds)"
 msgstr "默认延迟(秒计)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "默认信息"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "默认操作步骤持续时间"
 
@@ -3738,30 +3784,34 @@ msgstr "默认主题 \"%1$s\"."
 msgid "Delay"
 msgstr "延迟"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "延迟(秒计)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "被延迟由于"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "删除"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "删除并清除"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "删除并清除所选的模板? (警告: 所有连结的主机将被清除!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "删除并清除模板? (警告: 所有连结的主机将被清除!)"
 
@@ -3769,53 +3819,53 @@ msgstr "删除并清除模板? (警告: 所有连结的主机将被清除!)"
 msgid "Delete application?"
 msgstr "删除应用集?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "删除目前的动作?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "删除发现规则?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "删除表示式?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "删除图形?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "删除所选的WEB方桉的历史资料?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "删除所选的项目的历史资料?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "删除图标映射?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "删除监控项?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "删除关键字?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "删除所选组件间的连接?"
 
@@ -3823,11 +3873,15 @@ msgstr "删除所选组件间的连接?"
 msgid "Delete maintenance period?"
 msgstr "删除维修期间?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "删除网路地图?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "删除代理?"
 
@@ -3835,7 +3889,7 @@ msgstr "删除代理?"
 msgid "Delete regular expression?"
 msgstr "删除正规表示式?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "删除场景?"
 
@@ -3843,71 +3897,67 @@ msgstr "删除场景?"
 msgid "Delete screen?"
 msgstr "删除屏幕?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "删除脚本?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "删除所选的"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "删除所选的 WEB 场景?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "删除所选的动作?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "删除所选的应用集?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "删除所选的发现规则?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "删除所选的元素?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "删除所选的图表?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "删除所选的群组?"
@@ -3916,27 +3966,27 @@ msgstr "删除所选的群组?"
 msgid "Delete selected groups?"
 msgstr "删除所选的群组?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "删除所选的主机群组?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "删除所选的主机?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "删除所选的主机?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "删除所选的图像?"
 
@@ -3944,31 +3994,31 @@ msgstr "删除所选的图像?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "删除所选的监控项?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "删除所选的维修期间?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "删除所选的地图?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "删除所选的媒体类型?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "删除所选的报警媒体类型?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "删除所选的代理?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "删除所选的正规表示式?"
 
@@ -3976,15 +4026,15 @@ msgstr "删除所选的正规表示式?"
 msgid "Delete selected screens?"
 msgstr "删除所选的屏幕?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "删除所选的脚本?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "删除所选的幻灯片展示?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "删除所选的模板?"
 
@@ -3996,11 +4046,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "删除所选的触发器?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "删除所选的用户?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "删除所选的用户?"
 
@@ -4014,11 +4064,15 @@ msgid "Delete selected value mapping? It is used for %d item!"
 msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "删除所选的值映射? 它是用于 %d 监控项!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "删除所选的被连接的元素"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4027,15 +4081,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "删除幻灯片展示?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "删除模板?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "删除触发器?"
 
@@ -4043,62 +4097,62 @@ msgstr "删除触发器?"
 msgid "Deleted"
 msgstr "已删除"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "已删除: 应用集 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "已删除: 发现规则 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "已删除: 图表 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "已删除: 主机 \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "已删除: 监控项 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "已删除: 监控项原型 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "已删除: 代理 \"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "已删除: 模板 \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "已删除: 触发器 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "已删除: 触发器原型 \"%1$s\" 于 \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "被删除: Web 场景 \"%1$s\" 于 \"%2$s\"."
@@ -4107,35 +4161,35 @@ msgstr "被删除: Web 场景 \"%1$s\" 于 \"%2$s\"."
 msgid "Delimiter"
 msgstr "分隔符"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "差量 (简单变化)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "差量 (每秒速率)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "拒绝"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "依赖关系"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "依赖"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "依赖于"
 
@@ -4143,30 +4197,41 @@ msgstr "依赖于"
 msgid "Deployment status"
 msgstr "部署状态"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "描述"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "细节"
 
@@ -4179,71 +4244,71 @@ msgid "Device"
 msgstr "设备"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "设备唯一性准则"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "期间T的最大与最小值的差是 < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "期间T的最大与最小值的差是 = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "期间T的最大与最小值的差是 > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "期间T的最大与最小值的差不是 N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "最末和之前的值的差, 则 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "最末和之前的值的差, 则 N 非 1, 0 - 除外"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "最末和前一个值之前的差异是 < N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "最末和前一个值之前的差异是 = N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "最末和前一个值之前的差异是 > N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "最末和前一个值之前的差异不是 N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4267,48 +4332,44 @@ msgstr "停用所选的群组的调试模式?"
 msgid "Disable host"
 msgstr "停用主机"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "停用主机?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "停用所选的主机群组中的主机?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "停用所选的系统代理程式所监测的主机?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "停用所选的"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "停用所选的WEB方桉?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "停用所选的动作?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "停用所选的应用集?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "停用所选的探索规则?"
 
@@ -4316,11 +4377,11 @@ msgstr "停用所选的探索规则?"
 msgid "Disable selected groups?"
 msgstr "停用所选的群组?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "停用所选的主机?"
 
@@ -4328,42 +4389,47 @@ msgstr "停用所选的主机?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "停用所选的项目?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "停用所选的示警媒介类型?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "停用所选的触发器?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "停用的"
 
@@ -4376,7 +4442,7 @@ msgstr "灾难"
 msgid "Discovered"
 msgstr "已探索到的"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4384,17 +4450,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "已探索到的装置"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "探索"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "由系统代理程式探索"
 
@@ -4402,17 +4468,17 @@ msgstr "由系统代理程式探索"
 msgid "Discovery check"
 msgstr "探索检查"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "探索检查"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "探索清单"
 
@@ -4421,65 +4487,68 @@ msgid "Discovery object"
 msgstr "探索物件"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "探索规则"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "探索规则 \"%1$s\" 已存在于 \"%2$s\", 继承自其它的模板."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "探索规则\"%1$s:%2$s\" 有不正确的存活时间: \"%3$s\". (最小: %4$d, 最大: %5$d, 可用用户巨集)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "探索规则 \"%s\" 已存在."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "探索规则\"%1$s:%2$s\" 有不正确的存活时间: \"%3$s\". (最小: %4$d, 最大: %5$d, 可用用户巨集)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "探索规则已创建"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "探索规则已删除"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "探索规则已更新"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "探索规则"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "探索规则已删除"
 
@@ -4491,7 +4560,7 @@ msgstr "探索状态"
 msgid "Display OK triggers for"
 msgstr "显示OK触发器予"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "显示"
 
@@ -4500,32 +4569,32 @@ msgstr "显示"
 msgid "Displaying %1$s of %2$s found"
 msgstr "显示 已探索的 %2$s中的%1$s"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "多个项目的分佈的值"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "多个期间的分佈的值"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "不要计算"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "您想要替换条件式表示式吗?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "完成"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "点"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "下"
@@ -4535,30 +4604,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "下"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "断线时间"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "拖拉这裡来改变介面类型为 \"IPMI\" 类型."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "拖拉这裡来改变介面类型为 \"JMX\" 类型."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "拖拉这裡来改变介面类型为 \"SNMP\" 类型."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "拖拉这裡来改变介面类型为 \"端点代理程式\" 类型."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "绘图风格"
 
@@ -4576,74 +4645,75 @@ msgstr "下拉的第一个输入项 \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "下拉记住所选的 \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "重复依赖关系在触发器 \"%1$s\" 中."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "重复的主机. 有相同主机名称 \"%s\" 的主机已存于数据中."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "重复的主机. 有相同主机可视名称\"%s\"的主机已存于数据中."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "重複的拓墣图\"%s\"的拓墣图名称."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "重複的严重性名称\"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "重複的用户别名\"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "持续时间"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "持续时间(秒)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "荷兰(nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "动态监控项"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "错误"
 
@@ -4651,13 +4721,13 @@ msgstr "错误"
 msgid "EVENTS"
 msgstr "事件"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "每个URL必须是唯一的. 请确保仅有一个URL为名."
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4665,9 +4735,9 @@ msgstr "每个URL必须是唯一的. 请确保仅有一个URL为名."
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "编辑"
 
@@ -4675,7 +4745,7 @@ msgstr "编辑"
 msgid "Edit map element"
 msgstr "编辑拓墣图组件"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "编辑触发器"
 
@@ -4683,27 +4753,61 @@ msgstr "编辑触发器"
 msgid "Element"
 msgstr "组件"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "组件名称"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "电子邮件"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "空"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "空的动作条件."
 
@@ -4711,76 +4815,98 @@ msgstr "空的动作条件."
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "空的输入参数."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "空的输入."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "HISTORY OF EVENTS"
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "事件历史"
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "空参数"
 
@@ -4789,11 +4915,11 @@ msgstr "空参数"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr "空的回应收到来自于 Zabbix 服务器 \"%1$s\"."
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4801,11 +4927,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "空白时间期间."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "开启"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "启用确认"
 
@@ -4825,11 +4955,11 @@ msgstr "启用事件知悉"
 msgid "Enable host"
 msgstr "启用主机"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "启用主机?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "启用受所选的系统代理程式所监测的主机?"
 
@@ -4842,36 +4972,32 @@ msgstr "启用受所选的系统代理程式所监测的主机?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "启用所选"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "启用所选的WEB方桉?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "启用所选的动作?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "启用所选的应用集"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "启用所选的探索规则?"
 
@@ -4879,11 +5005,11 @@ msgstr "启用所选的探索规则?"
 msgid "Enable selected groups?"
 msgstr "启用所选的群组?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "启用所选的主机?"
 
@@ -4891,64 +5017,68 @@ msgstr "启用所选的主机?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "启用所选的项目?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "启用所选的示警媒介类型?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "启用所选的触发器?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "已启用"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "英语 (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "英语(en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "错误"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "资料表搜寻请求 \"%1$s\"的错误."
@@ -4966,15 +5096,15 @@ msgstr "事件"
 msgid "Event ID"
 msgstr "事件ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "符合正则表示式T的最末纪录项的事件 ID, 则 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "符合正则表示式T的最末纪录项的事件 ID, 则 N 非 1, 0 - 除外"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "事件已知悉"
 
@@ -4983,7 +5113,7 @@ msgstr "事件已知悉"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "事件知悉 \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "事件知悉已停用"
 
@@ -4991,7 +5121,7 @@ msgstr "事件知悉已停用"
 msgid "Event details"
 msgstr "事件细节"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "事件产出"
 
@@ -5011,9 +5141,10 @@ msgstr "事件来源细节"
 msgid "Event type"
 msgstr "只有超级管理员能创建群组"
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "事件"
 
@@ -5021,36 +5152,41 @@ msgstr "事件"
 msgid "Events and alerts"
 msgstr "时间和报警"
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "每日"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "每週"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "千兆兆"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "除外"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "执行"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "执行SQL错误[%1$s]于[%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "执行在"
 
@@ -5058,13 +5194,13 @@ msgstr "执行在"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "已执行的脚本"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "执行确认"
 
@@ -5076,7 +5212,7 @@ msgstr "拓展巨集"
 msgid "Expand single problem"
 msgstr "展开单一问题"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "要求 JSON-rpc版本2.0, 得到\"%s\" ."
@@ -5086,12 +5222,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "过期的"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "爆发的"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "汇出所选的"
 
@@ -5099,22 +5235,22 @@ msgstr "汇出所选的"
 msgid "Export to CSV"
 msgstr "汇出到CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "表示式"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "表示式语法错误."
 
@@ -5122,11 +5258,12 @@ msgstr "表示式语法错误."
 msgid "Expression Variable Elements"
 msgstr "表示式变数组成"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "表示式不能为空白"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "表示式建构子"
 
@@ -5147,17 +5284,17 @@ msgid "External check"
 msgstr "外在检查"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez简讯"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "伪"
 
@@ -5166,16 +5303,17 @@ msgstr "伪"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "失败"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "已失败"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5183,40 +5321,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "失败审计"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "常用的图形"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "常用的拓墣图"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "常用的筛选"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "常用的"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "二月"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "二月"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "栏位"
 
@@ -5260,19 +5398,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "栏位\"druleid\"是所要的."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "栏位\"name\"是所要的."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr "Only super admins can create groups"
 
@@ -5281,13 +5419,13 @@ msgstr "Only super admins can create groups"
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "档桉太大, 最大的上传大小是%1$s位元组."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "档桉用于一个viwq不存在. 试着找\"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5295,68 +5433,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "填满的区域"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "过滤"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "依主机群组过滤"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "依名称过滤"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "查找字符串V的最后 (最近的) 值. N = 1 - 如果发现，0 - 其他"
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "查找字符串V的最后 (最近的) 值. N = 1 - 如果发现，0 - 其他"
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "完成"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "芬兰语 (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "首"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "首"
@@ -5365,8 +5506,8 @@ msgstr "首"
 msgid "Fit to map"
 msgstr "调整至符合拓墣图"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "固定的"
 
@@ -5376,76 +5517,80 @@ msgstr "固定的"
 msgid "Flexible intervals"
 msgstr "弹性区间"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "访客的密码必须为空"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "公式"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "第四"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "法语 (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "週五"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "週五"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "自从"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "前端存取"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "前端存取已更新"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "前端信息中"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "全克隆"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "功能"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5455,50 +5600,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM 调制解调器"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "图形化使用者介面"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "图形化使用者介面存取已停用"
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "一般"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "产生于%s秒"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "德语 (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5506,65 +5651,65 @@ msgid "Get support"
 msgstr "获取支援"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "千兆"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "此表示式不是巨集"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "全域表示式不存在."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "全域脚本"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "全域脚本"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "确认"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "到"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr "转到仪表板"
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "谷歌 Chrome"
 
@@ -5573,66 +5718,73 @@ msgid "Gradient line"
 msgstr "梯度线"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "图形"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "图形\"%1$s\"已存在于\"%2$s\"中 (继承自其它的模板)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "图形\"%1$s\"已存在于\"%2$s\"中 (项目不一致)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "图形\"%1$s\"已存在于\"%2$s\"中."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "图形\"%1$s\"不能继承. \"%2$s\"中并无所要的项目 (Ymax值项目)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "图形\"%1$s\"不能继承. \"%2$s\"中并无所要的项目 (Ymin值项目)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "图形\"%1$s\"不能继承. \"%2$s\"中并无所要的项目."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "图形 \"%1$s\"不存在于模板\"%2$s\"中."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "略过图形\"%1$s\"-用户规则."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "含模板项目的图形\"%1$s\"不能包含其它主机的项目."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "图形已添加"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "图形已删除"
 
@@ -5644,54 +5796,59 @@ msgstr "图形组件"
 msgid "Graph item"
 msgstr "图形项目"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "图形名称"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr "图标原型"
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "含模板项目的图形原型\"%1$s\"不能包含其它主机的项目."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "图形原型\"%s\"已删除."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "图形原型"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5703,49 +5860,51 @@ msgstr "图形原型的"
 msgid "Graph sum"
 msgstr "图形总合"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "图形类别"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "图形已更新"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "图表名称 \"%1$s\" 已经存在在图表或者图表原型."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "同名但不同类型的图形已存在."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "图形"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "图形已複製"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "图形已删除"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "希腊(el_GR)"
 
@@ -5754,54 +5913,57 @@ msgstr "希腊(el_GR)"
 msgid "Grid"
 msgstr "网格"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "群组"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "群组 \"%1$s\" 不存在."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "主机 \"%2$s\" 的群组 \"%1$s\" 不存在."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "群组已添加"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "群组已删除"
+msgid_plural "Groups deleted"
+msgstr[0] "群组已删除"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5812,41 +5974,43 @@ msgstr "探索到的主机的群组"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "组名"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
 # msgid "map"
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "群组已更新"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "群组化之于"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "群组"
 
@@ -5854,22 +6018,13 @@ msgstr "群组"
 msgid "Groups in maintenance"
 msgstr "群组在维护中"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5886,7 +6041,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "主机资产记录概览"
 
@@ -5904,7 +6059,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP认证"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr "HTTP 代理"
 
@@ -5925,12 +6081,17 @@ msgstr "硬件"
 msgid "Hardware (Full details)"
 msgstr "硬体(全细节)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "高"
@@ -5943,15 +6104,15 @@ msgstr "帮助"
 msgid "Hexadecimal"
 msgstr "十六进位数字"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "隐藏"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "隐藏所有"
 
@@ -5967,15 +6128,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "隐藏失效的触发器"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "隐藏所选的"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr "隐藏所选的组"
 
@@ -5984,23 +6145,23 @@ msgstr "隐藏所选的组"
 msgid "High"
 msgstr "严重"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "历史记录"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "历史已清除"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "历史清除可能会很久?继续吗?"
 
@@ -6021,78 +6182,78 @@ msgstr "事件的历史"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "横向"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "横向对齐"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "主机"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "主机 \"%1$s\" 已存在."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "主机\"%1$s\"是以系统代理程式\"%2$s\"来监控的."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "主机 \"%s\" 有 \"useipmi\" 参数已检验,  但是没有 \"ipmi_ip\" 参数! 使用主机IP位址为IPMI介面的位址."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "主机(升幂)"
 
@@ -6104,64 +6265,66 @@ msgstr "主机IP地址"
 msgid "Host access"
 msgstr "主机存取"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "已添加主机"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "主机不能有超过一个同类型的预设介面."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "主机计数"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "主机已删除"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "主机群组"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "主机群组 \"%1$s\" 已存在."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "主机群组“%1$s”不能被删除，因为它被用于全局脚本"
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr "主机群组“%1$s”不能被删除，因为多主机属于其中"
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr "主机群组 \"%1$s\" 为内建的且不能被删除"
@@ -6178,14 +6341,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "主机群组标示类型"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr "主机群组名不能是空的"
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "主机群组"
 
@@ -6195,8 +6359,8 @@ msgstr "主机群组"
 msgid "Host interface"
 msgstr "主机介面"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "主机资产记录"
 
@@ -6212,7 +6376,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "主机标示类型"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "主机清单"
 
@@ -6221,18 +6385,18 @@ msgid "Host metadata"
 msgstr "主机元数据"
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "主机名称"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6241,70 +6405,70 @@ msgstr ""
 msgid "Host networks"
 msgstr "主机网路"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6316,7 +6480,7 @@ msgstr ""
 msgid "Host router"
 msgstr "主机路由"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "主机筛选"
 
@@ -6328,51 +6492,52 @@ msgstr "主机状态"
 msgid "Host subnet mask"
 msgstr "主机子网路遮罩"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "主机时间"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "主机更新失败."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "主机已更新"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "名称同样为 \"%s\" 的主机已存在."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "可视名称同样为 \"%s\" 的主机已存在."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "主机"
 
@@ -6380,11 +6545,11 @@ msgstr "主机"
 msgid "Hosts & Groups"
 msgstr "主机&群组"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "主机 (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "主机/模板"
 
@@ -6396,37 +6561,38 @@ msgstr "主机在于"
 msgid "Hosts in maintenance"
 msgstr "维修中主机"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "主机资讯"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "主机位置"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "主机已更新"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "每小时"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "时"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "匈牙利(hu_HU)"
 
@@ -6444,22 +6610,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP地址"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6467,26 +6633,26 @@ msgstr "IP地址"
 msgid "IP address"
 msgstr "IP地址"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "主机介面的IP和DNS不能是空白."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP范围"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "IP范围不能为空白."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6494,22 +6660,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI端点代理程式"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI认证演算法"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "IPMI介面"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI密码"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI优先层级"
 
@@ -6519,7 +6685,7 @@ msgstr "IPMI优先层级"
 msgid "IPMI sensor"
 msgstr "IPMI感应器"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI用户名"
 
@@ -6552,7 +6718,7 @@ msgstr "IT服务相依关係"
 msgid "IT service parent"
 msgstr "IT服务上层"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6568,25 +6734,25 @@ msgid "ITEMS"
 msgstr "项目"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "图示"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "图示(预设)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "图示(停用的)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "图示(维修)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "图示(问题)"
 
@@ -6607,42 +6773,44 @@ msgstr "图示标示类型"
 msgid "Icon map"
 msgstr "图示对应"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "图示对应\"%1$s\"无法被删除. 已用于对应\"%2$s\"中."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "图示对应\"%1$s\"已以不正确的iconid\"%2$s\"对应."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "图示对应\"%1$s\"已以不正确的资产纪录连结\"%2$s\"对应."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "图示对应\"%s\"已存在."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "图示对应\"%s\"无法以空白的表示式对应."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "图示对应\"%s\"无法以不存在的全域表示式对应."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "图示对应\"%s\"含有不正确的表示式."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "图示对应\"%s\"必须至少有一个对应."
@@ -6655,7 +6823,8 @@ msgstr "图示对应已创建"
 msgid "Icon map deleted"
 msgstr "图示对应已删除"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "图示对应名称不能是空白."
 
@@ -6663,29 +6832,29 @@ msgstr "图示对应名称不能是空白."
 msgid "Icon map updated"
 msgstr "图示对应已更新"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "有iconmapid \"%s\"的图示对应不存在."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "图示对应"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "图示对应输入项 \"%1$s\"相对于\"%2$s\"已存在."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "图示对应并未启用"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "图示"
 
@@ -6693,21 +6862,23 @@ msgstr "图示"
 msgid "Identical expression already exists"
 msgstr "相同的表达式已经存在"
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "假如您认为这个信息是错的, 请谘询您的管理者关于如何取得需要的许可权."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "图片"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "图片\"%1$s\"已经存在"
@@ -6716,7 +6887,7 @@ msgstr "图片\"%1$s\"已经存在"
 msgid "Image added"
 msgstr "图片已添加"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "图片已删除"
 
@@ -6724,12 +6895,13 @@ msgstr "图片已删除"
 msgid "Image label type"
 msgstr "图片标示类型"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr "图片加载错误[%1$s] in [%2$s]"
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr "图片尺寸必须小于1MB"
 
@@ -6738,66 +6910,66 @@ msgid "Image updated"
 msgstr "图片已更新"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "图片"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "所有拓墣图都将被更新!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "立即地"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "汇入"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "汇入失败"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "汇入文件"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "已成功汇入"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "不可能以不存在的资产纪录栏位\"%s\"来过滤."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "不可能移除最后的行和列."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "在...之中"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "在...群组之中"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "在...群组之中"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6810,244 +6982,282 @@ msgstr "维修中"
 msgid "In progress"
 msgstr "作业中"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "包含"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "不正确的相依性\"soft\"栏位值予服务\"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "不正确的%1$s标示类型值予拓墣图\"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "不正确的IP区域\"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "不正确的SNMP OID"
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "不正确的SNMP community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "不正确的可接受SLA予服务\"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "不正确的动作条件探索检查."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "不正确的动作条件探索检查. 探索检查不存在或您没有存取权."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr "不正确的动作条件探索对象."
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "不正确的动作条件探索规则. 探索规则不存在或您不能访问它."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "不正确的动作条件探索状态."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr "不正确的动作条件时间类型."
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "不正确的动作条件主机群组. 主机群组不存在或您不能访问它."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "不正确的动作条件主机. 主机不存在或您不能访问它."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr "不正确的动作条件ip \"%1$s\"."
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr "不正确的动作条件操作符."
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr "不正确的动作条件端口\"%1$s\"."
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "不正确的动作条件系统代理程式. 系统代理程式不存在或您没有存取权."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "不正确的动作条件模板. 模板不存在或您没有存取权."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr "不正确的操作条件触发器示警度."
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr "不正确的操作条件触发器值."
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "不正确的动作条件触发器. 触发器不存在或您没有存取权."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "不正确的动作条件类型."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "不正确的动作条件ID"
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr "不正确的动作条件对于动作\"%1$s\"."
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "不正确的动作操作命令类型."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "不正确的动作操作条件知悉类型."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "不正确的动作操作条件类型."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "不正确的动作操作升级步骤值."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "不正确的动作操作主机群组. 主机群组不存在或您没有存取权."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "不正确的动作操作主机. 主机不存在或您没有存取权."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "不正确的动作操作埠\"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "不正确的动作操作步骤停留时间."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "不正确的动作操作类型."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "不正确的动作操作用户群组. 用户群组不存在或您没有存取权."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "不正确的动作操作用户. 用户不存在或您没有存取权."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "不正确的动作操作ID."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "不正确的服务\"%1$s\"的演算法."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "不正确的自变数传入方程式"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "不正确的自变数传给方程式"
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "不正确的自变数传给方法."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr "不正确的身份验证协议对于发现规则\"%1$s\"."
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr "不正确的身份验证协议监控项\"%1$s\"."
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "不正确的计算SLA值予服务\"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "不正确的字元用于主机名称\"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr "不正确的字符用于代理名\"%1$s\"."
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "不正确的延迟."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7057,11 +7267,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr "错误的事件对象 \"%1$s\" (%2$s)对于事件源\"%3$s\" (%4$s),只有以下对象的支持:%5$s."
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr "错误的事件对象值."
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr "错误的事件源值."
 
@@ -7070,11 +7280,11 @@ msgstr "错误的事件源值."
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "不正确的栏位名称\"%1$s\"或用于资料表\"%2$s\"的where陈述式的值."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr "不正确的sysmap字段."
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "不正确的触发器栏位."
 
@@ -7082,74 +7292,100 @@ msgstr "不正确的触发器栏位."
 msgid "Incorrect file upload."
 msgstr "不正确的档桉上传."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "不正确的弹性间隔\"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "在项目\"%1$s\"中不正确的弹性间隔. 弹性间隔必须是一个字串."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "使用了不正确的方程式"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "不正确的主机群组."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7157,182 +7393,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr "不正确的图片索引"
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "给予了不正确的介面DNS参数\"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "给予了不正确的介面IP参数\"%s\"."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "给予了不正确的介面埠参数\"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "不正确的资产纪录栏位\"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "不正确的项目予轴值."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "提供不正确的项目键值\"%1$s\"给\"%2$s\"上的触发器表示式."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr "提供不正确的项目值类型\"%1$s\"给触发器函数\"%2$s\"."
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "不正确的键值."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "不正确的项目清单"
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "不正确的维修-日期必须在1970.01.01和2038.01.18之间"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "不正确的维修日期"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "不正确的维修日期间 "
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "不正确的週维修日数"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "不正确的维修月期间"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "不正确的维修期间 "
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "不正确的维修期间(至少要5分钟)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "不正确的维修週期间"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "予拓墣图\"%s\"不正确的拓墣图高度."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "予拓墣图\"%s\"不正确的拓墣图宽度."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr "错误的对象值."
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr "不正确的参数对于动作\"%1$s\"."
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "不正确的操作参数."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "用了不正确的参数于图示对应\"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "不正确的条件参数."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "不正确的图示对应更新方法\"%s\"参数."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "予维修不正确的参数."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "予主机群组不正确的参数."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "予服务\"%1$s\"的不正确上层"
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "不正确的上层服务."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "不正确的埠范围."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr "错误的隐私协议对于发现规则\"%1$s\"."
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr "错误的隐私协议对于监控项\"%1$s\"."
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "不正确的系统代理ID."
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "提供了不正确的资源类型给筛选项目."
 
@@ -7341,64 +7596,68 @@ msgstr "提供了不正确的资源类型给筛选项目."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "收到了来自于zabbix服务器\"%1$s\"的错误应答."
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "用于简报片展示的不正确筛选."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "不正确的服务终止时间."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "不正确的服务开始时间."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "不正确的服务时间类型."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "予服务\"%1$s\"不正确的排序次序."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr "错误的源值."
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "予服务\"%1$s\"不正确的状态."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "不正确的状态."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7419,52 +7678,57 @@ msgstr "不正确的时间期间\"%1$s\" 开始时间必须早于或等于终止
 msgid "Incorrect time period \"%1$s\"."
 msgstr "不正确的时间期间\"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "不正确的触发器ID予服务\"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "不正确的触发器表示式"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "不正确的触发器表示式."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "不正确的触发器表示式. 主机 \"%1$s\"不存在或您不能存取此主机."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "不正确的触发器表示式. 主机 \"%s\"不存在或您不能存取此主机."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "不正确的触发器表示式. 触发器表示式组件不该同时属于一个模板和一个主机."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "用了不正确的触发器方程式\"%1$s\"于表示式中."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "不正确的asort_by_key类型."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "不正确的用户群组."
 
@@ -7473,7 +7737,8 @@ msgstr "不正确的用户群组."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7493,7 +7758,7 @@ msgstr "不正确的值\"%1$s\"于整数栏位\"%2$s\"中."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "不正确的值\"%1$s\"于无正负整数栏位\"%2$s\"中."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7503,43 +7768,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "不正确的值于setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr "不正确的值用于代理服务器状态 \"%1$s\"."
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "不正确的工作时间."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "图形\"%1$s\"的不正确y max项目."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "图形\"%1$s\"的不正确y min项目."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "印度尼西亚 (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "资讯"
 
@@ -7548,15 +7819,15 @@ msgstr "资讯"
 msgid "Information"
 msgstr "资讯"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "插入"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "插入巨集"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "安装"
 
@@ -7564,31 +7835,32 @@ msgstr "安装"
 msgid "Installer name"
 msgstr "安装名称"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "介面"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "介面是连结到\"%2$s\"上的项目\"%1$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "介面是用于要求这类型介面的项目."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "DNS为\"%1$s\"的介面不能有空白的IP位址."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr " 当\"%2$s\"上有 \"Use DNS\"属性, IP为\"%1$s\"的介面不能有空白的DNS名称."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "IP为\"%1$s\"的介面不能有空白的DNS名称."
@@ -7608,7 +7880,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "内部的JSON-RPC错误."
 
@@ -7616,7 +7888,7 @@ msgstr "内部的JSON-RPC错误."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "内部的错误."
 
@@ -7629,19 +7901,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "IE浏览器"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "间隔"
 
@@ -7651,112 +7923,114 @@ msgstr "间隔"
 msgid "Interval (in sec)"
 msgstr "间隔(秒计)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "无效的JSON. 当解析JSON文字时, 在伺服器端发生了一个错误."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "无效的请求."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr "无效日期\"%s\"."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr "第一个参数无效."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr "第四个参数无效."
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "无效的主机ID予巨集 \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr "无效的维护周期."
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "无效的方法参数."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr "无效的参数个数."
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "无效的参数."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "无效的回应编码 \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "无效的回应编码范围 \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr "第二个参数无效."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr "第三个参数无效."
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "无效的时间期间"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "所给的\"%s\"为无效的检视名称.  可用的: \"a-z\" 和 \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "资产记录"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7765,7 +8039,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "资产纪录栏位"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "资产纪录模式"
 
@@ -7773,12 +8047,12 @@ msgstr "资产纪录模式"
 msgid "Is online?"
 msgstr "是否在线?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "议题"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "以用户密码过滤是不可能的."
 
@@ -7786,70 +8060,71 @@ msgstr "以用户密码过滤是不可能的."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "不可能于HTTP认证中登出."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "以用户密码寻找是不可能的."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "意大利语 (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "项目"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "键值为 \"%1$s\"的项目已存在于 \"%2$s\", 继承自其他模板."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr "项目\"%1$s\"已经存在于\"%2$s\"."
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "项目\"%1$s\"不能填入一个不存在的主机资产纪录栏位号码\"%2$d\". 选择为: 从0(不填入)到%3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "项目\"%1$s\"不存在于模板\"%2$s\"中."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "项目 \"%1$s\"不存在."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "\"%2$s\"上的项目\"%1$s\" : 应用集\"%3$s\"不存在."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "略过项目\"%1$s\"-用户规则."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "项目\"%1$s:%2$s\"有无效的埠: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "项目已添加"
 
@@ -7857,16 +8132,16 @@ msgstr "项目已添加"
 msgid "Item count"
 msgstr "项目数量"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "项目已删除"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7879,54 +8154,54 @@ msgstr "项目在“正常”状态"
 msgid "Item in \"not supported\" state"
 msgstr "项目在“不支持”的状态"
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "项目原型"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "项目原型\"%1$s\"已经存在于\"%2$s\",继承自其它的模板."
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "项目原型"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7934,92 +8209,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "项目原型之于"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "项目已更新"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "项目使用来自非上层主机的主机介面."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "项目使用不正确的介面类型."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "项目将不会被刷新. 请输入正确的更新区间."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "键值为 \"%1$s\"的项目已存在于\"%2$s\" 为探索规则."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "键值为 \"%1$s\"的项目已存在于\"%2$s\" 为创建自项目原型的项目."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "键值为 \"%1$s\"的项目已存在于\"%2$s\" 为项目原型."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "键值为 \"%1$s\"的项目已存在于\"%2$s\" 为项目."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "键值为 \"%1$s\"的项目已存在于\"%2$s\" 为未知的项目组件."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "键值为 \"%1$s\"的项目已存在于\"%2$s\" ."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr "键值为\"%1$s\"的项目已经存在."
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "项目"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "项目 (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "项目已複製"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "项目已删除"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "项目清单"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "监控项已更新"
 
@@ -8031,72 +8306,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX 端点代理程式"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX介面"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "JSON-rpc 错误产生失败. 无此错误 \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpc 方法尚未定义."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpc 参数不是一个阵列."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "JSON-rpc 版本并未指定."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber 标识符"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "一月"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "一月"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "日语 (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "七月"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "七月"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "六月"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "六月"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8105,40 +8380,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "保留失去的资源期间(日记)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "键值"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "键值\"%1$s\"不符 <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "键值通行短语"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "关键字"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "韩语 (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "最新数据"
 
@@ -8169,37 +8444,37 @@ msgstr "LDAP登入成功"
 msgid "LDAP login was not successful"
 msgstr "LDAP登入并不成功"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "失去"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "标示"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "标示位置"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "语言"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "末"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "末"
@@ -8210,19 +8485,19 @@ msgid "Last %1$d issue"
 msgid_plural "Last %1$d issues"
 msgstr[0] "最近%1$d个议题"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "最末(最近) T值是 < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "最末(最近) T值是 = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "最末(最近) T值是 > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "最末(最近) T值不是 N"
 
@@ -8242,28 +8517,28 @@ msgstr "最近365天"
 msgid "Last 7 days"
 msgstr "最近7天"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "上次修改于"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "最后改变(降幂)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "最近检查记录"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "最近一小时"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "上月图形"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "最后一个"
 
@@ -8271,66 +8546,67 @@ msgstr "最后一个"
 msgid "Last seen (age)"
 msgstr "最近出现(历时)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "最新数据"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "仩週图形"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "最新数据"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "最新报警"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "拉脱维亚语(lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "左侧"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "图例"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "于多字元中最末(最近) T值的长度是 < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "于多字元中最末(最近) T值的长度是 = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "于多字元中最末(最近) T值的长度是 > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "于多字元中最末(最近) T值的长度不是 N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "线"
 
@@ -8338,39 +8614,29 @@ msgstr "线"
 msgid "Link"
 msgstr "连结"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "连结指示器"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "拓墣图\"%s\"的连结名称必须是唯一的."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr "链接新模板"
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "连结栏位selementid1是为拓墣图\"%2$s\"指向不存在的拓墣图 selement ID \"%1$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "连结栏位selementid2是为拓墣图\"%2$s\"指向不存在的拓墣图 selement ID \"%1$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "于拓墣图\"%s\"的连结应都有 \"name\"和\"url\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "模板连结"
 
@@ -8382,50 +8648,50 @@ msgstr "与模板关联"
 msgid "Link to templates"
 msgstr "连结到模板"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "与模板连结"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "连结的模板"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "已连结到"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "所选组件之间的连结"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "所选组件的连结"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "清单是空的"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr "立陶宛 (lt_LT)"
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "载入中..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "当地时间"
 
@@ -8442,36 +8708,36 @@ msgid "Location longitude"
 msgstr "位置经度"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "日志"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "最末日志项的日志严重性是 < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "最末日志项的日志严重性是 = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "最末日志项的日志严重性是 > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "最末日志项的日志严重性不是 N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "最末符合参数T的日志项的日志来源, 则 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "最末符合参数T的日志项的日志来源, 则 N 非 1, 0 - 除外"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "日志时间格式"
@@ -8480,12 +8746,12 @@ msgstr "日志时间格式"
 msgid "Log unmatched SNMP traps"
 msgstr "日志与SNMP捉捕器不符"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "登入为"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8496,12 +8762,12 @@ msgstr "登入"
 msgid "Login as Guest"
 msgstr "登入为访客"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "登入失败\"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8510,8 +8776,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "登入名称或密码是不正确的."
 
@@ -8532,22 +8799,18 @@ msgstr "低级发现规则在“正常”状态"
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr "低级发现规则在“不支持”状态"
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8559,7 +8822,7 @@ msgstr "Mac位址A"
 msgid "MAC address B"
 msgstr "Mac位址B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "维修"
 
@@ -8584,49 +8847,49 @@ msgstr "最繁忙的100条触发器"
 msgid "Macro"
 msgstr "巨集"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "巨集\"%1$s\"已存在于\"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "巨集\"%1$s\"已存在."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "巨集\"%1$s\"并非唯一."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "巨集\"%1$s\"的值太长, 不应超过255字元."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "巨集\"%1$s\"的值太长, 不应超过64字元."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "含globalmacroid  \"%1$s\"的巨集不存在."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "有主机巨集识别码\"%1$s\"的巨集不存在."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "巨集"
 
@@ -8634,31 +8897,36 @@ msgstr "巨集"
 msgid "Macros updated"
 msgstr "巨集已更新"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "维修"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "维修\"%s\"已存在."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "维修期间\"Active since\"值不能晚于 \"Active till\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr "维护动作条件值必须为空."
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "维修已添加"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "维修已删除"
 
@@ -8666,7 +8934,7 @@ msgstr "维修已删除"
 msgid "Maintenance period"
 msgstr "维护周期"
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "维修期间长度"
 
@@ -8682,25 +8950,25 @@ msgstr "维修状态"
 msgid "Maintenance type"
 msgstr "维修类型"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "维修已更新"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "维修并含资料蒐集"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "维修不含资料蒐集"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "维修参数不存在."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "手动的"
 
@@ -8711,12 +8979,12 @@ msgstr "手动登出"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "拓墣图"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "略过拓墣图\"%1$s\"-用户规则."
@@ -8726,12 +8994,12 @@ msgstr "略过拓墣图\"%1$s\"-用户规则."
 msgid "Map \"%s\""
 msgstr "拓墣图\"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "拓墣图\"%s\"已创建."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "拓墣图\"%s\"已更新."
@@ -8748,12 +9016,12 @@ msgstr "拓朴图标示类型"
 msgid "Map save operation failed."
 msgstr "拓墣图储存动作失败"
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr "名为\"%s\"的地图已经存在."
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "对应到"
 
@@ -8763,23 +9031,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "对应值\"%1$s\"并非唯一."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "对应"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "拓墣图"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "三月"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "三月"
 
@@ -8787,28 +9055,34 @@ msgstr "三月"
 msgid "Mark elements on trigger status change"
 msgstr "触发器状态上的标记组件改变"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "标记其他"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "标记所选"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr "掩码"
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "批量更新"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "大量更新组件"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "表格位中最多可展示的的组件数量."
@@ -8822,29 +9096,11 @@ msgstr "表格位\"%1$s\"中最多可展示的的组件数量."
 msgid "Max count of events per trigger to show"
 msgstr "可展示的每触发器最多事件计数"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "最大化"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8852,103 +9108,98 @@ msgid "Maximum number of flexible intervals added"
 msgstr "添加了最大的弹性区间数量"
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr "周期T的最大值是 < N"
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr "周期T的最大值是 = N"
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr "周期T的最大值是 > N"
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr "周期T的最大值不是N"
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "五月"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "五月"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "示警媒介"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "示警媒介类型"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "示警媒介类型\"%s\"已存在."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "示警媒介类型已添加"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "示警媒介类型已删除"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "示警媒介类型已停用"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "示警媒介类型已启用"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "示警媒介类型已更新"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "示警媒介类型"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "示警媒介类型用于动作\"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -8963,14 +9214,14 @@ msgid "Memory limit: %s"
 msgstr "记忆体限制: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "选单"
 
@@ -8980,7 +9231,7 @@ msgstr "选单"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "信息"
 
@@ -8988,66 +9239,66 @@ msgstr "信息"
 msgid "Message actions"
 msgstr "信息动作"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "信息文字限制"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "信息逾时"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "信息逾时(秒)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "信息"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "信息中"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "未发现方法."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "居中"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "最小化"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9056,79 +9307,76 @@ msgstr ""
 msgid "Minimum severity"
 msgstr "最小的严重级别"
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr "最小的触发器严重级别"
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr "周期T的最小值是 < N"
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr "周期T的最小值是 = N"
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr "周期T的最小值是 > N"
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr "周期T的最小值不是N"
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "分"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr "缺少了\"%1$s\" 字段对于动作条件"
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "缺少项目的\"itemid\"栏位"
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "缺少图形的\"名称\"栏位"
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "主机 \"%2$s\"缺少了项目\"%1$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "缺少图形\"%1$s\"的项目."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr "缺少图原型项\"%1$s\"."
@@ -9138,7 +9386,7 @@ msgstr "缺少图原型项\"%1$s\"."
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "缺少主机\"%2$s\"的键值 \"%1$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "缺少参数: usrgrpids."
 
@@ -9150,18 +9398,18 @@ msgstr "节点"
 msgid "Model"
 msgstr "模型"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "一"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "週一"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "由系统代理程式监测"
 
@@ -9169,33 +9417,33 @@ msgstr "由系统代理程式监测"
 msgid "Monitored host"
 msgstr "已监测的主机"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "监测中"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "月"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "每月"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr "更多匹配发现..."
 
@@ -9203,7 +9451,7 @@ msgstr "更多匹配发现..."
 msgid "More than 10 minutes"
 msgstr "10分钟以上"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "于主机中多于一个名为\"%1$s\"的图形."
@@ -9212,19 +9460,19 @@ msgstr "于主机中多于一个名为\"%1$s\"的图形."
 msgid "Most busy triggers top 100"
 msgstr "最繁忙的100条触发器"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "多重问题事件"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "多重问题事件产生"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "静音"
 
@@ -9237,60 +9485,58 @@ msgstr "网络结构"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "无资料"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM认证"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9301,26 +9547,32 @@ msgstr "NTLM认证"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "名称"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9339,12 +9591,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9352,7 +9604,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "网路拓墣图已添加"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "网路拓墣图已删除"
 
@@ -9364,7 +9616,7 @@ msgstr "网路拓墣图已添加"
 msgid "Network maps"
 msgstr "网络结拓墣图"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "从未"
 
@@ -9372,24 +9624,24 @@ msgstr "从未"
 msgid "Never executed"
 msgstr "从未执行过"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "新的"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "新的应用集"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "新的触发条件"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "新的组件"
 
@@ -9400,16 +9652,16 @@ msgstr "新的组件"
 msgid "New flexible interval"
 msgstr "新的弹性区间"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "新的群组"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "新的主机群组"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "此图形的新项目"
 
@@ -9417,83 +9669,99 @@ msgstr "此图形的新项目"
 msgid "New media"
 msgstr "新的示警媒介"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "新的正规表示式"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "新的服务时间"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "下一步"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "次"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "不"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr "没有\"%1$s\"给予图原型."
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr "没有\"%1$s\"给予图."
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "图形 \"%s\"并无栏位 \"ymax_type\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "图形 \"%s\"并无栏位 \"ymin_type\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9501,25 +9769,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "没有提供URL给筛选组件"
 
@@ -9545,8 +9813,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "没有发现动作"
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9556,7 +9824,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "没有ID为\"%1$s\"的应用集."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9564,30 +9832,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "没有指定给动作操作命令\"%s\"的认证类型."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "没有指定给动作操作命令\"%s\"的认证用户名称."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "没有指定的认证用户名称"
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "没有指定给动作操作的命令."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "没有指定给动作操作的命令类型."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "没有已定义的条件."
 
@@ -9596,27 +9865,27 @@ msgstr "没有已定义的条件."
 msgid "No data collection"
 msgstr "没有数据收集"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr "在周期T期间没有接受到数据，然后N = 1，0 - 其他"
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr "在周期T期间没有接受到数据，然后N 不是 1，0 - 其他"
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "\"%2$s\"上之\"%1$s\"类型无预设介面."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "没有已定义的相依关係."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "没有细节"
 
@@ -9624,39 +9893,39 @@ msgstr "没有细节"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "没有所称的探索规则ID"
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "没有找到错误."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "没有事件"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "没有事件可知悉"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "没有指定给动作操作命令\"%s\"的执行目标."
@@ -9671,7 +9940,7 @@ msgstr "没有档桉上载."
 msgid "No flexible intervals defined."
 msgstr "并无定义的的弹性区间"
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "没有提供图形ID给筛选组件."
 
@@ -9680,7 +9949,11 @@ msgstr "没有提供图形ID给筛选组件."
 msgid "No graph item with graphid \"%s\"."
 msgstr "没有图形ID\"%s\"的图形项目."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9689,48 +9962,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "没有群组的主机 \"%s\"."
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "没有主机群组"
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "没有所知的主机IDs"
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "没有所知的巨集\"%1$s\"的主机."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "没有提供主机群组给筛选组件"
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9743,17 +10017,22 @@ msgstr "没有含群组ID\"%s\"的主机群组."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "没有含主机ID\"%s\"的主机."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "没有对应组件\"%s\"的图示."
@@ -9772,33 +10051,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "没有找到介面"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "没有找到介面."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr "没有接口提供了代理\"%s\"."
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "没有主机\"%s\"的介面."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "没有提供项目给筛选组件."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9817,7 +10103,7 @@ msgid "No items defined."
 msgstr "没有已定义的项目."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9833,7 +10119,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "没有提供拓墣图ID给筛选组件."
 
@@ -9842,15 +10128,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr "没有找到匹配"
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9862,133 +10148,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "不具图形 \"%1$s\"的许可权."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "不具主机 \"%1$s\"的许可权."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "无项目\"%s\"的许可权"
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "没有模板\"%s\"的许可权"
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "不具触发器 \"%s\"的许可权."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "没有许可权"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "不具群组 \"%1$s\"的许可权."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "不具拓墣图\"%1$s\"的许可权."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "不具筛选 \"%1$s\"的许可权."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "没有系统存取的许可权"
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "没有所说的物件的许可权或其不存在!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "没有指定给动作操作命令\"%s\"的私有金钥."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "没有指定的私有金钥."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "没有系统代理程式"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "没有指定给动作操作命令\"%s\"的公开金钥档."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "没有指定的公开金钥档"
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "没有动作操作信息的收受者."
 
@@ -9996,7 +10327,7 @@ msgstr "没有动作操作信息的收受者."
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "没有提供筛选ID给筛选组件."
 
@@ -10004,82 +10335,83 @@ msgstr "没有提供筛选ID给筛选组件."
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "没有指定给动作操作命令的脚本."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr "没有状态代理."
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "没有选择目标"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "没有已选的目标"
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "没有已定义的时间. 工作24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "没有触发器"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "没有含触发器ID\"%1$s\"的触发器."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "没有已定义的触发器."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "每有找到触发器."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10088,57 +10420,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "没有发现有值"
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "无"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "正常"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "正常检视"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "非知悉"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "非模板项目"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "并非所有的模板都连结到\"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "不允许设定用户\"guest\"的密码."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "不可用"
 
@@ -10147,7 +10480,7 @@ msgstr "不可用"
 msgid "Not classified"
 msgstr "未分类"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "未连接"
 
@@ -10160,8 +10493,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "不支持的"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "备注"
@@ -10174,7 +10507,7 @@ msgstr "备注"
 msgid "Nothing"
 msgstr "空无"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "无事需做"
 
@@ -10182,87 +10515,87 @@ msgstr "无事需做"
 msgid "Notification report"
 msgstr "警报汇总"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "警报"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "十一"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "十一月"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "现在"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "自Epoch起的秒数是 < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "自Epoch起的秒数是 = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "自Epoch起的秒数是 > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "自Epoch起的秒数不是 N"
 
@@ -10270,88 +10603,88 @@ msgstr "自Epoch起的秒数不是 N"
 msgid "Number of status changes"
 msgstr "状态改变次数"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Number of steps"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr "成功检索到的值V的数量 (满足操作者O)对于周期T是 < N"
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr "成功检索到的值V的数量 (满足操作者O) 对于周期T是 = N"
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr "成功检索到的值V的数量 (满足操作者O) 对于周期T是 > N"
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr "成功检索到的值V的数量 (满足操作者O)对于周期T不是N"
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "用户数(线上)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "数字的 (浮点)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "数字的(64位元整数)"
 
@@ -10366,16 +10699,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "正常"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr "正常或没有触发"
 
@@ -10391,8 +10726,7 @@ msgstr "OOP路由器"
 msgid "OOB subnet mask"
 msgstr "OOB子网遮罩"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "OR"
 
@@ -10412,11 +10746,12 @@ msgstr "作业系统( 简)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "其它组态参数"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "概览"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "十月"
 
@@ -10424,25 +10759,25 @@ msgstr "十月"
 msgid "Octal"
 msgstr "八进位"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "十月"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "关"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "正常"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "开"
 
@@ -10450,111 +10785,114 @@ msgstr "开"
 msgid "On status change triggers blink for"
 msgstr "于状态改变时, 触发器因此闪烁于"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "一次"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr "其中的一个对象被留下没有主机组."
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "一次性"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr " 单次停机"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "只有超级管理员可以创建全域巨集."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "只有超级管理员可以创建主机群组."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "只有超级管理员可以创建图示对应."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "只有超级管理员可以创建示警媒介类型."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "只有超级管理员可以删除全域巨集."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "只有超级管理员可以删除示警媒介类型."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "只有超级管理员可以删除用户群组."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "只有超级管理员可以编辑示警媒介类型."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "只有超级管理员可以更新全域巨集."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "只有超级管理员可以更新图示对应."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "只有超级管理员可以添加用户示警媒介."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "只有超级管理员可以用改变户示警媒介."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "只有超级管理员可以移除用户示警媒介."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "仅能使用字元."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "只计算指派给启用的主机的项目"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "只能一个检查可为唯一."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "每次仅有一个用户群组可以被改变."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "只可显示最近的20%%的指示灯号."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr "只有触发器时间能被告知."
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "只计算指派给启用的主机的和相依于启用的项目的触发器"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "操作\"%s\"已存在."
@@ -10563,28 +10901,28 @@ msgstr "操作\"%s\"已存在."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "由于未认证的请求, 操作无法完成."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "操作的条件"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "操作细节"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "操作并无群组来操作."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "操作并无模板来操作."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "操作类型"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "操作"
@@ -10593,25 +10931,27 @@ msgstr "操作"
 msgid "Operator"
 msgstr "操作者"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10641,24 +10981,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "原始的"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "原始的蓝色"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "其他"
 
@@ -10666,19 +11006,19 @@ msgstr "其他"
 msgid "Other configuration parameters"
 msgstr "其它组态参数"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "其它群组"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "其它主机"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10688,21 +11028,21 @@ msgstr "其它主机 | 群组"
 msgid "Other parameters"
 msgstr "其他参数"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "其它 | 群组"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "其它"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "覆盖被"
@@ -10715,14 +11055,11 @@ msgstr "覆盖监控项历史期间"
 msgid "Override item trend period"
 msgstr "覆盖监控项趋势期间"
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "总览"
 
@@ -10730,7 +11067,7 @@ msgstr "总览"
 msgid "Overview by proxy"
 msgstr "依系统代理程式概览"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10739,147 +11076,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "个人仪表板"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHP支持的资料库"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "支援PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "支援PHP gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "支援PHP gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP选项max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP选项max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP选项memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP选项post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP选项upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP连线期自动启动"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP时区"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP版本"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10888,32 +11233,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "问题"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "页面接收到不正确的资料"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palette"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palette #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "参数"
 
@@ -10922,7 +11269,7 @@ msgstr "参数"
 msgid "Parent discovery rules"
 msgstr "上层探索规则"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr "父图表"
 
@@ -10942,33 +11289,33 @@ msgstr "上层触发器"
 msgid "Parent web scenarios"
 msgstr "上层 web 场景"
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "解析SQL错误[%1$s]于[%2$s]之中."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "解析错误"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "被动式"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -10978,20 +11325,21 @@ msgstr "被动式"
 msgid "Password"
 msgstr "密码"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "密码 (再次确认)"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "示警媒介类型所需的密码."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "密码不能为空"
 
@@ -11000,21 +11348,21 @@ msgstr "密码不能为空"
 msgid "Peak memory usage: %s"
 msgstr "高峰记忆体用量: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "百分比线(左)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "百分比线(右)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11022,12 +11370,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "期间"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "期间类型"
@@ -11037,24 +11385,24 @@ msgstr "期间类型"
 msgid "Periods"
 msgstr "期间"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "许可权"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "许可权只能被指派予用户群组"
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "波斯语 (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Pie"
 
@@ -11066,55 +11414,56 @@ msgstr "置入演算法"
 msgid "Plain text"
 msgstr "文本"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "播放"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "播放声音"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "请修正所有的议题并按下\"再试\"按钮"
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "请输入确认文字."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "请选择两组件"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "波兰(pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "填入主机资产纪录栏位"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "埠"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "主机介面的埠不能是空白."
 
@@ -11122,51 +11471,51 @@ msgstr "主机介面的埠不能是空白."
 msgid "Port range"
 msgstr "埠范围"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "波兰语 (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr "葡萄牙语 (pt_PT)"
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "位置"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "贴上"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "预览"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "前"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "前"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "前值是 < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "前值是 = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "前值是 > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "前值不是 N"
 
@@ -11215,30 +11564,31 @@ msgstr "隐私密码"
 msgid "Privacy protocol"
 msgstr "隐私协议"
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "私有金钥档"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "优先权层级"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "可能的php-ldap模组不存在."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "问题"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "问题显示"
 
@@ -11250,16 +11600,16 @@ msgstr "问题在"
 msgid "Problem time"
 msgstr "问题时间"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "问题, 如果所有的下层都有问题"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "问题, 如果至少一个下层有一个问题"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "问题"
 
@@ -11267,75 +11617,71 @@ msgstr "问题"
 msgid "Profile"
 msgstr "基本资料"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "原型"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "系统代理程式"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "系统代理程式"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "主机\"%2$s\"的系统代理程式\"%1$s\"不存在."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "系统代理程式\"%1$s\"是用在探索规则\"%2$s\"上."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "系统代理程式\"%s\"已存在."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "系统代理程式已添加"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "系统代理程式已删除"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "系统代理程式的主机"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "系统代理程式介面创建失败"
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "系统代理程式介面更新失败"
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "系统代理程式模式"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "系统代理程式名称"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "系统代理程式已添加"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "公开金钥"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11346,7 +11692,7 @@ msgstr "公开金钥档"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "项目的队列将被更新"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "队列"
 
@@ -11354,18 +11700,18 @@ msgstr "队列"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "读"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "唯读"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "读写"
 
@@ -11377,7 +11723,7 @@ msgstr "理由"
 msgid "Received value"
 msgstr "接收到的值"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11385,11 +11731,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "接收者"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "接收者(升幂)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "接收者(降幂)"
 
@@ -11400,28 +11746,28 @@ msgstr "接收者(降幂)"
 msgid "Recipient(s)"
 msgstr "收件人(s)"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "恢复"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "恢复信息"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "恢复主旨"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "刷新(秒计)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "刷新时间倍数"
 
@@ -11439,46 +11785,50 @@ msgstr "刷新未支援的监控项目(秒计) \"%1$s\"."
 msgid "Regular expression"
 msgstr "正规表示式"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "正规表示式\"%s\"已存在."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "正则表示式V符合期间T的最末值, 则 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "正则表示式V符合期间T的最末值, 则 N = 1, 0 - 除外 (大小写不分)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "正则表示式V符合期间T的最末值, 则 N 非 1, 0 - 除外"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "正则表示式V符合期间T的最末值, 则 N 非 1, 0 - 除外 (大小写不分)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "正规表示式已添加"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "正规表示式已删除"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "正规表示式不存在"
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "正规表示式已更新"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11495,26 +11845,28 @@ msgstr "远端命令"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11525,21 +11877,19 @@ msgstr "远端命令"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "移除"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11547,11 +11897,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "删除组件"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "删除自"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "自常用的移除"
@@ -11560,7 +11910,7 @@ msgstr "自常用的移除"
 msgid "Remove from host group"
 msgstr "自主机群组移除"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "自主机群组移除"
 
@@ -11572,28 +11922,28 @@ msgstr "移除主机"
 msgid "Remove link"
 msgstr "移除连结"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "移除所选的"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "取代"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr "替换应用程序"
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "替换相依关係"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "替换主机群组"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "报表"
 
@@ -11601,35 +11951,36 @@ msgstr "报表"
 msgid "Report 1"
 msgstr "报表 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "报表 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "报表 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "报表"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "要求的"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "要求的栏位\"表示式\"不存在于图示对应中."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "要求的栏位\"iconid\"不存在于图示对应中."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "要求的栏位\"inventory_link\"不存在于图示对应中."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "要求的主机许可权"
 
@@ -11637,29 +11988,31 @@ msgstr "要求的主机许可权"
 msgid "Required performance (vps)"
 msgstr "要求的效能(vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "要求的主机效能, 每秒新值"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "要求的状态码"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "要求的字串"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "重设"
 
@@ -11678,9 +12031,9 @@ msgstr "重设所有的名称和颜色为预设值?"
 msgid "Reset confirmation"
 msgstr "重设确认"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11693,7 +12046,7 @@ msgstr "已解决"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "资源"
@@ -11708,15 +12061,15 @@ msgstr "回应时间"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "结果"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "结果为伪"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "结果为真"
 
@@ -11729,7 +12082,8 @@ msgstr "\"%s\"的结果"
 msgid "Result type"
 msgstr "结果类型"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr "重试"
 
@@ -11737,60 +12091,69 @@ msgstr "重试"
 msgid "Retries left"
 msgstr "可试次数"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "再试"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "右"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "行宽度"
 
@@ -11798,11 +12161,11 @@ msgstr "行宽度"
 msgid "Rows"
 msgstr "行"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "每页行数"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "规则"
 
@@ -11847,20 +12210,20 @@ msgid "Run remote commands on hosts"
 msgstr "于主机上执行远程命令"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "俄语 (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -11876,7 +12239,7 @@ msgstr "筛选"
 msgid "SEARCH"
 msgstr "搜寻"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "伺服器"
 
@@ -11891,13 +12254,13 @@ msgstr "SHA"
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "简报片展示"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "短信"
 
@@ -11906,17 +12269,17 @@ msgstr "短信"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP电邮"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP HELO"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP伺服器"
@@ -11932,7 +12295,7 @@ msgstr "SNMP Key"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11944,9 +12307,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMP介面"
@@ -11955,7 +12318,7 @@ msgstr "SNMP介面"
 msgid "SNMP trap"
 msgstr "SNMP捉捕"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "SNMP捉捕键值是无效的"
 
@@ -11979,7 +12342,7 @@ msgstr "SNMPv3 端点代理程式"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "SQL计数: %s (selects: %s | 执行: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -11997,7 +12360,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQL陈述式执行已失败: \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12006,15 +12369,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH 端点代理程式"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "探索的状态"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "触发器的状态"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "Web监控的状态"
 
@@ -12022,92 +12405,92 @@ msgstr "Web监控的状态"
 msgid "STATUS OF ZABBIX"
 msgstr "ZABBIX 状态"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "六"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "週六"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "存档"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "存档并返回"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Scale"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "方桉"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "方桉已添加"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "方桉已更新"
 
@@ -12119,7 +12502,7 @@ msgstr "方桉"
 msgid "Schedule"
 msgstr "排程"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr "按计划检查"
 
@@ -12130,126 +12513,125 @@ msgstr "按计划检查"
 msgid "Screen"
 msgstr "筛选"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "筛选 \"%1$s\" 已添加."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "筛选\"%1$s\"已存在于模板\"%2$2\"中."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "筛选\"%1$s\"已存在."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "略过筛选\"%1$s\"-用户规则."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "筛选\"%1$s\"已更新."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "筛选已添加"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "筛选格位组态"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "筛选已删除"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "筛选应包含至少一个行和列."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "筛选已更新"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "筛选"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "脚本"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "脚本已添加"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "脚本已删除"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "脚本名称"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12258,17 +12640,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "脚本探查器"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "脚本已更新"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "脚本"
 
@@ -12289,7 +12671,7 @@ msgstr "搜寻式样是空白"
 msgid "Search/Filter elements limit"
 msgstr "搜寻/过滤组件限制"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "秒"
 
@@ -12321,7 +12703,7 @@ msgstr "第二个POC电话B"
 msgid "Secondary POC screen name"
 msgstr "第二个POC筛选名称"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "秒"
 
@@ -12340,69 +12722,76 @@ msgstr "安全级别"
 msgid "Security name"
 msgstr "安全名称"
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "选择"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "选择原型"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "选择行含有值类似于"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "选择的"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "所选的动作已删除"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "所选的组件"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "选择的群组"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "选择的主机"
 
@@ -12418,7 +12807,7 @@ msgstr "送出信息给用户群组"
 msgid "Send message to users"
 msgstr "送出信息给用户"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "仅送到"
 
@@ -12426,11 +12815,11 @@ msgstr "仅送到"
 msgid "Send to"
 msgstr "收件人"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "送到用户群组"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "送到用户"
 
@@ -12439,17 +12828,17 @@ msgstr "送到用户"
 msgid "Sent"
 msgstr "已送"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "九月"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "分开的"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "九月"
 
@@ -12461,7 +12850,7 @@ msgstr "序列号A"
 msgid "Serial number B"
 msgstr "序列号B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "伺服器"
@@ -12470,44 +12859,44 @@ msgstr "伺服器"
 msgid "Server info"
 msgstr "伺服器资讯"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "伺服器时间"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "服务"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "服务\"%1$s\"不能被删除, 因为它相依于另一个服务."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "服务\"%1$s\"不能相依于自己."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "服务 \"%1$s\"不能被连结到一个触发器且同时有相依的服务."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "服务\"%1$s\"已经紧紧连结到一个不同的服务."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "服务不能同时为上层与下层"
 
@@ -12523,11 +12912,11 @@ msgstr "服务已删除"
 msgid "Service port"
 msgstr "服务端口"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "服务的开始时间不能晚于截止时间."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "服务次数"
 
@@ -12539,49 +12928,52 @@ msgstr "服务类型"
 msgid "Service updated"
 msgstr "服务已更新"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "服务"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "服务形成了一个循环式迴圈."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "连线期已中断, 请重连."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "严重性"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "严重性(降幂)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "严重性的名称不能是空白."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "展示"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "展示所有"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "展示细节"
 
@@ -12611,35 +13003,36 @@ msgstr "展示事件不能久于(日计)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "展示事件不能久于(日计)\"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "展示维修中主机"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "展示项目其名类似"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "展示无资料项目"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "展示图标"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "展示线条"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "展示所选的"
 
@@ -12647,19 +13040,21 @@ msgstr "展示所选的"
 msgid "Show selected groups"
 msgstr "显示选择的群组"
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "展示HTML文字"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "展示触发器"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "展示未知悉的"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "展示值"
@@ -12668,11 +13063,11 @@ msgstr "展示值"
 msgid "Show warning if Zabbix server is down"
 msgstr "当Zabbix伺服器停机时展示警告"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "展示工作时间"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "已展示"
 
@@ -12692,6 +13087,10 @@ msgstr "简单检查"
 msgid "Simple graph"
 msgstr "简单图形"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "场所邮递区号"
@@ -12729,7 +13128,7 @@ msgid "Site state / province"
 msgstr "场所州/省"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12747,16 +13146,16 @@ msgstr "略过複製图片\"%1$s\"到主机\"%2$s\"."
 msgid "Slide"
 msgstr "简报片"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "简报片展示"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "简报片展示\"%s\"已存在."
@@ -12765,11 +13164,11 @@ msgstr "简报片展示\"%s\"已存在."
 msgid "Slide show added"
 msgstr "简报片展示已添加."
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "简报片展示已删除"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "简报片展示必需包含简报片."
 
@@ -12777,10 +13176,10 @@ msgstr "简报片展示必需包含简报片."
 msgid "Slide show updated"
 msgstr "简报片展示已更新"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "简报片展示"
 
@@ -12788,15 +13187,15 @@ msgstr "简报片展示"
 msgid "Slides"
 msgstr "简报片"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "斯洛伐克(sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Snooze"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "软 "
 
@@ -12829,28 +13228,28 @@ msgid "Software application E"
 msgstr "软件应用程序E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "排序以"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "排序次(0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "依此排序触发器:"
 
@@ -12863,11 +13262,11 @@ msgstr "依栏位\"%1$s\"排序是不允许的."
 msgid "Source"
 msgstr "来源 "
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "西班牙语 (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "指定的脚本不存在或您没有对动作操作命令的此脚本的权限."
 
@@ -12875,63 +13274,63 @@ msgstr "指定的脚本不存在或您没有对动作操作命令的此脚本的
 msgid "Speed"
 msgstr "速度"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "层积的"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "标准项目"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "开始于"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "州"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "状态"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "状态(升幂)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "状态(降幂)"
 
@@ -12944,7 +13343,7 @@ msgstr "状态统计"
 msgid "Status calculation algorithm"
 msgstr "状态计算演算法"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "状态码"
 
@@ -12953,7 +13352,7 @@ msgid "Status of Web monitoring"
 msgstr "Web监控的状态"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Zabbix状态"
 
@@ -12970,40 +13369,40 @@ msgid "Status only"
 msgstr "只有状态"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "阶段"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "步骤\"%1$s\" [%2$s之于%3$s] 失败: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "步骤持续时间"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "方桉的步骤"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr "名字为\"%1$s\"的步骤已经存在."
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "步骤"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "停止"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "储存值"
@@ -13012,11 +13411,11 @@ msgstr "储存值"
 msgid "Straight"
 msgstr "Straight"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "风格"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "次过滤[仅影响已过滤的资料!]"
 
@@ -13024,11 +13423,11 @@ msgstr "次过滤[仅影响已过滤的资料!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "主旨"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "子拓墣图"
 
@@ -13037,32 +13436,32 @@ msgid "Success Audit"
 msgstr "成功审计"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr "期间 T 的值总数是 < N"
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "期间的总时间是 T = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "期间的总时间是 T > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr "期间 T 的值总数不是 N"
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "日"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "日"
 
@@ -13070,27 +13469,27 @@ msgstr "日"
 msgid "Support"
 msgstr "支援"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "姓氏"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "瑞士(sv_SE)"
 
@@ -13098,16 +13497,16 @@ msgstr "瑞士(sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "切换认证方法将重设除了此连线期之外的所有连线!继续吗?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "系统预设"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "系统错误."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13116,21 +13515,21 @@ msgid "System status"
 msgstr "系统状态"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -13149,11 +13548,11 @@ msgid "TOTAL"
 msgstr "总合"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "触发器评论"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "真"
 
@@ -13171,14 +13570,14 @@ msgstr "资料表\"%1$s\"不能有栏位名为\"%2$s\"."
 msgid "Tag"
 msgstr "标签"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "目标"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "目标清单"
 
@@ -13187,130 +13586,133 @@ msgid "Target type"
 msgstr "目标类型"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "模板"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "模板 \"%1$s\" 已存在."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "用于主机 \"%2$s\"的模板 \"%1$s\"不存在."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr "模板\"%1$s\" 的监控项键\"%2$s\"已经连接到主机."
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "模板已添加"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "模板不能重複连结到其它模板, 即使透过其它模板."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "模板已删除"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "模板群组"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "模板间的关联"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "模板清单"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "模版名称"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "模板筛选"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "模板触发器"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "模板已更新"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "含有相同名称\"%1$s\"的模板已连结到主机."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "含有相同可视名称\"%1$s\"的模板已连结到主机."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "模板的项目"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "模板"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "模板\"%1$s\"自主机\"%2$s\"断连."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "测试"
 
@@ -13318,11 +13720,11 @@ msgstr "测试"
 msgid "Test authentication"
 msgstr "测试认证"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "测试确认"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "测试数据"
 
@@ -13336,22 +13738,22 @@ msgid "Test string"
 msgstr "测试字串"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "文字"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13359,7 +13761,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr "前端不匹配Zabbix数据库."
@@ -13374,24 +13776,24 @@ msgstr "前端不匹配Zabbix数据库.当前数据库版本(强制/可选):%d/%
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "已无法探索此项目了, 将删除于%1$s (在%2$s在%3$s)."
@@ -13400,19 +13802,19 @@ msgstr "已无法探索此项目了, 将删除于%1$s (在%2$s在%3$s)."
 msgid "The queue is empty."
 msgstr "队列是空."
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "接收到的JSON不是一个有效的JSON-RPC请求."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "请求的远程程序不存在/不可用"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr "web 场景应用属于一个不同的主机而不是 web 场景主机."
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "背景主题"
 
@@ -13422,11 +13824,11 @@ msgid "There is \"%1$d\" group with Internal GUI access."
 msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "有内部GUI存取的群组\"%1$d\"."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "第三的"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "这栏位是由项目\"%s\"自动填入的."
@@ -13435,11 +13837,11 @@ msgstr "这栏位是由项目\"%s\"自动填入的."
 msgid "This month"
 msgstr "本月"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "这筛选-列不是空白. 删除它?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "这筛选-行不是空白. 删除它?"
 
@@ -13451,27 +13853,27 @@ msgstr "本周"
 msgid "This year"
 msgstr "本年"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "四"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "週四"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "直到"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13480,28 +13882,28 @@ msgstr "直到"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "时间"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "时间(升幂)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "时间(降幂)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13509,54 +13911,54 @@ msgstr ""
 msgid "Time period"
 msgstr "时间期间"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "排班"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "时间类型"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "逾时"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "时间戳"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "和Zabbix伺服器的时间戳记差异不超过T秒, 则 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "和Zabbix伺服器的时间戳记差异不超过T秒, 则 N 非 1, 0 - 除外"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "主题"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "到"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "要设定一个主机介面, 选择一个单一的项目类型给所有的项目"
 
@@ -13564,17 +13966,18 @@ msgstr "要设定一个主机介面, 选择一个单一的项目类型给所有�
 msgid "Today"
 msgstr "今天"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "顶部"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "合计"
 
@@ -13592,7 +13995,7 @@ msgstr "总时间: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "交易尚未被关闭. 放弃中..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "传输错误."
 
@@ -13609,90 +14012,90 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "趋势"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "触发器"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "触发器\"%1$s\"已存在于\"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "触发器\"%1$s\"相依于一个不存在的触发器\"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "略过触发器\"%1$s\"-用户规则."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "触发器\"%s\"属于有不同连结的模板."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "触发器已添加"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr "触发器不能依赖从它继承的一个触发器."
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "触发器评论"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "触发器已删除"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "触发器显示选项"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13706,11 +14109,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "触发器表示式条件"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "触发器表示式必需包含至少一个 主机:键值 参照."
 
@@ -13718,7 +14122,7 @@ msgstr "触发器表示式必需包含至少一个 主机:键值 参照."
 msgid "Trigger form"
 msgstr "触发器形式"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "触发器有项目来自于模板\"%1$s\"其并未连结到主机."
@@ -13731,12 +14135,12 @@ msgstr "触发器在\"正常\"状态"
 msgid "Trigger in \"unknown\" state"
 msgstr "触发器在\"未知\"状态"
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "模板\"%1$s\"中的触发器依赖模板\"%2$s\"中的触发器"
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "触发器刚添加. 尚无没有状态更新."
 
@@ -13748,50 +14152,50 @@ msgstr "触发器标示类型"
 msgid "Trigger name"
 msgstr "触发器名称"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "触发器类型"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "触发器类型"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13799,23 +14203,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "触发器类型之于"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "触发器严重性"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "触发器示警度"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "触发器已更新"
 
@@ -13823,40 +14235,41 @@ msgstr "触发器已更新"
 msgid "Trigger value"
 msgstr "触发器值"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "触发器"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr "触发器 (e/d)[p/o]"
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "触发器已删除"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "触发器资讯"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "触发器大量更新"
 
@@ -13864,78 +14277,78 @@ msgstr "触发器大量更新"
 msgid "Triggers overview"
 msgstr "触发器概览"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "触发器状态"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "前百大触发器"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "具示警度的触发器"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "删短的"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "尝试读取不能存取的属性\"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "二"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "週二"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr "土耳其语 (tr_TR)"
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "两个组件必需被选择"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "两个项目 (\"%1$s\"和\"%2$s\")不能填入一个主机资产纪录栏位\"%3$s\", 这会造成冲突."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "类型"
 
@@ -13943,62 +14356,64 @@ msgstr "类型"
 msgid "Type (Full details)"
 msgstr "类型(全细节)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "类型(OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "类型(升幂)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "类型(降幂)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "计算方式"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "数据类型"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "日志键值的资讯类型必须是\"Log\" ."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "整合性项目的资讯的类型必须是\"Numeric (float)\"."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "类型 "
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "未知的"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "上线"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "URL (登陆后)"
 
@@ -14014,20 +14429,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
+msgstr ""
+
+#: include/html.inc.php:112
 msgid "URL parameter cannot be array."
 msgstr "URL 参数不能为阵列."
 
-#: include/html.inc.php:112
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr "URL 参数名为空."
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160字元)"
 
@@ -14035,15 +14460,11 @@ msgstr "USA (160字元)"
 msgid "USER PROFILE"
 msgstr "用户基本资料"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "乌克兰语 (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "不能选择组态."
 
@@ -14051,7 +14472,7 @@ msgstr "不能选择组态."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr "不能上传文件因为 \"文件上传\"被禁止."
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "未知悉的"
 
@@ -14064,20 +14485,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "未知悉的Problem事件"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "仅未知悉的"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "解除封锁所选的"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "解除封锁所选的用户?"
 
@@ -14086,29 +14507,29 @@ msgstr "解除封锁所选的用户?"
 msgid "Units"
 msgstr "单位"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14118,23 +14539,20 @@ msgstr "未知的"
 msgid "Unknown action"
 msgstr "未知的操作"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "未知的服务状态计算演算法"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "未知的方程式."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "未知的主机项目, 在所选的主机中没有这样的项目"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "未知的主机, 在系统中没有出现这样的主机."
 
@@ -14146,23 +14564,23 @@ msgstr "未知的界面类型."
 msgid "Unknown resource"
 msgstr "未知的资源"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "未知的值类型"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "取消关联"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "取消关联并清理"
 
@@ -14170,61 +14588,61 @@ msgstr "取消关联并清理"
 msgid "Unlink from template"
 msgstr "自模板断连"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "自模板断连"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "断连: 应用程序\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "未连结的: 探索规则\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "未连结的: 图形\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "未连结的: 图形原型\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "断连:   \"%2$s\"上的项目\"%1$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "断连:   \"%2$s\"上的项目原型\"%1$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "断连:   \"%2$s\"上的触发器\"%1$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "断连:   \"%2$s\"上的触发器原型\"%1$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "不能被连接:\"%2$s\" 上的 Web 场景 \"%1$s\"."
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "开声音"
 
@@ -14238,32 +14656,43 @@ msgstr "未支援的汇入档桉副档名\"%1$s\"."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "未支援的汇入格式\"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "上"
@@ -14274,34 +14703,34 @@ msgid "Up"
 msgstr "上"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "更新"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "更新现有的"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "更新间隔"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "数据更新间隔(秒)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "更新"
 
@@ -14309,55 +14738,55 @@ msgstr "更新"
 msgid "Updated status of host"
 msgstr "主机的已更新状态"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "已更新: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 应用程序\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 探索规则\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 项目\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 项目原型\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 触发器\"%1$s\"于\"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 触发器原型\"%1$s\"于\"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr "已更新: Web 场景 \"%1$s\"于\"%2$s\"."
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "上传"
 
@@ -14365,14 +14794,14 @@ msgstr "上传"
 msgid "Upper level maps"
 msgstr "上层拓墣图"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "在线时间"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14380,10 +14809,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "在线/不在线"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14398,83 +14827,87 @@ msgid "Used in actions"
 msgstr "用于动作中"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "用户"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "用户\"%s\"不能没有用户群组."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "添加用户"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "用户不能自行改变类型"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "用户不能将自己加进一个取消的群组或已取消图形介面存取权的群组."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "用户不能自行改变GUI存取."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "用户不能改变自己的状态"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "用户不能改变自己的状态"
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "用户已删除"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "用户群组"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "用户群组\"%1$s\"被用于脚本\"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "用户群组\"%s\"已存在."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14490,34 +14923,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "用户群组"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "用户是不允许删除自己"
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "用户不能因为成为用户群组 \"%s\"的成员而帮自己修改GUI存取."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "用户不能因为成为用户群组 \"%s\"的成员而帮自己修改系统状态."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "用户名称"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "用户名称和DB中的不符"
 
@@ -14543,243 +14976,243 @@ msgstr ""
 msgid "User sessions"
 msgstr "用户会话"
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "用户类型"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "用户已更新"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "使用别名\"%s\"的用户已存在."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "用户名称"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "用户"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "用户(线上)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "未被封锁的用户"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "ֵ值"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "参数\"grid_align\"的值\"%1$s\"是无效的. 可用的是: \"%2$s\"和\"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr "参数 \"grid_show \"的值 \"%1$s \"是无效的. 可用的是: \"%2$s \"和 \"%3$s\"."
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "参数 \"grid_show \"的值 \"%1$s\"是无效的. 可用的是: \"%2$s\""
@@ -14814,11 +15247,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14864,10 +15297,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "valuemapid为\"%1$s\"的值对应不存在."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "值对应"
 
@@ -14876,7 +15309,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "值对应必需至少有一个对应."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14888,8 +15321,8 @@ msgstr "值: 无资料"
 msgid "Values"
 msgstr "值"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "变数"
 
@@ -14902,64 +15335,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "垂直的"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "纵向对齐"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "检视未能形成."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "可见的名称"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "如果缺少主机名称, 可见的名称不能是空白."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "警告"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "我们很抱歉, 已经到了可记住的最大可能的组件数量."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -14967,64 +15405,82 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web监测"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr "Web 场景 \"%1$s\" 已经存在在主机 \"%2$s\"."
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Web 场景 \"%1$s\" 已经存在."
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr "Web 场景被被删除"
 
-#: httpconf.php:337
+#: httpconf.php:365
 #, fuzzy
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web 场景被禁止"
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr "Web 场景缺少参数: %1$s"
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr "Web 场景必须至少有一步."
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr "Web 场景 步骤\"%1$s\" 已经存在."
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr "Web 场景步骤名称仅包含可打印字符."
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr "Web 场景 步骤数量不能少于1."
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr "Web 场景"
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "三"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "週三"
 
@@ -15032,9 +15488,9 @@ msgstr "週三"
 msgid "Week"
 msgstr "週"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "每週"
 
@@ -15042,12 +15498,12 @@ msgstr "每週"
 msgid "When active"
 msgstr "当作用中时"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "宽"
@@ -15057,28 +15513,28 @@ msgstr "宽"
 msgid "With data collection"
 msgstr "有数据收集"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "有最新知悉的事件"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "有问题"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "有触发器"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "有未知悉的事件"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "无问题"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "无触发器"
 
@@ -15087,7 +15543,7 @@ msgid "Wizard"
 msgstr "Wizard"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15100,277 +15556,271 @@ msgstr "工作时间"
 msgid "Working time \"%1$s\"."
 msgstr "工作时间\"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "写"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "错误的服务\"%1$s\"其相依关係栏位."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "错误的组件栏位."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "错误的主机栏位\"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr "错误的图像栏位\"%1$s\"."
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr "错误的图像栏位"
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr "错误的连接触发器删除栏位."
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr "错误的连接触发器更新栏位."
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr "字段错误连接触发器."
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "错误的巨集栏位\"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr "错误的图像连接栏位."
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "错误的媒介类型栏位"
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr "错误的代理\"%1$s\"栏位."
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "错误的脚本栏位."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "错误的服务栏位\"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "错误的服务\"%1$s\"其时间栏位."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "错误的触发器栏位."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "错误的用户栏位\"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "错误的巨集\"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "X标示"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML档含有错误 %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML档含有错误"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML档含有极严重错误 %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML档含有警告 %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "纵轴最大值"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y axis MAX value must be greater than Y axis MIN value."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "纵轴Y最小值MIN"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "纵轴Y侧"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Y标示"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "年"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "每年"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "是"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "您无法选择某些语言, 因为这些语系并未安装于web伺服器上."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "您未被允许来帮用户\"%s\"转换优先权."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "您尚未登入."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "您无法为目前的选择切换主机."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "您没有指定主机来操作."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "您没有指定主机群组来操作."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "您没有指定目标为动作操作的命令\"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "您没有指定目标为动作操作的全域脚本\"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "您没有许可权来完成此操作."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "您没有许可权来创建用户."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "您没有许可权来更新其它用户."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "您没有许可权来来更新用户或用户不存在."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr "你没有许可权来访问这个页面."
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "您必需登入才能浏览此页面."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr "你已经登录作为"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15383,7 +15833,7 @@ msgstr "Zabbix"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15402,8 +15852,8 @@ msgid "Zabbix User"
 msgstr "用户"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15429,10 +15879,11 @@ msgstr "Zabbix自身"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix内部认证"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "网路监测主机"
@@ -15448,7 +15899,7 @@ msgstr ""
 "1.  \"zabbix.conf.php\"中不正确的IP/DNS;\n"
 "2. 不正确的网路组态.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "Zabbix主机IP或埠并未设置!"
 
@@ -15456,15 +15907,15 @@ msgstr "Zabbix主机IP或埠并未设置!"
 msgid "Zabbix server activity check interval"
 msgstr "Zabbix主机活动检查间隔"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Zabbix主机资讯"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix server is not running: the information displayed may not be current."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix服务器端运行中"
 
@@ -15473,11 +15924,11 @@ msgstr "Zabbix服务器端运行中"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Zabbix主机正运作检查间隔\"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Zabbix主机名称"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Zabbix主机埠"
 
@@ -15485,25 +15936,20 @@ msgstr "Zabbix主机埠"
 msgid "Zabbix trapper"
 msgstr "Zabbix捉捕器"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "缩放"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[错误的日计数: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[错误的月计数: \"%s\" ]"
@@ -15512,19 +15958,19 @@ msgstr "[错误的月计数: \"%s\" ]"
 msgid "agent"
 msgstr "端点代理程式"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "所有"
 
@@ -15532,19 +15978,15 @@ msgstr "所有"
 msgid "all media"
 msgstr "所有介质"
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "已存在"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "成蓝"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "成绿"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "成红"
 
@@ -15556,83 +15998,49 @@ msgstr "自动注册"
 msgid "auto-registered host"
 msgstr "自动被注册的主机"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "平均"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "日"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15654,19 +16062,15 @@ msgstr "被发现的服务"
 msgid "discovery"
 msgstr "发现"
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "动态的"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "组件"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "组件複製到..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from和esc_step_to必须一起设定."
 
@@ -15678,47 +16082,49 @@ msgstr "正确地"
 msgid "executed"
 msgstr "已执行"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "固定的"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "已发现"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "主机"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "主机群组"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "图示"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "图片"
 
@@ -15726,7 +16132,7 @@ msgstr "图片"
 msgid "in"
 msgstr "在"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15736,7 +16142,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "是"
 
@@ -15744,20 +16150,20 @@ msgstr "是"
 msgid "item"
 msgstr "监控项"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "最新"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "似"
@@ -15766,12 +16172,12 @@ msgstr "似"
 msgid "low-level discovery rule"
 msgstr "底层发现规则"
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15780,46 +16186,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "宏(s)"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "维护"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "拓墣图"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "最大"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "最小"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "最少60秒"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "毫秒"
@@ -15828,17 +16234,17 @@ msgstr "毫秒"
 msgid "must be a valid LDAP user"
 msgstr "必需为一个正确的LDAP用户"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr "新"
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "没有数据"
@@ -15851,12 +16257,14 @@ msgstr "非在"
 msgid "not like"
 msgstr "非似"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "非运行中"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "非所选的"
 
@@ -15865,57 +16273,61 @@ msgstr "非所选的"
 msgid "not sent"
 msgstr "未发送"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "现在"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "其"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "于"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "其它"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "刷新于 "
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15924,25 +16336,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "记住所选的"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "运作中"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "秒"
 
@@ -15955,7 +16366,7 @@ msgstr "秒"
 msgid "sent"
 msgstr "已发送"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "简述"
 
@@ -15963,36 +16374,36 @@ msgstr "简述"
 msgid "show icon mappings"
 msgstr "展示图示对应"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "展示值对应"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "模板ID\"%1$s\"已传送%2$s次"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "到"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "触发器"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr "在此输入搜索"
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "未知的"
 
@@ -16004,11 +16415,11 @@ msgstr "值"
 msgid "via"
 msgstr "通过"
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyy"
diff --git a/frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po b/frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po
index 847d91bd58b..904e0941578 100644
--- a/frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po
+++ b/frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po
@@ -3,9 +3,9 @@
 # 20120720T0924
 msgid ""
 msgstr ""
-"Project-Id-Version: Zabbix 2.1\n"
+"Project-Id-Version: Zabbix 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-25 13:41+0300\n"
+"POT-Creation-Date: 2014-08-25 14:56+0300\n"
 "PO-Revision-Date: 2012-11-06 15:57+0800\n"
 "Last-Translator: Yaochiu Huang <brian.huang@primillet.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -17,28 +17,30 @@ msgstr ""
 "X-Generator: Pootle 2.1.6\n"
 "X-Poedit-Basepath: ../../\n"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:357
-#: api/classes/CMaintenance.php:466 api/classes/CMaintenance.php:471
-#: maintenance.php:145 maintenance.php:157 services.php:193 services.php:207
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:513
+#: include/classes/api/services/CMaintenance.php:518 maintenance.php:150
+#: maintenance.php:162 services.php:193 services.php:207
 #, c-format
 msgid "\"%s\" must be between 1970.01.01 and 2038.01.18."
 msgstr "\"%s\"必須是在1970.01.01和2038.01.18之間."
 
-#: include/profiles.inc.php:359
+#: include/profiles.inc.php:97
 msgid "\"Display OK triggers\" needs to be \"0\" or a positive integer."
 msgstr "\"顯示[正常]的觸發器\" 必須為 \"0\" 或正整數."
 
-#: include/profiles.inc.php:364
+#: include/profiles.inc.php:102
 msgid "\"Triggers blink on status change\" needs to be \"0\" or a positive integer."
 msgstr "\"觸發器閃爍狀態改變時\" 必須為 \"0\" 或正整數."
 
-#: include/func.inc.php:465
+#: include/func.inc.php:453
 #, c-format
 msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 
-#: include/blocks.inc.php:1120
+#: include/blocks.inc.php:1125
 #, c-format
 msgid "%1$d of %2$d issue is shown"
 msgid_plural "%1$d of %2$d issues are shown"
@@ -49,22 +51,20 @@ msgstr[0] ""
 msgid "%1$s (year %2$s)"
 msgstr "%1$s ( %2$s 年)"
 
-#: latest.php:547 latest.php:718
+#: latest.php:559 latest.php:731
 #, c-format
 msgid "%1$s Item"
 msgid_plural "%1$s Items"
 msgstr[0] "%1$s 項"
 
-#: include/views/configuration.item.edit.php:326
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.edit.php:347
-#: include/views/configuration.item.edit.php:351
+#: include/views/configuration.item.edit.php:327
+#: include/views/configuration.item.edit.php:343
 #, c-format
 msgid "%1$s day"
 msgid_plural "%1$s days"
 msgstr[0] ""
 
-#: jsLoader.php:220 jsLoader.php:221 jsLoader.php:222 jsLoader.php:223
+#: jsLoader.php:224 jsLoader.php:225 jsLoader.php:226 jsLoader.php:227
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -77,7 +77,7 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: jsLoader.php:218 jsLoader.php:219
+#: jsLoader.php:222 jsLoader.php:223
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -95,23 +95,23 @@ msgid "%d device"
 msgid_plural "%d devices"
 msgstr[0] "%d個裝置"
 
-#: include/users.inc.php:245
+#: include/users.inc.php:247
 #, c-format
 msgctxt "user fullname"
 msgid "(%1$s %2$s)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:438
+#: include/views/configuration.action.edit.php:484
 msgid "(0 - infinitely)"
 msgstr "(0 -無限地)"
 
-#: include/views/configuration.host.edit.php:206
+#: include/views/configuration.host.edit.php:217
 #: include/views/configuration.hostgroups.list.php:31
-#: include/views/configuration.template.edit.php:124
+#: include/views/configuration.template.edit.php:121
 msgid "(Only super admins can create groups)"
 msgstr ""
 
-#: include/forms.inc.php:566 include/forms.inc.php:581
+#: include/forms.inc.php:580 include/forms.inc.php:595
 msgid "(in days)"
 msgstr "(日計)"
 
@@ -119,34 +119,34 @@ msgstr "(日計)"
 msgid "(in sec)"
 msgstr "(秒計)"
 
-#: include/views/configuration.action.edit.php:449
+#: include/views/configuration.action.edit.php:495
 msgid "(minimum 60 seconds, 0 - use action default)"
 msgstr "(最少 60 秒, 0 為預設值)"
 
-#: include/views/configuration.host.edit.php:394
-#: include/views/configuration.host.edit.php:415
-#: include/views/configuration.host.massupdate.php:144
-#: include/views/configuration.host.prototype.edit.php:154
+#: include/views/configuration.host.edit.php:399
+#: include/views/configuration.host.edit.php:420
+#: include/views/configuration.host.massupdate.php:162
+#: include/views/configuration.host.prototype.edit.php:153
 msgid "(no proxy)"
 msgstr "(無系統代理程式)"
 
-#: include/setup.inc.php:244
+#: include/classes/setup/CSetupWizard.php:244
 msgid "(with warnings)"
 msgstr ""
 
-#: include/blocks.inc.php:1322
+#: include/blocks.inc.php:1326
 msgid "-"
 msgstr ""
 
-#: acknow.php:135
+#: acknow.php:134
 msgid "----[BULK ACKNOWLEDGE]----"
 msgstr "----[整批知悉]----"
 
-#: include/triggers.inc.php:2279 include/triggers.inc.php:2280
-#: include/triggers.inc.php:2281 include/triggers.inc.php:2283
-#: include/triggers.inc.php:2285 include/triggers.inc.php:2288
-#: include/triggers.inc.php:2291 include/triggers.inc.php:2292
-#: include/triggers.inc.php:2303
+#: include/triggers.inc.php:2089 include/triggers.inc.php:2090
+#: include/triggers.inc.php:2091 include/triggers.inc.php:2093
+#: include/triggers.inc.php:2095 include/triggers.inc.php:2098
+#: include/triggers.inc.php:2101 include/triggers.inc.php:2102
+#: include/triggers.inc.php:2114
 msgid "0 or 1"
 msgstr "0 或 1"
 
@@ -162,7 +162,7 @@ msgstr "10秒"
 msgid "30 seconds"
 msgstr "30秒"
 
-#: include/views/configuration.graph.edit.php:211
+#: include/views/configuration.graph.edit.php:221
 msgid "3D view"
 msgstr "3D 檢視"
 
@@ -178,7 +178,7 @@ msgstr "5秒"
 msgid "500 latest values"
 msgstr "最近500個值"
 
-#: include/views/administration.script.edit.php:41
+#: include/views/administration.script.edit.php:40
 msgid "<Sub-menu/Sub-menu.../>Script"
 msgstr ""
 
@@ -197,12 +197,11 @@ msgstr ""
 msgid "AES"
 msgstr ""
 
-#: acknow.php:195
+#: acknow.php:194
 msgid "ALARM ACKNOWLEDGES"
 msgstr "警報知悉"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:106 tr_logform.php:294
+#: tr_logform.php:262
 msgid "AND"
 msgstr "且"
 
@@ -214,19 +213,19 @@ msgstr ""
 msgid "AVAILABILITY REPORT"
 msgstr "系統可用性統計"
 
-#: popup_trexpr.php:139
+#: popup_trexpr.php:129
 msgid "Absolute difference between last and previous value is < N"
 msgstr "最末和前一個值之前的絕對差異是 < N"
 
-#: popup_trexpr.php:147
+#: popup_trexpr.php:137
 msgid "Absolute difference between last and previous value is = N"
 msgstr "最末和前一個值之前的絕對差異是 = N"
 
-#: popup_trexpr.php:143
+#: popup_trexpr.php:133
 msgid "Absolute difference between last and previous value is > N"
 msgstr "最末和前一個值之前的絕對差異是 > N"
 
-#: popup_trexpr.php:151
+#: popup_trexpr.php:141
 msgid "Absolute difference between last and previous value is NOT N"
 msgstr "最末和前一個值之前的絕對差異不是 N"
 
@@ -238,42 +237,42 @@ msgstr "可接受的SLA"
 msgid "Access denied!"
 msgstr "存取被拒!"
 
-#: include/func.inc.php:1907
+#: include/func.inc.php:1665
 msgid "Access denied."
 msgstr ""
 
-#: api/classes/CUser.php:994
+#: include/classes/api/services/CUser.php:988
 #, c-format
 msgid "Account is blocked for %s seconds"
 msgstr "帳號被封鎖%s秒"
 
-#: events.php:480 include/actions.inc.php:232 include/blocks.inc.php:999
-#: include/blocks.inc.php:1295 include/events.inc.php:197
-#: include/events.inc.php:272 include/views/configuration.action.edit.php:978
+#: events.php:481 include/actions.inc.php:232 include/blocks.inc.php:1005
+#: include/blocks.inc.php:1299 include/events.inc.php:197
+#: include/events.inc.php:272 include/views/configuration.action.edit.php:1042
 msgid "Ack"
 msgstr "知悉"
 
-#: acknow.php:234 jsLoader.php:178 tr_status.php:765
+#: acknow.php:233 jsLoader.php:180 tr_status.php:689
 msgid "Acknowledge"
 msgstr "知悉"
 
-#: acknow.php:161
+#: acknow.php:160
 msgid "Acknowledge added"
 msgstr "已加知悉"
 
-#: acknow.php:200 acknow.php:233
+#: acknow.php:199 acknow.php:232
 msgid "Acknowledge alarm by"
 msgstr "知悉警報以"
 
-#: acknow.php:201 acknow.php:235
+#: acknow.php:200 acknow.php:234
 msgid "Acknowledge and return"
 msgstr "知悉並返回"
 
-#: tr_status.php:268
+#: include/views/common.filter.trigger.php:45
 msgid "Acknowledge status"
 msgstr "知悉狀態"
 
-#: include/events.inc.php:182 tr_status.php:392 tr_status.php:776
+#: include/events.inc.php:182 tr_status.php:307 tr_status.php:700
 msgid "Acknowledged"
 msgstr "已知悉"
 
@@ -298,61 +297,64 @@ msgstr "無權知悉"
 #: include/views/administration.auditlogs.list.php:62
 #: include/views/administration.auditlogs.list.php:89
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/configuration.action.edit.php:507
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.action.edit.php:632
-#: include/views/configuration.action.edit.php:884
-#: include/views/configuration.action.edit.php:1005
-#: include/views/configuration.graph.edit.php:229
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/configuration.action.edit.php:553
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.action.edit.php:678
+#: include/views/configuration.action.edit.php:948
+#: include/views/configuration.action.edit.php:1069
+#: include/views/configuration.graph.edit.php:239
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.prototype.edit.php:211
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.prototype.edit.php:216
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.maintenance.edit.php:103
-#: include/views/configuration.services.edit.php:93
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:92
+#: include/views/configuration.services.edit.php:131
 #: include/views/configuration.slideconf.edit.php:52
-#: include/views/configuration.template.edit.php:391
-#: include/views/configuration.triggers.edit.php:149
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.massupdate.php:89 tr_logform.php:303
-#: tr_logform.php:307
+#: include/views/configuration.template.edit.php:409
+#: include/views/configuration.triggers.edit.php:155
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.massupdate.php:88 tr_logform.php:272
+#: tr_logform.php:276
 msgid "Action"
 msgstr "動作"
 
-#: api/classes/CAction.php:514 api/classes/CAction.php:528
-#: api/classes/CAction.php:645 api/classes/CAction.php:667
+#: include/classes/api/services/CAction.php:2148
+#: include/classes/api/services/CAction.php:2163
+#: include/classes/api/services/CAction.php:2259
+#: include/classes/api/services/CAction.php:2295
 #, c-format
 msgid "Action \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CAction.php:511 api/classes/CAction.php:630
+#: include/classes/api/services/CAction.php:2143
+#: include/classes/api/services/CAction.php:2242
 #, c-format
 msgid "Action \"%1$s\" has incorrect value for \"esc_period\" (minimum %2$s seconds)."
 msgstr "動作\"%1$s\"已有不正確值達\"esc_period\" (最少%2$s秒)."
 
-#: api/classes/CAction.php:712
+#: include/classes/api/services/CAction.php:2317
 #, c-format
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: actionconf.php:148
+#: actionconf.php:162
 msgid "Action added"
 msgstr "動作已新增"
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Action deleted"
 msgstr "動作已刪除"
 
-#: actionconf.php:333
+#: actionconf.php:338
 msgid "Action disabled"
 msgid_plural "Actions disabled"
 msgstr[0] ""
 
-#: actionconf.php:332
+#: actionconf.php:337
 msgid "Action enabled"
 msgid_plural "Actions enabled"
 msgstr[0] ""
@@ -364,21 +366,21 @@ msgstr[0] ""
 msgid "Action log"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:408
+#: include/views/configuration.action.edit.php:453
 msgid "Action operations"
 msgstr "動作操作"
 
-#: actionconf.php:137
+#: actionconf.php:151
 msgid "Action updated"
 msgstr "動作已更新"
 
-#: events.php:481 include/blocks.inc.php:1000 include/blocks.inc.php:1296
-#: include/events.inc.php:198 include/menu.inc.php:191
+#: events.php:482 include/blocks.inc.php:1006 include/blocks.inc.php:1300
+#: include/events.inc.php:198 include/menu.inc.php:185
 #: include/views/configuration.action.list.php:40
 msgid "Actions"
 msgstr "動作"
 
-#: include/views/administration.proxy.edit.php:42
+#: include/views/administration.proxy.edit.php:41
 #: include/views/administration.proxy.list.php:90
 msgid "Active"
 msgstr "主動式"
@@ -388,80 +390,83 @@ msgctxt "maintenance status"
 msgid "Active"
 msgstr "作用中"
 
-#: api/classes/CMaintenance.php:352 api/classes/CMaintenance.php:466
+#: include/classes/api/services/CMaintenance.php:376
+#: include/classes/api/services/CMaintenance.php:513
 #: include/views/configuration.maintenance.edit.php:89
-#: include/views/configuration.maintenance.list.php:46 maintenance.php:139
-#: maintenance.php:145
+#: include/views/configuration.maintenance.list.php:46 maintenance.php:144
+#: maintenance.php:150
 msgid "Active since"
 msgstr "作用中自從"
 
-#: api/classes/CMaintenance.php:357 api/classes/CMaintenance.php:471
+#: include/classes/api/services/CMaintenance.php:381
+#: include/classes/api/services/CMaintenance.php:518
 #: include/views/configuration.maintenance.edit.php:90
-#: include/views/configuration.maintenance.list.php:47 maintenance.php:153
-#: maintenance.php:157
+#: include/views/configuration.maintenance.list.php:47 maintenance.php:158
+#: maintenance.php:162
 msgid "Active till"
 msgstr "作用中直到"
 
-#: include/reports.inc.php:118 include/reports.inc.php:208
-#: include/reports.inc.php:250
+#: include/reports.inc.php:119 include/reports.inc.php:210
+#: include/reports.inc.php:252
 #: include/views/administration.auditlogs.list.php:45
 #: include/views/administration.general.iconmap.edit.php:119
 #: include/views/administration.general.regularexpressions.edit.php:47
 #: include/views/administration.general.regularexpressions.edit.php:56
-#: include/views/administration.general.valuemapping.edit.php:42
-#: include/views/administration.usergroups.edit.php:107
-#: include/views/administration.usergroups.edit.php:111
-#: include/views/administration.usergroups.edit.php:115
-#: include/views/administration.users.edit.php:70
-#: include/views/administration.users.edit.php:216
+#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.usergroups.edit.php:106
+#: include/views/administration.usergroups.edit.php:110
+#: include/views/administration.usergroups.edit.php:114
+#: include/views/administration.users.edit.php:69
+#: include/views/administration.users.edit.php:218
+#: include/views/common.filter.trigger.php:132
 #: include/views/common.macros.php:69
-#: include/views/configuration.action.edit.php:305
-#: include/views/configuration.action.edit.php:511
-#: include/views/configuration.action.edit.php:520
-#: include/views/configuration.action.edit.php:793
-#: include/views/configuration.action.edit.php:838
-#: include/views/configuration.action.edit.php:984
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.graph.edit.php:232
+#: include/views/configuration.action.edit.php:350
+#: include/views/configuration.action.edit.php:557
+#: include/views/configuration.action.edit.php:566
+#: include/views/configuration.action.edit.php:851
+#: include/views/configuration.action.edit.php:905
+#: include/views/configuration.action.edit.php:1048
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.graph.edit.php:242
 #: include/views/configuration.host.discovery.edit.php:237
-#: include/views/configuration.host.discovery.edit.php:336
-#: include/views/configuration.host.edit.php:251
-#: include/views/configuration.host.edit.php:268
-#: include/views/configuration.host.edit.php:284
-#: include/views/configuration.host.edit.php:299
-#: include/views/configuration.host.edit.php:699
-#: include/views/configuration.host.prototype.edit.php:190
-#: include/views/configuration.host.prototype.edit.php:247
-#: include/views/configuration.httpconf.edit.php:231
-#: include/views/configuration.httpconf.popup.php:93
+#: include/views/configuration.host.discovery.edit.php:326
+#: include/views/configuration.host.edit.php:260
+#: include/views/configuration.host.edit.php:277
+#: include/views/configuration.host.edit.php:293
+#: include/views/configuration.host.edit.php:308
+#: include/views/configuration.host.edit.php:730
+#: include/views/configuration.host.prototype.edit.php:195
+#: include/views/configuration.host.prototype.edit.php:258
+#: include/views/configuration.httpconf.edit.php:269
+#: include/views/configuration.httpconf.popup.php:109
 #: include/views/configuration.item.edit.php:304
 #: include/views/configuration.item.massupdate.php:366
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/configuration.services.edit.php:121
-#: include/views/configuration.services.edit.php:269
+#: include/views/configuration.services.edit.php:120
+#: include/views/configuration.services.edit.php:268
 #: include/views/configuration.slideconf.edit.php:87
 #: include/views/configuration.sysmap.edit.php:173
-#: include/views/configuration.template.edit.php:432
+#: include/views/configuration.template.edit.php:456
 #: include/views/configuration.triggers.edit.php:81
-#: include/views/configuration.triggers.edit.php:98
-#: include/views/configuration.triggers.edit.php:312
-#: include/views/configuration.triggers.massupdate.php:125
+#: include/views/configuration.triggers.edit.php:104
+#: include/views/configuration.triggers.edit.php:318
+#: include/views/configuration.triggers.massupdate.php:124
 #: include/views/js/adm.regexprs.edit.js.php:249
-#: include/views/js/configuration.action.edit.js.php:289
+#: include/views/js/configuration.action.edit.js.php:313
 #: include/views/js/configuration.discovery.edit.js.php:110
-#: include/views/js/configuration.sysmaps.js.php:194
-#: include/views/js/configuration.sysmaps.js.php:407
-#: include/views/monitoring.history.php:100 jsLoader.php:179
-#: popup_bitem.php:166 popup_media.php:137 popup_period.php:130
-#: tr_logform.php:293 tr_status.php:338 tr_status.php:820
+#: include/views/js/configuration.sysmaps.js.php:192
+#: include/views/js/configuration.sysmaps.js.php:405
+#: include/views/monitoring.history.php:101 jsLoader.php:181
+#: popup_bitem.php:176 popup_media.php:137 popup_period.php:143
+#: tr_logform.php:261 tr_status.php:744
 msgid "Add"
 msgstr "新增"
 
-#: jsLoader.php:180
+#: jsLoader.php:182
 msgid "Add child"
 msgstr ""
 
-#: acknow.php:228
+#: acknow.php:227
 msgid "Add comment by"
 msgstr "新增評論由"
 
@@ -477,27 +482,23 @@ msgstr "新增主機"
 msgid "Add link"
 msgstr "新增連結"
 
-#: include/views/conf.import.php:23
-msgid "Add missing"
-msgstr "新增缺少的"
-
-#: include/views/configuration.item.massupdate.php:534
+#: include/views/configuration.item.massupdate.php:546
 msgid "Add new or existing applications"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:107
+#: include/views/configuration.host.massupdate.php:119
 msgid "Add new or existing host groups"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:241
+#: include/views/configuration.graph.edit.php:251
 msgid "Add prototype"
 msgstr "新增原型"
 
-#: slides.php:158
+#: slides.php:159
 msgid "Add to"
 msgstr "新增到"
 
-#: charts.php:110 history.php:96 include/html.inc.php:183 maps.php:67
+#: charts.php:109 history.php:96 include/html.inc.php:189 maps.php:67
 #: screens.php:117
 msgid "Add to favourites"
 msgstr "新增到常用"
@@ -506,7 +507,7 @@ msgstr "新增到常用"
 msgid "Add to host group"
 msgstr "新增到主機群組"
 
-#: include/actions.inc.php:405 include/views/configuration.action.edit.php:817
+#: include/actions.inc.php:405 include/views/configuration.action.edit.php:872
 msgid "Add to host groups"
 msgstr "新增到主機群組"
 
@@ -518,7 +519,7 @@ msgstr "已新增"
 msgid "Admin"
 msgstr "管理者"
 
-#: include/menu.inc.php:218
+#: include/menu.inc.php:212
 msgid "Administration"
 msgstr "管理"
 
@@ -526,34 +527,34 @@ msgstr "管理"
 msgid "Advanced labels"
 msgstr "進階標示"
 
-#: include/blocks.inc.php:997 include/blocks.inc.php:1293
+#: include/blocks.inc.php:1003 include/blocks.inc.php:1297
 #: include/events.inc.php:196 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:390
+#: include/events.inc.php:275 tr_status.php:305
 msgid "Age"
 msgstr "歷時"
 
-#: tr_status.php:301
+#: include/views/common.filter.trigger.php:92
 msgid "Age less than"
 msgstr "歷時少於"
 
-#: include/views/monitoring.overview.php:64
+#: include/views/monitoring.overview.triggers.php:58
 #, c-format
 msgid "Age less than %s"
 msgstr "歷時少於%s"
 
 #: include/items.inc.php:280 include/views/administration.script.list.php:63
-#: include/views/configuration.httpconf.edit.php:139 popup.php:1442
+#: include/views/configuration.httpconf.edit.php:132 popup.php:1756
 msgid "Agent"
 msgstr "端點代理程式"
 
 #: include/classes/items/CHelpItems.php:65
-#: include/classes/items/CHelpItems.php:311
+#: include/classes/items/CHelpItems.php:315
 msgid "Agent host name defined in the configuration file. String value."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:259
-#: include/views/configuration.host.edit.php:343
-#: include/views/configuration.host.prototype.edit.php:108
+#: include/views/configuration.host.edit.php:268
+#: include/views/configuration.host.edit.php:352
+#: include/views/configuration.host.prototype.edit.php:107
 #: include/views/inventory.host.view.php:103
 msgid "Agent interfaces"
 msgstr "端點代理程式的介面"
@@ -562,12 +563,12 @@ msgstr "端點代理程式的介面"
 msgid "Agent or SNMP or JMX or IPMI interface"
 msgstr "端點代理程式或SNMP或JMX或IPMI的介面"
 
-#: include/classes/items/CHelpItems.php:569
+#: include/classes/items/CHelpItems.php:577
 msgid "Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual."
 msgstr ""
 
-#: include/hosts.inc.php:120 include/views/administration.users.edit.php:52
-#: include/views/administration.users.list.php:54 popup.php:563 users.php:44
+#: include/hosts.inc.php:120 include/views/administration.users.edit.php:51
+#: include/views/administration.users.list.php:54 popup.php:594 users.php:44
 msgid "Alias"
 msgstr "別名"
 
@@ -575,122 +576,125 @@ msgstr "別名"
 msgid "Align icons"
 msgstr "對齊圖示"
 
-#: include/reports.inc.php:326
+#: include/reports.inc.php:329
 #: include/views/administration.auditlogs.list.php:42
 #: include/views/administration.auditlogs.list.php:52
 #: include/views/administration.general.gui.edit.php:28
-#: include/views/administration.script.edit.php:74
-#: include/views/administration.script.edit.php:82
+#: include/views/administration.script.edit.php:73
+#: include/views/administration.script.edit.php:81
 #: include/views/administration.script.list.php:80
 #: include/views/administration.script.list.php:81
-#: include/views/administration.usergroups.edit.php:45
+#: include/views/administration.usergroups.edit.php:44
 #: include/views/administration.users.list.php:36
-#: include/views/configuration.action.edit.php:558
+#: include/views/configuration.action.edit.php:604
 #: include/views/configuration.hostgroups.edit.php:44
 #: include/views/configuration.sysmap.edit.php:121
 #: include/views/monitoring.dashconf.php:48
-#: include/views/monitoring.dashconf.php:92 jsLoader.php:91
+#: include/views/monitoring.dashconf.php:104 jsLoader.php:92
 msgid "All"
 msgstr "所有"
 
-#: include/classes/class.chostsinfo.php:108
-#: include/classes/class.ctriggersinfo.php:116
+#: include/classes/html/CHostsInfo.php:108
+#: include/classes/html/CTriggersInfo.php:114
 msgid "All groups"
 msgstr "所有群組"
 
-#: jsLoader.php:151
+#: jsLoader.php:152
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "所有的連結應含 特定的名稱和URL"
 
 #: include/views/configuration.host.discovery.edit.php:249
-#: include/views/configuration.item.edit.php:393
+#: include/views/configuration.item.edit.php:387
 #: include/views/configuration.item.massupdate.php:457
 msgid "Allowed hosts"
 msgstr "容許的主機"
 
 #: include/classes/items/CHelpItems.php:293
-#: include/classes/items/CHelpItems.php:551
+#: include/classes/items/CHelpItems.php:555
 msgid "Amount of memory size in bytes. If mode is missing total is used."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:111
-#: include/views/configuration.action.edit.php:925
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:120
+#: include/views/configuration.action.edit.php:989
 #: include/views/configuration.host.discovery.edit.php:278
+#: include/views/configuration.triggers.edit.php:112
 msgid "And"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:110
-#: include/views/configuration.action.edit.php:924
+#: include/views/configuration.action.edit.php:119
+#: include/views/configuration.action.edit.php:988
 #: include/views/configuration.host.discovery.edit.php:277
 msgid "And/Or"
 msgstr ""
 
-#: tr_status.php:258 tr_status.php:265
+#: include/views/common.filter.trigger.php:38
+#: include/views/common.filter.trigger.php:46
 msgid "Any"
 msgstr "任何"
 
-#: include/regexp.inc.php:186 include/views/js/adm.regexprs.edit.js.php:112
+#: include/regexp.inc.php:208 include/views/js/adm.regexprs.edit.js.php:112
 msgid "Any character string included"
 msgstr "包括任何字元字串"
 
-#: applications.php:115 httpconf.php:42 include/actions.inc.php:88
-#: include/audit.inc.php:32 include/forms.inc.php:552
+#: applications.php:119 httpconf.php:42 include/actions.inc.php:88
+#: include/audit.inc.php:32 include/forms.inc.php:566
 #: include/views/configuration.application.edit.php:46
 #: include/views/configuration.application.list.php:61
 #: include/views/configuration.httpconf.edit.php:64
 #: include/views/configuration.httpconf.edit.php:69
-#: include/views/configuration.screen.constructor.edit.php:382
-#: include/views/inventory.host.view.php:226
-#: include/views/js/configuration.sysmaps.js.php:120
-#: include/views/monitoring.overview.php:32
+#: include/views/configuration.httpconf.list.php:70
+#: include/views/configuration.screen.constructor.edit.php:502
+#: include/views/inventory.host.view.php:238
+#: include/views/js/configuration.sysmaps.js.php:118
 msgid "Application"
 msgstr "應用集"
 
-#: api/classes/CApplication.php:340
+#: include/classes/api/services/CApplication.php:350
 #, c-format
 msgid "Application \"%1$s\" already exists."
 msgstr "應用集 \"%1$s\"已存在."
 
-#: applications.php:106
+#: applications.php:110
 msgid "Application added"
 msgstr "應用集已新增"
 
-#: applications.php:151 applications.php:186
+#: applications.php:162 applications.php:202
 #, fuzzy
 msgid "Application deleted"
 msgid_plural "Applications deleted"
 msgstr[0] "應用集已删除"
 
-#: api/rpc/class.cjsonrpc.php:194
+#: include/classes/core/CJsonRpc.php:194
 msgid "Application error."
 msgstr "應用集 錯誤."
 
-#: applications.php:99
+#: applications.php:103
 msgid "Application updated"
 msgstr "應用集已更新"
 
-#: api/classes/CItemGeneral.php:397
+#: include/classes/api/services/CItemGeneral.php:397
 #, c-format
 msgid "Application with ID \"%1$s\" is not available on \"%2$s\"."
 msgstr "ID為 \"%1$s\"的應用集不在\"%2$s\"之中."
 
-#: hosts.php:836 hosts.php:928 include/forms.inc.php:875
-#: include/html.inc.php:355 include/html.inc.php:359
+#: hosts.php:862 hosts.php:951 include/forms.inc.php:889
+#: include/html.inc.php:361 include/html.inc.php:365
 #: include/views/configuration.application.list.php:47
-#: include/views/configuration.host.edit.php:441
-#: include/views/configuration.item.edit.php:406
+#: include/views/configuration.host.edit.php:446
+#: include/views/configuration.item.edit.php:400
 #: include/views/configuration.item.list.php:70
-#: include/views/configuration.item.prototype.list.php:57
-#: include/views/configuration.template.edit.php:199
-#: include/views/inventory.host.view.php:215 popup.php:39 search.php:140
-#: search.php:169 search.php:197 search.php:394 search.php:422 search.php:454
-#: templates.php:496 templates.php:557
+#: include/views/configuration.item.prototype.list.php:53
+#: include/views/configuration.template.edit.php:196
+#: include/views/conf.import.php:32 include/views/inventory.host.view.php:227
+#: popup.php:55 search.php:140 search.php:169 search.php:197 search.php:394
+#: search.php:422 search.php:454 templates.php:510 templates.php:568
 msgid "Applications"
 msgstr "應用集"
 
-#: include/views/js/configuration.sysmaps.js.php:203
-#: include/views/js/configuration.sysmaps.js.php:304
-#: include/views/js/configuration.sysmaps.js.php:417
+#: include/views/js/configuration.sysmaps.js.php:201
+#: include/views/js/configuration.sysmaps.js.php:302
+#: include/views/js/configuration.sysmaps.js.php:415
 msgid "Apply"
 msgstr "適用"
 
@@ -699,16 +703,16 @@ msgctxt "maintenance status"
 msgid "Approaching"
 msgstr "接近中"
 
-#: include/func.inc.php:252
+#: include/func.inc.php:240
 msgid "Apr"
 msgstr "四月"
 
-#: include/forms.inc.php:1668 include/func.inc.php:132
-#: include/func.inc.php:269 jsLoader.php:114
+#: include/forms.inc.php:1684 include/func.inc.php:120
+#: include/func.inc.php:257 jsLoader.php:115
 msgid "April"
 msgstr "四月"
 
-#: include/classes/class.cbuttonqmessage.php:48
+#: include/classes/html/CButtonQMessage.php:48
 msgid "Are you sure you want perform this action?"
 msgstr "您確定要完成這個動作嗎?"
 
@@ -724,9 +728,9 @@ msgstr "區域尺寸"
 msgid "Area type"
 msgstr "區域類型"
 
-#: include/views/configuration.item.edit.php:364
-#: include/views/configuration.item.edit.php:381
-#: include/views/configuration.item.edit.php:385
+#: include/views/configuration.item.edit.php:354
+#: include/views/configuration.item.edit.php:372
+#: include/views/configuration.item.edit.php:379
 #: include/views/configuration.item.massupdate.php:424
 #: include/views/configuration.item.massupdate.php:438
 msgid "As is"
@@ -740,50 +744,47 @@ msgstr "純文字"
 msgid "Asset tag"
 msgstr "區域標籤"
 
-#: include/maintenances.inc.php:53
-#, c-format
-msgid "At %1$s:%2$s on %3$s"
-msgstr ""
-
-#: include/maintenances.inc.php:122
+#: include/maintenances.inc.php:118
 #, c-format
 msgid "At %1$s:%2$s on %3$s %4$s of every %5$s"
 msgstr ""
 
-#: include/maintenances.inc.php:131
+#: include/maintenances.inc.php:127
 #, c-format
 msgid "At %1$s:%2$s on day %3$s of every %4$s"
 msgstr ""
 
-#: include/maintenances.inc.php:80
+#: include/maintenances.inc.php:76
 #, c-format
 msgid "At %1$s:%2$s on every %3$s of every week"
 msgid_plural "At %1$s:%2$s on every %3$s of every %4$s weeks"
 msgstr[0] ""
 
-#: include/maintenances.inc.php:60
+#: include/maintenances.inc.php:56
 #, c-format
 msgid "At %1$s:%2$s on every day"
 msgid_plural "At %1$s:%2$s on every %3$s days"
 msgstr[0] ""
 
-#: include/forms.inc.php:1749
+#: include/forms.inc.php:1765
 msgid "At (hour:minute)"
 msgstr "於(時:分)"
 
-#: api/classes/CMaintenance.php:297 api/classes/CMaintenance.php:490
+#: include/classes/api/services/CMaintenance.php:302
+#: include/classes/api/services/CMaintenance.php:537
 msgid "At least one host or group should be selected."
 msgstr "應該選擇至少一個主機或群組."
 
-#: api/classes/CMaintenance.php:367 api/classes/CMaintenance.php:481
+#: include/classes/api/services/CMaintenance.php:391
+#: include/classes/api/services/CMaintenance.php:528
 msgid "At least one maintenance period must be created."
 msgstr "必須創建至少一個維修期間."
 
-#: include/classes/class.frontendsetup.php:225
+#: include/classes/setup/CFrontendSetup.php:228
 msgid "At least one of MySQL, PostgreSQL, Oracle, SQLite3 or IBM DB2 should be supported."
 msgstr ""
 
-#: include/menu.inc.php:263
+#: include/menu.inc.php:255
 #: include/views/administration.general.housekeeper.edit.php:100
 msgid "Audit"
 msgstr "審計"
@@ -803,26 +804,28 @@ msgstr ""
 msgid "Audit log"
 msgstr ""
 
-#: include/func.inc.php:256
+#: include/func.inc.php:244
 msgid "Aug"
 msgstr "八月"
 
-#: include/forms.inc.php:1660 include/func.inc.php:136
-#: include/func.inc.php:273 jsLoader.php:118
+#: include/forms.inc.php:1676 include/func.inc.php:124
+#: include/func.inc.php:261 jsLoader.php:119
 msgid "August"
 msgstr "八月"
 
-#: include/menu.inc.php:246 include/views/configuration.httpconf.edit.php:80
+#: include/menu.inc.php:238 include/views/configuration.httpconf.edit.php:156
+#: include/views/configuration.httpconf.edit.php:281
+#: include/views/configuration.httpconf.list.php:68
 msgid "Authentication"
 msgstr "認證"
 
-#: include/views/configuration.host.edit.php:730
-#: include/views/configuration.host.edit.php:742
-#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.host.edit.php:761
+#: include/views/configuration.host.edit.php:773
+#: include/views/configuration.host.prototype.edit.php:271
 msgid "Authentication algorithm"
 msgstr "認證法則"
 
-#: include/views/configuration.action.edit.php:711
+#: include/views/configuration.action.edit.php:757
 #: include/views/configuration.host.discovery.edit.php:166
 #: include/views/configuration.item.edit.php:172
 #: include/views/configuration.item.massupdate.php:250
@@ -881,9 +884,9 @@ msgstr ""
 msgid "Auto-registration event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:790
-#: include/views/configuration.host.massupdate.php:252
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.edit.php:820
+#: include/views/configuration.host.massupdate.php:284
+#: include/views/configuration.host.prototype.edit.php:313
 msgid "Automatic"
 msgstr "自動地"
 
@@ -891,20 +894,20 @@ msgstr "自動地"
 msgid "Automatic icon mapping"
 msgstr "自動的圖示對應"
 
-#: include/views/js/configuration.sysmaps.js.php:135
-#: include/views/js/configuration.sysmaps.js.php:260
+#: include/views/js/configuration.sysmaps.js.php:133
+#: include/views/js/configuration.sysmaps.js.php:258
 msgid "Automatic icon selection"
 msgstr "自動的圖示選擇"
 
-#: hosts.php:845
+#: hosts.php:871
 msgid "Availability"
 msgstr "可用性"
 
-#: include/menu.inc.php:129 report2.php:26
+#: include/menu.inc.php:125 report2.php:26
 msgid "Availability report"
 msgstr "可用性報表"
 
-#: include/classes/class.chostsinfo.php:118
+#: include/classes/html/CHostsInfo.php:118
 msgid "Available"
 msgstr "可用"
 
@@ -913,36 +916,36 @@ msgstr "可用"
 msgid "Average"
 msgstr "一般嚴重"
 
-#: include/reports.inc.php:395
+#: include/reports.inc.php:398
 msgid "Average by"
 msgstr "平均之"
 
-#: popup_trexpr.php:155
+#: popup_trexpr.php:145
 msgid "Average value of a period T is < N"
 msgstr "一個期間T的平均值是 < N"
 
-#: popup_trexpr.php:165
+#: popup_trexpr.php:155
 msgid "Average value of a period T is = N"
 msgstr "一個期間T的平均值是 = N"
 
-#: popup_trexpr.php:160
+#: popup_trexpr.php:150
 msgid "Average value of a period T is > N"
 msgstr "一個期間T的平均值是 > N"
 
-#: popup_trexpr.php:170
+#: popup_trexpr.php:160
 msgid "Average value of a period T is NOT N"
 msgstr "一個期間T的平均值不是 N"
 
-#: popup_bitem.php:156
+#: popup_bitem.php:166
 msgid "Axis side"
 msgstr "軸側"
 
-#: include/func.inc.php:433
+#: include/func.inc.php:421
 msgctxt "Byte short"
 msgid "B"
 msgstr "B"
 
-#: include/views/administration.general.image.edit.php:29
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:25
 msgid "Background"
 msgstr "背景"
@@ -951,7 +954,7 @@ msgstr "背景"
 msgid "Background image"
 msgstr "背景圖片"
 
-#: include/menu.inc.php:137 report6.php:25 report6.php:231
+#: include/menu.inc.php:133 report6.php:25 report6.php:242
 msgid "Bar reports"
 msgstr "條狀圖報表"
 
@@ -961,8 +964,8 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: include/httptest.inc.php:28
-msgid "Basic authentication"
-msgstr "基本認證方式"
+msgid "Basic"
+msgstr ""
 
 #: include/views/administration.authentication.edit.php:91
 msgid "Bind DN"
@@ -974,15 +977,15 @@ msgstr "Bind DN"
 msgid "Bind password"
 msgstr "Bind密碼"
 
-#: popup_trexpr.php:521
+#: popup_trexpr.php:511
 msgid "Bitwise AND of last (most recent) T value and mask is = N"
 msgstr ""
 
-#: popup_trexpr.php:526
+#: popup_trexpr.php:516
 msgid "Bitwise AND of last (most recent) T value and mask is NOT N"
 msgstr ""
 
-#: include/classes/core/ZBase.php:241
+#: include/classes/core/ZBase.php:251
 msgid "Black & Blue"
 msgstr "黑&藍"
 
@@ -994,8 +997,8 @@ msgstr "閃爍中"
 msgid "Blocked"
 msgstr "封鎖的"
 
-#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:375
-#: include/views/js/configuration.sysmaps.js.php:453
+#: include/graphs.inc.php:59 include/views/js/configuration.sysmaps.js.php:373
+#: include/views/js/configuration.sysmaps.js.php:451
 msgid "Bold line"
 msgstr "粗線"
 
@@ -1003,22 +1006,22 @@ msgstr "粗線"
 msgid "Boolean"
 msgstr "二元邏輯"
 
-#: include/views/configuration.screen.constructor.edit.php:571
+#: include/views/configuration.screen.constructor.edit.php:714
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:83
-#: include/views/js/configuration.sysmaps.js.php:250
+#: include/views/js/configuration.sysmaps.js.php:248
 msgid "Bottom"
 msgstr "底部"
 
-#: include/reports.inc.php:433
+#: include/reports.inc.php:436
 msgid "Brighten"
 msgstr "轉亮"
 
-#: include/locales.inc.php:52
+#: include/locales.inc.php:56
 msgid "Bulgarian (bg_BG)"
 msgstr ""
 
-#: tr_status.php:905
+#: tr_status.php:829
 msgid "Bulk acknowledge"
 msgstr "整批知悉"
 
@@ -1044,7 +1047,7 @@ msgstr "應用集的組態"
 msgid "CONFIGURATION OF AUTHENTICATION"
 msgstr "授權的組態"
 
-#: host_discovery.php:333 include/views/configuration.discovery.edit.php:25
+#: host_discovery.php:345 include/views/configuration.discovery.edit.php:25
 #: include/views/configuration.discovery.list.php:28
 #: include/views/configuration.host.discovery.list.php:29
 msgid "CONFIGURATION OF DISCOVERY RULES"
@@ -1074,7 +1077,7 @@ msgstr "主機群組的組態"
 msgid "CONFIGURATION OF HOST PROTOTYPES"
 msgstr ""
 
-#: hosts.php:681 hosts.php:746 hosts.php:792
+#: hosts.php:701 hosts.php:766 hosts.php:818
 msgid "CONFIGURATION OF HOSTS"
 msgstr "主機的組態"
 
@@ -1086,7 +1089,7 @@ msgstr ""
 msgid "CONFIGURATION OF ICON MAPPING"
 msgstr "圖示對應的組態"
 
-#: adm.images.php:153
+#: adm.images.php:155
 msgid "CONFIGURATION OF IMAGES"
 msgstr "圖片的組態"
 
@@ -1095,14 +1098,14 @@ msgstr "圖片的組態"
 msgid "CONFIGURATION OF IT SERVICES"
 msgstr "IT服務的組態"
 
-#: disc_prototypes.php:349
+#: disc_prototypes.php:366
 #: include/views/configuration.item.prototype.list.php:29
 msgid "CONFIGURATION OF ITEM PROTOTYPES"
 msgstr "項目原型的組態"
 
 #: include/views/configuration.item.list.php:39
-#: include/views/configuration.item.massupdate.php:28 items.php:797
-#: items.php:932
+#: include/views/configuration.item.massupdate.php:28 items.php:825
+#: items.php:960
 msgid "CONFIGURATION OF ITEMS"
 msgstr "項目的組態"
 
@@ -1131,7 +1134,7 @@ msgstr "網絡拓墣圖的組態"
 msgid "CONFIGURATION OF PROXIES"
 msgstr "系統代理程式的組態"
 
-#: adm.regexps.php:212
+#: adm.regexps.php:220
 msgid "CONFIGURATION OF REGULAR EXPRESSIONS"
 msgstr "正規表示法的組態"
 
@@ -1151,7 +1154,7 @@ msgstr "脚本的組態"
 msgid "CONFIGURATION OF SLIDE SHOWS"
 msgstr "簡報片展示的組態"
 
-#: templates.php:427 templates.php:481
+#: templates.php:435 templates.php:495
 msgid "CONFIGURATION OF TEMPLATES"
 msgstr "模板的組態"
 
@@ -1167,7 +1170,7 @@ msgstr "觸發器嚴重性的組態"
 
 #: include/views/configuration.triggers.edit.php:40
 #: include/views/configuration.triggers.list.php:54
-#: include/views/configuration.triggers.massupdate.php:42 triggers.php:338
+#: include/views/configuration.triggers.massupdate.php:42 triggers.php:351
 msgid "CONFIGURATION OF TRIGGERS"
 msgstr "觸發器的組態"
 
@@ -1199,22 +1202,22 @@ msgid "CONFIGURATION OF ZABBIX"
 msgstr "Zabbix的組態"
 
 #: include/classes/items/CHelpItems.php:185
-#: include/classes/items/CHelpItems.php:443
+#: include/classes/items/CHelpItems.php:447
 msgid "CPU info - lists full info for all CPUs by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:161
-#: include/classes/items/CHelpItems.php:419
+#: include/classes/items/CHelpItems.php:423
 msgid "CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing all is used. If mode is missing avg1 is used. Note that this is not percentage."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:173
-#: include/classes/items/CHelpItems.php:431
-msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used.  If type is missing user is used. If mode is missing avg1 is used."
+#: include/classes/items/CHelpItems.php:435
+msgid "CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing all is used. If type is missing user is used. If mode is missing avg1 is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:265
-#: include/classes/items/CHelpItems.php:523
+#: include/classes/items/CHelpItems.php:527
 msgid "Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/usr/local/etc/zabbix_agentd.conf]"
 msgstr ""
 
@@ -1223,21 +1226,21 @@ msgid "Calculate SLA, acceptable SLA (in %)"
 msgstr "計算SLA, 可接受的SAL(%計)"
 
 #: include/classes/items/CHelpItems.php:253
-#: include/classes/items/CHelpItems.php:511
+#: include/classes/items/CHelpItems.php:515
 msgid "Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum. Example: vfs.file.cksum[/etc/passwd]"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:289
-#: include/classes/items/CHelpItems.php:547
-msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
+#: include/classes/items/CHelpItems.php:551
+msgid "Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used. In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free]."
 msgstr ""
 
-#: include/items.inc.php:97 include/views/configuration.graph.edit.php:96
-#: include/views/configuration.graph.edit.php:154
+#: include/items.inc.php:97 include/views/configuration.graph.edit.php:106
+#: include/views/configuration.graph.edit.php:164
 msgid "Calculated"
 msgstr "計算的"
 
-#: include/views/administration.usergroups.edit.php:120
+#: include/views/administration.usergroups.edit.php:119
 msgid "Calculated permissions"
 msgstr "已計許可權"
 
@@ -1245,92 +1248,95 @@ msgstr "已計許可權"
 msgid "Callback"
 msgstr "回呼"
 
-#: include/views/administration.mediatypes.edit.php:90
+#: include/views/administration.mediatypes.edit.php:89
 msgid "Canada (136 characters)"
 msgstr "加拿大 (136 字元)"
 
-#: include/classes/class.cbuttoncancel.php:25 include/js.inc.php:223
-#: include/setup.inc.php:128
+#: include/classes/html/CButtonCancel.php:25
+#: include/classes/setup/CSetupWizard.php:128 include/js.inc.php:215
 #: include/views/administration.general.regularexpressions.edit.php:58
-#: include/views/configuration.action.edit.php:986
-#: include/views/configuration.action.edit.php:995
+#: include/views/configuration.action.edit.php:1050
+#: include/views/configuration.action.edit.php:1059
 #: include/views/configuration.maintenance.edit.php:147
 #: include/views/configuration.services.parent.list.php:62
 #: include/views/js/administration.general.housekeeper.edit.js.php:127
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:55
 #: include/views/js/administration.general.triggerSeverity.js.php:38
 #: include/views/js/configuration.action.edit.js.php:102
-#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:103
-#: tr_logform.php:376
+#: include/views/js/configuration.discovery.edit.js.php:114 jsLoader.php:104
+#: tr_logform.php:346
 msgid "Cancel"
 msgstr "取消"
 
-#: acknow.php:168
+#: acknow.php:167
 msgid "Cannot acknowledge event"
 msgstr "無法知悉事件"
 
-#: api/classes/CGraph.php:685 api/classes/CGraph.php:699
-#: api/classes/CGraph.php:713
+#: include/classes/api/services/CGraph.php:716
+#: include/classes/api/services/CGraph.php:730
+#: include/classes/api/services/CGraph.php:744
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph \"%2$s\"."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:670 api/classes/CGraphPrototype.php:731
+#: include/classes/api/services/CGraphPrototype.php:688
+#: include/classes/api/services/CGraphPrototype.php:752
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
 msgstr ""
 
-#: include/reports.inc.php:489
+#: include/reports.inc.php:492
 #, c-format
 msgid "Cannot add a non-numeric item \"%1$s\"."
 msgstr ""
 
-#: actionconf.php:149
+#: actionconf.php:163
 msgid "Cannot add action"
 msgstr "無法新增操作"
 
-#: actionconf.php:221
+#: actionconf.php:248
 msgid "Cannot add action condition"
 msgstr ""
 
-#: applications.php:107
+#: applications.php:111
 msgid "Cannot add application"
 msgstr "無法新增應用集"
 
-#: api/classes/CTrigger.php:1381
+#: include/classes/api/services/CTrigger.php:1373
 msgid "Cannot add dependency from a host to a template."
 msgstr "無法新增自主機到模板的相依關係"
 
-#: include/triggers.inc.php:505
+#: include/triggers.inc.php:493
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
 msgstr "無法自觸發器\"%1$s:%2$s\" 新增相依關係到不存在的觸發器\"%3$s:%4$s\"."
 
-#: host_discovery.php:290
+#: host_discovery.php:297
 msgid "Cannot add discovery rule"
 msgstr "無法新增自動探索的規則"
 
-#: graphs.php:250
+#: graphs.php:255
 msgid "Cannot add graph"
 msgstr "無法新增圖表"
 
-#: graphs.php:232
+#: graphs.php:237
 msgid "Cannot add graph prototype"
 msgstr ""
 
-#: hostgroups.php:127 usergrps.php:189
+#: hostgroups.php:120 usergrps.php:195
 msgid "Cannot add group"
 msgstr "無法新增群組"
 
-#: api/classes/CTemplate.php:365 api/classes/CTemplate.php:795
+#: include/classes/api/services/CTemplate.php:375
+#: include/classes/api/services/CTemplate.php:826
 msgid "Cannot add group."
 msgstr ""
 
-#: hosts.php:390
+#: hosts.php:394
 msgid "Cannot add host"
 msgstr "無法新增主機"
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Cannot add host prototype"
 msgstr ""
 
@@ -1338,24 +1344,24 @@ msgstr ""
 msgid "Cannot add image"
 msgstr "無法新增圖片"
 
-#: include/classes/import/CXmlImport18.php:667
+#: include/classes/import/CXmlImport18.php:649
 msgid "Cannot add image."
 msgstr "無法新增圖片."
 
-#: items.php:480 screenedit.php:190
+#: items.php:493
 msgid "Cannot add item"
 msgstr "無法新增項目"
 
-#: api/classes/CApplication.php:512
+#: include/classes/api/services/CApplication.php:522
 #, c-format
 msgid "Cannot add item \"%1$s\" from \"%2$s\" to application \"%3$s\" from \"%4$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Cannot add item prototype"
 msgstr ""
 
-#: api/classes/CApplication.php:565
+#: include/classes/api/services/CApplication.php:575
 msgid "Cannot add items."
 msgstr ""
 
@@ -1363,20 +1369,20 @@ msgstr ""
 msgid "Cannot add macro."
 msgstr "無法新增巨集"
 
-#: maintenance.php:126
+#: maintenance.php:131
 msgid "Cannot add maintenance"
 msgstr "無法新增維修"
 
-#: media_types.php:131
+#: media_types.php:134
 msgid "Cannot add media type"
 msgstr "無法新增示警媒介類型"
 
-#: api/classes/CGraph.php:43
+#: include/classes/api/services/CGraph.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph \"%1$s\"."
 msgstr "無法新增超過一個 \"圖形總計\"類型的項目於圖形 \"%1$s\"上."
 
-#: api/classes/CGraphPrototype.php:43
+#: include/classes/api/services/CGraphPrototype.php:43
 #, c-format
 msgid "Cannot add more than one item with type \"Graph sum\" on graph prototype \"%1$s\"."
 msgstr ""
@@ -1385,24 +1391,24 @@ msgstr ""
 msgid "Cannot add network map"
 msgstr "無法新增網路拓墣圖"
 
-#: httpconf.php:233
+#: httpconf.php:261
 #, c-format
 msgid "Cannot add new application \"%1$s\"."
 msgstr ""
 
-#: proxies.php:116
+#: proxies.php:120
 msgid "Cannot add proxy"
 msgstr "無法新增系統代理程式"
 
-#: adm.regexps.php:133
+#: adm.regexps.php:141
 msgid "Cannot add regular expression"
 msgstr "無法新增正規表示式"
 
-#: screenconf.php:167
+#: screenconf.php:168
 msgid "Cannot add screen"
 msgstr "無法新增篩選"
 
-#: scripts.php:96 scripts.php:100 scripts.php:129
+#: scripts.php:89 scripts.php:93 scripts.php:122
 msgid "Cannot add script"
 msgstr "無法新增脚本"
 
@@ -1414,27 +1420,27 @@ msgstr "無法新增服務"
 msgid "Cannot add slide show"
 msgstr "無法新增簡報片展示"
 
-#: templates.php:242
+#: templates.php:245
 msgid "Cannot add template"
 msgstr "無法新增模板"
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Cannot add trigger"
 msgstr "無法新增觸發器"
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Cannot add trigger prototype"
 msgstr ""
 
-#: users.php:247
+#: users.php:248
 msgid "Cannot add user"
 msgstr "無法新增用户"
 
-#: users.php:190
+#: users.php:191
 msgid "Cannot add user. Both passwords must be equal."
 msgstr "無法新增用户. 兩次輸入的密碼必須一致."
 
-#: api/classes/CUserGroup.php:248
+#: include/classes/api/services/CUserGroup.php:263
 msgid "Cannot add users."
 msgstr "無法新增用戶"
 
@@ -1442,7 +1448,7 @@ msgstr "無法新增用戶"
 msgid "Cannot add value map"
 msgstr "無法新增值對應"
 
-#: httpconf.php:186
+#: httpconf.php:198
 msgid "Cannot add web scenario"
 msgstr ""
 
@@ -1462,23 +1468,23 @@ msgstr "無法改變授權方式為LDAP"
 msgid "Cannot change authentication method to Zabbix internal"
 msgstr "無法改變授權方式為Zabbix內部"
 
-#: httpconf.php:171 httpconf.php:372 items.php:506
+#: httpconf.php:186 httpconf.php:407 items.php:520
 msgid "Cannot clear history"
 msgstr "無法清除歷史"
 
-#: api/classes/CDiscoveryRule.php:1185
+#: include/classes/api/services/CDiscoveryRule.php:1195
 msgid "Cannot clone graph prototypes."
 msgstr "無法克隆圖形原型"
 
-#: api/classes/CDiscoveryRule.php:1233
+#: include/classes/api/services/CDiscoveryRule.php:1243
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:1069
+#: include/classes/api/services/CDiscoveryRule.php:1079
 msgid "Cannot clone item prototypes."
 msgstr "無法克隆項目原型"
 
-#: api/classes/CDiscoveryRule.php:612
+#: include/classes/api/services/CDiscoveryRule.php:622
 msgid "Cannot clone trigger prototypes."
 msgstr "無法克隆觸發器原型"
 
@@ -1486,20 +1492,20 @@ msgstr "無法克隆觸發器原型"
 msgid "Cannot connect to the trapper port of zabbix server daemon, but it should be available to run the script."
 msgstr "無法連接到系統主機主控程序的捉捕器的埠, 但是它應該可用的..."
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Cannot copy graphs"
 msgstr "無法複製圖形"
 
-#: items.php:716
+#: items.php:743
 msgid "Cannot copy items"
 msgstr "無法複製項目"
 
-#: include/triggers.inc.php:412
+#: include/triggers.inc.php:400
 #, c-format
 msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression."
 msgstr "無法複製觸發器 \"%1$s:%2$s\", 因為在其表示式中有多重主機."
 
-#: api/classes/CHostPrototype.php:151
+#: include/classes/api/services/CHostPrototype.php:151
 #, c-format
 msgid "Cannot create a host prototype on a discovered host \"%1$s\"."
 msgstr ""
@@ -1508,19 +1514,19 @@ msgstr ""
 msgid "Cannot create another database connection."
 msgstr "無法創建另外資料庫連線."
 
-#: api/classes/CTrigger.php:1415
+#: include/classes/api/services/CTrigger.php:1407
 msgid "Cannot create circular dependencies."
 msgstr "無法創建迴圈式相依關係"
 
-#: api/classes/CTrigger.php:1387
+#: include/classes/api/services/CTrigger.php:1379
 msgid "Cannot create dependency on trigger itself."
 msgstr "無法創建在觸發器自身上的相依關係."
 
-#: discoveryconf.php:144
+#: discoveryconf.php:154
 msgid "Cannot create discovery rule"
 msgstr "無法創建探索規則"
 
-#: api/classes/CHost.php:1072
+#: include/classes/api/services/CHost.php:1063
 msgid "Cannot create host group."
 msgstr "無法創建主機群組."
 
@@ -1528,101 +1534,100 @@ msgstr "無法創建主機群組."
 msgid "Cannot create icon map"
 msgstr "無法創建圖示對應"
 
-#: api/classes/CIconMap.php:166 api/classes/CIconMap.php:226
+#: include/classes/api/services/CIconMap.php:166
+#: include/classes/api/services/CIconMap.php:226
 #, c-format
 msgid "Cannot create icon maps with identical name \"%s\"."
 msgstr "無法創建同名為\"%s\"的圖示對應."
 
-#: include/classes/import/CXmlImport18.php:848
+#: include/classes/import/CXmlImport18.php:835
 #, c-format
 msgid "Cannot create map \"%s\"."
 msgstr "無法創建拓墣圖 \"%s\"."
 
-#: httpconf.php:190
+#: httpconf.php:205
 msgid "Cannot create new application, web scenario is already assigned to application."
 msgstr ""
 
-#: include/js.inc.php:266
+#: include/js.inc.php:258
 msgid "Cannot create new element"
 msgstr "無法創建新組件"
 
-#: include/classes/import/CXmlImport18.php:1737
-msgid "Cannot create screen."
-msgstr "無法創建篩選."
-
-#: api/classes/CTemplate.php:379
+#: include/classes/api/services/CTemplate.php:389
 msgid "Cannot create template."
 msgstr ""
 
-#: api/classes/CUser.php:1312
+#: include/classes/api/services/CUser.php:1317
 #, c-format
 msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
 msgstr "無法刪除Zabbix內部用戶 \"%1$s\", 試試停用那用戶."
 
-#: actionconf.php:165
+#: actionconf.php:186
 msgid "Cannot delete action"
 msgstr "無法删除動作"
 
-#: applications.php:151 applications.php:187
+#: applications.php:162 applications.php:203
 #, fuzzy
 msgid "Cannot delete application"
 msgid_plural "Cannot delete applications"
 msgstr[0] "無法删除應用集"
 
-#: api/classes/CTrigger.php:1041
+#: include/classes/api/services/CTrigger.php:1035
 msgid "Cannot delete dependency"
 msgstr "無法刪除相依關係"
 
-#: api/classes/CDiscoveryRule.php:420 discoveryconf.php:161
-#: host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
+#: include/classes/api/services/CDiscoveryRule.php:430
 msgid "Cannot delete discovery rule"
 msgstr "無法删除探索規則"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Cannot delete discovery rules"
 msgstr "無法刪除探索規則"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Cannot delete graph"
 msgstr "無法删除圖形"
 
-#: api/classes/CItemPrototype.php:501 graphs.php:279
+#: graphs.php:290 include/classes/api/services/CItemPrototype.php:511
 msgid "Cannot delete graph prototype"
 msgstr "無法刪除圖形原型"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Cannot delete graph prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:666
+#: include/classes/api/services/CItem.php:669
 msgid "Cannot delete graph."
 msgstr "無法刪除圖形."
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Cannot delete graphs"
 msgstr "無法删除圖形"
 
-#: api/classes/CGraphPrototype.php:568
+#: include/classes/api/services/CGraphPrototype.php:581
 msgid "Cannot delete graphs created by low level discovery."
 msgstr "無法刪除由低階層發現所創建的圖形."
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:194 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Cannot delete group"
-msgstr "無法刪除群組"
+msgid_plural "Cannot delete groups"
+msgstr[0] "無法刪除群組"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Cannot delete host"
 msgstr "無法删除主機"
 
-#: api/classes/CHost.php:1083
+#: include/classes/api/services/CHost.php:1074
 msgid "Cannot delete host group."
 msgstr "無法刪除主機群組."
 
-#: api/classes/CDiscoveryRule.php:432
+#: include/classes/api/services/CDiscoveryRule.php:442
 msgid "Cannot delete host prototype."
 msgstr ""
 
-#: host_prototypes.php:119 host_prototypes.php:243
+#: host_prototypes.php:128 host_prototypes.php:257
 msgid "Cannot delete host prototypes"
 msgstr ""
 
@@ -1630,78 +1635,78 @@ msgstr ""
 msgid "Cannot delete icon map"
 msgstr "無法刪除圖示對應"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Cannot delete image"
 msgstr "無法删除圖片"
 
-#: api/classes/CHost.php:1173
+#: include/classes/api/services/CHost.php:1160
 msgid "Cannot delete inventory."
 msgstr "無法刪除資產紀錄."
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Cannot delete item"
 msgstr "無法刪除項目"
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Cannot delete item prototype"
 msgstr ""
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:771
+#: items.php:800
 msgid "Cannot delete items"
 msgstr "無法刪除項目"
 
-#: api/classes/CItemPrototype.php:518
+#: include/classes/api/services/CItemPrototype.php:528
 msgid "Cannot delete items created by low level discovery."
 msgstr "無法刪除由低階層發現所創建的項目."
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Cannot delete maintenance"
 msgstr "無法刪除維修"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Cannot delete media type"
 msgstr "無法刪除示警媒介類型"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Cannot delete network map"
 msgstr "無法刪除網路拓墣圖"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Cannot delete proxy"
 msgstr "無法刪除系統代理程式"
 
-#: adm.regexps.php:181
+#: adm.regexps.php:191
 msgid "Cannot delete regular expression"
 msgid_plural "Cannot delete regular expressions"
 msgstr[0] "無法删除正規表示式 "
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Cannot delete screen"
 msgstr "無法刪除篩選"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Cannot delete script"
 msgstr "無法删除脚本"
 
-#: api/classes/CScript.php:491
+#: include/classes/api/services/CScript.php:491
 msgid "Cannot delete scripts. Empty input parameter \"scriptids\"."
 msgstr "無法刪除腳本.空白的輸入參數\"scriptids\"."
 
-#: api/classes/CScript.php:523
+#: include/classes/api/services/CScript.php:523
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "無法刪除腳本. 腳本 \"%1$s\" 用於動作操作\"%2$s\"."
 
-#: api/classes/CScript.php:506
+#: include/classes/api/services/CScript.php:506
 #, c-format
 msgid "Cannot delete scripts. Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Cannot delete selected actions"
 msgstr "無法刪除所選的動作"
 
@@ -1709,77 +1714,80 @@ msgstr "無法刪除所選的動作"
 msgid "Cannot delete service"
 msgstr "無法删除服務"
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Cannot delete slide show"
 msgstr "無法刪除簡報片展示"
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Cannot delete template"
 msgstr "無法刪除模板"
 
-#: api/classes/CApplication.php:409
+#: include/classes/api/services/CApplication.php:419
 msgid "Cannot delete templated application."
 msgstr ""
 
-#: api/classes/CGraph.php:530 api/classes/CGraphPrototype.php:543
+#: include/classes/api/services/CGraph.php:546
+#: include/classes/api/services/CGraphPrototype.php:556
 msgid "Cannot delete templated graphs."
 msgstr "無法刪除模板圖形."
 
-#: api/classes/CHostPrototype.php:1075
+#: include/classes/api/services/CHostPrototype.php:1075
 msgid "Cannot delete templated host prototype."
 msgstr ""
 
-#: api/classes/CItem.php:630
+#: include/classes/api/services/CItem.php:633
 msgid "Cannot delete templated item."
 msgstr "無法刪除樣本項目."
 
-#: api/classes/CItemPrototype.php:462
+#: include/classes/api/services/CItemPrototype.php:472
 msgid "Cannot delete templated items"
 msgstr "無法刪除模板化的項目"
 
-#: api/classes/CDiscoveryRule.php:380
+#: include/classes/api/services/CDiscoveryRule.php:390
 msgid "Cannot delete templated items."
 msgstr "無法刪除模板項目."
 
-#: api/classes/CTrigger.php:1842 api/classes/CTriggerPrototype.php:597
+#: include/classes/api/services/CTrigger.php:1874
+#: include/classes/api/services/CTriggerPrototype.php:597
 #, c-format
 msgid "Cannot delete templated trigger \"%1$s:%2$s\"."
 msgstr "無法刪除模板化觸發器 \"%1$s:%2$s\"."
 
-#: api/classes/CHttpTest.php:363
+#: include/classes/api/services/CHttpTest.php:366
 #, c-format
 msgid "Cannot delete templated web scenario \"%1$s\"."
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Cannot delete trigger"
 msgstr "無法删除觸發器"
 
-#: api/classes/CItemPrototype.php:533 trigger_prototypes.php:181
+#: include/classes/api/services/CItemPrototype.php:543
+#: trigger_prototypes.php:192
 msgid "Cannot delete trigger prototype"
 msgstr "無法刪除觸發器原型"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Cannot delete trigger prototypes"
 msgstr ""
 
-#: api/classes/CItem.php:682
+#: include/classes/api/services/CItem.php:685
 msgid "Cannot delete trigger."
 msgstr "無法刪除觸發器."
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Cannot delete triggers"
 msgstr "無法删除觸發器"
 
-#: api/classes/CTriggerPrototype.php:635
+#: include/classes/api/services/CTriggerPrototype.php:635
 msgid "Cannot delete triggers created by low level discovery."
 msgstr "無法刪除由低階層發現所創建的觸發器."
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "Cannot delete user"
 msgstr "無法删除用户"
 
-#: api/classes/CUser.php:894
+#: include/classes/api/services/CUser.php:888
 msgid "Cannot delete user media."
 msgstr "無法刪除用戶示警媒介."
 
@@ -1787,67 +1795,67 @@ msgstr "無法刪除用戶示警媒介."
 msgid "Cannot delete value map"
 msgstr "無法刪除值對應"
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Cannot delete web scenario"
 msgstr ""
 
-#: actionconf.php:336
+#: actionconf.php:341
 msgid "Cannot disable action"
 msgid_plural "Cannot disable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:193
+#: discoveryconf.php:205
 msgid "Cannot disable discovery rule"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:313
+#: host_discovery.php:324
 msgid "Cannot disable discovery rules"
 msgid_plural "Cannot disable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:227 hosts.php:657 proxies.php:183
+#: hostgroups.php:244 hosts.php:678 proxies.php:192
 msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:235
+#: host_prototypes.php:242
 msgid "Cannot disable host prototype"
 msgid_plural "Cannot disable host prototypes"
 msgstr[0] ""
 
-#: applications.php:223 items.php:684
+#: applications.php:236 items.php:708
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:313
+#: disc_prototypes.php:326
 msgid "Cannot disable item prototype"
 msgid_plural "Cannot disable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:174
+#: media_types.php:184
 #, fuzzy
 msgid "Cannot disable media type"
 msgid_plural "Cannot disable media types"
 msgstr[0] "無法關閉示警媒介類型"
 
-#: triggers.php:276
+#: triggers.php:281
 msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:248
+#: trigger_prototypes.php:258
 msgid "Cannot disable trigger prototype"
 msgid_plural "Cannot disable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:348
+#: usergrps.php:369
 msgid "Cannot disable user group"
 msgid_plural "Cannot disable user groups"
 msgstr[0] ""
 
-#: httpconf.php:340
+#: httpconf.php:368
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -1860,123 +1868,117 @@ msgstr ""
 msgid "Cannot display more than one item with type \"Graph sum\"."
 msgstr ""
 
-#: actionconf.php:335
+#: actionconf.php:340
 msgid "Cannot enable action"
 msgid_plural "Cannot enable actions"
 msgstr[0] ""
 
-#: discoveryconf.php:192
+#: discoveryconf.php:204
 msgid "Cannot enable discovery rule"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: host_discovery.php:312
+#: host_discovery.php:323
 msgid "Cannot enable discovery rules"
 msgid_plural "Cannot enable discovery rules"
 msgstr[0] ""
 
-#: hostgroups.php:226 hosts.php:656 proxies.php:182
+#: hostgroups.php:243 hosts.php:677 proxies.php:191
 msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 
-#: host_prototypes.php:234
+#: host_prototypes.php:241
 msgid "Cannot enable host prototype"
 msgid_plural "Cannot enable host prototypes"
 msgstr[0] ""
 
-#: applications.php:222 items.php:683
+#: applications.php:235 items.php:707
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
 
-#: disc_prototypes.php:312
+#: disc_prototypes.php:325
 msgid "Cannot enable item prototype"
 msgid_plural "Cannot enable item prototypes"
 msgstr[0] ""
 
-#: media_types.php:173
+#: media_types.php:183
 #, fuzzy
 msgid "Cannot enable media type"
 msgid_plural "Cannot enable media types"
 msgstr[0] "無法刪除示警媒介類型"
 
-#: triggers.php:275
+#: triggers.php:280
 msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 
-#: trigger_prototypes.php:247
+#: trigger_prototypes.php:257
 msgid "Cannot enable trigger prototype"
 msgid_plural "Cannot enable trigger prototypes"
 msgstr[0] ""
 
-#: usergrps.php:347
+#: usergrps.php:368
 msgid "Cannot enable user group"
 msgid_plural "Cannot enable user groups"
 msgstr[0] ""
 
-#: httpconf.php:339
+#: httpconf.php:367
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
 
-#: include/classes/import/CXmlImport18.php:711
+#: include/classes/import/CXmlImport18.php:698
 #: include/classes/import/importers/CMapImporter.php:188
 #, c-format
 msgid "Cannot find background image \"%1$s\" used in map \"%2$s\"."
 msgstr "無法找到用在篩選\"%2$s\"中的群組\"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:525
-#: include/classes/import/CXmlImport18.php:1694
-#: include/classes/import/importers/CAbstractScreenImporter.php:69
+#: include/classes/import/CXmlImport18.php:517
+#: include/classes/import/importers/CAbstractScreenImporter.php:80
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in screen \"%2$s\"."
 msgstr "無法找到用在篩選 \"%2$s\"中的圖形\"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:756
+#: include/classes/import/CXmlImport18.php:743
 #: include/classes/import/importers/CMapImporter.php:209
 #, c-format
 msgid "Cannot find group \"%1$s\" used in map \"%2$s\"."
 msgstr "無法找到用在拓墣圖\"%2$s\"中的群組\"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:491
-#: include/classes/import/importers/CAbstractScreenImporter.php:53
+#: include/classes/import/CXmlImport18.php:483
+#: include/classes/import/importers/CAbstractScreenImporter.php:61
 #, c-format
 msgid "Cannot find group \"%1$s\" used in screen \"%2$s\"."
 msgstr "無法找到用在篩選\"%2$s\"中的群組\"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:767
+#: include/classes/import/CXmlImport18.php:754
 #: include/classes/import/importers/CMapImporter.php:217
 #, c-format
 msgid "Cannot find host \"%1$s\" used in map \"%2$s\"."
 msgstr "無法找到用在拓墣圖\"%2$s\"中的主機\"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:508
-#: include/classes/import/importers/CAbstractScreenImporter.php:61
+#: include/classes/import/CXmlImport18.php:500
+#: include/classes/import/importers/CAbstractScreenImporter.php:69
 #, c-format
 msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"."
 msgstr "無法找到用在篩選\"%2$s\"中的主機\"%1$s\"."
 
-#: include/classes/import/CConfigurationImport.php:797
+#: include/classes/import/CConfigurationImport.php:877
 #, c-format
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:981 api/classes/CDiscoveryRule.php:1057
-#: api/classes/CItemGeneral.php:100 include/items.inc.php:380
+#: include/classes/api/services/CDiscoveryRule.php:991
+#: include/classes/api/services/CDiscoveryRule.php:1067
+#: include/classes/api/services/CItemGeneral.php:100 include/items.inc.php:380
 #: include/items.inc.php:431
 #, c-format
 msgid "Cannot find host interface on \"%1$s\" for item key \"%2$s\"."
 msgstr "找不到用於項目鍵\"%2$s\"的主機介面於 \"%1$s\" ."
 
-#: include/classes/import/CConfigurationImport.php:972
-#: include/classes/import/CConfigurationImport.php:1086
-#, c-format
-msgid "Cannot find host or template \"%1$s\" used in graph \"%2$s\"."
-msgstr ""
-
-#: include/classes/import/CXmlImport18.php:800
+#: include/classes/import/CXmlImport18.php:787
 #: include/classes/import/importers/CMapImporter.php:250
 #, c-format
 msgid "Cannot find icon \"%1$s\" used in map \"%2$s\"."
@@ -1987,34 +1989,53 @@ msgstr "無法找到用在拓墣圖 \"%2$s\"中的圖示\"%1$s\"."
 msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"."
 msgstr "無法找到用在拓墣圖 \"%2$s\"中的圖示對應\"%1$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1070
+#: include/classes/import/CConfigurationImport.php:1153
 #, 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:958
+#: include/classes/import/CConfigurationImport.php:1053
 #, 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:1052
+#: include/classes/import/CConfigurationImport.php:1137
 #, 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:938
+#: include/classes/import/CConfigurationImport.php:1033
 #, 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/CXmlImport18.php:545
-#: include/classes/import/CXmlImport18.php:1707
-#: include/classes/import/importers/CAbstractScreenImporter.php:82
+#: include/classes/import/CConfigurationImport.php:1172
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1073
+#, 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 ""
+
+#: include/classes/import/CConfigurationImport.php:1228
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger \"%3$s\"."
+msgstr ""
+
+#: include/classes/import/CConfigurationImport.php:1002
+#, c-format
+msgid "Cannot find item \"%1$s\" on \"%2$s\" used in trigger prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"."
+msgstr ""
+
+#: include/classes/import/CXmlImport18.php:537
+#: include/classes/import/importers/CAbstractScreenImporter.php:93
 #, c-format
 msgid "Cannot find item \"%1$s\" used in screen \"%2$s\"."
 msgstr "無法找到用在篩選\"%2$s\"中的項目\"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:745
+#: include/classes/import/CXmlImport18.php:732
 #, c-format
 msgid "Cannot find map \"%1$s\" used in exported map \"%2$s\"."
 msgstr "無法找到用在匯出的拓墣圖\"%2$s\"中的拓墣圖\"%1$s\"."
@@ -2024,41 +2045,41 @@ msgstr "無法找到用在匯出的拓墣圖\"%2$s\"中的拓墣圖\"%1$s\"."
 msgid "Cannot find map \"%1$s\" used in map \"%2$s\"."
 msgstr "無法找到用在拓墣圖\"%2$s\"中的拓墣圖\"%1$s\"."
 
-#: include/classes/import/CXmlImport18.php:561
-#: include/classes/import/importers/CAbstractScreenImporter.php:90
+#: include/classes/import/CXmlImport18.php:553
+#: include/classes/import/importers/CAbstractScreenImporter.php:101
 #, c-format
 msgid "Cannot find map \"%1$s\" used in screen \"%2$s\"."
 msgstr "無法找到用在篩選\"%2$s\"中的拓墣圖\"%1$s\"."
 
-#: include/js.inc.php:249
+#: include/js.inc.php:241
 msgid "Cannot find objects with name"
 msgstr "無法找到有名稱的物件"
 
-#: include/classes/import/CXmlImport18.php:577
-#: include/classes/import/importers/CAbstractScreenImporter.php:98
+#: include/classes/import/CXmlImport18.php:569
+#: include/classes/import/importers/CAbstractScreenImporter.php:109
 #, c-format
 msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"."
 msgstr "無法找到用在篩選 \"%2$s\"中的篩選\"%1$s\"."
 
-#: include/classes/import/CConfigurationImport.php:820
+#: include/classes/import/CConfigurationImport.php:900
 #, c-format
 msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:778
-#: include/classes/import/CXmlImport18.php:820
+#: include/classes/import/CXmlImport18.php:765
+#: include/classes/import/CXmlImport18.php:807
 #: include/classes/import/importers/CMapImporter.php:228
 #: include/classes/import/importers/CMapImporter.php:271
 #, c-format
 msgid "Cannot find trigger \"%1$s\" used in map \"%2$s\"."
 msgstr "無法找到用在拓墣圖 \"%2$s\"中的觸發器\"%1$s\"."
 
-#: include/classes/import/CConfigurationImport.php:608
+#: include/classes/import/CConfigurationImport.php:686
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:764
+#: include/classes/import/CConfigurationImport.php:844
 #, c-format
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
@@ -2071,12 +2092,14 @@ msgstr "無法形成樹狀格式. 檢查服務連結的邏輯結構."
 msgid "Cannot format tree."
 msgstr "無法形成樹狀格式"
 
-#: api/classes/CTemplate.php:760
+#: include/classes/api/services/CTemplate.php:791
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: api/classes/CTrigger.php:1074 api/classes/CTrigger.php:1213
-#: api/classes/CTriggerPrototype.php:678 api/classes/CTriggerPrototype.php:736
+#: include/classes/api/services/CTrigger.php:1068
+#: include/classes/api/services/CTrigger.php:1203
+#: include/classes/api/services/CTriggerPrototype.php:678
+#: include/classes/api/services/CTriggerPrototype.php:736
 #, c-format
 msgid "Cannot implode expression \"%s\"."
 msgstr "不能合併表示式 \"%s\"."
@@ -2087,58 +2110,59 @@ msgid "Cannot import screen \"%1$s\": subscreen \"%2$s\" does not exist."
 msgid_plural "Cannot import screen \"%1$s\": subscreens \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/import/importers/CTemplateImporter.php:114
+#: include/classes/import/importers/CTemplateImporter.php:122
 #, c-format
 msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist."
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: include/classes/class.cview.php:113
+#: include/classes/core/CView.php:113
 #, c-format
 msgid "Cannot include view file \"%s\"."
 msgstr "不能包含檢視檔案\"%s\"."
 
-#: popup_trexpr.php:786
+#: popup_trexpr.php:774
 msgid "Cannot insert trigger expression"
 msgstr ""
 
-#: api/classes/CUser.php:683
+#: include/classes/api/services/CUser.php:677
 msgid "Cannot insert user media."
 msgstr "不能插入用戶示警媒介"
 
-#: api/classes/CHost.php:1151
+#: include/classes/api/services/CHost.php:1138
 msgid "Cannot link template"
 msgstr "無法連結模板"
 
-#: api/classes/CTemplate.php:882 api/classes/CTemplate.php:897
+#: include/classes/api/services/CTemplate.php:913
+#: include/classes/api/services/CTemplate.php:928
 msgid "Cannot link template."
 msgstr ""
 
-#: api/classes/CUser.php:1035
+#: include/classes/api/services/CUser.php:1029
 msgid "Cannot login."
 msgstr ""
 
-#: api/classes/CUser.php:960
+#: include/classes/api/services/CUser.php:954
 msgid "Cannot logout."
 msgstr "不能登出"
 
-#: api/classes/CHost.php:977
+#: include/classes/api/services/CHost.php:959
 msgid "Cannot mass update host name."
 msgstr "不能大量更新主機名稱."
 
-#: api/classes/CTemplate.php:983
+#: include/classes/api/services/CTemplate.php:1017
 msgid "Cannot mass update template name."
 msgstr ""
 
-#: api/classes/CHost.php:967
+#: include/classes/api/services/CHost.php:949
 msgid "Cannot mass update visible host name."
 msgstr "不能大量更新可見主機名稱"
 
-#: api/classes/CTemplate.php:951
+#: include/classes/api/services/CTemplate.php:982
 msgid "Cannot mass update visible template name."
 msgstr ""
 
-#: api/classes/CHostBase.php:57
+#: include/classes/api/services/CHostBase.php:57
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %s."
 msgstr "不能傳遞重複的模板IDs給連結: %s."
@@ -2158,7 +2182,7 @@ msgstr "不能完成沒有值的更新(update)陳述式於資料表 \"%1$s\" 上
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "不能完成沒有條件的更新(update)陳述式於資料表 \"%1$s\" 上."
 
-#: api/classes/CApplication.php:501
+#: include/classes/api/services/CApplication.php:511
 msgid "Cannot process applications from different hosts or templates."
 msgstr ""
 
@@ -2167,11 +2191,11 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.history.js.php:35
+#: include/views/js/monitoring.history.js.php:38
 msgid "Cannot remove all items, at least one item should remain."
 msgstr ""
 
-#: api/classes/CTemplate.php:808
+#: include/classes/api/services/CTemplate.php:839
 msgid "Cannot remove group."
 msgstr ""
 
@@ -2179,11 +2203,11 @@ msgstr ""
 msgid "Cannot remove macro."
 msgstr "無法移除巨集."
 
-#: api/classes/CUser.php:270
+#: include/classes/api/services/CUser.php:273
 msgid "Cannot rename guest user."
 msgstr "無法重新命名訪客用戶."
 
-#: api/classes/CDRule.php:214
+#: include/classes/api/services/CDRule.php:223
 msgid "Cannot save discovery rule without checks."
 msgstr "無法儲存未檢驗的探索規則"
 
@@ -2192,217 +2216,226 @@ msgstr "無法儲存未檢驗的探索規則"
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:242
+#: include/classes/api/services/CItemGeneral.php:242
 #, c-format
 msgid "Cannot set \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot set \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:310
+#: include/classes/api/services/CApplication.php:320
 #, c-format
 msgid "Cannot set \"templateid\" for application \"%1$s\"."
 msgstr "無法設置 \"templateid\"給應用集\"%1$s\"."
 
-#: api/classes/CScreen.php:355
+#: include/classes/api/services/CScreen.php:365
 #, c-format
 msgid "Cannot set \"templateid\" for screen \"%1$s\"."
 msgstr "無法設置 \"templateid\"給篩選\"%1$s\"."
 
-#: api/classes/CTriggerPrototype.php:458
+#: include/classes/api/services/CTriggerPrototype.php:458
 #, c-format
 msgid "Cannot set \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "無法設置 \"templateid\"給觸發器原型\"%1$s\"."
 
-#: api/classes/CHost.php:558 api/classes/CHost.php:1022
+#: include/classes/api/services/CHost.php:568
+#: include/classes/api/services/CHost.php:1013
 msgid "Cannot set inventory fields for disabled inventory."
 msgstr ""
 
-#: api/classes/CHostInterface.php:266
+#: include/classes/api/services/CHostInterface.php:269
 msgid "Cannot switch host for interface."
 msgstr "無法為介面切換主機."
 
-#: users.php:313
+#: users.php:324
 msgid "Cannot unblock users"
 msgstr "無法解除阻擋用戶"
 
-#: api/classes/CHostGeneral.php:512
+#: include/classes/api/services/CHostGeneral.php:512
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:565
+#: include/classes/api/services/CHostGeneral.php:565
 msgid "Cannot unlink and clear applications."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:339
+#: include/classes/api/services/CHostGeneral.php:339
 msgid "Cannot unlink and clear discovery rules"
 msgstr "無法斷連和清除探索規則"
 
-#: api/classes/CHostGeneral.php:456
+#: include/classes/api/services/CHostGeneral.php:456
 msgid "Cannot unlink and clear graph prototypes"
 msgstr "無法斷連和清除圖形原型"
 
-#: api/classes/CHostGeneral.php:473
+#: include/classes/api/services/CHostGeneral.php:473
 msgid "Cannot unlink and clear graphs."
 msgstr "無法斷連和清除圖形."
 
-#: api/classes/CHostGeneral.php:373
+#: include/classes/api/services/CHostGeneral.php:373
 msgid "Cannot unlink and clear item prototypes"
 msgstr "無法斷連和清除項目原型"
 
-#: api/classes/CHostGeneral.php:356
+#: include/classes/api/services/CHostGeneral.php:356
 msgid "Cannot unlink and clear items"
 msgstr "無法斷連和清除項目"
 
-#: api/classes/CHostGeneral.php:279 api/classes/CHostGeneral.php:296
+#: include/classes/api/services/CHostGeneral.php:279
+#: include/classes/api/services/CHostGeneral.php:296
 msgid "Cannot unlink and clear triggers"
 msgstr "無法斷連和清除觸發器"
 
-#: api/classes/CHost.php:1142
+#: include/classes/api/services/CHost.php:1113
 msgid "Cannot unlink template"
 msgstr "無法斷連模板"
 
-#: api/classes/CTemplate.php:844 api/classes/CTemplate.php:867
+#: include/classes/api/services/CTemplate.php:875
+#: include/classes/api/services/CTemplate.php:898
 msgid "Cannot unlink template."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:234
+#: include/classes/api/services/CHostGeneral.php:234
 #, c-format
 msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host."
 msgstr "不能斷連觸發器\"%s\",其已有項目來自於留存連到主機的模板."
 
-#: api/classes/CHost.php:571
+#: include/classes/api/services/CHost.php:581
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered host."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:175
+#: include/classes/api/services/CItemGeneral.php:175
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered item."
 msgstr ""
 
-#: api/classes/CTrigger.php:587
+#: include/classes/api/services/CTrigger.php:588
 #, c-format
 msgid "Cannot update \"%1$s\" for a discovered trigger."
 msgstr ""
 
-#: api/classes/CAction.php:636
+#: include/classes/api/services/CAction.php:2250
 #, c-format
 msgid "Cannot update \"%1$s\" for action \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:206
+#: include/classes/api/services/CItemGeneral.php:206
 #, c-format
 msgid "Cannot update \"%1$s\" for item \"%2$s\"."
 msgstr ""
 
-#: api/classes/CTrigger.php:615
+#: include/classes/api/services/CTrigger.php:616
 #, c-format
 msgid "Cannot update \"%1$s\" for trigger \"%2$s\"."
 msgstr ""
 
-#: api/classes/CApplication.php:307
+#: include/classes/api/services/CImage.php:553
+#, c-format
+msgid "Cannot update \"imagetype\" for image \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CApplication.php:317
 #, c-format
 msgid "Cannot update \"templateid\" for application \"%1$s\"."
 msgstr "無法更新\"templateid\"給應用集\"%1$s\"."
 
-#: api/classes/CGraph.php:42
+#: include/classes/api/services/CGraph.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph \"%1$s\"."
 msgstr "無法更新\"templateid\"給圖形\"%1$s\"."
 
-#: api/classes/CGraphPrototype.php:42
+#: include/classes/api/services/CGraphPrototype.php:42
 #, c-format
 msgid "Cannot update \"templateid\" for graph prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:430
+#: include/classes/api/services/CScreen.php:440
 #, c-format
 msgid "Cannot update \"templateid\" for screen \"%1$s\"."
 msgstr "無法更新\"templateid\"給篩選\"%1$s\"."
 
-#: api/classes/CTemplateScreen.php:608
+#: include/classes/api/services/CTemplateScreen.php:630
 #, c-format
 msgid "Cannot update \"templateid\" for template screen \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:514
+#: include/classes/api/services/CTriggerPrototype.php:514
 #, c-format
 msgid "Cannot update \"templateid\" for trigger prototype \"%1$s\"."
 msgstr "無法更新\"templateid\"給觸發器原型\"%1$s\"."
 
-#: api/classes/CGraphGeneral.php:60
+#: include/classes/api/services/CGraphGeneral.php:60
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: api/classes/CHostGroup.php:471
+#: include/classes/api/services/CHostGroup.php:489
 msgid "Cannot update a discovered host group."
 msgstr ""
 
-#: actionconf.php:138
+#: actionconf.php:152
 msgid "Cannot update action"
 msgstr "無法更新操作"
 
-#: applications.php:100
+#: applications.php:104
 msgid "Cannot update application"
 msgstr "無法更新應用集"
 
-#: tr_comments.php:81
-msgid "Cannot update comment"
-msgstr "無法更新評論"
-
 #: adm.gui.php:69 adm.housekeeper.php:101 adm.other.php:99
 #: adm.triggerdisplayoptions.php:67 adm.triggerseverities.php:71
 #: adm.workingtime.php:52
 msgid "Cannot update configuration"
 msgstr "無法更新組態"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Cannot update debug mode"
 msgstr "無法更新調試模式"
 
-#: discoveryconf.php:137 host_discovery.php:286
+#: tr_comments.php:82
+msgid "Cannot update description"
+msgstr ""
+
+#: discoveryconf.php:147 host_discovery.php:293
 msgid "Cannot update discovery rule"
 msgstr "無法更新探索規則"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Cannot update frontend access"
 msgstr "無法更新前端存取"
 
-#: graphs.php:244
+#: graphs.php:249
 msgid "Cannot update graph"
 msgstr "無法更新圖形"
 
-#: graphs.php:226
+#: graphs.php:231
 msgid "Cannot update graph prototype"
 msgstr ""
 
-#: hostgroups.php:88 usergrps.php:182
+#: hostgroups.php:71 usergrps.php:188
 msgid "Cannot update group"
 msgstr "無法更新群組"
 
-#: api/classes/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:296
 msgid "Cannot update group."
 msgstr "無法更新群組."
 
-#: api/classes/CHostGroup.php:726 api/classes/CHostGroup.php:784
-#: api/classes/CHostGroup.php:844
+#: include/classes/api/services/CHostGroup.php:744
+#: include/classes/api/services/CHostGroup.php:802
+#: include/classes/api/services/CHostGroup.php:862
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
 
-#: hosts.php:377
+#: hosts.php:381
 msgid "Cannot update host"
 msgstr "無法更新主機"
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Cannot update host prototype"
 msgstr ""
 
-#: hosts.php:363
+#: hosts.php:367
 msgid "Cannot update hosts"
 msgstr "無法更新主機"
 
@@ -2414,24 +2447,24 @@ msgstr "無法更新圖示對應"
 msgid "Cannot update image"
 msgstr "無法更新圖片"
 
-#: include/classes/import/CXmlImport18.php:674
+#: include/classes/import/CXmlImport18.php:656
 msgid "Cannot update image."
 msgstr "無法更新圖片."
 
-#: api/classes/CHostInterface.php:337
+#: include/classes/api/services/CHostInterface.php:342
 #, c-format
 msgid "Cannot update interface for discovered host \"%1$s\"."
 msgstr ""
 
-#: items.php:477 screenedit.php:181
+#: items.php:490
 msgid "Cannot update item"
 msgstr "無法更新項目"
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Cannot update item prototype"
 msgstr ""
 
-#: items.php:662
+#: items.php:687
 msgid "Cannot update items"
 msgstr "無法更新項目"
 
@@ -2443,16 +2476,16 @@ msgstr "無法更新巨集."
 msgid "Cannot update macros"
 msgstr "無法更新巨集"
 
-#: maintenance.php:121
+#: maintenance.php:126
 msgid "Cannot update maintenance"
 msgstr "無法更新維修"
 
-#: include/classes/import/CXmlImport18.php:839
+#: include/classes/import/CXmlImport18.php:826
 #, c-format
 msgid "Cannot update map \"%s\"."
 msgstr "無法更新拓拓墣圖\"%s\"."
 
-#: media_types.php:123
+#: media_types.php:126
 msgid "Cannot update media type"
 msgstr "無法更新媒介型態"
 
@@ -2460,28 +2493,24 @@ msgstr "無法更新媒介型態"
 msgid "Cannot update network map"
 msgstr "無法更新網路拓墣圖"
 
-#: proxies.php:109
+#: proxies.php:113
 msgid "Cannot update proxy"
 msgstr "無法更新系統代理程式"
 
-#: api/classes/CProxy.php:289
+#: include/classes/api/services/CProxy.php:289
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: adm.regexps.php:127
+#: adm.regexps.php:135
 msgid "Cannot update regular expression"
 msgstr "無法更新正規表示式"
 
-#: screenconf.php:132
+#: screenconf.php:133 screenedit.php:227 screenedit.php:244
 msgid "Cannot update screen"
 msgstr "無法更新篩選"
 
-#: include/classes/import/CXmlImport18.php:1729
-msgid "Cannot update screen."
-msgstr "無法更新篩選."
-
-#: scripts.php:122
+#: scripts.php:115
 msgid "Cannot update script"
 msgstr "無法更新脚本"
 
@@ -2493,40 +2522,41 @@ msgstr "無法更新服務"
 msgid "Cannot update slide show"
 msgstr "無法更新簡報片展示"
 
-#: templates.php:232
+#: templates.php:235
 msgid "Cannot update template"
 msgstr "無法更新模板"
 
-#: api/classes/CApplication.php:318
+#: include/classes/api/services/CApplication.php:328
 msgid "Cannot update templated applications."
 msgstr ""
 
-#: api/classes/CTemplate.php:715 api/classes/CTemplate.php:1043
+#: include/classes/api/services/CTemplate.php:746
+#: include/classes/api/services/CTemplate.php:1080
 #, c-format
 msgid "Cannot update templates on discovered host \"%1$s\"."
 msgstr ""
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Cannot update trigger"
 msgstr "無法更新觸發器"
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Cannot update trigger prototype"
 msgstr ""
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Cannot update trigger prototypes"
 msgstr ""
 
-#: profile.php:179 users.php:240
+#: profile.php:180 users.php:241
 msgid "Cannot update user"
 msgstr "無法更新用户"
 
-#: api/classes/CUser.php:763
+#: include/classes/api/services/CUser.php:757
 msgid "Cannot update user media."
 msgstr "無法更新用戶媒介."
 
-#: profile.php:114 users.php:187
+#: profile.php:114 users.php:188
 msgid "Cannot update user. Both passwords must be equal."
 msgstr "無法更新用户. 兩次輸入的密碼必須一致."
 
@@ -2534,15 +2564,15 @@ msgstr "無法更新用户. 兩次輸入的密碼必須一致."
 msgid "Cannot update value map"
 msgstr "無法更新值對應"
 
-#: httpconf.php:181
+#: httpconf.php:193
 msgid "Cannot update web scenario"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:600
+#: include/views/js/configuration.discovery.edit.js.php:611
 msgid "Cannot validate discovery check: invalid request or connection to Zabbix server failed."
 msgstr ""
 
-#: popup_bitem.php:117 popup_period.php:110
+#: popup_bitem.php:125 popup_period.php:120
 msgid "Caption"
 msgstr "提示"
 
@@ -2551,47 +2581,47 @@ msgstr "提示"
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
-#: include/classes/items/CHelpItems.php:789
+#: include/classes/items/CHelpItems.php:797
 msgid "Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:785
+#: include/classes/items/CHelpItems.php:793
 msgid "Catches all SNMP traps that are not caught by any of the snmptrap[] items from a corresponding address of the interface."
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:555
+#: include/views/configuration.screen.constructor.edit.php:698
 msgid "Center"
 msgstr "中"
 
-#: include/classes/screens/CScreenBase.php:258
-#: include/classes/screens/CScreenBuilder.php:417
+#: include/classes/screens/CScreenBase.php:267
+#: include/classes/screens/CScreenBuilder.php:451
 #: include/classes/screens/CScreenMap.php:61
 #: include/views/configuration.services.edit.php:52
 msgid "Change"
 msgstr "更改"
 
-#: latest.php:335 latest.php:336
+#: latest.php:346 latest.php:347
 msgctxt "noun in latest data"
 msgid "Change"
 msgstr "更改"
 
 #: include/views/administration.authentication.edit.php:106
-#: include/views/administration.mediatypes.edit.php:70
-#: include/views/administration.users.edit.php:97
+#: include/views/administration.mediatypes.edit.php:69
+#: include/views/administration.users.edit.php:96
 msgid "Change password"
 msgstr "修改密碼"
 
 #: include/forms.inc.php:403 include/items.inc.php:125
-#: include/triggers.inc.php:2256 include/views/configuration.item.edit.php:213
+#: include/triggers.inc.php:2066 include/views/configuration.item.edit.php:213
 #: include/views/configuration.item.massupdate.php:210
 msgid "Character"
 msgstr "字元"
 
-#: include/regexp.inc.php:185 include/views/js/adm.regexprs.edit.js.php:109
+#: include/regexp.inc.php:207 include/views/js/adm.regexprs.edit.js.php:109
 msgid "Character string included"
 msgstr "字元字串已包含"
 
-#: include/regexp.inc.php:187 include/views/js/adm.regexprs.edit.js.php:115
+#: include/regexp.inc.php:209 include/views/js/adm.regexprs.edit.js.php:115
 msgid "Character string not included"
 msgstr "字元字串未包含"
 
@@ -2600,48 +2630,48 @@ msgid "Chassis"
 msgstr "機殼"
 
 #: include/classes/items/CHelpItems.php:181
-#: include/classes/items/CHelpItems.php:439
+#: include/classes/items/CHelpItems.php:443
 msgid "Chassis info - returns full info by default"
 msgstr ""
 
-#: include/views/js/configuration.discovery.edit.js.php:536
+#: include/views/js/configuration.discovery.edit.js.php:547
 msgid "Check already exists."
 msgstr "檢查已存在."
 
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:461
 #, c-format
 msgid "Check expression part starting from \"%1$s\"."
 msgstr "檢查開始於\"%1$s\"的表示式部份."
 
 #: include/classes/items/CHelpItems.php:261
-#: include/classes/items/CHelpItems.php:519
+#: include/classes/items/CHelpItems.php:523
 msgid "Check if file exists. 0 - file does not exist, 1 - file exists"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:591
+#: include/classes/items/CHelpItems.php:599
 msgid "Check if service is available. 0 - service is down, 1 - service is running. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:121
-#: include/classes/items/CHelpItems.php:383
-msgid "Check if service is available. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
+#: include/classes/items/CHelpItems.php:387
+msgid "Check if service is available. 0 - service is down, 1 - service is running. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45]."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:125
-#: include/classes/items/CHelpItems.php:379
-msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used."
+#: include/classes/items/CHelpItems.php:383
+msgid "Check performance of service \"service\". 0 - service is down, sec - number of seconds spent on connection to the service. If IP is missing 127.0.0.1 is used. If port number is missing, default service port is used."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:587
+#: include/classes/items/CHelpItems.php:595
 msgid "Check performance of service. 0 - service is down, sec - number of seconds spent on connection to the service. If <ip> is missing, IP or DNS name is taken from host definition. If <port> is missing, default service port is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:69
-#: include/classes/items/CHelpItems.php:315
+#: include/classes/items/CHelpItems.php:319
 msgid "Check the agent usability. Always return 1. Can be used as a TCP ping."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:282
+#: include/classes/api/services/CItemGeneral.php:282
 msgid "Check the key, please. Default example was passed."
 msgstr "請檢查鍵值. 用的是預設的例子."
 
@@ -2650,44 +2680,44 @@ msgid "Check type"
 msgstr "檢查類型"
 
 #: include/classes/items/CHelpItems.php:117
-#: include/classes/items/CHelpItems.php:375
-msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
+#: include/classes/items/CHelpItems.php:379
+msgid "Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If IP is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]"
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:63
+#: include/views/configuration.discovery.edit.php:62
 #: include/views/configuration.discovery.list.php:43
 msgid "Checks"
 msgstr "檢查 "
 
 #: include/classes/items/CHelpItems.php:89
-#: include/classes/items/CHelpItems.php:347
+#: include/classes/items/CHelpItems.php:351
 msgid "Checks if DNS service is up. 0 - DNS is down (server did not respond or DNS resolution failed), 1 - DNS is up."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:575
+#: include/classes/items/CHelpItems.php:583
 msgid "Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:113
 #: include/classes/items/CHelpItems.php:129
-#: include/classes/items/CHelpItems.php:371
-#: include/classes/items/CHelpItems.php:387
+#: include/classes/items/CHelpItems.php:375
+#: include/classes/items/CHelpItems.php:391
 msgid "Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state."
 msgstr ""
 
-#: api/classes/CDRule.php:355
+#: include/classes/api/services/CDRule.php:372
 msgid "Checks should be unique."
 msgstr "檢查必需是唯一的"
 
-#: include/locales.inc.php:53
+#: include/locales.inc.php:57
 msgid "Chinese (zh_CN)"
 msgstr "中文 (zh_CN)"
 
-#: include/locales.inc.php:54
+#: include/locales.inc.php:58
 msgid "Chinese (zh_TW)"
 msgstr "中文 (zh_TW)"
 
-#: api/classes/CMapElement.php:74
+#: include/classes/api/services/CMapElement.php:74
 #, c-format
 msgid "Circular link cannot be created for map element \"%s\"."
 msgstr "無法創建拓墣圖組件 \"%s\"的循環式連結"
@@ -2702,34 +2732,35 @@ msgstr "拓樸圖中的循環式引用: %1$s."
 msgid "Circular reference in screens: %1$s."
 msgstr "篩選中的循環式引用: %1$s."
 
-#: include/classes/import/importers/CTemplateImporter.php:139
+#: include/classes/import/importers/CTemplateImporter.php:156
 #, c-format
 msgid "Circular reference in templates: %1$s."
 msgstr "模板中的循環式引用: %1$s."
 
-#: api/classes/CHostBase.php:234 api/classes/CHostBase.php:291
+#: include/classes/api/services/CHostBase.php:234
+#: include/classes/api/services/CHostBase.php:291
 msgid "Circular template linkage is not allowed."
 msgstr "循環式模板連結是不允許的."
 
-#: include/classes/core/ZBase.php:239
+#: include/classes/core/ZBase.php:249
 msgid "Classic"
 msgstr "典型的"
 
-#: jsLoader.php:162
+#: jsLoader.php:163
 msgid "Clear"
 msgstr "清除"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "Clear history and trends"
 msgstr "清除歷史和趨勢"
 
-#: include/views/configuration.httpconf.list.php:103
-#: include/views/configuration.item.list.php:273
+#: include/views/configuration.httpconf.list.php:149
+#: include/views/configuration.item.list.php:277
 msgid "Clear history for selected"
 msgstr "清除所選的歷史"
 
-#: include/views/configuration.host.massupdate.php:188
+#: include/views/configuration.host.massupdate.php:219
 msgid "Clear when unlinking"
 msgstr "清除當無連結時"
 
@@ -2739,69 +2770,69 @@ msgstr "Clock"
 
 #: include/views/administration.general.iconmap.edit.php:145
 #: include/views/administration.general.regularexpressions.edit.php:88
-#: include/views/administration.proxy.edit.php:101
-#: include/views/administration.script.edit.php:115
-#: include/views/configuration.action.edit.php:1013
+#: include/views/administration.proxy.edit.php:100
+#: include/views/administration.script.edit.php:118
+#: include/views/configuration.action.edit.php:1077
 #: include/views/configuration.application.edit.php:54
-#: include/views/configuration.discovery.edit.php:92
-#: include/views/configuration.graph.edit.php:305
-#: include/views/configuration.host.discovery.edit.php:361
-#: include/views/configuration.host.edit.php:856
+#: include/views/configuration.discovery.edit.php:91
+#: include/views/configuration.graph.edit.php:315
+#: include/views/configuration.host.discovery.edit.php:351
+#: include/views/configuration.host.edit.php:886
 #: include/views/configuration.hostgroups.edit.php:86
-#: include/views/configuration.host.prototype.edit.php:323
-#: include/views/configuration.httpconf.edit.php:250
-#: include/views/configuration.item.edit.php:451
+#: include/views/configuration.host.prototype.edit.php:334
+#: include/views/configuration.httpconf.edit.php:290
+#: include/views/configuration.item.edit.php:445
 #: include/views/configuration.maintenance.edit.php:201
 #: include/views/configuration.screen.edit.php:54
 #: include/views/configuration.slideconf.edit.php:116
 #: include/views/configuration.sysmap.edit.php:190
-#: include/views/configuration.template.edit.php:455
-#: include/views/configuration.triggers.edit.php:334
+#: include/views/configuration.template.edit.php:479
+#: include/views/configuration.triggers.edit.php:340
 msgid "Clone"
 msgstr "克隆"
 
-#: include/views/js/configuration.discovery.edit.js.php:537
-#: include/views/js/configuration.discovery.edit.js.php:601
-#: include/views/js/configuration.discovery.edit.js.php:618
-#: include/views/js/configuration.sysmaps.js.php:205
-#: include/views/js/configuration.sysmaps.js.php:306
-#: include/views/js/configuration.sysmaps.js.php:419 jsLoader.php:145
-#: jsLoader.php:169 tr_testexpr.php:183
+#: include/views/js/configuration.discovery.edit.js.php:548
+#: include/views/js/configuration.discovery.edit.js.php:612
+#: include/views/js/configuration.discovery.edit.js.php:629
+#: include/views/js/configuration.sysmaps.js.php:203
+#: include/views/js/configuration.sysmaps.js.php:304
+#: include/views/js/configuration.sysmaps.js.php:417 jsLoader.php:146
+#: jsLoader.php:170 tr_testexpr.php:192
 msgid "Close"
 msgstr "關閉"
 
-#: include/views/configuration.triggers.edit.php:235
+#: include/views/configuration.triggers.edit.php:241
 msgid "Close expression constructor"
 msgstr "關閉表示式建構"
 
 #: include/views/administration.general.triggerDisplayOptions.edit.php:26
 #: include/views/administration.general.triggerSeverity.edit.php:28
-#: include/views/configuration.graph.edit.php:228
-#: include/views/js/configuration.sysmaps.js.php:399 popup_bitem.php:43
-#: popup_bitem.php:160 popup_period.php:125
+#: include/views/configuration.graph.edit.php:238
+#: include/views/js/configuration.sysmaps.js.php:397 popup_bitem.php:43
+#: popup_bitem.php:170 popup_period.php:138
 msgid "Colour"
 msgstr "顏色"
 
 #: include/classes/validators/CColorValidator.php:32
-#: include/validate.inc.php:376 jsLoader.php:156
+#: include/validate.inc.php:376 jsLoader.php:157
 #, c-format
 msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)."
 msgstr ""
 
-#: include/views/js/configuration.sysmaps.js.php:383
+#: include/views/js/configuration.sysmaps.js.php:381
 msgid "Colour (OK)"
 msgstr "顏色 (OK)"
 
-#: screenedit.php:264
+#: screenedit.php:286
 msgid "Column added"
 msgstr ""
 
-#: screenedit.php:339
+#: screenedit.php:361
 msgid "Column deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:574
-#: screenedit.php:46
+#: include/views/configuration.screen.constructor.edit.php:717
+#: screenedit.php:73
 msgid "Column span"
 msgstr "列跨幅"
 
@@ -2816,7 +2847,7 @@ msgstr "合併的結果"
 #: include/actions.inc.php:917 include/actions.inc.php:958
 #: include/actions.inc.php:1002
 #: include/views/administration.auditacts.list.php:109
-#: include/views/administration.script.edit.php:66
+#: include/views/administration.script.edit.php:65
 msgid "Command"
 msgstr "命令"
 
@@ -2824,41 +2855,31 @@ msgstr "命令"
 msgid "Command actions"
 msgstr "命令動作"
 
-#: scripts.php:99
+#: scripts.php:92
 msgid "Command cannot be empty."
 msgstr "命令不能是空白."
 
-#: include/views/administration.script.edit.php:61
+#: include/views/administration.script.edit.php:60
 #: include/views/administration.script.list.php:41
-#: include/views/configuration.action.edit.php:761
-#: include/views/configuration.action.edit.php:765 popup.php:1395
-#: popup.php:1402
+#: include/views/configuration.action.edit.php:807
+#: include/views/configuration.action.edit.php:811 popup.php:1709
+#: popup.php:1716
 msgid "Commands"
 msgstr "命令"
 
-#: tr_comments.php:81
-msgid "Comment updated"
-msgstr "評論已更新"
-
-#: include/acknow.inc.php:49 include/views/monitoring.triggerComment.php:39
-#: tr_comments.php:76 tr_logform.php:371 tr_status.php:395
+#: include/acknow.inc.php:49 tr_comments.php:77 tr_logform.php:339
 msgid "Comments"
 msgstr "評論"
 
-#: include/views/monitoring.triggerComment.php:43
-#, c-format
-msgid "Comments for \"%s\"."
-msgstr ""
-
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Commercial"
 msgstr "商業的"
 
-#: report6.php:227
+#: report6.php:238
 msgid "Compare values for multiple periods"
 msgstr "比較數期的值"
 
-#: include/views/administration.usergroups.edit.php:119
+#: include/views/administration.usergroups.edit.php:118
 msgid "Composing permissions"
 msgstr "組合許可權"
 
@@ -2866,29 +2887,39 @@ msgstr "組合許可權"
 msgid "Condition"
 msgstr "條件"
 
-#: api/classes/CDiscoveryRule.php:849
+#: include/classes/api/services/CAction.php:2020
+#, c-format
+msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:859
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:848
+#: include/classes/api/services/CAction.php:2019
+#, c-format
+msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:858
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:114
-#: include/views/configuration.action.edit.php:938
-#: include/views/configuration.action.edit.php:1006
+#: include/views/configuration.action.edit.php:135
+#: include/views/configuration.action.edit.php:1002
+#: include/views/configuration.action.edit.php:1070
 #: include/views/configuration.action.list.php:52
 msgid "Conditions"
 msgstr "條件"
 
-#: include/menu.inc.php:149 include/views/inventory.host.view.php:234
-#: jsLoader.php:181
+#: include/menu.inc.php:145 include/views/inventory.host.view.php:246
+#: jsLoader.php:183
 msgid "Configuration"
 msgstr "組態"
 
-#: include/classes/items/CHelpItems.php:855
+#: include/classes/items/CHelpItems.php:867
 msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)."
 msgstr ""
 
@@ -3051,23 +3082,23 @@ msgstr "組態已更新"
 msgid "Configure (Filter %s)"
 msgstr "組態(過濾器%s)"
 
-#: include/views/administration.script.edit.php:100
+#: include/views/administration.script.edit.php:104
 msgid "Confirmation text"
 msgstr "確認文字"
 
-#: include/views/administration.proxy.edit.php:56
-#: include/views/configuration.host.edit.php:243
-#: include/views/configuration.host.edit.php:330
-#: include/views/configuration.host.prototype.edit.php:95
+#: include/views/administration.proxy.edit.php:55
+#: include/views/configuration.host.edit.php:252
+#: include/views/configuration.host.edit.php:339
+#: include/views/configuration.host.prototype.edit.php:94
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
 #: include/views/inventory.host.view.php:154
-#: include/views/js/configuration.sysmaps.js.php:362
+#: include/views/js/configuration.sysmaps.js.php:360
 msgid "Connect to"
 msgstr "連接到"
 
-#: include/page_footer.php:85
+#: include/page_footer.php:80
 #, c-format
 msgid "Connected as '%1$s'"
 msgstr "連接為'%1$s'"
@@ -3126,7 +3157,7 @@ msgid "Context name"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:169
-#: include/classes/items/CHelpItems.php:427
+#: include/classes/items/CHelpItems.php:431
 msgid "Context switches."
 msgstr ""
 
@@ -3134,30 +3165,36 @@ msgstr ""
 msgid "Contract number"
 msgstr "合約號碼"
 
-#: include/views/js/configuration.sysmaps.js.php:170
+#: include/views/js/configuration.sysmaps.js.php:168
 msgid "Coordinates"
 msgstr "座標"
 
-#: include/views/configuration.copy.elements.php:114
+#: include/views/configuration.copy.elements.php:118
 msgid "Copy"
 msgstr "複製"
 
-#: include/views/configuration.graph.list.php:155
-#: include/views/configuration.item.list.php:270
+#: include/views/configuration.copy.elements.php:111
+#, c-format
+msgid "Copy %1$s element to..."
+msgid_plural "Copy %1$s elements to..."
+msgstr[0] ""
+
+#: include/views/configuration.graph.list.php:156
+#: include/views/configuration.item.list.php:274
 #: include/views/configuration.triggers.list.php:303
 msgid "Copy selected to ..."
 msgstr "複製所選的到 ..."
 
-#: api/classes/CUser.php:1080
+#: include/classes/api/services/CUser.php:1076
 #, c-format
 msgid "Correct login \"%s\"."
 msgstr "正確登入\"%s\"."
 
-#: api/classes/CImage.php:415
+#: include/classes/api/services/CImage.php:389
 msgid "Could not save image!"
 msgstr "不能儲存圖片!"
 
-#: include/graphs.inc.php:74 popup_bitem.php:147 popup_trexpr.php:44
+#: include/graphs.inc.php:74 popup_bitem.php:157 popup_trexpr.php:34
 msgid "Count"
 msgstr "計數"
 
@@ -3177,6 +3214,10 @@ msgstr "創建應用集"
 msgid "Create application (select host first)"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create background"
+msgstr ""
+
 #: include/views/configuration.discovery.list.php:27
 #: include/views/configuration.host.discovery.list.php:28
 msgid "Create discovery rule"
@@ -3194,7 +3235,7 @@ msgstr "創建圖形(先選擇主機)"
 msgid "Create graph prototype"
 msgstr "創建圖形原型"
 
-#: hosts.php:787
+#: hosts.php:813
 msgid "Create host"
 msgstr "創建主機"
 
@@ -3207,15 +3248,15 @@ msgstr "創建主機群組"
 msgid "Create host prototype"
 msgstr ""
 
+#: adm.images.php:151
+msgid "Create icon"
+msgstr ""
+
 #: adm.iconmapping.php:126
 msgid "Create icon map"
 msgstr "創建圖示對應"
 
-#: adm.images.php:149
-msgid "Create image"
-msgstr "創建圖片"
-
-#: include/views/configuration.item.list.php:37 items.php:778
+#: include/views/configuration.item.list.php:37 items.php:806
 msgid "Create item"
 msgstr "創建項目"
 
@@ -3239,6 +3280,10 @@ msgstr "創建拓墣圖"
 msgid "Create media type"
 msgstr "創建示警媒介類型"
 
+#: include/views/conf.import.php:24
+msgid "Create new"
+msgstr ""
+
 #: include/views/administration.proxy.list.php:27
 msgid "Create proxy"
 msgstr "創建系統代理程式"
@@ -3263,11 +3308,11 @@ msgstr "創建脚本"
 msgid "Create slide show"
 msgstr "創建簡報片展示"
 
-#: templates.php:476
+#: templates.php:490
 msgid "Create template"
 msgstr "創建模板"
 
-#: include/views/configuration.triggers.list.php:51 jsLoader.php:182
+#: include/views/configuration.triggers.list.php:51 jsLoader.php:184
 msgid "Create trigger"
 msgstr "創建觸發器"
 
@@ -3291,42 +3336,42 @@ msgstr "創建用戶群組"
 msgid "Create value map"
 msgstr "新增值對應"
 
-#: api/classes/managers/CApplicationManager.php:73
+#: include/classes/api/managers/CApplicationManager.php:73
 #, c-format
 msgid "Created: Application \"%1$s\" on \"%2$s\"."
 msgstr "已創建: 應用集 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:668
+#: include/classes/api/services/CDiscoveryRule.php:678
 #, c-format
 msgid "Created: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "已創建: 探索規則 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CHostPrototype.php:364
+#: include/classes/api/services/CHostPrototype.php:364
 #, c-format
 msgid "Created: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:528
+#: include/classes/api/services/CItem.php:531
 #, c-format
 msgid "Created: Item \"%1$s\" on \"%2$s\"."
 msgstr "已創建: 項目 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:361
+#: include/classes/api/services/CItemPrototype.php:371
 #, c-format
 msgid "Created: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "已創建: 項目原型 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CTrigger.php:1108
+#: include/classes/api/services/CTrigger.php:1102
 #, c-format
 msgid "Created: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "已創建: 觸發器 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:686
+#: include/classes/api/services/CTriggerPrototype.php:686
 #, c-format
 msgid "Created: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "已創建: 觸發器原型 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:124
+#: include/classes/api/managers/CHttpTestManager.php:124
 #, c-format
 msgid "Created: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -3336,51 +3381,52 @@ msgid "Critical"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:213
-#: include/classes/items/CHelpItems.php:471
+#: include/classes/items/CHelpItems.php:475
 msgid "Current OS - returns full info by default"
 msgstr ""
 
-#: popup_trexpr.php:365
+#: popup_trexpr.php:355
 msgid "Current date is < N"
 msgstr "當前日期是 < N"
 
-#: popup_trexpr.php:373
+#: popup_trexpr.php:363
 msgid "Current date is = N"
 msgstr "當前日期是 = N"
 
-#: popup_trexpr.php:369
+#: popup_trexpr.php:359
 msgid "Current date is > N"
 msgstr "當前日期是 > N"
 
-#: popup_trexpr.php:377
+#: popup_trexpr.php:367
 msgid "Current date is NOT N"
 msgstr "當前日期不是 N"
 
 #: include/views/js/configuration.action.edit.js.php:87
-#: include/views/js/configuration.action.edit.js.php:212
+#: include/views/js/configuration.action.edit.js.php:215
 msgid "Current host"
 msgstr "目前主機"
 
-#: popup_trexpr.php:495
+#: popup_trexpr.php:485
 msgid "Current time is < N"
 msgstr "當前日期是 < N"
 
-#: popup_trexpr.php:503
+#: popup_trexpr.php:493
 msgid "Current time is = N"
 msgstr "當前日期是 = N"
 
-#: popup_trexpr.php:499
+#: popup_trexpr.php:489
 msgid "Current time is > N"
 msgstr "當前日期是 > N"
 
-#: popup_trexpr.php:507
+#: popup_trexpr.php:497
 msgid "Current time is NOT N"
 msgstr "當前日期不是 N"
 
-#: include/setup.inc.php:186
+#: include/classes/setup/CSetupWizard.php:186
 msgid "Current value"
 msgstr "目前的值"
 
+#: include/views/configuration.action.edit.php:122
 #: include/views/configuration.host.discovery.edit.php:280
 msgid "Custom expression"
 msgstr ""
@@ -3393,7 +3439,7 @@ msgstr "自訂圖形"
 msgid "Custom label"
 msgstr "自訂標示"
 
-#: api/classes/CMap.php:409
+#: include/classes/api/services/CMap.php:419
 #, c-format
 msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty."
 msgstr "自訂標示給類型 \"%1$s\"的拓墣圖 \"%2$s\"組件, 其不得為空白."
@@ -3407,7 +3453,7 @@ msgstr "自訂倍數"
 msgid "Custom screens"
 msgstr "自訂篩選"
 
-#: include/views/configuration.action.edit.php:684
+#: include/views/configuration.action.edit.php:730
 msgid "Custom script"
 msgstr "自訂腳本"
 
@@ -3427,18 +3473,14 @@ msgstr "自訂尺寸"
 msgid "Custom slides"
 msgstr "自訂簡報片"
 
-#: include/locales.inc.php:55
+#: include/locales.inc.php:59
 msgid "Czech (cs_CZ)"
 msgstr "捷克(cs_CZ)"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1369
+#: include/classes/graphdraw/CLineGraphDraw.php:1373
 msgid "D"
 msgstr "D"
 
-#: include/translateDefines.inc.php:49
-msgid "D, d M Y H:i:s O"
-msgstr "D, d M Y H:i:s O"
-
 #: include/views/monitoring.dashconf.php:24
 msgid "DASHBOARD CONFIGURATION"
 msgstr "儀表板組態 "
@@ -3454,28 +3496,28 @@ msgstr ""
 msgid "DETAILS OF SCENARIO"
 msgstr "方案細節"
 
-#: include/maps.inc.php:445 include/maps.inc.php:527 include/maps.inc.php:615
-#: include/maps.inc.php:705
+#: include/maps.inc.php:462 include/maps.inc.php:544 include/maps.inc.php:632
+#: include/maps.inc.php:722
 msgid "DISABLED"
 msgstr "關閉"
 
-#: include/triggers.inc.php:185
+#: include/triggers.inc.php:173
 msgid "DISCOVERED"
 msgstr "探索到的"
 
-#: events.php:460 hosts.php:805 include/views/administration.proxy.edit.php:62
+#: events.php:461 hosts.php:831 include/views/administration.proxy.edit.php:61
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:133
+#: include/views/js/configuration.host.edit.js.php:22 search.php:133
 msgid "DNS"
 msgstr "DNS"
 
-#: include/views/administration.proxy.edit.php:55
-#: include/views/configuration.host.edit.php:242
-#: include/views/configuration.host.edit.php:329
-#: include/views/configuration.host.prototype.edit.php:94
+#: include/views/administration.proxy.edit.php:54
+#: include/views/configuration.host.edit.php:251
+#: include/views/configuration.host.edit.php:338
+#: include/views/configuration.host.prototype.edit.php:93
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -3483,25 +3525,25 @@ msgstr "DNS"
 msgid "DNS name"
 msgstr "DNS名稱"
 
-#: include/triggers.inc.php:184
+#: include/triggers.inc.php:172
 msgid "DOWN"
 msgstr "斷線"
 
-#: include/forms.inc.php:1617 include/maintenances.inc.php:33
-#: include/reports.inc.php:61 include/reports.inc.php:383
-#: include/reports.inc.php:391 report3.php:58 report4.php:104
+#: include/forms.inc.php:1633 include/maintenances.inc.php:33
+#: include/reports.inc.php:62 include/reports.inc.php:386
+#: include/reports.inc.php:394 report3.php:58 report4.php:104
 msgid "Daily"
 msgstr "每日"
 
-#: include/classes/core/ZBase.php:242
+#: include/classes/core/ZBase.php:252
 msgid "Dark orange"
 msgstr "暗橘色"
 
-#: include/reports.inc.php:432
+#: include/reports.inc.php:435
 msgid "Darken"
 msgstr "轉暗"
 
-#: dashboard.php:25 include/menu.inc.php:33 include/profiles.inc.php:426
+#: dashboard.php:25 include/menu.inc.php:32 include/profiles.inc.php:164
 msgid "Dashboard"
 msgstr "儀表板"
 
@@ -3513,20 +3555,21 @@ msgstr "儀表板的組態"
 msgid "Dashboard filter"
 msgstr "儀表板過濾"
 
-#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:377
-#: include/views/js/configuration.sysmaps.js.php:455
+#: include/graphs.inc.php:63 include/views/js/configuration.sysmaps.js.php:375
+#: include/views/js/configuration.sysmaps.js.php:453
 msgid "Dashed line"
 msgstr "虛線"
 
-#: include/views/monitoring.overview.php:28
+#: include/views/monitoring.overview.items.php:26
+#: include/views/monitoring.overview.triggers.php:28
 msgid "Data"
 msgstr "資料"
 
-#: include/classes/items/CHelpItems.php:891
+#: include/classes/items/CHelpItems.php:903
 msgid "Data cache statistics. Cache - one of values (modes: all, float, uint, str, log, text), history (modes: pfree, total, used, free), trend (modes: pfree, total, used, free), text (modes: pfree, total, used, free)."
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:2509
+#: include/classes/graphdraw/CLineGraphDraw.php:2513
 #: include/classes/graphdraw/CPieGraphDraw.php:750
 #, c-format
 msgid "Data from %1$s. Generated in %2$s sec."
@@ -3549,11 +3592,12 @@ msgstr ""
 msgid "Data type"
 msgstr "資料類型"
 
-#: include/setup.inc.php:275 include/setup.inc.php:411
+#: include/classes/setup/CSetupWizard.php:275
+#: include/classes/setup/CSetupWizard.php:411
 msgid "Database file"
 msgstr "資料庫檔案"
 
-#: include/setup.inc.php:283
+#: include/classes/setup/CSetupWizard.php:283
 msgid "Database host"
 msgstr "資料庫主機"
 
@@ -3561,35 +3605,39 @@ msgstr "資料庫主機"
 msgid "Database monitor"
 msgstr "資料庫監視"
 
-#: include/setup.inc.php:303 include/setup.inc.php:422 setup.php:44
+#: include/classes/setup/CSetupWizard.php:303
+#: include/classes/setup/CSetupWizard.php:422 setup.php:42
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: include/setup.inc.php:424
+#: include/classes/setup/CSetupWizard.php:424
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: include/setup.inc.php:295 include/setup.inc.php:419 setup.php:43
+#: include/classes/setup/CSetupWizard.php:295
+#: include/classes/setup/CSetupWizard.php:419 setup.php:41
 msgid "Database port"
 msgstr "資料庫埠"
 
-#: include/setup.inc.php:311 include/setup.inc.php:426
+#: include/classes/setup/CSetupWizard.php:311
+#: include/classes/setup/CSetupWizard.php:426
 msgid "Database schema"
 msgstr "資料庫資料結構"
 
-#: include/setup.inc.php:416
+#: include/classes/setup/CSetupWizard.php:416
 msgid "Database server"
 msgstr "資料庫伺服器"
 
-#: include/setup.inc.php:268 include/setup.inc.php:404
+#: include/classes/setup/CSetupWizard.php:268
+#: include/classes/setup/CSetupWizard.php:404
 msgid "Database type"
 msgstr "資料庫類型"
 
-#: include/setup.inc.php:423
+#: include/classes/setup/CSetupWizard.php:423
 msgid "Database user"
 msgstr "資料庫用戶"
 
-#: include/forms.inc.php:1684 include/forms.inc.php:1745 jsrpc.php:136
+#: include/forms.inc.php:1700 include/forms.inc.php:1761 jsrpc.php:136
 msgid "Date"
 msgstr "日期"
 
@@ -3609,53 +3657,52 @@ msgstr "硬體維修過期日期"
 msgid "Date HW purchased"
 msgstr "硬體購買日期"
 
-#: include/forms.inc.php:1686 report3.php:124 report4.php:159 report5.php:44
-#: tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1702 report3.php:124 report4.php:159 report5.php:44
 msgid "Day"
 msgstr "日"
 
-#: include/forms.inc.php:1718
+#: include/forms.inc.php:1734
 msgid "Day of month"
 msgstr "月中第幾日"
 
-#: popup_trexpr.php:397
+#: popup_trexpr.php:387
 msgid "Day of month is < N"
 msgstr "月中第幾日是 < N"
 
-#: popup_trexpr.php:405
+#: popup_trexpr.php:395
 msgid "Day of month is = N"
 msgstr "月中第幾日是 = N"
 
-#: popup_trexpr.php:401
+#: popup_trexpr.php:391
 msgid "Day of month is > N"
 msgstr "月中第幾日是 > N"
 
-#: popup_trexpr.php:409
+#: popup_trexpr.php:399
 msgid "Day of month is NOT N"
 msgstr "月中第幾日不是 N"
 
-#: include/forms.inc.php:1646 include/forms.inc.php:1689
-#: include/forms.inc.php:1714
+#: include/forms.inc.php:1662 include/forms.inc.php:1705
+#: include/forms.inc.php:1730
 msgid "Day of week"
 msgstr "週中第幾日"
 
-#: popup_trexpr.php:381
+#: popup_trexpr.php:371
 msgid "Day of week is < N"
 msgstr "週中第幾日是 < N"
 
-#: popup_trexpr.php:389
+#: popup_trexpr.php:379
 msgid "Day of week is = N"
 msgstr "週中第幾日是 = N"
 
-#: popup_trexpr.php:385
+#: popup_trexpr.php:375
 msgid "Day of week is > N"
 msgstr "週中第幾日是 > N"
 
-#: popup_trexpr.php:393
+#: popup_trexpr.php:383
 msgid "Day of week is NOT N"
 msgstr "週中第幾日不是 N"
 
-#: include/forms.inc.php:1762 tr_status.php:273 tr_status.php:275
+#: include/forms.inc.php:1778
 msgid "Days"
 msgstr "日數"
 
@@ -3663,22 +3710,22 @@ msgstr "日數"
 msgid "Debug"
 msgstr "調試"
 
-#: include/views/administration.usergroups.edit.php:73
+#: include/views/administration.usergroups.edit.php:72
 #: include/views/administration.usergroups.list.php:49
 #: include/views/administration.users.list.php:62
 msgid "Debug mode"
 msgstr "調試模式"
 
-#: usergrps.php:309
+#: usergrps.php:331
 msgid "Debug mode updated"
 msgstr "調試模式已更新"
 
-#: include/func.inc.php:260
+#: include/func.inc.php:248
 msgid "Dec"
 msgstr "十二"
 
-#: include/forms.inc.php:1680 include/func.inc.php:140
-#: include/func.inc.php:277 jsLoader.php:122
+#: include/forms.inc.php:1696 include/func.inc.php:128
+#: include/func.inc.php:265 jsLoader.php:123
 msgid "December"
 msgstr "十二"
 
@@ -3688,15 +3735,14 @@ msgstr "十進位數字"
 
 #: include/hosts.inc.php:37
 #: include/views/administration.general.iconmap.edit.php:133
-#: include/views/configuration.action.edit.php:362
-#: include/views/configuration.host.edit.php:245
-#: include/views/configuration.host.edit.php:332
-#: include/views/configuration.host.prototype.edit.php:97
+#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.host.edit.php:254
+#: include/views/configuration.host.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:96
 #: include/views/js/configuration.sysmaps.js.php:82
-#: include/views/js/configuration.sysmaps.js.php:141
-#: include/views/js/configuration.sysmaps.js.php:249
-#: include/views/monitoring.screen.php:88 jsLoader.php:144 popup_bitem.php:116
-#: popup_period.php:109 slides.php:224
+#: include/views/js/configuration.sysmaps.js.php:139
+#: include/views/js/configuration.sysmaps.js.php:247 jsLoader.php:145
+#: popup_bitem.php:123 popup_period.php:118
 msgid "Default"
 msgstr "預設"
 
@@ -3709,11 +3755,11 @@ msgid "Default delay (in seconds)"
 msgstr "預設延遲(秒計)"
 
 #: include/views/configuration.action.edit.php:48
-#: include/views/configuration.action.edit.php:571
+#: include/views/configuration.action.edit.php:617
 msgid "Default message"
 msgstr "預設訊息"
 
-#: actionconf.php:44 include/views/configuration.action.edit.php:315
+#: actionconf.php:46 include/views/configuration.action.edit.php:360
 msgid "Default operation step duration"
 msgstr "預設操作步驟停留時間 "
 
@@ -3736,30 +3782,34 @@ msgstr "預設的佈景主題 \"%1$s\"."
 msgid "Delay"
 msgstr "延遲"
 
-#: include/views/configuration.discovery.edit.php:50
+#: include/views/configuration.discovery.edit.php:49
 msgid "Delay (in sec)"
 msgstr "延遲(秒計)"
 
-#: queue.php:202
+#: queue.php:228
 msgid "Delayed by"
 msgstr "延遲因"
 
-#: include/classes/class.cbuttondelete.php:25
+#: include/classes/html/CButtonDelete.php:25
 #: include/views/administration.auditlogs.list.php:47
-#: include/views/configuration.triggers.edit.php:156 jsLoader.php:106
-#: jsLoader.php:183 tr_logform.php:336 tr_logform.php:353
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:107
+#: jsLoader.php:185 tr_logform.php:290 tr_logform.php:316
 msgid "Delete"
 msgstr "删除"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/js/conf.import.js.php:5
+msgid "Delete all elements that are not present in the XML file?"
+msgstr ""
+
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear"
 msgstr "刪除並清除"
 
-#: templates.php:661
+#: templates.php:675
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "刪除並清除所選的模板? (警告: 所有連結的主機將被清除!)"
 
-#: include/views/configuration.template.edit.php:458
+#: include/views/configuration.template.edit.php:482
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "刪除並清除模板? (警告: 所有連結的主機將被清除!)"
 
@@ -3767,53 +3817,53 @@ msgstr "刪除並清除模板? (警告: 所有連結的主機將被清除!)"
 msgid "Delete application?"
 msgstr "刪除應用集?"
 
-#: include/views/configuration.action.edit.php:1014
+#: include/views/configuration.action.edit.php:1078
 msgid "Delete current action?"
 msgstr "刪除目前的動作?"
 
-#: include/views/configuration.discovery.edit.php:85
-#: include/views/configuration.host.discovery.edit.php:364
+#: include/views/configuration.discovery.edit.php:84
+#: include/views/configuration.host.discovery.edit.php:354
 msgid "Delete discovery rule?"
 msgstr "刪除探索規則?"
 
-#: include/views/configuration.triggers.edit.php:158 jsLoader.php:108
-#: tr_logform.php:337
+#: include/views/configuration.triggers.edit.php:164 jsLoader.php:109
+#: tr_logform.php:292
 msgid "Delete expression?"
 msgstr "删除表示式?"
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph prototype?"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:302
+#: include/views/configuration.graph.edit.php:312
 msgid "Delete graph?"
 msgstr "刪除圖形?"
 
-#: include/views/configuration.httpconf.list.php:104
-msgid "Delete history of selected WEB scenarios?"
-msgstr "刪除所選的WEB方案的歷史資料?"
-
-#: include/views/configuration.item.list.php:274
+#: include/views/configuration.item.list.php:278
 msgid "Delete history of selected items?"
 msgstr "刪除所選的項目的歷史資料?"
 
+#: include/views/configuration.httpconf.list.php:150
+msgid "Delete history of selected web scenarios?"
+msgstr ""
+
 #: include/views/administration.general.iconmap.edit.php:146
 msgid "Delete icon map?"
 msgstr "刪除圖示對應?"
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:460
+#: include/views/configuration.item.edit.php:454
 msgid "Delete item?"
 msgstr "刪除項目?"
 
-#: jsLoader.php:107 tr_logform.php:353
+#: jsLoader.php:108 tr_logform.php:317
 msgid "Delete keyword?"
 msgstr "删除關鍵字?"
 
-#: jsLoader.php:153
+#: jsLoader.php:154
 msgid "Delete links between selected elements?"
 msgstr "刪除所選組件間的連結?"
 
@@ -3821,11 +3871,15 @@ msgstr "刪除所選組件間的連結?"
 msgid "Delete maintenance period?"
 msgstr "刪除維修期間?"
 
+#: include/views/conf.import.php:24
+msgid "Delete missing"
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:191
 msgid "Delete network map?"
 msgstr "刪除網路拓墣圖?"
 
-#: include/views/administration.proxy.edit.php:102
+#: include/views/administration.proxy.edit.php:101
 msgid "Delete proxy?"
 msgstr "刪除系統代理程式?"
 
@@ -3833,7 +3887,7 @@ msgstr "刪除系統代理程式?"
 msgid "Delete regular expression?"
 msgstr "删除正規表示式?"
 
-#: include/views/configuration.httpconf.edit.php:252
+#: include/views/configuration.httpconf.edit.php:292
 msgid "Delete scenario?"
 msgstr "刪除方案?"
 
@@ -3841,71 +3895,67 @@ msgstr "刪除方案?"
 msgid "Delete screen?"
 msgstr "删除篩選?"
 
-#: include/views/administration.script.edit.php:116
+#: include/views/administration.script.edit.php:119
 msgid "Delete script?"
 msgstr "删除脚本?"
 
-#: hosts.php:1059 include/reports.inc.php:110 include/reports.inc.php:199
-#: include/reports.inc.php:242
-#: include/views/administration.general.regularexpressions.list.php:65
-#: include/views/administration.mediatypes.list.php:119
-#: include/views/administration.proxy.list.php:109
-#: include/views/administration.script.list.php:88
-#: include/views/administration.usergroups.edit.php:108
-#: include/views/administration.usergroups.edit.php:112
-#: include/views/administration.usergroups.edit.php:116
+#: hosts.php:1077 include/reports.inc.php:111 include/reports.inc.php:201
+#: include/reports.inc.php:244
+#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.mediatypes.list.php:124
+#: include/views/administration.proxy.list.php:110
+#: include/views/administration.script.list.php:89
+#: include/views/administration.usergroups.edit.php:107
+#: include/views/administration.usergroups.edit.php:111
+#: include/views/administration.usergroups.edit.php:115
 #: include/views/administration.usergroups.list.php:148
-#: include/views/administration.users.edit.php:74
-#: include/views/administration.users.edit.php:219
-#: include/views/administration.users.list.php:153
-#: include/views/configuration.action.list.php:103
-#: include/views/configuration.application.list.php:118
-#: include/views/configuration.discovery.list.php:75
-#: include/views/configuration.graph.list.php:158
-#: include/views/configuration.host.discovery.list.php:148
-#: include/views/configuration.hostgroups.list.php:161
-#: include/views/configuration.host.prototype.list.php:127
-#: include/views/configuration.httpconf.list.php:107
-#: include/views/configuration.item.list.php:277
+#: include/views/administration.users.edit.php:73
+#: include/views/administration.users.edit.php:221
+#: include/views/administration.users.list.php:155
+#: include/views/configuration.action.list.php:104
+#: include/views/configuration.application.list.php:119
+#: include/views/configuration.discovery.list.php:76
+#: include/views/configuration.graph.list.php:159
+#: include/views/configuration.host.discovery.list.php:150
+#: include/views/configuration.hostgroups.list.php:164
+#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.httpconf.list.php:153
+#: include/views/configuration.item.list.php:281
 #: include/views/configuration.item.prototype.list.php:120
-#: include/views/configuration.maintenance.list.php:80
+#: include/views/configuration.maintenance.list.php:81
 #: include/views/configuration.screen.list.php:70
-#: include/views/configuration.slideconf.list.php:56
-#: include/views/configuration.sysmap.list.php:62
-#: include/views/configuration.triggers.list.php:307 templates.php:657
+#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.sysmap.list.php:64
+#: include/views/configuration.triggers.list.php:307 templates.php:670
 msgid "Delete selected"
 msgstr "删除所選的"
 
-#: include/views/configuration.httpconf.list.php:108
-msgid "Delete selected WEB scenarios?"
-msgstr "刪除所選的WEB方案?"
-
-#: include/views/configuration.action.list.php:104
+#: include/views/configuration.action.list.php:105
 msgid "Delete selected actions?"
 msgstr "刪除所選的動作?"
 
-#: include/views/configuration.application.list.php:119
+#: include/views/configuration.application.list.php:120
 msgid "Delete selected applications?"
 msgstr "删除所選的應用集?"
 
-#: include/views/configuration.discovery.list.php:76
-#: include/views/configuration.host.discovery.list.php:149
+#: include/views/configuration.discovery.list.php:77
+#: include/views/configuration.host.discovery.list.php:151
 msgid "Delete selected discovery rules?"
 msgstr "删除所選的探索規則?"
 
-#: jsLoader.php:149
+#: jsLoader.php:150
 msgid "Delete selected elements?"
 msgstr "刪除所選的組件?"
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graph prototypes?"
 msgstr ""
 
-#: include/views/configuration.graph.list.php:161
+#: include/views/configuration.graph.list.php:162
 msgid "Delete selected graphs?"
 msgstr "刪除所選的圖形?"
 
-#: include/views/administration.usergroups.edit.php:145
+#: include/views/administration.usergroups.edit.php:144
 #: include/views/configuration.hostgroups.edit.php:78
 msgid "Delete selected group?"
 msgstr "删除所選的群組?"
@@ -3914,27 +3964,27 @@ msgstr "删除所選的群組?"
 msgid "Delete selected groups?"
 msgstr "删除所選的群組?"
 
-#: include/views/configuration.hostgroups.list.php:162
+#: include/views/configuration.hostgroups.list.php:165
 msgid "Delete selected host groups?"
 msgstr "刪除所選的主機群組?"
 
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:331
 msgid "Delete selected host prototype?"
 msgstr ""
 
-#: include/views/configuration.host.prototype.list.php:128
+#: include/views/configuration.host.prototype.list.php:129
 msgid "Delete selected host prototypes?"
 msgstr ""
 
-#: include/views/configuration.host.edit.php:858
+#: include/views/configuration.host.edit.php:888
 msgid "Delete selected host?"
 msgstr "刪除所選的主機?"
 
-#: hosts.php:1060
+#: hosts.php:1078
 msgid "Delete selected hosts?"
 msgstr "删除所選的主機?"
 
-#: include/views/administration.general.image.edit.php:61
+#: include/views/administration.general.image.edit.php:57
 msgid "Delete selected image?"
 msgstr "删除所選的圖片?"
 
@@ -3942,31 +3992,31 @@ msgstr "删除所選的圖片?"
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:278
+#: include/views/configuration.item.list.php:282
 msgid "Delete selected items?"
 msgstr "删除所選的項目?"
 
-#: include/views/configuration.maintenance.list.php:81
+#: include/views/configuration.maintenance.list.php:82
 msgid "Delete selected maintenance periods?"
 msgstr "删除所選的維修期間?"
 
-#: include/views/configuration.sysmap.list.php:63
+#: include/views/configuration.sysmap.list.php:65
 msgid "Delete selected maps?"
 msgstr "删除所選的拓墣圖?"
 
-#: include/views/administration.mediatypes.edit.php:110
+#: include/views/administration.mediatypes.edit.php:109
 msgid "Delete selected media type?"
 msgstr "刪除所選的示警媒介類型?"
 
-#: include/views/administration.mediatypes.list.php:120
+#: include/views/administration.mediatypes.list.php:125
 msgid "Delete selected media types?"
 msgstr "刪除所選的示警媒介類型?"
 
-#: include/views/administration.proxy.list.php:110
+#: include/views/administration.proxy.list.php:111
 msgid "Delete selected proxies?"
 msgstr "删除所選的系統代理程式?"
 
-#: include/views/administration.general.regularexpressions.list.php:66
+#: include/views/administration.general.regularexpressions.list.php:67
 msgid "Delete selected regular expressions?"
 msgstr "删除所選的正規表示式?"
 
@@ -3974,15 +4024,15 @@ msgstr "删除所選的正規表示式?"
 msgid "Delete selected screens?"
 msgstr "刪除所選的篩選?"
 
-#: include/views/administration.script.list.php:89
+#: include/views/administration.script.list.php:90
 msgid "Delete selected scripts?"
 msgstr "删除所選的脚本?"
 
-#: include/views/configuration.slideconf.list.php:57
+#: include/views/configuration.slideconf.list.php:58
 msgid "Delete selected slide shows?"
 msgstr "刪除所選的簡報片展示?"
 
-#: templates.php:658
+#: templates.php:671
 msgid "Delete selected templates?"
 msgstr "删除所選的模板?"
 
@@ -3994,11 +4044,11 @@ msgstr ""
 msgid "Delete selected triggers?"
 msgstr "删除所選的觸發器?"
 
-#: include/views/administration.users.edit.php:387
+#: include/views/administration.users.edit.php:389
 msgid "Delete selected user?"
 msgstr "删除所選的用戶?"
 
-#: include/views/administration.users.list.php:154
+#: include/views/administration.users.list.php:156
 msgid "Delete selected users?"
 msgstr "删除所選的用戶?"
 
@@ -4012,11 +4062,15 @@ msgid "Delete selected value mapping? It is used for %d item!"
 msgid_plural "Delete selected value mapping? It is used for %d items!"
 msgstr[0] "刪除所選的值對應? 它是用於%d項目!"
 
-#: templates.php:660
+#: include/views/configuration.httpconf.list.php:154
+msgid "Delete selected web scenarios?"
+msgstr ""
+
+#: templates.php:674
 msgid "Delete selected with linked elements"
 msgstr "自連結的組件删除所選的"
 
-#: jsLoader.php:184
+#: jsLoader.php:186
 #, c-format
 msgid "Delete service \"%1$s\"?"
 msgstr ""
@@ -4025,15 +4079,15 @@ msgstr ""
 msgid "Delete slide show?"
 msgstr "刪除簡報片展示?"
 
-#: include/views/configuration.template.edit.php:457
+#: include/views/configuration.template.edit.php:481
 msgid "Delete template?"
 msgstr "刪除模板?"
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:337
+#: include/views/configuration.triggers.edit.php:343
 msgid "Delete trigger?"
 msgstr "刪除觸發器?"
 
@@ -4041,62 +4095,62 @@ msgstr "刪除觸發器?"
 msgid "Deleted"
 msgstr "已删除"
 
-#: api/classes/CApplication.php:444
+#: include/classes/api/services/CApplication.php:454
 #, c-format
 msgid "Deleted: Application \"%1$s\" on \"%2$s\"."
 msgstr "已刪除: 應用集 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:442
+#: include/classes/api/services/CDiscoveryRule.php:452
 #, c-format
 msgid "Deleted: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "已刪除: 探索規則 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CGraph.php:564
+#: include/classes/api/services/CGraph.php:580
 #, c-format
 msgid "Deleted: Graph \"%1$s\" on \"%2$s\"."
 msgstr "已刪除: 圖形 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CHost.php:1454
+#: include/classes/api/services/CHost.php:1441
 #, c-format
 msgid "Deleted: Host \"%1$s\"."
 msgstr "已刪除: 主機 \"%1$s\"."
 
-#: api/classes/CHostPrototype.php:970
+#: include/classes/api/services/CHostPrototype.php:970
 #, c-format
 msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:721
+#: include/classes/api/services/CItem.php:724
 #, c-format
 msgid "Deleted: Item \"%1$s\" on \"%2$s\"."
 msgstr "已刪除: 項目 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CItemPrototype.php:545
+#: include/classes/api/services/CItemPrototype.php:560
 #, c-format
 msgid "Deleted: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "已刪除: 項目原型 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CProxy.php:457
+#: include/classes/api/services/CProxy.php:457
 #, c-format
 msgid "Deleted: Proxy \"%1$s\"."
 msgstr "已刪除: 系統代理程式\"%1$s\"."
 
-#: api/classes/CTemplate.php:681
+#: include/classes/api/services/CTemplate.php:712
 #, c-format
 msgid "Deleted: Template \"%1$s\"."
 msgstr "已刪除: 模板 \"%1$s\"."
 
-#: api/classes/CTrigger.php:811
+#: include/classes/api/services/CTrigger.php:812
 #, c-format
 msgid "Deleted: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "已刪除: 觸發器 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:641
+#: include/classes/api/services/CTriggerPrototype.php:641
 #, c-format
 msgid "Deleted: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "已刪除: 觸發器原型 \"%1$s\" 於 \"%2$s\"."
 
-#: api/classes/CHttpTest.php:423
+#: include/classes/api/services/CHttpTest.php:426
 #, c-format
 msgid "Deleted: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
@@ -4105,35 +4159,35 @@ msgstr ""
 msgid "Delimiter"
 msgstr "分隔符"
 
-#: include/views/configuration.item.edit.php:366
+#: include/views/configuration.item.edit.php:356
 #: include/views/configuration.item.massupdate.php:426
 msgid "Delta (simple change)"
 msgstr "差量 (單純變化)"
 
-#: include/views/configuration.item.edit.php:365
+#: include/views/configuration.item.edit.php:355
 #: include/views/configuration.item.massupdate.php:425
 msgid "Delta (speed per second)"
 msgstr "差量 (每秒速率)"
 
 #: include/forms.inc.php:243 include/perm.inc.php:33
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Deny"
 msgstr "禁止"
 
-#: include/views/configuration.services.edit.php:282
-#: include/views/configuration.triggers.edit.php:308
-#: include/views/configuration.triggers.edit.php:325
+#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.triggers.edit.php:314
+#: include/views/configuration.triggers.edit.php:331
 msgid "Dependencies"
 msgstr "相依關係"
 
-#: include/triggers.inc.php:1415 tr_status.php:664
+#: include/triggers.inc.php:1237 tr_status.php:588
 msgid "Dependent"
 msgstr "相依"
 
-#: include/triggers.inc.php:1395
-#: include/views/configuration.services.edit.php:118
-#: include/views/configuration.triggers.list.php:173 popup.php:705
-#: tr_status.php:648
+#: include/triggers.inc.php:1217
+#: include/views/configuration.services.edit.php:117
+#: include/views/configuration.triggers.list.php:166 popup.php:1036
+#: tr_status.php:572
 msgid "Depends on"
 msgstr "相依於"
 
@@ -4141,30 +4195,41 @@ msgstr "相依於"
 msgid "Deployment status"
 msgstr "佈署狀態"
 
-#: events.php:461 events.php:476 include/classes/screens/CScreenEvents.php:41
+#: events.php:462 events.php:477 include/classes/screens/CScreenEvents.php:41
 #: include/views/administration.auditlogs.list.php:91
-#: include/views/administration.proxy.edit.php:89
-#: include/views/administration.script.edit.php:70
+#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.script.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.host.edit.php:385
-#: include/views/configuration.host.massupdate.php:135
-#: include/views/configuration.item.edit.php:437
-#: include/views/configuration.item.massupdate.php:546
+#: include/views/configuration.host.edit.php:394
+#: include/views/configuration.host.massupdate.php:153
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.massupdate.php:558
 #: include/views/configuration.maintenance.edit.php:92
 #: include/views/configuration.maintenance.list.php:49
-#: include/views/configuration.template.edit.php:178
-#: include/views/configuration.triggers.edit.php:245
-#: include/views/inventory.host.view.php:189 popup.php:1003 tr_logform.php:253
+#: include/views/configuration.template.edit.php:175
+#: include/views/configuration.triggers.edit.php:251
+#: include/views/inventory.host.view.php:198
+#: include/views/monitoring.triggerComment.php:39 popup.php:1304
+#: tr_logform.php:220 tr_status.php:310
 msgid "Description"
 msgstr "描述"
 
-#: include/actions.inc.php:971 include/blocks.inc.php:800
-#: include/func.inc.php:2023
+#: include/views/monitoring.triggerComment.php:43
+#, c-format
+msgid "Description for \"%s\"."
+msgstr ""
+
+#: tr_comments.php:82
+msgid "Description updated"
+msgstr ""
+
+#: include/actions.inc.php:971 include/blocks.inc.php:806
+#: include/func.inc.php:1781
 #: include/views/administration.auditlogs.list.php:92
 #: include/views/administration.mediatypes.list.php:43
-#: include/views/configuration.action.edit.php:325
-#: include/views/configuration.action.edit.php:329
-#: include/views/inventory.host.view.php:271 jsrpc.php:135 queue.php:71
+#: include/views/configuration.action.edit.php:370
+#: include/views/configuration.action.edit.php:374
+#: include/views/inventory.host.view.php:283 jsrpc.php:135 queue.php:71
 msgid "Details"
 msgstr "細節"
 
@@ -4177,71 +4242,71 @@ msgid "Device"
 msgstr "裝置"
 
 #: include/classes/items/CHelpItems.php:157
-#: include/classes/items/CHelpItems.php:415
+#: include/classes/items/CHelpItems.php:419
 msgid "Device interrupts."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:189
-#: include/classes/items/CHelpItems.php:447
+#: include/classes/items/CHelpItems.php:451
 msgid "Device list - lists PCI devices by default"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:245
-#: include/classes/items/CHelpItems.php:503
+#: include/classes/items/CHelpItems.php:507
 msgid "Device read statistics."
 msgstr ""
 
-#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:69
+#: discoveryconf.php:41 include/views/configuration.discovery.edit.php:68
 msgid "Device uniqueness criteria"
 msgstr "裝置唯一性準則"
 
 #: include/classes/items/CHelpItems.php:249
-#: include/classes/items/CHelpItems.php:507
+#: include/classes/items/CHelpItems.php:511
 msgid "Device write statistics."
 msgstr ""
 
-#: popup_trexpr.php:175
+#: popup_trexpr.php:165
 msgid "Difference between MAX and MIN value of a period T is < N"
 msgstr "期間T的最大與最小值的差是 < N"
 
-#: popup_trexpr.php:185
+#: popup_trexpr.php:175
 msgid "Difference between MAX and MIN value of a period T is = N"
 msgstr "期間T的最大與最小值的差是 = N"
 
-#: popup_trexpr.php:180
+#: popup_trexpr.php:170
 msgid "Difference between MAX and MIN value of a period T is > N"
 msgstr "期間T的最大與最小值的差是 > N"
 
-#: popup_trexpr.php:190
+#: popup_trexpr.php:180
 msgid "Difference between MAX and MIN value of a period T is NOT N"
 msgstr "期間T的最大與最小值的差不是 N"
 
-#: popup_trexpr.php:231
+#: popup_trexpr.php:221
 msgid "Difference between last and preceding values, then N = 1, 0 - otherwise"
 msgstr "最末和之前的值的差, 則 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:235
+#: popup_trexpr.php:225
 msgid "Difference between last and preceding values, then N NOT 1, 0 - otherwise"
 msgstr "最末和之前的值的差, 則 N 非 1, 0 - 除外"
 
-#: popup_trexpr.php:195
+#: popup_trexpr.php:185
 msgid "Difference between last and previous value is < N"
 msgstr "在最後與前一個值之間的差異是 <  N"
 
-#: popup_trexpr.php:203
+#: popup_trexpr.php:193
 msgid "Difference between last and previous value is = N"
 msgstr "在最後與前一個值之間的差異是 =  N"
 
-#: popup_trexpr.php:199
+#: popup_trexpr.php:189
 msgid "Difference between last and previous value is > N"
 msgstr "在最後與前一個值之間的差異是 >  N"
 
-#: popup_trexpr.php:207
+#: popup_trexpr.php:197
 msgid "Difference between last and previous value is NOT N"
 msgstr "在最後與前一個值之間的差異不是 N"
 
 #: include/classes/items/CHelpItems.php:145
-#: include/classes/items/CHelpItems.php:403
+#: include/classes/items/CHelpItems.php:407
 msgid "Different information about specific process(es)"
 msgstr ""
 
@@ -4265,48 +4330,44 @@ msgstr "停用所選的群組的調試模式?"
 msgid "Disable host"
 msgstr "停用主機"
 
-#: hosts.php:969 hosts.php:982
+#: hosts.php:991
 msgid "Disable host?"
 msgstr "停用主機?"
 
-#: include/views/configuration.hostgroups.list.php:159
+#: include/views/configuration.hostgroups.list.php:161
 msgid "Disable hosts in the selected host groups?"
 msgstr "停用所選的主機群組中的主機?"
 
-#: include/views/administration.proxy.list.php:106
+#: include/views/administration.proxy.list.php:107
 msgid "Disable hosts monitored by selected proxies?"
 msgstr "停用所選的系統代理程式所監測的主機?"
 
-#: hosts.php:1056 include/views/administration.mediatypes.list.php:115
-#: include/views/administration.proxy.list.php:105
+#: hosts.php:1073 include/views/administration.mediatypes.list.php:120
+#: include/views/administration.proxy.list.php:106
 #: include/views/administration.usergroups.list.php:136
-#: include/views/configuration.action.list.php:99
-#: include/views/configuration.application.list.php:114
-#: include/views/configuration.discovery.list.php:71
-#: include/views/configuration.host.discovery.list.php:144
-#: include/views/configuration.hostgroups.list.php:158
-#: include/views/configuration.host.prototype.list.php:123
-#: include/views/configuration.httpconf.list.php:99
-#: include/views/configuration.item.list.php:263
+#: include/views/configuration.action.list.php:100
+#: include/views/configuration.application.list.php:115
+#: include/views/configuration.discovery.list.php:72
+#: include/views/configuration.host.discovery.list.php:146
+#: include/views/configuration.hostgroups.list.php:160
+#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.httpconf.list.php:145
+#: include/views/configuration.item.list.php:267
 #: include/views/configuration.item.prototype.list.php:116
-#: include/views/configuration.triggers.list.php:293
+#: include/views/configuration.triggers.list.php:292
 msgid "Disable selected"
 msgstr "停用所選的"
 
-#: include/views/configuration.httpconf.list.php:100
-msgid "Disable selected WEB scenarios?"
-msgstr "停用所選的WEB方案?"
-
-#: include/views/configuration.action.list.php:100
+#: include/views/configuration.action.list.php:101
 msgid "Disable selected actions?"
 msgstr "停用所選的動作?"
 
-#: include/views/configuration.application.list.php:115
+#: include/views/configuration.application.list.php:116
 msgid "Disable selected applications?"
 msgstr "停用所選的應用集?"
 
-#: include/views/configuration.discovery.list.php:72
-#: include/views/configuration.host.discovery.list.php:145
+#: include/views/configuration.discovery.list.php:73
+#: include/views/configuration.host.discovery.list.php:147
 msgid "Disable selected discovery rules?"
 msgstr "停用所選的探索規則?"
 
@@ -4314,11 +4375,11 @@ msgstr "停用所選的探索規則?"
 msgid "Disable selected groups?"
 msgstr "停用所選的群組?"
 
-#: include/views/configuration.host.prototype.list.php:124
+#: include/views/configuration.host.prototype.list.php:125
 msgid "Disable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1057
+#: hosts.php:1074
 msgid "Disable selected hosts?"
 msgstr "停用所選的主機?"
 
@@ -4326,42 +4387,47 @@ msgstr "停用所選的主機?"
 msgid "Disable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:264
+#: include/views/configuration.item.list.php:268
 msgid "Disable selected items?"
 msgstr "停用所選的項目?"
 
-#: include/views/administration.mediatypes.list.php:116
+#: include/views/administration.mediatypes.list.php:121
 msgid "Disable selected media types?"
 msgstr "停用所選的示警媒介類型?"
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:296
+#: include/views/configuration.triggers.list.php:295
 msgid "Disable selected triggers?"
 msgstr "停用所選的觸發器?"
 
-#: auditlogs.php:146 dashboard.php:295 hosts.php:974
-#: include/discovery.inc.php:121 include/html.inc.php:330
+#: include/views/configuration.httpconf.list.php:146
+msgid "Disable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:146 dashboard.php:295 hosts.php:995
+#: include/discovery.inc.php:121 include/html.inc.php:336
 #: include/httptest.inc.php:46 include/items.inc.php:155
-#: include/items.inc.php:209 include/triggers.inc.php:1663
-#: include/triggers.inc.php:2513 include/users.inc.php:85
-#: include/views/administration.mediatypes.list.php:96
+#: include/items.inc.php:209 include/triggers.inc.php:1486
+#: include/triggers.inc.php:2323 include/users.inc.php:85
+#: include/views/administration.mediatypes.list.php:100
 #: include/views/administration.usergroups.list.php:58
 #: include/views/administration.usergroups.list.php:83
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:185
+#: include/views/administration.users.edit.php:187
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.list.php:72
-#: include/views/configuration.host.edit.php:786
-#: include/views/configuration.host.massupdate.php:250
-#: include/views/configuration.host.prototype.edit.php:298
+#: include/views/configuration.host.edit.php:816
+#: include/views/configuration.host.massupdate.php:178
+#: include/views/configuration.host.massupdate.php:282
+#: include/views/configuration.host.prototype.edit.php:309
 #: include/views/configuration.item.massupdate.php:300
-#: include/views/js/configuration.sysmaps.js.php:158
+#: include/views/js/configuration.sysmaps.js.php:156
 #: include/views/monitoring.dashconf.php:41 popup_media.php:133
-#: tr_logform.php:373
+#: tr_logform.php:341
 msgid "Disabled"
 msgstr "停用的"
 
@@ -4374,7 +4440,7 @@ msgstr "災難"
 msgid "Discovered"
 msgstr "已探索到的"
 
-#: include/views/configuration.host.edit.php:171
+#: include/views/configuration.host.edit.php:184
 msgid "Discovered by"
 msgstr ""
 
@@ -4382,17 +4448,17 @@ msgstr ""
 msgid "Discovered device"
 msgstr "已探索到的裝置"
 
-#: events.php:338 hosts.php:840 hosts.php:936 include/html.inc.php:345
-#: include/menu.inc.php:77 include/menu.inc.php:209
+#: events.php:338 hosts.php:866 hosts.php:959 include/html.inc.php:351
+#: include/menu.inc.php:76 include/menu.inc.php:203
 #: include/views/configuration.action.list.php:34
-#: include/views/inventory.host.view.php:220
-#: include/views/inventory.host.view.php:230 search.php:144 search.php:185
+#: include/views/inventory.host.view.php:232
+#: include/views/inventory.host.view.php:242 search.php:144 search.php:185
 #: search.php:201 search.php:399 search.php:442 search.php:459
-#: templates.php:501 templates.php:567
+#: templates.php:515 templates.php:578
 msgid "Discovery"
 msgstr "探索"
 
-#: include/views/configuration.discovery.edit.php:48
+#: include/views/configuration.discovery.edit.php:47
 msgid "Discovery by proxy"
 msgstr "由系統代理程式探索"
 
@@ -4400,17 +4466,17 @@ msgstr "由系統代理程式探索"
 msgid "Discovery check"
 msgstr "探索檢查"
 
-#: include/views/js/configuration.discovery.edit.js.php:535
-#: include/views/js/configuration.discovery.edit.js.php:599
-#: include/views/js/configuration.discovery.edit.js.php:616
+#: include/views/js/configuration.discovery.edit.js.php:546
+#: include/views/js/configuration.discovery.edit.js.php:610
+#: include/views/js/configuration.discovery.edit.js.php:627
 msgid "Discovery check error"
 msgstr ""
 
-#: popup.php:91
+#: popup.php:111
 msgid "Discovery checks"
 msgstr "探索檢查"
 
-#: include/html.inc.php:343
+#: include/html.inc.php:349
 msgid "Discovery list"
 msgstr "探索清單"
 
@@ -4419,65 +4485,68 @@ msgid "Discovery object"
 msgstr "探索物件"
 
 #: include/actions.inc.php:68 include/audit.inc.php:43
-#: include/blocks.inc.php:1251 include/forms.inc.php:1076
-#: include/views/configuration.discovery.edit.php:81
+#: include/blocks.inc.php:1256 include/forms.inc.php:1090
+#: include/views/configuration.discovery.edit.php:80
 #: include/views/configuration.discovery.list.php:29
 #: include/views/monitoring.discovery.php:32
 msgid "Discovery rule"
 msgstr "探索規則"
 
-#: api/classes/CDiscoveryRule.php:40
+#: include/classes/api/services/CDiscoveryRule.php:40
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "探索規則 \"%1$s\"已存在於 \"%2$s\",繼承自其它的模板."
 
-#: api/classes/CDiscoveryRule.php:41
+#: include/classes/api/services/CDiscoveryRule.php:41
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:893
+#: include/classes/api/services/CDRule.php:411
+#: include/classes/api/services/CDRule.php:424
+#: include/classes/api/services/CDRule.php:499
+#: include/classes/api/services/CDRule.php:518
 #, c-format
-msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
-msgstr "探索規則\"%1$s:%2$s\" 有不正確的存活時間: \"%3$s\". (最小: %4$d, 最大: %5$d, 可用用戶巨集)"
+msgid "Discovery rule \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CDRule.php:395 api/classes/CDRule.php:464
+#: include/classes/api/services/CDiscoveryRule.php:903
 #, c-format
-msgid "Discovery rule \"%s\" already exists."
-msgstr "探索規則\"%s\"已存在."
+msgid "Discovery rule \"%1$s:%2$s\" has incorrect lifetime: \"%3$s\". (min: %4$d, max: %5$d, user macro allowed)"
+msgstr "探索規則\"%1$s:%2$s\" 有不正確的存活時間: \"%3$s\". (最小: %4$d, 最大: %5$d, 可用用戶巨集)"
 
-#: discoveryconf.php:143 host_discovery.php:290
+#: discoveryconf.php:153 host_discovery.php:297
 msgid "Discovery rule created"
 msgstr "探索規則已創建"
 
-#: discoveryconf.php:161 host_discovery.php:178
+#: discoveryconf.php:178 host_discovery.php:185
 msgid "Discovery rule deleted"
 msgstr "探索規則已删除"
 
-#: discoveryconf.php:190 host_discovery.php:310
+#: discoveryconf.php:202 host_discovery.php:321
 msgid "Discovery rule disabled"
 msgid_plural "Discovery rules disabled"
 msgstr[0] ""
 
-#: discoveryconf.php:189 host_discovery.php:309
+#: discoveryconf.php:201 host_discovery.php:320
 msgid "Discovery rule enabled"
 msgid_plural "Discovery rules enabled"
 msgstr[0] ""
 
-#: discoveryconf.php:136 host_discovery.php:286
+#: discoveryconf.php:146 host_discovery.php:293
 msgid "Discovery rule updated"
 msgstr "探索規則已更新"
 
-#: include/html.inc.php:466 include/html.inc.php:470
+#: include/html.inc.php:472 include/html.inc.php:476
 #: include/views/configuration.host.discovery.list.php:32
-#: include/views/configuration.host.edit.php:548
-#: include/views/configuration.template.edit.php:289
-#: include/views/conf.import.php:32 include/views/monitoring.discovery.php:33
-#: popup.php:87
+#: include/views/configuration.host.edit.php:553
+#: include/views/configuration.template.edit.php:286
+#: include/views/conf.import.php:34 include/views/monitoring.discovery.php:33
+#: popup.php:107
 msgid "Discovery rules"
 msgstr "探索規則"
 
-#: discoveryconf.php:202 host_discovery.php:321
+#: discoveryconf.php:220 host_discovery.php:334
 msgid "Discovery rules deleted"
 msgstr "探索規則已删除"
 
@@ -4489,7 +4558,7 @@ msgstr "探索狀態"
 msgid "Display OK triggers for"
 msgstr "顯示OK觸發器予"
 
-#: include/func.inc.php:1801
+#: include/func.inc.php:1559
 msgid "Displaying"
 msgstr "顯示"
 
@@ -4498,32 +4567,32 @@ msgstr "顯示"
 msgid "Displaying %1$s of %2$s found"
 msgstr "顯示 已探索的 %2$s中的%1$s"
 
-#: report6.php:226
+#: report6.php:237
 msgid "Distribution of values for multiple items"
 msgstr "多個項目的分佈的值"
 
-#: report6.php:225
+#: report6.php:236
 msgid "Distribution of values for multiple periods"
 msgstr "多個期間的分佈的值"
 
-#: include/services.inc.php:60
+#: include/services.inc.php:26
 msgid "Do not calculate"
 msgstr "不要計算"
 
-#: jsLoader.php:185
+#: jsLoader.php:187
 msgid "Do you wish to replace the conditional expression?"
 msgstr "您想要替換條件式表示式嗎?"
 
-#: jsLoader.php:131
+#: jsLoader.php:132
 msgid "Done"
 msgstr "完成"
 
-#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:376
-#: include/views/js/configuration.sysmaps.js.php:454 jsLoader.php:147
+#: include/graphs.inc.php:61 include/views/js/configuration.sysmaps.js.php:374
+#: include/views/js/configuration.sysmaps.js.php:452 jsLoader.php:148
 msgid "Dot"
 msgstr "點"
 
-#: include/blocks.inc.php:1253
+#: include/blocks.inc.php:1258
 msgctxt "discovery results in dashboard"
 msgid "Down"
 msgstr "下"
@@ -4533,30 +4602,30 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "下"
 
-#: include/views/configuration.services.edit.php:143
-#: include/views/configuration.services.edit.php:262
+#: include/views/configuration.services.edit.php:142
+#: include/views/configuration.services.edit.php:261
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:164 report3.php:83
 msgid "Downtime"
 msgstr "斷線時間"
 
-#: include/views/configuration.host.edit.php:297
+#: include/views/configuration.host.edit.php:306
 msgid "Drag here to change the type of the interface to \"IPMI\" type."
 msgstr "拖拉這裡來改變介面類型為 \"IPMI\" 類型."
 
-#: include/views/configuration.host.edit.php:282
+#: include/views/configuration.host.edit.php:291
 msgid "Drag here to change the type of the interface to \"JMX\" type."
 msgstr "拖拉這裡來改變介面類型為 \"JMX\" 類型."
 
-#: include/views/configuration.host.edit.php:266
+#: include/views/configuration.host.edit.php:275
 msgid "Drag here to change the type of the interface to \"SNMP\" type."
 msgstr "拖拉這裡來改變介面類型為 \"SNMP\" 類型."
 
-#: include/views/configuration.host.edit.php:249
+#: include/views/configuration.host.edit.php:258
 msgid "Drag here to change the type of the interface to \"agent\" type."
 msgstr "拖拉這裡來改變介面類型為 \"端點代理程式\" 類型."
 
-#: include/views/configuration.graph.edit.php:225
+#: include/views/configuration.graph.edit.php:235
 msgid "Draw style"
 msgstr "繪圖風格"
 
@@ -4574,74 +4643,75 @@ msgstr "下拉的第一個輸入項 \"%1$s\"."
 msgid "Dropdown remember selected \"%1$s\"."
 msgstr "下拉記住所選的 \"%1$s\"."
 
-#: api/classes/CTrigger.php:1557
+#: include/classes/api/services/CTrigger.php:1549
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
 msgstr "觸發器 \"%1$s\" 中的重複相依關係."
 
-#: api/classes/CHostPrototype.php:197
+#: include/classes/api/services/CHostPrototype.php:197
 #, c-format
 msgid "Duplicate group prototype name \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:191
+#: include/classes/api/services/CHostPrototype.php:191
 #, c-format
 msgid "Duplicate host group ID \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:630
+#: include/classes/api/services/CHost.php:626
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%s\" already exists in data."
 msgstr "重複的主機. 有相同主機名稱\"%s\"的主機已存於資料中."
 
-#: api/classes/CHost.php:662
+#: include/classes/api/services/CHost.php:644
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data."
 msgstr "重複的主機. 有相同主機可視名稱\"%s\"的主機已存於資料中."
 
-#: api/classes/CMap.php:368
+#: include/classes/api/services/CMap.php:378
 #, c-format
 msgid "Duplicate map name for map \"%s\"."
 msgstr "重複的拓墣圖\"%s\"的拓墣圖名稱."
 
-#: api/classes/CScript.php:398 api/classes/CScript.php:454
+#: include/classes/api/services/CScript.php:398
+#: include/classes/api/services/CScript.php:454
 #, c-format
 msgid "Duplicate script name \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:384
+#: include/profiles.inc.php:122
 #, c-format
 msgid "Duplicate severity name \"%s\"."
 msgstr "重複的嚴重性名稱\"%s\"."
 
-#: api/classes/CUser.php:278
+#: include/classes/api/services/CUser.php:281
 #, c-format
 msgid "Duplicate user alias \"%s\"."
 msgstr "重複的用戶別名\"%s\"."
 
-#: events.php:479 include/events.inc.php:195 include/events.inc.php:272
-#: include/events.inc.php:275 tr_status.php:391
+#: events.php:480 include/events.inc.php:195 include/events.inc.php:272
+#: include/events.inc.php:275 tr_status.php:306
 msgid "Duration"
 msgstr "持續時間"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Duration (sec)"
 msgstr "持續時間(秒)"
 
-#: include/locales.inc.php:56
+#: include/locales.inc.php:60
 msgid "Dutch (nl_NL)"
 msgstr "荷蘭(nl_NL)"
 
-#: include/views/configuration.screen.constructor.edit.php:579
+#: include/views/configuration.screen.constructor.edit.php:730
 msgid "Dynamic item"
 msgstr "動態監控項"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgctxt "Exa short"
 msgid "E"
 msgstr "E"
 
-#: include/func.inc.php:1992
+#: include/func.inc.php:1750
 msgid "ERROR"
 msgstr "錯誤"
 
@@ -4649,13 +4719,13 @@ msgstr "錯誤"
 msgid "EVENTS"
 msgstr "事件"
 
-#: jsLoader.php:152
+#: jsLoader.php:153
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "每個URL必須是唯一的. 請確保僅有一個URL為名."
 
-#: include/views/administration.users.edit.php:211
-#: include/views/configuration.action.edit.php:373
-#: include/views/configuration.action.edit.php:386
+#: include/views/administration.users.edit.php:213
+#: include/views/configuration.action.edit.php:418
+#: include/views/configuration.action.edit.php:431
 #: include/views/configuration.maintenance.edit.php:112
 #: include/views/configuration.screen.list.php:61
 #: include/views/configuration.sysmap.list.php:46
@@ -4663,9 +4733,9 @@ msgstr "每個URL必須是唯一的. 請確保僅有一個URL為名."
 #: include/views/configuration.triggers.edit.php:81
 #: include/views/js/adm.regexprs.edit.js.php:7
 #: include/views/js/configuration.discovery.edit.js.php:7
-#: include/views/js/configuration.sysmaps.js.php:429
-#: include/views/js/configuration.sysmaps.js.php:437
-#: include/views/monitoring.triggerComment.php:51 jsLoader.php:186
+#: include/views/js/configuration.sysmaps.js.php:427
+#: include/views/js/configuration.sysmaps.js.php:435
+#: include/views/monitoring.triggerComment.php:51 jsLoader.php:188
 msgid "Edit"
 msgstr "編輯"
 
@@ -4673,7 +4743,7 @@ msgstr "編輯"
 msgid "Edit map element"
 msgstr "編輯拓墣圖組件"
 
-#: jsLoader.php:187
+#: jsLoader.php:189
 msgid "Edit trigger"
 msgstr "編輯觸發器"
 
@@ -4681,27 +4751,61 @@ msgstr "編輯觸發器"
 msgid "Element"
 msgstr "組件"
 
-#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:328
+#: include/maps.inc.php:47 include/views/js/configuration.sysmaps.js.php:326
 msgid "Element name"
 msgstr "組件名稱"
 
 #: include/media.inc.php:24
-#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.mediatypes.edit.php:40
 msgid "Email"
 msgstr "電子郵件"
 
-#: popup.php:485
+#: popup.php:516
 msgid "Empty"
 msgstr "空"
 
-#: api/classes/CAction.php:1510 api/classes/CAction.php:1517
-#: api/classes/CAction.php:1524 api/classes/CAction.php:1531
-#: api/classes/CAction.php:1538 api/classes/CAction.php:1545
-#: api/classes/CAction.php:1552 api/classes/CAction.php:1559
-#: api/classes/CAction.php:1575 api/classes/CAction.php:1585
-#: api/classes/CAction.php:1594 api/classes/CAction.php:1604
-#: api/classes/CAction.php:1620 api/classes/CAction.php:1630
-#: api/classes/CAction.php:1639 api/classes/CAction.php:1653
+#: include/classes/api/services/CHttpTest.php:909
+#, c-format
+msgid "Empty SSL certificate file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:902
+#, c-format
+msgid "Empty SSL key file for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:1513
+#: include/classes/api/services/CAction.php:1520
+#: include/classes/api/services/CAction.php:1527
+#: include/classes/api/services/CAction.php:1534
+#: include/classes/api/services/CAction.php:1541
+#: include/classes/api/services/CAction.php:1548
+#: include/classes/api/services/CAction.php:1555
+#: include/classes/api/services/CAction.php:1562
+#: include/classes/api/services/CAction.php:1578
+#: include/classes/api/services/CAction.php:1588
+#: include/classes/api/services/CAction.php:1597
+#: include/classes/api/services/CAction.php:1607
+#: include/classes/api/services/CAction.php:1623
+#: include/classes/api/services/CAction.php:1633
+#: include/classes/api/services/CAction.php:1642
+#: include/classes/api/services/CAction.php:1656
+#: include/classes/validators/CActionCondValidator.php:65
+#: include/classes/validators/CActionCondValidator.php:71
+#: include/classes/validators/CActionCondValidator.php:77
+#: include/classes/validators/CActionCondValidator.php:83
+#: include/classes/validators/CActionCondValidator.php:89
+#: include/classes/validators/CActionCondValidator.php:95
+#: include/classes/validators/CActionCondValidator.php:101
+#: include/classes/validators/CActionCondValidator.php:107
+#: include/classes/validators/CActionCondValidator.php:122
+#: include/classes/validators/CActionCondValidator.php:131
+#: include/classes/validators/CActionCondValidator.php:140
+#: include/classes/validators/CActionCondValidator.php:149
+#: include/classes/validators/CActionCondValidator.php:164
+#: include/classes/validators/CActionCondValidator.php:173
+#: include/classes/validators/CActionCondValidator.php:182
+#: include/classes/validators/CActionCondValidator.php:196
 msgid "Empty action condition."
 msgstr "空的動作條件."
 
@@ -4709,76 +4813,98 @@ msgstr "空的動作條件."
 msgid "Empty color."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:876
+#: include/classes/api/services/CAction.php:2062
+#, c-format
+msgid "Empty filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:886
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:868
+#: include/classes/api/services/CDiscoveryRule.php:878
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:458
+#: include/classes/api/services/CHostPrototype.php:458
 msgid "Empty host ID for host prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:173
+#: include/classes/api/services/CHostPrototype.php:173
 msgid "Empty host."
 msgstr ""
 
-#: api/classes/CAction.php:1251 api/classes/CApplication.php:253
-#: api/classes/CDiscoveryRule.php:360 api/classes/CDRule.php:562
-#: api/classes/CGraph.php:512 api/classes/CGraphPrototype.php:527
-#: api/classes/CHostGroup.php:443 api/classes/CHostGroup.php:514
-#: api/classes/CHostInterface.php:407 api/classes/CHost.php:1302
-#: api/classes/CHostPrototype.php:906 api/classes/CIconMap.php:301
-#: api/classes/CItem.php:610 api/classes/CItemPrototype.php:441
-#: api/classes/CProxy.php:474 api/classes/CService.php:341
-#: api/classes/CService.php:376 api/classes/CService.php:442
-#: api/classes/CService.php:514 api/classes/CTemplate.php:543
-#: api/classes/CTrigger.php:836 api/classes/CTrigger.php:916
-#: api/classes/CTrigger.php:1006 api/classes/CTriggerPrototype.php:578
-#: api/classes/CUserGroup.php:613 api/classes/CUserMacro.php:347
-#: api/classes/CUserMacro.php:499 api/classes/CUser.php:525
+#: include/classes/api/services/CAction.php:1246
+#: include/classes/api/services/CApplication.php:263
+#: include/classes/api/services/CDiscoveryRule.php:370
+#: include/classes/api/services/CDRule.php:629
+#: include/classes/api/services/CGraph.php:528
+#: include/classes/api/services/CGraphPrototype.php:540
+#: include/classes/api/services/CHostGroup.php:461
+#: include/classes/api/services/CHostGroup.php:532
+#: include/classes/api/services/CHostInterface.php:412
+#: include/classes/api/services/CHost.php:1289
+#: include/classes/api/services/CHostPrototype.php:906
+#: include/classes/api/services/CIconMap.php:301
+#: include/classes/api/services/CItem.php:613
+#: include/classes/api/services/CItemPrototype.php:451
+#: include/classes/api/services/CProxy.php:474
+#: include/classes/api/services/CService.php:341
+#: include/classes/api/services/CService.php:376
+#: include/classes/api/services/CService.php:442
+#: include/classes/api/services/CService.php:514
+#: include/classes/api/services/CTemplate.php:577
+#: include/classes/api/services/CTrigger.php:837
+#: include/classes/api/services/CTrigger.php:910
+#: include/classes/api/services/CTrigger.php:1000
+#: include/classes/api/services/CTriggerPrototype.php:578
+#: include/classes/api/services/CUserGroup.php:628
+#: include/classes/api/services/CUserMacro.php:347
+#: include/classes/api/services/CUserMacro.php:499
+#: include/classes/api/services/CUser.php:519
 msgid "Empty input parameter."
 msgstr "空的輸入參數."
 
-#: api/classes/CApplication.php:461
+#: include/classes/api/services/CApplication.php:471
+#: include/classes/api/services/CHttpTest.php:261
+#: include/classes/api/services/CHttpTest.php:305
 msgid "Empty input parameters."
 msgstr ""
 
-#: api/classes/CDRule.php:189
+#: include/classes/api/services/CDRule.php:198
 msgid "Empty input."
 msgstr "空的輸入."
 
-#: api/classes/CUserMacro.php:601
+#: include/classes/api/services/CUserMacro.php:601
 msgid "Empty macro."
 msgstr "空巨集."
 
-#: api/classes/CHostPrototype.php:222
+#: include/classes/api/services/CHostPrototype.php:222
 msgid "Empty name for group prototype."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:181
+#: include/classes/api/services/CHostPrototype.php:181
 #, c-format
 msgid "Empty name for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:556
+#: include/classes/api/services/CScript.php:556
 #, c-format
 msgid "Empty name for script \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:395 api/classes/CScript.php:451
+#: include/classes/api/services/CScript.php:395
+#: include/classes/api/services/CScript.php:451
 msgid "Empty name for script."
 msgstr ""
 
-#: api/classes/CService.php:1108
+#: include/classes/api/services/CService.php:907
 msgid "Empty name."
 msgstr "空名稱."
 
-#: api/classes/CImage.php:431
+#: include/classes/api/services/CImage.php:406
 msgid "Empty parameters"
 msgstr "空參數"
 
@@ -4787,11 +4913,11 @@ msgstr "空參數"
 msgid "Empty response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreen.php:461
+#: include/classes/api/services/CScreen.php:471
 msgid "Empty screen ID for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:575
+#: include/classes/api/services/CTemplateScreen.php:597
 msgid "Empty screen ID for template screen."
 msgstr ""
 
@@ -4799,11 +4925,15 @@ msgstr ""
 msgid "Empty time period."
 msgstr "空白時間期間."
 
+#: include/classes/api/services/CHttpTest.php:310
+msgid "Empty web scenario ID."
+msgstr ""
+
 #: include/views/administration.auditlogs.list.php:48
 msgid "Enable"
 msgstr "開啟"
 
-#: include/views/administration.script.edit.php:97
+#: include/views/administration.script.edit.php:101
 msgid "Enable confirmation"
 msgstr "啟用確認"
 
@@ -4823,11 +4953,11 @@ msgstr "啟用事件知悉"
 msgid "Enable host"
 msgstr "啟用主機"
 
-#: hosts.php:976
+#: hosts.php:997
 msgid "Enable host?"
 msgstr "啟用主機?"
 
-#: include/views/administration.proxy.list.php:102
+#: include/views/administration.proxy.list.php:103
 msgid "Enable hosts monitored by selected proxies?"
 msgstr "啟用受所選的系統代理程式所監測的主機?"
 
@@ -4840,36 +4970,32 @@ msgstr "啟用受所選的系統代理程式所監測的主機?"
 msgid "Enable internal housekeeping"
 msgstr ""
 
-#: hosts.php:1053 include/views/administration.mediatypes.list.php:111
-#: include/views/administration.proxy.list.php:101
+#: hosts.php:1069 include/views/administration.mediatypes.list.php:116
+#: include/views/administration.proxy.list.php:102
 #: include/views/administration.usergroups.list.php:132
-#: include/views/configuration.action.list.php:95
-#: include/views/configuration.application.list.php:110
-#: include/views/configuration.discovery.list.php:67
-#: include/views/configuration.host.discovery.list.php:140
-#: include/views/configuration.hostgroups.list.php:155
-#: include/views/configuration.host.prototype.list.php:119
-#: include/views/configuration.httpconf.list.php:95
-#: include/views/configuration.item.list.php:259
+#: include/views/configuration.action.list.php:96
+#: include/views/configuration.application.list.php:111
+#: include/views/configuration.discovery.list.php:68
+#: include/views/configuration.host.discovery.list.php:142
+#: include/views/configuration.hostgroups.list.php:156
+#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.httpconf.list.php:141
+#: include/views/configuration.item.list.php:263
 #: include/views/configuration.item.prototype.list.php:112
-#: include/views/configuration.triggers.list.php:286
+#: include/views/configuration.triggers.list.php:285
 msgid "Enable selected"
 msgstr "啟用所選"
 
-#: include/views/configuration.httpconf.list.php:96
-msgid "Enable selected WEB scenarios?"
-msgstr "啟用所選的WEB方案?"
-
-#: include/views/configuration.action.list.php:96
+#: include/views/configuration.action.list.php:97
 msgid "Enable selected actions?"
 msgstr "啟用所選的動作?"
 
-#: include/views/configuration.application.list.php:111
+#: include/views/configuration.application.list.php:112
 msgid "Enable selected applications?"
 msgstr "啟用所選的應用集"
 
-#: include/views/configuration.discovery.list.php:68
-#: include/views/configuration.host.discovery.list.php:141
+#: include/views/configuration.discovery.list.php:69
+#: include/views/configuration.host.discovery.list.php:143
 msgid "Enable selected discovery rules?"
 msgstr "啟用所選的探索規則?"
 
@@ -4877,11 +5003,11 @@ msgstr "啟用所選的探索規則?"
 msgid "Enable selected groups?"
 msgstr "啟用所選的群組?"
 
-#: include/views/configuration.host.prototype.list.php:120
+#: include/views/configuration.host.prototype.list.php:121
 msgid "Enable selected host prototypes?"
 msgstr ""
 
-#: hosts.php:1054 include/views/configuration.hostgroups.list.php:156
+#: hosts.php:1070 include/views/configuration.hostgroups.list.php:157
 msgid "Enable selected hosts?"
 msgstr "啟用所選的主機?"
 
@@ -4889,64 +5015,68 @@ msgstr "啟用所選的主機?"
 msgid "Enable selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:260
+#: include/views/configuration.item.list.php:264
 msgid "Enable selected items?"
 msgstr "啟用所選的項目?"
 
-#: include/views/administration.mediatypes.list.php:112
+#: include/views/administration.mediatypes.list.php:117
 msgid "Enable selected media types?"
 msgstr "啟用所選的示警媒介類型?"
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:289
+#: include/views/configuration.triggers.list.php:288
 msgid "Enable selected triggers?"
 msgstr "啟用所選的觸發器?"
 
-#: auditlogs.php:143 dashboard.php:295 hosts.php:965
-#: include/discovery.inc.php:120 include/html.inc.php:326
+#: include/views/configuration.httpconf.list.php:142
+msgid "Enable selected web scenarios?"
+msgstr ""
+
+#: auditlogs.php:143 dashboard.php:295 hosts.php:987
+#: include/discovery.inc.php:120 include/html.inc.php:332
 #: include/httptest.inc.php:45 include/items.inc.php:154
-#: include/items.inc.php:206 include/triggers.inc.php:2510
-#: include/views/administration.mediatypes.edit.php:96
-#: include/views/administration.mediatypes.list.php:95
-#: include/views/administration.usergroups.edit.php:65
-#: include/views/administration.usergroups.edit.php:71
+#: include/items.inc.php:206 include/triggers.inc.php:2320
+#: include/views/administration.mediatypes.edit.php:95
+#: include/views/administration.mediatypes.list.php:99
+#: include/views/administration.usergroups.edit.php:64
+#: include/views/administration.usergroups.edit.php:70
 #: include/views/administration.usergroups.list.php:57
 #: include/views/administration.usergroups.list.php:82
 #: include/views/administration.usergroups.list.php:87
-#: include/views/administration.users.edit.php:181
+#: include/views/administration.users.edit.php:183
 #: include/views/administration.users.list.php:143
 #: include/views/administration.users.list.php:144
 #: include/views/configuration.action.edit.php:61
 #: include/views/configuration.action.list.php:78
-#: include/views/configuration.discovery.edit.php:77
+#: include/views/configuration.discovery.edit.php:76
 #: include/views/configuration.host.discovery.edit.php:260
-#: include/views/configuration.host.edit.php:420
-#: include/views/configuration.host.massupdate.php:160
-#: include/views/configuration.host.prototype.edit.php:159
-#: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:441
-#: include/views/configuration.triggers.edit.php:256
+#: include/views/configuration.host.edit.php:425
+#: include/views/configuration.host.massupdate.php:177
+#: include/views/configuration.host.prototype.edit.php:158
+#: include/views/configuration.httpconf.edit.php:146
+#: include/views/configuration.item.edit.php:435
+#: include/views/configuration.triggers.edit.php:262
 #: include/views/monitoring.dashconf.php:37 popup_media.php:132
 msgid "Enabled"
 msgstr "已啟用"
 
-#: include/locales.inc.php:50
+#: include/locales.inc.php:54
 msgid "English (en_GB)"
 msgstr "英語 (en_GB)"
 
-#: include/locales.inc.php:51
+#: include/locales.inc.php:55
 msgid "English (en_US)"
 msgstr "英語(en_US)"
 
 #: include/actions.inc.php:918 include/items.inc.php:35
-#: include/views/configuration.triggers.edit.php:148 popup.php:99
+#: include/views/configuration.triggers.edit.php:154 popup.php:119
 msgid "Error"
 msgstr "錯誤"
 
-#: include/db.inc.php:738
+#: include/db.inc.php:749
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "資料表搜尋請求 \"%1$s\"的錯誤."
@@ -4964,15 +5094,15 @@ msgstr "事件"
 msgid "Event ID"
 msgstr "事件ID"
 
-#: popup_trexpr.php:443
+#: popup_trexpr.php:433
 msgid "Event ID of last log entry matching regular expression T, then N = 1, 0 - otherwise"
 msgstr "符合正則表示式T的最末紀錄項的事件 ID, 則 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:448
+#: popup_trexpr.php:438
 msgid "Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise"
 msgstr "符合正則表示式T的最末紀錄項的事件 ID, 則 N 非 1, 0 - 除外"
 
-#: acknow.php:168 include/actions.inc.php:86
+#: acknow.php:167 include/actions.inc.php:86
 msgid "Event acknowledged"
 msgstr "事件已知悉"
 
@@ -4981,7 +5111,7 @@ msgstr "事件已知悉"
 msgid "Event acknowledges \"%1$s\"."
 msgstr "事件知悉 \"%1$s\"."
 
-#: include/views/monitoring.dashconf.php:98
+#: include/views/monitoring.dashconf.php:110
 msgid "Event acknowledging disabled"
 msgstr "事件知悉已停用"
 
@@ -4989,7 +5119,7 @@ msgstr "事件知悉已停用"
 msgid "Event details"
 msgstr "事件細節"
 
-#: include/triggers.inc.php:1661
+#: include/triggers.inc.php:1484
 msgid "Event generation"
 msgstr "事件產出"
 
@@ -5009,9 +5139,10 @@ msgstr "事件來源細節"
 msgid "Event type"
 msgstr ""
 
-#: events.php:342 include/menu.inc.php:57
-#: include/views/inventory.host.view.php:202 jsLoader.php:188 search.php:136
-#: search.php:222 search.php:276 search.php:329 tr_status.php:277
+#: events.php:342 include/menu.inc.php:56
+#: include/views/common.filter.trigger.php:63
+#: include/views/inventory.host.view.php:214 jsLoader.php:190 search.php:136
+#: search.php:222 search.php:276 search.php:329
 msgid "Events"
 msgstr "事件"
 
@@ -5019,36 +5150,41 @@ msgstr "事件"
 msgid "Events and alerts"
 msgstr ""
 
-#: include/forms.inc.php:1629
+#: include/forms.inc.php:1645
 msgid "Every day(s)"
 msgstr "每日"
 
-#: include/forms.inc.php:1636
+#: include/forms.inc.php:1652
 msgid "Every week(s)"
 msgstr "每週"
 
-#: include/func.inc.php:681
+#: include/func.inc.php:669
 msgid "Exa"
 msgstr "Exa"
 
-#: tr_logform.php:287 tr_logform.php:339
+#: tr_logform.php:256 tr_logform.php:298
 msgid "Exclude"
 msgstr "除外"
 
-#: jsLoader.php:104
+#: jsLoader.php:105
 msgid "Execute"
 msgstr "執行"
 
-#: api/classes/CImage.php:253
+#: include/classes/api/services/CImage.php:244
 #, c-format
 msgid "Execute SQL error [%1$s] in [%2$s]."
 msgstr "執行SQL錯誤[%1$s]於[%2$s]."
 
-#: include/views/administration.script.edit.php:56
+#: include/classes/items/CHelpItems.php:309
+#: include/classes/items/CHelpItems.php:571
+msgid "Execute WMI query and return the first selected object."
+msgstr ""
+
+#: include/views/administration.script.edit.php:55
 #: include/views/administration.script.list.php:40
-#: include/views/configuration.action.edit.php:702
-#: include/views/js/configuration.action.edit.js.php:113 popup.php:1394
-#: popup.php:1401
+#: include/views/configuration.action.edit.php:748
+#: include/views/js/configuration.action.edit.js.php:113 popup.php:1708
+#: popup.php:1715
 msgid "Execute on"
 msgstr "執行在"
 
@@ -5056,13 +5192,13 @@ msgstr "執行在"
 msgid "Executed"
 msgstr ""
 
-#: include/items.inc.php:1320
+#: include/items.inc.php:1315
 #: include/views/configuration.host.discovery.edit.php:179
 #: include/views/configuration.item.edit.php:185
 msgid "Executed script"
 msgstr "已執行的腳本"
 
-#: jsLoader.php:105
+#: jsLoader.php:106
 msgid "Execution confirmation"
 msgstr "執行確認"
 
@@ -5074,7 +5210,7 @@ msgstr "拓展巨集"
 msgid "Expand single problem"
 msgstr "展開單一問題"
 
-#: api/rpc/class.cjsonrpc.php:90
+#: include/classes/core/CJsonRpc.php:90
 #, c-format
 msgid "Expecting JSON-rpc version 2.0, \"%s\" is given."
 msgstr "要求 JSON-rpc版本2.0, 得到\"%s\" ."
@@ -5084,12 +5220,12 @@ msgctxt "maintenance status"
 msgid "Expired"
 msgstr "過期的"
 
-#: include/graphs.inc.php:27 popup.php:1067
+#: include/graphs.inc.php:27 popup.php:1379
 msgid "Exploded"
 msgstr "Exploded"
 
-#: hosts.php:1051 include/views/configuration.screen.list.php:68
-#: include/views/configuration.sysmap.list.php:61 templates.php:656
+#: hosts.php:1066 include/views/configuration.screen.list.php:68
+#: include/views/configuration.sysmap.list.php:62 templates.php:668
 msgid "Export selected"
 msgstr "匯出所選的"
 
@@ -5097,22 +5233,22 @@ msgstr "匯出所選的"
 msgid "Export to CSV"
 msgstr "匯出到CSV"
 
-#: include/triggers.inc.php:1658
+#: include/triggers.inc.php:1481
 #: include/views/administration.general.iconmap.edit.php:41
 #: include/views/administration.general.regularexpressions.edit.php:42
 #: include/views/administration.general.regularexpressions.edit.php:51
 #: include/views/administration.general.regularexpressions.edit.php:73
-#: include/views/configuration.item.list.php:145
-#: include/views/configuration.triggers.edit.php:136
-#: include/views/configuration.triggers.edit.php:147
-#: include/views/configuration.triggers.list.php:110 trigger_prototypes.php:42
-#: triggers.php:42 triggers.php:48 tr_logform.php:299 tr_logform.php:307
-#: tr_testexpr.php:131
+#: include/views/configuration.item.list.php:148
+#: include/views/configuration.triggers.edit.php:142
+#: include/views/configuration.triggers.edit.php:153
+#: include/views/configuration.triggers.list.php:103 trigger_prototypes.php:42
+#: triggers.php:42 triggers.php:48 tr_logform.php:266 tr_logform.php:276
+#: tr_testexpr.php:138
 msgid "Expression"
 msgstr "表示式"
 
-#: include/forms.inc.php:1448 include/forms.inc.php:1453
-#: include/forms.inc.php:1467
+#: include/forms.inc.php:1469 include/forms.inc.php:1474
+#: include/forms.inc.php:1483
 msgid "Expression Syntax Error."
 msgstr "表示式語法錯誤."
 
@@ -5120,11 +5256,12 @@ msgstr "表示式語法錯誤."
 msgid "Expression Variable Elements"
 msgstr "表示式變數組成"
 
-#: include/triggers.inc.php:581 include/views/js/adm.regexprs.edit.js.php:215
+#: include/classes/triggers/CTextTriggerConstructor.php:63
+#: include/views/js/adm.regexprs.edit.js.php:215
 msgid "Expression cannot be empty"
 msgstr "表示式不能為空白"
 
-#: include/views/configuration.triggers.edit.php:128
+#: include/views/configuration.triggers.edit.php:134
 msgid "Expression constructor"
 msgstr "表示式建構子"
 
@@ -5145,17 +5282,17 @@ msgid "External check"
 msgstr "外在檢查"
 
 #: include/media.inc.php:28
-#: include/views/administration.mediatypes.edit.php:46
+#: include/views/administration.mediatypes.edit.php:45
 msgid "Ez Texting"
 msgstr "Ez簡訊"
 
-#: jsLoader.php:127
+#: jsLoader.php:128
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "FALSE"
 msgstr "偽"
 
@@ -5164,16 +5301,17 @@ msgstr "偽"
 msgid "FTP"
 msgstr "FTP"
 
-#: include/setup.inc.php:209 include/setup.inc.php:352
-#: include/setup.inc.php:516
+#: include/classes/setup/CSetupWizard.php:209
+#: include/classes/setup/CSetupWizard.php:352
+#: include/classes/setup/CSetupWizard.php:517
 msgid "Fail"
 msgstr "失敗"
 
-#: include/actions.inc.php:1079 include/blocks.inc.php:1165
+#: include/actions.inc.php:1079 include/blocks.inc.php:1170
 msgid "Failed"
 msgstr "已失敗"
 
-#: api/classes/CTemplate.php:502
+#: include/classes/api/services/CTemplate.php:536
 msgid "Failed to update template."
 msgstr ""
 
@@ -5181,40 +5319,40 @@ msgstr ""
 msgid "Failure Audit"
 msgstr "失敗審計"
 
-#: dashboard.php:316 jsLoader.php:189
+#: dashboard.php:316 jsLoader.php:191
 msgid "Favourite graphs"
 msgstr "常用的圖形"
 
-#: dashboard.php:330 jsLoader.php:190
+#: dashboard.php:330 jsLoader.php:192
 msgid "Favourite maps"
 msgstr "常用的拓墣圖"
 
-#: dashboard.php:344 jsLoader.php:191
+#: dashboard.php:344 jsLoader.php:193
 msgid "Favourite screens"
 msgstr "常用的篩選"
 
-#: jsLoader.php:192
+#: jsLoader.php:194
 msgid "Favourite simple graphs"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:195
 msgid "Favourite slide shows"
 msgstr ""
 
-#: include/views/monitoring.slides.php:44 slides.php:151 slides.php:158
+#: include/views/monitoring.slides.php:40 slides.php:152 slides.php:159
 msgid "Favourites"
 msgstr "常用的"
 
-#: include/func.inc.php:250
+#: include/func.inc.php:238
 msgid "Feb"
 msgstr "二月"
 
-#: include/forms.inc.php:1658 include/func.inc.php:130
-#: include/func.inc.php:267 jsLoader.php:112
+#: include/forms.inc.php:1674 include/func.inc.php:118
+#: include/func.inc.php:255 jsLoader.php:113
 msgid "February"
 msgstr "二月"
 
-#: hostinventoriesoverview.php:91 include/views/inventory.host.list.php:44
+#: hostinventoriesoverview.php:98 include/views/inventory.host.list.php:44
 msgid "Field"
 msgstr "欄位"
 
@@ -5258,19 +5396,19 @@ msgstr ""
 msgid "Field \"%1$s\" must be missing."
 msgstr ""
 
-#: api/classes/CDRule.php:324
+#: include/classes/api/services/CDRule.php:341
 msgid "Field \"druleid\" is required."
 msgstr "欄位\"druleid\"是所要的."
 
-#: api/classes/CTemplate.php:429
+#: include/classes/api/services/CTemplate.php:439
 msgid "Field \"host\" is mandatory."
 msgstr ""
 
-#: api/classes/CDRule.php:331
+#: include/classes/api/services/CDRule.php:348
 msgid "Field \"name\" is required."
 msgstr "欄位\"name\"是所要的."
 
-#: api/classes/CImage.php:511
+#: include/classes/api/services/CImage.php:599
 msgid "File format is unsupported."
 msgstr ""
 
@@ -5279,13 +5417,13 @@ msgstr ""
 msgid "File is too big, max upload size is %1$s bytes."
 msgstr "檔案太大, 最大的上傳大小是%1$s位元組."
 
-#: include/classes/class.cview.php:68
+#: include/classes/core/CView.php:68
 #, c-format
 msgid "File provided to a view does not exist. Tried to find \"%s\"."
 msgstr "檔案用於一個viwq不存在. 試著找\"%s\"."
 
 #: include/classes/items/CHelpItems.php:281
-#: include/classes/items/CHelpItems.php:539
+#: include/classes/items/CHelpItems.php:543
 msgid "File time information. Number of seconds.The mode is optional. If mode is missing modify is used."
 msgstr ""
 
@@ -5293,68 +5431,71 @@ msgstr ""
 msgid "Filled region"
 msgstr "填滿的區域"
 
-#: events.php:399 hosts.php:810 include/forms.inc.php:602
+#: events.php:400 hosts.php:836 include/forms.inc.php:616
 #: include/views/administration.auditacts.list.php:49
 #: include/views/administration.auditlogs.list.php:65
+#: include/views/common.filter.trigger.php:147
 #: include/views/inventory.host.list.php:52
-#: include/views/monitoring.dashconf.php:104
-#: include/views/monitoring.history.php:131 latest.php:304 report2.php:383
-#: tr_status.php:345
+#: include/views/monitoring.dashconf.php:116
+#: include/views/monitoring.history.php:132
+#: include/views/monitoring.overview.items.php:82 latest.php:315
+#: report2.php:384
 msgid "Filter"
 msgstr "過濾"
 
-#: tr_status.php:304
+#: include/views/common.filter.trigger.php:98
+#: include/views/monitoring.overview.items.php:72
 msgid "Filter by application"
 msgstr ""
 
-#: report2.php:322
+#: report2.php:323
 msgid "Filter by host group"
 msgstr "依主機群組過濾"
 
-#: tr_status.php:340
+#: include/views/common.filter.trigger.php:134
 msgid "Filter by host inventory"
 msgstr ""
 
-#: tr_status.php:303
+#: include/views/common.filter.trigger.php:95
 msgid "Filter by name"
 msgstr "依名稱過濾"
 
-#: include/views/configuration.host.discovery.edit.php:346
-#: include/views/configuration.host.discovery.edit.php:355
+#: include/views/configuration.host.discovery.edit.php:336
+#: include/views/configuration.host.discovery.edit.php:345
 msgid "Filters"
 msgstr ""
 
-#: popup_trexpr.php:315
+#: popup_trexpr.php:305
 msgid "Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise"
 msgstr "於最新的值中找字串V. N = 1 - 如果找到, 0 - 其它情況."
 
-#: popup_trexpr.php:320
+#: popup_trexpr.php:310
 msgid "Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise"
 msgstr "於最新的值中找字串V. N 非 1 - 如果找到, 0 - 其它情況."
 
 #: include/classes/items/CHelpItems.php:273
-#: include/classes/items/CHelpItems.php:531
+#: include/classes/items/CHelpItems.php:535
 msgid "Find string in a file. 0 - expression not found, 1 - found"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:269
-#: include/classes/items/CHelpItems.php:527
+#: include/classes/items/CHelpItems.php:531
 msgid "Find string in a file. Matched string"
 msgstr ""
 
-#: include/setup.inc.php:121
+#: include/classes/setup/CSetupWizard.php:121
 msgid "Finish"
 msgstr "完成"
 
-#: include/locales.inc.php:57
+#: include/locales.inc.php:61
 msgid "Finnish (fi_FI)"
 msgstr "芬蘭語 (fi_FI)"
 
-#: include/forms.inc.php:1696 include/maintenances.inc.php:115
+#: include/forms.inc.php:1712 include/maintenances.inc.php:111
 msgid "First"
 msgstr "首"
 
-#: include/func.inc.php:1746
+#: include/func.inc.php:1504
 msgctxt "page navigation"
 msgid "First"
 msgstr "首"
@@ -5363,8 +5504,8 @@ msgstr "首"
 msgid "Fit to map"
 msgstr "調整至符合拓墣圖"
 
-#: include/views/configuration.graph.edit.php:97
-#: include/views/configuration.graph.edit.php:155
+#: include/views/configuration.graph.edit.php:107
+#: include/views/configuration.graph.edit.php:165
 msgid "Fixed"
 msgstr "固定的"
 
@@ -5374,76 +5515,80 @@ msgstr "固定的"
 msgid "Flexible intervals"
 msgstr "彈性區間"
 
-#: profile.php:117 users.php:196
+#: include/views/configuration.httpconf.popup.php:93
+msgid "Follow redirects"
+msgstr ""
+
+#: profile.php:117 users.php:197
 msgid "For guest, password must be empty"
 msgstr "訪客的密碼必須為空"
 
-#: include/items.inc.php:1324 include/views/configuration.item.edit.php:197
+#: include/items.inc.php:1319 include/views/configuration.item.edit.php:197
 msgid "Formula"
 msgstr "公式"
 
-#: include/forms.inc.php:1699 include/maintenances.inc.php:118
+#: include/forms.inc.php:1715 include/maintenances.inc.php:114
 msgid "Fourth"
 msgstr "第四"
 
-#: include/locales.inc.php:58
+#: include/locales.inc.php:62
 msgid "French (fr_FR)"
 msgstr "法語 (fr_FR)"
 
-#: include/func.inc.php:230
+#: include/func.inc.php:218
 msgid "Fri"
 msgstr "週五"
 
-#: include/forms.inc.php:1643 include/forms.inc.php:1711
-#: include/func.inc.php:152 include/func.inc.php:242
+#: include/forms.inc.php:1659 include/forms.inc.php:1727
+#: include/func.inc.php:140 include/func.inc.php:230
 msgid "Friday"
 msgstr "週五"
 
-#: include/reports.inc.php:70 include/reports.inc.php:372
-#: include/views/configuration.action.edit.php:434
-#: include/views/configuration.services.edit.php:229
-#: include/views/configuration.services.edit.php:255
-#: include/views/js/configuration.sysmaps.js.php:339 popup_period.php:115
-#: report2.php:372 report3.php:143 report4.php:175 services.php:187
+#: include/reports.inc.php:71 include/reports.inc.php:375
+#: include/views/configuration.action.edit.php:480
+#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:254
+#: include/views/js/configuration.sysmaps.js.php:337 popup_period.php:128
+#: report2.php:373 report3.php:143 report4.php:175 services.php:187
 #: services.php:193
 msgid "From"
 msgstr "自從"
 
-#: include/views/administration.usergroups.edit.php:64
-#: include/views/administration.usergroups.edit.php:70
+#: include/views/administration.usergroups.edit.php:63
+#: include/views/administration.usergroups.edit.php:69
 #: include/views/administration.usergroups.list.php:48
 #: include/views/administration.users.list.php:61
 msgid "Frontend access"
 msgstr "前端存取"
 
-#: usergrps.php:275
+#: usergrps.php:294
 msgid "Frontend access updated"
 msgstr "前端存取已更新"
 
-#: include/views/administration.users.edit.php:230
+#: include/views/administration.users.edit.php:232
 msgid "Frontend messaging"
 msgstr "前端訊息中"
 
-#: include/views/configuration.host.edit.php:857
-#: include/views/configuration.template.edit.php:456
+#: include/views/configuration.host.edit.php:887
+#: include/views/configuration.template.edit.php:480
 msgid "Full clone"
 msgstr "全克隆"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: include/views/configuration.graph.edit.php:224
-#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:149
+#: include/views/configuration.graph.edit.php:234
+#: include/views/configuration.triggers.expression.php:63 popup_bitem.php:159
 msgid "Function"
 msgstr "功能"
 
-#: popup_trexpr.php:707
+#: popup_trexpr.php:695
 #, c-format
 msgid "Function \"%1$s\" cannot be used with selected item \"%2$s\""
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgctxt "Giga short"
 msgid "G"
 msgstr "G"
@@ -5453,50 +5598,50 @@ msgstr "G"
 msgid "GRAPHS"
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:62
+#: include/views/administration.mediatypes.edit.php:61
 #: include/views/administration.mediatypes.list.php:60
 msgid "GSM modem"
 msgstr "GSM Modem"
 
 #: adm.gui.php:95 adm.housekeeper.php:126 adm.iconmapping.php:109
-#: adm.images.php:134 adm.macros.php:158 adm.other.php:109 adm.regexps.php:192
+#: adm.images.php:133 adm.macros.php:158 adm.other.php:109 adm.regexps.php:200
 #: adm.triggerdisplayoptions.php:75 adm.triggerseverities.php:81
 #: adm.valuemapping.php:126 adm.workingtime.php:62
 #: include/views/administration.general.gui.edit.php:51
 msgid "GUI"
 msgstr "圖形化使用者介面"
 
-#: include/classes/class.cwebuser.php:41
+#: include/classes/user/CWebUser.php:51
 msgid "GUI access disabled."
 msgstr "圖形化使用者介面存取已停用"
 
-#: include/menu.inc.php:226
+#: include/menu.inc.php:218
 msgid "General"
 msgstr "一般"
 
 #: chart4.php:168 chart5.php:200
-#: include/classes/graphdraw/CBarGraphDraw.php:778
+#: include/classes/graphdraw/CBarGraphDraw.php:797
 #, c-format
 msgid "Generated in %s sec"
 msgstr "產生於%s秒"
 
-#: include/locales.inc.php:59
+#: include/locales.inc.php:63
 msgid "German (de_DE)"
 msgstr "德語 (de_DE)"
 
 #: include/classes/items/CHelpItems.php:297
-#: include/classes/items/CHelpItems.php:555
-msgid "Get content of WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:559
+msgid "Get content of web page. Default path is /"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:257
-#: include/classes/items/CHelpItems.php:515
+#: include/classes/items/CHelpItems.php:519
 msgid "Get contents of a given file."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:305
-#: include/classes/items/CHelpItems.php:563
-msgid "Get first occurence of regexp in WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:567
+msgid "Get first occurrence of regexp in web page. Default path is /"
 msgstr ""
 
 #: include/page_header.php:194
@@ -5504,65 +5649,65 @@ msgid "Get support"
 msgstr "獲取支援"
 
 #: include/classes/items/CHelpItems.php:301
-#: include/classes/items/CHelpItems.php:559
-msgid "Get timing of loading full WEB page. Default path is /"
+#: include/classes/items/CHelpItems.php:563
+msgid "Get timing of loading full web page. Default path is /"
 msgstr ""
 
-#: include/func.inc.php:678
+#: include/func.inc.php:666
 msgid "Giga"
 msgstr "Giga"
 
-#: include/triggers.inc.php:1793 tr_testexpr.php:35
+#: include/triggers.inc.php:1617 tr_testexpr.php:35
 msgid "Given expression is not a macro"
 msgstr "此表示式不是巨集"
 
-#: include/classes/class.globalregexp.php:78
+#: include/classes/regexp/CGlobalRegexp.php:78
 msgid "Global expression does not exist."
 msgstr "全域表示式不存在."
 
-#: include/views/configuration.action.edit.php:687
+#: include/views/configuration.action.edit.php:733
 msgid "Global script"
 msgstr "全域腳本"
 
-#: popup.php:95
+#: popup.php:115
 msgid "Global scripts"
 msgstr "全域腳本"
 
-#: hosts.php:1062
-#: include/views/administration.general.regularexpressions.list.php:68
-#: include/views/administration.mediatypes.list.php:123
-#: include/views/administration.proxy.list.php:113
-#: include/views/administration.script.list.php:92
+#: hosts.php:1081
+#: include/views/administration.general.regularexpressions.list.php:70
+#: include/views/administration.mediatypes.list.php:128
+#: include/views/administration.proxy.list.php:114
+#: include/views/administration.script.list.php:93
 #: include/views/administration.usergroups.list.php:152
-#: include/views/administration.users.list.php:156
-#: include/views/configuration.action.list.php:107
-#: include/views/configuration.application.list.php:122
-#: include/views/configuration.discovery.list.php:79
-#: include/views/configuration.graph.list.php:165
-#: include/views/configuration.host.discovery.list.php:152
-#: include/views/configuration.hostgroups.list.php:164
-#: include/views/configuration.host.prototype.list.php:131
-#: include/views/configuration.httpconf.list.php:111
-#: include/views/configuration.item.list.php:281
+#: include/views/administration.users.list.php:159
+#: include/views/configuration.action.list.php:108
+#: include/views/configuration.application.list.php:123
+#: include/views/configuration.discovery.list.php:80
+#: include/views/configuration.graph.list.php:166
+#: include/views/configuration.host.discovery.list.php:154
+#: include/views/configuration.hostgroups.list.php:168
+#: include/views/configuration.host.prototype.list.php:132
+#: include/views/configuration.httpconf.list.php:157
+#: include/views/configuration.item.list.php:285
 #: include/views/configuration.item.prototype.list.php:124
-#: include/views/configuration.maintenance.list.php:83
+#: include/views/configuration.maintenance.list.php:85
 #: include/views/configuration.screen.list.php:74
-#: include/views/configuration.slideconf.list.php:59
-#: include/views/configuration.sysmap.list.php:65
-#: include/views/configuration.triggers.list.php:314 templates.php:663
-#: tr_status.php:907
+#: include/views/configuration.slideconf.list.php:61
+#: include/views/configuration.sysmap.list.php:68
+#: include/views/configuration.triggers.list.php:314 templates.php:678
+#: tr_status.php:831
 msgid "Go"
 msgstr "確認"
 
-#: jsLoader.php:196
+#: jsLoader.php:200
 msgid "Go to"
 msgstr "到"
 
-#: include/func.inc.php:1925
+#: include/func.inc.php:1683
 msgid "Go to dashboard"
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:122
+#: include/views/configuration.httpconf.edit.php:113
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -5571,66 +5716,73 @@ msgid "Gradient line"
 msgstr "漸層線"
 
 #: include/audit.inc.php:29 include/screens.inc.php:30
-#: include/views/configuration.graph.edit.php:283
+#: include/views/configuration.graph.edit.php:293
 #: include/views/monitoring.charts.php:27
-#: include/views/monitoring.history.php:61 latest.php:438 latest.php:615
-#: report2.php:397
+#: include/views/monitoring.history.php:61 latest.php:449 latest.php:627
+#: report2.php:398
 msgid "Graph"
 msgstr "圖形"
 
-#: api/classes/CGraph.php:418 api/classes/CGraphPrototype.php:431
+#: include/classes/api/services/CGraph.php:434
+#: include/classes/api/services/CGraphPrototype.php:444
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (inherited from another template)."
 msgstr "圖形\"%1$s\"已存在於\"%2$s\"中 (繼承自其它的模板)."
 
-#: api/classes/CGraph.php:439 api/classes/CGraph.php:446
-#: api/classes/CGraphPrototype.php:453 api/classes/CGraphPrototype.php:460
+#: include/classes/api/services/CGraph.php:455
+#: include/classes/api/services/CGraph.php:462
+#: include/classes/api/services/CGraphPrototype.php:466
+#: include/classes/api/services/CGraphPrototype.php:473
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" (items are not identical)."
 msgstr "圖形\"%1$s\"已存在於\"%2$s\"中 (項目不一致)."
 
-#: api/classes/CGraph.php:397 api/classes/CGraphPrototype.php:409
+#: include/classes/api/services/CGraph.php:409
+#: include/classes/api/services/CGraphPrototype.php:419
 #: include/graphs.inc.php:345
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\"."
 msgstr "圖形\"%1$s\"已存在於\"%2$s\"中."
 
-#: api/classes/CGraph.php:371 api/classes/CGraphPrototype.php:375
+#: include/classes/api/services/CGraph.php:372
+#: include/classes/api/services/CGraphPrototype.php:375
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymax value item)."
 msgstr "圖形\"%1$s\"不能繼承. \"%2$s\"中並無所要的項目 (Ymax值項目)."
 
-#: api/classes/CGraph.php:379 api/classes/CGraphPrototype.php:384
+#: include/classes/api/services/CGraph.php:380
+#: include/classes/api/services/CGraphPrototype.php:384
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\" (Ymin value item)."
 msgstr "圖形\"%1$s\"不能繼承. \"%2$s\"中並無所要的項目 (Ymin值項目)."
 
-#: api/classes/CGraph.php:365 api/classes/CGraphPrototype.php:369
+#: include/classes/api/services/CGraph.php:366
+#: include/classes/api/services/CGraphPrototype.php:369
 #, c-format
 msgid "Graph \"%1$s\" cannot inherit. No required items on \"%2$s\"."
 msgstr "圖形\"%1$s\"不能繼承. \"%2$s\"中並無所要的項目."
 
-#: api/classes/CTemplateScreen.php:479
+#: include/classes/api/services/CTemplateScreen.php:494
 #, c-format
 msgid "Graph \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "圖形 \"%1$s\"不存在於模板\"%2$s\"中."
 
-#: include/classes/import/CXmlImport18.php:1589
-#: include/classes/import/CXmlImport18.php:1593
+#: include/classes/import/CXmlImport18.php:1871
+#: include/classes/import/CXmlImport18.php:1875
 #, c-format
 msgid "Graph \"%1$s\" skipped - user rule."
 msgstr "略過圖形\"%1$s\"-用戶規則."
 
-#: api/classes/CGraph.php:38
+#: include/classes/api/services/CGraph.php:38
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "含模板項目的圖形\"%1$s\"不能包含其它主機的項目."
 
-#: graphs.php:249
+#: graphs.php:254
 msgid "Graph added"
 msgstr "圖形已新增"
 
-#: graphs.php:285
+#: graphs.php:298
 msgid "Graph deleted"
 msgstr "圖形已删除"
 
@@ -5642,54 +5794,59 @@ msgstr "圖形組件"
 msgid "Graph item"
 msgstr "圖形項目"
 
-#: include/views/configuration.screen.constructor.edit.php:135
+#: include/views/configuration.screen.constructor.edit.php:137
+#: include/views/configuration.screen.constructor.edit.php:185
 msgid "Graph name"
 msgstr "圖形名稱"
 
-#: include/views/configuration.graph.edit.php:283
+#: include/screens.inc.php:45 include/views/configuration.graph.edit.php:293
 msgid "Graph prototype"
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:761
+#: include/classes/api/services/CGraphPrototype.php:785
 #, c-format
 msgid "Graph prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:767
+#: include/classes/api/services/CGraphPrototype.php:791
 #, c-format
 msgid "Graph prototype \"%1$s\" must have at least one item prototype."
 msgstr ""
 
-#: api/classes/CGraphPrototype.php:38
+#: include/classes/api/services/CGraphPrototype.php:38
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
 msgstr "含模板項目的圖形原型\"%1$s\"不能包含其它主機的項目."
 
-#: api/classes/CGraphPrototype.php:575
+#: include/classes/api/services/CGraphPrototype.php:593
 #, c-format
 msgid "Graph prototype \"%s\" deleted."
 msgstr "圖形原型\"%s\"已刪除."
 
-#: graphs.php:231
+#: graphs.php:236
 msgid "Graph prototype added"
 msgstr ""
 
-#: graphs.php:279
+#: graphs.php:290
 msgid "Graph prototype deleted"
 msgstr ""
 
-#: graphs.php:225
+#: include/classes/screens/CScreenLldGraph.php:175
+msgid "Graph prototype not found."
+msgstr ""
+
+#: graphs.php:230
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/html.inc.php:418 include/html.inc.php:422
-#: include/views/configuration.host.discovery.list.php:124
-#: include/views/configuration.host.edit.php:622
-#: include/views/configuration.template.edit.php:354
+#: include/html.inc.php:424 include/html.inc.php:428
+#: include/views/configuration.host.discovery.list.php:125
+#: include/views/configuration.host.edit.php:627
+#: include/views/configuration.template.edit.php:351 popup.php:91
 msgid "Graph prototypes"
 msgstr "圖形原型"
 
-#: graphs.php:299
+#: graphs.php:314
 msgid "Graph prototypes deleted"
 msgstr ""
 
@@ -5701,49 +5858,51 @@ msgstr "圖形原型的"
 msgid "Graph sum"
 msgstr "圖形總合"
 
-#: include/views/configuration.graph.edit.php:61
-#: include/views/configuration.graph.list.php:80 popup.php:1004 popup.php:1010
+#: include/views/configuration.graph.edit.php:60
+#: include/views/configuration.graph.list.php:80 popup.php:1306 popup.php:1312
 msgid "Graph type"
 msgstr "圖形類別"
 
-#: graphs.php:243
+#: graphs.php:248
 msgid "Graph updated"
 msgstr "圖形已更新"
 
-#: api/classes/CGraphGeneral.php:755
+#: include/classes/api/services/CGraphGeneral.php:758
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
 msgstr "名為\"%1$s\"的圖形已經存在於圖形或圖形原型中."
 
-#: api/classes/CGraph.php:400 api/classes/CGraph.php:421
-#: api/classes/CGraphPrototype.php:413 api/classes/CGraphPrototype.php:434
+#: include/classes/api/services/CGraph.php:416
+#: include/classes/api/services/CGraph.php:437
+#: include/classes/api/services/CGraphPrototype.php:426
+#: include/classes/api/services/CGraphPrototype.php:447
 msgid "Graph with same name but other type exist."
 msgstr "同名但不同類型的圖形已存在."
 
-#: dashboard.php:317 hosts.php:839 hosts.php:934 include/html.inc.php:429
-#: include/html.inc.php:433 include/menu.inc.php:62
+#: dashboard.php:317 hosts.php:865 hosts.php:957 include/html.inc.php:435
+#: include/html.inc.php:439 include/menu.inc.php:61
 #: include/views/configuration.graph.list.php:56
-#: include/views/configuration.host.discovery.list.php:53
-#: include/views/configuration.host.edit.php:522
-#: include/views/configuration.template.edit.php:265
-#: include/views/conf.import.php:34 include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219
-#: include/views/inventory.host.view.php:229 jsLoader.php:197 popup.php:75
+#: include/views/configuration.host.discovery.list.php:49
+#: include/views/configuration.host.edit.php:527
+#: include/views/configuration.template.edit.php:262
+#: include/views/conf.import.php:36 include/views/inventory.host.view.php:218
+#: include/views/inventory.host.view.php:231
+#: include/views/inventory.host.view.php:241 jsLoader.php:201 popup.php:87
 #: search.php:137 search.php:143 search.php:181 search.php:200 search.php:223
 #: search.php:277 search.php:330 search.php:397 search.php:434 search.php:457
-#: templates.php:499 templates.php:563
+#: templates.php:513 templates.php:574
 msgid "Graphs"
 msgstr "圖形"
 
-#: graphs.php:352
+#: graphs.php:374
 msgid "Graphs copied"
 msgstr "圖形已複製"
 
-#: graphs.php:305
+#: graphs.php:322
 msgid "Graphs deleted"
 msgstr "圖形已删除"
 
-#: include/locales.inc.php:60
+#: include/locales.inc.php:64
 msgid "Greek (el_GR)"
 msgstr "希臘(el_GR)"
 
@@ -5752,54 +5911,57 @@ msgstr "希臘(el_GR)"
 msgid "Grid"
 msgstr "網格"
 
-#: events.php:326 hostinventoriesoverview.php:83 hosts.php:795 httpmon.php:70
-#: include/classes/class.chostsinfo.php:105
-#: include/classes/class.ctriggersinfo.php:113
+#: events.php:326 hostinventoriesoverview.php:90 hosts.php:821 httpmon.php:77
+#: include/classes/html/CHostsInfo.php:105
+#: include/classes/html/CTriggersInfo.php:111
 #: include/classes/screens/CScreenHostgroupTriggers.php:66
 #: include/classes/screens/CScreenHostgroupTriggers.php:125
 #: include/classes/screens/CScreenHostTriggers.php:126
-#: include/reports.inc.php:331 include/screens.inc.php:346
+#: include/reports.inc.php:334 include/screens.inc.php:348
 #: include/views/configuration.application.list.php:44
 #: include/views/configuration.copy.elements.php:60
 #: include/views/configuration.graph.list.php:53
 #: include/views/configuration.httpconf.list.php:43
 #: include/views/configuration.maintenance.list.php:32
-#: include/views/configuration.screen.constructor.edit.php:285
-#: include/views/configuration.screen.constructor.edit.php:375
-#: include/views/configuration.screen.constructor.edit.php:442
+#: include/views/configuration.screen.constructor.edit.php:387
+#: include/views/configuration.screen.constructor.edit.php:489
+#: include/views/configuration.screen.constructor.edit.php:562
 #: include/views/configuration.triggers.list.php:74
 #: include/views/inventory.host.list.php:25
 #: include/views/inventory.host.list.php:75
 #: include/views/monitoring.charts.php:25
-#: include/views/monitoring.overview.php:31
+#: include/views/monitoring.overview.items.php:29
+#: include/views/monitoring.overview.triggers.php:31
 #: include/views/monitoring.screen.php:96
-#: include/views/monitoring.slides.php:86 latest.php:293 popup.php:458
-#: templates.php:484 tr_status.php:236
+#: include/views/monitoring.slides.php:82 latest.php:303 popup.php:483
+#: templates.php:498 tr_status.php:230
 msgid "Group"
 msgstr "群組"
 
-#: api/classes/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:564
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/import/importers/CTemplateImporter.php:233
+#: include/classes/import/importers/CTemplateImporter.php:250
 #, c-format
 msgid "Group \"%1$s\" does not exist."
 msgstr "群組 \"%1$s\" 不存在."
 
-#: include/classes/import/importers/CHostImporter.php:131
+#: include/classes/import/importers/CHostImporter.php:153
 #, c-format
 msgid "Group \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "主機 \"%2$s\" 的群組 \"%1$s\" 不存在."
 
-#: hostgroups.php:126 usergrps.php:188
+#: hostgroups.php:119 usergrps.php:194
 msgid "Group added"
 msgstr "群組已新增"
 
-#: hostgroups.php:164 hostgroups.php:175 usergrps.php:215 usergrps.php:243
+#: hostgroups.php:172 hostgroups.php:193 usergrps.php:228 usergrps.php:259
+#, fuzzy
 msgid "Group deleted"
-msgstr "群組已刪除"
+msgid_plural "Groups deleted"
+msgstr[0] "群組已刪除"
 
 #: include/views/administration.general.other.edit.php:36
 msgid "Group for discovered hosts"
@@ -5810,40 +5972,42 @@ msgstr "探索到的主機的群組"
 msgid "Group for discovered hosts \"%1$s\"."
 msgstr ""
 
-#: include/views/administration.usergroups.edit.php:41
-#: include/views/configuration.hostgroups.edit.php:40
+#: hostgroups.php:38 include/views/administration.usergroups.edit.php:40
+#: include/views/configuration.hostgroups.edit.php:40 usergrps.php:41
 msgid "Group name"
 msgstr "群組名稱"
 
-#: api/classes/CHostPrototype.php:395 api/classes/CHostPrototype.php:402
+#: include/classes/api/services/CHostPrototype.php:395
+#: include/classes/api/services/CHostPrototype.php:402
 msgid "Group prototype ID cannot be empty."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:156 api/classes/CHostPrototype.php:434
+#: include/classes/api/services/CHostPrototype.php:156
+#: include/classes/api/services/CHostPrototype.php:434
 #, c-format
 msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.host.prototype.edit.php:200
+#: include/views/configuration.host.prototype.edit.php:205
 msgid "Group prototypes"
 msgstr ""
 
-#: hostgroups.php:87 usergrps.php:181
+#: hostgroups.php:70 usergrps.php:187
 msgid "Group updated"
 msgstr "群組已更新"
 
-#: hostinventoriesoverview.php:84
+#: hostinventoriesoverview.php:91
 msgid "Grouping by"
 msgstr "群組化之於"
 
-#: include/reports.inc.php:322 include/views/administration.users.edit.php:67
+#: include/reports.inc.php:325 include/views/administration.users.edit.php:66
 #: include/views/administration.users.list.php:58
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.host.edit.php:219
-#: include/views/configuration.host.prototype.edit.php:174
-#: include/views/configuration.host.prototype.edit.php:202
-#: include/views/configuration.template.edit.php:117
-#: include/views/conf.import.php:26
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.host.edit.php:230
+#: include/views/configuration.host.prototype.edit.php:173
+#: include/views/configuration.host.prototype.edit.php:207
+#: include/views/configuration.template.edit.php:114
+#: include/views/conf.import.php:27
 msgid "Groups"
 msgstr "群組"
 
@@ -5851,22 +6015,13 @@ msgstr "群組"
 msgid "Groups in maintenance"
 msgstr "維修中的群組"
 
-#: include/translateDefines.inc.php:51
-msgid "H.i"
-msgstr "H.i"
-
-#: include/classes/graphdraw/CLineGraphDraw.php:1375
-#: include/classes/graphdraw/CLineGraphDraw.php:1434
-#: include/page_header.php:348
+#: include/classes/graphdraw/CLineGraphDraw.php:1379
+#: include/classes/graphdraw/CLineGraphDraw.php:1438
+#: include/translateDefines.inc.php:34
 msgid "H:i"
 msgstr "H:i"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
-#: include/classes/screens/CScreenSystemStatus.php:47 include/html.inc.php:552
-#: include/views/configuration.hostgroups.list.php:132
-#: include/views/configuration.item.list.php:126
+#: include/translateDefines.inc.php:33
 msgid "H:i:s"
 msgstr "H:i:s"
 
@@ -5883,7 +6038,7 @@ msgstr ""
 msgid "HOST INVENTORY"
 msgstr ""
 
-#: hostinventoriesoverview.php:65
+#: hostinventoriesoverview.php:72
 msgid "HOST INVENTORY OVERVIEW"
 msgstr "主機資產清單概覽"
 
@@ -5901,7 +6056,8 @@ msgstr "HTTP"
 msgid "HTTP authentication"
 msgstr "HTTP認證"
 
-#: include/views/configuration.httpconf.edit.php:144
+#: include/views/configuration.httpconf.edit.php:137
+#: include/views/configuration.httpconf.list.php:69
 msgid "HTTP proxy"
 msgstr ""
 
@@ -5922,12 +6078,17 @@ msgstr "硬體環境"
 msgid "Hardware (Full details)"
 msgstr "硬體(全細節)"
 
-#: graphs.php:43 include/views/configuration.graph.edit.php:57
+#: include/views/configuration.httpconf.edit.php:143
+#: include/views/configuration.httpconf.popup.php:91
+msgid "Headers"
+msgstr ""
+
+#: graphs.php:43 include/views/configuration.graph.edit.php:56
 #: include/views/configuration.graph.list.php:79
-#: include/views/configuration.screen.constructor.edit.php:543
+#: include/views/configuration.screen.constructor.edit.php:677
 #: include/views/configuration.sysmap.edit.php:43
 #: include/views/configuration.sysmap.list.php:45
-#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:45
+#: include/views/js/configuration.sysmaps.js.php:54 screenedit.php:69
 #: sysmaps.php:50
 msgid "Height"
 msgstr "高"
@@ -5940,15 +6101,15 @@ msgstr "說明"
 msgid "Hexadecimal"
 msgstr "十六進位數字"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:137
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
 msgid "Hidden"
 msgstr "隱藏的"
 
-#: include/classes/class.cuiwidget.php:108
+#: include/classes/html/CCollapsibleUiWidget.php:48
 msgid "Hide"
 msgstr "隱藏"
 
-#: tr_status.php:272
+#: include/views/common.filter.trigger.php:55
 msgid "Hide all"
 msgstr "隱藏所有"
 
@@ -5964,15 +6125,15 @@ msgstr ""
 msgid "Hide disabled triggers"
 msgstr "隱藏失效的觸發器"
 
-#: include/classes/class.cwidget.php:128
+#: include/classes/html/widget/CWidget.php:128
 msgid "Hide filter"
 msgstr ""
 
-#: include/views/monitoring.history.php:115
+#: include/views/monitoring.history.php:116
 msgid "Hide selected"
 msgstr "隱藏所選的"
 
-#: include/views/monitoring.dashconf.php:62
+#: include/views/monitoring.dashconf.php:68
 msgid "Hide selected groups"
 msgstr ""
 
@@ -5981,23 +6142,23 @@ msgstr ""
 msgid "High"
 msgstr "嚴重"
 
-#: history.php:27 include/forms.inc.php:566 include/forms.inc.php:910
+#: history.php:27 include/forms.inc.php:580 include/forms.inc.php:924
 #: include/page_header.php:323
 #: include/views/administration.general.housekeeper.edit.php:140
 #: include/views/configuration.item.list.php:67
-#: include/views/configuration.item.prototype.list.php:54 items.php:157
-#: jsLoader.php:198 latest.php:342 latest.php:343 latest.php:443
-#: latest.php:620
+#: include/views/configuration.item.prototype.list.php:50 items.php:162
+#: jsLoader.php:202 latest.php:353 latest.php:354 latest.php:454
+#: latest.php:632
 msgid "History"
 msgstr "歷史記錄"
 
-#: httpconf.php:171 httpconf.php:372 items.php:501 items.php:506 items.php:738
-#: items.php:744
+#: httpconf.php:186 httpconf.php:407 items.php:514 items.php:520 items.php:761
+#: items.php:770
 msgid "History cleared"
 msgstr "歷史已清除"
 
-#: include/views/configuration.httpconf.edit.php:251
-#: include/views/configuration.item.edit.php:455
+#: include/views/configuration.httpconf.edit.php:291
+#: include/views/configuration.item.edit.php:449
 msgid "History clearing can take a long time. Continue?"
 msgstr "歷史清除可能會很久?繼續嗎?"
 
@@ -6018,79 +6179,79 @@ msgstr "事件的歷史"
 msgid "History storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:334
+#: include/views/configuration.item.edit.php:329
 #: include/views/configuration.item.massupdate.php:381
 msgid "History storage period (in days)"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:515
+#: include/views/configuration.screen.constructor.edit.php:641
 msgid "Horizontal"
 msgstr "横向"
 
-#: include/views/configuration.screen.constructor.edit.php:559
+#: include/views/configuration.screen.constructor.edit.php:702
 msgid "Horizontal align"
 msgstr "横向對齊"
 
-#: events.php:330 events.php:475 events.php:575 httpmon.php:71 httpmon.php:84
+#: events.php:330 events.php:476 events.php:576 httpmon.php:78 httpmon.php:91
 #: include/actions.inc.php:64 include/audit.inc.php:27
-#: include/blocks.inc.php:666 include/blocks.inc.php:715
-#: include/blocks.inc.php:984 include/blocks.inc.php:994
-#: include/blocks.inc.php:1291 include/classes/screens/CScreenEvents.php:40
+#: include/blocks.inc.php:672 include/blocks.inc.php:721
+#: include/blocks.inc.php:990 include/blocks.inc.php:1000
+#: include/blocks.inc.php:1295 include/classes/screens/CScreenEvents.php:40
 #: include/classes/screens/CScreenHostgroupTriggers.php:126
 #: include/classes/screens/CScreenHostTriggers.php:67
 #: include/classes/screens/CScreenHostTriggers.php:127
-#: include/forms.inc.php:530 include/html.inc.php:337 include/maps.inc.php:24
-#: include/setup.inc.php:365 include/triggers.inc.php:1284
-#: include/triggers.inc.php:1649
+#: include/classes/setup/CSetupWizard.php:365 include/forms.inc.php:537
+#: include/html.inc.php:343 include/maps.inc.php:24
+#: include/triggers.inc.php:1106 include/triggers.inc.php:1472
 #: include/views/configuration.application.list.php:45
 #: include/views/configuration.application.list.php:60
 #: include/views/configuration.graph.list.php:54
-#: include/views/configuration.host.edit.php:58
-#: include/views/configuration.host.edit.php:644
-#: include/views/configuration.host.massupdate.php:303
-#: include/views/configuration.host.prototype.edit.php:161
+#: include/views/configuration.host.edit.php:671
+#: include/views/configuration.host.massupdate.php:335
+#: include/views/configuration.host.prototype.edit.php:160
 #: include/views/configuration.httpconf.list.php:44
-#: include/views/configuration.httpconf.list.php:61
+#: include/views/configuration.httpconf.list.php:62
 #: include/views/configuration.item.list.php:62
-#: include/views/configuration.screen.constructor.edit.php:307
+#: include/views/configuration.screen.constructor.edit.php:415
 #: include/views/configuration.triggers.list.php:75
-#: include/views/configuration.triggers.list.php:108
-#: include/views/configuration.triggers.list.php:128
+#: include/views/configuration.triggers.list.php:101
+#: include/views/configuration.triggers.list.php:121
 #: include/views/inventory.host.list.php:74
-#: include/views/inventory.host.view.php:213
 #: include/views/inventory.host.view.php:225
+#: include/views/inventory.host.view.php:237
 #: include/views/js/configuration.action.edit.js.php:88
-#: include/views/js/configuration.action.edit.js.php:209
+#: include/views/js/configuration.action.edit.js.php:212
 #: include/views/js/configuration.sysmaps.js.php:17
-#: include/views/js/configuration.sysmaps.js.php:99
+#: include/views/js/configuration.sysmaps.js.php:97
 #: include/views/monitoring.charts.php:26
 #: include/views/monitoring.screen.php:97
-#: include/views/monitoring.slides.php:87 items.php:501 items.php:738
-#: items.php:765 jsLoader.php:139 latest.php:294 latest.php:318 latest.php:320
-#: popup.php:454 popup.php:470 popup.php:759 popup.php:961 queue.php:203
-#: report2.php:359 report2.php:393 report5.php:58 search.php:131
-#: tr_status.php:237 tr_status.php:393
+#: include/views/monitoring.slides.php:83 items.php:514 items.php:761
+#: items.php:790 jsLoader.php:140 latest.php:304 latest.php:329 latest.php:331
+#: popup.php:475 popup.php:501 popup.php:1094 queue.php:229 report2.php:360
+#: report2.php:394 report5.php:58 search.php:131 tr_status.php:231
+#: tr_status.php:308
 #, fuzzy
 msgid "Host"
 msgid_plural "Hosts"
 msgstr[0] "主機"
 
-#: api/classes/CHost.php:990 api/classes/CTemplate.php:445
+#: include/classes/api/services/CHost.php:972
+#: include/classes/api/services/CTemplate.php:467
 #, c-format
 msgid "Host \"%1$s\" already exists."
 msgstr "主機 \"%1$s\" 已存在."
 
-#: api/classes/CProxy.php:576
+#: include/classes/api/services/CProxy.php:576
 #, c-format
 msgid "Host \"%1$s\" is monitored with proxy \"%2$s\"."
 msgstr "主機\"%1$s\"是以系統代理程式\"%2$s\"來監控的."
 
-#: include/classes/import/CXmlImport18.php:959
+#: include/classes/import/CXmlImport18.php:968
 #, c-format
 msgid "Host \"%s\" has \"useipmi\" parameter checked, but has no \"ipmi_ip\" parameter! Using host IP address as an address for IPMI interface."
 msgstr "主機 \"%s\" 有 \"useipmi\" 參數已檢驗,  但是沒有 \"ipmi_ip\" 參數! 使用主機IP位址為IPMI介面的位址."
 
-#: include/views/configuration.screen.constructor.edit.php:323
+#: include/views/configuration.screen.constructor.edit.php:437
 msgid "Host (ascending)"
 msgstr "主機(升冪)"
 
@@ -6102,64 +6263,66 @@ msgstr "主機IP地址"
 msgid "Host access"
 msgstr "主機存取"
 
-#: hosts.php:389
+#: hosts.php:393
 msgid "Host added"
 msgstr "已新增主機"
 
-#: api/classes/CHostInterface.php:786
+#: include/classes/api/services/CHostInterface.php:815
 msgid "Host cannot have more than one default interface of the same type."
 msgstr "主機不能有超過一個同類型的預設介面."
 
-#: hostinventoriesoverview.php:92
+#: hostinventoriesoverview.php:101
 #: include/views/administration.proxy.list.php:43
 msgid "Host count"
 msgstr "主機計數"
 
-#: hosts.php:611 hosts.php:628
+#: hosts.php:634 hosts.php:647
 msgid "Host deleted"
 msgstr "主機已删除"
 
-#: hostgroups.php:224 hosts.php:654 proxies.php:180
+#: hostgroups.php:241 hosts.php:675 proxies.php:189
 msgid "Host disabled"
 msgid_plural "Hosts disabled"
 msgstr[0] ""
 
-#: hostgroups.php:223 hosts.php:653 proxies.php:179
+#: hostgroups.php:240 hosts.php:674 proxies.php:188
 msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
 #: include/actions.inc.php:60 include/audit.inc.php:35
-#: include/blocks.inc.php:276 include/blocks.inc.php:461
-#: include/blocks.inc.php:1163 include/forms.inc.php:493
-#: include/maps.inc.php:25 include/views/administration.script.edit.php:84
+#: include/blocks.inc.php:276 include/blocks.inc.php:466
+#: include/blocks.inc.php:1168 include/forms.inc.php:493
+#: include/maps.inc.php:25 include/views/administration.script.edit.php:83
 #: include/views/administration.script.list.php:43
 #: include/views/configuration.hostgroups.edit.php:67
 #: include/views/js/configuration.action.edit.js.php:89
-#: include/views/js/configuration.action.edit.js.php:197
+#: include/views/js/configuration.action.edit.js.php:200
 #: include/views/js/configuration.sysmaps.js.php:20
 #: include/views/js/configuration.sysmaps.js.php:30
-#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:142
-#: report2.php:341 search.php:273
+#: include/views/js/configuration.sysmaps.js.php:91 jsLoader.php:143
+#: report2.php:342 search.php:273
 msgid "Host group"
 msgstr "主機群組"
 
-#: api/classes/CHostGroup.php:421 api/classes/CHostGroup.php:486
+#: include/classes/api/services/CHostGroup.php:427
+#: include/classes/api/services/CHostGroup.php:439
+#: include/classes/api/services/CHostGroup.php:504
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "主機群組 \"%1$s\" 已存在."
 
-#: api/classes/CHostGroup.php:578
+#: include/classes/api/services/CHostGroup.php:596
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: api/classes/CHostGroup.php:559
+#: include/classes/api/services/CHostGroup.php:577
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because some hosts depend on it."
 msgstr ""
 
-#: api/classes/CHostGroup.php:533
+#: include/classes/api/services/CHostGroup.php:551
 #, c-format
 msgid "Host group \"%1$s\" is internal and can not be deleted."
 msgstr ""
@@ -6176,14 +6339,15 @@ msgstr ""
 msgid "Host group label type"
 msgstr "主機群組標示類型"
 
-#: api/classes/CHostGroup.php:418 api/classes/CHostGroup.php:478
+#: include/classes/api/services/CHostGroup.php:420
+#: include/classes/api/services/CHostGroup.php:496
 msgid "Host group name cannot be empty."
 msgstr ""
 
-#: include/forms.inc.php:176 include/menu.inc.php:160
+#: include/forms.inc.php:176 include/menu.inc.php:154
 #: include/views/configuration.copy.elements.php:48
 #: include/views/configuration.hostgroups.list.php:39
-#: include/views/monitoring.dashconf.php:53 search.php:339
+#: include/views/monitoring.dashconf.php:53 popup.php:47 search.php:339
 msgid "Host groups"
 msgstr "主機群組"
 
@@ -6193,8 +6357,8 @@ msgstr "主機群組"
 msgid "Host interface"
 msgstr "主機介面"
 
-#: hostinventories.php:26 include/views/configuration.host.edit.php:847
-#: include/views/configuration.host.prototype.edit.php:311 jsLoader.php:199
+#: hostinventories.php:26 include/views/configuration.host.edit.php:877
+#: include/views/configuration.host.prototype.edit.php:322 jsLoader.php:203
 msgid "Host inventory"
 msgstr "主機資產記錄"
 
@@ -6210,7 +6374,7 @@ msgstr ""
 msgid "Host label type"
 msgstr "主機標示類型"
 
-#: include/html.inc.php:301
+#: include/html.inc.php:307
 msgid "Host list"
 msgstr "主機清單"
 
@@ -6219,18 +6383,18 @@ msgid "Host metadata"
 msgstr ""
 
 #: host_prototypes.php:40 hosts.php:53 include/actions.inc.php:58
-#: include/views/configuration.host.edit.php:182
+#: include/views/configuration.host.edit.php:194
 #: include/views/configuration.host.prototype.edit.php:66
 #: include/views/inventory.host.view.php:41
 msgid "Host name"
 msgstr "主機名稱"
 
-#: api/classes/CHostPrototype.php:174
+#: include/classes/api/services/CHostPrototype.php:174
 #, c-format
 msgid "Host name \"%1$s\" is too long, it must not be longer than %2$d characters."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:176
+#: include/classes/api/services/CHostPrototype.php:176
 #, c-format
 msgid "Host name for host prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -6239,70 +6403,70 @@ msgstr ""
 msgid "Host networks"
 msgstr "主機網路"
 
-#: api/classes/CHostPrototype.php:785
+#: include/classes/api/services/CHostPrototype.php:785
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:773
+#: include/classes/api/services/CHostPrototype.php:773
 #, c-format
 msgid "Host prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:189
+#: include/classes/api/services/CHostPrototype.php:189
 #, c-format
 msgid "Host prototype \"%1$s\" must have at least one host group."
 msgstr ""
 
-#: host_prototypes.php:201
+#: host_prototypes.php:208
 msgid "Host prototype added"
 msgstr ""
 
-#: host_prototypes.php:119
+#: host_prototypes.php:128
 msgid "Host prototype deleted"
 msgstr ""
 
-#: host_prototypes.php:232
+#: host_prototypes.php:239
 msgid "Host prototype disabled"
 msgid_plural "Host prototypes disabled"
 msgstr[0] ""
 
-#: host_prototypes.php:231
+#: host_prototypes.php:238
 msgid "Host prototype enabled"
 msgid_plural "Host prototypes enabled"
 msgstr[0] ""
 
-#: host_prototypes.php:187
+#: host_prototypes.php:194
 msgid "Host prototype updated"
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1099
+#: include/classes/api/services/CHostPrototype.php:1099
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1095
+#: include/classes/api/services/CHostPrototype.php:1095
 #, c-format
 msgid "Host prototype with host name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1107
+#: include/classes/api/services/CHostPrototype.php:1107
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:1104
+#: include/classes/api/services/CHostPrototype.php:1104
 #, c-format
 msgid "Host prototype with visible name \"%1$s\" already exists."
 msgstr ""
 
-#: include/html.inc.php:442 include/html.inc.php:446
-#: include/views/configuration.host.discovery.list.php:100
-#: include/views/configuration.host.edit.php:641
+#: include/html.inc.php:448 include/html.inc.php:452
+#: include/views/configuration.host.discovery.list.php:101
+#: include/views/configuration.host.edit.php:646
 msgid "Host prototypes"
 msgstr ""
 
-#: host_prototypes.php:243
+#: host_prototypes.php:257
 msgid "Host prototypes deleted"
 msgstr ""
 
@@ -6314,7 +6478,7 @@ msgstr ""
 msgid "Host router"
 msgstr "主機路由"
 
-#: host_screen.php:27 jsLoader.php:200
+#: host_screen.php:27 jsLoader.php:204
 msgid "Host screens"
 msgstr "主機篩選"
 
@@ -6326,51 +6490,52 @@ msgstr "主機狀態"
 msgid "Host subnet mask"
 msgstr "主機子網路遮罩"
 
-#: include/views/configuration.screen.constructor.edit.php:479
+#: include/views/configuration.screen.constructor.edit.php:605
 msgid "Host time"
 msgstr "主機時間"
 
-#: api/classes/CHost.php:865
+#: include/classes/api/services/CHost.php:846
 msgid "Host update failed."
 msgstr "主機更新失敗."
 
-#: hosts.php:376
+#: hosts.php:380
 msgid "Host updated"
 msgstr "主機已更新"
 
-#: api/classes/CTemplate.php:1006
+#: include/classes/api/services/CTemplate.php:1043
 #, c-format
 msgid "Host with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:692
+#: include/classes/api/services/CHost.php:674
 #, c-format
 msgid "Host with the same name \"%s\" already exists."
 msgstr "名稱同樣為 \"%s\" 的主機已存在."
 
-#: api/classes/CTemplate.php:459 api/classes/CTemplate.php:974
+#: include/classes/api/services/CTemplate.php:493
+#: include/classes/api/services/CTemplate.php:1008
 #, c-format
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:698
+#: include/classes/api/services/CHost.php:680
 #, c-format
 msgid "Host with the same visible name \"%s\" already exists."
 msgstr "可視名稱同樣為 \"%s\" 的主機已存在."
 
-#: hostinventoriesoverview.php:85 hosts.php:797 include/forms.inc.php:199
-#: include/forms.inc.php:870 include/items.inc.php:723
-#: include/menu.inc.php:112 include/menu.inc.php:168
-#: include/reports.inc.php:364 include/views/administration.proxy.edit.php:88
+#: hostinventoriesoverview.php:92 hosts.php:823 include/forms.inc.php:199
+#: include/forms.inc.php:884 include/items.inc.php:723
+#: include/menu.inc.php:109 include/menu.inc.php:162
+#: include/reports.inc.php:367 include/views/administration.proxy.edit.php:87
 #: include/views/administration.proxy.list.php:46
 #: include/views/configuration.copy.elements.php:46
 #: include/views/configuration.graph.list.php:76
-#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.discovery.list.php:50
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.hostgroups.list.php:146
-#: include/views/conf.import.php:27 include/views/inventory.host.list.php:27
-#: include/views/monitoring.dashconf.php:75 search.php:237 search.php:279
-#: search.php:299 search.php:304 search.php:320
+#: include/views/conf.import.php:28 include/views/inventory.host.list.php:27
+#: include/views/monitoring.dashconf.php:87 popup.php:35 popup.php:43
+#: search.php:237 search.php:279 search.php:299 search.php:304 search.php:320
 msgid "Hosts"
 msgstr "主機"
 
@@ -6378,11 +6543,11 @@ msgstr "主機"
 msgid "Hosts & Groups"
 msgstr "主機&群組"
 
-#: include/classes/class.cserverinfo.php:45
+#: include/classes/html/CServerInfo.php:45
 msgid "Hosts (m/n/t)"
 msgstr "主機 (m/n/t)"
 
-#: include/views/configuration.template.edit.php:173
+#: include/views/configuration.template.edit.php:170
 msgid "Hosts / templates"
 msgstr "主機/模板"
 
@@ -6394,37 +6559,38 @@ msgstr "主機在於"
 msgid "Hosts in maintenance"
 msgstr "維修中主機"
 
-#: include/classes/class.chostsinfo.php:101 include/screens.inc.php:33
+#: include/classes/html/CHostsInfo.php:101 include/screens.inc.php:33
 msgid "Hosts info"
 msgstr "主機資訊"
 
-#: include/views/configuration.screen.constructor.edit.php:528
-#: include/views/monitoring.overview.php:90
+#: include/views/configuration.screen.constructor.edit.php:654
+#: include/views/monitoring.overview.items.php:58
+#: include/views/monitoring.overview.triggers.php:80
 msgid "Hosts location"
 msgstr "主機位置"
 
-#: hosts.php:356
+#: hosts.php:361
 msgid "Hosts updated"
 msgstr "主機已更新"
 
-#: include/reports.inc.php:60 include/reports.inc.php:382
-#: include/reports.inc.php:390
+#: include/reports.inc.php:61 include/reports.inc.php:385
+#: include/reports.inc.php:393
 msgid "Hourly"
 msgstr "每小時"
 
-#: include/forms.inc.php:1764
+#: include/forms.inc.php:1780
 msgid "Hours"
 msgstr "時"
 
 #: adm.gui.php:96 adm.housekeeper.php:127 adm.iconmapping.php:110
-#: adm.images.php:135 adm.macros.php:159 adm.other.php:110 adm.regexps.php:193
+#: adm.images.php:134 adm.macros.php:159 adm.other.php:110 adm.regexps.php:201
 #: adm.triggerdisplayoptions.php:76 adm.triggerseverities.php:82
 #: adm.valuemapping.php:127 adm.workingtime.php:63
 #: include/views/administration.general.housekeeper.edit.php:164
 msgid "Housekeeping"
 msgstr ""
 
-#: include/locales.inc.php:61
+#: include/locales.inc.php:65
 msgid "Hungarian (hu_HU)"
 msgstr "匈牙利(hu_HU)"
 
@@ -6442,22 +6608,22 @@ msgstr "ID"
 msgid "IMAP"
 msgstr "IMAP"
 
-#: events.php:459 hosts.php:806
+#: events.php:460 hosts.php:832
 #: include/views/administration.auditlogs.list.php:87
-#: include/views/administration.proxy.edit.php:61
+#: include/views/administration.proxy.edit.php:60
 #: include/views/inventory.host.view.php:57
 #: include/views/inventory.host.view.php:66
 #: include/views/inventory.host.view.php:75
 #: include/views/inventory.host.view.php:84
-#: include/views/js/configuration.host.edit.js.php:18 search.php:132
+#: include/views/js/configuration.host.edit.js.php:22 search.php:132
 msgid "IP"
 msgstr "IP地址"
 
-#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:54
-#: include/views/configuration.discovery.edit.php:68
-#: include/views/configuration.host.edit.php:241
-#: include/views/configuration.host.edit.php:328
-#: include/views/configuration.host.prototype.edit.php:93
+#: include/maps.inc.php:46 include/views/administration.proxy.edit.php:53
+#: include/views/configuration.discovery.edit.php:67
+#: include/views/configuration.host.edit.php:250
+#: include/views/configuration.host.edit.php:337
+#: include/views/configuration.host.prototype.edit.php:92
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
@@ -6465,26 +6631,26 @@ msgstr "IP地址"
 msgid "IP address"
 msgstr "IP地址"
 
-#: api/classes/CHostInterface.php:289
+#: include/classes/api/services/CHostInterface.php:292
 msgid "IP and DNS cannot be empty for host interface."
 msgstr "主機介面的IP和DNS不能是空白."
 
-#: include/views/configuration.discovery.edit.php:49
+#: include/views/configuration.discovery.edit.php:48
 #: include/views/configuration.discovery.list.php:41
 msgid "IP range"
 msgstr "IP範圍"
 
-#: api/classes/CDRule.php:199
+#: include/classes/api/services/CDRule.php:208
 msgid "IP range cannot be empty."
 msgstr "IP範圍不能為空白."
 
 #: include/hosts.inc.php:477 include/items.inc.php:283
-#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:45
 #: include/views/administration.script.list.php:53
-#: include/views/configuration.action.edit.php:683
-#: include/views/configuration.host.edit.php:750
-#: include/views/configuration.host.massupdate.php:305
-#: include/views/configuration.host.prototype.edit.php:267
+#: include/views/configuration.action.edit.php:729
+#: include/views/configuration.host.edit.php:781
+#: include/views/configuration.host.massupdate.php:337
+#: include/views/configuration.host.prototype.edit.php:278
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -6492,22 +6658,22 @@ msgstr "IPMI"
 msgid "IPMI agent"
 msgstr "IPMI端點代理程式"
 
-#: include/views/configuration.host.massupdate.php:210
+#: include/views/configuration.host.massupdate.php:242
 msgid "IPMI authentication algorithm"
 msgstr "IPMI認證演算法"
 
-#: include/views/configuration.host.edit.php:306
-#: include/views/configuration.host.edit.php:382
-#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.host.edit.php:315
+#: include/views/configuration.host.edit.php:391
+#: include/views/configuration.host.prototype.edit.php:146
 #: include/views/inventory.host.view.php:162
 msgid "IPMI interfaces"
 msgstr "IPMI介面"
 
-#: include/views/configuration.host.massupdate.php:239
+#: include/views/configuration.host.massupdate.php:271
 msgid "IPMI password"
 msgstr "IPMI密碼"
 
-#: include/views/configuration.host.massupdate.php:221
+#: include/views/configuration.host.massupdate.php:253
 msgid "IPMI privilege level"
 msgstr "IPMI優先層級"
 
@@ -6517,7 +6683,7 @@ msgstr "IPMI優先層級"
 msgid "IPMI sensor"
 msgstr "IPMI感應器"
 
-#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:262
 msgid "IPMI username"
 msgstr "IPMI用戶名"
 
@@ -6550,7 +6716,7 @@ msgstr "IT服務相依關係"
 msgid "IT service parent"
 msgstr "IT服務上層"
 
-#: include/menu.inc.php:82 include/menu.inc.php:213
+#: include/menu.inc.php:81 include/menu.inc.php:207
 #: include/views/administration.general.housekeeper.edit.php:81
 #: include/views/configuration.services.list.php:24 srv_status.php:26
 #: srv_status.php:163
@@ -6566,25 +6732,25 @@ msgid "ITEMS"
 msgstr "項目"
 
 #: include/views/administration.general.iconmap.edit.php:41
-#: include/views/administration.general.image.edit.php:28
+#: include/views/administration.general.image.edit.php:46
 #: include/views/administration.general.image.list.php:24
 #: include/views/configuration.sysmap.constructor.php:69
 msgid "Icon"
 msgstr "圖示"
 
-#: include/views/js/configuration.sysmaps.js.php:269
+#: include/views/js/configuration.sysmaps.js.php:267
 msgid "Icon (default)"
 msgstr "圖示(預設)"
 
-#: include/views/js/configuration.sysmaps.js.php:296
+#: include/views/js/configuration.sysmaps.js.php:294
 msgid "Icon (disabled)"
 msgstr "圖示(停用的)"
 
-#: include/views/js/configuration.sysmaps.js.php:287
+#: include/views/js/configuration.sysmaps.js.php:285
 msgid "Icon (maintenance)"
 msgstr "圖示(維修)"
 
-#: include/views/js/configuration.sysmaps.js.php:278
+#: include/views/js/configuration.sysmaps.js.php:276
 msgid "Icon (problem)"
 msgstr "圖示(問題)"
 
@@ -6605,42 +6771,44 @@ msgstr "圖示標示類型"
 msgid "Icon map"
 msgstr "圖示對應"
 
-#: api/classes/CIconMap.php:313
+#: include/classes/api/services/CIconMap.php:313
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "圖示對應\"%1$s\"無法被刪除. 已用於對應\"%2$s\"中."
 
-#: api/classes/CIconMap.php:416
+#: include/classes/api/services/CIconMap.php:416
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect iconid \"%2$s\"."
 msgstr "圖示對應\"%1$s\"已以不正確的iconid\"%2$s\"對應."
 
-#: api/classes/CIconMap.php:412
+#: include/classes/api/services/CIconMap.php:412
 #, c-format
 msgid "Icon map \"%1$s\" has mapping with incorrect inventory link \"%2$s\"."
 msgstr "圖示對應\"%1$s\"已以不正確的資產紀錄連結\"%2$s\"對應."
 
-#: api/classes/CIconMap.php:183 api/classes/CIconMap.php:261
+#: include/classes/api/services/CIconMap.php:183
+#: include/classes/api/services/CIconMap.php:261
 #, c-format
 msgid "Icon map \"%s\" already exists."
 msgstr "圖示對應\"%s\"已存在."
 
-#: api/classes/CIconMap.php:426
+#: include/classes/api/services/CIconMap.php:426
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with empty expression."
 msgstr "圖示對應\"%s\"無法以空白的表示式對應."
 
-#: api/classes/CIconMap.php:430
+#: include/classes/api/services/CIconMap.php:430
 #, c-format
 msgid "Icon map \"%s\" cannot have mapping with global expression that does not exist."
 msgstr "圖示對應\"%s\"無法以不存在的全域表示式對應."
 
-#: api/classes/CIconMap.php:434
+#: include/classes/api/services/CIconMap.php:434
 #, c-format
 msgid "Icon map \"%s\" has incorrect expression."
 msgstr "圖示對應\"%s\"含有不正確的表示式."
 
-#: api/classes/CIconMap.php:387 api/classes/CIconMap.php:392
+#: include/classes/api/services/CIconMap.php:387
+#: include/classes/api/services/CIconMap.php:392
 #, c-format
 msgid "Icon map \"%s\" must have at least one mapping."
 msgstr "圖示對應\"%s\"必須至少有一個對應."
@@ -6653,7 +6821,8 @@ msgstr "圖示對應已創建"
 msgid "Icon map deleted"
 msgstr "圖示對應已刪除"
 
-#: api/classes/CIconMap.php:163 api/classes/CIconMap.php:223
+#: include/classes/api/services/CIconMap.php:163
+#: include/classes/api/services/CIconMap.php:223
 msgid "Icon map name cannot be empty."
 msgstr "圖示對應名稱不能是空白."
 
@@ -6661,29 +6830,29 @@ msgstr "圖示對應名稱不能是空白."
 msgid "Icon map updated"
 msgstr "圖示對應已更新"
 
-#: api/classes/CIconMap.php:248
+#: include/classes/api/services/CIconMap.php:248
 #, c-format
 msgid "Icon map with iconmapid \"%s\" does not exist."
 msgstr "有iconmapid \"%s\"的圖示對應不存在."
 
 #: adm.gui.php:98 adm.housekeeper.php:129 adm.iconmapping.php:112
-#: adm.iconmapping.php:175 adm.images.php:137 adm.macros.php:161
-#: adm.other.php:112 adm.regexps.php:195 adm.triggerdisplayoptions.php:78
+#: adm.iconmapping.php:175 adm.images.php:136 adm.macros.php:161
+#: adm.other.php:112 adm.regexps.php:203 adm.triggerdisplayoptions.php:78
 #: adm.triggerseverities.php:84 adm.valuemapping.php:129
 #: adm.workingtime.php:65
 msgid "Icon mapping"
 msgstr "圖示對應"
 
-#: api/classes/CIconMap.php:440
+#: include/classes/api/services/CIconMap.php:440
 #, c-format
 msgid "Icon mapping entry \"%1$s\" against \"%2$s\" already exists."
 msgstr "圖示對應輸入項 \"%1$s\"相對於\"%2$s\"已存在."
 
-#: jsLoader.php:155
+#: jsLoader.php:156
 msgid "Iconmap is not enabled"
 msgstr "圖示對應並未啟用"
 
-#: include/views/js/configuration.sysmaps.js.php:130
+#: include/views/js/configuration.sysmaps.js.php:128
 msgid "Icons"
 msgstr "圖示"
 
@@ -6691,21 +6860,23 @@ msgstr "圖示"
 msgid "Identical expression already exists"
 msgstr ""
 
-#: include/func.inc.php:1915 include/func.inc.php:1935
+#: include/func.inc.php:1673 include/func.inc.php:1693
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
 msgstr "假如您認為這個訊息是錯的, 請諮詢您的管理者關於如何取得需要的許可權."
 
 #: image.php:26 include/audit.inc.php:37 include/maps.inc.php:28
-#: include/maps.inc.php:727
-#: include/views/administration.general.image.edit.php:41
-#: include/views/administration.general.image.edit.php:44
-#: include/views/administration.general.image.edit.php:50
-#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:143
+#: include/maps.inc.php:744
+#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:40
+#: include/views/js/configuration.sysmaps.js.php:21 jsLoader.php:144
 #: map.php:144
 msgid "Image"
 msgstr "圖片"
 
-#: api/classes/CImage.php:220 api/classes/CImage.php:336
+#: include/classes/api/services/CImage.php:501
+#: include/classes/api/services/CImage.php:514
+#: include/classes/api/services/CImage.php:560
+#: include/classes/api/services/CImage.php:578
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -6714,7 +6885,7 @@ msgstr ""
 msgid "Image added"
 msgstr "圖片已新增"
 
-#: adm.images.php:124
+#: adm.images.php:123
 msgid "Image deleted"
 msgstr "圖片已删除"
 
@@ -6722,12 +6893,13 @@ msgstr "圖片已删除"
 msgid "Image label type"
 msgstr "圖片標示類型"
 
-#: api/classes/CImage.php:257
+#: include/classes/api/services/CImage.php:248
 #, c-format
 msgid "Image load error [%1$s] in [%2$s]."
 msgstr ""
 
-#: api/classes/CImage.php:506 include/classes/helpers/CUploadFile.php:129
+#: include/classes/api/services/CImage.php:594
+#: include/classes/helpers/CUploadFile.php:129
 msgid "Image size must be less than 1MB."
 msgstr ""
 
@@ -6736,66 +6908,66 @@ msgid "Image updated"
 msgstr "圖片已更新"
 
 #: adm.gui.php:97 adm.housekeeper.php:128 adm.iconmapping.php:111
-#: adm.images.php:136 adm.macros.php:160 adm.other.php:111 adm.regexps.php:194
+#: adm.images.php:135 adm.macros.php:160 adm.other.php:111 adm.regexps.php:202
 #: adm.triggerdisplayoptions.php:77 adm.triggerseverities.php:83
 #: adm.valuemapping.php:128 adm.workingtime.php:64
 #: include/views/administration.general.image.list.php:29
-#: include/views/conf.import.php:37
+#: include/views/conf.import.php:39
 msgid "Images"
 msgstr "圖片"
 
-#: include/views/conf.import.php:51
+#: include/views/conf.import.php:55
 msgid "Images for all maps will be updated!"
 msgstr "所有拓墣圖都將被更新!"
 
-#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:410
 msgid "Immediately"
 msgstr "立即地"
 
-#: hosts.php:788 include/views/configuration.screen.list.php:33
+#: hosts.php:814 include/views/configuration.screen.list.php:33
 #: include/views/configuration.sysmap.list.php:28
-#: include/views/conf.import.php:69 include/views/conf.import.php:74
-#: templates.php:477
+#: include/views/conf.import.php:83 include/views/conf.import.php:88
+#: templates.php:491
 msgid "Import"
 msgstr "匯入"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Import failed"
 msgstr "匯入失敗"
 
-#: include/views/conf.import.php:64
+#: include/views/conf.import.php:78
 msgid "Import file"
 msgstr "匯入文件"
 
-#: conf.import.php:138
+#: conf.import.php:196
 msgid "Imported successfully"
 msgstr "已成功匯入"
 
-#: hostinventories.php:180
+#: hostinventories.php:192
 #, c-format
 msgid "Impossible to filter by inventory field \"%s\", which does not exist."
 msgstr "不可能以不存在的資產紀錄欄位\"%s\"來過濾."
 
-#: screenedit.php:307 screenedit.php:347
+#: screenedit.php:329 screenedit.php:369
 msgid "Impossible to remove last row and column."
 msgstr "不可能移除最後的行和列."
 
-#: include/classes/class.ctweenbox.php:73
-#: include/classes/class.ctweenbox.php:100
-#: include/views/configuration.template.edit.php:173
+#: include/classes/html/CTweenBox.php:73
+#: include/classes/html/CTweenBox.php:100
+#: include/views/configuration.template.edit.php:170
 msgid "In"
 msgstr "在...之中"
 
-#: include/views/administration.usergroups.edit.php:55
+#: include/views/administration.usergroups.edit.php:54
 msgid "In group"
 msgstr "在...群組之中"
 
-#: include/views/configuration.host.edit.php:200
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.host.edit.php:211
+#: include/views/configuration.template.edit.php:114
 msgid "In groups"
 msgstr "在...群組之中"
 
-#: hosts.php:961 include/html.inc.php:323
+#: hosts.php:983 include/html.inc.php:329
 #: include/views/configuration.maintenance.edit.php:168
 #: include/views/configuration.maintenance.edit.php:176
 msgid "In maintenance"
@@ -6808,244 +6980,282 @@ msgstr "維修中"
 msgid "In progress"
 msgstr "作業中"
 
-#: tr_logform.php:286 tr_logform.php:339
+#: tr_logform.php:255 tr_logform.php:298
 msgid "Include"
 msgstr "包含"
 
-#: api/classes/CService.php:1330
+#: include/classes/api/services/CService.php:1129
 #, c-format
 msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"."
 msgstr "不正確的相依性\"soft\"欄位值予服務\"%1$s\"."
 
-#: api/classes/CMap.php:400 api/classes/CMap.php:405 api/classes/CMap.php:414
-#: api/classes/CMap.php:422
+#: include/classes/api/services/CMap.php:410
+#: include/classes/api/services/CMap.php:415
+#: include/classes/api/services/CMap.php:424
+#: include/classes/api/services/CMap.php:432
 #, c-format
 msgid "Incorrect %1$s label type value for map \"%2$s\"."
 msgstr "不正確的%1$s標示類型值予拓墣圖\"%2$s\"."
 
-#: include/classes/api/clients/CLocalApiClient.php:143
+#: include/classes/api/clients/CLocalApiClient.php:61
 #, c-format
 msgid "Incorrect API \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:202
+#: include/classes/api/services/CDRule.php:211
 #, c-format
 msgid "Incorrect IP range \"%s\"."
 msgstr "不正確的IP區域\"%s\"."
 
-#: api/classes/CDRule.php:269
-#: include/views/js/configuration.discovery.edit.js.php:568
+#: include/classes/api/services/CDRule.php:286
+#: include/views/js/configuration.discovery.edit.js.php:579
 msgid "Incorrect SNMP OID."
 msgstr "不正確的SNMP OID"
 
-#: api/classes/CDRule.php:265
-#: include/views/js/configuration.discovery.edit.js.php:564
+#: include/classes/api/services/CDRule.php:282
+#: include/views/js/configuration.discovery.edit.js.php:575
 msgid "Incorrect SNMP community."
 msgstr "不正確的SNMP community."
 
-#: api/classes/CService.php:1160
+#: include/classes/api/services/CHttpTest.php:892
+#, c-format
+msgid "Incorrect SSL verify host value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:883
+#, c-format
+msgid "Incorrect SSL verify peer value for web scenario \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CService.php:959
 #, c-format
 msgid "Incorrect acceptable SLA for service \"%1$s\"."
 msgstr "不正確的可接受SLA予服務\"%1$s\"."
 
-#: api/classes/CAction.php:1588
+#: include/classes/api/services/CAction.php:1591
+#: include/classes/validators/CActionCondValidator.php:134
 msgid "Incorrect action condition discovery check."
 msgstr "不正確的動作條件探索檢查."
 
-#: api/classes/CAction.php:1680
+#: include/classes/api/services/CAction.php:1683
+#: include/classes/api/services/CAction.php:2425
 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
 msgstr "不正確的動作條件探索檢查. 探索檢查不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1563
+#: include/classes/api/services/CAction.php:1566
+#: include/classes/validators/CActionCondValidator.php:110
 msgid "Incorrect action condition discovery object."
 msgstr ""
 
-#: api/classes/CAction.php:1677
+#: include/classes/api/services/CAction.php:1680
+#: include/classes/api/services/CAction.php:2419
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
 msgstr "不正確的動作條件探索規則. 探索規則不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1608
+#: include/classes/api/services/CAction.php:1611
+#: include/classes/validators/CActionCondValidator.php:152
 msgid "Incorrect action condition discovery status."
 msgstr "不正確的動作條件探索狀態."
 
-#: api/classes/CAction.php:1642
+#: include/classes/api/services/CAction.php:1645
+#: include/classes/validators/CActionCondValidator.php:185
 msgid "Incorrect action condition event type."
 msgstr ""
 
-#: api/classes/CAction.php:1665
+#: include/classes/api/services/CAction.php:1668
+#: include/classes/api/services/CAction.php:2395
 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it."
 msgstr "不正確的動作條件主機群組. 主機群組不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1668
+#: include/classes/api/services/CAction.php:1671
+#: include/classes/api/services/CAction.php:2401
 msgid "Incorrect action condition host. Host does not exist or you have no access to it."
 msgstr "不正確的動作條件主機. 主機不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1579
+#: include/classes/api/services/CAction.php:1582
+#: include/classes/validators/CActionCondValidator.php:125
 #, c-format
 msgid "Incorrect action condition ip \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1501
+#: include/classes/api/services/CAction.php:1504
 msgid "Incorrect action condition operator."
 msgstr ""
 
-#: api/classes/CAction.php:1598
+#: include/classes/api/services/CAction.php:1601
+#: include/classes/validators/CActionCondValidator.php:143
 #, c-format
 msgid "Incorrect action condition port \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:1683
+#: include/classes/api/services/CAction.php:1686
+#: include/classes/api/services/CAction.php:2431
 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
 msgstr "不正確的動作條件系統代理程式. 系統代理程式不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1671
+#: include/classes/api/services/CAction.php:1674
+#: include/classes/api/services/CAction.php:2407
 msgid "Incorrect action condition template. Template does not exist or you have no access to it."
 msgstr "不正確的動作條件模板. 模板不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1624
+#: include/classes/api/services/CAction.php:1627
+#: include/classes/validators/CActionCondValidator.php:167
 msgid "Incorrect action condition trigger severity."
 msgstr ""
 
-#: api/classes/CAction.php:1633
+#: include/classes/api/services/CAction.php:1636
+#: include/classes/validators/CActionCondValidator.php:176
 msgid "Incorrect action condition trigger value."
 msgstr ""
 
-#: api/classes/CAction.php:1674
+#: include/classes/api/services/CAction.php:1677
+#: include/classes/api/services/CAction.php:2413
 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
 msgstr "不正確的動作條件觸發器. 觸發器不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1658
+#: include/classes/api/services/CAction.php:1661
+#: include/classes/validators/CActionCondValidator.php:201
 msgid "Incorrect action condition type."
 msgstr "不正確的動作條件類型."
 
-#: api/classes/CAction.php:704
-msgid "Incorrect action conditionid."
-msgstr "不正確的動作條件ID(conditionid)"
-
-#: api/classes/CAction.php:539 api/classes/CAction.php:677
-#, c-format
-msgid "Incorrect action conditions for action \"%1$s\"."
-msgstr ""
-
-#: api/classes/CAction.php:1365
+#: include/classes/api/services/CAction.php:1368
 msgid "Incorrect action operation command type."
 msgstr "不正確的動作操作命令類型."
 
-#: api/classes/CAction.php:1707
+#: include/classes/api/services/CAction.php:1710
 msgid "Incorrect action operation condition acknowledge type."
 msgstr "不正確的動作操作條件知悉類型."
 
-#: api/classes/CAction.php:1712
+#: include/classes/api/services/CAction.php:1715
 msgid "Incorrect action operation condition type."
 msgstr "不正確的動作操作條件類型."
 
-#: api/classes/CAction.php:1283 api/classes/CAction.php:1287
+#: include/classes/api/services/CAction.php:1283
+#: include/classes/api/services/CAction.php:1287
 msgid "Incorrect action operation escalation step values."
 msgstr "不正確的動作操作升級步驟值."
 
-#: api/classes/CAction.php:1436
+#: include/classes/api/services/CAction.php:1439
 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group."
 msgstr "不正確的動作操作主機群組. 主機群組不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1439
+#: include/classes/api/services/CAction.php:1442
 msgid "Incorrect action operation host. Host does not exist or you have no access to this host."
 msgstr "不正確的動作操作主機. 主機不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1371 api/classes/CAction.php:1375
+#: include/classes/api/services/CAction.php:1374
+#: include/classes/api/services/CAction.php:1378
 #, c-format
 msgid "Incorrect action operation port \"%s\"."
 msgstr "不正確的動作操作埠\"%s\"."
 
-#: api/classes/CAction.php:1293
+#: include/classes/api/services/CAction.php:1293
 msgid "Incorrect action operation step duration."
 msgstr "不正確的動作操作步驟停留時間."
 
-#: api/classes/CAction.php:1431
+#: include/classes/api/services/CAction.php:1434
 msgid "Incorrect action operation type."
 msgstr "不正確的動作操作類型."
 
-#: api/classes/CAction.php:1445
+#: include/classes/api/services/CAction.php:1448
 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group."
 msgstr "不正確的動作操作用戶群組. 用戶群組不存在或您沒有存取權."
 
-#: api/classes/CAction.php:1442
+#: include/classes/api/services/CAction.php:1445
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "不正確的動作操作用戶. 用戶不存在或您沒有存取權."
 
-#: api/classes/CAction.php:730
+#: include/classes/api/services/CAction.php:2330
 msgid "Incorrect action operationid."
 msgstr "不正確的動作操作ID(operationid)."
 
-#: api/classes/CService.php:1123
+#: include/classes/api/services/CService.php:922
 #, c-format
 msgid "Incorrect algorithm for service \"%1$s\"."
 msgstr "不正確的服務\"%1$s\"的演算法."
 
-#: include/regexp.inc.php:47 include/regexp.inc.php:85
-#: include/regexp.inc.php:156
+#: include/regexp.inc.php:49 include/regexp.inc.php:89
+#: include/regexp.inc.php:178
 msgid "Incorrect arguments passed to function"
 msgstr "不正確的自變數傳入方程式"
 
-#: api/classes/CApplication.php:287 api/classes/CHostInterface.php:256
-#: api/classes/CHostInterface.php:455 api/classes/CHttpTest.php:508
-#: api/classes/CItemGeneral.php:197
+#: include/classes/api/services/CApplication.php:297
+#: include/classes/api/services/CHostInterface.php:259
+#: include/classes/api/services/CHostInterface.php:460
+#: include/classes/api/services/CItemGeneral.php:197
 msgid "Incorrect arguments passed to function."
 msgstr "不正確的自變數傳給方程式"
 
-#: api/classes/CHostInterface.php:284
+#: include/classes/api/services/CHostInterface.php:287
 msgid "Incorrect arguments passed to method."
 msgstr "不正確的自變數傳給方法."
 
-#: api/classes/CDRule.php:298
+#: include/classes/api/services/CDRule.php:315
 #, c-format
 msgid "Incorrect authentication protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:378
+#: include/classes/api/services/CItemGeneral.php:378
 #, c-format
 msgid "Incorrect authentication protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1142
+#: include/classes/api/services/CHostInterface.php:658
+msgid "Incorrect bulk value for interface."
+msgstr ""
+
+#: include/classes/api/services/CService.php:941
 #, c-format
 msgid "Incorrect calculate SLA value for service \"%1$s\"."
 msgstr "不正確的計算SLA值予服務\"%1$s\"."
 
-#: api/classes/CHostPrototype.php:175
+#: include/classes/api/services/CHostPrototype.php:175
 #, c-format
 msgid "Incorrect characters used for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHost.php:626 api/classes/CHost.php:973
+#: include/classes/api/services/CHost.php:622
+#: include/classes/api/services/CHost.php:955
 #, c-format
 msgid "Incorrect characters used for host name \"%s\"."
 msgstr "不正確的字元用於主機名稱\"%s\"."
 
-#: api/classes/CProxy.php:230
+#: include/classes/api/services/CProxy.php:230
 #, c-format
 msgid "Incorrect characters used for proxy name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:434 api/classes/CTemplate.php:1014
+#: include/classes/api/services/CTemplate.php:444
+#: include/classes/api/services/CTemplate.php:1051
 #, c-format
 msgid "Incorrect characters used for template name \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:842
+#: include/classes/api/services/CAction.php:2013
+#, c-format
+msgid "Incorrect conditions for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:852
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:847
+#: include/classes/api/services/CAction.php:2018
+#, c-format
+msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:857
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: api/classes/CDRule.php:206
+#: include/classes/api/services/CDRule.php:215
 msgid "Incorrect delay."
 msgstr "不正確的延遲."
 
-#: api/classes/CHostPrototype.php:113
+#: include/classes/api/services/CHostPrototype.php:113
 #, c-format
 msgid "Incorrect discovery rule ID for host prototype \"%1$s\"."
 msgstr ""
@@ -7055,11 +7265,11 @@ msgstr ""
 msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s."
 msgstr ""
 
-#: api/classes/CAlert.php:342
+#: include/classes/api/services/CAlert.php:342
 msgid "Incorrect eventobject value."
 msgstr ""
 
-#: api/classes/CAlert.php:335
+#: include/classes/api/services/CAlert.php:335
 msgid "Incorrect eventsource value."
 msgstr ""
 
@@ -7068,11 +7278,11 @@ msgstr ""
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "不正確的欄位名稱\"%1$s\"或用於資料表\"%2$s\"的where陳述式的值."
 
-#: api/classes/CMap.php:352
+#: include/classes/api/services/CMap.php:362
 msgid "Incorrect fields for sysmap."
 msgstr ""
 
-#: api/classes/CTrigger.php:620
+#: include/classes/api/services/CTrigger.php:621
 msgid "Incorrect fields for trigger."
 msgstr "不正確的觸發器欄位."
 
@@ -7080,74 +7290,100 @@ msgstr "不正確的觸發器欄位."
 msgid "Incorrect file upload."
 msgstr "不正確的檔案上傳."
 
-#: api/classes/CDiscoveryRule.php:877
+#: include/classes/api/services/CAction.php:2063
+#, c-format
+msgid "Incorrect filter condition formula ID for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:887
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:869
+#: include/classes/api/services/CDiscoveryRule.php:879
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:881
+#: include/classes/api/services/CAction.php:2067
+#, c-format
+msgid "Incorrect filter condition operator for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:891
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:838
+#: include/classes/api/services/CAction.php:2055
+#, c-format
+msgid "Incorrect filter condition type for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CItemGeneral.php:838
 #, c-format
 msgid "Incorrect flexible interval \"%1$s\"."
 msgstr "不正確的彈性間隔\"%1$s\"."
 
-#: api/classes/CItemGeneral.php:827
+#: include/classes/api/services/CItemGeneral.php:827
 #, c-format
 msgid "Incorrect flexible interval in item \"%1$s\". Flexible interval must be a string."
 msgstr "在項目\"%1$s\"中不正確的彈性間隔. 彈性間隔必須是一個字串."
 
-#: include/triggers.inc.php:629 include/triggers.inc.php:1794
-#: tr_testexpr.php:36
+#: include/classes/api/services/CHttpTest.php:683
+#, c-format
+msgid "Incorrect follow redirects value for step \"%1$s\" of web scenario \"%2$s\"."
+msgstr ""
+
+#: include/classes/triggers/CTextTriggerConstructor.php:113
+#: include/triggers.inc.php:1618 tr_testexpr.php:36
 msgid "Incorrect function is used"
 msgstr "使用了不正確的方程式"
 
-#: api/classes/CScreenItem.php:605
+#: include/classes/api/services/CScreenItem.php:643
 #, c-format
 msgid "Incorrect graph ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:396 api/classes/CHostPrototype.php:403
+#: include/classes/api/services/CScreenItem.php:661
+#, c-format
+msgid "Incorrect graph prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:396
+#: include/classes/api/services/CHostPrototype.php:403
 msgid "Incorrect group prototype ID."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:196
+#: include/classes/api/services/CHostPrototype.php:196
 #, c-format
 msgid "Incorrect group prototypes for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:586
+#: include/classes/api/services/CScreenItem.php:625
 #, c-format
 msgid "Incorrect host ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreenItem.php:567
+#: include/classes/api/services/CScreenItem.php:607
 #, c-format
 msgid "Incorrect host group ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:241
+#: include/classes/api/services/CHostPrototype.php:241
 msgid "Incorrect host group ID for group prototype."
 msgstr ""
 
-#: include/profiles.inc.php:330
+#: include/profiles.inc.php:68
 msgid "Incorrect host group."
 msgstr "不正確的主機群組."
 
-#: api/classes/CHostPrototype.php:190
+#: include/classes/api/services/CHostPrototype.php:190
 #, c-format
 msgid "Incorrect host groups for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:459
+#: include/classes/api/services/CHostPrototype.php:459
 msgid "Incorrect host prototype ID."
 msgstr ""
 
@@ -7155,182 +7391,201 @@ msgstr ""
 msgid "Incorrect image index."
 msgstr "不正確的圖片索引"
 
-#: api/classes/CScreen.php:348 api/classes/CTemplateScreen.php:522
+#: include/classes/api/services/CImage.php:534
+#: include/classes/api/services/CScreen.php:358
+#: include/classes/api/services/CTemplateScreen.php:544
 msgid "Incorrect input parameters."
 msgstr ""
 
-#: api/classes/CHostInterface.php:585
+#: include/classes/api/services/CHostInterface.php:595
 #, c-format
 msgid "Incorrect interface DNS parameter \"%s\" provided."
 msgstr "給予了不正確的介面DNS參數\"%s\"."
 
-#: api/classes/CHostInterface.php:600
+#: include/classes/api/services/CHostInterface.php:610
 #, c-format
 msgid "Incorrect interface IP parameter \"%s\" provided."
 msgstr "給予了不正確的介面IP參數\"%s\"."
 
-#: api/classes/CHostInterface.php:616
+#: include/classes/api/services/CHostInterface.php:626
 #, c-format
 msgid "Incorrect interface port \"%s\" provided."
 msgstr "給予了不正確的介面埠參數\"%s\"."
 
-#: api/classes/CHost.php:564
+#: include/classes/api/services/CHost.php:574
 #, c-format
 msgid "Incorrect inventory field \"%s\"."
 msgstr "不正確的資產紀錄欄位\"%s\"."
 
-#: api/classes/CScreenItem.php:625
+#: include/classes/api/services/CScreenItem.php:680
 #, c-format
 msgid "Incorrect item ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:323
+#: include/classes/api/services/CGraphGeneral.php:326
 msgid "Incorrect item for axis value."
 msgstr "不正確的項目予軸值."
 
-#: api/classes/CTrigger.php:688 include/triggers.inc.php:1038
+#: include/classes/api/services/CTrigger.php:689 include/triggers.inc.php:884
 #, c-format
 msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"."
 msgstr "提供不正確的項目鍵值\"%1$s\"給\"%2$s\"上的觸發器表示式."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:254
+#: include/classes/api/services/CScreenItem.php:698
+#, c-format
+msgid "Incorrect item prototype ID \"%1$s\" provided for screen element."
+msgstr ""
+
+#: include/classes/validators/CFunctionValidator.php:254
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:251
+#: include/classes/api/services/CDRule.php:268
 msgid "Incorrect key."
 msgstr "不正確的鍵值."
 
-#: include/forms.inc.php:1245
+#: include/forms.inc.php:1259
 msgid "Incorrect list of items."
 msgstr "不正確的項目清單"
 
-#: maintenance.php:318
+#: maintenance.php:329
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
 msgstr "不正確的維修-日期必須在1970.01.01和2038.01.18之間"
 
-#: maintenance.php:346
+#: maintenance.php:357
 msgid "Incorrect maintenance date"
 msgstr "不正確的維修日期"
 
-#: maintenance.php:325
+#: maintenance.php:336
 msgid "Incorrect maintenance day period"
 msgstr "不正確的維修日期間 "
 
-#: maintenance.php:332 maintenance.php:343
+#: maintenance.php:343 maintenance.php:354
 msgid "Incorrect maintenance days of week"
 msgstr "不正確的週維修日數"
 
-#: maintenance.php:340
+#: maintenance.php:351
 msgid "Incorrect maintenance month period"
 msgstr "不正確的維修月期間"
 
-#: maintenance.php:305
+#: maintenance.php:316
 msgid "Incorrect maintenance period"
 msgstr "不正確的維修期間 "
 
-#: maintenance.php:302
+#: maintenance.php:313
 msgid "Incorrect maintenance period (minimum 5 minutes)"
 msgstr "不正確的維修期間(至少要5分鐘)"
 
-#: maintenance.php:329
+#: maintenance.php:340
 msgid "Incorrect maintenance week period"
 msgstr "不正確的維修週期間"
 
-#: api/classes/CScreenItem.php:644
+#: include/classes/api/services/CScreenItem.php:716
 #, c-format
 msgid "Incorrect map ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CMap.php:380
+#: include/classes/api/services/CMap.php:390
 #, c-format
 msgid "Incorrect map height value for map \"%s\"."
 msgstr "予拓墣圖\"%s\"不正確的拓墣圖高度."
 
-#: api/classes/CMap.php:376
+#: include/classes/api/services/CMap.php:386
 #, c-format
 msgid "Incorrect map width value for map \"%s\"."
 msgstr "予拓墣圖\"%s\"不正確的拓墣圖寬度."
 
-#: api/classes/CScript.php:563
+#: include/classes/api/services/CScreenItem.php:590
+msgid "Incorrect max columns provided for screen element."
+msgstr ""
+
+#: include/classes/api/services/CScript.php:563
 #, c-format
 msgid "Incorrect menu path for script \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/clients/CLocalApiClient.php:151
+#: include/classes/api/clients/CLocalApiClient.php:69
 #, c-format
 msgid "Incorrect method \"%1$s.%2$s\"."
 msgstr ""
 
-#: api/classes/CEvent.php:370
+#: include/classes/api/services/CEvent.php:370
 msgid "Incorrect object value."
 msgstr ""
 
-#: api/classes/CAction.php:508 api/classes/CAction.php:559
+#: include/classes/api/services/CAction.php:2136
+#: include/classes/api/services/CAction.php:2189
 #, c-format
 msgid "Incorrect parameter for action \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:804
+#: include/classes/api/services/CAction.php:788
 msgid "Incorrect parameter for operations."
 msgstr "不正確的操作參數."
 
-#: api/classes/CIconMap.php:160
+#: include/classes/api/services/CIconMap.php:160
 #, c-format
 msgid "Incorrect parameter is used for icon map \"%s\"."
 msgstr "用了不正確的參數於圖示對應\"%s\"."
 
-#: api/classes/CAction.php:620
+#: include/classes/api/services/CAction.php:2232
 #, c-format
 msgid "Incorrect parameters for action update method \"%1$s\"."
 msgstr ""
 
-#: api/classes/CAction.php:774
+#: include/classes/api/services/CAction.php:750
 msgid "Incorrect parameters for condition."
 msgstr "不正確的條件參數."
 
-#: api/classes/CIconMap.php:218
+#: include/classes/api/services/CIconMap.php:218
 #, c-format
 msgid "Incorrect parameters for icon map update method \"%s\"."
 msgstr "不正確的圖示對應更新方法\"%s\"參數."
 
-#: api/classes/CMaintenance.php:342 api/classes/CMaintenance.php:530
+#: include/classes/api/services/CMaintenance.php:350
+#: include/classes/api/services/CMaintenance.php:577
 msgid "Incorrect parameters for maintenance."
 msgstr "予維修不正確的參數."
 
-#: api/classes/CUserGroup.php:226 api/classes/CUserGroup.php:275
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:290
 msgid "Incorrect parameters for user group."
 msgstr "予主機群組不正確的參數."
 
-#: api/classes/CService.php:1208
+#: include/classes/api/services/CService.php:1007
 #, c-format
 msgid "Incorrect parent for service \"%1$s\"."
 msgstr "予服務\"%1$s\"的不正確上層"
 
-#: api/classes/CService.php:1211
+#: include/classes/api/services/CService.php:1010
 msgid "Incorrect parent service."
 msgstr "不正確的上層服務."
 
-#: api/classes/CDRule.php:245 discoveryconf.php:90
+#: discoveryconf.php:96 include/classes/api/services/CDRule.php:262
 msgid "Incorrect port range."
 msgstr "不正確的埠範圍."
 
-#: api/classes/CDRule.php:307
+#: include/classes/api/services/CDRule.php:324
 #, c-format
 msgid "Incorrect privacy protocol for discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:387
+#: include/classes/api/services/CItemGeneral.php:387
 #, c-format
 msgid "Incorrect privacy protocol for item \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDRule.php:232
+#: include/classes/api/services/CDRule.php:241
 msgid "Incorrect proxyid."
 msgstr "不正確的系統代理程式ID(proxyid)"
 
-#: api/classes/CScreenItem.php:447
+#: adm.regexps.php:68 include/regexp.inc.php:120
+#, c-format
+msgid "Incorrect regular expression \"%1$s\": \"%2$s\""
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:456
 msgid "Incorrect resource type provided for screen item."
 msgstr "提供了不正確的資源類型給篩選項目."
 
@@ -7339,64 +7594,68 @@ msgstr "提供了不正確的資源類型給篩選項目."
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScreenItem.php:676
+#: include/classes/api/services/CHttpTest.php:693
+msgid "Incorrect retrieve mode value for step \"%1$s\" of web scenario \"%2$\"."
+msgstr ""
+
+#: include/classes/api/services/CScreenItem.php:747
 #, c-format
 msgid "Incorrect screen ID \"%1$s\" provided for screen element."
 msgstr ""
 
-#: api/classes/CScreen.php:462
+#: include/classes/api/services/CScreen.php:472
 msgid "Incorrect screen ID."
 msgstr ""
 
-#: include/screens.inc.php:170 include/screens.inc.php:230
+#: include/screens.inc.php:172 include/screens.inc.php:232
 msgid "Incorrect screen provided for slide show."
 msgstr "用於簡報片展示的不正確篩選."
 
-#: include/services.inc.php:483 include/services.inc.php:492
+#: include/services.inc.php:485 include/services.inc.php:494
 msgid "Incorrect service end time."
 msgstr "不正確的服務終止時間."
 
-#: include/services.inc.php:480 include/services.inc.php:489
+#: include/services.inc.php:482 include/services.inc.php:491
 msgid "Incorrect service start time."
 msgstr "不正確的服務開始時間."
 
-#: include/services.inc.php:474
+#: include/services.inc.php:476
 msgid "Incorrect service time type."
 msgstr "不正確的服務時間類型."
 
-#: api/classes/CService.php:1177
+#: include/classes/api/services/CService.php:976
 #, c-format
 msgid "Incorrect sorder order for service \"%1$s\"."
 msgstr "予服務\"%1$s\"不正確的排序次序."
 
-#: api/classes/CEvent.php:363
+#: include/classes/api/services/CEvent.php:363
 msgid "Incorrect source value."
 msgstr ""
 
-#: api/classes/CHost.php:539
+#: include/classes/api/services/CHost.php:549
 #, c-format
 msgid "Incorrect status for host \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:185
+#: include/classes/api/services/CHostPrototype.php:185
 #, c-format
 msgid "Incorrect status for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CService.php:1231
+#: include/classes/api/services/CService.php:1030
 #, c-format
 msgid "Incorrect status for service \"%1$s\"."
 msgstr "予服務\"%1$s\"不正確的狀態."
 
-#: api/classes/CDRule.php:210
+#: include/classes/api/services/CDRule.php:219
 msgid "Incorrect status."
 msgstr "不正確的狀態."
 
-#: api/classes/CTemplateScreen.php:576
+#: include/classes/api/services/CTemplateScreen.php:598
 msgid "Incorrect template screen ID."
 msgstr ""
 
-#: api/classes/CUser.php:322
+#: include/classes/api/services/CUser.php:312
 #, c-format
 msgid "Incorrect theme for user \"%1$s\"."
 msgstr ""
@@ -7417,52 +7676,57 @@ msgstr "不正確的時間期間\"%1$s\" 開始時間必須早於或等於終止
 msgid "Incorrect time period \"%1$s\"."
 msgstr "不正確的時間期間\"%1$s\"."
 
-#: api/classes/CService.php:1192
+#: include/classes/api/services/CService.php:991
 #, c-format
 msgid "Incorrect trigger ID for service \"%1$s\"."
 msgstr "不正確的觸發器ID予服務\"%1$s\"."
 
-#: include/triggers.inc.php:640
+#: include/classes/triggers/CTextTriggerConstructor.php:126
 msgid "Incorrect trigger expression"
 msgstr "不正確的觸發器表示式"
 
-#: include/classes/parsers/CTriggerExpression.php:285
-#: include/classes/parsers/CTriggerExpression.php:290
+#: include/classes/parsers/CTriggerExpression.php:454
+#: include/classes/parsers/CTriggerExpression.php:461
 msgid "Incorrect trigger expression."
 msgstr "不正確的觸發器表示式."
 
-#: include/triggers.inc.php:1140
+#: include/triggers.inc.php:986
 #, c-format
 msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host."
 msgstr "不正確的觸發器表示式. 主機 \"%1$s\"不存在或您不能存取此主機."
 
-#: api/classes/CTrigger.php:668
+#: include/classes/api/services/CTrigger.php:669
 #, c-format
 msgid "Incorrect trigger expression. Host \"%s\" does not exist or you have no access to this host."
 msgstr "不正確的觸發器表示式. 主機 \"%s\"不存在或您不能存取此主機."
 
-#: api/classes/CTrigger.php:674
+#: include/classes/api/services/CTrigger.php:675
 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously."
 msgstr "不正確的觸發器表示式. 觸發器表示式組件不該同時屬於一個模板和一個主機."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:248
-#: include/classes/validators/CTriggerFunctionValidator.php:260
-#: include/classes/validators/CTriggerFunctionValidator.php:275
-#: include/classes/validators/CTriggerFunctionValidator.php:294
+#: include/classes/validators/CFunctionValidator.php:248
+#: include/classes/validators/CFunctionValidator.php:260
+#: include/classes/validators/CFunctionValidator.php:275
+#: include/classes/validators/CFunctionValidator.php:294
 #, c-format
 msgid "Incorrect trigger function \"%1$s\" provided in expression."
 msgstr "用了不正確的觸發器方程式\"%1$s\"於表示式中."
 
-#: include/func.inc.php:1146
+#: include/func.inc.php:995
 msgid "Incorrect type of asort_by_key."
 msgstr "不正確的asort_by_key類型."
 
-#: api/classes/CDiscoveryRule.php:835
+#: include/classes/api/services/CAction.php:2006
+#, c-format
+msgid "Incorrect type of calculation for action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:845
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:318
+#: include/profiles.inc.php:56
 msgid "Incorrect user group."
 msgstr "不正確的用戶群組."
 
@@ -7471,7 +7735,8 @@ msgstr "不正確的用戶群組."
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
 msgstr ""
 
-#: api/classes/CScreenItem.php:541 include/validate.inc.php:480
+#: include/classes/api/services/CScreenItem.php:571
+#: include/validate.inc.php:480
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
@@ -7491,7 +7756,7 @@ msgstr "不正確的值\"%1$s\"於整數欄位\"%2$s\"中."
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "不正確的值\"%1$s\"於無正負整數欄位\"%2$s\"中."
 
-#: include/reports.inc.php:524 include/reports.inc.php:528
+#: include/reports.inc.php:527 include/reports.inc.php:531
 #, c-format
 msgid "Incorrect value for field \"%1$s\"."
 msgstr ""
@@ -7501,43 +7766,49 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": cannot be empty."
 msgstr ""
 
-#: include/classes/class.cbuttonqmessage.php:51
+#: include/classes/html/CButtonQMessage.php:51
 #, c-format
 msgid "Incorrect value for setMessage(): \"%s\"."
 msgstr "不正確的值於setMessage(): \"%s\"."
 
-#: api/classes/CProxy.php:209 api/classes/CProxy.php:220
+#: include/classes/api/services/CProxy.php:209
+#: include/classes/api/services/CProxy.php:220
 #, c-format
 msgid "Incorrect value used for proxy status \"%1$s\"."
 msgstr ""
 
-#: include/profiles.inc.php:312
+#: include/classes/api/services/CHttpTest.php:311
+msgid "Incorrect web scenario ID."
+msgstr ""
+
+#: include/profiles.inc.php:50
 msgid "Incorrect working time."
 msgstr "不正確的工作時間."
 
-#: include/classes/import/CXmlImport18.php:1621
+#: include/classes/import/CXmlImport18.php:1903
 #, c-format
 msgid "Incorrect y max item for graph \"%1$s\"."
 msgstr "圖形\"%1$s\"的不正確y max項目."
 
-#: include/classes/import/CXmlImport18.php:1608
+#: include/classes/import/CXmlImport18.php:1890
 #, c-format
 msgid "Incorrect y min item for graph \"%1$s\"."
 msgstr "圖形\"%1$s\"的不正確y min項目."
 
-#: include/locales.inc.php:62
+#: include/locales.inc.php:66
 msgid "Indonesian (id_ID)"
 msgstr "印尼語 (id_ID)"
 
-#: include/actions.inc.php:825 include/blocks.inc.php:998
-#: include/blocks.inc.php:1294 include/classes/class.cformlist.php:72
+#: include/actions.inc.php:825 include/blocks.inc.php:1004
+#: include/blocks.inc.php:1298 include/classes/html/CFormList.php:72
 #: include/classes/screens/CScreenActions.php:134
 #: include/views/administration.auditacts.list.php:75
-#: include/views/configuration.host.discovery.list.php:59
+#: include/views/configuration.host.discovery.list.php:55
 #: include/views/configuration.hostgroups.list.php:53
+#: include/views/configuration.httpconf.list.php:72
 #: include/views/configuration.item.list.php:72
-#: include/views/configuration.triggers.list.php:112 latest.php:351
-#: latest.php:352 tr_status.php:388
+#: include/views/configuration.triggers.list.php:105 latest.php:362
+#: latest.php:363 tr_status.php:303
 msgid "Info"
 msgstr "資訊"
 
@@ -7546,15 +7817,15 @@ msgstr "資訊"
 msgid "Information"
 msgstr "資訊"
 
-#: include/views/configuration.triggers.expression.php:125
+#: include/views/configuration.triggers.expression.php:124
 msgid "Insert"
 msgstr "插入"
 
-#: include/forms.inc.php:1460 jsLoader.php:194
-msgid "Insert macro"
-msgstr "插入巨集"
+#: include/views/configuration.triggers.edit.php:94 jsLoader.php:196
+msgid "Insert expression"
+msgstr ""
 
-#: include/menu.inc.php:276 include/profiles.inc.php:299 setup.php:103
+#: include/menu.inc.php:268 include/profiles.inc.php:37 setup.php:98
 msgid "Installation"
 msgstr "安装"
 
@@ -7562,31 +7833,32 @@ msgstr "安装"
 msgid "Installer name"
 msgstr "安裝名稱"
 
-#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:842
-#: include/views/administration.proxy.edit.php:71 items.php:40
+#: disc_prototypes.php:41 host_discovery.php:48 hosts.php:868
+#: include/views/administration.proxy.edit.php:70 items.php:40
 msgid "Interface"
 msgstr "介面"
 
-#: api/classes/CHostInterface.php:806
+#: include/classes/api/services/CHostInterface.php:835
 #, c-format
 msgid "Interface is linked to item \"%1$s\" on \"%2$s\"."
 msgstr "介面是連結到\"%2$s\"上的項目\"%1$s\"."
 
-#: include/views/js/configuration.host.edit.js.php:135
+#: include/views/js/configuration.host.edit.js.php:143
 msgid "Interface is used by items that require this type of the interface."
 msgstr "介面是用於要求這類型介面的項目."
 
-#: api/classes/CHostInterface.php:293
+#: include/classes/api/services/CHostInterface.php:296
 #, c-format
 msgid "Interface with DNS \"%1$s\" cannot have empty IP address."
 msgstr "DNS為\"%1$s\"的介面不能有空白的IP位址."
 
-#: api/classes/CHostInterface.php:299 api/classes/CHostInterface.php:306
+#: include/classes/api/services/CHostInterface.php:302
+#: include/classes/api/services/CHostInterface.php:309
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name while having \"Use DNS\" property on \"%2$s\"."
 msgstr " 當\"%2$s\"上有 \"Use DNS\"屬性, IP為\"%1$s\"的介面不能有空白的DNS名稱."
 
-#: api/classes/CHostInterface.php:312
+#: include/classes/api/services/CHostInterface.php:315
 #, c-format
 msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
 msgstr "IP為\"%1$s\"的介面不能有空白的DNS名稱."
@@ -7606,7 +7878,7 @@ msgctxt "user type"
 msgid "Internal"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:190
+#: include/classes/core/CJsonRpc.php:190
 msgid "Internal JSON-RPC error."
 msgstr "內部的JSON-RPC錯誤."
 
@@ -7614,7 +7886,7 @@ msgstr "內部的JSON-RPC錯誤."
 msgid "Internal data storage period (in days)"
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:189
+#: include/classes/core/CJsonRpc.php:189
 msgid "Internal error."
 msgstr "內部的錯誤."
 
@@ -7627,19 +7899,19 @@ msgstr ""
 msgid "Internal event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:94
+#: include/views/configuration.httpconf.edit.php:85
 msgid "Internet Explorer"
 msgstr "IE瀏覽器"
 
-#: include/forms.inc.php:920
+#: include/forms.inc.php:934
 #: include/views/configuration.host.discovery.edit.php:198
-#: include/views/configuration.host.discovery.list.php:56
+#: include/views/configuration.host.discovery.list.php:52
 #: include/views/configuration.item.edit.php:265
 #: include/views/configuration.item.list.php:66
 #: include/views/configuration.item.massupdate.php:321
-#: include/views/configuration.item.prototype.list.php:53
-#: include/views/configuration.services.edit.php:132 latest.php:339
-#: latest.php:340
+#: include/views/configuration.item.prototype.list.php:49
+#: include/views/configuration.services.edit.php:131 latest.php:350
+#: latest.php:351
 msgid "Interval"
 msgstr "間隔"
 
@@ -7649,112 +7921,114 @@ msgstr "間隔"
 msgid "Interval (in sec)"
 msgstr "間隔(秒計)"
 
-#: api/rpc/class.cjsonrpc.php:170
+#: include/classes/core/CJsonRpc.php:170
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
 msgstr "無效的JSON. 當解析JSON文字時, 在伺服器端發生了一個錯誤."
 
-#: api/rpc/class.cjsonrpc.php:174
+#: include/classes/core/CJsonRpc.php:174
 msgid "Invalid Request."
 msgstr "無效的請求."
 
-#: maintenance.php:139 maintenance.php:153 services.php:187 services.php:201
+#: maintenance.php:144 maintenance.php:158 services.php:187 services.php:201
 #, c-format
 msgid "Invalid date \"%s\"."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:266
+#: include/classes/validators/CFunctionValidator.php:266
 msgid "Invalid first parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:269
+#: include/classes/validators/CFunctionValidator.php:269
 msgid "Invalid fourth parameter."
 msgstr ""
 
-#: api/classes/CUserMacro.php:636
+#: include/classes/api/services/CUserMacro.php:636
 #, c-format
 msgid "Invalid hostid for macro \"%1$s\"."
 msgstr "無效的主機ID予巨集 \"%1$s\"."
 
-#: api/classes/CDiscoveryRule.php:42
+#: include/classes/api/services/CDiscoveryRule.php:42
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItem.php:39
+#: include/classes/api/services/CItem.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:39
+#: include/classes/api/services/CItemPrototype.php:39
 #, c-format
 msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
 
-#: api/classes/CDRule.php:256 discoveryconf.php:97
+#: discoveryconf.php:103 include/classes/api/services/CDRule.php:273
 #, c-format
 msgid "Invalid key \"%1$s\": %2$s."
 msgstr ""
 
-#: maintenance.php:313
+#: maintenance.php:324
 msgid "Invalid maintenance period"
 msgstr ""
 
-#: api/classes/CScreenItem.php:147 api/classes/CScreenItem.php:240
-#: api/classes/CScreenItem.php:301 api/classes/CScript.php:429
-#: api/classes/CService.php:206 api/classes/CService.php:381
-#: api/classes/CService.php:1469 api/classes/CUserMacro.php:292
-#: api/classes/CUserMacro.php:425 api/classes/CUser.php:618
-#: api/classes/CUser.php:638 api/classes/CUser.php:796
-#: api/classes/CUser.php:841 api/rpc/class.cjsonrpc.php:185
+#: include/classes/api/services/CScreenItem.php:149
+#: include/classes/api/services/CScreenItem.php:242
+#: include/classes/api/services/CScreenItem.php:303
+#: include/classes/api/services/CScript.php:429
+#: include/classes/api/services/CService.php:206
+#: include/classes/api/services/CService.php:381
+#: include/classes/api/services/CService.php:1268
+#: include/classes/api/services/CUserMacro.php:292
+#: include/classes/api/services/CUserMacro.php:425
+#: include/classes/api/services/CUser.php:612
+#: include/classes/api/services/CUser.php:632
+#: include/classes/api/services/CUser.php:790
+#: include/classes/api/services/CUser.php:835
+#: include/classes/core/CJsonRpc.php:185
 msgid "Invalid method parameters."
 msgstr "無效的方法參數."
 
-#: include/classes/validators/CTriggerFunctionValidator.php:261
+#: include/classes/validators/CFunctionValidator.php:261
 msgid "Invalid number of parameters."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:184
+#: include/classes/core/CJsonRpc.php:184
 msgid "Invalid params."
 msgstr "無效的參數."
 
-#: include/reports.inc.php:574 include/reports.inc.php:578
+#: include/reports.inc.php:577 include/reports.inc.php:581
 #, c-format
 msgid "Invalid period for field \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:610
+#: include/classes/api/services/CHttpTest.php:749
+#: include/classes/api/services/CHttpTest.php:755
 #, c-format
 msgid "Invalid response code \"%1$s\"."
 msgstr "無效的回應編碼 \"%1$s\"."
 
-#: api/classes/CHttpTest.php:605
-#, c-format
-msgid "Invalid response code range \"%1$s\"."
-msgstr "無效的回應編碼範圍 \"%1$s\"."
-
-#: include/classes/validators/CTriggerFunctionValidator.php:267
+#: include/classes/validators/CFunctionValidator.php:267
 msgid "Invalid second parameter."
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:268
+#: include/classes/validators/CFunctionValidator.php:268
 msgid "Invalid third parameter."
 msgstr ""
 
-#: disc_prototypes.php:182 host_discovery.php:172 items.php:359
+#: disc_prototypes.php:191 host_discovery.php:176 items.php:369
 msgid "Invalid time period"
 msgstr "無效的時間期間"
 
-#: include/classes/class.cview.php:62
+#: include/classes/core/CView.php:62
 #, c-format
 msgid "Invalid view name given \"%s\". Allowed chars: \"a-z\" and \".\"."
 msgstr "所給的\"%s\"為無效的檢視名稱.  可用的: \"a-z\" 和 \".\"."
 
-#: include/menu.inc.php:101
-#: include/views/configuration.host.massupdate.php:306
+#: include/menu.inc.php:99 include/views/configuration.host.massupdate.php:338
 msgid "Inventory"
 msgstr "資產記錄"
 
-#: api/classes/CHost.php:1192
+#: include/classes/api/services/CHost.php:1179
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
 msgstr ""
@@ -7763,7 +8037,7 @@ msgstr ""
 msgid "Inventory field"
 msgstr "資產紀錄欄位"
 
-#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:287
 msgid "Inventory mode"
 msgstr "資產紀錄模式"
 
@@ -7771,12 +8045,12 @@ msgstr "資產紀錄模式"
 msgid "Is online?"
 msgstr "是否在線?"
 
-#: include/blocks.inc.php:986 include/blocks.inc.php:995
-#: include/blocks.inc.php:1292
+#: include/blocks.inc.php:992 include/blocks.inc.php:1001
+#: include/blocks.inc.php:1296
 msgid "Issue"
 msgstr "議題"
 
-#: api/classes/CUser.php:141
+#: include/classes/api/services/CUser.php:141
 msgid "It is not possible to filter by user password."
 msgstr "以用戶密碼過濾是不可能的."
 
@@ -7784,70 +8058,71 @@ msgstr "以用戶密碼過濾是不可能的."
 msgid "It is not possible to logout from HTTP authentication."
 msgstr "不可能於HTTP認證中登出."
 
-#: api/classes/CUserMedia.php:154 api/classes/CUser.php:150
+#: include/classes/api/services/CUserMedia.php:154
+#: include/classes/api/services/CUser.php:150
 msgid "It is not possible to search by user password."
 msgstr "以用戶密碼尋找是不可能的."
 
-#: include/locales.inc.php:63
+#: include/locales.inc.php:67
 msgid "Italian (it_IT)"
 msgstr "意大利語 (it_IT)"
 
 #: include/audit.inc.php:36 include/classes/screens/CScreenHistory.php:164
-#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1079
-#: include/reports.inc.php:422 include/views/configuration.graph.edit.php:98
-#: include/views/configuration.graph.edit.php:156
-#: include/views/configuration.triggers.expression.php:57 items.php:500
-#: items.php:738 items.php:765 tr_logform.php:280
+#: include/classes/screens/CScreenPlainText.php:42 include/forms.inc.php:1093
+#: include/reports.inc.php:425 include/views/configuration.graph.edit.php:108
+#: include/views/configuration.graph.edit.php:166
+#: include/views/configuration.triggers.expression.php:57 items.php:513
+#: items.php:761 items.php:790 tr_logform.php:249
 msgid "Item"
 msgstr "項目"
 
-#: jsLoader.php:195
+#: jsLoader.php:199
 #, c-format
 msgid "Item \"%1$s\""
 msgstr ""
 
-#: api/classes/CItem.php:37
+#: include/classes/api/services/CItem.php:37
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "鍵值為 \"%1$s\"的項目已存在於 \"%2$s\", 繼承自其他模板."
 
-#: api/classes/CItem.php:38
+#: include/classes/api/services/CItem.php:38
 #, c-format
 msgid "Item \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:897
+#: include/classes/api/services/CItem.php:900
 #, 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 "項目\"%1$s\"不能填入一個不存在的主機資產紀錄欄位號碼\"%2$d\". 選擇為: 從0(不填入)到%3$d."
 
-#: api/classes/CTemplateScreen.php:493
+#: include/classes/api/services/CTemplateScreen.php:512
 #, c-format
 msgid "Item \"%1$s\" does not exist on template \"%2$s\"."
 msgstr "項目\"%1$s\"不存在於模板\"%2$s\"中."
 
-#: include/classes/import/CXmlImport18.php:1556
+#: include/classes/import/CXmlImport18.php:1832
 #, c-format
 msgid "Item \"%1$s\" does not exist."
 msgstr "項目 \"%1$s\"不存在."
 
-#: include/classes/import/CConfigurationImport.php:591
+#: include/classes/import/CConfigurationImport.php:669
 #, c-format
 msgid "Item \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist."
 msgstr "\"%2$s\"上的項目\"%1$s\" : 應用集\"%3$s\"不存在."
 
-#: include/classes/import/CXmlImport18.php:1307
-#: include/classes/import/CXmlImport18.php:1311
+#: include/classes/import/CXmlImport18.php:1648
+#: include/classes/import/CXmlImport18.php:1654
 #, c-format
 msgid "Item \"%1$s\" skipped - user rule."
 msgstr "略過項目\"%1$s\"-用戶規則."
 
-#: api/classes/CItemGeneral.php:369
+#: include/classes/api/services/CItemGeneral.php:369
 #, c-format
 msgid "Item \"%1$s:%2$s\" has invalid port: \"%3$s\"."
 msgstr "項目\"%1$s:%2$s\"有無效的埠: \"%3$s\"."
 
-#: items.php:480 screenedit.php:189
+#: items.php:493
 msgid "Item added"
 msgstr "項目已新增"
 
@@ -7855,16 +8130,16 @@ msgstr "項目已新增"
 msgid "Item count"
 msgstr "項目數量"
 
-#: items.php:367 screenedit.php:222
+#: items.php:382
 msgid "Item deleted"
 msgstr "項目已刪除"
 
-#: applications.php:220 items.php:681
+#: applications.php:233 items.php:705
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: applications.php:219 items.php:680
+#: applications.php:232 items.php:704
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -7877,54 +8152,54 @@ msgstr ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: popup_trexpr.php:781
+#: popup_trexpr.php:769
 msgid "Item not selected"
 msgstr ""
 
-#: include/forms.inc.php:1079
+#: include/forms.inc.php:1093
 msgid "Item prototype"
 msgstr "項目原型"
 
-#: api/classes/CItemPrototype.php:37
+#: include/classes/api/services/CItemPrototype.php:37
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: api/classes/CItemPrototype.php:38
+#: include/classes/api/services/CItemPrototype.php:38
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: disc_prototypes.php:289
+#: disc_prototypes.php:301
 msgid "Item prototype added"
 msgstr ""
 
-#: disc_prototypes.php:190
+#: disc_prototypes.php:202
 msgid "Item prototype deleted"
 msgstr ""
 
-#: disc_prototypes.php:310
+#: disc_prototypes.php:323
 msgid "Item prototype disabled"
 msgid_plural "Item prototypes disabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:309
+#: disc_prototypes.php:322
 msgid "Item prototype enabled"
 msgid_plural "Item prototypes enabled"
 msgstr[0] ""
 
-#: disc_prototypes.php:285
+#: disc_prototypes.php:297
 msgid "Item prototype updated"
 msgstr ""
 
-#: include/html.inc.php:368 include/html.inc.php:372
-#: include/views/configuration.host.discovery.list.php:110
-#: include/views/configuration.host.edit.php:571
-#: include/views/configuration.template.edit.php:312
+#: include/html.inc.php:374 include/html.inc.php:378
+#: include/views/configuration.host.discovery.list.php:111
+#: include/views/configuration.host.edit.php:576
+#: include/views/configuration.template.edit.php:309 popup.php:95
 msgid "Item prototypes"
 msgstr "項目原型"
 
-#: disc_prototypes.php:324
+#: disc_prototypes.php:342
 msgid "Item prototypes deleted"
 msgstr ""
 
@@ -7932,92 +8207,92 @@ msgstr ""
 msgid "Item prototypes of"
 msgstr "項目原型之於"
 
-#: items.php:477 screenedit.php:180
+#: items.php:490
 msgid "Item updated"
 msgstr "項目已更新"
 
-#: api/classes/CItemGeneral.php:266
+#: include/classes/api/services/CItemGeneral.php:266
 msgid "Item uses host interface from non-parent host."
 msgstr "項目使用來自非上層主機的主機介面."
 
-#: api/classes/CItemGeneral.php:269
+#: include/classes/api/services/CItemGeneral.php:269
 msgid "Item uses incorrect interface type."
 msgstr "項目使用不正確的介面類型."
 
-#: api/classes/CItemGeneral.php:327
+#: include/classes/api/services/CItemGeneral.php:327
 msgid "Item will not be refreshed. Please enter a correct update interval."
 msgstr "項目將不會被刷新. 請輸入正確的更新區間."
 
-#: api/classes/CItemGeneral.php:440
+#: include/classes/api/services/CItemGeneral.php:440
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule."
 msgstr "鍵值為 \"%1$s\"的項目已存在於\"%2$s\" 為探索規則."
 
-#: api/classes/CItemGeneral.php:446
+#: include/classes/api/services/CItemGeneral.php:446
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype."
 msgstr "鍵值為 \"%1$s\"的項目已存在於\"%2$s\" 為創建自項目原型的項目."
 
-#: api/classes/CItemGeneral.php:443
+#: include/classes/api/services/CItemGeneral.php:443
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype."
 msgstr "鍵值為 \"%1$s\"的項目已存在於\"%2$s\" 為項目原型."
 
-#: api/classes/CItemGeneral.php:437
+#: include/classes/api/services/CItemGeneral.php:437
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item."
 msgstr "鍵值為 \"%1$s\"的項目已存在於\"%2$s\" 為項目."
 
-#: api/classes/CItemGeneral.php:449
+#: include/classes/api/services/CItemGeneral.php:449
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element."
 msgstr "鍵值為 \"%1$s\"的項目已存在於\"%2$s\" 為未知的項目組件."
 
-#: api/classes/CItemGeneral.php:804
+#: include/classes/api/services/CItemGeneral.php:804
 #, c-format
 msgid "Item with key \"%1$s\" already exists on \"%2$s\"."
 msgstr "鍵值為 \"%1$s\"的項目已存在於\"%2$s\" ."
 
-#: api/classes/managers/CHttpTestManager.php:710
-#: api/classes/managers/CHttpTestManager.php:841
+#: include/classes/api/managers/CHttpTestManager.php:712
+#: include/classes/api/managers/CHttpTestManager.php:843
 #, c-format
 msgid "Item with key \"%1$s\" already exists."
 msgstr ""
 
-#: hosts.php:837 hosts.php:930 include/html.inc.php:379
-#: include/html.inc.php:383 include/items.inc.php:706
-#: include/reports.inc.php:116 include/reports.inc.php:248
+#: hosts.php:863 hosts.php:953 include/html.inc.php:385
+#: include/html.inc.php:389 include/items.inc.php:706
+#: include/reports.inc.php:117 include/reports.inc.php:250
 #: include/views/configuration.application.list.php:97
-#: include/views/configuration.graph.edit.php:274
-#: include/views/configuration.host.discovery.list.php:51
-#: include/views/configuration.host.edit.php:464
+#: include/views/configuration.graph.edit.php:284
+#: include/views/configuration.host.discovery.list.php:47
+#: include/views/configuration.host.edit.php:469
 #: include/views/configuration.item.list.php:42
-#: include/views/configuration.template.edit.php:223
-#: include/views/conf.import.php:31 include/views/inventory.host.view.php:217
-#: include/views/inventory.host.view.php:227 latest.php:296 popup.php:55
+#: include/views/configuration.template.edit.php:220
+#: include/views/conf.import.php:33 include/views/inventory.host.view.php:229
+#: include/views/inventory.host.view.php:239 latest.php:306 popup.php:71
 #: queue.php:101 report6.php:44 search.php:141 search.php:173 search.php:198
-#: search.php:395 search.php:426 search.php:455 templates.php:497
-#: templates.php:559
+#: search.php:395 search.php:426 search.php:455 templates.php:511
+#: templates.php:570
 msgid "Items"
 msgstr "項目"
 
-#: include/classes/class.cserverinfo.php:54
+#: include/classes/html/CServerInfo.php:54
 msgid "Items (m/d/n)"
 msgstr "項目 (m/d/n)"
 
-#: items.php:716
+#: items.php:743
 msgid "Items copied"
 msgstr "項目已複製"
 
-#: items.php:771
+#: items.php:800
 msgid "Items deleted"
 msgstr "項目已刪除"
 
-#: include/views/monitoring.history.php:108
+#: include/views/monitoring.history.php:109
 msgid "Items list"
 msgstr "項目清單"
 
-#: items.php:662
+#: items.php:687
 msgid "Items updated"
 msgstr "監控項已更新"
 
@@ -8029,72 +8304,72 @@ msgstr "JMX"
 msgid "JMX agent"
 msgstr "JMX 端點代理程式"
 
-#: include/views/configuration.host.edit.php:291
-#: include/views/configuration.host.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:134
+#: include/views/configuration.host.edit.php:300
+#: include/views/configuration.host.edit.php:378
+#: include/views/configuration.host.prototype.edit.php:133
 #: include/views/inventory.host.view.php:142
 msgid "JMX interfaces"
 msgstr "JMX介面"
 
-#: api/rpc/class.cjsonrpc.php:142
+#: include/classes/core/CJsonRpc.php:142
 #, c-format
 msgid "JSON-rpc error generation failed. No such error \"%s\"."
 msgstr "JSON-rpc 錯誤產生失敗. 無此錯誤 \"%s\"."
 
-#: api/rpc/class.cjsonrpc.php:95
+#: include/classes/core/CJsonRpc.php:95
 msgid "JSON-rpc method is not defined."
 msgstr "JSON-rpc 方法尚未定義."
 
-#: api/rpc/class.cjsonrpc.php:100
+#: include/classes/core/CJsonRpc.php:100
 msgid "JSON-rpc params is not an Array."
 msgstr "JSON-rpc 參數不是一個陣列."
 
-#: api/rpc/class.cjsonrpc.php:85
+#: include/classes/core/CJsonRpc.php:85
 msgid "JSON-rpc version is not specified."
 msgstr "JSON-rpc 版本並未指定."
 
 #: include/media.inc.php:27
-#: include/views/administration.mediatypes.edit.php:44
+#: include/views/administration.mediatypes.edit.php:43
 msgid "Jabber"
 msgstr "Jabber"
 
-#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:80
 #: include/views/administration.mediatypes.list.php:64
 msgid "Jabber identifier"
 msgstr "Jabber Identifier"
 
-#: include/func.inc.php:249
+#: include/func.inc.php:237
 msgid "Jan"
 msgstr "一月"
 
-#: include/forms.inc.php:1653 include/func.inc.php:129
-#: include/func.inc.php:266 jsLoader.php:111
+#: include/forms.inc.php:1669 include/func.inc.php:117
+#: include/func.inc.php:254 jsLoader.php:112
 msgid "January"
 msgstr "一月"
 
-#: include/locales.inc.php:65
+#: include/locales.inc.php:69
 msgid "Japanese (ja_JP)"
 msgstr "日語 (ja_JP)"
 
-#: include/func.inc.php:255
+#: include/func.inc.php:243
 msgid "Jul"
 msgstr "七月"
 
-#: include/forms.inc.php:1655 include/func.inc.php:135
-#: include/func.inc.php:272 jsLoader.php:117
+#: include/forms.inc.php:1671 include/func.inc.php:123
+#: include/func.inc.php:260 jsLoader.php:118
 msgid "July"
 msgstr "七月"
 
-#: include/func.inc.php:254
+#: include/func.inc.php:242
 msgid "Jun"
 msgstr "六月"
 
-#: include/forms.inc.php:1678 include/func.inc.php:134
-#: include/func.inc.php:271 jsLoader.php:116
+#: include/forms.inc.php:1694 include/func.inc.php:122
+#: include/func.inc.php:259 jsLoader.php:117
 msgid "June"
 msgstr "六月"
 
-#: include/func.inc.php:440 include/func.inc.php:676
+#: include/func.inc.php:428 include/func.inc.php:664
 msgctxt "Kilo short"
 msgid "K"
 msgstr "K"
@@ -8103,40 +8378,40 @@ msgstr "K"
 msgid "Keep lost resources period (in days)"
 msgstr "保留失去的資源期間(日記)"
 
-#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:592
+#: disc_prototypes.php:44 host_discovery.php:51 include/forms.inc.php:606
 #: include/views/configuration.host.discovery.edit.php:68
-#: include/views/configuration.host.discovery.list.php:55
+#: include/views/configuration.host.discovery.list.php:51
 #: include/views/configuration.item.edit.php:68
 #: include/views/configuration.item.list.php:65
-#: include/views/configuration.item.prototype.list.php:52
-#: include/views/js/configuration.discovery.edit.js.php:426 items.php:46
-#: popup.php:625 popup.php:762 popup.php:871 popup.php:880
+#: include/views/configuration.item.prototype.list.php:48
+#: include/views/js/configuration.discovery.edit.js.php:433 items.php:46
+#: popup.php:954 popup.php:1099
 msgid "Key"
 msgstr "鍵值"
 
-#: api/classes/CItemGeneral.php:306
+#: include/classes/api/services/CItemGeneral.php:306
 #, c-format
 msgid "Key \"%1$s\" does not match <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 msgstr "鍵值\"%1$s\"不符 <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \"Item key\", \"<last|min|max|avg|sum|count>\", \"parameter\"]."
 
-#: include/views/configuration.action.edit.php:748
+#: include/views/configuration.action.edit.php:794
 #: include/views/js/common.item.edit.js.php:179
 msgid "Key passphrase"
 msgstr "鍵值通行短語"
 
-#: tr_logform.php:303
+#: tr_logform.php:272
 msgid "Keyword"
 msgstr "關鍵字"
 
-#: include/func.inc.php:676
+#: include/func.inc.php:664
 msgid "Kilo"
 msgstr "Kilo"
 
-#: include/locales.inc.php:64
+#: include/locales.inc.php:68
 msgid "Korean (ko_KR)"
 msgstr "韓語 (ko_KR)"
 
-#: latest.php:308
+#: latest.php:319
 msgid "LATEST DATA"
 msgstr "最新數據"
 
@@ -8167,37 +8442,37 @@ msgstr "LDAP登入成功"
 msgid "LDAP login was not successful"
 msgstr "LDAP登入並不成功"
 
-#: include/classes/screens/CScreenClock.php:70
+#: include/classes/screens/CScreenClock.php:81
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: include/triggers.inc.php:186
+#: include/triggers.inc.php:174
 msgid "LOST"
 msgstr "失去"
 
 #: include/maps.inc.php:45 include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.host.discovery.edit.php:291
 #: include/views/js/configuration.sysmaps.js.php:70
-#: include/views/js/configuration.sysmaps.js.php:236
-#: include/views/js/configuration.sysmaps.js.php:354
+#: include/views/js/configuration.sysmaps.js.php:234
+#: include/views/js/configuration.sysmaps.js.php:352
 msgid "Label"
 msgstr "標示"
 
 #: include/views/js/configuration.sysmaps.js.php:78
-#: include/views/js/configuration.sysmaps.js.php:245
+#: include/views/js/configuration.sysmaps.js.php:243
 msgid "Label location"
 msgstr "標示位置"
 
-#: include/views/administration.users.edit.php:145
+#: include/views/administration.users.edit.php:144
 msgid "Language"
 msgstr "語言"
 
-#: include/forms.inc.php:1700 include/maintenances.inc.php:119
+#: include/forms.inc.php:1716 include/maintenances.inc.php:115
 msgid "Last"
 msgstr "末"
 
-#: include/func.inc.php:1786
+#: include/func.inc.php:1544
 msgctxt "page navigation"
 msgid "Last"
 msgstr "末"
@@ -8208,19 +8483,19 @@ msgid "Last %1$d issue"
 msgid_plural "Last %1$d issues"
 msgstr[0] "最近%1$d個議題"
 
-#: popup_trexpr.php:239
+#: popup_trexpr.php:229
 msgid "Last (most recent) T value is < N"
 msgstr "最末(最近) T值是 < N"
 
-#: popup_trexpr.php:249
+#: popup_trexpr.php:239
 msgid "Last (most recent) T value is = N"
 msgstr "最末(最近) T值是 = N"
 
-#: popup_trexpr.php:244
+#: popup_trexpr.php:234
 msgid "Last (most recent) T value is > N"
 msgstr "最末(最近) T值是 > N"
 
-#: popup_trexpr.php:254
+#: popup_trexpr.php:244
 msgid "Last (most recent) T value is NOT N"
 msgstr "最末(最近) T值不是 N"
 
@@ -8240,28 +8515,28 @@ msgstr "最近365天"
 msgid "Last 7 days"
 msgstr "最近7天"
 
-#: include/blocks.inc.php:996 tr_status.php:389
+#: include/blocks.inc.php:1002 tr_status.php:304
 msgid "Last change"
 msgstr "上次修改于"
 
-#: include/views/configuration.screen.constructor.edit.php:321
+#: include/views/configuration.screen.constructor.edit.php:435
 msgid "Last change (descending)"
 msgstr "最後改變(降冪)"
 
-#: httpmon.php:87 latest.php:328 latest.php:330
+#: httpmon.php:94 latest.php:339 latest.php:341
 msgid "Last check"
 msgstr "最近檢查記錄"
 
-#: jsLoader.php:204
+#: jsLoader.php:208
 msgid "Last hour graph"
 msgstr "最近一小時"
 
-#: jsLoader.php:205
+#: jsLoader.php:209
 msgid "Last month graph"
 msgstr "上月圖形"
 
-#: popup_trexpr.php:48 popup_trexpr.php:59 popup_trexpr.php:75
-#: popup_trexpr.php:82 popup_trexpr.php:101
+#: popup_trexpr.php:38 popup_trexpr.php:49 popup_trexpr.php:65
+#: popup_trexpr.php:72 popup_trexpr.php:91
 msgid "Last of"
 msgstr "Last of"
 
@@ -8269,66 +8544,67 @@ msgstr "Last of"
 msgid "Last seen (age)"
 msgstr "最近出現(歷時)"
 
-#: latest.php:332 latest.php:333
+#: latest.php:343 latest.php:344
 msgid "Last value"
 msgstr "最新數據"
 
-#: jsLoader.php:206
+#: jsLoader.php:210
 msgid "Last week graph"
 msgstr "仩週圖形"
 
-#: include/menu.inc.php:47 include/views/inventory.host.view.php:195
-#: include/views/inventory.host.view.php:197 jsLoader.php:201 latest.php:26
-#: search.php:134 search.php:220 search.php:274 search.php:327
+#: include/menu.inc.php:46 include/views/inventory.host.view.php:209
+#: jsLoader.php:205 latest.php:26 search.php:134 search.php:220 search.php:274
+#: search.php:327
 msgid "Latest data"
 msgstr "最新數據"
 
-#: events.php:41 jsLoader.php:202
+#: events.php:41 jsLoader.php:206
 msgid "Latest events"
 msgstr "最新報警"
 
-#: jsLoader.php:203
+#: jsLoader.php:207
 msgid "Latest values"
 msgstr ""
 
-#: include/locales.inc.php:66
+#: include/locales.inc.php:70
 msgid "Latvian (lv_LV)"
 msgstr "拉脱維亞語(lv_LV)"
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:524
-#: include/views/configuration.screen.constructor.edit.php:553
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:650
+#: include/views/configuration.screen.constructor.edit.php:696
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:72
 #: include/views/js/configuration.sysmaps.js.php:84
-#: include/views/js/configuration.sysmaps.js.php:251
-#: include/views/monitoring.overview.php:86 popup_bitem.php:153
+#: include/views/js/configuration.sysmaps.js.php:249
+#: include/views/monitoring.overview.items.php:54
+#: include/views/monitoring.overview.triggers.php:76 popup_bitem.php:163
 msgid "Left"
 msgstr "左側"
 
-#: include/reports.inc.php:57 include/reports.inc.php:163
-#: include/reports.inc.php:306
+#: include/reports.inc.php:58 include/reports.inc.php:165
+#: include/reports.inc.php:309
 msgid "Legend"
 msgstr "圖例"
 
-#: popup_trexpr.php:325
+#: popup_trexpr.php:315
 msgid "Length of last (most recent) T value in characters is < N"
 msgstr "於多字元中最末(最近) T值的長度是 < N"
 
-#: popup_trexpr.php:335
+#: popup_trexpr.php:325
 msgid "Length of last (most recent) T value in characters is = N"
 msgstr "於多字元中最末(最近) T值的長度是 = N"
 
-#: popup_trexpr.php:330
+#: popup_trexpr.php:320
 msgid "Length of last (most recent) T value in characters is > N"
 msgstr "於多字元中最末(最近) T值的長度是 > N"
 
-#: popup_trexpr.php:340
+#: popup_trexpr.php:330
 msgid "Length of last (most recent) T value in characters is NOT N"
 msgstr "於多字元中最末(最近) T值的長度不是 N"
 
-#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:374
-#: include/views/js/configuration.sysmaps.js.php:452
+#: include/graphs.inc.php:55 include/views/js/configuration.sysmaps.js.php:372
+#: include/views/js/configuration.sysmaps.js.php:450
 msgid "Line"
 msgstr "線"
 
@@ -8336,39 +8612,29 @@ msgstr "線"
 msgid "Link"
 msgstr "連結"
 
-#: include/views/js/configuration.sysmaps.js.php:329
-#: include/views/js/configuration.sysmaps.js.php:341
-#: include/views/js/configuration.sysmaps.js.php:393
+#: include/views/js/configuration.sysmaps.js.php:327
+#: include/views/js/configuration.sysmaps.js.php:339
+#: include/views/js/configuration.sysmaps.js.php:391
 msgid "Link indicators"
 msgstr "連結指示器"
 
-#: api/classes/CMap.php:456
-#, c-format
-msgid "Link name should be unique for map \"%s\"."
-msgstr "拓墣圖\"%s\"的連結名稱必須是唯一的."
-
-#: include/views/configuration.host.edit.php:701
-#: include/views/configuration.host.prototype.edit.php:249
-#: include/views/configuration.template.edit.php:436
+#: include/views/configuration.host.edit.php:732
+#: include/views/configuration.host.prototype.edit.php:260
+#: include/views/configuration.template.edit.php:460
 msgid "Link new templates"
 msgstr ""
 
-#: api/classes/CMap.php:470
+#: include/classes/api/services/CMap.php:484
 #, c-format
 msgid "Link selementid1 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "連結欄位selementid1是為拓墣圖\"%2$s\"指向不存在的拓墣圖 selement ID \"%1$s\"."
 
-#: api/classes/CMap.php:477
+#: include/classes/api/services/CMap.php:491
 #, c-format
 msgid "Link selementid2 field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "連結欄位selementid2是為拓墣圖\"%2$s\"指向不存在的拓墣圖 selement ID \"%1$s\"."
 
-#: api/classes/CMap.php:452
-#, c-format
-msgid "Link should have both \"name\" and \"url\" fields for map \"%s\"."
-msgstr "於拓墣圖\"%s\"的連結應都有 \"name\"和\"url\"."
-
-#: include/views/configuration.host.massupdate.php:196
+#: include/views/configuration.host.massupdate.php:228
 msgid "Link templates"
 msgstr "模板連結"
 
@@ -8380,50 +8646,50 @@ msgstr "與模板關聯"
 msgid "Link to templates"
 msgstr "連結到模板"
 
-#: include/views/configuration.action.edit.php:862
+#: include/views/configuration.action.edit.php:926
 msgid "Link with templates"
 msgstr "與模板連結"
 
-#: include/views/configuration.host.edit.php:686
-#: include/views/configuration.host.edit.php:713
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.template.edit.php:417
-#: include/views/configuration.template.edit.php:438 templates.php:503
+#: include/views/configuration.host.edit.php:712
+#: include/views/configuration.host.edit.php:744
+#: include/views/configuration.host.prototype.edit.php:233
+#: include/views/configuration.template.edit.php:435
+#: include/views/configuration.template.edit.php:462 templates.php:517
 msgid "Linked templates"
 msgstr "連結的模板"
 
-#: templates.php:504
+#: templates.php:518
 msgid "Linked to"
 msgstr "已連結到"
 
-#: include/views/js/configuration.sysmaps.js.php:335
+#: include/views/js/configuration.sysmaps.js.php:333
 msgid "Links between the selected elements"
 msgstr "所選組件之間的連結"
 
-#: include/views/js/configuration.sysmaps.js.php:324
+#: include/views/js/configuration.sysmaps.js.php:322
 msgid "Links for the selected element"
 msgstr "所選組件的連結"
 
-#: include/classes/class.clist.php:40
+#: include/classes/html/CList.php:40
 msgid "List is empty"
 msgstr "清單是空的"
 
 #: include/classes/items/CHelpItems.php:101
-#: include/classes/items/CHelpItems.php:359
+#: include/classes/items/CHelpItems.php:363
 msgid "List of network interfaces. Text value."
 msgstr ""
 
-#: include/locales.inc.php:67
+#: include/locales.inc.php:71
 msgid "Lithuanian (lt_LT)"
 msgstr ""
 
 #: dashboard.php:367 dashboard.php:391 dashboard.php:414 dashboard.php:437
-#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:94
+#: dashboard.php:460 dashboard.php:490 include/views/monitoring.slides.php:90
 msgid "Loading..."
 msgstr "載入中..."
 
 #: include/classes/screens/CScreenHistory.php:165
-#: include/views/configuration.screen.constructor.edit.php:477
+#: include/views/configuration.screen.constructor.edit.php:603
 msgid "Local time"
 msgstr "當地時間"
 
@@ -8440,36 +8706,36 @@ msgid "Location longitude"
 msgstr "位置經度"
 
 #: include/forms.inc.php:404 include/items.inc.php:127
-#: include/triggers.inc.php:2257 include/views/configuration.item.edit.php:214
+#: include/triggers.inc.php:2067 include/views/configuration.item.edit.php:214
 #: include/views/configuration.item.massupdate.php:211
 msgid "Log"
 msgstr "日誌"
 
-#: popup_trexpr.php:453
+#: popup_trexpr.php:443
 msgid "Log severity of the last log entry is < N"
 msgstr "最末日誌項的日誌嚴重性是 < N"
 
-#: popup_trexpr.php:461
+#: popup_trexpr.php:451
 msgid "Log severity of the last log entry is = N"
 msgstr "最末日誌項的日誌嚴重性是 = N"
 
-#: popup_trexpr.php:457
+#: popup_trexpr.php:447
 msgid "Log severity of the last log entry is > N"
 msgstr "最末日誌項的日誌嚴重性是 > N"
 
-#: popup_trexpr.php:465
+#: popup_trexpr.php:455
 msgid "Log severity of the last log entry is NOT N"
 msgstr "最末日誌項的日誌嚴重性不是 N"
 
-#: popup_trexpr.php:469
+#: popup_trexpr.php:459
 msgid "Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise"
 msgstr "最末符合參數T的日誌項的日誌來源, 則 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:474
+#: popup_trexpr.php:464
 msgid "Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise"
 msgstr "最末符合參數T的日誌項的日誌來源, 則 N 非 1, 0 - 除外"
 
-#: include/views/configuration.item.edit.php:357
+#: include/views/configuration.item.edit.php:347
 #: include/views/configuration.item.massupdate.php:415
 msgid "Log time format"
 msgstr "日誌時間格式"
@@ -8478,12 +8744,12 @@ msgstr "日誌時間格式"
 msgid "Log unmatched SNMP traps"
 msgstr "日誌與SNMP捉捕器不符"
 
-#: include/classes/class.cserverinfo.php:42
+#: include/classes/html/CServerInfo.php:42
 msgid "Logged in as"
 msgstr "登入為"
 
-#: auditlogs.php:137 include/func.inc.php:1921 include/func.inc.php:1938
-#: include/menu.inc.php:281 include/page_header.php:216
+#: auditlogs.php:137 include/func.inc.php:1679 include/func.inc.php:1696
+#: include/menu.inc.php:273 include/page_header.php:216
 #: include/views/administration.auditlogs.list.php:43
 #: include/views/administration.authentication.edit.php:111
 #: include/views/administration.users.list.php:60
@@ -8494,12 +8760,12 @@ msgstr "登入"
 msgid "Login as Guest"
 msgstr "登入為訪客"
 
-#: api/classes/CUser.php:1072
+#: include/classes/api/services/CUser.php:1066
 #, c-format
 msgid "Login failed \"%s\"."
 msgstr "登入失敗\"%s\"."
 
-#: api/classes/CUser.php:1040
+#: include/classes/api/services/CUser.php:1034
 #, c-format
 msgid "Login name \"%1$s\" does not match the name \"%2$s\" used to pass HTTP authentication."
 msgstr ""
@@ -8508,8 +8774,9 @@ msgstr ""
 msgid "Login name or password is incorrect!"
 msgstr ""
 
-#: api/classes/CUser.php:929 api/classes/CUser.php:945
-#: api/classes/CUser.php:988
+#: include/classes/api/services/CUser.php:923
+#: include/classes/api/services/CUser.php:939
+#: include/classes/api/services/CUser.php:982
 msgid "Login name or password is incorrect."
 msgstr "登入名稱或密碼是不正確的."
 
@@ -8530,22 +8797,18 @@ msgstr ""
 msgid "Low-level discovery rule in \"not supported\" state"
 msgstr ""
 
-#: include/func.inc.php:436 include/func.inc.php:677
+#: include/func.inc.php:424 include/func.inc.php:665
 msgctxt "Mega short"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:123
+#: jsLoader.php:124
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
 
-#: include/translateDefines.inc.php:42 report3.php:114
-msgid "M Y"
-msgstr "M Y"
-
 #: include/classes/items/CHelpItems.php:193
-#: include/classes/items/CHelpItems.php:451
+#: include/classes/items/CHelpItems.php:455
 msgid "MAC address - lists all MAC addresses with interface names by default"
 msgstr ""
 
@@ -8557,7 +8820,7 @@ msgstr "Mac位址A"
 msgid "MAC address B"
 msgstr "Mac位址B"
 
-#: include/maps.inc.php:519
+#: include/maps.inc.php:536
 msgid "MAINTENANCE"
 msgstr "維修"
 
@@ -8582,49 +8845,49 @@ msgstr "最繁忙的100條觸發器"
 msgid "Macro"
 msgstr "巨集"
 
-#: api/classes/CUserMacro.php:708
+#: include/classes/api/services/CUserMacro.php:708
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "巨集\"%1$s\"已存在於\"%2$s\"."
 
-#: api/classes/CUserMacro.php:753
+#: include/classes/api/services/CUserMacro.php:753
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "巨集\"%1$s\"已存在."
 
-#: api/classes/CUserMacro.php:669
+#: include/classes/api/services/CUserMacro.php:669
 #, c-format
 msgid "Macro \"%1$s\" is not unique."
 msgstr "巨集\"%1$s\"並非唯一."
 
-#: api/classes/CUserMacro.php:620
+#: include/classes/api/services/CUserMacro.php:620
 #, c-format
 msgid "Macro \"%1$s\" value is too long, it should not exceed 255 chars."
 msgstr "巨集\"%1$s\"的值太長, 不應超過255字元."
 
-#: api/classes/CUserMacro.php:604
+#: include/classes/api/services/CUserMacro.php:604
 #, c-format
 msgid "Macro name \"%1$s\" is too long, it should not exceed 64 chars."
 msgstr "巨集\"%1$s\"的值太長, 不應超過64字元."
 
-#: api/classes/CUserMacro.php:788
+#: include/classes/api/services/CUserMacro.php:788
 #, c-format
 msgid "Macro with globalmacroid \"%1$s\" does not exist."
 msgstr "含globalmacroid  \"%1$s\"的巨集不存在."
 
-#: api/classes/CUserMacro.php:728
+#: include/classes/api/services/CUserMacro.php:728
 #, c-format
 msgid "Macro with hostmacroid \"%1$s\" does not exist."
 msgstr "有主機巨集識別碼\"%1$s\"的巨集不存在."
 
 #: adm.gui.php:100 adm.housekeeper.php:131 adm.iconmapping.php:114
-#: adm.images.php:139 adm.macros.php:163 adm.other.php:114 adm.regexps.php:197
+#: adm.images.php:138 adm.macros.php:163 adm.other.php:114 adm.regexps.php:205
 #: adm.triggerdisplayoptions.php:80 adm.triggerseverities.php:86
 #: adm.valuemapping.php:131 adm.workingtime.php:67
 #: include/views/administration.general.macros.edit.php:31
-#: include/views/configuration.host.edit.php:763
-#: include/views/configuration.host.prototype.edit.php:274
-#: include/views/configuration.template.edit.php:448
+#: include/views/configuration.host.edit.php:794
+#: include/views/configuration.host.prototype.edit.php:285
+#: include/views/configuration.template.edit.php:472
 msgid "Macros"
 msgstr "巨集"
 
@@ -8632,31 +8895,36 @@ msgstr "巨集"
 msgid "Macros updated"
 msgstr "巨集已更新"
 
-#: include/audit.inc.php:47 include/maps.inc.php:604 include/maps.inc.php:694
-#: include/menu.inc.php:187
+#: include/audit.inc.php:47 include/maps.inc.php:621 include/maps.inc.php:711
+#: include/menu.inc.php:181
 #: include/views/configuration.maintenance.edit.php:185
-#: include/views/js/configuration.sysmaps.js.php:153
+#: include/views/js/configuration.sysmaps.js.php:151
 msgid "Maintenance"
 msgstr "維修"
 
-#: api/classes/CMaintenance.php:347 api/classes/CMaintenance.php:460
+#: include/classes/api/services/CMaintenance.php:356
+#: include/classes/api/services/CMaintenance.php:370
+#: include/classes/api/services/CMaintenance.php:480
+#: include/classes/api/services/CMaintenance.php:501
 #, c-format
-msgid "Maintenance \"%s\" already exists."
-msgstr "維修\"%s\"已存在."
+msgid "Maintenance \"%1$s\" already exists."
+msgstr ""
 
-#: api/classes/CMaintenance.php:362 api/classes/CMaintenance.php:476
+#: include/classes/api/services/CMaintenance.php:386
+#: include/classes/api/services/CMaintenance.php:523
 msgid "Maintenance \"Active since\" value cannot be bigger than \"Active till\"."
 msgstr "維修期間\"Active since\"值不能晚於 \"Active till\"."
 
-#: api/classes/CAction.php:1614
+#: include/classes/api/services/CAction.php:1617
+#: include/classes/validators/CActionCondValidator.php:158
 msgid "Maintenance action condition value must be empty."
 msgstr ""
 
-#: maintenance.php:125
+#: maintenance.php:130
 msgid "Maintenance added"
 msgstr "維修已新增"
 
-#: maintenance.php:239
+#: maintenance.php:251
 msgid "Maintenance deleted"
 msgstr "維修已刪除"
 
@@ -8664,7 +8932,7 @@ msgstr "維修已刪除"
 msgid "Maintenance period"
 msgstr ""
 
-#: include/forms.inc.php:1759
+#: include/forms.inc.php:1775
 msgid "Maintenance period length"
 msgstr "維修期間長度"
 
@@ -8680,25 +8948,25 @@ msgstr "維修狀態"
 msgid "Maintenance type"
 msgstr "維修類型"
 
-#: maintenance.php:120
+#: maintenance.php:125
 msgid "Maintenance updated"
 msgstr "維修已更新"
 
-#: include/blocks.inc.php:1027 tr_status.php:714
+#: include/blocks.inc.php:1033 tr_status.php:638
 msgid "Maintenance with data collection"
 msgstr "維修並含資料蒐集"
 
-#: include/blocks.inc.php:1026 tr_status.php:713
+#: include/blocks.inc.php:1032 tr_status.php:637
 msgid "Maintenance without data collection"
 msgstr "維修不含資料蒐集"
 
-#: include/classes/validators/CTriggerFunctionValidator.php:276
+#: include/classes/validators/CFunctionValidator.php:276
 msgid "Mandatory parameter is missing."
 msgstr "維修參數不存在."
 
-#: include/views/configuration.host.edit.php:788
-#: include/views/configuration.host.massupdate.php:251
-#: include/views/configuration.host.prototype.edit.php:300
+#: include/views/configuration.host.edit.php:818
+#: include/views/configuration.host.massupdate.php:283
+#: include/views/configuration.host.prototype.edit.php:311
 msgid "Manual"
 msgstr "手動的"
 
@@ -8709,12 +8977,12 @@ msgstr "手動登出"
 #: include/audit.inc.php:40 include/maps.inc.php:27 include/screens.inc.php:34
 #: include/views/configuration.sysmap.edit.php:184
 #: include/views/js/configuration.sysmaps.js.php:18
-#: include/views/js/configuration.sysmaps.js.php:113 jsLoader.php:140
+#: include/views/js/configuration.sysmaps.js.php:111 jsLoader.php:141
 #: map.php:25
 msgid "Map"
 msgstr "拓墣圖"
 
-#: include/classes/import/CXmlImport18.php:702
+#: include/classes/import/CXmlImport18.php:689
 #, c-format
 msgid "Map \"%1$s\" skipped - user rule."
 msgstr "略過拓墣圖\"%1$s\"-用戶規則."
@@ -8724,12 +8992,12 @@ msgstr "略過拓墣圖\"%1$s\"-用戶規則."
 msgid "Map \"%s\""
 msgstr "拓墣圖\"%s\""
 
-#: include/classes/import/CXmlImport18.php:851
+#: include/classes/import/CXmlImport18.php:838
 #, c-format
 msgid "Map \"%s\" created."
 msgstr "拓墣圖\"%s\"已創建."
 
-#: include/classes/import/CXmlImport18.php:842
+#: include/classes/import/CXmlImport18.php:829
 #, c-format
 msgid "Map \"%s\" updated."
 msgstr "拓墣圖\"%s\"已更新."
@@ -8746,12 +9014,12 @@ msgstr "拓樸圖標示類型"
 msgid "Map save operation failed."
 msgstr "拓墣圖儲存動作失敗"
 
-#: api/classes/CMap.php:495
+#: include/classes/api/services/CMap.php:509
 #, c-format
 msgid "Map with name \"%s\" already exists."
 msgstr ""
 
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/views/administration.general.valuemapping.edit.php:40
 msgid "Mapped to"
 msgstr "對應到"
 
@@ -8761,23 +9029,23 @@ msgid "Mapping value \"%1$s\" is not unique."
 msgstr "對應值\"%1$s\"並非唯一."
 
 #: include/views/administration.general.iconmap.edit.php:136
-#: include/views/administration.general.valuemapping.edit.php:43
+#: include/views/administration.general.valuemapping.edit.php:42
 msgid "Mappings"
 msgstr "對應"
 
-#: dashboard.php:331 include/menu.inc.php:72 include/menu.inc.php:204
+#: dashboard.php:331 include/menu.inc.php:71 include/menu.inc.php:198
 #: include/views/configuration.sysmap.list.php:36
-#: include/views/conf.import.php:36 include/views/monitoring.maps.php:36
-#: popup.php:79
+#: include/views/conf.import.php:38 include/views/monitoring.maps.php:36
+#: popup.php:99
 msgid "Maps"
 msgstr "拓墣圖"
 
-#: include/func.inc.php:251
+#: include/func.inc.php:239
 msgid "Mar"
 msgstr "三月"
 
-#: include/forms.inc.php:1663 include/func.inc.php:131
-#: include/func.inc.php:268 jsLoader.php:113
+#: include/forms.inc.php:1679 include/func.inc.php:119
+#: include/func.inc.php:256 jsLoader.php:114
 msgid "March"
 msgstr "三月"
 
@@ -8785,28 +9053,34 @@ msgstr "三月"
 msgid "Mark elements on trigger status change"
 msgstr "觸發器狀態上的標記組件改變"
 
-#: include/views/monitoring.history.php:117
+#: include/views/monitoring.history.php:118
 msgid "Mark others"
 msgstr "標記其他"
 
-#: include/views/monitoring.history.php:116
+#: include/views/monitoring.history.php:117
 msgid "Mark selected"
 msgstr "標記所選"
 
-#: popup_trexpr.php:106
+#: popup_trexpr.php:96
 msgid "Mask"
 msgstr ""
 
-#: hosts.php:1052 include/views/configuration.item.list.php:267
-#: include/views/configuration.item.massupdate.php:554
-#: include/views/configuration.triggers.list.php:300
+#: hosts.php:1068 include/views/configuration.item.list.php:271
+#: include/views/configuration.item.massupdate.php:566
+#: include/views/configuration.triggers.list.php:299
 msgid "Mass update"
 msgstr "批量更新"
 
-#: include/views/js/configuration.sysmaps.js.php:219
+#: include/views/js/configuration.sysmaps.js.php:217
 msgid "Mass update elements"
 msgstr "大量更新組件"
 
+#: include/views/configuration.screen.constructor.edit.php:190
+#: include/views/configuration.screen.constructor.edit.php:287
+#: screenedit.php:71
+msgid "Max columns"
+msgstr ""
+
 #: adm.gui.php:41 include/views/administration.general.gui.edit.php:39
 msgid "Max count of elements to show inside table cell"
 msgstr "表格位中最多可展示的的組件數量."
@@ -8820,29 +9094,11 @@ msgstr "表格位\"%1$s\"中最多可展示的的組件數量."
 msgid "Max count of events per trigger to show"
 msgstr "可展示的每觸發器最多事件計數"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Maximize"
 msgstr "最大化"
 
-#: api/classes/CHostInterface.php:575
-#, c-format
-msgid "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum DNS name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CUser.php:286
-#, c-format
-msgid "Maximum alias length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum alias length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: api/classes/CHost.php:616
-#, c-format
-msgid "Maximum host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
 #: include/views/configuration.host.discovery.edit.php:241
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.massupdate.php:372
@@ -8850,103 +9106,98 @@ msgid "Maximum number of flexible intervals added"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:77
-#: include/classes/items/CHelpItems.php:327
+#: include/classes/items/CHelpItems.php:331
 msgid "Maximum number of opened files supported by OS."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:81
-#: include/classes/items/CHelpItems.php:331
+#: include/classes/items/CHelpItems.php:335
 msgid "Maximum number of processes supported by OS."
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:339 include/graphs.inc.php:404
+#: include/classes/screens/CScreenBase.php:348 include/graphs.inc.php:404
 #, c-format
 msgid "Maximum time period to display is %1$s day."
 msgid_plural "Maximum time period to display is %1$s days."
 msgstr[0] ""
 
-#: popup_trexpr.php:259
+#: popup_trexpr.php:249
 msgid "Maximum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:269
+#: popup_trexpr.php:259
 msgid "Maximum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:264
+#: popup_trexpr.php:254
 msgid "Maximum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:274
+#: popup_trexpr.php:264
 msgid "Maximum value for period T is NOT N"
 msgstr ""
 
-#: api/classes/CHost.php:652
-#, c-format
-msgid "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d character."
-msgid_plural "Maximum visible host name length is %1$d characters, \"%2$s\" is %3$d characters."
-msgstr[0] ""
-
-#: include/forms.inc.php:1673 include/func.inc.php:133
-#: include/func.inc.php:270 jsLoader.php:115
+#: include/forms.inc.php:1689 include/func.inc.php:121
+#: include/func.inc.php:258 jsLoader.php:116
 msgid "May"
 msgstr "五月"
 
-#: include/func.inc.php:253
+#: include/func.inc.php:241
 msgctxt "May short"
 msgid "May"
 msgstr "五月"
 
-#: include/views/administration.users.edit.php:215
-#: include/views/administration.users.edit.php:343 popup_media.php:27
+#: include/views/administration.users.edit.php:217
+#: include/views/administration.users.edit.php:345 popup_media.php:27
 msgid "Media"
 msgstr "示警媒介"
 
 #: include/audit.inc.php:26
-#: include/views/administration.mediatypes.edit.php:100 report4.php:88
+#: include/views/administration.mediatypes.edit.php:99 report4.php:88
 msgid "Media type"
 msgstr "示警媒介類型"
 
-#: api/classes/CMediatype.php:206 api/classes/CMediatype.php:257
+#: include/classes/api/services/CMediatype.php:206
+#: include/classes/api/services/CMediatype.php:257
 #, c-format
 msgid "Media type \"%s\" already exists."
 msgstr "示警媒介類型\"%s\"已存在."
 
-#: media_types.php:130
+#: media_types.php:133
 msgid "Media type added"
 msgstr "示警媒介類型已新增"
 
-#: media_types.php:151 media_types.php:182
+#: media_types.php:157 media_types.php:194
 msgid "Media type deleted"
 msgstr "示警媒介類型已刪除"
 
-#: media_types.php:171
+#: media_types.php:181
 #, fuzzy
 msgid "Media type disabled"
 msgid_plural "Media types disabled"
 msgstr[0] "示警媒介類型已停用"
 
-#: media_types.php:170
+#: media_types.php:180
 #, fuzzy
 msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "示警媒介類型已啟用"
 
-#: media_types.php:122
+#: media_types.php:125
 msgid "Media type updated"
 msgstr "示警媒介類型已更新"
 
-#: include/menu.inc.php:255
+#: include/menu.inc.php:247
 #: include/views/administration.mediatypes.list.php:28
 msgid "Media types"
 msgstr "示警媒介類型"
 
-#: api/classes/CMediatype.php:305
+#: include/classes/api/services/CMediatype.php:305
 #, c-format
 msgid "Media types used by action \"%s\"."
 msgstr "示警媒介類型用於動作\"%s\"."
 
-#: include/func.inc.php:677
+#: include/func.inc.php:665
 msgid "Mega"
 msgstr "Mega"
 
@@ -8961,14 +9212,14 @@ msgid "Memory limit: %s"
 msgstr "記憶體限制: %s"
 
 #: include/classes/items/CHelpItems.php:137
-#: include/classes/items/CHelpItems.php:395
+#: include/classes/items/CHelpItems.php:399
 msgid "Memory used by a process. <name> process name (default: \"all processes\"). <user> user name (default: \"all users\"). <mode> possible values: avg, max, min, sum (default). <cmdline> filter by command line (supports regex). Example: proc.mem[,root]."
 msgstr ""
 
 #: dashboard.php:310 dashboard.php:324 dashboard.php:338 dashboard.php:364
 #: dashboard.php:388 dashboard.php:411 dashboard.php:434 dashboard.php:457
-#: dashboard.php:487 include/views/configuration.item.list.php:230
-#: include/views/monitoring.slides.php:46
+#: dashboard.php:487 include/views/configuration.item.list.php:233
+#: include/views/monitoring.slides.php:42
 msgid "Menu"
 msgstr "選單"
 
@@ -8978,7 +9229,7 @@ msgstr "選單"
 #: include/classes/screens/CScreenActions.php:168
 #: include/views/administration.auditacts.list.php:73
 #: include/views/administration.auditacts.list.php:104
-#: include/views/configuration.action.edit.php:583
+#: include/views/configuration.action.edit.php:629
 msgid "Message"
 msgstr "訊息"
 
@@ -8986,66 +9237,66 @@ msgstr "訊息"
 msgid "Message actions"
 msgstr "訊息動作"
 
-#: include/views/administration.mediatypes.edit.php:92
+#: include/views/administration.mediatypes.edit.php:91
 msgid "Message text limit"
 msgstr "訊息文字限制"
 
-#: include/views/administration.users.edit.php:236
+#: include/views/administration.users.edit.php:238
 msgid "Message timeout"
 msgstr "訊息逾時"
 
-#: include/views/administration.users.edit.php:231
+#: include/views/administration.users.edit.php:233
 msgid "Message timeout (seconds)"
 msgstr "訊息逾時(秒)"
 
-#: jsLoader.php:161
+#: jsLoader.php:162
 msgid "Messages"
 msgstr "訊息"
 
-#: include/views/administration.users.edit.php:372
+#: include/views/administration.users.edit.php:374
 msgid "Messaging"
 msgstr "訊息中"
 
-#: api/rpc/class.cjsonrpc.php:179
+#: include/classes/core/CJsonRpc.php:179
 msgid "Method not found."
 msgstr "未發現方法."
 
-#: include/reports.inc.php:431
-#: include/views/configuration.screen.constructor.edit.php:569
+#: include/reports.inc.php:434
+#: include/views/configuration.screen.constructor.edit.php:712
 msgid "Middle"
 msgstr "居中"
 
-#: include/classes/class.cwidget.php:121 include/classes/class.cwidget.php:124
-#: include/func.inc.php:2025
+#: include/classes/html/widget/CWidget.php:121
+#: include/classes/html/widget/CWidget.php:124 include/func.inc.php:1783
 msgid "Minimize"
 msgstr "最小化"
 
-#: include/classes/class.frontendsetup.php:117
+#: include/classes/setup/CFrontendSetup.php:120
 #, c-format
 msgid "Minimum required PHP memory limit is %s (configuration option \"memory_limit\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:151
+#: include/classes/setup/CFrontendSetup.php:154
 #, c-format
 msgid "Minimum required PHP upload filesize is %s (configuration option \"upload_max_filesize\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:99
+#: include/classes/setup/CFrontendSetup.php:102
 #, c-format
 msgid "Minimum required PHP version is %s."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:168
+#: include/classes/setup/CFrontendSetup.php:171
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %s (configuration option \"max_execution_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:185
+#: include/classes/setup/CFrontendSetup.php:188
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %s (configuration option \"max_input_time\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:134
+#: include/classes/setup/CFrontendSetup.php:137
 #, c-format
 msgid "Minimum required size of PHP post is %s (configuration option \"post_max_size\")."
 msgstr ""
@@ -9054,79 +9305,76 @@ msgstr ""
 msgid "Minimum severity"
 msgstr ""
 
-#: include/classes/screens/CScreenBase.php:334 include/graphs.inc.php:397
+#: include/classes/screens/CScreenBase.php:343 include/graphs.inc.php:397
 #, c-format
 msgid "Minimum time period to display is %1$s hour."
 msgid_plural "Minimum time period to display is %1$s hours."
 msgstr[0] ""
 
-#: include/views/configuration.sysmap.edit.php:132 tr_status.php:288
+#: include/views/common.filter.trigger.php:67
+#: include/views/configuration.sysmap.edit.php:132
 msgid "Minimum trigger severity"
 msgstr ""
 
-#: popup_trexpr.php:279
+#: popup_trexpr.php:269
 msgid "Minimum value for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:289
+#: popup_trexpr.php:279
 msgid "Minimum value for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:284
+#: popup_trexpr.php:274
 msgid "Minimum value for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:294
+#: popup_trexpr.php:284
 msgid "Minimum value for period T is NOT N"
 msgstr ""
 
-#: include/forms.inc.php:1766
+#: include/forms.inc.php:1782
 msgid "Minutes"
 msgstr "分"
 
-#: api/classes/CAction.php:545
-#, c-format
-msgid "Missing \"%1$s\" field for action condition."
-msgstr ""
-
-#: include/reports.inc.php:467
+#: include/reports.inc.php:470
 #, c-format
 msgid "Missing \"%1$s\" field for item."
 msgstr ""
 
-#: include/reports.inc.php:564
+#: include/reports.inc.php:567
 #, c-format
 msgid "Missing \"%1$s\" field for period."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:76
+#: include/classes/api/services/CGraphGeneral.php:76
 msgid "Missing \"gitemid\" field for item."
 msgstr ""
 
-#: api/classes/CGraphGeneral.php:475 api/classes/CGraphGeneral.php:594
+#: include/classes/api/services/CGraphGeneral.php:478
+#: include/classes/api/services/CGraphGeneral.php:597
 msgid "Missing \"itemid\" field for item."
 msgstr "缺少項目的\"itemid\"欄位"
 
-#: api/classes/CGraphPrototype.php:39
+#: include/classes/api/services/CGraphPrototype.php:39
 msgid "Missing \"name\" field for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:39
+#: include/classes/api/services/CGraph.php:39
 msgid "Missing \"name\" field for graph."
 msgstr "缺少圖形的\"名稱\"欄位"
 
-#: include/classes/import/CXmlImport18.php:1612
-#: include/classes/import/CXmlImport18.php:1625
+#: include/classes/import/CXmlImport18.php:1894
+#: include/classes/import/CXmlImport18.php:1907
 #, c-format
 msgid "Missing item \"%1$s\" for host \"%2$s\"."
 msgstr "主機 \"%2$s\"缺少了項目\"%1$s\"."
 
-#: api/classes/CGraph.php:40
+#: include/classes/api/services/CGraph.php:40
 #, c-format
 msgid "Missing items for graph \"%1$s\"."
 msgstr "缺少圖形\"%1$s\"的項目."
 
-#: api/classes/CGraphPrototype.php:40
+#: include/classes/api/services/CGraphPrototype.php:40
 #, c-format
 msgid "Missing items for graph prototype \"%1$s\"."
 msgstr ""
@@ -9136,7 +9384,7 @@ msgstr ""
 msgid "Missing key \"%1$s\" for host \"%2$s\"."
 msgstr "缺少主機\"%2$s\"的鍵值 \"%1$s\"."
 
-#: api/classes/CUserGroup.php:391
+#: include/classes/api/services/CUserGroup.php:406
 msgid "Missing parameter: usrgrpids."
 msgstr "缺少參數: usrgrpids."
 
@@ -9148,18 +9396,18 @@ msgstr "節點"
 msgid "Model"
 msgstr "模型"
 
-#: include/func.inc.php:226
+#: include/func.inc.php:214
 msgid "Mon"
 msgstr "一"
 
-#: include/forms.inc.php:1639 include/forms.inc.php:1707
-#: include/func.inc.php:148 include/func.inc.php:238
+#: include/forms.inc.php:1655 include/forms.inc.php:1723
+#: include/func.inc.php:136 include/func.inc.php:226
 msgid "Monday"
 msgstr "週一"
 
-#: include/views/configuration.host.edit.php:418
-#: include/views/configuration.host.massupdate.php:150
-#: include/views/configuration.host.prototype.edit.php:156
+#: include/views/configuration.host.edit.php:423
+#: include/views/configuration.host.massupdate.php:168
+#: include/views/configuration.host.prototype.edit.php:155
 msgid "Monitored by proxy"
 msgstr "由系統代理程式監測"
 
@@ -9167,33 +9415,33 @@ msgstr "由系統代理程式監測"
 msgid "Monitored host"
 msgstr "已監測的主機"
 
-#: include/menu.inc.php:26
+#: include/menu.inc.php:26 include/views/inventory.host.view.php:207
 msgid "Monitoring"
 msgstr "監測中"
 
-#: include/classes/items/CHelpItems.php:323
+#: include/classes/items/CHelpItems.php:327
 msgid "Monitoring of Windows event logs. pattern, severity, eventid - regular expressions"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:339
+#: include/classes/items/CHelpItems.php:343
 msgid "Monitoring of log file with rotation. fileformat - [path][regexp], pattern - regular expression"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:335
+#: include/classes/items/CHelpItems.php:339
 msgid "Monitoring of log file. pattern - regular expression"
 msgstr ""
 
-#: include/forms.inc.php:1682 report3.php:106 report4.php:146 report5.php:46
+#: include/forms.inc.php:1698 report3.php:106 report4.php:146 report5.php:46
 msgid "Month"
 msgstr "月"
 
-#: include/forms.inc.php:1619 include/maintenances.inc.php:37
-#: include/reports.inc.php:63 include/reports.inc.php:385
-#: include/reports.inc.php:393 report3.php:60 report4.php:106
+#: include/forms.inc.php:1635 include/maintenances.inc.php:37
+#: include/reports.inc.php:64 include/reports.inc.php:388
+#: include/reports.inc.php:396 report3.php:60 report4.php:106
 msgid "Monthly"
 msgstr "每月"
 
-#: include/classes/class.cmultiselect.php:52 jsLoader.php:173
+#: include/classes/html/CMultiSelect.php:51 jsLoader.php:174
 msgid "More matches found..."
 msgstr ""
 
@@ -9201,7 +9449,7 @@ msgstr ""
 msgid "More than 10 minutes"
 msgstr "10分鐘以上"
 
-#: api/classes/CGraphGeneral.php:768
+#: include/classes/api/services/CGraphGeneral.php:771
 #, c-format
 msgid "More than one graph with name \"%1$s\" within host."
 msgstr "於主機中多於一個名為\"%1$s\"的圖形."
@@ -9210,19 +9458,19 @@ msgstr "於主機中多於一個名為\"%1$s\"的圖形."
 msgid "Most busy triggers top 100"
 msgstr "最繁忙的100條觸發器"
 
-#: include/views/configuration.httpconf.edit.php:101
+#: include/views/configuration.httpconf.edit.php:92
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/triggers.inc.php:1662
+#: include/triggers.inc.php:1485
 msgid "Multiple PROBLEM events"
 msgstr "多重問題(PROBLEM)事件"
 
-#: include/views/configuration.triggers.edit.php:244
+#: include/views/configuration.triggers.edit.php:250
 msgid "Multiple PROBLEM events generation"
 msgstr "多重問題事件產生"
 
-#: jsLoader.php:159
+#: jsLoader.php:160
 msgid "Mute"
 msgstr "靜音"
 
@@ -9235,60 +9483,58 @@ msgstr "網絡結構"
 msgid "NNTP"
 msgstr "NNTP"
 
-#: include/classes/screens/CScreenClock.php:59
+#: include/classes/screens/CScreenClock.php:70
 msgid "NO DATA"
 msgstr "無資料"
 
 #: include/httptest.inc.php:29
-msgid "NTLM authentication"
-msgstr "NTLM認證"
-
-#: actionconf.php:37 actionconf.php:154 adm.regexps.php:37 adm.regexps.php:138
-#: adm.regexps.php:171 applications.php:38 disc_prototypes.php:42
-#: graphs.php:41 host_discovery.php:49 hosts.php:804 hosts.php:835
-#: httpconf.php:44 httpmon.php:85 include/forms.inc.php:577
-#: include/hosts.inc.php:115 include/reports.inc.php:167
-#: include/setup.inc.php:384
+msgid "NTLM"
+msgstr ""
+
+#: actionconf.php:37 actionconf.php:168 adm.regexps.php:37 adm.regexps.php:146
+#: adm.regexps.php:177 applications.php:38 disc_prototypes.php:42
+#: graphs.php:41 host_discovery.php:49 hosts.php:830 hosts.php:861
+#: httpconf.php:44 httpmon.php:92 include/classes/setup/CSetupWizard.php:384
+#: include/forms.inc.php:591 include/hosts.inc.php:115
+#: include/reports.inc.php:169
 #: include/views/administration.general.iconmap.edit.php:29
 #: include/views/administration.general.iconmap.list.php:24
-#: include/views/administration.general.image.edit.php:35
+#: include/views/administration.general.image.edit.php:32
 #: include/views/administration.general.regularexpressions.edit.php:37
 #: include/views/administration.general.regularexpressions.list.php:31
-#: include/views/administration.general.valuemapping.edit.php:36
+#: include/views/administration.general.valuemapping.edit.php:35
 #: include/views/administration.general.valuemapping.list.php:24
-#: include/views/administration.mediatypes.edit.php:36
+#: include/views/administration.mediatypes.edit.php:35
 #: include/views/administration.mediatypes.list.php:39
 #: include/views/administration.proxy.list.php:40
-#: include/views/administration.script.edit.php:42
+#: include/views/administration.script.edit.php:41
 #: include/views/administration.script.list.php:38
 #: include/views/administration.usergroups.list.php:45
-#: include/views/administration.users.edit.php:53
-#: include/views/administration.users.list.php:55
 #: include/views/configuration.action.edit.php:45
 #: include/views/configuration.action.edit.php:72
-#: include/views/configuration.action.edit.php:884
+#: include/views/configuration.action.edit.php:948
 #: include/views/configuration.action.list.php:51
 #: include/views/configuration.application.edit.php:42
-#: include/views/configuration.discovery.edit.php:40
+#: include/views/configuration.discovery.edit.php:39
 #: include/views/configuration.discovery.list.php:40
-#: include/views/configuration.graph.edit.php:55
-#: include/views/configuration.graph.edit.php:221
+#: include/views/configuration.graph.edit.php:54
+#: include/views/configuration.graph.edit.php:231
 #: include/views/configuration.graph.list.php:77
 #: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.discovery.list.php:50
-#: include/views/configuration.host.edit.php:661
-#: include/views/configuration.host.edit.php:705
+#: include/views/configuration.host.discovery.list.php:46
+#: include/views/configuration.host.edit.php:688
+#: include/views/configuration.host.edit.php:736
 #: include/views/configuration.hostgroups.list.php:50
-#: include/views/configuration.host.prototype.edit.php:211
-#: include/views/configuration.host.prototype.list.php:52
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.list.php:48
 #: include/views/configuration.httpconf.edit.php:59
-#: include/views/configuration.httpconf.edit.php:162
-#: include/views/configuration.httpconf.list.php:62
-#: include/views/configuration.httpconf.popup.php:77
+#: include/views/configuration.httpconf.edit.php:198
+#: include/views/configuration.httpconf.list.php:64
+#: include/views/configuration.httpconf.popup.php:86
 #: include/views/configuration.item.edit.php:52
 #: include/views/configuration.item.list.php:63
-#: include/views/configuration.item.list.php:144
-#: include/views/configuration.item.prototype.list.php:51
+#: include/views/configuration.item.list.php:147
+#: include/views/configuration.item.prototype.list.php:47
 #: include/views/configuration.maintenance.edit.php:39
 #: include/views/configuration.maintenance.list.php:44
 #: include/views/configuration.screen.edit.php:41
@@ -9299,26 +9545,32 @@ msgstr "NTLM認證"
 #: include/views/configuration.sysmap.edit.php:41
 #: include/views/configuration.sysmap.edit.php:137
 #: include/views/configuration.sysmap.list.php:43
-#: include/views/configuration.template.edit.php:391
+#: include/views/configuration.template.edit.php:409
 #: include/views/configuration.triggers.edit.php:63
-#: include/views/configuration.triggers.edit.php:276
-#: include/views/configuration.triggers.list.php:109
-#: include/views/configuration.triggers.massupdate.php:88
+#: include/views/configuration.triggers.edit.php:282
+#: include/views/configuration.triggers.list.php:102
+#: include/views/configuration.triggers.massupdate.php:87
 #: include/views/inventory.host.list.php:76
-#: include/views/js/configuration.sysmaps.js.php:186 items.php:44
-#: latest.php:325 latest.php:326 maintenance.php:44 maintenance.php:204
-#: maintenance.php:232 popup_httpstep.php:36 popup.php:506 popup.php:564
-#: popup.php:625 popup.php:648 popup.php:761 popup.php:870 popup.php:879
-#: popup.php:962 popup.php:1009 popup.php:1102 popup.php:1105 popup.php:1173
-#: popup.php:1176 popup.php:1237 popup.php:1241 popup.php:1291 popup.php:1317
-#: popup.php:1338 popup.php:1364 popup.php:1393 popup.php:1400
-#: popup_right.php:53 popup_usrgrp.php:89 queue.php:204 report2.php:394
+#: include/views/js/configuration.sysmaps.js.php:184 items.php:44
+#: latest.php:336 latest.php:337 maintenance.php:44 maintenance.php:209
+#: maintenance.php:240 popup_httpstep.php:36 popup.php:537 popup.php:662
+#: popup.php:737 popup.php:812 popup.php:888 popup.php:954 popup.php:977
+#: popup.php:1098 popup.php:1229 popup.php:1311 popup.php:1416 popup.php:1419
+#: popup.php:1486 popup.php:1489 popup.php:1550 popup.php:1554 popup.php:1604
+#: popup.php:1631 popup.php:1652 popup.php:1678 popup.php:1707 popup.php:1714
+#: popup_right.php:53 popup_usrgrp.php:89 queue.php:230 report2.php:395
 #: screenconf.php:50 services.php:41 slideconf.php:36 sysmaps.php:48
-#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:394 users.php:45
+#: trigger_prototypes.php:41 triggers.php:41 tr_status.php:309
 msgid "Name"
 msgstr "名稱"
 
-#: api/classes/CHostPrototype.php:223
+#: include/views/administration.users.edit.php:52
+#: include/views/administration.users.list.php:55 popup.php:595 users.php:45
+msgctxt "user first name"
+msgid "Name"
+msgstr ""
+
+#: include/classes/api/services/CHostPrototype.php:223
 #, c-format
 msgid "Name for group prototype \"%1$s\" must contain macros."
 msgstr ""
@@ -9337,12 +9589,12 @@ msgid "Network discovery event and alert data storage period (in days) \"%1$s\".
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:97
-#: include/classes/items/CHelpItems.php:355
+#: include/classes/items/CHelpItems.php:359
 msgid "Network interface input statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:105
-#: include/classes/items/CHelpItems.php:363
+#: include/classes/items/CHelpItems.php:367
 msgid "Network interface output statistic. Integer value. If mode is missing bytes is used."
 msgstr ""
 
@@ -9350,7 +9602,7 @@ msgstr ""
 msgid "Network map added"
 msgstr "網路拓墣圖已新增"
 
-#: sysmaps.php:213
+#: sysmaps.php:220
 msgid "Network map deleted"
 msgstr "網路拓墣圖已刪除"
 
@@ -9362,7 +9614,7 @@ msgstr "網路拓墣圖已新增"
 msgid "Network maps"
 msgstr "網絡結拓墣圖"
 
-#: httpmon.php:166 include/func.inc.php:220
+#: httpmon.php:173 include/func.inc.php:208
 msgid "Never"
 msgstr "從未"
 
@@ -9370,24 +9622,24 @@ msgstr "從未"
 msgid "Never executed"
 msgstr "從未執行過"
 
-#: include/views/configuration.action.edit.php:405
-#: include/views/configuration.action.edit.php:634
-#: include/views/configuration.action.edit.php:936
-#: include/views/configuration.discovery.edit.php:56
+#: include/views/configuration.action.edit.php:450
+#: include/views/configuration.action.edit.php:680
+#: include/views/configuration.action.edit.php:1000
+#: include/views/configuration.discovery.edit.php:55
 #: include/views/configuration.maintenance.edit.php:132
 msgid "New"
 msgstr "新的"
 
 #: include/views/configuration.httpconf.edit.php:73
-#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:392
 msgid "New application"
 msgstr "新的應用集"
 
-#: include/views/configuration.action.edit.php:307
+#: include/views/configuration.action.edit.php:352
 msgid "New condition"
 msgstr "新的觸發條件"
 
-#: jsLoader.php:150
+#: jsLoader.php:151
 msgid "New element"
 msgstr "新的組件"
 
@@ -9398,16 +9650,16 @@ msgstr "新的組件"
 msgid "New flexible interval"
 msgstr "新的彈性區間"
 
-#: include/views/configuration.host.edit.php:204
-#: include/views/configuration.template.edit.php:122
+#: include/views/configuration.host.edit.php:215
+#: include/views/configuration.template.edit.php:119
 msgid "New group"
 msgstr "新的群組"
 
-#: include/views/configuration.host.massupdate.php:124
+#: include/views/configuration.host.massupdate.php:142
 msgid "New host group"
 msgstr "新的主機群組"
 
-#: popup_bitem.php:96
+#: popup_bitem.php:102
 msgid "New item for the graph"
 msgstr "此圖形的新項目"
 
@@ -9415,83 +9667,99 @@ msgstr "此圖形的新項目"
 msgid "New media"
 msgstr "新的示警媒介"
 
-#: adm.regexps.php:208
+#: adm.regexps.php:216
 msgid "New regular expression"
 msgstr "新的正規表示式"
 
-#: include/views/configuration.services.edit.php:265
+#: include/views/configuration.services.edit.php:264
 msgid "New service time"
 msgstr "新的服務時間"
 
-#: include/setup.inc.php:118
+#: include/classes/setup/CSetupWizard.php:118
 msgid "Next"
 msgstr "下一步"
 
-#: include/func.inc.php:1779
+#: include/func.inc.php:1537
 msgctxt "page navigation"
 msgid "Next"
 msgstr "次"
 
-#: events.php:751 include/events.inc.php:355 include/events.inc.php:373
-#: include/func.inc.php:2255 include/triggers.inc.php:1664
+#: events.php:817 include/events.inc.php:355 include/events.inc.php:373
+#: include/func.inc.php:2013 include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:76
 #: include/views/administration.users.list.php:79
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:142
 msgid "No"
 msgstr "不"
 
-#: api/classes/CGraphPrototype.php:41
+#: include/classes/api/services/CGraphPrototype.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
 msgstr ""
 
-#: api/classes/CGraph.php:41
+#: include/classes/api/services/CGraph.php:41
 #, c-format
 msgid "No \"%1$s\" given for graph."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:457
+#: include/classes/api/services/CHostPrototype.php:457
 #, c-format
 msgid "No \"%1$s\" given for host prototype."
 msgstr ""
 
-#: api/classes/CScreen.php:460
+#: include/classes/api/services/CScreen.php:470
 #, c-format
 msgid "No \"%1$s\" given for screen."
 msgstr ""
 
-#: api/classes/CTemplateScreen.php:574
+#: include/classes/api/services/CTemplateScreen.php:596
 #, c-format
 msgid "No \"%1$s\" given for template screen."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:885
+#: include/classes/api/services/CHttpTest.php:309
+#, c-format
+msgid "No \"%1$s\" given for web scenario."
+msgstr ""
+
+#: include/classes/api/services/CAction.php:2074
+#, c-format
+msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:895
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:208
+#: include/classes/api/services/CHostPrototype.php:208
 #, c-format
 msgid "No \"%2$s\" given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:853
+#: include/classes/api/services/CAction.php:2024
+#, c-format
+msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:863
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:1602
+#: include/classes/import/CXmlImport18.php:1884
 #, c-format
 msgid "No \"ymax_type\" field for graph \"%s\"."
 msgstr "圖形 \"%s\"並無欄位 \"ymax_type\"."
 
-#: include/classes/import/CXmlImport18.php:1598
+#: include/classes/import/CXmlImport18.php:1880
 #, c-format
 msgid "No \"ymin_type\" field for graph \"%s\"."
 msgstr "圖形 \"%s\"並無欄位 \"ymin_type\"."
 
-#: include/views/configuration.host.edit.php:379
-#: include/views/configuration.host.prototype.edit.php:144
+#: include/views/configuration.host.edit.php:388
+#: include/views/configuration.host.prototype.edit.php:143
 msgid "No IPMI interfaces found."
 msgstr ""
 
@@ -9499,25 +9767,25 @@ msgstr ""
 msgid "No IT services found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:366
-#: include/views/configuration.host.prototype.edit.php:131
+#: include/views/configuration.host.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:130
 msgid "No JMX interfaces found."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:357
+#: include/classes/api/services/CItemGeneral.php:357
 msgid "No SNMP OID specified."
 msgstr ""
 
-#: api/classes/CItemGeneral.php:363
+#: include/classes/api/services/CItemGeneral.php:363
 msgid "No SNMP community specified."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:353
-#: include/views/configuration.host.prototype.edit.php:118
+#: include/views/configuration.host.edit.php:362
+#: include/views/configuration.host.prototype.edit.php:117
 msgid "No SNMP interfaces found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:525
+#: include/classes/api/services/CScreenItem.php:557
 msgid "No URL provided for screen element."
 msgstr "沒有提供URL給篩選組件"
 
@@ -9543,8 +9811,8 @@ msgstr ""
 msgid "No actions found."
 msgstr "沒有發現動作"
 
-#: include/views/configuration.host.edit.php:339
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.edit.php:348
+#: include/views/configuration.host.prototype.edit.php:103
 msgid "No agent interfaces found."
 msgstr ""
 
@@ -9554,7 +9822,7 @@ msgid "No application with ID \"%1$s\"."
 msgstr "沒有ID為\"%1$s\"的應用集."
 
 #: include/views/configuration.application.list.php:57
-#: include/views/configuration.httpconf.edit.php:69 popup.php:959
+#: include/views/configuration.httpconf.edit.php:69 popup.php:1227
 msgid "No applications found."
 msgstr ""
 
@@ -9562,30 +9830,31 @@ msgstr ""
 msgid "No audit log entries found."
 msgstr ""
 
-#: api/classes/CAction.php:1330
+#: include/classes/api/services/CAction.php:1333
 #, c-format
 msgid "No authentication type specified for action operation command \"%s\"."
 msgstr "沒有指定給動作操作命令\"%s\"的認證類型."
 
-#: api/classes/CAction.php:1334 api/classes/CAction.php:1348
+#: include/classes/api/services/CAction.php:1337
+#: include/classes/api/services/CAction.php:1351
 #, c-format
 msgid "No authentication user name specified for action operation command \"%s\"."
 msgstr "沒有指定給動作操作命令\"%s\"的認證用戶名稱."
 
-#: api/classes/CItemGeneral.php:334
+#: include/classes/api/services/CItemGeneral.php:334
 msgid "No authentication user name specified."
 msgstr "沒有指定的認證用戶名稱"
 
-#: api/classes/CAction.php:1317
+#: include/classes/api/services/CAction.php:1320
 msgid "No command specified for action operation."
 msgstr "沒有指定給動作操作的命令."
 
-#: api/classes/CAction.php:1312
+#: include/classes/api/services/CAction.php:1315
 msgid "No command type specified for action operation."
 msgstr "沒有指定給動作操作的命令類型."
 
 #: include/views/configuration.action.edit.php:69
-#: include/views/configuration.action.edit.php:881
+#: include/views/configuration.action.edit.php:945
 msgid "No conditions defined."
 msgstr "沒有已定義的條件."
 
@@ -9594,27 +9863,27 @@ msgstr "沒有已定義的條件."
 msgid "No data collection"
 msgstr "沒有數據收集"
 
-#: popup_trexpr.php:511
+#: popup_trexpr.php:501
 msgid "No data received during period of time T, then N = 1, 0 - otherwise"
 msgstr ""
 
-#: popup_trexpr.php:516
+#: popup_trexpr.php:506
 msgid "No data received during period of time T, then N NOT 1, 0 - otherwise"
 msgstr ""
 
-#: api/classes/CHostInterface.php:782
+#: include/classes/api/services/CHostInterface.php:811
 #, c-format
 msgid "No default interface for \"%1$s\" type on \"%2$s\"."
 msgstr "\"%2$s\"上之\"%1$s\"類型無預設介面."
 
-#: include/views/configuration.services.edit.php:90
-#: include/views/configuration.triggers.edit.php:273
-#: include/views/configuration.triggers.massupdate.php:84
+#: include/views/configuration.services.edit.php:89
+#: include/views/configuration.triggers.edit.php:279
+#: include/views/configuration.triggers.massupdate.php:83
 msgid "No dependencies defined."
 msgstr "沒有已定義的相依關係."
 
-#: api/rpc/class.cjsonrpc.php:195 api/rpc/class.cjsonrpc.php:200
-#: api/rpc/class.cjsonrpc.php:205
+#: include/classes/core/CJsonRpc.php:195 include/classes/core/CJsonRpc.php:200
+#: include/classes/core/CJsonRpc.php:205
 msgid "No details"
 msgstr "沒有細節"
 
@@ -9622,39 +9891,39 @@ msgstr "沒有細節"
 msgid "No discovered devices found."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:112
+#: include/classes/api/services/CHostPrototype.php:112
 #, c-format
 msgid "No discovery rule ID given for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:463
+#: include/classes/api/services/CDiscoveryRule.php:473
 msgid "No discovery rule IDs given."
 msgstr "沒有所稱的探索規則ID"
 
 #: include/views/configuration.discovery.list.php:37
-#: include/views/configuration.host.discovery.list.php:42 popup.php:1316
-#: popup.php:1337
+#: include/views/configuration.host.discovery.list.php:42 popup.php:1630
+#: popup.php:1651
 msgid "No discovery rules found."
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:172
+#: include/views/configuration.triggers.edit.php:178
 msgid "No errors found."
 msgstr "沒有找到錯誤."
 
-#: include/blocks.inc.php:1072 include/blocks.inc.php:1313 tr_status.php:786
+#: include/blocks.inc.php:1078 include/blocks.inc.php:1317 tr_status.php:710
 msgid "No events"
 msgstr "沒有事件"
 
-#: events.php:409 include/blocks.inc.php:992
+#: events.php:410 include/blocks.inc.php:998
 #: include/classes/screens/CScreenEvents.php:37 include/events.inc.php:191
 msgid "No events found."
 msgstr ""
 
-#: acknow.php:83
+#: acknow.php:82
 msgid "No events to acknowledge"
 msgstr "沒有事件可知悉"
 
-#: api/classes/CAction.php:1325
+#: include/classes/api/services/CAction.php:1328
 #, c-format
 msgid "No execution target specified for action operation command \"%s\"."
 msgstr "沒有指定給動作操作命令\"%s\"的執行目標."
@@ -9669,7 +9938,7 @@ msgstr "沒有檔案上載."
 msgid "No flexible intervals defined."
 msgstr "並無定義的的彈性區間"
 
-#: api/classes/CScreenItem.php:480
+#: include/classes/api/services/CScreenItem.php:492
 msgid "No graph ID provided for screen element."
 msgstr "沒有提供圖形ID給篩選組件."
 
@@ -9678,7 +9947,11 @@ msgstr "沒有提供圖形ID給篩選組件."
 msgid "No graph item with graphid \"%s\"."
 msgstr "沒有圖形ID\"%s\"的圖形項目."
 
-#: include/views/configuration.graph.list.php:73
+#: include/classes/api/services/CScreenItem.php:501
+msgid "No graph prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.graph.list.php:73 popup.php:1300
 msgid "No graph prototypes found."
 msgstr ""
 
@@ -9687,48 +9960,49 @@ msgid "No graphs added."
 msgstr ""
 
 #: include/views/configuration.graph.list.php:73
-#: include/views/monitoring.charts.php:77 popup.php:999
+#: include/views/monitoring.charts.php:77 popup.php:1300
 msgid "No graphs found."
 msgstr ""
 
-#: api/classes/CHost.php:584 api/classes/CHost.php:594
+#: include/classes/api/services/CHost.php:594
+#: include/classes/api/services/CHost.php:604
 #, c-format
 msgid "No groups for host \"%s\"."
 msgstr "沒有主機[%s]的群組"
 
-#: api/classes/CHost.php:959
+#: include/classes/api/services/CHost.php:941
 msgid "No groups for hosts."
 msgstr "沒有主機群組"
 
-#: api/classes/CTemplate.php:397
+#: include/classes/api/services/CTemplate.php:407
 #, c-format
 msgid "No groups for template \"%1$s\"."
 msgstr ""
 
-#: api/classes/CTemplate.php:945
+#: include/classes/api/services/CTemplate.php:976
 msgid "No groups for template."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:466
+#: include/classes/api/services/CDiscoveryRule.php:476
 msgid "No host IDs given."
 msgstr "沒有所知的主機IDs"
 
-#: api/classes/CUserMacro.php:633
+#: include/classes/api/services/CUserMacro.php:633
 #, c-format
 msgid "No host given for macro \"%1$s\"."
 msgstr "沒有所知的巨集\"%1$s\"的主機."
 
-#: api/classes/CHostPrototype.php:240
+#: include/classes/api/services/CHostPrototype.php:240
 msgid "No host group ID for group prototype."
 msgstr ""
 
-#: api/classes/CScreenItem.php:463
+#: include/classes/api/services/CScreenItem.php:474
 msgid "No host group ID provided for screen element."
 msgstr "沒有提供主機群組給篩選組件"
 
-#: include/blocks.inc.php:274 include/blocks.inc.php:459
-#: include/views/configuration.hostgroups.list.php:47 popup_right.php:50
-#: search.php:283
+#: include/blocks.inc.php:274 include/blocks.inc.php:464
+#: include/views/configuration.hostgroups.list.php:47 popup.php:886
+#: popup_right.php:50 search.php:283
 msgid "No host groups found."
 msgstr ""
 
@@ -9741,17 +10015,22 @@ msgstr "沒有含群組ID\"%s\"的主機群組."
 msgid "No host prototypes found."
 msgstr ""
 
+#: include/classes/screens/CScreenUrl.php:37
+msgid "No host selected."
+msgstr ""
+
 #: include/hosts.inc.php:536
 #, c-format
 msgid "No host with hostid \"%s\"."
 msgstr "沒有含主機ID\"%s\"的主機."
 
-#: hostinventoriesoverview.php:88 hosts.php:832
-#: include/views/inventory.host.list.php:72 search.php:129
+#: hostinventoriesoverview.php:95 hosts.php:858
+#: include/views/inventory.host.list.php:72 popup.php:735 popup.php:810
+#: search.php:129
 msgid "No hosts found."
 msgstr ""
 
-#: api/classes/CMapElement.php:70
+#: include/classes/api/services/CMapElement.php:70
 #, c-format
 msgid "No icon for map element \"%s\"."
 msgstr "沒有對應組件\"%s\"的圖示."
@@ -9770,33 +10049,40 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:96
 #: include/views/configuration.item.edit.php:102
-#: include/views/configuration.item.massupdate.php:77 jsLoader.php:227
+#: include/views/configuration.item.massupdate.php:77 jsLoader.php:231
 msgid "No interface found"
 msgstr "沒有找到介面"
 
-#: api/classes/CItemGeneral.php:263
+#: include/classes/api/services/CItemGeneral.php:263
 msgid "No interface found."
 msgstr "沒有找到介面."
 
-#: api/classes/CProxy.php:248 api/classes/CProxy.php:254
+#: include/classes/api/services/CProxy.php:248
+#: include/classes/api/services/CProxy.php:254
 #, c-format
 msgid "No interface provided for proxy \"%s\"."
 msgstr ""
 
-#: api/classes/CHost.php:588 api/classes/CHost.php:606
+#: include/classes/api/services/CHost.php:598
+#: include/classes/api/services/CHost.php:616
 #, c-format
 msgid "No interfaces for host \"%s\"."
 msgstr "沒有主機\"%s\"的介面."
 
-#: api/classes/CScreenItem.php:489 api/classes/CScreenItem.php:498
+#: include/classes/api/services/CScreenItem.php:521
+#: include/classes/api/services/CScreenItem.php:530
 msgid "No item ID provided for screen element."
 msgstr "沒有提供項目給篩選組件."
 
-#: popup.php:624
+#: popup.php:953
 msgid "No item keys found."
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:43 popup.php:866
+#: include/classes/api/services/CScreenItem.php:511
+msgid "No item prototype ID provided for screen element."
+msgstr ""
+
+#: include/views/configuration.item.prototype.list.php:43 popup.php:1092
 msgid "No item prototypes found."
 msgstr ""
 
@@ -9815,7 +10101,7 @@ msgid "No items defined."
 msgstr "沒有已定義的項目."
 
 #: include/items.inc.php:697 include/views/configuration.item.list.php:58
-#: include/views/monitoring.overview.php:114 popup.php:756
+#: include/views/monitoring.overview.items.php:95 popup.php:1092
 msgid "No items found."
 msgstr ""
 
@@ -9831,7 +10117,7 @@ msgstr ""
 msgid "No maintenance periods found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:507
+#: include/classes/api/services/CScreenItem.php:539
 msgid "No map ID provided for screen element."
 msgstr "沒有提供拓墣圖ID給篩選組件."
 
@@ -9840,15 +10126,15 @@ msgid "No maps added."
 msgstr ""
 
 #: include/views/configuration.sysmap.list.php:40
-#: include/views/monitoring.maps.php:23 popup.php:1099
+#: include/views/monitoring.maps.php:23 popup.php:1413
 msgid "No maps found."
 msgstr ""
 
-#: include/classes/class.cmultiselect.php:51 jsLoader.php:172
+#: include/classes/html/CMultiSelect.php:50 jsLoader.php:173
 msgid "No matches found"
 msgstr ""
 
-#: include/views/administration.users.edit.php:177
+#: include/views/administration.users.edit.php:179
 msgid "No media found."
 msgstr ""
 
@@ -9860,133 +10146,178 @@ msgstr ""
 msgid "No notifications found."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:322
+#: include/views/configuration.action.edit.php:367
 msgid "No operations defined."
 msgstr ""
 
-#: include/classes/import/CConfigurationImport.php:999
-#: include/classes/import/CConfigurationImport.php:1116
-#: include/classes/import/CXmlImport18.php:1583
+#: include/classes/import/CXmlImport18.php:1865
 #, c-format
 msgid "No permission for graph \"%1$s\"."
 msgstr "不具圖形 \"%1$s\"的許可權."
 
-#: include/classes/import/CXmlImport18.php:994
+#: include/classes/import/CXmlImport18.php:1003
 #, c-format
 msgid "No permission for host \"%1$s\"."
 msgstr "不具主機 \"%1$s\"的許可權."
 
-#: include/classes/import/CXmlImport18.php:1547
+#: include/classes/import/CXmlImport18.php:1823
 #, c-format
 msgid "No permission for item \"%1$s\"."
 msgstr "無項目\"%s\"的許可權"
 
-#: include/classes/import/CXmlImport18.php:1178
+#: include/classes/import/CXmlImport18.php:1482
 #, c-format
 msgid "No permission for template \"%1$s\"."
 msgstr "沒有模板\"%s\"的許可權"
 
-#: include/classes/import/CXmlImport18.php:1458
+#: include/classes/import/CXmlImport18.php:1731
 #, c-format
-msgid "No permission for trigger \"%s\"."
-msgstr "不具觸發器 \"%s\"的許可權."
+msgid "No permission for trigger \"%1$s\"."
+msgstr ""
 
 #: slides.php:91
 msgid "No permissions"
 msgstr "沒有許可權"
 
-#: include/classes/import/CXmlImport18.php:1055
+#: include/classes/import/CXmlImport18.php:1097
 #, c-format
-msgid "No permissions for group \"%1$s\"."
-msgstr "不具群組 \"%1$s\"的許可權."
+msgid "No permissions for host group \"%1$s\"."
+msgstr ""
 
-#: include/classes/import/CXmlImport18.php:695
+#: include/classes/import/CXmlImport18.php:682
 #, c-format
 msgid "No permissions for map \"%1$s\"."
 msgstr "不具拓墣圖\"%1$s\"的許可權."
 
-#: include/classes/import/CXmlImport18.php:455
+#: include/classes/import/CXmlImport18.php:441
 #, c-format
 msgid "No permissions for screen \"%1$s\"."
 msgstr "不具篩選 \"%1$s\"的許可權."
 
-#: api/classes/CUser.php:1002 api/classes/CUser.php:1129
+#: include/classes/api/services/CUser.php:996
+#: include/classes/api/services/CUser.php:1125
 msgid "No permissions for system access."
 msgstr "沒有系統存取的許可權"
 
-#: api/classes/CAction.php:609 api/classes/CAction.php:1264
-#: api/classes/CApplication.php:293 api/classes/CApplication.php:300
-#: api/classes/CApplication.php:406 api/classes/CApplication.php:479
-#: api/classes/CApplication.php:492 api/classes/CDiscoveryRule.php:377
-#: api/classes/CDiscoveryRule.php:471 api/classes/CDiscoveryRule.php:476
-#: api/classes/CDRule.php:193 api/classes/CDRule.php:728
-#: api/classes/CEvent.php:640 api/classes/CGraphGeneral.php:66
-#: api/classes/CGraphGeneral.php:88 api/classes/CGraph.php:671
-#: api/classes/CGraphPrototype.php:656 api/classes/CGraphPrototype.php:718
-#: api/classes/CHostBase.php:45 api/classes/CHostGeneral.php:140
-#: api/classes/CHostGroup.php:456 api/classes/CHostGroup.php:528
-#: api/classes/CHostGroup.php:713 api/classes/CHostGroup.php:775
-#: api/classes/CHostGroup.php:829 api/classes/CHostGroup.php:838
-#: api/classes/CHostGroup.php:861 api/classes/CHostInterface.php:261
-#: api/classes/CHostInterface.php:277 api/classes/CHostInterface.php:418
-#: api/classes/CHostInterface.php:629 api/classes/CHost.php:516
-#: api/classes/CHost.php:599 api/classes/CHost.php:1647
-#: api/classes/CHostPrototype.php:1019 api/classes/CHostPrototype.php:1034
-#: api/classes/CHostPrototype.php:1047 api/classes/CHostPrototype.php:1060
-#: api/classes/CHttpTest.php:366 api/classes/CIconMap.php:304
-#: api/classes/CImage.php:206 api/classes/CImage.php:320
-#: api/classes/CImage.php:435 api/classes/CItemGeneral.php:181
-#: api/classes/CItemGeneral.php:234 api/classes/CItem.php:627
-#: api/classes/CItemPrototype.php:459 api/classes/CMaintenance.php:285
-#: api/classes/CMaintenance.php:310 api/classes/CMaintenance.php:323
-#: api/classes/CMaintenance.php:431 api/classes/CMaintenance.php:448
-#: api/classes/CMaintenance.php:516 api/classes/CMapElement.php:60
-#: api/classes/CMapElement.php:119 api/classes/CMapElement.php:190
-#: api/classes/CMap.php:357 api/classes/CProxy.php:161
-#: api/classes/CProxy.php:202 api/classes/CProxy.php:275
-#: api/classes/CProxy.php:536 api/classes/CScreenItem.php:360
-#: api/classes/CScreenItem.php:443 api/classes/CScreen.php:418
-#: api/classes/CScreen.php:593 api/classes/CService.php:1252
-#: api/classes/CService.php:1267 api/classes/CTemplateScreen.php:546
-#: api/classes/CTemplateScreen.php:597 api/classes/CTemplateScreen.php:649
-#: api/classes/CTemplateScreen.php:655 api/classes/CTrigger.php:592
-#: api/classes/CTrigger.php:935 api/classes/CTrigger.php:956
-#: api/classes/CTrigger.php:1821 api/classes/CTriggerPrototype.php:504
-#: api/classes/CTriggerPrototype.php:592 api/classes/CUserMacro.php:540
-#: api/classes/CUserMacro.php:649 api/classes/CUser.php:625
-#: api/classes/CUser.php:804 api/classes/CUser.php:824
-#: api/classes/CUser.php:883 api/classes/CUser.php:1277
-#: include/func.inc.php:1895
+#: include/classes/api/services/CAction.php:1259
+#: include/classes/api/services/CAction.php:2219
+#: include/classes/api/services/CApplication.php:303
+#: include/classes/api/services/CApplication.php:310
+#: include/classes/api/services/CApplication.php:416
+#: include/classes/api/services/CApplication.php:489
+#: include/classes/api/services/CApplication.php:502
+#: include/classes/api/services/CDiscoveryRule.php:387
+#: include/classes/api/services/CDiscoveryRule.php:481
+#: include/classes/api/services/CDiscoveryRule.php:486
+#: include/classes/api/services/CDRule.php:202
+#: include/classes/api/services/CDRule.php:494
+#: include/classes/api/services/CDRule.php:795
+#: include/classes/api/services/CEvent.php:640
+#: include/classes/api/services/CGraphGeneral.php:66
+#: include/classes/api/services/CGraphGeneral.php:88
+#: include/classes/api/services/CGraph.php:702
+#: include/classes/api/services/CGraphPrototype.php:674
+#: include/classes/api/services/CGraphPrototype.php:736
+#: include/classes/api/services/CHostBase.php:45
+#: include/classes/api/services/CHostGeneral.php:140
+#: include/classes/api/services/CHostGroup.php:474
+#: include/classes/api/services/CHostGroup.php:546
+#: include/classes/api/services/CHostGroup.php:731
+#: include/classes/api/services/CHostGroup.php:793
+#: include/classes/api/services/CHostGroup.php:847
+#: include/classes/api/services/CHostGroup.php:856
+#: include/classes/api/services/CHostGroup.php:879
+#: include/classes/api/services/CHostInterface.php:264
+#: include/classes/api/services/CHostInterface.php:280
+#: include/classes/api/services/CHostInterface.php:423
+#: include/classes/api/services/CHostInterface.php:639
+#: include/classes/api/services/CHost.php:526
+#: include/classes/api/services/CHost.php:609
+#: include/classes/api/services/CHost.php:1634
+#: include/classes/api/services/CHostPrototype.php:1019
+#: include/classes/api/services/CHostPrototype.php:1034
+#: include/classes/api/services/CHostPrototype.php:1047
+#: include/classes/api/services/CHostPrototype.php:1060
+#: include/classes/api/services/CHttpTest.php:369
+#: include/classes/api/services/CHttpTest.php:451
+#: include/classes/api/services/CHttpTest.php:497
+#: include/classes/api/services/CHttpTest.php:707
+#: include/classes/api/services/CIconMap.php:304
+#: include/classes/api/services/CImage.php:410
+#: include/classes/api/services/CImage.php:482
+#: include/classes/api/services/CImage.php:529
+#: include/classes/api/services/CImage.php:547
+#: include/classes/api/services/CItemGeneral.php:181
+#: include/classes/api/services/CItemGeneral.php:234
+#: include/classes/api/services/CItem.php:630
+#: include/classes/api/services/CItemPrototype.php:469
+#: include/classes/api/services/CMaintenance.php:290
+#: include/classes/api/services/CMaintenance.php:315
+#: include/classes/api/services/CMaintenance.php:328
+#: include/classes/api/services/CMaintenance.php:456
+#: include/classes/api/services/CMaintenance.php:473
+#: include/classes/api/services/CMaintenance.php:563
+#: include/classes/api/services/CMapElement.php:60
+#: include/classes/api/services/CMapElement.php:119
+#: include/classes/api/services/CMapElement.php:190
+#: include/classes/api/services/CMap.php:367
+#: include/classes/api/services/CProxy.php:161
+#: include/classes/api/services/CProxy.php:202
+#: include/classes/api/services/CProxy.php:275
+#: include/classes/api/services/CProxy.php:536
+#: include/classes/api/services/CScreenItem.php:362
+#: include/classes/api/services/CScreenItem.php:452
+#: include/classes/api/services/CScreen.php:428
+#: include/classes/api/services/CScreen.php:603
+#: include/classes/api/services/CService.php:1051
+#: include/classes/api/services/CService.php:1066
+#: include/classes/api/services/CTemplateScreen.php:568
+#: include/classes/api/services/CTemplateScreen.php:619
+#: include/classes/api/services/CTemplateScreen.php:671
+#: include/classes/api/services/CTemplateScreen.php:677
+#: include/classes/api/services/CTrigger.php:593
+#: include/classes/api/services/CTrigger.php:929
+#: include/classes/api/services/CTrigger.php:950
+#: include/classes/api/services/CTrigger.php:1853
+#: include/classes/api/services/CTriggerPrototype.php:504
+#: include/classes/api/services/CTriggerPrototype.php:592
+#: include/classes/api/services/CUserMacro.php:540
+#: include/classes/api/services/CUserMacro.php:649
+#: include/classes/api/services/CUser.php:619
+#: include/classes/api/services/CUser.php:798
+#: include/classes/api/services/CUser.php:818
+#: include/classes/api/services/CUser.php:877
+#: include/classes/api/services/CUser.php:1282 include/func.inc.php:1653
 msgid "No permissions to referred object or it does not exist!"
 msgstr "沒有所說的物件的許可權或其不存在!"
 
-#: api/classes/CAction.php:1342
+#: include/classes/api/services/CAction.php:1345
 #, c-format
 msgid "No private key file specified for action operation command \"%s\"."
 msgstr "沒有指定給動作操作命令\"%s\"的私有金鑰."
 
-#: api/classes/CItemGeneral.php:342
+#: include/classes/api/services/CItemGeneral.php:342
 msgid "No private key file specified."
 msgstr "沒有指定的私有金鑰."
 
-#: include/views/administration.proxy.list.php:37 popup.php:1363
+#: include/views/administration.proxy.list.php:37 popup.php:1677
 msgid "No proxies found."
 msgstr ""
 
-#: include/views/configuration.discovery.edit.php:44
+#: include/views/configuration.discovery.edit.php:43
 msgid "No proxy"
 msgstr "沒有系統代理程式"
 
-#: api/classes/CAction.php:1339
+#: include/classes/api/services/CAction.php:1342
 #, c-format
 msgid "No public key file specified for action operation command \"%s\"."
 msgstr "沒有指定給動作操作命令\"%s\"的公開金鑰檔."
 
-#: api/classes/CItemGeneral.php:339
+#: include/classes/api/services/CItemGeneral.php:339
 msgid "No public key file specified."
 msgstr "沒有指定的公開金鑰檔"
 
-#: api/classes/CAction.php:1304
+#: include/classes/api/services/CAction.php:1307
 msgid "No recipients for action operation message."
 msgstr "沒有動作操作訊息的收受者."
 
@@ -9994,7 +10325,7 @@ msgstr "沒有動作操作訊息的收受者."
 msgid "No regular expressions found."
 msgstr ""
 
-#: api/classes/CScreenItem.php:515
+#: include/classes/api/services/CScreenItem.php:547
 msgid "No screen ID provided for screen element."
 msgstr "沒有提供篩選ID給篩選組件."
 
@@ -10002,82 +10333,83 @@ msgstr "沒有提供篩選ID給篩選組件."
 msgid "No screens added."
 msgstr ""
 
-#: include/classes/screens/CScreenBuilder.php:267
+#: include/classes/screens/CScreenBuilder.php:299
 #: include/views/configuration.screen.list.php:48
 #: include/views/monitoring.hostscreen.php:32
-#: include/views/monitoring.screen.php:35 popup.php:1233 popup.php:1290
+#: include/views/monitoring.screen.php:35 popup.php:1546 popup.php:1603
 msgid "No screens found."
 msgstr ""
 
-#: api/classes/CAction.php:1353
+#: include/classes/api/services/CAction.php:1356
 msgid "No script specified for action operation command."
 msgstr "沒有指定給動作操作命令的腳本."
 
-#: include/views/administration.script.list.php:35 popup.php:1389
+#: include/views/administration.script.list.php:35 popup.php:1703
 msgid "No scripts found."
 msgstr ""
 
 #: include/views/configuration.slideconf.list.php:37
-#: include/views/monitoring.slides.php:110
+#: include/views/monitoring.slides.php:106
 msgid "No slide shows found."
 msgstr ""
 
-#: include/views/monitoring.slides.php:97 popup.php:1170
+#: include/views/monitoring.slides.php:93 popup.php:1483
 msgid "No slides found."
 msgstr ""
 
-#: api/classes/CProxy.php:216
+#: include/classes/api/services/CProxy.php:216
 msgid "No status for proxy."
 msgstr ""
 
-#: triggers.php:314
+#: triggers.php:323
 msgid "No target selected"
 msgstr "沒有選擇目標"
 
-#: graphs.php:360 items.php:722
+#: graphs.php:377 items.php:746
 msgid "No target selected."
 msgstr "沒有已選的目標"
 
-#: search.php:403 templates.php:492
+#: popup.php:660 search.php:403 templates.php:506
 msgid "No templates found."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:650
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:232
-#: include/views/configuration.template.edit.php:388
+#: include/views/configuration.host.edit.php:677
+#: include/views/configuration.host.prototype.edit.php:213
+#: include/views/configuration.host.prototype.edit.php:237
+#: include/views/configuration.template.edit.php:407
 msgid "No templates linked."
 msgstr ""
 
-#: include/views/configuration.services.edit.php:130
+#: include/views/configuration.services.edit.php:129
 msgid "No times defined. Work 24x7."
 msgstr "沒有已定義的時間. 工作24x7."
 
-#: include/views/monitoring.overview.php:67
+#: include/views/monitoring.overview.triggers.php:61
 msgid "No trigger"
 msgstr "沒有觸發器"
 
-#: include/triggers.inc.php:271
+#: include/triggers.inc.php:259
 #, c-format
 msgid "No trigger with triggerid \"%1$s\"."
 msgstr "沒有含觸發器ID\"%1$s\"的觸發器."
 
-#: chart4.php:40 tr_comments.php:41
+#: chart4.php:40 tr_comments.php:42
 msgid "No triggers defined."
 msgstr "沒有已定義的觸發器."
 
-#: include/triggers.inc.php:1247
-#: include/views/configuration.triggers.list.php:104 popup.php:644
-#: report2.php:391 report5.php:56 tr_status.php:382
+#: include/triggers.inc.php:1069
+#: include/views/configuration.triggers.list.php:97
+#: include/views/monitoring.overview.triggers.php:116 popup.php:973
+#: report2.php:392 report5.php:56 tr_status.php:297
 msgid "No triggers found."
 msgstr "每有找到觸發器."
 
-#: include/views/administration.usergroups.list.php:42 popup.php:503
+#: include/views/administration.usergroups.list.php:42 popup.php:534
 #: popup_usrgrp.php:86
 msgid "No user groups found."
 msgstr ""
 
-#: include/views/administration.users.list.php:51 popup.php:560
+#: include/views/administration.users.list.php:51 popup.php:591
 msgid "No users found."
 msgstr ""
 
@@ -10086,57 +10418,58 @@ msgid "No value maps found."
 msgstr ""
 
 #: include/classes/screens/CScreenHistory.php:160
-#: include/classes/screens/CScreenHistory.php:266
+#: include/classes/screens/CScreenHistory.php:270
 #: include/classes/screens/CScreenPlainText.php:41
-#: include/classes/screens/CScreenPlainText.php:63 latest.php:311
+#: include/classes/screens/CScreenPlainText.php:63 latest.php:322
 msgid "No values found."
 msgstr "沒有發現有值"
 
-#: httpmon.php:82 include/blocks.inc.php:1161
+#: httpmon.php:89 include/blocks.inc.php:1166
 #: include/views/configuration.httpconf.list.php:58
 msgid "No web scenarios found."
 msgstr ""
 
 #: adm.other.php:89 include/hosts.inc.php:38 include/httptest.inc.php:27
-#: include/services.inc.php:308
+#: include/services.inc.php:274
 #: include/views/administration.general.gui.edit.php:27
 #: include/views/administration.general.other.edit.php:30
-#: include/views/configuration.item.edit.php:402
-#: include/views/configuration.item.edit.php:412
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.edit.php:406
 msgid "None"
 msgstr "無"
 
 #: include/graphs.inc.php:24 include/items.inc.php:180
-#: include/triggers.inc.php:1661 popup.php:1070
+#: include/triggers.inc.php:1484 popup.php:1382
 msgid "Normal"
 msgstr "正常"
 
-#: include/html.inc.php:197
+#: include/html.inc.php:203
 msgid "Normal view"
 msgstr "正常檢視"
 
-#: include/actions.inc.php:232 include/views/configuration.action.edit.php:977
+#: include/actions.inc.php:232
+#: include/views/configuration.action.edit.php:1041
 msgid "Not Ack"
 msgstr "非知悉"
 
-#: include/forms.inc.php:587 include/forms.inc.php:768
+#: include/forms.inc.php:601 include/forms.inc.php:782
 msgid "Not Templated items"
 msgstr "非模板項目"
 
-#: api/classes/CTrigger.php:1460
+#: include/classes/api/services/CTrigger.php:1452
 #, c-format
 msgid "Not all templates are linked to \"%s\"."
 msgstr "並非所有的模板都連結到\"%s\"."
 
-#: api/classes/CUser.php:344
+#: include/classes/api/services/CUser.php:334
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "不允許設定用戶\"guest\"的密碼."
 
-#: include/classes/api/clients/CLocalApiClient.php:119
+#: include/classes/api/clients/CLocalApiClient.php:146
 msgid "Not authorised."
 msgstr ""
 
-#: include/classes/class.chostsinfo.php:119
+#: include/classes/html/CHostsInfo.php:119
 msgid "Not available"
 msgstr "不可用"
 
@@ -10145,7 +10478,7 @@ msgstr "不可用"
 msgid "Not classified"
 msgstr "未分類"
 
-#: include/page_footer.php:84
+#: include/page_footer.php:79
 msgid "Not connected"
 msgstr "未連接"
 
@@ -10158,8 +10491,8 @@ msgstr ""
 msgid "Not supported"
 msgstr "不支持的"
 
-#: include/views/configuration.services.edit.php:132
-#: include/views/configuration.services.edit.php:228
+#: include/views/configuration.services.edit.php:131
+#: include/views/configuration.services.edit.php:227
 #: include/views/configuration.services.parent.list.php:48
 msgid "Note"
 msgstr "備註"
@@ -10172,7 +10505,7 @@ msgstr "備註"
 msgid "Nothing"
 msgstr "空無"
 
-#: include/profiles.inc.php:404
+#: include/profiles.inc.php:142
 msgid "Nothing to do."
 msgstr "無事需做"
 
@@ -10180,87 +10513,87 @@ msgstr "無事需做"
 msgid "Notification report"
 msgstr "警報匯總"
 
-#: include/menu.inc.php:272 report4.php:68 report4.php:119
+#: include/menu.inc.php:264 report4.php:68 report4.php:119
 msgid "Notifications"
 msgstr "警報"
 
-#: include/func.inc.php:259
+#: include/func.inc.php:247
 msgid "Nov"
 msgstr "十一"
 
-#: include/forms.inc.php:1675 include/func.inc.php:139
-#: include/func.inc.php:276 jsLoader.php:121
+#: include/forms.inc.php:1691 include/func.inc.php:127
+#: include/func.inc.php:264 jsLoader.php:122
 msgid "November"
 msgstr "十一月"
 
-#: jsLoader.php:130
+#: jsLoader.php:131
 msgid "Now"
 msgstr "現在"
 
 #: include/classes/items/CHelpItems.php:165
-#: include/classes/items/CHelpItems.php:423
+#: include/classes/items/CHelpItems.php:427
 msgid "Number of available proccessors."
 msgstr ""
 
-#: include/blocks.inc.php:811 include/blocks.inc.php:813
+#: include/blocks.inc.php:817 include/blocks.inc.php:819
 msgid "Number of hosts (enabled/disabled/templates)"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:285
-#: include/classes/items/CHelpItems.php:543
+#: include/classes/items/CHelpItems.php:547
 msgid "Number of inodes for a given volume. If mode is missing total is used."
 msgstr ""
 
-#: include/blocks.inc.php:820
+#: include/blocks.inc.php:826
 msgid "Number of items (enabled/disabled/not supported)"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:827
+#: include/classes/items/CHelpItems.php:839
 msgid "Number of items in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:847
+#: include/classes/items/CHelpItems.php:859
 msgid "Number of items in proxy history that are not yet sent to the server"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:851
+#: include/classes/items/CHelpItems.php:863
 msgid "Number of items in the queue which are delayed by from to to seconds, inclusive."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:823
+#: include/classes/items/CHelpItems.php:835
 msgid "Number of monitored hosts"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:141
-#: include/classes/items/CHelpItems.php:399
+#: include/classes/items/CHelpItems.php:403
 msgid "Number of processes. <name> and <user> same as in proc.mem item. <state> all (default), run, sleep, zomb. <cmdline> filter by command line (supports regex). Example: proc.num[apache2,www-data]. On Windows, only <name> and <user> are supported."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:639
+#: include/classes/items/CHelpItems.php:647
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:643
+#: include/classes/items/CHelpItems.php:651
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:699
+#: include/classes/items/CHelpItems.php:707
 msgid "Number of processors on VMware virtual machine, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: popup_trexpr.php:479
+#: popup_trexpr.php:469
 msgid "Number of seconds since the Epoch is < N"
 msgstr "自Epoch起的秒數是 < N"
 
-#: popup_trexpr.php:487
+#: popup_trexpr.php:477
 msgid "Number of seconds since the Epoch is = N"
 msgstr "自Epoch起的秒數是 = N"
 
-#: popup_trexpr.php:483
+#: popup_trexpr.php:473
 msgid "Number of seconds since the Epoch is > N"
 msgstr "自Epoch起的秒數是 > N"
 
-#: popup_trexpr.php:491
+#: popup_trexpr.php:481
 msgid "Number of seconds since the Epoch is NOT N"
 msgstr "自Epoch起的秒數不是 N"
 
@@ -10268,88 +10601,88 @@ msgstr "自Epoch起的秒數不是 N"
 msgid "Number of status changes"
 msgstr "狀態改變次數"
 
-#: httpmon.php:86 include/views/configuration.httpconf.list.php:63
+#: httpmon.php:93 include/views/configuration.httpconf.list.php:65
 msgid "Number of steps"
 msgstr "Number of steps"
 
-#: popup_trexpr.php:211
+#: popup_trexpr.php:201
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:221
+#: popup_trexpr.php:211
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is = N"
 msgstr ""
 
-#: popup_trexpr.php:216
+#: popup_trexpr.php:206
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is > N"
 msgstr ""
 
-#: popup_trexpr.php:226
+#: popup_trexpr.php:216
 msgid "Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N"
 msgstr ""
 
-#: include/blocks.inc.php:829
+#: include/blocks.inc.php:835
 msgid "Number of triggers (enabled/disabled [problem/ok])"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:871
+#: include/classes/items/CHelpItems.php:883
 msgid "Number of triggers in Zabbix database."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:831
+#: include/classes/items/CHelpItems.php:843
 msgid "Number of unsupported items in Zabbix database."
 msgstr ""
 
-#: include/blocks.inc.php:839
+#: include/blocks.inc.php:845
 msgid "Number of users (online)"
 msgstr "用戶數(線上)"
 
 #: include/classes/items/CHelpItems.php:241
-#: include/classes/items/CHelpItems.php:499
+#: include/classes/items/CHelpItems.php:503
 msgid "Number of users connected. Command who is used on agent side."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:799
+#: include/classes/items/CHelpItems.php:807
 msgid "Number of values stored in table HISTORY."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:803
+#: include/classes/items/CHelpItems.php:811
 msgid "Number of values stored in table HISTORY_LOG."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:807
+#: include/classes/items/CHelpItems.php:815
 msgid "Number of values stored in table HISTORY_STR."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:811
+#: include/classes/items/CHelpItems.php:819
 msgid "Number of values stored in table HISTORY_TEXT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:815
+#: include/classes/items/CHelpItems.php:823
 msgid "Number of values stored in table HISTORY_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:863
+#: include/classes/items/CHelpItems.php:875
 msgid "Number of values stored in table TRENDS."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:867
+#: include/classes/items/CHelpItems.php:879
 msgid "Number of values stored in table TRENDS_UINT."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:691
+#: include/classes/items/CHelpItems.php:699
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
 #: include/forms.inc.php:402 include/items.inc.php:123
-#: include/triggers.inc.php:2255 include/views/configuration.item.edit.php:212
+#: include/triggers.inc.php:2065 include/views/configuration.item.edit.php:212
 #: include/views/configuration.item.massupdate.php:209
 msgid "Numeric (float)"
 msgstr "數字的 (浮點)"
 
-#: include/triggers.inc.php:2254 include/triggers.inc.php:2270
-#: include/triggers.inc.php:2274 include/triggers.inc.php:2284
-#: include/triggers.inc.php:2289 include/triggers.inc.php:2293
+#: include/triggers.inc.php:2064 include/triggers.inc.php:2080
+#: include/triggers.inc.php:2084 include/triggers.inc.php:2094
+#: include/triggers.inc.php:2099 include/triggers.inc.php:2103
 msgid "Numeric (integer 64bit)"
 msgstr "數字的(64位元整數)"
 
@@ -10364,16 +10697,18 @@ msgid "OEM"
 msgstr "OEM"
 
 #: chart4.php:159 chart5.php:192 httpdetails.php:149 httpdetails.php:238
-#: httpmon.php:160 include/classes/tree/CServiceTree.php:45
-#: include/maps.inc.php:453 include/maps.inc.php:535 include/maps.inc.php:625
-#: include/maps.inc.php:715 include/setup.inc.php:198
-#: include/setup.inc.php:239 include/setup.inc.php:351
-#: include/setup.inc.php:515 include/triggers.inc.php:166
-#: include/views/monitoring.overview.php:41
+#: httpmon.php:167 include/classes/setup/CSetupWizard.php:198
+#: include/classes/setup/CSetupWizard.php:239
+#: include/classes/setup/CSetupWizard.php:351
+#: include/classes/setup/CSetupWizard.php:516
+#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:470
+#: include/maps.inc.php:552 include/maps.inc.php:642 include/maps.inc.php:732
+#: include/triggers.inc.php:154
+#: include/views/monitoring.overview.triggers.php:38
 msgid "OK"
 msgstr "正常"
 
-#: include/views/monitoring.overview.php:70
+#: include/views/monitoring.overview.items.php:39
 msgid "OK or no trigger"
 msgstr ""
 
@@ -10389,8 +10724,7 @@ msgstr "OOP路由器"
 msgid "OOB subnet mask"
 msgstr "OOB子網遮罩"
 
-#: include/triggers.inc.php:1718
-#: include/views/configuration.triggers.edit.php:113 tr_logform.php:295
+#: tr_logform.php:263
 msgid "OR"
 msgstr "OR"
 
@@ -10410,11 +10744,12 @@ msgstr "作業系統( 簡)"
 msgid "OTHER CONFIGURATION PARAMETERS"
 msgstr "其它組態參數"
 
-#: include/views/monitoring.overview.php:77
+#: include/views/monitoring.overview.items.php:45
+#: include/views/monitoring.overview.triggers.php:67
 msgid "OVERVIEW"
 msgstr "概覽"
 
-#: include/func.inc.php:258
+#: include/func.inc.php:246
 msgid "Oct"
 msgstr "十月"
 
@@ -10422,25 +10757,25 @@ msgstr "十月"
 msgid "Octal"
 msgstr "八進位"
 
-#: include/forms.inc.php:1670 include/func.inc.php:138
-#: include/func.inc.php:275 jsLoader.php:120
+#: include/forms.inc.php:1686 include/func.inc.php:126
+#: include/func.inc.php:263 jsLoader.php:121
 msgid "October"
 msgstr "十月"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:137
 msgid "Off"
 msgstr "關"
 
-#: include/actions.inc.php:1076 include/blocks.inc.php:1164
-#: include/classes/class.ctriggersinfo.php:126
-#: include/views/administration.users.list.php:85 report2.php:396
+#: include/actions.inc.php:1076 include/blocks.inc.php:1169
+#: include/classes/html/CTriggersInfo.php:124
+#: include/views/administration.users.list.php:85 report2.php:397
 #: report3.php:83
 msgid "Ok"
 msgstr "正常"
 
 #: include/views/configuration.sysmap.constructor.php:38
-#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:135
+#: include/views/configuration.sysmap.constructor.php:44 jsLoader.php:136
 msgid "On"
 msgstr "開"
 
@@ -10448,111 +10783,114 @@ msgstr "開"
 msgid "On status change triggers blink for"
 msgstr "於狀態改變時, 觸發器因此閃爍於"
 
-#: include/views/administration.users.edit.php:234
+#: include/views/administration.users.edit.php:236
 msgid "Once"
 msgstr "一次"
 
-#: api/classes/CHostGroup.php:791 api/classes/CHostGroup.php:925
+#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:943
 msgid "One of the objects is left without a host group."
 msgstr ""
 
-#: include/forms.inc.php:1616 include/maintenances.inc.php:31
+#: include/forms.inc.php:1632 include/maintenances.inc.php:31
 msgid "One time only"
 msgstr "一次性"
 
-#: include/views/configuration.services.edit.php:148
-#: include/views/configuration.services.edit.php:263
+#: include/views/configuration.services.edit.php:147
+#: include/views/configuration.services.edit.php:262
 msgid "One-time downtime"
 msgstr " 單次停機"
 
-#: api/classes/CUserMacro.php:250
+#: include/classes/api/services/CUserMacro.php:250
 msgid "Only Super Admins can create global macros."
 msgstr "只有超級管理員可以創建全域巨集."
 
-#: api/classes/CHostGroup.php:413
+#: include/classes/api/services/CHostGroup.php:415
 msgid "Only Super Admins can create host groups."
 msgstr "只有超級管理員可以創建主機群組."
 
-#: api/classes/CIconMap.php:151
+#: include/classes/api/services/CIconMap.php:151
 msgid "Only Super Admins can create icon maps."
 msgstr "只有超級管理員可以創建圖示對應."
 
-#: api/classes/CMediatype.php:182
+#: include/classes/api/services/CMediatype.php:182
 msgid "Only Super Admins can create media types."
 msgstr "只有超級管理員可以創建示警媒介類型."
 
-#: api/classes/CUserMacro.php:350
+#: include/classes/api/services/CUserMacro.php:350
 msgid "Only Super Admins can delete global macros."
 msgstr "只有超級管理員可以刪除全域巨集."
 
-#: api/classes/CMediatype.php:295
+#: include/classes/api/services/CMediatype.php:295
 msgid "Only Super Admins can delete media types."
 msgstr "只有超級管理員可以刪除示警媒介類型."
 
-#: api/classes/CUserGroup.php:215 api/classes/CUserGroup.php:266
-#: api/classes/CUserGroup.php:290 api/classes/CUserGroup.php:385
-#: api/classes/CUserGroup.php:609
+#: include/classes/api/services/CUserGroup.php:225
+#: include/classes/api/services/CUserGroup.php:281
+#: include/classes/api/services/CUserGroup.php:305
+#: include/classes/api/services/CUserGroup.php:400
+#: include/classes/api/services/CUserGroup.php:624
 msgid "Only Super Admins can delete user groups."
 msgstr "只有超級管理員可以刪除用戶群組."
 
-#: api/classes/CMediatype.php:233
+#: include/classes/api/services/CMediatype.php:233
 msgid "Only Super Admins can edit media types."
 msgstr "只有超級管理員可以編輯示警媒介類型."
 
-#: api/classes/CUserMacro.php:288
+#: include/classes/api/services/CUserMacro.php:288
 msgid "Only Super Admins can update global macros."
 msgstr "只有超級管理員可以更新全域巨集."
 
-#: api/classes/CIconMap.php:207
+#: include/classes/api/services/CIconMap.php:207
 msgid "Only Super Admins can update icon maps."
 msgstr "只有超級管理員可以更新圖示對應."
 
-#: api/classes/CUser.php:614
+#: include/classes/api/services/CUser.php:608
 msgid "Only Zabbix Admins can add user media."
 msgstr "只有超級管理員可以新增用戶示警媒介."
 
-#: api/classes/CUser.php:792
+#: include/classes/api/services/CUser.php:786
 msgid "Only Zabbix Admins can change user media."
 msgstr "只有超級管理員可以用改變戶示警媒介."
 
-#: api/classes/CUser.php:873
+#: include/classes/api/services/CUser.php:867
 msgid "Only Zabbix Admins can remove user media."
 msgstr "只有超級管理員可以移除用戶示警媒介."
 
-#: api/classes/CHttpTest.php:629
-msgid "Only characters are allowed."
-msgstr "僅能使用字元."
+#: include/classes/api/services/CDRule.php:254
+msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
+msgstr ""
 
-#: include/blocks.inc.php:821
+#: include/blocks.inc.php:827
 msgid "Only items assigned to enabled hosts are counted"
 msgstr "只計算指派給啟用的主機的項目"
 
-#: api/classes/CDRule.php:316
+#: include/classes/api/services/CDRule.php:333
 msgid "Only one check can be unique."
 msgstr "只能一個檢查可為唯一."
 
-#: api/classes/CUserGroup.php:398
+#: include/classes/api/services/CUserGroup.php:413
 msgid "Only one user group name can be changed at a time."
 msgstr "每次僅有一個用戶群組可以被改變."
 
-#: include/services.inc.php:290
+#: include/services.inc.php:256
 #, c-format
 msgid "Only the last 20%% of the indicator is displayed."
 msgstr "只可顯示最近的20%%的指示燈號."
 
-#: api/classes/CEvent.php:636
+#: include/classes/api/services/CEvent.php:636
 msgid "Only trigger events can be acknowledged."
 msgstr ""
 
-#: include/blocks.inc.php:830
+#: include/blocks.inc.php:836
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "只計算指派給啟用的主機的和相依於啟用的項目的觸發器"
 
-#: include/views/configuration.httpconf.edit.php:110
+#: include/views/configuration.httpconf.edit.php:101
 msgid "Opera"
 msgstr "Opera"
 
-#: actionconf.php:268
+#: actionconf.php:273
 #, c-format
 msgid "Operation \"%s\" already exists."
 msgstr "操作\"%s\"已存在."
@@ -10561,28 +10899,28 @@ msgstr "操作\"%s\"已存在."
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "由於未認證的請求, 操作無法完成."
 
-#: include/views/configuration.action.edit.php:989
+#: include/views/configuration.action.edit.php:1053
 msgid "Operation condition"
 msgstr "操作的條件"
 
-#: include/views/configuration.action.edit.php:997
+#: include/views/configuration.action.edit.php:1061
 msgid "Operation details"
 msgstr "操作細節"
 
-#: api/classes/CAction.php:1413
+#: include/classes/api/services/CAction.php:1416
 msgid "Operation has no group to operate."
 msgstr "操作並無群組來操作."
 
-#: api/classes/CAction.php:1421
+#: include/classes/api/services/CAction.php:1424
 msgid "Operation has no template to operate."
 msgstr "操作並無模板來操作."
 
-#: include/views/configuration.action.edit.php:467
-#: include/views/configuration.action.edit.php:473
+#: include/views/configuration.action.edit.php:513
+#: include/views/configuration.action.edit.php:519
 msgid "Operation type"
 msgstr "操作類型"
 
-#: include/views/configuration.action.edit.php:1007
+#: include/views/configuration.action.edit.php:1071
 #: include/views/configuration.action.list.php:53
 msgid "Operations"
 msgstr "操作"
@@ -10591,25 +10929,27 @@ msgstr "操作"
 msgid "Operator"
 msgstr "操作者"
 
-#: include/views/configuration.action.edit.php:112
-#: include/views/configuration.action.edit.php:926
+#: include/triggers.inc.php:1542
+#: include/views/configuration.action.edit.php:121
+#: include/views/configuration.action.edit.php:990
 #: include/views/configuration.host.discovery.edit.php:279
+#: include/views/configuration.triggers.edit.php:119
 msgid "Or"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:62
-#: include/views/configuration.host.massupdate.php:109
-#: include/views/configuration.host.massupdate.php:126
-#: include/views/configuration.host.massupdate.php:137
-#: include/views/configuration.host.massupdate.php:152
-#: include/views/configuration.host.massupdate.php:162
-#: include/views/configuration.host.massupdate.php:198
-#: include/views/configuration.host.massupdate.php:212
-#: include/views/configuration.host.massupdate.php:223
-#: include/views/configuration.host.massupdate.php:232
-#: include/views/configuration.host.massupdate.php:241
-#: include/views/configuration.host.massupdate.php:257
-#: include/views/configuration.host.massupdate.php:288
+#: include/views/configuration.host.massupdate.php:68
+#: include/views/configuration.host.massupdate.php:121
+#: include/views/configuration.host.massupdate.php:144
+#: include/views/configuration.host.massupdate.php:155
+#: include/views/configuration.host.massupdate.php:170
+#: include/views/configuration.host.massupdate.php:183
+#: include/views/configuration.host.massupdate.php:230
+#: include/views/configuration.host.massupdate.php:244
+#: include/views/configuration.host.massupdate.php:255
+#: include/views/configuration.host.massupdate.php:264
+#: include/views/configuration.host.massupdate.php:273
+#: include/views/configuration.host.massupdate.php:289
+#: include/views/configuration.host.massupdate.php:320
 #: include/views/configuration.item.massupdate.php:47
 #: include/views/configuration.item.massupdate.php:81
 #: include/views/configuration.item.massupdate.php:97
@@ -10639,24 +10979,24 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:431
 #: include/views/configuration.item.massupdate.php:449
 #: include/views/configuration.item.massupdate.php:459
-#: include/views/configuration.item.massupdate.php:490
-#: include/views/configuration.item.massupdate.php:535
-#: include/views/configuration.item.massupdate.php:548
-#: include/views/configuration.triggers.massupdate.php:76
-#: include/views/configuration.triggers.massupdate.php:152
+#: include/views/configuration.item.massupdate.php:496
+#: include/views/configuration.item.massupdate.php:547
+#: include/views/configuration.item.massupdate.php:560
+#: include/views/configuration.triggers.massupdate.php:75
+#: include/views/configuration.triggers.massupdate.php:150
 msgid "Original"
 msgstr "原始的"
 
-#: include/classes/core/ZBase.php:240
+#: include/classes/core/ZBase.php:250
 msgid "Original blue"
 msgstr "原始的藍色"
 
 #: adm.gui.php:105 adm.housekeeper.php:136 adm.iconmapping.php:119
-#: adm.images.php:144 adm.macros.php:168 adm.other.php:119 adm.regexps.php:202
+#: adm.images.php:143 adm.macros.php:168 adm.other.php:119 adm.regexps.php:210
 #: adm.triggerdisplayoptions.php:85 adm.triggerseverities.php:91
 #: adm.valuemapping.php:136 adm.workingtime.php:72
-#: include/classes/class.ctweenbox.php:76
-#: include/classes/class.ctweenbox.php:103
+#: include/classes/html/CTweenBox.php:76
+#: include/classes/html/CTweenBox.php:103
 msgid "Other"
 msgstr "其他"
 
@@ -10664,19 +11004,19 @@ msgstr "其他"
 msgid "Other configuration parameters"
 msgstr "其它組態參數"
 
-#: include/reports.inc.php:322
-#: include/views/administration.usergroups.edit.php:55
-#: include/views/configuration.host.edit.php:200
+#: include/reports.inc.php:325
+#: include/views/administration.usergroups.edit.php:54
+#: include/views/configuration.host.edit.php:211
 #: include/views/configuration.maintenance.edit.php:176
-#: include/views/configuration.template.edit.php:117
+#: include/views/configuration.template.edit.php:114
 msgid "Other groups"
 msgstr "其它群組"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Other hosts"
 msgstr "其它主機"
 
-#: include/reports.inc.php:366
+#: include/reports.inc.php:369
 #: include/views/configuration.hostgroups.edit.php:63
 #: include/views/configuration.maintenance.edit.php:168
 msgid "Other hosts | Group"
@@ -10686,21 +11026,21 @@ msgstr "其它主機 | 群組"
 msgid "Other parameters"
 msgstr "其他参數"
 
-#: include/views/configuration.template.edit.php:174
+#: include/views/configuration.template.edit.php:171
 msgid "Other | group"
 msgstr "其它 | 群組"
 
-#: include/views/configuration.httpconf.edit.php:130
+#: include/views/configuration.httpconf.edit.php:121
 msgid "Others"
 msgstr "其它"
 
 #: include/classes/items/CHelpItems.php:93
-#: include/classes/items/CHelpItems.php:351
+#: include/classes/items/CHelpItems.php:355
 msgid "Out-of-window collision. Collisions count."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:320
-#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.edit.php:318
+#: include/views/configuration.item.edit.php:334
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -10713,14 +11053,11 @@ msgstr ""
 msgid "Override item trend period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:329
-#: include/views/configuration.item.edit.php:350
-msgid "Overriden by global housekeeping settings"
-msgstr ""
-
-#: include/menu.inc.php:38 include/menu.inc.php:108
-#: include/views/inventory.host.view.php:246
-#: include/views/monitoring.overview.php:35 overview.php:27 queue.php:69
+#: include/menu.inc.php:37 include/menu.inc.php:105
+#: include/views/inventory.host.view.php:258
+#: include/views/monitoring.overview.items.php:32
+#: include/views/monitoring.overview.triggers.php:34 overview.php:27
+#: queue.php:69
 msgid "Overview"
 msgstr "總覽"
 
@@ -10728,7 +11065,7 @@ msgstr "總覽"
 msgid "Overview by proxy"
 msgstr "依系統代理程式概覽"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgctxt "Peta short"
 msgid "P"
 msgstr "P"
@@ -10737,147 +11074,155 @@ msgstr "P"
 msgid "PERSONAL DASHBOARD"
 msgstr "個人儀表板"
 
-#: include/classes/class.frontendsetup.php:283
+#: include/classes/setup/CFrontendSetup.php:286
 msgid "PHP bcmath"
 msgstr "PHP bcmath"
 
-#: include/classes/class.frontendsetup.php:287
+#: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath extension missing (PHP configuration parameter --enable-bcmath)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:497
+#: include/classes/setup/CFrontendSetup.php:521
 msgid "PHP ctype"
 msgstr "PHP ctype"
 
-#: include/classes/class.frontendsetup.php:501
+#: include/classes/setup/CFrontendSetup.php:525
 msgid "PHP ctype extension missing (PHP configuration parameter --enable-ctype)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:221
+#: include/classes/setup/CFrontendSetup.php:224
 msgid "PHP databases support"
 msgstr "PHP支持的資料庫"
 
-#: include/classes/class.frontendsetup.php:342
+#: include/classes/setup/CFrontendSetup.php:366
 msgid "PHP gd"
 msgstr "PHP gd"
 
-#: include/classes/class.frontendsetup.php:413
+#: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd FreeType support"
 msgstr "支援PHP gd FreeType"
 
-#: include/classes/class.frontendsetup.php:417
+#: include/classes/setup/CFrontendSetup.php:441
 msgid "PHP gd FreeType support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:394
+#: include/classes/setup/CFrontendSetup.php:418
 msgid "PHP gd JPEG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:390
+#: include/classes/setup/CFrontendSetup.php:414
 msgid "PHP gd JPEG support"
 msgstr "支援PHP gd JPEG"
 
-#: include/classes/class.frontendsetup.php:369
+#: include/classes/setup/CFrontendSetup.php:393
 msgid "PHP gd PNG image support missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:365
+#: include/classes/setup/CFrontendSetup.php:389
 msgid "PHP gd PNG support"
 msgstr "支援PHP gd PNG"
 
-#: include/classes/class.frontendsetup.php:346
+#: include/classes/setup/CFrontendSetup.php:370
 msgid "PHP gd extension missing (PHP configuration parameter --with-gd)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:548
+#: include/classes/setup/CFrontendSetup.php:572
 msgid "PHP gettext"
 msgstr "PHP gettext"
 
-#: include/classes/class.frontendsetup.php:552
+#: include/classes/setup/CFrontendSetup.php:576
 msgid "PHP gettext extension missing (PHP configuration parameter --with-gettext). Translations will not be available."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:436
+#: include/classes/setup/CFrontendSetup.php:460
 msgid "PHP libxml"
 msgstr "PHP libxml"
 
-#: include/classes/class.frontendsetup.php:440
+#: include/classes/setup/CFrontendSetup.php:464
 msgid "PHP libxml extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:300
+#: include/classes/setup/CFrontendSetup.php:303
 msgid "PHP mbstring"
 msgstr "PHP mbstring"
 
-#: include/classes/class.frontendsetup.php:304
+#: include/classes/setup/CFrontendSetup.php:307
 msgid "PHP mbstring extension missing (PHP configuration parameter --enable-mbstring)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:164
+#: include/classes/setup/CFrontendSetup.php:324
+msgid "PHP mbstring.func_overload"
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:167
 msgid "PHP option max_execution_time"
 msgstr "PHP選項max_execution_time"
 
-#: include/classes/class.frontendsetup.php:181
+#: include/classes/setup/CFrontendSetup.php:184
 msgid "PHP option max_input_time"
 msgstr "PHP選項max_input_time"
 
-#: include/classes/class.frontendsetup.php:113
+#: include/classes/setup/CFrontendSetup.php:116
 msgid "PHP option memory_limit"
 msgstr "PHP選項memory_limit"
 
-#: include/classes/class.frontendsetup.php:130
+#: include/classes/setup/CFrontendSetup.php:133
 msgid "PHP option post_max_size"
 msgstr "PHP選項post_max_size"
 
-#: include/classes/class.frontendsetup.php:147
+#: include/classes/setup/CFrontendSetup.php:150
 msgid "PHP option upload_max_filesize"
 msgstr "PHP選項upload_max_filesize"
 
-#: include/classes/class.frontendsetup.php:514
+#: include/classes/setup/CFrontendSetup.php:538
 msgid "PHP session"
 msgstr "PHP session"
 
-#: include/classes/class.frontendsetup.php:531
+#: include/classes/setup/CFrontendSetup.php:555
 msgid "PHP session auto start"
 msgstr "PHP連線期自動啟動"
 
-#: include/classes/class.frontendsetup.php:535
+#: include/classes/setup/CFrontendSetup.php:559
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:518
+#: include/classes/setup/CFrontendSetup.php:542
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:317
+#: include/classes/setup/CFrontendSetup.php:341
 msgid "PHP sockets"
 msgstr "PHP sockets"
 
-#: include/classes/class.frontendsetup.php:321
+#: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:198
+#: include/classes/setup/CFrontendSetup.php:328
+msgid "PHP string function overloading must be disabled."
+msgstr ""
+
+#: include/classes/setup/CFrontendSetup.php:201
 msgid "PHP time zone"
 msgstr "PHP時區"
 
-#: include/classes/class.frontendsetup.php:95
+#: include/classes/setup/CFrontendSetup.php:98
 msgid "PHP version"
 msgstr "PHP版本"
 
-#: include/classes/class.frontendsetup.php:470
+#: include/classes/setup/CFrontendSetup.php:494
 msgid "PHP xmlreader"
 msgstr "PHP xmlreader"
 
-#: include/classes/class.frontendsetup.php:474
+#: include/classes/setup/CFrontendSetup.php:498
 msgid "PHP xmlreader extension missing."
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:453
+#: include/classes/setup/CFrontendSetup.php:477
 msgid "PHP xmlwriter"
 msgstr "PHP xmlwriter"
 
-#: include/classes/class.frontendsetup.php:457
+#: include/classes/setup/CFrontendSetup.php:481
 msgid "PHP xmlwriter extension missing."
 msgstr ""
 
@@ -10886,32 +11231,34 @@ msgstr ""
 msgid "POP"
 msgstr "POP"
 
-#: chart5.php:196 include/maps.inc.php:437 include/triggers.inc.php:167
-#: include/views/monitoring.overview.php:45
+#: chart5.php:196 include/maps.inc.php:454 include/triggers.inc.php:155
+#: include/views/monitoring.overview.items.php:37
+#: include/views/monitoring.overview.triggers.php:40
 msgid "PROBLEM"
 msgstr "問題"
 
-#: include/validate.inc.php:547
+#: include/validate.inc.php:545
 msgid "Page received incorrect data"
 msgstr "頁面接收到不正確的資料"
 
-#: include/reports.inc.php:435
+#: include/reports.inc.php:438
 msgid "Palette"
 msgstr "Palette"
 
-#: include/reports.inc.php:425 include/reports.inc.php:426
-#: include/reports.inc.php:427 include/reports.inc.php:428
+#: include/reports.inc.php:428 include/reports.inc.php:429
+#: include/reports.inc.php:430 include/reports.inc.php:431
 #, c-format
 msgid "Palette #%1$s"
 msgstr "Palette #%1$s"
 
-#: include/blocks.inc.php:798
-#: include/views/configuration.screen.constructor.edit.php:182
-#: include/views/configuration.screen.constructor.edit.php:206
-#: include/views/configuration.screen.constructor.edit.php:258
-#: include/views/configuration.screen.constructor.edit.php:413
-#: include/views/configuration.screen.constructor.edit.php:496
-#: popup_bitem.php:42 popup_bitem.php:141
+#: include/blocks.inc.php:804
+#: include/views/configuration.screen.constructor.edit.php:234
+#: include/views/configuration.screen.constructor.edit.php:282
+#: include/views/configuration.screen.constructor.edit.php:308
+#: include/views/configuration.screen.constructor.edit.php:360
+#: include/views/configuration.screen.constructor.edit.php:533
+#: include/views/configuration.screen.constructor.edit.php:622
+#: popup_bitem.php:42 popup_bitem.php:151
 msgid "Parameter"
 msgstr "参數"
 
@@ -10920,7 +11267,7 @@ msgstr "参數"
 msgid "Parent discovery rules"
 msgstr "上層探索規則"
 
-#: include/views/configuration.graph.edit.php:51
+#: include/views/configuration.graph.edit.php:50
 msgid "Parent graphs"
 msgstr ""
 
@@ -10940,33 +11287,33 @@ msgstr "上層觸發器"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: api/classes/CImage.php:247
+#: include/classes/api/services/CImage.php:238
 #, c-format
 msgid "Parse SQL error [%1$s] in [%2$s]."
 msgstr "解析SQL錯誤[%1$s]於[%2$s]之中."
 
-#: api/rpc/class.cjsonrpc.php:169
+#: include/classes/core/CJsonRpc.php:169
 msgid "Parse error"
 msgstr "解析錯誤"
 
-#: include/views/administration.proxy.edit.php:43
+#: include/views/administration.proxy.edit.php:42
 #: include/views/administration.proxy.list.php:90
 msgid "Passive"
 msgstr "被動式"
 
-#: httpconf.php:55 include/setup.inc.php:326
-#: include/views/administration.mediatypes.edit.php:82
-#: include/views/administration.mediatypes.edit.php:86
-#: include/views/administration.users.edit.php:84
-#: include/views/administration.users.edit.php:102
-#: include/views/administration.users.edit.php:106
-#: include/views/configuration.action.edit.php:706
-#: include/views/configuration.action.edit.php:739
+#: httpconf.php:55 include/classes/setup/CSetupWizard.php:326
+#: include/views/administration.mediatypes.edit.php:81
+#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.users.edit.php:83
+#: include/views/administration.users.edit.php:101
+#: include/views/administration.users.edit.php:105
+#: include/views/configuration.action.edit.php:752
+#: include/views/configuration.action.edit.php:785
 #: include/views/configuration.host.discovery.edit.php:164
 #: include/views/configuration.host.discovery.edit.php:176
-#: include/views/configuration.host.edit.php:749
-#: include/views/configuration.host.prototype.edit.php:266
-#: include/views/configuration.httpconf.edit.php:83
+#: include/views/configuration.host.edit.php:780
+#: include/views/configuration.host.prototype.edit.php:277
+#: include/views/configuration.httpconf.edit.php:159
 #: include/views/configuration.item.edit.php:170
 #: include/views/configuration.item.edit.php:182
 #: include/views/configuration.item.massupdate.php:246
@@ -10976,20 +11323,21 @@ msgstr "被動式"
 msgid "Password"
 msgstr "密碼"
 
-#: include/views/administration.users.edit.php:88
+#: include/views/administration.users.edit.php:87
 msgid "Password (once again)"
 msgstr "確認密碼"
 
-#: users.php:165
+#: users.php:166
 #, c-format
 msgid "Password is unavailable for users with %1$s."
 msgstr ""
 
-#: api/classes/CMediatype.php:198 api/classes/CMediatype.php:262
+#: include/classes/api/services/CMediatype.php:198
+#: include/classes/api/services/CMediatype.php:262
 msgid "Password required for media type."
 msgstr "示警媒介類型所需的密碼."
 
-#: profile.php:120 users.php:201
+#: profile.php:120 users.php:202
 msgid "Password should not be empty"
 msgstr "密碼不能為空"
 
@@ -10998,21 +11346,21 @@ msgstr "密碼不能為空"
 msgid "Peak memory usage: %s"
 msgstr "高峰記憶體用量: %s"
 
-#: graphs.php:53 include/views/configuration.graph.edit.php:80
+#: graphs.php:53 include/views/configuration.graph.edit.php:84
 msgid "Percentile line (left)"
 msgstr "百分比線(左)"
 
-#: graphs.php:54 include/views/configuration.graph.edit.php:90
+#: graphs.php:54 include/views/configuration.graph.edit.php:100
 msgid "Percentile line (right)"
 msgstr "百分比線(右)"
 
 #: include/classes/items/CHelpItems.php:85
-#: include/classes/items/CHelpItems.php:343
+#: include/classes/items/CHelpItems.php:347
 msgid "Performs a DNS query. On success returns a character string with the required type of information."
 msgstr ""
 
-#: include/reports.inc.php:77 include/reports.inc.php:206
-#: include/reports.inc.php:379
+#: include/reports.inc.php:78 include/reports.inc.php:208
+#: include/reports.inc.php:382
 #: include/views/configuration.host.discovery.edit.php:198
 #: include/views/configuration.host.discovery.edit.php:233
 #: include/views/configuration.item.edit.php:265
@@ -11020,12 +11368,12 @@ msgstr ""
 #: include/views/configuration.item.massupdate.php:321
 #: include/views/configuration.item.massupdate.php:362
 #: include/views/configuration.maintenance.edit.php:102 popup_period.php:25
-#: popup_period.php:88 popup_period.php:122 report2.php:380 report3.php:62
+#: popup_period.php:95 popup_period.php:135 report2.php:381 report3.php:62
 #: report4.php:102 report6.php:56 srv_status.php:159
 msgid "Period"
 msgstr "期間"
 
-#: include/forms.inc.php:1621
+#: include/forms.inc.php:1637
 #: include/views/configuration.maintenance.edit.php:100
 msgid "Period type"
 msgstr "期間類型"
@@ -11035,24 +11383,24 @@ msgstr "期間類型"
 msgid "Periods"
 msgstr "期間"
 
-#: include/views/administration.usergroups.edit.php:129
-#: include/views/administration.users.edit.php:369
+#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.users.edit.php:371
 msgid "Permissions"
 msgstr "許可權"
 
-#: include/views/administration.users.edit.php:367
+#: include/views/administration.users.edit.php:369
 msgid "Permissions can be assigned for user groups only."
 msgstr "許可權只能被指派予用戶群組"
 
-#: include/locales.inc.php:68
+#: include/locales.inc.php:72
 msgid "Persian (fa_IR)"
 msgstr "波斯語 (fa_IR)"
 
-#: include/func.inc.php:680
+#: include/func.inc.php:668
 msgid "Peta"
 msgstr "Peta"
 
-#: include/graphs.inc.php:26 popup.php:1064
+#: include/graphs.inc.php:26 popup.php:1376
 msgid "Pie"
 msgstr "Pie"
 
@@ -11064,55 +11412,56 @@ msgstr "置入演算法"
 msgid "Plain text"
 msgstr "文本"
 
-#: include/views/administration.users.edit.php:249
-#: include/views/administration.users.edit.php:286
+#: include/views/administration.users.edit.php:251
+#: include/views/administration.users.edit.php:288
 msgid "Play"
 msgstr "播放"
 
-#: include/views/administration.users.edit.php:237
+#: include/views/administration.users.edit.php:239
 msgid "Play sound"
 msgstr "播放聲音"
 
-#: include/setup.inc.php:231
+#: include/classes/setup/CSetupWizard.php:231
 msgid "Please correct all issues and press \"Retry\" button"
 msgstr "請修正所有的議題並按下\"再試\"按鈕"
 
-#: scripts.php:95
+#: scripts.php:88
 msgid "Please enter confirmation text."
 msgstr "請輸入確認文字."
 
-#: jsLoader.php:146
+#: jsLoader.php:147
 msgid "Please select two elements"
 msgstr "請選擇兩組件"
 
-#: include/locales.inc.php:69
+#: include/locales.inc.php:73
 msgid "Polish (pl_PL)"
 msgstr "波蘭(pl_PL)"
 
-#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.edit.php:425
 msgid "Populates host inventory field"
 msgstr "填入主機資產紀錄欄位"
 
 #: authentication.php:40 disc_prototypes.php:82 host_discovery.php:85
-#: hosts.php:807 include/forms.inc.php:470 include/setup.inc.php:379
+#: hosts.php:833 include/classes/setup/CSetupWizard.php:379
+#: include/forms.inc.php:470
 #: include/views/administration.authentication.edit.php:71
-#: include/views/administration.proxy.edit.php:57
-#: include/views/configuration.action.edit.php:753
+#: include/views/administration.proxy.edit.php:56
+#: include/views/configuration.action.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:154
-#: include/views/configuration.host.edit.php:244
-#: include/views/configuration.host.edit.php:331
-#: include/views/configuration.host.prototype.edit.php:96
+#: include/views/configuration.host.edit.php:253
+#: include/views/configuration.host.edit.php:340
+#: include/views/configuration.host.prototype.edit.php:95
 #: include/views/configuration.item.edit.php:160
 #: include/views/configuration.item.massupdate.php:199
 #: include/views/inventory.host.view.php:96
 #: include/views/inventory.host.view.php:115
 #: include/views/inventory.host.view.php:135
-#: include/views/inventory.host.view.php:154 items.php:89 items.php:153
-#: setup.php:50
+#: include/views/inventory.host.view.php:154 items.php:89 items.php:158
+#: setup.php:48
 msgid "Port"
 msgstr "埠"
 
-#: api/classes/CHostInterface.php:613
+#: include/classes/api/services/CHostInterface.php:623
 msgid "Port cannot be empty for host interface."
 msgstr "主機介面的埠不能是空白."
 
@@ -11120,51 +11469,51 @@ msgstr "主機介面的埠不能是空白."
 msgid "Port range"
 msgstr "埠範圍"
 
-#: include/locales.inc.php:70
+#: include/locales.inc.php:74
 msgid "Portuguese (pt_BR)"
 msgstr "波蘭語 (pt_BR)"
 
-#: include/locales.inc.php:71
+#: include/locales.inc.php:75
 msgid "Portuguese (pt_PT)"
 msgstr ""
 
-#: tr_logform.php:307
+#: tr_logform.php:276
 msgid "Position"
 msgstr "位置"
 
-#: include/views/configuration.httpconf.popup.php:79
+#: include/views/configuration.httpconf.popup.php:88
 msgid "Post"
 msgstr "貼上"
 
 #: include/views/administration.general.iconmap.edit.php:64
 #: include/views/administration.general.iconmap.edit.php:102
 #: include/views/administration.general.iconmap.edit.php:130
-#: include/views/configuration.graph.edit.php:294
+#: include/views/configuration.graph.edit.php:304
 msgid "Preview"
 msgstr "預覽"
 
-#: include/setup.inc.php:138
+#: include/classes/setup/CSetupWizard.php:138
 msgid "Previous"
 msgstr "前"
 
-#: include/func.inc.php:1752
+#: include/func.inc.php:1510
 msgctxt "page navigation"
 msgid "Previous"
 msgstr "前"
 
-#: popup_trexpr.php:299
+#: popup_trexpr.php:289
 msgid "Previous value is < N"
 msgstr "前值是 < N"
 
-#: popup_trexpr.php:307
+#: popup_trexpr.php:297
 msgid "Previous value is = N"
 msgstr "前值是 = N"
 
-#: popup_trexpr.php:303
+#: popup_trexpr.php:293
 msgid "Previous value is > N"
 msgstr "前值是 > N"
 
-#: popup_trexpr.php:311
+#: popup_trexpr.php:301
 msgid "Previous value is NOT N"
 msgstr "前值不是 N"
 
@@ -11213,30 +11562,31 @@ msgstr ""
 msgid "Privacy protocol"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:732
+#: include/views/configuration.action.edit.php:778
 #: include/views/configuration.host.discovery.edit.php:173
 #: include/views/configuration.item.edit.php:179
 #: include/views/configuration.item.massupdate.php:280
 msgid "Private key file"
 msgstr "私有金鑰檔"
 
-#: include/views/configuration.host.edit.php:737
-#: include/views/configuration.host.edit.php:745
-#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.edit.php:768
+#: include/views/configuration.host.edit.php:776
+#: include/views/configuration.host.prototype.edit.php:274
 msgid "Privilege level"
 msgstr "優先權層級"
 
-#: api/classes/CUser.php:920
+#: include/classes/api/services/CUser.php:914
 msgid "Probably php-ldap module is missing."
 msgstr "可能的php-ldap模組不存在."
 
-#: include/maps.inc.php:491 include/maps.inc.php:574 include/maps.inc.php:665
-#: include/views/js/configuration.sysmaps.js.php:146 tr_status.php:260
+#: include/maps.inc.php:508 include/maps.inc.php:591 include/maps.inc.php:682
+#: include/views/common.filter.trigger.php:40
+#: include/views/js/configuration.sysmaps.js.php:144
 msgid "Problem"
 msgstr "問題"
 
 #: include/views/configuration.sysmap.edit.php:129
-#: include/views/monitoring.dashconf.php:100
+#: include/views/monitoring.dashconf.php:112
 msgid "Problem display"
 msgstr "問題顯示"
 
@@ -11248,16 +11598,16 @@ msgstr "問題在"
 msgid "Problem time"
 msgstr "問題時間"
 
-#: include/services.inc.php:59
+#: include/services.inc.php:25
 msgid "Problem, if all children have problems"
 msgstr "問題, 如果所有的下層都有問題"
 
-#: include/services.inc.php:58
+#: include/services.inc.php:24
 msgid "Problem, if at least one child has a problem"
 msgstr "問題, 如果至少一個下層有一個問題"
 
-#: chart4.php:163 include/maps.inc.php:485 include/maps.inc.php:568
-#: include/maps.inc.php:659 report2.php:395 report3.php:83
+#: chart4.php:163 include/maps.inc.php:502 include/maps.inc.php:585
+#: include/maps.inc.php:676 report2.php:396 report3.php:83
 msgid "Problems"
 msgstr "問題"
 
@@ -11265,75 +11615,71 @@ msgstr "問題"
 msgid "Profile"
 msgstr "基本資料"
 
-#: popup.php:59
-msgid "Prototypes"
-msgstr "原型"
-
-#: include/menu.inc.php:242 include/views/administration.proxy.list.php:29
-#: popup.php:35
+#: include/menu.inc.php:234 include/views/administration.proxy.list.php:29
+#: popup.php:51
 msgid "Proxies"
 msgstr "系統代理程式"
 
 #: include/actions.inc.php:90 include/audit.inc.php:45
-#: include/views/administration.proxy.edit.php:93 queue.php:149
+#: include/views/administration.proxy.edit.php:92 queue.php:149
 msgid "Proxy"
 msgstr "系統代理程式"
 
-#: include/classes/import/importers/CHostImporter.php:143
+#: include/classes/import/importers/CHostImporter.php:165
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "主機\"%2$s\"的系統代理程式\"%1$s\"不存在."
 
-#: api/classes/CProxy.php:556
+#: include/classes/api/services/CProxy.php:556
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "系統代理程式\"%1$s\"是用在探索規則\"%2$s\"上."
 
-#: api/classes/CProxy.php:239
+#: include/classes/api/services/CProxy.php:239
 #, c-format
 msgid "Proxy \"%s\" already exists."
 msgstr "系統代理程式\"%s\"已存在."
 
-#: proxies.php:115
+#: proxies.php:119
 msgid "Proxy added"
 msgstr "系統代理程式已新增"
 
-#: proxies.php:138 proxies.php:194
+#: proxies.php:144 proxies.php:205
 msgid "Proxy deleted"
 msgstr "系統代理程式已刪除"
 
-#: include/views/administration.proxy.edit.php:88
+#: include/views/administration.proxy.edit.php:87
 msgid "Proxy hosts"
 msgstr "系統代理程式的主機"
 
-#: api/classes/CProxy.php:323
+#: include/classes/api/services/CProxy.php:323
 msgid "Proxy interface creation failed."
 msgstr "系統代理程式介面創建失敗"
 
-#: api/classes/CProxy.php:395
+#: include/classes/api/services/CProxy.php:395
 msgid "Proxy interface update failed."
 msgstr "系統代理程式介面更新失敗"
 
-#: include/views/administration.proxy.edit.php:44
+#: include/views/administration.proxy.edit.php:43
 msgid "Proxy mode"
 msgstr "系統代理程式模式"
 
-#: include/views/administration.proxy.edit.php:38 proxies.php:34
+#: include/views/administration.proxy.edit.php:37 proxies.php:34
 msgid "Proxy name"
 msgstr "系統代理程式名稱"
 
-#: proxies.php:108
+#: proxies.php:112
 msgid "Proxy updated"
 msgstr "系統代理程式已新增"
 
-#: include/views/configuration.action.edit.php:707
+#: include/views/configuration.action.edit.php:753
 #: include/views/configuration.host.discovery.edit.php:165
 #: include/views/configuration.item.edit.php:171
 #: include/views/configuration.item.massupdate.php:247
 msgid "Public key"
 msgstr "公開金鑰"
 
-#: include/views/configuration.action.edit.php:725
+#: include/views/configuration.action.edit.php:771
 #: include/views/configuration.host.discovery.edit.php:170
 #: include/views/configuration.item.edit.php:176
 #: include/views/configuration.item.massupdate.php:270
@@ -11344,7 +11690,7 @@ msgstr "公開金鑰檔"
 msgid "QUEUE OF ITEMS TO BE UPDATED"
 msgstr "項目的隊列將被更新"
 
-#: include/menu.inc.php:268 queue.php:25
+#: include/menu.inc.php:260 queue.php:25
 msgid "Queue"
 msgstr "隊列"
 
@@ -11352,18 +11698,18 @@ msgstr "隊列"
 msgid "RMCP+"
 msgstr "RMCP+"
 
-#: include/views/administration.script.edit.php:94
+#: include/views/administration.script.edit.php:98
 #: include/views/administration.script.list.php:82
 msgid "Read"
 msgstr "讀"
 
 #: include/forms.inc.php:243 include/perm.inc.php:32
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read only"
 msgstr "唯讀"
 
 #: include/forms.inc.php:243 include/perm.inc.php:31
-#: include/views/administration.usergroups.edit.php:82
+#: include/views/administration.usergroups.edit.php:81
 msgid "Read-write"
 msgstr "讀寫"
 
@@ -11375,7 +11721,7 @@ msgstr "理由"
 msgid "Received value"
 msgstr "接收到的值"
 
-#: tr_status.php:259
+#: include/views/common.filter.trigger.php:39
 msgid "Recent problem"
 msgstr ""
 
@@ -11383,11 +11729,11 @@ msgstr ""
 msgid "Recipient"
 msgstr "接收者"
 
-#: include/views/configuration.screen.constructor.edit.php:343
+#: include/views/configuration.screen.constructor.edit.php:457
 msgid "Recipient (ascending)"
 msgstr "接收者(升冪)"
 
-#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:456
 msgid "Recipient (descending)"
 msgstr "接收者(降冪)"
 
@@ -11398,28 +11744,28 @@ msgstr "接收者(降冪)"
 msgid "Recipient(s)"
 msgstr "收件人"
 
-#: include/views/administration.users.edit.php:246
+#: include/views/administration.users.edit.php:248
 msgid "Recovery"
 msgstr "恢復"
 
-#: actionconf.php:50 include/views/configuration.action.edit.php:51
+#: actionconf.php:52 include/views/configuration.action.edit.php:51
 #: include/views/configuration.action.edit.php:54
 msgid "Recovery message"
 msgstr "恢復訊息"
 
-#: actionconf.php:49 include/views/configuration.action.edit.php:53
+#: actionconf.php:51 include/views/configuration.action.edit.php:53
 msgid "Recovery subject"
 msgstr "恢復主旨"
 
-#: include/views/administration.users.edit.php:166 profile.php:53 users.php:64
+#: include/views/administration.users.edit.php:168 profile.php:53 users.php:64
 msgid "Refresh (in seconds)"
 msgstr "刷新(秒計)"
 
-#: jsLoader.php:207
+#: jsLoader.php:211
 msgid "Refresh time"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:212
 msgid "Refresh time multiplier"
 msgstr "刷新時間倍數"
 
@@ -11437,46 +11783,50 @@ msgstr "刷新未支援的監控項目(秒計) \"%1$s\"."
 msgid "Regular expression"
 msgstr "正規表示式"
 
-#: include/regexp.inc.php:56 include/regexp.inc.php:95
+#: include/regexp.inc.php:58 include/regexp.inc.php:99
 #, c-format
 msgid "Regular expression \"%s\" already exists."
 msgstr "正規表示式\"%s\"已存在."
 
-#: popup_trexpr.php:423
+#: popup_trexpr.php:413
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise"
 msgstr "正則表示式V符合期間T的最末值, 則 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:433
+#: popup_trexpr.php:423
 msgid "Regular expression V matching last value in period T, then N = 1, 0 - otherwise (non case-sensitive)"
 msgstr "正則表示式V符合期間T的最末值, 則 N = 1, 0 - 除外 (大小寫不分)"
 
-#: popup_trexpr.php:428
+#: popup_trexpr.php:418
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise"
 msgstr "正則表示式V符合期間T的最末值, 則 N 非 1, 0 - 除外"
 
-#: popup_trexpr.php:438
+#: popup_trexpr.php:428
 msgid "Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)"
 msgstr "正則表示式V符合期間T的最末值, 則 N 非 1, 0 - 除外 (大小寫不分)"
 
-#: adm.regexps.php:132
+#: adm.regexps.php:140
 msgid "Regular expression added"
 msgstr "正規表示式已新增"
 
-#: adm.regexps.php:180
+#: adm.regexps.php:190
 msgid "Regular expression deleted"
 msgid_plural "Regular expressions deleted"
 msgstr[0] "正規表示式已删除"
 
-#: include/regexp.inc.php:79
+#: include/regexp.inc.php:83
 msgid "Regular expression does not exist."
 msgstr "正規表示式不存在"
 
-#: adm.regexps.php:126
+#: adm.regexps.php:67 include/regexp.inc.php:119
+msgid "Regular expression must be a string"
+msgstr ""
+
+#: adm.regexps.php:134
 msgid "Regular expression updated"
 msgstr "正規表示式已更新"
 
 #: adm.gui.php:99 adm.housekeeper.php:130 adm.iconmapping.php:113
-#: adm.images.php:138 adm.macros.php:162 adm.other.php:113 adm.regexps.php:196
+#: adm.images.php:137 adm.macros.php:162 adm.other.php:113 adm.regexps.php:204
 #: adm.triggerdisplayoptions.php:79 adm.triggerseverities.php:85
 #: adm.valuemapping.php:130 adm.workingtime.php:66
 #: include/views/administration.general.regularexpressions.list.php:22
@@ -11493,26 +11843,28 @@ msgstr "遠端命令"
 
 #: include/views/administration.general.iconmap.edit.php:74
 #: include/views/administration.general.iconmap.edit.php:113
+#: include/views/common.filter.trigger.php:126
 #: include/views/common.macros.php:53
-#: include/views/configuration.action.edit.php:99
-#: include/views/configuration.action.edit.php:376
-#: include/views/configuration.action.edit.php:389
-#: include/views/configuration.action.edit.php:910
+#: include/views/configuration.action.edit.php:100
+#: include/views/configuration.action.edit.php:421
+#: include/views/configuration.action.edit.php:434
+#: include/views/configuration.action.edit.php:974
 #: include/views/configuration.host.discovery.edit.php:211
-#: include/views/configuration.host.discovery.edit.php:330
-#: include/views/configuration.httpconf.edit.php:211
+#: include/views/configuration.host.discovery.edit.php:320
+#: include/views/configuration.httpconf.edit.php:249
 #: include/views/configuration.item.edit.php:278
 #: include/views/configuration.item.massupdate.php:334
 #: include/views/configuration.maintenance.edit.php:114
-#: include/views/configuration.services.edit.php:111
-#: include/views/configuration.services.edit.php:163
+#: include/views/configuration.services.edit.php:110
+#: include/views/configuration.services.edit.php:162
 #: include/views/configuration.slideconf.edit.php:68
 #: include/views/configuration.sysmap.edit.php:147
 #: include/views/configuration.sysmap.edit.php:165
-#: include/views/configuration.triggers.edit.php:299
-#: include/views/configuration.triggers.massupdate.php:113
+#: include/views/configuration.triggers.edit.php:305
+#: include/views/configuration.triggers.massupdate.php:112
 #: include/views/js/administration.general.valuemapping.edit.js.php:11
 #: include/views/js/adm.regexprs.edit.js.php:8
+#: include/views/js/common.filter.trigger.js.php:16
 #: include/views/js/common.macros.js.php:15
 #: include/views/js/configuration.action.edit.js.php:9
 #: include/views/js/configuration.action.edit.js.php:21
@@ -11523,21 +11875,19 @@ msgstr "遠端命令"
 #: include/views/js/configuration.discovery.edit.js.php:11
 #: include/views/js/configuration.graph.edit.js.php:90
 #: include/views/js/configuration.host.discovery.edit.js.php:31
-#: include/views/js/configuration.host.edit.js.php:29
+#: include/views/js/configuration.host.edit.js.php:33
 #: include/views/js/configuration.host.prototype.edit.js.php:8
 #: include/views/js/configuration.services.edit.js.php:75
 #: include/views/js/configuration.slideconf.edit.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:204
-#: include/views/js/configuration.sysmaps.js.php:305
-#: include/views/js/configuration.sysmaps.js.php:418
-#: include/views/js/configuration.sysmaps.js.php:463
-#: include/views/js/configuration.sysmaps.js.php:472
-#: include/views/js/monitoring.triggers.js.php:16 jsLoader.php:209
-#: tr_status.php:332
+#: include/views/js/configuration.sysmaps.js.php:202
+#: include/views/js/configuration.sysmaps.js.php:303
+#: include/views/js/configuration.sysmaps.js.php:416
+#: include/views/js/configuration.sysmaps.js.php:461
+#: include/views/js/configuration.sysmaps.js.php:470 jsLoader.php:213
 msgid "Remove"
 msgstr "移除"
 
-#: jsLoader.php:210
+#: jsLoader.php:214
 msgid "Remove all"
 msgstr ""
 
@@ -11545,11 +11895,11 @@ msgstr ""
 msgid "Remove element"
 msgstr "删除組件"
 
-#: slides.php:151
+#: slides.php:152
 msgid "Remove from"
 msgstr "删除自"
 
-#: charts.php:103 history.php:89 include/html.inc.php:176 maps.php:60
+#: charts.php:102 history.php:89 include/html.inc.php:182 maps.php:60
 #: screens.php:110
 msgid "Remove from favourites"
 msgstr "自常用的移除"
@@ -11558,7 +11908,7 @@ msgstr "自常用的移除"
 msgid "Remove from host group"
 msgstr "自主機群組移除"
 
-#: include/actions.inc.php:408 include/views/configuration.action.edit.php:818
+#: include/actions.inc.php:408 include/views/configuration.action.edit.php:873
 msgid "Remove from host groups"
 msgstr "自主機群組移除"
 
@@ -11570,28 +11920,28 @@ msgstr "移除主機"
 msgid "Remove link"
 msgstr "移除連結"
 
-#: include/views/monitoring.history.php:105
+#: include/views/monitoring.history.php:106
 msgid "Remove selected"
 msgstr "移除所選的"
 
-#: include/views/configuration.host.massupdate.php:184
-#: include/views/configuration.triggers.edit.php:120
+#: include/views/configuration.host.massupdate.php:215
+#: include/views/configuration.triggers.edit.php:126
 msgid "Replace"
 msgstr "取代"
 
-#: include/views/configuration.item.massupdate.php:489
+#: include/views/configuration.item.massupdate.php:495
 msgid "Replace applications"
 msgstr ""
 
-#: include/views/configuration.triggers.massupdate.php:146
+#: include/views/configuration.triggers.massupdate.php:144
 msgid "Replace depenencies"
 msgstr "替換相依關係"
 
-#: include/views/configuration.host.massupdate.php:60
+#: include/views/configuration.host.massupdate.php:66
 msgid "Replace host groups"
 msgstr "替換主機群組"
 
-#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:232
+#: chart_bar.php:66 report2.php:193 report5.php:53 report6.php:243
 msgid "Report"
 msgstr "報表"
 
@@ -11599,35 +11949,36 @@ msgstr "報表"
 msgid "Report 1"
 msgstr "報表 1"
 
-#: include/reports.inc.php:142
+#: include/reports.inc.php:143
 msgid "Report 2"
 msgstr "報表 2"
 
-#: include/reports.inc.php:271
+#: include/reports.inc.php:273
 msgid "Report 3"
 msgstr "報表 3"
 
-#: include/menu.inc.php:117 report6.php:229
+#: include/menu.inc.php:114 report6.php:240
 msgid "Reports"
 msgstr "報表"
 
-#: include/setup.inc.php:187 include/views/configuration.httpconf.edit.php:165
+#: include/classes/setup/CSetupWizard.php:187
+#: include/views/configuration.httpconf.edit.php:201
 msgid "Required"
 msgstr "要求的"
 
-#: api/classes/CIconMap.php:402
+#: include/classes/api/services/CIconMap.php:402
 msgid "Required field \"expression\" is missing in icon mapping."
 msgstr "要求的欄位\"表示式\"不存在於圖示對應中."
 
-#: api/classes/CIconMap.php:408
+#: include/classes/api/services/CIconMap.php:408
 msgid "Required field \"iconid\" is missing in icon mapping."
 msgstr "要求的欄位\"iconid\"不存在於圖示對應中."
 
-#: api/classes/CIconMap.php:405
+#: include/classes/api/services/CIconMap.php:405
 msgid "Required field \"inventory_link\" is missing in icon mapping."
 msgstr "要求的欄位\"inventory_link\"不存在於圖示對應中."
 
-#: include/views/administration.script.edit.php:96
+#: include/views/administration.script.edit.php:100
 msgid "Required host permissions"
 msgstr "要求的主機許可權"
 
@@ -11635,29 +11986,31 @@ msgstr "要求的主機許可權"
 msgid "Required performance (vps)"
 msgstr "要求的效能(vps)"
 
-#: include/classes/items/CHelpItems.php:859
+#: include/classes/items/CHelpItems.php:871
 msgid "Required performance of the Zabbix server, in new values per second expected."
 msgstr ""
 
-#: include/blocks.inc.php:840
+#: include/blocks.inc.php:846
 msgid "Required server performance, new values per second"
 msgstr "要求的主機效能, 每秒新值"
 
-#: include/views/configuration.httpconf.popup.php:83
+#: include/views/configuration.httpconf.popup.php:99
 msgid "Required status codes"
 msgstr "要求的狀態碼"
 
-#: include/views/configuration.httpconf.popup.php:82
+#: include/views/configuration.httpconf.popup.php:98
 msgid "Required string"
 msgstr "要求的字串"
 
-#: events.php:400 hosts.php:813 include/forms.inc.php:605
-#: include/html.inc.php:203 include/reports.inc.php:126
-#: include/reports.inc.php:258 include/reports.inc.php:438
+#: events.php:401 hosts.php:839 include/forms.inc.php:619
+#: include/html.inc.php:209 include/reports.inc.php:127
+#: include/reports.inc.php:260 include/reports.inc.php:441
 #: include/views/administration.auditacts.list.php:51
 #: include/views/administration.auditlogs.list.php:67
-#: include/views/inventory.host.list.php:55 latest.php:305 report2.php:384
-#: tr_status.php:346
+#: include/views/common.filter.trigger.php:148
+#: include/views/inventory.host.list.php:55
+#: include/views/monitoring.overview.items.php:83 latest.php:316
+#: report2.php:385
 msgid "Reset"
 msgstr "重設"
 
@@ -11676,9 +12029,9 @@ msgstr "重設所有的名稱和顏色為預設值?"
 msgid "Reset confirmation"
 msgstr "重設確認"
 
-#: include/views/administration.general.housekeeper.edit.php:170
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
+#: include/views/administration.general.housekeeper.edit.php:169
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
 #: include/views/js/administration.general.housekeeper.edit.js.php:43
 #: include/views/js/administration.general.triggerDisplayOptions.js.php:17
 #: include/views/js/administration.general.triggerSeverity.js.php:17
@@ -11691,7 +12044,7 @@ msgstr "已解決"
 
 #: include/views/administration.auditlogs.list.php:63
 #: include/views/administration.auditlogs.list.php:88
-#: include/views/configuration.screen.constructor.edit.php:92
+#: include/views/configuration.screen.constructor.edit.php:94
 #: popup_right.php:24
 msgid "Resource"
 msgstr "資源"
@@ -11706,15 +12059,15 @@ msgstr "回應時間"
 
 #: include/views/administration.general.regularexpressions.edit.php:73
 #: include/views/administration.general.regularexpressions.edit.php:74
-#: tr_testexpr.php:131 tr_testexpr.php:173
+#: tr_testexpr.php:138 tr_testexpr.php:182
 msgid "Result"
 msgstr "結果"
 
-#: include/regexp.inc.php:189 include/views/js/adm.regexprs.edit.js.php:121
+#: include/regexp.inc.php:211 include/views/js/adm.regexprs.edit.js.php:121
 msgid "Result is FALSE"
 msgstr "結果為偽"
 
-#: include/regexp.inc.php:188 include/views/js/adm.regexprs.edit.js.php:118
+#: include/regexp.inc.php:210 include/views/js/adm.regexprs.edit.js.php:118
 msgid "Result is TRUE"
 msgstr "結果為真"
 
@@ -11727,7 +12080,8 @@ msgstr "\"%s\"的結果"
 msgid "Result type"
 msgstr "結果類型"
 
-#: httpconf.php:46 include/views/configuration.httpconf.edit.php:90
+#: httpconf.php:46 include/views/configuration.httpconf.edit.php:81
+#: include/views/configuration.httpconf.list.php:67
 msgid "Retries"
 msgstr ""
 
@@ -11735,60 +12089,69 @@ msgstr ""
 msgid "Retries left"
 msgstr "可試次數"
 
-#: include/setup.inc.php:233 include/setup.inc.php:521
-#: include/views/general.warning.php:42
+#: include/views/configuration.httpconf.popup.php:95
+msgid "Retrieve only headers"
+msgstr ""
+
+#: include/classes/setup/CSetupWizard.php:233
+#: include/classes/setup/CSetupWizard.php:522
+#: include/views/general.warning.php:40
 msgid "Retry"
 msgstr "再試"
 
-#: include/classes/items/CHelpItems.php:583
+#: include/classes/items/CHelpItems.php:591
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:819
+#: include/classes/items/CHelpItems.php:831
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
 msgstr ""
 
+#: include/classes/items/CHelpItems.php:827
+msgid "Returns current maintenance status of the host."
+msgstr ""
+
 #: include/classes/items/CHelpItems.php:233
-#: include/classes/items/CHelpItems.php:491
+#: include/classes/items/CHelpItems.php:495
 msgid "Returns detailed host information. String value"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:177
-#: include/classes/items/CHelpItems.php:435
+#: include/classes/items/CHelpItems.php:439
 msgid "Returns hostname (or NetBIOS name (by default) on Windows). String value. Example of returned value: www.zabbix.com"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:835
+#: include/classes/items/CHelpItems.php:847
 msgid "Returns information associated with Zabbix Java gateway. Valid params are: ping, version."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:579
+#: include/classes/items/CHelpItems.php:587
 msgid "Returns percentage of lost ICMP ping packets."
 msgstr ""
 
-#: include/reports.inc.php:99
-#: include/views/configuration.screen.constructor.edit.php:557
+#: include/reports.inc.php:100
+#: include/views/configuration.screen.constructor.edit.php:700
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.graph.edit.js.php:73
 #: include/views/js/configuration.sysmaps.js.php:85
-#: include/views/js/configuration.sysmaps.js.php:252 popup_bitem.php:154
+#: include/views/js/configuration.sysmaps.js.php:250 popup_bitem.php:164
 msgid "Right"
 msgstr "右"
 
-#: include/locales.inc.php:72
+#: include/locales.inc.php:76
 msgid "Romanian (ro_RO)"
 msgstr ""
 
-#: screenedit.php:241
+#: screenedit.php:263
 msgid "Row added"
 msgstr ""
 
-#: screenedit.php:299
+#: screenedit.php:321
 msgid "Row deleted"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:575
-#: screenedit.php:47
+#: include/views/configuration.screen.constructor.edit.php:718
+#: screenedit.php:74
 msgid "Row span"
 msgstr "行寬度"
 
@@ -11796,11 +12159,11 @@ msgstr "行寬度"
 msgid "Rows"
 msgstr "行"
 
-#: include/views/administration.users.edit.php:167 profile.php:54 users.php:65
+#: include/views/administration.users.edit.php:169 profile.php:54 users.php:65
 msgid "Rows per page"
 msgstr "每頁行數"
 
-#: include/views/conf.import.php:65
+#: include/views/conf.import.php:79
 msgid "Rules"
 msgstr "規則"
 
@@ -11845,20 +12208,20 @@ msgid "Run remote commands on hosts"
 msgstr "於主機上執行遠程命令"
 
 #: include/classes/items/CHelpItems.php:201
-#: include/classes/items/CHelpItems.php:459
+#: include/classes/items/CHelpItems.php:463
 msgid "Run specified command on the host."
 msgstr ""
 
-#: include/locales.inc.php:73
+#: include/locales.inc.php:77
 msgid "Russian (ru_RU)"
 msgstr "俄語 (ru_RU)"
 
-#: jsLoader.php:128
+#: jsLoader.php:129
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:129
+#: jsLoader.php:130
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -11874,7 +12237,7 @@ msgstr "篩選"
 msgid "SEARCH"
 msgstr "搜尋"
 
-#: include/classes/screens/CScreenClock.php:64
+#: include/classes/screens/CScreenClock.php:75
 msgid "SERVER"
 msgstr "伺服器"
 
@@ -11889,13 +12252,13 @@ msgstr ""
 msgid "SLA"
 msgstr "SLA"
 
-#: include/views/monitoring.slides.php:60
-#: include/views/monitoring.slides.php:102
+#: include/views/monitoring.slides.php:56
+#: include/views/monitoring.slides.php:98
 msgid "SLIDE SHOWS"
 msgstr "簡報片展示"
 
 #: include/media.inc.php:26
-#: include/views/administration.mediatypes.edit.php:43
+#: include/views/administration.mediatypes.edit.php:42
 msgid "SMS"
 msgstr "短信"
 
@@ -11904,17 +12267,17 @@ msgstr "短信"
 msgid "SMTP"
 msgstr "SMTP"
 
-#: include/views/administration.mediatypes.edit.php:59
+#: include/views/administration.mediatypes.edit.php:58
 #: include/views/administration.mediatypes.list.php:52
 msgid "SMTP email"
 msgstr "SMTP電郵"
 
-#: include/views/administration.mediatypes.edit.php:58
+#: include/views/administration.mediatypes.edit.php:57
 #: include/views/administration.mediatypes.list.php:51
 msgid "SMTP helo"
 msgstr "SMTP HELO"
 
-#: include/views/administration.mediatypes.edit.php:57
+#: include/views/administration.mediatypes.edit.php:56
 #: include/views/administration.mediatypes.list.php:50
 msgid "SMTP server"
 msgstr "SMTP伺服器"
@@ -11930,7 +12293,7 @@ msgstr "SNMP Key"
 #: disc_prototypes.php:79 host_discovery.php:82 include/forms.inc.php:463
 #: include/views/configuration.host.discovery.edit.php:103
 #: include/views/configuration.item.edit.php:109
-#: include/views/js/configuration.discovery.edit.js.php:427 items.php:87
+#: include/views/js/configuration.discovery.edit.js.php:434 items.php:87
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -11942,9 +12305,9 @@ msgstr "SNMP OID"
 msgid "SNMP community"
 msgstr "SNMP community"
 
-#: include/views/configuration.host.edit.php:276
-#: include/views/configuration.host.edit.php:356
-#: include/views/configuration.host.prototype.edit.php:121
+#: include/views/configuration.host.edit.php:285
+#: include/views/configuration.host.edit.php:365
+#: include/views/configuration.host.prototype.edit.php:120
 #: include/views/inventory.host.view.php:123
 msgid "SNMP interfaces"
 msgstr "SNMP介面"
@@ -11953,7 +12316,7 @@ msgstr "SNMP介面"
 msgid "SNMP trap"
 msgstr "SNMP捉捕"
 
-#: api/classes/CItemGeneral.php:351
+#: include/classes/api/services/CItemGeneral.php:351
 msgid "SNMP trap key is invalid."
 msgstr "SNMP捉捕鍵值是無效的"
 
@@ -11977,7 +12340,7 @@ msgstr "SNMPv3 端點代理程式"
 msgid "SQL count: %s (selects: %s | executes: %s)"
 msgstr "SQL計數: %s (selects: %s | 執行: %s)"
 
-#: include/items.inc.php:1322
+#: include/items.inc.php:1317
 #: include/views/configuration.host.discovery.edit.php:183
 #: include/views/configuration.item.edit.php:189
 msgid "SQL query"
@@ -11995,7 +12358,7 @@ msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQL陳述式執行已失敗: \"%1$s\"."
 
 #: include/discovery.inc.php:56
-#: include/views/configuration.action.edit.php:685
+#: include/views/configuration.action.edit.php:731
 #: include/views/js/configuration.discovery.edit.js.php:182
 msgid "SSH"
 msgstr "SSH"
@@ -12004,15 +12367,35 @@ msgstr "SSH"
 msgid "SSH agent"
 msgstr "SSH 端點代理程式"
 
+#: include/views/configuration.httpconf.edit.php:170
+msgid "SSL certificate file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:176
+msgid "SSL key file"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:182
+msgid "SSL key password"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:166
+msgid "SSL verify host"
+msgstr ""
+
+#: include/views/configuration.httpconf.edit.php:163
+msgid "SSL verify peer"
+msgstr ""
+
 #: include/views/monitoring.discovery.php:28
 msgid "STATUS OF DISCOVERY"
 msgstr "探索的狀態"
 
-#: tr_status.php:241
+#: tr_status.php:235
 msgid "STATUS OF TRIGGERS"
 msgstr "觸發器的狀態"
 
-#: httpmon.php:75
+#: httpmon.php:82
 msgid "STATUS OF WEB MONITORING"
 msgstr "Web監控的狀態"
 
@@ -12020,92 +12403,92 @@ msgstr "Web監控的狀態"
 msgid "STATUS OF ZABBIX"
 msgstr "ZABBIX 狀態"
 
-#: include/views/configuration.httpconf.edit.php:116
+#: include/views/configuration.httpconf.edit.php:107
 msgid "Safari"
 msgstr "Safari"
 
-#: include/func.inc.php:231
+#: include/func.inc.php:219
 msgid "Sat"
 msgstr "六"
 
-#: include/forms.inc.php:1644 include/forms.inc.php:1712
-#: include/func.inc.php:153 include/func.inc.php:243
+#: include/forms.inc.php:1660 include/forms.inc.php:1728
+#: include/func.inc.php:141 include/func.inc.php:231
 msgid "Saturday"
 msgstr "週六"
 
-#: acknow.php:229 include/views/administration.authentication.edit.php:123
-#: include/views/administration.general.gui.edit.php:57
-#: include/views/administration.general.housekeeper.edit.php:170
+#: acknow.php:228 include/views/administration.authentication.edit.php:123
+#: include/views/administration.general.gui.edit.php:56
+#: include/views/administration.general.housekeeper.edit.php:169
 #: include/views/administration.general.iconmap.edit.php:149
+#: include/views/administration.general.image.edit.php:51
 #: include/views/administration.general.image.edit.php:55
-#: include/views/administration.general.image.edit.php:59
 #: include/views/administration.general.macros.edit.php:33
-#: include/views/administration.general.other.edit.php:47
+#: include/views/administration.general.other.edit.php:46
 #: include/views/administration.general.regularexpressions.edit.php:92
-#: include/views/administration.general.triggerDisplayOptions.edit.php:120
-#: include/views/administration.general.triggerSeverity.edit.php:76
-#: include/views/administration.general.valuemapping.edit.php:61
-#: include/views/administration.general.valuemapping.edit.php:69
-#: include/views/administration.general.workingtime.edit.php:35
-#: include/views/administration.mediatypes.edit.php:107
-#: include/views/administration.mediatypes.edit.php:110
-#: include/views/administration.proxy.edit.php:99
-#: include/views/administration.proxy.edit.php:109
-#: include/views/administration.script.edit.php:119
-#: include/views/administration.usergroups.edit.php:137
-#: include/views/administration.usergroups.edit.php:143
-#: include/views/administration.users.edit.php:380
-#: include/views/administration.users.edit.php:384
-#: include/views/administration.users.edit.php:394
-#: include/views/configuration.action.edit.php:1018
+#: include/views/administration.general.triggerDisplayOptions.edit.php:119
+#: include/views/administration.general.triggerSeverity.edit.php:75
+#: include/views/administration.general.valuemapping.edit.php:60
+#: include/views/administration.general.valuemapping.edit.php:68
+#: include/views/administration.general.workingtime.edit.php:33
+#: include/views/administration.mediatypes.edit.php:106
+#: include/views/administration.mediatypes.edit.php:109
+#: include/views/administration.proxy.edit.php:98
+#: include/views/administration.proxy.edit.php:108
+#: include/views/administration.script.edit.php:122
+#: include/views/administration.usergroups.edit.php:136
+#: include/views/administration.usergroups.edit.php:142
+#: include/views/administration.users.edit.php:382
+#: include/views/administration.users.edit.php:386
+#: include/views/administration.users.edit.php:396
+#: include/views/configuration.action.edit.php:1082
 #: include/views/configuration.application.edit.php:52
 #: include/views/configuration.application.edit.php:62
-#: include/views/configuration.discovery.edit.php:90
-#: include/views/configuration.graph.edit.php:298
-#: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.host.edit.php:862
+#: include/views/configuration.discovery.edit.php:89
+#: include/views/configuration.graph.edit.php:308
+#: include/views/configuration.host.discovery.edit.php:360
+#: include/views/configuration.host.edit.php:892
 #: include/views/configuration.hostgroups.edit.php:73
 #: include/views/configuration.hostgroups.edit.php:84
-#: include/views/configuration.host.prototype.edit.php:328
-#: include/views/configuration.httpconf.edit.php:248
-#: include/views/configuration.httpconf.edit.php:259
-#: include/views/configuration.item.edit.php:466
+#: include/views/configuration.host.prototype.edit.php:339
+#: include/views/configuration.httpconf.edit.php:288
+#: include/views/configuration.httpconf.edit.php:299
+#: include/views/configuration.item.edit.php:460
 #: include/views/configuration.maintenance.edit.php:138
 #: include/views/configuration.maintenance.edit.php:193
 #: include/views/configuration.maintenance.edit.php:199
-#: include/views/configuration.screen.constructor.edit.php:595
+#: include/views/configuration.screen.constructor.edit.php:746
 #: include/views/configuration.screen.edit.php:52
-#: include/views/configuration.services.edit.php:294
+#: include/views/configuration.services.edit.php:293
 #: include/views/configuration.slideconf.edit.php:108
 #: include/views/configuration.slideconf.edit.php:114
 #: include/views/configuration.sysmap.constructor.php:62
 #: include/views/configuration.sysmap.edit.php:195
-#: include/views/configuration.template.edit.php:462
-#: include/views/configuration.triggers.edit.php:347
-#: include/views/configuration.triggers.massupdate.php:166
-#: include/views/monitoring.dashconf.php:107
-#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:166
-#: popup_media.php:137 tr_logform.php:374
+#: include/views/configuration.template.edit.php:486
+#: include/views/configuration.triggers.edit.php:353
+#: include/views/configuration.triggers.massupdate.php:164
+#: include/views/monitoring.dashconf.php:119
+#: include/views/monitoring.triggerComment.php:47 popup_bitem.php:176
+#: popup_media.php:137 tr_logform.php:344
 msgid "Save"
 msgstr "存檔"
 
-#: acknow.php:230
+#: acknow.php:229
 msgid "Save and return"
 msgstr "存檔並返回"
 
-#: include/reports.inc.php:65 include/reports.inc.php:387
+#: include/reports.inc.php:66 include/reports.inc.php:390
 msgid "Scale"
 msgstr "Scale"
 
-#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:241
+#: include/audit.inc.php:42 include/views/configuration.httpconf.edit.php:279
 msgid "Scenario"
 msgstr "方案"
 
-#: httpconf.php:185
+#: httpconf.php:197
 msgid "Scenario added"
 msgstr "方案已新增"
 
-#: httpconf.php:180
+#: httpconf.php:192
 msgid "Scenario updated"
 msgstr "方案已更新"
 
@@ -12117,7 +12500,7 @@ msgstr "方案"
 msgid "Schedule"
 msgstr "排程"
 
-#: queue.php:201
+#: queue.php:227
 msgid "Scheduled check"
 msgstr ""
 
@@ -12128,126 +12511,125 @@ msgstr ""
 msgid "Screen"
 msgstr "篩選"
 
-#: include/classes/import/CXmlImport18.php:611
-#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:603
 #, c-format
 msgid "Screen \"%1$s\" added."
 msgstr "篩選 \"%1$s\" 已新增."
 
-#: api/classes/CTemplateScreen.php:673
+#: include/classes/api/services/CTemplateScreen.php:699
 msgid "Screen \"%1$s\" already exists on template \"%2$2\"."
 msgstr "篩選\"%1$s\"已存在於模板\"%2$2\"中."
 
-#: api/classes/CScreen.php:369 api/classes/CScreen.php:442
+#: include/classes/api/services/CScreen.php:379
+#: include/classes/api/services/CScreen.php:452
 #, c-format
 msgid "Screen \"%1$s\" already exists."
 msgstr "篩選\"%1$s\"已存在."
 
-#: api/classes/CScreenItem.php:819 api/classes/CScreenItem.php:843
+#: include/classes/api/services/CScreenItem.php:893
+#: include/classes/api/services/CScreenItem.php:917
 #, c-format
 msgid "Screen \"%1$s\" cell X - %2$s Y - %3$s is already taken."
 msgstr ""
 
-#: api/classes/CScreenItem.php:722
+#: include/classes/api/services/CScreenItem.php:793
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:771
+#: include/classes/api/services/CScreenItem.php:842
 #, c-format
 msgid "Screen \"%1$s\" column span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:708
+#: include/classes/api/services/CScreenItem.php:779
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is incorrect."
 msgstr ""
 
-#: api/classes/CScreenItem.php:758
+#: include/classes/api/services/CScreenItem.php:829
 #, c-format
 msgid "Screen \"%1$s\" row span in cell X - %2$s Y - %3$s is too big."
 msgstr ""
 
-#: include/classes/import/CXmlImport18.php:463
-#: include/classes/import/CXmlImport18.php:1674
-#: include/classes/import/CXmlImport18.php:1678
+#: include/classes/import/CXmlImport18.php:449
 #, c-format
 msgid "Screen \"%1$s\" skipped - user rule."
 msgstr "略過篩選\"%1$s\"-用戶規則."
 
-#: include/classes/import/CXmlImport18.php:608
-#: include/classes/import/CXmlImport18.php:1732
+#: include/classes/import/CXmlImport18.php:600
 #, c-format
 msgid "Screen \"%1$s\" updated."
 msgstr "篩選\"%1$s\"已更新."
 
-#: screenconf.php:166
+#: screenconf.php:167
 msgid "Screen added"
 msgstr "篩選已新增"
 
-#: include/views/configuration.screen.constructor.edit.php:585
+#: include/views/configuration.screen.constructor.edit.php:736
 msgid "Screen cell configuration"
 msgstr "篩選格位組態"
 
-#: screenconf.php:237
+#: screenconf.php:239
 msgid "Screen deleted"
 msgstr "篩選已删除"
 
-#: screenedit.php:306 screenedit.php:346
+#: screenedit.php:328 screenedit.php:368
 msgid "Screen should contain at least one row and column."
 msgstr "篩選應包含至少一個行和列."
 
-#: screenconf.php:131
+#: screenconf.php:132 screenedit.php:227 screenedit.php:244
 msgid "Screen updated"
 msgstr "篩選已更新"
 
-#: dashboard.php:347 include/html.inc.php:454 include/html.inc.php:458
-#: include/menu.inc.php:67 include/menu.inc.php:195
+#: dashboard.php:347 include/html.inc.php:460 include/html.inc.php:464
+#: include/menu.inc.php:66 include/menu.inc.php:189
 #: include/views/configuration.screen.list.php:38
-#: include/views/configuration.template.edit.php:375
-#: include/views/conf.import.php:35 include/views/inventory.host.view.php:207
+#: include/views/configuration.template.edit.php:372
+#: include/views/conf.import.php:37 include/views/inventory.host.view.php:219
 #: include/views/monitoring.screen.php:27
 #: include/views/monitoring.screen.php:77
-#: include/views/monitoring.slides.php:33 popup.php:67 popup.php:83
+#: include/views/monitoring.slides.php:29 popup.php:79 popup.php:103
 #: search.php:138 search.php:224 search.php:398 search.php:438 search.php:458
-#: templates.php:500 templates.php:565
+#: templates.php:514 templates.php:576
 msgid "Screens"
 msgstr "篩選"
 
 #: include/audit.inc.php:48 include/media.inc.php:25
-#: include/views/administration.mediatypes.edit.php:42
-#: include/views/administration.script.edit.php:47
-#: include/views/administration.script.edit.php:109
-#: include/views/administration.script.list.php:50 scripts.php:153
-#: scripts.php:170
+#: include/views/administration.mediatypes.edit.php:41
+#: include/views/administration.script.edit.php:46
+#: include/views/administration.script.edit.php:112
+#: include/views/administration.script.list.php:50 scripts.php:149
+#: scripts.php:169
 msgid "Script"
 msgstr "脚本"
 
-#: api/classes/CScript.php:411 api/classes/CScript.php:472
-#: api/classes/CScript.php:604
+#: include/classes/api/services/CScript.php:411
+#: include/classes/api/services/CScript.php:472
+#: include/classes/api/services/CScript.php:604
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
 
-#: scripts.php:128
+#: scripts.php:121
 msgid "Script added"
 msgstr "脚本已新增"
 
-#: scripts.php:158 scripts.php:176
+#: scripts.php:158 scripts.php:179
 msgid "Script deleted"
 msgstr "脚本已删除"
 
-#: api/classes/CScript.php:596
+#: include/classes/api/services/CScript.php:596
 #, c-format
 msgid "Script menu path \"%1$s\" already used in script name \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.mediatypes.edit.php:65
+#: include/views/administration.mediatypes.edit.php:64
 #: include/views/administration.mediatypes.list.php:56
 msgid "Script name"
 msgstr "脚本名稱"
 
-#: api/classes/CScript.php:583
+#: include/classes/api/services/CScript.php:583
 #, c-format
 msgid "Script name \"%1$s\" already used in menu path for script \"%2$s\"."
 msgstr ""
@@ -12256,17 +12638,17 @@ msgstr ""
 msgid "Script profiler"
 msgstr "腳本探查器"
 
-#: scripts.php:121
+#: scripts.php:114
 msgid "Script updated"
 msgstr "脚本已更新"
 
-#: api/classes/CScript.php:446
+#: include/classes/api/services/CScript.php:446
 #, c-format
 msgid "Script with scriptid \"%1$s\" does not exist."
 msgstr ""
 
-#: include/menu.inc.php:259 include/views/administration.script.list.php:28
-#: jsLoader.php:211 scripts_exec.php:24
+#: include/menu.inc.php:251 include/views/administration.script.list.php:28
+#: jsLoader.php:215 scripts_exec.php:24
 msgid "Scripts"
 msgstr "脚本"
 
@@ -12287,7 +12669,7 @@ msgstr "搜尋式樣是空白"
 msgid "Search/Filter elements limit"
 msgstr "搜尋/過濾組件限制"
 
-#: include/forms.inc.php:1697 include/maintenances.inc.php:116
+#: include/forms.inc.php:1713 include/maintenances.inc.php:112
 msgid "Second"
 msgstr "秒"
 
@@ -12319,7 +12701,7 @@ msgstr "第二個POC電話B"
 msgid "Secondary POC screen name"
 msgstr "第二個POC篩選名稱"
 
-#: include/views/administration.users.edit.php:235
+#: include/views/administration.users.edit.php:237
 msgid "Seconds"
 msgstr "秒"
 
@@ -12338,69 +12720,76 @@ msgstr ""
 msgid "Security name"
 msgstr ""
 
-#: events.php:381 include/classes/html/CButtonPopup.php:52
-#: include/forms.inc.php:555 include/reports.inc.php:411
+#: events.php:382 include/classes/html/CButtonPopup.php:52
+#: include/classes/html/CMultiSelect.php:54 include/forms.inc.php:569
+#: include/reports.inc.php:414
 #: include/views/administration.auditacts.list.php:44
 #: include/views/administration.auditlogs.list.php:59
-#: include/views/configuration.action.edit.php:208
-#: include/views/configuration.action.edit.php:221
-#: include/views/configuration.action.edit.php:234
-#: include/views/configuration.action.edit.php:691
-#: include/views/configuration.graph.edit.php:119
-#: include/views/configuration.graph.edit.php:177
+#: include/views/common.filter.trigger.php:100
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:266
+#: include/views/configuration.action.edit.php:279
+#: include/views/configuration.action.edit.php:737
+#: include/views/configuration.graph.edit.php:129
+#: include/views/configuration.graph.edit.php:187
 #: include/views/configuration.item.edit.php:71
-#: include/views/configuration.screen.constructor.edit.php:117
-#: include/views/configuration.screen.constructor.edit.php:126
-#: include/views/configuration.screen.constructor.edit.php:165
-#: include/views/configuration.screen.constructor.edit.php:173
-#: include/views/configuration.screen.constructor.edit.php:208
-#: include/views/configuration.screen.constructor.edit.php:240
-#: include/views/configuration.screen.constructor.edit.php:249
-#: include/views/configuration.screen.constructor.edit.php:415
-#: include/views/configuration.screen.constructor.edit.php:484
-#: include/views/configuration.screen.constructor.edit.php:491
+#: include/views/configuration.screen.constructor.edit.php:119
+#: include/views/configuration.screen.constructor.edit.php:128
+#: include/views/configuration.screen.constructor.edit.php:167
+#: include/views/configuration.screen.constructor.edit.php:176
+#: include/views/configuration.screen.constructor.edit.php:217
+#: include/views/configuration.screen.constructor.edit.php:225
+#: include/views/configuration.screen.constructor.edit.php:264
+#: include/views/configuration.screen.constructor.edit.php:273
+#: include/views/configuration.screen.constructor.edit.php:310
+#: include/views/configuration.screen.constructor.edit.php:342
+#: include/views/configuration.screen.constructor.edit.php:351
+#: include/views/configuration.screen.constructor.edit.php:535
+#: include/views/configuration.screen.constructor.edit.php:610
+#: include/views/configuration.screen.constructor.edit.php:617
 #: include/views/configuration.services.child.list.php:63
 #: include/views/configuration.services.edit.php:71
 #: include/views/configuration.triggers.expression.php:43
-#: include/views/js/configuration.sysmaps.js.php:109
-#: include/views/js/configuration.sysmaps.js.php:116
-#: include/views/js/configuration.sysmaps.js.php:123 popup_bitem.php:128
-#: popup.php:542 popup.php:610 popup.php:738 popup.php:848 popup.php:943
-#: popup.php:1081 popup.php:1150 popup.php:1213 popup.php:1274 popup.php:1460
-#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:278
-#: tr_status.php:306
+#: include/views/js/configuration.sysmaps.js.php:107
+#: include/views/js/configuration.sysmaps.js.php:114
+#: include/views/js/configuration.sysmaps.js.php:121
+#: include/views/monitoring.overview.items.php:74 jsLoader.php:177
+#: popup_bitem.php:138 popup.php:573 popup.php:641 popup.php:714 popup.php:789
+#: popup.php:865 popup.php:936 popup.php:1071 popup.php:1206 popup.php:1277
+#: popup.php:1393 popup.php:1463 popup.php:1526 popup.php:1587 popup.php:1774
+#: popup_right.php:71 popup_usrgrp.php:106 tr_logform.php:247
 msgid "Select"
 msgstr "選擇"
 
-#: include/views/configuration.graph.edit.php:133
-#: include/views/configuration.graph.edit.php:191
+#: include/views/configuration.graph.edit.php:143
+#: include/views/configuration.graph.edit.php:201
 #: include/views/configuration.triggers.expression.php:50
 msgid "Select prototype"
 msgstr "選擇原型"
 
-#: include/views/monitoring.history.php:109
+#: include/views/monitoring.history.php:110
 msgid "Select rows with value like"
 msgstr "選擇行含有值類似於"
 
-#: include/views/administration.script.edit.php:83
+#: include/views/administration.script.edit.php:82
 #: include/views/monitoring.dashconf.php:49
-#: include/views/monitoring.history.php:130
+#: include/views/monitoring.history.php:131
 msgid "Selected"
 msgstr "選擇的"
 
-#: actionconf.php:345
+#: actionconf.php:356
 msgid "Selected actions deleted"
 msgstr "所選的動作已刪除"
 
-#: include/views/js/configuration.sysmaps.js.php:225
+#: include/views/js/configuration.sysmaps.js.php:223
 msgid "Selected elements"
 msgstr "所選的組件"
 
-#: include/reports.inc.php:322
+#: include/reports.inc.php:325
 msgid "Selected groups"
 msgstr "選擇的群組"
 
-#: include/reports.inc.php:365
+#: include/reports.inc.php:368
 msgid "Selected hosts"
 msgstr "選擇的主機"
 
@@ -12416,7 +12805,7 @@ msgstr "送出訊息給用戶群組"
 msgid "Send message to users"
 msgstr "送出訊息給用戶"
 
-#: include/views/configuration.action.edit.php:568
+#: include/views/configuration.action.edit.php:614
 msgid "Send only to"
 msgstr "僅送到"
 
@@ -12424,11 +12813,11 @@ msgstr "僅送到"
 msgid "Send to"
 msgstr "收件人"
 
-#: include/views/configuration.action.edit.php:554
+#: include/views/configuration.action.edit.php:600
 msgid "Send to User groups"
 msgstr "送到用戶群組"
 
-#: include/views/configuration.action.edit.php:555
+#: include/views/configuration.action.edit.php:601
 msgid "Send to Users"
 msgstr "送到用戶"
 
@@ -12437,17 +12826,17 @@ msgstr "送到用戶"
 msgid "Sent"
 msgstr "已送"
 
-#: include/func.inc.php:257
+#: include/func.inc.php:245
 msgid "Sep"
 msgstr "九月"
 
 #: include/views/configuration.sysmap.edit.php:122
-#: include/views/monitoring.dashconf.php:93
+#: include/views/monitoring.dashconf.php:105
 msgid "Separated"
 msgstr "分開的"
 
-#: include/forms.inc.php:1665 include/func.inc.php:137
-#: include/func.inc.php:274 jsLoader.php:119
+#: include/forms.inc.php:1681 include/func.inc.php:125
+#: include/func.inc.php:262 jsLoader.php:120
 msgid "September"
 msgstr "九月"
 
@@ -12459,7 +12848,7 @@ msgstr "序列號A"
 msgid "Serial number B"
 msgstr "序列號B"
 
-#: include/views/administration.script.list.php:66 popup.php:1445
+#: include/views/administration.script.list.php:66 popup.php:1759
 #: queue.php:146
 msgid "Server"
 msgstr "伺服器"
@@ -12468,44 +12857,44 @@ msgstr "伺服器"
 msgid "Server info"
 msgstr "伺服器資訊"
 
-#: include/views/configuration.screen.constructor.edit.php:478
+#: include/views/configuration.screen.constructor.edit.php:604
 msgid "Server time"
 msgstr "伺服器時間"
 
-#: events.php:589 include/actions.inc.php:103
+#: events.php:590 include/actions.inc.php:103
 #: include/views/configuration.services.child.list.php:38
-#: include/views/configuration.services.edit.php:281
+#: include/views/configuration.services.edit.php:280
 #: include/views/configuration.services.parent.list.php:36 services.php:467
 #: srv_status.php:139
 msgid "Service"
 msgstr "服務"
 
-#: jsLoader.php:212
+#: jsLoader.php:216
 #, c-format
 msgid "Service \"%1$s\""
 msgstr ""
 
-#: api/classes/CService.php:1298
+#: include/classes/api/services/CService.php:1097
 #, c-format
 msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service."
 msgstr "服務\"%1$s\"不能被刪除, 因為它相依於另一個服務."
 
-#: api/classes/CService.php:1319
+#: include/classes/api/services/CService.php:1118
 #, c-format
 msgid "Service \"%1$s\" cannot be dependent on itself."
 msgstr "服務\"%1$s\"不能相依於自己."
 
-#: api/classes/CService.php:1398
+#: include/classes/api/services/CService.php:1197
 #, c-format
 msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time."
 msgstr "服務 \"%1$s\"不能被連結到一個觸發器且同時有相依的服務."
 
-#: api/classes/CService.php:1373
+#: include/classes/api/services/CService.php:1172
 #, c-format
 msgid "Service \"%1$s\" is already hardlinked to a different service."
 msgstr "服務\"%1$s\"已經緊緊連結到一個不同的服務."
 
-#: api/classes/CService.php:1216
+#: include/classes/api/services/CService.php:1015
 msgid "Service cannot be parent and child at the same time."
 msgstr "服務不能同時為上層與下層"
 
@@ -12521,11 +12910,11 @@ msgstr "服務已删除"
 msgid "Service port"
 msgstr "服務端口"
 
-#: include/services.inc.php:497
+#: include/services.inc.php:499
 msgid "Service start time must be less than end time."
 msgstr "服務的開始時間不能晚於截止時間."
 
-#: include/views/configuration.services.edit.php:170
+#: include/views/configuration.services.edit.php:169
 msgid "Service times"
 msgstr "服務次數"
 
@@ -12537,49 +12926,52 @@ msgstr "服務類型"
 msgid "Service updated"
 msgstr "服務已更新"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Services"
 msgstr "服務"
 
-#: api/classes/CService.php:1449
+#: include/classes/api/services/CService.php:1248
 msgid "Services form a circular dependency."
 msgstr "服務形成了一個循環式迴圈."
 
-#: api/classes/CUser.php:1123
+#: include/classes/api/services/CUser.php:1119
 msgid "Session terminated, re-login, please."
 msgstr "連線期已中斷, 請重連."
 
-#: events.php:478 include/classes/screens/CScreenEvents.php:43
+#: events.php:479 include/classes/screens/CScreenEvents.php:43
 #: include/classes/screens/CScreenHistory.php:167
-#: include/triggers.inc.php:1656 include/views/configuration.item.list.php:143
-#: include/views/configuration.triggers.edit.php:247
-#: include/views/configuration.triggers.list.php:107
-#: include/views/configuration.triggers.massupdate.php:70 popup.php:649
-#: report5.php:60 tr_logform.php:370 tr_status.php:386
+#: include/triggers.inc.php:1479 include/views/configuration.item.list.php:146
+#: include/views/configuration.triggers.edit.php:253
+#: include/views/configuration.triggers.list.php:100
+#: include/views/configuration.triggers.massupdate.php:69 popup.php:978
+#: report5.php:60 tr_logform.php:338 tr_status.php:301
 msgid "Severity"
 msgstr "嚴重性"
 
-#: include/views/configuration.screen.constructor.edit.php:322
+#: include/views/configuration.screen.constructor.edit.php:436
 msgid "Severity (descending)"
 msgstr "嚴重性(降冪)"
 
-#: include/profiles.inc.php:379
+#: include/profiles.inc.php:117
 msgid "Severity name cannot be empty."
 msgstr "嚴重性的名稱不能是空白."
 
-#: include/classes/class.cuiwidget.php:108 include/reports.inc.php:125
-#: include/reports.inc.php:257 include/reports.inc.php:437
+#: include/classes/html/CCollapsibleUiWidget.php:48
+#: include/reports.inc.php:126 include/reports.inc.php:259
+#: include/reports.inc.php:440
 #: include/views/configuration.application.list.php:62
-#: include/views/js/configuration.sysmaps.js.php:26 report2.php:419
-#: tr_status.php:820 tr_status.php:825
+#: include/views/js/configuration.sysmaps.js.php:26 report2.php:420
+#: tr_status.php:744 tr_status.php:749
 msgid "Show"
 msgstr "展示"
 
-#: tr_status.php:273
-msgid "Show all"
-msgstr "展示所有"
+#: include/views/common.filter.trigger.php:56
+#, c-format
+msgid "Show all (%1$s day)"
+msgid_plural "Show all (%1$s days)"
+msgstr[0] ""
 
-#: latest.php:303 tr_status.php:302
+#: include/views/common.filter.trigger.php:143 latest.php:314
 msgid "Show details"
 msgstr "展示細節"
 
@@ -12609,35 +13001,36 @@ msgstr "展示事件不能久於(日計)"
 msgid "Show events not older than (in days) \"%1$s\"."
 msgstr "展示事件不能久於(日計)\"%1$s\"."
 
-#: include/classes/class.cwidget.php:129
+#: include/classes/html/widget/CWidget.php:129
 msgid "Show filter"
 msgstr ""
 
-#: include/views/monitoring.dashconf.php:75 tr_status.php:343
+#: include/views/common.filter.trigger.php:137
+#: include/views/monitoring.dashconf.php:87
 msgid "Show hosts in maintenance"
 msgstr "展示維修中主機"
 
-#: latest.php:301
+#: latest.php:312
 msgid "Show items with name like"
 msgstr "展示項目其名類似"
 
-#: latest.php:302
+#: latest.php:313
 msgid "Show items without data"
 msgstr "展示無資料項目"
 
-#: include/views/configuration.graph.edit.php:64
+#: include/views/configuration.graph.edit.php:63
 msgid "Show legend"
 msgstr "展示圖標"
 
-#: include/views/configuration.screen.constructor.edit.php:262
-#: include/views/configuration.screen.constructor.edit.php:317
-#: include/views/configuration.screen.constructor.edit.php:332
-#: include/views/configuration.screen.constructor.edit.php:353
-#: screenedit.php:48
+#: include/views/configuration.screen.constructor.edit.php:364
+#: include/views/configuration.screen.constructor.edit.php:431
+#: include/views/configuration.screen.constructor.edit.php:446
+#: include/views/configuration.screen.constructor.edit.php:467
+#: screenedit.php:75
 msgid "Show lines"
 msgstr "展示線條"
 
-#: include/views/monitoring.history.php:114
+#: include/views/monitoring.history.php:115
 msgid "Show selected"
 msgstr "展示所選的"
 
@@ -12645,19 +13038,21 @@ msgstr "展示所選的"
 msgid "Show selected groups"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:263
+#: include/views/configuration.screen.constructor.edit.php:365
 msgid "Show text as HTML"
 msgstr "展示HTML文字"
 
-#: include/views/configuration.graph.edit.php:69
+#: include/views/configuration.graph.edit.php:68
 msgid "Show triggers"
 msgstr "展示觸發器"
 
-#: tr_status.php:275
-msgid "Show unacknowledged"
-msgstr "展示未知悉的"
+#: include/views/common.filter.trigger.php:60
+#, c-format
+msgid "Show unacknowledged (%1$s day)"
+msgid_plural "Show unacknowledged (%1$s days)"
+msgstr[0] ""
 
-#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.edit.php:386
 #: include/views/configuration.item.massupdate.php:447
 msgid "Show value"
 msgstr "展示值"
@@ -12666,11 +13061,11 @@ msgstr "展示值"
 msgid "Show warning if Zabbix server is down"
 msgstr "當Zabbix伺服器停機時展示警告"
 
-#: include/views/configuration.graph.edit.php:68
+#: include/views/configuration.graph.edit.php:67
 msgid "Show working time"
 msgstr "展示工作時間"
 
-#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:138
+#: include/views/configuration.sysmap.constructor.php:41 jsLoader.php:139
 msgid "Shown"
 msgstr "已展示"
 
@@ -12690,6 +13085,10 @@ msgstr "簡單檢查"
 msgid "Simple graph"
 msgstr "簡單圖形"
 
+#: include/screens.inc.php:46
+msgid "Simple graph prototype"
+msgstr ""
+
 #: include/hosts.inc.php:370
 msgid "Site ZIP / postal"
 msgstr "場所郵遞區號"
@@ -12727,7 +13126,7 @@ msgid "Site state / province"
 msgstr "場所州/省"
 
 #: include/classes/items/CHelpItems.php:277
-#: include/classes/items/CHelpItems.php:535
+#: include/classes/items/CHelpItems.php:539
 msgid "Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]"
 msgstr ""
 
@@ -12745,16 +13144,16 @@ msgstr "略過複製圖片\"%1$s\"到主機\"%2$s\"."
 msgid "Slide"
 msgstr "簡報片"
 
-#: include/audit.inc.php:44 include/views/monitoring.slides.php:80
+#: include/audit.inc.php:44 include/views/monitoring.slides.php:76
 msgid "Slide show"
 msgstr "簡報片展示"
 
-#: include/screens.inc.php:243
+#: include/screens.inc.php:245
 #, c-format
 msgid "Slide show \"%1$s\" already exists."
 msgstr ""
 
-#: include/screens.inc.php:181
+#: include/screens.inc.php:183
 #, c-format
 msgid "Slide show \"%s\" already exists."
 msgstr "簡報片展示\"%s\"已存在."
@@ -12763,11 +13162,11 @@ msgstr "簡報片展示\"%s\"已存在."
 msgid "Slide show added"
 msgstr "簡報片展示已新增."
 
-#: slideconf.php:131 slideconf.php:153
+#: slideconf.php:138 slideconf.php:159
 msgid "Slide show deleted"
 msgstr "簡報片展示已刪除"
 
-#: include/screens.inc.php:157 include/screens.inc.php:217
+#: include/screens.inc.php:159 include/screens.inc.php:219
 msgid "Slide show must contain slides."
 msgstr "簡報片展示必需包含簡報片."
 
@@ -12775,10 +13174,10 @@ msgstr "簡報片展示必需包含簡報片."
 msgid "Slide show updated"
 msgstr "簡報片展示已更新"
 
-#: dashboard.php:351 include/menu.inc.php:200
+#: dashboard.php:351 include/menu.inc.php:194
 #: include/views/configuration.slideconf.list.php:29
 #: include/views/monitoring.screen.php:28
-#: include/views/monitoring.slides.php:34 popup.php:71
+#: include/views/monitoring.slides.php:30 popup.php:83
 msgid "Slide shows"
 msgstr "簡報片展示"
 
@@ -12786,15 +13185,15 @@ msgstr "簡報片展示"
 msgid "Slides"
 msgstr "簡報片"
 
-#: include/locales.inc.php:74
+#: include/locales.inc.php:78
 msgid "Slovak (sk_SK)"
 msgstr "斯洛伐克(sk_SK)"
 
-#: jsLoader.php:163
+#: jsLoader.php:164
 msgid "Snooze"
 msgstr "Snooze"
 
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 msgid "Soft"
 msgstr "軟 "
 
@@ -12827,28 +13226,28 @@ msgid "Software application E"
 msgstr "軟體應用程式E"
 
 #: include/classes/items/CHelpItems.php:209
-#: include/classes/items/CHelpItems.php:467
+#: include/classes/items/CHelpItems.php:471
 msgid "Software architecture"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:217
-#: include/classes/items/CHelpItems.php:475
+#: include/classes/items/CHelpItems.php:479
 msgid "Software package list - lists all packages for all supported package managers by default"
 msgstr ""
 
-#: include/reports.inc.php:170
+#: include/reports.inc.php:172
 msgid "Sort by"
 msgstr "排序以"
 
-#: include/views/configuration.screen.constructor.edit.php:334
+#: include/views/configuration.screen.constructor.edit.php:448
 msgid "Sort entries by"
 msgstr ""
 
-#: include/views/configuration.services.edit.php:85 services.php:45
+#: include/views/configuration.services.edit.php:84 services.php:45
 msgid "Sort order (0->999)"
 msgstr "排序次(0->999)"
 
-#: include/views/configuration.screen.constructor.edit.php:319
+#: include/views/configuration.screen.constructor.edit.php:433
 msgid "Sort triggers by"
 msgstr "依此排序觸發器:"
 
@@ -12861,11 +13260,11 @@ msgstr "依欄位\"%1$s\"排序是不允許的."
 msgid "Source"
 msgstr "來源 "
 
-#: include/locales.inc.php:75
+#: include/locales.inc.php:79
 msgid "Spanish (es_ES)"
 msgstr "西班牙語 (es_ES)"
 
-#: api/classes/CAction.php:1361
+#: include/classes/api/services/CAction.php:1364
 msgid "Specified script does not exist or you do not have rights on it for action operation command."
 msgstr "指定的腳本不存在或您沒有對動作操作命令的此腳本的權限."
 
@@ -12873,63 +13272,63 @@ msgstr "指定的腳本不存在或您沒有對動作操作命令的此腳本的
 msgid "Speed"
 msgstr "速度"
 
-#: include/graphs.inc.php:25 popup.php:1061
+#: include/graphs.inc.php:25 popup.php:1373
 msgid "Stacked"
 msgstr "層積的"
 
-#: popup.php:63
+#: popup.php:75
 msgid "Standard items"
 msgstr "標準項目"
 
-#: include/views/configuration.action.edit.php:325
+#: include/views/configuration.action.edit.php:370
 msgid "Start in"
 msgstr "開始於"
 
-#: include/classes/items/CHelpItems.php:795
+#: include/classes/items/CHelpItems.php:803
 msgid "Startup time of Zabbix server, Unix timestamp."
 msgstr ""
 
-#: include/forms.inc.php:509 include/forms.inc.php:895
+#: include/forms.inc.php:516 include/forms.inc.php:909
 #: include/views/configuration.maintenance.list.php:48
 msgid "State"
 msgstr "州"
 
 #: include/classes/items/CHelpItems.php:149
-#: include/classes/items/CHelpItems.php:407
+#: include/classes/items/CHelpItems.php:411
 msgid "State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service"
 msgstr ""
 
-#: events.php:462 events.php:477 hosts.php:844 httpdetails.php:134
-#: httpmon.php:88 include/actions.inc.php:821 include/actions.inc.php:916
+#: events.php:463 events.php:478 hosts.php:870 httpdetails.php:134
+#: httpmon.php:95 include/actions.inc.php:821 include/actions.inc.php:916
 #: include/actions.inc.php:972 include/classes/screens/CScreenActions.php:62
 #: include/classes/screens/CScreenActions.php:68
 #: include/classes/screens/CScreenActions.php:133 include/events.inc.php:194
 #: include/events.inc.php:272 include/events.inc.php:275
-#: include/forms.inc.php:547 include/forms.inc.php:890
+#: include/forms.inc.php:561 include/forms.inc.php:904
 #: include/views/administration.auditacts.list.php:74
 #: include/views/administration.mediatypes.list.php:41
 #: include/views/administration.usergroups.list.php:50
 #: include/views/administration.users.list.php:63
 #: include/views/configuration.action.list.php:54
 #: include/views/configuration.discovery.list.php:44
-#: include/views/configuration.host.discovery.list.php:58
-#: include/views/configuration.host.prototype.list.php:54
-#: include/views/configuration.httpconf.list.php:65
+#: include/views/configuration.host.discovery.list.php:54
+#: include/views/configuration.host.massupdate.php:181
+#: include/views/configuration.host.prototype.list.php:50
+#: include/views/configuration.httpconf.list.php:71
 #: include/views/configuration.item.list.php:71
-#: include/views/configuration.item.list.php:146
+#: include/views/configuration.item.list.php:149
 #: include/views/configuration.item.massupdate.php:405
-#: include/views/configuration.item.prototype.list.php:58
-#: include/views/configuration.triggers.list.php:111 popup_media.php:134
-#: popup.php:650 popup.php:765 popup.php:874 popup.php:883 srv_status.php:140
-#: tr_status.php:387
+#: include/views/configuration.item.prototype.list.php:54
+#: include/views/configuration.triggers.list.php:104 popup_media.php:134
+#: popup.php:979 popup.php:1102 srv_status.php:140 tr_status.php:302
 msgid "Status"
 msgstr "狀態"
 
-#: include/views/configuration.screen.constructor.edit.php:341
+#: include/views/configuration.screen.constructor.edit.php:455
 msgid "Status (ascending)"
 msgstr "狀態(升冪)"
 
-#: include/views/configuration.screen.constructor.edit.php:340
+#: include/views/configuration.screen.constructor.edit.php:454
 msgid "Status (descending)"
 msgstr "狀態(降冪)"
 
@@ -12942,7 +13341,7 @@ msgstr "狀態統計"
 msgid "Status calculation algorithm"
 msgstr "狀態計算演算法"
 
-#: include/views/configuration.httpconf.edit.php:166
+#: include/views/configuration.httpconf.edit.php:202
 msgid "Status codes"
 msgstr "狀態碼"
 
@@ -12951,7 +13350,7 @@ msgid "Status of Web monitoring"
 msgstr "Web監控的狀態"
 
 #: dashboard.php:369 include/classes/screens/CScreenSystemStatus.php:46
-#: include/menu.inc.php:124 report1.php:25
+#: include/menu.inc.php:120 report1.php:25
 msgid "Status of Zabbix"
 msgstr "Zabbix狀態"
 
@@ -12968,40 +13367,40 @@ msgid "Status only"
 msgstr "只有狀態"
 
 #: httpdetails.php:130 include/actions.inc.php:839 include/actions.inc.php:930
-#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:501
 msgid "Step"
 msgstr "階段"
 
-#: httpmon.php:146
+#: httpmon.php:153 include/views/configuration.httpconf.list.php:95
 #, c-format
 msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s"
 msgstr "步驟\"%1$s\" [%2$s之於%3$s] 失敗: %4$s"
 
-#: include/views/configuration.action.edit.php:445
+#: include/views/configuration.action.edit.php:491
 msgid "Step duration"
 msgstr "步驟持續時間"
 
-#: include/views/configuration.httpconf.popup.php:87 popup_httpstep.php:24
+#: include/views/configuration.httpconf.popup.php:103 popup_httpstep.php:24
 msgid "Step of scenario"
 msgstr "方案的步驟"
 
-#: include/views/configuration.httpconf.popup.php:32
+#: include/views/configuration.httpconf.popup.php:33
 #, c-format
 msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:50 include/views/configuration.action.edit.php:325
-#: include/views/configuration.httpconf.edit.php:234
-#: include/views/configuration.httpconf.edit.php:242
+#: httpconf.php:50 include/views/configuration.action.edit.php:370
+#: include/views/configuration.httpconf.edit.php:272
+#: include/views/configuration.httpconf.edit.php:280
 msgid "Steps"
 msgstr "步驟"
 
-#: include/views/administration.users.edit.php:250
-#: include/views/administration.users.edit.php:287
+#: include/views/administration.users.edit.php:252
+#: include/views/administration.users.edit.php:289
 msgid "Stop"
 msgstr "停止"
 
-#: include/views/configuration.item.edit.php:376
+#: include/views/configuration.item.edit.php:366
 #: include/views/configuration.item.massupdate.php:429
 msgid "Store value"
 msgstr "儲存值"
@@ -13010,11 +13409,11 @@ msgstr "儲存值"
 msgid "Straight"
 msgstr "Straight"
 
-#: include/views/configuration.screen.constructor.edit.php:519
+#: include/views/configuration.screen.constructor.edit.php:645
 msgid "Style"
 msgstr "風格"
 
-#: include/forms.inc.php:923
+#: include/forms.inc.php:937
 msgid "Subfilter [affects only filtered data!]"
 msgstr "次過濾[僅影響已過濾的資料!]"
 
@@ -13022,11 +13421,11 @@ msgstr "次過濾[僅影響已過濾的資料!]"
 #: include/actions.inc.php:461 include/actions.inc.php:866
 #: include/classes/screens/CScreenActions.php:163
 #: include/views/administration.auditacts.list.php:99
-#: include/views/configuration.action.edit.php:579
+#: include/views/configuration.action.edit.php:625
 msgid "Subject"
 msgstr "主旨"
 
-#: jsLoader.php:213
+#: jsLoader.php:217
 msgid "Submap"
 msgstr "子拓墣圖"
 
@@ -13035,32 +13434,32 @@ msgid "Success Audit"
 msgstr "成功審計"
 
 #: include/classes/items/CHelpItems.php:109
-#: include/classes/items/CHelpItems.php:367
+#: include/classes/items/CHelpItems.php:371
 msgid "Sum of network interface incoming and outgoing statistics. Integer value. Mode - one of bytes (default), packets, errors or dropped"
 msgstr ""
 
-#: popup_trexpr.php:345
+#: popup_trexpr.php:335
 msgid "Sum of values of a period T is < N"
 msgstr ""
 
-#: popup_trexpr.php:355
+#: popup_trexpr.php:345
 msgid "Sum of values of a period T is = N"
 msgstr "期間的總時間是 T = N"
 
-#: popup_trexpr.php:350
+#: popup_trexpr.php:340
 msgid "Sum of values of a period T is > N"
 msgstr "期間的總時間是 T > N"
 
-#: popup_trexpr.php:360
+#: popup_trexpr.php:350
 msgid "Sum of values of a period T is NOT N"
 msgstr ""
 
-#: include/func.inc.php:225
+#: include/func.inc.php:213
 msgid "Sun"
 msgstr "日"
 
-#: include/forms.inc.php:1645 include/forms.inc.php:1713
-#: include/func.inc.php:155 include/func.inc.php:237
+#: include/forms.inc.php:1661 include/forms.inc.php:1729
+#: include/func.inc.php:143 include/func.inc.php:225
 msgid "Sunday"
 msgstr "日"
 
@@ -13068,27 +13467,27 @@ msgstr "日"
 msgid "Support"
 msgstr "支援"
 
-#: include/views/administration.users.edit.php:54
-#: include/views/administration.users.list.php:56 popup.php:565 users.php:46
+#: include/views/administration.users.edit.php:53
+#: include/views/administration.users.list.php:56 popup.php:596 users.php:46
 msgid "Surname"
 msgstr "姓氏"
 
 #: include/classes/items/CHelpItems.php:221
-#: include/classes/items/CHelpItems.php:479
+#: include/classes/items/CHelpItems.php:483
 msgid "Swap in. If type is count - swapins is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:225
-#: include/classes/items/CHelpItems.php:483
+#: include/classes/items/CHelpItems.php:487
 msgid "Swap out. If type is count - swapouts is returned. If type is pages - pages swapped in is returned. If swap is missing all is used."
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:229
-#: include/classes/items/CHelpItems.php:487
+#: include/classes/items/CHelpItems.php:491
 msgid "Swap space. Number of bytes. If swap is missing all is used. If mode is missing free is used."
 msgstr ""
 
-#: include/locales.inc.php:76
+#: include/locales.inc.php:80
 msgid "Swedish (sv_SE)"
 msgstr "瑞士(sv_SE)"
 
@@ -13096,16 +13495,16 @@ msgstr "瑞士(sv_SE)"
 msgid "Switching authentication method will reset all except this session! Continue?"
 msgstr "切換認證方法將重設除了此連線期之外的所有連線!繼續嗎?"
 
-#: include/users.inc.php:83 include/views/administration.users.edit.php:150
+#: include/users.inc.php:83 include/views/administration.users.edit.php:149
 msgid "System default"
 msgstr "系統預設"
 
-#: api/rpc/class.cjsonrpc.php:199
+#: include/classes/core/CJsonRpc.php:199
 msgid "System error."
 msgstr "系統錯誤."
 
 #: include/classes/items/CHelpItems.php:197
-#: include/classes/items/CHelpItems.php:455
+#: include/classes/items/CHelpItems.php:459
 msgid "System local time. Time in seconds."
 msgstr ""
 
@@ -13114,21 +13513,21 @@ msgid "System status"
 msgstr "系統狀態"
 
 #: include/classes/items/CHelpItems.php:237
-#: include/classes/items/CHelpItems.php:495
+#: include/classes/items/CHelpItems.php:499
 msgid "System uptime in seconds."
 msgstr ""
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgctxt "Tera short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:126
+#: jsLoader.php:127
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:124
+#: jsLoader.php:125
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -13147,11 +13546,11 @@ msgid "TOTAL"
 msgstr "總合"
 
 #: include/views/monitoring.triggerComment.php:25
-msgid "TRIGGER COMMENTS"
-msgstr "觸發器評論"
+msgid "TRIGGER DESCRIPTION"
+msgstr ""
 
-#: include/views/js/adm.regexprs.edit.js.php:360
-#: include/views/js/adm.regexprs.edit.js.php:369
+#: include/views/js/adm.regexprs.edit.js.php:365
+#: include/views/js/adm.regexprs.edit.js.php:387
 msgid "TRUE"
 msgstr "真"
 
@@ -13169,14 +13568,14 @@ msgstr "資料表\"%1$s\"不能有欄位名為\"%2$s\"."
 msgid "Tag"
 msgstr "標簽"
 
-#: include/views/configuration.action.edit.php:632
+#: include/views/configuration.action.edit.php:678
 #: include/views/configuration.copy.elements.php:105
-#: include/views/configuration.triggers.edit.php:146
+#: include/views/configuration.triggers.edit.php:152
 #: include/views/js/configuration.action.edit.js.php:84
 msgid "Target"
 msgstr "目標"
 
-#: include/views/configuration.action.edit.php:679
+#: include/views/configuration.action.edit.php:725
 msgid "Target list"
 msgstr "目標清單"
 
@@ -13185,130 +13584,133 @@ msgid "Target type"
 msgstr "目標類型"
 
 #: include/discovery.inc.php:70
-#: include/views/configuration.action.edit.php:686
+#: include/views/configuration.action.edit.php:732
 #: include/views/js/configuration.discovery.edit.js.php:183
 msgid "Telnet"
 msgstr "Telnet"
 
 #: include/actions.inc.php:62 include/audit.inc.php:50
-#: include/forms.inc.php:583 include/forms.inc.php:900
-#: include/html.inc.php:317 include/views/configuration.template.edit.php:35
-#: include/views/configuration.template.edit.php:379
-#: include/views/configuration.triggers.list.php:128 report2.php:267
+#: include/forms.inc.php:597 include/forms.inc.php:914
+#: include/html.inc.php:323 include/views/configuration.template.edit.php:35
+#: include/views/configuration.template.edit.php:398
+#: include/views/configuration.triggers.list.php:121 report2.php:268
 #: search.php:393
 msgid "Template"
 msgstr "模板"
 
-#: api/classes/CHost.php:995 api/classes/CTemplate.php:441
+#: include/classes/api/services/CHost.php:983
+#: include/classes/api/services/CTemplate.php:457
 #, c-format
 msgid "Template \"%1$s\" already exists."
 msgstr "模板 \"%1$s\" 已存在."
 
-#: include/classes/import/importers/CHostImporter.php:33
+#: include/classes/import/importers/CHostImporter.php:46
 #, c-format
 msgid "Template \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "用於主機 \"%2$s\"的模板 \"%1$s\"不存在."
 
-#: api/classes/CHostBase.php:94
+#: include/classes/api/services/CHostBase.php:94
 #, c-format
 msgid "Template \"%1$s\" with item key \"%2$s\" already linked to host."
 msgstr ""
 
-#: templates.php:241
+#: templates.php:244
 msgid "Template added"
 msgstr "模板已新增"
 
-#: api/classes/CHostBase.php:294
+#: include/classes/api/services/CHostBase.php:294
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "模板不能重複連結到其它模板, 即使透過其它模板."
 
-#: templates.php:361 templates.php:377 templates.php:405
+#: templates.php:375 templates.php:389 templates.php:414
 msgid "Template deleted"
 msgstr "模板已刪除"
 
-#: report2.php:248
+#: report2.php:249
 msgid "Template group"
 msgstr "模板群組"
 
-#: include/views/conf.import.php:30
+#: include/views/conf.import.php:31
 msgid "Template linkage"
 msgstr "模板間的關聯"
 
-#: include/html.inc.php:290
+#: include/html.inc.php:296
 msgid "Template list"
 msgstr "模板清單"
 
-#: include/views/configuration.template.edit.php:98 templates.php:55
+#: include/views/configuration.template.edit.php:96 templates.php:55
 msgid "Template name"
 msgstr "模版名稱"
 
-#: api/classes/CTemplateScreen.php:555 api/classes/CTemplateScreen.php:624
+#: include/classes/api/services/CTemplateScreen.php:577
+#: include/classes/api/services/CTemplateScreen.php:646
 #, c-format
 msgid "Template screen \"%1$s\" already exists."
 msgstr ""
 
-#: include/views/conf.import.php:29
+#: include/views/conf.import.php:30
 msgid "Template screens"
 msgstr "模板篩選"
 
-#: report2.php:300
+#: report2.php:301
 msgid "Template trigger"
 msgstr "模板觸發器"
 
-#: templates.php:231
+#: templates.php:234
 msgid "Template updated"
 msgstr "模板已更新"
 
-#: api/classes/CTemplate.php:998
+#: include/classes/api/services/CTemplate.php:1030
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:708
+#: include/classes/api/services/CHost.php:690
 #, c-format
 msgid "Template with the same name \"%s\" already exists."
 msgstr "含有相同名稱\"%1$s\"的模板已連結到主機."
 
-#: api/classes/CTemplate.php:452 api/classes/CTemplate.php:966
+#: include/classes/api/services/CTemplate.php:480
+#: include/classes/api/services/CTemplate.php:995
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHost.php:714
+#: include/classes/api/services/CHost.php:696
 #, c-format
 msgid "Template with the same visible name \"%s\" already exists."
 msgstr "含有相同可視名稱\"%1$s\"的模板已連結到主機."
 
-#: include/forms.inc.php:586 include/forms.inc.php:771
+#: include/forms.inc.php:600 include/forms.inc.php:785
 msgid "Templated items"
 msgstr "模板的項目"
 
-#: hosts.php:843 include/menu.inc.php:164
+#: hosts.php:869 include/menu.inc.php:158
 #: include/views/configuration.copy.elements.php:47
-#: include/views/configuration.host.edit.php:716
+#: include/views/configuration.host.edit.php:747
 #: include/views/configuration.hostgroups.list.php:144
-#: include/views/configuration.host.massupdate.php:304
-#: include/views/configuration.host.prototype.edit.php:252
-#: include/views/configuration.host.prototype.list.php:53
-#: include/views/conf.import.php:28 search.php:280 search.php:309
-#: search.php:314 search.php:321 search.php:485 templates.php:486
-#: templates.php:495
+#: include/views/configuration.host.massupdate.php:336
+#: include/views/configuration.host.prototype.edit.php:263
+#: include/views/configuration.host.prototype.list.php:49
+#: include/views/conf.import.php:29 popup.php:39 search.php:280 search.php:309
+#: search.php:314 search.php:321 search.php:485 templates.php:500
+#: templates.php:509
 msgid "Templates"
 msgstr "模板"
 
-#: api/classes/CHostBase.php:272
+#: include/classes/api/services/CHostBase.php:272
 #, c-format
 msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
 msgstr "模板\"%1$s\"自主機\"%2$s\"斷連."
 
-#: include/func.inc.php:679
+#: include/func.inc.php:667
 msgid "Tera"
 msgstr "Tera"
 
 #: include/views/administration.authentication.edit.php:136
 #: include/views/administration.general.regularexpressions.edit.php:81
-#: include/views/configuration.triggers.edit.php:215 tr_testexpr.php:25
-#: tr_testexpr.php:120 tr_testexpr.php:176
+#: include/views/configuration.triggers.edit.php:221 tr_testexpr.php:25
+#: tr_testexpr.php:128 tr_testexpr.php:185
 msgid "Test"
 msgstr "測試"
 
@@ -13316,11 +13718,11 @@ msgstr "測試"
 msgid "Test authentication"
 msgstr "測試認證"
 
-#: include/views/administration.script.edit.php:105
+#: include/views/administration.script.edit.php:108
 msgid "Test confirmation"
 msgstr "測試確認"
 
-#: tr_testexpr.php:125
+#: tr_testexpr.php:132
 msgid "Test data"
 msgstr "測試數據"
 
@@ -13334,22 +13736,22 @@ msgid "Test string"
 msgstr "測試字串"
 
 #: include/forms.inc.php:405 include/items.inc.php:129
-#: include/triggers.inc.php:2258 include/views/configuration.item.edit.php:215
+#: include/triggers.inc.php:2068 include/views/configuration.item.edit.php:215
 #: include/views/configuration.item.massupdate.php:212
 msgid "Text"
 msgstr "文字"
 
-#: include/classes/api/clients/CLocalApiClient.php:127
+#: include/classes/api/clients/CLocalApiClient.php:79
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
 msgstr ""
 
-#: api/classes/CScreenItem.php:867
+#: include/classes/api/services/CScreenItem.php:941
 #, c-format
 msgid "The X coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
 
-#: api/classes/CScreenItem.php:879
+#: include/classes/api/services/CScreenItem.php:953
 #, c-format
 msgid "The Y coordinate of screen element located at X - %1$s and Y - %2$s of screen \"%3$s\" is too big."
 msgstr ""
@@ -13357,7 +13759,7 @@ msgstr ""
 #: include/classes/db/Db2DbBackend.php:41
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
-#: include/classes/db/PostgresqlDbBackend.php:41
+#: include/classes/db/PostgresqlDbBackend.php:44
 #: include/classes/db/SqliteDbBackend.php:34
 msgid "The frontend does not match Zabbix database."
 msgstr ""
@@ -13372,24 +13774,24 @@ msgstr ""
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: include/html.inc.php:550
+#: include/html.inc.php:556
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr ""
 
-#: api/classes/CImage.php:454
+#: include/classes/api/services/CImage.php:429
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: api/classes/CImage.php:480
+#: include/classes/api/services/CImage.php:455
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
 msgstr[0] ""
 
-#: include/views/configuration.item.list.php:124
+#: include/views/configuration.item.list.php:126
 #, c-format
 msgid "The item is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
 msgstr "已無法探索此項目了, 將刪除於%1$s (在%2$s在%3$s)."
@@ -13398,19 +13800,19 @@ msgstr "已無法探索此項目了, 將刪除於%1$s (在%2$s在%3$s)."
 msgid "The queue is empty."
 msgstr ""
 
-#: api/rpc/class.cjsonrpc.php:175
+#: include/classes/core/CJsonRpc.php:175
 msgid "The received JSON is not a valid JSON-RPC Request."
 msgstr "接收到的JSON不是一個有效的JSON-RPC請求."
 
-#: api/rpc/class.cjsonrpc.php:180
+#: include/classes/core/CJsonRpc.php:180
 msgid "The requested remote-procedure does not exist / is not available"
 msgstr "請求的遠程程序不存在/不可用"
 
-#: api/classes/CHttpTest.php:545
+#: include/classes/api/services/CHttpTest.php:625
 msgid "The web scenario application belongs to a different host than the web scenario host."
 msgstr ""
 
-#: include/views/administration.users.edit.php:152
+#: include/views/administration.users.edit.php:151
 msgid "Theme"
 msgstr "背景主題"
 
@@ -13420,11 +13822,11 @@ msgid "There is \"%1$d\" group with Internal GUI access."
 msgid_plural "There are \"%1$d\" groups with Internal GUI access."
 msgstr[0] "有內部GUI存取的群組\"%1$d\"."
 
-#: include/forms.inc.php:1698 include/maintenances.inc.php:117
+#: include/forms.inc.php:1714 include/maintenances.inc.php:113
 msgid "Third"
 msgstr "第三的"
 
-#: include/views/configuration.host.edit.php:821
+#: include/views/configuration.host.edit.php:851
 #, c-format
 msgid "This field is automatically populated by item \"%s\"."
 msgstr "這欄位是由項目\"%s\"自動填入的."
@@ -13433,11 +13835,11 @@ msgstr "這欄位是由項目\"%s\"自動填入的."
 msgid "This month"
 msgstr "本月"
 
-#: include/classes/screens/CScreenBuilder.php:487
+#: include/classes/screens/CScreenBuilder.php:524
 msgid "This screen-column is not empty. Delete it?"
 msgstr "這篩選-列不是空白. 刪除它?"
 
-#: include/classes/screens/CScreenBuilder.php:469
+#: include/classes/screens/CScreenBuilder.php:504
 msgid "This screen-row is not empty. Delete it?"
 msgstr "這篩選-行不是空白. 刪除它?"
 
@@ -13449,27 +13851,27 @@ msgstr "本周"
 msgid "This year"
 msgstr "本年"
 
-#: include/func.inc.php:229
+#: include/func.inc.php:217
 msgid "Thu"
 msgstr "四"
 
-#: include/forms.inc.php:1642 include/forms.inc.php:1710
-#: include/func.inc.php:151 include/func.inc.php:241
+#: include/forms.inc.php:1658 include/forms.inc.php:1726
+#: include/func.inc.php:139 include/func.inc.php:229
 msgid "Thursday"
 msgstr "週四"
 
-#: include/reports.inc.php:74 include/reports.inc.php:376
-#: include/views/configuration.services.edit.php:230
-#: include/views/configuration.services.edit.php:256 popup_period.php:119
-#: report2.php:374 report3.php:143 report4.php:175 services.php:201
+#: include/reports.inc.php:75 include/reports.inc.php:379
+#: include/views/configuration.services.edit.php:229
+#: include/views/configuration.services.edit.php:255 popup_period.php:132
+#: report2.php:375 report3.php:143 report4.php:175 services.php:201
 #: services.php:207
 msgid "Till"
 msgstr "直到"
 
-#: events.php:458 events.php:474 include/acknow.inc.php:49
+#: events.php:459 events.php:475 include/acknow.inc.php:49
 #: include/actions.inc.php:819 include/actions.inc.php:842
 #: include/actions.inc.php:915 include/actions.inc.php:933
-#: include/blocks.inc.php:988 include/classes/screens/CScreenActions.php:32
+#: include/blocks.inc.php:994 include/classes/screens/CScreenActions.php:32
 #: include/classes/screens/CScreenActions.php:38
 #: include/classes/screens/CScreenActions.php:44
 #: include/classes/screens/CScreenActions.php:128
@@ -13478,28 +13880,28 @@ msgstr "直到"
 #: include/events.inc.php:275
 #: include/views/administration.auditacts.list.php:69
 #: include/views/administration.auditlogs.list.php:85
+#: include/views/configuration.services.edit.php:254
 #: include/views/configuration.services.edit.php:255
-#: include/views/configuration.services.edit.php:256
-#: include/views/configuration.services.edit.php:283
+#: include/views/configuration.services.edit.php:282
 #: include/views/configuration.triggers.expression.php:86
-#: include/views/configuration.triggers.expression.php:94 jsLoader.php:132
-#: popup_trexpr.php:43
+#: include/views/configuration.triggers.expression.php:94 jsLoader.php:133
+#: popup_trexpr.php:33
 msgid "Time"
 msgstr "時間"
 
-#: include/views/configuration.screen.constructor.edit.php:337
+#: include/views/configuration.screen.constructor.edit.php:451
 msgid "Time (ascending)"
 msgstr "時間(升冪)"
 
-#: include/views/configuration.screen.constructor.edit.php:336
+#: include/views/configuration.screen.constructor.edit.php:450
 msgid "Time (descending)"
 msgstr "時間(降冪)"
 
-#: include/classes/items/CHelpItems.php:839
+#: include/classes/items/CHelpItems.php:851
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <num>) spent in <state> in percentage."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:843
+#: include/classes/items/CHelpItems.php:855
 msgid "Time of proxy last access. Name - proxy name. Param - lastaccess. Unix timestamp."
 msgstr ""
 
@@ -13507,54 +13909,54 @@ msgstr ""
 msgid "Time period"
 msgstr "時間期間"
 
-#: popup_trexpr.php:53 popup_trexpr.php:95 popup_trexpr.php:110
+#: popup_trexpr.php:43 popup_trexpr.php:85 popup_trexpr.php:100
 msgid "Time shift"
 msgstr "排班"
 
-#: include/views/configuration.screen.constructor.edit.php:480
+#: include/views/configuration.screen.constructor.edit.php:606
 msgid "Time type"
 msgstr "時間類型"
 
-#: include/classes/class.frontendsetup.php:202
+#: include/classes/setup/CFrontendSetup.php:205
 msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\")."
 msgstr ""
 
-#: include/views/configuration.httpconf.edit.php:163
-#: include/views/configuration.httpconf.popup.php:81 popup_httpstep.php:40
+#: include/views/configuration.httpconf.edit.php:199
+#: include/views/configuration.httpconf.popup.php:97 popup_httpstep.php:43
 msgid "Timeout"
 msgstr "逾時"
 
 #: include/classes/screens/CScreenHistory.php:163
-#: include/classes/screens/CScreenHistory.php:267
+#: include/classes/screens/CScreenHistory.php:271
 #: include/classes/screens/CScreenPlainText.php:42
 #: include/classes/screens/CScreenPlainText.php:64
 msgid "Timestamp"
 msgstr "時間戳"
 
-#: popup_trexpr.php:413
+#: popup_trexpr.php:403
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N = 1, 0 - otherwise"
 msgstr "和Zabbix伺服器的時間戳記差異不超過T秒, 則 N = 1, 0 - 除外"
 
-#: popup_trexpr.php:418
+#: popup_trexpr.php:408
 msgid "Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise"
 msgstr "和Zabbix伺服器的時間戳記差異不超過T秒, 則 N 非 1, 0 - 除外"
 
 #: include/classes/items/CHelpItems.php:153
-#: include/classes/items/CHelpItems.php:411
+#: include/classes/items/CHelpItems.php:415
 msgid "Timestamp of system boot."
 msgstr ""
 
-#: include/reports.inc.php:54 include/reports.inc.php:159
-#: include/reports.inc.php:302
+#: include/reports.inc.php:55 include/reports.inc.php:161
+#: include/reports.inc.php:305
 msgid "Title"
 msgstr "主題"
 
-#: include/views/configuration.action.edit.php:437
-#: include/views/js/configuration.sysmaps.js.php:340
+#: include/views/configuration.action.edit.php:483
+#: include/views/js/configuration.sysmaps.js.php:338
 msgid "To"
 msgstr "到"
 
-#: jsLoader.php:226
+#: jsLoader.php:230
 msgid "To set a host interface select a single item type for all items"
 msgstr "要設定一個主機介面, 選擇一個單一的項目類型給所有的項目"
 
@@ -13562,17 +13964,18 @@ msgstr "要設定一個主機介面, 選擇一個單一的項目類型給所有�
 msgid "Today"
 msgstr "今天"
 
-#: include/views/configuration.screen.constructor.edit.php:526
-#: include/views/configuration.screen.constructor.edit.php:567
+#: include/views/configuration.screen.constructor.edit.php:652
+#: include/views/configuration.screen.constructor.edit.php:710
 #: include/views/configuration.sysmap.edit.php:115
 #: include/views/js/configuration.sysmaps.js.php:86
-#: include/views/js/configuration.sysmaps.js.php:253
-#: include/views/monitoring.overview.php:85
+#: include/views/js/configuration.sysmaps.js.php:251
+#: include/views/monitoring.overview.items.php:53
+#: include/views/monitoring.overview.triggers.php:75
 msgid "Top"
 msgstr "頂部"
 
-#: include/blocks.inc.php:464 include/classes/class.chostsinfo.php:121
-#: queue.php:236 queue.php:240
+#: include/blocks.inc.php:469 include/classes/html/CHostsInfo.php:121
+#: queue.php:264 queue.php:268
 msgid "Total"
 msgstr "合計"
 
@@ -13590,7 +13993,7 @@ msgstr "總時間: %s"
 msgid "Transaction has not been closed. Aborting..."
 msgstr "交易尚未被關閉. 放棄中..."
 
-#: api/rpc/class.cjsonrpc.php:204
+#: include/classes/core/CJsonRpc.php:204
 msgid "Transport error."
 msgstr "傳輸錯誤."
 
@@ -13607,90 +14010,90 @@ msgstr ""
 msgid "Trend storage period"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:356
+#: include/views/configuration.item.edit.php:346
 #: include/views/configuration.item.massupdate.php:391
 msgid "Trend storage period (in days)"
 msgstr ""
 
-#: include/forms.inc.php:581 include/forms.inc.php:915
+#: include/forms.inc.php:595 include/forms.inc.php:929
 #: include/views/administration.general.housekeeper.edit.php:161
 #: include/views/configuration.item.list.php:68
-#: include/views/configuration.item.prototype.list.php:55 items.php:158
-#: latest.php:345 latest.php:346
+#: include/views/configuration.item.prototype.list.php:51 items.php:163
+#: latest.php:356 latest.php:357
 msgid "Trends"
 msgstr "趨勢"
 
-#: events.php:337 events.php:378 include/actions.inc.php:56
-#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:480
-#: include/maps.inc.php:26 include/triggers.inc.php:1653
+#: events.php:337 events.php:379 include/actions.inc.php:56
+#: include/audit.inc.php:33 include/classes/graphdraw/CLineGraphDraw.php:484
+#: include/maps.inc.php:26 include/triggers.inc.php:1476
 #: include/views/configuration.services.child.list.php:40
 #: include/views/configuration.services.edit.php:69
-#: include/views/configuration.services.edit.php:93
+#: include/views/configuration.services.edit.php:92
 #: include/views/configuration.services.parent.list.php:36
-#: include/views/configuration.triggers.edit.php:265
+#: include/views/configuration.triggers.edit.php:271
 #: include/views/js/configuration.sysmaps.js.php:19
-#: include/views/js/configuration.sysmaps.js.php:105 jsLoader.php:141
-#: jsLoader.php:214 report5.php:59 services.php:469 tr_comments.php:75
-#: tr_logform.php:151 tr_logform.php:165
+#: include/views/js/configuration.sysmaps.js.php:103 jsLoader.php:142
+#: jsLoader.php:218 report5.php:59 services.php:469 tr_comments.php:76
+#: tr_logform.php:154 tr_logform.php:170
 msgid "Trigger"
 msgstr "觸發器"
 
-#: api/classes/CTriggerGeneral.php:283
+#: include/classes/api/services/CTriggerGeneral.php:283
 #, c-format
 msgid "Trigger \"%1$s\" already exists on \"%2$s\"."
 msgstr "觸發器\"%1$s\"已存在於\"%2$s\"."
 
-#: include/classes/import/CConfigurationImport.php:1159
-#: include/classes/import/CConfigurationImport.php:1200
+#: include/classes/import/CConfigurationImport.php:1244
+#: include/classes/import/CConfigurationImport.php:1288
 #, c-format
 msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist."
 msgstr "觸發器\"%1$s\"相依於一個不存在的觸發器\"%2$s\"."
 
-#: include/classes/import/CXmlImport18.php:1465
-#: include/classes/import/CXmlImport18.php:1469
+#: include/classes/import/CXmlImport18.php:1740
+#: include/classes/import/CXmlImport18.php:1744
 #, c-format
 msgid "Trigger \"%1$s\" skipped - user rule."
 msgstr "略過觸發器\"%1$s\"-用戶規則."
 
-#: api/classes/CTrigger.php:1599
+#: include/classes/api/services/CTrigger.php:1591
 #, c-format
 msgid "Trigger \"%s\" belongs to templates with different linkages."
 msgstr "觸發器\"%s\"屬於有不同連結的模板."
 
-#: triggers.php:183 triggers.php:308 tr_logform.php:146
+#: triggers.php:190 triggers.php:320 tr_logform.php:147
 msgid "Trigger added"
 msgstr "觸發器已新增"
 
-#: api/classes/CTrigger.php:1503
+#: include/classes/api/services/CTrigger.php:1495
 msgid "Trigger cannot be dependent on a trigger that is inherited from it."
 msgstr ""
 
-#: tr_comments.php:26
-msgid "Trigger comments"
-msgstr "觸發器評論"
-
 #: include/views/administration.general.housekeeper.edit.php:45
 msgid "Trigger data storage period (in days)"
 msgstr ""
 
-#: triggers.php:197
+#: triggers.php:208
 msgid "Trigger deleted"
 msgstr "觸發器已删除"
 
-#: triggers.php:273
+#: tr_comments.php:26
+msgid "Trigger description"
+msgstr ""
+
+#: triggers.php:278
 msgid "Trigger disabled"
 msgid_plural "Triggers disabled"
 msgstr[0] ""
 
 #: adm.gui.php:104 adm.housekeeper.php:135 adm.iconmapping.php:118
-#: adm.images.php:143 adm.macros.php:167 adm.other.php:118 adm.regexps.php:201
+#: adm.images.php:142 adm.macros.php:167 adm.other.php:118 adm.regexps.php:209
 #: adm.triggerdisplayoptions.php:84 adm.triggerseverities.php:90
 #: adm.valuemapping.php:135 adm.workingtime.php:71
 #: include/views/administration.general.triggerDisplayOptions.edit.php:114
 msgid "Trigger displaying options"
 msgstr "觸發器顯示選項"
 
-#: triggers.php:272
+#: triggers.php:277
 msgid "Trigger enabled"
 msgid_plural "Triggers enabled"
 msgstr[0] ""
@@ -13704,11 +14107,12 @@ msgstr ""
 msgid "Trigger event and alert data storage period (in days) \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.triggers.expression.php:120
+#: include/views/configuration.triggers.expression.php:119
 msgid "Trigger expression condition"
 msgstr "觸發器表示式條件"
 
-#: api/classes/CTrigger.php:648 api/classes/CTriggerPrototype.php:724
+#: include/classes/api/services/CTrigger.php:649
+#: include/classes/api/services/CTriggerPrototype.php:724
 msgid "Trigger expression must contain at least one host:key reference."
 msgstr "觸發器表示式必需包含至少一個 主機:鍵值 參照."
 
@@ -13716,7 +14120,7 @@ msgstr "觸發器表示式必需包含至少一個 主機:鍵值 參照."
 msgid "Trigger form"
 msgstr "觸發器形式"
 
-#: api/classes/CHostBase.php:187
+#: include/classes/api/services/CHostBase.php:187
 #, c-format
 msgid "Trigger has items from template \"%1$s\" that is not linked to host."
 msgstr "觸發器有項目來自於模板\"%1$s\"其並未連結到主機."
@@ -13729,12 +14133,12 @@ msgstr ""
 msgid "Trigger in \"unknown\" state"
 msgstr ""
 
-#: api/classes/CHostBase.php:143
+#: include/classes/api/services/CHostBase.php:143
 #, c-format
 msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"."
 msgstr "模板\"%1$s\"中的觸發器依賴模板\"%2$s\"中的觸發器"
 
-#: api/classes/CTriggerPrototype.php:449
+#: include/classes/api/services/CTriggerPrototype.php:449
 msgid "Trigger just added. No status update so far."
 msgstr "觸發器剛新增. 尚無沒有狀態更新."
 
@@ -13746,50 +14150,50 @@ msgstr "觸發器標示類型"
 msgid "Trigger name"
 msgstr "觸發器名稱"
 
-#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:265
+#: include/audit.inc.php:34 include/views/configuration.triggers.edit.php:271
 msgid "Trigger prototype"
 msgstr "觸發器類型"
 
-#: api/classes/CTriggerPrototype.php:872
+#: include/classes/api/services/CTriggerPrototype.php:872
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
 msgstr ""
 
-#: api/classes/CTriggerPrototype.php:878
+#: include/classes/api/services/CTriggerPrototype.php:878
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
 msgstr ""
 
-#: trigger_prototypes.php:168
+#: trigger_prototypes.php:175
 msgid "Trigger prototype added"
 msgstr ""
 
-#: trigger_prototypes.php:181
+#: trigger_prototypes.php:192
 msgid "Trigger prototype deleted"
 msgstr ""
 
-#: trigger_prototypes.php:245
+#: trigger_prototypes.php:255
 msgid "Trigger prototype disabled"
 msgid_plural "Trigger prototypes disabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:244
+#: trigger_prototypes.php:254
 msgid "Trigger prototype enabled"
 msgid_plural "Trigger prototypes enabled"
 msgstr[0] ""
 
-#: trigger_prototypes.php:163
+#: trigger_prototypes.php:170
 msgid "Trigger prototype updated"
 msgstr ""
 
-#: include/html.inc.php:393 include/html.inc.php:397
-#: include/views/configuration.host.discovery.list.php:117
-#: include/views/configuration.host.edit.php:598
-#: include/views/configuration.template.edit.php:333
+#: include/html.inc.php:399 include/html.inc.php:403
+#: include/views/configuration.host.discovery.list.php:118
+#: include/views/configuration.host.edit.php:603
+#: include/views/configuration.template.edit.php:330
 msgid "Trigger prototypes"
 msgstr "觸發器類型"
 
-#: trigger_prototypes.php:256
+#: trigger_prototypes.php:268
 msgid "Trigger prototypes deleted"
 msgstr ""
 
@@ -13797,23 +14201,31 @@ msgstr ""
 msgid "Trigger prototypes of"
 msgstr "觸發器類型之於"
 
-#: trigger_prototypes.php:209
+#: trigger_prototypes.php:219
 msgid "Trigger prototypes updated"
 msgstr ""
 
 #: adm.gui.php:103 adm.housekeeper.php:134 adm.iconmapping.php:117
-#: adm.images.php:142 adm.macros.php:166 adm.other.php:117 adm.regexps.php:200
+#: adm.images.php:141 adm.macros.php:166 adm.other.php:117 adm.regexps.php:208
 #: adm.triggerdisplayoptions.php:83 adm.triggerseverities.php:89
 #: adm.valuemapping.php:134 adm.workingtime.php:70
 #: include/views/administration.general.triggerSeverity.edit.php:70
 msgid "Trigger severities"
 msgstr "觸發器嚴重性"
 
-#: include/actions.inc.php:54 include/views/administration.users.edit.php:294
+#: include/actions.inc.php:54 include/views/administration.users.edit.php:296
 msgid "Trigger severity"
 msgstr "觸發器示警度"
 
-#: triggers.php:179 triggers.php:237 tr_logform.php:111
+#: jsLoader.php:197
+msgid "Trigger status \"OK\""
+msgstr ""
+
+#: jsLoader.php:198
+msgid "Trigger status \"Problem\""
+msgstr ""
+
+#: triggers.php:186 triggers.php:247 tr_logform.php:122
 msgid "Trigger updated"
 msgstr "觸發器已更新"
 
@@ -13821,40 +14233,41 @@ msgstr "觸發器已更新"
 msgid "Trigger value"
 msgstr "觸發器值"
 
-#: hosts.php:838 hosts.php:932 include/forms.inc.php:568
-#: include/html.inc.php:404 include/html.inc.php:408 include/menu.inc.php:52
-#: include/triggers.inc.php:1259
+#: hosts.php:864 hosts.php:955 include/forms.inc.php:582
+#: include/html.inc.php:410 include/html.inc.php:414 include/menu.inc.php:51
+#: include/triggers.inc.php:1081
 #: include/views/configuration.action.list.php:33
-#: include/views/configuration.host.discovery.list.php:52
-#: include/views/configuration.host.edit.php:491
+#: include/views/configuration.host.discovery.list.php:48
+#: include/views/configuration.host.edit.php:496
 #: include/views/configuration.item.list.php:64
-#: include/views/configuration.item.list.php:202
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.item.list.php:205
+#: include/views/configuration.template.edit.php:241
 #: include/views/configuration.triggers.list.php:77
-#: include/views/conf.import.php:33 include/views/inventory.host.view.php:199
-#: include/views/inventory.host.view.php:218
-#: include/views/inventory.host.view.php:228
-#: include/views/js/configuration.sysmaps.js.php:397
-#: include/views/monitoring.overview.php:27 jsLoader.php:215 popup.php:43
-#: search.php:135 search.php:142 search.php:177 search.php:199 search.php:221
-#: search.php:275 search.php:328 search.php:396 search.php:430 search.php:456
-#: templates.php:498 templates.php:561 tr_status.php:244
+#: include/views/conf.import.php:35 include/views/inventory.host.view.php:211
+#: include/views/inventory.host.view.php:230
+#: include/views/inventory.host.view.php:240
+#: include/views/js/configuration.sysmaps.js.php:395
+#: include/views/monitoring.overview.items.php:25
+#: include/views/monitoring.overview.triggers.php:27 jsLoader.php:219
+#: popup.php:59 search.php:135 search.php:142 search.php:177 search.php:199
+#: search.php:221 search.php:275 search.php:328 search.php:396 search.php:430
+#: search.php:456 templates.php:512 templates.php:572 tr_status.php:238
 msgid "Triggers"
 msgstr "觸發器"
 
-#: include/classes/class.cserverinfo.php:63
+#: include/classes/html/CServerInfo.php:63
 msgid "Triggers (e/d)[p/o]"
 msgstr ""
 
-#: triggers.php:320
+#: triggers.php:332
 msgid "Triggers deleted"
 msgstr "觸發器已删除"
 
-#: include/classes/class.ctriggersinfo.php:109 include/screens.inc.php:42
+#: include/classes/html/CTriggersInfo.php:107 include/screens.inc.php:42
 msgid "Triggers info"
 msgstr "觸發器資訊"
 
-#: include/views/configuration.triggers.massupdate.php:161
+#: include/views/configuration.triggers.massupdate.php:159
 msgid "Triggers massupdate"
 msgstr "觸發器大量更新"
 
@@ -13862,78 +14275,78 @@ msgstr "觸發器大量更新"
 msgid "Triggers overview"
 msgstr "觸發器概覽"
 
-#: tr_status.php:261
+#: include/views/common.filter.trigger.php:37
 msgid "Triggers status"
 msgstr "觸發器狀態"
 
-#: include/menu.inc.php:133
+#: include/menu.inc.php:129
 msgid "Triggers top 100"
 msgstr "前百大觸發器"
 
-#: include/views/monitoring.dashconf.php:87
+#: include/views/monitoring.dashconf.php:99
 msgid "Triggers with severity"
 msgstr "具示警度的觸發器"
 
-#: queue.php:241
+#: queue.php:269
 msgid "Truncated"
 msgstr "刪短的"
 
-#: include/classes/class.cpagefilter.php:188
+#: include/classes/pagefilter/CPageFilter.php:188
 #, c-format
 msgid "Try to read inaccessible property \"%s\"."
 msgstr "嘗試讀取不能存取的屬性\"%s\"."
 
-#: include/func.inc.php:227
+#: include/func.inc.php:215
 msgid "Tue"
 msgstr "二"
 
-#: include/forms.inc.php:1640 include/forms.inc.php:1708
-#: include/func.inc.php:149 include/func.inc.php:239
+#: include/forms.inc.php:1656 include/forms.inc.php:1724
+#: include/func.inc.php:137 include/func.inc.php:227
 msgid "Tuesday"
 msgstr "週二"
 
-#: include/locales.inc.php:77
+#: include/locales.inc.php:81
 msgid "Turkish (tr_TR)"
 msgstr ""
 
-#: jsLoader.php:148
+#: jsLoader.php:149
 msgid "Two elements should be selected"
 msgstr "兩個組件必需被選擇"
 
-#: api/classes/CItem.php:958
+#: include/classes/api/services/CItem.php:961
 #, 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 "兩個項目 (\"%1$s\"和\"%2$s\")不能填入一個主機資產紀錄欄位\"%3$s\", 這會造成衝突."
 
 #: include/actions.inc.php:820 include/classes/screens/CScreenActions.php:50
 #: include/classes/screens/CScreenActions.php:56
-#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:505
+#: include/classes/screens/CScreenActions.php:130 include/forms.inc.php:512
 #: include/hosts.inc.php:105
 #: include/views/administration.auditacts.list.php:71
-#: include/views/administration.general.image.edit.php:36
 #: include/views/administration.general.image.list.php:27
-#: include/views/administration.mediatypes.edit.php:53
+#: include/views/administration.mediatypes.edit.php:52
 #: include/views/administration.mediatypes.list.php:40
-#: include/views/administration.script.edit.php:48
+#: include/views/administration.script.edit.php:47
 #: include/views/administration.script.list.php:39
-#: include/views/configuration.action.edit.php:695
-#: include/views/configuration.graph.edit.php:223
+#: include/views/configuration.action.edit.php:741
+#: include/views/configuration.graph.edit.php:233
 #: include/views/configuration.host.discovery.edit.php:57
 #: include/views/configuration.host.discovery.edit.php:64
-#: include/views/configuration.host.discovery.list.php:57
+#: include/views/configuration.host.discovery.list.php:53
 #: include/views/configuration.item.edit.php:57
 #: include/views/configuration.item.edit.php:64
 #: include/views/configuration.item.list.php:69
 #: include/views/configuration.item.massupdate.php:45
-#: include/views/configuration.item.prototype.list.php:56
+#: include/views/configuration.item.prototype.list.php:52
 #: include/views/configuration.maintenance.list.php:45
-#: include/views/configuration.services.edit.php:132
+#: include/views/configuration.services.edit.php:131
 #: include/views/inventory.host.list.php:77
 #: include/views/js/configuration.sysmaps.js.php:13
-#: include/views/js/configuration.sysmaps.js.php:398
-#: include/views/monitoring.overview.php:33 latest.php:348 latest.php:349
-#: popup_media.php:117 popup.php:467 popup.php:763 popup.php:872 popup.php:881
-#: tr_logform.php:303 tr_logform.php:307
+#: include/views/js/configuration.sysmaps.js.php:396
+#: include/views/monitoring.overview.items.php:30
+#: include/views/monitoring.overview.triggers.php:32 latest.php:359
+#: latest.php:360 popup_media.php:117 popup.php:495 popup.php:1100
+#: tr_logform.php:272 tr_logform.php:276
 msgid "Type"
 msgstr "類型"
 
@@ -13941,62 +14354,64 @@ msgstr "類型"
 msgid "Type (Full details)"
 msgstr "類型(全細節)"
 
-#: include/views/js/configuration.sysmaps.js.php:370
+#: include/views/js/configuration.sysmaps.js.php:368
 msgid "Type (OK)"
 msgstr "類型(OK)"
 
-#: include/views/configuration.screen.constructor.edit.php:339
+#: include/views/configuration.screen.constructor.edit.php:453
 msgid "Type (ascending)"
 msgstr "類型(升冪)"
 
-#: include/views/configuration.screen.constructor.edit.php:338
+#: include/views/configuration.screen.constructor.edit.php:452
 msgid "Type (descending)"
 msgstr "類型(降冪)"
 
-#: include/views/configuration.action.edit.php:113
-#: include/views/configuration.action.edit.php:929
+#: include/views/configuration.action.edit.php:126
+#: include/views/configuration.action.edit.php:993
 #: include/views/configuration.host.discovery.edit.php:274
 msgid "Type of calculation"
 msgstr "計算方式"
 
-#: include/forms.inc.php:507 include/forms.inc.php:885
+#: include/forms.inc.php:514 include/forms.inc.php:899
 #: include/views/configuration.item.edit.php:205
 #: include/views/configuration.item.edit.php:216
-#: include/views/configuration.item.massupdate.php:215 popup.php:764
-#: popup.php:873 popup.php:882
+#: include/views/configuration.item.massupdate.php:215 popup.php:1101
 msgid "Type of information"
 msgstr "數據類型"
 
-#: api/classes/CItemGeneral.php:319
+#: include/classes/api/services/CItemGeneral.php:319
 msgid "Type of information must be \"Log\" for log key."
 msgstr "日誌鍵值的資訊類型必須是\"Log\" ."
 
-#: api/classes/CItemGeneral.php:314
+#: include/classes/api/services/CItemGeneral.php:314
 msgid "Type of information must be \"Numeric (float)\" for aggregate items."
 msgstr "整合性項目的資訊的類型必須是\"Numeric (float)\"."
 
-#: include/forms.inc.php:880
+#: include/forms.inc.php:894
 msgid "Types"
 msgstr "類型 "
 
 #: include/translateDefines.inc.php:25
+#: include/views/js/adm.regexprs.edit.js.php:381
 msgid "UNKNOWN"
 msgstr "未知的"
 
-#: include/triggers.inc.php:183
+#: include/triggers.inc.php:171
 msgid "UP"
 msgstr "上線"
 
-#: include/views/configuration.httpconf.edit.php:164
-#: include/views/configuration.httpconf.popup.php:78
+#: include/screens.inc.php:44
+#: include/views/configuration.httpconf.edit.php:200
+#: include/views/configuration.httpconf.popup.php:87
+#: include/views/configuration.screen.constructor.edit.php:661
 #: include/views/configuration.sysmap.edit.php:137
-#: include/views/configuration.triggers.edit.php:246
-#: include/views/js/configuration.sysmaps.js.php:187 jsLoader.php:216
-#: popup_httpstep.php:37 tr_logform.php:372
+#: include/views/configuration.triggers.edit.php:252
+#: include/views/js/configuration.sysmaps.js.php:185 jsLoader.php:220
+#: popup_httpstep.php:37 tr_logform.php:340
 msgid "URL"
 msgstr "URL"
 
-#: include/views/administration.users.edit.php:168
+#: include/views/administration.users.edit.php:170
 msgid "URL (after login)"
 msgstr "登錄後定向到"
 
@@ -14012,20 +14427,30 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/html.inc.php:106
-msgid "URL parameter cannot be array."
+#: include/classes/api/services/CMap.php:469
+#, c-format
+msgid "URL name should be unique for map \"%s\"."
 msgstr ""
 
 #: include/html.inc.php:112
+msgid "URL parameter cannot be array."
+msgstr ""
+
+#: include/html.inc.php:118
 msgid "URL parameter name is empty."
 msgstr ""
 
+#: include/classes/api/services/CMap.php:463
+#, c-format
+msgid "URL should have both \"name\" and \"url\" fields for map \"%s\"."
+msgstr ""
+
 #: include/views/configuration.sysmap.edit.php:180
-#: include/views/js/configuration.sysmaps.js.php:182 jsLoader.php:217
+#: include/views/js/configuration.sysmaps.js.php:180 jsLoader.php:221
 msgid "URLs"
 msgstr "URLs"
 
-#: include/views/administration.mediatypes.edit.php:89
+#: include/views/administration.mediatypes.edit.php:88
 msgid "USA (160 characters)"
 msgstr "USA (160字元)"
 
@@ -14033,15 +14458,11 @@ msgstr "USA (160字元)"
 msgid "USER PROFILE"
 msgstr "用戶基本資料"
 
-#: include/func.inc.php:2434
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: include/locales.inc.php:78
+#: include/locales.inc.php:82
 msgid "Ukrainian (uk_UA)"
 msgstr "烏克蘭語 (uk_UA)"
 
-#: include/profiles.inc.php:300
+#: include/profiles.inc.php:38
 msgid "Unable to select configuration."
 msgstr "不能選擇組態."
 
@@ -14049,7 +14470,7 @@ msgstr "不能選擇組態."
 msgid "Unable to upload file because \"file_uploads\" is disabled."
 msgstr ""
 
-#: include/maps.inc.php:502 include/maps.inc.php:585 include/maps.inc.php:676
+#: include/maps.inc.php:519 include/maps.inc.php:602 include/maps.inc.php:693
 msgid "Unacknowledged"
 msgstr "未知悉的"
 
@@ -14062,20 +14483,20 @@ msgid "Unacknowledged PROBLEM events"
 msgstr "未知悉的Problem事件"
 
 #: include/views/configuration.sysmap.edit.php:123
-#: include/views/monitoring.dashconf.php:94
+#: include/views/monitoring.dashconf.php:106
 msgid "Unacknowledged only"
 msgstr "僅未知悉的"
 
-#: include/views/administration.users.edit.php:107
+#: include/views/administration.users.edit.php:106
 #, c-format
 msgid "Unavailable for users with %1$s."
 msgstr ""
 
-#: include/views/administration.users.list.php:150
+#: include/views/administration.users.list.php:151
 msgid "Unblock selected"
 msgstr "解除封鎖所選的"
 
-#: include/views/administration.users.list.php:151
+#: include/views/administration.users.list.php:152
 msgid "Unblock selected users?"
 msgstr "解除封鎖所選的用戶?"
 
@@ -14084,29 +14505,29 @@ msgstr "解除封鎖所選的用戶?"
 msgid "Units"
 msgstr "單位"
 
-#: events.php:572 events.php:573 events.php:583 events.php:584 events.php:585
-#: events.php:586 hosts.php:981 httpdetails.php:165 httpmon.php:167
+#: events.php:573 events.php:574 events.php:584 events.php:585 events.php:586
+#: events.php:587 httpdetails.php:165 httpmon.php:174
 #: include/actions.inc.php:41 include/actions.inc.php:96
 #: include/actions.inc.php:113 include/actions.inc.php:132
 #: include/actions.inc.php:151 include/actions.inc.php:160
 #: include/actions.inc.php:185 include/actions.inc.php:199
 #: include/actions.inc.php:210 include/actions.inc.php:241
 #: include/actions.inc.php:625 include/actions.inc.php:1171
-#: include/blocks.inc.php:1166 include/classes/class.chostsinfo.php:120
+#: include/blocks.inc.php:1171 include/classes/html/CHostsInfo.php:120
 #: include/discovery.inc.php:131 include/discovery.inc.php:168
 #: include/events.inc.php:47 include/events.inc.php:78
 #: include/graphs.inc.php:37 include/graphs.inc.php:67
-#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:333
+#: include/hosts.inc.php:53 include/hosts.inc.php:80 include/html.inc.php:339
 #: include/httptest.inc.php:39 include/httptest.inc.php:56
 #: include/items.inc.php:45 include/items.inc.php:107
 #: include/items.inc.php:131 include/items.inc.php:148
 #: include/items.inc.php:164 include/items.inc.php:191
 #: include/items.inc.php:212 include/maintenances.inc.php:39
 #: include/maps.inc.php:39 include/media.inc.php:40 include/perm.inc.php:36
-#: include/perm.inc.php:53 include/regexp.inc.php:199
-#: include/screens.inc.php:55 include/triggers.inc.php:62
-#: include/triggers.inc.php:177 include/triggers.inc.php:196
-#: include/triggers.inc.php:2510 include/triggers.inc.php:2516
+#: include/perm.inc.php:53 include/regexp.inc.php:221
+#: include/screens.inc.php:57 include/triggers.inc.php:62
+#: include/triggers.inc.php:165 include/triggers.inc.php:184
+#: include/triggers.inc.php:2320 include/triggers.inc.php:2326
 #: include/users.inc.php:66 include/users.inc.php:88
 #: include/views/js/configuration.discovery.edit.js.php:192
 msgid "Unknown"
@@ -14116,23 +14537,20 @@ msgstr "未知的"
 msgid "Unknown action"
 msgstr "未知的操作"
 
-#: include/services.inc.php:361
-msgid "Unknown calculation algorithm of service status"
-msgstr "未知的服務狀態計算演算法"
-
-#: httpdetails.php:160 httpdetails.php:233 httpmon.php:142
+#: httpdetails.php:160 httpdetails.php:233 httpmon.php:149
+#: include/views/configuration.httpconf.list.php:99
 msgid "Unknown error"
 msgstr ""
 
-#: include/classes/validators/CTriggerFunctionValidator.php:249
+#: include/classes/validators/CFunctionValidator.php:249
 msgid "Unknown function."
 msgstr "未知的方程式."
 
-#: include/triggers.inc.php:1792 popup_trexpr.php:592 tr_testexpr.php:34
+#: include/triggers.inc.php:1616 popup_trexpr.php:616 tr_testexpr.php:34
 msgid "Unknown host item, no such item in selected host"
 msgstr "未知的主機項目, 在所選的主機中沒有這樣的項目"
 
-#: include/triggers.inc.php:1791 tr_testexpr.php:33
+#: include/triggers.inc.php:1615 tr_testexpr.php:33
 msgid "Unknown host, no such host present in system"
 msgstr "未知的主機, 在系統中沒有出現這樣的主機."
 
@@ -14144,23 +14562,23 @@ msgstr "未知的界面類型."
 msgid "Unknown resource"
 msgstr "未知的資源"
 
-#: httpmon.php:154
+#: httpmon.php:161 include/views/configuration.httpconf.list.php:101
 #, c-format
 msgid "Unknown step failed: %1$s"
 msgstr ""
 
-#: include/items.inc.php:888
+#: include/items.inc.php:896
 msgid "Unknown value type"
 msgstr "未知的值類型"
 
-#: include/views/configuration.host.edit.php:672
-#: include/views/configuration.host.prototype.edit.php:222
-#: include/views/configuration.template.edit.php:403
+#: include/views/configuration.host.edit.php:699
+#: include/views/configuration.host.prototype.edit.php:227
+#: include/views/configuration.template.edit.php:421
 msgid "Unlink"
 msgstr "取消關聯"
 
-#: include/views/configuration.host.edit.php:676
-#: include/views/configuration.template.edit.php:407
+#: include/views/configuration.host.edit.php:703
+#: include/views/configuration.template.edit.php:425
 msgid "Unlink and clear"
 msgstr "取消關聯並清理"
 
@@ -14168,61 +14586,61 @@ msgstr "取消關聯並清理"
 msgid "Unlink from template"
 msgstr "自模板斷連"
 
-#: include/actions.inc.php:432 include/views/configuration.action.edit.php:863
+#: include/actions.inc.php:432 include/views/configuration.action.edit.php:927
 msgid "Unlink from templates"
 msgstr "自模板斷連"
 
-#: api/classes/CHostGeneral.php:570
+#: include/classes/api/services/CHostGeneral.php:570
 #, c-format
 msgid "Unlinked: Application \"%1$s\" on \"%2$s\"."
 msgstr "斷連: 應用程式\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CHostGeneral.php:348
+#: include/classes/api/services/CHostGeneral.php:348
 #, c-format
 msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "未連結的: 探索規則\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CHostGeneral.php:482
+#: include/classes/api/services/CHostGeneral.php:482
 #, c-format
 msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"."
 msgstr "未連結的: 圖形\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CHostGeneral.php:465
+#: include/classes/api/services/CHostGeneral.php:465
 #, c-format
 msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"."
 msgstr "未連結的: 圖形原型\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CHostGeneral.php:413
+#: include/classes/api/services/CHostGeneral.php:413
 #, c-format
 msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHostGeneral.php:365
+#: include/classes/api/services/CHostGeneral.php:365
 #, c-format
 msgid "Unlinked: Item \"%1$s\" on \"%2$s\"."
 msgstr "斷連:   \"%2$s\"上的項目\"%1$s\"."
 
-#: api/classes/CHostGeneral.php:382
+#: include/classes/api/services/CHostGeneral.php:382
 #, c-format
 msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "斷連:   \"%2$s\"上的項目原型\"%1$s\"."
 
-#: api/classes/CHostGeneral.php:288
+#: include/classes/api/services/CHostGeneral.php:288
 #, c-format
 msgid "Unlinked: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "斷連:   \"%2$s\"上的觸發器\"%1$s\"."
 
-#: api/classes/CHostGeneral.php:305
+#: include/classes/api/services/CHostGeneral.php:305
 #, c-format
 msgid "Unlinked: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "斷連:   \"%2$s\"上的觸發器原型\"%1$s\"."
 
-#: api/classes/CHostGeneral.php:521
+#: include/classes/api/services/CHostGeneral.php:521
 #, c-format
 msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: jsLoader.php:160
+#: jsLoader.php:161
 msgid "Unmute"
 msgstr "開聲音"
 
@@ -14236,32 +14654,43 @@ msgstr "未支援的匯入檔案副檔名\"%1$s\"."
 msgid "Unsupported import format \"%1$s\"."
 msgstr "未支援的匯入格式\"%1$s\"."
 
-#: api/classes/CHostPrototype.php:227 api/classes/CHostPrototype.php:245
+#: include/classes/api/services/CHostPrototype.php:227
+#: include/classes/api/services/CHostPrototype.php:245
 #, c-format
 msgid "Unsupported parameter \"%1$s\" for group prototype."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:886
+#: include/classes/api/services/CAction.php:2075
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:896
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:209
+#: include/classes/api/services/CHostPrototype.php:209
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype \"%1$s\"."
 msgstr ""
 
-#: api/classes/CHostPrototype.php:203
+#: include/classes/api/services/CHostPrototype.php:203
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for host prototype %1$s host inventory."
 msgstr ""
 
-#: api/classes/CDiscoveryRule.php:854
+#: include/classes/api/services/CAction.php:2025
+#, c-format
+msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
+msgstr ""
+
+#: include/classes/api/services/CDiscoveryRule.php:864
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/blocks.inc.php:1252
+#: include/blocks.inc.php:1257
 msgctxt "discovery results in dashboard"
 msgid "Up"
 msgstr "上"
@@ -14272,34 +14701,34 @@ msgid "Up"
 msgstr "上"
 
 #: include/views/administration.auditlogs.list.php:46
-#: include/views/configuration.action.edit.php:993
-#: include/views/configuration.host.massupdate.php:310
-#: include/views/configuration.httpconf.popup.php:93
-#: include/views/configuration.item.massupdate.php:558
+#: include/views/configuration.action.edit.php:1057
+#: include/views/configuration.host.massupdate.php:342
+#: include/views/configuration.httpconf.popup.php:109
+#: include/views/configuration.item.massupdate.php:570
 #: include/views/js/adm.regexprs.edit.js.php:255
-#: include/views/js/configuration.discovery.edit.js.php:348
-#: popup_period.php:130
+#: include/views/js/configuration.discovery.edit.js.php:355
+#: popup_period.php:143
 msgid "Update"
 msgstr "更新"
 
-#: include/views/conf.import.php:23
+#: include/views/conf.import.php:24
 msgid "Update existing"
 msgstr "更新現有的"
 
-#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:64
-#: items.php:156
+#: include/forms.inc.php:428 include/views/configuration.httpconf.list.php:66
+#: items.php:161
 msgid "Update interval"
 msgstr "更新間隔"
 
 #: disc_prototypes.php:47 host_discovery.php:54 httpconf.php:45
 #: include/views/configuration.host.discovery.edit.php:192
-#: include/views/configuration.httpconf.edit.php:87
+#: include/views/configuration.httpconf.edit.php:78
 #: include/views/configuration.item.edit.php:259
 #: include/views/configuration.item.massupdate.php:310 items.php:49
 msgid "Update interval (in sec)"
 msgstr "數據更新間隔(秒)"
 
-#: auditlogs.php:131 include/classes/class.cserverinfo.php:40
+#: auditlogs.php:131 include/classes/html/CServerInfo.php:40
 msgid "Updated"
 msgstr "更新"
 
@@ -14307,55 +14736,55 @@ msgstr "更新"
 msgid "Updated status of host"
 msgstr "主機的已更新狀態"
 
-#: include/blocks.inc.php:452 include/blocks.inc.php:787
-#: include/blocks.inc.php:859 include/blocks.inc.php:1117
-#: include/blocks.inc.php:1218 include/blocks.inc.php:1268
+#: include/blocks.inc.php:457 include/blocks.inc.php:793
+#: include/blocks.inc.php:865 include/blocks.inc.php:1122
+#: include/blocks.inc.php:1223 include/blocks.inc.php:1273
 #: include/classes/screens/CScreenSystemStatus.php:47
 #, c-format
 msgid "Updated: %s"
 msgstr "已更新: %s"
 
-#: api/classes/managers/CApplicationManager.php:122
+#: include/classes/api/managers/CApplicationManager.php:122
 #, c-format
 msgid "Updated: Application \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 應用程式\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CDiscoveryRule.php:752
+#: include/classes/api/services/CDiscoveryRule.php:762
 #, c-format
 msgid "Updated: Discovery rule \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 探索規則\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CHostPrototype.php:615
+#: include/classes/api/services/CHostPrototype.php:615
 #, c-format
 msgid "Updated: Host prototype \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: api/classes/CItem.php:580
+#: include/classes/api/services/CItem.php:583
 #, c-format
 msgid "Updated: Item \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 項目\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CItemPrototype.php:411
+#: include/classes/api/services/CItemPrototype.php:421
 #, c-format
 msgid "Updated: Item prototype \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 項目原型\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CTrigger.php:1253
+#: include/classes/api/services/CTrigger.php:1241
 #, c-format
 msgid "Updated: Trigger \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 觸發器\"%1$s\"於\"%2$s\"."
 
-#: api/classes/CTriggerPrototype.php:763
+#: include/classes/api/services/CTriggerPrototype.php:763
 #, c-format
 msgid "Updated: Trigger prototype \"%1$s\" on \"%2$s\"."
 msgstr "已更新: 觸發器原型\"%1$s\"於\"%2$s\"."
 
-#: api/classes/managers/CHttpTestManager.php:264
+#: include/classes/api/managers/CHttpTestManager.php:264
 #, c-format
 msgid "Updated: Web scenario \"%1$s\" on \"%2$s\"."
 msgstr ""
 
-#: include/views/administration.general.image.edit.php:37
+#: include/views/administration.general.image.edit.php:33
 msgid "Upload"
 msgstr "上傳"
 
@@ -14363,14 +14792,14 @@ msgstr "上傳"
 msgid "Upper level maps"
 msgstr "上層拓墣圖"
 
-#: include/views/configuration.services.edit.php:138
-#: include/views/configuration.services.edit.php:261
+#: include/views/configuration.services.edit.php:137
+#: include/views/configuration.services.edit.php:260
 #: include/views/monitoring.discovery.php:42
 #: include/views/monitoring.discovery.php:161
 msgid "Uptime"
 msgstr "在線時間"
 
-#: include/classes/items/CHelpItems.php:875
+#: include/classes/items/CHelpItems.php:887
 msgid "Uptime of Zabbix server process in seconds."
 msgstr ""
 
@@ -14378,10 +14807,10 @@ msgstr ""
 msgid "Uptime/Downtime"
 msgstr "在線/不在線"
 
-#: include/screens.inc.php:44
-#: include/views/configuration.screen.constructor.edit.php:535
-msgid "Url"
-msgstr "Url"
+#: include/views/js/configuration.host.edit.js.php:12
+#: include/views/js/configuration.host.edit.js.php:365
+msgid "Use bulk requests"
+msgstr ""
 
 #: include/views/configuration.item.edit.php:257
 msgid "Use custom multiplier"
@@ -14396,83 +14825,87 @@ msgid "Used in actions"
 msgstr "用於動作中"
 
 #: httpconf.php:53 include/acknow.inc.php:49 include/actions.inc.php:970
-#: include/audit.inc.php:24 include/hosts.inc.php:67 include/setup.inc.php:319
-#: include/views/administration.auditlogs.list.php:56
+#: include/audit.inc.php:24 include/classes/setup/CSetupWizard.php:319
+#: include/hosts.inc.php:67 include/views/administration.auditlogs.list.php:56
 #: include/views/administration.auditlogs.list.php:86
-#: include/views/administration.users.edit.php:341
-#: include/views/configuration.action.edit.php:516
-#: include/views/configuration.httpconf.edit.php:82
+#: include/views/administration.users.edit.php:343
+#: include/views/configuration.action.edit.php:562
+#: include/views/configuration.httpconf.edit.php:158
 msgid "User"
 msgstr "用户"
 
-#: api/classes/CUser.php:298
+#: include/classes/api/services/CUser.php:288
 #, c-format
 msgid "User \"%s\" cannot be without user group."
 msgstr "用戶\"%s\"不能沒有用戶群組."
 
-#: users.php:246
+#: users.php:247
 msgid "User added"
 msgstr "新增用户"
 
-#: include/views/administration.users.edit.php:359
+#: include/views/administration.users.edit.php:361
 msgid "User can't change type for himself"
 msgstr "用戶不能自行改變類型"
 
-#: api/classes/CUserGroup.php:440
+#: include/classes/api/services/CUserGroup.php:455
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "用戶不能將自己加進一個取消的群組或已取消圖形介面存取權的群組."
 
-#: include/users.inc.php:210
+#: include/users.inc.php:212
 msgid "User cannot change GUI access for himself."
 msgstr "用戶不能自行改變GUI存取."
 
-#: api/classes/CUserGroup.php:307
+#: include/classes/api/services/CUserGroup.php:322
 msgid "User cannot change status of himself"
 msgstr "用戶不能改變自己的狀態"
 
-#: include/users.inc.php:185
+#: include/users.inc.php:187
 msgid "User cannot change status of himself."
 msgstr "用戶不能改變自己的狀態"
 
-#: users.php:290 users.php:345
+#: users.php:298 users.php:358
 msgid "User deleted"
 msgstr "用户已删除"
 
-#: api/classes/CUserGroup.php:230 include/audit.inc.php:31
-#: include/views/administration.script.edit.php:78
+#: include/audit.inc.php:31 include/views/administration.script.edit.php:77
 #: include/views/administration.script.list.php:42
-#: include/views/administration.usergroups.edit.php:128
+#: include/views/administration.usergroups.edit.php:127
 #: include/views/administration.users.list.php:41
-#: include/views/configuration.action.edit.php:507
+#: include/views/configuration.action.edit.php:553
 msgid "User group"
 msgstr "用户群組"
 
-#: api/classes/CUserGroup.php:663
+#: include/classes/api/services/CUserGroup.php:245
+#, c-format
+msgid "User group \"%1$s\" already exists."
+msgstr ""
+
+#: include/classes/api/services/CUserGroup.php:678
 #, c-format
 msgid "User group \"%1$s\" is the only group that user \"%2$s\" belongs to."
 msgstr ""
 
-#: api/classes/CUserGroup.php:646
+#: include/classes/api/services/CUserGroup.php:661
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: api/classes/CUserGroup.php:635
+#: include/classes/api/services/CUserGroup.php:650
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "用戶群組\"%1$s\"被用於腳本\"%2$s\"."
 
-#: api/classes/CUserGroup.php:409
+#: include/classes/api/services/CUserGroup.php:424
 #, c-format
 msgid "User group \"%s\" already exists."
 msgstr "用戶群組\"%s\"已存在."
 
-#: usergrps.php:345
+#: usergrps.php:366
 msgid "User group disabled"
 msgid_plural "User groups disabled"
 msgstr[0] ""
 
-#: usergrps.php:344
+#: usergrps.php:365
 msgid "User group enabled"
 msgid_plural "User groups enabled"
 msgstr[0] ""
@@ -14488,34 +14921,34 @@ msgstr ""
 
 #: include/views/administration.usergroups.list.php:28
 #: include/views/administration.usergroups.list.php:34
-#: include/views/administration.users.list.php:28 popup.php:47
+#: include/views/administration.users.list.php:28 popup.php:63
 #: popup_usrgrp.php:25 popup_usrgrp.php:46
 msgid "User groups"
 msgstr "用户群組"
 
-#: api/classes/CUser.php:1290
+#: include/classes/api/services/CUser.php:1295
 msgid "User is not allowed to delete himself."
 msgstr "用戶是不允許刪除自己"
 
-#: api/classes/CUser.php:311
+#: include/classes/api/services/CUser.php:301
 #, c-format
 msgid "User may not modify GUI access for himself by becoming a member of user group \"%s\"."
 msgstr "用戶不能因為成為用戶群組 \"%s\"的成員而幫自己修改GUI存取."
 
-#: api/classes/CUser.php:315
+#: include/classes/api/services/CUser.php:305
 #, c-format
 msgid "User may not modify system status for himself by becoming a member of user group \"%s\"."
 msgstr "用戶不能因為成為用戶群組 \"%s\"的成員而幫自己修改系統狀態."
 
 #: disc_prototypes.php:66 host_discovery.php:67
-#: include/views/configuration.action.edit.php:718
+#: include/views/configuration.action.edit.php:764
 #: include/views/configuration.host.discovery.edit.php:167
 #: include/views/configuration.item.edit.php:173
 #: include/views/configuration.item.massupdate.php:260 items.php:73
 msgid "User name"
 msgstr "用戶名稱"
 
-#: index.php:100
+#: index.php:102
 msgid "User name does not match with DB"
 msgstr "用戶名稱和DB中的不符"
 
@@ -14541,243 +14974,243 @@ msgstr ""
 msgid "User sessions"
 msgstr ""
 
-#: include/views/administration.users.edit.php:359
-#: include/views/administration.users.edit.php:363
+#: include/views/administration.users.edit.php:361
+#: include/views/administration.users.edit.php:365
 #: include/views/administration.users.list.php:57
 msgid "User type"
 msgstr "用戶類型"
 
-#: profile.php:179 users.php:239
+#: profile.php:180 users.php:240
 msgid "User updated"
 msgstr "用户已更新"
 
-#: api/classes/CUser.php:359
+#: include/classes/api/services/CUser.php:349
 #, c-format
 msgid "User with alias \"%s\" already exists."
 msgstr "使用別名\"%s\"的用戶已存在."
 
-#: include/views/administration.mediatypes.edit.php:85
+#: include/views/administration.mediatypes.edit.php:84
 #: include/views/administration.mediatypes.list.php:68
-#: include/views/configuration.host.edit.php:748
-#: include/views/configuration.host.prototype.edit.php:265
+#: include/views/configuration.host.edit.php:779
+#: include/views/configuration.host.prototype.edit.php:276
 #: include/views/general.login.php:66 index.php:32
 msgid "Username"
 msgstr "用戶名稱"
 
-#: include/menu.inc.php:250
-#: include/views/administration.usergroups.edit.php:55
+#: include/menu.inc.php:242
+#: include/views/administration.usergroups.edit.php:54
 #: include/views/administration.usergroups.list.php:29
 #: include/views/administration.usergroups.list.php:121
 #: include/views/administration.users.list.php:29
-#: include/views/administration.users.list.php:43 popup.php:51
+#: include/views/administration.users.list.php:43 popup.php:67
 msgid "Users"
 msgstr "用户"
 
-#: include/classes/class.cserverinfo.php:41
+#: include/classes/html/CServerInfo.php:41
 msgid "Users (online)"
 msgstr "用戶(線上)"
 
-#: users.php:313
+#: users.php:324
 msgid "Users unblocked"
 msgstr "未被封鎖的用戶"
 
-#: include/classes/items/CHelpItems.php:887
+#: include/classes/items/CHelpItems.php:899
 msgid "VMware cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:595
+#: include/classes/items/CHelpItems.php:603
 msgid "VMware cluster status, <url> - VMware service URL, <name> - VMware cluster name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:599
+#: include/classes/items/CHelpItems.php:607
 msgid "VMware event log, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:655
+#: include/classes/items/CHelpItems.php:663
 msgid "VMware hypervisor BIOS uuid, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:663
+#: include/classes/items/CHelpItems.php:671
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:611
+#: include/classes/items/CHelpItems.php:619
 msgid "VMware hypervisor cluster name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:619
+#: include/classes/items/CHelpItems.php:627
 msgid "VMware hypervisor datastore read statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:623
+#: include/classes/items/CHelpItems.php:631
 msgid "VMware hypervisor datastore write statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - datastore name, <mode> - latency"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:651
+#: include/classes/items/CHelpItems.php:659
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:627
+#: include/classes/items/CHelpItems.php:635
 msgid "VMware hypervisor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:671
+#: include/classes/items/CHelpItems.php:679
 msgid "VMware hypervisor network input statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:675
+#: include/classes/items/CHelpItems.php:683
 msgid "VMware hypervisor network output statistics, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <mode> - bps"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:631
+#: include/classes/items/CHelpItems.php:639
 msgid "VMware hypervisor processor frequency, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:635
+#: include/classes/items/CHelpItems.php:643
 msgid "VMware hypervisor processor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:615
+#: include/classes/items/CHelpItems.php:623
 msgid "VMware hypervisor processor usage in Hz, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:679
+#: include/classes/items/CHelpItems.php:687
 msgid "VMware hypervisor status, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:647
+#: include/classes/items/CHelpItems.php:655
 msgid "VMware hypervisor total memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:683
+#: include/classes/items/CHelpItems.php:691
 msgid "VMware hypervisor uptime, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:667
+#: include/classes/items/CHelpItems.php:675
 msgid "VMware hypervisor used memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:659
+#: include/classes/items/CHelpItems.php:667
 msgid "VMware hypervisor vendor name, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:687
+#: include/classes/items/CHelpItems.php:695
 msgid "VMware hypervisor version, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:603
+#: include/classes/items/CHelpItems.php:611
 msgid "VMware service full name, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:607
+#: include/classes/items/CHelpItems.php:615
 msgid "VMware service version, <url> - VMware service URL"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:711
+#: include/classes/items/CHelpItems.php:719
 msgid "VMware virtual machine ballooned memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:755
+#: include/classes/items/CHelpItems.php:763
 msgid "VMware virtual machine committed storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:715
+#: include/classes/items/CHelpItems.php:723
 msgid "VMware virtual machine compressed memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:771
+#: include/classes/items/CHelpItems.php:779
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:775
+#: include/classes/items/CHelpItems.php:783
 msgid "VMware virtual machine disk device write statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:779
+#: include/classes/items/CHelpItems.php:787
 msgid "VMware virtual machine file system statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <fsname> - file system name, <mode> - total/free/used/pfree/pused"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:731
+#: include/classes/items/CHelpItems.php:739
 msgid "VMware virtual machine guest memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:735
+#: include/classes/items/CHelpItems.php:743
 msgid "VMware virtual machine host memory usage, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:707
+#: include/classes/items/CHelpItems.php:715
 msgid "VMware virtual machine hypervisor name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:695
+#: include/classes/items/CHelpItems.php:703
 msgid "VMware virtual machine name, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:743
+#: include/classes/items/CHelpItems.php:751
 msgid "VMware virtual machine network interface input statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:747
+#: include/classes/items/CHelpItems.php:755
 msgid "VMware virtual machine network interface output statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance, <mode> - bps/pps - bytes/packets per second"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:751
+#: include/classes/items/CHelpItems.php:759
 msgid "VMware virtual machine power state, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:719
+#: include/classes/items/CHelpItems.php:727
 msgid "VMware virtual machine private memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:703
+#: include/classes/items/CHelpItems.php:711
 msgid "VMware virtual machine processor usage in Hz, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:723
+#: include/classes/items/CHelpItems.php:731
 msgid "VMware virtual machine shared memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:727
+#: include/classes/items/CHelpItems.php:735
 msgid "VMware virtual machine swapped memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:739
+#: include/classes/items/CHelpItems.php:747
 msgid "VMware virtual machine total memory size, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:759
+#: include/classes/items/CHelpItems.php:767
 msgid "VMware virtual machine uncommitted storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:763
+#: include/classes/items/CHelpItems.php:771
 msgid "VMware virtual machine unshared storage space, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:767
+#: include/classes/items/CHelpItems.php:775
 msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
 msgstr ""
 
-#: include/blocks.inc.php:799 include/classes/graphdraw/CPieGraphDraw.php:334
+#: include/blocks.inc.php:805 include/classes/graphdraw/CPieGraphDraw.php:334
 #: include/classes/screens/CScreenEvents.php:42
 #: include/classes/screens/CScreenHistory.php:169
-#: include/classes/screens/CScreenHistory.php:267 include/reports.inc.php:168
-#: include/views/administration.general.valuemapping.edit.php:41
+#: include/classes/screens/CScreenHistory.php:271 include/reports.inc.php:170
+#: include/views/administration.general.valuemapping.edit.php:40
 #: include/views/common.macros.php:38 tr_testexpr.php:50
 #, c-format
 msgid "Value"
 msgstr "ֵ值"
 
-#: api/classes/CMap.php:437
+#: include/classes/api/services/CMap.php:447
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_align\". Choices are: \"%2$s\" and \"%3$s\""
 msgstr "參數\"grid_align\"的值\"%1$s\"是無效的. 可用的是: \"%2$s\"和\"%3$s\""
 
-#: api/classes/CMap.php:442
+#: include/classes/api/services/CMap.php:452
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\" and \"%3$s\"."
 msgstr ""
 
-#: api/classes/CMap.php:432
+#: include/classes/api/services/CMap.php:442
 #, c-format
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
@@ -14812,11 +15245,11 @@ msgstr ""
 msgid "Value \"%2$s\" of \"%1$s\" is too long: it cannot have more than %3$s digits before the decimal point and more than %4$s digits after the decimal point."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:883
+#: include/classes/items/CHelpItems.php:895
 msgid "Value cache effectiveness. Valid parameters are: requests, hits and misses."
 msgstr ""
 
-#: include/classes/items/CHelpItems.php:879
+#: include/classes/items/CHelpItems.php:891
 msgid "Value cache statistics. Valid modes are: total, free, pfree, used and pused."
 msgstr ""
 
@@ -14862,10 +15295,10 @@ msgid "Value map with valuemapid \"%1$s\" does not exist."
 msgstr "valuemapid為\"%1$s\"的值對應不存在."
 
 #: adm.gui.php:101 adm.housekeeper.php:132 adm.iconmapping.php:115
-#: adm.images.php:140 adm.macros.php:164 adm.other.php:115 adm.regexps.php:198
+#: adm.images.php:139 adm.macros.php:164 adm.other.php:115 adm.regexps.php:206
 #: adm.triggerdisplayoptions.php:81 adm.triggerseverities.php:87
 #: adm.valuemapping.php:132 adm.valuemapping.php:198 adm.workingtime.php:68
-#: include/views/administration.general.valuemapping.edit.php:55
+#: include/views/administration.general.valuemapping.edit.php:54
 msgid "Value mapping"
 msgstr "值對應"
 
@@ -14874,7 +15307,7 @@ msgid "Value mapping must have at least one mapping."
 msgstr "值對應必需至少有一個對應."
 
 #: include/classes/items/CHelpItems.php:133
-#: include/classes/items/CHelpItems.php:391
+#: include/classes/items/CHelpItems.php:395
 msgid "Value of any performance counter, where \"counter\" parameter is the counter path and \"interval\" parameter is a number of last seconds, for which the agent returns an average value."
 msgstr ""
 
@@ -14886,8 +15319,8 @@ msgstr "值: 無資料"
 msgid "Values"
 msgstr "值"
 
-#: include/views/configuration.httpconf.edit.php:147
-#: include/views/configuration.httpconf.popup.php:80
+#: include/views/configuration.httpconf.edit.php:140
+#: include/views/configuration.httpconf.popup.php:89
 msgid "Variables"
 msgstr "變數"
 
@@ -14900,64 +15333,69 @@ msgid "Verbose"
 msgstr ""
 
 #: include/classes/items/CHelpItems.php:73
-#: include/classes/items/CHelpItems.php:319
+#: include/classes/items/CHelpItems.php:323
 msgid "Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1"
 msgstr ""
 
-#: include/views/configuration.screen.constructor.edit.php:517
+#: include/views/configuration.screen.constructor.edit.php:643
 msgid "Vertical"
 msgstr "垂直的"
 
-#: include/views/configuration.screen.constructor.edit.php:573
+#: include/views/configuration.screen.constructor.edit.php:716
 msgid "Vertical align"
 msgstr "縱向對齊"
 
-#: include/classes/class.cview.php:129
+#: include/locales.inc.php:83
+msgid "Vietnamese (vi_VN)"
+msgstr ""
+
+#: include/classes/core/CView.php:129
 msgid "View is not rendered."
 msgstr "檢視未能形成."
 
 #: include/classes/items/CHelpItems.php:205
-#: include/classes/items/CHelpItems.php:463
+#: include/classes/items/CHelpItems.php:467
 msgid "Virtual memory statistics."
 msgstr ""
 
-#: include/views/configuration.host.edit.php:186
+#: include/views/configuration.host.edit.php:197
 #: include/views/configuration.host.prototype.edit.php:71
-#: include/views/configuration.template.edit.php:102
+#: include/views/configuration.template.edit.php:99
 #: include/views/inventory.host.view.php:44
 msgid "Visible name"
 msgstr "可見的名稱"
 
-#: api/classes/CHost.php:641
+#: include/classes/api/services/CHost.php:637
 msgid "Visible name cannot be empty if host name is missing."
 msgstr "如果缺少主機名稱, 可見的名稱不能是空白."
 
-#: jsLoader.php:125
+#: jsLoader.php:126
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
 
 #: adm.triggerseverities.php:58 include/items.inc.php:33
 #: include/views/administration.general.triggerSeverity.edit.php:46
+#: include/views/general.warning.php:22
 msgid "Warning"
 msgstr "警告"
 
-#: include/setup.inc.php:203
+#: include/classes/setup/CSetupWizard.php:203
 msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: jsLoader.php:166
+#: jsLoader.php:167
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "我們很抱歉, 已經到了可記住的最大可能的組件數量."
 
-#: hosts.php:841 hosts.php:938 include/menu.inc.php:42
-#: include/views/inventory.host.view.php:196
-#: include/views/inventory.host.view.php:222
-#: include/views/inventory.host.view.php:231 search.php:139 search.php:145
+#: hosts.php:867 hosts.php:961 include/menu.inc.php:41
+#: include/views/inventory.host.view.php:208
+#: include/views/inventory.host.view.php:234
+#: include/views/inventory.host.view.php:243 search.php:139 search.php:145
 #: search.php:189 search.php:202 search.php:225 search.php:278 search.php:331
-#: search.php:400 search.php:446 search.php:460 templates.php:502
-#: templates.php:569
+#: search.php:400 search.php:446 search.php:460 templates.php:516
+#: templates.php:580
 msgid "Web"
 msgstr "Web"
 
@@ -14965,63 +15403,81 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web監測"
 
-#: api/classes/managers/CHttpTestManager.php:383
-#: api/classes/managers/CHttpTestManager.php:391
+#: include/classes/api/managers/CHttpTestManager.php:385
+#: include/classes/api/managers/CHttpTestManager.php:393
 #, c-format
 msgid "Web scenario \"%1$s\" already exists on host \"%2$s\"."
 msgstr ""
 
-#: api/classes/CHttpTest.php:451 api/classes/CHttpTest.php:503
+#: include/classes/api/services/CHttpTest.php:473
+#: include/classes/api/services/CHttpTest.php:547
+#: include/classes/api/services/CHttpTest.php:593
 #, c-format
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:138 httpconf.php:378
+#: httpconf.php:153 httpconf.php:415
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:337
+#: httpconf.php:365
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 
-#: httpconf.php:336
+#: httpconf.php:364
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 
-#: api/classes/CHttpTest.php:444 api/classes/CHttpTest.php:484
+#: include/classes/api/services/CHttpTest.php:445
 #, c-format
 msgid "Web scenario missing parameters: %1$s"
 msgstr ""
 
-#: api/classes/CHttpTest.php:455
+#: include/classes/api/services/CHttpTest.php:462
+#: include/classes/api/services/CHttpTest.php:645
 msgid "Web scenario must have at least one step."
 msgstr ""
 
-#: api/classes/CHttpTest.php:582
+#: include/classes/api/services/CHttpTest.php:456
+#: include/classes/api/services/CHttpTest.php:573
+msgid "Web scenario name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:724
 #, c-format
 msgid "Web scenario step \"%1$s\" already exists."
 msgstr ""
 
-#: api/classes/CHttpTest.php:562
+#: include/classes/api/services/CHttpTest.php:671
+msgid "Web scenario step URL cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:666
+msgid "Web scenario step name cannot be empty."
+msgstr ""
+
+#: include/classes/api/services/CHttpTest.php:650
 msgid "Web scenario step name should contain only printable characters."
 msgstr ""
 
-#: api/classes/CHttpTest.php:567
+#: include/classes/api/services/CHttpTest.php:675
 msgid "Web scenario step number cannot be less than 1."
 msgstr ""
 
-#: httpmon.php:78 include/html.inc.php:478 include/html.inc.php:482
+#: httpmon.php:85 include/html.inc.php:484 include/html.inc.php:488
+#: include/views/configuration.host.edit.php:668
+#: include/views/configuration.template.edit.php:394
 msgid "Web scenarios"
 msgstr ""
 
-#: include/func.inc.php:228
+#: include/func.inc.php:216
 msgid "Wed"
 msgstr "三"
 
-#: include/forms.inc.php:1641 include/forms.inc.php:1709
-#: include/func.inc.php:150 include/func.inc.php:240
+#: include/forms.inc.php:1657 include/forms.inc.php:1725
+#: include/func.inc.php:138 include/func.inc.php:228
 msgid "Wednesday"
 msgstr "週三"
 
@@ -15029,9 +15485,9 @@ msgstr "週三"
 msgid "Week"
 msgstr "週"
 
-#: include/forms.inc.php:1618 include/maintenances.inc.php:35
-#: include/reports.inc.php:62 include/reports.inc.php:384
-#: include/reports.inc.php:392 report3.php:59 report4.php:105
+#: include/forms.inc.php:1634 include/maintenances.inc.php:35
+#: include/reports.inc.php:63 include/reports.inc.php:387
+#: include/reports.inc.php:395 report3.php:59 report4.php:105
 msgid "Weekly"
 msgstr "每週"
 
@@ -15039,12 +15495,12 @@ msgstr "每週"
 msgid "When active"
 msgstr "當作用中時"
 
-#: graphs.php:42 include/views/configuration.graph.edit.php:56
+#: graphs.php:42 include/views/configuration.graph.edit.php:55
 #: include/views/configuration.graph.list.php:78
-#: include/views/configuration.screen.constructor.edit.php:542
+#: include/views/configuration.screen.constructor.edit.php:676
 #: include/views/configuration.sysmap.edit.php:42
 #: include/views/configuration.sysmap.list.php:44
-#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:44
+#: include/views/js/configuration.sysmaps.js.php:52 screenedit.php:68
 #: sysmaps.php:49
 msgid "Width"
 msgstr "寬"
@@ -15054,28 +15510,28 @@ msgstr "寬"
 msgid "With data collection"
 msgstr "有數據收集"
 
-#: tr_status.php:267
+#: include/views/common.filter.trigger.php:48
 msgid "With last event unacknowledged"
 msgstr "有最新知悉的事件"
 
-#: include/blocks.inc.php:463
+#: include/blocks.inc.php:468
 msgid "With problems"
 msgstr "有問題"
 
-#: include/forms.inc.php:571 include/forms.inc.php:796
-#: include/forms.inc.php:905
+#: include/forms.inc.php:585 include/forms.inc.php:810
+#: include/forms.inc.php:919
 msgid "With triggers"
 msgstr "有觸發器"
 
-#: tr_status.php:266
+#: include/views/common.filter.trigger.php:47
 msgid "With unacknowledged events"
 msgstr "有未知悉的事件"
 
-#: include/blocks.inc.php:462
+#: include/blocks.inc.php:467
 msgid "Without problems"
 msgstr "無問題"
 
-#: include/forms.inc.php:572 include/forms.inc.php:793
+#: include/forms.inc.php:586 include/forms.inc.php:807
 msgid "Without triggers"
 msgstr "無觸發器"
 
@@ -15084,7 +15540,7 @@ msgid "Wizard"
 msgstr "Wizard"
 
 #: adm.gui.php:102 adm.housekeeper.php:133 adm.iconmapping.php:116
-#: adm.images.php:141 adm.macros.php:165 adm.other.php:116 adm.regexps.php:199
+#: adm.images.php:140 adm.macros.php:165 adm.other.php:116 adm.regexps.php:207
 #: adm.triggerdisplayoptions.php:82 adm.triggerseverities.php:88
 #: adm.valuemapping.php:133 adm.workingtime.php:69
 #: include/views/administration.general.workingtime.edit.php:25
@@ -15097,277 +15553,271 @@ msgstr "工作時間"
 msgid "Working time \"%1$s\"."
 msgstr "工作時間\"%1$s\"."
 
-#: include/views/administration.script.edit.php:95
+#: include/views/administration.script.edit.php:99
 #: include/views/administration.script.list.php:82
 msgid "Write"
 msgstr "寫"
 
-#: api/classes/CService.php:396
+#: include/classes/api/services/CService.php:396
 #, c-format
 msgid "Wrong fields for dependency for service \"%1$s\"."
 msgstr "錯誤的服務\"%1$s\"其相依關係欄位."
 
-#: api/classes/CMapElement.php:55
+#: include/classes/api/services/CMapElement.php:55
 msgid "Wrong fields for element."
 msgstr "錯誤的組件欄位."
 
-#: api/classes/CHost.php:546
+#: include/classes/api/services/CHost.php:556
 #, c-format
 msgid "Wrong fields for host \"%s\"."
 msgstr "錯誤的主機欄位\"%s\"."
 
-#: api/classes/CImage.php:217
+#: include/classes/api/services/CImage.php:494
 #, c-format
 msgid "Wrong fields for image \"%1$s\"."
 msgstr ""
 
-#: api/classes/CImage.php:325
-msgid "Wrong fields for image."
-msgstr ""
-
-#: api/classes/CMapElement.php:497
+#: include/classes/api/services/CMapElement.php:497
 msgid "Wrong fields for linktrigger delete."
 msgstr ""
 
-#: api/classes/CMapElement.php:472
+#: include/classes/api/services/CMapElement.php:472
 msgid "Wrong fields for linktrigger update."
 msgstr ""
 
-#: api/classes/CMapElement.php:437
+#: include/classes/api/services/CMapElement.php:437
 msgid "Wrong fields for linktrigger."
 msgstr ""
 
-#: api/classes/CUserMacro.php:256 api/classes/CUserMacro.php:302
-#: api/classes/CUserMacro.php:391 api/classes/CUserMacro.php:451
+#: include/classes/api/services/CUserMacro.php:256
+#: include/classes/api/services/CUserMacro.php:302
+#: include/classes/api/services/CUserMacro.php:391
+#: include/classes/api/services/CUserMacro.php:451
 #, c-format
 msgid "Wrong fields for macro \"%1$s\"."
 msgstr "錯誤的巨集欄位\"%1$s\"."
 
-#: api/classes/CMapElement.php:181
+#: include/classes/api/services/CMapElement.php:181
 msgid "Wrong fields for map link."
 msgstr ""
 
-#: api/classes/CMediatype.php:193 api/classes/CMediatype.php:244
+#: include/classes/api/services/CMediatype.php:193
+#: include/classes/api/services/CMediatype.php:244
 msgid "Wrong fields for media type."
 msgstr "錯誤的媒介類型欄位"
 
-#: api/classes/CProxy.php:196
+#: include/classes/api/services/CProxy.php:196
 #, c-format
 msgid "Wrong fields for proxy \"%1$s\"."
 msgstr ""
 
-#: api/classes/CScript.php:392
+#: include/classes/api/services/CScript.php:392
 msgid "Wrong fields for script."
 msgstr "錯誤的腳本欄位."
 
-#: api/classes/CService.php:127 api/classes/CService.php:238
+#: include/classes/api/services/CService.php:127
+#: include/classes/api/services/CService.php:238
 #, c-format
 msgid "Wrong fields for service \"%1$s\"."
 msgstr "錯誤的服務欄位\"%1$s\"."
 
-#: api/classes/CService.php:480
+#: include/classes/api/services/CService.php:480
 #, c-format
 msgid "Wrong fields for time for service \"%1$s\"."
 msgstr "錯誤的服務\"%1$s\"其時間欄位."
 
-#: api/classes/CTriggerPrototype.php:452 api/classes/CTriggerPrototype.php:508
+#: include/classes/api/services/CTriggerPrototype.php:452
+#: include/classes/api/services/CTriggerPrototype.php:508
 msgid "Wrong fields for trigger."
 msgstr "錯誤的觸發器欄位."
 
-#: api/classes/CUser.php:243
+#: include/classes/api/services/CUser.php:246
 #, c-format
 msgid "Wrong fields for user \"%s\"."
 msgstr "錯誤的用戶欄位\"%s\"."
 
-#: api/classes/CUserMacro.php:607
+#: include/classes/api/services/CUserMacro.php:607
 #, c-format
 msgid "Wrong macro \"%1$s\"."
 msgstr "錯誤的巨集\"%1$s\"."
 
-#: include/views/js/configuration.sysmaps.js.php:172
+#: include/views/js/configuration.sysmaps.js.php:170
 msgid "X"
 msgstr "X"
 
-#: include/reports.inc.php:55 include/reports.inc.php:160
-#: include/reports.inc.php:303
+#: include/reports.inc.php:56 include/reports.inc.php:162
+#: include/reports.inc.php:306
 msgid "X label"
 msgstr "X標示"
 
-#: include/classes/import/readers/CXmlImportReader.php:48
+#: include/classes/import/readers/CXmlImportReader.php:49
 #, c-format
 msgid "XML file contains error %1$s:"
 msgstr "XML檔含有錯誤 %1$s:"
 
-#: include/classes/import/CXmlImport18.php:405
-#: include/classes/import/CXmlImport18.php:408
-#: include/classes/import/CXmlImport18.php:411
+#: include/classes/import/CXmlImport18.php:393
+#: include/classes/import/CXmlImport18.php:396
+#: include/classes/import/CXmlImport18.php:399
 msgid "XML file contains errors"
 msgstr "XML檔含有錯誤"
 
-#: include/classes/import/readers/CXmlImportReader.php:51
+#: include/classes/import/readers/CXmlImportReader.php:52
 #, c-format
 msgid "XML file contains fatal error %1$s:"
 msgstr "XML檔含有極嚴重錯誤 %1$s:"
 
-#: include/classes/import/readers/CXmlImportReader.php:45
+#: include/classes/import/readers/CXmlImportReader.php:46
 #, c-format
 msgid "XML file contains warning %1$s:"
 msgstr "XML檔含有警告 %1$s:"
 
-#: include/views/js/configuration.sysmaps.js.php:174 report3.php:96
+#: include/views/js/configuration.sysmaps.js.php:172
 msgid "Y"
 msgstr "Y"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgctxt "Yotta short"
 msgid "Y"
 msgstr "Y"
 
-#. GETTEXT: Date format (year). Do not translate.
-#: include/translateDefines.inc.php:41
-msgctxt "date format"
-msgid "Y"
-msgstr "Y"
-
-#: include/views/configuration.graph.edit.php:208
+#: include/views/configuration.graph.edit.php:218
 msgid "Y axis MAX value"
 msgstr "縱軸最大值"
 
-#: api/classes/CGraphGeneral.php:347
-#: include/classes/graphdraw/CLineGraphDraw.php:706
+#: include/classes/api/services/CGraphGeneral.php:350
+#: include/classes/graphdraw/CLineGraphDraw.php:710
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y axis MAX value must be greater than Y axis MIN value."
 
-#: include/views/configuration.graph.edit.php:150
+#: include/views/configuration.graph.edit.php:160
 msgid "Y axis MIN value"
 msgstr "縱軸Y最小值MIN"
 
-#: include/views/configuration.graph.edit.php:227
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis side"
 msgstr "縱軸Y側"
 
-#: include/reports.inc.php:56 include/reports.inc.php:161
-#: include/reports.inc.php:304
+#: include/reports.inc.php:57 include/reports.inc.php:163
+#: include/reports.inc.php:307
 msgid "Y label"
 msgstr "Y標示"
 
-#: include/translateDefines.inc.php:32 include/translateDefines.inc.php:33
-msgid "Y-m-d H:i:s"
-msgstr "Y-m-d H:i:s"
-
-#: include/classes/screens/CScreenHistory.php:216
-#: include/translateDefines.inc.php:30 include/translateDefines.inc.php:31
-#: include/translateDefines.inc.php:34
-msgid "Y.M.d H:i:s"
-msgstr "Y.M.d H:i:s"
-
-#: include/translateDefines.inc.php:39
-msgid "Y.m.d"
-msgstr "Y.m.d"
+#: include/translateDefines.inc.php:32
+msgid "Y-m-d"
+msgstr ""
 
-#: include/translateDefines.inc.php:38
-msgid "Y.m.d H:i"
-msgstr "Y.m.d H:i"
+#: include/translateDefines.inc.php:31
+msgid "Y-m-d H:i"
+msgstr ""
 
-#: include/func.inc.php:604 include/translateDefines.inc.php:48
-msgid "Y.m.d H:i:s"
-msgstr "Y.m.d H:i:s"
+#: include/translateDefines.inc.php:30
+msgid "Y-m-d H:i:s"
+msgstr "Y-m-d H:i:s"
 
 #: report3.php:70 report3.php:89 report4.php:111 report4.php:134
 #: report5.php:47
 msgid "Year"
 msgstr "年"
 
-#: include/reports.inc.php:64 include/reports.inc.php:386
-#: include/reports.inc.php:394 report3.php:61 report4.php:107
+#: include/reports.inc.php:65 include/reports.inc.php:389
+#: include/reports.inc.php:397 report3.php:61 report4.php:107
 msgid "Yearly"
 msgstr "每年"
 
-#: events.php:751 include/blocks.inc.php:808
-#: include/classes/class.cserverinfo.php:32 include/events.inc.php:358
-#: include/events.inc.php:376 include/func.inc.php:2255
-#: include/triggers.inc.php:1664
+#: events.php:817 include/blocks.inc.php:814
+#: include/classes/html/CServerInfo.php:32 include/events.inc.php:358
+#: include/events.inc.php:376 include/func.inc.php:2013
+#: include/triggers.inc.php:1487
 #: include/views/administration.users.list.php:75
+#: include/views/configuration.httpconf.list.php:122
 #: include/views/js/adm.regexprs.edit.js.php:139
 msgid "Yes"
 msgstr "是"
 
-#: include/func.inc.php:683
+#: include/func.inc.php:671
 msgid "Yotta"
 msgstr "Yotta"
 
-#: include/views/administration.users.edit.php:141
+#: include/views/administration.users.edit.php:140
 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
 msgstr "您無法選擇某些語言, 因為這些語系並未安裝於web伺服器上."
 
-#: api/classes/CUser.php:327
+#: include/classes/api/services/CUser.php:317
 #, c-format
 msgid "You are not allowed to alter privileges for user \"%s\"."
 msgstr "您未被允許來幫用戶\"%s\"轉換優先權."
 
-#: include/func.inc.php:1931
+#: include/func.inc.php:1689
 msgid "You are not logged in."
 msgstr "您尚未登入."
 
-#: popup.php:453
+#: popup.php:474
 msgid "You can not switch hosts for current selection."
 msgstr "您無法為目前的選擇切換主機."
 
-#: include/views/js/configuration.action.edit.js.php:351
+#: include/views/js/configuration.action.edit.js.php:375
 msgid "You did not specify host for operation."
 msgstr "您沒有指定主機來操作."
 
-#: include/views/js/configuration.action.edit.js.php:317
+#: include/views/js/configuration.action.edit.js.php:341
 msgid "You did not specify host group for operation."
 msgstr "您沒有指定主機群組來操作."
 
-#: api/classes/CAction.php:1402
+#: include/classes/api/services/CAction.php:1405
 #, c-format
 msgid "You did not specify targets for action operation command \"%s\"."
 msgstr "您沒有指定目標為動作操作的命令\"%s\"."
 
-#: api/classes/CAction.php:1399
+#: include/classes/api/services/CAction.php:1402
 #, c-format
 msgid "You did not specify targets for action operation global script \"%s\"."
 msgstr "您沒有指定目標為動作操作的全域腳本\"%s\"."
 
-#: api/classes/CGraph.php:526 api/classes/CGraphPrototype.php:540
-#: api/classes/CHost.php:896 api/classes/CHost.php:953
-#: api/classes/CHttpTest.php:476 api/classes/CMaintenance.php:503
-#: api/classes/CMaintenance.php:609 api/classes/CMaintenance.php:621
-#: api/classes/CScript.php:287 api/classes/CScript.php:384
-#: api/classes/CScript.php:424 api/classes/CScript.php:487
-#: api/classes/CTemplate.php:416 api/classes/CTemplate.php:528
-#: api/classes/CTemplate.php:555 api/classes/CTemplate.php:706
-#: api/classes/CTemplate.php:939 api/classes/CTemplate.php:1037
+#: include/classes/api/services/CGraph.php:542
+#: include/classes/api/services/CGraphPrototype.php:553
+#: include/classes/api/services/CHost.php:877
+#: include/classes/api/services/CHost.php:935
+#: include/classes/api/services/CMaintenance.php:550
+#: include/classes/api/services/CMaintenance.php:656
+#: include/classes/api/services/CMaintenance.php:668
+#: include/classes/api/services/CScript.php:287
+#: include/classes/api/services/CScript.php:384
+#: include/classes/api/services/CScript.php:424
+#: include/classes/api/services/CScript.php:487
+#: include/classes/api/services/CTemplate.php:426
+#: include/classes/api/services/CTemplate.php:562
+#: include/classes/api/services/CTemplate.php:589
+#: include/classes/api/services/CTemplate.php:737
+#: include/classes/api/services/CTemplate.php:970
+#: include/classes/api/services/CTemplate.php:1074
 msgid "You do not have permission to perform this operation."
 msgstr "您沒有許可權來完成此操作."
 
-#: api/classes/CUser.php:249
+#: include/classes/api/services/CUser.php:252
 msgid "You do not have permissions to create users."
 msgstr "您沒有許可權來創建用戶."
 
-#: api/classes/CUser.php:260
+#: include/classes/api/services/CUser.php:263
 msgid "You do not have permissions to update other users."
 msgstr "您沒有許可權來更新其它用戶."
 
-#: api/classes/CUser.php:256
+#: include/classes/api/services/CUser.php:259
 msgid "You do not have permissions to update user or user does not exist."
 msgstr "您沒有許可權來來更新用戶或用戶不存在."
 
-#: include/func.inc.php:1913
+#: include/func.inc.php:1671
 msgid "You have no permissions to access this page."
 msgstr ""
 
-#: include/func.inc.php:1933
+#: include/func.inc.php:1691
 msgid "You must login to view this page."
 msgstr "您必需登入才能瀏覽此頁面."
 
-#: include/func.inc.php:1909
+#: include/func.inc.php:1667
 msgid "Your are logged in as"
 msgstr ""
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgctxt "Zetta short"
 msgid "Z"
 msgstr "Z"
@@ -15380,7 +15830,7 @@ msgstr "Zabbix"
 msgid "Zabbix"
 msgstr "Zabbix"
 
-#: include/page_footer.php:89 include/views/general.browserwarning.php:60
+#: include/page_footer.php:84 include/views/general.browserwarning.php:60
 #: include/views/general.login.php:48
 #, c-format
 msgid "Zabbix %1$s Copyright %2$s-%3$s by Zabbix SIA"
@@ -15399,8 +15849,8 @@ msgid "Zabbix User"
 msgstr "用戶"
 
 #: include/discovery.inc.php:65 include/items.inc.php:81
-#: include/views/administration.script.edit.php:53
-#: include/views/configuration.action.edit.php:700
+#: include/views/administration.script.edit.php:52
+#: include/views/configuration.action.edit.php:746
 #: include/views/js/configuration.action.edit.js.php:118
 #: include/views/js/configuration.discovery.edit.js.php:184
 msgid "Zabbix agent"
@@ -15426,10 +15876,11 @@ msgstr "Zabbix自身"
 msgid "Zabbix internal authentication"
 msgstr "Zabbix內部認證"
 
-#: include/classes/class.cserverinfo.php:36
-#: include/classes/class.cserverinfo.php:37 include/setup.inc.php:432
-#: include/views/administration.script.edit.php:54
-#: include/views/configuration.action.edit.php:701
+#: include/classes/html/CServerInfo.php:36
+#: include/classes/html/CServerInfo.php:37
+#: include/classes/setup/CSetupWizard.php:432
+#: include/views/administration.script.edit.php:53
+#: include/views/configuration.action.edit.php:747
 #: include/views/js/configuration.action.edit.js.php:122
 msgid "Zabbix server"
 msgstr "網路監測主機"
@@ -15445,7 +15896,7 @@ msgstr ""
 "1.  \"zabbix.conf.php\"中不正確的IP/DNS;\n"
 "2. 不正確的網路組態.\n"
 
-#: include/blocks.inc.php:809
+#: include/blocks.inc.php:815
 msgid "Zabbix server IP or port is not set!"
 msgstr "Zabbix主機IP或埠並未設置!"
 
@@ -15453,15 +15904,15 @@ msgstr "Zabbix主機IP或埠並未設置!"
 msgid "Zabbix server activity check interval"
 msgstr "Zabbix主機活動檢查間隔"
 
-#: include/classes/class.cserverinfo.php:39
+#: include/classes/html/CServerInfo.php:39
 msgid "Zabbix server info"
 msgstr "Zabbix主機資訊"
 
-#: jsrpc.php:173
+#: jsrpc.php:174
 msgid "Zabbix server is not running: the information displayed may not be current."
 msgstr "Zabbix server is not running: the information displayed may not be current."
 
-#: include/blocks.inc.php:807
+#: include/blocks.inc.php:813
 msgid "Zabbix server is running"
 msgstr "Zabbix服務器端運行中"
 
@@ -15470,11 +15921,11 @@ msgstr "Zabbix服務器端運行中"
 msgid "Zabbix server is running check interval \"%1$s\"."
 msgstr "Zabbix主機正運作檢查間隔\"%1$s\"."
 
-#: include/setup.inc.php:434
+#: include/classes/setup/CSetupWizard.php:434
 msgid "Zabbix server name"
 msgstr "Zabbix主機名稱"
 
-#: include/setup.inc.php:433
+#: include/classes/setup/CSetupWizard.php:433
 msgid "Zabbix server port"
 msgstr "Zabbix主機埠"
 
@@ -15482,25 +15933,20 @@ msgstr "Zabbix主機埠"
 msgid "Zabbix trapper"
 msgstr "Zabbix捉捕器"
 
-#: include/func.inc.php:682
+#: include/func.inc.php:670
 msgid "Zetta"
 msgstr "Zetta"
 
-#: jsLoader.php:92
+#: jsLoader.php:93
 msgid "Zoom"
 msgstr "縮放"
 
-#: include/classes/screens/CScreenHostgroupTriggers.php:132
-#: include/classes/screens/CScreenHostTriggers.php:131
-msgid "[H:i:s]"
-msgstr "[H:i:s]"
-
-#: include/func.inc.php:158
+#: include/func.inc.php:146
 #, c-format
 msgid "[Wrong value for day: \"%s\" ]"
 msgstr "[錯誤的日計數: \"%s\" ]"
 
-#: include/func.inc.php:143
+#: include/func.inc.php:131
 #, c-format
 msgid "[Wrong value for month: \"%s\" ]"
 msgstr "[錯誤的月計數: \"%s\" ]"
@@ -15509,19 +15955,19 @@ msgstr "[錯誤的月計數: \"%s\" ]"
 msgid "agent"
 msgstr "端點代理程式"
 
-#: include/classes/class.cpagefilter.php:804
-#: include/classes/graphdraw/CLineGraphDraw.php:1850
+#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/pagefilter/CPageFilter.php:729
 #: include/classes/screens/CScreenHostgroupTriggers.php:109
 #: include/classes/screens/CScreenHostgroupTriggers.php:115
 #: include/classes/screens/CScreenHostTriggers.php:110
 #: include/classes/screens/CScreenHostTriggers.php:116
 #: include/forms.inc.php:357 include/forms.inc.php:400
 #: include/forms.inc.php:415 include/forms.inc.php:422
-#: include/forms.inc.php:439 include/forms.inc.php:570
-#: include/forms.inc.php:585 include/graphs.inc.php:76
-#: include/views/js/configuration.graph.edit.js.php:46 report2.php:236
-#: report2.php:252 report2.php:271 report2.php:304 report2.php:329
-#: report2.php:345 report4.php:90 report4.php:261
+#: include/forms.inc.php:439 include/forms.inc.php:584
+#: include/forms.inc.php:599 include/graphs.inc.php:76
+#: include/views/js/configuration.graph.edit.js.php:46 report2.php:237
+#: report2.php:253 report2.php:272 report2.php:305 report2.php:330
+#: report2.php:346 report4.php:90 report4.php:261
 msgid "all"
 msgstr "所有"
 
@@ -15529,19 +15975,15 @@ msgstr "所有"
 msgid "all media"
 msgstr ""
 
-#: api/classes/CUserGroup.php:230
-msgid "already exists"
-msgstr "已存在"
-
-#: include/views/monitoring.history.php:124
+#: include/views/monitoring.history.php:125
 msgid "as Blue"
 msgstr "成藍"
 
-#: include/views/monitoring.history.php:123
+#: include/views/monitoring.history.php:124
 msgid "as Green"
 msgstr "成綠"
 
-#: include/views/monitoring.history.php:122
+#: include/views/monitoring.history.php:123
 msgid "as Red"
 msgstr "成紅"
 
@@ -15553,83 +15995,49 @@ msgstr ""
 msgid "auto-registered host"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1832
-#: include/classes/graphdraw/CLineGraphDraw.php:1854
+#: include/classes/graphdraw/CLineGraphDraw.php:1836
+#: include/classes/graphdraw/CLineGraphDraw.php:1858
 #: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:85
 #: include/views/js/configuration.graph.edit.js.php:41
-#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:145
+#: include/views/js/configuration.graph.edit.js.php:49 popup_bitem.php:155
 msgid "avg"
 msgstr "平均"
 
-#: include/classes/parsers/CConditionFormula.php:139
+#: include/classes/parsers/CConditionFormula.php:188
 #, c-format
 msgid "check expression starting from \"%1$s\""
 msgstr ""
 
-#: include/func.inc.php:564 jsLoader.php:98
+#: include/func.inc.php:552 jsLoader.php:99
 msgctxt "day short"
 msgid "d"
 msgstr "d"
 
-#: include/html.inc.php:551 include/maintenances.inc.php:56
-#: include/page_header.php:347 include/translateDefines.inc.php:43
-#: include/views/configuration.hostgroups.list.php:131
-#: include/views/configuration.item.list.php:125 report3.php:132
-msgid "d M Y"
-msgstr "d M Y"
-
-#: include/translateDefines.inc.php:44 include/translateDefines.inc.php:45
-#: include/views/configuration.maintenance.list.php:71
-#: include/views/configuration.maintenance.list.php:72
-#: include/views/configuration.services.edit.php:149
-#: include/views/configuration.services.edit.php:150 report3.php:159
-msgid "d M Y H:i"
-msgstr "d M Y H:i"
-
-#: acknow.php:218 events.php:306 httpdetails.php:119 httpmon.php:137
-#: include/acknow.inc.php:54 include/blocks.inc.php:1091
-#: include/classes/screens/CScreenEvents.php:57
-#: include/classes/screens/CScreenPlainText.php:97 include/events.inc.php:176
-#: include/events.inc.php:249 include/events.inc.php:302
-#: include/translateDefines.inc.php:28 include/translateDefines.inc.php:29
-#: include/translateDefines.inc.php:35 include/translateDefines.inc.php:36
-#: include/translateDefines.inc.php:37 include/translateDefines.inc.php:46
-#: include/translateDefines.inc.php:47
-#: include/views/administration.auditacts.list.php:127
-#: include/views/administration.auditlogs.list.php:106 jsrpc.php:136
-#: latest.php:401 latest.php:577 tr_status.php:241 tr_status.php:751
-#: tr_status.php:868
-msgid "d M Y H:i:s"
-msgstr "d M H:i:s"
-
 #: chart4.php:124 chart5.php:137
 msgid "d.M"
 msgstr "d.M"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1372
-#: include/classes/graphdraw/CLineGraphDraw.php:1425
+#: include/classes/graphdraw/CLineGraphDraw.php:1376
+#: include/classes/graphdraw/CLineGraphDraw.php:1429
 msgid "d.m"
 msgstr "d.m"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1394
-#: include/classes/graphdraw/CLineGraphDraw.php:1409
-#: include/classes/graphdraw/CLineGraphDraw.php:1428
+#: include/classes/graphdraw/CLineGraphDraw.php:1398
+#: include/classes/graphdraw/CLineGraphDraw.php:1413
+#: include/classes/graphdraw/CLineGraphDraw.php:1432
 msgid "d.m H:i"
 msgstr "d.m H:i"
 
-#: include/translateDefines.inc.php:50
-msgid "d.m.y"
-msgstr "d.m.y"
-
-#: tr_status.php:299
+#: include/views/common.filter.trigger.php:90
 msgid "days"
 msgstr "日"
 
-#: include/html.inc.php:595
+#: include/html.inc.php:602
 msgid "dd"
 msgstr "dd"
 
-#: include/classes/class.cpagefilter.php:686 include/setup.inc.php:420
+#: include/classes/pagefilter/CPageFilter.php:627
+#: include/classes/setup/CSetupWizard.php:420
 #: include/views/configuration.slideconf.edit.php:66
 #: include/views/js/configuration.slideconf.edit.js.php:14
 msgid "default"
@@ -15651,19 +16059,15 @@ msgstr ""
 msgid "discovery"
 msgstr ""
 
-#: jsLoader.php:94
+#: jsLoader.php:95
 msgid "dynamic"
 msgstr "動態的"
 
-#: include/views/js/configuration.sysmaps.js.php:220
+#: include/views/js/configuration.sysmaps.js.php:218
 msgid "elements"
 msgstr "組件"
 
-#: include/views/configuration.copy.elements.php:109
-msgid "elements copy to ..."
-msgstr "組件複製到..."
-
-#: api/classes/CAction.php:1278
+#: include/classes/api/services/CAction.php:1278
 msgid "esc_step_from and esc_step_to must be set together."
 msgstr "esc_step_from和esc_step_to必須一起設定."
 
@@ -15675,47 +16079,49 @@ msgstr "正確地"
 msgid "executed"
 msgstr "已執行"
 
-#: include/classes/parsers/CConditionFormula.php:134
+#: include/classes/parsers/CConditionFormula.php:183
 msgid "expression is empty"
 msgstr ""
 
-#: jsLoader.php:93
+#: jsLoader.php:94
 msgid "fixed"
 msgstr "固定的"
 
-#: include/func.inc.php:1811
+#: include/func.inc.php:1569
 msgid "found"
 msgstr "已發現"
 
-#: include/views/configuration.item.edit.php:322
-#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.edit.php:320
+#: include/views/configuration.item.edit.php:325
+#: include/views/configuration.item.edit.php:336
+#: include/views/configuration.item.edit.php:341
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
 
-#: include/func.inc.php:565 jsLoader.php:99
+#: include/func.inc.php:553 jsLoader.php:100
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
 
-#: include/html.inc.php:601 include/views/configuration.services.edit.php:244
-#: include/views/configuration.services.edit.php:250
+#: include/html.inc.php:608 include/views/configuration.services.edit.php:243
+#: include/views/configuration.services.edit.php:249
 msgid "hh"
 msgstr "hh"
 
-#: api/classes/CMap.php:388
+#: include/classes/api/services/CMap.php:398
 msgid "host"
 msgstr "主機"
 
-#: api/classes/CMap.php:387
+#: include/classes/api/services/CMap.php:397
 msgid "host group"
 msgstr "主機群組"
 
-#: api/classes/CMap.php:384
+#: include/classes/api/services/CMap.php:394
 msgid "icon"
 msgstr "圖示"
 
-#: api/classes/CMap.php:391
+#: include/classes/api/services/CMap.php:401
 msgid "image"
 msgstr "圖片"
 
@@ -15723,7 +16129,7 @@ msgstr "圖片"
 msgid "in"
 msgstr "在"
 
-#: api/classes/CItemKey.php:76
+#: include/classes/parsers/CItemKey.php:76
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
@@ -15733,7 +16139,7 @@ msgctxt "event source"
 msgid "internal"
 msgstr ""
 
-#: include/classes/class.cserverinfo.php:43
+#: include/classes/html/CServerInfo.php:43
 msgid "is"
 msgstr "是"
 
@@ -15741,20 +16147,20 @@ msgstr "是"
 msgid "item"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "key is empty"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1830
+#: include/classes/graphdraw/CLineGraphDraw.php:1834
 #: include/classes/graphdraw/CPieGraphDraw.php:321 include/graphs.inc.php:82
 #: include/views/js/configuration.graph.edit.js.php:43
 msgid "last"
 msgstr "最新"
 
-#: hosts.php:804 hosts.php:805 hosts.php:806 include/actions.inc.php:29
+#: hosts.php:830 hosts.php:831 hosts.php:832 include/actions.inc.php:29
 #: include/forms.inc.php:449 include/forms.inc.php:456
 #: include/forms.inc.php:463 include/forms.inc.php:470
-#: include/forms.inc.php:577 include/forms.inc.php:592
+#: include/forms.inc.php:591 include/forms.inc.php:606
 #: include/views/inventory.host.list.php:40
 msgid "like"
 msgstr "似"
@@ -15763,12 +16169,12 @@ msgstr "似"
 msgid "low-level discovery rule"
 msgstr ""
 
-#: include/func.inc.php:566
+#: include/func.inc.php:554
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:563 jsLoader.php:97
+#: include/func.inc.php:551 jsLoader.php:98
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -15777,46 +16183,46 @@ msgstr "m"
 msgid "macro(s)"
 msgstr "巨集"
 
-#: include/actions.inc.php:178 include/views/configuration.action.edit.php:200
+#: include/actions.inc.php:178 include/views/configuration.action.edit.php:245
 msgid "maintenance"
 msgstr "維護"
 
-#: api/classes/CMap.php:390
+#: include/classes/api/services/CMap.php:400
 msgid "map"
 msgstr "拓墣圖"
 
-#: include/views/configuration.host.discovery.edit.php:332
+#: include/views/configuration.host.discovery.edit.php:322
 #: include/views/js/configuration.host.discovery.edit.js.php:23
 msgid "matches"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1833
-#: include/classes/graphdraw/CLineGraphDraw.php:1847
+#: include/classes/graphdraw/CLineGraphDraw.php:1837
+#: include/classes/graphdraw/CLineGraphDraw.php:1851
 #: include/classes/graphdraw/CPieGraphDraw.php:317 include/graphs.inc.php:80
 #: include/views/js/configuration.graph.edit.js.php:42
-#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:146
+#: include/views/js/configuration.graph.edit.js.php:50 popup_bitem.php:156
 msgid "max"
 msgstr "最大"
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1831
-#: include/classes/graphdraw/CLineGraphDraw.php:1844
+#: include/classes/graphdraw/CLineGraphDraw.php:1835
+#: include/classes/graphdraw/CLineGraphDraw.php:1848
 #: include/classes/graphdraw/CPieGraphDraw.php:313 include/graphs.inc.php:78
 #: include/views/js/configuration.graph.edit.js.php:40
-#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:144
+#: include/views/js/configuration.graph.edit.js.php:48 popup_bitem.php:154
 msgid "min"
 msgstr "最小"
 
-#: include/views/configuration.action.edit.php:317
+#: include/views/configuration.action.edit.php:362
 msgid "minimum 60 seconds"
 msgstr "最少60秒"
 
-#: include/html.inc.php:597 include/html.inc.php:603
-#: include/views/configuration.services.edit.php:247
-#: include/views/configuration.services.edit.php:253
+#: include/html.inc.php:604 include/html.inc.php:610
+#: include/views/configuration.services.edit.php:246
+#: include/views/configuration.services.edit.php:252
 msgid "mm"
 msgstr "mm"
 
-#: include/func.inc.php:568
+#: include/func.inc.php:556
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "毫秒"
@@ -15825,17 +16231,17 @@ msgstr "毫秒"
 msgid "must be a valid LDAP user"
 msgstr "必需為一個正確的LDAP用戶"
 
-#: include/classes/class.cmultiselect.php:54 jsLoader.php:175
+#: include/classes/html/CMultiSelect.php:53 jsLoader.php:176
 msgid "new"
 msgstr ""
 
-#: include/views/configuration.host.massupdate.php:74
-#: include/views/configuration.item.massupdate.php:502
+#: include/views/configuration.host.massupdate.php:80
+#: include/views/configuration.item.massupdate.php:508
 msgctxt "new element in multiselect"
 msgid "new"
 msgstr ""
 
-#: include/classes/graphdraw/CLineGraphDraw.php:1925
+#: include/classes/graphdraw/CLineGraphDraw.php:1929
 #: include/classes/graphdraw/CPieGraphDraw.php:347
 msgid "no data"
 msgstr "没有數據"
@@ -15848,12 +16254,14 @@ msgstr "非在"
 msgid "not like"
 msgstr "非似"
 
-#: include/classes/class.cserverinfo.php:34
+#: include/classes/html/CServerInfo.php:34
 msgid "not running"
 msgstr "非運行中"
 
-#: hostinventoriesoverview.php:70 include/classes/class.cpagefilter.php:726
-#: include/classes/class.cpagefilter.php:804 include/forms.inc.php:1094
+#: hostinventoriesoverview.php:77
+#: include/classes/pagefilter/CPageFilter.php:667
+#: include/classes/pagefilter/CPageFilter.php:729 include/forms.inc.php:1108
+#: include/views/monitoring.screen.php:88 slides.php:225
 msgid "not selected"
 msgstr "非所選的"
 
@@ -15862,57 +16270,61 @@ msgstr "非所選的"
 msgid "not sent"
 msgstr "未發送"
 
-#: jsLoader.php:95
+#: jsLoader.php:96
 msgid "now"
 msgstr "現在"
 
-#: include/blocks.inc.php:435 include/blocks.inc.php:774
-#: include/func.inc.php:1808
+#: include/blocks.inc.php:440 include/blocks.inc.php:780
+#: include/func.inc.php:1566
 msgid "of"
 msgstr "其"
 
-#: include/classes/class.frontendsetup.php:222
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:533
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:225
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:326
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:557
+#: include/classes/setup/CFrontendSetup.php:573
 msgid "off"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:284
-#: include/classes/class.frontendsetup.php:301
-#: include/classes/class.frontendsetup.php:318
-#: include/classes/class.frontendsetup.php:366
-#: include/classes/class.frontendsetup.php:391
-#: include/classes/class.frontendsetup.php:414
-#: include/classes/class.frontendsetup.php:454
-#: include/classes/class.frontendsetup.php:471
-#: include/classes/class.frontendsetup.php:498
-#: include/classes/class.frontendsetup.php:515
-#: include/classes/class.frontendsetup.php:532
-#: include/classes/class.frontendsetup.php:549
+#: include/classes/setup/CFrontendSetup.php:287
+#: include/classes/setup/CFrontendSetup.php:304
+#: include/classes/setup/CFrontendSetup.php:325
+#: include/classes/setup/CFrontendSetup.php:342
+#: include/classes/setup/CFrontendSetup.php:390
+#: include/classes/setup/CFrontendSetup.php:415
+#: include/classes/setup/CFrontendSetup.php:438
+#: include/classes/setup/CFrontendSetup.php:478
+#: include/classes/setup/CFrontendSetup.php:495
+#: include/classes/setup/CFrontendSetup.php:522
+#: include/classes/setup/CFrontendSetup.php:539
+#: include/classes/setup/CFrontendSetup.php:556
+#: include/classes/setup/CFrontendSetup.php:573
 #: include/views/monitoring.hostscreen.php:54
 msgid "on"
 msgstr "於"
 
-#: include/js.inc.php:134 include/js.inc.php:137
+#: include/views/configuration.httpconf.edit.php:129
 msgid "other"
 msgstr "其它"
 
-#: include/page_header.php:114
-msgid "refreshed every"
-msgstr "刷新於 "
+#: include/page_header.php:114 include/views/general.warning.php:22
+#, c-format
+msgid "refreshed every %1$s sec."
+msgstr ""
 
-#: include/views/configuration.host.discovery.edit.php:327
+#: include/views/configuration.host.discovery.edit.php:317
 #: include/views/js/configuration.host.discovery.edit.js.php:27
 msgid "regular expression"
 msgstr ""
@@ -15921,25 +16333,24 @@ msgstr ""
 msgid "remember selected"
 msgstr "記住所選的"
 
-#: include/services.inc.php:103 include/services.inc.php:104
-#: include/services.inc.php:191
+#: include/services.inc.php:69 include/services.inc.php:70
+#: include/services.inc.php:157
 #: include/views/configuration.services.parent.list.php:41
 #: include/views/configuration.services.parent.list.php:42
 #: include/views/configuration.services.parent.list.php:43
 msgid "root"
 msgstr "root"
 
-#: include/classes/class.cserverinfo.php:33
+#: include/classes/html/CServerInfo.php:33
 msgid "running"
 msgstr "運作中"
 
-#: include/func.inc.php:567
+#: include/func.inc.php:555
 msgctxt "second short"
 msgid "s"
 msgstr "s"
 
-#: include/page_header.php:114
-#: include/views/configuration.httpconf.edit.php:220
+#: include/views/configuration.httpconf.edit.php:258
 msgid "sec"
 msgstr "秒"
 
@@ -15952,7 +16363,7 @@ msgstr "秒"
 msgid "sent"
 msgstr "已發送"
 
-#: include/views/configuration.services.edit.php:227
+#: include/views/configuration.services.edit.php:226
 msgid "short description"
 msgstr "簡述"
 
@@ -15960,36 +16371,36 @@ msgstr "簡述"
 msgid "show icon mappings"
 msgstr "展示圖示對應"
 
-#: include/views/configuration.item.edit.php:390
+#: include/views/configuration.item.edit.php:384
 #: include/views/configuration.item.massupdate.php:442
 msgid "show value mappings"
 msgstr "展示值對應"
 
-#: api/classes/CHostBase.php:53
+#: include/classes/api/services/CHostBase.php:53
 #, c-format
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "模板ID\"%1$s\"已傳送%2$s次"
 
-#: include/func.inc.php:1804
+#: include/func.inc.php:1562
 msgid "to"
 msgstr "到"
 
-#: api/classes/CMap.php:389 include/events.inc.php:34
+#: include/classes/api/services/CMap.php:399 include/events.inc.php:34
 #: include/events.inc.php:63
 msgid "trigger"
 msgstr "觸發器"
 
-#: include/classes/class.cmultiselect.php:53 jsLoader.php:174
+#: include/classes/html/CMultiSelect.php:52 jsLoader.php:175
 msgid "type here to search"
 msgstr ""
 
-#: api/classes/CItemKey.php:62
+#: include/classes/parsers/CItemKey.php:62
 msgid "unexpected end of key"
 msgstr ""
 
-#: include/classes/class.frontendsetup.php:199
-#: include/classes/class.frontendsetup.php:337
-#: include/classes/class.frontendsetup.php:431
+#: include/classes/setup/CFrontendSetup.php:202
+#: include/classes/setup/CFrontendSetup.php:361
+#: include/classes/setup/CFrontendSetup.php:455
 msgid "unknown"
 msgstr "未知的"
 
@@ -16001,11 +16412,11 @@ msgstr "值"
 msgid "via"
 msgstr ""
 
-#: include/func.inc.php:562 jsLoader.php:96
+#: include/func.inc.php:550 jsLoader.php:97
 msgctxt "year short"
 msgid "y"
 msgstr "y"
 
-#: include/html.inc.php:599
+#: include/html.inc.php:606
 msgid "yyyy"
 msgstr "yyy"
diff --git a/frontends/php/maintenance.php b/frontends/php/maintenance.php
index ec6412f33d1..0d8916d075a 100644
--- a/frontends/php/maintenance.php
+++ b/frontends/php/maintenance.php
@@ -67,7 +67,7 @@ $fields = array(
 	'edit_timeperiodid' =>					array(null,      O_OPT, P_ACT,	DB_ID,		null),
 	'twb_groupid' =>						array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	// actions
-	'go' =>									array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>								array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, IN('"maintenance.massdelete"'), null),
 	'add_timeperiod' =>						array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel_new_timeperiod' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'save' =>								array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -76,17 +76,23 @@ $fields = array(
 	'cancel' =>								array(T_ZBX_STR, O_OPT, P_SYS,		 null,	null),
 	// form
 	'form' =>								array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
-	'form_refresh' =>						array(T_ZBX_STR, O_OPT, null,	null,		null)
+	'form_refresh' =>						array(T_ZBX_INT, O_OPT, null,	null,		null),
+	// sort and sortorder
+	'sort' =>								array(T_ZBX_STR, O_OPT, P_SYS,
+												IN('"active_since","active_till","maintenance_type","name"'),
+												null
+											),
+	'sortorder' =>							array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),
+												null
+											)
 );
 
 check_fields($fields);
 
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
-
 /*
  * Permissions
  */
-if (get_request('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
+if (getRequest('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
 	access_deny();
 }
 if (isset($_REQUEST['maintenanceid'])) {
@@ -94,16 +100,15 @@ if (isset($_REQUEST['maintenanceid'])) {
 		'output' => API_OUTPUT_EXTEND,
 		'selectTimeperiods' => API_OUTPUT_EXTEND,
 		'editable' => true,
-		'maintenanceids' => get_request('maintenanceid'),
+		'maintenanceids' => getRequest('maintenanceid'),
 	));
 	if (empty($dbMaintenance)) {
 		access_deny();
 	}
 }
-if (isset($_REQUEST['go']) && (!isset($_REQUEST['maintenanceids']) || !is_array($_REQUEST['maintenanceids']))) {
+if (hasRequest('action') && (!hasRequest('maintenanceids') || !is_array(getRequest('maintenanceids')))) {
 	access_deny();
 }
-$_REQUEST['go'] = get_request('go', 'none');
 
 /*
  * Actions
@@ -186,9 +191,9 @@ elseif (isset($_REQUEST['save'])) {
 			'description' => $_REQUEST['description'],
 			'active_since' => $activeSince,
 			'active_till' => $activeTill,
-			'timeperiods' => get_request('timeperiods', array()),
-			'hostids' => get_request('hostids', array()),
-			'groupids' => get_request('groupids', array())
+			'timeperiods' => getRequest('timeperiods', array()),
+			'hostids' => getRequest('hostids', array()),
+			'groupids' => getRequest('groupids', array())
 		);
 
 		if (isset($_REQUEST['maintenanceid'])) {
@@ -206,13 +211,16 @@ elseif (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
-elseif (isset($_REQUEST['delete']) || $_REQUEST['go'] == 'delete') {
-	$maintenanceids = get_request('maintenanceid', array());
-	if (isset($_REQUEST['maintenanceids'])) {
-		$maintenanceids = $_REQUEST['maintenanceids'];
+elseif (hasRequest('delete') || (hasRequest('action') && getRequest('action') == 'maintenance.massdelete')) {
+	$maintenanceids = getRequest('maintenanceid', array());
+	if (hasRequest('maintenanceids')) {
+		$maintenanceids = getRequest('maintenanceids');
 	}
 
 	zbx_value2array($maintenanceids);
@@ -236,8 +244,11 @@ elseif (isset($_REQUEST['delete']) || $_REQUEST['go'] == 'delete') {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('Maintenance deleted'), _('Cannot delete maintenance'));
-	clearCookies($result);
 }
 elseif (isset($_REQUEST['add_timeperiod']) && isset($_REQUEST['new_timeperiod'])) {
 	$new_timeperiod = $_REQUEST['new_timeperiod'];
@@ -295,7 +306,7 @@ elseif (isset($_REQUEST['add_timeperiod']) && isset($_REQUEST['new_timeperiod'])
 		}
 	}
 
-	$_REQUEST['timeperiods'] = get_request('timeperiods', array());
+	$_REQUEST['timeperiods'] = getRequest('timeperiods', array());
 
 	$result = false;
 	if ($new_timeperiod['period'] < 300) {
@@ -369,7 +380,7 @@ elseif (isset($_REQUEST['add_timeperiod']) && isset($_REQUEST['new_timeperiod'])
 	}
 }
 elseif (isset($_REQUEST['del_timeperiodid'])) {
-	$_REQUEST['timeperiods'] = get_request('timeperiods', array());
+	$_REQUEST['timeperiods'] = getRequest('timeperiods', array());
 	$delTimeperiodId = array_keys($_REQUEST['del_timeperiodid']);
 	$delTimeperiodId = reset($delTimeperiodId);
 	unset($_REQUEST['timeperiods'][$delTimeperiodId]);
@@ -377,7 +388,7 @@ elseif (isset($_REQUEST['del_timeperiodid'])) {
 elseif (isset($_REQUEST['edit_timeperiodid'])) {
 	$_REQUEST['edit_timeperiodid'] = array_keys($_REQUEST['edit_timeperiodid']);
 	$edit_timeperiodid = $_REQUEST['edit_timeperiodid'] = array_pop($_REQUEST['edit_timeperiodid']);
-	$_REQUEST['timeperiods'] = get_request('timeperiods', array());
+	$_REQUEST['timeperiods'] = getRequest('timeperiods', array());
 
 	if (isset($_REQUEST['timeperiods'][$edit_timeperiodid])) {
 		$_REQUEST['new_timeperiod'] = $_REQUEST['timeperiods'][$edit_timeperiodid];
@@ -388,7 +399,7 @@ elseif (isset($_REQUEST['edit_timeperiodid'])) {
 
 $options = array(
 	'groups' => array('editable' => 1),
-	'groupid' => get_request('groupid', null)
+	'groupid' => getRequest('groupid')
 );
 $pageFilter = new CPageFilter($options);
 $_REQUEST['groupid'] = $pageFilter->groupid;
@@ -397,12 +408,12 @@ $_REQUEST['groupid'] = $pageFilter->groupid;
  * Display
  */
 $data = array(
-	'form' => get_request('form')
+	'form' => getRequest('form')
 );
 
 if (!empty($data['form'])) {
-	$data['maintenanceid'] = get_request('maintenanceid');
-	$data['form_refresh'] = get_request('form_refresh', 0);
+	$data['maintenanceid'] = getRequest('maintenanceid');
+	$data['form_refresh'] = getRequest('form_refresh', 0);
 
 	if (isset($data['maintenanceid']) && !isset($_REQUEST['form_refresh'])) {
 		$dbMaintenance = reset($dbMaintenance);
@@ -435,8 +446,8 @@ if (!empty($data['form'])) {
 		$data['groupids'] = zbx_objectValues($data['groupids'], 'groupid');
 	}
 	else {
-		$data['mname'] = get_request('mname', '');
-		$data['maintenance_type'] = get_request('maintenance_type', 0);
+		$data['mname'] = getRequest('mname', '');
+		$data['maintenance_type'] = getRequest('maintenance_type', 0);
 		if (isset($_REQUEST['active_since'])) {
 			$data['active_since'] = mktime($_REQUEST['active_since_hour'],
 					$_REQUEST['active_since_minute'],
@@ -459,10 +470,10 @@ if (!empty($data['form'])) {
 		else {
 			$data['active_till'] = strtotime('tomorrow');
 		}
-		$data['description'] = get_request('description', '');
-		$data['timeperiods'] = get_request('timeperiods', array());
-		$data['hostids'] = get_request('hostids', array());
-		$data['groupids'] = get_request('groupids', array());
+		$data['description'] = getRequest('description', '');
+		$data['timeperiods'] = getRequest('timeperiods', array());
+		$data['hostids'] = getRequest('hostids', array());
+		$data['groupids'] = getRequest('groupids', array());
 	}
 
 	// get groups
@@ -474,7 +485,7 @@ if (!empty($data['form'])) {
 	));
 	order_result($data['all_groups'], 'name');
 
-	$data['twb_groupid'] = get_request('twb_groupid', 0);
+	$data['twb_groupid'] = getRequest('twb_groupid', 0);
 	if (!isset($data['all_groups'][$data['twb_groupid']])) {
 		$twb_groupid = reset($data['all_groups']);
 		$data['twb_groupid'] = $twb_groupid['groupid'];
@@ -506,24 +517,33 @@ if (!empty($data['form'])) {
 }
 else {
 	// get maintenances
-	$sortfield = getPageSortField('name');
-	$sortorder = getPageSortOrder();
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
 
-	$groupIds = array();
-	if ($pageFilter->groupsSelected) {
-		$groupIds = ($pageFilter->groupid > 0) ? $pageFilter->groupid : array_keys($pageFilter->groups);
-	}
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
 
-	// get only maintenance IDs for paging
-	$data['maintenances'] = API::Maintenance()->get(array(
+	$data['sort'] = $sortField;
+	$data['sortorder'] = $sortOrder;
+
+	$options = array(
 		'output' => array('maintenanceid'),
-		'groupids' => $groupIds,
-		'sortfield' => $sortfield,
-		'sortorder' => $sortorder,
 		'editable' => true,
+		'sortfield' => $sortField,
+		'sortorder' => $sortOrder,
 		'limit' => $config['search_limit'] + 1
-	));
-	$data['paging'] = getPagingLine($data['maintenances'], array('maintenanceid'));
+	);
+
+	if ($pageFilter->groupsSelected && $pageFilter->groupid > 0) {
+		$options['groupids'] = $pageFilter->groupid;
+	}
+	else {
+		$options['groupids'] = $config['dropdown_first_entry'] ? null : array();
+	}
+
+	$data['maintenances'] = API::Maintenance()->get($options);
+
+	$data['paging'] = getPagingLine($data['maintenances']);
 
 	// get list of maintenances
 	$data['maintenances'] = API::Maintenance()->get(array(
@@ -543,7 +563,7 @@ else {
 		}
 	}
 
-	order_result($data['maintenances'], $sortfield, $sortorder);
+	order_result($data['maintenances'], $sortField, $sortOrder);
 
 	$data['pageFilter'] = $pageFilter;
 
diff --git a/frontends/php/map.php b/frontends/php/map.php
index afe99ae4ee9..f01a93ee64d 100644
--- a/frontends/php/map.php
+++ b/frontends/php/map.php
@@ -61,7 +61,7 @@ $mapPainter = new CMapPainter($map, array(
 		'drawAreas' => (!isset($_REQUEST['selements']) && !isset($_REQUEST['noselements']))
 	),
 	'grid' => array(
-		'size' => get_request('grid', 0)
+		'size' => getRequest('grid', 0)
 	)
 ));
 
@@ -87,10 +87,10 @@ $y = imagesy($im);
 /*
  * Actions
  */
-$json = new CJSON();
+$json = new CJson();
 
 if (isset($_REQUEST['selements']) || isset($_REQUEST['noselements'])) {
-	$map['selements'] = get_request('selements', '[]');
+	$map['selements'] = getRequest('selements', '[]');
 	$map['selements'] = $json->decode($map['selements'], true);
 }
 else {
@@ -98,11 +98,11 @@ else {
 }
 
 if (isset($_REQUEST['links']) || isset($_REQUEST['nolinks'])) {
-	$map['links'] = get_request('links', '[]');
+	$map['links'] = getRequest('links', '[]');
 	$map['links'] = $json->decode($map['links'], true);
 }
 
-if (get_request('nocalculations', false)) {
+if (getRequest('nocalculations', false)) {
 	foreach ($map['selements'] as $selement) {
 		if ($selement['elementtype'] != SYSMAP_ELEMENT_TYPE_IMAGE) {
 			add_elementNames($map['selements']);
@@ -154,7 +154,7 @@ else {
 	add_triggerExpressions($map['selements']);
 
 	$areas = populateFromMapAreas($map);
-	$mapInfo = getSelementsInfo($map, array('severity_min' => get_request('severity_min')));
+	$mapInfo = getSelementsInfo($map, array('severity_min' => getRequest('severity_min')));
 	processAreasCoordinates($map, $areas, $mapInfo);
 	$allLinks = false;
 }
@@ -169,7 +169,7 @@ if (!isset($_REQUEST['noselements'])) {
 	drawMapSelements($im, $map, $mapInfo);
 }
 
-$expandMacros = get_request('expand_macros', true);
+$expandMacros = getRequest('expand_macros', true);
 drawMapLabels($im, $map, $mapInfo, $expandMacros);
 drawMapLinkLabels($im, $map, $mapInfo, $expandMacros);
 
@@ -179,12 +179,12 @@ if (!isset($_REQUEST['noselements']) && $map['markelements'] == 1) {
 
 show_messages();
 
-if (get_request('base64image')) {
+if (getRequest('base64image')) {
 	ob_start();
 	imagepng($im);
 	$imageSource = ob_get_contents();
 	ob_end_clean();
-	$json = new CJSON();
+	$json = new CJson();
 	echo $json->encode(array('result' => base64_encode($imageSource)));
 	imagedestroy($im);
 }
diff --git a/frontends/php/maps.php b/frontends/php/maps.php
index 57912f74d7f..4e8a8c0c4be 100644
--- a/frontends/php/maps.php
+++ b/frontends/php/maps.php
@@ -41,7 +41,7 @@ $fields = array(
 	'fullscreen' =>		array(T_ZBX_INT, O_OPT, P_SYS,			IN('0,1'),				null),
 	'favobj' =>			array(T_ZBX_STR, O_OPT, P_ACT,			null,					null),
 	'favid' =>			array(T_ZBX_INT, O_OPT, P_ACT,			null,					null),
-	'favaction' =>		array(T_ZBX_STR, O_OPT, P_ACT,			IN("'add','remove'"),	null)
+	'favaction' =>		array(T_ZBX_STR, O_OPT, P_ACT,			IN('"add","remove"'),	null)
 );
 check_fields($fields);
 
@@ -91,7 +91,7 @@ $maps = API::Map()->get(array(
 ));
 order_result($maps, 'name');
 
-if ($mapName = get_request('mapname')) {
+if ($mapName = getRequest('mapname')) {
 	unset($_REQUEST['sysmapid']);
 
 	foreach ($maps as $map) {
@@ -140,7 +140,7 @@ $data['pageFilter'] = new CPageFilter(array(
 		'default' => $data['map']['severity_min'],
 		'mapId' => $data['sysmapid']
 	),
-	'severityMin' => get_request('severity_min')
+	'severityMin' => getRequest('severity_min')
 ));
 $data['severity_min'] = $data['pageFilter']->severityMin;
 
diff --git a/frontends/php/media_types.php b/frontends/php/media_types.php
index 022cd16f6ab..a0caff82002 100644
--- a/frontends/php/media_types.php
+++ b/frontends/php/media_types.php
@@ -51,17 +51,22 @@ $fields = array(
 		'isset({save})&&isset({type})&&({type}=='.MEDIA_TYPE_JABBER.'||{type}=='.MEDIA_TYPE_EZ_TEXTING.')'),
 	'status'=>			array(T_ZBX_INT, O_OPT,	null,	IN(array(MEDIA_TYPE_STATUS_ACTIVE, MEDIA_TYPE_STATUS_DISABLED)), null),
 	// actions
+	'action' =>			array(T_ZBX_STR, O_OPT,	P_SYS|P_ACT,
+							IN('"mediatype.massdelete","mediatype.massdisable","mediatype.massenable"'),
+							null
+						),
 	'save' =>			array(T_ZBX_STR, O_OPT,	P_SYS|P_ACT, null, null),
 	'delete' =>			array(T_ZBX_STR, O_OPT,	P_SYS|P_ACT, null, null),
 	'cancel' =>			array(T_ZBX_STR, O_OPT,	P_SYS|P_ACT, null, null),
-	'go' =>				array(T_ZBX_STR, O_OPT,	P_SYS|P_ACT, null, null),
 	'form' =>			array(T_ZBX_STR, O_OPT,	P_SYS,	null,	null),
-	'form_refresh' =>	array(T_ZBX_INT, O_OPT,	null,	null,	null)
+	'form_refresh' =>	array(T_ZBX_INT, O_OPT,	null,	null,	null),
+	// sort and sortorder
+	'sort' =>					array(T_ZBX_STR, O_OPT, P_SYS, IN('"description","type"'),					null),
+	'sortorder' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('description', ZBX_SORT_UP);
 
-$mediaTypeId = get_request('mediatypeid');
+$mediaTypeId = getRequest('mediatypeid');
 
 /*
  * Permissions
@@ -75,38 +80,36 @@ if (isset($_REQUEST['mediatypeid'])) {
 		access_deny();
 	}
 }
-if (isset($_REQUEST['go'])) {
-	if (!isset($_REQUEST['mediatypeids']) || !is_array($_REQUEST['mediatypeids'])) {
+if (hasRequest('action')) {
+	if (!hasRequest('mediatypeids') || !is_array(getRequest('mediatypeids'))) {
 		access_deny();
 	}
 	else {
 		$mediaTypeChk = API::Mediatype()->get(array(
-			'mediatypeids' => $_REQUEST['mediatypeids'],
+			'mediatypeids' => getRequest('mediatypeids'),
 			'countOutput' => true
 		));
-		if ($mediaTypeChk != count($_REQUEST['mediatypeids'])) {
+		if ($mediaTypeChk != count(getRequest('mediatypeids'))) {
 			access_deny();
 		}
 	}
 }
 
-$_REQUEST['go'] = get_request('go', 'none');
-
 /*
  * Actions
  */
 if (isset($_REQUEST['save'])) {
 	$mediaType = array(
-		'type' => get_request('type'),
-		'description' => get_request('description'),
-		'smtp_server' => get_request('smtp_server'),
-		'smtp_helo' => get_request('smtp_helo'),
-		'smtp_email' => get_request('smtp_email'),
-		'exec_path' => get_request('exec_path'),
-		'gsm_modem' => get_request('gsm_modem'),
-		'username' => get_request('username'),
-		'passwd' => get_request('password'),
-		'status' => get_request('status', MEDIA_TYPE_STATUS_DISABLED)
+		'type' => getRequest('type'),
+		'description' => getRequest('description'),
+		'smtp_server' => getRequest('smtp_server'),
+		'smtp_helo' => getRequest('smtp_helo'),
+		'smtp_email' => getRequest('smtp_email'),
+		'exec_path' => getRequest('exec_path'),
+		'gsm_modem' => getRequest('gsm_modem'),
+		'username' => getRequest('username'),
+		'passwd' => getRequest('password'),
+		'status' => getRequest('status', MEDIA_TYPE_STATUS_DISABLED)
 	);
 
 	if (is_null($mediaType['passwd'])) {
@@ -138,22 +141,24 @@ if (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
 elseif (isset($_REQUEST['delete']) && !empty($mediaTypeId)) {
 	$result = API::Mediatype()->delete(array(getRequest('mediatypeid')));
 
 	if ($result) {
 		unset($_REQUEST['form']);
+		uncheckTableRows();
 	}
-
 	show_messages($result, _('Media type deleted'), _('Cannot delete media type'));
-	clearCookies($result);
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
-	$mediaTypeIds = getRequest('mediatypeids', array());
-	$enable = (getRequest('go') == 'activate');
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('mediatype.massenable', 'mediatype.massdisable')) && hasRequest('mediatypeids')) {
+	$mediaTypeIds = getRequest('mediatypeids');
+	$enable = (getRequest('action') == 'mediatype.massenable');
 	$status = $enable ? MEDIA_TYPE_STATUS_ACTIVE : MEDIA_TYPE_STATUS_DISABLED;
 	$update = array();
 
@@ -165,7 +170,12 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
 	}
 	$result = API::Mediatype()->update($update);
 
+	if ($result) {
+		uncheckTableRows();
+	}
+
 	$updated = count($update);
+
 	$messageSuccess = $enable
 		? _n('Media type enabled', 'Media types enabled', $updated)
 		: _n('Media type disabled', 'Media types disabled', $updated);
@@ -174,13 +184,14 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable'))) {
 		: _n('Cannot disable media type', 'Cannot disable media types', $updated);
 
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete') {
-	$goResult = API::Mediatype()->delete(get_request('mediatypeids', array()));
+elseif (hasRequest('action') && getRequest('action') == 'mediatype.massdelete' && hasRequest('mediatypeids')) {
+	$result = API::Mediatype()->delete(getRequest('mediatypeids'));
 
-	show_messages($goResult, _('Media type deleted'), _('Cannot delete media type'));
-	clearCookies($goResult);
+	if ($result) {
+		uncheckTableRows();
+	}
+	show_messages($result, _('Media type deleted'), _('Cannot delete media type'));
 }
 
 /*
@@ -188,8 +199,8 @@ elseif ($_REQUEST['go'] == 'delete') {
  */
 if (!empty($_REQUEST['form'])) {
 	$data = array(
-		'form' => get_request('form'),
-		'form_refresh' => get_request('form_refresh', 0),
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh', 0),
 		'mediatypeid' => $mediaTypeId
 	);
 
@@ -208,16 +219,16 @@ if (!empty($_REQUEST['form'])) {
 		$data['status'] = $mediaType['status'];
 	}
 	else {
-		$data['type'] = get_request('type', MEDIA_TYPE_EMAIL);
-		$data['description'] = get_request('description', '');
-		$data['smtp_server'] = get_request('smtp_server', 'localhost');
-		$data['smtp_helo'] = get_request('smtp_helo', 'localhost');
-		$data['smtp_email'] = get_request('smtp_email', 'zabbix@localhost');
-		$data['exec_path'] = get_request('exec_path', '');
-		$data['gsm_modem'] = get_request('gsm_modem', '/dev/ttyS0');
-		$data['username'] = get_request('username', ($data['type'] == MEDIA_TYPE_EZ_TEXTING) ? 'username' : 'user@server');
-		$data['password'] = get_request('password', '');
-		$data['status'] = get_request('status', MEDIA_TYPE_STATUS_ACTIVE);
+		$data['type'] = getRequest('type', MEDIA_TYPE_EMAIL);
+		$data['description'] = getRequest('description', '');
+		$data['smtp_server'] = getRequest('smtp_server', 'localhost');
+		$data['smtp_helo'] = getRequest('smtp_helo', 'localhost');
+		$data['smtp_email'] = getRequest('smtp_email', 'zabbix@localhost');
+		$data['exec_path'] = getRequest('exec_path', '');
+		$data['gsm_modem'] = getRequest('gsm_modem', '/dev/ttyS0');
+		$data['username'] = getRequest('username', ($data['type'] == MEDIA_TYPE_EZ_TEXTING) ? 'username' : 'user@server');
+		$data['password'] = getRequest('password', '');
+		$data['status'] = getRequest('status', MEDIA_TYPE_STATUS_ACTIVE);
 	}
 
 	// render view
@@ -226,7 +237,16 @@ if (!empty($_REQUEST['form'])) {
 	$mediaTypeView->show();
 }
 else {
-	$data = array();
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'description'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
+	$data = array(
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
+	);
 
 	// get media types
 	$data['mediatypes'] = API::Mediatype()->get(array(
@@ -256,7 +276,7 @@ else {
 						if ($operation['operationtype'] == OPERATION_TYPE_MESSAGE
 								&& $operation['opmessage']['mediatypeid'] == $mediaType['mediatypeid']) {
 
-							$data['mediatypes'][$key]['listOfActions'][] = array(
+							$data['mediatypes'][$key]['listOfActions'][$actionId] = array(
 								'actionid' => $actionId,
 								'name' => $action['name']
 							);
@@ -268,13 +288,13 @@ else {
 			}
 		}
 
-		// sorting & paging
-		order_result($data['mediatypes'], getPageSortField('description'), getPageSortOrder());
-		$data['paging'] = getPagingLine($data['mediatypes'], array('mediatypeid'));
+		order_result($data['mediatypes'], $sortField, $sortOrder);
+
+		$data['paging'] = getPagingLine($data['mediatypes']);
 	}
 	else {
 		$arr = array();
-		$data['paging'] = getPagingLine($arr, array('mediatypeid'));
+		$data['paging'] = getPagingLine($arr);
 	}
 
 	// render view
diff --git a/frontends/php/overview.php b/frontends/php/overview.php
index ac256c6fca4..a8db99cc12d 100644
--- a/frontends/php/overview.php
+++ b/frontends/php/overview.php
@@ -40,31 +40,125 @@ $fields = array(
 	'groupid'     => array(T_ZBX_INT, O_OPT, P_SYS, DB_ID,     null),
 	'view_style'  => array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'), null),
 	'type'        => array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'), null),
-	'application' => array(T_ZBX_STR, O_OPT, P_SYS, null,	   null),
-	'fullscreen'  => array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'), null)
+	'fullscreen'  => array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'), null),
+	// filter
+	'filter_rst' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
+	'filter_set' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
+	'show_triggers' =>		array(T_ZBX_INT, O_OPT, null,	null,		null),
+	'ack_status' =>			array(T_ZBX_INT, O_OPT, P_SYS,	null,		null),
+	'show_severity' =>		array(T_ZBX_INT, O_OPT, P_SYS,	null,		null),
+	'show_maintenance' =>	array(T_ZBX_INT, O_OPT, null,	null,		null),
+	'status_change_days' =>	array(T_ZBX_INT, O_OPT, null,	BETWEEN(1, DAY_IN_YEAR * 2), null),
+	'status_change' =>		array(T_ZBX_INT, O_OPT, null,	null,		null),
+	'txt_select' =>			array(T_ZBX_STR, O_OPT, null,	null,		null),
+	'application' =>		array(T_ZBX_STR, O_OPT, null,	null,		null),
+	'inventory' =>			array(T_ZBX_STR, O_OPT, null,	null,		null),
+	// ajax
+	'filterState' =>		array(T_ZBX_INT, O_OPT, P_ACT,	null,		null)
 );
 check_fields($fields);
 
 /*
  * Permissions
  */
-if (get_request('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
+if (getRequest('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
 	access_deny();
 }
 
 /*
+ * Ajax
+ */
+if (hasRequest('filterState')) {
+	CProfile::update('web.overview.filter.state', getRequest('filterState'), PROFILE_TYPE_INT);
+}
+
+if ($page['type'] == PAGE_TYPE_JS || $page['type'] == PAGE_TYPE_HTML_BLOCK) {
+	require_once dirname(__FILE__).'/include/page_footer.php';
+	exit();
+}
+
+$config = select_config();
+if (hasRequest('filter_set')) {
+	CProfile::update('web.overview.filter.show_maintenance', getRequest('show_maintenance', 0), PROFILE_TYPE_INT);
+	CProfile::update('web.overview.filter.show_severity', getRequest('show_severity', TRIGGER_SEVERITY_NOT_CLASSIFIED),
+		PROFILE_TYPE_INT
+	);
+	CProfile::update('web.overview.filter.txt_select', getRequest('txt_select'), PROFILE_TYPE_STR);
+	CProfile::update('web.overview.filter.status_change', getRequest('status_change', 0), PROFILE_TYPE_INT);
+	CProfile::update('web.overview.filter.status_change_days', getRequest('status_change_days', 14),
+		PROFILE_TYPE_INT
+	);
+	CProfile::update('web.overview.filter.application', getRequest('application'), PROFILE_TYPE_STR);
+
+	// show triggers
+	// when this filter is set to "All" it must not be remembered in the profiles because it may render the
+	// whole page inaccessible on large installations.
+	if (getRequest('show_triggers') != TRIGGERS_OPTION_ALL) {
+		CProfile::update('web.overview.filter.show_triggers', getRequest('show_triggers'), PROFILE_TYPE_INT);
+	}
+
+	// ack status
+	if ($config['event_ack_enable'] == EVENT_ACK_ENABLED) {
+		CProfile::update('web.overview.filter.ack_status', getRequest('ack_status', ZBX_ACK_STS_ANY), PROFILE_TYPE_INT);
+	}
+
+	// update host inventory filter
+	$inventoryFields = array();
+	$inventoryValues = array();
+	foreach (getRequest('inventory', array()) as $field) {
+		if ($field['value'] === '') {
+			continue;
+		}
+
+		$inventoryFields[] = $field['field'];
+		$inventoryValues[] = $field['value'];
+	}
+	CProfile::updateArray('web.overview.filter.inventory.field', $inventoryFields, PROFILE_TYPE_STR);
+	CProfile::updateArray('web.overview.filter.inventory.value', $inventoryValues, PROFILE_TYPE_STR);
+}
+elseif (hasRequest('filter_rst')) {
+	DBStart();
+	CProfile::delete('web.overview.filter.show_triggers');
+	CProfile::delete('web.overview.filter.show_maintenance');
+	CProfile::delete('web.overview.filter.ack_status');
+	CProfile::delete('web.overview.filter.show_severity');
+	CProfile::delete('web.overview.filter.txt_select');
+	CProfile::delete('web.overview.filter.status_change');
+	CProfile::delete('web.overview.filter.status_change_days');
+	CProfile::delete('web.overview.filter.application');
+	CProfile::deleteIdx('web.overview.filter.inventory.field');
+	CProfile::deleteIdx('web.overview.filter.inventory.value');
+	DBend();
+}
+
+// overview type
+if (hasRequest('type')) {
+	CProfile::update('web.overview.type', getRequest('type'), PROFILE_TYPE_INT);
+}
+$type = CProfile::get('web.overview.type', SHOW_TRIGGERS);
+
+// overview style
+if (hasRequest('view_style')) {
+	CProfile::update('web.overview.view_style', getRequest('view_style'), PROFILE_TYPE_INT);
+}
+$viewStyle = CProfile::get('web.overview.view_style', STYLE_TOP);
+
+if (hasRequest('filter_set') && getRequest('show_triggers') == TRIGGERS_OPTION_ALL) {
+	$showTriggers = TRIGGERS_OPTION_ALL;
+}
+else {
+	$showTriggers = CProfile::get('web.overview.filter.show_triggers', TRIGGERS_OPTION_RECENT_PROBLEM);
+}
+
+/*
  * Display
  */
 $data = array(
-	'fullscreen' => $_REQUEST['fullscreen']
+	'fullscreen' => $_REQUEST['fullscreen'],
+	'type' => $type,
+	'view_style' => $viewStyle
 );
 
-$data['view_style'] = get_request('view_style', CProfile::get('web.overview.view.style', STYLE_TOP));
-CProfile::update('web.overview.view.style', $data['view_style'], PROFILE_TYPE_INT);
-
-$data['type'] = get_request('type', CProfile::get('web.overview.type', SHOW_TRIGGERS));
-CProfile::update('web.overview.type', $data['type'], PROFILE_TYPE_INT);
-
 $data['pageFilter'] = new CPageFilter(array(
 	'groups' => array(
 		($data['type'] == SHOW_TRIGGERS ? 'with_monitored_triggers' : 'with_monitored_items') => true
@@ -73,16 +167,118 @@ $data['pageFilter'] = new CPageFilter(array(
 		'monitored_hosts' => true,
 		($data['type'] == SHOW_TRIGGERS ? 'with_monitored_triggers' : 'with_monitored_items') => true
 	),
-	'applications' => array('templated' => false),
-	'hostid' => get_request('hostid', null),
-	'groupid' => get_request('groupid', null),
-	'application' => get_request('application', null)
+	'hostid' => getRequest('hostid'),
+	'groupid' => getRequest('groupid')
 ));
 
 $data['groupid'] = $data['pageFilter']->groupid;
+$data['hostid'] = $data['pageFilter']->hostid;
+
+// fetch trigger data
+if ($type == SHOW_TRIGGERS) {
+	// filter data
+	$filter = array(
+		'showTriggers' => $showTriggers,
+		'ackStatus' => CProfile::get('web.overview.filter.ack_status', 0),
+		'showSeverity' => CProfile::get('web.overview.filter.show_severity', TRIGGER_SEVERITY_NOT_CLASSIFIED),
+		'statusChange' => CProfile::get('web.overview.filter.status_change', 0),
+		'statusChangeDays' => CProfile::get('web.overview.filter.status_change_days', 14),
+		'txtSelect' => CProfile::get('web.overview.filter.txt_select', ''),
+		'application' => CProfile::get('web.overview.filter.application', ''),
+		'showMaintenance' => CProfile::get('web.overview.filter.show_maintenance', 1),
+		'inventory' => array()
+	);
+	foreach (CProfile::getArray('web.overview.filter.inventory.field', array()) as $i => $field) {
+		$filter['inventory'][] = array(
+			'field' => $field,
+			'value' => CProfile::get('web.overview.filter.inventory.value', null, $i)
+		);
+	}
+
+	// fetch hosts
+	$inventoryFilter = array();
+	foreach ($filter['inventory'] as $field) {
+		$inventoryFilter[$field['field']][] = $field['value'];
+	}
+	$hosts = API::Host()->get(array(
+		'output' => array('hostid', 'status'),
+		'selectGraphs' => ($viewStyle == STYLE_LEFT) ? API_OUTPUT_COUNT : null,
+		'selectScreens' => ($viewStyle == STYLE_LEFT) ? API_OUTPUT_COUNT : null,
+		'groupids' => ($data['pageFilter']->groupid != 0) ? $data['pageFilter']->groupid : null,
+		'searchInventory' => ($inventoryFilter) ? $inventoryFilter : null,
+		'preservekeys' => true
+	));
+	$hostIds = array_keys($hosts);
+
+	$options = array(
+		'output' => array(
+			'description', 'expression', 'priority', 'url', 'value', 'triggerid', 'lastchange', 'flags'
+		),
+		'selectHosts' => array('hostid', 'name', 'status'),
+		'hostids' => $hostIds,
+		'search' => ($filter['txtSelect'] !== '') ? array('description' => $filter['txtSelect']) : null,
+		'only_true' => ($filter['showTriggers'] == TRIGGERS_OPTION_RECENT_PROBLEM) ? true : null,
+		'withUnacknowledgedEvents' => ($filter['ackStatus'] == ZBX_ACK_STS_WITH_UNACK) ? true : null,
+		'withLastEventUnacknowledged' => ($filter['ackStatus'] == ZBX_ACK_STS_WITH_LAST_UNACK) ? true : null,
+		'min_severity' => ($filter['showSeverity'] > TRIGGER_SEVERITY_NOT_CLASSIFIED) ? $filter['showSeverity'] : null,
+		'lastChangeSince' => $filter['statusChange'] ? time() - $filter['statusChangeDays'] * SEC_PER_DAY : null,
+		'maintenance' => !$filter['showMaintenance'] ? false : null,
+		'monitored' => true,
+		'skipDependent' => true,
+		'sortfield' => 'description'
+	);
+
+	// trigger status filter
+	if ($filter['showTriggers'] == TRIGGERS_OPTION_RECENT_PROBLEM) {
+		$options['only_true'] = true;
+	}
+	elseif ($filter['showTriggers'] == TRIGGERS_OPTION_IN_PROBLEM) {
+		$options['filter']['value'] = TRIGGER_VALUE_TRUE;
+	}
+
+	// application filter
+	if ($filter['application'] !== '') {
+		$applications = API::Application()->get(array(
+			'output' => array('applicationid'),
+			'hostids' => $hostIds,
+			'search' => array('name' => $filter['application'])
+		));
+		$options['applicationids'] = zbx_objectValues($applications, 'applicationid');
+	}
+
+	$triggers = API::Trigger()->get($options);
+
+	$data['filter'] = $filter;
+	$data['hosts'] = $hosts;
+	$data['triggers'] = $triggers;
+
+	$overviewView = new CView('monitoring.overview.triggers', $data);
+}
+// fetch item data
+else {
+	// filter data
+	$filter = array(
+		'application' => CProfile::get('web.overview.filter.application', '')
+	);
+
+	// application filter
+	$applicationIds = null;
+	if ($filter['application'] !== '') {
+		$applications = API::Application()->get(array(
+			'output' => array('applicationid'),
+			'groupids' => ($data['pageFilter']->groupid != 0) ? $data['pageFilter']->groupid : null,
+			'search' => array('name' => $filter['application'])
+		));
+		$applicationIds = zbx_objectValues($applications, 'applicationid');
+	}
+
+	$data['filter'] = $filter;
+	$data['applicationIds'] = $applicationIds;
+
+	$overviewView = new CView('monitoring.overview.items', $data);
+}
 
 // render view
-$overviewView = new CView('monitoring.overview', $data);
 $overviewView->render();
 $overviewView->show();
 
diff --git a/frontends/php/popup.php b/frontends/php/popup.php
index d1ce554e10a..c93ce7914e5 100644
--- a/frontends/php/popup.php
+++ b/frontends/php/popup.php
@@ -27,10 +27,26 @@ require_once dirname(__FILE__).'/include/users.inc.php';
 require_once dirname(__FILE__).'/include/js.inc.php';
 require_once dirname(__FILE__).'/include/discovery.inc.php';
 
-$srctbl = get_request('srctbl', ''); // source table name
+$srctbl = getRequest('srctbl', ''); // source table name
 
 // set page title
 switch ($srctbl) {
+	case 'hosts':
+		$page['title'] = _('Hosts');
+		$min_user_type = USER_TYPE_ZABBIX_ADMIN;
+		break;
+	case 'templates':
+		$page['title'] = _('Templates');
+		$min_user_type = USER_TYPE_ZABBIX_ADMIN;
+		break;
+	case 'host_templates':
+		$page['title'] = _('Hosts');
+		$min_user_type = USER_TYPE_ZABBIX_ADMIN;
+		break;
+	case 'host_groups':
+		$page['title'] = _('Host groups');
+		$min_user_type = USER_TYPE_ZABBIX_USER;
+		break;
 	case 'proxies':
 		$page['title'] = _('Proxies');
 		$min_user_type = USER_TYPE_ZABBIX_ADMIN;
@@ -55,10 +71,6 @@ switch ($srctbl) {
 		$page['title'] = _('Items');
 		$min_user_type = USER_TYPE_ZABBIX_USER;
 		break;
-	case 'prototypes':
-		$page['title'] = _('Prototypes');
-		$min_user_type = USER_TYPE_ZABBIX_ADMIN;
-		break;
 	case 'help_items':
 		$page['title'] = _('Standard items');
 		$min_user_type = USER_TYPE_ZABBIX_USER;
@@ -75,6 +87,14 @@ switch ($srctbl) {
 		$page['title'] = _('Graphs');
 		$min_user_type = USER_TYPE_ZABBIX_USER;
 		break;
+	case 'graph_prototypes':
+		$page['title'] = _('Graph prototypes');
+		$min_user_type = USER_TYPE_ZABBIX_ADMIN;
+		break;
+	case 'item_prototypes':
+		$page['title'] = _('Item prototypes');
+		$min_user_type = USER_TYPE_ZABBIX_ADMIN;
+		break;
 	case 'sysmaps':
 		$page['title'] = _('Maps');
 		$min_user_type = USER_TYPE_ZABBIX_USER;
@@ -121,8 +141,9 @@ $allowedSrcFields = array(
 	'users'					=> '"usergrpid", "alias", "fullname", "userid"',
 	'triggers'				=> '"description", "triggerid", "expression"',
 	'items'					=> '"itemid", "name"',
-	'prototypes'			=> '"itemid", "name", "flags"',
 	'graphs'				=> '"graphid", "name"',
+	'graph_prototypes'		=> '"graphid", "name"',
+	'item_prototypes'		=> '"itemid", "name", "flags"',
 	'sysmaps'				=> '"sysmapid", "name"',
 	'slides'				=> '"slideshowid"',
 	'help_items'			=> '"key"',
@@ -132,8 +153,12 @@ $allowedSrcFields = array(
 	'dchecks'				=> '"dcheckid", "name"',
 	'proxies'				=> '"hostid", "host"',
 	'usrgrp'				=> '"usrgrpid", "name"',
-	'applications'			=> '"name"',
-	'scripts'				=> '"scriptid", "name"'
+	'applications'			=> '"applicationid", "name"',
+	'scripts'				=> '"scriptid", "name"',
+	'hosts'					=> '"hostid", "host"',
+	'templates'				=> '"hostid", "host"',
+	'host_templates'		=> '"hostid", "host"',
+	'host_groups'			=> '"groupid", "name"'
 );
 
 // VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
@@ -150,7 +175,6 @@ $fields = array(
 	'screenid' =>					array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'templates' =>					array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	null),
 	'host_templates' =>				array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	null),
-	'existed_templates' =>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	null),
 	'multiselect' =>				array(T_ZBX_INT, O_OPT, null,	null,		null),
 	'submit' =>						array(T_ZBX_STR, O_OPT, null,	null,		null),
 	'excludeids' =>					array(T_ZBX_STR, O_OPT, null,	null,		null),
@@ -193,49 +217,49 @@ for ($i = 2; $i <= $srcfldCount; $i++) {
 check_fields($fields);
 
 // validate permissions
-if (get_request('only_hostid')) {
+if (getRequest('only_hostid')) {
 	if (!API::Host()->isReadable(array($_REQUEST['only_hostid']))) {
 		access_deny();
 	}
 }
 else {
-	if (get_request('hostid') && !API::Host()->isReadable(array($_REQUEST['hostid'])) ||
-			get_request('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
+	if (getRequest('hostid') && !API::Host()->isReadable(array($_REQUEST['hostid'])) ||
+			getRequest('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
 		access_deny();
 	}
 }
-if (get_request('parent_discoveryid') && !API::DiscoveryRule()->isReadable(array($_REQUEST['parent_discoveryid']))) {
+if (getRequest('parent_discoveryid') && !API::DiscoveryRule()->isReadable(array($_REQUEST['parent_discoveryid']))) {
 	access_deny();
 }
 
-$dstfrm = get_request('dstfrm', ''); // destination form
-$dstfld1 = get_request('dstfld1', ''); // output field on destination form
-$dstfld2 = get_request('dstfld2', ''); // second output field on destination form
-$dstfld3 = get_request('dstfld3', ''); // third output field on destination form
-$srcfld1 = get_request('srcfld1', ''); // source table field [can be different from fields of source table]
-$srcfld2 = get_request('srcfld2', null); // second source table field [can be different from fields of source table]
-$srcfld3 = get_request('srcfld3', null); //  source table field [can be different from fields of source table]
-$multiselect = get_request('multiselect', 0); // if create popup with checkboxes
-$dstact = get_request('dstact', '');
-$writeonly = get_request('writeonly');
-$withApplications = get_request('with_applications', 0);
-$withGraphs = get_request('with_graphs', 0);
-$withItems = get_request('with_items', 0);
-$noempty = get_request('noempty'); // display/hide "Empty" button
-$existedTemplates = get_request('existed_templates', null);
-$excludeids = get_request('excludeids', null);
-$reference = get_request('reference', get_request('srcfld1', 'unknown'));
-$realHosts = get_request('real_hosts', 0);
-$monitoredHosts = get_request('monitored_hosts', 0);
-$templatedHosts = get_request('templated_hosts', 0);
-$withSimpleGraphItems = get_request('with_simple_graph_items', 0);
-$withTriggers = get_request('with_triggers', 0);
-$withMonitoredTriggers = get_request('with_monitored_triggers', 0);
-$submitParent = get_request('submitParent', 0);
-$normalOnly = get_request('normal_only');
-$group = get_request('group', '');
-$host = get_request('host', '');
-$onlyHostid = get_request('only_hostid', null);
+$dstfrm = getRequest('dstfrm', ''); // destination form
+$dstfld1 = getRequest('dstfld1', ''); // output field on destination form
+$dstfld2 = getRequest('dstfld2', ''); // second output field on destination form
+$dstfld3 = getRequest('dstfld3', ''); // third output field on destination form
+$srcfld1 = getRequest('srcfld1', ''); // source table field [can be different from fields of source table]
+$srcfld2 = getRequest('srcfld2'); // second source table field [can be different from fields of source table]
+$srcfld3 = getRequest('srcfld3'); //  source table field [can be different from fields of source table]
+$multiselect = getRequest('multiselect', 0); // if create popup with checkboxes
+$dstact = getRequest('dstact', '');
+$writeonly = getRequest('writeonly');
+$withApplications = getRequest('with_applications', 0);
+$withGraphs = getRequest('with_graphs', 0);
+$withItems = getRequest('with_items', 0);
+$noempty = getRequest('noempty'); // display/hide "Empty" button
+$excludeids = zbx_toHash(getRequest('excludeids', array()));
+$reference = getRequest('reference', getRequest('srcfld1', 'unknown'));
+$realHosts = getRequest('real_hosts', 0);
+$monitoredHosts = getRequest('monitored_hosts', 0);
+$templatedHosts = getRequest('templated_hosts', 0);
+$withSimpleGraphItems = getRequest('with_simple_graph_items', 0);
+$withTriggers = getRequest('with_triggers', 0);
+$withMonitoredTriggers = getRequest('with_monitored_triggers', 0);
+$submitParent = getRequest('submitParent', 0);
+$normalOnly = getRequest('normal_only');
+$group = getRequest('group', '');
+$host = getRequest('host', '');
+$onlyHostid = getRequest('only_hostid');
+$parentDiscoveryId = getRequest('parent_discoveryid');
 
 if (isset($onlyHostid)) {
 	$_REQUEST['hostid'] = $onlyHostid;
@@ -245,14 +269,14 @@ if (isset($onlyHostid)) {
 
 // value types
 $value_types = null;
-if (get_request('value_types')) {
-	$value_types = get_request('value_types');
+if (getRequest('value_types')) {
+	$value_types = getRequest('value_types');
 }
-elseif (get_request('numeric')) {
+elseif (getRequest('numeric')) {
 	$value_types = array(ITEM_VALUE_TYPE_FLOAT, ITEM_VALUE_TYPE_UINT64);
 }
 
-clearCookies(true);
+uncheckTableRows();
 
 function get_window_opener($frame, $field, $value) {
 	if (empty($field)) {
@@ -288,8 +312,8 @@ $options = array(
 	'config' => array('select_latest' => true, 'deny_all' => true, 'popupDD' => true),
 	'groups' => array(),
 	'hosts' => array(),
-	'groupid' => get_request('groupid', null),
-	'hostid' => get_request('hostid', null)
+	'groupid' => getRequest('groupid'),
+	'hostid' => getRequest('hostid')
 );
 
 if (!is_null($writeonly)) {
@@ -405,17 +429,14 @@ if ($value_types) {
 if ($normalOnly) {
 	$frmTitle->addVar('normal_only', $normalOnly);
 }
-if (!is_null($existedTemplates)) {
-	$frmTitle->addVar('existed_templates', $existedTemplates);
-}
-if (!is_null($excludeids)) {
-	$frmTitle->addVar('excludeids', $excludeids);
+if (hasRequest('excludeids')) {
+	$frmTitle->addVar('excludeids', getRequest('excludeids'));
 }
 if (isset($onlyHostid)) {
 	$frmTitle->addVar('only_hostid', $onlyHostid);
 }
-if (get_request('screenid')) {
-	$frmTitle->addVar('screenid', get_request('screenid'));
+if (getRequest('screenid')) {
+	$frmTitle->addVar('screenid', getRequest('screenid'));
 }
 
 // adding param to a form, so that it would remain when page is refreshed
@@ -429,10 +450,10 @@ $frmTitle->addVar('submitParent', $submitParent);
 $frmTitle->addVar('noempty', $noempty);
 
 for ($i = 1; $i <= $dstfldCount; $i++) {
-	$frmTitle->addVar('dstfld'.$i, get_request('dstfld'.$i));
+	$frmTitle->addVar('dstfld'.$i, getRequest('dstfld'.$i));
 }
 for ($i = 1; $i <= $srcfldCount; $i++) {
-	$frmTitle->addVar('srcfld'.$i, get_request('srcfld'.$i));
+	$frmTitle->addVar('srcfld'.$i, getRequest('srcfld'.$i));
 }
 
 /*
@@ -442,40 +463,50 @@ if (isset($onlyHostid)) {
 	$only_hosts = API::Host()->get(array(
 		'hostids' => $hostid,
 		'templated_hosts' => true,
-		'output' => array('hostid', 'host'),
+		'output' => array('hostid', 'host', 'name'),
 		'limit' => 1
 	));
 	$host = reset($only_hosts);
 
 	$cmbHosts = new CComboBox('hostid', $hostid);
-	$cmbHosts->addItem($hostid, $host['host']);
+	$cmbHosts->addItem($hostid, $host['name']);
 	$cmbHosts->setEnabled('disabled');
 	$cmbHosts->setAttribute('title', _('You can not switch hosts for current selection.'));
 	$frmTitle->addItem(array(SPACE, _('Host'), SPACE, $cmbHosts));
 }
 else {
-	if (str_in_array($srctbl, array('triggers', 'items', 'applications', 'graphs'))) {
+	// show Group dropdown in header for these specified sources
+	$showGroupCmbBox = array('triggers', 'items', 'applications', 'graphs', 'graph_prototypes', 'item_prototypes',
+		'templates', 'hosts', 'host_templates'
+	);
+	if (str_in_array($srctbl, $showGroupCmbBox) && ($srctbl !== 'item_prototypes' || !$parentDiscoveryId)) {
 		$frmTitle->addItem(array(_('Group'), SPACE, $pageFilter->getGroupsCB()));
 	}
-	if (str_in_array($srctbl, array('help_items'))) {
-		$itemtype = get_request('itemtype', 0);
-		$cmbTypes = new CComboBox('itemtype', $itemtype, 'javascript: submit();');
+
+	// show Type dropdown in header for help items
+	if ($srctbl === 'help_items') {
+		$itemType = getRequest('itemtype', 0);
+		$cmbTypes = new CComboBox('itemtype', $itemType, 'javascript: submit();');
 
 		foreach ($allowed_item_types as $type) {
 			$cmbTypes->addItem($type, item_type2str($type));
 		}
+
 		$frmTitle->addItem(array(_('Type'), SPACE, $cmbTypes));
 	}
-	if (str_in_array($srctbl, array('triggers', 'items', 'applications', 'graphs'))) {
+
+	// show Host dropdown in header for these specified sources
+	$showHostCmbBox = array('triggers', 'items', 'applications', 'graphs', 'graph_prototypes', 'item_prototypes');
+	if (str_in_array($srctbl, $showHostCmbBox) && ($srctbl !== 'item_prototypes' || !$parentDiscoveryId)) {
 		$frmTitle->addItem(array(SPACE, _('Host'), SPACE, $pageFilter->getHostsCB()));
 	}
 }
 
 if (str_in_array($srctbl, array('applications', 'triggers'))) {
 	if (zbx_empty($noempty)) {
-		$value1 = isset($_REQUEST['dstfld1']) && zbx_strpos($_REQUEST['dstfld1'], 'id') !== false ? 0 : '';
-		$value2 = isset($_REQUEST['dstfld2']) && zbx_strpos($_REQUEST['dstfld2'], 'id') !== false ? 0 : '';
-		$value3 = isset($_REQUEST['dstfld3']) && zbx_strpos($_REQUEST['dstfld3'], 'id') !== false ? 0 : '';
+		$value1 = isset($_REQUEST['dstfld1']) && strpos($_REQUEST['dstfld1'], 'id') !== false ? 0 : '';
+		$value2 = isset($_REQUEST['dstfld2']) && strpos($_REQUEST['dstfld2'], 'id') !== false ? 0 : '';
+		$value3 = isset($_REQUEST['dstfld3']) && strpos($_REQUEST['dstfld3'], 'id') !== false ? 0 : '';
 
 		$epmtyScript = get_window_opener($dstfrm, $dstfld1, $value1);
 		$epmtyScript .= get_window_opener($dstfrm, $dstfld2, $value2);
@@ -544,7 +575,6 @@ if ($srctbl == 'usrgrp') {
 
 		insert_js('var popupReference = '.zbx_jsvalue($userGroups, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "usrgrps";');
 
 	$form->addItem($table);
 	$form->show();
@@ -561,7 +591,7 @@ elseif ($srctbl == 'users') {
 	$table->setHeader(array(
 		($multiselect ? new CCheckBox('all_users', null, "javascript: checkAll('".$form->getName()."', 'all_users', 'users');") : null),
 		_('Alias'),
-		_('Name'),
+		_x('Name', 'user first name'),
 		_('Surname')
 	));
 
@@ -612,20 +642,313 @@ elseif ($srctbl == 'users') {
 
 		insert_js('var popupReference = '.zbx_jsvalue($users, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "users";');
 
 	$form->addItem($table);
 	$form->show();
 }
+
+/*
+ * Templates
+ */
+elseif ($srctbl == 'templates') {
+	$form = new CForm();
+	$form->setName('templateform');
+	$form->setAttribute('id', 'templates');
+
+	$table = new CTableInfo(_('No templates found.'));
+	$table->setHeader(array(($multiselect ? new CCheckBox('all_templates', null,
+		"javascript: checkAll('".$form->getName()."', 'all_templates', 'templates');") : null), _('Name')
+	));
+
+	$options = array(
+		'output' => array('templateid', 'name'),
+		'groupids' => $groupid,
+		'preservekeys' => true
+	);
+
+	if (!is_null($writeonly)) {
+		$options['editable'] = true;
+	}
+
+	$templates = API::Template()->get($options);
+	order_result($templates, 'name');
+
+	$data = array();
+	$parentId = $dstfld1 ? zbx_jsvalue($dstfld1) : 'null';
+
+	foreach ($templates as &$template) {
+		$name = new CSpan($template['name'], 'link');
+		$name->attr('id', 'spanid'.$template['templateid']);
+
+		$jsAction = 'javascript: addValue('.zbx_jsvalue($reference).', '.zbx_jsvalue($template['templateid']).', '.
+			$parentId.');';
+
+		if ($multiselect) {
+			$checkBox = new CCheckBox('templates['.$template['templateid'].']', null, null, $template['templateid']);
+		}
+
+		// check for existing
+		if (isset($excludeids[$template['templateid']])) {
+			if ($multiselect) {
+				$checkBox->setChecked(1);
+				$checkBox->setEnabled('disabled');
+			}
+			$name->removeAttribute('class');
+		}
+		else {
+			$name->setAttribute('onclick', $jsAction.' jQuery(this).removeAttr("onclick");');
+
+			$data[$template['templateid']] = array(
+				'id' => $template['templateid'],
+				'name' => $template['name']
+			);
+		}
+
+		$table->addRow(array($multiselect ? $checkBox : null, $name));
+	}
+	unset($template);
+
+	if ($multiselect) {
+		$button = new CButton('select', _('Select'),
+			"javascript: addSelectedValues('templates', ".zbx_jsvalue($reference).', '.$parentId.');'
+		);
+		$table->setFooter(new CCol($button, 'right'));
+	}
+
+	insert_js('var popupReference = '.zbx_jsvalue($data, true).';');
+
+	$form->addItem($table);
+	$form->show();
+}
+
+/*
+ * Hosts
+ */
+elseif ($srctbl == 'hosts') {
+	$form = new CForm();
+	$form->setName('hostform');
+	$form->setAttribute('id', 'hosts');
+
+	$table = new CTableInfo(_('No hosts found.'));
+	$table->setHeader(array(($multiselect ? new CCheckBox('all_hosts', null,
+		"javascript: checkAll('".$form->getName()."', 'all_hosts', 'hosts');") : null), _('Name')
+	));
+
+	$options = array(
+		'output' => array('hostid', 'name'),
+		'groupids' => $groupid,
+		'preservekeys' => true
+	);
+
+	if (!is_null($writeonly)) {
+		$options['editable'] = true;
+	}
+
+	$hosts = API::Host()->get($options);
+	order_result($hosts, 'name');
+
+	$data = array();
+	$parentId = $dstfld1 ? zbx_jsvalue($dstfld1) : 'null';
+
+	foreach ($hosts as &$host) {
+		$name = new CSpan($host['name'], 'link');
+		$name->attr('id', 'spanid'.$host['hostid']);
+
+		$jsAction = 'javascript: addValue('.zbx_jsvalue($reference).', '.zbx_jsvalue($host['hostid']).', '.
+			$parentId.');';
+
+		if ($multiselect) {
+			$checkBox = new CCheckBox('hosts['.$host['hostid'].']', null, null, $host['hostid']);
+		}
+
+		// check for existing
+		if (isset($excludeids[$host['hostid']])) {
+			if ($multiselect) {
+				$checkBox->setChecked(1);
+				$checkBox->setEnabled('disabled');
+			}
+			$name->removeAttribute('class');
+		}
+		else {
+			$name->setAttribute('onclick', $jsAction.' jQuery(this).removeAttr("onclick");');
+
+			$data[$host['hostid']] = array(
+				'id' => $host['hostid'],
+				'name' => $host['name']
+			);
+		}
+
+		$table->addRow(array($multiselect ? $checkBox : null, $name));
+	}
+	unset($host);
+
+	if ($multiselect) {
+		$button = new CButton('select', _('Select'),
+			"javascript: addSelectedValues('hosts', ".zbx_jsvalue($reference).', '.$parentId.');'
+		);
+		$table->setFooter(new CCol($button, 'right'));
+	}
+
+	insert_js('var popupReference = '.zbx_jsvalue($data, true).';');
+
+	$form->addItem($table);
+	$form->show();
+}
+
+/*
+ * Hosts and templates
+ */
+elseif ($srctbl == 'host_templates') {
+	$form = new CForm();
+	$form->setName('hosttemplateform');
+	$form->setAttribute('id', 'hosts');
+
+	$table = new CTableInfo(_('No hosts found.'));
+	$table->setHeader(array(($multiselect ? new CCheckBox('all_hosts', null,
+		"javascript: checkAll('".$form->getName()."', 'all_hosts', 'hosts');") : null), _('Name')
+	));
+
+	$options = array(
+		'output' => array('hostid', 'name'),
+		'groupids' => $groupid,
+		'templated_hosts' => true,
+		'preservekeys' => true
+	);
+
+	if (!is_null($writeonly)) {
+		$options['editable'] = true;
+	}
+
+	$hosts = API::Host()->get($options);
+	order_result($hosts, 'name');
+
+	$data = array();
+	$parentId = $dstfld1 ? zbx_jsvalue($dstfld1) : 'null';
+
+	foreach ($hosts as &$host) {
+		$name = new CSpan($host['name'], 'link');
+		$name->attr('id', 'spanid'.$host['hostid']);
+
+		$jsAction = 'javascript: addValue('.zbx_jsvalue($reference).', '.zbx_jsvalue($host['hostid']).', '.
+			$parentId.');';
+
+		if ($multiselect) {
+			$checkBox = new CCheckBox('hosts['.$host['hostid'].']', null, null, $host['hostid']);
+		}
+
+		// check for existing
+		if (isset($excludeids[$host['hostid']])) {
+			if ($multiselect) {
+				$checkBox->setChecked(1);
+				$checkBox->setEnabled('disabled');
+			}
+			$name->removeAttribute('class');
+		}
+		else {
+			$name->setAttribute('onclick', $jsAction.' jQuery(this).removeAttr("onclick");');
+
+			$data[$host['hostid']] = array(
+				'id' => $host['hostid'],
+				'name' => $host['name']
+			);
+		}
+
+		$table->addRow(array($multiselect ? $checkBox : null, $name));
+	}
+	unset($host);
+
+	if ($multiselect) {
+		$button = new CButton('select', _('Select'),
+			"javascript: addSelectedValues('hosts', ".zbx_jsvalue($reference).', '.$parentId.');'
+		);
+		$table->setFooter(new CCol($button, 'right'));
+	}
+
+	insert_js('var popupReference = '.zbx_jsvalue($data, true).';');
+
+	$form->addItem($table);
+	$form->show();
+}
+
+/*
+ * Host group
+ */
+elseif ($srctbl == 'host_groups') {
+	$form = new CForm();
+	$form->setName('hostGroupsform');
+	$form->setAttribute('id', 'hostGroups');
+
+	$table = new CTableInfo(_('No host groups found.'));
+	$table->setHeader(array(($multiselect ? new CCheckBox('all_hostgroups', null,
+		"javascript: checkAll('".$form->getName()."', 'all_hostgroups', 'hostGroups');") : null), _('Name')
+	));
+
+	$options = array(
+		'output' => array('groupid', 'name'),
+		'preservekeys' => true
+	);
+	if (!is_null($writeonly)) {
+		$options['editable'] = true;
+	}
+	$hostgroups = API::HostGroup()->get($options);
+	order_result($hostgroups, 'name');
+
+	$data = array();
+	$parentId = $dstfld1 ? zbx_jsvalue($dstfld1) : 'null';
+
+	foreach ($hostgroups as &$hostgroup) {
+		$name = new CSpan($hostgroup['name'], 'link');
+		$name->attr('id', 'spanid'.$hostgroup['groupid']);
+
+		$jsAction = 'javascript: addValue('.zbx_jsvalue($reference).', '.zbx_jsvalue($hostgroup['groupid']).', '.
+			$parentId.');';
+		if ($multiselect) {
+			$checkBox = new CCheckBox('hostGroups['.$hostgroup['groupid'].']', null, null, $hostgroup['groupid']);
+		}
+
+		// check for existing
+		if (isset($excludeids[$hostgroup['groupid']])) {
+			if ($multiselect) {
+				$checkBox->setChecked(1);
+				$checkBox->setEnabled('disabled');
+			}
+			$name->removeAttribute('class');
+		}
+		else {
+			$name->setAttribute('onclick', $jsAction.' jQuery(this).removeAttr("onclick");');
+
+			$data[$hostgroup['groupid']] = array(
+				'id' => $hostgroup['groupid'],
+				'name' => $hostgroup['name']
+			);
+		}
+
+		$table->addRow(array($multiselect ? $checkBox : null, $name));
+	}
+	unset($hostgroup);
+
+	if ($multiselect) {
+		$button = new CButton('select', _('Select'),
+			"javascript: addSelectedValues('hostGroups', ".zbx_jsvalue($reference).', '.$parentId.');'
+		);
+		$table->setFooter(new CCol($button, 'right'));
+	}
+
+	insert_js('var popupReference = '.zbx_jsvalue($data, true).';');
+
+	$form->addItem($table);
+	$form->show();
+}
+
 /*
  * Help items
  */
-elseif ($srctbl == 'help_items') {
+elseif ($srctbl === 'help_items') {
 	$table = new CTableInfo(_('No item keys found.'));
 	$table->setHeader(array(_('Key'), _('Name')));
 
 	$helpItems = new CHelpItems();
-	foreach ($helpItems->getByType($itemtype) as $helpItem) {
+	foreach ($helpItems->getByType($itemType) as $helpItem) {
 		$action = get_window_opener($dstfrm, $dstfld1, $helpItem[$srcfld1]).(isset($srcfld2) ? get_window_opener($dstfrm, $dstfld2, $row[$srcfld2]) : '');
 		$name = new CSpan($helpItem['key'], 'link');
 		$name->setAttribute('onclick', $action.' close_window(); return false;');
@@ -676,6 +999,8 @@ elseif ($srctbl == 'triggers') {
 		$jsTriggers = array();
 	}
 
+	$parentId = $dstfld1 ? zbx_jsvalue($dstfld1) : 'null';
+
 	foreach ($triggers as $trigger) {
 		$host = reset($trigger['hosts']);
 		$trigger['hostname'] = $host['name'];
@@ -684,7 +1009,7 @@ elseif ($srctbl == 'triggers') {
 		$trigger['description'] = $trigger['hostname'].NAME_DELIMITER.$trigger['description'];
 
 		if ($multiselect) {
-			$js_action = 'addValue('.zbx_jsvalue($reference).', '.zbx_jsvalue($trigger['triggerid']).');';
+			$js_action = 'addValue('.zbx_jsvalue($reference).', '.zbx_jsvalue($trigger['triggerid']).', '.$parentId.');';
 		}
 		else {
 			$values = array(
@@ -721,9 +1046,11 @@ elseif ($srctbl == 'triggers') {
 			)
 		));
 
-		// made to save memmory usage
+		// made to save memory usage
 		if ($multiselect) {
 			$jsTriggers[$trigger['triggerid']] = array(
+				'id' => $trigger['triggerid'],
+				'name' => $trigger['description'],
 				'triggerid' => $trigger['triggerid'],
 				'description' => $trigger['description'],
 				'expression' => $trigger['expression'],
@@ -735,29 +1062,32 @@ elseif ($srctbl == 'triggers') {
 	}
 
 	if ($multiselect) {
-		$button = new CButton('select', _('Select'), "addSelectedValues('triggers', ".zbx_jsvalue($reference).');');
+		$button = new CButton('select', _('Select'), "addSelectedValues('triggers', ".zbx_jsvalue($reference).', '.$parentId.');');
 		$table->setFooter(new CCol($button, 'right'));
 
 		insert_js('var popupReference = '.zbx_jsValue($jsTriggers, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "triggers";');
 
 	$form->addItem($table);
 	$form->show();
 }
+
 /*
- * Items
+ * Items or Item prototypes
  */
-elseif ($srctbl == 'items') {
+elseif ($srctbl === 'items' || $srctbl === 'item_prototypes') {
 	$form = new CForm();
 	$form->setName('itemform');
 	$form->setAttribute('id', 'items');
 
-	$table = new CTableInfo(_('No items found.'));
+	$itemPrototypesPopup = ($srctbl === 'item_prototypes');
 
+	$table = new CTableInfo($itemPrototypesPopup ? _('No item prototypes found.') : _('No items found.'));
 	$header = array(
 		$pageFilter->hostsAll ? _('Host') : null,
-		$multiselect ? new CCheckBox('all_items', null, "javascript: checkAll('".$form->getName()."', 'all_items', 'items');") : null,
+		$multiselect
+			? new CCheckBox('all_items', null, "javascript: checkAll('".$form->getName()."', 'all_items', 'items');")
+			: null,
 		_('Name'),
 		_('Key'),
 		_('Type'),
@@ -767,28 +1097,43 @@ elseif ($srctbl == 'items') {
 	$table->setHeader($header);
 
 	$options = array(
-		'hostids' => $hostid,
-		'webitems' => true,
-		'output' => array('itemid', 'hostid', 'name', 'key_', 'type', 'value_type', 'status', 'state'),
-		'selectHosts' => array('hostid', 'name')
+		'output' => array('itemid', 'hostid', 'name', 'key_', 'flags', 'type', 'value_type', 'status', 'state'),
+		'selectHosts' => array('name')
 	);
-	if (!is_null($normalOnly)) {
-		$options['filter']['flags'] = ZBX_FLAG_DISCOVERY_NORMAL;
+
+	if ($parentDiscoveryId) {
+		$options['discoveryids'] = array($parentDiscoveryId);
 	}
-	if (!is_null($writeonly)) {
-		$options['editable'] = true;
+	else {
+		$options['hostids'] = $hostid;
 	}
-	if (!is_null($templated) && $templated == 1) {
-		$options['templated'] = $templated;
+
+	if ($templated == 1) {
+		$options['templated'] = true;
+	}
+
+	if ($writeonly !== null) {
+		$options['editable'] = true;
 	}
-	if (!is_null($value_types)) {
+
+	if ($value_types !== null) {
 		$options['filter']['value_type'] = $value_types;
 	}
 
-	$items = API::Item()->get($options);
+	if ($itemPrototypesPopup) {
+		$items = API::ItemPrototype()->get($options);
+	}
+	else {
+		$options['webitems'] = true;
 
-	$items = CMacrosResolverHelper::resolveItemNames($items);
+		if ($normalOnly !== null) {
+			$options['filter']['flags'] = ZBX_FLAG_DISCOVERY_NORMAL;
+		}
 
+		$items = API::Item()->get($options);
+	}
+
+	$items = CMacrosResolverHelper::resolveItemNames($items);
 	order_result($items, 'name_expanded');
 
 	if ($multiselect) {
@@ -808,8 +1153,8 @@ elseif ($srctbl == 'items') {
 		else {
 			$values = array();
 			for ($i = 1; $i <= $dstfldCount; $i++) {
-				$dstfld = get_request('dstfld'.$i);
-				$srcfld = get_request('srcfld'.$i);
+				$dstfld = getRequest('dstfld'.$i);
+				$srcfld = getRequest('srcfld'.$i);
 
 				if (!empty($dstfld) && !empty($item[$srcfld])) {
 					$values[$dstfld] = $item[$srcfld];
@@ -817,8 +1162,10 @@ elseif ($srctbl == 'items') {
 			}
 
 			// if we need to submit parent window
-			$js_action = 'javascript: addValues('.zbx_jsvalue($dstfrm).', '.zbx_jsvalue($values).', '.($submitParent ? 'true' : 'false').'); return false;';
+			$js_action = 'javascript: addValues('.zbx_jsvalue($dstfrm).', '.zbx_jsvalue($values).', '.
+				($submitParent ? 'true' : 'false').'); return false;';
 		}
+
 		$description->setAttribute('onclick', $js_action.' jQuery(this).removeAttr("onclick");');
 
 		$table->addRow(array(
@@ -828,7 +1175,10 @@ elseif ($srctbl == 'items') {
 			$item['key_'],
 			item_type2str($item['type']),
 			itemValueTypeString($item['value_type']),
-			new CSpan(itemIndicator($item['status'], $item['state']), itemIndicatorStyle($item['status'], $item['state']))
+			new CSpan(
+				itemIndicator($item['status'], $item['state']),
+				itemIndicatorStyle($item['status'], $item['state'])
+			)
 		));
 
 		// made to save memory usage
@@ -837,6 +1187,7 @@ elseif ($srctbl == 'items') {
 				'itemid' => $item['itemid'],
 				'name' => $item['name'],
 				'key_' => $item['key_'],
+				'flags' => $item['flags'],
 				'type' => $item['type'],
 				'value_type' => $item['value_type'],
 				'host' => $item['hostname']
@@ -845,162 +1196,104 @@ elseif ($srctbl == 'items') {
 	}
 
 	if ($multiselect) {
-		$button = new CButton('select', _('Select'), "javascript: addSelectedValues('items', ".zbx_jsvalue($reference).');');
+		$button = new CButton('select', _('Select'),
+			"javascript: addSelectedValues('items', ".zbx_jsvalue($reference).');'
+		);
 		$table->setFooter(new CCol($button, 'right'));
 
 		insert_js('var popupReference = '.zbx_jsvalue($jsItems, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "items";');
 
 	$form->addItem($table);
 	$form->show();
 }
+
 /*
- * Prototypes
+ * Applications
  */
-elseif ($srctbl == 'prototypes') {
+elseif ($srctbl == 'applications') {
 	$form = new CForm();
-	$form->setName('itemform');
-	$form->setAttribute('id', 'items');
-
-	$table = new CTableInfo(_('No item prototypes found.'));
+	$form->setName('applicationform');
+	$form->setAttribute('id', 'applications');
 
-	if ($multiselect) {
-		$header = array(
-			array(new CCheckBox('all_items', null, "javascript: checkAll('".$form->getName()."', 'all_items', 'items');"), _('Name')),
-			_('Key'),
-			_('Type'),
-			_('Type of information'),
-			_('Status')
-		);
-	}
-	else {
-		$header = array(
-			_('Name'),
-			_('Key'),
-			_('Type'),
-			_('Type of information'),
-			_('Status')
-		);
-	}
-	$table->setHeader($header);
+	$table = new CTableInfo(_('No applications found.'));
+	$table->setHeader(array(($multiselect ? new CCheckBox('all_applications', null,
+		"javascript: checkAll('".$form->getName()."', 'all_applications', 'applications');") : null), _('Name')
+	));
 
 	$options = array(
-		'selectHosts' => array('name'),
-		'discoveryids' => get_request('parent_discoveryid'),
-		'output' => API_OUTPUT_EXTEND,
-		'preservekeys' => true
+		'output' => array('applicationid', 'name'),
+		'hostids' => $hostid,
+		'expandData' => true
 	);
-	if (!is_null($value_types)) {
-		$options['filter']['value_type'] = $value_types;
+	if (is_null($hostid)) {
+		$options['groupids'] = $groupid;
 	}
+	if (!is_null($writeonly)) {
+		$options['editable'] = true;
+	}
+	if (!is_null($templated)) {
+		$options['templated'] = $templated;
+	}
+	$apps = API::Application()->get($options);
+	CArrayHelper::sort($apps, array('name'));
 
-	$items = API::ItemPrototype()->get($options);
-
-	$items = CMacrosResolverHelper::resolveItemNames($items);
-
-	order_result($items, 'name_expanded');
+	$data = array();
+	$parentId = $dstfld1 ? zbx_jsvalue($dstfld1) : 'null';
 
-	foreach ($items as &$item) {
-		$host = reset($item['hosts']);
+	foreach ($apps as &$app) {
+		$name = new CSpan($app['name'], 'link');
+		$name->attr('id', 'spanid'.$app['applicationid']);
 
-		$description = new CSpan($item['name_expanded'], 'link');
-		$item['name'] = $host['name'].NAME_DELIMITER.$item['name_expanded'];
+		$jsAction = 'javascript: addValue('.zbx_jsvalue($reference).', '.zbx_jsvalue($app['applicationid']).', '.
+			$parentId.');';
 
 		if ($multiselect) {
-			$js_action = 'javascript: addValue('.zbx_jsvalue($reference).', '.zbx_jsvalue($item['itemid']).');';
+			$checkBox = new CCheckBox('applications['.zbx_jsValue('applicationid').']', null, null,
+				$app['applicationid']
+			);
 		}
-		else {
-			$values = array();
-			for ($i = 1; $i <= $dstfldCount; $i++) {
-				$dstfld = get_request('dstfld'.$i);
-				$srcfld = get_request('srcfld'.$i);
-
-				if (!empty($dstfld) && !empty($item[$srcfld])) {
-					$values[$dstfld] = $item[$srcfld];
-				}
-			}
 
-			// if we need to submit parent window
-			$js_action = 'javascript: addValues('.zbx_jsvalue($dstfrm).', '.zbx_jsvalue($values).', '.($submitParent ? 'true' : 'false').'); return false;';
-		}
-		$description->setAttribute('onclick', $js_action.' jQuery(this).removeAttr("onclick");');
+		$name->setAttribute('onclick', $jsAction.' jQuery(this).removeAttr("onclick");');
 
-		if ($multiselect) {
-			$description = new CCol(array(new CCheckBox('items['.zbx_jsValue($item[$srcfld1]).']', null, null, $item['itemid']), $description));
-		}
+		$data[$app['applicationid']] = array(
+			'id' => $app['applicationid'],
+			'name' => $app['name']
+		);
 
-		$table->addRow(array(
-			$description,
-			$item['key_'],
-			item_type2str($item['type']),
-			itemValueTypeString($item['value_type']),
-			new CSpan(itemIndicator($item['status']), itemIndicatorStyle($item['status']))
-		));
+		$table->addRow(array($multiselect ? $checkBox : null, $name));
 	}
+	unset($app);
 
 	if ($multiselect) {
-		$button = new CButton('select', _('Select'), "javascript: addSelectedValues('items', ".zbx_jsvalue($reference).');');
+		$button = new CButton('select', _('Select'),
+			"javascript: addSelectedValues('applications', ".zbx_jsvalue($reference).', '.$parentId.');'
+		);
 		$table->setFooter(new CCol($button, 'right'));
-
-		insert_js('var popupReference = '.zbx_jsvalue($items, true).';');
 	}
-	unset($items);
 
-	zbx_add_post_js('chkbxRange.pageGoName = "items";');
+	insert_js('var popupReference = '.zbx_jsvalue($data, true).';');
 
 	$form->addItem($table);
 	$form->show();
 }
-/*
- * Applications
- */
-elseif ($srctbl == 'applications') {
-	$table = new CTableInfo(_('No applications found.'));
-	$table->setHeader(array(
-		$hostid > 0 ? null : _('Host'),
-		_('Name')
-	));
-
-	$options = array(
-		'hostids' => $hostid,
-		'output' => API_OUTPUT_EXTEND,
-		'expandData' => true
-	);
-	if (is_null($hostid)) {
-		$options['groupids'] = $groupid;
-	}
-	if (!is_null($writeonly)) {
-		$options['editable'] = true;
-	}
-	if (!is_null($templated)) {
-		$options['templated'] = $templated;
-	}
-	$apps = API::Application()->get($options);
-	CArrayHelper::sort($apps, array('host', 'name'));
 
-	foreach ($apps as $app) {
-		$action = get_window_opener($dstfrm, $dstfld1, $app[$srcfld1]).(isset($srcfld2) ? get_window_opener($dstfrm, $dstfld2, $app[$srcfld2]) : '');
-		$name = new CSpan($app['name'], 'link');
-		$name->setAttribute('onclick', $action.' close_window(); return false;');
-
-		$table->addRow(array($hostid > 0 ? null : $app['host'], $name));
-	}
-	$table->show();
-}
 /*
- * Graphs
+ * Graphs or Graph prototypes
  */
-elseif ($srctbl == 'graphs') {
+elseif ($srctbl === 'graphs' || $srctbl === 'graph_prototypes') {
 	$form = new CForm();
 	$form->setName('graphform');
 	$form->setAttribute('id', 'graphs');
 
-	$table = new CTableInfo(_('No graphs found.'));
+	$graphPrototypesPopup = ($srctbl === 'graph_prototypes');
 
+	$table = new CTableInfo($graphPrototypesPopup ? _('No graph prototypes found.') : _('No graphs found.'));
 	if ($multiselect) {
 		$header = array(
-			array(new CCheckBox('all_graphs', null, "javascript: checkAll('".$form->getName()."', 'all_graphs', 'graphs');"), _('Description')),
+			array(new CCheckBox('all_graphs', null,
+				"javascript: checkAll('".$form->getName()."', 'all_graphs', 'graphs');"), _('Description')
+			),
 			_('Graph type')
 		);
 	}
@@ -1015,9 +1308,9 @@ elseif ($srctbl == 'graphs') {
 
 	if ($pageFilter->hostsSelected) {
 		$options = array(
-			'hostids' => $hostid,
 			'output' => API_OUTPUT_EXTEND,
-			'selectHosts' => API_OUTPUT_EXTEND,
+			'hostids' => $hostid,
+			'selectHosts' => array('name'),
 			'preservekeys' => true
 		);
 
@@ -1027,7 +1320,13 @@ elseif ($srctbl == 'graphs') {
 		if (!is_null($templated)) {
 			$options['templated'] = $templated;
 		}
-		$graphs = API::Graph()->get($options);
+
+		if ($graphPrototypesPopup) {
+			$graphs = API::GraphPrototype()->get($options);
+		}
+		else {
+			$graphs = API::Graph()->get($options);
+		}
 		order_result($graphs, 'name');
 	}
 	else {
@@ -1048,12 +1347,16 @@ elseif ($srctbl == 'graphs') {
 				$dstfld1 => $graph[$srcfld1],
 				$dstfld2 => $graph[$srcfld2]
 			);
-			$js_action = 'javascript: addValues('.zbx_jsvalue($dstfrm).', '.zbx_jsvalue($values).'); close_window(); return false;';
+			$js_action = 'javascript: addValues('.zbx_jsvalue($dstfrm).', '.zbx_jsvalue($values).');'.
+				' close_window(); return false;';
 		}
 		$description->setAttribute('onclick', $js_action.' jQuery(this).removeAttr("onclick");');
 
 		if ($multiselect) {
-			$description = new CCol(array(new CCheckBox('graphs['.zbx_jsValue($graph[$srcfld1]).']', null, null, $graph['graphid']), $description));
+			$description = new CCol(array(
+				new CCheckBox('graphs['.zbx_jsValue($graph[$srcfld1]).']', null, null, $graph['graphid']),
+				$description
+			));
 		}
 
 		switch ($graph['graphtype']) {
@@ -1078,12 +1381,13 @@ elseif ($srctbl == 'graphs') {
 	}
 
 	if ($multiselect) {
-		$button = new CButton('select', _('Select'), "javascript: addSelectedValues('graphs', ".zbx_jsvalue($reference).');');
+		$button = new CButton('select', _('Select'),
+			"javascript: addSelectedValues('graphs', ".zbx_jsvalue($reference).');'
+		);
 		$table->setFooter(new CCol($button, 'right'));
 
 		insert_js('var popupReference = '.zbx_jsvalue($graphs, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "graphs";');
 
 	$form->addItem($table);
 	$form->show();
@@ -1107,9 +1411,6 @@ elseif ($srctbl == 'sysmaps') {
 
 	$table->setHeader($header);
 
-	$excludeids = get_request('excludeids', array());
-	$excludeids = zbx_toHash($excludeids);
-
 	$options = array(
 		'output' => API_OUTPUT_EXTEND,
 		'preservekeys' => true
@@ -1121,9 +1422,6 @@ elseif ($srctbl == 'sysmaps') {
 	order_result($sysmaps, 'name');
 
 	foreach ($sysmaps as $sysmap) {
-		if (isset($excludeids[$sysmap['sysmapid']])) {
-			continue;
-		}
 
 		$description = new CSpan($sysmap['name'], 'link');
 
@@ -1137,7 +1435,12 @@ elseif ($srctbl == 'sysmaps') {
 			);
 			$js_action = 'javascript: addValues('.zbx_jsvalue($dstfrm).', '.zbx_jsvalue($values).'); close_window(); return false;';
 		}
-		$description->setAttribute('onclick', $js_action.' jQuery(this).removeAttr("onclick");');
+		if (isset($excludeids[$sysmap['sysmapid']])) {
+			$description->removeAttribute('class');
+		}
+		else {
+			$description->setAttribute('onclick', $js_action.' jQuery(this).removeAttr("onclick");');
+		}
 
 		if ($multiselect) {
 			$description = new CCol(array(new CCheckBox('sysmaps['.zbx_jsValue($sysmap[$srcfld1]).']', null, null, $sysmap['sysmapid']), $description));
@@ -1152,7 +1455,6 @@ elseif ($srctbl == 'sysmaps') {
 
 		insert_js('var popupReference = '.zbx_jsvalue($sysmaps, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "sysmaps";');
 
 	$form->addItem($table);
 	$form->show();
@@ -1215,7 +1517,6 @@ elseif ($srctbl == 'slides') {
 
 		insert_js('var popupReference = '.zbx_jsvalue($slideshows, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "slides";');
 
 	$form->addItem($table);
 	$form->show();
@@ -1276,7 +1577,6 @@ elseif ($srctbl == 'screens') {
 
 		insert_js('var popupReference = '.zbx_jsvalue($screens, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "screens";');
 
 	$form->addItem($table);
 	$form->show();
@@ -1309,6 +1609,7 @@ elseif ($srctbl == 'screens2') {
 	}
 	$table->show();
 }
+
 /*
  * Discovery rules
  */
@@ -1461,7 +1762,6 @@ elseif ($srctbl == 'scripts') {
 		$table->setFooter(new CCol($button, 'right'));
 		insert_js('var popupReference = '.zbx_jsvalue($scripts, true).';');
 	}
-	zbx_add_post_js('chkbxRange.pageGoName = "scripts";');
 
 	$form->addItem($table);
 	$form->show();
diff --git a/frontends/php/popup_bitem.php b/frontends/php/popup_bitem.php
index 2753f277c9a..634e1d650f3 100644
--- a/frontends/php/popup_bitem.php
+++ b/frontends/php/popup_bitem.php
@@ -23,7 +23,7 @@ require_once dirname(__FILE__).'/include/config.inc.php';
 require_once dirname(__FILE__).'/include/triggers.inc.php';
 require_once dirname(__FILE__).'/include/js.inc.php';
 
-$dstfrm = get_request('dstfrm', 0);
+$dstfrm = getRequest('dstfrm', 0);
 
 $page['title'] = _('Graph item');
 $page['file'] = 'popup_bitem.php';
@@ -36,7 +36,7 @@ require_once dirname(__FILE__).'/include/page_header.php';
 $fields = array(
 	'dstfrm' =>			array(T_ZBX_STR, O_MAND, P_SYS,	NOT_EMPTY,			null),
 	'config' =>			array(T_ZBX_INT, O_OPT,	 P_SYS,	IN('0,1,2,3'),		null),
-	'gid' =>			array(T_ZBX_INT, O_OPT,	 P_SYS,	BETWEEN(0,65535),	null),
+	'gid' =>			array(T_ZBX_INT, O_OPT,	 P_SYS,	DB_ID.'({}!=0)',	null),
 	'list_name' =>		array(T_ZBX_STR, O_OPT,	 P_SYS,	NOT_EMPTY,			'isset({save})&&isset({gid})'),
 	'caption' =>		array(T_ZBX_STR, O_OPT,	 null,	null,				null),
 	'itemid' =>			array(T_ZBX_INT, O_OPT,	 P_SYS, DB_ID.'({}!=0)', 'isset({save})', _('Parameter')),
@@ -48,20 +48,26 @@ $fields = array(
 	'save' =>			array(T_ZBX_STR, O_OPT,	 P_SYS|P_ACT,	null,	null),
 	// other
 	'form' =>			array(T_ZBX_STR, O_OPT,	 P_SYS,	null,	null),
-	'form_refresh' =>	array(T_ZBX_STR, O_OPT,	 null,	null,	null),
+	'form_refresh' =>	array(T_ZBX_INT, O_OPT,	 null,	null,	null),
 	'host' =>			array(T_ZBX_STR, O_OPT,	 null,	null,	null),
-	'name' =>			array(T_ZBX_STR, O_OPT,	 null,	null,	null)
+	'name' =>			array(T_ZBX_STR, O_OPT,	 null,	null,	null),
+	'name_expanded' =>	array(T_ZBX_STR, O_OPT,	 null,	null,	null)
 );
 check_fields($fields);
 
-$_REQUEST['caption'] = get_request('caption', '');
-$_REQUEST['axisside'] = get_request('axisside',	GRAPH_YAXIS_SIDE_LEFT);
+$caption = getRequest('caption', '');
+$autoCaption = '';
+$_REQUEST['axisside'] = getRequest('axisside',	GRAPH_YAXIS_SIDE_LEFT);
 
-if (zbx_empty($_REQUEST['caption']) && isset($_REQUEST['itemid']) && $_REQUEST['itemid'] > 0) {
-	$items = CMacrosResolverHelper::resolveItemNames(array(get_item_by_itemid($_REQUEST['itemid'])));
+if (getRequest('itemid') > 0) {
+	$items = CMacrosResolverHelper::resolveItemNames(array(get_item_by_itemid(getRequest('itemid'))));
 	$item = reset($items);
 
-	$_REQUEST['caption'] = $item['name_expanded'];
+	$autoCaption = $item['name_expanded'];
+
+	if (!hasRequest('caption') || getRequest('caption') === $item['name']) {
+		$caption = $item['name_expanded'];
+	}
 }
 
 insert_js_function('add_bitem');
@@ -70,7 +76,7 @@ insert_js_function('update_bitem');
 if (isset($_REQUEST['save']) && !isset($_REQUEST['gid'])) {
 	insert_js("add_bitem(".
 		zbx_jsvalue($_REQUEST['dstfrm']).",".
-		zbx_jsvalue($_REQUEST['caption']).",'".
+		zbx_jsvalue($caption).",'".
 		$_REQUEST['itemid']."','".
 		$_REQUEST['color']."',".
 		$_REQUEST['calc_fnc'].",".
@@ -83,7 +89,7 @@ if (isset($_REQUEST['save']) && isset($_REQUEST['gid'])) {
 		zbx_jsvalue($_REQUEST['dstfrm']).",".
 		zbx_jsvalue($_REQUEST['list_name']).",'".
 		$_REQUEST['gid']."',".
-		zbx_jsvalue($_REQUEST['caption']).",'".
+		zbx_jsvalue($caption).",'".
 		$_REQUEST['itemid']."','".
 		$_REQUEST['color']."',".
 		$_REQUEST['calc_fnc'].",".
@@ -91,39 +97,43 @@ if (isset($_REQUEST['save']) && isset($_REQUEST['gid'])) {
 	);
 }
 else {
-	echo SBR;
+	echo BR();
 
 	$frmGItem = new CFormTable(_('New item for the graph'));
 	$frmGItem->setName('graph_item');
-	$frmGItem->setHelp('web.graph.item.php');
+	$frmGItem->addHelpIcon();
 
 	$frmGItem->addVar('dstfrm', $_REQUEST['dstfrm']);
 
-	$config	= get_request('config', 1);
-	$gid = get_request('gid', null);
-	$list_name = get_request('list_name', null);
-	$caption = get_request('caption', '');
-	$itemid = get_request('itemid', 0);
-	$color = get_request('color', '009900');
-	$calc_fnc = get_request('calc_fnc', 2);
-	$axisside = get_request('axisside', GRAPH_YAXIS_SIDE_LEFT);
+	$config	= getRequest('config', 1);
+	$gid = getRequest('gid');
+	$list_name = getRequest('list_name');
+	$itemid = getRequest('itemid', 0);
+	$color = getRequest('color', '009900');
+	$calc_fnc = getRequest('calc_fnc', 2);
+	$axisside = getRequest('axisside', GRAPH_YAXIS_SIDE_LEFT);
 
 	$frmGItem->addVar('gid', $gid);
 	$frmGItem->addVar('config', $config);
 	$frmGItem->addVar('list_name', $list_name);
 	$frmGItem->addVar('itemid', $itemid);
-
-	$frmGItem->addRow(array(new CVisibilityBox('caption_visible', !zbx_empty($caption), 'caption', _('Default')),
-		_('Caption')), new CTextBox('caption', $caption, 50)
+	$frmGItem->addRow(
+		array(
+			new CVisibilityBox('caption_visible', hasRequest('caption') && $caption != $autoCaption, 'caption',
+				_('Default')
+			),
+			_('Caption')
+		),
+		new CTextBox('caption', $caption, 50)
 	);
 
-	$host = get_request('host');
-	$itemName = get_request('name');
+	$host = getRequest('host');
+	$itemName = getRequest('name_expanded');
 	if ($host && $itemName) {
 		$caption = $host['name'].NAME_DELIMITER.$itemName;
 	}
 
-	$txtCondVal = new CTextBox('name', $caption, 50, 'yes');
+	$txtCondVal = new CTextBox('name', $caption, 50, true);
 
 	$btnSelect = new CSubmit('btn1', _('Select'),
 		'return PopUp("popup.php?'.
diff --git a/frontends/php/popup_httpstep.php b/frontends/php/popup_httpstep.php
index 8c88836c177..beceae452b8 100644
--- a/frontends/php/popup_httpstep.php
+++ b/frontends/php/popup_httpstep.php
@@ -35,18 +35,21 @@ $fields = array(
 	'list_name' =>		array(T_ZBX_STR, O_OPT, P_SYS,	NOT_EMPTY,			'isset({save})&&isset({stepid})'),
 	'name' =>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY.KEY_PARAM(), 'isset({save})', _('Name')),
 	'url' =>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,			'isset({save})', _('URL')),
-	'posts' =>			array(T_ZBX_STR, O_OPT, null,	null,				'isset({save})'),
+	'posts' =>			array(T_ZBX_STR, O_OPT, null,	null,				null),
 	'variables' =>		array(T_ZBX_STR, O_OPT, null,	null,				'isset({save})'),
+	'headers' =>		array(T_ZBX_STR, O_OPT, null,	null,				'isset({save})'),
+	'retrieve_mode' =>	array(T_ZBX_STR, O_OPT, null,	null,				null),
+	'follow_redirects' => array(T_ZBX_STR, O_OPT, null,	null,				null),
 	'timeout' =>		array(T_ZBX_INT, O_OPT, null,	BETWEEN(0,65535),	'isset({save})', _('Timeout')),
-	'required' =>		array(T_ZBX_STR, O_OPT, null,	null,				'isset({save})'),
-	'status_codes' =>	array(T_ZBX_INT_RANGE, O_OPT, 	null, null,			'isset({save})'),
+	'required' =>		array(T_ZBX_STR, O_OPT, null,	null,				null),
+	'status_codes' =>	array(T_ZBX_STR, O_OPT, null,	null,				'isset({save})'),
 	'templated' =>		array(T_ZBX_STR, O_OPT, null, 	null, null),
 	'old_name'=>		array(T_ZBX_STR, O_OPT, null, 	null, null),
 	'steps_names'=>		array(T_ZBX_STR, O_OPT, null, 	null, null),
 	// actions
 	'save' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,			null),
 	'form' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,				null),
-	'form_refresh' =>	array(T_ZBX_STR, O_OPT, null,	null,				null)
+	'form_refresh' =>	array(T_ZBX_INT, O_OPT, null,	null,				null)
 );
 check_fields($fields);
 
diff --git a/frontends/php/popup_media.php b/frontends/php/popup_media.php
index a51a86f13c5..49f0b9bcbce 100644
--- a/frontends/php/popup_media.php
+++ b/frontends/php/popup_media.php
@@ -50,7 +50,7 @@ $fields = array(
 	'add'=>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	NULL,	NULL),
 /* other */
 	'form'=>		array(T_ZBX_STR, O_OPT, P_SYS,	NULL,	NULL),
-	'form_refresh'=>array(T_ZBX_STR, O_OPT, NULL,	NULL,	NULL)
+	'form_refresh'=>array(T_ZBX_INT, O_OPT, null,	null,	null)
 );
 
 check_fields($fields);
@@ -61,7 +61,7 @@ if (isset($_REQUEST['add'])) {
 	$validator = new CTimePeriodValidator();
 	if ($validator->validate($_REQUEST['period'])) {
 		$severity = 0;
-		$_REQUEST['severity'] = get_request('severity', array());
+		$_REQUEST['severity'] = getRequest('severity', array());
 		foreach ($_REQUEST['severity'] as $id) {
 			$severity |= 1 << $id;
 		}
@@ -82,7 +82,7 @@ if (isset($_REQUEST['add'])) {
 }
 
 if (isset($_REQUEST['media']) && !isset($_REQUEST['form_refresh'])) {
-	$rq_severity = get_request('severity', 63);
+	$rq_severity = getRequest('severity', 63);
 
 	$severity = array();
 	for ($i = 0; $i < TRIGGER_SEVERITY_COUNT; $i++) {
@@ -92,14 +92,14 @@ if (isset($_REQUEST['media']) && !isset($_REQUEST['form_refresh'])) {
 	}
 }
 else {
-	$severity = get_request('severity', array(0, 1, 2, 3, 4, 5));
+	$severity = getRequest('severity', array(0, 1, 2, 3, 4, 5));
 }
 
-$media = get_request('media', -1);
-$sendto = get_request('sendto', '');
-$mediatypeid = get_request('mediatypeid', 0);
-$active = get_request('active', 0);
-$period = get_request('period', ZBX_DEFAULT_INTERVAL);
+$media = getRequest('media', -1);
+$sendto = getRequest('sendto', '');
+$mediatypeid = getRequest('mediatypeid', 0);
+$active = getRequest('active', 0);
+$period = getRequest('period', ZBX_DEFAULT_INTERVAL);
 
 
 $frmMedia = new CFormTable(_('New media'));
diff --git a/frontends/php/popup_period.php b/frontends/php/popup_period.php
index 79a789ec2f3..70f99ae98ee 100644
--- a/frontends/php/popup_period.php
+++ b/frontends/php/popup_period.php
@@ -46,7 +46,7 @@ require_once dirname(__FILE__).'/include/page_header.php';
 		'save'=>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 /* other */
 		'form'=>			array(T_ZBX_STR, O_OPT, P_SYS,	null,	null),
-		'form_refresh'=>	array(T_ZBX_STR, O_OPT, null,	null,	null)
+		'form_refresh'=>	array(T_ZBX_INT, O_OPT, null,	null,	null)
 	);
 
 	check_fields($fields);
@@ -54,13 +54,20 @@ require_once dirname(__FILE__).'/include/page_header.php';
 	insert_js_function('add_period');
 	insert_js_function('update_period');
 
-	$_REQUEST['report_timesince'] = zbxDateToTime(get_request('report_timesince', date(TIMESTAMP_FORMAT_ZERO_TIME, time() - SEC_PER_DAY)));
-	$_REQUEST['report_timetill'] = zbxDateToTime(get_request('report_timetill', date(TIMESTAMP_FORMAT_ZERO_TIME)));
+	$_REQUEST['report_timesince'] = zbxDateToTime(getRequest('report_timesince', date(TIMESTAMP_FORMAT_ZERO_TIME, time() - SEC_PER_DAY)));
+	$_REQUEST['report_timetill'] = zbxDateToTime(getRequest('report_timetill', date(TIMESTAMP_FORMAT_ZERO_TIME)));
 
-	$_REQUEST['caption'] = get_request('caption','');
-	if(zbx_empty($_REQUEST['caption']) && isset($_REQUEST['report_timesince']) && isset($_REQUEST['report_timetill'])){
-		$_REQUEST['caption'] = zbx_date2str(POPUP_PERIOD_CAPTION_DATE_FORMAT,  $_REQUEST['report_timesince']).' - '.
-								zbx_date2str(POPUP_PERIOD_CAPTION_DATE_FORMAT, $_REQUEST['report_timetill']);
+	$caption = getRequest('caption', '');
+	$autoCaption = '';
+
+	if (hasRequest('report_timesince') && hasRequest('report_timetill')) {
+		$autoCaption = zbx_date2str(DATE_TIME_FORMAT, getRequest('report_timesince')).' - '.
+			zbx_date2str(DATE_TIME_FORMAT, getRequest('report_timetill')
+		);
+	}
+
+	if (zbx_empty($caption)) {
+		$caption = $autoCaption;
 	}
 
 	if(isset($_REQUEST['save'])){
@@ -68,7 +75,7 @@ require_once dirname(__FILE__).'/include/page_header.php';
 			insert_js("update_period('".
 				$_REQUEST['period_id']."',".
 				zbx_jsvalue($_REQUEST['dstfrm']).",".
-				zbx_jsvalue($_REQUEST['caption']).",'".
+				zbx_jsvalue($caption).",'".
 				$_REQUEST['report_timesince']."','".
 				$_REQUEST['report_timetill']."','".
 				$_REQUEST['color']."');\n");
@@ -76,27 +83,26 @@ require_once dirname(__FILE__).'/include/page_header.php';
 		else{
 			insert_js("add_period(".
 				zbx_jsvalue($_REQUEST['dstfrm']).",".
-				zbx_jsvalue($_REQUEST['caption']).",'".
+				zbx_jsvalue($caption).",'".
 				$_REQUEST['report_timesince']."','".
 				$_REQUEST['report_timetill']."','".
 				$_REQUEST['color']."');\n");
 		}
 	}
 	else{
-		echo SBR;
+		echo BR();
 
 		$frmPd = new CFormTable(_('Period'));
 		$frmPd->setName('period');
 
 		$frmPd->addVar('dstfrm',$_REQUEST['dstfrm']);
 
-		$config		= get_request('config',	 	1);
+		$config		= getRequest('config',	 	1);
 
-		$caption	= get_request('caption', 	'');
-		$color		= get_request('color', 		'009900');
+		$color		= getRequest('color', 		'009900');
 
-		$report_timesince = get_request('report_timesince', time() - SEC_PER_DAY);
-		$report_timetill = get_request('report_timetill', time());
+		$report_timesince = getRequest('report_timesince', time() - SEC_PER_DAY);
+		$report_timetill = getRequest('report_timetill', time());
 
 		$frmPd->addVar('config',$config);
 		$frmPd->addVar('report_timesince', date(TIMESTAMP_FORMAT_ZERO_TIME, $report_timesince));
@@ -106,8 +112,15 @@ require_once dirname(__FILE__).'/include/page_header.php';
 			$frmPd->addVar('period_id',$_REQUEST['period_id']);
 
 
-		$frmPd->addRow(array( new CVisibilityBox('caption_visible', !zbx_empty($caption), 'caption', _('Default')),
-			_('Caption')), new CTextBox('caption',$caption,42));
+		$frmPd->addRow(
+			array(
+				new CVisibilityBox('caption_visible', hasRequest('caption') && $caption != $autoCaption, 'caption',
+					_('Default')
+				),
+				_('Caption')
+			),
+			new CTextBox('caption', $caption, 42)
+		);
 
 		$reporttimetab = new CTable(null, 'calendar');
 
@@ -120,7 +133,7 @@ require_once dirname(__FILE__).'/include/page_header.php';
 		$reporttimetab->addRow($timeTillRow);
 
 		$frmPd->addRow(_('Period'), $reporttimetab);
-//*/
+
 		if($config != 1)
 			$frmPd->addRow(_('Colour'), new CColor('color',$color));
 		else
diff --git a/frontends/php/popup_trexpr.php b/frontends/php/popup_trexpr.php
index 716d0651b88..65473693ecb 100644
--- a/frontends/php/popup_trexpr.php
+++ b/frontends/php/popup_trexpr.php
@@ -29,16 +29,6 @@ define('ZBX_PAGE_NO_MENU', 1);
 
 require_once dirname(__FILE__).'/include/page_header.php';
 
-$operators = array(
-	'<' => '<',
-	'>' => '>',
-	'=' => '=',
-	'#' => 'NOT'
-);
-$limitedOperators = array(
-	'=' => '=',
-	'#' => 'NOT'
-);
 $metrics = array(
 	PARAM_TYPE_TIME => _('Time'),
 	PARAM_TYPE_COUNTS => _('Count')
@@ -147,7 +137,7 @@ $functions = array(
 		'description' =>  _('Absolute difference between last and previous value is = N'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'abschange[#]' => array(
+	'abschange[<>]' => array(
 		'description' =>  _('Absolute difference between last and previous value is NOT N'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -166,7 +156,7 @@ $functions = array(
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
 	),
-	'avg[#]' => array(
+	'avg[<>]' => array(
 		'description' =>  _('Average value of a period T is NOT N'),
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
@@ -186,7 +176,7 @@ $functions = array(
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
 	),
-	'delta[#]' => array(
+	'delta[<>]' => array(
 		'description' =>  _('Difference between MAX and MIN value of a period T is NOT N'),
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
@@ -203,7 +193,7 @@ $functions = array(
 		'description' =>  _('Difference between last and previous value is = N'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'change[#]' => array(
+	'change[<>]' => array(
 		'description' =>  _('Difference between last and previous value is NOT N'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -222,7 +212,7 @@ $functions = array(
 		'params' => $param3SecVal,
 		'allowed_types' => $allowedTypesAny
 	),
-	'count[#]' => array(
+	'count[<>]' => array(
 		'description' =>  _('Number of successfully retrieved values V (which fulfill operator O) for period T is NOT N'),
 		'params' => $param3SecVal,
 		'allowed_types' => $allowedTypesAny
@@ -231,7 +221,7 @@ $functions = array(
 		'description' =>  _('Difference between last and preceding values, then N = 1, 0 - otherwise'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'diff[#]' => array(
+	'diff[<>]' => array(
 		'description' =>  _('Difference between last and preceding values, then N NOT 1, 0 - otherwise'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -250,7 +240,7 @@ $functions = array(
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesAny
 	),
-	'last[#]' => array(
+	'last[<>]' => array(
 		'description' =>  _('Last (most recent) T value is NOT N'),
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesAny
@@ -270,7 +260,7 @@ $functions = array(
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
 	),
-	'max[#]' => array(
+	'max[<>]' => array(
 		'description' =>  _('Maximum value for period T is NOT N'),
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
@@ -290,7 +280,7 @@ $functions = array(
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
 		),
-	'min[#]' => array(
+	'min[<>]' => array(
 		'description' =>  _('Minimum value for period T is NOT N'),
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
@@ -307,7 +297,7 @@ $functions = array(
 		'description' =>  _('Previous value is = N'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'prev[#]' => array(
+	'prev[<>]' => array(
 		'description' =>  _('Previous value is NOT N'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -316,7 +306,7 @@ $functions = array(
 		'params' => $param2SecCount,
 		'allowed_types' => $allowedTypesAny
 	),
-	'str[#]' => array(
+	'str[<>]' => array(
 		'description' =>  _('Find string V in last (most recent) value. N NOT 1 - if found, 0 - otherwise'),
 		'params' => $param2SecCount,
 		'allowed_types' => $allowedTypesAny
@@ -336,7 +326,7 @@ $functions = array(
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesStr
 	),
-	'strlen[#]' => array(
+	'strlen[<>]' => array(
 		'description' =>  _('Length of last (most recent) T value in characters is NOT N'),
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesStr
@@ -356,7 +346,7 @@ $functions = array(
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
 	),
-	'sum[#]' => array(
+	'sum[<>]' => array(
 		'description' =>  _('Sum of values of a period T is NOT N'),
 		'params' => $param1SecCount,
 		'allowed_types' => $allowedTypesNumeric
@@ -373,7 +363,7 @@ $functions = array(
 		'description' =>  _('Current date is = N'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'date[#]' => array(
+	'date[<>]' => array(
 		'description' =>  _('Current date is NOT N'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -389,7 +379,7 @@ $functions = array(
 		'description' =>  _('Day of week is = N'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'dayofweek[#]' => array(
+	'dayofweek[<>]' => array(
 		'description' =>  _('Day of week is NOT N'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -405,7 +395,7 @@ $functions = array(
 		'description' =>  _('Day of month is = N'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'dayofmonth[#]' => array(
+	'dayofmonth[<>]' => array(
 		'description' =>  _('Day of month is NOT N'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -414,7 +404,7 @@ $functions = array(
 		'params' => $param1Sec,
 		'allowed_types' => $allowedTypesAny
 	),
-	'fuzzytime[#]' => array(
+	'fuzzytime[<>]' => array(
 		'description' =>  _('Timestamp not different from Zabbix server time for more than T seconds, then N NOT 1, 0 - otherwise'),
 		'params' => $param1Sec,
 		'allowed_types' => $allowedTypesAny
@@ -424,7 +414,7 @@ $functions = array(
 		'params' => $param2SecCount,
 		'allowed_types' => $allowedTypesAny
 	),
-	'regexp[#]' => array(
+	'regexp[<>]' => array(
 		'description' =>  _('Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise'),
 		'params' => $param2SecCount,
 		'allowed_types' => $allowedTypesAny
@@ -434,7 +424,7 @@ $functions = array(
 		'params' => $param2SecCount,
 		'allowed_types' => $allowedTypesAny
 	),
-	'iregexp[#]' => array(
+	'iregexp[<>]' => array(
 		'description' =>  _('Regular expression V matching last value in period T, then N NOT 1, 0 - otherwise (non case-sensitive)'),
 		'params' => $param2SecCount,
 		'allowed_types' => $allowedTypesAny
@@ -444,7 +434,7 @@ $functions = array(
 		'params' => $param1Str,
 		'allowed_types' => $allowedTypesLog
 	),
-	'logeventid[#]' => array(
+	'logeventid[<>]' => array(
 		'description' =>  _('Event ID of last log entry matching regular expression T, then N NOT 1, 0 - otherwise'),
 		'params' => $param1Str,
 		'allowed_types' => $allowedTypesLog
@@ -461,7 +451,7 @@ $functions = array(
 		'description' =>  _('Log severity of the last log entry is = N'),
 		'allowed_types' => $allowedTypesLog
 	),
-	'logseverity[#]' => array(
+	'logseverity[<>]' => array(
 		'description' =>  _('Log severity of the last log entry is NOT N'),
 		'allowed_types' => $allowedTypesLog
 	),
@@ -470,7 +460,7 @@ $functions = array(
 		'params' => $param1Str,
 		'allowed_types' => $allowedTypesLog
 	),
-	'logsource[#]' => array(
+	'logsource[<>]' => array(
 		'description' =>  _('Log source of the last log entry matching parameter T, then N NOT 1, 0 - otherwise'),
 		'params' => $param1Str,
 		'allowed_types' => $allowedTypesLog
@@ -487,7 +477,7 @@ $functions = array(
 		'description' =>  _('Number of seconds since the Epoch is = N'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'now[#]' => array(
+	'now[<>]' => array(
 		'description' =>  _('Number of seconds since the Epoch is NOT N'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -503,7 +493,7 @@ $functions = array(
 		'description' =>  _('Current time is = N'),
 		'allowed_types' => $allowedTypesAny
 	),
-	'time[#]' => array(
+	'time[<>]' => array(
 		'description' =>  _('Current time is NOT N'),
 		'allowed_types' => $allowedTypesAny
 	),
@@ -512,7 +502,7 @@ $functions = array(
 		'params' => $param1Sec,
 		'allowed_types' => $allowedTypesAny
 	),
-	'nodata[#]' => array(
+	'nodata[<>]' => array(
 		'description' =>  _('No data received during period of time T, then N NOT 1, 0 - otherwise'),
 		'params' => $param1Sec,
 		'allowed_types' => $allowedTypesAny
@@ -522,7 +512,7 @@ $functions = array(
 		'params' => $paramSecIntCount,
 		'allowed_types' => $allowedTypesInt
 	),
-	'band[#]' => array(
+	'band[<>]' => array(
 		'description' =>  _('Bitwise AND of last (most recent) T value and mask is NOT N'),
 		'params' => $paramSecIntCount,
 		'allowed_types' => $allowedTypesInt
@@ -538,7 +528,7 @@ $fields = array(
 	'itemid' =>				array(T_ZBX_INT, O_OPT, null,	null,		'isset({insert})'),
 	'parent_discoveryid' =>	array(T_ZBX_INT, O_OPT, null,	null,		null),
 	'expr_type'=>			array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({insert})'),
-	'param' =>				array(T_ZBX_STR, O_OPT, null,	0,			'isset({insert})'),
+	'params' =>				array(T_ZBX_STR, O_OPT, null,	0,			null),
 	'paramtype' =>			array(T_ZBX_INT, O_OPT, null,	IN(PARAM_TYPE_TIME.','.PARAM_TYPE_COUNTS), 'isset({insert})'),
 	'value' =>				array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({insert})'),
 	// action
@@ -547,95 +537,122 @@ $fields = array(
 );
 check_fields($fields);
 
+$dstfrm = getRequest('dstfrm', 0);
+$dstfld1 = getRequest('dstfld1', '');
+$itemId = getRequest('itemid', 0);
+$value = getRequest('value', 0);
+$params = getRequest('params', array());
+$paramType = getRequest('paramtype');
+$exprType = getRequest('expr_type', 'last[=]');
+
+// opening the popup when editing an expression in the trigger constructor
 if (isset($_REQUEST['expression']) && $_REQUEST['dstfld1'] == 'expr_temp') {
 	$_REQUEST['expression'] = utf8RawUrlDecode($_REQUEST['expression']);
 
 	$expressionData = new CTriggerExpression();
+	$result = $expressionData->parse(getRequest('expression'));
+
+	if ($result) {
+		// only one item function macro is supported in an expression
+		$functionMacroTokens = $result->getTokensByType(CTriggerExpressionParserResult::TOKEN_TYPE_FUNCTION_MACRO);
+		if (count($functionMacroTokens) == 1) {
+			$functionMacroToken = $functionMacroTokens[0];
+
+			// function
+			$function = $functionMacroToken['data']['functionName'];
+
+			// determine param type
+			$params = $functionMacroToken['data']['functionParams'];
+			$paramNumber = in_array($function, array('regexp', 'iregexp', 'str')) ? 1 : 0;
+			if (isset($params[$paramNumber][0]) && $params[$paramNumber][0] == '#') {
+				$paramType = PARAM_TYPE_COUNTS;
+				$params[$paramNumber] = substr($params[$paramNumber], 1);
+			}
+			else {
+				$paramType = PARAM_TYPE_TIME;
+			}
 
-	if ($expressionData->parse($_REQUEST['expression']) && count($expressionData->expressions) == 1) {
-		$exprPart = reset($expressionData->expressions);
-
-		preg_match('/\}([=><#]{1})([0-9]+)$/', $_REQUEST['expression'], $exprSymbols);
-
-		if (isset($exprSymbols[1])) {
-			$_REQUEST['expr_type'] = $exprPart['functionName'].'['.$exprSymbols[1].']';
-		}
-
-		$_REQUEST['description'] = $exprPart['host'].':'.$exprPart['item'];
-		$_REQUEST['param'] = $exprPart['functionParamList'];
-
-		$paramNumber = in_array($exprPart['functionName'], array('regexp', 'iregexp', 'str')) ? 1 : 0;
-
-		if (isset($_REQUEST['param'][$paramNumber][0]) && $_REQUEST['param'][$paramNumber][0] == '#') {
-			$_REQUEST['paramtype'] = PARAM_TYPE_COUNTS;
-			$_REQUEST['param'][$paramNumber] = substr($_REQUEST['param'][$paramNumber], 1);
-		}
-		else {
-			$_REQUEST['paramtype'] = PARAM_TYPE_TIME;
-		}
-
-		if (isset($exprSymbols[2])) {
-			$_REQUEST['value'] = $exprSymbols[2];
-		}
-
-		$myItem = API::Item()->get(array(
-			'filter' => array('host' => $exprPart['host'], 'key_' => $exprPart['item'], 'flags' => null),
-			'output' => array('itemid'),
-			'webitems' => true
-		));
-		$myItem = reset($myItem);
+			// default operator
+			$operator = '=';
+
+			// try to find an operator and a numeric value
+			// the value and operator can be extracted only if the immediately follow the item function macro
+			$tokens = $result->getTokens();
+			foreach ($tokens as $key => $token) {
+				if ($token['type'] == CTriggerExpressionParserResult::TOKEN_TYPE_FUNCTION_MACRO) {
+					if (isset($tokens[$key + 2])
+							&& $tokens[$key + 1]['type'] == CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR
+							&& isset($functions[$function.'['.$tokens[$key + 1]['value'].']'])
+							&& $tokens[$key + 2]['type'] == CTriggerExpressionParserResult::TOKEN_TYPE_NUMBER) {
+
+						$operator = $tokens[$key + 1]['value'];
+						$value = $tokens[$key + 2]['value'];
+					}
+					else {
+						break;
+					}
+				}
+			}
 
-		if (isset($myItem['itemid'])) {
-			$_REQUEST['itemid'] = $myItem['itemid'];
-		}
-		else {
-			error(_('Unknown host item, no such item in selected host'));
+			$exprType = $function.'['.$operator.']';
+
+			// find the item
+			$item = API::Item()->get(array(
+				'output' => array('itemid', 'hostid', 'name', 'key_', 'value_type'),
+				'selectHosts' => array('name'),
+				'webitems' => true,
+				'filter' => array(
+					'host' => $functionMacroToken['data']['host'],
+					'key_' => $functionMacroToken['data']['item'],
+					'flags' => null
+				)
+			));
+			$item = reset($item);
+
+			if ($item) {
+				$itemId = $item['itemid'];
+			}
+			else {
+				error(_('Unknown host item, no such item in selected host'));
+			}
 		}
 	}
 }
+// opening an empty form or switching a function
+else {
+	if (preg_match('/^([a-z]+)\[([=><]{1,2})\]$/i', $exprType, $matches)) {
+		$function = $matches[1];
+		$operator = $matches[2];
 
-$exprType = get_request('expr_type', 'last[=]');
-
-if (preg_match('/^([a-z]+)\[(['.implode('', array_keys($operators)).'])\]$/i', $exprType, $exprRes)) {
-	$function = $exprRes[1];
-	$operator = $exprRes[2];
-
-	if (!isset($functions[$exprType])) {
-		unset($function);
+		if (!isset($functions[$exprType])) {
+			unset($function);
+		}
 	}
-}
 
-$dstfrm = get_request('dstfrm', 0);
-$dstfld1 = get_request('dstfld1', '');
-$itemId = get_request('itemid', 0);
-$value = get_request('value', 0);
-$param = get_request('param', 0);
-$paramType = get_request('paramtype');
-
-if (!isset($function)) {
-	$function = 'last[=]';
-	$exprType = $function;
-}
-
-if ($itemId) {
-	$items = API::Item()->get(array(
-		'output' => array('itemid', 'hostid', 'name', 'key_'),
+	// fetch item
+	$item = API::Item()->get(array(
+		'output' => array('itemid', 'hostid', 'name', 'key_', 'value_type'),
+		'selectHosts' => array('host', 'name'),
 		'itemids' => $itemId,
 		'webitems' => true,
-		'selectHosts' => array('host'),
 		'filter' => array('flags' => null)
 	));
+	$item = reset($item);
+}
 
-	$items = CMacrosResolverHelper::resolveItemNames($items);
+if ($itemId) {
+	$items = CMacrosResolverHelper::resolveItemNames(array($item));
+	$item = $items[0];
 
-	$item = reset($items);
+	$itemValueType = $item['value_type'];
 	$itemKey = $item['key_'];
-	$itemHost = reset($item['hosts']);
-	$itemHost = $itemHost['host'];
-	$description = $itemHost.NAME_DELIMITER.$item['name_expanded'];
+	$itemHostData = reset($item['hosts']);
+	$description = $itemHostData['name'].NAME_DELIMITER.$item['name_expanded'];
 }
 else {
-	$itemKey = $itemHost = $description = '';
+	$itemKey = '';
+	$description = '';
+	$itemValueType = null;
 }
 
 if (is_null($paramType) && isset($functions[$exprType]['params']['M'])) {
@@ -645,59 +662,30 @@ elseif (is_null($paramType)) {
 	$paramType = PARAM_TYPE_TIME;
 }
 
-if (!is_array($param)) {
-	if (isset($functions[$exprType]['params'])) {
-		$param = explode(',', $param, count($functions[$exprType]['params']));
-	}
-	else {
-		$param = array($param);
-	}
-}
-
 /*
  * Display
  */
 $data = array(
-	'parent_discoveryid' => get_request('parent_discoveryid', null),
+	'parent_discoveryid' => getRequest('parent_discoveryid'),
 	'dstfrm' => $dstfrm,
 	'dstfld1' => $dstfld1,
 	'itemid' => $itemId,
 	'value' => $value,
-	'param' => $param,
+	'params' => $params,
 	'paramtype' => $paramType,
 	'description' => $description,
 	'functions' => $functions,
-	'function' => $function,
-	'operator' => $operator,
-	'item_host' => $itemHost,
 	'item_key' => $itemKey,
-	'itemValueType' => null,
+	'itemValueType' => $itemValueType,
+	'selectedFunction' => null,
 	'expr_type' => $exprType,
-	'insert' => get_request('insert', null),
-	'cancel' => get_request('cancel', null)
+	'insert' => getRequest('insert'),
+	'cancel' => getRequest('cancel')
 );
 
-// if user has already selected an item
-if ($itemId) {
-	// get item value type
-	$selectedItems = API::Item()->get(array(
-		'itemids' => array($itemId),
-		'output' => array('value_type'),
-		'filter' => array('flags' => null),
-		'webitems' => true
-	));
-
-	if ($selectedItem = reset($selectedItems)) {
-		$data['itemValueType'] = $selectedItem['value_type'];
-	}
-}
-
-$submittedFunction = $data['function'].'['.$data['operator'].']';
-$data['selectedFunction'] = null;
-
 // check if submitted function is usable with selected item
 foreach ($data['functions'] as $id => $f) {
-	if ((!$data['itemValueType'] || isset($f['allowed_types'][$data['itemValueType']])) && $id == $submittedFunction) {
+	if ((!$data['itemValueType'] || isset($f['allowed_types'][$data['itemValueType']])) && $id == $exprType) {
 		$data['selectedFunction'] = $id;
 		break;
 	}
@@ -705,7 +693,7 @@ foreach ($data['functions'] as $id => $f) {
 
 if ($data['selectedFunction'] === null) {
 	error(_s('Function "%1$s" cannot be used with selected item "%2$s"',
-		$data['functions'][$submittedFunction]['description'],
+		$data['functions'][$exprType]['description'],
 		$data['description']
 	));
 }
@@ -722,26 +710,26 @@ if (isset($data['insert'])) {
 	try {
 		if ($data['description']) {
 			if ($data['paramtype'] == PARAM_TYPE_COUNTS) {
-				$paramNumber = in_array($data['function'], array('regexp', 'iregexp', 'str')) ? 1 : 0;
-				$data['param'][$paramNumber] = '#'.$data['param'][$paramNumber];
+				$paramNumber = in_array($function, array('regexp', 'iregexp', 'str')) ? 1 : 0;
+				$data['params'][$paramNumber] = '#'.$data['params'][$paramNumber];
 			}
 
-			if ($data['paramtype'] == PARAM_TYPE_TIME && in_array($data['function'], array('last', 'band', 'strlen'))) {
-				$data['param'][0] = '';
+			if ($data['paramtype'] == PARAM_TYPE_TIME && in_array($function, array('last', 'band', 'strlen'))) {
+				$data['params'][0] = '';
 			}
 
 			// quote function param
-			$params = array();
-			foreach ($data['param'] as $param) {
-				$params[] = quoteFunctionParam($param);
+			$quotedParams = array();
+			foreach ($data['params'] as $param) {
+				$quotedParams[] = quoteFunctionParam($param);
 			}
 
 			$data['expression'] = sprintf('{%s:%s.%s(%s)}%s%s',
-				$data['item_host'],
+				$itemHostData['host'],
 				$data['item_key'],
-				$data['function'],
-				rtrim(implode(',', $params), ','),
-				$data['operator'],
+				$function,
+				rtrim(implode(',', $quotedParams), ','),
+				$operator,
 				$data['value']
 			);
 
@@ -752,7 +740,7 @@ if (isset($data['insert'])) {
 				$expressionData = reset($triggerExpression->expressions);
 
 				// validate trigger function
-				$triggerFunctionValidator = new CTriggerFunctionValidator();
+				$triggerFunctionValidator = new CFunctionValidator();
 				$isValid = $triggerFunctionValidator->validate(array(
 					'function' => $expressionData['function'],
 					'functionName' => $expressionData['functionName'],
@@ -771,8 +759,8 @@ if (isset($data['insert'])) {
 
 			// quote function param
 			if (isset($data['insert'])) {
-				foreach ($data['param'] as $pnum => $param) {
-					$data['param'][$pnum] = quoteFunctionParam($param);
+				foreach ($data['params'] as $pnum => $param) {
+					$data['params'][$pnum] = quoteFunctionParam($param);
 				}
 			}
 		}
diff --git a/frontends/php/popup_usrgrp.php b/frontends/php/popup_usrgrp.php
index 20e4937a4b2..cbd0af61b04 100644
--- a/frontends/php/popup_usrgrp.php
+++ b/frontends/php/popup_usrgrp.php
@@ -40,8 +40,8 @@ require_once dirname(__FILE__).'/include/page_header.php';
 	check_fields($fields);
 
 // destination form
-	$dstfrm	= get_request('dstfrm',	0);
-	$new_groups = get_request('new_groups', array());
+	$dstfrm	= getRequest('dstfrm',	0);
+	$new_groups = getRequest('new_groups', array());
 
 	show_table_header(_('User groups'));
 ?>
diff --git a/frontends/php/profile.php b/frontends/php/profile.php
index ac55926c824..53597b02853 100644
--- a/frontends/php/profile.php
+++ b/frontends/php/profile.php
@@ -65,15 +65,15 @@ $fields = array(
 	'del_user_media'=>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null),
 	// form
 	'form'=>				array(T_ZBX_STR, O_OPT, P_SYS, null, null),
-	'form_refresh'=>		array(T_ZBX_STR, O_OPT, null, null, null)
+	'form_refresh'=>		array(T_ZBX_INT, O_OPT, null, null, null)
 );
 check_fields($fields);
 
-$_REQUEST['autologin'] = get_request('autologin', 0);
+$_REQUEST['autologin'] = getRequest('autologin', 0);
 
 // secondary actions
 if (isset($_REQUEST['new_media'])) {
-	$_REQUEST['user_medias'] = get_request('user_medias', array());
+	$_REQUEST['user_medias'] = getRequest('user_medias', array());
 	array_push($_REQUEST['user_medias'], $_REQUEST['new_media']);
 }
 elseif (isset($_REQUEST['user_medias']) && isset($_REQUEST['enable_media'])) {
@@ -87,7 +87,7 @@ elseif (isset($_REQUEST['user_medias']) && isset($_REQUEST['disable_media'])) {
 	}
 }
 elseif (isset($_REQUEST['del_user_media'])) {
-	$user_medias_to_del = get_request('user_medias_to_del', array());
+	$user_medias_to_del = getRequest('user_medias_to_del', array());
 	foreach ($user_medias_to_del as $mediaid) {
 		if (isset($_REQUEST['user_medias'][$mediaid])) {
 			unset($_REQUEST['user_medias'][$mediaid]);
@@ -106,8 +106,8 @@ elseif (isset($_REQUEST['save'])) {
 		$_REQUEST['password1'] = $_REQUEST['password2'] = null;
 	}
 	else {
-		$_REQUEST['password1'] = get_request('password1', null);
-		$_REQUEST['password2'] = get_request('password2', null);
+		$_REQUEST['password1'] = getRequest('password1');
+		$_REQUEST['password2'] = getRequest('password2');
 	}
 
 	if ($_REQUEST['password1'] != $_REQUEST['password2']) {
@@ -123,21 +123,21 @@ elseif (isset($_REQUEST['save'])) {
 		$user = array();
 		$user['userid'] = CWebUser::$data['userid'];
 		$user['alias'] = CWebUser::$data['alias'];
-		$user['passwd'] = get_request('password1');
-		$user['url'] = get_request('url');
-		$user['autologin'] = get_request('autologin', 0);
+		$user['passwd'] = getRequest('password1');
+		$user['url'] = getRequest('url');
+		$user['autologin'] = getRequest('autologin', 0);
 		$user['autologout'] = hasRequest('autologout_visible') ? getRequest('autologout') : 0;
-		$user['theme'] = get_request('theme');
-		$user['refresh'] = get_request('refresh');
-		$user['rows_per_page'] = get_request('rows_per_page');
+		$user['theme'] = getRequest('theme');
+		$user['refresh'] = getRequest('refresh');
+		$user['rows_per_page'] = getRequest('rows_per_page');
 		$user['user_groups'] = null;
-		$user['user_medias'] = get_request('user_medias', array());
+		$user['user_medias'] = getRequest('user_medias', array());
 
 		if (hasRequest('lang')) {
 			$user['lang'] = getRequest('lang');
 		}
 
-		$messages = get_request('messages', array());
+		$messages = getRequest('messages', array());
 		if (!isset($messages['enabled'])) {
 			$messages['enabled'] = 0;
 		}
@@ -173,6 +173,7 @@ elseif (isset($_REQUEST['save'])) {
 			);
 			DBend(true);
 			ob_end_clean();
+
 			redirect(CWebUser::$data['last_page']['url']);
 		}
 		else {
@@ -188,8 +189,8 @@ ob_end_flush();
  */
 $data = getUserFormData(CWebUser::$data['userid'], true);
 $data['userid'] = CWebUser::$data['userid'];
-$data['form'] = get_request('form');
-$data['form_refresh'] = get_request('form_refresh', 0);
+$data['form'] = getRequest('form');
+$data['form_refresh'] = getRequest('form_refresh', 0);
 $data['autologout'] = getRequest('autologout');
 
 // render view
diff --git a/frontends/php/proxies.php b/frontends/php/proxies.php
index c8425595420..c7bef168fa3 100644
--- a/frontends/php/proxies.php
+++ b/frontends/php/proxies.php
@@ -37,23 +37,28 @@ $fields = array(
 	'hosts' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'description' =>	array(T_ZBX_STR, O_OPT, null,	null,		null),
 	// actions
-	'go' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+							IN('"proxy.massenable","proxy.massdisable","proxy.massdelete"'),
+							null
+						),
 	'save' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'clone' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'delete' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
-	'form_refresh' =>	array(T_ZBX_STR, O_OPT, null,	null,		null)
+	'form_refresh' =>	array(T_ZBX_INT, O_OPT, null,	null,		null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"host"'),								null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('host', ZBX_SORT_UP);
 
 /*
  * Permissions
  */
 if (isset($_REQUEST['proxyid'])) {
 	$dbProxy = API::Proxy()->get(array(
-		'proxyids' => get_request('proxyid'),
+		'proxyids' => getRequest('proxyid'),
 		'selectHosts' => array('hostid', 'host'),
 		'selectInterface' => API_OUTPUT_EXTEND,
 		'output' => API_OUTPUT_EXTEND
@@ -63,7 +68,7 @@ if (isset($_REQUEST['proxyid'])) {
 		access_deny();
 	}
 }
-if (isset($_REQUEST['go'])) {
+if (isset($_REQUEST['action'])) {
 	if (!isset($_REQUEST['hosts']) || !is_array($_REQUEST['hosts'])) {
 		access_deny();
 	}
@@ -79,16 +84,15 @@ if (isset($_REQUEST['go'])) {
 		}
 	}
 }
-$_REQUEST['go'] = get_request('go', 'none');
 
 /*
  * Actions
  */
 if (isset($_REQUEST['save'])) {
 	$proxy = array(
-		'host' => get_request('host'),
-		'status' => get_request('status'),
-		'interface' => get_request('interface'),
+		'host' => getRequest('host'),
+		'status' => getRequest('status'),
+		'interface' => getRequest('interface'),
 		'description' => getRequest('description')
 	);
 
@@ -96,7 +100,7 @@ if (isset($_REQUEST['save'])) {
 
 	// skip discovered hosts
 	$proxy['hosts'] = API::Host()->get(array(
-		'hostids' => get_request('hosts', array()),
+		'hostids' => getRequest('hosts', array()),
 		'output' => array('hostid'),
 		'filter' => array('flags' => ZBX_FLAG_DISCOVERY_NORMAL)
 	));
@@ -124,19 +128,20 @@ if (isset($_REQUEST['save'])) {
 	unset($_REQUEST['save']);
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
 elseif (isset($_REQUEST['delete'])) {
 	$result = API::Proxy()->delete(array($_REQUEST['proxyid']));
 
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['proxyid']);
-		$proxy = reset($dbProxy);
+		uncheckTableRows();
 	}
-
 	show_messages($result, _('Proxy deleted'), _('Cannot delete proxy'));
-	clearCookies($result);
 
 	unset($_REQUEST['delete']);
 }
@@ -144,11 +149,11 @@ elseif (isset($_REQUEST['clone']) && isset($_REQUEST['proxyid'])) {
 	unset($_REQUEST['proxyid'], $_REQUEST['hosts']);
 	$_REQUEST['form'] = 'clone';
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('hosts')) {
+elseif (str_in_array(getRequest('action'), array('proxy.massenable', 'proxy.massdisable')) && hasRequest('hosts')) {
 	$result = true;
-	$enable =(getRequest('go') == 'activate');
+	$enable =(getRequest('action') == 'proxy.massenable');
 	$status = $enable ? HOST_STATUS_MONITORED : HOST_STATUS_NOT_MONITORED;
-	$hosts = getRequest('hosts', array());
+	$hosts = getRequest('hosts');
 
 	DBstart();
 
@@ -175,6 +180,10 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 
 	$result = DBend($result && $hosts);
 
+	if ($result) {
+		uncheckTableRows();
+	}
+
 	$messageSuccess = $enable
 		? _n('Host enabled', 'Hosts enabled', $updated)
 		: _n('Host disabled', 'Hosts disabled', $updated);
@@ -183,16 +192,17 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		: _n('Cannot disable host', 'Cannot disable hosts', $updated);
 
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['hosts'])) {
+elseif (hasRequest('action') && getRequest('action') == 'proxy.massdelete' && hasRequest('hosts')) {
 	DBstart();
 
-	$goResult = API::Proxy()->delete(get_request('hosts'));
-	$goResult = DBend($goResult);
+	$result = API::Proxy()->delete(getRequest('hosts'));
+	$result = DBend($result);
 
-	show_messages($goResult, _('Proxy deleted'), _('Cannot delete proxy'));
-	clearCookies($goResult);
+	if ($result) {
+		uncheckTableRows();
+	}
+	show_messages($result, _('Proxy deleted'), _('Cannot delete proxy'));
 }
 
 /*
@@ -200,13 +210,13 @@ elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['hosts'])) {
  */
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'form' => get_request('form', 1),
-		'form_refresh' => get_request('form_refresh', 0) + 1,
-		'proxyid' => get_request('proxyid', 0),
-		'name' => get_request('host', ''),
-		'status' => get_request('status', HOST_STATUS_PROXY_ACTIVE),
-		'hosts' => get_request('hosts', array()),
-		'interface' => get_request('interface', array()),
+		'form' => getRequest('form', 1),
+		'form_refresh' => getRequest('form_refresh', 0) + 1,
+		'proxyid' => getRequest('proxyid', 0),
+		'name' => getRequest('host', ''),
+		'status' => getRequest('status', HOST_STATUS_PROXY_ACTIVE),
+		'hosts' => getRequest('hosts', array()),
+		'interface' => getRequest('interface', array()),
 		'proxy' => array(),
 		'description' => getRequest('description', '')
 	);
@@ -249,17 +259,23 @@ if (isset($_REQUEST['form'])) {
 	$proxyView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'host'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'config' => select_config()
+		'config' => select_config(),
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	$sortfield = getPageSortField('host');
-
 	$data['proxies'] = API::Proxy()->get(array(
 		'editable' => true,
 		'selectHosts' => array('hostid', 'host', 'name', 'status'),
 		'output' => API_OUTPUT_EXTEND,
-		'sortfield' => $sortfield,
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit'] + 1
 	));
 	$data['proxies'] = zbx_toHash($data['proxies'], 'proxyid');
@@ -267,8 +283,8 @@ else {
 	$proxyIds = array_keys($data['proxies']);
 
 	// sorting & paging
-	order_result($data['proxies'], $sortfield, getPageSortOrder());
-	$data['paging'] = getPagingLine($data['proxies'], array('proxyid'));
+	order_result($data['proxies'], $sortField, $sortOrder);
+	$data['paging'] = getPagingLine($data['proxies']);
 
 	// calculate performance
 	$dbPerformance = DBselect(
diff --git a/frontends/php/queue.php b/frontends/php/queue.php
index 1356d0c40e0..c5832a53ccd 100644
--- a/frontends/php/queue.php
+++ b/frontends/php/queue.php
@@ -43,7 +43,7 @@ $fields = array(
 
 check_fields($fields);
 
-$config = get_request('config', CProfile::get('web.queue.config', 0));
+$config = getRequest('config', CProfile::get('web.queue.config', 0));
 CProfile::update('web.queue.config', $config, PROFILE_TYPE_INT);
 
 // fetch data
@@ -197,6 +197,32 @@ elseif ($config == QUEUE_DETAILS) {
 
 	$items = CMacrosResolverHelper::resolveItemNames($items);
 
+	// get hosts for queue items
+	$hostIds = zbx_objectValues($items, 'hostid');
+	$hostIds = array_keys(array_flip($hostIds));
+
+	$hosts = API::Host()->get(array(
+		'output' => array('hostid', 'proxy_hostid'),
+		'hostids' => $hostIds,
+		'preservekeys' => true
+	));
+
+	// get proxies for those hosts
+	$proxyHostIds = array();
+	foreach ($hosts as $host) {
+		if ($host['proxy_hostid']) {
+			$proxyHostIds[$host['proxy_hostid']] = $host['proxy_hostid'];
+		}
+	}
+
+	if ($proxyHostIds) {
+		$proxies = API::Proxy()->get(array(
+			'proxyids' => $proxyHostIds,
+			'output' => array('proxyid', 'host'),
+			'preservekeys' => true
+		));
+	}
+
 	$table->setHeader(array(
 		_('Scheduled check'),
 		_('Delayed by'),
@@ -220,9 +246,11 @@ elseif ($config == QUEUE_DETAILS) {
 		$host = reset($item['hosts']);
 
 		$table->addRow(array(
-			zbx_date2str(QUEUE_NODES_DATE_FORMAT, $itemData['nextcheck']),
+			zbx_date2str(DATE_TIME_FORMAT_SECONDS, $itemData['nextcheck']),
 			zbx_date2age($itemData['nextcheck']),
-			$host['name'],
+			(isset($proxies[$hosts[$item['hostid']]['proxy_hostid']]))
+				? $proxies[$hosts[$item['hostid']]['proxy_hostid']]['host'].NAME_DELIMITER.$host['name']
+				: $host['name'],
 			$item['name_expanded']
 		));
 	}
diff --git a/frontends/php/report2.php b/frontends/php/report2.php
index 48e858dd147..9c9e38aab3c 100644
--- a/frontends/php/report2.php
+++ b/frontends/php/report2.php
@@ -207,6 +207,7 @@ elseif (isset($_REQUEST['filter_hostid'])) {
 	 * Filter
 	 */
 	$filterForm = new CFormTable();
+	$filterForm->setTableClass('formtable old-filter');
 	$filterForm->setAttribute('name', 'zbx_filter');
 	$filterForm->setAttribute('id', 'zbx_filter');
 	$filterForm->addVar('config', $availabilityReportMode);
diff --git a/frontends/php/report3.php b/frontends/php/report3.php
index a0c08cb4604..58b17f0ffa0 100644
--- a/frontends/php/report3.php
+++ b/frontends/php/report3.php
@@ -36,8 +36,8 @@ $fields = array(
 );
 check_fields($fields);
 
-$period = get_request('period', 'weekly');
-$year = get_request('year', date('Y'));
+$period = getRequest('period', 'weekly');
+$year = getRequest('year', date('Y'));
 
 define('YEAR_LEFT_SHIFT', 5);
 
@@ -93,7 +93,7 @@ switch ($period) {
 		}
 
 		function format_time($t) {
-			return zbx_date2str(_('Y'), $t);
+			return zbx_date2str(_x('Y', DATE_FORMAT_CONTEXT), $t);
 		}
 
 		function format_time2($t) {
@@ -111,7 +111,7 @@ switch ($period) {
 		}
 
 		function format_time($t) {
-			return zbx_date2str(_('M Y'), $t);
+			return zbx_date2str(_x('F', DATE_FORMAT_CONTEXT), $t);
 		}
 
 		function format_time2($t) {
@@ -129,7 +129,7 @@ switch ($period) {
 		}
 
 		function format_time($t) {
-			return zbx_date2str(_('d M Y'), $t);
+			return zbx_date2str(DATE_FORMAT, $t);
 		}
 
 		function format_time2($t) {
@@ -156,7 +156,7 @@ switch ($period) {
 		}
 
 		function format_time($t) {
-			return zbx_date2str(_('d M Y H:i'), $t);
+			return zbx_date2str(DATE_TIME_FORMAT, $t);
 		}
 
 		function format_time2($t) {
diff --git a/frontends/php/report4.php b/frontends/php/report4.php
index 4355bc86208..fb62bfb5475 100644
--- a/frontends/php/report4.php
+++ b/frontends/php/report4.php
@@ -35,7 +35,7 @@ $fields = array(
 );
 check_fields($fields);
 
-if (get_request('media_type')) {
+if (getRequest('media_type')) {
 	$mediaTypeData = API::MediaType()->get(array(
 		'mediatypeids' => array($_REQUEST['media_type']),
 		'countOutput' => true
@@ -45,9 +45,9 @@ if (get_request('media_type')) {
 	}
 }
 
-$year = get_request('year', intval(date('Y')));
-$period = get_request('period', 'weekly');
-$media_type = get_request('media_type', 0);
+$year = getRequest('year', intval(date('Y')));
+$period = getRequest('period', 'weekly');
+$media_type = getRequest('media_type', 0);
 
 $_REQUEST['year'] = $year;
 $_REQUEST['period'] = $period;
@@ -130,7 +130,7 @@ else {
 		case 'yearly':
 			$minTime = mktime(0, 0, 0, 1, 1, $minYear);
 
-			$dateFormat = REPORT4_ANNUALLY_DATE_FORMAT;
+			$dateFormat = _x('Y', DATE_FORMAT_CONTEXT);
 			array_unshift($header, new CCol(_('Year'), 'center'));
 
 			for ($i = $minYear; $i <= date('Y'); $i++) {
@@ -142,7 +142,7 @@ else {
 		case 'monthly':
 			$minTime = mktime(0, 0, 0, 1, 1, $year);
 
-			$dateFormat = REPORT4_MONTHLY_DATE_FORMAT;
+			$dateFormat = _x('F', DATE_FORMAT_CONTEXT);
 			array_unshift($header, new CCol(_('Month'),'center'));
 
 			$max = ($year == $currentYear) ? date('n') : 12;
@@ -155,7 +155,7 @@ else {
 		case 'daily':
 			$minTime = mktime(0, 0, 0, 1, 1, $year);
 
-			$dateFormat = REPORT4_DAILY_DATE_FORMAT;
+			$dateFormat = DATE_FORMAT;
 			array_unshift($header, new CCol(_('Day'),'center'));
 
 			$max = ($year == $currentYear) ? date('z') : DAY_IN_YEAR;
@@ -171,7 +171,7 @@ else {
 			$wd = ($wd == 0) ? 6 : $wd - 1;
 			$minTime = $time - $wd * SEC_PER_DAY;
 
-			$dateFormat = REPORT4_WEEKLY_DATE_FORMAT;
+			$dateFormat = DATE_TIME_FORMAT;
 			array_unshift($header, new CCol(_('From'), 'center'), new CCol(_('Till'), 'center'));
 
 			$max = ($year == $currentYear) ? date('W') - 1 : 52;
@@ -192,7 +192,7 @@ else {
 			'output' => array('mediatypeid', 'userid', 'clock'),
 			'eventsource' => $sourceObject['source'],
 			'eventobject' => $sourceObject['object'],
-			'mediatypeids' => (get_request('media_type')) ? get_request('media_type') : null,
+			'mediatypeids' => (getRequest('media_type')) ? getRequest('media_type') : null,
 			'time_from' => $minTime,
 			'time_till' => $maxTime
 		)));
@@ -249,7 +249,7 @@ else {
 	$table->show();
 
 	if ($media_type == 0) {
-		echo SBR;
+		echo BR();
 
 		$links = array();
 		foreach ($media_types as $id => $description) {
diff --git a/frontends/php/report5.php b/frontends/php/report5.php
index 919284c5c7c..fcdff3925ac 100644
--- a/frontends/php/report5.php
+++ b/frontends/php/report5.php
@@ -35,7 +35,7 @@ check_fields($fields);
 
 $rprt_wdgt = new CWidget();
 
-$_REQUEST['period'] = get_request('period', 'day');
+$_REQUEST['period'] = getRequest('period', 'day');
 $admin_links = (CWebUser::$data['type'] == USER_TYPE_ZABBIX_ADMIN || CWebUser::$data['type'] == USER_TYPE_SUPER_ADMIN);
 
 $form = new CForm('get');
@@ -78,7 +78,7 @@ switch ($_REQUEST['period']) {
 }
 
 $triggersEventCount = array();
-// get 100 triggerids with max even count
+// get 100 triggerids with max event count
 $sql = 'SELECT e.objectid,count(distinct e.eventid) AS cnt_event'.
 		' FROM triggers t,events e'.
 		' WHERE t.triggerid=e.objectid'.
@@ -114,7 +114,7 @@ $triggers = API::Trigger()->get(array(
 	'triggerids' => array_keys($triggersEventCount),
 	'output' => array('triggerid', 'description', 'expression', 'priority', 'flags', 'url', 'lastchange'),
 	'selectItems' => array('hostid', 'name', 'value_type', 'key_'),
-	'selectHosts' => array('hostid'),
+	'selectHosts' => array('hostid', 'status'),
 	'expandDescription' => true,
 	'expandData' => true,
 	'preservekeys' => true,
@@ -136,7 +136,7 @@ foreach ($triggers as $triggerId => $trigger) {
 			'params' => array(
 				'itemid' => $item['itemid'],
 				'action' => in_array($item['value_type'], array(ITEM_VALUE_TYPE_FLOAT, ITEM_VALUE_TYPE_UINT64))
-					? 'showgraph' : 'showvalues'
+					? HISTORY_GRAPH : HISTORY_VALUES
 			)
 		);
 	}
@@ -151,7 +151,7 @@ CArrayHelper::sort($triggers, array(
 ));
 
 $hosts = API::Host()->get(array(
-	'output' => array('hostid'),
+	'output' => array('hostid', 'status'),
 	'hostids' => $hostIds,
 	'selectGraphs' => API_OUTPUT_COUNT,
 	'selectScreens' => API_OUTPUT_COUNT,
@@ -163,7 +163,10 @@ $scripts = API::Script()->getScriptsByHosts($hostIds);
 foreach ($triggers as $trigger) {
 	$hostId = $trigger['hostid'];
 
-	$hostName = new CSpan($trigger['hostname'], 'link_menu');
+	$hostName = new CSpan($trigger['hostname'],
+		'link_menu menu-host'.(($hosts[$hostId]['status'] == HOST_STATUS_NOT_MONITORED) ? ' not-monitored' : '')
+	);
+
 	$hostName->setMenuPopup(CMenuPopupHelper::getHost($hosts[$hostId], $scripts[$hostId]));
 
 	$triggerDescription = new CSpan($trigger['description'], 'link_menu');
diff --git a/frontends/php/report6.php b/frontends/php/report6.php
index 451eccda731..63760a0284c 100644
--- a/frontends/php/report6.php
+++ b/frontends/php/report6.php
@@ -98,8 +98,8 @@ if (hasRequest('report_reset')) {
 }
 
 if (hasRequest('new_graph_item')) {
-	$_REQUEST['items'] = get_request('items', array());
-	$newItem = get_request('new_graph_item', array());
+	$_REQUEST['items'] = getRequest('items', array());
+	$newItem = getRequest('new_graph_item', array());
 
 	foreach ($_REQUEST['items'] as $item) {
 		if ((bccomp($newItem['itemid'], $item['itemid']) == 0)
@@ -116,17 +116,17 @@ if (hasRequest('new_graph_item')) {
 }
 
 // validate permissions
-if (get_request('config') == BR_COMPARE_VALUE_MULTIPLE_PERIODS) {
-	if (get_request('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
+if (getRequest('config') == BR_COMPARE_VALUE_MULTIPLE_PERIODS) {
+	if (getRequest('groupid') && !API::HostGroup()->isReadable(array($_REQUEST['groupid']))) {
 		access_deny();
 	}
-	if (get_request('groupids') && !API::HostGroup()->isReadable($_REQUEST['groupids'])) {
+	if (getRequest('groupids') && !API::HostGroup()->isReadable($_REQUEST['groupids'])) {
 		access_deny();
 	}
-	if (get_request('hostids') && !API::Host()->isReadable($_REQUEST['hostids'])) {
+	if (getRequest('hostids') && !API::Host()->isReadable($_REQUEST['hostids'])) {
 		access_deny();
 	}
-	if (get_request('itemid')) {
+	if (getRequest('itemid')) {
 		$items = API::Item()->get(array(
 			'itemids' => $_REQUEST['itemid'],
 			'webitems' => true,
@@ -138,7 +138,7 @@ if (get_request('config') == BR_COMPARE_VALUE_MULTIPLE_PERIODS) {
 	}
 }
 else {
-	if (get_request('items') && count($_REQUEST['items']) > 0) {
+	if (getRequest('items') && count($_REQUEST['items']) > 0) {
 		$itemIds = zbx_objectValues($_REQUEST['items'], 'itemid');
 		$itemsCount = API::Item()->get(array(
 			'itemids' => $itemIds,
@@ -172,8 +172,8 @@ if (isset($_REQUEST['delete_item']) && isset($_REQUEST['group_gid'])) {
 	unset($_REQUEST['delete_item'], $_REQUEST['group_gid']);
 }
 elseif (isset($_REQUEST['new_period'])) {
-	$_REQUEST['periods'] = get_request('periods', array());
-	$newPeriod = get_request('new_period', array());
+	$_REQUEST['periods'] = getRequest('periods', array());
+	$newPeriod = getRequest('new_period', array());
 
 	foreach ($_REQUEST['periods'] as $period) {
 		$period['report_timesince'] = zbxDateToTime($period['report_timesince']);
@@ -201,21 +201,32 @@ elseif (isset($_REQUEST['delete_period']) && isset($_REQUEST['group_pid'])) {
 }
 
 // item validation
-$config = $_REQUEST['config'] = get_request('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
+$config = $_REQUEST['config'] = getRequest('config', BR_DISTRIBUTION_MULTIPLE_PERIODS);
 
 // items array validation
 if ($config != BR_COMPARE_VALUE_MULTIPLE_PERIODS) {
-	$items = get_request('items');
+	$items = getRequest('items');
 	$validItems = validateBarReportItems($items);
+	if ($validItems) {
+		$validItems = CMacrosResolverHelper::resolveItemNames($validItems);
+
+		foreach ($validItems as &$item) {
+			if ($item['caption'] === $item['name']) {
+				$item['caption'] = $item['name_expanded'];
+			}
+		}
+
+		unset($item);
+	}
 
 	if ($config == BR_DISTRIBUTION_MULTIPLE_ITEMS) {
-		$validPeriods = validateBarReportPeriods(get_request('periods'));
+		$validPeriods = validateBarReportPeriods(getRequest('periods'));
 	}
 }
 
-$_REQUEST['report_timesince'] = zbxDateToTime(get_request('report_timesince',
+$_REQUEST['report_timesince'] = zbxDateToTime(getRequest('report_timesince',
 	date(TIMESTAMP_FORMAT_ZERO_TIME, time() - SEC_PER_DAY)));
-$_REQUEST['report_timetill'] = zbxDateToTime(get_request('report_timetill',
+$_REQUEST['report_timetill'] = zbxDateToTime(getRequest('report_timetill',
 	date(TIMESTAMP_FORMAT_ZERO_TIME, time())));
 
 $rep6_wdgt = new CWidget();
@@ -255,8 +266,8 @@ $rep6_wdgt->addFlicker($rep_form, CProfile::get('web.report6.filter.state', BR_D
 
 if (hasRequest('report_show')) {
 	$items = ($config == BR_COMPARE_VALUE_MULTIPLE_PERIODS)
-		? array(array('itemid' => get_request('itemid')))
-		: get_request('items');
+		? array(array('itemid' => getRequest('itemid')))
+		: $validItems;
 
 	if ($isValid && (($config != BR_COMPARE_VALUE_MULTIPLE_PERIODS) ? $validItems : true)
 			&& (($config == BR_DISTRIBUTION_MULTIPLE_ITEMS) ? $validPeriods : true)) {
diff --git a/frontends/php/screenconf.php b/frontends/php/screenconf.php
index 20d78dbfc4f..97566045fca 100644
--- a/frontends/php/screenconf.php
+++ b/frontends/php/screenconf.php
@@ -25,7 +25,7 @@ require_once dirname(__FILE__).'/include/ident.inc.php';
 require_once dirname(__FILE__).'/include/forms.inc.php';
 require_once dirname(__FILE__).'/include/maps.inc.php';
 
-if (isset($_REQUEST['go']) && $_REQUEST['go'] == 'export' && isset($_REQUEST['screens'])) {
+if (hasRequest('action') && getRequest('action') == 'screen.export' && hasRequest('screens')) {
 	$isExportData = true;
 
 	$page['type'] = detect_page_type(PAGE_TYPE_XML);
@@ -51,7 +51,7 @@ $fields = array(
 	'hsize' =>			array(T_ZBX_INT, O_OPT, null,	BETWEEN(1, 100), 'isset({save})', _('Columns')),
 	'vsize' =>			array(T_ZBX_INT, O_OPT, null,	BETWEEN(1, 100), 'isset({save})', _('Rows')),
 	// actions
-	'go' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null),
+	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, IN('"screen.export","screen.massdelete"'),		null),
 	'clone' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null),
 	'save' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null),
 	'delete' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null),
@@ -60,13 +60,14 @@ $fields = array(
 	'form_refresh' =>	array(T_ZBX_INT, O_OPT, null,	null,			null),
 	// import
 	'rules' =>			array(T_ZBX_STR, O_OPT, null,	DB_ID,			null),
-	'import' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null)
+	'import' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null),
+	// sort and sortorder
+	'sort' =>					array(T_ZBX_STR, O_OPT, P_SYS, IN('"name"'),								null),
+	'sortorder' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
-CProfile::update('web.screenconf.config', get_request('config', 0), PROFILE_TYPE_INT);
-$_REQUEST['go'] = get_request('go', 'none');
+CProfile::update('web.screenconf.config', getRequest('config', 0), PROFILE_TYPE_INT);
 
 /*
  * Permissions
@@ -94,7 +95,7 @@ if (isset($_REQUEST['screenid'])) {
  * Export
  */
 if ($isExportData) {
-	$screens = get_request('screens', array());
+	$screens = getRequest('screens', array());
 	$export = new CConfigurationExport(array('screens' => $screens));
 	$export->setBuilder(new CConfigurationExportBuilder());
 	$export->setWriter(CExportWriterFactory::getWriter(CExportWriterFactory::XML));
@@ -167,7 +168,7 @@ elseif (isset($_REQUEST['save'])) {
 		$messageFailed = _('Cannot add screen');
 
 		if (isset($_REQUEST['templateid'])) {
-			$screen['templateid'] = get_request('templateid');
+			$screen['templateid'] = getRequest('templateid');
 			$screenids = API::TemplateScreen()->create($screen);
 		}
 		else {
@@ -183,16 +184,17 @@ elseif (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
+
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['screenid']);
+		uncheckTableRows();
 	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
-elseif (isset($_REQUEST['delete']) && isset($_REQUEST['screenid']) || $_REQUEST['go'] == 'delete') {
-	$screenids = get_request('screens', array());
-	if (isset($_REQUEST['screenid'])) {
-		$screenids[] = $_REQUEST['screenid'];
+elseif ((hasRequest('delete') && hasRequest('screenid')) || (hasRequest('action') && getRequest('action') == 'screen.massdelete' && hasRequest('screens'))) {
+	$screenids = getRequest('screens', array());
+	if (hasRequest('screenid')) {
+		$screenids[] = getRequest('screenid');
 	}
 
 	DBstart();
@@ -232,10 +234,9 @@ elseif (isset($_REQUEST['delete']) && isset($_REQUEST['screenid']) || $_REQUEST[
 
 	if ($result) {
 		unset($_REQUEST['screenid'], $_REQUEST['form']);
+		uncheckTableRows();
 	}
-
 	show_messages($result, _('Screen deleted'), _('Cannot delete screen'));
-	clearCookies($result);
 }
 
 /*
@@ -243,9 +244,9 @@ elseif (isset($_REQUEST['delete']) && isset($_REQUEST['screenid']) || $_REQUEST[
  */
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'form' => get_request('form', null),
-		'screenid' => get_request('screenid', null),
-		'templateid' => get_request('templateid', null)
+		'form' => getRequest('form'),
+		'screenid' => getRequest('screenid'),
+		'templateid' => getRequest('templateid')
 	);
 
 	// screen
@@ -273,9 +274,9 @@ if (isset($_REQUEST['form'])) {
 		}
 	}
 	else {
-		$data['name'] = get_request('name', '');
-		$data['hsize'] = get_request('hsize', 1);
-		$data['vsize'] = get_request('vsize', 1);
+		$data['name'] = getRequest('name', '');
+		$data['hsize'] = getRequest('hsize', 1);
+		$data['vsize'] = getRequest('vsize', 1);
 	}
 
 	// render view
@@ -284,16 +285,23 @@ if (isset($_REQUEST['form'])) {
 	$screenView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'templateid' => get_request('templateid', null)
+		'templateid' => getRequest('templateid'),
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	$sortfield = getPageSortField('name');
 	$options = array(
 		'editable' => true,
 		'output' => API_OUTPUT_EXTEND,
 		'templateids' => $data['templateid'],
-		'sortfield' => $sortfield,
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit']
 	);
 	if (!empty($data['templateid'])) {
@@ -302,14 +310,10 @@ else {
 	else {
 		$data['screens'] = API::Screen()->get($options);
 	}
-	order_result($data['screens'], $sortfield, getPageSortOrder());
+	order_result($data['screens'], $sortField, $sortOrder);
 
 	// paging
-	$data['paging'] = getPagingLine(
-		$data['screens'],
-		array('screenid'),
-		array('templateid' => get_request('templateid'))
-	);
+	$data['paging'] = getPagingLine($data['screens']);
 
 	// render view
 	$screenView = new CView('configuration.screen.list', $data);
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index e39c6f73f3f..9327dd98c19 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -32,19 +32,46 @@ $page['type'] = detect_page_type(PAGE_TYPE_HTML);
 
 require_once dirname(__FILE__).'/include/page_header.php';
 
+$knownResourceTypes = array(
+	SCREEN_RESOURCE_GRAPH,
+	SCREEN_RESOURCE_SIMPLE_GRAPH,
+	SCREEN_RESOURCE_MAP,
+	SCREEN_RESOURCE_PLAIN_TEXT,
+	SCREEN_RESOURCE_HOSTS_INFO,
+	SCREEN_RESOURCE_TRIGGERS_INFO,
+	SCREEN_RESOURCE_SERVER_INFO,
+	SCREEN_RESOURCE_CLOCK,
+	SCREEN_RESOURCE_SCREEN,
+	SCREEN_RESOURCE_TRIGGERS_OVERVIEW,
+	SCREEN_RESOURCE_DATA_OVERVIEW,
+	SCREEN_RESOURCE_URL,
+	SCREEN_RESOURCE_ACTIONS,
+	SCREEN_RESOURCE_EVENTS,
+	SCREEN_RESOURCE_HOSTGROUP_TRIGGERS,
+	SCREEN_RESOURCE_SYSTEM_STATUS,
+	SCREEN_RESOURCE_HOST_TRIGGERS,
+	SCREEN_RESOURCE_HISTORY,
+	SCREEN_RESOURCE_CHART,
+	SCREEN_RESOURCE_LLD_SIMPLE_GRAPH,
+	SCREEN_RESOURCE_LLD_GRAPH
+);
+
 // VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
 $fields = array(
 	'screenid' =>		array(T_ZBX_INT, O_MAND, P_SYS,	DB_ID,			null),
 	'screenitemid' =>	array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,			null),
-	'resourcetype' =>	array(T_ZBX_INT, O_OPT, null,	BETWEEN(0, 16),	'isset({save})'),
+	'resourcetype' =>	array(T_ZBX_INT, O_OPT, null,	IN($knownResourceTypes), 'isset({save})'),
 	'caption' =>		array(T_ZBX_STR, O_OPT, null,	null,			null),
 	'resourceid' =>		array(T_ZBX_INT, O_OPT, null,	DB_ID,			'isset({save})',
 		isset($_REQUEST['save']) ? getResourceNameByType($_REQUEST['resourcetype']) : null),
 	'templateid' =>		array(T_ZBX_INT, O_OPT, null,	DB_ID,			null),
 	'width' =>			array(T_ZBX_INT, O_OPT, null,	BETWEEN(0, 65535), null, _('Width')),
 	'height' =>			array(T_ZBX_INT, O_OPT, null,	BETWEEN(0, 65535), null, _('Height')),
-	'colspan' =>		array(T_ZBX_INT, O_OPT, null,	BETWEEN(0, 100), null, _('Column span')),
-	'rowspan' =>		array(T_ZBX_INT, O_OPT, null,	BETWEEN(0, 100), null, _('Row span')),
+	'max_columns' =>	array(T_ZBX_INT, O_OPT, null,
+		BETWEEN(SCREEN_SURROGATE_MAX_COLUMNS_MIN, SCREEN_SURROGATE_MAX_COLUMNS_MAX), null, _('Max columns')
+	),
+	'colspan' =>		array(T_ZBX_INT, O_OPT, null,	BETWEEN(1, 100), null, _('Column span')),
+	'rowspan' =>		array(T_ZBX_INT, O_OPT, null,	BETWEEN(1, 100), null, _('Row span')),
 	'elements' =>		array(T_ZBX_INT, O_OPT, null,	BETWEEN(1, 100), null, _('Show lines')),
 	'sort_triggers' =>	array(T_ZBX_INT, O_OPT, null,	BETWEEN(SCREEN_SORT_TRIGGERS_DATE_DESC, SCREEN_SORT_TRIGGERS_RECIPIENT_DESC), null),
 	'valign' =>			array(T_ZBX_INT, O_OPT, null,	BETWEEN(VALIGN_MIDDLE, VALIGN_BOTTOM), null),
@@ -72,7 +99,7 @@ $fields = array(
 	'ajaxAction' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,			null)
 );
 check_fields($fields);
-$_REQUEST['dynamic'] = get_request('dynamic', SCREEN_SIMPLE_ITEM);
+$_REQUEST['dynamic'] = getRequest('dynamic', SCREEN_SIMPLE_ITEM);
 
 /*
  * Permissions
@@ -96,7 +123,7 @@ $screen = reset($screens);
  * Ajax
  */
 if (!empty($_REQUEST['ajaxAction']) && $_REQUEST['ajaxAction'] == 'sw_pos') {
-	$sw_pos = get_request('sw_pos', array());
+	$sw_pos = getRequest('sw_pos', array());
 	if (count($sw_pos) > 3) {
 		DBstart();
 
@@ -154,22 +181,23 @@ if ($page['type'] == PAGE_TYPE_JS || $page['type'] == PAGE_TYPE_HTML_BLOCK) {
  */
 if (isset($_REQUEST['save'])) {
 	$screenItem = array(
-		'screenid' => get_request('screenid'),
-		'resourceid' => get_request('resourceid'),
-		'resourcetype' => get_request('resourcetype'),
-		'caption' => get_request('caption'),
-		'style' => get_request('style'),
-		'url' => get_request('url'),
-		'width' => get_request('width'),
-		'height' => get_request('height'),
-		'halign' => get_request('halign'),
-		'valign' => get_request('valign'),
-		'colspan' => get_request('colspan'),
-		'rowspan' => get_request('rowspan'),
-		'dynamic' => get_request('dynamic'),
-		'elements' => get_request('elements', 0),
-		'sort_triggers' => get_request('sort_triggers', SCREEN_SORT_TRIGGERS_DATE_DESC),
-		'application' => get_request('application', '')
+		'screenid' => getRequest('screenid'),
+		'resourceid' => getRequest('resourceid'),
+		'resourcetype' => getRequest('resourcetype'),
+		'caption' => getRequest('caption'),
+		'style' => getRequest('style'),
+		'url' => getRequest('url'),
+		'width' => getRequest('width'),
+		'height' => getRequest('height'),
+		'halign' => getRequest('halign'),
+		'valign' => getRequest('valign'),
+		'colspan' => getRequest('colspan'),
+		'rowspan' => getRequest('rowspan'),
+		'max_columns' => getRequest('max_columns'),
+		'dynamic' => getRequest('dynamic'),
+		'elements' => getRequest('elements', 0),
+		'sort_triggers' => getRequest('sort_triggers', SCREEN_SORT_TRIGGERS_DATE_DESC),
+		'application' => getRequest('application', '')
 	);
 
 	DBstart();
@@ -177,17 +205,11 @@ if (isset($_REQUEST['save'])) {
 	if (!empty($_REQUEST['screenitemid'])) {
 		$screenItem['screenitemid'] = $_REQUEST['screenitemid'];
 
-		$messageSuccess = _('Item updated');
-		$messageFailed = _('Cannot update item');
-
 		$result = API::ScreenItem()->update($screenItem);
 	}
 	else {
-		$screenItem['x'] = get_request('x');
-		$screenItem['y'] = get_request('y');
-
-		$messageSuccess = _('Item added');
-		$messageFailed = _('Cannot add item');
+		$screenItem['x'] = getRequest('x');
+		$screenItem['y'] = getRequest('y');
 
 		$result = API::ScreenItem()->create($screenItem);
 	}
@@ -202,7 +224,7 @@ if (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
-	show_messages($result, $messageSuccess, $messageFailed);
+	show_messages($result, _('Screen updated'), _('Cannot update screen'));
 }
 elseif (isset($_REQUEST['delete'])) {
 	DBstart();
@@ -219,7 +241,7 @@ elseif (isset($_REQUEST['delete'])) {
 	unset($_REQUEST['x']);
 
 	$result = DBend($screenitemid);
-	show_messages($result, _('Item deleted'), _('Cannot delete item'));
+	show_messages($result, _('Screen updated'), _('Cannot update screen'));
 }
 elseif (isset($_REQUEST['add_row'])) {
 	DBstart();
@@ -352,7 +374,7 @@ elseif (isset($_REQUEST['rmv_col'])) {
  * Display
  */
 $data = array(
-	'screenid' => get_request('screenid', 0)
+	'screenid' => getRequest('screenid', 0)
 );
 
 // getting updated screen, so we wont have to refresh the page to see changes
diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index 64c1ef839c6..c67cd4ebdb5 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -45,13 +45,13 @@ $fields = array(
 	'step' =>		array(T_ZBX_INT, O_OPT, P_SYS,	BETWEEN(0, 65535), null),
 	'period' =>		array(T_ZBX_INT, O_OPT, P_SYS,	null,		null),
 	'stime' =>		array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
-	'reset' =>		array(T_ZBX_STR, O_OPT, P_SYS,	IN("'reset'"), null),
+	'reset' =>		array(T_ZBX_STR, O_OPT, P_SYS,	IN('"reset"'), null),
 	'fullscreen' =>	array(T_ZBX_INT, O_OPT, P_SYS,	IN('0,1'), null),
 	// ajax
 	'filterState' => array(T_ZBX_INT, O_OPT, P_ACT,	null,		null),
 	'favobj' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
 	'favid' =>		array(T_ZBX_INT, O_OPT, P_ACT,	null,		null),
-	'favaction' =>	array(T_ZBX_STR, O_OPT, P_ACT,	IN("'add','remove'"), null)
+	'favaction' =>	array(T_ZBX_STR, O_OPT, P_ACT,	IN('"add","remove"'), null)
 );
 check_fields($fields);
 
@@ -60,8 +60,8 @@ check_fields($fields);
  */
 // validate group IDs
 $validateGroupIds = array_filter(array(
-	get_request('groupid'),
-	get_request('tr_groupid')
+	getRequest('groupid'),
+	getRequest('tr_groupid')
 ));
 if ($validateGroupIds && !API::HostGroup()->isReadable($validateGroupIds)) {
 	access_deny();
@@ -69,14 +69,14 @@ if ($validateGroupIds && !API::HostGroup()->isReadable($validateGroupIds)) {
 
 // validate host IDs
 $validateHostIds = array_filter(array(
-	get_request('hostid'),
-	get_request('tr_hostid')
+	getRequest('hostid'),
+	getRequest('tr_hostid')
 ));
 if ($validateHostIds && !API::Host()->isReadable($validateHostIds)) {
 	access_deny();
 }
 
-if (get_request('elementid')) {
+if (getRequest('elementid')) {
 	$screens = API::Screen()->get(array(
 		'screenids' => array($_REQUEST['elementid']),
 		'output' => array('screenid')
@@ -142,9 +142,9 @@ if ($page['type'] == PAGE_TYPE_JS || $page['type'] == PAGE_TYPE_HTML_BLOCK) {
  */
 $data = array(
 	'fullscreen' => $_REQUEST['fullscreen'],
-	'period' => get_request('period'),
-	'stime' => get_request('stime'),
-	'elementid' => get_request('elementid', false),
+	'period' => getRequest('period'),
+	'stime' => getRequest('stime'),
+	'elementid' => getRequest('elementid', false),
 
 	// whether we should use screen name to fetch a screen (if this is false, elementid is used)
 	'use_screen_name' => isset($_REQUEST['screenname'])
@@ -163,7 +163,7 @@ $data['screens'] = API::Screen()->get(array(
 // if screen name is provided it takes priority over elementid
 if ($data['use_screen_name']) {
 	$data['screens'] = zbx_toHash($data['screens'], 'name');
-	$data['elementIdentifier'] = get_request('screenname');
+	$data['elementIdentifier'] = getRequest('screenname');
 }
 else {
 	$data['screens'] = zbx_toHash($data['screens'], 'screenid');
diff --git a/frontends/php/scripts.php b/frontends/php/scripts.php
index 0d07558b9d8..06c9145f01d 100644
--- a/frontends/php/scripts.php
+++ b/frontends/php/scripts.php
@@ -41,31 +41,28 @@ $fields = array(
 	'command' =>			array(T_ZBX_STR, O_OPT, null,			null,		'isset({save})'),
 	'commandipmi' =>		array(T_ZBX_STR, O_OPT, null,			null,		'isset({save})'),
 	'description' =>		array(T_ZBX_STR, O_OPT, null,			null,		'isset({save})'),
-	'access' =>				array(T_ZBX_INT, O_OPT, null,			IN('0,1,2,3'), 'isset({save})'),
+	'host_access' =>		array(T_ZBX_INT, O_OPT, null,			IN('0,1,2,3'), 'isset({save})'),
 	'groupid' =>			array(T_ZBX_INT, O_OPT, null,			DB_ID,		'isset({save})&&{hgstype}!=0'),
 	'usrgrpid' =>			array(T_ZBX_INT, O_OPT, P_SYS,			DB_ID,		'isset({save})'),
 	'hgstype' =>			array(T_ZBX_INT, O_OPT, null,			null,		null),
 	'confirmation' =>		array(T_ZBX_STR, O_OPT, null,			null,		null),
 	'enableConfirmation' =>	array(T_ZBX_STR, O_OPT, null,			null,		null),
 	// actions
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		null),
-	'action' =>				array(T_ZBX_INT, O_OPT, P_ACT,			IN('0,1'),	null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	IN('"script.massdelete"'),		null),
 	'save' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		null),
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_ACT,			null,		null),
-	'clone' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,		null),
 	'form' =>				array(T_ZBX_STR, O_OPT, null,			null,		null),
-	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,			null,		null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,			null,		null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"command","name"'),						null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
 
-$_REQUEST['go'] = get_request('go', 'none');
-
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
-
 /*
  * Permissions
  */
-if ($scriptId = get_request('scriptid')) {
+if ($scriptId = getRequest('scriptid')) {
 	$scripts = API::Script()->get(array(
 		'scriptids' => $scriptId,
 		'output' => array('scriptid')
@@ -78,13 +75,9 @@ if ($scriptId = get_request('scriptid')) {
 /*
  * Actions
  */
-if (isset($_REQUEST['clone']) && isset($_REQUEST['scriptid'])) {
-	unset($_REQUEST['scriptid']);
-	$_REQUEST['form'] = 'clone';
-}
-elseif (isset($_REQUEST['save'])) {
-	$confirmation = get_request('confirmation', '');
-	$enableConfirmation = get_request('enableConfirmation', false);
+if (isset($_REQUEST['save'])) {
+	$confirmation = getRequest('confirmation', '');
+	$enableConfirmation = getRequest('enableConfirmation', false);
 	$command = ($_REQUEST['type'] == ZBX_SCRIPT_TYPE_IPMI) ? $_REQUEST['commandipmi'] : $_REQUEST['command'];
 
 	if (empty($_REQUEST['hgstype'])) {
@@ -108,8 +101,8 @@ elseif (isset($_REQUEST['save'])) {
 			'description' => $_REQUEST['description'],
 			'usrgrpid' => $_REQUEST['usrgrpid'],
 			'groupid' => $_REQUEST['groupid'],
-			'host_access' => $_REQUEST['access'],
-			'confirmation' => get_request('confirmation', '')
+			'host_access' => getRequest('host_access'),
+			'confirmation' => getRequest('confirmation', '')
 		);
 
 		DBstart();
@@ -134,16 +127,19 @@ elseif (isset($_REQUEST['save'])) {
 
 		if ($result) {
 			add_audit($auditAction, AUDIT_RESOURCE_SCRIPT, ' Name ['.$_REQUEST['name'].'] id ['.$scriptId.']');
-			unset($_REQUEST['action'], $_REQUEST['form'], $_REQUEST['scriptid']);
+			unset($_REQUEST['form'], $_REQUEST['scriptid']);
 		}
 
 		$result = DBend($result);
+
+		if ($result) {
+			uncheckTableRows();
+		}
 		show_messages($result, $messageSuccess, $messageFailed);
-		clearCookies($result);
 	}
 }
-elseif (isset($_REQUEST['delete'])) {
-	$scriptId = get_request('scriptid', 0);
+elseif (hasRequest('delete') && hasRequest('scriptid')) {
+	$scriptId = getRequest('scriptid');
 
 	DBstart();
 
@@ -155,11 +151,14 @@ elseif (isset($_REQUEST['delete'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('Script deleted'), _('Cannot delete script'));
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['scripts'])) {
-	$scriptIds = $_REQUEST['scripts'];
+elseif (hasRequest('action') && getRequest('action') == 'script.massdelete' && hasRequest('scripts')) {
+	$scriptIds = getRequest('scripts');
 
 	DBstart();
 
@@ -173,8 +172,11 @@ elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['scripts'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('Script deleted'), _('Cannot delete script'));
-	clearCookies($result);
 }
 
 /*
@@ -182,24 +184,24 @@ elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['scripts'])) {
  */
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'form' => get_request('form', 1),
-		'form_refresh' => get_request('form_refresh', 0),
-		'scriptid' => get_request('scriptid')
+		'form' => getRequest('form', 1),
+		'form_refresh' => getRequest('form_refresh', 0),
+		'scriptid' => getRequest('scriptid')
 	);
 
 	if (!$data['scriptid'] || isset($_REQUEST['form_refresh'])) {
-		$data['name'] = get_request('name', '');
-		$data['type'] = get_request('type', ZBX_SCRIPT_TYPE_CUSTOM_SCRIPT);
-		$data['execute_on'] = get_request('execute_on', ZBX_SCRIPT_EXECUTE_ON_SERVER);
-		$data['command'] = get_request('command', '');
-		$data['commandipmi'] = get_request('commandipmi', '');
-		$data['description'] = get_request('description', '');
-		$data['usrgrpid'] = get_request('usrgrpid', 0);
-		$data['groupid'] = get_request('groupid', 0);
-		$data['access'] = get_request('host_access', 0);
-		$data['confirmation'] = get_request('confirmation', '');
-		$data['enableConfirmation'] = get_request('enableConfirmation', false);
-		$data['hgstype'] = get_request('hgstype', 0);
+		$data['name'] = getRequest('name', '');
+		$data['type'] = getRequest('type', ZBX_SCRIPT_TYPE_CUSTOM_SCRIPT);
+		$data['execute_on'] = getRequest('execute_on', ZBX_SCRIPT_EXECUTE_ON_SERVER);
+		$data['command'] = getRequest('command', '');
+		$data['commandipmi'] = getRequest('commandipmi', '');
+		$data['description'] = getRequest('description', '');
+		$data['usrgrpid'] = getRequest('usrgrpid', 0);
+		$data['groupid'] = getRequest('groupid', 0);
+		$data['host_access'] = getRequest('host_access', 0);
+		$data['confirmation'] = getRequest('confirmation', '');
+		$data['enableConfirmation'] = getRequest('enableConfirmation', false);
+		$data['hgstype'] = getRequest('hgstype', 0);
 	}
 	elseif ($data['scriptid']) {
 		$script = API::Script()->get(array(
@@ -215,29 +217,13 @@ if (isset($_REQUEST['form'])) {
 		$data['description'] = $script['description'];
 		$data['usrgrpid'] = $script['usrgrpid'];
 		$data['groupid'] = $script['groupid'];
-		$data['access'] = $script['host_access'];
+		$data['host_access'] = $script['host_access'];
 		$data['confirmation'] = $script['confirmation'];
 		$data['enableConfirmation'] = !zbx_empty($script['confirmation']);
 		$data['hgstype'] = empty($data['groupid']) ? 0 : 1;
 	}
 
-	$scriptView = new CView('administration.script.edit');
-
-	$scriptView->set('form', $data['form']);
-	$scriptView->set('form_refresh', $data['form_refresh']);
-	$scriptView->set('scriptid', $data['scriptid']);
-	$scriptView->set('name', $data['name']);
-	$scriptView->set('type', $data['type']);
-	$scriptView->set('execute_on', $data['execute_on']);
-	$scriptView->set('command', $data['command']);
-	$scriptView->set('commandipmi', $data['commandipmi']);
-	$scriptView->set('description', $data['description']);
-	$scriptView->set('usrgrpid', $data['usrgrpid']);
-	$scriptView->set('groupid', $data['groupid']);
-	$scriptView->set('access', $data['access']);
-	$scriptView->set('confirmation', $data['confirmation']);
-	$scriptView->set('enableConfirmation', $data['enableConfirmation']);
-	$scriptView->set('hgstype', $data['hgstype']);
+	$scriptView = new CView('administration.script.edit', $data);
 
 	// get host gruop
 	$hostGroup = null;
@@ -267,7 +253,16 @@ if (isset($_REQUEST['form'])) {
 	$scriptView->show();
 }
 else {
-	$data = array();
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
+	$data = array(
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
+	);
 
 	// list of scripts
 	$data['scripts'] = API::Script()->get(array(
@@ -301,8 +296,8 @@ else {
 	}
 
 	// sorting & paging
-	order_result($data['scripts'], getPageSortField('name'), getPageSortOrder());
-	$data['paging'] = getPagingLine($data['scripts'], array('scriptid'));
+	order_result($data['scripts'], $sortField, $sortOrder);
+	$data['paging'] = getPagingLine($data['scripts']);
 
 	// render view
 	$scriptView = new CView('administration.script.list', $data);
diff --git a/frontends/php/search.php b/frontends/php/search.php
index 2fc6d04fd78..82b301d1d1a 100644
--- a/frontends/php/search.php
+++ b/frontends/php/search.php
@@ -63,7 +63,7 @@ $rows_per_page = CWebUser::$data['rows_per_page'];
 
 $searchWidget = new CWidget('search_wdgt');
 
-$search = get_request('search', '');
+$search = getRequest('search', '');
 
 // Header
 if (zbx_empty($search)) {
@@ -203,7 +203,7 @@ foreach ($hosts as $hnum => $host) {
 	}
 
 	// display the host name only if it matches the search string and is different from the visible name
-	if ($host['host'] !== $host['name'] && zbx_stripos($host['host'], $search) !== false) {
+	if ($host['host'] !== $host['name'] && stripos($host['host'], $search) !== false) {
 		$hostCell[] = BR();
 		$hostCell[] = '(';
 		$hostCell[] = make_decoration($host['host'], $search);
@@ -217,7 +217,7 @@ foreach ($hosts as $hnum => $host) {
 		$hostCell,
 		$hostip,
 		$hostdns,
-		new CLink(_('Latest data'), 'latest.php?'.$link),
+		new CLink(_('Latest data'), 'latest.php?filter_set=1&groupids[]='.$group['groupid'].'&hostids[]='.$hostid),
 		new CLink(_('Triggers'), 'tr_status.php?'.$link),
 		new CLink(_('Events'), 'events.php?source='.EVENT_SOURCE_TRIGGERS.'&'.$link),
 		new CLink(_('Graphs'), 'charts.php?'.$link),
@@ -232,9 +232,9 @@ foreach ($hosts as $hnum => $host) {
 	));
 }
 
-$searchHostWidget = new CUIWidget('search_hosts', $table);
+$searchHostWidget = new CCollapsibleUiWidget('search_hosts', $table);
 $searchHostWidget->open = (bool) CProfile::get('web.search.hats.search_hosts.state', true);
-$searchHostWidget->setHeader(_('Hosts'), SPACE);
+$searchHostWidget->setHeader(_('Hosts'));
 $searchHostWidget->setFooter(_s('Displaying %1$s of %2$s found', $viewCount, $overalCount));
 
 $searchWidget->addItem(new CDiv($searchHostWidget));
@@ -324,7 +324,7 @@ foreach ($hostGroups as $hnum => $group) {
 
 	$table->addRow(array(
 		$hgroup_link,
-		new CLink(_('Latest data'), 'latest.php?'.$link),
+		new CLink(_('Latest data'), 'latest.php?filter_set=1&groupids[]='.$hostgroupid),
 		new CLink(_('Triggers'), 'tr_status.php?'.$link),
 		new CLink(_('Events'), 'events.php?source='.EVENT_SOURCE_TRIGGERS.'&'.$link),
 		new CLink(_('Graphs'), 'charts.php?'.$link),
@@ -334,9 +334,9 @@ foreach ($hostGroups as $hnum => $group) {
 	));
 }
 
-$searchHostGroupWidget = new CUIWidget('search_hostgroup', $table);
+$searchHostGroupWidget = new CCollapsibleUiWidget('search_hostgroup', $table);
 $searchHostGroupWidget->open = (bool) CProfile::get('web.search.hats.search_hostgroup.state', true);
-$searchHostGroupWidget->setHeader(_('Host groups'), SPACE);
+$searchHostGroupWidget->setHeader(_('Host groups'));
 $searchHostGroupWidget->setFooter(_s('Displaying %1$s of %2$s found', $viewCount, $overalCount));
 
 $searchWidget->addItem(new CDiv($searchHostGroupWidget));
@@ -461,7 +461,7 @@ if ($admin) {
 		}
 
 		// display the template host name only if it matches the search string and is different from the visible name
-		if ($template['host'] !== $template['name'] && zbx_stripos($template['host'], $search) !== false) {
+		if ($template['host'] !== $template['name'] && stripos($template['host'], $search) !== false) {
 			$templateCell[] = BR();
 			$templateCell[] = '(';
 			$templateCell[] = make_decoration($template['host'], $search);
@@ -480,9 +480,9 @@ if ($admin) {
 		));
 	}
 
-	$searchTemplateWidget = new CUIWidget('search_templates', $table);
+	$searchTemplateWidget = new CCollapsibleUiWidget('search_templates', $table);
 	$searchTemplateWidget->open = (bool) CProfile::get('web.search.hats.search_templates.state', true);
-	$searchTemplateWidget->setHeader(_('Templates'), SPACE);
+	$searchTemplateWidget->setHeader(_('Templates'));
 	$searchTemplateWidget->setFooter(_s('Displaying %1$s of %2$s found', $viewCount, $overalCount));
 
 	$searchWidget->addItem(new CDiv($searchTemplateWidget));
diff --git a/frontends/php/services.php b/frontends/php/services.php
index 435586465bc..20042c62e64 100644
--- a/frontends/php/services.php
+++ b/frontends/php/services.php
@@ -118,14 +118,14 @@ if (isset($_REQUEST['delete']) && isset($_REQUEST['serviceid'])) {
 }
 
 if (isset($_REQUEST['form'])) {
-	$_REQUEST['showsla'] = get_request('showsla', 0);
+	$_REQUEST['showsla'] = getRequest('showsla', 0);
 	$result = false;
 
 	// save
 	if (isset($_REQUEST['save_service'])) {
 		DBstart();
 
-		$children = get_request('children', array());
+		$children = getRequest('children', array());
 		$dependencies = array();
 		foreach ($children as $child) {
 			$dependencies[] = array(
@@ -135,14 +135,14 @@ if (isset($_REQUEST['form'])) {
 		}
 
 		$serviceRequest = array(
-			'name' => get_request('name'),
-			'triggerid' => get_request('triggerid'),
-			'algorithm' => get_request('algorithm'),
-			'showsla' => get_request('showsla', 0),
-			'goodsla' => get_request('goodsla'),
-			'sortorder' => get_request('sortorder'),
-			'times' => get_request('times', array()),
-			'parentid' => get_request('parentid'),
+			'name' => getRequest('name'),
+			'triggerid' => getRequest('triggerid'),
+			'algorithm' => getRequest('algorithm'),
+			'showsla' => getRequest('showsla', 0),
+			'goodsla' => getRequest('goodsla'),
+			'sortorder' => getRequest('sortorder'),
+			'times' => getRequest('times', array()),
+			'parentid' => getRequest('parentid'),
 			'dependencies' => $dependencies
 		);
 
@@ -174,7 +174,7 @@ if (isset($_REQUEST['form'])) {
 	}
 	// validate and get service times
 	elseif (isset($_REQUEST['add_service_time']) && isset($_REQUEST['new_service_time'])) {
-		$_REQUEST['times'] = get_request('times', array());
+		$_REQUEST['times'] = getRequest('times', array());
 		$new_service_time['type'] = $_REQUEST['new_service_time']['type'];
 		$result = true;
 		if ($_REQUEST['new_service_time']['type'] == SERVICE_TIME_TYPE_ONETIME_DOWNTIME) {
@@ -350,12 +350,12 @@ elseif (isset($_REQUEST['cservices'])) {
  */
 elseif (isset($_REQUEST['form'])) {
 	$data = array();
-	$data['form'] = get_request('form');
-	$data['form_refresh'] = get_request('form_refresh', 0);
+	$data['form'] = getRequest('form');
+	$data['form_refresh'] = getRequest('form_refresh', 0);
 	$data['service'] = !empty($service) ? $service : null;
 
-	$data['times'] = get_request('times', array());
-	$data['new_service_time'] = get_request('new_service_time', array('type' => SERVICE_TIME_TYPE_UPTIME));
+	$data['times'] = getRequest('times', array());
+	$data['new_service_time'] = getRequest('new_service_time', array('type' => SERVICE_TIME_TYPE_UPTIME));
 
 	// populate the form from the object from the database
 	if (isset($data['service']['serviceid']) && !isset($_REQUEST['form_refresh'])) {
@@ -406,15 +406,15 @@ elseif (isset($_REQUEST['form'])) {
 	}
 	// populate the form from a submitted request
 	else {
-		$data['name'] = get_request('name', '');
-		$data['algorithm'] = get_request('algorithm', SERVICE_ALGORITHM_MAX);
-		$data['showsla'] = get_request('showsla', 0);
-		$data['goodsla'] = get_request('goodsla', SERVICE_SLA);
-		$data['sortorder'] = get_request('sortorder', 0);
-		$data['triggerid'] = get_request('triggerid', 0);
-		$data['parentid'] = get_request('parentid', 0);
-		$data['parentname'] = get_request('parentname', '');
-		$data['children'] = get_request('children', array());
+		$data['name'] = getRequest('name', '');
+		$data['algorithm'] = getRequest('algorithm', SERVICE_ALGORITHM_MAX);
+		$data['showsla'] = getRequest('showsla', 0);
+		$data['goodsla'] = getRequest('goodsla', SERVICE_SLA);
+		$data['sortorder'] = getRequest('sortorder', 0);
+		$data['triggerid'] = getRequest('triggerid', 0);
+		$data['parentid'] = getRequest('parentid', 0);
+		$data['parentname'] = getRequest('parentname', '');
+		$data['children'] = getRequest('children', array());
 	}
 
 	// get trigger
diff --git a/frontends/php/setup.php b/frontends/php/setup.php
index f3c4bf67de3..c38d2020e8a 100644
--- a/frontends/php/setup.php
+++ b/frontends/php/setup.php
@@ -34,8 +34,6 @@ catch (Exception $e) {
 	exit;
 }
 
-require_once dirname(__FILE__).'/include/setup.inc.php';
-
 // VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
 $fields = array(
 	'type' =>				array(T_ZBX_STR, O_OPT, null,	IN('"'.ZBX_DB_MYSQL.'","'.ZBX_DB_POSTGRESQL.'","'.ZBX_DB_ORACLE.'","'.ZBX_DB_DB2.'","'.ZBX_DB_SQLITE3.'"'), null),
@@ -61,8 +59,7 @@ $fields = array(
 );
 
 // config
-$ZBX_CONFIG = get_cookie('ZBX_CONFIG', null);
-$ZBX_CONFIG = isset($ZBX_CONFIG) ? unserialize($ZBX_CONFIG) : array();
+$ZBX_CONFIG = ZBase::getInstance()->getSession();
 $ZBX_CONFIG['check_fields_result'] = check_fields($fields, false);
 if (!isset($ZBX_CONFIG['step'])) {
 	$ZBX_CONFIG['step'] = 0;
@@ -73,7 +70,7 @@ if (CWebUser::$data && CWebUser::getType() < USER_TYPE_SUPER_ADMIN) {
 	// on the last step of the setup we always have a guest user logged in;
 	// when he presses the "Finish" button he must be redirected to the login screen
 	if (CWebUser::isGuest() && $ZBX_CONFIG['step'] == 5 && hasRequest('finish')) {
-		zbx_unsetcookie('ZBX_CONFIG');
+		$ZBX_CONFIG->clear();
 		redirect('index.php');
 	}
 	// the guest user can also view the last step of the setup
@@ -84,7 +81,7 @@ if (CWebUser::$data && CWebUser::getType() < USER_TYPE_SUPER_ADMIN) {
 }
 // if a super admin or a non-logged in user presses the "Finish" or "Login" button - redirect him to the login screen
 elseif (hasRequest('cancel') || hasRequest('finish')) {
-	zbx_unsetcookie('ZBX_CONFIG');
+	$ZBX_CONFIG->clear();
 	redirect('index.php');
 }
 
@@ -93,8 +90,6 @@ elseif (hasRequest('cancel') || hasRequest('finish')) {
  */
 $ZBX_SETUP_WIZARD = new CSetupWizard($ZBX_CONFIG);
 
-zbx_setcookie('ZBX_CONFIG', serialize($ZBX_CONFIG));
-
 // page title
 $pageTitle = '';
 if (isset($ZBX_SERVER_NAME) && !zbx_empty($ZBX_SERVER_NAME)) {
diff --git a/frontends/php/slideconf.php b/frontends/php/slideconf.php
index bdec7a1dfbf..ebc21837f5e 100644
--- a/frontends/php/slideconf.php
+++ b/frontends/php/slideconf.php
@@ -37,16 +37,18 @@ $fields = array(
 	'delay' => array(T_ZBX_INT, O_OPT, null, BETWEEN(1, SEC_PER_DAY), 'isset({save})',_('Default delay (in seconds)')),
 	'slides' =>			array(null,		 O_OPT, null,		null,	null),
 	// actions
-	'go' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, IN('"slideshow.massdelete"'),	null),
 	'clone' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'save' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'delete' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel' =>			array(T_ZBX_STR, O_OPT, P_SYS,		null,	null),
 	'form' =>			array(T_ZBX_STR, O_OPT, P_SYS,		null,	null),
-	'form_refresh' =>	array(T_ZBX_INT, O_OPT, null,		null,	null)
+	'form_refresh' =>	array(T_ZBX_INT, O_OPT, null,		null,	null),
+	// sort and sortorder
+	'sort' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"cnt","delay","name"'),					null),
+	'sortorder' =>		array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
 if (!empty($_REQUEST['slides'])) {
 	natksort($_REQUEST['slides']);
@@ -60,29 +62,27 @@ if (isset($_REQUEST['slideshowid'])) {
 		access_deny();
 	}
 
-	$dbSlideshow = get_slideshow_by_slideshowid(get_request('slideshowid'));
+	$dbSlideshow = get_slideshow_by_slideshowid(getRequest('slideshowid'));
 
 	if (!$dbSlideshow) {
 		access_deny();
 	}
 }
-if (isset($_REQUEST['go'])) {
-	if (!isset($_REQUEST['shows']) || !is_array($_REQUEST['shows'])) {
+if (hasRequest('action')) {
+	if (!hasRequest('shows') || !is_array(getRequest('shows'))) {
 		access_deny();
 	}
 	else {
 		$dbSlideshowCount = DBfetch(DBselect(
-			'SELECT COUNT(*) AS cnt FROM slideshows s WHERE '.dbConditionInt('s.slideshowid', $_REQUEST['shows'])
+			'SELECT COUNT(*) AS cnt FROM slideshows s WHERE '.dbConditionInt('s.slideshowid', getRequest('shows'))
 		));
 
-		if ($dbSlideshowCount['cnt'] != count($_REQUEST['shows'])) {
+		if ($dbSlideshowCount['cnt'] != count(getRequest('shows'))) {
 			access_deny();
 		}
 	}
 }
 
-$_REQUEST['go'] = get_request('go', 'none');
-
 /*
  * Actions
  */
@@ -94,14 +94,14 @@ elseif (isset($_REQUEST['save'])) {
 	DBstart();
 
 	if (isset($_REQUEST['slideshowid'])) {
-		$result = update_slideshow($_REQUEST['slideshowid'], $_REQUEST['name'], $_REQUEST['delay'], get_request('slides', array()));
+		$result = update_slideshow($_REQUEST['slideshowid'], $_REQUEST['name'], $_REQUEST['delay'], getRequest('slides', array()));
 
 		$messageSuccess = _('Slide show updated');
 		$messageFailed = _('Cannot update slide show');
 		$auditAction = AUDIT_ACTION_UPDATE;
 	}
 	else {
-		$result = add_slideshow($_REQUEST['name'], $_REQUEST['delay'], get_request('slides', array()));
+		$result = add_slideshow($_REQUEST['name'], $_REQUEST['delay'], getRequest('slides', array()));
 
 		$messageSuccess = _('Slide show added');
 		$messageFailed = _('Cannot add slide show');
@@ -114,8 +114,11 @@ elseif (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
 elseif (isset($_REQUEST['delete']) && isset($_REQUEST['slideshowid'])) {
 	DBstart();
@@ -128,30 +131,32 @@ elseif (isset($_REQUEST['delete']) && isset($_REQUEST['slideshowid'])) {
 	unset($_REQUEST['slideshowid'], $_REQUEST['form']);
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('Slide show deleted'), _('Cannot delete slide show'));
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete') {
-	$goResult = true;
+elseif (hasRequest('action') && getRequest('action') == 'slideshow.massdelete' && hasRequest('shows')) {
+	$result = true;
 
-	$shows = get_request('shows', array());
+	$shows = getRequest('shows');
 	DBstart();
 
 	foreach ($shows as $showid) {
-		$goResult &= delete_slideshow($showid);
-		if (!$goResult) {
+		$result &= delete_slideshow($showid);
+		if (!$result) {
 			break;
 		}
 	}
 
-	$goResult = DBend($goResult);
+	$result = DBend($result);
 
-	if ($goResult) {
+	if ($result) {
 		unset($_REQUEST['form']);
+		uncheckTableRows();
 	}
-
-	show_messages($goResult, _('Slide show deleted'), _('Cannot delete slide show'));
-	clearCookies($goResult);
+	show_messages($result, _('Slide show deleted'), _('Cannot delete slide show'));
 }
 
 /*
@@ -159,12 +164,12 @@ elseif ($_REQUEST['go'] == 'delete') {
  */
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'form' => get_request('form', null),
-		'form_refresh' => get_request('form_refresh', null),
-		'slideshowid' => get_request('slideshowid', null),
-		'name' => get_request('name', ''),
-		'delay' => get_request('delay', ZBX_ITEM_DELAY_DEFAULT),
-		'slides' => get_request('slides', array())
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh', 0),
+		'slideshowid' => getRequest('slideshowid'),
+		'name' => getRequest('name', ''),
+		'delay' => getRequest('delay', ZBX_ITEM_DELAY_DEFAULT),
+		'slides' => getRequest('slides', array())
 	);
 
 	if (isset($data['slideshowid']) && !isset($_REQUEST['form_refresh'])) {
@@ -172,21 +177,20 @@ if (isset($_REQUEST['form'])) {
 		$data['delay'] = $dbSlideshow['delay'];
 
 		// get slides
-		$db_slides = DBselect('SELECT s.* FROM slides s WHERE s.slideshowid='.zbx_dbstr($data['slideshowid']).' ORDER BY s.step');
-		while ($slide = DBfetch($db_slides)) {
-			$data['slides'][$slide['step']] = array(
-				'slideid' => $slide['slideid'],
-				'screenid' => $slide['screenid'],
-				'delay' => $slide['delay']
-			);
-		}
+		$data['slides'] = DBfetchArray(DBselect(
+				'SELECT s.slideid, s.screenid, s.delay'.
+				' FROM slides s'.
+				' WHERE s.slideshowid='.zbx_dbstr($data['slideshowid']).
+				' ORDER BY s.step'
+		));
 	}
 
 	// get slides without delay
 	$data['slides_without_delay'] = $data['slides'];
-	for ($i = 0, $size = count($data['slides_without_delay']); $i < $size; $i++) {
-		unset($data['slides_without_delay'][$i]['delay']);
+	foreach ($data['slides_without_delay'] as &$slide) {
+		unset($slide['delay']);
 	}
+	unset($slide);
 
 	// render view
 	$slideshowView = new CView('configuration.slideconf.edit', $data);
@@ -194,6 +198,17 @@ if (isset($_REQUEST['form'])) {
 	$slideshowView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
+	$data = array(
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
+	);
+
 	$data['slides'] = DBfetchArray(DBselect(
 			'SELECT s.slideshowid,s.name,s.delay,COUNT(sl.slideshowid) AS cnt'.
 			' FROM slideshows s'.
@@ -207,9 +222,9 @@ else {
 		}
 	}
 
-	order_result($data['slides'], getPageSortField('name'), getPageSortOrder());
+	order_result($data['slides'], $sortField, $sortOrder);
 
-	$data['paging'] = getPagingLine($data['slides'], array('slideshowid'));
+	$data['paging'] = getPagingLine($data['slides']);
 
 	// render view
 	$slideshowView = new CView('configuration.slideconf.list', $data);
diff --git a/frontends/php/slides.php b/frontends/php/slides.php
index 5778b35d2a3..26f5cdf6fa4 100644
--- a/frontends/php/slides.php
+++ b/frontends/php/slides.php
@@ -42,15 +42,15 @@ $fields = array(
 	'step' =>			array(T_ZBX_INT, O_OPT, P_SYS,	BETWEEN(0, 65535), null),
 	'period' =>			array(T_ZBX_INT, O_OPT, P_SYS,	null,	null),
 	'stime' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,	null),
-	'reset' =>			array(T_ZBX_STR, O_OPT, P_SYS,	IN("'reset'"), null),
+	'reset' =>			array(T_ZBX_STR, O_OPT, P_SYS,	IN('"reset"'), null),
 	'fullscreen' =>		array(T_ZBX_INT, O_OPT, P_SYS,	IN('0,1'), null),
 	// ajax
-	'widgetRefresh' =>	array(T_ZBX_STR, O_OPT, P_ACT,	null,	null),
+	'widgetRefresh' =>	array(T_ZBX_STR, O_OPT, null,	null,	null),
 	'widgetRefreshRate' => array(T_ZBX_STR, O_OPT, P_ACT, null,	null),
 	'filterState' =>	array(T_ZBX_INT, O_OPT, P_ACT, null,	null),
 	'favobj' =>			array(T_ZBX_STR, O_OPT, P_ACT,	null,	null),
 	'favid' =>			array(T_ZBX_INT, O_OPT, P_ACT,	null,	null),
-	'favaction' =>		array(T_ZBX_STR, O_OPT, P_ACT,	IN("'add','remove'"), null),
+	'favaction' =>		array(T_ZBX_STR, O_OPT, P_ACT,	IN('"add","remove"'), null),
 	'upd_counter' =>	array(T_ZBX_INT, O_OPT, P_ACT,	null,	null)
 );
 check_fields($fields);
@@ -60,8 +60,8 @@ check_fields($fields);
  */
 $dbSlideshow = null;
 
-if (hasRequest('groupid') && !API::HostGroup()->isReadable(array(getRequest('groupid')))
-		|| hasRequest('hostid') && !API::Host()->isReadable(array(getRequest('hostid')))) {
+if (getRequest('groupid') && !API::HostGroup()->isReadable(array(getRequest('groupid')))
+		|| getRequest('hostid') && !API::Host()->isReadable(array(getRequest('hostid')))) {
 	access_deny();
 }
 if (hasRequest('elementid')) {
@@ -100,6 +100,7 @@ if ((hasRequest('widgetRefresh') || hasRequest('widgetRefreshRate')) && $dbSlide
 				'mode' => SCREEN_MODE_PREVIEW,
 				'profileIdx' => 'web.slides',
 				'profileIdx2' => $elementId,
+				'hostid' => getRequest('hostid'),
 				'period' => getRequest('period'),
 				'stime' => getRequest('stime')
 			));
@@ -221,11 +222,14 @@ if ($data['screen']) {
 			'hosts' => array(
 				'monitored_hosts' => true,
 				'with_items' => true,
-				'DDFirstLabel' => _('Default')
+				'DDFirstLabel' => _('not selected')
 			),
 			'hostid' => getRequest('hostid'),
 			'groupid' => getRequest('groupid')
 		));
+
+		$data['groupid'] = $data['pageFilter']->groupid;
+		$data['hostid'] = $data['pageFilter']->hostid;
 	}
 
 	// get element
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php
index 574d3a9557a..fd9e8cc8a00 100644
--- a/frontends/php/srv_status.php
+++ b/frontends/php/srv_status.php
@@ -69,7 +69,7 @@ if (isset($_REQUEST['serviceid']) && isset($_REQUEST['showgraph'])) {
 	}
 }
 else {
-	$period = get_request('period', 7 * 24);
+	$period = getRequest('period', 7 * 24);
 	$period_end = time();
 
 	switch ($period) {
diff --git a/frontends/php/styles/color.css b/frontends/php/styles/color.css
index 3d2ec2cfaed..88ce6a4cc55 100644
--- a/frontends/php/styles/color.css
+++ b/frontends/php/styles/color.css
@@ -77,11 +77,11 @@ table.tableinfo tr.vertical_header td { background-color: #CED7DF; }
 table.tableinfo tr.vertical_header td.hover_grey:hover { color: #EEEEEE; background-color: #999999; }
 table.tableinfo tr.footer td { color: #FFFFFF; background: #5c9ccc url(themes/originalblue/images/bg_h-hard_55.png) 50% 50% repeat-x; }
 table.tableinfo tr.odd_row > td { background-color: #E1E7EC; }
-table.tableinfo tr.odd_row:hover > td { background-color: #BBCCFF; }
 table.tableinfo tr.even_row > td { background-color: #F2F7FA; }
-table.tableinfo tr.even_row:hover > td { background-color: #BBCCFF; }
+table.tableinfo tr.odd_row:hover > td, table.tableinfo tr.even_row:hover > td {
+	background-color: #BBCCFF;
+}
 table.tableinfo tr.selected > td { background-color: #FFFFBB; }
-table.tableinfo tr.selected:hover > td { background-color: #BBCCFF; }
 table.tableinfo tr > td.active { background-color: #AADDAA; border: 1px #AADDAA solid; color: #222222; }
 table.tableinfo tr:hover > td.active,
 table.tableinfo tr.even_row > td.active, table.tableinfo tr.odd_row > td.active { background-color: #AAD9AA; border: 1px #AAD9AA solid; }
diff --git a/frontends/php/styles/default.css b/frontends/php/styles/default.css
index 08896cd3185..603b97f4052 100644
--- a/frontends/php/styles/default.css
+++ b/frontends/php/styles/default.css
@@ -37,6 +37,8 @@ ul li.linear { float: left; list-style-type: none; margin-right: 2px; }
 
 .hidden { display: none; }
 .pre { white-space: pre; }
+.pre-wrap { white-space: pre-wrap; }
+.break-lines { word-break: break-all; }
 .placeholder { color: #aaa; }
 .maxwidth { width: 100%; }
 .paddingless { padding: 0; }
@@ -147,7 +149,7 @@ form { margin: 0; }
 .input:focus { border-color: #6e8ab4; }
 .input:hover { border-color: #6e8ab4; }
 .input[readonly] { border-color: #D0D0D0; background-color: #EEEEEE; }
-.input[disabled] { color: #ACA899; cursor: default; }
+.input[disabled] { border-color: #d0d0d0; background-color: #eee; color: #aca899; cursor: default; }
 .input[disabled]:focus { text-decoration: none; border-color: #ACA899; }
 .input[disabled]:hover { text-decoration: none; border-color: #ACA899; }
 .input option { color: #000000; }
@@ -161,10 +163,10 @@ input[type="button"],
 input[type="submit"],
 input[type="reset"],
 input[type="file"] { height: auto; }
-input[type="button"].formlist { vertical-align: top; margin-bottom: 1px; cursor: pointer; background: #ffffff; height: 20px; }
+input[type="button"].formlist { vertical-align: top; margin-bottom: 1px; cursor: pointer; background: #fff; height: 20px; }
 input[type="submit"].formlist { vertical-align: top; margin-bottom: 1px; cursor: pointer; height: 20px; }
 input[type="button"].input[disabled].formlist,
-input[type="submit"].input[disabled].formlist { cursor: default; }
+input[type="submit"].input[disabled].formlist { cursor: default; background: #fff; border-color: #aca899; }
 input.jqueryinput,
 .jqueryinputset input[type="button"],
 .jqueryinputset input[type="submit"] { height: auto; }
@@ -188,7 +190,7 @@ textarea.textarea_big { height: auto; }
 	text-decoration: none; padding: 1px 1px 0 1px; margin: 0; cursor: pointer;
 }
 .link_menu:hover { color: #6C80B9; border-bottom-color: #6C80B9; }
-.link_menu[disabled] { color: #DDD; cursor: default; border: 0; }
+.link_menu[disabled] { color: #ddd; cursor: default; border: 0; background-color: white; }
 .link_menu[disabled]:hover { border: 0; }
 
 /* transparent - must be after input! */
@@ -238,7 +240,7 @@ ul.favorites { padding-left: 5px; margin: 8px 4px 8px 0; }
 ul.favorites li { padding-left: 25px; margin: 9px 0; list-style: none; background: url("../images/general/chart.png") no-repeat left top; }
 ul.favorites li.empty { color: #999; background: none; }
 
-/* frondend messages */
+/* frontend messages */
 ul.messages { overflow: auto; vertical-align: top; background-color: #FFFFFF; margin: 1px; text-align: left; }
 ul.messages li { font-size: 1.1em; line-height: 18px; }
 ul.messages li.info { color: #000000; list-style: url("../images/general/warning2.png") inside; }
@@ -341,7 +343,7 @@ table.tableinfo tr.header td.hover_grey {
 	white-space: nowrap; word-spacing: 0; font-weight: bold; border-width: 0; cursor: pointer;
 }
 table.tableinfo tr.vertical_header td {
-	padding: 5px 0 5px 5px; margin: 0; white-space: nowrap; word-spacing: 0; font-weight: bold; width: 20px; text-align: center;
+	padding: 5px 0 5px 0px; margin: 0; white-space: nowrap; word-spacing: 0; font-weight: bold; width: 20px; text-align: center;
 }
 table.tableinfo tr.vertical_header td.left { text-align: left; }
 table.tableinfo tr.vertical_header td.hover_grey:hover { cursor: pointer; }
@@ -418,7 +420,7 @@ table.warningTable tr.header { height: 24px; color: #FFFFFF; font-weight: bold;
 table.warningTable tr.header td { padding: 0 2px 4px 10px; }
 table.warningTable tr.footer td { padding: 0; text-align: right; }
 table.warningTable tr.footer .buttons { margin: 0 10px 5px; padding-top: 5px; border-top: 1px dotted #1F1F1F; }
-table.warningTable tr.content { vertical-align: text-top; text-align: justify; font-size: 10px; }
+table.warningTable tr.content { vertical-align: text-top; font-size: 10px; }
 table.warningTable tr.content.center { text-align: center; }
 
 /* history */
@@ -448,20 +450,30 @@ table.requirements input#port { width: 50px; }
 table.requirements select { width: 152px; }
 
 /* filter */
-table.filter { width: 100%; border-collapse: collapse; text-align: center; }
-table.filter tr td { line-height: 20px; height: 26px; vertical-align: middle; border-left: 0 !important; padding: 0 2px 0 6px; }
-table.filter tr td.label { border-right: 0 !important; }
+table.filter { width: 100%; border-collapse: collapse; }
+table.filter tr td {
+	line-height: 20px; height: 26px; vertical-align: middle; border-left: 0 !important;
+	padding: 0 2px 0 6px;
+}
+table.filter tr td.label { border-right: 0 !important; text-align: right; }
 table.filter tr td.controls { text-align: center; }
 table.filter .text { height: 16px; }
 table.filter .filter-select-button { height: 20px; vertical-align: bottom; }
+table.filter .filter-multiselect-select-button { height: 20px; vertical-align: bottom; margin-left: 3px; }
 table.filter .select { -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; height: 18px; vertical-align: top; margin-bottom: 1px; }
 table.filter .host-inventories .select,
 table.filter .host-inventories .text { vertical-align: middle; }
 table.filter tr.item-list-row { height: 26px; }
+table.filter-center tr td { text-align: center; }
 
 table.filter.sub-filter tr td { text-align: left; }
 table.filter.sub-filter tr td:first-child { width: 8%; }
 
+/* old-style filter */
+.old-filter .form_row_l { text-align: right; }
+.old-filter #inventory-filter td { padding-left: 0; padding-right: 3px; }
+.old-filter .filter-button { height: 16px; }
+
 /* invisible */
 table.invisible { border: 0; margin: 0; padding: 0; }
 table.invisible tr > td { border: 0; margin: 0; padding: 0; }
@@ -509,11 +521,17 @@ table.suggest tr td { text-align: left; padding-left: 4px; line-height: 2.2em; f
 .flickerfreescreen .shadow { background-color: #000000; }
 
 /* multiselect */
-.multiselect { margin: 0 2px 0 0; width: 317px; position: relative; }
+.multiselect { margin: 0 2px 0 0; width: 317px; position: relative; float: left; }
 .multiselect input[type="text"] {
 	margin: 0 0 0 4px; padding: 2px 0 0 4px; top: 0; left: 0; min-height: 14px; position: absolute; z-index: 10;
 	background: none; border: none; outline: none;
 }
+
+/* IE10+ "clear field" X button removing */
+.multiselect input[type="text"]::-ms-clear {
+	display: none;
+}
+
 .multiselect .selected ul {
 	padding: 0 0 0 1px; margin: 0; min-height: 18px;
 	background: #ffffff; border: 1px solid #AAAAAA;
@@ -556,6 +574,9 @@ table.suggest tr td { text-align: left; padding-left: 4px; line-height: 2.2em; f
 .multiselect .available ul li.hover { background: #7A9FC1; color: #FFFFFF; }
 .multiselect .available ul li.hover .prefix { color: #F1F1F1; }
 
+.multiselect-wrapper { white-space: normal; text-align: left; }
+.multiselect-wrapper .select-popup { margin-left: 10px; }
+
 /* menu popup */
 .menuPopup {
 	width: 170px; border: 1px solid #7E9AB4; text-align: left; position: absolute; z-index: 1000; display: none; white-space: pre-wrap;
@@ -578,5 +599,8 @@ table.suggest tr td { text-align: left; padding-left: 4px; line-height: 2.2em; f
 .ui-widget-overlay { z-index: 1000; }
 .ui-dialog { z-index: 1001; opacity: 1; }
 
+/* trigger expression */
+.trigger-expression, table.tableinfo .trigger-expression { white-space: pre-wrap; }
+
 /* server name */
 .server-name { padding-right: 5px; }
diff --git a/frontends/php/styles/ie.css b/frontends/php/styles/ie.css
deleted file mode 100644
index 3a75d40da14..00000000000
--- a/frontends/php/styles/ie.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-** Zabbix
-** Copyright (C) 2001-2014 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-table.tableinfo tr.selected td { background-color: #FFFFBB; }
-table.tableinfo tr.selected:hover td { background-color: #BBCCFF; }
-table.tableinfo tr.odd_row td { background-color: #DDDDDD; }
-table.tableinfo tr.odd_row:hover td { background-color: #BBCCFF; }
-table.tableinfo tr.even_row td { background-color: #EEEEEE; }
-table.tableinfo tr.even_row:hover td{ background-color: #BBCCFF; }
-table.tableinfo tr td.center { vertical-align: middle; text-align: center; }
-table.tableinfo tr td.active { background-color: #AADDAA; border: 1px #AADDAA solid; }
-table.tableinfo tr:hover td.active { background-color: #AAD9AA; border: 1px #AAD9AA solid; }
-table.tableinfo tr td.inactive { background-color: #FF8888; border: 1px #FF8888 solid; }
-table.tableinfo tr:hover td.inactive { background-color: #FA8388; border: 1px #FA8388 solid; }
-
-.menu_icon { line-height: 15px; height: 15px; width: 15px; }
-ul.objectlist li { display: inline; }
-ul.formlist li div.dd { padding-left: 1%; margin-left: 0; }
-.link_menu { border: 0; text-decoration: underline; }
-.footer .dt input.main{ height: 25px; }
-.footer .dd { padding-left: 1%; }
-.inlineblock { *display: inline; }
-.radio { border: 0; }
-.formrow .listInfoLabel { padding: 8px 0; display: block; float: left; }
-.formrow .listInfoText { margin-left: 21%; }
-.listInfo { display: list-item; }
diff --git a/frontends/php/styles/pages.css b/frontends/php/styles/pages.css
index f38ca5af34c..50eabf81917 100644
--- a/frontends/php/styles/pages.css
+++ b/frontends/php/styles/pages.css
@@ -43,6 +43,8 @@
 .hostprototype-edit .interface-row .interface-port { width: 11em; }
 .host-edit .interface-row .interface-default,
 .hostprototype-edit .interface-row .interface-default { width: 4em; }
+.host-edit .interface-row .interface-bulk,
+.hostprototype-edit .interface-row .interface-bulk { height: 25px; margin-top: 5px; }
 .host-edit .interface-row-first .dd,
 .hostprototype-edit .interface-row-first .dd { padding-top: 2px; }
 .host-edit .interface-row-first .objectgroup,
@@ -50,8 +52,10 @@
 .host-edit .dropArea .interface-add-control,
 .hostprototype-edit .dropArea .interface-add-control { visibility: hidden; }
 .host-edit #groups { height: 140px; }
-.host-edit #linkedTemplateTable { min-width: 400px; }
+.host-edit #linkedTemplateTable { width: 100%; }
+.host-edit #newTemplateTable { width: 100%; }
 .host-edit.host-edit-discovered #linkedTemplateTable { min-width: 250px; }
+.template-link-block { min-width: 400px; }
 
 /* housekeeper elements */
 .hk .element-row { margin-top: -3px; border-top-width: 0; }
@@ -71,6 +75,8 @@
 .inventory-host .formlist .formrow .interfaces { min-width: 500px; }
 .inventory-host .formlist .formrow .description { padding-top: 2px; width: 550px; white-space: pre-wrap; }
 .inventory-host .formlist .formrow .text-field { width: 550px; white-space: pre-wrap; }
+.inventory-host .formlist .formrow .inventory-text-field { margin-top: 2px; height: 14px; }
+.inventory-host .formlist .formrow .inventory-text-field-wrap { clear: both; margin-top: 2px; display: block; width: 550px; }
 
 /* icon mapping */
 #iconMapTable .sortable { height: 30px; line-height: 30px; }
@@ -84,9 +90,12 @@
 	border-radius: 2px; -moz-border-radius: 2px; -webkit-border-radius: 2px;
 }
 
+table.tableinfo-overview-hint { width: 200px; }
+
 /* latest monitoring */
 .latest-mon .tableinfo { table-layout: fixed; }
 .latest-mon .tableinfo td:first-child { width: 15px; padding: 0; }
+.latest-mon .tableinfo td.latest-checkbox { width: 15px; }
 .latest-mon .tableinfo td.latest-host { width: 9%; }
 .latest-mon .tableinfo td.latest-interval { width: 5%; }
 .latest-mon .tableinfo td.latest-history { width: 5%; }
@@ -104,10 +113,14 @@
 .latest-mon .tableinfo td span,
 .latest-mon .tableinfo td a { float: left; max-width: 100%; }
 .latest-mon .tableinfo div.item { padding-left: 8px; }
+.latest-mon .filter tr td.label { width: 15%; }
+.latest-mon .filter tr td.inputcol { min-width: 277px; width: 35%; }
+.latest-mon .filter tr td.inputcol .checkbox { margin-top: 4px; }
+.latest-mon .filter tr td .text { width: 216px; }
+.latest-mon .filter .multiselect { width: 217px; line-height: 12px; }
 
-/* trigger monitoring */
-.trigger-mon #inventory-filter td { padding-left: 0; padding-right: 3px; }
-.trigger-mon .filter-button { height: 16px; }
+/*history */
+.history .filter tr td { width: 50%; }
 
 /* trigger list */
 .trigger-list .dependencies { padding-left: 8px; }
@@ -125,13 +138,13 @@
 
 /* item list */
 .item-list table.filter { text-align: left; min-width: 1024px; }
-.item-list table.filter tr td.label { text-align: right; }
 .item-list table.filter tr td.col1 { width: 230px; }
 .item-list table.filter tr td.label.col1 { width: 6%; }
 .item-list table.filter tr td.label.col4 { width: 8%; }
 .item-list .filter .col1 .text,
 .item-list .filter .multiselect { width: 165px; line-height: 12px; }
 .item-list .menuPopup { width: 200px; }
+.item-list .filter .multiselect .selected ul { margin: 0;}
 
 /* service list */
 .service-list .tableinfo .service-caption-soft a { color: #888; }
@@ -163,6 +176,8 @@
 #map-window #mapLinksContainer { border: 1px solid rgb(170, 170, 170); max-height: 128px; overflow-y: scroll; overflow-x: hidden; }
 #map-window #linkForm { display: none; }
 #map-window #linkForm #linklabel { margin-top: 4px; }
+#selementForm .multiselect .selected ul { margin: 0;}
+#map-window #application-select-row .link_menu { margin-left: 3px; }
 
 /* maintenance icon */
 .icon-maintenance-inline, .icon-maintenance-abs {
@@ -184,7 +199,7 @@
 div.trigger_displaying_form_col { width: 12em; zoom: 1; *display: inline; }
 
 /* triggers expression condition */
-.trigger-expression #expr_type { width: 605px; max-width: 605px; }
+.trigger-popup #expr_type { width: 605px; max-width: 605px; }
 
 /* acknowledge */
 .acknowledge-edit textarea { margin: 5px 0; vertical-align: inherit; }
@@ -268,3 +283,6 @@ div.setup_wizard div.footer div.footer_left { float: left; margin: 15px 0 0 10px
 div.setup_wizard div.footer div.footer_right { float: right; margin: 15px 29px 0; }
 div.setup_wizard .requirements .notice { color: #EE6000; border-color: #EE6000; }
 div.setup_wizard .requirements .fail { color: #DC0000; border-color: #DC0000; }
+
+/* httptest */
+.httptest-popup #retrieve_mode_2 { margin-left: 10px; }
diff --git a/frontends/php/styles/themes/classic/main.css b/frontends/php/styles/themes/classic/main.css
index 0a80146d4ac..f11ee5749a4 100644
--- a/frontends/php/styles/themes/classic/main.css
+++ b/frontends/php/styles/themes/classic/main.css
@@ -39,6 +39,7 @@ table.tableinfo tr.header td.hover_grey { background: #BBB; }
 table.tableinfo tr.header td.hover_grey:hover { background: #999; color: #EEE; }
 table.tableinfo tr.odd_row > td { background: #DDD; }
 table.tableinfo tr.even_row > td{ background: #EEE; }
+table.tableinfo tr.selected > td { background-color: #FFFFBB; }
 
 ul.favorites { margin: 0; padding: 4px 4px 4px 1em; border: 1px solid #AAAAAA; }
 
@@ -54,17 +55,16 @@ ul.favorites { margin: 0; padding: 4px 4px 4px 1em; border: 1px solid #AAAAAA; }
 }
 .footer.ui-widget-content { background: url("images/widget_header.gif") repeat-x scroll #4E6EA7; }
 .border_dotted { border-color: #777; }
-.link_menu[disabled] { color: #AAA; }
 
 .classic .ui-state-default, .classic .ui-widget-content .ui-state-default, .classic .ui-widget-header .ui-state-default {
 	background: #EEE; color: #383838;
 }
 
-.classic .filter .ui-state-default {
+.classic .filter .ui-state-default.button {
 	background: url("images/menu_not_active2.gif") repeat-x scroll left top #5473AA; color: #FFF;
 }
 
-.classic .filter .ui-state-hover {
+.classic .filter .ui-state-hover.button {
 	background: #5473AA
 }
 
@@ -145,3 +145,36 @@ table.suggest tr.highlight { background-color: #4F70A8; }
 .menuPopup { border: 1px solid #314979; }
 .menuPopup .title { color: #ffffff; background: #4E6EA7 url(images/widget_header.gif) repeat-x top left; }
 .menuPopup .ui-menu { border: 1px solid #314979; }
+
+.input[readonly], .input[disabled], .input[readonly]:hover, .input[disabled]:hover,
+input.input.formlist[type="button"][disabled], input.input.formlist[type="submit"][disabled] {
+	border-color: #aca899;
+	background-color: #fbfbfb;
+	/* ignored by IE for <select> */
+	color: #505050;
+}
+
+/* disabled <select> font color for IE 9+ */
+select[disabled="disabled"]::-ms-value {
+	color: #505050;
+	background-color: #fbfbfb;
+}
+
+.link_menu[disabled], .link_menu[disabled]:focus, .link_menu[disabled]:hover {
+	background-color: #eee;
+	color: #aaa;
+}
+
+/* disabled form buttons */
+.input.button[disabled]:hover {
+	background-color: #eee;
+	border-color: #d0d0d0;
+}
+
+/* disabled save button */
+.jqueryinput.input.button[disabled]:hover {
+	border-color: #ffaa33;
+}
+
+/* show non-gray background for disabled multiselect inputs on hover */
+.multiselect input[type="text"][disabled]:hover { background-color: transparent; }
diff --git a/frontends/php/styles/themes/darkblue/main.css b/frontends/php/styles/themes/darkblue/main.css
index 7261d65b0e2..805cec91767 100644
--- a/frontends/php/styles/themes/darkblue/main.css
+++ b/frontends/php/styles/themes/darkblue/main.css
@@ -461,22 +461,50 @@ span.darklink{ color: #3C759B; }span.darklink:hover{ color: #77B7DA; }
 
 /*////////////////	FORMS	////////////////////*/
 .input, .input[disabled]:hover, input.formlist[type="button"],
-div.calendar input[type="button"] {
+div.calendar input[type="button"], input[type="button"].input[disabled].formlist,
+input[type="submit"].input[disabled].formlist {
 	border: 1px solid #B3C9D6;
 	background: #2F6487;
 	color: #FFF;
 }
 .input option { background: #2F6487; color: #FFFFFF; }
 .input:focus, .input:hover { border-color: #77B7DA; }
-.input[readonly], .input[readonly]:hover {
-/* NOTE: Ignored by IE */
-	border-color: #4E738C;
-	background: #2B495E;
+
+.input[readonly], .input[disabled], .input[readonly]:hover, .input[disabled]:hover,
+input.input.formlist[type="button"][disabled], input.input.formlist[type="submit"][disabled] {
+	border-color: #4e738c;
+	background: #2b495e;
+	/* ignored by IE for <select> */
+	color: #aca899;
+}
+
+/* disabled <select> font color for IE 9+ */
+select[disabled="disabled"]::-ms-value {
+	color: #aca899;
+}
+
+select[disabled="disabled"] option { background: #2b495e; }
+
+/* disabled form buttons */
+.input.button[disabled]:hover {
+	background-color: #000e19;
+	border-color: #77b7da;
+	color: #77b7da;
+}
+
+/* disabled save button */
+.jqueryinput.input.button[disabled]:hover {
+	border-color: #77b7da;
+	color: #77b7da;
 }
 
 .shadow {}
 .shadow:hover{ -webkit-box-shadow: 0 0 6px #77B7DA; -moz-box-shadow: 0 0 6px #77B7DA; box-shadow: 0 0 6px #77B7DA; }
 
+.shadow[disabled]:hover {
+	-webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none;
+}
+
 .select { margin: 1px 4px 1px 1px; }
 .button{  border-color: #77B7DA; background: #022744; color: #77B7DA; }
 .button:hover { border-color: #022744; color: #022744; background: #77B7DA; text-decoration: none; }
diff --git a/frontends/php/styles/themes/darkorange/main.css b/frontends/php/styles/themes/darkorange/main.css
index d016b55c2de..2bb8777a899 100644
--- a/frontends/php/styles/themes/darkorange/main.css
+++ b/frontends/php/styles/themes/darkorange/main.css
@@ -416,23 +416,49 @@ span.link:hover{ color: #FF8800; }
 span.darklink{ color: #AA5500; }span.darklink:hover{ color: #FF5500; }
 
 /*////////////////	FORMS	////////////////////*/
-.input, .input[disabled]:hover, input.formlist[type="button"],
-div.calendar input[type="button"] {
-	border: 1px solid #DFDFDF;
-	background-color: #2F2F2F;
-	color: #DFDFDF;
+.input, input.formlist[type="button"], div.calendar input[type="button"] {
+	border: 1px solid #dfdfdf;
+	background-color: #2f2f2f;
+	color: #fff;
 }
-.input option { background: #2F2F2F; color: #FF5500; }
+.input option { background: #2f2f2f; color: #FF5500; }
 .input:focus, input.formlist[type="button"]:focus, div.calendar input[type="button"]:focus
 .input:hover, input.formlist[type="button"]:hover, div.calendar input[type="button"]:hover {
 	border-color: #FF5500; color: #FF5500;
 }
 
-.input[readonly], .input[readonly]:hover{
-/* NOTE: Ignored by IE */
-	border-color: #DFDFDF;
-	background-color: #777777;
-	color: #DFDFDF;
+.input[readonly], .input[disabled], .input[readonly]:hover, .input[disabled]:hover,
+input.input.formlist[type="button"][disabled], input.input.formlist[type="submit"][disabled] {
+	border-color: #444;
+	background-color: #2f2f2f;
+	/* ignored by IE for <select> */
+	color: #dfdfdf;
+}
+
+/* disabled <select> font color for IE 9+ */
+select[disabled="disabled"]::-ms-value {
+	background-color: #2f2f2f;
+	color: #dfdfdf;
+	border-color: #333;
+}
+
+select[disabled="disabled"] option { background-color: #2f2f2f; }
+
+.input.link_menu[disabled], .input.link_menu[disabled]:focus, .input.link_menu[disabled]:hover {
+	background-color: transparent;
+}
+
+/* disabled form buttons */
+.input.button[disabled]:hover {
+	background-color: #2f2f2f;
+	border-color: #dfdfdf;
+	color: #dfdfdf;
+}
+
+/* disabled save button */
+.jqueryinput.input.button[disabled]:hover {
+	border-color: #ff5500;
+	color: #dfdfdf;
 }
 
 ul.formlist li.new { background: #2F2F2F; }
@@ -440,6 +466,10 @@ ul.formlist li.new { background: #2F2F2F; }
 .shadow {}
 .shadow:hover{ -webkit-box-shadow: 0 0 6px #FF5500; -moz-box-shadow: 0 0 6px #FF5500; box-shadow: 0 0 6px #FF5500; }
 
+.shadow[disabled]:hover {
+	-webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none;
+}
+
 .select { margin: 1px 4px 1px 1px; }
 .button{  border-color: #FF5500; background: #2f2f2f; color: #FF5500; }
 .button:hover { border-color: #2f2f2f; color: #2f2f2f; background: #FF5500; text-decoration: none; }
@@ -458,9 +488,10 @@ ul.formlist li.new { background: #2F2F2F; }
 }
 
 .link_menu[disabled], .link_menu[disabled]:hover{
-	color: #DFDFDF;
+	color: #dfdfdf;
 	border: 0;
 	cursor: default;
+	background-color: #1a1a1a;
 }
 
 .column .widget .header{ border: 0;}
diff --git a/frontends/php/styles/themes/originalblue/main.css b/frontends/php/styles/themes/originalblue/main.css
index 37b16da437b..2438324f61f 100644
--- a/frontends/php/styles/themes/originalblue/main.css
+++ b/frontends/php/styles/themes/originalblue/main.css
@@ -37,3 +37,37 @@ table.ack_msgs tr.msg { background-color: #F8F8F8; }
 div.preloader {
 	background: url("images/preloader.gif") no-repeat;
 }
+
+.input[readonly], .input[disabled], .input[readonly]:hover, .input[disabled]:hover,
+input.input.formlist[type="button"][disabled], input.input.formlist[type="submit"][disabled] {
+	border-color: #d0d0d0;
+	background: #eeeeee;
+	/* ignored by IE for <select> */
+	color: #505050;
+}
+
+/* disabled <select> font color for IE 9+ */
+select[disabled="disabled"]::-ms-value {
+	color: #505050;
+}
+
+.link_menu[disabled], .link_menu[disabled]:focus, .link_menu[disabled]:hover {
+	background-color: #ffffff;
+	color: #aca899;
+}
+
+/* disabled form buttons */
+.input.button[disabled]:hover {
+	background-color: #fafbfc;
+	border-color: #ced8e6;
+	color: #a8bfd4;
+}
+
+/* disabled save button */
+.jqueryinput.input.button[disabled]:hover {
+	border-color: #ffaa33;
+	color: #a8bfd4;
+}
+
+/* show non-gray background for disabled multiselect inputs on hover */
+.multiselect input[type="text"][disabled]:hover { background-color: transparent; }
diff --git a/frontends/php/sysmap.php b/frontends/php/sysmap.php
index 11eee975b12..cfe546ac86d 100644
--- a/frontends/php/sysmap.php
+++ b/frontends/php/sysmap.php
@@ -55,10 +55,10 @@ check_fields($fields);
  * Ajax
  */
 if (isset($_REQUEST['favobj'])) {
-	$json = new CJSON();
+	$json = new CJson();
 
 	if ($_REQUEST['favobj'] == 'sysmap' && $_REQUEST['action'] == 'save') {
-		$sysmapid = get_request('sysmapid', 0);
+		$sysmapid = getRequest('sysmapid', 0);
 
 		@ob_start();
 
@@ -82,7 +82,7 @@ if (isset($_REQUEST['favobj'])) {
 			$result = API::Map()->update($sysmapUpdate);
 
 			if ($result !== false) {
-				echo 'if (Confirm("'._('Map is saved! Return?').'")) { location.href = "sysmaps.php"; }';
+				echo 'if (confirm('.CJs::encodeJson(_('Map is saved! Return?')).')) { location.href = "sysmaps.php"; }';
 			}
 			else {
 				throw new Exception(_('Map save operation failed.')."\n\r");
diff --git a/frontends/php/sysmaps.php b/frontends/php/sysmaps.php
index 3e1bae29e1b..61e8dd08a6b 100644
--- a/frontends/php/sysmaps.php
+++ b/frontends/php/sysmaps.php
@@ -24,7 +24,7 @@ require_once dirname(__FILE__).'/include/maps.inc.php';
 require_once dirname(__FILE__).'/include/ident.inc.php';
 require_once dirname(__FILE__).'/include/forms.inc.php';
 
-if (isset($_REQUEST['go']) && $_REQUEST['go'] == 'export' && isset($_REQUEST['maps'])) {
+if (hasRequest('action') && getRequest('action') == 'map.export' && hasRequest('maps')) {
 	$page['file'] = 'zbx_export_maps.xml';
 	$page['type'] = detect_page_type(PAGE_TYPE_XML);
 
@@ -70,16 +70,18 @@ $fields = array(
 	'urls' =>					array(T_ZBX_STR, O_OPT, null,	null,			null),
 	'severity_min' =>			array(T_ZBX_INT, O_OPT, null,	IN('0,1,2,3,4,5'), null),
 	// actions
+	'action' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, IN('"map.export","map.massdelete"'),		null),
 	'save' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null),
 	'delete' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null),
 	'cancel' =>					array(T_ZBX_STR, O_OPT, P_SYS,	null,			null),
-	'go' =>						array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,		null),
 	// form
 	'form' =>					array(T_ZBX_STR, O_OPT, P_SYS,	null,			null),
-	'form_refresh' =>			array(T_ZBX_INT, O_OPT, null,	null,			null)
+	'form_refresh' =>			array(T_ZBX_INT, O_OPT, null,	null,			null),
+	// sort and sortorder
+	'sort' =>					array(T_ZBX_STR, O_OPT, P_SYS, IN('"height","name","width"'),				null),
+	'sortorder' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
 /*
  * Permissions
@@ -103,7 +105,7 @@ else {
 }
 
 if ($isExportData) {
-	$export = new CConfigurationExport(array('maps' => get_request('maps', array())));
+	$export = new CConfigurationExport(array('maps' => getRequest('maps', array())));
 	$export->setBuilder(new CConfigurationExportBuilder());
 	$export->setWriter(CExportWriterFactory::getWriter(CExportWriterFactory::XML));
 	$exportData = $export->export();
@@ -118,8 +120,6 @@ if ($isExportData) {
 	exit;
 }
 
-$_REQUEST['go'] = get_request('go', 'none');
-
 /*
  * Actions
  */
@@ -130,25 +130,25 @@ if (isset($_REQUEST['save'])) {
 		'height' => $_REQUEST['height'],
 		'backgroundid' => $_REQUEST['backgroundid'],
 		'iconmapid' => $_REQUEST['iconmapid'],
-		'highlight' => get_request('highlight', 0),
-		'markelements' => get_request('markelements', 0),
-		'expandproblem' => get_request('expandproblem', 0),
-		'label_format' => get_request('label_format', 0),
-		'label_type_host' => get_request('label_type_host', 2),
-		'label_type_hostgroup' => get_request('label_type_hostgroup', 2),
-		'label_type_trigger' => get_request('label_type_trigger', 2),
-		'label_type_map' => get_request('label_type_map', 2),
-		'label_type_image' => get_request('label_type_image', 2),
-		'label_string_host' => get_request('label_string_host', ''),
-		'label_string_hostgroup' => get_request('label_string_hostgroup', ''),
-		'label_string_trigger' => get_request('label_string_trigger', ''),
-		'label_string_map' => get_request('label_string_map', ''),
-		'label_string_image' => get_request('label_string_image', ''),
+		'highlight' => getRequest('highlight', 0),
+		'markelements' => getRequest('markelements', 0),
+		'expandproblem' => getRequest('expandproblem', 0),
+		'label_format' => getRequest('label_format', 0),
+		'label_type_host' => getRequest('label_type_host', 2),
+		'label_type_hostgroup' => getRequest('label_type_hostgroup', 2),
+		'label_type_trigger' => getRequest('label_type_trigger', 2),
+		'label_type_map' => getRequest('label_type_map', 2),
+		'label_type_image' => getRequest('label_type_image', 2),
+		'label_string_host' => getRequest('label_string_host', ''),
+		'label_string_hostgroup' => getRequest('label_string_hostgroup', ''),
+		'label_string_trigger' => getRequest('label_string_trigger', ''),
+		'label_string_map' => getRequest('label_string_map', ''),
+		'label_string_image' => getRequest('label_string_image', ''),
 		'label_type' => $_REQUEST['label_type'],
 		'label_location' => $_REQUEST['label_location'],
-		'show_unack' => get_request('show_unack', 0),
-		'severity_min' => get_request('severity_min', TRIGGER_SEVERITY_NOT_CLASSIFIED),
-		'urls' => get_request('urls', array())
+		'show_unack' => getRequest('show_unack', 0),
+		'severity_min' => getRequest('severity_min', TRIGGER_SEVERITY_NOT_CLASSIFIED),
+		'urls' => getRequest('urls', array())
 	);
 
 	foreach ($map['urls'] as $unum => $url) {
@@ -182,10 +182,13 @@ if (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result);
 }
-elseif ((hasRequest('delete') && hasRequest('sysmapid')) || getRequest('go') == 'delete') {
+elseif ((hasRequest('delete') && hasRequest('sysmapid')) || (hasRequest('action') && getRequest('action') == 'map.massdelete')) {
 	$sysmapIds = getRequest('maps', array());
 
 	if (hasRequest('sysmapid')) {
@@ -196,7 +199,7 @@ elseif ((hasRequest('delete') && hasRequest('sysmapid')) || getRequest('go') ==
 
 	$maps = API::Map()->get(array(
 		'sysmapids' => $sysmapIds,
-		'output' => array('name'),
+		'output' => array('sysmapid', 'name'),
 		'editable' => true
 	));
 	$result = API::Map()->delete($sysmapIds);
@@ -210,8 +213,11 @@ elseif ((hasRequest('delete') && hasRequest('sysmapid')) || getRequest('go') ==
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('Network map deleted'), _('Cannot delete network map'));
-	clearCookies($result);
 }
 
 /*
@@ -222,30 +228,30 @@ if (isset($_REQUEST['form'])) {
 		$data = array(
 			'sysmap' => array(
 				'sysmapid' => getRequest('sysmapid'),
-				'name' => get_request('name', ''),
-				'width' => get_request('width', 800),
-				'height' => get_request('height', 600),
-				'backgroundid' => get_request('backgroundid', 0),
-				'iconmapid' => get_request('iconmapid', 0),
-				'label_format' => get_request('label_format', 0),
-				'label_type_host' => get_request('label_type_host', 2),
-				'label_type_hostgroup' => get_request('label_type_hostgroup', 2),
-				'label_type_trigger' => get_request('label_type_trigger', 2),
-				'label_type_map' => get_request('label_type_map', 2),
-				'label_type_image' => get_request('label_type_image', 2),
-				'label_string_host' => get_request('label_string_host', ''),
-				'label_string_hostgroup' => get_request('label_string_hostgroup', ''),
-				'label_string_trigger' => get_request('label_string_trigger', ''),
-				'label_string_map' => get_request('label_string_map', ''),
-				'label_string_image' => get_request('label_string_image', ''),
-				'label_type' => get_request('label_type', 0),
-				'label_location' => get_request('label_location', 0),
-				'highlight' => get_request('highlight', 0),
-				'markelements' => get_request('markelements', 0),
-				'expandproblem' => get_request('expandproblem', 0),
-				'show_unack' => get_request('show_unack', 0),
-				'severity_min' => get_request('severity_min', TRIGGER_SEVERITY_NOT_CLASSIFIED),
-				'urls' => get_request('urls', array())
+				'name' => getRequest('name', ''),
+				'width' => getRequest('width', 800),
+				'height' => getRequest('height', 600),
+				'backgroundid' => getRequest('backgroundid', 0),
+				'iconmapid' => getRequest('iconmapid', 0),
+				'label_format' => getRequest('label_format', 0),
+				'label_type_host' => getRequest('label_type_host', 2),
+				'label_type_hostgroup' => getRequest('label_type_hostgroup', 2),
+				'label_type_trigger' => getRequest('label_type_trigger', 2),
+				'label_type_map' => getRequest('label_type_map', 2),
+				'label_type_image' => getRequest('label_type_image', 2),
+				'label_string_host' => getRequest('label_string_host', ''),
+				'label_string_hostgroup' => getRequest('label_string_hostgroup', ''),
+				'label_string_trigger' => getRequest('label_string_trigger', ''),
+				'label_string_map' => getRequest('label_string_map', ''),
+				'label_string_image' => getRequest('label_string_image', ''),
+				'label_type' => getRequest('label_type', 0),
+				'label_location' => getRequest('label_location', 0),
+				'highlight' => getRequest('highlight', 0),
+				'markelements' => getRequest('markelements', 0),
+				'expandproblem' => getRequest('expandproblem', 0),
+				'show_unack' => getRequest('show_unack', 0),
+				'severity_min' => getRequest('severity_min', TRIGGER_SEVERITY_NOT_CLASSIFIED),
+				'urls' => getRequest('urls', array())
 			)
 		);
 	}
@@ -265,8 +271,8 @@ if (isset($_REQUEST['form'])) {
 
 	// images
 	$data['images'] = API::Image()->get(array(
-		'filter' => array('imagetype' => 2),
-		'output' => API_OUTPUT_EXTEND
+		'output' => array('imageid', 'name'),
+		'filter' => array('imagetype' => IMAGE_TYPE_BACKGROUND)
 	));
 	order_result($data['images'], 'name');
 
@@ -283,12 +289,18 @@ if (isset($_REQUEST['form'])) {
 	$mapView->show();
 }
 else {
-	$data = array();
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
 
-	// get maps
-	$sortField = getPageSortField('name');
-	$sortOrder = getPageSortOrder();
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
 
+	$data = array(
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
+	);
+
+	// get maps
 	$data['maps'] = API::Map()->get(array(
 		'editable' => true,
 		'output' => array('sysmapid', 'name', 'width', 'height'),
@@ -299,7 +311,7 @@ else {
 	order_result($data['maps'], $sortField, $sortOrder);
 
 	// paging
-	$data['paging'] = getPagingLine($data['maps'], array('sysmapid'));
+	$data['paging'] = getPagingLine($data['maps']);
 
 	// render view
 	$mapView = new CView('configuration.sysmap.list', $data);
diff --git a/frontends/php/templates.php b/frontends/php/templates.php
index f4e139eb218..80edab30e9a 100644
--- a/frontends/php/templates.php
+++ b/frontends/php/templates.php
@@ -25,7 +25,7 @@ require_once dirname(__FILE__).'/include/screens.inc.php';
 require_once dirname(__FILE__).'/include/forms.inc.php';
 require_once dirname(__FILE__).'/include/ident.inc.php';
 
-if (isset($_REQUEST['go']) && $_REQUEST['go'] == 'export' && isset($_REQUEST['templates'])) {
+if (hasRequest('action') && getRequest('action') == 'template.export' && hasRequest('templates')) {
 	$exportData = true;
 
 	$page['type'] = detect_page_type(PAGE_TYPE_XML);
@@ -64,7 +64,10 @@ $fields = array(
 	'value_new'			=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	'isset({macro_add})'),
 	'macro_add'			=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 	// actions
-	'go'				=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
+	'action'			=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+								IN('"template.export","template.massdelete","template.massdeleteclear"'),
+								null
+							),
 	'unlink'			=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 	'unlink_and_clear'	=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 	'save'				=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
@@ -74,24 +77,24 @@ $fields = array(
 	'delete_and_clear'	=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 	'cancel'			=> array(T_ZBX_STR, O_OPT, P_SYS,		null,	null),
 	'form'				=> array(T_ZBX_STR, O_OPT, P_SYS,		null,	null),
-	'form_refresh'		=> array(T_ZBX_STR, O_OPT, null,		null,	null)
+	'form_refresh'		=> array(T_ZBX_INT, O_OPT, null,		null,	null),
+	// sort and sortorder
+	'sort'				=> array(T_ZBX_STR, O_OPT, P_SYS, IN('"name"'),									null),
+	'sortorder'			=> array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
-
-$_REQUEST['go'] = get_request('go', 'none');
 
 /*
  * Permissions
  */
-if (get_request('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
+if (getRequest('groupid') && !API::HostGroup()->isWritable(array($_REQUEST['groupid']))) {
 	access_deny();
 }
-if (get_request('templateid') && !API::Template()->isWritable(array($_REQUEST['templateid']))) {
+if (getRequest('templateid') && !API::Template()->isWritable(array($_REQUEST['templateid']))) {
 	access_deny();
 }
 
-$templateIds = get_request('templates', array());
+$templateIds = getRequest('templates', array());
 
 if ($exportData) {
 	$export = new CConfigurationExport(array('templates' => $templateIds));
@@ -167,7 +170,7 @@ elseif (hasRequest('save')) {
 			}
 			else {
 				// transform macros to uppercase {$aaa} => {$AAA}
-				$macros[$key]['macro'] = zbx_strtoupper($macro['macro']);
+				$macros[$key]['macro'] = mb_strtoupper($macro['macro']);
 			}
 		}
 
@@ -262,6 +265,11 @@ elseif (hasRequest('save')) {
 				throw new Exception();
 			}
 
+			// copy web scenarios
+			if (!copyHttpTests($cloneTemplateId, $templateId)) {
+				throw new Exception();
+			}
+
 			// copy triggers
 			$dbTriggers = API::Trigger()->get(array(
 				'output' => array('triggerid'),
@@ -333,8 +341,11 @@ elseif (hasRequest('save')) {
 
 		unset($_REQUEST['form'], $_REQUEST['templateid']);
 		$result = DBend($result);
+
+		if ($result) {
+			uncheckTableRows();
+		}
 		show_messages($result, $messageSuccess, $messageFailed);
-		clearCookies($result);
 	}
 	catch (Exception $e) {
 		DBend(false);
@@ -346,8 +357,6 @@ elseif (hasRequest('save')) {
 elseif (isset($_REQUEST['delete']) && isset($_REQUEST['templateid'])) {
 	DBstart();
 
-	$goResult = true;
-
 	$result = API::Template()->massUpdate(array(
 		'templates' => zbx_toObject($_REQUEST['templateid'], 'templateid'),
 		'hosts' => array()
@@ -358,52 +367,51 @@ elseif (isset($_REQUEST['delete']) && isset($_REQUEST['templateid'])) {
 
 	$result = DBend($result);
 
-	show_messages($result, _('Template deleted'), _('Cannot delete template'));
-	clearCookies($result);
-
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['templateid']);
+		uncheckTableRows();
 	}
 	unset($_REQUEST['delete']);
+	show_messages($result, _('Template deleted'), _('Cannot delete template'));
 }
 elseif (isset($_REQUEST['delete_and_clear']) && isset($_REQUEST['templateid'])) {
 	DBstart();
 
-	$goResult = true;
 	$result = API::Template()->delete(array(getRequest('templateid')));
 
 	$result = DBend($result);
 
-	show_messages($result, _('Template deleted'), _('Cannot delete template'));
-	clearCookies($result);
-
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['templateid']);
+		uncheckTableRows();
 	}
 	unset($_REQUEST['delete']);
+	show_messages($result, _('Template deleted'), _('Cannot delete template'));
 }
-elseif (str_in_array($_REQUEST['go'], array('delete', 'delete_and_clear')) && isset($_REQUEST['templates'])) {
-	$templates = get_request('templates', array());
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('template.massdelete', 'template.massdeleteclear')) && hasRequest('templates')) {
+	$templates = getRequest('templates');
 
 	DBstart();
 
-	$goResult = true;
+	$result = true;
 
-	if ($_REQUEST['go'] == 'delete') {
-		$goResult = API::Template()->massUpdate(array(
+	if (getRequest('action') == 'action.massdelete') {
+		$result = API::Template()->massUpdate(array(
 			'templates' => zbx_toObject($templates, 'templateid'),
 			'hosts' => array()
 		));
 	}
 
-	if ($goResult) {
-		$goResult = API::Template()->delete($templates);
+	if ($result) {
+		$result = API::Template()->delete($templates);
 	}
 
-	$goResult = DBend($goResult);
+	$result = DBend($result);
 
-	show_messages($goResult, _('Template deleted'), _('Cannot delete template'));
-	clearCookies($goResult);
+	if ($result) {
+		uncheckTableRows();
+	}
+	show_messages($result, _('Template deleted'), _('Cannot delete template'));
 }
 
 /*
@@ -419,14 +427,14 @@ $pageFilter = new CPageFilter(array(
 		'templated_hosts' => true,
 		'editable' => true
 	),
-	'groupid' => get_request('groupid', null)
+	'groupid' => getRequest('groupid')
 ));
 $_REQUEST['groupid'] = $pageFilter->groupid;
 
 if (isset($_REQUEST['form'])) {
 	$templateWidget->addPageHeader(_('CONFIGURATION OF TEMPLATES'));
 
-	if ($templateId = get_request('templateid', 0)) {
+	if ($templateId = getRequest('templateid', 0)) {
 		$templateWidget->addItem(get_header_host_table('', $templateId));
 	}
 
@@ -470,6 +478,12 @@ if (isset($_REQUEST['form'])) {
 	$templateWidget->addItem($templateForm->render());
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$frmForm = new CForm();
 	$frmForm->cleanItems();
 	$frmForm->addItem(new CDiv(array(
@@ -492,7 +506,7 @@ else {
 	$table = new CTableInfo(_('No templates found.'));
 	$table->setHeader(array(
 		new CCheckBox('all_templates', null, "checkAll('".$form->getName()."', 'all_templates', 'templates');"),
-		make_sorting_header(_('Templates'), 'name'),
+		make_sorting_header(_('Templates'), 'name', $sortField, $sortOrder),
 		_('Applications'),
 		_('Items'),
 		_('Triggers'),
@@ -507,22 +521,19 @@ else {
 	// get templates
 	$templates = array();
 
-	$sortfield = getPageSortField('name');
-	$sortorder = getPageSortOrder();
-
 	if ($pageFilter->groupsSelected) {
 		$templates = API::Template()->get(array(
 			'output' => array('templateid', 'name'),
 			'groupids' => ($pageFilter->groupid > 0) ? $pageFilter->groupid : null,
 			'editable' => true,
-			'sortfield' => $sortfield,
+			'sortfield' => $sortField,
 			'limit' => $config['search_limit'] + 1
 		));
 	}
 
 	// sorting && paging
-	order_result($templates, $sortfield, $sortorder);
-	$paging = getPagingLine($templates, array('templateid'));
+	order_result($templates, $sortField, $sortOrder);
+	$paging = getPagingLine($templates);
 
 	$templates = API::Template()->get(array(
 		'templateids' => zbx_objectValues($templates, 'templateid'),
@@ -541,7 +552,7 @@ else {
 		'nopermissions' => true
 	));
 
-	order_result($templates, $sortfield, $sortorder);
+	order_result($templates, $sortField, $sortOrder);
 
 	foreach ($templates as $template) {
 		$templatesOutput = array();
@@ -652,14 +663,18 @@ else {
 		));
 	}
 
-	$goBox = new CComboBox('go');
-	$goBox->addItem('export', _('Export selected'));
-	$goOption = new CComboItem('delete', _('Delete selected'));
+	$goBox = new CComboBox('action');
+
+	$goBox->addItem('template.export', _('Export selected'));
+
+	$goOption = new CComboItem('template.massdelete', _('Delete selected'));
 	$goOption->setAttribute('confirm', _('Delete selected templates?'));
 	$goBox->addItem($goOption);
-	$goOption = new CComboItem('delete_and_clear', _('Delete selected with linked elements'));
+
+	$goOption = new CComboItem('template.massdeleteclear', _('Delete selected with linked elements'));
 	$goOption->setAttribute('confirm', _('Delete and clear selected templates? (Warning: all linked hosts will be cleared!)'));
 	$goBox->addItem($goOption);
+
 	$goButton = new CSubmit('goButton', _('Go').' (0)');
 	$goButton->setAttribute('id', 'goButton');
 
diff --git a/frontends/php/tests/agent/testMetrics.php b/frontends/php/tests/agent/testMetrics.php
index cfa5a4b9c37..743d43c6a32 100644
--- a/frontends/php/tests/agent/testMetrics.php
+++ b/frontends/php/tests/agent/testMetrics.php
@@ -339,6 +339,7 @@ class testMetrics extends CZabbixTest {
 			array('system.hw.cpu[]',						TYPE_ANY,	'/MHz/',			-1,	-1),
 			array('system.hw.macaddr[]',					TYPE_ANY,	'/eth[0-9]/',		-1,	-1),
 			array('system.sw.packages[]',					TYPE_ANY,	'/php/',			-1,	-1),
+			array('wmi.get[root\\cimv2,select Caption from Win32_OperatingSystem]',	TYPE_ANY,	ZBX_NOTSUPPORTED,	-1,	-1),
 		);
 	}
 
diff --git a/frontends/php/tests/api_json/APIInfo.php b/frontends/php/tests/api_json/APIInfo.php
index d368e8ca5d8..2ca0944f19e 100644
--- a/frontends/php/tests/api_json/APIInfo.php
+++ b/frontends/php/tests/api_json/APIInfo.php
@@ -26,14 +26,14 @@ class API_JSON_APIInfo extends CZabbixTest {
 		$result = $this->api_acall('apiinfo.version', array(), $debug);
 
 		$this->assertTrue(isset($result['result']), $debug);
-		$this->assertSame($result['result'], '2.3.0');
+		$this->assertSame($result['result'], '2.3.4');
 	}
 
 	public function testAPIInfo_VersionWithoutAuth() {
 		$result = $this->api_call('apiinfo.version', array(), $debug);
 
 		$this->assertTrue(isset($result['result']), $debug);
-		$this->assertSame($result['result'], '2.3.0');
+		$this->assertSame($result['result'], '2.3.4');
 	}
 
 }
diff --git a/frontends/php/tests/general/CTriggerExpressionTest.php b/frontends/php/tests/general/CTriggerExpressionTest.php
deleted file mode 100644
index 80a13809021..00000000000
--- a/frontends/php/tests/general/CTriggerExpressionTest.php
+++ /dev/null
@@ -1,2103 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2014 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-require_once dirname(__FILE__).'/../../include/gettextwrapper.inc.php';
-require_once dirname(__FILE__).'/../../include/defines.inc.php';
-require_once dirname(__FILE__).'/../../include/classes/parsers/CTriggerExpression.php';
-
-class CTriggerExpressionTest extends PHPUnit_Framework_TestCase {
-
-	public static function provider() {
-		return array(
-			array('', null, false),
-			array('+', null, false),
-			array('1+1', null, true),
-			array('abc', null, false),
-
-			array('1', null, true),
-			array('1s', null, true),
-			array('1m', null, true),
-			array('1h', null, true),
-			array('1d', null, true),
-			array('1w', null, true),
-			array('1K', null, true),
-			array('1M', null, true),
-			array('1G', null, true),
-			array('1T', null, true),
-			array('1.5', null, true),
-			array('1.5s', null, true),
-			array('1.5m', null, true),
-			array('1.5h', null, true),
-			array('1.5d', null, true),
-			array('1.5w', null, true),
-			array('1.5K', null, true),
-			array('1.5M', null, true),
-			array('1.5G', null, true),
-			array('1.5T', null, true),
-			array('-1.5', null, true),
-			array('-1.5s', null, true),
-			array('-1.5m', null, true),
-			array('-1.5h', null, true),
-			array('-1.5d', null, true),
-			array('-1.5w', null, true),
-			array('-1.5K', null, true),
-			array('-1.5M', null, true),
-			array('-1.5G', null, true),
-			array('-1.5T', null, true),
-
-			array('{TRIGGER.VALUE}', null, true),
-			array('{$USERMACRO}', null, true),
-			array('{TRIGGER.VALUE}=1', null, true),
-			array('{$USERMACRO}=1', null, true),
-
-			array('{host}', null, false),
-			array('{host:key}', null, false),
-			array('{host:key.str}', null, false),
-
-			array('{host:key.diff()} & {TRIGGER.VALUE}', null, true),
-			array('{host:key.diff()}& {TRIGGER.VALUE}', null, true),
-			array('{host:key.diff()}  &{TRIGGER.VALUE}', null, true),
-			array('{host:key.diff()}&{TRIGGER.VALUE}', null, true),
-			array('{host:key.diff()}&+{TRIGGER.VALUE}', null, false),
-			array('{host:key.diff()}&-{TRIGGER.VALUE}', null, true),
-			array('{host:key.diff()} & + {TRIGGER.VALUE}', null, false),
-			array('{host:key.diff()} & - {TRIGGER.VALUE}', null, true),
-
-			array('{host:key.diff()} & {$USERMACRO}', null, true),
-			array('{host:key.diff()}& {$USERMACRO}', null, true),
-			array('{host:key.diff()} &{$USERMACRO}', null, true),
-			array('{host:key.diff()}&{$USERMACRO}', null, true),
-			array('{host:key.diff()}&+{$USERMACRO}', null, false),
-			array('{host:key.diff()}&-{$USERMACRO}', null, true),
-			array('{host:key.diff()} & + {$USERMACRO}', null, false),
-			array('{host:key.diff()} & - {$USERMACRO}', null, true),
-
-			array('{host:key.diff()}=00', null, true),
-			array('{host:key.diff()}=0 0', null, false),
-			array('{host:key.diff()}=0 0={host:key.diff()}', null, false),
-			array('{host:key.diff()} = 00 = {host:key.diff()}', null, true),
-
-			array('{host:key.str(ГУГЛ)}=0', null, true),
-			array('{host:key.str("ГУГЛ")}=0', null, true),
-			array('{host:key[ГУГЛ].str(ГУГЛ)}=0', null, true),
-			array('{host:key["ГУГЛ"].str("ГУГЛ")}=0', null, true),
-			array('{host:key.str("こんにちは、世界")}', null, true),
-			array('{host:key.str(こんにちは、世界)}', null, true),
-			array('{host:key["こんにちは、世界"].str("こんにちは、世界")}', null, true),
-			array('{host:key[こんにちは、世界].str(こんにちは、世界)}', null, true),
-
-			array('{host:key[a,,"b",,[c,d,,"e",],,[f]].count(1,,"b",3)}', null, true),
-			array('{host:key[a,,"b",,[[c,d,,"e"],[]],,[f]].count(1,,"b",3)}', null, true),
-			array('{host:key[a,,"b",,[c,d,,"e",,,[f]].count(1,,"b",3)}', null, false),
-			array('{host:key[a,,"b",,[c,d,,"e",],,f]].count(1,,"b",3)}', null, false),
-
-			array('{abcdefghijklmnopqrstuvwxyz. _-ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890:key.diff()}', null, true),
-			array('{host:abcdefghijklmnopqrstuvwxyz._-ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890.diff()}', null, true),
-			array('{host:key.abcdefghijklmnopqrstuvwxyz()}', null, true),
-
-			array('{host:,.diff()}', null, false),
-			array('{host:;.diff()}', null, false),
-			array('{host::.diff()}', null, false),
-
-			array('{:key.diff()}', null, false),
-			array('{host:.diff()}', null, false),
-			array('{host:key.()}', null, false),
-
-			array(' {host:key.diff()} ', null, true),
-			array('({host:key.diff()})', null, true),
-			array('{(host:key.diff()})', null, false),
-			array('({host:key.diff())}', null, false),
-			array('{(host:key.diff())}', null, false),
-			array('{(host:key.diff()})=0', null, false),
-			array('({host:key.diff())}=0', null, false),
-			array('{(host:key.diff())}=0', null, false),
-			array('({host:key.diff()}=)0', null, false),
-			array('({host:key.diff()})0', null, false),
-			array('0(={host:key.diff()})', null, false),
-			array('0({host:key.diff()})', null, false),
-			array('( {host:key.diff()} )', null, true),
-			array(' ( {host:key.diff()} ) ', null, true),
-			array('(( {host:key.diff()} ))', null, true),
-			array(' ( ( {host:key.diff()} ) ) ', null, true),
-			array('((( {host:key.diff()} )))', null, true),
-			array(' ( ( ( {host:key.diff()} ) ) ) ', null, true),
-			array('()0={host:key.diff()}', null, false),
-			array('0()={host:key.diff()}', null, false),
-			array('0=()={host:key.diff()}', null, false),
-			array('0=(){host:key.diff()}', null, false),
-			array('0={()host:key.diff()}', null, false),
-			array('0={host:key.diff()()}', null, false),
-			array('0={host:key.diff()}()', null, false),
-			array('0={host:key.diff()}+()()()()5', null, false),
-			array('0={host:key.diff()}+((((()))))5', null, false),
-			array('(0)={host:key.diff()}', null, true),
-			array('(0+)={host:key.diff()}', null, false),
-			array('(0=){host:key.diff()}', null, false),
-			array('({host:key.diff)()}', null, false),
-			array('({host:key.)diff()}', null, false),
-			array('({host:key).diff()}', null, false),
-			array('(-5)={host:key.diff()}', null, true),
-			array('(15 - 5.25 - 1)={host:key.diff()}', null, true),
-			array('{host:key.diff()} = -5', null, true),
-			array('{0:0.last(0)}=0', null, true),
-
-			array('(({host:key.diff()})=0)', null, true),
-			array('( ( {host:key.diff()} ) = 0 )', null, true),
-			array('(({host:key.diff()}) * 100) / 95', null, true),
-			array('(({host:key.diff()}) * 5.25K) / 95.0', null, true),
-			array('(({host:key.diff()}) * 1w) / 1d', null, true),
-			array('(({host:key.diff()}) * 1w) / 1Ks', null, false),
-			array('(({host:key.diff()}) * 1w) / (1d * ({host:key.diff()})', null, false),
-			array('(({host:key.diff()}) * 1w) / (1d * host:key.diff()}))', null, false),
-			array('(({host:key.diff()}) * 1w) / (1d * ({host:key.diff()}))', null, true),
-
-			array('{host:key.last(1)} * (-1)', null, true),
-			array('{host:key.last(1)} / (-1)', null, true),
-			array('{host:key.last(1)} + (-1)', null, true),
-			array('{host:key.last(1)} - (-1)', null, true),
-			array('{host:key.last(1)} = (-1)', null, true),
-			array('{host:key.last(1)} # (-1)', null, true),
-			array('{host:key.last(1)} < (-1)', null, true),
-			array('{host:key.last(1)} > (-1)', null, true),
-			array('{host:key.last(1)} & (-1)', null, true),
-			array('{host:key.last(1)} | (-1)', null, true),
-
-			array('{host:key.last(1)}* (-1)', null, true),
-			array('{host:key.last(1)}/ (-1)', null, true),
-			array('{host:key.last(1)}+ (-1)', null, true),
-			array('{host:key.last(1)}- (-1)', null, true),
-			array('{host:key.last(1)}= (-1)', null, true),
-			array('{host:key.last(1)}# (-1)', null, true),
-			array('{host:key.last(1)}< (-1)', null, true),
-			array('{host:key.last(1)}> (-1)', null, true),
-			array('{host:key.last(1)}& (-1)', null, true),
-			array('{host:key.last(1)}| (-1)', null, true),
-
-			array('{host:key.last(1)} *(-1)', null, true),
-			array('{host:key.last(1)} /(-1)', null, true),
-			array('{host:key.last(1)} +(-1)', null, true),
-			array('{host:key.last(1)} -(-1)', null, true),
-			array('{host:key.last(1)} =(-1)', null, true),
-			array('{host:key.last(1)} #(-1)', null, true),
-			array('{host:key.last(1)} <(-1)', null, true),
-			array('{host:key.last(1)} >(-1)', null, true),
-			array('{host:key.last(1)} &(-1)', null, true),
-			array('{host:key.last(1)} |(-1)', null, true),
-
-			array('{host:key.last(1)}*(-1)', null, true),
-			array('{host:key.last(1)}/(-1)', null, true),
-			array('{host:key.last(1)}+(-1)', null, true),
-			array('{host:key.last(1)}-(-1)', null, true),
-			array('{host:key.last(1)}=(-1)', null, true),
-			array('{host:key.last(1)}#(-1)', null, true),
-			array('{host:key.last(1)}<(-1)', null, true),
-			array('{host:key.last(1)}>(-1)', null, true),
-			array('{host:key.last(1)}&(-1)', null, true),
-			array('{host:key.last(1)}|(-1)', null, true),
-
-			array('{host:key.last(1)} * -1', null, true),
-			array('{host:key.last(1)} / -1', null, true),
-			array('{host:key.last(1)} + -1', null, true),
-			array('{host:key.last(1)} - -1', null, true),
-			array('{host:key.last(1)} = -1', null, true),
-			array('{host:key.last(1)} # -1', null, true),
-			array('{host:key.last(1)} < -1', null, true),
-			array('{host:key.last(1)} > -1', null, true),
-			array('{host:key.last(1)} & -1', null, true),
-			array('{host:key.last(1)} | -1', null, true),
-
-			array('{host:key.last(1)}* -1', null, true),
-			array('{host:key.last(1)}/ -1', null, true),
-			array('{host:key.last(1)}+ -1', null, true),
-			array('{host:key.last(1)}- -1', null, true),
-			array('{host:key.last(1)}= -1', null, true),
-			array('{host:key.last(1)}# -1', null, true),
-			array('{host:key.last(1)}< -1', null, true),
-			array('{host:key.last(1)}> -1', null, true),
-			array('{host:key.last(1)}& -1', null, true),
-			array('{host:key.last(1)}| -1', null, true),
-
-			array('{host:key.last(1)} *-1', null, true),
-			array('{host:key.last(1)} /-1', null, true),
-			array('{host:key.last(1)} +-1', null, true),
-			array('{host:key.last(1)} --1', null, true),
-			array('{host:key.last(1)} =-1', null, true),
-			array('{host:key.last(1)} #-1', null, true),
-			array('{host:key.last(1)} <-1', null, true),
-			array('{host:key.last(1)} >-1', null, true),
-			array('{host:key.last(1)} &-1', null, true),
-			array('{host:key.last(1)} |-1', null, true),
-
-			array('{host:key.last(1)}*-1', null, true),
-			array('{host:key.last(1)}/-1', null, true),
-			array('{host:key.last(1)}+-1', null, true),
-			array('{host:key.last(1)}--1', null, true),
-			array('{host:key.last(1)}=-1', null, true),
-			array('{host:key.last(1)}#-1', null, true),
-			array('{host:key.last(1)}<-1', null, true),
-			array('{host:key.last(1)}>-1', null, true),
-			array('{host:key.last(1)}&-1', null, true),
-			array('{host:key.last(1)}|-1', null, true),
-
-			array('{host:key.last(1)} * (- 1)', null, true),
-			array('{host:key.last(1)} / (- 1)', null, true),
-			array('{host:key.last(1)} + (- 1)', null, true),
-			array('{host:key.last(1)} - (- 1)', null, true),
-			array('{host:key.last(1)} = (- 1)', null, true),
-			array('{host:key.last(1)} # (- 1)', null, true),
-			array('{host:key.last(1)} < (- 1)', null, true),
-			array('{host:key.last(1)} > (- 1)', null, true),
-			array('{host:key.last(1)} & (- 1)', null, true),
-			array('{host:key.last(1)} | (- 1)', null, true),
-
-			array('{host:key.last(1)}* (- 1)', null, true),
-			array('{host:key.last(1)}/ (- 1)', null, true),
-			array('{host:key.last(1)}+ (- 1)', null, true),
-			array('{host:key.last(1)}- (- 1)', null, true),
-			array('{host:key.last(1)}= (- 1)', null, true),
-			array('{host:key.last(1)}# (- 1)', null, true),
-			array('{host:key.last(1)}< (- 1)', null, true),
-			array('{host:key.last(1)}> (- 1)', null, true),
-			array('{host:key.last(1)}& (- 1)', null, true),
-			array('{host:key.last(1)}| (- 1)', null, true),
-
-			array('{host:key.last(1)} *(- 1)', null, true),
-			array('{host:key.last(1)} /(- 1)', null, true),
-			array('{host:key.last(1)} +(- 1)', null, true),
-			array('{host:key.last(1)} -(- 1)', null, true),
-			array('{host:key.last(1)} =(- 1)', null, true),
-			array('{host:key.last(1)} #(- 1)', null, true),
-			array('{host:key.last(1)} <(- 1)', null, true),
-			array('{host:key.last(1)} >(- 1)', null, true),
-			array('{host:key.last(1)} &(- 1)', null, true),
-			array('{host:key.last(1)} |(- 1)', null, true),
-
-			array('{host:key.last(1)}*(- 1)', null, true),
-			array('{host:key.last(1)}/(- 1)', null, true),
-			array('{host:key.last(1)}+(- 1)', null, true),
-			array('{host:key.last(1)}-(- 1)', null, true),
-			array('{host:key.last(1)}=(- 1)', null, true),
-			array('{host:key.last(1)}#(- 1)', null, true),
-			array('{host:key.last(1)}<(- 1)', null, true),
-			array('{host:key.last(1)}>(- 1)', null, true),
-			array('{host:key.last(1)}&(- 1)', null, true),
-			array('{host:key.last(1)}|(- 1)', null, true),
-
-			array('{host:key.last(1)} * - 1', null, true),
-			array('{host:key.last(1)} / - 1', null, true),
-			array('{host:key.last(1)} + - 1', null, true),
-			array('{host:key.last(1)} - - 1', null, true),
-			array('{host:key.last(1)} = - 1', null, true),
-			array('{host:key.last(1)} # - 1', null, true),
-			array('{host:key.last(1)} < - 1', null, true),
-			array('{host:key.last(1)} > - 1', null, true),
-			array('{host:key.last(1)} & - 1', null, true),
-			array('{host:key.last(1)} | - 1', null, true),
-
-			array('{host:key.last(1)}* - 1', null, true),
-			array('{host:key.last(1)}/ - 1', null, true),
-			array('{host:key.last(1)}+ - 1', null, true),
-			array('{host:key.last(1)}- - 1', null, true),
-			array('{host:key.last(1)}= - 1', null, true),
-			array('{host:key.last(1)}# - 1', null, true),
-			array('{host:key.last(1)}< - 1', null, true),
-			array('{host:key.last(1)}> - 1', null, true),
-			array('{host:key.last(1)}& - 1', null, true),
-			array('{host:key.last(1)}| - 1', null, true),
-
-			array('{host:key.last(1)} *- 1', null, true),
-			array('{host:key.last(1)} /- 1', null, true),
-			array('{host:key.last(1)} +- 1', null, true),
-			array('{host:key.last(1)} -- 1', null, true),
-			array('{host:key.last(1)} =- 1', null, true),
-			array('{host:key.last(1)} #- 1', null, true),
-			array('{host:key.last(1)} <- 1', null, true),
-			array('{host:key.last(1)} >- 1', null, true),
-			array('{host:key.last(1)} &- 1', null, true),
-			array('{host:key.last(1)} |- 1', null, true),
-
-			array('{host:key.last(1)}*- 1', null, true),
-			array('{host:key.last(1)}/- 1', null, true),
-			array('{host:key.last(1)}+- 1', null, true),
-			array('{host:key.last(1)}-- 1', null, true),
-			array('{host:key.last(1)}=- 1', null, true),
-			array('{host:key.last(1)}#- 1', null, true),
-			array('{host:key.last(1)}<- 1', null, true),
-			array('{host:key.last(1)}>- 1', null, true),
-			array('{host:key.last(1)}&- 1', null, true),
-			array('{host:key.last(1)}|- 1', null, true),
-
-			array('{host:key.last(1)} * (+1)', null, false),
-			array('{host:key.last(1)} / (+1)', null, false),
-			array('{host:key.last(1)} + (+1)', null, false),
-			array('{host:key.last(1)} - (+1)', null, false),
-			array('{host:key.last(1)} = (+1)', null, false),
-			array('{host:key.last(1)} # (+1)', null, false),
-			array('{host:key.last(1)} < (+1)', null, false),
-			array('{host:key.last(1)} > (+1)', null, false),
-			array('{host:key.last(1)} & (+1)', null, false),
-			array('{host:key.last(1)} | (+1)', null, false),
-
-			array('{host:key.last(1)}* (+1)', null, false),
-			array('{host:key.last(1)}/ (+1)', null, false),
-			array('{host:key.last(1)}+ (+1)', null, false),
-			array('{host:key.last(1)}- (+1)', null, false),
-			array('{host:key.last(1)}= (+1)', null, false),
-			array('{host:key.last(1)}# (+1)', null, false),
-			array('{host:key.last(1)}< (+1)', null, false),
-			array('{host:key.last(1)}> (+1)', null, false),
-			array('{host:key.last(1)}& (+1)', null, false),
-			array('{host:key.last(1)}| (+1)', null, false),
-
-			array('{host:key.last(1)} *(+1)', null, false),
-			array('{host:key.last(1)} /(+1)', null, false),
-			array('{host:key.last(1)} +(+1)', null, false),
-			array('{host:key.last(1)} -(+1)', null, false),
-			array('{host:key.last(1)} =(+1)', null, false),
-			array('{host:key.last(1)} #(+1)', null, false),
-			array('{host:key.last(1)} <(+1)', null, false),
-			array('{host:key.last(1)} >(+1)', null, false),
-			array('{host:key.last(1)} &(+1)', null, false),
-			array('{host:key.last(1)} |(+1)', null, false),
-
-			array('{host:key.last(1)}*(+1)', null, false),
-			array('{host:key.last(1)}/(+1)', null, false),
-			array('{host:key.last(1)}+(+1)', null, false),
-			array('{host:key.last(1)}-(+1)', null, false),
-			array('{host:key.last(1)}=(+1)', null, false),
-			array('{host:key.last(1)}#(+1)', null, false),
-			array('{host:key.last(1)}<(+1)', null, false),
-			array('{host:key.last(1)}>(+1)', null, false),
-			array('{host:key.last(1)}&(+1)', null, false),
-			array('{host:key.last(1)}|(+1)', null, false),
-
-			array('{host:key.last(1)} * +1', null, false),
-			array('{host:key.last(1)} / +1', null, false),
-			array('{host:key.last(1)} + +1', null, false),
-			array('{host:key.last(1)} - +1', null, false),
-			array('{host:key.last(1)} = +1', null, false),
-			array('{host:key.last(1)} # +1', null, false),
-			array('{host:key.last(1)} < +1', null, false),
-			array('{host:key.last(1)} > +1', null, false),
-			array('{host:key.last(1)} & +1', null, false),
-			array('{host:key.last(1)} | +1', null, false),
-
-			array('{host:key.last(1)}* +1', null, false),
-			array('{host:key.last(1)}/ +1', null, false),
-			array('{host:key.last(1)}+ +1', null, false),
-			array('{host:key.last(1)}- +1', null, false),
-			array('{host:key.last(1)}= +1', null, false),
-			array('{host:key.last(1)}# +1', null, false),
-			array('{host:key.last(1)}< +1', null, false),
-			array('{host:key.last(1)}> +1', null, false),
-			array('{host:key.last(1)}& +1', null, false),
-			array('{host:key.last(1)}| +1', null, false),
-
-			array('{host:key.last(1)} *+1', null, false),
-			array('{host:key.last(1)} /+1', null, false),
-			array('{host:key.last(1)} ++1', null, false),
-			array('{host:key.last(1)} -+1', null, false),
-			array('{host:key.last(1)} =+1', null, false),
-			array('{host:key.last(1)} #+1', null, false),
-			array('{host:key.last(1)} <+1', null, false),
-			array('{host:key.last(1)} >+1', null, false),
-			array('{host:key.last(1)} &+1', null, false),
-			array('{host:key.last(1)} |+1', null, false),
-
-			array('{host:key.last(1)}*+1', null, false),
-			array('{host:key.last(1)}/+1', null, false),
-			array('{host:key.last(1)}++1', null, false),
-			array('{host:key.last(1)}-+1', null, false),
-			array('{host:key.last(1)}=+1', null, false),
-			array('{host:key.last(1)}#+1', null, false),
-			array('{host:key.last(1)}<+1', null, false),
-			array('{host:key.last(1)}>+1', null, false),
-			array('{host:key.last(1)}&+1', null, false),
-			array('{host:key.last(1)}|+1', null, false),
-
-			array('{host:key.last(1)} * (+ 1)', null, false),
-			array('{host:key.last(1)} / (+ 1)', null, false),
-			array('{host:key.last(1)} + (+ 1)', null, false),
-			array('{host:key.last(1)} - (+ 1)', null, false),
-			array('{host:key.last(1)} = (+ 1)', null, false),
-			array('{host:key.last(1)} # (+ 1)', null, false),
-			array('{host:key.last(1)} < (+ 1)', null, false),
-			array('{host:key.last(1)} > (+ 1)', null, false),
-			array('{host:key.last(1)} & (+ 1)', null, false),
-			array('{host:key.last(1)} | (+ 1)', null, false),
-
-			array('{host:key.last(1)}* (+ 1)', null, false),
-			array('{host:key.last(1)}/ (+ 1)', null, false),
-			array('{host:key.last(1)}+ (+ 1)', null, false),
-			array('{host:key.last(1)}- (+ 1)', null, false),
-			array('{host:key.last(1)}= (+ 1)', null, false),
-			array('{host:key.last(1)}# (+ 1)', null, false),
-			array('{host:key.last(1)}< (+ 1)', null, false),
-			array('{host:key.last(1)}> (+ 1)', null, false),
-			array('{host:key.last(1)}& (+ 1)', null, false),
-			array('{host:key.last(1)}| (+ 1)', null, false),
-
-			array('{host:key.last(1)} *(+ 1)', null, false),
-			array('{host:key.last(1)} /(+ 1)', null, false),
-			array('{host:key.last(1)} +(+ 1)', null, false),
-			array('{host:key.last(1)} -(+ 1)', null, false),
-			array('{host:key.last(1)} =(+ 1)', null, false),
-			array('{host:key.last(1)} #(+ 1)', null, false),
-			array('{host:key.last(1)} <(+ 1)', null, false),
-			array('{host:key.last(1)} >(+ 1)', null, false),
-			array('{host:key.last(1)} &(+ 1)', null, false),
-			array('{host:key.last(1)} |(+ 1)', null, false),
-
-			array('{host:key.last(1)}*(+ 1)', null, false),
-			array('{host:key.last(1)}/(+ 1)', null, false),
-			array('{host:key.last(1)}+(+ 1)', null, false),
-			array('{host:key.last(1)}-(+ 1)', null, false),
-			array('{host:key.last(1)}=(+ 1)', null, false),
-			array('{host:key.last(1)}#(+ 1)', null, false),
-			array('{host:key.last(1)}<(+ 1)', null, false),
-			array('{host:key.last(1)}>(+ 1)', null, false),
-			array('{host:key.last(1)}&(+ 1)', null, false),
-			array('{host:key.last(1)}|(+ 1)', null, false),
-
-			array('{host:key.last(1)} * + 1', null, false),
-			array('{host:key.last(1)} / + 1', null, false),
-			array('{host:key.last(1)} + + 1', null, false),
-			array('{host:key.last(1)} - + 1', null, false),
-			array('{host:key.last(1)} = + 1', null, false),
-			array('{host:key.last(1)} # + 1', null, false),
-			array('{host:key.last(1)} < + 1', null, false),
-			array('{host:key.last(1)} > + 1', null, false),
-			array('{host:key.last(1)} & + 1', null, false),
-			array('{host:key.last(1)} | + 1', null, false),
-
-			array('{host:key.last(1)}* + 1', null, false),
-			array('{host:key.last(1)}/ + 1', null, false),
-			array('{host:key.last(1)}+ + 1', null, false),
-			array('{host:key.last(1)}- + 1', null, false),
-			array('{host:key.last(1)}= + 1', null, false),
-			array('{host:key.last(1)}# + 1', null, false),
-			array('{host:key.last(1)}< + 1', null, false),
-			array('{host:key.last(1)}> + 1', null, false),
-			array('{host:key.last(1)}& + 1', null, false),
-			array('{host:key.last(1)}| + 1', null, false),
-
-			array('{host:key.last(1)} *+ 1', null, false),
-			array('{host:key.last(1)} /+ 1', null, false),
-			array('{host:key.last(1)} ++ 1', null, false),
-			array('{host:key.last(1)} -+ 1', null, false),
-			array('{host:key.last(1)} =+ 1', null, false),
-			array('{host:key.last(1)} #+ 1', null, false),
-			array('{host:key.last(1)} <+ 1', null, false),
-			array('{host:key.last(1)} >+ 1', null, false),
-			array('{host:key.last(1)} &+ 1', null, false),
-			array('{host:key.last(1)} |+ 1', null, false),
-
-			array('{host:key.last(1)}*+ 1', null, false),
-			array('{host:key.last(1)}/+ 1', null, false),
-			array('{host:key.last(1)}++ 1', null, false),
-			array('{host:key.last(1)}-+ 1', null, false),
-			array('{host:key.last(1)}=+ 1', null, false),
-			array('{host:key.last(1)}#+ 1', null, false),
-			array('{host:key.last(1)}<+ 1', null, false),
-			array('{host:key.last(1)}>+ 1', null, false),
-			array('{host:key.last(1)}&+ 1', null, false),
-			array('{host:key.last(1)}|+ 1', null, false),
-
-			array('{host:key.diff()} + 1', null, true),
-			array('{host:key.diff()} - 1', null, true),
-			array('{host:key.diff()} / 1', null, true),
-			array('{host:key.diff()} * 1', null, true),
-			array('{host:key.diff()} = 1', null, true),
-			array('{host:key.diff()} # 1', null, true),
-			array('{host:key.diff()} & 1', null, true),
-			array('{host:key.diff()} | 1', null, true),
-
-			array('{host:key.diff()}+ 1', null, true),
-			array('{host:key.diff()}- 1', null, true),
-			array('{host:key.diff()}/ 1', null, true),
-			array('{host:key.diff()}* 1', null, true),
-			array('{host:key.diff()}= 1', null, true),
-			array('{host:key.diff()}# 1', null, true),
-			array('{host:key.diff()}& 1', null, true),
-			array('{host:key.diff()}| 1', null, true),
-
-			array('{host:key.diff()} +1', null, true),
-			array('{host:key.diff()} -1', null, true),
-			array('{host:key.diff()} /1', null, true),
-			array('{host:key.diff()} *1', null, true),
-			array('{host:key.diff()} =1', null, true),
-			array('{host:key.diff()} #1', null, true),
-			array('{host:key.diff()} &1', null, true),
-			array('{host:key.diff()} |1', null, true),
-
-			array('{host:key.diff()}+1', null, true),
-			array('{host:key.diff()}-1', null, true),
-			array('{host:key.diff()}/1', null, true),
-			array('{host:key.diff()}*1', null, true),
-			array('{host:key.diff()}=1', null, true),
-			array('{host:key.diff()}#1', null, true),
-			array('{host:key.diff()}&1', null, true),
-			array('{host:key.diff()}|1', null, true),
-
-			array('{host:key.diff()}=1K', null, true),
-			array('{host:key.diff()}=1M', null, true),
-			array('{host:key.diff()}=1G', null, true),
-			array('{host:key.diff()}=1T', null, true),
-			array('{host:key.diff()}=1s', null, true),
-			array('{host:key.diff()}=1m', null, true),
-			array('{host:key.diff()}=1h', null, true),
-			array('{host:key.diff()}=1d', null, true),
-			array('{host:key.diff()}=1w', null, true),
-
-			array('{host:key.diff()}=1.56K', null, true),
-			array('{host:key.diff()}=1.56M', null, true),
-			array('{host:key.diff()}=1.56G', null, true),
-			array('{host:key.diff()}=1.56T', null, true),
-			array('{host:key.diff()}=1.56s', null, true),
-			array('{host:key.diff()}=1.56m', null, true),
-			array('{host:key.diff()}=1.56h', null, true),
-			array('{host:key.diff()}=1.56d', null, true),
-			array('{host:key.diff()}=1.56w', null, true),
-
-			array('{host:key.diff()} + 1.173640', null, true),
-			array('{host:key.diff()} - 1.173640', null, true),
-			array('{host:key.diff()} / 1.173640', null, true),
-			array('{host:key.diff()} * 1.173640', null, true),
-			array('{host:key.diff()} = 1.173640', null, true),
-			array('{host:key.diff()} # 1.173640', null, true),
-			array('{host:key.diff()} & 1.173640', null, true),
-			array('{host:key.diff()} | 1.173640', null, true),
-
-			array('{host:key.diff()}+ 1.173640', null, true),
-			array('{host:key.diff()}- 1.173640', null, true),
-			array('{host:key.diff()}/ 1.173640', null, true),
-			array('{host:key.diff()}* 1.173640', null, true),
-			array('{host:key.diff()}= 1.173640', null, true),
-			array('{host:key.diff()}# 1.173640', null, true),
-			array('{host:key.diff()}& 1.173640', null, true),
-			array('{host:key.diff()}| 1.173640', null, true),
-
-			array('{host:key.diff()} +1.173640', null, true),
-			array('{host:key.diff()} -1.173640', null, true),
-			array('{host:key.diff()} /1.173640', null, true),
-			array('{host:key.diff()} *1.173640', null, true),
-			array('{host:key.diff()} =1.173640', null, true),
-			array('{host:key.diff()} #1.173640', null, true),
-			array('{host:key.diff()} &1.173640', null, true),
-			array('{host:key.diff()} |1.173640', null, true),
-
-			array('{host:key.diff()}+1.173640', null, true),
-			array('{host:key.diff()}-1.173640', null, true),
-			array('{host:key.diff()}/1.173640', null, true),
-			array('{host:key.diff()}*1.173640', null, true),
-			array('{host:key.diff()}=1.173640', null, true),
-			array('{host:key.diff()}#1.173640', null, true),
-			array('{host:key.diff()}&1.173640', null, true),
-			array('{host:key.diff()}|1.173640', null, true),
-
-			array('{host:key.diff()} + 1 | {host:key.diff()}', null, true),
-			array('{host:key.diff()} - 1 & {host:key.diff()}', null, true),
-			array('{host:key.diff()} / 1 # {host:key.diff()}', null, true),
-			array('{host:key.diff()} * 1 = {host:key.diff()}', null, true),
-			array('{host:key.diff()} = 1 * {host:key.diff()}', null, true),
-			array('{host:key.diff()} # 1 / {host:key.diff()}', null, true),
-			array('{host:key.diff()} & 1 - {host:key.diff()}', null, true),
-			array('{host:key.diff()} | 1 + {host:key.diff()}', null, true),
-
-			array('{host:key.diff()} -- 1', null, true),
-			array('{host:key.diff()} ++ 1', null, false),
-			array('{host:key.diff()} // 1', null, false),
-			array('{host:key.diff()} ** 1', null, false),
-			array('{host:key.diff()} == 1', null, false),
-			array('{host:key.diff()} ## 1', null, false),
-			array('{host:key.diff()} && 1', null, false),
-			array('{host:key.diff()} || 1', null, false),
-
-			array('{host:key.diff()} +', null, false),
-			array('{host:key.diff()} -', null, false),
-			array('{host:key.diff()} /', null, false),
-			array('{host:key.diff()} *', null, false),
-			array('{host:key.diff()} =', null, false),
-			array('{host:key.diff()} #', null, false),
-			array('{host:key.diff()} &', null, false),
-			array('{host:key.diff()} |', null, false),
-
-			array('- {host:key.diff()}', null, true),
-			array('+ {host:key.diff()}', null, false),
-			array('/ {host:key.diff()}', null, false),
-			array('* {host:key.diff()}', null, false),
-			array('= {host:key.diff()}', null, false),
-			array('# {host:key.diff()}', null, false),
-			array('& {host:key.diff()}', null, false),
-			array('| {host:key.diff()}', null, false),
-
-			array('{host:key.diff()}=0', null, true),
-			array('{host:key.count(1,)}=0', null, true),
-			array('{host:key.count( 1,)}=0', null, true),
-			array('{host:key.count(  1,)}=0', null, true),
-			array('{host:key.count(1, )}=0', null, true),
-			array('{host:key.count(1,  )}=0', null, true),
-
-			array('{host:key.str(")}=0', null, false),
-			array('{host:key.str("")}=0', null, true),
-			array('{host:key.str(""")}=0', null, false),
-			array('{host:key.str("""")}=0', null, false),
-
-			array('{host:key.str( ")}=0', null, false),
-			array('{host:key.str( "")}=0', null, true),
-			array('{host:key.str( """)}=0', null, false),
-			array('{host:key.str( """")}=0', null, false),
-
-			array('{host:key.str(  ")}=0', null, false),
-			array('{host:key.str(  "")}=0', null, true),
-			array('{host:key.str(  """)}=0', null, false),
-			array('{host:key.str(  """")}=0', null, false),
-
-			array('{host:key.count(1,")}=0', null, false),
-			array('{host:key.count(1,"")}=0', null, true),
-			array('{host:key.count(1,""")}=0', null, false),
-			array('{host:key.count(1,"""")}=0', null, false),
-
-			array('{host:key.count(1, ")}=0', null, false),
-			array('{host:key.count(1, "")}=0', null, true),
-			array('{host:key.count(1, """)}=0', null, false),
-			array('{host:key.count(1, """")}=0', null, false),
-
-			array('{host:key.count(1,  ")}=0', null, false),
-			array('{host:key.count(1,  "")}=0', null, true),
-			array('{host:key.count(1,  """)}=0', null, false),
-			array('{host:key.count(1,  """")}=0', null, false),
-
-			array('{host:key.count(1,"",")}=0', null, false),
-			array('{host:key.count(1,"","")}=0', null, true),
-			array('{host:key.count(1,"",""")}=0', null, false),
-			array('{host:key.count(1,"","""")}=0', null, false),
-
-			array('{host:key.count(1,"", ")}=0', null, false),
-			array('{host:key.count(1,"", "")}=0', null, true),
-			array('{host:key.count(1,"", """)}=0', null, false),
-			array('{host:key.count(1,"", """")}=0', null, false),
-
-			array('{host:key.count(1,"",  ")}=0', null, false),
-			array('{host:key.count(1,"",  "")}=0', null, true),
-			array('{host:key.count(1,"",  """)}=0', null, false),
-			array('{host:key.count(1,"",  """")}=0', null, false),
-
-			array('{host:key.str("\")}=0', null, false),
-			array('{host:key.str("\"")}=0', null, true),
-			array('{host:key.str("\\\\"")}=0', null, true),
-			array('{host:key.str("\""")}=0', null, false),
-			array('{host:key.str("\"""")}=0', null, false),
-
-			array('{host:key.str(\")}=0', null, true),
-			array('{host:key.str(param\")}=0', null, true),
-			array('{host:key.str(param")}=0', null, true),
-
-			array('{host:key.str( \")}=0', null, true),
-			array('{host:key.str( param\")}=0', null, true),
-			array('{host:key.str( param")}=0', null, true),
-
-			array('{host:key.str(  \")}=0', null, true),
-			array('{host:key.str(  param\")}=0', null, true),
-			array('{host:key.str(  param")}=0', null, true),
-
-			array('{host:key.str(()}=0', null, true),
-			array('{host:key.str(param()}=0', null, true),
-
-			array('{host:key.str( ()}=0', null, true),
-			array('{host:key.str( param()}=0', null, true),
-
-			array('{host:key.str(  ()}=0', null, true),
-			array('{host:key.str(  param()}=0', null, true),
-
-			array('{host:key.str())}=0', null, false),
-			array('{host:key.str(param))}=0', null, false),
-
-			array('{host:key.str( ))}=0', null, false),
-			array('{host:key.str( param))}=0', null, false),
-
-			array('{host:key.str(  ))}=0', null, false),
-			array('{host:key.str(  param))}=0', null, false),
-
-			array('{host:key.str("(")}=0', null, true),
-			array('{host:key.str("param(")}=0', null, true),
-
-			array('{host:key.str(")")}=0', null, true),
-			array('{host:key.str("param)")}=0', null, true),
-
-			array('{host:key.str()}=0', null, true),
-			array('{host:key.str( )}=0', null, true),
-			array('{host:key.str(" ")}=0', null, true),
-			array('{host:key.str(abc)}=0', null, true),
-			array('{host:key.str(\'abc\')}=0', null, true),
-			array('{host:key.str("")}=0', null, true),
-			array('{host:key.last(0)}=0', null, true),
-			array('{host:key.str(aaa()}=0', null, true),
-
-			array('{host:key.last(0)}=0', null, true),
-			array('{host:key.str(aaa()}=0', null, true),
-			array('({hostA:keyA.str("abc")}=0) | ({hostB:keyB.last(123)}=0)', null, true),
-			array('{host:key[asd[].str(aaa()}=0', null, true),
-			array('{host:key["param].diff()"].diff()}=0', null, true),
-			array('{host:key[param].diff()].diff()}', null, false),
-			array('{host:key[asd[,asd[,[]].str(aaa()}=0', null, true),
-			array('{host:key[[],[],[]].str()}=0', null, true),
-			array('{host:key[].count(1,[],[])}=0', null, true),
-			array('({hostA:keyA.str("abc")}) / ({hostB:keyB.last(123)})=(0)', null, true),
-			array('({hostA:keyA.str("abc")}=0) | ({hostB:keyB.last(123)}=0)', null, true),
-			array('({hostA:keyA.str("abc")}=0) & ({hostB:keyB.last(123)}=0)', null, true),
-
-			array('{hostkey.last(0)}=0', null, false),
-			array('{host:keylast(0)}=0', null, false),
-			array('{host:key.last(0}=0', null, false),
-			array('{host:key.last(0)}=', null, false),
-			array('{host:key.str()=0', null, false),
-			array('{host:key.last()}#0}', null, false),
-			array('{host:key.str()}<>0', null, false),
-			array('({host:key.str(aaa()}=0', null, false),
-			array('(({host:key.str(aaa()}=0)', null, false),
-			array('{host:key.str(aaa()}=0)', null, false),
-			array('({hostA:keyA.str("abc")}=0) || ({hostB:keyB.last(123)}=0)', null, false),
-			array('{host:key.last()}<>0', null, false),
-			array('{hostA:keyA.str("abc")} / ({hostB:keyB.last(123)}=0', null, false),
-			array('({hostA:keyA.str("abc")} / ({hostB:keyB.last(123)})=0', null, false),
-
-			array('{constant}', null, false),
-			array('{cons tant}', null, false),
-			array('{expression}', null, false),
-			array('{expre ssion}', null, false),
-			array('host:key.str()', null, false),
-			array('{host:key.str()', null, false),
-			array('host:key.str()}', null, false),
-			array(' {host:key.str()}', null, true),
-			array('{host:key.str()} ', null, true),
-			array('{ host:key.str()}', null, true),
-			array('{host :key.str()}', null, true),
-			array('{host:key.str(-5)}', null, true),
-			array('{host:key.str(+5)}', null, true),
-			array('{host:key.str([-5)}', null, true),
-			array('{host:key.str(-5])}', null, true),
-			array('{host:key.str((-5)}', null, true),
-			array('{host:key.str(-5))}', null, false),
-			array('{host:key.str(-5)*1}', null, false),
-			array('0={host:key["a"b].str()}', null, false),
-			array('0={host:key[].str(a"b"c)}', null, true),
-			array('0={host:key[].str("a\"b\"c")}', null, true),
-			array('0={host:key[].str("a\\\\"b\\\\"c")}', null, true),
-			array('0={host:key[].str("a"b)}', null, false),
-			array('0={host:key[].str(,"a"b,)}', null, false),
-			array('0={host:key[].str("","a"b,"")}', null, false),
-			array('0={host:key.str)', null, false),
-			array('1z={host:key.str()', null, false),
-			array('1z={host:key.str()}', null, false),
-			array('0={host:key[].str(")}', null, false),
-			array('0={host:key[].str( ")}', null, false),
-			array('0={host:key[].str(")}")}', null, true),
-			array('0={host:key[].str( ")}")}', null, true),
-			array(
-				'({host1:key1.last(0)}/{host2:key2.last(5)})/10+2*{TRIGGER.VALUE}&{$USERMACRO1}+(-{$USERMACRO2})+'.
-					'-{$USERMACRO3}*-12K+12.5m',
-				array(
-					'error' => '',
-					'expressions' => array(
-						0 => array(
-							'expression' => '{host1:key1.last(0)}',
-							'pos'=> 1,
-							'host' => 'host1',
-							'item' => 'key1',
-							'function' => 'last(0)',
-							'functionName' => 'last',
-							'functionParam' => '0',
-							'functionParamList' => array('0')
-						),
-						1 => array(
-							'expression' => '{host2:key2.last(5)}',
-							'pos'=> 22,
-							'host' => 'host2',
-							'item' => 'key2',
-							'function' => 'last(5)',
-							'functionName' => 'last',
-							'functionParam' => '5',
-							'functionParamList' => array('5')
-						)
-					),
-					'macros' => array(
-						0 => array(
-							'expression' => '{TRIGGER.VALUE}'
-						)
-					),
-					'usermacros' => array(
-						0 => array(
-							'expression' => '{$USERMACRO1}'
-						),
-						1 => array(
-							'expression' => '{$USERMACRO2}'
-						),
-						2 => array(
-							'expression' => '{$USERMACRO3}'
-						)
-					)
-				),
-				true
-			),
-			array(
-				'-12+{TRIGGER.VALUE}/(({host1:key1[].last(5)}+(5*(1-(-3*5&((7|9))#1)*{host2:key2[""].last(123)})/10'.
-					'/10/10)+{$USERMACRO1})-{$USERMACRO2})',
-				null,
-				true
-			),
-			array('{host:key["{$USERMACRO1}",{$USERMACRO2}].str()}', null, true),
-			array('{host:key[].str("{$USERMACRO1}",{$USERMACRO2})}', null, true),
-			array('{host:key["{HOSTNAME1}",{HOSTNAME2}].str()}', null, true),
-			array(
-				'{host:key[].str("{HOSTNAME1}",{HOSTNAME2})}',
-				array(
-					'error' => '',
-					'expressions' => array(
-						0 => array(
-							'expression' => '{host:key[].str("{HOSTNAME1}",{HOSTNAME2})}',
-							'pos' => 0,
-							'host' => 'host',
-							'item' => 'key[]',
-							'function' => 'str("{HOSTNAME1}",{HOSTNAME2})',
-							'functionName' => 'str',
-							'functionParam' => '"{HOSTNAME1}",{HOSTNAME2}',
-							'functionParamList' => array('{HOSTNAME1}', '{HOSTNAME2}')
-						)
-					),
-					'macros' => array(),
-					'usermacros' => array()
-				),
-				true
-			),
-			array('{host:key[].count(1,"{HOSTNAME1}",{HOSTNAME2})}', null, true),
-			array('{host:key[].str()}=-1=--2=---3=----4=-----5', null, false),
-			array('{host:key[].str()}=-1=--2=---3=----4=-----5', null, false),
-			array('{host:key[].str()}=-1', null, true),
-			array('{host:key[].str()}+-1', null, true),
-			array('{host:key[].str()}--1', null, true),
-			array('{host:key[].str()}-(-1)', null, true),
-			array('{host:key[].str()}-(-(-(-1)))', null, true),
-			array('{host:key[{$$$},"{$$$}"].str()}', null, true),
-			array('{host:key[{!!!},"{!!!}"].str()}', null, true),
-			array('{host:key[{$USERMACRO1,"{$USERMACRO"].str()}', null, true),
-			array('{host:key[].count(1,{$USERMACRO1,"{$USERMACRO")}', null, true),
-			array('{host:key[{$USERMACRO1}abc,"{$USERMACRO2}"].str()}', null, true),
-			array('{host:key[{$USERMACRO1},"{$USERMACRO2}abc"].str()}', null, true),
-			array('{host:key[].count(1,{$USERMACRO1}abc,"{$USERMACRO2}")}', null, true),
-			array('{host:key[].count(1,{$USERMACRO1},"{$USERMACRO2}abc")}', null, true),
-			array('{host:key[abc{HOSTNAME1},"{HOSTNAME2}"].str()}', null, true),
-			array('{host:key[{HOSTNAME1},"abc{HOSTNAME2}"].str()}', null, true),
-			array('{host:key[].count(1,abc{HOSTNAME1},"{HOSTNAME2}")}', null, true),
-			array('{host:key[].count(1,{HOSTNAME1},"abc{HOSTNAME2}")}', null, true),
-			array('{host:key[{host:key.last(0)},"{host:key.last(0)}"].str()}', null, true),
-			array('{host:key[].count(1,{host:key.last(0)},"{host:key.last(0)}")}', null, false),
-			array('{host:key[].count(1,{host:key.last(0},"{host:key.last(0)}")}', null, true),
-			array('{host:key[].count(1,{host:key.last(0)}+{host:key.last(0)}', null, true),
-			array('{host:key[].count(1,{host:key.last(0)}', null, true),
-			array('{host:key[{host:key[].last(0)},"{host:key[].last(0)}"].str()}', null, false),
-			array('{host:key["{host:key[].last(0)}",{host:key[].last(0)}].str()}', null, false),
-			array('{host:key["{host:key[].last(0)}",{host:key[].last(0)}', null, true),
-			array('{host:key[{host:key[].last(0)}+{host:key[].last(0)}', null, true),
-			array('{host:key[{host:key[].last(0)}', null, true),
-			array('{host:key.last({$UPPERCASE})}', null, true),
-			array('{host:key.last(0)}+{$UPPERCASE}', null, true),
-			array('{host:key.last({$lowercase})}', null, true),
-			array('{host:key.last(0)}+{$lowercase}', null, false),
-			array('{host:key.last(1.23)}', null, true),
-			array('{host:key.last(1.23s)}', null, true),
-			array('{host:key.last(#1.23)}', null, true),
-			array('{host:key.abschange()}', null, true),
-			array('{host:key.abschange(0)}', null, true),
-			array('{host:key.abschange(0,)}', null, true),
-			array('{host:key.avg()}', null, true),
-			array('{host:key.avg(123)}', null, true),
-			array('{host:key.avg(123s)}', null, true),
-			array('{host:key.avg(#123)}', null, true),
-			array('{host:key.avg(123,456)}', null, true),
-			array('{host:key.avg(123,456s)}', null, true),
-			array('{host:key.avg(123,456s,)}', null, true),
-			array('{host:key.change()}', null, true),
-			array('{host:key.change(0)}', null, true),
-			array('{host:key.change(0,)}', null, true),
-			array('{host:key.count()}', null, true),
-			array('{host:key.count(123)}', null, true),
-			array('{host:key.count(123,text)}', null, true),
-			array('{host:key.count(123s,text)}', null, true),
-			array('{host:key.count(#123,text)}', null, true),
-			array('{host:key.count(123,text,eq)}', null, true),
-			array('{host:key.count(123,text,ne)}', null, true),
-			array('{host:key.count(123,text,gt)}', null, true),
-			array('{host:key.count(123,text,ge)}', null, true),
-			array('{host:key.count(123,text,lt)}', null, true),
-			array('{host:key.count(123,text,le)}', null, true),
-			array('{host:key.count(123,text,like)}', null, true),
-			array('{host:key.count(123,text,like,456)}', null, true),
-			array('{host:key.count(123,text,like,456s)}', null, true),
-			array('{host:key.count(123,text,nonexistent,456s)}', null, true),
-			array('{host:key.count(123,text,nonexistent,456s,)}', null, true),
-			array('{host:key.date()}', null, true),
-			array('{host:key.date(0)}', null, true),
-			array('{host:key.date(0,)}', null, true),
-			array('{host:key.dayofweek()}', null, true),
-			array('{host:key.dayofweek(0)}', null, true),
-			array('{host:key.dayofweek(0,)}', null, true),
-			array('{host:key.delta()}', null, true),
-			array('{host:key.delta(123)}', null, true),
-			array('{host:key.delta(123s)}', null, true),
-			array('{host:key.delta(#123)}', null, true),
-			array('{host:key.delta(123,456)}', null, true),
-			array('{host:key.delta(123,456s)}', null, true),
-			array('{host:key.delta(123,456s,)}', null, true),
-			array('{host:key.diff()}', null, true),
-			array('{host:key.diff(0)}', null, true),
-			array('{host:key.diff(0,)}', null, true),
-			array('{host:key.fuzzytime()}', null, true),
-			array('{host:key.fuzzytime(123)}', null, true),
-			array('{host:key.fuzzytime(#123)}', null, true),
-			array('{host:key.fuzzytime(123,)}', null, true),
-			array('{host:key.iregexp()}', null, true),
-			array('{host:key.iregexp(text)}', null, true),
-			array('{host:key.iregexp(text,123)}', null, true),
-			array('{host:key.iregexp(text,123s)}', null, true),
-			array('{host:key.iregexp(text,#123)}', null, true),
-			array('{host:key.iregexp(text,#123,)}', null, true),
-			array('{host:key.last()}', null, true),
-			array('{host:key.last(0)}', null, true),
-			array('{host:key.last(#123)}', null, true),
-			array('{host:key.last(#123,456)}', null, true),
-			array('{host:key.last(#123,456s)}', null, true),
-			array('{host:key.last(#123,456s,)}', null, true),
-			array('{host:key.logseverity()}', null, true),
-			array('{host:key.logseverity(0)}', null, true),
-			array('{host:key.logseverity(0,)}', null, true),
-			array('{host:key.logsource()}', null, true),
-			array('{host:key.logsource(text)}', null, true),
-			array('{host:key.logsource(text,)}', null, true),
-			array('{host:key.max()}', null, true),
-			array(
-				'{host:key.max(123)}',
-				array(
-					'error' => '',
-					'expressions' => array(
-						0 => array(
-							'expression' => '{host:key.max(123)}',
-							'pos' => 0,
-							'host' => 'host',
-							'item' => 'key',
-							'function' => 'max(123)',
-							'functionName' => 'max',
-							'functionParam' => '123',
-							'functionParamList' => array('123')
-						)
-					),
-					'macros' => array(),
-					'usermacros' => array()
-				),
-				true
-			),
-			array('{host:key.max(123s)}', null, true),
-			array('{host:key.max(#123)}', null, true),
-			array('{host:key.max(123,456)}', null, true),
-			array('{host:key.max(123,456s)}', null, true),
-			array('{host:key.max(123,456s,)}', null, true),
-			array('{host:key.min()}', null, true),
-			array('{host:key.min(123)}', null, true),
-			array('{host:key.min(123s)}', null, true),
-			array('{host:key.min(#123)}', null, true),
-			array('{host:key.min(123,456)}', null, true),
-			array('{host:key.min(123,456s)}', null, true),
-			array('{host:key.min(123,456s,)}', null, true),
-			array('{host:key.nodata()}', null, true),
-			array('{host:key.nodata(123)}', null, true),
-			array('{host:key.nodata(123s)}', null, true),
-			array('{host:key.nodata(#123)}', null, true),
-			array('{host:key.nodata(123s,)}', null, true),
-			array('{host:key.now()}', null, true),
-			array('{host:key.now(0)}', null, true),
-			array('{host:key.now(0,)}', null, true),
-			array('{host:key.prev()}', null, true),
-			array('{host:key.prev(0)}', null, true),
-			array('{host:key.prev(0,)}', null, true),
-			array('{host:key.regexp()}', null, true),
-			array('{host:key.regexp(text)}', null, true),
-			array('{host:key.regexp(text,123)}', null, true),
-			array('{host:key.regexp(text,123s)}', null, true),
-			array('{host:key.regexp(text,#123)}', null, true),
-			array('{host:key.regexp(text,#123,)}', null, true),
-			array('{host:key.str()}', null, true),
-			array('{host:key.str(text)}', null, true),
-			array('{host:key.str(text,123)}', null, true),
-			array('{host:key.str(text,123s)}', null, true),
-			array('{host:key.str(text,#123)}', null, true),
-			array('{host:key.str(text,#123,)}', null, true),
-			array('{host:key.strlen()}', null, true),
-			array('{host:key.strlen(0)}', null, true),
-			array('{host:key.strlen(#123)}', null, true),
-			array('{host:key.strlen(#123,456)}', null, true),
-			array('{host:key.strlen(#123,456s)}', null, true),
-			array('{host:key.strlen(#123,456s,)}', null, true),
-			array('{host:key.sum()}', null, true),
-			array('{host:key.sum(123)}', null, true),
-			array('{host:key.sum(123s)}', null, true),
-			array('{host:key.sum(#123)}', null, true),
-			array('{host:key.sum(123,456)}', null, true),
-			array('{host:key.sum(123,456s)}', null, true),
-			array('{host:key.sum(123,456s,)}', null, true),
-			array('{host:key.time()}', null, true),
-			array('{host:key.time(0)}', null, true),
-			array('{host:key.time(0,)}', null, true),
-			array('{host:key.nonexistent()}', null, true),
-			array('{host:key.last(0)}+{TRIGGER.VALUE}', null, true),
-			array('{host:key.last(0)}+{trigger.value}', null, false),
-			array('(({host:key.last(0)}+1.)) + + (({host:key.last(0)}+1.))', null, false),
-			array('(({host:key.last(0)}+1.)) + - (({host:key.last(0)}+1.))', null, false),
-			array('(({host:key.last(0)}+1.)) + (({host:key.last(0)}+1.))', null, false),
-			array('(({host:key.last(0)}+1.))', null, false),
-			array('(--({host:key.last(0)}+1.))', null, false),
-			array('(+({host:key.last(0)}+1.))', null, false),
-			array('(/({host:key.last(0)}+1.))', null, false),
-			array('({host:key.last(0)}+1.)/({host:key.last(0)}+1.)', null, false),
-			array('({host:key.last(0)}+1.)-({host:key.last(0)}+1.)', null, false),
-			array('({host:key.last(0)}+1.)+({host:key.last(0)}+1.)', null, false),
-			array('({host:key.last(0)}+1.)|({host:key.last(0)}+1.)', null, false),
-			array('({host:key.last(0)}+1.)&({host:key.last(0)}+1.)', null, false),
-			array('({host:key.last(0)}+1.)&({host:key.last(0)}+1.)/({host:key.last(0)}+1.)', null, false),
-			array('({host:key.last(0)}+1.)+({host:key.last(0)}+1.)/({host:key.last(0)}+1.)', null, false),
-			array(
-				'1 - (1/({host:key.last(0)}+1.))+(({host:key.last(0)}+1.))/({host:key.last(0)}+1.)/({host:key.last('.
-					'0)}+1.)',
-				null,
-				false
-			),
-			array('(({host:key.last(0)}+.1)) + + (({host:key.last(0)}+.1))', null, false),
-			array('(({host:key.last(0)}+.1)) + - (({host:key.last(0)}+.1))', null, false),
-			array('(({host:key.last(0)}+.1)) + (({host:key.last(0)}+.1))', null, false),
-			array('(({host:key.last(0)}+.1))', null, false),
-			array('(--({host:key.last(0)}+.1))', null, false),
-			array('(+({host:key.last(0)}+.1))', null, false),
-			array('(/({host:key.last(0)}+.1))', null, false),
-			array('({host:key.last(0)}+.1)/({host:key.last(0)}+.1)', null, false),
-			array('({host:key.last(0)}+.1)-({host:key.last(0)}+.1)', null, false),
-			array('({host:key.last(0)}+.1)+({host:key.last(0)}+.1)', null, false),
-			array('({host:key.last(0)}+.1)|({host:key.last(0)}+.1)', null, false),
-			array('({host:key.last(0)}+.1)&({host:key.last(0)}+.1)', null, false),
-			array('({host:key.last(0)}+.1)&({host:key.last(0)}+.1)/({host:key.last(0)}+.1)', null, false),
-			array('({host:key.last(0)}+.1)+({host:key.last(0)}+.1)/({host:key.last(0)}+.1)', null, false),
-			array(
-				'1 - (1/({host:key.last(0)}+.1))+(({host:key.last(0)}+.1))/({host:key.last(0)}+.1)/({host:key.last('.
-					'0)}+.1)',
-				null,
-				false
-			),
-			array('(({host:key.last(0)}+0 .1)) + + (({host:key.last(0)}+0 .1))', null, false),
-			array('(({host:key.last(0)}+0 .1)) + - (({host:key.last(0)}+0 .1))', null, false),
-			array('(({host:key.last(0)}+0 .1)) + (({host:key.last(0)}+0 .1))', null, false),
-			array('(({host:key.last(0)}+0 .1))', null, false),
-			array('(--({host:key.last(0)}+0 .1))', null, false),
-			array('(+({host:key.last(0)}+0 .1))', null, false),
-			array('(/({host:key.last(0)}+0 .1))', null, false),
-			array('({host:key.last(0)}+0 .1)/({host:key.last(0)}+0 .1)', null, false),
-			array('({host:key.last(0)}+0 .1)-({host:key.last(0)}+0 .1)', null, false),
-			array('({host:key.last(0)}+0 .1)+({host:key.last(0)}+0 .1)', null, false),
-			array('({host:key.last(0)}+0 .1)|({host:key.last(0)}+0 .1)', null, false),
-			array('({host:key.last(0)}+0 .1)&({host:key.last(0)}+0 .1)', null, false),
-			array('({host:key.last(0)}+0 .1)&({host:key.last(0)}+0 .1)/({host:key.last(0)}+0 .1)', null, false),
-			array('({host:key.last(0)}+0 .1)+({host:key.last(0)}+0 .1)/({host:key.last(0)}+0 .1)', null, false),
-			array(
-				'1 - (1/({host:key.last(0)}+0 .1))+(({host:key.last(0)}+0 .1))/({host:key.last(0)}+0 .1)/({host:key'.
-					'.last(0)}+0 .1)',
-				null,
-				false
-			),
-			array('(({host:key.last(0)}+1 K)) + + (({host:key.last(0)}+1 K))', null, false),
-			array('(({host:key.last(0)}+1 K)) + - (({host:key.last(0)}+1 K))', null, false),
-			array('(({host:key.last(0)}+1 K)) + (({host:key.last(0)}+1 K))', null, false),
-			array('(({host:key.last(0)}+1 K))', null, false),
-			array('(--({host:key.last(0)}+1 K))', null, false),
-			array('(+({host:key.last(0)}+1 K))', null, false),
-			array('(/({host:key.last(0)}+1 K))', null, false),
-			array('({host:key.last(0)}+1 K)/({host:key.last(0)}+1 K)', null, false),
-			array('({host:key.last(0)}+1 K)-({host:key.last(0)}+1 K)', null, false),
-			array('({host:key.last(0)}+1 K)+({host:key.last(0)}+1 K)', null, false),
-			array('({host:key.last(0)}+1 K)|({host:key.last(0)}+1 K)', null, false),
-			array('({host:key.last(0)}+1 K)&({host:key.last(0)}+1 K)', null, false),
-			array('({host:key.last(0)}+1 K)&({host:key.last(0)}+1 K)/({host:key.last(0)}+1 K)', null, false),
-			array('({host:key.last(0)}+1 K)+({host:key.last(0)}+1 K)/({host:key.last(0)}+1 K)', null, false),
-			array(
-				'1 - (1/({host:key.last(0)}+1 K))+(({host:key.last(0)}+1 K))/({host:key.last(0)}+1 K)/({host:key.la'.
-					'st(0)}+1 K)',
-				null,
-				false
-			),
-			array('(({host:key.last(0)}+.)) + + (({host:key.last(0)}+.))', null, false),
-			array('(({host:key.last(0)}+.)) + - (({host:key.last(0)}+.))', null, false),
-			array('(({host:key.last(0)}+.)) + (({host:key.last(0)}+.))', null, false),
-			array('(({host:key.last(0)}+.))', null, false),
-			array('(--({host:key.last(0)}+.))', null, false),
-			array('(+({host:key.last(0)}+.))', null, false),
-			array('(/({host:key.last(0)}+.))', null, false),
-			array('({host:key.last(0)}+.)/({host:key.last(0)}+.)', null, false),
-			array('({host:key.last(0)}+.)-({host:key.last(0)}+.)', null, false),
-			array('({host:key.last(0)}+.)+({host:key.last(0)}+.)', null, false),
-			array('({host:key.last(0)}+.)|({host:key.last(0)}+.)', null, false),
-			array('({host:key.last(0)}+.)&({host:key.last(0)}+.)', null, false),
-			array('({host:key.last(0)}+.)&({host:key.last(0)}+.)/({host:key.last(0)}+.)', null, false),
-			array('({host:key.last(0)}+.)+({host:key.last(0)}+.)/({host:key.last(0)}+.)', null, false),
-			array(
-				'1 - (1/({host:key.last(0)}+.))+(({host:key.last(0)}+.))/({host:key.last(0)}+.)/({host:key.last(0)}'.
-					'+.)',
-				null,
-				false
-			),
-			array('(({host:key.last(0)}+.K)) + + (({host:key.last(0)}+.K))', null, false),
-			array('(({host:key.last(0)}+.K)) + - (({host:key.last(0)}+.K))', null, false),
-			array('(({host:key.last(0)}+.K)) + (({host:key.last(0)}+.K))', null, false),
-			array('(({host:key.last(0)}+.K))', null, false),
-			array('(--({host:key.last(0)}+.K))', null, false),
-			array('(+({host:key.last(0)}+.K))', null, false),
-			array('(/({host:key.last(0)}+.K))', null, false),
-			array('({host:key.last(0)}+.K)/({host:key.last(0)}+.K)', null, false),
-			array('({host:key.last(0)}+.K)-({host:key.last(0)}+.K)', null, false),
-			array('({host:key.last(0)}+.K)+({host:key.last(0)}+.K)', null, false),
-			array('({host:key.last(0)}+.K)|({host:key.last(0)}+.K)', null, false),
-			array('({host:key.last(0)}+.K)&({host:key.last(0)}+.K)', null, false),
-			array('({host:key.last(0)}+.K)&({host:key.last(0)}+.K)/({host:key.last(0)}+.K)', null, false),
-			array('({host:key.last(0)}+.K)+({host:key.last(0)}+.K)/({host:key.last(0)}+.K)', null, false),
-			array(
-				'1 - (1/({host:key.last(0)}+.K))+(({host:key.last(0)}+.K))/({host:key.last(0)}+.K)/({host:key.last('.
-					'0)}+.K)',
-				null,
-				false
-			),
-			array('(({host:key.last(0)}+K)) + + (({host:key.last(0)}+K))', null, false),
-			array('(({host:key.last(0)}+K)) + - (({host:key.last(0)}+K))', null, false),
-			array('(({host:key.last(0)}+K)) + (({host:key.last(0)}+K))', null, false),
-			array('(({host:key.last(0)}+K))', null, false),
-			array('(--({host:key.last(0)}+K))', null, false),
-			array('(+({host:key.last(0)}+K))', null, false),
-			array('(/({host:key.last(0)}+K))', null, false),
-			array('({host:key.last(0)}+K)/({host:key.last(0)}+K)', null, false),
-			array('({host:key.last(0)}+K)-({host:key.last(0)}+K)', null, false),
-			array('({host:key.last(0)}+K)+({host:key.last(0)}+K)', null, false),
-			array('({host:key.last(0)}+K)|({host:key.last(0)}+K)', null, false),
-			array('({host:key.last(0)}+K)&({host:key.last(0)}+K)', null, false),
-			array('({host:key.last(0)}+K)&({host:key.last(0)}+K)/({host:key.last(0)}+K)', null, false),
-			array('({host:key.last(0)}+K)+({host:key.last(0)}+K)/({host:key.last(0)}+K)', null, false),
-			array(
-				'1 - (1/({host:key.last(0)}+K))+(({host:key.last(0)}+K))/({host:key.last(0)}+K)/({host:key.last(0)}'.
-					'+K)',
-				null,
-				false
-			),
-			array(
-				'({host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}) + + ({host:key.last(1)}+(1/2+2*2-3|4)'.
-					'|23-34>{host:key.last(#1)})',
-				null,
-				false
-			),
-			array(
-				'({host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}) + - ({host:key.last(1)}+(1/2+2*2-3|'.
-					'4)|23-34>{host:key.last(#1)})',
-				array(
-					'error' => '',
-					'expressions' => array(
-						0 => array(
-							'expression' => '{host:key.last(1)}',
-							'pos'=> 1,
-							'host' => 'host',
-							'item' => 'key',
-							'function' => 'last(1)',
-							'functionName' => 'last',
-							'functionParam' => '1',
-							'functionParamList' => array('1')
-						),
-						1 => array(
-							'expression' => '{host:key.last(#1)}',
-							'pos'=> 40,
-							'host' => 'host',
-							'item' => 'key',
-							'function' => 'last(#1)',
-							'functionName' => 'last',
-							'functionParam' => '#1',
-							'functionParamList' => array('#1')
-						),
-						2 => array(
-							'expression' => '{host:key.last(1)}',
-							'pos'=> 66,
-							'host' => 'host',
-							'item' => 'key',
-							'function' => 'last(1)',
-							'functionName' => 'last',
-							'functionParam' => '1',
-							'functionParamList' => array('1')
-						),
-						3 => array(
-							'expression' => '{host:key.last(#1)}',
-							'pos'=> 105,
-							'host' => 'host',
-							'item' => 'key',
-							'function' => 'last(#1)',
-							'functionName' => 'last',
-							'functionParam' => '#1',
-							'functionParamList' => array('#1')
-						)
-					),
-					'macros' => array(),
-					'usermacros' => array()
-				),
-				true
-			),
-			array(
-				'({host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}) + ({host:key.last(1)}+(1/2+2*2-3|4)|'.
-					'23-34>{host:key.last(#1)})',
-				null,
-				true
-			),
-			array('({host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)})', null, true),
-			array('(--{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)})', null, false),
-			array('(+{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)})', null, false),
-			array('(/{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)})', null, false),
-			array(
-				'{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}/{host:key.last(1)}+(1/2+2*2-3|4)|23-34'.
-					'>{host:key.last(#1)}',
-				null,
-				true
-			),
-			array(
-				'{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}-{host:key.last(1)}+(1/2+2*2-3|4)|23-34'.
-					'>{host:key.last(#1)}',
-				null,
-				true
-			),
-			array(
-				'{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}+{host:key.last(1)}+(1/2+2*2-3|4)|23-34'.
-					'>{host:key.last(#1)}',
-				null,
-				true
-			),
-			array(
-				'{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}|{host:key.last(1)}+(1/2+2*2-3|4)|23-34'.
-					'>{host:key.last(#1)}',
-				null,
-				true
-			),
-			array(
-				'{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}&{host:key.last(1)}+(1/2+2*2-3|4)|23-34'.
-					'>{host:key.last(#1)}',
-				null,
-				true
-			),
-			array(
-				'{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}&{host:key.last(1)}+(1/2+2*2-3|4)|23-34'.
-					'>{host:key.last(#1)}/{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}',
-				null,
-				true
-			),
-			array(
-				'{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}+{host:key.last(1)}+(1/2+2*2-3|4)|23-34'.
-					'>{host:key.last(#1)}/{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}',
-				null,
-				true
-			),
-			array(
-				'1 - (1/{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)})+({host:key.last(1)}+(1/2+2*2-3|'.
-					'4)|23-34>{host:key.last(#1)})/{host:key.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}/{host:ke'.
-					'y.last(1)}+(1/2+2*2-3|4)|23-34>{host:key.last(#1)}',
-				null,
-				true
-			),
-			array('({host:key.last(0)}+(1/2+2*2-3|4)|23-34) + + ({host:key.last(0)}+(1/2+2*2-3|4)|23-34)', null, false),
-			array('({host:key.last(0)}+(1/2+2*2-3|4)|23-34) + - ({host:key.last(0)}+(1/2+2*2-3|4)|23-34)', null, true),
-			array('({host:key.last(0)}+(1/2+2*2-3|4)|23-34) + ({host:key.last(0)}+(1/2+2*2-3|4)|23-34)', null, true),
-			array('({host:key.last(0)}+(1/2+2*2-3|4)|23-34)', null, true),
-			array('(--{host:key.last(0)}+(1/2+2*2-3|4)|23-34)', null, false),
-			array('(+{host:key.last(0)}+(1/2+2*2-3|4)|23-34)', null, false),
-			array('(/{host:key.last(0)}+(1/2+2*2-3|4)|23-34)', null, false),
-			array('{host:key.last(0)}+(1/2+2*2-3|4)|23-34/{host:key.last(0)}+(1/2+2*2-3|4)|23-34', null, true),
-			array('{host:key.last(0)}+(1/2+2*2-3|4)|23-34-{host:key.last(0)}+(1/2+2*2-3|4)|23-34', null, true),
-			array('{host:key.last(0)}+(1/2+2*2-3|4)|23-34+{host:key.last(0)}+(1/2+2*2-3|4)|23-34', null, true),
-			array('{host:key.last(0)}+(1/2+2*2-3|4)|23-34|{host:key.last(0)}+(1/2+2*2-3|4)|23-34', null, true),
-			array('{host:key.last(0)}+(1/2+2*2-3|4)|23-34&{host:key.last(0)}+(1/2+2*2-3|4)|23-34', null, true),
-			array(
-				'{host:key.last(0)}+(1/2+2*2-3|4)|23-34&{host:key.last(0)}+(1/2+2*2-3|4)|23-34/{host:key.last(0)}+('.
-					'1/2+2*2-3|4)|23-34',
-				null,
-				true
-			),
-			array(
-				'{host:key.last(0)}+(1/2+2*2-3|4)|23-34+{host:key.last(0)}+(1/2+2*2-3|4)|23-34/{host:key.last(0)}+(1'.
-					'/2+2*2-3|4)|23-34',
-				null,
-				true
-			),
-			array(
-				'1 - (1/{host:key.last(0)}+(1/2+2*2-3|4)|23-34)+({host:key.last(0)}+(1/2+2*2-3|4)|23-34)/{host:key.'.
-					'last(0)}+(1/2+2*2-3|4)|23-34/{host:key.last(0)}+(1/2+2*2-3|4)|23-34',
-				null,
-				true
-			),
-			array('({host:key.{a}}) + + ({host:key.{a}})', null, false),
-			array('({host:key.{a}}) + - ({host:key.{a}})', null, false),
-			array('({host:key.{a}}) + ({host:key.{a}})', null, false),
-			array('({host:key.{a}})', null, false),
-			array('(--{host:key.{a}})', null, false),
-			array('(+{host:key.{a}})', null, false),
-			array('(/{host:key.{a}})', null, false),
-			array('{host:key.{a}}/{host:key.{a}}', null, false),
-			array('{host:key.{a}}-{host:key.{a}}', null, false),
-			array('{host:key.{a}}+{host:key.{a}}', null, false),
-			array('{host:key.{a}}|{host:key.{a}}', null, false),
-			array('{host:key.{a}}&{host:key.{a}}', null, false),
-			array('{host:key.{a}}&{host:key.{a}}/{host:key.{a}}', null, false),
-			array('{host:key.{a}}+{host:key.{a}}/{host:key.{a}}', null, false),
-			array('1 - (1/{host:key.{a}})+({host:key.{a}})/{host:key.{a}}/{host:key.{a}}', null, false),
-			array('({host::key.last{a}}) + + ({host::key.last{a}})', null, false),
-			array('({host::key.last{a}}) + - ({host::key.last{a}})', null, false),
-			array('({host::key.last{a}}) + ({host::key.last{a}})', null, false),
-			array('({host::key.last{a}})', null, false),
-			array('(--{host::key.last{a}})', null, false),
-			array('(+{host::key.last{a}})', null, false),
-			array('(/{host::key.last{a}})', null, false),
-			array('{host::key.last{a}}/{host::key.last{a}}', null, false),
-			array('{host::key.last{a}}-{host::key.last{a}}', null, false),
-			array('{host::key.last{a}}+{host::key.last{a}}', null, false),
-			array('{host::key.last{a}}|{host::key.last{a}}', null, false),
-			array('{host::key.last{a}}&{host::key.last{a}}', null, false),
-			array('{host::key.last{a}}&{host::key.last{a}}/{host::key.last{a}}', null, false),
-			array('{host::key.last{a}}+{host::key.last{a}}/{host::key.last{a}}', null, false),
-			array(
-				'1 - (1/{host::key.last{a}})+({host::key.last{a}})/{host::key.last{a}}/{host::key.last{a}}',
-				null,
-				false
-			),
-			array('({host::key.(0)}) + + ({host::key.(0)})', null, false),
-			array('({host::key.(0)}) + - ({host::key.(0)})', null, false),
-			array('({host::key.(0)}) + ({host::key.(0)})', null, false),
-			array('({host::key.(0)})', null, false),
-			array('(--{host::key.(0)})', null, false),
-			array('(+{host::key.(0)})', null, false),
-			array('(/{host::key.(0)})', null, false),
-			array('{host::key.(0)}/{host::key.(0)}', null, false),
-			array('{host::key.(0)}-{host::key.(0)}', null, false),
-			array('{host::key.(0)}+{host::key.(0)}', null, false),
-			array('{host::key.(0)}|{host::key.(0)}', null, false),
-			array('{host::key.(0)}&{host::key.(0)}', null, false),
-			array('{host::key.(0)}&{host::key.(0)}/{host::key.(0)}', null, false),
-			array('{host::key.(0)}+{host::key.(0)}/{host::key.(0)}', null, false),
-			array('1 - (1/{host::key.(0)})+({host::key.(0)})/{host::key.(0)}/{host::key.(0)}', null, false),
-			array('({:key.(0)}) + + ({:key.(0)})', null, false),
-			array('({:key.(0)}) + - ({:key.(0)})', null, false),
-			array('({:key.(0)}) + ({:key.(0)})', null, false),
-			array('({:key.(0)})', null, false),
-			array('(--{:key.(0)})', null, false),
-			array('(+{:key.(0)})', null, false),
-			array('(/{:key.(0)})', null, false),
-			array('{:key.(0)}/{:key.(0)}', null, false),
-			array('{:key.(0)}-{:key.(0)}', null, false),
-			array('{:key.(0)}+{:key.(0)}', null, false),
-			array('{:key.(0)}|{:key.(0)}', null, false),
-			array('{:key.(0)}&{:key.(0)}', null, false),
-			array('{:key.(0)}&{:key.(0)}/{:key.(0)}', null, false),
-			array('{:key.(0)}+{:key.(0)}/{:key.(0)}', null, false),
-			array('1 - (1/{:key.(0)})+({:key.(0)})/{:key.(0)}/{:key.(0)}', null, false),
-			array('({:key.last(0)}) + + ({:key.last(0)})', null, false),
-			array('({:key.last(0)}) + - ({:key.last(0)})', null, false),
-			array('({:key.last(0)}) + ({:key.last(0)})', null, false),
-			array('({:key.last(0)})', null, false),
-			array('(--{:key.last(0)})', null, false),
-			array('(+{:key.last(0)})', null, false),
-			array('(/{:key.last(0)})', null, false),
-			array('{:key.last(0)}/{:key.last(0)}', null, false),
-			array('{:key.last(0)}-{:key.last(0)}', null, false),
-			array('{:key.last(0)}+{:key.last(0)}', null, false),
-			array('{:key.last(0)}|{:key.last(0)}', null, false),
-			array('{:key.last(0)}&{:key.last(0)}', null, false),
-			array('{:key.last(0)}&{:key.last(0)}/{:key.last(0)}', null, false),
-			array('{:key.last(0)}+{:key.last(0)}/{:key.last(0)}', null, false),
-			array('1 - (1/{:key.last(0)})+({:key.last(0)})/{:key.last(0)}/{:key.last(0)}', null, false),
-			array('(({host:key.last(0)})) + + (({host:key.last(0)}))', null, false),
-			array('(({host:key.last(0)})) + - (({host:key.last(0)}))', null, true),
-			array('(({host:key.last(0)})) + (({host:key.last(0)}))', null, true),
-			array('(({host:key.last(0)}))', null, true),
-			array('(--({host:key.last(0)}))', null, false),
-			array('(+({host:key.last(0)}))', null, false),
-			array('(/({host:key.last(0)}))', null, false),
-			array('({host:key.last(0)})/({host:key.last(0)})', null, true),
-			array('({host:key.last(0)})-({host:key.last(0)})', null, true),
-			array('({host:key.last(0)})+({host:key.last(0)})', null, true),
-			array('({host:key.last(0)})|({host:key.last(0)})', null, true),
-			array('({host:key.last(0)})&({host:key.last(0)})', null, true),
-			array('({host:key.last(0)})&({host:key.last(0)})/({host:key.last(0)})', null, true),
-			array('({host:key.last(0)})+({host:key.last(0)})/({host:key.last(0)})', null, true),
-			array(
-				'1 - (1/({host:key.last(0)}))+(({host:key.last(0)}))/({host:key.last(0)})/({host:key.last(0)})',
-				null,
-				true
-			),
-			array('({host:.last(0)}) + + ({host:.last(0)})', null, false),
-			array('({host:.last(0)}) + - ({host:.last(0)})', null, false),
-			array('({host:.last(0)}) + ({host:.last(0)})', null, false),
-			array('({host:.last(0)})', null, false),
-			array('(--{host:.last(0)})', null, false),
-			array('(+{host:.last(0)})', null, false),
-			array('(/{host:.last(0)})', null, false),
-			array('{host:.last(0)}/{host:.last(0)}', null, false),
-			array('{host:.last(0)}-{host:.last(0)}', null, false),
-			array('{host:.last(0)}+{host:.last(0)}', null, false),
-			array('{host:.last(0)}|{host:.last(0)}', null, false),
-			array('{host:.last(0)}&{host:.last(0)}', null, false),
-			array('{host:.last(0)}&{host:.last(0)}/{host:.last(0)}', null, false),
-			array('{host:.last(0)}+{host:.last(0)}/{host:.last(0)}', null, false),
-			array('1 - (1/{host:.last(0)})+({host:.last(0)})/{host:.last(0)}/{host:.last(0)}', null, false),
-			array('({$}+{host:key.last(0)}) + + ({$}+{host:key.last(0)})', null, false),
-			array('({$}+{host:key.last(0)}) + - ({$}+{host:key.last(0)})', null, false),
-			array('({$}+{host:key.last(0)}) + ({$}+{host:key.last(0)})', null, false),
-			array('({$}+{host:key.last(0)})', null, false),
-			array('(--{$}+{host:key.last(0)})', null, false),
-			array('(+{$}+{host:key.last(0)})', null, false),
-			array('(/{$}+{host:key.last(0)})', null, false),
-			array('{$}+{host:key.last(0)}/{$}+{host:key.last(0)}', null, false),
-			array('{$}+{host:key.last(0)}-{$}+{host:key.last(0)}', null, false),
-			array('{$}+{host:key.last(0)}+{$}+{host:key.last(0)}', null, false),
-			array('{$}+{host:key.last(0)}|{$}+{host:key.last(0)}', null, false),
-			array('{$}+{host:key.last(0)}&{$}+{host:key.last(0)}', null, false),
-			array('{$}+{host:key.last(0)}&{$}+{host:key.last(0)}/{$}+{host:key.last(0)}', null, false),
-			array('{$}+{host:key.last(0)}+{$}+{host:key.last(0)}/{$}+{host:key.last(0)}', null, false),
-			array(
-				'1 - (1/{$}+{host:key.last(0)})+({$}+{host:key.last(0)})/{$}+{host:key.last(0)}/{$}+{host:key.last('.
-					'0)}',
-				null,
-				false
-			),
-			array('( - {$MACRO}+{host:key.last(0)}) + + ( - {$MACRO}+{host:key.last(0)})', null, false),
-			array('( - {$MACRO}+{host:key.last(0)}) + - ( - {$MACRO}+{host:key.last(0)})', null, true),
-			array('( - {$MACRO}+{host:key.last(0)}) + ( - {$MACRO}+{host:key.last(0)})', null, true),
-			array('( - {$MACRO}+{host:key.last(0)})', null, true),
-			array('(-- - {$MACRO}+{host:key.last(0)})', null, false),
-			array('(+ - {$MACRO}+{host:key.last(0)})', null, false),
-			array('(/ - {$MACRO}+{host:key.last(0)})', null, false),
-			array(' - {$MACRO}+{host:key.last(0)}/ - {$MACRO}+{host:key.last(0)}', null, true),
-			array(' - {$MACRO}+{host:key.last(0)}- - {$MACRO}+{host:key.last(0)}', null, true),
-			array(' - {$MACRO}+{host:key.last(0)}+ - {$MACRO}+{host:key.last(0)}', null, true),
-			array(' - {$MACRO}+{host:key.last(0)}| - {$MACRO}+{host:key.last(0)}', null, true),
-			array(' - {$MACRO}+{host:key.last(0)}& - {$MACRO}+{host:key.last(0)}', null, true),
-			array(
-				' - {$MACRO}+{host:key.last(0)}& - {$MACRO}+{host:key.last(0)}/ - {$MACRO}+{host:key.last(0)}',
-				null,
-				true
-			),
-			array(
-				' - {$MACRO}+{host:key.last(0)}+ - {$MACRO}+{host:key.last(0)}/ - {$MACRO}+{host:key.last(0)}',
-					null,
-					true
-				),
-			array(
-				'1 - (1/ - {$MACRO}+{host:key.last(0)})+( - {$MACRO}+{host:key.last(0)})/ - {$MACRO}+{host:key.last'.
-					'(0)}/ - {$MACRO}+{host:key.last(0)}',
-				null,
-				true
-			),
-			array('(100G+{host:key.last(0)}) + + (100G+{host:key.last(0)})', null, false),
-			array('(100G+{host:key.last(0)}) + - (100G+{host:key.last(0)})', null, true),
-			array('(100G+{host:key.last(0)}) + (100G+{host:key.last(0)})', null, true),
-			array('(100G+{host:key.last(0)})', null, true),
-			array('(--100G+{host:key.last(0)})', null, false),
-			array('(+100G+{host:key.last(0)})', null, false),
-			array('(/100G+{host:key.last(0)})', null, false),
-			array('100G+{host:key.last(0)}/100G+{host:key.last(0)}', null, true),
-			array('100G+{host:key.last(0)}-100G+{host:key.last(0)}', null, true),
-			array('100G+{host:key.last(0)}+100G+{host:key.last(0)}', null, true),
-			array('100G+{host:key.last(0)}|100G+{host:key.last(0)}', null, true),
-			array('100G+{host:key.last(0)}&100G+{host:key.last(0)}', null, true),
-			array('100G+{host:key.last(0)}&100G+{host:key.last(0)}/100G+{host:key.last(0)}', null, true),
-			array('100G+{host:key.last(0)}+100G+{host:key.last(0)}/100G+{host:key.last(0)}', null, true),
-			array(
-				'1 - (1/100G+{host:key.last(0)})+(100G+{host:key.last(0)})/100G+{host:key.last(0)}/100G+{host:key.l'.
-					'ast(0)}',
-				null,
-				true
-			),
-			array('({host:key.last(0)}) + + ({host:key.last(0)})', null, false),
-			array('({host:key.last(0)}) + - ({host:key.last(0)})', null, true),
-			array('({host:key.last(0)}) + ({host:key.last(0)})', null, true),
-			array('({host:key.last(0)})', null, true),
-			array('(--{host:key.last(0)})', null, false),
-			array('(+{host:key.last(0)})', null, false),
-			array('(/{host:key.last(0)})', null, false),
-			array('{host:key.last(0)}/{host:key.last(0)}', null, true),
-			array('{host:key.last(0)}-{host:key.last(0)}', null, true),
-			array('{host:key.last(0)}+{host:key.last(0)}', null, true),
-			array('{host:key.last(0)}|{host:key.last(0)}', null, true),
-			array('{host:key.last(0)}&{host:key.last(0)}', null, true),
-			array('{host:key.last(0)}&{host:key.last(0)}/{host:key.last(0)}', null, true),
-			array('{host:key.last(0)}+{host:key.last(0)}/{host:key.last(0)}', null, true),
-			array('1 - (1/{host:key.last(0)})+({host:key.last(0)})/{host:key.last(0)}/{host:key.last(0)}', null, true),
-			array('({host:key.str(0 - 1 / 2 |-4*-56.34K)}) + + ({host:key.str(0 - 1 / 2 |-4*-56.34K)})', null, false),
-			array('({host:key.str(0 - 1 / 2 |-4*-56.34K)}) + - ({host:key.str(0 - 1 / 2 |-4*-56.34K)})', null, true),
-			array('({host:key.str(0 - 1 / 2 |-4*-56.34K)}) + ({host:key.str(0 - 1 / 2 |-4*-56.34K)})', null, true),
-			array('({host:key.str(0 - 1 / 2 |-4*-56.34K)})', null, true),
-			array('(--{host:key.str(0 - 1 / 2 |-4*-56.34K)})', null, false),
-			array('(+{host:key.str(0 - 1 / 2 |-4*-56.34K)})', null, false),
-			array('(/{host:key.str(0 - 1 / 2 |-4*-56.34K)})', null, false),
-			array('{host:key.str(0 - 1 / 2 |-4*-56.34K)}/{host:key.str(0 - 1 / 2 |-4*-56.34K)}', null, true),
-			array('{host:key.str(0 - 1 / 2 |-4*-56.34K)}-{host:key.str(0 - 1 / 2 |-4*-56.34K)}', null, true),
-			array('{host:key.str(0 - 1 / 2 |-4*-56.34K)}+{host:key.str(0 - 1 / 2 |-4*-56.34K)}', null, true),
-			array('{host:key.str(0 - 1 / 2 |-4*-56.34K)}|{host:key.str(0 - 1 / 2 |-4*-56.34K)}', null, true),
-			array('{host:key.str(0 - 1 / 2 |-4*-56.34K)}&{host:key.str(0 - 1 / 2 |-4*-56.34K)}', null, true),
-			array(
-				'{host:key.str(0 - 1 / 2 |-4*-56.34K)}&{host:key.str(0 - 1 / 2 |-4*-56.34K)}/{host:key.str(0 - 1 / '.
-					'2 |-4*-56.34K)}',
-				null,
-				true
-			),
-			array(
-				'{host:key.str(0 - 1 / 2 |-4*-56.34K)}+{host:key.str(0 - 1 / 2 |-4*-56.34K)}/{host:key.str(0 - 1 / '.
-					'2 |-4*-56.34K)}',
-				null,
-				true
-			),
-			array(
-				'1 - (1/{host:key.str(0 - 1 / 2 |-4*-56.34K)})+({host:key.str(0 - 1 / 2 |-4*-56.34K)})/{host:key.st'.
-					'r(0 - 1 / 2 |-4*-56.34K)}/{host:key.str(0 - 1 / 2 |-4*-56.34K)}',
-				null,
-				true
-			),
-			array('({host:key.str(^$$$^%)}) + + ({host:key.str(^$$$^%)})', null, false),
-			array('({host:key.str(^$$$^%)}) + - ({host:key.str(^$$$^%)})', null, true),
-			array('({host:key.str(^$$$^%)}) + ({host:key.str(^$$$^%)})', null, true),
-			array('({host:key.str(^$$$^%)})', null, true),
-			array('(--{host:key.str(^$$$^%)})', null, false),
-			array('(+{host:key.str(^$$$^%)})', null, false),
-			array('(/{host:key.str(^$$$^%)})', null, false),
-			array('{host:key.str(^$$$^%)}/{host:key.str(^$$$^%)}', null, true),
-			array('{host:key.str(^$$$^%)}-{host:key.str(^$$$^%)}', null, true),
-			array('{host:key.str(^$$$^%)}+{host:key.str(^$$$^%)}', null, true),
-			array('{host:key.str(^$$$^%)}|{host:key.str(^$$$^%)}', null, true),
-			array('{host:key.str(^$$$^%)}&{host:key.str(^$$$^%)}', null, true),
-			array('{host:key.str(^$$$^%)}&{host:key.str(^$$$^%)}/{host:key.str(^$$$^%)}', null, true),
-			array('{host:key.str(^$$$^%)}+{host:key.str(^$$$^%)}/{host:key.str(^$$$^%)}', null, true),
-			array(
-				'1 - (1/{host:key.str(^$$$^%)})+({host:key.str(^$$$^%)})/{host:key.str(^$$$^%)}/{host:key.str(^$$$'.
-					'^%)}',
-				null,
-				true
-			),
-			array('({host:key.str("(^*&%#$%)*")}) + + ({host:key.str("(^*&%#$%)*")})', null, false),
-			array('({host:key.str("(^*&%#$%)*")}) + - ({host:key.str("(^*&%#$%)*")})', null, true),
-			array('({host:key.str("(^*&%#$%)*")}) + ({host:key.str("(^*&%#$%)*")})', null, true),
-			array('({host:key.str("(^*&%#$%)*")})', null, true),
-			array('(--{host:key.str("(^*&%#$%)*")})', null, false),
-			array('(+{host:key.str("(^*&%#$%)*")})', null, false),
-			array('(/{host:key.str("(^*&%#$%)*")})', null, false),
-			array('{host:key.str("(^*&%#$%)*")}/{host:key.str("(^*&%#$%)*")}', null, true),
-			array('{host:key.str("(^*&%#$%)*")}-{host:key.str("(^*&%#$%)*")}', null, true),
-			array('{host:key.str("(^*&%#$%)*")}+{host:key.str("(^*&%#$%)*")}', null, true),
-			array('{host:key.str("(^*&%#$%)*")}|{host:key.str("(^*&%#$%)*")}', null, true),
-			array('{host:key.str("(^*&%#$%)*")}&{host:key.str("(^*&%#$%)*")}', null, true),
-			array('{host:key.str("(^*&%#$%)*")}&{host:key.str("(^*&%#$%)*")}/{host:key.str("(^*&%#$%)*")}', null, true),
-			array('{host:key.str("(^*&%#$%)*")}+{host:key.str("(^*&%#$%)*")}/{host:key.str("(^*&%#$%)*")}', null, true),
-			array(
-				'1 - (1/{host:key.str("(^*&%#$%)*")})+({host:key.str("(^*&%#$%)*")})/{host:key.str("(^*&%#$%)*")}/{'.
-					'host:key.str("(^*&%#$%)*")}',
-				null,
-				true
-			),
-			array('(((((((({host:key.str("")})))))))) + + (((((((({host:key.str("")}))))))))', null, false),
-			array('(((((((({host:key.str("")})))))))) + - (((((((({host:key.str("")}))))))))', null, true),
-			array('(((((((({host:key.str("")})))))))) + (((((((({host:key.str("")}))))))))', null, true),
-			array('(((((((({host:key.str("")}))))))))', null, true),
-			array('(--((((((({host:key.str("")}))))))))', null, false),
-			array('(+((((((({host:key.str("")}))))))))', null, false),
-			array('(/((((((({host:key.str("")}))))))))', null, false),
-			array('((((((({host:key.str("")})))))))/((((((({host:key.str("")})))))))', null, true),
-			array('((((((({host:key.str("")})))))))-((((((({host:key.str("")})))))))', null, true),
-			array('((((((({host:key.str("")})))))))+((((((({host:key.str("")})))))))', null, true),
-			array('((((((({host:key.str("")})))))))|((((((({host:key.str("")})))))))', null, true),
-			array('((((((({host:key.str("")})))))))&((((((({host:key.str("")})))))))', null, true),
-			array(
-				'((((((({host:key.str("")})))))))&((((((({host:key.str("")})))))))/((((((({host:key.str("")})))))))',
-				null,
-				true
-			),
-			array(
-				'((((((({host:key.str("")})))))))+((((((({host:key.str("")})))))))/((((((({host:key.str("")})))))))',
-				null,
-				true
-			),
-			array(
-				'1 - (1/((((((({host:key.str("")}))))))))+(((((((({host:key.str("")}))))))))/((((((({host:key.str("'.
-					'")})))))))/((((((({host:key.str("")})))))))',
-				null,
-				true
-			),
-			array(
-				'((1 - 1-2-((((((({host:key.str("0")}))))))))) + + ((1 - 1-2-((((((({host:key.str("0")})))))))))',
-				null,
-				false
-			),
-			array(
-				'((1 - 1-2-((((((({host:key.str("0")}))))))))) + - ((1 - 1-2-((((((({host:key.str("0")})))))))))',
-				null,
-				true
-			),
-			array(
-				'((1 - 1-2-((((((({host:key.str("0")}))))))))) + ((1 - 1-2-((((((({host:key.str("0")})))))))))',
-				null,
-				true
-			),
-			array('((1 - 1-2-((((((({host:key.str("0")})))))))))', null, true),
-			array('(--(1 - 1-2-((((((({host:key.str("0")})))))))))', null, false),
-			array('(+(1 - 1-2-((((((({host:key.str("0")})))))))))', null, false),
-			array('(/(1 - 1-2-((((((({host:key.str("0")})))))))))', null, false),
-			array('(1 - 1-2-((((((({host:key.str("0")}))))))))/(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
-			array('(1 - 1-2-((((((({host:key.str("0")}))))))))-(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
-			array('(1 - 1-2-((((((({host:key.str("0")}))))))))+(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
-			array('(1 - 1-2-((((((({host:key.str("0")}))))))))|(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
-			array('(1 - 1-2-((((((({host:key.str("0")}))))))))&(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
-			array(
-				'(1 - 1-2-((((((({host:key.str("0")}))))))))&(1 - 1-2-((((((({host:key.str("0")}))))))))/'.
-					'(1 - 1-2-((((((({host:key.str("0")}))))))))',
-				null,
-				true
-			),
-			array(
-				'(1 - 1-2-((((((({host:key.str("0")}))))))))+(1 - 1-2-((((((({host:key.str("0")}))))))))/'.
-					'(1 - 1-2-((((((({host:key.str("0")}))))))))',
-				null,
-				true
-			),
-			array(
-				'1 - (1/(1 - 1-2-((((((({host:key.str("0")})))))))))+((1 - 1-2-((((((({host:key.str("0")})))))))))'.
-					'/(1 - 1-2-((((((({host:key.str("0")}))))))))/(1 - 1-2-((((((({host:key.str("0")}))))))))',
-				null,
-				true
-			),
-			array('{host:log[/data/logs/test.log,incorrect:FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect^FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect/FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect*FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect+FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect-FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect&FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect|FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,(incorrect|FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect|FAIL)].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,(incorrect|FAIL)].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,{incorrect|FAIL].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,incorrect|FAIL}].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,{incorrect|FAIL}].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,text1(incorrect|FAILtext2].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,text1incorrect|FAIL)text2].last(0)}', null, true),
-			array('{host:log[/data/logs/test.log,text1(incorrect|FAIL)text2].last(0)}', null, true),
-			array(
-				'{Template_App_CCWS:web.page.regexp[0.0.0.0,/ws-callcontrol-1.1/test,{$CCWS_PORT},"[Ss]moke [Tt]est '.
-					'= ([Ss]uccess|[Ww]arning|[Ff]ail).*([[:space:]].*)+"].count(#1,event service = failed)}=1',
-				null,
-				true
-			),
-			array('{host:key.str({$M})} | {host:key.str({$M})} | {$M} + {TRIGGER.VALUE}', null, true),
-			array('{$M} | {host:key.str({$M})}', null, true),
-			array('({$M} + 5) | {host:key.str({$M})}', null, true),
-			array(
-				'{hostA:keyA[1,2,3].str("abc",123)}*{hostB:keyB.last(123,"abc","def")}/{host:key["param","abc"].'.
-					'last(1,2,3,4,5)}+{host:key.diff()}+{TRIGGER.VALUE}/{$M}-{$M1234}*{$CUSTOM}-{TRIGGER.VALUE}',
-				array(
-					'error' => '',
-					'expressions' => array(
-						0 => array(
-							'expression' => '{hostA:keyA[1,2,3].str("abc",123)}',
-							'pos'=> 0,
-							'host' => 'hostA',
-							'item' => 'keyA[1,2,3]',
-							'function' => 'str("abc",123)',
-							'functionName' => 'str',
-							'functionParam' => '"abc",123',
-							'functionParamList' => array('abc', 123)
-						),
-						1 => array(
-							'expression' => '{hostB:keyB.last(123,"abc","def")}',
-							'pos'=> 35,
-							'host' => 'hostB',
-							'item' => 'keyB',
-							'function' => 'last(123,"abc","def")',
-							'functionName' => 'last',
-							'functionParam' => '123,"abc","def"',
-							'functionParamList' => array(123, 'abc', 'def')
-						),
-						2 => array(
-							'expression' => '{host:key["param","abc"].last(1,2,3,4,5)}',
-							'pos'=> 70,
-							'host' => 'host',
-							'item' => 'key["param","abc"]',
-							'function' => 'last(1,2,3,4,5)',
-							'functionName' => 'last',
-							'functionParam' => '1,2,3,4,5',
-							'functionParamList' => array(1, 2, 3, 4, 5)
-						),
-						3 => array(
-							'expression' => '{host:key.diff()}',
-							'pos'=> 112,
-							'host' => 'host',
-							'item' => 'key',
-							'function' => 'diff()',
-							'functionName' => 'diff',
-							'functionParam' => '',
-							'functionParamList' => array('')
-						)
-					),
-					'macros' => array(
-						0 => array(
-							'expression' => '{TRIGGER.VALUE}'
-						),
-						1 => array(
-							'expression' => '{TRIGGER.VALUE}'
-						)
-					),
-					'usermacros' => array(
-						0 => array(
-							'expression' => '{$M}'
-						),
-						1 => array(
-							'expression' => '{$M1234}'
-						),
-						2 => array(
-							'expression' => '{$CUSTOM}'
-						)
-					)
-				),
-				true
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VALUE}+{$M}',
-				null,
-				true
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VALUE}+{$M',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VALUE}+{$',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VALUE}+{',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VALUE}+',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VALUE}',
-				null,
-				true
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VALUE',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VALU',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VAL',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.VA',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.V',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER.',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGER',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGGE',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIGG',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRIG',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TRI',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{TR',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{T',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+{',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)'.
-					'+',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1)',
-				null,
-				true
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-1',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(-',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-(',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+-',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)+',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5)',
-				null,
-				true
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-5',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4-',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(4',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+(',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)+',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3)',
-				null,
-				true
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(3',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -(',
-				null,
-				false
-			),
-			array(
-				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & -',
-				null,
-				false
-			),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m & ', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m &', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m ', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9m', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=9', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8=', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#8', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7#', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<7', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6<', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>6', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5>', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&5', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4&', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|4', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3|', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}', null, true),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" ', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\""', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\\', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", ', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3",', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3"', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, ', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1,', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].func', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].fun', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].fu', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].f', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ].', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ]', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"" ', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\""', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\"', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4\\', null, false),
-			array('{host:key[p1, p2 ,"p3", "p4', null, false),
-			array('{host:key[p1, p2 ,"p3", "p', null, false),
-			array('{host:key[p1, p2 ,"p3", "', null, false),
-			array('{host:key[p1, p2 ,"p3", ', null, false),
-			array('{host:key[p1, p2 ,"p3",', null, false),
-			array('{host:key[p1, p2 ,"p3"', null, false),
-			array('{host:key[p1, p2 ,"p3', null, false),
-			array('{host:key[p1, p2 ,"p', null, false),
-			array('{host:key[p1, p2 ,"', null, false),
-			array('{host:key[p1, p2 ,', null, false),
-			array('{host:key[p1, p2 ', null, false),
-			array('{host:key[p1, p2', null, false),
-			array('{host:key[p1, p', null, false),
-			array('{host:key[p1, ', null, false),
-			array('{host:key[p1,', null, false),
-			array('{host:key[p1', null, false),
-			array('{host:key[p', null, false),
-			array('{host:key[', null, false),
-			array('{host:key', null, false),
-			array('{host:ke', null, false),
-			array('{host:k', null, false),
-			array('{host:', null, false),
-			array('{host', null, false),
-			array('{hos', null, false),
-			array('{ho', null, false),
-			array('{h', null, false),
-			array('{', null, false),
-		);
-	}
-
-	/**
-	 * @dataProvider provider
-	 */
-	public function test_parse($expression, $result, $rc) {
-		$expressionData = new CTriggerExpression();
-
-		if ($expressionData->parse($expression)) {
-			$this->assertEquals($rc, true);
-			$this->assertEquals($rc, $expressionData->isValid);
-
-			if (isset($result)) {
-				$this->assertEquals($result['error'], $expressionData->error);
-				$this->assertEquals($result['expressions'], $expressionData->expressions);
-				$this->assertEquals($result['macros'], $expressionData->macros);
-				$this->assertEquals($result['usermacros'], $expressionData->usermacros);
-			}
-		}
-		else {
-			$this->assertEquals($rc, false, "\nError with expression $expression: ".$expressionData->error);
-		}
-	}
-}
diff --git a/frontends/php/tests/general/GeneralTests.php b/frontends/php/tests/general/GeneralTests.php
index ce753cea243..dc564d42422 100644
--- a/frontends/php/tests/general/GeneralTests.php
+++ b/frontends/php/tests/general/GeneralTests.php
@@ -20,7 +20,6 @@
 
 
 require_once dirname(__FILE__).'/class_cItemKey.php';
-require_once dirname(__FILE__).'/CTriggerExpressionTest.php';
 require_once dirname(__FILE__).'/class_cxmlexportwriter.php';
 require_once dirname(__FILE__).'/class_cxmlimportreader.php';
 require_once dirname(__FILE__).'/function_DBcommit.php';
@@ -33,12 +32,10 @@ require_once dirname(__FILE__).'/function_DBloadfile.php';
 require_once dirname(__FILE__).'/function_DBrollback.php';
 require_once dirname(__FILE__).'/function_DBselect.php';
 require_once dirname(__FILE__).'/function_DBstart.php';
-require_once dirname(__FILE__).'/CTimePeriodValidatorTest.php';
 require_once dirname(__FILE__).'/zbx_dbcast_2bigintTest.php';
 require_once dirname(__FILE__).'/dbConditionIntTest.php';
 require_once dirname(__FILE__).'/dbConditionStringTest.php';
 require_once dirname(__FILE__).'/urlParamTest.php';
-require_once dirname(__FILE__).'/CTriggerFunctionValidatorTest.php';
 
 class GeneralTests {
 
@@ -46,7 +43,6 @@ class GeneralTests {
 		$suite = new PHPUnit_Framework_TestSuite('general');
 
 		$suite->addTestSuite('class_cItemKey');
-		$suite->addTestSuite('CTriggerExpressionTest');
 		$suite->addTestSuite('class_cxmlexportwriter');
 		$suite->addTestSuite('class_cxmlimportreader');
 		$suite->addTestSuite('function_DBcommit');
@@ -59,12 +55,10 @@ class GeneralTests {
 		$suite->addTestSuite('function_DBrollback');
 		$suite->addTestSuite('function_DBselect');
 		$suite->addTestSuite('function_DBstart');
-		$suite->addTestSuite('CTimePeriodValidatorTest');
 		$suite->addTestSuite('zbx_dbcast_2bigintTest');
 		$suite->addTestSuite('dbConditionIntTest');
 		$suite->addTestSuite('dbConditionStringTest');
 		$suite->addTestSuite('urlParamTest');
-		$suite->addTestSuite('CTriggerFunctionValidatorTest');
 
 		return $suite;
 	}
diff --git a/frontends/php/tests/general/class_cItemKey.php b/frontends/php/tests/general/class_cItemKey.php
index 9568ddf6ca9..ae1d27a8f3e 100644
--- a/frontends/php/tests/general/class_cItemKey.php
+++ b/frontends/php/tests/general/class_cItemKey.php
@@ -20,7 +20,7 @@
 
 
 require_once dirname(__FILE__).'/../../include/func.inc.php';
-require_once dirname(__FILE__).'/../../api/classes/CItemKey.php';
+require_once dirname(__FILE__).'/../../include/classes/parsers/CItemKey.php';
 require_once dirname(__FILE__).'/../../include/gettextwrapper.inc.php';
 require_once dirname(__FILE__).'/../../include/defines.inc.php';
 require_once dirname(__FILE__).'/../../include/locales.inc.php';
diff --git a/frontends/php/tests/include/class.cwebtest.php b/frontends/php/tests/include/class.cwebtest.php
index 496061fcca8..9c4f01f7b3d 100644
--- a/frontends/php/tests/include/class.cwebtest.php
+++ b/frontends/php/tests/include/class.cwebtest.php
@@ -76,7 +76,7 @@ class CWebTest extends PHPUnit_Extensions_SeleniumTestCase {
 
 		$this->setHost(PHPUNIT_FRONTEND_HOST);
 		$this->setBrowser('*firefox');
-		if (strstr(PHPUNIT_URL, 'http://')) {
+		if (strpos(PHPUNIT_URL, 'http://') !== false) {
 			$this->setBrowserUrl(PHPUNIT_URL);
 		}
 		else {
diff --git a/frontends/php/tests/include/class.czabbixtest.php b/frontends/php/tests/include/class.czabbixtest.php
index 43ab5f51bbb..828f9eca6ce 100644
--- a/frontends/php/tests/include/class.czabbixtest.php
+++ b/frontends/php/tests/include/class.czabbixtest.php
@@ -123,11 +123,11 @@ class CZabbixTest extends PHPUnit_Framework_TestCase {
 	protected function setUp() {
 		global $DB, $URL;
 
-		if (strstr(PHPUNIT_URL, 'http://')) {
-			$URL=PHPUNIT_URL.'api_jsonrpc.php';
+		if (strpos(PHPUNIT_URL, 'http://') !== false) {
+			$URL = PHPUNIT_URL.'api_jsonrpc.php';
 		}
 		else {
-			$URL='http://hudson/~hudson/'.PHPUNIT_URL.'/frontends/php/api_jsonrpc.php';
+			$URL = 'http://hudson/~hudson/'.PHPUNIT_URL.'/frontends/php/api_jsonrpc.php';
 		}
 
 		if (!isset($DB['DB'])) DBConnect($error);
diff --git a/frontends/php/tests/include/dbfunc.php b/frontends/php/tests/include/dbfunc.php
index 7979c9f43ea..b7d71a7878b 100644
--- a/frontends/php/tests/include/dbfunc.php
+++ b/frontends/php/tests/include/dbfunc.php
@@ -25,7 +25,7 @@ require_once dirname(__FILE__).'/../../conf/zabbix.conf.php';
 require_once dirname(__FILE__).'/../../include/func.inc.php';
 require_once dirname(__FILE__).'/../../include/db.inc.php';
 require_once dirname(__FILE__).'/../../include/classes/db/DB.php';
-require_once dirname(__FILE__).'/../../include/classes/class.cwebuser.php';
+require_once dirname(__FILE__) . '/../../include/classes/class.cwebuser.php';
 require_once dirname(__FILE__).'/../../include/classes/debug/CProfiler.php';
 require_once dirname(__FILE__).'/../../include/classes/db/DbBackend.php';
 require_once dirname(__FILE__).'/../../include/classes/db/MysqlDbBackend.php';
diff --git a/frontends/php/tests/selenium/templates/testPageSample.php b/frontends/php/tests/selenium/templates/testPageSample.php
index f53eacdfb35..0c9ff3d5999 100644
--- a/frontends/php/tests/selenium/templates/testPageSample.php
+++ b/frontends/php/tests/selenium/templates/testPageSample.php
@@ -42,7 +42,7 @@ class testPageHosts extends CWebTest {
 
 		// data
 		$this->zbxTestTextPresent(array($host['name']));
-		$this->zbxTestDropdownHasOptions('go',
+		$this->zbxTestDropdownHasOptions('action',
 				array('Export selected', 'Mass update', 'Activate selected', 'Disable selected', 'Delete selected'));
 	}
 
@@ -209,7 +209,7 @@ class testPageHosts extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 
 		$this->zbxTestCheckboxSelect('all_hosts');
-		$this->zbxTestDropdownSelect('go', 'Activate selected');
+		$this->zbxTestDropdownSelect('action', 'Activate selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -235,7 +235,7 @@ class testPageHosts extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 
 		$this->zbxTestCheckboxSelect('hosts_'.$hostid);
-		$this->zbxTestDropdownSelect('go', 'Activate selected');
+		$this->zbxTestDropdownSelect('action', 'Activate selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -256,7 +256,7 @@ class testPageHosts extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 
 		$this->zbxTestCheckboxSelect('all_hosts');
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -282,7 +282,7 @@ class testPageHosts extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 
 		$this->zbxTestCheckboxSelect('hosts_'.$hostid);
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php b/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php
index 83b4d245fb6..e03c2d2153a 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php
+++ b/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php
@@ -231,7 +231,7 @@ class testFormAdministrationGeneralRegexp extends CWebTest {
 	public function testFormAdministrationGeneralRegexp_DeleteAll() {
 		$this->zbxTestLogin('adm.regexps.php');
 		$this->zbxTestCheckboxSelect('all_regexps');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 
 		$this->chooseOkOnNextConfirmation();
 		$this->zbxTestClick('goButton');
diff --git a/frontends/php/tests/selenium/testFormDiscoveryRule.php b/frontends/php/tests/selenium/testFormDiscoveryRule.php
index 4542485b76d..f92ff2a9133 100644
--- a/frontends/php/tests/selenium/testFormDiscoveryRule.php
+++ b/frontends/php/tests/selenium/testFormDiscoveryRule.php
@@ -1701,7 +1701,7 @@ class testFormDiscoveryRule extends CWebTest {
 			$this->zbxTestClickWait("link=Discovery rules");
 
 			$this->zbxTestCheckboxSelect("g_hostdruleid_$itemId");
-			$this->zbxTestDropdownSelect('go', 'Delete selected');
+			$this->zbxTestDropdownSelect('action', 'Delete selected');
 			$this->zbxTestClick('goButton');
 
 			$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testFormGraphPrototype.php b/frontends/php/tests/selenium/testFormGraphPrototype.php
index dc6db7bf54c..81a1cd8faeb 100644
--- a/frontends/php/tests/selenium/testFormGraphPrototype.php
+++ b/frontends/php/tests/selenium/testFormGraphPrototype.php
@@ -1230,7 +1230,7 @@ class testFormGraphPrototype extends CWebTest {
 			$this->zbxTestClickWait("link=Graph prototypes");
 
 			$this->zbxTestCheckboxSelect("group_graphid_$graphid");
-			$this->zbxTestDropdownSelect('go', 'Delete selected');
+			$this->zbxTestDropdownSelect('action', 'Delete selected');
 			$this->zbxTestClick('goButton');
 
 			$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testFormItemPrototype.php b/frontends/php/tests/selenium/testFormItemPrototype.php
index e0503892601..378423622ec 100644
--- a/frontends/php/tests/selenium/testFormItemPrototype.php
+++ b/frontends/php/tests/selenium/testFormItemPrototype.php
@@ -2712,7 +2712,7 @@ class testFormItemPrototype extends CWebTest {
 			$this->zbxTestClickWait("link=Item prototypes");
 
 			$this->zbxTestCheckboxSelect("group_itemid_$itemId");
-			$this->zbxTestDropdownSelect('go', 'Delete selected');
+			$this->zbxTestDropdownSelect('action', 'Delete selected');
 			$this->zbxTestClick('goButton');
 
 			$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testFormTriggerPrototype.php b/frontends/php/tests/selenium/testFormTriggerPrototype.php
index f1b6e3f2034..c3f181af15a 100644
--- a/frontends/php/tests/selenium/testFormTriggerPrototype.php
+++ b/frontends/php/tests/selenium/testFormTriggerPrototype.php
@@ -880,7 +880,7 @@ class testFormTriggerPrototype extends CWebTest {
 			$this->zbxTestClickWait("link=Trigger prototypes");
 
 			$this->zbxTestCheckboxSelect("g_triggerid_$triggerId");
-			$this->zbxTestDropdownSelect('go', 'Delete selected');
+			$this->zbxTestDropdownSelect('action', 'Delete selected');
 			$this->zbxTestClick('goButton');
 
 			$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testFormWeb.php b/frontends/php/tests/selenium/testFormWeb.php
index 317d2cad3e7..20afa0f4f60 100644
--- a/frontends/php/tests/selenium/testFormWeb.php
+++ b/frontends/php/tests/selenium/testFormWeb.php
@@ -1056,26 +1056,26 @@ class testFormWeb extends CWebTest {
 					)
 				)
 			),
-			// Dublicate web scenario
+			// Duplicate web scenario
 			array(
 				array(
 					'expected' => TEST_GOOD,
-					'name' => 'Dublicate web test',
+					'name' => 'Duplicate web test',
 					'add_step' => array(
-						array('step' => 'Dublicate web test')
+						array('step' => 'Duplicate web test')
 					)
 				)
 			),
 			array(
 				array(
 					'expected' => TEST_BAD,
-					'name' => 'Dublicate web test',
+					'name' => 'Duplicate web test',
 					'add_step' => array(
-						array('step' => 'Dublicate web test')
+						array('step' => 'Duplicate web test')
 					),
 					'errors' => array(
 						'ERROR: Cannot add web scenario',
-						'Web scenario "Dublicate web test" already exists.'
+						'Web scenario "Duplicate web test" already exists.'
 					)
 				)
 			),
@@ -1613,7 +1613,7 @@ class testFormWeb extends CWebTest {
 
 		if (isset($data['remove'])) {
 			$this->zbxTestCheckboxSelect("group_httptestid_$httptestid");
-			$this->zbxTestDropdownSelect('go', 'Delete selected');
+			$this->zbxTestDropdownSelect('action', 'Delete selected');
 			$this->zbxTestClick('goButton');
 
 			$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testGeneric.php b/frontends/php/tests/selenium/testGeneric.php
index cb22980fee4..b8c93e10013 100644
--- a/frontends/php/tests/selenium/testGeneric.php
+++ b/frontends/php/tests/selenium/testGeneric.php
@@ -28,26 +28,26 @@ class testGeneric extends CWebTest {
 			array('dashboard.php',					'Dashboard'),
 			array('dashconf.php',					'Dashboard configuration'),
 
-			array('overview.php',												'Overview \[refreshed every 30 sec\]'),
-			array('overview.php?form_refresh=1&groupid=0&type=0&view_style=0',	'Overview \[refreshed every 30 sec\]'),
-			array('overview.php?form_refresh=1&groupid=0&type=0&view_style=1',	'Overview \[refreshed every 30 sec\]'),
-			array('overview.php?form_refresh=1&groupid=0&type=1&view_style=0',	'Overview \[refreshed every 30 sec\]'),
-			array('overview.php?form_refresh=1&groupid=0&type=1&view_style=1',	'Overview \[refreshed every 30 sec\]'),
-
-			array('httpmon.php',					'Status of Web monitoring \[refreshed every 30 sec\]'),
-			array('latest.php',						'Latest data \[refreshed every 30 sec\]'),
-			array('tr_status.php',					'Status of triggers \[refreshed every 30 sec\]'),
-
-			array('events.php',						'Latest events \[refreshed every 30 sec\]'),
-			array('events.php?source=0',			'Latest events \[refreshed every 30 sec\]'),
-			array('events.php?source=1',			'Latest events \[refreshed every 30 sec\]'),
-
-			array('charts.php',						'Custom graphs \[refreshed every 30 sec\]'),
-			array('screens.php',					'Custom screens \[refreshed every 30 sec\]'),
-			array('slides.php',						'Custom slides \[refreshed every 30 sec\]'),
-			array('maps.php',						'Network maps \[refreshed every 30 sec\]'),
+			array('overview.php',												'Overview \[refreshed every 30 sec.\]'),
+			array('overview.php?form_refresh=1&groupid=0&type=0&view_style=0',	'Overview \[refreshed every 30 sec.\]'),
+			array('overview.php?form_refresh=1&groupid=0&type=0&view_style=1',	'Overview \[refreshed every 30 sec.\]'),
+			array('overview.php?form_refresh=1&groupid=0&type=1&view_style=0',	'Overview \[refreshed every 30 sec.\]'),
+			array('overview.php?form_refresh=1&groupid=0&type=1&view_style=1',	'Overview \[refreshed every 30 sec.\]'),
+
+			array('httpmon.php',					'Status of Web monitoring \[refreshed every 30 sec.\]'),
+			array('latest.php',						'Latest data \[refreshed every 30 sec.\]'),
+			array('tr_status.php',					'Status of triggers \[refreshed every 30 sec.\]'),
+
+			array('events.php',						'Latest events \[refreshed every 30 sec.\]'),
+			array('events.php?source=0',			'Latest events \[refreshed every 30 sec.\]'),
+			array('events.php?source=1',			'Latest events \[refreshed every 30 sec.\]'),
+
+			array('charts.php',						'Custom graphs \[refreshed every 30 sec.\]'),
+			array('screens.php',					'Custom screens \[refreshed every 30 sec.\]'),
+			array('slides.php',						'Custom slides \[refreshed every 30 sec.\]'),
+			array('maps.php',						'Network maps \[refreshed every 30 sec.\]'),
 			array('discovery.php',					'Status of discovery'),
-			array('srv_status.php',					'IT services \[refreshed every 30 sec\]'),
+			array('srv_status.php',					'IT services \[refreshed every 30 sec.\]'),
 
 			// inventory
 			array('hostinventoriesoverview.php',	'Host inventory overview'),
@@ -104,10 +104,10 @@ class testGeneric extends CWebTest {
 			array('auditlogs.php',					'Audit logs'),
 			array('auditacts.php',					'Audit actions'),
 
-			array('queue.php',						'Queue \[refreshed every 30 sec\]'),
-			array('queue.php?config=0',				'Queue \[refreshed every 30 sec\]'),
-			array('queue.php?config=1',				'Queue \[refreshed every 30 sec\]'),
-			array('queue.php?config=2',				'Queue \[refreshed every 30 sec\]'),
+			array('queue.php',						'Queue \[refreshed every 30 sec.\]'),
+			array('queue.php?config=0',				'Queue \[refreshed every 30 sec.\]'),
+			array('queue.php?config=1',				'Queue \[refreshed every 30 sec.\]'),
+			array('queue.php?config=2',				'Queue \[refreshed every 30 sec.\]'),
 
 			array('report4.php',					'Notification report'),
 			array('report4.php?period=daily',		'Notification report'),
diff --git a/frontends/php/tests/selenium/testPageActions.php b/frontends/php/tests/selenium/testPageActions.php
index 28247f7ad2c..d5689ef06a1 100644
--- a/frontends/php/tests/selenium/testPageActions.php
+++ b/frontends/php/tests/selenium/testPageActions.php
@@ -191,7 +191,7 @@ class testPageActions extends CWebTest {
 			$this->zbxTestTextPresent(array($dbRow['name'], $statusStr));
 		}
 
-		$this->zbxTestDropdownHasOptions('go', array('Enable selected', 'Disable selected', 'Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Enable selected', 'Disable selected', 'Delete selected'));
 		$this->assertElementValue('goButton', 'Go (0)');
 	}
 
@@ -223,12 +223,12 @@ class testPageActions extends CWebTest {
 
 		switch ($action['status']) {
 			case ACTION_STATUS_ENABLED:
-				$this->zbxTestHrefClickWait('actionconf.php?go=disable&g_actionid%5B%5D='.$action['actionid'].'&');
+				$this->zbxTestHrefClickWait('actionconf.php?action=action.massdisable&g_actionid%5B%5D='.$action['actionid'].'&');
 				$this->zbxTestTextPresent('Action disabled');
 				$newStatus = ACTION_STATUS_DISABLED;
 				break;
 			case ACTION_STATUS_DISABLED:
-				$this->zbxTestHrefClickWait('actionconf.php?go=activate&g_actionid%5B%5D='.$action['actionid'].'&');
+				$this->zbxTestHrefClickWait('actionconf.php?action=action.massenable&g_actionid%5B%5D='.$action['actionid'].'&');
 				$this->zbxTestTextPresent('Action enabled');
 				$newStatus = ACTION_STATUS_ENABLED;
 				break;
@@ -261,7 +261,7 @@ class testPageActions extends CWebTest {
 		$this->zbxTestCheckTitle('Configuration of actions');
 
 		$this->zbxTestCheckboxSelect('g_actionid['.$action['actionid'].']');
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -293,7 +293,7 @@ class testPageActions extends CWebTest {
 		$this->zbxTestCheckTitle('Configuration of actions');
 
 		$this->zbxTestCheckboxSelect('g_actionid['.$action['actionid'].']');
-		$this->zbxTestDropdownSelect('go', 'Enable selected');
+		$this->zbxTestDropdownSelect('action', 'Enable selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -329,7 +329,7 @@ class testPageActions extends CWebTest {
 		$this->zbxTestCheckTitle('Configuration of actions');
 
 		$this->zbxTestCheckboxSelect('g_actionid['.$action['actionid'].']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testPageAdministrationDMProxies.php b/frontends/php/tests/selenium/testPageAdministrationDMProxies.php
index b2113625579..8d2e17ee17c 100644
--- a/frontends/php/tests/selenium/testPageAdministrationDMProxies.php
+++ b/frontends/php/tests/selenium/testPageAdministrationDMProxies.php
@@ -68,7 +68,7 @@ class testPageAdministrationDMProxies extends CWebTest {
 			'Name', 'Mode', 'Last seen (age)', 'Host count', 'Item count', 'Required performance (vps)', 'Hosts'
 		));
 
-		$this->zbxTestDropdownHasOptions('go', array('Enable selected', 'Disable selected', 'Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Enable selected', 'Disable selected', 'Delete selected'));
 		$this->assertElementValue('goButton', 'Go (0)');
 	}
 
diff --git a/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php b/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php
index a2ada8c005a..89ef35d8d82 100644
--- a/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php
+++ b/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php
@@ -69,10 +69,10 @@ class testPageAdministrationGeneralRegexp extends CWebTest {
 			$this->zbxTestTextPresent($dbRow['name']);
 		}
 
-		$this->zbxTestDropdownHasOptions('go', array('Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Delete selected'));
 		$this->assertElementValue('goButton', 'Go (0)');
 
-		$this->assertElementPresent("//select[@id='go' and @disabled]");
+		$this->assertElementPresent("//select[@id='action' and @disabled]");
 		$this->assertElementPresent("//input[@id='goButton' and @disabled]");
 	}
 
@@ -83,7 +83,7 @@ class testPageAdministrationGeneralRegexp extends CWebTest {
 
 		$this->zbxTestLogin('adm.regexps.php');
 		$this->zbxTestCheckboxSelect('all_regexps');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClick('goButton');
 		$this->getConfirmation();
 		$this->zbxTestCheckTitle('Configuration of regular expressions');
@@ -106,7 +106,7 @@ class testPageAdministrationGeneralRegexp extends CWebTest {
 
 		$this->zbxTestLogin('adm.regexps.php');
 		$this->zbxTestCheckboxSelect('regexpids['.$regexp['regexpid'].']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 		$this->getConfirmation();
 		$this->zbxTestCheckTitle('Configuration of regular expressions');
@@ -130,7 +130,7 @@ class testPageAdministrationGeneralRegexp extends CWebTest {
 
 		$this->zbxTestLogin('adm.regexps.php');
 		$this->zbxTestCheckboxSelect('all_regexps');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 		$this->getConfirmation();
 		$this->zbxTestCheckTitle('Configuration of regular expressions');
diff --git a/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php b/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php
index 83eb8c2cb0e..e7ded036a19 100644
--- a/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php
+++ b/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php
@@ -61,7 +61,7 @@ class testPageAdministrationMediaTypes extends CWebTest {
 			$this->zbxTestTextPresent(array($dbRow['description'], $this->mediatypes[$dbRow['type']]));
 		}
 
-		$this->zbxTestDropdownHasOptions('go', array('Enable selected', 'Disable selected', 'Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Enable selected', 'Disable selected', 'Delete selected'));
 		$this->assertElementValue('goButton', 'Go (0)');
 	}
 
@@ -95,7 +95,7 @@ class testPageAdministrationMediaTypes extends CWebTest {
 
 		$this->zbxTestLogin('media_types.php');
 		$this->zbxTestCheckboxSelect('mediatypeids_'.$mediatype['mediatypeid']);
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->zbxTestClickWait('goButton');
 		$this->getConfirmation();
 		$this->zbxTestCheckTitle('Configuration of media types');
@@ -123,7 +123,7 @@ class testPageAdministrationMediaTypes extends CWebTest {
 
 		$this->zbxTestLogin('media_types.php');
 		$this->zbxTestCheckboxSelect('mediatypeids_'.$mediatype['mediatypeid']);
-		$this->zbxTestDropdownSelect('go', 'Enable selected');
+		$this->zbxTestDropdownSelect('action', 'Enable selected');
 		$this->zbxTestClickWait('goButton');
 		$this->getConfirmation();
 		$this->zbxTestCheckTitle('Configuration of media types');
@@ -156,7 +156,7 @@ class testPageAdministrationMediaTypes extends CWebTest {
 
 		$this->zbxTestLogin('media_types.php');
 		$this->zbxTestCheckboxSelect('mediatypeids_'.$mediatype['mediatypeid']);
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 		$this->getConfirmation();
 		$this->zbxTestCheckTitle('Configuration of media types');
diff --git a/frontends/php/tests/selenium/testPageAdministrationScripts.php b/frontends/php/tests/selenium/testPageAdministrationScripts.php
index 1920996b7ff..19743151b82 100644
--- a/frontends/php/tests/selenium/testPageAdministrationScripts.php
+++ b/frontends/php/tests/selenium/testPageAdministrationScripts.php
@@ -55,7 +55,7 @@ class testPageAdministrationScripts extends CWebTest {
 			$this->zbxTestTextPresent(array($dbRow['name'], $dbRow['command']));
 		}
 
-		$this->zbxTestDropdownHasOptions('go', array('Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Delete selected'));
 		$this->assertElementValue('goButton', 'Go (0)');
 	}
 
@@ -82,7 +82,7 @@ class testPageAdministrationScripts extends CWebTest {
 
 		$this->zbxTestLogin('scripts.php');
 		$this->zbxTestCheckboxSelect('all_scripts');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 		$this->getConfirmation();
 		$this->zbxTestCheckTitle('Configuration of scripts');
@@ -105,7 +105,7 @@ class testPageAdministrationScripts extends CWebTest {
 
 		$this->zbxTestLogin('scripts.php');
 		$this->zbxTestCheckboxSelect('scripts['.$script['scriptid'].']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 		$this->getConfirmation();
 		$this->zbxTestCheckTitle('Configuration of scripts');
diff --git a/frontends/php/tests/selenium/testPageApplications.php b/frontends/php/tests/selenium/testPageApplications.php
index 1dd652fd772..bf369490057 100644
--- a/frontends/php/tests/selenium/testPageApplications.php
+++ b/frontends/php/tests/selenium/testPageApplications.php
@@ -55,6 +55,6 @@ class testPageApplications extends CWebTest {
 		// table
 		$this->zbxTestTextPresent(array('Applications', 'Show'));
 
-		$this->zbxTestDropdownHasOptions('go', array('Enable selected', 'Disable selected', 'Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Enable selected', 'Disable selected', 'Delete selected'));
 	}
 }
diff --git a/frontends/php/tests/selenium/testPageDiscovery.php b/frontends/php/tests/selenium/testPageDiscovery.php
index c1f618513fd..a2fcef2363c 100644
--- a/frontends/php/tests/selenium/testPageDiscovery.php
+++ b/frontends/php/tests/selenium/testPageDiscovery.php
@@ -39,7 +39,7 @@ class testPageDiscovery extends CWebTest {
 		$this->zbxTestTextPresent($rule['name']);
 		$this->zbxTestTextPresent($rule['iprange']);
 		$this->zbxTestTextPresent($rule['delay']);
-		$this->zbxTestDropdownHasOptions('go', array('Enable selected', 'Disable selected', 'Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Enable selected', 'Disable selected', 'Delete selected'));
 	}
 
 	/**
@@ -80,7 +80,7 @@ class testPageDiscovery extends CWebTest {
 		$this->zbxTestLogin('discoveryconf.php');
 		$this->zbxTestCheckTitle('Configuration of discovery');
 		$this->zbxTestCheckboxSelect('g_druleid['.$druleid.']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -103,7 +103,7 @@ class testPageDiscovery extends CWebTest {
 		$this->zbxTestLogin('discoveryconf.php');
 		$this->zbxTestCheckTitle('Configuration of discovery');
 		$this->zbxTestCheckboxSelect('all_drules');
-		$this->zbxTestDropdownSelect('go', 'Enable selected');
+		$this->zbxTestDropdownSelect('action', 'Enable selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -127,7 +127,7 @@ class testPageDiscovery extends CWebTest {
 		$this->zbxTestLogin('discoveryconf.php');
 		$this->zbxTestCheckTitle('Configuration of discovery');
 		$this->zbxTestCheckboxSelect('g_druleid['.$druleid.']');
-		$this->zbxTestDropdownSelect('go', 'Enable selected');
+		$this->zbxTestDropdownSelect('action', 'Enable selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -146,7 +146,7 @@ class testPageDiscovery extends CWebTest {
 		$this->zbxTestLogin('discoveryconf.php');
 		$this->zbxTestCheckTitle('Configuration of discovery');
 		$this->zbxTestCheckboxSelect('all_drules');
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
@@ -170,7 +170,7 @@ class testPageDiscovery extends CWebTest {
 		$this->zbxTestLogin('discoveryconf.php');
 		$this->zbxTestCheckTitle('Configuration of discovery');
 		$this->zbxTestCheckboxSelect('g_druleid['.$druleid.']');
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testPageDiscoveryRules.php b/frontends/php/tests/selenium/testPageDiscoveryRules.php
index 7dbb79342ad..72d934809b7 100644
--- a/frontends/php/tests/selenium/testPageDiscoveryRules.php
+++ b/frontends/php/tests/selenium/testPageDiscoveryRules.php
@@ -80,7 +80,7 @@ class testPageDiscoveryRules extends CWebTest {
 			$this->zbxTestTextNotPresent('Error');
 		}
 		// TODO someday should check that interval is not shown for trapper items, trends not shown for non-numeric items etc
-		$this->zbxTestDropdownHasOptions('go', array(
+		$this->zbxTestDropdownHasOptions('action', array(
 				'Enable selected',
 				'Disable selected',
 				'Delete selected'
@@ -104,7 +104,7 @@ class testPageDiscoveryRules extends CWebTest {
 		$this->zbxTestLogin('host_discovery.php?&hostid='.$data['hostid']);
 		$this->zbxTestCheckTitle('Configuration of discovery rules');
 		$this->zbxTestCheckboxSelect('g_hostdruleid_'.$itemid);
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		sleep(1);
 		$this->zbxTestClickWait('goButton');
 
@@ -160,7 +160,7 @@ class testPageDiscoveryRules extends CWebTest {
 		$this->zbxTestLogin('host_discovery.php?&hostid='.$rule['hostid']);
 		$this->zbxTestCheckTitle('Configuration of discovery rules');
 		$this->zbxTestCheckboxSelect('all_items');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		sleep(1);
 		$this->zbxTestClickWait('goButton');
 
diff --git a/frontends/php/tests/selenium/testPageEvents.php b/frontends/php/tests/selenium/testPageEvents.php
index d02023ffa7b..d357725a7fc 100644
--- a/frontends/php/tests/selenium/testPageEvents.php
+++ b/frontends/php/tests/selenium/testPageEvents.php
@@ -29,7 +29,7 @@ class testPageEvents extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 		$this->zbxTestDropdownSelectWait('hostid', 'all');
 
-		$this->zbxTestCheckTitle('Latest events \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Latest events \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('HISTORY OF EVENTS');
 		$this->zbxTestTextPresent('Group');
 		$this->zbxTestTextPresent('Host');
@@ -50,7 +50,7 @@ class testPageEvents extends CWebTest {
 
 		$this->zbxTestDropdownSelectWait('source', 'Discovery');
 
-		$this->zbxTestCheckTitle('Latest events \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Latest events \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('HISTORY OF EVENTS');
 		$this->zbxTestTextPresent('Source');
 		$this->zbxTestTextPresent('Filter');
@@ -67,7 +67,7 @@ class testPageEvents extends CWebTest {
 	public function testPageEvents_Triggers_NoHostNames() {
 		$this->zbxTestLogin('events.php');
 		$this->zbxTestDropdownSelectWait('source', 'Trigger');
-		$this->zbxTestCheckTitle('Latest events \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Latest events \[refreshed every 30 sec.\]');
 
 		$this->checkNoRealHostnames();
 	}
@@ -75,7 +75,7 @@ class testPageEvents extends CWebTest {
 	public function testPageEvents_Discovery_NoHostNames() {
 		$this->zbxTestLogin('events.php');
 		$this->zbxTestDropdownSelectWait('source', 'Discovery');
-		$this->zbxTestCheckTitle('Latest events \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Latest events \[refreshed every 30 sec.\]');
 
 		$this->checkNoRealHostnames();
 	}
diff --git a/frontends/php/tests/selenium/testPageHistory.php b/frontends/php/tests/selenium/testPageHistory.php
index cbcb692c597..9d2209e4807 100644
--- a/frontends/php/tests/selenium/testPageHistory.php
+++ b/frontends/php/tests/selenium/testPageHistory.php
@@ -43,18 +43,18 @@ class testPageHistory extends CWebTest {
 		// also different header for log items (different for eventlog items ?)
 		$itemid = $item['itemid'];
 		$this->zbxTestLogin("history.php?action=showvalues&itemid=$itemid");
-		$this->zbxTestCheckTitle('History \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('History \[refreshed every 30 sec.\]');
 		// Header
 		$this->zbxTestTextPresent(array('Timestamp', 'Value'));
 		$this->zbxTestDropdownSelectWait('action', '500 latest values');
-		$this->zbxTestCheckTitle('History \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('History \[refreshed every 30 sec.\]');
 		$this->zbxTestClickWait('plaintext');
 
 		// there surely is a better way to get out of the plaintext page than just clicking 'back'...
 		$this->goBack();
 		$this->wait();
 		$this->zbxTestDropdownSelectWait('action', 'Values');
-		$this->zbxTestCheckTitle('History \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('History \[refreshed every 30 sec.\]');
 		$this->zbxTestClickWait('plaintext');
 	}
 }
diff --git a/frontends/php/tests/selenium/testPageHosts.php b/frontends/php/tests/selenium/testPageHosts.php
index 6d15f53d763..097f5103711 100644
--- a/frontends/php/tests/selenium/testPageHosts.php
+++ b/frontends/php/tests/selenium/testPageHosts.php
@@ -61,7 +61,7 @@ class testPageHosts extends CWebTest {
 		);
 		// Data
 		$this->zbxTestTextPresent(array($host['name']));
-		$this->zbxTestDropdownHasOptions('go',
+		$this->zbxTestDropdownHasOptions('action',
 				array('Export selected', 'Mass update', 'Enable selected', 'Disable selected', 'Delete selected'));
 	}
 
@@ -234,7 +234,7 @@ class testPageHosts extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 
 		$this->zbxTestCheckboxSelect('all_hosts');
-		$this->zbxTestDropdownSelect('go', 'Enable selected');
+		$this->zbxTestDropdownSelect('action', 'Enable selected');
 		$this->assertVisible('goButton');
 		$this->zbxTestClickWait('goButton');
 
@@ -262,7 +262,7 @@ class testPageHosts extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 
 		$this->zbxTestCheckboxSelect('hosts_'.$hostid);
-		$this->zbxTestDropdownSelect('go', 'Enable selected');
+		$this->zbxTestDropdownSelect('action', 'Enable selected');
 		$this->assertVisible('goButton');
 		$this->zbxTestClickWait('goButton');
 
@@ -284,7 +284,7 @@ class testPageHosts extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 
 		$this->zbxTestCheckboxSelect('all_hosts');
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->assertVisible('goButton');
 		$this->zbxTestClickWait('goButton');
 
@@ -312,7 +312,7 @@ class testPageHosts extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 
 		$this->zbxTestCheckboxSelect('hosts_'.$hostid);
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->assertVisible('goButton');
 		$this->zbxTestClickWait('goButton');
 
diff --git a/frontends/php/tests/selenium/testPageItemPrototypes.php b/frontends/php/tests/selenium/testPageItemPrototypes.php
index 997ef356c7c..b8728efbc9d 100644
--- a/frontends/php/tests/selenium/testPageItemPrototypes.php
+++ b/frontends/php/tests/selenium/testPageItemPrototypes.php
@@ -61,7 +61,7 @@ class testPageItemPrototypes extends CWebTest {
 		$this->zbxTestTextNotPresent('Error');
 		// TODO someday should check that interval is not shown for trapper items, trends not shown for non-numeric items etc
 
-		$this->zbxTestDropdownHasOptions('go', array(
+		$this->zbxTestDropdownHasOptions('action', array(
 			'Activate selected',
 			'Disable selected',
 			'Delete selected'
@@ -87,7 +87,7 @@ class testPageItemPrototypes extends CWebTest {
 		$this->zbxTestLogin('disc_prototypes.php?hostid='.$data['hostid'].'&parent_discoveryid='.$data['parent_itemid']);
 		$this->zbxTestCheckTitle('Configuration of item prototypes');
 		$this->zbxTestCheckboxSelect('group_itemid_'.$itemid);
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		sleep(1);
 		$this->zbxTestClickWait('goButton');
 
@@ -144,7 +144,7 @@ class testPageItemPrototypes extends CWebTest {
 		$this->zbxTestLogin('disc_prototypes.php?hostid='.$hostid.'&parent_discoveryid='.$druleid);
 		$this->zbxTestCheckTitle('Configuration of item prototypes');
 		$this->zbxTestCheckboxSelect('all_items');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		sleep(1);
 		$this->zbxTestClickWait('goButton');
 
diff --git a/frontends/php/tests/selenium/testPageItems.php b/frontends/php/tests/selenium/testPageItems.php
index 90f7502909e..582fd3ff354 100644
--- a/frontends/php/tests/selenium/testPageItems.php
+++ b/frontends/php/tests/selenium/testPageItems.php
@@ -81,7 +81,7 @@ class testPageItems extends CWebTest {
 			$this->zbxTestTextNotPresent('Error');
 		}
 		// TODO someday should check that interval is not shown for trapper items, trends not shown for non-numeric items etc
-		$this->zbxTestDropdownHasOptions('go', array(
+		$this->zbxTestDropdownHasOptions('action', array(
 				'Enable selected',
 				'Disable selected',
 				'Mass update',
diff --git a/frontends/php/tests/selenium/testPageLatestData.php b/frontends/php/tests/selenium/testPageLatestData.php
index 4db3381f3d3..a148469cd12 100644
--- a/frontends/php/tests/selenium/testPageLatestData.php
+++ b/frontends/php/tests/selenium/testPageLatestData.php
@@ -23,7 +23,7 @@ require_once dirname(__FILE__).'/../include/class.cwebtest.php';
 class testPageLatestData extends CWebTest {
 	public function testPageLatestData_CheckLayout() {
 		$this->zbxTestLogin('latest.php');
-		$this->zbxTestCheckTitle('Latest data \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Latest data \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('LATEST DATA');
 		$this->zbxTestTextPresent('Items');
 		$this->zbxTestTextPresent(array('Host', 'Group'));
@@ -34,7 +34,7 @@ class testPageLatestData extends CWebTest {
 // Check that no real host or template names displayed
 	public function testPageLatestData_NoHostNames() {
 		$this->zbxTestLogin('latest.php');
-		$this->zbxTestCheckTitle('Latest data \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Latest data \[refreshed every 30 sec.\]');
 		$this->checkNoRealHostnames();
 	}
 }
diff --git a/frontends/php/tests/selenium/testPageMaintenance.php b/frontends/php/tests/selenium/testPageMaintenance.php
index 88836268c72..dcc9d2df0de 100644
--- a/frontends/php/tests/selenium/testPageMaintenance.php
+++ b/frontends/php/tests/selenium/testPageMaintenance.php
@@ -42,7 +42,7 @@ class testPageMaintenance extends CWebTest {
 		$this->zbxTestTextPresent($maintenance['name']);
 		if ($maintenance['maintenance_type'] == MAINTENANCE_TYPE_NORMAL)	$this->zbxTestTextPresent('With data collection');
 		if ($maintenance['maintenance_type'] == MAINTENANCE_TYPE_NODATA)	$this->zbxTestTextPresent('No data collection');
-		$this->zbxTestDropdownHasOptions('go', array('Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Delete selected'));
 	}
 
 	/**
@@ -94,7 +94,7 @@ class testPageMaintenance extends CWebTest {
 		$this->zbxTestDropdownSelectWait('groupid', 'all');
 		$this->zbxTestCheckTitle('Configuration of maintenance');
 		$this->zbxTestCheckboxSelect('maintenanceids['.$maintenanceid.']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testPageMaps.php b/frontends/php/tests/selenium/testPageMaps.php
index 2351814bbf8..299fbcefee1 100644
--- a/frontends/php/tests/selenium/testPageMaps.php
+++ b/frontends/php/tests/selenium/testPageMaps.php
@@ -40,7 +40,7 @@ class testPageMaps extends CWebTest {
 		$this->zbxTestTextNotPresent('Displaying 0');
 		$this->zbxTestTextPresent(array('Name', 'Width', 'Height', 'Edit'));
 		$this->zbxTestTextPresent(array($map['name'], $map['width'], $map['height']));
-		$this->zbxTestDropdownHasOptions('go', array('Delete selected', 'Export selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Delete selected', 'Export selected'));
 	}
 
 	/**
@@ -130,7 +130,7 @@ class testPageMaps extends CWebTest {
 		$this->zbxTestLogin('sysmaps.php');
 		$this->zbxTestCheckTitle('Configuration of network maps');
 		$this->zbxTestCheckboxSelect('maps['.$sysmapid.']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testPageOverview.php b/frontends/php/tests/selenium/testPageOverview.php
index 533ba4d83e3..fb7dc791b92 100644
--- a/frontends/php/tests/selenium/testPageOverview.php
+++ b/frontends/php/tests/selenium/testPageOverview.php
@@ -23,7 +23,7 @@ require_once dirname(__FILE__).'/../include/class.cwebtest.php';
 class testPageOverview extends CWebTest {
 	public function testPageOverview_CheckLayout() {
 		$this->zbxTestLogin('overview.php');
-		$this->zbxTestCheckTitle('Overview \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Overview \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('OVERVIEW');
 		$this->zbxTestTextPresent('Hosts location');
 		$this->zbxTestTextPresent('Group');
@@ -33,7 +33,7 @@ class testPageOverview extends CWebTest {
 // Check that no real host or template names displayed
 	public function testPageOverview_NoHostNames() {
 		$this->zbxTestLogin('overview.php');
-		$this->zbxTestCheckTitle('Overview \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Overview \[refreshed every 30 sec.\]');
 		$this->checkNoRealHostnames();
 	}
 }
diff --git a/frontends/php/tests/selenium/testPageQueueDetails.php b/frontends/php/tests/selenium/testPageQueueDetails.php
index c08637daa1e..dfd9c65f180 100644
--- a/frontends/php/tests/selenium/testPageQueueDetails.php
+++ b/frontends/php/tests/selenium/testPageQueueDetails.php
@@ -23,7 +23,7 @@ require_once dirname(__FILE__).'/../include/class.cwebtest.php';
 class testPageQueueDetails extends CWebTest {
 	public function testPageQueueDetails_CheckLayout() {
 		$this->zbxTestLogin('queue.php?config=2');
-		$this->zbxTestCheckTitle('Queue \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Queue \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('Queue');
 		$this->zbxTestTextPresent('QUEUE OF ITEMS TO BE UPDATED');
 		// Header
diff --git a/frontends/php/tests/selenium/testPageQueueOverview.php b/frontends/php/tests/selenium/testPageQueueOverview.php
index dc5a128c1fa..95941b52f4e 100644
--- a/frontends/php/tests/selenium/testPageQueueOverview.php
+++ b/frontends/php/tests/selenium/testPageQueueOverview.php
@@ -23,7 +23,7 @@ require_once dirname(__FILE__).'/../include/class.cwebtest.php';
 class testPageQueueOverview extends CWebTest {
 	public function testPageQueueOverview_CheckLayout() {
 		$this->zbxTestLogin('queue.php?config=0');
-		$this->zbxTestCheckTitle('Queue \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Queue \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('Queue');
 		$this->zbxTestTextPresent('QUEUE OF ITEMS TO BE UPDATED');
 		// Header
diff --git a/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php b/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php
index aac33ffed6c..67e07ef4fa9 100644
--- a/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php
+++ b/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php
@@ -31,7 +31,7 @@ class testPageQueueOverviewByProxy extends CWebTest {
 	*/
 	public function testPageQueueOverviewByProxy_CheckLayout($proxy) {
 		$this->zbxTestLogin('queue.php?config=1');
-		$this->zbxTestCheckTitle('Queue \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Queue \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('Queue');
 		$this->zbxTestTextPresent('QUEUE OF ITEMS TO BE UPDATED');
 		// Header
diff --git a/frontends/php/tests/selenium/testPageScreens.php b/frontends/php/tests/selenium/testPageScreens.php
index 125ba21f8a7..1c78cc23c98 100644
--- a/frontends/php/tests/selenium/testPageScreens.php
+++ b/frontends/php/tests/selenium/testPageScreens.php
@@ -41,7 +41,7 @@ class testPageScreens extends CWebTest {
 		$this->zbxTestTextPresent(array('Name', 'Dimension (cols x rows)', 'Screen'));
 		// Data
 		$this->zbxTestTextPresent(array($screen['name']));
-		$this->zbxTestDropdownHasOptions('go', array('Export selected', 'Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Export selected', 'Delete selected'));
 	}
 
 	/**
@@ -128,7 +128,7 @@ class testPageScreens extends CWebTest {
 		$this->zbxTestLogin('screenconf.php');
 		$this->zbxTestCheckTitle('Configuration of screens');
 		$this->zbxTestCheckboxSelect('screens['.$screenid.']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testPageSlideShows.php b/frontends/php/tests/selenium/testPageSlideShows.php
index b819677fa90..4cd74720c06 100644
--- a/frontends/php/tests/selenium/testPageSlideShows.php
+++ b/frontends/php/tests/selenium/testPageSlideShows.php
@@ -41,7 +41,7 @@ class testPageSlideShows extends CWebTest {
 		$this->zbxTestTextPresent(array('Name', 'Delay', 'Count of slides'));
 		// Data
 		$this->zbxTestTextPresent(array($slideshow['name']));
-		$this->zbxTestDropdownHasOptions('go', array('Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Delete selected'));
 	}
 
 	/**
@@ -98,7 +98,7 @@ class testPageSlideShows extends CWebTest {
 		$this->zbxTestLogin('slideconf.php');
 		$this->zbxTestCheckTitle('Configuration of slide shows');
 		$this->zbxTestCheckboxSelect('shows['.$slideshowid.']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testPageStatusOfTriggers.php b/frontends/php/tests/selenium/testPageStatusOfTriggers.php
index a3b525e2510..2363b574abc 100644
--- a/frontends/php/tests/selenium/testPageStatusOfTriggers.php
+++ b/frontends/php/tests/selenium/testPageStatusOfTriggers.php
@@ -23,7 +23,7 @@ require_once dirname(__FILE__).'/../include/class.cwebtest.php';
 class testPageStatusOfTriggers extends CWebTest {
 	public function testPageStatusOfTriggers_CheckLayout() {
 		$this->zbxTestLogin('tr_status.php');
-		$this->zbxTestCheckTitle('Status of triggers \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Status of triggers \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('STATUS OF TRIGGERS');
 		$this->zbxTestTextPresent('Triggers');
 		$this->zbxTestTextPresent('Displaying');
@@ -34,7 +34,7 @@ class testPageStatusOfTriggers extends CWebTest {
 // Check that no real host or template names displayed
 	public function testPageStatusOfTriggers_NoHostNames() {
 		$this->zbxTestLogin('tr_status.php');
-		$this->zbxTestCheckTitle('Status of triggers \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Status of triggers \[refreshed every 30 sec.\]');
 		$this->checkNoRealHostnames();
 	}
 }
diff --git a/frontends/php/tests/selenium/testPageTemplates.php b/frontends/php/tests/selenium/testPageTemplates.php
index f9b0f5abe89..f7b09553db8 100644
--- a/frontends/php/tests/selenium/testPageTemplates.php
+++ b/frontends/php/tests/selenium/testPageTemplates.php
@@ -41,7 +41,7 @@ class testPageTemplates extends CWebTest {
 
 		// data
 		$this->zbxTestTextPresent(array($template['name']));
-		$this->zbxTestDropdownHasOptions('go',
+		$this->zbxTestDropdownHasOptions('action',
 				array('Export selected', 'Delete selected', 'Delete selected with linked elements'));
 	}
 
diff --git a/frontends/php/tests/selenium/testPageTriggerPrototypes.php b/frontends/php/tests/selenium/testPageTriggerPrototypes.php
index 78ea536c665..ca71c5f8d26 100644
--- a/frontends/php/tests/selenium/testPageTriggerPrototypes.php
+++ b/frontends/php/tests/selenium/testPageTriggerPrototypes.php
@@ -66,7 +66,7 @@ class testPageTriggerPrototypes extends CWebTest {
 		);
 		$this->zbxTestTextNotPresent('Error');
 		// TODO someday should check that interval is not shown for trapper items, trends not shown for non-numeric items etc
-		$this->zbxTestDropdownHasOptions('go', array(
+		$this->zbxTestDropdownHasOptions('action', array(
 				'Enable selected',
 				'Disable selected',
 				'Mass update',
@@ -93,7 +93,7 @@ class testPageTriggerPrototypes extends CWebTest {
 
 		$this->zbxTestCheckTitle('Configuration of trigger prototypes');
 		$this->zbxTestCheckboxSelect('g_triggerid_'.$triggerid);
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		sleep(1);
 		$this->zbxTestClickWait('goButton');
 
@@ -148,7 +148,7 @@ class testPageTriggerPrototypes extends CWebTest {
 		$this->zbxTestLogin('trigger_prototypes.php?hostid='.$rule['hostid'].'&parent_discoveryid='.$druleid);
 		$this->zbxTestCheckTitle('Configuration of trigger prototypes');
 		$this->zbxTestCheckboxSelect('all_triggers');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		sleep(1);
 		$this->zbxTestClickWait('goButton');
 
diff --git a/frontends/php/tests/selenium/testPageTriggers.php b/frontends/php/tests/selenium/testPageTriggers.php
index ea474e9d614..b0af7c87719 100644
--- a/frontends/php/tests/selenium/testPageTriggers.php
+++ b/frontends/php/tests/selenium/testPageTriggers.php
@@ -68,7 +68,7 @@ class testPageTriggers extends CWebTest {
 			$this->zbxTestTextNotPresent('Error');
 		}
 		// TODO someday should check that interval is not shown for trapper items, trends not shown for non-numeric items etc
-		$this->zbxTestDropdownHasOptions('go', array(
+		$this->zbxTestDropdownHasOptions('action', array(
 				'Enable selected',
 				'Disable selected',
 				'Mass update',
diff --git a/frontends/php/tests/selenium/testPageUserGroups.php b/frontends/php/tests/selenium/testPageUserGroups.php
index 0c2d2d897ec..0ec0e218669 100644
--- a/frontends/php/tests/selenium/testPageUserGroups.php
+++ b/frontends/php/tests/selenium/testPageUserGroups.php
@@ -38,7 +38,7 @@ class testPageUserGroups extends CWebTest {
 		$this->zbxTestTextPresent(array('Name', '#', 'Members', 'Status', 'Frontend access', 'Debug mode'));
 		// Data
 		$this->zbxTestTextPresent(array($group['name']));
-		$this->zbxTestDropdownHasOptions('go',
+		$this->zbxTestDropdownHasOptions('action',
 				array('Enable selected', 'Disable selected', 'Enable DEBUG', 'Disable DEBUG', 'Delete selected'));
 	}
 
@@ -81,7 +81,7 @@ class testPageUserGroups extends CWebTest {
 		$this->zbxTestCheckTitle('Configuration of user groups');
 
 		$this->zbxTestCheckboxSelect('group_groupid['.$usrgrpid.']');
-		$this->zbxTestDropdownSelect('go', 'Enable selected');
+		$this->zbxTestDropdownSelect('action', 'Enable selected');
 		$this->zbxTestClick('goButton');
 
 		$this->getConfirmation();
@@ -111,7 +111,7 @@ class testPageUserGroups extends CWebTest {
 		$this->zbxTestCheckTitle('Configuration of user groups');
 
 		$this->zbxTestCheckboxSelect('group_groupid['.$usrgrpid.']');
-		$this->zbxTestDropdownSelect('go', 'Disable selected');
+		$this->zbxTestDropdownSelect('action', 'Disable selected');
 		$this->zbxTestClick('goButton');
 
 		$this->getConfirmation();
@@ -149,7 +149,7 @@ class testPageUserGroups extends CWebTest {
 		$this->zbxTestCheckTitle('Configuration of user groups');
 
 		$this->zbxTestCheckboxSelect('group_groupid['.$usrgrpid.']');
-		$this->zbxTestDropdownSelect('go', 'Enable DEBUG');
+		$this->zbxTestDropdownSelect('action', 'Enable DEBUG');
 		$this->zbxTestClick('goButton');
 
 		$this->getConfirmation();
@@ -177,7 +177,7 @@ class testPageUserGroups extends CWebTest {
 		$this->zbxTestCheckTitle('Configuration of user groups');
 
 		$this->zbxTestCheckboxSelect('group_groupid['.$usrgrpid.']');
-		$this->zbxTestDropdownSelect('go', 'Disable DEBUG');
+		$this->zbxTestDropdownSelect('action', 'Disable DEBUG');
 		$this->zbxTestClick('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testPageUsers.php b/frontends/php/tests/selenium/testPageUsers.php
index f20850f4284..21344f562f4 100644
--- a/frontends/php/tests/selenium/testPageUsers.php
+++ b/frontends/php/tests/selenium/testPageUsers.php
@@ -39,7 +39,7 @@ class testPageUsers extends CWebTest {
 		$this->zbxTestTextPresent('Displaying');
 		$this->zbxTestTextPresent(array('Alias', 'Name', 'Surname', 'User type', 'Groups', 'Is online?', 'Login', 'Frontend access', 'Debug mode', 'Status'));
 		$this->zbxTestTextPresent(array($user['alias'], $user['name'], $user['surname']));
-		$this->zbxTestDropdownHasOptions('go', array('Unblock selected', 'Delete selected'));
+		$this->zbxTestDropdownHasOptions('action', array('Unblock selected', 'Delete selected'));
 	}
 
 	/**
@@ -87,7 +87,7 @@ class testPageUsers extends CWebTest {
 			$this->zbxTestDropdownSelectWait('filter_usrgrpid', 'All');
 
 			$this->zbxTestCheckboxSelect('group_userid['.$id.']');
-			$this->zbxTestDropdownSelect('go', 'Delete selected');
+			$this->zbxTestDropdownSelect('action', 'Delete selected');
 			$this->zbxTestClickWait('goButton');
 
 			$this->getConfirmation();
@@ -120,7 +120,7 @@ class testPageUsers extends CWebTest {
 			$this->zbxTestDropdownSelectWait('filter_usrgrpid', 'All');
 
 			$this->zbxTestCheckboxSelect('group_userid['.$id.']');
-			$this->zbxTestDropdownSelect('go', 'Delete selected');
+			$this->zbxTestDropdownSelect('action', 'Delete selected');
 			$this->zbxTestClickWait('goButton');
 
 			$this->getConfirmation();
diff --git a/frontends/php/tests/selenium/testPageWeb.php b/frontends/php/tests/selenium/testPageWeb.php
index 673115dc5df..6909f1773a8 100644
--- a/frontends/php/tests/selenium/testPageWeb.php
+++ b/frontends/php/tests/selenium/testPageWeb.php
@@ -23,7 +23,7 @@ require_once dirname(__FILE__).'/../include/class.cwebtest.php';
 class testPageWeb extends CWebTest {
 	public function testPageWeb_CheckLayout() {
 		$this->zbxTestLogin('httpmon.php');
-		$this->zbxTestCheckTitle('Status of Web monitoring \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Status of Web monitoring \[refreshed every 30 sec.\]');
 		$this->zbxTestTextPresent('STATUS OF WEB MONITORING');
 		$this->zbxTestTextPresent('Web scenarios');
 		$this->zbxTestTextPresent(array('Group', 'Host'));
@@ -33,7 +33,7 @@ class testPageWeb extends CWebTest {
 // Check that no real host or template names displayed
 	public function testPageWeb_NoHostNames() {
 		$this->zbxTestLogin('httpmon.php');
-		$this->zbxTestCheckTitle('Status of Web monitoring \[refreshed every 30 sec\]');
+		$this->zbxTestCheckTitle('Status of Web monitoring \[refreshed every 30 sec.\]');
 		$this->checkNoRealHostnames();
 	}
 }
diff --git a/frontends/php/tests/selenium/testTemplateInheritance.php b/frontends/php/tests/selenium/testTemplateInheritance.php
index e658226b9f5..d9e00215c66 100644
--- a/frontends/php/tests/selenium/testTemplateInheritance.php
+++ b/frontends/php/tests/selenium/testTemplateInheritance.php
@@ -75,7 +75,7 @@ class testTemplateInheritance extends CWebTest {
 				'test-general-item',
 				array()
 					),
-			// Dublicated item on Template inheritance test host
+			// Duplicated item on Template inheritance test host
 			array(
 				TEST_BAD,
 				'Template App Zabbix Agent',
diff --git a/frontends/php/tests/selenium/testUrlParameters.php b/frontends/php/tests/selenium/testUrlParameters.php
index eae5cc42691..efa9e7be609 100644
--- a/frontends/php/tests/selenium/testUrlParameters.php
+++ b/frontends/php/tests/selenium/testUrlParameters.php
@@ -470,7 +470,7 @@ class testUrlParameters extends CWebTest {
 				)
 			),
 			array(
-				'title' => 'Overview \[refreshed every 30 sec\]',
+				'title' => 'Overview \[refreshed every 30 sec.\]',
 				'test_cases' => array(
 					array(
 						'url' => 'overview.php?groupid=4&type=0',
@@ -561,7 +561,7 @@ class testUrlParameters extends CWebTest {
 				)
 			),
 			array(
-				'title' => 'Latest data \[refreshed every 30 sec\]',
+				'title' => 'Latest data \[refreshed every 30 sec.\]',
 				'test_cases' => array(
 					array(
 						'url' => 'latest.php?groupid=4&hostid=10084',
@@ -615,7 +615,7 @@ class testUrlParameters extends CWebTest {
 				)
 			),
 			array(
-				'title' => 'Status of triggers \[refreshed every 30 sec\]',
+				'title' => 'Status of triggers \[refreshed every 30 sec.\]',
 				'test_cases' => array(
 					array(
 						'url' => 'tr_status.php?groupid=4&hostid=10084',
@@ -669,7 +669,7 @@ class testUrlParameters extends CWebTest {
 				)
 			),
 			array(
-				'title' => 'Latest events \[refreshed every 30 sec\]',
+				'title' => 'Latest events \[refreshed every 30 sec.\]',
 				'test_cases' => array(
 					array(
 						'url' => 'events.php?triggerid=13491',
@@ -713,7 +713,7 @@ class testUrlParameters extends CWebTest {
 				)
 			),
 			array(
-				'title' => 'Custom graphs \[refreshed every 30 sec\]',
+				'title' => 'Custom graphs \[refreshed every 30 sec.\]',
 				'test_cases' => array(
 					array(
 						'url' => 'charts.php?groupid=4&hostid=10084&graphid=524',
@@ -777,7 +777,7 @@ class testUrlParameters extends CWebTest {
 				)
 			),
 			array(
-				'title' => 'Custom screens \[refreshed every 30 sec\]',
+				'title' => 'Custom screens \[refreshed every 30 sec.\]',
 				'test_cases' => array(
 					array(
 						'url' => 'screens.php?elementid=16',
@@ -821,7 +821,7 @@ class testUrlParameters extends CWebTest {
 				)
 			),
 			array(
-				'title' => 'Network maps \[refreshed every 30 sec\]',
+				'title' => 'Network maps \[refreshed every 30 sec.\]',
 				'test_cases' => array(
 					array(
 						'url' => 'maps.php?sysmapid=1&severity_min=0',
@@ -927,7 +927,7 @@ class testUrlParameters extends CWebTest {
 				)
 			),
 			array(
-				'title' => 'IT services \[refreshed every 30 sec\]',
+				'title' => 'IT services \[refreshed every 30 sec.\]',
 				'test_cases' => array(
 					array(
 						'url' => 'srv_status.php?period=today',
diff --git a/frontends/php/tests/selenium/testZBX6339.php b/frontends/php/tests/selenium/testZBX6339.php
index 6bfb45e0ed2..f38ec7087ab 100644
--- a/frontends/php/tests/selenium/testZBX6339.php
+++ b/frontends/php/tests/selenium/testZBX6339.php
@@ -61,7 +61,7 @@ class testZBX6339 extends CWebTest {
 		$this->zbxTestCheckTitle('Configuration of screens');
 
 		$this->zbxTestCheckboxSelect('screens['.$screenid.']');
-		$this->zbxTestDropdownSelect('go', 'Delete selected');
+		$this->zbxTestDropdownSelect('action', 'Delete selected');
 		$this->zbxTestClickWait('goButton');
 
 		$this->getConfirmation();
diff --git a/frontends/php/tests/unit/bootstrap.php b/frontends/php/tests/unit/bootstrap.php
index 58451809e60..1cd7f090d64 100644
--- a/frontends/php/tests/unit/bootstrap.php
+++ b/frontends/php/tests/unit/bootstrap.php
@@ -18,23 +18,43 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+error_reporting(E_ALL | E_STRICT); // because in some PHP versions E_ALL does not include E_STRICT
+
 require_once __DIR__.'/../../include/defines.inc.php';
 require_once __DIR__.'/../../include/func.inc.php';
 require_once __DIR__.'/../../include/gettextwrapper.inc.php';
+require_once __DIR__.'/../../include/triggers.inc.php';
+require_once __DIR__.'/../../include/items.inc.php';
+require_once __DIR__.'/../../include/discovery.inc.php';
+require_once __DIR__.'/../../include/actions.inc.php';
+require_once __DIR__.'/../../include/validate.inc.php';
+require_once __DIR__.'/../../include/services.inc.php';
 
 // register autoloader
 require_once __DIR__.'/../../include/classes/core/CAutoloader.php';
 
 $autoloader = new CAutoloader(array(
+	__DIR__.'/../../include/classes',
 	__DIR__.'/../../include/classes/core',
 	__DIR__.'/../../include/classes/helpers',
 	__DIR__.'/../../include/classes/db',
 	__DIR__.'/../../include/classes/api',
 	__DIR__.'/../../include/classes/api/clients',
 	__DIR__.'/../../include/classes/api/wrappers',
+	__DIR__.'/../../include/classes/parsers',
+	__DIR__.'/../../include/classes/parsers/results',
 	__DIR__.'/../../include/classes/validators',
-	__DIR__.'/../../include/classes/validators/string',
-	__DIR__.'/../../api/classes',
+	__DIR__.'/../../include/classes/validators/action',
+	__DIR__.'/../../include/classes/triggers',
+	__DIR__.'/../../include/classes/import',
+	__DIR__.'/../../include/classes/services',
+	__DIR__.'/../../include/classes/helpers',
+	__DIR__.'/../../include/classes/regexp',
+	__DIR__.'/../../include/classes/api/services',
+	__DIR__.'/../../include/classes/api/managers',
+	__DIR__.'/../../include/classes/html',
+	__DIR__.'/include/classes/html',
 	__DIR__.'/include/classes/validators',
+	__DIR__.'/include/classes/parsers',
 ));
 $autoloader->register();
diff --git a/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php b/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php
index 9403403eb4a..4e9693be7be 100644
--- a/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php
+++ b/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php
@@ -40,8 +40,8 @@ class CLocalApiClientTest extends PHPUnit_Framework_TestCase {
 	public function incorrectCallProvider() {
 		return array(
 			// incorrect api
-			array('api', 'method', array(), 'token',
-				ZBX_API_ERROR_PARAMETERS, 'Incorrect API "api".'
+			array('Api', 'method', array(), 'token',
+				ZBX_API_ERROR_PARAMETERS, 'Incorrect API "Api".'
 			),
 			// incorrect method
 			array('user', 'incorrectMethod', array(), 'token',
@@ -56,8 +56,8 @@ class CLocalApiClientTest extends PHPUnit_Framework_TestCase {
 				ZBX_API_ERROR_NO_AUTH, 'Not authorised.'
 			),
 			// unnecessary auth token
-			array('apiinfo', 'version', array(), '',
-				ZBX_API_ERROR_PARAMETERS, 'The "apiinfo.version" method must be called without the "auth" parameter.'
+			array('Apiinfo', 'Version', array(), '',
+				ZBX_API_ERROR_PARAMETERS, 'The "Apiinfo.Version" method must be called without the "auth" parameter.'
 			),
 		);
 	}
diff --git a/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php b/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php
new file mode 100644
index 00000000000..824e9c2b380
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php
@@ -0,0 +1,125 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CGlobalRegexpTest extends PHPUnit_Framework_TestCase
+{
+	public function dataProvider()
+	{
+		return array(
+			// "character string included", case-sensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_INCLUDED, 'testString', 1),
+				'success' => array('This is testString', 'testString starts here', 'orendswithtestString'),
+				'fail' => array('', 'This is teststring', 'TeStString maybe?', 'orendswithTestString')
+			),
+			// "character string included", case-insensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_INCLUDED, 'testString', 0),
+				'success' => array('This is testStrinGG', 'TestStrinG starts here', 'orendswithtestString',
+					'This is teststring', 'TeStString maybe?'
+				),
+				'fail' => array('', 'orendswithTest String', 'this is not a TEST string')
+			),
+			// "character string NOT included", case-sensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_NOT_INCLUDED, 'testString', 1),
+				'success' => array('', 'This is teststring', 'TeStString maybe?', 'orendswithTestString'),
+				'fail' => array('This is testString', 'testString starts here', 'orendswithtestString')
+			),
+			// "character string NOT included", case-insensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_NOT_INCLUDED, 'testString', 0),
+				'success' => array('', 'orendswithTest String', 'this is not a TEST string'),
+				'fail' => array('This is testStrinGG', 'TestStrinG starts here', 'orendswithtestString',
+					'This is teststring', 'TeStString maybe?'
+				)
+			),
+			// ANY character string included, case-sensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_ANY_INCLUDED, 'Error,Disaster,Critical', 1),
+				'success' => array('Error message', 'Object has Error', 'Status: Critical', 'Disaster Errors'),
+				'fail' => array('ERROR: error', 'Object state: CRITICAL')
+			),
+			// ANY character string included, case-insensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_ANY_INCLUDED, 'Error,Disaster,Critical', 0),
+				'success' => array('Error message', 'Object has Error', 'Status: Critical', 'Disaster Errors',
+					'ERROR: error', 'Object state: CRITICAL', 'Log levels: DISASTER', 'Log levels: error'
+				),
+				'fail' => array('no errs or disastrs here')
+			),
+			// regular expressions, TRUE, case-sensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_TRUE, '^Log entry [0-9]+', 1),
+				'success' => array('Log entry 29', 'Log entry 0'),
+				'fail' => array(' Log entry 171', 'Log entry')
+			),
+			// regular expressions, TRUE, case-insensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_TRUE, '^Log entry [0-9]+', 0),
+				'success' => array('LOG ENTRY 71', 'log entry 161: something bad happened'),
+				'fail' => array(' Log entry 171', 'log entry')
+			),
+			// regular expressions, FALSE, case-sensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_FALSE, 'server state (1|3|5)', 1),
+				'success' => array('server state 2', 'server state OK'),
+				'fail' => array('server state 3', 'server state 1 - power failure')
+			),
+			// regular expressions, FALSE, case-insensitive
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_FALSE, 'server state (fail|outage)', 0),
+				'success' => array('server state 3', 'server state NOT OK - power failure'),
+				'fail' => array('Server state FAIL', 'server state outage of cooling liquid')
+			),
+			// extra tests, should verify both escaped and non-escaped slashes
+			array(
+				'expression' => $this->expr(EXPRESSION_TYPE_TRUE, 'http://example.com/', 0),
+				'success' => array('referrer: http://example.com/', 'request to http://example.com/test'),
+				'fail' => array('example.com')
+			)
+		);
+	}
+
+	/**
+	 * @dataProvider dataProvider
+	 */
+	public function testMatchExpressions ($expression, $successValues, $failValues)
+	{
+		foreach ($successValues as $successValue) {
+			$this->assertTrue(CGlobalRegexp::matchExpression($expression, $successValue), 'Value: '.$successValue);
+		}
+
+		foreach ($failValues as $failValue) {
+			$this->assertNotTrue(CGlobalRegexp::matchExpression($expression, $failValue), 'Value: '.$failValue);
+		}
+	}
+
+	protected function expr($type, $expression, $caseSensitive, $separator = ',')
+	{
+		return array(
+			'expression_type' => $type,
+			'expression' => $expression,
+			'case_sensitive' => $caseSensitive,
+			'exp_delimiter' => $separator
+		);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php b/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php
new file mode 100644
index 00000000000..b82c722dd10
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php
@@ -0,0 +1,356 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CConditionHelperTest extends PHPUnit_Framework_TestCase {
+
+	public function testGetFormulaProvider() {
+		return array(
+			array(
+				array(), CONDITION_EVAL_TYPE_AND, ''
+			),
+
+			// and
+			array(
+				array(
+					1 => 'condition1'
+				),
+				CONDITION_EVAL_TYPE_AND, '{1}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_AND, '{1} and {2}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition2',
+					3 => 'condition3',
+				),
+				CONDITION_EVAL_TYPE_AND, '{1} and {2} and {3}'
+			),
+			// same conditions shouldn't have parentheses
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+				),
+				CONDITION_EVAL_TYPE_AND, '{1} and {2}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+					3 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_AND, '({1} and {2}) and {3}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+					3 => 'condition2',
+					4 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_AND, '({1} and {2}) and ({3} and {4})'
+			),
+
+			// or
+			array(
+				array(
+					1 => 'condition1'
+				),
+				CONDITION_EVAL_TYPE_OR, '{1}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_OR, '{1} or {2}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition2',
+					3 => 'condition3',
+				),
+				CONDITION_EVAL_TYPE_OR, '{1} or {2} or {3}'
+			),
+			// same conditions shouldn't have parentheses
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+				),
+				CONDITION_EVAL_TYPE_OR, '{1} or {2}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+					3 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_OR, '({1} or {2}) or {3}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+					3 => 'condition2',
+					4 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_OR, '({1} or {2}) or ({3} or {4})'
+			),
+
+			// and/or
+			array(
+				array(
+					1 => 'condition1'
+				),
+				CONDITION_EVAL_TYPE_AND_OR, '{1}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_AND_OR, '{1} and {2}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition2',
+					3 => 'condition3',
+				),
+				CONDITION_EVAL_TYPE_AND_OR, '{1} and {2} and {3}'
+			),
+			// same conditions shouldn't have parentheses
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+				),
+				CONDITION_EVAL_TYPE_AND_OR, '{1} or {2}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+					3 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_AND_OR, '({1} or {2}) and {3}'
+			),
+			array(
+				array(
+					1 => 'condition1',
+					2 => 'condition1',
+					3 => 'condition2',
+					4 => 'condition2',
+				),
+				CONDITION_EVAL_TYPE_AND_OR, '({1} or {2}) and ({3} or {4})'
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider testGetFormulaProvider
+	 *
+	 * @param array $conditions
+	 * @param $evaltype
+	 * @param $expectedFormula
+	 */
+	public function testGetFormula(array $conditions, $evaltype, $expectedFormula) {
+		$formula = CConditionHelper::getFormula($conditions, $evaltype);
+
+		$this->assertSame($expectedFormula, $formula);
+	}
+
+	public function testGetFormulaIdsProvider() {
+		return array(
+			array('', array()),
+			array('1', array(1 => 'A')),
+			array('1 and 2', array(1 => 'A', 2 => 'B')),
+			array('1 and 2 and 1', array(1 => 'A', 2 => 'B')),
+			array('(1 and 2) and 3', array(1 => 'A', 2 => 'B', 3 => 'C')),
+		);
+	}
+
+	/**
+	 * @dataProvider testGetFormulaIdsProvider
+	 *
+	 * @param $formula
+	 * @param array $expectedIds
+	 */
+	public function testGetFormulaIds($formula, array $expectedIds) {
+		$ids = CConditionHelper::getFormulaIds($formula);
+
+		$this->assertSame($ids, $expectedIds);
+	}
+
+	public function testReplaceNumericIdsProvider() {
+		return array(
+			array(
+				'', array(), ''
+			),
+			array(
+				'{1}', array(1 => 'A'), 'A'
+			),
+			array(
+				'{1} and {2}', array(1 => 'A', 2 => 'B'), 'A and B'
+			),
+			array(
+				'{1} and {2} or {3}', array(1 => 'A', 2 => 'B', '3' => 'C'), 'A and B or C'
+			),
+			array(
+				'{1} and {2} or {1}', array(1 => 'A', 2 => 'B'), 'A and B or A'
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider testReplaceNumericIdsProvider
+	 *
+	 * @param $formula
+	 * @param array $ids
+	 * @param $expectedFormula
+	 */
+	public function testReplaceNumericIds($formula, array $ids, $expectedFormula) {
+		$generatedFormula = CConditionHelper::replaceNumericIds($formula, $ids);
+
+		$this->assertSame($expectedFormula, $generatedFormula);
+	}
+
+	public function testReplaceLetterIdsProvider() {
+		return array(
+			array(
+				'', array(), ''
+			),
+			array(
+				'A', array('A' => 1), '{1}'
+			),
+			array(
+				'A and B', array('A' => 1, 'B' => 2), '{1} and {2}'
+			),
+			array(
+				'A and B or C', array('A' => 1, 'B' => 2, 'C' => 3), '{1} and {2} or {3}'
+			),
+			array(
+				'A and B or A', array('A' => 1, 'B' => 2), '{1} and {2} or {1}'
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider testReplaceLetterIdsProvider
+	 *
+	 * @param $formula
+	 * @param array $ids
+	 * @param $expectedFormula
+	 */
+	public function testReplaceLetterIds($formula, array $ids, $expectedFormula) {
+		$generatedFormula = CConditionHelper::replaceLetterIds($formula, $ids);
+
+		$this->assertSame($expectedFormula, $generatedFormula);
+	}
+
+	/**
+	 * @dataProvider testSortConditionsByFormulaIdProvider
+	 *
+	 * @param array $conditions
+	 * @param array $expectedConditions
+	 */
+	public function testSortConditionsByFormulaId($conditions, $expectedConditions) {
+		$sortedConditions = CConditionHelper::sortConditionsByFormulaId($conditions);
+
+		$this->assertSame($expectedConditions, $sortedConditions);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function testSortConditionsByFormulaIdProvider() {
+		return array(
+			array(
+				array(0 => array('formulaid' => 'A'), 1 => array('formulaid' => 'B'), 2 => array('formulaid' => 'C')),
+				array(0 => array('formulaid' => 'A'), 1 => array('formulaid' => 'B'), 2 => array('formulaid' => 'C'))
+			),
+			array(
+				array(2 => array('formulaid' => 'C'), 0 => array('formulaid' => 'A'), 1 => array('formulaid' => 'B')),
+				array(0 => array('formulaid' => 'A'), 1 => array('formulaid' => 'B'), 2 => array('formulaid' => 'C'))
+			),
+			array(
+				array(2 => array('formulaid' => 'C'), 3 => array('formulaid' => 'D'), 0 => array('formulaid' => 'A')),
+				array(0 => array('formulaid' => 'A'), 2 => array('formulaid' => 'C'), 3 => array('formulaid' => 'D'))
+			),
+			array(
+				array(2 => array('formulaid' => 'CC'), 3 => array('formulaid' => 'D'), 0 => array('formulaid' => 'AA')),
+				array(3 => array('formulaid' => 'D'), 0 => array('formulaid' => 'AA'), 2 => array('formulaid' => 'CC'))
+			)
+		);
+	}
+
+	/**
+	 * @dataProvider testGetNextFormulaIdProvider
+	 *
+	 * @param array $formulaIds
+	 * @param string $expectedFormulaId
+	 */
+	public function testGetNextFormulaId($formulaIds, $expectedFormulaId) {
+		$nextFormulaId = CConditionHelper::getNextFormulaId($formulaIds);
+
+		$this->assertSame($expectedFormulaId, $nextFormulaId);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function testGetNextFormulaIdProvider() {
+		return array(
+			array(
+				array(), 'A'
+			),
+			array(
+				array('A', 'B', 'C'), 'D'
+			),
+			array(
+				array('C', 'A', 'B'), 'D'
+			),
+			array(
+				array('X', 'Y', 'Z'), 'AA'
+			),
+			array(
+				array('AX', 'AY', 'AZ'), 'BA'
+			),
+			array(
+				array('ZX', 'ZY', 'ZZ'), 'AAA'
+			),
+			array(
+				array('AAX', 'AAY', 'AAZ'), 'ABA'
+			),
+			array(
+				array('ZZZX', 'ZZZY', 'ZZZZ'), 'AAAAA'
+			)
+		);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/html/CRowTest.php b/frontends/php/tests/unit/include/classes/html/CRowTest.php
new file mode 100644
index 00000000000..d95038c2681
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/html/CRowTest.php
@@ -0,0 +1,53 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CRowTest extends CTagTest {
+
+	public function itemProvider() {
+		return array(
+			// the row should render an empty <td> tag instead
+			array(null, '<tr></tr>'),
+			array('', '<tr><td></td></tr>'),
+			array('test', '<tr><td>test</td></tr>'),
+			array(array('one', 'two'), '<tr><td>one</td><td>two</td></tr>'),
+
+			// null columns are not rendered
+			array(array('one', null), '<tr><td>one</td></tr>'),
+
+			array(new CCol('test'), '<tr><td>test</td></tr>'),
+			array(array(new CCol('one'), new CCol('two')), '<tr><td>one</td><td>two</td></tr>'),
+		);
+	}
+
+	public function testClass() {
+		$tag = $this->createTag('', 'myclass');
+		$this->assertEquals('<tr class="myclass"><td></td></tr>', (string) $tag);
+	}
+
+	public function testId() {
+		$tag = $this->createTag('', null, 'myid');
+		$this->assertEquals('<tr id="myid"><td></td></tr>', (string) $tag);
+	}
+
+	public function createTag($items = null, $class = null, $id = null) {
+		return new CRow($items, $class, $id);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/html/CTagTest.php b/frontends/php/tests/unit/include/classes/html/CTagTest.php
new file mode 100644
index 00000000000..bdef847260e
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/html/CTagTest.php
@@ -0,0 +1,60 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+abstract class CTagTest extends PHPUnit_Framework_TestCase {
+
+	abstract public function itemProvider();
+
+	/**
+	 * @dataProvider itemProvider
+	 *
+	 * @param $items
+	 * @param $expectedResult
+	 */
+	public function testContruct($items, $expectedResult) {
+		$tag = $this->createTag($items);
+		$this->assertEquals($expectedResult, (string) $tag);
+	}
+
+	/**
+	 * @dataProvider itemProvider
+	 *
+	 * @param $items
+	 * @param $expectedResult
+	 */
+	public function testAddItems($items, $expectedResult) {
+		$tag = $this->createTag();
+		$tag->addItem($items);
+		$this->assertEquals($expectedResult, (string) $tag);
+	}
+
+	abstract public function testClass();
+	abstract public function testId();
+
+	/**
+	 * @param mixed $items
+	 * @param string $class
+	 * @param string $id
+	 *
+	 * @return CTag
+	 */
+	abstract public function createTag($items = null, $class = null, $id = null);
+}
diff --git a/frontends/php/tests/unit/include/classes/import/C24TriggerConverterTest.php b/frontends/php/tests/unit/include/classes/import/C24TriggerConverterTest.php
new file mode 100644
index 00000000000..e12a4591b6a
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/import/C24TriggerConverterTest.php
@@ -0,0 +1,78 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class C24TriggerConverterTest extends PHPUnit_Framework_TestCase {
+
+	public function testConvertProvider() {
+		return array(
+			array('1#1', '1<>1'),
+
+			array('1|1', '1 or 1'),
+			array('1 |1', '1 or 1'),
+			array('1| 1', '1 or 1'),
+			array('1 | 1', '1 or 1'),
+			array('1  | 1', '1 or 1'),
+			array('1  |  1', '1 or 1'),
+
+			array('1&1', '1 and 1'),
+			array('1 &1', '1 and 1'),
+			array('1& 1', '1 and 1'),
+			array('1 & 1', '1 and 1'),
+			array('1  & 1',	'1 and 1'),
+			array('1  &  1', '1 and 1'),
+
+			array('{host:item.last()}      |      {host:item.str(#)}', '{host:item.last()} or {host:item.str(#)}'),
+			array('{host:item.last()} > {#MAX}', '{host:item.last()} > {#MAX}'),
+
+			array('{host:item.str(#)} # 1', '{host:item.str(#)} <> 1'),
+			array('{host:item.str(|)} | 1', '{host:item.str(|)} or 1'),
+			array('{host:item.str(&)} & 1', '{host:item.str(&)} and 1'),
+
+			array('{host:item[#].last()} # 1', '{host:item[#].last()} <> 1'),
+			array('{host:item[|].last()} | 1', '{host:item[|].last()} or 1'),
+			array('{host:item[&].last()} and 1', '{host:item[&].last()} and 1'),
+
+			array('{TRIGGER.VALUE}|{host:item[&].last()}', '{TRIGGER.VALUE} or {host:item[&].last()}'),
+			array(
+				'({TRIGGER.VALUE}=0&{Template App Zabbix Server:zabbix[process,alerter,avg,busy].avg(10m)}>75)|({TRIGGER.VALUE}=1&{Template App Zabbix Server:zabbix[process,alerter,avg,busy].avg(10m)}>65)',
+				'({TRIGGER.VALUE}=0 and {Template App Zabbix Server:zabbix[process,alerter,avg,busy].avg(10m)}>75) or ({TRIGGER.VALUE}=1 and {Template App Zabbix Server:zabbix[process,alerter,avg,busy].avg(10m)}>65)'
+			),
+
+			// incorrect expressions are returned as is
+			array('{host:item.last()', '{host:item.last()'),
+
+			// an already up-to-date expression
+			array('{host:item.last()} > 0', '{host:item.last()} > 0'),
+		);
+	}
+
+	/**
+	 * @dataProvider testConvertProvider
+	 *
+	 * @param $expression
+	 * @param $expectedConvertedExpression
+	 */
+	public function testConvert($expression, $expectedConvertedExpression) {
+		$converter = new C24TriggerConverter(new CFunctionMacroParser(), new CMacroParser('#'));
+		$this->assertEquals($expectedConvertedExpression, $converter->convert($expression));
+	}
+
+}
diff --git a/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php b/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php
new file mode 100644
index 00000000000..f0f0f26ddf4
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php
@@ -0,0 +1,108 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CConditionFormulaTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var CConditionFormula
+	 */
+	protected $conditionFormula;
+
+	public function setUp() {
+		$this->conditionFormula = new CConditionFormula();
+	}
+
+	public function testParseValidProvider() {
+		return array(
+			array('A'),
+			array('A and B'),
+			array('A or B'),
+			array('(A)'),
+			array('((A))'),
+			array('A and (B and C)'),
+			array('A and(B and C)'),
+			array('(A and B)and C'),
+		);
+	}
+
+	/**
+	 * @dataProvider testParseValidProvider
+	 *
+	 * @param $string
+	 */
+	public function testParseValid($string) {
+		$result = $this->conditionFormula->parse($string);
+
+		$this->assertSame(true, $result);
+	}
+
+	public function testParseInvalidProvider() {
+		return array(
+			array('a'),
+			array('A B'),
+			array('A and'),
+			array('A and or'),
+			array('A an'),
+			array('(A'),
+			array('A)'),
+			array('((A)'),
+			array('(A))'),
+			array('(A)B'),
+			array('A and (B and C'),
+			array('A andB'),
+			array('AandB'),
+			array('A and BandC'),
+		);
+	}
+
+	/**
+	 * @dataProvider testParseInvalidProvider
+	 *
+	 * @param $string
+	 */
+	public function testParseInvalid($string) {
+		$result = $this->conditionFormula->parse($string);
+
+		$this->assertSame(false, $result);
+	}
+
+	public function parseConstantsProvider() {
+		return array(
+			array('A', array('A')),
+			array('A and B', array('A', 'B')),
+			array('A and B or C', array('A', 'B', 'C')),
+			array('A and B or A', array('A', 'B')),
+		);
+	}
+
+	/**
+	 * @dataProvider parseConstantsProvider
+	 *
+	 * @param $string
+	 * @param $expectedConstants
+	 */
+	public function testParseConstants($string, $expectedConstants) {
+		$result = $this->conditionFormula->parse($string);
+
+		$this->assertSame(true, $result);
+		$this->assertSame($expectedConstants, $this->conditionFormula->constants);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php
new file mode 100644
index 00000000000..d99b9de5a93
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php
@@ -0,0 +1,113 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CFunctionMacroParserTest extends CParserTest {
+
+	protected $resultClassName = 'CFunctionMacroParserResult';
+
+	protected function getParser() {
+		return new CFunctionMacroParser();
+	}
+
+	public function validProvider() {
+		return array(
+			array('{host:item.func()}', 0, '{host:item.func()}', 18),
+			array('{host:item.func(0)}', 0, '{host:item.func(0)}', 19),
+			array('{host:item.func(0, param)}', 0, '{host:item.func(0, param)}', 26),
+			array('{host:item.func(0, "param")}', 0, '{host:item.func(0, "param")}', 28),
+			array('{host:item[0].func()}', 0, '{host:item[0].func()}', 21),
+			array('{host:item[0, param].func()}', 0, '{host:item[0, param].func()}', 28),
+			array('{host:item[, param].func()}', 0, '{host:item[, param].func()}', 27),
+			array('{host:item[0, "param"].func()}', 0, '{host:item[0, "param"].func()}', 30),
+
+			array('{host:item.func()} = 0', 0, '{host:item.func()}', 18),
+			array('not {host:item.func()} = 0', 4, '{host:item.func()}', 18),
+		);
+	}
+
+	public function invalidProvider() {
+		return array(
+			array('', 0,  0),
+			array('{}', 0,  1),
+			array('{host}', 0, 5),
+			array('{host:item}', 0, 10),
+			array('{host:item.func}', 0, 15),
+			array('{host:item.func(}', 0, 16),
+			array('{host:item.func()', 0, 17),
+			array('{host.item.func()}', 0, 15),
+		);
+	}
+
+	public function testParseExpressionProvider() {
+		return array(
+			array(
+				'{host:item[0, param1, "param2"].func(0, param1, "param2")}',
+				array(
+					'expression' => '{host:item[0, param1, "param2"].func(0, param1, "param2")}',
+					'pos' => 0,
+					'host' => 'host',
+					'item' => 'item[0, param1, "param2"]',
+					'function' => 'func(0, param1, "param2")',
+					'functionName' => 'func',
+					'functionParam' => '0, param1, "param2"',
+					'functionParamList' => array(
+						'0',
+						'param1',
+						'param2'
+					)
+				)
+			),
+			array(
+				'{host:item[0, param1, "param2"].func(, param1, "param2")}',
+				array(
+					'expression' => '{host:item[0, param1, "param2"].func(, param1, "param2")}',
+					'pos' => 0,
+					'host' => 'host',
+					'item' => 'item[0, param1, "param2"]',
+					'function' => 'func(, param1, "param2")',
+					'functionName' => 'func',
+					'functionParam' => ', param1, "param2"',
+					'functionParamList' => array(
+						'',
+						'param1',
+						'param2'
+					)
+				)
+			),
+		);
+	}
+
+
+	/**
+	 * Test the CFunctionMacroParserResult::$expression property.
+	 *
+	 * @dataProvider testParseExpressionProvider()
+	 *
+	 * @param string    $string
+	 * @param array     $expectedExpression
+	 */
+	public function testParseExpression($string, array $expectedExpression) {
+		$result = $this->getParser()->parse($string, 0);
+
+		$this->assertTrue($result instanceof CFunctionMacroParserResult);
+		$this->assertEquals($result->expression, $expectedExpression);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php
new file mode 100644
index 00000000000..c27c46f56ba
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php
@@ -0,0 +1,49 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CMacroParserTest extends CParserTest {
+
+	protected function getParser() {
+		return new CMacroParser('#');
+	}
+
+	public function validProvider() {
+		return array(
+			array('{#M}', 0, '{#M}', 4),
+			array('{#MACRO12.A_Z}', 0, '{#MACRO12.A_Z}', 14),
+			array('{#MACRO} = 0', 0, '{#MACRO}', 8),
+			array('not {#MACRO} = 0', 4, '{#MACRO}', 8),
+		);
+	}
+
+	public function invalidProvider() {
+		return array(
+			array('', 0, 0),
+			array('A', 0, 0),
+			array('{A', 0, 1),
+			array('{#', 0, 2),
+			array('{#}', 0, 2),
+			array('{#A', 0, 3),
+			array('{#a}', 0, 2),
+			array('{#+}', 0, 2),
+		);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/parsers/CParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CParserTest.php
new file mode 100644
index 00000000000..4e5bd8f9a70
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/parsers/CParserTest.php
@@ -0,0 +1,69 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+abstract class CParserTest extends PHPUnit_Framework_TestCase {
+
+	protected $resultClassName = 'CParserResult';
+
+	abstract public function validProvider();
+	abstract public function invalidProvider();
+
+	/**
+	 * Return an instance of the tested parser.
+	 *
+	 * @return CParser
+	 */
+	abstract protected function getParser();
+
+	/**
+	 * @dataProvider validProvider
+	 *
+	 * @param $string
+	 * @param $pos
+	 * @param $expectedMatch
+	 * @param $expectedLength
+	 */
+	public function testParseValid($string, $pos, $expectedMatch, $expectedLength) {
+		$result = $this->getParser()->parse($string, $pos);
+
+		$this->assertEquals($this->resultClassName, get_class($result));
+		$this->assertSame($expectedMatch, $result->match);
+		$this->assertSame($expectedLength, $result->length);
+		$this->assertSame($string, $result->source);
+		$this->assertSame($pos, $result->pos);
+	}
+
+	/**
+	 * @dataProvider invalidProvider
+	 *
+	 * @param $string
+	 * @param $pos
+	 * @param $expectedEndPos
+	 */
+	public function testParseInvalid($string, $pos, $expectedEndPos) {
+		$parser = $this->getParser();
+
+		$result = $parser->parse($string, $pos);
+
+		$this->assertSame(false, $result);
+		$this->assertSame($expectedEndPos, $parser->getPos());
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php b/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php
new file mode 100644
index 00000000000..f844996ce53
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php
@@ -0,0 +1,67 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CSetParserTest extends CParserTest {
+
+	protected function getParser() {
+		return new CSetParser(array('<', '>', '<>', 'and', 'or'));
+	}
+
+	public function validProvider() {
+		return array(
+			array('<', 0, '<', 1),
+			array('<=', 0, '<', 1),
+			array('>', 0, '>', 1),
+			array('>=', 0, '>', 1),
+			array('<>', 0, '<>', 2),
+			array('<>=', 0, '<>', 2),
+			array('and', 0, 'and', 3),
+			array('and this', 0, 'and', 3),
+			array('or', 0, 'or', 2),
+			array('or this', 0, 'or', 2),
+
+			array('prefix<', 6, '<', 1),
+			array('prefix<=', 6, '<', 1),
+			array('prefix>', 6, '>', 1),
+			array('prefix>=', 6, '>', 1),
+			array('prefix<>', 6, '<>', 2),
+			array('prefix<>=', 6, '<>', 2),
+			array('prefixand', 6, 'and', 3),
+			array('prefixand this', 6, 'and', 3),
+			array('prefixor', 6, 'or', 2),
+			array('prefixor this', 6, 'or', 2),
+
+			array('><', 0, '>', 1),
+		);
+	}
+
+	public function invalidProvider() {
+		return array(
+			array('', 0, 0),
+			array('an', 0, 2),
+			array('anor', 0, 4),
+			array('+<', 0, 0),
+
+			array('prefixand', 5, 5),
+			array('prefixand', 7, 9),
+		);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php b/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php
new file mode 100644
index 00000000000..d89b437d1af
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php
@@ -0,0 +1,3343 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+class CTriggerExpressionTest extends PHPUnit_Framework_TestCase {
+
+	public static function provider() {
+		return array(
+			array('', null, false),
+			array('+', null, false),
+			array('1+1', null, true),
+			array('abc', null, false),
+
+			array('.5', null, true),
+			array('5.', null, true),
+			array('..5', null, false),
+			array('5..', null, false),
+
+			array('1', null, true),
+			array('1s', null, true),
+			array('1m', null, true),
+			array('1h', null, true),
+			array('1d', null, true),
+			array('1w', null, true),
+			array('1K', null, true),
+			array('1M', null, true),
+			array('1G', null, true),
+			array('1T', null, true),
+			array('1.5', null, true),
+			array('1.5s', null, true),
+			array('1.5m', null, true),
+			array('1.5h', null, true),
+			array('1.5d', null, true),
+			array('1.5w', null, true),
+			array('1.5K', null, true),
+			array('1.5M', null, true),
+			array('1.5G', null, true),
+			array('1.5T', null, true),
+			array('-1.5', null, true),
+			array('-1.5s', null, true),
+			array('-1.5m', null, true),
+			array('-1.5h', null, true),
+			array('-1.5d', null, true),
+			array('-1.5w', null, true),
+			array('-1.5K', null, true),
+			array('-1.5M', null, true),
+			array('-1.5G', null, true),
+			array('-1.5T', null, true),
+
+			array('{TRIGGER.VALUE}', null, true),
+			array('{$USERMACRO}', null, true),
+			array('{TRIGGER.VALUE}=1', null, true),
+			array('{$USERMACRO}=1', null, true),
+
+			array('{host}', null, false),
+			array('{host:key}', null, false),
+			array('{host:key.str}', null, false),
+
+			array('{host:key.diff()} and {TRIGGER.VALUE}', null, true),
+			array('{host:key.diff()}and {TRIGGER.VALUE}', null, false),
+			array('{host:key.diff()}  and{TRIGGER.VALUE}', null, false),
+			array('{host:key.diff()}and{TRIGGER.VALUE}', null, false),
+			array('{host:key.diff()}and+{TRIGGER.VALUE}', null, false),
+			array('{host:key.diff()}and-{TRIGGER.VALUE}', null, false),
+			array('{host:key.diff()} and + {TRIGGER.VALUE}', null, false),
+			array('{host:key.diff()} and - {TRIGGER.VALUE}', null, true),
+
+			array('{host:key.diff()} and {$USERMACRO}', null, true),
+			array('{host:key.diff()}and {$USERMACRO}', null, false),
+			array('{host:key.diff()} and{$USERMACRO}', null, false),
+			array('{host:key.diff()}and{$USERMACRO}', null, false),
+			array('{host:key.diff()}and+{$USERMACRO}', null, false),
+			array('{host:key.diff()}and-{$USERMACRO}', null, false),
+			array('{host:key.diff()} and + {$USERMACRO}', null, false),
+			array('{host:key.diff()} and - {$USERMACRO}', null, true),
+
+			// basic "not" support
+			array('not 1', null, true),
+			array('not (1)', null, true),
+			array('not -1', null, true),
+			array('not (-1)', null, true),
+			array('not -(1)', null, true),
+			array('not {TRIGGER.VALUE}', null, true),
+			array('not ({TRIGGER.VALUE})', null, true),
+			array('not -{TRIGGER.VALUE}', null, true),
+			array('not (-{TRIGGER.VALUE})', null, true),
+			array('not -({TRIGGER.VALUE})', null, true),
+			array('not {$USERMACRO}', null, true),
+			array('not -{$USERMACRO}', null, true),
+			array('not (-{$USERMACRO})', null, true),
+			array('not -({$USERMACRO})', null, true),
+			array('not {host:key.diff()}', null, true),
+			array('not ({host:key.diff()})', null, true),
+			array('not (-{host:key.diff()})', null, true),
+			array('not -({host:key.diff()})', null, true),
+
+			array('not1', null, false),
+			array('not(1)', null, true),
+			array('not-1', null, false),
+			array('not(-1)', null, true),
+			array('not-(1)', null, false),
+			array('not{TRIGGER.VALUE}', null, false),
+			array('not({TRIGGER.VALUE})', null, true),
+			array('not-{TRIGGER.VALUE}', null, false),
+			array('not(-{TRIGGER.VALUE})', null, true),
+			array('not-({TRIGGER.VALUE})', null, false),
+			array('not{$USERMACRO}', null, false),
+			array('not-{$USERMACRO}', null, false),
+			array('not(-{$USERMACRO})', null, true),
+			array('not-({$USERMACRO})', null, false),
+			array('not{host:key.diff()}', null, false),
+			array('not({host:key.diff()})', null, true),
+			array('not(-{host:key.diff()})', null, true),
+			array('not-({host:key.diff()})', null, false),
+
+			array('- not 1', null, false),
+			array('-not 1', null, false),
+			array('- not1', null, false),
+			array('-not1', null, false),
+
+			// operator cases
+			array('Not 1', null, false),
+			array('NOT 1', null, false),
+			array('1 Or 1', null, false),
+			array('1 OR 1', null, false),
+			array('1 And 1', null, false),
+			array('1 AND 1', null, false),
+
+			array('{host:key.diff()}=00', null, true),
+			array('{host:key.diff()}=0 0', null, false),
+			array('{host:key.diff()}=0 0={host:key.diff()}', null, false),
+			array('{host:key.diff()} = 00 = {host:key.diff()}', null, true),
+
+			array('{host:key.str(ГУГЛ)}=0', null, true),
+			array('{host:key.str("ГУГЛ")}=0', null, true),
+			array('{host:key[ГУГЛ].str(ГУГЛ)}=0', null, true),
+			array('{host:key["ГУГЛ"].str("ГУГЛ")}=0', null, true),
+			array('{host:key.str("こんにちは、世界")}', null, true),
+			array('{host:key.str(こんにちは、世界)}', null, true),
+			array('{host:key["こんにちは、世界"].str("こんにちは、世界")}', null, true),
+			array('{host:key[こんにちは、世界].str(こんにちは、世界)}', null, true),
+
+			array('{host:key[a,,"b",,[c,d,,"e",],,[f]].count(1,,"b",3)}', null, true),
+			array('{host:key[a,,"b",,[[c,d,,"e"],[]],,[f]].count(1,,"b",3)}', null, true),
+			array('{host:key[a,,"b",,[c,d,,"e",,,[f]].count(1,,"b",3)}', null, false),
+			array('{host:key[a,,"b",,[c,d,,"e",],,f]].count(1,,"b",3)}', null, false),
+
+			array('{abcdefghijklmnopqrstuvwxyz. _-ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890:key.diff()}', null, true),
+			array('{host:abcdefghijklmnopqrstuvwxyz._-ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890.diff()}', null, true),
+			array('{host:key.abcdefghijklmnopqrstuvwxyz()}', null, true),
+
+			array('{host:,.diff()}', null, false),
+			array('{host:;.diff()}', null, false),
+			array('{host::.diff()}', null, false),
+
+			array('{:key.diff()}', null, false),
+			array('{host:.diff()}', null, false),
+			array('{host:key.()}', null, false),
+
+			array(' {host:key.diff()} ', null, true),
+			array('({host:key.diff()})', null, true),
+			array('{(host:key.diff()})', null, false),
+			array('({host:key.diff())}', null, false),
+			array('{(host:key.diff())}', null, false),
+			array('{(host:key.diff()})=0', null, false),
+			array('({host:key.diff())}=0', null, false),
+			array('{(host:key.diff())}=0', null, false),
+			array('({host:key.diff()}=)0', null, false),
+			array('({host:key.diff()})0', null, false),
+			array('0(={host:key.diff()})', null, false),
+			array('0({host:key.diff()})', null, false),
+			array('( {host:key.diff()} )', null, true),
+			array(' ( {host:key.diff()} ) ', null, true),
+			array('(( {host:key.diff()} ))', null, true),
+			array(' ( ( {host:key.diff()} ) ) ', null, true),
+			array('((( {host:key.diff()} )))', null, true),
+			array(' ( ( ( {host:key.diff()} ) ) ) ', null, true),
+			array('()0={host:key.diff()}', null, false),
+			array('0()={host:key.diff()}', null, false),
+			array('0=()={host:key.diff()}', null, false),
+			array('0=(){host:key.diff()}', null, false),
+			array('0={()host:key.diff()}', null, false),
+			array('0={host:key.diff()()}', null, false),
+			array('0={host:key.diff()}()', null, false),
+			array('0={host:key.diff()}+()()()()5', null, false),
+			array('0={host:key.diff()}+((((()))))5', null, false),
+			array('(0)={host:key.diff()}', null, true),
+			array('(0+)={host:key.diff()}', null, false),
+			array('(0=){host:key.diff()}', null, false),
+			array('({host:key.diff)()}', null, false),
+			array('({host:key.)diff()}', null, false),
+			array('({host:key).diff()}', null, false),
+			array('(-5)={host:key.diff()}', null, true),
+			array('(15 - 5.25 - 1)={host:key.diff()}', null, true),
+			array('{host:key.diff()} = -5', null, true),
+			array('{0:0.last(0)}=0', null, true),
+
+			array('(({host:key.diff()})=0)', null, true),
+			array('( ( {host:key.diff()} ) = 0 )', null, true),
+			array('(({host:key.diff()}) * 100) / 95', null, true),
+			array('(({host:key.diff()}) * 5.25K) / 95.0', null, true),
+			array('(({host:key.diff()}) * 1w) / 1d', null, true),
+			array('(({host:key.diff()}) * 1w) / 1Ks', null, false),
+			array('(({host:key.diff()}) * 1w) / (1d * ({host:key.diff()})', null, false),
+			array('(({host:key.diff()}) * 1w) / (1d * host:key.diff()}))', null, false),
+			array('(({host:key.diff()}) * 1w) / (1d * ({host:key.diff()}))', null, true),
+
+			array('{host:key.last(1)} * (-1)', null, true),
+			array('{host:key.last(1)} / (-1)', null, true),
+			array('{host:key.last(1)} + (-1)', null, true),
+			array('{host:key.last(1)} - (-1)', null, true),
+			array('{host:key.last(1)} = (-1)', null, true),
+			array('{host:key.last(1)} <> (-1)', null, true),
+			array('{host:key.last(1)} < (-1)', null, true),
+			array('{host:key.last(1)} > (-1)', null, true),
+			array('{host:key.last(1)} and (-1)', null, true),
+			array('{host:key.last(1)} or (-1)', null, true),
+
+			array('{host:key.last(1)} * not (-1)', null, true),
+			array('{host:key.last(1)} / not (-1)', null, true),
+			array('{host:key.last(1)} + not (-1)', null, true),
+			array('{host:key.last(1)} - not (-1)', null, true),
+			array('{host:key.last(1)} = not (-1)', null, true),
+			array('{host:key.last(1)} <> not (-1)', null, true),
+			array('{host:key.last(1)} < not (-1)', null, true),
+			array('{host:key.last(1)} > not (-1)', null, true),
+			array('{host:key.last(1)} and not (-1)', null, true),
+			array('{host:key.last(1)} or not (-1)', null, true),
+
+			array('{host:key.last(1)}* (-1)', null, true),
+			array('{host:key.last(1)}/ (-1)', null, true),
+			array('{host:key.last(1)}+ (-1)', null, true),
+			array('{host:key.last(1)}- (-1)', null, true),
+			array('{host:key.last(1)}= (-1)', null, true),
+			array('{host:key.last(1)}<> (-1)', null, true),
+			array('{host:key.last(1)}< (-1)', null, true),
+			array('{host:key.last(1)}> (-1)', null, true),
+			array('{host:key.last(1)}and (-1)', null, false),
+			array('{host:key.last(1)}or (-1)', null, false),
+
+			array('{host:key.last(1)}* not (-1)', null, true),
+			array('{host:key.last(1)}/ not (-1)', null, true),
+			array('{host:key.last(1)}+ not (-1)', null, true),
+			array('{host:key.last(1)}- not (-1)', null, true),
+			array('{host:key.last(1)}= not (-1)', null, true),
+			array('{host:key.last(1)}<> not (-1)', null, true),
+			array('{host:key.last(1)}< not (-1)', null, true),
+			array('{host:key.last(1)}> not (-1)', null, true),
+			array('{host:key.last(1)}and not (-1)', null, false),
+			array('{host:key.last(1)}or not (-1)', null, false),
+
+			array('{host:key.last(1)} *(-1)', null, true),
+			array('{host:key.last(1)} /(-1)', null, true),
+			array('{host:key.last(1)} +(-1)', null, true),
+			array('{host:key.last(1)} -(-1)', null, true),
+			array('{host:key.last(1)} =(-1)', null, true),
+			array('{host:key.last(1)} <>(-1)', null, true),
+			array('{host:key.last(1)} <(-1)', null, true),
+			array('{host:key.last(1)} >(-1)', null, true),
+			array('{host:key.last(1)} and(-1)', null, true),
+			array('{host:key.last(1)} or(-1)', null, true),
+
+			array('{host:key.last(1)} * not(-1)', null, true),
+			array('{host:key.last(1)} / not(-1)', null, true),
+			array('{host:key.last(1)} + not(-1)', null, true),
+			array('{host:key.last(1)} - not(-1)', null, true),
+			array('{host:key.last(1)} = not(-1)', null, true),
+			array('{host:key.last(1)} <> not(-1)', null, true),
+			array('{host:key.last(1)} < not(-1)', null, true),
+			array('{host:key.last(1)} > not(-1)', null, true),
+			array('{host:key.last(1)} and not(-1)', null, true),
+			array('{host:key.last(1)} or not(-1)', null, true),
+
+			array('{host:key.last(1)}*(-1)', null, true),
+			array('{host:key.last(1)}/(-1)', null, true),
+			array('{host:key.last(1)}+(-1)', null, true),
+			array('{host:key.last(1)}-(-1)', null, true),
+			array('{host:key.last(1)}=(-1)', null, true),
+			array('{host:key.last(1)}<>(-1)', null, true),
+			array('{host:key.last(1)}<(-1)', null, true),
+			array('{host:key.last(1)}>(-1)', null, true),
+			array('{host:key.last(1)}and(-1)', null, false),
+			array('{host:key.last(1)}or(-1)', null, false),
+
+			array('{host:key.last(1)}*not(-1)', null, false),
+			array('{host:key.last(1)}/not(-1)', null, false),
+			array('{host:key.last(1)}+not(-1)', null, false),
+			array('{host:key.last(1)}-not(-1)', null, false),
+			array('{host:key.last(1)}=not(-1)', null, false),
+			array('{host:key.last(1)}<>not(-1)', null, false),
+			array('{host:key.last(1)}<not(-1)', null, false),
+			array('{host:key.last(1)}>not(-1)', null, false),
+			array('{host:key.last(1)}andnot(-1)', null, false),
+			array('{host:key.last(1)}ornot(-1)', null, false),
+
+			array('{host:key.last(1)} * -1', null, true),
+			array('{host:key.last(1)} / -1', null, true),
+			array('{host:key.last(1)} + -1', null, true),
+			array('{host:key.last(1)} - -1', null, true),
+			array('{host:key.last(1)} = -1', null, true),
+			array('{host:key.last(1)} <> -1', null, true),
+			array('{host:key.last(1)} < -1', null, true),
+			array('{host:key.last(1)} > -1', null, true),
+			array('{host:key.last(1)} and -1', null, true),
+			array('{host:key.last(1)} or -1', null, true),
+
+			array('{host:key.last(1)} * not -1', null, true),
+			array('{host:key.last(1)} / not -1', null, true),
+			array('{host:key.last(1)} + not -1', null, true),
+			array('{host:key.last(1)} - not -1', null, true),
+			array('{host:key.last(1)} = not -1', null, true),
+			array('{host:key.last(1)} <> not -1', null, true),
+			array('{host:key.last(1)} < not -1', null, true),
+			array('{host:key.last(1)} > not -1', null, true),
+			array('{host:key.last(1)} and not -1', null, true),
+			array('{host:key.last(1)} or not -1', null, true),
+
+			array('{host:key.last(1)}* -1', null, true),
+			array('{host:key.last(1)}/ -1', null, true),
+			array('{host:key.last(1)}+ -1', null, true),
+			array('{host:key.last(1)}- -1', null, true),
+			array('{host:key.last(1)}= -1', null, true),
+			array('{host:key.last(1)}<> -1', null, true),
+			array('{host:key.last(1)}< -1', null, true),
+			array('{host:key.last(1)}> -1', null, true),
+			array('{host:key.last(1)}and -1', null, false),
+			array('{host:key.last(1)}or -1', null, false),
+
+			array('{host:key.last(1)}* not -1', null, true),
+			array('{host:key.last(1)}/ not -1', null, true),
+			array('{host:key.last(1)}+ not -1', null, true),
+			array('{host:key.last(1)}- not -1', null, true),
+			array('{host:key.last(1)}= not -1', null, true),
+			array('{host:key.last(1)}<> not -1', null, true),
+			array('{host:key.last(1)}< not -1', null, true),
+			array('{host:key.last(1)}> not -1', null, true),
+			array('{host:key.last(1)}and not -1', null, false),
+			array('{host:key.last(1)}or not -1', null, false),
+
+			array('{host:key.last(1)} *-1', null, true),
+			array('{host:key.last(1)} /-1', null, true),
+			array('{host:key.last(1)} +-1', null, true),
+			array('{host:key.last(1)} --1', null, true),
+			array('{host:key.last(1)} =-1', null, true),
+			array('{host:key.last(1)} <>-1', null, true),
+			array('{host:key.last(1)} <-1', null, true),
+			array('{host:key.last(1)} >-1', null, true),
+			array('{host:key.last(1)} and-1', null, false),
+			array('{host:key.last(1)} or-1', null, false),
+
+			array('{host:key.last(1)} * not-1', null, false),
+			array('{host:key.last(1)} / not-1', null, false),
+			array('{host:key.last(1)} + not-1', null, false),
+			array('{host:key.last(1)} - not-1', null, false),
+			array('{host:key.last(1)} = not-1', null, false),
+			array('{host:key.last(1)} <> not-1', null, false),
+			array('{host:key.last(1)} < not-1', null, false),
+			array('{host:key.last(1)} > not-1', null, false),
+			array('{host:key.last(1)} and not-1', null, false),
+			array('{host:key.last(1)} or not-1', null, false),
+
+			array('{host:key.last(1)}*-1', null, true),
+			array('{host:key.last(1)}/-1', null, true),
+			array('{host:key.last(1)}+-1', null, true),
+			array('{host:key.last(1)}--1', null, true),
+			array('{host:key.last(1)}=-1', null, true),
+			array('{host:key.last(1)}<>-1', null, true),
+			array('{host:key.last(1)}<-1', null, true),
+			array('{host:key.last(1)}>-1', null, true),
+			array('{host:key.last(1)}and-1', null, false),
+			array('{host:key.last(1)}or-1', null, false),
+
+			array('{host:key.last(1)}*not-1', null, false),
+			array('{host:key.last(1)}/not-1', null, false),
+			array('{host:key.last(1)}+not-1', null, false),
+			array('{host:key.last(1)}-not-1', null, false),
+			array('{host:key.last(1)}=not-1', null, false),
+			array('{host:key.last(1)}<>not-1', null, false),
+			array('{host:key.last(1)}<not-1', null, false),
+			array('{host:key.last(1)}>not-1', null, false),
+			array('{host:key.last(1)}andnot-1', null, false),
+			array('{host:key.last(1)}ornot-1', null, false),
+
+			array('{host:key.last(1)} * (- 1)', null, true),
+			array('{host:key.last(1)} / (- 1)', null, true),
+			array('{host:key.last(1)} + (- 1)', null, true),
+			array('{host:key.last(1)} - (- 1)', null, true),
+			array('{host:key.last(1)} = (- 1)', null, true),
+			array('{host:key.last(1)} <> (- 1)', null, true),
+			array('{host:key.last(1)} < (- 1)', null, true),
+			array('{host:key.last(1)} > (- 1)', null, true),
+			array('{host:key.last(1)} and (- 1)', null, true),
+			array('{host:key.last(1)} or (- 1)', null, true),
+
+			array('{host:key.last(1)} * not (- 1)', null, true),
+			array('{host:key.last(1)} / not (- 1)', null, true),
+			array('{host:key.last(1)} + not (- 1)', null, true),
+			array('{host:key.last(1)} - not (- 1)', null, true),
+			array('{host:key.last(1)} = not (- 1)', null, true),
+			array('{host:key.last(1)} <> not (- 1)', null, true),
+			array('{host:key.last(1)} < not (- 1)', null, true),
+			array('{host:key.last(1)} > not (- 1)', null, true),
+			array('{host:key.last(1)} and not (- 1)', null, true),
+			array('{host:key.last(1)} or not (- 1)', null, true),
+
+			array('{host:key.last(1)}* (- 1)', null, true),
+			array('{host:key.last(1)}/ (- 1)', null, true),
+			array('{host:key.last(1)}+ (- 1)', null, true),
+			array('{host:key.last(1)}- (- 1)', null, true),
+			array('{host:key.last(1)}= (- 1)', null, true),
+			array('{host:key.last(1)}<> (- 1)', null, true),
+			array('{host:key.last(1)}< (- 1)', null, true),
+			array('{host:key.last(1)}> (- 1)', null, true),
+			array('{host:key.last(1)}and (- 1)', null, false),
+			array('{host:key.last(1)}or (- 1)', null, false),
+
+			array('{host:key.last(1)}* not (- 1)', null, true),
+			array('{host:key.last(1)}/ not (- 1)', null, true),
+			array('{host:key.last(1)}+ not (- 1)', null, true),
+			array('{host:key.last(1)}- not (- 1)', null, true),
+			array('{host:key.last(1)}= not (- 1)', null, true),
+			array('{host:key.last(1)}<> not (- 1)', null, true),
+			array('{host:key.last(1)}< not (- 1)', null, true),
+			array('{host:key.last(1)}> not (- 1)', null, true),
+			array('{host:key.last(1)}and not (- 1)', null, false),
+			array('{host:key.last(1)}or not (- 1)', null, false),
+
+			array('{host:key.last(1)} *(- 1)', null, true),
+			array('{host:key.last(1)} /(- 1)', null, true),
+			array('{host:key.last(1)} +(- 1)', null, true),
+			array('{host:key.last(1)} -(- 1)', null, true),
+			array('{host:key.last(1)} =(- 1)', null, true),
+			array('{host:key.last(1)} <>(- 1)', null, true),
+			array('{host:key.last(1)} <(- 1)', null, true),
+			array('{host:key.last(1)} >(- 1)', null, true),
+			array('{host:key.last(1)} and(- 1)', null, true),
+			array('{host:key.last(1)} or(- 1)', null, true),
+
+			array('{host:key.last(1)} * not(- 1)', null, true),
+			array('{host:key.last(1)} / not(- 1)', null, true),
+			array('{host:key.last(1)} + not(- 1)', null, true),
+			array('{host:key.last(1)} - not(- 1)', null, true),
+			array('{host:key.last(1)} = not(- 1)', null, true),
+			array('{host:key.last(1)} <> not(- 1)', null, true),
+			array('{host:key.last(1)} < not(- 1)', null, true),
+			array('{host:key.last(1)} > not(- 1)', null, true),
+			array('{host:key.last(1)} and not(- 1)', null, true),
+			array('{host:key.last(1)} or not(- 1)', null, true),
+
+			array('{host:key.last(1)}*(- 1)', null, true),
+			array('{host:key.last(1)}/(- 1)', null, true),
+			array('{host:key.last(1)}+(- 1)', null, true),
+			array('{host:key.last(1)}-(- 1)', null, true),
+			array('{host:key.last(1)}=(- 1)', null, true),
+			array('{host:key.last(1)}<>(- 1)', null, true),
+			array('{host:key.last(1)}<(- 1)', null, true),
+			array('{host:key.last(1)}>(- 1)', null, true),
+			array('{host:key.last(1)}and(- 1)', null, false),
+			array('{host:key.last(1)}or(- 1)', null, false),
+
+			array('{host:key.last(1)}*not(- 1)', null, false),
+			array('{host:key.last(1)}/not(- 1)', null, false),
+			array('{host:key.last(1)}+not(- 1)', null, false),
+			array('{host:key.last(1)}-not(- 1)', null, false),
+			array('{host:key.last(1)}=not(- 1)', null, false),
+			array('{host:key.last(1)}<>not(- 1)', null, false),
+			array('{host:key.last(1)}<not(- 1)', null, false),
+			array('{host:key.last(1)}>not(- 1)', null, false),
+			array('{host:key.last(1)}andnot(- 1)', null, false),
+			array('{host:key.last(1)}ornot(- 1)', null, false),
+
+			array('{host:key.last(1)} * - 1', null, true),
+			array('{host:key.last(1)} / - 1', null, true),
+			array('{host:key.last(1)} + - 1', null, true),
+			array('{host:key.last(1)} - - 1', null, true),
+			array('{host:key.last(1)} = - 1', null, true),
+			array('{host:key.last(1)} <> - 1', null, true),
+			array('{host:key.last(1)} < - 1', null, true),
+			array('{host:key.last(1)} > - 1', null, true),
+			array('{host:key.last(1)} and - 1', null, true),
+			array('{host:key.last(1)} or - 1', null, true),
+
+			array('{host:key.last(1)} * not - 1', null, true),
+			array('{host:key.last(1)} / not - 1', null, true),
+			array('{host:key.last(1)} + not - 1', null, true),
+			array('{host:key.last(1)} - not - 1', null, true),
+			array('{host:key.last(1)} = not - 1', null, true),
+			array('{host:key.last(1)} <> not - 1', null, true),
+			array('{host:key.last(1)} < not - 1', null, true),
+			array('{host:key.last(1)} > not - 1', null, true),
+			array('{host:key.last(1)} and not - 1', null, true),
+			array('{host:key.last(1)} or not - 1', null, true),
+
+			array('{host:key.last(1)}* - 1', null, true),
+			array('{host:key.last(1)}/ - 1', null, true),
+			array('{host:key.last(1)}+ - 1', null, true),
+			array('{host:key.last(1)}- - 1', null, true),
+			array('{host:key.last(1)}= - 1', null, true),
+			array('{host:key.last(1)}<> - 1', null, true),
+			array('{host:key.last(1)}< - 1', null, true),
+			array('{host:key.last(1)}> - 1', null, true),
+			array('{host:key.last(1)}and - 1', null, false),
+			array('{host:key.last(1)}or - 1', null, false),
+
+			array('{host:key.last(1)}* not - 1', null, true),
+			array('{host:key.last(1)}/ not - 1', null, true),
+			array('{host:key.last(1)}+ not - 1', null, true),
+			array('{host:key.last(1)}- not - 1', null, true),
+			array('{host:key.last(1)}= not - 1', null, true),
+			array('{host:key.last(1)}<> not - 1', null, true),
+			array('{host:key.last(1)}< not - 1', null, true),
+			array('{host:key.last(1)}> not - 1', null, true),
+			array('{host:key.last(1)}and not - 1', null, false),
+			array('{host:key.last(1)}or not - 1', null, false),
+
+			array('{host:key.last(1)} *- 1', null, true),
+			array('{host:key.last(1)} /- 1', null, true),
+			array('{host:key.last(1)} +- 1', null, true),
+			array('{host:key.last(1)} -- 1', null, true),
+			array('{host:key.last(1)} =- 1', null, true),
+			array('{host:key.last(1)} <>- 1', null, true),
+			array('{host:key.last(1)} <- 1', null, true),
+			array('{host:key.last(1)} >- 1', null, true),
+			array('{host:key.last(1)} and- 1', null, false),
+			array('{host:key.last(1)} or- 1', null, false),
+
+			array('{host:key.last(1)} *not- 1', null, false),
+			array('{host:key.last(1)} /not- 1', null, false),
+			array('{host:key.last(1)} +not- 1', null, false),
+			array('{host:key.last(1)} -not- 1', null, false),
+			array('{host:key.last(1)} =not- 1', null, false),
+			array('{host:key.last(1)} <>not- 1', null, false),
+			array('{host:key.last(1)} <not- 1', null, false),
+			array('{host:key.last(1)} >not- 1', null, false),
+			array('{host:key.last(1)} andnot- 1', null, false),
+			array('{host:key.last(1)} ornot- 1', null, false),
+
+			array('{host:key.last(1)}*- 1', null, true),
+			array('{host:key.last(1)}/- 1', null, true),
+			array('{host:key.last(1)}+- 1', null, true),
+			array('{host:key.last(1)}-- 1', null, true),
+			array('{host:key.last(1)}=- 1', null, true),
+			array('{host:key.last(1)}<>- 1', null, true),
+			array('{host:key.last(1)}<- 1', null, true),
+			array('{host:key.last(1)}>- 1', null, true),
+			array('{host:key.last(1)}and- 1', null, false),
+			array('{host:key.last(1)}or- 1', null, false),
+
+			array('{host:key.last(1)}*not- 1', null, false),
+			array('{host:key.last(1)}/not- 1', null, false),
+			array('{host:key.last(1)}+not- 1', null, false),
+			array('{host:key.last(1)}-not- 1', null, false),
+			array('{host:key.last(1)}=not- 1', null, false),
+			array('{host:key.last(1)}<>not- 1', null, false),
+			array('{host:key.last(1)}<not- 1', null, false),
+			array('{host:key.last(1)}>not- 1', null, false),
+			array('{host:key.last(1)}andnot- 1', null, false),
+			array('{host:key.last(1)}ornot- 1', null, false),
+
+			array('{host:key.last(1)} * (+1)', null, false),
+			array('{host:key.last(1)} / (+1)', null, false),
+			array('{host:key.last(1)} + (+1)', null, false),
+			array('{host:key.last(1)} - (+1)', null, false),
+			array('{host:key.last(1)} = (+1)', null, false),
+			array('{host:key.last(1)} <> (+1)', null, false),
+			array('{host:key.last(1)} < (+1)', null, false),
+			array('{host:key.last(1)} > (+1)', null, false),
+			array('{host:key.last(1)} and (+1)', null, false),
+			array('{host:key.last(1)} or (+1)', null, false),
+
+			array('{host:key.last(1)} * not (+1)', null, false),
+			array('{host:key.last(1)} / not (+1)', null, false),
+			array('{host:key.last(1)} + not (+1)', null, false),
+			array('{host:key.last(1)} - not (+1)', null, false),
+			array('{host:key.last(1)} = not (+1)', null, false),
+			array('{host:key.last(1)} <> not (+1)', null, false),
+			array('{host:key.last(1)} < not (+1)', null, false),
+			array('{host:key.last(1)} > not (+1)', null, false),
+			array('{host:key.last(1)} and not (+1)', null, false),
+			array('{host:key.last(1)} or not (+1)', null, false),
+
+			array('{host:key.last(1)}* (+1)', null, false),
+			array('{host:key.last(1)}/ (+1)', null, false),
+			array('{host:key.last(1)}+ (+1)', null, false),
+			array('{host:key.last(1)}- (+1)', null, false),
+			array('{host:key.last(1)}= (+1)', null, false),
+			array('{host:key.last(1)}<> (+1)', null, false),
+			array('{host:key.last(1)}< (+1)', null, false),
+			array('{host:key.last(1)}> (+1)', null, false),
+			array('{host:key.last(1)}and (+1)', null, false),
+			array('{host:key.last(1)}or (+1)', null, false),
+
+			array('{host:key.last(1)}*not (+1)', null, false),
+			array('{host:key.last(1)}/not (+1)', null, false),
+			array('{host:key.last(1)}+not (+1)', null, false),
+			array('{host:key.last(1)}-not (+1)', null, false),
+			array('{host:key.last(1)}=not (+1)', null, false),
+			array('{host:key.last(1)}<>not (+1)', null, false),
+			array('{host:key.last(1)}<not (+1)', null, false),
+			array('{host:key.last(1)}>not (+1)', null, false),
+			array('{host:key.last(1)}andnot (+1)', null, false),
+			array('{host:key.last(1)}ornot (+1)', null, false),
+
+			array('{host:key.last(1)} *(+1)', null, false),
+			array('{host:key.last(1)} /(+1)', null, false),
+			array('{host:key.last(1)} +(+1)', null, false),
+			array('{host:key.last(1)} -(+1)', null, false),
+			array('{host:key.last(1)} =(+1)', null, false),
+			array('{host:key.last(1)} <>(+1)', null, false),
+			array('{host:key.last(1)} <(+1)', null, false),
+			array('{host:key.last(1)} >(+1)', null, false),
+			array('{host:key.last(1)} and(+1)', null, false),
+			array('{host:key.last(1)} or(+1)', null, false),
+
+			array('{host:key.last(1)} * not(+1)', null, false),
+			array('{host:key.last(1)} / not(+1)', null, false),
+			array('{host:key.last(1)} + not(+1)', null, false),
+			array('{host:key.last(1)} - not(+1)', null, false),
+			array('{host:key.last(1)} = not(+1)', null, false),
+			array('{host:key.last(1)} <> not(+1)', null, false),
+			array('{host:key.last(1)} < not(+1)', null, false),
+			array('{host:key.last(1)} > not(+1)', null, false),
+			array('{host:key.last(1)} and not(+1)', null, false),
+			array('{host:key.last(1)} or not(+1)', null, false),
+
+			array('{host:key.last(1)}*(+1)', null, false),
+			array('{host:key.last(1)}/(+1)', null, false),
+			array('{host:key.last(1)}+(+1)', null, false),
+			array('{host:key.last(1)}-(+1)', null, false),
+			array('{host:key.last(1)}=(+1)', null, false),
+			array('{host:key.last(1)}<>(+1)', null, false),
+			array('{host:key.last(1)}<(+1)', null, false),
+			array('{host:key.last(1)}>(+1)', null, false),
+			array('{host:key.last(1)}and(+1)', null, false),
+			array('{host:key.last(1)}or(+1)', null, false),
+
+			array('{host:key.last(1)}*not(+1)', null, false),
+			array('{host:key.last(1)}/not(+1)', null, false),
+			array('{host:key.last(1)}+not(+1)', null, false),
+			array('{host:key.last(1)}-not(+1)', null, false),
+			array('{host:key.last(1)}=not(+1)', null, false),
+			array('{host:key.last(1)}<>not(+1)', null, false),
+			array('{host:key.last(1)}<not(+1)', null, false),
+			array('{host:key.last(1)}>not(+1)', null, false),
+			array('{host:key.last(1)}andnot(+1)', null, false),
+			array('{host:key.last(1)}ornot(+1)', null, false),
+
+			array('{host:key.last(1)} * +1', null, false),
+			array('{host:key.last(1)} / +1', null, false),
+			array('{host:key.last(1)} + +1', null, false),
+			array('{host:key.last(1)} - +1', null, false),
+			array('{host:key.last(1)} = +1', null, false),
+			array('{host:key.last(1)} <> +1', null, false),
+			array('{host:key.last(1)} < +1', null, false),
+			array('{host:key.last(1)} > +1', null, false),
+			array('{host:key.last(1)} and +1', null, false),
+			array('{host:key.last(1)} or +1', null, false),
+
+			array('{host:key.last(1)} * not +1', null, false),
+			array('{host:key.last(1)} / not +1', null, false),
+			array('{host:key.last(1)} + not +1', null, false),
+			array('{host:key.last(1)} - not +1', null, false),
+			array('{host:key.last(1)} = not +1', null, false),
+			array('{host:key.last(1)} <> not +1', null, false),
+			array('{host:key.last(1)} < not +1', null, false),
+			array('{host:key.last(1)} > not +1', null, false),
+			array('{host:key.last(1)} and not +1', null, false),
+			array('{host:key.last(1)} or not +1', null, false),
+
+			array('{host:key.last(1)}* +1', null, false),
+			array('{host:key.last(1)}/ +1', null, false),
+			array('{host:key.last(1)}+ +1', null, false),
+			array('{host:key.last(1)}- +1', null, false),
+			array('{host:key.last(1)}= +1', null, false),
+			array('{host:key.last(1)}<> +1', null, false),
+			array('{host:key.last(1)}< +1', null, false),
+			array('{host:key.last(1)}> +1', null, false),
+			array('{host:key.last(1)}and +1', null, false),
+			array('{host:key.last(1)}or +1', null, false),
+
+			array('{host:key.last(1)}* not +1', null, false),
+			array('{host:key.last(1)}/ not +1', null, false),
+			array('{host:key.last(1)}+ not +1', null, false),
+			array('{host:key.last(1)}- not +1', null, false),
+			array('{host:key.last(1)}= not +1', null, false),
+			array('{host:key.last(1)}<> not +1', null, false),
+			array('{host:key.last(1)}< not +1', null, false),
+			array('{host:key.last(1)}> not +1', null, false),
+			array('{host:key.last(1)}and not +1', null, false),
+			array('{host:key.last(1)}or not +1', null, false),
+
+			array('{host:key.last(1)} *+1', null, false),
+			array('{host:key.last(1)} /+1', null, false),
+			array('{host:key.last(1)} ++1', null, false),
+			array('{host:key.last(1)} -+1', null, false),
+			array('{host:key.last(1)} =+1', null, false),
+			array('{host:key.last(1)} <>+1', null, false),
+			array('{host:key.last(1)} <+1', null, false),
+			array('{host:key.last(1)} >+1', null, false),
+			array('{host:key.last(1)} and+1', null, false),
+			array('{host:key.last(1)} or+1', null, false),
+
+			array('{host:key.last(1)} *not+1', null, false),
+			array('{host:key.last(1)} /not+1', null, false),
+			array('{host:key.last(1)} +not+1', null, false),
+			array('{host:key.last(1)} -not+1', null, false),
+			array('{host:key.last(1)} =not+1', null, false),
+			array('{host:key.last(1)} <>not+1', null, false),
+			array('{host:key.last(1)} <not+1', null, false),
+			array('{host:key.last(1)} >not+1', null, false),
+			array('{host:key.last(1)} andnot+1', null, false),
+			array('{host:key.last(1)} ornot+1', null, false),
+
+			array('{host:key.last(1)}*+1', null, false),
+			array('{host:key.last(1)}/+1', null, false),
+			array('{host:key.last(1)}++1', null, false),
+			array('{host:key.last(1)}-+1', null, false),
+			array('{host:key.last(1)}=+1', null, false),
+			array('{host:key.last(1)}<>+1', null, false),
+			array('{host:key.last(1)}<+1', null, false),
+			array('{host:key.last(1)}>+1', null, false),
+			array('{host:key.last(1)}and+1', null, false),
+			array('{host:key.last(1)}or+1', null, false),
+
+			array('{host:key.last(1)}*not+1', null, false),
+			array('{host:key.last(1)}/not+1', null, false),
+			array('{host:key.last(1)}+not+1', null, false),
+			array('{host:key.last(1)}-not+1', null, false),
+			array('{host:key.last(1)}=not+1', null, false),
+			array('{host:key.last(1)}<>not+1', null, false),
+			array('{host:key.last(1)}<not+1', null, false),
+			array('{host:key.last(1)}>not+1', null, false),
+			array('{host:key.last(1)}andnot+1', null, false),
+			array('{host:key.last(1)}ornot+1', null, false),
+
+			array('{host:key.last(1)} * (+ 1)', null, false),
+			array('{host:key.last(1)} / (+ 1)', null, false),
+			array('{host:key.last(1)} + (+ 1)', null, false),
+			array('{host:key.last(1)} - (+ 1)', null, false),
+			array('{host:key.last(1)} = (+ 1)', null, false),
+			array('{host:key.last(1)} <> (+ 1)', null, false),
+			array('{host:key.last(1)} < (+ 1)', null, false),
+			array('{host:key.last(1)} > (+ 1)', null, false),
+			array('{host:key.last(1)} and (+ 1)', null, false),
+			array('{host:key.last(1)} or (+ 1)', null, false),
+
+			array('{host:key.last(1)} * not (+ 1)', null, false),
+			array('{host:key.last(1)} / not (+ 1)', null, false),
+			array('{host:key.last(1)} + not (+ 1)', null, false),
+			array('{host:key.last(1)} - not (+ 1)', null, false),
+			array('{host:key.last(1)} = not (+ 1)', null, false),
+			array('{host:key.last(1)} <> not (+ 1)', null, false),
+			array('{host:key.last(1)} < not (+ 1)', null, false),
+			array('{host:key.last(1)} > not (+ 1)', null, false),
+			array('{host:key.last(1)} and not (+ 1)', null, false),
+			array('{host:key.last(1)} or not (+ 1)', null, false),
+
+			array('{host:key.last(1)}* (+ 1)', null, false),
+			array('{host:key.last(1)}/ (+ 1)', null, false),
+			array('{host:key.last(1)}+ (+ 1)', null, false),
+			array('{host:key.last(1)}- (+ 1)', null, false),
+			array('{host:key.last(1)}= (+ 1)', null, false),
+			array('{host:key.last(1)}<> (+ 1)', null, false),
+			array('{host:key.last(1)}< (+ 1)', null, false),
+			array('{host:key.last(1)}> (+ 1)', null, false),
+			array('{host:key.last(1)}and (+ 1)', null, false),
+			array('{host:key.last(1)}or (+ 1)', null, false),
+
+			array('{host:key.last(1)}* not (+ 1)', null, false),
+			array('{host:key.last(1)}/ not (+ 1)', null, false),
+			array('{host:key.last(1)}+ not (+ 1)', null, false),
+			array('{host:key.last(1)}- not (+ 1)', null, false),
+			array('{host:key.last(1)}= not (+ 1)', null, false),
+			array('{host:key.last(1)}<> not (+ 1)', null, false),
+			array('{host:key.last(1)}< not (+ 1)', null, false),
+			array('{host:key.last(1)}> not (+ 1)', null, false),
+			array('{host:key.last(1)}and not (+ 1)', null, false),
+			array('{host:key.last(1)}or not (+ 1)', null, false),
+
+			array('{host:key.last(1)} *(+ 1)', null, false),
+			array('{host:key.last(1)} /(+ 1)', null, false),
+			array('{host:key.last(1)} +(+ 1)', null, false),
+			array('{host:key.last(1)} -(+ 1)', null, false),
+			array('{host:key.last(1)} =(+ 1)', null, false),
+			array('{host:key.last(1)} <>(+ 1)', null, false),
+			array('{host:key.last(1)} <(+ 1)', null, false),
+			array('{host:key.last(1)} >(+ 1)', null, false),
+			array('{host:key.last(1)} and(+ 1)', null, false),
+			array('{host:key.last(1)} or(+ 1)', null, false),
+
+			array('{host:key.last(1)} *not(+ 1)', null, false),
+			array('{host:key.last(1)} /not(+ 1)', null, false),
+			array('{host:key.last(1)} +not(+ 1)', null, false),
+			array('{host:key.last(1)} -not(+ 1)', null, false),
+			array('{host:key.last(1)} =not(+ 1)', null, false),
+			array('{host:key.last(1)} <>not(+ 1)', null, false),
+			array('{host:key.last(1)} <not(+ 1)', null, false),
+			array('{host:key.last(1)} >not(+ 1)', null, false),
+			array('{host:key.last(1)} andnot(+ 1)', null, false),
+			array('{host:key.last(1)} ornot(+ 1)', null, false),
+
+			array('{host:key.last(1)}*(+ 1)', null, false),
+			array('{host:key.last(1)}/(+ 1)', null, false),
+			array('{host:key.last(1)}+(+ 1)', null, false),
+			array('{host:key.last(1)}-(+ 1)', null, false),
+			array('{host:key.last(1)}=(+ 1)', null, false),
+			array('{host:key.last(1)}<>(+ 1)', null, false),
+			array('{host:key.last(1)}<(+ 1)', null, false),
+			array('{host:key.last(1)}>(+ 1)', null, false),
+			array('{host:key.last(1)}and(+ 1)', null, false),
+			array('{host:key.last(1)}or(+ 1)', null, false),
+
+			array('{host:key.last(1)}*not(+ 1)', null, false),
+			array('{host:key.last(1)}/not(+ 1)', null, false),
+			array('{host:key.last(1)}+not(+ 1)', null, false),
+			array('{host:key.last(1)}-not(+ 1)', null, false),
+			array('{host:key.last(1)}=not(+ 1)', null, false),
+			array('{host:key.last(1)}<>not(+ 1)', null, false),
+			array('{host:key.last(1)}<not(+ 1)', null, false),
+			array('{host:key.last(1)}>not(+ 1)', null, false),
+			array('{host:key.last(1)}andnot(+ 1)', null, false),
+			array('{host:key.last(1)}ornot(+ 1)', null, false),
+
+			array('{host:key.last(1)} * + 1', null, false),
+			array('{host:key.last(1)} / + 1', null, false),
+			array('{host:key.last(1)} + + 1', null, false),
+			array('{host:key.last(1)} - + 1', null, false),
+			array('{host:key.last(1)} = + 1', null, false),
+			array('{host:key.last(1)} <> + 1', null, false),
+			array('{host:key.last(1)} < + 1', null, false),
+			array('{host:key.last(1)} > + 1', null, false),
+			array('{host:key.last(1)} and + 1', null, false),
+			array('{host:key.last(1)} or + 1', null, false),
+
+			array('{host:key.last(1)} * not + 1', null, false),
+			array('{host:key.last(1)} / not + 1', null, false),
+			array('{host:key.last(1)} + not + 1', null, false),
+			array('{host:key.last(1)} - not + 1', null, false),
+			array('{host:key.last(1)} = not + 1', null, false),
+			array('{host:key.last(1)} <> not + 1', null, false),
+			array('{host:key.last(1)} < not + 1', null, false),
+			array('{host:key.last(1)} > not + 1', null, false),
+			array('{host:key.last(1)} and not + 1', null, false),
+			array('{host:key.last(1)} or not + 1', null, false),
+
+			array('{host:key.last(1)}* + 1', null, false),
+			array('{host:key.last(1)}/ + 1', null, false),
+			array('{host:key.last(1)}+ + 1', null, false),
+			array('{host:key.last(1)}- + 1', null, false),
+			array('{host:key.last(1)}= + 1', null, false),
+			array('{host:key.last(1)}<> + 1', null, false),
+			array('{host:key.last(1)}< + 1', null, false),
+			array('{host:key.last(1)}> + 1', null, false),
+			array('{host:key.last(1)}and + 1', null, false),
+			array('{host:key.last(1)}or + 1', null, false),
+
+			array('{host:key.last(1)}* not + 1', null, false),
+			array('{host:key.last(1)}/ not + 1', null, false),
+			array('{host:key.last(1)}+ not + 1', null, false),
+			array('{host:key.last(1)}- not + 1', null, false),
+			array('{host:key.last(1)}= not + 1', null, false),
+			array('{host:key.last(1)}<> not + 1', null, false),
+			array('{host:key.last(1)}< not + 1', null, false),
+			array('{host:key.last(1)}> not + 1', null, false),
+			array('{host:key.last(1)}and not + 1', null, false),
+			array('{host:key.last(1)}or not + 1', null, false),
+
+			array('{host:key.last(1)} *+ 1', null, false),
+			array('{host:key.last(1)} /+ 1', null, false),
+			array('{host:key.last(1)} ++ 1', null, false),
+			array('{host:key.last(1)} -+ 1', null, false),
+			array('{host:key.last(1)} =+ 1', null, false),
+			array('{host:key.last(1)} <>+ 1', null, false),
+			array('{host:key.last(1)} <+ 1', null, false),
+			array('{host:key.last(1)} >+ 1', null, false),
+			array('{host:key.last(1)} and+ 1', null, false),
+			array('{host:key.last(1)} or+ 1', null, false),
+
+			array('{host:key.last(1)} * not+ 1', null, false),
+			array('{host:key.last(1)} / not+ 1', null, false),
+			array('{host:key.last(1)} + not+ 1', null, false),
+			array('{host:key.last(1)} - not+ 1', null, false),
+			array('{host:key.last(1)} = not+ 1', null, false),
+			array('{host:key.last(1)} <> not+ 1', null, false),
+			array('{host:key.last(1)} < not+ 1', null, false),
+			array('{host:key.last(1)} > not+ 1', null, false),
+			array('{host:key.last(1)} and not+ 1', null, false),
+			array('{host:key.last(1)} or not+ 1', null, false),
+
+			array('{host:key.last(1)}*+ 1', null, false),
+			array('{host:key.last(1)}/+ 1', null, false),
+			array('{host:key.last(1)}++ 1', null, false),
+			array('{host:key.last(1)}-+ 1', null, false),
+			array('{host:key.last(1)}=+ 1', null, false),
+			array('{host:key.last(1)}<>+ 1', null, false),
+			array('{host:key.last(1)}<+ 1', null, false),
+			array('{host:key.last(1)}>+ 1', null, false),
+			array('{host:key.last(1)}and+ 1', null, false),
+			array('{host:key.last(1)}or+ 1', null, false),
+
+			array('{host:key.last(1)}*not+ 1', null, false),
+			array('{host:key.last(1)}/not+ 1', null, false),
+			array('{host:key.last(1)}+not+ 1', null, false),
+			array('{host:key.last(1)}-not+ 1', null, false),
+			array('{host:key.last(1)}=not+ 1', null, false),
+			array('{host:key.last(1)}<>not+ 1', null, false),
+			array('{host:key.last(1)}<not+ 1', null, false),
+			array('{host:key.last(1)}>not+ 1', null, false),
+			array('{host:key.last(1)}andnot+ 1', null, false),
+			array('{host:key.last(1)}ornot+ 1', null, false),
+
+			array('{host:key.last(1)} * (not1)', null, false),
+			array('{host:key.last(1)} / (not1)', null, false),
+			array('{host:key.last(1)} + (not1)', null, false),
+			array('{host:key.last(1)} - (not1)', null, false),
+			array('{host:key.last(1)} = (not1)', null, false),
+			array('{host:key.last(1)} <> (not1)', null, false),
+			array('{host:key.last(1)} < (not1)', null, false),
+			array('{host:key.last(1)} > (not1)', null, false),
+			array('{host:key.last(1)} and (not1)', null, false),
+			array('{host:key.last(1)} or (not1)', null, false),
+
+			array('{host:key.last(1)} * not (not1)', null, false),
+			array('{host:key.last(1)} / not (not1)', null, false),
+			array('{host:key.last(1)} + not (not1)', null, false),
+			array('{host:key.last(1)} - not (not1)', null, false),
+			array('{host:key.last(1)} = not (not1)', null, false),
+			array('{host:key.last(1)} <> not (not1)', null, false),
+			array('{host:key.last(1)} < not (not1)', null, false),
+			array('{host:key.last(1)} > not (not1)', null, false),
+			array('{host:key.last(1)} and not (not1)', null, false),
+			array('{host:key.last(1)} or not (not1)', null, false),
+
+			array('{host:key.last(1)}* (not1)', null, false),
+			array('{host:key.last(1)}/ (not1)', null, false),
+			array('{host:key.last(1)}+ (not1)', null, false),
+			array('{host:key.last(1)}- (not1)', null, false),
+			array('{host:key.last(1)}= (not1)', null, false),
+			array('{host:key.last(1)}<> (not1)', null, false),
+			array('{host:key.last(1)}< (not1)', null, false),
+			array('{host:key.last(1)}> (not1)', null, false),
+			array('{host:key.last(1)}and (not1)', null, false),
+			array('{host:key.last(1)}or (not1)', null, false),
+
+			array('{host:key.last(1)}*not (not1)', null, false),
+			array('{host:key.last(1)}/not (not1)', null, false),
+			array('{host:key.last(1)}+not (not1)', null, false),
+			array('{host:key.last(1)}-not (not1)', null, false),
+			array('{host:key.last(1)}=not (not1)', null, false),
+			array('{host:key.last(1)}<>not (not1)', null, false),
+			array('{host:key.last(1)}<not (not1)', null, false),
+			array('{host:key.last(1)}>not (not1)', null, false),
+			array('{host:key.last(1)}andnot (not1)', null, false),
+			array('{host:key.last(1)}ornot (not1)', null, false),
+
+			array('{host:key.last(1)} *(not1)', null, false),
+			array('{host:key.last(1)} /(not1)', null, false),
+			array('{host:key.last(1)} +(not1)', null, false),
+			array('{host:key.last(1)} -(not1)', null, false),
+			array('{host:key.last(1)} =(not1)', null, false),
+			array('{host:key.last(1)} <>(not1)', null, false),
+			array('{host:key.last(1)} <(not1)', null, false),
+			array('{host:key.last(1)} >(not1)', null, false),
+			array('{host:key.last(1)} and(not1)', null, false),
+			array('{host:key.last(1)} or(not1)', null, false),
+
+			array('{host:key.last(1)} * not(not1)', null, false),
+			array('{host:key.last(1)} / not(not1)', null, false),
+			array('{host:key.last(1)} + not(not1)', null, false),
+			array('{host:key.last(1)} - not(not1)', null, false),
+			array('{host:key.last(1)} = not(not1)', null, false),
+			array('{host:key.last(1)} <> not(not1)', null, false),
+			array('{host:key.last(1)} < not(not1)', null, false),
+			array('{host:key.last(1)} > not(not1)', null, false),
+			array('{host:key.last(1)} and not(not1)', null, false),
+			array('{host:key.last(1)} or not(not1)', null, false),
+
+			array('{host:key.last(1)}*(not1)', null, false),
+			array('{host:key.last(1)}/(not1)', null, false),
+			array('{host:key.last(1)}+(not1)', null, false),
+			array('{host:key.last(1)}-(not1)', null, false),
+			array('{host:key.last(1)}=(not1)', null, false),
+			array('{host:key.last(1)}<>(not1)', null, false),
+			array('{host:key.last(1)}<(not1)', null, false),
+			array('{host:key.last(1)}>(not1)', null, false),
+			array('{host:key.last(1)}and(not1)', null, false),
+			array('{host:key.last(1)}or(not1)', null, false),
+
+			array('{host:key.last(1)}*not(not1)', null, false),
+			array('{host:key.last(1)}/not(not1)', null, false),
+			array('{host:key.last(1)}+not(not1)', null, false),
+			array('{host:key.last(1)}-not(not1)', null, false),
+			array('{host:key.last(1)}=not(not1)', null, false),
+			array('{host:key.last(1)}<>not(not1)', null, false),
+			array('{host:key.last(1)}<not(not1)', null, false),
+			array('{host:key.last(1)}>not(not1)', null, false),
+			array('{host:key.last(1)}andnot(not1)', null, false),
+			array('{host:key.last(1)}ornot(not1)', null, false),
+
+			array('{host:key.last(1)} * not1', null, false),
+			array('{host:key.last(1)} / not1', null, false),
+			array('{host:key.last(1)} + not1', null, false),
+			array('{host:key.last(1)} - not1', null, false),
+			array('{host:key.last(1)} = not1', null, false),
+			array('{host:key.last(1)} <> not1', null, false),
+			array('{host:key.last(1)} < not1', null, false),
+			array('{host:key.last(1)} > not1', null, false),
+			array('{host:key.last(1)} and not1', null, false),
+			array('{host:key.last(1)} or not1', null, false),
+
+			array('{host:key.last(1)} * not not1', null, false),
+			array('{host:key.last(1)} / not not1', null, false),
+			array('{host:key.last(1)} + not not1', null, false),
+			array('{host:key.last(1)} - not not1', null, false),
+			array('{host:key.last(1)} = not not1', null, false),
+			array('{host:key.last(1)} <> not not1', null, false),
+			array('{host:key.last(1)} < not not1', null, false),
+			array('{host:key.last(1)} > not not1', null, false),
+			array('{host:key.last(1)} and not not1', null, false),
+			array('{host:key.last(1)} or not not1', null, false),
+
+			array('{host:key.last(1)}* not1', null, false),
+			array('{host:key.last(1)}/ not1', null, false),
+			array('{host:key.last(1)}+ not1', null, false),
+			array('{host:key.last(1)}- not1', null, false),
+			array('{host:key.last(1)}= not1', null, false),
+			array('{host:key.last(1)}<> not1', null, false),
+			array('{host:key.last(1)}< not1', null, false),
+			array('{host:key.last(1)}> not1', null, false),
+			array('{host:key.last(1)}and not1', null, false),
+			array('{host:key.last(1)}or not1', null, false),
+
+			array('{host:key.last(1)}* not not1', null, false),
+			array('{host:key.last(1)}/ not not1', null, false),
+			array('{host:key.last(1)}+ not not1', null, false),
+			array('{host:key.last(1)}- not not1', null, false),
+			array('{host:key.last(1)}= not not1', null, false),
+			array('{host:key.last(1)}<> not not1', null, false),
+			array('{host:key.last(1)}< not not1', null, false),
+			array('{host:key.last(1)}> not not1', null, false),
+			array('{host:key.last(1)}and not not1', null, false),
+			array('{host:key.last(1)}or not not1', null, false),
+
+			array('{host:key.last(1)} *not1', null, false),
+			array('{host:key.last(1)} /not1', null, false),
+			array('{host:key.last(1)} +not1', null, false),
+			array('{host:key.last(1)} -not1', null, false),
+			array('{host:key.last(1)} =not1', null, false),
+			array('{host:key.last(1)} <>not1', null, false),
+			array('{host:key.last(1)} <not1', null, false),
+			array('{host:key.last(1)} >not1', null, false),
+			array('{host:key.last(1)} andnot1', null, false),
+			array('{host:key.last(1)} ornot1', null, false),
+
+			array('{host:key.last(1)} *notnot1', null, false),
+			array('{host:key.last(1)} /notnot1', null, false),
+			array('{host:key.last(1)} +notnot1', null, false),
+			array('{host:key.last(1)} -notnot1', null, false),
+			array('{host:key.last(1)} =notnot1', null, false),
+			array('{host:key.last(1)} <>notnot1', null, false),
+			array('{host:key.last(1)} <notnot1', null, false),
+			array('{host:key.last(1)} >notnot1', null, false),
+			array('{host:key.last(1)} andnotnot1', null, false),
+			array('{host:key.last(1)} ornotnot1', null, false),
+
+			array('{host:key.last(1)}*not1', null, false),
+			array('{host:key.last(1)}/not1', null, false),
+			array('{host:key.last(1)}+not1', null, false),
+			array('{host:key.last(1)}-not1', null, false),
+			array('{host:key.last(1)}=not1', null, false),
+			array('{host:key.last(1)}<>not1', null, false),
+			array('{host:key.last(1)}<not1', null, false),
+			array('{host:key.last(1)}>not1', null, false),
+			array('{host:key.last(1)}andnot1', null, false),
+			array('{host:key.last(1)}ornot1', null, false),
+
+			array('{host:key.last(1)}*notnot1', null, false),
+			array('{host:key.last(1)}/notnot1', null, false),
+			array('{host:key.last(1)}+notnot1', null, false),
+			array('{host:key.last(1)}-notnot1', null, false),
+			array('{host:key.last(1)}=notnot1', null, false),
+			array('{host:key.last(1)}<>notnot1', null, false),
+			array('{host:key.last(1)}<notnot1', null, false),
+			array('{host:key.last(1)}>notnot1', null, false),
+			array('{host:key.last(1)}andnotnot1', null, false),
+			array('{host:key.last(1)}ornotnot1', null, false),
+
+			array('{host:key.last(1)} * (not 1)', null, true),
+			array('{host:key.last(1)} / (not 1)', null, true),
+			array('{host:key.last(1)} + (not 1)', null, true),
+			array('{host:key.last(1)} - (not 1)', null, true),
+			array('{host:key.last(1)} = (not 1)', null, true),
+			array('{host:key.last(1)} <> (not 1)', null, true),
+			array('{host:key.last(1)} < (not 1)', null, true),
+			array('{host:key.last(1)} > (not 1)', null, true),
+			array('{host:key.last(1)} and (not 1)', null, true),
+			array('{host:key.last(1)} or (not 1)', null, true),
+
+			array('{host:key.last(1)} * not (not 1)', null, true),
+			array('{host:key.last(1)} / not (not 1)', null, true),
+			array('{host:key.last(1)} + not (not 1)', null, true),
+			array('{host:key.last(1)} - not (not 1)', null, true),
+			array('{host:key.last(1)} = not (not 1)', null, true),
+			array('{host:key.last(1)} <> not (not 1)', null, true),
+			array('{host:key.last(1)} < not (not 1)', null, true),
+			array('{host:key.last(1)} > not (not 1)', null, true),
+			array('{host:key.last(1)} and not (not 1)', null, true),
+			array('{host:key.last(1)} or not (not 1)', null, true),
+
+			array('{host:key.last(1)}* (not 1)', null, true),
+			array('{host:key.last(1)}/ (not 1)', null, true),
+			array('{host:key.last(1)}+ (not 1)', null, true),
+			array('{host:key.last(1)}- (not 1)', null, true),
+			array('{host:key.last(1)}= (not 1)', null, true),
+			array('{host:key.last(1)}<> (not 1)', null, true),
+			array('{host:key.last(1)}< (not 1)', null, true),
+			array('{host:key.last(1)}> (not 1)', null, true),
+			array('{host:key.last(1)}and (not 1)', null, false),
+			array('{host:key.last(1)}or (not 1)', null, false),
+
+			array('{host:key.last(1)}* not (not 1)', null, true),
+			array('{host:key.last(1)}/ not (not 1)', null, true),
+			array('{host:key.last(1)}+ not (not 1)', null, true),
+			array('{host:key.last(1)}- not (not 1)', null, true),
+			array('{host:key.last(1)}= not (not 1)', null, true),
+			array('{host:key.last(1)}<> not (not 1)', null, true),
+			array('{host:key.last(1)}< not (not 1)', null, true),
+			array('{host:key.last(1)}> not (not 1)', null, true),
+			array('{host:key.last(1)}and not (not 1)', null, false),
+			array('{host:key.last(1)}or not (not 1)', null, false),
+
+			array('{host:key.last(1)} *(not 1)', null, true),
+			array('{host:key.last(1)} /(not 1)', null, true),
+			array('{host:key.last(1)} +(not 1)', null, true),
+			array('{host:key.last(1)} -(not 1)', null, true),
+			array('{host:key.last(1)} =(not 1)', null, true),
+			array('{host:key.last(1)} <>(not 1)', null, true),
+			array('{host:key.last(1)} <(not 1)', null, true),
+			array('{host:key.last(1)} >(not 1)', null, true),
+			array('{host:key.last(1)} and(not 1)', null, true),
+			array('{host:key.last(1)} or(not 1)', null, true),
+
+			array('{host:key.last(1)} *not(not 1)', null, false),
+			array('{host:key.last(1)} /not(not 1)', null, false),
+			array('{host:key.last(1)} +not(not 1)', null, false),
+			array('{host:key.last(1)} -not(not 1)', null, false),
+			array('{host:key.last(1)} =not(not 1)', null, false),
+			array('{host:key.last(1)} <>not(not 1)', null, false),
+			array('{host:key.last(1)} <not(not 1)', null, false),
+			array('{host:key.last(1)} >not(not 1)', null, false),
+			array('{host:key.last(1)} andnot(not 1)', null, false),
+			array('{host:key.last(1)} ornot(not 1)', null, false),
+
+			array('{host:key.last(1)}*(not 1)', null, true),
+			array('{host:key.last(1)}/(not 1)', null, true),
+			array('{host:key.last(1)}+(not 1)', null, true),
+			array('{host:key.last(1)}-(not 1)', null, true),
+			array('{host:key.last(1)}=(not 1)', null, true),
+			array('{host:key.last(1)}<>(not 1)', null, true),
+			array('{host:key.last(1)}<(not 1)', null, true),
+			array('{host:key.last(1)}>(not 1)', null, true),
+			array('{host:key.last(1)}and(not 1)', null, false),
+			array('{host:key.last(1)}or(not 1)', null, false),
+
+			array('{host:key.last(1)}*not(not 1)', null, false),
+			array('{host:key.last(1)}/not(not 1)', null, false),
+			array('{host:key.last(1)}+not(not 1)', null, false),
+			array('{host:key.last(1)}-not(not 1)', null, false),
+			array('{host:key.last(1)}=not(not 1)', null, false),
+			array('{host:key.last(1)}<>not(not 1)', null, false),
+			array('{host:key.last(1)}<not(not 1)', null, false),
+			array('{host:key.last(1)}>not(not 1)', null, false),
+			array('{host:key.last(1)}andnot(not 1)', null, false),
+			array('{host:key.last(1)}ornot(not 1)', null, false),
+
+			array('{host:key.last(1)} * not 1', null, true),
+			array('{host:key.last(1)} / not 1', null, true),
+			array('{host:key.last(1)} + not 1', null, true),
+			array('{host:key.last(1)} - not 1', null, true),
+			array('{host:key.last(1)} = not 1', null, true),
+			array('{host:key.last(1)} <> not 1', null, true),
+			array('{host:key.last(1)} < not 1', null, true),
+			array('{host:key.last(1)} > not 1', null, true),
+			array('{host:key.last(1)} and not 1', null, true),
+			array('{host:key.last(1)} or not 1', null, true),
+
+			array('{host:key.last(1)} * not not 1', null, false),
+			array('{host:key.last(1)} / not not 1', null, false),
+			array('{host:key.last(1)} + not not 1', null, false),
+			array('{host:key.last(1)} - not not 1', null, false),
+			array('{host:key.last(1)} = not not 1', null, false),
+			array('{host:key.last(1)} <> not not 1', null, false),
+			array('{host:key.last(1)} < not not 1', null, false),
+			array('{host:key.last(1)} > not not 1', null, false),
+			array('{host:key.last(1)} and not not 1', null, false),
+			array('{host:key.last(1)} or not not 1', null, false),
+
+			array('{host:key.last(1)}* not 1', null, true),
+			array('{host:key.last(1)}/ not 1', null, true),
+			array('{host:key.last(1)}+ not 1', null, true),
+			array('{host:key.last(1)}- not 1', null, true),
+			array('{host:key.last(1)}= not 1', null, true),
+			array('{host:key.last(1)}<> not 1', null, true),
+			array('{host:key.last(1)}< not 1', null, true),
+			array('{host:key.last(1)}> not 1', null, true),
+			array('{host:key.last(1)}and not 1', null, false),
+			array('{host:key.last(1)}or not 1', null, false),
+
+			array('{host:key.last(1)}* not not 1', null, false),
+			array('{host:key.last(1)}/ not not 1', null, false),
+			array('{host:key.last(1)}+ not not 1', null, false),
+			array('{host:key.last(1)}- not not 1', null, false),
+			array('{host:key.last(1)}= not not 1', null, false),
+			array('{host:key.last(1)}<> not not 1', null, false),
+			array('{host:key.last(1)}< not not 1', null, false),
+			array('{host:key.last(1)}> not not 1', null, false),
+			array('{host:key.last(1)}and not not 1', null, false),
+			array('{host:key.last(1)}or not not 1', null, false),
+
+			array('{host:key.last(1)} *not 1', null, false),
+			array('{host:key.last(1)} /not 1', null, false),
+			array('{host:key.last(1)} +not 1', null, false),
+			array('{host:key.last(1)} -not 1', null, false),
+			array('{host:key.last(1)} =not 1', null, false),
+			array('{host:key.last(1)} <>not 1', null, false),
+			array('{host:key.last(1)} <not 1', null, false),
+			array('{host:key.last(1)} >not 1', null, false),
+			array('{host:key.last(1)} andnot 1', null, false),
+			array('{host:key.last(1)} ornot 1', null, false),
+
+			array('{host:key.last(1)} * notnot 1', null, false),
+			array('{host:key.last(1)} / notnot 1', null, false),
+			array('{host:key.last(1)} + notnot 1', null, false),
+			array('{host:key.last(1)} - notnot 1', null, false),
+			array('{host:key.last(1)} = notnot 1', null, false),
+			array('{host:key.last(1)} <> notnot 1', null, false),
+			array('{host:key.last(1)} < notnot 1', null, false),
+			array('{host:key.last(1)} > notnot 1', null, false),
+			array('{host:key.last(1)} and notnot 1', null, false),
+			array('{host:key.last(1)} or notnot 1', null, false),
+
+			array('{host:key.last(1)}*not 1', null, false),
+			array('{host:key.last(1)}/not 1', null, false),
+			array('{host:key.last(1)}+not 1', null, false),
+			array('{host:key.last(1)}-not 1', null, false),
+			array('{host:key.last(1)}=not 1', null, false),
+			array('{host:key.last(1)}<>not 1', null, false),
+			array('{host:key.last(1)}<not 1', null, false),
+			array('{host:key.last(1)}>not 1', null, false),
+			array('{host:key.last(1)}andnot 1', null, false),
+			array('{host:key.last(1)}ornot 1', null, false),
+
+			array('{host:key.last(1)}*notnot 1', null, false),
+			array('{host:key.last(1)}/notnot 1', null, false),
+			array('{host:key.last(1)}+notnot 1', null, false),
+			array('{host:key.last(1)}-notnot 1', null, false),
+			array('{host:key.last(1)}=notnot 1', null, false),
+			array('{host:key.last(1)}<>notnot 1', null, false),
+			array('{host:key.last(1)}<notnot 1', null, false),
+			array('{host:key.last(1)}>notnot 1', null, false),
+			array('{host:key.last(1)}andnotnot 1', null, false),
+			array('{host:key.last(1)}ornotnot 1', null, false),
+
+			array('{host:key.last(1)} *not 1', null, false),
+			array('{host:key.last(1)} /not 1', null, false),
+			array('{host:key.last(1)} +not 1', null, false),
+			array('{host:key.last(1)} -not 1', null, false),
+			array('{host:key.last(1)} =not 1', null, false),
+			array('{host:key.last(1)} <>not 1', null, false),
+			array('{host:key.last(1)} <not 1', null, false),
+			array('{host:key.last(1)} >not 1', null, false),
+			array('{host:key.last(1)} andnot 1', null, false),
+			array('{host:key.last(1)} ornot 1', null, false),
+
+			array('{host:key.diff()} + 1', null, true),
+			array('{host:key.diff()} - 1', null, true),
+			array('{host:key.diff()} / 1', null, true),
+			array('{host:key.diff()} * 1', null, true),
+			array('{host:key.diff()} = 1', null, true),
+			array('{host:key.diff()} <> 1', null, true),
+			array('{host:key.diff()} and 1', null, true),
+			array('{host:key.diff()} or 1', null, true),
+
+			array('{host:key.diff()} + not 1', null, true),
+			array('{host:key.diff()} - not 1', null, true),
+			array('{host:key.diff()} / not 1', null, true),
+			array('{host:key.diff()} * not 1', null, true),
+			array('{host:key.diff()} = not 1', null, true),
+			array('{host:key.diff()} <> not 1', null, true),
+			array('{host:key.diff()} and not 1', null, true),
+			array('{host:key.diff()} or not 1', null, true),
+
+			array('{host:key.diff()}+ 1', null, true),
+			array('{host:key.diff()}- 1', null, true),
+			array('{host:key.diff()}/ 1', null, true),
+			array('{host:key.diff()}* 1', null, true),
+			array('{host:key.diff()}= 1', null, true),
+			array('{host:key.diff()}<> 1', null, true),
+			array('{host:key.diff()}and 1', null, false),
+			array('{host:key.diff()}or 1', null, false),
+
+			array('{host:key.diff()}+ not 1', null, true),
+			array('{host:key.diff()}- not 1', null, true),
+			array('{host:key.diff()}/ not 1', null, true),
+			array('{host:key.diff()}* not 1', null, true),
+			array('{host:key.diff()}= not 1', null, true),
+			array('{host:key.diff()}<> not 1', null, true),
+			array('{host:key.diff()}and not 1', null, false),
+			array('{host:key.diff()}or not 1', null, false),
+
+			array('{host:key.diff()} +1', null, true),
+			array('{host:key.diff()} -1', null, true),
+			array('{host:key.diff()} /1', null, true),
+			array('{host:key.diff()} *1', null, true),
+			array('{host:key.diff()} =1', null, true),
+			array('{host:key.diff()} <>1', null, true),
+			array('{host:key.diff()} and1', null, false),
+			array('{host:key.diff()} or1', null, false),
+
+			array('{host:key.diff()} + not1', null, false),
+			array('{host:key.diff()} - not1', null, false),
+			array('{host:key.diff()} / not1', null, false),
+			array('{host:key.diff()} * not1', null, false),
+			array('{host:key.diff()} = not1', null, false),
+			array('{host:key.diff()} <> not1', null, false),
+			array('{host:key.diff()} and not1', null, false),
+			array('{host:key.diff()} or not1', null, false),
+
+			array('{host:key.diff()}+1', null, true),
+			array('{host:key.diff()}-1', null, true),
+			array('{host:key.diff()}/1', null, true),
+			array('{host:key.diff()}*1', null, true),
+			array('{host:key.diff()}=1', null, true),
+			array('{host:key.diff()}<>1', null, true),
+			array('{host:key.diff()}and1', null, false),
+			array('{host:key.diff()}or1', null, false),
+
+			array('{host:key.diff()}+not1', null, false),
+			array('{host:key.diff()}-not1', null, false),
+			array('{host:key.diff()}/not1', null, false),
+			array('{host:key.diff()}*not1', null, false),
+			array('{host:key.diff()}=not1', null, false),
+			array('{host:key.diff()}<>not1', null, false),
+			array('{host:key.diff()}andnot1', null, false),
+			array('{host:key.diff()}ornot1', null, false),
+
+			// unary operators before binary operators
+			array('{host:key.diff()} -* 1', null, false),
+			array('{host:key.diff()} -- 1', null, true),
+			array('{host:key.diff()} -/ 1', null, false),
+			array('{host:key.diff()} -* 1', null, false),
+			array('{host:key.diff()} -= 1', null, false),
+			array('{host:key.diff()} -<> 1', null, false),
+			array('{host:key.diff()} -and 1', null, false),
+			array('{host:key.diff()} -or 1', null, false),
+
+			array('{host:key.diff()}-* 1', null, false),
+			array('{host:key.diff()}-- 1', null, true),
+			array('{host:key.diff()}-/ 1', null, false),
+			array('{host:key.diff()}-* 1', null, false),
+			array('{host:key.diff()}-= 1', null, false),
+			array('{host:key.diff()}-<> 1', null, false),
+			array('{host:key.diff()}-and 1', null, false),
+			array('{host:key.diff()}-or 1', null, false),
+
+			array('{host:key.diff()} -*1', null, false),
+			array('{host:key.diff()} --1', null, true),
+			array('{host:key.diff()} -/1', null, false),
+			array('{host:key.diff()} -*1', null, false),
+			array('{host:key.diff()} -=1', null, false),
+			array('{host:key.diff()} -<>1', null, false),
+			array('{host:key.diff()} -and1', null, false),
+			array('{host:key.diff()} -or1', null, false),
+
+			array('{host:key.diff()}-*1', null, false),
+			array('{host:key.diff()}--1', null, true),
+			array('{host:key.diff()}-/1', null, false),
+			array('{host:key.diff()}-*1', null, false),
+			array('{host:key.diff()}-=1', null, false),
+			array('{host:key.diff()}-<>1', null, false),
+			array('{host:key.diff()}-and1', null, false),
+			array('{host:key.diff()}-or1', null, false),
+
+			array('{host:key.diff()} not* 1', null, false),
+			array('{host:key.diff()} not- 1', null, false),
+			array('{host:key.diff()} not/ 1', null, false),
+			array('{host:key.diff()} not* 1', null, false),
+			array('{host:key.diff()} not= 1', null, false),
+			array('{host:key.diff()} not<> 1', null, false),
+			array('{host:key.diff()} notand 1', null, false),
+			array('{host:key.diff()} notor 1', null, false),
+
+			array('{host:key.diff()}not* 1', null, false),
+			array('{host:key.diff()}not- 1', null, false),
+			array('{host:key.diff()}not/ 1', null, false),
+			array('{host:key.diff()}not* 1', null, false),
+			array('{host:key.diff()}not= 1', null, false),
+			array('{host:key.diff()}not<> 1', null, false),
+			array('{host:key.diff()}notand 1', null, false),
+			array('{host:key.diff()}notor 1', null, false),
+
+			array('{host:key.diff()} not*1', null, false),
+			array('{host:key.diff()} not-1', null, false),
+			array('{host:key.diff()} not/1', null, false),
+			array('{host:key.diff()} not*1', null, false),
+			array('{host:key.diff()} not=1', null, false),
+			array('{host:key.diff()} not<>1', null, false),
+			array('{host:key.diff()} notand1', null, false),
+			array('{host:key.diff()} notor1', null, false),
+
+			array('{host:key.diff()}-*1', null, false),
+			array('{host:key.diff()}--1', null, true),
+			array('{host:key.diff()}-/1', null, false),
+			array('{host:key.diff()}-*1', null, false),
+			array('{host:key.diff()}-=1', null, false),
+			array('{host:key.diff()}-<>1', null, false),
+			array('{host:key.diff()}-and1', null, false),
+			array('{host:key.diff()}-or1', null, false),
+
+			// suffixes
+			array('{host:key.diff()}=1K', null, true),
+			array('{host:key.diff()}=1M', null, true),
+			array('{host:key.diff()}=1G', null, true),
+			array('{host:key.diff()}=1T', null, true),
+			array('{host:key.diff()}=1s', null, true),
+			array('{host:key.diff()}=1m', null, true),
+			array('{host:key.diff()}=1h', null, true),
+			array('{host:key.diff()}=1d', null, true),
+			array('{host:key.diff()}=1w', null, true),
+
+			array('{host:key.diff()}=1.56K', null, true),
+			array('{host:key.diff()}=1.56M', null, true),
+			array('{host:key.diff()}=1.56G', null, true),
+			array('{host:key.diff()}=1.56T', null, true),
+			array('{host:key.diff()}=1.56s', null, true),
+			array('{host:key.diff()}=1.56m', null, true),
+			array('{host:key.diff()}=1.56h', null, true),
+			array('{host:key.diff()}=1.56d', null, true),
+			array('{host:key.diff()}=1.56w', null, true),
+
+			// text operators after suffixes
+			array('{host:key.diff()}=1K and 1', null, true),
+			array('{host:key.diff()}=1M and 1', null, true),
+			array('{host:key.diff()}=1G and 1', null, true),
+			array('{host:key.diff()}=1T and 1', null, true),
+			array('{host:key.diff()}=1s and 1', null, true),
+			array('{host:key.diff()}=1m and 1', null, true),
+			array('{host:key.diff()}=1h and 1', null, true),
+			array('{host:key.diff()}=1d and 1', null, true),
+			array('{host:key.diff()}=1w and 1', null, true),
+
+			array('{host:key.diff()}=1Kand 1', null, false),
+			array('{host:key.diff()}=1Mand 1', null, false),
+			array('{host:key.diff()}=1Gand 1', null, false),
+			array('{host:key.diff()}=1Tand 1', null, false),
+			array('{host:key.diff()}=1sand 1', null, false),
+			array('{host:key.diff()}=1mand 1', null, false),
+			array('{host:key.diff()}=1hand 1', null, false),
+			array('{host:key.diff()}=1dand 1', null, false),
+			array('{host:key.diff()}=1wand 1', null, false),
+
+			array('{host:key.diff()}=1.56K and 1', null, true),
+			array('{host:key.diff()}=1.56M and 1', null, true),
+			array('{host:key.diff()}=1.56G and 1', null, true),
+			array('{host:key.diff()}=1.56T and 1', null, true),
+			array('{host:key.diff()}=1.56s and 1', null, true),
+			array('{host:key.diff()}=1.56m and 1', null, true),
+			array('{host:key.diff()}=1.56h and 1', null, true),
+			array('{host:key.diff()}=1.56d and 1', null, true),
+			array('{host:key.diff()}=1.56w and 1', null, true),
+
+			array('{host:key.diff()}=1.56Kand 1', null, false),
+			array('{host:key.diff()}=1.56Mand 1', null, false),
+			array('{host:key.diff()}=1.56Gand 1', null, false),
+			array('{host:key.diff()}=1.56Tand 1', null, false),
+			array('{host:key.diff()}=1.56sand 1', null, false),
+			array('{host:key.diff()}=1.56mand 1', null, false),
+			array('{host:key.diff()}=1.56hand 1', null, false),
+			array('{host:key.diff()}=1.56dand 1', null, false),
+			array('{host:key.diff()}=1.56wand 1', null, false),
+
+			array('{host:key.diff()}=1K or 1', null, true),
+			array('{host:key.diff()}=1M or 1', null, true),
+			array('{host:key.diff()}=1G or 1', null, true),
+			array('{host:key.diff()}=1T or 1', null, true),
+			array('{host:key.diff()}=1s or 1', null, true),
+			array('{host:key.diff()}=1m or 1', null, true),
+			array('{host:key.diff()}=1h or 1', null, true),
+			array('{host:key.diff()}=1d or 1', null, true),
+			array('{host:key.diff()}=1w or 1', null, true),
+
+			array('{host:key.diff()}=1Kor 1', null, false),
+			array('{host:key.diff()}=1Mor 1', null, false),
+			array('{host:key.diff()}=1Gor 1', null, false),
+			array('{host:key.diff()}=1Tor 1', null, false),
+			array('{host:key.diff()}=1sor 1', null, false),
+			array('{host:key.diff()}=1mor 1', null, false),
+			array('{host:key.diff()}=1hor 1', null, false),
+			array('{host:key.diff()}=1dor 1', null, false),
+			array('{host:key.diff()}=1wor 1', null, false),
+
+			array('{host:key.diff()}=1.56K or 1', null, true),
+			array('{host:key.diff()}=1.56M or 1', null, true),
+			array('{host:key.diff()}=1.56G or 1', null, true),
+			array('{host:key.diff()}=1.56T or 1', null, true),
+			array('{host:key.diff()}=1.56s or 1', null, true),
+			array('{host:key.diff()}=1.56m or 1', null, true),
+			array('{host:key.diff()}=1.56h or 1', null, true),
+			array('{host:key.diff()}=1.56d or 1', null, true),
+			array('{host:key.diff()}=1.56w or 1', null, true),
+
+			array('{host:key.diff()}=1.56Kor 1', null, false),
+			array('{host:key.diff()}=1.56Mor 1', null, false),
+			array('{host:key.diff()}=1.56Gor 1', null, false),
+			array('{host:key.diff()}=1.56Tor 1', null, false),
+			array('{host:key.diff()}=1.56sor 1', null, false),
+			array('{host:key.diff()}=1.56mor 1', null, false),
+			array('{host:key.diff()}=1.56hor 1', null, false),
+			array('{host:key.diff()}=1.56dor 1', null, false),
+			array('{host:key.diff()}=1.56wor 1', null, false),
+
+			array('{host:key.diff()} + 1.173640', null, true),
+			array('{host:key.diff()} - 1.173640', null, true),
+			array('{host:key.diff()} / 1.173640', null, true),
+			array('{host:key.diff()} * 1.173640', null, true),
+			array('{host:key.diff()} = 1.173640', null, true),
+			array('{host:key.diff()} <> 1.173640', null, true),
+			array('{host:key.diff()} and 1.173640', null, true),
+			array('{host:key.diff()} or 1.173640', null, true),
+
+			array('{host:key.diff()}+ 1.173640', null, true),
+			array('{host:key.diff()}- 1.173640', null, true),
+			array('{host:key.diff()}/ 1.173640', null, true),
+			array('{host:key.diff()}* 1.173640', null, true),
+			array('{host:key.diff()}= 1.173640', null, true),
+			array('{host:key.diff()}<> 1.173640', null, true),
+			array('{host:key.diff()}and 1.173640', null, false),
+			array('{host:key.diff()}or 1.173640', null, false),
+
+			array('{host:key.diff()} +1.173640', null, true),
+			array('{host:key.diff()} -1.173640', null, true),
+			array('{host:key.diff()} /1.173640', null, true),
+			array('{host:key.diff()} *1.173640', null, true),
+			array('{host:key.diff()} =1.173640', null, true),
+			array('{host:key.diff()} <>1.173640', null, true),
+			array('{host:key.diff()} and1.173640', null, false),
+			array('{host:key.diff()} or1.173640', null, false),
+
+			array('{host:key.diff()}+1.173640', null, true),
+			array('{host:key.diff()}-1.173640', null, true),
+			array('{host:key.diff()}/1.173640', null, true),
+			array('{host:key.diff()}*1.173640', null, true),
+			array('{host:key.diff()}=1.173640', null, true),
+			array('{host:key.diff()}<>1.173640', null, true),
+			array('{host:key.diff()}and1.173640', null, false),
+			array('{host:key.diff()}or1.173640', null, false),
+
+			array('{host:key.diff()} + 1 or {host:key.diff()}', null, true),
+			array('{host:key.diff()} - 1 and {host:key.diff()}', null, true),
+			array('{host:key.diff()} / 1 <> {host:key.diff()}', null, true),
+			array('{host:key.diff()} * 1 = {host:key.diff()}', null, true),
+			array('{host:key.diff()} = 1 * {host:key.diff()}', null, true),
+			array('{host:key.diff()} <> 1 / {host:key.diff()}', null, true),
+			array('{host:key.diff()} and 1 - {host:key.diff()}', null, true),
+			array('{host:key.diff()} or 1 + {host:key.diff()}', null, true),
+
+			array('{host:key.diff()} + not 1 or {host:key.diff()}', null, true),
+			array('{host:key.diff()} - not 1 and {host:key.diff()}', null, true),
+			array('{host:key.diff()} / not 1 <> {host:key.diff()}', null, true),
+			array('{host:key.diff()} * not 1 = {host:key.diff()}', null, true),
+			array('{host:key.diff()} = not 1 * {host:key.diff()}', null, true),
+			array('{host:key.diff()} <> not 1 / {host:key.diff()}', null, true),
+			array('{host:key.diff()} and not 1 - {host:key.diff()}', null, true),
+			array('{host:key.diff()} or not 1 + {host:key.diff()}', null, true),
+
+			array('{host:key.diff()} + 1 or not {host:key.diff()}', null, true),
+			array('{host:key.diff()} - 1 and not {host:key.diff()}', null, true),
+			array('{host:key.diff()} / 1 <> not {host:key.diff()}', null, true),
+			array('{host:key.diff()} * 1 = not {host:key.diff()}', null, true),
+			array('{host:key.diff()} = 1 * not {host:key.diff()}', null, true),
+			array('{host:key.diff()} <> 1 / not {host:key.diff()}', null, true),
+			array('{host:key.diff()} and 1 - not {host:key.diff()}', null, true),
+			array('{host:key.diff()} or 1 + not {host:key.diff()}', null, true),
+
+			array('{host:key.diff()} -- 1', null, true),
+			array('{host:key.diff()} ++ 1', null, false),
+			array('{host:key.diff()} // 1', null, false),
+			array('{host:key.diff()} ** 1', null, false),
+			array('{host:key.diff()} == 1', null, false),
+			array('{host:key.diff()} <><> 1', null, false),
+			array('{host:key.diff()} andand 1', null, false),
+			array('{host:key.diff()} oror 1', null, false),
+
+			array('{host:key.diff()} +', null, false),
+			array('{host:key.diff()} -', null, false),
+			array('{host:key.diff()} /', null, false),
+			array('{host:key.diff()} *', null, false),
+			array('{host:key.diff()} =', null, false),
+			array('{host:key.diff()} <>', null, false),
+			array('{host:key.diff()} and', null, false),
+			array('{host:key.diff()} or', null, false),
+			array('{host:key.diff()} not', null, false),
+
+			array('{host:key.diff()} + not', null, false),
+			array('{host:key.diff()} - not', null, false),
+			array('{host:key.diff()} / not', null, false),
+			array('{host:key.diff()} * not', null, false),
+			array('{host:key.diff()} = not', null, false),
+			array('{host:key.diff()} <> not', null, false),
+			array('{host:key.diff()} and not', null, false),
+			array('{host:key.diff()} or not', null, false),
+
+			array('- {host:key.diff()}', null, true),
+			array('+ {host:key.diff()}', null, false),
+			array('/ {host:key.diff()}', null, false),
+			array('* {host:key.diff()}', null, false),
+			array('= {host:key.diff()}', null, false),
+			array('<> {host:key.diff()}', null, false),
+			array('and {host:key.diff()}', null, false),
+			array('or {host:key.diff()}', null, false),
+
+			array('not - {host:key.diff()}', null, true),
+			array('not + {host:key.diff()}', null, false),
+			array('not / {host:key.diff()}', null, false),
+			array('not * {host:key.diff()}', null, false),
+			array('not = {host:key.diff()}', null, false),
+			array('not <> {host:key.diff()}', null, false),
+			array('not and {host:key.diff()}', null, false),
+			array('not or {host:key.diff()}', null, false),
+
+			array('- not {host:key.diff()}', null, false),
+			array('+ not {host:key.diff()}', null, false),
+			array('/ not {host:key.diff()}', null, false),
+			array('* not {host:key.diff()}', null, false),
+			array('= not {host:key.diff()}', null, false),
+			array('<> not {host:key.diff()}', null, false),
+			array('and not {host:key.diff()}', null, false),
+			array('or not {host:key.diff()}', null, false),
+
+			array('{host:key.diff()}=0', null, true),
+			array('{host:key.count(1,)}=0', null, true),
+			array('{host:key.count( 1,)}=0', null, true),
+			array('{host:key.count(  1,)}=0', null, true),
+			array('{host:key.count(1, )}=0', null, true),
+			array('{host:key.count(1,  )}=0', null, true),
+
+			array('{host:key.str(")}=0', null, false),
+			array('{host:key.str("")}=0', null, true),
+			array('{host:key.str(""")}=0', null, false),
+			array('{host:key.str("""")}=0', null, false),
+
+			array('{host:key.str( ")}=0', null, false),
+			array('{host:key.str( "")}=0', null, true),
+			array('{host:key.str( """)}=0', null, false),
+			array('{host:key.str( """")}=0', null, false),
+
+			array('{host:key.str(  ")}=0', null, false),
+			array('{host:key.str(  "")}=0', null, true),
+			array('{host:key.str(  """)}=0', null, false),
+			array('{host:key.str(  """")}=0', null, false),
+
+			array('{host:key.count(1,")}=0', null, false),
+			array('{host:key.count(1,"")}=0', null, true),
+			array('{host:key.count(1,""")}=0', null, false),
+			array('{host:key.count(1,"""")}=0', null, false),
+
+			array('{host:key.count(1, ")}=0', null, false),
+			array('{host:key.count(1, "")}=0', null, true),
+			array('{host:key.count(1, """)}=0', null, false),
+			array('{host:key.count(1, """")}=0', null, false),
+
+			array('{host:key.count(1,  ")}=0', null, false),
+			array('{host:key.count(1,  "")}=0', null, true),
+			array('{host:key.count(1,  """)}=0', null, false),
+			array('{host:key.count(1,  """")}=0', null, false),
+
+			array('{host:key.count(1,"",")}=0', null, false),
+			array('{host:key.count(1,"","")}=0', null, true),
+			array('{host:key.count(1,"",""")}=0', null, false),
+			array('{host:key.count(1,"","""")}=0', null, false),
+
+			array('{host:key.count(1,"", ")}=0', null, false),
+			array('{host:key.count(1,"", "")}=0', null, true),
+			array('{host:key.count(1,"", """)}=0', null, false),
+			array('{host:key.count(1,"", """")}=0', null, false),
+
+			array('{host:key.count(1,"",  ")}=0', null, false),
+			array('{host:key.count(1,"",  "")}=0', null, true),
+			array('{host:key.count(1,"",  """)}=0', null, false),
+			array('{host:key.count(1,"",  """")}=0', null, false),
+
+			array('{host:key.str("\")}=0', null, false),
+			array('{host:key.str("\"")}=0', null, true),
+			array('{host:key.str("\\\\"")}=0', null, true),
+			array('{host:key.str("\""")}=0', null, false),
+			array('{host:key.str("\"""")}=0', null, false),
+
+			array('{host:key.str(\")}=0', null, true),
+			array('{host:key.str(param\")}=0', null, true),
+			array('{host:key.str(param")}=0', null, true),
+
+			array('{host:key.str( \")}=0', null, true),
+			array('{host:key.str( param\")}=0', null, true),
+			array('{host:key.str( param")}=0', null, true),
+
+			array('{host:key.str(  \")}=0', null, true),
+			array('{host:key.str(  param\")}=0', null, true),
+			array('{host:key.str(  param")}=0', null, true),
+
+			array('{host:key.str(()}=0', null, true),
+			array('{host:key.str(param()}=0', null, true),
+
+			array('{host:key.str( ()}=0', null, true),
+			array('{host:key.str( param()}=0', null, true),
+
+			array('{host:key.str(  ()}=0', null, true),
+			array('{host:key.str(  param()}=0', null, true),
+
+			array('{host:key.str())}=0', null, false),
+			array('{host:key.str(param))}=0', null, false),
+
+			array('{host:key.str( ))}=0', null, false),
+			array('{host:key.str( param))}=0', null, false),
+
+			array('{host:key.str(  ))}=0', null, false),
+			array('{host:key.str(  param))}=0', null, false),
+
+			array('{host:key.str("(")}=0', null, true),
+			array('{host:key.str("param(")}=0', null, true),
+
+			array('{host:key.str(")")}=0', null, true),
+			array('{host:key.str("param)")}=0', null, true),
+
+			array('{host:key.str()}=0', null, true),
+			array('{host:key.str( )}=0', null, true),
+			array('{host:key.str(" ")}=0', null, true),
+			array('{host:key.str(abc)}=0', null, true),
+			array('{host:key.str(\'abc\')}=0', null, true),
+			array('{host:key.str("")}=0', null, true),
+			array('{host:key.last(0)}=0', null, true),
+			array('{host:key.str(aaa()}=0', null, true),
+
+			array('{host:key.last(0)}=0', null, true),
+			array('{host:key.str(aaa()}=0', null, true),
+			array('({hostA:keyA.str("abc")}=0) or ({hostB:keyB.last(123)}=0)', null, true),
+			array('{host:key[asd[].str(aaa()}=0', null, true),
+			array('{host:key["param].diff()"].diff()}=0', null, true),
+			array('{host:key[param].diff()].diff()}', null, false),
+			array('{host:key[asd[,asd[,[]].str(aaa()}=0', null, true),
+			array('{host:key[[],[],[]].str()}=0', null, true),
+			array('{host:key[].count(1,[],[])}=0', null, true),
+			array('({hostA:keyA.str("abc")}) / ({hostB:keyB.last(123)})=(0)', null, true),
+			array('({hostA:keyA.str("abc")}=0) or ({hostB:keyB.last(123)}=0)', null, true),
+			array('({hostA:keyA.str("abc")}=0) and ({hostB:keyB.last(123)}=0)', null, true),
+
+			array('{hostkey.last(0)}=0', null, false),
+			array('{host:keylast(0)}=0', null, false),
+			array('{host:key.last(0}=0', null, false),
+			array('{host:key.last(0)}=', null, false),
+			array('{host:key.str()=0', null, false),
+			array('{host:key.last()}<>0}', null, false),
+			array('{host:key.str()}<>0', null, true),
+			array('({host:key.str(aaa()}=0', null, false),
+			array('(({host:key.str(aaa()}=0)', null, false),
+			array('{host:key.str(aaa()}=0)', null, false),
+			array('({hostA:keyA.str("abc")}=0) oror ({hostB:keyB.last(123)}=0)', null, false),
+			array('{host:key.last()}<>0', null, true),
+			array('{hostA:keyA.str("abc")} / ({hostB:keyB.last(123)}=0', null, false),
+			array('({hostA:keyA.str("abc")} / ({hostB:keyB.last(123)})=0', null, false),
+
+			array('{constant}', null, false),
+			array('{cons tant}', null, false),
+			array('{expression}', null, false),
+			array('{expre ssion}', null, false),
+			array('host:key.str()', null, false),
+			array('{host:key.str()', null, false),
+			array('host:key.str()}', null, false),
+			array(' {host:key.str()}', null, true),
+			array('{host:key.str()} ', null, true),
+			array('{ host:key.str()}', null, true),
+			array('{host :key.str()}', null, true),
+			array('{host:key.str(-5)}', null, true),
+			array('{host:key.str(+5)}', null, true),
+			array('{host:key.str([-5)}', null, true),
+			array('{host:key.str(-5])}', null, true),
+			array('{host:key.str((-5)}', null, true),
+			array('{host:key.str(-5))}', null, false),
+			array('{host:key.str(-5)*1}', null, false),
+			array('0={host:key["a"b].str()}', null, false),
+			array('0={host:key[].str(a"b"c)}', null, true),
+			array('0={host:key[].str("a\"b\"c")}', null, true),
+			array('0={host:key[].str("a\\\\"b\\\\"c")}', null, true),
+			array('0={host:key[].str("a"b)}', null, false),
+			array('0={host:key[].str(,"a"b,)}', null, false),
+			array('0={host:key[].str("","a"b,"")}', null, false),
+			array('0={host:key.str)', null, false),
+			array('1z={host:key.str()', null, false),
+			array('1z={host:key.str()}', null, false),
+			array('0={host:key[].str(")}', null, false),
+			array('0={host:key[].str( ")}', null, false),
+			array('0={host:key[].str(")}")}', null, true),
+			array('0={host:key[].str( ")}")}', null, true),
+			array(
+				'({host1:key1.last(0)}/{host2:key2.last(5)})/10+2*{TRIGGER.VALUE} and {$USERMACRO1}+(-{$USERMACRO2})+'.
+					'-{$USERMACRO3}*-12K+12.5m',
+				array(
+					'error' => '',
+					'expressions' => array(
+						0 => array(
+							'expression' => '{host1:key1.last(0)}',
+							'pos'=> 1,
+							'host' => 'host1',
+							'item' => 'key1',
+							'function' => 'last(0)',
+							'functionName' => 'last',
+							'functionParam' => '0',
+							'functionParamList' => array('0')
+						),
+						1 => array(
+							'expression' => '{host2:key2.last(5)}',
+							'pos'=> 22,
+							'host' => 'host2',
+							'item' => 'key2',
+							'function' => 'last(5)',
+							'functionName' => 'last',
+							'functionParam' => '5',
+							'functionParamList' => array('5')
+						)
+					)
+				),
+				true
+			),
+			array(
+				'-12+{TRIGGER.VALUE}/(({host1:key1[].last(5)}+(5*(1-(-3*5 and ((7 or 9))<>1)*{host2:key2[""].last(123)})/10'.
+					'/10/10)+{$USERMACRO1})-{$USERMACRO2})',
+				null,
+				true
+			),
+			array('{host:key["{$USERMACRO1}",{$USERMACRO2}].str()}', null, true),
+			array('{host:key[].str("{$USERMACRO1}",{$USERMACRO2})}', null, true),
+			array('{host:key["{HOSTNAME1}",{HOSTNAME2}].str()}', null, true),
+			array(
+				'{host:key[].str("{HOSTNAME1}",{HOSTNAME2})}',
+				array(
+					'error' => '',
+					'expressions' => array(
+						0 => array(
+							'expression' => '{host:key[].str("{HOSTNAME1}",{HOSTNAME2})}',
+							'pos' => 0,
+							'host' => 'host',
+							'item' => 'key[]',
+							'function' => 'str("{HOSTNAME1}",{HOSTNAME2})',
+							'functionName' => 'str',
+							'functionParam' => '"{HOSTNAME1}",{HOSTNAME2}',
+							'functionParamList' => array('{HOSTNAME1}', '{HOSTNAME2}')
+						)
+					)
+				),
+				true
+			),
+			array('{host:key[].count(1,"{HOSTNAME1}",{HOSTNAME2})}', null, true),
+			array('{host:key[].str()}=-1=--2=---3=----4=-----5', null, false),
+			array('{host:key[].str()}=-1=--2=---3=----4=-----5', null, false),
+			array('{host:key[].str()}=-1', null, true),
+			array('{host:key[].str()}+-1', null, true),
+			array('{host:key[].str()}--1', null, true),
+			array('{host:key[].str()}-(-1)', null, true),
+			array('{host:key[].str()}-(-(-(-1)))', null, true),
+			array('{host:key[{$$$},"{$$$}"].str()}', null, true),
+			array('{host:key[{!!!},"{!!!}"].str()}', null, true),
+			array('{host:key[{$USERMACRO1,"{$USERMACRO"].str()}', null, true),
+			array('{host:key[].count(1,{$USERMACRO1,"{$USERMACRO")}', null, true),
+			array('{host:key[{$USERMACRO1}abc,"{$USERMACRO2}"].str()}', null, true),
+			array('{host:key[{$USERMACRO1},"{$USERMACRO2}abc"].str()}', null, true),
+			array('{host:key[].count(1,{$USERMACRO1}abc,"{$USERMACRO2}")}', null, true),
+			array('{host:key[].count(1,{$USERMACRO1},"{$USERMACRO2}abc")}', null, true),
+			array('{host:key[abc{HOSTNAME1},"{HOSTNAME2}"].str()}', null, true),
+			array('{host:key[{HOSTNAME1},"abc{HOSTNAME2}"].str()}', null, true),
+			array('{host:key[].count(1,abc{HOSTNAME1},"{HOSTNAME2}")}', null, true),
+			array('{host:key[].count(1,{HOSTNAME1},"abc{HOSTNAME2}")}', null, true),
+			array('{host:key[{host:key.last(0)},"{host:key.last(0)}"].str()}', null, true),
+			array('{host:key[].count(1,{host:key.last(0)},"{host:key.last(0)}")}', null, false),
+			array('{host:key[].count(1,{host:key.last(0},"{host:key.last(0)}")}', null, true),
+			array('{host:key[].count(1,{host:key.last(0)}+{host:key.last(0)}', null, true),
+			array('{host:key[].count(1,{host:key.last(0)}', null, true),
+			array('{host:key[{host:key[].last(0)},"{host:key[].last(0)}"].str()}', null, false),
+			array('{host:key["{host:key[].last(0)}",{host:key[].last(0)}].str()}', null, false),
+			array('{host:key["{host:key[].last(0)}",{host:key[].last(0)}', null, true),
+			array('{host:key[{host:key[].last(0)}+{host:key[].last(0)}', null, true),
+			array('{host:key[{host:key[].last(0)}', null, true),
+			array('{host:key.last({$UPPERCASE})}', null, true),
+			array('{host:key.last(0)}+{$UPPERCASE}', null, true),
+			array('{host:key.last({$lowercase})}', null, true),
+			array('{host:key.last(0)}+{$lowercase}', null, false),
+			array('{host:key.last(1.23)}', null, true),
+			array('{host:key.last(1.23s)}', null, true),
+			array('{host:key.last(<>1.23)}', null, true),
+			array('{host:key.abschange()}', null, true),
+			array('{host:key.abschange(0)}', null, true),
+			array('{host:key.abschange(0,)}', null, true),
+			array('{host:key.avg()}', null, true),
+			array('{host:key.avg(123)}', null, true),
+			array('{host:key.avg(123s)}', null, true),
+			array('{host:key.avg(#123)}', null, true),
+			array('{host:key.avg(123,456)}', null, true),
+			array('{host:key.avg(123,456s)}', null, true),
+			array('{host:key.avg(123,456s,)}', null, true),
+			array('{host:key.change()}', null, true),
+			array('{host:key.change(0)}', null, true),
+			array('{host:key.change(0,)}', null, true),
+			array('{host:key.count()}', null, true),
+			array('{host:key.count(123)}', null, true),
+			array('{host:key.count(123,text)}', null, true),
+			array('{host:key.count(123s,text)}', null, true),
+			array('{host:key.count(#123,text)}', null, true),
+			array('{host:key.count(123,text,eq)}', null, true),
+			array('{host:key.count(123,text,ne)}', null, true),
+			array('{host:key.count(123,text,gt)}', null, true),
+			array('{host:key.count(123,text,ge)}', null, true),
+			array('{host:key.count(123,text,lt)}', null, true),
+			array('{host:key.count(123,text,le)}', null, true),
+			array('{host:key.count(123,text,like)}', null, true),
+			array('{host:key.count(123,text,like,456)}', null, true),
+			array('{host:key.count(123,text,like,456s)}', null, true),
+			array('{host:key.count(123,text,nonexistent,456s)}', null, true),
+			array('{host:key.count(123,text,nonexistent,456s,)}', null, true),
+			array('{host:key.date()}', null, true),
+			array('{host:key.date(0)}', null, true),
+			array('{host:key.date(0,)}', null, true),
+			array('{host:key.dayofweek()}', null, true),
+			array('{host:key.dayofweek(0)}', null, true),
+			array('{host:key.dayofweek(0,)}', null, true),
+			array('{host:key.delta()}', null, true),
+			array('{host:key.delta(123)}', null, true),
+			array('{host:key.delta(123s)}', null, true),
+			array('{host:key.delta(#123)}', null, true),
+			array('{host:key.delta(123,456)}', null, true),
+			array('{host:key.delta(123,456s)}', null, true),
+			array('{host:key.delta(123,456s,)}', null, true),
+			array('{host:key.diff()}', null, true),
+			array('{host:key.diff(0)}', null, true),
+			array('{host:key.diff(0,)}', null, true),
+			array('{host:key.fuzzytime()}', null, true),
+			array('{host:key.fuzzytime(123)}', null, true),
+			array('{host:key.fuzzytime(#123)}', null, true),
+			array('{host:key.fuzzytime(123,)}', null, true),
+			array('{host:key.iregexp()}', null, true),
+			array('{host:key.iregexp(text)}', null, true),
+			array('{host:key.iregexp(text,123)}', null, true),
+			array('{host:key.iregexp(text,123s)}', null, true),
+			array('{host:key.iregexp(text,#123)}', null, true),
+			array('{host:key.iregexp(text,#123,)}', null, true),
+			array('{host:key.last()}', null, true),
+			array('{host:key.last(0)}', null, true),
+			array('{host:key.last(#123)}', null, true),
+			array('{host:key.last(#123,456)}', null, true),
+			array('{host:key.last(#123,456s)}', null, true),
+			array('{host:key.last(#123,456s,)}', null, true),
+			array('{host:key.logseverity()}', null, true),
+			array('{host:key.logseverity(0)}', null, true),
+			array('{host:key.logseverity(0,)}', null, true),
+			array('{host:key.logsource()}', null, true),
+			array('{host:key.logsource(text)}', null, true),
+			array('{host:key.logsource(text,)}', null, true),
+			array('{host:key.max()}', null, true),
+			array(
+				'{host:key.max(123)}',
+				array(
+					'error' => '',
+					'expressions' => array(
+						0 => array(
+							'expression' => '{host:key.max(123)}',
+							'pos' => 0,
+							'host' => 'host',
+							'item' => 'key',
+							'function' => 'max(123)',
+							'functionName' => 'max',
+							'functionParam' => '123',
+							'functionParamList' => array('123')
+						)
+					)
+				),
+				true
+			),
+			array('{host:key.max(123s)}', null, true),
+			array('{host:key.max(#123)}', null, true),
+			array('{host:key.max(123,456)}', null, true),
+			array('{host:key.max(123,456s)}', null, true),
+			array('{host:key.max(123,456s,)}', null, true),
+			array('{host:key.min()}', null, true),
+			array('{host:key.min(123)}', null, true),
+			array('{host:key.min(123s)}', null, true),
+			array('{host:key.min(#123)}', null, true),
+			array('{host:key.min(123,456)}', null, true),
+			array('{host:key.min(123,456s)}', null, true),
+			array('{host:key.min(123,456s,)}', null, true),
+			array('{host:key.nodata()}', null, true),
+			array('{host:key.nodata(123)}', null, true),
+			array('{host:key.nodata(123s)}', null, true),
+			array('{host:key.nodata(#123)}', null, true),
+			array('{host:key.nodata(123s,)}', null, true),
+			array('{host:key.now()}', null, true),
+			array('{host:key.now(0)}', null, true),
+			array('{host:key.now(0,)}', null, true),
+			array('{host:key.prev()}', null, true),
+			array('{host:key.prev(0)}', null, true),
+			array('{host:key.prev(0,)}', null, true),
+			array('{host:key.regexp()}', null, true),
+			array('{host:key.regexp(text)}', null, true),
+			array('{host:key.regexp(text,123)}', null, true),
+			array('{host:key.regexp(text,123s)}', null, true),
+			array('{host:key.regexp(text,#123)}', null, true),
+			array('{host:key.regexp(text,#123,)}', null, true),
+			array('{host:key.str()}', null, true),
+			array('{host:key.str(text)}', null, true),
+			array('{host:key.str(text,123)}', null, true),
+			array('{host:key.str(text,123s)}', null, true),
+			array('{host:key.str(text,#123)}', null, true),
+			array('{host:key.str(text,#123,)}', null, true),
+			array('{host:key.strlen()}', null, true),
+			array('{host:key.strlen(0)}', null, true),
+			array('{host:key.strlen(#123)}', null, true),
+			array('{host:key.strlen(#123,456)}', null, true),
+			array('{host:key.strlen(#123,456s)}', null, true),
+			array('{host:key.strlen(#123,456s,)}', null, true),
+			array('{host:key.sum()}', null, true),
+			array('{host:key.sum(123)}', null, true),
+			array('{host:key.sum(123s)}', null, true),
+			array('{host:key.sum(#123)}', null, true),
+			array('{host:key.sum(123,456)}', null, true),
+			array('{host:key.sum(123,456s)}', null, true),
+			array('{host:key.sum(123,456s,)}', null, true),
+			array('{host:key.time()}', null, true),
+			array('{host:key.time(0)}', null, true),
+			array('{host:key.time(0,)}', null, true),
+			array('{host:key.nonexistent()}', null, true),
+			array('{host:key.last(0)}+{TRIGGER.VALUE}', null, true),
+			array('{host:key.last(0)}+{trigger.value}', null, false),
+			array('(({host:key.last(0)}+1.)) + + (({host:key.last(0)}+1.))', null, false),
+			array('(({host:key.last(0)}+1.)) + - (({host:key.last(0)}+1.))', null, true),
+			array('(({host:key.last(0)}+1.)) + (({host:key.last(0)}+1.))', null, true),
+			array('(({host:key.last(0)}+1.))', null, true),
+			array('(--({host:key.last(0)}+1.))', null, false),
+			array('(+({host:key.last(0)}+1.))', null, false),
+			array('(/({host:key.last(0)}+1.))', null, false),
+			array('({host:key.last(0)}+1.)/({host:key.last(0)}+1.)', null, true),
+			array('({host:key.last(0)}+1.)-({host:key.last(0)}+1.)', null, true),
+			array('({host:key.last(0)}+1.)+({host:key.last(0)}+1.)', null, true),
+			array('({host:key.last(0)}+1.) or ({host:key.last(0)}+1.)', null, true),
+			array('({host:key.last(0)}+1.) and ({host:key.last(0)}+1.)', null, true),
+			array('({host:key.last(0)}+1.) and ({host:key.last(0)}+1.)/({host:key.last(0)}+1.)', null, true),
+			array('({host:key.last(0)}+1.)+({host:key.last(0)}+1.)/({host:key.last(0)}+1.)', null, true),
+			array(
+				'1 - (1/({host:key.last(0)}+1.))+(({host:key.last(0)}+1.))/({host:key.last(0)}+1.)/({host:key.last('.
+					'0)}+1.)',
+				null,
+				true
+			),
+			array('(({host:key.last(0)}+.1)) + + (({host:key.last(0)}+.1))', null, false),
+			array('(({host:key.last(0)}+.1)) + - (({host:key.last(0)}+.1))', null, true),
+			array('(({host:key.last(0)}+.1)) + (({host:key.last(0)}+.1))', null, true),
+			array('(({host:key.last(0)}+.1))', null, true),
+			array('(--({host:key.last(0)}+.1))', null, false),
+			array('(+({host:key.last(0)}+.1))', null, false),
+			array('(/({host:key.last(0)}+.1))', null, false),
+			array('({host:key.last(0)}+.1)/({host:key.last(0)}+.1)', null, true),
+			array('({host:key.last(0)}+.1)-({host:key.last(0)}+.1)', null, true),
+			array('({host:key.last(0)}+.1)+({host:key.last(0)}+.1)', null, true),
+			array('({host:key.last(0)}+.1) or ({host:key.last(0)}+.1)', null, true),
+			array('({host:key.last(0)}+.1) and ({host:key.last(0)}+.1)', null, true),
+			array('({host:key.last(0)}+.1) and ({host:key.last(0)}+.1)/({host:key.last(0)}+.1)', null, true),
+			array('({host:key.last(0)}+.1)+({host:key.last(0)}+.1)/({host:key.last(0)}+.1)', null, true),
+			array(
+				'1 - (1/({host:key.last(0)}+.1))+(({host:key.last(0)}+.1))/({host:key.last(0)}+.1)/({host:key.last('.
+					'0)}+.1)',
+				null,
+				true
+			),
+			array('(({host:key.last(0)}+0 .1)) + + (({host:key.last(0)}+0 .1))', null, false),
+			array('(({host:key.last(0)}+0 .1)) + - (({host:key.last(0)}+0 .1))', null, false),
+			array('(({host:key.last(0)}+0 .1)) + (({host:key.last(0)}+0 .1))', null, false),
+			array('(({host:key.last(0)}+0 .1))', null, false),
+			array('(--({host:key.last(0)}+0 .1))', null, false),
+			array('(+({host:key.last(0)}+0 .1))', null, false),
+			array('(/({host:key.last(0)}+0 .1))', null, false),
+			array('({host:key.last(0)}+0 .1)/({host:key.last(0)}+0 .1)', null, false),
+			array('({host:key.last(0)}+0 .1)-({host:key.last(0)}+0 .1)', null, false),
+			array('({host:key.last(0)}+0 .1)+({host:key.last(0)}+0 .1)', null, false),
+			array('({host:key.last(0)}+0 .1) or ({host:key.last(0)}+0 .1)', null, false),
+			array('({host:key.last(0)}+0 .1) and ({host:key.last(0)}+0 .1)', null, false),
+			array('({host:key.last(0)}+0 .1) and ({host:key.last(0)}+0 .1)/({host:key.last(0)}+0 .1)', null, false),
+			array('({host:key.last(0)}+0 .1)+({host:key.last(0)}+0 .1)/({host:key.last(0)}+0 .1)', null, false),
+			array(
+				'1 - (1/({host:key.last(0)}+0 .1))+(({host:key.last(0)}+0 .1))/({host:key.last(0)}+0 .1)/({host:key'.
+					'.last(0)}+0 .1)',
+				null,
+				false
+			),
+			array('(({host:key.last(0)}+1 K)) + + (({host:key.last(0)}+1 K))', null, false),
+			array('(({host:key.last(0)}+1 K)) + - (({host:key.last(0)}+1 K))', null, false),
+			array('(({host:key.last(0)}+1 K)) + (({host:key.last(0)}+1 K))', null, false),
+			array('(({host:key.last(0)}+1 K))', null, false),
+			array('(--({host:key.last(0)}+1 K))', null, false),
+			array('(+({host:key.last(0)}+1 K))', null, false),
+			array('(/({host:key.last(0)}+1 K))', null, false),
+			array('({host:key.last(0)}+1 K)/({host:key.last(0)}+1 K)', null, false),
+			array('({host:key.last(0)}+1 K)-({host:key.last(0)}+1 K)', null, false),
+			array('({host:key.last(0)}+1 K)+({host:key.last(0)}+1 K)', null, false),
+			array('({host:key.last(0)}+1 K) or ({host:key.last(0)}+1 K)', null, false),
+			array('({host:key.last(0)}+1 K) and ({host:key.last(0)}+1 K)', null, false),
+			array('({host:key.last(0)}+1 K) and ({host:key.last(0)}+1 K)/({host:key.last(0)}+1 K)', null, false),
+			array('({host:key.last(0)}+1 K)+({host:key.last(0)}+1 K)/({host:key.last(0)}+1 K)', null, false),
+			array(
+				'1 - (1/({host:key.last(0)}+1 K))+(({host:key.last(0)}+1 K))/({host:key.last(0)}+1 K)/({host:key.la'.
+					'st(0)}+1 K)',
+				null,
+				false
+			),
+			array('(({host:key.last(0)}+.)) + + (({host:key.last(0)}+.))', null, false),
+			array('(({host:key.last(0)}+.)) + - (({host:key.last(0)}+.))', null, false),
+			array('(({host:key.last(0)}+.)) + (({host:key.last(0)}+.))', null, false),
+			array('(({host:key.last(0)}+.))', null, false),
+			array('(--({host:key.last(0)}+.))', null, false),
+			array('(+({host:key.last(0)}+.))', null, false),
+			array('(/({host:key.last(0)}+.))', null, false),
+			array('({host:key.last(0)}+.)/({host:key.last(0)}+.)', null, false),
+			array('({host:key.last(0)}+.)-({host:key.last(0)}+.)', null, false),
+			array('({host:key.last(0)}+.)+({host:key.last(0)}+.)', null, false),
+			array('({host:key.last(0)}+.) or ({host:key.last(0)}+.)', null, false),
+			array('({host:key.last(0)}+.) and ({host:key.last(0)}+.)', null, false),
+			array('({host:key.last(0)}+.) and ({host:key.last(0)}+.)/({host:key.last(0)}+.)', null, false),
+			array('({host:key.last(0)}+.)+({host:key.last(0)}+.)/({host:key.last(0)}+.)', null, false),
+			array(
+				'1 - (1/({host:key.last(0)}+.))+(({host:key.last(0)}+.))/({host:key.last(0)}+.)/({host:key.last(0)}'.
+					'+.)',
+				null,
+				false
+			),
+			array('(({host:key.last(0)}+.K)) + + (({host:key.last(0)}+.K))', null, false),
+			array('(({host:key.last(0)}+.K)) + - (({host:key.last(0)}+.K))', null, false),
+			array('(({host:key.last(0)}+.K)) + (({host:key.last(0)}+.K))', null, false),
+			array('(({host:key.last(0)}+.K))', null, false),
+			array('(--({host:key.last(0)}+.K))', null, false),
+			array('(+({host:key.last(0)}+.K))', null, false),
+			array('(/({host:key.last(0)}+.K))', null, false),
+			array('({host:key.last(0)}+.K)/({host:key.last(0)}+.K)', null, false),
+			array('({host:key.last(0)}+.K)-({host:key.last(0)}+.K)', null, false),
+			array('({host:key.last(0)}+.K)+({host:key.last(0)}+.K)', null, false),
+			array('({host:key.last(0)}+.K) or ({host:key.last(0)}+.K)', null, false),
+			array('({host:key.last(0)}+.K) and ({host:key.last(0)}+.K)', null, false),
+			array('({host:key.last(0)}+.K) and ({host:key.last(0)}+.K)/({host:key.last(0)}+.K)', null, false),
+			array('({host:key.last(0)}+.K)+({host:key.last(0)}+.K)/({host:key.last(0)}+.K)', null, false),
+			array(
+				'1 - (1/({host:key.last(0)}+.K))+(({host:key.last(0)}+.K))/({host:key.last(0)}+.K)/({host:key.last('.
+					'0)}+.K)',
+				null,
+				false
+			),
+			array('(({host:key.last(0)}+K)) + + (({host:key.last(0)}+K))', null, false),
+			array('(({host:key.last(0)}+K)) + - (({host:key.last(0)}+K))', null, false),
+			array('(({host:key.last(0)}+K)) + (({host:key.last(0)}+K))', null, false),
+			array('(({host:key.last(0)}+K))', null, false),
+			array('(--({host:key.last(0)}+K))', null, false),
+			array('(+({host:key.last(0)}+K))', null, false),
+			array('(/({host:key.last(0)}+K))', null, false),
+			array('({host:key.last(0)}+K)/({host:key.last(0)}+K)', null, false),
+			array('({host:key.last(0)}+K)-({host:key.last(0)}+K)', null, false),
+			array('({host:key.last(0)}+K)+({host:key.last(0)}+K)', null, false),
+			array('({host:key.last(0)}+K) or ({host:key.last(0)}+K)', null, false),
+			array('({host:key.last(0)}+K) and ({host:key.last(0)}+K)', null, false),
+			array('({host:key.last(0)}+K) and ({host:key.last(0)}+K)/({host:key.last(0)}+K)', null, false),
+			array('({host:key.last(0)}+K)+({host:key.last(0)}+K)/({host:key.last(0)}+K)', null, false),
+			array(
+				'1 - (1/({host:key.last(0)}+K))+(({host:key.last(0)}+K))/({host:key.last(0)}+K)/({host:key.last(0)}'.
+					'+K)',
+				null,
+				false
+			),
+			array(
+				'({host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}) + + ({host:key.last(1)}+(1/2+2*2-3 or 4)'.
+					' or 23-34>{host:key.last(#1)})',
+				null,
+				false
+			),
+			array(
+				'({host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}) + - ({host:key.last(1)}+(1/2+2*2-3 or '.
+					'4) or 23-34>{host:key.last(#1)})',
+				array(
+					'error' => '',
+					'expressions' => array(
+						0 => array(
+							'expression' => '{host:key.last(1)}',
+							'pos'=> 1,
+							'host' => 'host',
+							'item' => 'key',
+							'function' => 'last(1)',
+							'functionName' => 'last',
+							'functionParam' => '1',
+							'functionParamList' => array('1')
+						),
+						1 => array(
+							'expression' => '{host:key.last(#1)}',
+							'pos'=> 46,
+							'host' => 'host',
+							'item' => 'key',
+							'function' => 'last(#1)',
+							'functionName' => 'last',
+							'functionParam' => '#1',
+							'functionParamList' => array('#1')
+						),
+						2 => array(
+							'expression' => '{host:key.last(1)}',
+							'pos'=> 72,
+							'host' => 'host',
+							'item' => 'key',
+							'function' => 'last(1)',
+							'functionName' => 'last',
+							'functionParam' => '1',
+							'functionParamList' => array('1')
+						),
+						3 => array(
+							'expression' => '{host:key.last(#1)}',
+							'pos'=> 117,
+							'host' => 'host',
+							'item' => 'key',
+							'function' => 'last(#1)',
+							'functionName' => 'last',
+							'functionParam' => '#1',
+							'functionParamList' => array('#1')
+						)
+					)
+				),
+				true
+			),
+			array(
+				'({host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}) + ({host:key.last(1)}+(1/2+2*2-3 or 4) or '.
+					'23-34>{host:key.last(#1)})',
+				null,
+				true
+			),
+			array('({host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)})', null, true),
+			array('(--{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)})', null, false),
+			array('(+{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)})', null, false),
+			array('(/{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)})', null, false),
+			array(
+				'{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}/{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34'.
+					'>{host:key.last(#1)}',
+				null,
+				true
+			),
+			array(
+				'{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}-{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34'.
+					'>{host:key.last(#1)}',
+				null,
+				true
+			),
+			array(
+				'{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}+{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34'.
+					'>{host:key.last(#1)}',
+				null,
+				true
+			),
+			array(
+				'{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)} or {host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34'.
+					'>{host:key.last(#1)}',
+				null,
+				true
+			),
+			array(
+				'{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)} and {host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34'.
+					'>{host:key.last(#1)}',
+				null,
+				true
+			),
+			array(
+				'{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)} and {host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34'.
+					'>{host:key.last(#1)}/{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}',
+				null,
+				true
+			),
+			array(
+				'{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}+{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34'.
+					'>{host:key.last(#1)}/{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}',
+				null,
+				true
+			),
+			array(
+				'1 - (1/{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)})+({host:key.last(1)}+(1/2+2*2-3 or '.
+					'4) or 23-34>{host:key.last(#1)})/{host:key.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}/{host:ke'.
+					'y.last(1)}+(1/2+2*2-3 or 4) or 23-34>{host:key.last(#1)}',
+				null,
+				true
+			),
+			array('({host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34) + + ({host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)', null, false),
+			array('({host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34) + - ({host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)', null, true),
+			array('({host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34) + ({host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)', null, true),
+			array('({host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)', null, true),
+			array('(--{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)', null, false),
+			array('(+{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)', null, false),
+			array('(/{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)', null, false),
+			array('{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34/{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34', null, true),
+			array('{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34-{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34', null, true),
+			array('{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34+{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34', null, true),
+			array('{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34 or {host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34', null, true),
+			array('{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34 and {host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34', null, true),
+			array(
+				'{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34 and {host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34/{host:key.last(0)}+('.
+					'1/2+2*2-3 or 4) or 23-34',
+				null,
+				true
+			),
+			array(
+				'{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34+{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34/{host:key.last(0)}+(1'.
+					'/2+2*2-3 or 4) or 23-34',
+				null,
+				true
+			),
+			array(
+				'1 - (1/{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)+({host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34)/{host:key.'.
+					'last(0)}+(1/2+2*2-3 or 4) or 23-34/{host:key.last(0)}+(1/2+2*2-3 or 4) or 23-34',
+				null,
+				true
+			),
+			array('({host:key.{a}}) + + ({host:key.{a}})', null, false),
+			array('({host:key.{a}}) + - ({host:key.{a}})', null, false),
+			array('({host:key.{a}}) + ({host:key.{a}})', null, false),
+			array('({host:key.{a}})', null, false),
+			array('(--{host:key.{a}})', null, false),
+			array('(+{host:key.{a}})', null, false),
+			array('(/{host:key.{a}})', null, false),
+			array('{host:key.{a}}/{host:key.{a}}', null, false),
+			array('{host:key.{a}}-{host:key.{a}}', null, false),
+			array('{host:key.{a}}+{host:key.{a}}', null, false),
+			array('{host:key.{a}} or {host:key.{a}}', null, false),
+			array('{host:key.{a}} and {host:key.{a}}', null, false),
+			array('{host:key.{a}} and {host:key.{a}}/{host:key.{a}}', null, false),
+			array('{host:key.{a}}+{host:key.{a}}/{host:key.{a}}', null, false),
+			array('1 - (1/{host:key.{a}})+({host:key.{a}})/{host:key.{a}}/{host:key.{a}}', null, false),
+			array('({host::key.last{a}}) + + ({host::key.last{a}})', null, false),
+			array('({host::key.last{a}}) + - ({host::key.last{a}})', null, false),
+			array('({host::key.last{a}}) + ({host::key.last{a}})', null, false),
+			array('({host::key.last{a}})', null, false),
+			array('(--{host::key.last{a}})', null, false),
+			array('(+{host::key.last{a}})', null, false),
+			array('(/{host::key.last{a}})', null, false),
+			array('{host::key.last{a}}/{host::key.last{a}}', null, false),
+			array('{host::key.last{a}}-{host::key.last{a}}', null, false),
+			array('{host::key.last{a}}+{host::key.last{a}}', null, false),
+			array('{host::key.last{a}} or {host::key.last{a}}', null, false),
+			array('{host::key.last{a}} and {host::key.last{a}}', null, false),
+			array('{host::key.last{a}} and {host::key.last{a}}/{host::key.last{a}}', null, false),
+			array('{host::key.last{a}}+{host::key.last{a}}/{host::key.last{a}}', null, false),
+			array(
+				'1 - (1/{host::key.last{a}})+({host::key.last{a}})/{host::key.last{a}}/{host::key.last{a}}',
+				null,
+				false
+			),
+			array('({host::key.(0)}) + + ({host::key.(0)})', null, false),
+			array('({host::key.(0)}) + - ({host::key.(0)})', null, false),
+			array('({host::key.(0)}) + ({host::key.(0)})', null, false),
+			array('({host::key.(0)})', null, false),
+			array('(--{host::key.(0)})', null, false),
+			array('(+{host::key.(0)})', null, false),
+			array('(/{host::key.(0)})', null, false),
+			array('{host::key.(0)}/{host::key.(0)}', null, false),
+			array('{host::key.(0)}-{host::key.(0)}', null, false),
+			array('{host::key.(0)}+{host::key.(0)}', null, false),
+			array('{host::key.(0)} or {host::key.(0)}', null, false),
+			array('{host::key.(0)} and {host::key.(0)}', null, false),
+			array('{host::key.(0)} and {host::key.(0)}/{host::key.(0)}', null, false),
+			array('{host::key.(0)}+{host::key.(0)}/{host::key.(0)}', null, false),
+			array('1 - (1/{host::key.(0)})+({host::key.(0)})/{host::key.(0)}/{host::key.(0)}', null, false),
+			array('({:key.(0)}) + + ({:key.(0)})', null, false),
+			array('({:key.(0)}) + - ({:key.(0)})', null, false),
+			array('({:key.(0)}) + ({:key.(0)})', null, false),
+			array('({:key.(0)})', null, false),
+			array('(--{:key.(0)})', null, false),
+			array('(+{:key.(0)})', null, false),
+			array('(/{:key.(0)})', null, false),
+			array('{:key.(0)}/{:key.(0)}', null, false),
+			array('{:key.(0)}-{:key.(0)}', null, false),
+			array('{:key.(0)}+{:key.(0)}', null, false),
+			array('{:key.(0)} or {:key.(0)}', null, false),
+			array('{:key.(0)} and {:key.(0)}', null, false),
+			array('{:key.(0)} and {:key.(0)}/{:key.(0)}', null, false),
+			array('{:key.(0)}+{:key.(0)}/{:key.(0)}', null, false),
+			array('1 - (1/{:key.(0)})+({:key.(0)})/{:key.(0)}/{:key.(0)}', null, false),
+			array('({:key.last(0)}) + + ({:key.last(0)})', null, false),
+			array('({:key.last(0)}) + - ({:key.last(0)})', null, false),
+			array('({:key.last(0)}) + ({:key.last(0)})', null, false),
+			array('({:key.last(0)})', null, false),
+			array('(--{:key.last(0)})', null, false),
+			array('(+{:key.last(0)})', null, false),
+			array('(/{:key.last(0)})', null, false),
+			array('{:key.last(0)}/{:key.last(0)}', null, false),
+			array('{:key.last(0)}-{:key.last(0)}', null, false),
+			array('{:key.last(0)}+{:key.last(0)}', null, false),
+			array('{:key.last(0)} or {:key.last(0)}', null, false),
+			array('{:key.last(0)} and {:key.last(0)}', null, false),
+			array('{:key.last(0)} and {:key.last(0)}/{:key.last(0)}', null, false),
+			array('{:key.last(0)}+{:key.last(0)}/{:key.last(0)}', null, false),
+			array('1 - (1/{:key.last(0)})+({:key.last(0)})/{:key.last(0)}/{:key.last(0)}', null, false),
+			array('(({host:key.last(0)})) + + (({host:key.last(0)}))', null, false),
+			array('(({host:key.last(0)})) + - (({host:key.last(0)}))', null, true),
+			array('(({host:key.last(0)})) + (({host:key.last(0)}))', null, true),
+			array('(({host:key.last(0)}))', null, true),
+			array('(--({host:key.last(0)}))', null, false),
+			array('(+({host:key.last(0)}))', null, false),
+			array('(/({host:key.last(0)}))', null, false),
+			array('({host:key.last(0)})/({host:key.last(0)})', null, true),
+			array('({host:key.last(0)})-({host:key.last(0)})', null, true),
+			array('({host:key.last(0)})+({host:key.last(0)})', null, true),
+			array('({host:key.last(0)}) or ({host:key.last(0)})', null, true),
+			array('({host:key.last(0)}) and ({host:key.last(0)})', null, true),
+			array('({host:key.last(0)}) and ({host:key.last(0)})/({host:key.last(0)})', null, true),
+			array('({host:key.last(0)})+({host:key.last(0)})/({host:key.last(0)})', null, true),
+			array(
+				'1 - (1/({host:key.last(0)}))+(({host:key.last(0)}))/({host:key.last(0)})/({host:key.last(0)})',
+				null,
+				true
+			),
+			array('({host:.last(0)}) + + ({host:.last(0)})', null, false),
+			array('({host:.last(0)}) + - ({host:.last(0)})', null, false),
+			array('({host:.last(0)}) + ({host:.last(0)})', null, false),
+			array('({host:.last(0)})', null, false),
+			array('(--{host:.last(0)})', null, false),
+			array('(+{host:.last(0)})', null, false),
+			array('(/{host:.last(0)})', null, false),
+			array('{host:.last(0)}/{host:.last(0)}', null, false),
+			array('{host:.last(0)}-{host:.last(0)}', null, false),
+			array('{host:.last(0)}+{host:.last(0)}', null, false),
+			array('{host:.last(0)} or {host:.last(0)}', null, false),
+			array('{host:.last(0)} and {host:.last(0)}', null, false),
+			array('{host:.last(0)} and {host:.last(0)}/{host:.last(0)}', null, false),
+			array('{host:.last(0)}+{host:.last(0)}/{host:.last(0)}', null, false),
+			array('1 - (1/{host:.last(0)})+({host:.last(0)})/{host:.last(0)}/{host:.last(0)}', null, false),
+			array('({$}+{host:key.last(0)}) + + ({$}+{host:key.last(0)})', null, false),
+			array('({$}+{host:key.last(0)}) + - ({$}+{host:key.last(0)})', null, false),
+			array('({$}+{host:key.last(0)}) + ({$}+{host:key.last(0)})', null, false),
+			array('({$}+{host:key.last(0)})', null, false),
+			array('(--{$}+{host:key.last(0)})', null, false),
+			array('(+{$}+{host:key.last(0)})', null, false),
+			array('(/{$}+{host:key.last(0)})', null, false),
+			array('{$}+{host:key.last(0)}/{$}+{host:key.last(0)}', null, false),
+			array('{$}+{host:key.last(0)}-{$}+{host:key.last(0)}', null, false),
+			array('{$}+{host:key.last(0)}+{$}+{host:key.last(0)}', null, false),
+			array('{$}+{host:key.last(0)} or {$}+{host:key.last(0)}', null, false),
+			array('{$}+{host:key.last(0)} and {$}+{host:key.last(0)}', null, false),
+			array('{$}+{host:key.last(0)} and {$}+{host:key.last(0)}/{$}+{host:key.last(0)}', null, false),
+			array('{$}+{host:key.last(0)}+{$}+{host:key.last(0)}/{$}+{host:key.last(0)}', null, false),
+			array(
+				'1 - (1/{$}+{host:key.last(0)})+({$}+{host:key.last(0)})/{$}+{host:key.last(0)}/{$}+{host:key.last('.
+					'0)}',
+				null,
+				false
+			),
+			array('( - {$MACRO}+{host:key.last(0)}) + + ( - {$MACRO}+{host:key.last(0)})', null, false),
+			array('( - {$MACRO}+{host:key.last(0)}) + - ( - {$MACRO}+{host:key.last(0)})', null, true),
+			array('( - {$MACRO}+{host:key.last(0)}) + ( - {$MACRO}+{host:key.last(0)})', null, true),
+			array('( - {$MACRO}+{host:key.last(0)})', null, true),
+			array('(-- - {$MACRO}+{host:key.last(0)})', null, false),
+			array('(+ - {$MACRO}+{host:key.last(0)})', null, false),
+			array('(/ - {$MACRO}+{host:key.last(0)})', null, false),
+			array(' - {$MACRO}+{host:key.last(0)}/ - {$MACRO}+{host:key.last(0)}', null, true),
+			array(' - {$MACRO}+{host:key.last(0)}- - {$MACRO}+{host:key.last(0)}', null, true),
+			array(' - {$MACRO}+{host:key.last(0)}+ - {$MACRO}+{host:key.last(0)}', null, true),
+			array(' - {$MACRO}+{host:key.last(0)} or - {$MACRO}+{host:key.last(0)}', null, true),
+			array(' - {$MACRO}+{host:key.last(0)} and - {$MACRO}+{host:key.last(0)}', null, true),
+			array(
+				' - {$MACRO}+{host:key.last(0)} and - {$MACRO}+{host:key.last(0)}/ - {$MACRO}+{host:key.last(0)}',
+				null,
+				true
+			),
+			array(
+				' - {$MACRO}+{host:key.last(0)}+ - {$MACRO}+{host:key.last(0)}/ - {$MACRO}+{host:key.last(0)}',
+					null,
+					true
+				),
+			array(
+				'1 - (1/ - {$MACRO}+{host:key.last(0)})+( - {$MACRO}+{host:key.last(0)})/ - {$MACRO}+{host:key.last'.
+					'(0)}/ - {$MACRO}+{host:key.last(0)}',
+				null,
+				true
+			),
+			array('(100G+{host:key.last(0)}) + + (100G+{host:key.last(0)})', null, false),
+			array('(100G+{host:key.last(0)}) + - (100G+{host:key.last(0)})', null, true),
+			array('(100G+{host:key.last(0)}) + (100G+{host:key.last(0)})', null, true),
+			array('(100G+{host:key.last(0)})', null, true),
+			array('(--100G+{host:key.last(0)})', null, false),
+			array('(+100G+{host:key.last(0)})', null, false),
+			array('(/100G+{host:key.last(0)})', null, false),
+			array('100G+{host:key.last(0)}/100G+{host:key.last(0)}', null, true),
+			array('100G+{host:key.last(0)}-100G+{host:key.last(0)}', null, true),
+			array('100G+{host:key.last(0)}+100G+{host:key.last(0)}', null, true),
+			array('100G+{host:key.last(0)} or 100G+{host:key.last(0)}', null, true),
+			array('100G+{host:key.last(0)} and 100G+{host:key.last(0)}', null, true),
+			array('100G+{host:key.last(0)} and 100G+{host:key.last(0)}/100G+{host:key.last(0)}', null, true),
+			array('100G+{host:key.last(0)}+100G+{host:key.last(0)}/100G+{host:key.last(0)}', null, true),
+			array(
+				'1 - (1/100G+{host:key.last(0)})+(100G+{host:key.last(0)})/100G+{host:key.last(0)}/100G+{host:key.l'.
+					'ast(0)}',
+				null,
+				true
+			),
+			array('({host:key.last(0)}) + + ({host:key.last(0)})', null, false),
+			array('({host:key.last(0)}) + - ({host:key.last(0)})', null, true),
+			array('({host:key.last(0)}) + ({host:key.last(0)})', null, true),
+			array('({host:key.last(0)})', null, true),
+			array('(--{host:key.last(0)})', null, false),
+			array('(+{host:key.last(0)})', null, false),
+			array('(/{host:key.last(0)})', null, false),
+			array('{host:key.last(0)}/{host:key.last(0)}', null, true),
+			array('{host:key.last(0)}-{host:key.last(0)}', null, true),
+			array('{host:key.last(0)}+{host:key.last(0)}', null, true),
+			array('{host:key.last(0)} or {host:key.last(0)}', null, true),
+			array('{host:key.last(0)} and {host:key.last(0)}', null, true),
+			array('{host:key.last(0)} and {host:key.last(0)}/{host:key.last(0)}', null, true),
+			array('{host:key.last(0)}+{host:key.last(0)}/{host:key.last(0)}', null, true),
+			array('1 - (1/{host:key.last(0)})+({host:key.last(0)})/{host:key.last(0)}/{host:key.last(0)}', null, true),
+			array('({host:key.str(0 - 1 / 2 or-4*-56.34K)}) + + ({host:key.str(0 - 1 / 2 or-4*-56.34K)})', null, false),
+			array('({host:key.str(0 - 1 / 2 or -4*-56.34K)}) + - ({host:key.str(0 - 1 / 2 or -4*-56.34K)})', null, true),
+			array('({host:key.str(0 - 1 / 2 or -4*-56.34K)}) + ({host:key.str(0 - 1 / 2 or -4*-56.34K)})', null, true),
+			array('({host:key.str(0 - 1 / 2 or -4*-56.34K)})', null, true),
+			array('(--{host:key.str(0 - 1 / 2 or-4*-56.34K)})', null, false),
+			array('(+{host:key.str(0 - 1 / 2 or-4*-56.34K)})', null, false),
+			array('(/{host:key.str(0 - 1 / 2 or-4*-56.34K)})', null, false),
+			array('{host:key.str(0 - 1 / 2 or -4*-56.34K)}/{host:key.str(0 - 1 / 2 or -4*-56.34K)}', null, true),
+			array('{host:key.str(0 - 1 / 2 or -4*-56.34K)}-{host:key.str(0 - 1 / 2 or -4*-56.34K)}', null, true),
+			array('{host:key.str(0 - 1 / 2 or -4*-56.34K)}+{host:key.str(0 - 1 / 2 or -4*-56.34K)}', null, true),
+			array('{host:key.str(0 - 1 / 2 or -4*-56.34K)} or {host:key.str(0 - 1 / 2 or -4*-56.34K)}', null, true),
+			array('{host:key.str(0 - 1 / 2 or -4*-56.34K)} and {host:key.str(0 - 1 / 2 or -4*-56.34K)}', null, true),
+			array(
+				'{host:key.str(0 - 1 / 2 or -4*-56.34K)} and {host:key.str(0 - 1 / 2 or -4*-56.34K)}/{host:key.str(0 - 1 / '.
+					'2 or -4*-56.34K)}',
+				null,
+				true
+			),
+			array(
+				'{host:key.str(0 - 1 / 2 or -4*-56.34K)}+{host:key.str(0 - 1 / 2 or -4*-56.34K)}/{host:key.str(0 - 1 / '.
+					'2 or -4*-56.34K)}',
+				null,
+				true
+			),
+			array(
+				'1 - (1/{host:key.str(0 - 1 / 2 or -4*-56.34K)})+({host:key.str(0 - 1 / 2 or -4*-56.34K)})/{host:key.st'.
+					'r(0 - 1 / 2 or -4*-56.34K)}/{host:key.str(0 - 1 / 2 or -4*-56.34K)}',
+				null,
+				true
+			),
+			array('({host:key.str(^$$$^%)}) + + ({host:key.str(^$$$^%)})', null, false),
+			array('({host:key.str(^$$$^%)}) + - ({host:key.str(^$$$^%)})', null, true),
+			array('({host:key.str(^$$$^%)}) + ({host:key.str(^$$$^%)})', null, true),
+			array('({host:key.str(^$$$^%)})', null, true),
+			array('(--{host:key.str(^$$$^%)})', null, false),
+			array('(+{host:key.str(^$$$^%)})', null, false),
+			array('(/{host:key.str(^$$$^%)})', null, false),
+			array('{host:key.str(^$$$^%)}/{host:key.str(^$$$^%)}', null, true),
+			array('{host:key.str(^$$$^%)}-{host:key.str(^$$$^%)}', null, true),
+			array('{host:key.str(^$$$^%)}+{host:key.str(^$$$^%)}', null, true),
+			array('{host:key.str(^$$$^%)} or {host:key.str(^$$$^%)}', null, true),
+			array('{host:key.str(^$$$^%)} and {host:key.str(^$$$^%)}', null, true),
+			array('{host:key.str(^$$$^%)} and {host:key.str(^$$$^%)}/{host:key.str(^$$$^%)}', null, true),
+			array('{host:key.str(^$$$^%)}+{host:key.str(^$$$^%)}/{host:key.str(^$$$^%)}', null, true),
+			array(
+				'1 - (1/{host:key.str(^$$$^%)})+({host:key.str(^$$$^%)})/{host:key.str(^$$$^%)}/{host:key.str(^$$$'.
+					'^%)}',
+				null,
+				true
+			),
+			array('({host:key.str("(^*&%#$%)*")}) + + ({host:key.str("(^*&%#$%)*")})', null, false),
+			array('({host:key.str("(^*&%#$%)*")}) + - ({host:key.str("(^*&%#$%)*")})', null, true),
+			array('({host:key.str("(^*&%#$%)*")}) + ({host:key.str("(^*&%#$%)*")})', null, true),
+			array('({host:key.str("(^*&%#$%)*")})', null, true),
+			array('(--{host:key.str("(^*&%#$%)*")})', null, false),
+			array('(+{host:key.str("(^*&%#$%)*")})', null, false),
+			array('(/{host:key.str("(^*&%#$%)*")})', null, false),
+			array('{host:key.str("(^*&%#$%)*")}/{host:key.str("(^*&%#$%)*")}', null, true),
+			array('{host:key.str("(^*&%#$%)*")}-{host:key.str("(^*&%#$%)*")}', null, true),
+			array('{host:key.str("(^*&%#$%)*")}+{host:key.str("(^*&%#$%)*")}', null, true),
+			array('{host:key.str("(^*&%#$%)*")} or {host:key.str("(^*&%#$%)*")}', null, true),
+			array('{host:key.str("(^*&%#$%)*")} and {host:key.str("(^*&%#$%)*")}', null, true),
+			array('{host:key.str("(^*&%#$%)*")} and {host:key.str("(^*&%#$%)*")}/{host:key.str("(^*&%#$%)*")}', null, true),
+			array('{host:key.str("(^*%#$%)*")}+{host:key.str("(^*&%#$%)*")}/{host:key.str("(^*&%#$%)*")}', null, true),
+			array(
+				'1 - (1/{host:key.str("(^*&%#$%)*")})+({host:key.str("(^*&%#$%)*")})/{host:key.str("(^*&%#$%)*")}/{'.
+					'host:key.str("(^*&%#$%)*")}',
+				null,
+				true
+			),
+			array('(((((((({host:key.str("")})))))))) + + (((((((({host:key.str("")}))))))))', null, false),
+			array('(((((((({host:key.str("")})))))))) + - (((((((({host:key.str("")}))))))))', null, true),
+			array('(((((((({host:key.str("")})))))))) + (((((((({host:key.str("")}))))))))', null, true),
+			array('(((((((({host:key.str("")}))))))))', null, true),
+			array('(--((((((({host:key.str("")}))))))))', null, false),
+			array('(+((((((({host:key.str("")}))))))))', null, false),
+			array('(/((((((({host:key.str("")}))))))))', null, false),
+			array('((((((({host:key.str("")})))))))/((((((({host:key.str("")})))))))', null, true),
+			array('((((((({host:key.str("")})))))))-((((((({host:key.str("")})))))))', null, true),
+			array('((((((({host:key.str("")})))))))+((((((({host:key.str("")})))))))', null, true),
+			array('((((((({host:key.str("")})))))))or((((((({host:key.str("")})))))))', null, true),
+			array('((((((({host:key.str("")})))))))and((((((({host:key.str("")})))))))', null, true),
+			array(
+				'((((((({host:key.str("")})))))))and((((((({host:key.str("")})))))))/((((((({host:key.str("")})))))))',
+				null,
+				true
+			),
+			array(
+				'((((((({host:key.str("")})))))))+((((((({host:key.str("")})))))))/((((((({host:key.str("")})))))))',
+				null,
+				true
+			),
+			array(
+				'1 - (1/((((((({host:key.str("")}))))))))+(((((((({host:key.str("")}))))))))/((((((({host:key.str("'.
+					'")})))))))/((((((({host:key.str("")})))))))',
+				null,
+				true
+			),
+			array(
+				'((1 - 1-2-((((((({host:key.str("0")}))))))))) + + ((1 - 1-2-((((((({host:key.str("0")})))))))))',
+				null,
+				false
+			),
+			array(
+				'((1 - 1-2-((((((({host:key.str("0")}))))))))) + - ((1 - 1-2-((((((({host:key.str("0")})))))))))',
+				null,
+				true
+			),
+			array(
+				'((1 - 1-2-((((((({host:key.str("0")}))))))))) + ((1 - 1-2-((((((({host:key.str("0")})))))))))',
+				null,
+				true
+			),
+			array('((1 - 1-2-((((((({host:key.str("0")})))))))))', null, true),
+			array('(--(1 - 1-2-((((((({host:key.str("0")})))))))))', null, false),
+			array('(+(1 - 1-2-((((((({host:key.str("0")})))))))))', null, false),
+			array('(/(1 - 1-2-((((((({host:key.str("0")})))))))))', null, false),
+			array('(1 - 1-2-((((((({host:key.str("0")}))))))))/(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
+			array('(1 - 1-2-((((((({host:key.str("0")}))))))))-(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
+			array('(1 - 1-2-((((((({host:key.str("0")}))))))))+(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
+			array('(1 - 1-2-((((((({host:key.str("0")}))))))))or(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
+			array('(1 - 1-2-((((((({host:key.str("0")}))))))))and(1 - 1-2-((((((({host:key.str("0")}))))))))', null, true),
+			array(
+				'(1 - 1-2-((((((({host:key.str("0")}))))))))and(1 - 1-2-((((((({host:key.str("0")}))))))))/'.
+					'(1 - 1-2-((((((({host:key.str("0")}))))))))',
+				null,
+				true
+			),
+			array(
+				'(1 - 1-2-((((((({host:key.str("0")}))))))))+(1 - 1-2-((((((({host:key.str("0")}))))))))/'.
+					'(1 - 1-2-((((((({host:key.str("0")}))))))))',
+				null,
+				true
+			),
+			array(
+				'1 - (1/(1 - 1-2-((((((({host:key.str("0")})))))))))+((1 - 1-2-((((((({host:key.str("0")})))))))))'.
+					'/(1 - 1-2-((((((({host:key.str("0")}))))))))/(1 - 1-2-((((((({host:key.str("0")}))))))))',
+				null,
+				true
+			),
+			array('{host:log[/data/logs/test.log,incorrect:FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect^FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect/FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect*FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect+FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect-FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect&FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect|FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,(incorrect|FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect|FAIL)].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,(incorrect|FAIL)].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,{incorrect|FAIL].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,incorrect|FAIL}].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,{incorrect|FAIL}].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,text1(incorrect|FAILtext2].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,text1incorrect|FAIL)text2].last(0)}', null, true),
+			array('{host:log[/data/logs/test.log,text1(incorrect|FAIL)text2].last(0)}', null, true),
+			array(
+				'{Template_App_CCWS:web.page.regexp[0.0.0.0,/ws-callcontrol-1.1/test,{$CCWS_PORT},"[Ss]moke [Tt]est '.
+					'= ([Ss]uccess|[Ww]arning|[Ff]ail).*([[:space:]].*)+"].count(#1,event service = failed)}=1',
+				null,
+				true
+			),
+			array('{host:key.str({$M})} or {host:key.str({$M})} or {$M} + {TRIGGER.VALUE}', null, true),
+			array('{$M} or {host:key.str({$M})}', null, true),
+			array('({$M} + 5) or {host:key.str({$M})}', null, true),
+			array(
+				'{hostA:keyA[1,2,3].str("abc",123)}*{hostB:keyB.last(123,"abc","def")}/{host:key["param","abc"].'.
+					'last(1,2,3,4,5)}+{host:key.diff()}+{TRIGGER.VALUE}/{$M}-{$M1234}*{$CUSTOM}-{TRIGGER.VALUE}',
+				array(
+					'error' => '',
+					'expressions' => array(
+						0 => array(
+							'expression' => '{hostA:keyA[1,2,3].str("abc",123)}',
+							'pos'=> 0,
+							'host' => 'hostA',
+							'item' => 'keyA[1,2,3]',
+							'function' => 'str("abc",123)',
+							'functionName' => 'str',
+							'functionParam' => '"abc",123',
+							'functionParamList' => array('abc', 123)
+						),
+						1 => array(
+							'expression' => '{hostB:keyB.last(123,"abc","def")}',
+							'pos'=> 35,
+							'host' => 'hostB',
+							'item' => 'keyB',
+							'function' => 'last(123,"abc","def")',
+							'functionName' => 'last',
+							'functionParam' => '123,"abc","def"',
+							'functionParamList' => array(123, 'abc', 'def')
+						),
+						2 => array(
+							'expression' => '{host:key["param","abc"].last(1,2,3,4,5)}',
+							'pos'=> 70,
+							'host' => 'host',
+							'item' => 'key["param","abc"]',
+							'function' => 'last(1,2,3,4,5)',
+							'functionName' => 'last',
+							'functionParam' => '1,2,3,4,5',
+							'functionParamList' => array(1, 2, 3, 4, 5)
+						),
+						3 => array(
+							'expression' => '{host:key.diff()}',
+							'pos'=> 112,
+							'host' => 'host',
+							'item' => 'key',
+							'function' => 'diff()',
+							'functionName' => 'diff',
+							'functionParam' => '',
+							'functionParamList' => array('')
+						)
+					)
+				),
+				true
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VALUE}+{$M}',
+				null,
+				true
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VALUE}+{$M',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VALUE}+{$',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3or4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VALUE}+{',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VALUE}+',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VALUE}',
+				null,
+				true
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VALUE',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VALU',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VAL',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.VA',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.V',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER.',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGER',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGGE',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIGG',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRIG',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TRI',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{TR',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{T',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+{',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)'.
+					'+',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1)',
+				null,
+				true
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-1',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(-',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-(',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+-',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)+',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5)',
+				null,
+				true
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-5',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4-',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(4',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+(',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)+',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3)',
+				null,
+				true
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(3',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -(',
+				null,
+				false
+			),
+			array(
+				'{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and -',
+				null,
+				false
+			),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and ', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m and', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m an', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m a', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m ', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9m', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=9', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8=', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>8', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<>', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7<', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<7', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6<', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>6', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5>', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and 5', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and ', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 and', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 an', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 a', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4 ', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or 4', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or ', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 or', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 o', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3 ', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+3', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2+', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-2', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1-', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/1', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0/', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*0', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}*', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )}', null, true),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" )', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"" ', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\""', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\"', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4\\', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p4', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "p', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", "', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3", ', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3",', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3"', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p3', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"p', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,"', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ,', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2 ', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p2', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, p', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1, ', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1,', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p1', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(p', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func(', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].func', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].fun', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].fu', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].f', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ].', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ]', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"" ', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\""', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\"', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4\\', null, false),
+			array('{host:key[p1, p2 ,"p3", "p4', null, false),
+			array('{host:key[p1, p2 ,"p3", "p', null, false),
+			array('{host:key[p1, p2 ,"p3", "', null, false),
+			array('{host:key[p1, p2 ,"p3", ', null, false),
+			array('{host:key[p1, p2 ,"p3",', null, false),
+			array('{host:key[p1, p2 ,"p3"', null, false),
+			array('{host:key[p1, p2 ,"p3', null, false),
+			array('{host:key[p1, p2 ,"p', null, false),
+			array('{host:key[p1, p2 ,"', null, false),
+			array('{host:key[p1, p2 ,', null, false),
+			array('{host:key[p1, p2 ', null, false),
+			array('{host:key[p1, p2', null, false),
+			array('{host:key[p1, p', null, false),
+			array('{host:key[p1, ', null, false),
+			array('{host:key[p1,', null, false),
+			array('{host:key[p1', null, false),
+			array('{host:key[p', null, false),
+			array('{host:key[', null, false),
+			array('{host:key', null, false),
+			array('{host:ke', null, false),
+			array('{host:k', null, false),
+			array('{host:', null, false),
+			array('{host', null, false),
+			array('{hos', null, false),
+			array('{ho', null, false),
+			array('{h', null, false),
+			array('{', null, false),
+
+			// new lines and tabs
+			array("\r{host:key.last(1)}+1", null, true),
+			array("\n{host:key.last(1)}+1", null, true),
+			array("\r\n{host:key.last(1)}+1", null, true),
+			array("\t{host:key.last(1)}+1", null, true),
+
+			array("{\rhost:key.last(1)}+1", null, false),
+			array("{\nhost:key.last(1)}+1", null, false),
+			array("{\r\nhost:key.last(1)}+1", null, false),
+			array("{\thost:key.last(1)}+1", null, false),
+
+			array("{host\r:key.last(1)}+1", null, false),
+			array("{host\n:key.last(1)}+1", null, false),
+			array("{host\r\n:key.last(1)}+1", null, false),
+			array("{host\t:key.last(1)}+1", null, false),
+
+			array("{host:\rkey.last(1)}+1", null, false),
+			array("{host:\nkey.last(1)}+1", null, false),
+			array("{host:\r\nkey.last(1)}+1", null, false),
+			array("{host:\tkey.last(1)}+1", null, false),
+
+			array("{host:key\r.last(1)}+1", null, false),
+			array("{host:key\n.last(1)}+1", null, false),
+			array("{host:key\r\n.last(1)}+1", null, false),
+			array("{host:key\t.last(1)}+1", null, false),
+
+			array("{host:key.\rlast(1)}+1", null, false),
+			array("{host:key.\nlast(1)}+1", null, false),
+			array("{host:key.\r\nlast(1)}+1", null, false),
+			array("{host:key.\tlast(1)}+1", null, false),
+
+			array("{host:key.last\r(1)}+1", null, false),
+			array("{host:key.last\n(1)}+1", null, false),
+			array("{host:key.last\r\n(1)}+1", null, false),
+			array("{host:key.last\t(1)}+1", null, false),
+
+			array("{host:key.last(1)\r}+1", null, false),
+			array("{host:key.last(1)\n}+1", null, false),
+			array("{host:key.last(1)\r\n}+1", null, false),
+			array("{host:key.last(1)\t}+1", null, false),
+
+			array("{host:key.last(1)}\r+1", null, true),
+			array("{host:key.last(1)}\n+1", null, true),
+			array("{host:key.last(1)}\r\n+1", null, true),
+			array("{host:key.last(1)}\t+1", null, true),
+
+			array("{host:key.last(1)}+\r1", null, true),
+			array("{host:key.last(1)}+\n1", null, true),
+			array("{host:key.last(1)}+\r\n1", null, true),
+			array("{host:key.last(1)}+\t1", null, true),
+
+			array("{host:key.last(1)}+1\r", null, true),
+			array("{host:key.last(1)}+1\n", null, true),
+			array("{host:key.last(1)}+1\r\n", null, true),
+			array("{host:key.last(1)}+1\t", null, true),
+
+			array("{host:key.last(1)}\r\r+\r\r1", null, true),
+			array("{host:key.last(1)}\n\n+\n\n1", null, true),
+			array("{host:key.last(1)}\r\n\r\n+\r\n\r\n1", null, true),
+			array("{host:key.last(1)}\t\t+\t\t1", null, true),
+
+			array("{host:key.last(1)}\r\t+\r\t1", null, true),
+			array("{host:key.last(1)}\n\t+\n\t1", null, true),
+			array("{host:key.last(1)}\r\n\t+\r\n\t1", null, true),
+			array("{host:key.last(1)}\t\t+\t\t1", null, true),
+
+			array("(\r{host:key.last(1)}+1) or 1", null, true),
+			array("(\n{host:key.last(1)}+1) or 1", null, true),
+			array("(\r\n{host:key.last(1)}+1) or 1", null, true),
+			array("(\t{host:key.last(1)}+1) or 1", null, true),
+
+			array("({host:key.last(1)}+1\r) or 1", null, true),
+			array("({host:key.last(1)}+1\n) or 1", null, true),
+			array("({host:key.last(1)}+1\r\n) or 1", null, true),
+			array("({host:key.last(1)}+1\t) or 1", null, true),
+			array("({host:key.last(1)}+1\t) or 1", null, true),
+
+			array("{host:key.last(1)}\ror not 1", null, true),
+			array("{host:key.last(1)}\nor not 1", null, true),
+			array("{host:key.last(1)}\r\nor not 1", null, true),
+			array("{host:key.last(1)}\tor not 1", null, true),
+
+			array("{host:key.last(1)} or\rnot 1", null, true),
+			array("{host:key.last(1)} or\nnot 1", null, true),
+			array("{host:key.last(1)} or\r\nnot 1", null, true),
+			array("{host:key.last(1)} or\tnot 1", null, true),
+
+			array("{host:key.last(1)}\rand not 1", null, true),
+			array("{host:key.last(1)}\nand not 1", null, true),
+			array("{host:key.last(1)}\r\nand not 1", null, true),
+			array("{host:key.last(1)}\tand not 1", null, true),
+
+			array("{host:key.last(1)} and\rnot 1", null, true),
+			array("{host:key.last(1)} and\nnot 1", null, true),
+			array("{host:key.last(1)} and\r\nnot 1", null, true),
+			array("{host:key.last(1)} and\tnot 1", null, true),
+
+			array("{host:key.last(1)} and not\r1", null, true),
+			array("{host:key.last(1)} and not\n1", null, true),
+			array("{host:key.last(1)} and not\r\n1", null, true),
+			array("{host:key.last(1)} and not\t1", null, true),
+
+			array("{host:key.count(1,\"\"\r)}=0", null, false),
+			array("{host:key.count(1,\"\"\n)}=0", null, false),
+			array("{host:key.count(1,\"\"\r\n)}=0", null, false),
+			array("{host:key.count(1,\"\"\t)}=0", null, false),
+
+			array("{host:key.count(1,\"\r\")}=0", null, true),
+			array("{host:key.count(1,\"\n\")}=0", null, true),
+			array("{host:key.count(1,\"\r\n\")}=0", null, true),
+			array("{host:key.count(1,\"\t\")}=0", null, true),
+
+			array("{host:key.count(1,\r\"\")}=0", null, true),
+			array("{host:key.count(1,\n\"\")}=0", null, true),
+			array("{host:key.count(1,\r\n\"\")}=0", null, true),
+			array("{host:key.count(1,\t\"\")}=0", null, true),
+
+			array("{host:key.count(1\r,\"\")}=0", null, true),
+			array("{host:key.count(1\n,\"\")}=0", null, true),
+			array("{host:key.count(1\r\n,\"\")}=0", null, true),
+			array("{host:key.count(1\t,\"\")}=0", null, true),
+
+			array("{host:key.count(\r1,\"\")}=0", null, true),
+			array("{host:key.count(\n1,\"\")}=0", null, true),
+			array("{host:key.count(\r\n1,\"\")}=0", null, true),
+			array("{host:key.count(\t1,\"\")}=0", null, true),
+		);
+	}
+
+	/**
+	 * @dataProvider provider
+	 */
+	public function test_parse($expression, $result, $rc) {
+		$expressionData = new CTriggerExpression();
+
+		if ($expressionData->parse($expression)) {
+			$this->assertEquals($rc, true);
+			$this->assertEquals($rc, $expressionData->isValid);
+
+			if (isset($result)) {
+				$this->assertEquals($result['error'], $expressionData->error);
+				$this->assertEquals($result['expressions'], $expressionData->expressions);
+			}
+		}
+		else {
+			$this->assertEquals($rc, false, "\nError with expression $expression: ".$expressionData->error);
+		}
+	}
+
+
+	public function testTokens() {
+		$exp = '((-12 + {host:item.str(ГУГЛ)} or {$USERMACRO} and not {TRIGGER.VALUE} or {#LLD} or 10m))';
+		$tokens = array(
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPEN_BRACE,
+				'value' => '(',
+				'data' => null,
+				'pos' => 0,
+				'length' => 1
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPEN_BRACE,
+				'value' => '(',
+				'data' => null,
+				'pos' => 1,
+				'length' => 1
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+				'value' => '-',
+				'data' => null,
+				'pos' => 2,
+				'length' => 1
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_NUMBER,
+				'value' => '12',
+				'pos' => 3,
+				'length' => 2,
+				'data' => array(
+					'suffix' => null
+				)
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+				'value' => '+',
+				'data' => null,
+				'pos' => 6,
+				'length' => 1
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_FUNCTION_MACRO,
+				'value' => '{host:item.str(ГУГЛ)}',
+				'pos' => 8,
+				'length' => 25,
+				'data' => array(
+					'host' => 'host',
+					'item' => 'item',
+					'function' => 'str(ГУГЛ)',
+					'functionName' => 'str',
+					'functionParams' => array('ГУГЛ')
+				),
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+				'value' => 'or',
+				'data' => null,
+				'pos' => 34,
+				'length' => 2
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_USER_MACRO,
+				'value' => '{$USERMACRO}',
+				'data' => null,
+				'pos' => 37,
+				'length' => 12
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+				'value' => 'and',
+				'data' => null,
+				'pos' => 50,
+				'length' => 3
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+				'value' => 'not',
+				'data' => null,
+				'pos' => 54,
+				'length' => 3
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_MACRO,
+				'value' => '{TRIGGER.VALUE}',
+				'data' => null,
+				'pos' => 58,
+				'length' => 15
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+				'value' => 'or',
+				'data' => null,
+				'pos' => 74,
+				'length' => 2
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_LLD_MACRO,
+				'value' => '{#LLD}',
+				'data' => null,
+				'pos' => 77,
+				'length' => 6
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_OPERATOR,
+				'value' => 'or',
+				'data' => null,
+				'pos' => 84,
+				'length' => 2
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_NUMBER,
+				'value' => '10m',
+				'pos' => 87,
+				'length' => 3,
+				'data' => array(
+					'suffix' => 'm'
+				)
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_CLOSE_BRACE,
+				'value' => ')',
+				'data' => null,
+				'pos' => 90,
+				'length' => 1
+			),
+			array(
+				'type' => CTriggerExpressionParserResult::TOKEN_TYPE_CLOSE_BRACE,
+				'value' => ')',
+				'data' => null,
+				'pos' => 91,
+				'length' => 1
+			),
+		);
+
+		$parser = new CTriggerExpression();
+		$result = $parser->parse($exp);
+		$this->assertTrue($result instanceof CTriggerExpressionParserResult);
+		$this->assertEquals($tokens, $result->getTokens());
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php b/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php
new file mode 100644
index 00000000000..d73d1a3ddfa
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php
@@ -0,0 +1,137 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CServicesSlaCalculatorTest extends PHPUnit_Framework_TestCase {
+
+	protected $defaultTimezone;
+
+	public function setUp() {
+		$this->defaultTimezone = date_default_timezone_get();
+		date_default_timezone_set('Europe/Riga');
+	}
+
+	public function testCalculateSlaProvider() {
+		return array(
+			array(
+				array(
+					array(
+						'clock' => strtotime('30 March 2014 3:00'),
+						'value' => 3
+					),
+					array(
+						'clock' => strtotime('30 March 2014 6:00'),
+						'value' => 0
+					),
+				),
+				array(
+					// downtime during DST
+					array(
+						'type' => SERVICE_TIME_TYPE_DOWNTIME,
+						'ts_from' => 10800,
+						'ts_to' => 18000
+					)
+				),
+				strtotime('30 March 2014 0:00'),
+				strtotime('30 March 2014 24:00'),
+				0,
+				array(
+					'dt' => array(
+						'problemTime' => 3600,
+						'okTime' => 0
+					),
+					'ut' => array(
+						'problemTime' => 3600,
+						'okTime' => 75600
+					),
+					'problemTime' => 3600,
+					'okTime' => 75600,
+					'downtimeTime' => 3600,
+					'problem' => 4.5454545454545,
+					'ok' => 95.454545454545
+				)
+			),
+			array(
+				array(
+					array(
+						'clock' => strtotime('30 March 2014 3:00'),
+						'value' => 3
+					),
+					array(
+						'clock' => strtotime('30 March 2014 6:00'),
+						'value' => 0
+					),
+				),
+				array(
+					// downtime during DST
+					array(
+						'type' => SERVICE_TIME_TYPE_DOWNTIME,
+						'ts_from' => 10800,
+						'ts_to' => 18000
+					)
+				),
+				strtotime('1 March 2014 0:00'),
+				strtotime('30 March 2014 24:00'),
+				0,
+				array(
+					'dt' => array(
+						'problemTime' => 3600,
+						'okTime' => 28800
+					),
+					'ut' => array(
+						'problemTime' => 3600,
+						'okTime' => 2552400
+					),
+					'problemTime' => 3600,
+					'okTime' => 2552400,
+					'downtimeTime' => 32400,
+					'problem' => 0.14084507042254,
+					'ok' => 99.859154929577
+				)
+			)
+		);
+	}
+
+	/**
+	 * @dataProvider testCalculateSlaProvider
+	 *
+	 * @param array $alarms
+	 * @param array $times
+	 * @param $periodStart
+	 * @param $periodEnd
+	 * @param $prevValue
+	 * @param array $expectedResult
+	 */
+	public function testCalculateSla(array $alarms, array $times, $periodStart, $periodEnd, $prevValue, array $expectedResult) {
+		$slaCalculator = new CServicesSlaCalculator();
+		$result = $slaCalculator->calculateSla($alarms, $times, $periodStart, $periodEnd, $prevValue);
+
+		$this->assertEquals($expectedResult, $result);
+
+		// too little test cases
+		$this->markTestIncomplete();
+	}
+
+	public function tearDown() {
+		date_default_timezone_set($this->defaultTimezone);
+	}
+
+
+}
diff --git a/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php b/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php
new file mode 100644
index 00000000000..c5ee177be08
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php
@@ -0,0 +1,548 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CTextTriggerConstructorTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var CTextTriggerConstructor
+	 */
+	protected $constructor;
+
+	public function setUp() {
+		$this->constructor = new CTextTriggerConstructor(new CTriggerExpression());
+	}
+
+	public function testGetExpressionFromPartsValidProvider() {
+		return array(
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'regexp(test)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				),
+				'(({host:item.regexp(test)})<>0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'regexp(test)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				),
+				'(({host:item.regexp(test)})=0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'regexp(a) and regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				),
+				'(({host:item.regexp(a)})<>0 and ({host:item.regexp(b)})<>0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'regexp(a) or regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				),
+				'(({host:item.regexp(a)})<>0 or ({host:item.regexp(b)})<>0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					),
+					array(
+						'value' => 'regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					),
+				),
+				'((({host:item.regexp(a)})<>0) or (({host:item.regexp(b)})<>0))'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				),
+				'(({host:item.regexp(a)})=0) and (({host:item.regexp(b)})=0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'regexp(a) and regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					),
+					array(
+						'value' => 'regexp(с) or regexp(d)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					),
+				),
+				'((({host:item.regexp(a)})<>0 and ({host:item.regexp(b)})<>0) or (({host:item.regexp(с)})<>0 or ({host:item.regexp(d)})<>0))'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'regexp(a) and regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(c) or regexp(d)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				),
+				'(({host:item.regexp(a)})=0 and ({host:item.regexp(b)})=0) and (({host:item.regexp(c)})=0 or ({host:item.regexp(d)})=0)'
+			),
+
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'iregexp(test)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				),
+				'(({host:item.iregexp(test)})<>0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'iregexp(test)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				),
+				'(({host:item.iregexp(test)})=0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => '(regexp(a))>0',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				),
+				'(({host:item.regexp(a)})=0)'
+			),
+
+			// "not" cases
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'not regexp(test)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				),
+				'((not {host:item.regexp(test)})=0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'not (regexp(test))',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				),
+				'((not {host:item.regexp(test)})=0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'not regexp(a) and not regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				),
+				'((not {host:item.regexp(a)})<>0 and (not {host:item.regexp(b)})<>0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'not regexp(a) or not regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				),
+				'((not {host:item.regexp(a)})<>0 or (not {host:item.regexp(b)})<>0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => 'not regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					),
+					array(
+						'value' => 'not regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					),
+				),
+				'(((not {host:item.regexp(a)})<>0) or ((not {host:item.regexp(b)})<>0))'
+			),
+
+			// "-" cases
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => '- regexp(test)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				),
+				'((-{host:item.regexp(test)})=0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => '- (regexp(test))',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				),
+				'((-{host:item.regexp(test)})=0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => '- regexp(a) and - regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				),
+				'((-{host:item.regexp(a)})<>0 and (-{host:item.regexp(b)})<>0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => '- regexp(a) or - regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				),
+				'((-{host:item.regexp(a)})<>0 or (-{host:item.regexp(b)})<>0)'
+			),
+			array(
+				'host',
+				'item',
+				array(
+					array(
+						'value' => '- regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					),
+					array(
+						'value' => '- regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					),
+				),
+				'(((-{host:item.regexp(a)})<>0) or ((-{host:item.regexp(b)})<>0))'
+			),
+		);
+	}
+
+	/**
+	 * Test calling getExpressionFromParts() with valid parameters.
+	 *
+	 * @dataProvider testGetExpressionFromPartsValidProvider
+	 *
+	 * @param $host
+	 * @param $item
+	 * @param array $expressions
+	 * @param $expectedExpressions
+	 */
+	public function testGetExpressionFromPartsValid($host, $item, array $expressions, $expectedExpressions) {
+		$expression = $this->constructor->getExpressionFromParts($host, $item, $expressions);
+
+		$this->assertEquals($expectedExpressions, $expression);
+	}
+
+	/**
+	 * Test calling getExpressionFromParts() with invalid parameters.
+	 */
+	public function testGetExpressionFromPartsInvalid() {
+		$this->markTestIncomplete();
+	}
+
+	public function testGetPartsFromExpressionProvider() {
+		return array(
+			array(
+				'({Zabbix server:system.hostname.regexp(a)})=0',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'({Zabbix server:system.hostname.regexp(a)})<>0',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_MATCH
+					)
+				)
+			),
+			array(
+				'(({Zabbix server:system.hostname.regexp(a)})=0)',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'({Zabbix server:system.hostname.regexp(a)})=0 and ({Zabbix server:system.hostname.regexp(b)})=0',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				)
+			),
+			array(
+				'({Zabbix server:system.hostname.regexp(a)})=0 or ({Zabbix server:system.hostname.regexp(b)})=0',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				)
+			),
+			array(
+				'(({Zabbix server:system.hostname.regexp(a)})=0 or ({Zabbix server:system.hostname.regexp(b)})=0) and ({Zabbix server:system.hostname.regexp(c)})=0',
+				array(
+					array(
+						'value' => 'regexp(a) or regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(c)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				)
+			),
+			array(
+				'({Zabbix server:system.hostname.regexp(a)})=0 or (({Zabbix server:system.hostname.regexp(b)})=0 and ({Zabbix server:system.hostname.regexp(c)})=0)',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(b) and regexp(c)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				)
+			),
+			array(
+				'({Zabbix server:system.hostname.regexp(a)})=0 or ({Zabbix server:system.hostname.regexp(b)})=0 and ({Zabbix server:system.hostname.regexp(c)})=0',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(c)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				)
+			),
+			array(
+				'(({Zabbix server:system.hostname.regexp(a)})=0 and ({Zabbix server:system.hostname.regexp(b)})=0) or (({Zabbix server:system.hostname.regexp(c)})=0 or ({Zabbix server:system.hostname.regexp(d)})=0)',
+				array(
+					array(
+						'value' => 'regexp(a) and regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(c) or regexp(d)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				)
+			),
+			array(
+				'((({Zabbix server:system.hostname.regexp(a)})=0) or (({Zabbix server:system.hostname.regexp(b)})=0)) and (({Zabbix server:system.hostname.regexp(c)})=0)',
+				array(
+					array(
+						'value' => 'regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(b)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+					array(
+						'value' => 'regexp(c)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					),
+				)
+			),
+
+			// "not" cases
+			array(
+				'(not {Zabbix server:system.hostname.regexp(a)})=0',
+				array(
+					array(
+						'value' => 'not regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'(not ({Zabbix server:system.hostname.regexp(a)})=0)',
+				array(
+					array(
+						'value' => 'not regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'not (({Zabbix server:system.hostname.regexp(a)})=0)',
+				array(
+					array(
+						'value' => 'not (regexp(a))',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+
+			// "-" cases
+			array(
+				'(-{Zabbix server:system.hostname.regexp(a)})=0',
+				array(
+					array(
+						'value' => '-regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'(-({Zabbix server:system.hostname.regexp(a)})=0)',
+				array(
+					array(
+						'value' => '-regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'-(({Zabbix server:system.hostname.regexp(a)})=0)',
+				array(
+					array(
+						'value' => '-(regexp(a))',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'(- {Zabbix server:system.hostname.regexp(a)})=0',
+				array(
+					array(
+						'value' => '-regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'(- ({Zabbix server:system.hostname.regexp(a)})=0)',
+				array(
+					array(
+						'value' => '-regexp(a)',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+			array(
+				'- (({Zabbix server:system.hostname.regexp(a)})=0)',
+				array(
+					array(
+						'value' => '-(regexp(a))',
+						'type' => CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH
+					)
+				)
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider testGetPartsFromExpressionProvider
+	 *
+	 * @param $expression
+	 * @param array $expectedParts
+	 */
+	public function testGetPartsFromExpression($expression, array $expectedParts) {
+		$parts = $this->constructor->getPartsFromExpression($expression);
+
+		$this->assertEquals($expectedParts, $parts);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php
new file mode 100644
index 00000000000..cfa7a912a87
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php
@@ -0,0 +1,408 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CActionCondValidatorTest extends CValidatorTest {
+
+	public function validParamProvider() {
+		return array(
+			array(array())
+		);
+	}
+
+	public function validValuesProvider()
+	{
+		return array(
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_HOST_GROUP,
+				'value' => 1,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_TEMPLATE,
+				'value' => 1,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_TRIGGER,
+				'value' => 1,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_HOST,
+				'value' => 1,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DRULE,
+				'value' => 1,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DCHECK,
+				'value' => 1,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_PROXY,
+				'value' => 1,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DOBJECT,
+				'value' => EVENT_OBJECT_DHOST,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DOBJECT,
+				'value' => EVENT_OBJECT_DSERVICE,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_TIME_PERIOD,
+				'value' => '5-7,00:00-09:00;1,10:00-20:00;',
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DHOST_IP,
+				'value' => '192.168.0.0/24'
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DSERVICE_TYPE,
+				'value' => SVC_SSH,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DSERVICE_PORT,
+				'value' => '100-200',
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DSTATUS,
+				'value' => DOBJECT_STATUS_UP,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_MAINTENANCE,
+				'value' => null,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_TRIGGER_SEVERITY,
+				'value' => TRIGGER_SEVERITY_NOT_CLASSIFIED,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_TRIGGER_VALUE,
+				'value' => TRIGGER_VALUE_TRUE,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_EVENT_TYPE,
+				'value' => EVENT_TYPE_ITEM_NORMAL,
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_TRIGGER_NAME,
+				'value' => 'abc',
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DUPTIME,
+				'value' => 'abc',
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_DVALUE,
+				'value' => 'abc',
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_APPLICATION,
+				'value' => 'abc',
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_HOST_NAME,
+				'value' => 'abc',
+			)),
+			array(array(), array(
+				'conditiontype' => CONDITION_TYPE_HOST_METADATA,
+				'value' => 'abc',
+			))
+		);
+	}
+
+	public function invalidValuesProvider()
+	{
+		return array(
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_HOST_GROUP,
+					'value' => ''
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TEMPLATE,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TRIGGER,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_HOST,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DRULE,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DCHECK,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_PROXY,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DOBJECT,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DOBJECT,
+					'value' => 100,
+				),
+				'Incorrect action condition discovery object.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TIME_PERIOD,
+					'value' => '',
+				),
+				'Empty time period.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TIME_PERIOD,
+					'value' => 'QQQQQQ',
+				),
+				'Incorrect time period "QQQQQQ".'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DHOST_IP,
+					'value' => ''
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DHOST_IP,
+					'value' => '192.168.443.0/432'
+				),
+				'Incorrect action condition ip "192.168.443.0/432".'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DSERVICE_TYPE,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DSERVICE_TYPE,
+					'value' => 100,
+				),
+				'Incorrect action condition discovery check.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DSERVICE_PORT,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DSERVICE_PORT,
+					'value' => '3mdn-jiwiw',
+				),
+				'Incorrect action condition port "3mdn-jiwiw".'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DSTATUS,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DSTATUS,
+					'value' => 100,
+				),
+				'Incorrect action condition discovery status.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_MAINTENANCE,
+					'value' => 123,
+				),
+				'Maintenance action condition value must be empty.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TRIGGER_SEVERITY,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TRIGGER_SEVERITY,
+					'value' => 100,
+				),
+				'Incorrect action condition trigger severity.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TRIGGER_VALUE,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TRIGGER_VALUE,
+					'value' => 100,
+				),
+				'Incorrect action condition trigger value.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_EVENT_TYPE,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_EVENT_TYPE,
+					'value' => 100,
+				),
+				'Incorrect action condition event type.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_TRIGGER_NAME,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DUPTIME,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_DVALUE,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_APPLICATION,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_HOST_NAME,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			array(array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_HOST_METADATA,
+					'value' => '',
+				),
+				'Empty action condition.'
+			),
+			// invalid condition type
+			array(array(),
+				array(
+					'conditiontype' => 9999,
+					'value' => '',
+				),
+				'Incorrect action condition type.'
+			)
+		);
+
+	}
+
+	/**
+	 * Test that a correct error message is generated when setting an object name.
+	 *
+	 * @dataProvider invalidValuesWithObjectsProvider()
+	 *
+	 * @param array 	$params
+	 * @param mixed 	$value
+	 * @param string 	$expectedError
+	 */
+	public function testValidateInvalidWithObject(array $params, $value, $expectedError) {
+		// We have no tests because messages in this validator are hardcoded for now.
+		$this->markTestIncomplete();
+	}
+
+	public function invalidValuesWithObjectsProvider() {
+		return array(
+			array(
+				array(),
+				array(
+					'conditiontype' => CONDITION_TYPE_HOST_GROUP,
+					'value' => ''
+				),
+				'Empty action condition.'
+			)
+		);
+	}
+
+	/**
+	 * Create and return a validator object using the given params.
+	 *
+	 * @param array $params
+	 *
+	 * @return CValidator
+	 */
+	protected function createValidator(array $params = array()) {
+		return new CActionCondValidator($params);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php
index 8c6415e863b..9e1667721ae 100644
--- a/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php
+++ b/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php
@@ -27,8 +27,8 @@ class CCollectionValidatorTest extends CValidatorTest {
 				'empty' => true,
 				'uniqueField' => 'field',
 				'uniqueField2' => 'field',
-				'messageEmpty' => 'Empty collection',
 				'messageInvalid' => 'Not an array',
+				'messageEmpty' => 'Empty collection',
 				'messageDuplicate' => 'Collection has duplicate values',
 			))
 		);
@@ -61,6 +61,14 @@ class CCollectionValidatorTest extends CValidatorTest {
 					array('type' => 2, 'subtype' => 2),
 				)
 			),
+			array(
+				array('uniqueField' => 'type', 'uniqueField2' => null),
+				array(
+					array('type' => 1),
+					array('type' => 2),
+					array('type' => 3)
+				)
+			)
 		);
 	}
 
@@ -96,14 +104,15 @@ class CCollectionValidatorTest extends CValidatorTest {
 				'Duplicate type "1"'
 			),
 			array(
-				array('uniqueField' => 'type', 'messageDuplicate' => 'Duplicate type "%1$s" and subtype "%2$s"'),
+				array('uniqueField' => 'type', 'uniqueField2' => 'subtype',
+					'messageDuplicate' => 'Duplicate type "%1$s" and subtype "%2$s"'),
 				array(
 					array('type' => 1, 'subtype' => 1),
 					array('type' => 1, 'subtype' => 2),
 					array('type' => 2, 'subtype' => 2),
 					array('type' => 2, 'subtype' => 2),
 				),
-				'Duplicate type "1" and subtype "2"'
+				'Duplicate type "2" and subtype "2"'
 			),
 		);
 	}
@@ -111,7 +120,7 @@ class CCollectionValidatorTest extends CValidatorTest {
 	public function invalidValuesWithObjectsProvider() {
 		return array(
 			array(
-				array('messageInvalid' => 'Not an array for "%1$s"'),
+			array('messageInvalid' => 'Not an array for "%1$s"'),
 				'',
 				'Not an array for "object"'
 			),
@@ -140,14 +149,15 @@ class CCollectionValidatorTest extends CValidatorTest {
 				'Duplicate type "1" for "object"'
 			),
 			array(
-				array('uniqueField' => 'type', 'messageDuplicate' => 'Duplicate type "%2$s" and subtype "%3$s" for "%1$s"'),
+				array('uniqueField' => 'type', 'uniqueField2' => 'subtype',
+					'messageDuplicate' => 'Duplicate type "%2$s" and subtype "%3$s" for "%1$s"'),
 				array(
 					array('type' => 1, 'subtype' => 1),
 					array('type' => 1, 'subtype' => 2),
 					array('type' => 2, 'subtype' => 2),
 					array('type' => 2, 'subtype' => 2),
 				),
-				'Duplicate type "1" and subtype "2" for "object"'
+				'Duplicate type "2" and subtype "2" for "object"'
 			),
 		);
 	}
diff --git a/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php
index cdccccd8e09..c6017c51d9d 100644
--- a/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php
+++ b/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php
@@ -25,6 +25,7 @@ class CColorValidatorTest extends CValidatorTest {
 		return array(
 			array(array(
 				'empty' => true,
+				'messageInvalid' => 'Not a string',
 				'messageEmpty' => 'Empty color',
 				'messageRegex' => 'Incorrect color'
 			))
diff --git a/frontends/php/tests/unit/include/classes/validators/CDecimalValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CDecimalValidatorTest.php
new file mode 100644
index 00000000000..ad7b1e8176d
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/validators/CDecimalValidatorTest.php
@@ -0,0 +1,182 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CDecimalValidatorTest extends CValidatorTest {
+
+	public function validParamProvider() {
+		return array(
+			array(array(
+				'maxPrecision' => 3,
+				'maxScale' => 2,
+				'messageInvalid' => 'Invalid decimal',
+				'messagePrecision' => 'Value too long',
+				'messageNatural' => 'To many digits before the decimal point',
+				'messageScale' => 'To many digits after the decimal point'
+			))
+		);
+	}
+
+	public function validValuesProvider() {
+		return array(
+			array(array('maxPrecision' => 5, 'maxScale' => 3), 0),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), 1),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), -1),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), 1.0),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), '1'),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), '-1'),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), '1.0'),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), 99.999),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), '99.999'),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), -99.999),
+			array(array('maxPrecision' => 5, 'maxScale' => 3), '-99.999'),
+		);
+	}
+
+	public function invalidValuesProvider() {
+		return array(
+			array(
+				array('messageInvalid' => 'Invalid decimal'),
+				'',
+				'Invalid decimal'
+			),
+			array(
+				array('messageInvalid' => 'Invalid decimal'),
+				'--1.0',
+				'Invalid decimal'
+			),
+			array(
+				array('messageInvalid' => 'Invalid decimal'),
+				'1E3',
+				'Invalid decimal'
+			),
+			array(
+				array('messageInvalid' => 'Invalid decimal "%1$s"'),
+				array(),
+				'Invalid decimal "array"'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messagePrecision' => 'Value %1$s is too long, it cannot have more than %2$s digits before the decimal point and %3$s after'
+				),
+				999.999,
+				'Value 999.999 is too long, it cannot have more than 2 digits before the decimal point and 3 after'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messageNatural' => 'Value %1$s has to many digits before the decimal point, it cannot have more than %2$s digits'
+				),
+				999.99,
+				'Value 999.99 has to many digits before the decimal point, it cannot have more than 2 digits'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messageScale' => 'Value %1$s has to many digits after the decimal point, it cannot have more than %2$s digits'
+				),
+				9.9999,
+				'Value 9.9999 has to many digits after the decimal point, it cannot have more than 3 digits'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messagePrecision' => 'Value %1$s is too long, it cannot have more than %2$s digits before the decimal point and %3$s after'
+				),
+				'999.999',
+				'Value 999.999 is too long, it cannot have more than 2 digits before the decimal point and 3 after'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messageNatural' => 'Value %1$s has to many digits before the decimal point, it cannot have more than %2$s digits'
+				),
+				'999.99',
+				'Value 999.99 has to many digits before the decimal point, it cannot have more than 2 digits'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messageScale' => 'Value %1$s has to many digits after the decimal point, it cannot have more than %2$s digits'
+				),
+				'9.9999',
+				'Value 9.9999 has to many digits after the decimal point, it cannot have more than 3 digits'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messagePrecision' => 'Value %1$s is too long, it cannot have more than %2$s digits before the decimal point and %3$s after'
+				),
+				-999.999,
+				'Value -999.999 is too long, it cannot have more than 2 digits before the decimal point and 3 after'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messageNatural' => 'Value %1$s has to many digits before the decimal point, it cannot have more than %2$s digits'
+				),
+				-999.99,
+				'Value -999.99 has to many digits before the decimal point, it cannot have more than 2 digits'
+			),
+			array(
+				array(
+					'maxPrecision' => 5,
+					'maxScale' => 3,
+					'messageScale' => 'Value %1$s has to many digits after the decimal point, it cannot have more than %2$s digits'
+				),
+				-9.9999,
+				'Value -9.9999 has to many digits after the decimal point, it cannot have more than 3 digits'
+			),
+		);
+	}
+
+	public function invalidValuesWithObjectsProvider() {
+		return array(
+			array(
+				array('messageInvalid' => 'Invalid decimal value for "%1$s"'),
+				'',
+				'Invalid decimal value for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Invalid decimal value for "%1$s"'),
+				array(),
+				'Invalid decimal value for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Invalid decimal value "%2$s" for "%1$s"'),
+				'A',
+				'Invalid decimal value "A" for "object"'
+			),
+		);
+	}
+
+	protected function createValidator(array $params = array()) {
+		return new CDecimalValidator($params);
+	}
+}
diff --git a/frontends/php/tests/general/CTriggerFunctionValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CFunctionValidatorTest.php
index 56e017c8b66..5ceb4f47fd2 100644
--- a/frontends/php/tests/general/CTriggerFunctionValidatorTest.php
+++ b/frontends/php/tests/unit/include/classes/validators/CFunctionValidatorTest.php
@@ -19,15 +19,7 @@
 **/
 
 
-require_once dirname(__FILE__).'/../../include/gettextwrapper.inc.php';
-require_once dirname(__FILE__).'/../../include/defines.inc.php';
-require_once dirname(__FILE__).'/../../include/debug.inc.php';
-require_once dirname(__FILE__).'/../../include/func.inc.php';
-require_once dirname(__FILE__).'/../../include/items.inc.php';
-require_once dirname(__FILE__).'/../../include/classes/validators/CValidator.php';
-require_once dirname(__FILE__).'/../../include/classes/validators/CTriggerFunctionValidator.php';
-
-class CTriggerFunctionValidatorTest extends PHPUnit_Framework_TestCase {
+class CFunctionValidatorTest extends PHPUnit_Framework_TestCase {
 
 	private static function parameterSecNumPeriod_TestCases($func, array $valueTypes, array $params = array(), $no = 0) {
 		$valueTypesAny = array(ITEM_VALUE_TYPE_FLOAT, ITEM_VALUE_TYPE_STR, ITEM_VALUE_TYPE_LOG, ITEM_VALUE_TYPE_UINT64,
@@ -313,7 +305,7 @@ class CTriggerFunctionValidatorTest extends PHPUnit_Framework_TestCase {
 	 * @dataProvider provider
 	 */
 	public function test_parse($functionName, $functionParamList, $valueType, $expectedResult) {
-		$triggerFunctionValidator = new CTriggerFunctionValidator();
+		$triggerFunctionValidator = new CFunctionValidator();
 
 		$result = $triggerFunctionValidator->validate(array(
 			'function' => '',
diff --git a/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php
new file mode 100644
index 00000000000..333c34890e6
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php
@@ -0,0 +1,182 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CIdValidatorTest extends CValidatorTest {
+
+	public function validParamProvider() {
+		return array(
+			array(array(
+				'empty' => true,
+				'messageEmpty' => 'Empty ID',
+				'messageInvalid' => 'Incorrect ID specified'
+			))
+		);
+	}
+
+	public function validValuesProvider() {
+		return array(
+			array(array(), 1),
+			array(array(), '1'),
+			array(array(), '9223372036854775807'),
+			array(array('empty' => true), 0),
+			array(array('empty' => true), '0'),
+		);
+	}
+
+	public function invalidValuesProvider() {
+		return array(
+			array(
+				array('messageInvalid' => 'Invalid ID type'),
+				true,
+				'Invalid ID type'
+			),
+			array(
+				array('messageInvalid' => 'Invalid ID type'),
+				null,
+				'Invalid ID type'
+			),
+			array(
+				array('messageInvalid' => 'Invalid ID type'),
+				array(),
+				'Invalid ID type'
+			),
+			array(
+				array('messageInvalid' => 'Invalid ID type'),
+				new stdClass(),
+				'Invalid ID type'
+			),
+			array(
+				array('messageEmpty' => 'Empty ID'),
+				0,
+				'Empty ID'
+			),
+			array(
+				array('messageEmpty' => 'Empty ID'),
+				'0',
+				'Empty ID'
+			),
+			array(
+				array('messageInvalid' => 'Invalid ID'),
+				'',
+				'Invalid ID'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%1$s"'),
+				'01',
+				'Incorrect ID "01"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%1$s"'),
+				'1.1',
+				'Incorrect ID "1.1"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%1$s"'),
+				'-1',
+				'Incorrect ID "-1"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%1$s"'),
+				'9223372036854775808',
+				'Incorrect ID "9223372036854775808"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%1$s"'),
+				'A',
+				'Incorrect ID "A"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%1$s"'),
+				'1A',
+				'Incorrect ID "1A"'
+			)
+		);
+	}
+
+	public function invalidValuesWithObjectsProvider() {
+		return array(
+			array(
+				array('messageInvalid' => 'Invalid ID for "%1$s"'),
+				true,
+				'Invalid ID for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Invalid ID for "%1$s"'),
+				null,
+				'Invalid ID for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Invalid ID for "%1$s"'),
+				array(),
+				'Invalid ID for "object"'
+			),
+			array(
+				array('messageEmpty' => 'Empty ID for "%1$s"'),
+				0,
+				'Empty ID for "object"'
+			),
+			array(
+				array('messageEmpty' => 'Empty ID for "%1$s"'),
+				'0',
+				'Empty ID for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Invalid ID for "%1$s"'),
+				'',
+				'Invalid ID for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%2$s" for "%1$s"'),
+				'01',
+				'Incorrect ID "01" for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%2$s" for "%1$s"'),
+				'-1',
+				'Incorrect ID "-1" for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%2$s" for "%1$s"'),
+				'1.1',
+				'Incorrect ID "1.1" for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%2$s" for "%1$s"'),
+				'9223372036854775808',
+				'Incorrect ID "9223372036854775808" for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%2$s" for "%1$s"'),
+				'A',
+				'Incorrect ID "A" for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect ID "%2$s" for "%1$s"'),
+				'1A',
+				'Incorrect ID "1A" for "object"'
+			)
+		);
+	}
+
+	protected function createValidator(array $params = array()) {
+		return new CIdValidator($params);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php
new file mode 100644
index 00000000000..67a2bb54452
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php
@@ -0,0 +1,53 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+/**
+ * @incomplete
+ */
+class CLdapAuthValidatorTest extends CValidatorTest {
+
+	public function setUp() {
+		$this->markTestIncomplete('This test is not yet written');
+	}
+
+	public function validParamProvider() {
+		return array(
+			array(array(
+				'conf' => array()
+			))
+		);
+	}
+
+	public function validValuesProvider() {
+		return array(array());
+	}
+
+	public function invalidValuesProvider() {
+		return array(array());
+	}
+
+	public function invalidValuesWithObjectsProvider() {
+		return array(array());
+	}
+
+	protected function createValidator(array $params = array()) {
+		return new CLdapAuthValidator($params);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php
new file mode 100644
index 00000000000..7ac2768d291
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php
@@ -0,0 +1,126 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CLimitedSetValidatorTest extends CValidatorTest {
+
+	public function validParamProvider() {
+		return array(
+			array(array(
+				'values' => array(1, 2, 3),
+				'messageInvalid' => 'Incorrect value'
+			))
+		);
+	}
+
+	public function validValuesProvider() {
+		return array(
+			array(array('values' => array(1, 2, 3)), 2),
+			array(array('values' => array(1, 2, 3)), '2'),
+			array(array('values' => array('1', '2', '3')), 2),
+			array(array('values' => array('1', '2', '3')), '2'),
+			array(array('values' => array('one', 'two', 'three')), 'one'),
+		);
+	}
+
+	public function invalidValuesProvider() {
+		return array(
+			array(
+				array('messageInvalid' => 'Incorrect value type'),
+				null,
+				'Incorrect value type'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect value type'),
+				true,
+				'Incorrect value type'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect value type'),
+				array(),
+				'Incorrect value type'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect value type'),
+				1.1,
+				'Incorrect value type'
+			),
+			array(
+				array('values' => array(1, 2, 3), 'messageInvalid' => 'Incorrect value "%1$s"'),
+				4,
+				'Incorrect value "4"'
+			),
+			array(
+				array('values' => array('one', 'two', 'three'), 'messageInvalid' => 'Incorrect value "%1$s"'),
+				'four',
+				'Incorrect value "four"'
+			),
+			array(
+				array('values' => array('one', 'two', 'three'), 'messageInvalid' => 'Incorrect value "%1$s"'),
+				'FOUR',
+				'Incorrect value "FOUR"'
+			),
+		);
+	}
+
+	public function invalidValuesWithObjectsProvider() {
+		return array(
+			array(
+				array('messageInvalid' => 'Incorrect value type for "%1$s"'),
+				null,
+				'Incorrect value type for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect value type for "%1$s"'),
+				true,
+				'Incorrect value type for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect value type for "%1$s"'),
+				array(),
+				'Incorrect value type for "object"'
+			),
+			array(
+				array('messageInvalid' => 'Incorrect value type for "%1$s"'),
+				1.1,
+				'Incorrect value type for "object"'
+			),
+			array(
+				array('values' => array(1, 2, 3), 'messageInvalid' => 'Incorrect value "%2$s" for "%1$s"'),
+				4,
+				'Incorrect value "4" for "object"'
+			),
+			array(
+				array('values' => array('one', 'two', 'three'), 'messageInvalid' => 'Incorrect value "%2$s" for "%1$s"'),
+				'four',
+				'Incorrect value "four" for "object"'
+			),
+			array(
+				array('values' => array('one', 'two', 'three'), 'messageInvalid' => 'Incorrect value "%2$s" for "%1$s"'),
+				'FOUR',
+				'Incorrect value "FOUR" for "object"'
+			),
+		);
+	}
+
+	protected function createValidator(array $params = array()) {
+		return new CLimitedSetValidator($params);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php
new file mode 100644
index 00000000000..cb284f01121
--- /dev/null
+++ b/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php
@@ -0,0 +1,101 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+class CRegexValidatorTest extends CValidatorTest
+{
+	public function validParamProvider()
+	{
+		return array(array(
+			array(
+				'messageInvalid' => 'Invalid regular expression'
+			)
+		));
+	}
+
+	public function validValuesProvider()
+	{
+		return array(
+			array(array(), 'foobar'),
+			array(array(), '/foobar'),
+			array(array(), 'foobar/'),
+			array(array(), 'foobar/i'),
+			array(array(), '/'),
+			array(array(), ' '),
+			array(array(), '\\\\'),
+			array(array(), '[A-Z]+[0-9]{123}foo.*(bar|buz)[^A-K]{4}'),
+			array(array(), 'asd\('),
+			array(array(), '^Timestamp \[[0-9]{4}-[A-Za-z]{3}-[0-9]{1,2}\]: ERROR.*$'),
+			array(array(), '/[a-z]+'),
+			array(array(), '[a-z]+\ \[/'),
+			array(array(), '[a-f0-9]{32}/iu'),
+			array(array(), '[a-f0-9]{32}/i'),
+			array(array(), '/foo bar// me!/'),
+			array(array(), 1),
+			array(array(), 1.2)
+		);
+	}
+
+	public function invalidValuesProvider()
+	{
+		return array(
+			array(
+				array('messageInvalid' => 'Not a string'),
+				array(),
+				'Not a string'
+			),
+			array(
+				array('messageInvalid' => 'Not a string'),
+				null,
+				'Not a string'
+			),
+			array(
+				array('messageInvalid' => 'Not a string'),
+				true,
+				'Not a string'
+			),
+			array(
+				array('messageRegex' => 'Incorrect regular expression "%1$s": "%2$s"'),
+				'[[',
+				'Incorrect regular expression "[[": "Compilation failed: missing terminating ] for character class at offset 2"'
+			),
+			array(
+				array('messageRegex' => 'Incorrect regular expression "%1$s": "%2$s".'),
+				'asd(',
+				'Incorrect regular expression "asd(": "Compilation failed: missing ) at offset 4".'
+			)
+		);
+	}
+
+	public function invalidValuesWithObjectsProvider()
+	{
+		return array(
+			array(
+				array('messageRegex' => 'Incorrect regular expression "%2$s" for object "%1$s": "%3$s"'),
+				'test[',
+				'Incorrect regular expression "test[" for object "object": "Compilation failed: missing terminating ] for character class at offset 5"'
+			)
+		);
+	}
+
+	protected function createValidator(array $params = array())
+	{
+		return new CRegexValidator($params);
+	}
+}
diff --git a/frontends/php/tests/unit/include/classes/validators/string/CStringValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CStringValidatorTest.php
index d104589247c..6990d9140a7 100644
--- a/frontends/php/tests/unit/include/classes/validators/string/CStringValidatorTest.php
+++ b/frontends/php/tests/unit/include/classes/validators/CStringValidatorTest.php
@@ -27,6 +27,7 @@ class CStringValidatorTest extends CValidatorTest {
 				'empty' => true,
 				'maxLength' => 10,
 				'regex' => '/[a-z]+/',
+				'messageInvalid' => 'Not a string',
 				'messageEmpty' => 'String empty',
 				'messageMaxLength' => 'String too long',
 				'messageRegex' => 'Incorrect string'
@@ -42,7 +43,6 @@ class CStringValidatorTest extends CValidatorTest {
 			array(array(), 0),
 
 			array(array('empty' => true), ''),
-			array(array('empty' => true), null),
 
 			array(array('maxLength' => 6), 'string'),
 			array(array('maxLength' => 6), 123456),
@@ -109,9 +109,9 @@ class CStringValidatorTest extends CValidatorTest {
 				'Empty string for "object"'
 			),
 			array(
-				array('messageEmpty' => 'Empty string for "%1$s"'),
+				array('messageInvalid' => 'Not a string for "%1$s"'),
 				null,
-				'Empty string for "object"'
+				'Not a string for "object"'
 			),
 			array(
 				array('messageInvalid' => 'Not a string for "%1$s"'),
diff --git a/frontends/php/tests/general/CTimePeriodValidatorTest.php b/frontends/php/tests/unit/include/classes/validators/CTimePeriodValidatorTest.php
index 0c3f113b095..6612e0dd30a 100644
--- a/frontends/php/tests/general/CTimePeriodValidatorTest.php
+++ b/frontends/php/tests/unit/include/classes/validators/CTimePeriodValidatorTest.php
@@ -18,12 +18,6 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-require_once dirname(__FILE__).'/../../include/gettextwrapper.inc.php';
-require_once dirname(__FILE__).'/../../include/defines.inc.php';
-require_once dirname(__FILE__).'/../../include/locales.inc.php';
-require_once dirname(__FILE__).'/../../include/func.inc.php';
-require_once dirname(__FILE__).'/../../include/classes/validators/CValidator.php';
-require_once dirname(__FILE__).'/../../include/classes/validators/CTimePeriodValidator.php';
 
 class CTimePeriodValidatorTest extends PHPUnit_Framework_TestCase {
 
diff --git a/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php b/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php
new file mode 100644
index 00000000000..ee7078f6c45
--- /dev/null
+++ b/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php
@@ -0,0 +1,47 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CalculateItServiceStatusByTriggerTest extends PHPUnit_Framework_TestCase {
+
+	public function provider() {
+		return array(
+			array(TRIGGER_STATUS_ENABLED, TRIGGER_VALUE_FALSE, TRIGGER_SEVERITY_DISASTER, SERVICE_STATUS_OK),
+			array(TRIGGER_STATUS_DISABLED, TRIGGER_VALUE_TRUE, TRIGGER_SEVERITY_DISASTER, SERVICE_STATUS_OK),
+
+			array(TRIGGER_STATUS_ENABLED, TRIGGER_VALUE_TRUE, TRIGGER_SEVERITY_DISASTER, TRIGGER_SEVERITY_DISASTER),
+			array(TRIGGER_STATUS_ENABLED, TRIGGER_VALUE_TRUE, TRIGGER_SEVERITY_AVERAGE, TRIGGER_SEVERITY_AVERAGE),
+		);
+	}
+
+	/**
+	 * @dataProvider provider
+	 *
+	 * @param $triggerStatus
+	 * @param $triggerValue
+	 * @param $triggerPriority
+	 * @param $expectedStatus
+	 */
+	public function test($triggerStatus, $triggerValue, $triggerPriority, $expectedStatus) {
+		$status = calculateItServiceStatusByTrigger($triggerStatus, $triggerValue, $triggerPriority);
+		$this->assertEquals($expectedStatus, $status);
+	}
+
+}
diff --git a/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php b/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php
new file mode 100644
index 00000000000..2433f8ac98d
--- /dev/null
+++ b/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php
@@ -0,0 +1,211 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CalculateItServiceStatusTest extends PHPUnit_Framework_TestCase {
+
+	public function provider() {
+		return array(
+			// single service without an algorithm
+			array(
+				array(
+					0 => array('algorithm' => SERVICE_ALGORITHM_NONE, 'triggerid' => 0),
+				),
+				array(),
+				array(),
+				array(
+					0 => SERVICE_STATUS_OK
+				)
+			),
+
+			// service with SLA calculation but no trigger
+			array(
+				array(
+					0 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 0)
+				),
+				array(),
+				array(),
+				array(
+					0 => SERVICE_STATUS_OK
+				)
+			),
+
+			// max ok
+			array(
+				array(
+					0 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 0),
+					1 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 1),
+					2 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 2),
+				),
+				array(
+					0 => array(1, 2)
+				),
+				array(
+					1 => $this->createTrigger(TRIGGER_VALUE_FALSE),
+					2 => $this->createTrigger(TRIGGER_VALUE_FALSE),
+				),
+				array(
+					0 => SERVICE_STATUS_OK,
+					1 => SERVICE_STATUS_OK,
+					2 => SERVICE_STATUS_OK
+				)
+			),
+
+			// min ok
+			array(
+				array(
+					0 => array('algorithm' => SERVICE_ALGORITHM_MIN, 'triggerid' => 0),
+					1 => array('algorithm' => SERVICE_ALGORITHM_MIN, 'triggerid' => 1),
+					2 => array('algorithm' => SERVICE_ALGORITHM_MIN, 'triggerid' => 2),
+				),
+				array(
+					0 => array(1, 2)
+				),
+				array(
+					1 => $this->createTrigger(TRIGGER_VALUE_FALSE),
+					2 => $this->createTrigger(TRIGGER_VALUE_FALSE),
+				),
+				array(
+					0 => SERVICE_STATUS_OK,
+					1 => SERVICE_STATUS_OK,
+					2 => SERVICE_STATUS_OK
+				)
+			),
+
+			// max problem
+			array(
+				array(
+					0 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 0),
+					1 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 1),
+					2 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 2),
+					3 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 3),
+				),
+				array(
+					0 => array(1, 2, 3)
+				),
+				array(
+					1 => $this->createTrigger(TRIGGER_VALUE_TRUE),
+					2 => $this->createTrigger(TRIGGER_VALUE_TRUE, TRIGGER_SEVERITY_DISASTER),
+					3 => $this->createTrigger(TRIGGER_VALUE_FALSE),
+				),
+				array(
+					0 => TRIGGER_SEVERITY_DISASTER,
+					1 => TRIGGER_SEVERITY_AVERAGE,
+					2 => TRIGGER_SEVERITY_DISASTER,
+					3 => SERVICE_STATUS_OK
+				)
+			),
+
+			// min problem
+			array(
+				array(
+					0 => array('algorithm' => SERVICE_ALGORITHM_MIN, 'triggerid' => 0),
+					1 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 1),
+					2 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 2),
+					3 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 3),
+				),
+				array(
+					0 => array(1, 2, 3)
+				),
+				array(
+					1 => $this->createTrigger(TRIGGER_VALUE_TRUE),
+					2 => $this->createTrigger(TRIGGER_VALUE_TRUE, TRIGGER_SEVERITY_DISASTER),
+					3 => $this->createTrigger(TRIGGER_VALUE_TRUE),
+				),
+				array(
+					0 => TRIGGER_SEVERITY_DISASTER,
+					1 => TRIGGER_SEVERITY_AVERAGE,
+					2 => TRIGGER_SEVERITY_DISASTER,
+					3 => TRIGGER_SEVERITY_AVERAGE
+				)
+			),
+
+			// graph services with soft links
+			array(
+				array(
+					0 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 0),
+					1 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 0),
+					2 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 0),
+					3 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 1),
+				),
+				array(
+					0 => array(1, 2),
+					1 => array(3),
+					2 => array(3),
+				),
+				array(
+					1 => $this->createTrigger(TRIGGER_VALUE_TRUE),
+				),
+				array(
+					0 => TRIGGER_SEVERITY_AVERAGE,
+					1 => TRIGGER_SEVERITY_AVERAGE,
+					2 => TRIGGER_SEVERITY_AVERAGE,
+					3 => TRIGGER_SEVERITY_AVERAGE,
+				)
+			),
+
+			// a service branch with a disabled service in the middle
+			array(
+				array(
+					0 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 0),
+					1 => array('algorithm' => SERVICE_ALGORITHM_NONE, 'triggerid' => 0),
+					2 => array('algorithm' => SERVICE_ALGORITHM_MAX, 'triggerid' => 1),
+				),
+				array(
+					0 => array(1),
+					1 => array(2)
+				),
+				array(
+					1 => $this->createTrigger(TRIGGER_VALUE_TRUE),
+				),
+				array(
+					0 => SERVICE_STATUS_OK,
+					1 => SERVICE_STATUS_OK,
+					2 => TRIGGER_SEVERITY_AVERAGE,
+				)
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provider
+	 *
+	 * @param $services
+	 * @param $serviceLinks
+	 * @param $triggers
+	 * @param $expectedStatuses
+	 */
+	public function test($services, $serviceLinks, $triggers, $expectedStatuses) {
+		calculateItServiceStatus(0, $serviceLinks, $services, $triggers);
+
+		foreach ($services as $serviceId => $service) {
+			$this->assertEquals($expectedStatuses[$serviceId], $service['newStatus']);
+		}
+	}
+
+	public function createTrigger($value, $severity = TRIGGER_SEVERITY_AVERAGE) {
+		return array(
+			'status' => TRIGGER_STATUS_ENABLED,
+			'value' => $value,
+			'priority' => $severity
+		);
+	}
+
+}
diff --git a/frontends/php/tests/unit/include/triggers/EvalExpressionDataTest.php b/frontends/php/tests/unit/include/triggers/EvalExpressionDataTest.php
new file mode 100644
index 00000000000..c08264253fa
--- /dev/null
+++ b/frontends/php/tests/unit/include/triggers/EvalExpressionDataTest.php
@@ -0,0 +1,243 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class EvalExpressionDataTest extends PHPUnit_Framework_TestCase {
+
+	public function testValidProvider() {
+		return array(
+			array(
+				'{host:item.last()} = 0',
+				array(
+					'{host:item.last()}' => 0
+				)
+			),
+			array(
+				'{host:item.last()} <> 0',
+				array(
+					'{host:item.last()}' => 1
+				)
+			),
+			array(
+				'{host:item.last()} < 10',
+				array(
+					'{host:item.last()}' => 5
+				)
+			),
+			array(
+				'{host:item.last()} <= 10',
+				array(
+					'{host:item.last()}' => 10
+				)
+			),
+			array(
+				'{host:item.last()} > 10',
+				array(
+					'{host:item.last()}' => 15
+				)
+			),
+			array(
+				'{host:item.last()} >= 10',
+				array(
+					'{host:item.last()}' => 10
+				)
+			),
+			array(
+				'{host:item.last()} = 10.9',
+				array(
+					'{host:item.last()}' => 10.9
+				)
+			),
+			array(
+				'{host:item.last()} = 1 or {host:item2.last()} = 2',
+				array(
+					'{host:item.last()}' => 1,
+					'{host:item2.last()}' => 2,
+				)
+			),
+			array(
+				'not {host:item.last()} = 0',
+				array(
+					'{host:item.last()}' => 1
+				)
+			),
+			array(
+				'{host:item.last()} = -1',
+				array(
+					'{host:item.last()}' => -1
+				)
+			),
+			// units
+			array(
+				'{host:item.last()} = 10s',
+				array(
+					'{host:item.last()}' => 10
+				)
+			),
+			array(
+				'{host:item.last()} = 10m',
+				array(
+					'{host:item.last()}' => 600
+				)
+			),
+			array(
+				'{host:item.last()} = 10m',
+				array(
+					'{host:item.last()}' => '600s'
+				)
+			),
+			array(
+				'{host:item.last()} = 600',
+				array(
+					'{host:item.last()}' => '10m'
+				)
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider testValidProvider
+	 *
+	 * @param $expression
+	 * @param array $replacements
+	 */
+	public function testValid($expression, array $replacements) {
+		$result = evalExpressionData($expression, $replacements);
+
+		$this->assertSame(true, $result);
+	}
+
+	public function testInvalidProvider() {
+		return array(
+			array(
+				'{host:item.last()} = 0',
+				array(
+					'{host:item.last()}' => 2
+				)
+			),
+			array(
+				'{host:item.last()} <> 0',
+				array(
+					'{host:item.last()}' => 0
+				)
+			),
+			array(
+				'{host:item.last()} < 10',
+				array(
+					'{host:item.last()}' => 15
+				)
+			),
+			array(
+				'{host:item.last()} <= 10',
+				array(
+					'{host:item.last()}' => 15
+				)
+			),
+			array(
+				'{host:item.last()} > 10',
+				array(
+					'{host:item.last()}' => 5
+				)
+			),
+			array(
+				'{host:item.last()} >= 10',
+				array(
+					'{host:item.last()}' => 5
+				)
+			),
+			array(
+				'{host:item.last()} = 10.9',
+				array(
+					'{host:item.last()}' => 10.99
+				)
+			),
+			array(
+				'{host:item.last()} = 1 and {host:item2.last()} = 2',
+				array(
+					'{host:item.last()}' => 2,
+					'{host:item2.last()}' => 2,
+				)
+			),
+			array(
+				'not {host:item.last()} = 0',
+				array(
+					'{host:item.last()}' => 0
+				)
+			),
+			array(
+				'{host:item.last()} = -1',
+				array(
+					'{host:item.last()}' => -20
+				)
+			),
+			// units
+			array(
+				'{host:item.last()} = 10s',
+				array(
+					'{host:item.last()}' => 11
+				)
+			),
+			array(
+				'{host:item.last()} = 10m',
+				array(
+					'{host:item.last()}' => 601
+				)
+			),
+			array(
+				'{host:item.last()} = 10m',
+				array(
+					'{host:item.last()}' => '601s'
+				)
+			),
+			array(
+				'{host:item.last()} = 600',
+				array(
+					'{host:item.last()}' => '11m'
+				)
+			),
+			array(
+				'{host:item.last()} = 10s',
+				array(
+					'{host:item.last()}' => '10m'
+				)
+			),
+			// invalid expression
+			array(
+				'{host:item.last()} = value',
+				array(
+					'{host:item.last()}' => 2
+				)
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider testInvalidProvider
+	 *
+	 * @param $expression
+	 * @param array $replacements
+	 */
+	public function testInvalid($expression, array $replacements) {
+		$result = evalExpressionData($expression, $replacements);
+
+		$this->assertSame(false, $result);
+	}
+
+}
diff --git a/frontends/php/tests/unit/phpunit.xml b/frontends/php/tests/unit/phpunit.xml
index 319a39a45e0..1e90fb970ae 100644
--- a/frontends/php/tests/unit/phpunit.xml
+++ b/frontends/php/tests/unit/phpunit.xml
@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<phpunit colors="true" bootstrap="bootstrap.php">
+<phpunit
+		colors="true"
+		bootstrap="bootstrap.php"
+		convertErrorsToExceptions="true"
+		convertNoticesToExceptions="true"
+		convertWarningsToExceptions="true"
+		>
 </phpunit>
diff --git a/frontends/php/tr_comments.php b/frontends/php/tr_comments.php
index ba3eae57784..9f8f70c1ad3 100644
--- a/frontends/php/tr_comments.php
+++ b/frontends/php/tr_comments.php
@@ -23,8 +23,9 @@ require_once dirname(__FILE__).'/include/config.inc.php';
 require_once dirname(__FILE__).'/include/triggers.inc.php';
 require_once dirname(__FILE__).'/include/forms.inc.php';
 
-$page['title'] = _('Trigger comments');
+$page['title'] = _('Trigger description');
 $page['file'] = 'tr_comments.php';
+$page['hist_arg'] = array('triggerid');
 
 require_once dirname(__FILE__).'/include/page_header.php';
 
@@ -78,7 +79,7 @@ if (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
-	show_messages($result, _('Comment updated'), _('Cannot update comment'));
+	show_messages($result, _('Description updated'), _('Cannot update description'));
 }
 elseif (isset($_REQUEST['cancel'])) {
 	jsRedirect('tr_status.php');
@@ -95,7 +96,7 @@ $triggerEditable = API::Trigger()->get(array(
 ));
 
 $data = array(
-	'triggerid' => get_request('triggerid'),
+	'triggerid' => getRequest('triggerid'),
 	'trigger' => $trigger,
 	'isTriggerEditable' => !empty($triggerEditable),
 	'isCommentExist' => !empty($trigger['comments'])
diff --git a/frontends/php/tr_events.php b/frontends/php/tr_events.php
index 7065746ff72..e0832bdfd20 100644
--- a/frontends/php/tr_events.php
+++ b/frontends/php/tr_events.php
@@ -45,7 +45,7 @@ $fields = array(
 	'save' =>		array(T_ZBX_STR,O_OPT,	P_ACT|P_SYS, null,	null),
 	'cancel' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	// ajax
-	'favobj' =>		array(T_ZBX_STR, O_OPT, P_ACT,	IN("'filter','hat'"), null),
+	'favobj' =>		array(T_ZBX_STR, O_OPT, P_ACT,	IN('"filter","hat"'), null),
 	'favref' =>		array(T_ZBX_STR, O_OPT, P_ACT,	NOT_EMPTY,	'isset({favobj})'),
 	'favstate' =>	array(T_ZBX_INT, O_OPT, P_ACT,	NOT_EMPTY,	'isset({favobj})')
 );
@@ -104,16 +104,16 @@ $eventWidget->addHeader(
 );
 
 // trigger details
-$triggerDetailsWidget = new CUIWidget('hat_triggerdetails', make_trigger_details($trigger));
+$triggerDetailsWidget = new CUiWidget('hat_triggerdetails', make_trigger_details($trigger));
 $triggerDetailsWidget->setHeader(_('Event source details'));
 
 // event details
-$eventDetailsWidget = new CUIWidget('hat_eventdetails', make_event_details($event, $trigger));
+$eventDetailsWidget = new CUiWidget('hat_eventdetails', make_event_details($event, $trigger));
 $eventDetailsWidget->setHeader(_('Event details'));
 
 // if acknowledges are not disabled in configuration, let's show them
 if ($config['event_ack_enable']) {
-	$eventAcknowledgesWidget = new CUIWidget('hat_eventack', makeAckTab($event));
+	$eventAcknowledgesWidget = new CCollapsibleUiWidget('hat_eventack', makeAckTab($event));
 	$eventAcknowledgesWidget->open = (bool) CProfile::get('web.tr_events.hats.hat_eventack.state', true);
 	$eventAcknowledgesWidget->setHeader(_('Acknowledges'));
 }
@@ -122,17 +122,17 @@ else {
 }
 
 // actions messages
-$actionMessagesWidget = new CUIWidget('hat_eventactionmsgs', getActionMessages($event['alerts']));
+$actionMessagesWidget = new CCollapsibleUiWidget('hat_eventactionmsgs', getActionMessages($event['alerts']));
 $actionMessagesWidget->open = (bool) CProfile::get('web.tr_events.hats.hat_eventactionmsgs.state', true);
 $actionMessagesWidget->setHeader(_('Message actions'));
 
 // actions commands
-$actionCommandWidget = new CUIWidget('hat_eventactionmcmds', getActionCommands($event['alerts']));
+$actionCommandWidget = new CCollapsibleUiWidget('hat_eventactionmcmds', getActionCommands($event['alerts']));
 $actionCommandWidget->open = (bool) CProfile::get('web.tr_events.hats.hat_eventactioncmds.state', true);
 $actionCommandWidget->setHeader(_('Command actions'));
 
 // event history
-$eventHistoryWidget = new CUIWidget('hat_eventlist', make_small_eventlist($event));
+$eventHistoryWidget = new CCollapsibleUiWidget('hat_eventlist', make_small_eventlist($event));
 $eventHistoryWidget->open = (bool) CProfile::get('web.tr_events.hats.hat_eventlist.state', true);
 $eventHistoryWidget->setHeader(_('Event list [previous 20]'));
 
diff --git a/frontends/php/tr_logform.php b/frontends/php/tr_logform.php
index abc39251ce4..8a8ee0ecf05 100644
--- a/frontends/php/tr_logform.php
+++ b/frontends/php/tr_logform.php
@@ -26,6 +26,7 @@ require_once dirname(__FILE__).'/include/items.inc.php';
 
 $page['title'] = _('Trigger form');
 $page['file'] = 'tr_logform.php';
+$page['scripts'] = array('tr_logform.js');
 $page['type'] = detect_page_type(PAGE_TYPE_HTML);
 
 define('ZBX_PAGE_NO_MENU', 1);
@@ -34,122 +35,127 @@ require_once dirname(__FILE__).'/include/page_header.php';
 
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
 $fields = array(
-	'description' =>	array(T_ZBX_STR, O_OPT,  NULL,			NOT_EMPTY,			'isset({save_trigger})'),
+	'description' =>	array(T_ZBX_STR, O_OPT,  null,			NOT_EMPTY,			'isset({save_trigger})'),
 	'itemid' =>			array(T_ZBX_INT, O_OPT,	 P_SYS,			DB_ID,				'isset({save_trigger})'),
-	'sform' =>			array(T_ZBX_INT, O_OPT,  NULL,			IN('0,1'),			null),
-	'sitems' =>			array(T_ZBX_INT, O_OPT,  NULL,			IN('0,1'),			null),
+	'sform' =>			array(T_ZBX_INT, O_OPT,  null,			IN('0,1'),			null),
+	'sitems' =>			array(T_ZBX_INT, O_OPT,  null,			IN('0,1'),			null),
 	'triggerid' =>		array(T_ZBX_INT, O_OPT,  P_SYS,			DB_ID,				null),
-	'type' =>			array(T_ZBX_INT, O_OPT,  NULL,			IN('0,1'),			null),
-	'priority' =>		array(T_ZBX_INT, O_OPT,  NULL,			IN('0,1,2,3,4,5'),	'isset({save_trigger})'),
-	'expressions' =>	array(T_ZBX_STR, O_OPT,	 NULL,			NOT_EMPTY,			'isset({save_trigger})'),
-	'expr_type' =>		array(T_ZBX_INT, O_OPT,  NULL,			IN('0,1'),			null),
+	'type' =>			array(T_ZBX_INT, O_OPT,  null,			IN('0,1'),			null),
+	'priority' =>		array(T_ZBX_INT, O_OPT,  null,			IN('0,1,2,3,4,5'),	'isset({save_trigger})'),
+	'expressions' =>	array(T_ZBX_STR, O_OPT,	 null,			NOT_EMPTY,			'isset({save_trigger})'),
+	'expr_type' =>		array(T_ZBX_INT, O_OPT,  null,			IN('0,1'),			null),
 	'comments' =>		array(T_ZBX_STR, O_OPT,  null,			null,				null),
 	'url' =>			array(T_ZBX_STR, O_OPT,  null,			null,				null),
-	'status' =>			array(T_ZBX_INT, O_OPT,  NULL,			IN('0,1'),			null),
-	'form_refresh' =>	array(T_ZBX_INT, O_OPT,	 NULL,			NULL,				NULL),
-	'save_trigger' =>	array(T_ZBX_STR, O_OPT,	 P_SYS|P_ACT,	NULL,				null),
-	'keys '=> 			array(T_ZBX_STR, O_OPT,  NULL,			NULL,				NULL),
+	'status' =>			array(T_ZBX_INT, O_OPT,  null,			IN('0,1'),			null),
+	'form_refresh' =>	array(T_ZBX_INT, O_OPT,	 null,			null,				null),
+	'save_trigger' =>	array(T_ZBX_STR, O_OPT,	 P_SYS|P_ACT,	null,				null),
+	'keys' => 			array(T_ZBX_STR, O_OPT,  null,			null,				null),
 );
 check_fields($fields);
 
 /*
  * Permissions
  */
-if (get_request('itemid') && !API::Item()->isWritable(array($_REQUEST['itemid']))
-		|| get_request('triggerid') && !API::Trigger()->isWritable(array($_REQUEST['triggerid']))) {
+if (getRequest('itemid') && !API::Item()->isWritable(array($_REQUEST['itemid']))
+		|| getRequest('triggerid') && !API::Trigger()->isWritable(array($_REQUEST['triggerid']))) {
 	access_deny();
 }
 
-$itemid = get_request('itemid', 0);
+$itemid = getRequest('itemid', 0);
 
-//------------------------ <ACTIONS> ---------------------------
-if (isset($_REQUEST['save_trigger'])) {
-	show_messages();
+$item = API::Item()->get(array(
+	'output' => array('key_'),
+	'selectHosts' => array('host'),
+	'itemids' => $itemid,
+	'limit' => 1
+));
+$item = reset($item);
+$host = reset($item['hosts']);
 
-	$exprs = get_request('expressions', false);
-	if($exprs && ($expression = construct_expression($_REQUEST['itemid'], $exprs))){
-		if(!check_right_on_trigger_by_expression(PERM_READ_WRITE, $expression)) access_deny();
+$constructor = new CTextTriggerConstructor(new CTriggerExpression());
 
-		$now=time();
-		if(isset($_REQUEST['status']))	{ $status=TRIGGER_STATUS_DISABLED; }
-		else{ $status=TRIGGER_STATUS_ENABLED; }
+/**
+ * Save a trigger
+ */
+if (hasRequest('save_trigger')) {
+	show_messages();
+
+	$exprs = getRequest('expressions', false);
+	if ($exprs && ($expression = $constructor->getExpressionFromParts($host['host'], $item['key_'], $exprs))) {
+		if (!check_right_on_trigger_by_expression(PERM_READ_WRITE, $expression)) {
+			access_deny();
+		}
 
-		//if(isset($_REQUEST['type']))	{ $type=TRIGGER_MULT_EVENT_ENABLED; }
-		//else{ $type=TRIGGER_MULT_EVENT_DISABLED; }
+		$now = time();
+		$status = hasRequest('status') ? TRIGGER_STATUS_DISABLED : TRIGGER_STATUS_ENABLED;
 		$type = TRIGGER_MULT_EVENT_ENABLED;
 
-		if(isset($_REQUEST['triggerid'])){
+		if (hasRequest('triggerid')) {
+			$triggerId = getRequest('triggerid');
+			$description = getRequest('description', '');
+
 			$triggersData = API::Trigger()->get(array(
-				'triggerids' => $_REQUEST['triggerid'],
+				'triggerids' => array($triggerId),
 				'output' => API_OUTPUT_EXTEND
 			));
 			$triggerData = reset($triggersData);
 
-			if($triggerData['templateid']){
-				$_REQUEST['description'] = $triggerData['description'];
+			if ($triggerData['templateid']) {
+				$description = $triggerData['description'];
 				$expression = explode_exp($triggerData['expression']);
 			}
 
 			$trigger = array();
-			$trigger['triggerid'] = $_REQUEST['triggerid'];
+			$trigger['triggerid'] = $triggerId;
 			$trigger['expression'] = $expression;
-			$trigger['description'] = $_REQUEST['description'];
+			$trigger['description'] = $description;
 			$trigger['type'] = $type;
-			$trigger['priority'] = $_REQUEST['priority'];
+			$trigger['priority'] = getRequest('priority', 0);
 			$trigger['status'] = $status;
-			$trigger['comments'] = $_REQUEST['comments'];
-			$trigger['url'] = $_REQUEST['url'];
+			$trigger['comments'] = getRequest('comments', '');
+			$trigger['url'] = getRequest('url', '');
 
-			DBstart();
-			$result = API::Trigger()->update($trigger);
-//REVERT
-			$result = DBend($result);
+			$result = (bool) API::Trigger()->update($trigger);
 
-			$triggerid = $_REQUEST['triggerid'];
-			$audit_action = AUDIT_ACTION_UPDATE;
+			$auditAction = AUDIT_ACTION_UPDATE;
 
 			show_messages($result, _('Trigger updated'), _('Cannot update trigger'));
 		}
-		else{
+		else {
 			$trigger = array();
 			$trigger['expression'] = $expression;
-			$trigger['description'] = $_REQUEST['description'];
+			$trigger['description'] = getRequest('description');
 			$trigger['type'] = $type;
-			$trigger['priority'] = $_REQUEST['priority'];
+			$trigger['priority'] = getRequest('priority', 0);
 			$trigger['status'] = $status;
-			$trigger['comments'] = $_REQUEST['comments'];
-			$trigger['url'] = $_REQUEST['url'];
-
-			DBstart();
-			if($result = API::Trigger()->create($trigger)){
-				if($result !== false){
-					$options = array(
-						'triggerids' => $result['triggerids'],
-						'output' => API_OUTPUT_EXTEND
-					);
-					$db_triggers = API::Trigger()->get($options);
-
-					$result = true;
-					$db_triggers = reset($db_triggers);
-					$triggerid = $db_triggers['triggerid'];
-				}
-				else{
-					$result = false;
-				}
+			$trigger['comments'] = getRequest('comments', '');
+			$trigger['url'] = getRequest('url', '');
+
+			$result = (bool) API::Trigger()->create($trigger);
+			if ($result) {
+				$dbTriggers = API::Trigger()->get(array(
+					'triggerids' => $result['triggerids'],
+					'output' => array('triggerid')
+				));
+
+				$dbTrigger = reset($dbTriggers);
+				$triggerId = $dbTrigger['triggerid'];
 			}
 
-			$result = DBend($result);
-
-			// $result = $triggerid;
-			$audit_action = AUDIT_ACTION_ADD;
+			$auditAction = AUDIT_ACTION_ADD;
 
 			show_messages($result, _('Trigger added'), _('Cannot add trigger'));
 		}
 
-		if ($result){
+		if ($result) {
 			DBstart();
-			add_audit($audit_action, AUDIT_RESOURCE_TRIGGER, _('Trigger').' ['.$triggerid.'] ['.$trigger['description'].']');
+
+			add_audit($auditAction, AUDIT_RESOURCE_TRIGGER,
+				_('Trigger').' ['.$triggerId.'] ['.$trigger['description'].']'
+			);
+
 			DBend(true);
+
 			unset($_REQUEST['sform']);
 
 			zbx_add_post_js('closeForm("items.php");');
@@ -157,98 +163,59 @@ if (isset($_REQUEST['save_trigger'])) {
 		}
 	}
 }
-//------------------------ </ACTIONS> --------------------------
 
 //------------------------ <FORM> ---------------------------
 
-if(isset($_REQUEST['sform'])){
-	$frmTRLog = new CFormTable(_('Trigger'),'tr_logform.php','POST',null,'sform');
-	$frmTRLog->setHelp('web.triggerlog.service.php');
+if (hasRequest('sform')) {
+	$frmTRLog = new CFormTable(_('Trigger'), null, null, null, 'sform');
+	$frmTRLog->setName('sform');
+	$frmTRLog->addHelpIcon();
 	$frmTRLog->setTableClass('formlongtable formtable');
-	$frmTRLog->addVar('form_refresh',get_request('form_refresh',1));
-
-	if(isset($_REQUEST['triggerid'])) $frmTRLog->addVar('triggerid',$_REQUEST['triggerid']);
-
-	if(isset($_REQUEST['triggerid']) && !isset($_REQUEST['form_refresh'])){
-		$frmTRLog->addVar('form_refresh',get_request('form_refresh',1));
-
-		$sql = 'SELECT DISTINCT f.functionid, f.function, f.parameter, t.expression, '.
-								' t.description, t.priority, t.comments, t.url, t.status, t.type'.
-					' FROM functions f, triggers t, items i '.
-					' WHERE t.triggerid='.zbx_dbstr($_REQUEST['triggerid']).
-						' AND i.itemid=f.itemid '.
-						' AND f.triggerid = t.triggerid '.
-						' AND i.value_type IN ('.ITEM_VALUE_TYPE_LOG.' , '.ITEM_VALUE_TYPE_TEXT.', '.ITEM_VALUE_TYPE_STR.')';
-
-		$res = DBselect($sql);
-		while($rows = DBfetch($res)){
-			$description = $rows['description'];
-			$expression = $rows['expression'];
-			$type = $rows['type'];
-			$priority = $rows['priority'];
-			$comments = $rows['comments'];
-			$url = $rows['url'];
-			$status = $rows['status'];
-
-			$functionid[] = '/\{'.$rows['functionid'].'\}/Uu';
-			$functions[] = $rows['function'].'('.$rows['parameter'].')';
-		}
-
-		$expr_v = $expression;
-		$expression = preg_replace($functionid,$functions,$expression);
-		$expr_incase = $expression;
 
-		$expression = preg_replace('/\(\(\((.+?)\)\) &/i', '(($1) &', $expression);
-		$expression = preg_replace('/\(\(\((.+?)\)\)$/i', '(($1)', $expression);
-
-		$expr_v = preg_replace('/\(\(\((.+?)\)\) &/i', '(($1) &', $expr_v);
-		$expr_v = preg_replace('/\(\(\((.+?)\)\)$/i', '(($1)', $expr_v);
-
-		$expression = splitByFirstLevel($expression);
-		$expr_v = splitByFirstLevel($expr_v);
-
-		foreach($expression as $id => $expr){
-			$expr = preg_replace('/^\((.*)\)$/u','$1',$expr);
-
-			$value = preg_replace('/([=|#]0)/','',$expr);
-			$value = preg_replace('/^\((.*)\)$/u','$1',$value); // removing wrapping parentheses
+	if (hasRequest('triggerid')) {
+		$frmTRLog->addVar('triggerid', getRequest('triggerid'));
+	}
 
-			$expressions[$id]['value'] = trim($value);
-			$expressions[$id]['type'] = (zbx_strpos($expr,'#0',zbx_strlen($expr)-3) === false)?(REGEXP_EXCLUDE):(REGEXP_INCLUDE);
+	if (hasRequest('triggerid') && !hasRequest('form_refresh')) {
+		$result = DBselect(
+			'SELECT t.expression,t.description,t.priority,t.comments,t.url,t.status,t.type'.
+			' FROM triggers t'.
+			' WHERE t.triggerid='.zbx_dbstr(getRequest('triggerid')).
+				' AND EXISTS ('.
+					'SELECT NULL'.
+					' FROM functions f,items i'.
+					' WHERE t.triggerid=f.triggerid'.
+						' AND f.itemid=i.itemid '.
+						' AND i.value_type IN ('.
+							ITEM_VALUE_TYPE_LOG.','.ITEM_VALUE_TYPE_TEXT.','.ITEM_VALUE_TYPE_STR.
+						')'.
+				')'
+		);
+
+		if ($row = DBfetch($result)) {
+			$description = $row['description'];
+			$expression = explode_exp($row['expression']);
+			$type = $row['type'];
+			$priority = $row['priority'];
+			$comments = $row['comments'];
+			$url = $row['url'];
+			$status = $row['status'];
 		}
 
-		foreach($expr_v as $id => $expr) {
-			$expr = preg_replace('/^\((.*)\)$/u','$1',$expr);
-			$value = preg_replace('/\((.*)\)[=|#]0/U','$1',$expr);
-			$value = preg_replace('/^\((.*)\)$/u','$1',$value);
-
-			if (zbx_strpos($expr,'#0',zbx_strlen($expr)-3) === false) {
-//REGEXP_EXCLUDE
-				$value = str_replace('&', ' OR ', $value);
-				$value = str_replace('|', ' AND ', $value);
-			} else {
-//EGEXP_INCLUDE
-				$value = str_replace('&', ' AND ', $value);
-				$value = str_replace('|', ' OR ', $value);
-			}
-
-			$value = preg_replace($functionid,$functions,$value);
-			$value = preg_replace('/([=|#]0)/','',$value);
-
-			$expressions[$id]['view'] = trim($value);
-		}
+		// break expression into parts
+		$expressions = $constructor->getPartsFromExpression($expression);
 	}
-	else{
-		$description = get_request('description','');
-		$expressions = get_request('expressions',array());
-		$type = get_request('type',0);
-		$priority = get_request('priority',0);
-		$comments = get_request('comments','');
-		$url = get_request('url','');
-		$status = get_request('status',0);
+	else {
+		$description = getRequest('description', '');
+		$expressions = getRequest('expressions', array());
+		$type = getRequest('type', 0);
+		$priority = getRequest('priority', 0);
+		$comments = getRequest('comments', '');
+		$url = getRequest('url', '');
+		$status = getRequest('status', 0);
 	}
 
-	$keys = get_request('keys',array());
+	$keys = getRequest('keys', array());
 
 	$frmTRLog->addRow(_('Description'), new CTextBox('description', $description, 80));
 
@@ -267,117 +234,118 @@ if(isset($_REQUEST['sform'])){
 		$itemName = $template['host'].NAME_DELIMITER.$dbItem['name_expanded'];
 	}
 	else {
-		$itemName = $dbItem['name_expanded'];
+		$host = get_host_by_hostid($dbItem['hostid']);
+		$itemName = $host['name'].NAME_DELIMITER.$dbItem['name_expanded'];
 	}
 
 	$ctb = new CTextBox('item', $itemName, 80);
-	$ctb->setAttribute('id','item');
-	$ctb->setAttribute('disabled','disabled');
+	$ctb->setAttribute('id', 'item');
+	$ctb->setAttribute('disabled', 'disabled');
 
-	$script = "javascript: return PopUp('popup.php?dstfrm=".$frmTRLog->getName()."&dstfld1=itemid&dstfld2=item&srctbl=items&srcfld1=itemid&srcfld2=name',800,450);";
-	$cbtn = new CSubmit('select_item',_('Select'),$script);
+	$script = "javascript: return PopUp('popup.php?dstfrm=".$frmTRLog->getName()."&dstfld1=itemid&dstfld2=item".
+		"&srctbl=items&srcfld1=itemid&srcfld2=name',800,450);";
+	$cbtn = new CSubmit('select_item', _('Select'), $script);
 
 	$frmTRLog->addRow(_('Item'), array($ctb, $cbtn));
-	$frmTRLog->addVar('itemid',$itemid);
+	$frmTRLog->addVar('itemid', $itemid);
 
 
 	$exp_select = new CComboBox('expr_type');
-	$exp_select->setAttribute('id','expr_type');
-		$exp_select->addItem(REGEXP_INCLUDE,_('Include'));
-		$exp_select->addItem(REGEXP_EXCLUDE,_('Exclude'));
+	$exp_select->setAttribute('id', 'expr_type');
+	$exp_select->addItem(CTextTriggerConstructor::EXPRESSION_TYPE_MATCH, _('Include'));
+	$exp_select->addItem(CTextTriggerConstructor::EXPRESSION_TYPE_NO_MATCH, _('Exclude'));
 
+	$ctb = new CTextBox('expression', '', 80);
+	$ctb->setAttribute('id', 'logexpr');
 
-	$ctb = new CTextBox('expression','',80);
-	$ctb->setAttribute('id','logexpr');
-
-	$cb = new CButton('add_exp',_('Add'),'javascript: add_logexpr();');
+	$cb = new CButton('add_exp', _('Add'), 'javascript: add_logexpr();');
 	$cbAdd = new CButton('add_key_and', _('AND'), 'javascript: add_keyword_and();');
 	$cbOr = new CButton('add_key_or', _('OR'), 'javascript: add_keyword_or();');
-	$cbIregexp = new CCheckBox('iregexp', 'no', null,1);
-
+	$cbIregexp = new CCheckBox('iregexp', 'no', null, 1);
 
-	$frmTRLog->addRow(_('Expression'), array($ctb,BR(),$cbIregexp,'iregexp',SPACE,$cbAdd,SPACE,$cbOr,SPACE,$exp_select,SPACE, $cb));
+	$frmTRLog->addRow(_('Expression'),
+		array($ctb, BR(), $cbIregexp, 'iregexp', SPACE, $cbAdd, SPACE, $cbOr, SPACE, $exp_select, SPACE, $cb)
+	);
 
 	$keyTable = new CTableInfo(null);
-	$keyTable->setAttribute('id','key_list');
+	$keyTable->setAttribute('id', 'key_list');
 	$keyTable->setHeader(array(_('Keyword'), _('Type'), _('Action')));
 
 	$table = new CTableInfo(null);
-	$table->setAttribute('id','exp_list');
+	$table->setAttribute('id', 'exp_list');
 	$table->setHeader(array(_('Expression'), _('Type'), _('Position'), _('Action')));
 
-	$maxid=0;
-
-	$bExprResult = true;
-	$expressionData = new CTriggerExpression();
-	if (isset($_REQUEST['triggerid']) && !isset($_REQUEST['save_trigger'])
-			&& !$expressionData->parse(empty($expressions) ? '' : construct_expression($itemid, $expressions))
-			&& !isset($_REQUEST['form_refresh'])) {
-
-		info($expressionData->error);
-
-		unset($expressions);
-		$expressions[0]['value'] = $expr_incase;
-		$expressions[0]['type'] = 0;
-		$expressions[0]['view'] = $expr_incase;
-		$bExprResult = false;
-	}
-
-	foreach($expressions as $id => $expr){
-
-		$imgup = new CImg('images/general/arrow_up.png','up',12,14);
-		$imgup->setAttribute('onclick','javascript:  element_up("logtr'.$id.'");');
-		$imgup->setAttribute('onmouseover','javascript: this.style.cursor = "pointer";');
-
-		$imgdn = new CImg('images/general/arrow_down.png','down',12,14);
-		$imgdn->setAttribute('onclick','javascript:  element_down("logtr'.$id.'");');
-		$imgdn->setAttribute('onmouseover','javascript: this.style.cursor = "pointer";');
-
-		$del_url = new CSpan(_('Delete'),'link');
-		$del_url->setAttribute('onclick', 'javascript: if(confirm("'._('Delete expression?').'")) remove_expression("logtr'.$id.'"); return false;');
-
-		$row = new CRow(array(htmlspecialchars($expr['view']),(($expr['type']==REGEXP_INCLUDE)?_('Include'):_('Exclude')),array($imgup,SPACE,$imgdn),$del_url));
-		$row->setAttribute('id','logtr'.$id);
+	$maxId = 0;
+	foreach ($expressions as $id => $expr) {
+		$imgup = new CImg('images/general/arrow_up.png', 'up', 12, 14);
+		$imgup->setAttribute('onclick', 'javascript: element_up("logtr'.$id.'");');
+		$imgup->setAttribute('onmouseover', 'javascript: this.style.cursor = "pointer";');
+		$imgup->addClass('updown');
+
+		$imgdn = new CImg('images/general/arrow_down.png', 'down', 12, 14);
+		$imgdn->setAttribute('onclick', 'javascript: element_down("logtr'.$id.'");');
+		$imgdn->setAttribute('onmouseover', 'javascript: this.style.cursor = "pointer";');
+		$imgdn->addClass('updown');
+
+		$del_url = new CSpan(_('Delete'), 'link');
+		$del_url->setAttribute('onclick', 'javascript:'.
+			' if (confirm('.CJs::encodeJson(_('Delete expression?')).')) remove_expression("logtr'.$id.'");'.
+			' return false;'
+		);
+
+		$row = new CRow(array(
+			htmlspecialchars($expr['value']),
+			($expr['type'] == CTextTriggerConstructor::EXPRESSION_TYPE_MATCH) ? _('Include') : _('Exclude'),
+			array($imgup, ' ', $imgdn),
+			$del_url
+		));
+		$row->setAttribute('id', 'logtr'.$id);
 		$table->addRow($row);
 
-		$frmTRLog->addVar('expressions['.$id.'][value]',$expr['value']);
-		$frmTRLog->addVar('expressions['.$id.'][type]',$expr['type']);
-		$frmTRLog->addVar('expressions['.$id.'][view]',$expr['view']);
+		$frmTRLog->addVar('expressions['.$id.'][value]', $expr['value']);
+		$frmTRLog->addVar('expressions['.$id.'][type]', $expr['type']);
 
-		$maxid = ($maxid<$id)?$id:$maxid;
+		$maxId = max($maxId, $id);
 	}
-	zbx_add_post_js('logexpr_count='.($maxid+1).';');
 
-	$maxid=0;
-	foreach($keys as $id => $val){
-		$del_url = new CLink(_('Delete'),'#','action','javascript: if(confirm("'._('Delete keyword?').'")) remove_keyword("keytr'.$id.'"); return false;');
-		$row = new CRow(array(htmlspecialchars($val['value']),$val['type'],$del_url));
-		$row->setAttribute('id','keytr'.$id);
+	zbx_add_post_js('logexpr_count='.($maxId + 1).';');
+	zbx_add_post_js('processExpressionList();');
+
+	$maxId = 0;
+	foreach ($keys as $id => $val) {
+		$del_url = new CLink(_('Delete'), '#', 'action', 'javascript:'.
+			' if (confirm('.CJs::encodeJson(_('Delete keyword?')).')) remove_keyword("keytr'.$id.'");'.
+			' return false;'
+		);
+		$row = new CRow(array(htmlspecialchars($val['value']), $val['type'], $del_url));
+		$row->setAttribute('id', 'keytr'.$id);
 		$keyTable->addRow($row);
 
-		$frmTRLog->addVar('keys['.$id.'][value]',$val['value']);
-		$frmTRLog->addVar('keys['.$id.'][type]',$val['type']);
+		$frmTRLog->addVar('keys['.$id.'][value]', $val['value']);
+		$frmTRLog->addVar('keys['.$id.'][type]', $val['type']);
 
-		$maxid = ($maxid<$id)?$id:$maxid;
+		$maxId = max($maxId, $id);
 	}
-	zbx_add_post_js('key_count='.($maxid+1).';');
+
+	zbx_add_post_js('key_count='.($maxId + 1).';');
 
 	$frmTRLog->addRow(SPACE, $keyTable);
 	$frmTRLog->addRow(SPACE, $table);
 
 	$sev_select = new CComboBox('priority', $priority);
 	$sev_select->addItems(getSeverityCaption());
+
 	$frmTRLog->addRow(_('Severity'), $sev_select);
 	$frmTRLog->addRow(_('Comments'), new CTextArea('comments', $comments));
 	$frmTRLog->addRow(_('URL'), new CTextBox('url', $url, 80));
-	$frmTRLog->addRow(_('Disabled'), new CCheckBox('status', $status == TRIGGER_STATUS_DISABLED ? 'yes' : 'no', null, 1));
-	$frmTRLog->addItemToBottomRow(new CSubmit('save_trigger', _('Save'), 'javascript: document.forms[0].action += \'?saction=1\';'));
+	$frmTRLog->addRow(_('Disabled'),
+		new CCheckBox('status', $status == TRIGGER_STATUS_DISABLED ? 'yes' : 'no', null, 1)
+	);
+	$frmTRLog->addItemToBottomRow(new CSubmit('save_trigger', _('Save')));
 	$frmTRLog->addItemToBottomRow(SPACE);
 	$frmTRLog->addItemToBottomRow(new CButton('cancel', _('Cancel'), 'javascript: self.close();'));
 
-	if ($bExprResult) {
-		$frmTRLog->show();
-	}
+	$frmTRLog->show();
 }
 
 require_once dirname(__FILE__).'/include/page_footer.php';
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php
index c7569489a36..cc644f5e5e0 100644
--- a/frontends/php/tr_status.php
+++ b/frontends/php/tr_status.php
@@ -54,7 +54,10 @@ $fields = array(
 	'application' =>		array(T_ZBX_STR, O_OPT, null,	null,		null),
 	'inventory' =>			array(T_ZBX_STR, O_OPT, null,	null,		null),
 	// ajax
-	'filterState' =>		array(T_ZBX_INT, O_OPT, P_ACT,	null,		null)
+	'filterState' =>		array(T_ZBX_INT, O_OPT, P_ACT,	null,		null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"description","lastchange","priority"'),	null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
 
@@ -94,8 +97,8 @@ $pageFilter = new CPageFilter(array(
 		'monitored_hosts' => true,
 		'with_monitored_triggers' => true
 	),
-	'hostid' => getRequest('hostid', null),
-	'groupid' => getRequest('groupid', null)
+	'hostid' => getRequest('hostid'),
+	'groupid' => getRequest('groupid')
 ));
 $_REQUEST['groupid'] = $pageFilter->groupid;
 $_REQUEST['hostid'] = $pageFilter->hostid;
@@ -123,51 +126,28 @@ if (hasRequest('filter_set')) {
 
 	// show events
 	$showEvents = getRequest('show_events', EVENTS_OPTION_NOEVENT);
-
-	if (hasRequest('show_events')) {
-		if ($config['event_ack_enable'] == EVENT_ACK_DISABLED) {
-			if (!str_in_array($showEvents, array(EVENTS_OPTION_NOEVENT, EVENTS_OPTION_ALL))) {
-				$showEvents = EVENTS_OPTION_NOEVENT;
-			}
-		}
-
+	if ($config['event_ack_enable'] == EVENT_ACK_ENABLED || $showEvents != EVENTS_OPTION_NOT_ACK) {
 		CProfile::update('web.tr_status.filter.show_events', $showEvents, PROFILE_TYPE_INT);
 	}
 
 	// ack status
-	$ackStatus = getRequest('ack_status', ZBX_ACK_STS_ANY);
-
-	if (hasRequest('ack_status')) {
-		if ($config['event_ack_enable'] == EVENT_ACK_DISABLED) {
-			$ackStatus = ZBX_ACK_STS_ANY;
-		}
-
-		CProfile::update('web.tr_status.filter.ack_status', $ackStatus, PROFILE_TYPE_INT);
+	if ($config['event_ack_enable'] == EVENT_ACK_ENABLED) {
+		CProfile::update('web.tr_status.filter.ack_status', getRequest('ack_status', ZBX_ACK_STS_ANY), PROFILE_TYPE_INT);
 	}
 
 	// update host inventory filter
-	$i = 0;
+	$inventoryFields = array();
+	$inventoryValues = array();
 	foreach (getRequest('inventory', array()) as $field) {
 		if ($field['value'] === '') {
 			continue;
 		}
 
-		CProfile::update('web.tr_status.filter.inventory.field', $field['field'], PROFILE_TYPE_STR, $i);
-		CProfile::update('web.tr_status.filter.inventory.value', $field['value'], PROFILE_TYPE_STR, $i);
-
-		$i++;
+		$inventoryFields[] = $field['field'];
+		$inventoryValues[] = $field['value'];
 	}
-
-	// delete remaining old values
-	$idx2 = array();
-	while (CProfile::get('web.tr_status.filter.inventory.field', null, $i) !== null) {
-		$idx2[] = $i;
-
-		$i++;
-	}
-
-	CProfile::delete('web.tr_status.filter.inventory.field', $idx2);
-	CProfile::delete('web.tr_status.filter.inventory.value', $idx2);
+	CProfile::updateArray('web.tr_status.filter.inventory.field', $inventoryFields, PROFILE_TYPE_STR);
+	CProfile::updateArray('web.tr_status.filter.inventory.value', $inventoryValues, PROFILE_TYPE_STR);
 }
 elseif (hasRequest('filter_rst')) {
 	DBStart();
@@ -212,25 +192,27 @@ $filter = array(
 	'application' => CProfile::get('web.tr_status.filter.application', ''),
 	'inventory' => array()
 );
-$i = 0;
-while (CProfile::get('web.tr_status.filter.inventory.field', null, $i) !== null) {
+
+foreach (CProfile::getArray('web.tr_status.filter.inventory.field', array()) as $i => $field) {
 	$filter['inventory'][] = array(
-		'field' => CProfile::get('web.tr_status.filter.inventory.field', null, $i),
+		'field' => $field,
 		'value' => CProfile::get('web.tr_status.filter.inventory.value', null, $i)
 	);
-
-	$i++;
 }
 
 /*
  * Page sorting
  */
-validate_sort_and_sortorder('lastchange', ZBX_SORT_DOWN);
+$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'lastchange'));
+$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_DOWN));
+
+CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
 
 /*
  * Display
  */
-$triggerWidget = new CWidget(null, 'trigger-mon');
+$triggerWidget = new CWidget();
 
 $rightForm = new CForm('get');
 $rightForm->addItem(array(_('Group').SPACE, $pageFilter->getGroupsCB()));
@@ -238,112 +220,33 @@ $rightForm->addItem(array(SPACE._('Host').SPACE, $pageFilter->getHostsCB()));
 $rightForm->addVar('fullscreen', $_REQUEST['fullscreen']);
 
 $triggerWidget->addPageHeader(
-	_('STATUS OF TRIGGERS').SPACE.'['.zbx_date2str(_('d M Y H:i:s')).']',
+	_('STATUS OF TRIGGERS').SPACE.'['.zbx_date2str(DATE_TIME_FORMAT_SECONDS).']',
 	get_icon('fullscreen', array('fullscreen' => $_REQUEST['fullscreen']))
 );
 $triggerWidget->addHeader(_('Triggers'), $rightForm);
 $triggerWidget->addHeaderRowNumber();
 
-/*
- * Filter
- */
-$filterForm = new CFormTable(null, null, 'get');
-$filterForm->setAttribute('name', 'zbx_filter');
-$filterForm->setAttribute('id', 'zbx_filter');
-$filterForm->addVar('fullscreen', $_REQUEST['fullscreen']);
-$filterForm->addVar('groupid', $_REQUEST['groupid']);
-$filterForm->addVar('hostid', $_REQUEST['hostid']);
-
-$statusComboBox = new CComboBox('show_triggers', $showTriggers);
-$statusComboBox->addItem(TRIGGERS_OPTION_ALL, _('Any'));
-$statusComboBox->additem(TRIGGERS_OPTION_RECENT_PROBLEM, _('Recent problem'));
-$statusComboBox->additem(TRIGGERS_OPTION_IN_PROBLEM, _('Problem'));
-$filterForm->addRow(_('Triggers status'), $statusComboBox);
-
-if ($config['event_ack_enable']) {
-	$ackStatusComboBox = new CComboBox('ack_status', $ackStatus);
-	$ackStatusComboBox->addItem(ZBX_ACK_STS_ANY, _('Any'));
-	$ackStatusComboBox->additem(ZBX_ACK_STS_WITH_UNACK, _('With unacknowledged events'));
-	$ackStatusComboBox->additem(ZBX_ACK_STS_WITH_LAST_UNACK, _('With last event unacknowledged'));
-	$filterForm->addRow(_('Acknowledge status'), $ackStatusComboBox);
-}
-
-$eventsComboBox = new CComboBox('show_events', $showEvents);
-$eventsComboBox->addItem(EVENTS_OPTION_NOEVENT, _('Hide all'));
-$eventsComboBox->addItem(EVENTS_OPTION_ALL, _('Show all').' ('.$config['event_expire'].' '.(($config['event_expire'] > 1) ? _('Days') : _('Day')).')');
-if ($config['event_ack_enable']) {
-	$eventsComboBox->addItem(EVENTS_OPTION_NOT_ACK, _('Show unacknowledged').' ('.$config['event_expire'].' '.(($config['event_expire'] > 1) ? _('Days') : _('Day')).')');
-}
-$filterForm->addRow(_('Events'), $eventsComboBox);
-
-$severityComboBox = new CComboBox('show_severity', $showSeverity);
-$severityComboBox->addItems(array(
-	TRIGGER_SEVERITY_NOT_CLASSIFIED => getSeverityCaption(TRIGGER_SEVERITY_NOT_CLASSIFIED),
-	TRIGGER_SEVERITY_INFORMATION => getSeverityCaption(TRIGGER_SEVERITY_INFORMATION),
-	TRIGGER_SEVERITY_WARNING => getSeverityCaption(TRIGGER_SEVERITY_WARNING),
-	TRIGGER_SEVERITY_AVERAGE => getSeverityCaption(TRIGGER_SEVERITY_AVERAGE),
-	TRIGGER_SEVERITY_HIGH => getSeverityCaption(TRIGGER_SEVERITY_HIGH),
-	TRIGGER_SEVERITY_DISASTER => getSeverityCaption(TRIGGER_SEVERITY_DISASTER)
-));
-$filterForm->addRow(_('Minimum trigger severity'), $severityComboBox);
-
-$statusChangeDays = new CNumericBox('status_change_days', $statusChangeBydays, 3, false, false, false);
-if (!$showChange) {
-	$statusChangeDays->setAttribute('disabled', 'disabled');
-}
-$statusChangeDays->addStyle('vertical-align: middle;');
-
-$statusChangeCheckBox = new CCheckBox('status_change', $showChange, 'javascript: this.checked ? $("status_change_days").enable() : $("status_change_days").disable()', 1);
-$statusChangeCheckBox->addStyle('vertical-align: middle;');
-
-$daysSpan = new CSpan(_('days'));
-$daysSpan->addStyle('vertical-align: middle;');
-$filterForm->addRow(_('Age less than'), array($statusChangeCheckBox, $statusChangeDays, SPACE, $daysSpan));
-$filterForm->addRow(_('Show details'), new CCheckBox('show_details', $showDetails, null, 1));
-$filterForm->addRow(_('Filter by name'), new CTextBox('txt_select', $txtSelect, 40));
-$filterForm->addRow(_('Filter by application'), array(
-	new CTextBox('application', $filter['application'], 40),
-	new CButton('application_name', _('Select'),
-		'return PopUp("popup.php?srctbl=applications&srcfld1=name&real_hosts=1&dstfld1=application&with_applications=1'.
-			'&dstfrm='.$filterForm->getName().'");',
-		'filter-button'
+// filter
+$filterFormView = new CView('common.filter.trigger', array(
+	'overview' => false,
+	'filter' => array(
+		'showTriggers' => $showTriggers,
+		'ackStatus' => $ackStatus,
+		'showEvents' => $showEvents,
+		'showSeverity' => $showSeverity,
+		'statusChange' => $showChange,
+		'statusChangeDays' => $statusChangeBydays,
+		'showDetails' => $showDetails,
+		'txtSelect' => $txtSelect,
+		'application' => $filter['application'],
+		'inventory' => $filter['inventory'],
+		'showMaintenance' => $showMaintenance,
+		'hostId' => getRequest('hostid'),
+		'groupId' => getRequest('groupid'),
+		'fullScreen' => getRequest('fullscreen')
 	)
 ));
-
-// inventory filter
-$inventoryFilters = $filter['inventory'];
-if (!$inventoryFilters) {
-	$inventoryFilters = array(
-		array('field' => '', 'value' => '')
-	);
-}
-$inventoryFields = array();
-foreach (getHostInventories() as $inventory) {
-	$inventoryFields[$inventory['db_field']] = $inventory['title'];
-}
-
-$inventoryFilterTable = new CTable();
-$inventoryFilterTable->setAttribute('id', 'inventory-filter');
-$i = 0;
-foreach ($inventoryFilters as $field) {
-	$inventoryFilterTable->addRow(array(
-		new CComboBox('inventory['.$i.'][field]', $field['field'], null, $inventoryFields),
-		new CTextBox('inventory['.$i.'][value]', $field['value'], 20),
-		new CButton('inventory['.$i.'][remove]', _('Remove'), null, 'link_menu element-table-remove')
-	), 'form_row');
-
-	$i++;
-}
-$inventoryFilterTable->addRow(
-	new CCol(new CButton('inventory_add', _('Add'), null, 'link_menu element-table-add'), null, 3)
-);
-$filterForm->addRow(_('Filter by host inventory'), $inventoryFilterTable);
-
-// maintenance filter
-$filterForm->addRow(_('Show hosts in maintenance'), new CCheckBox('show_maintenance', $showMaintenance, null, 1));
-
-$filterForm->addItemToBottomRow(new CSubmit('filter_set', _('Filter'), 'chkbxRange.clearSelectedOnFilterChange();'));
-$filterForm->addItemToBottomRow(new CSubmit('filter_rst', _('Reset'), 'chkbxRange.clearSelectedOnFilterChange();'));
+$filterForm = $filterFormView->render();
 
 $triggerWidget->addFlicker($filterForm, CProfile::get('web.tr_status.filter.state', 0));
 
@@ -383,28 +286,25 @@ $triggerTable = new CTableInfo(_('No triggers found.'));
 $triggerTable->setHeader(array(
 	$showHideAllDiv,
 	$config['event_ack_enable'] ? $headerCheckBox : null,
-	make_sorting_header(_('Severity'), 'priority'),
+	make_sorting_header(_('Severity'), 'priority', $sortField, $sortOrder),
 	_('Status'),
 	_('Info'),
-	make_sorting_header(_('Last change'), 'lastchange'),
+	make_sorting_header(_('Last change'), 'lastchange', $sortField, $sortOrder),
 	_('Age'),
 	$showEventColumn ? _('Duration') : null,
 	$config['event_ack_enable'] ? _('Acknowledged') : null,
 	_('Host'),
-	make_sorting_header(_('Name'), 'description'),
-	_('Comments')
+	make_sorting_header(_('Name'), 'description', $sortField, $sortOrder),
+	_('Description')
 ));
 
 // get triggers
-$sortfield = getPageSortField('description');
-$sortorder = getPageSortOrder();
 $options = array(
-	'output' => array('triggerid', $sortfield),
-	'output' => array('triggerid', $sortfield),
+	'output' => array('triggerid', $sortField),
 	'monitored' => true,
 	'skipDependent' => true,
-	'sortfield' => $sortfield,
-	'sortorder' => $sortorder,
+	'sortfield' => $sortField,
+	'sortorder' => $sortOrder,
 	'limit' => $config['search_limit'] + 1
 );
 
@@ -471,14 +371,22 @@ if (!$showMaintenance) {
 }
 $triggers = API::Trigger()->get($options);
 
-order_result($triggers, $sortfield, $sortorder);
+order_result($triggers, $sortField, $sortOrder);
 $paging = getPagingLine($triggers);
 
 
 $triggers = API::Trigger()->get(array(
 	'triggerids' => zbx_objectValues($triggers, 'triggerid'),
 	'output' => API_OUTPUT_EXTEND,
-	'selectHosts' => array('hostid', 'name', 'maintenance_status', 'maintenance_type', 'maintenanceid', 'description'),
+	'selectHosts' => array(
+		'hostid',
+		'name',
+		'description',
+		'status',
+		'maintenanceid',
+		'maintenance_status',
+		'maintenance_type'
+	),
 	'selectItems' => array('itemid', 'hostid', 'key_', 'name', 'value_type'),
 	'selectDependencies' => API_OUTPUT_EXTEND,
 	'selectLastEvent' => true,
@@ -486,7 +394,7 @@ $triggers = API::Trigger()->get(array(
 	'preservekeys' => true
 ));
 
-order_result($triggers, $sortfield, $sortorder);
+order_result($triggers, $sortField, $sortOrder);
 
 // sort trigger hosts by name
 foreach ($triggers as &$trigger) {
@@ -508,7 +416,7 @@ $triggerEditable = API::Trigger()->get(array(
 
 // get events
 if ($config['event_ack_enable']) {
-	// get all unacknowledged events, if trigger has unacknowledged even => it has events
+	// get all unacknowledged events, if trigger has unacknowledged event => it has events
 	$eventCounts = API::Event()->get(array(
 		'source' => EVENT_SOURCE_TRIGGERS,
 		'object' => EVENT_OBJECT_TRIGGER,
@@ -592,7 +500,7 @@ foreach ($triggers as $tnum => $trigger) {
 
 // get hosts
 $hosts = API::Host()->get(array(
-	'output' => array('hostid'),
+	'output' => array('hostid', 'status'),
 	'hostids' => $hostIds,
 	'preservekeys' => true,
 	'selectGraphs' => API_OUTPUT_COUNT,
@@ -630,7 +538,7 @@ foreach ($triggers as $trigger) {
 			'params' => array(
 				'itemid' => $item['itemid'],
 				'action' => in_array($item['value_type'], array(ITEM_VALUE_TYPE_FLOAT, ITEM_VALUE_TYPE_UINT64))
-					? 'showgraph' : 'showvalues'
+					? HISTORY_GRAPH : HISTORY_VALUES
 			)
 		);
 	}
@@ -639,7 +547,11 @@ foreach ($triggers as $trigger) {
 	$description->setMenuPopup(CMenuPopupHelper::getTrigger($trigger, $triggerItems));
 
 	if ($showDetails) {
-		$description = array($description, BR(), explode_exp($trigger['expression'], true, true));
+		$description = array(
+			$description,
+			BR(),
+			new CDiv(explode_exp($trigger['expression'], true, true), 'trigger-expression')
+		);
 	}
 
 	if (!empty($trigger['dependencies'])) {
@@ -651,7 +563,7 @@ foreach ($triggers as $trigger) {
 			$dependenciesTable->addRow(' - '.CMacrosResolverHelper::resolveTriggerNameById($dependency['triggerid']));
 		}
 
-		$img = new Cimg('images/general/arrow_down2.png', 'DEP_UP');
+		$img = new CImg('images/general/arrow_down2.png', 'DEP_UP');
 		$img->setAttribute('style', 'vertical-align: middle; border: 0px;');
 		$img->setHint($dependenciesTable);
 
@@ -672,7 +584,7 @@ foreach ($triggers as $trigger) {
 	}
 
 	if ($dependency) {
-		$img = new Cimg('images/general/arrow_up2.png', 'DEP_UP');
+		$img = new CImg('images/general/arrow_up2.png', 'DEP_UP');
 		$img->setAttribute('style', 'vertical-align: middle; border: 0px;');
 		$img->setHint($dependenciesTable);
 
@@ -748,7 +660,7 @@ foreach ($triggers as $trigger) {
 		$config['event_ack_enable'] ? ($trigger['event_count'] == 0) : false
 	);
 
-	$lastChangeDate = zbx_date2str(_('d M Y H:i:s'), $trigger['lastchange']);
+	$lastChangeDate = zbx_date2str(DATE_TIME_FORMAT_SECONDS, $trigger['lastchange']);
 	$lastChange = empty($trigger['lastchange'])
 		? $lastChangeDate
 		: new CLink($lastChangeDate,
@@ -812,7 +724,7 @@ foreach ($triggers as $trigger) {
 	$unknown = SPACE;
 	if ($trigger['state'] == TRIGGER_STATE_UNKNOWN) {
 		$unknown = new CDiv(SPACE, 'status_icon iconunknown');
-		$unknown->setHint($trigger['error'], '', 'on');
+		$unknown->setHint($trigger['error'], 'on');
 	}
 
 	// comments
@@ -865,7 +777,7 @@ foreach ($triggers as $trigger) {
 				? new CCheckBox('events['.$event['eventid'].']', 'no', null, $event['eventid'])
 				: SPACE;
 
-			$clock = new CLink(zbx_date2str(_('d M Y H:i:s'), $event['clock']),
+			$clock = new CLink(zbx_date2str(DATE_TIME_FORMAT_SECONDS, $event['clock']),
 				'tr_events.php?triggerid='.$trigger['triggerid'].'&eventid='.$event['eventid']);
 
 			$nextClock = isset($trigger['events'][$enum - 1]) ? $trigger['events'][$enum - 1]['clock'] : time();
@@ -901,8 +813,8 @@ foreach ($triggers as $trigger) {
  */
 $footer = null;
 if ($config['event_ack_enable']) {
-	$goComboBox = new CComboBox('go');
-	$goComboBox->addItem('bulkacknowledge', _('Bulk acknowledge'));
+	$goComboBox = new CComboBox('action');
+	$goComboBox->addItem('trigger.bulkacknowledge', _('Bulk acknowledge'));
 
 	$goButton = new CSubmit('goButton', _('Go').' (0)');
 	$goButton->setAttribute('id', 'goButton');
@@ -921,6 +833,4 @@ $triggerWidget->show();
 zbx_add_post_js('jqBlink.blink();');
 zbx_add_post_js('var switcher = new CSwitcher(\''.$switcherName.'\');');
 
-require_once dirname(__FILE__).'/include/views/js/monitoring.triggers.js.php';
-
 require_once dirname(__FILE__).'/include/page_footer.php';
diff --git a/frontends/php/tr_testexpr.php b/frontends/php/tr_testexpr.php
index 1f10fee3584..7b9e7721711 100644
--- a/frontends/php/tr_testexpr.php
+++ b/frontends/php/tr_testexpr.php
@@ -27,7 +27,7 @@ $page['file'] = 'tr_testexpr.php';
 
 define('ZBX_PAGE_NO_MENU', 1);
 define('COMBO_PATTERN', 'str_in_array({},array(');
-define('COMBO_PATTERN_LENGTH', zbx_strlen(COMBO_PATTERN));
+define('COMBO_PATTERN_LENGTH', strlen(COMBO_PATTERN));
 
 $definedErrorPhrases = array(
 	EXPRESSION_HOST_UNKNOWN => _('Unknown host, no such host present in system'),
@@ -39,7 +39,7 @@ $definedErrorPhrases = array(
 require_once dirname(__FILE__).'/include/page_header.php';
 
 // expression analyze
-$expression = get_request('expression', '');
+$expression = getRequest('expression', '');
 
 define('NO_LINK_IN_TESTING', true);
 list($outline, $eHTMLTree) = analyzeExpression($expression);
@@ -55,49 +55,57 @@ $rplcts = array();
 $allowedTesting = true;
 
 $expressionData = new CTriggerExpression();
-if ($expressionData->parse($expression)) {
+$result = $expressionData->parse($expression);
+if ($result) {
 	$macrosData = array();
 
-	$expressions = array_merge($expressionData->expressions, $expressionData->macros, $expressionData->usermacros, $expressionData->lldmacros);
-
-	foreach ($expressions as $exprPart) {
-		if (isset($macrosData[$exprPart['expression']])) {
+	$supportedTokenTypes = array(
+		CTriggerExpressionParserResult::TOKEN_TYPE_FUNCTION_MACRO => 1,
+		CTriggerExpressionParserResult::TOKEN_TYPE_MACRO => 1,
+		CTriggerExpressionParserResult::TOKEN_TYPE_USER_MACRO => 1,
+		CTriggerExpressionParserResult::TOKEN_TYPE_LLD_MACRO => 1
+	);
+	foreach ($result->getTokens() as $token) {
+		if (!isset($supportedTokenTypes[$token['type']]) || isset($macrosData[$token['value']])) {
 			continue;
 		}
 
-		$fname = 'test_data_'.md5($exprPart['expression']);
-		$macrosData[$exprPart['expression']] = get_request($fname, '');
+		$fname = 'test_data_'.md5($token['value']);
+		$macrosData[$token['value']] = getRequest($fname, '');
 
-		$info = get_item_function_info($exprPart['expression']);
+		$info = get_item_function_info($token['value']);
 
 		if (!is_array($info) && isset($definedErrorPhrases[$info])) {
 			$allowedTesting = false;
-			$control = new CTextBox($fname, $macrosData[$exprPart['expression']], 30);
+			$control = new CTextBox($fname, $macrosData[$token['value']], 30);
 			$control->setAttribute('disabled', 'disabled');
 		}
 		else {
 			$validation = $info['validation'];
 
 			if (substr($validation, 0, COMBO_PATTERN_LENGTH) == COMBO_PATTERN) {
-				$vals = explode(',', substr($validation, COMBO_PATTERN_LENGTH, zbx_strlen($validation) - COMBO_PATTERN_LENGTH - 4));
-				$control = new CComboBox($fname, $macrosData[$exprPart['expression']]);
+				$end = strlen($validation) - COMBO_PATTERN_LENGTH - 4;
+				$vals = explode(',', substr($validation, COMBO_PATTERN_LENGTH, $end));
+				$control = new CComboBox($fname, $macrosData[$token['value']]);
 
 				foreach ($vals as $v) {
 					$control->addItem($v, $v);
 				}
 			}
 			else {
-				$control = new CTextBox($fname, $macrosData[$exprPart['expression']], 30);
+				$control = new CTextBox($fname, $macrosData[$token['value']], 30);
 			}
 
-			$fields[$fname] = array($info['type'], O_OPT, null, $validation, 'isset({test_expression})', $exprPart['expression']);
+			$fields[$fname] = array($info['type'], O_OPT, null, $validation, 'isset({test_expression})',
+				$token['value']
+			);
 		}
 
 		$resultType = (is_array($info) || !isset($definedErrorPhrases[$info]))
 			? $info['value_type']
 			: new CCol($definedErrorPhrases[$info], 'disaster');
 
-		$dataTable->addRow(new CRow(array($exprPart['expression'], $resultType, $control)));
+		$dataTable->addRow(new CRow(array($token['value'], $resultType, $control)));
 	}
 }
 
@@ -118,9 +126,8 @@ else {
 
 // form
 $testForm = new CFormTable(_('Test'), 'tr_testexpr.php');
-$testForm->setHelp('web.testexpr.service.php');
+$testForm->addHelpIcon();
 $testForm->setTableClass('formlongtable formtable');
-$testForm->addVar('form_refresh', get_request('form_refresh', 1));
 $testForm->addVar('expression', $expression);
 $testForm->addRow(_('Test data'), $dataTable);
 
@@ -133,39 +140,41 @@ $resultTable->setHeader(array(_('Expression'), _('Result')));
 ksort($rplcts, SORT_NUMERIC);
 
 foreach ($eHTMLTree as $e) {
-	$result = array('result' => '-', 'error' => '');
+	$result = '-';
+	$style = 'text-align: center;';
 
 	if ($allowedTesting && $test && isset($e['expression'])) {
-		$result = evalExpressionData($e['expression']['value'], $macrosData);
-	}
-
-	$style = 'text-align: center;';
-	if ($result['result'] != '-') {
-		$style = ($result['result'] == 'TRUE')
-			? 'background-color: #ccf; color: #00f;'
-			: 'background-color: #fcc; color: #f00;';
+		if (evalExpressionData($e['expression']['value'], $macrosData)) {
+			$result = 'TRUE';
+			$style = 'background-color: #ccf; color: #00f;';
+		}
+		else {
+			$result = 'FALSE';
+			$style = 'background-color: #fcc; color: #f00;';
+		}
 	}
 
-	$col = new CCol(array($result['result'], SPACE, $result['error']));
+	$col = new CCol($result);
 	$col->setAttribute('style', $style);
 
 	$resultTable->addRow(new CRow(array($e['list'], $col)));
 }
 
-$result = array('result' => '-', 'error' => '');
+$result = '-';
+$style = 'text-align: center;';
 
 if ($allowedTesting && $test) {
-	$result = evalExpressionData($expression, $macrosData);
-}
-
-$style = 'text-align: center;';
-if ($result['result'] != '-') {
-	$style = ($result['result'] == 'TRUE')
-		? 'background-color: #ccf; color: #00f;'
-		: 'background-color: #fcc; color: #f00;';
+	if (evalExpressionData($expression, $macrosData)) {
+		$result = 'TRUE';
+		$style = 'background-color: #ccf; color: #00f;';
+	}
+	else {
+		$result = 'FALSE';
+		$style = 'background-color: #fcc; color: #f00;';
+	}
 }
 
-$col = new CCol(array($result['result'], SPACE, $result['error']));
+$col = new CCol($result);
 $col->setAttribute('style', $style);
 
 $resultTable->setFooter(array($outline, $col), $resultTable->headerClass);
diff --git a/frontends/php/trigger_prototypes.php b/frontends/php/trigger_prototypes.php
index 78ecad25723..7696ba05627 100644
--- a/frontends/php/trigger_prototypes.php
+++ b/frontends/php/trigger_prototypes.php
@@ -55,9 +55,14 @@ $fields = array(
 	'filter_groupid' =>		array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		'isset({copy})&&(isset({copy_type})&&({copy_type}==0))'),
 	'showdisabled' =>		array(T_ZBX_INT, O_OPT, P_SYS,	IN('0,1'),	null),
 	// actions
-	'massupdate' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+								IN('"triggerprototype.massdelete","triggerprototype.massdisable",'.
+									'"triggerprototype.massenable","triggerprototype.massupdate",'.
+									'"triggerprototype.massupdateform"'
+								),
+								null
+							),
 	'visible' =>			array(T_ZBX_STR, O_OPT, null,	null,		null),
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'toggle_input_method' =>array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'add_expression' => 	array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'and_expression' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -77,19 +82,20 @@ $fields = array(
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
-	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,	null,		null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,	null,		null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"description","priority","status"'),		null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
-$_REQUEST['showdisabled'] = get_request('showdisabled', CProfile::get('web.triggers.showdisabled', 1));
+$_REQUEST['showdisabled'] = getRequest('showdisabled', CProfile::get('web.triggers.showdisabled', 1));
 
 check_fields($fields);
-validate_sort_and_sortorder('description', ZBX_SORT_UP);
 
 $_REQUEST['status'] = isset($_REQUEST['status']) ? TRIGGER_STATUS_ENABLED : TRIGGER_STATUS_DISABLED;
 $_REQUEST['type'] = isset($_REQUEST['type']) ? TRIGGER_MULT_EVENT_ENABLED : TRIGGER_MULT_EVENT_DISABLED;
-$_REQUEST['go'] = get_request('go', 'none');
 
 // validate permissions
-if (get_request('parent_discoveryid')) {
+if (getRequest('parent_discoveryid')) {
 	$discovery_rule = API::DiscoveryRule()->get(array(
 		'itemids' => $_REQUEST['parent_discoveryid'],
 		'output' => API_OUTPUT_EXTEND,
@@ -117,27 +123,28 @@ else {
 	access_deny();
 }
 
-$showdisabled = get_request('showdisabled', 0);
+$showdisabled = getRequest('showdisabled', 0);
 CProfile::update('web.triggers.showdisabled', $showdisabled, PROFILE_TYPE_INT);
 
 /*
  * Actions
  */
+$exprAction = null;
 if (isset($_REQUEST['add_expression'])) {
 	$_REQUEST['expression'] = $_REQUEST['expr_temp'];
 	$_REQUEST['expr_temp'] = '';
 }
 elseif (isset($_REQUEST['and_expression'])) {
-	$_REQUEST['expr_action'] = '&';
+	$exprAction = 'and';
 }
 elseif (isset($_REQUEST['or_expression'])) {
-	$_REQUEST['expr_action'] = '|';
+	$exprAction = 'or';
 }
 elseif (isset($_REQUEST['replace_expression'])) {
-	$_REQUEST['expr_action'] = 'r';
+	$exprAction = 'r';
 }
-elseif (isset($_REQUEST['remove_expression']) && zbx_strlen($_REQUEST['remove_expression'])) {
-	$_REQUEST['expr_action'] = 'R';
+elseif (getRequest('remove_expression')) {
+	$exprAction = 'R';
 	$_REQUEST['expr_target_single'] = $_REQUEST['remove_expression'];
 }
 elseif (isset($_REQUEST['clone']) && isset($_REQUEST['triggerid'])) {
@@ -170,7 +177,7 @@ elseif (hasRequest('save')) {
 
 	if ($result) {
 		unset($_REQUEST['form']);
-		clearCookies($result, getRequest('parent_discoveryid'));
+		uncheckTableRows(getRequest('parent_discoveryid'));
 	}
 
 	unset($_REQUEST['save']);
@@ -178,14 +185,13 @@ elseif (hasRequest('save')) {
 elseif (hasRequest('delete') && hasRequest('triggerid')) {
 	$result = API::TriggerPrototype()->delete(array(getRequest('triggerid')));
 
-	show_messages($result, _('Trigger prototype deleted'), _('Cannot delete trigger prototype'));
-	clearCookies($result, getRequest('parent_discoveryid'));
-
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['triggerid']);
+		uncheckTableRows(getRequest('parent_discoveryid'));
 	}
+	show_messages($result, _('Trigger prototype deleted'), _('Cannot delete trigger prototype'));
 }
-elseif (getRequest('go') == 'massupdate' && hasRequest('mass_save') && hasRequest('g_triggerid')) {
+elseif (hasRequest('action') && getRequest('action') == 'triggerprototype.massupdate' && hasRequest('mass_save') && hasRequest('g_triggerid')) {
 	$triggerIds = getRequest('g_triggerid');
 	$visible = getRequest('visible');
 
@@ -206,15 +212,14 @@ elseif (getRequest('go') == 'massupdate' && hasRequest('mass_save') && hasReques
 		$result = true;
 	}
 
-	show_messages($result, _('Trigger prototypes updated'), _('Cannot update trigger prototypes'));
-	clearCookies($result, getRequest('parent_discoveryid'));
-
 	if ($result) {
 		unset($_REQUEST['massupdate'], $_REQUEST['form'], $_REQUEST['g_triggerid']);
+		uncheckTableRows(getRequest('parent_discoveryid'));
 	}
+	show_messages($result, _('Trigger prototypes updated'), _('Cannot update trigger prototypes'));
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('g_triggerid')) {
-	$enable = (getRequest('go') == 'activate');
+elseif (getRequest('action') && str_in_array(getRequest('action'), array('triggerprototype.massenable', 'triggerprototype.massdisable')) && hasRequest('g_triggerid')) {
+	$enable = (getRequest('action') == 'triggerprototype.massenable');
 	$status = $enable ? TRIGGER_STATUS_ENABLED : TRIGGER_STATUS_DISABLED;
 	$update = array();
 
@@ -239,7 +244,12 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		$result = true;
 	}
 
+	if ($result) {
+		uncheckTableRows(getRequest('parent_discoveryid'));
+	}
+
 	$updated = count($update);
+
 	$messageSuccess = $enable
 		? _n('Trigger prototype enabled', 'Trigger prototypes enabled', $updated)
 		: _n('Trigger prototype disabled', 'Trigger prototypes disabled', $updated);
@@ -248,46 +258,56 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		: _n('Cannot disable trigger prototype', 'Cannot disable trigger prototypes', $updated);
 
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, getRequest('parent_discoveryid'));
 }
-elseif (getRequest('go') == 'delete' && hasRequest('g_triggerid')) {
+elseif (hasRequest('action') && getRequest('action') == 'triggerprototype.massdelete' && hasRequest('g_triggerid')) {
 	$result = API::TriggerPrototype()->delete(getRequest('g_triggerid'));
 
+	if ($result) {
+		uncheckTableRows(getRequest('parent_discoveryid'));
+	}
 	show_messages($result, _('Trigger prototypes deleted'), _('Cannot delete trigger prototypes'));
-	clearCookies($result, getRequest('parent_discoveryid'));
 }
 
 /*
  * Display
  */
-if ($_REQUEST['go'] == 'massupdate' && isset($_REQUEST['g_triggerid'])) {
-	$triggersView = new CView('configuration.triggers.massupdate', getTriggerMassupdateFormData());
+if (hasRequest('action') && getRequest('action') == 'triggerprototype.massupdateform' && hasRequest('g_triggerid')) {
+	$data = getTriggerMassupdateFormData();
+	$data['action'] = 'triggerprototype.massupdate';
+	$triggersView = new CView('configuration.triggers.massupdate', $data);
 	$triggersView->render();
 	$triggersView->show();
 }
 elseif (isset($_REQUEST['form'])) {
-	$triggersView = new CView('configuration.triggers.edit', getTriggerFormData());
+	$triggersView = new CView('configuration.triggers.edit', getTriggerFormData($exprAction));
 	$triggersView->render();
 	$triggersView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'description'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'parent_discoveryid' => get_request('parent_discoveryid'),
+		'parent_discoveryid' => getRequest('parent_discoveryid'),
 		'showInfoColumn' => false,
 		'discovery_rule' => $discovery_rule,
-		'hostid' => get_request('hostid'),
-		'showdisabled' => get_request('showdisabled', 1),
-		'triggers' => array()
+		'hostid' => getRequest('hostid'),
+		'showdisabled' => getRequest('showdisabled', 1),
+		'triggers' => array(),
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 	CProfile::update('web.triggers.showdisabled', $data['showdisabled'], PROFILE_TYPE_INT);
 
 	// get triggers
-	$sortfield = getPageSortField('description');
 	$options = array(
 		'editable' => true,
 		'output' => array('triggerid'),
 		'discoveryids' => $data['parent_discoveryid'],
-		'sortfield' => $sortfield,
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit'] + 1
 	);
 	if (empty($data['showdisabled'])) {
@@ -296,14 +316,7 @@ else {
 	$data['triggers'] = API::TriggerPrototype()->get($options);
 
 	// paging
-	$data['paging'] = getPagingLine(
-		$data['triggers'],
-		array('triggerid'),
-		array(
-			'hostid' => get_request('hostid', $data['discovery_rule']['hostid']),
-			'parent_discoveryid' => get_request('parent_discoveryid')
-		)
-	);
+	$data['paging'] = getPagingLine($data['triggers']);
 
 	$data['triggers'] = API::TriggerPrototype()->get(array(
 		'triggerids' => zbx_objectValues($data['triggers'], 'triggerid'),
@@ -312,7 +325,7 @@ else {
 		'selectItems' => array('itemid', 'hostid', 'key_', 'type', 'flags', 'status'),
 		'selectFunctions' => API_OUTPUT_EXTEND
 	));
-	order_result($data['triggers'], $sortfield, getPageSortOrder());
+	order_result($data['triggers'], $sortField, $sortOrder);
 
 	// get real hosts
 	$data['realHosts'] = getParentHostsByTriggers($data['triggers']);
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php
index c650b5eb36e..bff087b5aa3 100644
--- a/frontends/php/triggers.php
+++ b/frontends/php/triggers.php
@@ -56,7 +56,12 @@ $fields = array(
 	'massupdate' =>			array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'visible' =>			array(T_ZBX_STR, O_OPT, null,	null,		null),
 	// actions
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+								IN('"trigger.masscopyto","trigger.massdelete","trigger.massdisable",'.
+									'"trigger.massenable","trigger.massupdate","trigger.massupdateform"'
+								),
+								null
+							),
 	'toggle_input_method' =>array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'add_expression' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'and_expression' =>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -75,19 +80,20 @@ $fields = array(
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'cancel' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
 	'form' =>				array(T_ZBX_STR, O_OPT, P_SYS,	null,		null),
-	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,	null,		null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,	null,		null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"description","priority","status"'),		null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
-$_REQUEST['showdisabled'] = get_request('showdisabled', CProfile::get('web.triggers.showdisabled', 1));
+$_REQUEST['showdisabled'] = getRequest('showdisabled', CProfile::get('web.triggers.showdisabled', 1));
 
 check_fields($fields);
-validate_sort_and_sortorder('description', ZBX_SORT_UP);
 
 $_REQUEST['status'] = isset($_REQUEST['status']) ? TRIGGER_STATUS_ENABLED : TRIGGER_STATUS_DISABLED;
 $_REQUEST['type'] = isset($_REQUEST['type']) ? TRIGGER_MULT_EVENT_ENABLED : TRIGGER_MULT_EVENT_DISABLED;
-$_REQUEST['go'] = get_request('go', 'none');
 
 // validate permissions
-if (get_request('triggerid')) {
+if (getRequest('triggerid')) {
 	$triggers = API::Trigger()->get(array(
 		'triggerids' => $_REQUEST['triggerid'],
 		'output' => array('triggerid'),
@@ -99,27 +105,28 @@ if (get_request('triggerid')) {
 		access_deny();
 	}
 }
-if (get_request('hostid') && !API::Host()->isWritable(array($_REQUEST['hostid']))) {
+if (getRequest('hostid') && !API::Host()->isWritable(array($_REQUEST['hostid']))) {
 	access_deny();
 }
 /*
  * Actions
  */
+$exprAction = null;
 if (isset($_REQUEST['add_expression'])) {
 	$_REQUEST['expression'] = $_REQUEST['expr_temp'];
 	$_REQUEST['expr_temp'] = '';
 }
 elseif (isset($_REQUEST['and_expression'])) {
-	$_REQUEST['expr_action'] = '&';
+	$exprAction = 'and';
 }
 elseif (isset($_REQUEST['or_expression'])) {
-	$_REQUEST['expr_action'] = '|';
+	$exprAction = 'or';
 }
 elseif (isset($_REQUEST['replace_expression'])) {
-	$_REQUEST['expr_action'] = 'r';
+	$exprAction = 'r';
 }
-elseif (isset($_REQUEST['remove_expression']) && zbx_strlen($_REQUEST['remove_expression'])) {
-	$_REQUEST['expr_action'] = 'R';
+elseif (getRequest('remove_expression')) {
+	$exprAction = 'R';
 	$_REQUEST['expr_target_single'] = $_REQUEST['remove_expression'];
 }
 elseif (isset($_REQUEST['clone']) && isset($_REQUEST['triggerid'])) {
@@ -135,10 +142,10 @@ elseif (isset($_REQUEST['save'])) {
 		'type' => $_REQUEST['type'],
 		'comments' => $_REQUEST['comments'],
 		'url' => $_REQUEST['url'],
-		'dependencies' => zbx_toObject(get_request('dependencies', array()), 'triggerid')
+		'dependencies' => zbx_toObject(getRequest('dependencies', array()), 'triggerid')
 	);
 
-	if (get_request('triggerid')) {
+	if (getRequest('triggerid')) {
 		// update only changed fields
 		$oldTrigger = API::Trigger()->get(array(
 			'triggerids' => $_REQUEST['triggerid'],
@@ -185,7 +192,7 @@ elseif (isset($_REQUEST['save'])) {
 
 	if ($result) {
 		unset($_REQUEST['form']);
-		clearCookies($result, $_REQUEST['hostid']);
+		uncheckTableRows(getRequest('hostid'));
 	}
 }
 elseif (isset($_REQUEST['delete']) && isset($_REQUEST['triggerid'])) {
@@ -194,12 +201,11 @@ elseif (isset($_REQUEST['delete']) && isset($_REQUEST['triggerid'])) {
 	$result = API::Trigger()->delete(array(getRequest('triggerid')));
 	$result = DBend($result);
 
-	show_messages($result, _('Trigger deleted'), _('Cannot delete trigger'));
-	clearCookies($result, $_REQUEST['hostid']);
-
 	if ($result) {
 		unset($_REQUEST['form'], $_REQUEST['triggerid']);
+		uncheckTableRows(getRequest('hostid'));
 	}
+	show_messages($result, _('Trigger deleted'), _('Cannot delete trigger'));
 }
 elseif (isset($_REQUEST['add_dependency']) && isset($_REQUEST['new_dependency'])) {
 	if (!isset($_REQUEST['dependencies'])) {
@@ -211,19 +217,19 @@ elseif (isset($_REQUEST['add_dependency']) && isset($_REQUEST['new_dependency'])
 		}
 	}
 }
-elseif ($_REQUEST['go'] == 'massupdate' && isset($_REQUEST['mass_save']) && isset($_REQUEST['g_triggerid'])) {
-	$visible = get_request('visible', array());
+elseif (hasRequest('action') && getRequest('action') == 'trigger.massupdate' && hasRequest('mass_save') && hasRequest('g_triggerid')) {
+	$visible = getRequest('visible', array());
 
 	// update triggers
 	$triggersToUpdate = array();
-	foreach ($_REQUEST['g_triggerid'] as $triggerid) {
+	foreach (getRequest('g_triggerid') as $triggerid) {
 		$trigger = array('triggerid' => $triggerid);
 
 		if (isset($visible['priority'])) {
-			$trigger['priority'] = get_request('priority');
+			$trigger['priority'] = getRequest('priority');
 		}
 		if (isset($visible['dependencies'])) {
-			$trigger['dependencies'] = zbx_toObject(get_request('dependencies', array()), 'triggerid');
+			$trigger['dependencies'] = zbx_toObject(getRequest('dependencies', array()), 'triggerid');
 		}
 
 		$triggersToUpdate[] = $trigger;
@@ -234,15 +240,14 @@ elseif ($_REQUEST['go'] == 'massupdate' && isset($_REQUEST['mass_save']) && isse
 	$result = API::Trigger()->update($triggersToUpdate);
 	$result = DBend($result);
 
-	show_messages($result, _('Trigger updated'), _('Cannot update trigger'));
-	clearCookies($result, $_REQUEST['hostid']);
-
 	if ($result) {
 		unset($_REQUEST['massupdate'], $_REQUEST['form'], $_REQUEST['g_triggerid']);
+		uncheckTableRows(getRequest('hostid'));
 	}
+	show_messages($result, _('Trigger updated'), _('Cannot update trigger'));
 }
-elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasRequest('g_triggerid')) {
-	$enable = (getRequest('go') == 'activate');
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('trigger.massenable', 'trigger.massdisable')) && hasRequest('g_triggerid')) {
+	$enable = (getRequest('action') == 'trigger.massenable');
 	$status = $enable ? TRIGGER_STATUS_ENABLED : TRIGGER_STATUS_DISABLED;
 	$update = array();
 
@@ -275,10 +280,13 @@ elseif (str_in_array(getRequest('go'), array('activate', 'disable')) && hasReque
 		? _n('Cannot enable trigger', 'Cannot enable triggers', $updated)
 		: _n('Cannot disable trigger', 'Cannot disable triggers', $updated);
 
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+		unset($_REQUEST['g_triggerid']);
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
-	clearCookies($result, getRequest('hostid'));
 }
-elseif (getRequest('go') == 'copy_to' && hasRequest('copy') && hasRequest('g_triggerid')) {
+elseif (hasRequest('action') && getRequest('action') == 'trigger.masscopyto' && hasRequest('copy') && hasRequest('g_triggerid')) {
 	if (hasRequest('copy_targetid') && getRequest('copy_targetid') > 0 && hasRequest('copy_type')) {
 		// hosts or templates
 		if (getRequest('copy_type') == COPY_TYPE_TO_HOST || getRequest('copy_type') == COPY_TYPE_TO_TEMPLATE) {
@@ -302,69 +310,83 @@ elseif (getRequest('go') == 'copy_to' && hasRequest('copy') && hasRequest('g_tri
 
 		DBstart();
 
-		$goResult = copyTriggersToHosts(getRequest('g_triggerid'), $hosts_ids, getRequest('hostid'));
-		$goResult = DBend($goResult);
+		$result = copyTriggersToHosts(getRequest('g_triggerid'), $hosts_ids, getRequest('hostid'));
+		$result = DBend($result);
 
-		show_messages($goResult, _('Trigger added'), _('Cannot add trigger'));
-		clearCookies($goResult, getRequest('hostid'));
-
-		$_REQUEST['go'] = 'none2';
+		if ($result) {
+			uncheckTableRows(getRequest('hostid'));
+			unset($_REQUEST['g_triggerid']);
+		}
+		show_messages($result, _('Trigger added'), _('Cannot add trigger'));
 	}
 	else {
 		show_error_message(_('No target selected'));
 	}
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['g_triggerid'])) {
-	$goResult = API::Trigger()->delete($_REQUEST['g_triggerid']);
+elseif (hasRequest('action') && getRequest('action') == 'trigger.massdelete' && hasRequest('g_triggerid')) {
+	$result = API::Trigger()->delete(getRequest('g_triggerid'));
 
-	show_messages($goResult, _('Triggers deleted'), _('Cannot delete triggers'));
-	clearCookies($goResult, $_REQUEST['hostid']);
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
+	}
+	show_messages($result, _('Triggers deleted'), _('Cannot delete triggers'));
 }
 
 /*
  * Display
  */
-if ($_REQUEST['go'] == 'massupdate' && isset($_REQUEST['g_triggerid'])) {
-	$triggersView = new CView('configuration.triggers.massupdate', getTriggerMassupdateFormData());
+if (hasRequest('action') && getRequest('action') == 'trigger.massupdateform' && hasRequest('g_triggerid')) {
+	$data = getTriggerMassupdateFormData();
+	$data['action'] = 'trigger.massupdate';
+	$triggersView = new CView('configuration.triggers.massupdate', $data);
 	$triggersView->render();
 	$triggersView->show();
 }
 elseif (isset($_REQUEST['form'])) {
-	$triggersView = new CView('configuration.triggers.edit', getTriggerFormData());
+	$triggersView = new CView('configuration.triggers.edit', getTriggerFormData($exprAction));
 	$triggersView->render();
 	$triggersView->show();
 }
-elseif ($_REQUEST['go'] == 'copy_to' && isset($_REQUEST['g_triggerid'])) {
-	$triggersView = new CView('configuration.copy.elements', getCopyElementsFormData('g_triggerid', _('CONFIGURATION OF TRIGGERS')));
+elseif (hasRequest('action') && getRequest('action') == 'trigger.masscopyto' && hasRequest('g_triggerid')) {
+	$data = getCopyElementsFormData('g_triggerid', _('CONFIGURATION OF TRIGGERS'));
+	$data['action'] = 'trigger.masscopyto';
+	$triggersView = new CView('configuration.copy.elements', $data);
 	$triggersView->render();
 	$triggersView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'description'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'showdisabled' => get_request('showdisabled', 1),
+		'showdisabled' => getRequest('showdisabled', 1),
 		'parent_discoveryid' => null,
-		'triggers' => array()
+		'triggers' => array(),
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
 	CProfile::update('web.triggers.showdisabled', $data['showdisabled'], PROFILE_TYPE_INT);
 
 	$data['pageFilter'] = new CPageFilter(array(
-		'groups' => array('not_proxy_hosts' => true, 'editable' => true),
+		'groups' => array('with_hosts_and_templates' => true, 'editable' => true),
 		'hosts' => array('templated_hosts' => true, 'editable' => true),
 		'triggers' => array('editable' => true),
-		'groupid' => get_request('groupid', null),
-		'hostid' => get_request('hostid', null)
+		'groupid' => getRequest('groupid'),
+		'hostid' => getRequest('hostid')
 	));
 	$data['groupid'] = $data['pageFilter']->groupid;
 	$data['hostid'] = $data['pageFilter']->hostid;
 
 	// get triggers
-	$sortfield = getPageSortField('description');
 	if ($data['pageFilter']->hostsSelected) {
 		$options = array(
 			'editable' => true,
 			'output' => array('triggerid'),
-			'sortfield' => $sortfield,
+			'sortfield' => $sortField,
 			'limit' => $config['search_limit'] + 1
 		);
 		if (empty($data['showdisabled'])) {
@@ -379,10 +401,10 @@ else {
 		$data['triggers'] = API::Trigger()->get($options);
 	}
 
-	$_REQUEST['hostid'] = get_request('hostid', $data['pageFilter']->hostid);
+	$_REQUEST['hostid'] = getRequest('hostid', $data['pageFilter']->hostid);
 
 	// paging
-	$data['paging'] = getPagingLine($data['triggers'], array('triggerid'), array('hostid' => $_REQUEST['hostid']));
+	$data['paging'] = getPagingLine($data['triggers']);
 
 	$data['triggers'] = API::Trigger()->get(array(
 		'triggerids' => zbx_objectValues($data['triggers'], 'triggerid'),
@@ -394,11 +416,11 @@ else {
 		'selectDiscoveryRule' => API_OUTPUT_EXTEND
 	));
 
-	if ($sortfield === 'status') {
-		orderTriggersByStatus($data['triggers'], getPageSortOrder());
+	if ($sortField === 'status') {
+		orderTriggersByStatus($data['triggers'], $sortOrder);
 	}
 	else {
-		order_result($data['triggers'], $sortfield, getPageSortOrder());
+		order_result($data['triggers'], $sortField, $sortOrder);
 	}
 
 	$dependencyIds = array();
@@ -441,14 +463,10 @@ else {
 
 	// determine, show or not column of errors
 	if ($data['hostid'] > 0) {
-		$host = API::Host()->get(array(
-			'hostids' => $_REQUEST['hostid'],
-			'output' => array('status'),
-			'templated_hosts' => true,
-			'editable' => true
+		$data['showInfoColumn'] = (bool) API::Host()->get(array(
+			'hostids' => $data['hostid'],
+			'output' => array('status')
 		));
-		$host = reset($host);
-		$data['showInfoColumn'] = (!$host || $host['status'] != HOST_STATUS_TEMPLATE);
 	}
 	else {
 		$data['showInfoColumn'] = true;
diff --git a/frontends/php/usergrps.php b/frontends/php/usergrps.php
index 44b8a06dcea..f86efe6447b 100644
--- a/frontends/php/usergrps.php
+++ b/frontends/php/usergrps.php
@@ -38,7 +38,7 @@ $fields = array(
 	'usrgrpid' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		'isset({form})&&{form}=="update"'),
 	'group_groupid' =>		array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'selusrgrp' =>			array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
-	'gname' =>				array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({save})'),
+	'gname' =>				array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({save})', _('Group name')),
 	'users' =>				array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'gui_access' =>			array(T_ZBX_INT, O_OPT, null,	IN('0,1,2'),'isset({save})'),
 	'users_status' =>		array(T_ZBX_INT, O_OPT, null,	IN('0,1'),	null),
@@ -52,7 +52,12 @@ $fields = array(
 	'set_gui_access' =>		array(T_ZBX_INT, O_OPT, null,	IN('0,1,2'),null),
 	'set_debug_mode' =>		array(T_ZBX_INT, O_OPT, null,	IN('0,1'),	null),
 	// actions
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,
+								IN('"usergroup.massdisable","usergroup.massdisabledebug","usergroup.massdelete",'.
+									'"usergroup.massenable","usergroup.massenabledebug","usergroup.set_gui_access"'
+								),
+								null
+							),
 	'register' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, IN('"add permission","delete permission"'), null),
 	'save' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null,	null),
@@ -70,13 +75,15 @@ $fields = array(
 	'cancel' =>				array(T_ZBX_STR, O_OPT, P_SYS,		 null,	null),
 	// form
 	'form' =>				array(T_ZBX_STR, O_OPT, P_SYS,		 null,	null),
-	'form_refresh' =>		array(T_ZBX_STR, O_OPT, null,		 null,	null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,		 null,	null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"name"'),								null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('name', ZBX_SORT_UP);
 
 $_REQUEST['users_status'] = isset($_REQUEST['users_status']) ? 0 : 1;
-$_REQUEST['debug_mode'] = get_request('debug_mode', 0);
+$_REQUEST['debug_mode'] = getRequest('debug_mode', 0);
 
 /*
  * Permissions
@@ -91,29 +98,28 @@ if (isset($_REQUEST['usrgrpid'])) {
 		access_deny();
 	}
 }
-elseif (isset($_REQUEST['go'])) {
-	if (!isset($_REQUEST['group_groupid']) || !is_array($_REQUEST['group_groupid'])) {
+elseif (hasRequest('action')) {
+	if (!hasRequest('group_groupid') || !is_array(getRequest('group_groupid'))) {
 		access_deny();
 	}
 	else {
 		$dbUserGroupCount = API::UserGroup()->get(array(
 			'output' => array('usrgrpid'),
-			'usrgrpids' => $_REQUEST['group_groupid'],
+			'usrgrpids' => getRequest('group_groupid'),
 			'countOutput' => true
 		));
 
-		if ($dbUserGroupCount != count($_REQUEST['group_groupid'])) {
+		if ($dbUserGroupCount != count(getRequest('group_groupid'))) {
 			access_deny();
 		}
 	}
 }
-$_REQUEST['go'] = get_request('go', 'none');
 
 /*
  * Actions
  */
 if (isset($_REQUEST['del_deny']) && isset($_REQUEST['right_to_del']['deny'])) {
-	$_REQUEST['group_rights'] = get_request('group_rights', array());
+	$_REQUEST['group_rights'] = getRequest('group_rights', array());
 
 	foreach ($_REQUEST['right_to_del']['deny'] as $name) {
 		if (!isset($_REQUEST['group_rights'][$name])) {
@@ -126,7 +132,7 @@ if (isset($_REQUEST['del_deny']) && isset($_REQUEST['right_to_del']['deny'])) {
 	}
 }
 elseif (isset($_REQUEST['del_read_only']) && isset($_REQUEST['right_to_del']['read_only'])) {
-	$_REQUEST['group_rights'] = get_request('group_rights', array());
+	$_REQUEST['group_rights'] = getRequest('group_rights', array());
 
 	foreach ($_REQUEST['right_to_del']['read_only'] as $name) {
 		if (!isset($_REQUEST['group_rights'][$name])) {
@@ -139,7 +145,7 @@ elseif (isset($_REQUEST['del_read_only']) && isset($_REQUEST['right_to_del']['re
 	}
 }
 elseif (isset($_REQUEST['del_read_write']) && isset($_REQUEST['right_to_del']['read_write'])) {
-	$_REQUEST['group_rights'] = get_request('group_rights', array());
+	$_REQUEST['group_rights'] = getRequest('group_rights', array());
 
 	foreach ($_REQUEST['right_to_del']['read_write'] as $name) {
 		if (!isset($_REQUEST['group_rights'][$name])) {
@@ -152,7 +158,7 @@ elseif (isset($_REQUEST['del_read_write']) && isset($_REQUEST['right_to_del']['r
 	}
 }
 elseif (isset($_REQUEST['new_right'])) {
-	$_REQUEST['group_rights'] = get_request('group_rights', array());
+	$_REQUEST['group_rights'] = getRequest('group_rights', array());
 
 	foreach ($_REQUEST['new_right'] as $id => $right) {
 		$_REQUEST['group_rights'][$id] = array(
@@ -168,8 +174,8 @@ elseif (isset($_REQUEST['save'])) {
 		'users_status' => $_REQUEST['users_status'],
 		'gui_access' => $_REQUEST['gui_access'],
 		'debug_mode' => $_REQUEST['debug_mode'],
-		'userids' => get_request('group_users', array()),
-		'rights' => array_values(get_request('group_rights', array()))
+		'userids' => getRequest('group_users', array()),
+		'rights' => array_values(getRequest('group_rights', array()))
 	);
 
 	DBstart();
@@ -196,7 +202,10 @@ elseif (isset($_REQUEST['save'])) {
 	}
 
 	$result = DBend($result);
-	clearCookies($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, $messageSuccess, $messageFailed);
 }
 elseif (isset($_REQUEST['delete'])) {
@@ -212,11 +221,14 @@ elseif (isset($_REQUEST['delete'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('Group deleted'), _('Cannot delete group'));
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete') {
-	$groupIds = get_request('group_groupid', array());
+elseif (hasRequest('action') && getRequest('action') == 'usergroup.massdelete' && hasRequest('group_groupid')) {
+	$groupIds = getRequest('group_groupid');
 	$groups = array();
 
 	$dbGroups = DBselect(
@@ -240,12 +252,15 @@ elseif ($_REQUEST['go'] == 'delete') {
 		}
 
 		$result = DBend($result);
+
+		if ($result) {
+			uncheckTableRows();
+		}
 		show_messages($result, _('Group deleted'), _('Cannot delete group'));
-		clearCookies($result);
 	}
 }
-elseif ($_REQUEST['go'] == 'set_gui_access') {
-	$groupIds = get_request('group_groupid', get_request('usrgrpid'));
+elseif (hasRequest('action') && getRequest('action') == 'usergroup.set_gui_access') {
+	$groupIds = getRequest('group_groupid', getRequest('usrgrpid'));
 	zbx_value2array($groupIds);
 
 	$groups = array();
@@ -261,10 +276,10 @@ elseif ($_REQUEST['go'] == 'set_gui_access') {
 	if ($groups) {
 		DBstart();
 
-		$result = change_group_gui_access($groupIds, $_REQUEST['set_gui_access']);
+		$result = change_group_gui_access($groupIds, getRequest('set_gui_access'));
 
 		if ($result) {
-			$auditAction = ($_REQUEST['set_gui_access'] == GROUP_GUI_ACCESS_DISABLED) ? AUDIT_ACTION_DISABLE : AUDIT_ACTION_ENABLE;
+			$auditAction = (getRequest('set_gui_access') == GROUP_GUI_ACCESS_DISABLED) ? AUDIT_ACTION_DISABLE : AUDIT_ACTION_ENABLE;
 
 			foreach ($groups as $groupId => $group) {
 				add_audit($auditAction, AUDIT_RESOURCE_USER_GROUP, 'GUI access for group name ['.$group['name'].']');
@@ -272,15 +287,18 @@ elseif ($_REQUEST['go'] == 'set_gui_access') {
 		}
 
 		$result = DBend($result);
+
+		if ($result) {
+			uncheckTableRows();
+		}
 		show_messages($result, _('Frontend access updated'), _('Cannot update frontend access'));
-		clearCookies($result);
 	}
 }
-elseif (str_in_array($_REQUEST['go'], array('enable_debug', 'disable_debug'))) {
-	$groupIds = get_request('group_groupid', get_request('usrgrpid'));
+elseif (hasRequest('action') && str_in_array(getRequest('action'), array('usergroup.massenabledebug', 'usergroup.massdisabledebug'))) {
+	$groupIds = getRequest('group_groupid', getRequest('usrgrpid'));
 	zbx_value2array($groupIds);
 
-	$setDebugMode = ($_REQUEST['go'] == 'enable_debug') ? GROUP_DEBUG_MODE_ENABLED : GROUP_DEBUG_MODE_DISABLED;
+	$setDebugMode = (getRequest('action') == 'usergroup.massenabledebug') ? GROUP_DEBUG_MODE_ENABLED : GROUP_DEBUG_MODE_DISABLED;
 
 	$groups = array();
 	$dbGroup = DBselect(
@@ -306,15 +324,18 @@ elseif (str_in_array($_REQUEST['go'], array('enable_debug', 'disable_debug'))) {
 		}
 
 		$result = DBend($result);
+
+		if ($result) {
+			uncheckTableRows();
+		}
 		show_messages($result, _('Debug mode updated'), _('Cannot update debug mode'));
-		clearCookies($result);
 	}
 }
-elseif (str_in_array(getRequest('go'), array('enable_status', 'disable_status'))) {
+elseif (str_in_array(getRequest('action'), array('usergroup.massenable', 'usergroup.massdisable'))) {
 	$groupIds = getRequest('group_groupid', getRequest('usrgrpid'));
 	zbx_value2array($groupIds);
 
-	$enable = (getRequest('go') == 'enable_status');
+	$enable = (getRequest('action') == 'usergroup.massenable');
 	$status = $enable ? GROUP_STATUS_ENABLED : GROUP_STATUS_DISABLED;
 	$auditAction = $enable ? AUDIT_ACTION_ENABLE : AUDIT_ACTION_DISABLE;
 	$groups = array();
@@ -348,8 +369,11 @@ elseif (str_in_array(getRequest('go'), array('enable_status', 'disable_status'))
 			: _n('Cannot disable user group', 'Cannot disable user groups', $updated);
 
 		$result = DBend($result);
+
+		if ($result) {
+			uncheckTableRows();
+		}
 		show_messages($result, $messageSuccess, $messageFailed);
-		clearCookies($result);
 	}
 }
 
@@ -358,9 +382,9 @@ elseif (str_in_array(getRequest('go'), array('enable_status', 'disable_status'))
  */
 if (isset($_REQUEST['form'])) {
 	$data = array(
-		'usrgrpid' => get_request('usrgrpid'),
-		'form' => get_request('form'),
-		'form_refresh' => get_request('form_refresh', 0)
+		'usrgrpid' => getRequest('usrgrpid'),
+		'form' => getRequest('form'),
+		'form_refresh' => getRequest('form_refresh', 0)
 	);
 
 	if (isset($_REQUEST['usrgrpid'])) {
@@ -405,15 +429,15 @@ if (isset($_REQUEST['form'])) {
 		}
 	}
 	else {
-		$data['name'] = get_request('gname', '');
-		$data['users_status'] = get_request('users_status', GROUP_STATUS_ENABLED);
-		$data['gui_access'] = get_request('gui_access', GROUP_GUI_ACCESS_SYSTEM);
-		$data['debug_mode'] = get_request('debug_mode', GROUP_DEBUG_MODE_DISABLED);
-		$data['group_users'] = get_request('group_users', array());
-		$data['group_rights'] = get_request('group_rights', array());
+		$data['name'] = getRequest('gname', '');
+		$data['users_status'] = getRequest('users_status', GROUP_STATUS_ENABLED);
+		$data['gui_access'] = getRequest('gui_access', GROUP_GUI_ACCESS_SYSTEM);
+		$data['debug_mode'] = getRequest('debug_mode', GROUP_DEBUG_MODE_DISABLED);
+		$data['group_users'] = getRequest('group_users', array());
+		$data['group_rights'] = getRequest('group_rights', array());
 	}
 
-	$data['selected_usrgrp'] = get_request('selusrgrp', 0);
+	$data['selected_usrgrp'] = getRequest('selusrgrp', 0);
 
 	// sort group rights
 	order_result($data['group_rights'], 'name');
@@ -450,22 +474,28 @@ if (isset($_REQUEST['form'])) {
 	$userGroupsView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'name'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'config' => $config
+		'config' => $config,
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
-	$sortfield = getPageSortField('name');
-
 	$data['usergroups'] = API::UserGroup()->get(array(
 		'output' => API_OUTPUT_EXTEND,
 		'selectUsers' => API_OUTPUT_EXTEND,
-		'sortfield' => $sortfield,
+		'sortfield' => $sortField,
 		'limit' => $config['search_limit'] + 1
 	));
 
 	// sorting & paging
-	order_result($data['usergroups'], $sortfield, getPageSortOrder());
-	$data['paging'] = getPagingLine($data['usergroups'], array('usrgrpid'));
+	order_result($data['usergroups'], $sortField, $sortOrder);
+	$data['paging'] = getPagingLine($data['usergroups']);
 
 	// render view
 	$userGroupsView = new CView('administration.usergroups.list', $data);
diff --git a/frontends/php/users.php b/frontends/php/users.php
index c229e5df985..2c5f51c795f 100644
--- a/frontends/php/users.php
+++ b/frontends/php/users.php
@@ -42,7 +42,7 @@ $fields = array(
 	'group_userid' =>		array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'filter_usrgrpid' =>	array(T_ZBX_INT, O_OPT, P_SYS,	DB_ID,		null),
 	'alias' =>				array(T_ZBX_STR, O_OPT, null,	NOT_EMPTY,	'isset({save})', _('Alias')),
-	'name' =>				array(T_ZBX_STR, O_OPT, null,	null,		null, _('Name')),
+	'name' =>				array(T_ZBX_STR, O_OPT, null,	null,		null, _x('Name', 'user first name')),
 	'surname' =>			array(T_ZBX_STR, O_OPT, null,	null,		null, _('Surname')),
 	'password1' =>			array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})&&isset({form})&&{form}!="update"&&isset({change_password})'),
 	'password2' =>			array(T_ZBX_STR, O_OPT, null,	null,		'isset({save})&&isset({form})&&{form}!="update"&&isset({change_password})'),
@@ -64,7 +64,7 @@ $fields = array(
 	'refresh' =>			array(T_ZBX_INT, O_OPT, null,	BETWEEN(0, SEC_PER_HOUR), 'isset({save})', _('Refresh (in seconds)')),
 	'rows_per_page' =>		array(T_ZBX_INT, O_OPT, null,	BETWEEN(1, 999999),'isset({save})', _('Rows per page')),
 	// actions
-	'go' =>					array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
+	'action' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	IN('"user.massdelete","user.massunblock"'),	null),
 	'register' =>			array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	IN('"add permission","delete permission"'), null),
 	'save' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
 	'delete' =>				array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
@@ -76,17 +76,19 @@ $fields = array(
 	'cancel' =>				array(T_ZBX_STR, O_OPT, P_SYS,			null,	null),
 	// form
 	'form' =>				array(T_ZBX_STR, O_OPT, P_SYS,			null,	null),
-	'form_refresh' =>		array(T_ZBX_STR, O_OPT, null,			null,	null)
+	'form_refresh' =>		array(T_ZBX_INT, O_OPT, null,			null,	null),
+	// sort and sortorder
+	'sort' =>				array(T_ZBX_STR, O_OPT, P_SYS, IN('"alias","name","surname","type"'),		null),
+	'sortorder' =>			array(T_ZBX_STR, O_OPT, P_SYS, IN('"'.ZBX_SORT_DOWN.'","'.ZBX_SORT_UP.'"'),	null)
 );
 check_fields($fields);
-validate_sort_and_sortorder('alias', ZBX_SORT_UP);
 
 /*
  * Permissions
  */
 if (isset($_REQUEST['userid'])) {
 	$users = API::User()->get(array(
-		'userids' => get_request('userid'),
+		'userids' => getRequest('userid'),
 		'output' => API_OUTPUT_EXTEND,
 		'editable' => true
 	));
@@ -94,22 +96,22 @@ if (isset($_REQUEST['userid'])) {
 		access_deny();
 	}
 }
-if (get_request('filter_usrgrpid') && !API::UserGroup()->isWritable(array($_REQUEST['filter_usrgrpid']))) {
+if (getRequest('filter_usrgrpid') && !API::UserGroup()->isWritable(array($_REQUEST['filter_usrgrpid']))) {
 	access_deny();
 }
 
-if (isset($_REQUEST['go'])) {
-	if (!isset($_REQUEST['group_userid']) || !is_array($_REQUEST['group_userid'])) {
+if (hasRequest('action')) {
+	if (!hasRequest('group_userid') || !is_array(getRequest('group_userid'))) {
 		access_deny();
 	}
 	else {
 		$usersChk = API::User()->get(array(
 			'output' => array('userid'),
-			'userids' => $_REQUEST['group_userid'],
+			'userids' => getRequest('group_userid'),
 			'countOutput' => true,
 			'editable' => true
 		));
-		if ($usersChk != count($_REQUEST['group_userid'])) {
+		if ($usersChk != count(getRequest('group_userid'))) {
 			access_deny();
 		}
 	}
@@ -118,17 +120,16 @@ if (isset($_REQUEST['go'])) {
 /*
  * Actions
  */
-$_REQUEST['go'] = get_request('go', 'none');
 
 if (isset($_REQUEST['new_groups'])) {
-	$_REQUEST['new_groups'] = get_request('new_groups', array());
-	$_REQUEST['user_groups'] = get_request('user_groups', array());
+	$_REQUEST['new_groups'] = getRequest('new_groups', array());
+	$_REQUEST['user_groups'] = getRequest('user_groups', array());
 	$_REQUEST['user_groups'] += $_REQUEST['new_groups'];
 
 	unset($_REQUEST['new_groups']);
 }
 elseif (isset($_REQUEST['new_media'])) {
-	$_REQUEST['user_medias'] = get_request('user_medias', array());
+	$_REQUEST['user_medias'] = getRequest('user_medias', array());
 
 	array_push($_REQUEST['user_medias'], $_REQUEST['new_media']);
 }
@@ -178,8 +179,8 @@ elseif (isset($_REQUEST['save'])) {
 		}
 	}
 	else {
-		$_REQUEST['password1'] = getRequest('password1', null);
-		$_REQUEST['password2'] = getRequest('password2', null);
+		$_REQUEST['password1'] = getRequest('password1');
+		$_REQUEST['password2'] = getRequest('password2');
 	}
 
 	if ($_REQUEST['password1'] != $_REQUEST['password2']) {
@@ -205,18 +206,18 @@ elseif (isset($_REQUEST['save'])) {
 
 	if ($isValid) {
 		$user = array();
-		$user['alias'] = get_request('alias');
-		$user['name'] = get_request('name');
-		$user['surname'] = get_request('surname');
-		$user['passwd'] = get_request('password1');
-		$user['url'] = get_request('url');
-		$user['autologin'] = get_request('autologin', 0);
+		$user['alias'] = getRequest('alias');
+		$user['name'] = getRequest('name');
+		$user['surname'] = getRequest('surname');
+		$user['passwd'] = getRequest('password1');
+		$user['url'] = getRequest('url');
+		$user['autologin'] = getRequest('autologin', 0);
 		$user['autologout'] = hasRequest('autologout_visible') ? getRequest('autologout') : 0;
-		$user['theme'] = get_request('theme');
-		$user['refresh'] = get_request('refresh');
-		$user['rows_per_page'] = get_request('rows_per_page');
-		$user['type'] = get_request('user_type');
-		$user['user_medias'] = get_request('user_medias', array());
+		$user['theme'] = getRequest('theme');
+		$user['refresh'] = getRequest('refresh');
+		$user['rows_per_page'] = getRequest('rows_per_page');
+		$user['type'] = getRequest('user_type');
+		$user['user_medias'] = getRequest('user_medias', array());
 		$user['usrgrps'] = zbx_toObject($usrgrps, 'usrgrpid');
 
 		if (hasRequest('lang')) {
@@ -256,19 +257,22 @@ elseif (isset($_REQUEST['save'])) {
 		}
 
 		$result = DBend($result);
+
+		if ($result) {
+			uncheckTableRows();
+		}
 		show_messages($result, $messageSuccess, $messageFailed);
-		clearCookies($result);
 	}
 }
 elseif (isset($_REQUEST['del_user_media'])) {
-	foreach (get_request('user_medias_to_del', array()) as $mediaId) {
+	foreach (getRequest('user_medias_to_del', array()) as $mediaId) {
 		if (isset($_REQUEST['user_medias'][$mediaId])) {
 			unset($_REQUEST['user_medias'][$mediaId]);
 		}
 	}
 }
 elseif (isset($_REQUEST['del_user_group'])) {
-	foreach (get_request('user_groups_to_del', array()) as $groupId) {
+	foreach (getRequest('user_groups_to_del', array()) as $groupId) {
 		if (isset($_REQUEST['user_groups'][$groupId])) {
 			unset($_REQUEST['user_groups'][$groupId]);
 		}
@@ -287,11 +291,14 @@ elseif (isset($_REQUEST['delete']) && isset($_REQUEST['userid'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('User deleted'), _('Cannot delete user'));
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'unblock' && isset($_REQUEST['group_userid'])) {
-	$groupUserId = get_request('group_userid', array());
+elseif (hasRequest('action') && getRequest('action') == 'user.massunblock' && hasRequest('group_userid')) {
+	$groupUserId = getRequest('group_userid');
 
 	DBstart();
 
@@ -310,13 +317,16 @@ elseif ($_REQUEST['go'] == 'unblock' && isset($_REQUEST['group_userid'])) {
 	}
 
 	$result = DBend($result);
+
+	if ($result) {
+		uncheckTableRows();
+	}
 	show_messages($result, _('Users unblocked'), _('Cannot unblock users'));
-	clearCookies($result);
 }
-elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['group_userid'])) {
-	$goResult = false;
+elseif (hasRequest('action') && getRequest('action') == 'user.massdelete' && hasRequest('group_userid')) {
+	$result = false;
 
-	$groupUserId = get_request('group_userid', array());
+	$groupUserId = getRequest('group_userid');
 
 	$dbUsers = API::User()->get(array(
 		'userids' => $groupUserId,
@@ -331,35 +341,37 @@ elseif ($_REQUEST['go'] == 'delete' && isset($_REQUEST['group_userid'])) {
 			continue;
 		}
 
-		$goResult |= (bool) API::User()->delete(array($userId));
+		$result |= (bool) API::User()->delete(array($userId));
 
-		if ($goResult) {
+		if ($result) {
 			$userData = $dbUsers[$userId];
 
 			add_audit(AUDIT_ACTION_DELETE, AUDIT_RESOURCE_USER, 'User alias ['.$userData['alias'].'] name ['.$userData['name'].'] surname ['.$userData['surname'].']');
 		}
 	}
 
-	$goResult = DBend($goResult);
+	$result = DBend($result);
 
-	show_messages($goResult, _('User deleted'), _('Cannot delete user'));
-	clearCookies($goResult);
+	if ($result) {
+		uncheckTableRows();
+	}
+	show_messages($result, _('User deleted'), _('Cannot delete user'));
 }
 
 /*
  * Display
  */
-$_REQUEST['filter_usrgrpid'] = get_request('filter_usrgrpid', CProfile::get('web.users.filter.usrgrpid', 0));
+$_REQUEST['filter_usrgrpid'] = getRequest('filter_usrgrpid', CProfile::get('web.users.filter.usrgrpid', 0));
 CProfile::update('web.users.filter.usrgrpid', $_REQUEST['filter_usrgrpid'], PROFILE_TYPE_ID);
 
 if (!empty($_REQUEST['form'])) {
-	$userId = get_request('userid');
+	$userId = getRequest('userid');
 
 	$data = getUserFormData($userId);
 
 	$data['userid'] = $userId;
-	$data['form'] = get_request('form');
-	$data['form_refresh'] = get_request('form_refresh', 0);
+	$data['form'] = getRequest('form');
+	$data['form_refresh'] = getRequest('form_refresh', 0);
 	$data['autologout'] = getRequest('autologout');
 
 	// render view
@@ -368,8 +380,16 @@ if (!empty($_REQUEST['form'])) {
 	$usersView->show();
 }
 else {
+	$sortField = getRequest('sort', CProfile::get('web.'.$page['file'].'.sort', 'alias'));
+	$sortOrder = getRequest('sortorder', CProfile::get('web.'.$page['file'].'.sortorder', ZBX_SORT_UP));
+
+	CProfile::update('web.'.$page['file'].'.sort', $sortField, PROFILE_TYPE_STR);
+	CProfile::update('web.'.$page['file'].'.sortorder', $sortOrder, PROFILE_TYPE_STR);
+
 	$data = array(
-		'config' => $config
+		'config' => $config,
+		'sort' => $sortField,
+		'sortorder' => $sortOrder
 	);
 
 	// get user groups
@@ -387,9 +407,9 @@ else {
 		'limit' => $config['search_limit'] + 1
 	));
 
-	// sorting & apging
-	order_result($data['users'], getPageSortField('alias'), getPageSortOrder());
-	$data['paging'] = getPagingLine($data['users'], array('userid'));
+	// sorting & paging
+	order_result($data['users'], $sortField, $sortOrder);
+	$data['paging'] = getPagingLine($data['users']);
 
 	// set default lastaccess time to 0
 	foreach ($data['users'] as $user) {
diff --git a/include/common.h b/include/common.h
index 2d3ecc439d3..f4f0e2f4cdb 100644
--- a/include/common.h
+++ b/include/common.h
@@ -67,7 +67,6 @@
 #endif
 #define strncasecmp	ERROR_DO_NOT_USE_STRNCASECMP_FUNCTION_TRY_TO_USE_ZBX_STRNCASECMP
 
-
 #define ON	1
 #define OFF	0
 
@@ -94,7 +93,7 @@ const char	*zbx_result_string(int result);
 #define MAX_ID_LEN		21
 #define MAX_STRING_LEN		2048
 #define MAX_BUFFER_LEN		65536
-#define MAX_ZBX_HOSTNAME_LEN	64
+#define MAX_ZBX_HOSTNAME_LEN	128
 #define MAX_EXECUTE_OUTPUT_LEN	(512 * ZBX_KIBIBYTE)
 
 #define ZBX_MAX_UINT64_LEN	21
@@ -110,6 +109,9 @@ zbx_timespec_t;
 #define zbx_timespec_compare(t1, t2)	\
 	((t1)->sec == (t2)->sec ? (t1)->ns - (t2)->ns : (t1)->sec - (t2)->sec)
 
+#define ZBX_DOUBLE_EPSILON	0.000001
+int	zbx_double_compare(double a, double b);
+
 /* item types */
 typedef enum
 {
@@ -150,6 +152,9 @@ const char	*zbx_interface_type_string(zbx_interface_type_t type);
 #define INTERFACE_TYPE_COUNT	4	/* number of interface types */
 extern const int	INTERFACE_TYPE_PRIORITY[INTERFACE_TYPE_COUNT];
 
+#define SNMP_BULK_DISABLED	0
+#define SNMP_BULK_ENABLED	1
+
 #define ZBX_FLAG_DISCOVERY_NORMAL	0x00
 #define ZBX_FLAG_DISCOVERY_RULE		0x01
 #define ZBX_FLAG_DISCOVERY_PROTOTYPE	0x02
@@ -633,6 +638,8 @@ zbx_script_t;
 #define POLLER_DELAY		5
 #define DISCOVERER_DELAY	60
 
+#define HOUSEKEEPER_STARTUP_DELAY	30	/* in minutes */
+
 #define	GET_SENDER_TIMEOUT	60
 
 #ifndef MAX
@@ -789,9 +796,7 @@ void	zbx_ltrim(char *str, const char *charlist);
 void	zbx_lrtrim(char *str, const char *charlist);
 void	zbx_remove_chars(register char *str, const char *charlist);
 #define ZBX_WHITESPACE			" \t\r\n"
-#define zbx_remove_spaces(str)		zbx_remove_chars(str, " ")
 #define zbx_remove_whitespace(str)	zbx_remove_chars(str, ZBX_WHITESPACE)
-void	compress_signs(char *str);
 void	del_zeroes(char *s);
 int	get_param(const char *param, int num, char *buf, size_t max_len);
 int	num_param(const char *param);
@@ -808,7 +813,7 @@ char	*get_param_dyn(const char *param, int num);
  *                       for their parameters - 1 or higher (for arrays)      *
  *      num       - [IN] parameter number; for item keys and OIDs the level   *
  *                       will be 0; for their parameters - 1 or higher        *
- *      quoted    - [IN] 1 if parameter is quoted; 0 - othetwise              *
+ *      quoted    - [IN] 1 if parameter is quoted; 0 - otherwise              *
  *      cb_data   - [IN] callback function custom data                        *
  *                                                                            *
  * Return value: NULL if parameter doesn't change; a new string - otherwise   *
@@ -824,7 +829,6 @@ int	replace_key_params_dyn(char **data, int key_type, replace_key_param_f cb, vo
 		size_t maxerrlen);
 
 void	remove_param(char *param, int num);
-const char	*get_string(const char *p, char *buf, size_t bufsize);
 int	get_key_param(char *param, int num, char *buf, size_t max_len);
 int	num_key_param(char *param);
 size_t	zbx_get_escape_string_len(const char *src, const char *charlist);
@@ -897,7 +901,7 @@ void	zbx_chrcpy_alloc(char **str, size_t *alloc_len, size_t *offset, char c);
 #define strscpy(x, y)	zbx_strlcpy(x, y, sizeof(x))
 #define strscat(x, y)	zbx_strlcat(x, y, sizeof(x))
 size_t	zbx_strlcpy(char *dst, const char *src, size_t siz);
-size_t	zbx_strlcat(char *dst, const char *src, size_t siz);
+void	zbx_strlcat(char *dst, const char *src, size_t siz);
 
 char	*zbx_dvsprintf(char *dest, const char *f, va_list args);
 
@@ -936,11 +940,12 @@ void	zbx_on_exit(); /* calls exit() at the end! */
 
 int	int_in_list(char *list, int value);
 int	uint64_in_list(char *list, zbx_uint64_t value);
-int	ip_in_list(char *list, char *ip);
+int	ip_in_list(char *list, const char *ip);
 
-int	expand_ipv6(const char *ip, char *str, size_t str_len);
+int	ip4_str2dig(const char *ip, unsigned int *ip_dig);
+int	ip6_str2dig(const char *ip, unsigned short *groups);
 #ifdef HAVE_IPV6
-char	*collapse_ipv6(char *str, size_t str_len);
+void	ip6_dig2str(unsigned short *groups, char *ip, size_t ip_len);
 #endif
 
 /* time related functions */
@@ -967,13 +972,14 @@ void	uint64_array_remove_both(zbx_uint64_t *values, int *num, zbx_uint64_t *rm_v
 const char	*zbx_event_value_string(unsigned char source, unsigned char object, unsigned char value);
 
 #ifdef _WINDOWS
-LPTSTR	zbx_acp_to_unicode(LPCSTR acp_string);
-LPTSTR	zbx_oemcp_to_unicode(LPCSTR oemcp_string);
-int	zbx_acp_to_unicode_static(LPCSTR acp_string, LPTSTR wide_string, int wide_size);
-LPTSTR	zbx_utf8_to_unicode(LPCSTR utf8_string);
-LPSTR	zbx_unicode_to_utf8(LPCTSTR wide_string);
-LPSTR	zbx_unicode_to_utf8_static(LPCTSTR wide_string, LPSTR utf8_string, int utf8_size);
-int	_wis_uint(LPCTSTR wide_string);
+const OSVERSIONINFOEX	*zbx_win_getversion();
+wchar_t	*zbx_acp_to_unicode(const char *acp_string);
+wchar_t	*zbx_oemcp_to_unicode(const char *oemcp_string);
+int	zbx_acp_to_unicode_static(const char *acp_string, wchar_t *wide_string, int wide_size);
+wchar_t	*zbx_utf8_to_unicode(const char *utf8_string);
+char	*zbx_unicode_to_utf8(const wchar_t *wide_string);
+char	*zbx_unicode_to_utf8_static(const wchar_t *wide_string, char *utf8_string, int utf8_size);
+int	_wis_uint(const wchar_t *wide_string);
 #endif
 void	zbx_strlower(char *str);
 void	zbx_strupper(char *str);
@@ -994,6 +1000,8 @@ void	dos2unix(char *str);
 int	str2uint64(const char *str, const char *suffixes, zbx_uint64_t *value);
 double	str2double(const char *str);
 
+zbx_uint64_t	suffix2factor(char c);
+
 #if defined(_WINDOWS)
 typedef struct __stat64	zbx_stat_t;
 int	__zbx_stat(const char *path, zbx_stat_t *buf);
@@ -1003,7 +1011,8 @@ typedef struct stat	zbx_stat_t;
 #endif	/* _WINDOWS */
 
 typedef int (*zbx_process_value_func_t)(const char *, unsigned short, const char *, const char *, const char *,
-		zbx_uint64_t *, int *, unsigned long *, const char *, unsigned short *, unsigned long *, unsigned char);
+		unsigned char, zbx_uint64_t *, int *, unsigned long *, const char *, unsigned short *, unsigned long *,
+		unsigned char);
 
 void	find_cr_lf_szbyte(const char *encoding, const char **cr, const char **lf, size_t *szbyte);
 int	zbx_read(int fd, char *buf, size_t count, const char *encoding);
@@ -1014,7 +1023,7 @@ int	MAIN_ZABBIX_ENTRY();
 zbx_uint64_t	zbx_letoh_uint64(zbx_uint64_t data);
 zbx_uint64_t	zbx_htole_uint64(zbx_uint64_t data);
 
-int	zbx_check_hostname(const char *hostname);
+int	zbx_check_hostname(const char *hostname, char **error);
 
 int	is_hostname_char(char c);
 int	is_key_char(char c);
diff --git a/include/comms.h b/include/comms.h
index b5fcf0847a7..590df441add 100644
--- a/include/comms.h
+++ b/include/comms.h
@@ -52,13 +52,6 @@ typedef int	ZBX_SOCKET;
 
 typedef enum
 {
-	ZBX_TCP_ERR_NETWORK = 1,
-	ZBX_TCP_ERR_TIMEOUT
-}
-zbx_tcp_errors;
-
-typedef enum
-{
 	ZBX_BUF_TYPE_STAT = 0,
 	ZBX_BUF_TYPE_DYN
 }
@@ -73,16 +66,18 @@ typedef struct
 	ZBX_SOCKET	sockets[ZBX_SOCKET_COUNT];
 	ZBX_SOCKET	socket;
 	ZBX_SOCKET	socket_orig;
-	char		buf_stat[ZBX_STAT_BUF_LEN];
-	char		*buf_dyn;
+	size_t		read_bytes;
 	zbx_buf_type_t	buf_type;
+	char		buf_stat[ZBX_STAT_BUF_LEN];
+	char		*buffer;
 	unsigned char	accepted;
 	char		*error;
+	char		*next_line;
 	int		timeout;
 }
 zbx_sock_t;
 
-const char	*zbx_tcp_strerror();
+const char	*zbx_tcp_strerror(void);
 
 #if !defined(_WINDOWS)
 void	zbx_gethost_by_ip(const char *ip, char *host, size_t hostlen);
@@ -93,11 +88,12 @@ int     zbx_tcp_connect(zbx_sock_t *s, const char *source_ip, const char *ip, un
 
 #define ZBX_TCP_PROTOCOL	0x01
 
-#define zbx_tcp_send(s, d)		zbx_tcp_send_ext((s), (d), ZBX_TCP_PROTOCOL, 0)
-#define zbx_tcp_send_to(s, d, timeout)	zbx_tcp_send_ext((s), (d), ZBX_TCP_PROTOCOL, timeout)
-#define zbx_tcp_send_raw(s, d)		zbx_tcp_send_ext((s), (d), 0, 0)
+#define zbx_tcp_send(s, d)				zbx_tcp_send_ext((s), (d), strlen(d), ZBX_TCP_PROTOCOL, 0)
+#define zbx_tcp_send_to(s, d, timeout)			zbx_tcp_send_ext((s), (d), strlen(d), ZBX_TCP_PROTOCOL, timeout)
+#define zbx_tcp_send_bytes_to(s, d, len, timeout)	zbx_tcp_send_ext((s), (d), len, ZBX_TCP_PROTOCOL, timeout)
+#define zbx_tcp_send_raw(s, d)				zbx_tcp_send_ext((s), (d), strlen(d), 0, 0)
 
-int     zbx_tcp_send_ext(zbx_sock_t *s, const char *data, unsigned char flags, int timeout);
+int     zbx_tcp_send_ext(zbx_sock_t *s, const char *data, size_t len, unsigned char flags, int timeout);
 
 void    zbx_tcp_close(zbx_sock_t *s);
 
@@ -114,10 +110,11 @@ void    zbx_tcp_free(zbx_sock_t *s);
 
 #define ZBX_TCP_READ_UNTIL_CLOSE 0x01
 
-#define	zbx_tcp_recv(s, data) 			SUCCEED_OR_FAIL(zbx_tcp_recv_ext(s, data, 0, 0))
-#define	zbx_tcp_recv_to(s, data, timeout) 	SUCCEED_OR_FAIL(zbx_tcp_recv_ext(s, data, 0, timeout))
+#define	zbx_tcp_recv(s) 		SUCCEED_OR_FAIL(zbx_tcp_recv_ext(s, 0, 0))
+#define	zbx_tcp_recv_to(s, timeout) 	SUCCEED_OR_FAIL(zbx_tcp_recv_ext(s, 0, timeout))
 
-ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, char **data, unsigned char flags, int timeout);
+ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, unsigned char flags, int timeout);
+const char	*zbx_tcp_recv_line(zbx_sock_t *s);
 
 char    *get_ip_by_socket(zbx_sock_t *s);
 int	zbx_tcp_check_security(zbx_sock_t *s, const char *ip_list, int allow_if_empty);
diff --git a/include/db.h b/include/db.h
index 64542f6580f..4a0163f1fcd 100644
--- a/include/db.h
+++ b/include/db.h
@@ -58,6 +58,8 @@ typedef enum
 }
 zbx_graph_item_type;
 
+struct	_DC_TRIGGER;
+
 #define ZBX_DB_CONNECT_NORMAL	0
 #define ZBX_DB_CONNECT_EXIT	1
 #define ZBX_DB_CONNECT_ONCE	2
@@ -76,7 +78,7 @@ zbx_graph_item_type;
 
 #define HOST_HOST_LEN			MAX_ZBX_HOSTNAME_LEN
 #define HOST_HOST_LEN_MAX		(HOST_HOST_LEN + 1)
-#define HOST_NAME_LEN			64
+#define HOST_NAME_LEN			128
 #define HOST_ERROR_LEN			128
 #define HOST_ERROR_LEN_MAX		(HOST_ERROR_LEN + 1)
 #define HOST_IPMI_USERNAME_LEN		16
@@ -99,7 +101,7 @@ zbx_graph_item_type;
 #define ITEM_SNMP_COMMUNITY_LEN_MAX	(ITEM_SNMP_COMMUNITY_LEN + 1)
 #define ITEM_SNMP_OID_LEN		255
 #define ITEM_SNMP_OID_LEN_MAX		(ITEM_SNMP_OID_LEN + 1)
-#define ITEM_ERROR_LEN			128
+#define ITEM_ERROR_LEN			2048
 #define ITEM_ERROR_LEN_MAX		(ITEM_ERROR_LEN + 1)
 #define ITEM_TRAPPER_HOSTS_LEN		255
 #define ITEM_TRAPPER_HOSTS_LEN_MAX	(ITEM_TRAPPER_HOSTS_LEN + 1)
@@ -162,12 +164,9 @@ zbx_graph_item_type;
 
 #define DSERVICE_KEY_LEN		255
 #define DSERVICE_VALUE_LEN		255
-#define DSERVICE_VALUE_LEN_MAX		(DSERVICE_VALUE_LEN + 1)
 
 #define HTTPTEST_HTTP_USER_LEN		64
-#define HTTPTEST_HTTP_USER_LEN_MAX	(HTTPTEST_HTTP_USER_LEN + 1)
 #define HTTPTEST_HTTP_PASSWORD_LEN	64
-#define HTTPTEST_HTTP_PASSWORD_LEN_MAX	(HTTPTEST_HTTP_PASSWORD_LEN + 1)
 
 #define PROXY_DHISTORY_KEY_LEN		255
 #define PROXY_DHISTORY_VALUE_LEN	255
@@ -251,7 +250,7 @@ typedef struct
 	int		status;
 	int		lastup;
 	int		lastdown;
-	char		value[DSERVICE_VALUE_LEN_MAX];
+	char		*value;
 }
 DB_DSERVICE;
 
@@ -368,12 +367,18 @@ typedef struct
 	zbx_uint64_t	httptestid;
 	char		*name;
 	char		*variables;
+	char		*headers;
 	char		*agent;
 	char		*http_user;
 	char		*http_password;
 	char		*http_proxy;
+	char		*ssl_cert_file;
+	char		*ssl_key_file;
+	char		*ssl_key_password;
 	int		authentication;
 	int		retries;
+	int		verify_peer;
+	int		verify_host;
 }
 DB_HTTPTEST;
 
@@ -389,6 +394,9 @@ typedef struct
 	int		no;
 	int		timeout;
 	char		*variables;
+	int		follow_redirects;
+	int		retrieve_mode;
+	char		*headers;
 }
 DB_HTTPSTEP;
 
@@ -407,9 +415,9 @@ typedef struct
 DB_ESCALATION;
 
 int	DBconnect(int flag);
-void	DBinit();
+void	DBinit(void);
 
-void	DBclose();
+void	DBclose(void);
 
 #ifdef HAVE_ORACLE
 void	DBstatement_prepare(const char *sql);
@@ -470,8 +478,10 @@ typedef struct
 }
 ZBX_GRAPH_ITEMS;
 
-int	DBupdate_item_status_to_notsupported(DB_ITEM *item, int clock, const char *error);
 void	process_triggers(zbx_vector_ptr_t *triggers);
+int	process_trigger(char **sql, size_t *sql_alloc, size_t *sql_offset, const struct _DC_TRIGGER *trigger);
+
+int	DBupdate_item_status_to_notsupported(DB_ITEM *item, int clock, const char *error);
 int	DBget_row_count(const char *table_name);
 int	DBget_proxy_lastaccess(const char *hostname, int *lastaccess, char **error);
 
@@ -498,7 +508,6 @@ int	DBcopy_template_elements(zbx_uint64_t hostid, zbx_vector_uint64_t *lnk_templ
 int	DBdelete_template_elements(zbx_uint64_t hostid, zbx_vector_uint64_t *del_templateids);
 
 void	DBdelete_items(zbx_vector_uint64_t *itemids);
-void	DBdelete_triggers(zbx_vector_uint64_t *triggerids);
 void	DBdelete_graphs(zbx_vector_uint64_t *graphids);
 void	DBdelete_hosts(zbx_vector_uint64_t *hostids);
 
@@ -513,10 +522,11 @@ void	DBadd_trend_uint(zbx_uint64_t itemid, zbx_uint64_t value, int clock);
 
 void	DBadd_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, const char *fieldname,
 		const zbx_uint64_t *values, const int num);
+void	DBadd_str_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, const char *fieldname,
+		const char **values, const int num);
 
 const char	*zbx_host_string(zbx_uint64_t hostid);
 const char	*zbx_host_key_string(zbx_uint64_t itemid);
-const char	*zbx_host_key_string_by_item(DB_ITEM *item);
 const char	*zbx_user_string(zbx_uint64_t userid);
 
 void	DBregister_host(zbx_uint64_t proxy_hostid, const char *host, const char *ip, const char *dns,
diff --git a/include/dbcache.h b/include/dbcache.h
index 83ef8b985b3..d3b1ba9c942 100644
--- a/include/dbcache.h
+++ b/include/dbcache.h
@@ -102,6 +102,7 @@ typedef struct
 	unsigned char	jmx_available;
 	int		jmx_disable_until;
 	char		inventory_mode;
+	unsigned char	status;
 }
 DC_HOST;
 
@@ -125,6 +126,7 @@ typedef struct
 	unsigned char	snmpv3_authprotocol;
 	unsigned char	snmpv3_privprotocol;
 	unsigned char	inventory_link;
+	unsigned char	status;
 	char		key_orig[ITEM_KEY_LEN * 4 + 1], *key;
 	char		*formula;
 	char		*units;
@@ -163,21 +165,25 @@ typedef struct
 }
 DC_FUNCTION;
 
-typedef struct
+typedef struct _DC_TRIGGER
 {
 	zbx_uint64_t	triggerid;
 	char		*description;
 	char		*expression_orig;
+	/* temporary value, allocated during processing and freed right after */
 	char		*expression;
+
 	char		*error;
 	char		*new_error;
 	zbx_timespec_t	timespec;
 	int		lastchange;
+	unsigned char	topoindex;
 	unsigned char	priority;
 	unsigned char	type;
 	unsigned char	value;
 	unsigned char	state;
 	unsigned char	new_value;
+	unsigned char	status;
 }
 DC_TRIGGER;
 
@@ -196,8 +202,8 @@ DC_PROXY;
 
 typedef struct
 {
-	char	*host;
-	char	*key;
+	const char	*host;
+	const char	*key;
 }
 zbx_host_key_t;
 
@@ -253,6 +259,9 @@ typedef struct
 }
 zbx_host_availability_t;
 
+int	is_item_processed_by_server(unsigned char type, const char *key);
+int	in_maintenance_without_data_collection(unsigned char maintenance_status, unsigned char maintenance_type,
+		unsigned char type);
 void	dc_add_history(zbx_uint64_t itemid, unsigned char value_type, unsigned char flags, AGENT_RESULT *value,
 		zbx_timespec_t *ts, unsigned char state, const char *error);
 void	dc_flush_history();
@@ -291,15 +300,17 @@ void	init_configuration_cache();
 void	free_configuration_cache();
 void	DCload_config();
 
+void	DCconfig_get_triggers_by_triggerids(DC_TRIGGER *triggers, const zbx_uint64_t *triggerids, int *errcode,
+		size_t num);
 void	DCconfig_clean_items(DC_ITEM *items, int *errcodes, size_t num);
 int	DCget_host_by_hostid(DC_HOST *host, zbx_uint64_t hostid);
-void	DCconfig_get_items_by_keys(DC_ITEM *items, zbx_uint64_t proxy_hostid,
-		zbx_host_key_t *keys, int *errcodes, size_t num);
-void	DCconfig_get_items_by_itemids(DC_ITEM *items, zbx_uint64_t *itemids, int *errcodes, size_t num);
+void	DCconfig_get_items_by_keys(DC_ITEM *items, zbx_host_key_t *keys, int *errcodes, size_t num);
+void	DCconfig_get_items_by_itemids(DC_ITEM *items, const zbx_uint64_t *itemids, int *errcodes, size_t num);
 void	DCconfig_set_item_db_state(zbx_uint64_t itemid, unsigned char state, const char *error);
 void	DCconfig_get_functions_by_functionids(DC_FUNCTION *functions,
 		zbx_uint64_t *functionids, int *errcodes, size_t num);
 void	DCconfig_clean_functions(DC_FUNCTION *functions, int *errcodes, size_t num);
+void	DCconfig_clean_triggers(DC_TRIGGER *triggers, int *errcodes, size_t num);
 void	DCconfig_lock_triggers_by_itemids(zbx_uint64_t *itemids, int itemids_num, zbx_vector_uint64_t *triggerids);
 void	DCconfig_unlock_triggers(const zbx_vector_uint64_t *triggerids);
 void	DCconfig_get_triggers_by_itemids(zbx_hashset_t *trigger_info, zbx_vector_ptr_t *trigger_order,
@@ -308,8 +319,7 @@ void	DCconfig_get_time_based_triggers(DC_TRIGGER **trigger_info, zbx_vector_ptr_
 		int process_num);
 void	DCfree_triggers(zbx_vector_ptr_t *triggers);
 void	DCconfig_update_interface_snmp_stats(zbx_uint64_t interfaceid, int max_snmp_succeed, int min_snmp_fail);
-int	DCconfig_get_interface_snmp_stats(zbx_uint64_t interfaceid, int *max_snmp_succeed, int *min_snmp_fail);
-int	DCconfig_get_suggested_snmp_vars(int max_snmp_succeed, int min_snmp_fail);
+int	DCconfig_get_suggested_snmp_vars(zbx_uint64_t interfaceid, int *bulk);
 int	DCconfig_get_interface_by_type(DC_INTERFACE *interface, zbx_uint64_t hostid, unsigned char type);
 int	DCconfig_get_poller_nextcheck(unsigned char poller_type);
 int	DCconfig_get_poller_items(unsigned char poller_type, DC_ITEM *items);
@@ -369,7 +379,7 @@ int	DCget_trigger_count();
 double	DCget_required_performance();
 int	DCget_host_count();
 
-void	DCget_functions_hostids(zbx_vector_uint64_t *hosts, const zbx_vector_uint64_t *functionids);
+void	DCget_functions_hostids(zbx_vector_uint64_t *hostids, const zbx_vector_uint64_t *functionids);
 
 void	DCget_expressions_by_names(zbx_vector_ptr_t *expressions, const char * const *names, int names_num);
 void	DCget_expressions_by_name(zbx_vector_ptr_t *expressions, const char *name);
diff --git a/include/gnuregex.h b/include/gnuregex.h
index 5b294847191..e427826ed87 100644
--- a/include/gnuregex.h
+++ b/include/gnuregex.h
@@ -428,7 +428,7 @@ extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
    compiled into BUFFER.  Start searching at position START, for RANGE
    characters.  Return the starting position of the match, -1 for no
    match, or -2 for an internal error.  Also return register
-   information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
+   information in REGS (if REGS and BUFFER->no_sub are non-zero).  */
 extern int re_search
   _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
             int length, int start, int range, struct re_registers *regs));
diff --git a/include/log.h b/include/log.h
index 938eb74d639..05285b7d8af 100644
--- a/include/log.h
+++ b/include/log.h
@@ -58,14 +58,16 @@ int		zabbix_open_log(int type,int level, const char *filename);
 void		zabbix_errlog(zbx_err_codes_t err, ...);
 void		__zbx_zabbix_log(int level, const char *fmt, ...);
 void		zabbix_close_log();
+void		zabbix_set_log_level(int level);
 int		set_debug_level_up();
 int		set_debug_level_down();
 const char	*get_debug_level_string();
 int		zabbix_check_log_level(int level);
 char		*zbx_strerror(int errnum);
 char		*strerror_from_system(unsigned long error);
+
 #ifdef _WINDOWS
-char		*strerror_from_module(unsigned long error, LPCTSTR module);
+char		*strerror_from_module(unsigned long error, const wchar_t *module);
 #endif
 
 #if defined(_WINDOWS)
diff --git a/include/module.h b/include/module.h
index 654c35cd556..f70fe5c2f81 100644
--- a/include/module.h
+++ b/include/module.h
@@ -27,7 +27,7 @@
 
 #define ZBX_MODULE_API_VERSION_ONE	1
 
-#define get_rparam(request, num)	(request->nparam > num ? request->params[num] : NULL)
+#define get_rparam(request, num)	((request)->nparam > num ? (request)->params[num] : NULL)
 
 /* flags for command */
 #define CF_HAVEPARAMS		0x01	/* item accepts either optional or mandatory parameters */
diff --git a/include/mutexs.h b/include/mutexs.h
index 0592a886580..9a15064efea 100644
--- a/include/mutexs.h
+++ b/include/mutexs.h
@@ -55,7 +55,8 @@
 #	define ZBX_MUTEX_ITSERVICES	8
 #	define ZBX_MUTEX_VALUECACHE	9
 #	define ZBX_MUTEX_VMWARE		10
-#	define ZBX_MUTEX_COUNT		11
+#	define ZBX_MUTEX_SQLITE3	11
+#	define ZBX_MUTEX_COUNT		12
 
 #	define ZBX_MUTEX_MAX_TRIES	20	/* seconds */
 
@@ -71,27 +72,4 @@ void	__zbx_mutex_lock(const char *filename, int line, ZBX_MUTEX *mutex);
 void	__zbx_mutex_unlock(const char *filename, int line, ZBX_MUTEX *mutex);
 int	zbx_mutex_destroy(ZBX_MUTEX *mutex);
 
-#if defined(HAVE_SQLITE3)
-
-/*********************************************************/
-/*** PHP Semaphore functions using System V semaphores ***/
-/*********************************************************/
-
-#define PHP_MUTEX_OK	1
-#define PHP_MUTEX_ERROR	0
-
-typedef struct
-{
-	int	semid;
-	int	count;
-}
-PHP_MUTEX;
-
-int	php_sem_get(PHP_MUTEX *sem_ptr, const char *path_name);
-int	php_sem_acquire(PHP_MUTEX *sem_ptr);
-int	php_sem_release(PHP_MUTEX *sem_ptr);
-int	php_sem_remove(PHP_MUTEX *sem_ptr);
-
-#endif	/* HAVE_SQLITE3 */
-
 #endif	/* ZABBIX_MUTEXS_H */
diff --git a/include/perfmon.h b/include/perfmon.h
index cf8b82caf07..124d83b9556 100644
--- a/include/perfmon.h
+++ b/include/perfmon.h
@@ -44,7 +44,7 @@ typedef struct perf_counter_id
 {
 	struct perf_counter_id	*next;
 	unsigned long		pdhIndex;
-	TCHAR			name[PDH_MAX_COUNTER_NAME];
+	wchar_t			name[PDH_MAX_COUNTER_NAME];
 }
 PERF_COUNTER_ID;
 
@@ -73,7 +73,7 @@ PDH_STATUS	zbx_PdhCollectQueryData(const char *function, const char *counterpath
 PDH_STATUS	zbx_PdhGetRawCounterValue(const char *function, const char *counterpath, PDH_HCOUNTER handle, PPDH_RAW_COUNTER value);
 
 PDH_STATUS	calculate_counter_value(const char *function, const char *counterpath, double *value);
-LPTSTR		get_counter_name(DWORD pdhIndex);
+wchar_t		*get_counter_name(DWORD pdhIndex);
 int		check_counter_path(char *counterPath);
 
 #endif /* ZABBIX_PERFMON_H */
diff --git a/include/symbols.h b/include/symbols.h
index 163742c10aa..069e71a8611 100644
--- a/include/symbols.h
+++ b/include/symbols.h
@@ -22,10 +22,28 @@
 
 #if defined(_WINDOWS)
 
+#	define _WIN32_WINNT	0x0500	/* Target MS Windows 2000 and later. */
+
+/* some definitions which are not available on older MS Windows versions */
+typedef enum {
+	FileIdInfo	= 18	/* we need only one value, the rest of enumerated values are omitted here */
+} FILE_INFO_BY_HANDLE_CLASS;
+
+typedef struct {
+	ULONGLONG	LowPart;
+	ULONGLONG	HighPart;
+} EXT_FILE_ID_128;
+
+typedef struct {
+	ULONGLONG	VolumeSerialNumber;
+	EXT_FILE_ID_128	FileId;
+} FILE_ID_INFO;
+
 DWORD	(__stdcall *zbx_GetGuiResources)(HANDLE, DWORD);
 BOOL	(__stdcall *zbx_GetProcessIoCounters)(HANDLE, PIO_COUNTERS);
 BOOL	(__stdcall *zbx_GetPerformanceInfo)(PPERFORMANCE_INFORMATION, DWORD);
 BOOL	(__stdcall *zbx_GlobalMemoryStatusEx)(LPMEMORYSTATUSEX);
+BOOL	(__stdcall *zbx_GetFileInformationByHandleEx)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, LPVOID, DWORD);
 
 void	import_symbols();
 
diff --git a/include/sysinc.h b/include/sysinc.h
index 507602edf93..b172e01143e 100644
--- a/include/sysinc.h
+++ b/include/sysinc.h
@@ -56,7 +56,7 @@
 
 #ifdef HAVE_WINDOWS_H
 /* to speed build process and reduce size of the Win32 header files */
-#define WIN32_LEAN_AND_MEAN	1
+#	define WIN32_LEAN_AND_MEAN	1
 #	include <windows.h>
 #endif
 
@@ -131,9 +131,9 @@
 #endif
 
 #ifdef HAVE_ARPA_NAMESER_H
-#ifdef MAC_OS_X
-#	define BIND_8_COMPAT 1
-#endif
+#	ifdef MAC_OS_X
+#		define BIND_8_COMPAT 1
+#	endif
 #	include <arpa/nameser.h>
 #endif
 
@@ -382,6 +382,10 @@
 #	if !defined(HAVE_FUNCTION_CURL_EASY_ESCAPE)
 #		define curl_easy_escape(handle, string, length) curl_escape(string, length)
 #	endif
+#	if 0x071004 >= LIBCURL_VERSION_NUM	/* version 7.16.4 */
+#		define CURLOPT_KEYPASSWD	CURLOPT_SSLKEYPASSWD
+#	endif
+#	define ZBX_CURLOPT_MAXREDIRS	10L
 #endif
 
 /* Net-SNMP is used */
diff --git a/include/sysinfo.h b/include/sysinfo.h
index dbd19db123a..4d48cda4d05 100644
--- a/include/sysinfo.h
+++ b/include/sysinfo.h
@@ -129,6 +129,10 @@ extern int	CONFIG_UNSAFE_USER_PARAMETERS;
 #define ZBX_AVG15		2
 #define ZBX_AVG_COUNT		3
 
+#ifdef _WINDOWS
+#	define MAX_COLLECTOR_PERIOD	(15 * SEC_PER_MIN)
+#endif
+
 #define ZBX_CPU_STATE_USER	0
 #define ZBX_CPU_STATE_SYSTEM	1
 #define ZBX_CPU_STATE_NICE	2
@@ -189,7 +193,7 @@ void	free_result(AGENT_RESULT *result);
 void	init_request(AGENT_REQUEST *request);
 void	free_request(AGENT_REQUEST *request);
 
-int	parse_item_key(char *cmd, AGENT_REQUEST *request);
+int	parse_item_key(const char *itemkey, AGENT_REQUEST *request);
 
 zbx_log_t	*add_log_result(AGENT_RESULT *result, const char *value);
 void		set_log_result_empty(AGENT_RESULT *result);
@@ -223,6 +227,7 @@ int	SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result);
 int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result);
 int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result);
 int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result);
 int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result);
 int	SYSTEM_HW_CHASSIS(AGENT_REQUEST *request, AGENT_RESULT *result);
 int	SYSTEM_HW_CPU(AGENT_REQUEST *request, AGENT_RESULT *result);
diff --git a/include/version.h b/include/version.h
index 3918402ddfb..599f3238313 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,10 +24,10 @@
 #define ZBX_STR(str)	ZBX_STR2(str)
 
 #define APPLICATION_NAME	"Zabbix Agent"
-#define ZABBIX_REVDATE		"12 November 2013"
+#define ZABBIX_REVDATE		"5 August 2014"
 #define ZABBIX_VERSION_MAJOR	2
 #define ZABBIX_VERSION_MINOR	3
-#define ZABBIX_VERSION_PATCH	0
+#define ZABBIX_VERSION_PATCH	4
 #define ZABBIX_VERSION_REVISION	{ZABBIX_REVISION}
 #define ZABBIX_VERSION_RC	""
 #define ZABBIX_VERSION		ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \
diff --git a/include/zbxalgo.h b/include/zbxalgo.h
index a65e50cfe06..561a6b90390 100644
--- a/include/zbxalgo.h
+++ b/include/zbxalgo.h
@@ -105,6 +105,10 @@ ZBX_HASHSET_ENTRY_T
 {
 	ZBX_HASHSET_ENTRY_T	*next;
 	zbx_hash_t		hash;
+#if SIZEOF_VOID_P > 4
+	/* the data member must be properly aligned on 64-bit architectures that require aligned memory access */
+	char			padding[sizeof(void *) - sizeof(zbx_hash_t)];
+#endif
 	char			data[1];
 };
 
@@ -310,4 +314,8 @@ void umul64_64(zbx_uint128_t *result, zbx_uint64_t value, zbx_uint64_t factor);
 
 unsigned int	zbx_isqrt32(unsigned int value);
 
+/* expression evaluation */
+
+int	evaluate(double *value, const char *expression, char *error, int max_error_len);
+
 #endif
diff --git a/include/zbxdb.h b/include/zbxdb.h
index 8d6c4b3afa4..8dda4f8ec60 100644
--- a/include/zbxdb.h
+++ b/include/zbxdb.h
@@ -158,17 +158,17 @@
 
 int	zbx_db_connect(char *host, char *user, char *password, char *dbname, char *dbschema, char *dbsocket, int port);
 #ifdef HAVE_SQLITE3
-void	zbx_create_sqlite3_mutex(const char *dbname);
-void	zbx_remove_sqlite3_mutex();
+void	zbx_create_sqlite3_mutex(void);
+void	zbx_remove_sqlite3_mutex(void);
 #endif
 void	zbx_db_init(const char *dbname, const char *const db_schema);
-void    zbx_db_close();
+void    zbx_db_close(void);
 
-int	zbx_db_begin();
-int	zbx_db_commit();
-int	zbx_db_rollback();
-int	zbx_db_txn_level();
-int	zbx_db_txn_error();
+int	zbx_db_begin(void);
+int	zbx_db_commit(void);
+int	zbx_db_rollback(void);
+int	zbx_db_txn_level(void);
+int	zbx_db_txn_error(void);
 
 #ifdef HAVE_ORACLE
 int		zbx_db_statement_prepare(const char *sql);
diff --git a/include/zbxgetopt.h b/include/zbxgetopt.h
index 6501d5a23db..7222084bc64 100644
--- a/include/zbxgetopt.h
+++ b/include/zbxgetopt.h
@@ -69,7 +69,7 @@ extern int zbx_optopt;
 
    To have a long-named option do something other than set an `int' to
    a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
+   option's `flag' field to zero and its `val' field to a non-zero
    value (the equivalent single-letter option character, if there is
    one).  For long options that have a zero `flag' field, `getopt'
    returns the contents of the `val' field.  */
diff --git a/include/zbxjson.h b/include/zbxjson.h
index a5c23530177..dc360fbd019 100644
--- a/include/zbxjson.h
+++ b/include/zbxjson.h
@@ -138,6 +138,8 @@ int	zbx_json_close(struct zbx_json *j);
 int		zbx_json_open(const char *buffer, struct zbx_json_parse *jp);
 const char	*zbx_json_next(const struct zbx_json_parse *jp, const char *p);
 const char	*zbx_json_next_value(const struct zbx_json_parse *jp, const char *p, char *string, size_t len, int *is_null);
+const char	*zbx_json_next_value_dyn(const struct zbx_json_parse *jp, const char *p, char **string,
+		size_t *string_alloc, int *is_null);
 const char	*zbx_json_pair_next(const struct zbx_json_parse *jp, const char *p, char *name, size_t len);
 const char	*zbx_json_pair_by_name(const struct zbx_json_parse *jp, const char *name);
 int		zbx_json_value_by_name(const struct zbx_json_parse *jp, const char *name, char *string, size_t len);
diff --git a/include/zbxserver.h b/include/zbxserver.h
index 9cede13a10c..8625fbe818f 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -25,8 +25,6 @@
 #include "dbcache.h"
 #include "zbxjson.h"
 
-#define TRIGGER_EPSILON	0.000001
-
 #define MACRO_TYPE_MESSAGE_NORMAL	0x0001
 #define MACRO_TYPE_MESSAGE_RECOVERY	0x0002
 #define MACRO_TYPE_TRIGGER_URL		0x0004
@@ -46,14 +44,16 @@
 
 #define STR_CONTAINS_MACROS(str)	(NULL != strchr(str, '{'))
 
-int	evaluate_function(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now);
+void	get_functionids(zbx_vector_uint64_t *functionids, const char *expression);
+
+int	evaluate_function(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now,
+		char **error);
 
 int	substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, DB_EVENT *r_event, zbx_uint64_t *userid,
 		zbx_uint64_t *hostid, DC_HOST *dc_host, DC_ITEM *dc_item, char **data, int macro_type, char *error,
 		int maxerrlen);
 
 void	evaluate_expressions(zbx_vector_ptr_t *triggers);
-int	evaluate(double *value, char *exp, char *error, int maxerrlen);
 
 void	zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid,
 		const char *units, unsigned char value_type);
@@ -66,6 +66,4 @@ int	substitute_discovery_macros(char **data, struct zbx_json_parse *jp_row, int
 int	substitute_key_macros(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, struct zbx_json_parse *jp_row,
 		int macro_type, char *error, size_t mexerrlen);
 
-int	translate_expression(const char *expression, char **opcode, char **error);
-
 #endif
diff --git a/include/zbxtypes.h b/include/zbxtypes.h
index eb8d1a77453..f637de68f1c 100644
--- a/include/zbxtypes.h
+++ b/include/zbxtypes.h
@@ -21,10 +21,10 @@
 #define ZABBIX_TYPES_H
 
 #if defined(_WINDOWS)
-#      define ZBX_THREAD_LOCAL __declspec(thread)
+#	define ZBX_THREAD_LOCAL __declspec(thread)
 #else
-#      define ZBX_THREAD_LOCAL
-#endif 
+#	define ZBX_THREAD_LOCAL
+#endif
 
 #define	ZBX_FS_DBL		"%lf"
 #define	ZBX_FS_DBL_EXT(p)	"%." #p "lf"
@@ -32,17 +32,11 @@
 #define ZBX_PTR_SIZE		sizeof(void *)
 
 #if defined(_WINDOWS)
+#	include <strsafe.h>
 
 #	define zbx_stat(path, buf)		__zbx_stat(path, buf)
 #	define zbx_open(pathname, flags)	__zbx_open(pathname, flags | O_BINARY)
 
-#	include <strsafe.h>
-#	define zbx_wsnprintf	StringCchPrintf
-#	define zbx_strlen	wcslen
-#	define zbx_strchr	wcschr
-#	define zbx_strstr	wcsstr
-#	define zbx_fullpath	_wfullpath
-
 #	ifndef __UINT64_C
 #		define __UINT64_C(x)	x
 #	endif
diff --git a/m4/ax_lib_mysql.m4 b/m4/ax_lib_mysql.m4
index 25013e6399b..50a6b731ba2 100644
--- a/m4/ax_lib_mysql.m4
+++ b/m4/ax_lib_mysql.m4
@@ -88,7 +88,12 @@ AC_DEFUN([AX_LIB_MYSQL],
 
             for i in $_full_libmysql_libs; do
                 case $i in
-                -lmysqlclient)
+		    -lmysqlclient)
+		        _client_lib_name="mysqlclient"
+	     ;;
+		    -lperconaserverclient)
+		        _client_lib_name="perconaserverclient"
+
              ;;
                    -L*)
                         MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
@@ -99,7 +104,7 @@ AC_DEFUN([AX_LIB_MYSQL],
             if test "x$enable_static" = "xyes"; then
                for i in $_full_libmysql_libs; do
                    case $i in
-           	      -lmysqlclient)
+           	      -lmysqlclient|-lperconaserverclient)
            	    ;;
                       -l*)
 				_lib_name="`echo "$i" | cut -b3-`"
@@ -120,8 +125,8 @@ AC_DEFUN([AX_LIB_MYSQL],
 		LDFLAGS="${LDFLAGS} ${MYSQL_LDFLAGS}"
 		CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
 
-		AC_CHECK_LIB(mysqlclient, main, [
-			MYSQL_LIBS="-lmysqlclient ${MYSQL_LIBS}"
+		AC_CHECK_LIB($_client_lib_name, main, [
+			MYSQL_LIBS="-l${_client_lib_name} ${MYSQL_LIBS}"
 			],[
 			AC_MSG_ERROR([Not found mysqlclient library])
 			])
diff --git a/man/zabbix_server.man b/man/zabbix_server.man
index 5c2f4f65a01..a9b7f1c1f16 100644
--- a/man/zabbix_server.man
+++ b/man/zabbix_server.man
@@ -2,7 +2,7 @@
 .SH NAME
 zabbix_server \- Zabbix server daemon.
 .SH SYNOPSIS
-.B zabbix_server [-hV] [-c \fI<config-file>\fR] [-n \fI<nodeid>\fR] [-R \fI<option>\fR]
+.B zabbix_server [-hV] [-c \fI<config-file>\fR] [-R \fI<option>\fR]
 .SH DESCRIPTION
 .B zabbix_server
 is the core daemon of Zabbix software.
@@ -10,8 +10,6 @@ is the core daemon of Zabbix software.
 .IP "-c, --config \fI<config-file>\fR"
 Use the alternate \fIconfig-file\fR instead of the default one.
 Absolute path should be specified.
-.IP "-n, --new-nodeid \fI<nodeid>\fR"
-Convert database data to new \fInodeid\fR. Does not start the server. Run this only once.
 .IP "-R, --runtime-control \fI<option>\fR"
 Perform administrative functions according to \fIoption\fR.
 .SS
diff --git a/misc/images/svg/elements/Cloud.svg b/misc/images/svg/elements/Cloud.svg
index 7ecf310bcca..59400dcb511 100644
--- a/misc/images/svg/elements/Cloud.svg
+++ b/misc/images/svg/elements/Cloud.svg
@@ -1,758 +1,181 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="68"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="Cloud.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-29"
-       id="linearGradient150610"
-       gradientUnits="userSpaceOnUse"
-       x1="389.12378"
-       y1="-871.61053"
-       x2="494.38727"
-       y2="-919.32983" />
-    <linearGradient
-       id="linearGradient4046-29">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4048-75" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop4050-34" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2"
-       id="linearGradient6533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(509.5152,-21.421806)"
-       x1="386.03799"
-       y1="-891.43896"
-       x2="398.38727"
-       y2="-927.82983" />
-    <linearGradient
-       id="linearGradient4046-3-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4048-2-1" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop4050-2-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4384-2"
-       id="linearGradient6535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient4384-2">
-      <stop
-         id="stop4386-5"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop4388-3"
-         offset="1"
-         style="stop-color:#8eafc5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2"
-       id="linearGradient6537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient122938">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop122940" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop122942" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-7-2"
-       id="linearGradient6539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient4046-3-7-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4048-2-7-2" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop4050-2-8-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-29"
-       id="linearGradient150612"
-       gradientUnits="userSpaceOnUse"
-       x1="389.12378"
-       y1="-871.61053"
-       x2="494.38727"
-       y2="-919.32983" />
-    <linearGradient
-       id="linearGradient122949">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop122951" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop122953" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2"
-       id="linearGradient6511"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(509.5152,-21.421806)"
-       x1="386.03799"
-       y1="-891.43896"
-       x2="398.38727"
-       y2="-927.82983" />
-    <linearGradient
-       id="linearGradient122960">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop122962" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop122964" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4384-2"
-       id="linearGradient6513"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient122967">
-      <stop
-         id="stop122969"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop122971"
-         offset="1"
-         style="stop-color:#8eafc5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2"
-       id="linearGradient6515"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient122974">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop122976" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop122978" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-7-2"
-       id="linearGradient6517"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient122981">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop122983" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop122985" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-29"
-       id="linearGradient150614"
-       gradientUnits="userSpaceOnUse"
-       x1="389.12378"
-       y1="-871.61053"
-       x2="494.38727"
-       y2="-919.32983" />
-    <linearGradient
-       id="linearGradient122988">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop122990" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop122992" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2"
-       id="linearGradient6489"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(509.5152,-21.421806)"
-       x1="386.03799"
-       y1="-891.43896"
-       x2="398.38727"
-       y2="-927.82983" />
-    <linearGradient
-       id="linearGradient122999">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123001" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123003" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4384-2"
-       id="linearGradient6491"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient123006">
-      <stop
-         id="stop123008"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop123010"
-         offset="1"
-         style="stop-color:#8eafc5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2"
-       id="linearGradient6493"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient123013">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123015" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123017" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-7-2"
-       id="linearGradient6495"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient123020">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123022" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123024" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-29"
-       id="linearGradient150616"
-       gradientUnits="userSpaceOnUse"
-       x1="389.12378"
-       y1="-871.61053"
-       x2="494.38727"
-       y2="-919.32983" />
-    <linearGradient
-       id="linearGradient123027">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123029" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123031" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2"
-       id="linearGradient6467"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(509.5152,-21.421806)"
-       x1="386.03799"
-       y1="-891.43896"
-       x2="398.38727"
-       y2="-927.82983" />
-    <linearGradient
-       id="linearGradient123038">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123040" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123042" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4384-2"
-       id="linearGradient6469"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient123045">
-      <stop
-         id="stop123047"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop123049"
-         offset="1"
-         style="stop-color:#8eafc5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2"
-       id="linearGradient6471"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient123052">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123054" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123056" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-7-2"
-       id="linearGradient6473"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient123059">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123061" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123063" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-29"
-       id="linearGradient150618"
-       gradientUnits="userSpaceOnUse"
-       x1="389.12378"
-       y1="-871.61053"
-       x2="494.38727"
-       y2="-919.32983" />
-    <linearGradient
-       id="linearGradient123066">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123068" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123070" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient123077">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123079" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123081" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient123084">
-      <stop
-         id="stop123086"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop123088"
-         offset="1"
-         style="stop-color:#8eafc5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient123091">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123093" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123095" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient123098">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123100" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop123102" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-29-7"
-       id="linearGradient150618-1"
-       gradientUnits="userSpaceOnUse"
-       x1="389.12378"
-       y1="-871.61053"
-       x2="494.38727"
-       y2="-919.32983" />
-    <linearGradient
-       id="linearGradient4046-29-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4048-75-4" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop4050-34-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2-9"
-       id="linearGradient75948"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(509.5152,-21.421806)"
-       x1="386.03799"
-       y1="-891.43896"
-       x2="398.38727"
-       y2="-927.82983" />
-    <linearGradient
-       id="linearGradient4046-3-2-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4048-2-1-4" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop4050-2-1-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4384-2-2"
-       id="linearGradient6447-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient4384-2-2">
-      <stop
-         id="stop4386-5-4"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop4388-3-5"
-         offset="1"
-         style="stop-color:#8eafc5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2-9"
-       id="linearGradient6449-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       id="linearGradient75198">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop75200" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop75202" />
-    </linearGradient>
-    <linearGradient
-       y2="-927.2887"
-       x2="907.27484"
-       y1="-923.7887"
-       x1="872.52484"
-       gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient157741-1"
-       xlink:href="#linearGradient4046-3-7-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient4046-3-7-2-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4048-2-7-2-1" />
-      <stop
-         style="stop-color:#8eafc5;stop-opacity:1;"
-         offset="1"
-         id="stop4050-2-8-2-1" />
-    </linearGradient>
-    <linearGradient
-       y2="-927.2887"
-       x2="907.27484"
-       y1="-923.7887"
-       x1="872.52484"
-       gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient75214"
-       xlink:href="#linearGradient4046-3-7-2-7"
-       inkscape:collect="always" />
-    <filter
-       inkscape:collect="always"
-       id="filter3883"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.4602676"
-         id="feGaussianBlur3885" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="68" id="svg2" version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="Cloud.svg">
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-29" id="linearGradient150610" gradientUnits="userSpaceOnUse" x1="389.12378" y1="-871.61053" x2="494.38727" y2="-919.32983"/>
+    <linearGradient id="linearGradient4046-29">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4048-75"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop4050-34"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2" id="linearGradient6533" gradientUnits="userSpaceOnUse" gradientTransform="translate(509.5152,-21.421806)" x1="386.03799" y1="-891.43896" x2="398.38727" y2="-927.82983"/>
+    <linearGradient id="linearGradient4046-3-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4048-2-1"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop4050-2-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4384-2" id="linearGradient6535" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient4384-2">
+      <stop id="stop4386-5" offset="0" style="stop-color:#ffffff;stop-opacity:0;"/>
+      <stop id="stop4388-3" offset="1" style="stop-color:#8eafc5;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2" id="linearGradient6537" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient122938">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop122940"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop122942"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-7-2" id="linearGradient6539" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient4046-3-7-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4048-2-7-2"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop4050-2-8-2"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-29" id="linearGradient150612" gradientUnits="userSpaceOnUse" x1="389.12378" y1="-871.61053" x2="494.38727" y2="-919.32983"/>
+    <linearGradient id="linearGradient122949">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop122951"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop122953"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2" id="linearGradient6511" gradientUnits="userSpaceOnUse" gradientTransform="translate(509.5152,-21.421806)" x1="386.03799" y1="-891.43896" x2="398.38727" y2="-927.82983"/>
+    <linearGradient id="linearGradient122960">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop122962"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop122964"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4384-2" id="linearGradient6513" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient122967">
+      <stop id="stop122969" offset="0" style="stop-color:#ffffff;stop-opacity:0;"/>
+      <stop id="stop122971" offset="1" style="stop-color:#8eafc5;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2" id="linearGradient6515" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient122974">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop122976"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop122978"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-7-2" id="linearGradient6517" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient122981">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop122983"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop122985"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-29" id="linearGradient150614" gradientUnits="userSpaceOnUse" x1="389.12378" y1="-871.61053" x2="494.38727" y2="-919.32983"/>
+    <linearGradient id="linearGradient122988">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop122990"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop122992"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2" id="linearGradient6489" gradientUnits="userSpaceOnUse" gradientTransform="translate(509.5152,-21.421806)" x1="386.03799" y1="-891.43896" x2="398.38727" y2="-927.82983"/>
+    <linearGradient id="linearGradient122999">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123001"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123003"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4384-2" id="linearGradient6491" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient123006">
+      <stop id="stop123008" offset="0" style="stop-color:#ffffff;stop-opacity:0;"/>
+      <stop id="stop123010" offset="1" style="stop-color:#8eafc5;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2" id="linearGradient6493" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient123013">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123015"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123017"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-7-2" id="linearGradient6495" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient123020">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123022"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123024"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-29" id="linearGradient150616" gradientUnits="userSpaceOnUse" x1="389.12378" y1="-871.61053" x2="494.38727" y2="-919.32983"/>
+    <linearGradient id="linearGradient123027">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123029"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123031"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2" id="linearGradient6467" gradientUnits="userSpaceOnUse" gradientTransform="translate(509.5152,-21.421806)" x1="386.03799" y1="-891.43896" x2="398.38727" y2="-927.82983"/>
+    <linearGradient id="linearGradient123038">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123040"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123042"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4384-2" id="linearGradient6469" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient123045">
+      <stop id="stop123047" offset="0" style="stop-color:#ffffff;stop-opacity:0;"/>
+      <stop id="stop123049" offset="1" style="stop-color:#8eafc5;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2" id="linearGradient6471" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient123052">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123054"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123056"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-7-2" id="linearGradient6473" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient123059">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123061"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123063"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-29" id="linearGradient150618" gradientUnits="userSpaceOnUse" x1="389.12378" y1="-871.61053" x2="494.38727" y2="-919.32983"/>
+    <linearGradient id="linearGradient123066">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123068"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123070"/>
+    </linearGradient>
+    <linearGradient id="linearGradient123077">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123079"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123081"/>
+    </linearGradient>
+    <linearGradient id="linearGradient123084">
+      <stop id="stop123086" offset="0" style="stop-color:#ffffff;stop-opacity:0;"/>
+      <stop id="stop123088" offset="1" style="stop-color:#8eafc5;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient123091">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123093"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123095"/>
+    </linearGradient>
+    <linearGradient id="linearGradient123098">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123100"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop123102"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-29-7" id="linearGradient150618-1" gradientUnits="userSpaceOnUse" x1="389.12378" y1="-871.61053" x2="494.38727" y2="-919.32983"/>
+    <linearGradient id="linearGradient4046-29-7">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4048-75-4"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop4050-34-0"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2-9" id="linearGradient75948" gradientUnits="userSpaceOnUse" gradientTransform="translate(509.5152,-21.421806)" x1="386.03799" y1="-891.43896" x2="398.38727" y2="-927.82983"/>
+    <linearGradient id="linearGradient4046-3-2-9">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4048-2-1-4"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop4050-2-1-8"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4384-2-2" id="linearGradient6447-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient4384-2-2">
+      <stop id="stop4386-5-4" offset="0" style="stop-color:#ffffff;stop-opacity:0;"/>
+      <stop id="stop4388-3-5" offset="1" style="stop-color:#8eafc5;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2-9" id="linearGradient6449-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient id="linearGradient75198">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop75200"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop75202"/>
+    </linearGradient>
+    <linearGradient y2="-927.2887" x2="907.27484" y1="-923.7887" x1="872.52484" gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)" gradientUnits="userSpaceOnUse" id="linearGradient157741-1" xlink:href="#linearGradient4046-3-7-2-7" inkscape:collect="always"/>
+    <linearGradient id="linearGradient4046-3-7-2-7">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4048-2-7-2-1"/>
+      <stop style="stop-color:#8eafc5;stop-opacity:1;" offset="1" id="stop4050-2-8-2-1"/>
+    </linearGradient>
+    <linearGradient y2="-927.2887" x2="907.27484" y1="-923.7887" x1="872.52484" gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)" gradientUnits="userSpaceOnUse" id="linearGradient75214" xlink:href="#linearGradient4046-3-7-2-7" inkscape:collect="always"/>
+    <filter inkscape:collect="always" id="filter3883" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.4602676" id="feGaussianBlur3885"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2-9"
-       id="linearGradient3894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(509.5152,-21.421806)"
-       x1="386.03799"
-       y1="-891.43896"
-       x2="398.38727"
-       y2="-927.82983" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4384-2-2"
-       id="linearGradient3896"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-2-9"
-       id="linearGradient3898"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-3-7-2-7"
-       id="linearGradient3900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)"
-       x1="872.52484"
-       y1="-923.7887"
-       x2="907.27484"
-       y2="-927.2887" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4046-29-7"
-       id="linearGradient3902"
-       gradientUnits="userSpaceOnUse"
-       x1="389.12378"
-       y1="-871.61053"
-       x2="494.38727"
-       y2="-919.32983" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2-9" id="linearGradient3894" gradientUnits="userSpaceOnUse" gradientTransform="translate(509.5152,-21.421806)" x1="386.03799" y1="-891.43896" x2="398.38727" y2="-927.82983"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4384-2-2" id="linearGradient3896" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.6105545,0.16444182,-0.21691679,0.80538832,177.14072,-319.69219)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-2-9" id="linearGradient3898" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99499162,0,0,0.99499162,4.5850725,-4.5564552)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-3-7-2-7" id="linearGradient3900" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22628857,-0.64717021,0.87840559,0.16671936,1474.952,-168.59004)" x1="872.52484" y1="-923.7887" x2="907.27484" y2="-927.2887"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4046-29-7" id="linearGradient3902" gradientUnits="userSpaceOnUse" x1="389.12378" y1="-871.61053" x2="494.38727" y2="-919.32983"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="-7.4243299"
-     inkscape:cy="-9.2543632"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6433-5"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="10"
-     fit-margin-right="10"
-     fit-margin-bottom="10"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" inkscape:cx="-7.4243299" inkscape:cy="-9.2543632" inkscape:document-units="px" inkscape:current-layer="g6433-5" showgrid="false" fit-margin-top="0" fit-margin-left="10" fit-margin-right="10" fit-margin-bottom="10" inkscape:window-width="1280" inkscape:window-height="968" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-67.179,-144.00828)">
-    <g
-       transform="matrix(1.1798504,0,0,1.1798504,-920.68141,1243.4771)"
-       style="fill:url(#linearGradient150618-1);fill-opacity:1;stroke:none;display:inline"
-       id="g6433-5"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Tiny\Cloud.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g3887"
-         style="fill:url(#linearGradient3902)"
-         transform="matrix(1.0362783,0,0,1.0362783,-46.059079,40.498929)"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Icons reduced whitespace\Tiny\Cloud.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90">
-        <path
-           style="fill:#00274a;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3883)"
-           d="m 892.44187,-934.56291 c -11.26791,0 -20.03864,11.2509 -21.21959,21.2018 -20.863,2.4236 -19.85279,27.1015 -0.29592,27.1439 l 50.46525,0 17.14244,0 0,-0.017 c 0.18953,0.01 0.37717,0.017 0.5685,0.017 8.00575,0 14.69842,-5.8983 14.48943,-13.1679 -0.25,-8.6962 -9.90297,-11.599 -17.69285,-9.6225 -0.86593,-10.9275 -7.57194,-16.9042 -14.50752,-16.9042 -3.44026,0 -6.69641,0.7112 -9.59161,1.9978 -3.6523,-6.3292 -10.94603,-10.6489 -19.35813,-10.6489 z"
-           id="path6435-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="scccccsscscs" />
-        <path
-           style="fill:url(#linearGradient3894);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 892.69,-934.52623 c -11.26791,0 -20.03864,11.25097 -21.21959,21.20186 -20.863,2.42361 -19.85279,27.10145 -0.29592,27.14384 l 50.46525,0 17.14244,0 0,-0.0174 c 0.18953,0.007 0.37717,0.0174 0.5685,0.0174 8.00575,0 14.69842,-5.89826 14.48943,-13.16783 -0.25,-8.69625 -9.90297,-11.59907 -17.69285,-9.62249 -0.86593,-10.92758 -7.57194,-16.90423 -14.50752,-16.90423 -3.44026,0 -6.69641,0.71116 -9.59161,1.99776 -3.6523,-6.32919 -10.94603,-10.64891 -19.35813,-10.64891 z"
-           id="path6437-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="scccccsscscs" />
-        <path
-           style="fill:url(#linearGradient3896);fill-opacity:1;stroke:none"
-           d="m 920.90303,-926.0401 c -4.58627,0.38383 -9.75014,0.97639 -12.41501,5.39822 0.39702,-0.16131 0.79507,-0.28888 1.20782,-0.38209 3.2013,-3.2307 7.08592,-3.69472 11.18782,-3.99427 0.22617,-0.0333 0.43821,-0.0368 0.66637,-0.056 7.30099,-0.61358 14.38401,6.58977 13.84934,15.76284 -0.089,1.52602 -0.35315,3.01997 -0.7416,4.44936 l -0.1718,2.94762 c 0.95095,-2.30957 1.56794,-4.83676 1.72111,-7.46485 0.56767,-9.73927 -6.84567,-17.37168 -14.59729,-16.72024 -0.24223,0.0203 -0.46665,0.024 -0.70676,0.0594 z"
-           id="path6439-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccscc" />
-        <path
-           style="fill:url(#linearGradient3898);fill-opacity:1;stroke:none"
-           d="m 887.19105,-933.53017 c -6.43434,2.11552 -11.24313,6.99612 -13.48268,12.91619 0.53724,-0.30897 1.08984,-0.57941 1.67885,-0.8148 2.2868,-5.00417 6.594,-9.07759 12.19257,-10.91833 0.33,-0.1085 0.65076,-0.17837 0.98959,-0.27123 10.84227,-2.97176 22.02635,3.31626 24.96788,14.04825 0.48935,1.78535 0.69929,3.58813 0.69402,5.35511 l 0.94521,3.44856 c 0.49976,-2.95533 0.40302,-6.05772 -0.43973,-9.13244 -3.1231,-11.3944 -14.98467,-18.07417 -26.49616,-14.91899 -0.35973,0.0986 -0.69919,0.17246 -1.04955,0.28768 z"
-           id="path6441-1"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:url(#linearGradient3900);fill-opacity:1;stroke:none"
-           d="m 855.55783,-898.319 c 0.4043,4.53954 3.61938,8.24203 8.33644,10.69065 -0.15058,-0.40121 -0.26366,-0.80594 -0.33751,-1.2285 -3.89774,-2.32589 -6.51429,-5.56687 -6.86607,-9.51677 -0.0207,-0.23283 -0.009,-0.45316 -0.0144,-0.68911 3.12583,-14.52445 17.18844,-14.80392 23.14282,-11.14191 l 2.55233,0.93527 c -10.74454,-9.97362 -26.62593,0.0396 -26.82888,10.21947 0.005,0.25049 -0.006,0.48366 0.0153,0.73086 z"
-           id="path6443-4"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccc" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-67.179,-144.00828)">
+    <g transform="matrix(1.1798504,0,0,1.1798504,-920.68141,1243.4771)" style="fill:url(#linearGradient150618-1);fill-opacity:1;stroke:none;display:inline" id="g6433-5">
+      <g id="g3887" style="fill:url(#linearGradient3902)" transform="matrix(1.0362783,0,0,1.0362783,-46.059079,40.498929)">
+        <path style="fill:#00274a;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3883)" d="m 892.44187,-934.56291 c -11.26791,0 -20.03864,11.2509 -21.21959,21.2018 -20.863,2.4236 -19.85279,27.1015 -0.29592,27.1439 l 50.46525,0 17.14244,0 0,-0.017 c 0.18953,0.01 0.37717,0.017 0.5685,0.017 8.00575,0 14.69842,-5.8983 14.48943,-13.1679 -0.25,-8.6962 -9.90297,-11.599 -17.69285,-9.6225 -0.86593,-10.9275 -7.57194,-16.9042 -14.50752,-16.9042 -3.44026,0 -6.69641,0.7112 -9.59161,1.9978 -3.6523,-6.3292 -10.94603,-10.6489 -19.35813,-10.6489 z" id="path6435-2" inkscape:connector-curvature="0" sodipodi:nodetypes="scccccsscscs"/>
+        <path style="fill:url(#linearGradient3894);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 892.69,-934.52623 c -11.26791,0 -20.03864,11.25097 -21.21959,21.20186 -20.863,2.42361 -19.85279,27.10145 -0.29592,27.14384 l 50.46525,0 17.14244,0 0,-0.0174 c 0.18953,0.007 0.37717,0.0174 0.5685,0.0174 8.00575,0 14.69842,-5.89826 14.48943,-13.16783 -0.25,-8.69625 -9.90297,-11.59907 -17.69285,-9.62249 -0.86593,-10.92758 -7.57194,-16.90423 -14.50752,-16.90423 -3.44026,0 -6.69641,0.71116 -9.59161,1.99776 -3.6523,-6.32919 -10.94603,-10.64891 -19.35813,-10.64891 z" id="path6437-7" inkscape:connector-curvature="0" sodipodi:nodetypes="scccccsscscs"/>
+        <path style="fill:url(#linearGradient3896);fill-opacity:1;stroke:none" d="m 920.90303,-926.0401 c -4.58627,0.38383 -9.75014,0.97639 -12.41501,5.39822 0.39702,-0.16131 0.79507,-0.28888 1.20782,-0.38209 3.2013,-3.2307 7.08592,-3.69472 11.18782,-3.99427 0.22617,-0.0333 0.43821,-0.0368 0.66637,-0.056 7.30099,-0.61358 14.38401,6.58977 13.84934,15.76284 -0.089,1.52602 -0.35315,3.01997 -0.7416,4.44936 l -0.1718,2.94762 c 0.95095,-2.30957 1.56794,-4.83676 1.72111,-7.46485 0.56767,-9.73927 -6.84567,-17.37168 -14.59729,-16.72024 -0.24223,0.0203 -0.46665,0.024 -0.70676,0.0594 z" id="path6439-6" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccscc"/>
+        <path style="fill:url(#linearGradient3898);fill-opacity:1;stroke:none" d="m 887.19105,-933.53017 c -6.43434,2.11552 -11.24313,6.99612 -13.48268,12.91619 0.53724,-0.30897 1.08984,-0.57941 1.67885,-0.8148 2.2868,-5.00417 6.594,-9.07759 12.19257,-10.91833 0.33,-0.1085 0.65076,-0.17837 0.98959,-0.27123 10.84227,-2.97176 22.02635,3.31626 24.96788,14.04825 0.48935,1.78535 0.69929,3.58813 0.69402,5.35511 l 0.94521,3.44856 c 0.49976,-2.95533 0.40302,-6.05772 -0.43973,-9.13244 -3.1231,-11.3944 -14.98467,-18.07417 -26.49616,-14.91899 -0.35973,0.0986 -0.69919,0.17246 -1.04955,0.28768 z" id="path6441-1" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#linearGradient3900);fill-opacity:1;stroke:none" d="m 855.55783,-898.319 c 0.4043,4.53954 3.61938,8.24203 8.33644,10.69065 -0.15058,-0.40121 -0.26366,-0.80594 -0.33751,-1.2285 -3.89774,-2.32589 -6.51429,-5.56687 -6.86607,-9.51677 -0.0207,-0.23283 -0.009,-0.45316 -0.0144,-0.68911 3.12583,-14.52445 17.18844,-14.80392 23.14282,-11.14191 l 2.55233,0.93527 c -10.74454,-9.97362 -26.62593,0.0396 -26.82888,10.21947 0.005,0.25049 -0.006,0.48366 0.0153,0.73086 z" id="path6443-4" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Crypto-router.svg b/misc/images/svg/elements/Crypto-router.svg
index dc4cd6122f3..c731f5153db 100644
--- a/misc/images/svg/elements/Crypto-router.svg
+++ b/misc/images/svg/elements/Crypto-router.svg
@@ -1,991 +1,184 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="120.73853"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="Crypto-router.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-7-2"
-       id="linearGradient9076-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.9144941,0,0,0.90774263,1286.6392,1564.0724)"
-       x1="460.23651"
-       y1="-965.29681"
-       x2="462.87714"
-       y2="-965.26556" />
-    <linearGradient
-       id="linearGradient4781-3-7-2">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2-2-5" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5-5-4" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="120.73853" id="svg2" version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="Crypto-router.svg">
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-7-2" id="linearGradient9076-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.9144941,0,0,0.90774263,1286.6392,1564.0724)" x1="460.23651" y1="-965.29681" x2="462.87714" y2="-965.26556"/>
+    <linearGradient id="linearGradient4781-3-7-2">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2-2-5"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5-5-4"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7732-1"
-       id="linearGradient9078-0"
-       gradientUnits="userSpaceOnUse"
-       x1="80.671188"
-       y1="917.11938"
-       x2="91.550255"
-       y2="917.73877" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7732-1">
-      <stop
-         style="stop-color:#1b1b1b;stop-opacity:1;"
-         offset="0"
-         id="stop7734-3" />
-      <stop
-         style="stop-color:#1b1b1b;stop-opacity:0;"
-         offset="1"
-         id="stop7736-9" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7732-1" id="linearGradient9078-0" gradientUnits="userSpaceOnUse" x1="80.671188" y1="917.11938" x2="91.550255" y2="917.73877"/>
+    <linearGradient inkscape:collect="always" id="linearGradient7732-1">
+      <stop style="stop-color:#1b1b1b;stop-opacity:1;" offset="0" id="stop7734-3"/>
+      <stop style="stop-color:#1b1b1b;stop-opacity:0;" offset="1" id="stop7736-9"/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter7728-5"
-       x="-0.054699458"
-       width="1.1093988"
-       y="-0.50930429"
-       height="2.0186086"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.52342113"
-         id="feGaussianBlur7730-8" />
+    <filter inkscape:collect="always" id="filter7728-5" x="-0.054699458" width="1.1093988" y="-0.50930429" height="2.0186086" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.52342113" id="feGaussianBlur7730-8"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818-2-3-2"
-       id="linearGradient9080-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9919109,0,0,0.99082157,0.88429866,9.7527949)"
-       x1="65.57148"
-       y1="911.26953"
-       x2="85.808258"
-       y2="908.14453" />
-    <linearGradient
-       id="linearGradient4818-2-3-2">
-      <stop
-         style="stop-color:#4c4c4c;stop-opacity:1;"
-         offset="0"
-         id="stop4820-2-5-7" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4822-8-6-9" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4818-2-3-2" id="linearGradient9080-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9919109,0,0,0.99082157,0.88429866,9.7527949)" x1="65.57148" y1="911.26953" x2="85.808258" y2="908.14453"/>
+    <linearGradient id="linearGradient4818-2-3-2">
+      <stop style="stop-color:#4c4c4c;stop-opacity:1;" offset="0" id="stop4820-2-5-7"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop4822-8-6-9"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818-2-3-2"
-       id="linearGradient9082-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9088145,0,0,1.011806,8.2282575,-9.2582399)"
-       x1="87.038445"
-       y1="906.24481"
-       x2="86.753571"
-       y2="881.91229" />
-    <linearGradient
-       id="linearGradient123173">
-      <stop
-         style="stop-color:#4c4c4c;stop-opacity:1;"
-         offset="0"
-         id="stop123175" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123177" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4818-2-3-2" id="linearGradient9082-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9088145,0,0,1.011806,8.2282575,-9.2582399)" x1="87.038445" y1="906.24481" x2="86.753571" y2="881.91229"/>
+    <linearGradient id="linearGradient123173">
+      <stop style="stop-color:#4c4c4c;stop-opacity:1;" offset="0" id="stop123175"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123177"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4893-5-5-6"
-       id="linearGradient9084-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="76.602463"
-       y1="912.10504"
-       x2="75.851158"
-       y2="883.29041" />
-    <linearGradient
-       id="linearGradient4893-5-5-6">
-      <stop
-         id="stop4895-5-7-1"
-         offset="0"
-         style="stop-color:#b5b5b5;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a5a5a5;stop-opacity:1;"
-         offset="0.6197595"
-         id="stop4899-9-0-7" />
-      <stop
-         id="stop4897-6-1-7"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4893-5-5-6" id="linearGradient9084-0" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="76.602463" y1="912.10504" x2="75.851158" y2="883.29041"/>
+    <linearGradient id="linearGradient4893-5-5-6">
+      <stop id="stop4895-5-7-1" offset="0" style="stop-color:#b5b5b5;stop-opacity:1;"/>
+      <stop style="stop-color:#a5a5a5;stop-opacity:1;" offset="0.6197595" id="stop4899-9-0-7"/>
+      <stop id="stop4897-6-1-7" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4858-6-3-1"
-       id="linearGradient9086-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="71.191071"
-       y1="894.60565"
-       x2="85.760696"
-       y2="890.11536" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4858-6-3-1">
-      <stop
-         style="stop-color:#1e1e1e;stop-opacity:1;"
-         offset="0"
-         id="stop4860-8-7-9" />
-      <stop
-         style="stop-color:#1e1e1e;stop-opacity:0;"
-         offset="1"
-         id="stop4862-9-3-0" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4858-6-3-1" id="linearGradient9086-4" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="71.191071" y1="894.60565" x2="85.760696" y2="890.11536"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4858-6-3-1">
+      <stop style="stop-color:#1e1e1e;stop-opacity:1;" offset="0" id="stop4860-8-7-9"/>
+      <stop style="stop-color:#1e1e1e;stop-opacity:0;" offset="1" id="stop4862-9-3-0"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter4943-0-1-3">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.3568344"
-         id="feGaussianBlur4945-6-3-4" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4943-0-1-3">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.3568344" id="feGaussianBlur4945-6-3-4"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4868-0-9-1"
-       id="linearGradient9088-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="84.448196"
-       y1="888.54315"
-       x2="62.066071"
-       y2="889.41815" />
-    <linearGradient
-       id="linearGradient4868-0-9-1">
-      <stop
-         style="stop-color:#8c8c8c;stop-opacity:1;"
-         offset="0"
-         id="stop4870-6-6-7" />
-      <stop
-         id="stop4876-6-0-5"
-         offset="0.18895134"
-         style="stop-color:#353535;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="1"
-         id="stop4872-3-2-3" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4868-0-9-1" id="linearGradient9088-2" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="84.448196" y1="888.54315" x2="62.066071" y2="889.41815"/>
+    <linearGradient id="linearGradient4868-0-9-1">
+      <stop style="stop-color:#8c8c8c;stop-opacity:1;" offset="0" id="stop4870-6-6-7"/>
+      <stop id="stop4876-6-0-5" offset="0.18895134" style="stop-color:#353535;stop-opacity:1;"/>
+      <stop style="stop-color:#959595;stop-opacity:1;" offset="1" id="stop4872-3-2-3"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5053-5-1-3">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.19085882"
-         id="feGaussianBlur5055-4-9-2" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5053-5-1-3">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.19085882" id="feGaussianBlur5055-4-9-2"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5098-8-8-4"
-       id="linearGradient9090-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="75.503571"
-       y1="901.06091"
-       x2="76.275017"
-       y2="894.05725" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5098-8-8-4">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5100-8-8-1" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5102-4-7-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5098-8-8-4" id="linearGradient9090-9" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="75.503571" y1="901.06091" x2="76.275017" y2="894.05725"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5098-8-8-4">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop5100-8-8-1"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop5102-4-7-2"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-0-9"
-       id="linearGradient9092-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="71.333176"
-       y1="896.18628"
-       x2="75.074463"
-       y2="878.22595" />
-    <linearGradient
-       id="linearGradient5311-7-0-9">
-      <stop
-         id="stop5313-3-9-0"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop5315-2-0-8"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-0-9" id="linearGradient9092-3" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="71.333176" y1="896.18628" x2="75.074463" y2="878.22595"/>
+    <linearGradient id="linearGradient5311-7-0-9">
+      <stop id="stop5313-3-9-0" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop5315-2-0-8" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient9094-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)"
-       x1="158.86479"
-       y1="706.07477"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       id="linearGradient5801-7-5">
-      <stop
-         id="stop5803-7-6"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5805-9-8"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient9094-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)" x1="158.86479" y1="706.07477" x2="319.51733" y2="742.35919"/>
+    <linearGradient id="linearGradient5801-7-5">
+      <stop id="stop5803-7-6" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop5805-9-8" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient9096-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)"
-       x1="173.61505"
-       y1="760.87512"
-       x2="65.997429"
-       y2="689.16925" />
-    <linearGradient
-       id="linearGradient123212">
-      <stop
-         id="stop123214"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop123216"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient9096-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)" x1="173.61505" y1="760.87512" x2="65.997429" y2="689.16925"/>
+    <linearGradient id="linearGradient123212">
+      <stop id="stop123214" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop123216" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       id="linearGradient123219">
-      <stop
-         id="stop123221"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop123223"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
+    <linearGradient id="linearGradient123219">
+      <stop id="stop123221" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop123223" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5763-1-0"
-       x="-0.068371981"
-       width="1.136744"
-       y="-0.13107832"
-       height="1.2621566">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.29772692"
-         id="feGaussianBlur5765-4-7" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5763-1-0" x="-0.068371981" width="1.136744" y="-0.13107832" height="1.2621566">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.29772692" id="feGaussianBlur5765-4-7"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5755-4-7"
-       x="-0.07161101"
-       width="1.143222"
-       y="-0.14175981"
-       height="1.2835196">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.31559987"
-         id="feGaussianBlur5757-5-4" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5755-4-7" x="-0.07161101" width="1.143222" y="-0.14175981" height="1.2835196">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.31559987" id="feGaussianBlur5757-5-4"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5771-9-3"
-       x="-0.072505891"
-       width="1.1450118"
-       y="-0.13837889"
-       height="1.2767578">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.31063639"
-         id="feGaussianBlur5773-5-1" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5771-9-3" x="-0.072505891" width="1.1450118" y="-0.13837889" height="1.2767578">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.31063639" id="feGaussianBlur5773-5-1"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5775-6-3"
-       x="-0.077720456"
-       width="1.1554409"
-       y="-0.14193143"
-       height="1.2838629">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.32433816"
-         id="feGaussianBlur5777-4-6" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5775-6-3" x="-0.077720456" width="1.1554409" y="-0.14193143" height="1.2838629">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.32433816" id="feGaussianBlur5777-4-6"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient3111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)"
-       x1="319.22894"
-       y1="667.52386"
-       x2="188.08318"
-       y2="761.83972" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter3898-1">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.7915937"
-         id="feGaussianBlur3900-7" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient3111" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)" x1="319.22894" y1="667.52386" x2="188.08318" y2="761.83972"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3898-1">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.7915937" id="feGaussianBlur3900-7"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-7-2"
-       id="linearGradient3250"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.9144941,0,0,0.90774263,1286.6392,1564.0724)"
-       x1="460.23651"
-       y1="-965.29681"
-       x2="462.87714"
-       y2="-965.26556" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7732-1"
-       id="linearGradient3252"
-       gradientUnits="userSpaceOnUse"
-       x1="80.671188"
-       y1="917.11938"
-       x2="91.550255"
-       y2="917.73877" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818-2-3-2"
-       id="linearGradient3254"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9919109,0,0,0.99082157,0.88429866,9.7527949)"
-       x1="65.57148"
-       y1="911.26953"
-       x2="85.808258"
-       y2="908.14453" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818-2-3-2"
-       id="linearGradient3256"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9088145,0,0,1.011806,8.2282575,-9.2582399)"
-       x1="87.038445"
-       y1="906.24481"
-       x2="86.753571"
-       y2="881.91229" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4893-5-5-6"
-       id="linearGradient3258"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="76.602463"
-       y1="912.10504"
-       x2="75.851158"
-       y2="883.29041" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4858-6-3-1"
-       id="linearGradient3260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="71.191071"
-       y1="894.60565"
-       x2="85.760696"
-       y2="890.11536" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4868-0-9-1"
-       id="linearGradient3262"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="84.448196"
-       y1="888.54315"
-       x2="62.066071"
-       y2="889.41815" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5098-8-8-4"
-       id="linearGradient3264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="75.503571"
-       y1="901.06091"
-       x2="76.275017"
-       y2="894.05725" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-0-9"
-       id="linearGradient3266"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="71.333176"
-       y1="896.18628"
-       x2="75.074463"
-       y2="878.22595" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient3268"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)"
-       x1="158.86479"
-       y1="706.07477"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient3270"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)"
-       x1="173.61505"
-       y1="760.87512"
-       x2="65.997429"
-       y2="689.16925" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient3272"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)"
-       x1="319.22894"
-       y1="667.52386"
-       x2="188.08318"
-       y2="761.83972" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-7-2"
-       id="linearGradient3946"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.9144941,0,0,0.90774263,1286.6392,1564.0724)"
-       x1="460.23651"
-       y1="-965.29681"
-       x2="462.87714"
-       y2="-965.26556" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7732-1"
-       id="linearGradient3948"
-       gradientUnits="userSpaceOnUse"
-       x1="80.671188"
-       y1="917.11938"
-       x2="91.550255"
-       y2="917.73877" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818-2-3-2"
-       id="linearGradient3950"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9919109,0,0,0.99082157,0.88429866,9.7527949)"
-       x1="65.57148"
-       y1="911.26953"
-       x2="85.808258"
-       y2="908.14453" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818-2-3-2"
-       id="linearGradient3952"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9088145,0,0,1.011806,8.2282575,-9.2582399)"
-       x1="87.038445"
-       y1="906.24481"
-       x2="86.753571"
-       y2="881.91229" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4893-5-5-6"
-       id="linearGradient3954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="76.602463"
-       y1="912.10504"
-       x2="75.851158"
-       y2="883.29041" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4858-6-3-1"
-       id="linearGradient3956"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="71.191071"
-       y1="894.60565"
-       x2="85.760696"
-       y2="890.11536" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4868-0-9-1"
-       id="linearGradient3958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="84.448196"
-       y1="888.54315"
-       x2="62.066071"
-       y2="889.41815" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5098-8-8-4"
-       id="linearGradient3960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="75.503571"
-       y1="901.06091"
-       x2="76.275017"
-       y2="894.05725" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-0-9"
-       id="linearGradient3962"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="71.333176"
-       y1="896.18628"
-       x2="75.074463"
-       y2="878.22595" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient3964"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)"
-       x1="158.86479"
-       y1="706.07477"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient3966"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)"
-       x1="173.61505"
-       y1="760.87512"
-       x2="65.997429"
-       y2="689.16925" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-5"
-       id="linearGradient3968"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)"
-       x1="319.22894"
-       y1="667.52386"
-       x2="188.08318"
-       y2="761.83972" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-7-2" id="linearGradient3250" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.9144941,0,0,0.90774263,1286.6392,1564.0724)" x1="460.23651" y1="-965.29681" x2="462.87714" y2="-965.26556"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7732-1" id="linearGradient3252" gradientUnits="userSpaceOnUse" x1="80.671188" y1="917.11938" x2="91.550255" y2="917.73877"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4818-2-3-2" id="linearGradient3254" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9919109,0,0,0.99082157,0.88429866,9.7527949)" x1="65.57148" y1="911.26953" x2="85.808258" y2="908.14453"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4818-2-3-2" id="linearGradient3256" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9088145,0,0,1.011806,8.2282575,-9.2582399)" x1="87.038445" y1="906.24481" x2="86.753571" y2="881.91229"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4893-5-5-6" id="linearGradient3258" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="76.602463" y1="912.10504" x2="75.851158" y2="883.29041"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4858-6-3-1" id="linearGradient3260" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="71.191071" y1="894.60565" x2="85.760696" y2="890.11536"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4868-0-9-1" id="linearGradient3262" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="84.448196" y1="888.54315" x2="62.066071" y2="889.41815"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5098-8-8-4" id="linearGradient3264" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="75.503571" y1="901.06091" x2="76.275017" y2="894.05725"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-0-9" id="linearGradient3266" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="71.333176" y1="896.18628" x2="75.074463" y2="878.22595"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient3268" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)" x1="158.86479" y1="706.07477" x2="319.51733" y2="742.35919"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient3270" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)" x1="173.61505" y1="760.87512" x2="65.997429" y2="689.16925"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient3272" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)" x1="319.22894" y1="667.52386" x2="188.08318" y2="761.83972"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-7-2" id="linearGradient3946" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.9144941,0,0,0.90774263,1286.6392,1564.0724)" x1="460.23651" y1="-965.29681" x2="462.87714" y2="-965.26556"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7732-1" id="linearGradient3948" gradientUnits="userSpaceOnUse" x1="80.671188" y1="917.11938" x2="91.550255" y2="917.73877"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4818-2-3-2" id="linearGradient3950" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9919109,0,0,0.99082157,0.88429866,9.7527949)" x1="65.57148" y1="911.26953" x2="85.808258" y2="908.14453"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4818-2-3-2" id="linearGradient3952" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9088145,0,0,1.011806,8.2282575,-9.2582399)" x1="87.038445" y1="906.24481" x2="86.753571" y2="881.91229"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4893-5-5-6" id="linearGradient3954" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="76.602463" y1="912.10504" x2="75.851158" y2="883.29041"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4858-6-3-1" id="linearGradient3956" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="71.191071" y1="894.60565" x2="85.760696" y2="890.11536"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4868-0-9-1" id="linearGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="84.448196" y1="888.54315" x2="62.066071" y2="889.41815"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5098-8-8-4" id="linearGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="75.503571" y1="901.06091" x2="76.275017" y2="894.05725"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-0-9" id="linearGradient3962" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="71.333176" y1="896.18628" x2="75.074463" y2="878.22595"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient3964" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)" x1="158.86479" y1="706.07477" x2="319.51733" y2="742.35919"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient3966" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)" x1="173.61505" y1="760.87512" x2="65.997429" y2="689.16925"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-5" id="linearGradient3968" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8265149,0,0,0.8265149,678.00044,123.14464)" x1="319.22894" y1="667.52386" x2="188.08318" y2="761.83972"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="59.362346"
-     inkscape:cy="60.063422"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3175"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" inkscape:cx="59.362346" inkscape:cy="60.063422" inkscape:document-units="px" inkscape:current-layer="g3175" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="968" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-246.93714,-407.58177)">
-    <g
-       style="display:inline"
-       transform="matrix(1.0365867,0,0,1.0365867,-532.88956,-272.1151)"
-       id="g8964"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Cryto-router.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g3124">
-        <g
-           id="g3175"
-           inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Tiny\Crypto-router.png"
-           inkscape:export-xdpi="90"
-           inkscape:export-ydpi="90"
-           transform="translate(-5.8571354,9.9915838)">
-          <g
-             transform="matrix(0.73527017,-0.0157551,0.0157551,0.73527017,633.03669,21.927668)"
-             id="g8974">
-            <g
-               transform="matrix(1.7399471,0,0,1.7399471,113.54526,-679.68865)"
-               id="g8976" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-246.93714,-407.58177)">
+    <g style="display:inline" transform="matrix(1.0365867,0,0,1.0365867,-532.88956,-272.1151)" id="g8964">
+      <g id="g3124">
+        <g id="g3175" transform="translate(-5.8571354,9.9915838)">
+          <g transform="matrix(0.73527017,-0.0157551,0.0157551,0.73527017,633.03669,21.927668)" id="g8974">
+            <g transform="matrix(1.7399471,0,0,1.7399471,113.54526,-679.68865)" id="g8976"/>
           </g>
-          <g
-             id="g3896"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Icons reduced whitespace\Tiny\Crypto-router.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90"
-             transform="translate(-4.1800279e-6,-5.2367812e-6)">
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 190.21338,691.0295 81.78485,38.21794 c -17.02861,10.15729 -36.60437,20.04494 -53.33546,30.59488 l -78.41702,-42.48508 z"
-               style="opacity:0.85650222;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter3898-1)"
-               id="path5323-3-6-7-9-5"
-               transform="matrix(0.87980278,0,0,0.93973585,638.55397,44.100397)" />
-            <path
-               inkscape:connector-curvature="0"
-               d="m 865.75562,660.07009 -4.00091,0 0,51.61769 4.00091,0 z"
-               style="fill:url(#linearGradient3946);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path8972" />
-            <path
-               id="path8978"
-               style="opacity:0.37219729;fill:url(#linearGradient3948);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter7728-5)"
-               d="m 67.744509,914.95532 c 16.01462,0.88918 15.62697,1.21938 20.59089,2.32875 l -2.57497,1.07216 c -6.43216,-0.23924 -12.62335,-0.34722 -20.346901,-2.42182 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="matrix(1.7801744,-0.15352373,0.18180145,2.696293,528.97224,-1767.7891)" />
-            <path
-               id="path8980"
-               style="fill:url(#linearGradient3950);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.49568304;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-               d="m 65.553401,897.93807 c 5.5337,1.27812 13.423478,1.65192 20.197069,1.4243 l -2.88e-4,19.8419 C 78.790608,918.99206 72.203,918.629 65.429412,916.78914 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)" />
-            <path
-               id="path8982"
-               style="fill:url(#linearGradient3952);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 85.766095,899.16658 2.558591,-1.22501 -0.0039,20.15611 -2.324216,1.36735 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)" />
-            <path
-               id="path8984"
-               style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 67.640565,896.47478 c 16.084093,0.15821 15.694761,0.52999 20.680215,1.46943 l -2.58614,1.27224 c -6.460064,0.0624 -12.674206,0.24908 -20.431262,-1.58479 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)" />
-            <path
-               id="path8986"
-               style="fill:url(#linearGradient3954);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccsccccscc"
-               transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)" />
-            <path
-               sodipodi:nodetypes="ccsccccsc"
-               inkscape:connector-curvature="0"
-               d="m 82.252334,898.59057 c -0.367268,-0.11167 -0.466043,-0.17569 -0.756748,-0.34245 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -0.608009,0.19655 -1.313731,0.28799 -1.942822,0.2806 0.09555,-7.18886 1.912722,-10.57272 4.869938,-11.0339 4.157131,-0.6483 8.515223,1.69408 7.495035,11.59668 z"
-               style="fill:url(#linearGradient3956);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter4943-0-1-3)"
-               id="path8988"
-               transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)" />
-            <path
-               sodipodi:nodetypes="cccsccccscc"
-               inkscape:connector-curvature="0"
-               d="m 76.31721,883.95313 c -0.995822,0.0446 -1.976963,0.26771 -2.90625,0.625 -0.909432,0.39243 -1.783947,0.90349 -2.5,1.59375 -0.865307,0.73417 -1.526371,1.68033 -1.986619,2.7135 -0.446678,0.86565 -0.653624,1.82073 -0.841048,2.76877 -0.203427,0.96712 -0.247263,1.9615 -0.31166,2.94556 -0.02125,0.93248 -0.09331,1.86193 -0.173173,2.79092 0.135417,0.0625 0.270833,0.125 0.40625,0.1875 -0.138016,-0.35664 0.04678,-0.72641 0,-1.09375 0.09674,-1.11642 0.21077,-2.23106 0.34375,-3.34375 0.164016,-1.04781 0.321442,-2.09846 0.59375,-3.125 0.338004,-0.97258 0.844625,-1.88515 1.515601,-2.66768 0.690807,-0.82474 1.511578,-1.55752 2.46162,-2.0699 0.779103,-0.45606 1.631602,-0.83317 2.543566,-0.88421 1.022891,-0.10838 2.083355,-0.23287 3.08076,0.0972 0.991734,0.25411 1.987713,0.57049 2.804703,1.21206 0.42392,0.45234 0.858588,0.90009 1.118895,1.47369 0.551331,0.82862 0.691368,1.83253 0.847462,2.7932 0.170285,1.0206 0.44843,2.02056 0.596143,3.04561 0.23056,1.06838 0.241639,2.16524 0.34375,3.25 -0.0024,0.83398 0.0099,1.67442 -0.125,2.5 0.603386,-0.10313 1.231104,-0.0641 1.8125,-0.28125 0.0124,-1.10074 -0.0079,-2.20086 -0.06204,-3.30034 -0.05439,-0.98791 -0.11089,-1.97851 -0.312959,-2.94966 -0.138156,-1.03978 -0.348864,-2.08573 -0.795357,-3.04098 -0.426208,-0.96093 -0.873087,-1.94781 -1.631342,-2.69552 -0.585169,-0.68264 -1.35478,-1.17821 -2.148507,-1.58861 -0.926727,-0.47863 -1.948421,-0.78973 -2.987294,-0.89364 -0.560763,-0.0713 -1.122909,-0.13743 -1.6875,-0.0625 z"
-               style="fill:url(#linearGradient3958);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter5053-5-1-3)"
-               id="path8990"
-               transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)" />
-            <path
-               sodipodi:nodetypes="ccsccccscc"
-               inkscape:connector-curvature="0"
-               d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z"
-               style="fill:url(#linearGradient3960);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               id="path8992"
-               transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)" />
-            <path
-               id="path8994"
-               style="fill:none;stroke:url(#linearGradient3962);stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-               d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccsccccscc"
-               transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)" />
-            <rect
-               ry="0"
-               transform="matrix(0.96470464,0,0,0.96470464,758.63366,650.93048)"
-               y="-5.4061451"
-               x="16.667517"
-               height="2.5253813"
-               width="104.55079"
-               id="rect3884"
-               style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-            <path
-               id="path8998"
-               style="fill:url(#linearGradient3964);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 808.86147,687.60678 68.9085,24.80055 -0.77413,15.94137 -47.80665,12.10674 -64.28965,-37.11761 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccccc" />
-            <path
-               id="path9000"
-               style="fill:url(#linearGradient3966);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 764.89955,703.33785 64.28962,37.11761 3e-5,16.4631 -64.28965,-37.8695 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path9002"
-               style="fill:#8fa2b0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 777.3858,710.54677 38.40386,22.17248 c -23.88195,3.2132 -38.40386,-15.1502 -38.40386,-22.17248 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccc" />
-            <path
-               id="path9004"
-               style="fill:url(#linearGradient3968);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 829.1892,740.45546 48.58078,-28.04813 0,16.45518 -48.58078,28.05605 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path9006"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 814.03045,731.7036 32.66245,-17.71405 1.37544,0.50061 -32.57407,18.05856 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 810.96772,729.93535 32.30782,-17.41305 1.81541,0.66075 -32.6594,17.59741 z"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9008" />
-            <path
-               id="path9010"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 807.96611,728.20236 32.12072,-17.03137 1.85216,0.67413 -32.50906,17.20237 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 804.8164,726.38388 32.20521,-16.52484 1.67287,0.60887 -32.41424,16.7611 z"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9012" />
-            <path
-               id="path9014"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 801.75368,724.61562 32.51091,-16.02809 1.64956,0.70019 -32.69665,16.17302 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 798.75206,722.88265 32.56913,-15.54451 1.7606,0.74732 -32.8659,15.64231 z"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9016" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 795.6585,721.09653 32.76358,-14.989 1.64324,0.69751 -32.943,15.13661 z"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9018" />
-            <path
-               id="path9020"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 792.59576,719.32828 32.62016,-14.58168 1.77848,0.75492 -32.93481,14.67188 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 789.59415,717.5953 32.38806,-14.22134 1.62827,0.69117 -32.55251,14.37529 z"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9022" />
-            <path
-               id="path9024"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 786.44445,715.77682 31.89331,-13.94983 2.10105,0.89184 -32.53054,13.90311 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 783.38171,714.00857 31.39884,-13.58321 1.81466,0.66197 -31.74967,13.76636 z"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9026" />
-            <path
-               id="path9028"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 780.09143,712.08314 31.05906,-13.30696 2.14161,0.90906 -31.44817,13.43547 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 777.08931,710.37565 30.59664,-13.07008 1.88599,0.80055 -31.0188,13.11465 z"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9030" />
-            <path
-               id="path9032"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 777.10655,710.38556 1.49561,0.8635 -0.14298,3.35446 c -0.4593,-1.12951 -0.92606,-2.01646 -1.35263,-4.20971 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 780.0813,712.07539 1.76023,1.04393 -0.14298,6.59916 c -0.4651,-0.58726 -0.92177,-1.18292 -1.35263,-1.80441 z"
-               style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9034" />
-            <path
-               id="path9036"
-               style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 783.38569,714.01083 1.49561,0.8635 -0.14298,8.12629 c -0.45638,-0.43323 -0.91303,-0.86562 -1.35263,-1.34918 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 786.41318,715.75875 1.49561,0.8635 -0.14298,8.94957 c -0.45436,-0.35261 -0.90681,-0.70714 -1.35263,-1.06831 z"
-               style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9038" />
-            <path
-               id="path9040"
-               style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 789.58577,717.59044 1.49561,0.8635 -0.14298,9.27566 c -0.45088,-0.27593 -0.90176,-0.55691 -1.35263,-0.85845 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 792.57181,719.31443 1.49561,0.86351 -0.14298,9.1788 c -0.45088,-0.21585 -0.90176,-0.44359 -1.35263,-0.69379 z"
-               style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9042" />
-            <path
-               id="path9044"
-               style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 795.59749,721.11296 1.49561,0.81185 -0.14299,8.74637 c -0.44778,-0.17974 -0.89637,-0.3603 -1.35262,-0.54851 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 798.73585,722.87324 1.49561,0.8635 -0.143,7.97132 c -0.44777,-0.13346 -0.89637,-0.26774 -1.35261,-0.40967 z"
-               style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9046" />
-            <path
-               id="path9048"
-               style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 801.74147,724.60853 1.49561,0.8635 -0.143,6.9414 c -0.45086,-0.0891 -0.90174,-0.18394 -1.35261,-0.29021 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 804.77561,726.3603 1.49561,0.8635 -0.14298,5.64801 c -0.45087,-0.0448 -0.90175,-0.10761 -1.35263,-0.1869 z"
-               style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9050" />
-            <path
-               id="path9052"
-               style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 807.96014,728.19889 1.49561,0.8635 -0.14298,4.02277 -1.35263,-0.061 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 810.94728,729.92351 1.49562,0.8635 -0.143,2.25351 c -0.45087,0.0365 -0.90175,0.043 -1.35262,0.0455 z"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path9054" />
-            <path
-               id="path9056"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 813.98787,731.67901 1.49561,0.8635 -0.005,0.21951 c -0.49716,0.0743 -0.99431,0.11867 -1.49146,0.15855 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path9058"
-               style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 808.50116,724.46812 4.32579,2.77189 -3.36496,1.82596 -4.63336,-2.67507 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)"
-               id="path9060"
-               style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5763-1-0)"
-               d="m 168.97267,729.02876 5.53505,3.29122 -4.85888,2.16006 -5.59196,-3.22851 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)"
-               id="path9062"
-               style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5755-4-7)"
-               d="m 160.72395,724.79949 6.15668,3.30299 -4.80265,2.04013 -5.77449,-3.40035 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)"
-               id="path9064"
-               style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5771-9-3)"
-               d="m 176.36093,733.32799 5.42473,3.1111 -4.80067,2.27648 -5.48163,-3.16481 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)"
-               id="path9066"
-               style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5775-6-3)"
-               d="m 183.77308,737.49097 5.15796,3.14973 -4.56782,2.33469 -5.44771,-3.14523 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(1.0976847,0,0,1.9977591,499.58969,-841.44418)"
-               d="m 333.57762,751.60089 c 0,0.0732 -0.81619,0.13258 -1.82301,0.13258 -1.00682,0 -1.82301,-0.0594 -1.82301,-0.13258 0,-0.0732 0.81619,-0.13258 1.82301,-0.13258 1.00682,0 1.82301,0.0594 1.82301,0.13258 z"
-               sodipodi:ry="0.13258252"
-               sodipodi:rx="1.8230097"
-               sodipodi:cy="751.60089"
-               sodipodi:cx="331.75461"
-               id="path9068"
-               style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
+          <g id="g3896" transform="translate(-4.1800279e-6,-5.2367812e-6)">
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 190.21338,691.0295 81.78485,38.21794 c -17.02861,10.15729 -36.60437,20.04494 -53.33546,30.59488 l -78.41702,-42.48508 z" style="opacity:0.85650222;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter3898-1)" id="path5323-3-6-7-9-5" transform="matrix(0.87980278,0,0,0.93973585,638.55397,44.100397)"/>
+            <path inkscape:connector-curvature="0" d="m 865.75562,660.07009 -4.00091,0 0,51.61769 4.00091,0 z" style="fill:url(#linearGradient3946);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path8972"/>
+            <path id="path8978" style="opacity:0.37219729;fill:url(#linearGradient3948);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter7728-5)" d="m 67.744509,914.95532 c 16.01462,0.88918 15.62697,1.21938 20.59089,2.32875 l -2.57497,1.07216 c -6.43216,-0.23924 -12.62335,-0.34722 -20.346901,-2.42182 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(1.7801744,-0.15352373,0.18180145,2.696293,528.97224,-1767.7891)"/>
+            <path id="path8980" style="fill:url(#linearGradient3950);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.49568304;stroke-miterlimit:4;stroke-dasharray:none;display:inline" d="m 65.553401,897.93807 c 5.5337,1.27812 13.423478,1.65192 20.197069,1.4243 l -2.88e-4,19.8419 C 78.790608,918.99206 72.203,918.629 65.429412,916.78914 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)"/>
+            <path id="path8982" style="fill:url(#linearGradient3952);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 85.766095,899.16658 2.558591,-1.22501 -0.0039,20.15611 -2.324216,1.36735 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)"/>
+            <path id="path8984" style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 67.640565,896.47478 c 16.084093,0.15821 15.694761,0.52999 20.680215,1.46943 l -2.58614,1.27224 c -6.460064,0.0624 -12.674206,0.24908 -20.431262,-1.58479 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)"/>
+            <path id="path8986" style="fill:url(#linearGradient3954);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsccccscc" transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)"/>
+            <path sodipodi:nodetypes="ccsccccsc" inkscape:connector-curvature="0" d="m 82.252334,898.59057 c -0.367268,-0.11167 -0.466043,-0.17569 -0.756748,-0.34245 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -0.608009,0.19655 -1.313731,0.28799 -1.942822,0.2806 0.09555,-7.18886 1.912722,-10.57272 4.869938,-11.0339 4.157131,-0.6483 8.515223,1.69408 7.495035,11.59668 z" style="fill:url(#linearGradient3956);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter4943-0-1-3)" id="path8988" transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)"/>
+            <path sodipodi:nodetypes="cccsccccscc" inkscape:connector-curvature="0" d="m 76.31721,883.95313 c -0.995822,0.0446 -1.976963,0.26771 -2.90625,0.625 -0.909432,0.39243 -1.783947,0.90349 -2.5,1.59375 -0.865307,0.73417 -1.526371,1.68033 -1.986619,2.7135 -0.446678,0.86565 -0.653624,1.82073 -0.841048,2.76877 -0.203427,0.96712 -0.247263,1.9615 -0.31166,2.94556 -0.02125,0.93248 -0.09331,1.86193 -0.173173,2.79092 0.135417,0.0625 0.270833,0.125 0.40625,0.1875 -0.138016,-0.35664 0.04678,-0.72641 0,-1.09375 0.09674,-1.11642 0.21077,-2.23106 0.34375,-3.34375 0.164016,-1.04781 0.321442,-2.09846 0.59375,-3.125 0.338004,-0.97258 0.844625,-1.88515 1.515601,-2.66768 0.690807,-0.82474 1.511578,-1.55752 2.46162,-2.0699 0.779103,-0.45606 1.631602,-0.83317 2.543566,-0.88421 1.022891,-0.10838 2.083355,-0.23287 3.08076,0.0972 0.991734,0.25411 1.987713,0.57049 2.804703,1.21206 0.42392,0.45234 0.858588,0.90009 1.118895,1.47369 0.551331,0.82862 0.691368,1.83253 0.847462,2.7932 0.170285,1.0206 0.44843,2.02056 0.596143,3.04561 0.23056,1.06838 0.241639,2.16524 0.34375,3.25 -0.0024,0.83398 0.0099,1.67442 -0.125,2.5 0.603386,-0.10313 1.231104,-0.0641 1.8125,-0.28125 0.0124,-1.10074 -0.0079,-2.20086 -0.06204,-3.30034 -0.05439,-0.98791 -0.11089,-1.97851 -0.312959,-2.94966 -0.138156,-1.03978 -0.348864,-2.08573 -0.795357,-3.04098 -0.426208,-0.96093 -0.873087,-1.94781 -1.631342,-2.69552 -0.585169,-0.68264 -1.35478,-1.17821 -2.148507,-1.58861 -0.926727,-0.47863 -1.948421,-0.78973 -2.987294,-0.89364 -0.560763,-0.0713 -1.122909,-0.13743 -1.6875,-0.0625 z" style="fill:url(#linearGradient3958);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter5053-5-1-3)" id="path8990" transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)"/>
+            <path sodipodi:nodetypes="ccsccccscc" inkscape:connector-curvature="0" d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z" style="fill:url(#linearGradient3960);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path8992" transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)"/>
+            <path id="path8994" style="fill:none;stroke:url(#linearGradient3962);stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsccccscc" transform="matrix(1.2793312,-0.02741304,0.02741304,1.2793312,705.81457,-479.61605)"/>
+            <rect ry="0" transform="matrix(0.96470464,0,0,0.96470464,758.63366,650.93048)" y="-5.4061451" x="16.667517" height="2.5253813" width="104.55079" id="rect3884" style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"/>
+            <path id="path8998" style="fill:url(#linearGradient3964);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 808.86147,687.60678 68.9085,24.80055 -0.77413,15.94137 -47.80665,12.10674 -64.28965,-37.11761 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+            <path id="path9000" style="fill:url(#linearGradient3966);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 764.89955,703.33785 64.28962,37.11761 3e-5,16.4631 -64.28965,-37.8695 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path9002" style="fill:#8fa2b0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 777.3858,710.54677 38.40386,22.17248 c -23.88195,3.2132 -38.40386,-15.1502 -38.40386,-22.17248 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+            <path id="path9004" style="fill:url(#linearGradient3968);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 829.1892,740.45546 48.58078,-28.04813 0,16.45518 -48.58078,28.05605 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path9006" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 814.03045,731.7036 32.66245,-17.71405 1.37544,0.50061 -32.57407,18.05856 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 810.96772,729.93535 32.30782,-17.41305 1.81541,0.66075 -32.6594,17.59741 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9008"/>
+            <path id="path9010" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 807.96611,728.20236 32.12072,-17.03137 1.85216,0.67413 -32.50906,17.20237 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 804.8164,726.38388 32.20521,-16.52484 1.67287,0.60887 -32.41424,16.7611 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9012"/>
+            <path id="path9014" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 801.75368,724.61562 32.51091,-16.02809 1.64956,0.70019 -32.69665,16.17302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 798.75206,722.88265 32.56913,-15.54451 1.7606,0.74732 -32.8659,15.64231 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9016"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 795.6585,721.09653 32.76358,-14.989 1.64324,0.69751 -32.943,15.13661 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9018"/>
+            <path id="path9020" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 792.59576,719.32828 32.62016,-14.58168 1.77848,0.75492 -32.93481,14.67188 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 789.59415,717.5953 32.38806,-14.22134 1.62827,0.69117 -32.55251,14.37529 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9022"/>
+            <path id="path9024" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 786.44445,715.77682 31.89331,-13.94983 2.10105,0.89184 -32.53054,13.90311 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 783.38171,714.00857 31.39884,-13.58321 1.81466,0.66197 -31.74967,13.76636 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9026"/>
+            <path id="path9028" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 780.09143,712.08314 31.05906,-13.30696 2.14161,0.90906 -31.44817,13.43547 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 777.08931,710.37565 30.59664,-13.07008 1.88599,0.80055 -31.0188,13.11465 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9030"/>
+            <path id="path9032" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 777.10655,710.38556 1.49561,0.8635 -0.14298,3.35446 c -0.4593,-1.12951 -0.92606,-2.01646 -1.35263,-4.20971 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 780.0813,712.07539 1.76023,1.04393 -0.14298,6.59916 c -0.4651,-0.58726 -0.92177,-1.18292 -1.35263,-1.80441 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9034"/>
+            <path id="path9036" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 783.38569,714.01083 1.49561,0.8635 -0.14298,8.12629 c -0.45638,-0.43323 -0.91303,-0.86562 -1.35263,-1.34918 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 786.41318,715.75875 1.49561,0.8635 -0.14298,8.94957 c -0.45436,-0.35261 -0.90681,-0.70714 -1.35263,-1.06831 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9038"/>
+            <path id="path9040" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 789.58577,717.59044 1.49561,0.8635 -0.14298,9.27566 c -0.45088,-0.27593 -0.90176,-0.55691 -1.35263,-0.85845 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 792.57181,719.31443 1.49561,0.86351 -0.14298,9.1788 c -0.45088,-0.21585 -0.90176,-0.44359 -1.35263,-0.69379 z" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9042"/>
+            <path id="path9044" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 795.59749,721.11296 1.49561,0.81185 -0.14299,8.74637 c -0.44778,-0.17974 -0.89637,-0.3603 -1.35262,-0.54851 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 798.73585,722.87324 1.49561,0.8635 -0.143,7.97132 c -0.44777,-0.13346 -0.89637,-0.26774 -1.35261,-0.40967 z" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9046"/>
+            <path id="path9048" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 801.74147,724.60853 1.49561,0.8635 -0.143,6.9414 c -0.45086,-0.0891 -0.90174,-0.18394 -1.35261,-0.29021 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 804.77561,726.3603 1.49561,0.8635 -0.14298,5.64801 c -0.45087,-0.0448 -0.90175,-0.10761 -1.35263,-0.1869 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9050"/>
+            <path id="path9052" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 807.96014,728.19889 1.49561,0.8635 -0.14298,4.02277 -1.35263,-0.061 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 810.94728,729.92351 1.49562,0.8635 -0.143,2.25351 c -0.45087,0.0365 -0.90175,0.043 -1.35262,0.0455 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9054"/>
+            <path id="path9056" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 813.98787,731.67901 1.49561,0.8635 -0.005,0.21951 c -0.49716,0.0743 -0.99431,0.11867 -1.49146,0.15855 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path9058" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 808.50116,724.46812 4.32579,2.77189 -3.36496,1.82596 -4.63336,-2.67507 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)" id="path9060" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5763-1-0)" d="m 168.97267,729.02876 5.53505,3.29122 -4.85888,2.16006 -5.59196,-3.22851 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)" id="path9062" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5755-4-7)" d="m 160.72395,724.79949 6.15668,3.30299 -4.80265,2.04013 -5.77449,-3.40035 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)" id="path9064" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5771-9-3)" d="m 176.36093,733.32799 5.42473,3.1111 -4.80067,2.27648 -5.48163,-3.16481 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.8265149,0,0,0.8265149,650.87746,111.40294)" id="path9066" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5775-6-3)" d="m 183.77308,737.49097 5.15796,3.14973 -4.56782,2.33469 -5.44771,-3.14523 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(1.0976847,0,0,1.9977591,499.58969,-841.44418)" d="m 333.57762,751.60089 c 0,0.0732 -0.81619,0.13258 -1.82301,0.13258 -1.00682,0 -1.82301,-0.0594 -1.82301,-0.13258 0,-0.0732 0.81619,-0.13258 1.82301,-0.13258 1.00682,0 1.82301,0.0594 1.82301,0.13258 z" sodipodi:ry="0.13258252" sodipodi:rx="1.8230097" sodipodi:cy="751.60089" sodipodi:cx="331.75461" id="path9068" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
           </g>
         </g>
       </g>
diff --git a/misc/images/svg/elements/Crypto-router_symbol.svg b/misc/images/svg/elements/Crypto-router_symbol.svg
index 33c0b5b4e71..c2a99e63f52 100644
--- a/misc/images/svg/elements/Crypto-router_symbol.svg
+++ b/misc/images/svg/elements/Crypto-router_symbol.svg
@@ -1,642 +1,133 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="126.6424"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <filter
-       inkscape:collect="always"
-       id="filter7728-5-8"
-       x="-0.054699458"
-       width="1.1093988"
-       y="-0.50930429"
-       height="2.0186086"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.52342113"
-         id="feGaussianBlur7730-8-2" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="126.6424" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <filter inkscape:collect="always" id="filter7728-5-8" x="-0.054699458" width="1.1093988" y="-0.50930429" height="2.0186086" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.52342113" id="feGaussianBlur7730-8-2"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818-2-3-2-5"
-       id="linearGradient64037"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9919109,0,0,0.99082157,0.88429866,9.7527949)"
-       x1="65.57148"
-       y1="911.26953"
-       x2="85.808258"
-       y2="908.14453" />
-    <linearGradient
-       id="linearGradient4818-2-3-2-5">
-      <stop
-         style="stop-color:#4c4c4c;stop-opacity:1;"
-         offset="0"
-         id="stop4820-2-5-7-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4822-8-6-9-1" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4818-2-3-2-5" id="linearGradient64037" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9919109,0,0,0.99082157,0.88429866,9.7527949)" x1="65.57148" y1="911.26953" x2="85.808258" y2="908.14453"/>
+    <linearGradient id="linearGradient4818-2-3-2-5">
+      <stop style="stop-color:#4c4c4c;stop-opacity:1;" offset="0" id="stop4820-2-5-7-5"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop4822-8-6-9-1"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4818-2-3-2-5"
-       id="linearGradient64039"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9088145,0,0,1.011806,8.2282575,-9.2582399)"
-       x1="87.038445"
-       y1="906.24481"
-       x2="86.753571"
-       y2="881.91229" />
-    <linearGradient
-       id="linearGradient123304">
-      <stop
-         style="stop-color:#4c4c4c;stop-opacity:1;"
-         offset="0"
-         id="stop123306" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123308" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4818-2-3-2-5" id="linearGradient64039" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9088145,0,0,1.011806,8.2282575,-9.2582399)" x1="87.038445" y1="906.24481" x2="86.753571" y2="881.91229"/>
+    <linearGradient id="linearGradient123304">
+      <stop style="stop-color:#4c4c4c;stop-opacity:1;" offset="0" id="stop123306"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123308"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4893-5-5-6-5"
-       id="linearGradient64041"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="76.602463"
-       y1="912.10504"
-       x2="75.851158"
-       y2="883.29041" />
-    <linearGradient
-       id="linearGradient4893-5-5-6-5">
-      <stop
-         id="stop4895-5-7-1-2"
-         offset="0"
-         style="stop-color:#b5b5b5;stop-opacity:1;" />
-      <stop
-         style="stop-color:#a5a5a5;stop-opacity:1;"
-         offset="0.6197595"
-         id="stop4899-9-0-7-7" />
-      <stop
-         id="stop4897-6-1-7-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4893-5-5-6-5" id="linearGradient64041" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="76.602463" y1="912.10504" x2="75.851158" y2="883.29041"/>
+    <linearGradient id="linearGradient4893-5-5-6-5">
+      <stop id="stop4895-5-7-1-2" offset="0" style="stop-color:#b5b5b5;stop-opacity:1;"/>
+      <stop style="stop-color:#a5a5a5;stop-opacity:1;" offset="0.6197595" id="stop4899-9-0-7-7"/>
+      <stop id="stop4897-6-1-7-6" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4858-6-3-1-4"
-       id="linearGradient64043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="71.191071"
-       y1="894.60565"
-       x2="85.760696"
-       y2="890.11536" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4858-6-3-1-4">
-      <stop
-         style="stop-color:#1e1e1e;stop-opacity:1;"
-         offset="0"
-         id="stop4860-8-7-9-2" />
-      <stop
-         style="stop-color:#1e1e1e;stop-opacity:0;"
-         offset="1"
-         id="stop4862-9-3-0-3" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4858-6-3-1-4" id="linearGradient64043" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="71.191071" y1="894.60565" x2="85.760696" y2="890.11536"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4858-6-3-1-4">
+      <stop style="stop-color:#1e1e1e;stop-opacity:1;" offset="0" id="stop4860-8-7-9-2"/>
+      <stop style="stop-color:#1e1e1e;stop-opacity:0;" offset="1" id="stop4862-9-3-0-3"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter4943-0-1-3-2">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.3568344"
-         id="feGaussianBlur4945-6-3-4-2" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4943-0-1-3-2">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.3568344" id="feGaussianBlur4945-6-3-4-2"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4868-0-9-1-6"
-       id="linearGradient64045"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="84.448196"
-       y1="888.54315"
-       x2="62.066071"
-       y2="889.41815" />
-    <linearGradient
-       id="linearGradient4868-0-9-1-6">
-      <stop
-         style="stop-color:#8c8c8c;stop-opacity:1;"
-         offset="0"
-         id="stop4870-6-6-7-8" />
-      <stop
-         id="stop4876-6-0-5-5"
-         offset="0.18895134"
-         style="stop-color:#353535;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="1"
-         id="stop4872-3-2-3-7" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4868-0-9-1-6" id="linearGradient64045" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="84.448196" y1="888.54315" x2="62.066071" y2="889.41815"/>
+    <linearGradient id="linearGradient4868-0-9-1-6">
+      <stop style="stop-color:#8c8c8c;stop-opacity:1;" offset="0" id="stop4870-6-6-7-8"/>
+      <stop id="stop4876-6-0-5-5" offset="0.18895134" style="stop-color:#353535;stop-opacity:1;"/>
+      <stop style="stop-color:#959595;stop-opacity:1;" offset="1" id="stop4872-3-2-3-7"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5053-5-1-3-6">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.19085882"
-         id="feGaussianBlur5055-4-9-2-1" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5053-5-1-3-6">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.19085882" id="feGaussianBlur5055-4-9-2-1"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5098-8-8-4-9"
-       id="linearGradient64047"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="75.503571"
-       y1="901.06091"
-       x2="76.275017"
-       y2="894.05725" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5098-8-8-4-9">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5100-8-8-1-2" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5102-4-7-2-7" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5098-8-8-4-9" id="linearGradient64047" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="75.503571" y1="901.06091" x2="76.275017" y2="894.05725"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5098-8-8-4-9">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop5100-8-8-1-2"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop5102-4-7-2-7"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-0-9-5"
-       id="linearGradient64049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.19220976,1.3281291)"
-       x1="71.333176"
-       y1="896.18628"
-       x2="75.074463"
-       y2="878.22595" />
-    <linearGradient
-       id="linearGradient5311-7-0-9-5">
-      <stop
-         id="stop5313-3-9-0-4"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop5315-2-0-8-3"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-0-9-5" id="linearGradient64049" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.19220976,1.3281291)" x1="71.333176" y1="896.18628" x2="75.074463" y2="878.22595"/>
+    <linearGradient id="linearGradient5311-7-0-9-5">
+      <stop id="stop5313-3-9-0-4" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop5315-2-0-8-3" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter9216"
-       x="-0.069969781"
-       width="1.1399395"
-       y="-0.182404"
-       height="1.364808">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.5101205"
-         id="feGaussianBlur9218" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter9216" x="-0.069969781" width="1.1399395" y="-0.182404" height="1.364808">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="5.5101205" id="feGaussianBlur9218"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9232"
-       id="linearGradient63623"
-       gradientUnits="userSpaceOnUse"
-       x1="798.18555"
-       y1="-320.4082"
-       x2="831.51312"
-       y2="-382.40469" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9232">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop9234" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop9236" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9232" id="linearGradient63623" gradientUnits="userSpaceOnUse" x1="798.18555" y1="-320.4082" x2="831.51312" y2="-382.40469"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9232">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop9234"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop9236"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient64053"
-       id="linearGradient64069"
-       x1="826.46161"
-       y1="-697.23346"
-       x2="1045.338"
-       y2="-697.23346"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient64053">
-      <stop
-         style="stop-color:#0a161a;stop-opacity:1;"
-         offset="0"
-         id="stop64055" />
-      <stop
-         id="stop64057"
-         offset="0.84582919"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop64059" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient64053" id="linearGradient64069" x1="826.46161" y1="-697.23346" x2="1045.338" y2="-697.23346" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient64053">
+      <stop style="stop-color:#0a161a;stop-opacity:1;" offset="0" id="stop64055"/>
+      <stop id="stop64057" offset="0.84582919" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop64059"/>
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient64053"
-       id="radialGradient63627"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0029987,-0.02499486,0.00775171,0.87105506,-1717.6929,-22.539722)"
-       cx="869.76385"
-       cy="-381.34979"
-       fx="869.76385"
-       fy="-381.34979"
-       r="94.5" />
-    <linearGradient
-       id="linearGradient123352">
-      <stop
-         style="stop-color:#0a161a;stop-opacity:1;"
-         offset="0"
-         id="stop123354" />
-      <stop
-         id="stop123356"
-         offset="0.84582919"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop123358" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient64053" id="radialGradient63627" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.0029987,-0.02499486,0.00775171,0.87105506,-1717.6929,-22.539722)" cx="869.76385" cy="-381.34979" fx="869.76385" fy="-381.34979" r="94.5"/>
+    <linearGradient id="linearGradient123352">
+      <stop style="stop-color:#0a161a;stop-opacity:1;" offset="0" id="stop123354"/>
+      <stop id="stop123356" offset="0.84582919" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop123358"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient70007"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9154">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9156" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop9158" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient70007" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9154">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop9156"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop9158"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient70009"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9178">
-      <stop
-         style="stop-color:#576274;stop-opacity:1;"
-         offset="0"
-         id="stop9180" />
-      <stop
-         style="stop-color:#576274;stop-opacity:0;"
-         offset="1"
-         id="stop9182" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient70009" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9178">
+      <stop style="stop-color:#576274;stop-opacity:1;" offset="0" id="stop9180"/>
+      <stop style="stop-color:#576274;stop-opacity:0;" offset="1" id="stop9182"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient63629"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient63631"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9080"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient63633"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient63635"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9088"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient63637"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient63639"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9098"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient63641"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient63643"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9112"
-       is_visible="true" />
-    <linearGradient
-       y2="-846.79266"
-       x2="879.32739"
-       y1="-754.46265"
-       x1="929.86853"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient123450"
-       xlink:href="#linearGradient9154"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-703.55096"
-       x2="920.79816"
-       y1="-754.46265"
-       x1="929.86853"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient123452"
-       xlink:href="#linearGradient9178"
-       inkscape:collect="always" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient63629" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient63631" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9080" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient63633" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient63635" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9088" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient63637" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient63639" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9098" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient63641" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient63643" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9112" is_visible="true"/>
+    <linearGradient y2="-846.79266" x2="879.32739" y1="-754.46265" x1="929.86853" gradientUnits="userSpaceOnUse" id="linearGradient123450" xlink:href="#linearGradient9154" inkscape:collect="always"/>
+    <linearGradient y2="-703.55096" x2="920.79816" y1="-754.46265" x1="929.86853" gradientUnits="userSpaceOnUse" id="linearGradient123452" xlink:href="#linearGradient9178" inkscape:collect="always"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="159"
-     inkscape:cy="34.749771"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="66"
-     inkscape:window-y="87"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="159" inkscape:cy="34.749771" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="66" inkscape:window-y="87" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-216,-440.46955)">
-    <g
-       transform="matrix(0.49500498,0,0,0.49500498,-180.64674,882.50442)"
-       style="display:inline"
-       id="g64083"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Cryto-router_symbol.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g8974-1"
-         transform="matrix(1.8719154,-0.04011071,0.04011071,1.8719154,376.23676,-2488.215)"
-         style="display:inline">
-        <g
-           id="g8976-2"
-           transform="matrix(1.7399471,0,0,1.7399471,113.54526,-679.68865)">
-          <path
-             id="path8978-3"
-             style="opacity:0.55172412;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7728-5-8)"
-             d="m 67.744509,914.95532 c 16.01462,0.88918 -7.950063,0.20801 -2.986143,1.31738 l 21.002063,2.08353 c -6.43216,-0.23924 23.010661,8.63448 15.287111,6.55988 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             transform="matrix(1.3934199,-0.09014543,0.09690169,2.1096565,-116.60103,-1009.4098)" />
-          <path
-             transform="matrix(1.6783854,-0.08403929,0.12600398,2.1102801,-161.72056,-1010.3766)"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 66.635897,913.64361 c 16.01462,0.88918 -2.285988,-0.82213 -0.723011,2.8509 l 10.148939,1.41354 c -6.43216,-0.23924 32.709265,9.08266 24.985715,7.00806 z"
-             style="opacity:0.55172412;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7728-5-8)"
-             id="path64051" />
-          <path
-             id="path8980-3"
-             style="fill:url(#linearGradient64037);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.49568304;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 65.553401,897.93807 c 5.5337,1.27812 13.423478,1.65192 20.197069,1.4243 l -2.88e-4,19.8419 C 78.790608,918.99206 72.203,918.629 65.429412,916.78914 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path8982-4"
-             style="fill:url(#linearGradient64039);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 85.766095,899.16658 2.558591,-1.22501 -0.0039,20.15611 -2.324216,1.36735 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path8984-1"
-             style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 67.640565,896.47478 c 16.084093,0.15821 15.694761,0.52999 20.680215,1.46943 l -2.58614,1.27224 c -6.460064,0.0624 -12.674206,0.24908 -20.431262,-1.58479 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path8986-1"
-             style="fill:url(#linearGradient64041);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccsccccscc" />
-          <path
-             sodipodi:nodetypes="ccsccccsc"
-             inkscape:connector-curvature="0"
-             d="m 82.252334,898.59057 c -0.367268,-0.11167 -0.466043,-0.17569 -0.756748,-0.34245 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -0.608009,0.19655 -1.313731,0.28799 -1.942822,0.2806 0.09555,-7.18886 1.912722,-10.57272 4.869938,-11.0339 4.157131,-0.6483 8.515223,1.69408 7.495035,11.59668 z"
-             style="fill:url(#linearGradient64043);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter4943-0-1-3-2)"
-             id="path8988-3" />
-          <path
-             sodipodi:nodetypes="cccsccccscc"
-             inkscape:connector-curvature="0"
-             d="m 76.31721,883.95313 c -0.995822,0.0446 -1.976963,0.26771 -2.90625,0.625 -0.909432,0.39243 -1.783947,0.90349 -2.5,1.59375 -0.865307,0.73417 -1.526371,1.68033 -1.986619,2.7135 -0.446678,0.86565 -0.653624,1.82073 -0.841048,2.76877 -0.203427,0.96712 -0.247263,1.9615 -0.31166,2.94556 -0.02125,0.93248 -0.09331,1.86193 -0.173173,2.79092 0.135417,0.0625 0.270833,0.125 0.40625,0.1875 -0.138016,-0.35664 0.04678,-0.72641 0,-1.09375 0.09674,-1.11642 0.21077,-2.23106 0.34375,-3.34375 0.164016,-1.04781 0.321442,-2.09846 0.59375,-3.125 0.338004,-0.97258 0.844625,-1.88515 1.515601,-2.66768 0.690807,-0.82474 1.511578,-1.55752 2.46162,-2.0699 0.779103,-0.45606 1.631602,-0.83317 2.543566,-0.88421 1.022891,-0.10838 2.083355,-0.23287 3.08076,0.0972 0.991734,0.25411 1.987713,0.57049 2.804703,1.21206 0.42392,0.45234 0.858588,0.90009 1.118895,1.47369 0.551331,0.82862 0.691368,1.83253 0.847462,2.7932 0.170285,1.0206 0.44843,2.02056 0.596143,3.04561 0.23056,1.06838 0.241639,2.16524 0.34375,3.25 -0.0024,0.83398 0.0099,1.67442 -0.125,2.5 0.603386,-0.10313 1.231104,-0.0641 1.8125,-0.28125 0.0124,-1.10074 -0.0079,-2.20086 -0.06204,-3.30034 -0.05439,-0.98791 -0.11089,-1.97851 -0.312959,-2.94966 -0.138156,-1.03978 -0.348864,-2.08573 -0.795357,-3.04098 -0.426208,-0.96093 -0.873087,-1.94781 -1.631342,-2.69552 -0.585169,-0.68264 -1.35478,-1.17821 -2.148507,-1.58861 -0.926727,-0.47863 -1.948421,-0.78973 -2.987294,-0.89364 -0.560763,-0.0713 -1.122909,-0.13743 -1.6875,-0.0625 z"
-             style="fill:url(#linearGradient64045);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5053-5-1-3-6)"
-             id="path8990-8" />
-          <path
-             sodipodi:nodetypes="ccsccccscc"
-             inkscape:connector-curvature="0"
-             d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z"
-             style="fill:url(#linearGradient64047);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path8992-7" />
-          <path
-             id="path8994-4"
-             style="fill:none;stroke:url(#linearGradient64049);stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccsccccscc" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-216,-440.46955)">
+    <g transform="matrix(0.49500498,0,0,0.49500498,-180.64674,882.50442)" style="display:inline" id="g64083">
+      <g id="g8974-1" transform="matrix(1.8719154,-0.04011071,0.04011071,1.8719154,376.23676,-2488.215)" style="display:inline">
+        <g id="g8976-2" transform="matrix(1.7399471,0,0,1.7399471,113.54526,-679.68865)">
+          <path id="path8978-3" style="opacity:0.55172412;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7728-5-8)" d="m 67.744509,914.95532 c 16.01462,0.88918 -7.950063,0.20801 -2.986143,1.31738 l 21.002063,2.08353 c -6.43216,-0.23924 23.010661,8.63448 15.287111,6.55988 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(1.3934199,-0.09014543,0.09690169,2.1096565,-116.60103,-1009.4098)"/>
+          <path transform="matrix(1.6783854,-0.08403929,0.12600398,2.1102801,-161.72056,-1010.3766)" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 66.635897,913.64361 c 16.01462,0.88918 -2.285988,-0.82213 -0.723011,2.8509 l 10.148939,1.41354 c -6.43216,-0.23924 32.709265,9.08266 24.985715,7.00806 z" style="opacity:0.55172412;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7728-5-8)" id="path64051"/>
+          <path id="path8980-3" style="fill:url(#linearGradient64037);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.49568304;stroke-miterlimit:4;stroke-dasharray:none" d="m 65.553401,897.93807 c 5.5337,1.27812 13.423478,1.65192 20.197069,1.4243 l -2.88e-4,19.8419 C 78.790608,918.99206 72.203,918.629 65.429412,916.78914 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path8982-4" style="fill:url(#linearGradient64039);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 85.766095,899.16658 2.558591,-1.22501 -0.0039,20.15611 -2.324216,1.36735 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path8984-1" style="fill:#424242;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 67.640565,896.47478 c 16.084093,0.15821 15.694761,0.52999 20.680215,1.46943 l -2.58614,1.27224 c -6.460064,0.0624 -12.674206,0.24908 -20.431262,-1.58479 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path8986-1" style="fill:url(#linearGradient64041);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsccccscc"/>
+          <path sodipodi:nodetypes="ccsccccsc" inkscape:connector-curvature="0" d="m 82.252334,898.59057 c -0.367268,-0.11167 -0.466043,-0.17569 -0.756748,-0.34245 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -0.608009,0.19655 -1.313731,0.28799 -1.942822,0.2806 0.09555,-7.18886 1.912722,-10.57272 4.869938,-11.0339 4.157131,-0.6483 8.515223,1.69408 7.495035,11.59668 z" style="fill:url(#linearGradient64043);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter4943-0-1-3-2)" id="path8988-3"/>
+          <path sodipodi:nodetypes="cccsccccscc" inkscape:connector-curvature="0" d="m 76.31721,883.95313 c -0.995822,0.0446 -1.976963,0.26771 -2.90625,0.625 -0.909432,0.39243 -1.783947,0.90349 -2.5,1.59375 -0.865307,0.73417 -1.526371,1.68033 -1.986619,2.7135 -0.446678,0.86565 -0.653624,1.82073 -0.841048,2.76877 -0.203427,0.96712 -0.247263,1.9615 -0.31166,2.94556 -0.02125,0.93248 -0.09331,1.86193 -0.173173,2.79092 0.135417,0.0625 0.270833,0.125 0.40625,0.1875 -0.138016,-0.35664 0.04678,-0.72641 0,-1.09375 0.09674,-1.11642 0.21077,-2.23106 0.34375,-3.34375 0.164016,-1.04781 0.321442,-2.09846 0.59375,-3.125 0.338004,-0.97258 0.844625,-1.88515 1.515601,-2.66768 0.690807,-0.82474 1.511578,-1.55752 2.46162,-2.0699 0.779103,-0.45606 1.631602,-0.83317 2.543566,-0.88421 1.022891,-0.10838 2.083355,-0.23287 3.08076,0.0972 0.991734,0.25411 1.987713,0.57049 2.804703,1.21206 0.42392,0.45234 0.858588,0.90009 1.118895,1.47369 0.551331,0.82862 0.691368,1.83253 0.847462,2.7932 0.170285,1.0206 0.44843,2.02056 0.596143,3.04561 0.23056,1.06838 0.241639,2.16524 0.34375,3.25 -0.0024,0.83398 0.0099,1.67442 -0.125,2.5 0.603386,-0.10313 1.231104,-0.0641 1.8125,-0.28125 0.0124,-1.10074 -0.0079,-2.20086 -0.06204,-3.30034 -0.05439,-0.98791 -0.11089,-1.97851 -0.312959,-2.94966 -0.138156,-1.03978 -0.348864,-2.08573 -0.795357,-3.04098 -0.426208,-0.96093 -0.873087,-1.94781 -1.631342,-2.69552 -0.585169,-0.68264 -1.35478,-1.17821 -2.148507,-1.58861 -0.926727,-0.47863 -1.948421,-0.78973 -2.987294,-0.89364 -0.560763,-0.0713 -1.122909,-0.13743 -1.6875,-0.0625 z" style="fill:url(#linearGradient64045);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5053-5-1-3-6)" id="path8990-8"/>
+          <path sodipodi:nodetypes="ccsccccscc" inkscape:connector-curvature="0" d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z" style="fill:url(#linearGradient64047);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path8992-7"/>
+          <path id="path8994-4" style="fill:none;stroke:url(#linearGradient64049);stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 85.940441,898.47629 c -1.446119,0.4556 -3.6854,0.29015 -4.444855,-0.22817 -0.0951,-2.38924 0.02435,-4.22796 -0.415062,-6.02566 -1.14909,-4.70105 -5.071535,-4.53769 -6.959173,-3.4305 -1.047785,0.70434 -1.172903,1.36672 -1.506313,2.13427 -0.417274,1.18497 -0.645081,2.87399 -0.784855,6.82096 -1.307228,0.41139 -3.163743,0.34737 -4.227903,-0.35734 0.264165,-5.05119 0.229897,-9.20567 4.213284,-11.97646 2.549128,-1.77314 6.390368,-1.96299 9.215683,-0.53508 5.04357,2.50245 4.921657,9.3152 4.909194,13.59798 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsccccscc"/>
         </g>
       </g>
-      <path
-         sodipodi:open="true"
-         sodipodi:end="6.2158485"
-         sodipodi:start="0"
-         transform="matrix(1.2002087,0,0,1.112967,-100.98926,-310.03403)"
-         d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089"
-         sodipodi:ry="36.25"
-         sodipodi:rx="94.5"
-         sodipodi:cy="-343.38782"
-         sodipodi:cx="859.5"
-         id="path63525"
-         style="opacity:0.60096154;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216)"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.6057692;fill:url(#linearGradient63623);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216)"
-         id="path63527"
-         sodipodi:cx="859.5"
-         sodipodi:cy="-343.38782"
-         sodipodi:rx="94.5"
-         sodipodi:ry="36.25"
-         d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089"
-         transform="matrix(1.2002087,0,0,1.112967,-100.98926,-310.03403)"
-         sodipodi:start="0"
-         sodipodi:end="6.2158485"
-         sodipodi:open="true" />
-      <path
-         style="fill:url(#linearGradient64069);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 826.46295,-741.3125 0,44.34562 c -0.003,0.13487 0,0.27109 0,0.40625 0,23.97362 48.99684,43.40625 109.4375,43.40625 60.44066,0 109.43755,-19.43263 109.43755,-43.40625 0,-0.13543 -0.028,-0.27111 -0.031,-0.40625 l 0.031,0 0,-44.34562 z"
-         id="path63529"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccssscccc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient63627);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path63531"
-         sodipodi:cx="859.5"
-         sodipodi:cy="-343.38782"
-         sodipodi:rx="94.5"
-         sodipodi:ry="36.25"
-         d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089"
-         transform="matrix(1.1580688,0,0,1.197464,-59.460328,-330.28167)"
-         sodipodi:start="0"
-         sodipodi:end="6.2158485"
-         sodipodi:open="true" />
-      <g
-         id="g63533"
-         transform="matrix(1.1399016,0,0,1.1399016,-132.1887,105.34687)"
-         style="fill:url(#linearGradient123450);fill-opacity:1;stroke:url(#linearGradient123452);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 z"
-           inkscape:path-effect="#path-effect9080"
-           id="path63535"
-           d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 -30.68741,-10.69953"
-           style="fill:url(#linearGradient63629);fill-opacity:1;stroke:url(#linearGradient63631);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 c 23.36516,-0.0531 24.68121,-4.90539 38.49395,-6.86895 l -9.3618,16.54834 -7.77996,-2.58496 z"
-           inkscape:path-effect="#path-effect9088"
-           id="path63537"
-           d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 38.49395,-6.86895 -9.3618,16.54834 -7.77996,-2.58496 -20.5683,10.27791"
-           style="fill:url(#linearGradient63633);fill-opacity:1;stroke:url(#linearGradient63635);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 z"
-           inkscape:path-effect="#path-effect9098"
-           id="path63539"
-           d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 -40.66977,-1.68129"
-           style="fill:url(#linearGradient63637);fill-opacity:1;stroke:url(#linearGradient63639);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 z"
-           inkscape:path-effect="#path-effect9112"
-           id="path63541"
-           d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 21.33124,-9.9955"
-           style="fill:url(#linearGradient63641);fill-opacity:1;stroke:url(#linearGradient63643);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(1.2002087,0,0,1.112967,-100.98926,-310.03403)" d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089" sodipodi:ry="36.25" sodipodi:rx="94.5" sodipodi:cy="-343.38782" sodipodi:cx="859.5" id="path63525" style="opacity:0.60096154;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216)" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="opacity:0.6057692;fill:url(#linearGradient63623);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216)" id="path63527" sodipodi:cx="859.5" sodipodi:cy="-343.38782" sodipodi:rx="94.5" sodipodi:ry="36.25" d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089" transform="matrix(1.2002087,0,0,1.112967,-100.98926,-310.03403)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+      <path style="fill:url(#linearGradient64069);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 826.46295,-741.3125 0,44.34562 c -0.003,0.13487 0,0.27109 0,0.40625 0,23.97362 48.99684,43.40625 109.4375,43.40625 60.44066,0 109.43755,-19.43263 109.43755,-43.40625 0,-0.13543 -0.028,-0.27111 -0.031,-0.40625 l 0.031,0 0,-44.34562 z" id="path63529" inkscape:connector-curvature="0" sodipodi:nodetypes="ccssscccc"/>
+      <path sodipodi:type="arc" style="fill:url(#radialGradient63627);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path63531" sodipodi:cx="859.5" sodipodi:cy="-343.38782" sodipodi:rx="94.5" sodipodi:ry="36.25" d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089" transform="matrix(1.1580688,0,0,1.197464,-59.460328,-330.28167)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+      <g id="g63533" transform="matrix(1.1399016,0,0,1.1399016,-132.1887,105.34687)" style="fill:url(#linearGradient123450);fill-opacity:1;stroke:url(#linearGradient123452);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 z" inkscape:path-effect="#path-effect9080" id="path63535" d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 -30.68741,-10.69953" style="fill:url(#linearGradient63629);fill-opacity:1;stroke:url(#linearGradient63631);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 c 23.36516,-0.0531 24.68121,-4.90539 38.49395,-6.86895 l -9.3618,16.54834 -7.77996,-2.58496 z" inkscape:path-effect="#path-effect9088" id="path63537" d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 38.49395,-6.86895 -9.3618,16.54834 -7.77996,-2.58496 -20.5683,10.27791" style="fill:url(#linearGradient63633);fill-opacity:1;stroke:url(#linearGradient63635);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 z" inkscape:path-effect="#path-effect9098" id="path63539" d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 -40.66977,-1.68129" style="fill:url(#linearGradient63637);fill-opacity:1;stroke:url(#linearGradient63639);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 z" inkscape:path-effect="#path-effect9112" id="path63541" d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 21.33124,-9.9955" style="fill:url(#linearGradient63641);fill-opacity:1;stroke:url(#linearGradient63643);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Disk_array_2D.svg b/misc/images/svg/elements/Disk_array_2D.svg
index e5f47394b69..ba72d821d00 100644
--- a/misc/images/svg/elements/Disk_array_2D.svg
+++ b/misc/images/svg/elements/Disk_array_2D.svg
@@ -1,3395 +1,631 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="23.84375"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427"
-       id="linearGradient149625"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.18232,509.26382)"
-       x1="159.92857"
-       y1="361.98718"
-       x2="210.83929"
-       y2="333.23718" />
-    <linearGradient
-       id="linearGradient76427">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop76429-9" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop76431" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="23.84375" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427" id="linearGradient149625" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.18232,509.26382)" x1="159.92857" y1="361.98718" x2="210.83929" y2="333.23718"/>
+    <linearGradient id="linearGradient76427">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop76429-9"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop76431"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427"
-       id="linearGradient149627"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.18232,509.26382)"
-       x1="355.42856"
-       y1="451.72647"
-       x2="327.83929"
-       y2="256.22647" />
-    <linearGradient
-       id="linearGradient124285">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop124287" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop124289" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427" id="linearGradient149627" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.18232,509.26382)" x1="355.42856" y1="451.72647" x2="327.83929" y2="256.22647"/>
+    <linearGradient id="linearGradient124285">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop124287"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop124289"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149629"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.33145)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient76456">
-      <stop
-         id="stop76458"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop76460" />
-      <stop
-         id="stop76462"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149629" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.33145)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient76456">
+      <stop id="stop76458" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop76460"/>
+      <stop id="stop76462" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4612"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4614"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4616"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4618"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149631"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.33145)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient5345">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop5347" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop5349" />
+    <inkscape:path-effect is_visible="true" id="path-effect4612" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4614" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4616" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4618" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149631" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.33145)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient5345">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop5347"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop5349"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4620"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4622"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5365"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149633"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.26382)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5369">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop5371" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop5373" />
+    <inkscape:path-effect is_visible="true" id="path-effect4620" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4622" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5365" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149633" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.26382)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5369">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop5371"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop5373"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149635"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-689.1367)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149637"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.97414)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient124319">
-      <stop
-         id="stop124321"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop124323" />
-      <stop
-         id="stop124325"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149635" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-689.1367)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149637" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.97414)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient124319">
+      <stop id="stop124321" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop124323"/>
+      <stop id="stop124325" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5439"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5441"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5443"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5445"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.97414)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124332">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124334" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124336" />
+    <inkscape:path-effect effect="spiro" id="path-effect5439" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5441" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5443" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5445" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149639" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.97414)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124332">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124334"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124336"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5449"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5451"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5453"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.90651)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-696.77939)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.60736)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient124356">
-      <stop
-         id="stop124358"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop124360" />
-      <stop
-         id="stop124362"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect5449" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5451" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5453" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149641" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.90651)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149643" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-696.77939)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149645" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.60736)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient124356">
+      <stop id="stop124358" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop124360"/>
+      <stop id="stop124362" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5515"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5517"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5519"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5521"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.60736)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124369">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124371" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124373" />
+    <inkscape:path-effect is_visible="true" id="path-effect5515" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5517" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5519" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5521" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149647" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.60736)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124369">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124371"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124373"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5525"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5527"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5529"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.53973)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-704.4126)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.33145)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient124393">
-      <stop
-         id="stop124395"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop124397" />
-      <stop
-         id="stop124399"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect is_visible="true" id="path-effect5525" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5527" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5529" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149649" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.53973)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149651" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-704.4126)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149653" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.33145)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient124393">
+      <stop id="stop124395" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop124397"/>
+      <stop id="stop124399" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5699"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5701"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5703"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5705"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.33145)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124406">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124408" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124410" />
+    <inkscape:path-effect effect="spiro" id="path-effect5699" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5701" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5703" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5705" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149655" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.33145)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124406">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124408"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124410"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5709"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5711"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5713"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149657"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.26382)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149659"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-689.1367)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149661"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.97414)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient124430">
-      <stop
-         id="stop124432"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop124434" />
-      <stop
-         id="stop124436"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect5709" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5711" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5713" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149657" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.26382)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149659" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-689.1367)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149661" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.97414)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient124430">
+      <stop id="stop124432" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop124434"/>
+      <stop id="stop124436" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5721"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5723"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5725"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5727"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149663"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.97414)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124443">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124445" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124447" />
+    <inkscape:path-effect is_visible="true" id="path-effect5721" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5723" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5725" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5727" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149663" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.97414)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124443">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124445"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124447"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5731"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5733"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5735"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149665"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.90651)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149667"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-696.77939)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149669"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.60736)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient124467">
-      <stop
-         id="stop124469"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop124471" />
-      <stop
-         id="stop124473"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect is_visible="true" id="path-effect5731" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5733" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5735" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149665" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.90651)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149667" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-696.77939)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149669" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.60736)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient124467">
+      <stop id="stop124469" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop124471"/>
+      <stop id="stop124473" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5743"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5745"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5747"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5749"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149671"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.60736)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124480">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124482" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124484" />
+    <inkscape:path-effect effect="spiro" id="path-effect5743" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5745" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5747" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5749" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149671" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.60736)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124480">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124482"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124484"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5753"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5755"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5757"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149673"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.53973)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149675"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-704.4126)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149677"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.33145)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient6289">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6291" />
-      <stop
-         id="stop6293"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop6295" />
+    <inkscape:path-effect effect="spiro" id="path-effect5753" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5755" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5757" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149673" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.53973)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149675" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-704.4126)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149677" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.33145)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient6289">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6291"/>
+      <stop id="stop6293" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop6295"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6155"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6157"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6159"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6161"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149679"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.33145)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124513">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124515" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124517" />
+    <inkscape:path-effect is_visible="true" id="path-effect6155" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6157" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6159" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6161" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149679" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.33145)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124513">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124515"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124517"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6165"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6167"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6169"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149681"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.26382)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149683"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-689.1367)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149685"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.9782)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient124537">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop124539" />
-      <stop
-         id="stop124541"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop124543" />
+    <inkscape:path-effect is_visible="true" id="path-effect6165" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6167" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6169" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149681" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.26382)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149683" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-689.1367)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149685" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.9782)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient124537">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop124539"/>
+      <stop id="stop124541" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop124543"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6353"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6355"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6357"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6359"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149687"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.9782)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124550">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124552" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124554" />
+    <inkscape:path-effect effect="spiro" id="path-effect6353" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6355" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6357" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6359" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149687" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.9782)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124550">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124552"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124554"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6363"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6365"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6367"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.91057)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-696.78344)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.61751)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient124574">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop124576" />
-      <stop
-         id="stop124578"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop124580" />
+    <inkscape:path-effect effect="spiro" id="path-effect6363" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6365" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6367" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149689" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.91057)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149691" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-696.78344)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149693" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.61751)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient124574">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop124576"/>
+      <stop id="stop124578" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop124580"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6431"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6433"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6435"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6437"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.61751)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124587">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124589" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124591" />
+    <inkscape:path-effect is_visible="true" id="path-effect6431" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6433" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6435" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6437" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149695" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.61751)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124587">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124589"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124591"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6441"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6443"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6445"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149697"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.54988)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149699"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-704.42274)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149701"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.33145)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient124611">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop124613" />
-      <stop
-         id="stop124615"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop124617" />
+    <inkscape:path-effect is_visible="true" id="path-effect6441" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6443" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6445" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149697" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.54988)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149699" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-704.42274)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149701" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.33145)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient124611">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop124613"/>
+      <stop id="stop124615" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop124617"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6615"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6617"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6619"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6621"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149703"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.33145)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124624">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124626" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124628" />
+    <inkscape:path-effect effect="spiro" id="path-effect6615" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6617" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6619" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6621" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149703" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.33145)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124624">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124626"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124628"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6625"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6627"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6629"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149705"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.26382)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149707"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-689.1367)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.9782)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient124648">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop124650" />
-      <stop
-         id="stop124652"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop124654" />
+    <inkscape:path-effect effect="spiro" id="path-effect6625" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6627" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6629" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149705" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.26382)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149707" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-689.1367)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149709" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.9782)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient124648">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop124650"/>
+      <stop id="stop124652" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop124654"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6637"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6639"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6641"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6643"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.9782)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124661">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124663" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124665" />
+    <inkscape:path-effect is_visible="true" id="path-effect6637" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6639" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6641" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6643" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149711" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.9782)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124661">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124663"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124665"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6647"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6649"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6651"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149713"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.91057)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-696.78344)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.61751)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient124685">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop124687" />
-      <stop
-         id="stop124689"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop124691" />
+    <inkscape:path-effect is_visible="true" id="path-effect6647" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6649" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6651" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149713" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.91057)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149715" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-696.78344)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149717" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.61751)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient124685">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop124687"/>
+      <stop id="stop124689" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop124691"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6659"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6661"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6663"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6665"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.61751)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient124698">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop124700" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop124702" />
+    <inkscape:path-effect effect="spiro" id="path-effect6659" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6661" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6663" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6665" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149719" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.61751)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient124698">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop124700"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop124702"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6669"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6671"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6673"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149721"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.54988)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149723"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-704.42274)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="radialGradient149725"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8699295,0.50303111,-1.0254274,1.7733485,-37.994738,548.59038)"
-       cx="239.79552"
-       cy="-31.373899"
-       fx="239.79552"
-       fy="-31.373899"
-       r="9.4448795" />
-    <linearGradient
-       id="linearGradient124722">
-      <stop
-         id="stop124724"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop124726" />
-      <stop
-         id="stop124728"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect6669" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6671" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6673" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149721" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.54988)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149723" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-704.42274)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="radialGradient149725" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8699295,0.50303111,-1.0254274,1.7733485,-37.994738,548.59038)" cx="239.79552" cy="-31.373899" fx="239.79552" fy="-31.373899" r="9.4448795"/>
+    <linearGradient id="linearGradient124722">
+      <stop id="stop124724" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop124726"/>
+      <stop id="stop124728" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6709"
-       id="linearGradient149727"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,127.30276,619.50783)"
-       x1="248.57724"
-       y1="-37.698475"
-       x2="236.82542"
-       y2="-36.991367" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6709">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="0"
-         id="stop6711" />
-      <stop
-         style="stop-color:#cccccc;stop-opacity:0;"
-         offset="1"
-         id="stop6713" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6709" id="linearGradient149727" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,127.30276,619.50783)" x1="248.57724" y1="-37.698475" x2="236.82542" y2="-36.991367"/>
+    <linearGradient inkscape:collect="always" id="linearGradient6709">
+      <stop style="stop-color:#cccccc;stop-opacity:1;" offset="0" id="stop6711"/>
+      <stop style="stop-color:#cccccc;stop-opacity:0;" offset="1" id="stop6713"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6689"
-       is_visible="true" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10169-8"
-       id="radialGradient149729"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.6294256,0.14991889,0.18027644,2.0446153,734.31916,639.79423)"
-       cx="236.30856"
-       cy="-34.540203"
-       fx="236.30856"
-       fy="-34.540203"
-       r="9.4448795" />
-    <linearGradient
-       id="linearGradient10169-8">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop10171" />
-      <stop
-         id="stop10173"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop10175" />
+    <inkscape:path-effect effect="spiro" id="path-effect6689" is_visible="true"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient10169-8" id="radialGradient149729" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.6294256,0.14991889,0.18027644,2.0446153,734.31916,639.79423)" cx="236.30856" cy="-34.540203" fx="236.30856" fy="-34.540203" r="9.4448795"/>
+    <linearGradient id="linearGradient10169-8">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop10171"/>
+      <stop id="stop10173" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop10175"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-1.00865"
-     inkscape:cy="71.90609"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="22"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-1.00865" inkscape:cy="71.90609" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="22" inkscape:window-y="29" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-376.00865,-580.42452)">
-    <g
-       style="display:inline"
-       transform="translate(169.4774,-14.731727)"
-       id="g145685"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Disk_array_2D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <rect
-         ry="0"
-         y="595.39062"
-         x="211.99065"
-         height="23.370089"
-         width="117.4845"
-         id="rect145687"
-         style="fill:url(#linearGradient149625);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 211.99064,595.39064 117.48452,0 0,22.6865 -117.48452,0 z"
-         style="fill:url(#linearGradient149627);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145689" />
-      <path
-         id="path145691"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 242.48253,595.62906 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.38431,0.3843 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path145693"
-         style="fill:url(#linearGradient149629);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 245.16523,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path145695"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,596.83714 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,598.13951 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145697" />
-      <path
-         id="path145699"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,599.50593 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,600.85101 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145701" />
-      <path
-         id="path145703"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,597.4136 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,598.78003 0.98211,0 0,0.7259 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145705" />
-      <path
-         id="path145707"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,600.1251 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 268.74342,596.96525 0,4.65437"
-         id="path145709"
-         inkscape:path-effect="#path-effect4612"
-         inkscape:original-d="m 268.74342,596.96525 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path145711"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 265.11387,596.79445 0.76,0 0,0.66186 -0.76,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 265.11387,600.85101 0.76,0 0,0.66186 -0.76,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145713" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 249.14383,595.81233 0,1.53723 15.54303,0"
-         id="path145715"
-         inkscape:path-effect="#path-effect4614"
-         inkscape:original-d="m 249.14383,595.81233 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 261.56972,597.34956 0,3.71495 2.73284,0"
-         id="path145717"
-         inkscape:path-effect="#path-effect4616"
-         inkscape:original-d="m 261.56972,597.34956 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 261.61242,601.06451 -12.51129,0 0,1.45182"
-         id="path145719"
-         inkscape:path-effect="#path-effect4618"
-         inkscape:original-d="m 261.61242,601.06451 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path145721"
-         style="fill:url(#linearGradient149631);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 261.91961,597.64679 3.088,0 0,3.09689 -3.088,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 265.33622,597.47765 0,3.43741"
-         id="path145723"
-         inkscape:path-effect="#path-effect4620"
-         inkscape:original-d="m 265.33622,597.47765 0,3.43741"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path145725"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 246.53905,596.46975 2.0381,0 0,5.43491 -2.0381,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path145727"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 249.3018,596.46975 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 249.27161,601.22529 1.29834,0 0,0.66428 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145729"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 246.70512,595.80549 0,6.11426"
-         id="path145731"
-         inkscape:path-effect="#path-effect4622"
-         inkscape:original-d="m 246.70512,595.80549 0,6.11426"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path145733"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 242.50062,595.86751 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61889 c -0.51707,0 -1.33379,0 -1.97015,-10e-6 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 245.16523,596.18292 2.62972,0 -0.006,0.28009 -1.24814,1.7e-4 -0.0274,5.40197 1.28102,0.0534 0,0.27299 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145735" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 242.55339,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63051 c -0.51708,0 0.40454,0 -0.23181,-10e-6 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145737" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 244.39505,596.15519 0,6.02755"
-         inkscape:path-effect="#path-effect5365"
-         id="path145739"
-         d="m 244.39505,596.15519 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="596.45782"
-         x="250.5587"
-         height="0.62769938"
-         width="12.494207"
-         id="rect145741"
-         style="fill:url(#linearGradient149633);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149635);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect145743"
-         width="12.494207"
-         height="0.62769938"
-         x="250.5587"
-         y="-601.94269" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 242.48253,603.27174 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.21291 -0.1714,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path145745" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 245.16523,603.8256 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         style="fill:url(#linearGradient149637);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145747" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,604.47983 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145749" />
-      <path
-         id="path145751"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,605.7822 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,607.14862 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145753" />
-      <path
-         id="path145755"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,608.49369 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,605.05629 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145757" />
-      <path
-         id="path145759"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,606.42271 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,607.76778 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145761" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 268.74342,604.60793 0,4.65437"
-         inkscape:path-effect="#path-effect5439"
-         id="path145763"
-         d="m 268.74342,604.60793 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 265.11387,604.43713 0.76,0 0,0.66186 -0.76,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145765" />
-      <path
-         id="path145767"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 265.11387,608.49369 0.76,0 0,0.66186 -0.76,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 249.14383,603.45501 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect5441"
-         id="path145769"
-         d="m 249.14383,603.45501 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 261.56972,604.99224 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect5443"
-         id="path145771"
-         d="m 261.56972,604.99224 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 261.61242,608.70719 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45183"
-         inkscape:path-effect="#path-effect5445"
-         id="path145773"
-         d="m 261.61242,608.70719 -12.51129,0 0,1.45183"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 261.91961,605.28947 3.088,0 0,3.0969 -3.088,0 z"
-         style="fill:url(#linearGradient149639);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path145775" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 265.33622,605.12034 0,3.4374"
-         inkscape:path-effect="#path-effect5449"
-         id="path145777"
-         d="m 265.33622,605.12034 0,3.4374"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 246.53905,604.11244 2.0381,0 0,5.4349 -2.0381,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145779" />
-      <path
-         d="m 249.3018,604.11244 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145781"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path145783"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 249.27161,608.86798 1.29834,0 0,0.66427 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 246.70512,603.44817 0,6.11427"
-         inkscape:path-effect="#path-effect5451"
-         id="path145785"
-         d="m 246.70512,603.44817 0,6.11427"
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 242.50062,603.51019 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51707,0 -1.33379,0 -1.97015,-10e-6 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145787" />
-      <path
-         id="path145789"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 245.16523,603.8256 2.62972,0 -0.006,0.28009 -1.24814,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path145791"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 242.55339,603.50492 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63051 c -0.51708,0 0.40454,0 -0.23181,0 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.23401,-0.22892 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 244.39505,603.79787 0,6.02755"
-         id="path145793"
-         inkscape:path-effect="#path-effect5453"
-         inkscape:original-d="m 244.39505,603.79787 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149641);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect145795"
-         width="12.494207"
-         height="0.62769938"
-         x="250.5587"
-         y="604.10052" />
-      <rect
-         y="-609.58539"
-         x="250.5587"
-         height="0.62769938"
-         width="12.494207"
-         id="rect145797"
-         style="fill:url(#linearGradient149643);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path145799"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 242.48253,610.90496 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.3843 l 0,6.33216 c 0,0.21291 -0.1714,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.2129 0.17141,-0.3843 0.38431,-0.3843 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path145801"
-         style="fill:url(#linearGradient149645);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 245.16523,611.45881 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91254 -0.0214,-1.4737 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path145803"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,612.11304 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,613.41541 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145805" />
-      <path
-         id="path145807"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,614.78183 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,616.1269 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145809" />
-      <path
-         id="path145811"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,612.6895 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,614.05592 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145813" />
-      <path
-         id="path145815"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,615.40099 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 268.74342,612.24115 0,4.65436"
-         id="path145817"
-         inkscape:path-effect="#path-effect5515"
-         inkscape:original-d="m 268.74342,612.24115 0,4.65436"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path145819"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 265.11387,612.07035 0.76,0 0,0.66186 -0.76,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 265.11387,616.12691 0.76,0 0,0.66186 -0.76,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145821" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 249.14383,611.08823 0,1.53722 15.54303,0"
-         id="path145823"
-         inkscape:path-effect="#path-effect5517"
-         inkscape:original-d="m 249.14383,611.08823 0,1.53722 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 261.56972,612.62545 0,3.71496 2.73284,0"
-         id="path145825"
-         inkscape:path-effect="#path-effect5519"
-         inkscape:original-d="m 261.56972,612.62545 0,3.71496 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 261.61242,616.34041 -12.51129,0 0,1.45182"
-         id="path145827"
-         inkscape:path-effect="#path-effect5521"
-         inkscape:original-d="m 261.61242,616.34041 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path145829"
-         style="fill:url(#linearGradient149647);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 261.91961,612.92269 3.088,0 0,3.09689 -3.088,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 265.33622,612.75355 0,3.4374"
-         id="path145831"
-         inkscape:path-effect="#path-effect5525"
-         inkscape:original-d="m 265.33622,612.75355 0,3.4374"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path145833"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 246.53905,611.74565 2.0381,0 0,5.43491 -2.0381,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path145835"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 249.3018,611.74565 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 249.27161,616.50119 1.29834,0 0,0.66427 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145837"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 246.70512,611.08139 0,6.11426"
-         id="path145839"
-         inkscape:path-effect="#path-effect5527"
-         inkscape:original-d="m 246.70512,611.08139 0,6.11426"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path145841"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 242.50062,611.14341 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51707,0 -1.33379,0 -1.97015,0 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 245.16523,611.45881 2.62972,0 -0.006,0.28009 -1.24814,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145843" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 242.55339,611.13814 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63052 c -0.51708,0 0.40454,0 -0.23181,-1e-5 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145845" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 244.39505,611.43109 0,6.02755"
-         inkscape:path-effect="#path-effect5529"
-         id="path145847"
-         d="m 244.39505,611.43109 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="611.7337"
-         x="250.5587"
-         height="0.62769938"
-         width="12.494207"
-         id="rect145849"
-         style="fill:url(#linearGradient149649);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149651);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect145851"
-         width="12.494207"
-         height="0.62769938"
-         x="250.5587"
-         y="-617.21863" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 213.52488,595.62906 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.2129 -0.17141,0.3843 -0.38431,0.3843 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path145853" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 216.20758,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         style="fill:url(#linearGradient149653);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145855" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,596.83714 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145857" />
-      <path
-         id="path145859"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,598.13951 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,599.50593 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145861" />
-      <path
-         id="path145863"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,600.85101 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,597.4136 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145865" />
-      <path
-         id="path145867"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,598.78003 0.98211,0 0,0.7259 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,600.1251 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145869" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 239.78577,596.96525 0,4.65437"
-         inkscape:path-effect="#path-effect5699"
-         id="path145871"
-         d="m 239.78577,596.96525 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 236.15621,596.79445 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145873" />
-      <path
-         id="path145875"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 236.15621,600.85101 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 220.18618,595.81233 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect5701"
-         id="path145877"
-         d="m 220.18618,595.81233 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 232.61207,597.34956 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect5703"
-         id="path145879"
-         d="m 232.61207,597.34956 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 232.65476,601.06451 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182"
-         inkscape:path-effect="#path-effect5705"
-         id="path145881"
-         d="m 232.65476,601.06451 -12.51128,0 0,1.45182"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 232.96196,597.64679 3.08799,0 0,3.09689 -3.08799,0 z"
-         style="fill:url(#linearGradient149655);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path145883" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 236.37857,597.47765 0,3.43741"
-         inkscape:path-effect="#path-effect5709"
-         id="path145885"
-         d="m 236.37857,597.47765 0,3.43741"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 217.5814,596.46975 2.03809,0 0,5.43491 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145887" />
-      <path
-         d="m 220.34415,596.46975 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145889"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path145891"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 220.31395,601.22529 1.29834,0 0,0.66428 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 217.74747,595.80549 0,6.11426"
-         inkscape:path-effect="#path-effect5711"
-         id="path145893"
-         d="m 217.74747,595.80549 0,6.11426"
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 213.54297,595.86751 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97015,-10e-6 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145895" />
-      <path
-         id="path145897"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 216.20758,596.18292 2.62972,0 -0.006,0.28009 -1.24815,1.7e-4 -0.0274,5.40197 1.28102,0.0534 0,0.27299 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path145899"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 213.59574,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63051 c -0.51707,0 0.40455,0 -0.2318,-10e-6 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 215.4374,596.15519 0,6.02755"
-         id="path145901"
-         inkscape:path-effect="#path-effect5713"
-         inkscape:original-d="m 215.4374,596.15519 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149657);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect145903"
-         width="12.494207"
-         height="0.62769938"
-         x="221.60103"
-         y="596.45782" />
-      <rect
-         y="-601.94269"
-         x="221.60103"
-         height="0.62769938"
-         width="12.494207"
-         id="rect145905"
-         style="fill:url(#linearGradient149659);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path145907"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 213.52488,603.27174 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.21291 -0.17141,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path145909"
-         style="fill:url(#linearGradient149661);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 216.20758,603.8256 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path145911"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,604.47983 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,605.7822 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145913" />
-      <path
-         id="path145915"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,607.14862 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,608.49369 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145917" />
-      <path
-         id="path145919"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,605.05629 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,606.42271 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145921" />
-      <path
-         id="path145923"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,607.76778 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 239.78577,604.60793 0,4.65437"
-         id="path145925"
-         inkscape:path-effect="#path-effect5721"
-         inkscape:original-d="m 239.78577,604.60793 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path145927"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 236.15621,604.43713 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 236.15621,608.49369 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145929" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 220.18618,603.45501 0,1.53723 15.54303,0"
-         id="path145931"
-         inkscape:path-effect="#path-effect5723"
-         inkscape:original-d="m 220.18618,603.45501 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 232.61207,604.99224 0,3.71495 2.73284,0"
-         id="path145933"
-         inkscape:path-effect="#path-effect5725"
-         inkscape:original-d="m 232.61207,604.99224 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 232.65476,608.70719 -12.51128,0 0,1.45183"
-         id="path145935"
-         inkscape:path-effect="#path-effect5727"
-         inkscape:original-d="m 232.65476,608.70719 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45183"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path145937"
-         style="fill:url(#linearGradient149663);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 232.96196,605.28947 3.08799,0 0,3.0969 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 236.37857,605.12034 0,3.4374"
-         id="path145939"
-         inkscape:path-effect="#path-effect5731"
-         inkscape:original-d="m 236.37857,605.12034 0,3.4374"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path145941"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 217.5814,604.11244 2.03809,0 0,5.4349 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path145943"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 220.34415,604.11244 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 220.31395,608.86798 1.29834,0 0,0.66427 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145945"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 217.74747,603.44817 0,6.11427"
-         id="path145947"
-         inkscape:path-effect="#path-effect5733"
-         inkscape:original-d="m 217.74747,603.44817 0,6.11427"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path145949"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 213.54297,603.51019 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51708,0 -1.3338,0 -1.97015,-10e-6 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 216.20758,603.8256 2.62972,0 -0.006,0.28009 -1.24815,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145951" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 213.59574,603.50492 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63051 c -0.51707,0 0.40455,0 -0.2318,0 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.23401,-0.22892 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145953" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 215.4374,603.79787 0,6.02755"
-         inkscape:path-effect="#path-effect5735"
-         id="path145955"
-         d="m 215.4374,603.79787 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="604.10052"
-         x="221.60103"
-         height="0.62769938"
-         width="12.494207"
-         id="rect145957"
-         style="fill:url(#linearGradient149665);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149667);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect145959"
-         width="12.494207"
-         height="0.62769938"
-         x="221.60103"
-         y="-609.58539" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 213.52488,610.90496 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.3843 l 0,6.33216 c 0,0.21291 -0.17141,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.2129 0.17141,-0.3843 0.38431,-0.3843 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path145961" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 216.20758,611.45881 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.4737 -2.02336,-0.0139 0.0105,2.05368 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         style="fill:url(#linearGradient149669);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145963" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,612.11304 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145965" />
-      <path
-         id="path145967"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,613.41541 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,614.78183 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145969" />
-      <path
-         id="path145971"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,616.1269 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,612.6895 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145973" />
-      <path
-         id="path145975"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,614.05592 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,615.40099 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145977" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 239.78577,612.24115 0,4.65436"
-         inkscape:path-effect="#path-effect5743"
-         id="path145979"
-         d="m 239.78577,612.24115 0,4.65436"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 236.15621,612.07035 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145981" />
-      <path
-         id="path145983"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 236.15621,616.12691 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 220.18618,611.08823 0,1.53722 15.54303,0"
-         inkscape:path-effect="#path-effect5745"
-         id="path145985"
-         d="m 220.18618,611.08823 0,1.53722 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 232.61207,612.62545 0,3.71496 2.73284,0"
-         inkscape:path-effect="#path-effect5747"
-         id="path145987"
-         d="m 232.61207,612.62545 0,3.71496 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 232.65476,616.34041 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182"
-         inkscape:path-effect="#path-effect5749"
-         id="path145989"
-         d="m 232.65476,616.34041 -12.51128,0 0,1.45182"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 232.96196,612.92269 3.08799,0 0,3.09689 -3.08799,0 z"
-         style="fill:url(#linearGradient149671);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path145991" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 236.37857,612.75355 0,3.4374"
-         inkscape:path-effect="#path-effect5753"
-         id="path145993"
-         d="m 236.37857,612.75355 0,3.4374"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 217.5814,611.74565 2.03809,0 0,5.43491 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145995" />
-      <path
-         d="m 220.34415,611.74565 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path145997"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path145999"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 220.31395,616.50119 1.29834,0 0,0.66427 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 217.74747,611.08139 0,6.11426"
-         inkscape:path-effect="#path-effect5755"
-         id="path146001"
-         d="m 217.74747,611.08139 0,6.11426"
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 213.54297,611.14341 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51708,0 -1.3338,0 -1.97015,0 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146003" />
-      <path
-         id="path146005"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 216.20758,611.45881 2.62972,0 -0.006,0.28009 -1.24815,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path146007"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 213.59574,611.13814 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63052 c -0.51707,0 0.40455,0 -0.2318,-1e-5 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 215.4374,611.43109 0,6.02755"
-         id="path146009"
-         inkscape:path-effect="#path-effect5757"
-         inkscape:original-d="m 215.4374,611.43109 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149673);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect146011"
-         width="12.494207"
-         height="0.62769938"
-         x="221.60103"
-         y="611.7337" />
-      <rect
-         y="-617.21863"
-         x="221.60103"
-         height="0.62769938"
-         width="12.494207"
-         id="rect146013"
-         style="fill:url(#linearGradient149675);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path146015"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 271.46279,595.62906 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.3843,0.3843 l -27.52056,0 c -0.21291,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path146017"
-         style="fill:url(#linearGradient149677);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 274.14549,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path146019"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,596.83714 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,598.13951 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146021" />
-      <path
-         id="path146023"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,599.50593 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,600.85101 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146025" />
-      <path
-         id="path146027"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,597.4136 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,598.78003 0.98212,0 0,0.7259 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146029" />
-      <path
-         id="path146031"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,600.1251 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 297.72368,596.96525 0,4.65437"
-         id="path146033"
-         inkscape:path-effect="#path-effect6155"
-         inkscape:original-d="m 297.72368,596.96525 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path146035"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 294.09412,596.79445 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 294.09412,600.85101 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146037" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 278.12409,595.81233 0,1.53723 15.54303,0"
-         id="path146039"
-         inkscape:path-effect="#path-effect6157"
-         inkscape:original-d="m 278.12409,595.81233 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 290.54997,597.34956 0,3.71495 2.73284,0"
-         id="path146041"
-         inkscape:path-effect="#path-effect6159"
-         inkscape:original-d="m 290.54997,597.34956 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 290.59267,601.06451 -12.51128,0 0,1.45182"
-         id="path146043"
-         inkscape:path-effect="#path-effect6161"
-         inkscape:original-d="m 290.59267,601.06451 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path146045"
-         style="fill:url(#linearGradient149679);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 290.89987,597.64679 3.08799,0 0,3.09689 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 294.31647,597.47765 0,3.43741"
-         id="path146047"
-         inkscape:path-effect="#path-effect6165"
-         inkscape:original-d="m 294.31647,597.47765 0,3.43741"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path146049"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 275.51931,596.46975 2.03809,0 0,5.43491 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path146051"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 278.28206,596.46975 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 278.25186,601.22529 1.29834,0 0,0.66428 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146053"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 275.68538,595.80549 0,6.11426"
-         id="path146055"
-         inkscape:path-effect="#path-effect6167"
-         inkscape:original-d="m 275.68538,595.80549 0,6.11426"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path146057"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 271.48087,595.86751 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 275.52045,596.18292 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146059" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 271.53365,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146061" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 273.22586,596.15519 0,6.02755"
-         inkscape:path-effect="#path-effect6169"
-         id="path146063"
-         d="m 273.22586,596.15519 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="596.45782"
-         x="279.53894"
-         height="0.62769938"
-         width="12.494207"
-         id="rect146065"
-         style="fill:url(#linearGradient149681);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149683);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect146067"
-         width="12.494207"
-         height="0.62769938"
-         x="279.53894"
-         y="-601.94269" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 271.46279,603.2758 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path146069" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 274.14549,603.82966 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:url(#linearGradient149685);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146071" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,604.48388 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146073" />
-      <path
-         id="path146075"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,605.78626 0.98211,0 0,0.7259 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,607.15268 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146077" />
-      <path
-         id="path146079"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,608.49775 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,605.06035 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146081" />
-      <path
-         id="path146083"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,606.42677 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,607.77184 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146085" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 297.72368,604.61199 0,4.65437"
-         inkscape:path-effect="#path-effect6353"
-         id="path146087"
-         d="m 297.72368,604.61199 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 294.09412,604.44119 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146089" />
-      <path
-         id="path146091"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 294.09412,608.49775 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 278.12409,603.45907 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect6355"
-         id="path146093"
-         d="m 278.12409,603.45907 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 290.54997,604.9963 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect6357"
-         id="path146095"
-         d="m 290.54997,604.9963 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 290.59267,608.71125 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182"
-         inkscape:path-effect="#path-effect6359"
-         id="path146097"
-         d="m 290.59267,608.71125 -12.51128,0 0,1.45182"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 290.89987,605.29353 3.08799,0 0,3.0969 -3.08799,0 z"
-         style="fill:url(#linearGradient149687);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path146099" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 294.31647,605.1244 0,3.4374"
-         inkscape:path-effect="#path-effect6363"
-         id="path146101"
-         d="m 294.31647,605.1244 0,3.4374"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 275.51931,604.11649 2.03809,0 0,5.43491 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146103" />
-      <path
-         d="m 278.28206,604.11649 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146105"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path146107"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 278.25186,608.87204 1.29834,0 0,0.66427 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 275.68538,603.45223 0,6.11427"
-         inkscape:path-effect="#path-effect6365"
-         id="path146109"
-         d="m 275.68538,603.45223 0,6.11427"
-         style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 271.48087,603.51425 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146111" />
-      <path
-         id="path146113"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 275.52045,603.82966 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path146115"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 271.53365,603.50898 c 0.0816,-0.003 0.14905,-0.002 0.17896,0.001 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22892 l 0,-6.17358 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 273.22586,603.80193 0,6.02755"
-         id="path146117"
-         inkscape:path-effect="#path-effect6367"
-         inkscape:original-d="m 273.22586,603.80193 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149689);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect146119"
-         width="12.494207"
-         height="0.62769938"
-         x="279.53894"
-         y="604.10455" />
-      <rect
-         y="-609.58942"
-         x="279.53894"
-         height="0.62769938"
-         width="12.494207"
-         id="rect146121"
-         style="fill:url(#linearGradient149691);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path146123"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 271.46279,610.9151 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path146125"
-         style="fill:url(#linearGradient149693);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 274.14549,611.46896 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35717 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path146127"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,612.12319 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,613.42556 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146129" />
-      <path
-         id="path146131"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,614.79198 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,616.13705 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146133" />
-      <path
-         id="path146135"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,612.69965 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,614.06607 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146137" />
-      <path
-         id="path146139"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,615.41114 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 297.72368,612.25129 0,4.65437"
-         id="path146141"
-         inkscape:path-effect="#path-effect6431"
-         inkscape:original-d="m 297.72368,612.25129 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path146143"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 294.09412,612.08049 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 294.09412,616.13705 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146145" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 278.12409,611.09837 0,1.53723 15.54303,0"
-         id="path146147"
-         inkscape:path-effect="#path-effect6433"
-         inkscape:original-d="m 278.12409,611.09837 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 290.54997,612.6356 0,3.71495 2.73284,0"
-         id="path146149"
-         inkscape:path-effect="#path-effect6435"
-         inkscape:original-d="m 290.54997,612.6356 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 290.59267,616.35055 -12.51128,0 0,1.45183"
-         id="path146151"
-         inkscape:path-effect="#path-effect6437"
-         inkscape:original-d="m 290.59267,616.35055 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45183"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path146153"
-         style="fill:url(#linearGradient149695);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 290.89987,612.93283 3.08799,0 0,3.0969 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 294.31647,612.7637 0,3.4374"
-         id="path146155"
-         inkscape:path-effect="#path-effect6441"
-         inkscape:original-d="m 294.31647,612.7637 0,3.4374"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path146157"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 275.51931,611.7558 2.03809,0 0,5.4349 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path146159"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 278.28206,611.7558 1.29834,0 0,0.70955 -1.29834,0 z" />
-      <path
-         d="m 278.25186,616.51134 1.29834,0 0,0.66427 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146161"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 275.68538,611.09153 0,6.11427"
-         id="path146163"
-         inkscape:path-effect="#path-effect6443"
-         inkscape:original-d="m 275.68538,611.09153 0,6.11427"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path146165"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 271.48087,611.15355 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 275.52045,611.46896 -2.52638,0 0.005,0.28009 1.1991,1.8e-4 0.0263,5.40196 -1.23068,0.0534 0,0.27298 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146167" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 271.53365,611.14828 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,0 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.234,-0.22892 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146169" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 273.22586,611.44123 0,6.02755"
-         inkscape:path-effect="#path-effect6445"
-         id="path146171"
-         d="m 273.22586,611.44123 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="611.74384"
-         x="279.53894"
-         height="0.62769938"
-         width="12.494207"
-         id="rect146173"
-         style="fill:url(#linearGradient149697);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149699);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect146175"
-         width="12.494207"
-         height="0.62769938"
-         x="279.53894"
-         y="-617.22876" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 300.38668,595.62906 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.3843,0.3843 l -27.52056,0 c -0.21291,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path146177" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 303.06938,596.18292 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:url(#linearGradient149701);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146179" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,596.83714 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146181" />
-      <path
-         id="path146183"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,598.13951 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,599.50593 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146185" />
-      <path
-         id="path146187"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,600.85101 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,597.4136 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146189" />
-      <path
-         id="path146191"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,598.78003 0.98212,0 0,0.7259 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,600.1251 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146193" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 326.64757,596.96525 0,4.65437"
-         inkscape:path-effect="#path-effect6615"
-         id="path146195"
-         d="m 326.64757,596.96525 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 323.01801,596.79445 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146197" />
-      <path
-         id="path146199"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 323.01801,600.85101 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 307.04798,595.81233 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect6617"
-         id="path146201"
-         d="m 307.04798,595.81233 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 319.47386,597.34956 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect6619"
-         id="path146203"
-         d="m 319.47386,597.34956 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 319.51656,601.06451 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45182"
-         inkscape:path-effect="#path-effect6621"
-         id="path146205"
-         d="m 319.51656,601.06451 -12.51128,0 0,1.45182"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 319.82376,597.64679 3.08799,0 0,3.09689 -3.08799,0 z"
-         style="fill:url(#linearGradient149703);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path146207" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 323.24036,597.47765 0,3.43741"
-         inkscape:path-effect="#path-effect6625"
-         id="path146209"
-         d="m 323.24036,597.47765 0,3.43741"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 304.4432,596.46975 2.03809,0 0,5.43491 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146211" />
-      <path
-         d="m 307.20595,596.46975 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146213"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path146215"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 307.17575,601.22529 1.29834,0 0,0.66428 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 304.60927,595.80549 0,6.11426"
-         inkscape:path-effect="#path-effect6627"
-         id="path146217"
-         d="m 304.60927,595.80549 0,6.11426"
-         style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 300.40476,595.86751 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146219" />
-      <path
-         id="path146221"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 304.44434,596.18292 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path146223"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 300.45754,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 302.14975,596.15519 0,6.02755"
-         id="path146225"
-         inkscape:path-effect="#path-effect6629"
-         inkscape:original-d="m 302.14975,596.15519 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149705);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect146227"
-         width="12.494207"
-         height="0.62769938"
-         x="308.46283"
-         y="596.45782" />
-      <rect
-         y="-601.94269"
-         x="308.46283"
-         height="0.62769938"
-         width="12.494207"
-         id="rect146229"
-         style="fill:url(#linearGradient149707);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path146231"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 300.38668,603.2758 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path146233"
-         style="fill:url(#linearGradient149709);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 303.06938,603.82966 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path146235"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,604.48388 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,605.78626 0.98211,0 0,0.7259 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146237" />
-      <path
-         id="path146239"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,607.15268 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,608.49775 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146241" />
-      <path
-         id="path146243"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,605.06035 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,606.42677 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146245" />
-      <path
-         id="path146247"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,607.77184 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 326.64757,604.61199 0,4.65437"
-         id="path146249"
-         inkscape:path-effect="#path-effect6637"
-         inkscape:original-d="m 326.64757,604.61199 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path146251"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 323.01801,604.44119 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 323.01801,608.49775 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146253" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 307.04798,603.45907 0,1.53723 15.54303,0"
-         id="path146255"
-         inkscape:path-effect="#path-effect6639"
-         inkscape:original-d="m 307.04798,603.45907 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 319.47386,604.9963 0,3.71495 2.73284,0"
-         id="path146257"
-         inkscape:path-effect="#path-effect6641"
-         inkscape:original-d="m 319.47386,604.9963 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 319.51656,608.71125 -12.51128,0 0,1.45182"
-         id="path146259"
-         inkscape:path-effect="#path-effect6643"
-         inkscape:original-d="m 319.51656,608.71125 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path146261"
-         style="fill:url(#linearGradient149711);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 319.82376,605.29353 3.08799,0 0,3.0969 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 323.24036,605.1244 0,3.4374"
-         id="path146263"
-         inkscape:path-effect="#path-effect6647"
-         inkscape:original-d="m 323.24036,605.1244 0,3.4374"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path146265"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 304.4432,604.11649 2.03809,0 0,5.43491 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path146267"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 307.20595,604.11649 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 307.17575,608.87204 1.29834,0 0,0.66427 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146269"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 304.60927,603.45223 0,6.11427"
-         id="path146271"
-         inkscape:path-effect="#path-effect6649"
-         inkscape:original-d="m 304.60927,603.45223 0,6.11427"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path146273"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 300.40476,603.51425 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 304.44434,603.82966 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146275" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 300.45754,603.50898 c 0.0816,-0.003 0.14905,-0.002 0.17896,0.001 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22892 l 0,-6.17358 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146277" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 302.14975,603.80193 0,6.02755"
-         inkscape:path-effect="#path-effect6651"
-         id="path146279"
-         d="m 302.14975,603.80193 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="604.10455"
-         x="308.46283"
-         height="0.62769938"
-         width="12.494207"
-         id="rect146281"
-         style="fill:url(#linearGradient149713);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149715);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect146283"
-         width="12.494207"
-         height="0.62769938"
-         x="308.46283"
-         y="-609.58942" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 300.38668,610.9151 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path146285" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 303.06938,611.46896 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35717 -0.6861,-0.0318 z"
-         style="fill:url(#linearGradient149717);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146287" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,612.12319 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146289" />
-      <path
-         id="path146291"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,613.42556 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,614.79198 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146293" />
-      <path
-         id="path146295"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,616.13705 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,612.69965 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146297" />
-      <path
-         id="path146299"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,614.06607 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,615.41114 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146301" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 326.64757,612.25129 0,4.65437"
-         inkscape:path-effect="#path-effect6659"
-         id="path146303"
-         d="m 326.64757,612.25129 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 323.01801,612.08049 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146305" />
-      <path
-         id="path146307"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 323.01801,616.13705 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 307.04798,611.09837 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect6661"
-         id="path146309"
-         d="m 307.04798,611.09837 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 319.47386,612.6356 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect6663"
-         id="path146311"
-         d="m 319.47386,612.6356 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 319.51656,616.35055 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45183"
-         inkscape:path-effect="#path-effect6665"
-         id="path146313"
-         d="m 319.51656,616.35055 -12.51128,0 0,1.45183"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 319.82376,612.93283 3.08799,0 0,3.0969 -3.08799,0 z"
-         style="fill:url(#linearGradient149719);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path146315" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 323.24036,612.7637 0,3.4374"
-         inkscape:path-effect="#path-effect6669"
-         id="path146317"
-         d="m 323.24036,612.7637 0,3.4374"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 304.4432,611.7558 2.03809,0 0,5.4349 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146319" />
-      <path
-         d="m 307.20595,611.7558 1.29834,0 0,0.70955 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146321"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path146323"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 307.17575,616.51134 1.29834,0 0,0.66427 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 304.60927,611.09153 0,6.11427"
-         inkscape:path-effect="#path-effect6671"
-         id="path146325"
-         d="m 304.60927,611.09153 0,6.11427"
-         style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 300.40476,611.15355 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146327" />
-      <path
-         id="path146329"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 304.44434,611.46896 -2.52638,0 0.005,0.28009 1.1991,1.8e-4 0.0263,5.40196 -1.23068,0.0534 0,0.27298 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path146331"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 300.45754,611.14828 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,0 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.234,-0.22892 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 302.14975,611.44123 0,6.02755"
-         id="path146333"
-         inkscape:path-effect="#path-effect6673"
-         inkscape:original-d="m 302.14975,611.44123 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149721);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect146335"
-         width="12.494207"
-         height="0.62769938"
-         x="308.46283"
-         y="611.74384" />
-      <rect
-         y="-617.22876"
-         x="308.46283"
-         height="0.62769938"
-         width="12.494207"
-         id="rect146337"
-         style="fill:url(#linearGradient149723);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 208.97198,595.36143 4.50938,0 -1.49896,0.0375 0,23.30535 -5.29061,0 0,-23.29041 c -0.0138,0.003 1.34269,-0.0525 1.34269,-0.0525 z"
-         style="fill:url(#radialGradient149725);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.33817181"
-         id="path146339" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 208.54462,605.30753 1.42666,0 0,3.38172 -1.42666,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient149727);stroke-width:0.33817181;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path146341" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 209.37948,605.44491 0,3.11753"
-         inkscape:path-effect="#path-effect6689"
-         id="path146343"
-         d="m 209.37948,605.44491 0,3.11753"
-         style="fill:none;stroke:#000000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         d="m 333.01057,595.36143 -5.44664,0 1.49889,0.0977 0,23.36729 5.29037,0 c 0,-7.7841 0,-35.35982 0,-23.46502 0.0138,0.003 -1.34262,10e-6 -1.34262,0 z"
-         style="fill:url(#radialGradient149729);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.33861357"
-         id="path146345" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 332.68665,610.08476 0.89672,0 0,1.07605 -0.89672,0 z m 0,-1.49452 0.89672,0 0,1.07605 -0.89672,0 z m 0,-1.49453 0.89672,0 0,1.07606 -0.89672,0 z m -1.28529,2.98905 0.89671,0 0,1.07605 -0.89671,0 z m 0,-1.49452 0.89671,0 0,1.07605 -0.89671,0 z m 0,-1.49453 0.89671,0 0,1.07606 -0.89671,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146347" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 331.40136,613.33966 0.89671,0 0,1.07606 -0.89671,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146349" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 333.17456,614.72682 0.62436,0 0,3.04354 -0.62436,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146351" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path146353"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 332.06458,614.72682 0.62436,0 0,3.04354 -0.62436,0 z" />
-      <path
-         id="path146355"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 330.95459,614.72682 0.62437,0 0,3.04354 -0.62437,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 329.84461,614.72682 0.62437,0 0,3.04354 -0.62437,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146357"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path146359"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 333.86077,598.52056 0,0.62437 -4.2535,0 0,-0.62437 z" />
-      <path
-         d="m 333.86077,599.40826 0,0.62437 -4.2535,0 0,-0.62437 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path146361"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path146363"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 331.40136,597.5724 0.89671,0 0,0.69561 -0.89671,0 z" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-376.00865,-580.42452)">
+    <g style="display:inline" transform="translate(169.4774,-14.731727)" id="g145685">
+      <rect ry="0" y="595.39062" x="211.99065" height="23.370089" width="117.4845" id="rect145687" style="fill:url(#linearGradient149625);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 211.99064,595.39064 117.48452,0 0,22.6865 -117.48452,0 z" style="fill:url(#linearGradient149627);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145689"/>
+      <path id="path145691" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 242.48253,595.62906 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.38431,0.3843 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path145693" style="fill:url(#linearGradient149629);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 245.16523,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path145695" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,596.83714 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,598.13951 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145697"/>
+      <path id="path145699" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,599.50593 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,600.85101 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145701"/>
+      <path id="path145703" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,597.4136 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,598.78003 0.98211,0 0,0.7259 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145705"/>
+      <path id="path145707" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,600.1251 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 268.74342,596.96525 0,4.65437" id="path145709" inkscape:path-effect="#path-effect4612" inkscape:original-d="m 268.74342,596.96525 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path145711" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 265.11387,596.79445 0.76,0 0,0.66186 -0.76,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 265.11387,600.85101 0.76,0 0,0.66186 -0.76,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145713"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 249.14383,595.81233 0,1.53723 15.54303,0" id="path145715" inkscape:path-effect="#path-effect4614" inkscape:original-d="m 249.14383,595.81233 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 261.56972,597.34956 0,3.71495 2.73284,0" id="path145717" inkscape:path-effect="#path-effect4616" inkscape:original-d="m 261.56972,597.34956 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 261.61242,601.06451 -12.51129,0 0,1.45182" id="path145719" inkscape:path-effect="#path-effect4618" inkscape:original-d="m 261.61242,601.06451 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path145721" style="fill:url(#linearGradient149631);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 261.91961,597.64679 3.088,0 0,3.09689 -3.088,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 265.33622,597.47765 0,3.43741" id="path145723" inkscape:path-effect="#path-effect4620" inkscape:original-d="m 265.33622,597.47765 0,3.43741" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path145725" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 246.53905,596.46975 2.0381,0 0,5.43491 -2.0381,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path145727" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 249.3018,596.46975 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 249.27161,601.22529 1.29834,0 0,0.66428 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145729" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 246.70512,595.80549 0,6.11426" id="path145731" inkscape:path-effect="#path-effect4622" inkscape:original-d="m 246.70512,595.80549 0,6.11426" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path145733" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 242.50062,595.86751 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61889 c -0.51707,0 -1.33379,0 -1.97015,-10e-6 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 245.16523,596.18292 2.62972,0 -0.006,0.28009 -1.24814,1.7e-4 -0.0274,5.40197 1.28102,0.0534 0,0.27299 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145735"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 242.55339,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63051 c -0.51708,0 0.40454,0 -0.23181,-10e-6 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145737"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 244.39505,596.15519 0,6.02755" inkscape:path-effect="#path-effect5365" id="path145739" d="m 244.39505,596.15519 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="596.45782" x="250.5587" height="0.62769938" width="12.494207" id="rect145741" style="fill:url(#linearGradient149633);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149635);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect145743" width="12.494207" height="0.62769938" x="250.5587" y="-601.94269"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 242.48253,603.27174 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.21291 -0.1714,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path145745"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 245.16523,603.8256 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" style="fill:url(#linearGradient149637);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145747"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,604.47983 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145749"/>
+      <path id="path145751" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,605.7822 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,607.14862 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145753"/>
+      <path id="path145755" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,608.49369 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,605.05629 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145757"/>
+      <path id="path145759" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,606.42271 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,607.76778 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145761"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 268.74342,604.60793 0,4.65437" inkscape:path-effect="#path-effect5439" id="path145763" d="m 268.74342,604.60793 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 265.11387,604.43713 0.76,0 0,0.66186 -0.76,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145765"/>
+      <path id="path145767" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 265.11387,608.49369 0.76,0 0,0.66186 -0.76,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 249.14383,603.45501 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect5441" id="path145769" d="m 249.14383,603.45501 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 261.56972,604.99224 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect5443" id="path145771" d="m 261.56972,604.99224 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 261.61242,608.70719 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45183" inkscape:path-effect="#path-effect5445" id="path145773" d="m 261.61242,608.70719 -12.51129,0 0,1.45183" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 261.91961,605.28947 3.088,0 0,3.0969 -3.088,0 z" style="fill:url(#linearGradient149639);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path145775"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 265.33622,605.12034 0,3.4374" inkscape:path-effect="#path-effect5449" id="path145777" d="m 265.33622,605.12034 0,3.4374" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 246.53905,604.11244 2.0381,0 0,5.4349 -2.0381,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145779"/>
+      <path d="m 249.3018,604.11244 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145781" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path145783" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 249.27161,608.86798 1.29834,0 0,0.66427 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 246.70512,603.44817 0,6.11427" inkscape:path-effect="#path-effect5451" id="path145785" d="m 246.70512,603.44817 0,6.11427" style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 242.50062,603.51019 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51707,0 -1.33379,0 -1.97015,-10e-6 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145787"/>
+      <path id="path145789" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 245.16523,603.8256 2.62972,0 -0.006,0.28009 -1.24814,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path145791" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 242.55339,603.50492 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63051 c -0.51708,0 0.40454,0 -0.23181,0 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.23401,-0.22892 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 244.39505,603.79787 0,6.02755" id="path145793" inkscape:path-effect="#path-effect5453" inkscape:original-d="m 244.39505,603.79787 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149641);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect145795" width="12.494207" height="0.62769938" x="250.5587" y="604.10052"/>
+      <rect y="-609.58539" x="250.5587" height="0.62769938" width="12.494207" id="rect145797" style="fill:url(#linearGradient149643);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path145799" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 242.48253,610.90496 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.3843 l 0,6.33216 c 0,0.21291 -0.1714,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.2129 0.17141,-0.3843 0.38431,-0.3843 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path145801" style="fill:url(#linearGradient149645);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 245.16523,611.45881 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91254 -0.0214,-1.4737 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path145803" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,612.11304 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,613.41541 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145805"/>
+      <path id="path145807" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,614.78183 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,616.1269 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145809"/>
+      <path id="path145811" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,612.6895 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,614.05592 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145813"/>
+      <path id="path145815" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,615.40099 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 268.74342,612.24115 0,4.65436" id="path145817" inkscape:path-effect="#path-effect5515" inkscape:original-d="m 268.74342,612.24115 0,4.65436" inkscape:connector-curvature="0"/>
+      <path id="path145819" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 265.11387,612.07035 0.76,0 0,0.66186 -0.76,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 265.11387,616.12691 0.76,0 0,0.66186 -0.76,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145821"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 249.14383,611.08823 0,1.53722 15.54303,0" id="path145823" inkscape:path-effect="#path-effect5517" inkscape:original-d="m 249.14383,611.08823 0,1.53722 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 261.56972,612.62545 0,3.71496 2.73284,0" id="path145825" inkscape:path-effect="#path-effect5519" inkscape:original-d="m 261.56972,612.62545 0,3.71496 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 261.61242,616.34041 -12.51129,0 0,1.45182" id="path145827" inkscape:path-effect="#path-effect5521" inkscape:original-d="m 261.61242,616.34041 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path145829" style="fill:url(#linearGradient149647);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 261.91961,612.92269 3.088,0 0,3.09689 -3.088,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 265.33622,612.75355 0,3.4374" id="path145831" inkscape:path-effect="#path-effect5525" inkscape:original-d="m 265.33622,612.75355 0,3.4374" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path145833" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 246.53905,611.74565 2.0381,0 0,5.43491 -2.0381,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path145835" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 249.3018,611.74565 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 249.27161,616.50119 1.29834,0 0,0.66427 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145837" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 246.70512,611.08139 0,6.11426" id="path145839" inkscape:path-effect="#path-effect5527" inkscape:original-d="m 246.70512,611.08139 0,6.11426" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path145841" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 242.50062,611.14341 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51707,0 -1.33379,0 -1.97015,0 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 245.16523,611.45881 2.62972,0 -0.006,0.28009 -1.24814,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145843"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 242.55339,611.13814 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63052 c -0.51708,0 0.40454,0 -0.23181,-1e-5 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145845"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 244.39505,611.43109 0,6.02755" inkscape:path-effect="#path-effect5529" id="path145847" d="m 244.39505,611.43109 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="611.7337" x="250.5587" height="0.62769938" width="12.494207" id="rect145849" style="fill:url(#linearGradient149649);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149651);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect145851" width="12.494207" height="0.62769938" x="250.5587" y="-617.21863"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 213.52488,595.62906 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.2129 -0.17141,0.3843 -0.38431,0.3843 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path145853"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 216.20758,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" style="fill:url(#linearGradient149653);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145855"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,596.83714 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145857"/>
+      <path id="path145859" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,598.13951 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,599.50593 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145861"/>
+      <path id="path145863" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,600.85101 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,597.4136 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145865"/>
+      <path id="path145867" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,598.78003 0.98211,0 0,0.7259 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,600.1251 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145869"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 239.78577,596.96525 0,4.65437" inkscape:path-effect="#path-effect5699" id="path145871" d="m 239.78577,596.96525 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 236.15621,596.79445 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145873"/>
+      <path id="path145875" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 236.15621,600.85101 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 220.18618,595.81233 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect5701" id="path145877" d="m 220.18618,595.81233 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 232.61207,597.34956 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect5703" id="path145879" d="m 232.61207,597.34956 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 232.65476,601.06451 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182" inkscape:path-effect="#path-effect5705" id="path145881" d="m 232.65476,601.06451 -12.51128,0 0,1.45182" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 232.96196,597.64679 3.08799,0 0,3.09689 -3.08799,0 z" style="fill:url(#linearGradient149655);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path145883"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 236.37857,597.47765 0,3.43741" inkscape:path-effect="#path-effect5709" id="path145885" d="m 236.37857,597.47765 0,3.43741" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 217.5814,596.46975 2.03809,0 0,5.43491 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145887"/>
+      <path d="m 220.34415,596.46975 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145889" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path145891" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 220.31395,601.22529 1.29834,0 0,0.66428 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 217.74747,595.80549 0,6.11426" inkscape:path-effect="#path-effect5711" id="path145893" d="m 217.74747,595.80549 0,6.11426" style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 213.54297,595.86751 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97015,-10e-6 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145895"/>
+      <path id="path145897" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 216.20758,596.18292 2.62972,0 -0.006,0.28009 -1.24815,1.7e-4 -0.0274,5.40197 1.28102,0.0534 0,0.27299 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path145899" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 213.59574,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63051 c -0.51707,0 0.40455,0 -0.2318,-10e-6 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 215.4374,596.15519 0,6.02755" id="path145901" inkscape:path-effect="#path-effect5713" inkscape:original-d="m 215.4374,596.15519 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149657);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect145903" width="12.494207" height="0.62769938" x="221.60103" y="596.45782"/>
+      <rect y="-601.94269" x="221.60103" height="0.62769938" width="12.494207" id="rect145905" style="fill:url(#linearGradient149659);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path145907" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 213.52488,603.27174 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.21291 -0.17141,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path145909" style="fill:url(#linearGradient149661);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 216.20758,603.8256 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path145911" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,604.47983 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,605.7822 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145913"/>
+      <path id="path145915" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,607.14862 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,608.49369 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145917"/>
+      <path id="path145919" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,605.05629 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,606.42271 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145921"/>
+      <path id="path145923" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,607.76778 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 239.78577,604.60793 0,4.65437" id="path145925" inkscape:path-effect="#path-effect5721" inkscape:original-d="m 239.78577,604.60793 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path145927" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 236.15621,604.43713 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 236.15621,608.49369 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145929"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 220.18618,603.45501 0,1.53723 15.54303,0" id="path145931" inkscape:path-effect="#path-effect5723" inkscape:original-d="m 220.18618,603.45501 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 232.61207,604.99224 0,3.71495 2.73284,0" id="path145933" inkscape:path-effect="#path-effect5725" inkscape:original-d="m 232.61207,604.99224 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 232.65476,608.70719 -12.51128,0 0,1.45183" id="path145935" inkscape:path-effect="#path-effect5727" inkscape:original-d="m 232.65476,608.70719 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45183" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path145937" style="fill:url(#linearGradient149663);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 232.96196,605.28947 3.08799,0 0,3.0969 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 236.37857,605.12034 0,3.4374" id="path145939" inkscape:path-effect="#path-effect5731" inkscape:original-d="m 236.37857,605.12034 0,3.4374" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path145941" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 217.5814,604.11244 2.03809,0 0,5.4349 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path145943" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 220.34415,604.11244 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 220.31395,608.86798 1.29834,0 0,0.66427 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145945" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 217.74747,603.44817 0,6.11427" id="path145947" inkscape:path-effect="#path-effect5733" inkscape:original-d="m 217.74747,603.44817 0,6.11427" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path145949" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 213.54297,603.51019 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51708,0 -1.3338,0 -1.97015,-10e-6 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 216.20758,603.8256 2.62972,0 -0.006,0.28009 -1.24815,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145951"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 213.59574,603.50492 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63051 c -0.51707,0 0.40455,0 -0.2318,0 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.23401,-0.22892 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145953"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 215.4374,603.79787 0,6.02755" inkscape:path-effect="#path-effect5735" id="path145955" d="m 215.4374,603.79787 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="604.10052" x="221.60103" height="0.62769938" width="12.494207" id="rect145957" style="fill:url(#linearGradient149665);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149667);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect145959" width="12.494207" height="0.62769938" x="221.60103" y="-609.58539"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 213.52488,610.90496 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.3843 l 0,6.33216 c 0,0.21291 -0.17141,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.2129 0.17141,-0.3843 0.38431,-0.3843 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path145961"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 216.20758,611.45881 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.4737 -2.02336,-0.0139 0.0105,2.05368 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" style="fill:url(#linearGradient149669);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145963"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,612.11304 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145965"/>
+      <path id="path145967" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,613.41541 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,614.78183 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145969"/>
+      <path id="path145971" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,616.1269 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,612.6895 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145973"/>
+      <path id="path145975" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,614.05592 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,615.40099 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145977"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 239.78577,612.24115 0,4.65436" inkscape:path-effect="#path-effect5743" id="path145979" d="m 239.78577,612.24115 0,4.65436" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 236.15621,612.07035 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145981"/>
+      <path id="path145983" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 236.15621,616.12691 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 220.18618,611.08823 0,1.53722 15.54303,0" inkscape:path-effect="#path-effect5745" id="path145985" d="m 220.18618,611.08823 0,1.53722 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 232.61207,612.62545 0,3.71496 2.73284,0" inkscape:path-effect="#path-effect5747" id="path145987" d="m 232.61207,612.62545 0,3.71496 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 232.65476,616.34041 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182" inkscape:path-effect="#path-effect5749" id="path145989" d="m 232.65476,616.34041 -12.51128,0 0,1.45182" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 232.96196,612.92269 3.08799,0 0,3.09689 -3.08799,0 z" style="fill:url(#linearGradient149671);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path145991"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 236.37857,612.75355 0,3.4374" inkscape:path-effect="#path-effect5753" id="path145993" d="m 236.37857,612.75355 0,3.4374" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 217.5814,611.74565 2.03809,0 0,5.43491 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145995"/>
+      <path d="m 220.34415,611.74565 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path145997" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path145999" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 220.31395,616.50119 1.29834,0 0,0.66427 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 217.74747,611.08139 0,6.11426" inkscape:path-effect="#path-effect5755" id="path146001" d="m 217.74747,611.08139 0,6.11426" style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 213.54297,611.14341 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51708,0 -1.3338,0 -1.97015,0 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146003"/>
+      <path id="path146005" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 216.20758,611.45881 2.62972,0 -0.006,0.28009 -1.24815,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path146007" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 213.59574,611.13814 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63052 c -0.51707,0 0.40455,0 -0.2318,-1e-5 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 215.4374,611.43109 0,6.02755" id="path146009" inkscape:path-effect="#path-effect5757" inkscape:original-d="m 215.4374,611.43109 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149673);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect146011" width="12.494207" height="0.62769938" x="221.60103" y="611.7337"/>
+      <rect y="-617.21863" x="221.60103" height="0.62769938" width="12.494207" id="rect146013" style="fill:url(#linearGradient149675);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path146015" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 271.46279,595.62906 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.3843,0.3843 l -27.52056,0 c -0.21291,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path146017" style="fill:url(#linearGradient149677);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 274.14549,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path146019" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,596.83714 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,598.13951 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146021"/>
+      <path id="path146023" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,599.50593 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,600.85101 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146025"/>
+      <path id="path146027" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,597.4136 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,598.78003 0.98212,0 0,0.7259 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146029"/>
+      <path id="path146031" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,600.1251 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 297.72368,596.96525 0,4.65437" id="path146033" inkscape:path-effect="#path-effect6155" inkscape:original-d="m 297.72368,596.96525 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path146035" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 294.09412,596.79445 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 294.09412,600.85101 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146037"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 278.12409,595.81233 0,1.53723 15.54303,0" id="path146039" inkscape:path-effect="#path-effect6157" inkscape:original-d="m 278.12409,595.81233 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 290.54997,597.34956 0,3.71495 2.73284,0" id="path146041" inkscape:path-effect="#path-effect6159" inkscape:original-d="m 290.54997,597.34956 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 290.59267,601.06451 -12.51128,0 0,1.45182" id="path146043" inkscape:path-effect="#path-effect6161" inkscape:original-d="m 290.59267,601.06451 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path146045" style="fill:url(#linearGradient149679);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 290.89987,597.64679 3.08799,0 0,3.09689 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 294.31647,597.47765 0,3.43741" id="path146047" inkscape:path-effect="#path-effect6165" inkscape:original-d="m 294.31647,597.47765 0,3.43741" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path146049" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 275.51931,596.46975 2.03809,0 0,5.43491 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path146051" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 278.28206,596.46975 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 278.25186,601.22529 1.29834,0 0,0.66428 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146053" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 275.68538,595.80549 0,6.11426" id="path146055" inkscape:path-effect="#path-effect6167" inkscape:original-d="m 275.68538,595.80549 0,6.11426" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path146057" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 271.48087,595.86751 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 275.52045,596.18292 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146059"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 271.53365,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146061"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 273.22586,596.15519 0,6.02755" inkscape:path-effect="#path-effect6169" id="path146063" d="m 273.22586,596.15519 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="596.45782" x="279.53894" height="0.62769938" width="12.494207" id="rect146065" style="fill:url(#linearGradient149681);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149683);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect146067" width="12.494207" height="0.62769938" x="279.53894" y="-601.94269"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 271.46279,603.2758 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path146069"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 274.14549,603.82966 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:url(#linearGradient149685);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146071"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,604.48388 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146073"/>
+      <path id="path146075" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,605.78626 0.98211,0 0,0.7259 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,607.15268 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146077"/>
+      <path id="path146079" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,608.49775 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,605.06035 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146081"/>
+      <path id="path146083" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,606.42677 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,607.77184 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146085"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 297.72368,604.61199 0,4.65437" inkscape:path-effect="#path-effect6353" id="path146087" d="m 297.72368,604.61199 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 294.09412,604.44119 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146089"/>
+      <path id="path146091" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 294.09412,608.49775 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 278.12409,603.45907 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect6355" id="path146093" d="m 278.12409,603.45907 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 290.54997,604.9963 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect6357" id="path146095" d="m 290.54997,604.9963 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 290.59267,608.71125 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182" inkscape:path-effect="#path-effect6359" id="path146097" d="m 290.59267,608.71125 -12.51128,0 0,1.45182" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 290.89987,605.29353 3.08799,0 0,3.0969 -3.08799,0 z" style="fill:url(#linearGradient149687);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path146099"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 294.31647,605.1244 0,3.4374" inkscape:path-effect="#path-effect6363" id="path146101" d="m 294.31647,605.1244 0,3.4374" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 275.51931,604.11649 2.03809,0 0,5.43491 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146103"/>
+      <path d="m 278.28206,604.11649 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146105" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path146107" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 278.25186,608.87204 1.29834,0 0,0.66427 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 275.68538,603.45223 0,6.11427" inkscape:path-effect="#path-effect6365" id="path146109" d="m 275.68538,603.45223 0,6.11427" style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 271.48087,603.51425 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146111"/>
+      <path id="path146113" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 275.52045,603.82966 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path146115" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 271.53365,603.50898 c 0.0816,-0.003 0.14905,-0.002 0.17896,0.001 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22892 l 0,-6.17358 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 273.22586,603.80193 0,6.02755" id="path146117" inkscape:path-effect="#path-effect6367" inkscape:original-d="m 273.22586,603.80193 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149689);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect146119" width="12.494207" height="0.62769938" x="279.53894" y="604.10455"/>
+      <rect y="-609.58942" x="279.53894" height="0.62769938" width="12.494207" id="rect146121" style="fill:url(#linearGradient149691);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path146123" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 271.46279,610.9151 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path146125" style="fill:url(#linearGradient149693);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 274.14549,611.46896 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35717 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path146127" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,612.12319 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,613.42556 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146129"/>
+      <path id="path146131" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,614.79198 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,616.13705 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146133"/>
+      <path id="path146135" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,612.69965 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,614.06607 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146137"/>
+      <path id="path146139" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,615.41114 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 297.72368,612.25129 0,4.65437" id="path146141" inkscape:path-effect="#path-effect6431" inkscape:original-d="m 297.72368,612.25129 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path146143" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 294.09412,612.08049 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 294.09412,616.13705 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146145"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 278.12409,611.09837 0,1.53723 15.54303,0" id="path146147" inkscape:path-effect="#path-effect6433" inkscape:original-d="m 278.12409,611.09837 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 290.54997,612.6356 0,3.71495 2.73284,0" id="path146149" inkscape:path-effect="#path-effect6435" inkscape:original-d="m 290.54997,612.6356 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 290.59267,616.35055 -12.51128,0 0,1.45183" id="path146151" inkscape:path-effect="#path-effect6437" inkscape:original-d="m 290.59267,616.35055 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45183" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path146153" style="fill:url(#linearGradient149695);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 290.89987,612.93283 3.08799,0 0,3.0969 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 294.31647,612.7637 0,3.4374" id="path146155" inkscape:path-effect="#path-effect6441" inkscape:original-d="m 294.31647,612.7637 0,3.4374" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path146157" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 275.51931,611.7558 2.03809,0 0,5.4349 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path146159" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 278.28206,611.7558 1.29834,0 0,0.70955 -1.29834,0 z"/>
+      <path d="m 278.25186,616.51134 1.29834,0 0,0.66427 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146161" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 275.68538,611.09153 0,6.11427" id="path146163" inkscape:path-effect="#path-effect6443" inkscape:original-d="m 275.68538,611.09153 0,6.11427" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path146165" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 271.48087,611.15355 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 275.52045,611.46896 -2.52638,0 0.005,0.28009 1.1991,1.8e-4 0.0263,5.40196 -1.23068,0.0534 0,0.27298 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146167"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 271.53365,611.14828 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,0 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.234,-0.22892 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146169"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 273.22586,611.44123 0,6.02755" inkscape:path-effect="#path-effect6445" id="path146171" d="m 273.22586,611.44123 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="611.74384" x="279.53894" height="0.62769938" width="12.494207" id="rect146173" style="fill:url(#linearGradient149697);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149699);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect146175" width="12.494207" height="0.62769938" x="279.53894" y="-617.22876"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 300.38668,595.62906 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.3843,0.3843 l -27.52056,0 c -0.21291,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path146177"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 303.06938,596.18292 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:url(#linearGradient149701);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146179"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,596.83714 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146181"/>
+      <path id="path146183" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,598.13951 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,599.50593 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146185"/>
+      <path id="path146187" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,600.85101 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,597.4136 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146189"/>
+      <path id="path146191" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,598.78003 0.98212,0 0,0.7259 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,600.1251 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146193"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 326.64757,596.96525 0,4.65437" inkscape:path-effect="#path-effect6615" id="path146195" d="m 326.64757,596.96525 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 323.01801,596.79445 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146197"/>
+      <path id="path146199" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 323.01801,600.85101 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 307.04798,595.81233 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect6617" id="path146201" d="m 307.04798,595.81233 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 319.47386,597.34956 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect6619" id="path146203" d="m 319.47386,597.34956 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 319.51656,601.06451 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45182" inkscape:path-effect="#path-effect6621" id="path146205" d="m 319.51656,601.06451 -12.51128,0 0,1.45182" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 319.82376,597.64679 3.08799,0 0,3.09689 -3.08799,0 z" style="fill:url(#linearGradient149703);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path146207"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 323.24036,597.47765 0,3.43741" inkscape:path-effect="#path-effect6625" id="path146209" d="m 323.24036,597.47765 0,3.43741" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 304.4432,596.46975 2.03809,0 0,5.43491 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146211"/>
+      <path d="m 307.20595,596.46975 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146213" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path146215" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 307.17575,601.22529 1.29834,0 0,0.66428 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 304.60927,595.80549 0,6.11426" inkscape:path-effect="#path-effect6627" id="path146217" d="m 304.60927,595.80549 0,6.11426" style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 300.40476,595.86751 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146219"/>
+      <path id="path146221" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 304.44434,596.18292 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path146223" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 300.45754,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 302.14975,596.15519 0,6.02755" id="path146225" inkscape:path-effect="#path-effect6629" inkscape:original-d="m 302.14975,596.15519 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149705);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect146227" width="12.494207" height="0.62769938" x="308.46283" y="596.45782"/>
+      <rect y="-601.94269" x="308.46283" height="0.62769938" width="12.494207" id="rect146229" style="fill:url(#linearGradient149707);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path146231" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 300.38668,603.2758 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path146233" style="fill:url(#linearGradient149709);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 303.06938,603.82966 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path146235" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,604.48388 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,605.78626 0.98211,0 0,0.7259 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146237"/>
+      <path id="path146239" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,607.15268 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,608.49775 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146241"/>
+      <path id="path146243" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,605.06035 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,606.42677 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146245"/>
+      <path id="path146247" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,607.77184 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 326.64757,604.61199 0,4.65437" id="path146249" inkscape:path-effect="#path-effect6637" inkscape:original-d="m 326.64757,604.61199 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path146251" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 323.01801,604.44119 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 323.01801,608.49775 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146253"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 307.04798,603.45907 0,1.53723 15.54303,0" id="path146255" inkscape:path-effect="#path-effect6639" inkscape:original-d="m 307.04798,603.45907 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 319.47386,604.9963 0,3.71495 2.73284,0" id="path146257" inkscape:path-effect="#path-effect6641" inkscape:original-d="m 319.47386,604.9963 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 319.51656,608.71125 -12.51128,0 0,1.45182" id="path146259" inkscape:path-effect="#path-effect6643" inkscape:original-d="m 319.51656,608.71125 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path146261" style="fill:url(#linearGradient149711);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 319.82376,605.29353 3.08799,0 0,3.0969 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 323.24036,605.1244 0,3.4374" id="path146263" inkscape:path-effect="#path-effect6647" inkscape:original-d="m 323.24036,605.1244 0,3.4374" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path146265" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 304.4432,604.11649 2.03809,0 0,5.43491 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path146267" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 307.20595,604.11649 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 307.17575,608.87204 1.29834,0 0,0.66427 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146269" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 304.60927,603.45223 0,6.11427" id="path146271" inkscape:path-effect="#path-effect6649" inkscape:original-d="m 304.60927,603.45223 0,6.11427" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path146273" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 300.40476,603.51425 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 304.44434,603.82966 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146275"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 300.45754,603.50898 c 0.0816,-0.003 0.14905,-0.002 0.17896,0.001 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22892 l 0,-6.17358 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146277"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 302.14975,603.80193 0,6.02755" inkscape:path-effect="#path-effect6651" id="path146279" d="m 302.14975,603.80193 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="604.10455" x="308.46283" height="0.62769938" width="12.494207" id="rect146281" style="fill:url(#linearGradient149713);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149715);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect146283" width="12.494207" height="0.62769938" x="308.46283" y="-609.58942"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 300.38668,610.9151 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path146285"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 303.06938,611.46896 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35717 -0.6861,-0.0318 z" style="fill:url(#linearGradient149717);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146287"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,612.12319 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146289"/>
+      <path id="path146291" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,613.42556 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,614.79198 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146293"/>
+      <path id="path146295" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,616.13705 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,612.69965 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146297"/>
+      <path id="path146299" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,614.06607 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,615.41114 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146301"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 326.64757,612.25129 0,4.65437" inkscape:path-effect="#path-effect6659" id="path146303" d="m 326.64757,612.25129 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 323.01801,612.08049 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146305"/>
+      <path id="path146307" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 323.01801,616.13705 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 307.04798,611.09837 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect6661" id="path146309" d="m 307.04798,611.09837 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 319.47386,612.6356 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect6663" id="path146311" d="m 319.47386,612.6356 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 319.51656,616.35055 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45183" inkscape:path-effect="#path-effect6665" id="path146313" d="m 319.51656,616.35055 -12.51128,0 0,1.45183" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 319.82376,612.93283 3.08799,0 0,3.0969 -3.08799,0 z" style="fill:url(#linearGradient149719);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path146315"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 323.24036,612.7637 0,3.4374" inkscape:path-effect="#path-effect6669" id="path146317" d="m 323.24036,612.7637 0,3.4374" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 304.4432,611.7558 2.03809,0 0,5.4349 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146319"/>
+      <path d="m 307.20595,611.7558 1.29834,0 0,0.70955 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146321" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path146323" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 307.17575,616.51134 1.29834,0 0,0.66427 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 304.60927,611.09153 0,6.11427" inkscape:path-effect="#path-effect6671" id="path146325" d="m 304.60927,611.09153 0,6.11427" style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 300.40476,611.15355 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146327"/>
+      <path id="path146329" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 304.44434,611.46896 -2.52638,0 0.005,0.28009 1.1991,1.8e-4 0.0263,5.40196 -1.23068,0.0534 0,0.27298 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path146331" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 300.45754,611.14828 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,0 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.234,-0.22892 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 302.14975,611.44123 0,6.02755" id="path146333" inkscape:path-effect="#path-effect6673" inkscape:original-d="m 302.14975,611.44123 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149721);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect146335" width="12.494207" height="0.62769938" x="308.46283" y="611.74384"/>
+      <rect y="-617.22876" x="308.46283" height="0.62769938" width="12.494207" id="rect146337" style="fill:url(#linearGradient149723);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 208.97198,595.36143 4.50938,0 -1.49896,0.0375 0,23.30535 -5.29061,0 0,-23.29041 c -0.0138,0.003 1.34269,-0.0525 1.34269,-0.0525 z" style="fill:url(#radialGradient149725);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.33817181" id="path146339"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 208.54462,605.30753 1.42666,0 0,3.38172 -1.42666,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient149727);stroke-width:0.33817181;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path146341"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 209.37948,605.44491 0,3.11753" inkscape:path-effect="#path-effect6689" id="path146343" d="m 209.37948,605.44491 0,3.11753" style="fill:none;stroke:#000000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 333.01057,595.36143 -5.44664,0 1.49889,0.0977 0,23.36729 5.29037,0 c 0,-7.7841 0,-35.35982 0,-23.46502 0.0138,0.003 -1.34262,10e-6 -1.34262,0 z" style="fill:url(#radialGradient149729);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.33861357" id="path146345"/>
+      <path inkscape:connector-curvature="0" d="m 332.68665,610.08476 0.89672,0 0,1.07605 -0.89672,0 z m 0,-1.49452 0.89672,0 0,1.07605 -0.89672,0 z m 0,-1.49453 0.89672,0 0,1.07606 -0.89672,0 z m -1.28529,2.98905 0.89671,0 0,1.07605 -0.89671,0 z m 0,-1.49452 0.89671,0 0,1.07605 -0.89671,0 z m 0,-1.49453 0.89671,0 0,1.07606 -0.89671,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146347"/>
+      <path inkscape:connector-curvature="0" d="m 331.40136,613.33966 0.89671,0 0,1.07606 -0.89671,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146349"/>
+      <path inkscape:connector-curvature="0" d="m 333.17456,614.72682 0.62436,0 0,3.04354 -0.62436,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146351"/>
+      <path inkscape:connector-curvature="0" id="path146353" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 332.06458,614.72682 0.62436,0 0,3.04354 -0.62436,0 z"/>
+      <path id="path146355" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 330.95459,614.72682 0.62437,0 0,3.04354 -0.62437,0 z" inkscape:connector-curvature="0"/>
+      <path d="m 329.84461,614.72682 0.62437,0 0,3.04354 -0.62437,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146357" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path146359" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 333.86077,598.52056 0,0.62437 -4.2535,0 0,-0.62437 z"/>
+      <path d="m 333.86077,599.40826 0,0.62437 -4.2535,0 0,-0.62437 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path146361" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path146363" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 331.40136,597.5724 0.89671,0 0,0.69561 -0.89671,0 z"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Disk_array_3D.svg b/misc/images/svg/elements/Disk_array_3D.svg
index 1944bbba54a..ebe0d597914 100644
--- a/misc/images/svg/elements/Disk_array_3D.svg
+++ b/misc/images/svg/elements/Disk_array_3D.svg
@@ -1,3426 +1,638 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="32.372547"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0-4-7-1"
-       id="linearGradient149085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0846636,0,0,1.0308208,-183.46398,-7644.7028)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.82794"
-       y2="7976.5229" />
-    <linearGradient
-       id="linearGradient42443-7-52-0-4-7-1">
-      <stop
-         id="stop42445-53-8-3-5-8-7"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-2-7-5-1-4" />
-      <stop
-         id="stop42449-3-19-2-1-5-0"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="32.372547" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0-4-7-1" id="linearGradient149085" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0846636,0,0,1.0308208,-183.46398,-7644.7028)" x1="407.2959" y1="8015.7466" x2="407.82794" y2="7976.5229"/>
+    <linearGradient id="linearGradient42443-7-52-0-4-7-1">
+      <stop id="stop42445-53-8-3-5-8-7" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-2-7-5-1-4"/>
+      <stop id="stop42449-3-19-2-1-5-0" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427"
-       id="linearGradient149087"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.18232,509.26382)"
-       x1="159.92857"
-       y1="361.98718"
-       x2="210.83929"
-       y2="333.23718" />
-    <linearGradient
-       id="linearGradient76427">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop76429-9" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop76431" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427" id="linearGradient149087" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.18232,509.26382)" x1="159.92857" y1="361.98718" x2="210.83929" y2="333.23718"/>
+    <linearGradient id="linearGradient76427">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop76429-9"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop76431"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427"
-       id="linearGradient149089"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.18232,509.26382)"
-       x1="355.42856"
-       y1="451.72647"
-       x2="327.83929"
-       y2="256.22647" />
-    <linearGradient
-       id="linearGradient123474">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop123476" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop123478" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427" id="linearGradient149089" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.18232,509.26382)" x1="355.42856" y1="451.72647" x2="327.83929" y2="256.22647"/>
+    <linearGradient id="linearGradient123474">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop123476"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop123478"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149091"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.33145)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient76456">
-      <stop
-         id="stop76458"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop76460" />
-      <stop
-         id="stop76462"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149091" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.33145)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient76456">
+      <stop id="stop76458" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop76460"/>
+      <stop id="stop76462" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4612"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4614"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4616"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4618"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149093"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.33145)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient5345">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop5347" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop5349" />
+    <inkscape:path-effect is_visible="true" id="path-effect4612" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4614" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4616" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4618" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149093" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.33145)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient5345">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop5347"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop5349"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4620"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4622"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5365"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149095"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.26382)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5369">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop5371" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop5373" />
+    <inkscape:path-effect is_visible="true" id="path-effect4620" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4622" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5365" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149095" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,509.26382)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5369">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop5371"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop5373"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-689.1367)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.97414)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient123508">
-      <stop
-         id="stop123510"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop123512" />
-      <stop
-         id="stop123514"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149097" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-689.1367)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149099" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.97414)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient123508">
+      <stop id="stop123510" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop123512"/>
+      <stop id="stop123514" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5439"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5441"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5443"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5445"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149101"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.97414)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123521">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123523" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123525" />
+    <inkscape:path-effect effect="spiro" id="path-effect5439" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5441" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5443" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5445" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149101" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.97414)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123521">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123523"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123525"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5449"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5451"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5453"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.90651)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-696.77939)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.60736)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient123545">
-      <stop
-         id="stop123547"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop123549" />
-      <stop
-         id="stop123551"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect5449" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5451" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5453" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149103" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,516.90651)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149105" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-696.77939)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149107" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.60736)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient123545">
+      <stop id="stop123547" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop123549"/>
+      <stop id="stop123551" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5515"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5517"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5519"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5521"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.60736)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123558">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123560" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123562" />
+    <inkscape:path-effect is_visible="true" id="path-effect5515" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5517" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5519" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5521" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149109" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.60736)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123558">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123560"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123562"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5525"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5527"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5529"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.53973)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149113"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-704.4126)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149115"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.33145)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient123582">
-      <stop
-         id="stop123584"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop123586" />
-      <stop
-         id="stop123588"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect is_visible="true" id="path-effect5525" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5527" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5529" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149111" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,524.53973)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149113" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,142.38516,-704.4126)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149115" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.33145)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient123582">
+      <stop id="stop123584" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop123586"/>
+      <stop id="stop123588" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5699"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5701"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5703"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5705"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149117"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.33145)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123595">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123597" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123599" />
+    <inkscape:path-effect effect="spiro" id="path-effect5699" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5701" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5703" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5705" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149117" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.33145)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123595">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123597"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123599"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5709"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5711"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5713"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149119"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.26382)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149121"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-689.1367)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149123"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.97414)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient123619">
-      <stop
-         id="stop123621"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop123623" />
-      <stop
-         id="stop123625"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect5709" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5711" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5713" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149119" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,509.26382)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149121" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-689.1367)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149123" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.97414)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient123619">
+      <stop id="stop123621" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop123623"/>
+      <stop id="stop123625" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5721"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5723"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5725"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5727"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149125"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.97414)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123632">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123634" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123636" />
+    <inkscape:path-effect is_visible="true" id="path-effect5721" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5723" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5725" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5727" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149125" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.97414)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123632">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123634"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123636"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5731"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5733"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5735"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.90651)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149129"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-696.77939)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="linearGradient149131"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.60736)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient123656">
-      <stop
-         id="stop123658"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop123660" />
-      <stop
-         id="stop123662"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect is_visible="true" id="path-effect5731" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5733" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5735" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149127" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,516.90651)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149129" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-696.77939)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="linearGradient149131" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.60736)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient123656">
+      <stop id="stop123658" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop123660"/>
+      <stop id="stop123662" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5743"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5745"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5747"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5749"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149133"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.60736)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123669">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123671" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123673" />
+    <inkscape:path-effect effect="spiro" id="path-effect5743" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5745" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5747" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5749" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149133" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.60736)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123669">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123671"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123673"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5753"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5755"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5757"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149135"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.53973)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149137"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-704.4126)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149139"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.33145)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient6289">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6291" />
-      <stop
-         id="stop6293"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop6295" />
+    <inkscape:path-effect effect="spiro" id="path-effect5753" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5755" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5757" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149135" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.42751,524.53973)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149137" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,113.4275,-704.4126)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149139" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.33145)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient6289">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6291"/>
+      <stop id="stop6293" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop6295"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6155"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6157"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6159"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6161"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149141"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.33145)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123702">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123704" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123706" />
+    <inkscape:path-effect is_visible="true" id="path-effect6155" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6157" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6159" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6161" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149141" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.33145)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123702">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123704"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123706"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6165"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6167"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6169"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149143"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.26382)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149145"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-689.1367)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149147"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.9782)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient123726">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop123728" />
-      <stop
-         id="stop123730"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop123732" />
+    <inkscape:path-effect is_visible="true" id="path-effect6165" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6167" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6169" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149143" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,509.26382)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149145" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-689.1367)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149147" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.9782)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient123726">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop123728"/>
+      <stop id="stop123730" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop123732"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6353"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6355"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6357"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6359"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149149"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.9782)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123739">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123741" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123743" />
+    <inkscape:path-effect effect="spiro" id="path-effect6353" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6355" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6357" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6359" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149149" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.9782)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123739">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123741"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123743"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6363"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6365"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6367"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149151"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.91057)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149153"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-696.78344)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149155"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.61751)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient123763">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop123765" />
-      <stop
-         id="stop123767"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop123769" />
+    <inkscape:path-effect effect="spiro" id="path-effect6363" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6365" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6367" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149151" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,516.91057)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149153" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-696.78344)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149155" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.61751)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient123763">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop123765"/>
+      <stop id="stop123767" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop123769"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6431"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6433"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6435"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6437"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149157"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.61751)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123776">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123778" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123780" />
+    <inkscape:path-effect is_visible="true" id="path-effect6431" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6433" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6435" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6437" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149157" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.61751)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123776">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123778"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123780"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6441"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6443"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6445"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.54988)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149161"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-704.42274)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.33145)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient123800">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop123802" />
-      <stop
-         id="stop123804"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop123806" />
+    <inkscape:path-effect is_visible="true" id="path-effect6441" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6443" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6445" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149159" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,524.54988)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149161" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,171.36541,-704.42274)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149163" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.33145)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient123800">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop123802"/>
+      <stop id="stop123804" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop123806"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6615"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6617"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6619"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6621"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149165"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.33145)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123813">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123815" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123817" />
+    <inkscape:path-effect effect="spiro" id="path-effect6615" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6617" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6619" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6621" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149165" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.33145)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123813">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123815"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123817"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6625"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6627"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6629"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149167"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.26382)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-689.1367)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149171"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.9782)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient123837">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop123839" />
-      <stop
-         id="stop123841"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop123843" />
+    <inkscape:path-effect effect="spiro" id="path-effect6625" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6627" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6629" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149167" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,509.26382)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149169" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-689.1367)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149171" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.9782)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient123837">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop123839"/>
+      <stop id="stop123841" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop123843"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6637"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6639"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6641"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6643"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149173"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.9782)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123850">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123852" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123854" />
+    <inkscape:path-effect is_visible="true" id="path-effect6637" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6639" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6641" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6643" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149173" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.9782)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123850">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123852"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123854"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6647"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6649"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6651"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.91057)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149177"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-696.78344)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289"
-       id="linearGradient149179"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.61751)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient123874">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop123876" />
-      <stop
-         id="stop123878"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop123880" />
+    <inkscape:path-effect is_visible="true" id="path-effect6647" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6649" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6651" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149175" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,516.91057)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149177" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-696.78344)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289" id="linearGradient149179" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.61751)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient123874">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop123876"/>
+      <stop id="stop123878" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop123880"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6659"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6661"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6663"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6665"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345"
-       id="linearGradient149181"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.61751)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient123887">
-      <stop
-         style="stop-color:#ff8080;stop-opacity:1;"
-         offset="0"
-         id="stop123889" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop123891" />
+    <inkscape:path-effect effect="spiro" id="path-effect6659" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6661" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6663" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6665" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345" id="linearGradient149181" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.61751)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient123887">
+      <stop style="stop-color:#ff8080;stop-opacity:1;" offset="0" id="stop123889"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop123891"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6669"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6671"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6673"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149183"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.54988)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369"
-       id="linearGradient149185"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-704.42274)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456"
-       id="radialGradient149187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8699295,0.50303111,-1.0254274,1.7733485,-37.994738,548.59038)"
-       cx="239.79552"
-       cy="-31.373899"
-       fx="239.79552"
-       fy="-31.373899"
-       r="9.4448795" />
-    <linearGradient
-       id="linearGradient123911">
-      <stop
-         id="stop123913"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop123915" />
-      <stop
-         id="stop123917"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect6669" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6671" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6673" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149183" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,524.54988)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369" id="linearGradient149185" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,200.2893,-704.42274)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient76456" id="radialGradient149187" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.8699295,0.50303111,-1.0254274,1.7733485,-37.994738,548.59038)" cx="239.79552" cy="-31.373899" fx="239.79552" fy="-31.373899" r="9.4448795"/>
+    <linearGradient id="linearGradient123911">
+      <stop id="stop123913" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.2624054" id="stop123915"/>
+      <stop id="stop123917" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6709"
-       id="linearGradient149189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33817181,0,0,0.33817181,127.30276,619.50783)"
-       x1="248.57724"
-       y1="-37.698475"
-       x2="236.82542"
-       y2="-36.991367" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6709">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="0"
-         id="stop6711" />
-      <stop
-         style="stop-color:#cccccc;stop-opacity:0;"
-         offset="1"
-         id="stop6713" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6709" id="linearGradient149189" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.33817181,0,0,0.33817181,127.30276,619.50783)" x1="248.57724" y1="-37.698475" x2="236.82542" y2="-36.991367"/>
+    <linearGradient inkscape:collect="always" id="linearGradient6709">
+      <stop style="stop-color:#cccccc;stop-opacity:1;" offset="0" id="stop6711"/>
+      <stop style="stop-color:#cccccc;stop-opacity:0;" offset="1" id="stop6713"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6689"
-       is_visible="true" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10169-8"
-       id="radialGradient149191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.6294256,0.14991889,0.18027644,2.0446153,734.31916,639.79423)"
-       cx="236.30856"
-       cy="-34.540203"
-       fx="236.30856"
-       fy="-34.540203"
-       r="9.4448795" />
-    <linearGradient
-       id="linearGradient10169-8">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop10171" />
-      <stop
-         id="stop10173"
-         offset="0.2624054"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop10175" />
+    <inkscape:path-effect effect="spiro" id="path-effect6689" is_visible="true"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient10169-8" id="radialGradient149191" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.6294256,0.14991889,0.18027644,2.0446153,734.31916,639.79423)" cx="236.30856" cy="-34.540203" fx="236.30856" fy="-34.540203" r="9.4448795"/>
+    <linearGradient id="linearGradient10169-8">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop10171"/>
+      <stop id="stop10173" offset="0.2624054" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop10175"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="74.309263"
-     inkscape:cy="79.681217"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="132"
-     inkscape:window-y="174"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" inkscape:cx="74.309263" inkscape:cy="79.681217" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="132" inkscape:window-y="174" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-233.14286,-544.74734)">
-    <g
-       style="display:inline"
-       id="g142275"
-       transform="translate(26.620257,-41.875872)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Disk_array_3D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="path142277"
-         style="fill:url(#linearGradient149085);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 212.1896,595.39091 0,22.71748 116.666,0 -10e-6,-22.71748 -31.87765,-8.7677 -53.88512,0 z"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149087);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142279"
-         width="117.4845"
-         height="23.370089"
-         x="211.99065"
-         y="595.39062"
-         ry="0" />
-      <path
-         id="path142281"
-         style="fill:url(#linearGradient149089);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 211.99064,595.39064 117.48452,0 0,22.6865 -117.48452,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 242.48253,595.62906 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.38431,0.3843 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path142283" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 245.16523,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         style="fill:url(#linearGradient149091);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142285" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,596.83714 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142287" />
-      <path
-         id="path142289"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,598.13951 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,599.50593 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142291" />
-      <path
-         id="path142293"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,600.85101 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,597.4136 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142295" />
-      <path
-         id="path142297"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,598.78003 0.98211,0 0,0.7259 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,600.1251 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142299" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 268.74342,596.96525 0,4.65437"
-         inkscape:path-effect="#path-effect4612"
-         id="path142301"
-         d="m 268.74342,596.96525 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 265.11387,596.79445 0.76,0 0,0.66186 -0.76,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142303" />
-      <path
-         id="path142305"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 265.11387,600.85101 0.76,0 0,0.66186 -0.76,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 249.14383,595.81233 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect4614"
-         id="path142307"
-         d="m 249.14383,595.81233 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 261.56972,597.34956 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect4616"
-         id="path142309"
-         d="m 261.56972,597.34956 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 261.61242,601.06451 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45182"
-         inkscape:path-effect="#path-effect4618"
-         id="path142311"
-         d="m 261.61242,601.06451 -12.51129,0 0,1.45182"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 261.91961,597.64679 3.088,0 0,3.09689 -3.088,0 z"
-         style="fill:url(#linearGradient149093);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path142313" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 265.33622,597.47765 0,3.43741"
-         inkscape:path-effect="#path-effect4620"
-         id="path142315"
-         d="m 265.33622,597.47765 0,3.43741"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 246.53905,596.46975 2.0381,0 0,5.43491 -2.0381,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142317" />
-      <path
-         d="m 249.3018,596.46975 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142319"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path142321"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 249.27161,601.22529 1.29834,0 0,0.66428 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 246.70512,595.80549 0,6.11426"
-         inkscape:path-effect="#path-effect4622"
-         id="path142323"
-         d="m 246.70512,595.80549 0,6.11426"
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 242.50062,595.86751 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61889 c -0.51707,0 -1.33379,0 -1.97015,-10e-6 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142325" />
-      <path
-         id="path142327"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 245.16523,596.18292 2.62972,0 -0.006,0.28009 -1.24814,1.7e-4 -0.0274,5.40197 1.28102,0.0534 0,0.27299 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path142329"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 242.55339,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63051 c -0.51708,0 0.40454,0 -0.23181,-10e-6 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 244.39505,596.15519 0,6.02755"
-         id="path142331"
-         inkscape:path-effect="#path-effect5365"
-         inkscape:original-d="m 244.39505,596.15519 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149095);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142333"
-         width="12.494207"
-         height="0.62769938"
-         x="250.5587"
-         y="596.45782" />
-      <rect
-         y="-601.94269"
-         x="250.5587"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142335"
-         style="fill:url(#linearGradient149097);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path142337"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 242.48253,603.27174 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.21291 -0.1714,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path142339"
-         style="fill:url(#linearGradient149099);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 245.16523,603.8256 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path142341"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,604.47983 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,605.7822 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142343" />
-      <path
-         id="path142345"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,607.14862 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,608.49369 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142347" />
-      <path
-         id="path142349"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,605.05629 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,606.42271 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142351" />
-      <path
-         id="path142353"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,607.76778 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 268.74342,604.60793 0,4.65437"
-         id="path142355"
-         inkscape:path-effect="#path-effect5439"
-         inkscape:original-d="m 268.74342,604.60793 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path142357"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 265.11387,604.43713 0.76,0 0,0.66186 -0.76,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 265.11387,608.49369 0.76,0 0,0.66186 -0.76,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142359" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 249.14383,603.45501 0,1.53723 15.54303,0"
-         id="path142361"
-         inkscape:path-effect="#path-effect5441"
-         inkscape:original-d="m 249.14383,603.45501 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 261.56972,604.99224 0,3.71495 2.73284,0"
-         id="path142363"
-         inkscape:path-effect="#path-effect5443"
-         inkscape:original-d="m 261.56972,604.99224 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 261.61242,608.70719 -12.51129,0 0,1.45183"
-         id="path142365"
-         inkscape:path-effect="#path-effect5445"
-         inkscape:original-d="m 261.61242,608.70719 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45183"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path142367"
-         style="fill:url(#linearGradient149101);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 261.91961,605.28947 3.088,0 0,3.0969 -3.088,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 265.33622,605.12034 0,3.4374"
-         id="path142369"
-         inkscape:path-effect="#path-effect5449"
-         inkscape:original-d="m 265.33622,605.12034 0,3.4374"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142371"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 246.53905,604.11244 2.0381,0 0,5.4349 -2.0381,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path142373"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 249.3018,604.11244 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 249.27161,608.86798 1.29834,0 0,0.66427 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142375"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 246.70512,603.44817 0,6.11427"
-         id="path142377"
-         inkscape:path-effect="#path-effect5451"
-         inkscape:original-d="m 246.70512,603.44817 0,6.11427"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142379"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 242.50062,603.51019 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51707,0 -1.33379,0 -1.97015,-10e-6 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 245.16523,603.8256 2.62972,0 -0.006,0.28009 -1.24814,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142381" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 242.55339,603.50492 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63051 c -0.51708,0 0.40454,0 -0.23181,0 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.23401,-0.22892 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142383" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 244.39505,603.79787 0,6.02755"
-         inkscape:path-effect="#path-effect5453"
-         id="path142385"
-         d="m 244.39505,603.79787 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="604.10052"
-         x="250.5587"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142387"
-         style="fill:url(#linearGradient149103);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149105);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142389"
-         width="12.494207"
-         height="0.62769938"
-         x="250.5587"
-         y="-609.58539" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 242.48253,610.90496 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.3843 l 0,6.33216 c 0,0.21291 -0.1714,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.2129 0.17141,-0.3843 0.38431,-0.3843 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path142391" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 245.16523,611.45881 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91254 -0.0214,-1.4737 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         style="fill:url(#linearGradient149107);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142393" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,612.11304 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142395" />
-      <path
-         id="path142397"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,613.41541 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 267.2062,614.78183 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142399" />
-      <path
-         id="path142401"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 267.2062,616.1269 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,612.6895 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142403" />
-      <path
-         id="path142405"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 266.18139,614.05592 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 266.18139,615.40099 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142407" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 268.74342,612.24115 0,4.65436"
-         inkscape:path-effect="#path-effect5515"
-         id="path142409"
-         d="m 268.74342,612.24115 0,4.65436"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 265.11387,612.07035 0.76,0 0,0.66186 -0.76,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142411" />
-      <path
-         id="path142413"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 265.11387,616.12691 0.76,0 0,0.66186 -0.76,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 249.14383,611.08823 0,1.53722 15.54303,0"
-         inkscape:path-effect="#path-effect5517"
-         id="path142415"
-         d="m 249.14383,611.08823 0,1.53722 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 261.56972,612.62545 0,3.71496 2.73284,0"
-         inkscape:path-effect="#path-effect5519"
-         id="path142417"
-         d="m 261.56972,612.62545 0,3.71496 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 261.61242,616.34041 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45182"
-         inkscape:path-effect="#path-effect5521"
-         id="path142419"
-         d="m 261.61242,616.34041 -12.51129,0 0,1.45182"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 261.91961,612.92269 3.088,0 0,3.09689 -3.088,0 z"
-         style="fill:url(#linearGradient149109);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path142421" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 265.33622,612.75355 0,3.4374"
-         inkscape:path-effect="#path-effect5525"
-         id="path142423"
-         d="m 265.33622,612.75355 0,3.4374"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 246.53905,611.74565 2.0381,0 0,5.43491 -2.0381,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142425" />
-      <path
-         d="m 249.3018,611.74565 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142427"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path142429"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 249.27161,616.50119 1.29834,0 0,0.66427 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 246.70512,611.08139 0,6.11426"
-         inkscape:path-effect="#path-effect5527"
-         id="path142431"
-         d="m 246.70512,611.08139 0,6.11426"
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 242.50062,611.14341 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51707,0 -1.33379,0 -1.97015,0 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142433" />
-      <path
-         id="path142435"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 245.16523,611.45881 2.62972,0 -0.006,0.28009 -1.24814,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path142437"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 242.55339,611.13814 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63052 c -0.51708,0 0.40454,0 -0.23181,-1e-5 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 244.39505,611.43109 0,6.02755"
-         id="path142439"
-         inkscape:path-effect="#path-effect5529"
-         inkscape:original-d="m 244.39505,611.43109 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149111);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142441"
-         width="12.494207"
-         height="0.62769938"
-         x="250.5587"
-         y="611.7337" />
-      <rect
-         y="-617.21863"
-         x="250.5587"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142443"
-         style="fill:url(#linearGradient149113);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path142445"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 213.52488,595.62906 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.2129 -0.17141,0.3843 -0.38431,0.3843 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path142447"
-         style="fill:url(#linearGradient149115);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 216.20758,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path142449"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,596.83714 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,598.13951 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142451" />
-      <path
-         id="path142453"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,599.50593 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,600.85101 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142455" />
-      <path
-         id="path142457"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,597.4136 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,598.78003 0.98211,0 0,0.7259 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142459" />
-      <path
-         id="path142461"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,600.1251 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 239.78577,596.96525 0,4.65437"
-         id="path142463"
-         inkscape:path-effect="#path-effect5699"
-         inkscape:original-d="m 239.78577,596.96525 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path142465"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 236.15621,596.79445 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 236.15621,600.85101 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142467" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 220.18618,595.81233 0,1.53723 15.54303,0"
-         id="path142469"
-         inkscape:path-effect="#path-effect5701"
-         inkscape:original-d="m 220.18618,595.81233 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 232.61207,597.34956 0,3.71495 2.73284,0"
-         id="path142471"
-         inkscape:path-effect="#path-effect5703"
-         inkscape:original-d="m 232.61207,597.34956 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 232.65476,601.06451 -12.51128,0 0,1.45182"
-         id="path142473"
-         inkscape:path-effect="#path-effect5705"
-         inkscape:original-d="m 232.65476,601.06451 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path142475"
-         style="fill:url(#linearGradient149117);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 232.96196,597.64679 3.08799,0 0,3.09689 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 236.37857,597.47765 0,3.43741"
-         id="path142477"
-         inkscape:path-effect="#path-effect5709"
-         inkscape:original-d="m 236.37857,597.47765 0,3.43741"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142479"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 217.5814,596.46975 2.03809,0 0,5.43491 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path142481"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 220.34415,596.46975 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 220.31395,601.22529 1.29834,0 0,0.66428 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142483"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 217.74747,595.80549 0,6.11426"
-         id="path142485"
-         inkscape:path-effect="#path-effect5711"
-         inkscape:original-d="m 217.74747,595.80549 0,6.11426"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142487"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 213.54297,595.86751 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97015,-10e-6 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 216.20758,596.18292 2.62972,0 -0.006,0.28009 -1.24815,1.7e-4 -0.0274,5.40197 1.28102,0.0534 0,0.27299 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142489" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 213.59574,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63051 c -0.51707,0 0.40455,0 -0.2318,-10e-6 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142491" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 215.4374,596.15519 0,6.02755"
-         inkscape:path-effect="#path-effect5713"
-         id="path142493"
-         d="m 215.4374,596.15519 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="596.45782"
-         x="221.60103"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142495"
-         style="fill:url(#linearGradient149119);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149121);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142497"
-         width="12.494207"
-         height="0.62769938"
-         x="221.60103"
-         y="-601.94269" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 213.52488,603.27174 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.21291 -0.17141,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path142499" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 216.20758,603.8256 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         style="fill:url(#linearGradient149123);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142501" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,604.47983 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142503" />
-      <path
-         id="path142505"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,605.7822 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,607.14862 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142507" />
-      <path
-         id="path142509"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,608.49369 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,605.05629 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142511" />
-      <path
-         id="path142513"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,606.42271 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,607.76778 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142515" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 239.78577,604.60793 0,4.65437"
-         inkscape:path-effect="#path-effect5721"
-         id="path142517"
-         d="m 239.78577,604.60793 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 236.15621,604.43713 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142519" />
-      <path
-         id="path142521"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 236.15621,608.49369 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 220.18618,603.45501 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect5723"
-         id="path142523"
-         d="m 220.18618,603.45501 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 232.61207,604.99224 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect5725"
-         id="path142525"
-         d="m 232.61207,604.99224 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 232.65476,608.70719 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45183"
-         inkscape:path-effect="#path-effect5727"
-         id="path142527"
-         d="m 232.65476,608.70719 -12.51128,0 0,1.45183"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 232.96196,605.28947 3.08799,0 0,3.0969 -3.08799,0 z"
-         style="fill:url(#linearGradient149125);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path142529" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 236.37857,605.12034 0,3.4374"
-         inkscape:path-effect="#path-effect5731"
-         id="path142531"
-         d="m 236.37857,605.12034 0,3.4374"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 217.5814,604.11244 2.03809,0 0,5.4349 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142533" />
-      <path
-         d="m 220.34415,604.11244 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142535"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path142537"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 220.31395,608.86798 1.29834,0 0,0.66427 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 217.74747,603.44817 0,6.11427"
-         inkscape:path-effect="#path-effect5733"
-         id="path142539"
-         d="m 217.74747,603.44817 0,6.11427"
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 213.54297,603.51019 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51708,0 -1.3338,0 -1.97015,-10e-6 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142541" />
-      <path
-         id="path142543"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 216.20758,603.8256 2.62972,0 -0.006,0.28009 -1.24815,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path142545"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 213.59574,603.50492 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63051 c -0.51707,0 0.40455,0 -0.2318,0 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.23401,-0.22892 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 215.4374,603.79787 0,6.02755"
-         id="path142547"
-         inkscape:path-effect="#path-effect5735"
-         inkscape:original-d="m 215.4374,603.79787 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149127);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142549"
-         width="12.494207"
-         height="0.62769938"
-         x="221.60103"
-         y="604.10052" />
-      <rect
-         y="-609.58539"
-         x="221.60103"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142551"
-         style="fill:url(#linearGradient149129);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path142553"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 213.52488,610.90496 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.3843 l 0,6.33216 c 0,0.21291 -0.17141,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.2129 0.17141,-0.3843 0.38431,-0.3843 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path142555"
-         style="fill:url(#linearGradient149131);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 216.20758,611.45881 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.4737 -2.02336,-0.0139 0.0105,2.05368 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path142557"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,612.11304 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,613.41541 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142559" />
-      <path
-         id="path142561"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 238.24855,614.78183 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 238.24855,616.1269 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142563" />
-      <path
-         id="path142565"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,612.6895 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 237.22374,614.05592 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142567" />
-      <path
-         id="path142569"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 237.22374,615.40099 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 239.78577,612.24115 0,4.65436"
-         id="path142571"
-         inkscape:path-effect="#path-effect5743"
-         inkscape:original-d="m 239.78577,612.24115 0,4.65436"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path142573"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 236.15621,612.07035 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 236.15621,616.12691 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142575" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 220.18618,611.08823 0,1.53722 15.54303,0"
-         id="path142577"
-         inkscape:path-effect="#path-effect5745"
-         inkscape:original-d="m 220.18618,611.08823 0,1.53722 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 232.61207,612.62545 0,3.71496 2.73284,0"
-         id="path142579"
-         inkscape:path-effect="#path-effect5747"
-         inkscape:original-d="m 232.61207,612.62545 0,3.71496 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 232.65476,616.34041 -12.51128,0 0,1.45182"
-         id="path142581"
-         inkscape:path-effect="#path-effect5749"
-         inkscape:original-d="m 232.65476,616.34041 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path142583"
-         style="fill:url(#linearGradient149133);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 232.96196,612.92269 3.08799,0 0,3.09689 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 236.37857,612.75355 0,3.4374"
-         id="path142585"
-         inkscape:path-effect="#path-effect5753"
-         inkscape:original-d="m 236.37857,612.75355 0,3.4374"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142587"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 217.5814,611.74565 2.03809,0 0,5.43491 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path142589"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 220.34415,611.74565 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 220.31395,616.50119 1.29834,0 0,0.66427 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142591"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 217.74747,611.08139 0,6.11426"
-         id="path142593"
-         inkscape:path-effect="#path-effect5755"
-         inkscape:original-d="m 217.74747,611.08139 0,6.11426"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142595"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 213.54297,611.14341 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51708,0 -1.3338,0 -1.97015,0 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 216.20758,611.45881 2.62972,0 -0.006,0.28009 -1.24815,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142597" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 213.59574,611.13814 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63052 c -0.51707,0 0.40455,0 -0.2318,-1e-5 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142599" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 215.4374,611.43109 0,6.02755"
-         inkscape:path-effect="#path-effect5757"
-         id="path142601"
-         d="m 215.4374,611.43109 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="611.7337"
-         x="221.60103"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142603"
-         style="fill:url(#linearGradient149135);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149137);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142605"
-         width="12.494207"
-         height="0.62769938"
-         x="221.60103"
-         y="-617.21863" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 271.46279,595.62906 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.3843,0.3843 l -27.52056,0 c -0.21291,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path142607" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 274.14549,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:url(#linearGradient149139);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142609" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,596.83714 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142611" />
-      <path
-         id="path142613"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,598.13951 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,599.50593 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142615" />
-      <path
-         id="path142617"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,600.85101 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,597.4136 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142619" />
-      <path
-         id="path142621"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,598.78003 0.98212,0 0,0.7259 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,600.1251 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142623" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 297.72368,596.96525 0,4.65437"
-         inkscape:path-effect="#path-effect6155"
-         id="path142625"
-         d="m 297.72368,596.96525 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 294.09412,596.79445 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142627" />
-      <path
-         id="path142629"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 294.09412,600.85101 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 278.12409,595.81233 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect6157"
-         id="path142631"
-         d="m 278.12409,595.81233 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 290.54997,597.34956 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect6159"
-         id="path142633"
-         d="m 290.54997,597.34956 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 290.59267,601.06451 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182"
-         inkscape:path-effect="#path-effect6161"
-         id="path142635"
-         d="m 290.59267,601.06451 -12.51128,0 0,1.45182"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 290.89987,597.64679 3.08799,0 0,3.09689 -3.08799,0 z"
-         style="fill:url(#linearGradient149141);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path142637" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 294.31647,597.47765 0,3.43741"
-         inkscape:path-effect="#path-effect6165"
-         id="path142639"
-         d="m 294.31647,597.47765 0,3.43741"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 275.51931,596.46975 2.03809,0 0,5.43491 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142641" />
-      <path
-         d="m 278.28206,596.46975 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142643"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path142645"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 278.25186,601.22529 1.29834,0 0,0.66428 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 275.68538,595.80549 0,6.11426"
-         inkscape:path-effect="#path-effect6167"
-         id="path142647"
-         d="m 275.68538,595.80549 0,6.11426"
-         style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 271.48087,595.86751 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142649" />
-      <path
-         id="path142651"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 275.52045,596.18292 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path142653"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 271.53365,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 273.22586,596.15519 0,6.02755"
-         id="path142655"
-         inkscape:path-effect="#path-effect6169"
-         inkscape:original-d="m 273.22586,596.15519 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149143);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142657"
-         width="12.494207"
-         height="0.62769938"
-         x="279.53894"
-         y="596.45782" />
-      <rect
-         y="-601.94269"
-         x="279.53894"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142659"
-         style="fill:url(#linearGradient149145);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path142661"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 271.46279,603.2758 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path142663"
-         style="fill:url(#linearGradient149147);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 274.14549,603.82966 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path142665"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,604.48388 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,605.78626 0.98211,0 0,0.7259 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142667" />
-      <path
-         id="path142669"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,607.15268 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,608.49775 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142671" />
-      <path
-         id="path142673"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,605.06035 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,606.42677 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142675" />
-      <path
-         id="path142677"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,607.77184 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 297.72368,604.61199 0,4.65437"
-         id="path142679"
-         inkscape:path-effect="#path-effect6353"
-         inkscape:original-d="m 297.72368,604.61199 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path142681"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 294.09412,604.44119 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 294.09412,608.49775 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142683" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 278.12409,603.45907 0,1.53723 15.54303,0"
-         id="path142685"
-         inkscape:path-effect="#path-effect6355"
-         inkscape:original-d="m 278.12409,603.45907 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 290.54997,604.9963 0,3.71495 2.73284,0"
-         id="path142687"
-         inkscape:path-effect="#path-effect6357"
-         inkscape:original-d="m 290.54997,604.9963 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 290.59267,608.71125 -12.51128,0 0,1.45182"
-         id="path142689"
-         inkscape:path-effect="#path-effect6359"
-         inkscape:original-d="m 290.59267,608.71125 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path142691"
-         style="fill:url(#linearGradient149149);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 290.89987,605.29353 3.08799,0 0,3.0969 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 294.31647,605.1244 0,3.4374"
-         id="path142693"
-         inkscape:path-effect="#path-effect6363"
-         inkscape:original-d="m 294.31647,605.1244 0,3.4374"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142695"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 275.51931,604.11649 2.03809,0 0,5.43491 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path142697"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 278.28206,604.11649 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 278.25186,608.87204 1.29834,0 0,0.66427 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142699"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 275.68538,603.45223 0,6.11427"
-         id="path142701"
-         inkscape:path-effect="#path-effect6365"
-         inkscape:original-d="m 275.68538,603.45223 0,6.11427"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142703"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 271.48087,603.51425 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 275.52045,603.82966 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142705" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 271.53365,603.50898 c 0.0816,-0.003 0.14905,-0.002 0.17896,0.001 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22892 l 0,-6.17358 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142707" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 273.22586,603.80193 0,6.02755"
-         inkscape:path-effect="#path-effect6367"
-         id="path142709"
-         d="m 273.22586,603.80193 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="604.10455"
-         x="279.53894"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142711"
-         style="fill:url(#linearGradient149151);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149153);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142713"
-         width="12.494207"
-         height="0.62769938"
-         x="279.53894"
-         y="-609.58942" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 271.46279,610.9151 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path142715" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 274.14549,611.46896 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35717 -0.6861,-0.0318 z"
-         style="fill:url(#linearGradient149155);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142717" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,612.12319 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142719" />
-      <path
-         id="path142721"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,613.42556 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 296.18646,614.79198 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142723" />
-      <path
-         id="path142725"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 296.18646,616.13705 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,612.69965 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142727" />
-      <path
-         id="path142729"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 295.16164,614.06607 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 295.16164,615.41114 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142731" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 297.72368,612.25129 0,4.65437"
-         inkscape:path-effect="#path-effect6431"
-         id="path142733"
-         d="m 297.72368,612.25129 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 294.09412,612.08049 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142735" />
-      <path
-         id="path142737"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 294.09412,616.13705 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 278.12409,611.09837 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect6433"
-         id="path142739"
-         d="m 278.12409,611.09837 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 290.54997,612.6356 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect6435"
-         id="path142741"
-         d="m 290.54997,612.6356 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 290.59267,616.35055 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45183"
-         inkscape:path-effect="#path-effect6437"
-         id="path142743"
-         d="m 290.59267,616.35055 -12.51128,0 0,1.45183"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 290.89987,612.93283 3.08799,0 0,3.0969 -3.08799,0 z"
-         style="fill:url(#linearGradient149157);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path142745" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 294.31647,612.7637 0,3.4374"
-         inkscape:path-effect="#path-effect6441"
-         id="path142747"
-         d="m 294.31647,612.7637 0,3.4374"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 275.51931,611.7558 2.03809,0 0,5.4349 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142749" />
-      <path
-         d="m 278.28206,611.7558 1.29834,0 0,0.70955 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142751"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path142753"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 278.25186,616.51134 1.29834,0 0,0.66427 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 275.68538,611.09153 0,6.11427"
-         inkscape:path-effect="#path-effect6443"
-         id="path142755"
-         d="m 275.68538,611.09153 0,6.11427"
-         style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 271.48087,611.15355 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142757" />
-      <path
-         id="path142759"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 275.52045,611.46896 -2.52638,0 0.005,0.28009 1.1991,1.8e-4 0.0263,5.40196 -1.23068,0.0534 0,0.27298 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path142761"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 271.53365,611.14828 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,0 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.234,-0.22892 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 273.22586,611.44123 0,6.02755"
-         id="path142763"
-         inkscape:path-effect="#path-effect6445"
-         inkscape:original-d="m 273.22586,611.44123 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149159);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142765"
-         width="12.494207"
-         height="0.62769938"
-         x="279.53894"
-         y="611.74384" />
-      <rect
-         y="-617.22876"
-         x="279.53894"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142767"
-         style="fill:url(#linearGradient149161);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path142769"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 300.38668,595.62906 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.3843,0.3843 l -27.52056,0 c -0.21291,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path142771"
-         style="fill:url(#linearGradient149163);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 303.06938,596.18292 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path142773"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,596.83714 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,598.13951 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142775" />
-      <path
-         id="path142777"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,599.50593 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,600.85101 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142779" />
-      <path
-         id="path142781"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,597.4136 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,598.78003 0.98212,0 0,0.7259 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142783" />
-      <path
-         id="path142785"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,600.1251 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 326.64757,596.96525 0,4.65437"
-         id="path142787"
-         inkscape:path-effect="#path-effect6615"
-         inkscape:original-d="m 326.64757,596.96525 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path142789"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 323.01801,596.79445 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 323.01801,600.85101 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142791" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 307.04798,595.81233 0,1.53723 15.54303,0"
-         id="path142793"
-         inkscape:path-effect="#path-effect6617"
-         inkscape:original-d="m 307.04798,595.81233 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 319.47386,597.34956 0,3.71495 2.73284,0"
-         id="path142795"
-         inkscape:path-effect="#path-effect6619"
-         inkscape:original-d="m 319.47386,597.34956 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 319.51656,601.06451 -12.51128,0 0,1.45182"
-         id="path142797"
-         inkscape:path-effect="#path-effect6621"
-         inkscape:original-d="m 319.51656,601.06451 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path142799"
-         style="fill:url(#linearGradient149165);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 319.82376,597.64679 3.08799,0 0,3.09689 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 323.24036,597.47765 0,3.43741"
-         id="path142801"
-         inkscape:path-effect="#path-effect6625"
-         inkscape:original-d="m 323.24036,597.47765 0,3.43741"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142803"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 304.4432,596.46975 2.03809,0 0,5.43491 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path142805"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 307.20595,596.46975 1.29834,0 0,0.70956 -1.29834,0 z" />
-      <path
-         d="m 307.17575,601.22529 1.29834,0 0,0.66428 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142807"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 304.60927,595.80549 0,6.11426"
-         id="path142809"
-         inkscape:path-effect="#path-effect6627"
-         inkscape:original-d="m 304.60927,595.80549 0,6.11426"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142811"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 300.40476,595.86751 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 304.44434,596.18292 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142813" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 300.45754,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142815" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 302.14975,596.15519 0,6.02755"
-         inkscape:path-effect="#path-effect6629"
-         id="path142817"
-         d="m 302.14975,596.15519 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="596.45782"
-         x="308.46283"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142819"
-         style="fill:url(#linearGradient149167);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149169);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142821"
-         width="12.494207"
-         height="0.62769938"
-         x="308.46283"
-         y="-601.94269" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 300.38668,603.2758 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path142823" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 303.06938,603.82966 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z"
-         style="fill:url(#linearGradient149171);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142825" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,604.48388 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142827" />
-      <path
-         id="path142829"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,605.78626 0.98211,0 0,0.7259 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,607.15268 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142831" />
-      <path
-         id="path142833"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,608.49775 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,605.06035 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142835" />
-      <path
-         id="path142837"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,606.42677 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,607.77184 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142839" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 326.64757,604.61199 0,4.65437"
-         inkscape:path-effect="#path-effect6637"
-         id="path142841"
-         d="m 326.64757,604.61199 0,4.65437"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 323.01801,604.44119 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142843" />
-      <path
-         id="path142845"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 323.01801,608.49775 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 307.04798,603.45907 0,1.53723 15.54303,0"
-         inkscape:path-effect="#path-effect6639"
-         id="path142847"
-         d="m 307.04798,603.45907 0,1.53723 15.54303,0"
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 319.47386,604.9963 0,3.71495 2.73284,0"
-         inkscape:path-effect="#path-effect6641"
-         id="path142849"
-         d="m 319.47386,604.9963 0,3.71495 2.73284,0"
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 319.51656,608.71125 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45182"
-         inkscape:path-effect="#path-effect6643"
-         id="path142851"
-         d="m 319.51656,608.71125 -12.51128,0 0,1.45182"
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 319.82376,605.29353 3.08799,0 0,3.0969 -3.08799,0 z"
-         style="fill:url(#linearGradient149173);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path142853" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 323.24036,605.1244 0,3.4374"
-         inkscape:path-effect="#path-effect6647"
-         id="path142855"
-         d="m 323.24036,605.1244 0,3.4374"
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 304.4432,604.11649 2.03809,0 0,5.43491 -2.03809,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142857" />
-      <path
-         d="m 307.20595,604.11649 1.29834,0 0,0.70956 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142859"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path142861"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 307.17575,608.87204 1.29834,0 0,0.66427 -1.29834,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 304.60927,603.45223 0,6.11427"
-         inkscape:path-effect="#path-effect6649"
-         id="path142863"
-         d="m 304.60927,603.45223 0,6.11427"
-         style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 300.40476,603.51425 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142865" />
-      <path
-         id="path142867"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 304.44434,603.82966 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path142869"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 300.45754,603.50898 c 0.0816,-0.003 0.14905,-0.002 0.17896,0.001 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22892 l 0,-6.17358 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 302.14975,603.80193 0,6.02755"
-         id="path142871"
-         inkscape:path-effect="#path-effect6651"
-         inkscape:original-d="m 302.14975,603.80193 0,6.02755"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient149175);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142873"
-         width="12.494207"
-         height="0.62769938"
-         x="308.46283"
-         y="604.10455" />
-      <rect
-         y="-609.58942"
-         x="308.46283"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142875"
-         style="fill:url(#linearGradient149177);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path142877"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 300.38668,610.9151 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path142879"
-         style="fill:url(#linearGradient149179);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 303.06938,611.46896 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35717 -0.6861,-0.0318 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path142881"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,612.12319 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,613.42556 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142883" />
-      <path
-         id="path142885"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 325.11035,614.79198 0.98211,0 0,0.72591 -0.98211,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 325.11035,616.13705 0.98211,0 0,0.72591 -0.98211,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142887" />
-      <path
-         id="path142889"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,612.69965 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 324.08553,614.06607 0.98212,0 0,0.72591 -0.98212,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142891" />
-      <path
-         id="path142893"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 324.08553,615.41114 0.98212,0 0,0.72591 -0.98212,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 326.64757,612.25129 0,4.65437"
-         id="path142895"
-         inkscape:path-effect="#path-effect6659"
-         inkscape:original-d="m 326.64757,612.25129 0,4.65437"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path142897"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 323.01801,612.08049 0.76001,0 0,0.66186 -0.76001,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 323.01801,616.13705 0.76001,0 0,0.66186 -0.76001,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142899" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 307.04798,611.09837 0,1.53723 15.54303,0"
-         id="path142901"
-         inkscape:path-effect="#path-effect6661"
-         inkscape:original-d="m 307.04798,611.09837 0,1.53723 15.54303,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 319.47386,612.6356 0,3.71495 2.73284,0"
-         id="path142903"
-         inkscape:path-effect="#path-effect6663"
-         inkscape:original-d="m 319.47386,612.6356 0,3.71495 2.73284,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 319.51656,616.35055 -12.51128,0 0,1.45183"
-         id="path142905"
-         inkscape:path-effect="#path-effect6665"
-         inkscape:original-d="m 319.51656,616.35055 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45183"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path142907"
-         style="fill:url(#linearGradient149181);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 319.82376,612.93283 3.08799,0 0,3.0969 -3.08799,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 323.24036,612.7637 0,3.4374"
-         id="path142909"
-         inkscape:path-effect="#path-effect6669"
-         inkscape:original-d="m 323.24036,612.7637 0,3.4374"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142911"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 304.4432,611.7558 2.03809,0 0,5.4349 -2.03809,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path142913"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 307.20595,611.7558 1.29834,0 0,0.70955 -1.29834,0 z" />
-      <path
-         d="m 307.17575,616.51134 1.29834,0 0,0.66427 -1.29834,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142915"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 304.60927,611.09153 0,6.11427"
-         id="path142917"
-         inkscape:path-effect="#path-effect6671"
-         inkscape:original-d="m 304.60927,611.09153 0,6.11427"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142919"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 300.40476,611.15355 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 304.44434,611.46896 -2.52638,0 0.005,0.28009 1.1991,1.8e-4 0.0263,5.40196 -1.23068,0.0534 0,0.27298 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142921" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m 300.45754,611.14828 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,0 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.234,-0.22892 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142923" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 302.14975,611.44123 0,6.02755"
-         inkscape:path-effect="#path-effect6673"
-         id="path142925"
-         d="m 302.14975,611.44123 0,6.02755"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="611.74384"
-         x="308.46283"
-         height="0.62769938"
-         width="12.494207"
-         id="rect142927"
-         style="fill:url(#linearGradient149183);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient149185);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect142929"
-         width="12.494207"
-         height="0.62769938"
-         x="308.46283"
-         y="-617.22876" />
-      <path
-         id="path142931"
-         style="fill:url(#radialGradient149187);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.33817181"
-         d="m 208.03448,594.84301 5.44688,0.0211 -1.49896,0.53484 0,23.30535 -5.29061,0 0,-23.29041 c -0.0138,0.003 1.34269,-0.57092 1.34269,-0.57092 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         id="path142933"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient149189);stroke-width:0.33817181;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 208.54462,605.30753 1.42666,0 0,3.38172 -1.42666,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 209.37948,605.44491 0,3.11753"
-         id="path142935"
-         inkscape:path-effect="#path-effect6689"
-         inkscape:original-d="m 209.37948,605.44491 0,3.11753"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path142937"
-         style="fill:url(#radialGradient149191);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.33861357"
-         d="m 333.01057,594.9017 -5.44664,0.0212 1.49889,0.53626 0,23.36729 5.29037,0 0,-23.3523 c 0.0138,0.003 -1.34262,-0.57244 -1.34262,-0.57244 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         id="path142939"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 332.68665,610.08476 0.89672,0 0,1.07605 -0.89672,0 z m 0,-1.49452 0.89672,0 0,1.07605 -0.89672,0 z m 0,-1.49453 0.89672,0 0,1.07606 -0.89672,0 z m -1.28529,2.98905 0.89671,0 0,1.07605 -0.89671,0 z m 0,-1.49452 0.89671,0 0,1.07605 -0.89671,0 z m 0,-1.49453 0.89671,0 0,1.07606 -0.89671,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path142941"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 331.40136,613.33966 0.89671,0 0,1.07606 -0.89671,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path142943"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 333.17456,614.72682 0.62436,0 0,3.04354 -0.62436,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 332.06458,614.72682 0.62436,0 0,3.04354 -0.62436,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142945"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 330.95459,614.72682 0.62437,0 0,3.04354 -0.62437,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142947" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path142949"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 329.84461,614.72682 0.62437,0 0,3.04354 -0.62437,0 z" />
-      <path
-         d="m 333.86077,598.52056 0,0.62437 -4.2535,0 0,-0.62437 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142951"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path142953"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 333.86077,599.40826 0,0.62437 -4.2535,0 0,-0.62437 z" />
-      <path
-         d="m 331.40136,597.5724 0.89671,0 0,0.69561 -0.89671,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path142955"
-         inkscape:connector-curvature="0" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-233.14286,-544.74734)">
+    <g style="display:inline" id="g142275" transform="translate(26.620257,-41.875872)">
+      <path sodipodi:nodetypes="ccccccc" id="path142277" style="fill:url(#linearGradient149085);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 212.1896,595.39091 0,22.71748 116.666,0 -10e-6,-22.71748 -31.87765,-8.7677 -53.88512,0 z" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149087);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142279" width="117.4845" height="23.370089" x="211.99065" y="595.39062" ry="0"/>
+      <path id="path142281" style="fill:url(#linearGradient149089);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 211.99064,595.39064 117.48452,0 0,22.6865 -117.48452,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 242.48253,595.62906 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.38431,0.3843 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path142283"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 245.16523,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" style="fill:url(#linearGradient149091);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142285"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,596.83714 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142287"/>
+      <path id="path142289" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,598.13951 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,599.50593 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142291"/>
+      <path id="path142293" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,600.85101 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,597.4136 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142295"/>
+      <path id="path142297" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,598.78003 0.98211,0 0,0.7259 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,600.1251 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142299"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 268.74342,596.96525 0,4.65437" inkscape:path-effect="#path-effect4612" id="path142301" d="m 268.74342,596.96525 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 265.11387,596.79445 0.76,0 0,0.66186 -0.76,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142303"/>
+      <path id="path142305" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 265.11387,600.85101 0.76,0 0,0.66186 -0.76,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 249.14383,595.81233 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect4614" id="path142307" d="m 249.14383,595.81233 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 261.56972,597.34956 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect4616" id="path142309" d="m 261.56972,597.34956 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 261.61242,601.06451 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45182" inkscape:path-effect="#path-effect4618" id="path142311" d="m 261.61242,601.06451 -12.51129,0 0,1.45182" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 261.91961,597.64679 3.088,0 0,3.09689 -3.088,0 z" style="fill:url(#linearGradient149093);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path142313"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 265.33622,597.47765 0,3.43741" inkscape:path-effect="#path-effect4620" id="path142315" d="m 265.33622,597.47765 0,3.43741" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 246.53905,596.46975 2.0381,0 0,5.43491 -2.0381,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142317"/>
+      <path d="m 249.3018,596.46975 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142319" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path142321" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 249.27161,601.22529 1.29834,0 0,0.66428 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 246.70512,595.80549 0,6.11426" inkscape:path-effect="#path-effect4622" id="path142323" d="m 246.70512,595.80549 0,6.11426" style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 242.50062,595.86751 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61889 c -0.51707,0 -1.33379,0 -1.97015,-10e-6 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142325"/>
+      <path id="path142327" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 245.16523,596.18292 2.62972,0 -0.006,0.28009 -1.24814,1.7e-4 -0.0274,5.40197 1.28102,0.0534 0,0.27299 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path142329" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 242.55339,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63051 c -0.51708,0 0.40454,0 -0.23181,-10e-6 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 244.39505,596.15519 0,6.02755" id="path142331" inkscape:path-effect="#path-effect5365" inkscape:original-d="m 244.39505,596.15519 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149095);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142333" width="12.494207" height="0.62769938" x="250.5587" y="596.45782"/>
+      <rect y="-601.94269" x="250.5587" height="0.62769938" width="12.494207" id="rect142335" style="fill:url(#linearGradient149097);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path142337" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 242.48253,603.27174 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.21291 -0.1714,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path142339" style="fill:url(#linearGradient149099);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 245.16523,603.8256 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path142341" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,604.47983 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,605.7822 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142343"/>
+      <path id="path142345" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,607.14862 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,608.49369 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142347"/>
+      <path id="path142349" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,605.05629 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,606.42271 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142351"/>
+      <path id="path142353" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,607.76778 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 268.74342,604.60793 0,4.65437" id="path142355" inkscape:path-effect="#path-effect5439" inkscape:original-d="m 268.74342,604.60793 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path142357" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 265.11387,604.43713 0.76,0 0,0.66186 -0.76,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 265.11387,608.49369 0.76,0 0,0.66186 -0.76,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142359"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 249.14383,603.45501 0,1.53723 15.54303,0" id="path142361" inkscape:path-effect="#path-effect5441" inkscape:original-d="m 249.14383,603.45501 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 261.56972,604.99224 0,3.71495 2.73284,0" id="path142363" inkscape:path-effect="#path-effect5443" inkscape:original-d="m 261.56972,604.99224 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 261.61242,608.70719 -12.51129,0 0,1.45183" id="path142365" inkscape:path-effect="#path-effect5445" inkscape:original-d="m 261.61242,608.70719 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45183" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path142367" style="fill:url(#linearGradient149101);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 261.91961,605.28947 3.088,0 0,3.0969 -3.088,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 265.33622,605.12034 0,3.4374" id="path142369" inkscape:path-effect="#path-effect5449" inkscape:original-d="m 265.33622,605.12034 0,3.4374" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142371" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 246.53905,604.11244 2.0381,0 0,5.4349 -2.0381,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path142373" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 249.3018,604.11244 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 249.27161,608.86798 1.29834,0 0,0.66427 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142375" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 246.70512,603.44817 0,6.11427" id="path142377" inkscape:path-effect="#path-effect5451" inkscape:original-d="m 246.70512,603.44817 0,6.11427" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142379" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 242.50062,603.51019 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51707,0 -1.33379,0 -1.97015,-10e-6 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 245.16523,603.8256 2.62972,0 -0.006,0.28009 -1.24814,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142381"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 242.55339,603.50492 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63051 c -0.51708,0 0.40454,0 -0.23181,0 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.23401,-0.22892 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142383"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 244.39505,603.79787 0,6.02755" inkscape:path-effect="#path-effect5453" id="path142385" d="m 244.39505,603.79787 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="604.10052" x="250.5587" height="0.62769938" width="12.494207" id="rect142387" style="fill:url(#linearGradient149103);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149105);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142389" width="12.494207" height="0.62769938" x="250.5587" y="-609.58539"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 242.48253,610.90496 27.52056,0 c 0.21291,0 0.38431,0.1714 0.38431,0.3843 l 0,6.33216 c 0,0.21291 -0.1714,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.2129 0.17141,-0.3843 0.38431,-0.3843 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path142391"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 245.16523,611.45881 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67621,0.0192 0.007,2.04956 1.99733,-0.0207 0.0462,-3.91254 -0.0214,-1.4737 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" style="fill:url(#linearGradient149107);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142393"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,612.11304 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142395"/>
+      <path id="path142397" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,613.41541 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 267.2062,614.78183 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142399"/>
+      <path id="path142401" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.2062,616.1269 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,612.6895 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142403"/>
+      <path id="path142405" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 266.18139,614.05592 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 266.18139,615.40099 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142407"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 268.74342,612.24115 0,4.65436" inkscape:path-effect="#path-effect5515" id="path142409" d="m 268.74342,612.24115 0,4.65436" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 265.11387,612.07035 0.76,0 0,0.66186 -0.76,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142411"/>
+      <path id="path142413" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 265.11387,616.12691 0.76,0 0,0.66186 -0.76,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 249.14383,611.08823 0,1.53722 15.54303,0" inkscape:path-effect="#path-effect5517" id="path142415" d="m 249.14383,611.08823 0,1.53722 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 261.56972,612.62545 0,3.71496 2.73284,0" inkscape:path-effect="#path-effect5519" id="path142417" d="m 261.56972,612.62545 0,3.71496 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 261.61242,616.34041 c -4.17043,0 -8.34086,0 -12.51129,0 l 0,1.45182" inkscape:path-effect="#path-effect5521" id="path142419" d="m 261.61242,616.34041 -12.51129,0 0,1.45182" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 261.91961,612.92269 3.088,0 0,3.09689 -3.088,0 z" style="fill:url(#linearGradient149109);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path142421"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 265.33622,612.75355 0,3.4374" inkscape:path-effect="#path-effect5525" id="path142423" d="m 265.33622,612.75355 0,3.4374" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 246.53905,611.74565 2.0381,0 0,5.43491 -2.0381,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142425"/>
+      <path d="m 249.3018,611.74565 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142427" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path142429" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 249.27161,616.50119 1.29834,0 0,0.66427 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 246.70512,611.08139 0,6.11426" inkscape:path-effect="#path-effect5527" id="path142431" d="m 246.70512,611.08139 0,6.11426" style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 242.50062,611.14341 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51707,0 -1.33379,0 -1.97015,0 -0.15589,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142433"/>
+      <path id="path142435" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 245.16523,611.45881 2.62972,0 -0.006,0.28009 -1.24814,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0179,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path142437" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 242.55339,611.13814 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 7e-5,6.63052 c -0.51708,0 0.40454,0 -0.23181,-1e-5 -0.15589,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 244.39505,611.43109 0,6.02755" id="path142439" inkscape:path-effect="#path-effect5529" inkscape:original-d="m 244.39505,611.43109 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149111);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142441" width="12.494207" height="0.62769938" x="250.5587" y="611.7337"/>
+      <rect y="-617.21863" x="250.5587" height="0.62769938" width="12.494207" id="rect142443" style="fill:url(#linearGradient149113);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path142445" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 213.52488,595.62906 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.2129 -0.17141,0.3843 -0.38431,0.3843 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path142447" style="fill:url(#linearGradient149115);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 216.20758,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path142449" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,596.83714 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,598.13951 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142451"/>
+      <path id="path142453" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,599.50593 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,600.85101 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142455"/>
+      <path id="path142457" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,597.4136 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,598.78003 0.98211,0 0,0.7259 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142459"/>
+      <path id="path142461" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,600.1251 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 239.78577,596.96525 0,4.65437" id="path142463" inkscape:path-effect="#path-effect5699" inkscape:original-d="m 239.78577,596.96525 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path142465" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 236.15621,596.79445 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 236.15621,600.85101 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142467"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 220.18618,595.81233 0,1.53723 15.54303,0" id="path142469" inkscape:path-effect="#path-effect5701" inkscape:original-d="m 220.18618,595.81233 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 232.61207,597.34956 0,3.71495 2.73284,0" id="path142471" inkscape:path-effect="#path-effect5703" inkscape:original-d="m 232.61207,597.34956 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 232.65476,601.06451 -12.51128,0 0,1.45182" id="path142473" inkscape:path-effect="#path-effect5705" inkscape:original-d="m 232.65476,601.06451 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path142475" style="fill:url(#linearGradient149117);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 232.96196,597.64679 3.08799,0 0,3.09689 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 236.37857,597.47765 0,3.43741" id="path142477" inkscape:path-effect="#path-effect5709" inkscape:original-d="m 236.37857,597.47765 0,3.43741" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142479" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 217.5814,596.46975 2.03809,0 0,5.43491 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path142481" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 220.34415,596.46975 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 220.31395,601.22529 1.29834,0 0,0.66428 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142483" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 217.74747,595.80549 0,6.11426" id="path142485" inkscape:path-effect="#path-effect5711" inkscape:original-d="m 217.74747,595.80549 0,6.11426" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142487" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 213.54297,595.86751 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97015,-10e-6 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 216.20758,596.18292 2.62972,0 -0.006,0.28009 -1.24815,1.7e-4 -0.0274,5.40197 1.28102,0.0534 0,0.27299 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142489"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 213.59574,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63051 c -0.51707,0 0.40455,0 -0.2318,-10e-6 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142491"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 215.4374,596.15519 0,6.02755" inkscape:path-effect="#path-effect5713" id="path142493" d="m 215.4374,596.15519 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="596.45782" x="221.60103" height="0.62769938" width="12.494207" id="rect142495" style="fill:url(#linearGradient149119);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149121);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142497" width="12.494207" height="0.62769938" x="221.60103" y="-601.94269"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 213.52488,603.27174 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.38431 l 0,6.33216 c 0,0.21291 -0.17141,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.17141,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path142499"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 216.20758,603.8256 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" style="fill:url(#linearGradient149123);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142501"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,604.47983 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142503"/>
+      <path id="path142505" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,605.7822 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,607.14862 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142507"/>
+      <path id="path142509" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,608.49369 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,605.05629 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142511"/>
+      <path id="path142513" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,606.42271 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,607.76778 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142515"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 239.78577,604.60793 0,4.65437" inkscape:path-effect="#path-effect5721" id="path142517" d="m 239.78577,604.60793 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 236.15621,604.43713 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142519"/>
+      <path id="path142521" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 236.15621,608.49369 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 220.18618,603.45501 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect5723" id="path142523" d="m 220.18618,603.45501 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 232.61207,604.99224 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect5725" id="path142525" d="m 232.61207,604.99224 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 232.65476,608.70719 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45183" inkscape:path-effect="#path-effect5727" id="path142527" d="m 232.65476,608.70719 -12.51128,0 0,1.45183" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 232.96196,605.28947 3.08799,0 0,3.0969 -3.08799,0 z" style="fill:url(#linearGradient149125);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path142529"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 236.37857,605.12034 0,3.4374" inkscape:path-effect="#path-effect5731" id="path142531" d="m 236.37857,605.12034 0,3.4374" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 217.5814,604.11244 2.03809,0 0,5.4349 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142533"/>
+      <path d="m 220.34415,604.11244 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142535" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path142537" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 220.31395,608.86798 1.29834,0 0,0.66427 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 217.74747,603.44817 0,6.11427" inkscape:path-effect="#path-effect5733" id="path142539" d="m 217.74747,603.44817 0,6.11427" style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 213.54297,603.51019 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51708,0 -1.3338,0 -1.97015,-10e-6 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142541"/>
+      <path id="path142543" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 216.20758,603.8256 2.62972,0 -0.006,0.28009 -1.24815,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path142545" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 213.59574,603.50492 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63051 c -0.51707,0 0.40455,0 -0.2318,0 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.23401,-0.22892 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 215.4374,603.79787 0,6.02755" id="path142547" inkscape:path-effect="#path-effect5735" inkscape:original-d="m 215.4374,603.79787 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149127);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142549" width="12.494207" height="0.62769938" x="221.60103" y="604.10052"/>
+      <rect y="-609.58539" x="221.60103" height="0.62769938" width="12.494207" id="rect142551" style="fill:url(#linearGradient149129);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path142553" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 213.52488,610.90496 27.52056,0 c 0.2129,0 0.38431,0.1714 0.38431,0.3843 l 0,6.33216 c 0,0.21291 -0.17141,0.38431 -0.38431,0.38431 l -27.52056,0 c -0.2129,0 -0.38431,-0.1714 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.2129 0.17141,-0.3843 0.38431,-0.3843 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path142555" style="fill:url(#linearGradient149131);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 216.20758,611.45881 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.4737 -2.02336,-0.0139 0.0105,2.05368 -0.69549,0.0303 -0.003,-1.35716 -0.68609,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path142557" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,612.11304 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,613.41541 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142559"/>
+      <path id="path142561" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.24855,614.78183 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 238.24855,616.1269 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142563"/>
+      <path id="path142565" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,612.6895 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 237.22374,614.05592 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142567"/>
+      <path id="path142569" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 237.22374,615.40099 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 239.78577,612.24115 0,4.65436" id="path142571" inkscape:path-effect="#path-effect5743" inkscape:original-d="m 239.78577,612.24115 0,4.65436" inkscape:connector-curvature="0"/>
+      <path id="path142573" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 236.15621,612.07035 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 236.15621,616.12691 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142575"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 220.18618,611.08823 0,1.53722 15.54303,0" id="path142577" inkscape:path-effect="#path-effect5745" inkscape:original-d="m 220.18618,611.08823 0,1.53722 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 232.61207,612.62545 0,3.71496 2.73284,0" id="path142579" inkscape:path-effect="#path-effect5747" inkscape:original-d="m 232.61207,612.62545 0,3.71496 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 232.65476,616.34041 -12.51128,0 0,1.45182" id="path142581" inkscape:path-effect="#path-effect5749" inkscape:original-d="m 232.65476,616.34041 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path142583" style="fill:url(#linearGradient149133);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 232.96196,612.92269 3.08799,0 0,3.09689 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 236.37857,612.75355 0,3.4374" id="path142585" inkscape:path-effect="#path-effect5753" inkscape:original-d="m 236.37857,612.75355 0,3.4374" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142587" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 217.5814,611.74565 2.03809,0 0,5.43491 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path142589" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 220.34415,611.74565 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 220.31395,616.50119 1.29834,0 0,0.66427 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142591" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 217.74747,611.08139 0,6.11426" id="path142593" inkscape:path-effect="#path-effect5755" inkscape:original-d="m 217.74747,611.08139 0,6.11426" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142595" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 213.54297,611.14341 c 0.55186,-0.007 1.65799,-1.6e-4 1.97015,0.007 l 0,6.61888 c -0.51708,0 -1.3338,0 -1.97015,0 -0.1559,-0.007 -0.23401,-0.10202 -0.23401,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.23401,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 216.20758,611.45881 2.62972,0 -0.006,0.28009 -1.24815,1.8e-4 -0.0274,5.40196 1.28102,0.0534 0,0.27298 -2.62972,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 -0.01,-0.01 -0.0178,-5.41774 1.281,0.0208 -1.25475,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142597"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 213.59574,611.13814 c 0.0816,-0.003 0.14905,-0.002 0.17897,10e-4 l 6e-5,6.63052 c -0.51707,0 0.40455,0 -0.2318,-1e-5 -0.1559,-0.007 -0.23401,-0.1021 -0.23401,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.23401,-0.22893 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142599"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 215.4374,611.43109 0,6.02755" inkscape:path-effect="#path-effect5757" id="path142601" d="m 215.4374,611.43109 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="611.7337" x="221.60103" height="0.62769938" width="12.494207" id="rect142603" style="fill:url(#linearGradient149135);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149137);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142605" width="12.494207" height="0.62769938" x="221.60103" y="-617.21863"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 271.46279,595.62906 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.3843,0.3843 l -27.52056,0 c -0.21291,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path142607"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 274.14549,596.18292 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:url(#linearGradient149139);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142609"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,596.83714 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142611"/>
+      <path id="path142613" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,598.13951 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,599.50593 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142615"/>
+      <path id="path142617" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,600.85101 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,597.4136 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142619"/>
+      <path id="path142621" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,598.78003 0.98212,0 0,0.7259 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,600.1251 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142623"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 297.72368,596.96525 0,4.65437" inkscape:path-effect="#path-effect6155" id="path142625" d="m 297.72368,596.96525 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 294.09412,596.79445 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142627"/>
+      <path id="path142629" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 294.09412,600.85101 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 278.12409,595.81233 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect6157" id="path142631" d="m 278.12409,595.81233 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 290.54997,597.34956 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect6159" id="path142633" d="m 290.54997,597.34956 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 290.59267,601.06451 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182" inkscape:path-effect="#path-effect6161" id="path142635" d="m 290.59267,601.06451 -12.51128,0 0,1.45182" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 290.89987,597.64679 3.08799,0 0,3.09689 -3.08799,0 z" style="fill:url(#linearGradient149141);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path142637"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 294.31647,597.47765 0,3.43741" inkscape:path-effect="#path-effect6165" id="path142639" d="m 294.31647,597.47765 0,3.43741" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 275.51931,596.46975 2.03809,0 0,5.43491 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142641"/>
+      <path d="m 278.28206,596.46975 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142643" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path142645" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 278.25186,601.22529 1.29834,0 0,0.66428 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 275.68538,595.80549 0,6.11426" inkscape:path-effect="#path-effect6167" id="path142647" d="m 275.68538,595.80549 0,6.11426" style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 271.48087,595.86751 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142649"/>
+      <path id="path142651" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 275.52045,596.18292 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path142653" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 271.53365,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 273.22586,596.15519 0,6.02755" id="path142655" inkscape:path-effect="#path-effect6169" inkscape:original-d="m 273.22586,596.15519 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149143);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142657" width="12.494207" height="0.62769938" x="279.53894" y="596.45782"/>
+      <rect y="-601.94269" x="279.53894" height="0.62769938" width="12.494207" id="rect142659" style="fill:url(#linearGradient149145);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path142661" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 271.46279,603.2758 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path142663" style="fill:url(#linearGradient149147);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 274.14549,603.82966 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path142665" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,604.48388 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,605.78626 0.98211,0 0,0.7259 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142667"/>
+      <path id="path142669" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,607.15268 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,608.49775 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142671"/>
+      <path id="path142673" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,605.06035 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,606.42677 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142675"/>
+      <path id="path142677" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,607.77184 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 297.72368,604.61199 0,4.65437" id="path142679" inkscape:path-effect="#path-effect6353" inkscape:original-d="m 297.72368,604.61199 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path142681" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 294.09412,604.44119 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 294.09412,608.49775 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142683"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 278.12409,603.45907 0,1.53723 15.54303,0" id="path142685" inkscape:path-effect="#path-effect6355" inkscape:original-d="m 278.12409,603.45907 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 290.54997,604.9963 0,3.71495 2.73284,0" id="path142687" inkscape:path-effect="#path-effect6357" inkscape:original-d="m 290.54997,604.9963 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 290.59267,608.71125 -12.51128,0 0,1.45182" id="path142689" inkscape:path-effect="#path-effect6359" inkscape:original-d="m 290.59267,608.71125 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path142691" style="fill:url(#linearGradient149149);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 290.89987,605.29353 3.08799,0 0,3.0969 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 294.31647,605.1244 0,3.4374" id="path142693" inkscape:path-effect="#path-effect6363" inkscape:original-d="m 294.31647,605.1244 0,3.4374" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142695" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 275.51931,604.11649 2.03809,0 0,5.43491 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path142697" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 278.28206,604.11649 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 278.25186,608.87204 1.29834,0 0,0.66427 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142699" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 275.68538,603.45223 0,6.11427" id="path142701" inkscape:path-effect="#path-effect6365" inkscape:original-d="m 275.68538,603.45223 0,6.11427" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142703" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 271.48087,603.51425 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 275.52045,603.82966 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142705"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 271.53365,603.50898 c 0.0816,-0.003 0.14905,-0.002 0.17896,0.001 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22892 l 0,-6.17358 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142707"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 273.22586,603.80193 0,6.02755" inkscape:path-effect="#path-effect6367" id="path142709" d="m 273.22586,603.80193 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="604.10455" x="279.53894" height="0.62769938" width="12.494207" id="rect142711" style="fill:url(#linearGradient149151);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149153);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142713" width="12.494207" height="0.62769938" x="279.53894" y="-609.58942"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 271.46279,610.9151 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path142715"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 274.14549,611.46896 24.57785,0 0,6.00859 -24.57785,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35717 -0.6861,-0.0318 z" style="fill:url(#linearGradient149155);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142717"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,612.12319 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142719"/>
+      <path id="path142721" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,613.42556 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 296.18646,614.79198 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142723"/>
+      <path id="path142725" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 296.18646,616.13705 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,612.69965 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142727"/>
+      <path id="path142729" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 295.16164,614.06607 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 295.16164,615.41114 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142731"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 297.72368,612.25129 0,4.65437" inkscape:path-effect="#path-effect6431" id="path142733" d="m 297.72368,612.25129 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 294.09412,612.08049 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142735"/>
+      <path id="path142737" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 294.09412,616.13705 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 278.12409,611.09837 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect6433" id="path142739" d="m 278.12409,611.09837 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 290.54997,612.6356 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect6435" id="path142741" d="m 290.54997,612.6356 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 290.59267,616.35055 c -4.17043,0 -8.34085,0 -12.51128,0 l 0,1.45183" inkscape:path-effect="#path-effect6437" id="path142743" d="m 290.59267,616.35055 -12.51128,0 0,1.45183" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 290.89987,612.93283 3.08799,0 0,3.0969 -3.08799,0 z" style="fill:url(#linearGradient149157);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path142745"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 294.31647,612.7637 0,3.4374" inkscape:path-effect="#path-effect6441" id="path142747" d="m 294.31647,612.7637 0,3.4374" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 275.51931,611.7558 2.03809,0 0,5.4349 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142749"/>
+      <path d="m 278.28206,611.7558 1.29834,0 0,0.70955 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142751" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path142753" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 278.25186,616.51134 1.29834,0 0,0.66427 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 275.68538,611.09153 0,6.11427" inkscape:path-effect="#path-effect6443" id="path142755" d="m 275.68538,611.09153 0,6.11427" style="fill:none;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 271.48087,611.15355 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142757"/>
+      <path id="path142759" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 275.52045,611.46896 -2.52638,0 0.005,0.28009 1.1991,1.8e-4 0.0263,5.40196 -1.23068,0.0534 0,0.27298 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0171,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path142761" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 271.53365,611.14828 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,0 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.234,-0.22892 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 273.22586,611.44123 0,6.02755" id="path142763" inkscape:path-effect="#path-effect6445" inkscape:original-d="m 273.22586,611.44123 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149159);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142765" width="12.494207" height="0.62769938" x="279.53894" y="611.74384"/>
+      <rect y="-617.22876" x="279.53894" height="0.62769938" width="12.494207" id="rect142767" style="fill:url(#linearGradient149161);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path142769" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 300.38668,595.62906 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.3843 -0.3843,0.3843 l -27.52056,0 c -0.21291,0 -0.38431,-0.1714 -0.38431,-0.3843 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path142771" style="fill:url(#linearGradient149163);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 303.06938,596.18292 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91254 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path142773" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,596.83714 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,598.13951 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142775"/>
+      <path id="path142777" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,599.50593 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,600.85101 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142779"/>
+      <path id="path142781" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,597.4136 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,598.78003 0.98212,0 0,0.7259 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142783"/>
+      <path id="path142785" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,600.1251 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 326.64757,596.96525 0,4.65437" id="path142787" inkscape:path-effect="#path-effect6615" inkscape:original-d="m 326.64757,596.96525 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path142789" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 323.01801,596.79445 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 323.01801,600.85101 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142791"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 307.04798,595.81233 0,1.53723 15.54303,0" id="path142793" inkscape:path-effect="#path-effect6617" inkscape:original-d="m 307.04798,595.81233 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 319.47386,597.34956 0,3.71495 2.73284,0" id="path142795" inkscape:path-effect="#path-effect6619" inkscape:original-d="m 319.47386,597.34956 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 319.51656,601.06451 -12.51128,0 0,1.45182" id="path142797" inkscape:path-effect="#path-effect6621" inkscape:original-d="m 319.51656,601.06451 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path142799" style="fill:url(#linearGradient149165);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 319.82376,597.64679 3.08799,0 0,3.09689 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 323.24036,597.47765 0,3.43741" id="path142801" inkscape:path-effect="#path-effect6625" inkscape:original-d="m 323.24036,597.47765 0,3.43741" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142803" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 304.4432,596.46975 2.03809,0 0,5.43491 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path142805" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 307.20595,596.46975 1.29834,0 0,0.70956 -1.29834,0 z"/>
+      <path d="m 307.17575,601.22529 1.29834,0 0,0.66428 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142807" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 304.60927,595.80549 0,6.11426" id="path142809" inkscape:path-effect="#path-effect6627" inkscape:original-d="m 304.60927,595.80549 0,6.11426" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142811" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 300.40476,595.86751 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 304.44434,596.18292 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142813"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 300.45754,595.86224 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17357 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142815"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 302.14975,596.15519 0,6.02755" inkscape:path-effect="#path-effect6629" id="path142817" d="m 302.14975,596.15519 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="596.45782" x="308.46283" height="0.62769938" width="12.494207" id="rect142819" style="fill:url(#linearGradient149167);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149169);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142821" width="12.494207" height="0.62769938" x="308.46283" y="-601.94269"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 300.38668,603.2758 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" id="path142823"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m 303.06938,603.82966 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05369 -0.6955,0.0303 -0.003,-1.35716 -0.6861,-0.0318 z" style="fill:url(#linearGradient149171);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142825"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,604.48388 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142827"/>
+      <path id="path142829" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,605.78626 0.98211,0 0,0.7259 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,607.15268 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142831"/>
+      <path id="path142833" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,608.49775 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,605.06035 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142835"/>
+      <path id="path142837" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,606.42677 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,607.77184 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142839"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 326.64757,604.61199 0,4.65437" inkscape:path-effect="#path-effect6637" id="path142841" d="m 326.64757,604.61199 0,4.65437" style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m 323.01801,604.44119 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142843"/>
+      <path id="path142845" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 323.01801,608.49775 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 307.04798,603.45907 0,1.53723 15.54303,0" inkscape:path-effect="#path-effect6639" id="path142847" d="m 307.04798,603.45907 0,1.53723 15.54303,0" style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 319.47386,604.9963 0,3.71495 2.73284,0" inkscape:path-effect="#path-effect6641" id="path142849" d="m 319.47386,604.9963 0,3.71495 2.73284,0" style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 319.51656,608.71125 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45182" inkscape:path-effect="#path-effect6643" id="path142851" d="m 319.51656,608.71125 -12.51128,0 0,1.45182" style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m 319.82376,605.29353 3.08799,0 0,3.0969 -3.08799,0 z" style="fill:url(#linearGradient149173);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path142853"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 323.24036,605.1244 0,3.4374" inkscape:path-effect="#path-effect6647" id="path142855" d="m 323.24036,605.1244 0,3.4374" style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 304.4432,604.11649 2.03809,0 0,5.43491 -2.03809,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142857"/>
+      <path d="m 307.20595,604.11649 1.29834,0 0,0.70956 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142859" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path142861" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 307.17575,608.87204 1.29834,0 0,0.66427 -1.29834,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 304.60927,603.45223 0,6.11427" inkscape:path-effect="#path-effect6649" id="path142863" d="m 304.60927,603.45223 0,6.11427" style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 300.40476,603.51425 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16876 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142865"/>
+      <path id="path142867" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 304.44434,603.82966 -2.52638,0 0.005,0.28009 1.1991,1.7e-4 0.0263,5.40197 -1.23068,0.0534 0,0.27299 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path142869" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 300.45754,603.50898 c 0.0816,-0.003 0.14905,-0.002 0.17896,0.001 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,-10e-6 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22892 l 0,-6.17358 c 0,-0.12683 0.10437,-0.22893 0.234,-0.22893 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 302.14975,603.80193 0,6.02755" id="path142871" inkscape:path-effect="#path-effect6651" inkscape:original-d="m 302.14975,603.80193 0,6.02755" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient149175);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142873" width="12.494207" height="0.62769938" x="308.46283" y="604.10455"/>
+      <rect y="-609.58942" x="308.46283" height="0.62769938" width="12.494207" id="rect142875" style="fill:url(#linearGradient149177);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path142877" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.47344053;stroke-miterlimit:4;stroke-dasharray:none" d="m 300.38668,610.9151 27.52056,0 c 0.2129,0 0.3843,0.1714 0.3843,0.38431 l 0,6.33216 c 0,0.2129 -0.1714,0.38431 -0.3843,0.38431 l -27.52056,0 c -0.21291,0 -0.38431,-0.17141 -0.38431,-0.38431 l 0,-6.33216 c 0,-0.21291 0.1714,-0.38431 0.38431,-0.38431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path142879" style="fill:url(#linearGradient149179);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 303.06938,611.46896 24.57784,0 0,6.00859 -24.57784,0 0,-1.35873 0.69446,0 -0.002,-1.02659 0.67622,0.0192 0.007,2.04956 1.99734,-0.0207 0.0462,-3.91255 -0.0214,-1.47369 -2.02336,-0.0139 0.0105,2.05368 -0.6955,0.0303 -0.003,-1.35717 -0.6861,-0.0318 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path142881" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,612.12319 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,613.42556 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142883"/>
+      <path id="path142885" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 325.11035,614.79198 0.98211,0 0,0.72591 -0.98211,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 325.11035,616.13705 0.98211,0 0,0.72591 -0.98211,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142887"/>
+      <path id="path142889" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,612.69965 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 324.08553,614.06607 0.98212,0 0,0.72591 -0.98212,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142891"/>
+      <path id="path142893" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 324.08553,615.41114 0.98212,0 0,0.72591 -0.98212,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 326.64757,612.25129 0,4.65437" id="path142895" inkscape:path-effect="#path-effect6659" inkscape:original-d="m 326.64757,612.25129 0,4.65437" inkscape:connector-curvature="0"/>
+      <path id="path142897" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 323.01801,612.08049 0.76001,0 0,0.66186 -0.76001,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 323.01801,616.13705 0.76001,0 0,0.66186 -0.76001,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142899"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 307.04798,611.09837 0,1.53723 15.54303,0" id="path142901" inkscape:path-effect="#path-effect6661" inkscape:original-d="m 307.04798,611.09837 0,1.53723 15.54303,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 319.47386,612.6356 0,3.71495 2.73284,0" id="path142903" inkscape:path-effect="#path-effect6663" inkscape:original-d="m 319.47386,612.6356 0,3.71495 2.73284,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.54107493;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 319.51656,616.35055 -12.51128,0 0,1.45183" id="path142905" inkscape:path-effect="#path-effect6665" inkscape:original-d="m 319.51656,616.35055 c -4.17043,0 -8.34086,0 -12.51128,0 l 0,1.45183" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path142907" style="fill:url(#linearGradient149181);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.34097391;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 319.82376,612.93283 3.08799,0 0,3.0969 -3.08799,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 323.24036,612.7637 0,3.4374" id="path142909" inkscape:path-effect="#path-effect6669" inkscape:original-d="m 323.24036,612.7637 0,3.4374" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142911" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 304.4432,611.7558 2.03809,0 0,5.4349 -2.03809,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path142913" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 307.20595,611.7558 1.29834,0 0,0.70955 -1.29834,0 z"/>
+      <path d="m 307.17575,616.51134 1.29834,0 0,0.66427 -1.29834,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142915" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#008080;stroke:#d45500;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 304.60927,611.09153 0,6.11427" id="path142917" inkscape:path-effect="#path-effect6671" inkscape:original-d="m 304.60927,611.09153 0,6.11427" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142919" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 300.40476,611.15355 c 0.55187,-0.007 1.658,-1.6e-4 1.97016,0.007 l 0,6.61889 c -0.51708,0 -1.3338,0 -1.97016,-10e-6 -0.15589,-0.007 -0.234,-0.10202 -0.234,-0.22875 l 0,-6.16875 c 0,-0.12673 0.10437,-0.22875 0.234,-0.22875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 304.44434,611.46896 -2.52638,0 0.005,0.28009 1.1991,1.8e-4 0.0263,5.40196 -1.23068,0.0534 0,0.27298 2.52638,0 0,-1.35873 -0.66717,0 0.002,-1.02659 -0.64965,0.0192 -0.007,2.04956 0.009,-0.01 0.0172,-5.41774 -1.23066,0.0208 1.20544,-0.0139 -0.0101,2.05368 0.66816,0.0303 0.003,-1.35716 0.65913,-0.0318 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142921"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m 300.45754,611.14828 c 0.0816,-0.003 0.14905,-0.002 0.17896,10e-4 l 7e-5,6.63051 c -0.51707,0 0.40455,0 -0.23181,0 -0.15589,-0.007 -0.234,-0.1021 -0.234,-0.22893 l 0,-6.17358 c 0,-0.12682 0.10437,-0.22892 0.234,-0.22892 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142923"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 302.14975,611.44123 0,6.02755" inkscape:path-effect="#path-effect6673" id="path142925" d="m 302.14975,611.44123 0,6.02755" style="fill:none;stroke:#b3b3b3;stroke-width:0.38483763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="611.74384" x="308.46283" height="0.62769938" width="12.494207" id="rect142927" style="fill:url(#linearGradient149183);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient149185);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect142929" width="12.494207" height="0.62769938" x="308.46283" y="-617.22876"/>
+      <path id="path142931" style="fill:url(#radialGradient149187);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.33817181" d="m 208.03448,594.84301 5.44688,0.0211 -1.49896,0.53484 0,23.30535 -5.29061,0 0,-23.29041 c -0.0138,0.003 1.34269,-0.57092 1.34269,-0.57092 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+      <path id="path142933" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient149189);stroke-width:0.33817181;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 208.54462,605.30753 1.42666,0 0,3.38172 -1.42666,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#000000;stroke-width:0.33817181px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 209.37948,605.44491 0,3.11753" id="path142935" inkscape:path-effect="#path-effect6689" inkscape:original-d="m 209.37948,605.44491 0,3.11753" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path142937" style="fill:url(#radialGradient149191);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.33861357" d="m 333.01057,594.9017 -5.44664,0.0212 1.49889,0.53626 0,23.36729 5.29037,0 0,-23.3523 c 0.0138,0.003 -1.34262,-0.57244 -1.34262,-0.57244 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+      <path id="path142939" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 332.68665,610.08476 0.89672,0 0,1.07605 -0.89672,0 z m 0,-1.49452 0.89672,0 0,1.07605 -0.89672,0 z m 0,-1.49453 0.89672,0 0,1.07606 -0.89672,0 z m -1.28529,2.98905 0.89671,0 0,1.07605 -0.89671,0 z m 0,-1.49452 0.89671,0 0,1.07605 -0.89671,0 z m 0,-1.49453 0.89671,0 0,1.07606 -0.89671,0 z" inkscape:connector-curvature="0"/>
+      <path id="path142941" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 331.40136,613.33966 0.89671,0 0,1.07606 -0.89671,0 z" inkscape:connector-curvature="0"/>
+      <path id="path142943" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 333.17456,614.72682 0.62436,0 0,3.04354 -0.62436,0 z" inkscape:connector-curvature="0"/>
+      <path d="m 332.06458,614.72682 0.62436,0 0,3.04354 -0.62436,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142945" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 330.95459,614.72682 0.62437,0 0,3.04354 -0.62437,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142947"/>
+      <path inkscape:connector-curvature="0" id="path142949" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 329.84461,614.72682 0.62437,0 0,3.04354 -0.62437,0 z"/>
+      <path d="m 333.86077,598.52056 0,0.62437 -4.2535,0 0,-0.62437 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142951" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path142953" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 333.86077,599.40826 0,0.62437 -4.2535,0 0,-0.62437 z"/>
+      <path d="m 331.40136,597.5724 0.89671,0 0,0.69561 -0.89671,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path142955" inkscape:connector-curvature="0"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Firewall.svg b/misc/images/svg/elements/Firewall.svg
index 1c02f927649..2f600ffe887 100644
--- a/misc/images/svg/elements/Firewall.svg
+++ b/misc/images/svg/elements/Firewall.svg
@@ -1,2934 +1,540 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="95.913948"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12327-0"
-       id="linearGradient120912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.11855694,-0.0188069,0,0.12591085,816.92022,1503.8981)"
-       x1="-90.215118"
-       y1="931.0921"
-       x2="-122.94196"
-       y2="1325.8798" />
-    <linearGradient
-       id="linearGradient12327-0">
-      <stop
-         id="stop12329-7"
-         offset="0"
-         style="stop-color:#faf202;stop-opacity:1;" />
-      <stop
-         id="stop12331-0"
-         offset="1"
-         style="stop-color:#9c3b02;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="95.913948" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient12327-0" id="linearGradient120912" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.11855694,-0.0188069,0,0.12591085,816.92022,1503.8981)" x1="-90.215118" y1="931.0921" x2="-122.94196" y2="1325.8798"/>
+    <linearGradient id="linearGradient12327-0">
+      <stop id="stop12329-7" offset="0" style="stop-color:#faf202;stop-opacity:1;"/>
+      <stop id="stop12331-0" offset="1" style="stop-color:#9c3b02;stop-opacity:1;"/>
     </linearGradient>
-    <filter
-       id="filter12291-3"
-       y="-0.2"
-       width="1.2"
-       height="1.4"
-       x="-0.1"
-       inkscape:label="Fire"
-       inkscape:menu="Protrusions"
-       inkscape:menu-tooltip="Edges of object are on fire"
-       color-interpolation-filters="sRGB">
-      <feMorphology
-         id="feMorphology12293-8"
-         result="result1"
-         radius="2.4"
-         operator="dilate" />
-      <feTurbulence
-         id="feTurbulence12295-7"
-         baseFrequency="0.09 0.028"
-         numOctaves="1" />
-      <feColorMatrix
-         id="feColorMatrix12297-9"
-         result="result2"
-         values="2 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 1 0" />
-      <feDisplacementMap
-         id="feDisplacementMap12299-44"
-         in2="result2"
-         result="result4"
-         scale="10.31941"
-         yChannelSelector="G"
-         xChannelSelector="R"
-         in="result1" />
-      <feFlood
-         id="feFlood12301-3"
-         result="result3"
-         flood-opacity="1"
-         flood-color="rgb(255,159,54)" />
-      <feMorphology
-         id="feMorphology12303-5"
-         radius="3.8"
-         result="result7"
-         in="result4" />
-      <feGaussianBlur
-         id="feGaussianBlur12305-4"
-         result="result7"
-         in="result7"
-         stdDeviation="2.4" />
-      <feComposite
-         id="feComposite12307-42"
-         in2="result4"
-         result="result5"
-         in="result3"
-         operator="in" />
-      <feComposite
-         id="feComposite12309-7"
-         in2="result7"
-         operator="out" />
-      <feOffset
-         id="feOffset12311-7"
-         result="result6"
-         dy="-7"
-         dx="-4.5" />
-      <feGaussianBlur
-         id="feGaussianBlur12313-5"
-         result="result7"
-         stdDeviation="4.8" />
-      <feComposite
-         id="feComposite12315-6"
-         in2="result6"
-         in="SourceGraphic"
-         result="result8" />
-      <feComposite
-         id="feComposite12317-6"
-         in2="result7" />
+    <filter id="filter12291-3" y="-0.2" width="1.2" height="1.4" x="-0.1" inkscape:label="Fire" inkscape:menu="Protrusions" inkscape:menu-tooltip="Edges of object are on fire" color-interpolation-filters="sRGB">
+      <feMorphology id="feMorphology12293-8" result="result1" radius="2.4" operator="dilate"/>
+      <feTurbulence id="feTurbulence12295-7" baseFrequency="0.09 0.028" numOctaves="1"/>
+      <feColorMatrix id="feColorMatrix12297-9" result="result2" values="2 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+      <feDisplacementMap id="feDisplacementMap12299-44" in2="result2" result="result4" scale="10.31941" yChannelSelector="G" xChannelSelector="R" in="result1"/>
+      <feFlood id="feFlood12301-3" result="result3" flood-opacity="1" flood-color="rgb(255,159,54)"/>
+      <feMorphology id="feMorphology12303-5" radius="3.8" result="result7" in="result4"/>
+      <feGaussianBlur id="feGaussianBlur12305-4" result="result7" in="result7" stdDeviation="2.4"/>
+      <feComposite id="feComposite12307-42" in2="result4" result="result5" in="result3" operator="in"/>
+      <feComposite id="feComposite12309-7" in2="result7" operator="out"/>
+      <feOffset id="feOffset12311-7" result="result6" dy="-7" dx="-4.5"/>
+      <feGaussianBlur id="feGaussianBlur12313-5" result="result7" stdDeviation="4.8"/>
+      <feComposite id="feComposite12315-6" in2="result6" in="SourceGraphic" result="result8"/>
+      <feComposite id="feComposite12317-6" in2="result7"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11032-7-6"
-       id="linearGradient120914"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.11855694,-0.0188069,0,0.12591085,816.30314,1477.9804)"
-       x1="-91.469711"
-       y1="1216.6841"
-       x2="-78.334816"
-       y2="1079.3312" />
-    <linearGradient
-       id="linearGradient11032-7-6">
-      <stop
-         style="stop-color:#aa0000;stop-opacity:1;"
-         offset="0"
-         id="stop11034-4-6" />
-      <stop
-         style="stop-color:#ff1010;stop-opacity:1;"
-         offset="1"
-         id="stop11036-0-1" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11032-7-6" id="linearGradient120914" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.11855694,-0.0188069,0,0.12591085,816.30314,1477.9804)" x1="-91.469711" y1="1216.6841" x2="-78.334816" y2="1079.3312"/>
+    <linearGradient id="linearGradient11032-7-6">
+      <stop style="stop-color:#aa0000;stop-opacity:1;" offset="0" id="stop11034-4-6"/>
+      <stop style="stop-color:#ff1010;stop-opacity:1;" offset="1" id="stop11036-0-1"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient119892"
-       id="linearGradient120916"
-       gradientUnits="userSpaceOnUse"
-       x1="55.779922"
-       y1="1564.1458"
-       x2="-344.51505"
-       y2="1070.9723" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient119892">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop119894" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop119896" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient119892" id="linearGradient120916" gradientUnits="userSpaceOnUse" x1="55.779922" y1="1564.1458" x2="-344.51505" y2="1070.9723"/>
+    <linearGradient inkscape:collect="always" id="linearGradient119892">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop119894"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop119896"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter119916"
-       x="-0.013514084"
-       width="1.0270282"
-       y="-0.13691488"
-       height="1.2738298">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="17.145669"
-         id="feGaussianBlur119918" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter119916" x="-0.013514084" width="1.0270282" y="-0.13691488" height="1.2738298">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="17.145669" id="feGaussianBlur119918"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11032-71"
-       id="linearGradient120918"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34171723,0,0,0.58600715,732.01217,792.45356)"
-       x1="205.41455"
-       y1="1510.8406"
-       x2="196.51129"
-       y2="1454.9791" />
-    <linearGradient
-       id="linearGradient11032-71">
-      <stop
-         style="stop-color:#aa0000;stop-opacity:1;"
-         offset="0"
-         id="stop11034-7" />
-      <stop
-         style="stop-color:#ff1010;stop-opacity:1;"
-         offset="1"
-         id="stop11036-06" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11032-71" id="linearGradient120918" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.34171723,0,0,0.58600715,732.01217,792.45356)" x1="205.41455" y1="1510.8406" x2="196.51129" y2="1454.9791"/>
+    <linearGradient id="linearGradient11032-71">
+      <stop style="stop-color:#aa0000;stop-opacity:1;" offset="0" id="stop11034-7"/>
+      <stop style="stop-color:#ff1010;stop-opacity:1;" offset="1" id="stop11036-06"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26872"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26869"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26866"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26863"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26860"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26857"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26854"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26851"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26848"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26845"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26842"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26839"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26836"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26833"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26830"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26827"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26824"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26821"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26818"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26815"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26812"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26809"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26806"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26803"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26800"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26797"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26794"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26791"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26788"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26785"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26782"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26779"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26776"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26773"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26770"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26767"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26764"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26761"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26758"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26755"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26752"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26749"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26746"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26743"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26740"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26737"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26734"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26731"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26728"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26725"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26722"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26719"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26716"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26713"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26710"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26707"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26704"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26701"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26698"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26695"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26692"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26689"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26686"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26683"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26680"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26677"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26674"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26671"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26668"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26665"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26662"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26659"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26656"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26653"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26650"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26647"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26644"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26641"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26638"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26635"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26632"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26629"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26626"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26623"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26620"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26617"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26614"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26611"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26608"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26605"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26602"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26599"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26596"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26593"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26590"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26587"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26584"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26581"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26578"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26575"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26572"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26569"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26566"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26563"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26560"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26557"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26554"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26551"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26548"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26545"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26542"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26539"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26536"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26533"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26530"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26527"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26524"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26521"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26518"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26515"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26512"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26509"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26506"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26503"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26500"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26497"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26494"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26491"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26488"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26485"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26482"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26479"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26476"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26473"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26470"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26467"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26464"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26461"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26458"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26455"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26452"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26449"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26446"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26443"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26440"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26437"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26434"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26431"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26428"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26425"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26422"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26419"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26416"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26413"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26410"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26407"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26404"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26401"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26398"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26395"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26392"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26389"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26386"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26383"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26380"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26377"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26374"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26371"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26368"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26365"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26362"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26359"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26356"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26353"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26350"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26347"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26344"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26341"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26338"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26335"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26332"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26329"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26326"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26323"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26320"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26317"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26314"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26311"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26308"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26305"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26302"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26299"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26296"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26293"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26290"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26287"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26284"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26281"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26278"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26275"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26272"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26269"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26266"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26263"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26260"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26257"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26254"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26251"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26248"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26245"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26242"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26239"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26236"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26233"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26230"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26227"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26224"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26221"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26218"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26215"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26212"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26209"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26206"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26203"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26200"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26197"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26194"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26191"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26188"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26185"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26182"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26179"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26176"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26173"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26170"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26167"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect26164"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect26161"
-       effect="spiro" />
+    <inkscape:path-effect is_visible="true" id="path-effect26872" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26869" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26866" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26863" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26860" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26857" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26854" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26851" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26848" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26845" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26842" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26839" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26836" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26833" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26830" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26827" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26824" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26821" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26818" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26815" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26812" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26809" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26806" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26803" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26800" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26797" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26794" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26791" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26788" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26785" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26782" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26779" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26776" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26773" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26770" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26767" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26764" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26761" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26758" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26755" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26752" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26749" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26746" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26743" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26740" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26737" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26734" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26731" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26728" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26725" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26722" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26719" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26716" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26713" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26710" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26707" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26704" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26701" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26698" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26695" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26692" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26689" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26686" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26683" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26680" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26677" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26674" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26671" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26668" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26665" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26662" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26659" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26656" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26653" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26650" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26647" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26644" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26641" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26638" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26635" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26632" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26629" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26626" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26623" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26620" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26617" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26614" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26611" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26608" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26605" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26602" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26599" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26596" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26593" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26590" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26587" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26584" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26581" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26578" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26575" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26572" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26569" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26566" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26563" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26560" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26557" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26554" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26551" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26548" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26545" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26542" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26539" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26536" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26533" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26530" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26527" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26524" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26521" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26518" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26515" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26512" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26509" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26506" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26503" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26500" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26497" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26494" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26491" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26488" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26485" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26482" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26479" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26476" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26473" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26470" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26467" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26464" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26461" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26458" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26455" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26452" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26449" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26446" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26443" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26440" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26437" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26434" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26431" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26428" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26425" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26422" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26419" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26416" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26413" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26410" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26407" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26404" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26401" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26398" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26395" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26392" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26389" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26386" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26383" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26380" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26377" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26374" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26371" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26368" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26365" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26362" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26359" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26356" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26353" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26350" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26347" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26344" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26341" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26338" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26335" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26332" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26329" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26326" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26323" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26320" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26317" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26314" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26311" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26308" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26305" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26302" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26299" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26296" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26293" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26290" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26287" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26284" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26281" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26278" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26275" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26272" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26269" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26266" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26263" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26260" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26257" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26254" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26251" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26248" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26245" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26242" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26239" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26236" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26233" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26230" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26227" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26224" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26221" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26218" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26215" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26212" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26209" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26206" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26203" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26200" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26197" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26194" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26191" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26188" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26185" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26182" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26179" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26176" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26173" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26170" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26167" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect26164" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect26161" effect="spiro"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-55.285709"
-     inkscape:cy="139.38557"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="66"
-     inkscape:window-y="87"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-55.285709" inkscape:cy="139.38557" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="66" inkscape:window-y="87" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-430.28571,-575.83381)">
-    <g
-       style="display:inline"
-       id="g120168"
-       transform="matrix(1.0298528,0,0,1.0298528,-364.50483,-1080.756)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Firewall.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         sodipodi:nodetypes="csccsssssssscsssscsssscssssssssssssssscssssscssscsscsccsssssssscsscsssscssscsssssssccssssscccsssssssscsccssccsssscssssssssscscsssssssssscssscssscscsssssscssccsscscssscsssssscssscssssccssssssssccssscsscsssscsccssccssscscscscssss"
-         inkscape:connector-curvature="0"
-         id="path11997-9"
-         d="m 774.98987,1645.8557 c -0.55641,-0.5528 -0.73378,-2.4138 -0.6113,-3.1439 0.0437,-0.2608 0.21167,-0.7483 0.37314,-1.0834 0.25281,-0.5246 0.27308,-0.6467 0.14591,-0.8789 0.046,-0.4917 -0.0534,0.4832 0.0655,-0.8129 0.291,-3.1714 0.93195,-6.856 1.638,-8.4478 0.39873,-0.8989 1.39066,-2.1338 2.71407,-3.0982 1.3295,-0.9689 1.79991,-1.1594 1.79991,-2.1274 0,-0.358 0.0578,-1.1169 -0.0445,-1.4663 -0.10225,-0.3495 -0.20944,-0.7997 -0.17409,-0.774 0.21114,0.1537 0.5879,0.4258 0.84374,1.1894 0.26172,0.7812 0.41619,1.3086 -0.0323,2.3198 -0.22701,0.5117 -1.60934,2.0033 -1.61056,2.0576 -10e-4,0.054 -0.79469,4.484 -0.56908,4.6585 0.22561,0.1746 1.95289,-1.6479 2.12569,-1.3001 0.27884,0.561 1.10418,-1.9379 1.0483,-1.1172 -0.0346,0.5086 -0.36907,1.0881 -0.45638,1.2902 l -0.21344,0.4941 0.7402,-0.421 c 0.83736,-0.4762 1.11814,-2.1939 1.14723,-4.6883 0.0285,-2.4438 0.17069,-3.5075 0.79698,-5.1105 0.23971,-0.6136 0.63307,-0.7657 0.28699,-1.9645 l -0.0291,-0.5652 0.20623,0.2458 c 0.37689,0.4492 0.43044,-0.044 0.43044,-0.4379 0,-0.6818 0.44349,-2.4217 0.8492,-3.135 0.52382,-0.921 0.87864,-1.6118 1.06275,-2.9556 0.16461,-1.2016 0.25413,-0.6056 0.28191,0.3179 0.0217,0.7224 -0.0987,1.3727 -0.36368,2.4988 -0.41873,1.7792 -0.62707,3.1614 -0.43196,3.6614 0.19902,0.5099 0.13516,2.5989 0.35211,1.2761 0.21297,-1.2984 0.38454,1.3692 1.26768,0.1076 0.85942,-1.2277 -0.0282,-2.7196 0.23858,-2.4745 0.53531,0.4919 0.53198,0.5887 0.6282,1.6981 0.14148,1.6311 -0.49322,2.3917 -1.92061,3.8565 -0.29954,0.3075 -0.0507,0.9538 0.006,1.3911 0.0943,0.7313 0.55926,0.4264 0.77877,-0.1664 0.36932,-0.9972 0.79102,-1.6511 0.80011,-1.4987 0.006,0.094 0.14138,0.2061 0.26974,0.359 0.12835,0.1529 0.28128,0.4028 0.36207,0.7108 0.0808,0.308 0.37283,0.8998 0.41565,0.8931 0.0776,-0.012 0.4225,-0.9162 0.66155,-1.7924 0.22973,-0.8421 0.56062,-2.7433 0.56062,-3.593 0,-0.4611 2.4e-4,-1.1309 -0.0995,-1.5217 -0.0997,-0.3907 -0.17423,-0.7101 -0.15445,-0.7762 0.25825,0.3201 0.26826,0.2091 0.58784,0.7821 0.54779,0.982 0.6915,1.7934 0.65072,4.1373 -0.0347,1.9948 -0.18226,2.7031 0.29726,3.0993 l 0.65176,0.5384 0.0135,-1.5421 c 0.0101,-1.1554 0.14319,-1.8172 0.39186,-2.5111 0.35989,-1.0043 0.44619,-1.2161 0.20582,-1.5155 -0.18685,-0.2327 -0.27207,-0.3897 -0.11453,-0.4148 0.0528,-0.01 0.0995,-0.01 0.22604,0.079 0.29787,0.192 0.54228,0.058 0.72728,-0.2079 0.24902,-0.3583 0.0284,-0.1423 0.0284,0.423 0,0.4603 0.0852,0.3908 0.46776,0.7268 0.24728,0.2173 0.36787,0.6197 0.89418,0.561 0.37101,-0.041 0.0153,-2.2011 -0.20628,-2.8455 -0.11288,-0.3284 -0.62508,-1.3034 -1.17153,-2.1 -0.90303,-1.3164 -1.39015,-1.9582 -1.39015,-2.1364 0,-0.392 1.26717,0.5888 2.25758,1.5905 1.38895,1.4048 2.27997,3.0814 2.82139,4.9831 0.23002,0.8079 0.38902,1.2177 0.38929,2.8754 9e-5,0.4469 -0.46119,1.523 -0.25591,1.7386 0.19312,0.2027 1.01612,-0.5574 1.64417,-1.1789 0.39808,-0.394 0.61784,-2.4686 0.59468,-2.1253 -0.0215,0.075 -0.0604,1.7275 -0.32808,2.0729 -0.64129,0.8274 -1.70871,2.1332 -1.85904,2.4857 -0.29575,0.6934 0.36551,0.9568 0.4991,0.9356 0.316,-0.05 2.67444,-2.8273 2.87443,-3.1709 0.0351,-0.06 0.36128,-0.6509 0.56952,-0.9359 0.30922,-0.423 0.50534,-0.8224 0.54334,-1.4092 0.0436,-0.6738 0.0874,-0.8272 -0.39413,-1.5082 -0.55454,-0.7845 -0.76638,-0.8971 -0.47313,-1.8873 0.14602,-0.493 0.1441,-0.6865 0.38355,-0.4181 0.24436,0.274 0.76635,0.1411 0.95778,-0.2825 0.30077,-0.6654 0.56848,-1.2116 0.36667,-2.0162 -0.23643,-0.9426 -0.15543,-1.416 0.18252,-0.8298 0.39167,0.6794 0.63627,1.0351 0.59592,4.8969 -0.0389,3.7231 0.0726,3.6439 0.78791,4.4703 0.46571,0.5379 0.80604,0.4598 0.80916,-0.3517 0.002,-0.5377 -0.0323,-0.05 0.24066,0.3183 0.15951,0.2152 0.25958,0.3404 0.35585,0.1648 0.0624,-0.1138 0.2233,-0.968 0.2243,-1.1094 10e-4,-0.1415 0.0501,-0.572 0.15367,-1.0011 0.17464,-0.7241 0.22748,-0.9348 0.0308,-1.9862 -0.18542,-0.9912 -0.18502,-1.2225 -0.0603,-2.2909 0.22724,-1.9468 0.41665,-2.0905 0.41665,-0.5947 0,0.8241 0.13873,1.0624 0.37297,1.5001 l 0.27795,0.5193 0.37887,-0.043 0.1607,-0.2249 0.16532,0.2633 c 0.14165,0.2255 0.25065,0.3024 0.29939,0.2947 0.34639,-0.055 0.45511,-2.1381 0.0348,-3.2107 -0.23579,-0.6018 -0.34117,-0.893 -0.34117,-1.937 0,-0.698 -0.0267,-1.0127 0.0295,-1.0217 0.0563,-0.01 0.10301,0.03 0.3039,0.431 0.20089,0.401 0.59865,0.9552 0.90613,1.2873 0.62357,0.6736 0.97971,1.4781 1.10052,2.2643 0.0877,0.5708 0.14624,0.9128 0.4804,0.5911 0.19341,-0.3083 0.19953,-0.3498 0.2006,0.2286 10e-4,0.6085 0.0662,1.1221 0.32142,1.4368 0.1508,0.1858 0.48089,0.051 0.58397,-0.1295 0.17362,-0.3032 0.13774,-1.4563 -0.0131,-2.0228 -0.23409,-0.8788 -0.31652,-0.9295 0.45948,0.011 l 0.55069,0.6677 0.25587,-0.2906 c 0.0957,-0.2299 0.19265,-0.3817 0.24873,-0.3708 0.0561,0.011 0.0775,0.1595 0.22546,0.5857 0.28335,0.8163 0.81615,1.4721 0.98831,1.4448 0.0565,-0.01 0.19978,-0.2113 0.22959,-0.3719 0.25006,-1.3465 0.32245,-1.9045 0.56713,-2.5287 0.24056,-0.6137 0.52358,-1.0097 0.46791,-1.6288 -0.0368,-0.4096 0.0443,-0.6043 0.002,-0.7881 -0.10302,-0.4535 -0.0221,-0.4979 0.32121,-0.09 0.36326,0.4312 0.19029,0.355 0.28432,-0.4132 0.11865,-0.9695 0.44727,-2.5524 0.86307,-3.2602 0.46372,-0.7894 0.8973,-1.6209 1.06741,-2.8678 0.16384,-1.2008 -0.0258,-1.0029 0.14297,-0.384 0.24936,0.9142 0.0842,1.5784 -0.32013,3.2262 -0.4075,1.6607 -0.43866,3.8221 -0.1598,4.0753 0.18857,0.1713 0.56482,0.7515 0.74629,-0.4922 -0.0261,1.4531 0.18854,0.7233 0.76395,1.4739 0.44667,0.5827 0.7936,-1.0845 0.80527,-0.6275 0.0397,1.457 -0.41995,1.746 -1.64992,3.292 -0.2733,0.3436 -0.48632,0.4617 -0.26978,1.6139 0.13852,0.737 0.4293,0.4616 0.65627,-0.1519 0.24719,-0.6682 0.53808,-1.4732 0.75683,-1.5079 0.0923,-0.014 0.18606,-0.051 0.18606,0.02 0,0.071 0.19342,0.2101 0.35205,0.4432 0.15863,0.2331 0.27008,0.5486 0.31432,0.8013 0.0443,0.2527 0.25981,0.798 0.31236,0.7897 0.0525,-0.01 0.35853,-0.5961 0.45772,-0.9062 0.74551,-2.3302 1.01545,-4.6638 0.65096,-6.2482 -0.0983,-0.4272 -0.0784,-0.5376 -0.0448,-0.5787 0.0737,-0.04 0.15175,0.092 0.44736,0.5435 0.60832,0.9284 0.6475,1.2745 0.66529,3.7513 0.009,1.2797 0.11294,2.9002 0.16389,3.1345 0.106,0.4874 0.73789,1.1924 0.81904,1.0934 0.03,-0.037 0.0146,-0.8754 0.0325,-1.5972 0.0204,-0.8255 -0.007,-1.4013 0.11141,-1.7369 0.10342,-0.2934 0.34967,-0.947 0.4361,-1.1858 0.12963,-0.3581 0.22096,-0.556 0.0933,-0.8733 -0.27588,-0.6859 -0.36324,-0.4948 -0.17617,-0.5244 0.0974,-0.016 0.27992,-0.026 0.3611,0.065 0.20368,0.2283 0.136,0.2533 0.44083,-0.036 0.22244,-0.2114 0.33341,-0.6458 0.25755,-0.033 -0.0588,0.4746 0.24941,0.8875 0.66374,1.2725 0.2506,0.2328 0.70567,0.2153 0.76684,0.2056 0.18863,-0.03 -0.0341,-2.1399 -0.28707,-2.8001 -0.12977,-0.3387 -0.58991,-1.2502 -1.04475,-1.8921 -1.02275,-1.4435 -1.0807,-1.8552 -1.48654,-2.3448 0.30917,-0.133 1.793,1.0311 2.91268,2.4316 0.81805,1.0232 1.72447,2.5864 2.07812,3.8038 0.31289,1.077 0.6199,3.4675 0.41,4.5513 1.11884,-0.4351 2.43549,-1.1652 2.53887,-2.8262 0.0802,-0.1888 0.24863,1.199 -0.26612,1.8553 -0.66525,0.8483 -2.08984,2.0107 -2.43558,2.6488 -0.2179,0.4021 0.43374,0.7903 0.47628,0.8115 0.26872,0.1338 2.27894,-1.8709 2.67521,-2.7567 0.13339,-0.2981 0.68023,-1.153 0.79299,-1.2552 0.28545,-0.2588 0.69244,-1.2547 0.56066,-1.7218 -0.0581,-0.2059 -0.27865,-0.9008 -0.51237,-1.1888 -0.469,-0.578 -0.56854,-0.6808 -0.50579,-1.6539 0.0358,-0.5551 0.29371,-0.8442 0.53766,-0.5707 0.0812,0.091 0.34103,0.092 0.48856,0.068 0.60613,-0.096 1.10074,-1.188 0.78923,-2.36 -0.0971,-0.3655 -0.19273,-1.0399 -0.14578,-1.0986 0.14129,-0.1767 0.21727,0.114 0.46354,0.5875 0.405,0.7789 0.44237,1.9847 0.3543,5.1883 -0.0645,2.3467 0.1824,2.8175 0.30371,3.0415 0.26181,0.4834 0.96822,1.2276 1.07932,1.137 0.0579,-0.047 0.10527,-0.3374 0.10527,-0.6449 0,-0.6109 0.11472,-0.7508 0.3859,-0.3827 0.25015,0.3396 0.54106,0.2981 0.62691,-0.4912 0.0412,-0.3789 0.18894,-0.9794 0.28116,-1.2716 0.15034,-0.4764 0.17003,-0.6043 -0.0325,-1.3478 -0.27059,-0.9934 -0.40784,-1.0135 -0.1698,-2.4128 0.287,-1.6873 0.19529,-2.2165 0.40099,-1.1919 0.16314,0.8127 0.26923,1.6714 0.55341,2.0865 l 0.23219,0.3392 0.29447,0.062 c 0.10964,-0.135 0.13259,-0.3563 0.23664,-0.1257 0.0997,0.221 0.36271,0.4221 0.42132,0.4111 0.51563,-0.097 0.38848,-2.3253 -0.0551,-3.5057 -0.18553,-0.4937 -0.292,-0.5946 -0.29493,-1.5216 -0.002,-0.7122 -0.009,-1.157 0.0567,-1.1724 0.0815,-0.019 0.0342,0.023 0.20757,0.3848 0.17335,0.3616 0.38207,0.8313 0.65269,1.1436 0.85792,0.9902 1.21646,1.1538 1.37329,2.0134 0.0848,0.465 0.22306,1.1051 0.23545,1.126 0.0124,0.021 0.12513,0.1203 0.29584,-0.026 0.0946,-0.2141 0.23354,-0.3843 0.21805,-0.026 -0.0293,0.6769 0.0213,1.1726 0.50658,2.119 0.40551,0.7908 0.64547,2.0585 0.78825,3.1304 0.0611,0.4588 0.29276,0.7405 0.39877,0.6111 0.0959,-0.117 0.70549,-0.8849 0.5021,-2.5116 -0.24482,-1.958 -0.25715,-2.5871 -0.0752,-3.122 0.11944,-0.3511 0.21738,-0.6798 0.2805,-0.6674 0.0631,0.012 0.0378,-0.044 0.14794,0.2826 0.31557,0.9367 1.01836,2.0565 2.01345,3.218 0.50458,0.5889 1.0292,1.3039 1.19724,1.5888 0.88498,1.5009 0.86623,3.323 -0.008,5.0674 l -0.26189,0.5227 0.459,1.1204 c 0.65693,1.6035 1.8664,6.5314 0.75712,8.2638 -9.82617,1.5588 -68.0366,8.136 -75.86031,9.8475 z m 65.25407,-24.1692 c -0.0782,-0.3338 -0.21624,-0.6989 -0.30675,-0.8114 -0.1541,-0.1915 -0.1648,-0.1839 -0.16833,0.1195 -0.007,0.5588 0.35459,1.6195 0.49356,1.4498 0.0859,-0.1048 0.0803,-0.3364 -0.0185,-0.7579 z m -32.05957,4.2458 c -0.24889,-0.9728 -0.48473,-1.1462 -0.38038,-0.2798 0.0937,0.7777 0.30358,1.2907 0.4533,1.1079 0.0622,-0.076 0.0321,-0.4179 -0.0729,-0.8281 z m 19.2525,-3.7491 c 0.12948,-0.2901 0.23542,-0.6522 0.23542,-0.8047 0,-0.3726 -0.57524,-1.3055 -0.75001,-1.2163 -0.18576,0.095 -0.2514,2.1834 -0.0785,2.499 0.16219,0.2962 0.29557,0.1887 0.59313,-0.478 z m -32.00233,4.2777 c 0.29757,-0.7432 0.28449,-0.946 -0.0987,-1.5293 -0.51083,-0.7777 -0.62242,-0.6372 -0.62242,0.7841 0,1.6476 0.25445,1.9105 0.72108,0.7452 z"
-         style="fill:url(#linearGradient120912);fill-opacity:1" />
-      <path
-         sodipodi:nodetypes="cscssscscccsscccsssssscscssscsssssssssssssscssssscssssssssscscsscssssccssscccssssssccscssssscssscscssscssssssscssscscssscssscssssssssssccssssscssssscssscsscssssssssssssssssssssccsssssssssssscscssssssssscssssscssssccssscssssssscssscsssssssscsssscsscsssscsssscsssssssssccscsssssssscsscsssccssssssscssscsscscssssssssscsssssscsssscsssscsssscssssscsssscccccsssssscsscssssssscsscsssccssscsssssssssssc"
-         inkscape:connector-curvature="0"
-         id="path11989-8"
-         d="m 217.41945,1273.9261 c -1.76708,-1.8736 -5.63282,-8.1917 -8.59053,-14.0402 l -5.37767,-10.6336 -0.6917,-14.2098 c -0.72007,-14.7927 -2.25263,-21.2922 -7.0213,-29.7769 -2.09916,-3.735 -2.15721,-4.3446 -0.96382,-10.1224 1.08336,-5.2451 1.05794,-6.2666 -0.17307,-6.9555 -0.79361,-0.4442 -2.06444,-2.2807 -2.82406,-4.0812 l -1.38114,-3.2737 -0.50087,5.5 -0.50087,5.5 -1.80405,-5.1734 c -1.12919,-3.2381 -1.68258,-7.166 -1.47933,-10.5 l 0.32471,-5.3266 2.10142,4.5 2.10142,4.5 1.03742,-4 c 0.57058,-2.2 1.33674,-6.1751 1.70256,-8.8334 0.36583,-2.6584 1.31189,-6.6665 2.10236,-8.9069 1.31044,-3.7142 1.24403,-4.8612 -0.75278,-13.0033 -2.04247,-8.3282 -2.10291,-9.545 -0.89726,-18.0634 2.06578,-14.5956 3.28528,-16.0284 4.41991,-5.193 1.13899,10.877 6.26908,21.0759 8.78254,17.4602 0.66521,-0.9569 1.17361,-1.0783 1.47501,-0.3521 0.25297,0.6095 1.07001,1.9426 1.81566,2.9623 1.15054,1.5735 1.59912,1.6521 2.96394,0.5194 3.01098,-2.4989 1.81677,-16.8592 -2.36381,-28.4244 -1.60626,-4.4436 -2.0398,-7.662 -1.81852,-13.5 l 0.29054,-7.6654 2.64532,5 c 1.45492,2.75 5.00442,7.925 7.88777,11.5 6.20985,7.6994 8.58731,12.6265 9.52989,19.75 0.65823,4.9745 2.35632,6.8076 3.93702,4.25 1.3376,-2.1643 1.99794,-0.793 1.6606,3.4485 -0.28222,3.5485 0.46311,6.2294 3.68364,13.25 4.23283,9.2274 6.6403,17.8721 7.68865,27.6084 0.73901,6.8634 2.21228,7.0585 4.60531,0.6099 1.32899,-3.5813 1.45468,-5.5518 0.66444,-10.4168 -1.77913,-10.953 0.37107,-34.5 3.15036,-34.5 0.47245,0 1.58122,2.1196 2.46394,4.7102 2.2756,6.6785 8.72548,17.1764 16.37288,26.6487 8.92598,11.056 11.93523,16.0192 14.24605,23.4964 3.2918,10.6513 2.10166,20.4801 -3.80484,31.4222 l -2.5789,4.7776 1.71865,5.4522 c 2.52541,8.0115 3.01327,14.3227 1.62586,21.0329 -1.96,9.4795 -11.07432,25.349 -12.32494,21.4598 -0.26529,-0.825 -1.69339,-5.55 -3.17357,-10.5 -3.08416,-10.3141 -8.04038,-19.1532 -12.7487,-22.7366 -5.00262,-3.8074 -13.68939,-8.364 -19.53047,-10.2446 -2.90457,-0.9351 -6.65456,-2.8559 -8.33333,-4.2685 -2.83631,-2.3866 -3.01652,-2.9286 -2.5467,-7.6594 0.27807,-2.8 0.81665,-6.5534 1.19683,-8.3409 0.59781,-2.8108 0.42187,-3.25 -1.30168,-3.25 -2.40709,0 -9.93293,7.0777 -11.27263,10.6014 -1.40957,3.7074 -1.17395,9.1537 0.55149,12.7474 0.83211,1.7331 4.03169,6.0762 7.11017,9.6512 6.35337,7.378 11.37493,16.9622 11.3761,21.7124 4.3e-4,1.7669 -0.93009,5.7005 -2.06782,8.7414 -3.43013,9.1678 -8.80177,11.084 -14.4081,5.1395 z m -13.55869,-97.4024 c -0.0441,-4.5995 -4.02982,-16.4303 -5.7146,-16.9627 -1.74722,-0.552 -1.64524,8.1406 0.16611,14.1593 2.47553,8.2255 5.61571,9.8122 5.54849,2.8034 z m -255.246164,92.8022 c -2.90683,-2.2865 -10.70849,-15.3569 -13.70652,-22.9629 -1.54624,-3.9228 -2.01534,-7.4682 -2.0267,-15.3173 -0.0173,-11.9704 -1.84,-20.6412 -6.20111,-29.4999 -3.04966,-6.1948 -3.1101,-6.5721 -1.95141,-12.1819 1.18899,-5.7565 1.17873,-5.8074 -1.81848,-9.0159 l -3.01422,-3.2268 0,3.6058 c 0,1.9832 -0.37813,3.6058 -0.84029,3.6058 -1.34927,0 -3.35921,-10.0933 -2.98706,-15 l 0.34129,-4.5 1.72208,3.8219 c 0.94714,2.1021 2.11768,3.5775 2.60121,3.2787 0.48352,-0.2989 1.41257,-3.8501 2.06454,-7.8916 0.65197,-4.0416 1.78641,-9.3453 2.52099,-11.7861 1.17181,-3.8937 1.11221,-5.2954 -0.48594,-11.4304 -2.25534,-8.6579 -2.33458,-12.7168 -0.4566,-23.3881 2.06591,-11.7391 2.80724,-11.9036 3.94258,-0.8751 0.71546,6.9498 4.21264,16.6935 6.27573,17.4852 0.82683,0.3173 1.94216,-0.051 2.47853,-0.8188 0.65013,-0.9305 1.12852,-1.0263 1.43513,-0.2876 0.25297,0.6095 1.11871,1.9595 1.92387,3 1.43202,1.8506 1.49876,1.8482 3.06074,-0.1081 2.29287,-2.8719 1.21943,-17.9407 -1.73436,-24.3467 -2.28242,-4.95 -3.99713,-23.1533 -2.18098,-23.1533 0.506,0 1.85817,1.931 3.0048,4.2911 1.14664,2.3601 4.44008,7.1976 7.31876,10.75 6.00276,7.4076 7.68273,10.8678 9.12614,18.797 1.19538,6.5667 2.0556,7.8467 3.83367,5.7042 2.08658,-2.5141 2.55406,-1.816 2.2002,3.2858 -0.4267,6.152 1.92987,12.1719 4.76489,12.1719 1.40396,0 2.21821,-0.85 2.63455,-2.75 0.33142,-1.5125 0.78891,-3.3465 1.01665,-4.0756 0.22774,-0.729 -0.25948,-4.554 -1.08271,-8.5 -0.82322,-3.9459 -1.49714,-7.3654 -1.49759,-7.5988 -0.003,-1.3078 5.4887,4.9994 7.11682,8.1744 2.24993,4.3875 3.49476,4.6947 5.06431,1.25 1.55161,-3.4054 2.29963,-3.1503 3.66541,1.25 1.81401,5.8444 6.4747997,13.6909 8.3456297,14.0498 1.26904,0.2435 1.85781,-0.6298 2.35119,-3.4875 1.291,-7.4776 4.48961,-19.2253 6.52918,-23.9801 1.54213,-3.5952 1.99004,-6.4322 1.74969,-11.0823 -0.30694,-5.9385 -0.24263,-6.1432 1.28974,-4.1062 2.30259,3.0609 3.5508903,1.7036 4.3554103,-4.7355 1.08145,-8.6557 3.32554,-15.2982 7.57033,-22.4082 4.61413,-7.7288 6.53708,-12.8992 8.06898,-21.696 1.48024,-8.5002 2.86434,-6.4656 2.85443,4.196 -0.005,5.7628 -0.84704,11.076 -3.00989,19 -3.58039,13.1173 -4.73782,24.589 -3.00933,29.8264 2.31464,7.0134 4.51587,4.2954 7.10272,-8.7702 1.0672,-5.3902 1.28593,-5.7399 2.34845,-3.7545 0.81768,1.5278 0.94841,4.9833 0.43272,11.4376 -0.40641,5.0866 -0.3927,9.5946 0.0305,10.0177 0.42318,0.4232 1.78172,-0.3081 3.01898,-1.6251 2.44183,-2.5992 3.06292,-7.0711 1.73614,-12.5004 -1.1263,-4.609 1.08179,-3.8069 3.76764,1.3686 1.41972,2.7358 2.01126,5.8099 2.00865,10.4388 -0.006,11.1038 -1.54908,14.6232 -9.95618,22.7117 -8.01269,7.7091 -8.56744,9.1897 -6.12587,16.3494 1.61571,4.7379 3.70244,4.4156 5.2454,-0.8101 1.417,-4.799 5.39205,-11.1726 6.97472,-11.1831 1.64777,-0.011 6.39817,8.0362 7.04043,11.9265 1.43744,8.7068 3.05633,7.9857 6.67797,-2.9744 4.46622,-13.5161 6.05465,-23.9966 5.44997,-35.9589 -0.29191,-5.775 -0.84518,-11.5125 -1.22947,-12.75 -1.12661,-3.6279 0.86616,-2.5914 3.84522,2 5.23215,8.0638 6.0658,12.5317 6.20409,33.25 0.13257,19.8603 0.96236,25.2942 4.5612,29.8694 3.44876,4.3844 4.00886,3.267 3.31815,-6.6194 -0.7036,-10.0709 0.74904,-18.19 4.6078,-25.7538 1.88534,-3.6956 1.9258,-4.2353 0.52106,-6.9518 -2.27364,-4.3967 -1.93852,-5.3107 1.32793,-3.6215 2.51458,1.3003 3.101,1.299 4.97091,-0.011 2.04631,-1.4333 2.11533,-1.3605 1.98536,2.0967 -0.11177,2.973 0.6083,4.3386 4.23729,8.0363 2.40457,2.4501 4.93286,4.4547 5.61842,4.4547 1.968064,0 2.558674,-5.8784 1.356364,-13.5 -1.295734,-8.2139 -5.325654,-17.3685 -11.398464,-25.8935 -6.28231,-8.819 -12.82162,-19.739 -12.1955,-20.3651 1.95046,-1.9505 22.26462,17.9208 29.399654,28.7586 6.18169,9.3898 11.73684,21.3107 14.21296,30.5 2.49951,9.2761 3.88995,31.8978 2.15936,35.1314 -0.58073,1.0851 -4.80018,4.269 -9.37656,7.0753 -29.506584,18.0938 -44.478344,47.1721 -36.268544,70.4411 1.97641,5.6018 1.82964,6.8538 -0.80216,6.8428 -5.38234,-0.022 -25.90774,-15.133 -29.57014,-21.7692 -2.77886,-5.0352 -2.4064,-6.6826 2.89607,-12.8091 4.26387,-4.9265 4.71443,-7.2764 2.43922,-12.7218 -1.90167,-4.5513 -2.99319,-5.1695 -5.7359,-3.2484 -3.48777,2.4429 -5.64625,1.9047 -7.43915,-1.8551 -1.37472,-2.8828 -1.44108,-4.0867 -0.42716,-7.75 1.78101,-6.4348 1.75905,-7.2249 -0.21211,-7.6315 -2.9149,-0.6012 -6.73302,2.6254 -9.02732,7.6288 -1.99028,4.3405 -2.12119,6.0452 -1.8781,24.4574 0.23591,17.8673 0.0696,20.2251 -1.71082,24.25 -1.08467,2.452 -2.44743,4.4583 -3.02836,4.4583 -0.58093,0 -1.39373,0.1125 -1.80623,0.25 -0.4125,0.1375 -0.975,-1.325 -1.25,-3.25 -0.37452,-2.6216 -0.98553,-3.5 -2.43465,-3.5 -1.91333,0 -2.44063,1.2613 -5.50073,13.1573 -1.0073,3.9158 -8.7806903,12.3436 -9.4633403,10.26 -0.25539,-0.7795 -1.2017,-4.1173 -2.10290003,-7.4173 -2.57678997,-9.4356 -9.05833997,-22.0663 -12.75463967,-24.8552 -5.30465,-4.0024 -12.93645,-8.1991 -19.11216,-10.5097 -9.3709,-3.5061 -11.38423,-4.8556 -12.56026,-8.419 -0.85152,-2.5801 -0.7612,-4.42 0.40588,-8.2674 0.82564,-2.7218 1.50602,-5.5112 1.51198,-6.1987 0.0343,-3.9555 -9.65672,2.4223 -12.37051,8.1412 -0.89027,1.8761 -1.61867,5.4314 -1.61867,7.9007 0,4.7918 1.40922,7.2124 11.26204,19.3445 4.80891,5.9213 8.73793,14.4033 8.73793,18.8636 0,1.3337 -0.93088,4.9129 -2.06861,7.9538 -3.11155,8.3163 -7.92517,10.6987 -13.21295,6.5393 z m -15.35913,-99.5968 c -0.0774,-2.693 -0.99627,-7.3401 -2.04198,-10.327 -3.20714,-9.1606 -6.04721,-7.3849 -4.19696,2.624 2.29224,12.3999 6.52403,17.6247 6.23894,7.703 z m 48.13764,-9.6463 c -0.86404,-7.7211 -1.9505,-9.1005 -4.52871,-5.75 -2.54217,3.3036 0.753507,-5.3857 3.426497,-2.5404 3.93015,4.1835 1.890493,15.3343 1.102213,8.2904 z m 113.31999,0.017 c 3.21904,-6.2552 3.07552,-8.524 -0.92592,-14.6362 -5.52102,-8.4335 -7.07252,-7.0698 -7.11776,6.2561 -0.0483,14.2321 3.25897,17.6777 8.04368,8.3801 z m -413.245506,101.6614 c -2.40426,-2.4042 -1.89082,-7.4953 1.62405,-16.103 2.89198,-7.0823 3.19603,-8.8228 3.20131,-18.3255 0.005,-8.6475 -0.37628,-11.3381 -2.15994,-15.25 -1.19118,-2.6125 -2.79499,-4.75 -3.56403,-4.75 -0.76905,0 -2.88902,3.0281 -4.71105,6.7292 -2.47091,5.0191 -5.70347,9.0852 -12.7202,16 -5.17408,5.0989 -10.0451,9.2708 -10.82449,9.2708 -1.80702,0 -1.79523,-2.2796 0.0954,-18.4423 3.04158,-26.0016 8.42692,-46.8958 14.60774,-56.6754 3.68512,-5.8308 12.52618,-12.8099 22.88722,-18.067 12.28412,-6.2329 15.07549,-11.6848 12.44952,-24.3153 -0.80044,-3.85 -1.45571,-7.1823 -1.45616,-7.405 -0.002,-1.195 4.54153,3.9743 6.6378,7.5513 5.32151,9.0805 3.90038,19.7186 -4.25528,31.8537 -6.59687,9.8156 -11.34997,20.2577 -12.63447,27.7566 -1.80201,10.52 -0.013,11.8835 8.89137,6.7764 8.78236,-5.037 10.72641,-11.5512 7.76914,-26.033 l -0.71472,-3.5 2.2944,2 c 1.26193,1.1 5.73685,4.5042 7.02853,7.2542 4.26712,9.0847 0.30121,19.5506 -6.47155,27.463 -1.92258,2.2461 -4.25474,6.0716 -5.18258,8.5011 -1.48044,3.8765 -1.97886,4.344 -4.0712,3.8189 -3.53573,-0.8874 -4.1402,-0.01 -2.98103,4.3343 0.98022,3.6724 0.7876,4.3466 -3.07798,10.773 -2.268,3.7705 -4.58944,8.0989 -5.15875,9.6187 -1.97018,5.2596 -2.89873,14.3777 -2.1177,20.7952 1.08413,8.9079 -1.23817,12.5173 -5.38535,8.3701 z m 54.38864,-9.4685 c -5.10766,-5.1076 -4.85405,-10.0488 1.17333,-22.8599 5.21466,-11.0836 6.38261,-16.6687 4.89073,-23.3873 -1.78276,-8.0286 -4.05843,-12.7128 -6.176,-12.7128 -1.52141,0 -1.84813,0.7889 -1.84813,4.4624 0,2.4544 -0.9013,6.8715 -2.00288,9.8157 -2.11681,5.6577 -7.09743,11.3959 -8.91586,10.2721 -0.59469,-0.3676 -1.08126,-3.3696 -1.08126,-6.6712 0,-4.4886 0.69019,-7.4377 2.73612,-11.691 2.14747,-4.4643 2.72505,-7.0865 2.68464,-12.188 -0.0283,-3.575 -0.60337,-7.5181 -1.2779,-8.7624 -0.9177,-1.6928 -0.96914,-3.7065 -0.20436,-8 0.56212,-3.1557 0.97612,-11.3626 0.92,-18.2376 -0.11979,-14.6728 1.88259,-26.8001 6.32866,-38.3292 2.506,-6.4982 2.9624,-8.9265 2.60541,-13.8618 -0.41854,-5.7862 -0.3773,-5.91 1.25009,-3.7525 2.06118,2.7326 3.95734,1.7955 3.95734,-1.9556 0,-5.7627 4.11513,-18.6713 8.00409,-25.1077 4.31989,-7.1497 6.24201,-12.2645 8.03779,-21.3887 0.80576,-4.094 1.4303,-5.469 2.0439,-4.5 1.58587,2.5045 0.97534,15.3046 -1.09528,22.9631 -5.9427,21.9798 -6.64655,36.7972 -1.79233,37.732 1.78641,0.344 2.92359,-2.5269 4.84476,-12.2313 1.82018,-9.1942 3.38922,-4.7026 2.64196,7.5631 -0.32853,5.3925 -0.23244,10.0301 0.21353,10.3058 0.44597,0.2756 1.80454,-0.5566 3.01904,-1.8494 2.41429,-2.5699 3.01128,-7.0623 1.67017,-12.5682 -0.77978,-3.2014 -0.71177,-3.3676 0.84825,-2.0729 3.26718,2.7116 4.84119,7.321 4.79904,14.0537 -0.0717,11.4563 -1.44405,14.6183 -9.80182,22.5839 -8.16546,7.7824 -8.91572,9.9315 -5.94733,17.0358 1.71749,4.1106 3.69614,4.0261 4.56488,-0.1949 0.97558,-4.7401 5.85903,-12.4423 7.87366,-12.4184 1.45974,0.017 5.49269,7.5731 6.55148,12.2742 0.69613,3.0909 1.71842,5.219 2.50715,5.219 1.70887,0 5.47215,-11.1094 8.12996,-24 2.03104,-9.8508 2.20854,-24.4582 0.40098,-33 l -0.63483,-3 2.94342,3.322 c 1.61889,1.8271 3.99811,6.3271 5.28716,10 2.12178,6.0455 2.34942,8.4299 2.40371,25.178 0.037,11.4283 0.52507,20.0746 1.27671,22.6194 1.1859,4.0151 4.64998,9.3806 6.05629,9.3806 0.38565,0 0.69318,-5.5125 0.6834,-12.25 -0.0167,-11.4719 0.1806,-12.7264 3.10559,-19.75 2.84011,-6.8199 2.99828,-7.7449 1.74402,-10.2004 -2.15023,-4.2095 -1.70348,-5.1042 1.58012,-3.1645 2.84499,1.6806 3.04431,1.6731 5.15267,-0.1935 l 2.1932,-1.9416 -0.63913,3.3073 c -0.56964,2.9477 -0.13641,3.8447 3.98417,8.25 2.54282,2.7184 5.18794,4.9427 5.87805,4.9427 1.99784,0 2.55807,-4.3431 1.50825,-11.6924 -1.53888,-10.7728 -3.57613,-15.3143 -14.13117,-31.5022 -5.44803,-8.3555 -9.90551,-15.5549 -9.90551,-15.9986 0,-1.7382 2.13349,-0.6069 7.69808,4.0822 17.57985,14.8139 29.71073,32.9389 35.88134,53.611 2.31164,7.7441 2.70283,10.9339 2.80354,22.8597 0.10802,12.7913 -0.0371,13.9696 -1.88296,15.2847 -1.1,0.7837 -5.54345,3.6868 -9.87434,6.4512 -12.21117,7.7946 -22.6863,18.5693 -29.55894,30.4044 -6.14624,10.5841 -8.50755,25.5994 -5.58276,35.5 3.00666,10.1777 2.9999,10.0012 0.38262,9.9879 -3.01603,-0.015 -8.85382,-3.3609 -18.39553,-10.5422 -14.07309,-10.5917 -16.00081,-15.8928 -8.67105,-23.8446 4.63005,-5.023 4.96495,-6.6489 2.59142,-12.5809 -1.76923,-4.4218 -2.1887,-4.5846 -7.16952,-2.7835 -3.1677,1.1454 -3.56663,1.0558 -5.40552,-1.2152 -2.0173,-2.4912 -2.02602,-2.9631 -0.24534,-13.2715 0.56761,-3.286 0.40342,-3.75 -1.32678,-3.75 -3.04235,0 -6.82132,3.5176 -8.84275,8.2312 -1.57602,3.675 -1.83556,7.1896 -1.86607,25.2688 -0.0327,19.3529 -0.1967,21.2745 -2.09149,24.5 -1.13083,1.925 -2.70583,3.5 -3.5,3.5 -0.88832,0 -1.63635,-1.3468 -1.94395,-3.5 -0.38443,-2.6911 -1.02488,-3.5745 -2.77083,-3.8223 -1.78906,-0.2539 -2.58463,0.4288 -3.75,3.2179 -0.81354,1.947 -1.47917,5.3178 -1.47917,7.4904 0,7.2711 -2.08841,9.0255 -6.03993,5.074 z m 88.09041,-96.5417 c 1.21749,-1.97 2.39551,-5.4575 2.61783,-7.75 0.34513,-3.559 -0.12096,-4.8721 -3.18856,-8.9828 -1.97604,-2.648 -4.12344,-4.6376 -4.77201,-4.4215 -2.55132,0.8505 -3.17745,14.032 -1.06612,22.4442 0.85685,3.4139 3.87745,2.806 6.40886,-1.2899 z m 344.30219,89.0252 c -1.85111,-1.8511 -2.37599,-3.1616 -1.90243,-4.75 1.87592,-6.292 1.77573,-9.5919 -0.39801,-13.109 -2.42838,-3.9292 -6.99014,-7.5845 -9.46534,-7.5845 -1.34992,0 -1.50513,0.8442 -0.97869,5.3235 0.60912,5.1826 -1.30944,11.6765 -3.44974,11.6765 -1.36103,0 -4.87006,-7.1748 -7.56711,-15.4723 -3.0565,-9.4033 -3.52538,-21.3565 -1.0684,-27.2369 2.14385,-5.131 0.56809,-6.2786 -4.24624,-3.0927 -2.20318,1.458 -5.0608,4.7867 -6.79038,7.9096 -2.87898,5.1984 -2.99519,5.9066 -3.23269,19.7012 -0.15486,8.9947 -0.70164,15.1227 -1.47227,16.5 -1.09591,1.9587 -1.29807,1.4912 -1.90642,-4.4082 -0.82963,-8.0454 -3.46445,-13.444 -9.73788,-19.9526 -5.46629,-5.6712 -8.65302,-6.5611 -7.87142,-2.1981 0.27095,1.5125 1.27323,7.1315 2.22728,12.4866 1.77624,9.9702 1.42647,17.1983 -0.80029,16.5382 -0.65595,-0.1944 -2.54264,-3.0358 -4.19264,-6.3142 -2.38686,-4.7424 -3.07293,-7.549 -3.35686,-13.7321 -0.31064,-6.7649 -0.0225,-8.4486 2.22483,-13 2.35966,-4.7789 15.82983,-20.7285 17.50615,-20.7285 0.39176,0 1.14285,1.4615 1.66908,3.2479 1.32701,4.5046 3.76448,4.5603 9.07665,0.2074 7.00786,-5.7425 19.27108,-18.5336 20.00171,-20.8628 0.36102,-1.1509 1.68804,-3.055 2.94893,-4.2313 2.76988,-2.5841 4.78573,-9.4629 3.92352,-13.3885 -0.34548,-1.573 -2.45418,-5.5793 -4.68601,-8.9031 -3.78605,-5.6383 -4.02704,-6.4148 -3.59774,-11.5916 0.58565,-7.0621 1.60818,-8.1404 5.70861,-6.02 3.08841,1.5971 3.20405,1.5729 6.04137,-1.2644 3.67746,-3.6775 4.66596,-8.8956 3.25122,-17.1625 -0.60886,-3.5579 -0.94302,-6.6329 -0.74258,-6.8334 1.00687,-1.0068 4.59757,4.2869 5.91357,8.7184 3.23352,10.8884 2.95466,44.5839 -0.36898,44.5839 -2.06701,0 -4.0723,4.6259 -4.68035,10.797 -0.41359,4.1975 0.18105,7.3049 3.07711,16.0802 4.1072,12.445 4.52692,18.5735 1.60073,23.3728 -2.11191,3.4637 -4.49628,4.078 -7.44897,1.9189 -1.45054,-1.0606 -1.68981,-2.127 -1.17801,-5.25 1.27142,-7.7582 1.25007,-7.9413 -0.88398,-7.585 -3.10315,0.5181 -7.42603,5.1871 -8.68109,9.3761 -1.93443,6.4566 0.3155,13.7374 5.81039,18.8024 2.48622,2.2917 7.07422,5.2748 10.19555,6.6292 10.85078,4.7081 12.44801,5.7672 13.88533,9.2071 3.94919,9.4518 -7.36415,18.5882 -14.35751,11.5948 z m -267.044374,-3.4625 c -1.205436,-0.4804 -2.933476,-2.0056 -3.840096,-3.3892 -1.38845,-2.1191 -1.46087,-3.084 -0.45924,-6.119 2.08213,-6.3089 0.18782,-11.1179 -6.39382,-16.2315 -4.79409,-3.7247 -5.86257,-3.0699 -5.0893,3.1192 0.71722,5.7404 -1.44567,12.1582 -3.8345,11.3778 -1.82808,-0.5972 -7.60926,-14.8286 -9.28124,-22.8475 -1.58471,-7.6003 -1.19372,-13.8696 1.23596,-19.8179 1.85672,-4.5456 0.48016,-5.8496 -3.62367,-3.4328 -3.77256,2.2218 -8.58784,9.1791 -10.24377,14.8007 -0.69314,2.3531 -1.11366,9.0358 -1.00051,15.8998 0.12825,7.7806 -0.22142,12.5812 -1.01976,14 -1.08488,1.9282 -1.2797,1.5074 -1.81978,-3.9302 -0.33265,-3.3493 -1.63086,-8.2091 -2.8849,-10.7996 -2.64778,-5.4696 -11.15546,-14.6108 -13.59815,-14.6108 -1.84676,0 -1.89539,-0.7687 1.01873,16.1037 1.62792,9.4255 1.19834,16.3963 -1.01045,16.3963 -0.49998,0 -2.26331,-2.7 -3.91851,-6 -4.05863,-8.0918 -4.79555,-19.8852 -1.68232,-26.9232 2.14608,-4.8516 15.79227,-21.3532 17.77574,-21.4953 0.62629,-0.045 1.43418,1.4935 1.79531,3.4185 1.12,5.9701 4.04942,4.8172 15.88042,-6.25 5.73259,-5.3625 11.26949,-11.2819 12.30422,-13.1542 1.03474,-1.8722 2.86257,-4.408 4.06184,-5.635 5.30166,-5.4243 5.00054,-14.8122 -0.70539,-21.9922 -3.64966,-4.5925 -4.38088,-7.1763 -3.71149,-13.1151 0.66775,-5.9243 1.81404,-7.004 5.12948,-4.8316 2.45079,1.6058 2.76161,1.6067 5.19043,0.015 5.15288,-3.3763 6.36553,-10.402 3.84993,-22.3052 -0.57668,-2.7287 -0.42949,-3.1678 0.892,-2.6607 4.875936,1.8711 8.217396,19.508 7.185896,37.9286 -0.77277,13.8001 -1.05949,15.1486 -3.3481,15.7471 -2.039906,0.5334 -4.163256,7.1925 -4.163256,13.0565 0,1.8799 1.575,8.1747 3.5,13.9885 3.921076,11.8423 4.303706,16.5929 1.748446,21.7079 -1.409786,2.8221 -2.323796,3.5 -4.718916,3.5 -4.22939,0 -5.93934,-3.5834 -3.96489,-8.3089 1.93422,-4.6293 1.83021,-5.1911 -0.96105,-5.1911 -2.58631,0 -7.92889,5.2989 -9.11706,9.0425 -0.37947,1.1956 -0.37938,4.7127 2e-4,7.8157 0.62395,5.1007 1.18572,6.1246 5.85686,10.6753 3.47158,3.382 7.46165,5.9833 12.161556,7.9286 9.68505,4.0086 12.49485,6.7542 12.49485,12.2092 0,6.8777 -6.32004,12.4507 -11.6917,10.3098 z"
-         style="fill:#f85616;fill-opacity:1;filter:url(#filter12291-3)"
-         transform="matrix(0.11855694,-0.0188069,0,0.12591085,816.30314,1477.9804)" />
-      <path
-         sodipodi:nodetypes="ssssscssssscssccssscccsssscssssssssccccscsccscssccssccccsssssscssssssscssscscssscssssssscsscssssssscsssssssscsccscssccsssssccsssccsccccscssscscsssssscssccssssssssssscssscsssssssscsscssssssscsccssssssscsscscsssssccssccssscsssccscsscscssccccscsscscssssssscsscsscccccsscsscccscsscsssscssssscssscsscssscssssscssscsssscssssssssssssssscsscsscssssssscsssccsssscsssssssssccssscssssssscsscsscccsc"
-         inkscape:connector-curvature="0"
-         id="path11987-6"
-         d="m 774.91445,1640.2443 c 0,-0.7384 0.3723,-3.7337 0.65185,-5.2444 0.342,-1.8481 0.77318,-3.2758 1.25932,-4.1699 0.4369,-0.8034 1.48507,-1.8484 2.71344,-2.7052 1.45637,-1.0158 1.7873,-1.7547 1.47597,-3.2957 -0.0949,-0.4697 -0.17258,-0.8769 -0.17263,-0.905 -2.4e-4,-0.1504 0.53843,0.415 0.78696,0.8259 0.62612,1.0354 0.46221,2.4087 -0.48428,4.0573 -1.0222,1.7804 -1.6006,3.3955 -1.61119,4.4989 -0.004,0.3993 -0.10218,0.5506 -0.93213,1.434 -1.07567,1.1451 -1.60041,2.1044 -1.88813,3.4521 -0.1765,0.8267 -0.24251,0.9505 -0.86719,1.6266 -0.37188,0.4026 -0.73372,0.741 -0.80407,0.7522 -0.0704,0.011 -0.12792,-0.1359 -0.12792,-0.3268 z m 70.89705,-11.5581 -0.41495,-0.191 -0.0172,-1.019 c -0.0218,-1.2927 -0.28945,-2.4596 -0.77649,-3.3853 -0.32674,-0.621 -0.3852,-0.8712 -0.40326,-1.7255 -0.0215,-1.015 -0.1297,-1.2221 -0.45936,-0.8793 -0.13737,0.1429 -0.2089,0.028 -0.4106,-0.6592 -0.13434,-0.4578 -0.36445,-0.9925 -0.51136,-1.1884 -1.19792,-1.597 -1.2863,-1.7405 -1.16443,-1.8892 0.15011,-0.1832 0.15533,-1.4483 0.009,-2.2261 -0.0568,-0.3026 -0.21589,-0.863 -0.35342,-1.2452 -0.19043,-0.5293 -0.24182,-0.9264 -0.21559,-1.6656 l 0.0344,-0.9706 0.31362,0.5798 c 0.1725,0.3189 0.59331,0.9037 0.93515,1.2996 0.73622,0.8527 1.01809,1.4283 1.12984,2.3075 0.078,0.614 0.27936,0.8128 0.46676,0.4611 0.15858,-0.2977 0.23687,-0.1374 0.19687,0.403 -0.0335,0.4516 0.055,0.7765 0.43558,1.5992 0.78976,1.7075 0.89899,2.2974 0.8788,4.7461 -0.0191,2.3145 0.15819,3.8368 0.5871,5.0419 0.13492,0.379 0.22482,0.7135 0.19977,0.7432 -0.0251,0.03 -0.23227,-0.032 -0.46049,-0.137 z m -14.47389,2.1677 c -0.17167,-0.5166 -0.2763,-1.4748 -0.18808,-1.7225 0.061,-0.1712 0.1165,-1.0629 0.1234,-1.9816 0.008,-1.0333 0.0583,-1.6778 0.13251,-1.6898 0.15635,-0.025 1.59648,-1.5829 2.01185,-2.1759 0.3941,-0.5626 0.53842,-0.6023 0.5388,-0.1484 1.1e-4,0.196 0.2059,0.6351 0.47423,1.012 0.26066,0.3662 0.47394,0.7171 0.47394,0.7798 0,0.063 -0.12004,0.3055 -0.26676,0.5396 -0.20281,0.3235 -0.26737,0.5993 -0.26937,1.1504 -0.002,0.6705 -0.04,0.7759 -0.50148,1.4058 l -0.49886,0.6811 -0.12094,-0.3187 c -0.18594,-0.4898 -0.14863,-2.2501 0.0596,-2.8124 0.25417,-0.6864 0.0674,-0.8013 -0.50342,-0.3096 -0.2612,0.225 -0.59999,0.6979 -0.80505,1.1236 -0.36276,0.7532 -0.39182,1.0522 -0.41193,4.2384 -10e-4,0.1734 -0.20454,0.3603 -0.24845,0.2282 z m -17.57688,2.1695 c -0.38735,-0.1503 -0.44453,-0.2241 -0.38294,-0.4945 0.14577,-0.6399 -0.1784,-2.5692 -0.60638,-3.6088 -0.73965,-1.7967 -0.77211,-1.9165 -0.68685,-2.5339 0.0943,-0.6825 0.0835,-0.7071 -0.28274,-0.649 -0.23885,0.038 -0.31297,-0.062 -0.50186,-0.6758 -0.2372,-0.771 -0.33043,-0.9264 -1.20878,-2.015 -0.39963,-0.4954 -0.54032,-0.7678 -0.47423,-0.9185 0.0517,-0.1177 0.0864,-0.7291 0.0771,-1.3587 -0.0131,-0.8945 -0.0751,-1.2698 -0.28354,-1.7177 -0.19326,-0.4154 -0.28228,-0.8914 -0.32332,-1.7289 -0.0325,-0.6634 -0.0102,-1.163 0.0524,-1.173 0.06,-0.01 0.2203,0.2082 0.35624,0.4838 0.13594,0.2756 0.52641,0.8228 0.86769,1.2159 0.71167,0.8198 0.91084,1.2239 1.08197,2.1951 0.14172,0.8043 0.2437,0.9493 0.45451,0.6462 0.24738,-0.3559 0.3028,-0.2767 0.26084,0.3723 -0.0505,0.7826 0.22881,1.4963 0.56492,1.4429 0.16644,-0.026 0.26298,-0.1487 0.31234,-0.3958 0.0393,-0.1966 0.0935,-0.4362 0.12053,-0.5323 0.027,-0.096 -0.0308,-0.5684 -0.12836,-1.0498 -0.0976,-0.4814 -0.1775,-0.8992 -0.17755,-0.9286 -3.6e-4,-0.1646 0.65072,0.5262 0.84375,0.8954 0.26674,0.5101 0.41432,0.5254 0.6004,0.062 0.18396,-0.4579 0.27264,-0.4399 0.43457,0.089 0.21506,0.7018 0.76763,1.602 0.98943,1.612 0.15045,0.01 0.22025,-0.1142 0.27875,-0.4833 0.15305,-0.9658 0.53227,-2.5051 0.77408,-3.1421 0.18283,-0.4817 0.23593,-0.8474 0.20743,-1.4283 -0.0364,-0.742 -0.0287,-0.7689 0.15291,-0.5413 0.27299,0.3421 0.42099,0.1477 0.51637,-0.6782 0.12821,-1.1102 0.39426,-1.9887 0.89751,-2.9638 0.54704,-1.0599 0.77502,-1.7471 0.95664,-2.8835 0.17549,-1.0981 0.33958,-0.868 0.33841,0.4747 -5.9e-4,0.7256 -0.10042,1.4105 -0.35684,2.4489 -0.4698,1.9024 -0.57144,3.2307 -0.30143,3.9388 l 0.20178,0.5291 -0.46981,0.8073 c -0.45855,0.7881 -0.75228,1.6917 -0.90923,2.7973 -0.0872,0.6146 -0.18667,0.6901 -0.43594,0.3309 -0.28663,-0.4129 -0.4335,-0.1224 -0.30429,0.6021 0.0633,0.355 0.0833,0.9808 0.0445,1.3905 -0.0688,0.7245 -0.0545,0.7704 0.52354,1.6833 0.42031,0.6638 0.63508,1.1652 0.73375,1.7131 0.0767,0.426 0.2,0.7896 0.27393,0.808 0.15824,0.04 1.46537,-0.9315 1.99754,-1.4838 0.60968,-0.6326 1.2206,-1.7885 1.31054,-2.4797 0.0445,-0.3421 0.16131,-0.8207 0.25956,-1.0637 0.2922,-0.7225 0.72355,-2.4305 0.87968,-3.4831 0.14283,-0.963 0.10231,-3.1233 -0.0693,-3.6922 -0.0448,-0.1487 -0.0339,-0.2779 0.0244,-0.2872 0.17581,-0.028 0.74751,0.91 0.94477,1.55 0.21764,0.706 0.35321,3.4102 0.20254,4.0401 l -0.10464,0.4374 -0.29374,-0.4355 c -0.16156,-0.2395 -0.39391,-0.4401 -0.51634,-0.4457 -0.19361,-0.01 -0.21242,0.043 -0.14448,0.3989 0.16963,0.8885 0.21476,3.2143 0.0791,4.0782 -0.17157,1.0931 -0.84756,3.6927 -1.0331,3.9729 -0.1058,0.1598 -0.41863,-0.2787 -0.57145,-0.801 -0.1405,-0.4801 -0.14799,-0.7204 -0.0387,-1.2408 0.19076,-0.9078 0.005,-1.0499 -0.52153,-0.399 -0.21594,0.2669 -0.55266,0.5973 -0.74828,0.7342 -0.61538,0.4309 -0.92088,1.3423 -0.95287,2.8429 -0.015,0.7054 -0.0602,1.2736 -0.10039,1.2627 -0.0401,-0.011 -0.12413,-0.012 -0.18659,0 -0.0625,0.01 -0.25425,-0.2146 -0.42621,-0.499 -0.17196,-0.2843 -0.37227,-0.5075 -0.44513,-0.4959 -0.0729,0.012 -0.24818,0.1934 -0.38959,0.4042 l -0.2571,0.3832 -0.22158,-0.3441 c -0.12187,-0.1893 -0.57336,-0.7676 -1.00332,-1.285 -0.96388,-1.1601 -1.68166,-2.341 -1.95151,-3.2106 -0.11264,-0.363 -0.2473,-0.746 -0.29925,-0.8511 -0.79053,-3.896 -0.75928,1.1507 -0.75535,2.3828 0.005,2.4076 0.037,2.8471 0.27119,3.7549 0.14588,0.5655 0.32376,1.1765 0.39531,1.3578 0.0715,0.1813 0.10955,0.3542 0.0845,0.384 -0.0251,0.03 -0.2505,-0.025 -0.50094,-0.1223 z m -14.59266,1.6164 c -0.11242,-0.8045 -0.11117,-0.8509 0.0485,-1.8067 0.1286,-0.77 0.0852,-2.281 -0.0776,-2.706 -0.0389,-0.1013 0.0567,-0.2315 0.24925,-0.3398 0.17172,-0.097 0.80925,-0.7651 1.41673,-1.4856 0.60748,-0.7205 1.13005,-1.3141 1.16127,-1.319 0.0312,-0.01 0.0343,0.157 0.007,0.36 -0.052,0.3846 0.10488,0.7278 0.67649,1.4799 l 0.33934,0.4465 -0.28463,0.4045 c -0.35654,0.5065 -0.45219,0.9165 -0.35732,1.5315 0.0694,0.4498 0.0386,0.5253 -0.46309,1.1377 -0.29557,0.3608 -0.55786,0.6593 -0.58285,0.6632 -0.025,0.01 -0.10548,-0.3657 -0.17886,-0.8215 -0.13749,-0.8541 -0.0381,-1.8846 0.23906,-2.4786 0.20966,-0.4493 -0.0348,-0.5532 -0.48009,-0.2041 -0.44835,0.3516 -1.01935,1.3195 -1.21281,2.056 -0.077,0.2933 -0.14305,1.2088 -0.14667,2.0344 -0.004,0.9864 -0.052,1.5244 -0.13884,1.5693 -0.0784,0.041 -0.16583,-0.1721 -0.21468,-0.5217 z m 50.33955,-8.3382 c -0.0747,-0.1622 -0.55737,-0.8154 -1.07265,-1.4515 -1.18055,-1.4573 -1.44774,-1.9042 -1.93295,-3.2324 -0.37282,-1.0206 -0.39135,-1.1543 -0.39271,-2.8336 -0.001,-1.6896 0.16287,-2.8589 0.40695,-2.8976 0.0566,-0.01 0.18847,0.237 0.29313,0.5466 0.26978,0.798 1.03446,1.9986 1.94111,3.0474 1.05824,1.2242 1.41501,1.7925 1.68897,2.6906 0.37392,1.2256 0.25311,2.4763 -0.37541,3.8865 -0.26617,0.5972 -0.3724,0.6438 -0.55644,0.244 z m -66.09659,10.2139 c -0.0435,-0.04 -0.079,-0.4055 -0.079,-0.8137 0,-0.5504 0.0838,-0.9407 0.32438,-1.51 0.2546,-0.6024 0.32307,-0.9435 0.31829,-1.585 -0.003,-0.4496 -0.0715,-0.9353 -0.15151,-1.0793 -0.1088,-0.1959 -0.1149,-0.4484 -0.0242,-1.0034 0.0666,-0.4079 0.11572,-1.449 0.10907,-2.3137 -0.0142,-1.8452 0.22319,-3.4097 0.75031,-4.945 0.2971,-0.8654 0.35121,-1.1797 0.30888,-1.7944 -0.0496,-0.7206 -0.0447,-0.737 0.14821,-0.4959 0.24437,0.3052 0.46917,0.1516 0.46917,-0.3207 0,-0.7256 0.48788,-2.4283 0.94894,-3.3119 0.51216,-0.9814 0.74003,-1.6616 0.95294,-2.8442 0.0955,-0.5306 0.16957,-0.7155 0.24232,-0.605 0.18826,0.2858 0.11565,1.9086 -0.13031,2.9119 -0.47726,1.9469 -0.62019,2.9026 -0.56194,3.7579 0.0315,0.4635 0.12041,0.9134 0.19745,0.9997 0.11119,0.1247 0.0661,0.2965 -0.21887,0.8335 -0.54468,1.0265 -0.8074,1.7748 -0.96033,2.735 -0.1444,0.9067 -0.25521,1.0653 -0.4702,0.6727 -0.0698,-0.1274 -0.21203,-0.2182 -0.31608,-0.2017 -0.15422,0.024 -0.17394,0.1149 -0.10668,0.4891 0.22796,1.2687 0.21615,1.4342 -0.20229,2.8371 -0.53663,1.7991 -0.67907,2.8598 -0.67907,5.0565 l 0,1.7998 -0.33252,0.3911 c -0.35328,0.4155 -0.41185,0.4526 -0.5369,0.3396 z m 3.73707,-1.1434 c -0.80489,-0.6687 -0.9435,-2.1816 -0.28553,-3.1164 0.16902,-0.2401 0.53965,-0.5793 0.82361,-0.7536 0.57325,-0.3519 1.69707,-1.5968 2.03198,-2.2508 0.11912,-0.2326 0.28407,-0.7736 0.36656,-1.2022 0.0825,-0.4287 0.19164,-0.8425 0.24256,-0.9199 0.17105,-0.2597 0.69596,-2.2723 0.8948,-3.4309 0.19147,-1.1155 0.18914,-2.9365 -0.005,-3.8872 l -0.0747,-0.3658 0.34896,0.3628 c 0.70421,0.7324 1.13592,3.0668 0.91728,4.96 l -0.0846,0.7328 -0.45512,-0.4682 c -0.40579,-0.4174 -0.46475,-0.4407 -0.54405,-0.2143 -0.0489,0.1396 -0.0267,0.491 0.0493,0.7809 0.20803,0.7931 0.16506,2.6985 -0.0907,4.0224 -0.28249,1.4621 -0.85854,3.4098 -1.01587,3.4348 -0.20089,0.032 -0.56402,-0.852 -0.57564,-1.4011 -0.006,-0.2862 0.0336,-0.7399 0.088,-1.0083 0.12546,-0.618 -0.0546,-0.615 -0.53608,0.01 -0.19151,0.2481 -0.51968,0.5693 -0.72927,0.7137 -0.6395,0.4408 -0.96241,1.3678 -0.99811,2.8655 -0.0164,0.6879 -0.0482,1.273 -0.0707,1.3005 -0.0225,0.027 -0.15646,-0.046 -0.29773,-0.1635 z m 37.9293,-7.4915 c -0.2473,-0.7858 -0.26203,-0.9655 -0.15291,-1.8644 0.0664,-0.5471 0.0824,-1.3696 0.0354,-1.8278 -0.0784,-0.7646 -0.0695,-0.8202 0.10765,-0.6781 0.10614,0.085 0.21902,0.1508 0.25084,0.1457 0.0318,-0.01 0.0557,-0.7029 0.0532,-1.5508 -0.004,-1.3193 0.0345,-1.652 0.26652,-2.3063 0.14913,-0.4205 0.31803,-0.8028 0.37534,-0.8495 0.0573,-0.047 0.23424,0.1366 0.39317,0.4074 0.25638,0.4367 0.27884,0.5791 0.19914,1.262 -0.0972,0.8324 -0.0315,1.8877 0.1376,2.2112 0.0779,0.1491 -0.002,0.3839 -0.30498,0.9004 -0.66415,1.1308 -0.91971,2.0487 -1.0085,3.6223 l -0.0789,1.3975 z m 14.39761,-1.882 c -0.10934,-0.1598 -0.18105,-0.4176 -0.15936,-0.5727 0.0297,-0.2124 0.0884,-0.142 0.23724,0.2845 0.22423,0.6424 0.20727,0.7052 -0.0779,0.2882 z m -31.99327,4.3983 c -0.11069,-0.1814 -0.19675,-0.4352 -0.19125,-0.5639 0.006,-0.1356 0.10928,-0.02 0.24624,0.275 0.27387,0.59 0.23934,0.7714 -0.055,0.2889 z m -14.26755,2.2438 c -0.27309,-0.3135 -0.35663,-1.0244 -0.27472,-2.3374 0.0458,-0.7344 0.0567,-1.6144 0.0242,-1.9555 -0.0488,-0.5124 -0.0317,-0.5971 0.0984,-0.4878 0.0867,0.073 0.18816,0.1276 0.22558,0.1216 0.0374,-0.01 0.0684,-0.7049 0.0688,-1.5533 5.8e-4,-1.3106 0.0415,-1.6574 0.27161,-2.3071 0.14894,-0.4205 0.31248,-0.7985 0.36343,-0.84 0.051,-0.041 0.23145,0.1277 0.40113,0.376 0.29265,0.4283 0.30198,0.4918 0.18154,1.2371 -0.0932,0.5766 -0.0897,1.0253 0.0133,1.6868 0.13778,0.8852 0.13455,0.9117 -0.18159,1.4937 -0.68033,1.2525 -0.89726,2.006 -0.97861,3.3989 -0.0597,1.0228 -0.10809,1.2876 -0.21313,1.167 z m 33.8045,-6.3584 c 0.11988,-1.5499 0.44747,-3.7515 0.63321,-4.2555 l 0.17248,-0.4681 0.21116,0.5961 c 0.15308,0.4321 0.21368,0.995 0.22034,2.0468 l 0.009,1.4509 -0.66016,0.7929 -0.66017,0.7929 z m -32.06423,4.8303 c 0.003,-0.4204 0.0479,-0.8141 0.35823,-3.1936 0.0779,-0.5973 0.23245,-1.3275 0.34347,-1.6227 l 0.20183,-0.5368 0.19836,0.8072 c 0.12166,0.4951 0.19835,1.31 0.19835,2.1077 l 0,1.3005 -0.65206,0.7873 -0.65206,0.7874 z m 43.58891,-7.2469 c -0.13446,-0.388 -0.19942,-0.8691 -0.1748,-1.2944 l 0.0392,-0.6769 0.20966,0.4482 c 0.15012,0.3208 0.19976,0.6883 0.1748,1.2943 l -0.0348,0.8462 z m 2.12893,-0.505 c -0.23818,-0.2628 -0.28579,-0.422 -0.23271,-0.7779 0.0806,-0.5401 -0.11189,-1.3996 -0.49088,-2.1919 -0.15393,-0.3219 -0.40087,-1.1254 -0.54875,-1.7857 -0.25124,-1.1218 -0.25886,-1.2771 -0.11622,-2.3701 0.24419,-1.8711 0.39072,-2.0767 0.52173,-0.732 0.0763,0.7829 0.39424,1.7503 0.66866,2.0344 0.15331,0.1587 0.21372,0.4415 0.22113,1.0351 0.007,0.5274 0.11667,1.1226 0.31064,1.6797 0.23006,0.6607 0.30044,1.1116 0.30044,1.9251 0,1.5544 -0.11062,1.7609 -0.63404,1.1833 z m -34.21276,4.6405 c -0.0811,-0.3507 -0.12929,-0.8955 -0.10703,-1.2107 l 0.0404,-0.573 0.20665,0.4548 c 0.21218,0.4669 0.29198,1.9214 0.10703,1.9507 -0.0548,0.01 -0.16599,-0.2711 -0.24711,-0.6218 z m 2.14341,-0.3754 c -0.17341,-0.2066 -0.22567,-0.4017 -0.17779,-0.6635 0.0771,-0.4218 -0.1297,-1.4343 -0.43539,-2.1313 -0.34278,-0.7816 -0.70242,-2.0488 -0.78204,-2.7557 -0.0651,-0.5782 0.0193,-1.4757 0.26316,-2.7976 0.10422,-0.5649 0.24256,-0.3371 0.31954,0.5261 0.0771,0.8649 0.42841,1.9241 0.74453,2.2449 0.14625,0.1485 0.18097,0.3315 0.129,0.6798 -0.0833,0.5581 0.0672,1.3645 0.40223,2.1549 0.31305,0.7386 0.29628,2.8492 -0.0236,2.9649 -0.10673,0.038 -0.30458,-0.062 -0.43967,-0.2225 z m 22.03694,-4.3759 c -0.008,-0.5246 -1.20696,-2.5809 -1.98484,-3.4886 -0.33423,-0.39 -0.38951,-0.5398 -0.32923,-0.8921 0.19545,-1.1423 -0.4078,-2.995 -1.40983,-4.3299 -0.74481,-0.9923 -1.52009,-2.2442 -1.44586,-2.3348 0.23124,-0.2823 2.63962,1.8376 3.48553,3.0681 0.7323,1.0651 1.39124,2.4618 1.68558,3.5728 0.34546,1.304 0.46122,4.0865 0.18734,4.5032 -0.18483,0.2811 -0.18483,0.1525 -0.18869,-0.099 z m -32.01405,4.4149 c 0,-0.478 -1.37411,-2.9052 -2.12852,-3.7598 -0.11834,-0.1341 -0.18622,-0.519 -0.2008,-1.1386 -0.0357,-1.5191 -0.36107,-2.3449 -1.69833,-4.3109 -0.65387,-0.9613 -1.18886,-1.7936 -1.18886,-1.8494 0,-0.2189 0.25295,-0.1166 0.91267,0.3692 2.08421,1.5346 3.52241,3.5886 4.25398,6.0754 0.27316,0.9285 0.32047,1.3277 0.33238,2.8045 0.01,1.2263 -0.0288,1.7742 -0.13432,1.9037 -0.11883,0.1458 -0.1482,0.1271 -0.1482,-0.094 z m 36.28549,-6.0881 c -0.10935,-0.1225 -0.10167,-0.2434 0.0346,-0.5449 0.44852,-0.9923 0.36734,-1.5742 -0.36058,-2.5847 -0.38862,-0.5395 -0.41842,-0.6448 -0.36791,-1.2996 0.0698,-0.9057 0.19052,-1.0608 0.67721,-0.8707 0.36615,0.143 0.37986,0.1378 0.71624,-0.2728 0.43599,-0.5322 0.55319,-1.2079 0.38546,-2.2221 -0.0722,-0.4365 -0.1118,-0.8174 -0.088,-0.8465 0.0237,-0.029 0.15142,0.045 0.28367,0.1645 0.54828,0.4954 0.81665,2.6346 0.63715,5.0787 -0.0942,1.2827 -0.10387,1.3186 -0.23525,0.8724 -0.16734,-0.5684 -0.46255,-0.8876 -0.77504,-0.838 -0.20576,0.033 -0.2246,0.093 -0.15492,0.4967 0.27312,1.5822 0.23348,2.2134 -0.16989,2.7058 -0.27838,0.3398 -0.39469,0.372 -0.5827,0.1612 z m -14.64553,1.6702 c -0.20268,-0.1831 -0.15959,-0.5304 0.17539,-1.4136 0.25688,-0.6774 0.42303,-0.8277 0.58597,-0.5302 0.18743,0.3422 0.14976,1.0999 -0.0767,1.543 -0.25221,0.4934 -0.4524,0.6107 -0.68466,0.4008 z m -17.36062,2.657 c -0.1155,-0.1295 -0.1031,-0.2534 0.0614,-0.6133 0.4079,-0.8923 0.26046,-1.674 -0.50316,-2.6677 -0.25979,-0.3381 -0.29518,-0.4951 -0.25402,-1.1263 0.0594,-0.9107 0.19419,-1.1042 0.61255,-0.8795 0.29056,0.1561 0.32741,0.1504 0.61536,-0.096 0.61091,-0.522 0.75468,-1.4294 0.45644,-2.8809 -0.0684,-0.3327 -0.0509,-0.3907 0.10575,-0.3518 0.32205,0.08 0.65633,0.9741 0.79076,2.1147 0.13785,1.1697 0.0406,4.2289 -0.13533,4.2568 -0.0557,0.01 -0.10123,-0.096 -0.10123,-0.2338 0,-0.1374 -0.15648,-0.4101 -0.34774,-0.6059 -0.52793,-0.5405 -0.64614,-0.2859 -0.47801,1.0292 0.12268,0.9596 0.11459,1.1145 -0.0822,1.5736 -0.23805,0.5552 -0.51412,0.7343 -0.74053,0.4805 z m -14.64096,1.6734 c -0.21512,-0.1944 -0.14881,-0.7415 0.18115,-1.4945 0.21696,-0.4953 0.42431,-0.7526 0.52965,-0.6574 0.15877,0.1434 0.18772,1.3589 0.0399,1.6756 -0.22918,0.4912 -0.52585,0.6794 -0.75071,0.4763 z m 31.524,-7.0334 c 0.26253,-1.7714 0.44886,-2.4525 0.78938,-2.886 0.37763,-0.4808 0.46409,-0.9905 0.29097,-1.7154 -0.13353,-0.5592 0.12825,-0.4997 0.44668,0.1014 0.28066,0.5299 0.32179,1.7806 0.088,2.6765 -0.14675,0.5624 -1.00052,1.8158 -1.46867,2.1562 -0.20033,0.1456 -0.21299,0.1168 -0.14636,-0.3327 z m -32.06017,4.322 c 0.41675,-2.136 0.51049,-2.4567 0.84402,-2.8864 0.37426,-0.4823 0.45806,-0.9937 0.28321,-1.7283 -0.0924,-0.3884 -0.0844,-0.4106 0.10057,-0.277 0.38734,0.28 0.57395,0.8308 0.56896,1.6793 -0.008,1.3547 -0.1918,1.8846 -0.98225,2.8314 -0.38318,0.459 -0.74458,0.8421 -0.80313,0.8514 -0.0609,0.01 -0.0657,-0.1918 -0.0114,-0.4704 z m 38.87723,-6.9387 c 0,-0.061 0.08,-0.1937 0.17783,-0.2954 0.14858,-0.1546 0.17784,-0.141 0.17784,0.082 0,0.1536 -0.0756,0.2792 -0.17784,0.2954 -0.0978,0.016 -0.17783,-0.022 -0.17783,-0.082 z"
-         style="fill:url(#linearGradient120914);fill-opacity:1" />
-      <path
-         transform="matrix(0.06418734,0.02637803,-0.16989623,0.03548107,1065.4079,1635.9846)"
-         style="opacity:0.29596414;fill:url(#linearGradient120916);fill-opacity:1;filter:url(#filter119916)"
-         d="m -381.65793,1267.809 c 0.77672,-3.4305 44.70529,289.842 45.73844,284.1973 0.36902,-2.0161 -49.1092,-315.6131 -47.74717,-318.0709 2.13237,-3.848 2.30335,-4.7922 1.23066,-6.7966 0.38783,-3.8474 -0.45044,3.7704 0.55269,-6.3735 2.45457,-24.8205 7.86079,-53.2773 13.8162,-65.0297 3.3632,-6.637 11.72985,-15.195 22.89256,-21.1873 11.214,-6.0199 15.18177,-6.9406 15.18177,-14.6278 0,-2.8439 0.4872,-8.798 -0.37522,-11.7021 -0.86242,-2.9041 -1.76661,-6.6151 -1.46844,-6.3662 1.78093,1.4864 4.95887,4.1219 7.11676,10.5089 2.20758,6.534 3.51049,10.9175 -0.27251,18.3834 -1.91472,3.7787 -13.5744,13.8836 -13.58468,14.3129 -0.0103,0.4293 -6.703,34.611 -4.80004,36.2818 1.90295,1.6708 16.47215,-10.6273 17.92973,-7.6482 2.3519,4.8071 9.31349,-13.9992 8.84214,-7.5519 -0.29211,3.9957 -3.11303,8.1769 -3.84951,9.6721 l -1.80027,3.6549 6.24342,-2.4108 c 7.06291,-2.7271 9.43126,-16.0152 9.6766,-35.7892 0.24037,-19.3733 1.43975,-27.6426 6.7223,-39.5847 2.0219,-4.5709 5.33982,-5.2836 2.42067,-15.2402 l -0.24552,-4.5257 1.73952,2.2118 c 3.17899,4.0421 3.63062,0.1909 3.63062,-2.936 0,-5.415 3.74074,-18.6742 7.1629,-23.8284 4.41827,-6.6544 7.41108,-11.694 8.96399,-22.1349 1.38846,-9.3352 2.14349,-4.4891 2.37782,2.8802 0.18332,5.7652 -0.83203,10.7781 -3.06749,19.3878 -3.53198,13.6031 -5.28927,24.318 -3.64353,28.5346 1.67874,4.3011 1.14003,20.8111 2.96997,10.5789 1.79636,-10.0444 3.24353,11.3588 10.69264,2.4516 7.24892,-8.6679 -0.23749,-21.6346 2.01227,-19.352 4.51526,4.5811 4.48715,5.3457 5.29879,14.2777 1.19335,13.1328 -4.16019,18.374 -16.19994,28.2096 -2.52655,2.064 -0.42735,7.5105 0.0481,11.0549 0.795,5.9272 4.71716,4.0913 6.56871,-0.34 3.11509,-7.4555 6.67206,-12.1173 6.74874,-10.8954 0.0475,0.7566 1.19249,1.8151 2.27512,3.1915 1.08264,1.3763 2.37262,3.5533 3.05406,6.1011 0.68144,2.5479 3.14472,7.6165 3.50593,7.6165 0.65411,0 3.56364,-6.7439 5.57996,-13.4016 1.93769,-6.3982 4.72868,-21.0808 4.72868,-27.8293 0,-3.6624 0.002,-8.9816 -0.83933,-12.2111 -0.84118,-3.2295 -1.4696,-5.8596 -1.30276,-6.3601 2.17829,2.8681 2.26269,1.9995 4.95834,6.9523 4.62043,8.4893 5.83259,15.115 5.48864,33.6791 -0.29272,15.7992 -1.53733,21.2393 2.50733,24.9894 l 5.49746,5.0971 0.114,-12.2299 c 0.0854,-9.1634 1.20775,-14.2522 3.30522,-19.4503 3.03562,-7.523 3.76355,-9.0959 1.73609,-11.7765 -1.57601,-2.0836 -2.2949,-3.4386 -0.96603,-3.4386 0.44488,0 0.83893,0.1014 1.90655,0.909 2.51245,1.9003 4.57399,1.1442 6.13443,-0.7358 2.10046,-2.5309 0.23963,-1.0938 0.23963,3.3955 0,3.6563 0.71879,3.2115 3.94551,6.3623 2.08569,2.0366 3.10284,5.3851 7.54221,5.5822 3.12939,0.1389 0.12876,-17.4624 -1.73995,-22.8597 -0.95214,-2.75 -5.27235,-11.1387 -9.88161,-18.1542 -7.61684,-11.593 -11.72561,-17.3034 -11.72561,-18.7192 0,-3.1136 10.68836,6.2728 19.04215,15.4765 11.71548,12.9074 19.23107,27.3454 23.79787,43.1309 1.94015,6.7063 3.28125,10.1611 3.28353,23.3274 7.7e-4,3.5489 -3.89002,11.5149 -2.15854,13.4853 1.62888,1.8536 8.57072,-3.1464 13.86816,-7.2915 3.35775,-2.6274 5.21139,-18.8273 5.01605,-16.13 -0.18183,0.5656 -0.5098,13.644 -2.76733,16.0496 -5.40917,5.7639 -14.41256,14.79 -15.68058,17.3999 -2.49456,5.1344 3.08301,8.0594 4.2098,8.0594 2.66534,0 22.55827,-19.0854 24.24516,-21.5621 0.29621,-0.4349 3.04733,-4.7146 4.80382,-6.7152 2.60817,-2.9705 4.26233,-5.8954 4.58286,-10.5077 0.36808,-5.2966 0.73687,-6.4597 -3.32435,-12.4755 -4.67747,-6.9287 -6.46424,-8.09 -3.99071,-15.5848 1.23159,-3.7318 1.21542,-5.2705 3.23509,-2.8369 2.0611,2.4834 6.46393,2.0854 8.07867,-1.0372 2.53694,-4.9059 4.79496,-8.9065 3.0927,-15.551 -1.99417,-7.784 -1.31098,-11.4425 1.53961,-6.3609 3.30361,5.8891 5.36676,9.0229 5.02646,39.6432 -0.32806,29.5197 0.61197,29.0316 6.64582,36.4955 3.92813,4.8592 6.79875,4.6677 6.82505,-1.7734 0.0174,-4.2676 -0.27301,-0.4385 2.02994,2.8309 1.34541,1.91 2.1895,3.0306 3.00146,1.7573 0.52607,-0.825 1.88351,-7.4067 1.89193,-8.5286 0.008,-1.122 0.42302,-4.479 1.29619,-7.757 1.4731,-5.5304 1.91873,-7.1372 0.25983,-15.7357 -1.56393,-8.1062 -1.56055,-9.9421 -0.50861,-18.2708 1.91662,-15.1748 3.51424,-16.0775 3.51424,-4.1978 0,6.5446 1.17024,8.6124 3.14593,12.3834 l 2.344506,4.475 3.19565,0.1352 1.35541,-1.5836 1.3945,2.2991 c 1.19475,1.9699 2.1142,2.7175 2.52527,2.7175 2.92175,0 3.83879,-16.4074 0.29349,-25.4558 -1.98892,-5.0762 -2.87778,-7.5215 -2.87778,-15.8133 0,-5.5437 -0.22519,-8.0773 0.24931,-8.0773 0.4745,0 0.8689,0.3682 2.56334,3.8057 1.69444,3.4375 5.04943,8.3411 7.64296,11.3661 5.25964,6.1346 8.26364,12.9736 9.28269,19.3696 0.73986,4.6436 1.23348,7.4336 4.05202,5.3001 1.63134,-2.205 1.68294,-2.5272 1.69204,2.0678 0.01,4.8346 0.55859,8.9957 2.71107,11.8158 1.27193,1.6665 4.05615,1.0067 4.92562,-0.2927 1.46449,-2.1887 1.16183,-11.3921 -0.11114,-16.0817 -1.97451,-7.2741 -2.66976,-7.7807 3.8756,0.669 l 4.64497,5.9965 2.15817,-1.986 c 0.80745,-1.705 1.625,-2.7886 2.09794,-2.631 0.47293,0.1576 0.65396,1.3645 1.90174,4.9354 2.39,6.8398 6.884059,12.7196 8.336159,12.7196 0.47626,0 1.68511,-1.4263 1.9366,-2.6638 2.10914,-10.3788 2.71978,-14.7197 4.7836,-19.3691 2.029,-4.5711 4.4162,-7.3595 3.94665,-12.346 -0.31075,-3.3 0.37365,-4.7439 0.0214,-6.2564 -0.86896,-3.7315 -0.18662,-3.9822 2.70936,-0.3126 3.063941,3.8823 1.604951,3.0592 2.398061,-2.9237 1.00081,-7.5497 3.77267,-19.708 7.27981,-24.8055 3.91142,-5.685 7.5685401,-11.7422 9.0034001,-21.431 1.38191,-9.3311 -0.21798,-7.9983 1.20591,-2.8702 2.10328,7.5749 0.71031,12.642 -2.70023,25.2196 -3.4371801,12.6759 -3.6999901,29.8031 -1.34789,32.1654 1.59057,1.5975 4.76419,6.6802 6.29477,-2.9685 -0.22005,11.5077 1.59030003,5.982 6.44381,12.6681 3.76747,5.19 6.6938399,-7.6138 6.7922199,-3.9689 0.33515,11.6216 -3.5421399,13.3372 -13.9166899,24.0666 -2.30526,2.384 -4.10195,3.0542 -2.27549,12.4779 1.16835,6.0281 3.62107,4.2064 5.53542003,-0.3799 2.08500997,-4.9951 4.53862997,-11.0222 6.38373997,-11.0222 0.77878,0 1.56932,-0.1673 1.56932,0.3945 0,0.5618 1.63148,1.9131 2.9694999,3.9638 1.338,2.0507 2.27803,4.6976 2.65122,6.7601 0.37319,2.0625 2.19138,6.6653 2.63468,6.6653 0.4433,0 3.0241,-4.2826 3.86077,-6.6201 6.2882,-17.568 8.56503,-35.7616 5.49067,-48.8039 -0.82902,-3.517 -0.66172,-4.3691 -0.37793,-4.6529 0.6219,-0.2206 1.28001,0.9244 3.77339,4.8801 5.13103,8.1401 5.46149,10.9382 5.61158,30.6317 0.0775,10.175 0.95266,23.176 1.38239,25.101 0.89411,4.0051 6.22393,10.4001 6.9084,9.7156 0.25305,-0.253 0.12322,-6.9337 0.27378,-12.6443 0.17217,-6.5304 -0.0579,-11.1381 0.93972,-13.6539 0.87235,-2.2 2.94936,-7.0807 3.67842,-8.8682 1.09342,-2.6809 1.86379,-4.1379 0.78727,-6.8187 -2.32694,-5.795 -3.0638,-4.3869 -1.48594,-4.3869 0.82181,0 2.36109,0.1433 3.04578,0.9683 1.71801,2.07 1.14715,2.1831 3.7183,0.2663 1.87629,-1.3987 2.81229,-4.7089 2.17247,0.061 -0.49568,3.6956 2.10364,7.3636 5.59843,10.9426 2.11377,2.1647 5.952219,2.5995 6.468134,2.5995 1.59113,0 -0.288015,-17.0391 -2.421371,-22.6006 -1.094633,-2.8536 -4.975793,-10.6721 -8.812233,-16.3435 -8.62667,-12.7528 -9.11547,-16.0959 -12.53862,-20.4959 2.60779,-0.667 15.12354,10.4481 24.567824,22.9816 6.900008,9.157 14.545518,22.7147 17.528508,32.8286 2.63913,8.9479 5.22866,28.3209 3.45816,36.6639 9.43723,-2.0459 20.542842,-6.1858 21.414862,-19.2481 0.6767,-1.3981 2.09711,9.8363 -2.24465,14.4004 -5.6113,5.8987 -17.627402,13.3362 -20.543582,17.9679 -1.83795,2.9192 3.65852,6.8238 4.01728,7.0456 2.26659,1.4008 19.222302,-11.9878 22.564762,-18.5234 1.12513,-2.2 5.73758,-8.3004 6.68868,-8.9702 2.40776,-1.6958 5.84056,-9.0923 4.72904,-12.968 -0.48993,-1.7083 -2.35034,-7.5057 -4.32168,-10.0875 -3.95591,-5.1809 -4.79558,-6.1231 -4.26619,-13.7723 0.30201,-4.3638 2.47734,-6.3352 4.535,-3.8558 0.68469,0.825 2.87644,1.1585 4.12084,1.1585 5.11262,0 9.28452,-8.0485 6.65704,-17.7494 -0.81932,-3.025 -1.62569,-8.5013 -1.22963,-8.9087 1.19167,-1.2258 1.83262,1.1785 3.90981,5.2502 3.41612,6.6961 3.73132,16.3195 2.98843,41.6524 -0.54415,18.556 1.53858,22.6069 2.56175,24.5385 2.20829,4.169 8.16668,10.9693 9.10383,10.3901 0.48836,-0.3018 0.88793,-2.5472 0.88793,-4.9898 0,-4.8519 0.96762,-5.8185 3.25494,-2.5529 2.10998,3.0124 4.56373,3.0495 5.28783,-3.1114 0.34756,-2.9572 1.59369,-7.5405 2.37158,-9.7452 1.26806,-3.5941 1.43416,-4.5849 -0.27406,-10.7453 -2.28232,-8.2308 -3.43996,-8.5629 -1.43224,-19.377 2.42078,-13.0389 1.64731,-17.3573 3.3823,-8.9603 1.37608,6.6598 2.27087,13.6131 4.66793,17.2683 l 1.95843,2.9863 2.48376,0.8597 c 0.92484,-0.9342 1.11843,-2.6632 1.99606,-0.7001 0.84082,1.8806 3.05937,3.8096 3.5537,3.7955 4.34917,-0.1245 3.27673,-17.9787 -0.46477,-27.9123 -1.56485,-4.1547 -2.46294,-5.0904 -2.4876,-12.4554 -0.019,-5.6596 -0.0774,-9.2013 0.47799,-9.2411 0.68724,-0.049 0.2885,0.2267 1.75074,3.3176 1.46224,3.0909 3.22272,7.0839 5.50535,9.9055 7.23631,8.9449 10.26051,10.6964 11.58335,17.7209 0.71559,3.8 1.8815,9.0577 1.98603,9.2392 0.10453,0.1814 1.05542,1.1134 2.4953,0.17 0.7982,-1.5816 1.96984,-2.758 1.83916,0.067 -0.24699,5.3393 0.17984,9.3401 4.27297,17.4679 3.42033,6.7919 5.44432,17.162 6.64866,25.8549 0.51545,3.7205 2.46936,6.2504 3.36355,5.3561 0.80858,-0.8086 5.9506,-6.1395 4.23504,-19.315 -2.06501,-15.8592 -2.16894,-20.8712 -0.63415,-24.8902 1.00747,-2.6382 1.83357,-5.1248 2.36592,-4.9473 0.53234,0.1774 0.31852,-0.3042 1.2478,2.4315 2.66182,7.8362 8.58967,17.6156 16.98302,28.0935 4.25606,5.3131 8.68108,11.6528 10.09847,14.1278 7.46458,13.0344 7.30644,27.4822 -0.0657,40.2356 l -2.20902,3.8215 3.87164,9.4767 c 5.54105,13.563 18.839,225.713 9.48249,238.0747 -82.88145,0 -639.46573,83.4363 -705.45687,87.1724 z m 550.40286,-109.7426 c -0.65964,-2.7497 -1.82394,-5.8236 -2.58734,-6.8309 -1.29984,-1.7151 -1.39001,-1.6683 -1.4198,0.7371 -0.0548,4.4294 2.99086,13.3088 4.163,12.1367 0.72464,-0.7247 0.67701,-2.5711 -0.15586,-6.0429 z m -270.41501,-6.6707 c -2.09927,-8.039 -4.08857,-9.7139 -3.20838,-2.7014 0.79002,6.2942 2.56058,10.6336 3.82345,9.3707 0.52435,-0.5243 0.27033,-3.2787 -0.61507,-6.6693 z m 162.390356,-5.5197 c 1.09214,-2.1407 1.9857,-4.8832 1.9857,-6.0942 0,-2.9592 -4.85204,-11.0931 -6.32611,-10.605 -1.56686,0.5188 -2.12059,17.024 -0.66254,19.7484 1.36805,2.5563 2.49309,1.8706 5.00295,-3.0492 z m -269.932136,-6.3453 c 2.5099,-5.5272 2.39954,-7.1544 -0.83216,-12.27 -4.30877,-6.8205 -5.25,-5.8446 -5.25,5.4434 0,13.0852 2.14623,15.4941 6.08216,6.8266 z"
-         id="path12387-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssccsssssssscsssscsssscssssssssssssssscssssscssscsscsccsssssssscsscsssscssscsssssssccssssscccsssssssscsccssccsssscssssssssscscsssssssssscssscssscscsssssscssccsscscssscsssssscssscssssccssssssssccssscsscsssscsccssccssccscscscsssss" />
-      <path
-         id="rect9610-2"
-         style="fill:url(#linearGradient120918);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 774.41835,1644.6483 66.42639,-9.9437 0,58.0477 -66.42639,-14.4294 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect9622-0"
-         style="fill:#550000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 840.8447,1634.7046 9.38838,1.0038 0,54.969 -9.38834,2.0749 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1638.4168 -66.4096,8.1505"
-         id="path9628-1"
-         inkscape:path-effect="#path-effect26872"
-         inkscape:original-d="m 840.84474,1638.4168 -66.4096,8.1505"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1642.3724 -66.35392,6.3415"
-         id="path9632-5"
-         inkscape:path-effect="#path-effect26869"
-         inkscape:original-d="m 840.84474,1642.3724 -66.35392,6.3415"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1646.0612 -66.29071,4.703"
-         id="path9636-3"
-         inkscape:path-effect="#path-effect26866"
-         inkscape:original-d="m 840.84474,1646.0612 -66.29071,4.703"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1649.7552 -66.28606,3.1191"
-         id="path9640-5"
-         inkscape:path-effect="#path-effect26863"
-         inkscape:original-d="m 840.84474,1649.7552 -66.28606,3.1191"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1653.6057 -66.26623,1.3876"
-         id="path9644-65"
-         inkscape:path-effect="#path-effect26860"
-         inkscape:original-d="m 840.84474,1653.6057 -66.26623,1.3876"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1657.2492 -66.28765,-0.2026"
-         id="path9648-4"
-         inkscape:path-effect="#path-effect26857"
-         inkscape:original-d="m 840.84474,1657.2492 -66.28765,-0.2026"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1660.8749 -66.26587,-1.7232"
-         id="path9652-6"
-         inkscape:path-effect="#path-effect26854"
-         inkscape:original-d="m 840.84474,1660.8749 -66.26587,-1.7232"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1664.4941 -66.24463,-3.2276"
-         id="path9656-8"
-         inkscape:path-effect="#path-effect26851"
-         inkscape:original-d="m 840.84474,1664.4941 -66.24463,-3.2276"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1668.3032 -66.26761,-4.765"
-         id="path9660-1"
-         inkscape:path-effect="#path-effect26848"
-         inkscape:original-d="m 840.84474,1668.3032 -66.26761,-4.765"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1671.9657 -66.28341,-6.2646"
-         id="path9664-5"
-         inkscape:path-effect="#path-effect26845"
-         inkscape:original-d="m 840.84474,1671.9657 -66.28341,-6.2646"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1675.1888 -66.24471,-7.4855"
-         id="path9668-8"
-         inkscape:path-effect="#path-effect26842"
-         inkscape:original-d="m 840.84474,1675.1888 -66.24471,-7.4855"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1678.9978 -66.21668,-9.0884"
-         id="path9672-53"
-         inkscape:path-effect="#path-effect26839"
-         inkscape:original-d="m 840.84474,1678.9978 -66.21668,-9.0884"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1682.6293 -66.29429,-10.5569"
-         id="path9676-3"
-         inkscape:path-effect="#path-effect26836"
-         inkscape:original-d="m 840.84474,1682.6293 -66.29429,-10.5569"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1685.9694 -66.33177,-11.821"
-         id="path9680-2"
-         inkscape:path-effect="#path-effect26833"
-         inkscape:original-d="m 840.84474,1685.9694 -66.33177,-11.821"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1689.2456 -66.28714,-12.966"
-         id="path9684-8"
-         inkscape:path-effect="#path-effect26830"
-         inkscape:original-d="m 840.84474,1689.2456 -66.28714,-12.966"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 833.92588,1635.7427 0,3.3334"
-         id="path9688-7"
-         inkscape:path-effect="#path-effect26827"
-         inkscape:original-d="m 833.92588,1635.7427 0,3.3334"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 828.00027,1636.6319 0,3.3334"
-         inkscape:path-effect="#path-effect26824"
-         id="path9692-6"
-         d="m 828.00027,1636.6319 0,3.3334"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 821.91592,1637.5449 0,3.3333"
-         id="path9696-9"
-         inkscape:path-effect="#path-effect26821"
-         inkscape:original-d="m 821.91592,1637.5449 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 815.96635,1638.4377 0,3.0697"
-         inkscape:path-effect="#path-effect26818"
-         id="path9700-6"
-         d="m 815.96635,1638.4377 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 810.08683,1639.3199 0,3.0697"
-         id="path9704-4"
-         inkscape:path-effect="#path-effect26815"
-         inkscape:original-d="m 810.08683,1639.3199 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 804.35805,1640.1795 0,2.7353"
-         inkscape:path-effect="#path-effect26812"
-         id="path9708-6"
-         d="m 804.35805,1640.1795 0,2.7353"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 799.01959,1640.9806 0,2.7352"
-         id="path9712-3"
-         inkscape:path-effect="#path-effect26809"
-         inkscape:original-d="m 799.01959,1640.9806 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 794.05801,1641.7251 0,2.2507"
-         inkscape:path-effect="#path-effect26806"
-         id="path9716-2"
-         d="m 794.05801,1641.7251 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 789.00725,1642.483 0,2.2507"
-         id="path9720-1"
-         inkscape:path-effect="#path-effect26803"
-         inkscape:original-d="m 789.00725,1642.483 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 783.80163,1643.2641 0,2.2507"
-         inkscape:path-effect="#path-effect26800"
-         id="path9724-0"
-         d="m 783.80163,1643.2641 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 778.86121,1644.0054 0,2.2508"
-         id="path9728-5"
-         inkscape:path-effect="#path-effect26797"
-         inkscape:original-d="m 778.86121,1644.0054 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 831.39829,1639.7928 0,3.3333"
-         inkscape:path-effect="#path-effect26794"
-         id="path9760-8"
-         d="m 831.39829,1639.7928 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 825.47269,1640.5133 0,3.3333"
-         id="path9762-7"
-         inkscape:path-effect="#path-effect26791"
-         inkscape:original-d="m 825.47269,1640.5133 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 819.38834,1641.253 0,3.3334"
-         inkscape:path-effect="#path-effect26788"
-         id="path9764-0"
-         d="m 819.38834,1641.253 0,3.3334"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 813.43877,1641.9764 0,3.0698"
-         id="path9766-0"
-         inkscape:path-effect="#path-effect26785"
-         inkscape:original-d="m 813.43877,1641.9764 0,3.0698"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 807.55925,1642.6913 0,3.0697"
-         inkscape:path-effect="#path-effect26782"
-         id="path9768-3"
-         d="m 807.55925,1642.6913 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 801.83047,1643.3878 0,2.7353"
-         id="path9770-7"
-         inkscape:path-effect="#path-effect26779"
-         inkscape:original-d="m 801.83047,1643.3878 0,2.7353"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 796.49201,1644.0369 0,2.7352"
-         inkscape:path-effect="#path-effect26776"
-         id="path9772-3"
-         d="m 796.49201,1644.0369 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 791.53042,1644.6401 0,2.2508"
-         id="path9774-4"
-         inkscape:path-effect="#path-effect26773"
-         inkscape:original-d="m 791.53042,1644.6401 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 786.47967,1645.2543 0,2.2507"
-         inkscape:path-effect="#path-effect26770"
-         id="path9776-6"
-         d="m 786.47967,1645.2543 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 781.27405,1645.8872 0,2.2507"
-         id="path9778-2"
-         inkscape:path-effect="#path-effect26767"
-         inkscape:original-d="m 781.27405,1645.8872 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 776.33363,1646.4878 0,2.2507"
-         inkscape:path-effect="#path-effect26764"
-         id="path9780-0"
-         d="m 776.33363,1646.4878 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 838.34918,1638.8605 0,3.549"
-         id="path9832-11"
-         inkscape:path-effect="#path-effect26761"
-         inkscape:original-d="m 838.34918,1638.8605 0,3.549"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 834.01064,1643.0244 0,3.3334"
-         inkscape:path-effect="#path-effect26758"
-         id="path9840-65"
-         d="m 834.01064,1643.0244 0,3.3334"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 828.08503,1643.5905 0,3.3333"
-         id="path9842-34"
-         inkscape:path-effect="#path-effect26755"
-         inkscape:original-d="m 828.08503,1643.5905 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 822.00069,1644.1717 0,3.3333"
-         inkscape:path-effect="#path-effect26752"
-         id="path9844-9"
-         d="m 822.00069,1644.1717 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 816.05111,1644.7399 0,3.0698"
-         id="path9846-53"
-         inkscape:path-effect="#path-effect26749"
-         inkscape:original-d="m 816.05111,1644.7399 0,3.0698"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 810.17159,1645.3016 0,3.0697"
-         inkscape:path-effect="#path-effect26746"
-         id="path9848-43"
-         d="m 810.17159,1645.3016 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 804.44281,1645.8488 0,2.7353"
-         id="path9850-7"
-         inkscape:path-effect="#path-effect26743"
-         inkscape:original-d="m 804.44281,1645.8488 0,2.7353"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 799.10436,1646.3587 0,2.7353"
-         inkscape:path-effect="#path-effect26740"
-         id="path9852-7"
-         d="m 799.10436,1646.3587 0,2.7353"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 794.14277,1646.9496 0,2.2508"
-         id="path9854-0"
-         inkscape:path-effect="#path-effect26737"
-         inkscape:original-d="m 794.14277,1646.9496 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 789.09202,1647.3151 0,2.2507"
-         inkscape:path-effect="#path-effect26734"
-         id="path9856-9"
-         d="m 789.09202,1647.3151 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 783.8864,1647.8124 0,2.2507"
-         id="path9858-1"
-         inkscape:path-effect="#path-effect26731"
-         inkscape:original-d="m 783.8864,1647.8124 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 778.94597,1648.2842 0,2.2507"
-         inkscape:path-effect="#path-effect26728"
-         id="path9860-5"
-         d="m 778.94597,1648.2842 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 831.48306,1646.9366 0,3.3334"
-         id="path9876-4"
-         inkscape:path-effect="#path-effect26725"
-         inkscape:original-d="m 831.48306,1646.9366 0,3.3334"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 825.55745,1647.3339 0,3.3334"
-         inkscape:path-effect="#path-effect26722"
-         id="path9878-0"
-         d="m 825.55745,1647.3339 0,3.3334"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 819.4731,1647.742 0,3.3333"
-         id="path9880-0"
-         inkscape:path-effect="#path-effect26719"
-         inkscape:original-d="m 819.4731,1647.742 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 813.52353,1648.1409 0,3.0697"
-         inkscape:path-effect="#path-effect26716"
-         id="path9882-71"
-         d="m 813.52353,1648.1409 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 807.64401,1648.5351 0,3.0697"
-         id="path9884-2"
-         inkscape:path-effect="#path-effect26713"
-         inkscape:original-d="m 807.64401,1648.5351 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 801.91523,1648.9192 0,2.7353"
-         inkscape:path-effect="#path-effect26710"
-         id="path9886-37"
-         d="m 801.91523,1648.9192 0,2.7353"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 796.57677,1649.2772 0,2.7352"
-         id="path9888-7"
-         inkscape:path-effect="#path-effect26707"
-         inkscape:original-d="m 796.57677,1649.2772 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 791.61519,1649.6099 0,2.2507"
-         inkscape:path-effect="#path-effect26704"
-         id="path9890-3"
-         d="m 791.61519,1649.6099 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 786.56443,1649.9485 0,2.2508"
-         id="path9892-3"
-         inkscape:path-effect="#path-effect26701"
-         inkscape:original-d="m 786.56443,1649.9485 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 781.35881,1650.2976 0,2.2507"
-         inkscape:path-effect="#path-effect26698"
-         id="path9894-3"
-         d="m 781.35881,1650.2976 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 776.41839,1650.6287 0,2.2508"
-         id="path9896-9"
-         inkscape:path-effect="#path-effect26695"
-         inkscape:original-d="m 776.41839,1650.6287 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 838.43395,1646.3833 0,3.5491"
-         inkscape:path-effect="#path-effect26692"
-         id="path9910-1"
-         d="m 838.43395,1646.3833 0,3.5491"
-         style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 833.92588,1650.1453 0,3.3333"
-         inkscape:path-effect="#path-effect26689"
-         id="path9988-5"
-         d="m 833.92588,1650.1453 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 828.00027,1650.4097 0,3.3333"
-         id="path9990-8"
-         inkscape:path-effect="#path-effect26686"
-         inkscape:original-d="m 828.00027,1650.4097 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 821.91592,1650.6813 0,3.3333"
-         inkscape:path-effect="#path-effect26683"
-         id="path9992-8"
-         d="m 821.91592,1650.6813 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 815.96635,1650.9467 0,3.0697"
-         id="path9994-8"
-         inkscape:path-effect="#path-effect26680"
-         inkscape:original-d="m 815.96635,1650.9467 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 810.08683,1651.209 0,3.0697"
-         inkscape:path-effect="#path-effect26677"
-         id="path9996-0"
-         d="m 810.08683,1651.209 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 804.35805,1651.4647 0,2.7352"
-         id="path9998-2"
-         inkscape:path-effect="#path-effect26674"
-         inkscape:original-d="m 804.35805,1651.4647 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 799.01959,1651.7028 0,2.7352"
-         inkscape:path-effect="#path-effect26671"
-         id="path10000-44"
-         d="m 799.01959,1651.7028 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 794.05801,1652.2172 0,2.2508"
-         id="path10002-33"
-         inkscape:path-effect="#path-effect26668"
-         inkscape:original-d="m 794.05801,1652.2172 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 789.00725,1652.1496 0,2.2507"
-         inkscape:path-effect="#path-effect26665"
-         id="path10004-6"
-         d="m 789.00725,1652.1496 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 783.80163,1652.3819 0,2.2507"
-         id="path10006-7"
-         inkscape:path-effect="#path-effect26662"
-         inkscape:original-d="m 783.80163,1652.3819 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 778.86121,1652.6023 0,2.2508"
-         inkscape:path-effect="#path-effect26659"
-         id="path10008-6"
-         d="m 778.86121,1652.6023 0,2.2508"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 831.39829,1653.9289 0,3.3333"
-         id="path10024-6"
-         inkscape:path-effect="#path-effect26656"
-         inkscape:original-d="m 831.39829,1653.9289 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 825.47269,1654.0246 0,3.3333"
-         inkscape:path-effect="#path-effect26653"
-         id="path10026-1"
-         d="m 825.47269,1654.0246 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 819.38834,1654.1229 0,3.3333"
-         id="path10028-4"
-         inkscape:path-effect="#path-effect26650"
-         inkscape:original-d="m 819.38834,1654.1229 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 813.43877,1654.2189 0,3.0698"
-         inkscape:path-effect="#path-effect26647"
-         id="path10030-8"
-         d="m 813.43877,1654.2189 0,3.0698"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 807.55925,1654.3139 0,3.0698"
-         id="path10032-1"
-         inkscape:path-effect="#path-effect26644"
-         inkscape:original-d="m 807.55925,1654.3139 0,3.0698"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 801.83047,1654.4064 0,2.7353"
-         inkscape:path-effect="#path-effect26641"
-         id="path10034-6"
-         d="m 801.83047,1654.4064 0,2.7353"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 796.49201,1654.4927 0,2.7352"
-         id="path10036-5"
-         inkscape:path-effect="#path-effect26638"
-         inkscape:original-d="m 796.49201,1654.4927 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 791.53042,1654.5727 0,2.2508"
-         inkscape:path-effect="#path-effect26635"
-         id="path10038-9"
-         d="m 791.53042,1654.5727 0,2.2508"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 786.47967,1654.6543 0,2.2508"
-         id="path10040-6"
-         inkscape:path-effect="#path-effect26632"
-         inkscape:original-d="m 786.47967,1654.6543 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 781.27405,1654.7385 0,2.2507"
-         inkscape:path-effect="#path-effect26629"
-         id="path10042-8"
-         d="m 781.27405,1654.7385 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 776.33363,1654.8182 0,2.2507"
-         id="path10044-7"
-         inkscape:path-effect="#path-effect26626"
-         inkscape:original-d="m 776.33363,1654.8182 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 838.34918,1653.7294 0,3.5491"
-         inkscape:path-effect="#path-effect26623"
-         id="path10058-1"
-         d="m 838.34918,1653.7294 0,3.5491"
-         style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 834.01064,1657.4359 0,3.3334"
-         id="path10062-9"
-         inkscape:path-effect="#path-effect26620"
-         inkscape:original-d="m 834.01064,1657.4359 0,3.3334"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 828.08503,1657.3772 0,3.3333"
-         inkscape:path-effect="#path-effect26617"
-         id="path10064-1"
-         d="m 828.08503,1657.3772 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 822.00069,1657.3169 0,3.3334"
-         id="path10066-6"
-         inkscape:path-effect="#path-effect26614"
-         inkscape:original-d="m 822.00069,1657.3169 0,3.3334"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 816.05111,1657.2579 0,3.0697"
-         inkscape:path-effect="#path-effect26611"
-         id="path10068-7"
-         d="m 816.05111,1657.2579 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 810.17159,1657.1996 0,3.0697"
-         id="path10070-6"
-         inkscape:path-effect="#path-effect26608"
-         inkscape:original-d="m 810.17159,1657.1996 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 804.44281,1657.1429 0,2.7352"
-         inkscape:path-effect="#path-effect26605"
-         id="path10072-37"
-         d="m 804.44281,1657.1429 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 799.10436,1657.0899 0,2.7352"
-         id="path10074-1"
-         inkscape:path-effect="#path-effect26602"
-         inkscape:original-d="m 799.10436,1657.0899 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 794.14277,1657.248 0,2.2507"
-         inkscape:path-effect="#path-effect26599"
-         id="path10076-2"
-         d="m 794.14277,1657.248 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 789.09202,1656.9906 0,2.2507"
-         id="path10078-7"
-         inkscape:path-effect="#path-effect26596"
-         inkscape:original-d="m 789.09202,1656.9906 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 783.8864,1656.9391 0,2.2507"
-         inkscape:path-effect="#path-effect26593"
-         id="path10080-9"
-         d="m 783.8864,1656.9391 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 778.94597,1656.89 0,2.2508"
-         id="path10082-4"
-         inkscape:path-effect="#path-effect26590"
-         inkscape:original-d="m 778.94597,1656.89 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 831.48306,1660.847 0,3.3334"
-         inkscape:path-effect="#path-effect26587"
-         id="path10098-7"
-         d="m 831.48306,1660.847 0,3.3334"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 825.55745,1660.6195 0,3.3334"
-         id="path10100-1"
-         inkscape:path-effect="#path-effect26584"
-         inkscape:original-d="m 825.55745,1660.6195 0,3.3334"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 819.4731,1660.3861 0,3.3333"
-         inkscape:path-effect="#path-effect26581"
-         id="path10102-82"
-         d="m 819.4731,1660.3861 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 813.52353,1660.2168 0,3.0697"
-         id="path10104-4"
-         inkscape:path-effect="#path-effect26578"
-         inkscape:original-d="m 813.52353,1660.2168 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 807.64401,1659.9326 0,3.0697"
-         inkscape:path-effect="#path-effect26575"
-         id="path10106-8"
-         d="m 807.64401,1659.9326 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 801.91523,1659.9467 0,2.7353"
-         id="path10108-8"
-         inkscape:path-effect="#path-effect26572"
-         inkscape:original-d="m 801.91523,1659.9467 0,2.7353"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 796.57677,1659.7418 0,2.7353"
-         inkscape:path-effect="#path-effect26569"
-         id="path10110-1"
-         d="m 796.57677,1659.7418 0,2.7353"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 791.61519,1659.5515 0,2.2507"
-         id="path10112-6"
-         inkscape:path-effect="#path-effect26566"
-         inkscape:original-d="m 791.61519,1659.5515 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 786.56443,1659.3576 0,2.2507"
-         inkscape:path-effect="#path-effect26563"
-         id="path10114-2"
-         d="m 786.56443,1659.3576 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 781.35881,1659.1578 0,2.2507"
-         id="path10116-0"
-         inkscape:path-effect="#path-effect26560"
-         inkscape:original-d="m 781.35881,1659.1578 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 776.41839,1658.968 0,2.2508"
-         inkscape:path-effect="#path-effect26557"
-         id="path10118-4"
-         d="m 776.41839,1658.968 0,2.2508"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 838.43395,1661.0266 0,3.5491"
-         id="path10132-8"
-         inkscape:path-effect="#path-effect26554"
-         inkscape:original-d="m 838.43395,1661.0266 0,3.5491"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 833.92588,1664.3584 0,3.3333"
-         inkscape:path-effect="#path-effect26551"
-         id="path10284-5"
-         d="m 833.92588,1664.3584 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 828.08504,1664.1032 0,3.3334"
-         id="path10286-9"
-         inkscape:path-effect="#path-effect26548"
-         inkscape:original-d="m 828.08504,1664.1032 0,3.3334"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 821.91592,1663.6844 0,3.3333"
-         inkscape:path-effect="#path-effect26545"
-         id="path10288-44"
-         d="m 821.91592,1663.6844 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 815.96635,1663.3242 0,3.0697"
-         id="path10290-49"
-         inkscape:path-effect="#path-effect26542"
-         inkscape:original-d="m 815.96635,1663.3242 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 810.08683,1663.1232 0,3.0697"
-         inkscape:path-effect="#path-effect26539"
-         id="path10292-9"
-         d="m 810.08683,1663.1232 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 804.35805,1662.7228 0,2.7353"
-         id="path10294-45"
-         inkscape:path-effect="#path-effect26536"
-         inkscape:original-d="m 804.35805,1662.7228 0,2.7353"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 799.01959,1662.6533 0,2.7352"
-         inkscape:path-effect="#path-effect26533"
-         id="path10296-3"
-         d="m 799.01959,1662.6533 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 794.05801,1662.3962 0,2.2507"
-         id="path10298-2"
-         inkscape:path-effect="#path-effect26530"
-         inkscape:original-d="m 794.05801,1662.3962 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 789.00725,1662.1346 0,2.2507"
-         inkscape:path-effect="#path-effect26527"
-         id="path10300-1"
-         d="m 789.00725,1662.1346 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 783.80163,1662.072 0,2.2507"
-         id="path10302-7"
-         inkscape:path-effect="#path-effect26524"
-         inkscape:original-d="m 783.80163,1662.072 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 778.86121,1661.816 0,2.2508"
-         inkscape:path-effect="#path-effect26521"
-         id="path10304-4"
-         d="m 778.86121,1661.816 0,2.2508"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 831.39829,1667.8983 0,3.3333"
-         id="path10320-3"
-         inkscape:path-effect="#path-effect26518"
-         inkscape:original-d="m 831.39829,1667.8983 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 825.47269,1667.2153 0,3.3333"
-         inkscape:path-effect="#path-effect26515"
-         id="path10322-1"
-         d="m 825.47269,1667.2153 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 819.38834,1666.8304 0,3.3333"
-         id="path10324-9"
-         inkscape:path-effect="#path-effect26512"
-         inkscape:original-d="m 819.38834,1666.8304 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 813.43877,1666.301 0,3.0697"
-         inkscape:path-effect="#path-effect26509"
-         id="path10326-0"
-         d="m 813.43877,1666.301 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 807.55925,1665.8808 0,3.0697"
-         id="path10328-7"
-         inkscape:path-effect="#path-effect26506"
-         inkscape:original-d="m 807.55925,1665.8808 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 801.83047,1665.5245 0,2.7352"
-         inkscape:path-effect="#path-effect26503"
-         id="path10330-3"
-         d="m 801.83047,1665.5245 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 796.49201,1665.2512 0,2.7353"
-         id="path10332-8"
-         inkscape:path-effect="#path-effect26500"
-         inkscape:original-d="m 796.49201,1665.2512 0,2.7353"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 791.53042,1665.0082 0,2.2507"
-         inkscape:path-effect="#path-effect26497"
-         id="path10334-4"
-         d="m 791.53042,1665.0082 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 786.47967,1664.6027 0,2.2508"
-         id="path10336-2"
-         inkscape:path-effect="#path-effect26494"
-         inkscape:original-d="m 786.47967,1664.6027 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 781.27405,1664.1849 0,2.2507"
-         inkscape:path-effect="#path-effect26491"
-         id="path10338-6"
-         d="m 781.27405,1664.1849 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 776.33363,1663.7881 0,2.2508"
-         id="path10340-9"
-         inkscape:path-effect="#path-effect26488"
-         inkscape:original-d="m 776.33363,1663.7881 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 838.34918,1668.369 0,3.549"
-         inkscape:path-effect="#path-effect26485"
-         id="path10354-8"
-         d="m 838.34918,1668.369 0,3.549"
-         style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 833.92588,1671.3464 0,3.3333"
-         id="path10358-7"
-         inkscape:path-effect="#path-effect26482"
-         inkscape:original-d="m 833.92588,1671.3464 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 828.08503,1670.6644 0,3.3333"
-         inkscape:path-effect="#path-effect26479"
-         id="path10360-7"
-         d="m 828.08503,1670.6644 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.49867719px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 822.00069,1670.121 0,2.95"
-         id="path10362-4"
-         inkscape:path-effect="#path-effect26476"
-         inkscape:original-d="m 822.00069,1670.121 0,2.95"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 816.05111,1669.7472 0,2.7831"
-         inkscape:path-effect="#path-effect26473"
-         id="path10364-8"
-         d="m 816.05111,1669.7472 0,2.7831"
-         style="fill:none;stroke:#d29898;stroke-width:0.48436409px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 810.17159,1668.9666 0,3.0697"
-         id="path10366-7"
-         inkscape:path-effect="#path-effect26470"
-         inkscape:original-d="m 810.17159,1668.9666 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 804.44281,1668.5646 0,2.7352"
-         inkscape:path-effect="#path-effect26467"
-         id="path10368-8"
-         d="m 804.44281,1668.5646 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 799.10436,1668.0485 0,2.7353"
-         id="path10370-3"
-         inkscape:path-effect="#path-effect26464"
-         inkscape:original-d="m 799.10436,1668.0485 0,2.7353"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 794.14277,1667.8451 0,2.2507"
-         inkscape:path-effect="#path-effect26461"
-         id="path10372-2"
-         d="m 794.14277,1667.8451 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 789.09202,1667.191 0,2.2507"
-         id="path10374-1"
-         inkscape:path-effect="#path-effect26458"
-         inkscape:original-d="m 789.09202,1667.191 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 783.8864,1666.6374 0,2.2507"
-         inkscape:path-effect="#path-effect26455"
-         id="path10376-9"
-         d="m 783.8864,1666.6374 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 778.94597,1666.112 0,2.2507"
-         id="path10378-3"
-         inkscape:path-effect="#path-effect26452"
-         inkscape:original-d="m 778.94597,1666.112 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 831.48306,1674.2304 0,3.3333"
-         inkscape:path-effect="#path-effect26449"
-         id="path10394-7"
-         d="m 831.48306,1674.2304 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 825.55745,1673.5351 0,3.3333"
-         id="path10396-4"
-         inkscape:path-effect="#path-effect26446"
-         inkscape:original-d="m 825.55745,1673.5351 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 819.4731,1672.8185 0,3.3333"
-         inkscape:path-effect="#path-effect26443"
-         id="path10398-4"
-         d="m 819.4731,1672.8185 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 813.52353,1672.2235 0,3.0698"
-         id="path10400-4"
-         inkscape:path-effect="#path-effect26440"
-         inkscape:original-d="m 813.52353,1672.2235 0,3.0698"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 807.64401,1671.5863 0,3.0697"
-         inkscape:path-effect="#path-effect26437"
-         id="path10402-3"
-         d="m 807.64401,1671.5863 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 801.91523,1670.9694 0,2.7352"
-         id="path10404-5"
-         inkscape:path-effect="#path-effect26434"
-         inkscape:original-d="m 801.91523,1670.9694 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 796.57677,1670.3532 0,2.7352"
-         inkscape:path-effect="#path-effect26431"
-         id="path10406-1"
-         d="m 796.57677,1670.3532 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 791.61519,1669.7361 0,2.2507"
-         id="path10408-3"
-         inkscape:path-effect="#path-effect26428"
-         inkscape:original-d="m 791.61519,1669.7361 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 786.56443,1669.3141 0,2.2508"
-         inkscape:path-effect="#path-effect26425"
-         id="path10410-2"
-         d="m 786.56443,1669.3141 0,2.2508"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 781.35881,1668.6124 0,2.2507"
-         id="path10412-8"
-         inkscape:path-effect="#path-effect26422"
-         inkscape:original-d="m 781.35881,1668.6124 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 776.41839,1667.9462 0,2.2507"
-         inkscape:path-effect="#path-effect26419"
-         id="path10414-0"
-         d="m 776.41839,1667.9462 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 838.43395,1675.0803 0,3.5491"
-         id="path10428-9"
-         inkscape:path-effect="#path-effect26416"
-         inkscape:original-d="m 838.43395,1675.0803 0,3.5491"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 833.92588,1678.1911 0,3.3334"
-         id="path10432-0"
-         inkscape:path-effect="#path-effect26413"
-         inkscape:original-d="m 833.92588,1678.1911 0,3.3334"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 828.00027,1677.4667 0,3.3333"
-         inkscape:path-effect="#path-effect26410"
-         id="path10434-3"
-         d="m 828.00027,1677.4667 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 821.91592,1676.4582 0,3.3333"
-         id="path10436-4"
-         inkscape:path-effect="#path-effect26407"
-         inkscape:original-d="m 821.91592,1676.4582 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 815.96635,1675.626 0,3.0698"
-         inkscape:path-effect="#path-effect26404"
-         id="path10438-9"
-         d="m 815.96635,1675.626 0,3.0698"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 810.08683,1674.7015 0,3.0698"
-         id="path10440-4"
-         inkscape:path-effect="#path-effect26401"
-         inkscape:original-d="m 810.08683,1674.7015 0,3.0698"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 804.35805,1673.9562 0,2.7352"
-         inkscape:path-effect="#path-effect26398"
-         id="path10442-43"
-         d="m 804.35805,1673.9562 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 799.01959,1673.272 0,2.7352"
-         id="path10444-9"
-         inkscape:path-effect="#path-effect26395"
-         inkscape:original-d="m 799.01959,1673.272 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 794.05801,1672.8366 0,2.2507"
-         inkscape:path-effect="#path-effect26392"
-         id="path10446-8"
-         d="m 794.05801,1672.8366 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 789.00725,1672.0084 0,2.2508"
-         id="path10448-5"
-         inkscape:path-effect="#path-effect26389"
-         inkscape:original-d="m 789.00725,1672.0084 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 783.80163,1671.1898 0,2.2507"
-         inkscape:path-effect="#path-effect26386"
-         id="path10450-38"
-         d="m 783.80163,1671.1898 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 778.86121,1670.4129 0,2.2508"
-         id="path10452-1"
-         inkscape:path-effect="#path-effect26383"
-         inkscape:original-d="m 778.86121,1670.4129 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 831.39829,1681.1538 0,3.3333"
-         inkscape:path-effect="#path-effect26380"
-         id="path10468-2"
-         d="m 831.39829,1681.1538 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 825.47269,1679.9497 0,3.3333"
-         id="path10470-38"
-         inkscape:path-effect="#path-effect26377"
-         inkscape:original-d="m 825.47269,1679.9497 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 819.38834,1679.0268 0,3.3333"
-         inkscape:path-effect="#path-effect26374"
-         id="path10472-9"
-         d="m 819.38834,1679.0268 0,3.3333"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 813.43877,1678.2327 0,3.0697"
-         id="path10474-8"
-         inkscape:path-effect="#path-effect26371"
-         inkscape:original-d="m 813.43877,1678.2327 0,3.0697"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 807.55925,1677.2445 0,3.0697"
-         inkscape:path-effect="#path-effect26368"
-         id="path10476-51"
-         d="m 807.55925,1677.2445 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 801.83047,1676.3359 0,2.7352"
-         id="path10478-0"
-         inkscape:path-effect="#path-effect26365"
-         inkscape:original-d="m 801.83047,1676.3359 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 796.49201,1675.4999 0,2.7352"
-         inkscape:path-effect="#path-effect26362"
-         id="path10480-6"
-         d="m 796.49201,1675.4999 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 791.53042,1674.9408 0,2.2508"
-         id="path10482-1"
-         inkscape:path-effect="#path-effect26359"
-         inkscape:original-d="m 791.53042,1674.9408 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 786.47967,1674.0028 0,2.2508"
-         inkscape:path-effect="#path-effect26356"
-         id="path10484-8"
-         d="m 786.47967,1674.0028 0,2.2508"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 781.27405,1673.0362 0,2.2507"
-         id="path10486-1"
-         inkscape:path-effect="#path-effect26353"
-         inkscape:original-d="m 781.27405,1673.0362 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 776.33363,1672.1185 0,2.2507"
-         inkscape:path-effect="#path-effect26350"
-         id="path10488-8"
-         d="m 776.33363,1672.1185 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 838.34918,1682.202 0,3.549"
-         id="path10502-7"
-         inkscape:path-effect="#path-effect26347"
-         inkscape:original-d="m 838.34918,1682.202 0,3.549"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 834.01064,1684.722 0,3.3334"
-         inkscape:path-effect="#path-effect26344"
-         id="path10506-72"
-         d="m 834.01064,1684.722 0,3.3334"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 828.08503,1683.6742 0,3.3334"
-         id="path10508-8"
-         inkscape:path-effect="#path-effect26341"
-         inkscape:original-d="m 828.08503,1683.6742 0,3.3334"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 822.00069,1682.4893 0,3.3334"
-         inkscape:path-effect="#path-effect26338"
-         id="path10510-2"
-         d="m 822.00069,1682.4893 0,3.3334"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 816.05111,1681.3846 0,3.0698"
-         id="path10512-3"
-         inkscape:path-effect="#path-effect26335"
-         inkscape:original-d="m 816.05111,1681.3846 0,3.0698"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 810.17159,1680.4503 0,3.0697"
-         inkscape:path-effect="#path-effect26332"
-         id="path10514-6"
-         d="m 810.17159,1680.4503 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 804.44281,1679.496 0,2.7353"
-         id="path10516-6"
-         inkscape:path-effect="#path-effect26329"
-         inkscape:original-d="m 804.44281,1679.496 0,2.7353"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 799.10436,1678.3654 0,2.7352"
-         inkscape:path-effect="#path-effect26326"
-         id="path10518-9"
-         d="m 799.10436,1678.3654 0,2.7352"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 794.14277,1677.9362 0,2.2508"
-         id="path10520-6"
-         inkscape:path-effect="#path-effect26323"
-         inkscape:original-d="m 794.14277,1677.9362 0,2.2508"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 789.09202,1676.8665 0,2.2507"
-         inkscape:path-effect="#path-effect26320"
-         id="path10522-5"
-         d="m 789.09202,1676.8665 0,2.2507"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 783.8864,1675.7641 0,2.2507"
-         id="path10524-13"
-         inkscape:path-effect="#path-effect26317"
-         inkscape:original-d="m 783.8864,1675.7641 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 778.94597,1674.7177 0,2.2508"
-         inkscape:path-effect="#path-effect26314"
-         id="path10526-8"
-         d="m 778.94597,1674.7177 0,2.2508"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 831.48306,1687.5193 0,3.3333"
-         id="path10542-0"
-         inkscape:path-effect="#path-effect26311"
-         inkscape:original-d="m 831.48306,1687.5193 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 825.55745,1686.5099 0,2.9967"
-         inkscape:path-effect="#path-effect26308"
-         id="path10544-7"
-         d="m 825.55745,1686.5099 0,2.9967"
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 819.4731,1684.8411 0,3.3333"
-         id="path10546-6"
-         inkscape:path-effect="#path-effect26305"
-         inkscape:original-d="m 819.4731,1684.8411 0,3.3333"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 813.52353,1683.8333 0,3.0697"
-         inkscape:path-effect="#path-effect26302"
-         id="path10548-1"
-         d="m 813.52353,1683.8333 0,3.0697"
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 807.64401,1682.7766 0,2.8316"
-         id="path10550-6"
-         inkscape:path-effect="#path-effect26299"
-         inkscape:original-d="m 807.64401,1682.7766 0,2.8316"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 801.91523,1681.7897 0,2.5539"
-         inkscape:path-effect="#path-effect26296"
-         id="path10552-0"
-         d="m 801.91523,1681.7897 0,2.5539"
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 796.57677,1680.4035 0,2.7352"
-         id="path10554-3"
-         inkscape:path-effect="#path-effect26293"
-         inkscape:original-d="m 796.57677,1680.4035 0,2.7352"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 791.61519,1679.6777 0.0106,2.432"
-         inkscape:path-effect="#path-effect26290"
-         id="path10556-10"
-         d="m 791.61519,1679.6777 0.0106,2.432"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 786.56443,1678.7232 0,2.2507"
-         id="path10558-4"
-         inkscape:path-effect="#path-effect26287"
-         inkscape:original-d="m 786.56443,1678.7232 0,2.2507"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 781.35881,1677.4726 0.0212,2.4061"
-         inkscape:path-effect="#path-effect26284"
-         id="path10560-3"
-         d="m 781.35881,1677.4726 0.0212,2.4061"
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 776.41839,1676.4409 0,2.3673"
-         id="path10562-1"
-         inkscape:path-effect="#path-effect26281"
-         inkscape:original-d="m 776.41839,1676.4409 0,2.3673"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 838.43395,1688.9984 0,3.4026"
-         inkscape:path-effect="#path-effect26278"
-         id="path10576-5"
-         d="m 838.43395,1688.9984 0,3.4026"
-         style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.84474,1638.4212 9.38834,0.6475"
-         id="path10876-8"
-         inkscape:path-effect="#path-effect26275"
-         inkscape:original-d="m 840.84474,1638.4212 9.38834,0.6475"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 840.85972,1642.3585 9.37336,0.1347"
-         inkscape:path-effect="#path-effect26272"
-         id="path10880-9"
-         d="m 840.85972,1642.3585 9.37336,0.1347"
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.85972,1646.0211 9.37336,-0.072"
-         id="path10884-5"
-         inkscape:path-effect="#path-effect26269"
-         inkscape:original-d="m 840.85972,1646.0211 9.37336,-0.072"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 840.85972,1649.7504 9.37336,-0.2797"
-         inkscape:path-effect="#path-effect26266"
-         id="path10888-4"
-         d="m 840.85972,1649.7504 9.37336,-0.2797"
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.85972,1653.6052 9.37336,-0.7283"
-         id="path10892-5"
-         inkscape:path-effect="#path-effect26263"
-         inkscape:original-d="m 840.85972,1653.6052 c 3.12446,3.3694 6.24891,5.1681 9.37336,-0.7283"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 840.85972,1657.2311 c 3.12446,3.3694 6.24891,5.0127 9.37336,-0.8837"
-         inkscape:path-effect="#path-effect26260"
-         id="path10896-7"
-         d="m 840.85972,1657.2311 9.37336,-0.8837"
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.85972,1660.8754 9.37336,-1.1866"
-         id="path10900-4"
-         inkscape:path-effect="#path-effect26257"
-         inkscape:original-d="m 840.85972,1660.8754 c 3.12446,3.3693 6.24891,4.7098 9.37336,-1.1866"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 840.85972,1664.5011 c 3.12446,3.3694 6.24891,4.5544 9.37336,-1.342"
-         inkscape:path-effect="#path-effect26254"
-         id="path10904-4"
-         d="m 840.85972,1664.5011 9.37336,-1.342"
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.85972,1668.2953 9.37336,-1.4393"
-         id="path10908-67"
-         inkscape:path-effect="#path-effect26251"
-         inkscape:original-d="m 840.85972,1668.2953 c 3.12446,3.3693 6.24891,4.4572 9.37336,-1.4393"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 840.85972,1671.921 c 3.12446,3.3693 6.24891,4.3666 9.37336,-1.5298"
-         inkscape:path-effect="#path-effect26248"
-         id="path10912-7"
-         d="m 840.85972,1671.921 9.37336,-1.5298"
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.85972,1675.1712 9.37336,-1.5816"
-         id="path10916-5"
-         inkscape:path-effect="#path-effect26245"
-         inkscape:original-d="m 840.85972,1675.1712 c 3.12446,3.3694 6.24891,4.3148 9.37336,-1.5816"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 840.85972,1678.9005 c 3.12446,3.3694 6.24891,4.1595 9.37336,-1.7369"
-         inkscape:path-effect="#path-effect26242"
-         id="path10920-2"
-         d="m 840.85972,1678.9005 9.37336,-1.7369"
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.85972,1682.5781 9.37336,-1.8405"
-         id="path10924-6"
-         inkscape:path-effect="#path-effect26239"
-         inkscape:original-d="m 840.85972,1682.5781 c 3.12446,3.3694 1.63968,19.0768 9.37336,-1.8405"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 840.85972,1685.9448 c 3.12446,3.3694 6.24891,4.0559 9.37336,-1.8405"
-         inkscape:path-effect="#path-effect26236"
-         id="path10928-8"
-         d="m 840.85972,1685.9448 9.37336,-1.8405"
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 840.85972,1689.2598 9.37336,-1.7887"
-         id="path10932-89"
-         inkscape:path-effect="#path-effect26233"
-         inkscape:original-d="m 840.85972,1689.2598 c 3.12446,3.3694 6.24891,4.1077 9.37336,-1.7887"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 845.84599,1638.7723 0,3.5535"
-         id="path10936-1"
-         inkscape:path-effect="#path-effect26230"
-         inkscape:original-d="m 845.84599,1638.7723 0,3.5535"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 845.84599,1646.1273 0,3.5535"
-         inkscape:path-effect="#path-effect26227"
-         id="path10940-9"
-         d="m 845.84599,1646.1273 0,3.5535"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 845.84599,1653.0939 0,3.5535"
-         id="path10944-8"
-         inkscape:path-effect="#path-effect26224"
-         inkscape:original-d="m 845.84599,1653.0939 0,3.5535"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 845.84599,1660.1123 0,3.5535"
-         inkscape:path-effect="#path-effect26221"
-         id="path10948-0"
-         d="m 845.84599,1660.1123 0,3.5535"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 845.84599,1667.4673 0,3.5535"
-         id="path10950-5"
-         inkscape:path-effect="#path-effect26218"
-         inkscape:original-d="m 845.84599,1667.4673 0,3.5535"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 845.84599,1674.4339 0,3.5535"
-         inkscape:path-effect="#path-effect26215"
-         id="path10952-0"
-         d="m 845.84599,1674.4339 0,3.5535"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 845.84599,1681.6595 0,3.5535"
-         inkscape:path-effect="#path-effect26212"
-         id="path10960-29"
-         d="m 845.84599,1681.6595 0,3.5535"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.51035887px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 845.93076,1688.2635 0,3.3608"
-         id="path10962-6"
-         inkscape:path-effect="#path-effect26209"
-         inkscape:original-d="m 845.93076,1688.2635 0,3.3608"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 843.59967,1634.9912 0,3.5535"
-         inkscape:path-effect="#path-effect26206"
-         id="path10968-0"
-         d="m 843.59967,1634.9912 0,3.5535"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 848.47377,1635.5091 0,3.5535"
-         id="path10972-22"
-         inkscape:path-effect="#path-effect26203"
-         inkscape:original-d="m 848.47377,1635.5091 0,3.5535"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 843.59967,1642.2945 0,3.5534"
-         id="path10976-9"
-         inkscape:path-effect="#path-effect26200"
-         inkscape:original-d="m 843.59967,1642.2945 0,3.5534"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 848.47377,1642.5017 0,3.5534"
-         inkscape:path-effect="#path-effect26197"
-         id="path10978-2"
-         d="m 848.47377,1642.5017 0,3.5534"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 843.59967,1649.5977 0,3.5535"
-         inkscape:path-effect="#path-effect26194"
-         id="path10984-6"
-         d="m 843.59967,1649.5977 0,3.5535"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 848.47377,1649.8049 0,3.2164"
-         id="path10986-73"
-         inkscape:path-effect="#path-effect26191"
-         inkscape:original-d="m 848.47377,1649.8049 0,3.2164"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 843.59967,1656.901 0,3.5535"
-         id="path10992-6"
-         inkscape:path-effect="#path-effect26188"
-         inkscape:original-d="m 843.59967,1656.901 0,3.5535"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 848.47377,1656.4349 0,3.5534"
-         inkscape:path-effect="#path-effect26185"
-         id="path10994-0"
-         d="m 848.47377,1656.4349 0,3.5534"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 843.59967,1664.2043 0,3.5535"
-         inkscape:path-effect="#path-effect26182"
-         id="path10996-5"
-         d="m 843.59967,1664.2043 0,3.5535"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 848.47377,1663.4274 0,3.5535"
-         id="path10998-2"
-         inkscape:path-effect="#path-effect26179"
-         inkscape:original-d="m 848.47377,1663.4274 0,3.5535"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 843.59967,1671.5076 0,3.2164"
-         id="path11000-1"
-         inkscape:path-effect="#path-effect26176"
-         inkscape:original-d="m 843.59967,1671.5076 0,3.2164"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 848.47377,1670.7307 0,3.2164"
-         inkscape:path-effect="#path-effect26173"
-         id="path11002-7"
-         d="m 848.47377,1670.7307 0,3.2164"
-         style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 843.59967,1678.3965 0,3.5535"
-         id="path11016-1"
-         inkscape:path-effect="#path-effect26170"
-         inkscape:original-d="m 843.59967,1678.3965 0,3.5535"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 848.47377,1677.6196 0,3.5535"
-         inkscape:path-effect="#path-effect26167"
-         id="path11018-1"
-         d="m 848.47377,1677.6196 0,3.5535"
-         style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 843.59967,1685.6998 0,3.2163"
-         inkscape:path-effect="#path-effect26164"
-         id="path11020-5"
-         d="m 843.59967,1685.6998 0,3.2163"
-         style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 848.47377,1684.4567 0,3.2163"
-         id="path11022-3"
-         inkscape:path-effect="#path-effect26161"
-         inkscape:original-d="m 848.47377,1684.4567 0,3.2163"
-         inkscape:connector-curvature="0" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-430.28571,-575.83381)">
+    <g style="display:inline" id="g120168" transform="matrix(1.0298528,0,0,1.0298528,-364.50483,-1080.756)">
+      <path sodipodi:nodetypes="csccsssssssscsssscsssscssssssssssssssscssssscssscsscsccsssssssscsscsssscssscsssssssccssssscccsssssssscsccssccsssscssssssssscscsssssssssscssscssscscsssssscssccsscscssscsssssscssscssssccssssssssccssscsscsssscsccssccssscscscscssss" inkscape:connector-curvature="0" id="path11997-9" d="m 774.98987,1645.8557 c -0.55641,-0.5528 -0.73378,-2.4138 -0.6113,-3.1439 0.0437,-0.2608 0.21167,-0.7483 0.37314,-1.0834 0.25281,-0.5246 0.27308,-0.6467 0.14591,-0.8789 0.046,-0.4917 -0.0534,0.4832 0.0655,-0.8129 0.291,-3.1714 0.93195,-6.856 1.638,-8.4478 0.39873,-0.8989 1.39066,-2.1338 2.71407,-3.0982 1.3295,-0.9689 1.79991,-1.1594 1.79991,-2.1274 0,-0.358 0.0578,-1.1169 -0.0445,-1.4663 -0.10225,-0.3495 -0.20944,-0.7997 -0.17409,-0.774 0.21114,0.1537 0.5879,0.4258 0.84374,1.1894 0.26172,0.7812 0.41619,1.3086 -0.0323,2.3198 -0.22701,0.5117 -1.60934,2.0033 -1.61056,2.0576 -10e-4,0.054 -0.79469,4.484 -0.56908,4.6585 0.22561,0.1746 1.95289,-1.6479 2.12569,-1.3001 0.27884,0.561 1.10418,-1.9379 1.0483,-1.1172 -0.0346,0.5086 -0.36907,1.0881 -0.45638,1.2902 l -0.21344,0.4941 0.7402,-0.421 c 0.83736,-0.4762 1.11814,-2.1939 1.14723,-4.6883 0.0285,-2.4438 0.17069,-3.5075 0.79698,-5.1105 0.23971,-0.6136 0.63307,-0.7657 0.28699,-1.9645 l -0.0291,-0.5652 0.20623,0.2458 c 0.37689,0.4492 0.43044,-0.044 0.43044,-0.4379 0,-0.6818 0.44349,-2.4217 0.8492,-3.135 0.52382,-0.921 0.87864,-1.6118 1.06275,-2.9556 0.16461,-1.2016 0.25413,-0.6056 0.28191,0.3179 0.0217,0.7224 -0.0987,1.3727 -0.36368,2.4988 -0.41873,1.7792 -0.62707,3.1614 -0.43196,3.6614 0.19902,0.5099 0.13516,2.5989 0.35211,1.2761 0.21297,-1.2984 0.38454,1.3692 1.26768,0.1076 0.85942,-1.2277 -0.0282,-2.7196 0.23858,-2.4745 0.53531,0.4919 0.53198,0.5887 0.6282,1.6981 0.14148,1.6311 -0.49322,2.3917 -1.92061,3.8565 -0.29954,0.3075 -0.0507,0.9538 0.006,1.3911 0.0943,0.7313 0.55926,0.4264 0.77877,-0.1664 0.36932,-0.9972 0.79102,-1.6511 0.80011,-1.4987 0.006,0.094 0.14138,0.2061 0.26974,0.359 0.12835,0.1529 0.28128,0.4028 0.36207,0.7108 0.0808,0.308 0.37283,0.8998 0.41565,0.8931 0.0776,-0.012 0.4225,-0.9162 0.66155,-1.7924 0.22973,-0.8421 0.56062,-2.7433 0.56062,-3.593 0,-0.4611 2.4e-4,-1.1309 -0.0995,-1.5217 -0.0997,-0.3907 -0.17423,-0.7101 -0.15445,-0.7762 0.25825,0.3201 0.26826,0.2091 0.58784,0.7821 0.54779,0.982 0.6915,1.7934 0.65072,4.1373 -0.0347,1.9948 -0.18226,2.7031 0.29726,3.0993 l 0.65176,0.5384 0.0135,-1.5421 c 0.0101,-1.1554 0.14319,-1.8172 0.39186,-2.5111 0.35989,-1.0043 0.44619,-1.2161 0.20582,-1.5155 -0.18685,-0.2327 -0.27207,-0.3897 -0.11453,-0.4148 0.0528,-0.01 0.0995,-0.01 0.22604,0.079 0.29787,0.192 0.54228,0.058 0.72728,-0.2079 0.24902,-0.3583 0.0284,-0.1423 0.0284,0.423 0,0.4603 0.0852,0.3908 0.46776,0.7268 0.24728,0.2173 0.36787,0.6197 0.89418,0.561 0.37101,-0.041 0.0153,-2.2011 -0.20628,-2.8455 -0.11288,-0.3284 -0.62508,-1.3034 -1.17153,-2.1 -0.90303,-1.3164 -1.39015,-1.9582 -1.39015,-2.1364 0,-0.392 1.26717,0.5888 2.25758,1.5905 1.38895,1.4048 2.27997,3.0814 2.82139,4.9831 0.23002,0.8079 0.38902,1.2177 0.38929,2.8754 9e-5,0.4469 -0.46119,1.523 -0.25591,1.7386 0.19312,0.2027 1.01612,-0.5574 1.64417,-1.1789 0.39808,-0.394 0.61784,-2.4686 0.59468,-2.1253 -0.0215,0.075 -0.0604,1.7275 -0.32808,2.0729 -0.64129,0.8274 -1.70871,2.1332 -1.85904,2.4857 -0.29575,0.6934 0.36551,0.9568 0.4991,0.9356 0.316,-0.05 2.67444,-2.8273 2.87443,-3.1709 0.0351,-0.06 0.36128,-0.6509 0.56952,-0.9359 0.30922,-0.423 0.50534,-0.8224 0.54334,-1.4092 0.0436,-0.6738 0.0874,-0.8272 -0.39413,-1.5082 -0.55454,-0.7845 -0.76638,-0.8971 -0.47313,-1.8873 0.14602,-0.493 0.1441,-0.6865 0.38355,-0.4181 0.24436,0.274 0.76635,0.1411 0.95778,-0.2825 0.30077,-0.6654 0.56848,-1.2116 0.36667,-2.0162 -0.23643,-0.9426 -0.15543,-1.416 0.18252,-0.8298 0.39167,0.6794 0.63627,1.0351 0.59592,4.8969 -0.0389,3.7231 0.0726,3.6439 0.78791,4.4703 0.46571,0.5379 0.80604,0.4598 0.80916,-0.3517 0.002,-0.5377 -0.0323,-0.05 0.24066,0.3183 0.15951,0.2152 0.25958,0.3404 0.35585,0.1648 0.0624,-0.1138 0.2233,-0.968 0.2243,-1.1094 10e-4,-0.1415 0.0501,-0.572 0.15367,-1.0011 0.17464,-0.7241 0.22748,-0.9348 0.0308,-1.9862 -0.18542,-0.9912 -0.18502,-1.2225 -0.0603,-2.2909 0.22724,-1.9468 0.41665,-2.0905 0.41665,-0.5947 0,0.8241 0.13873,1.0624 0.37297,1.5001 l 0.27795,0.5193 0.37887,-0.043 0.1607,-0.2249 0.16532,0.2633 c 0.14165,0.2255 0.25065,0.3024 0.29939,0.2947 0.34639,-0.055 0.45511,-2.1381 0.0348,-3.2107 -0.23579,-0.6018 -0.34117,-0.893 -0.34117,-1.937 0,-0.698 -0.0267,-1.0127 0.0295,-1.0217 0.0563,-0.01 0.10301,0.03 0.3039,0.431 0.20089,0.401 0.59865,0.9552 0.90613,1.2873 0.62357,0.6736 0.97971,1.4781 1.10052,2.2643 0.0877,0.5708 0.14624,0.9128 0.4804,0.5911 0.19341,-0.3083 0.19953,-0.3498 0.2006,0.2286 10e-4,0.6085 0.0662,1.1221 0.32142,1.4368 0.1508,0.1858 0.48089,0.051 0.58397,-0.1295 0.17362,-0.3032 0.13774,-1.4563 -0.0131,-2.0228 -0.23409,-0.8788 -0.31652,-0.9295 0.45948,0.011 l 0.55069,0.6677 0.25587,-0.2906 c 0.0957,-0.2299 0.19265,-0.3817 0.24873,-0.3708 0.0561,0.011 0.0775,0.1595 0.22546,0.5857 0.28335,0.8163 0.81615,1.4721 0.98831,1.4448 0.0565,-0.01 0.19978,-0.2113 0.22959,-0.3719 0.25006,-1.3465 0.32245,-1.9045 0.56713,-2.5287 0.24056,-0.6137 0.52358,-1.0097 0.46791,-1.6288 -0.0368,-0.4096 0.0443,-0.6043 0.002,-0.7881 -0.10302,-0.4535 -0.0221,-0.4979 0.32121,-0.09 0.36326,0.4312 0.19029,0.355 0.28432,-0.4132 0.11865,-0.9695 0.44727,-2.5524 0.86307,-3.2602 0.46372,-0.7894 0.8973,-1.6209 1.06741,-2.8678 0.16384,-1.2008 -0.0258,-1.0029 0.14297,-0.384 0.24936,0.9142 0.0842,1.5784 -0.32013,3.2262 -0.4075,1.6607 -0.43866,3.8221 -0.1598,4.0753 0.18857,0.1713 0.56482,0.7515 0.74629,-0.4922 -0.0261,1.4531 0.18854,0.7233 0.76395,1.4739 0.44667,0.5827 0.7936,-1.0845 0.80527,-0.6275 0.0397,1.457 -0.41995,1.746 -1.64992,3.292 -0.2733,0.3436 -0.48632,0.4617 -0.26978,1.6139 0.13852,0.737 0.4293,0.4616 0.65627,-0.1519 0.24719,-0.6682 0.53808,-1.4732 0.75683,-1.5079 0.0923,-0.014 0.18606,-0.051 0.18606,0.02 0,0.071 0.19342,0.2101 0.35205,0.4432 0.15863,0.2331 0.27008,0.5486 0.31432,0.8013 0.0443,0.2527 0.25981,0.798 0.31236,0.7897 0.0525,-0.01 0.35853,-0.5961 0.45772,-0.9062 0.74551,-2.3302 1.01545,-4.6638 0.65096,-6.2482 -0.0983,-0.4272 -0.0784,-0.5376 -0.0448,-0.5787 0.0737,-0.04 0.15175,0.092 0.44736,0.5435 0.60832,0.9284 0.6475,1.2745 0.66529,3.7513 0.009,1.2797 0.11294,2.9002 0.16389,3.1345 0.106,0.4874 0.73789,1.1924 0.81904,1.0934 0.03,-0.037 0.0146,-0.8754 0.0325,-1.5972 0.0204,-0.8255 -0.007,-1.4013 0.11141,-1.7369 0.10342,-0.2934 0.34967,-0.947 0.4361,-1.1858 0.12963,-0.3581 0.22096,-0.556 0.0933,-0.8733 -0.27588,-0.6859 -0.36324,-0.4948 -0.17617,-0.5244 0.0974,-0.016 0.27992,-0.026 0.3611,0.065 0.20368,0.2283 0.136,0.2533 0.44083,-0.036 0.22244,-0.2114 0.33341,-0.6458 0.25755,-0.033 -0.0588,0.4746 0.24941,0.8875 0.66374,1.2725 0.2506,0.2328 0.70567,0.2153 0.76684,0.2056 0.18863,-0.03 -0.0341,-2.1399 -0.28707,-2.8001 -0.12977,-0.3387 -0.58991,-1.2502 -1.04475,-1.8921 -1.02275,-1.4435 -1.0807,-1.8552 -1.48654,-2.3448 0.30917,-0.133 1.793,1.0311 2.91268,2.4316 0.81805,1.0232 1.72447,2.5864 2.07812,3.8038 0.31289,1.077 0.6199,3.4675 0.41,4.5513 1.11884,-0.4351 2.43549,-1.1652 2.53887,-2.8262 0.0802,-0.1888 0.24863,1.199 -0.26612,1.8553 -0.66525,0.8483 -2.08984,2.0107 -2.43558,2.6488 -0.2179,0.4021 0.43374,0.7903 0.47628,0.8115 0.26872,0.1338 2.27894,-1.8709 2.67521,-2.7567 0.13339,-0.2981 0.68023,-1.153 0.79299,-1.2552 0.28545,-0.2588 0.69244,-1.2547 0.56066,-1.7218 -0.0581,-0.2059 -0.27865,-0.9008 -0.51237,-1.1888 -0.469,-0.578 -0.56854,-0.6808 -0.50579,-1.6539 0.0358,-0.5551 0.29371,-0.8442 0.53766,-0.5707 0.0812,0.091 0.34103,0.092 0.48856,0.068 0.60613,-0.096 1.10074,-1.188 0.78923,-2.36 -0.0971,-0.3655 -0.19273,-1.0399 -0.14578,-1.0986 0.14129,-0.1767 0.21727,0.114 0.46354,0.5875 0.405,0.7789 0.44237,1.9847 0.3543,5.1883 -0.0645,2.3467 0.1824,2.8175 0.30371,3.0415 0.26181,0.4834 0.96822,1.2276 1.07932,1.137 0.0579,-0.047 0.10527,-0.3374 0.10527,-0.6449 0,-0.6109 0.11472,-0.7508 0.3859,-0.3827 0.25015,0.3396 0.54106,0.2981 0.62691,-0.4912 0.0412,-0.3789 0.18894,-0.9794 0.28116,-1.2716 0.15034,-0.4764 0.17003,-0.6043 -0.0325,-1.3478 -0.27059,-0.9934 -0.40784,-1.0135 -0.1698,-2.4128 0.287,-1.6873 0.19529,-2.2165 0.40099,-1.1919 0.16314,0.8127 0.26923,1.6714 0.55341,2.0865 l 0.23219,0.3392 0.29447,0.062 c 0.10964,-0.135 0.13259,-0.3563 0.23664,-0.1257 0.0997,0.221 0.36271,0.4221 0.42132,0.4111 0.51563,-0.097 0.38848,-2.3253 -0.0551,-3.5057 -0.18553,-0.4937 -0.292,-0.5946 -0.29493,-1.5216 -0.002,-0.7122 -0.009,-1.157 0.0567,-1.1724 0.0815,-0.019 0.0342,0.023 0.20757,0.3848 0.17335,0.3616 0.38207,0.8313 0.65269,1.1436 0.85792,0.9902 1.21646,1.1538 1.37329,2.0134 0.0848,0.465 0.22306,1.1051 0.23545,1.126 0.0124,0.021 0.12513,0.1203 0.29584,-0.026 0.0946,-0.2141 0.23354,-0.3843 0.21805,-0.026 -0.0293,0.6769 0.0213,1.1726 0.50658,2.119 0.40551,0.7908 0.64547,2.0585 0.78825,3.1304 0.0611,0.4588 0.29276,0.7405 0.39877,0.6111 0.0959,-0.117 0.70549,-0.8849 0.5021,-2.5116 -0.24482,-1.958 -0.25715,-2.5871 -0.0752,-3.122 0.11944,-0.3511 0.21738,-0.6798 0.2805,-0.6674 0.0631,0.012 0.0378,-0.044 0.14794,0.2826 0.31557,0.9367 1.01836,2.0565 2.01345,3.218 0.50458,0.5889 1.0292,1.3039 1.19724,1.5888 0.88498,1.5009 0.86623,3.323 -0.008,5.0674 l -0.26189,0.5227 0.459,1.1204 c 0.65693,1.6035 1.8664,6.5314 0.75712,8.2638 -9.82617,1.5588 -68.0366,8.136 -75.86031,9.8475 z m 65.25407,-24.1692 c -0.0782,-0.3338 -0.21624,-0.6989 -0.30675,-0.8114 -0.1541,-0.1915 -0.1648,-0.1839 -0.16833,0.1195 -0.007,0.5588 0.35459,1.6195 0.49356,1.4498 0.0859,-0.1048 0.0803,-0.3364 -0.0185,-0.7579 z m -32.05957,4.2458 c -0.24889,-0.9728 -0.48473,-1.1462 -0.38038,-0.2798 0.0937,0.7777 0.30358,1.2907 0.4533,1.1079 0.0622,-0.076 0.0321,-0.4179 -0.0729,-0.8281 z m 19.2525,-3.7491 c 0.12948,-0.2901 0.23542,-0.6522 0.23542,-0.8047 0,-0.3726 -0.57524,-1.3055 -0.75001,-1.2163 -0.18576,0.095 -0.2514,2.1834 -0.0785,2.499 0.16219,0.2962 0.29557,0.1887 0.59313,-0.478 z m -32.00233,4.2777 c 0.29757,-0.7432 0.28449,-0.946 -0.0987,-1.5293 -0.51083,-0.7777 -0.62242,-0.6372 -0.62242,0.7841 0,1.6476 0.25445,1.9105 0.72108,0.7452 z" style="fill:url(#linearGradient120912);fill-opacity:1"/>
+      <path sodipodi:nodetypes="cscssscscccsscccsssssscscssscsssssssssssssscssssscssssssssscscsscssssccssscccssssssccscssssscssscscssscssssssscssscscssscssscssssssssssccssssscssssscssscsscssssssssssssssssssssccsssssssssssscscssssssssscssssscssssccssscssssssscssscsssssssscsssscsscsssscsssscsssssssssccscsssssssscsscsssccssssssscssscsscscssssssssscsssssscsssscsssscsssscssssscsssscccccsssssscsscssssssscsscsssccssscsssssssssssc" inkscape:connector-curvature="0" id="path11989-8" d="m 217.41945,1273.9261 c -1.76708,-1.8736 -5.63282,-8.1917 -8.59053,-14.0402 l -5.37767,-10.6336 -0.6917,-14.2098 c -0.72007,-14.7927 -2.25263,-21.2922 -7.0213,-29.7769 -2.09916,-3.735 -2.15721,-4.3446 -0.96382,-10.1224 1.08336,-5.2451 1.05794,-6.2666 -0.17307,-6.9555 -0.79361,-0.4442 -2.06444,-2.2807 -2.82406,-4.0812 l -1.38114,-3.2737 -0.50087,5.5 -0.50087,5.5 -1.80405,-5.1734 c -1.12919,-3.2381 -1.68258,-7.166 -1.47933,-10.5 l 0.32471,-5.3266 2.10142,4.5 2.10142,4.5 1.03742,-4 c 0.57058,-2.2 1.33674,-6.1751 1.70256,-8.8334 0.36583,-2.6584 1.31189,-6.6665 2.10236,-8.9069 1.31044,-3.7142 1.24403,-4.8612 -0.75278,-13.0033 -2.04247,-8.3282 -2.10291,-9.545 -0.89726,-18.0634 2.06578,-14.5956 3.28528,-16.0284 4.41991,-5.193 1.13899,10.877 6.26908,21.0759 8.78254,17.4602 0.66521,-0.9569 1.17361,-1.0783 1.47501,-0.3521 0.25297,0.6095 1.07001,1.9426 1.81566,2.9623 1.15054,1.5735 1.59912,1.6521 2.96394,0.5194 3.01098,-2.4989 1.81677,-16.8592 -2.36381,-28.4244 -1.60626,-4.4436 -2.0398,-7.662 -1.81852,-13.5 l 0.29054,-7.6654 2.64532,5 c 1.45492,2.75 5.00442,7.925 7.88777,11.5 6.20985,7.6994 8.58731,12.6265 9.52989,19.75 0.65823,4.9745 2.35632,6.8076 3.93702,4.25 1.3376,-2.1643 1.99794,-0.793 1.6606,3.4485 -0.28222,3.5485 0.46311,6.2294 3.68364,13.25 4.23283,9.2274 6.6403,17.8721 7.68865,27.6084 0.73901,6.8634 2.21228,7.0585 4.60531,0.6099 1.32899,-3.5813 1.45468,-5.5518 0.66444,-10.4168 -1.77913,-10.953 0.37107,-34.5 3.15036,-34.5 0.47245,0 1.58122,2.1196 2.46394,4.7102 2.2756,6.6785 8.72548,17.1764 16.37288,26.6487 8.92598,11.056 11.93523,16.0192 14.24605,23.4964 3.2918,10.6513 2.10166,20.4801 -3.80484,31.4222 l -2.5789,4.7776 1.71865,5.4522 c 2.52541,8.0115 3.01327,14.3227 1.62586,21.0329 -1.96,9.4795 -11.07432,25.349 -12.32494,21.4598 -0.26529,-0.825 -1.69339,-5.55 -3.17357,-10.5 -3.08416,-10.3141 -8.04038,-19.1532 -12.7487,-22.7366 -5.00262,-3.8074 -13.68939,-8.364 -19.53047,-10.2446 -2.90457,-0.9351 -6.65456,-2.8559 -8.33333,-4.2685 -2.83631,-2.3866 -3.01652,-2.9286 -2.5467,-7.6594 0.27807,-2.8 0.81665,-6.5534 1.19683,-8.3409 0.59781,-2.8108 0.42187,-3.25 -1.30168,-3.25 -2.40709,0 -9.93293,7.0777 -11.27263,10.6014 -1.40957,3.7074 -1.17395,9.1537 0.55149,12.7474 0.83211,1.7331 4.03169,6.0762 7.11017,9.6512 6.35337,7.378 11.37493,16.9622 11.3761,21.7124 4.3e-4,1.7669 -0.93009,5.7005 -2.06782,8.7414 -3.43013,9.1678 -8.80177,11.084 -14.4081,5.1395 z m -13.55869,-97.4024 c -0.0441,-4.5995 -4.02982,-16.4303 -5.7146,-16.9627 -1.74722,-0.552 -1.64524,8.1406 0.16611,14.1593 2.47553,8.2255 5.61571,9.8122 5.54849,2.8034 z m -255.246164,92.8022 c -2.90683,-2.2865 -10.70849,-15.3569 -13.70652,-22.9629 -1.54624,-3.9228 -2.01534,-7.4682 -2.0267,-15.3173 -0.0173,-11.9704 -1.84,-20.6412 -6.20111,-29.4999 -3.04966,-6.1948 -3.1101,-6.5721 -1.95141,-12.1819 1.18899,-5.7565 1.17873,-5.8074 -1.81848,-9.0159 l -3.01422,-3.2268 0,3.6058 c 0,1.9832 -0.37813,3.6058 -0.84029,3.6058 -1.34927,0 -3.35921,-10.0933 -2.98706,-15 l 0.34129,-4.5 1.72208,3.8219 c 0.94714,2.1021 2.11768,3.5775 2.60121,3.2787 0.48352,-0.2989 1.41257,-3.8501 2.06454,-7.8916 0.65197,-4.0416 1.78641,-9.3453 2.52099,-11.7861 1.17181,-3.8937 1.11221,-5.2954 -0.48594,-11.4304 -2.25534,-8.6579 -2.33458,-12.7168 -0.4566,-23.3881 2.06591,-11.7391 2.80724,-11.9036 3.94258,-0.8751 0.71546,6.9498 4.21264,16.6935 6.27573,17.4852 0.82683,0.3173 1.94216,-0.051 2.47853,-0.8188 0.65013,-0.9305 1.12852,-1.0263 1.43513,-0.2876 0.25297,0.6095 1.11871,1.9595 1.92387,3 1.43202,1.8506 1.49876,1.8482 3.06074,-0.1081 2.29287,-2.8719 1.21943,-17.9407 -1.73436,-24.3467 -2.28242,-4.95 -3.99713,-23.1533 -2.18098,-23.1533 0.506,0 1.85817,1.931 3.0048,4.2911 1.14664,2.3601 4.44008,7.1976 7.31876,10.75 6.00276,7.4076 7.68273,10.8678 9.12614,18.797 1.19538,6.5667 2.0556,7.8467 3.83367,5.7042 2.08658,-2.5141 2.55406,-1.816 2.2002,3.2858 -0.4267,6.152 1.92987,12.1719 4.76489,12.1719 1.40396,0 2.21821,-0.85 2.63455,-2.75 0.33142,-1.5125 0.78891,-3.3465 1.01665,-4.0756 0.22774,-0.729 -0.25948,-4.554 -1.08271,-8.5 -0.82322,-3.9459 -1.49714,-7.3654 -1.49759,-7.5988 -0.003,-1.3078 5.4887,4.9994 7.11682,8.1744 2.24993,4.3875 3.49476,4.6947 5.06431,1.25 1.55161,-3.4054 2.29963,-3.1503 3.66541,1.25 1.81401,5.8444 6.4747997,13.6909 8.3456297,14.0498 1.26904,0.2435 1.85781,-0.6298 2.35119,-3.4875 1.291,-7.4776 4.48961,-19.2253 6.52918,-23.9801 1.54213,-3.5952 1.99004,-6.4322 1.74969,-11.0823 -0.30694,-5.9385 -0.24263,-6.1432 1.28974,-4.1062 2.30259,3.0609 3.5508903,1.7036 4.3554103,-4.7355 1.08145,-8.6557 3.32554,-15.2982 7.57033,-22.4082 4.61413,-7.7288 6.53708,-12.8992 8.06898,-21.696 1.48024,-8.5002 2.86434,-6.4656 2.85443,4.196 -0.005,5.7628 -0.84704,11.076 -3.00989,19 -3.58039,13.1173 -4.73782,24.589 -3.00933,29.8264 2.31464,7.0134 4.51587,4.2954 7.10272,-8.7702 1.0672,-5.3902 1.28593,-5.7399 2.34845,-3.7545 0.81768,1.5278 0.94841,4.9833 0.43272,11.4376 -0.40641,5.0866 -0.3927,9.5946 0.0305,10.0177 0.42318,0.4232 1.78172,-0.3081 3.01898,-1.6251 2.44183,-2.5992 3.06292,-7.0711 1.73614,-12.5004 -1.1263,-4.609 1.08179,-3.8069 3.76764,1.3686 1.41972,2.7358 2.01126,5.8099 2.00865,10.4388 -0.006,11.1038 -1.54908,14.6232 -9.95618,22.7117 -8.01269,7.7091 -8.56744,9.1897 -6.12587,16.3494 1.61571,4.7379 3.70244,4.4156 5.2454,-0.8101 1.417,-4.799 5.39205,-11.1726 6.97472,-11.1831 1.64777,-0.011 6.39817,8.0362 7.04043,11.9265 1.43744,8.7068 3.05633,7.9857 6.67797,-2.9744 4.46622,-13.5161 6.05465,-23.9966 5.44997,-35.9589 -0.29191,-5.775 -0.84518,-11.5125 -1.22947,-12.75 -1.12661,-3.6279 0.86616,-2.5914 3.84522,2 5.23215,8.0638 6.0658,12.5317 6.20409,33.25 0.13257,19.8603 0.96236,25.2942 4.5612,29.8694 3.44876,4.3844 4.00886,3.267 3.31815,-6.6194 -0.7036,-10.0709 0.74904,-18.19 4.6078,-25.7538 1.88534,-3.6956 1.9258,-4.2353 0.52106,-6.9518 -2.27364,-4.3967 -1.93852,-5.3107 1.32793,-3.6215 2.51458,1.3003 3.101,1.299 4.97091,-0.011 2.04631,-1.4333 2.11533,-1.3605 1.98536,2.0967 -0.11177,2.973 0.6083,4.3386 4.23729,8.0363 2.40457,2.4501 4.93286,4.4547 5.61842,4.4547 1.968064,0 2.558674,-5.8784 1.356364,-13.5 -1.295734,-8.2139 -5.325654,-17.3685 -11.398464,-25.8935 -6.28231,-8.819 -12.82162,-19.739 -12.1955,-20.3651 1.95046,-1.9505 22.26462,17.9208 29.399654,28.7586 6.18169,9.3898 11.73684,21.3107 14.21296,30.5 2.49951,9.2761 3.88995,31.8978 2.15936,35.1314 -0.58073,1.0851 -4.80018,4.269 -9.37656,7.0753 -29.506584,18.0938 -44.478344,47.1721 -36.268544,70.4411 1.97641,5.6018 1.82964,6.8538 -0.80216,6.8428 -5.38234,-0.022 -25.90774,-15.133 -29.57014,-21.7692 -2.77886,-5.0352 -2.4064,-6.6826 2.89607,-12.8091 4.26387,-4.9265 4.71443,-7.2764 2.43922,-12.7218 -1.90167,-4.5513 -2.99319,-5.1695 -5.7359,-3.2484 -3.48777,2.4429 -5.64625,1.9047 -7.43915,-1.8551 -1.37472,-2.8828 -1.44108,-4.0867 -0.42716,-7.75 1.78101,-6.4348 1.75905,-7.2249 -0.21211,-7.6315 -2.9149,-0.6012 -6.73302,2.6254 -9.02732,7.6288 -1.99028,4.3405 -2.12119,6.0452 -1.8781,24.4574 0.23591,17.8673 0.0696,20.2251 -1.71082,24.25 -1.08467,2.452 -2.44743,4.4583 -3.02836,4.4583 -0.58093,0 -1.39373,0.1125 -1.80623,0.25 -0.4125,0.1375 -0.975,-1.325 -1.25,-3.25 -0.37452,-2.6216 -0.98553,-3.5 -2.43465,-3.5 -1.91333,0 -2.44063,1.2613 -5.50073,13.1573 -1.0073,3.9158 -8.7806903,12.3436 -9.4633403,10.26 -0.25539,-0.7795 -1.2017,-4.1173 -2.10290003,-7.4173 -2.57678997,-9.4356 -9.05833997,-22.0663 -12.75463967,-24.8552 -5.30465,-4.0024 -12.93645,-8.1991 -19.11216,-10.5097 -9.3709,-3.5061 -11.38423,-4.8556 -12.56026,-8.419 -0.85152,-2.5801 -0.7612,-4.42 0.40588,-8.2674 0.82564,-2.7218 1.50602,-5.5112 1.51198,-6.1987 0.0343,-3.9555 -9.65672,2.4223 -12.37051,8.1412 -0.89027,1.8761 -1.61867,5.4314 -1.61867,7.9007 0,4.7918 1.40922,7.2124 11.26204,19.3445 4.80891,5.9213 8.73793,14.4033 8.73793,18.8636 0,1.3337 -0.93088,4.9129 -2.06861,7.9538 -3.11155,8.3163 -7.92517,10.6987 -13.21295,6.5393 z m -15.35913,-99.5968 c -0.0774,-2.693 -0.99627,-7.3401 -2.04198,-10.327 -3.20714,-9.1606 -6.04721,-7.3849 -4.19696,2.624 2.29224,12.3999 6.52403,17.6247 6.23894,7.703 z m 48.13764,-9.6463 c -0.86404,-7.7211 -1.9505,-9.1005 -4.52871,-5.75 -2.54217,3.3036 0.753507,-5.3857 3.426497,-2.5404 3.93015,4.1835 1.890493,15.3343 1.102213,8.2904 z m 113.31999,0.017 c 3.21904,-6.2552 3.07552,-8.524 -0.92592,-14.6362 -5.52102,-8.4335 -7.07252,-7.0698 -7.11776,6.2561 -0.0483,14.2321 3.25897,17.6777 8.04368,8.3801 z m -413.245506,101.6614 c -2.40426,-2.4042 -1.89082,-7.4953 1.62405,-16.103 2.89198,-7.0823 3.19603,-8.8228 3.20131,-18.3255 0.005,-8.6475 -0.37628,-11.3381 -2.15994,-15.25 -1.19118,-2.6125 -2.79499,-4.75 -3.56403,-4.75 -0.76905,0 -2.88902,3.0281 -4.71105,6.7292 -2.47091,5.0191 -5.70347,9.0852 -12.7202,16 -5.17408,5.0989 -10.0451,9.2708 -10.82449,9.2708 -1.80702,0 -1.79523,-2.2796 0.0954,-18.4423 3.04158,-26.0016 8.42692,-46.8958 14.60774,-56.6754 3.68512,-5.8308 12.52618,-12.8099 22.88722,-18.067 12.28412,-6.2329 15.07549,-11.6848 12.44952,-24.3153 -0.80044,-3.85 -1.45571,-7.1823 -1.45616,-7.405 -0.002,-1.195 4.54153,3.9743 6.6378,7.5513 5.32151,9.0805 3.90038,19.7186 -4.25528,31.8537 -6.59687,9.8156 -11.34997,20.2577 -12.63447,27.7566 -1.80201,10.52 -0.013,11.8835 8.89137,6.7764 8.78236,-5.037 10.72641,-11.5512 7.76914,-26.033 l -0.71472,-3.5 2.2944,2 c 1.26193,1.1 5.73685,4.5042 7.02853,7.2542 4.26712,9.0847 0.30121,19.5506 -6.47155,27.463 -1.92258,2.2461 -4.25474,6.0716 -5.18258,8.5011 -1.48044,3.8765 -1.97886,4.344 -4.0712,3.8189 -3.53573,-0.8874 -4.1402,-0.01 -2.98103,4.3343 0.98022,3.6724 0.7876,4.3466 -3.07798,10.773 -2.268,3.7705 -4.58944,8.0989 -5.15875,9.6187 -1.97018,5.2596 -2.89873,14.3777 -2.1177,20.7952 1.08413,8.9079 -1.23817,12.5173 -5.38535,8.3701 z m 54.38864,-9.4685 c -5.10766,-5.1076 -4.85405,-10.0488 1.17333,-22.8599 5.21466,-11.0836 6.38261,-16.6687 4.89073,-23.3873 -1.78276,-8.0286 -4.05843,-12.7128 -6.176,-12.7128 -1.52141,0 -1.84813,0.7889 -1.84813,4.4624 0,2.4544 -0.9013,6.8715 -2.00288,9.8157 -2.11681,5.6577 -7.09743,11.3959 -8.91586,10.2721 -0.59469,-0.3676 -1.08126,-3.3696 -1.08126,-6.6712 0,-4.4886 0.69019,-7.4377 2.73612,-11.691 2.14747,-4.4643 2.72505,-7.0865 2.68464,-12.188 -0.0283,-3.575 -0.60337,-7.5181 -1.2779,-8.7624 -0.9177,-1.6928 -0.96914,-3.7065 -0.20436,-8 0.56212,-3.1557 0.97612,-11.3626 0.92,-18.2376 -0.11979,-14.6728 1.88259,-26.8001 6.32866,-38.3292 2.506,-6.4982 2.9624,-8.9265 2.60541,-13.8618 -0.41854,-5.7862 -0.3773,-5.91 1.25009,-3.7525 2.06118,2.7326 3.95734,1.7955 3.95734,-1.9556 0,-5.7627 4.11513,-18.6713 8.00409,-25.1077 4.31989,-7.1497 6.24201,-12.2645 8.03779,-21.3887 0.80576,-4.094 1.4303,-5.469 2.0439,-4.5 1.58587,2.5045 0.97534,15.3046 -1.09528,22.9631 -5.9427,21.9798 -6.64655,36.7972 -1.79233,37.732 1.78641,0.344 2.92359,-2.5269 4.84476,-12.2313 1.82018,-9.1942 3.38922,-4.7026 2.64196,7.5631 -0.32853,5.3925 -0.23244,10.0301 0.21353,10.3058 0.44597,0.2756 1.80454,-0.5566 3.01904,-1.8494 2.41429,-2.5699 3.01128,-7.0623 1.67017,-12.5682 -0.77978,-3.2014 -0.71177,-3.3676 0.84825,-2.0729 3.26718,2.7116 4.84119,7.321 4.79904,14.0537 -0.0717,11.4563 -1.44405,14.6183 -9.80182,22.5839 -8.16546,7.7824 -8.91572,9.9315 -5.94733,17.0358 1.71749,4.1106 3.69614,4.0261 4.56488,-0.1949 0.97558,-4.7401 5.85903,-12.4423 7.87366,-12.4184 1.45974,0.017 5.49269,7.5731 6.55148,12.2742 0.69613,3.0909 1.71842,5.219 2.50715,5.219 1.70887,0 5.47215,-11.1094 8.12996,-24 2.03104,-9.8508 2.20854,-24.4582 0.40098,-33 l -0.63483,-3 2.94342,3.322 c 1.61889,1.8271 3.99811,6.3271 5.28716,10 2.12178,6.0455 2.34942,8.4299 2.40371,25.178 0.037,11.4283 0.52507,20.0746 1.27671,22.6194 1.1859,4.0151 4.64998,9.3806 6.05629,9.3806 0.38565,0 0.69318,-5.5125 0.6834,-12.25 -0.0167,-11.4719 0.1806,-12.7264 3.10559,-19.75 2.84011,-6.8199 2.99828,-7.7449 1.74402,-10.2004 -2.15023,-4.2095 -1.70348,-5.1042 1.58012,-3.1645 2.84499,1.6806 3.04431,1.6731 5.15267,-0.1935 l 2.1932,-1.9416 -0.63913,3.3073 c -0.56964,2.9477 -0.13641,3.8447 3.98417,8.25 2.54282,2.7184 5.18794,4.9427 5.87805,4.9427 1.99784,0 2.55807,-4.3431 1.50825,-11.6924 -1.53888,-10.7728 -3.57613,-15.3143 -14.13117,-31.5022 -5.44803,-8.3555 -9.90551,-15.5549 -9.90551,-15.9986 0,-1.7382 2.13349,-0.6069 7.69808,4.0822 17.57985,14.8139 29.71073,32.9389 35.88134,53.611 2.31164,7.7441 2.70283,10.9339 2.80354,22.8597 0.10802,12.7913 -0.0371,13.9696 -1.88296,15.2847 -1.1,0.7837 -5.54345,3.6868 -9.87434,6.4512 -12.21117,7.7946 -22.6863,18.5693 -29.55894,30.4044 -6.14624,10.5841 -8.50755,25.5994 -5.58276,35.5 3.00666,10.1777 2.9999,10.0012 0.38262,9.9879 -3.01603,-0.015 -8.85382,-3.3609 -18.39553,-10.5422 -14.07309,-10.5917 -16.00081,-15.8928 -8.67105,-23.8446 4.63005,-5.023 4.96495,-6.6489 2.59142,-12.5809 -1.76923,-4.4218 -2.1887,-4.5846 -7.16952,-2.7835 -3.1677,1.1454 -3.56663,1.0558 -5.40552,-1.2152 -2.0173,-2.4912 -2.02602,-2.9631 -0.24534,-13.2715 0.56761,-3.286 0.40342,-3.75 -1.32678,-3.75 -3.04235,0 -6.82132,3.5176 -8.84275,8.2312 -1.57602,3.675 -1.83556,7.1896 -1.86607,25.2688 -0.0327,19.3529 -0.1967,21.2745 -2.09149,24.5 -1.13083,1.925 -2.70583,3.5 -3.5,3.5 -0.88832,0 -1.63635,-1.3468 -1.94395,-3.5 -0.38443,-2.6911 -1.02488,-3.5745 -2.77083,-3.8223 -1.78906,-0.2539 -2.58463,0.4288 -3.75,3.2179 -0.81354,1.947 -1.47917,5.3178 -1.47917,7.4904 0,7.2711 -2.08841,9.0255 -6.03993,5.074 z m 88.09041,-96.5417 c 1.21749,-1.97 2.39551,-5.4575 2.61783,-7.75 0.34513,-3.559 -0.12096,-4.8721 -3.18856,-8.9828 -1.97604,-2.648 -4.12344,-4.6376 -4.77201,-4.4215 -2.55132,0.8505 -3.17745,14.032 -1.06612,22.4442 0.85685,3.4139 3.87745,2.806 6.40886,-1.2899 z m 344.30219,89.0252 c -1.85111,-1.8511 -2.37599,-3.1616 -1.90243,-4.75 1.87592,-6.292 1.77573,-9.5919 -0.39801,-13.109 -2.42838,-3.9292 -6.99014,-7.5845 -9.46534,-7.5845 -1.34992,0 -1.50513,0.8442 -0.97869,5.3235 0.60912,5.1826 -1.30944,11.6765 -3.44974,11.6765 -1.36103,0 -4.87006,-7.1748 -7.56711,-15.4723 -3.0565,-9.4033 -3.52538,-21.3565 -1.0684,-27.2369 2.14385,-5.131 0.56809,-6.2786 -4.24624,-3.0927 -2.20318,1.458 -5.0608,4.7867 -6.79038,7.9096 -2.87898,5.1984 -2.99519,5.9066 -3.23269,19.7012 -0.15486,8.9947 -0.70164,15.1227 -1.47227,16.5 -1.09591,1.9587 -1.29807,1.4912 -1.90642,-4.4082 -0.82963,-8.0454 -3.46445,-13.444 -9.73788,-19.9526 -5.46629,-5.6712 -8.65302,-6.5611 -7.87142,-2.1981 0.27095,1.5125 1.27323,7.1315 2.22728,12.4866 1.77624,9.9702 1.42647,17.1983 -0.80029,16.5382 -0.65595,-0.1944 -2.54264,-3.0358 -4.19264,-6.3142 -2.38686,-4.7424 -3.07293,-7.549 -3.35686,-13.7321 -0.31064,-6.7649 -0.0225,-8.4486 2.22483,-13 2.35966,-4.7789 15.82983,-20.7285 17.50615,-20.7285 0.39176,0 1.14285,1.4615 1.66908,3.2479 1.32701,4.5046 3.76448,4.5603 9.07665,0.2074 7.00786,-5.7425 19.27108,-18.5336 20.00171,-20.8628 0.36102,-1.1509 1.68804,-3.055 2.94893,-4.2313 2.76988,-2.5841 4.78573,-9.4629 3.92352,-13.3885 -0.34548,-1.573 -2.45418,-5.5793 -4.68601,-8.9031 -3.78605,-5.6383 -4.02704,-6.4148 -3.59774,-11.5916 0.58565,-7.0621 1.60818,-8.1404 5.70861,-6.02 3.08841,1.5971 3.20405,1.5729 6.04137,-1.2644 3.67746,-3.6775 4.66596,-8.8956 3.25122,-17.1625 -0.60886,-3.5579 -0.94302,-6.6329 -0.74258,-6.8334 1.00687,-1.0068 4.59757,4.2869 5.91357,8.7184 3.23352,10.8884 2.95466,44.5839 -0.36898,44.5839 -2.06701,0 -4.0723,4.6259 -4.68035,10.797 -0.41359,4.1975 0.18105,7.3049 3.07711,16.0802 4.1072,12.445 4.52692,18.5735 1.60073,23.3728 -2.11191,3.4637 -4.49628,4.078 -7.44897,1.9189 -1.45054,-1.0606 -1.68981,-2.127 -1.17801,-5.25 1.27142,-7.7582 1.25007,-7.9413 -0.88398,-7.585 -3.10315,0.5181 -7.42603,5.1871 -8.68109,9.3761 -1.93443,6.4566 0.3155,13.7374 5.81039,18.8024 2.48622,2.2917 7.07422,5.2748 10.19555,6.6292 10.85078,4.7081 12.44801,5.7672 13.88533,9.2071 3.94919,9.4518 -7.36415,18.5882 -14.35751,11.5948 z m -267.044374,-3.4625 c -1.205436,-0.4804 -2.933476,-2.0056 -3.840096,-3.3892 -1.38845,-2.1191 -1.46087,-3.084 -0.45924,-6.119 2.08213,-6.3089 0.18782,-11.1179 -6.39382,-16.2315 -4.79409,-3.7247 -5.86257,-3.0699 -5.0893,3.1192 0.71722,5.7404 -1.44567,12.1582 -3.8345,11.3778 -1.82808,-0.5972 -7.60926,-14.8286 -9.28124,-22.8475 -1.58471,-7.6003 -1.19372,-13.8696 1.23596,-19.8179 1.85672,-4.5456 0.48016,-5.8496 -3.62367,-3.4328 -3.77256,2.2218 -8.58784,9.1791 -10.24377,14.8007 -0.69314,2.3531 -1.11366,9.0358 -1.00051,15.8998 0.12825,7.7806 -0.22142,12.5812 -1.01976,14 -1.08488,1.9282 -1.2797,1.5074 -1.81978,-3.9302 -0.33265,-3.3493 -1.63086,-8.2091 -2.8849,-10.7996 -2.64778,-5.4696 -11.15546,-14.6108 -13.59815,-14.6108 -1.84676,0 -1.89539,-0.7687 1.01873,16.1037 1.62792,9.4255 1.19834,16.3963 -1.01045,16.3963 -0.49998,0 -2.26331,-2.7 -3.91851,-6 -4.05863,-8.0918 -4.79555,-19.8852 -1.68232,-26.9232 2.14608,-4.8516 15.79227,-21.3532 17.77574,-21.4953 0.62629,-0.045 1.43418,1.4935 1.79531,3.4185 1.12,5.9701 4.04942,4.8172 15.88042,-6.25 5.73259,-5.3625 11.26949,-11.2819 12.30422,-13.1542 1.03474,-1.8722 2.86257,-4.408 4.06184,-5.635 5.30166,-5.4243 5.00054,-14.8122 -0.70539,-21.9922 -3.64966,-4.5925 -4.38088,-7.1763 -3.71149,-13.1151 0.66775,-5.9243 1.81404,-7.004 5.12948,-4.8316 2.45079,1.6058 2.76161,1.6067 5.19043,0.015 5.15288,-3.3763 6.36553,-10.402 3.84993,-22.3052 -0.57668,-2.7287 -0.42949,-3.1678 0.892,-2.6607 4.875936,1.8711 8.217396,19.508 7.185896,37.9286 -0.77277,13.8001 -1.05949,15.1486 -3.3481,15.7471 -2.039906,0.5334 -4.163256,7.1925 -4.163256,13.0565 0,1.8799 1.575,8.1747 3.5,13.9885 3.921076,11.8423 4.303706,16.5929 1.748446,21.7079 -1.409786,2.8221 -2.323796,3.5 -4.718916,3.5 -4.22939,0 -5.93934,-3.5834 -3.96489,-8.3089 1.93422,-4.6293 1.83021,-5.1911 -0.96105,-5.1911 -2.58631,0 -7.92889,5.2989 -9.11706,9.0425 -0.37947,1.1956 -0.37938,4.7127 2e-4,7.8157 0.62395,5.1007 1.18572,6.1246 5.85686,10.6753 3.47158,3.382 7.46165,5.9833 12.161556,7.9286 9.68505,4.0086 12.49485,6.7542 12.49485,12.2092 0,6.8777 -6.32004,12.4507 -11.6917,10.3098 z" style="fill:#f85616;fill-opacity:1;filter:url(#filter12291-3)" transform="matrix(0.11855694,-0.0188069,0,0.12591085,816.30314,1477.9804)"/>
+      <path sodipodi:nodetypes="ssssscssssscssccssscccsssscssssssssccccscsccscssccssccccsssssscssssssscssscscssscssssssscsscssssssscsssssssscsccscssccsssssccsssccsccccscssscscsssssscssccssssssssssscssscsssssssscsscssssssscsccssssssscsscscsssssccssccssscsssccscsscscssccccscsscscssssssscsscsscccccsscsscccscsscsssscssssscssscsscssscssssscssscsssscssssssssssssssscsscsscssssssscsssccsssscsssssssssccssscssssssscsscsscccsc" inkscape:connector-curvature="0" id="path11987-6" d="m 774.91445,1640.2443 c 0,-0.7384 0.3723,-3.7337 0.65185,-5.2444 0.342,-1.8481 0.77318,-3.2758 1.25932,-4.1699 0.4369,-0.8034 1.48507,-1.8484 2.71344,-2.7052 1.45637,-1.0158 1.7873,-1.7547 1.47597,-3.2957 -0.0949,-0.4697 -0.17258,-0.8769 -0.17263,-0.905 -2.4e-4,-0.1504 0.53843,0.415 0.78696,0.8259 0.62612,1.0354 0.46221,2.4087 -0.48428,4.0573 -1.0222,1.7804 -1.6006,3.3955 -1.61119,4.4989 -0.004,0.3993 -0.10218,0.5506 -0.93213,1.434 -1.07567,1.1451 -1.60041,2.1044 -1.88813,3.4521 -0.1765,0.8267 -0.24251,0.9505 -0.86719,1.6266 -0.37188,0.4026 -0.73372,0.741 -0.80407,0.7522 -0.0704,0.011 -0.12792,-0.1359 -0.12792,-0.3268 z m 70.89705,-11.5581 -0.41495,-0.191 -0.0172,-1.019 c -0.0218,-1.2927 -0.28945,-2.4596 -0.77649,-3.3853 -0.32674,-0.621 -0.3852,-0.8712 -0.40326,-1.7255 -0.0215,-1.015 -0.1297,-1.2221 -0.45936,-0.8793 -0.13737,0.1429 -0.2089,0.028 -0.4106,-0.6592 -0.13434,-0.4578 -0.36445,-0.9925 -0.51136,-1.1884 -1.19792,-1.597 -1.2863,-1.7405 -1.16443,-1.8892 0.15011,-0.1832 0.15533,-1.4483 0.009,-2.2261 -0.0568,-0.3026 -0.21589,-0.863 -0.35342,-1.2452 -0.19043,-0.5293 -0.24182,-0.9264 -0.21559,-1.6656 l 0.0344,-0.9706 0.31362,0.5798 c 0.1725,0.3189 0.59331,0.9037 0.93515,1.2996 0.73622,0.8527 1.01809,1.4283 1.12984,2.3075 0.078,0.614 0.27936,0.8128 0.46676,0.4611 0.15858,-0.2977 0.23687,-0.1374 0.19687,0.403 -0.0335,0.4516 0.055,0.7765 0.43558,1.5992 0.78976,1.7075 0.89899,2.2974 0.8788,4.7461 -0.0191,2.3145 0.15819,3.8368 0.5871,5.0419 0.13492,0.379 0.22482,0.7135 0.19977,0.7432 -0.0251,0.03 -0.23227,-0.032 -0.46049,-0.137 z m -14.47389,2.1677 c -0.17167,-0.5166 -0.2763,-1.4748 -0.18808,-1.7225 0.061,-0.1712 0.1165,-1.0629 0.1234,-1.9816 0.008,-1.0333 0.0583,-1.6778 0.13251,-1.6898 0.15635,-0.025 1.59648,-1.5829 2.01185,-2.1759 0.3941,-0.5626 0.53842,-0.6023 0.5388,-0.1484 1.1e-4,0.196 0.2059,0.6351 0.47423,1.012 0.26066,0.3662 0.47394,0.7171 0.47394,0.7798 0,0.063 -0.12004,0.3055 -0.26676,0.5396 -0.20281,0.3235 -0.26737,0.5993 -0.26937,1.1504 -0.002,0.6705 -0.04,0.7759 -0.50148,1.4058 l -0.49886,0.6811 -0.12094,-0.3187 c -0.18594,-0.4898 -0.14863,-2.2501 0.0596,-2.8124 0.25417,-0.6864 0.0674,-0.8013 -0.50342,-0.3096 -0.2612,0.225 -0.59999,0.6979 -0.80505,1.1236 -0.36276,0.7532 -0.39182,1.0522 -0.41193,4.2384 -10e-4,0.1734 -0.20454,0.3603 -0.24845,0.2282 z m -17.57688,2.1695 c -0.38735,-0.1503 -0.44453,-0.2241 -0.38294,-0.4945 0.14577,-0.6399 -0.1784,-2.5692 -0.60638,-3.6088 -0.73965,-1.7967 -0.77211,-1.9165 -0.68685,-2.5339 0.0943,-0.6825 0.0835,-0.7071 -0.28274,-0.649 -0.23885,0.038 -0.31297,-0.062 -0.50186,-0.6758 -0.2372,-0.771 -0.33043,-0.9264 -1.20878,-2.015 -0.39963,-0.4954 -0.54032,-0.7678 -0.47423,-0.9185 0.0517,-0.1177 0.0864,-0.7291 0.0771,-1.3587 -0.0131,-0.8945 -0.0751,-1.2698 -0.28354,-1.7177 -0.19326,-0.4154 -0.28228,-0.8914 -0.32332,-1.7289 -0.0325,-0.6634 -0.0102,-1.163 0.0524,-1.173 0.06,-0.01 0.2203,0.2082 0.35624,0.4838 0.13594,0.2756 0.52641,0.8228 0.86769,1.2159 0.71167,0.8198 0.91084,1.2239 1.08197,2.1951 0.14172,0.8043 0.2437,0.9493 0.45451,0.6462 0.24738,-0.3559 0.3028,-0.2767 0.26084,0.3723 -0.0505,0.7826 0.22881,1.4963 0.56492,1.4429 0.16644,-0.026 0.26298,-0.1487 0.31234,-0.3958 0.0393,-0.1966 0.0935,-0.4362 0.12053,-0.5323 0.027,-0.096 -0.0308,-0.5684 -0.12836,-1.0498 -0.0976,-0.4814 -0.1775,-0.8992 -0.17755,-0.9286 -3.6e-4,-0.1646 0.65072,0.5262 0.84375,0.8954 0.26674,0.5101 0.41432,0.5254 0.6004,0.062 0.18396,-0.4579 0.27264,-0.4399 0.43457,0.089 0.21506,0.7018 0.76763,1.602 0.98943,1.612 0.15045,0.01 0.22025,-0.1142 0.27875,-0.4833 0.15305,-0.9658 0.53227,-2.5051 0.77408,-3.1421 0.18283,-0.4817 0.23593,-0.8474 0.20743,-1.4283 -0.0364,-0.742 -0.0287,-0.7689 0.15291,-0.5413 0.27299,0.3421 0.42099,0.1477 0.51637,-0.6782 0.12821,-1.1102 0.39426,-1.9887 0.89751,-2.9638 0.54704,-1.0599 0.77502,-1.7471 0.95664,-2.8835 0.17549,-1.0981 0.33958,-0.868 0.33841,0.4747 -5.9e-4,0.7256 -0.10042,1.4105 -0.35684,2.4489 -0.4698,1.9024 -0.57144,3.2307 -0.30143,3.9388 l 0.20178,0.5291 -0.46981,0.8073 c -0.45855,0.7881 -0.75228,1.6917 -0.90923,2.7973 -0.0872,0.6146 -0.18667,0.6901 -0.43594,0.3309 -0.28663,-0.4129 -0.4335,-0.1224 -0.30429,0.6021 0.0633,0.355 0.0833,0.9808 0.0445,1.3905 -0.0688,0.7245 -0.0545,0.7704 0.52354,1.6833 0.42031,0.6638 0.63508,1.1652 0.73375,1.7131 0.0767,0.426 0.2,0.7896 0.27393,0.808 0.15824,0.04 1.46537,-0.9315 1.99754,-1.4838 0.60968,-0.6326 1.2206,-1.7885 1.31054,-2.4797 0.0445,-0.3421 0.16131,-0.8207 0.25956,-1.0637 0.2922,-0.7225 0.72355,-2.4305 0.87968,-3.4831 0.14283,-0.963 0.10231,-3.1233 -0.0693,-3.6922 -0.0448,-0.1487 -0.0339,-0.2779 0.0244,-0.2872 0.17581,-0.028 0.74751,0.91 0.94477,1.55 0.21764,0.706 0.35321,3.4102 0.20254,4.0401 l -0.10464,0.4374 -0.29374,-0.4355 c -0.16156,-0.2395 -0.39391,-0.4401 -0.51634,-0.4457 -0.19361,-0.01 -0.21242,0.043 -0.14448,0.3989 0.16963,0.8885 0.21476,3.2143 0.0791,4.0782 -0.17157,1.0931 -0.84756,3.6927 -1.0331,3.9729 -0.1058,0.1598 -0.41863,-0.2787 -0.57145,-0.801 -0.1405,-0.4801 -0.14799,-0.7204 -0.0387,-1.2408 0.19076,-0.9078 0.005,-1.0499 -0.52153,-0.399 -0.21594,0.2669 -0.55266,0.5973 -0.74828,0.7342 -0.61538,0.4309 -0.92088,1.3423 -0.95287,2.8429 -0.015,0.7054 -0.0602,1.2736 -0.10039,1.2627 -0.0401,-0.011 -0.12413,-0.012 -0.18659,0 -0.0625,0.01 -0.25425,-0.2146 -0.42621,-0.499 -0.17196,-0.2843 -0.37227,-0.5075 -0.44513,-0.4959 -0.0729,0.012 -0.24818,0.1934 -0.38959,0.4042 l -0.2571,0.3832 -0.22158,-0.3441 c -0.12187,-0.1893 -0.57336,-0.7676 -1.00332,-1.285 -0.96388,-1.1601 -1.68166,-2.341 -1.95151,-3.2106 -0.11264,-0.363 -0.2473,-0.746 -0.29925,-0.8511 -0.79053,-3.896 -0.75928,1.1507 -0.75535,2.3828 0.005,2.4076 0.037,2.8471 0.27119,3.7549 0.14588,0.5655 0.32376,1.1765 0.39531,1.3578 0.0715,0.1813 0.10955,0.3542 0.0845,0.384 -0.0251,0.03 -0.2505,-0.025 -0.50094,-0.1223 z m -14.59266,1.6164 c -0.11242,-0.8045 -0.11117,-0.8509 0.0485,-1.8067 0.1286,-0.77 0.0852,-2.281 -0.0776,-2.706 -0.0389,-0.1013 0.0567,-0.2315 0.24925,-0.3398 0.17172,-0.097 0.80925,-0.7651 1.41673,-1.4856 0.60748,-0.7205 1.13005,-1.3141 1.16127,-1.319 0.0312,-0.01 0.0343,0.157 0.007,0.36 -0.052,0.3846 0.10488,0.7278 0.67649,1.4799 l 0.33934,0.4465 -0.28463,0.4045 c -0.35654,0.5065 -0.45219,0.9165 -0.35732,1.5315 0.0694,0.4498 0.0386,0.5253 -0.46309,1.1377 -0.29557,0.3608 -0.55786,0.6593 -0.58285,0.6632 -0.025,0.01 -0.10548,-0.3657 -0.17886,-0.8215 -0.13749,-0.8541 -0.0381,-1.8846 0.23906,-2.4786 0.20966,-0.4493 -0.0348,-0.5532 -0.48009,-0.2041 -0.44835,0.3516 -1.01935,1.3195 -1.21281,2.056 -0.077,0.2933 -0.14305,1.2088 -0.14667,2.0344 -0.004,0.9864 -0.052,1.5244 -0.13884,1.5693 -0.0784,0.041 -0.16583,-0.1721 -0.21468,-0.5217 z m 50.33955,-8.3382 c -0.0747,-0.1622 -0.55737,-0.8154 -1.07265,-1.4515 -1.18055,-1.4573 -1.44774,-1.9042 -1.93295,-3.2324 -0.37282,-1.0206 -0.39135,-1.1543 -0.39271,-2.8336 -0.001,-1.6896 0.16287,-2.8589 0.40695,-2.8976 0.0566,-0.01 0.18847,0.237 0.29313,0.5466 0.26978,0.798 1.03446,1.9986 1.94111,3.0474 1.05824,1.2242 1.41501,1.7925 1.68897,2.6906 0.37392,1.2256 0.25311,2.4763 -0.37541,3.8865 -0.26617,0.5972 -0.3724,0.6438 -0.55644,0.244 z m -66.09659,10.2139 c -0.0435,-0.04 -0.079,-0.4055 -0.079,-0.8137 0,-0.5504 0.0838,-0.9407 0.32438,-1.51 0.2546,-0.6024 0.32307,-0.9435 0.31829,-1.585 -0.003,-0.4496 -0.0715,-0.9353 -0.15151,-1.0793 -0.1088,-0.1959 -0.1149,-0.4484 -0.0242,-1.0034 0.0666,-0.4079 0.11572,-1.449 0.10907,-2.3137 -0.0142,-1.8452 0.22319,-3.4097 0.75031,-4.945 0.2971,-0.8654 0.35121,-1.1797 0.30888,-1.7944 -0.0496,-0.7206 -0.0447,-0.737 0.14821,-0.4959 0.24437,0.3052 0.46917,0.1516 0.46917,-0.3207 0,-0.7256 0.48788,-2.4283 0.94894,-3.3119 0.51216,-0.9814 0.74003,-1.6616 0.95294,-2.8442 0.0955,-0.5306 0.16957,-0.7155 0.24232,-0.605 0.18826,0.2858 0.11565,1.9086 -0.13031,2.9119 -0.47726,1.9469 -0.62019,2.9026 -0.56194,3.7579 0.0315,0.4635 0.12041,0.9134 0.19745,0.9997 0.11119,0.1247 0.0661,0.2965 -0.21887,0.8335 -0.54468,1.0265 -0.8074,1.7748 -0.96033,2.735 -0.1444,0.9067 -0.25521,1.0653 -0.4702,0.6727 -0.0698,-0.1274 -0.21203,-0.2182 -0.31608,-0.2017 -0.15422,0.024 -0.17394,0.1149 -0.10668,0.4891 0.22796,1.2687 0.21615,1.4342 -0.20229,2.8371 -0.53663,1.7991 -0.67907,2.8598 -0.67907,5.0565 l 0,1.7998 -0.33252,0.3911 c -0.35328,0.4155 -0.41185,0.4526 -0.5369,0.3396 z m 3.73707,-1.1434 c -0.80489,-0.6687 -0.9435,-2.1816 -0.28553,-3.1164 0.16902,-0.2401 0.53965,-0.5793 0.82361,-0.7536 0.57325,-0.3519 1.69707,-1.5968 2.03198,-2.2508 0.11912,-0.2326 0.28407,-0.7736 0.36656,-1.2022 0.0825,-0.4287 0.19164,-0.8425 0.24256,-0.9199 0.17105,-0.2597 0.69596,-2.2723 0.8948,-3.4309 0.19147,-1.1155 0.18914,-2.9365 -0.005,-3.8872 l -0.0747,-0.3658 0.34896,0.3628 c 0.70421,0.7324 1.13592,3.0668 0.91728,4.96 l -0.0846,0.7328 -0.45512,-0.4682 c -0.40579,-0.4174 -0.46475,-0.4407 -0.54405,-0.2143 -0.0489,0.1396 -0.0267,0.491 0.0493,0.7809 0.20803,0.7931 0.16506,2.6985 -0.0907,4.0224 -0.28249,1.4621 -0.85854,3.4098 -1.01587,3.4348 -0.20089,0.032 -0.56402,-0.852 -0.57564,-1.4011 -0.006,-0.2862 0.0336,-0.7399 0.088,-1.0083 0.12546,-0.618 -0.0546,-0.615 -0.53608,0.01 -0.19151,0.2481 -0.51968,0.5693 -0.72927,0.7137 -0.6395,0.4408 -0.96241,1.3678 -0.99811,2.8655 -0.0164,0.6879 -0.0482,1.273 -0.0707,1.3005 -0.0225,0.027 -0.15646,-0.046 -0.29773,-0.1635 z m 37.9293,-7.4915 c -0.2473,-0.7858 -0.26203,-0.9655 -0.15291,-1.8644 0.0664,-0.5471 0.0824,-1.3696 0.0354,-1.8278 -0.0784,-0.7646 -0.0695,-0.8202 0.10765,-0.6781 0.10614,0.085 0.21902,0.1508 0.25084,0.1457 0.0318,-0.01 0.0557,-0.7029 0.0532,-1.5508 -0.004,-1.3193 0.0345,-1.652 0.26652,-2.3063 0.14913,-0.4205 0.31803,-0.8028 0.37534,-0.8495 0.0573,-0.047 0.23424,0.1366 0.39317,0.4074 0.25638,0.4367 0.27884,0.5791 0.19914,1.262 -0.0972,0.8324 -0.0315,1.8877 0.1376,2.2112 0.0779,0.1491 -0.002,0.3839 -0.30498,0.9004 -0.66415,1.1308 -0.91971,2.0487 -1.0085,3.6223 l -0.0789,1.3975 z m 14.39761,-1.882 c -0.10934,-0.1598 -0.18105,-0.4176 -0.15936,-0.5727 0.0297,-0.2124 0.0884,-0.142 0.23724,0.2845 0.22423,0.6424 0.20727,0.7052 -0.0779,0.2882 z m -31.99327,4.3983 c -0.11069,-0.1814 -0.19675,-0.4352 -0.19125,-0.5639 0.006,-0.1356 0.10928,-0.02 0.24624,0.275 0.27387,0.59 0.23934,0.7714 -0.055,0.2889 z m -14.26755,2.2438 c -0.27309,-0.3135 -0.35663,-1.0244 -0.27472,-2.3374 0.0458,-0.7344 0.0567,-1.6144 0.0242,-1.9555 -0.0488,-0.5124 -0.0317,-0.5971 0.0984,-0.4878 0.0867,0.073 0.18816,0.1276 0.22558,0.1216 0.0374,-0.01 0.0684,-0.7049 0.0688,-1.5533 5.8e-4,-1.3106 0.0415,-1.6574 0.27161,-2.3071 0.14894,-0.4205 0.31248,-0.7985 0.36343,-0.84 0.051,-0.041 0.23145,0.1277 0.40113,0.376 0.29265,0.4283 0.30198,0.4918 0.18154,1.2371 -0.0932,0.5766 -0.0897,1.0253 0.0133,1.6868 0.13778,0.8852 0.13455,0.9117 -0.18159,1.4937 -0.68033,1.2525 -0.89726,2.006 -0.97861,3.3989 -0.0597,1.0228 -0.10809,1.2876 -0.21313,1.167 z m 33.8045,-6.3584 c 0.11988,-1.5499 0.44747,-3.7515 0.63321,-4.2555 l 0.17248,-0.4681 0.21116,0.5961 c 0.15308,0.4321 0.21368,0.995 0.22034,2.0468 l 0.009,1.4509 -0.66016,0.7929 -0.66017,0.7929 z m -32.06423,4.8303 c 0.003,-0.4204 0.0479,-0.8141 0.35823,-3.1936 0.0779,-0.5973 0.23245,-1.3275 0.34347,-1.6227 l 0.20183,-0.5368 0.19836,0.8072 c 0.12166,0.4951 0.19835,1.31 0.19835,2.1077 l 0,1.3005 -0.65206,0.7873 -0.65206,0.7874 z m 43.58891,-7.2469 c -0.13446,-0.388 -0.19942,-0.8691 -0.1748,-1.2944 l 0.0392,-0.6769 0.20966,0.4482 c 0.15012,0.3208 0.19976,0.6883 0.1748,1.2943 l -0.0348,0.8462 z m 2.12893,-0.505 c -0.23818,-0.2628 -0.28579,-0.422 -0.23271,-0.7779 0.0806,-0.5401 -0.11189,-1.3996 -0.49088,-2.1919 -0.15393,-0.3219 -0.40087,-1.1254 -0.54875,-1.7857 -0.25124,-1.1218 -0.25886,-1.2771 -0.11622,-2.3701 0.24419,-1.8711 0.39072,-2.0767 0.52173,-0.732 0.0763,0.7829 0.39424,1.7503 0.66866,2.0344 0.15331,0.1587 0.21372,0.4415 0.22113,1.0351 0.007,0.5274 0.11667,1.1226 0.31064,1.6797 0.23006,0.6607 0.30044,1.1116 0.30044,1.9251 0,1.5544 -0.11062,1.7609 -0.63404,1.1833 z m -34.21276,4.6405 c -0.0811,-0.3507 -0.12929,-0.8955 -0.10703,-1.2107 l 0.0404,-0.573 0.20665,0.4548 c 0.21218,0.4669 0.29198,1.9214 0.10703,1.9507 -0.0548,0.01 -0.16599,-0.2711 -0.24711,-0.6218 z m 2.14341,-0.3754 c -0.17341,-0.2066 -0.22567,-0.4017 -0.17779,-0.6635 0.0771,-0.4218 -0.1297,-1.4343 -0.43539,-2.1313 -0.34278,-0.7816 -0.70242,-2.0488 -0.78204,-2.7557 -0.0651,-0.5782 0.0193,-1.4757 0.26316,-2.7976 0.10422,-0.5649 0.24256,-0.3371 0.31954,0.5261 0.0771,0.8649 0.42841,1.9241 0.74453,2.2449 0.14625,0.1485 0.18097,0.3315 0.129,0.6798 -0.0833,0.5581 0.0672,1.3645 0.40223,2.1549 0.31305,0.7386 0.29628,2.8492 -0.0236,2.9649 -0.10673,0.038 -0.30458,-0.062 -0.43967,-0.2225 z m 22.03694,-4.3759 c -0.008,-0.5246 -1.20696,-2.5809 -1.98484,-3.4886 -0.33423,-0.39 -0.38951,-0.5398 -0.32923,-0.8921 0.19545,-1.1423 -0.4078,-2.995 -1.40983,-4.3299 -0.74481,-0.9923 -1.52009,-2.2442 -1.44586,-2.3348 0.23124,-0.2823 2.63962,1.8376 3.48553,3.0681 0.7323,1.0651 1.39124,2.4618 1.68558,3.5728 0.34546,1.304 0.46122,4.0865 0.18734,4.5032 -0.18483,0.2811 -0.18483,0.1525 -0.18869,-0.099 z m -32.01405,4.4149 c 0,-0.478 -1.37411,-2.9052 -2.12852,-3.7598 -0.11834,-0.1341 -0.18622,-0.519 -0.2008,-1.1386 -0.0357,-1.5191 -0.36107,-2.3449 -1.69833,-4.3109 -0.65387,-0.9613 -1.18886,-1.7936 -1.18886,-1.8494 0,-0.2189 0.25295,-0.1166 0.91267,0.3692 2.08421,1.5346 3.52241,3.5886 4.25398,6.0754 0.27316,0.9285 0.32047,1.3277 0.33238,2.8045 0.01,1.2263 -0.0288,1.7742 -0.13432,1.9037 -0.11883,0.1458 -0.1482,0.1271 -0.1482,-0.094 z m 36.28549,-6.0881 c -0.10935,-0.1225 -0.10167,-0.2434 0.0346,-0.5449 0.44852,-0.9923 0.36734,-1.5742 -0.36058,-2.5847 -0.38862,-0.5395 -0.41842,-0.6448 -0.36791,-1.2996 0.0698,-0.9057 0.19052,-1.0608 0.67721,-0.8707 0.36615,0.143 0.37986,0.1378 0.71624,-0.2728 0.43599,-0.5322 0.55319,-1.2079 0.38546,-2.2221 -0.0722,-0.4365 -0.1118,-0.8174 -0.088,-0.8465 0.0237,-0.029 0.15142,0.045 0.28367,0.1645 0.54828,0.4954 0.81665,2.6346 0.63715,5.0787 -0.0942,1.2827 -0.10387,1.3186 -0.23525,0.8724 -0.16734,-0.5684 -0.46255,-0.8876 -0.77504,-0.838 -0.20576,0.033 -0.2246,0.093 -0.15492,0.4967 0.27312,1.5822 0.23348,2.2134 -0.16989,2.7058 -0.27838,0.3398 -0.39469,0.372 -0.5827,0.1612 z m -14.64553,1.6702 c -0.20268,-0.1831 -0.15959,-0.5304 0.17539,-1.4136 0.25688,-0.6774 0.42303,-0.8277 0.58597,-0.5302 0.18743,0.3422 0.14976,1.0999 -0.0767,1.543 -0.25221,0.4934 -0.4524,0.6107 -0.68466,0.4008 z m -17.36062,2.657 c -0.1155,-0.1295 -0.1031,-0.2534 0.0614,-0.6133 0.4079,-0.8923 0.26046,-1.674 -0.50316,-2.6677 -0.25979,-0.3381 -0.29518,-0.4951 -0.25402,-1.1263 0.0594,-0.9107 0.19419,-1.1042 0.61255,-0.8795 0.29056,0.1561 0.32741,0.1504 0.61536,-0.096 0.61091,-0.522 0.75468,-1.4294 0.45644,-2.8809 -0.0684,-0.3327 -0.0509,-0.3907 0.10575,-0.3518 0.32205,0.08 0.65633,0.9741 0.79076,2.1147 0.13785,1.1697 0.0406,4.2289 -0.13533,4.2568 -0.0557,0.01 -0.10123,-0.096 -0.10123,-0.2338 0,-0.1374 -0.15648,-0.4101 -0.34774,-0.6059 -0.52793,-0.5405 -0.64614,-0.2859 -0.47801,1.0292 0.12268,0.9596 0.11459,1.1145 -0.0822,1.5736 -0.23805,0.5552 -0.51412,0.7343 -0.74053,0.4805 z m -14.64096,1.6734 c -0.21512,-0.1944 -0.14881,-0.7415 0.18115,-1.4945 0.21696,-0.4953 0.42431,-0.7526 0.52965,-0.6574 0.15877,0.1434 0.18772,1.3589 0.0399,1.6756 -0.22918,0.4912 -0.52585,0.6794 -0.75071,0.4763 z m 31.524,-7.0334 c 0.26253,-1.7714 0.44886,-2.4525 0.78938,-2.886 0.37763,-0.4808 0.46409,-0.9905 0.29097,-1.7154 -0.13353,-0.5592 0.12825,-0.4997 0.44668,0.1014 0.28066,0.5299 0.32179,1.7806 0.088,2.6765 -0.14675,0.5624 -1.00052,1.8158 -1.46867,2.1562 -0.20033,0.1456 -0.21299,0.1168 -0.14636,-0.3327 z m -32.06017,4.322 c 0.41675,-2.136 0.51049,-2.4567 0.84402,-2.8864 0.37426,-0.4823 0.45806,-0.9937 0.28321,-1.7283 -0.0924,-0.3884 -0.0844,-0.4106 0.10057,-0.277 0.38734,0.28 0.57395,0.8308 0.56896,1.6793 -0.008,1.3547 -0.1918,1.8846 -0.98225,2.8314 -0.38318,0.459 -0.74458,0.8421 -0.80313,0.8514 -0.0609,0.01 -0.0657,-0.1918 -0.0114,-0.4704 z m 38.87723,-6.9387 c 0,-0.061 0.08,-0.1937 0.17783,-0.2954 0.14858,-0.1546 0.17784,-0.141 0.17784,0.082 0,0.1536 -0.0756,0.2792 -0.17784,0.2954 -0.0978,0.016 -0.17783,-0.022 -0.17783,-0.082 z" style="fill:url(#linearGradient120914);fill-opacity:1"/>
+      <path transform="matrix(0.06418734,0.02637803,-0.16989623,0.03548107,1065.4079,1635.9846)" style="opacity:0.29596414;fill:url(#linearGradient120916);fill-opacity:1;filter:url(#filter119916)" d="m -381.65793,1267.809 c 0.77672,-3.4305 44.70529,289.842 45.73844,284.1973 0.36902,-2.0161 -49.1092,-315.6131 -47.74717,-318.0709 2.13237,-3.848 2.30335,-4.7922 1.23066,-6.7966 0.38783,-3.8474 -0.45044,3.7704 0.55269,-6.3735 2.45457,-24.8205 7.86079,-53.2773 13.8162,-65.0297 3.3632,-6.637 11.72985,-15.195 22.89256,-21.1873 11.214,-6.0199 15.18177,-6.9406 15.18177,-14.6278 0,-2.8439 0.4872,-8.798 -0.37522,-11.7021 -0.86242,-2.9041 -1.76661,-6.6151 -1.46844,-6.3662 1.78093,1.4864 4.95887,4.1219 7.11676,10.5089 2.20758,6.534 3.51049,10.9175 -0.27251,18.3834 -1.91472,3.7787 -13.5744,13.8836 -13.58468,14.3129 -0.0103,0.4293 -6.703,34.611 -4.80004,36.2818 1.90295,1.6708 16.47215,-10.6273 17.92973,-7.6482 2.3519,4.8071 9.31349,-13.9992 8.84214,-7.5519 -0.29211,3.9957 -3.11303,8.1769 -3.84951,9.6721 l -1.80027,3.6549 6.24342,-2.4108 c 7.06291,-2.7271 9.43126,-16.0152 9.6766,-35.7892 0.24037,-19.3733 1.43975,-27.6426 6.7223,-39.5847 2.0219,-4.5709 5.33982,-5.2836 2.42067,-15.2402 l -0.24552,-4.5257 1.73952,2.2118 c 3.17899,4.0421 3.63062,0.1909 3.63062,-2.936 0,-5.415 3.74074,-18.6742 7.1629,-23.8284 4.41827,-6.6544 7.41108,-11.694 8.96399,-22.1349 1.38846,-9.3352 2.14349,-4.4891 2.37782,2.8802 0.18332,5.7652 -0.83203,10.7781 -3.06749,19.3878 -3.53198,13.6031 -5.28927,24.318 -3.64353,28.5346 1.67874,4.3011 1.14003,20.8111 2.96997,10.5789 1.79636,-10.0444 3.24353,11.3588 10.69264,2.4516 7.24892,-8.6679 -0.23749,-21.6346 2.01227,-19.352 4.51526,4.5811 4.48715,5.3457 5.29879,14.2777 1.19335,13.1328 -4.16019,18.374 -16.19994,28.2096 -2.52655,2.064 -0.42735,7.5105 0.0481,11.0549 0.795,5.9272 4.71716,4.0913 6.56871,-0.34 3.11509,-7.4555 6.67206,-12.1173 6.74874,-10.8954 0.0475,0.7566 1.19249,1.8151 2.27512,3.1915 1.08264,1.3763 2.37262,3.5533 3.05406,6.1011 0.68144,2.5479 3.14472,7.6165 3.50593,7.6165 0.65411,0 3.56364,-6.7439 5.57996,-13.4016 1.93769,-6.3982 4.72868,-21.0808 4.72868,-27.8293 0,-3.6624 0.002,-8.9816 -0.83933,-12.2111 -0.84118,-3.2295 -1.4696,-5.8596 -1.30276,-6.3601 2.17829,2.8681 2.26269,1.9995 4.95834,6.9523 4.62043,8.4893 5.83259,15.115 5.48864,33.6791 -0.29272,15.7992 -1.53733,21.2393 2.50733,24.9894 l 5.49746,5.0971 0.114,-12.2299 c 0.0854,-9.1634 1.20775,-14.2522 3.30522,-19.4503 3.03562,-7.523 3.76355,-9.0959 1.73609,-11.7765 -1.57601,-2.0836 -2.2949,-3.4386 -0.96603,-3.4386 0.44488,0 0.83893,0.1014 1.90655,0.909 2.51245,1.9003 4.57399,1.1442 6.13443,-0.7358 2.10046,-2.5309 0.23963,-1.0938 0.23963,3.3955 0,3.6563 0.71879,3.2115 3.94551,6.3623 2.08569,2.0366 3.10284,5.3851 7.54221,5.5822 3.12939,0.1389 0.12876,-17.4624 -1.73995,-22.8597 -0.95214,-2.75 -5.27235,-11.1387 -9.88161,-18.1542 -7.61684,-11.593 -11.72561,-17.3034 -11.72561,-18.7192 0,-3.1136 10.68836,6.2728 19.04215,15.4765 11.71548,12.9074 19.23107,27.3454 23.79787,43.1309 1.94015,6.7063 3.28125,10.1611 3.28353,23.3274 7.7e-4,3.5489 -3.89002,11.5149 -2.15854,13.4853 1.62888,1.8536 8.57072,-3.1464 13.86816,-7.2915 3.35775,-2.6274 5.21139,-18.8273 5.01605,-16.13 -0.18183,0.5656 -0.5098,13.644 -2.76733,16.0496 -5.40917,5.7639 -14.41256,14.79 -15.68058,17.3999 -2.49456,5.1344 3.08301,8.0594 4.2098,8.0594 2.66534,0 22.55827,-19.0854 24.24516,-21.5621 0.29621,-0.4349 3.04733,-4.7146 4.80382,-6.7152 2.60817,-2.9705 4.26233,-5.8954 4.58286,-10.5077 0.36808,-5.2966 0.73687,-6.4597 -3.32435,-12.4755 -4.67747,-6.9287 -6.46424,-8.09 -3.99071,-15.5848 1.23159,-3.7318 1.21542,-5.2705 3.23509,-2.8369 2.0611,2.4834 6.46393,2.0854 8.07867,-1.0372 2.53694,-4.9059 4.79496,-8.9065 3.0927,-15.551 -1.99417,-7.784 -1.31098,-11.4425 1.53961,-6.3609 3.30361,5.8891 5.36676,9.0229 5.02646,39.6432 -0.32806,29.5197 0.61197,29.0316 6.64582,36.4955 3.92813,4.8592 6.79875,4.6677 6.82505,-1.7734 0.0174,-4.2676 -0.27301,-0.4385 2.02994,2.8309 1.34541,1.91 2.1895,3.0306 3.00146,1.7573 0.52607,-0.825 1.88351,-7.4067 1.89193,-8.5286 0.008,-1.122 0.42302,-4.479 1.29619,-7.757 1.4731,-5.5304 1.91873,-7.1372 0.25983,-15.7357 -1.56393,-8.1062 -1.56055,-9.9421 -0.50861,-18.2708 1.91662,-15.1748 3.51424,-16.0775 3.51424,-4.1978 0,6.5446 1.17024,8.6124 3.14593,12.3834 l 2.344506,4.475 3.19565,0.1352 1.35541,-1.5836 1.3945,2.2991 c 1.19475,1.9699 2.1142,2.7175 2.52527,2.7175 2.92175,0 3.83879,-16.4074 0.29349,-25.4558 -1.98892,-5.0762 -2.87778,-7.5215 -2.87778,-15.8133 0,-5.5437 -0.22519,-8.0773 0.24931,-8.0773 0.4745,0 0.8689,0.3682 2.56334,3.8057 1.69444,3.4375 5.04943,8.3411 7.64296,11.3661 5.25964,6.1346 8.26364,12.9736 9.28269,19.3696 0.73986,4.6436 1.23348,7.4336 4.05202,5.3001 1.63134,-2.205 1.68294,-2.5272 1.69204,2.0678 0.01,4.8346 0.55859,8.9957 2.71107,11.8158 1.27193,1.6665 4.05615,1.0067 4.92562,-0.2927 1.46449,-2.1887 1.16183,-11.3921 -0.11114,-16.0817 -1.97451,-7.2741 -2.66976,-7.7807 3.8756,0.669 l 4.64497,5.9965 2.15817,-1.986 c 0.80745,-1.705 1.625,-2.7886 2.09794,-2.631 0.47293,0.1576 0.65396,1.3645 1.90174,4.9354 2.39,6.8398 6.884059,12.7196 8.336159,12.7196 0.47626,0 1.68511,-1.4263 1.9366,-2.6638 2.10914,-10.3788 2.71978,-14.7197 4.7836,-19.3691 2.029,-4.5711 4.4162,-7.3595 3.94665,-12.346 -0.31075,-3.3 0.37365,-4.7439 0.0214,-6.2564 -0.86896,-3.7315 -0.18662,-3.9822 2.70936,-0.3126 3.063941,3.8823 1.604951,3.0592 2.398061,-2.9237 1.00081,-7.5497 3.77267,-19.708 7.27981,-24.8055 3.91142,-5.685 7.5685401,-11.7422 9.0034001,-21.431 1.38191,-9.3311 -0.21798,-7.9983 1.20591,-2.8702 2.10328,7.5749 0.71031,12.642 -2.70023,25.2196 -3.4371801,12.6759 -3.6999901,29.8031 -1.34789,32.1654 1.59057,1.5975 4.76419,6.6802 6.29477,-2.9685 -0.22005,11.5077 1.59030003,5.982 6.44381,12.6681 3.76747,5.19 6.6938399,-7.6138 6.7922199,-3.9689 0.33515,11.6216 -3.5421399,13.3372 -13.9166899,24.0666 -2.30526,2.384 -4.10195,3.0542 -2.27549,12.4779 1.16835,6.0281 3.62107,4.2064 5.53542003,-0.3799 2.08500997,-4.9951 4.53862997,-11.0222 6.38373997,-11.0222 0.77878,0 1.56932,-0.1673 1.56932,0.3945 0,0.5618 1.63148,1.9131 2.9694999,3.9638 1.338,2.0507 2.27803,4.6976 2.65122,6.7601 0.37319,2.0625 2.19138,6.6653 2.63468,6.6653 0.4433,0 3.0241,-4.2826 3.86077,-6.6201 6.2882,-17.568 8.56503,-35.7616 5.49067,-48.8039 -0.82902,-3.517 -0.66172,-4.3691 -0.37793,-4.6529 0.6219,-0.2206 1.28001,0.9244 3.77339,4.8801 5.13103,8.1401 5.46149,10.9382 5.61158,30.6317 0.0775,10.175 0.95266,23.176 1.38239,25.101 0.89411,4.0051 6.22393,10.4001 6.9084,9.7156 0.25305,-0.253 0.12322,-6.9337 0.27378,-12.6443 0.17217,-6.5304 -0.0579,-11.1381 0.93972,-13.6539 0.87235,-2.2 2.94936,-7.0807 3.67842,-8.8682 1.09342,-2.6809 1.86379,-4.1379 0.78727,-6.8187 -2.32694,-5.795 -3.0638,-4.3869 -1.48594,-4.3869 0.82181,0 2.36109,0.1433 3.04578,0.9683 1.71801,2.07 1.14715,2.1831 3.7183,0.2663 1.87629,-1.3987 2.81229,-4.7089 2.17247,0.061 -0.49568,3.6956 2.10364,7.3636 5.59843,10.9426 2.11377,2.1647 5.952219,2.5995 6.468134,2.5995 1.59113,0 -0.288015,-17.0391 -2.421371,-22.6006 -1.094633,-2.8536 -4.975793,-10.6721 -8.812233,-16.3435 -8.62667,-12.7528 -9.11547,-16.0959 -12.53862,-20.4959 2.60779,-0.667 15.12354,10.4481 24.567824,22.9816 6.900008,9.157 14.545518,22.7147 17.528508,32.8286 2.63913,8.9479 5.22866,28.3209 3.45816,36.6639 9.43723,-2.0459 20.542842,-6.1858 21.414862,-19.2481 0.6767,-1.3981 2.09711,9.8363 -2.24465,14.4004 -5.6113,5.8987 -17.627402,13.3362 -20.543582,17.9679 -1.83795,2.9192 3.65852,6.8238 4.01728,7.0456 2.26659,1.4008 19.222302,-11.9878 22.564762,-18.5234 1.12513,-2.2 5.73758,-8.3004 6.68868,-8.9702 2.40776,-1.6958 5.84056,-9.0923 4.72904,-12.968 -0.48993,-1.7083 -2.35034,-7.5057 -4.32168,-10.0875 -3.95591,-5.1809 -4.79558,-6.1231 -4.26619,-13.7723 0.30201,-4.3638 2.47734,-6.3352 4.535,-3.8558 0.68469,0.825 2.87644,1.1585 4.12084,1.1585 5.11262,0 9.28452,-8.0485 6.65704,-17.7494 -0.81932,-3.025 -1.62569,-8.5013 -1.22963,-8.9087 1.19167,-1.2258 1.83262,1.1785 3.90981,5.2502 3.41612,6.6961 3.73132,16.3195 2.98843,41.6524 -0.54415,18.556 1.53858,22.6069 2.56175,24.5385 2.20829,4.169 8.16668,10.9693 9.10383,10.3901 0.48836,-0.3018 0.88793,-2.5472 0.88793,-4.9898 0,-4.8519 0.96762,-5.8185 3.25494,-2.5529 2.10998,3.0124 4.56373,3.0495 5.28783,-3.1114 0.34756,-2.9572 1.59369,-7.5405 2.37158,-9.7452 1.26806,-3.5941 1.43416,-4.5849 -0.27406,-10.7453 -2.28232,-8.2308 -3.43996,-8.5629 -1.43224,-19.377 2.42078,-13.0389 1.64731,-17.3573 3.3823,-8.9603 1.37608,6.6598 2.27087,13.6131 4.66793,17.2683 l 1.95843,2.9863 2.48376,0.8597 c 0.92484,-0.9342 1.11843,-2.6632 1.99606,-0.7001 0.84082,1.8806 3.05937,3.8096 3.5537,3.7955 4.34917,-0.1245 3.27673,-17.9787 -0.46477,-27.9123 -1.56485,-4.1547 -2.46294,-5.0904 -2.4876,-12.4554 -0.019,-5.6596 -0.0774,-9.2013 0.47799,-9.2411 0.68724,-0.049 0.2885,0.2267 1.75074,3.3176 1.46224,3.0909 3.22272,7.0839 5.50535,9.9055 7.23631,8.9449 10.26051,10.6964 11.58335,17.7209 0.71559,3.8 1.8815,9.0577 1.98603,9.2392 0.10453,0.1814 1.05542,1.1134 2.4953,0.17 0.7982,-1.5816 1.96984,-2.758 1.83916,0.067 -0.24699,5.3393 0.17984,9.3401 4.27297,17.4679 3.42033,6.7919 5.44432,17.162 6.64866,25.8549 0.51545,3.7205 2.46936,6.2504 3.36355,5.3561 0.80858,-0.8086 5.9506,-6.1395 4.23504,-19.315 -2.06501,-15.8592 -2.16894,-20.8712 -0.63415,-24.8902 1.00747,-2.6382 1.83357,-5.1248 2.36592,-4.9473 0.53234,0.1774 0.31852,-0.3042 1.2478,2.4315 2.66182,7.8362 8.58967,17.6156 16.98302,28.0935 4.25606,5.3131 8.68108,11.6528 10.09847,14.1278 7.46458,13.0344 7.30644,27.4822 -0.0657,40.2356 l -2.20902,3.8215 3.87164,9.4767 c 5.54105,13.563 18.839,225.713 9.48249,238.0747 -82.88145,0 -639.46573,83.4363 -705.45687,87.1724 z m 550.40286,-109.7426 c -0.65964,-2.7497 -1.82394,-5.8236 -2.58734,-6.8309 -1.29984,-1.7151 -1.39001,-1.6683 -1.4198,0.7371 -0.0548,4.4294 2.99086,13.3088 4.163,12.1367 0.72464,-0.7247 0.67701,-2.5711 -0.15586,-6.0429 z m -270.41501,-6.6707 c -2.09927,-8.039 -4.08857,-9.7139 -3.20838,-2.7014 0.79002,6.2942 2.56058,10.6336 3.82345,9.3707 0.52435,-0.5243 0.27033,-3.2787 -0.61507,-6.6693 z m 162.390356,-5.5197 c 1.09214,-2.1407 1.9857,-4.8832 1.9857,-6.0942 0,-2.9592 -4.85204,-11.0931 -6.32611,-10.605 -1.56686,0.5188 -2.12059,17.024 -0.66254,19.7484 1.36805,2.5563 2.49309,1.8706 5.00295,-3.0492 z m -269.932136,-6.3453 c 2.5099,-5.5272 2.39954,-7.1544 -0.83216,-12.27 -4.30877,-6.8205 -5.25,-5.8446 -5.25,5.4434 0,13.0852 2.14623,15.4941 6.08216,6.8266 z" id="path12387-7" inkscape:connector-curvature="0" sodipodi:nodetypes="ssccsssssssscsssscsssscssssssssssssssscssssscssscsscsccsssssssscsscsssscssscsssssssccssssscccsssssssscsccssccsssscssssssssscscsssssssssscssscssscscsssssscssccsscscssscsssssscssscssssccssssssssccssscsscsssscsccssccssccscscscsssss"/>
+      <path id="rect9610-2" style="fill:url(#linearGradient120918);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.41835,1644.6483 66.42639,-9.9437 0,58.0477 -66.42639,-14.4294 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect9622-0" style="fill:#550000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 840.8447,1634.7046 9.38838,1.0038 0,54.969 -9.38834,2.0749 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1638.4168 -66.4096,8.1505" id="path9628-1" inkscape:path-effect="#path-effect26872" inkscape:original-d="m 840.84474,1638.4168 -66.4096,8.1505" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1642.3724 -66.35392,6.3415" id="path9632-5" inkscape:path-effect="#path-effect26869" inkscape:original-d="m 840.84474,1642.3724 -66.35392,6.3415" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1646.0612 -66.29071,4.703" id="path9636-3" inkscape:path-effect="#path-effect26866" inkscape:original-d="m 840.84474,1646.0612 -66.29071,4.703" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1649.7552 -66.28606,3.1191" id="path9640-5" inkscape:path-effect="#path-effect26863" inkscape:original-d="m 840.84474,1649.7552 -66.28606,3.1191" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1653.6057 -66.26623,1.3876" id="path9644-65" inkscape:path-effect="#path-effect26860" inkscape:original-d="m 840.84474,1653.6057 -66.26623,1.3876" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1657.2492 -66.28765,-0.2026" id="path9648-4" inkscape:path-effect="#path-effect26857" inkscape:original-d="m 840.84474,1657.2492 -66.28765,-0.2026" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1660.8749 -66.26587,-1.7232" id="path9652-6" inkscape:path-effect="#path-effect26854" inkscape:original-d="m 840.84474,1660.8749 -66.26587,-1.7232" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1664.4941 -66.24463,-3.2276" id="path9656-8" inkscape:path-effect="#path-effect26851" inkscape:original-d="m 840.84474,1664.4941 -66.24463,-3.2276" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1668.3032 -66.26761,-4.765" id="path9660-1" inkscape:path-effect="#path-effect26848" inkscape:original-d="m 840.84474,1668.3032 -66.26761,-4.765" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1671.9657 -66.28341,-6.2646" id="path9664-5" inkscape:path-effect="#path-effect26845" inkscape:original-d="m 840.84474,1671.9657 -66.28341,-6.2646" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1675.1888 -66.24471,-7.4855" id="path9668-8" inkscape:path-effect="#path-effect26842" inkscape:original-d="m 840.84474,1675.1888 -66.24471,-7.4855" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1678.9978 -66.21668,-9.0884" id="path9672-53" inkscape:path-effect="#path-effect26839" inkscape:original-d="m 840.84474,1678.9978 -66.21668,-9.0884" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1682.6293 -66.29429,-10.5569" id="path9676-3" inkscape:path-effect="#path-effect26836" inkscape:original-d="m 840.84474,1682.6293 -66.29429,-10.5569" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1685.9694 -66.33177,-11.821" id="path9680-2" inkscape:path-effect="#path-effect26833" inkscape:original-d="m 840.84474,1685.9694 -66.33177,-11.821" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1689.2456 -66.28714,-12.966" id="path9684-8" inkscape:path-effect="#path-effect26830" inkscape:original-d="m 840.84474,1689.2456 -66.28714,-12.966" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 833.92588,1635.7427 0,3.3334" id="path9688-7" inkscape:path-effect="#path-effect26827" inkscape:original-d="m 833.92588,1635.7427 0,3.3334" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 828.00027,1636.6319 0,3.3334" inkscape:path-effect="#path-effect26824" id="path9692-6" d="m 828.00027,1636.6319 0,3.3334" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 821.91592,1637.5449 0,3.3333" id="path9696-9" inkscape:path-effect="#path-effect26821" inkscape:original-d="m 821.91592,1637.5449 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 815.96635,1638.4377 0,3.0697" inkscape:path-effect="#path-effect26818" id="path9700-6" d="m 815.96635,1638.4377 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 810.08683,1639.3199 0,3.0697" id="path9704-4" inkscape:path-effect="#path-effect26815" inkscape:original-d="m 810.08683,1639.3199 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 804.35805,1640.1795 0,2.7353" inkscape:path-effect="#path-effect26812" id="path9708-6" d="m 804.35805,1640.1795 0,2.7353" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 799.01959,1640.9806 0,2.7352" id="path9712-3" inkscape:path-effect="#path-effect26809" inkscape:original-d="m 799.01959,1640.9806 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 794.05801,1641.7251 0,2.2507" inkscape:path-effect="#path-effect26806" id="path9716-2" d="m 794.05801,1641.7251 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 789.00725,1642.483 0,2.2507" id="path9720-1" inkscape:path-effect="#path-effect26803" inkscape:original-d="m 789.00725,1642.483 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 783.80163,1643.2641 0,2.2507" inkscape:path-effect="#path-effect26800" id="path9724-0" d="m 783.80163,1643.2641 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 778.86121,1644.0054 0,2.2508" id="path9728-5" inkscape:path-effect="#path-effect26797" inkscape:original-d="m 778.86121,1644.0054 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 831.39829,1639.7928 0,3.3333" inkscape:path-effect="#path-effect26794" id="path9760-8" d="m 831.39829,1639.7928 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 825.47269,1640.5133 0,3.3333" id="path9762-7" inkscape:path-effect="#path-effect26791" inkscape:original-d="m 825.47269,1640.5133 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 819.38834,1641.253 0,3.3334" inkscape:path-effect="#path-effect26788" id="path9764-0" d="m 819.38834,1641.253 0,3.3334" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 813.43877,1641.9764 0,3.0698" id="path9766-0" inkscape:path-effect="#path-effect26785" inkscape:original-d="m 813.43877,1641.9764 0,3.0698" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 807.55925,1642.6913 0,3.0697" inkscape:path-effect="#path-effect26782" id="path9768-3" d="m 807.55925,1642.6913 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 801.83047,1643.3878 0,2.7353" id="path9770-7" inkscape:path-effect="#path-effect26779" inkscape:original-d="m 801.83047,1643.3878 0,2.7353" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 796.49201,1644.0369 0,2.7352" inkscape:path-effect="#path-effect26776" id="path9772-3" d="m 796.49201,1644.0369 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 791.53042,1644.6401 0,2.2508" id="path9774-4" inkscape:path-effect="#path-effect26773" inkscape:original-d="m 791.53042,1644.6401 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 786.47967,1645.2543 0,2.2507" inkscape:path-effect="#path-effect26770" id="path9776-6" d="m 786.47967,1645.2543 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 781.27405,1645.8872 0,2.2507" id="path9778-2" inkscape:path-effect="#path-effect26767" inkscape:original-d="m 781.27405,1645.8872 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 776.33363,1646.4878 0,2.2507" inkscape:path-effect="#path-effect26764" id="path9780-0" d="m 776.33363,1646.4878 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 838.34918,1638.8605 0,3.549" id="path9832-11" inkscape:path-effect="#path-effect26761" inkscape:original-d="m 838.34918,1638.8605 0,3.549" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 834.01064,1643.0244 0,3.3334" inkscape:path-effect="#path-effect26758" id="path9840-65" d="m 834.01064,1643.0244 0,3.3334" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 828.08503,1643.5905 0,3.3333" id="path9842-34" inkscape:path-effect="#path-effect26755" inkscape:original-d="m 828.08503,1643.5905 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 822.00069,1644.1717 0,3.3333" inkscape:path-effect="#path-effect26752" id="path9844-9" d="m 822.00069,1644.1717 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 816.05111,1644.7399 0,3.0698" id="path9846-53" inkscape:path-effect="#path-effect26749" inkscape:original-d="m 816.05111,1644.7399 0,3.0698" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 810.17159,1645.3016 0,3.0697" inkscape:path-effect="#path-effect26746" id="path9848-43" d="m 810.17159,1645.3016 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 804.44281,1645.8488 0,2.7353" id="path9850-7" inkscape:path-effect="#path-effect26743" inkscape:original-d="m 804.44281,1645.8488 0,2.7353" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 799.10436,1646.3587 0,2.7353" inkscape:path-effect="#path-effect26740" id="path9852-7" d="m 799.10436,1646.3587 0,2.7353" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 794.14277,1646.9496 0,2.2508" id="path9854-0" inkscape:path-effect="#path-effect26737" inkscape:original-d="m 794.14277,1646.9496 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 789.09202,1647.3151 0,2.2507" inkscape:path-effect="#path-effect26734" id="path9856-9" d="m 789.09202,1647.3151 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 783.8864,1647.8124 0,2.2507" id="path9858-1" inkscape:path-effect="#path-effect26731" inkscape:original-d="m 783.8864,1647.8124 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 778.94597,1648.2842 0,2.2507" inkscape:path-effect="#path-effect26728" id="path9860-5" d="m 778.94597,1648.2842 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 831.48306,1646.9366 0,3.3334" id="path9876-4" inkscape:path-effect="#path-effect26725" inkscape:original-d="m 831.48306,1646.9366 0,3.3334" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 825.55745,1647.3339 0,3.3334" inkscape:path-effect="#path-effect26722" id="path9878-0" d="m 825.55745,1647.3339 0,3.3334" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 819.4731,1647.742 0,3.3333" id="path9880-0" inkscape:path-effect="#path-effect26719" inkscape:original-d="m 819.4731,1647.742 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 813.52353,1648.1409 0,3.0697" inkscape:path-effect="#path-effect26716" id="path9882-71" d="m 813.52353,1648.1409 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 807.64401,1648.5351 0,3.0697" id="path9884-2" inkscape:path-effect="#path-effect26713" inkscape:original-d="m 807.64401,1648.5351 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 801.91523,1648.9192 0,2.7353" inkscape:path-effect="#path-effect26710" id="path9886-37" d="m 801.91523,1648.9192 0,2.7353" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 796.57677,1649.2772 0,2.7352" id="path9888-7" inkscape:path-effect="#path-effect26707" inkscape:original-d="m 796.57677,1649.2772 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 791.61519,1649.6099 0,2.2507" inkscape:path-effect="#path-effect26704" id="path9890-3" d="m 791.61519,1649.6099 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 786.56443,1649.9485 0,2.2508" id="path9892-3" inkscape:path-effect="#path-effect26701" inkscape:original-d="m 786.56443,1649.9485 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 781.35881,1650.2976 0,2.2507" inkscape:path-effect="#path-effect26698" id="path9894-3" d="m 781.35881,1650.2976 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 776.41839,1650.6287 0,2.2508" id="path9896-9" inkscape:path-effect="#path-effect26695" inkscape:original-d="m 776.41839,1650.6287 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 838.43395,1646.3833 0,3.5491" inkscape:path-effect="#path-effect26692" id="path9910-1" d="m 838.43395,1646.3833 0,3.5491" style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 833.92588,1650.1453 0,3.3333" inkscape:path-effect="#path-effect26689" id="path9988-5" d="m 833.92588,1650.1453 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 828.00027,1650.4097 0,3.3333" id="path9990-8" inkscape:path-effect="#path-effect26686" inkscape:original-d="m 828.00027,1650.4097 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 821.91592,1650.6813 0,3.3333" inkscape:path-effect="#path-effect26683" id="path9992-8" d="m 821.91592,1650.6813 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 815.96635,1650.9467 0,3.0697" id="path9994-8" inkscape:path-effect="#path-effect26680" inkscape:original-d="m 815.96635,1650.9467 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 810.08683,1651.209 0,3.0697" inkscape:path-effect="#path-effect26677" id="path9996-0" d="m 810.08683,1651.209 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 804.35805,1651.4647 0,2.7352" id="path9998-2" inkscape:path-effect="#path-effect26674" inkscape:original-d="m 804.35805,1651.4647 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 799.01959,1651.7028 0,2.7352" inkscape:path-effect="#path-effect26671" id="path10000-44" d="m 799.01959,1651.7028 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 794.05801,1652.2172 0,2.2508" id="path10002-33" inkscape:path-effect="#path-effect26668" inkscape:original-d="m 794.05801,1652.2172 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 789.00725,1652.1496 0,2.2507" inkscape:path-effect="#path-effect26665" id="path10004-6" d="m 789.00725,1652.1496 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 783.80163,1652.3819 0,2.2507" id="path10006-7" inkscape:path-effect="#path-effect26662" inkscape:original-d="m 783.80163,1652.3819 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 778.86121,1652.6023 0,2.2508" inkscape:path-effect="#path-effect26659" id="path10008-6" d="m 778.86121,1652.6023 0,2.2508" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 831.39829,1653.9289 0,3.3333" id="path10024-6" inkscape:path-effect="#path-effect26656" inkscape:original-d="m 831.39829,1653.9289 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 825.47269,1654.0246 0,3.3333" inkscape:path-effect="#path-effect26653" id="path10026-1" d="m 825.47269,1654.0246 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 819.38834,1654.1229 0,3.3333" id="path10028-4" inkscape:path-effect="#path-effect26650" inkscape:original-d="m 819.38834,1654.1229 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 813.43877,1654.2189 0,3.0698" inkscape:path-effect="#path-effect26647" id="path10030-8" d="m 813.43877,1654.2189 0,3.0698" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 807.55925,1654.3139 0,3.0698" id="path10032-1" inkscape:path-effect="#path-effect26644" inkscape:original-d="m 807.55925,1654.3139 0,3.0698" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 801.83047,1654.4064 0,2.7353" inkscape:path-effect="#path-effect26641" id="path10034-6" d="m 801.83047,1654.4064 0,2.7353" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 796.49201,1654.4927 0,2.7352" id="path10036-5" inkscape:path-effect="#path-effect26638" inkscape:original-d="m 796.49201,1654.4927 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 791.53042,1654.5727 0,2.2508" inkscape:path-effect="#path-effect26635" id="path10038-9" d="m 791.53042,1654.5727 0,2.2508" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 786.47967,1654.6543 0,2.2508" id="path10040-6" inkscape:path-effect="#path-effect26632" inkscape:original-d="m 786.47967,1654.6543 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 781.27405,1654.7385 0,2.2507" inkscape:path-effect="#path-effect26629" id="path10042-8" d="m 781.27405,1654.7385 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 776.33363,1654.8182 0,2.2507" id="path10044-7" inkscape:path-effect="#path-effect26626" inkscape:original-d="m 776.33363,1654.8182 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 838.34918,1653.7294 0,3.5491" inkscape:path-effect="#path-effect26623" id="path10058-1" d="m 838.34918,1653.7294 0,3.5491" style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 834.01064,1657.4359 0,3.3334" id="path10062-9" inkscape:path-effect="#path-effect26620" inkscape:original-d="m 834.01064,1657.4359 0,3.3334" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 828.08503,1657.3772 0,3.3333" inkscape:path-effect="#path-effect26617" id="path10064-1" d="m 828.08503,1657.3772 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 822.00069,1657.3169 0,3.3334" id="path10066-6" inkscape:path-effect="#path-effect26614" inkscape:original-d="m 822.00069,1657.3169 0,3.3334" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 816.05111,1657.2579 0,3.0697" inkscape:path-effect="#path-effect26611" id="path10068-7" d="m 816.05111,1657.2579 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 810.17159,1657.1996 0,3.0697" id="path10070-6" inkscape:path-effect="#path-effect26608" inkscape:original-d="m 810.17159,1657.1996 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 804.44281,1657.1429 0,2.7352" inkscape:path-effect="#path-effect26605" id="path10072-37" d="m 804.44281,1657.1429 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 799.10436,1657.0899 0,2.7352" id="path10074-1" inkscape:path-effect="#path-effect26602" inkscape:original-d="m 799.10436,1657.0899 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 794.14277,1657.248 0,2.2507" inkscape:path-effect="#path-effect26599" id="path10076-2" d="m 794.14277,1657.248 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 789.09202,1656.9906 0,2.2507" id="path10078-7" inkscape:path-effect="#path-effect26596" inkscape:original-d="m 789.09202,1656.9906 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 783.8864,1656.9391 0,2.2507" inkscape:path-effect="#path-effect26593" id="path10080-9" d="m 783.8864,1656.9391 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 778.94597,1656.89 0,2.2508" id="path10082-4" inkscape:path-effect="#path-effect26590" inkscape:original-d="m 778.94597,1656.89 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 831.48306,1660.847 0,3.3334" inkscape:path-effect="#path-effect26587" id="path10098-7" d="m 831.48306,1660.847 0,3.3334" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 825.55745,1660.6195 0,3.3334" id="path10100-1" inkscape:path-effect="#path-effect26584" inkscape:original-d="m 825.55745,1660.6195 0,3.3334" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 819.4731,1660.3861 0,3.3333" inkscape:path-effect="#path-effect26581" id="path10102-82" d="m 819.4731,1660.3861 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 813.52353,1660.2168 0,3.0697" id="path10104-4" inkscape:path-effect="#path-effect26578" inkscape:original-d="m 813.52353,1660.2168 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 807.64401,1659.9326 0,3.0697" inkscape:path-effect="#path-effect26575" id="path10106-8" d="m 807.64401,1659.9326 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 801.91523,1659.9467 0,2.7353" id="path10108-8" inkscape:path-effect="#path-effect26572" inkscape:original-d="m 801.91523,1659.9467 0,2.7353" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 796.57677,1659.7418 0,2.7353" inkscape:path-effect="#path-effect26569" id="path10110-1" d="m 796.57677,1659.7418 0,2.7353" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 791.61519,1659.5515 0,2.2507" id="path10112-6" inkscape:path-effect="#path-effect26566" inkscape:original-d="m 791.61519,1659.5515 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 786.56443,1659.3576 0,2.2507" inkscape:path-effect="#path-effect26563" id="path10114-2" d="m 786.56443,1659.3576 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 781.35881,1659.1578 0,2.2507" id="path10116-0" inkscape:path-effect="#path-effect26560" inkscape:original-d="m 781.35881,1659.1578 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 776.41839,1658.968 0,2.2508" inkscape:path-effect="#path-effect26557" id="path10118-4" d="m 776.41839,1658.968 0,2.2508" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 838.43395,1661.0266 0,3.5491" id="path10132-8" inkscape:path-effect="#path-effect26554" inkscape:original-d="m 838.43395,1661.0266 0,3.5491" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 833.92588,1664.3584 0,3.3333" inkscape:path-effect="#path-effect26551" id="path10284-5" d="m 833.92588,1664.3584 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 828.08504,1664.1032 0,3.3334" id="path10286-9" inkscape:path-effect="#path-effect26548" inkscape:original-d="m 828.08504,1664.1032 0,3.3334" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 821.91592,1663.6844 0,3.3333" inkscape:path-effect="#path-effect26545" id="path10288-44" d="m 821.91592,1663.6844 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 815.96635,1663.3242 0,3.0697" id="path10290-49" inkscape:path-effect="#path-effect26542" inkscape:original-d="m 815.96635,1663.3242 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 810.08683,1663.1232 0,3.0697" inkscape:path-effect="#path-effect26539" id="path10292-9" d="m 810.08683,1663.1232 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 804.35805,1662.7228 0,2.7353" id="path10294-45" inkscape:path-effect="#path-effect26536" inkscape:original-d="m 804.35805,1662.7228 0,2.7353" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 799.01959,1662.6533 0,2.7352" inkscape:path-effect="#path-effect26533" id="path10296-3" d="m 799.01959,1662.6533 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 794.05801,1662.3962 0,2.2507" id="path10298-2" inkscape:path-effect="#path-effect26530" inkscape:original-d="m 794.05801,1662.3962 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 789.00725,1662.1346 0,2.2507" inkscape:path-effect="#path-effect26527" id="path10300-1" d="m 789.00725,1662.1346 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 783.80163,1662.072 0,2.2507" id="path10302-7" inkscape:path-effect="#path-effect26524" inkscape:original-d="m 783.80163,1662.072 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 778.86121,1661.816 0,2.2508" inkscape:path-effect="#path-effect26521" id="path10304-4" d="m 778.86121,1661.816 0,2.2508" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 831.39829,1667.8983 0,3.3333" id="path10320-3" inkscape:path-effect="#path-effect26518" inkscape:original-d="m 831.39829,1667.8983 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 825.47269,1667.2153 0,3.3333" inkscape:path-effect="#path-effect26515" id="path10322-1" d="m 825.47269,1667.2153 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 819.38834,1666.8304 0,3.3333" id="path10324-9" inkscape:path-effect="#path-effect26512" inkscape:original-d="m 819.38834,1666.8304 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 813.43877,1666.301 0,3.0697" inkscape:path-effect="#path-effect26509" id="path10326-0" d="m 813.43877,1666.301 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 807.55925,1665.8808 0,3.0697" id="path10328-7" inkscape:path-effect="#path-effect26506" inkscape:original-d="m 807.55925,1665.8808 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 801.83047,1665.5245 0,2.7352" inkscape:path-effect="#path-effect26503" id="path10330-3" d="m 801.83047,1665.5245 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 796.49201,1665.2512 0,2.7353" id="path10332-8" inkscape:path-effect="#path-effect26500" inkscape:original-d="m 796.49201,1665.2512 0,2.7353" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 791.53042,1665.0082 0,2.2507" inkscape:path-effect="#path-effect26497" id="path10334-4" d="m 791.53042,1665.0082 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 786.47967,1664.6027 0,2.2508" id="path10336-2" inkscape:path-effect="#path-effect26494" inkscape:original-d="m 786.47967,1664.6027 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 781.27405,1664.1849 0,2.2507" inkscape:path-effect="#path-effect26491" id="path10338-6" d="m 781.27405,1664.1849 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 776.33363,1663.7881 0,2.2508" id="path10340-9" inkscape:path-effect="#path-effect26488" inkscape:original-d="m 776.33363,1663.7881 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 838.34918,1668.369 0,3.549" inkscape:path-effect="#path-effect26485" id="path10354-8" d="m 838.34918,1668.369 0,3.549" style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 833.92588,1671.3464 0,3.3333" id="path10358-7" inkscape:path-effect="#path-effect26482" inkscape:original-d="m 833.92588,1671.3464 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 828.08503,1670.6644 0,3.3333" inkscape:path-effect="#path-effect26479" id="path10360-7" d="m 828.08503,1670.6644 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.49867719px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 822.00069,1670.121 0,2.95" id="path10362-4" inkscape:path-effect="#path-effect26476" inkscape:original-d="m 822.00069,1670.121 0,2.95" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 816.05111,1669.7472 0,2.7831" inkscape:path-effect="#path-effect26473" id="path10364-8" d="m 816.05111,1669.7472 0,2.7831" style="fill:none;stroke:#d29898;stroke-width:0.48436409px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 810.17159,1668.9666 0,3.0697" id="path10366-7" inkscape:path-effect="#path-effect26470" inkscape:original-d="m 810.17159,1668.9666 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 804.44281,1668.5646 0,2.7352" inkscape:path-effect="#path-effect26467" id="path10368-8" d="m 804.44281,1668.5646 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 799.10436,1668.0485 0,2.7353" id="path10370-3" inkscape:path-effect="#path-effect26464" inkscape:original-d="m 799.10436,1668.0485 0,2.7353" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 794.14277,1667.8451 0,2.2507" inkscape:path-effect="#path-effect26461" id="path10372-2" d="m 794.14277,1667.8451 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 789.09202,1667.191 0,2.2507" id="path10374-1" inkscape:path-effect="#path-effect26458" inkscape:original-d="m 789.09202,1667.191 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 783.8864,1666.6374 0,2.2507" inkscape:path-effect="#path-effect26455" id="path10376-9" d="m 783.8864,1666.6374 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 778.94597,1666.112 0,2.2507" id="path10378-3" inkscape:path-effect="#path-effect26452" inkscape:original-d="m 778.94597,1666.112 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 831.48306,1674.2304 0,3.3333" inkscape:path-effect="#path-effect26449" id="path10394-7" d="m 831.48306,1674.2304 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 825.55745,1673.5351 0,3.3333" id="path10396-4" inkscape:path-effect="#path-effect26446" inkscape:original-d="m 825.55745,1673.5351 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 819.4731,1672.8185 0,3.3333" inkscape:path-effect="#path-effect26443" id="path10398-4" d="m 819.4731,1672.8185 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 813.52353,1672.2235 0,3.0698" id="path10400-4" inkscape:path-effect="#path-effect26440" inkscape:original-d="m 813.52353,1672.2235 0,3.0698" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 807.64401,1671.5863 0,3.0697" inkscape:path-effect="#path-effect26437" id="path10402-3" d="m 807.64401,1671.5863 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 801.91523,1670.9694 0,2.7352" id="path10404-5" inkscape:path-effect="#path-effect26434" inkscape:original-d="m 801.91523,1670.9694 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 796.57677,1670.3532 0,2.7352" inkscape:path-effect="#path-effect26431" id="path10406-1" d="m 796.57677,1670.3532 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 791.61519,1669.7361 0,2.2507" id="path10408-3" inkscape:path-effect="#path-effect26428" inkscape:original-d="m 791.61519,1669.7361 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 786.56443,1669.3141 0,2.2508" inkscape:path-effect="#path-effect26425" id="path10410-2" d="m 786.56443,1669.3141 0,2.2508" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 781.35881,1668.6124 0,2.2507" id="path10412-8" inkscape:path-effect="#path-effect26422" inkscape:original-d="m 781.35881,1668.6124 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 776.41839,1667.9462 0,2.2507" inkscape:path-effect="#path-effect26419" id="path10414-0" d="m 776.41839,1667.9462 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 838.43395,1675.0803 0,3.5491" id="path10428-9" inkscape:path-effect="#path-effect26416" inkscape:original-d="m 838.43395,1675.0803 0,3.5491" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 833.92588,1678.1911 0,3.3334" id="path10432-0" inkscape:path-effect="#path-effect26413" inkscape:original-d="m 833.92588,1678.1911 0,3.3334" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 828.00027,1677.4667 0,3.3333" inkscape:path-effect="#path-effect26410" id="path10434-3" d="m 828.00027,1677.4667 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 821.91592,1676.4582 0,3.3333" id="path10436-4" inkscape:path-effect="#path-effect26407" inkscape:original-d="m 821.91592,1676.4582 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 815.96635,1675.626 0,3.0698" inkscape:path-effect="#path-effect26404" id="path10438-9" d="m 815.96635,1675.626 0,3.0698" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 810.08683,1674.7015 0,3.0698" id="path10440-4" inkscape:path-effect="#path-effect26401" inkscape:original-d="m 810.08683,1674.7015 0,3.0698" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 804.35805,1673.9562 0,2.7352" inkscape:path-effect="#path-effect26398" id="path10442-43" d="m 804.35805,1673.9562 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 799.01959,1673.272 0,2.7352" id="path10444-9" inkscape:path-effect="#path-effect26395" inkscape:original-d="m 799.01959,1673.272 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 794.05801,1672.8366 0,2.2507" inkscape:path-effect="#path-effect26392" id="path10446-8" d="m 794.05801,1672.8366 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 789.00725,1672.0084 0,2.2508" id="path10448-5" inkscape:path-effect="#path-effect26389" inkscape:original-d="m 789.00725,1672.0084 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 783.80163,1671.1898 0,2.2507" inkscape:path-effect="#path-effect26386" id="path10450-38" d="m 783.80163,1671.1898 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 778.86121,1670.4129 0,2.2508" id="path10452-1" inkscape:path-effect="#path-effect26383" inkscape:original-d="m 778.86121,1670.4129 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 831.39829,1681.1538 0,3.3333" inkscape:path-effect="#path-effect26380" id="path10468-2" d="m 831.39829,1681.1538 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 825.47269,1679.9497 0,3.3333" id="path10470-38" inkscape:path-effect="#path-effect26377" inkscape:original-d="m 825.47269,1679.9497 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 819.38834,1679.0268 0,3.3333" inkscape:path-effect="#path-effect26374" id="path10472-9" d="m 819.38834,1679.0268 0,3.3333" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 813.43877,1678.2327 0,3.0697" id="path10474-8" inkscape:path-effect="#path-effect26371" inkscape:original-d="m 813.43877,1678.2327 0,3.0697" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 807.55925,1677.2445 0,3.0697" inkscape:path-effect="#path-effect26368" id="path10476-51" d="m 807.55925,1677.2445 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 801.83047,1676.3359 0,2.7352" id="path10478-0" inkscape:path-effect="#path-effect26365" inkscape:original-d="m 801.83047,1676.3359 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 796.49201,1675.4999 0,2.7352" inkscape:path-effect="#path-effect26362" id="path10480-6" d="m 796.49201,1675.4999 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 791.53042,1674.9408 0,2.2508" id="path10482-1" inkscape:path-effect="#path-effect26359" inkscape:original-d="m 791.53042,1674.9408 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 786.47967,1674.0028 0,2.2508" inkscape:path-effect="#path-effect26356" id="path10484-8" d="m 786.47967,1674.0028 0,2.2508" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 781.27405,1673.0362 0,2.2507" id="path10486-1" inkscape:path-effect="#path-effect26353" inkscape:original-d="m 781.27405,1673.0362 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 776.33363,1672.1185 0,2.2507" inkscape:path-effect="#path-effect26350" id="path10488-8" d="m 776.33363,1672.1185 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 838.34918,1682.202 0,3.549" id="path10502-7" inkscape:path-effect="#path-effect26347" inkscape:original-d="m 838.34918,1682.202 0,3.549" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 834.01064,1684.722 0,3.3334" inkscape:path-effect="#path-effect26344" id="path10506-72" d="m 834.01064,1684.722 0,3.3334" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 828.08503,1683.6742 0,3.3334" id="path10508-8" inkscape:path-effect="#path-effect26341" inkscape:original-d="m 828.08503,1683.6742 0,3.3334" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 822.00069,1682.4893 0,3.3334" inkscape:path-effect="#path-effect26338" id="path10510-2" d="m 822.00069,1682.4893 0,3.3334" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 816.05111,1681.3846 0,3.0698" id="path10512-3" inkscape:path-effect="#path-effect26335" inkscape:original-d="m 816.05111,1681.3846 0,3.0698" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 810.17159,1680.4503 0,3.0697" inkscape:path-effect="#path-effect26332" id="path10514-6" d="m 810.17159,1680.4503 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 804.44281,1679.496 0,2.7353" id="path10516-6" inkscape:path-effect="#path-effect26329" inkscape:original-d="m 804.44281,1679.496 0,2.7353" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 799.10436,1678.3654 0,2.7352" inkscape:path-effect="#path-effect26326" id="path10518-9" d="m 799.10436,1678.3654 0,2.7352" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 794.14277,1677.9362 0,2.2508" id="path10520-6" inkscape:path-effect="#path-effect26323" inkscape:original-d="m 794.14277,1677.9362 0,2.2508" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 789.09202,1676.8665 0,2.2507" inkscape:path-effect="#path-effect26320" id="path10522-5" d="m 789.09202,1676.8665 0,2.2507" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 783.8864,1675.7641 0,2.2507" id="path10524-13" inkscape:path-effect="#path-effect26317" inkscape:original-d="m 783.8864,1675.7641 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 778.94597,1674.7177 0,2.2508" inkscape:path-effect="#path-effect26314" id="path10526-8" d="m 778.94597,1674.7177 0,2.2508" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 831.48306,1687.5193 0,3.3333" id="path10542-0" inkscape:path-effect="#path-effect26311" inkscape:original-d="m 831.48306,1687.5193 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 825.55745,1686.5099 0,2.9967" inkscape:path-effect="#path-effect26308" id="path10544-7" d="m 825.55745,1686.5099 0,2.9967" style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 819.4731,1684.8411 0,3.3333" id="path10546-6" inkscape:path-effect="#path-effect26305" inkscape:original-d="m 819.4731,1684.8411 0,3.3333" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 813.52353,1683.8333 0,3.0697" inkscape:path-effect="#path-effect26302" id="path10548-1" d="m 813.52353,1683.8333 0,3.0697" style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.50870317px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 807.64401,1682.7766 0,2.8316" id="path10550-6" inkscape:path-effect="#path-effect26299" inkscape:original-d="m 807.64401,1682.7766 0,2.8316" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 801.91523,1681.7897 0,2.5539" inkscape:path-effect="#path-effect26296" id="path10552-0" d="m 801.91523,1681.7897 0,2.5539" style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.48018765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 796.57677,1680.4035 0,2.7352" id="path10554-3" inkscape:path-effect="#path-effect26293" inkscape:original-d="m 796.57677,1680.4035 0,2.7352" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 791.61519,1679.6777 0.0106,2.432" inkscape:path-effect="#path-effect26290" id="path10556-10" d="m 791.61519,1679.6777 0.0106,2.432" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 786.56443,1678.7232 0,2.2507" id="path10558-4" inkscape:path-effect="#path-effect26287" inkscape:original-d="m 786.56443,1678.7232 0,2.2507" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 781.35881,1677.4726 0.0212,2.4061" inkscape:path-effect="#path-effect26284" id="path10560-3" d="m 781.35881,1677.4726 0.0212,2.4061" style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#d29898;stroke-width:0.33317316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 776.41839,1676.4409 0,2.3673" id="path10562-1" inkscape:path-effect="#path-effect26281" inkscape:original-d="m 776.41839,1676.4409 0,2.3673" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 838.43395,1688.9984 0,3.4026" inkscape:path-effect="#path-effect26278" id="path10576-5" d="m 838.43395,1688.9984 0,3.4026" style="fill:none;stroke:#d29898;stroke-width:0.54698116px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.84474,1638.4212 9.38834,0.6475" id="path10876-8" inkscape:path-effect="#path-effect26275" inkscape:original-d="m 840.84474,1638.4212 9.38834,0.6475" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 840.85972,1642.3585 9.37336,0.1347" inkscape:path-effect="#path-effect26272" id="path10880-9" d="m 840.85972,1642.3585 9.37336,0.1347" style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.85972,1646.0211 9.37336,-0.072" id="path10884-5" inkscape:path-effect="#path-effect26269" inkscape:original-d="m 840.85972,1646.0211 9.37336,-0.072" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 840.85972,1649.7504 9.37336,-0.2797" inkscape:path-effect="#path-effect26266" id="path10888-4" d="m 840.85972,1649.7504 9.37336,-0.2797" style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.85972,1653.6052 9.37336,-0.7283" id="path10892-5" inkscape:path-effect="#path-effect26263" inkscape:original-d="m 840.85972,1653.6052 c 3.12446,3.3694 6.24891,5.1681 9.37336,-0.7283" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 840.85972,1657.2311 c 3.12446,3.3694 6.24891,5.0127 9.37336,-0.8837" inkscape:path-effect="#path-effect26260" id="path10896-7" d="m 840.85972,1657.2311 9.37336,-0.8837" style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.85972,1660.8754 9.37336,-1.1866" id="path10900-4" inkscape:path-effect="#path-effect26257" inkscape:original-d="m 840.85972,1660.8754 c 3.12446,3.3693 6.24891,4.7098 9.37336,-1.1866" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 840.85972,1664.5011 c 3.12446,3.3694 6.24891,4.5544 9.37336,-1.342" inkscape:path-effect="#path-effect26254" id="path10904-4" d="m 840.85972,1664.5011 9.37336,-1.342" style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.85972,1668.2953 9.37336,-1.4393" id="path10908-67" inkscape:path-effect="#path-effect26251" inkscape:original-d="m 840.85972,1668.2953 c 3.12446,3.3693 6.24891,4.4572 9.37336,-1.4393" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 840.85972,1671.921 c 3.12446,3.3693 6.24891,4.3666 9.37336,-1.5298" inkscape:path-effect="#path-effect26248" id="path10912-7" d="m 840.85972,1671.921 9.37336,-1.5298" style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.85972,1675.1712 9.37336,-1.5816" id="path10916-5" inkscape:path-effect="#path-effect26245" inkscape:original-d="m 840.85972,1675.1712 c 3.12446,3.3694 6.24891,4.3148 9.37336,-1.5816" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 840.85972,1678.9005 c 3.12446,3.3694 6.24891,4.1595 9.37336,-1.7369" inkscape:path-effect="#path-effect26242" id="path10920-2" d="m 840.85972,1678.9005 9.37336,-1.7369" style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.85972,1682.5781 9.37336,-1.8405" id="path10924-6" inkscape:path-effect="#path-effect26239" inkscape:original-d="m 840.85972,1682.5781 c 3.12446,3.3694 1.63968,19.0768 9.37336,-1.8405" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 840.85972,1685.9448 c 3.12446,3.3694 6.24891,4.0559 9.37336,-1.8405" inkscape:path-effect="#path-effect26236" id="path10928-8" d="m 840.85972,1685.9448 9.37336,-1.8405" style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.53009319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 840.85972,1689.2598 9.37336,-1.7887" id="path10932-89" inkscape:path-effect="#path-effect26233" inkscape:original-d="m 840.85972,1689.2598 c 3.12446,3.3694 6.24891,4.1077 9.37336,-1.7887" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 845.84599,1638.7723 0,3.5535" id="path10936-1" inkscape:path-effect="#path-effect26230" inkscape:original-d="m 845.84599,1638.7723 0,3.5535" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 845.84599,1646.1273 0,3.5535" inkscape:path-effect="#path-effect26227" id="path10940-9" d="m 845.84599,1646.1273 0,3.5535" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 845.84599,1653.0939 0,3.5535" id="path10944-8" inkscape:path-effect="#path-effect26224" inkscape:original-d="m 845.84599,1653.0939 0,3.5535" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 845.84599,1660.1123 0,3.5535" inkscape:path-effect="#path-effect26221" id="path10948-0" d="m 845.84599,1660.1123 0,3.5535" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 845.84599,1667.4673 0,3.5535" id="path10950-5" inkscape:path-effect="#path-effect26218" inkscape:original-d="m 845.84599,1667.4673 0,3.5535" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 845.84599,1674.4339 0,3.5535" inkscape:path-effect="#path-effect26215" id="path10952-0" d="m 845.84599,1674.4339 0,3.5535" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 845.84599,1681.6595 0,3.5535" inkscape:path-effect="#path-effect26212" id="path10960-29" d="m 845.84599,1681.6595 0,3.5535" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.51035887px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 845.93076,1688.2635 0,3.3608" id="path10962-6" inkscape:path-effect="#path-effect26209" inkscape:original-d="m 845.93076,1688.2635 0,3.3608" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 843.59967,1634.9912 0,3.5535" inkscape:path-effect="#path-effect26206" id="path10968-0" d="m 843.59967,1634.9912 0,3.5535" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 848.47377,1635.5091 0,3.5535" id="path10972-22" inkscape:path-effect="#path-effect26203" inkscape:original-d="m 848.47377,1635.5091 0,3.5535" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 843.59967,1642.2945 0,3.5534" id="path10976-9" inkscape:path-effect="#path-effect26200" inkscape:original-d="m 843.59967,1642.2945 0,3.5534" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 848.47377,1642.5017 0,3.5534" inkscape:path-effect="#path-effect26197" id="path10978-2" d="m 848.47377,1642.5017 0,3.5534" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 843.59967,1649.5977 0,3.5535" inkscape:path-effect="#path-effect26194" id="path10984-6" d="m 843.59967,1649.5977 0,3.5535" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 848.47377,1649.8049 0,3.2164" id="path10986-73" inkscape:path-effect="#path-effect26191" inkscape:original-d="m 848.47377,1649.8049 0,3.2164" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 843.59967,1656.901 0,3.5535" id="path10992-6" inkscape:path-effect="#path-effect26188" inkscape:original-d="m 843.59967,1656.901 0,3.5535" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 848.47377,1656.4349 0,3.5534" inkscape:path-effect="#path-effect26185" id="path10994-0" d="m 848.47377,1656.4349 0,3.5534" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 843.59967,1664.2043 0,3.5535" inkscape:path-effect="#path-effect26182" id="path10996-5" d="m 843.59967,1664.2043 0,3.5535" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 848.47377,1663.4274 0,3.5535" id="path10998-2" inkscape:path-effect="#path-effect26179" inkscape:original-d="m 848.47377,1663.4274 0,3.5535" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 843.59967,1671.5076 0,3.2164" id="path11000-1" inkscape:path-effect="#path-effect26176" inkscape:original-d="m 843.59967,1671.5076 0,3.2164" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 848.47377,1670.7307 0,3.2164" inkscape:path-effect="#path-effect26173" id="path11002-7" d="m 848.47377,1670.7307 0,3.2164" style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 843.59967,1678.3965 0,3.5535" id="path11016-1" inkscape:path-effect="#path-effect26170" inkscape:original-d="m 843.59967,1678.3965 0,3.5535" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 848.47377,1677.6196 0,3.5535" inkscape:path-effect="#path-effect26167" id="path11018-1" d="m 848.47377,1677.6196 0,3.5535" style="fill:none;stroke:#7f3737;stroke-width:0.52478218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 843.59967,1685.6998 0,3.2163" inkscape:path-effect="#path-effect26164" id="path11020-5" d="m 843.59967,1685.6998 0,3.2163" style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7f3737;stroke-width:0.49926803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 848.47377,1684.4567 0,3.2163" id="path11022-3" inkscape:path-effect="#path-effect26161" inkscape:original-d="m 848.47377,1684.4567 0,3.2163" inkscape:connector-curvature="0"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/House.svg b/misc/images/svg/elements/House.svg
index dcc10eea0d0..88bf258b8e1 100644
--- a/misc/images/svg/elements/House.svg
+++ b/misc/images/svg/elements/House.svg
@@ -1,670 +1,134 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="117.09678"
-   height="128"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <filter
-       inkscape:collect="always"
-       id="filter29478"
-       x="-0.12292307"
-       width="1.2458462"
-       y="-0.078414656"
-       height="1.1568294"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.9899027"
-         id="feGaussianBlur29480" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="117.09678" height="128" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <filter inkscape:collect="always" id="filter29478" x="-0.12292307" width="1.2458462" y="-0.078414656" height="1.1568294" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.9899027" id="feGaussianBlur29480"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter29482"
-       x="-0.10632366"
-       width="1.2126473"
-       y="-0.059334766"
-       height="1.1186695"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.9899027"
-         id="feGaussianBlur29484" />
+    <filter inkscape:collect="always" id="filter29482" x="-0.10632366" width="1.2126473" y="-0.059334766" height="1.1186695" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.9899027" id="feGaussianBlur29484"/>
     </filter>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28750-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28754-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28758-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28764-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28768-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28772-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28776-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28780-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28784-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28788-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28792-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28796-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28800-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28808-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28810-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28812-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28816-3"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28820-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28824-3"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28750-0-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28855-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28859-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28776-3-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28776-3-3-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect28776-3-6-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28947-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28951-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect28955-9"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient29019-5"
-       id="linearGradient33248"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(213.48075,58.691798)"
-       x1="215.92969"
-       y1="2112.6641"
-       x2="170.88683"
-       y2="2186.2473" />
-    <linearGradient
-       id="linearGradient29019-5">
-      <stop
-         id="stop29021-6"
-         offset="0"
-         style="stop-color:#aa0000;stop-opacity:1;" />
-      <stop
-         id="stop29023-3"
-         offset="1"
-         style="stop-color:#ffa810;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect28750-2" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28754-8" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28758-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28764-5" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28768-8" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28772-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28776-0" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28780-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28784-9" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28788-4" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28792-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28796-6" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28800-7" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28808-7" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28810-1" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28812-8" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28816-3" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28820-6" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28824-3" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28750-0-3" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28855-8" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28859-3" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28776-3-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28776-3-3-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect28776-3-6-6" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28947-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28951-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect28955-9" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient29019-5" id="linearGradient33248" gradientUnits="userSpaceOnUse" gradientTransform="translate(213.48075,58.691798)" x1="215.92969" y1="2112.6641" x2="170.88683" y2="2186.2473"/>
+    <linearGradient id="linearGradient29019-5">
+      <stop id="stop29021-6" offset="0" style="stop-color:#aa0000;stop-opacity:1;"/>
+      <stop id="stop29023-3" offset="1" style="stop-color:#ffa810;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient28708-1"
-       id="linearGradient33250"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(180.66468,44.485498)"
-       x1="227.00528"
-       y1="2175.3342"
-       x2="229.30338"
-       y2="2170.1194" />
-    <linearGradient
-       id="linearGradient28708-1">
-      <stop
-         style="stop-color:#999999;stop-opacity:1;"
-         offset="0"
-         id="stop28710-2" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop28712-0" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient28708-1" id="linearGradient33250" gradientUnits="userSpaceOnUse" gradientTransform="translate(180.66468,44.485498)" x1="227.00528" y1="2175.3342" x2="229.30338" y2="2170.1194"/>
+    <linearGradient id="linearGradient28708-1">
+      <stop style="stop-color:#999999;stop-opacity:1;" offset="0" id="stop28710-2"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop28712-0"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient28708-1"
-       id="linearGradient33252"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(180.66468,44.485498)"
-       x1="242.55457"
-       y1="2203.689"
-       x2="240.21933"
-       y2="2203.689" />
-    <linearGradient
-       id="linearGradient125656">
-      <stop
-         style="stop-color:#999999;stop-opacity:1;"
-         offset="0"
-         id="stop125658" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop125660" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient28708-1" id="linearGradient33252" gradientUnits="userSpaceOnUse" gradientTransform="translate(180.66468,44.485498)" x1="242.55457" y1="2203.689" x2="240.21933" y2="2203.689"/>
+    <linearGradient id="linearGradient125656">
+      <stop style="stop-color:#999999;stop-opacity:1;" offset="0" id="stop125658"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop125660"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient28991-9"
-       id="linearGradient33254"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(180.66468,44.485498)"
-       x1="225.78993"
-       y1="2185.6057"
-       x2="217.0174"
-       y2="2194.3557" />
-    <linearGradient
-       id="linearGradient28991-9">
-      <stop
-         style="stop-color:#6f94d2;stop-opacity:1;"
-         offset="0"
-         id="stop28993-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop28995-7" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient28991-9" id="linearGradient33254" gradientUnits="userSpaceOnUse" gradientTransform="translate(180.66468,44.485498)" x1="225.78993" y1="2185.6057" x2="217.0174" y2="2194.3557"/>
+    <linearGradient id="linearGradient28991-9">
+      <stop style="stop-color:#6f94d2;stop-opacity:1;" offset="0" id="stop28993-5"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop28995-7"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient29003-6"
-       id="linearGradient33256"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(213.48075,58.691798)"
-       x1="239.25"
-       y1="2169.8369"
-       x2="239.25"
-       y2="2182.6597" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient29003-6">
-      <stop
-         style="stop-color:#c88943;stop-opacity:1;"
-         offset="0"
-         id="stop29005-9" />
-      <stop
-         style="stop-color:#c88943;stop-opacity:0;"
-         offset="1"
-         id="stop29007-8" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient29003-6" id="linearGradient33256" gradientUnits="userSpaceOnUse" gradientTransform="translate(213.48075,58.691798)" x1="239.25" y1="2169.8369" x2="239.25" y2="2182.6597"/>
+    <linearGradient inkscape:collect="always" id="linearGradient29003-6">
+      <stop style="stop-color:#c88943;stop-opacity:1;" offset="0" id="stop29005-9"/>
+      <stop style="stop-color:#c88943;stop-opacity:0;" offset="1" id="stop29007-8"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="102.11982"
-     inkscape:cy="-1.7142887"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="132"
-     inkscape:window-y="174"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="102.11982" inkscape:cy="-1.7142887" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="132" inkscape:window-y="174" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-272.88018,-402.64789)">
-    <g
-       style="display:inline"
-       id="g33114"
-       transform="matrix(0.91481861,0,0,0.91481861,-415.40974,-1503.6668)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\House.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         transform="matrix(1.4307013,0,0,1.4307013,-351.75488,-712.75623)"
-         id="g33130">
-        <g
-           id="g33132"
-           transform="matrix(0.89762261,0,0,0.89762261,434.7028,13.720741)">
-          <path
-             id="path33134"
-             style="opacity:0.73991029;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter29478)"
-             d="m 384.36758,2206.4662 38.85167,20.125 0,40.779 -38.85167,-22.431 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             transform="matrix(1,0,0,1.0556083,0,-127.20369)" />
-          <path
-             id="path33136"
-             style="opacity:0.73991029;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter29482)"
-             d="m 423.21925,2222.8412 25.85544,-35.9595 19.06181,19.7095 0,44.4304 -44.91725,16.3486 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccc"
-             transform="matrix(1,0,0,1.0556083,0,-127.20369)" />
-          <g
-             id="g33138"
-             transform="translate(180.66468,44.485498)">
-            <path
-               id="path33140"
-               transform="translate(32.816074,14.206269)"
-               style="fill:#d3a477;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 223.0038,2108.7708 10.96016,-1.3811 0,13.1484 -10.96016,0.1982 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 255.81987,2123.0986 -7.07411,-2.6545 0,11.0156 7.07411,3.3945 z"
-               style="fill:#695135;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path33142" />
-            <path
-               id="path33144"
-               transform="translate(32.816074,14.206269)"
-               style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 215.93274,2106.2406 9.45755,-1.3258 8.57367,2.4738 -10.96016,1.5036 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 252.34506,2120.6774 5.48507,-0.7362 4.97242,1.3736 -6.35652,0.8349 z"
-               style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path33146" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 255.81988,2124.8933 10.9337,-1.625"
-               id="path33148"
-               inkscape:path-effect="#path-effect28750-2"
-               inkscape:original-d="m 255.81988,2124.8933 10.9337,-1.625"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 255.81987,2126.9262 10.9337,-1.625"
-               inkscape:path-effect="#path-effect28754-8"
-               id="path33150"
-               d="m 255.81987,2126.9262 10.9337,-1.625"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 255.81987,2129.0627 10.9337,-1.625"
-               id="path33152"
-               inkscape:path-effect="#path-effect28758-5"
-               inkscape:original-d="m 255.81987,2129.0627 10.9337,-1.625"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 225.22276,2116.6087 8.71474,-1.3343"
-               id="path33154"
-               inkscape:path-effect="#path-effect28764-5"
-               inkscape:original-d="m 225.22276,2116.6087 8.71474,-1.3343"
-               inkscape:connector-curvature="0"
-               transform="translate(32.816074,14.206269)" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 261.58435,2132.32 5.16922,-0.6646"
-               inkscape:path-effect="#path-effect28768-8"
-               id="path33156"
-               d="m 261.58435,2132.32 5.16922,-0.6646"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               sodipodi:nodetypes="cc" />
-            <path
-               sodipodi:nodetypes="cc"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 265.07503,2133.8017 1.67854,-0.2462"
-               id="path33158"
-               inkscape:path-effect="#path-effect28772-8"
-               inkscape:original-d="m 265.07503,2133.8017 1.67854,-0.2462"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 259.34732,2122.6136 0,1.6875"
-               id="path33160"
-               inkscape:path-effect="#path-effect28776-0"
-               inkscape:original-d="m 259.34732,2122.6136 0,1.6875"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 263.44107,2122.051 0,1.6875"
-               inkscape:path-effect="#path-effect28780-1"
-               id="path33162"
-               d="m 263.44107,2122.051 0,1.6875"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 261.53482,2124.1202 0,1.9245"
-               inkscape:path-effect="#path-effect28784-9"
-               id="path33164"
-               d="m 261.53482,2124.1202 0,1.9245"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 257.22232,2124.7765 0,1.9245"
-               id="path33166"
-               inkscape:path-effect="#path-effect28788-4"
-               inkscape:original-d="m 257.22232,2124.7765 0,1.9245"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 265.53482,2123.4952 0,1.9245"
-               inkscape:path-effect="#path-effect28792-5"
-               id="path33168"
-               d="m 265.53482,2123.4952 0,1.9245"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 259.37857,2126.4968 0,1.9542"
-               inkscape:path-effect="#path-effect28796-6"
-               id="path33170"
-               d="m 259.37857,2126.4968 0,1.9542"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.21522164;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.22166701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 263.50357,2125.8405 0,2.073"
-               id="path33172"
-               inkscape:path-effect="#path-effect28800-7"
-               inkscape:original-d="m 263.50357,2125.8405 0,2.073"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 261.53482,2128.2522 0,1.9245"
-               id="path33174"
-               inkscape:path-effect="#path-effect28808-7"
-               inkscape:original-d="m 261.53482,2128.2522 0,1.9245"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 257.22232,2128.9085 0,1.5599"
-               inkscape:path-effect="#path-effect28810-1"
-               id="path33176"
-               d="m 257.22232,2128.9085 0,1.5599"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.1922868;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 265.53482,2127.6741 0,1.9245"
-               id="path33178"
-               inkscape:path-effect="#path-effect28812-8"
-               inkscape:original-d="m 265.53482,2127.6741 0,1.9245"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 263.50357,2129.9506 0,2.073"
-               inkscape:path-effect="#path-effect28816-3"
-               id="path33180"
-               d="m 263.50357,2129.9506 0,2.073"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.22166701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.12945846;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 259.37857,2130.6766 0,0.7071"
-               id="path33182"
-               inkscape:path-effect="#path-effect28820-6"
-               inkscape:original-d="m 259.37857,2130.6766 0,0.7071"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 265.53873,2131.834 0,1.9245"
-               inkscape:path-effect="#path-effect28824-3"
-               id="path33184"
-               d="m 265.53873,2131.834 0,1.9245"
-               style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 248.74576,2122.0951 7.07411,2.7959"
-               id="path33186"
-               inkscape:path-effect="#path-effect28750-0-3"
-               inkscape:original-d="m 248.74576,2122.0951 7.07411,2.7959"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 248.74576,2124.1229 7.07411,2.7959"
-               inkscape:path-effect="#path-effect28855-8"
-               id="path33188"
-               d="m 248.74576,2124.1229 7.07411,2.7959"
-               style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 248.74576,2126.1022 7.07411,2.9601"
-               id="path33190"
-               inkscape:path-effect="#path-effect28859-3"
-               inkscape:original-d="m 248.74576,2126.1022 7.07411,2.9601"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
-            <path
-               style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 253.90982,2122.387 0,1.6875"
-               id="path33192"
-               inkscape:path-effect="#path-effect28776-3-5"
-               inkscape:original-d="m 253.90982,2122.387 0,1.6875"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:none;stroke:#92602f;stroke-width:0.21192092;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 251.78482,2123.336 0,1.8947"
-               id="path33194"
-               inkscape:path-effect="#path-effect28776-3-3-9"
-               inkscape:original-d="m 251.78482,2123.336 0,1.8947"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="m 250.17544,2121.0119 0,1.6875"
-               id="path33196"
-               inkscape:path-effect="#path-effect28776-3-6-6"
-               inkscape:original-d="m 250.17544,2121.0119 0,1.6875"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 250.17544,2124.6994 0,1.9834"
-               inkscape:path-effect="#path-effect28947-1"
-               id="path33198"
-               d="m 250.17544,2124.6994 0,1.9834"
-               style="fill:none;stroke:#92602f;stroke-width:0.21682934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 253.90982,2126.1683 0,2.1018"
-               inkscape:path-effect="#path-effect28951-1"
-               id="path33200"
-               d="m 253.90982,2126.1683 0,2.1018"
-               style="fill:none;stroke:#92602f;stroke-width:0.22320607;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 251.78482,2127.3673 0,0.793"
-               inkscape:path-effect="#path-effect28955-9"
-               id="path33202"
-               d="m 251.78482,2127.3673 0,0.793"
-               style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-272.88018,-402.64789)">
+    <g style="display:inline" id="g33114" transform="matrix(0.91481861,0,0,0.91481861,-415.40974,-1503.6668)">
+      <g transform="matrix(1.4307013,0,0,1.4307013,-351.75488,-712.75623)" id="g33130">
+        <g id="g33132" transform="matrix(0.89762261,0,0,0.89762261,434.7028,13.720741)">
+          <path id="path33134" style="opacity:0.73991029;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter29478)" d="m 384.36758,2206.4662 38.85167,20.125 0,40.779 -38.85167,-22.431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(1,0,0,1.0556083,0,-127.20369)"/>
+          <path id="path33136" style="opacity:0.73991029;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter29482)" d="m 423.21925,2222.8412 25.85544,-35.9595 19.06181,19.7095 0,44.4304 -44.91725,16.3486 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc" transform="matrix(1,0,0,1.0556083,0,-127.20369)"/>
+          <g id="g33138" transform="translate(180.66468,44.485498)">
+            <path id="path33140" transform="translate(32.816074,14.206269)" style="fill:#d3a477;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 223.0038,2108.7708 10.96016,-1.3811 0,13.1484 -10.96016,0.1982 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 255.81987,2123.0986 -7.07411,-2.6545 0,11.0156 7.07411,3.3945 z" style="fill:#695135;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33142"/>
+            <path id="path33144" transform="translate(32.816074,14.206269)" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 215.93274,2106.2406 9.45755,-1.3258 8.57367,2.4738 -10.96016,1.5036 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 252.34506,2120.6774 5.48507,-0.7362 4.97242,1.3736 -6.35652,0.8349 z" style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33146"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 255.81988,2124.8933 10.9337,-1.625" id="path33148" inkscape:path-effect="#path-effect28750-2" inkscape:original-d="m 255.81988,2124.8933 10.9337,-1.625" inkscape:connector-curvature="0"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 255.81987,2126.9262 10.9337,-1.625" inkscape:path-effect="#path-effect28754-8" id="path33150" d="m 255.81987,2126.9262 10.9337,-1.625" style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 255.81987,2129.0627 10.9337,-1.625" id="path33152" inkscape:path-effect="#path-effect28758-5" inkscape:original-d="m 255.81987,2129.0627 10.9337,-1.625" inkscape:connector-curvature="0"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 225.22276,2116.6087 8.71474,-1.3343" id="path33154" inkscape:path-effect="#path-effect28764-5" inkscape:original-d="m 225.22276,2116.6087 8.71474,-1.3343" inkscape:connector-curvature="0" transform="translate(32.816074,14.206269)"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 261.58435,2132.32 5.16922,-0.6646" inkscape:path-effect="#path-effect28768-8" id="path33156" d="m 261.58435,2132.32 5.16922,-0.6646" style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc"/>
+            <path sodipodi:nodetypes="cc" style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 265.07503,2133.8017 1.67854,-0.2462" id="path33158" inkscape:path-effect="#path-effect28772-8" inkscape:original-d="m 265.07503,2133.8017 1.67854,-0.2462" inkscape:connector-curvature="0"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 259.34732,2122.6136 0,1.6875" id="path33160" inkscape:path-effect="#path-effect28776-0" inkscape:original-d="m 259.34732,2122.6136 0,1.6875" inkscape:connector-curvature="0"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 263.44107,2122.051 0,1.6875" inkscape:path-effect="#path-effect28780-1" id="path33162" d="m 263.44107,2122.051 0,1.6875" style="fill:none;stroke:#e3c5a8;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 261.53482,2124.1202 0,1.9245" inkscape:path-effect="#path-effect28784-9" id="path33164" d="m 261.53482,2124.1202 0,1.9245" style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 257.22232,2124.7765 0,1.9245" id="path33166" inkscape:path-effect="#path-effect28788-4" inkscape:original-d="m 257.22232,2124.7765 0,1.9245" inkscape:connector-curvature="0"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 265.53482,2123.4952 0,1.9245" inkscape:path-effect="#path-effect28792-5" id="path33168" d="m 265.53482,2123.4952 0,1.9245" style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 259.37857,2126.4968 0,1.9542" inkscape:path-effect="#path-effect28796-6" id="path33170" d="m 259.37857,2126.4968 0,1.9542" style="fill:none;stroke:#e3c5a8;stroke-width:0.21522164;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.22166701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 263.50357,2125.8405 0,2.073" id="path33172" inkscape:path-effect="#path-effect28800-7" inkscape:original-d="m 263.50357,2125.8405 0,2.073" inkscape:connector-curvature="0"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 261.53482,2128.2522 0,1.9245" id="path33174" inkscape:path-effect="#path-effect28808-7" inkscape:original-d="m 261.53482,2128.2522 0,1.9245" inkscape:connector-curvature="0"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 257.22232,2128.9085 0,1.5599" inkscape:path-effect="#path-effect28810-1" id="path33176" d="m 257.22232,2128.9085 0,1.5599" style="fill:none;stroke:#e3c5a8;stroke-width:0.1922868;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 265.53482,2127.6741 0,1.9245" id="path33178" inkscape:path-effect="#path-effect28812-8" inkscape:original-d="m 265.53482,2127.6741 0,1.9245" inkscape:connector-curvature="0"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 263.50357,2129.9506 0,2.073" inkscape:path-effect="#path-effect28816-3" id="path33180" d="m 263.50357,2129.9506 0,2.073" style="fill:none;stroke:#e3c5a8;stroke-width:0.22166701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path style="fill:none;stroke:#e3c5a8;stroke-width:0.12945846;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 259.37857,2130.6766 0,0.7071" id="path33182" inkscape:path-effect="#path-effect28820-6" inkscape:original-d="m 259.37857,2130.6766 0,0.7071" inkscape:connector-curvature="0"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 265.53873,2131.834 0,1.9245" inkscape:path-effect="#path-effect28824-3" id="path33184" d="m 265.53873,2131.834 0,1.9245" style="fill:none;stroke:#e3c5a8;stroke-width:0.2135805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 248.74576,2122.0951 7.07411,2.7959" id="path33186" inkscape:path-effect="#path-effect28750-0-3" inkscape:original-d="m 248.74576,2122.0951 7.07411,2.7959" inkscape:connector-curvature="0"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 248.74576,2124.1229 7.07411,2.7959" inkscape:path-effect="#path-effect28855-8" id="path33188" d="m 248.74576,2124.1229 7.07411,2.7959" style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 248.74576,2126.1022 7.07411,2.9601" id="path33190" inkscape:path-effect="#path-effect28859-3" inkscape:original-d="m 248.74576,2126.1022 7.07411,2.9601" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+            <path style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 253.90982,2122.387 0,1.6875" id="path33192" inkscape:path-effect="#path-effect28776-3-5" inkscape:original-d="m 253.90982,2122.387 0,1.6875" inkscape:connector-curvature="0"/>
+            <path style="fill:none;stroke:#92602f;stroke-width:0.21192092;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 251.78482,2123.336 0,1.8947" id="path33194" inkscape:path-effect="#path-effect28776-3-3-9" inkscape:original-d="m 251.78482,2123.336 0,1.8947" inkscape:connector-curvature="0"/>
+            <path style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 250.17544,2121.0119 0,1.6875" id="path33196" inkscape:path-effect="#path-effect28776-3-6-6" inkscape:original-d="m 250.17544,2121.0119 0,1.6875" inkscape:connector-curvature="0"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 250.17544,2124.6994 0,1.9834" inkscape:path-effect="#path-effect28947-1" id="path33198" d="m 250.17544,2124.6994 0,1.9834" style="fill:none;stroke:#92602f;stroke-width:0.21682934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 253.90982,2126.1683 0,2.1018" inkscape:path-effect="#path-effect28951-1" id="path33200" d="m 253.90982,2126.1683 0,2.1018" style="fill:none;stroke:#92602f;stroke-width:0.22320607;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 251.78482,2127.3673 0,0.793" inkscape:path-effect="#path-effect28955-9" id="path33202" d="m 251.78482,2127.3673 0,0.793" style="fill:none;stroke:#92602f;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
           </g>
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 384.36758,2206.4662 38.85167,20.125 0,40.779 -38.85167,-22.431 z"
-             style="fill:#e2e2e2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path33204" />
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             d="m 423.21925,2222.8412 25.85544,-35.9595 19.06181,19.7095 0,44.4304 -44.91725,16.3486 z"
-             style="fill:#eaeaea;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path33206" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 468.1365,2204.4125 7.00831,1.9209 0,6.1083 -7.00831,-3.625 z"
-             style="fill:#b3b3b3;stroke:none"
-             id="path33208" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 448.21667,2179.3386 26.93472,27.0019 -3.0864,4.2847 -27.06466,-27.4536 z"
-             style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path33210" />
-          <path
-             id="path33212"
-             style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 449.01543,2187.2118 -25.79619,35.9461 -4.96552,-1.6954 26.96249,-38.3869 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 408.23076,2162.3412 39.99999,17 -30.24999,42.5 -42.5,-22 z"
-             style="fill:url(#linearGradient33248);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path33214" />
-          <path
-             id="path33216"
-             style="fill:url(#linearGradient33250);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 375.54233,2202.6483 42.92326,22.1303 4.75365,0.5336 0,-3.3025 -4.69115,-0.4186 -42.99648,-21.7401 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc" />
-          <path
-             id="path33218"
-             style="fill:#7a1717;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 384.36758,2242.6238 38.85167,21.7799 0,2.9665 -38.85167,-22.431 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path33220"
-             style="fill:url(#linearGradient33252);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 420.52929,2224.7362 2.68995,0.2465 0,42.3875 -2.67591,-1.545 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 440.55043,2228.0417 12.97112,-3.7123 -0.0441,29.159 -12.92704,4.3227 z"
-             style="fill:#895b28;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path33222" />
-          <path
-             id="path33224"
-             style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 407.66995,2227.3965 -9.98788,-5.5527 0,15.8564 9.98788,5.6929 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path33226"
-             style="fill:url(#linearGradient33254);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 406.45461,2228.2141 -7.93285,-4.4371 0,12.9489 7.93285,4.2647 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 406.45461,2234.114 -7.93285,-4.2932 0,1.1839 7.93285,4.5218 c 0,-1.4142 0,-1.4125 0,-1.4125 z"
-             style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path33228" />
-          <path
-             id="path33230"
-             style="fill:url(#linearGradient33256);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 440.79326,2228.3542 11.93749,-3.0873 0,27.8465 -11.93749,4.3227 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 423.21924,2263.711 44.91726,-15.6559 0,2.9665 -44.91726,16.3486 z"
-             style="fill:#7a1717;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path33232" />
-          <path
-             transform="translate(213.72436,59.089498)"
-             d="m 238.2066,2182.4314 c 0,0.659 -0.31658,1.1932 -0.7071,1.1932 -0.39053,0 -0.70711,-0.5342 -0.70711,-1.1932 0,-0.659 0.31658,-1.1932 0.70711,-1.1932 0.39052,0 0.7071,0.5342 0.7071,1.1932 z"
-             sodipodi:ry="1.1932427"
-             sodipodi:rx="0.70710677"
-             sodipodi:cy="2182.4314"
-             sodipodi:cx="237.4995"
-             id="path33234"
-             style="fill:#dac331;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             id="path33236"
-             style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 402.81843,2239.0468 -0.0473,-12.8952 -0.92867,-0.5577 -0.0127,12.975 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 384.36758,2206.4662 38.85167,20.125 0,40.779 -38.85167,-22.431 z" style="fill:#e2e2e2;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33204"/>
+          <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" d="m 423.21925,2222.8412 25.85544,-35.9595 19.06181,19.7095 0,44.4304 -44.91725,16.3486 z" style="fill:#eaeaea;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33206"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 468.1365,2204.4125 7.00831,1.9209 0,6.1083 -7.00831,-3.625 z" style="fill:#b3b3b3;stroke:none" id="path33208"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 448.21667,2179.3386 26.93472,27.0019 -3.0864,4.2847 -27.06466,-27.4536 z" style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33210"/>
+          <path id="path33212" style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 449.01543,2187.2118 -25.79619,35.9461 -4.96552,-1.6954 26.96249,-38.3869 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 408.23076,2162.3412 39.99999,17 -30.24999,42.5 -42.5,-22 z" style="fill:url(#linearGradient33248);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33214"/>
+          <path id="path33216" style="fill:url(#linearGradient33250);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 375.54233,2202.6483 42.92326,22.1303 4.75365,0.5336 0,-3.3025 -4.69115,-0.4186 -42.99648,-21.7401 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+          <path id="path33218" style="fill:#7a1717;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 384.36758,2242.6238 38.85167,21.7799 0,2.9665 -38.85167,-22.431 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path33220" style="fill:url(#linearGradient33252);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.52929,2224.7362 2.68995,0.2465 0,42.3875 -2.67591,-1.545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 440.55043,2228.0417 12.97112,-3.7123 -0.0441,29.159 -12.92704,4.3227 z" style="fill:#895b28;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33222"/>
+          <path id="path33224" style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 407.66995,2227.3965 -9.98788,-5.5527 0,15.8564 9.98788,5.6929 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path33226" style="fill:url(#linearGradient33254);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 406.45461,2228.2141 -7.93285,-4.4371 0,12.9489 7.93285,4.2647 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 406.45461,2234.114 -7.93285,-4.2932 0,1.1839 7.93285,4.5218 c 0,-1.4142 0,-1.4125 0,-1.4125 z" style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33228"/>
+          <path id="path33230" style="fill:url(#linearGradient33256);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 440.79326,2228.3542 11.93749,-3.0873 0,27.8465 -11.93749,4.3227 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 423.21924,2263.711 44.91726,-15.6559 0,2.9665 -44.91726,16.3486 z" style="fill:#7a1717;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path33232"/>
+          <path transform="translate(213.72436,59.089498)" d="m 238.2066,2182.4314 c 0,0.659 -0.31658,1.1932 -0.7071,1.1932 -0.39053,0 -0.70711,-0.5342 -0.70711,-1.1932 0,-0.659 0.31658,-1.1932 0.70711,-1.1932 0.39052,0 0.7071,0.5342 0.7071,1.1932 z" sodipodi:ry="1.1932427" sodipodi:rx="0.70710677" sodipodi:cy="2182.4314" sodipodi:cx="237.4995" id="path33234" style="fill:#dac331;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path id="path33236" style="fill:#6e2c2c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 402.81843,2239.0468 -0.0473,-12.8952 -0.92867,-0.5577 -0.0127,12.975 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
         </g>
       </g>
     </g>
diff --git a/misc/images/svg/elements/Hub.svg b/misc/images/svg/elements/Hub.svg
index 9e06826767f..0ccee301b6c 100644
--- a/misc/images/svg/elements/Hub.svg
+++ b/misc/images/svg/elements/Hub.svg
@@ -1,995 +1,199 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="80.23642"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="Hub.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5801-0-4-1-0">
-      <stop
-         id="stop5803-5-77-3-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5805-98-0-6-4"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125742">
-      <stop
-         id="stop125744"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125746"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125749">
-      <stop
-         id="stop125751"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125753"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4449-4">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop4451-5" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop4453-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4457-1">
-      <stop
-         style="stop-color:#800000;stop-opacity:1;"
-         offset="0"
-         id="stop4459-7" />
-      <stop
-         style="stop-color:#800000;stop-opacity:0;"
-         offset="1"
-         id="stop4461-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient6526"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       id="linearGradient6520">
-      <stop
-         id="stop6522"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop6524"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125768">
-      <stop
-         id="stop125770"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125772"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125775">
-      <stop
-         id="stop125777"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125779"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125782">
-      <stop
-         id="stop125784"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125786"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125789">
-      <stop
-         id="stop125791"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125793"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125796">
-      <stop
-         id="stop125798"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125800"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125803">
-      <stop
-         id="stop125805"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125807"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125810">
-      <stop
-         id="stop125812"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125814"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125817">
-      <stop
-         id="stop125819"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125821"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125824">
-      <stop
-         id="stop125826"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125828"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125831">
-      <stop
-         id="stop125833"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125835"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125838">
-      <stop
-         id="stop125840"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125842"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125845">
-      <stop
-         id="stop125847"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125849"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125852">
-      <stop
-         id="stop125854"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125856"
-         offset="1"
-         style="stop-color:#10577c;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter3898"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.7915937"
-         id="feGaussianBlur3900" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="80.23642" id="svg2" version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="Hub.svg">
+  <defs id="defs4">
+    <linearGradient id="linearGradient5801-0-4-1-0">
+      <stop id="stop5803-5-77-3-9" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop5805-98-0-6-4" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125742">
+      <stop id="stop125744" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125746" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125749">
+      <stop id="stop125751" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125753" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient4449-4">
+      <stop style="stop-color:#008000;stop-opacity:1;" offset="0" id="stop4451-5"/>
+      <stop style="stop-color:#008000;stop-opacity:0;" offset="1" id="stop4453-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient4457-1">
+      <stop style="stop-color:#800000;stop-opacity:1;" offset="0" id="stop4459-7"/>
+      <stop style="stop-color:#800000;stop-opacity:0;" offset="1" id="stop4461-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient6526" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient id="linearGradient6520">
+      <stop id="stop6522" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop6524" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125768">
+      <stop id="stop125770" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125772" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125775">
+      <stop id="stop125777" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125779" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125782">
+      <stop id="stop125784" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125786" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125789">
+      <stop id="stop125791" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125793" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125796">
+      <stop id="stop125798" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125800" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125803">
+      <stop id="stop125805" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125807" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125810">
+      <stop id="stop125812" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125814" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125817">
+      <stop id="stop125819" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125821" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125824">
+      <stop id="stop125826" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125828" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125831">
+      <stop id="stop125833" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125835" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125838">
+      <stop id="stop125840" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125842" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125845">
+      <stop id="stop125847" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125849" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125852">
+      <stop id="stop125854" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125856" offset="1" style="stop-color:#10577c;stop-opacity:1;"/>
+    </linearGradient>
+    <filter inkscape:collect="always" id="filter3898" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.7915937" id="feGaussianBlur3900"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-1-0"
-       id="linearGradient3992"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93807502,0,0,0.93807502,224.55919,2103.3937)"
-       x1="158.86479"
-       y1="706.07477"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-1-0"
-       id="linearGradient3994"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93807502,0,0,0.93807502,255.34313,2116.7203)"
-       x1="173.61505"
-       y1="760.87512"
-       x2="65.997429"
-       y2="689.16925" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-1-0"
-       id="linearGradient3996"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93807502,0,0,0.93807502,255.34313,2116.7203)"
-       x1="319.22894"
-       y1="667.52386"
-       x2="118.96131"
-       y2="815.45764" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4449-4"
-       id="linearGradient3998"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2119905,0,0,1.2119905,-85.75807,-590.83914)"
-       x1="414.93307"
-       y1="2813.7981"
-       x2="419.81009"
-       y2="2813.7981" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4457-1"
-       id="linearGradient4000"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2119905,0,0,1.2119905,-85.75807,-590.83914)"
-       x1="415.09222"
-       y1="2820.1055"
-       x2="419.65094"
-       y2="2820.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4002"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4004"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4006"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4008"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4010"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4012"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4016"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4018"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4022"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4024"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4026"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient4028"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-1-0"
-       id="linearGradient3173"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93807502,0,0,0.93807502,224.55919,2103.3937)"
-       x1="158.86479"
-       y1="706.07477"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-1-0"
-       id="linearGradient3175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93807502,0,0,0.93807502,255.34313,2116.7203)"
-       x1="173.61505"
-       y1="760.87512"
-       x2="65.997429"
-       y2="689.16925" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-1-0"
-       id="linearGradient3177"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93807502,0,0,0.93807502,255.34313,2116.7203)"
-       x1="319.22894"
-       y1="667.52386"
-       x2="118.96131"
-       y2="815.45764" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4449-4"
-       id="linearGradient3179"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2119905,0,0,1.2119905,-85.75807,-590.83914)"
-       x1="414.93307"
-       y1="2813.7981"
-       x2="419.81009"
-       y2="2813.7981" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4457-1"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2119905,0,0,1.2119905,-85.75807,-590.83914)"
-       x1="415.09222"
-       y1="2820.1055"
-       x2="419.65094"
-       y2="2820.1055" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3183"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3185"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3187"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3189"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3191"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3193"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3195"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3197"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3199"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3201"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3203"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3205"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3207"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6520"
-       id="linearGradient3209"
-       gradientUnits="userSpaceOnUse"
-       x1="-557.98676"
-       y1="7464.0142"
-       x2="-552.38593"
-       y2="7519.0479" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-1-0" id="linearGradient3992" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93807502,0,0,0.93807502,224.55919,2103.3937)" x1="158.86479" y1="706.07477" x2="319.51733" y2="742.35919"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-1-0" id="linearGradient3994" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93807502,0,0,0.93807502,255.34313,2116.7203)" x1="173.61505" y1="760.87512" x2="65.997429" y2="689.16925"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-1-0" id="linearGradient3996" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93807502,0,0,0.93807502,255.34313,2116.7203)" x1="319.22894" y1="667.52386" x2="118.96131" y2="815.45764"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4449-4" id="linearGradient3998" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2119905,0,0,1.2119905,-85.75807,-590.83914)" x1="414.93307" y1="2813.7981" x2="419.81009" y2="2813.7981"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4457-1" id="linearGradient4000" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2119905,0,0,1.2119905,-85.75807,-590.83914)" x1="415.09222" y1="2820.1055" x2="419.65094" y2="2820.1055"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4002" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4004" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4006" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4008" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4010" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4012" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4014" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4016" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4018" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4020" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4022" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4024" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4026" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient4028" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-1-0" id="linearGradient3173" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93807502,0,0,0.93807502,224.55919,2103.3937)" x1="158.86479" y1="706.07477" x2="319.51733" y2="742.35919"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-1-0" id="linearGradient3175" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93807502,0,0,0.93807502,255.34313,2116.7203)" x1="173.61505" y1="760.87512" x2="65.997429" y2="689.16925"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-1-0" id="linearGradient3177" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93807502,0,0,0.93807502,255.34313,2116.7203)" x1="319.22894" y1="667.52386" x2="118.96131" y2="815.45764"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4449-4" id="linearGradient3179" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2119905,0,0,1.2119905,-85.75807,-590.83914)" x1="414.93307" y1="2813.7981" x2="419.81009" y2="2813.7981"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4457-1" id="linearGradient3181" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2119905,0,0,1.2119905,-85.75807,-590.83914)" x1="415.09222" y1="2820.1055" x2="419.65094" y2="2820.1055"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3183" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3185" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3187" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3189" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3191" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3193" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3195" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3197" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3199" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3201" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3203" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3205" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3207" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6520" id="linearGradient3209" gradientUnits="userSpaceOnUse" x1="-557.98676" y1="7464.0142" x2="-552.38593" y2="7519.0479"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-51.606987"
-     inkscape:cy="134.17221"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6528"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" inkscape:cx="-51.606987" inkscape:cy="134.17221" inkscape:document-units="px" inkscape:current-layer="g6528" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="968" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.22096,-551.66379)">
-    <g
-       style="display:inline"
-       transform="matrix(1.0266398,0,0,1.0266398,1046.5323,-7220.0693)"
-       id="g5698"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Hub.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g6528">
-        <g
-           style="display:inline"
-           transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-           id="g4863-1" />
-        <g
-           id="g3118"
-           inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Icons reduced whitespace\Tiny\Hub.png"
-           inkscape:export-xdpi="90"
-           inkscape:export-ydpi="90"
-           transform="translate(1.1340273e-6,1.2189894e-4)">
-          <g
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Tiny\Hub.png"
-             transform="matrix(0.97498037,0,0,0.97498037,-13.719249,190.86465)"
-             id="g3939">
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 190.21338,691.0295 81.78485,38.21794 c -17.02861,10.15729 -36.60437,20.04494 -53.33546,30.59488 l -78.41702,-42.48508 z"
-               style="opacity:0.85650222;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter3898)"
-               id="path5323-3-6-7-9-5"
-               transform="matrix(0.91112297,0,0,1.0144991,-711.52964,6873.5044)" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               id="rect3607-2-2-8-8-2"
-               style="fill:url(#linearGradient3173);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 403.86733,2757.3715 78.20953,28.148 -55.13804,31.8341 -72.96725,-42.1277 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               id="rect3628-2-7-5-1-7"
-               style="fill:url(#linearGradient3175);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 353.97157,2775.226 72.96723,42.1276 2e-5,18.6852 -72.96725,-42.981 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               id="rect3636-9-1-1-3-6"
-               style="fill:url(#linearGradient3177);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 426.93882,2817.3536 55.13806,-31.8341 0,18.6763 -55.13806,31.843 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               id="rect3607-1-9-8-0-0-1"
-               style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3179);stroke-width:0.56924582;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-               d="m 417.70608,2815.5907 4.73571,2.7705 0,5.1237 -4.73571,-2.7126 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <g
-               style="display:inline"
-               id="g34130-8-2-4"
-               transform="matrix(1.1134847,-0.06305443,0,1.1134847,-984.67114,4520.0003)">
-              <path
-                 id="rect34046-8-5-2"
-                 transform="translate(65.29157,14.177646)"
-                 d="m 340,2793.75 0,5.25 6.75957,4.3593 -0.01,-5.4843 -1.5,-0.9062 0.0346,-0.7767 -3.59709,-2.2859 0,0.875 z"
-                 style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 481.08801,2560.1294 1.91121,-0.078 0.0308,5.5131 -7.96576,-0.2322 z"
-                 style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 transform="matrix(0.85313008,0.52169825,0,1,0,0)"
-                 id="rect34056-44-6-3" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -754.60323,2741.0944 5.26259,-0.229 0.16812,0.2325 -5.17129,0.3702 z"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 transform="matrix(0.91628321,-0.40053099,0.40053099,0.91628321,0,0)"
-                 id="rect34063-3-0-2" />
-              <path
-                 id="path34067-3-7-2"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 407.21298,2814.3608 4.82406,-2.349 0.0284,0.302 -4.46509,2.2855 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 408.08798,2814.892 3.94906,-1.9271 -0.003,0.302 -3.55884,1.8636 z"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path34069-5-20-1" />
-              <path
-                 id="path34071-2-9-6"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 409.10361,2815.5014 2.94906,-1.4427 -0.0185,0.3176 -2.54321,1.3636 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 410.19737,2816.1733 1.83968,-0.9114 0.0284,0.3644 -1.48071,0.7855 z"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path34073-20-5-8" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-444.22096,-551.66379)">
+    <g style="display:inline" transform="matrix(1.0266398,0,0,1.0266398,1046.5323,-7220.0693)" id="g5698">
+      <g id="g6528">
+        <g style="display:inline" transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="g4863-1"/>
+        <g id="g3118" transform="translate(1.1340273e-6,1.2189894e-4)">
+          <g transform="matrix(0.97498037,0,0,0.97498037,-13.719249,190.86465)" id="g3939">
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 190.21338,691.0295 81.78485,38.21794 c -17.02861,10.15729 -36.60437,20.04494 -53.33546,30.59488 l -78.41702,-42.48508 z" style="opacity:0.85650222;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter3898)" id="path5323-3-6-7-9-5" transform="matrix(0.91112297,0,0,1.0144991,-711.52964,6873.5044)"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="rect3607-2-2-8-8-2" style="fill:url(#linearGradient3173);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 403.86733,2757.3715 78.20953,28.148 -55.13804,31.8341 -72.96725,-42.1277 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="rect3628-2-7-5-1-7" style="fill:url(#linearGradient3175);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 353.97157,2775.226 72.96723,42.1276 2e-5,18.6852 -72.96725,-42.981 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="rect3636-9-1-1-3-6" style="fill:url(#linearGradient3177);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 426.93882,2817.3536 55.13806,-31.8341 0,18.6763 -55.13806,31.843 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="rect3607-1-9-8-0-0-1" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3179);stroke-width:0.56924582;stroke-miterlimit:4;stroke-dasharray:none;display:inline" d="m 417.70608,2815.5907 4.73571,2.7705 0,5.1237 -4.73571,-2.7126 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <g style="display:inline" id="g34130-8-2-4" transform="matrix(1.1134847,-0.06305443,0,1.1134847,-984.67114,4520.0003)">
+              <path id="rect34046-8-5-2" transform="translate(65.29157,14.177646)" d="m 340,2793.75 0,5.25 6.75957,4.3593 -0.01,-5.4843 -1.5,-0.9062 0.0346,-0.7767 -3.59709,-2.2859 0,0.875 z" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 481.08801,2560.1294 1.91121,-0.078 0.0308,5.5131 -7.96576,-0.2322 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.85313008,0.52169825,0,1,0,0)" id="rect34056-44-6-3"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -754.60323,2741.0944 5.26259,-0.229 0.16812,0.2325 -5.17129,0.3702 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.91628321,-0.40053099,0.40053099,0.91628321,0,0)" id="rect34063-3-0-2"/>
+              <path id="path34067-3-7-2" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 407.21298,2814.3608 4.82406,-2.349 0.0284,0.302 -4.46509,2.2855 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 408.08798,2814.892 3.94906,-1.9271 -0.003,0.302 -3.55884,1.8636 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34069-5-20-1"/>
+              <path id="path34071-2-9-6" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 409.10361,2815.5014 2.94906,-1.4427 -0.0185,0.3176 -2.54321,1.3636 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 410.19737,2816.1733 1.83968,-0.9114 0.0284,0.3644 -1.48071,0.7855 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34073-20-5-8"/>
             </g>
-            <g
-               style="display:inline"
-               id="g34121-5-4-5"
-               transform="matrix(1.1504525,0,0,1.1504525,-999.44953,4390.3447)">
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 393.34327,2801.2865 0.0271,5.0583 6.3706,3.8274 0,-4.976 -1.42171,-0.8589 -0.039,-0.9757 -3.3376,-1.927 0,0.8293 z"
-                 id="path34075-0-3-7"
-                 sodipodi:nodetypes="ccccccccc" />
-              <path
-                 id="path34077-4-25-6"
-                 style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 398.21412,2804.3049 1.54541,0.8711 -0.0295,4.915 -6.34593,-3.738 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path34079-32-6-1"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 394.45354,2806.9101 4.48342,-2.1968 0.23426,0.1381 -4.35052,2.2847 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 395.16439,2807.384 4.57228,-2.2264 0.0269,0.2862 -4.23204,2.1662 z"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path34081-6-0-8" />
-              <path
-                 id="path34083-8-8-9"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 395.99373,2807.8874 3.74294,-1.8265 -0.003,0.2863 -3.3731,1.7663 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 396.95635,2808.465 2.79513,-1.3674 -0.0175,0.3011 -2.41047,1.2924 z"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path34085-8-8-2" />
-              <path
-                 id="path34087-1-1-7"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 397.99302,2809.1019 1.74366,-0.8639 0.0269,0.3454 -1.40343,0.7445 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
+            <g style="display:inline" id="g34121-5-4-5" transform="matrix(1.1504525,0,0,1.1504525,-999.44953,4390.3447)">
+              <path inkscape:connector-curvature="0" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 393.34327,2801.2865 0.0271,5.0583 6.3706,3.8274 0,-4.976 -1.42171,-0.8589 -0.039,-0.9757 -3.3376,-1.927 0,0.8293 z" id="path34075-0-3-7" sodipodi:nodetypes="ccccccccc"/>
+              <path id="path34077-4-25-6" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 398.21412,2804.3049 1.54541,0.8711 -0.0295,4.915 -6.34593,-3.738 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path id="path34079-32-6-1" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.45354,2806.9101 4.48342,-2.1968 0.23426,0.1381 -4.35052,2.2847 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 395.16439,2807.384 4.57228,-2.2264 0.0269,0.2862 -4.23204,2.1662 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34081-6-0-8"/>
+              <path id="path34083-8-8-9" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 395.99373,2807.8874 3.74294,-1.8265 -0.003,0.2863 -3.3731,1.7663 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 396.95635,2808.465 2.79513,-1.3674 -0.0175,0.3011 -2.41047,1.2924 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34085-8-8-2"/>
+              <path id="path34087-1-1-7" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 397.99302,2809.1019 1.74366,-0.8639 0.0269,0.3454 -1.40343,0.7445 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
             </g>
-            <g
-               style="display:inline"
-               id="g34139-5-5-9"
-               transform="matrix(1.1948348,0,0,1.1948348,-1016.3341,4266.8158)">
-              <path
-                 id="path34089-6-7-5"
-                 d="m 378.79924,2792.4716 0,4.717 5.94115,3.5345 0,-4.6208 -1.32025,-0.7976 0,-0.8853 -3.13561,-1.8104 0,0.7702 z"
-                 style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 383.32251,2795.2745 1.43511,0.8089 0,4.6569 -5.95838,-3.5517 z"
-                 style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path34091-2-5-4" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 379.83028,2797.6937 4.16348,-2.0399 0.21755,0.1282 -4.04007,2.1217 z"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path34093-3-7-3" />
-              <path
-                 id="path34095-8-9-1"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 380.49041,2798.1338 4.24599,-2.0675 0.0249,0.2659 -3.93003,2.0115 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 381.26055,2798.6014 3.47585,-1.6962 -0.003,0.2658 -3.13239,1.6403 z"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path34097-9-2-2" />
-              <path
-                 id="path34099-1-3-3"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 382.15448,2799.1378 2.59567,-1.2698 -0.0163,0.2795 -2.23845,1.2002 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 383.11718,2799.7291 1.61923,-0.8021 0.0249,0.3207 -1.30327,0.6914 z"
-                 style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path34101-1-7-3" />
+            <g style="display:inline" id="g34139-5-5-9" transform="matrix(1.1948348,0,0,1.1948348,-1016.3341,4266.8158)">
+              <path id="path34089-6-7-5" d="m 378.79924,2792.4716 0,4.717 5.94115,3.5345 0,-4.6208 -1.32025,-0.7976 0,-0.8853 -3.13561,-1.8104 0,0.7702 z" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 383.32251,2795.2745 1.43511,0.8089 0,4.6569 -5.95838,-3.5517 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34091-2-5-4"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 379.83028,2797.6937 4.16348,-2.0399 0.21755,0.1282 -4.04007,2.1217 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34093-3-7-3"/>
+              <path id="path34095-8-9-1" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 380.49041,2798.1338 4.24599,-2.0675 0.0249,0.2659 -3.93003,2.0115 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 381.26055,2798.6014 3.47585,-1.6962 -0.003,0.2658 -3.13239,1.6403 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34097-9-2-2"/>
+              <path id="path34099-1-3-3" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 382.15448,2799.1378 2.59567,-1.2698 -0.0163,0.2795 -2.23845,1.2002 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 383.11718,2799.7291 1.61923,-0.8021 0.0249,0.3207 -1.30327,0.6914 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34101-1-7-3"/>
             </g>
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               inkscape:connector-curvature="0"
-               style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 361.25711,2787.0528 0,5.8464 7.44405,4.3848 0,-5.682 -1.65423,-0.9995 0,-1.3012 -3.9288,-2.2683 0,1.157 z"
-               id="path34103-68-2-4"
-               sodipodi:nodetypes="ccccccccc" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               id="path34105-1-7-1"
-               style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 366.9246,2790.5648 1.79816,1.0135 0,5.8349 -7.46565,-4.5763 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               id="path34107-8-9-1"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 362.54897,2793.5959 5.21669,-2.5558 0.27258,0.1605 -5.06207,2.6584 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 363.37609,2794.1474 5.32008,-2.5905 0.0313,0.333 -4.9242,2.5205 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               id="path34109-7-36-3" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               id="path34111-19-3-8"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 364.34105,2794.7333 4.35512,-2.1254 -0.004,0.3332 -3.92475,2.0552 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 365.46111,2795.4054 3.25229,-1.5911 -0.0204,0.3502 -2.80469,1.5039 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               id="path34113-9-8-7" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               id="path34115-2-1-4"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-               d="m 366.66733,2796.1463 2.02885,-1.0051 0.0312,0.4018 -1.63296,0.8663 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)"
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 417.70608,2823.4763 4.73571,2.5287 0,4.8831 -4.73571,-2.7128 z"
-               style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3181);stroke-width:0.82624167;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-               id="path34159-0-0-2" />
-            <g
-               id="g5647"
-               transform="matrix(1.2119905,0,0,1.2119905,166.44108,-1506.8397)"
-               style="fill:url(#linearGradient3209);fill-opacity:1">
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -564.36909,7520.2368 28.71484,-15.2996 1.32832,0.4442 -28.72254,15.5084 z"
-                 style="fill:url(#linearGradient3183);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 id="rect3648-1-2-5-3-6" />
-              <path
-                 id="path3656-7-5-7-4-0"
-                 style="fill:url(#linearGradient3185);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 d="m -566.7786,7519.0454 28.38376,-15.0997 1.34176,0.4832 -28.49325,15.2258 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -569.34639,7517.7756 28.31411,-14.7796 1.37517,0.4951 -28.41532,14.9145 z"
-                 style="fill:url(#linearGradient3187);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 id="path3658-5-8-4-1-6" />
-              <path
-                 id="path3660-0-5-3-1-6"
-                 style="fill:url(#linearGradient3189);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 d="m -571.98364,7516.4715 28.30253,-14.4294 1.31078,0.472 -28.3487,14.5828 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -574.56955,7515.1929 28.51117,-14.0069 1.28185,0.4616 -28.50347,14.1829 z"
-                 style="fill:url(#linearGradient3191);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 id="path3662-9-8-7-3-1" />
-              <path
-                 id="path3664-9-4-2-8-8"
-                 style="fill:url(#linearGradient3193);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 d="m -577.06556,7513.9586 28.56211,-13.653 1.35988,0.4897 -28.71299,13.7612 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path3666-8-6-9-7-4"
-                 style="fill:url(#linearGradient3195);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 d="m -579.67027,7512.6707 28.56231,-13.303 1.37594,0.4955 -28.64851,13.4452 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -582.26202,7511.3891 28.48818,-12.9814 1.37828,0.4963 -28.56484,13.1287 z"
-                 style="fill:url(#linearGradient3197);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 id="path3668-9-8-2-4-9" />
-              <path
-                 id="path3670-8-5-2-2-6"
-                 style="fill:url(#linearGradient3199);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 d="m -584.84482,7510.1119 28.34967,-12.6842 1.37614,0.4956 -28.36564,12.8612 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -587.52521,7508.7865 28.00592,-12.4478 1.67167,0.602 -28.35444,12.5001 z"
-                 style="fill:url(#linearGradient3201);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 id="path3672-0-8-5-7-3" />
-              <path
-                 id="path3674-1-5-2-7-7"
-                 style="fill:url(#linearGradient3203);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 d="m -590.10479,7507.511 27.60763,-12.2446 1.60953,0.5796 -27.89723,12.3177 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -592.93831,7506.1099 27.43572,-11.9258 1.51231,0.5446 -27.40182,12.1457 z"
-                 style="fill:url(#linearGradient3205);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 id="path3676-8-9-50-9-8" />
-              <path
-                 id="path3678-0-7-4-3-8"
-                 style="fill:url(#linearGradient3207);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-                 d="m -595.4387,7504.8735 26.88363,-11.7885 1.63913,0.5902 -27.25493,11.8252 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" inkscape:connector-curvature="0" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 361.25711,2787.0528 0,5.8464 7.44405,4.3848 0,-5.682 -1.65423,-0.9995 0,-1.3012 -3.9288,-2.2683 0,1.157 z" id="path34103-68-2-4" sodipodi:nodetypes="ccccccccc"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="path34105-1-7-1" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 366.9246,2790.5648 1.79816,1.0135 0,5.8349 -7.46565,-4.5763 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="path34107-8-9-1" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 362.54897,2793.5959 5.21669,-2.5558 0.27258,0.1605 -5.06207,2.6584 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 363.37609,2794.1474 5.32008,-2.5905 0.0313,0.333 -4.9242,2.5205 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path34109-7-36-3"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="path34111-19-3-8" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 364.34105,2794.7333 4.35512,-2.1254 -0.004,0.3332 -3.92475,2.0552 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 365.46111,2795.4054 3.25229,-1.5911 -0.0204,0.3502 -2.80469,1.5039 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path34113-9-8-7"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" id="path34115-2-1-4" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 366.66733,2796.1463 2.02885,-1.0051 0.0312,0.4018 -1.63296,0.8663 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path transform="matrix(0.91872391,0,0,0.91872391,-905.88315,5037.0494)" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 417.70608,2823.4763 4.73571,2.5287 0,4.8831 -4.73571,-2.7128 z" style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3181);stroke-width:0.82624167;stroke-miterlimit:4;stroke-dasharray:none;display:inline" id="path34159-0-0-2"/>
+            <g id="g5647" transform="matrix(1.2119905,0,0,1.2119905,166.44108,-1506.8397)" style="fill:url(#linearGradient3209);fill-opacity:1">
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -564.36909,7520.2368 28.71484,-15.2996 1.32832,0.4442 -28.72254,15.5084 z" style="fill:url(#linearGradient3183);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="rect3648-1-2-5-3-6"/>
+              <path id="path3656-7-5-7-4-0" style="fill:url(#linearGradient3185);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m -566.7786,7519.0454 28.38376,-15.0997 1.34176,0.4832 -28.49325,15.2258 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -569.34639,7517.7756 28.31411,-14.7796 1.37517,0.4951 -28.41532,14.9145 z" style="fill:url(#linearGradient3187);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path3658-5-8-4-1-6"/>
+              <path id="path3660-0-5-3-1-6" style="fill:url(#linearGradient3189);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m -571.98364,7516.4715 28.30253,-14.4294 1.31078,0.472 -28.3487,14.5828 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -574.56955,7515.1929 28.51117,-14.0069 1.28185,0.4616 -28.50347,14.1829 z" style="fill:url(#linearGradient3191);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path3662-9-8-7-3-1"/>
+              <path id="path3664-9-4-2-8-8" style="fill:url(#linearGradient3193);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m -577.06556,7513.9586 28.56211,-13.653 1.35988,0.4897 -28.71299,13.7612 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path id="path3666-8-6-9-7-4" style="fill:url(#linearGradient3195);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m -579.67027,7512.6707 28.56231,-13.303 1.37594,0.4955 -28.64851,13.4452 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -582.26202,7511.3891 28.48818,-12.9814 1.37828,0.4963 -28.56484,13.1287 z" style="fill:url(#linearGradient3197);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path3668-9-8-2-4-9"/>
+              <path id="path3670-8-5-2-2-6" style="fill:url(#linearGradient3199);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m -584.84482,7510.1119 28.34967,-12.6842 1.37614,0.4956 -28.36564,12.8612 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -587.52521,7508.7865 28.00592,-12.4478 1.67167,0.602 -28.35444,12.5001 z" style="fill:url(#linearGradient3201);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path3672-0-8-5-7-3"/>
+              <path id="path3674-1-5-2-7-7" style="fill:url(#linearGradient3203);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m -590.10479,7507.511 27.60763,-12.2446 1.60953,0.5796 -27.89723,12.3177 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -592.93831,7506.1099 27.43572,-11.9258 1.51231,0.5446 -27.40182,12.1457 z" style="fill:url(#linearGradient3205);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path3676-8-9-50-9-8"/>
+              <path id="path3678-0-7-4-3-8" style="fill:url(#linearGradient3207);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m -595.4387,7504.8735 26.88363,-11.7885 1.63913,0.5902 -27.25493,11.8252 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
             </g>
           </g>
-          <rect
-             y="7570.0679"
-             x="-582.40515"
-             height="1.4759109"
-             width="119.05681"
-             id="rect3116"
-             style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+          <rect y="7570.0679" x="-582.40515" height="1.4759109" width="119.05681" id="rect3116" style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
         </g>
       </g>
     </g>
diff --git a/misc/images/svg/elements/IP_PBX.svg b/misc/images/svg/elements/IP_PBX.svg
index ad7c104bfde..56afc25f880 100644
--- a/misc/images/svg/elements/IP_PBX.svg
+++ b/misc/images/svg/elements/IP_PBX.svg
@@ -1,2197 +1,419 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="118.50569"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3"
-       id="linearGradient69189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.106446,0,0,1.0982774,769.20783,1757.5841)"
-       x1="460.23651"
-       y1="-965.29681"
-       x2="462.87714"
-       y2="-965.26556" />
-    <linearGradient
-       id="linearGradient4781-3">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5333-1"
-       x="-0.14196153"
-       width="1.2839231"
-       y="-0.2458846"
-       height="1.4917692">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="8.0777229"
-         id="feGaussianBlur5335-2" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="118.50569" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3" id="linearGradient69189" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.106446,0,0,1.0982774,769.20783,1757.5841)" x1="460.23651" y1="-965.29681" x2="462.87714" y2="-965.26556"/>
+    <linearGradient id="linearGradient4781-3">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5333-1" x="-0.14196153" width="1.2839231" y="-0.2458846" height="1.4917692">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="8.0777229" id="feGaussianBlur5335-2"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801"
-       id="linearGradient69191"
-       gradientUnits="userSpaceOnUse"
-       x1="158.86479"
-       y1="706.07477"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       id="linearGradient5801">
-      <stop
-         id="stop5803"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5805"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801"
-       id="linearGradient69193"
-       gradientUnits="userSpaceOnUse"
-       x1="173.61505"
-       y1="760.87512"
-       x2="65.997429"
-       y2="689.16925" />
-    <linearGradient
-       id="linearGradient125933">
-      <stop
-         id="stop125935"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125937"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801"
-       id="linearGradient69195"
-       gradientUnits="userSpaceOnUse"
-       x1="319.22894"
-       y1="667.52386"
-       x2="188.08318"
-       y2="761.83972" />
-    <linearGradient
-       id="linearGradient125940">
-      <stop
-         id="stop125942"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125944"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter5763"
-       x="-0.068371981"
-       width="1.136744"
-       y="-0.13107832"
-       height="1.2621566"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.29772692"
-         id="feGaussianBlur5765" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801" id="linearGradient69191" gradientUnits="userSpaceOnUse" x1="158.86479" y1="706.07477" x2="319.51733" y2="742.35919"/>
+    <linearGradient id="linearGradient5801">
+      <stop id="stop5803" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop5805" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801" id="linearGradient69193" gradientUnits="userSpaceOnUse" x1="173.61505" y1="760.87512" x2="65.997429" y2="689.16925"/>
+    <linearGradient id="linearGradient125933">
+      <stop id="stop125935" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125937" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801" id="linearGradient69195" gradientUnits="userSpaceOnUse" x1="319.22894" y1="667.52386" x2="188.08318" y2="761.83972"/>
+    <linearGradient id="linearGradient125940">
+      <stop id="stop125942" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125944" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <filter inkscape:collect="always" id="filter5763" x="-0.068371981" width="1.136744" y="-0.13107832" height="1.2621566" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.29772692" id="feGaussianBlur5765"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter5755"
-       x="-0.07161101"
-       width="1.143222"
-       y="-0.14175981"
-       height="1.2835196"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.31559987"
-         id="feGaussianBlur5757" />
+    <filter inkscape:collect="always" id="filter5755" x="-0.07161101" width="1.143222" y="-0.14175981" height="1.2835196" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.31559987" id="feGaussianBlur5757"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter5771"
-       x="-0.072505891"
-       width="1.1450118"
-       y="-0.13837889"
-       height="1.2767578"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.31063639"
-         id="feGaussianBlur5773" />
+    <filter inkscape:collect="always" id="filter5771" x="-0.072505891" width="1.1450118" y="-0.13837889" height="1.2767578" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.31063639" id="feGaussianBlur5773"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter5775"
-       x="-0.077720456"
-       width="1.1554409"
-       y="-0.14193143"
-       height="1.2838629"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.32433816"
-         id="feGaussianBlur5777" />
+    <filter inkscape:collect="always" id="filter5775" x="-0.077720456" width="1.1554409" y="-0.14193143" height="1.2838629" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.32433816" id="feGaussianBlur5777"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter7993-0-0-7-0"
-       x="-0.17000002"
-       width="1.34"
-       y="-0.092727274"
-       height="1.1854545">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.6939478"
-         id="feGaussianBlur7995-57-1-9-9" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter7993-0-0-7-0" x="-0.17000002" width="1.34" y="-0.092727274" height="1.1854545">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="3.6939478" id="feGaussianBlur7995-57-1-9-9"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39593-6-1"
-       id="radialGradient69197"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(6.3578606,-7.751052,3.3554948,2.7523707,-4674.2771,5051.5987)"
-       cx="713.94525"
-       cy="279.92365"
-       fx="713.94525"
-       fy="279.92365"
-       r="23.981091" />
-    <linearGradient
-       id="linearGradient39593-6-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39595-8-1" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39597-9-5" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient39593-6-1" id="radialGradient69197" gradientUnits="userSpaceOnUse" gradientTransform="matrix(6.3578606,-7.751052,3.3554948,2.7523707,-4674.2771,5051.5987)" cx="713.94525" cy="279.92365" fx="713.94525" fy="279.92365" r="23.981091"/>
+    <linearGradient id="linearGradient39593-6-1">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39595-8-1"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39597-9-5"/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter46966"
-       x="-0.036184639"
-       width="1.0723693"
-       y="-0.14797489"
-       height="1.2959498"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.96611874"
-         id="feGaussianBlur46968" />
+    <filter inkscape:collect="always" id="filter46966" x="-0.036184639" width="1.0723693" y="-0.14797489" height="1.2959498" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.96611874" id="feGaussianBlur46968"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5"
-       id="linearGradient69199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-928.33226)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient45657-4-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45659-8-4" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45661-6-31" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503"
-       id="linearGradient69201"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient13503">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop13505" />
-      <stop
-         id="stop13507"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5"
-       id="linearGradient69203"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-896.61885)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient125975">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop125977" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop125979" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503"
-       id="linearGradient69205"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-144.72539)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient125982">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop125984" />
-      <stop
-         id="stop125986"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5"
-       id="linearGradient69207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-865.51531)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient125993">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop125995" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop125997" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503"
-       id="linearGradient69209"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-113.62185)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126000">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126002" />
-      <stop
-         id="stop126004"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5"
-       id="linearGradient69211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-833.8019)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient126011">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126013" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126015" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503"
-       id="linearGradient69213"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-81.908438)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126018">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126020" />
-      <stop
-         id="stop126022"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5"
-       id="linearGradient69215"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-802.08849)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient126029">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126031" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126033" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503"
-       id="linearGradient69217"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-50.195031)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126036">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126038" />
-      <stop
-         id="stop126040"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5"
-       id="linearGradient69219"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-770.98495)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient126047">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126049" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126051" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503"
-       id="linearGradient69221"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-19.091492)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126054">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126056" />
-      <stop
-         id="stop126058"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7"
-       id="linearGradient69223"
-       gradientUnits="userSpaceOnUse"
-       x1="297.40717"
-       y1="3509.1924"
-       x2="314.71207"
-       y2="3410.9441" />
-    <linearGradient
-       id="linearGradient5311-7-4-7">
-      <stop
-         id="stop5313-3-2-7"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop5315-2-2-7"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter38419-4-6">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.7694005"
-         id="feGaussianBlur38421-6-0" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5" id="linearGradient69199" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-928.33226)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient45657-4-5">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45659-8-4"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45661-6-31"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503" id="linearGradient69201" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient13503">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop13505"/>
+      <stop id="stop13507" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5" id="linearGradient69203" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-896.61885)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient125975">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop125977"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop125979"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503" id="linearGradient69205" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-144.72539)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient125982">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop125984"/>
+      <stop id="stop125986" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5" id="linearGradient69207" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-865.51531)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient125993">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop125995"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop125997"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503" id="linearGradient69209" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-113.62185)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126000">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126002"/>
+      <stop id="stop126004" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5" id="linearGradient69211" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-833.8019)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient126011">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126013"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126015"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503" id="linearGradient69213" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-81.908438)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126018">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126020"/>
+      <stop id="stop126022" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5" id="linearGradient69215" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-802.08849)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient126029">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126031"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126033"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503" id="linearGradient69217" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-50.195031)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126036">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126038"/>
+      <stop id="stop126040" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5" id="linearGradient69219" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-770.98495)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient126047">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126049"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126051"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503" id="linearGradient69221" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-19.091492)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126054">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126056"/>
+      <stop id="stop126058" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7" id="linearGradient69223" gradientUnits="userSpaceOnUse" x1="297.40717" y1="3509.1924" x2="314.71207" y2="3410.9441"/>
+    <linearGradient id="linearGradient5311-7-4-7">
+      <stop id="stop5313-3-2-7" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop5315-2-2-7" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter38419-4-6">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="4.7694005" id="feGaussianBlur38421-6-0"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2"
-       id="linearGradient69225"
-       gradientUnits="userSpaceOnUse"
-       x1="264.81149"
-       y1="3440.2717"
-       x2="481.61218"
-       y2="3440.2717" />
-    <linearGradient
-       id="linearGradient45664-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45666-0" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45668-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2"
-       id="linearGradient69227"
-       gradientUnits="userSpaceOnUse"
-       x1="261.08292"
-       y1="3436.8167"
-       x2="371.50009"
-       y2="3503.804" />
-    <linearGradient
-       id="linearGradient126071">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126073" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126075" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2"
-       id="linearGradient69229"
-       gradientUnits="userSpaceOnUse"
-       x1="224.51013"
-       y1="3438.6394"
-       x2="310.77881"
-       y2="3470.2268" />
-    <linearGradient
-       id="linearGradient126078">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126080" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126082" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4"
-       id="linearGradient69231"
-       gradientUnits="userSpaceOnUse"
-       x1="499.38858"
-       y1="3030.9595"
-       x2="557.47589"
-       y2="2944.1663" />
-    <linearGradient
-       id="linearGradient45657-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45659-8" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45661-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2"
-       id="linearGradient69233"
-       gradientUnits="userSpaceOnUse"
-       x1="383.04486"
-       y1="3478.7351"
-       x2="429.69995"
-       y2="3502.1536" />
-    <linearGradient
-       id="linearGradient126089">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126091" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126093" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39579-9"
-       id="linearGradient69235"
-       gradientUnits="userSpaceOnUse"
-       x1="255.00148"
-       y1="3447.7202"
-       x2="470.04922"
-       y2="3443.0991" />
-    <linearGradient
-       id="linearGradient39579-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39581-2" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39583-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39663-2"
-       id="linearGradient69237"
-       gradientUnits="userSpaceOnUse"
-       x1="407.95468"
-       y1="2968.5569"
-       x2="393.68661"
-       y2="2941.3262" />
-    <linearGradient
-       id="linearGradient39663-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39665-0" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39667-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45643-9"
-       id="linearGradient69239"
-       gradientUnits="userSpaceOnUse"
-       x1="249.83018"
-       y1="3437.0818"
-       x2="297.52451"
-       y2="3451.2417" />
-    <linearGradient
-       id="linearGradient45643-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45645-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45647-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-8-0-7"
-       id="linearGradient69241"
-       gradientUnits="userSpaceOnUse"
-       x1="414.52451"
-       y1="3362.4617"
-       x2="403.10547"
-       y2="3417.4617" />
-    <linearGradient
-       id="linearGradient4781-3-8-0-7">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2-9-8-3" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5-0-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37431-0-0"
-       id="linearGradient69243"
-       gradientUnits="userSpaceOnUse"
-       x1="403.10547"
-       y1="3373.5867"
-       x2="477"
-       y2="3459.5867" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient37431-0-0">
-      <stop
-         style="stop-color:#008888;stop-opacity:1;"
-         offset="0"
-         id="stop37433-3-8" />
-      <stop
-         style="stop-color:#008888;stop-opacity:0;"
-         offset="1"
-         id="stop37435-5-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69245"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient37235-2-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37237-7-3" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop37239-7-60" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69247"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126120">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126122" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126124" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69249"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126127">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126129" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126131" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69251"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126134">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126136" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126138" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69253"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126141">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126143" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126145" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69255"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126148">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126150" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126152" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69257"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126155">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126157" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126159" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69259"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126162">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126164" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126166" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69261"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126169">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126171" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126173" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69263"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126176">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126178" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126180" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69265"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126183">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126185" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126187" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69267"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126190">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126192" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126194" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69269"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126197">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126199" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126201" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69271"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126204">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126206" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126208" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69273"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126211">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126213" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126215" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69275"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126218">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126220" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126222" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69277"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126225">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126227" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126229" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69279"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126232">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126234" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126236" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69281"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126239">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126241" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126243" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69283"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126246">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126248" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126250" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69285"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126253">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126255" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126257" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69287"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126260">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126262" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126264" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6"
-       id="linearGradient69289"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126267">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126269" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126271" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2" id="linearGradient69225" gradientUnits="userSpaceOnUse" x1="264.81149" y1="3440.2717" x2="481.61218" y2="3440.2717"/>
+    <linearGradient id="linearGradient45664-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45666-0"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45668-4"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2" id="linearGradient69227" gradientUnits="userSpaceOnUse" x1="261.08292" y1="3436.8167" x2="371.50009" y2="3503.804"/>
+    <linearGradient id="linearGradient126071">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126073"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126075"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2" id="linearGradient69229" gradientUnits="userSpaceOnUse" x1="224.51013" y1="3438.6394" x2="310.77881" y2="3470.2268"/>
+    <linearGradient id="linearGradient126078">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126080"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126082"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4" id="linearGradient69231" gradientUnits="userSpaceOnUse" x1="499.38858" y1="3030.9595" x2="557.47589" y2="2944.1663"/>
+    <linearGradient id="linearGradient45657-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45659-8"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45661-6"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2" id="linearGradient69233" gradientUnits="userSpaceOnUse" x1="383.04486" y1="3478.7351" x2="429.69995" y2="3502.1536"/>
+    <linearGradient id="linearGradient126089">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126091"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126093"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient39579-9" id="linearGradient69235" gradientUnits="userSpaceOnUse" x1="255.00148" y1="3447.7202" x2="470.04922" y2="3443.0991"/>
+    <linearGradient id="linearGradient39579-9">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39581-2"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39583-4"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient39663-2" id="linearGradient69237" gradientUnits="userSpaceOnUse" x1="407.95468" y1="2968.5569" x2="393.68661" y2="2941.3262"/>
+    <linearGradient id="linearGradient39663-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39665-0"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39667-4"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45643-9" id="linearGradient69239" gradientUnits="userSpaceOnUse" x1="249.83018" y1="3437.0818" x2="297.52451" y2="3451.2417"/>
+    <linearGradient id="linearGradient45643-9">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45645-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45647-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-8-0-7" id="linearGradient69241" gradientUnits="userSpaceOnUse" x1="414.52451" y1="3362.4617" x2="403.10547" y2="3417.4617"/>
+    <linearGradient id="linearGradient4781-3-8-0-7">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2-9-8-3"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5-0-4-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37431-0-0" id="linearGradient69243" gradientUnits="userSpaceOnUse" x1="403.10547" y1="3373.5867" x2="477" y2="3459.5867"/>
+    <linearGradient inkscape:collect="always" id="linearGradient37431-0-0">
+      <stop style="stop-color:#008888;stop-opacity:1;" offset="0" id="stop37433-3-8"/>
+      <stop style="stop-color:#008888;stop-opacity:0;" offset="1" id="stop37435-5-3"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69245" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient37235-2-6">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop37237-7-3"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop37239-7-60"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69247" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126120">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126122"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126124"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69249" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126127">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126129"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126131"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69251" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126134">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126136"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126138"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69253" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126141">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126143"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126145"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69255" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126148">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126150"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126152"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69257" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126155">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126157"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126159"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69259" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126162">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126164"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126166"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69261" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126169">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126171"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126173"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69263" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126176">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126178"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126180"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69265" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126183">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126185"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126187"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69267" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126190">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126192"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126194"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69269" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126197">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126199"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126201"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69271" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126204">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126206"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126208"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69273" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126211">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126213"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126215"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69275" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126218">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126220"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126222"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69277" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126225">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126227"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126229"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69279" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126232">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126234"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126236"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69281" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126239">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126241"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126243"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69283" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126246">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126248"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126250"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69285" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126253">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126255"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126257"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69287" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126260">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126262"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126264"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6" id="linearGradient69289" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126267">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126269"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126271"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="76.142853"
-     inkscape:cy="33.538557"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="66"
-     inkscape:window-y="87"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="76.142853" inkscape:cy="33.538557" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="66" inkscape:window-y="87" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-298.85715,-447.39505)">
-    <g
-       transform="translate(217.38056,-812.71427)"
-       style="display:inline"
-       id="g23894"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\IP_PBX.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         transform="matrix(0.37313039,0,0,0.37313039,96.267444,1017.7286)"
-         id="g55848">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 259.98099,663.83214 -4.84071,0 0,62.45221 4.84071,0 z"
-           style="fill:url(#linearGradient69189);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path55850" />
-        <g
-           id="g55852">
-          <path
-             transform="matrix(1,0,0,1.1134602,0,-66.517423)"
-             id="path55854"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5333-1)"
-             d="m 190.21338,691.0295 84.30377,36.12543 -58.77787,33.93541 -77.78402,-44.90858 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 191.14478,697.14877 83.37237,30.00616 -58.77787,33.93541 -77.78402,-44.90858 z"
-             style="fill:url(#linearGradient69191);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55856" />
-          <path
-             transform="translate(32.816074,14.206269)"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 105.13919,701.97549 77.78399,44.9086 3e-5,19.91869 -77.78402,-45.81829 z"
-             style="fill:url(#linearGradient69193);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55858" />
-          <path
-             sodipodi:nodetypes="ccc"
-             inkscape:connector-curvature="0"
-             d="m 153.06238,724.90385 46.46481,26.82648 c -28.89475,3.88764 -46.46481,-18.33023 -46.46481,-26.82648 z"
-             style="fill:#8fa2b0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55860" />
-          <path
-             transform="translate(32.816074,14.206269)"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 182.92321,746.88408 58.77787,-33.93542 0,19.90912 -58.77787,33.945 z"
-             style="fill:url(#linearGradient69195);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55862" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 197.39873,750.50148 39.51828,-21.43222 1.66414,0.6057 -39.41134,21.84903 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55864" />
-          <path
-             id="path55866"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 193.69313,748.36207 39.08921,-21.06804 2.19647,0.79945 -39.5146,21.2911 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 190.06148,746.26534 38.86286,-20.60625 2.24092,0.81563 -39.3327,20.81313 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55868" />
-          <path
-             id="path55870"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 186.25066,744.06516 38.96507,-19.9934 2.024,0.73667 -39.21799,20.27924 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 182.54506,741.92575 39.33495,-19.39238 1.9958,0.84716 -39.55967,19.56773 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55872" />
-          <path
-             id="path55874"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 178.91341,739.82902 39.40538,-18.8073 2.13014,0.90419 -39.76444,18.92562 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path55876"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 175.17051,737.668 39.64065,-18.13518 1.98814,0.84391 -39.85771,18.31378 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 171.46491,735.52859 39.46711,-17.64237 2.15179,0.91338 -39.84782,17.7515 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55878" />
-          <path
-             id="path55880"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 167.83326,733.43186 39.18629,-17.20639 1.97005,0.83624 -39.38526,17.39266 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 164.02244,731.23168 38.5877,-16.87789 2.54205,1.07904 -39.35867,16.82136 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55882" />
-          <path
-             id="path55884"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 160.31684,729.09227 37.98944,-16.43431 2.19554,0.80091 -38.4139,16.65591 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 156.33592,726.76269 37.57835,-16.10008 2.59113,1.09988 -38.04913,16.25556 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55886" />
-          <path
-             id="path55888"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 152.70366,724.6968 37.01886,-15.81348 2.28185,0.96859 -37.52963,15.8674 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 152.72452,724.7088 1.80954,1.04475 -0.173,4.05855 c -0.5557,-1.36658 -1.12044,-2.43971 -1.63654,-5.09332 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55890" />
-          <path
-             id="path55892"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 156.32366,726.75333 2.12971,1.26304 -0.173,7.98433 c -0.56271,-0.71053 -1.11524,-1.43122 -1.63654,-2.18316 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 160.32165,729.09501 1.80954,1.04475 -0.173,9.83199 c -0.55217,-0.52416 -1.10467,-1.04732 -1.63654,-1.63238 z"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55894" />
-          <path
-             id="path55896"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 163.98461,731.20982 1.80954,1.04475 -0.173,10.82808 c -0.54973,-0.42663 -1.09715,-0.85557 -1.63654,-1.29254 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 167.82312,733.42598 1.80954,1.04475 -0.173,11.22261 c -0.54551,-0.33385 -1.09103,-0.6738 -1.63654,-1.03863 z"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55898" />
-          <path
-             id="path55900"
-             style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 171.43593,735.51184 1.80954,1.04475 -0.173,11.10543 c -0.54551,-0.26116 -1.09103,-0.53669 -1.63654,-0.83942 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 175.09669,737.68788 1.80954,0.98225 -0.173,10.58222 c -0.54177,-0.21746 -1.08452,-0.43591 -1.63654,-0.66363 z"
-             style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55902" />
-          <path
-             id="path55904"
-             style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 178.89379,739.81764 1.80954,1.04475 -0.173,9.64449 c -0.54176,-0.16147 -1.08453,-0.32394 -1.63654,-0.49566 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 182.53029,741.91717 1.80954,1.04475 -0.173,8.39839 c -0.54551,-0.10782 -1.09103,-0.22254 -1.63654,-0.35113 z"
-             style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55906" />
-          <path
-             id="path55908"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 186.20131,744.03663 1.80954,1.04475 -0.173,6.83353 c -0.54551,-0.0543 -1.09103,-0.13017 -1.63654,-0.22613 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 190.05426,746.26114 1.80954,1.04475 -0.173,4.86714 -1.63654,-0.0738 z"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55910" />
-          <path
-             id="path55912"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 193.6684,748.34776 1.80954,1.04475 -0.173,2.72652 c -0.54551,0.0441 -1.09103,0.0521 -1.63654,0.0551 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 197.34721,750.47173 1.80954,1.04475 -0.005,0.26558 c -0.6015,0.0899 -1.20301,0.14358 -1.80451,0.19184 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55914" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 190.70885,741.74728 5.23376,3.35371 -4.07126,2.20923 -5.6059,-3.23657 z"
-             style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path55916" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 168.97267,729.02876 5.53505,3.29122 -4.85888,2.16006 -5.59196,-3.22851 z"
-             style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5763)"
-             id="path55918" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 160.72395,724.79949 6.15668,3.30299 -4.80265,2.04013 -5.77449,-3.40035 z"
-             style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5755)"
-             id="path55920" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 176.36093,733.32799 5.42473,3.1111 -4.80067,2.27648 -5.48163,-3.16481 z"
-             style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5771)"
-             id="path55922" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 183.77308,737.49097 5.15796,3.14973 -4.56782,2.33469 -5.44771,-3.14523 z"
-             style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5775)"
-             id="path55924" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-298.85715,-447.39505)">
+    <g transform="translate(217.38056,-812.71427)" style="display:inline" id="g23894">
+      <g transform="matrix(0.37313039,0,0,0.37313039,96.267444,1017.7286)" id="g55848">
+        <path inkscape:connector-curvature="0" d="m 259.98099,663.83214 -4.84071,0 0,62.45221 4.84071,0 z" style="fill:url(#linearGradient69189);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55850"/>
+        <g id="g55852">
+          <path transform="matrix(1,0,0,1.1134602,0,-66.517423)" id="path55854" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5333-1)" d="m 190.21338,691.0295 84.30377,36.12543 -58.77787,33.93541 -77.78402,-44.90858 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 191.14478,697.14877 83.37237,30.00616 -58.77787,33.93541 -77.78402,-44.90858 z" style="fill:url(#linearGradient69191);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55856"/>
+          <path transform="translate(32.816074,14.206269)" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 105.13919,701.97549 77.78399,44.9086 3e-5,19.91869 -77.78402,-45.81829 z" style="fill:url(#linearGradient69193);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55858"/>
+          <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" d="m 153.06238,724.90385 46.46481,26.82648 c -28.89475,3.88764 -46.46481,-18.33023 -46.46481,-26.82648 z" style="fill:#8fa2b0;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55860"/>
+          <path transform="translate(32.816074,14.206269)" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 182.92321,746.88408 58.77787,-33.93542 0,19.90912 -58.77787,33.945 z" style="fill:url(#linearGradient69195);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55862"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 197.39873,750.50148 39.51828,-21.43222 1.66414,0.6057 -39.41134,21.84903 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55864"/>
+          <path id="path55866" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 193.69313,748.36207 39.08921,-21.06804 2.19647,0.79945 -39.5146,21.2911 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 190.06148,746.26534 38.86286,-20.60625 2.24092,0.81563 -39.3327,20.81313 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55868"/>
+          <path id="path55870" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 186.25066,744.06516 38.96507,-19.9934 2.024,0.73667 -39.21799,20.27924 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 182.54506,741.92575 39.33495,-19.39238 1.9958,0.84716 -39.55967,19.56773 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55872"/>
+          <path id="path55874" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 178.91341,739.82902 39.40538,-18.8073 2.13014,0.90419 -39.76444,18.92562 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path55876" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 175.17051,737.668 39.64065,-18.13518 1.98814,0.84391 -39.85771,18.31378 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 171.46491,735.52859 39.46711,-17.64237 2.15179,0.91338 -39.84782,17.7515 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55878"/>
+          <path id="path55880" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 167.83326,733.43186 39.18629,-17.20639 1.97005,0.83624 -39.38526,17.39266 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 164.02244,731.23168 38.5877,-16.87789 2.54205,1.07904 -39.35867,16.82136 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55882"/>
+          <path id="path55884" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 160.31684,729.09227 37.98944,-16.43431 2.19554,0.80091 -38.4139,16.65591 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 156.33592,726.76269 37.57835,-16.10008 2.59113,1.09988 -38.04913,16.25556 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55886"/>
+          <path id="path55888" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 152.70366,724.6968 37.01886,-15.81348 2.28185,0.96859 -37.52963,15.8674 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 152.72452,724.7088 1.80954,1.04475 -0.173,4.05855 c -0.5557,-1.36658 -1.12044,-2.43971 -1.63654,-5.09332 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55890"/>
+          <path id="path55892" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 156.32366,726.75333 2.12971,1.26304 -0.173,7.98433 c -0.56271,-0.71053 -1.11524,-1.43122 -1.63654,-2.18316 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 160.32165,729.09501 1.80954,1.04475 -0.173,9.83199 c -0.55217,-0.52416 -1.10467,-1.04732 -1.63654,-1.63238 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55894"/>
+          <path id="path55896" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 163.98461,731.20982 1.80954,1.04475 -0.173,10.82808 c -0.54973,-0.42663 -1.09715,-0.85557 -1.63654,-1.29254 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 167.82312,733.42598 1.80954,1.04475 -0.173,11.22261 c -0.54551,-0.33385 -1.09103,-0.6738 -1.63654,-1.03863 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55898"/>
+          <path id="path55900" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 171.43593,735.51184 1.80954,1.04475 -0.173,11.10543 c -0.54551,-0.26116 -1.09103,-0.53669 -1.63654,-0.83942 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 175.09669,737.68788 1.80954,0.98225 -0.173,10.58222 c -0.54177,-0.21746 -1.08452,-0.43591 -1.63654,-0.66363 z" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55902"/>
+          <path id="path55904" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 178.89379,739.81764 1.80954,1.04475 -0.173,9.64449 c -0.54176,-0.16147 -1.08453,-0.32394 -1.63654,-0.49566 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 182.53029,741.91717 1.80954,1.04475 -0.173,8.39839 c -0.54551,-0.10782 -1.09103,-0.22254 -1.63654,-0.35113 z" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55906"/>
+          <path id="path55908" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 186.20131,744.03663 1.80954,1.04475 -0.173,6.83353 c -0.54551,-0.0543 -1.09103,-0.13017 -1.63654,-0.22613 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 190.05426,746.26114 1.80954,1.04475 -0.173,4.86714 -1.63654,-0.0738 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55910"/>
+          <path id="path55912" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 193.6684,748.34776 1.80954,1.04475 -0.173,2.72652 c -0.54551,0.0441 -1.09103,0.0521 -1.63654,0.0551 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 197.34721,750.47173 1.80954,1.04475 -0.005,0.26558 c -0.6015,0.0899 -1.20301,0.14358 -1.80451,0.19184 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55914"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 190.70885,741.74728 5.23376,3.35371 -4.07126,2.20923 -5.6059,-3.23657 z" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55916"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 168.97267,729.02876 5.53505,3.29122 -4.85888,2.16006 -5.59196,-3.22851 z" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5763)" id="path55918"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 160.72395,724.79949 6.15668,3.30299 -4.80265,2.04013 -5.77449,-3.40035 z" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5755)" id="path55920"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 176.36093,733.32799 5.42473,3.1111 -4.80067,2.27648 -5.48163,-3.16481 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5771)" id="path55922"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 183.77308,737.49097 5.15796,3.14973 -4.56782,2.33469 -5.44771,-3.14523 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5775)" id="path55924"/>
         </g>
-        <path
-           transform="matrix(1.3280882,0,0,2.4170878,-183.04301,-1152.8493)"
-           d="m 333.57762,751.60089 c 0,0.0732 -0.81619,0.13258 -1.82301,0.13258 -1.00682,0 -1.82301,-0.0594 -1.82301,-0.13258 0,-0.0732 0.81619,-0.13258 1.82301,-0.13258 1.00682,0 1.82301,0.0594 1.82301,0.13258 z"
-           sodipodi:ry="0.13258252"
-           sodipodi:rx="1.8230097"
-           sodipodi:cy="751.60089"
-           sodipodi:cx="331.75461"
-           id="path55926"
-           style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
+        <path transform="matrix(1.3280882,0,0,2.4170878,-183.04301,-1152.8493)" d="m 333.57762,751.60089 c 0,0.0732 -0.81619,0.13258 -1.82301,0.13258 -1.00682,0 -1.82301,-0.0594 -1.82301,-0.13258 0,-0.0732 0.81619,-0.13258 1.82301,-0.13258 1.00682,0 1.82301,0.0594 1.82301,0.13258 z" sodipodi:ry="0.13258252" sodipodi:rx="1.8230097" sodipodi:cy="751.60089" sodipodi:cx="331.75461" id="path55926" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
       </g>
-      <g
-         transform="matrix(-0.33974786,0,0,-0.31192045,365.03571,1387.0582)"
-         id="g55928">
-        <g
-           id="g55930"
-           transform="matrix(1.1658228,0,0,1.1658228,-223.77018,-23.517156)">
-          <rect
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7993-0-0-7-0)"
-             id="rect55932"
-             width="52.149849"
-             height="95.608063"
-             x="706.578"
-             y="217.21054"
-             rx="4.5029464"
-             transform="matrix(2.1771373,0,0,2.1771373,-763.31094,-331.07614)"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             rx="0"
-             y="141.82109"
-             x="775.00635"
-             height="208.1519"
-             width="113.53738"
-             id="rect55934"
-             style="fill:url(#radialGradient69197);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="2.6026535"
-             y="200.96188"
-             x="676.24481"
-             height="15.669449"
-             width="64.079262"
-             id="rect55936"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)"
-             ry="2.6026535" />
-          <rect
-             ry="4.3124557"
-             style="fill:url(#linearGradient69199);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect55938"
-             width="106.17586"
-             height="25.963427"
-             x="778.68713"
-             y="156.54411"
-             rx="4.3124557"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             rx="0"
-             y="162.40015"
-             x="792.35138"
-             height="5.1418839"
-             width="78.84758"
-             id="rect55940"
-             style="fill:url(#linearGradient69201);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"
-             ry="2.6026535"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)"
-             id="rect55942"
-             width="64.079262"
-             height="15.669449"
-             x="676.24481"
-             y="220.10156"
-             rx="2.6026535"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="4.3124557"
-             y="188.25754"
-             x="778.68713"
-             height="25.963427"
-             width="106.17586"
-             id="rect55944"
-             style="fill:url(#linearGradient69203);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             ry="4.3124557" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             style="fill:url(#linearGradient69205);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect55946"
-             width="78.84758"
-             height="5.1418839"
-             x="792.35138"
-             y="194.11356"
-             rx="0" />
-          <rect
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="2.6026535"
-             y="238.87317"
-             x="676.24481"
-             height="15.669449"
-             width="64.079262"
-             id="rect55948"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)"
-             ry="2.6026535" />
-          <rect
-             ry="4.3124557"
-             style="fill:url(#linearGradient69207);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect55950"
-             width="106.17586"
-             height="25.963427"
-             x="778.68713"
-             y="219.36107"
-             rx="4.3124557"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             rx="0"
-             y="225.21709"
-             x="792.35138"
-             height="5.1418839"
-             width="78.84758"
-             id="rect55952"
-             style="fill:url(#linearGradient69209);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"
-             ry="2.6026535"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)"
-             id="rect55954"
-             width="64.079262"
-             height="15.669449"
-             x="676.24481"
-             y="258.01285"
-             rx="2.6026535"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="4.3124557"
-             y="251.07448"
-             x="778.68713"
-             height="25.963427"
-             width="106.17586"
-             id="rect55956"
-             style="fill:url(#linearGradient69211);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             ry="4.3124557" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             style="fill:url(#linearGradient69213);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect55958"
-             width="78.84758"
-             height="5.1418839"
-             x="792.35138"
-             y="256.93051"
-             rx="0" />
-          <rect
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="2.6026535"
-             y="277.15253"
-             x="676.24481"
-             height="15.669449"
-             width="64.079262"
-             id="rect55960"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)"
-             ry="2.6026535" />
-          <rect
-             ry="4.3124557"
-             style="fill:url(#linearGradient69215);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect55962"
-             width="106.17586"
-             height="25.963427"
-             x="778.68713"
-             y="282.78787"
-             rx="4.3124557"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             rx="0"
-             y="288.64392"
-             x="792.35138"
-             height="5.1418839"
-             width="78.84758"
-             id="rect55964"
-             style="fill:url(#linearGradient69217);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"
-             ry="2.6026535"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)"
-             id="rect55966"
-             width="64.079262"
-             height="15.669449"
-             x="676.24481"
-             y="295.92413"
-             rx="2.6026535"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="4.3124557"
-             y="313.89142"
-             x="778.68713"
-             height="25.963427"
-             width="106.17586"
-             id="rect55968"
-             style="fill:url(#linearGradient69219);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             ry="4.3124557" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             style="fill:url(#linearGradient69221);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect55970"
-             width="78.84758"
-             height="5.1418839"
-             x="792.35138"
-             y="319.74744"
-             rx="0" />
+      <g transform="matrix(-0.33974786,0,0,-0.31192045,365.03571,1387.0582)" id="g55928">
+        <g id="g55930" transform="matrix(1.1658228,0,0,1.1658228,-223.77018,-23.517156)">
+          <rect style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7993-0-0-7-0)" id="rect55932" width="52.149849" height="95.608063" x="706.578" y="217.21054" rx="4.5029464" transform="matrix(2.1771373,0,0,2.1771373,-763.31094,-331.07614)"/>
+          <rect rx="0" y="141.82109" x="775.00635" height="208.1519" width="113.53738" id="rect55934" style="fill:url(#radialGradient69197);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <rect transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" rx="2.6026535" y="200.96188" x="676.24481" height="15.669449" width="64.079262" id="rect55936" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)" ry="2.6026535"/>
+          <rect ry="4.3124557" style="fill:url(#linearGradient69199);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect55938" width="106.17586" height="25.963427" x="778.68713" y="156.54411" rx="4.3124557"/>
+          <rect rx="0" y="162.40015" x="792.35138" height="5.1418839" width="78.84758" id="rect55940" style="fill:url(#linearGradient69201);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <rect transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" ry="2.6026535" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)" id="rect55942" width="64.079262" height="15.669449" x="676.24481" y="220.10156" rx="2.6026535"/>
+          <rect rx="4.3124557" y="188.25754" x="778.68713" height="25.963427" width="106.17586" id="rect55944" style="fill:url(#linearGradient69203);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557"/>
+          <rect style="fill:url(#linearGradient69205);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect55946" width="78.84758" height="5.1418839" x="792.35138" y="194.11356" rx="0"/>
+          <rect transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" rx="2.6026535" y="238.87317" x="676.24481" height="15.669449" width="64.079262" id="rect55948" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)" ry="2.6026535"/>
+          <rect ry="4.3124557" style="fill:url(#linearGradient69207);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect55950" width="106.17586" height="25.963427" x="778.68713" y="219.36107" rx="4.3124557"/>
+          <rect rx="0" y="225.21709" x="792.35138" height="5.1418839" width="78.84758" id="rect55952" style="fill:url(#linearGradient69209);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <rect transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" ry="2.6026535" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)" id="rect55954" width="64.079262" height="15.669449" x="676.24481" y="258.01285" rx="2.6026535"/>
+          <rect rx="4.3124557" y="251.07448" x="778.68713" height="25.963427" width="106.17586" id="rect55956" style="fill:url(#linearGradient69211);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557"/>
+          <rect style="fill:url(#linearGradient69213);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect55958" width="78.84758" height="5.1418839" x="792.35138" y="256.93051" rx="0"/>
+          <rect transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" rx="2.6026535" y="277.15253" x="676.24481" height="15.669449" width="64.079262" id="rect55960" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)" ry="2.6026535"/>
+          <rect ry="4.3124557" style="fill:url(#linearGradient69215);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect55962" width="106.17586" height="25.963427" x="778.68713" y="282.78787" rx="4.3124557"/>
+          <rect rx="0" y="288.64392" x="792.35138" height="5.1418839" width="78.84758" id="rect55964" style="fill:url(#linearGradient69217);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <rect transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" ry="2.6026535" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966)" id="rect55966" width="64.079262" height="15.669449" x="676.24481" y="295.92413" rx="2.6026535"/>
+          <rect rx="4.3124557" y="313.89142" x="778.68713" height="25.963427" width="106.17586" id="rect55968" style="fill:url(#linearGradient69219);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557"/>
+          <rect style="fill:url(#linearGradient69221);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect55970" width="78.84758" height="5.1418839" x="792.35138" y="319.74744" rx="0"/>
         </g>
       </g>
-      <g
-         transform="matrix(0.41026974,0,0,0.41026974,-18.20118,117.10043)"
-         id="g55972">
-        <path
-           id="path55974"
-           style="opacity:0.66367714;fill:url(#linearGradient69223);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38419-4-6)"
-           d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccssccccc"
-           transform="matrix(0.99314524,0,0,1.0733187,65.267577,-704.49343)" />
-        <path
-           transform="translate(65.29157,-457.32235)"
-           sodipodi:nodetypes="cccccccccccccccssccccc"
-           inkscape:connector-curvature="0"
-           d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z"
-           style="fill:url(#linearGradient69225);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path55976" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 307.375,3465.2117 c 34.26733,14.6434 68.94238,28.0977 107.1495,31.25 l 0,13.2576 c -24.68963,-1.6711 -57.21221,-9.8648 -107.1495,-32.1326 z"
-           style="fill:url(#linearGradient69227);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path55978" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 264.81149,3449.3193 c 13.86542,6.1358 27.70227,11.8873 42.69966,15.9856 l -0.13615,10.5803 c -14.35199,-5.2271 -28.43675,-10.9888 -42.56351,-16.6664 z"
-           style="fill:url(#linearGradient69229);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path55980" />
-        <path
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
-           d="m 479.81607,3039.13 55.61312,-85.3168 0.12069,3.7129 11.27145,3.1956 0.11249,6.9111 c -15.78066,28.2016 -33.36133,56.1548 -51.96791,82.9432 l -11.73005,-4.0877 -3.4198,5.922 z"
-           style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path55982" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 484.42913,3039.0198 51.13267,-81.4941 11.24742,3.1931 c -19.93534,34.7618 -36.66883,57.631 -53.38134,80.4223 z"
-           style="fill:url(#linearGradient69231);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path55984" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 419.09335,3496.342 9.01561,2.1213 1.59099,9.5018 -11.79985,-4.1543 z"
-           style="fill:url(#linearGradient69233);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path55986" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 371.32043,3389.7457 98.72881,21.5668 -55.52474,85.14 c -30.80213,-2.2501 -63.39824,-12.2959 -107.1495,-30.8697 z"
-           style="fill:url(#linearGradient69235);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path55988" />
-        <path
-           id="path55990"
-           style="fill:url(#linearGradient69237);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 413.11231,2930.8324 23.59872,1.591 -64.04446,76.036 c -16.39483,-5.1669 -20.93739,-6.7274 -42.59157,-16.4624 l 4.52414,-2.4954 28.21693,8.1501 c 15.92247,-22.9475 32.56027,-45.3226 50.29624,-66.8193 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 268.34702,3441.718 c 9.42697,6.402 19.55292,9.6953 29.17748,11.1369 l 0,7.9108 c -9.57244,-3.1473 -19.35461,-6.4281 -28.47038,-11.4021 z"
-           style="fill:url(#linearGradient69239);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path55992" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           d="m 355.90625,3392.2742 0.71875,8.4375 -13.05822,-1.5672 c 8.45723,-5.9316 9.47905,-5.9157 12.33947,-6.8703 z"
-           style="fill:#27343c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path55994" />
-        <path
-           transform="translate(65.29157,-457.32235)"
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 362.07612,3373.1864 c 10.40456,2.9805 9.17758,8.5477 6.82064,16.4372 l -12.27176,11.0881 -0.73625,-8.4589 c -16.78443,4.7009 -47.00113,40.6402 -46.88307,59.4089 -4.42767,4.02 -6.17212,6.0399 -11.48117,9.0598 l 0,-8.0434 c 17.21489,-35.1342 46.00261,-60.6212 64.55161,-79.4917 z"
-           style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path55996" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 380.25,3374.0867 c 27.40103,3.8438 54.47999,10.8575 81.22097,18.6616 L 449.75,3432.8367 c -24.31091,-12.4836 -57.75432,-20.0723 -93.125,-26 z"
-           style="fill:url(#linearGradient69241);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path55998" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 386.5,3383.8367 60,14.5 -6.25,20 -64.5,-16.5 z"
-           style="fill:url(#linearGradient69243);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path56000" />
-        <path
-           id="path56002"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.91657,2951.0144 c 36.67955,5.0391 66.90815,13.8479 91.875,25.25 l -8,11.75 -93.5,-25.75 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           transform="translate(65.29157,-457.57235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56004"
-           style="fill:url(#linearGradient69245);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69247);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56006"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(77.54157,-454.32235)" />
-        <path
-           transform="translate(91.14657,-450.82235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56008"
-           style="fill:url(#linearGradient69249);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69251);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56010"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(59.79157,-448.82235)" />
-        <path
-           transform="translate(72.04157,-445.57235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56012"
-           style="fill:url(#linearGradient69253);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69255);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56014"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(85.64657,-442.07235)" />
-        <path
-           transform="translate(51.69157,-439.02235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56016"
-           style="fill:url(#linearGradient69257);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69259);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56018"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(63.94157,-435.77235)" />
-        <path
-           transform="translate(77.54657,-432.27235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56020"
-           style="fill:url(#linearGradient69261);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69263);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56022"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(44.66657,-428.27235)" />
-        <path
-           transform="translate(56.91657,-425.02235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56024"
-           style="fill:url(#linearGradient69265);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69267);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56026"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(70.52157,-421.52235)" />
-        <path
-           transform="translate(95.77204,-413.02235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56028"
-           style="fill:url(#linearGradient69269);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69271);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56030"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,176.06657,551.20365)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,172.06657,556.07865)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56032"
-           style="fill:url(#linearGradient69273);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69275);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56034"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,185.44157,560.07865)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,190.44157,554.82865)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56036"
-           style="fill:url(#linearGradient69277);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69279);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56038"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,206.35957,558.82865)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,202.32204,564.20365)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56040"
-           style="fill:url(#linearGradient69281);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           transform="matrix(0.7,0,0,0.7,218.97857,562.20365)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56042"
-           style="fill:url(#linearGradient69283);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69285);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56044"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,215.74107,567.57865)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,231.49107,572.07865)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path56046"
-           style="fill:url(#linearGradient69287);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient69289);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56048"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,235.24107,566.95365)" />
-        <text
-           transform="matrix(1,0.39087979,-0.73785056,0.71158913,0,0)"
-           sodipodi:linespacing="125%"
-           id="text56050"
-           y="2812.095"
-           x="2508.6321"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2812.095"
-             x="2508.6321"
-             id="tspan56052"
-             sodipodi:role="line">1</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2564.4163"
-           y="2870.449"
-           id="text56054"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan56056"
-             x="2564.4163"
-             y="2870.449">2</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text56058"
-           y="2870.5251"
-           x="2577.9075"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2870.5251"
-             x="2577.9075"
-             id="tspan56060"
-             sodipodi:role="line">3</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2553.8669"
-           y="2880.3496"
-           id="text56062"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan56064"
-             x="2553.8669"
-             y="2880.3496">4</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text56066"
-           y="2880.5222"
-           x="2566.3687"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2880.5222"
-             x="2566.3687"
-             id="tspan56068"
-             sodipodi:role="line">5</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2579.8599"
-           y="2880.5984"
-           id="text56070"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan56072"
-             x="2579.8599"
-             y="2880.5984">6</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text56074"
-           y="2892.5071"
-           x="2554.7546"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2892.5071"
-             x="2554.7546"
-             id="tspan56076"
-             sodipodi:role="line">7</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2566.9827"
-           y="2892.5483"
-           id="text56078"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan56080"
-             x="2566.9827"
-             y="2892.5483">8</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text56082"
-           y="2892.4424"
-           x="2581.0466"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2892.4424"
-             x="2581.0466"
-             id="tspan56084"
-             sodipodi:role="line">9</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text56086"
-           y="2904.9302"
-           x="2569.2244"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2904.9302"
-             x="2569.2244"
-             id="tspan56088"
-             sodipodi:role="line">0</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2583.002"
-           y="2904.9153"
-           id="text56090"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan56092"
-             x="2583.002"
-             y="2904.9153">#</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text56094"
-           y="2906.1316"
-           x="2557.2061"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2906.1316"
-             x="2557.2061"
-             id="tspan56096"
-             sodipodi:role="line">*</tspan></text>
-        <path
-           sodipodi:nodetypes="ccccccc"
-           inkscape:connector-curvature="0"
-           d="m 465.90628,3024.2653 2.21823,-0.016 2.27115,-1.4201 -2.49315,5.2256 -0.73698,-1.9145 -1.75787,-0.8314 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path56098" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           d="m 461.46891,3392.7407 0.15609,20.471 -11.88716,19.6776 c 4.87601,-20.9096 7.98356,-30.2545 11.73107,-40.1486 z"
-           style="fill:#6b7377;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="translate(65.29157,-457.32235)"
-           id="path56100" />
-        <text
-           transform="matrix(0.88202664,0.23432752,-0.4878438,1.0041474,0,0)"
-           sodipodi:linespacing="125%"
-           id="text56102"
-           y="2488.5532"
-           x="1894.4528"
-           style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2488.5532"
-             x="1894.4528"
-             id="tspan56104"
-             sodipodi:role="line">ZABBIX</tspan></text>
+      <g transform="matrix(0.41026974,0,0,0.41026974,-18.20118,117.10043)" id="g55972">
+        <path id="path55974" style="opacity:0.66367714;fill:url(#linearGradient69223);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38419-4-6)" d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccssccccc" transform="matrix(0.99314524,0,0,1.0733187,65.267577,-704.49343)"/>
+        <path transform="translate(65.29157,-457.32235)" sodipodi:nodetypes="cccccccccccccccssccccc" inkscape:connector-curvature="0" d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z" style="fill:url(#linearGradient69225);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55976"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 307.375,3465.2117 c 34.26733,14.6434 68.94238,28.0977 107.1495,31.25 l 0,13.2576 c -24.68963,-1.6711 -57.21221,-9.8648 -107.1495,-32.1326 z" style="fill:url(#linearGradient69227);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path55978"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 264.81149,3449.3193 c 13.86542,6.1358 27.70227,11.8873 42.69966,15.9856 l -0.13615,10.5803 c -14.35199,-5.2271 -28.43675,-10.9888 -42.56351,-16.6664 z" style="fill:url(#linearGradient69229);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path55980"/>
+        <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" d="m 479.81607,3039.13 55.61312,-85.3168 0.12069,3.7129 11.27145,3.1956 0.11249,6.9111 c -15.78066,28.2016 -33.36133,56.1548 -51.96791,82.9432 l -11.73005,-4.0877 -3.4198,5.922 z" style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55982"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 484.42913,3039.0198 51.13267,-81.4941 11.24742,3.1931 c -19.93534,34.7618 -36.66883,57.631 -53.38134,80.4223 z" style="fill:url(#linearGradient69231);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55984"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 419.09335,3496.342 9.01561,2.1213 1.59099,9.5018 -11.79985,-4.1543 z" style="fill:url(#linearGradient69233);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path55986"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 371.32043,3389.7457 98.72881,21.5668 -55.52474,85.14 c -30.80213,-2.2501 -63.39824,-12.2959 -107.1495,-30.8697 z" style="fill:url(#linearGradient69235);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path55988"/>
+        <path id="path55990" style="fill:url(#linearGradient69237);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 413.11231,2930.8324 23.59872,1.591 -64.04446,76.036 c -16.39483,-5.1669 -20.93739,-6.7274 -42.59157,-16.4624 l 4.52414,-2.4954 28.21693,8.1501 c 15.92247,-22.9475 32.56027,-45.3226 50.29624,-66.8193 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 268.34702,3441.718 c 9.42697,6.402 19.55292,9.6953 29.17748,11.1369 l 0,7.9108 c -9.57244,-3.1473 -19.35461,-6.4281 -28.47038,-11.4021 z" style="fill:url(#linearGradient69239);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path55992"/>
+        <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" d="m 355.90625,3392.2742 0.71875,8.4375 -13.05822,-1.5672 c 8.45723,-5.9316 9.47905,-5.9157 12.33947,-6.8703 z" style="fill:#27343c;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path55994"/>
+        <path transform="translate(65.29157,-457.32235)" sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 362.07612,3373.1864 c 10.40456,2.9805 9.17758,8.5477 6.82064,16.4372 l -12.27176,11.0881 -0.73625,-8.4589 c -16.78443,4.7009 -47.00113,40.6402 -46.88307,59.4089 -4.42767,4.02 -6.17212,6.0399 -11.48117,9.0598 l 0,-8.0434 c 17.21489,-35.1342 46.00261,-60.6212 64.55161,-79.4917 z" style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path55996"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 380.25,3374.0867 c 27.40103,3.8438 54.47999,10.8575 81.22097,18.6616 L 449.75,3432.8367 c -24.31091,-12.4836 -57.75432,-20.0723 -93.125,-26 z" style="fill:url(#linearGradient69241);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path55998"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 386.5,3383.8367 60,14.5 -6.25,20 -64.5,-16.5 z" style="fill:url(#linearGradient69243);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path56000"/>
+        <path id="path56002" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.91657,2951.0144 c 36.67955,5.0391 66.90815,13.8479 91.875,25.25 l -8,11.75 -93.5,-25.75 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path transform="translate(65.29157,-457.57235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56004" style="fill:url(#linearGradient69245);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69247);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56006" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(77.54157,-454.32235)"/>
+        <path transform="translate(91.14657,-450.82235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56008" style="fill:url(#linearGradient69249);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69251);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56010" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(59.79157,-448.82235)"/>
+        <path transform="translate(72.04157,-445.57235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56012" style="fill:url(#linearGradient69253);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69255);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56014" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(85.64657,-442.07235)"/>
+        <path transform="translate(51.69157,-439.02235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56016" style="fill:url(#linearGradient69257);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69259);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56018" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(63.94157,-435.77235)"/>
+        <path transform="translate(77.54657,-432.27235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56020" style="fill:url(#linearGradient69261);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69263);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56022" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(44.66657,-428.27235)"/>
+        <path transform="translate(56.91657,-425.02235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56024" style="fill:url(#linearGradient69265);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69267);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56026" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(70.52157,-421.52235)"/>
+        <path transform="translate(95.77204,-413.02235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56028" style="fill:url(#linearGradient69269);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69271);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56030" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,176.06657,551.20365)"/>
+        <path transform="matrix(0.7,0,0,0.7,172.06657,556.07865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56032" style="fill:url(#linearGradient69273);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69275);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56034" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,185.44157,560.07865)"/>
+        <path transform="matrix(0.7,0,0,0.7,190.44157,554.82865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56036" style="fill:url(#linearGradient69277);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69279);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56038" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,206.35957,558.82865)"/>
+        <path transform="matrix(0.7,0,0,0.7,202.32204,564.20365)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56040" style="fill:url(#linearGradient69281);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path transform="matrix(0.7,0,0,0.7,218.97857,562.20365)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56042" style="fill:url(#linearGradient69283);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69285);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56044" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,215.74107,567.57865)"/>
+        <path transform="matrix(0.7,0,0,0.7,231.49107,572.07865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path56046" style="fill:url(#linearGradient69287);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient69289);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56048" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,235.24107,566.95365)"/>
+        <text transform="matrix(1,0.39087979,-0.73785056,0.71158913,0,0)" sodipodi:linespacing="125%" id="text56050" y="2812.095" x="2508.6321" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2812.095" x="2508.6321" id="tspan56052" sodipodi:role="line">1</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2564.4163" y="2870.449" id="text56054" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan56056" x="2564.4163" y="2870.449">2</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text56058" y="2870.5251" x="2577.9075" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2870.5251" x="2577.9075" id="tspan56060" sodipodi:role="line">3</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2553.8669" y="2880.3496" id="text56062" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan56064" x="2553.8669" y="2880.3496">4</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text56066" y="2880.5222" x="2566.3687" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2880.5222" x="2566.3687" id="tspan56068" sodipodi:role="line">5</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2579.8599" y="2880.5984" id="text56070" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan56072" x="2579.8599" y="2880.5984">6</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text56074" y="2892.5071" x="2554.7546" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2892.5071" x="2554.7546" id="tspan56076" sodipodi:role="line">7</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2566.9827" y="2892.5483" id="text56078" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan56080" x="2566.9827" y="2892.5483">8</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text56082" y="2892.4424" x="2581.0466" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2892.4424" x="2581.0466" id="tspan56084" sodipodi:role="line">9</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text56086" y="2904.9302" x="2569.2244" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2904.9302" x="2569.2244" id="tspan56088" sodipodi:role="line">0</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2583.002" y="2904.9153" id="text56090" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan56092" x="2583.002" y="2904.9153">#</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text56094" y="2906.1316" x="2557.2061" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2906.1316" x="2557.2061" id="tspan56096" sodipodi:role="line">*</tspan></text>
+        <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 465.90628,3024.2653 2.21823,-0.016 2.27115,-1.4201 -2.49315,5.2256 -0.73698,-1.9145 -1.75787,-0.8314 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path56098"/>
+        <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" d="m 461.46891,3392.7407 0.15609,20.471 -11.88716,19.6776 c 4.87601,-20.9096 7.98356,-30.2545 11.73107,-40.1486 z" style="fill:#6b7377;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path56100"/>
+        <text transform="matrix(0.88202664,0.23432752,-0.4878438,1.0041474,0,0)" sodipodi:linespacing="125%" id="text56102" y="2488.5532" x="1894.4528" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2488.5532" x="1894.4528" id="tspan56104" sodipodi:role="line">ZABBIX</tspan></text>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/IP_PBX_symbol.svg b/misc/images/svg/elements/IP_PBX_symbol.svg
index c612013ec23..82c28236dfc 100644
--- a/misc/images/svg/elements/IP_PBX_symbol.svg
+++ b/misc/images/svg/elements/IP_PBX_symbol.svg
@@ -1,2631 +1,590 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="118.50565"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4781-3">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5801">
-      <stop
-         id="stop5803"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5805"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125933">
-      <stop
-         id="stop125935"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125937"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125940">
-      <stop
-         id="stop125942"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop125944"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient39593-6-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39595-8-1" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39597-9-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient45657-4-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45659-8-4" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45661-6-31" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13503">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop13505" />
-      <stop
-         id="stop13507"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125975">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop125977" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop125979" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125982">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop125984" />
-      <stop
-         id="stop125986"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient125993">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop125995" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop125997" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126000">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126002" />
-      <stop
-         id="stop126004"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126011">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126013" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126015" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126018">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126020" />
-      <stop
-         id="stop126022"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126029">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126031" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126033" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126036">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126038" />
-      <stop
-         id="stop126040"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126047">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126049" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126051" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126054">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126056" />
-      <stop
-         id="stop126058"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5311-7-4-7">
-      <stop
-         id="stop5313-3-2-7"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop5315-2-2-7"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient45664-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45666-0" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45668-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126071">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126073" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126075" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126078">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126080" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126082" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient45657-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45659-8" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45661-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126089">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126091" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126093" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient39579-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39581-2" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39583-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient39663-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39665-0" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39667-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient45643-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45645-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45647-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4781-3-8-0-7">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2-9-8-3" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5-0-4-5" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient37235-2-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37237-7-3" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop37239-7-60" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126120">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126122" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126124" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126127">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126129" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126131" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126134">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126136" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126138" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126141">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126143" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126145" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126148">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126150" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126152" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126155">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126157" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126159" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126162">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126164" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126166" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126169">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126171" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126173" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126176">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126178" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126180" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126183">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126185" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126187" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126190">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126192" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126194" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126197">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126199" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126201" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126204">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126206" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126208" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126211">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126213" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126215" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126218">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126220" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126222" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126225">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126227" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126229" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126232">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126234" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126236" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126239">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126241" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126243" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126246">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126248" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126250" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126253">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126255" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126257" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126260">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126262" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126264" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient126267">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126269" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126271" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter9216-5"
-       x="-0.069969781"
-       width="1.1399395"
-       y="-0.182404"
-       height="1.364808">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.5101205"
-         id="feGaussianBlur9218-5" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="118.50565" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <linearGradient id="linearGradient4781-3">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5801">
+      <stop id="stop5803" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop5805" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125933">
+      <stop id="stop125935" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125937" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125940">
+      <stop id="stop125942" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop125944" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient39593-6-1">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39595-8-1"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39597-9-5"/>
+    </linearGradient>
+    <linearGradient id="linearGradient45657-4-5">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45659-8-4"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45661-6-31"/>
+    </linearGradient>
+    <linearGradient id="linearGradient13503">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop13505"/>
+      <stop id="stop13507" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125975">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop125977"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop125979"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125982">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop125984"/>
+      <stop id="stop125986" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient125993">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop125995"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop125997"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126000">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126002"/>
+      <stop id="stop126004" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126011">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126013"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126015"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126018">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126020"/>
+      <stop id="stop126022" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126029">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126031"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126033"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126036">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126038"/>
+      <stop id="stop126040" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126047">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126049"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126051"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126054">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126056"/>
+      <stop id="stop126058" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5311-7-4-7">
+      <stop id="stop5313-3-2-7" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop5315-2-2-7" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient45664-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45666-0"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45668-4"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126071">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126073"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126075"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126078">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126080"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126082"/>
+    </linearGradient>
+    <linearGradient id="linearGradient45657-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45659-8"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45661-6"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126089">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126091"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126093"/>
+    </linearGradient>
+    <linearGradient id="linearGradient39579-9">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39581-2"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39583-4"/>
+    </linearGradient>
+    <linearGradient id="linearGradient39663-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39665-0"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39667-4"/>
+    </linearGradient>
+    <linearGradient id="linearGradient45643-9">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45645-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45647-1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4781-3-8-0-7">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2-9-8-3"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5-0-4-5"/>
+    </linearGradient>
+    <linearGradient id="linearGradient37235-2-6">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop37237-7-3"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop37239-7-60"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126120">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126122"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126124"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126127">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126129"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126131"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126134">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126136"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126138"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126141">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126143"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126145"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126148">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126150"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126152"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126155">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126157"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126159"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126162">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126164"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126166"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126169">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126171"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126173"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126176">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126178"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126180"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126183">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126185"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126187"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126190">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126192"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126194"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126197">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126199"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126201"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126204">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126206"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126208"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126211">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126213"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126215"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126218">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126220"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126222"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126225">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126227"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126229"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126232">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126234"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126236"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126239">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126241"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126243"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126246">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126248"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126250"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126253">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126255"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126257"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126260">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126262"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126264"/>
+    </linearGradient>
+    <linearGradient id="linearGradient126267">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126269"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126271"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter9216-5" x="-0.069969781" width="1.1399395" y="-0.182404" height="1.364808">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="5.5101205" id="feGaussianBlur9218-5"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44599-4"
-       id="radialGradient112517"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8399617,0,0,2.0180867,-801.87631,686.3042)"
-       cx="997.38855"
-       cy="-662.14374"
-       fx="997.38855"
-       fy="-662.14374"
-       r="109.43819" />
-    <linearGradient
-       id="linearGradient44599-4">
-      <stop
-         id="stop44601-2"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.74646086"
-         id="stop44603-7" />
-      <stop
-         id="stop44605-5"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44589-4"
-       id="radialGradient112519"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0029987,-0.02499486,0.00775171,0.87105506,-1717.6929,-22.539722)"
-       cx="869.76385"
-       cy="-381.34979"
-       fx="869.76385"
-       fy="-381.34979"
-       r="94.5" />
-    <linearGradient
-       id="linearGradient44589-4">
-      <stop
-         id="stop44591-0"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.84582919"
-         id="stop44593-1-9" />
-      <stop
-         id="stop44595-7-4"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154-3"
-       id="linearGradient112537"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9154-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9156-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop9158-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178-1"
-       id="linearGradient112539"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9178-1">
-      <stop
-         style="stop-color:#576274;stop-opacity:1;"
-         offset="0"
-         id="stop9180-0" />
-      <stop
-         style="stop-color:#576274;stop-opacity:0;"
-         offset="1"
-         id="stop9182-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154-3"
-       id="linearGradient112521"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178-1"
-       id="linearGradient112523"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9080-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154-3"
-       id="linearGradient112525"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178-1"
-       id="linearGradient112527"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9088-5"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154-3"
-       id="linearGradient112529"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178-1"
-       id="linearGradient112531"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9098-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154-3"
-       id="linearGradient112533"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178-1"
-       id="linearGradient112535"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9112-5"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter7993-0-0-7-0-1"
-       x="-0.17000002"
-       width="1.34"
-       y="-0.092727274"
-       height="1.1854545">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.6939478"
-         id="feGaussianBlur7995-57-1-9-9-7" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient44599-4" id="radialGradient112517" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.8399617,0,0,2.0180867,-801.87631,686.3042)" cx="997.38855" cy="-662.14374" fx="997.38855" fy="-662.14374" r="109.43819"/>
+    <linearGradient id="linearGradient44599-4">
+      <stop id="stop44601-2" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.74646086" id="stop44603-7"/>
+      <stop id="stop44605-5" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient44589-4" id="radialGradient112519" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.0029987,-0.02499486,0.00775171,0.87105506,-1717.6929,-22.539722)" cx="869.76385" cy="-381.34979" fx="869.76385" fy="-381.34979" r="94.5"/>
+    <linearGradient id="linearGradient44589-4">
+      <stop id="stop44591-0" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.84582919" id="stop44593-1-9"/>
+      <stop id="stop44595-7-4" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154-3" id="linearGradient112537" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9154-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop9156-5"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop9158-8"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178-1" id="linearGradient112539" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9178-1">
+      <stop style="stop-color:#576274;stop-opacity:1;" offset="0" id="stop9180-0"/>
+      <stop style="stop-color:#576274;stop-opacity:0;" offset="1" id="stop9182-3"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154-3" id="linearGradient112521" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178-1" id="linearGradient112523" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9080-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154-3" id="linearGradient112525" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178-1" id="linearGradient112527" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9088-5" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154-3" id="linearGradient112529" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178-1" id="linearGradient112531" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9098-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154-3" id="linearGradient112533" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178-1" id="linearGradient112535" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9112-5" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter7993-0-0-7-0-1" x="-0.17000002" width="1.34" y="-0.092727274" height="1.1854545">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="3.6939478" id="feGaussianBlur7995-57-1-9-9-7"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39593-6-1-4"
-       id="radialGradient111950"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(6.3578606,-7.751052,3.3554948,2.7523707,-4674.2771,5051.5987)"
-       cx="713.94525"
-       cy="279.92365"
-       fx="713.94525"
-       fy="279.92365"
-       r="23.981091" />
-    <linearGradient
-       id="linearGradient39593-6-1-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39595-8-1-0" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39597-9-5-9" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter46966-4"
-       x="-0.036184639"
-       width="1.0723693"
-       y="-0.14797489"
-       height="1.2959498"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.96611874"
-         id="feGaussianBlur46968-8" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient39593-6-1-4" id="radialGradient111950" gradientUnits="userSpaceOnUse" gradientTransform="matrix(6.3578606,-7.751052,3.3554948,2.7523707,-4674.2771,5051.5987)" cx="713.94525" cy="279.92365" fx="713.94525" fy="279.92365" r="23.981091"/>
+    <linearGradient id="linearGradient39593-6-1-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39595-8-1-0"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39597-9-5-9"/>
+    </linearGradient>
+    <filter inkscape:collect="always" id="filter46966-4" x="-0.036184639" width="1.0723693" y="-0.14797489" height="1.2959498" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.96611874" id="feGaussianBlur46968-8"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-8"
-       id="linearGradient111952"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-928.33226)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient45657-4-5-8">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45659-8-4-2" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45661-6-31-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503-5"
-       id="linearGradient111954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient13503-5">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop13505-5" />
-      <stop
-         id="stop13507-1"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-8"
-       id="linearGradient111956"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-896.61885)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient126514">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126516" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126518" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503-5"
-       id="linearGradient111958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-144.72539)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126521">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126523" />
-      <stop
-         id="stop126525"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-8"
-       id="linearGradient111960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-865.51531)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient126532">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126534" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126536" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503-5"
-       id="linearGradient111962"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-113.62185)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126539">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126541" />
-      <stop
-         id="stop126543"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-8"
-       id="linearGradient111964"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-833.8019)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient126550">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126552" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126554" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503-5"
-       id="linearGradient111966"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-81.908438)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126557">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126559" />
-      <stop
-         id="stop126561"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-8"
-       id="linearGradient111968"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-802.08849)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient126568">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126570" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126572" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503-5"
-       id="linearGradient111970"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-50.195031)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126575">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126577" />
-      <stop
-         id="stop126579"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-8"
-       id="linearGradient111972"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-770.98495)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient126586">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126588" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126590" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13503-5"
-       id="linearGradient111974"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-19.091492)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient126593">
-      <stop
-         style="stop-color:#0f0f0f;stop-opacity:1;"
-         offset="0"
-         id="stop126595" />
-      <stop
-         id="stop126597"
-         offset="1"
-         style="stop-color:#062a73;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7"
-       id="linearGradient111976"
-       gradientUnits="userSpaceOnUse"
-       x1="297.40717"
-       y1="3509.1924"
-       x2="314.71207"
-       y2="3410.9441" />
-    <linearGradient
-       id="linearGradient5311-7-4-7-7">
-      <stop
-         id="stop5313-3-2-7-1"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop5315-2-2-7-1"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter38419-4-6-5">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.7694005"
-         id="feGaussianBlur38421-6-0-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-8" id="linearGradient111952" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-928.33226)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient45657-4-5-8">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45659-8-4-2"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45661-6-31-4"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503-5" id="linearGradient111954" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient13503-5">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop13505-5"/>
+      <stop id="stop13507-1" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-8" id="linearGradient111956" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-896.61885)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient126514">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126516"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126518"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503-5" id="linearGradient111958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-144.72539)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126521">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126523"/>
+      <stop id="stop126525" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-8" id="linearGradient111960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-865.51531)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient126532">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126534"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126536"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503-5" id="linearGradient111962" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-113.62185)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126539">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126541"/>
+      <stop id="stop126543" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-8" id="linearGradient111964" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-833.8019)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient126550">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126552"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126554"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503-5" id="linearGradient111966" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-81.908438)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126557">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126559"/>
+      <stop id="stop126561" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-8" id="linearGradient111968" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-802.08849)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient126568">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126570"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126572"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503-5" id="linearGradient111970" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-50.195031)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126575">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126577"/>
+      <stop id="stop126579" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-8" id="linearGradient111972" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-770.98495)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient126586">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126588"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126590"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient13503-5" id="linearGradient111974" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-19.091492)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient126593">
+      <stop style="stop-color:#0f0f0f;stop-opacity:1;" offset="0" id="stop126595"/>
+      <stop id="stop126597" offset="1" style="stop-color:#062a73;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7" id="linearGradient111976" gradientUnits="userSpaceOnUse" x1="297.40717" y1="3509.1924" x2="314.71207" y2="3410.9441"/>
+    <linearGradient id="linearGradient5311-7-4-7-7">
+      <stop id="stop5313-3-2-7-1" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop5315-2-2-7-1" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter38419-4-6-5">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="4.7694005" id="feGaussianBlur38421-6-0-2"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2-7"
-       id="linearGradient111978"
-       gradientUnits="userSpaceOnUse"
-       x1="264.81149"
-       y1="3440.2717"
-       x2="481.61218"
-       y2="3440.2717" />
-    <linearGradient
-       id="linearGradient45664-2-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45666-0-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45668-4-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2-7"
-       id="linearGradient111980"
-       gradientUnits="userSpaceOnUse"
-       x1="261.08292"
-       y1="3436.8167"
-       x2="371.50009"
-       y2="3503.804" />
-    <linearGradient
-       id="linearGradient126610">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126612" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126614" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2-7"
-       id="linearGradient111982"
-       gradientUnits="userSpaceOnUse"
-       x1="224.51013"
-       y1="3438.6394"
-       x2="310.77881"
-       y2="3470.2268" />
-    <linearGradient
-       id="linearGradient126617">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126619" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126621" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-4"
-       id="linearGradient111984"
-       gradientUnits="userSpaceOnUse"
-       x1="499.38858"
-       y1="3030.9595"
-       x2="557.47589"
-       y2="2944.1663" />
-    <linearGradient
-       id="linearGradient45657-4-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45659-8-2" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45661-6-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2-7"
-       id="linearGradient111986"
-       gradientUnits="userSpaceOnUse"
-       x1="383.04486"
-       y1="3478.7351"
-       x2="429.69995"
-       y2="3502.1536" />
-    <linearGradient
-       id="linearGradient126628">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126630" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126632" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39579-9-2"
-       id="linearGradient111988"
-       gradientUnits="userSpaceOnUse"
-       x1="255.00148"
-       y1="3447.7202"
-       x2="470.04922"
-       y2="3443.0991" />
-    <linearGradient
-       id="linearGradient39579-9-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39581-2-2" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39583-4-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39663-2-6"
-       id="linearGradient111990"
-       gradientUnits="userSpaceOnUse"
-       x1="407.95468"
-       y1="2968.5569"
-       x2="393.68661"
-       y2="2941.3262" />
-    <linearGradient
-       id="linearGradient39663-2-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39665-0-8" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39667-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45643-9-7"
-       id="linearGradient111992"
-       gradientUnits="userSpaceOnUse"
-       x1="249.83018"
-       y1="3437.0818"
-       x2="297.52451"
-       y2="3451.2417" />
-    <linearGradient
-       id="linearGradient45643-9-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45645-6-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45647-1-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-8-0-7-8"
-       id="linearGradient111994"
-       gradientUnits="userSpaceOnUse"
-       x1="414.52451"
-       y1="3362.4617"
-       x2="403.10547"
-       y2="3417.4617" />
-    <linearGradient
-       id="linearGradient4781-3-8-0-7-8">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2-9-8-3-9" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5-0-4-5-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37431-0-0-7"
-       id="linearGradient111996"
-       gradientUnits="userSpaceOnUse"
-       x1="403.10547"
-       y1="3373.5867"
-       x2="477"
-       y2="3459.5867" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient37431-0-0-7">
-      <stop
-         style="stop-color:#008888;stop-opacity:1;"
-         offset="0"
-         id="stop37433-3-8-9" />
-      <stop
-         style="stop-color:#008888;stop-opacity:0;"
-         offset="1"
-         id="stop37435-5-3-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient111998"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient37235-2-6-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37237-7-3-3" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop37239-7-60-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112000"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126659">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126661" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126663" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112002"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126666">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126668" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126670" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112004"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126673">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126675" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126677" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112006"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126680">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126682" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126684" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112008"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126687">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126689" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126691" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112010"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126694">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126696" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126698" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112012"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126701">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126703" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126705" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112014"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126708">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126710" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126712" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112016"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126715">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126717" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126719" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112018"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126722">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126724" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126726" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112020"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126729">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126731" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126733" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112022"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126736">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126738" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126740" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112024"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126743">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126745" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126747" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112026"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126750">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126752" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126754" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112028"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126757">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126759" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112030"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126764">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126766" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126768" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112032"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126771">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126773" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126775" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112034"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126778">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126780" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126782" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112036"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126785">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126787" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126789" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112038"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126792">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126794" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126796" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112040"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126799">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126801" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126803" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-4"
-       id="linearGradient112042"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient126806">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop126808" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop126810" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2-7" id="linearGradient111978" gradientUnits="userSpaceOnUse" x1="264.81149" y1="3440.2717" x2="481.61218" y2="3440.2717"/>
+    <linearGradient id="linearGradient45664-2-7">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45666-0-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45668-4-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2-7" id="linearGradient111980" gradientUnits="userSpaceOnUse" x1="261.08292" y1="3436.8167" x2="371.50009" y2="3503.804"/>
+    <linearGradient id="linearGradient126610">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126612"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126614"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2-7" id="linearGradient111982" gradientUnits="userSpaceOnUse" x1="224.51013" y1="3438.6394" x2="310.77881" y2="3470.2268"/>
+    <linearGradient id="linearGradient126617">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126619"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126621"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-4" id="linearGradient111984" gradientUnits="userSpaceOnUse" x1="499.38858" y1="3030.9595" x2="557.47589" y2="2944.1663"/>
+    <linearGradient id="linearGradient45657-4-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45659-8-2"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45661-6-3"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2-7" id="linearGradient111986" gradientUnits="userSpaceOnUse" x1="383.04486" y1="3478.7351" x2="429.69995" y2="3502.1536"/>
+    <linearGradient id="linearGradient126628">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126630"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126632"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient39579-9-2" id="linearGradient111988" gradientUnits="userSpaceOnUse" x1="255.00148" y1="3447.7202" x2="470.04922" y2="3443.0991"/>
+    <linearGradient id="linearGradient39579-9-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39581-2-2"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39583-4-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient39663-2-6" id="linearGradient111990" gradientUnits="userSpaceOnUse" x1="407.95468" y1="2968.5569" x2="393.68661" y2="2941.3262"/>
+    <linearGradient id="linearGradient39663-2-6">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39665-0-8"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39667-4-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45643-9-7" id="linearGradient111992" gradientUnits="userSpaceOnUse" x1="249.83018" y1="3437.0818" x2="297.52451" y2="3451.2417"/>
+    <linearGradient id="linearGradient45643-9-7">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45645-6-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45647-1-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-8-0-7-8" id="linearGradient111994" gradientUnits="userSpaceOnUse" x1="414.52451" y1="3362.4617" x2="403.10547" y2="3417.4617"/>
+    <linearGradient id="linearGradient4781-3-8-0-7-8">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2-9-8-3-9"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5-0-4-5-2"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37431-0-0-7" id="linearGradient111996" gradientUnits="userSpaceOnUse" x1="403.10547" y1="3373.5867" x2="477" y2="3459.5867"/>
+    <linearGradient inkscape:collect="always" id="linearGradient37431-0-0-7">
+      <stop style="stop-color:#008888;stop-opacity:1;" offset="0" id="stop37433-3-8-9"/>
+      <stop style="stop-color:#008888;stop-opacity:0;" offset="1" id="stop37435-5-3-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient111998" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient37235-2-6-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop37237-7-3-3"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop37239-7-60-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112000" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126659">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126661"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126663"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112002" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126666">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126668"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126670"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112004" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126673">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126675"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126677"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112006" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126680">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126682"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126684"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112008" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126687">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126689"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126691"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112010" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126694">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126696"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126698"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112012" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126701">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126703"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126705"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112014" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126708">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126710"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126712"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112016" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126715">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126717"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126719"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112018" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126722">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126724"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126726"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112020" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126729">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126731"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126733"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112022" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126736">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126738"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126740"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112024" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126743">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126745"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126747"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112026" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126750">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126752"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126754"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112028" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126757">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126759"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126761"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112030" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126764">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126766"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126768"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112032" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126771">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126773"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126775"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112034" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126778">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126780"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126782"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112036" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126785">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126787"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126789"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112038" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126792">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126794"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126796"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112040" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126799">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126801"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126803"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-4" id="linearGradient112042" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient126806">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop126808"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop126810"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="110.42857"
-     inkscape:cy="-0.74717785"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="132"
-     inkscape:window-y="174"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="110.42857" inkscape:cy="-0.74717785" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="132" inkscape:window-y="174" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-264.57143,-413.10936)">
-    <g
-       transform="matrix(0.24750249,0,0,0.24750249,131.15422,618.05552)"
-       style="display:inline"
-       id="g66971"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\IP_PBX_symbol.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         style="display:inline"
-         id="g64553"
-         transform="matrix(-1.3727048,0,0,-1.260272,1684.7359,-315.13735)">
-        <g
-           transform="matrix(1.1658228,0,0,1.1658228,-223.77018,-23.517156)"
-           id="g64555">
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             transform="matrix(2.1771373,0,0,2.1771373,-763.31094,-331.07614)"
-             rx="4.5029464"
-             y="217.21054"
-             x="706.578"
-             height="95.608063"
-             width="52.149849"
-             id="rect64557"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7993-0-0-7-0-1)" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             style="fill:url(#radialGradient111950);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect64559"
-             width="113.53738"
-             height="208.1519"
-             x="775.00635"
-             y="141.82109"
-             rx="0" />
-          <rect
-             ry="2.6026535"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)"
-             id="rect64561"
-             width="64.079262"
-             height="15.669449"
-             x="676.24481"
-             y="200.96188"
-             rx="2.6026535"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90"
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="4.3124557"
-             y="156.54411"
-             x="778.68713"
-             height="25.963427"
-             width="106.17586"
-             id="rect64563"
-             style="fill:url(#linearGradient111952);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             ry="4.3124557" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             style="fill:url(#linearGradient111954);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect64565"
-             width="78.84758"
-             height="5.1418839"
-             x="792.35138"
-             y="162.40015"
-             rx="0" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="2.6026535"
-             y="220.10156"
-             x="676.24481"
-             height="15.669449"
-             width="64.079262"
-             id="rect64567"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)"
-             ry="2.6026535"
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" />
-          <rect
-             ry="4.3124557"
-             style="fill:url(#linearGradient111956);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect64569"
-             width="106.17586"
-             height="25.963427"
-             x="778.68713"
-             y="188.25754"
-             rx="4.3124557"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             rx="0"
-             y="194.11356"
-             x="792.35138"
-             height="5.1418839"
-             width="78.84758"
-             id="rect64571"
-             style="fill:url(#linearGradient111958);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             ry="2.6026535"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)"
-             id="rect64573"
-             width="64.079262"
-             height="15.669449"
-             x="676.24481"
-             y="238.87317"
-             rx="2.6026535"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90"
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="4.3124557"
-             y="219.36107"
-             x="778.68713"
-             height="25.963427"
-             width="106.17586"
-             id="rect64575"
-             style="fill:url(#linearGradient111960);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             ry="4.3124557" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             style="fill:url(#linearGradient111962);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect64577"
-             width="78.84758"
-             height="5.1418839"
-             x="792.35138"
-             y="225.21709"
-             rx="0" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="2.6026535"
-             y="258.01285"
-             x="676.24481"
-             height="15.669449"
-             width="64.079262"
-             id="rect64579"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)"
-             ry="2.6026535"
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" />
-          <rect
-             ry="4.3124557"
-             style="fill:url(#linearGradient111964);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect64581"
-             width="106.17586"
-             height="25.963427"
-             x="778.68713"
-             y="251.07448"
-             rx="4.3124557"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             rx="0"
-             y="256.93051"
-             x="792.35138"
-             height="5.1418839"
-             width="78.84758"
-             id="rect64583"
-             style="fill:url(#linearGradient111966);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             ry="2.6026535"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)"
-             id="rect64585"
-             width="64.079262"
-             height="15.669449"
-             x="676.24481"
-             y="277.15253"
-             rx="2.6026535"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90"
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="4.3124557"
-             y="282.78787"
-             x="778.68713"
-             height="25.963427"
-             width="106.17586"
-             id="rect64587"
-             style="fill:url(#linearGradient111968);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             ry="4.3124557" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             style="fill:url(#linearGradient111970);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect64589"
-             width="78.84758"
-             height="5.1418839"
-             x="792.35138"
-             y="288.64392"
-             rx="0" />
-          <rect
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             rx="2.6026535"
-             y="295.92413"
-             x="676.24481"
-             height="15.669449"
-             width="64.079262"
-             id="rect64591"
-             style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)"
-             ry="2.6026535"
-             transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)" />
-          <rect
-             ry="4.3124557"
-             style="fill:url(#linearGradient111972);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect64593"
-             width="106.17586"
-             height="25.963427"
-             x="778.68713"
-             y="313.89142"
-             rx="4.3124557"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
-          <rect
-             rx="0"
-             y="319.74744"
-             x="792.35138"
-             height="5.1418839"
-             width="78.84758"
-             id="rect64595"
-             style="fill:url(#linearGradient111974);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-264.57143,-413.10936)">
+    <g transform="matrix(0.24750249,0,0,0.24750249,131.15422,618.05552)" style="display:inline" id="g66971">
+      <g style="display:inline" id="g64553" transform="matrix(-1.3727048,0,0,-1.260272,1684.7359,-315.13735)">
+        <g transform="matrix(1.1658228,0,0,1.1658228,-223.77018,-23.517156)" id="g64555">
+          <rect transform="matrix(2.1771373,0,0,2.1771373,-763.31094,-331.07614)" rx="4.5029464" y="217.21054" x="706.578" height="95.608063" width="52.149849" id="rect64557" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7993-0-0-7-0-1)"/>
+          <rect style="fill:url(#radialGradient111950);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect64559" width="113.53738" height="208.1519" x="775.00635" y="141.82109" rx="0"/>
+          <rect ry="2.6026535" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)" id="rect64561" width="64.079262" height="15.669449" x="676.24481" y="200.96188" rx="2.6026535" transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"/>
+          <rect rx="4.3124557" y="156.54411" x="778.68713" height="25.963427" width="106.17586" id="rect64563" style="fill:url(#linearGradient111952);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557"/>
+          <rect style="fill:url(#linearGradient111954);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect64565" width="78.84758" height="5.1418839" x="792.35138" y="162.40015" rx="0"/>
+          <rect rx="2.6026535" y="220.10156" x="676.24481" height="15.669449" width="64.079262" id="rect64567" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)" ry="2.6026535" transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"/>
+          <rect ry="4.3124557" style="fill:url(#linearGradient111956);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect64569" width="106.17586" height="25.963427" x="778.68713" y="188.25754" rx="4.3124557"/>
+          <rect rx="0" y="194.11356" x="792.35138" height="5.1418839" width="78.84758" id="rect64571" style="fill:url(#linearGradient111958);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <rect ry="2.6026535" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)" id="rect64573" width="64.079262" height="15.669449" x="676.24481" y="238.87317" rx="2.6026535" transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"/>
+          <rect rx="4.3124557" y="219.36107" x="778.68713" height="25.963427" width="106.17586" id="rect64575" style="fill:url(#linearGradient111960);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557"/>
+          <rect style="fill:url(#linearGradient111962);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect64577" width="78.84758" height="5.1418839" x="792.35138" y="225.21709" rx="0"/>
+          <rect rx="2.6026535" y="258.01285" x="676.24481" height="15.669449" width="64.079262" id="rect64579" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)" ry="2.6026535" transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"/>
+          <rect ry="4.3124557" style="fill:url(#linearGradient111964);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect64581" width="106.17586" height="25.963427" x="778.68713" y="251.07448" rx="4.3124557"/>
+          <rect rx="0" y="256.93051" x="792.35138" height="5.1418839" width="78.84758" id="rect64583" style="fill:url(#linearGradient111966);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <rect ry="2.6026535" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)" id="rect64585" width="64.079262" height="15.669449" x="676.24481" y="277.15253" rx="2.6026535" transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"/>
+          <rect rx="4.3124557" y="282.78787" x="778.68713" height="25.963427" width="106.17586" id="rect64587" style="fill:url(#linearGradient111968);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557"/>
+          <rect style="fill:url(#linearGradient111970);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect64589" width="78.84758" height="5.1418839" x="792.35138" y="288.64392" rx="0"/>
+          <rect rx="2.6026535" y="295.92413" x="676.24481" height="15.669449" width="64.079262" id="rect64591" style="opacity:0.78026907;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-4)" ry="2.6026535" transform="matrix(1.6569457,0,0,1.6569457,-341.81381,-176.4388)"/>
+          <rect ry="4.3124557" style="fill:url(#linearGradient111972);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect64593" width="106.17586" height="25.963427" x="778.68713" y="313.89142" rx="4.3124557"/>
+          <rect rx="0" y="319.74744" x="792.35138" height="5.1418839" width="78.84758" id="rect64595" style="fill:url(#linearGradient111974);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
         </g>
       </g>
-      <g
-         style="display:inline"
-         id="g64597"
-         transform="matrix(1.6576388,0,0,1.6576388,136.31964,-5446.2283)">
-        <path
-           transform="matrix(0.99314524,0,0,1.0733187,65.267577,-704.49343)"
-           sodipodi:nodetypes="cccccccccccccccssccccc"
-           inkscape:connector-curvature="0"
-           d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z"
-           style="opacity:0.66367714;fill:url(#linearGradient111976);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38419-4-6-5)"
-           id="path64599" />
-        <path
-           id="path64601"
-           style="fill:url(#linearGradient111978);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccssccccc"
-           transform="translate(65.29157,-457.32235)" />
-        <path
-           id="path64603"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:url(#linearGradient111980);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 307.375,3465.2117 c 34.26733,14.6434 68.94238,28.0977 107.1495,31.25 l 0,13.2576 c -24.68963,-1.6711 -57.21221,-9.8648 -107.1495,-32.1326 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path64605"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:url(#linearGradient111982);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 264.81149,3449.3193 c 13.86542,6.1358 27.70227,11.8873 42.69966,15.9856 l -0.13615,10.5803 c -14.35199,-5.2271 -28.43675,-10.9888 -42.56351,-16.6664 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path64607"
-           style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 479.81607,3039.13 55.61312,-85.3168 0.12069,3.7129 11.27145,3.1956 0.11249,6.9111 c -15.78066,28.2016 -33.36133,56.1548 -51.96791,82.9432 l -11.73005,-4.0877 -3.4198,5.922 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccc" />
-        <path
-           id="path64609"
-           style="fill:url(#linearGradient111984);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 484.42913,3039.0198 51.13267,-81.4941 11.24742,3.1931 c -19.93534,34.7618 -36.66883,57.631 -53.38134,80.4223 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path64611"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:url(#linearGradient111986);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 419.09335,3496.342 9.01561,2.1213 1.59099,9.5018 -11.79985,-4.1543 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path64613"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:url(#linearGradient111988);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 371.32043,3389.7457 98.72881,21.5668 -55.52474,85.14 c -30.80213,-2.2501 -63.39824,-12.2959 -107.1495,-30.8697 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccccc"
-           inkscape:connector-curvature="0"
-           d="m 413.11231,2930.8324 23.59872,1.591 -64.04446,76.036 c -16.39483,-5.1669 -20.93739,-6.7274 -42.59157,-16.4624 l 4.52414,-2.4954 28.21693,8.1501 c 15.92247,-22.9475 32.56027,-45.3226 50.29624,-66.8193 z"
-           style="fill:url(#linearGradient111990);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64615" />
-        <path
-           id="path64617"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:url(#linearGradient111992);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 268.34702,3441.718 c 9.42697,6.402 19.55292,9.6953 29.17748,11.1369 l 0,7.9108 c -9.57244,-3.1473 -19.35461,-6.4281 -28.47038,-11.4021 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path64619"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:#27343c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 355.90625,3392.2742 0.71875,8.4375 -13.05822,-1.5672 c 8.45723,-5.9316 9.47905,-5.9157 12.33947,-6.8703 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="path64621"
-           style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 362.07612,3373.1864 c 10.40456,2.9805 9.17758,8.5477 6.82064,16.4372 l -12.27176,11.0881 -0.73625,-8.4589 c -16.78443,4.7009 -47.00113,40.6402 -46.88307,59.4089 -4.42767,4.02 -6.17212,6.0399 -11.48117,9.0598 l 0,-8.0434 c 17.21489,-35.1342 46.00261,-60.6212 64.55161,-79.4917 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc"
-           transform="translate(65.29157,-457.32235)" />
-        <path
-           id="path64623"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:url(#linearGradient111994);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 380.25,3374.0867 c 27.40103,3.8438 54.47999,10.8575 81.22097,18.6616 L 449.75,3432.8367 c -24.31091,-12.4836 -57.75432,-20.0723 -93.125,-26 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path64625"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:url(#linearGradient111996);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 386.5,3383.8367 60,14.5 -6.25,20 -64.5,-16.5 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.91657,2951.0144 c 36.67955,5.0391 66.90815,13.8479 91.875,25.25 l -8,11.75 -93.5,-25.75 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64627" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient111998);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64629"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(65.29157,-457.57235)" />
-        <path
-           transform="translate(77.54157,-454.32235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64631"
-           style="fill:url(#linearGradient112000);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112002);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64633"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(91.14657,-450.82235)" />
-        <path
-           transform="translate(59.79157,-448.82235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64635"
-           style="fill:url(#linearGradient112004);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112006);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64637"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(72.04157,-445.57235)" />
-        <path
-           transform="translate(85.64657,-442.07235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64639"
-           style="fill:url(#linearGradient112008);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112010);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64641"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(51.69157,-439.02235)" />
-        <path
-           transform="translate(63.94157,-435.77235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64643"
-           style="fill:url(#linearGradient112012);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112014);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64645"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(77.54657,-432.27235)" />
-        <path
-           transform="translate(44.66657,-428.27235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64647"
-           style="fill:url(#linearGradient112016);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112018);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64649"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(56.91657,-425.02235)" />
-        <path
-           transform="translate(70.52157,-421.52235)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64651"
-           style="fill:url(#linearGradient112020);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112022);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64653"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="translate(95.77204,-413.02235)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,176.06657,551.20365)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64655"
-           style="fill:url(#linearGradient112024);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112026);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64657"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,172.06657,556.07865)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,185.44157,560.07865)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64659"
-           style="fill:url(#linearGradient112028);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112030);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64661"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,190.44157,554.82865)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,206.35957,558.82865)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64663"
-           style="fill:url(#linearGradient112032);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112034);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64665"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,202.32204,564.20365)" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112036);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64667"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,218.97857,562.20365)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,215.74107,567.57865)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64669"
-           style="fill:url(#linearGradient112038);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient112040);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path64671"
-           sodipodi:cx="372.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:rx="4.625"
-           sodipodi:ry="3.125"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           transform="matrix(0.7,0,0,0.7,231.49107,572.07865)" />
-        <path
-           transform="matrix(0.7,0,0,0.7,235.24107,566.95365)"
-           d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-           sodipodi:ry="3.125"
-           sodipodi:rx="4.625"
-           sodipodi:cy="3438.2117"
-           sodipodi:cx="372.625"
-           id="path64673"
-           style="fill:url(#linearGradient112042);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2508.6321"
-           y="2812.095"
-           id="text64675"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.39087979,-0.73785056,0.71158913,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan64677"
-             x="2508.6321"
-             y="2812.095">1</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text64679"
-           y="2870.449"
-           x="2564.4163"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2870.449"
-             x="2564.4163"
-             id="tspan64681"
-             sodipodi:role="line">2</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2577.9075"
-           y="2870.5251"
-           id="text64683"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan64685"
-             x="2577.9075"
-             y="2870.5251">3</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text64687"
-           y="2880.3496"
-           x="2553.8669"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2880.3496"
-             x="2553.8669"
-             id="tspan64689"
-             sodipodi:role="line">4</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2566.3687"
-           y="2880.5222"
-           id="text64691"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan64693"
-             x="2566.3687"
-             y="2880.5222">5</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text64695"
-           y="2880.5984"
-           x="2579.8599"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2880.5984"
-             x="2579.8599"
-             id="tspan64697"
-             sodipodi:role="line">6</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2554.7546"
-           y="2892.5071"
-           id="text64699"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan64701"
-             x="2554.7546"
-             y="2892.5071">7</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text64703"
-           y="2892.5483"
-           x="2566.9827"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2892.5483"
-             x="2566.9827"
-             id="tspan64705"
-             sodipodi:role="line">8</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2581.0466"
-           y="2892.4424"
-           id="text64707"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan64709"
-             x="2581.0466"
-             y="2892.4424">9</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2569.2244"
-           y="2904.9302"
-           id="text64711"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan64713"
-             x="2569.2244"
-             y="2904.9302">0</tspan></text>
-        <text
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-           sodipodi:linespacing="125%"
-           id="text64715"
-           y="2904.9153"
-           x="2583.002"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2904.9153"
-             x="2583.002"
-             id="tspan64717"
-             sodipodi:role="line">#</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="2557.2061"
-           y="2906.1316"
-           id="text64719"
-           sodipodi:linespacing="125%"
-           transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan64721"
-             x="2557.2061"
-             y="2906.1316">*</tspan></text>
-        <path
-           id="path64723"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 465.90628,3024.2653 2.21823,-0.016 2.27115,-1.4201 -2.49315,5.2256 -0.73698,-1.9145 -1.75787,-0.8314 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           id="path64725"
-           transform="translate(65.29157,-457.32235)"
-           style="fill:#6b7377;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 461.46891,3392.7407 0.15609,20.471 -11.88716,19.6776 c 4.87601,-20.9096 7.98356,-30.2545 11.73107,-40.1486 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-        <text
-           xml:space="preserve"
-           style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="1894.4528"
-           y="2488.5532"
-           id="text64727"
-           sodipodi:linespacing="125%"
-           transform="matrix(0.88202664,0.23432752,-0.4878438,1.0041474,0,0)"><tspan
-             sodipodi:role="line"
-             id="tspan64729"
-             x="1894.4528"
-             y="2488.5532">ZABBIX</tspan></text>
+      <g style="display:inline" id="g64597" transform="matrix(1.6576388,0,0,1.6576388,136.31964,-5446.2283)">
+        <path transform="matrix(0.99314524,0,0,1.0733187,65.267577,-704.49343)" sodipodi:nodetypes="cccccccccccccccssccccc" inkscape:connector-curvature="0" d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z" style="opacity:0.66367714;fill:url(#linearGradient111976);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38419-4-6-5)" id="path64599"/>
+        <path id="path64601" style="fill:url(#linearGradient111978);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccssccccc" transform="translate(65.29157,-457.32235)"/>
+        <path id="path64603" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient111980);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 307.375,3465.2117 c 34.26733,14.6434 68.94238,28.0977 107.1495,31.25 l 0,13.2576 c -24.68963,-1.6711 -57.21221,-9.8648 -107.1495,-32.1326 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path64605" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient111982);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 264.81149,3449.3193 c 13.86542,6.1358 27.70227,11.8873 42.69966,15.9856 l -0.13615,10.5803 c -14.35199,-5.2271 -28.43675,-10.9888 -42.56351,-16.6664 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path64607" style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 479.81607,3039.13 55.61312,-85.3168 0.12069,3.7129 11.27145,3.1956 0.11249,6.9111 c -15.78066,28.2016 -33.36133,56.1548 -51.96791,82.9432 l -11.73005,-4.0877 -3.4198,5.922 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+        <path id="path64609" style="fill:url(#linearGradient111984);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 484.42913,3039.0198 51.13267,-81.4941 11.24742,3.1931 c -19.93534,34.7618 -36.66883,57.631 -53.38134,80.4223 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path64611" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient111986);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 419.09335,3496.342 9.01561,2.1213 1.59099,9.5018 -11.79985,-4.1543 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path64613" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient111988);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 371.32043,3389.7457 98.72881,21.5668 -55.52474,85.14 c -30.80213,-2.2501 -63.39824,-12.2959 -107.1495,-30.8697 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 413.11231,2930.8324 23.59872,1.591 -64.04446,76.036 c -16.39483,-5.1669 -20.93739,-6.7274 -42.59157,-16.4624 l 4.52414,-2.4954 28.21693,8.1501 c 15.92247,-22.9475 32.56027,-45.3226 50.29624,-66.8193 z" style="fill:url(#linearGradient111990);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64615"/>
+        <path id="path64617" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient111992);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 268.34702,3441.718 c 9.42697,6.402 19.55292,9.6953 29.17748,11.1369 l 0,7.9108 c -9.57244,-3.1473 -19.35461,-6.4281 -28.47038,-11.4021 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path64619" transform="translate(65.29157,-457.32235)" style="fill:#27343c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 355.90625,3392.2742 0.71875,8.4375 -13.05822,-1.5672 c 8.45723,-5.9316 9.47905,-5.9157 12.33947,-6.8703 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+        <path id="path64621" style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 362.07612,3373.1864 c 10.40456,2.9805 9.17758,8.5477 6.82064,16.4372 l -12.27176,11.0881 -0.73625,-8.4589 c -16.78443,4.7009 -47.00113,40.6402 -46.88307,59.4089 -4.42767,4.02 -6.17212,6.0399 -11.48117,9.0598 l 0,-8.0434 c 17.21489,-35.1342 46.00261,-60.6212 64.55161,-79.4917 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" transform="translate(65.29157,-457.32235)"/>
+        <path id="path64623" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient111994);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 380.25,3374.0867 c 27.40103,3.8438 54.47999,10.8575 81.22097,18.6616 L 449.75,3432.8367 c -24.31091,-12.4836 -57.75432,-20.0723 -93.125,-26 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path64625" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient111996);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 386.5,3383.8367 60,14.5 -6.25,20 -64.5,-16.5 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.91657,2951.0144 c 36.67955,5.0391 66.90815,13.8479 91.875,25.25 l -8,11.75 -93.5,-25.75 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64627"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient111998);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64629" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(65.29157,-457.57235)"/>
+        <path transform="translate(77.54157,-454.32235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64631" style="fill:url(#linearGradient112000);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112002);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64633" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(91.14657,-450.82235)"/>
+        <path transform="translate(59.79157,-448.82235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64635" style="fill:url(#linearGradient112004);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112006);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64637" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(72.04157,-445.57235)"/>
+        <path transform="translate(85.64657,-442.07235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64639" style="fill:url(#linearGradient112008);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112010);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64641" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(51.69157,-439.02235)"/>
+        <path transform="translate(63.94157,-435.77235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64643" style="fill:url(#linearGradient112012);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112014);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64645" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(77.54657,-432.27235)"/>
+        <path transform="translate(44.66657,-428.27235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64647" style="fill:url(#linearGradient112016);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112018);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64649" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(56.91657,-425.02235)"/>
+        <path transform="translate(70.52157,-421.52235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64651" style="fill:url(#linearGradient112020);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112022);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64653" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(95.77204,-413.02235)"/>
+        <path transform="matrix(0.7,0,0,0.7,176.06657,551.20365)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64655" style="fill:url(#linearGradient112024);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112026);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64657" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,172.06657,556.07865)"/>
+        <path transform="matrix(0.7,0,0,0.7,185.44157,560.07865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64659" style="fill:url(#linearGradient112028);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112030);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64661" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,190.44157,554.82865)"/>
+        <path transform="matrix(0.7,0,0,0.7,206.35957,558.82865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64663" style="fill:url(#linearGradient112032);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112034);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64665" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,202.32204,564.20365)"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112036);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64667" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,218.97857,562.20365)"/>
+        <path transform="matrix(0.7,0,0,0.7,215.74107,567.57865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64669" style="fill:url(#linearGradient112038);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient112040);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path64671" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,231.49107,572.07865)"/>
+        <path transform="matrix(0.7,0,0,0.7,235.24107,566.95365)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path64673" style="fill:url(#linearGradient112042);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2508.6321" y="2812.095" id="text64675" sodipodi:linespacing="125%" transform="matrix(1,0.39087979,-0.73785056,0.71158913,0,0)"><tspan sodipodi:role="line" id="tspan64677" x="2508.6321" y="2812.095">1</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text64679" y="2870.449" x="2564.4163" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2870.449" x="2564.4163" id="tspan64681" sodipodi:role="line">2</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2577.9075" y="2870.5251" id="text64683" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan64685" x="2577.9075" y="2870.5251">3</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text64687" y="2880.3496" x="2553.8669" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2880.3496" x="2553.8669" id="tspan64689" sodipodi:role="line">4</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2566.3687" y="2880.5222" id="text64691" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan64693" x="2566.3687" y="2880.5222">5</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text64695" y="2880.5984" x="2579.8599" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2880.5984" x="2579.8599" id="tspan64697" sodipodi:role="line">6</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2554.7546" y="2892.5071" id="text64699" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan64701" x="2554.7546" y="2892.5071">7</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text64703" y="2892.5483" x="2566.9827" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2892.5483" x="2566.9827" id="tspan64705" sodipodi:role="line">8</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2581.0466" y="2892.4424" id="text64707" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan64709" x="2581.0466" y="2892.4424">9</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2569.2244" y="2904.9302" id="text64711" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan64713" x="2569.2244" y="2904.9302">0</tspan></text>
+        <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text64715" y="2904.9153" x="2583.002" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2904.9153" x="2583.002" id="tspan64717" sodipodi:role="line">#</tspan></text>
+        <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2557.2061" y="2906.1316" id="text64719" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan64721" x="2557.2061" y="2906.1316">*</tspan></text>
+        <path id="path64723" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 465.90628,3024.2653 2.21823,-0.016 2.27115,-1.4201 -2.49315,5.2256 -0.73698,-1.9145 -1.75787,-0.8314 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+        <path id="path64725" transform="translate(65.29157,-457.32235)" style="fill:#6b7377;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 461.46891,3392.7407 0.15609,20.471 -11.88716,19.6776 c 4.87601,-20.9096 7.98356,-30.2545 11.73107,-40.1486 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+        <text xml:space="preserve" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="1894.4528" y="2488.5532" id="text64727" sodipodi:linespacing="125%" transform="matrix(0.88202664,0.23432752,-0.4878438,1.0041474,0,0)"><tspan sodipodi:role="line" id="tspan64729" x="1894.4528" y="2488.5532">ZABBIX</tspan></text>
       </g>
     </g>
-    <g
-       transform="matrix(0.24750249,0,0,0.24750249,131.15422,618.05552)"
-       style="display:inline"
-       id="g68327">
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.60096154;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216-5)"
-         id="path63359-9"
-         sodipodi:cx="859.5"
-         sodipodi:cy="-343.38782"
-         sodipodi:rx="94.5"
-         sodipodi:ry="36.25"
-         d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089"
-         transform="matrix(1.2002087,0,0,1.112967,-116.74563,-293.87257)"
-         sodipodi:start="0"
-         sodipodi:end="6.2158485"
-         sodipodi:open="true" />
-      <path
-         sodipodi:nodetypes="ccssscccc"
-         inkscape:connector-curvature="0"
-         id="path63363-4"
-         d="m 810.70658,-725.15104 0,44.34562 c -0.003,0.13487 0,0.27109 0,0.40625 0,23.97362 48.99684,43.40625 109.4375,43.40625 60.44066,0 109.43762,-19.43263 109.43762,-43.40625 0,-0.13543 -0.028,-0.27111 -0.031,-0.40625 l 0.031,0 0,-44.34562 z"
-         style="fill:url(#radialGradient112517);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:open="true"
-         sodipodi:end="6.2158485"
-         sodipodi:start="0"
-         transform="matrix(1.1580688,0,0,1.197464,-75.21669,-314.12021)"
-         d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089"
-         sodipodi:ry="36.25"
-         sodipodi:rx="94.5"
-         sodipodi:cy="-343.38782"
-         sodipodi:cx="859.5"
-         id="path63365-8"
-         style="fill:url(#radialGradient112519);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:url(#linearGradient112537);fill-opacity:1;stroke:url(#linearGradient112539);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         transform="matrix(1.1399016,0,0,1.1399016,-147.94507,121.50833)"
-         id="g63367-7">
-        <path
-           style="fill:url(#linearGradient112521);fill-opacity:1;stroke:url(#linearGradient112523);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 -30.68741,-10.69953"
-           id="path63369-4"
-           inkscape:path-effect="#path-effect9080-0"
-           inkscape:original-d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           style="fill:url(#linearGradient112525);fill-opacity:1;stroke:url(#linearGradient112527);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 38.49395,-6.86895 -9.3618,16.54834 -7.77996,-2.58496 -20.5683,10.27791"
-           id="path63371-0"
-           inkscape:path-effect="#path-effect9088-5"
-           inkscape:original-d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 c 23.36516,-0.0531 24.68121,-4.90539 38.49395,-6.86895 l -9.3618,16.54834 -7.77996,-2.58496 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           style="fill:url(#linearGradient112529);fill-opacity:1;stroke:url(#linearGradient112531);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 -40.66977,-1.68129"
-           id="path63373-2"
-           inkscape:path-effect="#path-effect9098-9"
-           inkscape:original-d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           style="fill:url(#linearGradient112533);fill-opacity:1;stroke:url(#linearGradient112535);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 21.33124,-9.9955"
-           id="path63375-3"
-           inkscape:path-effect="#path-effect9112-5"
-           inkscape:original-d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
+    <g transform="matrix(0.24750249,0,0,0.24750249,131.15422,618.05552)" style="display:inline" id="g68327">
+      <path sodipodi:type="arc" style="opacity:0.60096154;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216-5)" id="path63359-9" sodipodi:cx="859.5" sodipodi:cy="-343.38782" sodipodi:rx="94.5" sodipodi:ry="36.25" d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089" transform="matrix(1.2002087,0,0,1.112967,-116.74563,-293.87257)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+      <path sodipodi:nodetypes="ccssscccc" inkscape:connector-curvature="0" id="path63363-4" d="m 810.70658,-725.15104 0,44.34562 c -0.003,0.13487 0,0.27109 0,0.40625 0,23.97362 48.99684,43.40625 109.4375,43.40625 60.44066,0 109.43762,-19.43263 109.43762,-43.40625 0,-0.13543 -0.028,-0.27111 -0.031,-0.40625 l 0.031,0 0,-44.34562 z" style="fill:url(#radialGradient112517);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(1.1580688,0,0,1.197464,-75.21669,-314.12021)" d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089" sodipodi:ry="36.25" sodipodi:rx="94.5" sodipodi:cy="-343.38782" sodipodi:cx="859.5" id="path63365-8" style="fill:url(#radialGradient112519);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <g style="fill:url(#linearGradient112537);fill-opacity:1;stroke:url(#linearGradient112539);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="matrix(1.1399016,0,0,1.1399016,-147.94507,121.50833)" id="g63367-7">
+        <path style="fill:url(#linearGradient112521);fill-opacity:1;stroke:url(#linearGradient112523);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 -30.68741,-10.69953" id="path63369-4" inkscape:path-effect="#path-effect9080-0" inkscape:original-d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path style="fill:url(#linearGradient112525);fill-opacity:1;stroke:url(#linearGradient112527);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 38.49395,-6.86895 -9.3618,16.54834 -7.77996,-2.58496 -20.5683,10.27791" id="path63371-0" inkscape:path-effect="#path-effect9088-5" inkscape:original-d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 c 23.36516,-0.0531 24.68121,-4.90539 38.49395,-6.86895 l -9.3618,16.54834 -7.77996,-2.58496 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path style="fill:url(#linearGradient112529);fill-opacity:1;stroke:url(#linearGradient112531);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 -40.66977,-1.68129" id="path63373-2" inkscape:path-effect="#path-effect9098-9" inkscape:original-d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path style="fill:url(#linearGradient112533);fill-opacity:1;stroke:url(#linearGradient112535);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 21.33124,-9.9955" id="path63375-3" inkscape:path-effect="#path-effect9112-5" inkscape:original-d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Modem.svg b/misc/images/svg/elements/Modem.svg
index 5727eb64818..d8b7d9f2737 100644
--- a/misc/images/svg/elements/Modem.svg
+++ b/misc/images/svg/elements/Modem.svg
@@ -1,757 +1,161 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="77.07811"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter4519-4-4-9-5"
-       x="-5.7849717"
-       width="12.569944"
-       y="-5.5134401"
-       height="12.02688">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.5886576"
-         id="feGaussianBlur4521-0-2-1-0" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="77.07811" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4519-4-4-9-5" x="-5.7849717" width="12.569944" y="-5.5134401" height="12.02688">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="2.5886576" id="feGaussianBlur4521-0-2-1-0"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter4531-6-6-1-2"
-       x="-1.2963736"
-       width="3.5927472"
-       y="-3.7918129"
-       height="8.5836258">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.2656724"
-         id="feGaussianBlur4533-8-3-9-9" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4531-6-6-1-2" x="-1.2963736" width="3.5927472" y="-3.7918129" height="8.5836258">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="4.2656724" id="feGaussianBlur4533-8-3-9-9"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter61177"
-       x="-0.049402189"
-       width="1.0988044"
-       y="-0.10550965"
-       height="1.2110193"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.175719"
-         id="feGaussianBlur61179" />
+    <filter inkscape:collect="always" id="filter61177" x="-0.049402189" width="1.0988044" y="-0.10550965" height="1.2110193" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="2.175719" id="feGaussianBlur61179"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-1"
-       id="linearGradient71504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85302172,0,0,0.85302172,304.65006,3497.7884)"
-       x1="158.86479"
-       y1="706.07477"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       id="linearGradient5801-0-1">
-      <stop
-         id="stop5803-5-74"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5805-98-094"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-1"
-       id="linearGradient71506"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85302172,0,0,0.85302172,332.64288,3509.9067)"
-       x1="173.61505"
-       y1="760.87512"
-       x2="65.997429"
-       y2="689.16925" />
-    <linearGradient
-       id="linearGradient126932">
-      <stop
-         id="stop126934"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop126936"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-1"
-       id="linearGradient71508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85302172,0,0,0.85302172,332.64288,3509.9067)"
-       x1="319.22894"
-       y1="667.52386"
-       x2="118.96131"
-       y2="815.45764" />
-    <linearGradient
-       id="linearGradient126939">
-      <stop
-         id="stop126941"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop126943"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient59117-88"
-       id="linearGradient71510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,29.2918,-225.2942)"
-       x1="423.80014"
-       y1="3922.2336"
-       x2="418.04654"
-       y2="3984.4587" />
-    <linearGradient
-       id="linearGradient59117-88">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop59119-24" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop59121-5" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect69727-51"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="470.82925"
-       y1="3967.031"
-       x2="502.70425"
-       y2="3967.031" />
-    <linearGradient
-       id="linearGradient5311-7-4-7-7-7">
-      <stop
-         id="stop5313-3-2-7-0-1"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop5315-2-2-7-2-1"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="467.96115"
-       y1="3965.5161"
-       x2="499.91605"
-       y2="3965.5161" />
-    <linearGradient
-       id="linearGradient126955">
-      <stop
-         id="stop126957"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop126959"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="465.15027"
-       y1="3964.072"
-       x2="496.96439"
-       y2="3964.072" />
-    <linearGradient
-       id="linearGradient126962">
-      <stop
-         id="stop126964"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop126966"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71518-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="462.20071"
-       y1="3962.6062"
-       x2="493.92606"
-       y2="3962.6062" />
-    <linearGradient
-       id="linearGradient126969">
-      <stop
-         id="stop126971"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop126973"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="459.33258"
-       y1="3961.1829"
-       x2="491.32239"
-       y2="3961.1829" />
-    <linearGradient
-       id="linearGradient126976">
-      <stop
-         id="stop126978"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop126980"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="456.5217"
-       y1="3959.7864"
-       x2="488.67001"
-       y2="3959.7864" />
-    <linearGradient
-       id="linearGradient126983">
-      <stop
-         id="stop126985"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop126987"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="453.62473"
-       y1="3958.3738"
-       x2="485.84521"
-       y2="3958.3738" />
-    <linearGradient
-       id="linearGradient126990">
-      <stop
-         id="stop126992"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop126994"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71526"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="450.75659"
-       y1="3956.9087"
-       x2="482.96942"
-       y2="3956.9087" />
-    <linearGradient
-       id="linearGradient126997">
-      <stop
-         id="stop126999"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop127001"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71528"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="447.94571"
-       y1="3955.4546"
-       x2="479.80054"
-       y2="3955.4546" />
-    <linearGradient
-       id="linearGradient127004">
-      <stop
-         id="stop127006"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop127008"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71530"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="444.99615"
-       y1="3953.8789"
-       x2="476.83041"
-       y2="3953.8789" />
-    <linearGradient
-       id="linearGradient127011">
-      <stop
-         id="stop127013"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop127015"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71532"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="442.12805"
-       y1="3952.3945"
-       x2="473.23102"
-       y2="3952.3945" />
-    <linearGradient
-       id="linearGradient127018">
-      <stop
-         id="stop127020"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop127022"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71534"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="439.04684"
-       y1="3950.811"
-       x2="470.13782"
-       y2="3950.811" />
-    <linearGradient
-       id="linearGradient127025">
-      <stop
-         id="stop127027"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop127029"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-7-7"
-       id="linearGradient71536"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="436.23547"
-       y1="3949.2329"
-       x2="466.65405"
-       y2="3949.2329" />
-    <linearGradient
-       id="linearGradient127032">
-      <stop
-         id="stop127034"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop127036"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient59117-88"
-       id="linearGradient71538"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)"
-       x1="461.29156"
-       y1="3967.3174"
-       x2="450.29156"
-       y2="3987.8174" />
-    <linearGradient
-       id="linearGradient127039">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop127041" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop127043" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3982-2"
-       id="linearGradient3988-3"
-       x1="420.495"
-       y1="4128.1646"
-       x2="477.3085"
-       y2="4136.3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.2097087,-1.0606602)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3982-2">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop3984-2" />
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:0;"
-         offset="1"
-         id="stop3986-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3968-8"
-       id="linearGradient4083-6"
-       gradientUnits="userSpaceOnUse"
-       x1="394.36313"
-       y1="4139.8091"
-       x2="399.54099"
-       y2="4139.8091" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3968-8">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3970-5" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3972-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3968-8"
-       id="linearGradient4081-6"
-       gradientUnits="userSpaceOnUse"
-       x1="394.36313"
-       y1="4139.8091"
-       x2="399.54099"
-       y2="4139.8091" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3968-8"
-       id="linearGradient4079-1"
-       gradientUnits="userSpaceOnUse"
-       x1="394.36313"
-       y1="4139.8091"
-       x2="399.54099"
-       y2="4139.8091" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3968-8"
-       id="linearGradient4077-8"
-       gradientUnits="userSpaceOnUse"
-       x1="394.36313"
-       y1="4139.8091"
-       x2="399.54099"
-       y2="4139.8091" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3968-8"
-       id="linearGradient4075-9"
-       gradientUnits="userSpaceOnUse"
-       x1="394.36313"
-       y1="4139.8091"
-       x2="399.54099"
-       y2="4139.8091" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-1" id="linearGradient71504" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.85302172,0,0,0.85302172,304.65006,3497.7884)" x1="158.86479" y1="706.07477" x2="319.51733" y2="742.35919"/>
+    <linearGradient id="linearGradient5801-0-1">
+      <stop id="stop5803-5-74" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop5805-98-094" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-1" id="linearGradient71506" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.85302172,0,0,0.85302172,332.64288,3509.9067)" x1="173.61505" y1="760.87512" x2="65.997429" y2="689.16925"/>
+    <linearGradient id="linearGradient126932">
+      <stop id="stop126934" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop126936" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-1" id="linearGradient71508" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.85302172,0,0,0.85302172,332.64288,3509.9067)" x1="319.22894" y1="667.52386" x2="118.96131" y2="815.45764"/>
+    <linearGradient id="linearGradient126939">
+      <stop id="stop126941" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop126943" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient59117-88" id="linearGradient71510" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,29.2918,-225.2942)" x1="423.80014" y1="3922.2336" x2="418.04654" y2="3984.4587"/>
+    <linearGradient id="linearGradient59117-88">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop59119-24"/>
+      <stop style="stop-color:#d4d4d4;stop-opacity:1;" offset="1" id="stop59121-5"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect69727-51" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71512" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="470.82925" y1="3967.031" x2="502.70425" y2="3967.031"/>
+    <linearGradient id="linearGradient5311-7-4-7-7-7">
+      <stop id="stop5313-3-2-7-0-1" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop5315-2-2-7-2-1" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71514" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="467.96115" y1="3965.5161" x2="499.91605" y2="3965.5161"/>
+    <linearGradient id="linearGradient126955">
+      <stop id="stop126957" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop126959" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71516" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="465.15027" y1="3964.072" x2="496.96439" y2="3964.072"/>
+    <linearGradient id="linearGradient126962">
+      <stop id="stop126964" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop126966" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71518-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="462.20071" y1="3962.6062" x2="493.92606" y2="3962.6062"/>
+    <linearGradient id="linearGradient126969">
+      <stop id="stop126971" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop126973" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71520" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="459.33258" y1="3961.1829" x2="491.32239" y2="3961.1829"/>
+    <linearGradient id="linearGradient126976">
+      <stop id="stop126978" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop126980" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71522" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="456.5217" y1="3959.7864" x2="488.67001" y2="3959.7864"/>
+    <linearGradient id="linearGradient126983">
+      <stop id="stop126985" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop126987" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71524" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="453.62473" y1="3958.3738" x2="485.84521" y2="3958.3738"/>
+    <linearGradient id="linearGradient126990">
+      <stop id="stop126992" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop126994" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71526" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="450.75659" y1="3956.9087" x2="482.96942" y2="3956.9087"/>
+    <linearGradient id="linearGradient126997">
+      <stop id="stop126999" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop127001" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71528" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="447.94571" y1="3955.4546" x2="479.80054" y2="3955.4546"/>
+    <linearGradient id="linearGradient127004">
+      <stop id="stop127006" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop127008" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71530" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="444.99615" y1="3953.8789" x2="476.83041" y2="3953.8789"/>
+    <linearGradient id="linearGradient127011">
+      <stop id="stop127013" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop127015" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71532" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="442.12805" y1="3952.3945" x2="473.23102" y2="3952.3945"/>
+    <linearGradient id="linearGradient127018">
+      <stop id="stop127020" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop127022" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71534" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="439.04684" y1="3950.811" x2="470.13782" y2="3950.811"/>
+    <linearGradient id="linearGradient127025">
+      <stop id="stop127027" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop127029" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-7-7" id="linearGradient71536" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="436.23547" y1="3949.2329" x2="466.65405" y2="3949.2329"/>
+    <linearGradient id="linearGradient127032">
+      <stop id="stop127034" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop127036" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient59117-88" id="linearGradient71538" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1021019,0,0,1.1021019,-46.643636,-242.68718)" x1="461.29156" y1="3967.3174" x2="450.29156" y2="3987.8174"/>
+    <linearGradient id="linearGradient127039">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop127041"/>
+      <stop style="stop-color:#d4d4d4;stop-opacity:1;" offset="1" id="stop127043"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3982-2" id="linearGradient3988-3" x1="420.495" y1="4128.1646" x2="477.3085" y2="4136.3789" gradientUnits="userSpaceOnUse" gradientTransform="translate(-2.2097087,-1.0606602)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3982-2">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop3984-2"/>
+      <stop style="stop-color:#1a1a1a;stop-opacity:0;" offset="1" id="stop3986-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3968-8" id="linearGradient4083-6" gradientUnits="userSpaceOnUse" x1="394.36313" y1="4139.8091" x2="399.54099" y2="4139.8091"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3968-8">
+      <stop style="stop-color:#008000;stop-opacity:1;" offset="0" id="stop3970-5"/>
+      <stop style="stop-color:#008000;stop-opacity:0;" offset="1" id="stop3972-7"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3968-8" id="linearGradient4081-6" gradientUnits="userSpaceOnUse" x1="394.36313" y1="4139.8091" x2="399.54099" y2="4139.8091"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3968-8" id="linearGradient4079-1" gradientUnits="userSpaceOnUse" x1="394.36313" y1="4139.8091" x2="399.54099" y2="4139.8091"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3968-8" id="linearGradient4077-8" gradientUnits="userSpaceOnUse" x1="394.36313" y1="4139.8091" x2="399.54099" y2="4139.8091"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3968-8" id="linearGradient4075-9" gradientUnits="userSpaceOnUse" x1="394.36313" y1="4139.8091" x2="399.54099" y2="4139.8091"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="56.142857"
-     inkscape:cy="98.539029"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="22"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="56.142857" inkscape:cy="98.539029" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="22" inkscape:window-y="29" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-318.85714,-553.8231)">
-    <g
-       style="display:inline"
-       transform="translate(-97.716877,-3538.6483)"
-       id="g4085-2"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Modem.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g5539">
-        <path
-           inkscape:connector-curvature="0"
-           id="path71454-7"
-           d="m 380.39451,739.80348 c 0,-0.29883 -0.1975,-0.4951 -0.54827,-0.54492 -0.61694,-0.0876 -0.66076,0.0216 -0.2881,0.71788 0.31341,0.58564 0.83637,0.47748 0.83637,-0.17296 z"
-           style="opacity:0.8585366;fill:#060a0d;filter:url(#filter4519-4-4-9-5)"
-           inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\native_agents.png"
-           inkscape:export-xdpi="90"
-           inkscape:export-ydpi="90"
-           transform="matrix(1.4410726,0,0,1.4410726,-83.734386,3073.9499)" />
-        <path
-           transform="matrix(0.76015965,-0.44366017,1.0116422,0.41566432,133.11962,4170.2275)"
-           style="opacity:0.8585366;fill:#060a0d;filter:url(#filter4531-6-6-1-2)"
-           d="m 226.49695,162.72085 c -0.34101,-0.35184 -0.5836,-0.79129 -0.5836,-1.05719 0,-0.25028 -0.0889,-0.54393 -0.19753,-0.65258 -0.33644,-0.33644 -0.009,-2.20104 0.44138,-2.51681 0.53724,-0.37629 1.32754,-0.33323 1.75648,0.0957 0.46319,0.46319 0.49441,1.95103 0.0584,2.78222 -0.1679,0.32009 -0.35233,0.86168 -0.4098,1.20352 -0.13989,0.83161 -0.0658,0.14513 -1.06534,0.14513 z"
-           id="path71456-9"
-           inkscape:connector-curvature="0"
-           inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\native_agents.png"
-           inkscape:export-xdpi="90"
-           inkscape:export-ydpi="90" />
-        <path
-           transform="matrix(1.1021019,0,0,1.1224307,-42.66616,-305.18348)"
-           id="path71458-5"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter61177)"
-           d="m 463.08501,3931.933 64.52982,23.2246 -45.49379,26.2659 -60.20447,-34.7591 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 467.70071,4092.4714 71.11844,25.5959 -50.1388,28.9477 -66.35146,-38.308 z"
-           style="fill:url(#linearGradient71504);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71460-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 422.32889,4108.7071 66.35144,38.3079 2e-5,16.9911 -66.35146,-39.084 z"
-           style="fill:url(#linearGradient71506);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71462-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 488.68035,4147.015 50.13881,-28.9477 0,16.983 -50.13881,28.9558 z"
-           style="fill:url(#linearGradient71508);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71464-1" />
-        <path
-           style="fill:none;stroke:url(#linearGradient71510);stroke-width:1.10210192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 538.56678,4126.3956 -49.87543,28.9317 -66.00891,-37.7338"
-           id="path71466-2"
-           inkscape:path-effect="#path-effect69727-51"
-           inkscape:original-d="m 538.56678,4126.3956 -49.87543,28.9317 -66.00891,-37.7338"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 472.25818,4138.0903 33.70995,-18.2821 1.41955,0.5166 -33.61874,18.6378 z"
-           style="fill:url(#linearGradient71512);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71468-3" />
-        <path
-           id="path71470-3"
-           style="fill:url(#linearGradient71514);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 469.09722,4136.2653 33.34394,-17.9714 1.87364,0.682 -33.70681,18.1617 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 465.99935,4134.4768 33.15086,-17.5776 1.91155,0.6957 -33.55164,17.7541 z"
-           style="fill:url(#linearGradient71516);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71472-4" />
-        <path
-           id="path71474-1"
-           style="fill:url(#linearGradient71518-5);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 462.74863,4132.6 33.23805,-17.0548 1.72652,0.6283 -33.4538,17.2987 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 459.58767,4130.7751 33.55357,-16.5421 1.70246,0.7226 -33.74526,16.6917 z"
-           style="fill:url(#linearGradient71520);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71476-1" />
-        <path
-           id="path71478-3"
-           style="fill:url(#linearGradient71522);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 456.48979,4128.9865 33.61365,-16.0431 1.81706,0.7714 -33.91993,16.1439 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path71480-8"
-           style="fill:url(#linearGradient71524);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 453.29703,4127.1431 33.81432,-15.4698 1.69594,0.7199 -33.9995,15.6221 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 450.13607,4125.3181 33.6663,-15.0493 1.83552,0.7791 -33.99105,15.1424 z"
-           style="fill:url(#linearGradient71526);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71482-7" />
-        <path
-           id="path71484-4"
-           style="fill:url(#linearGradient71528);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 447.03819,4123.5295 33.42675,-14.6773 1.6805,0.7133 -33.59648,14.8363 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 443.78747,4121.6528 32.91615,-14.3972 2.16843,0.9204 -33.5738,14.349 z"
-           style="fill:url(#linearGradient71530);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71486-2" />
-        <path
-           id="path71488-7"
-           style="fill:url(#linearGradient71532);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 440.62652,4119.8278 32.40581,-14.0189 1.87285,0.6832 -32.76789,14.2079 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 437.23071,4117.8406 32.05515,-13.7337 2.21028,0.9382 -32.45673,13.8664 z"
-           style="fill:url(#linearGradient71534);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path71490-7" />
-        <path
-           id="path71492-9"
-           style="fill:url(#linearGradient71536);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 434.13231,4116.0783 31.57789,-13.4892 1.94648,0.8263 -32.0136,13.5352 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path71494-3"
-           style="fill:url(#linearGradient71538);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3988-3);stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 434.14103,4116.0564 39.71301,22.9227 c 1.38214,6.6716 0.8247,12.0718 -1.5409,15.6007 l -38.52524,-22.303 c -2.49425,-6.1067 -2.38196,-12.0587 0.35313,-16.2204 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           transform="matrix(1.4680752,0.55156069,0.01420205,1.2111861,-174.2074,-1088.7069)"
-           d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z"
-           sodipodi:ry="1.767767"
-           sodipodi:rx="2.3864853"
-           sodipodi:cy="4139.8091"
-           sodipodi:cx="396.95206"
-           id="path4025-1"
-           style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4083-6);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4081-6);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path4031-9"
-           sodipodi:cx="396.95206"
-           sodipodi:cy="4139.8091"
-           sodipodi:rx="2.3864853"
-           sodipodi:ry="1.767767"
-           d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z"
-           transform="matrix(1.3902588,0.52232481,0.01344925,1.1469864,-148.41075,-815.9587)" />
-        <path
-           transform="matrix(1.3318936,0.50039681,0.01288462,1.098834,-130.6197,-612.56619)"
-           d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z"
-           sodipodi:ry="1.767767"
-           sodipodi:rx="2.3864853"
-           sodipodi:cy="4139.8091"
-           sodipodi:cx="396.95206"
-           id="path4035-8"
-           style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4079-1);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4077-8);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path4039-6"
-           sodipodi:cx="396.95206"
-           sodipodi:cy="4139.8091"
-           sodipodi:rx="2.3864853"
-           sodipodi:ry="1.767767"
-           d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z"
-           transform="matrix(1.2540734,0.4711595,0.01213178,1.0346312,-103.99241,-339.52033)" />
-        <path
-           transform="matrix(1.1762531,0.44192214,0.01137894,0.97042811,-76.94113,-66.252647)"
-           d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z"
-           sodipodi:ry="1.767767"
-           sodipodi:rx="2.3864853"
-           sodipodi:cy="4139.8091"
-           sodipodi:cx="396.95206"
-           id="path4043-5"
-           style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4075-9);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:type="arc" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-318.85714,-553.8231)">
+    <g style="display:inline" transform="translate(-97.716877,-3538.6483)" id="g4085-2">
+      <g id="g5539">
+        <path inkscape:connector-curvature="0" id="path71454-7" d="m 380.39451,739.80348 c 0,-0.29883 -0.1975,-0.4951 -0.54827,-0.54492 -0.61694,-0.0876 -0.66076,0.0216 -0.2881,0.71788 0.31341,0.58564 0.83637,0.47748 0.83637,-0.17296 z" style="opacity:0.8585366;fill:#060a0d;filter:url(#filter4519-4-4-9-5)" transform="matrix(1.4410726,0,0,1.4410726,-83.734386,3073.9499)"/>
+        <path transform="matrix(0.76015965,-0.44366017,1.0116422,0.41566432,133.11962,4170.2275)" style="opacity:0.8585366;fill:#060a0d;filter:url(#filter4531-6-6-1-2)" d="m 226.49695,162.72085 c -0.34101,-0.35184 -0.5836,-0.79129 -0.5836,-1.05719 0,-0.25028 -0.0889,-0.54393 -0.19753,-0.65258 -0.33644,-0.33644 -0.009,-2.20104 0.44138,-2.51681 0.53724,-0.37629 1.32754,-0.33323 1.75648,0.0957 0.46319,0.46319 0.49441,1.95103 0.0584,2.78222 -0.1679,0.32009 -0.35233,0.86168 -0.4098,1.20352 -0.13989,0.83161 -0.0658,0.14513 -1.06534,0.14513 z" id="path71456-9" inkscape:connector-curvature="0"/>
+        <path transform="matrix(1.1021019,0,0,1.1224307,-42.66616,-305.18348)" id="path71458-5" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter61177)" d="m 463.08501,3931.933 64.52982,23.2246 -45.49379,26.2659 -60.20447,-34.7591 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 467.70071,4092.4714 71.11844,25.5959 -50.1388,28.9477 -66.35146,-38.308 z" style="fill:url(#linearGradient71504);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71460-4"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 422.32889,4108.7071 66.35144,38.3079 2e-5,16.9911 -66.35146,-39.084 z" style="fill:url(#linearGradient71506);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71462-3"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 488.68035,4147.015 50.13881,-28.9477 0,16.983 -50.13881,28.9558 z" style="fill:url(#linearGradient71508);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71464-1"/>
+        <path style="fill:none;stroke:url(#linearGradient71510);stroke-width:1.10210192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 538.56678,4126.3956 -49.87543,28.9317 -66.00891,-37.7338" id="path71466-2" inkscape:path-effect="#path-effect69727-51" inkscape:original-d="m 538.56678,4126.3956 -49.87543,28.9317 -66.00891,-37.7338" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 472.25818,4138.0903 33.70995,-18.2821 1.41955,0.5166 -33.61874,18.6378 z" style="fill:url(#linearGradient71512);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71468-3"/>
+        <path id="path71470-3" style="fill:url(#linearGradient71514);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 469.09722,4136.2653 33.34394,-17.9714 1.87364,0.682 -33.70681,18.1617 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 465.99935,4134.4768 33.15086,-17.5776 1.91155,0.6957 -33.55164,17.7541 z" style="fill:url(#linearGradient71516);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71472-4"/>
+        <path id="path71474-1" style="fill:url(#linearGradient71518-5);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 462.74863,4132.6 33.23805,-17.0548 1.72652,0.6283 -33.4538,17.2987 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 459.58767,4130.7751 33.55357,-16.5421 1.70246,0.7226 -33.74526,16.6917 z" style="fill:url(#linearGradient71520);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71476-1"/>
+        <path id="path71478-3" style="fill:url(#linearGradient71522);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 456.48979,4128.9865 33.61365,-16.0431 1.81706,0.7714 -33.91993,16.1439 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path71480-8" style="fill:url(#linearGradient71524);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 453.29703,4127.1431 33.81432,-15.4698 1.69594,0.7199 -33.9995,15.6221 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 450.13607,4125.3181 33.6663,-15.0493 1.83552,0.7791 -33.99105,15.1424 z" style="fill:url(#linearGradient71526);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71482-7"/>
+        <path id="path71484-4" style="fill:url(#linearGradient71528);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 447.03819,4123.5295 33.42675,-14.6773 1.6805,0.7133 -33.59648,14.8363 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 443.78747,4121.6528 32.91615,-14.3972 2.16843,0.9204 -33.5738,14.349 z" style="fill:url(#linearGradient71530);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71486-2"/>
+        <path id="path71488-7" style="fill:url(#linearGradient71532);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 440.62652,4119.8278 32.40581,-14.0189 1.87285,0.6832 -32.76789,14.2079 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 437.23071,4117.8406 32.05515,-13.7337 2.21028,0.9382 -32.45673,13.8664 z" style="fill:url(#linearGradient71534);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path71490-7"/>
+        <path id="path71492-9" style="fill:url(#linearGradient71536);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 434.13231,4116.0783 31.57789,-13.4892 1.94648,0.8263 -32.0136,13.5352 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path71494-3" style="fill:url(#linearGradient71538);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3988-3);stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none" d="m 434.14103,4116.0564 39.71301,22.9227 c 1.38214,6.6716 0.8247,12.0718 -1.5409,15.6007 l -38.52524,-22.303 c -2.49425,-6.1067 -2.38196,-12.0587 0.35313,-16.2204 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path transform="matrix(1.4680752,0.55156069,0.01420205,1.2111861,-174.2074,-1088.7069)" d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z" sodipodi:ry="1.767767" sodipodi:rx="2.3864853" sodipodi:cy="4139.8091" sodipodi:cx="396.95206" id="path4025-1" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4083-6);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4081-6);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4031-9" sodipodi:cx="396.95206" sodipodi:cy="4139.8091" sodipodi:rx="2.3864853" sodipodi:ry="1.767767" d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z" transform="matrix(1.3902588,0.52232481,0.01344925,1.1469864,-148.41075,-815.9587)"/>
+        <path transform="matrix(1.3318936,0.50039681,0.01288462,1.098834,-130.6197,-612.56619)" d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z" sodipodi:ry="1.767767" sodipodi:rx="2.3864853" sodipodi:cy="4139.8091" sodipodi:cx="396.95206" id="path4035-8" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4079-1);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4077-8);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4039-6" sodipodi:cx="396.95206" sodipodi:cy="4139.8091" sodipodi:rx="2.3864853" sodipodi:ry="1.767767" d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z" transform="matrix(1.2540734,0.4711595,0.01213178,1.0346312,-103.99241,-339.52033)"/>
+        <path transform="matrix(1.1762531,0.44192214,0.01137894,0.97042811,-76.94113,-66.252647)" d="m 399.33854,4139.8091 c 0,0.9763 -1.06846,1.7677 -2.38648,1.7677 -1.31802,0 -2.38649,-0.7914 -2.38649,-1.7677 0,-0.9763 1.06847,-1.7678 2.38649,-1.7678 1.31802,0 2.38648,0.7915 2.38648,1.7678 z" sodipodi:ry="1.767767" sodipodi:rx="2.3864853" sodipodi:cy="4139.8091" sodipodi:cx="396.95206" id="path4043-5" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4075-9);stroke-width:0.40489218;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Network.svg b/misc/images/svg/elements/Network.svg
index 45113daaf8a..45713930ca7 100644
--- a/misc/images/svg/elements/Network.svg
+++ b/misc/images/svg/elements/Network.svg
@@ -1,5787 +1,948 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="101.87279"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5308-5"
-       x="-0.02874162"
-       width="1.0574832"
-       y="-0.1624866"
-       height="1.3249732">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.4980839"
-         id="feGaussianBlur5310-6" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="101.87279" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5308-5" x="-0.02874162" width="1.0574832" y="-0.1624866" height="1.3249732">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="2.4980839" id="feGaussianBlur5310-6"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5262-0"
-       id="radialGradient27391"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.17288162,0,1156.4252)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient5262-0">
-      <stop
-         style="stop-color:#9ca0a5;stop-opacity:1;"
-         offset="0"
-         id="stop5264-3" />
-      <stop
-         id="stop5266-5"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#303d53;stop-opacity:1;"
-         offset="1"
-         id="stop5268-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313-6"
-       id="radialGradient27393"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient6313-6">
-      <stop
-         id="stop6315-7"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop6317-6" />
-      <stop
-         id="stop6319-7"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5188-1"
-       id="linearGradient27395"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85239486,0,0,0.85239486,57.136448,187.49243)"
-       x1="476.92038"
-       y1="1419.8461"
-       x2="476.56497"
-       y2="1427.665" />
-    <linearGradient
-       id="linearGradient5188-1">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop5190-9" />
-      <stop
-         id="stop5192-1"
-         offset="1"
-         style="stop-color:#c6d0dd;stop-opacity:0;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6294-6"
-       effect="spiro" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5200-2">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.12989622"
-         id="feGaussianBlur5202-7" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5262-0" id="radialGradient27391" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.17288162,0,1156.4252)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient5262-0">
+      <stop style="stop-color:#9ca0a5;stop-opacity:1;" offset="0" id="stop5264-3"/>
+      <stop id="stop5266-5" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#303d53;stop-opacity:1;" offset="1" id="stop5268-6"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6313-6" id="radialGradient27393" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient6313-6">
+      <stop id="stop6315-7" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop6317-6"/>
+      <stop id="stop6319-7" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5188-1" id="linearGradient27395" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.85239486,0,0,0.85239486,57.136448,187.49243)" x1="476.92038" y1="1419.8461" x2="476.56497" y2="1427.665"/>
+    <linearGradient id="linearGradient5188-1">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop5190-9"/>
+      <stop id="stop5192-1" offset="1" style="stop-color:#c6d0dd;stop-opacity:0;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6294-6" effect="spiro"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5200-2">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.12989622" id="feGaussianBlur5202-7"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5262-0"
-       id="radialGradient27397"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.17288136,0,1156.4255)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient127139">
-      <stop
-         style="stop-color:#9ca0a5;stop-opacity:1;"
-         offset="0"
-         id="stop127141" />
-      <stop
-         id="stop127143"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#303d53;stop-opacity:1;"
-         offset="1"
-         id="stop127145" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6576-6"
-       id="radialGradient27399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5866403,-0.09663684,0.22675106,3.7229321,-587.10574,-3751.5668)"
-       cx="462.20682"
-       cy="1394.1276"
-       fx="462.20682"
-       fy="1394.1276"
-       r="7.4508848" />
-    <linearGradient
-       id="linearGradient6576-6">
-      <stop
-         id="stop6578-5"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.52657253"
-         id="stop6580-1" />
-      <stop
-         id="stop6582-3"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313-6"
-       id="radialGradient27401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.400253,0.88612027,-0.23564026,0.37236026,136.09643,445.52997)"
-       cx="461.34637"
-       cy="1361.1923"
-       fx="461.34637"
-       fy="1361.1923"
-       r="39.277084" />
-    <linearGradient
-       id="linearGradient127153">
-      <stop
-         id="stop127155"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop127157" />
-      <stop
-         id="stop127159"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6353-5"
-       id="linearGradient27403"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.53889,1111.3268)"
-       x1="666.09454"
-       y1="1080.6464"
-       x2="949.8515"
-       y2="1293.1321" />
-    <linearGradient
-       id="linearGradient6353-5">
-      <stop
-         id="stop6355-3"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop6357-2"
-         offset="1"
-         style="stop-color:#9a9a9d;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6247-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6345-4"
-       id="linearGradient27405"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.53889,1111.3268)"
-       x1="897.6601"
-       y1="1334.4812"
-       x2="586.69891"
-       y2="1369.8365" />
-    <linearGradient
-       id="linearGradient6345-4">
-      <stop
-         id="stop6347-2"
-         offset="0"
-         style="stop-color:#adb8c9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939aa4;stop-opacity:1;"
-         offset="0.35951823"
-         id="stop6349-7" />
-      <stop
-         id="stop6351-9"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5020-3"
-       id="radialGradient27407"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)"
-       cx="874.3125"
-       cy="1324.2997"
-       fx="874.3125"
-       fy="1324.2997"
-       r="5.5625" />
-    <linearGradient
-       id="linearGradient5020-3">
-      <stop
-         id="stop5022-7"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.30869097"
-         id="stop5024-3" />
-      <stop
-         id="stop5026-1"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4904-7"
-       id="linearGradient27409"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)"
-       x1="556.0246"
-       y1="1099.3903"
-       x2="968.59534"
-       y2="1330.6199" />
-    <linearGradient
-       id="linearGradient4904-7">
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0"
-         id="stop4906-8" />
-      <stop
-         id="stop4950-5"
-         offset="0.46410909"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-      <stop
-         id="stop4948-8"
-         offset="0.74663347"
-         style="stop-color:#c0f4fe;stop-opacity:1;" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="1"
-         id="stop4908-3" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6247-9-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4956-1"
-       id="linearGradient27411"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)"
-       x1="1154.8738"
-       y1="1067.8448"
-       x2="785.32184"
-       y2="1353.5291" />
-    <linearGradient
-       id="linearGradient4956-1">
-      <stop
-         id="stop4958-1"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:0" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop4960-5" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop4962-9" />
-      <stop
-         id="stop4964-5"
-         offset="1"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5008-1"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4988-6"
-       id="linearGradient27413"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)"
-       x1="1093.0221"
-       y1="911.74304"
-       x2="653.22003"
-       y2="1274.0055" />
-    <linearGradient
-       id="linearGradient4988-6">
-      <stop
-         id="stop4990-4"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop4992-5" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop4994-3" />
-      <stop
-         id="stop4996-0"
-         offset="1"
-         style="stop-color:#1a97cb;stop-opacity:0.40568627" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5006-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5244-1"
-       id="linearGradient27415"
-       gradientUnits="userSpaceOnUse"
-       x1="485.21152"
-       y1="1282.5083"
-       x2="413.37195"
-       y2="1401.8518" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5244-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5246-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5248-4" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6808-1"
-       effect="spiro" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter7271-4"
-       x="-0.042689584"
-       width="1.0853792"
-       y="-0.12341323"
-       height="1.2468265">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.606943"
-         id="feGaussianBlur7273-8" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5262-0" id="radialGradient27397" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.17288136,0,1156.4255)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient127139">
+      <stop style="stop-color:#9ca0a5;stop-opacity:1;" offset="0" id="stop127141"/>
+      <stop id="stop127143" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#303d53;stop-opacity:1;" offset="1" id="stop127145"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6576-6" id="radialGradient27399" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5866403,-0.09663684,0.22675106,3.7229321,-587.10574,-3751.5668)" cx="462.20682" cy="1394.1276" fx="462.20682" fy="1394.1276" r="7.4508848"/>
+    <linearGradient id="linearGradient6576-6">
+      <stop id="stop6578-5" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.52657253" id="stop6580-1"/>
+      <stop id="stop6582-3" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6313-6" id="radialGradient27401" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.400253,0.88612027,-0.23564026,0.37236026,136.09643,445.52997)" cx="461.34637" cy="1361.1923" fx="461.34637" fy="1361.1923" r="39.277084"/>
+    <linearGradient id="linearGradient127153">
+      <stop id="stop127155" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop127157"/>
+      <stop id="stop127159" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6353-5" id="linearGradient27403" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.53889,1111.3268)" x1="666.09454" y1="1080.6464" x2="949.8515" y2="1293.1321"/>
+    <linearGradient id="linearGradient6353-5">
+      <stop id="stop6355-3" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop id="stop6357-2" offset="1" style="stop-color:#9a9a9d;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6247-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6345-4" id="linearGradient27405" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.53889,1111.3268)" x1="897.6601" y1="1334.4812" x2="586.69891" y2="1369.8365"/>
+    <linearGradient id="linearGradient6345-4">
+      <stop id="stop6347-2" offset="0" style="stop-color:#adb8c9;stop-opacity:1;"/>
+      <stop style="stop-color:#939aa4;stop-opacity:1;" offset="0.35951823" id="stop6349-7"/>
+      <stop id="stop6351-9" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5020-3" id="radialGradient27407" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)" cx="874.3125" cy="1324.2997" fx="874.3125" fy="1324.2997" r="5.5625"/>
+    <linearGradient id="linearGradient5020-3">
+      <stop id="stop5022-7" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.30869097" id="stop5024-3"/>
+      <stop id="stop5026-1" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4904-7" id="linearGradient27409" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)" x1="556.0246" y1="1099.3903" x2="968.59534" y2="1330.6199"/>
+    <linearGradient id="linearGradient4904-7">
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0" id="stop4906-8"/>
+      <stop id="stop4950-5" offset="0.46410909" style="stop-color:#21aae3;stop-opacity:1;"/>
+      <stop id="stop4948-8" offset="0.74663347" style="stop-color:#c0f4fe;stop-opacity:1;"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="1" id="stop4908-3"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6247-9-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4956-1" id="linearGradient27411" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)" x1="1154.8738" y1="1067.8448" x2="785.32184" y2="1353.5291"/>
+    <linearGradient id="linearGradient4956-1">
+      <stop id="stop4958-1" offset="0" style="stop-color:#01397d;stop-opacity:0"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="0.46410909" id="stop4960-5"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop4962-9"/>
+      <stop id="stop4964-5" offset="1" style="stop-color:#21aae3;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5008-1" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4988-6" id="linearGradient27413" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)" x1="1093.0221" y1="911.74304" x2="653.22003" y2="1274.0055"/>
+    <linearGradient id="linearGradient4988-6">
+      <stop id="stop4990-4" offset="0" style="stop-color:#01397d;stop-opacity:1;"/>
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0.46410909" id="stop4992-5"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop4994-3"/>
+      <stop id="stop4996-0" offset="1" style="stop-color:#1a97cb;stop-opacity:0.40568627"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5006-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5244-1" id="linearGradient27415" gradientUnits="userSpaceOnUse" x1="485.21152" y1="1282.5083" x2="413.37195" y2="1401.8518"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5244-1">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop5246-3"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop5248-4"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6808-1" effect="spiro"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter7271-4" x="-0.042689584" width="1.0853792" y="-0.12341323" height="1.2468265">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.606943" id="feGaussianBlur7273-8"/>
     </filter>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3858-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4628-2"
-       id="linearGradient27417"
-       gradientUnits="userSpaceOnUse"
-       x1="419.73904"
-       y1="1459.7787"
-       x2="523.4317"
-       y2="1426.0287" />
-    <linearGradient
-       id="linearGradient4628-2">
-      <stop
-         style="stop-color:#dde2e3;stop-opacity:1;"
-         offset="0"
-         id="stop4630-0" />
-      <stop
-         style="stop-color:#86989b;stop-opacity:1;"
-         offset="1"
-         id="stop4632-7" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6796-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6804-6"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27551"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4848-7">
-      <stop
-         style="stop-color:#373f41;stop-opacity:1;"
-         offset="0"
-         id="stop4850-0" />
-      <stop
-         style="stop-color:#373f41;stop-opacity:0;"
-         offset="1"
-         id="stop4852-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27419"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27421"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27423"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27425"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27427"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27429"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27431"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27433"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27435"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27437"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27439"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27441"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27443"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27445"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27447"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27449"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27451"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27453"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27455"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27457"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27459"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27461"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27463"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27465"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27467"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27469"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27471"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27473"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27475"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27477"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27479"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27481"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27483"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27485"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27487"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27489"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27491"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27493"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27495"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27497"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27499"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27501"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27503"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27505"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27507"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27509"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27511"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27513"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27515"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27517"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27519"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27521"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27523"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27525"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27527"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27529"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27531"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27533"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27535"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27537"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27539"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27541"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27543"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27545"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27547"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27549"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient18521"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient18523"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient18525"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient18527"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient18529"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient18531"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient18533"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5262-0"
-       id="radialGradient27907"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.10739327,-0.00494555,0,0.02351734,-542.1205,207.96071)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient127731">
-      <stop
-         style="stop-color:#9ca0a5;stop-opacity:1;"
-         offset="0"
-         id="stop127733" />
-      <stop
-         id="stop127735"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#303d53;stop-opacity:1;"
-         offset="1"
-         id="stop127737" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313-6"
-       id="radialGradient18539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient127740">
-      <stop
-         id="stop127742"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop127744" />
-      <stop
-         id="stop127746"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5188-1"
-       id="linearGradient18541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85239486,0,0,0.85239486,57.136448,187.49243)"
-       x1="476.92038"
-       y1="1419.8461"
-       x2="476.56497"
-       y2="1427.665" />
-    <linearGradient
-       id="linearGradient127749">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop127751" />
-      <stop
-         id="stop127753"
-         offset="1"
-         style="stop-color:#c6d0dd;stop-opacity:0;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect127755"
-       effect="spiro" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5262-0"
-       id="radialGradient18543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.17288136,0,1156.4255)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient127762">
-      <stop
-         style="stop-color:#9ca0a5;stop-opacity:1;"
-         offset="0"
-         id="stop127764" />
-      <stop
-         id="stop127766"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#303d53;stop-opacity:1;"
-         offset="1"
-         id="stop127768" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6576-6"
-       id="radialGradient27901"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.8199709,-0.04994163,-0.11718426,1.9240001,-79.937174,-2424.4069)"
-       cx="462.20682"
-       cy="1394.1276"
-       fx="462.20682"
-       fy="1394.1276"
-       r="7.4508848" />
-    <linearGradient
-       id="linearGradient127771">
-      <stop
-         id="stop127773"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.52657253"
-         id="stop127775" />
-      <stop
-         id="stop127777"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313-6"
-       id="radialGradient27897"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.72364653,0.45794427,0.12177817,0.19243466,-453.68587,-255.36004)"
-       cx="461.34637"
-       cy="1361.1923"
-       fx="461.34637"
-       fy="1361.1923"
-       r="39.277084" />
-    <linearGradient
-       id="linearGradient127780">
-      <stop
-         id="stop127782"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop127784" />
-      <stop
-         id="stop127786"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6353-5"
-       id="linearGradient27894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.354,88.721752)"
-       x1="666.09454"
-       y1="1080.6464"
-       x2="949.8515"
-       y2="1293.1321" />
-    <linearGradient
-       id="linearGradient127789">
-      <stop
-         id="stop127791"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop127793"
-         offset="1"
-         style="stop-color:#9a9a9d;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17541"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6345-4"
-       id="linearGradient27891"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.354,88.721752)"
-       x1="897.6601"
-       y1="1334.4812"
-       x2="586.69891"
-       y2="1369.8365" />
-    <linearGradient
-       id="linearGradient127797">
-      <stop
-         id="stop127799"
-         offset="0"
-         style="stop-color:#adb8c9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939aa4;stop-opacity:1;"
-         offset="0.35951823"
-         id="stop127801" />
-      <stop
-         id="stop127803"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5020-3"
-       id="radialGradient18553"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)"
-       cx="874.3125"
-       cy="1324.2997"
-       fx="874.3125"
-       fy="1324.2997"
-       r="5.5625" />
-    <linearGradient
-       id="linearGradient127806">
-      <stop
-         id="stop127808"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.30869097"
-         id="stop127810" />
-      <stop
-         id="stop127812"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4904-7"
-       id="linearGradient27887"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.36243,88.719685)"
-       x1="556.0246"
-       y1="1099.3903"
-       x2="968.59534"
-       y2="1330.6199" />
-    <linearGradient
-       id="linearGradient127815">
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0"
-         id="stop127817" />
-      <stop
-         id="stop127819"
-         offset="0.46410909"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-      <stop
-         id="stop127821"
-         offset="0.74663347"
-         style="stop-color:#c0f4fe;stop-opacity:1;" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="1"
-         id="stop127823" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17532"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4956-1"
-       id="linearGradient27884"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.36243,88.719685)"
-       x1="1154.8738"
-       y1="1067.8448"
-       x2="785.32184"
-       y2="1353.5291" />
-    <linearGradient
-       id="linearGradient127827">
-      <stop
-         id="stop127829"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:0" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop127831" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop127833" />
-      <stop
-         id="stop127835"
-         offset="1"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17527"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4988-6"
-       id="linearGradient27881"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.36243,88.719685)"
-       x1="1093.0221"
-       y1="911.74304"
-       x2="653.22003"
-       y2="1274.0055" />
-    <linearGradient
-       id="linearGradient127839">
-      <stop
-         id="stop127841"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop127843" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop127845" />
-      <stop
-         id="stop127847"
-         offset="1"
-         style="stop-color:#1a97cb;stop-opacity:0.40568627" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17522"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5244-1"
-       id="linearGradient27878"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51679698,0,0,0.51679698,-383.35164,-485.60858)"
-       x1="485.21152"
-       y1="1282.5083"
-       x2="413.37195"
-       y2="1401.8518" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect127857"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17487"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4628-2"
-       id="linearGradient27873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.60688566,0,0,0.60688566,-341.77893,-627.87789)"
-       x1="419.73904"
-       y1="1459.7787"
-       x2="523.4317"
-       y2="1426.0287" />
-    <linearGradient
-       id="linearGradient127865">
-      <stop
-         style="stop-color:#dde2e3;stop-opacity:1;"
-         offset="0"
-         id="stop127867" />
-      <stop
-         style="stop-color:#86989b;stop-opacity:1;"
-         offset="1"
-         id="stop127869" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17484"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17478"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27868"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.50288057,-0.12131309,-0.14065869,0.49781611,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27862"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27859"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27856"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27853"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27844"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27841"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27838"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27835"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27832"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27826"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27817"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27814"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27811"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27808"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27802"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27799"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27790"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27784"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27781"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27778"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27775"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27772"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27769"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27766"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27763"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27760"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27757"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27754"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27751"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27748"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27745"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27742"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27739"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27736"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27733"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27730"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27727"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27724"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27721"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27718"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27712"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27706"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27703"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27700"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27697"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27694"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27685"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51400045,-0.05838918,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27682"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27679"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27676"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27673"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27670"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27667"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27664"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27661"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848-7"
-       id="linearGradient27652"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5244-1"
-       id="linearGradient27576"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51916098,0,0,0.38892929,-421.74109,-362.99635)"
-       x1="485.21152"
-       y1="1282.5083"
-       x2="413.37195"
-       y2="1401.8518" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5262-0-9"
-       id="radialGradient28099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.19300109,-4.132794e-4,0,0.04226402,-517.28663,28.301231)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient5262-0-9">
-      <stop
-         style="stop-color:#9ca0a5;stop-opacity:1;"
-         offset="0"
-         id="stop5264-3-5" />
-      <stop
-         id="stop5266-5-6"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#303d53;stop-opacity:1;"
-         offset="1"
-         id="stop5268-6-4" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313-6-9"
-       id="radialGradient28101"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient6313-6-9">
-      <stop
-         id="stop6315-7-8"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop6317-6-8" />
-      <stop
-         id="stop6319-7-7"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15945"
-       id="radialGradient28103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.5213919,-0.01503868,0.01200139,1.7636334,-684.45188,3626.9541)"
-       cx="487.21918"
-       cy="-4741.7397"
-       fx="487.21918"
-       fy="-4741.7397"
-       r="7.1086226" />
-    <linearGradient
-       id="linearGradient15945">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop15947" />
-      <stop
-         id="stop15949"
-         offset="0.56911689"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop15951" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4904-7"
-       id="linearGradient28105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.19045098,0,0,0.14947651,-519.79219,-124.18303)"
-       x1="556.0246"
-       y1="1099.3903"
-       x2="968.59534"
-       y2="1330.6199" />
-    <linearGradient
-       id="linearGradient128407">
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0"
-         id="stop128409" />
-      <stop
-         id="stop128411"
-         offset="0.46410909"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-      <stop
-         id="stop128413"
-         offset="0.74663347"
-         style="stop-color:#c0f4fe;stop-opacity:1;" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="1"
-         id="stop128415" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect15898"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4956-1"
-       id="linearGradient28107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.19045098,0,0,0.14947651,-522.30544,-123.71085)"
-       x1="1154.8738"
-       y1="1067.8448"
-       x2="785.32184"
-       y2="1353.5291" />
-    <linearGradient
-       id="linearGradient128419">
-      <stop
-         id="stop128421"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:0" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop128423" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop128425" />
-      <stop
-         id="stop128427"
-         offset="1"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect15896"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4988-6"
-       id="linearGradient28109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.19045098,0,0,0.14947651,-522.19026,-123.71085)"
-       x1="1093.0221"
-       y1="911.74304"
-       x2="653.22003"
-       y2="1274.0055" />
-    <linearGradient
-       id="linearGradient128431">
-      <stop
-         id="stop128433"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop128435" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop128437" />
-      <stop
-         id="stop128439"
-         offset="1"
-         style="stop-color:#1a97cb;stop-opacity:0.40568627" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect15886"
-       is_visible="true" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5020-3-8"
-       id="radialGradient28111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)"
-       cx="874.3125"
-       cy="1324.2997"
-       fx="874.3125"
-       fy="1324.2997"
-       r="5.5625" />
-    <linearGradient
-       id="linearGradient5020-3-8">
-      <stop
-         id="stop5022-7-5"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.30869097"
-         id="stop5024-3-7" />
-      <stop
-         id="stop5026-1-3"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter20384-7"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.6906501"
-         id="feGaussianBlur20386-7" />
+    <inkscape:path-effect effect="spiro" id="path-effect3858-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4628-2" id="linearGradient27417" gradientUnits="userSpaceOnUse" x1="419.73904" y1="1459.7787" x2="523.4317" y2="1426.0287"/>
+    <linearGradient id="linearGradient4628-2">
+      <stop style="stop-color:#dde2e3;stop-opacity:1;" offset="0" id="stop4630-0"/>
+      <stop style="stop-color:#86989b;stop-opacity:1;" offset="1" id="stop4632-7"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6796-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6804-6" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27551" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4848-7">
+      <stop style="stop-color:#373f41;stop-opacity:1;" offset="0" id="stop4850-0"/>
+      <stop style="stop-color:#373f41;stop-opacity:0;" offset="1" id="stop4852-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27419" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27421" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27423" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27425" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27427" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27429" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27431" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27433" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27435" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27437" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27439" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27441" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27443" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27445" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27447" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27449" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27451" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27453" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27455" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27457" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27459" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27461" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27463" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27465" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27467" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27469" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27471" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27473" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27475" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27477" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27479" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27481" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27483" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27485" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27487" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27489" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27491" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27493" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27495" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27497" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27499" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27501" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27503" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27505" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27507" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27509" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27511" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27513" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27515" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27517" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27519" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27521" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27523" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27525" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27527" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27529" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27531" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27533" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27535" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27537" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27539" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27541" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27543" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27545" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27547" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27549" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient18521" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient18523" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient18525" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient18527" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient18529" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient18531" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient18533" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5262-0" id="radialGradient27907" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.10739327,-0.00494555,0,0.02351734,-542.1205,207.96071)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient127731">
+      <stop style="stop-color:#9ca0a5;stop-opacity:1;" offset="0" id="stop127733"/>
+      <stop id="stop127735" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#303d53;stop-opacity:1;" offset="1" id="stop127737"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6313-6" id="radialGradient18539" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient127740">
+      <stop id="stop127742" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop127744"/>
+      <stop id="stop127746" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5188-1" id="linearGradient18541" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.85239486,0,0,0.85239486,57.136448,187.49243)" x1="476.92038" y1="1419.8461" x2="476.56497" y2="1427.665"/>
+    <linearGradient id="linearGradient127749">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop127751"/>
+      <stop id="stop127753" offset="1" style="stop-color:#c6d0dd;stop-opacity:0;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect127755" effect="spiro"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5262-0" id="radialGradient18543" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.17288136,0,1156.4255)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient127762">
+      <stop style="stop-color:#9ca0a5;stop-opacity:1;" offset="0" id="stop127764"/>
+      <stop id="stop127766" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#303d53;stop-opacity:1;" offset="1" id="stop127768"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6576-6" id="radialGradient27901" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.8199709,-0.04994163,-0.11718426,1.9240001,-79.937174,-2424.4069)" cx="462.20682" cy="1394.1276" fx="462.20682" fy="1394.1276" r="7.4508848"/>
+    <linearGradient id="linearGradient127771">
+      <stop id="stop127773" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.52657253" id="stop127775"/>
+      <stop id="stop127777" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6313-6" id="radialGradient27897" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.72364653,0.45794427,0.12177817,0.19243466,-453.68587,-255.36004)" cx="461.34637" cy="1361.1923" fx="461.34637" fy="1361.1923" r="39.277084"/>
+    <linearGradient id="linearGradient127780">
+      <stop id="stop127782" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop127784"/>
+      <stop id="stop127786" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6353-5" id="linearGradient27894" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.354,88.721752)" x1="666.09454" y1="1080.6464" x2="949.8515" y2="1293.1321"/>
+    <linearGradient id="linearGradient127789">
+      <stop id="stop127791" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop id="stop127793" offset="1" style="stop-color:#9a9a9d;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17541" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6345-4" id="linearGradient27891" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.354,88.721752)" x1="897.6601" y1="1334.4812" x2="586.69891" y2="1369.8365"/>
+    <linearGradient id="linearGradient127797">
+      <stop id="stop127799" offset="0" style="stop-color:#adb8c9;stop-opacity:1;"/>
+      <stop style="stop-color:#939aa4;stop-opacity:1;" offset="0.35951823" id="stop127801"/>
+      <stop id="stop127803" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5020-3" id="radialGradient18553" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)" cx="874.3125" cy="1324.2997" fx="874.3125" fy="1324.2997" r="5.5625"/>
+    <linearGradient id="linearGradient127806">
+      <stop id="stop127808" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.30869097" id="stop127810"/>
+      <stop id="stop127812" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4904-7" id="linearGradient27887" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.36243,88.719685)" x1="556.0246" y1="1099.3903" x2="968.59534" y2="1330.6199"/>
+    <linearGradient id="linearGradient127815">
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0" id="stop127817"/>
+      <stop id="stop127819" offset="0.46410909" style="stop-color:#21aae3;stop-opacity:1;"/>
+      <stop id="stop127821" offset="0.74663347" style="stop-color:#c0f4fe;stop-opacity:1;"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="1" id="stop127823"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17532" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4956-1" id="linearGradient27884" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.36243,88.719685)" x1="1154.8738" y1="1067.8448" x2="785.32184" y2="1353.5291"/>
+    <linearGradient id="linearGradient127827">
+      <stop id="stop127829" offset="0" style="stop-color:#01397d;stop-opacity:0"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="0.46410909" id="stop127831"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop127833"/>
+      <stop id="stop127835" offset="1" style="stop-color:#21aae3;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17527" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4988-6" id="linearGradient27881" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.10631213,0,0,0.10631213,-544.36243,88.719685)" x1="1093.0221" y1="911.74304" x2="653.22003" y2="1274.0055"/>
+    <linearGradient id="linearGradient127839">
+      <stop id="stop127841" offset="0" style="stop-color:#01397d;stop-opacity:1;"/>
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0.46410909" id="stop127843"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop127845"/>
+      <stop id="stop127847" offset="1" style="stop-color:#1a97cb;stop-opacity:0.40568627"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17522" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5244-1" id="linearGradient27878" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51679698,0,0,0.51679698,-383.35164,-485.60858)" x1="485.21152" y1="1282.5083" x2="413.37195" y2="1401.8518"/>
+    <inkscape:path-effect is_visible="true" id="path-effect127857" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17487" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4628-2" id="linearGradient27873" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.60688566,0,0,0.60688566,-341.77893,-627.87789)" x1="419.73904" y1="1459.7787" x2="523.4317" y2="1426.0287"/>
+    <linearGradient id="linearGradient127865">
+      <stop style="stop-color:#dde2e3;stop-opacity:1;" offset="0" id="stop127867"/>
+      <stop style="stop-color:#86989b;stop-opacity:1;" offset="1" id="stop127869"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17484" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17478" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27868" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.50288057,-0.12131309,-0.14065869,0.49781611,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27865" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27862" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27859" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27856" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27853" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27850" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27847" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27844" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27841" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27838" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27835" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27832" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27829" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27826" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27823" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27820" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27817" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27814" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27811" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27808" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27805" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27802" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27799" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27796" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27793" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27790" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27787" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27784" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27781" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27778" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27775" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27772" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27769" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27766" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27763" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27760" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27757" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27754" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27751" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27748" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27745" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27742" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27739" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27736" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27733" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27730" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27727" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27724" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27721" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27718" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27715" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27709" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27706" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27703" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27700" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27697" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27694" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27691" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27688" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27685" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51400045,-0.05838918,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27682" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27679" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27676" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27673" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27670" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27667" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27664" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27661" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27658" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27655" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848-7" id="linearGradient27652" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5244-1" id="linearGradient27576" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.51916098,0,0,0.38892929,-421.74109,-362.99635)" x1="485.21152" y1="1282.5083" x2="413.37195" y2="1401.8518"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5262-0-9" id="radialGradient28099" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.19300109,-4.132794e-4,0,0.04226402,-517.28663,28.301231)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient5262-0-9">
+      <stop style="stop-color:#9ca0a5;stop-opacity:1;" offset="0" id="stop5264-3-5"/>
+      <stop id="stop5266-5-6" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#303d53;stop-opacity:1;" offset="1" id="stop5268-6-4"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6313-6-9" id="radialGradient28101" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient6313-6-9">
+      <stop id="stop6315-7-8" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop6317-6-8"/>
+      <stop id="stop6319-7-7" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient15945" id="radialGradient28103" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.5213919,-0.01503868,0.01200139,1.7636334,-684.45188,3626.9541)" cx="487.21918" cy="-4741.7397" fx="487.21918" fy="-4741.7397" r="7.1086226"/>
+    <linearGradient id="linearGradient15945">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop15947"/>
+      <stop id="stop15949" offset="0.56911689" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop15951"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4904-7" id="linearGradient28105" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.19045098,0,0,0.14947651,-519.79219,-124.18303)" x1="556.0246" y1="1099.3903" x2="968.59534" y2="1330.6199"/>
+    <linearGradient id="linearGradient128407">
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0" id="stop128409"/>
+      <stop id="stop128411" offset="0.46410909" style="stop-color:#21aae3;stop-opacity:1;"/>
+      <stop id="stop128413" offset="0.74663347" style="stop-color:#c0f4fe;stop-opacity:1;"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="1" id="stop128415"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect15898" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4956-1" id="linearGradient28107" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.19045098,0,0,0.14947651,-522.30544,-123.71085)" x1="1154.8738" y1="1067.8448" x2="785.32184" y2="1353.5291"/>
+    <linearGradient id="linearGradient128419">
+      <stop id="stop128421" offset="0" style="stop-color:#01397d;stop-opacity:0"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="0.46410909" id="stop128423"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop128425"/>
+      <stop id="stop128427" offset="1" style="stop-color:#21aae3;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect15896" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4988-6" id="linearGradient28109" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.19045098,0,0,0.14947651,-522.19026,-123.71085)" x1="1093.0221" y1="911.74304" x2="653.22003" y2="1274.0055"/>
+    <linearGradient id="linearGradient128431">
+      <stop id="stop128433" offset="0" style="stop-color:#01397d;stop-opacity:1;"/>
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0.46410909" id="stop128435"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop128437"/>
+      <stop id="stop128439" offset="1" style="stop-color:#1a97cb;stop-opacity:0.40568627"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect15886" is_visible="true"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5020-3-8" id="radialGradient28111" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)" cx="874.3125" cy="1324.2997" fx="874.3125" fy="1324.2997" r="5.5625"/>
+    <linearGradient id="linearGradient5020-3-8">
+      <stop id="stop5022-7-5" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.30869097" id="stop5024-3-7"/>
+      <stop id="stop5026-1-3" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <filter inkscape:collect="always" id="filter20384-7" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.6906501" id="feGaussianBlur20386-7"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20398-9"
-       id="linearGradient19129"
-       gradientUnits="userSpaceOnUse"
-       x1="551.07391"
-       y1="4743.2173"
-       x2="539.0531"
-       y2="4751.7021" />
-    <linearGradient
-       id="linearGradient20398-9">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="0"
-         id="stop20400-3" />
-      <stop
-         style="stop-color:#cccccc;stop-opacity:0;"
-         offset="1"
-         id="stop20402-1" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect128453"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect16581"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4628-2"
-       id="linearGradient27000"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.2776278,0,0,1.2776278,133.95645,-1761.4822)"
-       x1="419.73904"
-       y1="1459.7787"
-       x2="523.4317"
-       y2="1426.0287" />
-    <linearGradient
-       id="linearGradient128461">
-      <stop
-         style="stop-color:#dde2e3;stop-opacity:1;"
-         offset="0"
-         id="stop128463" />
-      <stop
-         style="stop-color:#86989b;stop-opacity:1;"
-         offset="1"
-         id="stop128465" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect16578"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20398-9"
-       id="linearGradient18739"
-       gradientUnits="userSpaceOnUse"
-       x1="551.07391"
-       y1="4743.2173"
-       x2="539.0531"
-       y2="4751.7021" />
-    <linearGradient
-       id="linearGradient128473">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="0"
-         id="stop128475" />
-      <stop
-         style="stop-color:#cccccc;stop-opacity:0;"
-         offset="1"
-         id="stop128477" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20398-9"
-       id="linearGradient18737"
-       gradientUnits="userSpaceOnUse"
-       x1="551.07391"
-       y1="4743.2173"
-       x2="539.0531"
-       y2="4751.7021" />
-    <linearGradient
-       id="linearGradient128484">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="0"
-         id="stop128486" />
-      <stop
-         style="stop-color:#cccccc;stop-opacity:0;"
-         offset="1"
-         id="stop128488" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient20398-9" id="linearGradient19129" gradientUnits="userSpaceOnUse" x1="551.07391" y1="4743.2173" x2="539.0531" y2="4751.7021"/>
+    <linearGradient id="linearGradient20398-9">
+      <stop style="stop-color:#cccccc;stop-opacity:1;" offset="0" id="stop20400-3"/>
+      <stop style="stop-color:#cccccc;stop-opacity:0;" offset="1" id="stop20402-1"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect128453" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect16581" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4628-2" id="linearGradient27000" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.2776278,0,0,1.2776278,133.95645,-1761.4822)" x1="419.73904" y1="1459.7787" x2="523.4317" y2="1426.0287"/>
+    <linearGradient id="linearGradient128461">
+      <stop style="stop-color:#dde2e3;stop-opacity:1;" offset="0" id="stop128463"/>
+      <stop style="stop-color:#86989b;stop-opacity:1;" offset="1" id="stop128465"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect16578" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient20398-9" id="linearGradient18739" gradientUnits="userSpaceOnUse" x1="551.07391" y1="4743.2173" x2="539.0531" y2="4751.7021"/>
+    <linearGradient id="linearGradient128473">
+      <stop style="stop-color:#cccccc;stop-opacity:1;" offset="0" id="stop128475"/>
+      <stop style="stop-color:#cccccc;stop-opacity:0;" offset="1" id="stop128477"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient20398-9" id="linearGradient18737" gradientUnits="userSpaceOnUse" x1="551.07391" y1="4743.2173" x2="539.0531" y2="4751.7021"/>
+    <linearGradient id="linearGradient128484">
+      <stop style="stop-color:#cccccc;stop-opacity:1;" offset="0" id="stop128486"/>
+      <stop style="stop-color:#cccccc;stop-opacity:0;" offset="1" id="stop128488"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="30.428554"
-     inkscape:cy="196.65068"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="66"
-     inkscape:window-y="87"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="30.428554" inkscape:cy="196.65068" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="66" inkscape:window-y="87" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-344.57145,-627.14008)">
-    <g
-       style="display:inline"
-       transform="translate(1073.7171,473.96686)"
-       id="g28623"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Network.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g28113">
-        <g
-           id="g14932"
-           transform="matrix(0.47500975,0,0,0.47500975,-346.21861,133.15899)">
-          <g
-             transform="matrix(1.08797,0,0,1.08797,-1264.6494,-1302.6398)"
-             id="g4675-3">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5270-7"
-               transform="matrix(0.21082311,-0.00966172,0,0.26575403,304.62653,1034.3155)"
-               style="opacity:0.68609864;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5308-5)"
-               d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" />
-            <path
-               inkscape:connector-curvature="0"
-               d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-               style="fill:url(#radialGradient27391);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               transform="matrix(0.20780553,-0.00956961,0,0.26322031,307.21707,1037.6591)"
-               id="path6278-9" />
-            <path
-               transform="matrix(0.1980134,-0.00870404,0,0.23941226,314.3596,1069.5719)"
-               d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-               sodipodi:ry="18.031223"
-               sodipodi:rx="104.29825"
-               sodipodi:cy="1398.1375"
-               sodipodi:cx="744.58344"
-               id="path6280-3"
-               style="fill:url(#radialGradient27393);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:nodetypes="cscccscc"
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 454.79268,1401.7435 c 0.32318,-0.7586 0.0627,-0.9297 6.2e-4,-1.6682 -0.0622,-0.7385 0.25383,-1.5451 -0.17296,-2.2502 l 14.53854,-0.8732 c -0.26236,1.9711 -0.58448,2.7627 -0.86471,4.5641 -2.23925,0.3472 -4.46092,0.4766 -6.72533,0.5472 -2.26442,0.071 -4.46873,0.083 -6.77611,-0.3197 z"
-               inkscape:path-effect="#path-effect6294-6"
-               id="path6292-9"
-               d="m 454.79268,1401.7435 c 0.0184,-0.5559 0.0186,-1.1123 6.2e-4,-1.6682 -0.0244,-0.7521 -0.0821,-1.5032 -0.17296,-2.2502 l 14.53854,-0.8732 -0.86471,4.5641 c -2.22704,0.3256 -4.47494,0.5085 -6.72533,0.5472 -2.26244,0.039 -4.52738,-0.068 -6.77611,-0.3197 l -5e-5,0"
-               style="fill:url(#linearGradient27395);fill-opacity:1;stroke:none;filter:url(#filter5200-2)" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#radialGradient27397);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path6282-1"
-               sodipodi:cx="744.58344"
-               sodipodi:cy="1398.1375"
-               sodipodi:rx="104.29825"
-               sodipodi:ry="18.031223"
-               d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-               transform="matrix(0.08535972,-0.00450311,0,0.0855003,398.37302,1280.5771)" />
-            <path
-               style="fill:url(#radialGradient27399);fill-opacity:1;stroke:none"
-               d="m 468.88402,1390.3837 -14.3228,0.945 c 0.13455,1.4072 0.33944,4.3508 -0.0193,5.4257 -0.0492,0.065 -0.0771,0.1286 -0.0771,0.1928 0,0 -5e-5,0.01 0,0.01 0.0182,0.7323 3.34727,1.1429 7.45069,0.9193 4.11472,-0.2244 7.45068,-0.9996 7.45068,-1.7358 0,-0.01 8.5e-4,-0.022 0,-0.032 -8.2e-4,-0.013 -0.005,-0.025 -0.007,-0.038 -0.5902,-1.9111 -0.69061,-4.1629 -0.47571,-5.6828 z"
-               id="path6284-8"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccscsscccc" />
-            <path
-               sodipodi:nodetypes="ssssccsss"
-               inkscape:connector-curvature="0"
-               d="m 423.32844,1330.2636 71.84537,5.7095 c 0.72298,0.057 1.26267,0.5854 1.30915,1.3091 l 3.05468,47.5659 c 0.0465,0.7238 -0.74078,1.1782 -1.30915,1.3092 -22.95377,5.5659 -48.38487,6.2191 -73.02164,5.8911 -0.72293,0.059 -1.27894,-0.5845 -1.30915,-1.3091 l -2.46623,-59.1734 c -0.0302,-0.7246 0.65071,-1.4013 1.89697,-1.3023 z"
-               style="fill:#8e959f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path6276-2" />
-            <path
-               id="rect6253-8"
-               style="fill:url(#radialGradient27401);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.32914165;stroke-miterlimit:4;stroke-opacity:1"
-               d="m 423.54419,1330.4303 72.5489,5.3821 c 0.72328,0.054 1.26267,0.5854 1.30915,1.3092 l 3.05468,47.5658 c 0.0465,0.7238 -0.74078,1.1781 -1.30915,1.3092 -22.95376,5.5658 -48.38487,6.2192 -73.02164,5.8912 -0.72292,0.058 -1.27736,-0.5846 -1.30915,-1.3092 l -2.58194,-58.8392 c -0.0318,-0.7245 0.58587,-1.3628 1.30915,-1.3091 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ssssccsss" />
-            <path
-               style="fill:url(#linearGradient27403);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 425.92067,1334.0668 69.77239,4.8003 2.6183,41.7474 -69.67602,4.6548 -2.71467,-51.2025"
-               id="path6245-0"
-               inkscape:path-effect="#path-effect6247-4"
-               inkscape:original-d="m 425.92067,1334.0668 69.77239,4.8003 2.6183,41.7474 -69.67602,4.6548 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               style="fill:url(#linearGradient27405);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 424.92361,1390.4625 c 0.0317,0.7245 0.5865,1.3697 1.30697,1.3114 24.55302,0.328 49.89789,-0.3227 72.77363,-5.8885 0.56644,-0.1311 1.34688,-0.5877 1.30056,-1.3115 l -0.11532,-1.8128 c -0.23506,0.4251 -0.76842,0.7006 -1.18524,0.7971 -22.87574,5.5658 -48.22061,6.2166 -72.77363,5.8886 -1.32,-0.012 -1.29964,-0.1096 -1.30697,1.0157 z"
-               id="path6269-1"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccccccc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#radialGradient27407);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-               id="path6274-8"
-               sodipodi:cx="874.3125"
-               sodipodi:cy="1324.2997"
-               sodipodi:rx="5.0625"
-               sodipodi:ry="6.5625"
-               d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z"
-               transform="matrix(0.20134232,0.04967248,-0.02204121,0.19072995,344.29271,1087.5475)" />
-            <path
-               style="fill:url(#linearGradient27409);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025"
-               id="path6245-4-4"
-               inkscape:path-effect="#path-effect6247-9-2"
-               inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z"
-               inkscape:path-effect="#path-effect5008-1"
-               id="path4952-8"
-               d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025"
-               style="opacity:0.27354264;fill:url(#linearGradient27411);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-            <path
-               style="opacity:0.63677135;fill:url(#linearGradient27413);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025"
-               id="path4974-6"
-               inkscape:path-effect="#path-effect5006-8"
-               inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ssccsss"
-               inkscape:connector-curvature="0"
-               d="m 423.54419,1330.4303 72.5489,5.3821 c 0.72328,0.054 2.01309,1.1345 1.30915,1.3092 -50.55136,-3.2968 -57.54122,54.12 -71.27611,54.7662 -0.72292,0.058 -1.27736,-0.5846 -1.30915,-1.3092 l -2.58194,-58.8392 c -0.0318,-0.7245 0.58587,-1.3628 1.30915,-1.3091 z"
-               style="opacity:0.24215249;fill:url(#linearGradient27415);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path5230-0" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-344.57145,-627.14008)">
+    <g style="display:inline" transform="translate(1073.7171,473.96686)" id="g28623">
+      <g id="g28113">
+        <g id="g14932" transform="matrix(0.47500975,0,0,0.47500975,-346.21861,133.15899)">
+          <g transform="matrix(1.08797,0,0,1.08797,-1264.6494,-1302.6398)" id="g4675-3">
+            <path inkscape:connector-curvature="0" id="path5270-7" transform="matrix(0.21082311,-0.00966172,0,0.26575403,304.62653,1034.3155)" style="opacity:0.68609864;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5308-5)" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"/>
+            <path inkscape:connector-curvature="0" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" style="fill:url(#radialGradient27391);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.20780553,-0.00956961,0,0.26322031,307.21707,1037.6591)" id="path6278-9"/>
+            <path transform="matrix(0.1980134,-0.00870404,0,0.23941226,314.3596,1069.5719)" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" sodipodi:ry="18.031223" sodipodi:rx="104.29825" sodipodi:cy="1398.1375" sodipodi:cx="744.58344" id="path6280-3" style="fill:url(#radialGradient27393);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:nodetypes="cscccscc" inkscape:connector-curvature="0" inkscape:original-d="m 454.79268,1401.7435 c 0.32318,-0.7586 0.0627,-0.9297 6.2e-4,-1.6682 -0.0622,-0.7385 0.25383,-1.5451 -0.17296,-2.2502 l 14.53854,-0.8732 c -0.26236,1.9711 -0.58448,2.7627 -0.86471,4.5641 -2.23925,0.3472 -4.46092,0.4766 -6.72533,0.5472 -2.26442,0.071 -4.46873,0.083 -6.77611,-0.3197 z" inkscape:path-effect="#path-effect6294-6" id="path6292-9" d="m 454.79268,1401.7435 c 0.0184,-0.5559 0.0186,-1.1123 6.2e-4,-1.6682 -0.0244,-0.7521 -0.0821,-1.5032 -0.17296,-2.2502 l 14.53854,-0.8732 -0.86471,4.5641 c -2.22704,0.3256 -4.47494,0.5085 -6.72533,0.5472 -2.26244,0.039 -4.52738,-0.068 -6.77611,-0.3197 l -5e-5,0" style="fill:url(#linearGradient27395);fill-opacity:1;stroke:none;filter:url(#filter5200-2)"/>
+            <path sodipodi:type="arc" style="fill:url(#radialGradient27397);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6282-1" sodipodi:cx="744.58344" sodipodi:cy="1398.1375" sodipodi:rx="104.29825" sodipodi:ry="18.031223" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" transform="matrix(0.08535972,-0.00450311,0,0.0855003,398.37302,1280.5771)"/>
+            <path style="fill:url(#radialGradient27399);fill-opacity:1;stroke:none" d="m 468.88402,1390.3837 -14.3228,0.945 c 0.13455,1.4072 0.33944,4.3508 -0.0193,5.4257 -0.0492,0.065 -0.0771,0.1286 -0.0771,0.1928 0,0 -5e-5,0.01 0,0.01 0.0182,0.7323 3.34727,1.1429 7.45069,0.9193 4.11472,-0.2244 7.45068,-0.9996 7.45068,-1.7358 0,-0.01 8.5e-4,-0.022 0,-0.032 -8.2e-4,-0.013 -0.005,-0.025 -0.007,-0.038 -0.5902,-1.9111 -0.69061,-4.1629 -0.47571,-5.6828 z" id="path6284-8" inkscape:connector-curvature="0" sodipodi:nodetypes="cccscsscccc"/>
+            <path sodipodi:nodetypes="ssssccsss" inkscape:connector-curvature="0" d="m 423.32844,1330.2636 71.84537,5.7095 c 0.72298,0.057 1.26267,0.5854 1.30915,1.3091 l 3.05468,47.5659 c 0.0465,0.7238 -0.74078,1.1782 -1.30915,1.3092 -22.95377,5.5659 -48.38487,6.2191 -73.02164,5.8911 -0.72293,0.059 -1.27894,-0.5845 -1.30915,-1.3091 l -2.46623,-59.1734 c -0.0302,-0.7246 0.65071,-1.4013 1.89697,-1.3023 z" style="fill:#8e959f;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6276-2"/>
+            <path id="rect6253-8" style="fill:url(#radialGradient27401);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.32914165;stroke-miterlimit:4;stroke-opacity:1" d="m 423.54419,1330.4303 72.5489,5.3821 c 0.72328,0.054 1.26267,0.5854 1.30915,1.3092 l 3.05468,47.5658 c 0.0465,0.7238 -0.74078,1.1781 -1.30915,1.3092 -22.95376,5.5658 -48.38487,6.2192 -73.02164,5.8912 -0.72292,0.058 -1.27736,-0.5846 -1.30915,-1.3092 l -2.58194,-58.8392 c -0.0318,-0.7245 0.58587,-1.3628 1.30915,-1.3091 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ssssccsss"/>
+            <path style="fill:url(#linearGradient27403);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 425.92067,1334.0668 69.77239,4.8003 2.6183,41.7474 -69.67602,4.6548 -2.71467,-51.2025" id="path6245-0" inkscape:path-effect="#path-effect6247-4" inkscape:original-d="m 425.92067,1334.0668 69.77239,4.8003 2.6183,41.7474 -69.67602,4.6548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path style="fill:url(#linearGradient27405);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 424.92361,1390.4625 c 0.0317,0.7245 0.5865,1.3697 1.30697,1.3114 24.55302,0.328 49.89789,-0.3227 72.77363,-5.8885 0.56644,-0.1311 1.34688,-0.5877 1.30056,-1.3115 l -0.11532,-1.8128 c -0.23506,0.4251 -0.76842,0.7006 -1.18524,0.7971 -22.87574,5.5658 -48.22061,6.2166 -72.77363,5.8886 -1.32,-0.012 -1.29964,-0.1096 -1.30697,1.0157 z" id="path6269-1" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+            <path sodipodi:type="arc" style="fill:url(#radialGradient27407);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" id="path6274-8" sodipodi:cx="874.3125" sodipodi:cy="1324.2997" sodipodi:rx="5.0625" sodipodi:ry="6.5625" d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z" transform="matrix(0.20134232,0.04967248,-0.02204121,0.19072995,344.29271,1087.5475)"/>
+            <path style="fill:url(#linearGradient27409);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025" id="path6245-4-4" inkscape:path-effect="#path-effect6247-9-2" inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z" inkscape:path-effect="#path-effect5008-1" id="path4952-8" d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025" style="opacity:0.27354264;fill:url(#linearGradient27411);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+            <path style="opacity:0.63677135;fill:url(#linearGradient27413);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025" id="path4974-6" inkscape:path-effect="#path-effect5006-8" inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ssccsss" inkscape:connector-curvature="0" d="m 423.54419,1330.4303 72.5489,5.3821 c 0.72328,0.054 2.01309,1.1345 1.30915,1.3092 -50.55136,-3.2968 -57.54122,54.12 -71.27611,54.7662 -0.72292,0.058 -1.27736,-0.5846 -1.30915,-1.3092 l -2.58194,-58.8392 c -0.0318,-0.7245 0.58587,-1.3628 1.30915,-1.3091 z" style="opacity:0.24215249;fill:url(#linearGradient27415);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5230-0"/>
           </g>
-          <g
-             transform="matrix(1.2776262,0,0,1.2776262,-1352.169,-1602.1477)"
-             id="g4693-9">
-            <path
-               sodipodi:nodetypes="ccccscccccc"
-               style="opacity:0.8699552;fill:#5e6b6a;fill-opacity:1;stroke:none;filter:url(#filter7271-4)"
-               d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.10844,0.2803 0.10113,0.6035 -0.0199,0.8786 -0.10048,0.2284 -0.27746,0.4224 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 -12.37498,-23.875"
-               id="path7269-3"
-               inkscape:path-effect="#path-effect6808-1"
-               inkscape:original-d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.0752,0.4655 0.0673,0.7 -0.0199,0.8786 -0.0872,0.1786 -0.2537,0.3014 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 z"
-               inkscape:connector-curvature="0"
-               transform="matrix(0.85239486,0,0,0.85239486,57.386448,214.74243)" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 436.48906,1430.4597 57.53666,-5.5406 17.68719,9.8026 1.7181,0.3862 c 0.0641,0.3968 0.0574,0.5967 -0.017,0.7489 -0.0743,0.1522 -0.21625,0.2569 -0.42257,0.4631 l -63.29031,15.13 -1.17205,0.1066 -1.06549,-0.1066 -0.4262,-0.6393 z"
-               inkscape:path-effect="#path-effect3858-4"
-               id="path6806-0"
-               d="m 436.48906,1430.4597 57.53666,-5.5406 17.68719,9.8026 1.7181,0.3862 c 0.0924,0.239 0.0862,0.5144 -0.017,0.7489 -0.0856,0.1947 -0.23651,0.36 -0.42257,0.4631 l -63.29031,15.13 -1.17205,0.1066 -1.06549,-0.1066 -0.4262,-0.6393 -10.54833,-20.3509"
-               style="fill:#a5b0af;fill-opacity:1;stroke:none"
-               sodipodi:nodetypes="ccccscccccc" />
-            <path
-               style="fill:url(#linearGradient27417);fill-opacity:1;stroke:none"
-               d="m 436.48906,1429.5007 57.53666,-5.5405 c 6.06778,2.9433 11.97516,6.2173 17.68719,9.8025 0.50543,0.3172 1.00932,0.6369 1.51167,0.959 0.073,0.03 0.13466,0.086 0.17063,0.156 0.036,0.07 0.0459,0.1531 0.0274,0.2296 -0.0166,0.069 -0.0559,0.132 -0.11029,0.1773 -0.0544,0.045 -0.12362,0.072 -0.19431,0.076 l -63.41685,15.13 -1.17204,0.1065 -1.06549,-0.1065 -0.4262,-0.6393 -10.54839,-20.351"
-               id="path6794-0"
-               inkscape:path-effect="#path-effect6796-0"
-               inkscape:original-d="m 436.48906,1429.5007 57.53666,-5.5405 17.68719,9.8025 1.51167,0.959 c 0.20338,0.1091 0.30253,0.2833 0.19805,0.3856 -0.10449,0.1023 -0.23283,0.2292 -0.3046,0.2537 l -63.41685,15.13 -1.17204,0.1065 -1.06549,-0.1065 -0.4262,-0.6393 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccscccccc" />
-            <path
-               id="rect6798-8"
-               style="fill:#717c7d;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m 436.48906,1429.5041 1.61908,3.1178 -0.23717,2.4694 -1.61384,-2.8106 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               style="fill:#5d686c;fill-opacity:1;stroke:none"
-               d="m 437.86849,1435.086 1.42732,-0.1778 -1.18854,-2.2825 -0.23878,2.4603"
-               id="path6802-7"
-               inkscape:path-effect="#path-effect6804-6"
-               inkscape:original-d="m 437.86849,1435.086 1.42732,-0.1778 -1.18854,-2.2825 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccc" />
-            <g
-               id="g7046-6"
-               style="fill:url(#linearGradient27551);fill-opacity:1"
-               transform="matrix(0.85239486,0,0,0.85239486,57.386448,214.74243)">
-              <path
-                 sodipodi:nodetypes="cssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 47.697778,1511.0581 6.087718,0.2141 c 0.349743,0.012 0.522843,0.3039 0.632435,0.6325 l 1.203138,3.6075 c 0.109592,0.3286 -0.2994,0.553 -0.649558,0.5485 l -6.40556,-0.082 c -0.350353,0 -0.552167,-0.2944 -0.632435,-0.6324 l -0.868173,-3.6557 c -0.08027,-0.338 0.282107,-0.6335 0.632435,-0.6325 z"
-                 style="fill:url(#linearGradient27419);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 transform="matrix(0.97211389,-0.23450924,0.27190603,0.96232381,0,0)"
-                 id="rect6814-35" />
-              <path
-                 inkscape:transform-center-y="0.95777293"
-                 inkscape:transform-center-x="0.50002642"
-                 id="path6822-6"
-                 style="fill:url(#linearGradient27421);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 465.21397,1441.2337 5.97648,-1.17 c 0.34326,-0.067 0.59092,0.1627 0.78681,0.4409 l 2.1506,3.0546 c 0.19589,0.2783 -0.10119,0.6506 -0.44287,0.7249 l -5.82422,1.267 c -0.34184,0.075 -0.58591,-0.1659 -0.78679,-0.4408 l -2.3029,-3.1518 c -0.20088,-0.275 0.10199,-0.6472 0.44285,-0.725 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cssssssssc" />
-              <path
-                 sodipodi:nodetypes="csssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 472.86949,1439.7116 4.96651,-1.0132 c 0.30643,-0.062 0.49497,0.1853 0.70013,0.4425 l 2.25743,2.8304 c 0.20521,0.2573 -0.0888,0.6579 -0.39408,0.7275 l -5.01763,1.1439 c -0.3055,0.069 -0.50641,-0.1768 -0.70011,-0.4424 l -2.21416,-3.0355 c -0.10992,-0.1507 -0.0581,-0.2652 0.0559,-0.4146 0.087,-0.114 0.34415,-0.246 0.34595,-0.2388 z"
-                 style="fill:url(#linearGradient27423);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6828-5"
-                 inkscape:transform-center-x="0.44493633"
-                 inkscape:transform-center-y="0.9612254" />
-              <path
-                 inkscape:transform-center-y="0.93458356"
-                 inkscape:transform-center-x="0.44493633"
-                 id="path6830-8"
-                 style="fill:url(#linearGradient27425);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 479.44154,1438.3333 6.18042,-1.2097 c 0.30632,-0.06 0.69706,0.086 0.92161,0.3193 l 2.56679,2.6635 c 0.22455,0.233 -0.0892,0.638 -0.39408,0.7073 l -6.76238,1.5361 c -0.30499,0.069 -0.50641,-0.1719 -0.70011,-0.4301 l -2.21416,-2.9513 c -0.10992,-0.1465 -0.0581,-0.2579 0.0559,-0.4031 0.087,-0.1109 0.34415,-0.2392 0.34595,-0.2322 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="csssssssssc" />
-              <path
-                 sodipodi:nodetypes="csssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 487.69681,1436.6835 22.45389,-4.6258 c 0.30535,-0.063 0.67279,0.1096 0.92161,0.3096 l 2.70741,2.1765 c 0.24824,0.1995 -0.0895,0.6168 -0.39408,0.6858 l -22.60384,5.1149 c -0.30455,0.069 -0.6324,0.01 -0.84854,-0.2218 l -2.63836,-2.8234 c -0.12261,-0.1312 -0.0581,-0.2501 0.0559,-0.3909 0.087,-0.1075 0.34393,-0.2318 0.34595,-0.2251 z"
-                 style="fill:url(#linearGradient27427);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6832-3"
-                 inkscape:transform-center-x="0.44493633"
-                 inkscape:transform-center-y="0.90626211" />
-              <path
-                 sodipodi:nodetypes="csssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 512.01768,1431.6827 3.27189,-0.679 c 0.25053,-0.052 0.54511,0.1046 0.75544,0.2617 l 2.90858,2.1734 c 0.21252,0.1588 -0.0731,0.523 -0.32303,0.5798 l -3.397,0.7716 c -0.25009,0.057 -0.36195,-0.1942 -0.57387,-0.3526 l -2.89964,-2.168 c -0.12014,-0.09 -0.1139,-0.2887 -0.0205,-0.4078 0.0713,-0.091 0.27612,-0.1848 0.27806,-0.1793 z"
-                 style="fill:url(#linearGradient27429);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6834-9"
-                 inkscape:transform-center-x="0.36471052"
-                 inkscape:transform-center-y="0.76615965" />
-              <path
-                 inkscape:transform-center-y="0.74552444"
-                 inkscape:transform-center-x="0.36471052"
-                 id="path6836-4"
-                 style="fill:url(#linearGradient27431);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 516.87631,1430.6627 2.69737,-0.5392 c 0.2507,-0.05 0.54512,0.1018 0.75544,0.2547 l 2.90858,2.1148 c 0.21251,0.1545 -0.0732,0.5085 -0.32303,0.5642 l -2.82248,0.6293 c -0.25014,0.056 -0.36195,-0.189 -0.57387,-0.3431 l -2.89964,-2.1096 c -0.12014,-0.088 -0.1139,-0.2809 -0.0205,-0.3968 0.0713,-0.089 0.27612,-0.1798 0.27806,-0.1745 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="csssssssssc" />
-              <path
-                 sodipodi:nodetypes="csssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 520.94699,1429.8131 2.69737,-0.5258 c 0.2507,-0.049 0.54512,0.099 0.75544,0.2484 l 2.90858,2.0623 c 0.21251,0.1507 -0.0732,0.4959 -0.32303,0.5502 l -2.82248,0.6137 c -0.25014,0.055 -0.36195,-0.1843 -0.57387,-0.3346 l -2.89964,-2.0573 c -0.12014,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27612,-0.1754 0.27806,-0.1702 z"
-                 style="fill:url(#linearGradient27433);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6838-8"
-                 inkscape:transform-center-x="0.36471052"
-                 inkscape:transform-center-y="0.72705418" />
-              <path
-                 inkscape:transform-center-y="0.72705418"
-                 inkscape:transform-center-x="0.36471052"
-                 id="path6840-3"
-                 style="fill:url(#linearGradient27435);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 525.09132,1428.99 1.81349,-0.3726 c 0.25019,-0.051 0.53014,0.1227 0.75544,0.2484 l 3.34419,1.8652 c 0.22753,0.1269 -0.0737,0.4935 -0.32303,0.5502 l -2.53192,0.5751 c -0.24975,0.057 -0.36305,-0.1828 -0.57387,-0.3346 l -2.74193,-1.9748 c -0.11989,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27622,-0.1754 0.27806,-0.1702 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="csssssssssc" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 454.69085,1438.2936 14.72061,-2.4946 c 0.34338,-0.058 0.58523,0.1452 0.78678,0.3809 l 2.02413,2.3671 c 0.2016,0.2358 -0.14123,0.4959 -0.48231,0.5629 l -15.16831,2.9835 c -0.34077,0.067 -0.63951,-0.1135 -0.78675,-0.381 l -1.53697,-2.7924 c -0.1472,-0.2675 0.10031,-0.5684 0.44282,-0.6264 z"
-                 style="fill:url(#linearGradient27437);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="rect6814-3-9" />
-              <path
-                 id="path6864-7"
-                 style="fill:url(#linearGradient27439);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 471.24017,1435.5075 4.73892,-0.8214 c 0.34247,-0.059 0.58137,0.1383 0.78678,0.353 l 2.13814,2.235 c 0.20554,0.2149 -0.14214,0.4547 -0.48231,0.5216 l -4.87836,0.9596 c -0.33985,0.067 -0.60051,-0.133 -0.78675,-0.353 l -1.95924,-2.3144 c -0.1863,-0.2201 0.10119,-0.5212 0.44282,-0.5804 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 477.72189,1434.3908 4.25555,-0.7477 c 0.34178,-0.06 0.58135,0.1322 0.78678,0.3375 l 2.13814,2.1367 c 0.20553,0.2054 -0.1427,0.4318 -0.48231,0.4986 l -4.30471,0.8467 c -0.33932,0.067 -0.59426,-0.1328 -0.78675,-0.3375 l -2.04952,-2.1795 c -0.19251,-0.2048 0.10176,-0.4949 0.44282,-0.5548 z"
-                 style="fill:url(#linearGradient27441);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6866-6" />
-              <path
-                 id="path6868-4"
-                 style="fill:url(#linearGradient27443);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 483.80361,1433.3299 3.93266,-0.6732 c 0.33258,-0.057 0.56567,0.1263 0.76558,0.3224 l 2.08052,2.0409 c 0.2,0.1961 -0.13885,0.4124 -0.46932,0.4762 l -3.9805,0.7678 c -0.33023,0.064 -0.57824,-0.1269 -0.76554,-0.3224 l -1.99429,-2.0818 c -0.18732,-0.1956 0.0989,-0.4731 0.43089,-0.5299 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 489.56243,1432.3586 3.49706,-0.6074 c 0.33196,-0.058 0.56568,0.12 0.76558,0.3063 l 2.08052,1.9391 c 0.19999,0.1864 -0.13966,0.3877 -0.46932,0.4525 l -3.5449,0.6973 c -0.3295,0.065 -0.57824,-0.1206 -0.76554,-0.3063 l -1.99429,-1.978 c -0.18732,-0.1858 0.0995,-0.4459 0.43089,-0.5035 z"
-                 style="fill:url(#linearGradient27445);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6870-5" />
-              <path
-                 id="path6872-8"
-                 style="fill:url(#linearGradient27447);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 494.85266,1431.4662 3.05202,-0.5246 c 0.33162,-0.057 0.56568,0.1136 0.76558,0.29 l 2.08052,1.836 c 0.19999,0.1765 -0.1403,0.3638 -0.46932,0.4285 l -3.09986,0.6097 c -0.32898,0.065 -0.57824,-0.1142 -0.76554,-0.29 l -1.99429,-1.8728 c -0.18732,-0.176 0.0999,-0.4199 0.43089,-0.4768 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 499.48759,1430.684 3.05202,-0.4988 c 0.33162,-0.054 0.56568,0.108 0.76558,0.2757 l 2.08052,1.746 c 0.19999,0.1679 -0.1403,0.346 -0.46932,0.4075 l -3.09986,0.5798 c -0.32898,0.062 -0.57824,-0.1086 -0.76554,-0.2758 l -1.99429,-1.7809 c -0.18732,-0.1674 0.0999,-0.3993 0.43089,-0.4535 z"
-                 style="fill:url(#linearGradient27449);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6874-6" />
-              <path
-                 id="path6876-1"
-                 style="fill:url(#linearGradient27451);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 504.17762,1429.868 2.70166,-0.4632 c 0.33085,-0.057 0.5657,0.1034 0.76558,0.264 l 2.08052,1.6719 c 0.20004,0.1607 -0.14135,0.3257 -0.46932,0.3902 l -2.7495,0.5408 c -0.32795,0.064 -0.57824,-0.104 -0.76554,-0.2641 l -1.99429,-1.7053 c -0.18732,-0.1603 0.10067,-0.3777 0.43089,-0.4343 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 508.45089,1429.1633 2.70166,-0.4371 c 0.33085,-0.054 0.5657,0.098 0.76558,0.2491 l 2.08052,1.5775 c 0.20004,0.1516 -0.14135,0.3073 -0.46932,0.3681 l -2.7495,0.5103 c -0.32795,0.06 -0.57824,-0.098 -0.76554,-0.2492 l -1.99429,-1.609 c -0.18732,-0.1512 0.10067,-0.3563 0.43089,-0.4097 z"
-                 style="fill:url(#linearGradient27453);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6878-5" />
-              <path
-                 id="path6880-5"
-                 style="fill:url(#linearGradient27455);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 512.60906,1428.4424 2.70166,-0.4184 c 0.33085,-0.052 0.5657,0.094 0.76558,0.2384 l 2.08052,1.5101 c 0.20004,0.1451 -0.14135,0.2941 -0.46932,0.3523 l -2.7495,0.4885 c -0.32795,0.057 -0.57824,-0.094 -0.76554,-0.2385 l -1.99429,-1.5403 c -0.18732,-0.1447 0.10067,-0.341 0.43089,-0.3921 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 516.77633,1427.7726 2.62492,-0.4448 c 0.3299,-0.056 0.5657,0.09 0.76558,0.2284 l 2.08052,1.4469 c 0.20004,0.139 -0.14135,0.2818 -0.46932,0.3376 l -2.7495,0.468 c -0.32795,0.055 -0.57889,-0.089 -0.76554,-0.2285 l -1.91755,-1.4319 c -0.18676,-0.1394 0.10174,-0.3199 0.43089,-0.3757 z"
-                 style="fill:url(#linearGradient27457);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6882-1" />
-              <path
-                 id="path6884-9"
-                 style="fill:url(#linearGradient27459);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 521.03501,1427.051 2.42068,-0.3892 c 0.32986,-0.053 0.55745,0.099 0.76558,0.2176 l 2.32063,1.317 c 0.20863,0.1184 -0.14135,0.2685 -0.46932,0.3217 l -2.7495,0.4459 c -0.32795,0.052 -0.57643,-0.088 -0.76554,-0.2177 l -1.95342,-1.3373 c -0.18911,-0.1295 0.1017,-0.3051 0.43089,-0.358 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 id="path6890-6"
-                 style="fill:url(#linearGradient27461);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 452.57798,1434.6551 11.12923,-1.6317 c 0.259,-0.038 0.41871,0.208 0.59558,0.4431 l 1.50759,2.0044 c 0.17693,0.2352 -0.1074,0.4817 -0.36511,0.5247 l -11.38645,1.8987 c -0.25749,0.043 -0.44999,-0.1804 -0.59556,-0.4433 l -1.22049,-2.2045 c -0.14557,-0.2629 0.0768,-0.5535 0.33521,-0.5914 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 465.14481,1432.8122 4.899,-0.7203 c 0.25873,-0.038 0.40063,0.2129 0.59558,0.4201 l 1.77321,1.8851 c 0.19503,0.2073 -0.10774,0.4547 -0.36511,0.4976 l -5.17296,0.8626 c -0.2572,0.043 -0.42263,-0.1893 -0.59556,-0.4204 l -1.46937,-1.9639 c -0.17299,-0.2312 0.0771,-0.5229 0.33521,-0.5608 z"
-                 style="fill:url(#linearGradient27463);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6892-4" />
-              <path
-                 id="path6894-5"
-                 style="fill:url(#linearGradient27465);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 471.62681,1431.8596 4.86438,-0.7161 c 0.25852,-0.038 0.39723,0.2086 0.59563,0.405 l 1.80467,1.7862 c 0.19848,0.1964 -0.10793,0.4368 -0.36505,0.4797 l -5.0158,0.8364 c -0.25706,0.043 -0.40931,-0.1935 -0.59561,-0.4053 l -1.62336,-1.8453 c -0.18633,-0.2118 0.0772,-0.5026 0.33514,-0.5406 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 478.00171,1430.898 4.18042,-0.6063 c 0.25845,-0.037 0.39724,0.201 0.59563,0.3902 l 1.80467,1.7213 c 0.19842,0.1893 -0.10819,0.4194 -0.36505,0.4622 l -4.17981,0.697 c -0.25679,0.043 -0.39478,-0.2008 -0.59561,-0.3906 l -1.83789,-1.7372 c -0.20084,-0.1898 0.1398,-0.4992 0.39764,-0.5366 z"
-                 style="fill:url(#linearGradient27467);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6896-4" />
-              <path
-                 id="path6898-2"
-                 style="fill:url(#linearGradient27469);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 483.79892,1430.0354 3.67118,-0.504 c 0.25839,-0.036 0.40547,0.171 0.60385,0.3528 l 1.80467,1.654 c 0.19844,0.1819 -0.10847,0.4013 -0.36505,0.4441 l -3.67879,0.6134 c -0.2565,0.043 -0.39478,-0.193 -0.59561,-0.3753 l -1.83789,-1.6694 c -0.20084,-0.1823 0.13971,-0.4802 0.39764,-0.5156 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 489.09271,1429.2929 3.5803,-0.5261 c 0.25798,-0.038 0.40547,0.1653 0.60385,0.3409 l 1.80467,1.5984 c 0.19844,0.1758 -0.10847,0.3879 -0.36505,0.4292 l -3.67879,0.5928 c -0.2565,0.042 -0.39478,-0.1865 -0.59561,-0.3627 l -1.83789,-1.6133 c -0.20084,-0.1761 0.2311,-0.4213 0.48852,-0.4592 z"
-                 style="fill:url(#linearGradient27471);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6900-5" />
-              <path
-                 id="path6902-3"
-                 style="fill:url(#linearGradient27473);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 494.19377,1428.5433 3.20991,-0.4717 c 0.25793,-0.038 0.42396,0.1214 0.62227,0.2912 l 1.80473,1.5451 c 0.19845,0.1699 -0.10891,0.3722 -0.36504,0.4149 l -3.35786,0.5599 c -0.25623,0.043 -0.39548,-0.1795 -0.59562,-0.3506 l -1.8069,-1.5449 c -0.20009,-0.1711 0.23124,-0.4061 0.48851,-0.4439 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 498.9165,1427.8332 2.74646,-0.3973 c 0.25789,-0.037 0.42394,0.1174 0.62227,0.2816 l 1.80473,1.4939 c 0.19847,0.1643 -0.10913,0.3585 -0.36504,0.4012 l -2.89441,0.4826 c -0.25611,0.043 -0.39548,-0.1736 -0.59562,-0.339 l -1.8069,-1.4938 c -0.20009,-0.1654 0.23134,-0.392 0.48851,-0.4292 z"
-                 style="fill:url(#linearGradient27475);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6904-2" />
-              <path
-                 id="path6906-6"
-                 style="fill:url(#linearGradient27477);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 503.16635,1427.2047 2.74646,-0.3835 c 0.25789,-0.036 0.42394,0.1133 0.62227,0.2718 l 1.80473,1.4421 c 0.19847,0.1586 -0.10913,0.3461 -0.36504,0.3873 l -2.89441,0.4659 c -0.25611,0.042 -0.39548,-0.1676 -0.59562,-0.3273 l -1.8069,-1.442 c -0.20009,-0.1597 0.23134,-0.3784 0.48851,-0.4143 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 507.34415,1426.5781 2.48328,-0.359 c 0.25757,-0.037 0.42392,0.1096 0.62227,0.2629 l 1.80473,1.3947 c 0.19843,0.1533 -0.10958,0.3319 -0.36504,0.3745 l -2.63123,0.4387 c -0.25584,0.043 -0.39548,-0.1621 -0.59562,-0.3165 l -1.8069,-1.3946 c -0.20009,-0.1545 0.23168,-0.3636 0.48851,-0.4007 z"
-                 style="fill:url(#linearGradient27479);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6908-8" />
-              <path
-                 id="path6910-2"
-                 style="fill:url(#linearGradient27481);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 511.51931,1425.9526 1.99681,-0.2827 c 0.25755,-0.037 0.42389,0.1061 0.62227,0.2544 l 1.80473,1.3494 c 0.19847,0.1484 -0.10982,0.3196 -0.36504,0.3624 l -2.14476,0.3598 c -0.25564,0.043 -0.39548,-0.1568 -0.59562,-0.3062 l -1.8069,-1.3494 c -0.20009,-0.1495 0.23173,-0.3513 0.48851,-0.3877 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 515.04488,1425.4534 1.99681,-0.2702 c 0.25755,-0.035 0.42389,0.1014 0.62227,0.2431 l 1.80473,1.2895 c 0.19847,0.1418 -0.10982,0.3054 -0.36504,0.3463 l -2.14476,0.3438 c -0.25564,0.041 -0.39548,-0.1498 -0.59562,-0.2926 l -1.8069,-1.2895 c -0.20009,-0.1428 0.23173,-0.3357 0.48851,-0.3704 z"
-                 style="fill:url(#linearGradient27483);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6912-6" />
-              <path
-                 id="path6914-6"
-                 style="fill:url(#linearGradient27485);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 518.52859,1424.9356 1.76656,-0.2279 c 0.25765,-0.033 0.41505,0.1117 0.62227,0.2355 l 2.03498,1.2156 c 0.20723,0.1238 -0.10982,0.2959 -0.36504,0.3356 l -2.14476,0.3331 c -0.25564,0.04 -0.39548,-0.1452 -0.59562,-0.2835 l -1.8069,-1.2495 c -0.20009,-0.1384 0.23167,-0.3258 0.48851,-0.3589 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 450.58393,1431.1152 9.10708,-1.1496 c 0.25925,-0.033 0.42916,0.1753 0.59554,0.3916 l 1.42588,1.8534 c 0.16646,0.2164 -0.10732,0.4265 -0.36515,0.4637 l -9.40234,1.355 c -0.25759,0.037 -0.46337,-0.1516 -0.59552,-0.3917 l -1.10075,-1.9998 c -0.1322,-0.2402 0.0768,-0.49 0.33526,-0.5226 z"
-                 style="fill:url(#linearGradient27487);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6920-3" />
-              <path
-                 id="path6922-9"
-                 style="fill:url(#linearGradient27489);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 461.14009,1429.7827 5.07055,-0.6277 c 0.25912,-0.032 0.4291,0.1669 0.59554,0.373 l 1.42588,1.7652 c 0.16648,0.206 -0.10756,0.4044 -0.36515,0.4416 l -5.111,0.7365 c -0.2573,0.037 -0.43762,-0.1614 -0.59552,-0.3731 l -1.35556,-1.8178 c -0.15792,-0.2118 0.0769,-0.4657 0.33526,-0.4977 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 467.76368,1428.9131 4.67261,-0.5673 c 0.25312,-0.031 0.41909,0.1617 0.58168,0.3611 l 1.3927,1.7087 c 0.16255,0.1995 -0.10505,0.3916 -0.35666,0.4275 l -4.71211,0.6726 c -0.25134,0.036 -0.42744,-0.1562 -0.58167,-0.3612 l -1.32401,-1.7596 c -0.15424,-0.205 0.0751,-0.4512 0.32746,-0.4818 z"
-                 style="fill:url(#linearGradient27491);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6924-4" />
-              <path
-                 id="path6926-5"
-                 style="fill:url(#linearGradient27493);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 473.8017,1428.1844 4.13261,-0.4996 c 0.25888,-0.031 0.42252,0.1618 0.59554,0.3486 l 1.47529,1.5921 c 0.17295,0.1866 -0.1075,0.3784 -0.36515,0.4127 l -4.28877,0.5706 c -0.2574,0.034 -0.43729,-0.1511 -0.59552,-0.3487 l -1.28926,-1.6105 c -0.15825,-0.1977 0.077,-0.434 0.33526,-0.4652 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 479.37869,1427.4803 3.87442,-0.5106 c 0.25849,-0.034 0.41253,0.1699 0.59554,0.3448 l 1.60236,1.5308 c 0.18286,0.1746 -0.10794,0.371 -0.36515,0.4081 l -4.03058,0.5808 c -0.25698,0.037 -0.42586,-0.1592 -0.59552,-0.3448 l -1.41633,-1.5491 c -0.16973,-0.1856 0.0774,-0.426 0.33526,-0.46 z"
-                 style="fill:url(#linearGradient27495);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6928-6" />
-              <path
-                 id="path6930-2"
-                 style="fill:url(#linearGradient27497);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 484.58967,1426.8298 3.57896,-0.4467 c 0.25858,-0.032 0.40179,0.1753 0.59554,0.3304 l 1.79531,1.4368 c 0.19356,0.1549 -0.10792,0.3557 -0.36515,0.3911 l -3.73512,0.514 c -0.25693,0.035 -0.41319,-0.1656 -0.59552,-0.3304 l -1.60928,-1.4544 c -0.18242,-0.1649 0.0774,-0.4086 0.33526,-0.4408 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 489.53231,1426.1828 3.35692,-0.441 c 0.25821,-0.034 0.40175,0.1702 0.59554,0.3208 l 1.79531,1.3946 c 0.19358,0.1504 -0.10828,0.3427 -0.36515,0.3797 l -3.51308,0.5063 c -0.25652,0.037 -0.41319,-0.1607 -0.59552,-0.3207 l -1.60928,-1.4118 c -0.18242,-0.16 0.0777,-0.3941 0.33526,-0.4279 z"
-                 style="fill:url(#linearGradient27499);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6932-5" />
-              <path
-                 id="path6934-3"
-                 style="fill:url(#linearGradient27501);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 494.30488,1425.5933 2.97943,-0.3895 c 0.25799,-0.034 0.40174,0.1625 0.59554,0.3062 l 1.79531,1.3311 c 0.19361,0.1436 -0.10852,0.3254 -0.36515,0.3624 l -3.13559,0.4519 c -0.25625,0.037 -0.41319,-0.1534 -0.59552,-0.3061 l -1.60928,-1.3475 c -0.18242,-0.1528 0.0779,-0.3749 0.33526,-0.4085 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 498.68156,1425.0421 2.68932,-0.3501 c 0.25791,-0.034 0.40171,0.1562 0.59554,0.2944 l 1.79531,1.2798 c 0.1936,0.138 -0.10872,0.3114 -0.36515,0.3484 l -2.84548,0.4101 c -0.25612,0.037 -0.41319,-0.1475 -0.59552,-0.2943 l -1.60928,-1.2956 c -0.18242,-0.1469 0.0781,-0.3592 0.33526,-0.3927 z"
-                 style="fill:url(#linearGradient27503);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6936-5" />
-              <path
-                 id="path6938-6"
-                 style="fill:url(#linearGradient27505);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 502.81699,1424.5193 2.68932,-0.3371 c 0.25791,-0.033 0.40171,0.1504 0.59554,0.2835 l 1.79531,1.2325 c 0.1936,0.1329 -0.10872,0.2999 -0.36515,0.3355 l -2.84548,0.395 c -0.25612,0.036 -0.41319,-0.1421 -0.59552,-0.2834 l -1.60928,-1.2478 c -0.18242,-0.1414 0.0781,-0.3459 0.33526,-0.3782 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 506.81318,1424.0041 2.23999,-0.2893 c 0.25775,-0.033 0.40168,0.1457 0.59554,0.2745 l 1.79531,1.1933 c 0.19361,0.1287 -0.10906,0.288 -0.36515,0.3249 l -2.39615,0.3453 c -0.25586,0.037 -0.41319,-0.1376 -0.59552,-0.2744 l -1.60928,-1.2081 c -0.18242,-0.1369 0.0783,-0.333 0.33526,-0.3662 z"
-                 style="fill:url(#linearGradient27507);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6940-6" />
-              <path
-                 id="path6942-1"
-                 style="fill:url(#linearGradient27509);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 510.41945,1423.5572 2.23999,-0.278 c 0.25775,-0.032 0.40168,0.14 0.59554,0.2638 l 1.79531,1.1466 c 0.19361,0.1237 -0.10906,0.2767 -0.36515,0.3122 l -2.39615,0.3318 c -0.25586,0.036 -0.41319,-0.1322 -0.59552,-0.2637 l -1.60928,-1.1608 c -0.18242,-0.1316 0.0783,-0.32 0.33526,-0.3519 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 514.00115,1423.0964 2.70057,-0.3596 c 0.25733,-0.034 0.40169,0.1356 0.59554,0.2555 l 1.79531,1.1106 c 0.19362,0.1198 -0.1094,0.2655 -0.36515,0.3024 l -2.85673,0.4117 c -0.2556,0.037 -0.41319,-0.1281 -0.59552,-0.2554 l -1.60928,-1.1244 c -0.18242,-0.1275 0.0787,-0.3066 0.33526,-0.3408 z"
-                 style="fill:url(#linearGradient27511);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6944-4" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 448.90855,1428.1161 5.63036,-0.6248 c 0.25928,-0.029 0.44294,0.1441 0.59554,0.3466 l 1.3325,1.7687 c 0.15272,0.2027 -0.10729,0.3777 -0.36515,0.4105 l -5.93657,0.7538 c -0.25763,0.033 -0.47664,-0.1265 -0.59552,-0.3467 l -0.99642,-1.8456 c -0.11894,-0.2203 0.0768,-0.4338 0.33526,-0.4625 z"
-                 style="fill:url(#linearGradient27513);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6920-4-4" />
-              <path
-                 id="path6990-6"
-                 style="fill:url(#linearGradient27515);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 456.07139,1427.3009 5.11456,-0.5881 c 0.25908,-0.03 0.44295,0.1407 0.59554,0.3385 l 1.3325,1.7273 c 0.15269,0.1979 -0.10734,0.3684 -0.36515,0.4009 l -5.10827,0.6437 c -0.25757,0.033 -0.44735,-0.1425 -0.59552,-0.3386 l -1.30892,-1.7321 c -0.14819,-0.1961 0.077,-0.4219 0.33526,-0.4516 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 462.56281,1426.5463 4.61648,-0.5268 c 0.25902,-0.03 0.44291,0.1371 0.59554,0.33 l 1.3325,1.6838 c 0.15272,0.193 -0.10744,0.3584 -0.36515,0.3909 l -4.61019,0.581 c -0.25751,0.033 -0.44735,-0.1389 -0.59552,-0.3301 l -1.30892,-1.6886 c -0.14819,-0.1911 0.0771,-0.4107 0.33526,-0.4402 z"
-                 style="fill:url(#linearGradient27517);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6992-2" />
-              <path
-                 id="path6994-6"
-                 style="fill:url(#linearGradient27519);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 468.60056,1425.854 4.33762,-0.4931 c 0.25897,-0.029 0.44286,0.1332 0.59554,0.3208 l 1.3325,1.6368 c 0.15272,0.1876 -0.10754,0.3475 -0.36515,0.38 l -4.33133,0.5458 c -0.25745,0.032 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 474.32467,1425.2135 3.86408,-0.4391 c 0.25887,-0.029 0.43837,0.137 0.59554,0.3208 l 1.33459,1.5614 c 0.15718,0.1839 -0.10826,0.3422 -0.36515,0.38 l -3.85988,0.5672 c -0.25667,0.038 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z"
-                 style="fill:url(#linearGradient27521);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path6996-8" />
-              <path
-                 id="path6998-2"
-                 style="fill:url(#linearGradient27523);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 479.60347,1424.6159 3.70783,-0.4235 c 0.25881,-0.029 0.42624,0.1482 0.59554,0.3208 l 1.45362,1.4828 c 0.16936,0.1728 -0.10753,0.3476 -0.36515,0.38 l -3.88516,0.4896 c -0.25743,0.032 -0.44364,-0.138 -0.59552,-0.3209 l -1.24642,-1.5009 c -0.15184,-0.1828 0.0772,-0.3984 0.33526,-0.4279 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 484.88205,1424.0301 2.91038,-0.3245 c 0.25872,-0.029 0.41533,0.1566 0.59554,0.3134 l 1.60987,1.4015 c 0.18036,0.157 -0.10763,0.3387 -0.36515,0.3712 l -3.08771,0.3891 c -0.25725,0.032 -0.43066,-0.1467 -0.59552,-0.3135 l -1.40267,-1.4193 c -0.16473,-0.1666 0.0772,-0.3891 0.33526,-0.4179 z"
-                 style="fill:url(#linearGradient27525);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7000-5" />
-              <path
-                 id="path7002-5"
-                 style="fill:url(#linearGradient27527);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 489.26317,1423.5327 2.91038,-0.315 c 0.25872,-0.028 0.40668,0.1629 0.59554,0.3042 l 1.79737,1.345 c 0.18905,0.1415 -0.10763,0.3288 -0.36515,0.3604 l -3.08771,0.3777 c -0.25725,0.031 -0.42004,-0.154 -0.59552,-0.3043 l -1.59017,-1.3623 c -0.17535,-0.1502 0.0772,-0.3777 0.33526,-0.4057 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 493.62818,1423.0779 2.91038,-0.3006 c 0.25872,-0.027 0.40668,0.1555 0.59554,0.2903 l 1.79737,1.2832 c 0.18905,0.135 -0.10763,0.3137 -0.36515,0.3438 l -3.08771,0.3604 c -0.25725,0.03 -0.42004,-0.1469 -0.59552,-0.2903 l -1.59017,-1.2998 c -0.17535,-0.1433 0.0772,-0.3603 0.33526,-0.387 z"
-                 style="fill:url(#linearGradient27529);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7004-1" />
-              <path
-                 id="path7006-0"
-                 style="fill:url(#linearGradient27531);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 497.91616,1422.631 2.45855,-0.2751 c 0.25841,-0.029 0.4067,0.1481 0.59554,0.2766 l 1.79737,1.2225 c 0.18905,0.1286 -0.10808,0.2951 -0.36515,0.3275 l -2.63588,0.3321 c -0.25685,0.032 -0.42004,-0.14 -0.59552,-0.2766 l -1.59017,-1.2383 c -0.17535,-0.1365 0.0776,-0.3399 0.33526,-0.3687 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 501.78123,1422.2229 2.43762,-0.275 c 0.25829,-0.029 0.40672,0.142 0.59554,0.265 l 1.79737,1.1713 c 0.18905,0.1232 -0.10821,0.2815 -0.36515,0.3138 l -2.61495,0.3296 c -0.25674,0.032 -0.42004,-0.1341 -0.59552,-0.265 l -1.59017,-1.1865 c -0.17535,-0.1307 0.0777,-0.3241 0.33526,-0.3532 z"
-                 style="fill:url(#linearGradient27533);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7008-1" />
-              <path
-                 id="path7010-5"
-                 style="fill:url(#linearGradient27535);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 505.5518,1421.8696 2.11562,-0.238 c 0.25807,-0.029 0.40674,0.1323 0.59554,0.2471 l 1.79737,1.0922 c 0.18906,0.1148 -0.10848,0.2602 -0.36515,0.2926 l -2.29295,0.2889 c -0.25646,0.032 -0.42004,-0.125 -0.59552,-0.2471 l -1.59017,-1.1063 c -0.17535,-0.1219 0.0779,-0.3004 0.33526,-0.3294 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 509.17441,1421.5029 1.86761,-0.2095 c 0.25786,-0.029 0.4067,0.1254 0.59554,0.234 l 1.79737,1.0338 c 0.18904,0.1087 -0.10869,0.2447 -0.36515,0.277 l -2.04494,0.2577 c -0.25618,0.032 -0.42004,-0.1183 -0.59552,-0.2339 l -1.59017,-1.0472 c -0.17535,-0.1154 0.078,-0.283 0.33526,-0.3119 z"
-                 style="fill:url(#linearGradient27537);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7012-1" />
-              <path
-                 id="path7014-7"
-                 style="fill:url(#linearGradient27539);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 512.35472,1421.1789 1.40841,-0.1539 c 0.25784,-0.028 0.40673,0.1193 0.59554,0.2227 l 1.79737,0.984 c 0.189,0.1035 -0.10889,0.2313 -0.36515,0.2636 l -1.58574,0.1998 c -0.25602,0.032 -0.42004,-0.1126 -0.59552,-0.2226 l -1.59017,-0.9967 c -0.17535,-0.1098 0.0781,-0.2688 0.33526,-0.2969 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 450.26701,1477.3135 6.35126,0.077 0.97049,1.2438 -6.64425,-0.031 z"
-                 style="fill:url(#linearGradient27541);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 transform="matrix(0.99360958,-0.1128716,0,1,0,0)"
-                 id="rect7020-6" />
-              <path
-                 id="path7024-0"
-                 style="fill:url(#linearGradient27543);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 454.46572,1425.7741 5.72964,-0.5831 1.2141,1.0589 -5.89416,0.7012 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 461.19718,1425.0866 5.72964,-0.5831 1.29638,1.0032 -5.71936,0.6238 z"
-                 style="fill:url(#linearGradient27545);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7026-0" />
-              <path
-                 id="path7028-2"
-                 style="fill:url(#linearGradient27547);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 467.4812,1424.4577 5.01441,-0.5172 1.32369,0.9827 -4.96903,0.5151 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 473.2652,1423.8598 4.71239,-0.4766 1.22552,0.9605 -4.66701,0.4745 z"
-                 style="fill:url(#linearGradient27549);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7030-4" />
-              <path
-                 id="path7032-3"
-                 style="fill:url(#linearGradient18521);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 478.62568,1423.325 4.22215,-0.3799 1.0076,0.8765 -4.07063,0.4241 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 483.31976,1422.8503 4.10186,-0.4272 1.00482,0.8801 -4.10634,0.4479 z"
-                 style="fill:url(#linearGradient18523);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7034-3" />
-              <path
-                 id="path7036-6"
-                 style="fill:url(#linearGradient18525);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 488.02944,1422.373 3.94836,-0.4001 1.08523,0.8246 -4.10634,0.4479 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 492.53573,1421.9164 4.0649,-0.4119 1.08523,0.8014 -4.10634,0.4353 z"
-                 style="fill:url(#linearGradient18527);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7038-2" />
-              <path
-                 id="path7040-8"
-                 style="fill:url(#linearGradient18529);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 497.12539,1421.4513 4.14103,-0.4196 1.08523,0.778 -4.10634,0.4226 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 501.78284,1420.9794 4.08424,-0.4139 0.96099,0.7307 -3.9821,0.4343 z"
-                 style="fill:url(#linearGradient18531);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7042-2" />
-              <path
-                 id="path7044-3"
-                 style="fill:url(#linearGradient18533);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 506.50535,1420.4878 4.08424,-0.4009 0.96099,0.7078 -3.9821,0.4207 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
+          <g transform="matrix(1.2776262,0,0,1.2776262,-1352.169,-1602.1477)" id="g4693-9">
+            <path sodipodi:nodetypes="ccccscccccc" style="opacity:0.8699552;fill:#5e6b6a;fill-opacity:1;stroke:none;filter:url(#filter7271-4)" d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.10844,0.2803 0.10113,0.6035 -0.0199,0.8786 -0.10048,0.2284 -0.27746,0.4224 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 -12.37498,-23.875" id="path7269-3" inkscape:path-effect="#path-effect6808-1" inkscape:original-d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.0752,0.4655 0.0673,0.7 -0.0199,0.8786 -0.0872,0.1786 -0.2537,0.3014 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 z" inkscape:connector-curvature="0" transform="matrix(0.85239486,0,0,0.85239486,57.386448,214.74243)"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m 436.48906,1430.4597 57.53666,-5.5406 17.68719,9.8026 1.7181,0.3862 c 0.0641,0.3968 0.0574,0.5967 -0.017,0.7489 -0.0743,0.1522 -0.21625,0.2569 -0.42257,0.4631 l -63.29031,15.13 -1.17205,0.1066 -1.06549,-0.1066 -0.4262,-0.6393 z" inkscape:path-effect="#path-effect3858-4" id="path6806-0" d="m 436.48906,1430.4597 57.53666,-5.5406 17.68719,9.8026 1.7181,0.3862 c 0.0924,0.239 0.0862,0.5144 -0.017,0.7489 -0.0856,0.1947 -0.23651,0.36 -0.42257,0.4631 l -63.29031,15.13 -1.17205,0.1066 -1.06549,-0.1066 -0.4262,-0.6393 -10.54833,-20.3509" style="fill:#a5b0af;fill-opacity:1;stroke:none" sodipodi:nodetypes="ccccscccccc"/>
+            <path style="fill:url(#linearGradient27417);fill-opacity:1;stroke:none" d="m 436.48906,1429.5007 57.53666,-5.5405 c 6.06778,2.9433 11.97516,6.2173 17.68719,9.8025 0.50543,0.3172 1.00932,0.6369 1.51167,0.959 0.073,0.03 0.13466,0.086 0.17063,0.156 0.036,0.07 0.0459,0.1531 0.0274,0.2296 -0.0166,0.069 -0.0559,0.132 -0.11029,0.1773 -0.0544,0.045 -0.12362,0.072 -0.19431,0.076 l -63.41685,15.13 -1.17204,0.1065 -1.06549,-0.1065 -0.4262,-0.6393 -10.54839,-20.351" id="path6794-0" inkscape:path-effect="#path-effect6796-0" inkscape:original-d="m 436.48906,1429.5007 57.53666,-5.5405 17.68719,9.8025 1.51167,0.959 c 0.20338,0.1091 0.30253,0.2833 0.19805,0.3856 -0.10449,0.1023 -0.23283,0.2292 -0.3046,0.2537 l -63.41685,15.13 -1.17204,0.1065 -1.06549,-0.1065 -0.4262,-0.6393 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccscccccc"/>
+            <path id="rect6798-8" style="fill:#717c7d;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m 436.48906,1429.5041 1.61908,3.1178 -0.23717,2.4694 -1.61384,-2.8106 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path style="fill:#5d686c;fill-opacity:1;stroke:none" d="m 437.86849,1435.086 1.42732,-0.1778 -1.18854,-2.2825 -0.23878,2.4603" id="path6802-7" inkscape:path-effect="#path-effect6804-6" inkscape:original-d="m 437.86849,1435.086 1.42732,-0.1778 -1.18854,-2.2825 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+            <g id="g7046-6" style="fill:url(#linearGradient27551);fill-opacity:1" transform="matrix(0.85239486,0,0,0.85239486,57.386448,214.74243)">
+              <path sodipodi:nodetypes="cssssssssc" inkscape:connector-curvature="0" d="m 47.697778,1511.0581 6.087718,0.2141 c 0.349743,0.012 0.522843,0.3039 0.632435,0.6325 l 1.203138,3.6075 c 0.109592,0.3286 -0.2994,0.553 -0.649558,0.5485 l -6.40556,-0.082 c -0.350353,0 -0.552167,-0.2944 -0.632435,-0.6324 l -0.868173,-3.6557 c -0.08027,-0.338 0.282107,-0.6335 0.632435,-0.6325 z" style="fill:url(#linearGradient27419);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.97211389,-0.23450924,0.27190603,0.96232381,0,0)" id="rect6814-35"/>
+              <path inkscape:transform-center-y="0.95777293" inkscape:transform-center-x="0.50002642" id="path6822-6" style="fill:url(#linearGradient27421);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 465.21397,1441.2337 5.97648,-1.17 c 0.34326,-0.067 0.59092,0.1627 0.78681,0.4409 l 2.1506,3.0546 c 0.19589,0.2783 -0.10119,0.6506 -0.44287,0.7249 l -5.82422,1.267 c -0.34184,0.075 -0.58591,-0.1659 -0.78679,-0.4408 l -2.3029,-3.1518 c -0.20088,-0.275 0.10199,-0.6472 0.44285,-0.725 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cssssssssc"/>
+              <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 472.86949,1439.7116 4.96651,-1.0132 c 0.30643,-0.062 0.49497,0.1853 0.70013,0.4425 l 2.25743,2.8304 c 0.20521,0.2573 -0.0888,0.6579 -0.39408,0.7275 l -5.01763,1.1439 c -0.3055,0.069 -0.50641,-0.1768 -0.70011,-0.4424 l -2.21416,-3.0355 c -0.10992,-0.1507 -0.0581,-0.2652 0.0559,-0.4146 0.087,-0.114 0.34415,-0.246 0.34595,-0.2388 z" style="fill:url(#linearGradient27423);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6828-5" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.9612254"/>
+              <path inkscape:transform-center-y="0.93458356" inkscape:transform-center-x="0.44493633" id="path6830-8" style="fill:url(#linearGradient27425);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 479.44154,1438.3333 6.18042,-1.2097 c 0.30632,-0.06 0.69706,0.086 0.92161,0.3193 l 2.56679,2.6635 c 0.22455,0.233 -0.0892,0.638 -0.39408,0.7073 l -6.76238,1.5361 c -0.30499,0.069 -0.50641,-0.1719 -0.70011,-0.4301 l -2.21416,-2.9513 c -0.10992,-0.1465 -0.0581,-0.2579 0.0559,-0.4031 0.087,-0.1109 0.34415,-0.2392 0.34595,-0.2322 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+              <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 487.69681,1436.6835 22.45389,-4.6258 c 0.30535,-0.063 0.67279,0.1096 0.92161,0.3096 l 2.70741,2.1765 c 0.24824,0.1995 -0.0895,0.6168 -0.39408,0.6858 l -22.60384,5.1149 c -0.30455,0.069 -0.6324,0.01 -0.84854,-0.2218 l -2.63836,-2.8234 c -0.12261,-0.1312 -0.0581,-0.2501 0.0559,-0.3909 0.087,-0.1075 0.34393,-0.2318 0.34595,-0.2251 z" style="fill:url(#linearGradient27427);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6832-3" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.90626211"/>
+              <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 512.01768,1431.6827 3.27189,-0.679 c 0.25053,-0.052 0.54511,0.1046 0.75544,0.2617 l 2.90858,2.1734 c 0.21252,0.1588 -0.0731,0.523 -0.32303,0.5798 l -3.397,0.7716 c -0.25009,0.057 -0.36195,-0.1942 -0.57387,-0.3526 l -2.89964,-2.168 c -0.12014,-0.09 -0.1139,-0.2887 -0.0205,-0.4078 0.0713,-0.091 0.27612,-0.1848 0.27806,-0.1793 z" style="fill:url(#linearGradient27429);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6834-9" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.76615965"/>
+              <path inkscape:transform-center-y="0.74552444" inkscape:transform-center-x="0.36471052" id="path6836-4" style="fill:url(#linearGradient27431);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 516.87631,1430.6627 2.69737,-0.5392 c 0.2507,-0.05 0.54512,0.1018 0.75544,0.2547 l 2.90858,2.1148 c 0.21251,0.1545 -0.0732,0.5085 -0.32303,0.5642 l -2.82248,0.6293 c -0.25014,0.056 -0.36195,-0.189 -0.57387,-0.3431 l -2.89964,-2.1096 c -0.12014,-0.088 -0.1139,-0.2809 -0.0205,-0.3968 0.0713,-0.089 0.27612,-0.1798 0.27806,-0.1745 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+              <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 520.94699,1429.8131 2.69737,-0.5258 c 0.2507,-0.049 0.54512,0.099 0.75544,0.2484 l 2.90858,2.0623 c 0.21251,0.1507 -0.0732,0.4959 -0.32303,0.5502 l -2.82248,0.6137 c -0.25014,0.055 -0.36195,-0.1843 -0.57387,-0.3346 l -2.89964,-2.0573 c -0.12014,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27612,-0.1754 0.27806,-0.1702 z" style="fill:url(#linearGradient27433);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6838-8" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.72705418"/>
+              <path inkscape:transform-center-y="0.72705418" inkscape:transform-center-x="0.36471052" id="path6840-3" style="fill:url(#linearGradient27435);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 525.09132,1428.99 1.81349,-0.3726 c 0.25019,-0.051 0.53014,0.1227 0.75544,0.2484 l 3.34419,1.8652 c 0.22753,0.1269 -0.0737,0.4935 -0.32303,0.5502 l -2.53192,0.5751 c -0.24975,0.057 -0.36305,-0.1828 -0.57387,-0.3346 l -2.74193,-1.9748 c -0.11989,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27622,-0.1754 0.27806,-0.1702 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 454.69085,1438.2936 14.72061,-2.4946 c 0.34338,-0.058 0.58523,0.1452 0.78678,0.3809 l 2.02413,2.3671 c 0.2016,0.2358 -0.14123,0.4959 -0.48231,0.5629 l -15.16831,2.9835 c -0.34077,0.067 -0.63951,-0.1135 -0.78675,-0.381 l -1.53697,-2.7924 c -0.1472,-0.2675 0.10031,-0.5684 0.44282,-0.6264 z" style="fill:url(#linearGradient27437);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect6814-3-9"/>
+              <path id="path6864-7" style="fill:url(#linearGradient27439);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.24017,1435.5075 4.73892,-0.8214 c 0.34247,-0.059 0.58137,0.1383 0.78678,0.353 l 2.13814,2.235 c 0.20554,0.2149 -0.14214,0.4547 -0.48231,0.5216 l -4.87836,0.9596 c -0.33985,0.067 -0.60051,-0.133 -0.78675,-0.353 l -1.95924,-2.3144 c -0.1863,-0.2201 0.10119,-0.5212 0.44282,-0.5804 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 477.72189,1434.3908 4.25555,-0.7477 c 0.34178,-0.06 0.58135,0.1322 0.78678,0.3375 l 2.13814,2.1367 c 0.20553,0.2054 -0.1427,0.4318 -0.48231,0.4986 l -4.30471,0.8467 c -0.33932,0.067 -0.59426,-0.1328 -0.78675,-0.3375 l -2.04952,-2.1795 c -0.19251,-0.2048 0.10176,-0.4949 0.44282,-0.5548 z" style="fill:url(#linearGradient27441);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6866-6"/>
+              <path id="path6868-4" style="fill:url(#linearGradient27443);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 483.80361,1433.3299 3.93266,-0.6732 c 0.33258,-0.057 0.56567,0.1263 0.76558,0.3224 l 2.08052,2.0409 c 0.2,0.1961 -0.13885,0.4124 -0.46932,0.4762 l -3.9805,0.7678 c -0.33023,0.064 -0.57824,-0.1269 -0.76554,-0.3224 l -1.99429,-2.0818 c -0.18732,-0.1956 0.0989,-0.4731 0.43089,-0.5299 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 489.56243,1432.3586 3.49706,-0.6074 c 0.33196,-0.058 0.56568,0.12 0.76558,0.3063 l 2.08052,1.9391 c 0.19999,0.1864 -0.13966,0.3877 -0.46932,0.4525 l -3.5449,0.6973 c -0.3295,0.065 -0.57824,-0.1206 -0.76554,-0.3063 l -1.99429,-1.978 c -0.18732,-0.1858 0.0995,-0.4459 0.43089,-0.5035 z" style="fill:url(#linearGradient27445);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6870-5"/>
+              <path id="path6872-8" style="fill:url(#linearGradient27447);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 494.85266,1431.4662 3.05202,-0.5246 c 0.33162,-0.057 0.56568,0.1136 0.76558,0.29 l 2.08052,1.836 c 0.19999,0.1765 -0.1403,0.3638 -0.46932,0.4285 l -3.09986,0.6097 c -0.32898,0.065 -0.57824,-0.1142 -0.76554,-0.29 l -1.99429,-1.8728 c -0.18732,-0.176 0.0999,-0.4199 0.43089,-0.4768 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 499.48759,1430.684 3.05202,-0.4988 c 0.33162,-0.054 0.56568,0.108 0.76558,0.2757 l 2.08052,1.746 c 0.19999,0.1679 -0.1403,0.346 -0.46932,0.4075 l -3.09986,0.5798 c -0.32898,0.062 -0.57824,-0.1086 -0.76554,-0.2758 l -1.99429,-1.7809 c -0.18732,-0.1674 0.0999,-0.3993 0.43089,-0.4535 z" style="fill:url(#linearGradient27449);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6874-6"/>
+              <path id="path6876-1" style="fill:url(#linearGradient27451);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 504.17762,1429.868 2.70166,-0.4632 c 0.33085,-0.057 0.5657,0.1034 0.76558,0.264 l 2.08052,1.6719 c 0.20004,0.1607 -0.14135,0.3257 -0.46932,0.3902 l -2.7495,0.5408 c -0.32795,0.064 -0.57824,-0.104 -0.76554,-0.2641 l -1.99429,-1.7053 c -0.18732,-0.1603 0.10067,-0.3777 0.43089,-0.4343 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 508.45089,1429.1633 2.70166,-0.4371 c 0.33085,-0.054 0.5657,0.098 0.76558,0.2491 l 2.08052,1.5775 c 0.20004,0.1516 -0.14135,0.3073 -0.46932,0.3681 l -2.7495,0.5103 c -0.32795,0.06 -0.57824,-0.098 -0.76554,-0.2492 l -1.99429,-1.609 c -0.18732,-0.1512 0.10067,-0.3563 0.43089,-0.4097 z" style="fill:url(#linearGradient27453);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6878-5"/>
+              <path id="path6880-5" style="fill:url(#linearGradient27455);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 512.60906,1428.4424 2.70166,-0.4184 c 0.33085,-0.052 0.5657,0.094 0.76558,0.2384 l 2.08052,1.5101 c 0.20004,0.1451 -0.14135,0.2941 -0.46932,0.3523 l -2.7495,0.4885 c -0.32795,0.057 -0.57824,-0.094 -0.76554,-0.2385 l -1.99429,-1.5403 c -0.18732,-0.1447 0.10067,-0.341 0.43089,-0.3921 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 516.77633,1427.7726 2.62492,-0.4448 c 0.3299,-0.056 0.5657,0.09 0.76558,0.2284 l 2.08052,1.4469 c 0.20004,0.139 -0.14135,0.2818 -0.46932,0.3376 l -2.7495,0.468 c -0.32795,0.055 -0.57889,-0.089 -0.76554,-0.2285 l -1.91755,-1.4319 c -0.18676,-0.1394 0.10174,-0.3199 0.43089,-0.3757 z" style="fill:url(#linearGradient27457);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6882-1"/>
+              <path id="path6884-9" style="fill:url(#linearGradient27459);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 521.03501,1427.051 2.42068,-0.3892 c 0.32986,-0.053 0.55745,0.099 0.76558,0.2176 l 2.32063,1.317 c 0.20863,0.1184 -0.14135,0.2685 -0.46932,0.3217 l -2.7495,0.4459 c -0.32795,0.052 -0.57643,-0.088 -0.76554,-0.2177 l -1.95342,-1.3373 c -0.18911,-0.1295 0.1017,-0.3051 0.43089,-0.358 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path id="path6890-6" style="fill:url(#linearGradient27461);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 452.57798,1434.6551 11.12923,-1.6317 c 0.259,-0.038 0.41871,0.208 0.59558,0.4431 l 1.50759,2.0044 c 0.17693,0.2352 -0.1074,0.4817 -0.36511,0.5247 l -11.38645,1.8987 c -0.25749,0.043 -0.44999,-0.1804 -0.59556,-0.4433 l -1.22049,-2.2045 c -0.14557,-0.2629 0.0768,-0.5535 0.33521,-0.5914 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 465.14481,1432.8122 4.899,-0.7203 c 0.25873,-0.038 0.40063,0.2129 0.59558,0.4201 l 1.77321,1.8851 c 0.19503,0.2073 -0.10774,0.4547 -0.36511,0.4976 l -5.17296,0.8626 c -0.2572,0.043 -0.42263,-0.1893 -0.59556,-0.4204 l -1.46937,-1.9639 c -0.17299,-0.2312 0.0771,-0.5229 0.33521,-0.5608 z" style="fill:url(#linearGradient27463);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6892-4"/>
+              <path id="path6894-5" style="fill:url(#linearGradient27465);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.62681,1431.8596 4.86438,-0.7161 c 0.25852,-0.038 0.39723,0.2086 0.59563,0.405 l 1.80467,1.7862 c 0.19848,0.1964 -0.10793,0.4368 -0.36505,0.4797 l -5.0158,0.8364 c -0.25706,0.043 -0.40931,-0.1935 -0.59561,-0.4053 l -1.62336,-1.8453 c -0.18633,-0.2118 0.0772,-0.5026 0.33514,-0.5406 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 478.00171,1430.898 4.18042,-0.6063 c 0.25845,-0.037 0.39724,0.201 0.59563,0.3902 l 1.80467,1.7213 c 0.19842,0.1893 -0.10819,0.4194 -0.36505,0.4622 l -4.17981,0.697 c -0.25679,0.043 -0.39478,-0.2008 -0.59561,-0.3906 l -1.83789,-1.7372 c -0.20084,-0.1898 0.1398,-0.4992 0.39764,-0.5366 z" style="fill:url(#linearGradient27467);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6896-4"/>
+              <path id="path6898-2" style="fill:url(#linearGradient27469);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 483.79892,1430.0354 3.67118,-0.504 c 0.25839,-0.036 0.40547,0.171 0.60385,0.3528 l 1.80467,1.654 c 0.19844,0.1819 -0.10847,0.4013 -0.36505,0.4441 l -3.67879,0.6134 c -0.2565,0.043 -0.39478,-0.193 -0.59561,-0.3753 l -1.83789,-1.6694 c -0.20084,-0.1823 0.13971,-0.4802 0.39764,-0.5156 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 489.09271,1429.2929 3.5803,-0.5261 c 0.25798,-0.038 0.40547,0.1653 0.60385,0.3409 l 1.80467,1.5984 c 0.19844,0.1758 -0.10847,0.3879 -0.36505,0.4292 l -3.67879,0.5928 c -0.2565,0.042 -0.39478,-0.1865 -0.59561,-0.3627 l -1.83789,-1.6133 c -0.20084,-0.1761 0.2311,-0.4213 0.48852,-0.4592 z" style="fill:url(#linearGradient27471);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6900-5"/>
+              <path id="path6902-3" style="fill:url(#linearGradient27473);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 494.19377,1428.5433 3.20991,-0.4717 c 0.25793,-0.038 0.42396,0.1214 0.62227,0.2912 l 1.80473,1.5451 c 0.19845,0.1699 -0.10891,0.3722 -0.36504,0.4149 l -3.35786,0.5599 c -0.25623,0.043 -0.39548,-0.1795 -0.59562,-0.3506 l -1.8069,-1.5449 c -0.20009,-0.1711 0.23124,-0.4061 0.48851,-0.4439 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 498.9165,1427.8332 2.74646,-0.3973 c 0.25789,-0.037 0.42394,0.1174 0.62227,0.2816 l 1.80473,1.4939 c 0.19847,0.1643 -0.10913,0.3585 -0.36504,0.4012 l -2.89441,0.4826 c -0.25611,0.043 -0.39548,-0.1736 -0.59562,-0.339 l -1.8069,-1.4938 c -0.20009,-0.1654 0.23134,-0.392 0.48851,-0.4292 z" style="fill:url(#linearGradient27475);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6904-2"/>
+              <path id="path6906-6" style="fill:url(#linearGradient27477);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 503.16635,1427.2047 2.74646,-0.3835 c 0.25789,-0.036 0.42394,0.1133 0.62227,0.2718 l 1.80473,1.4421 c 0.19847,0.1586 -0.10913,0.3461 -0.36504,0.3873 l -2.89441,0.4659 c -0.25611,0.042 -0.39548,-0.1676 -0.59562,-0.3273 l -1.8069,-1.442 c -0.20009,-0.1597 0.23134,-0.3784 0.48851,-0.4143 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 507.34415,1426.5781 2.48328,-0.359 c 0.25757,-0.037 0.42392,0.1096 0.62227,0.2629 l 1.80473,1.3947 c 0.19843,0.1533 -0.10958,0.3319 -0.36504,0.3745 l -2.63123,0.4387 c -0.25584,0.043 -0.39548,-0.1621 -0.59562,-0.3165 l -1.8069,-1.3946 c -0.20009,-0.1545 0.23168,-0.3636 0.48851,-0.4007 z" style="fill:url(#linearGradient27479);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6908-8"/>
+              <path id="path6910-2" style="fill:url(#linearGradient27481);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 511.51931,1425.9526 1.99681,-0.2827 c 0.25755,-0.037 0.42389,0.1061 0.62227,0.2544 l 1.80473,1.3494 c 0.19847,0.1484 -0.10982,0.3196 -0.36504,0.3624 l -2.14476,0.3598 c -0.25564,0.043 -0.39548,-0.1568 -0.59562,-0.3062 l -1.8069,-1.3494 c -0.20009,-0.1495 0.23173,-0.3513 0.48851,-0.3877 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 515.04488,1425.4534 1.99681,-0.2702 c 0.25755,-0.035 0.42389,0.1014 0.62227,0.2431 l 1.80473,1.2895 c 0.19847,0.1418 -0.10982,0.3054 -0.36504,0.3463 l -2.14476,0.3438 c -0.25564,0.041 -0.39548,-0.1498 -0.59562,-0.2926 l -1.8069,-1.2895 c -0.20009,-0.1428 0.23173,-0.3357 0.48851,-0.3704 z" style="fill:url(#linearGradient27483);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6912-6"/>
+              <path id="path6914-6" style="fill:url(#linearGradient27485);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 518.52859,1424.9356 1.76656,-0.2279 c 0.25765,-0.033 0.41505,0.1117 0.62227,0.2355 l 2.03498,1.2156 c 0.20723,0.1238 -0.10982,0.2959 -0.36504,0.3356 l -2.14476,0.3331 c -0.25564,0.04 -0.39548,-0.1452 -0.59562,-0.2835 l -1.8069,-1.2495 c -0.20009,-0.1384 0.23167,-0.3258 0.48851,-0.3589 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 450.58393,1431.1152 9.10708,-1.1496 c 0.25925,-0.033 0.42916,0.1753 0.59554,0.3916 l 1.42588,1.8534 c 0.16646,0.2164 -0.10732,0.4265 -0.36515,0.4637 l -9.40234,1.355 c -0.25759,0.037 -0.46337,-0.1516 -0.59552,-0.3917 l -1.10075,-1.9998 c -0.1322,-0.2402 0.0768,-0.49 0.33526,-0.5226 z" style="fill:url(#linearGradient27487);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6920-3"/>
+              <path id="path6922-9" style="fill:url(#linearGradient27489);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 461.14009,1429.7827 5.07055,-0.6277 c 0.25912,-0.032 0.4291,0.1669 0.59554,0.373 l 1.42588,1.7652 c 0.16648,0.206 -0.10756,0.4044 -0.36515,0.4416 l -5.111,0.7365 c -0.2573,0.037 -0.43762,-0.1614 -0.59552,-0.3731 l -1.35556,-1.8178 c -0.15792,-0.2118 0.0769,-0.4657 0.33526,-0.4977 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 467.76368,1428.9131 4.67261,-0.5673 c 0.25312,-0.031 0.41909,0.1617 0.58168,0.3611 l 1.3927,1.7087 c 0.16255,0.1995 -0.10505,0.3916 -0.35666,0.4275 l -4.71211,0.6726 c -0.25134,0.036 -0.42744,-0.1562 -0.58167,-0.3612 l -1.32401,-1.7596 c -0.15424,-0.205 0.0751,-0.4512 0.32746,-0.4818 z" style="fill:url(#linearGradient27491);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6924-4"/>
+              <path id="path6926-5" style="fill:url(#linearGradient27493);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 473.8017,1428.1844 4.13261,-0.4996 c 0.25888,-0.031 0.42252,0.1618 0.59554,0.3486 l 1.47529,1.5921 c 0.17295,0.1866 -0.1075,0.3784 -0.36515,0.4127 l -4.28877,0.5706 c -0.2574,0.034 -0.43729,-0.1511 -0.59552,-0.3487 l -1.28926,-1.6105 c -0.15825,-0.1977 0.077,-0.434 0.33526,-0.4652 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 479.37869,1427.4803 3.87442,-0.5106 c 0.25849,-0.034 0.41253,0.1699 0.59554,0.3448 l 1.60236,1.5308 c 0.18286,0.1746 -0.10794,0.371 -0.36515,0.4081 l -4.03058,0.5808 c -0.25698,0.037 -0.42586,-0.1592 -0.59552,-0.3448 l -1.41633,-1.5491 c -0.16973,-0.1856 0.0774,-0.426 0.33526,-0.46 z" style="fill:url(#linearGradient27495);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6928-6"/>
+              <path id="path6930-2" style="fill:url(#linearGradient27497);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 484.58967,1426.8298 3.57896,-0.4467 c 0.25858,-0.032 0.40179,0.1753 0.59554,0.3304 l 1.79531,1.4368 c 0.19356,0.1549 -0.10792,0.3557 -0.36515,0.3911 l -3.73512,0.514 c -0.25693,0.035 -0.41319,-0.1656 -0.59552,-0.3304 l -1.60928,-1.4544 c -0.18242,-0.1649 0.0774,-0.4086 0.33526,-0.4408 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 489.53231,1426.1828 3.35692,-0.441 c 0.25821,-0.034 0.40175,0.1702 0.59554,0.3208 l 1.79531,1.3946 c 0.19358,0.1504 -0.10828,0.3427 -0.36515,0.3797 l -3.51308,0.5063 c -0.25652,0.037 -0.41319,-0.1607 -0.59552,-0.3207 l -1.60928,-1.4118 c -0.18242,-0.16 0.0777,-0.3941 0.33526,-0.4279 z" style="fill:url(#linearGradient27499);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6932-5"/>
+              <path id="path6934-3" style="fill:url(#linearGradient27501);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 494.30488,1425.5933 2.97943,-0.3895 c 0.25799,-0.034 0.40174,0.1625 0.59554,0.3062 l 1.79531,1.3311 c 0.19361,0.1436 -0.10852,0.3254 -0.36515,0.3624 l -3.13559,0.4519 c -0.25625,0.037 -0.41319,-0.1534 -0.59552,-0.3061 l -1.60928,-1.3475 c -0.18242,-0.1528 0.0779,-0.3749 0.33526,-0.4085 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 498.68156,1425.0421 2.68932,-0.3501 c 0.25791,-0.034 0.40171,0.1562 0.59554,0.2944 l 1.79531,1.2798 c 0.1936,0.138 -0.10872,0.3114 -0.36515,0.3484 l -2.84548,0.4101 c -0.25612,0.037 -0.41319,-0.1475 -0.59552,-0.2943 l -1.60928,-1.2956 c -0.18242,-0.1469 0.0781,-0.3592 0.33526,-0.3927 z" style="fill:url(#linearGradient27503);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6936-5"/>
+              <path id="path6938-6" style="fill:url(#linearGradient27505);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 502.81699,1424.5193 2.68932,-0.3371 c 0.25791,-0.033 0.40171,0.1504 0.59554,0.2835 l 1.79531,1.2325 c 0.1936,0.1329 -0.10872,0.2999 -0.36515,0.3355 l -2.84548,0.395 c -0.25612,0.036 -0.41319,-0.1421 -0.59552,-0.2834 l -1.60928,-1.2478 c -0.18242,-0.1414 0.0781,-0.3459 0.33526,-0.3782 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 506.81318,1424.0041 2.23999,-0.2893 c 0.25775,-0.033 0.40168,0.1457 0.59554,0.2745 l 1.79531,1.1933 c 0.19361,0.1287 -0.10906,0.288 -0.36515,0.3249 l -2.39615,0.3453 c -0.25586,0.037 -0.41319,-0.1376 -0.59552,-0.2744 l -1.60928,-1.2081 c -0.18242,-0.1369 0.0783,-0.333 0.33526,-0.3662 z" style="fill:url(#linearGradient27507);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6940-6"/>
+              <path id="path6942-1" style="fill:url(#linearGradient27509);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 510.41945,1423.5572 2.23999,-0.278 c 0.25775,-0.032 0.40168,0.14 0.59554,0.2638 l 1.79531,1.1466 c 0.19361,0.1237 -0.10906,0.2767 -0.36515,0.3122 l -2.39615,0.3318 c -0.25586,0.036 -0.41319,-0.1322 -0.59552,-0.2637 l -1.60928,-1.1608 c -0.18242,-0.1316 0.0783,-0.32 0.33526,-0.3519 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 514.00115,1423.0964 2.70057,-0.3596 c 0.25733,-0.034 0.40169,0.1356 0.59554,0.2555 l 1.79531,1.1106 c 0.19362,0.1198 -0.1094,0.2655 -0.36515,0.3024 l -2.85673,0.4117 c -0.2556,0.037 -0.41319,-0.1281 -0.59552,-0.2554 l -1.60928,-1.1244 c -0.18242,-0.1275 0.0787,-0.3066 0.33526,-0.3408 z" style="fill:url(#linearGradient27511);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6944-4"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 448.90855,1428.1161 5.63036,-0.6248 c 0.25928,-0.029 0.44294,0.1441 0.59554,0.3466 l 1.3325,1.7687 c 0.15272,0.2027 -0.10729,0.3777 -0.36515,0.4105 l -5.93657,0.7538 c -0.25763,0.033 -0.47664,-0.1265 -0.59552,-0.3467 l -0.99642,-1.8456 c -0.11894,-0.2203 0.0768,-0.4338 0.33526,-0.4625 z" style="fill:url(#linearGradient27513);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6920-4-4"/>
+              <path id="path6990-6" style="fill:url(#linearGradient27515);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 456.07139,1427.3009 5.11456,-0.5881 c 0.25908,-0.03 0.44295,0.1407 0.59554,0.3385 l 1.3325,1.7273 c 0.15269,0.1979 -0.10734,0.3684 -0.36515,0.4009 l -5.10827,0.6437 c -0.25757,0.033 -0.44735,-0.1425 -0.59552,-0.3386 l -1.30892,-1.7321 c -0.14819,-0.1961 0.077,-0.4219 0.33526,-0.4516 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 462.56281,1426.5463 4.61648,-0.5268 c 0.25902,-0.03 0.44291,0.1371 0.59554,0.33 l 1.3325,1.6838 c 0.15272,0.193 -0.10744,0.3584 -0.36515,0.3909 l -4.61019,0.581 c -0.25751,0.033 -0.44735,-0.1389 -0.59552,-0.3301 l -1.30892,-1.6886 c -0.14819,-0.1911 0.0771,-0.4107 0.33526,-0.4402 z" style="fill:url(#linearGradient27517);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6992-2"/>
+              <path id="path6994-6" style="fill:url(#linearGradient27519);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 468.60056,1425.854 4.33762,-0.4931 c 0.25897,-0.029 0.44286,0.1332 0.59554,0.3208 l 1.3325,1.6368 c 0.15272,0.1876 -0.10754,0.3475 -0.36515,0.38 l -4.33133,0.5458 c -0.25745,0.032 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 474.32467,1425.2135 3.86408,-0.4391 c 0.25887,-0.029 0.43837,0.137 0.59554,0.3208 l 1.33459,1.5614 c 0.15718,0.1839 -0.10826,0.3422 -0.36515,0.38 l -3.85988,0.5672 c -0.25667,0.038 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z" style="fill:url(#linearGradient27521);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6996-8"/>
+              <path id="path6998-2" style="fill:url(#linearGradient27523);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 479.60347,1424.6159 3.70783,-0.4235 c 0.25881,-0.029 0.42624,0.1482 0.59554,0.3208 l 1.45362,1.4828 c 0.16936,0.1728 -0.10753,0.3476 -0.36515,0.38 l -3.88516,0.4896 c -0.25743,0.032 -0.44364,-0.138 -0.59552,-0.3209 l -1.24642,-1.5009 c -0.15184,-0.1828 0.0772,-0.3984 0.33526,-0.4279 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 484.88205,1424.0301 2.91038,-0.3245 c 0.25872,-0.029 0.41533,0.1566 0.59554,0.3134 l 1.60987,1.4015 c 0.18036,0.157 -0.10763,0.3387 -0.36515,0.3712 l -3.08771,0.3891 c -0.25725,0.032 -0.43066,-0.1467 -0.59552,-0.3135 l -1.40267,-1.4193 c -0.16473,-0.1666 0.0772,-0.3891 0.33526,-0.4179 z" style="fill:url(#linearGradient27525);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7000-5"/>
+              <path id="path7002-5" style="fill:url(#linearGradient27527);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.26317,1423.5327 2.91038,-0.315 c 0.25872,-0.028 0.40668,0.1629 0.59554,0.3042 l 1.79737,1.345 c 0.18905,0.1415 -0.10763,0.3288 -0.36515,0.3604 l -3.08771,0.3777 c -0.25725,0.031 -0.42004,-0.154 -0.59552,-0.3043 l -1.59017,-1.3623 c -0.17535,-0.1502 0.0772,-0.3777 0.33526,-0.4057 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 493.62818,1423.0779 2.91038,-0.3006 c 0.25872,-0.027 0.40668,0.1555 0.59554,0.2903 l 1.79737,1.2832 c 0.18905,0.135 -0.10763,0.3137 -0.36515,0.3438 l -3.08771,0.3604 c -0.25725,0.03 -0.42004,-0.1469 -0.59552,-0.2903 l -1.59017,-1.2998 c -0.17535,-0.1433 0.0772,-0.3603 0.33526,-0.387 z" style="fill:url(#linearGradient27529);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7004-1"/>
+              <path id="path7006-0" style="fill:url(#linearGradient27531);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 497.91616,1422.631 2.45855,-0.2751 c 0.25841,-0.029 0.4067,0.1481 0.59554,0.2766 l 1.79737,1.2225 c 0.18905,0.1286 -0.10808,0.2951 -0.36515,0.3275 l -2.63588,0.3321 c -0.25685,0.032 -0.42004,-0.14 -0.59552,-0.2766 l -1.59017,-1.2383 c -0.17535,-0.1365 0.0776,-0.3399 0.33526,-0.3687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 501.78123,1422.2229 2.43762,-0.275 c 0.25829,-0.029 0.40672,0.142 0.59554,0.265 l 1.79737,1.1713 c 0.18905,0.1232 -0.10821,0.2815 -0.36515,0.3138 l -2.61495,0.3296 c -0.25674,0.032 -0.42004,-0.1341 -0.59552,-0.265 l -1.59017,-1.1865 c -0.17535,-0.1307 0.0777,-0.3241 0.33526,-0.3532 z" style="fill:url(#linearGradient27533);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7008-1"/>
+              <path id="path7010-5" style="fill:url(#linearGradient27535);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 505.5518,1421.8696 2.11562,-0.238 c 0.25807,-0.029 0.40674,0.1323 0.59554,0.2471 l 1.79737,1.0922 c 0.18906,0.1148 -0.10848,0.2602 -0.36515,0.2926 l -2.29295,0.2889 c -0.25646,0.032 -0.42004,-0.125 -0.59552,-0.2471 l -1.59017,-1.1063 c -0.17535,-0.1219 0.0779,-0.3004 0.33526,-0.3294 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 509.17441,1421.5029 1.86761,-0.2095 c 0.25786,-0.029 0.4067,0.1254 0.59554,0.234 l 1.79737,1.0338 c 0.18904,0.1087 -0.10869,0.2447 -0.36515,0.277 l -2.04494,0.2577 c -0.25618,0.032 -0.42004,-0.1183 -0.59552,-0.2339 l -1.59017,-1.0472 c -0.17535,-0.1154 0.078,-0.283 0.33526,-0.3119 z" style="fill:url(#linearGradient27537);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7012-1"/>
+              <path id="path7014-7" style="fill:url(#linearGradient27539);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 512.35472,1421.1789 1.40841,-0.1539 c 0.25784,-0.028 0.40673,0.1193 0.59554,0.2227 l 1.79737,0.984 c 0.189,0.1035 -0.10889,0.2313 -0.36515,0.2636 l -1.58574,0.1998 c -0.25602,0.032 -0.42004,-0.1126 -0.59552,-0.2226 l -1.59017,-0.9967 c -0.17535,-0.1098 0.0781,-0.2688 0.33526,-0.2969 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 450.26701,1477.3135 6.35126,0.077 0.97049,1.2438 -6.64425,-0.031 z" style="fill:url(#linearGradient27541);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.99360958,-0.1128716,0,1,0,0)" id="rect7020-6"/>
+              <path id="path7024-0" style="fill:url(#linearGradient27543);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 454.46572,1425.7741 5.72964,-0.5831 1.2141,1.0589 -5.89416,0.7012 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 461.19718,1425.0866 5.72964,-0.5831 1.29638,1.0032 -5.71936,0.6238 z" style="fill:url(#linearGradient27545);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7026-0"/>
+              <path id="path7028-2" style="fill:url(#linearGradient27547);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 467.4812,1424.4577 5.01441,-0.5172 1.32369,0.9827 -4.96903,0.5151 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 473.2652,1423.8598 4.71239,-0.4766 1.22552,0.9605 -4.66701,0.4745 z" style="fill:url(#linearGradient27549);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7030-4"/>
+              <path id="path7032-3" style="fill:url(#linearGradient18521);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 478.62568,1423.325 4.22215,-0.3799 1.0076,0.8765 -4.07063,0.4241 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 483.31976,1422.8503 4.10186,-0.4272 1.00482,0.8801 -4.10634,0.4479 z" style="fill:url(#linearGradient18523);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7034-3"/>
+              <path id="path7036-6" style="fill:url(#linearGradient18525);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 488.02944,1422.373 3.94836,-0.4001 1.08523,0.8246 -4.10634,0.4479 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 492.53573,1421.9164 4.0649,-0.4119 1.08523,0.8014 -4.10634,0.4353 z" style="fill:url(#linearGradient18527);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7038-2"/>
+              <path id="path7040-8" style="fill:url(#linearGradient18529);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 497.12539,1421.4513 4.14103,-0.4196 1.08523,0.778 -4.10634,0.4226 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 501.78284,1420.9794 4.08424,-0.4139 0.96099,0.7307 -3.9821,0.4343 z" style="fill:url(#linearGradient18531);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7042-2"/>
+              <path id="path7044-3" style="fill:url(#linearGradient18533);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 506.50535,1420.4878 4.08424,-0.4009 0.96099,0.7078 -3.9821,0.4207 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
             </g>
-            <g
-               style="fill:#fafbfb;fill-opacity:1"
-               id="g7121-4"
-               transform="matrix(0.85239486,0,0,0.85239486,57.642494,214.40186)">
-              <path
-                 id="path7123-3"
-                 transform="matrix(0.97211389,-0.23450924,0.27190603,0.96232381,0,0)"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 47.697778,1511.0581 6.087718,0.2141 c 0.349743,0.012 0.522843,0.3039 0.632435,0.6325 l 1.203138,3.6075 c 0.109592,0.3286 -0.2994,0.553 -0.649558,0.5485 l -6.40556,-0.082 c -0.350353,0 -0.552167,-0.2944 -0.632435,-0.6324 l -0.868173,-3.6557 c -0.08027,-0.338 0.282107,-0.6335 0.632435,-0.6325 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cssssssssc" />
-              <path
-                 sodipodi:nodetypes="cssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 465.21397,1441.2337 5.97648,-1.17 c 0.34326,-0.067 0.59092,0.1627 0.78681,0.4409 l 2.1506,3.0546 c 0.19589,0.2783 -0.10119,0.6506 -0.44287,0.7249 l -5.82422,1.267 c -0.34184,0.075 -0.58591,-0.1659 -0.78679,-0.4408 l -2.3029,-3.1518 c -0.20088,-0.275 0.10199,-0.6472 0.44285,-0.725 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7125-4"
-                 inkscape:transform-center-x="0.50002642"
-                 inkscape:transform-center-y="0.95777293" />
-              <path
-                 inkscape:transform-center-y="0.9612254"
-                 inkscape:transform-center-x="0.44493633"
-                 id="path7127-3"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 472.86949,1439.7116 4.96651,-1.0132 c 0.30643,-0.062 0.49497,0.1853 0.70013,0.4425 l 2.25743,2.8304 c 0.20521,0.2573 -0.0888,0.6579 -0.39408,0.7275 l -5.01763,1.1439 c -0.3055,0.069 -0.50641,-0.1768 -0.70011,-0.4424 l -2.21416,-3.0355 c -0.10992,-0.1507 -0.0581,-0.2652 0.0559,-0.4146 0.087,-0.114 0.34415,-0.246 0.34595,-0.2388 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="csssssssssc" />
-              <path
-                 sodipodi:nodetypes="csssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 479.44154,1438.3333 6.18042,-1.2097 c 0.30632,-0.06 0.69706,0.086 0.92161,0.3193 l 2.56679,2.6635 c 0.22455,0.233 -0.0892,0.638 -0.39408,0.7073 l -6.76238,1.5361 c -0.30499,0.069 -0.50641,-0.1719 -0.70011,-0.4301 l -2.21416,-2.9513 c -0.10992,-0.1465 -0.0581,-0.2579 0.0559,-0.4031 0.087,-0.1109 0.34415,-0.2392 0.34595,-0.2322 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7129-6"
-                 inkscape:transform-center-x="0.44493633"
-                 inkscape:transform-center-y="0.93458356" />
-              <path
-                 inkscape:transform-center-y="0.90626211"
-                 inkscape:transform-center-x="0.44493633"
-                 id="path7131-8"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 487.69681,1436.6835 22.45389,-4.6258 c 0.30535,-0.063 0.67279,0.1096 0.92161,0.3096 l 2.70741,2.1765 c 0.24824,0.1995 -0.0895,0.6168 -0.39408,0.6858 l -22.60384,5.1149 c -0.30455,0.069 -0.6324,0.01 -0.84854,-0.2218 l -2.63836,-2.8234 c -0.12261,-0.1312 -0.0581,-0.2501 0.0559,-0.3909 0.087,-0.1075 0.34393,-0.2318 0.34595,-0.2251 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="csssssssssc" />
-              <path
-                 inkscape:transform-center-y="0.76615965"
-                 inkscape:transform-center-x="0.36471052"
-                 id="path7133-4"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 512.01768,1431.6827 3.27189,-0.679 c 0.25053,-0.052 0.54511,0.1046 0.75544,0.2617 l 2.90858,2.1734 c 0.21252,0.1588 -0.0731,0.523 -0.32303,0.5798 l -3.397,0.7716 c -0.25009,0.057 -0.36195,-0.1942 -0.57387,-0.3526 l -2.89964,-2.168 c -0.12014,-0.09 -0.1139,-0.2887 -0.0205,-0.4078 0.0713,-0.091 0.27612,-0.1848 0.27806,-0.1793 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="csssssssssc" />
-              <path
-                 sodipodi:nodetypes="csssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 516.87631,1430.6627 2.69737,-0.5392 c 0.2507,-0.05 0.54512,0.1018 0.75544,0.2547 l 2.90858,2.1148 c 0.21251,0.1545 -0.0732,0.5085 -0.32303,0.5642 l -2.82248,0.6293 c -0.25014,0.056 -0.36195,-0.189 -0.57387,-0.3431 l -2.89964,-2.1096 c -0.12014,-0.088 -0.1139,-0.2809 -0.0205,-0.3968 0.0713,-0.089 0.27612,-0.1798 0.27806,-0.1745 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7135-7"
-                 inkscape:transform-center-x="0.36471052"
-                 inkscape:transform-center-y="0.74552444" />
-              <path
-                 inkscape:transform-center-y="0.72705418"
-                 inkscape:transform-center-x="0.36471052"
-                 id="path7137-3"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 520.94699,1429.8131 2.69737,-0.5258 c 0.2507,-0.049 0.54512,0.099 0.75544,0.2484 l 2.90858,2.0623 c 0.21251,0.1507 -0.0732,0.4959 -0.32303,0.5502 l -2.82248,0.6137 c -0.25014,0.055 -0.36195,-0.1843 -0.57387,-0.3346 l -2.89964,-2.0573 c -0.12014,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27612,-0.1754 0.27806,-0.1702 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="csssssssssc" />
-              <path
-                 sodipodi:nodetypes="csssssssssc"
-                 inkscape:connector-curvature="0"
-                 d="m 525.09132,1428.99 1.81349,-0.3726 c 0.25019,-0.051 0.53014,0.1227 0.75544,0.2484 l 3.34419,1.8652 c 0.22753,0.1269 -0.0737,0.4935 -0.32303,0.5502 l -2.53192,0.5751 c -0.24975,0.057 -0.36305,-0.1828 -0.57387,-0.3346 l -2.74193,-1.9748 c -0.11989,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27622,-0.1754 0.27806,-0.1702 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7139-9"
-                 inkscape:transform-center-x="0.36471052"
-                 inkscape:transform-center-y="0.72705418" />
-              <path
-                 id="path7141-8"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 454.69085,1438.2936 14.72061,-2.4946 c 0.34338,-0.058 0.58523,0.1452 0.78678,0.3809 l 2.02413,2.3671 c 0.2016,0.2358 -0.14123,0.4959 -0.48231,0.5629 l -15.16831,2.9835 c -0.34077,0.067 -0.63951,-0.1135 -0.78675,-0.381 l -1.53697,-2.7924 c -0.1472,-0.2675 0.10031,-0.5684 0.44282,-0.6264 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 471.24017,1435.5075 4.73892,-0.8214 c 0.34247,-0.059 0.58137,0.1383 0.78678,0.353 l 2.13814,2.235 c 0.20554,0.2149 -0.14214,0.4547 -0.48231,0.5216 l -4.87836,0.9596 c -0.33985,0.067 -0.60051,-0.133 -0.78675,-0.353 l -1.95924,-2.3144 c -0.1863,-0.2201 0.10119,-0.5212 0.44282,-0.5804 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7143-0" />
-              <path
-                 id="path7145-0"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 477.72189,1434.3908 4.25555,-0.7477 c 0.34178,-0.06 0.58135,0.1322 0.78678,0.3375 l 2.13814,2.1367 c 0.20553,0.2054 -0.1427,0.4318 -0.48231,0.4986 l -4.30471,0.8467 c -0.33932,0.067 -0.59426,-0.1328 -0.78675,-0.3375 l -2.04952,-2.1795 c -0.19251,-0.2048 0.10176,-0.4949 0.44282,-0.5548 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 483.80361,1433.3299 3.93266,-0.6732 c 0.33258,-0.057 0.56567,0.1263 0.76558,0.3224 l 2.08052,2.0409 c 0.2,0.1961 -0.13885,0.4124 -0.46932,0.4762 l -3.9805,0.7678 c -0.33023,0.064 -0.57824,-0.1269 -0.76554,-0.3224 l -1.99429,-2.0818 c -0.18732,-0.1956 0.0989,-0.4731 0.43089,-0.5299 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7147-8" />
-              <path
-                 id="path7149-8"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 489.56243,1432.3586 3.49706,-0.6074 c 0.33196,-0.058 0.56568,0.12 0.76558,0.3063 l 2.08052,1.9391 c 0.19999,0.1864 -0.13966,0.3877 -0.46932,0.4525 l -3.5449,0.6973 c -0.3295,0.065 -0.57824,-0.1206 -0.76554,-0.3063 l -1.99429,-1.978 c -0.18732,-0.1858 0.0995,-0.4459 0.43089,-0.5035 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 494.85266,1431.4662 3.05202,-0.5246 c 0.33162,-0.057 0.56568,0.1136 0.76558,0.29 l 2.08052,1.836 c 0.19999,0.1765 -0.1403,0.3638 -0.46932,0.4285 l -3.09986,0.6097 c -0.32898,0.065 -0.57824,-0.1142 -0.76554,-0.29 l -1.99429,-1.8728 c -0.18732,-0.176 0.0999,-0.4199 0.43089,-0.4768 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7151-0" />
-              <path
-                 id="path7153-5"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 499.48759,1430.684 3.05202,-0.4988 c 0.33162,-0.054 0.56568,0.108 0.76558,0.2757 l 2.08052,1.746 c 0.19999,0.1679 -0.1403,0.346 -0.46932,0.4075 l -3.09986,0.5798 c -0.32898,0.062 -0.57824,-0.1086 -0.76554,-0.2758 l -1.99429,-1.7809 c -0.18732,-0.1674 0.0999,-0.3993 0.43089,-0.4535 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 504.17762,1429.868 2.70166,-0.4632 c 0.33085,-0.057 0.5657,0.1034 0.76558,0.264 l 2.08052,1.6719 c 0.20004,0.1607 -0.14135,0.3257 -0.46932,0.3902 l -2.7495,0.5408 c -0.32795,0.064 -0.57824,-0.104 -0.76554,-0.2641 l -1.99429,-1.7053 c -0.18732,-0.1603 0.10067,-0.3777 0.43089,-0.4343 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7155-1" />
-              <path
-                 id="path7157-4"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 508.45089,1429.1633 2.70166,-0.4371 c 0.33085,-0.054 0.5657,0.098 0.76558,0.2491 l 2.08052,1.5775 c 0.20004,0.1516 -0.14135,0.3073 -0.46932,0.3681 l -2.7495,0.5103 c -0.32795,0.06 -0.57824,-0.098 -0.76554,-0.2492 l -1.99429,-1.609 c -0.18732,-0.1512 0.10067,-0.3563 0.43089,-0.4097 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 512.60906,1428.4424 2.70166,-0.4184 c 0.33085,-0.052 0.5657,0.094 0.76558,0.2384 l 2.08052,1.5101 c 0.20004,0.1451 -0.14135,0.2941 -0.46932,0.3523 l -2.7495,0.4885 c -0.32795,0.057 -0.57824,-0.094 -0.76554,-0.2385 l -1.99429,-1.5403 c -0.18732,-0.1447 0.10067,-0.341 0.43089,-0.3921 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7159-3" />
-              <path
-                 id="path7161-6"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 516.77633,1427.7726 2.62492,-0.4448 c 0.3299,-0.056 0.5657,0.09 0.76558,0.2284 l 2.08052,1.4469 c 0.20004,0.139 -0.14135,0.2818 -0.46932,0.3376 l -2.7495,0.468 c -0.32795,0.055 -0.57889,-0.089 -0.76554,-0.2285 l -1.91755,-1.4319 c -0.18676,-0.1394 0.10174,-0.3199 0.43089,-0.3757 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 521.03501,1427.051 2.42068,-0.3892 c 0.32986,-0.053 0.55745,0.099 0.76558,0.2176 l 2.32063,1.317 c 0.20863,0.1184 -0.14135,0.2685 -0.46932,0.3217 l -2.7495,0.4459 c -0.32795,0.052 -0.57643,-0.088 -0.76554,-0.2177 l -1.95342,-1.3373 c -0.18911,-0.1295 0.1017,-0.3051 0.43089,-0.358 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7163-3" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 452.57798,1434.6551 11.12923,-1.6317 c 0.259,-0.038 0.41871,0.208 0.59558,0.4431 l 1.50759,2.0044 c 0.17693,0.2352 -0.1074,0.4817 -0.36511,0.5247 l -11.38645,1.8987 c -0.25749,0.043 -0.44999,-0.1804 -0.59556,-0.4433 l -1.22049,-2.2045 c -0.14557,-0.2629 0.0768,-0.5535 0.33521,-0.5914 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7165-9" />
-              <path
-                 id="path7167-2"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 465.14481,1432.8122 4.899,-0.7203 c 0.25873,-0.038 0.40063,0.2129 0.59558,0.4201 l 1.77321,1.8851 c 0.19503,0.2073 -0.10774,0.4547 -0.36511,0.4976 l -5.17296,0.8626 c -0.2572,0.043 -0.42263,-0.1893 -0.59556,-0.4204 l -1.46937,-1.9639 c -0.17299,-0.2312 0.0771,-0.5229 0.33521,-0.5608 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 471.62681,1431.8596 4.86438,-0.7161 c 0.25852,-0.038 0.39723,0.2086 0.59563,0.405 l 1.80467,1.7862 c 0.19848,0.1964 -0.10793,0.4368 -0.36505,0.4797 l -5.0158,0.8364 c -0.25706,0.043 -0.40931,-0.1935 -0.59561,-0.4053 l -1.62336,-1.8453 c -0.18633,-0.2118 0.0772,-0.5026 0.33514,-0.5406 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7169-1" />
-              <path
-                 id="path7171-9"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 478.00171,1430.898 4.18042,-0.6063 c 0.25845,-0.037 0.39724,0.201 0.59563,0.3902 l 1.80467,1.7213 c 0.19842,0.1893 -0.10819,0.4194 -0.36505,0.4622 l -4.17981,0.697 c -0.25679,0.043 -0.39478,-0.2008 -0.59561,-0.3906 l -1.83789,-1.7372 c -0.20084,-0.1898 0.1398,-0.4992 0.39764,-0.5366 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 483.79892,1430.0354 3.67118,-0.504 c 0.25839,-0.036 0.40547,0.171 0.60385,0.3528 l 1.80467,1.654 c 0.19844,0.1819 -0.10847,0.4013 -0.36505,0.4441 l -3.67879,0.6134 c -0.2565,0.043 -0.39478,-0.193 -0.59561,-0.3753 l -1.83789,-1.6694 c -0.20084,-0.1823 0.13971,-0.4802 0.39764,-0.5156 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7173-8" />
-              <path
-                 id="path7175-2"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 489.09271,1429.2929 3.5803,-0.5261 c 0.25798,-0.038 0.40547,0.1653 0.60385,0.3409 l 1.80467,1.5984 c 0.19844,0.1758 -0.10847,0.3879 -0.36505,0.4292 l -3.67879,0.5928 c -0.2565,0.042 -0.39478,-0.1865 -0.59561,-0.3627 l -1.83789,-1.6133 c -0.20084,-0.1761 0.2311,-0.4213 0.48852,-0.4592 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 494.19377,1428.5433 3.20991,-0.4717 c 0.25793,-0.038 0.42396,0.1214 0.62227,0.2912 l 1.80473,1.5451 c 0.19845,0.1699 -0.10891,0.3722 -0.36504,0.4149 l -3.35786,0.5599 c -0.25623,0.043 -0.39548,-0.1795 -0.59562,-0.3506 l -1.8069,-1.5449 c -0.20009,-0.1711 0.23124,-0.4061 0.48851,-0.4439 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7177-3" />
-              <path
-                 id="path7179-4"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 498.9165,1427.8332 2.74646,-0.3973 c 0.25789,-0.037 0.42394,0.1174 0.62227,0.2816 l 1.80473,1.4939 c 0.19847,0.1643 -0.10913,0.3585 -0.36504,0.4012 l -2.89441,0.4826 c -0.25611,0.043 -0.39548,-0.1736 -0.59562,-0.339 l -1.8069,-1.4938 c -0.20009,-0.1654 0.23134,-0.392 0.48851,-0.4292 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 503.16635,1427.2047 2.74646,-0.3835 c 0.25789,-0.036 0.42394,0.1133 0.62227,0.2718 l 1.80473,1.4421 c 0.19847,0.1586 -0.10913,0.3461 -0.36504,0.3873 l -2.89441,0.4659 c -0.25611,0.042 -0.39548,-0.1676 -0.59562,-0.3273 l -1.8069,-1.442 c -0.20009,-0.1597 0.23134,-0.3784 0.48851,-0.4143 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7181-0" />
-              <path
-                 id="path7183-2"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 507.34415,1426.5781 2.48328,-0.359 c 0.25757,-0.037 0.42392,0.1096 0.62227,0.2629 l 1.80473,1.3947 c 0.19843,0.1533 -0.10958,0.3319 -0.36504,0.3745 l -2.63123,0.4387 c -0.25584,0.043 -0.39548,-0.1621 -0.59562,-0.3165 l -1.8069,-1.3946 c -0.20009,-0.1545 0.23168,-0.3636 0.48851,-0.4007 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 511.51931,1425.9526 1.99681,-0.2827 c 0.25755,-0.037 0.42389,0.1061 0.62227,0.2544 l 1.80473,1.3494 c 0.19847,0.1484 -0.10982,0.3196 -0.36504,0.3624 l -2.14476,0.3598 c -0.25564,0.043 -0.39548,-0.1568 -0.59562,-0.3062 l -1.8069,-1.3494 c -0.20009,-0.1495 0.23173,-0.3513 0.48851,-0.3877 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7185-3" />
-              <path
-                 id="path7187-1"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 515.04488,1425.4534 1.99681,-0.2702 c 0.25755,-0.035 0.42389,0.1014 0.62227,0.2431 l 1.80473,1.2895 c 0.19847,0.1418 -0.10982,0.3054 -0.36504,0.3463 l -2.14476,0.3438 c -0.25564,0.041 -0.39548,-0.1498 -0.59562,-0.2926 l -1.8069,-1.2895 c -0.20009,-0.1428 0.23173,-0.3357 0.48851,-0.3704 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 518.52859,1424.9356 1.76656,-0.2279 c 0.25765,-0.033 0.41505,0.1117 0.62227,0.2355 l 2.03498,1.2156 c 0.20723,0.1238 -0.10982,0.2959 -0.36504,0.3356 l -2.14476,0.3331 c -0.25564,0.04 -0.39548,-0.1452 -0.59562,-0.2835 l -1.8069,-1.2495 c -0.20009,-0.1384 0.23167,-0.3258 0.48851,-0.3589 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7189-9" />
-              <path
-                 id="path7191-8"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 450.58393,1431.1152 9.10708,-1.1496 c 0.25925,-0.033 0.42916,0.1753 0.59554,0.3916 l 1.42588,1.8534 c 0.16646,0.2164 -0.10732,0.4265 -0.36515,0.4637 l -9.40234,1.355 c -0.25759,0.037 -0.46337,-0.1516 -0.59552,-0.3917 l -1.10075,-1.9998 c -0.1322,-0.2402 0.0768,-0.49 0.33526,-0.5226 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 461.14009,1429.7827 5.07055,-0.6277 c 0.25912,-0.032 0.4291,0.1669 0.59554,0.373 l 1.42588,1.7652 c 0.16648,0.206 -0.10756,0.4044 -0.36515,0.4416 l -5.111,0.7365 c -0.2573,0.037 -0.43762,-0.1614 -0.59552,-0.3731 l -1.35556,-1.8178 c -0.15792,-0.2118 0.0769,-0.4657 0.33526,-0.4977 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7193-9" />
-              <path
-                 id="path7195-8"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 467.76368,1428.9131 4.67261,-0.5673 c 0.25312,-0.031 0.41909,0.1617 0.58168,0.3611 l 1.3927,1.7087 c 0.16255,0.1995 -0.10505,0.3916 -0.35666,0.4275 l -4.71211,0.6726 c -0.25134,0.036 -0.42744,-0.1562 -0.58167,-0.3612 l -1.32401,-1.7596 c -0.15424,-0.205 0.0751,-0.4512 0.32746,-0.4818 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 473.8017,1428.1844 4.13261,-0.4996 c 0.25888,-0.031 0.42252,0.1618 0.59554,0.3486 l 1.47529,1.5921 c 0.17295,0.1866 -0.1075,0.3784 -0.36515,0.4127 l -4.28877,0.5706 c -0.2574,0.034 -0.43729,-0.1511 -0.59552,-0.3487 l -1.28926,-1.6105 c -0.15825,-0.1977 0.077,-0.434 0.33526,-0.4652 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7197-9" />
-              <path
-                 id="path7199-1"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 479.37869,1427.4803 3.87442,-0.5106 c 0.25849,-0.034 0.41253,0.1699 0.59554,0.3448 l 1.60236,1.5308 c 0.18286,0.1746 -0.10794,0.371 -0.36515,0.4081 l -4.03058,0.5808 c -0.25698,0.037 -0.42586,-0.1592 -0.59552,-0.3448 l -1.41633,-1.5491 c -0.16973,-0.1856 0.0774,-0.426 0.33526,-0.46 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 484.58967,1426.8298 3.57896,-0.4467 c 0.25858,-0.032 0.40179,0.1753 0.59554,0.3304 l 1.79531,1.4368 c 0.19356,0.1549 -0.10792,0.3557 -0.36515,0.3911 l -3.73512,0.514 c -0.25693,0.035 -0.41319,-0.1656 -0.59552,-0.3304 l -1.60928,-1.4544 c -0.18242,-0.1649 0.0774,-0.4086 0.33526,-0.4408 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7201-3" />
-              <path
-                 id="path7203-5"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 489.53231,1426.1828 3.35692,-0.441 c 0.25821,-0.034 0.40175,0.1702 0.59554,0.3208 l 1.79531,1.3946 c 0.19358,0.1504 -0.10828,0.3427 -0.36515,0.3797 l -3.51308,0.5063 c -0.25652,0.037 -0.41319,-0.1607 -0.59552,-0.3207 l -1.60928,-1.4118 c -0.18242,-0.16 0.0777,-0.3941 0.33526,-0.4279 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 494.30488,1425.5933 2.97943,-0.3895 c 0.25799,-0.034 0.40174,0.1625 0.59554,0.3062 l 1.79531,1.3311 c 0.19361,0.1436 -0.10852,0.3254 -0.36515,0.3624 l -3.13559,0.4519 c -0.25625,0.037 -0.41319,-0.1534 -0.59552,-0.3061 l -1.60928,-1.3475 c -0.18242,-0.1528 0.0779,-0.3749 0.33526,-0.4085 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7205-1" />
-              <path
-                 id="path7207-4"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 498.68156,1425.0421 2.68932,-0.3501 c 0.25791,-0.034 0.40171,0.1562 0.59554,0.2944 l 1.79531,1.2798 c 0.1936,0.138 -0.10872,0.3114 -0.36515,0.3484 l -2.84548,0.4101 c -0.25612,0.037 -0.41319,-0.1475 -0.59552,-0.2943 l -1.60928,-1.2956 c -0.18242,-0.1469 0.0781,-0.3592 0.33526,-0.3927 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 502.81699,1424.5193 2.68932,-0.3371 c 0.25791,-0.033 0.40171,0.1504 0.59554,0.2835 l 1.79531,1.2325 c 0.1936,0.1329 -0.10872,0.2999 -0.36515,0.3355 l -2.84548,0.395 c -0.25612,0.036 -0.41319,-0.1421 -0.59552,-0.2834 l -1.60928,-1.2478 c -0.18242,-0.1414 0.0781,-0.3459 0.33526,-0.3782 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7209-2" />
-              <path
-                 id="path7211-5"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 506.81318,1424.0041 2.23999,-0.2893 c 0.25775,-0.033 0.40168,0.1457 0.59554,0.2745 l 1.79531,1.1933 c 0.19361,0.1287 -0.10906,0.288 -0.36515,0.3249 l -2.39615,0.3453 c -0.25586,0.037 -0.41319,-0.1376 -0.59552,-0.2744 l -1.60928,-1.2081 c -0.18242,-0.1369 0.0783,-0.333 0.33526,-0.3662 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 510.41945,1423.5572 2.23999,-0.278 c 0.25775,-0.032 0.40168,0.14 0.59554,0.2638 l 1.79531,1.1466 c 0.19361,0.1237 -0.10906,0.2767 -0.36515,0.3122 l -2.39615,0.3318 c -0.25586,0.036 -0.41319,-0.1322 -0.59552,-0.2637 l -1.60928,-1.1608 c -0.18242,-0.1316 0.0783,-0.32 0.33526,-0.3519 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7213-3" />
-              <path
-                 id="path7215-8"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 514.00115,1423.0964 2.70057,-0.3596 c 0.25733,-0.034 0.40169,0.1356 0.59554,0.2555 l 1.79531,1.1106 c 0.19362,0.1198 -0.1094,0.2655 -0.36515,0.3024 l -2.85673,0.4117 c -0.2556,0.037 -0.41319,-0.1281 -0.59552,-0.2554 l -1.60928,-1.1244 c -0.18242,-0.1275 0.0787,-0.3066 0.33526,-0.3408 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 id="path7217-9"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 448.90855,1428.1161 5.63036,-0.6248 c 0.25928,-0.029 0.44294,0.1441 0.59554,0.3466 l 1.3325,1.7687 c 0.15272,0.2027 -0.10729,0.3777 -0.36515,0.4105 l -5.93657,0.7538 c -0.25763,0.033 -0.47664,-0.1265 -0.59552,-0.3467 l -0.99642,-1.8456 c -0.11894,-0.2203 0.0768,-0.4338 0.33526,-0.4625 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 456.07139,1427.3009 5.11456,-0.5881 c 0.25908,-0.03 0.44295,0.1407 0.59554,0.3385 l 1.3325,1.7273 c 0.15269,0.1979 -0.10734,0.3684 -0.36515,0.4009 l -5.10827,0.6437 c -0.25757,0.033 -0.44735,-0.1425 -0.59552,-0.3386 l -1.30892,-1.7321 c -0.14819,-0.1961 0.077,-0.4219 0.33526,-0.4516 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7219-2" />
-              <path
-                 id="path7221-8"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 462.56281,1426.5463 4.61648,-0.5268 c 0.25902,-0.03 0.44291,0.1371 0.59554,0.33 l 1.3325,1.6838 c 0.15272,0.193 -0.10744,0.3584 -0.36515,0.3909 l -4.61019,0.581 c -0.25751,0.033 -0.44735,-0.1389 -0.59552,-0.3301 l -1.30892,-1.6886 c -0.14819,-0.1911 0.0771,-0.4107 0.33526,-0.4402 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 468.60056,1425.854 4.33762,-0.4931 c 0.25897,-0.029 0.44286,0.1332 0.59554,0.3208 l 1.3325,1.6368 c 0.15272,0.1876 -0.10754,0.3475 -0.36515,0.38 l -4.33133,0.5458 c -0.25745,0.032 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7223-7" />
-              <path
-                 id="path7225-0"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 474.32467,1425.2135 3.86408,-0.4391 c 0.25887,-0.029 0.43837,0.137 0.59554,0.3208 l 1.33459,1.5614 c 0.15718,0.1839 -0.10826,0.3422 -0.36515,0.38 l -3.85988,0.5672 c -0.25667,0.038 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 479.60347,1424.6159 3.70783,-0.4235 c 0.25881,-0.029 0.42624,0.1482 0.59554,0.3208 l 1.45362,1.4828 c 0.16936,0.1728 -0.10753,0.3476 -0.36515,0.38 l -3.88516,0.4896 c -0.25743,0.032 -0.44364,-0.138 -0.59552,-0.3209 l -1.24642,-1.5009 c -0.15184,-0.1828 0.0772,-0.3984 0.33526,-0.4279 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7227-1" />
-              <path
-                 id="path7229-4"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 484.88205,1424.0301 2.91038,-0.3245 c 0.25872,-0.029 0.41533,0.1566 0.59554,0.3134 l 1.60987,1.4015 c 0.18036,0.157 -0.10763,0.3387 -0.36515,0.3712 l -3.08771,0.3891 c -0.25725,0.032 -0.43066,-0.1467 -0.59552,-0.3135 l -1.40267,-1.4193 c -0.16473,-0.1666 0.0772,-0.3891 0.33526,-0.4179 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 489.26317,1423.5327 2.91038,-0.315 c 0.25872,-0.028 0.40668,0.1629 0.59554,0.3042 l 1.79737,1.345 c 0.18905,0.1415 -0.10763,0.3288 -0.36515,0.3604 l -3.08771,0.3777 c -0.25725,0.031 -0.42004,-0.154 -0.59552,-0.3043 l -1.59017,-1.3623 c -0.17535,-0.1502 0.0772,-0.3777 0.33526,-0.4057 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7231-8" />
-              <path
-                 id="path7233-1"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 493.62818,1423.0779 2.91038,-0.3006 c 0.25872,-0.027 0.40668,0.1555 0.59554,0.2903 l 1.79737,1.2832 c 0.18905,0.135 -0.10763,0.3137 -0.36515,0.3438 l -3.08771,0.3604 c -0.25725,0.03 -0.42004,-0.1469 -0.59552,-0.2903 l -1.59017,-1.2998 c -0.17535,-0.1433 0.0772,-0.3603 0.33526,-0.387 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 497.91616,1422.631 2.45855,-0.2751 c 0.25841,-0.029 0.4067,0.1481 0.59554,0.2766 l 1.79737,1.2225 c 0.18905,0.1286 -0.10808,0.2951 -0.36515,0.3275 l -2.63588,0.3321 c -0.25685,0.032 -0.42004,-0.14 -0.59552,-0.2766 l -1.59017,-1.2383 c -0.17535,-0.1365 0.0776,-0.3399 0.33526,-0.3687 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7235-9" />
-              <path
-                 id="path7237-3"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 501.78123,1422.2229 2.43762,-0.275 c 0.25829,-0.029 0.40672,0.142 0.59554,0.265 l 1.79737,1.1713 c 0.18905,0.1232 -0.10821,0.2815 -0.36515,0.3138 l -2.61495,0.3296 c -0.25674,0.032 -0.42004,-0.1341 -0.59552,-0.265 l -1.59017,-1.1865 c -0.17535,-0.1307 0.0777,-0.3241 0.33526,-0.3532 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 505.5518,1421.8696 2.11562,-0.238 c 0.25807,-0.029 0.40674,0.1323 0.59554,0.2471 l 1.79737,1.0922 c 0.18906,0.1148 -0.10848,0.2602 -0.36515,0.2926 l -2.29295,0.2889 c -0.25646,0.032 -0.42004,-0.125 -0.59552,-0.2471 l -1.59017,-1.1063 c -0.17535,-0.1219 0.0779,-0.3004 0.33526,-0.3294 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7239-5" />
-              <path
-                 id="path7241-9"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 509.17441,1421.5029 1.86761,-0.2095 c 0.25786,-0.029 0.4067,0.1254 0.59554,0.234 l 1.79737,1.0338 c 0.18904,0.1087 -0.10869,0.2447 -0.36515,0.277 l -2.04494,0.2577 c -0.25618,0.032 -0.42004,-0.1183 -0.59552,-0.2339 l -1.59017,-1.0472 c -0.17535,-0.1154 0.078,-0.283 0.33526,-0.3119 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="sssssssss" />
-              <path
-                 sodipodi:nodetypes="sssssssss"
-                 inkscape:connector-curvature="0"
-                 d="m 512.35472,1421.1789 1.40841,-0.1539 c 0.25784,-0.028 0.40673,0.1193 0.59554,0.2227 l 1.79737,0.984 c 0.189,0.1035 -0.10889,0.2313 -0.36515,0.2636 l -1.58574,0.1998 c -0.25602,0.032 -0.42004,-0.1126 -0.59552,-0.2226 l -1.59017,-0.9967 c -0.17535,-0.1098 0.0781,-0.2688 0.33526,-0.2969 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7243-7" />
-              <path
-                 id="path7245-9"
-                 transform="matrix(0.99360958,-0.1128716,0,1,0,0)"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 450.26701,1477.3135 6.35126,0.077 0.97049,1.2438 -6.64425,-0.031 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 454.46572,1425.7741 5.72964,-0.5831 1.2141,1.0589 -5.89416,0.7012 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7247-8" />
-              <path
-                 id="path7249-0"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 461.19718,1425.0866 5.72964,-0.5831 1.29638,1.0032 -5.71936,0.6238 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 467.4812,1424.4577 5.01441,-0.5172 1.32369,0.9827 -4.96903,0.5151 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7251-1" />
-              <path
-                 id="path7253-4"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 473.2652,1423.8598 4.71239,-0.4766 1.22552,0.9605 -4.66701,0.4745 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 478.62568,1423.325 4.22215,-0.3799 1.0076,0.8765 -4.07063,0.4241 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7255-7" />
-              <path
-                 id="path7257-5"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 483.31976,1422.8503 4.10186,-0.4272 1.00482,0.8801 -4.10634,0.4479 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 488.02944,1422.373 3.94836,-0.4001 1.08523,0.8246 -4.10634,0.4479 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7259-5" />
-              <path
-                 id="path7261-5"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 492.53573,1421.9164 4.0649,-0.4119 1.08523,0.8014 -4.10634,0.4353 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 497.12539,1421.4513 4.14103,-0.4196 1.08523,0.778 -4.10634,0.4226 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7263-0" />
-              <path
-                 id="path7265-9"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 501.78284,1420.9794 4.08424,-0.4139 0.96099,0.7307 -3.9821,0.4343 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 506.50535,1420.4878 4.08424,-0.4009 0.96099,0.7078 -3.9821,0.4207 z"
-                 style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path7267-2" />
+            <g style="fill:#fafbfb;fill-opacity:1" id="g7121-4" transform="matrix(0.85239486,0,0,0.85239486,57.642494,214.40186)">
+              <path id="path7123-3" transform="matrix(0.97211389,-0.23450924,0.27190603,0.96232381,0,0)" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 47.697778,1511.0581 6.087718,0.2141 c 0.349743,0.012 0.522843,0.3039 0.632435,0.6325 l 1.203138,3.6075 c 0.109592,0.3286 -0.2994,0.553 -0.649558,0.5485 l -6.40556,-0.082 c -0.350353,0 -0.552167,-0.2944 -0.632435,-0.6324 l -0.868173,-3.6557 c -0.08027,-0.338 0.282107,-0.6335 0.632435,-0.6325 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cssssssssc"/>
+              <path sodipodi:nodetypes="cssssssssc" inkscape:connector-curvature="0" d="m 465.21397,1441.2337 5.97648,-1.17 c 0.34326,-0.067 0.59092,0.1627 0.78681,0.4409 l 2.1506,3.0546 c 0.19589,0.2783 -0.10119,0.6506 -0.44287,0.7249 l -5.82422,1.267 c -0.34184,0.075 -0.58591,-0.1659 -0.78679,-0.4408 l -2.3029,-3.1518 c -0.20088,-0.275 0.10199,-0.6472 0.44285,-0.725 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7125-4" inkscape:transform-center-x="0.50002642" inkscape:transform-center-y="0.95777293"/>
+              <path inkscape:transform-center-y="0.9612254" inkscape:transform-center-x="0.44493633" id="path7127-3" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 472.86949,1439.7116 4.96651,-1.0132 c 0.30643,-0.062 0.49497,0.1853 0.70013,0.4425 l 2.25743,2.8304 c 0.20521,0.2573 -0.0888,0.6579 -0.39408,0.7275 l -5.01763,1.1439 c -0.3055,0.069 -0.50641,-0.1768 -0.70011,-0.4424 l -2.21416,-3.0355 c -0.10992,-0.1507 -0.0581,-0.2652 0.0559,-0.4146 0.087,-0.114 0.34415,-0.246 0.34595,-0.2388 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+              <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 479.44154,1438.3333 6.18042,-1.2097 c 0.30632,-0.06 0.69706,0.086 0.92161,0.3193 l 2.56679,2.6635 c 0.22455,0.233 -0.0892,0.638 -0.39408,0.7073 l -6.76238,1.5361 c -0.30499,0.069 -0.50641,-0.1719 -0.70011,-0.4301 l -2.21416,-2.9513 c -0.10992,-0.1465 -0.0581,-0.2579 0.0559,-0.4031 0.087,-0.1109 0.34415,-0.2392 0.34595,-0.2322 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7129-6" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.93458356"/>
+              <path inkscape:transform-center-y="0.90626211" inkscape:transform-center-x="0.44493633" id="path7131-8" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 487.69681,1436.6835 22.45389,-4.6258 c 0.30535,-0.063 0.67279,0.1096 0.92161,0.3096 l 2.70741,2.1765 c 0.24824,0.1995 -0.0895,0.6168 -0.39408,0.6858 l -22.60384,5.1149 c -0.30455,0.069 -0.6324,0.01 -0.84854,-0.2218 l -2.63836,-2.8234 c -0.12261,-0.1312 -0.0581,-0.2501 0.0559,-0.3909 0.087,-0.1075 0.34393,-0.2318 0.34595,-0.2251 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+              <path inkscape:transform-center-y="0.76615965" inkscape:transform-center-x="0.36471052" id="path7133-4" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 512.01768,1431.6827 3.27189,-0.679 c 0.25053,-0.052 0.54511,0.1046 0.75544,0.2617 l 2.90858,2.1734 c 0.21252,0.1588 -0.0731,0.523 -0.32303,0.5798 l -3.397,0.7716 c -0.25009,0.057 -0.36195,-0.1942 -0.57387,-0.3526 l -2.89964,-2.168 c -0.12014,-0.09 -0.1139,-0.2887 -0.0205,-0.4078 0.0713,-0.091 0.27612,-0.1848 0.27806,-0.1793 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+              <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 516.87631,1430.6627 2.69737,-0.5392 c 0.2507,-0.05 0.54512,0.1018 0.75544,0.2547 l 2.90858,2.1148 c 0.21251,0.1545 -0.0732,0.5085 -0.32303,0.5642 l -2.82248,0.6293 c -0.25014,0.056 -0.36195,-0.189 -0.57387,-0.3431 l -2.89964,-2.1096 c -0.12014,-0.088 -0.1139,-0.2809 -0.0205,-0.3968 0.0713,-0.089 0.27612,-0.1798 0.27806,-0.1745 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7135-7" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.74552444"/>
+              <path inkscape:transform-center-y="0.72705418" inkscape:transform-center-x="0.36471052" id="path7137-3" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 520.94699,1429.8131 2.69737,-0.5258 c 0.2507,-0.049 0.54512,0.099 0.75544,0.2484 l 2.90858,2.0623 c 0.21251,0.1507 -0.0732,0.4959 -0.32303,0.5502 l -2.82248,0.6137 c -0.25014,0.055 -0.36195,-0.1843 -0.57387,-0.3346 l -2.89964,-2.0573 c -0.12014,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27612,-0.1754 0.27806,-0.1702 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+              <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 525.09132,1428.99 1.81349,-0.3726 c 0.25019,-0.051 0.53014,0.1227 0.75544,0.2484 l 3.34419,1.8652 c 0.22753,0.1269 -0.0737,0.4935 -0.32303,0.5502 l -2.53192,0.5751 c -0.24975,0.057 -0.36305,-0.1828 -0.57387,-0.3346 l -2.74193,-1.9748 c -0.11989,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27622,-0.1754 0.27806,-0.1702 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7139-9" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.72705418"/>
+              <path id="path7141-8" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 454.69085,1438.2936 14.72061,-2.4946 c 0.34338,-0.058 0.58523,0.1452 0.78678,0.3809 l 2.02413,2.3671 c 0.2016,0.2358 -0.14123,0.4959 -0.48231,0.5629 l -15.16831,2.9835 c -0.34077,0.067 -0.63951,-0.1135 -0.78675,-0.381 l -1.53697,-2.7924 c -0.1472,-0.2675 0.10031,-0.5684 0.44282,-0.6264 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 471.24017,1435.5075 4.73892,-0.8214 c 0.34247,-0.059 0.58137,0.1383 0.78678,0.353 l 2.13814,2.235 c 0.20554,0.2149 -0.14214,0.4547 -0.48231,0.5216 l -4.87836,0.9596 c -0.33985,0.067 -0.60051,-0.133 -0.78675,-0.353 l -1.95924,-2.3144 c -0.1863,-0.2201 0.10119,-0.5212 0.44282,-0.5804 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7143-0"/>
+              <path id="path7145-0" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 477.72189,1434.3908 4.25555,-0.7477 c 0.34178,-0.06 0.58135,0.1322 0.78678,0.3375 l 2.13814,2.1367 c 0.20553,0.2054 -0.1427,0.4318 -0.48231,0.4986 l -4.30471,0.8467 c -0.33932,0.067 -0.59426,-0.1328 -0.78675,-0.3375 l -2.04952,-2.1795 c -0.19251,-0.2048 0.10176,-0.4949 0.44282,-0.5548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 483.80361,1433.3299 3.93266,-0.6732 c 0.33258,-0.057 0.56567,0.1263 0.76558,0.3224 l 2.08052,2.0409 c 0.2,0.1961 -0.13885,0.4124 -0.46932,0.4762 l -3.9805,0.7678 c -0.33023,0.064 -0.57824,-0.1269 -0.76554,-0.3224 l -1.99429,-2.0818 c -0.18732,-0.1956 0.0989,-0.4731 0.43089,-0.5299 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7147-8"/>
+              <path id="path7149-8" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.56243,1432.3586 3.49706,-0.6074 c 0.33196,-0.058 0.56568,0.12 0.76558,0.3063 l 2.08052,1.9391 c 0.19999,0.1864 -0.13966,0.3877 -0.46932,0.4525 l -3.5449,0.6973 c -0.3295,0.065 -0.57824,-0.1206 -0.76554,-0.3063 l -1.99429,-1.978 c -0.18732,-0.1858 0.0995,-0.4459 0.43089,-0.5035 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 494.85266,1431.4662 3.05202,-0.5246 c 0.33162,-0.057 0.56568,0.1136 0.76558,0.29 l 2.08052,1.836 c 0.19999,0.1765 -0.1403,0.3638 -0.46932,0.4285 l -3.09986,0.6097 c -0.32898,0.065 -0.57824,-0.1142 -0.76554,-0.29 l -1.99429,-1.8728 c -0.18732,-0.176 0.0999,-0.4199 0.43089,-0.4768 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7151-0"/>
+              <path id="path7153-5" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 499.48759,1430.684 3.05202,-0.4988 c 0.33162,-0.054 0.56568,0.108 0.76558,0.2757 l 2.08052,1.746 c 0.19999,0.1679 -0.1403,0.346 -0.46932,0.4075 l -3.09986,0.5798 c -0.32898,0.062 -0.57824,-0.1086 -0.76554,-0.2758 l -1.99429,-1.7809 c -0.18732,-0.1674 0.0999,-0.3993 0.43089,-0.4535 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 504.17762,1429.868 2.70166,-0.4632 c 0.33085,-0.057 0.5657,0.1034 0.76558,0.264 l 2.08052,1.6719 c 0.20004,0.1607 -0.14135,0.3257 -0.46932,0.3902 l -2.7495,0.5408 c -0.32795,0.064 -0.57824,-0.104 -0.76554,-0.2641 l -1.99429,-1.7053 c -0.18732,-0.1603 0.10067,-0.3777 0.43089,-0.4343 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7155-1"/>
+              <path id="path7157-4" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 508.45089,1429.1633 2.70166,-0.4371 c 0.33085,-0.054 0.5657,0.098 0.76558,0.2491 l 2.08052,1.5775 c 0.20004,0.1516 -0.14135,0.3073 -0.46932,0.3681 l -2.7495,0.5103 c -0.32795,0.06 -0.57824,-0.098 -0.76554,-0.2492 l -1.99429,-1.609 c -0.18732,-0.1512 0.10067,-0.3563 0.43089,-0.4097 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 512.60906,1428.4424 2.70166,-0.4184 c 0.33085,-0.052 0.5657,0.094 0.76558,0.2384 l 2.08052,1.5101 c 0.20004,0.1451 -0.14135,0.2941 -0.46932,0.3523 l -2.7495,0.4885 c -0.32795,0.057 -0.57824,-0.094 -0.76554,-0.2385 l -1.99429,-1.5403 c -0.18732,-0.1447 0.10067,-0.341 0.43089,-0.3921 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7159-3"/>
+              <path id="path7161-6" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 516.77633,1427.7726 2.62492,-0.4448 c 0.3299,-0.056 0.5657,0.09 0.76558,0.2284 l 2.08052,1.4469 c 0.20004,0.139 -0.14135,0.2818 -0.46932,0.3376 l -2.7495,0.468 c -0.32795,0.055 -0.57889,-0.089 -0.76554,-0.2285 l -1.91755,-1.4319 c -0.18676,-0.1394 0.10174,-0.3199 0.43089,-0.3757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 521.03501,1427.051 2.42068,-0.3892 c 0.32986,-0.053 0.55745,0.099 0.76558,0.2176 l 2.32063,1.317 c 0.20863,0.1184 -0.14135,0.2685 -0.46932,0.3217 l -2.7495,0.4459 c -0.32795,0.052 -0.57643,-0.088 -0.76554,-0.2177 l -1.95342,-1.3373 c -0.18911,-0.1295 0.1017,-0.3051 0.43089,-0.358 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7163-3"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 452.57798,1434.6551 11.12923,-1.6317 c 0.259,-0.038 0.41871,0.208 0.59558,0.4431 l 1.50759,2.0044 c 0.17693,0.2352 -0.1074,0.4817 -0.36511,0.5247 l -11.38645,1.8987 c -0.25749,0.043 -0.44999,-0.1804 -0.59556,-0.4433 l -1.22049,-2.2045 c -0.14557,-0.2629 0.0768,-0.5535 0.33521,-0.5914 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7165-9"/>
+              <path id="path7167-2" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 465.14481,1432.8122 4.899,-0.7203 c 0.25873,-0.038 0.40063,0.2129 0.59558,0.4201 l 1.77321,1.8851 c 0.19503,0.2073 -0.10774,0.4547 -0.36511,0.4976 l -5.17296,0.8626 c -0.2572,0.043 -0.42263,-0.1893 -0.59556,-0.4204 l -1.46937,-1.9639 c -0.17299,-0.2312 0.0771,-0.5229 0.33521,-0.5608 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 471.62681,1431.8596 4.86438,-0.7161 c 0.25852,-0.038 0.39723,0.2086 0.59563,0.405 l 1.80467,1.7862 c 0.19848,0.1964 -0.10793,0.4368 -0.36505,0.4797 l -5.0158,0.8364 c -0.25706,0.043 -0.40931,-0.1935 -0.59561,-0.4053 l -1.62336,-1.8453 c -0.18633,-0.2118 0.0772,-0.5026 0.33514,-0.5406 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7169-1"/>
+              <path id="path7171-9" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 478.00171,1430.898 4.18042,-0.6063 c 0.25845,-0.037 0.39724,0.201 0.59563,0.3902 l 1.80467,1.7213 c 0.19842,0.1893 -0.10819,0.4194 -0.36505,0.4622 l -4.17981,0.697 c -0.25679,0.043 -0.39478,-0.2008 -0.59561,-0.3906 l -1.83789,-1.7372 c -0.20084,-0.1898 0.1398,-0.4992 0.39764,-0.5366 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 483.79892,1430.0354 3.67118,-0.504 c 0.25839,-0.036 0.40547,0.171 0.60385,0.3528 l 1.80467,1.654 c 0.19844,0.1819 -0.10847,0.4013 -0.36505,0.4441 l -3.67879,0.6134 c -0.2565,0.043 -0.39478,-0.193 -0.59561,-0.3753 l -1.83789,-1.6694 c -0.20084,-0.1823 0.13971,-0.4802 0.39764,-0.5156 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7173-8"/>
+              <path id="path7175-2" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.09271,1429.2929 3.5803,-0.5261 c 0.25798,-0.038 0.40547,0.1653 0.60385,0.3409 l 1.80467,1.5984 c 0.19844,0.1758 -0.10847,0.3879 -0.36505,0.4292 l -3.67879,0.5928 c -0.2565,0.042 -0.39478,-0.1865 -0.59561,-0.3627 l -1.83789,-1.6133 c -0.20084,-0.1761 0.2311,-0.4213 0.48852,-0.4592 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 494.19377,1428.5433 3.20991,-0.4717 c 0.25793,-0.038 0.42396,0.1214 0.62227,0.2912 l 1.80473,1.5451 c 0.19845,0.1699 -0.10891,0.3722 -0.36504,0.4149 l -3.35786,0.5599 c -0.25623,0.043 -0.39548,-0.1795 -0.59562,-0.3506 l -1.8069,-1.5449 c -0.20009,-0.1711 0.23124,-0.4061 0.48851,-0.4439 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7177-3"/>
+              <path id="path7179-4" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 498.9165,1427.8332 2.74646,-0.3973 c 0.25789,-0.037 0.42394,0.1174 0.62227,0.2816 l 1.80473,1.4939 c 0.19847,0.1643 -0.10913,0.3585 -0.36504,0.4012 l -2.89441,0.4826 c -0.25611,0.043 -0.39548,-0.1736 -0.59562,-0.339 l -1.8069,-1.4938 c -0.20009,-0.1654 0.23134,-0.392 0.48851,-0.4292 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 503.16635,1427.2047 2.74646,-0.3835 c 0.25789,-0.036 0.42394,0.1133 0.62227,0.2718 l 1.80473,1.4421 c 0.19847,0.1586 -0.10913,0.3461 -0.36504,0.3873 l -2.89441,0.4659 c -0.25611,0.042 -0.39548,-0.1676 -0.59562,-0.3273 l -1.8069,-1.442 c -0.20009,-0.1597 0.23134,-0.3784 0.48851,-0.4143 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7181-0"/>
+              <path id="path7183-2" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 507.34415,1426.5781 2.48328,-0.359 c 0.25757,-0.037 0.42392,0.1096 0.62227,0.2629 l 1.80473,1.3947 c 0.19843,0.1533 -0.10958,0.3319 -0.36504,0.3745 l -2.63123,0.4387 c -0.25584,0.043 -0.39548,-0.1621 -0.59562,-0.3165 l -1.8069,-1.3946 c -0.20009,-0.1545 0.23168,-0.3636 0.48851,-0.4007 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 511.51931,1425.9526 1.99681,-0.2827 c 0.25755,-0.037 0.42389,0.1061 0.62227,0.2544 l 1.80473,1.3494 c 0.19847,0.1484 -0.10982,0.3196 -0.36504,0.3624 l -2.14476,0.3598 c -0.25564,0.043 -0.39548,-0.1568 -0.59562,-0.3062 l -1.8069,-1.3494 c -0.20009,-0.1495 0.23173,-0.3513 0.48851,-0.3877 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7185-3"/>
+              <path id="path7187-1" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 515.04488,1425.4534 1.99681,-0.2702 c 0.25755,-0.035 0.42389,0.1014 0.62227,0.2431 l 1.80473,1.2895 c 0.19847,0.1418 -0.10982,0.3054 -0.36504,0.3463 l -2.14476,0.3438 c -0.25564,0.041 -0.39548,-0.1498 -0.59562,-0.2926 l -1.8069,-1.2895 c -0.20009,-0.1428 0.23173,-0.3357 0.48851,-0.3704 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 518.52859,1424.9356 1.76656,-0.2279 c 0.25765,-0.033 0.41505,0.1117 0.62227,0.2355 l 2.03498,1.2156 c 0.20723,0.1238 -0.10982,0.2959 -0.36504,0.3356 l -2.14476,0.3331 c -0.25564,0.04 -0.39548,-0.1452 -0.59562,-0.2835 l -1.8069,-1.2495 c -0.20009,-0.1384 0.23167,-0.3258 0.48851,-0.3589 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7189-9"/>
+              <path id="path7191-8" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 450.58393,1431.1152 9.10708,-1.1496 c 0.25925,-0.033 0.42916,0.1753 0.59554,0.3916 l 1.42588,1.8534 c 0.16646,0.2164 -0.10732,0.4265 -0.36515,0.4637 l -9.40234,1.355 c -0.25759,0.037 -0.46337,-0.1516 -0.59552,-0.3917 l -1.10075,-1.9998 c -0.1322,-0.2402 0.0768,-0.49 0.33526,-0.5226 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 461.14009,1429.7827 5.07055,-0.6277 c 0.25912,-0.032 0.4291,0.1669 0.59554,0.373 l 1.42588,1.7652 c 0.16648,0.206 -0.10756,0.4044 -0.36515,0.4416 l -5.111,0.7365 c -0.2573,0.037 -0.43762,-0.1614 -0.59552,-0.3731 l -1.35556,-1.8178 c -0.15792,-0.2118 0.0769,-0.4657 0.33526,-0.4977 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7193-9"/>
+              <path id="path7195-8" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 467.76368,1428.9131 4.67261,-0.5673 c 0.25312,-0.031 0.41909,0.1617 0.58168,0.3611 l 1.3927,1.7087 c 0.16255,0.1995 -0.10505,0.3916 -0.35666,0.4275 l -4.71211,0.6726 c -0.25134,0.036 -0.42744,-0.1562 -0.58167,-0.3612 l -1.32401,-1.7596 c -0.15424,-0.205 0.0751,-0.4512 0.32746,-0.4818 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 473.8017,1428.1844 4.13261,-0.4996 c 0.25888,-0.031 0.42252,0.1618 0.59554,0.3486 l 1.47529,1.5921 c 0.17295,0.1866 -0.1075,0.3784 -0.36515,0.4127 l -4.28877,0.5706 c -0.2574,0.034 -0.43729,-0.1511 -0.59552,-0.3487 l -1.28926,-1.6105 c -0.15825,-0.1977 0.077,-0.434 0.33526,-0.4652 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7197-9"/>
+              <path id="path7199-1" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 479.37869,1427.4803 3.87442,-0.5106 c 0.25849,-0.034 0.41253,0.1699 0.59554,0.3448 l 1.60236,1.5308 c 0.18286,0.1746 -0.10794,0.371 -0.36515,0.4081 l -4.03058,0.5808 c -0.25698,0.037 -0.42586,-0.1592 -0.59552,-0.3448 l -1.41633,-1.5491 c -0.16973,-0.1856 0.0774,-0.426 0.33526,-0.46 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 484.58967,1426.8298 3.57896,-0.4467 c 0.25858,-0.032 0.40179,0.1753 0.59554,0.3304 l 1.79531,1.4368 c 0.19356,0.1549 -0.10792,0.3557 -0.36515,0.3911 l -3.73512,0.514 c -0.25693,0.035 -0.41319,-0.1656 -0.59552,-0.3304 l -1.60928,-1.4544 c -0.18242,-0.1649 0.0774,-0.4086 0.33526,-0.4408 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7201-3"/>
+              <path id="path7203-5" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.53231,1426.1828 3.35692,-0.441 c 0.25821,-0.034 0.40175,0.1702 0.59554,0.3208 l 1.79531,1.3946 c 0.19358,0.1504 -0.10828,0.3427 -0.36515,0.3797 l -3.51308,0.5063 c -0.25652,0.037 -0.41319,-0.1607 -0.59552,-0.3207 l -1.60928,-1.4118 c -0.18242,-0.16 0.0777,-0.3941 0.33526,-0.4279 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 494.30488,1425.5933 2.97943,-0.3895 c 0.25799,-0.034 0.40174,0.1625 0.59554,0.3062 l 1.79531,1.3311 c 0.19361,0.1436 -0.10852,0.3254 -0.36515,0.3624 l -3.13559,0.4519 c -0.25625,0.037 -0.41319,-0.1534 -0.59552,-0.3061 l -1.60928,-1.3475 c -0.18242,-0.1528 0.0779,-0.3749 0.33526,-0.4085 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7205-1"/>
+              <path id="path7207-4" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 498.68156,1425.0421 2.68932,-0.3501 c 0.25791,-0.034 0.40171,0.1562 0.59554,0.2944 l 1.79531,1.2798 c 0.1936,0.138 -0.10872,0.3114 -0.36515,0.3484 l -2.84548,0.4101 c -0.25612,0.037 -0.41319,-0.1475 -0.59552,-0.2943 l -1.60928,-1.2956 c -0.18242,-0.1469 0.0781,-0.3592 0.33526,-0.3927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 502.81699,1424.5193 2.68932,-0.3371 c 0.25791,-0.033 0.40171,0.1504 0.59554,0.2835 l 1.79531,1.2325 c 0.1936,0.1329 -0.10872,0.2999 -0.36515,0.3355 l -2.84548,0.395 c -0.25612,0.036 -0.41319,-0.1421 -0.59552,-0.2834 l -1.60928,-1.2478 c -0.18242,-0.1414 0.0781,-0.3459 0.33526,-0.3782 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7209-2"/>
+              <path id="path7211-5" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 506.81318,1424.0041 2.23999,-0.2893 c 0.25775,-0.033 0.40168,0.1457 0.59554,0.2745 l 1.79531,1.1933 c 0.19361,0.1287 -0.10906,0.288 -0.36515,0.3249 l -2.39615,0.3453 c -0.25586,0.037 -0.41319,-0.1376 -0.59552,-0.2744 l -1.60928,-1.2081 c -0.18242,-0.1369 0.0783,-0.333 0.33526,-0.3662 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 510.41945,1423.5572 2.23999,-0.278 c 0.25775,-0.032 0.40168,0.14 0.59554,0.2638 l 1.79531,1.1466 c 0.19361,0.1237 -0.10906,0.2767 -0.36515,0.3122 l -2.39615,0.3318 c -0.25586,0.036 -0.41319,-0.1322 -0.59552,-0.2637 l -1.60928,-1.1608 c -0.18242,-0.1316 0.0783,-0.32 0.33526,-0.3519 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7213-3"/>
+              <path id="path7215-8" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 514.00115,1423.0964 2.70057,-0.3596 c 0.25733,-0.034 0.40169,0.1356 0.59554,0.2555 l 1.79531,1.1106 c 0.19362,0.1198 -0.1094,0.2655 -0.36515,0.3024 l -2.85673,0.4117 c -0.2556,0.037 -0.41319,-0.1281 -0.59552,-0.2554 l -1.60928,-1.1244 c -0.18242,-0.1275 0.0787,-0.3066 0.33526,-0.3408 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path id="path7217-9" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 448.90855,1428.1161 5.63036,-0.6248 c 0.25928,-0.029 0.44294,0.1441 0.59554,0.3466 l 1.3325,1.7687 c 0.15272,0.2027 -0.10729,0.3777 -0.36515,0.4105 l -5.93657,0.7538 c -0.25763,0.033 -0.47664,-0.1265 -0.59552,-0.3467 l -0.99642,-1.8456 c -0.11894,-0.2203 0.0768,-0.4338 0.33526,-0.4625 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 456.07139,1427.3009 5.11456,-0.5881 c 0.25908,-0.03 0.44295,0.1407 0.59554,0.3385 l 1.3325,1.7273 c 0.15269,0.1979 -0.10734,0.3684 -0.36515,0.4009 l -5.10827,0.6437 c -0.25757,0.033 -0.44735,-0.1425 -0.59552,-0.3386 l -1.30892,-1.7321 c -0.14819,-0.1961 0.077,-0.4219 0.33526,-0.4516 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7219-2"/>
+              <path id="path7221-8" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 462.56281,1426.5463 4.61648,-0.5268 c 0.25902,-0.03 0.44291,0.1371 0.59554,0.33 l 1.3325,1.6838 c 0.15272,0.193 -0.10744,0.3584 -0.36515,0.3909 l -4.61019,0.581 c -0.25751,0.033 -0.44735,-0.1389 -0.59552,-0.3301 l -1.30892,-1.6886 c -0.14819,-0.1911 0.0771,-0.4107 0.33526,-0.4402 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 468.60056,1425.854 4.33762,-0.4931 c 0.25897,-0.029 0.44286,0.1332 0.59554,0.3208 l 1.3325,1.6368 c 0.15272,0.1876 -0.10754,0.3475 -0.36515,0.38 l -4.33133,0.5458 c -0.25745,0.032 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7223-7"/>
+              <path id="path7225-0" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 474.32467,1425.2135 3.86408,-0.4391 c 0.25887,-0.029 0.43837,0.137 0.59554,0.3208 l 1.33459,1.5614 c 0.15718,0.1839 -0.10826,0.3422 -0.36515,0.38 l -3.85988,0.5672 c -0.25667,0.038 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 479.60347,1424.6159 3.70783,-0.4235 c 0.25881,-0.029 0.42624,0.1482 0.59554,0.3208 l 1.45362,1.4828 c 0.16936,0.1728 -0.10753,0.3476 -0.36515,0.38 l -3.88516,0.4896 c -0.25743,0.032 -0.44364,-0.138 -0.59552,-0.3209 l -1.24642,-1.5009 c -0.15184,-0.1828 0.0772,-0.3984 0.33526,-0.4279 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7227-1"/>
+              <path id="path7229-4" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 484.88205,1424.0301 2.91038,-0.3245 c 0.25872,-0.029 0.41533,0.1566 0.59554,0.3134 l 1.60987,1.4015 c 0.18036,0.157 -0.10763,0.3387 -0.36515,0.3712 l -3.08771,0.3891 c -0.25725,0.032 -0.43066,-0.1467 -0.59552,-0.3135 l -1.40267,-1.4193 c -0.16473,-0.1666 0.0772,-0.3891 0.33526,-0.4179 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 489.26317,1423.5327 2.91038,-0.315 c 0.25872,-0.028 0.40668,0.1629 0.59554,0.3042 l 1.79737,1.345 c 0.18905,0.1415 -0.10763,0.3288 -0.36515,0.3604 l -3.08771,0.3777 c -0.25725,0.031 -0.42004,-0.154 -0.59552,-0.3043 l -1.59017,-1.3623 c -0.17535,-0.1502 0.0772,-0.3777 0.33526,-0.4057 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7231-8"/>
+              <path id="path7233-1" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 493.62818,1423.0779 2.91038,-0.3006 c 0.25872,-0.027 0.40668,0.1555 0.59554,0.2903 l 1.79737,1.2832 c 0.18905,0.135 -0.10763,0.3137 -0.36515,0.3438 l -3.08771,0.3604 c -0.25725,0.03 -0.42004,-0.1469 -0.59552,-0.2903 l -1.59017,-1.2998 c -0.17535,-0.1433 0.0772,-0.3603 0.33526,-0.387 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 497.91616,1422.631 2.45855,-0.2751 c 0.25841,-0.029 0.4067,0.1481 0.59554,0.2766 l 1.79737,1.2225 c 0.18905,0.1286 -0.10808,0.2951 -0.36515,0.3275 l -2.63588,0.3321 c -0.25685,0.032 -0.42004,-0.14 -0.59552,-0.2766 l -1.59017,-1.2383 c -0.17535,-0.1365 0.0776,-0.3399 0.33526,-0.3687 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7235-9"/>
+              <path id="path7237-3" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 501.78123,1422.2229 2.43762,-0.275 c 0.25829,-0.029 0.40672,0.142 0.59554,0.265 l 1.79737,1.1713 c 0.18905,0.1232 -0.10821,0.2815 -0.36515,0.3138 l -2.61495,0.3296 c -0.25674,0.032 -0.42004,-0.1341 -0.59552,-0.265 l -1.59017,-1.1865 c -0.17535,-0.1307 0.0777,-0.3241 0.33526,-0.3532 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 505.5518,1421.8696 2.11562,-0.238 c 0.25807,-0.029 0.40674,0.1323 0.59554,0.2471 l 1.79737,1.0922 c 0.18906,0.1148 -0.10848,0.2602 -0.36515,0.2926 l -2.29295,0.2889 c -0.25646,0.032 -0.42004,-0.125 -0.59552,-0.2471 l -1.59017,-1.1063 c -0.17535,-0.1219 0.0779,-0.3004 0.33526,-0.3294 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7239-5"/>
+              <path id="path7241-9" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 509.17441,1421.5029 1.86761,-0.2095 c 0.25786,-0.029 0.4067,0.1254 0.59554,0.234 l 1.79737,1.0338 c 0.18904,0.1087 -0.10869,0.2447 -0.36515,0.277 l -2.04494,0.2577 c -0.25618,0.032 -0.42004,-0.1183 -0.59552,-0.2339 l -1.59017,-1.0472 c -0.17535,-0.1154 0.078,-0.283 0.33526,-0.3119 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+              <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 512.35472,1421.1789 1.40841,-0.1539 c 0.25784,-0.028 0.40673,0.1193 0.59554,0.2227 l 1.79737,0.984 c 0.189,0.1035 -0.10889,0.2313 -0.36515,0.2636 l -1.58574,0.1998 c -0.25602,0.032 -0.42004,-0.1126 -0.59552,-0.2226 l -1.59017,-0.9967 c -0.17535,-0.1098 0.0781,-0.2688 0.33526,-0.2969 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7243-7"/>
+              <path id="path7245-9" transform="matrix(0.99360958,-0.1128716,0,1,0,0)" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 450.26701,1477.3135 6.35126,0.077 0.97049,1.2438 -6.64425,-0.031 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 454.46572,1425.7741 5.72964,-0.5831 1.2141,1.0589 -5.89416,0.7012 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7247-8"/>
+              <path id="path7249-0" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 461.19718,1425.0866 5.72964,-0.5831 1.29638,1.0032 -5.71936,0.6238 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 467.4812,1424.4577 5.01441,-0.5172 1.32369,0.9827 -4.96903,0.5151 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7251-1"/>
+              <path id="path7253-4" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 473.2652,1423.8598 4.71239,-0.4766 1.22552,0.9605 -4.66701,0.4745 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 478.62568,1423.325 4.22215,-0.3799 1.0076,0.8765 -4.07063,0.4241 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7255-7"/>
+              <path id="path7257-5" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 483.31976,1422.8503 4.10186,-0.4272 1.00482,0.8801 -4.10634,0.4479 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 488.02944,1422.373 3.94836,-0.4001 1.08523,0.8246 -4.10634,0.4479 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7259-5"/>
+              <path id="path7261-5" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 492.53573,1421.9164 4.0649,-0.4119 1.08523,0.8014 -4.10634,0.4353 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 497.12539,1421.4513 4.14103,-0.4196 1.08523,0.778 -4.10634,0.4226 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7263-0"/>
+              <path id="path7265-9" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 501.78284,1420.9794 4.08424,-0.4139 0.96099,0.7307 -3.9821,0.4343 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 506.50535,1420.4878 4.08424,-0.4009 0.96099,0.7078 -3.9821,0.4207 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7267-2"/>
             </g>
           </g>
         </g>
-        <path
-           d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-           style="opacity:0.68609864;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5308-5)"
-           transform="matrix(-0.10895274,-0.00499315,0,0.13734088,-540.78171,48.922546)"
-           id="path14178"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path14180"
-           style="fill:url(#radialGradient27907);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -633.28468,236.64301 c 0,1.35464 5.01483,2.68375 11.20093,2.96862 6.18611,0.28488 11.20093,-0.58235 11.20093,-1.937 0,-1.35465 -5.01482,-2.68376 -11.20093,-2.96863 -6.1861,-0.28488 -11.20093,0.58235 -11.20093,1.93701 z"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient18539);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14182"
-           sodipodi:cx="744.58344"
-           sodipodi:cy="1398.1375"
-           sodipodi:rx="104.29825"
-           sodipodi:ry="18.031223"
-           d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-           transform="matrix(-0.10233273,-0.00449822,0,0.12372753,-545.81173,67.142946)" />
-        <path
-           style="fill:url(#linearGradient18541);fill-opacity:1;stroke:none;filter:url(#filter5200-2)"
-           d="m 454.79268,1401.7435 c 0.0184,-0.5559 0.0186,-1.1123 6.2e-4,-1.6682 -0.0244,-0.7521 -0.0821,-1.5032 -0.17296,-2.2502 l 14.53854,-0.8732 -0.86471,4.5641 c -2.22704,0.3256 -4.47494,0.5085 -6.72533,0.5472 -2.26244,0.039 -4.52738,-0.068 -6.77611,-0.3197 l -5e-5,0"
-           id="path14184"
-           inkscape:path-effect="#path-effect6294-6"
-           inkscape:original-d="m 454.79268,1401.7435 c 0.32318,-0.7586 0.0627,-0.9297 6.2e-4,-1.6682 -0.0622,-0.7385 0.25383,-1.5451 -0.17296,-2.2502 l 14.53854,-0.8732 c -0.26236,1.9711 -0.58448,2.7627 -0.86471,4.5641 -2.23925,0.3472 -4.46092,0.4766 -6.72533,0.5472 -2.26442,0.071 -4.46873,0.083 -6.77611,-0.3197 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cscccscc"
-           transform="matrix(-0.51679698,0,0,0.51679698,-383.35164,-485.60858)" />
-        <path
-           transform="matrix(-0.04411365,-0.00232719,0,0.0441863,-589.22961,176.1898)"
-           d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-           sodipodi:ry="18.031223"
-           sodipodi:rx="104.29825"
-           sodipodi:cy="1398.1375"
-           sodipodi:cx="744.58344"
-           id="path14186"
-           style="fill:url(#radialGradient18543);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:nodetypes="cccscsscccc"
-           inkscape:connector-curvature="0"
-           id="path14188"
-           d="m -625.66949,232.93751 7.40198,0.48838 c -0.0695,0.72724 -0.17542,2.24848 0.01,2.80398 0.0254,0.0336 0.0399,0.0665 0.0399,0.0996 0,0 3e-5,0.005 0,0.005 -0.009,0.37845 -1.72986,0.59064 -3.85049,0.47509 -2.12648,-0.11597 -3.85049,-0.51659 -3.85049,-0.89706 0,-0.005 -4.4e-4,-0.0114 0,-0.0165 4.2e-4,-0.007 0.002,-0.0129 0.004,-0.0196 0.30501,-0.98765 0.3569,-2.15137 0.24584,-2.93685 z"
-           style="fill:url(#radialGradient27901);fill-opacity:1;stroke:none" />
-        <path
-           id="path14190"
-           style="fill:#8e959f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -602.1265,201.86763 -37.12947,2.95065 c -0.37364,0.0295 -0.65254,0.30253 -0.67656,0.67654 l -1.57866,24.58191 c -0.024,0.37406 0.38284,0.6089 0.67657,0.67659 11.86244,2.87644 25.00515,3.21401 37.73736,3.04451 0.37361,0.0305 0.66096,-0.30207 0.67657,-0.67654 l 1.27454,-30.58064 c 0.0156,-0.37447 -0.33629,-0.72418 -0.98035,-0.67302 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ssssccsss" />
-        <path
-           sodipodi:nodetypes="ssssccsss"
-           inkscape:connector-curvature="0"
-           d="m -602.238,201.95378 -37.49305,2.78145 c -0.37379,0.0279 -0.65254,0.30253 -0.67656,0.67659 l -1.57866,24.58186 c -0.024,0.37406 0.38284,0.60884 0.67657,0.67659 11.86243,2.87639 25.00515,3.21407 37.73736,3.04456 0.3736,0.03 0.66014,-0.30212 0.67657,-0.67659 l 1.33433,-30.40792 c 0.0164,-0.37442 -0.30277,-0.70429 -0.67656,-0.67654 z"
-           style="fill:url(#radialGradient27897);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.17009941;stroke-miterlimit:4;stroke-opacity:1"
-           id="path14192" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m -603.46616,203.83311 -36.05815,2.48078 -1.35314,21.57493 36.00836,2.40559 z"
-           inkscape:path-effect="#path-effect17541"
-           id="path14194"
-           d="m -603.46616,203.83311 -36.05815,2.48078 -1.35314,21.57493 36.00836,2.40559 1.40293,-26.4613"
-           style="fill:url(#linearGradient27894);fill-opacity:1;stroke:#666666;stroke-width:0.10631213px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           id="path14196"
-           d="m -602.95088,232.97824 c -0.0164,0.37442 -0.3031,0.70786 -0.67544,0.67773 -12.68892,0.1695 -25.78708,-0.16678 -37.60919,-3.04316 -0.29273,-0.0677 -0.69606,-0.30373 -0.67212,-0.67778 l 0.0596,-0.93685 c 0.12148,0.21969 0.39712,0.36206 0.61253,0.41193 11.82211,2.87639 24.92027,3.21273 37.60919,3.04322 0.68217,-0.006 0.67165,-0.0566 0.67544,0.52491 z"
-           style="fill:url(#linearGradient27891);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-        <path
-           transform="matrix(-0.1040531,0.02567059,0.01139083,0.09856866,-561.28107,76.432683)"
-           d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z"
-           sodipodi:ry="6.5625"
-           sodipodi:rx="5.0625"
-           sodipodi:cy="1324.2997"
-           sodipodi:cx="874.3125"
-           id="path14198"
-           style="fill:url(#radialGradient18553);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 z"
-           inkscape:path-effect="#path-effect17532"
-           id="path14200"
-           d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 1.40294,-26.4613"
-           style="fill:url(#linearGradient27887);fill-opacity:1;stroke:#666666;stroke-width:0.10631213px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           style="opacity:0.27354264;fill:url(#linearGradient27884);fill-opacity:1;stroke:#666666;stroke-width:0.10631213px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 1.40294,-26.4613"
-           id="path14202"
-           inkscape:path-effect="#path-effect17527"
-           inkscape:original-d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 z"
-           inkscape:path-effect="#path-effect17522"
-           id="path14204"
-           d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 1.40294,-26.4613"
-           style="opacity:0.63677135;fill:url(#linearGradient27881);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.10631213px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           id="path14206"
-           style="opacity:0.24215249;fill:url(#linearGradient27878);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -602.238,201.95378 -37.49305,2.78145 c -0.37379,0.0279 -1.04036,0.58631 -0.67656,0.67659 26.12479,-1.70378 29.73712,27.96905 36.83527,28.30301 0.3736,0.03 0.66014,-0.30212 0.67657,-0.67659 l 1.33433,-30.40792 c 0.0164,-0.37442 -0.30277,-0.70429 -0.67656,-0.67654 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ssccsss" />
-        <path
-           transform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.0752,0.4655 0.0673,0.7 -0.0199,0.8786 -0.0872,0.1786 -0.2537,0.3014 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 z"
-           inkscape:path-effect="#path-effect6808-1"
-           id="path14210"
-           d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.10844,0.2803 0.10113,0.6035 -0.0199,0.8786 -0.10048,0.2284 -0.27746,0.4224 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 -12.37498,-23.875"
-           style="opacity:0.8699552;fill:#5e6b6a;fill-opacity:1;stroke:none;filter:url(#filter7271-4)"
-           sodipodi:nodetypes="ccccscccccc" />
-        <path
-           sodipodi:nodetypes="ccccscccccc"
-           style="fill:#a5b0af;fill-opacity:1;stroke:none"
-           d="m -606.67788,240.24759 -34.91817,-3.36251 -10.7341,5.94906 -1.04269,0.23438 c -0.0561,0.14501 -0.0523,0.31217 0.0103,0.45449 0.052,0.11816 0.14353,0.2185 0.25645,0.28105 l 38.40998,9.18218 0.71131,0.0647 0.64663,-0.0647 0.25865,-0.38798 6.40164,-12.35067"
-           id="path14212"
-           inkscape:path-effect="#path-effect17487"
-           inkscape:original-d="m -606.67788,240.24759 -34.91817,-3.36251 -10.7341,5.94906 -1.04269,0.23438 c -0.0389,0.24081 -0.0348,0.36213 0.0103,0.45449 0.0451,0.0924 0.13124,0.15591 0.25645,0.28105 l 38.40998,9.18218 0.71131,0.0647 0.64663,-0.0647 0.25865,-0.38798 z"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccscccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m -606.67788,239.66558 -34.91817,-3.36244 -10.7341,5.94899 -0.91742,0.58201 c -0.12343,0.0662 -0.1836,0.17193 -0.12019,0.23401 0.0634,0.0621 0.1413,0.1391 0.18486,0.15397 l 38.48677,9.18218 0.7113,0.0646 0.64663,-0.0646 0.25866,-0.38798 z"
-           inkscape:path-effect="#path-effect17484"
-           id="path14214"
-           d="m -606.67788,239.66558 -34.91817,-3.36244 c -3.68245,1.78625 -7.26756,3.77317 -10.7341,5.94899 -0.30674,0.19253 -0.61255,0.38654 -0.91742,0.58201 -0.0443,0.018 -0.0817,0.0522 -0.10355,0.0947 -0.0218,0.0425 -0.0278,0.0929 -0.0166,0.13932 0.0101,0.0418 0.0339,0.0801 0.0669,0.1076 0.033,0.0275 0.075,0.044 0.11793,0.0464 l 38.48677,9.18218 0.7113,0.0646 0.64663,-0.0646 0.25866,-0.38798 6.40166,-12.35074"
-           style="fill:url(#linearGradient27873);fill-opacity:1;stroke:none" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -606.67788,239.66765 -0.9826,1.89215 0.14394,1.49864 0.97941,-1.70571 z"
-           style="fill:#717c7d;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-           id="path14216" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m -607.51504,243.05523 -0.86622,-0.10791 0.72131,-1.38522 z"
-           inkscape:path-effect="#path-effect17478"
-           id="path14218"
-           d="m -607.51504,243.05523 -0.86622,-0.10791 0.72131,-1.38522 0.14491,1.49313"
-           style="fill:#5d686c;fill-opacity:1;stroke:none" />
-        <path
-           sodipodi:nodetypes="cssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -613.13567,248.88891 -3.09151,-0.63194 c -0.17757,-0.0365 -0.30567,0.0879 -0.40701,0.23815 l -1.11246,1.64991 c -0.10133,0.15029 0.0728,0.31162 0.2495,0.35186 l 3.23277,0.73625 c 0.17618,0.0425 0.31908,-0.0796 0.40699,-0.23809 l 0.95079,-1.71455 c 0.0879,-0.15853 -0.0528,-0.34959 -0.22907,-0.39159 z"
-           style="fill:url(#linearGradient27868);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14222" />
-        <path
-           inkscape:transform-center-y="0.95777293"
-           inkscape:transform-center-x="0.50002642"
-           id="path14224"
-           style="fill:url(#linearGradient27865);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -617.26403,248.00539 -3.09167,-0.60525 c -0.17757,-0.0347 -0.30568,0.0842 -0.40702,0.22808 l -1.11252,1.58016 c -0.10133,0.14397 0.0523,0.33656 0.2291,0.375 l 3.01291,0.65542 c 0.17683,0.0388 0.30309,-0.0858 0.40701,-0.22803 l 1.1913,-1.63044 c 0.10392,-0.14226 -0.0528,-0.3348 -0.22908,-0.37505 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cssssssssc" />
-        <path
-           sodipodi:nodetypes="csssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -621.22427,247.218 -2.56921,-0.52414 c -0.15852,-0.0321 -0.25605,0.0959 -0.36218,0.22891 l -1.16779,1.46418 c -0.10615,0.13311 0.0459,0.34034 0.20386,0.37634 l 2.59566,0.59175 c 0.15803,0.0357 0.26196,-0.0915 0.36217,-0.22886 l 1.1454,-1.57028 c 0.0569,-0.078 0.0301,-0.13719 -0.0289,-0.21448 -0.045,-0.059 -0.17803,-0.12725 -0.17896,-0.12353 z"
-           style="fill:url(#linearGradient27862);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14226"
-           inkscape:transform-center-x="0.44493633"
-           inkscape:transform-center-y="0.9612254" />
-        <path
-           inkscape:transform-center-y="0.93458356"
-           inkscape:transform-center-x="0.44493633"
-           id="path14228"
-           style="fill:url(#linearGradient27859);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -624.62404,246.50499 -3.19717,-0.62578 c -0.15846,-0.031 -0.36059,0.0445 -0.47675,0.16517 l -1.32782,1.37785 c -0.11616,0.12053 0.0461,0.33004 0.20386,0.36589 l 3.49822,0.79463 c 0.15778,0.0357 0.26197,-0.0889 0.36217,-0.22249 l 1.1454,-1.52673 c 0.0569,-0.0758 0.0301,-0.13341 -0.0289,-0.20852 -0.045,-0.0574 -0.17803,-0.12374 -0.17896,-0.12012 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssssssssc" />
-        <path
-           sodipodi:nodetypes="csssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -628.89454,245.65154 -11.61553,-2.39295 c -0.15796,-0.0326 -0.34804,0.0567 -0.47676,0.16015 l -1.40056,1.12592 c -0.12842,0.1032 0.0463,0.31908 0.20386,0.35477 l 11.69311,2.64597 c 0.15754,0.0357 0.32714,0.005 0.43895,-0.11474 l 1.36484,-1.46056 c 0.0634,-0.0679 0.0301,-0.12938 -0.0289,-0.20222 -0.045,-0.0556 -0.17792,-0.11991 -0.17896,-0.11644 z"
-           style="fill:url(#linearGradient27856);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14230"
-           inkscape:transform-center-x="0.44493633"
-           inkscape:transform-center-y="0.90626211" />
-        <path
-           sodipodi:nodetypes="csssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -641.47588,243.0646 -1.69257,-0.35126 c -0.1296,-0.0269 -0.28199,0.0541 -0.39079,0.13538 l -1.50462,1.12431 c -0.10995,0.0822 0.0378,0.27056 0.1671,0.29994 l 1.75729,0.39916 c 0.12937,0.0295 0.18724,-0.10046 0.29687,-0.18241 l 1.5,-1.12152 c 0.0621,-0.0465 0.0589,-0.14934 0.0106,-0.21096 -0.0369,-0.0471 -0.14284,-0.0956 -0.14384,-0.0927 z"
-           style="fill:url(#linearGradient27853);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14232"
-           inkscape:transform-center-x="0.36471052"
-           inkscape:transform-center-y="0.76615965" />
-        <path
-           inkscape:transform-center-y="0.74552444"
-           inkscape:transform-center-x="0.36471052"
-           id="path14234"
-           style="fill:url(#linearGradient27850);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -643.98928,242.53694 -1.39536,-0.27893 c -0.12969,-0.0259 -0.282,0.0527 -0.3908,0.13176 l -1.50463,1.094 c -0.10993,0.0799 0.0379,0.26305 0.16711,0.29187 l 1.46009,0.32553 c 0.1294,0.029 0.18724,-0.0978 0.29687,-0.17748 l 1.5,-1.09131 c 0.0621,-0.0455 0.0589,-0.14532 0.0106,-0.20527 -0.0369,-0.046 -0.14284,-0.093 -0.14384,-0.0903 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssssssssc" />
-        <path
-           sodipodi:nodetypes="csssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -646.09506,242.09744 -1.39537,-0.272 c -0.12969,-0.0254 -0.282,0.0512 -0.39079,0.1285 l -1.50463,1.06684 c -0.10994,0.078 0.0379,0.25653 0.1671,0.28462 l 1.46009,0.31747 c 0.1294,0.0285 0.18724,-0.0953 0.29687,-0.17309 l 1.5,-1.06425 c 0.0621,-0.0445 0.0589,-0.14169 0.0106,-0.20015 -0.0369,-0.045 -0.14283,-0.0907 -0.14384,-0.088 z"
-           style="fill:url(#linearGradient27847);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14236"
-           inkscape:transform-center-x="0.36471052"
-           inkscape:transform-center-y="0.72705418" />
-        <path
-           inkscape:transform-center-y="0.72705418"
-           inkscape:transform-center-x="0.36471052"
-           id="path14238"
-           style="fill:url(#linearGradient27844);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -648.23895,241.67165 -0.93813,-0.19275 c -0.12943,-0.0264 -0.27425,0.0635 -0.39079,0.1285 l -1.72997,0.96487 c -0.11771,0.0657 0.0381,0.2553 0.1671,0.28463 l 1.30978,0.2975 c 0.12919,0.0295 0.18781,-0.0946 0.29686,-0.17309 l 1.41842,-1.02158 c 0.062,-0.0445 0.0589,-0.14169 0.0106,-0.20014 -0.0369,-0.045 -0.14289,-0.0907 -0.14384,-0.0881 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssssssssc" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -611.82035,246.48445 -7.61506,-1.29047 c -0.17764,-0.03 -0.30275,0.0751 -0.40701,0.19704 l -1.0471,1.22452 c -0.10428,0.12198 0.0731,0.25653 0.24951,0.29119 l 7.84666,1.54339 c 0.17628,0.0347 0.33082,-0.0587 0.40699,-0.1971 l 0.79508,-1.44452 c 0.0761,-0.13838 -0.0519,-0.29404 -0.22907,-0.32405 z"
-           style="fill:url(#linearGradient27841);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14240" />
-        <path
-           id="path14242"
-           style="fill:url(#linearGradient27838);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -620.38142,245.04319 -2.45147,-0.42492 c -0.17716,-0.0305 -0.30075,0.0716 -0.40701,0.18261 l -1.10607,1.15618 c -0.10633,0.11117 0.0735,0.23522 0.2495,0.26983 l 2.52361,0.4964 c 0.17581,0.0347 0.31065,-0.0688 0.40699,-0.1826 l 1.01353,-1.19726 c 0.0964,-0.11386 -0.0524,-0.26962 -0.22908,-0.30024 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -623.73445,244.46551 -2.20142,-0.38679 c -0.17681,-0.031 -0.30074,0.0684 -0.40701,0.17459 l -1.10607,1.10533 c -0.10633,0.10626 0.0738,0.22338 0.2495,0.25793 l 2.22685,0.43801 c 0.17553,0.0347 0.30742,-0.0687 0.40699,-0.17459 l 1.06023,-1.12747 c 0.0996,-0.10595 -0.0526,-0.25602 -0.22907,-0.28701 z"
-           style="fill:url(#linearGradient27835);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14244" />
-        <path
-           id="path14246"
-           style="fill:url(#linearGradient27832);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -626.88056,243.9167 -2.03439,-0.34825 c -0.17205,-0.0295 -0.29263,0.0653 -0.39604,0.16678 l -1.07627,1.05577 c -0.10346,0.10144 0.0718,0.21334 0.24279,0.24634 l 2.05913,0.39719 c 0.17083,0.0331 0.29913,-0.0657 0.39602,-0.16678 l 1.03166,-1.07693 c 0.0969,-0.10118 -0.0512,-0.24473 -0.2229,-0.27412 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -629.85964,243.41424 -1.80905,-0.31421 c -0.17172,-0.03 -0.29263,0.0621 -0.39604,0.15845 l -1.07626,1.00311 c -0.10346,0.0964 0.0722,0.20056 0.24278,0.23408 l 1.8338,0.36072 c 0.17045,0.0336 0.29913,-0.0624 0.39602,-0.15845 l 1.03165,-1.02323 c 0.0969,-0.0961 -0.0515,-0.23067 -0.2229,-0.26047 z"
-           style="fill:url(#linearGradient27829);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14248" />
-        <path
-           id="path14250"
-           style="fill:url(#linearGradient27826);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -632.59631,242.9526 -1.57883,-0.27138 c -0.17154,-0.0295 -0.29262,0.0588 -0.39603,0.15002 l -1.07627,0.94977 c -0.10345,0.0913 0.0726,0.1882 0.24278,0.22167 l 1.60358,0.3154 c 0.17018,0.0336 0.29913,-0.0591 0.39602,-0.15002 l 1.03166,-0.96881 c 0.0969,-0.091 -0.0517,-0.21722 -0.22291,-0.24665 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -634.99399,242.54796 -1.57882,-0.25803 c -0.17155,-0.0279 -0.29263,0.0559 -0.39604,0.14262 l -1.07627,0.90322 c -0.10345,0.0868 0.0726,0.17899 0.24279,0.2108 l 1.60357,0.29993 c 0.17018,0.0321 0.29913,-0.0562 0.39602,-0.14267 l 1.03166,-0.92127 c 0.0969,-0.0866 -0.0517,-0.20656 -0.22291,-0.2346 z"
-           style="fill:url(#linearGradient27823);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14252" />
-        <path
-           id="path14254"
-           style="fill:url(#linearGradient27820);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -637.42016,242.12584 -1.39759,-0.23962 c -0.17115,-0.0295 -0.29264,0.0535 -0.39604,0.13657 l -1.07626,0.86489 c -0.10349,0.0831 0.0731,0.16848 0.24278,0.20185 l 1.42233,0.27976 c 0.16965,0.0331 0.29913,-0.0538 0.39602,-0.13662 l 1.03166,-0.88216 c 0.0969,-0.0829 -0.0521,-0.19539 -0.2229,-0.22467 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -639.63076,241.76129 -1.39758,-0.22611 c -0.17115,-0.0279 -0.29264,0.0507 -0.39604,0.12886 l -1.07627,0.81605 c -0.10348,0.0784 0.0731,0.15897 0.24279,0.19042 l 1.42233,0.26398 c 0.16965,0.031 0.29913,-0.0507 0.39602,-0.12891 l 1.03166,-0.83235 c 0.0969,-0.0782 -0.0521,-0.18431 -0.22291,-0.21194 z"
-           style="fill:url(#linearGradient27817);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14256" />
-        <path
-           id="path14258"
-           style="fill:url(#linearGradient27814);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -641.7818,241.38837 -1.39759,-0.21644 c -0.17115,-0.0269 -0.29264,0.0486 -0.39604,0.12332 l -1.07626,0.78118 c -0.10348,0.0751 0.0731,0.15215 0.24278,0.18225 l 1.42233,0.25271 c 0.16965,0.0295 0.29913,-0.0486 0.39602,-0.12338 l 1.03166,-0.79681 c 0.0969,-0.0748 -0.0521,-0.1764 -0.2229,-0.20283 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -643.93755,241.04188 -1.3579,-0.2301 c -0.17065,-0.029 -0.29264,0.0465 -0.39604,0.11815 l -1.07626,0.74849 c -0.10348,0.0719 0.0731,0.14578 0.24278,0.17465 l 1.42234,0.24209 c 0.16965,0.0285 0.29946,-0.046 0.39602,-0.1182 l 0.99195,-0.74073 c 0.0966,-0.0721 -0.0526,-0.16549 -0.22289,-0.19435 z"
-           style="fill:url(#linearGradient27811);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14260" />
-        <path
-           id="path14262"
-           style="fill:url(#linearGradient27808);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -646.1406,240.66859 -1.25223,-0.20134 c -0.17064,-0.0274 -0.28837,0.0512 -0.39604,0.11257 l -1.20047,0.68129 c -0.10793,0.0613 0.0731,0.1389 0.24278,0.16642 l 1.42233,0.23066 c 0.16965,0.0269 0.29819,-0.0455 0.39602,-0.11261 l 1.01052,-0.6918 c 0.0978,-0.067 -0.0526,-0.15783 -0.22291,-0.18519 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           id="path14264"
-           style="fill:url(#linearGradient27805);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -610.72735,244.60224 -5.75722,-0.84409 c -0.13398,-0.0197 -0.2166,0.1076 -0.3081,0.22922 l -0.77988,1.03689 c -0.0915,0.12166 0.0556,0.24918 0.18887,0.27143 l 5.89028,0.98221 c 0.1332,0.0222 0.23279,-0.0933 0.30809,-0.22933 l 0.63136,-1.1404 c 0.0753,-0.136 -0.0397,-0.28633 -0.1734,-0.30593 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -617.22825,243.64889 -2.53428,-0.37261 c -0.13385,-0.0197 -0.20725,0.11013 -0.3081,0.21732 l -0.91729,0.97517 c -0.10089,0.10724 0.0557,0.23522 0.18887,0.25741 l 2.676,0.44623 c 0.13306,0.0222 0.21863,-0.0979 0.30809,-0.21747 l 0.76012,-1.01594 c 0.0895,-0.1196 -0.0399,-0.2705 -0.17341,-0.29011 z"
-           style="fill:url(#linearGradient27802);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14266" />
-        <path
-           id="path14268"
-           style="fill:url(#linearGradient27799);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -620.58143,243.15611 -2.51637,-0.37045 c -0.13374,-0.0197 -0.20549,0.10792 -0.30812,0.20952 l -0.93357,0.92401 c -0.10268,0.10159 0.0558,0.22596 0.18884,0.24815 l 2.5947,0.43267 c 0.13298,0.0222 0.21175,-0.10009 0.30812,-0.20966 l 0.83977,-0.95459 c 0.0964,-0.10956 -0.0399,-0.26 -0.17337,-0.27965 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -623.8792,242.65866 -2.16256,-0.31364 c -0.1337,-0.0191 -0.2055,0.10398 -0.30813,0.20186 l -0.93356,0.89043 c -0.10265,0.0979 0.056,0.21696 0.18884,0.23911 l 2.16224,0.36056 c 0.13284,0.0222 0.20422,-0.10388 0.30812,-0.20206 l 0.95075,-0.89867 c 0.10389,-0.0982 -0.0723,-0.25824 -0.2057,-0.27759 z"
-           style="fill:url(#linearGradient27796);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14270" />
-        <path
-           id="path14272"
-           style="fill:url(#linearGradient27793);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -626.87814,242.21244 -1.89912,-0.26072 c -0.13367,-0.0186 -0.20975,0.0884 -0.31238,0.1825 l -0.93356,0.85563 c -0.10266,0.0941 0.0561,0.20759 0.18884,0.22973 l 1.90306,0.31732 c 0.13269,0.0222 0.20422,-0.0998 0.30811,-0.19415 l 0.95075,-0.86359 c 0.1039,-0.0943 -0.0723,-0.24841 -0.2057,-0.26672 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -629.61665,241.82834 -1.85211,-0.27216 c -0.13345,-0.0197 -0.20975,0.0855 -0.31237,0.17635 l -0.93357,0.82687 c -0.10265,0.0909 0.0561,0.20066 0.18884,0.22202 l 1.90306,0.30666 c 0.13269,0.0217 0.20423,-0.0965 0.30812,-0.18763 l 0.95075,-0.83456 c 0.10389,-0.0911 -0.11955,-0.21795 -0.25272,-0.23755 z"
-           style="fill:url(#linearGradient27790);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14274" />
-        <path
-           id="path14276"
-           style="fill:url(#linearGradient27787);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -632.25546,241.44056 -1.6605,-0.24401 c -0.13343,-0.0197 -0.21932,0.0628 -0.32191,0.15064 l -0.9336,0.79929 c -0.10266,0.0879 0.0563,0.19254 0.18884,0.21463 l 1.73704,0.28964 c 0.13255,0.0222 0.20459,-0.0928 0.30812,-0.18137 l 0.93472,-0.79918 c 0.10351,-0.0885 -0.11962,-0.21008 -0.25271,-0.22964 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -634.69855,241.07322 -1.42077,-0.20552 c -0.1334,-0.0191 -0.2193,0.0607 -0.3219,0.14567 l -0.9336,0.77281 c -0.10267,0.085 0.0565,0.18545 0.18884,0.20754 l 1.4973,0.24965 c 0.13248,0.0222 0.20458,-0.0898 0.30811,-0.17537 l 0.93473,-0.77275 c 0.1035,-0.0856 -0.11968,-0.20278 -0.25271,-0.22203 z"
-           style="fill:url(#linearGradient27784);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14278" />
-        <path
-           id="path14280"
-           style="fill:url(#linearGradient27781);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -636.89703,240.7481 -1.42076,-0.19839 c -0.13341,-0.0186 -0.21931,0.0586 -0.3219,0.1406 l -0.9336,0.74601 c -0.10267,0.0821 0.0565,0.17904 0.18884,0.20036 l 1.49729,0.24101 c 0.13249,0.0217 0.20459,-0.0867 0.30812,-0.16932 l 0.93472,-0.74595 c 0.10351,-0.0826 -0.11968,-0.19575 -0.25271,-0.21432 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -639.05823,240.42395 -1.28462,-0.18571 c -0.13324,-0.0191 -0.21929,0.0567 -0.3219,0.136 l -0.9336,0.72149 c -0.10265,0.0793 0.0567,0.17169 0.18884,0.19373 l 1.36115,0.22694 c 0.13235,0.0222 0.20458,-0.0839 0.30812,-0.16373 l 0.93472,-0.72143 c 0.10351,-0.0799 -0.11985,-0.18809 -0.25271,-0.20729 z"
-           style="fill:url(#linearGradient27778);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14282" />
-        <path
-           id="path14284"
-           style="fill:url(#linearGradient27775);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -641.21807,240.10038 -1.03296,-0.14624 c -0.13323,-0.0191 -0.21928,0.0549 -0.3219,0.1316 l -0.9336,0.69805 c -0.10267,0.0768 0.0568,0.16533 0.18883,0.18747 l 1.1095,0.18613 c 0.13225,0.0222 0.20459,-0.0811 0.30812,-0.1584 l 0.93472,-0.69805 c 0.10351,-0.0773 -0.11987,-0.18173 -0.25271,-0.20056 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -643.04187,239.84214 -1.03296,-0.13978 c -0.13323,-0.0181 -0.21928,0.0525 -0.3219,0.12576 l -0.9336,0.66707 c -0.10267,0.0734 0.0568,0.15798 0.18883,0.17914 l 1.1095,0.17785 c 0.13225,0.0212 0.20459,-0.0775 0.30812,-0.15136 l 0.93472,-0.66707 c 0.10351,-0.0739 -0.11987,-0.17366 -0.25271,-0.19161 z"
-           style="fill:url(#linearGradient27772);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14286" />
-        <path
-           id="path14288"
-           style="fill:url(#linearGradient27769);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -644.84401,239.57428 -0.91385,-0.11789 c -0.13329,-0.0171 -0.21471,0.0578 -0.32191,0.12182 l -1.0527,0.62884 c -0.1072,0.064 0.0568,0.15307 0.18883,0.1736 l 1.1095,0.17232 c 0.13224,0.0207 0.20458,-0.0751 0.30812,-0.14666 l 0.93472,-0.64637 c 0.1035,-0.0716 -0.11985,-0.16854 -0.25271,-0.18566 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -609.69582,242.77102 -4.71114,-0.59469 c -0.13412,-0.0171 -0.22201,0.0907 -0.30808,0.20258 l -0.73762,0.95877 c -0.0861,0.11195 0.0555,0.22063 0.1889,0.23988 l 4.86388,0.70094 c 0.13326,0.0191 0.23971,-0.0784 0.30807,-0.20262 l 0.56943,-1.03451 c 0.0684,-0.12426 -0.0397,-0.25348 -0.17344,-0.27035 z"
-           style="fill:url(#linearGradient27766);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14290" />
-        <path
-           id="path14292"
-           style="fill:url(#linearGradient27763);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -615.15658,242.08171 -2.62303,-0.32471 c -0.13405,-0.0165 -0.22198,0.0863 -0.30808,0.19295 l -0.73761,0.91315 c -0.0861,0.10657 0.0556,0.2092 0.18889,0.22845 l 2.64395,0.38099 c 0.13311,0.0191 0.22639,-0.0835 0.30807,-0.19301 l 0.70124,-0.94035 c 0.0817,-0.10957 -0.0398,-0.24091 -0.17343,-0.25747 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -618.58301,241.63186 -2.41717,-0.29346 c -0.13094,-0.0161 -0.21679,0.0836 -0.3009,0.1868 l -0.72046,0.88392 c -0.0841,0.1032 0.0543,0.20257 0.18451,0.22114 l 2.4376,0.34795 c 0.13002,0.0186 0.22112,-0.0808 0.3009,-0.18686 l 0.68492,-0.91025 c 0.0798,-0.10604 -0.0389,-0.2334 -0.1694,-0.24924 z"
-           style="fill:url(#linearGradient27760);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14294" />
-        <path
-           id="path14296"
-           style="fill:url(#linearGradient27757);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -621.70651,241.2549 -2.13783,-0.25844 c -0.13392,-0.0161 -0.21857,0.0837 -0.30808,0.18033 l -0.76317,0.82361 c -0.0895,0.0965 0.0556,0.19574 0.18889,0.21348 l 2.21861,0.29518 c 0.13316,0.0176 0.22622,-0.0782 0.30807,-0.18039 l 0.66694,-0.83311 c 0.0819,-0.10228 -0.0399,-0.22452 -0.17343,-0.24066 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -624.59152,240.89067 -2.00426,-0.26414 c -0.13372,-0.0176 -0.21341,0.0879 -0.30808,0.17837 l -0.82891,0.79189 c -0.0946,0.0903 0.0558,0.19192 0.18889,0.21111 l 2.08505,0.30046 c 0.13293,0.0191 0.2203,-0.0824 0.30806,-0.17837 l 0.73268,-0.80136 c 0.0878,-0.096 -0.04,-0.22037 -0.17343,-0.23796 z"
-           style="fill:url(#linearGradient27754);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14298" />
-        <path
-           id="path14300"
-           style="fill:url(#linearGradient27751);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -627.28719,240.55416 -1.85143,-0.23108 c -0.13376,-0.0165 -0.20784,0.0907 -0.30807,0.17092 l -0.92873,0.74326 c -0.10013,0.0801 0.0558,0.18401 0.1889,0.20232 l 1.9322,0.2659 c 0.13291,0.0181 0.21375,-0.0857 0.30806,-0.17092 l 0.8325,-0.75237 c 0.0944,-0.0853 -0.0401,-0.21137 -0.17343,-0.22803 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -629.84405,240.21947 -1.73656,-0.22814 c -0.13358,-0.0176 -0.20783,0.088 -0.30808,0.16595 l -0.92872,0.72144 c -0.10014,0.0778 0.056,0.17728 0.18889,0.19642 l 1.81734,0.26191 c 0.1327,0.0191 0.21375,-0.0831 0.30807,-0.1659 l 0.83249,-0.73033 c 0.0944,-0.0828 -0.0402,-0.20387 -0.17343,-0.22135 z"
-           style="fill:url(#linearGradient27748);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14302" />
-        <path
-           id="path14304"
-           style="fill:url(#linearGradient27745);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -632.31294,239.91451 -1.54127,-0.20149 c -0.13346,-0.0176 -0.20783,0.0841 -0.30808,0.1584 l -0.92873,0.68858 c -0.10015,0.0743 0.0562,0.16834 0.1889,0.18748 l 1.62206,0.23377 c 0.13256,0.0191 0.21374,-0.0794 0.30807,-0.15835 l 0.83249,-0.69707 c 0.0944,-0.079 -0.0403,-0.19394 -0.17344,-0.21132 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -634.57702,239.62937 -1.3912,-0.18111 c -0.13342,-0.0176 -0.20781,0.0808 -0.30808,0.1523 l -0.92872,0.66205 c -0.10015,0.0714 0.0562,0.16109 0.18889,0.18022 l 1.47199,0.21215 c 0.13249,0.0191 0.21374,-0.0763 0.30806,-0.15224 l 0.83249,-0.67022 c 0.0944,-0.076 -0.0404,-0.18582 -0.17343,-0.20315 z"
-           style="fill:url(#linearGradient27742);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14306" />
-        <path
-           id="path14308"
-           style="fill:url(#linearGradient27739);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -636.7163,239.35892 -1.3912,-0.17438 c -0.13342,-0.0171 -0.20781,0.0778 -0.30808,0.14666 l -0.92873,0.63758 c -0.10015,0.0687 0.0562,0.15514 0.1889,0.17355 l 1.47198,0.20434 c 0.1325,0.0186 0.21375,-0.0735 0.30807,-0.1466 l 0.83249,-0.6455 c 0.0944,-0.0731 -0.0404,-0.17894 -0.17343,-0.19565 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -638.78356,239.09241 -1.15876,-0.14966 c -0.13333,-0.017 -0.20779,0.0754 -0.30808,0.142 l -0.92872,0.6173 c -0.10016,0.0666 0.0564,0.14899 0.1889,0.16807 l 1.23954,0.17863 c 0.13236,0.0191 0.21374,-0.0712 0.30807,-0.14195 l 0.83248,-0.62496 c 0.0944,-0.0708 -0.0405,-0.17226 -0.17343,-0.18943 z"
-           style="fill:url(#linearGradient27736);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14310" />
-        <path
-           id="path14312"
-           style="fill:url(#linearGradient27733);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -640.6491,238.86122 -1.15876,-0.14381 c -0.13334,-0.0165 -0.2078,0.0724 -0.30808,0.13647 l -0.92872,0.59314 c -0.10016,0.064 0.0564,0.14314 0.18889,0.16151 l 1.23954,0.17164 c 0.13236,0.0186 0.21375,-0.0684 0.30807,-0.13642 l 0.83249,-0.60049 c 0.0944,-0.0681 -0.0405,-0.16554 -0.17343,-0.18204 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -642.50194,238.62285 -1.39702,-0.18603 c -0.13312,-0.0176 -0.2078,0.0701 -0.30808,0.13218 l -0.92872,0.57452 c -0.10016,0.062 0.0566,0.13734 0.18889,0.15643 l 1.47781,0.21298 c 0.13222,0.0191 0.21374,-0.0663 0.30806,-0.13212 l 0.83249,-0.58166 c 0.0944,-0.066 -0.0407,-0.15861 -0.17343,-0.1763 z"
-           style="fill:url(#linearGradient27730);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14314" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -608.82913,241.21957 -2.91262,-0.32321 c -0.13413,-0.015 -0.22914,0.0745 -0.30808,0.1793 l -0.68931,0.91495 c -0.079,0.10486 0.0555,0.19539 0.1889,0.21236 l 3.07102,0.38995 c 0.13328,0.0171 0.24657,-0.0654 0.30807,-0.17936 l 0.51545,-0.95473 c 0.0615,-0.11397 -0.0397,-0.22441 -0.17343,-0.23926 z"
-           style="fill:url(#linearGradient27727);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14316" />
-        <path
-           id="path14318"
-           style="fill:url(#linearGradient27724);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -612.53451,240.79786 -2.6458,-0.30422 c -0.13402,-0.0155 -0.22914,0.0728 -0.30807,0.1751 l -0.68931,0.89354 c -0.079,0.10238 0.0555,0.19058 0.18889,0.20739 l 2.64254,0.333 c 0.13324,0.0171 0.23142,-0.0737 0.30807,-0.17516 l 0.67711,-0.89603 c 0.0767,-0.10144 -0.0398,-0.21825 -0.17343,-0.23362 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -615.89257,240.4075 -2.38813,-0.27252 c -0.13399,-0.0155 -0.22912,0.0709 -0.30807,0.17072 l -0.68931,0.87104 c -0.079,0.0998 0.0556,0.1854 0.18889,0.20221 l 2.38488,0.30056 c 0.13321,0.0171 0.23142,-0.0719 0.30806,-0.17076 l 0.67712,-0.87353 c 0.0767,-0.0989 -0.0399,-0.21246 -0.17344,-0.22772 z"
-           style="fill:url(#linearGradient27721);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14320" />
-        <path
-           id="path14322"
-           style="fill:url(#linearGradient27718);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -619.01593,240.04937 -2.24388,-0.25508 c -0.13397,-0.015 -0.22909,0.0689 -0.30807,0.16595 l -0.68931,0.84673 c -0.079,0.097 0.0556,0.17976 0.18889,0.19657 l 2.24063,0.28235 c 0.13317,0.0165 0.23141,-0.0698 0.30806,-0.16601 l 0.67711,-0.84915 c 0.0767,-0.0961 -0.0399,-0.2062 -0.17343,-0.22136 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -621.97705,239.71804 -1.99891,-0.22715 c -0.13391,-0.015 -0.22677,0.0709 -0.30808,0.16595 l -0.69039,0.80772 c -0.0813,0.0951 0.056,0.17702 0.18889,0.19658 l 1.99674,0.29342 c 0.13278,0.0197 0.23142,-0.0698 0.30807,-0.16601 l 0.67711,-0.84916 c 0.0767,-0.0961 -0.0399,-0.2062 -0.17343,-0.22135 z"
-           style="fill:url(#linearGradient27715);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14324" />
-        <path
-           id="path14326"
-           style="fill:url(#linearGradient27712);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -624.70781,239.40889 -1.91808,-0.21908 c -0.13388,-0.015 -0.2205,0.0767 -0.30807,0.16596 l -0.75197,0.76706 c -0.0876,0.0894 0.0556,0.17981 0.1889,0.19658 l 2.00981,0.25327 c 0.13317,0.0166 0.2295,-0.0714 0.30807,-0.166 l 0.64478,-0.77643 c 0.0785,-0.0946 -0.0399,-0.20609 -0.17344,-0.22136 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -627.43845,239.10586 -1.50555,-0.16787 c -0.13384,-0.015 -0.21486,0.081 -0.30808,0.16212 l -0.8328,0.72501 c -0.0933,0.0812 0.0557,0.17521 0.1889,0.19202 l 1.59729,0.20129 c 0.13308,0.0166 0.22278,-0.0759 0.30807,-0.16218 l 0.7256,-0.73421 c 0.0852,-0.0862 -0.0399,-0.20128 -0.17343,-0.21618 z"
-           style="fill:url(#linearGradient27709);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14328" />
-        <path
-           id="path14330"
-           style="fill:url(#linearGradient27706);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -629.70483,238.84855 -1.50556,-0.16295 c -0.13383,-0.0145 -0.21037,0.0843 -0.30807,0.15736 l -0.92979,0.69578 c -0.0978,0.0732 0.0557,0.17009 0.18889,0.18643 l 1.59729,0.1954 c 0.13308,0.0161 0.2173,-0.0797 0.30807,-0.15742 l 0.8226,-0.70473 c 0.0907,-0.0777 -0.04,-0.19539 -0.17343,-0.20987 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -631.96287,238.61328 -1.50556,-0.1555 c -0.13384,-0.014 -0.21038,0.0804 -0.30808,0.15017 l -0.92979,0.66381 c -0.0978,0.0698 0.0557,0.16228 0.1889,0.17785 l 1.59729,0.18643 c 0.13307,0.0155 0.21729,-0.076 0.30807,-0.15017 l 0.8226,-0.6724 c 0.0907,-0.0741 -0.0399,-0.18638 -0.17343,-0.20019 z"
-           style="fill:url(#linearGradient27703);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14332" />
-        <path
-           id="path14334"
-           style="fill:url(#linearGradient27700);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -634.18107,238.38209 -1.27183,-0.1423 c -0.13367,-0.015 -0.21038,0.0766 -0.30807,0.14308 l -0.92979,0.63241 c -0.0978,0.0665 0.0559,0.15266 0.18889,0.16941 l 1.36356,0.1718 c 0.13287,0.0166 0.21729,-0.0724 0.30807,-0.14309 l 0.8226,-0.64058 c 0.0907,-0.0706 -0.0401,-0.17582 -0.17343,-0.19073 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -636.1805,238.17098 -1.26099,-0.14226 c -0.13362,-0.015 -0.2104,0.0735 -0.30808,0.13709 l -0.92979,0.60592 c -0.0978,0.0637 0.056,0.14562 0.18889,0.16233 l 1.35273,0.1705 c 0.13282,0.0166 0.21729,-0.0694 0.30807,-0.13708 l 0.8226,-0.61379 c 0.0907,-0.0676 -0.0402,-0.16766 -0.17343,-0.18271 z"
-           style="fill:url(#linearGradient27697);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14336" />
-        <path
-           id="path14338"
-           style="fill:url(#linearGradient27694);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -638.13104,237.98822 -1.09442,-0.12312 c -0.1335,-0.015 -0.21041,0.0684 -0.30807,0.12782 l -0.9298,0.56501 c -0.0978,0.0594 0.0561,0.1346 0.1889,0.15136 l 1.18616,0.14945 c 0.13266,0.0165 0.21728,-0.0647 0.30806,-0.12783 l 0.82261,-0.57229 c 0.0907,-0.0631 -0.0403,-0.1554 -0.17344,-0.1704 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -640.00503,237.79852 -0.96613,-0.10837 c -0.13339,-0.015 -0.21039,0.0649 -0.30808,0.12104 l -0.92979,0.5348 c -0.0978,0.0562 0.0562,0.12658 0.1889,0.14329 l 1.05786,0.13331 c 0.13252,0.0166 0.21728,-0.0612 0.30806,-0.121 l 0.82261,-0.54172 c 0.0907,-0.0597 -0.0404,-0.1464 -0.17343,-0.16135 z"
-           style="fill:url(#linearGradient27691);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14340" />
-        <path
-           id="path14342"
-           style="fill:url(#linearGradient27688);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -641.65023,237.63091 -0.72858,-0.0796 c -0.13338,-0.0145 -0.2104,0.0617 -0.30808,0.11521 l -0.92979,0.50903 c -0.0978,0.0535 0.0563,0.11965 0.1889,0.13636 l 0.82031,0.10335 c 0.13244,0.0166 0.21729,-0.0582 0.30807,-0.11515 l 0.8226,-0.5156 c 0.0907,-0.0568 -0.0404,-0.13905 -0.17343,-0.15359 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -608.04339,240.37897 -3.26455,-0.33101 -0.49883,0.58676 3.41515,0.37191 z"
-           style="fill:url(#linearGradient27685);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14344" />
-        <path
-           id="path14346"
-           style="fill:url(#linearGradient27682);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -611.70389,240.00804 -2.96398,-0.30164 -0.62806,0.54777 3.04909,0.36274 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -615.18612,239.65239 -2.96397,-0.30164 -0.67063,0.51896 2.95866,0.3227 z"
-           style="fill:url(#linearGradient27679);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14348" />
-        <path
-           id="path14350"
-           style="fill:url(#linearGradient27676);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -618.43688,239.32706 -2.59398,-0.26755 -0.68476,0.50836 2.57052,0.26646 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -621.42898,239.01776 -2.43775,-0.24655 -0.63397,0.49688 2.41428,0.24546 z"
-           style="fill:url(#linearGradient27673);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14352" />
-        <path
-           id="path14354"
-           style="fill:url(#linearGradient27670);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -624.20199,238.74111 -2.18414,-0.19653 -0.52124,0.45342 2.10576,0.21939 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -626.63027,238.49554 -2.12191,-0.22099 -0.5198,0.45528 2.12423,0.2317 z"
-           style="fill:url(#linearGradient27667);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14356" />
-        <path
-           id="path14358"
-           style="fill:url(#linearGradient27664);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -629.06661,238.24863 -2.04251,-0.20698 -0.5614,0.42658 2.12424,0.2317 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -631.39774,238.01243 -2.1028,-0.21308 -0.5614,0.41457 2.12424,0.22518 z"
-           style="fill:url(#linearGradient27661);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14360" />
-        <path
-           id="path14362"
-           style="fill:url(#linearGradient27658);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -633.772,237.77183 -2.14218,-0.21707 -0.5614,0.40247 2.12424,0.21861 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -636.18133,237.52771 -2.1128,-0.21411 -0.49713,0.378 2.05996,0.22466 z"
-           style="fill:url(#linearGradient27655);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14364" />
-        <path
-           id="path14366"
-           style="fill:url(#linearGradient27652);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -638.62431,237.2734 -2.11281,-0.20738 -0.49712,0.36614 2.05996,0.21764 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path14370"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -613.29106,248.68223 -3.09151,-0.63193 c -0.17757,-0.0365 -0.30567,0.0879 -0.40701,0.23814 l -1.11246,1.64991 c -0.10133,0.15029 0.0728,0.31162 0.2495,0.35186 l 3.23277,0.73625 c 0.17618,0.0425 0.31908,-0.0796 0.40699,-0.23809 l 0.95079,-1.71455 c 0.0879,-0.15852 -0.0528,-0.34959 -0.22907,-0.39159 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cssssssssc" />
-        <path
-           sodipodi:nodetypes="cssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -617.41942,247.79871 -3.09167,-0.60525 c -0.17757,-0.0347 -0.30568,0.0842 -0.40702,0.22808 l -1.11252,1.58017 c -0.10133,0.14396 0.0523,0.33656 0.2291,0.37499 l 3.01291,0.65543 c 0.17683,0.0388 0.30309,-0.0858 0.40701,-0.22803 l 1.1913,-1.63044 c 0.10392,-0.14227 -0.0528,-0.33481 -0.22908,-0.37505 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14372"
-           inkscape:transform-center-x="0.50002642"
-           inkscape:transform-center-y="0.95777293" />
-        <path
-           inkscape:transform-center-y="0.9612254"
-           inkscape:transform-center-x="0.44493633"
-           id="path14374"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -621.37966,247.01132 -2.56921,-0.52413 c -0.15852,-0.0321 -0.25605,0.0959 -0.36218,0.2289 l -1.16779,1.46419 c -0.10615,0.1331 0.0459,0.34033 0.20386,0.37634 l 2.59566,0.59174 c 0.15803,0.0357 0.26196,-0.0915 0.36217,-0.22885 l 1.1454,-1.57029 c 0.0569,-0.078 0.0301,-0.13719 -0.0289,-0.21447 -0.045,-0.059 -0.17803,-0.12726 -0.17896,-0.12353 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssssssssc" />
-        <path
-           sodipodi:nodetypes="csssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -624.77943,246.29832 -3.19717,-0.62579 c -0.15846,-0.031 -0.36059,0.0445 -0.47675,0.16517 l -1.32782,1.37785 c -0.11616,0.12053 0.0461,0.33004 0.20386,0.36589 l 3.49822,0.79464 c 0.15778,0.0357 0.26197,-0.0889 0.36217,-0.2225 l 1.1454,-1.52672 c 0.0569,-0.0758 0.0301,-0.13342 -0.0289,-0.20853 -0.045,-0.0574 -0.17803,-0.12374 -0.17896,-0.12012 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14376"
-           inkscape:transform-center-x="0.44493633"
-           inkscape:transform-center-y="0.93458356" />
-        <path
-           inkscape:transform-center-y="0.90626211"
-           inkscape:transform-center-x="0.44493633"
-           id="path14378"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -629.04993,245.44486 -11.61554,-2.39295 c -0.15796,-0.0326 -0.34803,0.0567 -0.47675,0.16015 l -1.40056,1.12592 c -0.12842,0.10321 0.0463,0.31908 0.20386,0.35477 l 11.69311,2.64597 c 0.15754,0.0357 0.32714,0.005 0.43895,-0.11474 l 1.36484,-1.46056 c 0.0634,-0.0679 0.0301,-0.12938 -0.0289,-0.20221 -0.045,-0.0556 -0.17791,-0.11992 -0.17896,-0.11645 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssssssssc" />
-        <path
-           inkscape:transform-center-y="0.76615965"
-           inkscape:transform-center-x="0.36471052"
-           id="path14380"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -641.63127,242.85792 -1.69257,-0.35125 c -0.1296,-0.0269 -0.28199,0.0541 -0.39079,0.13538 l -1.50463,1.12431 c -0.10994,0.0822 0.0378,0.27055 0.16711,0.29993 l 1.75729,0.39916 c 0.12937,0.0295 0.18724,-0.10046 0.29687,-0.1824 l 1.5,-1.12153 c 0.0621,-0.0465 0.0589,-0.14934 0.0106,-0.21095 -0.0369,-0.0471 -0.14284,-0.0956 -0.14384,-0.0927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssssssssc" />
-        <path
-           sodipodi:nodetypes="csssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -644.14467,242.33027 -1.39536,-0.27893 c -0.12969,-0.0259 -0.282,0.0527 -0.3908,0.13175 l -1.50462,1.094 c -0.10994,0.0799 0.0378,0.26305 0.1671,0.29187 l 1.46009,0.32554 c 0.1294,0.029 0.18724,-0.0978 0.29687,-0.17749 l 1.5,-1.09131 c 0.0621,-0.0455 0.0589,-0.14531 0.0106,-0.20527 -0.0369,-0.046 -0.14284,-0.093 -0.14384,-0.0903 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14382"
-           inkscape:transform-center-x="0.36471052"
-           inkscape:transform-center-y="0.74552444" />
-        <path
-           inkscape:transform-center-y="0.72705418"
-           inkscape:transform-center-x="0.36471052"
-           id="path14384"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -646.25045,241.89076 -1.39537,-0.272 c -0.12969,-0.0254 -0.282,0.0512 -0.39079,0.1285 l -1.50463,1.06684 c -0.10994,0.078 0.0379,0.25654 0.1671,0.28463 l 1.46009,0.31747 c 0.1294,0.0284 0.18724,-0.0953 0.29687,-0.17309 l 1.5,-1.06426 c 0.0621,-0.0445 0.0589,-0.14169 0.0106,-0.20014 -0.0369,-0.045 -0.14284,-0.0907 -0.14384,-0.0881 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csssssssssc" />
-        <path
-           sodipodi:nodetypes="csssssssssc"
-           inkscape:connector-curvature="0"
-           d="m -648.39434,241.46497 -0.93813,-0.19275 c -0.12943,-0.0264 -0.27425,0.0635 -0.3908,0.1285 l -1.72996,0.96488 c -0.11771,0.0656 0.0381,0.25529 0.1671,0.28462 l 1.30978,0.2975 c 0.12919,0.0295 0.18781,-0.0946 0.29686,-0.17309 l 1.41842,-1.02157 c 0.062,-0.0445 0.0589,-0.14169 0.0106,-0.20015 -0.0369,-0.045 -0.14289,-0.0907 -0.14384,-0.0881 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14386"
-           inkscape:transform-center-x="0.36471052"
-           inkscape:transform-center-y="0.72705418" />
-        <path
-           id="path14388"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -611.97574,246.27778 -7.61507,-1.29048 c -0.17763,-0.03 -0.30274,0.0751 -0.407,0.19705 l -1.0471,1.22452 c -0.10428,0.12197 0.0731,0.25652 0.24951,0.29119 l 7.84666,1.54338 c 0.17628,0.0347 0.33082,-0.0587 0.40699,-0.1971 l 0.79508,-1.44452 c 0.0761,-0.13838 -0.0519,-0.29404 -0.22907,-0.32404 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -620.53681,244.83651 -2.45147,-0.42491 c -0.17716,-0.0306 -0.30075,0.0715 -0.40701,0.18261 l -1.10607,1.15617 c -0.10633,0.11117 0.0735,0.23522 0.2495,0.26983 l 2.52361,0.49641 c 0.17581,0.0347 0.31065,-0.0688 0.40699,-0.18261 l 1.01353,-1.19725 c 0.0964,-0.11386 -0.0524,-0.26962 -0.22908,-0.30025 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14390" />
-        <path
-           id="path14392"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -623.88984,244.25883 -2.20142,-0.38678 c -0.17681,-0.031 -0.30074,0.0684 -0.40701,0.17459 l -1.10607,1.10533 c -0.10633,0.10625 0.0738,0.22337 0.2495,0.25792 l 2.22685,0.43801 c 0.17553,0.0347 0.30742,-0.0687 0.40699,-0.17459 l 1.06023,-1.12747 c 0.0996,-0.10595 -0.0526,-0.25602 -0.22907,-0.28701 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -627.03595,243.71003 -2.03439,-0.34826 c -0.17205,-0.0295 -0.29263,0.0653 -0.39604,0.16678 l -1.07627,1.05577 c -0.10346,0.10145 0.0718,0.21334 0.24278,0.24635 l 2.05914,0.39718 c 0.17083,0.0331 0.29913,-0.0656 0.39602,-0.16678 l 1.03166,-1.07692 c 0.0969,-0.10119 -0.0512,-0.24474 -0.2229,-0.27412 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14394" />
-        <path
-           id="path14396"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -630.01503,243.20757 -1.80905,-0.31422 c -0.17172,-0.03 -0.29263,0.0621 -0.39604,0.15846 l -1.07626,1.0031 c -0.10346,0.0964 0.0722,0.20056 0.24278,0.23408 l 1.8338,0.36072 c 0.17045,0.0336 0.29913,-0.0624 0.39602,-0.15845 l 1.03165,-1.02323 c 0.0969,-0.0961 -0.0515,-0.23067 -0.2229,-0.26046 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -632.7517,242.74592 -1.57883,-0.27137 c -0.17154,-0.0295 -0.29262,0.0588 -0.39603,0.15001 l -1.07627,0.94978 c -0.10345,0.0913 0.0726,0.18819 0.24278,0.22166 l 1.60358,0.31541 c 0.17018,0.0336 0.29913,-0.0591 0.39602,-0.15003 l 1.03166,-0.96881 c 0.0969,-0.091 -0.0517,-0.21722 -0.22291,-0.24665 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14398" />
-        <path
-           id="path14400"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -635.14938,242.34129 -1.57882,-0.25804 c -0.17155,-0.0279 -0.29263,0.0559 -0.39604,0.14262 l -1.07627,0.90322 c -0.10345,0.0869 0.0726,0.17899 0.24278,0.2108 l 1.60358,0.29994 c 0.17018,0.0321 0.29913,-0.0562 0.39602,-0.14267 l 1.03166,-0.92128 c 0.0969,-0.0866 -0.0517,-0.20656 -0.22291,-0.23459 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -637.57555,241.91916 -1.39759,-0.23961 c -0.17115,-0.0295 -0.29264,0.0535 -0.39604,0.13657 l -1.07626,0.86488 c -0.10349,0.0831 0.0731,0.16848 0.24278,0.20185 l 1.42233,0.27976 c 0.16965,0.0331 0.29913,-0.0538 0.39602,-0.13662 l 1.03166,-0.88216 c 0.0969,-0.0829 -0.0521,-0.19539 -0.2229,-0.22467 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14402" />
-        <path
-           id="path14404"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -639.78614,241.55462 -1.39759,-0.22612 c -0.17115,-0.0279 -0.29264,0.0507 -0.39604,0.12886 l -1.07627,0.81606 c -0.10348,0.0784 0.0731,0.15896 0.24279,0.19041 l 1.42233,0.26399 c 0.16965,0.031 0.29913,-0.0507 0.39602,-0.12892 l 1.03166,-0.83234 c 0.0969,-0.0782 -0.0521,-0.18432 -0.2229,-0.21194 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -641.93719,241.18169 -1.39759,-0.21644 c -0.17115,-0.0269 -0.29264,0.0486 -0.39604,0.12333 l -1.07626,0.78118 c -0.10348,0.0751 0.0731,0.15214 0.24278,0.18225 l 1.42233,0.2527 c 0.16965,0.0295 0.29913,-0.0486 0.39602,-0.12337 l 1.03166,-0.79681 c 0.0969,-0.0749 -0.0521,-0.1764 -0.2229,-0.20284 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14406" />
-        <path
-           id="path14408"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -644.09294,240.8352 -1.3579,-0.2301 c -0.17065,-0.029 -0.29264,0.0465 -0.39604,0.11816 l -1.07626,0.74848 c -0.10348,0.0719 0.0731,0.14578 0.24278,0.17465 l 1.42234,0.2421 c 0.16965,0.0285 0.29946,-0.046 0.39602,-0.11821 l 0.99195,-0.74073 c 0.0966,-0.0721 -0.0526,-0.16548 -0.22289,-0.19435 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -646.29599,240.46191 -1.25223,-0.20133 c -0.17064,-0.0274 -0.28837,0.0512 -0.39604,0.11256 l -1.20047,0.68129 c -0.10793,0.0613 0.0731,0.1389 0.24278,0.16642 l 1.42233,0.23067 c 0.16965,0.0269 0.29819,-0.0455 0.39602,-0.11262 l 1.01052,-0.69179 c 0.0978,-0.067 -0.0526,-0.15783 -0.22291,-0.1852 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14410" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -610.88274,244.39556 -5.75722,-0.84409 c -0.13398,-0.0197 -0.2166,0.1076 -0.3081,0.22922 l -0.77988,1.03689 c -0.0915,0.12167 0.0556,0.24918 0.18887,0.27143 l 5.89028,0.98221 c 0.1332,0.0222 0.23278,-0.0933 0.30809,-0.22933 l 0.63136,-1.14039 c 0.0753,-0.136 -0.0397,-0.28634 -0.1734,-0.30594 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14412" />
-        <path
-           id="path14414"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -617.38364,243.44222 -2.53428,-0.37262 c -0.13385,-0.0197 -0.20725,0.11014 -0.3081,0.21732 l -0.91729,0.97517 c -0.10089,0.10724 0.0557,0.23522 0.18887,0.25742 l 2.676,0.44622 c 0.13306,0.0222 0.21863,-0.0979 0.30809,-0.21747 l 0.76012,-1.01594 c 0.0895,-0.1196 -0.0399,-0.2705 -0.17341,-0.2901 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -620.73682,242.94943 -2.51637,-0.37044 c -0.13374,-0.0197 -0.20549,0.10791 -0.30813,0.20951 l -0.93356,0.92401 c -0.10268,0.1016 0.0558,0.22596 0.18884,0.24815 l 2.5947,0.43268 c 0.13298,0.0222 0.21175,-0.1001 0.30812,-0.20967 l 0.83977,-0.95459 c 0.0964,-0.10956 -0.0399,-0.25999 -0.17337,-0.27965 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14416" />
-        <path
-           id="path14418"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -624.03459,242.45199 -2.16256,-0.31364 c -0.1337,-0.0191 -0.2055,0.10397 -0.30813,0.20185 l -0.93356,0.89044 c -0.10265,0.0979 0.056,0.21696 0.18884,0.2391 l 2.16224,0.36056 c 0.13284,0.0222 0.20422,-0.10388 0.30811,-0.20206 l 0.95076,-0.89867 c 0.10389,-0.0982 -0.0723,-0.25824 -0.2057,-0.27758 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -627.03352,242.00576 -1.89913,-0.26072 c -0.13367,-0.0186 -0.20975,0.0885 -0.31238,0.1825 l -0.93356,0.85563 c -0.10266,0.0941 0.0561,0.20759 0.18884,0.22973 l 1.90306,0.31732 c 0.13269,0.0222 0.20422,-0.0998 0.30811,-0.19415 l 0.95075,-0.86359 c 0.1039,-0.0943 -0.0723,-0.24841 -0.20569,-0.26672 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14420" />
-        <path
-           id="path14422"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -629.77204,241.62166 -1.85211,-0.27216 c -0.13345,-0.0197 -0.20975,0.0855 -0.31237,0.17636 l -0.93357,0.82686 c -0.10266,0.0909 0.0561,0.20066 0.18884,0.22202 l 1.90306,0.30667 c 0.13269,0.0217 0.20422,-0.0965 0.30812,-0.18763 l 0.95075,-0.83457 c 0.10389,-0.0911 -0.11955,-0.21795 -0.25272,-0.23755 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -632.41085,241.23389 -1.6605,-0.24402 c -0.13343,-0.0197 -0.21932,0.0628 -0.32191,0.15064 l -0.9336,0.79929 c -0.10266,0.0879 0.0563,0.19254 0.18884,0.21464 l 1.73704,0.28963 c 0.13255,0.0222 0.20459,-0.0928 0.30812,-0.18136 l 0.93472,-0.79919 c 0.10351,-0.0885 -0.11962,-0.21008 -0.25271,-0.22963 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14424" />
-        <path
-           id="path14426"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -634.85394,240.86655 -1.42077,-0.20553 c -0.1334,-0.0191 -0.2193,0.0607 -0.3219,0.14568 l -0.9336,0.7728 c -0.10267,0.085 0.0565,0.18545 0.18884,0.20754 l 1.4973,0.24966 c 0.13248,0.0222 0.20458,-0.0898 0.30811,-0.17537 l 0.93472,-0.77275 c 0.10351,-0.0856 -0.11967,-0.20279 -0.2527,-0.22203 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -637.05242,240.54142 -1.42076,-0.19839 c -0.13341,-0.0186 -0.21931,0.0586 -0.3219,0.14061 l -0.9336,0.746 c -0.10267,0.0821 0.0565,0.17905 0.18884,0.20036 l 1.49729,0.24101 c 0.13249,0.0217 0.20459,-0.0867 0.30812,-0.16931 l 0.93472,-0.74596 c 0.10351,-0.0826 -0.11968,-0.19575 -0.25271,-0.21432 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14428" />
-        <path
-           id="path14430"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -639.21362,240.21728 -1.28462,-0.18571 c -0.13324,-0.0191 -0.21929,0.0567 -0.3219,0.136 l -0.9336,0.72148 c -0.10265,0.0793 0.0567,0.1717 0.18884,0.19373 l 1.36115,0.22695 c 0.13235,0.0222 0.20458,-0.0839 0.30812,-0.16373 l 0.93472,-0.72144 c 0.1035,-0.0799 -0.11985,-0.18809 -0.25271,-0.20728 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -641.37346,239.8937 -1.03296,-0.14624 c -0.13323,-0.0191 -0.21928,0.0549 -0.3219,0.1316 l -0.9336,0.69805 c -0.10267,0.0768 0.0568,0.16534 0.18883,0.18748 l 1.1095,0.18612 c 0.13225,0.0222 0.20459,-0.0811 0.30812,-0.15839 l 0.93472,-0.69806 c 0.10351,-0.0773 -0.11987,-0.18173 -0.25271,-0.20056 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14432" />
-        <path
-           id="path14434"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -643.19726,239.63546 -1.03296,-0.13977 c -0.13323,-0.0181 -0.21928,0.0524 -0.3219,0.12575 l -0.9336,0.66707 c -0.10267,0.0734 0.0568,0.15799 0.18883,0.17914 l 1.1095,0.17785 c 0.13225,0.0212 0.20459,-0.0775 0.30812,-0.15136 l 0.93472,-0.66707 c 0.10351,-0.0739 -0.11987,-0.17365 -0.25271,-0.19161 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -644.9994,239.3676 -0.91385,-0.11789 c -0.13329,-0.017 -0.21471,0.0578 -0.32191,0.12182 l -1.0527,0.62884 c -0.10721,0.064 0.0568,0.15307 0.18883,0.17361 l 1.1095,0.17231 c 0.13224,0.0207 0.20458,-0.0751 0.30812,-0.14665 l 0.93472,-0.64638 c 0.1035,-0.0716 -0.11985,-0.16853 -0.25271,-0.18566 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14436" />
-        <path
-           id="path14438"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -609.85121,242.56435 -4.71114,-0.5947 c -0.13412,-0.0171 -0.22201,0.0907 -0.30808,0.20258 l -0.73762,0.95877 c -0.0861,0.11195 0.0555,0.22064 0.1889,0.23988 l 4.86388,0.70095 c 0.13326,0.0191 0.23971,-0.0784 0.30807,-0.20263 l 0.56942,-1.03451 c 0.0684,-0.12425 -0.0397,-0.25348 -0.17343,-0.27034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -615.31197,241.87504 -2.62303,-0.32472 c -0.13405,-0.0166 -0.22198,0.0863 -0.30808,0.19296 l -0.73761,0.91315 c -0.0861,0.10657 0.0556,0.2092 0.18889,0.22844 l 2.64395,0.38099 c 0.13311,0.0191 0.22638,-0.0835 0.30807,-0.193 l 0.70124,-0.94036 c 0.0817,-0.10957 -0.0398,-0.24091 -0.17343,-0.25746 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14440" />
-        <path
-           id="path14442"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -618.7384,241.42519 -2.41717,-0.29347 c -0.13094,-0.0161 -0.21679,0.0837 -0.3009,0.1868 l -0.72046,0.88392 c -0.0841,0.1032 0.0543,0.20258 0.18451,0.22115 l 2.4376,0.34794 c 0.13002,0.0186 0.22112,-0.0808 0.3009,-0.18685 l 0.68492,-0.91026 c 0.0798,-0.10604 -0.0389,-0.2334 -0.1694,-0.24923 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -621.8619,241.04822 -2.13783,-0.25844 c -0.13392,-0.0161 -0.21857,0.0837 -0.30808,0.18033 l -0.76317,0.82361 c -0.0895,0.0965 0.0556,0.19575 0.18889,0.21349 l 2.21861,0.29517 c 0.13316,0.0176 0.22622,-0.0782 0.30807,-0.18038 l 0.66694,-0.83312 c 0.0819,-0.10228 -0.0399,-0.22452 -0.17343,-0.24066 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14444" />
-        <path
-           id="path14446"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -624.74691,240.68399 -2.00426,-0.26414 c -0.13372,-0.0176 -0.21341,0.0879 -0.30808,0.17837 l -0.82891,0.79189 c -0.0946,0.0903 0.0558,0.19193 0.18889,0.21112 l 2.08505,0.30045 c 0.13293,0.0191 0.2203,-0.0824 0.30806,-0.17837 l 0.73268,-0.80136 c 0.0878,-0.096 -0.04,-0.22037 -0.17343,-0.23796 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -627.44258,240.34748 -1.85143,-0.23108 c -0.13376,-0.0166 -0.20784,0.0907 -0.30807,0.17092 l -0.92873,0.74327 c -0.10013,0.0801 0.0558,0.184 0.1889,0.20231 l 1.9322,0.2659 c 0.13291,0.0181 0.21375,-0.0857 0.30806,-0.17092 l 0.8325,-0.75237 c 0.0944,-0.0853 -0.0401,-0.21137 -0.17343,-0.22803 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14448" />
-        <path
-           id="path14450"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -629.99944,240.01279 -1.73656,-0.22813 c -0.13358,-0.0176 -0.20783,0.088 -0.30808,0.16594 l -0.92872,0.72144 c -0.10014,0.0778 0.056,0.17728 0.18889,0.19642 l 1.81734,0.26191 c 0.1327,0.0191 0.21375,-0.0831 0.30807,-0.16589 l 0.83249,-0.73034 c 0.0944,-0.0828 -0.0402,-0.20387 -0.17343,-0.22135 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -632.46833,239.70783 -1.54127,-0.20149 c -0.13346,-0.0176 -0.20783,0.0841 -0.30808,0.1584 l -0.92873,0.68859 c -0.10015,0.0743 0.0561,0.16833 0.1889,0.18747 l 1.62206,0.23377 c 0.13256,0.0191 0.21375,-0.0794 0.30807,-0.15835 l 0.83249,-0.69707 c 0.0944,-0.079 -0.0403,-0.19393 -0.17344,-0.21132 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14452" />
-        <path
-           id="path14454"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -634.73241,239.42269 -1.3912,-0.1811 c -0.13342,-0.0176 -0.20781,0.0808 -0.30808,0.15229 l -0.92872,0.66205 c -0.10015,0.0714 0.0562,0.16109 0.18889,0.18023 l 1.47199,0.21215 c 0.13249,0.0191 0.21374,-0.0763 0.30806,-0.15224 l 0.83249,-0.67023 c 0.0944,-0.076 -0.0404,-0.18581 -0.17343,-0.20315 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -636.87169,239.15225 -1.3912,-0.17438 c -0.13342,-0.0171 -0.20781,0.0778 -0.30808,0.14665 l -0.92873,0.63758 c -0.10015,0.0687 0.0562,0.15514 0.1889,0.17356 l 1.47198,0.20433 c 0.1325,0.0186 0.21375,-0.0735 0.30807,-0.1466 l 0.83249,-0.6455 c 0.0944,-0.0731 -0.0404,-0.17893 -0.17343,-0.19564 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14456" />
-        <path
-           id="path14458"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -638.93895,238.88573 -1.15876,-0.14965 c -0.13333,-0.0171 -0.20779,0.0754 -0.30808,0.142 l -0.92872,0.61729 c -0.10016,0.0666 0.0564,0.14899 0.1889,0.16808 l 1.23954,0.17862 c 0.13236,0.0191 0.21374,-0.0712 0.30807,-0.14194 l 0.83248,-0.62496 c 0.0944,-0.0708 -0.0405,-0.17227 -0.17343,-0.18944 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -640.80449,238.65455 -1.15876,-0.14381 c -0.13334,-0.0166 -0.2078,0.0724 -0.30808,0.13646 l -0.92872,0.59315 c -0.10016,0.064 0.0564,0.14313 0.18889,0.1615 l 1.23954,0.17164 c 0.13236,0.0186 0.21375,-0.0684 0.30807,-0.13641 l 0.83249,-0.60049 c 0.0944,-0.0681 -0.0405,-0.16554 -0.17343,-0.18204 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14460" />
-        <path
-           id="path14462"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -642.65733,238.41617 -1.39702,-0.18602 c -0.13312,-0.0176 -0.2078,0.0701 -0.30808,0.13217 l -0.92872,0.57452 c -0.10016,0.062 0.0566,0.13735 0.18889,0.15643 l 1.47781,0.21298 c 0.13222,0.0191 0.21374,-0.0663 0.30806,-0.13212 l 0.83249,-0.58166 c 0.0944,-0.066 -0.0407,-0.1586 -0.17343,-0.1763 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           id="path14464"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -608.98452,241.01289 -2.91262,-0.32321 c -0.13413,-0.015 -0.22913,0.0745 -0.30808,0.1793 l -0.68931,0.91496 c -0.079,0.10486 0.0555,0.19538 0.1889,0.21235 l 3.07102,0.38995 c 0.13327,0.0171 0.24657,-0.0654 0.30807,-0.17935 l 0.51545,-0.95474 c 0.0615,-0.11396 -0.0397,-0.22441 -0.17343,-0.23926 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -612.6899,240.59118 -2.6458,-0.30422 c -0.13402,-0.0155 -0.22914,0.0728 -0.30807,0.17511 l -0.68931,0.89354 c -0.079,0.10238 0.0555,0.19058 0.18889,0.20739 l 2.64254,0.33299 c 0.13324,0.017 0.23142,-0.0737 0.30807,-0.17516 l 0.67711,-0.89603 c 0.0767,-0.10144 -0.0398,-0.21825 -0.17343,-0.23362 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14466" />
-        <path
-           id="path14468"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -616.04796,240.20083 -2.38813,-0.27252 c -0.13399,-0.0155 -0.22912,0.0709 -0.30807,0.17071 l -0.68931,0.87104 c -0.079,0.0998 0.0556,0.1854 0.18889,0.20222 l 2.38488,0.30055 c 0.13321,0.0171 0.23142,-0.0718 0.30806,-0.17076 l 0.67712,-0.87352 c 0.0767,-0.0989 -0.0399,-0.21246 -0.17344,-0.22772 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -619.17132,239.8427 -2.24388,-0.25509 c -0.13397,-0.015 -0.22909,0.0689 -0.30808,0.16596 l -0.68931,0.84672 c -0.079,0.097 0.0556,0.17976 0.1889,0.19658 l 2.24062,0.28234 c 0.13318,0.0166 0.23142,-0.0698 0.30807,-0.166 l 0.67711,-0.84916 c 0.0767,-0.0961 -0.0399,-0.2062 -0.17343,-0.22135 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14470" />
-        <path
-           id="path14472"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -622.13244,239.51136 -1.99891,-0.22715 c -0.13392,-0.015 -0.22677,0.0709 -0.30808,0.16595 l -0.69039,0.80772 c -0.0813,0.0951 0.056,0.17703 0.18889,0.19658 l 1.99674,0.29342 c 0.13278,0.0197 0.23142,-0.0698 0.30807,-0.16601 l 0.67711,-0.84915 c 0.0767,-0.0961 -0.0399,-0.2062 -0.17343,-0.22136 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -624.8632,239.20222 -1.91808,-0.21908 c -0.13388,-0.015 -0.2205,0.0767 -0.30807,0.16595 l -0.75197,0.76706 c -0.0876,0.0894 0.0556,0.17982 0.1889,0.19658 l 2.00981,0.25327 c 0.13317,0.0166 0.2295,-0.0714 0.30807,-0.166 l 0.64478,-0.77642 c 0.0785,-0.0946 -0.0399,-0.2061 -0.17344,-0.22136 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14474" />
-        <path
-           id="path14476"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -627.59384,238.89918 -1.50555,-0.16786 c -0.13384,-0.015 -0.21486,0.081 -0.30808,0.16212 l -0.8328,0.725 c -0.0933,0.0812 0.0557,0.17522 0.1889,0.19203 l 1.59729,0.20128 c 0.13307,0.0166 0.22278,-0.0759 0.30806,-0.16217 l 0.72561,-0.73422 c 0.0852,-0.0862 -0.0399,-0.20128 -0.17343,-0.21618 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -629.86022,238.64187 -1.50556,-0.16295 c -0.13383,-0.0145 -0.21037,0.0843 -0.30807,0.15737 l -0.92979,0.69577 c -0.0978,0.0732 0.0557,0.17009 0.18889,0.18644 l 1.59729,0.19539 c 0.13308,0.0161 0.21729,-0.0797 0.30807,-0.15742 l 0.8226,-0.70472 c 0.0907,-0.0777 -0.0399,-0.19539 -0.17343,-0.20988 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14478" />
-        <path
-           id="path14480"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -632.11826,238.4066 -1.50556,-0.1555 c -0.13384,-0.014 -0.21038,0.0804 -0.30808,0.15018 l -0.92979,0.6638 c -0.0978,0.0698 0.0557,0.16228 0.1889,0.17785 l 1.59729,0.18644 c 0.13307,0.0155 0.21729,-0.076 0.30806,-0.15018 l 0.82261,-0.67239 c 0.0907,-0.0741 -0.0399,-0.18639 -0.17343,-0.2002 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -634.33646,238.17542 -1.27183,-0.14231 c -0.13367,-0.015 -0.21038,0.0766 -0.30807,0.14308 l -0.92979,0.63241 c -0.0978,0.0665 0.0559,0.15266 0.18889,0.16942 l 1.36356,0.17179 c 0.13287,0.0166 0.21729,-0.0724 0.30807,-0.14308 l 0.8226,-0.64058 c 0.0907,-0.0706 -0.0401,-0.17583 -0.17343,-0.19073 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14482" />
-        <path
-           id="path14484"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -636.33589,237.9643 -1.26099,-0.14225 c -0.13362,-0.015 -0.2104,0.0735 -0.30808,0.13708 l -0.92979,0.60592 c -0.0978,0.0637 0.056,0.14562 0.18889,0.16233 l 1.35273,0.17051 c 0.13282,0.0166 0.21729,-0.0694 0.30807,-0.13709 l 0.8226,-0.61378 c 0.0907,-0.0676 -0.0402,-0.16766 -0.17343,-0.18272 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -638.28643,237.78154 -1.09442,-0.12312 c -0.1335,-0.015 -0.21041,0.0684 -0.30808,0.12783 l -0.92979,0.565 c -0.0978,0.0594 0.0561,0.13461 0.1889,0.15136 l 1.18616,0.14946 c 0.13266,0.0166 0.21728,-0.0647 0.30806,-0.12783 l 0.82261,-0.5723 c 0.0907,-0.0631 -0.0403,-0.1554 -0.17344,-0.1704 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14486" />
-        <path
-           id="path14488"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -640.16042,237.59184 -0.96613,-0.10837 c -0.13339,-0.015 -0.21039,0.0649 -0.30808,0.12105 l -0.92979,0.53479 c -0.0978,0.0562 0.0562,0.12658 0.1889,0.14329 l 1.05786,0.13331 c 0.13252,0.0166 0.21728,-0.0612 0.30806,-0.12099 l 0.82261,-0.54173 c 0.0907,-0.0597 -0.0404,-0.1464 -0.17343,-0.16135 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           sodipodi:nodetypes="sssssssss"
-           inkscape:connector-curvature="0"
-           d="m -641.80562,237.42424 -0.72858,-0.0796 c -0.13338,-0.0145 -0.21041,0.0617 -0.30808,0.1152 l -0.92979,0.50903 c -0.0978,0.0535 0.0563,0.11965 0.1889,0.13636 l 0.82031,0.10336 c 0.13244,0.0165 0.21729,-0.0583 0.30807,-0.11515 l 0.8226,-0.5156 c 0.0907,-0.0568 -0.0404,-0.13906 -0.17343,-0.15359 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14490" />
-        <path
-           id="path14492"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -608.19878,240.17229 -3.26455,-0.33101 -0.49883,0.58676 3.41515,0.37192 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -611.85928,239.80136 -2.96398,-0.30164 -0.62806,0.54778 3.04909,0.36273 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14494" />
-        <path
-           id="path14496"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -615.34151,239.44572 -2.96397,-0.30165 -0.67063,0.51896 2.95866,0.3227 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -618.59227,239.12038 -2.59398,-0.26755 -0.68476,0.50836 2.57051,0.26646 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14498" />
-        <path
-           id="path14500"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -621.58437,238.81108 -2.43775,-0.24654 -0.63397,0.49687 2.41428,0.24546 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -624.35738,238.53443 -2.18414,-0.19653 -0.52124,0.45342 2.10576,0.21939 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14502" />
-        <path
-           id="path14504"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -626.78566,238.28886 -2.12191,-0.22099 -0.5198,0.45528 2.12423,0.2317 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -629.222,238.04195 -2.04251,-0.20697 -0.5614,0.42657 2.12424,0.2317 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14506" />
-        <path
-           id="path14508"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -631.55313,237.80575 -2.1028,-0.21308 -0.5614,0.41457 2.12424,0.22518 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -633.92739,237.56515 -2.14218,-0.21706 -0.5614,0.40246 2.12424,0.21862 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14510" />
-        <path
-           id="path14512"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m -636.33672,237.32104 -2.1128,-0.21412 -0.49713,0.378 2.05996,0.22466 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m -638.7797,237.06673 -2.11281,-0.20739 -0.49713,0.36615 2.05997,0.21763 z"
-           style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path14514" />
-        <path
-           sodipodi:nodetypes="scccsss"
-           inkscape:connector-curvature="0"
-           d="m -641.6287,154.44699 -36.06339,0 c 0.02,0 0.0453,0.42883 0.0267,0.53383 26.2443,-1.28211 28.90615,19.81339 36.03677,20.0647 0.3753,0.0225 0.67965,-0.22707 0.67965,-0.50913 l 0,-19.58035 c 0,-0.28197 -0.30317,-0.50905 -0.67965,-0.50905 z"
-           style="opacity:0.24215249;fill:url(#linearGradient27576);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path15340" />
-        <g
-           id="g17937"
-           transform="matrix(0.56076597,0,0,0.56076597,-293.72224,133.06077)">
-          <path
-             id="path15314-7"
-             style="fill:url(#radialGradient28099);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -681.12172,87.041345 c 0,2.434445 9.01236,4.427282 20.12967,4.451108 11.11732,0.02394 20.12968,-1.930496 20.12968,-4.36494 0,-2.434554 -9.01236,-4.427391 -20.12968,-4.451217 -11.11731,-0.02394 -20.12967,1.930496 -20.12967,4.365049 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:type="arc"
-             style="fill:url(#radialGradient28101);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path15316-5"
-             sodipodi:cx="744.58344"
-             sodipodi:cy="1398.1375"
-             sodipodi:rx="104.29825"
-             sodipodi:ry="18.031223"
-             d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-             transform="matrix(-0.18390657,-8.7132298e-6,0,0.22235609,-523.92032,-224.47726)" />
-          <g
-             id="g22010"
-             transform="matrix(1.012007,0,0,1.0809621,-1153.9577,-5043.3068)">
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 480.17719,-4745.1079 c 4.73908,-1.3374 9.47816,-1.4954 14.21724,0 -0.65053,2.2453 -1.17918,4.4477 0,6.0506 l -14.21724,0 c 1.53641,-1.873 0.72894,-3.9655 0,-6.0506 z"
-               style="fill:url(#radialGradient28103);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               transform="scale(1,-1)"
-               id="rect22016" />
-            <path
-               id="rect22020"
-               style="fill:#aab4c5;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 452.78729,4698.752 69.00856,0 0,40.5342 c -22.67954,2.4215 -45.67031,2.512 -69.00856,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 452.78729,4698.752 69.00856,0 0,38.9859 c -22.67954,2.3291 -45.67031,2.4161 -69.00856,0 z"
-               style="fill:#0f131a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path15884" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\telnet_ssh.png"
-               rx="0"
-               y="4700.8618"
-               x="455.07489"
-               height="33.965286"
-               width="64.433403"
-               id="rect22022"
-               style="fill:#4f92be;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\telnet_ssh.png"
-               style="fill:#4f92be;fill-opacity:1;stroke:#ffffff;stroke-width:0.19121987;stroke-miterlimit:4;stroke-dasharray:none"
-               id="rect22030"
-               width="64.433403"
-               height="33.965286"
-               x="455.07489"
-               y="4700.8618"
-               rx="0" />
+        <path d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" style="opacity:0.68609864;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5308-5)" transform="matrix(-0.10895274,-0.00499315,0,0.13734088,-540.78171,48.922546)" id="path14178" inkscape:connector-curvature="0"/>
+        <path id="path14180" style="fill:url(#radialGradient27907);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -633.28468,236.64301 c 0,1.35464 5.01483,2.68375 11.20093,2.96862 6.18611,0.28488 11.20093,-0.58235 11.20093,-1.937 0,-1.35465 -5.01482,-2.68376 -11.20093,-2.96863 -6.1861,-0.28488 -11.20093,0.58235 -11.20093,1.93701 z" inkscape:connector-curvature="0"/>
+        <path sodipodi:type="arc" style="fill:url(#radialGradient18539);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14182" sodipodi:cx="744.58344" sodipodi:cy="1398.1375" sodipodi:rx="104.29825" sodipodi:ry="18.031223" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" transform="matrix(-0.10233273,-0.00449822,0,0.12372753,-545.81173,67.142946)"/>
+        <path style="fill:url(#linearGradient18541);fill-opacity:1;stroke:none;filter:url(#filter5200-2)" d="m 454.79268,1401.7435 c 0.0184,-0.5559 0.0186,-1.1123 6.2e-4,-1.6682 -0.0244,-0.7521 -0.0821,-1.5032 -0.17296,-2.2502 l 14.53854,-0.8732 -0.86471,4.5641 c -2.22704,0.3256 -4.47494,0.5085 -6.72533,0.5472 -2.26244,0.039 -4.52738,-0.068 -6.77611,-0.3197 l -5e-5,0" id="path14184" inkscape:path-effect="#path-effect6294-6" inkscape:original-d="m 454.79268,1401.7435 c 0.32318,-0.7586 0.0627,-0.9297 6.2e-4,-1.6682 -0.0622,-0.7385 0.25383,-1.5451 -0.17296,-2.2502 l 14.53854,-0.8732 c -0.26236,1.9711 -0.58448,2.7627 -0.86471,4.5641 -2.23925,0.3472 -4.46092,0.4766 -6.72533,0.5472 -2.26442,0.071 -4.46873,0.083 -6.77611,-0.3197 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccscc" transform="matrix(-0.51679698,0,0,0.51679698,-383.35164,-485.60858)"/>
+        <path transform="matrix(-0.04411365,-0.00232719,0,0.0441863,-589.22961,176.1898)" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" sodipodi:ry="18.031223" sodipodi:rx="104.29825" sodipodi:cy="1398.1375" sodipodi:cx="744.58344" id="path14186" style="fill:url(#radialGradient18543);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:nodetypes="cccscsscccc" inkscape:connector-curvature="0" id="path14188" d="m -625.66949,232.93751 7.40198,0.48838 c -0.0695,0.72724 -0.17542,2.24848 0.01,2.80398 0.0254,0.0336 0.0399,0.0665 0.0399,0.0996 0,0 3e-5,0.005 0,0.005 -0.009,0.37845 -1.72986,0.59064 -3.85049,0.47509 -2.12648,-0.11597 -3.85049,-0.51659 -3.85049,-0.89706 0,-0.005 -4.4e-4,-0.0114 0,-0.0165 4.2e-4,-0.007 0.002,-0.0129 0.004,-0.0196 0.30501,-0.98765 0.3569,-2.15137 0.24584,-2.93685 z" style="fill:url(#radialGradient27901);fill-opacity:1;stroke:none"/>
+        <path id="path14190" style="fill:#8e959f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -602.1265,201.86763 -37.12947,2.95065 c -0.37364,0.0295 -0.65254,0.30253 -0.67656,0.67654 l -1.57866,24.58191 c -0.024,0.37406 0.38284,0.6089 0.67657,0.67659 11.86244,2.87644 25.00515,3.21401 37.73736,3.04451 0.37361,0.0305 0.66096,-0.30207 0.67657,-0.67654 l 1.27454,-30.58064 c 0.0156,-0.37447 -0.33629,-0.72418 -0.98035,-0.67302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ssssccsss"/>
+        <path sodipodi:nodetypes="ssssccsss" inkscape:connector-curvature="0" d="m -602.238,201.95378 -37.49305,2.78145 c -0.37379,0.0279 -0.65254,0.30253 -0.67656,0.67659 l -1.57866,24.58186 c -0.024,0.37406 0.38284,0.60884 0.67657,0.67659 11.86243,2.87639 25.00515,3.21407 37.73736,3.04456 0.3736,0.03 0.66014,-0.30212 0.67657,-0.67659 l 1.33433,-30.40792 c 0.0164,-0.37442 -0.30277,-0.70429 -0.67656,-0.67654 z" style="fill:url(#radialGradient27897);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.17009941;stroke-miterlimit:4;stroke-opacity:1" id="path14192"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m -603.46616,203.83311 -36.05815,2.48078 -1.35314,21.57493 36.00836,2.40559 z" inkscape:path-effect="#path-effect17541" id="path14194" d="m -603.46616,203.83311 -36.05815,2.48078 -1.35314,21.57493 36.00836,2.40559 1.40293,-26.4613" style="fill:url(#linearGradient27894);fill-opacity:1;stroke:#666666;stroke-width:0.10631213px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" id="path14196" d="m -602.95088,232.97824 c -0.0164,0.37442 -0.3031,0.70786 -0.67544,0.67773 -12.68892,0.1695 -25.78708,-0.16678 -37.60919,-3.04316 -0.29273,-0.0677 -0.69606,-0.30373 -0.67212,-0.67778 l 0.0596,-0.93685 c 0.12148,0.21969 0.39712,0.36206 0.61253,0.41193 11.82211,2.87639 24.92027,3.21273 37.60919,3.04322 0.68217,-0.006 0.67165,-0.0566 0.67544,0.52491 z" style="fill:url(#linearGradient27891);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+        <path transform="matrix(-0.1040531,0.02567059,0.01139083,0.09856866,-561.28107,76.432683)" d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z" sodipodi:ry="6.5625" sodipodi:rx="5.0625" sodipodi:cy="1324.2997" sodipodi:cx="874.3125" id="path14198" style="fill:url(#radialGradient18553);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" sodipodi:type="arc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 z" inkscape:path-effect="#path-effect17532" id="path14200" d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 1.40294,-26.4613" style="fill:url(#linearGradient27887);fill-opacity:1;stroke:#666666;stroke-width:0.10631213px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path style="opacity:0.27354264;fill:url(#linearGradient27884);fill-opacity:1;stroke:#666666;stroke-width:0.10631213px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 1.40294,-26.4613" id="path14202" inkscape:path-effect="#path-effect17527" inkscape:original-d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 z" inkscape:path-effect="#path-effect17522" id="path14204" d="m -603.47459,203.83104 -36.05817,2.48079 -1.35313,21.57492 36.00836,2.40559 1.40294,-26.4613" style="opacity:0.63677135;fill:url(#linearGradient27881);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.10631213px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path id="path14206" style="opacity:0.24215249;fill:url(#linearGradient27878);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -602.238,201.95378 -37.49305,2.78145 c -0.37379,0.0279 -1.04036,0.58631 -0.67656,0.67659 26.12479,-1.70378 29.73712,27.96905 36.83527,28.30301 0.3736,0.03 0.66014,-0.30212 0.67657,-0.67659 l 1.33433,-30.40792 c 0.0164,-0.37442 -0.30277,-0.70429 -0.67656,-0.67654 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ssccsss"/>
+        <path transform="matrix(-0.51730623,0,0,0.51730623,-376.60594,-497.55379)" inkscape:connector-curvature="0" inkscape:original-d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.0752,0.4655 0.0673,0.7 -0.0199,0.8786 -0.0872,0.1786 -0.2537,0.3014 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 z" inkscape:path-effect="#path-effect6808-1" id="path14210" d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.10844,0.2803 0.10113,0.6035 -0.0199,0.8786 -0.10048,0.2284 -0.27746,0.4224 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 -12.37498,-23.875" style="opacity:0.8699552;fill:#5e6b6a;fill-opacity:1;stroke:none;filter:url(#filter7271-4)" sodipodi:nodetypes="ccccscccccc"/>
+        <path sodipodi:nodetypes="ccccscccccc" style="fill:#a5b0af;fill-opacity:1;stroke:none" d="m -606.67788,240.24759 -34.91817,-3.36251 -10.7341,5.94906 -1.04269,0.23438 c -0.0561,0.14501 -0.0523,0.31217 0.0103,0.45449 0.052,0.11816 0.14353,0.2185 0.25645,0.28105 l 38.40998,9.18218 0.71131,0.0647 0.64663,-0.0647 0.25865,-0.38798 6.40164,-12.35067" id="path14212" inkscape:path-effect="#path-effect17487" inkscape:original-d="m -606.67788,240.24759 -34.91817,-3.36251 -10.7341,5.94906 -1.04269,0.23438 c -0.0389,0.24081 -0.0348,0.36213 0.0103,0.45449 0.0451,0.0924 0.13124,0.15591 0.25645,0.28105 l 38.40998,9.18218 0.71131,0.0647 0.64663,-0.0647 0.25865,-0.38798 z" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccscccccc" inkscape:connector-curvature="0" inkscape:original-d="m -606.67788,239.66558 -34.91817,-3.36244 -10.7341,5.94899 -0.91742,0.58201 c -0.12343,0.0662 -0.1836,0.17193 -0.12019,0.23401 0.0634,0.0621 0.1413,0.1391 0.18486,0.15397 l 38.48677,9.18218 0.7113,0.0646 0.64663,-0.0646 0.25866,-0.38798 z" inkscape:path-effect="#path-effect17484" id="path14214" d="m -606.67788,239.66558 -34.91817,-3.36244 c -3.68245,1.78625 -7.26756,3.77317 -10.7341,5.94899 -0.30674,0.19253 -0.61255,0.38654 -0.91742,0.58201 -0.0443,0.018 -0.0817,0.0522 -0.10355,0.0947 -0.0218,0.0425 -0.0278,0.0929 -0.0166,0.13932 0.0101,0.0418 0.0339,0.0801 0.0669,0.1076 0.033,0.0275 0.075,0.044 0.11793,0.0464 l 38.48677,9.18218 0.7113,0.0646 0.64663,-0.0646 0.25866,-0.38798 6.40166,-12.35074" style="fill:url(#linearGradient27873);fill-opacity:1;stroke:none"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -606.67788,239.66765 -0.9826,1.89215 0.14394,1.49864 0.97941,-1.70571 z" style="fill:#717c7d;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path14216"/>
+        <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" inkscape:original-d="m -607.51504,243.05523 -0.86622,-0.10791 0.72131,-1.38522 z" inkscape:path-effect="#path-effect17478" id="path14218" d="m -607.51504,243.05523 -0.86622,-0.10791 0.72131,-1.38522 0.14491,1.49313" style="fill:#5d686c;fill-opacity:1;stroke:none"/>
+        <path sodipodi:nodetypes="cssssssssc" inkscape:connector-curvature="0" d="m -613.13567,248.88891 -3.09151,-0.63194 c -0.17757,-0.0365 -0.30567,0.0879 -0.40701,0.23815 l -1.11246,1.64991 c -0.10133,0.15029 0.0728,0.31162 0.2495,0.35186 l 3.23277,0.73625 c 0.17618,0.0425 0.31908,-0.0796 0.40699,-0.23809 l 0.95079,-1.71455 c 0.0879,-0.15853 -0.0528,-0.34959 -0.22907,-0.39159 z" style="fill:url(#linearGradient27868);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14222"/>
+        <path inkscape:transform-center-y="0.95777293" inkscape:transform-center-x="0.50002642" id="path14224" style="fill:url(#linearGradient27865);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -617.26403,248.00539 -3.09167,-0.60525 c -0.17757,-0.0347 -0.30568,0.0842 -0.40702,0.22808 l -1.11252,1.58016 c -0.10133,0.14397 0.0523,0.33656 0.2291,0.375 l 3.01291,0.65542 c 0.17683,0.0388 0.30309,-0.0858 0.40701,-0.22803 l 1.1913,-1.63044 c 0.10392,-0.14226 -0.0528,-0.3348 -0.22908,-0.37505 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cssssssssc"/>
+        <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m -621.22427,247.218 -2.56921,-0.52414 c -0.15852,-0.0321 -0.25605,0.0959 -0.36218,0.22891 l -1.16779,1.46418 c -0.10615,0.13311 0.0459,0.34034 0.20386,0.37634 l 2.59566,0.59175 c 0.15803,0.0357 0.26196,-0.0915 0.36217,-0.22886 l 1.1454,-1.57028 c 0.0569,-0.078 0.0301,-0.13719 -0.0289,-0.21448 -0.045,-0.059 -0.17803,-0.12725 -0.17896,-0.12353 z" style="fill:url(#linearGradient27862);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14226" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.9612254"/>
+        <path inkscape:transform-center-y="0.93458356" inkscape:transform-center-x="0.44493633" id="path14228" style="fill:url(#linearGradient27859);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -624.62404,246.50499 -3.19717,-0.62578 c -0.15846,-0.031 -0.36059,0.0445 -0.47675,0.16517 l -1.32782,1.37785 c -0.11616,0.12053 0.0461,0.33004 0.20386,0.36589 l 3.49822,0.79463 c 0.15778,0.0357 0.26197,-0.0889 0.36217,-0.22249 l 1.1454,-1.52673 c 0.0569,-0.0758 0.0301,-0.13341 -0.0289,-0.20852 -0.045,-0.0574 -0.17803,-0.12374 -0.17896,-0.12012 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+        <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m -628.89454,245.65154 -11.61553,-2.39295 c -0.15796,-0.0326 -0.34804,0.0567 -0.47676,0.16015 l -1.40056,1.12592 c -0.12842,0.1032 0.0463,0.31908 0.20386,0.35477 l 11.69311,2.64597 c 0.15754,0.0357 0.32714,0.005 0.43895,-0.11474 l 1.36484,-1.46056 c 0.0634,-0.0679 0.0301,-0.12938 -0.0289,-0.20222 -0.045,-0.0556 -0.17792,-0.11991 -0.17896,-0.11644 z" style="fill:url(#linearGradient27856);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14230" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.90626211"/>
+        <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m -641.47588,243.0646 -1.69257,-0.35126 c -0.1296,-0.0269 -0.28199,0.0541 -0.39079,0.13538 l -1.50462,1.12431 c -0.10995,0.0822 0.0378,0.27056 0.1671,0.29994 l 1.75729,0.39916 c 0.12937,0.0295 0.18724,-0.10046 0.29687,-0.18241 l 1.5,-1.12152 c 0.0621,-0.0465 0.0589,-0.14934 0.0106,-0.21096 -0.0369,-0.0471 -0.14284,-0.0956 -0.14384,-0.0927 z" style="fill:url(#linearGradient27853);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14232" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.76615965"/>
+        <path inkscape:transform-center-y="0.74552444" inkscape:transform-center-x="0.36471052" id="path14234" style="fill:url(#linearGradient27850);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -643.98928,242.53694 -1.39536,-0.27893 c -0.12969,-0.0259 -0.282,0.0527 -0.3908,0.13176 l -1.50463,1.094 c -0.10993,0.0799 0.0379,0.26305 0.16711,0.29187 l 1.46009,0.32553 c 0.1294,0.029 0.18724,-0.0978 0.29687,-0.17748 l 1.5,-1.09131 c 0.0621,-0.0455 0.0589,-0.14532 0.0106,-0.20527 -0.0369,-0.046 -0.14284,-0.093 -0.14384,-0.0903 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+        <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m -646.09506,242.09744 -1.39537,-0.272 c -0.12969,-0.0254 -0.282,0.0512 -0.39079,0.1285 l -1.50463,1.06684 c -0.10994,0.078 0.0379,0.25653 0.1671,0.28462 l 1.46009,0.31747 c 0.1294,0.0285 0.18724,-0.0953 0.29687,-0.17309 l 1.5,-1.06425 c 0.0621,-0.0445 0.0589,-0.14169 0.0106,-0.20015 -0.0369,-0.045 -0.14283,-0.0907 -0.14384,-0.088 z" style="fill:url(#linearGradient27847);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14236" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.72705418"/>
+        <path inkscape:transform-center-y="0.72705418" inkscape:transform-center-x="0.36471052" id="path14238" style="fill:url(#linearGradient27844);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -648.23895,241.67165 -0.93813,-0.19275 c -0.12943,-0.0264 -0.27425,0.0635 -0.39079,0.1285 l -1.72997,0.96487 c -0.11771,0.0657 0.0381,0.2553 0.1671,0.28463 l 1.30978,0.2975 c 0.12919,0.0295 0.18781,-0.0946 0.29686,-0.17309 l 1.41842,-1.02158 c 0.062,-0.0445 0.0589,-0.14169 0.0106,-0.20014 -0.0369,-0.045 -0.14289,-0.0907 -0.14384,-0.0881 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -611.82035,246.48445 -7.61506,-1.29047 c -0.17764,-0.03 -0.30275,0.0751 -0.40701,0.19704 l -1.0471,1.22452 c -0.10428,0.12198 0.0731,0.25653 0.24951,0.29119 l 7.84666,1.54339 c 0.17628,0.0347 0.33082,-0.0587 0.40699,-0.1971 l 0.79508,-1.44452 c 0.0761,-0.13838 -0.0519,-0.29404 -0.22907,-0.32405 z" style="fill:url(#linearGradient27841);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14240"/>
+        <path id="path14242" style="fill:url(#linearGradient27838);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -620.38142,245.04319 -2.45147,-0.42492 c -0.17716,-0.0305 -0.30075,0.0716 -0.40701,0.18261 l -1.10607,1.15618 c -0.10633,0.11117 0.0735,0.23522 0.2495,0.26983 l 2.52361,0.4964 c 0.17581,0.0347 0.31065,-0.0688 0.40699,-0.1826 l 1.01353,-1.19726 c 0.0964,-0.11386 -0.0524,-0.26962 -0.22908,-0.30024 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -623.73445,244.46551 -2.20142,-0.38679 c -0.17681,-0.031 -0.30074,0.0684 -0.40701,0.17459 l -1.10607,1.10533 c -0.10633,0.10626 0.0738,0.22338 0.2495,0.25793 l 2.22685,0.43801 c 0.17553,0.0347 0.30742,-0.0687 0.40699,-0.17459 l 1.06023,-1.12747 c 0.0996,-0.10595 -0.0526,-0.25602 -0.22907,-0.28701 z" style="fill:url(#linearGradient27835);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14244"/>
+        <path id="path14246" style="fill:url(#linearGradient27832);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -626.88056,243.9167 -2.03439,-0.34825 c -0.17205,-0.0295 -0.29263,0.0653 -0.39604,0.16678 l -1.07627,1.05577 c -0.10346,0.10144 0.0718,0.21334 0.24279,0.24634 l 2.05913,0.39719 c 0.17083,0.0331 0.29913,-0.0657 0.39602,-0.16678 l 1.03166,-1.07693 c 0.0969,-0.10118 -0.0512,-0.24473 -0.2229,-0.27412 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -629.85964,243.41424 -1.80905,-0.31421 c -0.17172,-0.03 -0.29263,0.0621 -0.39604,0.15845 l -1.07626,1.00311 c -0.10346,0.0964 0.0722,0.20056 0.24278,0.23408 l 1.8338,0.36072 c 0.17045,0.0336 0.29913,-0.0624 0.39602,-0.15845 l 1.03165,-1.02323 c 0.0969,-0.0961 -0.0515,-0.23067 -0.2229,-0.26047 z" style="fill:url(#linearGradient27829);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14248"/>
+        <path id="path14250" style="fill:url(#linearGradient27826);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -632.59631,242.9526 -1.57883,-0.27138 c -0.17154,-0.0295 -0.29262,0.0588 -0.39603,0.15002 l -1.07627,0.94977 c -0.10345,0.0913 0.0726,0.1882 0.24278,0.22167 l 1.60358,0.3154 c 0.17018,0.0336 0.29913,-0.0591 0.39602,-0.15002 l 1.03166,-0.96881 c 0.0969,-0.091 -0.0517,-0.21722 -0.22291,-0.24665 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -634.99399,242.54796 -1.57882,-0.25803 c -0.17155,-0.0279 -0.29263,0.0559 -0.39604,0.14262 l -1.07627,0.90322 c -0.10345,0.0868 0.0726,0.17899 0.24279,0.2108 l 1.60357,0.29993 c 0.17018,0.0321 0.29913,-0.0562 0.39602,-0.14267 l 1.03166,-0.92127 c 0.0969,-0.0866 -0.0517,-0.20656 -0.22291,-0.2346 z" style="fill:url(#linearGradient27823);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14252"/>
+        <path id="path14254" style="fill:url(#linearGradient27820);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -637.42016,242.12584 -1.39759,-0.23962 c -0.17115,-0.0295 -0.29264,0.0535 -0.39604,0.13657 l -1.07626,0.86489 c -0.10349,0.0831 0.0731,0.16848 0.24278,0.20185 l 1.42233,0.27976 c 0.16965,0.0331 0.29913,-0.0538 0.39602,-0.13662 l 1.03166,-0.88216 c 0.0969,-0.0829 -0.0521,-0.19539 -0.2229,-0.22467 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -639.63076,241.76129 -1.39758,-0.22611 c -0.17115,-0.0279 -0.29264,0.0507 -0.39604,0.12886 l -1.07627,0.81605 c -0.10348,0.0784 0.0731,0.15897 0.24279,0.19042 l 1.42233,0.26398 c 0.16965,0.031 0.29913,-0.0507 0.39602,-0.12891 l 1.03166,-0.83235 c 0.0969,-0.0782 -0.0521,-0.18431 -0.22291,-0.21194 z" style="fill:url(#linearGradient27817);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14256"/>
+        <path id="path14258" style="fill:url(#linearGradient27814);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -641.7818,241.38837 -1.39759,-0.21644 c -0.17115,-0.0269 -0.29264,0.0486 -0.39604,0.12332 l -1.07626,0.78118 c -0.10348,0.0751 0.0731,0.15215 0.24278,0.18225 l 1.42233,0.25271 c 0.16965,0.0295 0.29913,-0.0486 0.39602,-0.12338 l 1.03166,-0.79681 c 0.0969,-0.0748 -0.0521,-0.1764 -0.2229,-0.20283 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -643.93755,241.04188 -1.3579,-0.2301 c -0.17065,-0.029 -0.29264,0.0465 -0.39604,0.11815 l -1.07626,0.74849 c -0.10348,0.0719 0.0731,0.14578 0.24278,0.17465 l 1.42234,0.24209 c 0.16965,0.0285 0.29946,-0.046 0.39602,-0.1182 l 0.99195,-0.74073 c 0.0966,-0.0721 -0.0526,-0.16549 -0.22289,-0.19435 z" style="fill:url(#linearGradient27811);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14260"/>
+        <path id="path14262" style="fill:url(#linearGradient27808);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -646.1406,240.66859 -1.25223,-0.20134 c -0.17064,-0.0274 -0.28837,0.0512 -0.39604,0.11257 l -1.20047,0.68129 c -0.10793,0.0613 0.0731,0.1389 0.24278,0.16642 l 1.42233,0.23066 c 0.16965,0.0269 0.29819,-0.0455 0.39602,-0.11261 l 1.01052,-0.6918 c 0.0978,-0.067 -0.0526,-0.15783 -0.22291,-0.18519 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path id="path14264" style="fill:url(#linearGradient27805);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -610.72735,244.60224 -5.75722,-0.84409 c -0.13398,-0.0197 -0.2166,0.1076 -0.3081,0.22922 l -0.77988,1.03689 c -0.0915,0.12166 0.0556,0.24918 0.18887,0.27143 l 5.89028,0.98221 c 0.1332,0.0222 0.23279,-0.0933 0.30809,-0.22933 l 0.63136,-1.1404 c 0.0753,-0.136 -0.0397,-0.28633 -0.1734,-0.30593 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -617.22825,243.64889 -2.53428,-0.37261 c -0.13385,-0.0197 -0.20725,0.11013 -0.3081,0.21732 l -0.91729,0.97517 c -0.10089,0.10724 0.0557,0.23522 0.18887,0.25741 l 2.676,0.44623 c 0.13306,0.0222 0.21863,-0.0979 0.30809,-0.21747 l 0.76012,-1.01594 c 0.0895,-0.1196 -0.0399,-0.2705 -0.17341,-0.29011 z" style="fill:url(#linearGradient27802);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14266"/>
+        <path id="path14268" style="fill:url(#linearGradient27799);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -620.58143,243.15611 -2.51637,-0.37045 c -0.13374,-0.0197 -0.20549,0.10792 -0.30812,0.20952 l -0.93357,0.92401 c -0.10268,0.10159 0.0558,0.22596 0.18884,0.24815 l 2.5947,0.43267 c 0.13298,0.0222 0.21175,-0.10009 0.30812,-0.20966 l 0.83977,-0.95459 c 0.0964,-0.10956 -0.0399,-0.26 -0.17337,-0.27965 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -623.8792,242.65866 -2.16256,-0.31364 c -0.1337,-0.0191 -0.2055,0.10398 -0.30813,0.20186 l -0.93356,0.89043 c -0.10265,0.0979 0.056,0.21696 0.18884,0.23911 l 2.16224,0.36056 c 0.13284,0.0222 0.20422,-0.10388 0.30812,-0.20206 l 0.95075,-0.89867 c 0.10389,-0.0982 -0.0723,-0.25824 -0.2057,-0.27759 z" style="fill:url(#linearGradient27796);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14270"/>
+        <path id="path14272" style="fill:url(#linearGradient27793);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -626.87814,242.21244 -1.89912,-0.26072 c -0.13367,-0.0186 -0.20975,0.0884 -0.31238,0.1825 l -0.93356,0.85563 c -0.10266,0.0941 0.0561,0.20759 0.18884,0.22973 l 1.90306,0.31732 c 0.13269,0.0222 0.20422,-0.0998 0.30811,-0.19415 l 0.95075,-0.86359 c 0.1039,-0.0943 -0.0723,-0.24841 -0.2057,-0.26672 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -629.61665,241.82834 -1.85211,-0.27216 c -0.13345,-0.0197 -0.20975,0.0855 -0.31237,0.17635 l -0.93357,0.82687 c -0.10265,0.0909 0.0561,0.20066 0.18884,0.22202 l 1.90306,0.30666 c 0.13269,0.0217 0.20423,-0.0965 0.30812,-0.18763 l 0.95075,-0.83456 c 0.10389,-0.0911 -0.11955,-0.21795 -0.25272,-0.23755 z" style="fill:url(#linearGradient27790);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14274"/>
+        <path id="path14276" style="fill:url(#linearGradient27787);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -632.25546,241.44056 -1.6605,-0.24401 c -0.13343,-0.0197 -0.21932,0.0628 -0.32191,0.15064 l -0.9336,0.79929 c -0.10266,0.0879 0.0563,0.19254 0.18884,0.21463 l 1.73704,0.28964 c 0.13255,0.0222 0.20459,-0.0928 0.30812,-0.18137 l 0.93472,-0.79918 c 0.10351,-0.0885 -0.11962,-0.21008 -0.25271,-0.22964 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -634.69855,241.07322 -1.42077,-0.20552 c -0.1334,-0.0191 -0.2193,0.0607 -0.3219,0.14567 l -0.9336,0.77281 c -0.10267,0.085 0.0565,0.18545 0.18884,0.20754 l 1.4973,0.24965 c 0.13248,0.0222 0.20458,-0.0898 0.30811,-0.17537 l 0.93473,-0.77275 c 0.1035,-0.0856 -0.11968,-0.20278 -0.25271,-0.22203 z" style="fill:url(#linearGradient27784);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14278"/>
+        <path id="path14280" style="fill:url(#linearGradient27781);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -636.89703,240.7481 -1.42076,-0.19839 c -0.13341,-0.0186 -0.21931,0.0586 -0.3219,0.1406 l -0.9336,0.74601 c -0.10267,0.0821 0.0565,0.17904 0.18884,0.20036 l 1.49729,0.24101 c 0.13249,0.0217 0.20459,-0.0867 0.30812,-0.16932 l 0.93472,-0.74595 c 0.10351,-0.0826 -0.11968,-0.19575 -0.25271,-0.21432 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -639.05823,240.42395 -1.28462,-0.18571 c -0.13324,-0.0191 -0.21929,0.0567 -0.3219,0.136 l -0.9336,0.72149 c -0.10265,0.0793 0.0567,0.17169 0.18884,0.19373 l 1.36115,0.22694 c 0.13235,0.0222 0.20458,-0.0839 0.30812,-0.16373 l 0.93472,-0.72143 c 0.10351,-0.0799 -0.11985,-0.18809 -0.25271,-0.20729 z" style="fill:url(#linearGradient27778);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14282"/>
+        <path id="path14284" style="fill:url(#linearGradient27775);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -641.21807,240.10038 -1.03296,-0.14624 c -0.13323,-0.0191 -0.21928,0.0549 -0.3219,0.1316 l -0.9336,0.69805 c -0.10267,0.0768 0.0568,0.16533 0.18883,0.18747 l 1.1095,0.18613 c 0.13225,0.0222 0.20459,-0.0811 0.30812,-0.1584 l 0.93472,-0.69805 c 0.10351,-0.0773 -0.11987,-0.18173 -0.25271,-0.20056 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -643.04187,239.84214 -1.03296,-0.13978 c -0.13323,-0.0181 -0.21928,0.0525 -0.3219,0.12576 l -0.9336,0.66707 c -0.10267,0.0734 0.0568,0.15798 0.18883,0.17914 l 1.1095,0.17785 c 0.13225,0.0212 0.20459,-0.0775 0.30812,-0.15136 l 0.93472,-0.66707 c 0.10351,-0.0739 -0.11987,-0.17366 -0.25271,-0.19161 z" style="fill:url(#linearGradient27772);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14286"/>
+        <path id="path14288" style="fill:url(#linearGradient27769);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -644.84401,239.57428 -0.91385,-0.11789 c -0.13329,-0.0171 -0.21471,0.0578 -0.32191,0.12182 l -1.0527,0.62884 c -0.1072,0.064 0.0568,0.15307 0.18883,0.1736 l 1.1095,0.17232 c 0.13224,0.0207 0.20458,-0.0751 0.30812,-0.14666 l 0.93472,-0.64637 c 0.1035,-0.0716 -0.11985,-0.16854 -0.25271,-0.18566 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -609.69582,242.77102 -4.71114,-0.59469 c -0.13412,-0.0171 -0.22201,0.0907 -0.30808,0.20258 l -0.73762,0.95877 c -0.0861,0.11195 0.0555,0.22063 0.1889,0.23988 l 4.86388,0.70094 c 0.13326,0.0191 0.23971,-0.0784 0.30807,-0.20262 l 0.56943,-1.03451 c 0.0684,-0.12426 -0.0397,-0.25348 -0.17344,-0.27035 z" style="fill:url(#linearGradient27766);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14290"/>
+        <path id="path14292" style="fill:url(#linearGradient27763);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -615.15658,242.08171 -2.62303,-0.32471 c -0.13405,-0.0165 -0.22198,0.0863 -0.30808,0.19295 l -0.73761,0.91315 c -0.0861,0.10657 0.0556,0.2092 0.18889,0.22845 l 2.64395,0.38099 c 0.13311,0.0191 0.22639,-0.0835 0.30807,-0.19301 l 0.70124,-0.94035 c 0.0817,-0.10957 -0.0398,-0.24091 -0.17343,-0.25747 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -618.58301,241.63186 -2.41717,-0.29346 c -0.13094,-0.0161 -0.21679,0.0836 -0.3009,0.1868 l -0.72046,0.88392 c -0.0841,0.1032 0.0543,0.20257 0.18451,0.22114 l 2.4376,0.34795 c 0.13002,0.0186 0.22112,-0.0808 0.3009,-0.18686 l 0.68492,-0.91025 c 0.0798,-0.10604 -0.0389,-0.2334 -0.1694,-0.24924 z" style="fill:url(#linearGradient27760);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14294"/>
+        <path id="path14296" style="fill:url(#linearGradient27757);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -621.70651,241.2549 -2.13783,-0.25844 c -0.13392,-0.0161 -0.21857,0.0837 -0.30808,0.18033 l -0.76317,0.82361 c -0.0895,0.0965 0.0556,0.19574 0.18889,0.21348 l 2.21861,0.29518 c 0.13316,0.0176 0.22622,-0.0782 0.30807,-0.18039 l 0.66694,-0.83311 c 0.0819,-0.10228 -0.0399,-0.22452 -0.17343,-0.24066 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -624.59152,240.89067 -2.00426,-0.26414 c -0.13372,-0.0176 -0.21341,0.0879 -0.30808,0.17837 l -0.82891,0.79189 c -0.0946,0.0903 0.0558,0.19192 0.18889,0.21111 l 2.08505,0.30046 c 0.13293,0.0191 0.2203,-0.0824 0.30806,-0.17837 l 0.73268,-0.80136 c 0.0878,-0.096 -0.04,-0.22037 -0.17343,-0.23796 z" style="fill:url(#linearGradient27754);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14298"/>
+        <path id="path14300" style="fill:url(#linearGradient27751);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -627.28719,240.55416 -1.85143,-0.23108 c -0.13376,-0.0165 -0.20784,0.0907 -0.30807,0.17092 l -0.92873,0.74326 c -0.10013,0.0801 0.0558,0.18401 0.1889,0.20232 l 1.9322,0.2659 c 0.13291,0.0181 0.21375,-0.0857 0.30806,-0.17092 l 0.8325,-0.75237 c 0.0944,-0.0853 -0.0401,-0.21137 -0.17343,-0.22803 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -629.84405,240.21947 -1.73656,-0.22814 c -0.13358,-0.0176 -0.20783,0.088 -0.30808,0.16595 l -0.92872,0.72144 c -0.10014,0.0778 0.056,0.17728 0.18889,0.19642 l 1.81734,0.26191 c 0.1327,0.0191 0.21375,-0.0831 0.30807,-0.1659 l 0.83249,-0.73033 c 0.0944,-0.0828 -0.0402,-0.20387 -0.17343,-0.22135 z" style="fill:url(#linearGradient27748);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14302"/>
+        <path id="path14304" style="fill:url(#linearGradient27745);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -632.31294,239.91451 -1.54127,-0.20149 c -0.13346,-0.0176 -0.20783,0.0841 -0.30808,0.1584 l -0.92873,0.68858 c -0.10015,0.0743 0.0562,0.16834 0.1889,0.18748 l 1.62206,0.23377 c 0.13256,0.0191 0.21374,-0.0794 0.30807,-0.15835 l 0.83249,-0.69707 c 0.0944,-0.079 -0.0403,-0.19394 -0.17344,-0.21132 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -634.57702,239.62937 -1.3912,-0.18111 c -0.13342,-0.0176 -0.20781,0.0808 -0.30808,0.1523 l -0.92872,0.66205 c -0.10015,0.0714 0.0562,0.16109 0.18889,0.18022 l 1.47199,0.21215 c 0.13249,0.0191 0.21374,-0.0763 0.30806,-0.15224 l 0.83249,-0.67022 c 0.0944,-0.076 -0.0404,-0.18582 -0.17343,-0.20315 z" style="fill:url(#linearGradient27742);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14306"/>
+        <path id="path14308" style="fill:url(#linearGradient27739);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -636.7163,239.35892 -1.3912,-0.17438 c -0.13342,-0.0171 -0.20781,0.0778 -0.30808,0.14666 l -0.92873,0.63758 c -0.10015,0.0687 0.0562,0.15514 0.1889,0.17355 l 1.47198,0.20434 c 0.1325,0.0186 0.21375,-0.0735 0.30807,-0.1466 l 0.83249,-0.6455 c 0.0944,-0.0731 -0.0404,-0.17894 -0.17343,-0.19565 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -638.78356,239.09241 -1.15876,-0.14966 c -0.13333,-0.017 -0.20779,0.0754 -0.30808,0.142 l -0.92872,0.6173 c -0.10016,0.0666 0.0564,0.14899 0.1889,0.16807 l 1.23954,0.17863 c 0.13236,0.0191 0.21374,-0.0712 0.30807,-0.14195 l 0.83248,-0.62496 c 0.0944,-0.0708 -0.0405,-0.17226 -0.17343,-0.18943 z" style="fill:url(#linearGradient27736);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14310"/>
+        <path id="path14312" style="fill:url(#linearGradient27733);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -640.6491,238.86122 -1.15876,-0.14381 c -0.13334,-0.0165 -0.2078,0.0724 -0.30808,0.13647 l -0.92872,0.59314 c -0.10016,0.064 0.0564,0.14314 0.18889,0.16151 l 1.23954,0.17164 c 0.13236,0.0186 0.21375,-0.0684 0.30807,-0.13642 l 0.83249,-0.60049 c 0.0944,-0.0681 -0.0405,-0.16554 -0.17343,-0.18204 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -642.50194,238.62285 -1.39702,-0.18603 c -0.13312,-0.0176 -0.2078,0.0701 -0.30808,0.13218 l -0.92872,0.57452 c -0.10016,0.062 0.0566,0.13734 0.18889,0.15643 l 1.47781,0.21298 c 0.13222,0.0191 0.21374,-0.0663 0.30806,-0.13212 l 0.83249,-0.58166 c 0.0944,-0.066 -0.0407,-0.15861 -0.17343,-0.1763 z" style="fill:url(#linearGradient27730);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14314"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -608.82913,241.21957 -2.91262,-0.32321 c -0.13413,-0.015 -0.22914,0.0745 -0.30808,0.1793 l -0.68931,0.91495 c -0.079,0.10486 0.0555,0.19539 0.1889,0.21236 l 3.07102,0.38995 c 0.13328,0.0171 0.24657,-0.0654 0.30807,-0.17936 l 0.51545,-0.95473 c 0.0615,-0.11397 -0.0397,-0.22441 -0.17343,-0.23926 z" style="fill:url(#linearGradient27727);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14316"/>
+        <path id="path14318" style="fill:url(#linearGradient27724);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -612.53451,240.79786 -2.6458,-0.30422 c -0.13402,-0.0155 -0.22914,0.0728 -0.30807,0.1751 l -0.68931,0.89354 c -0.079,0.10238 0.0555,0.19058 0.18889,0.20739 l 2.64254,0.333 c 0.13324,0.0171 0.23142,-0.0737 0.30807,-0.17516 l 0.67711,-0.89603 c 0.0767,-0.10144 -0.0398,-0.21825 -0.17343,-0.23362 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -615.89257,240.4075 -2.38813,-0.27252 c -0.13399,-0.0155 -0.22912,0.0709 -0.30807,0.17072 l -0.68931,0.87104 c -0.079,0.0998 0.0556,0.1854 0.18889,0.20221 l 2.38488,0.30056 c 0.13321,0.0171 0.23142,-0.0719 0.30806,-0.17076 l 0.67712,-0.87353 c 0.0767,-0.0989 -0.0399,-0.21246 -0.17344,-0.22772 z" style="fill:url(#linearGradient27721);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14320"/>
+        <path id="path14322" style="fill:url(#linearGradient27718);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -619.01593,240.04937 -2.24388,-0.25508 c -0.13397,-0.015 -0.22909,0.0689 -0.30807,0.16595 l -0.68931,0.84673 c -0.079,0.097 0.0556,0.17976 0.18889,0.19657 l 2.24063,0.28235 c 0.13317,0.0165 0.23141,-0.0698 0.30806,-0.16601 l 0.67711,-0.84915 c 0.0767,-0.0961 -0.0399,-0.2062 -0.17343,-0.22136 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -621.97705,239.71804 -1.99891,-0.22715 c -0.13391,-0.015 -0.22677,0.0709 -0.30808,0.16595 l -0.69039,0.80772 c -0.0813,0.0951 0.056,0.17702 0.18889,0.19658 l 1.99674,0.29342 c 0.13278,0.0197 0.23142,-0.0698 0.30807,-0.16601 l 0.67711,-0.84916 c 0.0767,-0.0961 -0.0399,-0.2062 -0.17343,-0.22135 z" style="fill:url(#linearGradient27715);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14324"/>
+        <path id="path14326" style="fill:url(#linearGradient27712);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -624.70781,239.40889 -1.91808,-0.21908 c -0.13388,-0.015 -0.2205,0.0767 -0.30807,0.16596 l -0.75197,0.76706 c -0.0876,0.0894 0.0556,0.17981 0.1889,0.19658 l 2.00981,0.25327 c 0.13317,0.0166 0.2295,-0.0714 0.30807,-0.166 l 0.64478,-0.77643 c 0.0785,-0.0946 -0.0399,-0.20609 -0.17344,-0.22136 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -627.43845,239.10586 -1.50555,-0.16787 c -0.13384,-0.015 -0.21486,0.081 -0.30808,0.16212 l -0.8328,0.72501 c -0.0933,0.0812 0.0557,0.17521 0.1889,0.19202 l 1.59729,0.20129 c 0.13308,0.0166 0.22278,-0.0759 0.30807,-0.16218 l 0.7256,-0.73421 c 0.0852,-0.0862 -0.0399,-0.20128 -0.17343,-0.21618 z" style="fill:url(#linearGradient27709);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14328"/>
+        <path id="path14330" style="fill:url(#linearGradient27706);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -629.70483,238.84855 -1.50556,-0.16295 c -0.13383,-0.0145 -0.21037,0.0843 -0.30807,0.15736 l -0.92979,0.69578 c -0.0978,0.0732 0.0557,0.17009 0.18889,0.18643 l 1.59729,0.1954 c 0.13308,0.0161 0.2173,-0.0797 0.30807,-0.15742 l 0.8226,-0.70473 c 0.0907,-0.0777 -0.04,-0.19539 -0.17343,-0.20987 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -631.96287,238.61328 -1.50556,-0.1555 c -0.13384,-0.014 -0.21038,0.0804 -0.30808,0.15017 l -0.92979,0.66381 c -0.0978,0.0698 0.0557,0.16228 0.1889,0.17785 l 1.59729,0.18643 c 0.13307,0.0155 0.21729,-0.076 0.30807,-0.15017 l 0.8226,-0.6724 c 0.0907,-0.0741 -0.0399,-0.18638 -0.17343,-0.20019 z" style="fill:url(#linearGradient27703);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14332"/>
+        <path id="path14334" style="fill:url(#linearGradient27700);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -634.18107,238.38209 -1.27183,-0.1423 c -0.13367,-0.015 -0.21038,0.0766 -0.30807,0.14308 l -0.92979,0.63241 c -0.0978,0.0665 0.0559,0.15266 0.18889,0.16941 l 1.36356,0.1718 c 0.13287,0.0166 0.21729,-0.0724 0.30807,-0.14309 l 0.8226,-0.64058 c 0.0907,-0.0706 -0.0401,-0.17582 -0.17343,-0.19073 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -636.1805,238.17098 -1.26099,-0.14226 c -0.13362,-0.015 -0.2104,0.0735 -0.30808,0.13709 l -0.92979,0.60592 c -0.0978,0.0637 0.056,0.14562 0.18889,0.16233 l 1.35273,0.1705 c 0.13282,0.0166 0.21729,-0.0694 0.30807,-0.13708 l 0.8226,-0.61379 c 0.0907,-0.0676 -0.0402,-0.16766 -0.17343,-0.18271 z" style="fill:url(#linearGradient27697);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14336"/>
+        <path id="path14338" style="fill:url(#linearGradient27694);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -638.13104,237.98822 -1.09442,-0.12312 c -0.1335,-0.015 -0.21041,0.0684 -0.30807,0.12782 l -0.9298,0.56501 c -0.0978,0.0594 0.0561,0.1346 0.1889,0.15136 l 1.18616,0.14945 c 0.13266,0.0165 0.21728,-0.0647 0.30806,-0.12783 l 0.82261,-0.57229 c 0.0907,-0.0631 -0.0403,-0.1554 -0.17344,-0.1704 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -640.00503,237.79852 -0.96613,-0.10837 c -0.13339,-0.015 -0.21039,0.0649 -0.30808,0.12104 l -0.92979,0.5348 c -0.0978,0.0562 0.0562,0.12658 0.1889,0.14329 l 1.05786,0.13331 c 0.13252,0.0166 0.21728,-0.0612 0.30806,-0.121 l 0.82261,-0.54172 c 0.0907,-0.0597 -0.0404,-0.1464 -0.17343,-0.16135 z" style="fill:url(#linearGradient27691);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14340"/>
+        <path id="path14342" style="fill:url(#linearGradient27688);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -641.65023,237.63091 -0.72858,-0.0796 c -0.13338,-0.0145 -0.2104,0.0617 -0.30808,0.11521 l -0.92979,0.50903 c -0.0978,0.0535 0.0563,0.11965 0.1889,0.13636 l 0.82031,0.10335 c 0.13244,0.0166 0.21729,-0.0582 0.30807,-0.11515 l 0.8226,-0.5156 c 0.0907,-0.0568 -0.0404,-0.13905 -0.17343,-0.15359 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -608.04339,240.37897 -3.26455,-0.33101 -0.49883,0.58676 3.41515,0.37191 z" style="fill:url(#linearGradient27685);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14344"/>
+        <path id="path14346" style="fill:url(#linearGradient27682);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -611.70389,240.00804 -2.96398,-0.30164 -0.62806,0.54777 3.04909,0.36274 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -615.18612,239.65239 -2.96397,-0.30164 -0.67063,0.51896 2.95866,0.3227 z" style="fill:url(#linearGradient27679);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14348"/>
+        <path id="path14350" style="fill:url(#linearGradient27676);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -618.43688,239.32706 -2.59398,-0.26755 -0.68476,0.50836 2.57052,0.26646 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -621.42898,239.01776 -2.43775,-0.24655 -0.63397,0.49688 2.41428,0.24546 z" style="fill:url(#linearGradient27673);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14352"/>
+        <path id="path14354" style="fill:url(#linearGradient27670);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -624.20199,238.74111 -2.18414,-0.19653 -0.52124,0.45342 2.10576,0.21939 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -626.63027,238.49554 -2.12191,-0.22099 -0.5198,0.45528 2.12423,0.2317 z" style="fill:url(#linearGradient27667);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14356"/>
+        <path id="path14358" style="fill:url(#linearGradient27664);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -629.06661,238.24863 -2.04251,-0.20698 -0.5614,0.42658 2.12424,0.2317 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -631.39774,238.01243 -2.1028,-0.21308 -0.5614,0.41457 2.12424,0.22518 z" style="fill:url(#linearGradient27661);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14360"/>
+        <path id="path14362" style="fill:url(#linearGradient27658);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -633.772,237.77183 -2.14218,-0.21707 -0.5614,0.40247 2.12424,0.21861 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -636.18133,237.52771 -2.1128,-0.21411 -0.49713,0.378 2.05996,0.22466 z" style="fill:url(#linearGradient27655);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14364"/>
+        <path id="path14366" style="fill:url(#linearGradient27652);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -638.62431,237.2734 -2.11281,-0.20738 -0.49712,0.36614 2.05996,0.21764 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path14370" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -613.29106,248.68223 -3.09151,-0.63193 c -0.17757,-0.0365 -0.30567,0.0879 -0.40701,0.23814 l -1.11246,1.64991 c -0.10133,0.15029 0.0728,0.31162 0.2495,0.35186 l 3.23277,0.73625 c 0.17618,0.0425 0.31908,-0.0796 0.40699,-0.23809 l 0.95079,-1.71455 c 0.0879,-0.15852 -0.0528,-0.34959 -0.22907,-0.39159 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cssssssssc"/>
+        <path sodipodi:nodetypes="cssssssssc" inkscape:connector-curvature="0" d="m -617.41942,247.79871 -3.09167,-0.60525 c -0.17757,-0.0347 -0.30568,0.0842 -0.40702,0.22808 l -1.11252,1.58017 c -0.10133,0.14396 0.0523,0.33656 0.2291,0.37499 l 3.01291,0.65543 c 0.17683,0.0388 0.30309,-0.0858 0.40701,-0.22803 l 1.1913,-1.63044 c 0.10392,-0.14227 -0.0528,-0.33481 -0.22908,-0.37505 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14372" inkscape:transform-center-x="0.50002642" inkscape:transform-center-y="0.95777293"/>
+        <path inkscape:transform-center-y="0.9612254" inkscape:transform-center-x="0.44493633" id="path14374" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -621.37966,247.01132 -2.56921,-0.52413 c -0.15852,-0.0321 -0.25605,0.0959 -0.36218,0.2289 l -1.16779,1.46419 c -0.10615,0.1331 0.0459,0.34033 0.20386,0.37634 l 2.59566,0.59174 c 0.15803,0.0357 0.26196,-0.0915 0.36217,-0.22885 l 1.1454,-1.57029 c 0.0569,-0.078 0.0301,-0.13719 -0.0289,-0.21447 -0.045,-0.059 -0.17803,-0.12726 -0.17896,-0.12353 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+        <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m -624.77943,246.29832 -3.19717,-0.62579 c -0.15846,-0.031 -0.36059,0.0445 -0.47675,0.16517 l -1.32782,1.37785 c -0.11616,0.12053 0.0461,0.33004 0.20386,0.36589 l 3.49822,0.79464 c 0.15778,0.0357 0.26197,-0.0889 0.36217,-0.2225 l 1.1454,-1.52672 c 0.0569,-0.0758 0.0301,-0.13342 -0.0289,-0.20853 -0.045,-0.0574 -0.17803,-0.12374 -0.17896,-0.12012 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14376" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.93458356"/>
+        <path inkscape:transform-center-y="0.90626211" inkscape:transform-center-x="0.44493633" id="path14378" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -629.04993,245.44486 -11.61554,-2.39295 c -0.15796,-0.0326 -0.34803,0.0567 -0.47675,0.16015 l -1.40056,1.12592 c -0.12842,0.10321 0.0463,0.31908 0.20386,0.35477 l 11.69311,2.64597 c 0.15754,0.0357 0.32714,0.005 0.43895,-0.11474 l 1.36484,-1.46056 c 0.0634,-0.0679 0.0301,-0.12938 -0.0289,-0.20221 -0.045,-0.0556 -0.17791,-0.11992 -0.17896,-0.11645 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+        <path inkscape:transform-center-y="0.76615965" inkscape:transform-center-x="0.36471052" id="path14380" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -641.63127,242.85792 -1.69257,-0.35125 c -0.1296,-0.0269 -0.28199,0.0541 -0.39079,0.13538 l -1.50463,1.12431 c -0.10994,0.0822 0.0378,0.27055 0.16711,0.29993 l 1.75729,0.39916 c 0.12937,0.0295 0.18724,-0.10046 0.29687,-0.1824 l 1.5,-1.12153 c 0.0621,-0.0465 0.0589,-0.14934 0.0106,-0.21095 -0.0369,-0.0471 -0.14284,-0.0956 -0.14384,-0.0927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+        <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m -644.14467,242.33027 -1.39536,-0.27893 c -0.12969,-0.0259 -0.282,0.0527 -0.3908,0.13175 l -1.50462,1.094 c -0.10994,0.0799 0.0378,0.26305 0.1671,0.29187 l 1.46009,0.32554 c 0.1294,0.029 0.18724,-0.0978 0.29687,-0.17749 l 1.5,-1.09131 c 0.0621,-0.0455 0.0589,-0.14531 0.0106,-0.20527 -0.0369,-0.046 -0.14284,-0.093 -0.14384,-0.0903 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14382" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.74552444"/>
+        <path inkscape:transform-center-y="0.72705418" inkscape:transform-center-x="0.36471052" id="path14384" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -646.25045,241.89076 -1.39537,-0.272 c -0.12969,-0.0254 -0.282,0.0512 -0.39079,0.1285 l -1.50463,1.06684 c -0.10994,0.078 0.0379,0.25654 0.1671,0.28463 l 1.46009,0.31747 c 0.1294,0.0284 0.18724,-0.0953 0.29687,-0.17309 l 1.5,-1.06426 c 0.0621,-0.0445 0.0589,-0.14169 0.0106,-0.20014 -0.0369,-0.045 -0.14284,-0.0907 -0.14384,-0.0881 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+        <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m -648.39434,241.46497 -0.93813,-0.19275 c -0.12943,-0.0264 -0.27425,0.0635 -0.3908,0.1285 l -1.72996,0.96488 c -0.11771,0.0656 0.0381,0.25529 0.1671,0.28462 l 1.30978,0.2975 c 0.12919,0.0295 0.18781,-0.0946 0.29686,-0.17309 l 1.41842,-1.02157 c 0.062,-0.0445 0.0589,-0.14169 0.0106,-0.20015 -0.0369,-0.045 -0.14289,-0.0907 -0.14384,-0.0881 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14386" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.72705418"/>
+        <path id="path14388" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -611.97574,246.27778 -7.61507,-1.29048 c -0.17763,-0.03 -0.30274,0.0751 -0.407,0.19705 l -1.0471,1.22452 c -0.10428,0.12197 0.0731,0.25652 0.24951,0.29119 l 7.84666,1.54338 c 0.17628,0.0347 0.33082,-0.0587 0.40699,-0.1971 l 0.79508,-1.44452 c 0.0761,-0.13838 -0.0519,-0.29404 -0.22907,-0.32404 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -620.53681,244.83651 -2.45147,-0.42491 c -0.17716,-0.0306 -0.30075,0.0715 -0.40701,0.18261 l -1.10607,1.15617 c -0.10633,0.11117 0.0735,0.23522 0.2495,0.26983 l 2.52361,0.49641 c 0.17581,0.0347 0.31065,-0.0688 0.40699,-0.18261 l 1.01353,-1.19725 c 0.0964,-0.11386 -0.0524,-0.26962 -0.22908,-0.30025 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14390"/>
+        <path id="path14392" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -623.88984,244.25883 -2.20142,-0.38678 c -0.17681,-0.031 -0.30074,0.0684 -0.40701,0.17459 l -1.10607,1.10533 c -0.10633,0.10625 0.0738,0.22337 0.2495,0.25792 l 2.22685,0.43801 c 0.17553,0.0347 0.30742,-0.0687 0.40699,-0.17459 l 1.06023,-1.12747 c 0.0996,-0.10595 -0.0526,-0.25602 -0.22907,-0.28701 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -627.03595,243.71003 -2.03439,-0.34826 c -0.17205,-0.0295 -0.29263,0.0653 -0.39604,0.16678 l -1.07627,1.05577 c -0.10346,0.10145 0.0718,0.21334 0.24278,0.24635 l 2.05914,0.39718 c 0.17083,0.0331 0.29913,-0.0656 0.39602,-0.16678 l 1.03166,-1.07692 c 0.0969,-0.10119 -0.0512,-0.24474 -0.2229,-0.27412 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14394"/>
+        <path id="path14396" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -630.01503,243.20757 -1.80905,-0.31422 c -0.17172,-0.03 -0.29263,0.0621 -0.39604,0.15846 l -1.07626,1.0031 c -0.10346,0.0964 0.0722,0.20056 0.24278,0.23408 l 1.8338,0.36072 c 0.17045,0.0336 0.29913,-0.0624 0.39602,-0.15845 l 1.03165,-1.02323 c 0.0969,-0.0961 -0.0515,-0.23067 -0.2229,-0.26046 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -632.7517,242.74592 -1.57883,-0.27137 c -0.17154,-0.0295 -0.29262,0.0588 -0.39603,0.15001 l -1.07627,0.94978 c -0.10345,0.0913 0.0726,0.18819 0.24278,0.22166 l 1.60358,0.31541 c 0.17018,0.0336 0.29913,-0.0591 0.39602,-0.15003 l 1.03166,-0.96881 c 0.0969,-0.091 -0.0517,-0.21722 -0.22291,-0.24665 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14398"/>
+        <path id="path14400" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -635.14938,242.34129 -1.57882,-0.25804 c -0.17155,-0.0279 -0.29263,0.0559 -0.39604,0.14262 l -1.07627,0.90322 c -0.10345,0.0869 0.0726,0.17899 0.24278,0.2108 l 1.60358,0.29994 c 0.17018,0.0321 0.29913,-0.0562 0.39602,-0.14267 l 1.03166,-0.92128 c 0.0969,-0.0866 -0.0517,-0.20656 -0.22291,-0.23459 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -637.57555,241.91916 -1.39759,-0.23961 c -0.17115,-0.0295 -0.29264,0.0535 -0.39604,0.13657 l -1.07626,0.86488 c -0.10349,0.0831 0.0731,0.16848 0.24278,0.20185 l 1.42233,0.27976 c 0.16965,0.0331 0.29913,-0.0538 0.39602,-0.13662 l 1.03166,-0.88216 c 0.0969,-0.0829 -0.0521,-0.19539 -0.2229,-0.22467 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14402"/>
+        <path id="path14404" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -639.78614,241.55462 -1.39759,-0.22612 c -0.17115,-0.0279 -0.29264,0.0507 -0.39604,0.12886 l -1.07627,0.81606 c -0.10348,0.0784 0.0731,0.15896 0.24279,0.19041 l 1.42233,0.26399 c 0.16965,0.031 0.29913,-0.0507 0.39602,-0.12892 l 1.03166,-0.83234 c 0.0969,-0.0782 -0.0521,-0.18432 -0.2229,-0.21194 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -641.93719,241.18169 -1.39759,-0.21644 c -0.17115,-0.0269 -0.29264,0.0486 -0.39604,0.12333 l -1.07626,0.78118 c -0.10348,0.0751 0.0731,0.15214 0.24278,0.18225 l 1.42233,0.2527 c 0.16965,0.0295 0.29913,-0.0486 0.39602,-0.12337 l 1.03166,-0.79681 c 0.0969,-0.0749 -0.0521,-0.1764 -0.2229,-0.20284 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14406"/>
+        <path id="path14408" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -644.09294,240.8352 -1.3579,-0.2301 c -0.17065,-0.029 -0.29264,0.0465 -0.39604,0.11816 l -1.07626,0.74848 c -0.10348,0.0719 0.0731,0.14578 0.24278,0.17465 l 1.42234,0.2421 c 0.16965,0.0285 0.29946,-0.046 0.39602,-0.11821 l 0.99195,-0.74073 c 0.0966,-0.0721 -0.0526,-0.16548 -0.22289,-0.19435 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -646.29599,240.46191 -1.25223,-0.20133 c -0.17064,-0.0274 -0.28837,0.0512 -0.39604,0.11256 l -1.20047,0.68129 c -0.10793,0.0613 0.0731,0.1389 0.24278,0.16642 l 1.42233,0.23067 c 0.16965,0.0269 0.29819,-0.0455 0.39602,-0.11262 l 1.01052,-0.69179 c 0.0978,-0.067 -0.0526,-0.15783 -0.22291,-0.1852 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14410"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -610.88274,244.39556 -5.75722,-0.84409 c -0.13398,-0.0197 -0.2166,0.1076 -0.3081,0.22922 l -0.77988,1.03689 c -0.0915,0.12167 0.0556,0.24918 0.18887,0.27143 l 5.89028,0.98221 c 0.1332,0.0222 0.23278,-0.0933 0.30809,-0.22933 l 0.63136,-1.14039 c 0.0753,-0.136 -0.0397,-0.28634 -0.1734,-0.30594 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14412"/>
+        <path id="path14414" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -617.38364,243.44222 -2.53428,-0.37262 c -0.13385,-0.0197 -0.20725,0.11014 -0.3081,0.21732 l -0.91729,0.97517 c -0.10089,0.10724 0.0557,0.23522 0.18887,0.25742 l 2.676,0.44622 c 0.13306,0.0222 0.21863,-0.0979 0.30809,-0.21747 l 0.76012,-1.01594 c 0.0895,-0.1196 -0.0399,-0.2705 -0.17341,-0.2901 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -620.73682,242.94943 -2.51637,-0.37044 c -0.13374,-0.0197 -0.20549,0.10791 -0.30813,0.20951 l -0.93356,0.92401 c -0.10268,0.1016 0.0558,0.22596 0.18884,0.24815 l 2.5947,0.43268 c 0.13298,0.0222 0.21175,-0.1001 0.30812,-0.20967 l 0.83977,-0.95459 c 0.0964,-0.10956 -0.0399,-0.25999 -0.17337,-0.27965 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14416"/>
+        <path id="path14418" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -624.03459,242.45199 -2.16256,-0.31364 c -0.1337,-0.0191 -0.2055,0.10397 -0.30813,0.20185 l -0.93356,0.89044 c -0.10265,0.0979 0.056,0.21696 0.18884,0.2391 l 2.16224,0.36056 c 0.13284,0.0222 0.20422,-0.10388 0.30811,-0.20206 l 0.95076,-0.89867 c 0.10389,-0.0982 -0.0723,-0.25824 -0.2057,-0.27758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -627.03352,242.00576 -1.89913,-0.26072 c -0.13367,-0.0186 -0.20975,0.0885 -0.31238,0.1825 l -0.93356,0.85563 c -0.10266,0.0941 0.0561,0.20759 0.18884,0.22973 l 1.90306,0.31732 c 0.13269,0.0222 0.20422,-0.0998 0.30811,-0.19415 l 0.95075,-0.86359 c 0.1039,-0.0943 -0.0723,-0.24841 -0.20569,-0.26672 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14420"/>
+        <path id="path14422" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -629.77204,241.62166 -1.85211,-0.27216 c -0.13345,-0.0197 -0.20975,0.0855 -0.31237,0.17636 l -0.93357,0.82686 c -0.10266,0.0909 0.0561,0.20066 0.18884,0.22202 l 1.90306,0.30667 c 0.13269,0.0217 0.20422,-0.0965 0.30812,-0.18763 l 0.95075,-0.83457 c 0.10389,-0.0911 -0.11955,-0.21795 -0.25272,-0.23755 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -632.41085,241.23389 -1.6605,-0.24402 c -0.13343,-0.0197 -0.21932,0.0628 -0.32191,0.15064 l -0.9336,0.79929 c -0.10266,0.0879 0.0563,0.19254 0.18884,0.21464 l 1.73704,0.28963 c 0.13255,0.0222 0.20459,-0.0928 0.30812,-0.18136 l 0.93472,-0.79919 c 0.10351,-0.0885 -0.11962,-0.21008 -0.25271,-0.22963 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14424"/>
+        <path id="path14426" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -634.85394,240.86655 -1.42077,-0.20553 c -0.1334,-0.0191 -0.2193,0.0607 -0.3219,0.14568 l -0.9336,0.7728 c -0.10267,0.085 0.0565,0.18545 0.18884,0.20754 l 1.4973,0.24966 c 0.13248,0.0222 0.20458,-0.0898 0.30811,-0.17537 l 0.93472,-0.77275 c 0.10351,-0.0856 -0.11967,-0.20279 -0.2527,-0.22203 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -637.05242,240.54142 -1.42076,-0.19839 c -0.13341,-0.0186 -0.21931,0.0586 -0.3219,0.14061 l -0.9336,0.746 c -0.10267,0.0821 0.0565,0.17905 0.18884,0.20036 l 1.49729,0.24101 c 0.13249,0.0217 0.20459,-0.0867 0.30812,-0.16931 l 0.93472,-0.74596 c 0.10351,-0.0826 -0.11968,-0.19575 -0.25271,-0.21432 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14428"/>
+        <path id="path14430" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -639.21362,240.21728 -1.28462,-0.18571 c -0.13324,-0.0191 -0.21929,0.0567 -0.3219,0.136 l -0.9336,0.72148 c -0.10265,0.0793 0.0567,0.1717 0.18884,0.19373 l 1.36115,0.22695 c 0.13235,0.0222 0.20458,-0.0839 0.30812,-0.16373 l 0.93472,-0.72144 c 0.1035,-0.0799 -0.11985,-0.18809 -0.25271,-0.20728 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -641.37346,239.8937 -1.03296,-0.14624 c -0.13323,-0.0191 -0.21928,0.0549 -0.3219,0.1316 l -0.9336,0.69805 c -0.10267,0.0768 0.0568,0.16534 0.18883,0.18748 l 1.1095,0.18612 c 0.13225,0.0222 0.20459,-0.0811 0.30812,-0.15839 l 0.93472,-0.69806 c 0.10351,-0.0773 -0.11987,-0.18173 -0.25271,-0.20056 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14432"/>
+        <path id="path14434" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -643.19726,239.63546 -1.03296,-0.13977 c -0.13323,-0.0181 -0.21928,0.0524 -0.3219,0.12575 l -0.9336,0.66707 c -0.10267,0.0734 0.0568,0.15799 0.18883,0.17914 l 1.1095,0.17785 c 0.13225,0.0212 0.20459,-0.0775 0.30812,-0.15136 l 0.93472,-0.66707 c 0.10351,-0.0739 -0.11987,-0.17365 -0.25271,-0.19161 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -644.9994,239.3676 -0.91385,-0.11789 c -0.13329,-0.017 -0.21471,0.0578 -0.32191,0.12182 l -1.0527,0.62884 c -0.10721,0.064 0.0568,0.15307 0.18883,0.17361 l 1.1095,0.17231 c 0.13224,0.0207 0.20458,-0.0751 0.30812,-0.14665 l 0.93472,-0.64638 c 0.1035,-0.0716 -0.11985,-0.16853 -0.25271,-0.18566 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14436"/>
+        <path id="path14438" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -609.85121,242.56435 -4.71114,-0.5947 c -0.13412,-0.0171 -0.22201,0.0907 -0.30808,0.20258 l -0.73762,0.95877 c -0.0861,0.11195 0.0555,0.22064 0.1889,0.23988 l 4.86388,0.70095 c 0.13326,0.0191 0.23971,-0.0784 0.30807,-0.20263 l 0.56942,-1.03451 c 0.0684,-0.12425 -0.0397,-0.25348 -0.17343,-0.27034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -615.31197,241.87504 -2.62303,-0.32472 c -0.13405,-0.0166 -0.22198,0.0863 -0.30808,0.19296 l -0.73761,0.91315 c -0.0861,0.10657 0.0556,0.2092 0.18889,0.22844 l 2.64395,0.38099 c 0.13311,0.0191 0.22638,-0.0835 0.30807,-0.193 l 0.70124,-0.94036 c 0.0817,-0.10957 -0.0398,-0.24091 -0.17343,-0.25746 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14440"/>
+        <path id="path14442" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -618.7384,241.42519 -2.41717,-0.29347 c -0.13094,-0.0161 -0.21679,0.0837 -0.3009,0.1868 l -0.72046,0.88392 c -0.0841,0.1032 0.0543,0.20258 0.18451,0.22115 l 2.4376,0.34794 c 0.13002,0.0186 0.22112,-0.0808 0.3009,-0.18685 l 0.68492,-0.91026 c 0.0798,-0.10604 -0.0389,-0.2334 -0.1694,-0.24923 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -621.8619,241.04822 -2.13783,-0.25844 c -0.13392,-0.0161 -0.21857,0.0837 -0.30808,0.18033 l -0.76317,0.82361 c -0.0895,0.0965 0.0556,0.19575 0.18889,0.21349 l 2.21861,0.29517 c 0.13316,0.0176 0.22622,-0.0782 0.30807,-0.18038 l 0.66694,-0.83312 c 0.0819,-0.10228 -0.0399,-0.22452 -0.17343,-0.24066 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14444"/>
+        <path id="path14446" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -624.74691,240.68399 -2.00426,-0.26414 c -0.13372,-0.0176 -0.21341,0.0879 -0.30808,0.17837 l -0.82891,0.79189 c -0.0946,0.0903 0.0558,0.19193 0.18889,0.21112 l 2.08505,0.30045 c 0.13293,0.0191 0.2203,-0.0824 0.30806,-0.17837 l 0.73268,-0.80136 c 0.0878,-0.096 -0.04,-0.22037 -0.17343,-0.23796 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -627.44258,240.34748 -1.85143,-0.23108 c -0.13376,-0.0166 -0.20784,0.0907 -0.30807,0.17092 l -0.92873,0.74327 c -0.10013,0.0801 0.0558,0.184 0.1889,0.20231 l 1.9322,0.2659 c 0.13291,0.0181 0.21375,-0.0857 0.30806,-0.17092 l 0.8325,-0.75237 c 0.0944,-0.0853 -0.0401,-0.21137 -0.17343,-0.22803 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14448"/>
+        <path id="path14450" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -629.99944,240.01279 -1.73656,-0.22813 c -0.13358,-0.0176 -0.20783,0.088 -0.30808,0.16594 l -0.92872,0.72144 c -0.10014,0.0778 0.056,0.17728 0.18889,0.19642 l 1.81734,0.26191 c 0.1327,0.0191 0.21375,-0.0831 0.30807,-0.16589 l 0.83249,-0.73034 c 0.0944,-0.0828 -0.0402,-0.20387 -0.17343,-0.22135 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -632.46833,239.70783 -1.54127,-0.20149 c -0.13346,-0.0176 -0.20783,0.0841 -0.30808,0.1584 l -0.92873,0.68859 c -0.10015,0.0743 0.0561,0.16833 0.1889,0.18747 l 1.62206,0.23377 c 0.13256,0.0191 0.21375,-0.0794 0.30807,-0.15835 l 0.83249,-0.69707 c 0.0944,-0.079 -0.0403,-0.19393 -0.17344,-0.21132 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14452"/>
+        <path id="path14454" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -634.73241,239.42269 -1.3912,-0.1811 c -0.13342,-0.0176 -0.20781,0.0808 -0.30808,0.15229 l -0.92872,0.66205 c -0.10015,0.0714 0.0562,0.16109 0.18889,0.18023 l 1.47199,0.21215 c 0.13249,0.0191 0.21374,-0.0763 0.30806,-0.15224 l 0.83249,-0.67023 c 0.0944,-0.076 -0.0404,-0.18581 -0.17343,-0.20315 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -636.87169,239.15225 -1.3912,-0.17438 c -0.13342,-0.0171 -0.20781,0.0778 -0.30808,0.14665 l -0.92873,0.63758 c -0.10015,0.0687 0.0562,0.15514 0.1889,0.17356 l 1.47198,0.20433 c 0.1325,0.0186 0.21375,-0.0735 0.30807,-0.1466 l 0.83249,-0.6455 c 0.0944,-0.0731 -0.0404,-0.17893 -0.17343,-0.19564 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14456"/>
+        <path id="path14458" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -638.93895,238.88573 -1.15876,-0.14965 c -0.13333,-0.0171 -0.20779,0.0754 -0.30808,0.142 l -0.92872,0.61729 c -0.10016,0.0666 0.0564,0.14899 0.1889,0.16808 l 1.23954,0.17862 c 0.13236,0.0191 0.21374,-0.0712 0.30807,-0.14194 l 0.83248,-0.62496 c 0.0944,-0.0708 -0.0405,-0.17227 -0.17343,-0.18944 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -640.80449,238.65455 -1.15876,-0.14381 c -0.13334,-0.0166 -0.2078,0.0724 -0.30808,0.13646 l -0.92872,0.59315 c -0.10016,0.064 0.0564,0.14313 0.18889,0.1615 l 1.23954,0.17164 c 0.13236,0.0186 0.21375,-0.0684 0.30807,-0.13641 l 0.83249,-0.60049 c 0.0944,-0.0681 -0.0405,-0.16554 -0.17343,-0.18204 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14460"/>
+        <path id="path14462" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -642.65733,238.41617 -1.39702,-0.18602 c -0.13312,-0.0176 -0.2078,0.0701 -0.30808,0.13217 l -0.92872,0.57452 c -0.10016,0.062 0.0566,0.13735 0.18889,0.15643 l 1.47781,0.21298 c 0.13222,0.0191 0.21374,-0.0663 0.30806,-0.13212 l 0.83249,-0.58166 c 0.0944,-0.066 -0.0407,-0.1586 -0.17343,-0.1763 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path id="path14464" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -608.98452,241.01289 -2.91262,-0.32321 c -0.13413,-0.015 -0.22913,0.0745 -0.30808,0.1793 l -0.68931,0.91496 c -0.079,0.10486 0.0555,0.19538 0.1889,0.21235 l 3.07102,0.38995 c 0.13327,0.0171 0.24657,-0.0654 0.30807,-0.17935 l 0.51545,-0.95474 c 0.0615,-0.11396 -0.0397,-0.22441 -0.17343,-0.23926 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -612.6899,240.59118 -2.6458,-0.30422 c -0.13402,-0.0155 -0.22914,0.0728 -0.30807,0.17511 l -0.68931,0.89354 c -0.079,0.10238 0.0555,0.19058 0.18889,0.20739 l 2.64254,0.33299 c 0.13324,0.017 0.23142,-0.0737 0.30807,-0.17516 l 0.67711,-0.89603 c 0.0767,-0.10144 -0.0398,-0.21825 -0.17343,-0.23362 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14466"/>
+        <path id="path14468" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -616.04796,240.20083 -2.38813,-0.27252 c -0.13399,-0.0155 -0.22912,0.0709 -0.30807,0.17071 l -0.68931,0.87104 c -0.079,0.0998 0.0556,0.1854 0.18889,0.20222 l 2.38488,0.30055 c 0.13321,0.0171 0.23142,-0.0718 0.30806,-0.17076 l 0.67712,-0.87352 c 0.0767,-0.0989 -0.0399,-0.21246 -0.17344,-0.22772 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -619.17132,239.8427 -2.24388,-0.25509 c -0.13397,-0.015 -0.22909,0.0689 -0.30808,0.16596 l -0.68931,0.84672 c -0.079,0.097 0.0556,0.17976 0.1889,0.19658 l 2.24062,0.28234 c 0.13318,0.0166 0.23142,-0.0698 0.30807,-0.166 l 0.67711,-0.84916 c 0.0767,-0.0961 -0.0399,-0.2062 -0.17343,-0.22135 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14470"/>
+        <path id="path14472" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -622.13244,239.51136 -1.99891,-0.22715 c -0.13392,-0.015 -0.22677,0.0709 -0.30808,0.16595 l -0.69039,0.80772 c -0.0813,0.0951 0.056,0.17703 0.18889,0.19658 l 1.99674,0.29342 c 0.13278,0.0197 0.23142,-0.0698 0.30807,-0.16601 l 0.67711,-0.84915 c 0.0767,-0.0961 -0.0399,-0.2062 -0.17343,-0.22136 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -624.8632,239.20222 -1.91808,-0.21908 c -0.13388,-0.015 -0.2205,0.0767 -0.30807,0.16595 l -0.75197,0.76706 c -0.0876,0.0894 0.0556,0.17982 0.1889,0.19658 l 2.00981,0.25327 c 0.13317,0.0166 0.2295,-0.0714 0.30807,-0.166 l 0.64478,-0.77642 c 0.0785,-0.0946 -0.0399,-0.2061 -0.17344,-0.22136 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14474"/>
+        <path id="path14476" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -627.59384,238.89918 -1.50555,-0.16786 c -0.13384,-0.015 -0.21486,0.081 -0.30808,0.16212 l -0.8328,0.725 c -0.0933,0.0812 0.0557,0.17522 0.1889,0.19203 l 1.59729,0.20128 c 0.13307,0.0166 0.22278,-0.0759 0.30806,-0.16217 l 0.72561,-0.73422 c 0.0852,-0.0862 -0.0399,-0.20128 -0.17343,-0.21618 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -629.86022,238.64187 -1.50556,-0.16295 c -0.13383,-0.0145 -0.21037,0.0843 -0.30807,0.15737 l -0.92979,0.69577 c -0.0978,0.0732 0.0557,0.17009 0.18889,0.18644 l 1.59729,0.19539 c 0.13308,0.0161 0.21729,-0.0797 0.30807,-0.15742 l 0.8226,-0.70472 c 0.0907,-0.0777 -0.0399,-0.19539 -0.17343,-0.20988 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14478"/>
+        <path id="path14480" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -632.11826,238.4066 -1.50556,-0.1555 c -0.13384,-0.014 -0.21038,0.0804 -0.30808,0.15018 l -0.92979,0.6638 c -0.0978,0.0698 0.0557,0.16228 0.1889,0.17785 l 1.59729,0.18644 c 0.13307,0.0155 0.21729,-0.076 0.30806,-0.15018 l 0.82261,-0.67239 c 0.0907,-0.0741 -0.0399,-0.18639 -0.17343,-0.2002 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -634.33646,238.17542 -1.27183,-0.14231 c -0.13367,-0.015 -0.21038,0.0766 -0.30807,0.14308 l -0.92979,0.63241 c -0.0978,0.0665 0.0559,0.15266 0.18889,0.16942 l 1.36356,0.17179 c 0.13287,0.0166 0.21729,-0.0724 0.30807,-0.14308 l 0.8226,-0.64058 c 0.0907,-0.0706 -0.0401,-0.17583 -0.17343,-0.19073 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14482"/>
+        <path id="path14484" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -636.33589,237.9643 -1.26099,-0.14225 c -0.13362,-0.015 -0.2104,0.0735 -0.30808,0.13708 l -0.92979,0.60592 c -0.0978,0.0637 0.056,0.14562 0.18889,0.16233 l 1.35273,0.17051 c 0.13282,0.0166 0.21729,-0.0694 0.30807,-0.13709 l 0.8226,-0.61378 c 0.0907,-0.0676 -0.0402,-0.16766 -0.17343,-0.18272 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -638.28643,237.78154 -1.09442,-0.12312 c -0.1335,-0.015 -0.21041,0.0684 -0.30808,0.12783 l -0.92979,0.565 c -0.0978,0.0594 0.0561,0.13461 0.1889,0.15136 l 1.18616,0.14946 c 0.13266,0.0166 0.21728,-0.0647 0.30806,-0.12783 l 0.82261,-0.5723 c 0.0907,-0.0631 -0.0403,-0.1554 -0.17344,-0.1704 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14486"/>
+        <path id="path14488" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -640.16042,237.59184 -0.96613,-0.10837 c -0.13339,-0.015 -0.21039,0.0649 -0.30808,0.12105 l -0.92979,0.53479 c -0.0978,0.0562 0.0562,0.12658 0.1889,0.14329 l 1.05786,0.13331 c 0.13252,0.0166 0.21728,-0.0612 0.30806,-0.12099 l 0.82261,-0.54173 c 0.0907,-0.0597 -0.0404,-0.1464 -0.17343,-0.16135 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -641.80562,237.42424 -0.72858,-0.0796 c -0.13338,-0.0145 -0.21041,0.0617 -0.30808,0.1152 l -0.92979,0.50903 c -0.0978,0.0535 0.0563,0.11965 0.1889,0.13636 l 0.82031,0.10336 c 0.13244,0.0165 0.21729,-0.0583 0.30807,-0.11515 l 0.8226,-0.5156 c 0.0907,-0.0568 -0.0404,-0.13906 -0.17343,-0.15359 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14490"/>
+        <path id="path14492" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -608.19878,240.17229 -3.26455,-0.33101 -0.49883,0.58676 3.41515,0.37192 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -611.85928,239.80136 -2.96398,-0.30164 -0.62806,0.54778 3.04909,0.36273 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14494"/>
+        <path id="path14496" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -615.34151,239.44572 -2.96397,-0.30165 -0.67063,0.51896 2.95866,0.3227 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -618.59227,239.12038 -2.59398,-0.26755 -0.68476,0.50836 2.57051,0.26646 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14498"/>
+        <path id="path14500" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -621.58437,238.81108 -2.43775,-0.24654 -0.63397,0.49687 2.41428,0.24546 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -624.35738,238.53443 -2.18414,-0.19653 -0.52124,0.45342 2.10576,0.21939 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14502"/>
+        <path id="path14504" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -626.78566,238.28886 -2.12191,-0.22099 -0.5198,0.45528 2.12423,0.2317 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -629.222,238.04195 -2.04251,-0.20697 -0.5614,0.42657 2.12424,0.2317 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14506"/>
+        <path id="path14508" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -631.55313,237.80575 -2.1028,-0.21308 -0.5614,0.41457 2.12424,0.22518 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -633.92739,237.56515 -2.14218,-0.21706 -0.5614,0.40246 2.12424,0.21862 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14510"/>
+        <path id="path14512" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -636.33672,237.32104 -2.1128,-0.21412 -0.49713,0.378 2.05996,0.22466 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -638.7797,237.06673 -2.11281,-0.20739 -0.49713,0.36615 2.05997,0.21763 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14514"/>
+        <path sodipodi:nodetypes="scccsss" inkscape:connector-curvature="0" d="m -641.6287,154.44699 -36.06339,0 c 0.02,0 0.0453,0.42883 0.0267,0.53383 26.2443,-1.28211 28.90615,19.81339 36.03677,20.0647 0.3753,0.0225 0.67965,-0.22707 0.67965,-0.50913 l 0,-19.58035 c 0,-0.28197 -0.30317,-0.50905 -0.67965,-0.50905 z" style="opacity:0.24215249;fill:url(#linearGradient27576);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path15340"/>
+        <g id="g17937" transform="matrix(0.56076597,0,0,0.56076597,-293.72224,133.06077)">
+          <path id="path15314-7" style="fill:url(#radialGradient28099);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -681.12172,87.041345 c 0,2.434445 9.01236,4.427282 20.12967,4.451108 11.11732,0.02394 20.12968,-1.930496 20.12968,-4.36494 0,-2.434554 -9.01236,-4.427391 -20.12968,-4.451217 -11.11731,-0.02394 -20.12967,1.930496 -20.12967,4.365049 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:type="arc" style="fill:url(#radialGradient28101);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path15316-5" sodipodi:cx="744.58344" sodipodi:cy="1398.1375" sodipodi:rx="104.29825" sodipodi:ry="18.031223" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" transform="matrix(-0.18390657,-8.7132298e-6,0,0.22235609,-523.92032,-224.47726)"/>
+          <g id="g22010" transform="matrix(1.012007,0,0,1.0809621,-1153.9577,-5043.3068)">
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 480.17719,-4745.1079 c 4.73908,-1.3374 9.47816,-1.4954 14.21724,0 -0.65053,2.2453 -1.17918,4.4477 0,6.0506 l -14.21724,0 c 1.53641,-1.873 0.72894,-3.9655 0,-6.0506 z" style="fill:url(#radialGradient28103);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)" id="rect22016"/>
+            <path id="rect22020" style="fill:#aab4c5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 452.78729,4698.752 69.00856,0 0,40.5342 c -22.67954,2.4215 -45.67031,2.512 -69.00856,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 452.78729,4698.752 69.00856,0 0,38.9859 c -22.67954,2.3291 -45.67031,2.4161 -69.00856,0 z" style="fill:#0f131a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path15884"/>
+            <rect rx="0" y="4700.8618" x="455.07489" height="33.965286" width="64.433403" id="rect22022" style="fill:#4f92be;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+            <rect style="fill:#4f92be;fill-opacity:1;stroke:#ffffff;stroke-width:0.19121987;stroke-miterlimit:4;stroke-dasharray:none" id="rect22030" width="64.433403" height="33.965286" x="455.07489" y="4700.8618" rx="0"/>
           </g>
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m -628.2009,38.137506 -65.52299,0 0,36.732848 65.52299,0 z"
-             inkscape:path-effect="#path-effect15898"
-             id="path15334"
-             d="m -628.2009,38.137506 -65.52299,0 0,36.732848 65.52299,0 0,-36.732848"
-             style="fill:url(#linearGradient28105);fill-opacity:1;stroke:#666666;stroke-width:0.16872448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="opacity:0.27354264;fill:url(#linearGradient28107);fill-opacity:1;stroke:#666666;stroke-width:0.16872448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m -628.20092,38.137506 -65.52297,0 0,36.732848 65.52297,0 0,-36.732848"
-             id="path15336"
-             inkscape:path-effect="#path-effect15896"
-             inkscape:original-d="m -628.20092,38.137506 -65.52297,0 0,36.732848 65.52297,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m -628.08571,38.137506 -65.63818,0 0,36.732848 65.52297,0 z"
-             inkscape:path-effect="#path-effect15886"
-             id="path15338"
-             d="m -628.08571,38.137506 -65.63818,0 0,36.732848 65.52297,0 0.11521,-36.732848"
-             style="opacity:0.63677135;fill:url(#linearGradient28109);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.16872448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             transform="matrix(-0.21568922,0.04679456,0.03690265,0.17967945,-548.54039,-201.94273)"
-             d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z"
-             sodipodi:ry="6.5625"
-             sodipodi:rx="5.0625"
-             sodipodi:cy="1324.2997"
-             sodipodi:cx="874.3125"
-             id="path15332-3"
-             style="fill:url(#radialGradient28111);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-             sodipodi:type="arc" />
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m -628.2009,38.137506 -65.52299,0 0,36.732848 65.52299,0 z" inkscape:path-effect="#path-effect15898" id="path15334" d="m -628.2009,38.137506 -65.52299,0 0,36.732848 65.52299,0 0,-36.732848" style="fill:url(#linearGradient28105);fill-opacity:1;stroke:#666666;stroke-width:0.16872448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="opacity:0.27354264;fill:url(#linearGradient28107);fill-opacity:1;stroke:#666666;stroke-width:0.16872448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -628.20092,38.137506 -65.52297,0 0,36.732848 65.52297,0 0,-36.732848" id="path15336" inkscape:path-effect="#path-effect15896" inkscape:original-d="m -628.20092,38.137506 -65.52297,0 0,36.732848 65.52297,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m -628.08571,38.137506 -65.63818,0 0,36.732848 65.52297,0 z" inkscape:path-effect="#path-effect15886" id="path15338" d="m -628.08571,38.137506 -65.63818,0 0,36.732848 65.52297,0 0.11521,-36.732848" style="opacity:0.63677135;fill:url(#linearGradient28109);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.16872448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path transform="matrix(-0.21568922,0.04679456,0.03690265,0.17967945,-548.54039,-201.94273)" d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z" sodipodi:ry="6.5625" sodipodi:rx="5.0625" sodipodi:cy="1324.2997" sodipodi:cx="874.3125" id="path15332-3" style="fill:url(#radialGradient28111);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" sodipodi:type="arc"/>
         </g>
-        <g
-           transform="matrix(0.47252558,-0.92632682,0.81381292,0.64137887,-4787.7051,-2315.1584)"
-           id="g22094">
-          <path
-             inkscape:connector-curvature="0"
-             id="path22096"
-             d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20384-7)" />
-          <path
-             style="fill:url(#linearGradient19129);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z"
-             id="path22098"
-             inkscape:connector-curvature="0" />
+        <g transform="matrix(0.47252558,-0.92632682,0.81381292,0.64137887,-4787.7051,-2315.1584)" id="g22094">
+          <path inkscape:connector-curvature="0" id="path22096" d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20384-7)"/>
+          <path style="fill:url(#linearGradient19129);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z" id="path22098" inkscape:connector-curvature="0"/>
         </g>
-        <g
-           id="g26652"
-           transform="matrix(1.1805357,0,0,1.1805357,65.291872,173.59376)">
-          <g
-             id="g26861"
-             transform="matrix(0.34244354,0,0,0.34244354,-454.73493,-13.993042)">
-            <path
-               sodipodi:nodetypes="ccccscccccc"
-               style="opacity:0.8699552;fill:#5e6b6a;fill-opacity:1;stroke:none;filter:url(#filter7271-4)"
-               d="m 453.84618,1426.2372 98.06107,0 9.25241,25.3223 2.01562,0.4531 c 0.10844,0.2803 0.10113,0.6035 -0.0199,0.8786 -0.10048,0.2284 -0.27746,0.4224 -0.49574,0.5433 l -114.59819,-1.125 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 8.90973,-25.3223"
-               id="path15344"
-               inkscape:path-effect="#path-effect6808-1"
-               inkscape:original-d="m 453.84618,1426.2372 98.06107,0 9.25241,25.3223 2.01562,0.4531 c 0.0752,0.4655 0.0673,0.7 -0.0199,0.8786 -0.0872,0.1786 -0.2537,0.3014 -0.49574,0.5433 l -114.59819,-1.125 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 z"
-               inkscape:connector-curvature="0"
-               transform="matrix(-1.0890434,0,0,1.0890434,70.544085,-1488.3466)" />
-            <path
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m -423.7141,64.887563 -106.79276,0 -10.07628,27.57716 c 17.06578,0 94.83122,1.094955 123.16885,0.81678 l 1.49745,0.1362 1.36129,-0.1362 0.54453,-0.81678 z"
-               inkscape:path-effect="#path-effect16581"
-               id="path15346"
-               d="m -423.7141,64.887563 -106.79276,0 -10.07628,27.57716 123.16885,0.81678 1.49745,0.1362 1.36129,-0.1362 0.54453,-0.81678 -9.70308,-27.57716"
-               style="fill:#a5b0af;fill-opacity:1;stroke:none"
-               sodipodi:nodetypes="cccccccc" />
-            <path
-               style="fill:url(#linearGradient27000);fill-opacity:1;stroke:none"
-               d="m -423.7141,64.887563 -106.79276,0 -10.07628,27.57716 126.57212,0 -9.70308,-27.57716"
-               id="path15348"
-               inkscape:path-effect="#path-effect16578"
-               inkscape:original-d="m -423.7141,64.887563 -106.79276,0 -10.07628,27.57716 c 19.94423,-12.968463 113.70273,19.304327 126.57212,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path26518"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -536.08043,86.896253 6.9,-0.01601 -1.01332,3.981938 -7.29624,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -527.7181,86.880243 6.93456,0 -0.57138,3.981938 -7.29624,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26520"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26522"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -519.23283,86.880245 6.93456,0 -0.21782,3.981938 -7.29624,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26526"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -510.81319,86.880243 40.01244,0 0.65751,3.98194 -40.82924,-2e-6 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -468.96766,86.880245 7.11134,-2e-6 0.8554,3.98194 -7.29624,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26528"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26530"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -460.21722,86.880243 6.93456,0 1.29735,3.98194 -7.29624,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -451.64355,86.880243 6.93456,0 1.7393,3.98194 -7.38463,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26532"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26534"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -443.15827,86.880243 7.19973,0 1.91608,3.98194 -7.29624,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -434.31944,86.880243 7.3765,0 1.73931,3.98194 -7.29624,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26536"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26538"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -425.281,86.880243 7.46489,0 1.65092,3.98194 -7.29624,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -534.17498,81.681343 6.4082,0.102727 -0.95315,3.759108 -6.86299,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26540"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26542"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -526.39128,81.78407 6.52279,0 -0.53744,3.759108 -6.86303,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -518.40986,81.784072 6.52278,0 -0.2049,3.759108 -6.86298,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26544"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26546"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -469.91491,81.680028 6.95279,-2e-6 0.83632,3.846207 -7.13355,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -461.3596,81.680026 6.77995,0 1.26838,3.846207 -7.13354,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26548"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26550"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -452.97712,81.680026 6.77992,0 1.70056,3.846207 -7.22,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -444.68105,81.680026 7.03915,0 1.87335,3.846207 -7.13348,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26552"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26554"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -436.03932,81.680026 7.21201,0 1.7005,3.846207 -7.13356,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -427.20241,81.680026 7.29836,0 1.61414,3.846207 -7.13356,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26556"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26558"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -510.63169,81.784072 6.52278,0 0.14866,3.759108 -6.86298,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -502.85352,81.784072 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26560"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26562"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -494.81018,81.784072 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -486.67845,81.767125 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26564"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26566"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -478.45364,81.784072 6.78325,-0.102729 0.41383,3.861837 -6.86298,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26568"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -532.36109,76.989189 6.20531,0.05888 -0.92112,3.759108 -6.63235,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -524.82651,77.048073 6.30359,0 -0.51938,3.759108 -6.63239,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26570"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26572"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -517.11331,77.048075 6.30357,0 -0.19801,3.759108 -6.63234,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -470.2481,76.944031 6.71913,-2e-6 0.80821,3.846207 -6.89381,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26574"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26576"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -461.9803,76.944029 6.5521,0 1.22575,3.846207 -6.89381,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -453.87953,76.944029 6.55207,0 1.64341,3.846207 -6.97736,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26578"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26580"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -445.86226,76.944029 6.80259,0 1.81039,3.846207 -6.89375,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -437.51095,76.944029 6.96964,0 1.64336,3.846207 -6.89383,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26582"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26584"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -428.97101,76.944029 7.05309,0 1.55989,3.846207 -6.89383,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -509.59654,77.048075 6.30357,0 0.14367,3.759108 -6.63234,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26586"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26588"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -502.07977,77.048075 6.55984,-0.102729 0.22908,3.861837 -6.63234,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -494.30673,77.048075 6.55983,-0.102729 0.22908,3.861837 -6.63234,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26590"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26592"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -486.44828,77.031128 6.55983,-0.102729 0.22908,3.861837 -6.63234,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -478.49988,77.048075 6.55529,-0.102729 0.39993,3.861837 -6.63234,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26594"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -530.70365,72.180865 6.03127,0.06181 -0.89529,3.946497 -6.44633,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26596"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26598"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -523.3804,72.242685 6.12679,0 -0.50481,3.946496 -6.44637,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -515.88353,72.242687 6.12677,0 -0.19246,3.946496 -6.44632,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26600"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26602"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -470.33276,72.133456 6.53067,-2e-6 0.78555,4.037937 -6.70046,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -462.29685,72.133454 6.36833,0 1.19137,4.037937 -6.70046,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26604"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26606"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -454.42329,72.133454 6.36831,0 1.59731,4.037937 -6.78166,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -446.63088,72.133454 6.6118,0 1.75961,4.037937 -6.7004,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26608"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26610"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -438.5138,72.133454 6.77416,0 1.59727,4.037937 -6.70048,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -430.21338,72.133454 6.85527,0 1.51614,4.037937 -6.70048,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26612"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26614"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -508.57759,72.242687 6.12678,0 0.13964,3.946496 -6.44632,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -501.27164,72.242687 6.37585,-0.10785 0.22266,4.054346 -6.44632,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26616"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26618"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -493.71661,72.242687 6.37584,-0.10785 0.22266,4.054346 -6.44632,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -486.07857,72.224895 6.37584,-0.10785 0.22266,4.054346 -6.44632,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26620"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26622"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -478.3531,72.242687 6.37143,-0.10785 0.38871,4.054346 -6.44632,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26624"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -529.13475,67.887037 5.85032,0.05365 -0.86843,3.424996 -6.25293,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -522.03121,67.940687 5.94297,0 -0.48966,3.424995 -6.25297,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26626"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26628"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -514.75926,67.940689 5.94295,0 -0.18669,3.424995 -6.25291,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -470.57511,67.845892 6.33474,-1e-6 0.76198,3.504352 -6.49943,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26630"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26632"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -462.78029,67.845891 6.17727,0 1.15563,3.504352 -6.49944,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -455.14295,67.845891 6.17725,0 1.54939,3.504352 -6.5782,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26634"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26636"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -447.58433,67.845891 6.41344,0 1.70682,3.504352 -6.49938,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -439.71077,67.845891 6.57092,0 1.54935,3.504352 -6.49946,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26638"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26640"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -431.65938,67.845891 6.6496,0 1.47065,3.504352 -6.49945,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -507.67252,67.940689 5.94297,0 0.13545,3.424995 -6.25292,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26642"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26644"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -500.58576,67.940689 6.18456,-0.0936 0.21598,3.518594 -6.25292,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -493.25739,67.940689 6.18455,-0.0936 0.21598,3.518594 -6.25292,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26646"
-               transform="translate(0.39999,0.7)" />
-            <path
-               id="path26648"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               d="m -485.84851,67.925248 6.18455,-0.0936 0.21598,3.518593 -6.25292,0 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="translate(0.39999,0.7)" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -478.35482,67.940689 6.18028,-0.0936 0.37704,3.518594 -6.25291,0 z"
-               style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-               id="path26650"
-               transform="translate(0.39999,0.7)" />
-            <g
-               id="g26447">
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -536.08043,86.896253 6.9,-0.01601 -1.01332,3.981938 -7.29624,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="rect26299" />
-              <path
-                 id="path26305"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -527.7181,86.880243 6.93456,0 -0.57138,3.981938 -7.29624,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -519.23283,86.880245 6.93456,0 -0.21782,3.981938 -7.29624,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26307" />
-              <path
-                 id="path26313"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -493.85066,86.880243 6.93456,0 0.56252,3.981938 -7.29624,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -510.81319,86.880243 40.01244,0 0.65751,3.98194 -40.82924,-2e-6 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26315" />
-              <path
-                 id="path26317"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -468.96766,86.880245 7.11134,-2e-6 0.8554,3.98194 -7.29624,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -460.21722,86.880243 6.93456,0 1.29735,3.98194 -7.29624,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26319" />
-              <path
-                 id="path26321"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -451.64355,86.880243 6.93456,0 1.7393,3.98194 -7.38463,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -443.15827,86.880243 7.19973,0 1.91608,3.98194 -7.29624,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26323" />
-              <path
-                 id="path26325"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -434.31944,86.880243 7.3765,0 1.73931,3.98194 -7.29624,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -425.281,86.880243 7.46489,0 1.65092,3.98194 -7.29624,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26327" />
-              <path
-                 id="path26329"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -534.17498,81.681343 6.4082,0.102727 -0.95315,3.759108 -6.86299,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -526.39128,81.78407 6.52279,0 -0.53744,3.759108 -6.86303,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26331" />
-              <path
-                 id="path26333"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -518.40986,81.784072 6.52278,0 -0.2049,3.759108 -6.86298,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -469.91491,81.680028 6.95279,-2e-6 0.83632,3.846207 -7.13355,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26339" />
-              <path
-                 id="path26341"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -461.3596,81.680026 6.77995,0 1.26838,3.846207 -7.13354,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -452.97712,81.680026 6.77992,0 1.70056,3.846207 -7.22,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26343" />
-              <path
-                 id="path26345"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -444.68105,81.680026 7.03915,0 1.87335,3.846207 -7.13348,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -436.03932,81.680026 7.21201,0 1.7005,3.846207 -7.13356,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26347" />
-              <path
-                 id="path26349"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -427.20241,81.680026 7.29836,0 1.61414,3.846207 -7.13356,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -510.63169,81.784072 6.52278,0 0.14866,3.759108 -6.86298,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26351" />
-              <path
-                 id="path26353"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -502.85352,81.784072 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -494.81018,81.784072 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26355" />
-              <path
-                 id="path26357"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -486.67845,81.767125 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -478.45364,81.784072 6.78325,-0.102729 0.41383,3.861837 -6.86298,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26359" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -532.36109,76.989189 6.20531,0.05888 -0.92112,3.759108 -6.63235,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26361" />
-              <path
-                 id="path26363"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -524.82651,77.048073 6.30359,0 -0.51938,3.759108 -6.63239,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -517.11331,77.048075 6.30357,0 -0.19801,3.759108 -6.63234,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26365" />
-              <path
-                 id="path26367"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -470.2481,76.944031 6.71913,-2e-6 0.80821,3.846207 -6.89381,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -461.9803,76.944029 6.5521,0 1.22575,3.846207 -6.89381,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26369" />
-              <path
-                 id="path26371"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -453.87953,76.944029 6.55207,0 1.64341,3.846207 -6.97736,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -445.86226,76.944029 6.80259,0 1.81039,3.846207 -6.89375,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26373" />
-              <path
-                 id="path26375"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -437.51095,76.944029 6.96964,0 1.64336,3.846207 -6.89383,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -428.97101,76.944029 7.05309,0 1.55989,3.846207 -6.89383,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26377" />
-              <path
-                 id="path26379"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -509.59654,77.048075 6.30357,0 0.14367,3.759108 -6.63234,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -502.07977,77.048075 6.55984,-0.102729 0.22908,3.861837 -6.63234,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26381" />
-              <path
-                 id="path26383"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -494.30673,77.048075 6.55983,-0.102729 0.22908,3.861837 -6.63234,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -486.44828,77.031128 6.55983,-0.102729 0.22908,3.861837 -6.63234,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26385" />
-              <path
-                 id="path26387"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -478.49988,77.048075 6.55529,-0.102729 0.39993,3.861837 -6.63234,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path26391"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -530.70365,72.180865 6.03127,0.06181 -0.89529,3.946497 -6.44633,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -523.3804,72.242685 6.12679,0 -0.50481,3.946496 -6.44637,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26393" />
-              <path
-                 id="path26395"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -515.88353,72.242687 6.12677,0 -0.19246,3.946496 -6.44632,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -470.33276,72.133456 6.53067,-2e-6 0.78555,4.037937 -6.70046,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26397" />
-              <path
-                 id="path26399"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -462.29685,72.133454 6.36833,0 1.19137,4.037937 -6.70046,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -454.42329,72.133454 6.36831,0 1.59731,4.037937 -6.78166,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26401" />
-              <path
-                 id="path26403"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -446.63088,72.133454 6.6118,0 1.75961,4.037937 -6.7004,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -438.5138,72.133454 6.77416,0 1.59727,4.037937 -6.70048,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26405" />
-              <path
-                 id="path26407"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -430.21338,72.133454 6.85527,0 1.51614,4.037937 -6.70048,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -508.57759,72.242687 6.12678,0 0.13964,3.946496 -6.44632,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26409" />
-              <path
-                 id="path26411"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -501.27164,72.242687 6.37585,-0.10785 0.22266,4.054346 -6.44632,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -493.71661,72.242687 6.37584,-0.10785 0.22266,4.054346 -6.44632,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26413" />
-              <path
-                 id="path26415"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -486.07857,72.224895 6.37584,-0.10785 0.22266,4.054346 -6.44632,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -478.3531,72.242687 6.37143,-0.10785 0.38871,4.054346 -6.44632,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26417" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -529.13475,67.887037 5.85032,0.05365 -0.86843,3.424996 -6.25293,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26419" />
-              <path
-                 id="path26421"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -522.03121,67.940687 5.94297,0 -0.48966,3.424995 -6.25297,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -514.75926,67.940689 5.94295,0 -0.18669,3.424995 -6.25291,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26423" />
-              <path
-                 id="path26425"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -470.57511,67.845892 6.33474,-1e-6 0.76198,3.504352 -6.49943,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -462.78029,67.845891 6.17727,0 1.15563,3.504352 -6.49944,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26427" />
-              <path
-                 id="path26429"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -455.14295,67.845891 6.17725,0 1.54939,3.504352 -6.5782,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -447.58433,67.845891 6.41344,0 1.70682,3.504352 -6.49938,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26431" />
-              <path
-                 id="path26433"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -439.71077,67.845891 6.57092,0 1.54935,3.504352 -6.49946,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -431.65938,67.845891 6.6496,0 1.47065,3.504352 -6.49945,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26435" />
-              <path
-                 id="path26437"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -507.67252,67.940689 5.94297,0 0.13545,3.424995 -6.25292,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -500.58576,67.940689 6.18456,-0.0936 0.21598,3.518594 -6.25292,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26439" />
-              <path
-                 id="path26441"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -493.25739,67.940689 6.18455,-0.0936 0.21598,3.518594 -6.25292,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m -485.84851,67.925248 6.18455,-0.0936 0.21598,3.518593 -6.25292,0 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path26443" />
-              <path
-                 id="path26445"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m -478.35482,67.940689 6.18028,-0.0936 0.37704,3.518594 -6.25291,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
+        <g id="g26652" transform="matrix(1.1805357,0,0,1.1805357,65.291872,173.59376)">
+          <g id="g26861" transform="matrix(0.34244354,0,0,0.34244354,-454.73493,-13.993042)">
+            <path sodipodi:nodetypes="ccccscccccc" style="opacity:0.8699552;fill:#5e6b6a;fill-opacity:1;stroke:none;filter:url(#filter7271-4)" d="m 453.84618,1426.2372 98.06107,0 9.25241,25.3223 2.01562,0.4531 c 0.10844,0.2803 0.10113,0.6035 -0.0199,0.8786 -0.10048,0.2284 -0.27746,0.4224 -0.49574,0.5433 l -114.59819,-1.125 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 8.90973,-25.3223" id="path15344" inkscape:path-effect="#path-effect6808-1" inkscape:original-d="m 453.84618,1426.2372 98.06107,0 9.25241,25.3223 2.01562,0.4531 c 0.0752,0.4655 0.0673,0.7 -0.0199,0.8786 -0.0872,0.1786 -0.2537,0.3014 -0.49574,0.5433 l -114.59819,-1.125 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 z" inkscape:connector-curvature="0" transform="matrix(-1.0890434,0,0,1.0890434,70.544085,-1488.3466)"/>
+            <path inkscape:connector-curvature="0" inkscape:original-d="m -423.7141,64.887563 -106.79276,0 -10.07628,27.57716 c 17.06578,0 94.83122,1.094955 123.16885,0.81678 l 1.49745,0.1362 1.36129,-0.1362 0.54453,-0.81678 z" inkscape:path-effect="#path-effect16581" id="path15346" d="m -423.7141,64.887563 -106.79276,0 -10.07628,27.57716 123.16885,0.81678 1.49745,0.1362 1.36129,-0.1362 0.54453,-0.81678 -9.70308,-27.57716" style="fill:#a5b0af;fill-opacity:1;stroke:none" sodipodi:nodetypes="cccccccc"/>
+            <path style="fill:url(#linearGradient27000);fill-opacity:1;stroke:none" d="m -423.7141,64.887563 -106.79276,0 -10.07628,27.57716 126.57212,0 -9.70308,-27.57716" id="path15348" inkscape:path-effect="#path-effect16578" inkscape:original-d="m -423.7141,64.887563 -106.79276,0 -10.07628,27.57716 c 19.94423,-12.968463 113.70273,19.304327 126.57212,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path26518" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -536.08043,86.896253 6.9,-0.01601 -1.01332,3.981938 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -527.7181,86.880243 6.93456,0 -0.57138,3.981938 -7.29624,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26520" transform="translate(0.39999,0.7)"/>
+            <path id="path26522" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -519.23283,86.880245 6.93456,0 -0.21782,3.981938 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path id="path26526" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -510.81319,86.880243 40.01244,0 0.65751,3.98194 -40.82924,-2e-6 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -468.96766,86.880245 7.11134,-2e-6 0.8554,3.98194 -7.29624,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26528" transform="translate(0.39999,0.7)"/>
+            <path id="path26530" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -460.21722,86.880243 6.93456,0 1.29735,3.98194 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -451.64355,86.880243 6.93456,0 1.7393,3.98194 -7.38463,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26532" transform="translate(0.39999,0.7)"/>
+            <path id="path26534" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -443.15827,86.880243 7.19973,0 1.91608,3.98194 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -434.31944,86.880243 7.3765,0 1.73931,3.98194 -7.29624,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26536" transform="translate(0.39999,0.7)"/>
+            <path id="path26538" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -425.281,86.880243 7.46489,0 1.65092,3.98194 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -534.17498,81.681343 6.4082,0.102727 -0.95315,3.759108 -6.86299,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26540" transform="translate(0.39999,0.7)"/>
+            <path id="path26542" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -526.39128,81.78407 6.52279,0 -0.53744,3.759108 -6.86303,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -518.40986,81.784072 6.52278,0 -0.2049,3.759108 -6.86298,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26544" transform="translate(0.39999,0.7)"/>
+            <path id="path26546" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -469.91491,81.680028 6.95279,-2e-6 0.83632,3.846207 -7.13355,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -461.3596,81.680026 6.77995,0 1.26838,3.846207 -7.13354,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26548" transform="translate(0.39999,0.7)"/>
+            <path id="path26550" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -452.97712,81.680026 6.77992,0 1.70056,3.846207 -7.22,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -444.68105,81.680026 7.03915,0 1.87335,3.846207 -7.13348,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26552" transform="translate(0.39999,0.7)"/>
+            <path id="path26554" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -436.03932,81.680026 7.21201,0 1.7005,3.846207 -7.13356,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -427.20241,81.680026 7.29836,0 1.61414,3.846207 -7.13356,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26556" transform="translate(0.39999,0.7)"/>
+            <path id="path26558" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -510.63169,81.784072 6.52278,0 0.14866,3.759108 -6.86298,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -502.85352,81.784072 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26560" transform="translate(0.39999,0.7)"/>
+            <path id="path26562" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -494.81018,81.784072 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -486.67845,81.767125 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26564" transform="translate(0.39999,0.7)"/>
+            <path id="path26566" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -478.45364,81.784072 6.78325,-0.102729 0.41383,3.861837 -6.86298,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path id="path26568" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -532.36109,76.989189 6.20531,0.05888 -0.92112,3.759108 -6.63235,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -524.82651,77.048073 6.30359,0 -0.51938,3.759108 -6.63239,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26570" transform="translate(0.39999,0.7)"/>
+            <path id="path26572" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -517.11331,77.048075 6.30357,0 -0.19801,3.759108 -6.63234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -470.2481,76.944031 6.71913,-2e-6 0.80821,3.846207 -6.89381,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26574" transform="translate(0.39999,0.7)"/>
+            <path id="path26576" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -461.9803,76.944029 6.5521,0 1.22575,3.846207 -6.89381,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -453.87953,76.944029 6.55207,0 1.64341,3.846207 -6.97736,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26578" transform="translate(0.39999,0.7)"/>
+            <path id="path26580" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -445.86226,76.944029 6.80259,0 1.81039,3.846207 -6.89375,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -437.51095,76.944029 6.96964,0 1.64336,3.846207 -6.89383,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26582" transform="translate(0.39999,0.7)"/>
+            <path id="path26584" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -428.97101,76.944029 7.05309,0 1.55989,3.846207 -6.89383,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -509.59654,77.048075 6.30357,0 0.14367,3.759108 -6.63234,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26586" transform="translate(0.39999,0.7)"/>
+            <path id="path26588" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -502.07977,77.048075 6.55984,-0.102729 0.22908,3.861837 -6.63234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -494.30673,77.048075 6.55983,-0.102729 0.22908,3.861837 -6.63234,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26590" transform="translate(0.39999,0.7)"/>
+            <path id="path26592" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -486.44828,77.031128 6.55983,-0.102729 0.22908,3.861837 -6.63234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -478.49988,77.048075 6.55529,-0.102729 0.39993,3.861837 -6.63234,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26594" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -530.70365,72.180865 6.03127,0.06181 -0.89529,3.946497 -6.44633,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26596" transform="translate(0.39999,0.7)"/>
+            <path id="path26598" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -523.3804,72.242685 6.12679,0 -0.50481,3.946496 -6.44637,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -515.88353,72.242687 6.12677,0 -0.19246,3.946496 -6.44632,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26600" transform="translate(0.39999,0.7)"/>
+            <path id="path26602" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -470.33276,72.133456 6.53067,-2e-6 0.78555,4.037937 -6.70046,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -462.29685,72.133454 6.36833,0 1.19137,4.037937 -6.70046,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26604" transform="translate(0.39999,0.7)"/>
+            <path id="path26606" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -454.42329,72.133454 6.36831,0 1.59731,4.037937 -6.78166,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -446.63088,72.133454 6.6118,0 1.75961,4.037937 -6.7004,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26608" transform="translate(0.39999,0.7)"/>
+            <path id="path26610" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -438.5138,72.133454 6.77416,0 1.59727,4.037937 -6.70048,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -430.21338,72.133454 6.85527,0 1.51614,4.037937 -6.70048,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26612" transform="translate(0.39999,0.7)"/>
+            <path id="path26614" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -508.57759,72.242687 6.12678,0 0.13964,3.946496 -6.44632,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -501.27164,72.242687 6.37585,-0.10785 0.22266,4.054346 -6.44632,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26616" transform="translate(0.39999,0.7)"/>
+            <path id="path26618" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -493.71661,72.242687 6.37584,-0.10785 0.22266,4.054346 -6.44632,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -486.07857,72.224895 6.37584,-0.10785 0.22266,4.054346 -6.44632,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26620" transform="translate(0.39999,0.7)"/>
+            <path id="path26622" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -478.3531,72.242687 6.37143,-0.10785 0.38871,4.054346 -6.44632,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path id="path26624" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -529.13475,67.887037 5.85032,0.05365 -0.86843,3.424996 -6.25293,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -522.03121,67.940687 5.94297,0 -0.48966,3.424995 -6.25297,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26626" transform="translate(0.39999,0.7)"/>
+            <path id="path26628" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -514.75926,67.940689 5.94295,0 -0.18669,3.424995 -6.25291,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -470.57511,67.845892 6.33474,-1e-6 0.76198,3.504352 -6.49943,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26630" transform="translate(0.39999,0.7)"/>
+            <path id="path26632" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -462.78029,67.845891 6.17727,0 1.15563,3.504352 -6.49944,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -455.14295,67.845891 6.17725,0 1.54939,3.504352 -6.5782,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26634" transform="translate(0.39999,0.7)"/>
+            <path id="path26636" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -447.58433,67.845891 6.41344,0 1.70682,3.504352 -6.49938,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -439.71077,67.845891 6.57092,0 1.54935,3.504352 -6.49946,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26638" transform="translate(0.39999,0.7)"/>
+            <path id="path26640" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -431.65938,67.845891 6.6496,0 1.47065,3.504352 -6.49945,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -507.67252,67.940689 5.94297,0 0.13545,3.424995 -6.25292,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26642" transform="translate(0.39999,0.7)"/>
+            <path id="path26644" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -500.58576,67.940689 6.18456,-0.0936 0.21598,3.518594 -6.25292,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -493.25739,67.940689 6.18455,-0.0936 0.21598,3.518594 -6.25292,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26646" transform="translate(0.39999,0.7)"/>
+            <path id="path26648" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m -485.84851,67.925248 6.18455,-0.0936 0.21598,3.518593 -6.25292,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="translate(0.39999,0.7)"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -478.35482,67.940689 6.18028,-0.0936 0.37704,3.518594 -6.25291,0 z" style="fill:#373f41;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" id="path26650" transform="translate(0.39999,0.7)"/>
+            <g id="g26447">
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -536.08043,86.896253 6.9,-0.01601 -1.01332,3.981938 -7.29624,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect26299"/>
+              <path id="path26305" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -527.7181,86.880243 6.93456,0 -0.57138,3.981938 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -519.23283,86.880245 6.93456,0 -0.21782,3.981938 -7.29624,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26307"/>
+              <path id="path26313" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -493.85066,86.880243 6.93456,0 0.56252,3.981938 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -510.81319,86.880243 40.01244,0 0.65751,3.98194 -40.82924,-2e-6 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26315"/>
+              <path id="path26317" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -468.96766,86.880245 7.11134,-2e-6 0.8554,3.98194 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -460.21722,86.880243 6.93456,0 1.29735,3.98194 -7.29624,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26319"/>
+              <path id="path26321" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -451.64355,86.880243 6.93456,0 1.7393,3.98194 -7.38463,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -443.15827,86.880243 7.19973,0 1.91608,3.98194 -7.29624,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26323"/>
+              <path id="path26325" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -434.31944,86.880243 7.3765,0 1.73931,3.98194 -7.29624,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -425.281,86.880243 7.46489,0 1.65092,3.98194 -7.29624,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26327"/>
+              <path id="path26329" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -534.17498,81.681343 6.4082,0.102727 -0.95315,3.759108 -6.86299,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -526.39128,81.78407 6.52279,0 -0.53744,3.759108 -6.86303,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26331"/>
+              <path id="path26333" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -518.40986,81.784072 6.52278,0 -0.2049,3.759108 -6.86298,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -469.91491,81.680028 6.95279,-2e-6 0.83632,3.846207 -7.13355,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26339"/>
+              <path id="path26341" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -461.3596,81.680026 6.77995,0 1.26838,3.846207 -7.13354,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -452.97712,81.680026 6.77992,0 1.70056,3.846207 -7.22,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26343"/>
+              <path id="path26345" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -444.68105,81.680026 7.03915,0 1.87335,3.846207 -7.13348,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -436.03932,81.680026 7.21201,0 1.7005,3.846207 -7.13356,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26347"/>
+              <path id="path26349" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -427.20241,81.680026 7.29836,0 1.61414,3.846207 -7.13356,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -510.63169,81.784072 6.52278,0 0.14866,3.759108 -6.86298,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26351"/>
+              <path id="path26353" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -502.85352,81.784072 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -494.81018,81.784072 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26355"/>
+              <path id="path26357" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -486.67845,81.767125 6.78795,-0.102729 0.23705,3.861837 -6.86298,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -478.45364,81.784072 6.78325,-0.102729 0.41383,3.861837 -6.86298,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26359"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -532.36109,76.989189 6.20531,0.05888 -0.92112,3.759108 -6.63235,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26361"/>
+              <path id="path26363" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -524.82651,77.048073 6.30359,0 -0.51938,3.759108 -6.63239,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -517.11331,77.048075 6.30357,0 -0.19801,3.759108 -6.63234,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26365"/>
+              <path id="path26367" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -470.2481,76.944031 6.71913,-2e-6 0.80821,3.846207 -6.89381,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -461.9803,76.944029 6.5521,0 1.22575,3.846207 -6.89381,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26369"/>
+              <path id="path26371" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -453.87953,76.944029 6.55207,0 1.64341,3.846207 -6.97736,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -445.86226,76.944029 6.80259,0 1.81039,3.846207 -6.89375,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26373"/>
+              <path id="path26375" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -437.51095,76.944029 6.96964,0 1.64336,3.846207 -6.89383,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -428.97101,76.944029 7.05309,0 1.55989,3.846207 -6.89383,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26377"/>
+              <path id="path26379" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -509.59654,77.048075 6.30357,0 0.14367,3.759108 -6.63234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -502.07977,77.048075 6.55984,-0.102729 0.22908,3.861837 -6.63234,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26381"/>
+              <path id="path26383" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -494.30673,77.048075 6.55983,-0.102729 0.22908,3.861837 -6.63234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -486.44828,77.031128 6.55983,-0.102729 0.22908,3.861837 -6.63234,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26385"/>
+              <path id="path26387" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -478.49988,77.048075 6.55529,-0.102729 0.39993,3.861837 -6.63234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path id="path26391" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -530.70365,72.180865 6.03127,0.06181 -0.89529,3.946497 -6.44633,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -523.3804,72.242685 6.12679,0 -0.50481,3.946496 -6.44637,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26393"/>
+              <path id="path26395" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -515.88353,72.242687 6.12677,0 -0.19246,3.946496 -6.44632,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -470.33276,72.133456 6.53067,-2e-6 0.78555,4.037937 -6.70046,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26397"/>
+              <path id="path26399" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -462.29685,72.133454 6.36833,0 1.19137,4.037937 -6.70046,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -454.42329,72.133454 6.36831,0 1.59731,4.037937 -6.78166,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26401"/>
+              <path id="path26403" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -446.63088,72.133454 6.6118,0 1.75961,4.037937 -6.7004,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -438.5138,72.133454 6.77416,0 1.59727,4.037937 -6.70048,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26405"/>
+              <path id="path26407" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -430.21338,72.133454 6.85527,0 1.51614,4.037937 -6.70048,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -508.57759,72.242687 6.12678,0 0.13964,3.946496 -6.44632,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26409"/>
+              <path id="path26411" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -501.27164,72.242687 6.37585,-0.10785 0.22266,4.054346 -6.44632,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -493.71661,72.242687 6.37584,-0.10785 0.22266,4.054346 -6.44632,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26413"/>
+              <path id="path26415" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -486.07857,72.224895 6.37584,-0.10785 0.22266,4.054346 -6.44632,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -478.3531,72.242687 6.37143,-0.10785 0.38871,4.054346 -6.44632,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26417"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -529.13475,67.887037 5.85032,0.05365 -0.86843,3.424996 -6.25293,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26419"/>
+              <path id="path26421" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -522.03121,67.940687 5.94297,0 -0.48966,3.424995 -6.25297,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -514.75926,67.940689 5.94295,0 -0.18669,3.424995 -6.25291,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26423"/>
+              <path id="path26425" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -470.57511,67.845892 6.33474,-1e-6 0.76198,3.504352 -6.49943,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -462.78029,67.845891 6.17727,0 1.15563,3.504352 -6.49944,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26427"/>
+              <path id="path26429" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -455.14295,67.845891 6.17725,0 1.54939,3.504352 -6.5782,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -447.58433,67.845891 6.41344,0 1.70682,3.504352 -6.49938,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26431"/>
+              <path id="path26433" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -439.71077,67.845891 6.57092,0 1.54935,3.504352 -6.49946,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -431.65938,67.845891 6.6496,0 1.47065,3.504352 -6.49945,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26435"/>
+              <path id="path26437" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -507.67252,67.940689 5.94297,0 0.13545,3.424995 -6.25292,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -500.58576,67.940689 6.18456,-0.0936 0.21598,3.518594 -6.25292,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26439"/>
+              <path id="path26441" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -493.25739,67.940689 6.18455,-0.0936 0.21598,3.518594 -6.25292,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -485.84851,67.925248 6.18455,-0.0936 0.21598,3.518593 -6.25292,0 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26443"/>
+              <path id="path26445" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -478.35482,67.940689 6.18028,-0.0936 0.37704,3.518594 -6.25291,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
             </g>
           </g>
-          <g
-             transform="translate(0.39999,0.69999962)"
-             style="fill:#373f41;fill-opacity:0.74901961"
-             id="g26516" />
+          <g transform="translate(0.39999,0.69999962)" style="fill:#373f41;fill-opacity:0.74901961" id="g26516"/>
         </g>
-        <g
-           transform="matrix(-0.9250156,0,0,0.72617059,-183.28098,-3256.6126)"
-           id="g17965">
-          <path
-             inkscape:connector-curvature="0"
-             id="path17967"
-             d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20384-7)" />
-          <path
-             style="fill:url(#linearGradient18739);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z"
-             id="path17969"
-             inkscape:connector-curvature="0" />
+        <g transform="matrix(-0.9250156,0,0,0.72617059,-183.28098,-3256.6126)" id="g17965">
+          <path inkscape:connector-curvature="0" id="path17967" d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20384-7)"/>
+          <path style="fill:url(#linearGradient18739);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z" id="path17969" inkscape:connector-curvature="0"/>
         </g>
-        <g
-           id="g22088"
-           transform="matrix(0.92501408,0,0,0.72617059,-1146.0218,-3257.0876)">
-          <path
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20384-7)"
-             d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z"
-             id="path22090"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path22092"
-             d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z"
-             style="fill:url(#linearGradient18737);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <g id="g22088" transform="matrix(0.92501408,0,0,0.72617059,-1146.0218,-3257.0876)">
+          <path style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20384-7)" d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z" id="path22090" inkscape:connector-curvature="0"/>
+          <path inkscape:connector-curvature="0" id="path22092" d="m 526.85407,4708.1776 c -0.0827,-0.011 -0.15654,0 -0.21875,0.031 -0.12428,0.068 -0.18614,0.2144 -0.1875,0.4376 l -0.0937,14.6874 c -0.005,1.2679 0.41686,1.3961 0.6875,1.25 l 4.21875,-2.2812 34.96875,50.2188 c -1.22444,0.6564 -2.44528,1.3058 -4.25,2.2812 -0.2707,0.1442 -0.3761,0.5606 0.6875,1.25 l 12.28125,8 c 0.18977,0.1236 0.37538,0.1303 0.5,0.062 0.12461,-0.067 0.21622,-0.2143 0.21875,-0.4375 l 0.125,-14.6875 c 0.0118,-1.2679 -0.38479,-1.3948 -0.65625,-1.25 -1.98698,1.0702 -2.90115,1.5613 -4.1875,2.25 l -35,-50.25 4.21875,-2.2813 c 0.26996,-0.1457 0.37976,-0.5661 -0.6875,-1.25 l -12.34375,-7.9374 c -0.0951,-0.061 -0.19855,-0.082 -0.28125,-0.094 z" style="fill:url(#linearGradient18737);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
         </g>
       </g>
     </g>
diff --git a/misc/images/svg/elements/Network_adapter.svg b/misc/images/svg/elements/Network_adapter.svg
index 78d51b377f8..c196da539f4 100644
--- a/misc/images/svg/elements/Network_adapter.svg
+++ b/misc/images/svg/elements/Network_adapter.svg
@@ -1,3314 +1,574 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="112.55525"
-   height="128"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <filter
-       inkscape:collect="always"
-       id="filter38075"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.1310237"
-         id="feGaussianBlur38077" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="112.55525" height="128" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 1">
+  <defs id="defs4">
+    <filter inkscape:collect="always" id="filter38075" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="2.1310237" id="feGaussianBlur38077"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23865"
-       id="linearGradient38437"
-       gradientUnits="userSpaceOnUse"
-       x1="420.375"
-       y1="5282.606"
-       x2="361.3475"
-       y2="5204.1172" />
-    <linearGradient
-       id="linearGradient23865">
-      <stop
-         style="stop-color:#31855e;stop-opacity:1;"
-         offset="0"
-         id="stop23867" />
-      <stop
-         style="stop-color:#a2c1b2;stop-opacity:1;"
-         offset="1"
-         id="stop23869" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23865" id="linearGradient38437" gradientUnits="userSpaceOnUse" x1="420.375" y1="5282.606" x2="361.3475" y2="5204.1172"/>
+    <linearGradient id="linearGradient23865">
+      <stop style="stop-color:#31855e;stop-opacity:1;" offset="0" id="stop23867"/>
+      <stop style="stop-color:#a2c1b2;stop-opacity:1;" offset="1" id="stop23869"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-7"
-       id="linearGradient38439"
-       gradientUnits="userSpaceOnUse"
-       x1="335.69891"
-       y1="5263.2075"
-       x2="304.23267"
-       y2="5263.2075" />
-    <linearGradient
-       id="linearGradient5801-0-7">
-      <stop
-         id="stop5803-5-4"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5805-98-09"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-7" id="linearGradient38439" gradientUnits="userSpaceOnUse" x1="335.69891" y1="5263.2075" x2="304.23267" y2="5263.2075"/>
+    <linearGradient id="linearGradient5801-0-7">
+      <stop id="stop5803-5-4" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop5805-98-09" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24231"
-       id="linearGradient38441"
-       gradientUnits="userSpaceOnUse"
-       x1="396.41733"
-       y1="5238.1143"
-       x2="396.3739"
-       y2="5250.9746" />
-    <linearGradient
-       id="linearGradient24231">
-      <stop
-         style="stop-color:#8c8c8c;stop-opacity:1;"
-         offset="0"
-         id="stop24233" />
-      <stop
-         id="stop24235"
-         offset="0.63122052"
-         style="stop-color:#353535;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="1"
-         id="stop24237" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24231" id="linearGradient38441" gradientUnits="userSpaceOnUse" x1="396.41733" y1="5238.1143" x2="396.3739" y2="5250.9746"/>
+    <linearGradient id="linearGradient24231">
+      <stop style="stop-color:#8c8c8c;stop-opacity:1;" offset="0" id="stop24233"/>
+      <stop id="stop24235" offset="0.63122052" style="stop-color:#353535;stop-opacity:1;"/>
+      <stop style="stop-color:#959595;stop-opacity:1;" offset="1" id="stop24237"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24231"
-       id="linearGradient38443"
-       gradientUnits="userSpaceOnUse"
-       x1="396.40118"
-       y1="5225.7065"
-       x2="396.69312"
-       y2="5238.269" />
-    <linearGradient
-       id="linearGradient129018">
-      <stop
-         style="stop-color:#8c8c8c;stop-opacity:1;"
-         offset="0"
-         id="stop129020" />
-      <stop
-         id="stop129022"
-         offset="0.63122052"
-         style="stop-color:#353535;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="1"
-         id="stop129024" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24231" id="linearGradient38443" gradientUnits="userSpaceOnUse" x1="396.40118" y1="5225.7065" x2="396.69312" y2="5238.269"/>
+    <linearGradient id="linearGradient129018">
+      <stop style="stop-color:#8c8c8c;stop-opacity:1;" offset="0" id="stop129020"/>
+      <stop id="stop129022" offset="0.63122052" style="stop-color:#353535;stop-opacity:1;"/>
+      <stop style="stop-color:#959595;stop-opacity:1;" offset="1" id="stop129024"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24195"
-       id="linearGradient38445"
-       gradientUnits="userSpaceOnUse"
-       x1="395.21368"
-       y1="5213.3315"
-       x2="395.25562"
-       y2="5224.0815" />
-    <linearGradient
-       id="linearGradient24195">
-      <stop
-         id="stop24197"
-         offset="0"
-         style="stop-color:#8c8c8c;stop-opacity:1;" />
-      <stop
-         style="stop-color:#353535;stop-opacity:1;"
-         offset="0.65012163"
-         id="stop24199" />
-      <stop
-         id="stop24201"
-         offset="1"
-         style="stop-color:#959595;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24195" id="linearGradient38445" gradientUnits="userSpaceOnUse" x1="395.21368" y1="5213.3315" x2="395.25562" y2="5224.0815"/>
+    <linearGradient id="linearGradient24195">
+      <stop id="stop24197" offset="0" style="stop-color:#8c8c8c;stop-opacity:1;"/>
+      <stop style="stop-color:#353535;stop-opacity:1;" offset="0.65012163" id="stop24199"/>
+      <stop id="stop24201" offset="1" style="stop-color:#959595;stop-opacity:1;"/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter24081"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.51748509"
-         id="feGaussianBlur24083" />
+    <filter inkscape:collect="always" id="filter24081" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.51748509" id="feGaussianBlur24083"/>
     </filter>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23827"
-       is_visible="true" />
-    <filter
-       inkscape:collect="always"
-       id="filter24175"
-       x="-0.14029559"
-       width="1.2805912"
-       y="-0.22585672"
-       height="1.4517134"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.89391266"
-         id="feGaussianBlur24177" />
+    <inkscape:path-effect effect="spiro" id="path-effect23827" is_visible="true"/>
+    <filter inkscape:collect="always" id="filter24175" x="-0.14029559" width="1.2805912" y="-0.22585672" height="1.4517134" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.89391266" id="feGaussianBlur24177"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24195"
-       id="linearGradient38447"
-       gradientUnits="userSpaceOnUse"
-       x1="435.02841"
-       y1="5218.5449"
-       x2="437.55905"
-       y2="5228.9746" />
-    <linearGradient
-       id="linearGradient129037">
-      <stop
-         id="stop129039"
-         offset="0"
-         style="stop-color:#8c8c8c;stop-opacity:1;" />
-      <stop
-         style="stop-color:#353535;stop-opacity:1;"
-         offset="0.65012163"
-         id="stop129041" />
-      <stop
-         id="stop129043"
-         offset="1"
-         style="stop-color:#959595;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24195" id="linearGradient38447" gradientUnits="userSpaceOnUse" x1="435.02841" y1="5218.5449" x2="437.55905" y2="5228.9746"/>
+    <linearGradient id="linearGradient129037">
+      <stop id="stop129039" offset="0" style="stop-color:#8c8c8c;stop-opacity:1;"/>
+      <stop style="stop-color:#353535;stop-opacity:1;" offset="0.65012163" id="stop129041"/>
+      <stop id="stop129043" offset="1" style="stop-color:#959595;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4757-3-7-9-7-3-1"
-       id="linearGradient38449"
-       gradientUnits="userSpaceOnUse"
-       x1="294.57544"
-       y1="5226.5747"
-       x2="324.40939"
-       y2="5226.9282" />
-    <linearGradient
-       id="linearGradient4757-3-7-9-7-3-1">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1;"
-         offset="0"
-         id="stop4759-0-5-6-4-0-8" />
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="1"
-         id="stop4761-2-4-0-1-5-9" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4757-3-7-9-7-3-1" id="linearGradient38449" gradientUnits="userSpaceOnUse" x1="294.57544" y1="5226.5747" x2="324.40939" y2="5226.9282"/>
+    <linearGradient id="linearGradient4757-3-7-9-7-3-1">
+      <stop style="stop-color:#f5f5f5;stop-opacity:1;" offset="0" id="stop4759-0-5-6-4-0-8"/>
+      <stop style="stop-color:#cccccc;stop-opacity:1;" offset="1" id="stop4761-2-4-0-1-5-9"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24019"
-       id="linearGradient38451"
-       gradientUnits="userSpaceOnUse"
-       x1="324.40939"
-       y1="5226.9282"
-       x2="294.57544"
-       y2="5226.5747" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient24019">
-      <stop
-         style="stop-color:#808080;stop-opacity:1;"
-         offset="0"
-         id="stop24021" />
-      <stop
-         style="stop-color:#808080;stop-opacity:0;"
-         offset="1"
-         id="stop24023" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24019" id="linearGradient38451" gradientUnits="userSpaceOnUse" x1="324.40939" y1="5226.9282" x2="294.57544" y2="5226.5747"/>
+    <linearGradient inkscape:collect="always" id="linearGradient24019">
+      <stop style="stop-color:#808080;stop-opacity:1;" offset="0" id="stop24021"/>
+      <stop style="stop-color:#808080;stop-opacity:0;" offset="1" id="stop24023"/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter24179"
-       x="-0.14029559"
-       width="1.2805912"
-       y="-0.22585672"
-       height="1.4517134"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.89391266"
-         id="feGaussianBlur24181" />
+    <filter inkscape:collect="always" id="filter24179" x="-0.14029559" width="1.2805912" y="-0.22585672" height="1.4517134" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.89391266" id="feGaussianBlur24181"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22646"
-       id="linearGradient38453"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient22646">
-      <stop
-         style="stop-color:#d7d700;stop-opacity:1;"
-         offset="0"
-         id="stop22648" />
-      <stop
-         style="stop-color:#7e7e00;stop-opacity:1;"
-         offset="1"
-         id="stop22650" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22646" id="linearGradient38453" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient22646">
+      <stop style="stop-color:#d7d700;stop-opacity:1;" offset="0" id="stop22648"/>
+      <stop style="stop-color:#7e7e00;stop-opacity:1;" offset="1" id="stop22650"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22662"
-       id="linearGradient38455"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient22662">
-      <stop
-         id="stop22664"
-         offset="0"
-         style="stop-color:#d71700;stop-opacity:1;" />
-      <stop
-         id="stop22666"
-         offset="1"
-         style="stop-color:#440e00;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22662" id="linearGradient38455" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient22662">
+      <stop id="stop22664" offset="0" style="stop-color:#d71700;stop-opacity:1;"/>
+      <stop id="stop22666" offset="1" style="stop-color:#440e00;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22672"
-       id="linearGradient38457"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient22672">
-      <stop
-         style="stop-color:#00d71b;stop-opacity:1;"
-         offset="0"
-         id="stop22674" />
-      <stop
-         style="stop-color:#0a4400;stop-opacity:1;"
-         offset="1"
-         id="stop22676" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22672" id="linearGradient38457" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient22672">
+      <stop style="stop-color:#00d71b;stop-opacity:1;" offset="0" id="stop22674"/>
+      <stop style="stop-color:#0a4400;stop-opacity:1;" offset="1" id="stop22676"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38459"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient23875">
-      <stop
-         style="stop-color:#9f981f;stop-opacity:1;"
-         offset="0"
-         id="stop23877" />
-      <stop
-         style="stop-color:#9f981f;stop-opacity:0;"
-         offset="1"
-         id="stop23879" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38459" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" id="linearGradient23875">
+      <stop style="stop-color:#9f981f;stop-opacity:1;" offset="0" id="stop23877"/>
+      <stop style="stop-color:#9f981f;stop-opacity:0;" offset="1" id="stop23879"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38461"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38463"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38465"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38467"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38469"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38471"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38473"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38475"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38477"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38479"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38481"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38483"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38485"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38487"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38489"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38491"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38493"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38495"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38497"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38499"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38501"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38503"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38505"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38507"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38509"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38511"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38513"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38515"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38517"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38519"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38521"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38523"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38525"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38527"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38529"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38531"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38533"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38535"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38537"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38539"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38541"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38543"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38545"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38547"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38549"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38551"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38553"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38555"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38557"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38559"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23875"
-       id="linearGradient38561"
-       gradientUnits="userSpaceOnUse"
-       x1="485.66656"
-       y1="5312.5596"
-       x2="485.66656"
-       y2="5331.8882" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24195"
-       id="linearGradient38563"
-       gradientUnits="userSpaceOnUse"
-       x1="353.5564"
-       y1="5202.2334"
-       x2="358.03156"
-       y2="5214.2544" />
-    <linearGradient
-       id="linearGradient129429">
-      <stop
-         id="stop129431"
-         offset="0"
-         style="stop-color:#8c8c8c;stop-opacity:1;" />
-      <stop
-         style="stop-color:#353535;stop-opacity:1;"
-         offset="0.65012163"
-         id="stop129433" />
-      <stop
-         id="stop129435"
-         offset="1"
-         style="stop-color:#959595;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38461" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38463" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38465" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38467" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38469" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38471" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38473" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38475" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38477" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38479" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38481" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38483" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38485" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38487" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38489" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38491" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38493" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38495" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38497" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38499" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38501" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38503" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38505" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38507" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38509" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38511" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38513" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38515" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38517" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38519" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38521" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38523" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38525" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38527" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38529" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38531" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38533" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38535" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38537" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38539" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38541" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38543" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38545" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38547" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38549" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38551" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38553" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38555" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38557" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38559" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient23875" id="linearGradient38561" gradientUnits="userSpaceOnUse" x1="485.66656" y1="5312.5596" x2="485.66656" y2="5331.8882"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24195" id="linearGradient38563" gradientUnits="userSpaceOnUse" x1="353.5564" y1="5202.2334" x2="358.03156" y2="5214.2544"/>
+    <linearGradient id="linearGradient129429">
+      <stop id="stop129431" offset="0" style="stop-color:#8c8c8c;stop-opacity:1;"/>
+      <stop style="stop-color:#353535;stop-opacity:1;" offset="0.65012163" id="stop129433"/>
+      <stop id="stop129435" offset="1" style="stop-color:#959595;stop-opacity:1;"/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter24183"
-       x="-0.14029559"
-       width="1.2805912"
-       y="-0.22585672"
-       height="1.4517134"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.89391266"
-         id="feGaussianBlur24185" />
+    <filter inkscape:collect="always" id="filter24183" x="-0.14029559" width="1.2805912" y="-0.22585672" height="1.4517134" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.89391266" id="feGaussianBlur24185"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24231"
-       id="linearGradient38565"
-       gradientUnits="userSpaceOnUse"
-       x1="422.91656"
-       y1="5251.4478"
-       x2="465.79156"
-       y2="5292.4478" />
-    <linearGradient
-       id="linearGradient129440">
-      <stop
-         style="stop-color:#8c8c8c;stop-opacity:1;"
-         offset="0"
-         id="stop129442" />
-      <stop
-         id="stop129444"
-         offset="0.63122052"
-         style="stop-color:#353535;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="1"
-         id="stop129446" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24231" id="linearGradient38565" gradientUnits="userSpaceOnUse" x1="422.91656" y1="5251.4478" x2="465.79156" y2="5292.4478"/>
+    <linearGradient id="linearGradient129440">
+      <stop style="stop-color:#8c8c8c;stop-opacity:1;" offset="0" id="stop129442"/>
+      <stop id="stop129444" offset="0.63122052" style="stop-color:#353535;stop-opacity:1;"/>
+      <stop style="stop-color:#959595;stop-opacity:1;" offset="1" id="stop129446"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24007"
-       id="linearGradient38567"
-       gradientUnits="userSpaceOnUse"
-       x1="423.76001"
-       y1="5233.2417"
-       x2="410.45862"
-       y2="5219.6802" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient24007">
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1;"
-         offset="0"
-         id="stop24009" />
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:0;"
-         offset="1"
-         id="stop24011" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24007" id="linearGradient38567" gradientUnits="userSpaceOnUse" x1="423.76001" y1="5233.2417" x2="410.45862" y2="5219.6802"/>
+    <linearGradient inkscape:collect="always" id="linearGradient24007">
+      <stop style="stop-color:#4d4d4d;stop-opacity:1;" offset="0" id="stop24009"/>
+      <stop style="stop-color:#4d4d4d;stop-opacity:0;" offset="1" id="stop24011"/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter24003"
-       x="-0.14840657"
-       width="1.2968131"
-       y="-0.14763071"
-       height="1.2952614"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.97351999"
-         id="feGaussianBlur24005" />
+    <filter inkscape:collect="always" id="filter24003" x="-0.14840657" width="1.2968131" y="-0.14763071" height="1.2952614" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.97351999" id="feGaussianBlur24005"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18875"
-       id="linearGradient38569"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,-0.02348578,1,122.39055,-1.0003434)"
-       x1="453.79523"
-       y1="5231.5518"
-       x2="503.56018"
-       y2="5251.3506" />
-    <linearGradient
-       id="linearGradient18875">
-      <stop
-         id="stop18877"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop18879"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient18875" id="linearGradient38569" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,-0.02348578,1,122.39055,-1.0003434)" x1="453.79523" y1="5231.5518" x2="503.56018" y2="5251.3506"/>
+    <linearGradient id="linearGradient18875">
+      <stop id="stop18877" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop18879" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39719"
-       id="linearGradient38571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.9907889,0,0,1,-507.07741,0)"
-       x1="490.08032"
-       y1="5253.4458"
-       x2="516.03418"
-       y2="5271.8306" />
-    <linearGradient
-       id="linearGradient39719">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39721" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39723" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient39719" id="linearGradient38571" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.9907889,0,0,1,-507.07741,0)" x1="490.08032" y1="5253.4458" x2="516.03418" y2="5271.8306"/>
+    <linearGradient id="linearGradient39719">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39721"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39723"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24195"
-       id="linearGradient38573"
-       gradientUnits="userSpaceOnUse"
-       x1="442.64706"
-       y1="5200.3081"
-       x2="469.04962"
-       y2="5297.8887" />
-    <linearGradient
-       id="linearGradient129463">
-      <stop
-         id="stop129465"
-         offset="0"
-         style="stop-color:#8c8c8c;stop-opacity:1;" />
-      <stop
-         style="stop-color:#353535;stop-opacity:1;"
-         offset="0.65012163"
-         id="stop129467" />
-      <stop
-         id="stop129469"
-         offset="1"
-         style="stop-color:#959595;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24195" id="linearGradient38573" gradientUnits="userSpaceOnUse" x1="442.64706" y1="5200.3081" x2="469.04962" y2="5297.8887"/>
+    <linearGradient id="linearGradient129463">
+      <stop id="stop129465" offset="0" style="stop-color:#8c8c8c;stop-opacity:1;"/>
+      <stop style="stop-color:#353535;stop-opacity:1;" offset="0.65012163" id="stop129467"/>
+      <stop id="stop129469" offset="1" style="stop-color:#959595;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303"
-       id="linearGradient38575"
-       gradientUnits="userSpaceOnUse"
-       x1="459.04688"
-       y1="5218.6763"
-       x2="493.15625"
-       y2="5225.6763" />
-    <linearGradient
-       id="linearGradient24303">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop24307" />
-      <stop
-         id="stop24309"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303" id="linearGradient38575" gradientUnits="userSpaceOnUse" x1="459.04688" y1="5218.6763" x2="493.15625" y2="5225.6763"/>
+    <linearGradient id="linearGradient24303">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop24307"/>
+      <stop id="stop24309" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303"
-       id="linearGradient38577"
-       gradientUnits="userSpaceOnUse"
-       x1="529.83087"
-       y1="5281.5977"
-       x2="552.21344"
-       y2="5289.3477" />
-    <linearGradient
-       id="linearGradient129476">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop129478" />
-      <stop
-         id="stop129480"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303" id="linearGradient38577" gradientUnits="userSpaceOnUse" x1="529.83087" y1="5281.5977" x2="552.21344" y2="5289.3477"/>
+    <linearGradient id="linearGradient129476">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop129478"/>
+      <stop id="stop129480" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24394"
-       id="linearGradient38579"
-       gradientUnits="userSpaceOnUse"
-       x1="519.25873"
-       y1="5220.2598"
-       x2="535.50415"
-       y2="5279.8979" />
-    <linearGradient
-       id="linearGradient24394">
-      <stop
-         id="stop24396"
-         offset="0"
-         style="stop-color:#5f5f5f;stop-opacity:1;" />
-      <stop
-         style="stop-color:#353535;stop-opacity:1;"
-         offset="0.60042131"
-         id="stop24398" />
-      <stop
-         id="stop24400"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24394" id="linearGradient38579" gradientUnits="userSpaceOnUse" x1="519.25873" y1="5220.2598" x2="535.50415" y2="5279.8979"/>
+    <linearGradient id="linearGradient24394">
+      <stop id="stop24396" offset="0" style="stop-color:#5f5f5f;stop-opacity:1;"/>
+      <stop style="stop-color:#353535;stop-opacity:1;" offset="0.60042131" id="stop24398"/>
+      <stop id="stop24400" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24394"
-       id="linearGradient38581"
-       gradientUnits="userSpaceOnUse"
-       x1="544.59131"
-       y1="5260.6191"
-       x2="549.61469"
-       y2="5260.6191" />
-    <linearGradient
-       id="linearGradient129488">
-      <stop
-         id="stop129490"
-         offset="0"
-         style="stop-color:#5f5f5f;stop-opacity:1;" />
-      <stop
-         style="stop-color:#353535;stop-opacity:1;"
-         offset="0.60042131"
-         id="stop129492" />
-      <stop
-         id="stop129494"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24394" id="linearGradient38581" gradientUnits="userSpaceOnUse" x1="544.59131" y1="5260.6191" x2="549.61469" y2="5260.6191"/>
+    <linearGradient id="linearGradient129488">
+      <stop id="stop129490" offset="0" style="stop-color:#5f5f5f;stop-opacity:1;"/>
+      <stop style="stop-color:#353535;stop-opacity:1;" offset="0.60042131" id="stop129492"/>
+      <stop id="stop129494" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23823"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23831"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24007"
-       id="linearGradient38583"
-       gradientUnits="userSpaceOnUse"
-       x1="423.76001"
-       y1="5233.2417"
-       x2="410.45862"
-       y2="5219.6802" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23835"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23839"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23843"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23847"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23855"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect23859"
-       is_visible="true" />
+    <inkscape:path-effect effect="spiro" id="path-effect23823" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect23831" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24007" id="linearGradient38583" gradientUnits="userSpaceOnUse" x1="423.76001" y1="5233.2417" x2="410.45862" y2="5219.6802"/>
+    <inkscape:path-effect effect="spiro" id="path-effect23835" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect23839" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect23843" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect23847" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect23855" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect23859" is_visible="true"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="208.42048"
-     inkscape:cy="118.28572"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="132"
-     inkscape:window-y="174"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="208.42048" inkscape:cy="118.28572" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="132" inkscape:window-y="174" inkscape:window-maximized="0"/>
+  <metadata id="metadata7">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-166.57952,-522.6479)">
-    <g
-       style="display:inline"
-       id="g38079"
-       transform="matrix(1.2250467,0,0,1.2250467,-779.90206,-6246.1855)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Network_adapter.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         id="rect37357"
-         style="opacity:0.60538121;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38075)"
-         d="m 787.24757,5560.9863 -0.20025,-25.2871 -9.32429,-1.3341 6.90477,-3.883 9.84026,2.1892 0.7268,4.5558 -0.0156,23.975 4.82896,1.7161 59.36423,5.8463 -0.70711,33.4109 -0.39743,8.4407 -44.85737,-0.4858 -0.35356,-6.0104 -14.01961,-0.1891 0.23103,5.1388 -4.58467,0.675 -0.12121,6.0934 -2.21257,3.8435 -0.0374,5.0575 -4.16901,-0.4813 -0.51296,-5.128 -1.79691,-3.1461 0.53002,-11.5101 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccccc" />
-      <g
-         transform="matrix(0.39985938,0,0,0.39985938,639.14668,3482.9683)"
-         id="g34230">
-        <path
-           id="path34232"
-           style="fill:url(#linearGradient38437);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 322.61748,5182.1183 14.0105,5.5773 147.04898,13.7875 c -0.33282,26.9921 -0.49989,71.2002 -0.72335,105.2432 l -16.35077,-0.07 -0.0513,-12.9099 -3.32947,-1e-4 0.0217,12.9008 -89.88042,-0.3627 -1.07888,-15.9505 -37.11616,0.5024 -0.70587,14.7994 -13.77298,0.07 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccc"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           id="path34234"
-           transform="translate(65.29157,14.177646)"
-           style="fill:url(#linearGradient38439);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 323.67812,5243.2832 29.5217,0.7071 0.17678,28.9914 -30.05204,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34236"
-           style="fill:url(#linearGradient38441);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 402.57044,5249.1308 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc"
-           inkscape:transform-center-x="-2.6358334"
-           inkscape:transform-center-y="0.03445" />
-        <path
-           inkscape:transform-center-y="0.03445"
-           inkscape:transform-center-x="-2.6358334"
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 402.57044,5236.3808 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z"
-           style="fill:url(#linearGradient38443);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34238" />
-        <path
-           id="path34240"
-           style="fill:url(#linearGradient38445);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 402.57044,5223.3808 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc"
-           inkscape:transform-center-x="-2.6358334"
-           inkscape:transform-center-y="0.03445" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 455.73185,5222.6605 21.03129,1.133 c 1.59006,0.086 2.89573,1.4363 2.9275,3.0284 l 0.23655,11.8541 c 0.0315,1.5921 -1.22274,2.8047 -2.81279,2.719 l -21.03129,-1.1329 c -1.59005,-0.086 -2.89572,-1.4362 -2.92749,-3.0283 l -0.23655,-11.8542 c -0.0315,-1.5921 1.22272,-2.8048 2.81278,-2.7191 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24081)"
-           id="path34242"
-           transform="matrix(1.0029444,0,-0.02355493,1.0029444,121.60999,-15.873851)" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 476.05964,5218.3577 0,-3.5356 -8.52947,-8.5294 -128.38408,-11.2696 0,14.0538 -1.14905,0"
-           id="path34244"
-           inkscape:path-effect="#path-effect23827"
-           inkscape:original-d="m 476.05964,5218.3577 0,-3.5356 -8.52947,-8.5294 -128.38408,-11.2696 0,14.0538 -1.14905,0"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           inkscape:transform-center-y="0.039881254"
-           inkscape:transform-center-x="-3.0429505"
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 402.99722,5227.6967 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z"
-           style="opacity:0.33183857;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24175)"
-           id="path34246"
-           transform="matrix(1.1544516,0,0,1.1544516,-60.049014,-805.89687)" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.72203,5218.6869 13.23437,-1.8594 0.73438,9.3125 -13.03125,1.5469 c -3.01666,-2.3242 -3.03669,-6.3031 -0.9375,-9 z"
-           style="fill:url(#linearGradient38447);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34248" />
-        <path
-           id="path34250"
-           transform="translate(65.29157,14.177646)"
-           style="fill:url(#linearGradient38449);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient38451)"
-           d="m 304.5,5119.9575 18.52513,-7.5277 2.29847,11.444 -2.8236,198.74 -4.97435,7.0987 -0.1559,11.7138 -10.08501,-0.5625 0.1925,-11.9869 -4.97714,-9.2631 4.02451,-188.5874 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
-        <path
-           transform="matrix(1.1544516,0,0,1.1544516,-60.174014,-792.64687)"
-           id="path34252"
-           style="opacity:0.33183857;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24179)"
-           d="m 402.99722,5227.6967 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc"
-           inkscape:transform-center-x="-3.0429505"
-           inkscape:transform-center-y="0.039881254" />
-        <path
-           id="path34254"
-           transform="translate(65.29157,14.177646)"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 281.25,5115.9575 19.75,-8.5 22.31619,4.317 -19.07745,8.4482 -4.86999,-2.806 -5.2506,0.7543 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           id="path34256"
-           style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 309.79487,5245.8463 8.58623,-1.8195 -0.35355,27.5986 -8.40946,-0.5 0.0274,-5.2158 -3.41918,-3.7116 -0.10765,-7.2392 3.63038,-3.7198 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccc"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient38453);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34258"
-           sodipodi:cx="310.50827"
-           sodipodi:cy="5206.0718"
-           sodipodi:rx="2.2097087"
-           sodipodi:ry="3.9774756"
-           d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-           transform="translate(68.296774,25.668131)" />
-        <path
-           transform="translate(68.650327,11.525995)"
-           d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-           sodipodi:ry="3.9774756"
-           sodipodi:rx="2.2097087"
-           sodipodi:cy="5206.0718"
-           sodipodi:cx="310.50827"
-           id="path34260"
-           style="fill:url(#linearGradient38455);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#linearGradient38457);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34262"
-           sodipodi:cx="310.50827"
-           sodipodi:cy="5206.0718"
-           sodipodi:rx="2.2097087"
-           sodipodi:ry="3.9774756"
-           d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-           transform="translate(68.296774,38.926383)" />
-        <path
-           id="path34264"
-           style="fill:#fff65f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 372.3125,5290.0826 3.0625,3.5628 107.74999,0.015 -0.15625,13.0157 -16.40628,0 0.005,-12.8845 -3.317,-0.028 -2.2e-4,13.0367 L 372.5,5306.645 c -0.11017,-5.5219 -0.0969,-5.4777 -0.1875,-16.5624 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccc"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           id="path34266"
-           transform="translate(65.29157,14.177646)"
-           style="fill:#9f981f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 372.3125,5290.0512 1.09375,1.3438 0.10938,15.3281 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 439.54938,5306.5335 1.09375,1.2735 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38459);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34268" />
-        <path
-           id="path34270"
-           style="fill:url(#linearGradient38461);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 441.67438,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 443.73688,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38463);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34272" />
-        <path
-           id="path34274"
-           style="fill:url(#linearGradient38465);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 445.70563,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 447.72125,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           style="fill:url(#linearGradient38467);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34276" />
-        <path
-           id="path34278"
-           style="fill:url(#linearGradient38469);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 449.73688,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 451.70563,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38471);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34280" />
-        <path
-           id="path34282"
-           style="fill:url(#linearGradient38473);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 453.76813,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 455.73688,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38475);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34284" />
-        <path
-           id="path34286"
-           style="fill:url(#linearGradient38477);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 457.7525,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 459.76813,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           style="fill:url(#linearGradient38479);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34288" />
-        <path
-           id="path34290"
-           style="fill:url(#linearGradient38481);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 461.64957,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 463.71857,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38483);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34292" />
-        <path
-           id="path34294"
-           style="fill:url(#linearGradient38485);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 465.63357,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 467.64957,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           style="fill:url(#linearGradient38487);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34296" />
-        <path
-           id="path34298"
-           style="fill:url(#linearGradient38489);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 469.61857,5307.8148 2.23753,-0.01 0.20779,13.0937 -2.1097,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 472.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38491);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34300" />
-        <path
-           id="path34302"
-           style="fill:url(#linearGradient38493);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 474.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 476.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           style="fill:url(#linearGradient38495);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34304" />
-        <path
-           id="path34306"
-           style="fill:url(#linearGradient38497);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 478.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34308"
-           style="fill:url(#linearGradient38499);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 480.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 482.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38501);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34310" />
-        <path
-           id="path34312"
-           style="fill:url(#linearGradient38503);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 484.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 486.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           style="fill:url(#linearGradient38505);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34314" />
-        <path
-           id="path34316"
-           style="fill:url(#linearGradient38507);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 488.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 490.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38509);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34318" />
-        <path
-           id="path34320"
-           style="fill:url(#linearGradient38511);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 492.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 494.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           style="fill:url(#linearGradient38513);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34322" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 496.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38515);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34324" />
-        <path
-           id="path34326"
-           style="fill:url(#linearGradient38517);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 498.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 500.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           style="fill:url(#linearGradient38519);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34328" />
-        <path
-           id="path34330"
-           style="fill:url(#linearGradient38521);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 502.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 504.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38523);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34332" />
-        <path
-           id="path34334"
-           style="fill:url(#linearGradient38525);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 506.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 508.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           style="fill:url(#linearGradient38527);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34336" />
-        <path
-           id="path34338"
-           style="fill:url(#linearGradient38529);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 510.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34340"
-           style="fill:url(#linearGradient38531);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 512.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 514.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38533);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34342" />
-        <path
-           id="path34344"
-           style="fill:url(#linearGradient38535);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 516.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 518.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           style="fill:url(#linearGradient38537);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34346" />
-        <path
-           id="path34348"
-           style="fill:url(#linearGradient38539);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 520.65557,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 522.62432,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38541);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34350" />
-        <path
-           id="path34352"
-           style="fill:url(#linearGradient38543);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 524.63994,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 526.65557,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           style="fill:url(#linearGradient38545);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34354" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 532.63994,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           style="fill:url(#linearGradient38547);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34356" />
-        <path
-           id="path34358"
-           style="fill:url(#linearGradient38549);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 534.65557,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34360"
-           style="fill:url(#linearGradient38551);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 536.65557,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34362"
-           style="fill:url(#linearGradient38553);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 538.65557,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 540.62432,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z"
-           style="fill:url(#linearGradient38555);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34364" />
-        <path
-           id="path34366"
-           style="fill:url(#linearGradient38557);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 542.63994,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 544.65557,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           style="fill:url(#linearGradient38559);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34368" />
-        <path
-           id="path34370"
-           style="fill:url(#linearGradient38561);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 546.59307,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 448.70996,5221.2039 c 0.21432,2.5716 -1.1176,4.7818 -2.9749,4.9367 -1.85731,0.1547 -3.53666,-1.8046 -3.75096,-4.3762 -0.21432,-2.5717 1.1176,-4.7819 2.9749,-4.9367 1.85731,-0.1547 3.53666,1.8045 3.75096,4.3762 z"
-           style="fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34372" />
-        <path
-           id="path34374"
-           transform="translate(65.29157,14.177646)"
-           style="fill:url(#linearGradient38563);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 350.25,5203.0825 13.23437,-1.8594 0.73438,9.3125 -13.03125,1.5469 c -3.01666,-2.3242 -3.03669,-6.3031 -0.9375,-9 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34376"
-           style="fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 432.5295,5219.7771 c 0.21432,2.5716 -1.1176,4.7818 -2.9749,4.9367 -1.85731,0.1547 -3.53666,-1.8046 -3.75096,-4.3762 -0.21432,-2.5717 1.1176,-4.7819 2.9749,-4.9367 1.85731,-0.1547 3.53666,1.8045 3.75096,4.3762 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path34378"
-           transform="translate(65.29157,14.177646)"
-           style="fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 323.23619,5272.9819 30.14043,-0.1768 -4.86136,2.1213 -25.36746,0.442 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:transform-center-y="0.039881254"
-           inkscape:transform-center-x="-3.0429505"
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 402.99722,5227.6967 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z"
-           style="opacity:0.33183857;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24183)"
-           id="path34380"
-           transform="matrix(1.1544516,0,0,1.1544516,-60.799014,-780.14687)" />
-        <path
-           id="path34382"
-           style="fill:url(#linearGradient38565);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 423.91657,5264.3851 34.625,1.375 0.25,20.75 -34.875,-1 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34384"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 454.53217,5263.4441 2.1888,0.096 0.0706,2.1582 -2.25,-0.094 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 450.99402,5263.2896 2.21588,0.097 -0.0433,2.1547 -2.25,-0.094 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34386" />
-        <path
-           id="path34388"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 447.544,5263.139 2.23224,0.097 -0.0784,2.1487 -2.25,-0.094 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 444.38299,5263.001 2.09114,0.091 -0.12006,2.1993 -2.125,-0.1253 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34390" />
-        <path
-           id="path34392"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 441.20019,5262.862 2.10363,0.092 -0.10601,2.1555 -2.09961,-0.023 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 437.88718,5262.7174 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34394" />
-        <path
-           id="path34396"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 434.57282,5262.5727 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.32719,5262.4307 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34398" />
-        <path
-           id="path34400"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 427.98573,5262.2848 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 424.5425,5262.1347 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34402" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 454.92431,5286.4515 2.18991,0.066 0.10033,2.157 -2.25107,-0.063 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34404" />
-        <path
-           id="path34406"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 451.38437,5286.3457 2.21701,0.066 -0.0136,2.1551 -2.25109,-0.063 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 447.9326,5286.2427 2.23337,0.066 -0.0488,2.1495 -2.25108,-0.063 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34408" />
-        <path
-           id="path34410"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 444.76999,5286.1482 2.0922,0.062 -0.0898,2.2008 -2.12652,-0.096 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 441.58558,5286.0531 2.10469,0.063 -0.0763,2.1568 -2.09974,0.01 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34412" />
-        <path
-           id="path34414"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 438.27089,5285.9542 2.12614,0.063 -0.0961,2.2329 -2.06361,-0.065 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 434.95485,5285.8552 2.12614,0.063 -0.0961,2.2329 -2.06361,-0.065 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34416" />
-        <path
-           id="path34418"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 431.70757,5285.7578 2.12614,0.064 -0.0961,2.2328 -2.06361,-0.065 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 428.36442,5285.658 2.12613,0.064 -0.0961,2.2329 -2.06359,-0.066 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34420" />
-        <path
-           id="path34422"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 424.91945,5285.5554 2.12614,0.063 -0.0962,2.2329 -2.06359,-0.065 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34424"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 413.63983,5289.67 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34426"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 413.84721,5296.4172 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 413.88127,5295.6375 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34428" />
-        <path
-           id="path34430"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 413.91445,5294.8771 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 413.94487,5294.1805 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34432" />
-        <path
-           id="path34434"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 413.9755,5293.479 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 414.00737,5292.7489 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34436" />
-        <path
-           id="path34438"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 414.03926,5292.0184 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 414.07056,5291.3032 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34440" />
-        <path
-           id="path34442"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 414.10271,5290.5668 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 414.13578,5289.8079 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34444" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 408.77675,5296.5036 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34446" />
-        <path
-           id="path34448"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 408.80006,5295.7235 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 408.82276,5294.9628 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34450" />
-        <path
-           id="path34452"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 408.84359,5294.2658 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 408.86454,5293.564 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34454" />
-        <path
-           id="path34456"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 408.88634,5292.8335 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 408.90816,5292.1027 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34458" />
-        <path
-           id="path34460"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 408.92962,5291.387 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 408.95162,5290.6502 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34462" />
-        <path
-           id="path34464"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 408.97423,5289.8911 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.00379,5289.67 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34466" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.21117,5296.4172 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34468" />
-        <path
-           id="path34470"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.24523,5295.6375 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.27841,5294.8771 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34472" />
-        <path
-           id="path34474"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.30883,5294.1805 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.33946,5293.479 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34476" />
-        <path
-           id="path34478"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.37133,5292.7489 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.40322,5292.0184 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34480" />
-        <path
-           id="path34482"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.43452,5291.3032 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.46667,5290.5668 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34484" />
-        <path
-           id="path34486"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.49974,5289.8079 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34488"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.14071,5296.5036 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.16402,5295.7235 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34490" />
-        <path
-           id="path34492"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.18672,5294.9628 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.20755,5294.2658 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34494" />
-        <path
-           id="path34496"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.2285,5293.564 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.2503,5292.8335 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34498" />
-        <path
-           id="path34500"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.27212,5292.1027 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.29358,5291.387 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34502" />
-        <path
-           id="path34504"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.31558,5290.6502 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.33819,5289.8911 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34506" />
-        <path
-           id="path34508"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.36775,5289.67 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34510"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.57513,5296.4172 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 426.60919,5295.6375 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34512" />
-        <path
-           id="path34514"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.64237,5294.8771 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 426.67279,5294.1805 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34516" />
-        <path
-           id="path34518"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.70342,5293.479 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 426.73529,5292.7489 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34520" />
-        <path
-           id="path34522"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.76718,5292.0184 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 426.79848,5291.3032 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34524" />
-        <path
-           id="path34526"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.83063,5290.5668 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 426.8637,5289.8079 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34528" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.50467,5296.5036 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34530" />
-        <path
-           id="path34532"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.52798,5295.7235 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.55068,5294.9628 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34534" />
-        <path
-           id="path34536"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.57151,5294.2658 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.59246,5293.564 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34538" />
-        <path
-           id="path34540"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.61426,5292.8335 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.63608,5292.1027 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34542" />
-        <path
-           id="path34544"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.65754,5291.387 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.67954,5290.6502 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34546" />
-        <path
-           id="path34548"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.70215,5289.8911 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.00379,5232.0408 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34550" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.21117,5238.788 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34552" />
-        <path
-           id="path34554"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.24523,5238.0083 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.27841,5237.2479 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34556" />
-        <path
-           id="path34558"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.30883,5236.5513 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.33946,5235.8498 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34560" />
-        <path
-           id="path34562"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.37133,5235.1197 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.40322,5234.3892 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34564" />
-        <path
-           id="path34566"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.43452,5233.674 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 420.46667,5232.9376 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34568" />
-        <path
-           id="path34570"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 420.49974,5232.1787 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34572"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.14071,5238.8744 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.16402,5238.0943 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34574" />
-        <path
-           id="path34576"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.18672,5237.3336 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.20755,5236.6366 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34578" />
-        <path
-           id="path34580"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.2285,5235.9348 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.2503,5235.2043 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34582" />
-        <path
-           id="path34584"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.27212,5234.4735 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.29358,5233.7578 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34586" />
-        <path
-           id="path34588"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 415.31558,5233.021 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 415.33819,5232.2619 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34590" />
-        <path
-           id="path34592"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.7213,5234.1621 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34594"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.92868,5240.9093 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 426.96274,5240.1296 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34596" />
-        <path
-           id="path34598"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 426.99592,5239.3692 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 427.02634,5238.6726 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34600" />
-        <path
-           id="path34602"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 427.05697,5237.9711 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 427.08884,5237.241 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34604" />
-        <path
-           id="path34606"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 427.12073,5236.5105 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 427.15203,5235.7953 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34608" />
-        <path
-           id="path34610"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 427.18418,5235.0589 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 427.21725,5234.3 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34612" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.85822,5240.9957 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34614" />
-        <path
-           id="path34616"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.88153,5240.2156 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.90423,5239.4549 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34618" />
-        <path
-           id="path34620"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.92506,5238.7579 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.94601,5238.0561 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34622" />
-        <path
-           id="path34624"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 421.96781,5237.3256 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.98963,5236.5948 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34626" />
-        <path
-           id="path34628"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 422.01109,5235.8791 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 422.03309,5235.1423 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34630" />
-        <path
-           id="path34632"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 422.0557,5234.3832 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 433.43881,5234.5157 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34634" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 433.64619,5241.2629 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34636" />
-        <path
-           id="path34638"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 433.68025,5240.4832 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 433.71343,5239.7228 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34640" />
-        <path
-           id="path34642"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 433.74385,5239.0262 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 433.77448,5238.3247 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34644" />
-        <path
-           id="path34646"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 433.80635,5237.5946 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 433.83824,5236.8641 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34648" />
-        <path
-           id="path34650"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 433.86954,5236.1489 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 433.90169,5235.4125 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34652" />
-        <path
-           id="path34654"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 433.93476,5234.6536 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34656"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 428.57573,5241.3493 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 428.59904,5240.5692 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34658" />
-        <path
-           id="path34660"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 428.62174,5239.8085 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 428.64257,5239.1115 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34662" />
-        <path
-           id="path34664"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 428.66352,5238.4097 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 428.68532,5237.6792 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34666" />
-        <path
-           id="path34668"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 428.70714,5236.9484 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 428.7286,5236.2327 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34670" />
-        <path
-           id="path34672"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 428.7506,5235.4959 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 428.77321,5234.7368 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34674" />
-        <path
-           id="path34676"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 440.3331,5234.6925 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34678"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 440.54048,5241.4397 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 440.57454,5240.66 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34680" />
-        <path
-           id="path34682"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 440.60772,5239.8996 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 440.63814,5239.203 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34684" />
-        <path
-           id="path34686"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 440.66877,5238.5015 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 440.70064,5237.7714 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34688" />
-        <path
-           id="path34690"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 440.73253,5237.0409 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 440.76383,5236.3257 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34692" />
-        <path
-           id="path34694"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 440.79598,5235.5893 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 440.82905,5234.8304 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34696" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 435.47002,5241.5261 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34698" />
-        <path
-           id="path34700"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 435.49333,5240.746 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 435.51603,5239.9853 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34702" />
-        <path
-           id="path34704"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 435.53686,5239.2883 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 435.55781,5238.5865 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34706" />
-        <path
-           id="path34708"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 435.57961,5237.856 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 435.60143,5237.1252 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34710" />
-        <path
-           id="path34712"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 435.62289,5236.4095 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 435.64489,5235.6727 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34714" />
-        <path
-           id="path34716"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 435.6675,5234.9136 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 447.22739,5235.0461 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34718" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 447.43477,5241.7933 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34720" />
-        <path
-           id="path34722"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 447.46883,5241.0136 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 447.50201,5240.2532 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34724" />
-        <path
-           id="path34726"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 447.53243,5239.5566 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 447.56306,5238.8551 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34728" />
-        <path
-           id="path34730"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 447.59493,5238.125 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 447.62682,5237.3945 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34732" />
-        <path
-           id="path34734"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 447.65812,5236.6793 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 447.69027,5235.9429 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34736" />
-        <path
-           id="path34738"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 447.72334,5235.184 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34740"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 442.36431,5241.8797 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 442.38762,5241.0996 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34742" />
-        <path
-           id="path34744"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 442.41032,5240.3389 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 442.43115,5239.6419 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34746" />
-        <path
-           id="path34748"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 442.4521,5238.9401 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 442.4739,5238.2096 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34750" />
-        <path
-           id="path34752"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 442.49572,5237.4788 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 442.51718,5236.7631 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34754" />
-        <path
-           id="path34756"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 442.53918,5236.0263 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           transform="matrix(-0.90508377,-0.24251646,0.24251646,-0.90508377,-446.81736,10060.926)"
-           id="path34758"
-           style="opacity:0.52466371;fill:url(#linearGradient38567);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24003)"
-           d="m 421.12931,5219.2144 10.97663,7.6236 -5.78574,7.334 -10.61531,-7.7151 c -0.63564,-3.7547 2.052,-6.6888 5.42442,-7.2425 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 442.56179,5235.2672 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34760" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 485.62916,5226.0322 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34762" />
-        <path
-           id="path34764"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 483.82815,5232.7081 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 483.03265,5224.709 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34766" />
-        <path
-           id="path34768"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 489.78341,5226.0322 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 487.9824,5232.7081 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34770" />
-        <path
-           id="path34772"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 487.1869,5224.709 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 494.55638,5226.0322 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34774" />
-        <path
-           id="path34776"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 492.75537,5232.7081 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 491.95987,5224.709 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34778" />
-        <path
-           id="path34780"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 493.14217,5236.1969 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 491.34116,5242.8728 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34782" />
-        <path
-           id="path34784"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 490.54566,5234.8737 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 488.19242,5236.1969 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34786" />
-        <path
-           id="path34788"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 486.39141,5242.8728 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 485.59591,5234.8737 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34790" />
-        <path
-           id="path34792"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 503.4836,5239.9976 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 501.68259,5246.6735 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34794" />
-        <path
-           id="path34796"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 500.88709,5238.6744 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 508.7869,5239.9976 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34798" />
-        <path
-           id="path34800"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 506.98589,5246.6735 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 506.19039,5238.6744 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34802" />
-        <path
-           id="path34804"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 513.73665,5239.9976 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 511.93564,5246.6735 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34806" />
-        <path
-           id="path34808"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 511.14014,5238.6744 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 518.6864,5239.9976 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34810" />
-        <path
-           id="path34812"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 516.88539,5246.6735 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 516.08989,5238.6744 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34814" />
-        <path
-           id="path34816"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 515.6864,5229.6226 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 513.88539,5236.2985 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34818" />
-        <path
-           id="path34820"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 513.08989,5228.2994 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 510.4364,5229.6226 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34822" />
-        <path
-           id="path34824"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 508.63539,5236.2985 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 507.83989,5228.2994 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34826" />
-        <path
-           id="path34828"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 505.4364,5229.6226 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 503.63539,5236.2985 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34830" />
-        <path
-           id="path34832"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 502.83989,5228.2994 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34834"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 475.39939,5255.7753 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 473.59838,5262.4512 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34836" />
-        <path
-           id="path34838"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 472.80288,5254.4521 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34840"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 472.841,5290.1641 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 471.03999,5296.84 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34842" />
-        <path
-           id="path34844"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 470.24449,5288.8409 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34846"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 481.32628,5290.4644 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 479.52527,5297.1403 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34848" />
-        <path
-           id="path34850"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 478.72977,5289.1412 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34852"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 490.16511,5290.818 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 488.3641,5297.4939 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34854" />
-        <path
-           id="path34856"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 487.5686,5289.4948 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34858"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 499.18073,5290.8179 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 497.37972,5297.4938 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34860" />
-        <path
-           id="path34862"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 496.58422,5289.4947 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34864"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 508.90345,5290.9947 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 507.10244,5297.6706 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34866" />
-        <path
-           id="path34868"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 506.30694,5289.6715 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34870"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 518.44939,5280.5649 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 516.64838,5287.2408 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34872" />
-        <path
-           id="path34874"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 515.85288,5279.2417 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34876"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 532.94507,5295.9445 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 531.14406,5302.6204 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34878" />
-        <path
-           id="path34880"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 530.34856,5294.6213 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34882"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 538.24838,5295.9445 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 536.44737,5302.6204 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34884" />
-        <path
-           id="path34886"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 535.65187,5294.6213 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34888"
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 543.72846,5295.9445 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 541.92745,5302.6204 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34890" />
-        <path
-           id="path34892"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 541.13195,5294.6213 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34894"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 455.46416,5221.6602 21.00468,1.133 c 1.58804,0.086 2.862,1.4363 2.85638,3.0284 l -0.0419,11.8541 c -0.006,1.5921 -1.28861,2.8047 -2.87665,2.719 l -21.00468,-1.1329 c -1.58803,-0.086 -2.86199,-1.4362 -2.85637,-3.0283 l 0.0419,-11.8542 c 0.006,-1.5921 1.2886,-2.8048 2.87664,-2.7191 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path34896"
-           style="fill:url(#linearGradient38569);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 456.30353,5221.3352 20.52024,1.5572 c 1.55969,0.1188 2.81623,1.4144 2.81069,2.9811 l -0.0396,11.2231 c -0.006,1.5667 -1.26799,2.7595 -2.83064,2.6747 l -20.52181,-1.1156 c -1.56264,-0.085 -2.81622,-1.4145 -2.81069,-2.9812 l 0.0412,-11.6649 c 0.006,-1.5666 1.27095,-2.7928 2.83064,-2.6744 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-        <path
-           style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 485.05357,5255.3834 0,22.2188 13.0625,0.2812 0.15625,-21.9374 -13.21875,-0.5626 z m 13.0625,22.5 13.1875,0.2188 0,-21.8438 -13,-0.25 -0.1875,21.875 z"
-           id="path34898"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 485.06657,5255.8086 0,22.1876 13.28125,0 12.84375,0 0.6,-0.611 -0.6,-20.639 -12.625,-0.4688 0,0.031 -12.9,-1.0855 -0.6,0.5855 z"
-           id="path34900"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccc" />
-        <path
-           id="path34902"
-           style="fill:url(#linearGradient38571);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 485.78141,5255.228 26.01016,0.9072 0,21.25 -25.97192,-0.044 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path34904"
-           transform="translate(65.29157,14.177646)"
-           style="fill:url(#linearGradient38573);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 455.5,5220.27 6.125,-1.3125 0,54.75 -6.25,0.875 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 536.66657,5233.3851 8,0 0.11428,54.4848 -8.23928,0.8589 z"
-           style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34906" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 520.65442,5288.7575 25.64232,0.1721 3.55485,-1.0207 -22.94798,-0.023 z"
-           style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34908" />
-        <path
-           id="path34910"
-           transform="translate(65.29157,14.177646)"
-           style="fill:url(#linearGradient38575);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 466.54687,5218.9887 12.85938,0.1407 -5e-5,3.7344 -12.84375,-0.1563 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 531.85406,5284.7008 12.82767,0.096 0.0317,3.198 -12.88258,-0.044 z"
-           style="fill:url(#linearGradient38577);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34912" />
-        <path
-           id="path34914"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 526.91657,5233.1503 4.9375,0 0,54.7348 -4.9375,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 544.72682,5233.4154 4.85983,0 0,54.5139 -4.85983,0 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path34916"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path34918"
-           style="fill:url(#linearGradient38579);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 526.88159,5286.9087 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.8438 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9003 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.856 4.92765,0 0,0.9944 -4.92765,0 z m 0.0781,-1.9004 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.7236 4.84952,0 0,0.9943 -4.84952,0 z m 0,-1.9004 4.84952,0 0,0.9943 -4.84952,0 z m 0,-1.9444 4.84952,0 0,0.9944 -4.84952,0 z m -3e-5,-1.9003 4.84952,0 0,0.9943 -4.84952,0 z m 0,-1.856 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.9004 4.84952,0 0,0.9944 -4.84952,0 z m -0.0177,-1.8965 4.84952,0 0,0.9944 -4.84952,0 z m -3e-5,-1.9004 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.9443 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.9004 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.856 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.9003 4.84952,0 0,0.9943 -4.84952,0 z m -0.0202,-1.7642 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9443 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.856 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.936 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9443 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.856 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9944 -4.92765,0 z m 3.93226,-0.9303 1,-0.01 0,54.7451 -1,0 z m -3.9387,-0.017 1.03245,-0.03 -0.0112,54.7806 -1.04328,-7e-4 z m 1.90745,-0.023 1,0 2.03644,0.01 -0.83331,0.9709 -1.20313,0.016 0,53.7842 -1,0 0,-53.7685 -0.92188,0 0.0308,-1.0134 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
-        <path
-           id="path34920"
-           style="fill:url(#linearGradient38581);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 544.64227,5286.9385 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8364 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8941 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8496 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8931 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.7177 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8941 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.937 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.894 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8496 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8931 4.92765,0 0,0.9908 -4.92765,0 z m -0.0177,-1.8902 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.894 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.937 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.894 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8492 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8935 4.92765,0 0,0.9908 -4.92765,0 z m 0.0579,-1.7583 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8931 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.938 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8935 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8492 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.894 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.9292 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8936 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.9375 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8935 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8496 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8936 4.92765,0 0,0.9909 -4.92765,0 z m 3.93223,-0.9463 1,0.016 0,54.5479 -1,0 z m -4.00085,-0.044 1.04843,0.01 3.01216,0.04 c 0,0 0.0134,0.037 0.0153,0.056 0.0308,0.308 -0.0622,0.9265 -0.0622,0.9265 l -1.04104,-0.014 -0.87554,-0.7541 -0.0835,0.8204 -1.06933,-0.048 0.10401,-0.9206 -0.0114,54.4934 -1.05943,-7e-4 z m 1.96963,0.04 1,0 0,54.5674 -1,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscacccccccccccccc" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 336.75961,5199.6193 0,-8.2201 131.87541,12.9047 9.28078,9.8111 0,4.1543"
-           id="path34922"
-           inkscape:path-effect="#path-effect23823"
-           inkscape:original-d="m 336.75961,5199.6193 0,-8.2201 131.87541,12.9047 9.28078,9.8111 0,4.1543"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 338.79254,5212.524 4.15425,0 0,-13.9653 124.18563,10.7834 5.3033,6.8942 0,1.6794"
-           id="path34924"
-           inkscape:path-effect="#path-effect23831"
-           inkscape:original-d="m 338.79254,5212.524 4.15425,0 0,-13.9653 124.18563,10.7834 5.3033,6.8942 0,1.6794"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 421.12931,5219.2144 10.97663,7.6236 -5.78574,7.334 -10.61531,-7.7151 c -0.63564,-3.7547 2.052,-6.6888 5.42442,-7.2425 z"
-           style="opacity:0.52466371;fill:url(#linearGradient38583);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24003)"
-           id="path34926"
-           transform="matrix(-0.90508377,-0.24251646,0.24251646,-0.90508377,-463.31736,10059.426)" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 338.61576,5213.1428 12.02082,14.8492 -11.49049,0"
-           id="path34928"
-           inkscape:path-effect="#path-effect23835"
-           inkscape:original-d="m 338.61576,5213.1428 12.02082,14.8492 -11.49049,0"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 339.41126,5231.174 15.29118,0 1.66421,12.7405 47.47971,2.1087 -0.003,-6.0037 c 1.85389,0.065 3.70779,0.1295 5.56168,0.1942 1.31188,0.046 2.62376,0.092 3.93564,0.1374 l 0,-6.0835 40.79897,0.1767 0,3.3588 1.23744,0"
-           id="path34930"
-           inkscape:path-effect="#path-effect23839"
-           inkscape:original-d="m 339.41126,5231.174 15.29118,0 1.66421,12.7405 47.47971,2.1087 -0.003,-6.0037 5.56168,0.1942 3.93564,0.1374 0,-6.0835 40.79897,0.1767 0,3.3588 1.23744,0"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)"
-           sodipodi:nodetypes="ccccccccccc" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 358.94508,5228.2572 0,1.9445 9.81111,0 27.04683,0 16.17507,0 1.32582,0 0,3.2704"
-           id="path34932"
-           inkscape:path-effect="#path-effect23843"
-           inkscape:original-d="m 358.94508,5228.2572 0,1.9445 9.81111,0 27.04683,0 16.17507,0 1.32582,0 0,3.2704"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 409.85677,5231.7043 0,5.2149 -9.19239,0 0,5.1265 -41.30864,-2.0797 -0.41066,-9.6759"
-           id="path34934"
-           inkscape:path-effect="#path-effect23847"
-           inkscape:original-d="m 409.85677,5231.7043 0,5.2149 -9.19239,0 0,5.1265 -41.30864,-2.0797 -0.41066,-9.6759"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 407.3819,5250.0891 -10.695,1.0606 0.24265,37.4767 -20.13002,0.2652 -3.62393,-4.773 -41.10058,0.8839 -2.59099,2.7903 -0.59099,11.1746 -2.74004,0 0,-23.8648"
-           id="path34936"
-           inkscape:path-effect="#path-effect23855"
-           inkscape:original-d="m 407.3819,5250.0891 -10.695,1.0606 0.24265,37.4767 -20.13002,0.2652 -3.62393,-4.773 -41.10058,0.8839 c -0.53091,2.7128 0.13657,3.7087 -2.59099,2.7903 l -0.59099,11.1746 -2.74004,0 0,-23.8648"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)"
-           sodipodi:nodetypes="cccccccccc" />
-        <path
-           style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 324.38524,5275.2798 0,27.0468 6.54073,0 0.35356,0 0.53033,-12.5852 1.59099,-1.9105 39.95153,-0.7071 2.82843,3.8891 22.7665,0 1.23744,-1.2375 0.0377,-36.2392 15.20279,-2.8284 -0.25853,-7.8637 4.23603,0.086"
-           id="path34938"
-           inkscape:path-effect="#path-effect23859"
-           inkscape:original-d="m 324.38524,5275.2798 0,27.0468 6.54073,0 0.35356,0 0.53033,-12.5852 1.59099,-1.9105 39.95153,-0.7071 2.82843,3.8891 22.7665,0 1.23744,-1.2375 0.0377,-36.2392 15.20279,-2.8284 -0.25853,-7.8637 4.23603,0.086"
-           inkscape:connector-curvature="0"
-           transform="translate(65.29157,14.177646)"
-           sodipodi:nodetypes="cccccccccccccc" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-166.57952,-522.6479)">
+    <g style="display:inline" id="g38079" transform="matrix(1.2250467,0,0,1.2250467,-779.90206,-6246.1855)">
+      <path id="rect37357" style="opacity:0.60538121;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38075)" d="m 787.24757,5560.9863 -0.20025,-25.2871 -9.32429,-1.3341 6.90477,-3.883 9.84026,2.1892 0.7268,4.5558 -0.0156,23.975 4.82896,1.7161 59.36423,5.8463 -0.70711,33.4109 -0.39743,8.4407 -44.85737,-0.4858 -0.35356,-6.0104 -14.01961,-0.1891 0.23103,5.1388 -4.58467,0.675 -0.12121,6.0934 -2.21257,3.8435 -0.0374,5.0575 -4.16901,-0.4813 -0.51296,-5.128 -1.79691,-3.1461 0.53002,-11.5101 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccc"/>
+      <g transform="matrix(0.39985938,0,0,0.39985938,639.14668,3482.9683)" id="g34230">
+        <path id="path34232" style="fill:url(#linearGradient38437);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 322.61748,5182.1183 14.0105,5.5773 147.04898,13.7875 c -0.33282,26.9921 -0.49989,71.2002 -0.72335,105.2432 l -16.35077,-0.07 -0.0513,-12.9099 -3.32947,-1e-4 0.0217,12.9008 -89.88042,-0.3627 -1.07888,-15.9505 -37.11616,0.5024 -0.70587,14.7994 -13.77298,0.07 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccc" transform="translate(65.29157,14.177646)"/>
+        <path id="path34234" transform="translate(65.29157,14.177646)" style="fill:url(#linearGradient38439);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 323.67812,5243.2832 29.5217,0.7071 0.17678,28.9914 -30.05204,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34236" style="fill:url(#linearGradient38441);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 402.57044,5249.1308 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-2.6358334" inkscape:transform-center-y="0.03445"/>
+        <path inkscape:transform-center-y="0.03445" inkscape:transform-center-x="-2.6358334" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 402.57044,5236.3808 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z" style="fill:url(#linearGradient38443);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34238"/>
+        <path id="path34240" style="fill:url(#linearGradient38445);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 402.57044,5223.3808 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-2.6358334" inkscape:transform-center-y="0.03445"/>
+        <path inkscape:connector-curvature="0" d="m 455.73185,5222.6605 21.03129,1.133 c 1.59006,0.086 2.89573,1.4363 2.9275,3.0284 l 0.23655,11.8541 c 0.0315,1.5921 -1.22274,2.8047 -2.81279,2.719 l -21.03129,-1.1329 c -1.59005,-0.086 -2.89572,-1.4362 -2.92749,-3.0283 l -0.23655,-11.8542 c -0.0315,-1.5921 1.22272,-2.8048 2.81278,-2.7191 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24081)" id="path34242" transform="matrix(1.0029444,0,-0.02355493,1.0029444,121.60999,-15.873851)"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 476.05964,5218.3577 0,-3.5356 -8.52947,-8.5294 -128.38408,-11.2696 0,14.0538 -1.14905,0" id="path34244" inkscape:path-effect="#path-effect23827" inkscape:original-d="m 476.05964,5218.3577 0,-3.5356 -8.52947,-8.5294 -128.38408,-11.2696 0,14.0538 -1.14905,0" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)"/>
+        <path inkscape:transform-center-y="0.039881254" inkscape:transform-center-x="-3.0429505" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 402.99722,5227.6967 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z" style="opacity:0.33183857;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24175)" id="path34246" transform="matrix(1.1544516,0,0,1.1544516,-60.049014,-805.89687)"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 431.72203,5218.6869 13.23437,-1.8594 0.73438,9.3125 -13.03125,1.5469 c -3.01666,-2.3242 -3.03669,-6.3031 -0.9375,-9 z" style="fill:url(#linearGradient38447);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34248"/>
+        <path id="path34250" transform="translate(65.29157,14.177646)" style="fill:url(#linearGradient38449);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient38451)" d="m 304.5,5119.9575 18.52513,-7.5277 2.29847,11.444 -2.8236,198.74 -4.97435,7.0987 -0.1559,11.7138 -10.08501,-0.5625 0.1925,-11.9869 -4.97714,-9.2631 4.02451,-188.5874 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccc"/>
+        <path transform="matrix(1.1544516,0,0,1.1544516,-60.174014,-792.64687)" id="path34252" style="opacity:0.33183857;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24179)" d="m 402.99722,5227.6967 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-3.0429505" inkscape:transform-center-y="0.039881254"/>
+        <path id="path34254" transform="translate(65.29157,14.177646)" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 281.25,5115.9575 19.75,-8.5 22.31619,4.317 -19.07745,8.4482 -4.86999,-2.806 -5.2506,0.7543 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+        <path id="path34256" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 309.79487,5245.8463 8.58623,-1.8195 -0.35355,27.5986 -8.40946,-0.5 0.0274,-5.2158 -3.41918,-3.7116 -0.10765,-7.2392 3.63038,-3.7198 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc" transform="translate(65.29157,14.177646)"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient38453);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34258" sodipodi:cx="310.50827" sodipodi:cy="5206.0718" sodipodi:rx="2.2097087" sodipodi:ry="3.9774756" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" transform="translate(68.296774,25.668131)"/>
+        <path transform="translate(68.650327,11.525995)" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" sodipodi:ry="3.9774756" sodipodi:rx="2.2097087" sodipodi:cy="5206.0718" sodipodi:cx="310.50827" id="path34260" style="fill:url(#linearGradient38455);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:type="arc" style="fill:url(#linearGradient38457);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34262" sodipodi:cx="310.50827" sodipodi:cy="5206.0718" sodipodi:rx="2.2097087" sodipodi:ry="3.9774756" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" transform="translate(68.296774,38.926383)"/>
+        <path id="path34264" style="fill:#fff65f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 372.3125,5290.0826 3.0625,3.5628 107.74999,0.015 -0.15625,13.0157 -16.40628,0 0.005,-12.8845 -3.317,-0.028 -2.2e-4,13.0367 L 372.5,5306.645 c -0.11017,-5.5219 -0.0969,-5.4777 -0.1875,-16.5624 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc" transform="translate(65.29157,14.177646)"/>
+        <path id="path34266" transform="translate(65.29157,14.177646)" style="fill:#9f981f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 372.3125,5290.0512 1.09375,1.3438 0.10938,15.3281 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 439.54938,5306.5335 1.09375,1.2735 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38459);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34268"/>
+        <path id="path34270" style="fill:url(#linearGradient38461);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 441.67438,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 443.73688,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38463);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34272"/>
+        <path id="path34274" style="fill:url(#linearGradient38465);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 445.70563,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.72125,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" style="fill:url(#linearGradient38467);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34276"/>
+        <path id="path34278" style="fill:url(#linearGradient38469);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 449.73688,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 451.70563,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38471);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34280"/>
+        <path id="path34282" style="fill:url(#linearGradient38473);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 453.76813,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 455.73688,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38475);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34284"/>
+        <path id="path34286" style="fill:url(#linearGradient38477);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 457.7525,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 459.76813,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" style="fill:url(#linearGradient38479);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34288"/>
+        <path id="path34290" style="fill:url(#linearGradient38481);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 461.64957,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 463.71857,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38483);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34292"/>
+        <path id="path34294" style="fill:url(#linearGradient38485);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 465.63357,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 467.64957,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" style="fill:url(#linearGradient38487);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34296"/>
+        <path id="path34298" style="fill:url(#linearGradient38489);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 469.61857,5307.8148 2.23753,-0.01 0.20779,13.0937 -2.1097,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 472.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38491);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34300"/>
+        <path id="path34302" style="fill:url(#linearGradient38493);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 474.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 476.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" style="fill:url(#linearGradient38495);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34304"/>
+        <path id="path34306" style="fill:url(#linearGradient38497);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 478.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34308" style="fill:url(#linearGradient38499);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 480.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 482.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38501);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34310"/>
+        <path id="path34312" style="fill:url(#linearGradient38503);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 484.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 486.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" style="fill:url(#linearGradient38505);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34314"/>
+        <path id="path34316" style="fill:url(#linearGradient38507);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 488.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 490.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38509);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34318"/>
+        <path id="path34320" style="fill:url(#linearGradient38511);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 492.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 494.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" style="fill:url(#linearGradient38513);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34322"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 496.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38515);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34324"/>
+        <path id="path34326" style="fill:url(#linearGradient38517);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 498.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 500.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" style="fill:url(#linearGradient38519);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34328"/>
+        <path id="path34330" style="fill:url(#linearGradient38521);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 502.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 504.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38523);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34332"/>
+        <path id="path34334" style="fill:url(#linearGradient38525);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 506.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 508.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" style="fill:url(#linearGradient38527);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34336"/>
+        <path id="path34338" style="fill:url(#linearGradient38529);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 510.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34340" style="fill:url(#linearGradient38531);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 512.78057,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 514.74932,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38533);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34342"/>
+        <path id="path34344" style="fill:url(#linearGradient38535);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 516.76494,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 518.78057,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" style="fill:url(#linearGradient38537);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34346"/>
+        <path id="path34348" style="fill:url(#linearGradient38539);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 520.65557,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 522.62432,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38541);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34350"/>
+        <path id="path34352" style="fill:url(#linearGradient38543);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 524.63994,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 526.65557,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" style="fill:url(#linearGradient38545);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34354"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 532.63994,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" style="fill:url(#linearGradient38547);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34356"/>
+        <path id="path34358" style="fill:url(#linearGradient38549);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 534.65557,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34360" style="fill:url(#linearGradient38551);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 536.65557,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34362" style="fill:url(#linearGradient38553);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 538.65557,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 540.62432,5307.8148 1.09375,-0.01 0.10157,13.0937 -1.03126,-0.016 z" style="fill:url(#linearGradient38555);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34364"/>
+        <path id="path34366" style="fill:url(#linearGradient38557);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 542.63994,5307.8304 1.00797,-0.01 0.0936,13.0937 -0.95038,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 544.65557,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" style="fill:url(#linearGradient38559);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34368"/>
+        <path id="path34370" style="fill:url(#linearGradient38561);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 546.59307,5307.8148 1.02226,-0.01 0.0949,13.0937 -0.96385,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" d="m 448.70996,5221.2039 c 0.21432,2.5716 -1.1176,4.7818 -2.9749,4.9367 -1.85731,0.1547 -3.53666,-1.8046 -3.75096,-4.3762 -0.21432,-2.5717 1.1176,-4.7819 2.9749,-4.9367 1.85731,-0.1547 3.53666,1.8045 3.75096,4.3762 z" style="fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34372"/>
+        <path id="path34374" transform="translate(65.29157,14.177646)" style="fill:url(#linearGradient38563);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 350.25,5203.0825 13.23437,-1.8594 0.73438,9.3125 -13.03125,1.5469 c -3.01666,-2.3242 -3.03669,-6.3031 -0.9375,-9 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34376" style="fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 432.5295,5219.7771 c 0.21432,2.5716 -1.1176,4.7818 -2.9749,4.9367 -1.85731,0.1547 -3.53666,-1.8046 -3.75096,-4.3762 -0.21432,-2.5717 1.1176,-4.7819 2.9749,-4.9367 1.85731,-0.1547 3.53666,1.8045 3.75096,4.3762 z" inkscape:connector-curvature="0"/>
+        <path id="path34378" transform="translate(65.29157,14.177646)" style="fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 323.23619,5272.9819 30.14043,-0.1768 -4.86136,2.1213 -25.36746,0.442 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:transform-center-y="0.039881254" inkscape:transform-center-x="-3.0429505" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 402.99722,5227.6967 -13.35677,0.4503 0.25395,-9.338 13.12177,-0.1609 c 2.75412,2.63 2.35352,6.5888 -0.0189,9.0486 z" style="opacity:0.33183857;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24183)" id="path34380" transform="matrix(1.1544516,0,0,1.1544516,-60.799014,-780.14687)"/>
+        <path id="path34382" style="fill:url(#linearGradient38565);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 423.91657,5264.3851 34.625,1.375 0.25,20.75 -34.875,-1 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34384" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 454.53217,5263.4441 2.1888,0.096 0.0706,2.1582 -2.25,-0.094 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 450.99402,5263.2896 2.21588,0.097 -0.0433,2.1547 -2.25,-0.094 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34386"/>
+        <path id="path34388" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 447.544,5263.139 2.23224,0.097 -0.0784,2.1487 -2.25,-0.094 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 444.38299,5263.001 2.09114,0.091 -0.12006,2.1993 -2.125,-0.1253 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34390"/>
+        <path id="path34392" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 441.20019,5262.862 2.10363,0.092 -0.10601,2.1555 -2.09961,-0.023 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 437.88718,5262.7174 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34394"/>
+        <path id="path34396" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 434.57282,5262.5727 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 431.32719,5262.4307 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34398"/>
+        <path id="path34400" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 427.98573,5262.2848 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 424.5425,5262.1347 2.12506,0.093 -0.12692,2.2313 -2.0625,-0.094 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34402"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 454.92431,5286.4515 2.18991,0.066 0.10033,2.157 -2.25107,-0.063 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34404"/>
+        <path id="path34406" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 451.38437,5286.3457 2.21701,0.066 -0.0136,2.1551 -2.25109,-0.063 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.9326,5286.2427 2.23337,0.066 -0.0488,2.1495 -2.25108,-0.063 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34408"/>
+        <path id="path34410" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 444.76999,5286.1482 2.0922,0.062 -0.0898,2.2008 -2.12652,-0.096 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 441.58558,5286.0531 2.10469,0.063 -0.0763,2.1568 -2.09974,0.01 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34412"/>
+        <path id="path34414" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 438.27089,5285.9542 2.12614,0.063 -0.0961,2.2329 -2.06361,-0.065 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 434.95485,5285.8552 2.12614,0.063 -0.0961,2.2329 -2.06361,-0.065 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34416"/>
+        <path id="path34418" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.70757,5285.7578 2.12614,0.064 -0.0961,2.2328 -2.06361,-0.065 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 428.36442,5285.658 2.12613,0.064 -0.0961,2.2329 -2.06359,-0.066 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34420"/>
+        <path id="path34422" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 424.91945,5285.5554 2.12614,0.063 -0.0962,2.2329 -2.06359,-0.065 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34424" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 413.63983,5289.67 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34426" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 413.84721,5296.4172 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 413.88127,5295.6375 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34428"/>
+        <path id="path34430" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 413.91445,5294.8771 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 413.94487,5294.1805 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34432"/>
+        <path id="path34434" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 413.9755,5293.479 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 414.00737,5292.7489 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34436"/>
+        <path id="path34438" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 414.03926,5292.0184 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 414.07056,5291.3032 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34440"/>
+        <path id="path34442" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 414.10271,5290.5668 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 414.13578,5289.8079 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34444"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 408.77675,5296.5036 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34446"/>
+        <path id="path34448" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 408.80006,5295.7235 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 408.82276,5294.9628 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34450"/>
+        <path id="path34452" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 408.84359,5294.2658 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 408.86454,5293.564 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34454"/>
+        <path id="path34456" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 408.88634,5292.8335 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 408.90816,5292.1027 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34458"/>
+        <path id="path34460" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 408.92962,5291.387 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 408.95162,5290.6502 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34462"/>
+        <path id="path34464" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 408.97423,5289.8911 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.00379,5289.67 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34466"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.21117,5296.4172 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34468"/>
+        <path id="path34470" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.24523,5295.6375 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.27841,5294.8771 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34472"/>
+        <path id="path34474" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.30883,5294.1805 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.33946,5293.479 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34476"/>
+        <path id="path34478" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.37133,5292.7489 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.40322,5292.0184 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34480"/>
+        <path id="path34482" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.43452,5291.3032 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.46667,5290.5668 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34484"/>
+        <path id="path34486" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.49974,5289.8079 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34488" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.14071,5296.5036 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.16402,5295.7235 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34490"/>
+        <path id="path34492" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.18672,5294.9628 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.20755,5294.2658 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34494"/>
+        <path id="path34496" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.2285,5293.564 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.2503,5292.8335 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34498"/>
+        <path id="path34500" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.27212,5292.1027 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.29358,5291.387 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34502"/>
+        <path id="path34504" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.31558,5290.6502 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.33819,5289.8911 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34506"/>
+        <path id="path34508" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.36775,5289.67 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34510" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.57513,5296.4172 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 426.60919,5295.6375 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34512"/>
+        <path id="path34514" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.64237,5294.8771 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 426.67279,5294.1805 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34516"/>
+        <path id="path34518" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.70342,5293.479 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 426.73529,5292.7489 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34520"/>
+        <path id="path34522" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.76718,5292.0184 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 426.79848,5291.3032 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34524"/>
+        <path id="path34526" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.83063,5290.5668 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 426.8637,5289.8079 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34528"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.50467,5296.5036 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34530"/>
+        <path id="path34532" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.52798,5295.7235 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.55068,5294.9628 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34534"/>
+        <path id="path34536" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.57151,5294.2658 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.59246,5293.564 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34538"/>
+        <path id="path34540" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.61426,5292.8335 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.63608,5292.1027 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34542"/>
+        <path id="path34544" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.65754,5291.387 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.67954,5290.6502 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34546"/>
+        <path id="path34548" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.70215,5289.8911 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.00379,5232.0408 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34550"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.21117,5238.788 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34552"/>
+        <path id="path34554" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.24523,5238.0083 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.27841,5237.2479 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34556"/>
+        <path id="path34558" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.30883,5236.5513 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.33946,5235.8498 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34560"/>
+        <path id="path34562" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.37133,5235.1197 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.40322,5234.3892 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34564"/>
+        <path id="path34566" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.43452,5233.674 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 420.46667,5232.9376 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34568"/>
+        <path id="path34570" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 420.49974,5232.1787 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34572" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.14071,5238.8744 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.16402,5238.0943 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34574"/>
+        <path id="path34576" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.18672,5237.3336 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.20755,5236.6366 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34578"/>
+        <path id="path34580" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.2285,5235.9348 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.2503,5235.2043 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34582"/>
+        <path id="path34584" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.27212,5234.4735 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.29358,5233.7578 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34586"/>
+        <path id="path34588" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 415.31558,5233.021 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 415.33819,5232.2619 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34590"/>
+        <path id="path34592" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.7213,5234.1621 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34594" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.92868,5240.9093 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 426.96274,5240.1296 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34596"/>
+        <path id="path34598" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.99592,5239.3692 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 427.02634,5238.6726 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34600"/>
+        <path id="path34602" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 427.05697,5237.9711 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 427.08884,5237.241 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34604"/>
+        <path id="path34606" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 427.12073,5236.5105 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 427.15203,5235.7953 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34608"/>
+        <path id="path34610" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 427.18418,5235.0589 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 427.21725,5234.3 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34612"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.85822,5240.9957 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34614"/>
+        <path id="path34616" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.88153,5240.2156 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.90423,5239.4549 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34618"/>
+        <path id="path34620" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.92506,5238.7579 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.94601,5238.0561 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34622"/>
+        <path id="path34624" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.96781,5237.3256 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.98963,5236.5948 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34626"/>
+        <path id="path34628" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 422.01109,5235.8791 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 422.03309,5235.1423 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34630"/>
+        <path id="path34632" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 422.0557,5234.3832 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 433.43881,5234.5157 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34634"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 433.64619,5241.2629 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34636"/>
+        <path id="path34638" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 433.68025,5240.4832 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 433.71343,5239.7228 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34640"/>
+        <path id="path34642" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 433.74385,5239.0262 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 433.77448,5238.3247 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34644"/>
+        <path id="path34646" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 433.80635,5237.5946 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 433.83824,5236.8641 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34648"/>
+        <path id="path34650" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 433.86954,5236.1489 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 433.90169,5235.4125 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34652"/>
+        <path id="path34654" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 433.93476,5234.6536 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34656" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 428.57573,5241.3493 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 428.59904,5240.5692 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34658"/>
+        <path id="path34660" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 428.62174,5239.8085 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 428.64257,5239.1115 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34662"/>
+        <path id="path34664" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 428.66352,5238.4097 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 428.68532,5237.6792 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34666"/>
+        <path id="path34668" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 428.70714,5236.9484 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 428.7286,5236.2327 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34670"/>
+        <path id="path34672" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 428.7506,5235.4959 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 428.77321,5234.7368 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34674"/>
+        <path id="path34676" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 440.3331,5234.6925 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34678" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 440.54048,5241.4397 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 440.57454,5240.66 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34680"/>
+        <path id="path34682" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 440.60772,5239.8996 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 440.63814,5239.203 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34684"/>
+        <path id="path34686" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 440.66877,5238.5015 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 440.70064,5237.7714 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34688"/>
+        <path id="path34690" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 440.73253,5237.0409 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 440.76383,5236.3257 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34692"/>
+        <path id="path34694" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 440.79598,5235.5893 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 440.82905,5234.8304 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34696"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 435.47002,5241.5261 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34698"/>
+        <path id="path34700" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 435.49333,5240.746 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 435.51603,5239.9853 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34702"/>
+        <path id="path34704" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 435.53686,5239.2883 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 435.55781,5238.5865 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34706"/>
+        <path id="path34708" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 435.57961,5237.856 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 435.60143,5237.1252 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34710"/>
+        <path id="path34712" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 435.62289,5236.4095 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 435.64489,5235.6727 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34714"/>
+        <path id="path34716" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 435.6675,5234.9136 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.22739,5235.0461 -0.30302,7.6308 -4.57298,0.055 0.22039,-7.6859 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34718"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.43477,5241.7933 -0.0212,0.4824 -0.47563,0.016 0.0207,-0.4959 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34720"/>
+        <path id="path34722" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 447.46883,5241.0136 -0.0214,0.4883 -0.47486,-0.01 0.0207,-0.4959 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.50201,5240.2532 -0.0214,0.492 -0.47355,-0.018 0.0207,-0.4958 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34724"/>
+        <path id="path34726" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 447.53243,5239.5566 -0.02,0.4609 -0.48469,-0.027 0.0276,-0.4683 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.56306,5238.8551 -0.0203,0.4636 -0.47504,-0.024 0.005,-0.4628 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34728"/>
+        <path id="path34730" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 447.59493,5238.125 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.62682,5237.3945 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34732"/>
+        <path id="path34734" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 447.65812,5236.6793 -0.0205,0.4683 -0.49175,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.69027,5235.9429 -0.0205,0.4683 -0.49174,-0.028 0.0207,-0.4545 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34736"/>
+        <path id="path34738" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 447.72334,5235.184 -0.0205,0.4684 -0.49174,-0.028 0.0207,-0.4545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34740" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 442.36431,5241.8797 -0.0146,0.4826 -0.47537,0.022 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 442.38762,5241.0996 -0.0146,0.4886 -0.47494,0 0.0139,-0.4961 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34742"/>
+        <path id="path34744" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 442.41032,5240.3389 -0.0146,0.4922 -0.47372,-0.011 0.0139,-0.4961 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 442.43115,5239.6419 -0.0137,0.461 -0.48502,-0.02 0.0212,-0.4687 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34746"/>
+        <path id="path34748" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 442.4521,5238.9401 -0.0139,0.4639 -0.47532,-0.017 -0.002,-0.4628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 442.4739,5238.2096 -0.0139,0.4686 -0.4921,-0.021 0.0143,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34750"/>
+        <path id="path34752" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 442.49572,5237.4788 -0.0139,0.4685 -0.4921,-0.021 0.0143,-0.4549 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 442.51718,5236.7631 -0.0141,0.4686 -0.49207,-0.021 0.0144,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34754"/>
+        <path id="path34756" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 442.53918,5236.0263 -0.0141,0.4686 -0.49209,-0.021 0.0146,-0.4548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path transform="matrix(-0.90508377,-0.24251646,0.24251646,-0.90508377,-446.81736,10060.926)" id="path34758" style="opacity:0.52466371;fill:url(#linearGradient38567);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24003)" d="m 421.12931,5219.2144 10.97663,7.6236 -5.78574,7.334 -10.61531,-7.7151 c -0.63564,-3.7547 2.052,-6.6888 5.42442,-7.2425 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 442.56179,5235.2672 -0.0139,0.4685 -0.49209,-0.021 0.0143,-0.4548 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34760"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 485.62916,5226.0322 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34762"/>
+        <path id="path34764" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 483.82815,5232.7081 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 483.03265,5224.709 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34766"/>
+        <path id="path34768" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.78341,5226.0322 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 487.9824,5232.7081 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34770"/>
+        <path id="path34772" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 487.1869,5224.709 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 494.55638,5226.0322 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34774"/>
+        <path id="path34776" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 492.75537,5232.7081 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 491.95987,5224.709 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34778"/>
+        <path id="path34780" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 493.14217,5236.1969 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 491.34116,5242.8728 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34782"/>
+        <path id="path34784" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 490.54566,5234.8737 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 488.19242,5236.1969 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34786"/>
+        <path id="path34788" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 486.39141,5242.8728 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 485.59591,5234.8737 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34790"/>
+        <path id="path34792" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 503.4836,5239.9976 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 501.68259,5246.6735 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34794"/>
+        <path id="path34796" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 500.88709,5238.6744 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 508.7869,5239.9976 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34798"/>
+        <path id="path34800" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 506.98589,5246.6735 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 506.19039,5238.6744 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34802"/>
+        <path id="path34804" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 513.73665,5239.9976 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 511.93564,5246.6735 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34806"/>
+        <path id="path34808" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 511.14014,5238.6744 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 518.6864,5239.9976 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34810"/>
+        <path id="path34812" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 516.88539,5246.6735 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 516.08989,5238.6744 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34814"/>
+        <path id="path34816" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 515.6864,5229.6226 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 513.88539,5236.2985 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34818"/>
+        <path id="path34820" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 513.08989,5228.2994 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 510.4364,5229.6226 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34822"/>
+        <path id="path34824" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 508.63539,5236.2985 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 507.83989,5228.2994 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34826"/>
+        <path id="path34828" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 505.4364,5229.6226 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 503.63539,5236.2985 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34830"/>
+        <path id="path34832" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 502.83989,5228.2994 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34834" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 475.39939,5255.7753 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 473.59838,5262.4512 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34836"/>
+        <path id="path34838" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 472.80288,5254.4521 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34840" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 472.841,5290.1641 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 471.03999,5296.84 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34842"/>
+        <path id="path34844" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 470.24449,5288.8409 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34846" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 481.32628,5290.4644 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 479.52527,5297.1403 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34848"/>
+        <path id="path34850" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 478.72977,5289.1412 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34852" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 490.16511,5290.818 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 488.3641,5297.4939 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34854"/>
+        <path id="path34856" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 487.5686,5289.4948 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34858" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 499.18073,5290.8179 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 497.37972,5297.4938 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34860"/>
+        <path id="path34862" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 496.58422,5289.4947 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34864" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 508.90345,5290.9947 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 507.10244,5297.6706 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34866"/>
+        <path id="path34868" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 506.30694,5289.6715 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34870" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 518.44939,5280.5649 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 516.64838,5287.2408 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34872"/>
+        <path id="path34874" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 515.85288,5279.2417 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34876" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 532.94507,5295.9445 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 531.14406,5302.6204 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34878"/>
+        <path id="path34880" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 530.34856,5294.6213 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34882" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 538.24838,5295.9445 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 536.44737,5302.6204 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34884"/>
+        <path id="path34886" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 535.65187,5294.6213 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34888" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 543.72846,5295.9445 0.32767,6.7708 -2.90453,0.2251 -0.38398,-6.8164 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 541.92745,5302.6204 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34890"/>
+        <path id="path34892" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 541.13195,5294.6213 1.67724,-0.03 0.23229,1.4982 -1.72377,0.034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34894" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 455.46416,5221.6602 21.00468,1.133 c 1.58804,0.086 2.862,1.4363 2.85638,3.0284 l -0.0419,11.8541 c -0.006,1.5921 -1.28861,2.8047 -2.87665,2.719 l -21.00468,-1.1329 c -1.58803,-0.086 -2.86199,-1.4362 -2.85637,-3.0283 l 0.0419,-11.8542 c 0.006,-1.5921 1.2886,-2.8048 2.87664,-2.7191 z" inkscape:connector-curvature="0"/>
+        <path id="path34896" style="fill:url(#linearGradient38569);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 456.30353,5221.3352 20.52024,1.5572 c 1.55969,0.1188 2.81623,1.4144 2.81069,2.9811 l -0.0396,11.2231 c -0.006,1.5667 -1.26799,2.7595 -2.83064,2.6747 l -20.52181,-1.1156 c -1.56264,-0.085 -2.81622,-1.4145 -2.81069,-2.9812 l 0.0412,-11.6649 c 0.006,-1.5666 1.27095,-2.7928 2.83064,-2.6744 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+        <path style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 485.05357,5255.3834 0,22.2188 13.0625,0.2812 0.15625,-21.9374 -13.21875,-0.5626 z m 13.0625,22.5 13.1875,0.2188 0,-21.8438 -13,-0.25 -0.1875,21.875 z" id="path34898" inkscape:connector-curvature="0"/>
+        <path style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 485.06657,5255.8086 0,22.1876 13.28125,0 12.84375,0 0.6,-0.611 -0.6,-20.639 -12.625,-0.4688 0,0.031 -12.9,-1.0855 -0.6,0.5855 z" id="path34900" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccc"/>
+        <path id="path34902" style="fill:url(#linearGradient38571);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 485.78141,5255.228 26.01016,0.9072 0,21.25 -25.97192,-0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path34904" transform="translate(65.29157,14.177646)" style="fill:url(#linearGradient38573);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 455.5,5220.27 6.125,-1.3125 0,54.75 -6.25,0.875 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 536.66657,5233.3851 8,0 0.11428,54.4848 -8.23928,0.8589 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34906"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 520.65442,5288.7575 25.64232,0.1721 3.55485,-1.0207 -22.94798,-0.023 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34908"/>
+        <path id="path34910" transform="translate(65.29157,14.177646)" style="fill:url(#linearGradient38575);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 466.54687,5218.9887 12.85938,0.1407 -5e-5,3.7344 -12.84375,-0.1563 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 531.85406,5284.7008 12.82767,0.096 0.0317,3.198 -12.88258,-0.044 z" style="fill:url(#linearGradient38577);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34912"/>
+        <path id="path34914" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 526.91657,5233.1503 4.9375,0 0,54.7348 -4.9375,0 z" inkscape:connector-curvature="0"/>
+        <path d="m 544.72682,5233.4154 4.85983,0 0,54.5139 -4.85983,0 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34916" inkscape:connector-curvature="0"/>
+        <path id="path34918" style="fill:url(#linearGradient38579);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 526.88159,5286.9087 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.8438 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9003 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.856 4.92765,0 0,0.9944 -4.92765,0 z m 0.0781,-1.9004 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.7236 4.84952,0 0,0.9943 -4.84952,0 z m 0,-1.9004 4.84952,0 0,0.9943 -4.84952,0 z m 0,-1.9444 4.84952,0 0,0.9944 -4.84952,0 z m -3e-5,-1.9003 4.84952,0 0,0.9943 -4.84952,0 z m 0,-1.856 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.9004 4.84952,0 0,0.9944 -4.84952,0 z m -0.0177,-1.8965 4.84952,0 0,0.9944 -4.84952,0 z m -3e-5,-1.9004 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.9443 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.9004 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.856 4.84952,0 0,0.9944 -4.84952,0 z m 0,-1.9003 4.84952,0 0,0.9943 -4.84952,0 z m -0.0202,-1.7642 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9443 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.856 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.936 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9443 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9943 -4.92765,0 z m 0,-1.856 4.92765,0 0,0.9944 -4.92765,0 z m 0,-1.9004 4.92765,0 0,0.9944 -4.92765,0 z m 3.93226,-0.9303 1,-0.01 0,54.7451 -1,0 z m -3.9387,-0.017 1.03245,-0.03 -0.0112,54.7806 -1.04328,-7e-4 z m 1.90745,-0.023 1,0 2.03644,0.01 -0.83331,0.9709 -1.20313,0.016 0,53.7842 -1,0 0,-53.7685 -0.92188,0 0.0308,-1.0134 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"/>
+        <path id="path34920" style="fill:url(#linearGradient38581);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 544.64227,5286.9385 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8364 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8941 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8496 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8931 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.7177 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8941 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.937 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.894 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8496 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8931 4.92765,0 0,0.9908 -4.92765,0 z m -0.0177,-1.8902 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.894 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.937 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.894 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8492 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8935 4.92765,0 0,0.9908 -4.92765,0 z m 0.0579,-1.7583 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8931 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.938 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8935 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8492 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.894 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.9292 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8936 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.9375 4.92765,0 0,0.9909 -4.92765,0 z m 0,-1.8935 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8496 4.92765,0 0,0.9908 -4.92765,0 z m 0,-1.8936 4.92765,0 0,0.9909 -4.92765,0 z m 3.93223,-0.9463 1,0.016 0,54.5479 -1,0 z m -4.00085,-0.044 1.04843,0.01 3.01216,0.04 c 0,0 0.0134,0.037 0.0153,0.056 0.0308,0.308 -0.0622,0.9265 -0.0622,0.9265 l -1.04104,-0.014 -0.87554,-0.7541 -0.0835,0.8204 -1.06933,-0.048 0.10401,-0.9206 -0.0114,54.4934 -1.05943,-7e-4 z m 1.96963,0.04 1,0 0,54.5674 -1,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscacccccccccccccc"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 336.75961,5199.6193 0,-8.2201 131.87541,12.9047 9.28078,9.8111 0,4.1543" id="path34922" inkscape:path-effect="#path-effect23823" inkscape:original-d="m 336.75961,5199.6193 0,-8.2201 131.87541,12.9047 9.28078,9.8111 0,4.1543" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 338.79254,5212.524 4.15425,0 0,-13.9653 124.18563,10.7834 5.3033,6.8942 0,1.6794" id="path34924" inkscape:path-effect="#path-effect23831" inkscape:original-d="m 338.79254,5212.524 4.15425,0 0,-13.9653 124.18563,10.7834 5.3033,6.8942 0,1.6794" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.12931,5219.2144 10.97663,7.6236 -5.78574,7.334 -10.61531,-7.7151 c -0.63564,-3.7547 2.052,-6.6888 5.42442,-7.2425 z" style="opacity:0.52466371;fill:url(#linearGradient38583);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter24003)" id="path34926" transform="matrix(-0.90508377,-0.24251646,0.24251646,-0.90508377,-463.31736,10059.426)"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 338.61576,5213.1428 12.02082,14.8492 -11.49049,0" id="path34928" inkscape:path-effect="#path-effect23835" inkscape:original-d="m 338.61576,5213.1428 12.02082,14.8492 -11.49049,0" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 339.41126,5231.174 15.29118,0 1.66421,12.7405 47.47971,2.1087 -0.003,-6.0037 c 1.85389,0.065 3.70779,0.1295 5.56168,0.1942 1.31188,0.046 2.62376,0.092 3.93564,0.1374 l 0,-6.0835 40.79897,0.1767 0,3.3588 1.23744,0" id="path34930" inkscape:path-effect="#path-effect23839" inkscape:original-d="m 339.41126,5231.174 15.29118,0 1.66421,12.7405 47.47971,2.1087 -0.003,-6.0037 5.56168,0.1942 3.93564,0.1374 0,-6.0835 40.79897,0.1767 0,3.3588 1.23744,0" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)" sodipodi:nodetypes="ccccccccccc"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 358.94508,5228.2572 0,1.9445 9.81111,0 27.04683,0 16.17507,0 1.32582,0 0,3.2704" id="path34932" inkscape:path-effect="#path-effect23843" inkscape:original-d="m 358.94508,5228.2572 0,1.9445 9.81111,0 27.04683,0 16.17507,0 1.32582,0 0,3.2704" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 409.85677,5231.7043 0,5.2149 -9.19239,0 0,5.1265 -41.30864,-2.0797 -0.41066,-9.6759" id="path34934" inkscape:path-effect="#path-effect23847" inkscape:original-d="m 409.85677,5231.7043 0,5.2149 -9.19239,0 0,5.1265 -41.30864,-2.0797 -0.41066,-9.6759" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)" sodipodi:nodetypes="cccccc"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 407.3819,5250.0891 -10.695,1.0606 0.24265,37.4767 -20.13002,0.2652 -3.62393,-4.773 -41.10058,0.8839 -2.59099,2.7903 -0.59099,11.1746 -2.74004,0 0,-23.8648" id="path34936" inkscape:path-effect="#path-effect23855" inkscape:original-d="m 407.3819,5250.0891 -10.695,1.0606 0.24265,37.4767 -20.13002,0.2652 -3.62393,-4.773 -41.10058,0.8839 c -0.53091,2.7128 0.13657,3.7087 -2.59099,2.7903 l -0.59099,11.1746 -2.74004,0 0,-23.8648" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)" sodipodi:nodetypes="cccccccccc"/>
+        <path style="fill:none;stroke:#e9f2ac;stroke-width:0.57800001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 324.38524,5275.2798 0,27.0468 6.54073,0 0.35356,0 0.53033,-12.5852 1.59099,-1.9105 39.95153,-0.7071 2.82843,3.8891 22.7665,0 1.23744,-1.2375 0.0377,-36.2392 15.20279,-2.8284 -0.25853,-7.8637 4.23603,0.086" id="path34938" inkscape:path-effect="#path-effect23859" inkscape:original-d="m 324.38524,5275.2798 0,27.0468 6.54073,0 0.35356,0 0.53033,-12.5852 1.59099,-1.9105 39.95153,-0.7071 2.82843,3.8891 22.7665,0 1.23744,-1.2375 0.0377,-36.2392 15.20279,-2.8284 -0.25853,-7.8637 4.23603,0.086" inkscape:connector-curvature="0" transform="translate(65.29157,14.177646)" sodipodi:nodetypes="cccccccccccccc"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Notebook.svg b/misc/images/svg/elements/Notebook.svg
index 8314695afd0..2562f61699e 100644
--- a/misc/images/svg/elements/Notebook.svg
+++ b/misc/images/svg/elements/Notebook.svg
@@ -1,5580 +1,1292 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="117.36148"
-   id="svg131597"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Notebook.svg">
-  <defs
-     id="defs131599">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44591"
-       id="linearGradient40777"
-       gradientUnits="userSpaceOnUse"
-       x1="410.36655"
-       y1="6066.4492"
-       x2="409.93729"
-       y2="6051.4961" />
-    <linearGradient
-       id="linearGradient44591">
-      <stop
-         id="stop44593"
-         offset="0"
-         style="stop-color:#202c36;stop-opacity:1;" />
-      <stop
-         id="stop44595"
-         offset="1"
-         style="stop-color:#b2bac0;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39719-2"
-       id="linearGradient40779"
-       gradientUnits="userSpaceOnUse"
-       x1="414.82666"
-       y1="6112.8496"
-       x2="422.78177"
-       y2="6054.8496" />
-    <linearGradient
-       id="linearGradient39719-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39721-4" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39723-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44591"
-       id="linearGradient40781"
-       gradientUnits="userSpaceOnUse"
-       x1="338.78629"
-       y1="6085.7114"
-       x2="338.79538"
-       y2="6080.5044" />
-    <linearGradient
-       id="linearGradient129891">
-      <stop
-         id="stop129893"
-         offset="0"
-         style="stop-color:#202c36;stop-opacity:1;" />
-      <stop
-         id="stop129895"
-         offset="1"
-         style="stop-color:#b2bac0;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56034"
-       id="linearGradient40783"
-       gradientUnits="userSpaceOnUse"
-       x1="409.20425"
-       y1="6087.7764"
-       x2="409.12289"
-       y2="6110.6851" />
-    <linearGradient
-       id="linearGradient56034">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop56036" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop56038" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter42621"
-       x="-0.017699031"
-       width="1.0353981"
-       y="-0.64296621"
-       height="2.2859323"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.81037852"
-         id="feGaussianBlur42623" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="117.36148" id="svg131597" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="Notebook.svg">
+  <defs id="defs131599">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient44591" id="linearGradient40777" gradientUnits="userSpaceOnUse" x1="410.36655" y1="6066.4492" x2="409.93729" y2="6051.4961"/>
+    <linearGradient id="linearGradient44591">
+      <stop id="stop44593" offset="0" style="stop-color:#202c36;stop-opacity:1;"/>
+      <stop id="stop44595" offset="1" style="stop-color:#b2bac0;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient39719-2" id="linearGradient40779" gradientUnits="userSpaceOnUse" x1="414.82666" y1="6112.8496" x2="422.78177" y2="6054.8496"/>
+    <linearGradient id="linearGradient39719-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39721-4"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39723-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient44591" id="linearGradient40781" gradientUnits="userSpaceOnUse" x1="338.78629" y1="6085.7114" x2="338.79538" y2="6080.5044"/>
+    <linearGradient id="linearGradient129891">
+      <stop id="stop129893" offset="0" style="stop-color:#202c36;stop-opacity:1;"/>
+      <stop id="stop129895" offset="1" style="stop-color:#b2bac0;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient56034" id="linearGradient40783" gradientUnits="userSpaceOnUse" x1="409.20425" y1="6087.7764" x2="409.12289" y2="6110.6851"/>
+    <linearGradient id="linearGradient56034">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop56036"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop56038"/>
+    </linearGradient>
+    <filter inkscape:collect="always" id="filter42621" x="-0.017699031" width="1.0353981" y="-0.64296621" height="2.2859323" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.81037852" id="feGaussianBlur42623"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18875-2"
-       id="linearGradient40785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.91471658,0,517.25548)"
-       x1="397.76871"
-       y1="5966.5059"
-       x2="422.38306"
-       y2="6077.4565" />
-    <linearGradient
-       id="linearGradient18875-2">
-      <stop
-         id="stop18877-5"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop18879-1"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42597"
-       id="linearGradient40787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.91471658,0,517.25548)"
-       x1="422.38049"
-       y1="6051.9395"
-       x2="382.42896"
-       y2="6013.0483" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient42597">
-      <stop
-         style="stop-color:#080808;stop-opacity:1;"
-         offset="0"
-         id="stop42599" />
-      <stop
-         style="stop-color:#080808;stop-opacity:0;"
-         offset="1"
-         id="stop42601" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient55929"
-       id="linearGradient40789"
-       gradientUnits="userSpaceOnUse"
-       x1="345.28143"
-       y1="6077.2759"
-       x2="345.96701"
-       y2="6060.7412" />
-    <linearGradient
-       id="linearGradient55929">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop55931" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop55933" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24394-2"
-       id="linearGradient40791"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(65.29157,14.877462)"
-       x1="344.53705"
-       y1="6072.9365"
-       x2="346.82233"
-       y2="6084.7876" />
-    <linearGradient
-       id="linearGradient24394-2">
-      <stop
-         id="stop24396-3"
-         offset="0"
-         style="stop-color:#5f5f5f;stop-opacity:1;" />
-      <stop
-         style="stop-color:#353535;stop-opacity:1;"
-         offset="0.60042131"
-         id="stop24398-7" />
-      <stop
-         id="stop24400-3"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40793"
-       gradientUnits="userSpaceOnUse"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353"
-       gradientTransform="matrix(0.96511756,0,0,1,14.214464,0)" />
-    <linearGradient
-       id="linearGradient24303-6">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop24307-3" />
-      <stop
-         id="stop24309-0"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40795"
-       gradientUnits="userSpaceOnUse"
-       x1="366.22906"
-       y1="6074.0103"
-       x2="370.54156"
-       y2="6074.0103"
-       gradientTransform="matrix(0.96511756,0,0,1,14.214464,0)" />
-    <linearGradient
-       id="linearGradient42643">
-      <stop
-         style="stop-color:#2f2f2f;stop-opacity:1;"
-         offset="0"
-         id="stop42645" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop42647" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40797"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,18.723373,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient129929">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop129931" />
-      <stop
-         id="stop129933"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40799"
-       gradientUnits="userSpaceOnUse"
-       x1="370.90094"
-       y1="6074.0103"
-       x2="375.21344"
-       y2="6074.0103"
-       gradientTransform="matrix(0.96511756,0,0,1,14.214464,0)" />
-    <linearGradient
-       id="linearGradient129936">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop129938" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop129940" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40801"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,25.2874,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient129943">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop129945" />
-      <stop
-         id="stop129947"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40803"
-       gradientUnits="userSpaceOnUse"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103"
-       gradientTransform="matrix(0.96511756,0,0,1,16.269583,0)" />
-    <linearGradient
-       id="linearGradient129950">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop129952" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop129954" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient129957">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop129959" />
-      <stop
-         id="stop129961"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient129964">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop129966" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop129968" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient129971">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop129973" />
-      <stop
-         id="stop129975"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient129978">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop129980" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop129982" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient129985">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop129987" />
-      <stop
-         id="stop129989"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient129992">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop129994" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop129996" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient129999">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130001" />
-      <stop
-         id="stop130003"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130006">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130008" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130010" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130013">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130015" />
-      <stop
-         id="stop130017"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130020">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130022" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130024" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130027">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130029" />
-      <stop
-         id="stop130031"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130034">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130036" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130038" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130041">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130043" />
-      <stop
-         id="stop130045"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130048">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130050" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130052" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130055">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130057" />
-      <stop
-         id="stop130059"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130062">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130064" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130066" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130069">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130071" />
-      <stop
-         id="stop130073"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130076">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130078" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130080" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130083">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130085" />
-      <stop
-         id="stop130087"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130090">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130092" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130094" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130097">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130099" />
-      <stop
-         id="stop130101"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130104">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130106" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130108" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130111">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130113" />
-      <stop
-         id="stop130115"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130118">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130120" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130122" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130125">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130127" />
-      <stop
-         id="stop130129"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130132">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130134" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130136" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130139">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130141" />
-      <stop
-         id="stop130143"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130146">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130148" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130150" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130153">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130155" />
-      <stop
-         id="stop130157"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130160">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130162" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130164" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130167">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130169" />
-      <stop
-         id="stop130171"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130174">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130176" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130178" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40869"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,8.1650752,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130181">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130183" />
-      <stop
-         id="stop130185"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40871"
-       gradientUnits="userSpaceOnUse"
-       x1="366.22906"
-       y1="6076.7603"
-       x2="370.54156"
-       y2="6076.7603"
-       gradientTransform="matrix(0.98028523,0,0,1,8.1650752,0)" />
-    <linearGradient
-       id="linearGradient130188">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130190" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130192" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,12.744846,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130195">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130197" />
-      <stop
-         id="stop130199"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40875"
-       gradientUnits="userSpaceOnUse"
-       x1="370.90094"
-       y1="6076.7603"
-       x2="375.21344"
-       y2="6076.7603"
-       gradientTransform="matrix(0.98028523,0,0,1,8.1650752,0)" />
-    <linearGradient
-       id="linearGradient130202">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130204" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130206" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40877"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,19.379734,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130209">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130211" />
-      <stop
-         id="stop130213"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40879"
-       gradientUnits="userSpaceOnUse"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603"
-       gradientTransform="matrix(0.98028523,0,0,1,10.220194,0)" />
-    <linearGradient
-       id="linearGradient130216">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130218" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130220" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130223">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130225" />
-      <stop
-         id="stop130227"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130230">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130232" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130234" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130237">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130239" />
-      <stop
-         id="stop130241"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130244">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130246" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130248" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130251">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130253" />
-      <stop
-         id="stop130255"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130258">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130260" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130262" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130265">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130267" />
-      <stop
-         id="stop130269"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130272">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130274" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130276" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130279">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130281" />
-      <stop
-         id="stop130283"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130286">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130288" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130290" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130293">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130295" />
-      <stop
-         id="stop130297"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130300">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130302" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130304" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130307">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130309" />
-      <stop
-         id="stop130311"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130314">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130316" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130318" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130321">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130323" />
-      <stop
-         id="stop130325"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130328">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130330" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130332" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130335">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130337" />
-      <stop
-         id="stop130339"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130342">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130344" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130346" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130349">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130351" />
-      <stop
-         id="stop130353"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130356">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130358" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130360" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130363">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130365" />
-      <stop
-         id="stop130367"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130370">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130372" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130374" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130377">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130379" />
-      <stop
-         id="stop130381"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130384">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130386" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130388" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40929"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,3.8235894,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130391">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130393" />
-      <stop
-         id="stop130395"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40931"
-       gradientUnits="userSpaceOnUse"
-       x1="366.22906"
-       y1="6079.5103"
-       x2="370.54156"
-       y2="6079.5103"
-       gradientTransform="matrix(0.9907903,0,0,1,3.8235894,0)" />
-    <linearGradient
-       id="linearGradient130398">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130400" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130402" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40933"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,8.4524379,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130405">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130407" />
-      <stop
-         id="stop130409"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40935"
-       gradientUnits="userSpaceOnUse"
-       x1="370.90094"
-       y1="6079.5103"
-       x2="375.21344"
-       y2="6079.5103"
-       gradientTransform="matrix(0.9907903,0,0,1,3.8235894,0)" />
-    <linearGradient
-       id="linearGradient130412">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130414" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130416" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient40937"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,15.136405,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130419">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130421" />
-      <stop
-         id="stop130423"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient40939"
-       gradientUnits="userSpaceOnUse"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103"
-       gradientTransform="matrix(0.9907903,0,0,1,5.8787079,0)" />
-    <linearGradient
-       id="linearGradient130426">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130428" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130430" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130433">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130435" />
-      <stop
-         id="stop130437"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130440">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130442" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130444" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130447">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130449" />
-      <stop
-         id="stop130451"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130454">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130456" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130458" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130461">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130463" />
-      <stop
-         id="stop130465"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130468">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130470" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130472" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130475">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130477" />
-      <stop
-         id="stop130479"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130482">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130484" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130486" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130489">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130491" />
-      <stop
-         id="stop130493"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130496">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130498" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130500" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130503">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130505" />
-      <stop
-         id="stop130507"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130510">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130512" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130514" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130517">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130519" />
-      <stop
-         id="stop130521"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130524">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130526" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130528" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130531">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130533" />
-      <stop
-         id="stop130535"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130538">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130540" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130542" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130545">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130547" />
-      <stop
-         id="stop130549"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130552">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130554" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130556" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130559">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130561" />
-      <stop
-         id="stop130563"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130566">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130568" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130570" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130573">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130575" />
-      <stop
-         id="stop130577"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130580">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130582" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130584" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130587">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130589" />
-      <stop
-         id="stop130591"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130594">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130596" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130598" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130601">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130603" />
-      <stop
-         id="stop130605"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130608">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130610" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130612" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130615">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130617" />
-      <stop
-         id="stop130619"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130622">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130624" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130626" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130629">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130631" />
-      <stop
-         id="stop130633"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130636">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130638" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130640" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130643">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130645" />
-      <stop
-         id="stop130647"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130650">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130652" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130654" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41005"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,1.1637965,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130657">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130659" />
-      <stop
-         id="stop130661"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41007"
-       gradientUnits="userSpaceOnUse"
-       x1="366.22906"
-       y1="6082.2915"
-       x2="370.54156"
-       y2="6082.2915"
-       gradientTransform="matrix(0.99668887,0,0,1,1.1637965,0)" />
-    <linearGradient
-       id="linearGradient130664">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130666" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130668" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,5.820203,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130671">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130673" />
-      <stop
-         id="stop130675"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41011"
-       gradientUnits="userSpaceOnUse"
-       x1="370.90094"
-       y1="6082.2915"
-       x2="375.21344"
-       y2="6082.2915"
-       gradientTransform="matrix(0.99668887,0,0,1,1.1637965,0)" />
-    <linearGradient
-       id="linearGradient130678">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130680" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130682" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41013"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,12.531727,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130685">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130687" />
-      <stop
-         id="stop130689"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41015"
-       gradientUnits="userSpaceOnUse"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915"
-       gradientTransform="matrix(0.99668887,0,0,1,3.218915,0)" />
-    <linearGradient
-       id="linearGradient130692">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130694" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130696" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130699">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130701" />
-      <stop
-         id="stop130703"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130706">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130708" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130710" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130713">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130715" />
-      <stop
-         id="stop130717"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130720">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130722" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130724" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130727">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130729" />
-      <stop
-         id="stop130731"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130734">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130736" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130738" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130741">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130743" />
-      <stop
-         id="stop130745"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130748">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130750" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130752" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130755">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130757" />
-      <stop
-         id="stop130759"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130762">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130764" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130766" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130769">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130771" />
-      <stop
-         id="stop130773"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130776">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130778" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130780" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130783">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130785" />
-      <stop
-         id="stop130787"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130790">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130792" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130794" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130797">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130799" />
-      <stop
-         id="stop130801"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130804">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130806" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130808" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130811">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130813" />
-      <stop
-         id="stop130815"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130818">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130820" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130822" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130825">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130827" />
-      <stop
-         id="stop130829"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130832">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130834" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130836" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130839">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130841" />
-      <stop
-         id="stop130843"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130846">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130848" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130853">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130855" />
-      <stop
-         id="stop130857"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130860">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130862" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130864" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130867">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130869" />
-      <stop
-         id="stop130871"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130874">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130876" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130878" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130881">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130883" />
-      <stop
-         id="stop130885"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130888">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130890" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130892" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130895">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130897" />
-      <stop
-         id="stop130899"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130902">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130904" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130906" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,-3.2685325,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130909">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130911" />
-      <stop
-         id="stop130913"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41079"
-       gradientUnits="userSpaceOnUse"
-       x1="366.22906"
-       y1="6085.104"
-       x2="370.54156"
-       y2="6085.104"
-       gradientTransform="matrix(1.0074113,0,0,1,-3.2685325,0)" />
-    <linearGradient
-       id="linearGradient130916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,1.4379675,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130923">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130925" />
-      <stop
-         id="stop130927"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41083"
-       gradientUnits="userSpaceOnUse"
-       x1="370.90094"
-       y1="6085.104"
-       x2="375.21344"
-       y2="6085.104"
-       gradientTransform="matrix(1.0074113,0,0,1,-3.2685325,0)" />
-    <linearGradient
-       id="linearGradient130930">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130932" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130934" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,8.1995848,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient130937">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130939" />
-      <stop
-         id="stop130941"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41087"
-       gradientUnits="userSpaceOnUse"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104"
-       gradientTransform="matrix(1.0074113,0,0,1,-1.213414,0)" />
-    <linearGradient
-       id="linearGradient130944">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130946" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130948" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130951">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130953" />
-      <stop
-         id="stop130955"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130958">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130960" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130962" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130965">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130967" />
-      <stop
-         id="stop130969"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130972">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130974" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130976" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130979">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130981" />
-      <stop
-         id="stop130983"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130986">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop130988" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop130990" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient130993">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop130995" />
-      <stop
-         id="stop130997"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131000">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131002" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131004" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131007">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131009" />
-      <stop
-         id="stop131011"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131014">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131016" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131018" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131021">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131023" />
-      <stop
-         id="stop131025"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131028">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131030" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131032" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131035">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131037" />
-      <stop
-         id="stop131039"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131042">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131044" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131046" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131049">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131051" />
-      <stop
-         id="stop131053"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131056">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131058" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131060" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131063">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131065" />
-      <stop
-         id="stop131067"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131070">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131072" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131074" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131077">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131079" />
-      <stop
-         id="stop131081"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131084">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131086" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131088" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131091">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131093" />
-      <stop
-         id="stop131095"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131098">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131100" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131102" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131105">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131107" />
-      <stop
-         id="stop131109"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131112">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131114" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131116" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131119">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131121" />
-      <stop
-         id="stop131123"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131126">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131128" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131130" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41141"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,-7.6023636,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient131133">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131135" />
-      <stop
-         id="stop131137"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41143"
-       gradientUnits="userSpaceOnUse"
-       x1="366.23096"
-       y1="6087.854"
-       x2="370.54346"
-       y2="6087.854"
-       gradientTransform="matrix(1.0178954,0,0,1,-7.6042927,0)" />
-    <linearGradient
-       id="linearGradient131140">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131142" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131144" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41145"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,-2.846884,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient131147">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131149" />
-      <stop
-         id="stop131151"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41147"
-       gradientUnits="userSpaceOnUse"
-       x1="370.90283"
-       y1="6087.854"
-       x2="375.21533"
-       y2="6087.854"
-       gradientTransform="matrix(1.0178954,0,0,1,-7.6042927,0)" />
-    <linearGradient
-       id="linearGradient131154">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131156" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131158" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient41149"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,3.963716,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       id="linearGradient131161">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131163" />
-      <stop
-         id="stop131165"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient41151"
-       gradientUnits="userSpaceOnUse"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854"
-       gradientTransform="matrix(1.0178954,0,0,1,-5.5491742,0)" />
-    <linearGradient
-       id="linearGradient131168">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131170" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131172" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131175">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131177" />
-      <stop
-         id="stop131179"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131182">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131184" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131186" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131189">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131191" />
-      <stop
-         id="stop131193"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131196">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131198" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131200" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131203">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131205" />
-      <stop
-         id="stop131207"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131210">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131212" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131214" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131217">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131219" />
-      <stop
-         id="stop131221"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131224">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131226" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131228" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131231">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131233" />
-      <stop
-         id="stop131235"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131238">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131240" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131242" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131245">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131247" />
-      <stop
-         id="stop131249"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131252">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131254" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131256" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131259">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131261" />
-      <stop
-         id="stop131263"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131266">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131268" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131270" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131273">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131275" />
-      <stop
-         id="stop131277"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131280">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131282" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131284" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131287">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131289" />
-      <stop
-         id="stop131291"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131294">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131296" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131298" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131301">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131303" />
-      <stop
-         id="stop131305"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131308">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131310" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131312" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131315">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131317" />
-      <stop
-         id="stop131319"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131322">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131324" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131326" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22646-0"
-       id="linearGradient41197"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient22646-0">
-      <stop
-         style="stop-color:#d7d700;stop-opacity:1;"
-         offset="0"
-         id="stop22648-8" />
-      <stop
-         style="stop-color:#7e7e00;stop-opacity:1;"
-         offset="1"
-         id="stop22650-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22662-1"
-       id="linearGradient41199"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient22662-1">
-      <stop
-         id="stop22664-3"
-         offset="0"
-         style="stop-color:#d71700;stop-opacity:1;" />
-      <stop
-         id="stop22666-6"
-         offset="1"
-         style="stop-color:#440e00;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22672-89"
-       id="linearGradient41201"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient22672-89">
-      <stop
-         style="stop-color:#00d71b;stop-opacity:1;"
-         offset="0"
-         id="stop22674-7" />
-      <stop
-         style="stop-color:#0a4400;stop-opacity:1;"
-         offset="1"
-         id="stop22676-0-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22672-89-1"
-       id="linearGradient41203"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient22672-89-1">
-      <stop
-         style="stop-color:#9fa1a0;stop-opacity:1;"
-         offset="0"
-         id="stop22674-7-9" />
-      <stop
-         style="stop-color:#282f27;stop-opacity:1;"
-         offset="1"
-         id="stop22676-0-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22672-89-1"
-       id="linearGradient41205"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient131345">
-      <stop
-         style="stop-color:#9fa1a0;stop-opacity:1;"
-         offset="0"
-         id="stop131347" />
-      <stop
-         style="stop-color:#282f27;stop-opacity:1;"
-         offset="1"
-         id="stop131349" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22672-89-1"
-       id="linearGradient41207"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient131352">
-      <stop
-         style="stop-color:#9fa1a0;stop-opacity:1;"
-         offset="0"
-         id="stop131354" />
-      <stop
-         style="stop-color:#282f27;stop-opacity:1;"
-         offset="1"
-         id="stop131356" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient43079"
-       id="linearGradient41209"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient43079">
-      <stop
-         id="stop43081"
-         offset="0"
-         style="stop-color:#5e605f;stop-opacity:1;" />
-      <stop
-         id="stop43083"
-         offset="1"
-         style="stop-color:#282f27;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient43079"
-       id="linearGradient41211"
-       gradientUnits="userSpaceOnUse"
-       x1="309.00565"
-       y1="5206.4253"
-       x2="311.65732"
-       y2="5207.3091" />
-    <linearGradient
-       id="linearGradient131363">
-      <stop
-         id="stop131365"
-         offset="0"
-         style="stop-color:#5e605f;stop-opacity:1;" />
-      <stop
-         id="stop131367"
-         offset="1"
-         style="stop-color:#282f27;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131370">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131372" />
-      <stop
-         id="stop131374"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131377">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131379" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131381" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131384">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131386" />
-      <stop
-         id="stop131388"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131391">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131393" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131395" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131398">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131400" />
-      <stop
-         id="stop131402"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131405">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131407" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131409" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131412">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131414" />
-      <stop
-         id="stop131416"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131419">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131421" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131423" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131426">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131428" />
-      <stop
-         id="stop131430"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131433">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131435" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131437" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131440">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131442" />
-      <stop
-         id="stop131444"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131447">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131449" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131451" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131454">
-      <stop
-         style="stop-color:#4e5466;stop-opacity:1;"
-         offset="0"
-         id="stop131456" />
-      <stop
-         id="stop131458"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient131461">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="0"
-         id="stop131463" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop131465" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4166"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,31.015486,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4168"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,21.997669,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4170"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,25.10782,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4172"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,15.94828,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4174"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,20.864491,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,11.606794,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4178"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,18.259813,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4180"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,8.947001,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4182"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,13.927671,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4184"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,4.514672,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4186"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,9.691802,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="403.5625"
-       y2="6077.2354" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4188"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,0.17891176,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="394.32101"
-       y2="6088.0112" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4202"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,36.745224,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4204"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,27.727407,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4206"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,30.837558,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4208"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,21.678018,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4210"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,26.594229,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4212"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,17.336532,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,23.989551,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,14.676739,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,19.657409,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,10.24441,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,15.42154,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4224"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,5.9086502,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,42.674566,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4240"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,33.656749,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4242"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,36.7669,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4244"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,27.60736,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,32.523571,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4248"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,23.265874,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4250"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,29.918893,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4252"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,20.606081,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4254"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,25.586751,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4256"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,16.173752,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4258"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,21.350882,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4260"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,11.837992,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4274"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,48.544103,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,39.526286,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4278"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,42.636437,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4280"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,33.476897,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4282"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,38.393108,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4284"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,29.135411,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,35.78843,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4288"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,26.475618,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4290"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,31.456288,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4292"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,22.043289,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4294"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,27.220419,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4296"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,17.707529,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4310"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,54.473443,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4312"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,45.455626,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4314"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,48.565777,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4316"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,39.406237,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4318"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,44.322448,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4320"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,35.064751,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4322"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,41.71777,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4324"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,32.404958,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,37.385628,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,27.972629,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4330"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,33.149759,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4332"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,23.636869,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4346"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,60.42138,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4348"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,51.403563,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4350"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,54.513714,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,45.354174,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,50.270385,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,41.012688,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,47.665707,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4360"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,38.352895,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4362"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,43.333565,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4364"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,33.920566,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,39.097696,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,29.584806,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4382"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,66.350728,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4384"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,57.332911,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4386"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,60.443062,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4388"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,51.283522,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,56.199733,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4392"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,46.942036,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4394"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,53.595055,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4396"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,44.282243,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4398"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,49.262913,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4400"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,39.849914,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4402"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,45.027044,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4404"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,35.514154,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4418"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,72.280069,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4420"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,63.262252,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4422"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,66.372403,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4424"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,57.212863,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,62.129074,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4428"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,52.871377,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,59.524396,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4432"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,50.211584,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4434"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,55.192254,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,45.779255,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,50.956385,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4440"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,41.443495,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,78.209409,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,69.191592,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,72.301743,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,63.142203,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,68.058414,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4464"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,58.800717,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,65.453736,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4468"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,56.140924,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4470"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,61.121594,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,51.708595,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4474"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,56.885725,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4476"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,47.372835,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,84.138757,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,75.12094,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,78.231091,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4496"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,69.071551,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4498"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,73.987762,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,64.730065,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4502"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,71.383084,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,62.070272,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4506"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,67.050942,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,57.637943,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,62.815073,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,53.302183,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4526"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,90.068092,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4528"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,81.050275,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4530"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,84.160426,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4532"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,75.000886,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4534"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,79.917097,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4536"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,70.6594,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4538"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,77.312419,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4540"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,67.999607,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,72.980277,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,63.567278,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4546"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,68.744408,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4548"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,59.231518,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4562"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,95.997434,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,86.979617,0)"
-       x1="375.57281"
-       y1="6074.0103"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,90.089768,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4568"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,80.930228,0)"
-       x1="375.57281"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4570"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,85.846439,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4572"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,76.588742,0)"
-       x1="375.57281"
-       y1="6079.5103"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4574"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,83.241761,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4576"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,73.928949,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,78.909619,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,69.49662,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,74.67375,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4584"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,65.16086,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,101.92677,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,92.908949,0)"
-       x1="372.34708"
-       y1="6074.02"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,96.0191,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,86.85956,0)"
-       x1="373.33871"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,91.775771,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,82.518074,0)"
-       x1="373.99677"
-       y1="6079.52"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4610"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,89.171093,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,79.858281,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,84.838951,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,75.425952,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4618"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,80.603082,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4620"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,71.090192,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4634"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,106.41197,0)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4636"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96511756,0,0,1,97.39415,0)"
-       x1="372.34708"
-       y1="6074.02"
-       x2="379.88531"
-       y2="6074.0103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4638"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,100.5043,2.75)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4640"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98028523,0,0,1,91.344761,0)"
-       x1="373.33871"
-       y1="6076.7603"
-       x2="379.88531"
-       y2="6076.7603" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4642"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,96.260972,5.5)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4644"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9907903,0,0,1,87.003275,0)"
-       x1="373.99677"
-       y1="6079.52"
-       x2="379.88531"
-       y2="6079.5103" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4646"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,93.656294,8.28125)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4648"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99668887,0,0,1,84.343482,0)"
-       x1="375.57281"
-       y1="6082.2915"
-       x2="379.88531"
-       y2="6082.2915" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4650"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,89.324152,11.09375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4652"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0074113,0,0,1,79.911153,0)"
-       x1="375.57281"
-       y1="6085.104"
-       x2="379.88531"
-       y2="6085.104" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24303-6"
-       id="linearGradient4654"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,85.088283,13.84375)"
-       x1="365.85406"
-       y1="6072.4478"
-       x2="370.60406"
-       y2="6076.1353" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42643"
-       id="linearGradient4656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0178954,0,0,1,75.575393,0)"
-       x1="375.57471"
-       y1="6087.854"
-       x2="379.88721"
-       y2="6087.854" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient18875-2" id="linearGradient40785" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.91471658,0,517.25548)" x1="397.76871" y1="5966.5059" x2="422.38306" y2="6077.4565"/>
+    <linearGradient id="linearGradient18875-2">
+      <stop id="stop18877-5" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop18879-1" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42597" id="linearGradient40787" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.91471658,0,517.25548)" x1="422.38049" y1="6051.9395" x2="382.42896" y2="6013.0483"/>
+    <linearGradient inkscape:collect="always" id="linearGradient42597">
+      <stop style="stop-color:#080808;stop-opacity:1;" offset="0" id="stop42599"/>
+      <stop style="stop-color:#080808;stop-opacity:0;" offset="1" id="stop42601"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient55929" id="linearGradient40789" gradientUnits="userSpaceOnUse" x1="345.28143" y1="6077.2759" x2="345.96701" y2="6060.7412"/>
+    <linearGradient id="linearGradient55929">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop55931"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop55933"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24394-2" id="linearGradient40791" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.29157,14.877462)" x1="344.53705" y1="6072.9365" x2="346.82233" y2="6084.7876"/>
+    <linearGradient id="linearGradient24394-2">
+      <stop id="stop24396-3" offset="0" style="stop-color:#5f5f5f;stop-opacity:1;"/>
+      <stop style="stop-color:#353535;stop-opacity:1;" offset="0.60042131" id="stop24398-7"/>
+      <stop id="stop24400-3" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40793" gradientUnits="userSpaceOnUse" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353" gradientTransform="matrix(0.96511756,0,0,1,14.214464,0)"/>
+    <linearGradient id="linearGradient24303-6">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop24307-3"/>
+      <stop id="stop24309-0" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40795" gradientUnits="userSpaceOnUse" x1="366.22906" y1="6074.0103" x2="370.54156" y2="6074.0103" gradientTransform="matrix(0.96511756,0,0,1,14.214464,0)"/>
+    <linearGradient id="linearGradient42643">
+      <stop style="stop-color:#2f2f2f;stop-opacity:1;" offset="0" id="stop42645"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop42647"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40797" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,18.723373,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient129929">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop129931"/>
+      <stop id="stop129933" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40799" gradientUnits="userSpaceOnUse" x1="370.90094" y1="6074.0103" x2="375.21344" y2="6074.0103" gradientTransform="matrix(0.96511756,0,0,1,14.214464,0)"/>
+    <linearGradient id="linearGradient129936">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop129938"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop129940"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40801" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,25.2874,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient129943">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop129945"/>
+      <stop id="stop129947" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40803" gradientUnits="userSpaceOnUse" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103" gradientTransform="matrix(0.96511756,0,0,1,16.269583,0)"/>
+    <linearGradient id="linearGradient129950">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop129952"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop129954"/>
+    </linearGradient>
+    <linearGradient id="linearGradient129957">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop129959"/>
+      <stop id="stop129961" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient129964">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop129966"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop129968"/>
+    </linearGradient>
+    <linearGradient id="linearGradient129971">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop129973"/>
+      <stop id="stop129975" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient129978">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop129980"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop129982"/>
+    </linearGradient>
+    <linearGradient id="linearGradient129985">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop129987"/>
+      <stop id="stop129989" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient129992">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop129994"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop129996"/>
+    </linearGradient>
+    <linearGradient id="linearGradient129999">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130001"/>
+      <stop id="stop130003" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130006">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130008"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130010"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130013">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130015"/>
+      <stop id="stop130017" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130020">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130022"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130024"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130027">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130029"/>
+      <stop id="stop130031" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130034">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130036"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130038"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130041">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130043"/>
+      <stop id="stop130045" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130048">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130050"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130052"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130055">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130057"/>
+      <stop id="stop130059" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130062">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130064"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130066"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130069">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130071"/>
+      <stop id="stop130073" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130076">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130078"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130080"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130083">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130085"/>
+      <stop id="stop130087" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130090">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130092"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130094"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130097">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130099"/>
+      <stop id="stop130101" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130104">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130106"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130108"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130111">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130113"/>
+      <stop id="stop130115" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130118">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130120"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130122"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130125">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130127"/>
+      <stop id="stop130129" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130132">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130134"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130136"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130139">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130141"/>
+      <stop id="stop130143" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130146">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130148"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130150"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130153">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130155"/>
+      <stop id="stop130157" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130160">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130162"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130164"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130167">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130169"/>
+      <stop id="stop130171" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130174">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130176"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130178"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40869" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,8.1650752,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130181">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130183"/>
+      <stop id="stop130185" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40871" gradientUnits="userSpaceOnUse" x1="366.22906" y1="6076.7603" x2="370.54156" y2="6076.7603" gradientTransform="matrix(0.98028523,0,0,1,8.1650752,0)"/>
+    <linearGradient id="linearGradient130188">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130190"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130192"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40873" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,12.744846,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130195">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130197"/>
+      <stop id="stop130199" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40875" gradientUnits="userSpaceOnUse" x1="370.90094" y1="6076.7603" x2="375.21344" y2="6076.7603" gradientTransform="matrix(0.98028523,0,0,1,8.1650752,0)"/>
+    <linearGradient id="linearGradient130202">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130204"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130206"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,19.379734,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130209">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130211"/>
+      <stop id="stop130213" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40879" gradientUnits="userSpaceOnUse" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603" gradientTransform="matrix(0.98028523,0,0,1,10.220194,0)"/>
+    <linearGradient id="linearGradient130216">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130218"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130220"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130223">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130225"/>
+      <stop id="stop130227" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130230">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130232"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130234"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130237">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130239"/>
+      <stop id="stop130241" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130244">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130246"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130248"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130251">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130253"/>
+      <stop id="stop130255" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130258">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130260"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130262"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130265">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130267"/>
+      <stop id="stop130269" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130272">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130274"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130276"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130279">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130281"/>
+      <stop id="stop130283" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130286">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130288"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130290"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130293">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130295"/>
+      <stop id="stop130297" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130300">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130302"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130304"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130307">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130309"/>
+      <stop id="stop130311" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130314">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130316"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130318"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130321">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130323"/>
+      <stop id="stop130325" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130328">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130330"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130332"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130335">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130337"/>
+      <stop id="stop130339" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130342">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130344"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130346"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130349">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130351"/>
+      <stop id="stop130353" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130356">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130358"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130360"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130363">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130365"/>
+      <stop id="stop130367" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130370">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130372"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130374"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130377">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130379"/>
+      <stop id="stop130381" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130384">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130386"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130388"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40929" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,3.8235894,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130391">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130393"/>
+      <stop id="stop130395" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40931" gradientUnits="userSpaceOnUse" x1="366.22906" y1="6079.5103" x2="370.54156" y2="6079.5103" gradientTransform="matrix(0.9907903,0,0,1,3.8235894,0)"/>
+    <linearGradient id="linearGradient130398">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130400"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130402"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40933" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,8.4524379,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130405">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130407"/>
+      <stop id="stop130409" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40935" gradientUnits="userSpaceOnUse" x1="370.90094" y1="6079.5103" x2="375.21344" y2="6079.5103" gradientTransform="matrix(0.9907903,0,0,1,3.8235894,0)"/>
+    <linearGradient id="linearGradient130412">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130414"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130416"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient40937" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,15.136405,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130419">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130421"/>
+      <stop id="stop130423" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient40939" gradientUnits="userSpaceOnUse" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103" gradientTransform="matrix(0.9907903,0,0,1,5.8787079,0)"/>
+    <linearGradient id="linearGradient130426">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130428"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130430"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130433">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130435"/>
+      <stop id="stop130437" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130440">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130442"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130444"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130447">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130449"/>
+      <stop id="stop130451" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130454">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130456"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130458"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130461">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130463"/>
+      <stop id="stop130465" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130468">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130470"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130472"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130475">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130477"/>
+      <stop id="stop130479" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130482">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130484"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130486"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130489">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130491"/>
+      <stop id="stop130493" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130496">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130498"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130500"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130503">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130505"/>
+      <stop id="stop130507" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130510">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130512"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130514"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130517">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130519"/>
+      <stop id="stop130521" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130524">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130526"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130528"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130531">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130533"/>
+      <stop id="stop130535" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130538">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130540"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130542"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130545">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130547"/>
+      <stop id="stop130549" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130552">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130554"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130556"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130559">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130561"/>
+      <stop id="stop130563" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130566">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130568"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130570"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130573">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130575"/>
+      <stop id="stop130577" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130580">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130582"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130584"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130587">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130589"/>
+      <stop id="stop130591" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130594">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130596"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130598"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130601">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130603"/>
+      <stop id="stop130605" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130608">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130610"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130612"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130615">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130617"/>
+      <stop id="stop130619" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130622">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130624"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130626"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130629">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130631"/>
+      <stop id="stop130633" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130636">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130638"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130640"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130643">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130645"/>
+      <stop id="stop130647" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130650">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130652"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130654"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41005" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,1.1637965,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130657">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130659"/>
+      <stop id="stop130661" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41007" gradientUnits="userSpaceOnUse" x1="366.22906" y1="6082.2915" x2="370.54156" y2="6082.2915" gradientTransform="matrix(0.99668887,0,0,1,1.1637965,0)"/>
+    <linearGradient id="linearGradient130664">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130666"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130668"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41009" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,5.820203,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130671">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130673"/>
+      <stop id="stop130675" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41011" gradientUnits="userSpaceOnUse" x1="370.90094" y1="6082.2915" x2="375.21344" y2="6082.2915" gradientTransform="matrix(0.99668887,0,0,1,1.1637965,0)"/>
+    <linearGradient id="linearGradient130678">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130680"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130682"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41013" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,12.531727,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130685">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130687"/>
+      <stop id="stop130689" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41015" gradientUnits="userSpaceOnUse" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915" gradientTransform="matrix(0.99668887,0,0,1,3.218915,0)"/>
+    <linearGradient id="linearGradient130692">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130694"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130696"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130699">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130701"/>
+      <stop id="stop130703" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130706">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130708"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130710"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130713">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130715"/>
+      <stop id="stop130717" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130720">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130722"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130724"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130727">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130729"/>
+      <stop id="stop130731" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130734">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130736"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130738"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130741">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130743"/>
+      <stop id="stop130745" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130748">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130750"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130752"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130755">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130757"/>
+      <stop id="stop130759" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130762">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130764"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130766"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130769">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130771"/>
+      <stop id="stop130773" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130776">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130778"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130780"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130783">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130785"/>
+      <stop id="stop130787" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130790">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130792"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130794"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130797">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130799"/>
+      <stop id="stop130801" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130804">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130806"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130808"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130811">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130813"/>
+      <stop id="stop130815" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130818">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130820"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130822"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130825">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130827"/>
+      <stop id="stop130829" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130832">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130834"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130836"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130839">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130841"/>
+      <stop id="stop130843" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130846">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130848"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130850"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130853">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130855"/>
+      <stop id="stop130857" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130860">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130862"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130864"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130867">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130869"/>
+      <stop id="stop130871" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130874">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130876"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130878"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130881">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130883"/>
+      <stop id="stop130885" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130888">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130890"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130892"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130895">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130897"/>
+      <stop id="stop130899" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130902">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130904"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130906"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41077" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,-3.2685325,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130909">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130911"/>
+      <stop id="stop130913" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41079" gradientUnits="userSpaceOnUse" x1="366.22906" y1="6085.104" x2="370.54156" y2="6085.104" gradientTransform="matrix(1.0074113,0,0,1,-3.2685325,0)"/>
+    <linearGradient id="linearGradient130916">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130918"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130920"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41081" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,1.4379675,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130923">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130925"/>
+      <stop id="stop130927" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41083" gradientUnits="userSpaceOnUse" x1="370.90094" y1="6085.104" x2="375.21344" y2="6085.104" gradientTransform="matrix(1.0074113,0,0,1,-3.2685325,0)"/>
+    <linearGradient id="linearGradient130930">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130932"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130934"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41085" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,8.1995848,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient130937">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130939"/>
+      <stop id="stop130941" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41087" gradientUnits="userSpaceOnUse" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104" gradientTransform="matrix(1.0074113,0,0,1,-1.213414,0)"/>
+    <linearGradient id="linearGradient130944">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130946"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130948"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130951">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130953"/>
+      <stop id="stop130955" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130958">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130960"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130962"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130965">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130967"/>
+      <stop id="stop130969" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130972">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130974"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130976"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130979">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130981"/>
+      <stop id="stop130983" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130986">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop130988"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop130990"/>
+    </linearGradient>
+    <linearGradient id="linearGradient130993">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop130995"/>
+      <stop id="stop130997" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131000">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131002"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131004"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131007">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131009"/>
+      <stop id="stop131011" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131014">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131016"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131018"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131021">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131023"/>
+      <stop id="stop131025" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131028">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131030"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131032"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131035">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131037"/>
+      <stop id="stop131039" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131042">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131044"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131046"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131049">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131051"/>
+      <stop id="stop131053" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131056">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131058"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131060"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131063">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131065"/>
+      <stop id="stop131067" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131070">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131072"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131074"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131077">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131079"/>
+      <stop id="stop131081" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131084">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131086"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131088"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131091">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131093"/>
+      <stop id="stop131095" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131098">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131100"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131102"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131105">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131107"/>
+      <stop id="stop131109" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131112">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131114"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131116"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131119">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131121"/>
+      <stop id="stop131123" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131126">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131128"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131130"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41141" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,-7.6023636,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient131133">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131135"/>
+      <stop id="stop131137" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41143" gradientUnits="userSpaceOnUse" x1="366.23096" y1="6087.854" x2="370.54346" y2="6087.854" gradientTransform="matrix(1.0178954,0,0,1,-7.6042927,0)"/>
+    <linearGradient id="linearGradient131140">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131142"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131144"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41145" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,-2.846884,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient131147">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131149"/>
+      <stop id="stop131151" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41147" gradientUnits="userSpaceOnUse" x1="370.90283" y1="6087.854" x2="375.21533" y2="6087.854" gradientTransform="matrix(1.0178954,0,0,1,-7.6042927,0)"/>
+    <linearGradient id="linearGradient131154">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131156"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131158"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient41149" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,3.963716,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient id="linearGradient131161">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131163"/>
+      <stop id="stop131165" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient41151" gradientUnits="userSpaceOnUse" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854" gradientTransform="matrix(1.0178954,0,0,1,-5.5491742,0)"/>
+    <linearGradient id="linearGradient131168">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131170"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131172"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131175">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131177"/>
+      <stop id="stop131179" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131182">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131184"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131186"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131189">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131191"/>
+      <stop id="stop131193" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131196">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131198"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131200"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131203">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131205"/>
+      <stop id="stop131207" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131210">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131212"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131214"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131217">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131219"/>
+      <stop id="stop131221" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131224">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131226"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131228"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131231">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131233"/>
+      <stop id="stop131235" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131238">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131240"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131242"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131245">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131247"/>
+      <stop id="stop131249" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131252">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131254"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131256"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131259">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131261"/>
+      <stop id="stop131263" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131266">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131268"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131270"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131273">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131275"/>
+      <stop id="stop131277" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131280">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131282"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131284"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131287">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131289"/>
+      <stop id="stop131291" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131294">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131296"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131298"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131301">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131303"/>
+      <stop id="stop131305" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131308">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131310"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131312"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131315">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131317"/>
+      <stop id="stop131319" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131322">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131324"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131326"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22646-0" id="linearGradient41197" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient22646-0">
+      <stop style="stop-color:#d7d700;stop-opacity:1;" offset="0" id="stop22648-8"/>
+      <stop style="stop-color:#7e7e00;stop-opacity:1;" offset="1" id="stop22650-3"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22662-1" id="linearGradient41199" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient22662-1">
+      <stop id="stop22664-3" offset="0" style="stop-color:#d71700;stop-opacity:1;"/>
+      <stop id="stop22666-6" offset="1" style="stop-color:#440e00;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22672-89" id="linearGradient41201" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient22672-89">
+      <stop style="stop-color:#00d71b;stop-opacity:1;" offset="0" id="stop22674-7"/>
+      <stop style="stop-color:#0a4400;stop-opacity:1;" offset="1" id="stop22676-0-4"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22672-89-1" id="linearGradient41203" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient22672-89-1">
+      <stop style="stop-color:#9fa1a0;stop-opacity:1;" offset="0" id="stop22674-7-9"/>
+      <stop style="stop-color:#282f27;stop-opacity:1;" offset="1" id="stop22676-0-0"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22672-89-1" id="linearGradient41205" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient131345">
+      <stop style="stop-color:#9fa1a0;stop-opacity:1;" offset="0" id="stop131347"/>
+      <stop style="stop-color:#282f27;stop-opacity:1;" offset="1" id="stop131349"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient22672-89-1" id="linearGradient41207" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient131352">
+      <stop style="stop-color:#9fa1a0;stop-opacity:1;" offset="0" id="stop131354"/>
+      <stop style="stop-color:#282f27;stop-opacity:1;" offset="1" id="stop131356"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient43079" id="linearGradient41209" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient43079">
+      <stop id="stop43081" offset="0" style="stop-color:#5e605f;stop-opacity:1;"/>
+      <stop id="stop43083" offset="1" style="stop-color:#282f27;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient43079" id="linearGradient41211" gradientUnits="userSpaceOnUse" x1="309.00565" y1="5206.4253" x2="311.65732" y2="5207.3091"/>
+    <linearGradient id="linearGradient131363">
+      <stop id="stop131365" offset="0" style="stop-color:#5e605f;stop-opacity:1;"/>
+      <stop id="stop131367" offset="1" style="stop-color:#282f27;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131370">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131372"/>
+      <stop id="stop131374" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131377">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131379"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131381"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131384">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131386"/>
+      <stop id="stop131388" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131391">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131393"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131395"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131398">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131400"/>
+      <stop id="stop131402" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131405">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131407"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131409"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131412">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131414"/>
+      <stop id="stop131416" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131419">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131421"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131423"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131426">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131428"/>
+      <stop id="stop131430" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131433">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131435"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131437"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131440">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131442"/>
+      <stop id="stop131444" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131447">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131449"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131451"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131454">
+      <stop style="stop-color:#4e5466;stop-opacity:1;" offset="0" id="stop131456"/>
+      <stop id="stop131458" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient131461">
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="0" id="stop131463"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop131465"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4166" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,31.015486,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4168" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,21.997669,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4170" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,25.10782,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4172" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,15.94828,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4174" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,20.864491,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4176" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,11.606794,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4178" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,18.259813,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4180" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,8.947001,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4182" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,13.927671,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4184" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,4.514672,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4186" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,9.691802,13.84375)" x1="365.85406" y1="6072.4478" x2="403.5625" y2="6077.2354"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4188" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,0.17891176,0)" x1="375.57471" y1="6087.854" x2="394.32101" y2="6088.0112"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4202" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,36.745224,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4204" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,27.727407,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4206" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,30.837558,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4208" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,21.678018,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4210" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,26.594229,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4212" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,17.336532,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4214" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,23.989551,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4216" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,14.676739,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4218" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,19.657409,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4220" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,10.24441,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4222" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,15.42154,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4224" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,5.9086502,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4238" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,42.674566,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4240" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,33.656749,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4242" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,36.7669,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4244" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,27.60736,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4246" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,32.523571,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4248" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,23.265874,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4250" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,29.918893,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4252" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,20.606081,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4254" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,25.586751,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4256" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,16.173752,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4258" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,21.350882,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4260" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,11.837992,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4274" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,48.544103,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4276" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,39.526286,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4278" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,42.636437,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4280" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,33.476897,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4282" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,38.393108,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4284" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,29.135411,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4286" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,35.78843,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4288" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,26.475618,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4290" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,31.456288,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4292" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,22.043289,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4294" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,27.220419,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4296" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,17.707529,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4310" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,54.473443,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4312" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,45.455626,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4314" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,48.565777,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4316" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,39.406237,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4318" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,44.322448,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4320" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,35.064751,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4322" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,41.71777,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4324" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,32.404958,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4326" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,37.385628,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4328" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,27.972629,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4330" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,33.149759,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4332" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,23.636869,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4346" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,60.42138,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4348" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,51.403563,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4350" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,54.513714,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4352" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,45.354174,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4354" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,50.270385,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4356" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,41.012688,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4358" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,47.665707,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4360" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,38.352895,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4362" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,43.333565,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4364" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,33.920566,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4366" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,39.097696,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4368" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,29.584806,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4382" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,66.350728,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4384" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,57.332911,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4386" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,60.443062,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4388" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,51.283522,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4390" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,56.199733,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4392" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,46.942036,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4394" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,53.595055,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4396" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,44.282243,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4398" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,49.262913,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4400" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,39.849914,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4402" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,45.027044,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4404" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,35.514154,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4418" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,72.280069,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4420" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,63.262252,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4422" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,66.372403,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4424" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,57.212863,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4426" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,62.129074,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4428" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,52.871377,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4430" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,59.524396,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4432" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,50.211584,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4434" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,55.192254,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4436" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,45.779255,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4438" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,50.956385,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4440" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,41.443495,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4454" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,78.209409,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4456" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,69.191592,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4458" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,72.301743,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4460" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,63.142203,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4462" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,68.058414,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4464" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,58.800717,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4466" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,65.453736,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4468" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,56.140924,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4470" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,61.121594,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4472" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,51.708595,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4474" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,56.885725,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4476" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,47.372835,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4490" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,84.138757,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4492" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,75.12094,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4494" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,78.231091,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4496" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,69.071551,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4498" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,73.987762,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4500" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,64.730065,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4502" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,71.383084,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4504" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,62.070272,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4506" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,67.050942,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4508" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,57.637943,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4510" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,62.815073,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4512" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,53.302183,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4526" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,90.068092,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4528" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,81.050275,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4530" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,84.160426,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4532" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,75.000886,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4534" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,79.917097,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4536" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,70.6594,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4538" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,77.312419,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4540" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,67.999607,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4542" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,72.980277,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4544" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,63.567278,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4546" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,68.744408,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4548" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,59.231518,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4562" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,95.997434,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4564" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,86.979617,0)" x1="375.57281" y1="6074.0103" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4566" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,90.089768,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4568" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,80.930228,0)" x1="375.57281" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4570" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,85.846439,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4572" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,76.588742,0)" x1="375.57281" y1="6079.5103" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4574" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,83.241761,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4576" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,73.928949,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4578" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,78.909619,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4580" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,69.49662,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4582" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,74.67375,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4584" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,65.16086,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4598" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,101.92677,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4600" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,92.908949,0)" x1="372.34708" y1="6074.02" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4602" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,96.0191,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4604" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,86.85956,0)" x1="373.33871" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4606" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,91.775771,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4608" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,82.518074,0)" x1="373.99677" y1="6079.52" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4610" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,89.171093,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4612" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,79.858281,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4614" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,84.838951,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4616" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,75.425952,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4618" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,80.603082,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4620" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,71.090192,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4634" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,106.41197,0)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4636" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96511756,0,0,1,97.39415,0)" x1="372.34708" y1="6074.02" x2="379.88531" y2="6074.0103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4638" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,100.5043,2.75)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4640" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98028523,0,0,1,91.344761,0)" x1="373.33871" y1="6076.7603" x2="379.88531" y2="6076.7603"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4642" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,96.260972,5.5)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4644" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9907903,0,0,1,87.003275,0)" x1="373.99677" y1="6079.52" x2="379.88531" y2="6079.5103"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4646" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,93.656294,8.28125)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4648" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.99668887,0,0,1,84.343482,0)" x1="375.57281" y1="6082.2915" x2="379.88531" y2="6082.2915"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4650" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,89.324152,11.09375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4652" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0074113,0,0,1,79.911153,0)" x1="375.57281" y1="6085.104" x2="379.88531" y2="6085.104"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient24303-6" id="linearGradient4654" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,85.088283,13.84375)" x1="365.85406" y1="6072.4478" x2="370.60406" y2="6076.1353"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42643" id="linearGradient4656" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0178954,0,0,1,75.575393,0)" x1="375.57471" y1="6087.854" x2="379.88721" y2="6087.854"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="-127.77215"
-     inkscape:cy="151.75162"
-     inkscape:document-units="px"
-     inkscape:current-layer="g40519"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata131602">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4142136" inkscape:cx="-127.77215" inkscape:cy="151.75162" inkscape:document-units="px" inkscape:current-layer="g40519" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="968" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true"/>
+  <metadata id="metadata131602">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-313.14286,-579.39572)">
-    <g
-       style="display:inline"
-       id="g40517"
-       transform="matrix(1.4418042,0,0,1.4418042,-799.24088,-7815.5819)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Notebook.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g40519"
-         transform="matrix(0.78027321,0,0,0.78027321,494.17953,1136.7206)">
-        <g
-           id="g5428">
-          <path
-             id="path40521"
-             style="fill:url(#linearGradient40777);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 365.28162,6005.7904 94.0452,0 0,59.5097 -1.97446,3.3073 -90.91183,0.4767 -1.15891,-3.784 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc" />
-          <path
-             sodipodi:nodetypes="ccccccc"
-             inkscape:connector-curvature="0"
-             d="m 357.32667,6097.7248 109.9551,0.3535 -7.95495,-28.5515 -1.71425,-1.3826 -91.45546,0 -0.87549,1.3826 z"
-             style="fill:url(#linearGradient40779);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path40523" />
-          <path
-             transform="translate(65.29157,14.177646)"
-             id="path40525"
-             style="fill:url(#linearGradient40781);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 292.03125,6083.5473 109.96317,0.353 -0.0104,3.792 -109.97623,0.023 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 366.94782,6104.4749 90.71317,-0.2234 9.6146,-2.4007 -109.97623,-0.014 z"
-             style="fill:url(#linearGradient40783);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path40527" />
-          <path
-             id="path40529"
-             style="opacity:0.58295964;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter42621)"
-             d="m 367.03621,6104.8285 90.62478,-0.1065 9.6146,2.6553 -109.88784,0.3696 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <rect
-             y="6005.3706"
-             x="365.28494"
-             height="59.76482"
-             width="94.034927"
-             id="rect40531"
-             style="fill:url(#linearGradient40785);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-          <rect
-             style="fill:url(#linearGradient40787);fill-opacity:1;fill-rule:nonzero;stroke:#646873;stroke-width:0.95640814;stroke-opacity:1"
-             id="rect40533"
-             width="87.625"
-             height="50.30941"
-             x="368.49173"
-             y="6010.481" />
-          <path
-             transform="translate(65.29157,14.177646)"
-             id="path40535"
-             style="fill:url(#linearGradient40789);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 300.24736,6057.0158 23.50066,-0.123 0.84573,1.2991 43.93221,-0.1009 0.91108,-1.4375 24.25245,-0.1269 5.31051,19.1809 -103.5,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
-          <path
-             id="path40537"
-             style="fill:url(#linearGradient40791);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 402.16657,6090.9602 20.125,0 1,5.375 -22.125,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path40539"
-             style="fill:#27343c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 366.29157,6072.7601 92.875,0 3.27037,17.0366 -99.64537,0.088 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40541"
-             style="fill:url(#linearGradient40793);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40795);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 367.65071,6072.9565 5.01143,0 -0.39266,2.3036 -5.09937,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 373.16518,6072.9565 5.07582,0 -0.33721,2.3036 -5.12627,0 z"
-             style="fill:url(#linearGradient40797);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40799);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40543" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40545"
-             style="fill:url(#linearGradient40801);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40803);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 378.70038,6072.9565 5.08393,0 -0.28214,2.3036 -5.13443,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 367.12205,6075.7065 5.07134,0 -0.39266,2.3036 -5.15928,0 z"
-             style="fill:url(#linearGradient40869);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40871);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40579" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40581"
-             style="fill:url(#linearGradient40873);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40875);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 372.7024,6075.7065 5.13604,0 -0.33721,2.3036 -5.18649,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 378.30328,6075.7065 5.14422,0 -0.28214,2.3036 -5.19473,0 z"
-             style="fill:url(#linearGradient40877);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40879);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40583" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40609"
-             style="fill:url(#linearGradient40929);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40931);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 366.59339,6078.378 5.14463,0 -0.40604,2.3821 -5.21919,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 372.25283,6078.378 5.19454,0 -0.3487,2.3821 -5.24671,0 z"
-             style="fill:url(#linearGradient40933);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40935);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40611" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40613"
-             style="fill:url(#linearGradient40937);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40939);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 377.91751,6078.378 5.20279,0 -0.29175,2.3821 -5.25502,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 366.05873,6081.1199 5.21192,0 -0.41274,2.4214 -5.27978,0 z"
-             style="fill:url(#linearGradient41005);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41007);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40647" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40649"
-             style="fill:url(#linearGradient41009);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41011);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 371.79141,6081.1199 5.25459,0 -0.35445,2.4214 -5.30762,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 377.52157,6081.1199 5.26291,0 -0.29657,2.4214 -5.31599,0 z"
-             style="fill:url(#linearGradient41013);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41015);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40651" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40683"
-             style="fill:url(#linearGradient41077);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41079);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 365.51806,6083.8538 5.28659,0 -0.42614,2.5 c 2.11314,0 -3.60643,0 -5.34105,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 371.33134,6083.8538 5.31447,0 -0.36596,2.5 -5.36922,0 z"
-             style="fill:url(#linearGradient41081);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41083);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40685" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40687"
-             style="fill:url(#linearGradient41085);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41087);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 377.12679,6083.8538 5.32285,0 -0.30619,2.5 -5.37766,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 364.9894,6086.6038 5.3465,0 -0.42025,2.5 -5.40685,0 z"
-             style="fill:url(#linearGradient41141);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41143);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40715" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path40717"
-             style="fill:url(#linearGradient41145);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41147);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 370.86856,6086.6038 5.37469,0 -0.36596,2.5 -5.43531,0.051 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 376.72969,6086.6038 5.38314,0 -0.3062,2.5 -5.43795,0 z"
-             style="fill:url(#linearGradient41149);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41151);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path40719" />
-          <rect
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect40743"
-             width="2.625"
-             height="0.875"
-             x="449.04156"
-             y="6104.21" />
-          <rect
-             y="6104.4102"
-             x="374.01657"
-             height="0.875"
-             width="2.625"
-             id="rect40745"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-          <path
-             sodipodi:type="arc"
-             style="fill:url(#linearGradient41197);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path40747"
-             sodipodi:cx="310.50827"
-             sodipodi:cy="5206.0718"
-             sodipodi:rx="2.2097087"
-             sodipodi:ry="3.9774756"
-             d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-             transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2353.6734,5980.0333)" />
-          <path
-             transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2358.8382,5980.1445)"
-             d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-             sodipodi:ry="3.9774756"
-             sodipodi:rx="2.2097087"
-             sodipodi:cy="5206.0718"
-             sodipodi:cx="310.50827"
-             id="path40749"
-             style="fill:url(#linearGradient41199);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:url(#linearGradient41201);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path40751"
-             sodipodi:cx="310.50827"
-             sodipodi:cy="5206.0718"
-             sodipodi:rx="2.2097087"
-             sodipodi:ry="3.9774756"
-             d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-             transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2348.8318,5980.0501)" />
-          <path
-             sodipodi:type="arc"
-             style="fill:url(#linearGradient41203);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path40753"
-             sodipodi:cx="310.50827"
-             sodipodi:cy="5206.0718"
-             sodipodi:rx="2.2097087"
-             sodipodi:ry="3.9774756"
-             d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-             transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2272.8592,5980.0809)" />
-          <path
-             transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2278.024,5980.1921)"
-             d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-             sodipodi:ry="3.9774756"
-             sodipodi:rx="2.2097087"
-             sodipodi:cy="5206.0718"
-             sodipodi:cx="310.50827"
-             id="path40755"
-             style="fill:url(#linearGradient41205);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:url(#linearGradient41207);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path40757"
-             sodipodi:cx="310.50827"
-             sodipodi:cy="5206.0718"
-             sodipodi:rx="2.2097087"
-             sodipodi:ry="3.9774756"
-             d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-             transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2268.0176,5980.0977)" />
-          <path
-             sodipodi:type="arc"
-             style="fill:url(#linearGradient41209);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path40759"
-             sodipodi:cx="310.50827"
-             sodipodi:cy="5206.0718"
-             sodipodi:rx="2.2097087"
-             sodipodi:ry="3.9774756"
-             d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-             transform="matrix(0.00105099,0.36517426,-0.30232038,0.00126949,1941.2408,5887.5431)" />
-          <path
-             transform="matrix(0.00105099,0.36517426,-0.30232038,0.00126949,2030.5403,5887.5431)"
-             d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z"
-             sodipodi:ry="3.9774756"
-             sodipodi:rx="2.2097087"
-             sodipodi:cy="5206.0718"
-             sodipodi:cx="310.50827"
-             id="path40761"
-             style="fill:url(#linearGradient41211);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 384.24203,6072.9565 5.08541,0 -0.22704,2.3036 -5.13598,0 z"
-             style="fill:url(#linearGradient4166);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4168);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4154"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4156"
-             style="fill:url(#linearGradient4170);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4172);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 383.91063,6075.7065 5.14578,0 -0.22705,2.3036 -5.19634,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 383.58868,6078.378 5.20442,0 -0.23478,2.3821 -5.2567,0 z"
-             style="fill:url(#linearGradient4174);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4176);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4158"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4160"
-             style="fill:url(#linearGradient4178);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4180);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 383.25826,6081.1199 5.2646,0 -0.23865,2.4214 -5.31776,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 382.92879,6083.8538 5.32462,0 -0.2464,2.5 -5.37949,0 z"
-             style="fill:url(#linearGradient4182);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4184);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4162"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4164"
-             style="fill:url(#linearGradient4186);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4188);stroke-width:0.10089082000000001;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 382.59739,6086.6038 28.85697,0 0.009,2.5 -29.16718,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4190"
-             style="fill:url(#linearGradient4202);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4204);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 389.78509,6072.9565 5.08551,0 -0.17195,2.3036 -5.13606,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 389.51948,6075.7065 5.14585,0 -0.17194,2.3036 -5.19641,0 z"
-             style="fill:url(#linearGradient4206);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4208);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4192" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4194"
-             style="fill:url(#linearGradient4210);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4212);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 389.26144,6078.378 5.20448,0 -0.1778,2.3821 -5.25676,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 388.99661,6081.1199 5.26465,0 -0.18074,2.4214 -5.31779,0 z"
-             style="fill:url(#linearGradient4214);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4216);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4196" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4198"
-             style="fill:url(#linearGradient4218);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4220);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 388.73254,6083.8538 5.32465,0 -0.1866,2.5 -5.37952,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 395.3282,6072.9565 5.08549,0 -0.11685,2.3036 -5.13604,0 z"
-             style="fill:url(#linearGradient4238);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4240);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4226"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4228"
-             style="fill:url(#linearGradient4242);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4244);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 395.12836,6075.7065 5.14584,0 -0.11684,2.3036 -5.1964,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 394.93423,6078.378 5.20447,0 -0.12083,2.3821 -5.25675,0 z"
-             style="fill:url(#linearGradient4246);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4248);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4230"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4232"
-             style="fill:url(#linearGradient4250);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4252);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 394.73498,6081.1199 5.26464,0 -0.12282,2.4214 -5.31778,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 394.53631,6083.8538 5.32464,0 -0.12681,2.5 -5.3795,0 z"
-             style="fill:url(#linearGradient4254);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4256);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4234"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4262"
-             style="fill:url(#linearGradient4274);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4276);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 400.87128,6072.9565 5.08549,0 -0.0617,2.3036 -5.13604,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 400.73723,6075.7065 5.14584,0 -0.0617,2.3036 c -1.73214,0 -9.64135,0 -5.1964,0 z"
-             style="fill:url(#linearGradient4278);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4280);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4264" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4266"
-             style="fill:url(#linearGradient4282);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4284);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 400.607,6078.378 5.20447,0 -0.0639,2.3821 -5.25674,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 400.47334,6081.1199 5.26464,0 -0.0649,2.4214 -5.31778,0 z"
-             style="fill:url(#linearGradient4286);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4288);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4268" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4270"
-             style="fill:url(#linearGradient4290);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4292);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 400.34007,6083.8538 5.32464,0 -0.067,2.5 -5.3795,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 406.41437,6072.9565 5.08565,0 -0.007,2.3036 -5.13618,0 z"
-             style="fill:url(#linearGradient4310);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4312);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4298"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4300"
-             style="fill:url(#linearGradient4314);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4316);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 406.34609,6075.7065 5.14598,0 -0.007,2.3036 c -1.73214,0 -9.64146,0 -5.19651,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 406.27977,6078.378 5.20458,0 -0.007,2.3821 -5.25683,0 z"
-             style="fill:url(#linearGradient4318);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4320);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4302"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4304"
-             style="fill:url(#linearGradient4322);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4324);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 406.2117,6081.1199 5.26472,0 -0.007,2.4214 -5.31784,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 406.14382,6083.8538 5.3247,0 -0.007,2.5 -5.37953,0 z"
-             style="fill:url(#linearGradient4326);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4328);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4306"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4334"
-             style="fill:url(#linearGradient4346);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4348);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 411.96087,6072.9565 5.08546,0 0.0485,2.3036 -5.13602,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 411.95839,6075.7065 5.14581,0 0.0485,2.3036 c -1.73214,0 -9.64132,0 -5.19637,0 z"
-             style="fill:url(#linearGradient4350);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4352);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4336" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4338"
-             style="fill:url(#linearGradient4354);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4356);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 411.95598,6078.378 5.20445,0 0.0501,2.3821 -5.25673,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 411.9535,6081.1199 5.26463,0 0.051,2.4214 -5.31777,0 z"
-             style="fill:url(#linearGradient4358);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4360);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4340" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4342"
-             style="fill:url(#linearGradient4362);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4364);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 411.95103,6083.8538 5.32464,0 0.0526,2.5 -5.3795,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 411.94855,6086.6038 5.385,2e-4 0.0526,2.4998 -5.43986,0 z"
-             style="fill:url(#linearGradient4366);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4368);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4344" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 417.50401,6072.9565 5.0853,0 0.1036,2.3036 -5.13588,0 z"
-             style="fill:url(#linearGradient4382);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4384);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4370"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4372"
-             style="fill:url(#linearGradient4386);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4388);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 417.5673,6075.7065 5.14569,0 0.1036,2.3036 c -1.73214,0 -9.64122,0 -5.19627,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 417.62879,6078.378 5.20434,0 0.10713,2.3821 -5.25665,0 z"
-             style="fill:url(#linearGradient4390);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4392);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4374"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4376"
-             style="fill:url(#linearGradient4394);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4396);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 417.69189,6081.1199 5.26455,0 0.1089,2.4214 -5.31772,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 417.75481,6083.8538 5.32458,0 0.11243,2.5 -5.37947,0 z"
-             style="fill:url(#linearGradient4398);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4400);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4378"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4380"
-             style="fill:url(#linearGradient4402);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4404);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 417.8181,6086.6038 5.38498,2e-4 0.11242,2.4998 -5.43986,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4406"
-             style="fill:url(#linearGradient4418);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4420);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 423.0469,6072.9565 5.08558,0 0.15869,2.3036 -5.13612,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 423.17601,6075.7065 5.14591,0 0.15869,2.3036 c -1.73214,0 -9.6414,0 -5.19645,0 z"
-             style="fill:url(#linearGradient4422);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4424);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4408" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4410"
-             style="fill:url(#linearGradient4426);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4428);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 423.30143,6078.378 5.20453,0 0.1641,2.3821 -5.2568,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 423.43016,6081.1199 5.26468,0 0.16681,2.4214 -5.31782,0 z"
-             style="fill:url(#linearGradient4430);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4432);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4412" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4414"
-             style="fill:url(#linearGradient4434);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4436);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 423.55851,6083.8538 5.32467,0 0.17222,2.5 -5.37953,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 423.68761,6086.6038 5.38502,2e-4 0.17221,2.4998 -5.43986,0 z"
-             style="fill:url(#linearGradient4438);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4440);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4416" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 428.59008,6072.9565 5.0852,0 0.21384,2.3036 -5.1358,0 z"
-             style="fill:url(#linearGradient4454);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4456);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4442"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4444"
-             style="fill:url(#linearGradient4458);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4460);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 428.78495,6075.7065 5.14561,0 0.21383,2.3036 c -1.73214,0 -9.64115,0 -5.1962,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 428.97426,6078.378 5.20428,0 0.22112,2.3821 -5.2566,0 z"
-             style="fill:url(#linearGradient4462);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4464);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4446"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4448"
-             style="fill:url(#linearGradient4466);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4468);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 429.16856,6081.1199 5.2645,0 0.22477,2.4214 -5.31768,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 429.36229,6083.8538 5.32455,0 0.23207,2.5 -5.37946,0 z"
-             style="fill:url(#linearGradient4470);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4472);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4450"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4452"
-             style="fill:url(#linearGradient4474);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4476);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 429.55717,6086.6038 5.38496,2e-4 0.23205,2.4998 -5.43986,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4478"
-             style="fill:url(#linearGradient4490);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4492);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 434.13407,6072.9565 5.0842,0 0.26895,2.3036 -5.13494,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 434.39457,6075.7065 5.14477,0 0.26895,2.3036 c -1.73214,0 -9.64045,0 -5.1955,0 z"
-             style="fill:url(#linearGradient4494);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4496);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4480" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4482"
-             style="fill:url(#linearGradient4498);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4500);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 434.64764,6078.378 5.20361,0 0.27812,2.3821 -5.25608,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 434.90737,6081.1199 5.264,0 0.28271,2.4214 -5.31734,0 z"
-             style="fill:url(#linearGradient4502);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4504);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4484" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4486"
-             style="fill:url(#linearGradient4506);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4508);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 435.16635,6083.8538 5.32422,0 0.29188,2.5 -5.37928,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 435.42685,6086.6038 5.38481,2e-4 0.29187,2.4999 -5.43986,-1e-4 z"
-             style="fill:url(#linearGradient4510);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4512);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4488" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 439.67657,6072.9565 5.08506,0 0.32402,2.3036 -5.13568,0 z"
-             style="fill:url(#linearGradient4526);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4528);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4514"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4516"
-             style="fill:url(#linearGradient4530);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4532);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 440.00295,6075.7065 5.14549,0 0.32402,2.3036 c -1.94106,-0.014 0.47153,0.021 -5.19611,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 440.32002,6078.378 5.20418,0 0.33507,2.3821 -5.25653,0 z"
-             style="fill:url(#linearGradient4534);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4536);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4518"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4520"
-             style="fill:url(#linearGradient4538);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4540);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 440.64544,6081.1199 5.26443,0 0.34059,2.4214 -5.31764,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 440.96991,6083.8538 5.32451,0 0.35164,2.5 -5.37944,0 z"
-             style="fill:url(#linearGradient4542);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4544);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4522"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4524"
-             style="fill:url(#linearGradient4546);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4548);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 441.2963,6086.6038 5.38495,2e-4 0.35162,2.4998 -5.43986,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4550"
-             style="fill:url(#linearGradient4562);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4564);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 445.22054,6072.9565 5.08578,0 0.37889,2.3036 -5.13629,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 445.61255,6075.7065 5.14609,0 0.37889,2.3036 c -1.94106,-0.014 0.47378,0.041 -5.1966,0 z"
-             style="fill:url(#linearGradient4566);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4568);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4552" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4554"
-             style="fill:url(#linearGradient4570);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4572);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 445.99338,6078.378 5.20466,0 0.39181,2.3821 -5.2569,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 446.38424,6081.1199 5.26479,0 0.39827,2.4214 -5.31789,0 z"
-             style="fill:url(#linearGradient4574);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4576);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4556" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4558"
-             style="fill:url(#linearGradient4578);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4580);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 446.77396,6083.8538 5.32474,0 0.4112,2.5 -5.37956,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 447.16598,6086.6038 5.38507,2e-4 0.41116,2.4998 -5.43985,0 z"
-             style="fill:url(#linearGradient4582);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4584);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4560" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 450.76289,6072.9565 3.73803,0 0.42085,2.3036 -3.77529,0 z"
-             style="fill:url(#linearGradient4598);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4600);stroke-width:0.09824041000000000;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4586"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4588"
-             style="fill:url(#linearGradient4602);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4604);stroke-width:0.09900935000000000;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 451.22081,6075.7065 3.78251,0 0.42084,2.3036 c -1.94106,-0.014 1.85062,0.041 -3.81976,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 451.66566,6078.378 3.82572,0 0.43518,2.3821 -3.86424,0 z"
-             style="fill:url(#linearGradient4606);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4608);stroke-width:0.09953846000000000;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4590"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4592"
-             style="fill:url(#linearGradient4610);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4612);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 452.12224,6081.1199 3.87005,0 0.44237,2.4214 -3.90922,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 452.57748,6083.8538 3.91427,0 0.45672,2.5 -3.9547,0 z"
-             style="fill:url(#linearGradient4614);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4616);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4594"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path4596"
-             style="fill:url(#linearGradient4618);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4620);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 453.0354,6086.6038 3.95878,2e-4 0.45669,2.4998 -3.99918,0 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4622"
-             style="fill:url(#linearGradient4634);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4636);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 454.95619,6072.9565 2.8155,0 0.45326,2.3036 -2.84353,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 455.46383,6075.7065 2.84895,0 0.45326,2.3036 c -1.94106,-0.014 -0.27073,0.021 -2.87698,0 z"
-             style="fill:url(#linearGradient4638);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4640);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4624" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4626"
-             style="fill:url(#linearGradient4642);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4644);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 455.95697,6078.378 2.88146,0 0.4687,2.3821 -2.91044,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 456.46311,6081.1199 2.91482,0 0.47643,2.4214 -2.94427,0 z"
-             style="fill:url(#linearGradient4646);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4648);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4628" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             id="path4630"
-             style="fill:url(#linearGradient4650);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4652);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 456.96777,6083.8538 2.94808,0 0.4919,2.5 -2.97849,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 457.47541,6086.6038 2.98157,2e-4 0.49186,2.4998 -3.01195,0 z"
-             style="fill:url(#linearGradient4654);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4656);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path4632" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-313.14286,-579.39572)">
+    <g style="display:inline" id="g40517" transform="matrix(1.4418042,0,0,1.4418042,-799.24088,-7815.5819)">
+      <g id="g40519" transform="matrix(0.78027321,0,0,0.78027321,494.17953,1136.7206)">
+        <g id="g5428">
+          <path id="path40521" style="fill:url(#linearGradient40777);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 365.28162,6005.7904 94.0452,0 0,59.5097 -1.97446,3.3073 -90.91183,0.4767 -1.15891,-3.784 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+          <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 357.32667,6097.7248 109.9551,0.3535 -7.95495,-28.5515 -1.71425,-1.3826 -91.45546,0 -0.87549,1.3826 z" style="fill:url(#linearGradient40779);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40523"/>
+          <path transform="translate(65.29157,14.177646)" id="path40525" style="fill:url(#linearGradient40781);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 292.03125,6083.5473 109.96317,0.353 -0.0104,3.792 -109.97623,0.023 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 366.94782,6104.4749 90.71317,-0.2234 9.6146,-2.4007 -109.97623,-0.014 z" style="fill:url(#linearGradient40783);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40527"/>
+          <path id="path40529" style="opacity:0.58295964;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter42621)" d="m 367.03621,6104.8285 90.62478,-0.1065 9.6146,2.6553 -109.88784,0.3696 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <rect y="6005.3706" x="365.28494" height="59.76482" width="94.034927" id="rect40531" style="fill:url(#linearGradient40785);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <rect style="fill:url(#linearGradient40787);fill-opacity:1;fill-rule:nonzero;stroke:#646873;stroke-width:0.95640814;stroke-opacity:1" id="rect40533" width="87.625" height="50.30941" x="368.49173" y="6010.481"/>
+          <path transform="translate(65.29157,14.177646)" id="path40535" style="fill:url(#linearGradient40789);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 300.24736,6057.0158 23.50066,-0.123 0.84573,1.2991 43.93221,-0.1009 0.91108,-1.4375 24.25245,-0.1269 5.31051,19.1809 -103.5,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+          <path id="path40537" style="fill:url(#linearGradient40791);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none" d="m 402.16657,6090.9602 20.125,0 1,5.375 -22.125,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path40539" style="fill:#27343c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 366.29157,6072.7601 92.875,0 3.27037,17.0366 -99.64537,0.088 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" id="path40541" style="fill:url(#linearGradient40793);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40795);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 367.65071,6072.9565 5.01143,0 -0.39266,2.3036 -5.09937,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 373.16518,6072.9565 5.07582,0 -0.33721,2.3036 -5.12627,0 z" style="fill:url(#linearGradient40797);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40799);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" id="path40543"/>
+          <path sodipodi:nodetypes="ccccc" id="path40545" style="fill:url(#linearGradient40801);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40803);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 378.70038,6072.9565 5.08393,0 -0.28214,2.3036 -5.13443,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 367.12205,6075.7065 5.07134,0 -0.39266,2.3036 -5.15928,0 z" style="fill:url(#linearGradient40869);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40871);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path40579"/>
+          <path sodipodi:nodetypes="ccccc" id="path40581" style="fill:url(#linearGradient40873);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40875);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" d="m 372.7024,6075.7065 5.13604,0 -0.33721,2.3036 -5.18649,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 378.30328,6075.7065 5.14422,0 -0.28214,2.3036 -5.19473,0 z" style="fill:url(#linearGradient40877);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40879);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path40583"/>
+          <path sodipodi:nodetypes="ccccc" id="path40609" style="fill:url(#linearGradient40929);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40931);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 366.59339,6078.378 5.14463,0 -0.40604,2.3821 -5.21919,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 372.25283,6078.378 5.19454,0 -0.3487,2.3821 -5.24671,0 z" style="fill:url(#linearGradient40933);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40935);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" id="path40611"/>
+          <path sodipodi:nodetypes="ccccc" id="path40613" style="fill:url(#linearGradient40937);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40939);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 377.91751,6078.378 5.20279,0 -0.29175,2.3821 -5.25502,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 366.05873,6081.1199 5.21192,0 -0.41274,2.4214 -5.27978,0 z" style="fill:url(#linearGradient41005);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41007);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path40647"/>
+          <path sodipodi:nodetypes="ccccc" id="path40649" style="fill:url(#linearGradient41009);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41011);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" d="m 371.79141,6081.1199 5.25459,0 -0.35445,2.4214 -5.30762,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 377.52157,6081.1199 5.26291,0 -0.29657,2.4214 -5.31599,0 z" style="fill:url(#linearGradient41013);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41015);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path40651"/>
+          <path sodipodi:nodetypes="ccccc" id="path40683" style="fill:url(#linearGradient41077);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41079);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 365.51806,6083.8538 5.28659,0 -0.42614,2.5 c 2.11314,0 -3.60643,0 -5.34105,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 371.33134,6083.8538 5.31447,0 -0.36596,2.5 -5.36922,0 z" style="fill:url(#linearGradient41081);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41083);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" id="path40685"/>
+          <path sodipodi:nodetypes="ccccc" id="path40687" style="fill:url(#linearGradient41085);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41087);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 377.12679,6083.8538 5.32285,0 -0.30619,2.5 -5.37766,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 364.9894,6086.6038 5.3465,0 -0.42025,2.5 -5.40685,0 z" style="fill:url(#linearGradient41141);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41143);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" id="path40715"/>
+          <path sodipodi:nodetypes="ccccc" id="path40717" style="fill:url(#linearGradient41145);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41147);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" d="m 370.86856,6086.6038 5.37469,0 -0.36596,2.5 -5.43531,0.051 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 376.72969,6086.6038 5.38314,0 -0.3062,2.5 -5.43795,0 z" style="fill:url(#linearGradient41149);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient41151);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" id="path40719"/>
+          <rect style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect40743" width="2.625" height="0.875" x="449.04156" y="6104.21"/>
+          <rect y="6104.4102" x="374.01657" height="0.875" width="2.625" id="rect40745" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <path sodipodi:type="arc" style="fill:url(#linearGradient41197);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40747" sodipodi:cx="310.50827" sodipodi:cy="5206.0718" sodipodi:rx="2.2097087" sodipodi:ry="3.9774756" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2353.6734,5980.0333)"/>
+          <path transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2358.8382,5980.1445)" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" sodipodi:ry="3.9774756" sodipodi:rx="2.2097087" sodipodi:cy="5206.0718" sodipodi:cx="310.50827" id="path40749" style="fill:url(#linearGradient41199);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:url(#linearGradient41201);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40751" sodipodi:cx="310.50827" sodipodi:cy="5206.0718" sodipodi:rx="2.2097087" sodipodi:ry="3.9774756" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2348.8318,5980.0501)"/>
+          <path sodipodi:type="arc" style="fill:url(#linearGradient41203);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40753" sodipodi:cx="310.50827" sodipodi:cy="5206.0718" sodipodi:rx="2.2097087" sodipodi:ry="3.9774756" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2272.8592,5980.0809)"/>
+          <path transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2278.024,5980.1921)" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" sodipodi:ry="3.9774756" sodipodi:rx="2.2097087" sodipodi:cy="5206.0718" sodipodi:cx="310.50827" id="path40755" style="fill:url(#linearGradient41205);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:url(#linearGradient41207);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40757" sodipodi:cx="310.50827" sodipodi:cy="5206.0718" sodipodi:rx="2.2097087" sodipodi:ry="3.9774756" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" transform="matrix(0.00126949,0.36517426,-0.36517426,0.00126949,2268.0176,5980.0977)"/>
+          <path sodipodi:type="arc" style="fill:url(#linearGradient41209);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40759" sodipodi:cx="310.50827" sodipodi:cy="5206.0718" sodipodi:rx="2.2097087" sodipodi:ry="3.9774756" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" transform="matrix(0.00105099,0.36517426,-0.30232038,0.00126949,1941.2408,5887.5431)"/>
+          <path transform="matrix(0.00105099,0.36517426,-0.30232038,0.00126949,2030.5403,5887.5431)" d="m 312.71798,5206.0718 c 0,2.1967 -0.98932,3.9775 -2.20971,3.9775 -1.22039,0 -2.20971,-1.7808 -2.20971,-3.9775 0,-2.1967 0.98932,-3.9775 2.20971,-3.9775 1.22039,0 2.20971,1.7808 2.20971,3.9775 z" sodipodi:ry="3.9774756" sodipodi:rx="2.2097087" sodipodi:cy="5206.0718" sodipodi:cx="310.50827" id="path40761" style="fill:url(#linearGradient41211);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path inkscape:connector-curvature="0" d="m 384.24203,6072.9565 5.08541,0 -0.22704,2.3036 -5.13598,0 z" style="fill:url(#linearGradient4166);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4168);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" id="path4154" sodipodi:nodetypes="ccccc"/>
+          <path id="path4156" style="fill:url(#linearGradient4170);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4172);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" d="m 383.91063,6075.7065 5.14578,0 -0.22705,2.3036 -5.19634,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 383.58868,6078.378 5.20442,0 -0.23478,2.3821 -5.2567,0 z" style="fill:url(#linearGradient4174);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4176);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" id="path4158" sodipodi:nodetypes="ccccc"/>
+          <path id="path4160" style="fill:url(#linearGradient4178);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4180);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" d="m 383.25826,6081.1199 5.2646,0 -0.23865,2.4214 -5.31776,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 382.92879,6083.8538 5.32462,0 -0.2464,2.5 -5.37949,0 z" style="fill:url(#linearGradient4182);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4184);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" id="path4162" sodipodi:nodetypes="ccccc"/>
+          <path id="path4164" style="fill:url(#linearGradient4186);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4188);stroke-width:0.10089082000000001;stroke-miterlimit:4;stroke-dasharray:none" d="m 382.59739,6086.6038 28.85697,0 0.009,2.5 -29.16718,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" id="path4190" style="fill:url(#linearGradient4202);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4204);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 389.78509,6072.9565 5.08551,0 -0.17195,2.3036 -5.13606,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 389.51948,6075.7065 5.14585,0 -0.17194,2.3036 -5.19641,0 z" style="fill:url(#linearGradient4206);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4208);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path4192"/>
+          <path sodipodi:nodetypes="ccccc" id="path4194" style="fill:url(#linearGradient4210);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4212);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 389.26144,6078.378 5.20448,0 -0.1778,2.3821 -5.25676,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 388.99661,6081.1199 5.26465,0 -0.18074,2.4214 -5.31779,0 z" style="fill:url(#linearGradient4214);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4216);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path4196"/>
+          <path sodipodi:nodetypes="ccccc" id="path4198" style="fill:url(#linearGradient4218);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4220);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 388.73254,6083.8538 5.32465,0 -0.1866,2.5 -5.37952,0 z" inkscape:connector-curvature="0"/>
+          <path inkscape:connector-curvature="0" d="m 395.3282,6072.9565 5.08549,0 -0.11685,2.3036 -5.13604,0 z" style="fill:url(#linearGradient4238);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4240);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" id="path4226" sodipodi:nodetypes="ccccc"/>
+          <path id="path4228" style="fill:url(#linearGradient4242);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4244);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" d="m 395.12836,6075.7065 5.14584,0 -0.11684,2.3036 -5.1964,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 394.93423,6078.378 5.20447,0 -0.12083,2.3821 -5.25675,0 z" style="fill:url(#linearGradient4246);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4248);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" id="path4230" sodipodi:nodetypes="ccccc"/>
+          <path id="path4232" style="fill:url(#linearGradient4250);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4252);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" d="m 394.73498,6081.1199 5.26464,0 -0.12282,2.4214 -5.31778,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 394.53631,6083.8538 5.32464,0 -0.12681,2.5 -5.3795,0 z" style="fill:url(#linearGradient4254);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4256);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" id="path4234" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" id="path4262" style="fill:url(#linearGradient4274);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4276);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 400.87128,6072.9565 5.08549,0 -0.0617,2.3036 -5.13604,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 400.73723,6075.7065 5.14584,0 -0.0617,2.3036 c -1.73214,0 -9.64135,0 -5.1964,0 z" style="fill:url(#linearGradient4278);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4280);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path4264"/>
+          <path sodipodi:nodetypes="ccccc" id="path4266" style="fill:url(#linearGradient4282);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4284);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 400.607,6078.378 5.20447,0 -0.0639,2.3821 -5.25674,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 400.47334,6081.1199 5.26464,0 -0.0649,2.4214 -5.31778,0 z" style="fill:url(#linearGradient4286);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4288);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path4268"/>
+          <path sodipodi:nodetypes="ccccc" id="path4270" style="fill:url(#linearGradient4290);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4292);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 400.34007,6083.8538 5.32464,0 -0.067,2.5 -5.3795,0 z" inkscape:connector-curvature="0"/>
+          <path inkscape:connector-curvature="0" d="m 406.41437,6072.9565 5.08565,0 -0.007,2.3036 -5.13618,0 z" style="fill:url(#linearGradient4310);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4312);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" id="path4298" sodipodi:nodetypes="ccccc"/>
+          <path id="path4300" style="fill:url(#linearGradient4314);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4316);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" d="m 406.34609,6075.7065 5.14598,0 -0.007,2.3036 c -1.73214,0 -9.64146,0 -5.19651,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 406.27977,6078.378 5.20458,0 -0.007,2.3821 -5.25683,0 z" style="fill:url(#linearGradient4318);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4320);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" id="path4302" sodipodi:nodetypes="ccccc"/>
+          <path id="path4304" style="fill:url(#linearGradient4322);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4324);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" d="m 406.2117,6081.1199 5.26472,0 -0.007,2.4214 -5.31784,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 406.14382,6083.8538 5.3247,0 -0.007,2.5 -5.37953,0 z" style="fill:url(#linearGradient4326);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4328);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" id="path4306" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" id="path4334" style="fill:url(#linearGradient4346);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4348);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 411.96087,6072.9565 5.08546,0 0.0485,2.3036 -5.13602,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 411.95839,6075.7065 5.14581,0 0.0485,2.3036 c -1.73214,0 -9.64132,0 -5.19637,0 z" style="fill:url(#linearGradient4350);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4352);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path4336"/>
+          <path sodipodi:nodetypes="ccccc" id="path4338" style="fill:url(#linearGradient4354);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4356);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 411.95598,6078.378 5.20445,0 0.0501,2.3821 -5.25673,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 411.9535,6081.1199 5.26463,0 0.051,2.4214 -5.31777,0 z" style="fill:url(#linearGradient4358);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4360);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path4340"/>
+          <path sodipodi:nodetypes="ccccc" id="path4342" style="fill:url(#linearGradient4362);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4364);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 411.95103,6083.8538 5.32464,0 0.0526,2.5 -5.3795,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 411.94855,6086.6038 5.385,2e-4 0.0526,2.4998 -5.43986,0 z" style="fill:url(#linearGradient4366);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4368);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" id="path4344"/>
+          <path inkscape:connector-curvature="0" d="m 417.50401,6072.9565 5.0853,0 0.1036,2.3036 -5.13588,0 z" style="fill:url(#linearGradient4382);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4384);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" id="path4370" sodipodi:nodetypes="ccccc"/>
+          <path id="path4372" style="fill:url(#linearGradient4386);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4388);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" d="m 417.5673,6075.7065 5.14569,0 0.1036,2.3036 c -1.73214,0 -9.64122,0 -5.19627,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 417.62879,6078.378 5.20434,0 0.10713,2.3821 -5.25665,0 z" style="fill:url(#linearGradient4390);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4392);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" id="path4374" sodipodi:nodetypes="ccccc"/>
+          <path id="path4376" style="fill:url(#linearGradient4394);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4396);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" d="m 417.69189,6081.1199 5.26455,0 0.1089,2.4214 -5.31772,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 417.75481,6083.8538 5.32458,0 0.11243,2.5 -5.37947,0 z" style="fill:url(#linearGradient4398);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4400);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" id="path4378" sodipodi:nodetypes="ccccc"/>
+          <path id="path4380" style="fill:url(#linearGradient4402);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4404);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" d="m 417.8181,6086.6038 5.38498,2e-4 0.11242,2.4998 -5.43986,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" id="path4406" style="fill:url(#linearGradient4418);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4420);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 423.0469,6072.9565 5.08558,0 0.15869,2.3036 -5.13612,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 423.17601,6075.7065 5.14591,0 0.15869,2.3036 c -1.73214,0 -9.6414,0 -5.19645,0 z" style="fill:url(#linearGradient4422);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4424);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path4408"/>
+          <path sodipodi:nodetypes="ccccc" id="path4410" style="fill:url(#linearGradient4426);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4428);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 423.30143,6078.378 5.20453,0 0.1641,2.3821 -5.2568,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 423.43016,6081.1199 5.26468,0 0.16681,2.4214 -5.31782,0 z" style="fill:url(#linearGradient4430);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4432);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path4412"/>
+          <path sodipodi:nodetypes="ccccc" id="path4414" style="fill:url(#linearGradient4434);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4436);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 423.55851,6083.8538 5.32467,0 0.17222,2.5 -5.37953,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 423.68761,6086.6038 5.38502,2e-4 0.17221,2.4998 -5.43986,0 z" style="fill:url(#linearGradient4438);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4440);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" id="path4416"/>
+          <path inkscape:connector-curvature="0" d="m 428.59008,6072.9565 5.0852,0 0.21384,2.3036 -5.1358,0 z" style="fill:url(#linearGradient4454);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4456);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" id="path4442" sodipodi:nodetypes="ccccc"/>
+          <path id="path4444" style="fill:url(#linearGradient4458);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4460);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" d="m 428.78495,6075.7065 5.14561,0 0.21383,2.3036 c -1.73214,0 -9.64115,0 -5.1962,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 428.97426,6078.378 5.20428,0 0.22112,2.3821 -5.2566,0 z" style="fill:url(#linearGradient4462);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4464);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" id="path4446" sodipodi:nodetypes="ccccc"/>
+          <path id="path4448" style="fill:url(#linearGradient4466);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4468);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" d="m 429.16856,6081.1199 5.2645,0 0.22477,2.4214 -5.31768,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 429.36229,6083.8538 5.32455,0 0.23207,2.5 -5.37946,0 z" style="fill:url(#linearGradient4470);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4472);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" id="path4450" sodipodi:nodetypes="ccccc"/>
+          <path id="path4452" style="fill:url(#linearGradient4474);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4476);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" d="m 429.55717,6086.6038 5.38496,2e-4 0.23205,2.4998 -5.43986,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" id="path4478" style="fill:url(#linearGradient4490);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4492);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 434.13407,6072.9565 5.0842,0 0.26895,2.3036 -5.13494,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 434.39457,6075.7065 5.14477,0 0.26895,2.3036 c -1.73214,0 -9.64045,0 -5.1955,0 z" style="fill:url(#linearGradient4494);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4496);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path4480"/>
+          <path sodipodi:nodetypes="ccccc" id="path4482" style="fill:url(#linearGradient4498);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4500);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 434.64764,6078.378 5.20361,0 0.27812,2.3821 -5.25608,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 434.90737,6081.1199 5.264,0 0.28271,2.4214 -5.31734,0 z" style="fill:url(#linearGradient4502);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4504);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path4484"/>
+          <path sodipodi:nodetypes="ccccc" id="path4486" style="fill:url(#linearGradient4506);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4508);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 435.16635,6083.8538 5.32422,0 0.29188,2.5 -5.37928,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 435.42685,6086.6038 5.38481,2e-4 0.29187,2.4999 -5.43986,-1e-4 z" style="fill:url(#linearGradient4510);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4512);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" id="path4488"/>
+          <path inkscape:connector-curvature="0" d="m 439.67657,6072.9565 5.08506,0 0.32402,2.3036 -5.13568,0 z" style="fill:url(#linearGradient4526);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4528);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" id="path4514" sodipodi:nodetypes="ccccc"/>
+          <path id="path4516" style="fill:url(#linearGradient4530);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4532);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" d="m 440.00295,6075.7065 5.14549,0 0.32402,2.3036 c -1.94106,-0.014 0.47153,0.021 -5.19611,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 440.32002,6078.378 5.20418,0 0.33507,2.3821 -5.25653,0 z" style="fill:url(#linearGradient4534);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4536);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" id="path4518" sodipodi:nodetypes="ccccc"/>
+          <path id="path4520" style="fill:url(#linearGradient4538);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4540);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" d="m 440.64544,6081.1199 5.26443,0 0.34059,2.4214 -5.31764,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 440.96991,6083.8538 5.32451,0 0.35164,2.5 -5.37944,0 z" style="fill:url(#linearGradient4542);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4544);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" id="path4522" sodipodi:nodetypes="ccccc"/>
+          <path id="path4524" style="fill:url(#linearGradient4546);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4548);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" d="m 441.2963,6086.6038 5.38495,2e-4 0.35162,2.4998 -5.43986,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" id="path4550" style="fill:url(#linearGradient4562);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4564);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 445.22054,6072.9565 5.08578,0 0.37889,2.3036 -5.13629,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 445.61255,6075.7065 5.14609,0 0.37889,2.3036 c -1.94106,-0.014 0.47378,0.041 -5.1966,0 z" style="fill:url(#linearGradient4566);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4568);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path4552"/>
+          <path sodipodi:nodetypes="ccccc" id="path4554" style="fill:url(#linearGradient4570);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4572);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 445.99338,6078.378 5.20466,0 0.39181,2.3821 -5.2569,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 446.38424,6081.1199 5.26479,0 0.39827,2.4214 -5.31789,0 z" style="fill:url(#linearGradient4574);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4576);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path4556"/>
+          <path sodipodi:nodetypes="ccccc" id="path4558" style="fill:url(#linearGradient4578);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4580);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 446.77396,6083.8538 5.32474,0 0.4112,2.5 -5.37956,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 447.16598,6086.6038 5.38507,2e-4 0.41116,2.4998 -5.43985,0 z" style="fill:url(#linearGradient4582);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4584);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" id="path4560"/>
+          <path inkscape:connector-curvature="0" d="m 450.76289,6072.9565 3.73803,0 0.42085,2.3036 -3.77529,0 z" style="fill:url(#linearGradient4598);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4600);stroke-width:0.09824041000000000;stroke-miterlimit:4;stroke-dasharray:none" id="path4586" sodipodi:nodetypes="ccccc"/>
+          <path id="path4588" style="fill:url(#linearGradient4602);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4604);stroke-width:0.09900935000000000;stroke-miterlimit:4;stroke-dasharray:none" d="m 451.22081,6075.7065 3.78251,0 0.42084,2.3036 c -1.94106,-0.014 1.85062,0.041 -3.81976,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 451.66566,6078.378 3.82572,0 0.43518,2.3821 -3.86424,0 z" style="fill:url(#linearGradient4606);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4608);stroke-width:0.09953846000000000;stroke-miterlimit:4;stroke-dasharray:none" id="path4590" sodipodi:nodetypes="ccccc"/>
+          <path id="path4592" style="fill:url(#linearGradient4610);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4612);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" d="m 452.12224,6081.1199 3.87005,0 0.44237,2.4214 -3.90922,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:connector-curvature="0" d="m 452.57748,6083.8538 3.91427,0 0.45672,2.5 -3.9547,0 z" style="fill:url(#linearGradient4614);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4616);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" id="path4594" sodipodi:nodetypes="ccccc"/>
+          <path id="path4596" style="fill:url(#linearGradient4618);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4620);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" d="m 453.0354,6086.6038 3.95878,2e-4 0.45669,2.4998 -3.99918,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" id="path4622" style="fill:url(#linearGradient4634);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4636);stroke-width:0.09824041;stroke-miterlimit:4;stroke-dasharray:none" d="m 454.95619,6072.9565 2.8155,0 0.45326,2.3036 -2.84353,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 455.46383,6075.7065 2.84895,0 0.45326,2.3036 c -1.94106,-0.014 -0.27073,0.021 -2.87698,0 z" style="fill:url(#linearGradient4638);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4640);stroke-width:0.09900935;stroke-miterlimit:4;stroke-dasharray:none" id="path4624"/>
+          <path sodipodi:nodetypes="ccccc" id="path4626" style="fill:url(#linearGradient4642);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4644);stroke-width:0.09953846;stroke-miterlimit:4;stroke-dasharray:none" d="m 455.95697,6078.378 2.88146,0 0.4687,2.3821 -2.91044,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 456.46311,6081.1199 2.91482,0 0.47643,2.4214 -2.94427,0 z" style="fill:url(#linearGradient4646);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4648);stroke-width:0.09983431;stroke-miterlimit:4;stroke-dasharray:none" id="path4628"/>
+          <path sodipodi:nodetypes="ccccc" id="path4630" style="fill:url(#linearGradient4650);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4652);stroke-width:0.10036989;stroke-miterlimit:4;stroke-dasharray:none" d="m 456.96777,6083.8538 2.94808,0 0.4919,2.5 -2.97849,0 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 457.47541,6086.6038 2.98157,2e-4 0.49186,2.4998 -3.01195,0 z" style="fill:url(#linearGradient4654);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4656);stroke-width:0.10089082;stroke-miterlimit:4;stroke-dasharray:none" id="path4632"/>
         </g>
       </g>
     </g>
diff --git a/misc/images/svg/elements/PBX.svg b/misc/images/svg/elements/PBX.svg
index d7e861e1779..cf6e1628e2e 100644
--- a/misc/images/svg/elements/PBX.svg
+++ b/misc/images/svg/elements/PBX.svg
@@ -1,1805 +1,338 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="124.66694"
-   id="svg133732"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 17">
-  <defs
-     id="defs133734">
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter7993-0-0-7-0-0"
-       x="-0.17000002"
-       width="1.34"
-       y="-0.092727274"
-       height="1.1854545">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.6939478"
-         id="feGaussianBlur7995-57-1-9-9-6" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="124.66694" id="svg133732" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 17">
+  <defs id="defs133734">
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter7993-0-0-7-0-0" x="-0.17000002" width="1.34" y="-0.092727274" height="1.1854545">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="3.6939478" id="feGaussianBlur7995-57-1-9-9-6"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient68148-9"
-       id="radialGradient75331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(6.3578606,-7.751052,3.3554948,2.7523707,-4674.2771,5051.5987)"
-       cx="713.94525"
-       cy="279.92365"
-       fx="713.94525"
-       fy="279.92365"
-       r="23.981091" />
-    <linearGradient
-       id="linearGradient68148-9">
-      <stop
-         id="stop68150"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop68152"
-         offset="1"
-         style="stop-color:#3b4e5a;stop-opacity:1;" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient68148-9" id="radialGradient75331" gradientUnits="userSpaceOnUse" gradientTransform="matrix(6.3578606,-7.751052,3.3554948,2.7523707,-4674.2771,5051.5987)" cx="713.94525" cy="279.92365" fx="713.94525" fy="279.92365" r="23.981091"/>
+    <linearGradient id="linearGradient68148-9">
+      <stop id="stop68150" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop68152" offset="1" style="stop-color:#3b4e5a;stop-opacity:1;"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter46966-7"
-       x="-0.036184639"
-       width="1.0723693"
-       y="-0.14797489"
-       height="1.2959498">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.96611874"
-         id="feGaussianBlur46968-5" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter46966-7" x="-0.036184639" width="1.0723693" y="-0.14797489" height="1.2959498">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.96611874" id="feGaussianBlur46968-5"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-5"
-       id="linearGradient75333"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-770.11058)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient45657-4-5-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45659-8-4-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45661-6-31-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient58902"
-       id="linearGradient75335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-19.091492)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient58902">
-      <stop
-         id="stop58904"
-         offset="0"
-         style="stop-color:#008888;stop-opacity:1;" />
-      <stop
-         id="stop58906"
-         offset="1"
-         style="stop-color:#004444;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-5"
-       id="linearGradient75337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-801.58795)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient133771">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133773" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133775" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient58902"
-       id="linearGradient75339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-50.568861)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient133778">
-      <stop
-         id="stop133780"
-         offset="0"
-         style="stop-color:#008888;stop-opacity:1;" />
-      <stop
-         id="stop133782"
-         offset="1"
-         style="stop-color:#004444;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-5"
-       id="linearGradient75341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-833.93969)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient133789">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133791" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133793" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient58902"
-       id="linearGradient75343"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-82.920602)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient133796">
-      <stop
-         id="stop133798"
-         offset="0"
-         style="stop-color:#008888;stop-opacity:1;" />
-      <stop
-         id="stop133800"
-         offset="1"
-         style="stop-color:#004444;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-5"
-       id="linearGradient75345"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-865.41706)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient133807">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133809" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133811" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient58902"
-       id="linearGradient75347"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-114.39797)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient133814">
-      <stop
-         id="stop133816"
-         offset="0"
-         style="stop-color:#008888;stop-opacity:1;" />
-      <stop
-         id="stop133818"
-         offset="1"
-         style="stop-color:#004444;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-5"
-       id="linearGradient75349"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-896.89443)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient133825">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133827" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133829" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient58902"
-       id="linearGradient75351"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-145.87534)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient133832">
-      <stop
-         id="stop133834"
-         offset="0"
-         style="stop-color:#008888;stop-opacity:1;" />
-      <stop
-         id="stop133836"
-         offset="1"
-         style="stop-color:#004444;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-5-5"
-       id="linearGradient75353"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-928.3718)"
-       x1="674.93817"
-       y1="272.85315"
-       x2="728.26373"
-       y2="273.1134" />
-    <linearGradient
-       id="linearGradient133843">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133845" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133847" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient58902"
-       id="linearGradient75355"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-177.35271)"
-       x1="684.49146"
-       y1="206.04771"
-       x2="732.07758"
-       y2="206.04771" />
-    <linearGradient
-       id="linearGradient133850">
-      <stop
-         id="stop133852"
-         offset="0"
-         style="stop-color:#008888;stop-opacity:1;" />
-      <stop
-         id="stop133854"
-         offset="1"
-         style="stop-color:#004444;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5311-7-4-7-6"
-       id="linearGradient75357"
-       gradientUnits="userSpaceOnUse"
-       x1="297.40717"
-       y1="3509.1924"
-       x2="314.71207"
-       y2="3410.9441" />
-    <linearGradient
-       id="linearGradient5311-7-4-7-6">
-      <stop
-         id="stop5313-3-2-7-5"
-         offset="0"
-         style="stop-color:#424242;stop-opacity:1;" />
-      <stop
-         id="stop5315-2-2-7-0"
-         offset="1"
-         style="stop-color:#818181;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter38419-4-6-9">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.7694005"
-         id="feGaussianBlur38421-6-0-9" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-5" id="linearGradient75333" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-770.11058)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient45657-4-5-5">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45659-8-4-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45661-6-31-6"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient58902" id="linearGradient75335" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-19.091492)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient58902">
+      <stop id="stop58904" offset="0" style="stop-color:#008888;stop-opacity:1;"/>
+      <stop id="stop58906" offset="1" style="stop-color:#004444;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-5" id="linearGradient75337" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-801.58795)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient133771">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133773"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133775"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient58902" id="linearGradient75339" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-50.568861)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient133778">
+      <stop id="stop133780" offset="0" style="stop-color:#008888;stop-opacity:1;"/>
+      <stop id="stop133782" offset="1" style="stop-color:#004444;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-5" id="linearGradient75341" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-833.93969)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient133789">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133791"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133793"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient58902" id="linearGradient75343" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-82.920602)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient133796">
+      <stop id="stop133798" offset="0" style="stop-color:#008888;stop-opacity:1;"/>
+      <stop id="stop133800" offset="1" style="stop-color:#004444;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-5" id="linearGradient75345" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-865.41706)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient133807">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133809"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133811"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient58902" id="linearGradient75347" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-114.39797)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient133814">
+      <stop id="stop133816" offset="0" style="stop-color:#008888;stop-opacity:1;"/>
+      <stop id="stop133818" offset="1" style="stop-color:#004444;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-5" id="linearGradient75349" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-896.89443)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient133825">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133827"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133829"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient58902" id="linearGradient75351" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-145.87534)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient133832">
+      <stop id="stop133834" offset="0" style="stop-color:#008888;stop-opacity:1;"/>
+      <stop id="stop133836" offset="1" style="stop-color:#004444;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-5-5" id="linearGradient75353" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.0236227,0,0,4.0236227,-1937.0093,-928.3718)" x1="674.93817" y1="272.85315" x2="728.26373" y2="273.1134"/>
+    <linearGradient id="linearGradient133843">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133845"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133847"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient58902" id="linearGradient75355" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6569457,0,0,1.6569457,-341.81381,-177.35271)" x1="684.49146" y1="206.04771" x2="732.07758" y2="206.04771"/>
+    <linearGradient id="linearGradient133850">
+      <stop id="stop133852" offset="0" style="stop-color:#008888;stop-opacity:1;"/>
+      <stop id="stop133854" offset="1" style="stop-color:#004444;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5311-7-4-7-6" id="linearGradient75357" gradientUnits="userSpaceOnUse" x1="297.40717" y1="3509.1924" x2="314.71207" y2="3410.9441"/>
+    <linearGradient id="linearGradient5311-7-4-7-6">
+      <stop id="stop5313-3-2-7-5" offset="0" style="stop-color:#424242;stop-opacity:1;"/>
+      <stop id="stop5315-2-2-7-0" offset="1" style="stop-color:#818181;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter38419-4-6-9">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="4.7694005" id="feGaussianBlur38421-6-0-9"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4771"
-       id="linearGradient75359"
-       gradientUnits="userSpaceOnUse"
-       x1="310.51315"
-       y1="3404.3198"
-       x2="391.1004"
-       y2="3364.6641" />
-    <linearGradient
-       id="linearGradient4771">
-      <stop
-         style="stop-color:#afc4cc;stop-opacity:1;"
-         offset="0"
-         id="stop4773" />
-      <stop
-         id="stop4775"
-         offset="1"
-         style="stop-color:#596a71;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient68014-8"
-       id="linearGradient75361"
-       gradientUnits="userSpaceOnUse"
-       x1="326.28394"
-       y1="3477.0342"
-       x2="467.77823"
-       y2="3506.8508" />
-    <linearGradient
-       id="linearGradient68014-8">
-      <stop
-         style="stop-color:#e1e9ec;stop-opacity:1;"
-         offset="0"
-         id="stop68016" />
-      <stop
-         style="stop-color:#5d8392;stop-opacity:1;"
-         offset="1"
-         id="stop68018" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient68014-8"
-       id="linearGradient75363"
-       gradientUnits="userSpaceOnUse"
-       x1="224.51013"
-       y1="3438.6394"
-       x2="310.77881"
-       y2="3470.2268" />
-    <linearGradient
-       id="linearGradient133871">
-      <stop
-         style="stop-color:#e1e9ec;stop-opacity:1;"
-         offset="0"
-         id="stop133873" />
-      <stop
-         style="stop-color:#5d8392;stop-opacity:1;"
-         offset="1"
-         id="stop133875" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient68014-8"
-       id="linearGradient75365"
-       gradientUnits="userSpaceOnUse"
-       x1="513.1767"
-       y1="2999.0745"
-       x2="557.47589"
-       y2="2944.1663" />
-    <linearGradient
-       id="linearGradient133878">
-      <stop
-         style="stop-color:#e1e9ec;stop-opacity:1;"
-         offset="0"
-         id="stop133880" />
-      <stop
-         style="stop-color:#5d8392;stop-opacity:1;"
-         offset="1"
-         id="stop133882" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient68014-8"
-       id="linearGradient75367"
-       gradientUnits="userSpaceOnUse"
-       x1="227.42522"
-       y1="3513.2139"
-       x2="402.83206"
-       y2="3425.864" />
-    <linearGradient
-       id="linearGradient133885">
-      <stop
-         style="stop-color:#e1e9ec;stop-opacity:1;"
-         offset="0"
-         id="stop133887" />
-      <stop
-         style="stop-color:#5d8392;stop-opacity:1;"
-         offset="1"
-         id="stop133889" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient68014-8"
-       id="linearGradient75369"
-       gradientUnits="userSpaceOnUse"
-       x1="404.18625"
-       y1="2962.7517"
-       x2="400.94806"
-       y2="2944.655" />
-    <linearGradient
-       id="linearGradient133892">
-      <stop
-         style="stop-color:#e1e9ec;stop-opacity:1;"
-         offset="0"
-         id="stop133894" />
-      <stop
-         style="stop-color:#5d8392;stop-opacity:1;"
-         offset="1"
-         id="stop133896" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient68014-8"
-       id="linearGradient75371"
-       gradientUnits="userSpaceOnUse"
-       x1="249.83018"
-       y1="3437.0818"
-       x2="297.52451"
-       y2="3451.2417" />
-    <linearGradient
-       id="linearGradient133899">
-      <stop
-         style="stop-color:#e1e9ec;stop-opacity:1;"
-         offset="0"
-         id="stop133901" />
-      <stop
-         style="stop-color:#5d8392;stop-opacity:1;"
-         offset="1"
-         id="stop133903" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient68014-8"
-       id="linearGradient75373"
-       gradientUnits="userSpaceOnUse"
-       x1="394.41577"
-       y1="3408.7727"
-       x2="443.32291"
-       y2="3383.3379" />
-    <linearGradient
-       id="linearGradient133906">
-      <stop
-         style="stop-color:#e1e9ec;stop-opacity:1;"
-         offset="0"
-         id="stop133908" />
-      <stop
-         style="stop-color:#5d8392;stop-opacity:1;"
-         offset="1"
-         id="stop133910" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37431-0-0-8"
-       id="linearGradient75375"
-       gradientUnits="userSpaceOnUse"
-       x1="403.10547"
-       y1="3373.5867"
-       x2="477"
-       y2="3459.5867" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient37431-0-0-8">
-      <stop
-         style="stop-color:#008888;stop-opacity:1;"
-         offset="0"
-         id="stop37433-3-8-08" />
-      <stop
-         style="stop-color:#008888;stop-opacity:0;"
-         offset="1"
-         id="stop37435-5-3-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75377"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient37235-2-6-0-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37237-7-3-4" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop37239-7-60-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75379"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133921">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133923" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133925" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75381"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133928">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133930" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133932" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75383"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133935">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133937" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133939" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75385"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133942">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133944" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133946" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75387"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133949">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133951" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133953" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75389"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133956">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133958" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133960" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75391"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133963">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133965" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133967" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75393"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133970">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133972" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133974" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75395"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133977">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133979" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133981" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75397"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133984">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133986" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133988" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75399"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133991">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop133993" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop133995" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75401"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient133998">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134000" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134002" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75403"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134005">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134007" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134009" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75405"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134012">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134014" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134016" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75407"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134019">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134021" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134023" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75409"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134026">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134028" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134030" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75411"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134033">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134035" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134037" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75413"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134040">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134042" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134044" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75415"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134047">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134049" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134051" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75417"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134054">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134056" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134058" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75419"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134061">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134063" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134065" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0-6"
-       id="linearGradient75421"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134068">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134070" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134072" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4771" id="linearGradient75359" gradientUnits="userSpaceOnUse" x1="310.51315" y1="3404.3198" x2="391.1004" y2="3364.6641"/>
+    <linearGradient id="linearGradient4771">
+      <stop style="stop-color:#afc4cc;stop-opacity:1;" offset="0" id="stop4773"/>
+      <stop id="stop4775" offset="1" style="stop-color:#596a71;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient68014-8" id="linearGradient75361" gradientUnits="userSpaceOnUse" x1="326.28394" y1="3477.0342" x2="467.77823" y2="3506.8508"/>
+    <linearGradient id="linearGradient68014-8">
+      <stop style="stop-color:#e1e9ec;stop-opacity:1;" offset="0" id="stop68016"/>
+      <stop style="stop-color:#5d8392;stop-opacity:1;" offset="1" id="stop68018"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient68014-8" id="linearGradient75363" gradientUnits="userSpaceOnUse" x1="224.51013" y1="3438.6394" x2="310.77881" y2="3470.2268"/>
+    <linearGradient id="linearGradient133871">
+      <stop style="stop-color:#e1e9ec;stop-opacity:1;" offset="0" id="stop133873"/>
+      <stop style="stop-color:#5d8392;stop-opacity:1;" offset="1" id="stop133875"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient68014-8" id="linearGradient75365" gradientUnits="userSpaceOnUse" x1="513.1767" y1="2999.0745" x2="557.47589" y2="2944.1663"/>
+    <linearGradient id="linearGradient133878">
+      <stop style="stop-color:#e1e9ec;stop-opacity:1;" offset="0" id="stop133880"/>
+      <stop style="stop-color:#5d8392;stop-opacity:1;" offset="1" id="stop133882"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient68014-8" id="linearGradient75367" gradientUnits="userSpaceOnUse" x1="227.42522" y1="3513.2139" x2="402.83206" y2="3425.864"/>
+    <linearGradient id="linearGradient133885">
+      <stop style="stop-color:#e1e9ec;stop-opacity:1;" offset="0" id="stop133887"/>
+      <stop style="stop-color:#5d8392;stop-opacity:1;" offset="1" id="stop133889"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient68014-8" id="linearGradient75369" gradientUnits="userSpaceOnUse" x1="404.18625" y1="2962.7517" x2="400.94806" y2="2944.655"/>
+    <linearGradient id="linearGradient133892">
+      <stop style="stop-color:#e1e9ec;stop-opacity:1;" offset="0" id="stop133894"/>
+      <stop style="stop-color:#5d8392;stop-opacity:1;" offset="1" id="stop133896"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient68014-8" id="linearGradient75371" gradientUnits="userSpaceOnUse" x1="249.83018" y1="3437.0818" x2="297.52451" y2="3451.2417"/>
+    <linearGradient id="linearGradient133899">
+      <stop style="stop-color:#e1e9ec;stop-opacity:1;" offset="0" id="stop133901"/>
+      <stop style="stop-color:#5d8392;stop-opacity:1;" offset="1" id="stop133903"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient68014-8" id="linearGradient75373" gradientUnits="userSpaceOnUse" x1="394.41577" y1="3408.7727" x2="443.32291" y2="3383.3379"/>
+    <linearGradient id="linearGradient133906">
+      <stop style="stop-color:#e1e9ec;stop-opacity:1;" offset="0" id="stop133908"/>
+      <stop style="stop-color:#5d8392;stop-opacity:1;" offset="1" id="stop133910"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37431-0-0-8" id="linearGradient75375" gradientUnits="userSpaceOnUse" x1="403.10547" y1="3373.5867" x2="477" y2="3459.5867"/>
+    <linearGradient inkscape:collect="always" id="linearGradient37431-0-0-8">
+      <stop style="stop-color:#008888;stop-opacity:1;" offset="0" id="stop37433-3-8-08"/>
+      <stop style="stop-color:#008888;stop-opacity:0;" offset="1" id="stop37435-5-3-9"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75377" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient37235-2-6-0-6">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop37237-7-3-4"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop37239-7-60-6"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75379" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133921">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133923"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133925"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75381" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133928">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133930"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133932"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75383" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133935">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133937"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133939"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75385" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133942">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133944"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133946"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75387" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133949">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133951"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133953"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75389" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133956">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133958"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133960"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75391" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133963">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133965"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133967"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75393" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133970">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133972"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133974"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75395" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133977">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133979"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133981"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75397" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133984">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133986"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133988"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75399" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133991">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop133993"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop133995"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75401" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient133998">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134000"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134002"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75403" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134005">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134007"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134009"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75405" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134012">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134014"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134016"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75407" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134019">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134021"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134023"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75409" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134026">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134028"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134030"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75411" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134033">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134035"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134037"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75413" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134040">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134042"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134044"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75415" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134047">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134049"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134051"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75417" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134054">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134056"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134058"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75419" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134061">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134063"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134065"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0-6" id="linearGradient75421" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134068">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134070"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134072"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="78.999997"
-     inkscape:cy="139.47633"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="66"
-     inkscape:window-y="87"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata133737">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="78.999997" inkscape:cy="139.47633" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="66" inkscape:window-y="87" inkscape:window-maximized="0"/>
+  <metadata id="metadata133737">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-296,-547.17157)">
-    <g
-       style="display:inline"
-       transform="matrix(0.41645656,0,0,0.41645656,192.88888,-608.69956)"
-       id="g75147"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\PBX.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g75149">
-        <g
-           id="g75151">
-          <g
-             transform="matrix(-0.9598265,0,0,-0.84538989,1048.6784,3119.5565)"
-             id="g75153">
-            <g
-               id="g75155"
-               transform="matrix(1.1658228,0,0,1.1658228,-223.77018,-23.517156)" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-296,-547.17157)">
+    <g style="display:inline" transform="matrix(0.41645656,0,0,0.41645656,192.88888,-608.69956)" id="g75147">
+      <g id="g75149">
+        <g id="g75151">
+          <g transform="matrix(-0.9598265,0,0,-0.84538989,1048.6784,3119.5565)" id="g75153">
+            <g id="g75155" transform="matrix(1.1658228,0,0,1.1658228,-223.77018,-23.517156)"/>
           </g>
-          <g
-             id="g75157">
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               transform="matrix(-2.4361897,0,0,-2.1457317,2117.5945,3465.738)"
-               rx="4.5029464"
-               y="217.21054"
-               x="706.578"
-               height="95.608063"
-               width="52.149849"
-               id="rect75159"
-               style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7993-0-0-7-0-0)" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               style="fill:url(#radialGradient75331);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="rect75161"
-               width="113.53738"
-               height="208.1519"
-               x="775.00635"
-               y="141.82109"
-               rx="0"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               rx="2.6026535"
-               y="295.92413"
-               x="676.24481"
-               height="15.669449"
-               width="64.079262"
-               id="rect75163"
-               style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)"
-               ry="2.6026535"
-               transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3313.3312)" />
-            <rect
-               ry="4.3124557"
-               style="fill:url(#linearGradient75333);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="rect75165"
-               width="106.17586"
-               height="25.963427"
-               x="778.68713"
-               y="314.76581"
-               rx="4.3124557"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               rx="0"
-               y="319.74744"
-               x="792.35138"
-               height="5.1418839"
-               width="78.84758"
-               id="rect75167"
-               style="fill:url(#linearGradient75335);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3344.3545)"
-               ry="2.6026535"
-               style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)"
-               id="rect75169"
-               width="64.079262"
-               height="15.669449"
-               x="676.24481"
-               y="295.92413"
-               rx="2.6026535"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               rx="4.3124557"
-               y="283.28845"
-               x="778.68713"
-               height="25.963427"
-               width="106.17586"
-               id="rect75171"
-               style="fill:url(#linearGradient75337);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               ry="4.3124557"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               style="fill:url(#linearGradient75339);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="rect75173"
-               width="78.84758"
-               height="5.1418839"
-               x="792.35138"
-               y="288.27008"
-               rx="0"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3376.2396)"
-               ry="2.6026535"
-               style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)"
-               id="rect75175"
-               width="64.079262"
-               height="15.669449"
-               x="676.24481"
-               y="295.92413"
-               rx="2.6026535"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               rx="4.3124557"
-               y="250.93669"
-               x="778.68713"
-               height="25.963427"
-               width="106.17586"
-               id="rect75177"
-               style="fill:url(#linearGradient75341);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               ry="4.3124557"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               style="fill:url(#linearGradient75343);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="rect75179"
-               width="78.84758"
-               height="5.1418839"
-               x="792.35138"
-               y="255.91832"
-               rx="0"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               rx="2.6026535"
-               y="295.92413"
-               x="676.24481"
-               height="15.669449"
-               width="64.079262"
-               id="rect75181"
-               style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)"
-               ry="2.6026535"
-               transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3407.2629)" />
-            <rect
-               ry="4.3124557"
-               style="fill:url(#linearGradient75345);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="rect75183"
-               width="106.17586"
-               height="25.963427"
-               x="778.68713"
-               y="219.45934"
-               rx="4.3124557"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               rx="0"
-               y="224.44096"
-               x="792.35138"
-               height="5.1418839"
-               width="78.84758"
-               id="rect75185"
-               style="fill:url(#linearGradient75347);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               rx="2.6026535"
-               y="295.92413"
-               x="676.24481"
-               height="15.669449"
-               width="64.079262"
-               id="rect75187"
-               style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)"
-               ry="2.6026535"
-               transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3438.2863)" />
-            <rect
-               ry="4.3124557"
-               style="fill:url(#linearGradient75349);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="rect75189"
-               width="106.17586"
-               height="25.963427"
-               x="778.68713"
-               y="187.98195"
-               rx="4.3124557"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               rx="0"
-               y="192.96358"
-               x="792.35138"
-               height="5.1418839"
-               width="78.84758"
-               id="rect75191"
-               style="fill:url(#linearGradient75351);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3469.3096)"
-               ry="2.6026535"
-               style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)"
-               id="rect75193"
-               width="64.079262"
-               height="15.669449"
-               x="676.24481"
-               y="295.92413"
-               rx="2.6026535"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               inkscape:export-xdpi="90"
-               inkscape:export-ydpi="90" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               rx="4.3124557"
-               y="156.50459"
-               x="778.68713"
-               height="25.963427"
-               width="106.17586"
-               id="rect75195"
-               style="fill:url(#linearGradient75353);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               ry="4.3124557"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <rect
-               inkscape:export-ydpi="90"
-               inkscape:export-xdpi="90"
-               inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\command_server.png"
-               style="fill:url(#linearGradient75355);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="rect75197"
-               width="78.84758"
-               height="5.1418839"
-               x="792.35138"
-               y="161.48622"
-               rx="0"
-               transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)" />
-            <path
-               transform="matrix(0.99314524,0,0,1.0733187,65.267577,-704.49343)"
-               sodipodi:nodetypes="cccccccccccccccssccccc"
-               inkscape:connector-curvature="0"
-               d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z"
-               style="opacity:0.66367714;fill:url(#linearGradient75357);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38419-4-6-9)"
-               id="path75199" />
-            <path
-               transform="translate(65.29157,-457.32235)"
-               id="path75201"
-               style="fill:url(#linearGradient75359);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccccccccccccccssccccc" />
-            <path
-               id="path75203"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:url(#linearGradient75361);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 307.375,3465.2117 c 34.26733,14.6434 68.94238,28.0977 107.1495,31.25 l 0,13.2576 c -24.68963,-1.6711 -57.21221,-9.8648 -107.1495,-32.1326 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path75205"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:url(#linearGradient75363);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 264.81149,3449.3193 c 13.86542,6.1358 27.70227,11.8873 42.69966,15.9856 l -0.13615,10.5803 c -14.35199,-5.2271 -28.43675,-10.9888 -42.56351,-16.6664 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path75207"
-               style="fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 479.81607,3039.13 55.61312,-85.3168 0.12069,3.7129 11.27145,3.1956 0.11249,6.9111 c -15.78066,28.2016 -33.36133,56.1548 -51.96791,82.9432 l -11.73005,-4.0877 -3.4198,5.922 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccccc" />
-            <path
-               id="path75209"
-               style="fill:url(#linearGradient75365);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 484.42913,3039.0198 51.13267,-81.4941 11.24742,3.1931 c -19.93534,34.7618 -36.66883,57.631 -53.38134,80.4223 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path75211"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:#7092a0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 419.09335,3496.342 9.01561,2.1213 1.59099,9.5018 -11.79985,-4.1543 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path75213"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:url(#linearGradient75367);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 371.32043,3389.7457 98.72881,21.5668 -55.52474,85.14 c -30.80213,-2.2501 -63.39824,-12.2959 -107.1495,-30.8697 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccccc"
-               inkscape:connector-curvature="0"
-               d="m 413.11231,2930.8324 23.59872,1.591 -64.04446,76.036 c -16.39483,-5.1669 -20.93739,-6.7274 -42.59157,-16.4624 l 4.52414,-2.4954 28.21693,8.1501 c 15.92247,-22.9475 32.56027,-45.3226 50.29624,-66.8193 z"
-               style="fill:url(#linearGradient75369);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75215" />
-            <path
-               id="path75217"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:url(#linearGradient75371);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 268.34702,3441.718 c 9.42697,6.402 19.55292,9.6953 29.17748,11.1369 l 0,7.9108 c -9.57244,-3.1473 -19.35461,-6.4281 -28.47038,-11.4021 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path75219"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 355.90625,3392.2742 0.71875,8.4375 -13.05822,-1.5672 c 8.45723,-5.9316 9.47905,-5.9157 12.33947,-6.8703 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccc" />
-            <path
-               id="path75221"
-               style="fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 362.07612,3373.1864 c 10.40456,2.9805 9.17758,8.5477 6.82064,16.4372 l -12.27176,11.0881 -0.73625,-8.4589 c -16.78443,4.7009 -47.00113,40.6402 -46.88307,59.4089 -4.42767,4.02 -6.17212,6.0399 -11.48117,9.0598 l 0,-8.0434 c 17.21489,-35.1342 46.00261,-60.6212 64.55161,-79.4917 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccccccc"
-               transform="translate(65.29157,-457.32235)" />
-            <path
-               id="path75223"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:url(#linearGradient75373);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 380.25,3374.0867 c 27.40103,3.8438 54.47999,10.8575 81.22097,18.6616 L 449.75,3432.8367 c -24.31091,-12.4836 -57.75432,-20.0723 -93.125,-26 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path75225"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:url(#linearGradient75375);fill-opacity:1;fill-rule:nonzero;stroke:#2a6c98;stroke-opacity:1"
-               d="m 386.5,3383.8367 60,14.5 -6.25,20 -64.5,-16.5 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 421.91657,2951.0144 c 36.67955,5.0391 66.90815,13.8479 91.875,25.25 l -8,11.75 -93.5,-25.75 z"
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75227" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75377);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75229"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="translate(65.29157,-457.57235)" />
-            <path
-               transform="translate(77.54157,-454.32235)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75231"
-               style="fill:url(#linearGradient75379);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75381);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75233"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="translate(91.14657,-450.82235)" />
-            <path
-               transform="translate(59.79157,-448.82235)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75235"
-               style="fill:url(#linearGradient75383);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75385);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75237"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="translate(72.04157,-445.57235)" />
-            <path
-               transform="translate(85.64657,-442.07235)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75239"
-               style="fill:url(#linearGradient75387);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75389);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75241"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="translate(51.69157,-439.02235)" />
-            <path
-               transform="translate(63.94157,-435.77235)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75243"
-               style="fill:url(#linearGradient75391);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75393);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75245"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="translate(77.54657,-432.27235)" />
-            <path
-               transform="translate(44.66657,-428.27235)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75247"
-               style="fill:url(#linearGradient75395);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75397);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75249"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="translate(56.91657,-425.02235)" />
-            <path
-               transform="translate(70.52157,-421.52235)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75251"
-               style="fill:url(#linearGradient75399);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75401);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75253"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="translate(95.77204,-413.02235)" />
-            <path
-               transform="matrix(0.7,0,0,0.7,176.06657,551.20365)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75255"
-               style="fill:url(#linearGradient75403);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75405);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75257"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="matrix(0.7,0,0,0.7,172.06657,556.07865)" />
-            <path
-               transform="matrix(0.7,0,0,0.7,185.44157,560.07865)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75259"
-               style="fill:url(#linearGradient75407);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75409);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75261"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="matrix(0.7,0,0,0.7,190.44157,554.82865)" />
-            <path
-               transform="matrix(0.7,0,0,0.7,206.35957,558.82865)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75263"
-               style="fill:url(#linearGradient75411);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75413);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75265"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="matrix(0.7,0,0,0.7,202.32204,564.20365)" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75415);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75267"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="matrix(0.7,0,0,0.7,218.97857,562.20365)" />
-            <path
-               transform="matrix(0.7,0,0,0.7,215.74107,567.57865)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75269"
-               style="fill:url(#linearGradient75417);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#linearGradient75419);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path75271"
-               sodipodi:cx="372.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:rx="4.625"
-               sodipodi:ry="3.125"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               transform="matrix(0.7,0,0,0.7,231.49107,572.07865)" />
-            <path
-               transform="matrix(0.7,0,0,0.7,235.24107,566.95365)"
-               d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-               sodipodi:ry="3.125"
-               sodipodi:rx="4.625"
-               sodipodi:cy="3438.2117"
-               sodipodi:cx="372.625"
-               id="path75273"
-               style="fill:url(#linearGradient75421);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <text
-               xml:space="preserve"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               x="2508.6321"
-               y="2812.095"
-               id="text75275"
-               sodipodi:linespacing="125%"
-               transform="matrix(1,0.39087979,-0.73785056,0.71158913,0,0)"><tspan
-                 sodipodi:role="line"
-                 id="tspan75277"
-                 x="2508.6321"
-                 y="2812.095">1</tspan></text>
-            <text
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-               sodipodi:linespacing="125%"
-               id="text75279"
-               y="2870.449"
-               x="2564.4163"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               xml:space="preserve"><tspan
-                 y="2870.449"
-                 x="2564.4163"
-                 id="tspan75281"
-                 sodipodi:role="line">2</tspan></text>
-            <text
-               xml:space="preserve"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               x="2577.9075"
-               y="2870.5251"
-               id="text75283"
-               sodipodi:linespacing="125%"
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-                 sodipodi:role="line"
-                 id="tspan75285"
-                 x="2577.9075"
-                 y="2870.5251">3</tspan></text>
-            <text
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-               sodipodi:linespacing="125%"
-               id="text75287"
-               y="2880.3496"
-               x="2553.8669"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               xml:space="preserve"><tspan
-                 y="2880.3496"
-                 x="2553.8669"
-                 id="tspan75289"
-                 sodipodi:role="line">4</tspan></text>
-            <text
-               xml:space="preserve"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               x="2566.3687"
-               y="2880.5222"
-               id="text75291"
-               sodipodi:linespacing="125%"
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-                 sodipodi:role="line"
-                 id="tspan75293"
-                 x="2566.3687"
-                 y="2880.5222">5</tspan></text>
-            <text
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-               sodipodi:linespacing="125%"
-               id="text75295"
-               y="2880.5984"
-               x="2579.8599"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               xml:space="preserve"><tspan
-                 y="2880.5984"
-                 x="2579.8599"
-                 id="tspan75297"
-                 sodipodi:role="line">6</tspan></text>
-            <text
-               xml:space="preserve"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               x="2554.7546"
-               y="2892.5071"
-               id="text75299"
-               sodipodi:linespacing="125%"
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-                 sodipodi:role="line"
-                 id="tspan75301"
-                 x="2554.7546"
-                 y="2892.5071">7</tspan></text>
-            <text
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-               sodipodi:linespacing="125%"
-               id="text75303"
-               y="2892.5483"
-               x="2566.9827"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               xml:space="preserve"><tspan
-                 y="2892.5483"
-                 x="2566.9827"
-                 id="tspan75305"
-                 sodipodi:role="line">8</tspan></text>
-            <text
-               xml:space="preserve"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               x="2581.0466"
-               y="2892.4424"
-               id="text75307"
-               sodipodi:linespacing="125%"
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-                 sodipodi:role="line"
-                 id="tspan75309"
-                 x="2581.0466"
-                 y="2892.4424">9</tspan></text>
-            <text
-               xml:space="preserve"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               x="2569.2244"
-               y="2904.9302"
-               id="text75311"
-               sodipodi:linespacing="125%"
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-                 sodipodi:role="line"
-                 id="tspan75313"
-                 x="2569.2244"
-                 y="2904.9302">0</tspan></text>
-            <text
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-               sodipodi:linespacing="125%"
-               id="text75315"
-               y="2904.9153"
-               x="2583.002"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               xml:space="preserve"><tspan
-                 y="2904.9153"
-                 x="2583.002"
-                 id="tspan75317"
-                 sodipodi:role="line">#</tspan></text>
-            <text
-               xml:space="preserve"
-               style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               x="2557.2061"
-               y="2906.1316"
-               id="text75319"
-               sodipodi:linespacing="125%"
-               transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-                 sodipodi:role="line"
-                 id="tspan75321"
-                 x="2557.2061"
-                 y="2906.1316">*</tspan></text>
-            <path
-               id="path75323"
-               style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 465.90628,3024.2653 2.21823,-0.016 2.27115,-1.4201 -2.49315,5.2256 -0.73698,-1.9145 -1.75787,-0.8314 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccc" />
-            <path
-               id="path75325"
-               transform="translate(65.29157,-457.32235)"
-               style="fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 461.46891,3392.7407 0.15609,20.471 -11.88716,19.6776 c 4.87601,-20.9096 7.98356,-30.2545 11.73107,-40.1486 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccc" />
-            <text
-               xml:space="preserve"
-               style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-               x="1894.4528"
-               y="2488.5532"
-               id="text75327"
-               sodipodi:linespacing="125%"
-               transform="matrix(0.88202664,0.23432752,-0.4878438,1.0041474,0,0)"><tspan
-                 sodipodi:role="line"
-                 id="tspan75329"
-                 x="1894.4528"
-                 y="2488.5532">ZABBIX</tspan></text>
+          <g id="g75157">
+            <rect transform="matrix(-2.4361897,0,0,-2.1457317,2117.5945,3465.738)" rx="4.5029464" y="217.21054" x="706.578" height="95.608063" width="52.149849" id="rect75159" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter7993-0-0-7-0-0)"/>
+            <rect style="fill:url(#radialGradient75331);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect75161" width="113.53738" height="208.1519" x="775.00635" y="141.82109" rx="0" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect rx="2.6026535" y="295.92413" x="676.24481" height="15.669449" width="64.079262" id="rect75163" style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)" ry="2.6026535" transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3313.3312)"/>
+            <rect ry="4.3124557" style="fill:url(#linearGradient75333);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect75165" width="106.17586" height="25.963427" x="778.68713" y="314.76581" rx="4.3124557" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect rx="0" y="319.74744" x="792.35138" height="5.1418839" width="78.84758" id="rect75167" style="fill:url(#linearGradient75335);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3344.3545)" ry="2.6026535" style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)" id="rect75169" width="64.079262" height="15.669449" x="676.24481" y="295.92413" rx="2.6026535"/>
+            <rect rx="4.3124557" y="283.28845" x="778.68713" height="25.963427" width="106.17586" id="rect75171" style="fill:url(#linearGradient75337);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect style="fill:url(#linearGradient75339);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect75173" width="78.84758" height="5.1418839" x="792.35138" y="288.27008" rx="0" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3376.2396)" ry="2.6026535" style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)" id="rect75175" width="64.079262" height="15.669449" x="676.24481" y="295.92413" rx="2.6026535"/>
+            <rect rx="4.3124557" y="250.93669" x="778.68713" height="25.963427" width="106.17586" id="rect75177" style="fill:url(#linearGradient75341);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect style="fill:url(#linearGradient75343);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect75179" width="78.84758" height="5.1418839" x="792.35138" y="255.91832" rx="0" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect rx="2.6026535" y="295.92413" x="676.24481" height="15.669449" width="64.079262" id="rect75181" style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)" ry="2.6026535" transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3407.2629)"/>
+            <rect ry="4.3124557" style="fill:url(#linearGradient75345);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect75183" width="106.17586" height="25.963427" x="778.68713" y="219.45934" rx="4.3124557" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect rx="0" y="224.44096" x="792.35138" height="5.1418839" width="78.84758" id="rect75185" style="fill:url(#linearGradient75347);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect rx="2.6026535" y="295.92413" x="676.24481" height="15.669449" width="64.079262" id="rect75187" style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)" ry="2.6026535" transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3438.2863)"/>
+            <rect ry="4.3124557" style="fill:url(#linearGradient75349);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect75189" width="106.17586" height="25.963427" x="778.68713" y="187.98195" rx="4.3124557" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect rx="0" y="192.96358" x="792.35138" height="5.1418839" width="78.84758" id="rect75191" style="fill:url(#linearGradient75351);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect transform="matrix(-1.8541017,0,0,-1.6330439,1645.9444,3469.3096)" ry="2.6026535" style="opacity:0.78026907;fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46966-7)" id="rect75193" width="64.079262" height="15.669449" x="676.24481" y="295.92413" rx="2.6026535"/>
+            <rect rx="4.3124557" y="156.50459" x="778.68713" height="25.963427" width="106.17586" id="rect75195" style="fill:url(#linearGradient75353);fill-opacity:1;fill-rule:nonzero;stroke:none" ry="4.3124557" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <rect style="fill:url(#linearGradient75355);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect75197" width="78.84758" height="5.1418839" x="792.35138" y="161.48622" rx="0" transform="matrix(-1.1189876,0,0,-0.98557481,1263.4589,3139.4376)"/>
+            <path transform="matrix(0.99314524,0,0,1.0733187,65.267577,-704.49343)" sodipodi:nodetypes="cccccccccccccccssccccc" inkscape:connector-curvature="0" d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z" style="opacity:0.66367714;fill:url(#linearGradient75357);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38419-4-6-9)" id="path75199"/>
+            <path transform="translate(65.29157,-457.32235)" id="path75201" style="fill:url(#linearGradient75359);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccssccccc"/>
+            <path id="path75203" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient75361);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 307.375,3465.2117 c 34.26733,14.6434 68.94238,28.0977 107.1495,31.25 l 0,13.2576 c -24.68963,-1.6711 -57.21221,-9.8648 -107.1495,-32.1326 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path75205" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient75363);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 264.81149,3449.3193 c 13.86542,6.1358 27.70227,11.8873 42.69966,15.9856 l -0.13615,10.5803 c -14.35199,-5.2271 -28.43675,-10.9888 -42.56351,-16.6664 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path75207" style="fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 479.81607,3039.13 55.61312,-85.3168 0.12069,3.7129 11.27145,3.1956 0.11249,6.9111 c -15.78066,28.2016 -33.36133,56.1548 -51.96791,82.9432 l -11.73005,-4.0877 -3.4198,5.922 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+            <path id="path75209" style="fill:url(#linearGradient75365);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 484.42913,3039.0198 51.13267,-81.4941 11.24742,3.1931 c -19.93534,34.7618 -36.66883,57.631 -53.38134,80.4223 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path75211" transform="translate(65.29157,-457.32235)" style="fill:#7092a0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 419.09335,3496.342 9.01561,2.1213 1.59099,9.5018 -11.79985,-4.1543 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path75213" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient75367);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 371.32043,3389.7457 98.72881,21.5668 -55.52474,85.14 c -30.80213,-2.2501 -63.39824,-12.2959 -107.1495,-30.8697 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 413.11231,2930.8324 23.59872,1.591 -64.04446,76.036 c -16.39483,-5.1669 -20.93739,-6.7274 -42.59157,-16.4624 l 4.52414,-2.4954 28.21693,8.1501 c 15.92247,-22.9475 32.56027,-45.3226 50.29624,-66.8193 z" style="fill:url(#linearGradient75369);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75215"/>
+            <path id="path75217" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient75371);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 268.34702,3441.718 c 9.42697,6.402 19.55292,9.6953 29.17748,11.1369 l 0,7.9108 c -9.57244,-3.1473 -19.35461,-6.4281 -28.47038,-11.4021 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path75219" transform="translate(65.29157,-457.32235)" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 355.90625,3392.2742 0.71875,8.4375 -13.05822,-1.5672 c 8.45723,-5.9316 9.47905,-5.9157 12.33947,-6.8703 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+            <path id="path75221" style="fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 362.07612,3373.1864 c 10.40456,2.9805 9.17758,8.5477 6.82064,16.4372 l -12.27176,11.0881 -0.73625,-8.4589 c -16.78443,4.7009 -47.00113,40.6402 -46.88307,59.4089 -4.42767,4.02 -6.17212,6.0399 -11.48117,9.0598 l 0,-8.0434 c 17.21489,-35.1342 46.00261,-60.6212 64.55161,-79.4917 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" transform="translate(65.29157,-457.32235)"/>
+            <path id="path75223" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient75373);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 380.25,3374.0867 c 27.40103,3.8438 54.47999,10.8575 81.22097,18.6616 L 449.75,3432.8367 c -24.31091,-12.4836 -57.75432,-20.0723 -93.125,-26 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path75225" transform="translate(65.29157,-457.32235)" style="fill:url(#linearGradient75375);fill-opacity:1;fill-rule:nonzero;stroke:#2a6c98;stroke-opacity:1" d="m 386.5,3383.8367 60,14.5 -6.25,20 -64.5,-16.5 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 421.91657,2951.0144 c 36.67955,5.0391 66.90815,13.8479 91.875,25.25 l -8,11.75 -93.5,-25.75 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75227"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75377);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75229" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(65.29157,-457.57235)"/>
+            <path transform="translate(77.54157,-454.32235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75231" style="fill:url(#linearGradient75379);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75381);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75233" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(91.14657,-450.82235)"/>
+            <path transform="translate(59.79157,-448.82235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75235" style="fill:url(#linearGradient75383);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75385);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75237" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(72.04157,-445.57235)"/>
+            <path transform="translate(85.64657,-442.07235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75239" style="fill:url(#linearGradient75387);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75389);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75241" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(51.69157,-439.02235)"/>
+            <path transform="translate(63.94157,-435.77235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75243" style="fill:url(#linearGradient75391);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75393);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75245" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(77.54657,-432.27235)"/>
+            <path transform="translate(44.66657,-428.27235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75247" style="fill:url(#linearGradient75395);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75397);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75249" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(56.91657,-425.02235)"/>
+            <path transform="translate(70.52157,-421.52235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75251" style="fill:url(#linearGradient75399);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75401);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75253" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(95.77204,-413.02235)"/>
+            <path transform="matrix(0.7,0,0,0.7,176.06657,551.20365)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75255" style="fill:url(#linearGradient75403);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75405);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75257" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,172.06657,556.07865)"/>
+            <path transform="matrix(0.7,0,0,0.7,185.44157,560.07865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75259" style="fill:url(#linearGradient75407);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75409);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75261" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,190.44157,554.82865)"/>
+            <path transform="matrix(0.7,0,0,0.7,206.35957,558.82865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75263" style="fill:url(#linearGradient75411);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75413);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75265" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,202.32204,564.20365)"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75415);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75267" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,218.97857,562.20365)"/>
+            <path transform="matrix(0.7,0,0,0.7,215.74107,567.57865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75269" style="fill:url(#linearGradient75417);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:url(#linearGradient75419);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path75271" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,231.49107,572.07865)"/>
+            <path transform="matrix(0.7,0,0,0.7,235.24107,566.95365)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path75273" style="fill:url(#linearGradient75421);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2508.6321" y="2812.095" id="text75275" sodipodi:linespacing="125%" transform="matrix(1,0.39087979,-0.73785056,0.71158913,0,0)"><tspan sodipodi:role="line" id="tspan75277" x="2508.6321" y="2812.095">1</tspan></text>
+            <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text75279" y="2870.449" x="2564.4163" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2870.449" x="2564.4163" id="tspan75281" sodipodi:role="line">2</tspan></text>
+            <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2577.9075" y="2870.5251" id="text75283" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan75285" x="2577.9075" y="2870.5251">3</tspan></text>
+            <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text75287" y="2880.3496" x="2553.8669" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2880.3496" x="2553.8669" id="tspan75289" sodipodi:role="line">4</tspan></text>
+            <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2566.3687" y="2880.5222" id="text75291" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan75293" x="2566.3687" y="2880.5222">5</tspan></text>
+            <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text75295" y="2880.5984" x="2579.8599" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2880.5984" x="2579.8599" id="tspan75297" sodipodi:role="line">6</tspan></text>
+            <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2554.7546" y="2892.5071" id="text75299" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan75301" x="2554.7546" y="2892.5071">7</tspan></text>
+            <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text75303" y="2892.5483" x="2566.9827" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2892.5483" x="2566.9827" id="tspan75305" sodipodi:role="line">8</tspan></text>
+            <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2581.0466" y="2892.4424" id="text75307" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan75309" x="2581.0466" y="2892.4424">9</tspan></text>
+            <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2569.2244" y="2904.9302" id="text75311" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan75313" x="2569.2244" y="2904.9302">0</tspan></text>
+            <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text75315" y="2904.9153" x="2583.002" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2904.9153" x="2583.002" id="tspan75317" sodipodi:role="line">#</tspan></text>
+            <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2557.2061" y="2906.1316" id="text75319" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan75321" x="2557.2061" y="2906.1316">*</tspan></text>
+            <path id="path75323" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 465.90628,3024.2653 2.21823,-0.016 2.27115,-1.4201 -2.49315,5.2256 -0.73698,-1.9145 -1.75787,-0.8314 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+            <path id="path75325" transform="translate(65.29157,-457.32235)" style="fill:#405a64;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 461.46891,3392.7407 0.15609,20.471 -11.88716,19.6776 c 4.87601,-20.9096 7.98356,-30.2545 11.73107,-40.1486 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+            <text xml:space="preserve" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="1894.4528" y="2488.5532" id="text75327" sodipodi:linespacing="125%" transform="matrix(0.88202664,0.23432752,-0.4878438,1.0041474,0,0)"><tspan sodipodi:role="line" id="tspan75329" x="1894.4528" y="2488.5532">ZABBIX</tspan></text>
           </g>
         </g>
       </g>
diff --git a/misc/images/svg/elements/Phone.svg b/misc/images/svg/elements/Phone.svg
index 210274e84d7..3fdcf32ad7f 100644
--- a/misc/images/svg/elements/Phone.svg
+++ b/misc/images/svg/elements/Phone.svg
@@ -1,1240 +1,241 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="93.374268"
-   id="svg135041"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 20">
-  <defs
-     id="defs135043">
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter38419-4-6-0">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.7694005"
-         id="feGaussianBlur38421-6-0-6" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="93.374268" id="svg135041" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 20">
+  <defs id="defs135043">
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter38419-4-6-0">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="4.7694005" id="feGaussianBlur38421-6-0-6"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2-6"
-       id="linearGradient153305"
-       gradientUnits="userSpaceOnUse"
-       x1="264.81149"
-       y1="3440.2717"
-       x2="481.61218"
-       y2="3440.2717" />
-    <linearGradient
-       id="linearGradient45664-2-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45666-0-3" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45668-4-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2-6"
-       id="linearGradient153307"
-       gradientUnits="userSpaceOnUse"
-       x1="261.08292"
-       y1="3436.8167"
-       x2="371.50009"
-       y2="3503.804" />
-    <linearGradient
-       id="linearGradient134772">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134774" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134776" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2-6"
-       id="linearGradient153309"
-       gradientUnits="userSpaceOnUse"
-       x1="224.51013"
-       y1="3438.6394"
-       x2="310.77881"
-       y2="3470.2268" />
-    <linearGradient
-       id="linearGradient134779">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134781" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134783" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45657-4-0"
-       id="linearGradient153311"
-       gradientUnits="userSpaceOnUse"
-       x1="499.38858"
-       y1="3030.9595"
-       x2="557.47589"
-       y2="2944.1663" />
-    <linearGradient
-       id="linearGradient45657-4-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45659-8-8" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45661-6-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45664-2-6"
-       id="linearGradient153313"
-       gradientUnits="userSpaceOnUse"
-       x1="383.04486"
-       y1="3478.7351"
-       x2="429.69995"
-       y2="3502.1536" />
-    <linearGradient
-       id="linearGradient134790">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134792" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134794" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39579-9-7"
-       id="linearGradient153315"
-       gradientUnits="userSpaceOnUse"
-       x1="255.00148"
-       y1="3447.7202"
-       x2="470.04922"
-       y2="3443.0991" />
-    <linearGradient
-       id="linearGradient39579-9-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39581-2-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39583-4-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient39663-2-0"
-       id="linearGradient153317"
-       gradientUnits="userSpaceOnUse"
-       x1="407.95468"
-       y1="2968.5569"
-       x2="393.68661"
-       y2="2941.3262" />
-    <linearGradient
-       id="linearGradient39663-2-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop39665-0-5" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop39667-4-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient45643-9-0"
-       id="linearGradient153319"
-       gradientUnits="userSpaceOnUse"
-       x1="249.83018"
-       y1="3437.0818"
-       x2="297.52451"
-       y2="3451.2417" />
-    <linearGradient
-       id="linearGradient45643-9-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop45645-6-7" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop45647-1-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-8-0-7-6"
-       id="linearGradient153321"
-       gradientUnits="userSpaceOnUse"
-       x1="414.52451"
-       y1="3362.4617"
-       x2="403.10547"
-       y2="3417.4617" />
-    <linearGradient
-       id="linearGradient4781-3-8-0-7-6">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2-9-8-3-8" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5-0-4-5-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37431-0-0-9"
-       id="linearGradient153323"
-       gradientUnits="userSpaceOnUse"
-       x1="403.10547"
-       y1="3373.5867"
-       x2="477"
-       y2="3459.5867" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient37431-0-0-9">
-      <stop
-         style="stop-color:#008888;stop-opacity:1;"
-         offset="0"
-         id="stop37433-3-8-4" />
-      <stop
-         style="stop-color:#008888;stop-opacity:0;"
-         offset="1"
-         id="stop37435-5-3-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153325"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient37235-2-6-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37237-7-3-8" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop37239-7-60-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153327"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134821">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134823" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134825" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153329"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134828">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134830" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134832" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153331"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134835">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134837" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134839" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153333"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134842">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134844" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134846" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153335"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134849">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134851" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134853" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153337"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134856">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134858" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134860" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153339"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134863">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134865" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134867" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153341"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134870">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134872" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134874" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153343"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134877">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134879" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134881" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153345"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134884">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134886" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134888" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153347"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134891">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134893" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134895" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153349"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134898">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134900" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134902" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153351"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134905">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134907" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134909" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153353"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134912">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134914" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134916" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153355"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134919">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134921" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134923" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153357"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134926">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134928" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134930" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153359"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134933">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134935" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134937" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153361"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134940">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134942" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134944" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153363"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134947">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134949" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134951" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153365"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134954">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134956" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134958" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153367"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134961">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134963" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134965" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37235-2-6-0"
-       id="linearGradient153369"
-       gradientUnits="userSpaceOnUse"
-       x1="371.875"
-       y1="3435.3367"
-       x2="375.875"
-       y2="3443.5867" />
-    <linearGradient
-       id="linearGradient134968">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop134970" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop134972" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2-6" id="linearGradient153305" gradientUnits="userSpaceOnUse" x1="264.81149" y1="3440.2717" x2="481.61218" y2="3440.2717"/>
+    <linearGradient id="linearGradient45664-2-6">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45666-0-3"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45668-4-4"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2-6" id="linearGradient153307" gradientUnits="userSpaceOnUse" x1="261.08292" y1="3436.8167" x2="371.50009" y2="3503.804"/>
+    <linearGradient id="linearGradient134772">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134774"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134776"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2-6" id="linearGradient153309" gradientUnits="userSpaceOnUse" x1="224.51013" y1="3438.6394" x2="310.77881" y2="3470.2268"/>
+    <linearGradient id="linearGradient134779">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134781"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134783"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45657-4-0" id="linearGradient153311" gradientUnits="userSpaceOnUse" x1="499.38858" y1="3030.9595" x2="557.47589" y2="2944.1663"/>
+    <linearGradient id="linearGradient45657-4-0">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45659-8-8"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45661-6-3"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45664-2-6" id="linearGradient153313" gradientUnits="userSpaceOnUse" x1="383.04486" y1="3478.7351" x2="429.69995" y2="3502.1536"/>
+    <linearGradient id="linearGradient134790">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134792"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134794"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient39579-9-7" id="linearGradient153315" gradientUnits="userSpaceOnUse" x1="255.00148" y1="3447.7202" x2="470.04922" y2="3443.0991"/>
+    <linearGradient id="linearGradient39579-9-7">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39581-2-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39583-4-6"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient39663-2-0" id="linearGradient153317" gradientUnits="userSpaceOnUse" x1="407.95468" y1="2968.5569" x2="393.68661" y2="2941.3262"/>
+    <linearGradient id="linearGradient39663-2-0">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop39665-0-5"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop39667-4-2"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient45643-9-0" id="linearGradient153319" gradientUnits="userSpaceOnUse" x1="249.83018" y1="3437.0818" x2="297.52451" y2="3451.2417"/>
+    <linearGradient id="linearGradient45643-9-0">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop45645-6-7"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop45647-1-3"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-8-0-7-6" id="linearGradient153321" gradientUnits="userSpaceOnUse" x1="414.52451" y1="3362.4617" x2="403.10547" y2="3417.4617"/>
+    <linearGradient id="linearGradient4781-3-8-0-7-6">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2-9-8-3-8"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5-0-4-5-7"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37431-0-0-9" id="linearGradient153323" gradientUnits="userSpaceOnUse" x1="403.10547" y1="3373.5867" x2="477" y2="3459.5867"/>
+    <linearGradient inkscape:collect="always" id="linearGradient37431-0-0-9">
+      <stop style="stop-color:#008888;stop-opacity:1;" offset="0" id="stop37433-3-8-4"/>
+      <stop style="stop-color:#008888;stop-opacity:0;" offset="1" id="stop37435-5-3-8"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153325" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient37235-2-6-0">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop37237-7-3-8"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop37239-7-60-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153327" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134821">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134823"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134825"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153329" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134828">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134830"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134832"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153331" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134835">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134837"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134839"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153333" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134842">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134844"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134846"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153335" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134849">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134851"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134853"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153337" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134856">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134858"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134860"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153339" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134863">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134865"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134867"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153341" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134870">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134872"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134874"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153343" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134877">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134879"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134881"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153345" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134884">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134886"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134888"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153347" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134891">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134893"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134895"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153349" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134898">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134900"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134902"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153351" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134905">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134907"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134909"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153353" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134912">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134914"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134916"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153355" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134919">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134921"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134923"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153357" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134926">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134928"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134930"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153359" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134933">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134935"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134937"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153361" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134940">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134942"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134944"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153363" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134947">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134949"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134951"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153365" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134954">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134956"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134958"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153367" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134961">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134963"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134965"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient37235-2-6-0" id="linearGradient153369" gradientUnits="userSpaceOnUse" x1="371.875" y1="3435.3367" x2="375.875" y2="3443.5867"/>
+    <linearGradient id="linearGradient134968">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop134970"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop134972"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="196.14286"
-     inkscape:cy="-101.88427"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="132"
-     inkscape:window-y="174"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata135046">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="196.14286" inkscape:cy="-101.88427" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="132" inkscape:window-y="174" inkscape:window-maximized="0"/>
+  <metadata id="metadata135046">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-178.85714,-337.10364)">
-    <g
-       style="display:inline"
-       transform="matrix(0.5377004,0,0,0.5377004,8.4621718,-1222.8658)"
-       id="g150359"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Phone.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         id="path150361"
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38419-4-6-0)"
-         d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccssccccc"
-         transform="matrix(0.99314524,0,0,1.0733187,65.267577,-704.49343)" />
-      <path
-         transform="translate(65.29157,-457.32235)"
-         sodipodi:nodetypes="cccccccccccccccssccccc"
-         inkscape:connector-curvature="0"
-         d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z"
-         style="fill:url(#linearGradient153305);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150363" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 307.375,3465.2117 c 34.26733,14.6434 68.94238,28.0977 107.1495,31.25 l 0,13.2576 c -24.68963,-1.6711 -57.21221,-9.8648 -107.1495,-32.1326 z"
-         style="fill:url(#linearGradient153307);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150365" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 264.81149,3449.3193 c 13.86542,6.1358 27.70227,11.8873 42.69966,15.9856 l -0.13615,10.5803 c -14.35199,-5.2271 -28.43675,-10.9888 -42.56351,-16.6664 z"
-         style="fill:url(#linearGradient153309);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150367" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 479.81607,3039.13 55.61312,-85.3168 0.12069,3.7129 11.27145,3.1956 0.11249,6.9111 c -15.78066,28.2016 -33.36133,56.1548 -51.96791,82.9432 l -11.73005,-4.0877 -3.4198,5.922 z"
-         style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150369" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 484.42913,3039.0198 51.13267,-81.4941 11.24742,3.1931 c -19.93534,34.7618 -36.66883,57.631 -53.38134,80.4223 z"
-         style="fill:url(#linearGradient153311);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150371" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 419.09335,3496.342 9.01561,2.1213 1.59099,9.5018 -11.79985,-4.1543 z"
-         style="fill:url(#linearGradient153313);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150373" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 371.32043,3389.7457 98.72881,21.5668 -55.52474,85.14 c -30.80213,-2.2501 -63.39824,-12.2959 -107.1495,-30.8697 z"
-         style="fill:url(#linearGradient153315);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150375" />
-      <path
-         id="path150377"
-         style="fill:url(#linearGradient153317);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 413.11231,2930.8324 23.59872,1.591 -64.04446,76.036 c -16.39483,-5.1669 -20.93739,-6.7274 -42.59157,-16.4624 l 4.52414,-2.4954 28.21693,8.1501 c 15.92247,-22.9475 32.56027,-45.3226 50.29624,-66.8193 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 268.34702,3441.718 c 9.42697,6.402 19.55292,9.6953 29.17748,11.1369 l 0,7.9108 c -9.57244,-3.1473 -19.35461,-6.4281 -28.47038,-11.4021 z"
-         style="fill:url(#linearGradient153319);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150379" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         d="m 355.90625,3392.2742 0.71875,8.4375 -13.05822,-1.5672 c 8.45723,-5.9316 9.47905,-5.9157 12.33947,-6.8703 z"
-         style="fill:#27343c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150381" />
-      <path
-         transform="translate(65.29157,-457.32235)"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 362.07612,3373.1864 c 10.40456,2.9805 9.17758,8.5477 6.82064,16.4372 l -12.27176,11.0881 -0.73625,-8.4589 c -16.78443,4.7009 -47.00113,40.6402 -46.88307,59.4089 -4.42767,4.02 -6.17212,6.0399 -11.48117,9.0598 l 0,-8.0434 c 17.21489,-35.1342 46.00261,-60.6212 64.55161,-79.4917 z"
-         style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150383" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 380.25,3374.0867 c 27.40103,3.8438 54.47999,10.8575 81.22097,18.6616 L 449.75,3432.8367 c -24.31091,-12.4836 -57.75432,-20.0723 -93.125,-26 z"
-         style="fill:url(#linearGradient153321);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150385" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 386.5,3383.8367 60,14.5 -6.25,20 -64.5,-16.5 z"
-         style="fill:url(#linearGradient153323);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150387" />
-      <path
-         id="path150389"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 421.91657,2951.0144 c 36.67955,5.0391 66.90815,13.8479 91.875,25.25 l -8,11.75 -93.5,-25.75 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         transform="translate(65.29157,-457.57235)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150391"
-         style="fill:url(#linearGradient153325);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153327);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150393"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="translate(77.54157,-454.32235)" />
-      <path
-         transform="translate(91.14657,-450.82235)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150395"
-         style="fill:url(#linearGradient153329);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153331);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150397"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="translate(59.79157,-448.82235)" />
-      <path
-         transform="translate(72.04157,-445.57235)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150399"
-         style="fill:url(#linearGradient153333);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153335);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150401"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="translate(85.64657,-442.07235)" />
-      <path
-         transform="translate(51.69157,-439.02235)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150403"
-         style="fill:url(#linearGradient153337);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153339);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150405"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="translate(63.94157,-435.77235)" />
-      <path
-         transform="translate(77.54657,-432.27235)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150407"
-         style="fill:url(#linearGradient153341);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153343);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150409"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="translate(44.66657,-428.27235)" />
-      <path
-         transform="translate(56.91657,-425.02235)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150411"
-         style="fill:url(#linearGradient153345);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153347);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150413"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="translate(70.52157,-421.52235)" />
-      <path
-         transform="translate(95.77204,-413.02235)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150415"
-         style="fill:url(#linearGradient153349);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153351);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150417"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="matrix(0.7,0,0,0.7,176.06657,551.20365)" />
-      <path
-         transform="matrix(0.7,0,0,0.7,172.06657,556.07865)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150419"
-         style="fill:url(#linearGradient153353);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153355);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150421"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="matrix(0.7,0,0,0.7,185.44157,560.07865)" />
-      <path
-         transform="matrix(0.7,0,0,0.7,190.44157,554.82865)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150423"
-         style="fill:url(#linearGradient153357);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153359);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150425"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="matrix(0.7,0,0,0.7,206.35957,558.82865)" />
-      <path
-         transform="matrix(0.7,0,0,0.7,202.32204,564.20365)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150427"
-         style="fill:url(#linearGradient153361);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.7,0,0,0.7,218.97857,562.20365)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150429"
-         style="fill:url(#linearGradient153363);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153365);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150431"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="matrix(0.7,0,0,0.7,215.74107,567.57865)" />
-      <path
-         transform="matrix(0.7,0,0,0.7,231.49107,572.07865)"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         sodipodi:ry="3.125"
-         sodipodi:rx="4.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:cx="372.625"
-         id="path150433"
-         style="fill:url(#linearGradient153367);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient153369);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150435"
-         sodipodi:cx="372.625"
-         sodipodi:cy="3438.2117"
-         sodipodi:rx="4.625"
-         sodipodi:ry="3.125"
-         d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z"
-         transform="matrix(0.7,0,0,0.7,235.24107,566.95365)" />
-      <text
-         transform="matrix(1,0.39087979,-0.73785056,0.71158913,0,0)"
-         sodipodi:linespacing="125%"
-         id="text150437"
-         y="2812.095"
-         x="2508.6321"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="2812.095"
-           x="2508.6321"
-           id="tspan150439"
-           sodipodi:role="line">1</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         x="2564.4163"
-         y="2870.449"
-         id="text150441"
-         sodipodi:linespacing="125%"
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-           sodipodi:role="line"
-           id="tspan150443"
-           x="2564.4163"
-           y="2870.449">2</tspan></text>
-      <text
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-         sodipodi:linespacing="125%"
-         id="text150445"
-         y="2870.5251"
-         x="2577.9075"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="2870.5251"
-           x="2577.9075"
-           id="tspan150447"
-           sodipodi:role="line">3</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         x="2553.8669"
-         y="2880.3496"
-         id="text150449"
-         sodipodi:linespacing="125%"
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-           sodipodi:role="line"
-           id="tspan150451"
-           x="2553.8669"
-           y="2880.3496">4</tspan></text>
-      <text
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-         sodipodi:linespacing="125%"
-         id="text150453"
-         y="2880.5222"
-         x="2566.3687"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="2880.5222"
-           x="2566.3687"
-           id="tspan150455"
-           sodipodi:role="line">5</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         x="2579.8599"
-         y="2880.5984"
-         id="text150457"
-         sodipodi:linespacing="125%"
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-           sodipodi:role="line"
-           id="tspan150459"
-           x="2579.8599"
-           y="2880.5984">6</tspan></text>
-      <text
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-         sodipodi:linespacing="125%"
-         id="text150461"
-         y="2892.5071"
-         x="2554.7546"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="2892.5071"
-           x="2554.7546"
-           id="tspan150463"
-           sodipodi:role="line">7</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         x="2566.9827"
-         y="2892.5483"
-         id="text150465"
-         sodipodi:linespacing="125%"
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-           sodipodi:role="line"
-           id="tspan150467"
-           x="2566.9827"
-           y="2892.5483">8</tspan></text>
-      <text
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-         sodipodi:linespacing="125%"
-         id="text150469"
-         y="2892.4424"
-         x="2581.0466"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="2892.4424"
-           x="2581.0466"
-           id="tspan150471"
-           sodipodi:role="line">9</tspan></text>
-      <text
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-         sodipodi:linespacing="125%"
-         id="text150473"
-         y="2904.9302"
-         x="2569.2244"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="2904.9302"
-           x="2569.2244"
-           id="tspan150475"
-           sodipodi:role="line">0</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         x="2583.002"
-         y="2904.9153"
-         id="text150477"
-         sodipodi:linespacing="125%"
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan
-           sodipodi:role="line"
-           id="tspan150479"
-           x="2583.002"
-           y="2904.9153">#</tspan></text>
-      <text
-         transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"
-         sodipodi:linespacing="125%"
-         id="text150481"
-         y="2906.1316"
-         x="2557.2061"
-         style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="2906.1316"
-           x="2557.2061"
-           id="tspan150483"
-           sodipodi:role="line">*</tspan></text>
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         d="m 465.90628,3024.2653 2.21823,-0.016 2.27115,-1.4201 -2.49315,5.2256 -0.73698,-1.9145 -1.75787,-0.8314 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150485" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         d="m 461.46891,3392.7407 0.15609,20.471 -11.88716,19.6776 c 4.87601,-20.9096 7.98356,-30.2545 11.73107,-40.1486 z"
-         style="fill:#6b7377;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="translate(65.29157,-457.32235)"
-         id="path150487" />
-      <text
-         transform="matrix(0.88202664,0.23432752,-0.4878438,1.0041474,0,0)"
-         sodipodi:linespacing="125%"
-         id="text150489"
-         y="2488.5532"
-         x="1894.4528"
-         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="2488.5532"
-           x="1894.4528"
-           id="tspan150491"
-           sodipodi:role="line">ZABBIX</tspan></text>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-178.85714,-337.10364)">
+    <g style="display:inline" transform="matrix(0.5377004,0,0,0.5377004,8.4621718,-1222.8658)" id="g150359">
+      <path id="path150361" style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter38419-4-6-0)" d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccssccccc" transform="matrix(0.99314524,0,0,1.0733187,65.267577,-704.49343)"/>
+      <path transform="translate(65.29157,-457.32235)" sodipodi:nodetypes="cccccccccccccccssccccc" inkscape:connector-curvature="0" d="m 297.5245,3402.1841 c 13.01216,-14.3448 22.24208,-28.4187 40.13241,-30.9958 9.90135,-0.2088 22.10539,-2.2686 31.49522,6.2592 1.73321,3.4893 1.13076,8.3536 -0.30188,12.343 l 2.88994,0.1733 9.3979,-15.5695 c 32.49735,5.4543 57.77763,11.6542 80.33472,18.4339 l -0.77242,16.873 9.32524,1.7243 0.23564,3.416 11.23088,3.2417 0.12004,6.9229 c -15.41593,27.5499 -32.41438,55.0997 -52.4858,82.6496 l -11.23083,-3.8735 -3.37106,5.9391 c -36.17177,-3.0598 -71.19553,-16.5945 -106.40688,-31.6595 -1.79262,-0.767 0.40413,-1.8139 -1.45073,-2.4628 -12.59731,-4.4071 -29.27315,-11.4014 -41.8554,-16.3801 l 0,-9.3822 4.01517,-2.4848 -0.57396,-6.5154 c 9.39813,-13.0038 18.02329,-26.2653 29.2718,-38.6524 z" style="fill:url(#linearGradient153305);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150363"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 307.375,3465.2117 c 34.26733,14.6434 68.94238,28.0977 107.1495,31.25 l 0,13.2576 c -24.68963,-1.6711 -57.21221,-9.8648 -107.1495,-32.1326 z" style="fill:url(#linearGradient153307);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150365"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 264.81149,3449.3193 c 13.86542,6.1358 27.70227,11.8873 42.69966,15.9856 l -0.13615,10.5803 c -14.35199,-5.2271 -28.43675,-10.9888 -42.56351,-16.6664 z" style="fill:url(#linearGradient153309);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150367"/>
+      <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" d="m 479.81607,3039.13 55.61312,-85.3168 0.12069,3.7129 11.27145,3.1956 0.11249,6.9111 c -15.78066,28.2016 -33.36133,56.1548 -51.96791,82.9432 l -11.73005,-4.0877 -3.4198,5.922 z" style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150369"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 484.42913,3039.0198 51.13267,-81.4941 11.24742,3.1931 c -19.93534,34.7618 -36.66883,57.631 -53.38134,80.4223 z" style="fill:url(#linearGradient153311);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150371"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 419.09335,3496.342 9.01561,2.1213 1.59099,9.5018 -11.79985,-4.1543 z" style="fill:url(#linearGradient153313);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150373"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 371.32043,3389.7457 98.72881,21.5668 -55.52474,85.14 c -30.80213,-2.2501 -63.39824,-12.2959 -107.1495,-30.8697 z" style="fill:url(#linearGradient153315);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150375"/>
+      <path id="path150377" style="fill:url(#linearGradient153317);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 413.11231,2930.8324 23.59872,1.591 -64.04446,76.036 c -16.39483,-5.1669 -20.93739,-6.7274 -42.59157,-16.4624 l 4.52414,-2.4954 28.21693,8.1501 c 15.92247,-22.9475 32.56027,-45.3226 50.29624,-66.8193 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 268.34702,3441.718 c 9.42697,6.402 19.55292,9.6953 29.17748,11.1369 l 0,7.9108 c -9.57244,-3.1473 -19.35461,-6.4281 -28.47038,-11.4021 z" style="fill:url(#linearGradient153319);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150379"/>
+      <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" d="m 355.90625,3392.2742 0.71875,8.4375 -13.05822,-1.5672 c 8.45723,-5.9316 9.47905,-5.9157 12.33947,-6.8703 z" style="fill:#27343c;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150381"/>
+      <path transform="translate(65.29157,-457.32235)" sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 362.07612,3373.1864 c 10.40456,2.9805 9.17758,8.5477 6.82064,16.4372 l -12.27176,11.0881 -0.73625,-8.4589 c -16.78443,4.7009 -47.00113,40.6402 -46.88307,59.4089 -4.42767,4.02 -6.17212,6.0399 -11.48117,9.0598 l 0,-8.0434 c 17.21489,-35.1342 46.00261,-60.6212 64.55161,-79.4917 z" style="fill:#858d91;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150383"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 380.25,3374.0867 c 27.40103,3.8438 54.47999,10.8575 81.22097,18.6616 L 449.75,3432.8367 c -24.31091,-12.4836 -57.75432,-20.0723 -93.125,-26 z" style="fill:url(#linearGradient153321);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150385"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 386.5,3383.8367 60,14.5 -6.25,20 -64.5,-16.5 z" style="fill:url(#linearGradient153323);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150387"/>
+      <path id="path150389" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 421.91657,2951.0144 c 36.67955,5.0391 66.90815,13.8479 91.875,25.25 l -8,11.75 -93.5,-25.75 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path transform="translate(65.29157,-457.57235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150391" style="fill:url(#linearGradient153325);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153327);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150393" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(77.54157,-454.32235)"/>
+      <path transform="translate(91.14657,-450.82235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150395" style="fill:url(#linearGradient153329);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153331);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150397" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(59.79157,-448.82235)"/>
+      <path transform="translate(72.04157,-445.57235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150399" style="fill:url(#linearGradient153333);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153335);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150401" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(85.64657,-442.07235)"/>
+      <path transform="translate(51.69157,-439.02235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150403" style="fill:url(#linearGradient153337);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153339);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150405" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(63.94157,-435.77235)"/>
+      <path transform="translate(77.54657,-432.27235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150407" style="fill:url(#linearGradient153341);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153343);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150409" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(44.66657,-428.27235)"/>
+      <path transform="translate(56.91657,-425.02235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150411" style="fill:url(#linearGradient153345);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153347);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150413" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="translate(70.52157,-421.52235)"/>
+      <path transform="translate(95.77204,-413.02235)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150415" style="fill:url(#linearGradient153349);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153351);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150417" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,176.06657,551.20365)"/>
+      <path transform="matrix(0.7,0,0,0.7,172.06657,556.07865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150419" style="fill:url(#linearGradient153353);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153355);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150421" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,185.44157,560.07865)"/>
+      <path transform="matrix(0.7,0,0,0.7,190.44157,554.82865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150423" style="fill:url(#linearGradient153357);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153359);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150425" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,206.35957,558.82865)"/>
+      <path transform="matrix(0.7,0,0,0.7,202.32204,564.20365)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150427" style="fill:url(#linearGradient153361);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(0.7,0,0,0.7,218.97857,562.20365)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150429" style="fill:url(#linearGradient153363);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153365);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150431" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,215.74107,567.57865)"/>
+      <path transform="matrix(0.7,0,0,0.7,231.49107,572.07865)" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" sodipodi:ry="3.125" sodipodi:rx="4.625" sodipodi:cy="3438.2117" sodipodi:cx="372.625" id="path150433" style="fill:url(#linearGradient153367);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient153369);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150435" sodipodi:cx="372.625" sodipodi:cy="3438.2117" sodipodi:rx="4.625" sodipodi:ry="3.125" d="m 377.25,3438.2117 c 0,1.7259 -2.07068,3.125 -4.625,3.125 -2.55432,0 -4.625,-1.3991 -4.625,-3.125 0,-1.7259 2.07068,-3.125 4.625,-3.125 2.55432,0 4.625,1.3991 4.625,3.125 z" transform="matrix(0.7,0,0,0.7,235.24107,566.95365)"/>
+      <text transform="matrix(1,0.39087979,-0.73785056,0.71158913,0,0)" sodipodi:linespacing="125%" id="text150437" y="2812.095" x="2508.6321" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2812.095" x="2508.6321" id="tspan150439" sodipodi:role="line">1</tspan></text>
+      <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2564.4163" y="2870.449" id="text150441" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan150443" x="2564.4163" y="2870.449">2</tspan></text>
+      <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text150445" y="2870.5251" x="2577.9075" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2870.5251" x="2577.9075" id="tspan150447" sodipodi:role="line">3</tspan></text>
+      <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2553.8669" y="2880.3496" id="text150449" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan150451" x="2553.8669" y="2880.3496">4</tspan></text>
+      <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text150453" y="2880.5222" x="2566.3687" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2880.5222" x="2566.3687" id="tspan150455" sodipodi:role="line">5</tspan></text>
+      <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2579.8599" y="2880.5984" id="text150457" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan150459" x="2579.8599" y="2880.5984">6</tspan></text>
+      <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text150461" y="2892.5071" x="2554.7546" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2892.5071" x="2554.7546" id="tspan150463" sodipodi:role="line">7</tspan></text>
+      <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2566.9827" y="2892.5483" id="text150465" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan150467" x="2566.9827" y="2892.5483">8</tspan></text>
+      <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text150469" y="2892.4424" x="2581.0466" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2892.4424" x="2581.0466" id="tspan150471" sodipodi:role="line">9</tspan></text>
+      <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text150473" y="2904.9302" x="2569.2244" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2904.9302" x="2569.2244" id="tspan150475" sodipodi:role="line">0</tspan></text>
+      <text xml:space="preserve" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="2583.002" y="2904.9153" id="text150477" sodipodi:linespacing="125%" transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)"><tspan sodipodi:role="line" id="tspan150479" x="2583.002" y="2904.9153">#</tspan></text>
+      <text transform="matrix(1,0.25748665,-0.73785056,0.81001333,0,0)" sodipodi:linespacing="125%" id="text150481" y="2906.1316" x="2557.2061" style="font-size:6.83504629px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2906.1316" x="2557.2061" id="tspan150483" sodipodi:role="line">*</tspan></text>
+      <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 465.90628,3024.2653 2.21823,-0.016 2.27115,-1.4201 -2.49315,5.2256 -0.73698,-1.9145 -1.75787,-0.8314 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150485"/>
+      <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" d="m 461.46891,3392.7407 0.15609,20.471 -11.88716,19.6776 c 4.87601,-20.9096 7.98356,-30.2545 11.73107,-40.1486 z" style="fill:#6b7377;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(65.29157,-457.32235)" id="path150487"/>
+      <text transform="matrix(0.88202664,0.23432752,-0.4878438,1.0041474,0,0)" sodipodi:linespacing="125%" id="text150489" y="2488.5532" x="1894.4528" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2488.5532" x="1894.4528" id="tspan150491" sodipodi:role="line">ZABBIX</tspan></text>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Printer.svg b/misc/images/svg/elements/Printer.svg
index 6f5c20703f5..373e2d508e7 100644
--- a/misc/images/svg/elements/Printer.svg
+++ b/misc/images/svg/elements/Printer.svg
@@ -1,560 +1,128 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="127.99999"
-   height="119.29203"
-   id="svg135659"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Printer.svg">
-  <defs
-     id="defs135661">
-    <filter
-       inkscape:collect="always"
-       id="filter76760-6"
-       x="-0.041678306"
-       width="1.0833566"
-       y="-0.13272315"
-       height="1.2654463"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.0207789"
-         id="feGaussianBlur76762-1" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="127.99999" height="119.29203" id="svg135659" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="Printer.svg">
+  <defs id="defs135661">
+    <filter inkscape:collect="always" id="filter76760-6" x="-0.041678306" width="1.0833566" y="-0.13272315" height="1.2654463" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="3.0207789" id="feGaussianBlur76762-1"/>
     </filter>
-    <linearGradient
-       y2="7304.1592"
-       x2="443.70435"
-       y1="7314.8599"
-       x1="443.70435"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient69341-8"
-       xlink:href="#linearGradient76812-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient76812-4">
-      <stop
-         id="stop76814-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop76816-6" />
-      <stop
-         id="stop76818-3"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient y2="7304.1592" x2="443.70435" y1="7314.8599" x1="443.70435" gradientUnits="userSpaceOnUse" id="linearGradient69341-8" xlink:href="#linearGradient76812-4" inkscape:collect="always"/>
+    <linearGradient id="linearGradient76812-4">
+      <stop id="stop76814-9" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.61109358" id="stop76816-6"/>
+      <stop id="stop76818-3" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter76754-7"
-       x="-0.041822508"
-       width="1.083645"
-       y="-0.51368457"
-       height="2.0273693"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.1241809"
-         id="feGaussianBlur76756-8" />
+    <filter inkscape:collect="always" id="filter76754-7" x="-0.041822508" width="1.083645" y="-0.51368457" height="2.0273693" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="4.1241809" id="feGaussianBlur76756-8"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76598-2"
-       id="linearGradient40342-8"
-       gradientUnits="userSpaceOnUse"
-       x1="460.97647"
-       y1="7136.0518"
-       x2="462.45685"
-       y2="7371.2422" />
-    <linearGradient
-       id="linearGradient76598-2">
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:1;"
-         offset="0"
-         id="stop76600-9" />
-      <stop
-         style="stop-color:#5a5a5a;stop-opacity:1;"
-         offset="1"
-         id="stop76602-1" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76598-2" id="linearGradient40342-8" gradientUnits="userSpaceOnUse" x1="460.97647" y1="7136.0518" x2="462.45685" y2="7371.2422"/>
+    <linearGradient id="linearGradient76598-2">
+      <stop style="stop-color:#f9f9f9;stop-opacity:1;" offset="0" id="stop76600-9"/>
+      <stop style="stop-color:#5a5a5a;stop-opacity:1;" offset="1" id="stop76602-1"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76704-5"
-       id="linearGradient40344-3"
-       gradientUnits="userSpaceOnUse"
-       x1="355.10181"
-       y1="7299.9707"
-       x2="355.76944"
-       y2="7236.9707" />
-    <linearGradient
-       id="linearGradient76704-5">
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0"
-         id="stop76706-9" />
-      <stop
-         style="stop-color:#d6d6d6;stop-opacity:1;"
-         offset="1"
-         id="stop76708-8" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76704-5" id="linearGradient40344-3" gradientUnits="userSpaceOnUse" x1="355.10181" y1="7299.9707" x2="355.76944" y2="7236.9707"/>
+    <linearGradient id="linearGradient76704-5">
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0" id="stop76706-9"/>
+      <stop style="stop-color:#d6d6d6;stop-opacity:1;" offset="1" id="stop76708-8"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76606-0"
-       id="linearGradient40346-4"
-       gradientUnits="userSpaceOnUse"
-       x1="378.5"
-       y1="7283.9736"
-       x2="378.5"
-       y2="7253.7314" />
-    <linearGradient
-       id="linearGradient76606-0">
-      <stop
-         style="stop-color:#1d1e1e;stop-opacity:1;"
-         offset="0"
-         id="stop76608-7" />
-      <stop
-         style="stop-color:#c1c3c3;stop-opacity:1;"
-         offset="1"
-         id="stop76610-6" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76606-0" id="linearGradient40346-4" gradientUnits="userSpaceOnUse" x1="378.5" y1="7283.9736" x2="378.5" y2="7253.7314"/>
+    <linearGradient id="linearGradient76606-0">
+      <stop style="stop-color:#1d1e1e;stop-opacity:1;" offset="0" id="stop76608-7"/>
+      <stop style="stop-color:#c1c3c3;stop-opacity:1;" offset="1" id="stop76610-6"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40094-6"
-       id="linearGradient40348-3"
-       gradientUnits="userSpaceOnUse"
-       x1="337.74893"
-       y1="7269.7163"
-       x2="337.74893"
-       y2="7229.0669" />
-    <linearGradient
-       id="linearGradient40094-6">
-      <stop
-         id="stop40096-1"
-         offset="0"
-         style="stop-color:#2d2d2d;stop-opacity:1;" />
-      <stop
-         id="stop40098-5"
-         offset="1"
-         style="stop-color:#f5f5f5;stop-opacity:0.27450982;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40094-6" id="linearGradient40348-3" gradientUnits="userSpaceOnUse" x1="337.74893" y1="7269.7163" x2="337.74893" y2="7229.0669"/>
+    <linearGradient id="linearGradient40094-6">
+      <stop id="stop40096-1" offset="0" style="stop-color:#2d2d2d;stop-opacity:1;"/>
+      <stop id="stop40098-5" offset="1" style="stop-color:#f5f5f5;stop-opacity:0.27450982;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76812-4"
-       id="linearGradient40340-4"
-       gradientUnits="userSpaceOnUse"
-       x1="443.70435"
-       y1="7314.8599"
-       x2="443.70435"
-       y2="7304.1592" />
-    <linearGradient
-       id="linearGradient135492">
-      <stop
-         id="stop135494"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop135496" />
-      <stop
-         id="stop135498"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76812-4" id="linearGradient40340-4" gradientUnits="userSpaceOnUse" x1="443.70435" y1="7314.8599" x2="443.70435" y2="7304.1592"/>
+    <linearGradient id="linearGradient135492">
+      <stop id="stop135494" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.61109358" id="stop135496"/>
+      <stop id="stop135498" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76670-0"
-       id="linearGradient40350-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98898122,0,0,0.6650889,69.670762,2428.3565)"
-       x1="375.6521"
-       y1="7217.8555"
-       x2="375.6521"
-       y2="7191.9053" />
-    <linearGradient
-       id="linearGradient76670-0">
-      <stop
-         id="stop76672-9"
-         offset="0"
-         style="stop-color:#c0c0c0;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dfdfdf;stop-opacity:1;"
-         offset="0.35685185"
-         id="stop76674-7" />
-      <stop
-         id="stop76676-3"
-         offset="1"
-         style="stop-color:#9c9c9c;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76670-0" id="linearGradient40350-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.98898122,0,0,0.6650889,69.670762,2428.3565)" x1="375.6521" y1="7217.8555" x2="375.6521" y2="7191.9053"/>
+    <linearGradient id="linearGradient76670-0">
+      <stop id="stop76672-9" offset="0" style="stop-color:#c0c0c0;stop-opacity:1;"/>
+      <stop style="stop-color:#dfdfdf;stop-opacity:1;" offset="0.35685185" id="stop76674-7"/>
+      <stop id="stop76676-3" offset="1" style="stop-color:#9c9c9c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76606-0"
-       id="linearGradient40352-7"
-       gradientUnits="userSpaceOnUse"
-       x1="463.79178"
-       y1="7251.1294"
-       x2="464.58942"
-       y2="7142.9424" />
-    <linearGradient
-       id="linearGradient135510">
-      <stop
-         style="stop-color:#1d1e1e;stop-opacity:1;"
-         offset="0"
-         id="stop135512" />
-      <stop
-         style="stop-color:#c1c3c3;stop-opacity:1;"
-         offset="1"
-         id="stop135514" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76606-0" id="linearGradient40352-7" gradientUnits="userSpaceOnUse" x1="463.79178" y1="7251.1294" x2="464.58942" y2="7142.9424"/>
+    <linearGradient id="linearGradient135510">
+      <stop style="stop-color:#1d1e1e;stop-opacity:1;" offset="0" id="stop135512"/>
+      <stop style="stop-color:#c1c3c3;stop-opacity:1;" offset="1" id="stop135514"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient67848-1"
-       id="linearGradient40354-4"
-       gradientUnits="userSpaceOnUse"
-       x1="455.6145"
-       y1="7216.2612"
-       x2="455.29156"
-       y2="7298.7251"
-       gradientTransform="matrix(1.0679109,0,0,1,-30.941203,0)" />
-    <linearGradient
-       id="linearGradient67848-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop67850-1" />
-      <stop
-         id="stop67852-2"
-         offset="0.67187059"
-         style="stop-color:#9f9f9f;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop67854-3" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient67848-1" id="linearGradient40354-4" gradientUnits="userSpaceOnUse" x1="455.6145" y1="7216.2612" x2="455.29156" y2="7298.7251" gradientTransform="matrix(1.0679109,0,0,1,-30.941203,0)"/>
+    <linearGradient id="linearGradient67848-1">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop67850-1"/>
+      <stop id="stop67852-2" offset="0.67187059" style="stop-color:#9f9f9f;stop-opacity:1;"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop67854-3"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76606-0"
-       id="linearGradient40356-2"
-       gradientUnits="userSpaceOnUse"
-       x1="425.98798"
-       y1="7223.8872"
-       x2="424.01218"
-       y2="7156.2358" />
-    <linearGradient
-       id="linearGradient135522">
-      <stop
-         style="stop-color:#1d1e1e;stop-opacity:1;"
-         offset="0"
-         id="stop135524" />
-      <stop
-         style="stop-color:#c1c3c3;stop-opacity:1;"
-         offset="1"
-         id="stop135526" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76606-0" id="linearGradient40356-2" gradientUnits="userSpaceOnUse" x1="425.98798" y1="7223.8872" x2="424.01218" y2="7156.2358"/>
+    <linearGradient id="linearGradient135522">
+      <stop style="stop-color:#1d1e1e;stop-opacity:1;" offset="0" id="stop135524"/>
+      <stop style="stop-color:#c1c3c3;stop-opacity:1;" offset="1" id="stop135526"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76598-2"
-       id="linearGradient40358-6"
-       gradientUnits="userSpaceOnUse"
-       x1="444.30081"
-       y1="7127.9019"
-       x2="444.30081"
-       y2="7170.8936" />
-    <linearGradient
-       id="linearGradient135529">
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:1;"
-         offset="0"
-         id="stop135531" />
-      <stop
-         style="stop-color:#5a5a5a;stop-opacity:1;"
-         offset="1"
-         id="stop135533" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76598-2" id="linearGradient40358-6" gradientUnits="userSpaceOnUse" x1="444.30081" y1="7127.9019" x2="444.30081" y2="7170.8936"/>
+    <linearGradient id="linearGradient135529">
+      <stop style="stop-color:#f9f9f9;stop-opacity:1;" offset="0" id="stop135531"/>
+      <stop style="stop-color:#5a5a5a;stop-opacity:1;" offset="1" id="stop135533"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76834-1"
-       id="linearGradient40360-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.77806877,0,0,0.59593611,152.00841,2926.0057)"
-       x1="375.00946"
-       y1="7224.8975"
-       x2="375.00946"
-       y2="7192.3247" />
-    <linearGradient
-       id="linearGradient76834-1">
-      <stop
-         id="stop76836-6"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.4470056"
-         id="stop76838-5" />
-      <stop
-         id="stop76840-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76834-1" id="linearGradient40360-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.77806877,0,0,0.59593611,152.00841,2926.0057)" x1="375.00946" y1="7224.8975" x2="375.00946" y2="7192.3247"/>
+    <linearGradient id="linearGradient76834-1">
+      <stop id="stop76836-6" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.4470056" id="stop76838-5"/>
+      <stop id="stop76840-7" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76680-4"
-       id="linearGradient40362-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.0838175,0)"
-       x1="1896.6582"
-       y1="7396.7222"
-       x2="1894.3082"
-       y2="7398.7622" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76680-4">
-      <stop
-         style="stop-color:#3c3c3c;stop-opacity:1;"
-         offset="0"
-         id="stop76682-1" />
-      <stop
-         style="stop-color:#3c3c3c;stop-opacity:0;"
-         offset="1"
-         id="stop76684-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76680-4" id="linearGradient40362-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(4.0838175,0)" x1="1896.6582" y1="7396.7222" x2="1894.3082" y2="7398.7622"/>
+    <linearGradient inkscape:collect="always" id="linearGradient76680-4">
+      <stop style="stop-color:#3c3c3c;stop-opacity:1;" offset="0" id="stop76682-1"/>
+      <stop style="stop-color:#3c3c3c;stop-opacity:0;" offset="1" id="stop76684-2"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76688-0"
-       id="linearGradient40364-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.0838175,0)"
-       x1="1894.3082"
-       y1="7398.7622"
-       x2="1916.5155"
-       y2="7412.7842" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76688-0">
-      <stop
-         style="stop-color:#b1b1b1;stop-opacity:1;"
-         offset="0"
-         id="stop76690-1" />
-      <stop
-         style="stop-color:#b1b1b1;stop-opacity:0;"
-         offset="1"
-         id="stop76692-4" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76688-0" id="linearGradient40364-0" gradientUnits="userSpaceOnUse" gradientTransform="translate(4.0838175,0)" x1="1894.3082" y1="7398.7622" x2="1916.5155" y2="7412.7842"/>
+    <linearGradient inkscape:collect="always" id="linearGradient76688-0">
+      <stop style="stop-color:#b1b1b1;stop-opacity:1;" offset="0" id="stop76690-1"/>
+      <stop style="stop-color:#b1b1b1;stop-opacity:0;" offset="1" id="stop76692-4"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="147.60167"
-     inkscape:cy="150.92638"
-     inkscape:document-units="px"
-     inkscape:current-layer="g70720"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata135664">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" inkscape:cx="147.60167" inkscape:cy="150.92638" inkscape:document-units="px" inkscape:current-layer="g70720" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="968" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1"/>
+  <metadata id="metadata135664">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-321.71429,-498.43393)">
-    <g
-       transform="translate(853.71429,80.714243)"
-       style="display:inline"
-       id="g70720"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Printer.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g68677"
-         style="display:inline"
-         transform="matrix(0.47886735,0,0,0.47886735,-686.34131,-2978.8116)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 377.83277,7273.0359 154.67961,0 10.07627,54.624 -173.94827,0 z"
-           style="opacity:0.57399101;fill:#2e2e2e;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;filter:url(#filter76760-6)"
-           id="path78179"
-           transform="matrix(1.0743927,0,0,1.1050228,-33.894401,-763.83437)" />
-        <path
-           id="path78181"
-           style="opacity:0.57399101;fill:url(#linearGradient69341-8);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter76754-7)"
-           d="m 339.38384,7303.088 233.6104,-0.2221 c 0.90697,-10.1609 -4.48981,-11.8963 -4.30991,-14.0489 0.32004,-3.8895 -6.6368,-4.9977 -15.84263,-4.9977 l -192.6866,0 c -9.20582,0 -16.67273,0.3947 -15.91421,4.8156 -0.46153,4.4291 -6.42034,6.6514 -4.85705,14.4531 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccsscc"
-           transform="matrix(1.0533058,0,0,2.7443518,-24.469778,-12752.93)" />
-        <path
-           id="path78183"
-           style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 294.86353,7149.9639 192.6866,0 c 9.20583,0 11.98244,7.6681 14.14214,16.617 7.17711,29.7389 6.32501,58.2861 7.07106,87.1509 0.32004,12.3822 -12.00737,15.9099 -21.2132,15.9099 l -192.6866,0 c -9.20582,0 -23.38594,-2.8967 -22.62742,-16.9706 1.51544,-28.1177 0.89041,-54.5231 6.71752,-86.0902 1.6711,-9.0529 6.70408,-16.617 15.9099,-16.617 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           id="path78185"
-           style="fill:url(#linearGradient40342-8);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 375.41657,7093.0829 160.61244,0 0,79.5 -160.61244,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="cccsscc"
-           inkscape:connector-curvature="0"
-           d="m 274.09227,7208.3002 233.6104,0.7071 c 0.90697,32.3471 0.88076,37.8716 1.06066,44.7245 0.32004,12.3822 -12.00737,15.9099 -21.2132,15.9099 l -192.6866,0 c -9.20582,0 -23.38594,-2.8967 -22.62742,-16.9706 -0.46153,-14.1 0.29287,-19.5341 1.85616,-44.3709 z"
-           style="fill:url(#linearGradient40344-3);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path78187"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           transform="translate(65.29157,14.177646)"
-           id="path78189"
-           style="fill:url(#linearGradient40346-4);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40348-3)"
-           d="m 274.09227,7208.3002 233.6104,0.7071 c 0.90697,32.3471 0.88076,37.8716 1.06066,44.7245 0.32004,12.3822 -12.00737,15.9099 -21.2132,15.9099 l -192.6866,0 c -9.20582,0 -23.38594,-2.8967 -22.62742,-16.9706 -0.46153,-14.1 0.29287,-19.5341 1.85616,-44.3709 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccsscc" />
-        <path
-           transform="matrix(1.0533058,0,0,2.7443518,-24.469778,-12752.93)"
-           sodipodi:nodetypes="cccsscc"
-           inkscape:connector-curvature="0"
-           d="m 339.38384,7303.088 233.6104,-0.2221 c 0.90697,-10.1609 -4.48981,-11.8963 -4.30991,-14.0489 0.32004,-3.8895 -6.6368,-4.9977 -15.84263,-4.9977 l -192.6866,0 c -9.20582,0 -16.67273,0.3947 -15.91421,4.8156 -0.46153,4.4291 -6.42034,6.6514 -4.85705,14.4531 z"
-           style="opacity:0.4;fill:url(#linearGradient40340-4);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter76754-7)"
-           id="path67905" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 572.16303,7214.5837 c 0.51856,3.1365 0.90254,9.0192 0.90336,13.2243 l -233.91988,0 c 0.18244,-2.977 0.36703,-8.0202 0.79731,-13.1681 77.31802,-0.019 154.9012,-0.038 232.21921,-0.056 z"
-           style="fill:url(#linearGradient40350-2);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path78191" />
-        <path
-           id="path78193"
-           style="fill:#535353;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 363.38126,7265.1555 184.2897,-1.0028 -0.13258,19.2633 -183.84776,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path78195"
-           style="fill:url(#linearGradient40352-7);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 370.0546,7164.1413 2.12131,0 0,-28.0896 c 2.42698,0 4.82252,0 7.18697,0 l 2.0528,28.0896 148.01314,0 2.85568,-28.3284 7.07791,0 -0.0442,28.1533 2.20979,0 6.5,64.3684 -0.34367,36.219 c -2.51053,5.7957 -9.41238,7.3442 -15.1783,8.4603 l -154.33447,0.091 c -7.49851,0.1501 -13.5475,-4.5119 -14.78894,-7.8466 l 0.17198,-37.6738 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           id="path78197-6"
-           style="fill:url(#linearGradient40354-4);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 371.73481,7272.035 4.16035,0.9789 155.78768,0.022 6.05175,-0.9136 10.76055,55.5376 -185.76125,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           id="path78199"
-           style="fill:url(#linearGradient40356-2);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 370.06931,7164.1413 171.48869,-0.25 4.87554,51.0176 -181.5824,-0.2684 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="cccccccccccc"
-           inkscape:connector-curvature="0"
-           d="m 377.21145,7164.1157 4.15959,0 -2.22802,-28.0679 c 0.75793,0 1.16962,0 1.50273,0 l 3.49016,28.0679 143.73882,-0.2652 2.54302,-28.0488 1.8954,0 -0.6654,28.1393 2.01622,0 c -146.54105,-0.2361 -8.8736,-0.1846 -156.45259,0.1747 z"
-           style="fill:url(#linearGradient40358-6);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path78201" />
-        <path
-           id="path78203"
-           style="fill:url(#linearGradient40360-0);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 365.35096,7214.6337 181.23928,-0.081 c 1.57806,14.5239 0.0277,-0.307 1.44019,13.7673 l -184.47841,-0.7182 c -0.10892,-3.4553 0.62426,-7.7708 1.29923,-12.9674 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
-        <rect
-           style="fill:url(#linearGradient40362-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40364-0);stroke-width:0.50492668;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="rect78205"
-           width="10.25"
-           height="9.6881371"
-           x="1903.2469"
-           y="7402.3311"
-           transform="matrix(1,0,-0.19611614,0.98058067,0,0)" />
-        <path
-           sodipodi:type="arc"
-           style="opacity:0.70852015;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080"
-           id="path78207"
-           sodipodi:cx="495.375"
-           sodipodi:cy="7228.5303"
-           sodipodi:rx="3.625"
-           sodipodi:ry="3.625"
-           d="m 499,7228.5303 c 0,2.002 -1.62297,3.625 -3.625,3.625 -2.00203,0 -3.625,-1.623 -3.625,-3.625 0,-2.0021 1.62297,-3.625 3.625,-3.625 2.00203,0 3.625,1.6229 3.625,3.625 z"
-           transform="translate(65.29157,14.177646)" />
-        <path
-           transform="translate(65.29157,26.707212)"
-           d="m 499,7228.5303 c 0,2.002 -1.62297,3.625 -3.625,3.625 -2.00203,0 -3.625,-1.623 -3.625,-3.625 0,-2.0021 1.62297,-3.625 3.625,-3.625 2.00203,0 3.625,1.6229 3.625,3.625 z"
-           sodipodi:ry="3.625"
-           sodipodi:rx="3.625"
-           sodipodi:cy="7228.5303"
-           sodipodi:cx="495.375"
-           id="path67907"
-           style="opacity:0.70852015;fill:#ffdc2a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-321.71429,-498.43393)">
+    <g transform="translate(853.71429,80.714243)" style="display:inline" id="g70720">
+      <g id="g68677" style="display:inline" transform="matrix(0.47886735,0,0,0.47886735,-686.34131,-2978.8116)">
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 377.83277,7273.0359 154.67961,0 10.07627,54.624 -173.94827,0 z" style="opacity:0.57399101;fill:#2e2e2e;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;filter:url(#filter76760-6)" id="path78179" transform="matrix(1.0743927,0,0,1.1050228,-33.894401,-763.83437)"/>
+        <path id="path78181" style="opacity:0.57399101;fill:url(#linearGradient69341-8);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter76754-7)" d="m 339.38384,7303.088 233.6104,-0.2221 c 0.90697,-10.1609 -4.48981,-11.8963 -4.30991,-14.0489 0.32004,-3.8895 -6.6368,-4.9977 -15.84263,-4.9977 l -192.6866,0 c -9.20582,0 -16.67273,0.3947 -15.91421,4.8156 -0.46153,4.4291 -6.42034,6.6514 -4.85705,14.4531 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccsscc" transform="matrix(1.0533058,0,0,2.7443518,-24.469778,-12752.93)"/>
+        <path id="path78183" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 294.86353,7149.9639 192.6866,0 c 9.20583,0 11.98244,7.6681 14.14214,16.617 7.17711,29.7389 6.32501,58.2861 7.07106,87.1509 0.32004,12.3822 -12.00737,15.9099 -21.2132,15.9099 l -192.6866,0 c -9.20582,0 -23.38594,-2.8967 -22.62742,-16.9706 1.51544,-28.1177 0.89041,-54.5231 6.71752,-86.0902 1.6711,-9.0529 6.70408,-16.617 15.9099,-16.617 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss" transform="translate(65.29157,14.177646)"/>
+        <path id="path78185" style="fill:url(#linearGradient40342-8);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 375.41657,7093.0829 160.61244,0 0,79.5 -160.61244,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="cccsscc" inkscape:connector-curvature="0" d="m 274.09227,7208.3002 233.6104,0.7071 c 0.90697,32.3471 0.88076,37.8716 1.06066,44.7245 0.32004,12.3822 -12.00737,15.9099 -21.2132,15.9099 l -192.6866,0 c -9.20582,0 -23.38594,-2.8967 -22.62742,-16.9706 -0.46153,-14.1 0.29287,-19.5341 1.85616,-44.3709 z" style="fill:url(#linearGradient40344-3);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path78187" transform="translate(65.29157,14.177646)"/>
+        <path transform="translate(65.29157,14.177646)" id="path78189" style="fill:url(#linearGradient40346-4);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40348-3)" d="m 274.09227,7208.3002 233.6104,0.7071 c 0.90697,32.3471 0.88076,37.8716 1.06066,44.7245 0.32004,12.3822 -12.00737,15.9099 -21.2132,15.9099 l -192.6866,0 c -9.20582,0 -23.38594,-2.8967 -22.62742,-16.9706 -0.46153,-14.1 0.29287,-19.5341 1.85616,-44.3709 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccsscc"/>
+        <path transform="matrix(1.0533058,0,0,2.7443518,-24.469778,-12752.93)" sodipodi:nodetypes="cccsscc" inkscape:connector-curvature="0" d="m 339.38384,7303.088 233.6104,-0.2221 c 0.90697,-10.1609 -4.48981,-11.8963 -4.30991,-14.0489 0.32004,-3.8895 -6.6368,-4.9977 -15.84263,-4.9977 l -192.6866,0 c -9.20582,0 -16.67273,0.3947 -15.91421,4.8156 -0.46153,4.4291 -6.42034,6.6514 -4.85705,14.4531 z" style="opacity:0.4;fill:url(#linearGradient40340-4);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter76754-7)" id="path67905"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 572.16303,7214.5837 c 0.51856,3.1365 0.90254,9.0192 0.90336,13.2243 l -233.91988,0 c 0.18244,-2.977 0.36703,-8.0202 0.79731,-13.1681 77.31802,-0.019 154.9012,-0.038 232.21921,-0.056 z" style="fill:url(#linearGradient40350-2);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path78191"/>
+        <path id="path78193" style="fill:#535353;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 363.38126,7265.1555 184.2897,-1.0028 -0.13258,19.2633 -183.84776,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path78195" style="fill:url(#linearGradient40352-7);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 370.0546,7164.1413 2.12131,0 0,-28.0896 c 2.42698,0 4.82252,0 7.18697,0 l 2.0528,28.0896 148.01314,0 2.85568,-28.3284 7.07791,0 -0.0442,28.1533 2.20979,0 6.5,64.3684 -0.34367,36.219 c -2.51053,5.7957 -9.41238,7.3442 -15.1783,8.4603 l -154.33447,0.091 c -7.49851,0.1501 -13.5475,-4.5119 -14.78894,-7.8466 l 0.17198,-37.6738 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path id="path78197-6" style="fill:url(#linearGradient40354-4);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 371.73481,7272.035 4.16035,0.9789 155.78768,0.022 6.05175,-0.9136 10.76055,55.5376 -185.76125,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+        <path id="path78199" style="fill:url(#linearGradient40356-2);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 370.06931,7164.1413 171.48869,-0.25 4.87554,51.0176 -181.5824,-0.2684 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="cccccccccccc" inkscape:connector-curvature="0" d="m 377.21145,7164.1157 4.15959,0 -2.22802,-28.0679 c 0.75793,0 1.16962,0 1.50273,0 l 3.49016,28.0679 143.73882,-0.2652 2.54302,-28.0488 1.8954,0 -0.6654,28.1393 2.01622,0 c -146.54105,-0.2361 -8.8736,-0.1846 -156.45259,0.1747 z" style="fill:url(#linearGradient40358-6);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path78201"/>
+        <path id="path78203" style="fill:url(#linearGradient40360-0);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 365.35096,7214.6337 181.23928,-0.081 c 1.57806,14.5239 0.0277,-0.307 1.44019,13.7673 l -184.47841,-0.7182 c -0.10892,-3.4553 0.62426,-7.7708 1.29923,-12.9674 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+        <rect style="fill:url(#linearGradient40362-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient40364-0);stroke-width:0.50492668;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="rect78205" width="10.25" height="9.6881371" x="1903.2469" y="7402.3311" transform="matrix(1,0,-0.19611614,0.98058067,0,0)"/>
+        <path sodipodi:type="arc" style="opacity:0.70852015;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080" id="path78207" sodipodi:cx="495.375" sodipodi:cy="7228.5303" sodipodi:rx="3.625" sodipodi:ry="3.625" d="m 499,7228.5303 c 0,2.002 -1.62297,3.625 -3.625,3.625 -2.00203,0 -3.625,-1.623 -3.625,-3.625 0,-2.0021 1.62297,-3.625 3.625,-3.625 2.00203,0 3.625,1.6229 3.625,3.625 z" transform="translate(65.29157,14.177646)"/>
+        <path transform="translate(65.29157,26.707212)" d="m 499,7228.5303 c 0,2.002 -1.62297,3.625 -3.625,3.625 -2.00203,0 -3.625,-1.623 -3.625,-3.625 0,-2.0021 1.62297,-3.625 3.625,-3.625 2.00203,0 3.625,1.6229 3.625,3.625 z" sodipodi:ry="3.625" sodipodi:rx="3.625" sodipodi:cy="7228.5303" sodipodi:cx="495.375" id="path67907" style="opacity:0.70852015;fill:#ffdc2a;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
       </g>
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -450.42703,522.0321 18.9593,0 0.66291,4.77298 -19.48963,0 z"
-         style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect39539" />
-      <g
-         transform="matrix(-1,0,-0.1871345,-1,0,0)"
-         style="font-size:4.66575718px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         id="text39543">
-        <path
-           d="m 530.55538,-522.77234 0,-0.41008 1.71093,-2.13923 c 0.1215,-0.15187 0.23693,-0.28401 0.34629,-0.3964 l -1.86357,0 0,-0.39413 2.39211,0 0,0.39413 -1.87496,2.31693 -0.20276,0.23465 2.1324,0 0,0.39413 z"
-           id="path39756-6"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 533.30745,-522.77234 1.28263,-3.33984 0.47614,0 1.36692,3.33984 -0.50348,0 -0.38957,-1.01152 -1.39654,0 -0.36679,1.01152 z m 0.96368,-1.37148 1.13226,0 -0.34856,-0.92495 c -0.10632,-0.28097 -0.1853,-0.51183 -0.23693,-0.69257 -0.0425,0.21415 -0.10252,0.42679 -0.17998,0.6379 z"
-           id="path39758-0"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 536.77259,-522.77234 0,-3.33984 1.25301,0 c 0.25516,0 0.45982,0.0338 0.61398,0.10138 0.15416,0.0676 0.2749,0.17162 0.36223,0.31211 0.0873,0.14049 0.131,0.28744 0.131,0.44083 0,0.14277 -0.0387,0.27719 -0.11619,0.40324 -0.0775,0.12607 -0.19441,0.22783 -0.35084,0.30528 0.202,0.0592 0.35729,0.16024 0.46589,0.303 0.10859,0.14277 0.16289,0.31136 0.16289,0.50577 0,0.15643 -0.033,0.30186 -0.0991,0.43627 -0.0661,0.13442 -0.1477,0.23807 -0.24491,0.31098 -0.0972,0.0729 -0.21908,0.12795 -0.36565,0.16517 -0.14656,0.0372 -0.32616,0.0558 -0.53879,0.0558 z m 0.44197,-1.93647 0.72219,0 c 0.19593,0 0.33642,-0.0129 0.42147,-0.0387 0.11239,-0.0334 0.19706,-0.0889 0.25402,-0.16631 0.0569,-0.0775 0.0854,-0.17466 0.0854,-0.29161 0,-0.11087 -0.0266,-0.20845 -0.0797,-0.29275 -0.0532,-0.0843 -0.1291,-0.142 -0.22782,-0.17314 -0.0987,-0.0311 -0.26807,-0.0467 -0.50804,-0.0467 l -0.66752,0 z m 0,1.54234 0.83155,0 c 0.14276,0 0.243,-0.005 0.30072,-0.0159 0.10176,-0.0182 0.18681,-0.0486 0.25516,-0.0911 0.0683,-0.0425 0.12454,-0.10442 0.16859,-0.18568 0.044,-0.0813 0.0661,-0.17504 0.0661,-0.28135 0,-0.12455 -0.0319,-0.23276 -0.0957,-0.32465 -0.0638,-0.0919 -0.15226,-0.15643 -0.26541,-0.19365 -0.11315,-0.0372 -0.27604,-0.0558 -0.48867,-0.0558 l -0.77232,0 z"
-           id="path39760-7"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 539.88917,-522.77234 0,-3.33984 1.25301,0 c 0.25516,0 0.45982,0.0338 0.61398,0.10138 0.15416,0.0676 0.2749,0.17162 0.36223,0.31211 0.0873,0.14049 0.131,0.28744 0.131,0.44083 0,0.14277 -0.0387,0.27719 -0.11619,0.40324 -0.0775,0.12607 -0.19441,0.22783 -0.35084,0.30528 0.202,0.0592 0.35729,0.16024 0.46589,0.303 0.10859,0.14277 0.16289,0.31136 0.16289,0.50577 0,0.15643 -0.033,0.30186 -0.0991,0.43627 -0.0661,0.13442 -0.1477,0.23807 -0.24491,0.31098 -0.0972,0.0729 -0.21908,0.12795 -0.36565,0.16517 -0.14656,0.0372 -0.32616,0.0558 -0.53879,0.0558 z m 0.44197,-1.93647 0.72219,0 c 0.19593,0 0.33642,-0.0129 0.42147,-0.0387 0.11239,-0.0334 0.19706,-0.0889 0.25402,-0.16631 0.0569,-0.0775 0.0854,-0.17466 0.0854,-0.29161 0,-0.11087 -0.0266,-0.20845 -0.0797,-0.29275 -0.0532,-0.0843 -0.1291,-0.142 -0.22782,-0.17314 -0.0987,-0.0311 -0.26807,-0.0467 -0.50804,-0.0467 l -0.66752,0 z m 0,1.54234 0.83155,0 c 0.14276,0 0.243,-0.005 0.30072,-0.0159 0.10176,-0.0182 0.18681,-0.0486 0.25516,-0.0911 0.0683,-0.0425 0.12454,-0.10442 0.16859,-0.18568 0.044,-0.0813 0.0661,-0.17504 0.0661,-0.28135 0,-0.12455 -0.0319,-0.23276 -0.0957,-0.32465 -0.0638,-0.0919 -0.15226,-0.15643 -0.26541,-0.19365 -0.11315,-0.0372 -0.27604,-0.0558 -0.48867,-0.0558 l -0.77232,0 z"
-           id="path39762-1"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 543.09916,-522.77234 0,-3.33984 0.44197,0 0,3.33984 z"
-           id="path39764-7"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 543.97855,-522.77234 1.29174,-1.74055 -1.1391,-1.59929 0.52626,0 0.606,0.8566 c 0.12606,0.1777 0.21567,0.3144 0.26883,0.41008 0.0744,-0.1215 0.16251,-0.24832 0.26427,-0.38046 l 0.67207,-0.88622 0.4807,0 -1.17327,1.57423 1.2644,1.76561 -0.54677,0 -0.84066,-1.1915 c -0.0471,-0.0683 -0.0957,-0.14276 -0.1458,-0.22326 -0.0744,0.1215 -0.12758,0.20504 -0.15947,0.2506 l -0.83838,1.16416 z"
-           id="path39766-7"
-           inkscape:connector-curvature="0" />
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -450.42703,522.0321 18.9593,0 0.66291,4.77298 -19.48963,0 z" style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect39539"/>
+      <g transform="matrix(-1,0,-0.1871345,-1,0,0)" style="font-size:4.66575718px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text39543">
+        <path d="m 530.55538,-522.77234 0,-0.41008 1.71093,-2.13923 c 0.1215,-0.15187 0.23693,-0.28401 0.34629,-0.3964 l -1.86357,0 0,-0.39413 2.39211,0 0,0.39413 -1.87496,2.31693 -0.20276,0.23465 2.1324,0 0,0.39413 z" id="path39756-6" inkscape:connector-curvature="0"/>
+        <path d="m 533.30745,-522.77234 1.28263,-3.33984 0.47614,0 1.36692,3.33984 -0.50348,0 -0.38957,-1.01152 -1.39654,0 -0.36679,1.01152 z m 0.96368,-1.37148 1.13226,0 -0.34856,-0.92495 c -0.10632,-0.28097 -0.1853,-0.51183 -0.23693,-0.69257 -0.0425,0.21415 -0.10252,0.42679 -0.17998,0.6379 z" id="path39758-0" inkscape:connector-curvature="0"/>
+        <path d="m 536.77259,-522.77234 0,-3.33984 1.25301,0 c 0.25516,0 0.45982,0.0338 0.61398,0.10138 0.15416,0.0676 0.2749,0.17162 0.36223,0.31211 0.0873,0.14049 0.131,0.28744 0.131,0.44083 0,0.14277 -0.0387,0.27719 -0.11619,0.40324 -0.0775,0.12607 -0.19441,0.22783 -0.35084,0.30528 0.202,0.0592 0.35729,0.16024 0.46589,0.303 0.10859,0.14277 0.16289,0.31136 0.16289,0.50577 0,0.15643 -0.033,0.30186 -0.0991,0.43627 -0.0661,0.13442 -0.1477,0.23807 -0.24491,0.31098 -0.0972,0.0729 -0.21908,0.12795 -0.36565,0.16517 -0.14656,0.0372 -0.32616,0.0558 -0.53879,0.0558 z m 0.44197,-1.93647 0.72219,0 c 0.19593,0 0.33642,-0.0129 0.42147,-0.0387 0.11239,-0.0334 0.19706,-0.0889 0.25402,-0.16631 0.0569,-0.0775 0.0854,-0.17466 0.0854,-0.29161 0,-0.11087 -0.0266,-0.20845 -0.0797,-0.29275 -0.0532,-0.0843 -0.1291,-0.142 -0.22782,-0.17314 -0.0987,-0.0311 -0.26807,-0.0467 -0.50804,-0.0467 l -0.66752,0 z m 0,1.54234 0.83155,0 c 0.14276,0 0.243,-0.005 0.30072,-0.0159 0.10176,-0.0182 0.18681,-0.0486 0.25516,-0.0911 0.0683,-0.0425 0.12454,-0.10442 0.16859,-0.18568 0.044,-0.0813 0.0661,-0.17504 0.0661,-0.28135 0,-0.12455 -0.0319,-0.23276 -0.0957,-0.32465 -0.0638,-0.0919 -0.15226,-0.15643 -0.26541,-0.19365 -0.11315,-0.0372 -0.27604,-0.0558 -0.48867,-0.0558 l -0.77232,0 z" id="path39760-7" inkscape:connector-curvature="0"/>
+        <path d="m 539.88917,-522.77234 0,-3.33984 1.25301,0 c 0.25516,0 0.45982,0.0338 0.61398,0.10138 0.15416,0.0676 0.2749,0.17162 0.36223,0.31211 0.0873,0.14049 0.131,0.28744 0.131,0.44083 0,0.14277 -0.0387,0.27719 -0.11619,0.40324 -0.0775,0.12607 -0.19441,0.22783 -0.35084,0.30528 0.202,0.0592 0.35729,0.16024 0.46589,0.303 0.10859,0.14277 0.16289,0.31136 0.16289,0.50577 0,0.15643 -0.033,0.30186 -0.0991,0.43627 -0.0661,0.13442 -0.1477,0.23807 -0.24491,0.31098 -0.0972,0.0729 -0.21908,0.12795 -0.36565,0.16517 -0.14656,0.0372 -0.32616,0.0558 -0.53879,0.0558 z m 0.44197,-1.93647 0.72219,0 c 0.19593,0 0.33642,-0.0129 0.42147,-0.0387 0.11239,-0.0334 0.19706,-0.0889 0.25402,-0.16631 0.0569,-0.0775 0.0854,-0.17466 0.0854,-0.29161 0,-0.11087 -0.0266,-0.20845 -0.0797,-0.29275 -0.0532,-0.0843 -0.1291,-0.142 -0.22782,-0.17314 -0.0987,-0.0311 -0.26807,-0.0467 -0.50804,-0.0467 l -0.66752,0 z m 0,1.54234 0.83155,0 c 0.14276,0 0.243,-0.005 0.30072,-0.0159 0.10176,-0.0182 0.18681,-0.0486 0.25516,-0.0911 0.0683,-0.0425 0.12454,-0.10442 0.16859,-0.18568 0.044,-0.0813 0.0661,-0.17504 0.0661,-0.28135 0,-0.12455 -0.0319,-0.23276 -0.0957,-0.32465 -0.0638,-0.0919 -0.15226,-0.15643 -0.26541,-0.19365 -0.11315,-0.0372 -0.27604,-0.0558 -0.48867,-0.0558 l -0.77232,0 z" id="path39762-1" inkscape:connector-curvature="0"/>
+        <path d="m 543.09916,-522.77234 0,-3.33984 0.44197,0 0,3.33984 z" id="path39764-7" inkscape:connector-curvature="0"/>
+        <path d="m 543.97855,-522.77234 1.29174,-1.74055 -1.1391,-1.59929 0.52626,0 0.606,0.8566 c 0.12606,0.1777 0.21567,0.3144 0.26883,0.41008 0.0744,-0.1215 0.16251,-0.24832 0.26427,-0.38046 l 0.67207,-0.88622 0.4807,0 -1.17327,1.57423 1.2644,1.76561 -0.54677,0 -0.84066,-1.1915 c -0.0471,-0.0683 -0.0957,-0.14276 -0.1458,-0.22326 -0.0744,0.1215 -0.12758,0.20504 -0.15947,0.2506 l -0.83838,1.16416 z" id="path39766-7" inkscape:connector-curvature="0"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Rackmountable_1U_server_2D.svg b/misc/images/svg/elements/Rackmountable_1U_server_2D.svg
index 7b694c27148..9223beaed57 100644
--- a/misc/images/svg/elements/Rackmountable_1U_server_2D.svg
+++ b/misc/images/svg/elements/Rackmountable_1U_server_2D.svg
@@ -1,493 +1,99 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.0096"
-   height="8.7264385"
-   id="svg136394"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 26">
-  <defs
-     id="defs136396">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-5-8-08-7"
-       id="linearGradient77341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0640224,0,0.04454039,0.50127099,-379.3982,3985.9438)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-5-8-08-7">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-5-0-5-48" />
-      <stop
-         id="stop76664-9-1-9-1-5"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-7-5-4-6" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.0096" height="8.7264385" id="svg136394" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 26">
+  <defs id="defs136396">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-5-8-08-7" id="linearGradient77341" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0640224,0,0.04454039,0.50127099,-379.3982,3985.9438)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-5-8-08-7">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-5-0-5-48"/>
+      <stop id="stop76664-9-1-9-1-5" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-7-5-4-6"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect150888"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect150885"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-09-4-2-2"
-       id="linearGradient77343"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0856538,0,-0.0337151,0.50565158,237.94435,3950.7794)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient42443-09-4-2-2">
-      <stop
-         id="stop42445-48-8-2-42"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-8-6-1-8" />
-      <stop
-         id="stop42449-2-8-9-0"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect is_visible="true" id="path-effect150888" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect150885" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-09-4-2-2" id="linearGradient77343" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0856538,0,-0.0337151,0.50565158,237.94435,3950.7794)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient42443-09-4-2-2">
+      <stop id="stop42445-48-8-2-42" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-8-6-1-8"/>
+      <stop id="stop42449-2-8-9-0" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect150878"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect150875"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-1-5-1-21"
-       id="linearGradient77345"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-27.252557,-440.24054)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-1-5-1-21">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-42-5-0-4" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-3-8-9-7" />
+    <inkscape:path-effect effect="spiro" id="path-effect150878" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect150875" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-1-5-1-21" id="linearGradient77345" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-27.252557,-440.24054)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-1-5-1-21">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-42-5-0-4"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-3-8-9-7"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-132.42303"
-     inkscape:cy="172.93585"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="44"
-     inkscape:window-y="58"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata136399">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-132.42303" inkscape:cy="172.93585" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="44" inkscape:window-y="58" inkscape:window-maximized="0"/>
+  <metadata id="metadata136399">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-507.42303,-696.57159)">
-    <g
-       style="display:inline"
-       id="g151309"
-       transform="matrix(1.0266398,0,0,1.0266398,138.25017,-7509.232)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_1U_server_2D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         id="path143645-2"
-         style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.89336765;stroke-opacity:1"
-         d="m 365.6445,7993.3146 112.41737,0 0,7.6187 -112.41737,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:url(#linearGradient77341);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21909525;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 477.36379,7993.2912 c -0.74882,0 -1.34622,0.3835 -1.3527,0.8596 l -0.0937,5.8129 c -0.006,0.4764 0.59608,0.8598 1.34491,0.8598 l 5.45939,0 c 0.74882,0 1.34627,-0.3834 1.35268,-0.8598 l 0.0199,-1.4019 -0.84048,-0.062 -0.23915,-2.6915 1.1304,0.072 0.0229,-1.7295 c 0.006,-0.4763 -0.59607,-0.8597 -1.34489,-0.8597 l -5.45939,0 z m 2.93159,2.8143 c 0.23848,0.01 0.44296,0.2595 0.45145,0.5629 0.008,0.3036 -0.18024,0.5382 -0.41837,0.5322 -0.23847,-0.01 -0.42596,-0.2491 -0.43446,-0.5526 -0.009,-0.3034 0.16328,-0.5483 0.40138,-0.5425 z"
-         id="path143647-2"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#808080;fill-opacity:1;stroke:none"
-         d="m 479.52455,7994.0543 1.09723,-0.036 1.41762,0.8449 0.18563,5.6923 -1.09956,0.062 -1.64028,-1.0083 0.91188,-0.026 0.69831,0.2404 -0.14334,-4.8817 -1.42749,-0.8876"
-         id="path143649-4"
-         inkscape:path-effect="#path-effect150888"
-         inkscape:original-d="m 479.52455,7994.0543 c 0.0258,-0.3919 0.41082,-0.2615 1.09723,-0.036 l 1.41762,0.8449 0.18563,5.6923 c -0.27316,0.3102 -0.65908,0.1392 -1.09956,0.062 l -1.64028,-1.0083 c 0.29248,-0.2598 0.38742,-0.1277 0.91188,-0.026 l 0.69831,0.2404 -0.14334,-4.8817 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-      <path
-         style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-         d="m 479.5648,7995.2724 1.05024,0.4755 0.13727,4.2094 -1.26699,-0.3477 0.0236,0.683 1.623,0.325 -0.154,-5.6998 -1.45871,-0.8642 0.0456,1.2188"
-         id="path143651-2"
-         inkscape:path-effect="#path-effect150885"
-         inkscape:original-d="m 479.5648,7995.2724 1.05024,0.4755 0.13727,4.2094 -1.26699,-0.3477 0.0236,0.683 1.623,0.325 -0.154,-5.6998 -1.45871,-0.8642 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 365.64451,7993.3144 73.48309,0 0,7.6189 -73.48309,0 z"
-         style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.89338529;stroke-opacity:1"
-         id="path143653-5"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143655-1"
-         d="m 366.59557,7993.2609 c 0.76408,0 1.38262,0.3867 1.40034,0.8672 l 0.23161,5.8637 c 0.0176,0.4805 -0.58808,0.8672 -1.35214,0.8672 l -5.57042,0 c -0.76404,0 -1.38266,-0.3867 -1.40032,-0.8672 l -0.0532,-1.4143 0.85614,-0.063 0.18102,-2.7149 -1.15164,0.072 -0.0639,-1.7447 c -0.0178,-0.4803 0.58805,-0.8671 1.3521,-0.8671 l 5.57042,0 z m -2.92534,2.839 c -0.24309,0.01 -0.44589,0.2616 -0.44746,0.5678 -0.002,0.3062 0.19653,0.5427 0.43934,0.5368 0.24308,-0.01 0.42881,-0.2515 0.43038,-0.5575 0.002,-0.3061 -0.17945,-0.5531 -0.42226,-0.5471 z"
-         style="fill:url(#linearGradient77343);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.14818402;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 364.40875,7994.0305 c -0.0353,-0.3953 -0.42529,-0.2638 -1.12034,-0.037 l -1.42669,0.8523 -0.0562,5.742 c 0.28596,0.3131 0.67573,0.1406 1.12332,0.063 l 1.65006,-1.0172 c -0.30451,-0.2619 -0.39831,-0.1287 -0.93104,-0.026 l -0.70688,0.2424 0.032,-4.9241 z"
-         inkscape:path-effect="#path-effect150878"
-         id="path143657-2"
-         d="m 364.40875,7994.0305 -1.12034,-0.037 -1.42669,0.8523 -0.0562,5.742 1.12332,0.063 1.65006,-1.0172 -0.93104,-0.026 -0.70688,0.2424 0.032,-4.9241 1.43577,-0.8954"
-         style="fill:#808080;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 364.39617,7995.2595 -1.06048,0.4796 -0.0415,4.2462 1.28464,-0.3508 -0.008,0.6891 -1.64838,0.3278 0.0238,-5.7496 1.46817,-0.872 z"
-         inkscape:path-effect="#path-effect150875"
-         id="path143659-0"
-         d="m 364.39617,7995.2595 -1.06048,0.4796 -0.0415,4.2462 1.28464,-0.3508 -0.008,0.6891 -1.64838,0.3278 0.0238,-5.7496 1.46817,-0.872 -0.0183,1.2297"
-         style="fill:#4d4d4d;stroke:none" />
-      <path
-         id="path143661-3"
-         style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 471.7156,7994.9581 1.90862,0 0,2.4099 -1.90862,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 468.90547,7994.958 1.9086,0 0,2.41 -1.9086,0 z"
-         style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path143663-9"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path143665-9"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4"
-         d="m 466.79703,7994.9136 1.21366,0 0,4.2539 -1.21366,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 467.53583,7994.9136 0.47486,0 0,4.2539 -0.47486,0 z"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4"
-         id="path143667-5" />
-      <rect
-         transform="matrix(1,0,-0.01802634,0.99983751,0,0)"
-         y="7995.9048"
-         x="585.81073"
-         height="4.7188153"
-         width="23.795719"
-         id="rect143669-4"
-         style="fill:url(#linearGradient77345);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143671-4"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         d="m 442.96371,7995.2727 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 446.15365,7995.2727 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         id="path143673-4"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143675-3"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         d="m 449.37599,7995.2727 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 369.77778,7994.026 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-         id="path143677-3" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143679-2"
-         d="m 373.0097,7995.654 7.1891,0 0,0.7235 -7.1891,0 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path143681-6"
-         d="m 390.7089,7995.5218 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 381.53484,7995.654 7.1891,0 0,0.7235 -7.1891,0 z"
-         id="path143683-4" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 373.21327,7997.0106 7.18911,0 0,0.4071 -7.18911,0 z"
-         id="path143685-9" />
-      <path
-         id="path143687-2"
-         d="m 381.73841,7997.0106 7.18912,0 0,0.4071 -7.18912,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path143689-0"
-         d="m 373.36597,7998.096 7.18911,0 0,0.407 -7.18911,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 381.89111,7998.096 7.18912,0 0,0.407 -7.18912,0 z"
-         id="path143691-3" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 373.41686,7999.1361 7.18912,0 0,0.407 -7.18912,0 z"
-         id="path143693-7" />
-      <path
-         id="path143695-4"
-         d="m 381.94201,7999.1361 7.18911,0 0,0.407 -7.18911,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 390.59439,7999.1361 7.18912,0 0,0.407 -7.18912,0 z"
-         id="path143697-1" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 369.77778,7995.0661 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-         style="fill:#000000;stroke:none"
-         id="path143699-9" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 401.28774,7994.474 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-         id="path143701-3" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 403.99722,7994.4151 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-         id="path143703-0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143705-2"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-         d="m 401.33384,7996.5987 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143707-5"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-         d="m 404.04332,7996.54 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z" />
-      <path
-         d="m 401.38387,7998.9045 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-         id="path143709-3"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 404.09334,7998.8457 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-         id="path143711-1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path143713-1"
-         style="fill:#808080;stroke:#000000;stroke-width:0.42910308"
-         d="m 406.58427,7994.0259 29.32904,-0.045 0.0637,6.331 -29.20179,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 409.8162,7995.654 7.1891,0 0,0.7235 -7.1891,0 z"
-         id="path143715-6"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 427.5154,7995.5218 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-         id="path143717-4" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path143719-9"
-         d="m 418.34134,7995.654 7.1891,0 0,0.7235 -7.1891,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path143721-2"
-         d="m 410.01977,7997.0106 7.18913,0 0,0.4071 -7.18913,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 418.54491,7997.0106 7.18913,0 0,0.4071 -7.18913,0 z"
-         id="path143723-9" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 410.17247,7998.096 7.18911,0 0,0.407 -7.18911,0 z"
-         id="path143725-6" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path143727-2"
-         d="m 418.69761,7998.096 7.18911,0 0,0.407 -7.18911,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path143729-9"
-         d="m 410.22338,7999.1361 7.1891,0 0,0.407 -7.1891,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 418.74852,7999.1361 7.1891,0 0,0.407 -7.1891,0 z"
-         id="path143731-8" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path143733-1"
-         d="m 427.40089,7999.1361 7.18911,0 0,0.407 -7.18911,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path143735-1"
-         style="fill:#000000;stroke:none"
-         d="m 406.58427,7995.0661 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 394.53988,7995.5027 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path143737-0" />
-      <path
-         id="path143739-1"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 394.53996,7998.7362 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path143741-7"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 431.17483,7995.5027 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 431.1749,7998.7362 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path143743-5" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 471.7156,7998.2726 1.90862,0 0,1.0539 -1.90862,0 z"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path143745-0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143747-3"
-         style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 468.90547,7998.2725 1.9086,0 0,1.054 -1.9086,0 z" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 442.96371,7997.4474 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         id="path143749-8"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143751-8"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         d="m 446.15365,7997.4474 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 449.37599,7997.4474 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         id="path143753-1"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143755-5"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         d="m 452.6521,7997.4474 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 455.84203,7997.4474 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         id="path143757-6"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path143759-0"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-         d="m 459.06437,7997.4474 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z"
-         sodipodi:nodetypes="ssccssccs" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-507.42303,-696.57159)">
+    <g style="display:inline" id="g151309" transform="matrix(1.0266398,0,0,1.0266398,138.25017,-7509.232)">
+      <path id="path143645-2" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.89336765;stroke-opacity:1" d="m 365.6445,7993.3146 112.41737,0 0,7.6187 -112.41737,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:url(#linearGradient77341);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21909525;stroke-miterlimit:4;stroke-dasharray:none" d="m 477.36379,7993.2912 c -0.74882,0 -1.34622,0.3835 -1.3527,0.8596 l -0.0937,5.8129 c -0.006,0.4764 0.59608,0.8598 1.34491,0.8598 l 5.45939,0 c 0.74882,0 1.34627,-0.3834 1.35268,-0.8598 l 0.0199,-1.4019 -0.84048,-0.062 -0.23915,-2.6915 1.1304,0.072 0.0229,-1.7295 c 0.006,-0.4763 -0.59607,-0.8597 -1.34489,-0.8597 l -5.45939,0 z m 2.93159,2.8143 c 0.23848,0.01 0.44296,0.2595 0.45145,0.5629 0.008,0.3036 -0.18024,0.5382 -0.41837,0.5322 -0.23847,-0.01 -0.42596,-0.2491 -0.43446,-0.5526 -0.009,-0.3034 0.16328,-0.5483 0.40138,-0.5425 z" id="path143647-2" inkscape:connector-curvature="0"/>
+      <path style="fill:#808080;fill-opacity:1;stroke:none" d="m 479.52455,7994.0543 1.09723,-0.036 1.41762,0.8449 0.18563,5.6923 -1.09956,0.062 -1.64028,-1.0083 0.91188,-0.026 0.69831,0.2404 -0.14334,-4.8817 -1.42749,-0.8876" id="path143649-4" inkscape:path-effect="#path-effect150888" inkscape:original-d="m 479.52455,7994.0543 c 0.0258,-0.3919 0.41082,-0.2615 1.09723,-0.036 l 1.41762,0.8449 0.18563,5.6923 c -0.27316,0.3102 -0.65908,0.1392 -1.09956,0.062 l -1.64028,-1.0083 c 0.29248,-0.2598 0.38742,-0.1277 0.91188,-0.026 l 0.69831,0.2404 -0.14334,-4.8817 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+      <path style="fill:#4d4d4d;fill-opacity:1;stroke:none" d="m 479.5648,7995.2724 1.05024,0.4755 0.13727,4.2094 -1.26699,-0.3477 0.0236,0.683 1.623,0.325 -0.154,-5.6998 -1.45871,-0.8642 0.0456,1.2188" id="path143651-2" inkscape:path-effect="#path-effect150885" inkscape:original-d="m 479.5648,7995.2724 1.05024,0.4755 0.13727,4.2094 -1.26699,-0.3477 0.0236,0.683 1.623,0.325 -0.154,-5.6998 -1.45871,-0.8642 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path inkscape:connector-curvature="0" d="m 365.64451,7993.3144 73.48309,0 0,7.6189 -73.48309,0 z" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.89338529;stroke-opacity:1" id="path143653-5" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path143655-1" d="m 366.59557,7993.2609 c 0.76408,0 1.38262,0.3867 1.40034,0.8672 l 0.23161,5.8637 c 0.0176,0.4805 -0.58808,0.8672 -1.35214,0.8672 l -5.57042,0 c -0.76404,0 -1.38266,-0.3867 -1.40032,-0.8672 l -0.0532,-1.4143 0.85614,-0.063 0.18102,-2.7149 -1.15164,0.072 -0.0639,-1.7447 c -0.0178,-0.4803 0.58805,-0.8671 1.3521,-0.8671 l 5.57042,0 z m -2.92534,2.839 c -0.24309,0.01 -0.44589,0.2616 -0.44746,0.5678 -0.002,0.3062 0.19653,0.5427 0.43934,0.5368 0.24308,-0.01 0.42881,-0.2515 0.43038,-0.5575 0.002,-0.3061 -0.17945,-0.5531 -0.42226,-0.5471 z" style="fill:url(#linearGradient77343);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.14818402;stroke-miterlimit:4;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 364.40875,7994.0305 c -0.0353,-0.3953 -0.42529,-0.2638 -1.12034,-0.037 l -1.42669,0.8523 -0.0562,5.742 c 0.28596,0.3131 0.67573,0.1406 1.12332,0.063 l 1.65006,-1.0172 c -0.30451,-0.2619 -0.39831,-0.1287 -0.93104,-0.026 l -0.70688,0.2424 0.032,-4.9241 z" inkscape:path-effect="#path-effect150878" id="path143657-2" d="m 364.40875,7994.0305 -1.12034,-0.037 -1.42669,0.8523 -0.0562,5.742 1.12332,0.063 1.65006,-1.0172 -0.93104,-0.026 -0.70688,0.2424 0.032,-4.9241 1.43577,-0.8954" style="fill:#808080;stroke:none"/>
+      <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 364.39617,7995.2595 -1.06048,0.4796 -0.0415,4.2462 1.28464,-0.3508 -0.008,0.6891 -1.64838,0.3278 0.0238,-5.7496 1.46817,-0.872 z" inkscape:path-effect="#path-effect150875" id="path143659-0" d="m 364.39617,7995.2595 -1.06048,0.4796 -0.0415,4.2462 1.28464,-0.3508 -0.008,0.6891 -1.64838,0.3278 0.0238,-5.7496 1.46817,-0.872 -0.0183,1.2297" style="fill:#4d4d4d;stroke:none"/>
+      <path id="path143661-3" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.7156,7994.9581 1.90862,0 0,2.4099 -1.90862,0 z" inkscape:connector-curvature="0"/>
+      <path d="m 468.90547,7994.958 1.9086,0 0,2.41 -1.9086,0 z" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path143663-9" inkscape:connector-curvature="0"/>
+      <path id="path143665-9" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4" d="m 466.79703,7994.9136 1.21366,0 0,4.2539 -1.21366,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 467.53583,7994.9136 0.47486,0 0,4.2539 -0.47486,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4" id="path143667-5"/>
+      <rect transform="matrix(1,0,-0.01802634,0.99983751,0,0)" y="7995.9048" x="585.81073" height="4.7188153" width="23.795719" id="rect143669-4" style="fill:url(#linearGradient77345);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554"/>
+      <path inkscape:connector-curvature="0" id="path143671-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 442.96371,7995.2727 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 446.15365,7995.2727 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path143673-4" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path143675-3" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 449.37599,7995.2727 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 369.77778,7994.026 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path143677-3"/>
+      <path inkscape:connector-curvature="0" id="path143679-2" d="m 373.0097,7995.654 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path143681-6" d="m 390.7089,7995.5218 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z" style="fill:#000000;stroke:none"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.53484,7995.654 7.1891,0 0,0.7235 -7.1891,0 z" id="path143683-4"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.21327,7997.0106 7.18911,0 0,0.4071 -7.18911,0 z" id="path143685-9"/>
+      <path id="path143687-2" d="m 381.73841,7997.0106 7.18912,0 0,0.4071 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path143689-0" d="m 373.36597,7998.096 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.89111,7998.096 7.18912,0 0,0.407 -7.18912,0 z" id="path143691-3"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.41686,7999.1361 7.18912,0 0,0.407 -7.18912,0 z" id="path143693-7"/>
+      <path id="path143695-4" d="m 381.94201,7999.1361 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 390.59439,7999.1361 7.18912,0 0,0.407 -7.18912,0 z" id="path143697-1"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 369.77778,7995.0661 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" style="fill:#000000;stroke:none" id="path143699-9"/>
+      <path inkscape:connector-curvature="0" d="m 401.28774,7994.474 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path143701-3"/>
+      <path inkscape:connector-curvature="0" d="m 403.99722,7994.4151 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path143703-0"/>
+      <path inkscape:connector-curvature="0" id="path143705-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.33384,7996.5987 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z"/>
+      <path inkscape:connector-curvature="0" id="path143707-5" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 404.04332,7996.54 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z"/>
+      <path d="m 401.38387,7998.9045 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path143709-3" inkscape:connector-curvature="0"/>
+      <path d="m 404.09334,7998.8457 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path143711-1" inkscape:connector-curvature="0"/>
+      <path id="path143713-1" style="fill:#808080;stroke:#000000;stroke-width:0.42910308" d="m 406.58427,7994.0259 29.32904,-0.045 0.0637,6.331 -29.20179,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 409.8162,7995.654 7.1891,0 0,0.7235 -7.1891,0 z" id="path143715-6" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.5154,7995.5218 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z" id="path143717-4"/>
+      <path sodipodi:nodetypes="ccccc" id="path143719-9" d="m 418.34134,7995.654 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path143721-2" d="m 410.01977,7997.0106 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.54491,7997.0106 7.18913,0 0,0.4071 -7.18913,0 z" id="path143723-9"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.17247,7998.096 7.18911,0 0,0.407 -7.18911,0 z" id="path143725-6"/>
+      <path sodipodi:nodetypes="ccccc" id="path143727-2" d="m 418.69761,7998.096 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path143729-9" d="m 410.22338,7999.1361 7.1891,0 0,0.407 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.74852,7999.1361 7.1891,0 0,0.407 -7.1891,0 z" id="path143731-8"/>
+      <path sodipodi:nodetypes="ccccc" id="path143733-1" d="m 427.40089,7999.1361 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path143735-1" style="fill:#000000;stroke:none" d="m 406.58427,7995.0661 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.53988,7995.5027 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path143737-0"/>
+      <path id="path143739-1" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.53996,7998.7362 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path143741-7" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.17483,7995.5027 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.1749,7998.7362 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path143743-5"/>
+      <path inkscape:connector-curvature="0" d="m 471.7156,7998.2726 1.90862,0 0,1.0539 -1.90862,0 z" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path143745-0"/>
+      <path inkscape:connector-curvature="0" id="path143747-3" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 468.90547,7998.2725 1.9086,0 0,1.054 -1.9086,0 z"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 442.96371,7997.4474 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path143749-8" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path143751-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 446.15365,7997.4474 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 449.37599,7997.4474 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path143753-1" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path143755-5" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 452.6521,7997.4474 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 455.84203,7997.4474 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path143757-6" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path143759-0" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 459.06437,7997.4474 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Rackmountable_1U_server_3D.svg b/misc/images/svg/elements/Rackmountable_1U_server_3D.svg
index 4c9fbf55581..8fe13f392af 100644
--- a/misc/images/svg/elements/Rackmountable_1U_server_3D.svg
+++ b/misc/images/svg/elements/Rackmountable_1U_server_3D.svg
@@ -1,526 +1,107 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.0096"
-   height="18.208483"
-   id="svg136126"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 24">
-  <defs
-     id="defs136128">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-09-4-2-2"
-       id="linearGradient149702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-19.316631,-432.42507)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.36697"
-       y2="7986.2241" />
-    <linearGradient
-       id="linearGradient42443-09-4-2-2">
-      <stop
-         id="stop42445-48-8-2-42"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-8-6-1-8" />
-      <stop
-         id="stop42449-2-8-9-0"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.0096" height="18.208483" id="svg136126" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 24">
+  <defs id="defs136128">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-09-4-2-2" id="linearGradient149702" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-19.316631,-432.42507)" x1="407.2959" y1="8015.7466" x2="407.36697" y2="7986.2241"/>
+    <linearGradient id="linearGradient42443-09-4-2-2">
+      <stop id="stop42445-48-8-2-42" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-8-6-1-8"/>
+      <stop id="stop42449-2-8-9-0" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-5-8-08-7"
-       id="linearGradient149704"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0640224,0,0.04454039,0.50127099,-379.3982,3985.9438)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-5-8-08-7">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-5-0-5-48" />
-      <stop
-         id="stop76664-9-1-9-1-5"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-7-5-4-6" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-5-8-08-7" id="linearGradient149704" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0640224,0,0.04454039,0.50127099,-379.3982,3985.9438)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-5-8-08-7">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-5-0-5-48"/>
+      <stop id="stop76664-9-1-9-1-5" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-7-5-4-6"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect145856-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect145854-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-09-4-2-2"
-       id="linearGradient149706"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0856538,0,-0.0337151,0.50565158,237.94435,3950.7794)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient136051">
-      <stop
-         id="stop136053"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop136055" />
-      <stop
-         id="stop136057"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect145856-3" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect145854-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-09-4-2-2" id="linearGradient149706" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0856538,0,-0.0337151,0.50565158,237.94435,3950.7794)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient136051">
+      <stop id="stop136053" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop136055"/>
+      <stop id="stop136057" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect145850-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect145848-2"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-1-5-1-21"
-       id="linearGradient149708"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-27.252557,-440.24054)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-1-5-1-21">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-42-5-0-4" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-3-8-9-7" />
+    <inkscape:path-effect is_visible="true" id="path-effect145850-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect145848-2" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-1-5-1-21" id="linearGradient149708" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-27.252557,-440.24054)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-1-5-1-21">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-42-5-0-4"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-3-8-9-7"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="67.576974"
-     inkscape:cy="34.81849"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="110"
-     inkscape:window-y="145"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata136131">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="67.576974" inkscape:cy="34.81849" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="110" inkscape:window-y="145" inkscape:window-maximized="0"/>
+  <metadata id="metadata136131">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-307.42303,-548.97219)">
-    <g
-       style="display:inline"
-       transform="matrix(1.0266398,0,0,1.0266398,-61.749833,-7647.3587)"
-       id="g149580"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_1U_server_3D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g149582">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 365.13604,7992.8485 0.13246,8.167 113.50577,0.3686 -0.26297,-8.5493 -30.98725,-9.1867 -52.35964,0 z"
-           style="fill:url(#linearGradient149702);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path149584"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           id="path149586"
-           style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.89336765;stroke-opacity:1"
-           d="m 365.6445,7993.3146 112.41737,0 0,7.6187 -112.41737,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:url(#linearGradient149704);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21909525;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 477.36379,7993.2912 c -0.74882,0 -1.34622,0.3835 -1.3527,0.8596 l -0.0937,5.8129 c -0.006,0.4764 0.59608,0.8598 1.34491,0.8598 l 5.45939,0 c 0.74882,0 1.34627,-0.3834 1.35268,-0.8598 l 0.0199,-1.4019 -0.84048,-0.062 -0.23915,-2.6915 1.1304,0.072 0.0229,-1.7295 c 0.006,-0.4763 -0.59607,-0.8597 -1.34489,-0.8597 l -5.45939,0 z m 2.93159,2.8143 c 0.23848,0.01 0.44296,0.2595 0.45145,0.5629 0.008,0.3036 -0.18024,0.5382 -0.41837,0.5322 -0.23847,-0.01 -0.42596,-0.2491 -0.43446,-0.5526 -0.009,-0.3034 0.16328,-0.5483 0.40138,-0.5425 z"
-           id="path149588"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#808080;fill-opacity:1;stroke:none"
-           d="m 479.52455,7994.0543 1.09723,-0.036 1.41762,0.8449 0.18563,5.6923 -1.09956,0.062 -1.64028,-1.0083 0.91188,-0.026 0.69831,0.2404 -0.14334,-4.8817 -1.42749,-0.8876"
-           id="path149590"
-           inkscape:path-effect="#path-effect145856-3"
-           inkscape:original-d="m 479.52455,7994.0543 c 0.0258,-0.3919 0.41082,-0.2615 1.09723,-0.036 l 1.41762,0.8449 0.18563,5.6923 c -0.27316,0.3102 -0.65908,0.1392 -1.09956,0.062 l -1.64028,-1.0083 c 0.29248,-0.2598 0.38742,-0.1277 0.91188,-0.026 l 0.69831,0.2404 -0.14334,-4.8817 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccc" />
-        <path
-           style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-           d="m 479.5648,7995.2724 1.05024,0.4755 0.13727,4.2094 -1.26699,-0.3477 0.0236,0.683 1.623,0.325 -0.154,-5.6998 -1.45871,-0.8642 0.0456,1.2188"
-           id="path149592"
-           inkscape:path-effect="#path-effect145854-0"
-           inkscape:original-d="m 479.5648,7995.2724 1.05024,0.4755 0.13727,4.2094 -1.26699,-0.3477 0.0236,0.683 1.623,0.325 -0.154,-5.6998 -1.45871,-0.8642 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 365.64451,7993.3144 73.48309,0 0,7.6189 -73.48309,0 z"
-           style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.89338529;stroke-opacity:1"
-           id="path149594"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149596"
-           d="m 366.59557,7993.2609 c 0.76408,0 1.38262,0.3867 1.40034,0.8672 l 0.23161,5.8637 c 0.0176,0.4805 -0.58808,0.8672 -1.35214,0.8672 l -5.57042,0 c -0.76404,0 -1.38266,-0.3867 -1.40032,-0.8672 l -0.0532,-1.4143 0.85614,-0.063 0.18102,-2.7149 -1.15164,0.072 -0.0639,-1.7447 c -0.0178,-0.4803 0.58805,-0.8671 1.3521,-0.8671 l 5.57042,0 z m -2.92534,2.839 c -0.24309,0.01 -0.44589,0.2616 -0.44746,0.5678 -0.002,0.3062 0.19653,0.5427 0.43934,0.5368 0.24308,-0.01 0.42881,-0.2515 0.43038,-0.5575 0.002,-0.3061 -0.17945,-0.5531 -0.42226,-0.5471 z"
-           style="fill:url(#linearGradient149706);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.14818402;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 364.40875,7994.0305 c -0.0353,-0.3953 -0.42529,-0.2638 -1.12034,-0.037 l -1.42669,0.8523 -0.0562,5.742 c 0.28596,0.3131 0.67573,0.1406 1.12332,0.063 l 1.65006,-1.0172 c -0.30451,-0.2619 -0.39831,-0.1287 -0.93104,-0.026 l -0.70688,0.2424 0.032,-4.9241 z"
-           inkscape:path-effect="#path-effect145850-9"
-           id="path149598"
-           d="m 364.40875,7994.0305 -1.12034,-0.037 -1.42669,0.8523 -0.0562,5.742 1.12332,0.063 1.65006,-1.0172 -0.93104,-0.026 -0.70688,0.2424 0.032,-4.9241 1.43577,-0.8954"
-           style="fill:#808080;stroke:none" />
-        <path
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 364.39617,7995.2595 -1.06048,0.4796 -0.0415,4.2462 1.28464,-0.3508 -0.008,0.6891 -1.64838,0.3278 0.0238,-5.7496 1.46817,-0.872 z"
-           inkscape:path-effect="#path-effect145848-2"
-           id="path149600"
-           d="m 364.39617,7995.2595 -1.06048,0.4796 -0.0415,4.2462 1.28464,-0.3508 -0.008,0.6891 -1.64838,0.3278 0.0238,-5.7496 1.46817,-0.872 -0.0183,1.2297"
-           style="fill:#4d4d4d;stroke:none" />
-        <path
-           id="path149602"
-           style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 471.7156,7994.9581 1.90862,0 0,2.4099 -1.90862,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 468.90547,7994.958 1.9086,0 0,2.41 -1.9086,0 z"
-           style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path149604"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path149606"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4"
-           d="m 466.79703,7994.9136 1.21366,0 0,4.2539 -1.21366,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 467.53583,7994.9136 0.47486,0 0,4.2539 -0.47486,0 z"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4"
-           id="path149608" />
-        <rect
-           transform="matrix(1,0,-0.01802634,0.99983751,0,0)"
-           y="7995.9048"
-           x="585.81073"
-           height="4.7188153"
-           width="23.795719"
-           id="rect149610"
-           style="fill:url(#linearGradient149708);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149612"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 442.96371,7995.2727 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 446.15365,7995.2727 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path149614"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149616"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 449.37599,7995.2727 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 369.77778,7994.026 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           id="path149618" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149620"
-           d="m 373.0097,7995.654 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path149622"
-           d="m 390.7089,7995.5218 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.53484,7995.654 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path149624" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 373.21327,7997.0106 7.18911,0 0,0.4071 -7.18911,0 z"
-           id="path149626" />
-        <path
-           id="path149628"
-           d="m 381.73841,7997.0106 7.18912,0 0,0.4071 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path149630"
-           d="m 373.36597,7998.096 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.89111,7998.096 7.18912,0 0,0.407 -7.18912,0 z"
-           id="path149632" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 373.41686,7999.1361 7.18912,0 0,0.407 -7.18912,0 z"
-           id="path149634" />
-        <path
-           id="path149636"
-           d="m 381.94201,7999.1361 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 390.59439,7999.1361 7.18912,0 0,0.407 -7.18912,0 z"
-           id="path149638" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 369.77778,7995.0661 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-           style="fill:#000000;stroke:none"
-           id="path149640" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 401.28774,7994.474 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path149642" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 403.99722,7994.4151 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path149644" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149646"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.33384,7996.5987 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149648"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 404.04332,7996.54 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z" />
-        <path
-           d="m 401.38387,7998.9045 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path149650"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 404.09334,7998.8457 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path149652"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path149654"
-           style="fill:#808080;stroke:#000000;stroke-width:0.42910308"
-           d="m 406.58427,7994.0259 29.32904,-0.045 0.0637,6.331 -29.20179,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 409.8162,7995.654 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path149656"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 427.5154,7995.5218 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-           id="path149658" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path149660"
-           d="m 418.34134,7995.654 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path149662"
-           d="m 410.01977,7997.0106 7.18913,0 0,0.4071 -7.18913,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.54491,7997.0106 7.18913,0 0,0.4071 -7.18913,0 z"
-           id="path149664" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.17247,7998.096 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path149666" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path149668"
-           d="m 418.69761,7998.096 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path149670"
-           d="m 410.22338,7999.1361 7.1891,0 0,0.407 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.74852,7999.1361 7.1891,0 0,0.407 -7.1891,0 z"
-           id="path149672" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path149674"
-           d="m 427.40089,7999.1361 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path149676"
-           style="fill:#000000;stroke:none"
-           d="m 406.58427,7995.0661 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 394.53988,7995.5027 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path149678" />
-        <path
-           id="path149680"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 394.53996,7998.7362 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path149682"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 431.17483,7995.5027 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.1749,7998.7362 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path149684" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 471.7156,7998.2726 1.90862,0 0,1.0539 -1.90862,0 z"
-           style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path149686" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149688"
-           style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 468.90547,7998.2725 1.9086,0 0,1.054 -1.9086,0 z" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 442.96371,7997.4474 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path149690"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149692"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 446.15365,7997.4474 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 449.37599,7997.4474 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path149694"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149696"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 452.6521,7997.4474 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 455.84203,7997.4474 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path149698"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149700"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 459.06437,7997.4474 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-307.42303,-548.97219)">
+    <g style="display:inline" transform="matrix(1.0266398,0,0,1.0266398,-61.749833,-7647.3587)" id="g149580">
+      <g id="g149582">
+        <path inkscape:connector-curvature="0" d="m 365.13604,7992.8485 0.13246,8.167 113.50577,0.3686 -0.26297,-8.5493 -30.98725,-9.1867 -52.35964,0 z" style="fill:url(#linearGradient149702);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149584" sodipodi:nodetypes="ccccccc"/>
+        <path id="path149586" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.89336765;stroke-opacity:1" d="m 365.6445,7993.3146 112.41737,0 0,7.6187 -112.41737,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:url(#linearGradient149704);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21909525;stroke-miterlimit:4;stroke-dasharray:none" d="m 477.36379,7993.2912 c -0.74882,0 -1.34622,0.3835 -1.3527,0.8596 l -0.0937,5.8129 c -0.006,0.4764 0.59608,0.8598 1.34491,0.8598 l 5.45939,0 c 0.74882,0 1.34627,-0.3834 1.35268,-0.8598 l 0.0199,-1.4019 -0.84048,-0.062 -0.23915,-2.6915 1.1304,0.072 0.0229,-1.7295 c 0.006,-0.4763 -0.59607,-0.8597 -1.34489,-0.8597 l -5.45939,0 z m 2.93159,2.8143 c 0.23848,0.01 0.44296,0.2595 0.45145,0.5629 0.008,0.3036 -0.18024,0.5382 -0.41837,0.5322 -0.23847,-0.01 -0.42596,-0.2491 -0.43446,-0.5526 -0.009,-0.3034 0.16328,-0.5483 0.40138,-0.5425 z" id="path149588" inkscape:connector-curvature="0"/>
+        <path style="fill:#808080;fill-opacity:1;stroke:none" d="m 479.52455,7994.0543 1.09723,-0.036 1.41762,0.8449 0.18563,5.6923 -1.09956,0.062 -1.64028,-1.0083 0.91188,-0.026 0.69831,0.2404 -0.14334,-4.8817 -1.42749,-0.8876" id="path149590" inkscape:path-effect="#path-effect145856-3" inkscape:original-d="m 479.52455,7994.0543 c 0.0258,-0.3919 0.41082,-0.2615 1.09723,-0.036 l 1.41762,0.8449 0.18563,5.6923 c -0.27316,0.3102 -0.65908,0.1392 -1.09956,0.062 l -1.64028,-1.0083 c 0.29248,-0.2598 0.38742,-0.1277 0.91188,-0.026 l 0.69831,0.2404 -0.14334,-4.8817 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+        <path style="fill:#4d4d4d;fill-opacity:1;stroke:none" d="m 479.5648,7995.2724 1.05024,0.4755 0.13727,4.2094 -1.26699,-0.3477 0.0236,0.683 1.623,0.325 -0.154,-5.6998 -1.45871,-0.8642 0.0456,1.2188" id="path149592" inkscape:path-effect="#path-effect145854-0" inkscape:original-d="m 479.5648,7995.2724 1.05024,0.4755 0.13727,4.2094 -1.26699,-0.3477 0.0236,0.683 1.623,0.325 -0.154,-5.6998 -1.45871,-0.8642 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+        <path inkscape:connector-curvature="0" d="m 365.64451,7993.3144 73.48309,0 0,7.6189 -73.48309,0 z" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.89338529;stroke-opacity:1" id="path149594" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" id="path149596" d="m 366.59557,7993.2609 c 0.76408,0 1.38262,0.3867 1.40034,0.8672 l 0.23161,5.8637 c 0.0176,0.4805 -0.58808,0.8672 -1.35214,0.8672 l -5.57042,0 c -0.76404,0 -1.38266,-0.3867 -1.40032,-0.8672 l -0.0532,-1.4143 0.85614,-0.063 0.18102,-2.7149 -1.15164,0.072 -0.0639,-1.7447 c -0.0178,-0.4803 0.58805,-0.8671 1.3521,-0.8671 l 5.57042,0 z m -2.92534,2.839 c -0.24309,0.01 -0.44589,0.2616 -0.44746,0.5678 -0.002,0.3062 0.19653,0.5427 0.43934,0.5368 0.24308,-0.01 0.42881,-0.2515 0.43038,-0.5575 0.002,-0.3061 -0.17945,-0.5531 -0.42226,-0.5471 z" style="fill:url(#linearGradient149706);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.14818402;stroke-miterlimit:4;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 364.40875,7994.0305 c -0.0353,-0.3953 -0.42529,-0.2638 -1.12034,-0.037 l -1.42669,0.8523 -0.0562,5.742 c 0.28596,0.3131 0.67573,0.1406 1.12332,0.063 l 1.65006,-1.0172 c -0.30451,-0.2619 -0.39831,-0.1287 -0.93104,-0.026 l -0.70688,0.2424 0.032,-4.9241 z" inkscape:path-effect="#path-effect145850-9" id="path149598" d="m 364.40875,7994.0305 -1.12034,-0.037 -1.42669,0.8523 -0.0562,5.742 1.12332,0.063 1.65006,-1.0172 -0.93104,-0.026 -0.70688,0.2424 0.032,-4.9241 1.43577,-0.8954" style="fill:#808080;stroke:none"/>
+        <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 364.39617,7995.2595 -1.06048,0.4796 -0.0415,4.2462 1.28464,-0.3508 -0.008,0.6891 -1.64838,0.3278 0.0238,-5.7496 1.46817,-0.872 z" inkscape:path-effect="#path-effect145848-2" id="path149600" d="m 364.39617,7995.2595 -1.06048,0.4796 -0.0415,4.2462 1.28464,-0.3508 -0.008,0.6891 -1.64838,0.3278 0.0238,-5.7496 1.46817,-0.872 -0.0183,1.2297" style="fill:#4d4d4d;stroke:none"/>
+        <path id="path149602" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.7156,7994.9581 1.90862,0 0,2.4099 -1.90862,0 z" inkscape:connector-curvature="0"/>
+        <path d="m 468.90547,7994.958 1.9086,0 0,2.41 -1.9086,0 z" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149604" inkscape:connector-curvature="0"/>
+        <path id="path149606" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4" d="m 466.79703,7994.9136 1.21366,0 0,4.2539 -1.21366,0 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 467.53583,7994.9136 0.47486,0 0,4.2539 -0.47486,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4" id="path149608"/>
+        <rect transform="matrix(1,0,-0.01802634,0.99983751,0,0)" y="7995.9048" x="585.81073" height="4.7188153" width="23.795719" id="rect149610" style="fill:url(#linearGradient149708);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554"/>
+        <path inkscape:connector-curvature="0" id="path149612" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 442.96371,7995.2727 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 446.15365,7995.2727 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path149614" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path149616" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 449.37599,7995.2727 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 369.77778,7994.026 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path149618"/>
+        <path inkscape:connector-curvature="0" id="path149620" d="m 373.0097,7995.654 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path149622" d="m 390.7089,7995.5218 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.53484,7995.654 7.1891,0 0,0.7235 -7.1891,0 z" id="path149624"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.21327,7997.0106 7.18911,0 0,0.4071 -7.18911,0 z" id="path149626"/>
+        <path id="path149628" d="m 381.73841,7997.0106 7.18912,0 0,0.4071 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path149630" d="m 373.36597,7998.096 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.89111,7998.096 7.18912,0 0,0.407 -7.18912,0 z" id="path149632"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.41686,7999.1361 7.18912,0 0,0.407 -7.18912,0 z" id="path149634"/>
+        <path id="path149636" d="m 381.94201,7999.1361 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 390.59439,7999.1361 7.18912,0 0,0.407 -7.18912,0 z" id="path149638"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 369.77778,7995.0661 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" style="fill:#000000;stroke:none" id="path149640"/>
+        <path inkscape:connector-curvature="0" d="m 401.28774,7994.474 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149642"/>
+        <path inkscape:connector-curvature="0" d="m 403.99722,7994.4151 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149644"/>
+        <path inkscape:connector-curvature="0" id="path149646" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.33384,7996.5987 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z"/>
+        <path inkscape:connector-curvature="0" id="path149648" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 404.04332,7996.54 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z"/>
+        <path d="m 401.38387,7998.9045 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149650" inkscape:connector-curvature="0"/>
+        <path d="m 404.09334,7998.8457 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149652" inkscape:connector-curvature="0"/>
+        <path id="path149654" style="fill:#808080;stroke:#000000;stroke-width:0.42910308" d="m 406.58427,7994.0259 29.32904,-0.045 0.0637,6.331 -29.20179,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 409.8162,7995.654 7.1891,0 0,0.7235 -7.1891,0 z" id="path149656" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.5154,7995.5218 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z" id="path149658"/>
+        <path sodipodi:nodetypes="ccccc" id="path149660" d="m 418.34134,7995.654 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path149662" d="m 410.01977,7997.0106 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.54491,7997.0106 7.18913,0 0,0.4071 -7.18913,0 z" id="path149664"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.17247,7998.096 7.18911,0 0,0.407 -7.18911,0 z" id="path149666"/>
+        <path sodipodi:nodetypes="ccccc" id="path149668" d="m 418.69761,7998.096 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path149670" d="m 410.22338,7999.1361 7.1891,0 0,0.407 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.74852,7999.1361 7.1891,0 0,0.407 -7.1891,0 z" id="path149672"/>
+        <path sodipodi:nodetypes="ccccc" id="path149674" d="m 427.40089,7999.1361 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path149676" style="fill:#000000;stroke:none" d="m 406.58427,7995.0661 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.53988,7995.5027 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149678"/>
+        <path id="path149680" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.53996,7998.7362 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path149682" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.17483,7995.5027 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.1749,7998.7362 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149684"/>
+        <path inkscape:connector-curvature="0" d="m 471.7156,7998.2726 1.90862,0 0,1.0539 -1.90862,0 z" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149686"/>
+        <path inkscape:connector-curvature="0" id="path149688" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 468.90547,7998.2725 1.9086,0 0,1.054 -1.9086,0 z"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 442.96371,7997.4474 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path149690" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path149692" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 446.15365,7997.4474 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 449.37599,7997.4474 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path149694" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path149696" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 452.6521,7997.4474 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 455.84203,7997.4474 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path149698" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path149700" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 459.06437,7997.4474 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Rackmountable_2U_server_2D.svg b/misc/images/svg/elements/Rackmountable_2U_server_2D.svg
index 66b35f829cf..4e7a97a0656 100644
--- a/misc/images/svg/elements/Rackmountable_2U_server_2D.svg
+++ b/misc/images/svg/elements/Rackmountable_2U_server_2D.svg
@@ -1,761 +1,153 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.00008"
-   height="17.478027"
-   id="svg137128"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 30">
-  <defs
-     id="defs137130">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-9-5"
-       id="linearGradient149934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-18.559388,-432.42507)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-9-5">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-6-4" />
-      <stop
-         id="stop76664-9-25-9-0"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-21-6" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.00008" height="17.478027" id="svg137128" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 30">
+  <defs id="defs137130">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-9-5" id="linearGradient149934" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-18.559388,-432.42507)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-9-5">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-6-4"/>
+      <stop id="stop76664-9-25-9-0" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-21-6"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45434-5-3-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45430-8-1-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0"
-       id="linearGradient149936"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-20.251492,-432.42507)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient42443-7-52-0">
-      <stop
-         id="stop42445-53-8-3"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-2-7" />
-      <stop
-         id="stop42449-3-19-2"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect45434-5-3-2" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect45430-8-1-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0" id="linearGradient149936" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-20.251492,-432.42507)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient42443-7-52-0">
+      <stop id="stop42445-53-8-3" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-2-7"/>
+      <stop id="stop42449-3-19-2" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45449-51-8-3"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45451-306-5-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-6-8"
-       id="linearGradient149938"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,-0.02945495,1.0535452,-19.316631,-432.42507)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-6-8">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-76-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-7-9" />
+    <inkscape:path-effect is_visible="true" id="path-effect45449-51-8-3" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect45451-306-5-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-6-8" id="linearGradient149938" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,-0.02945495,1.0535452,-19.316631,-432.42507)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-6-8">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-76-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-7-9"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-5-4"
-       id="linearGradient149940"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-27.112939,-432.49535)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-5-4">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-5-2" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-28-8" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-5-4" id="linearGradient149940" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-27.112939,-432.49535)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-5-4">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-5-2"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-28-8"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="179.00005"
-     inkscape:cy="-54.118175"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="176"
-     inkscape:window-y="232"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata137133">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="179.00005" inkscape:cy="-54.118175" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="176" inkscape:window-y="232" inkscape:window-maximized="0"/>
+  <metadata id="metadata137133">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-195.99995,-460.76598)">
-    <g
-       style="display:inline"
-       transform="translate(-547.88306,-7311.7353)"
-       id="g149718"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_2U_server_2D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g149720"
-         transform="translate(0,-80)">
-        <g
-           transform="matrix(1.0266398,0,0,1.0266398,382.18931,-70.5375)"
-           id="g149722">
-          <g
-             transform="translate(-7.2319631,-275.15898)"
-             id="g149724">
-            <g
-               id="g149726">
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path149730"
-                 style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.92312402;stroke-opacity:1"
-                 d="m 365.62668,7993.0681 112.45301,0 0,16.1013 -112.45301,0 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 style="fill:url(#linearGradient149934);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31618708;stroke-miterlimit:4;stroke-dasharray:none"
-                 d="m 477.39368,7993.2997 c -0.74174,0 -1.36725,0.8063 -1.41556,1.8075 l -0.60439,12.222 c -0.0483,1.0015 0.51476,1.8077 1.25651,1.8077 l 5.40774,0 c 0.74174,0 1.36729,-0.8062 1.41556,-1.8077 l 0.14314,-2.9477 -0.82707,-0.1297 0,-5.6591 1.11336,0.1506 0.17496,-3.6366 c 0.0483,-1.0014 -0.51477,-1.8074 -1.25651,-1.8074 l -5.40774,0 z m 2.65615,5.9174 c 0.23534,0.014 0.41593,0.5454 0.39763,1.1835 -0.0183,0.6382 -0.2259,1.1314 -0.46124,1.119 -0.23534,-0.014 -0.40001,-0.5238 -0.38172,-1.162 0.0182,-0.638 0.21,-1.1528 0.44533,-1.1405 z"
-                 id="path149732"
-                 inkscape:connector-curvature="0" />
-              <path
-                 style="fill:#808080;fill-opacity:1;stroke:none"
-                 d="m 479.46683,7994.9041 1.09002,-0.077 1.32985,1.7765 -0.31713,11.9685 -1.09462,0.1297 -1.53602,-2.1201 0.90554,-0.053 0.67055,0.5054 0.28767,-10.2639 -1.33586,-1.8661"
-                 id="path149734"
-                 inkscape:path-effect="#path-effect45434-5-3-2"
-                 inkscape:original-d="m 479.46683,7994.9041 c 0.06,-0.8238 0.42995,-0.5498 1.09002,-0.077 l 1.32985,1.7765 -0.31713,11.9685 c -0.29789,0.6523 -0.6651,0.2926 -1.09462,0.1297 l -1.53602,-2.1201 c 0.31257,-0.5462 0.395,-0.2684 0.90554,-0.053 l 0.67055,0.5054 0.28767,-10.2639 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccccc" />
-              <path
-                 style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-                 d="m 479.39949,7997.4654 0.99846,0.9997 -0.23452,8.8505 -1.22441,-0.7311 -0.0368,1.4362 1.57904,0.6833 0.34912,-11.9841 -1.36885,-1.8172 -0.062,2.5627"
-                 id="path149736"
-                 inkscape:path-effect="#path-effect45430-8-1-9"
-                 inkscape:original-d="m 479.39949,7997.4654 0.99846,0.9997 -0.23452,8.8505 -1.22441,-0.7311 -0.0368,1.4362 1.57904,0.6833 0.34912,-11.9841 -1.36885,-1.8172 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 365.62671,7993.0681 73.51722,0 0,16.1013 -73.51722,0 z"
-                 style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.92319888;stroke-opacity:1"
-                 id="path149738"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149740"
-                 d="m 366.31282,7993.5372 c 0.74177,0 1.36728,0.8059 1.41558,1.8075 l 0.60441,12.2221 c 0.0482,1.0014 -0.51478,1.8075 -1.25653,1.8075 l -5.40779,0 c -0.74173,0 -1.36732,-0.8061 -1.41557,-1.8075 l -0.14315,-2.9478 0.82707,-0.1298 0,-5.6591 -1.11336,0.1504 -0.17495,-3.6364 c -0.0483,-1.0014 0.51476,-1.8075 1.2565,-1.8075 l 5.40779,0 z m -2.65617,5.9174 c -0.23534,0.014 -0.41593,0.5454 -0.39764,1.1836 0.0183,0.6381 0.22592,1.1311 0.46126,1.1189 0.23534,-0.014 0.40002,-0.5241 0.38173,-1.1621 -0.0183,-0.6382 -0.21002,-1.1528 -0.44535,-1.1404 z"
-                 style="fill:url(#linearGradient149936);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21079138;stroke-miterlimit:4;stroke-dasharray:none" />
-              <path
-                 sodipodi:nodetypes="cccccccccc"
-                 inkscape:connector-curvature="0"
-                 inkscape:original-d="m 364.23966,7995.1415 c -0.0599,-0.8241 -0.42995,-0.55 -1.09002,-0.077 l -1.32988,1.7765 0.31715,11.9686 c 0.29789,0.6524 0.66511,0.2927 1.09461,0.1298 l 1.53604,-2.1202 c -0.31257,-0.5459 -0.39501,-0.2683 -0.90554,-0.053 l -0.67055,0.5054 -0.28768,-10.264 z"
-                 inkscape:path-effect="#path-effect45449-51-8-3"
-                 id="path149742"
-                 d="m 364.23966,7995.1415 -1.09002,-0.077 -1.32988,1.7765 0.31715,11.9686 1.09461,0.1298 1.53604,-2.1202 -0.90554,-0.053 -0.67055,0.5054 -0.28768,-10.264 1.33587,-1.8661"
-                 style="fill:#808080;stroke:none" />
-              <path
-                 sodipodi:nodetypes="ccccccccc"
-                 inkscape:connector-curvature="0"
-                 inkscape:original-d="m 364.307,7997.7028 -0.99847,0.9997 0.23453,8.8506 1.22442,-0.7312 0.0368,1.4364 -1.57905,0.6833 -0.34911,-11.9843 1.36887,-1.8173 z"
-                 inkscape:path-effect="#path-effect45451-306-5-5"
-                 id="path149744"
-                 d="m 364.307,7997.7028 -0.99847,0.9997 0.23453,8.8506 1.22442,-0.7312 0.0368,1.4364 -1.57905,0.6833 -0.34911,-11.9843 1.36887,-1.8173 0.062,2.5628"
-                 style="fill:#4d4d4d;stroke:none" />
-              <path
-                 id="path149746"
-                 style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-                 d="m 369.46174,7994.5215 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 style="fill:#000000;stroke:none"
-                 d="m 372.69366,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z"
-                 id="path149748"
-                 inkscape:connector-curvature="0" />
-              <path
-                 style="fill:#000000;stroke:none"
-                 d="m 390.39286,7996.0173 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z"
-                 id="path149750"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccccccccccccc" />
-              <path
-                 id="path149752"
-                 d="m 381.2188,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path149754"
-                 d="m 372.89723,7997.5061 7.18911,0 0,0.4071 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 381.42237,7997.5061 7.18912,0 0,0.4071 -7.18912,0 z"
-                 id="path149756" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 373.04993,7998.5915 7.18911,0 0,0.407 -7.18911,0 z"
-                 id="path149758" />
-              <path
-                 id="path149760"
-                 d="m 381.57507,7998.5915 7.18912,0 0,0.407 -7.18912,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path149762"
-                 d="m 373.10082,7999.6317 7.18912,0 0,0.4069 -7.18912,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 381.62597,7999.6317 7.18911,0 0,0.4069 -7.18911,0 z"
-                 id="path149764" />
-              <path
-                 id="path149766"
-                 d="m 390.27835,7999.6317 7.18912,0 0,0.4069 -7.18912,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path149768"
-                 style="fill:#000000;stroke:none"
-                 d="m 369.46174,7995.5616 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccsssccccccc" />
-              <path
-                 id="path149770"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 401.13052,7994.9712 0.47457,-0.011 c 0.24733,-0.011 0.46443,0.131 0.48672,0.3059 l 0.031,0.2425 c 0.0223,0.175 -0.15884,0.3201 -0.40618,0.3255 l -0.47457,0.011 c -0.24735,0.01 -0.46445,-0.131 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3253 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path149772"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 403.83999,7994.9124 0.47457,-0.011 c 0.24735,-0.01 0.46444,0.1311 0.48676,0.3059 l 0.0309,0.2425 c 0.0222,0.1749 -0.15886,0.3201 -0.40621,0.3255 l -0.47456,0.01 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15886,-0.32 0.40621,-0.3252 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 d="m 401.17662,7997.096 0.47457,-0.01 c 0.24734,-0.011 0.46444,0.1313 0.48673,0.306 l 0.031,0.2426 c 0.0223,0.1747 -0.15884,0.32 -0.40619,0.3254 l -0.47457,0.011 c -0.24735,0 -0.46445,-0.1312 -0.48677,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1747 0.15885,-0.3201 0.40621,-0.3254 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path149774"
-                 inkscape:connector-curvature="0" />
-              <path
-                 d="m 403.88609,7997.0372 0.47458,-0.01 c 0.24734,-0.011 0.46443,0.1313 0.48675,0.3061 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3254 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path149776"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149778"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 401.22664,7999.4017 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1312 0.48674,0.3061 l 0.031,0.2424 c 0.0224,0.1751 -0.15883,0.3203 -0.40618,0.3257 l -0.47457,0.011 c -0.24735,0.011 -0.46444,-0.1311 -0.48677,-0.3061 l -0.0309,-0.2424 c -0.0223,-0.175 0.15885,-0.3202 0.4062,-0.3256 z" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149780"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 403.93612,7999.343 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.1313 0.48676,0.3061 l 0.0309,0.2425 c 0.0222,0.175 -0.15885,0.3202 -0.4062,0.3256 l -0.47457,0.01 c -0.24733,0.011 -0.46444,-0.1312 -0.48675,-0.3062 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.32 0.4062,-0.3254 z" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 406.58427,7994.5214 29.32904,-0.045 0.0637,6.3309 -29.20179,0 z"
-                 style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-                 id="path149782" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149784"
-                 d="m 409.8162,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path149786"
-                 d="m 427.5154,7996.0173 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1023 0,2.9844 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9844 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccccccccccccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 418.34134,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z"
-                 id="path149788"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 410.01977,7997.5061 7.18913,0 0,0.4071 -7.18913,0 z"
-                 id="path149790"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path149792"
-                 d="m 418.54491,7997.5061 7.18913,0 0,0.4071 -7.18913,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path149794"
-                 d="m 410.17247,7998.5915 7.18911,0 0,0.407 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 418.69761,7998.5915 7.18911,0 0,0.407 -7.18911,0 z"
-                 id="path149796"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 410.22338,7999.6317 7.1891,0 0,0.4069 -7.1891,0 z"
-                 id="path149798"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path149800"
-                 d="m 418.74852,7999.6317 7.1891,0 0,0.4069 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 427.40089,7999.6317 7.18911,0 0,0.4069 -7.18911,0 z"
-                 id="path149802"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccsssccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 406.58427,7995.5616 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.059,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-                 style="fill:#000000;stroke:none"
-                 id="path149804" />
-              <path
-                 id="path149806"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 394.22384,7995.9982 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccc" />
-              <path
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 394.22392,7999.2317 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path149808" />
-              <path
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 431.17483,7995.9982 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path149810" />
-              <path
-                 id="path149812"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 431.1749,7999.2317 0,-0.4635 2.11403,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 441.70238,7995.8111 31.74661,0 -0.11348,4.0591 -31.74662,0 z"
-                 style="fill:url(#linearGradient149938);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.50041842"
-                 id="path149814" />
-              <g
-                 transform="matrix(0.14942814,0,-0.03044284,0.12343177,389.80533,6930.2532)"
-                 style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-                 id="g149816">
-                <path
-                   id="path149818"
-                   style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Arial Bold"
-                   d="m 2304.2619,8640.1281 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z m -6.9816,6.5971 -2.8381,-7.9403 1.7386,0 2.0094,5.8767 1.9445,-5.8767 1.7007,0 -2.8436,7.9403 z m -10.0472,-7.9403 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z"
-                   inkscape:connector-curvature="0" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-195.99995,-460.76598)">
+    <g style="display:inline" transform="translate(-547.88306,-7311.7353)" id="g149718">
+      <g id="g149720" transform="translate(0,-80)">
+        <g transform="matrix(1.0266398,0,0,1.0266398,382.18931,-70.5375)" id="g149722">
+          <g transform="translate(-7.2319631,-275.15898)" id="g149724">
+            <g id="g149726">
+              <path sodipodi:nodetypes="ccccc" id="path149730" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.92312402;stroke-opacity:1" d="m 365.62668,7993.0681 112.45301,0 0,16.1013 -112.45301,0 z" inkscape:connector-curvature="0"/>
+              <path style="fill:url(#linearGradient149934);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31618708;stroke-miterlimit:4;stroke-dasharray:none" d="m 477.39368,7993.2997 c -0.74174,0 -1.36725,0.8063 -1.41556,1.8075 l -0.60439,12.222 c -0.0483,1.0015 0.51476,1.8077 1.25651,1.8077 l 5.40774,0 c 0.74174,0 1.36729,-0.8062 1.41556,-1.8077 l 0.14314,-2.9477 -0.82707,-0.1297 0,-5.6591 1.11336,0.1506 0.17496,-3.6366 c 0.0483,-1.0014 -0.51477,-1.8074 -1.25651,-1.8074 l -5.40774,0 z m 2.65615,5.9174 c 0.23534,0.014 0.41593,0.5454 0.39763,1.1835 -0.0183,0.6382 -0.2259,1.1314 -0.46124,1.119 -0.23534,-0.014 -0.40001,-0.5238 -0.38172,-1.162 0.0182,-0.638 0.21,-1.1528 0.44533,-1.1405 z" id="path149732" inkscape:connector-curvature="0"/>
+              <path style="fill:#808080;fill-opacity:1;stroke:none" d="m 479.46683,7994.9041 1.09002,-0.077 1.32985,1.7765 -0.31713,11.9685 -1.09462,0.1297 -1.53602,-2.1201 0.90554,-0.053 0.67055,0.5054 0.28767,-10.2639 -1.33586,-1.8661" id="path149734" inkscape:path-effect="#path-effect45434-5-3-2" inkscape:original-d="m 479.46683,7994.9041 c 0.06,-0.8238 0.42995,-0.5498 1.09002,-0.077 l 1.32985,1.7765 -0.31713,11.9685 c -0.29789,0.6523 -0.6651,0.2926 -1.09462,0.1297 l -1.53602,-2.1201 c 0.31257,-0.5462 0.395,-0.2684 0.90554,-0.053 l 0.67055,0.5054 0.28767,-10.2639 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+              <path style="fill:#4d4d4d;fill-opacity:1;stroke:none" d="m 479.39949,7997.4654 0.99846,0.9997 -0.23452,8.8505 -1.22441,-0.7311 -0.0368,1.4362 1.57904,0.6833 0.34912,-11.9841 -1.36885,-1.8172 -0.062,2.5627" id="path149736" inkscape:path-effect="#path-effect45430-8-1-9" inkscape:original-d="m 479.39949,7997.4654 0.99846,0.9997 -0.23452,8.8505 -1.22441,-0.7311 -0.0368,1.4362 1.57904,0.6833 0.34912,-11.9841 -1.36885,-1.8172 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+              <path inkscape:connector-curvature="0" d="m 365.62671,7993.0681 73.51722,0 0,16.1013 -73.51722,0 z" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.92319888;stroke-opacity:1" id="path149738" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" id="path149740" d="m 366.31282,7993.5372 c 0.74177,0 1.36728,0.8059 1.41558,1.8075 l 0.60441,12.2221 c 0.0482,1.0014 -0.51478,1.8075 -1.25653,1.8075 l -5.40779,0 c -0.74173,0 -1.36732,-0.8061 -1.41557,-1.8075 l -0.14315,-2.9478 0.82707,-0.1298 0,-5.6591 -1.11336,0.1504 -0.17495,-3.6364 c -0.0483,-1.0014 0.51476,-1.8075 1.2565,-1.8075 l 5.40779,0 z m -2.65617,5.9174 c -0.23534,0.014 -0.41593,0.5454 -0.39764,1.1836 0.0183,0.6381 0.22592,1.1311 0.46126,1.1189 0.23534,-0.014 0.40002,-0.5241 0.38173,-1.1621 -0.0183,-0.6382 -0.21002,-1.1528 -0.44535,-1.1404 z" style="fill:url(#linearGradient149936);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21079138;stroke-miterlimit:4;stroke-dasharray:none"/>
+              <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 364.23966,7995.1415 c -0.0599,-0.8241 -0.42995,-0.55 -1.09002,-0.077 l -1.32988,1.7765 0.31715,11.9686 c 0.29789,0.6524 0.66511,0.2927 1.09461,0.1298 l 1.53604,-2.1202 c -0.31257,-0.5459 -0.39501,-0.2683 -0.90554,-0.053 l -0.67055,0.5054 -0.28768,-10.264 z" inkscape:path-effect="#path-effect45449-51-8-3" id="path149742" d="m 364.23966,7995.1415 -1.09002,-0.077 -1.32988,1.7765 0.31715,11.9686 1.09461,0.1298 1.53604,-2.1202 -0.90554,-0.053 -0.67055,0.5054 -0.28768,-10.264 1.33587,-1.8661" style="fill:#808080;stroke:none"/>
+              <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 364.307,7997.7028 -0.99847,0.9997 0.23453,8.8506 1.22442,-0.7312 0.0368,1.4364 -1.57905,0.6833 -0.34911,-11.9843 1.36887,-1.8173 z" inkscape:path-effect="#path-effect45451-306-5-5" id="path149744" d="m 364.307,7997.7028 -0.99847,0.9997 0.23453,8.8506 1.22442,-0.7312 0.0368,1.4364 -1.57905,0.6833 -0.34911,-11.9843 1.36887,-1.8173 0.062,2.5628" style="fill:#4d4d4d;stroke:none"/>
+              <path id="path149746" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" d="m 369.46174,7994.5215 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path style="fill:#000000;stroke:none" d="m 372.69366,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z" id="path149748" inkscape:connector-curvature="0"/>
+              <path style="fill:#000000;stroke:none" d="m 390.39286,7996.0173 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z" id="path149750" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+              <path id="path149752" d="m 381.2188,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path149754" d="m 372.89723,7997.5061 7.18911,0 0,0.4071 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.42237,7997.5061 7.18912,0 0,0.4071 -7.18912,0 z" id="path149756"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.04993,7998.5915 7.18911,0 0,0.407 -7.18911,0 z" id="path149758"/>
+              <path id="path149760" d="m 381.57507,7998.5915 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path149762" d="m 373.10082,7999.6317 7.18912,0 0,0.4069 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.62597,7999.6317 7.18911,0 0,0.4069 -7.18911,0 z" id="path149764"/>
+              <path id="path149766" d="m 390.27835,7999.6317 7.18912,0 0,0.4069 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path149768" style="fill:#000000;stroke:none" d="m 369.46174,7995.5616 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+              <path id="path149770" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.13052,7994.9712 0.47457,-0.011 c 0.24733,-0.011 0.46443,0.131 0.48672,0.3059 l 0.031,0.2425 c 0.0223,0.175 -0.15884,0.3201 -0.40618,0.3255 l -0.47457,0.011 c -0.24735,0.01 -0.46445,-0.131 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3253 z" inkscape:connector-curvature="0"/>
+              <path id="path149772" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.83999,7994.9124 0.47457,-0.011 c 0.24735,-0.01 0.46444,0.1311 0.48676,0.3059 l 0.0309,0.2425 c 0.0222,0.1749 -0.15886,0.3201 -0.40621,0.3255 l -0.47456,0.01 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15886,-0.32 0.40621,-0.3252 z" inkscape:connector-curvature="0"/>
+              <path d="m 401.17662,7997.096 0.47457,-0.01 c 0.24734,-0.011 0.46444,0.1313 0.48673,0.306 l 0.031,0.2426 c 0.0223,0.1747 -0.15884,0.32 -0.40619,0.3254 l -0.47457,0.011 c -0.24735,0 -0.46445,-0.1312 -0.48677,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1747 0.15885,-0.3201 0.40621,-0.3254 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149774" inkscape:connector-curvature="0"/>
+              <path d="m 403.88609,7997.0372 0.47458,-0.01 c 0.24734,-0.011 0.46443,0.1313 0.48675,0.3061 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3254 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149776" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path149778" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.22664,7999.4017 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1312 0.48674,0.3061 l 0.031,0.2424 c 0.0224,0.1751 -0.15883,0.3203 -0.40618,0.3257 l -0.47457,0.011 c -0.24735,0.011 -0.46444,-0.1311 -0.48677,-0.3061 l -0.0309,-0.2424 c -0.0223,-0.175 0.15885,-0.3202 0.4062,-0.3256 z"/>
+              <path inkscape:connector-curvature="0" id="path149780" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.93612,7999.343 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.1313 0.48676,0.3061 l 0.0309,0.2425 c 0.0222,0.175 -0.15885,0.3202 -0.4062,0.3256 l -0.47457,0.01 c -0.24733,0.011 -0.46444,-0.1312 -0.48675,-0.3062 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.32 0.4062,-0.3254 z"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 406.58427,7994.5214 29.32904,-0.045 0.0637,6.3309 -29.20179,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path149782"/>
+              <path inkscape:connector-curvature="0" id="path149784" d="m 409.8162,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+              <path id="path149786" d="m 427.5154,7996.0173 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1023 0,2.9844 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9844 0.9543,0 0.0159,-0.1132 -1.65414,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.34134,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z" id="path149788" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.01977,7997.5061 7.18913,0 0,0.4071 -7.18913,0 z" id="path149790" sodipodi:nodetypes="ccccc"/>
+              <path id="path149792" d="m 418.54491,7997.5061 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path id="path149794" d="m 410.17247,7998.5915 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.69761,7998.5915 7.18911,0 0,0.407 -7.18911,0 z" id="path149796" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.22338,7999.6317 7.1891,0 0,0.4069 -7.1891,0 z" id="path149798" sodipodi:nodetypes="ccccc"/>
+              <path id="path149800" d="m 418.74852,7999.6317 7.1891,0 0,0.4069 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.40089,7999.6317 7.18911,0 0,0.4069 -7.18911,0 z" id="path149802" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 406.58427,7995.5616 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.059,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" style="fill:#000000;stroke:none" id="path149804"/>
+              <path id="path149806" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.22384,7995.9982 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+              <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.22392,7999.2317 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149808"/>
+              <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.17483,7995.9982 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149810"/>
+              <path id="path149812" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.1749,7999.2317 0,-0.4635 2.11403,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+              <path inkscape:connector-curvature="0" d="m 441.70238,7995.8111 31.74661,0 -0.11348,4.0591 -31.74662,0 z" style="fill:url(#linearGradient149938);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.50041842" id="path149814"/>
+              <g transform="matrix(0.14942814,0,-0.03044284,0.12343177,389.80533,6930.2532)" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="g149816">
+                <path id="path149818" style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Arial Bold" d="m 2304.2619,8640.1281 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z m -6.9816,6.5971 -2.8381,-7.9403 1.7386,0 2.0094,5.8767 1.9445,-5.8767 1.7007,0 -2.8436,7.9403 z m -10.0472,-7.9403 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z" inkscape:connector-curvature="0"/>
               </g>
-              <path
-                 style="fill:#ffffff;stroke:none"
-                 d="m 470.27084,7998.0012 c -1.08707,0 -1.96833,0.1211 -1.96833,0.2713 0,0.15 0.88126,0.2712 1.96833,0.2712 1.08709,0 1.96834,-0.1212 1.96834,-0.2712 0,-0.1502 -0.88125,-0.2713 -1.96834,-0.2713 z m 0,0.1961 c 0.30515,0 0.55253,0.034 0.55253,0.075 0,0.042 -0.24738,0.075 -0.55253,0.075 -0.30514,0 -0.55251,-0.034 -0.55251,-0.075 0,-0.042 0.24737,-0.075 0.55251,-0.075 z"
-                 id="path149820"
-                 inkscape:connector-curvature="0" />
-              <text
-                 xml:space="preserve"
-                 style="font-size:0.64422148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-                 x="461.62274"
-                 y="8135.8271"
-                 id="text149822"
-                 sodipodi:linespacing="125%"
-                 transform="scale(1.0170762,0.9832105)"><tspan
-                   sodipodi:role="line"
-                   id="tspan149824"
-                   x="461.62274"
-                   y="8135.8271">ROM</tspan></text>
-              <g
-                 transform="matrix(0.02255355,0,0,-0.02180257,456.42108,8000.0463)"
-                 id="g149826"
-                 style="fill:#ffffff">
-                <g
-                   id="g149828"
-                   transform="translate(8.50391,150.1943)"
-                   style="fill:#ffffff">
-                  <path
-                     inkscape:connector-curvature="0"
-                     d="m 121.00809,-7.9961 c 0,0 -4.304,0 -4.304,0 0,0 0,5.5352 0,5.5352 0,0 4.458,0 4.458,0 2.152,0 3.229,-0.8721 3.229,-2.6113 0,-1.9522 -1.13,-2.9239 -3.383,-2.9239 z m 34.29,-2.7656 c -0.617,-3.0781 -2.206,-4.6123 -4.768,-4.6123 -3.587,0 -5.381,2.252 -5.381,6.7647 0,4.4043 1.794,6.6113 5.381,6.6113 2.562,0 4.101,-1.1309 4.613,-3.3828 0,0 2.153,0 2.153,0 -0.718,3.5869 -2.975,5.3808 -6.766,5.3808 -5.126,0 -7.687,-2.8701 -7.687,-8.6093 0,-5.7432 2.457,-8.6133 7.379,-8.6133 4.204,0 6.611,2.1523 7.228,6.4609 0,0 -2.152,0 -2.152,0 z M 82.41409,0 c -5.3311,0 -7.9951,-2.8701 -7.9951,-8.6093 0,-5.7432 2.664,-8.6133 7.9951,-8.6133 5.331,0 7.9961,2.8701 7.9961,8.6133 0,5.7392 -2.6651,8.6093 -7.9961,8.6093 z m -12.9131,-10.7617 c -0.5166,-3.0781 -2.0528,-4.6123 -4.6133,-4.6123 -3.6914,0 -5.5352,2.252 -5.5352,6.7647 0,4.4043 1.794,6.6113 5.3809,6.6113 2.5615,0 4.0996,-1.1309 4.6133,-3.3828 0,0 2.1523,0 2.1523,0 C 71.08989,-1.7939 68.83299,0 64.73339,0 c -5.0215,0 -7.5332,-2.8701 -7.5332,-8.6093 0,-5.7432 2.4072,-8.6133 7.2246,-8.6133 4.2041,0 6.6113,2.1523 7.2285,6.4609 0,0 -2.1523,0 -2.1523,0 z m 102.4011,10.3028 c 0,0 -13.221,0 -13.221,0 0,0 0,-2.002 0,-2.002 0,0 5.534,0 5.534,0 0,0 0,-14.4522 0,-14.4522 0,0 2.152,0 2.152,0 0,0 0,14.4522 0,14.4522 0,0 5.535,0 5.535,0 0,0 0,2.002 0,2.002 z m -35.824,0 c 0,0 -2.461,0 -2.461,0 0,0 -6.148,-16.4542 -6.148,-16.4542 0,0 2.302,0 2.302,0 0,0 1.694,4.7667 1.694,4.7667 0,0 6.611,0 6.611,0 0,0 1.539,-4.7667 1.539,-4.7667 0,0 2.461,0 2.461,0 0,0 -5.998,16.4542 -5.998,16.4542 z m -14.298,0 c 0,0 -7.228,0 -7.228,0 0,0 0,-16.4542 0,-16.4542 0,0 2.152,0 2.152,0 0,0 0,6.919 0,6.919 0,0 5.076,0 5.076,0 3.279,0 4.917,1.6396 4.917,4.9219 0,3.0742 -1.638,4.6133 -4.917,4.6133 z m -11.996,0 c 0,0 -3.074,0 -3.074,0 0,0 -4.768,-13.8399 -4.768,-13.8399 0,0 -4.612,13.8399 -4.612,13.8399 0,0 -3.229,0 -3.229,0 0,0 0,-16.4542 0,-16.4542 0,0 2.153,0 2.153,0 0,0 0,13.6836 0,13.6836 0,0 4.612,-13.6836 4.612,-13.6836 0,0 2.152,0 2.152,0 0,0 4.768,13.8389 4.768,13.8389 0,0 -0.154,-4.1504 -0.154,-4.1504 0,0 0,-9.6885 0,-9.6885 0,0 2.152,0 2.152,0 0,0 0,16.4542 0,16.4542 z m -61.8095,-2.9239 c 0,1.2305 -0.6172,1.8477 -1.8476,1.8477 0,0 -16.7598,0 -16.7598,0 -1.2295,0 -1.8428,-0.6172 -1.8428,-1.8477 0,0 0,-17.372 0,-17.372 0,-0.8223 -0.4131,-1.2315 -1.2304,-1.2315 0,0 -15.375,0 -15.375,0 -3.1778,0 -5.793,-1.0508 -7.8448,-3.1523 C 1.02148,-27.2412 0,-29.8808 0,-33.0595 c 0,0 0,-38.2848 0,-38.2848 0,-3.079 1.05078,-5.69 3.15329,-7.842 2.1026,-2.153 4.6875,-3.229 7.7657,-3.229 0,0 35.208,0 35.208,0 1.2304,0 1.8476,0.663 1.8476,1.998 0,0 0,77.0345 0,77.0345 z m 127.7735,-53.6601 c 0,1.331 -0.617,1.998 -1.848,1.998 0,0 -15.374,0 -15.374,0 -1.335,0 -1.998,-0.667 -1.998,-1.998 0,0 0,-8.9174 0,-8.9174 0,-2.565 -1.23,-3.845 -3.691,-3.845 -2.566,0 -3.846,1.28 -3.846,3.845 0,0 0,27.3656 0,27.3656 0,2.5615 1.28,3.8457 3.846,3.8457 2.461,0 3.691,-1.2842 3.691,-3.8457 0,0 0,-7.2236 0,-7.2236 0,-1.2344 0.663,-1.8477 1.998,-1.8477 0,0 15.374,0 15.374,0 1.231,0 1.848,0.6133 1.848,1.8477 0,0 0,12.7588 0,12.7588 0,3.0742 -1.076,5.6894 -3.229,7.8418 -2.152,2.1523 -4.767,3.2314 -7.84,3.2314 0,0 -23.679,0 -23.679,0 -3.078,0 -5.693,-1.0791 -7.846,-3.2314 -2.152,-2.1524 -3.228,-4.7676 -3.228,-7.8418 0,0 0,-38.1308 0,-38.1308 0,-3.179 1.05,-5.844 3.153,-7.996 2.103,-2.153 4.742,-3.229 7.921,-3.229 0,0 23.679,0 23.679,0 3.173,0 5.813,1.076 7.916,3.229 2.102,2.152 3.153,4.817 3.153,7.996 0,0 0,14.1474 0,14.1474 z m -50.895,3.2285 c 0,3.0742 -1.076,5.6894 -3.227,7.8418 -2.152,2.1513 -4.768,3.2285 -7.842,3.2285 0,0 -14.303,0 -14.303,0 -1.538,0 -2.305,0.7676 -2.305,2.3057 0,1.6396 0.767,2.4619 2.305,2.4619 0,0 21.527,0 21.527,0 1.23,0 1.847,0.6123 1.847,1.8427 0,0 0,12.3008 0,12.3008 0,1.2305 -0.617,1.8467 -1.847,1.8467 0,0 -30.4436,0 -30.4436,0 -3.0782,0 -5.6895,-1.0791 -7.8418,-3.2314 -2.1514,-2.1524 -3.2286,-4.7676 -3.2286,-7.8418 0,0 0,-16.2959 0,-16.2959 0,-3.0782 1.0772,-5.6895 3.2286,-7.8419 2.1523,-2.152 4.7636,-3.228 7.8418,-3.228 0,0 14.3016,0 14.3016,0 1.944,0 2.92,-1.026 2.92,-3.079 0,-1.842 -0.976,-2.764 -2.92,-2.764 0,0 -23.5282,0 -23.5282,0 -1.2305,0 -1.8438,-0.668 -1.8438,-1.998 0,0 0,-12.151 0,-12.151 0,-1.335 0.6133,-1.998 1.8438,-1.998 0,0 32.4462,0 32.4462,0 3.174,0 5.815,1.076 7.916,3.229 2.103,2.152 3.153,4.817 3.153,7.996 0,0 0,17.3759 0,17.3759 z m 46.59,-51.5119 c 0,0 -9.843,0 -9.843,0 0,0 0,5.535 0,5.535 0,0 8.917,0 8.917,0 0,0 0,1.848 0,1.848 0,0 -8.917,0 -8.917,0 0,0 0,5.072 0,5.072 0,0 9.689,0 9.689,0 0,0 0,2.002 0,2.002 0,0 -11.841,0 -11.841,0 0,0 0,-16.3 0,-16.3 0,0 11.995,0 11.995,0 0,0 0,1.843 0,1.843 z m -15.991,6.766 c 0,0 -7.228,0 -7.228,0 0,0 0,-1.844 0,-1.844 0,0 5.076,0 5.076,0 0,-3.587 -1.694,-5.38 -5.076,-5.38 -3.587,0 -5.381,2.252 -5.381,6.765 0,4.404 1.794,6.611 5.381,6.611 2.665,0 4.254,-1.131 4.767,-3.383 0,0 2.152,0 2.152,0 -0.409,3.587 -2.715,5.381 -6.919,5.381 -5.126,0 -7.687,-2.87 -7.687,-8.609 0,-2.869 0.742,-5.026 2.227,-6.461 1.485,-1.435 3.253,-2.152 5.305,-2.152 2.461,0 4.255,0.872 5.385,2.615 0,0 0.613,-2.152 0.613,-2.152 0,0 1.385,0 1.385,0 0,0 0,8.609 0,8.609 z m -21.526,7.691 c 0,0 -2.461,0 -2.461,0 0,0 -6.303,-16.3 -6.303,-16.3 0,0 2.307,0 2.307,0 0,0 1.689,4.613 1.689,4.613 0,0 6.611,0 6.611,0 0,0 1.694,-4.613 1.694,-4.613 0,0 2.306,0 2.306,0 0,0 -5.843,16.3 -5.843,16.3 z m -9.227,-15.991 c -0.513,0.2 -0.767,0.763 -0.767,1.688 0,0 -0.155,2.924 -0.155,2.924 -0.103,1.331 -0.771,2.358 -1.997,3.075 1.534,0.817 2.306,2.102 2.306,3.845 0,2.97 -1.797,4.459 -5.385,4.459 0,0 -7.686,0 -7.686,0 0,0 0,-16.3 0,-16.3 0,0 2.306,0 2.306,0 0,0 0,6.919 0,6.919 0,0 5.38,0 5.38,0 1.844,0 2.82,-0.975 2.925,-2.923 0,0 0.304,-3.996 0.304,-3.996 0,0 2.769,0.309 2.769,0.309 z m -23.833,16.45 c -5.33,0 -7.995,-2.87 -7.995,-8.609 0,-2.461 0.718,-4.513 2.152,-6.153 1.435,-1.642 3.382,-2.46 5.843,-2.46 5.331,0 7.996,2.87 7.996,8.613 0,5.739 -2.665,8.609 -7.996,8.609 z m -7.995,-0.459 c 0,0 -13.377,0 -13.377,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.1523,0 2.1523,0 0,0 0,14.298 0,14.298 0,0 5.5352,0 5.5352,0 0,0 0,2.002 0,2.002 z m -17.5264,-7.383 c 0,0 -4.6132,1.077 -4.6132,1.077 -1.335,0.308 -2.002,0.971 -2.002,1.998 0,1.947 1.2295,2.923 3.6904,2.923 2.7696,0 4.1543,-1.13 4.1543,-3.382 0,0 1.9981,0 1.9981,0 0,3.482 -2.1016,5.226 -6.3057,5.226 -3.7959,0 -5.6894,-1.693 -5.6894,-5.072 0,-2.052 1.1767,-3.337 3.5371,-3.846 0,0 3.2275,-0.767 3.2275,-0.767 2.3564,-0.517 3.5371,-1.49 3.5371,-2.924 0,-1.844 -1.4346,-2.765 -4.3047,-2.765 -2.9726,0 -4.458,1.28 -4.458,3.841 0,0 -1.998,0 -1.998,0 0,-3.796 2.1523,-5.689 6.456,-5.689 4.3047,0 6.4571,1.639 6.4571,4.921 0,2.357 -1.2305,3.842 -3.6866,4.459 z m -24.6054,7.383 c 0,0 -2.4561,0 -2.4561,0 0,0 -6.1523,-16.3 -6.1523,-16.3 0,0 2.3066,0 2.3066,0 0,0 1.6895,4.613 1.6895,4.613 0,0 6.6152,0 6.6152,0 0,0 1.5342,-4.613 1.5342,-4.613 0,0 2.4609,0 2.4609,0 0,0 -5.998,16.3 -5.998,16.3 z m -5.6885,0 c 0,0 -13.376,0 -13.376,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.3056,0 2.3056,0 0,0 0,14.298 0,14.298 0,0 5.3809,0 5.3809,0 0,0 0,2.002 0,2.002 z m -17.5264,0 c 0,0 -2.6152,0 -2.6152,0 0,0 -6.1485,-16.3 -6.1485,-16.3 0,0 2.3067,0 2.3067,0 0,0 1.6894,4.613 1.6894,4.613 0,0 6.6104,0 6.6104,0 0,0 1.6934,-4.613 1.6934,-4.613 0,0 2.4619,0 2.4619,0 0,0 -5.9981,16.3 -5.9981,16.3 z m -16.9131,0 c 0,0 -6.7656,0 -6.7656,0 0,0 0,-16.3 0,-16.3 0,0 6.6104,0 6.6104,0 4.6142,0 6.9199,2.765 6.9199,8.304 0,5.331 -2.2559,7.996 -6.7647,7.996 z m 121.4668,80.7209 c 0,0 2.77,7.2285 2.77,7.2285 0,0 2.306,-7.2285 2.306,-7.2285 0,0 -5.076,0 -5.076,0 z m -49.664,-5.2256 c -3.7959,0 -5.6885,2.252 -5.6885,6.7647 0,4.4043 1.8926,6.6113 5.6885,6.6113 3.792,0 5.6894,-2.207 5.6894,-6.6113 0,-4.5127 -1.8974,-6.7647 -5.6894,-6.7647 z m -38.8985,-63.5043 c 0,0 -32.5966,0 -32.5966,0 -2.1553,0 -3.9493,0.718 -5.3838,2.153 -1.4356,1.434 -2.1524,3.228 -2.1524,5.381 0,0 0,38.2848 0,38.2848 0,2.1523 0.7168,3.9502 2.1524,5.3847 1.4345,1.4346 3.2285,2.1524 5.3838,2.1524 0,0 18.1445,0 18.1445,0 1.2265,0 1.8437,0.6631 1.8437,1.998 0,0 0,17.376 0,17.376 0,0.8174 0.4082,1.2305 1.2305,1.2305 0,0 11.3779,0 11.3779,0 0.7178,-0.7168 1.0762,-1.1309 1.0762,-1.2305 0,0 0,-71.6529 0,-71.6529 0,-0.208 -0.3584,-0.568 -1.0762,-1.077 z m 126.6185,2.228 c -1.485,-1.485 -3.304,-2.228 -5.455,-2.228 0,0 -23.679,0 -23.679,0 -2.156,0 -4.005,0.743 -5.539,2.228 -1.535,1.484 -2.303,3.308 -2.303,5.46 0,0 0,38.1308 0,38.1308 0,2.1523 0.768,3.9502 2.303,5.3847 1.534,1.4346 3.383,2.1524 5.539,2.1524 0,0 23.679,0 23.679,0 2.252,0 4.099,-0.6924 5.534,-2.0772 1.435,-1.3847 2.152,-3.207 2.152,-5.4599 0,0 0,-10.1475 0,-10.1475 0,-0.7178 -0.358,-1.0771 -1.076,-1.0771 0,0 -10.147,0 -10.147,0 -0.718,0 -1.077,0.3593 -1.077,1.0771 0,0 0,4.6123 0,4.6123 0,2.0527 -0.692,3.7666 -2.077,5.1514 -1.385,1.3847 -3.103,2.0771 -5.151,2.0771 -2.052,0 -3.767,-0.6924 -5.152,-2.0771 -1.384,-1.3848 -2.077,-3.0987 -2.077,-5.1514 0,0 0,-27.3656 0,-27.3656 0,-2.052 0.693,-3.77 2.077,-5.155 1.385,-1.385 3.1,-2.073 5.152,-2.073 2.048,0 3.766,0.688 5.151,2.073 1.385,1.385 2.077,3.103 2.077,5.155 0,0 0,6.456 0,6.456 0,0.718 0.359,1.077 1.077,1.077 0,0 10.147,0 10.147,0 0.205,0 0.563,-0.359 1.076,-1.077 0,0 0,-11.686 0,-11.686 0,-2.152 -0.746,-3.976 -2.231,-5.46 z m -50.895,0 c -1.484,-1.485 -3.303,-2.228 -5.455,-2.228 0,0 -29.6767,0 -29.6767,0 -0.8213,0 -1.2304,0.36 -1.2304,1.077 0,0 0,6.919 0,6.919 0,0.717 0.4091,1.077 1.2304,1.077 0,0 20.7587,0 20.7587,0 1.739,0 3.225,0.613 4.455,1.843 1.231,1.231 1.848,2.715 1.848,4.458 0,1.844 -0.593,3.383 -1.769,4.614 -1.18,1.23 -2.69,1.8474 -4.534,1.8474 0,0 -14.3016,0 -14.3016,0 -2.1524,0 -3.9746,0.7422 -5.46,2.2275 -1.4854,1.4854 -2.2275,3.3076 -2.2275,5.46 0,0 0,16.2959 0,16.2959 0,2.1523 0.7421,3.9502 2.2275,5.3847 1.4854,1.4346 3.3076,2.1524 5.46,2.1524 0,0 27.6786,0 27.6786,0 0.717,0 1.076,-0.3584 1.076,-1.0762 0,0 0,-6.7656 0,-6.7656 0,-0.8213 -0.359,-1.2305 -1.076,-1.2305 0,0 -18.762,0 -18.762,0 -3.795,0 -5.688,-1.9473 -5.688,-5.8437 0,-1.5381 0.562,-2.8741 1.689,-3.9991 1.126,-1.1259 2.461,-1.6894 3.999,-1.6894 0,0 14.303,0 14.303,0 2.048,0 3.842,-0.7715 5.381,-2.3067 1.534,-1.539 2.306,-3.333 2.306,-5.3808 0,0 0,-17.3759 0,-17.3759 0,-2.152 -0.746,-3.976 -2.232,-5.46 z m -46.6649,-5.765 c 0,0 -16.7588,0 -16.7588,0 -1.2304,0 -1.8427,0.663 -1.8427,1.998 0,0 0,56.5843 0,56.5843 0,1.2305 0.6123,1.8467 1.8427,1.8467 0,0 16.7588,0 16.7588,0 1.2266,0 1.8448,-0.6162 1.8448,-1.8467 0,0 0,-56.5843 0,-56.5843 0,-1.335 -0.6182,-1.998 -1.8448,-1.998 z m 45.9729,-15.837 c 0,0 -5.226,0 -5.226,0 0,0 0,5.536 0,5.536 0,0 5.535,0 5.535,0 1.948,0 2.924,-0.922 2.924,-2.766 0,-1.848 -1.081,-2.77 -3.233,-2.77 z m 11.379,-2.152 c 0,0 2.615,7.229 2.615,7.229 0,0 2.461,-7.229 2.461,-7.229 0,0 -5.076,0 -5.076,0 z m -83.182,0 c 0,0 2.7647,7.229 2.7647,7.229 0,0 2.3076,-7.229 2.3076,-7.229 0,0 -5.0723,0 -5.0723,0 z m -23.2197,0 c 0,0 2.6153,7.229 2.6153,7.229 0,0 2.4609,-7.229 2.4609,-7.229 0,0 -5.0762,0 -5.0762,0 z m -13.0683,-4.922 c 0,0 -4.3037,0 -4.3037,0 0,0 0,12.61 0,12.61 0,0 3.996,0 3.996,0 3.3819,0 5.0752,-2.103 5.0752,-6.303 0,-4.204 -1.5888,-6.307 -4.7675,-6.307 z m 90.41,-0.458 c -3.795,0 -5.688,2.252 -5.688,6.765 0,4.404 1.893,6.611 5.688,6.611 3.897,0 5.844,-2.207 5.844,-6.611 0,-4.513 -1.947,-6.765 -5.844,-6.765 z m -29.83,79.1857 c 0,0.7178 -0.3593,1.0762 -1.0771,1.0762 0,0 -11.3779,0 -11.3779,0 -0.7178,0 -1.0762,-0.3584 -1.0762,-1.0762 0,0 0,-51.2027 0,-51.2027 0,-0.717 0.3584,-1.077 1.0762,-1.077 0,0 11.3779,0 11.3779,0 0.7178,0 1.0771,0.36 1.0771,1.077 0,0 0,51.2027 0,51.2027 z m -39.9755,-11.6875 c 0,1.9443 -0.6915,3.6123 -2.0762,4.9971 -1.3858,1.3847 -3.0537,2.0771 -4.9971,2.0771 -1.9482,0 -3.5869,-0.6924 -4.9219,-2.0771 -1.3339,-1.3848 -1.998,-3.0528 -1.998,-4.9971 0,0 0,-28.1372 0,-28.1372 0,-2.052 0.6377,-3.742 1.9228,-5.076 1.2813,-1.335 2.9454,-1.998 4.9971,-1.998 1.9434,0 3.6113,0.693 4.9971,2.077 1.3847,1.385 2.0762,3.049 2.0762,4.997 0,0 0,28.1372 0,28.1372 z m -7.0733,-31.6742 c -2.3613,0 -3.5371,1.176 -3.5371,3.537 0,0 0,28.1372 0,28.1372 0,2.3564 1.1758,3.5371 3.5371,3.5371 2.2529,0 3.3828,-1.1807 3.3828,-3.5371 0,0 0,-28.1372 0,-28.1372 0,-2.361 -1.1299,-3.537 -3.3828,-3.537 z"
-                     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-                     id="path149830" />
+              <path style="fill:#ffffff;stroke:none" d="m 470.27084,7998.0012 c -1.08707,0 -1.96833,0.1211 -1.96833,0.2713 0,0.15 0.88126,0.2712 1.96833,0.2712 1.08709,0 1.96834,-0.1212 1.96834,-0.2712 0,-0.1502 -0.88125,-0.2713 -1.96834,-0.2713 z m 0,0.1961 c 0.30515,0 0.55253,0.034 0.55253,0.075 0,0.042 -0.24738,0.075 -0.55253,0.075 -0.30514,0 -0.55251,-0.034 -0.55251,-0.075 0,-0.042 0.24737,-0.075 0.55251,-0.075 z" id="path149820" inkscape:connector-curvature="0"/>
+              <text xml:space="preserve" style="font-size:0.64422148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="461.62274" y="8135.8271" id="text149822" sodipodi:linespacing="125%" transform="scale(1.0170762,0.9832105)"><tspan sodipodi:role="line" id="tspan149824" x="461.62274" y="8135.8271">ROM</tspan></text>
+              <g transform="matrix(0.02255355,0,0,-0.02180257,456.42108,8000.0463)" id="g149826" style="fill:#ffffff">
+                <g id="g149828" transform="translate(8.50391,150.1943)" style="fill:#ffffff">
+                  <path inkscape:connector-curvature="0" d="m 121.00809,-7.9961 c 0,0 -4.304,0 -4.304,0 0,0 0,5.5352 0,5.5352 0,0 4.458,0 4.458,0 2.152,0 3.229,-0.8721 3.229,-2.6113 0,-1.9522 -1.13,-2.9239 -3.383,-2.9239 z m 34.29,-2.7656 c -0.617,-3.0781 -2.206,-4.6123 -4.768,-4.6123 -3.587,0 -5.381,2.252 -5.381,6.7647 0,4.4043 1.794,6.6113 5.381,6.6113 2.562,0 4.101,-1.1309 4.613,-3.3828 0,0 2.153,0 2.153,0 -0.718,3.5869 -2.975,5.3808 -6.766,5.3808 -5.126,0 -7.687,-2.8701 -7.687,-8.6093 0,-5.7432 2.457,-8.6133 7.379,-8.6133 4.204,0 6.611,2.1523 7.228,6.4609 0,0 -2.152,0 -2.152,0 z M 82.41409,0 c -5.3311,0 -7.9951,-2.8701 -7.9951,-8.6093 0,-5.7432 2.664,-8.6133 7.9951,-8.6133 5.331,0 7.9961,2.8701 7.9961,8.6133 0,5.7392 -2.6651,8.6093 -7.9961,8.6093 z m -12.9131,-10.7617 c -0.5166,-3.0781 -2.0528,-4.6123 -4.6133,-4.6123 -3.6914,0 -5.5352,2.252 -5.5352,6.7647 0,4.4043 1.794,6.6113 5.3809,6.6113 2.5615,0 4.0996,-1.1309 4.6133,-3.3828 0,0 2.1523,0 2.1523,0 C 71.08989,-1.7939 68.83299,0 64.73339,0 c -5.0215,0 -7.5332,-2.8701 -7.5332,-8.6093 0,-5.7432 2.4072,-8.6133 7.2246,-8.6133 4.2041,0 6.6113,2.1523 7.2285,6.4609 0,0 -2.1523,0 -2.1523,0 z m 102.4011,10.3028 c 0,0 -13.221,0 -13.221,0 0,0 0,-2.002 0,-2.002 0,0 5.534,0 5.534,0 0,0 0,-14.4522 0,-14.4522 0,0 2.152,0 2.152,0 0,0 0,14.4522 0,14.4522 0,0 5.535,0 5.535,0 0,0 0,2.002 0,2.002 z m -35.824,0 c 0,0 -2.461,0 -2.461,0 0,0 -6.148,-16.4542 -6.148,-16.4542 0,0 2.302,0 2.302,0 0,0 1.694,4.7667 1.694,4.7667 0,0 6.611,0 6.611,0 0,0 1.539,-4.7667 1.539,-4.7667 0,0 2.461,0 2.461,0 0,0 -5.998,16.4542 -5.998,16.4542 z m -14.298,0 c 0,0 -7.228,0 -7.228,0 0,0 0,-16.4542 0,-16.4542 0,0 2.152,0 2.152,0 0,0 0,6.919 0,6.919 0,0 5.076,0 5.076,0 3.279,0 4.917,1.6396 4.917,4.9219 0,3.0742 -1.638,4.6133 -4.917,4.6133 z m -11.996,0 c 0,0 -3.074,0 -3.074,0 0,0 -4.768,-13.8399 -4.768,-13.8399 0,0 -4.612,13.8399 -4.612,13.8399 0,0 -3.229,0 -3.229,0 0,0 0,-16.4542 0,-16.4542 0,0 2.153,0 2.153,0 0,0 0,13.6836 0,13.6836 0,0 4.612,-13.6836 4.612,-13.6836 0,0 2.152,0 2.152,0 0,0 4.768,13.8389 4.768,13.8389 0,0 -0.154,-4.1504 -0.154,-4.1504 0,0 0,-9.6885 0,-9.6885 0,0 2.152,0 2.152,0 0,0 0,16.4542 0,16.4542 z m -61.8095,-2.9239 c 0,1.2305 -0.6172,1.8477 -1.8476,1.8477 0,0 -16.7598,0 -16.7598,0 -1.2295,0 -1.8428,-0.6172 -1.8428,-1.8477 0,0 0,-17.372 0,-17.372 0,-0.8223 -0.4131,-1.2315 -1.2304,-1.2315 0,0 -15.375,0 -15.375,0 -3.1778,0 -5.793,-1.0508 -7.8448,-3.1523 C 1.02148,-27.2412 0,-29.8808 0,-33.0595 c 0,0 0,-38.2848 0,-38.2848 0,-3.079 1.05078,-5.69 3.15329,-7.842 2.1026,-2.153 4.6875,-3.229 7.7657,-3.229 0,0 35.208,0 35.208,0 1.2304,0 1.8476,0.663 1.8476,1.998 0,0 0,77.0345 0,77.0345 z m 127.7735,-53.6601 c 0,1.331 -0.617,1.998 -1.848,1.998 0,0 -15.374,0 -15.374,0 -1.335,0 -1.998,-0.667 -1.998,-1.998 0,0 0,-8.9174 0,-8.9174 0,-2.565 -1.23,-3.845 -3.691,-3.845 -2.566,0 -3.846,1.28 -3.846,3.845 0,0 0,27.3656 0,27.3656 0,2.5615 1.28,3.8457 3.846,3.8457 2.461,0 3.691,-1.2842 3.691,-3.8457 0,0 0,-7.2236 0,-7.2236 0,-1.2344 0.663,-1.8477 1.998,-1.8477 0,0 15.374,0 15.374,0 1.231,0 1.848,0.6133 1.848,1.8477 0,0 0,12.7588 0,12.7588 0,3.0742 -1.076,5.6894 -3.229,7.8418 -2.152,2.1523 -4.767,3.2314 -7.84,3.2314 0,0 -23.679,0 -23.679,0 -3.078,0 -5.693,-1.0791 -7.846,-3.2314 -2.152,-2.1524 -3.228,-4.7676 -3.228,-7.8418 0,0 0,-38.1308 0,-38.1308 0,-3.179 1.05,-5.844 3.153,-7.996 2.103,-2.153 4.742,-3.229 7.921,-3.229 0,0 23.679,0 23.679,0 3.173,0 5.813,1.076 7.916,3.229 2.102,2.152 3.153,4.817 3.153,7.996 0,0 0,14.1474 0,14.1474 z m -50.895,3.2285 c 0,3.0742 -1.076,5.6894 -3.227,7.8418 -2.152,2.1513 -4.768,3.2285 -7.842,3.2285 0,0 -14.303,0 -14.303,0 -1.538,0 -2.305,0.7676 -2.305,2.3057 0,1.6396 0.767,2.4619 2.305,2.4619 0,0 21.527,0 21.527,0 1.23,0 1.847,0.6123 1.847,1.8427 0,0 0,12.3008 0,12.3008 0,1.2305 -0.617,1.8467 -1.847,1.8467 0,0 -30.4436,0 -30.4436,0 -3.0782,0 -5.6895,-1.0791 -7.8418,-3.2314 -2.1514,-2.1524 -3.2286,-4.7676 -3.2286,-7.8418 0,0 0,-16.2959 0,-16.2959 0,-3.0782 1.0772,-5.6895 3.2286,-7.8419 2.1523,-2.152 4.7636,-3.228 7.8418,-3.228 0,0 14.3016,0 14.3016,0 1.944,0 2.92,-1.026 2.92,-3.079 0,-1.842 -0.976,-2.764 -2.92,-2.764 0,0 -23.5282,0 -23.5282,0 -1.2305,0 -1.8438,-0.668 -1.8438,-1.998 0,0 0,-12.151 0,-12.151 0,-1.335 0.6133,-1.998 1.8438,-1.998 0,0 32.4462,0 32.4462,0 3.174,0 5.815,1.076 7.916,3.229 2.103,2.152 3.153,4.817 3.153,7.996 0,0 0,17.3759 0,17.3759 z m 46.59,-51.5119 c 0,0 -9.843,0 -9.843,0 0,0 0,5.535 0,5.535 0,0 8.917,0 8.917,0 0,0 0,1.848 0,1.848 0,0 -8.917,0 -8.917,0 0,0 0,5.072 0,5.072 0,0 9.689,0 9.689,0 0,0 0,2.002 0,2.002 0,0 -11.841,0 -11.841,0 0,0 0,-16.3 0,-16.3 0,0 11.995,0 11.995,0 0,0 0,1.843 0,1.843 z m -15.991,6.766 c 0,0 -7.228,0 -7.228,0 0,0 0,-1.844 0,-1.844 0,0 5.076,0 5.076,0 0,-3.587 -1.694,-5.38 -5.076,-5.38 -3.587,0 -5.381,2.252 -5.381,6.765 0,4.404 1.794,6.611 5.381,6.611 2.665,0 4.254,-1.131 4.767,-3.383 0,0 2.152,0 2.152,0 -0.409,3.587 -2.715,5.381 -6.919,5.381 -5.126,0 -7.687,-2.87 -7.687,-8.609 0,-2.869 0.742,-5.026 2.227,-6.461 1.485,-1.435 3.253,-2.152 5.305,-2.152 2.461,0 4.255,0.872 5.385,2.615 0,0 0.613,-2.152 0.613,-2.152 0,0 1.385,0 1.385,0 0,0 0,8.609 0,8.609 z m -21.526,7.691 c 0,0 -2.461,0 -2.461,0 0,0 -6.303,-16.3 -6.303,-16.3 0,0 2.307,0 2.307,0 0,0 1.689,4.613 1.689,4.613 0,0 6.611,0 6.611,0 0,0 1.694,-4.613 1.694,-4.613 0,0 2.306,0 2.306,0 0,0 -5.843,16.3 -5.843,16.3 z m -9.227,-15.991 c -0.513,0.2 -0.767,0.763 -0.767,1.688 0,0 -0.155,2.924 -0.155,2.924 -0.103,1.331 -0.771,2.358 -1.997,3.075 1.534,0.817 2.306,2.102 2.306,3.845 0,2.97 -1.797,4.459 -5.385,4.459 0,0 -7.686,0 -7.686,0 0,0 0,-16.3 0,-16.3 0,0 2.306,0 2.306,0 0,0 0,6.919 0,6.919 0,0 5.38,0 5.38,0 1.844,0 2.82,-0.975 2.925,-2.923 0,0 0.304,-3.996 0.304,-3.996 0,0 2.769,0.309 2.769,0.309 z m -23.833,16.45 c -5.33,0 -7.995,-2.87 -7.995,-8.609 0,-2.461 0.718,-4.513 2.152,-6.153 1.435,-1.642 3.382,-2.46 5.843,-2.46 5.331,0 7.996,2.87 7.996,8.613 0,5.739 -2.665,8.609 -7.996,8.609 z m -7.995,-0.459 c 0,0 -13.377,0 -13.377,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.1523,0 2.1523,0 0,0 0,14.298 0,14.298 0,0 5.5352,0 5.5352,0 0,0 0,2.002 0,2.002 z m -17.5264,-7.383 c 0,0 -4.6132,1.077 -4.6132,1.077 -1.335,0.308 -2.002,0.971 -2.002,1.998 0,1.947 1.2295,2.923 3.6904,2.923 2.7696,0 4.1543,-1.13 4.1543,-3.382 0,0 1.9981,0 1.9981,0 0,3.482 -2.1016,5.226 -6.3057,5.226 -3.7959,0 -5.6894,-1.693 -5.6894,-5.072 0,-2.052 1.1767,-3.337 3.5371,-3.846 0,0 3.2275,-0.767 3.2275,-0.767 2.3564,-0.517 3.5371,-1.49 3.5371,-2.924 0,-1.844 -1.4346,-2.765 -4.3047,-2.765 -2.9726,0 -4.458,1.28 -4.458,3.841 0,0 -1.998,0 -1.998,0 0,-3.796 2.1523,-5.689 6.456,-5.689 4.3047,0 6.4571,1.639 6.4571,4.921 0,2.357 -1.2305,3.842 -3.6866,4.459 z m -24.6054,7.383 c 0,0 -2.4561,0 -2.4561,0 0,0 -6.1523,-16.3 -6.1523,-16.3 0,0 2.3066,0 2.3066,0 0,0 1.6895,4.613 1.6895,4.613 0,0 6.6152,0 6.6152,0 0,0 1.5342,-4.613 1.5342,-4.613 0,0 2.4609,0 2.4609,0 0,0 -5.998,16.3 -5.998,16.3 z m -5.6885,0 c 0,0 -13.376,0 -13.376,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.3056,0 2.3056,0 0,0 0,14.298 0,14.298 0,0 5.3809,0 5.3809,0 0,0 0,2.002 0,2.002 z m -17.5264,0 c 0,0 -2.6152,0 -2.6152,0 0,0 -6.1485,-16.3 -6.1485,-16.3 0,0 2.3067,0 2.3067,0 0,0 1.6894,4.613 1.6894,4.613 0,0 6.6104,0 6.6104,0 0,0 1.6934,-4.613 1.6934,-4.613 0,0 2.4619,0 2.4619,0 0,0 -5.9981,16.3 -5.9981,16.3 z m -16.9131,0 c 0,0 -6.7656,0 -6.7656,0 0,0 0,-16.3 0,-16.3 0,0 6.6104,0 6.6104,0 4.6142,0 6.9199,2.765 6.9199,8.304 0,5.331 -2.2559,7.996 -6.7647,7.996 z m 121.4668,80.7209 c 0,0 2.77,7.2285 2.77,7.2285 0,0 2.306,-7.2285 2.306,-7.2285 0,0 -5.076,0 -5.076,0 z m -49.664,-5.2256 c -3.7959,0 -5.6885,2.252 -5.6885,6.7647 0,4.4043 1.8926,6.6113 5.6885,6.6113 3.792,0 5.6894,-2.207 5.6894,-6.6113 0,-4.5127 -1.8974,-6.7647 -5.6894,-6.7647 z m -38.8985,-63.5043 c 0,0 -32.5966,0 -32.5966,0 -2.1553,0 -3.9493,0.718 -5.3838,2.153 -1.4356,1.434 -2.1524,3.228 -2.1524,5.381 0,0 0,38.2848 0,38.2848 0,2.1523 0.7168,3.9502 2.1524,5.3847 1.4345,1.4346 3.2285,2.1524 5.3838,2.1524 0,0 18.1445,0 18.1445,0 1.2265,0 1.8437,0.6631 1.8437,1.998 0,0 0,17.376 0,17.376 0,0.8174 0.4082,1.2305 1.2305,1.2305 0,0 11.3779,0 11.3779,0 0.7178,-0.7168 1.0762,-1.1309 1.0762,-1.2305 0,0 0,-71.6529 0,-71.6529 0,-0.208 -0.3584,-0.568 -1.0762,-1.077 z m 126.6185,2.228 c -1.485,-1.485 -3.304,-2.228 -5.455,-2.228 0,0 -23.679,0 -23.679,0 -2.156,0 -4.005,0.743 -5.539,2.228 -1.535,1.484 -2.303,3.308 -2.303,5.46 0,0 0,38.1308 0,38.1308 0,2.1523 0.768,3.9502 2.303,5.3847 1.534,1.4346 3.383,2.1524 5.539,2.1524 0,0 23.679,0 23.679,0 2.252,0 4.099,-0.6924 5.534,-2.0772 1.435,-1.3847 2.152,-3.207 2.152,-5.4599 0,0 0,-10.1475 0,-10.1475 0,-0.7178 -0.358,-1.0771 -1.076,-1.0771 0,0 -10.147,0 -10.147,0 -0.718,0 -1.077,0.3593 -1.077,1.0771 0,0 0,4.6123 0,4.6123 0,2.0527 -0.692,3.7666 -2.077,5.1514 -1.385,1.3847 -3.103,2.0771 -5.151,2.0771 -2.052,0 -3.767,-0.6924 -5.152,-2.0771 -1.384,-1.3848 -2.077,-3.0987 -2.077,-5.1514 0,0 0,-27.3656 0,-27.3656 0,-2.052 0.693,-3.77 2.077,-5.155 1.385,-1.385 3.1,-2.073 5.152,-2.073 2.048,0 3.766,0.688 5.151,2.073 1.385,1.385 2.077,3.103 2.077,5.155 0,0 0,6.456 0,6.456 0,0.718 0.359,1.077 1.077,1.077 0,0 10.147,0 10.147,0 0.205,0 0.563,-0.359 1.076,-1.077 0,0 0,-11.686 0,-11.686 0,-2.152 -0.746,-3.976 -2.231,-5.46 z m -50.895,0 c -1.484,-1.485 -3.303,-2.228 -5.455,-2.228 0,0 -29.6767,0 -29.6767,0 -0.8213,0 -1.2304,0.36 -1.2304,1.077 0,0 0,6.919 0,6.919 0,0.717 0.4091,1.077 1.2304,1.077 0,0 20.7587,0 20.7587,0 1.739,0 3.225,0.613 4.455,1.843 1.231,1.231 1.848,2.715 1.848,4.458 0,1.844 -0.593,3.383 -1.769,4.614 -1.18,1.23 -2.69,1.8474 -4.534,1.8474 0,0 -14.3016,0 -14.3016,0 -2.1524,0 -3.9746,0.7422 -5.46,2.2275 -1.4854,1.4854 -2.2275,3.3076 -2.2275,5.46 0,0 0,16.2959 0,16.2959 0,2.1523 0.7421,3.9502 2.2275,5.3847 1.4854,1.4346 3.3076,2.1524 5.46,2.1524 0,0 27.6786,0 27.6786,0 0.717,0 1.076,-0.3584 1.076,-1.0762 0,0 0,-6.7656 0,-6.7656 0,-0.8213 -0.359,-1.2305 -1.076,-1.2305 0,0 -18.762,0 -18.762,0 -3.795,0 -5.688,-1.9473 -5.688,-5.8437 0,-1.5381 0.562,-2.8741 1.689,-3.9991 1.126,-1.1259 2.461,-1.6894 3.999,-1.6894 0,0 14.303,0 14.303,0 2.048,0 3.842,-0.7715 5.381,-2.3067 1.534,-1.539 2.306,-3.333 2.306,-5.3808 0,0 0,-17.3759 0,-17.3759 0,-2.152 -0.746,-3.976 -2.232,-5.46 z m -46.6649,-5.765 c 0,0 -16.7588,0 -16.7588,0 -1.2304,0 -1.8427,0.663 -1.8427,1.998 0,0 0,56.5843 0,56.5843 0,1.2305 0.6123,1.8467 1.8427,1.8467 0,0 16.7588,0 16.7588,0 1.2266,0 1.8448,-0.6162 1.8448,-1.8467 0,0 0,-56.5843 0,-56.5843 0,-1.335 -0.6182,-1.998 -1.8448,-1.998 z m 45.9729,-15.837 c 0,0 -5.226,0 -5.226,0 0,0 0,5.536 0,5.536 0,0 5.535,0 5.535,0 1.948,0 2.924,-0.922 2.924,-2.766 0,-1.848 -1.081,-2.77 -3.233,-2.77 z m 11.379,-2.152 c 0,0 2.615,7.229 2.615,7.229 0,0 2.461,-7.229 2.461,-7.229 0,0 -5.076,0 -5.076,0 z m -83.182,0 c 0,0 2.7647,7.229 2.7647,7.229 0,0 2.3076,-7.229 2.3076,-7.229 0,0 -5.0723,0 -5.0723,0 z m -23.2197,0 c 0,0 2.6153,7.229 2.6153,7.229 0,0 2.4609,-7.229 2.4609,-7.229 0,0 -5.0762,0 -5.0762,0 z m -13.0683,-4.922 c 0,0 -4.3037,0 -4.3037,0 0,0 0,12.61 0,12.61 0,0 3.996,0 3.996,0 3.3819,0 5.0752,-2.103 5.0752,-6.303 0,-4.204 -1.5888,-6.307 -4.7675,-6.307 z m 90.41,-0.458 c -3.795,0 -5.688,2.252 -5.688,6.765 0,4.404 1.893,6.611 5.688,6.611 3.897,0 5.844,-2.207 5.844,-6.611 0,-4.513 -1.947,-6.765 -5.844,-6.765 z m -29.83,79.1857 c 0,0.7178 -0.3593,1.0762 -1.0771,1.0762 0,0 -11.3779,0 -11.3779,0 -0.7178,0 -1.0762,-0.3584 -1.0762,-1.0762 0,0 0,-51.2027 0,-51.2027 0,-0.717 0.3584,-1.077 1.0762,-1.077 0,0 11.3779,0 11.3779,0 0.7178,0 1.0771,0.36 1.0771,1.077 0,0 0,51.2027 0,51.2027 z m -39.9755,-11.6875 c 0,1.9443 -0.6915,3.6123 -2.0762,4.9971 -1.3858,1.3847 -3.0537,2.0771 -4.9971,2.0771 -1.9482,0 -3.5869,-0.6924 -4.9219,-2.0771 -1.3339,-1.3848 -1.998,-3.0528 -1.998,-4.9971 0,0 0,-28.1372 0,-28.1372 0,-2.052 0.6377,-3.742 1.9228,-5.076 1.2813,-1.335 2.9454,-1.998 4.9971,-1.998 1.9434,0 3.6113,0.693 4.9971,2.077 1.3847,1.385 2.0762,3.049 2.0762,4.997 0,0 0,28.1372 0,28.1372 z m -7.0733,-31.6742 c -2.3613,0 -3.5371,1.176 -3.5371,3.537 0,0 0,28.1372 0,28.1372 0,2.3564 1.1758,3.5371 3.5371,3.5371 2.2529,0 3.3828,-1.1807 3.3828,-3.5371 0,0 0,-28.1372 0,-28.1372 0,-2.361 -1.1299,-3.537 -3.3828,-3.537 z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path149830"/>
                 </g>
               </g>
-              <path
-                 id="path149832"
-                 style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 471.22906,8002.2149 1.90862,0 0,2.4099 -1.90862,0 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 d="m 468.87511,8002.2148 1.9086,0 0,2.41 -1.9086,0 z"
-                 style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path149834"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path149836"
-                 style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4"
-                 d="m 467.18673,8002.1704 1.21366,0 0,4.2539 -1.21366,0 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 467.92553,8002.1704 0.47486,0 0,4.2539 -0.47486,0 z"
-                 style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4"
-                 id="path149838" />
-              <rect
-                 transform="matrix(1,0,-0.01802634,0.99983751,0,0)"
-                 y="8003.6514"
-                 x="585.95044"
-                 height="4.7188153"
-                 width="23.795719"
-                 id="rect149840"
-                 style="fill:url(#linearGradient149940);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149842"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 442.96371,8003.0165 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z"
-                 sodipodi:nodetypes="ssccssccs" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 446.15365,8003.0165 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path149844"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149846"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 449.37599,8003.0165 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z"
-                 sodipodi:nodetypes="ssccssccs" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 369.77778,8001.7698 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z"
-                 style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-                 id="path149848" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149850"
-                 d="m 373.0097,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z"
-                 style="fill:#000000;stroke:none" />
-              <path
-                 sodipodi:nodetypes="cccccccccccccccccc"
-                 inkscape:connector-curvature="0"
-                 id="path149852"
-                 d="m 390.7089,8003.2656 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z"
-                 style="fill:#000000;stroke:none" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 381.53484,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z"
-                 id="path149854" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 373.21327,8004.7544 7.18911,0 0,0.4071 -7.18911,0 z"
-                 id="path149856" />
-              <path
-                 id="path149858"
-                 d="m 381.73841,8004.7544 7.18912,0 0,0.4071 -7.18912,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path149860"
-                 d="m 373.36597,8005.8398 7.18911,0 0,0.407 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 381.89111,8005.8398 7.18912,0 0,0.407 -7.18912,0 z"
-                 id="path149862" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 373.41686,8006.8799 7.18912,0 0,0.407 -7.18912,0 z"
-                 id="path149864" />
-              <path
-                 id="path149866"
-                 d="m 381.94201,8006.8799 7.18911,0 0,0.407 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 390.59439,8006.8799 7.18912,0 0,0.407 -7.18912,0 z"
-                 id="path149868" />
-              <path
-                 sodipodi:nodetypes="ccsssccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 369.77778,8002.8099 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-                 style="fill:#000000;stroke:none"
-                 id="path149870" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 401.28774,8002.2178 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path149872" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 403.99722,8002.1589 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path149874" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149876"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 401.33384,8004.3425 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149878"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 404.04332,8004.2838 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z" />
-              <path
-                 d="m 401.38387,8006.6483 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path149880"
-                 inkscape:connector-curvature="0" />
-              <path
-                 d="m 404.09334,8006.5895 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path149882"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path149884"
-                 style="fill:#808080;stroke:#000000;stroke-width:0.42910308"
-                 d="m 406.58427,8001.7697 29.32904,-0.045 0.0637,6.331 -29.20179,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 style="fill:#000000;stroke:none"
-                 d="m 409.8162,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z"
-                 id="path149886"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccccccccccccccc"
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 427.5154,8003.2656 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-                 id="path149888" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path149890"
-                 d="m 418.34134,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path149892"
-                 d="m 410.01977,8004.7544 7.18913,0 0,0.4071 -7.18913,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 418.54491,8004.7544 7.18913,0 0,0.4071 -7.18913,0 z"
-                 id="path149894" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 410.17247,8005.8398 7.18911,0 0,0.407 -7.18911,0 z"
-                 id="path149896" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path149898"
-                 d="m 418.69761,8005.8398 7.18911,0 0,0.407 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path149900"
-                 d="m 410.22338,8006.8799 7.1891,0 0,0.407 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 418.74852,8006.8799 7.1891,0 0,0.407 -7.1891,0 z"
-                 id="path149902" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path149904"
-                 d="m 427.40089,8006.8799 7.18911,0 0,0.407 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path149906"
-                 style="fill:#000000;stroke:none"
-                 d="m 406.58427,8002.8099 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccsssccccccc" />
-              <path
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 394.53988,8003.2465 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path149908" />
-              <path
-                 id="path149910"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 394.53996,8006.48 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccc" />
-              <path
-                 id="path149912"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 431.17483,8003.2465 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccc" />
-              <path
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 431.1749,8006.48 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path149914" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 471.22906,8005.5294 1.90862,0 0,1.0539 -1.90862,0 z"
-                 style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path149916" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149918"
-                 style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 468.87511,8005.5293 1.9086,0 0,1.054 -1.9086,0 z" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 442.96371,8005.1912 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path149920"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149922"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 446.15365,8005.1912 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z"
-                 sodipodi:nodetypes="ssccssccs" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 449.37599,8005.1912 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path149924"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149926"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 452.6521,8005.1912 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z"
-                 sodipodi:nodetypes="ssccssccs" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 455.84203,8005.1912 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path149928"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path149930"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 459.06437,8005.1912 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z"
-                 sodipodi:nodetypes="ssccssccs" />
+              <path id="path149832" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.22906,8002.2149 1.90862,0 0,2.4099 -1.90862,0 z" inkscape:connector-curvature="0"/>
+              <path d="m 468.87511,8002.2148 1.9086,0 0,2.41 -1.9086,0 z" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149834" inkscape:connector-curvature="0"/>
+              <path id="path149836" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4" d="m 467.18673,8002.1704 1.21366,0 0,4.2539 -1.21366,0 z" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" d="m 467.92553,8002.1704 0.47486,0 0,4.2539 -0.47486,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4" id="path149838"/>
+              <rect transform="matrix(1,0,-0.01802634,0.99983751,0,0)" y="8003.6514" x="585.95044" height="4.7188153" width="23.795719" id="rect149840" style="fill:url(#linearGradient149940);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554"/>
+              <path inkscape:connector-curvature="0" id="path149842" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 442.96371,8003.0165 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 446.15365,8003.0165 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path149844" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path149846" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 449.37599,8003.0165 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 369.77778,8001.7698 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path149848"/>
+              <path inkscape:connector-curvature="0" id="path149850" d="m 373.0097,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none"/>
+              <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path149852" d="m 390.7089,8003.2656 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z" style="fill:#000000;stroke:none"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.53484,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z" id="path149854"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.21327,8004.7544 7.18911,0 0,0.4071 -7.18911,0 z" id="path149856"/>
+              <path id="path149858" d="m 381.73841,8004.7544 7.18912,0 0,0.4071 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path149860" d="m 373.36597,8005.8398 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.89111,8005.8398 7.18912,0 0,0.407 -7.18912,0 z" id="path149862"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.41686,8006.8799 7.18912,0 0,0.407 -7.18912,0 z" id="path149864"/>
+              <path id="path149866" d="m 381.94201,8006.8799 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 390.59439,8006.8799 7.18912,0 0,0.407 -7.18912,0 z" id="path149868"/>
+              <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 369.77778,8002.8099 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" style="fill:#000000;stroke:none" id="path149870"/>
+              <path inkscape:connector-curvature="0" d="m 401.28774,8002.2178 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149872"/>
+              <path inkscape:connector-curvature="0" d="m 403.99722,8002.1589 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149874"/>
+              <path inkscape:connector-curvature="0" id="path149876" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.33384,8004.3425 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z"/>
+              <path inkscape:connector-curvature="0" id="path149878" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 404.04332,8004.2838 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z"/>
+              <path d="m 401.38387,8006.6483 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149880" inkscape:connector-curvature="0"/>
+              <path d="m 404.09334,8006.5895 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149882" inkscape:connector-curvature="0"/>
+              <path id="path149884" style="fill:#808080;stroke:#000000;stroke-width:0.42910308" d="m 406.58427,8001.7697 29.32904,-0.045 0.0637,6.331 -29.20179,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 409.8162,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z" id="path149886" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.5154,8003.2656 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z" id="path149888"/>
+              <path sodipodi:nodetypes="ccccc" id="path149890" d="m 418.34134,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccc" id="path149892" d="m 410.01977,8004.7544 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.54491,8004.7544 7.18913,0 0,0.4071 -7.18913,0 z" id="path149894"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.17247,8005.8398 7.18911,0 0,0.407 -7.18911,0 z" id="path149896"/>
+              <path sodipodi:nodetypes="ccccc" id="path149898" d="m 418.69761,8005.8398 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccc" id="path149900" d="m 410.22338,8006.8799 7.1891,0 0,0.407 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.74852,8006.8799 7.1891,0 0,0.407 -7.1891,0 z" id="path149902"/>
+              <path sodipodi:nodetypes="ccccc" id="path149904" d="m 427.40089,8006.8799 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path149906" style="fill:#000000;stroke:none" d="m 406.58427,8002.8099 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+              <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.53988,8003.2465 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149908"/>
+              <path id="path149910" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.53996,8006.48 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+              <path id="path149912" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.17483,8003.2465 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+              <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.1749,8006.48 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149914"/>
+              <path inkscape:connector-curvature="0" d="m 471.22906,8005.5294 1.90862,0 0,1.0539 -1.90862,0 z" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path149916"/>
+              <path inkscape:connector-curvature="0" id="path149918" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 468.87511,8005.5293 1.9086,0 0,1.054 -1.9086,0 z"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 442.96371,8005.1912 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path149920" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path149922" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 446.15365,8005.1912 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 449.37599,8005.1912 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path149924" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path149926" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 452.6521,8005.1912 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 455.84203,8005.1912 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path149928" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path149930" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 459.06437,8005.1912 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
             </g>
           </g>
         </g>
diff --git a/misc/images/svg/elements/Rackmountable_2U_server_3D.svg b/misc/images/svg/elements/Rackmountable_2U_server_3D.svg
index 4932ca804c2..be1db14b5b7 100644
--- a/misc/images/svg/elements/Rackmountable_2U_server_3D.svg
+++ b/misc/images/svg/elements/Rackmountable_2U_server_3D.svg
@@ -1,792 +1,160 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.01477"
-   height="26.668919"
-   id="svg136709"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 28">
-  <defs
-     id="defs136711">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0"
-       id="linearGradient146494-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-19.316631,-432.42507)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.36697"
-       y2="7986.2241" />
-    <linearGradient
-       id="linearGradient42443-7-52-0">
-      <stop
-         id="stop42445-53-8-3"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-2-7" />
-      <stop
-         id="stop42449-3-19-2"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.01477" height="26.668919" id="svg136709" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 28">
+  <defs id="defs136711">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0" id="linearGradient146494-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-19.316631,-432.42507)" x1="407.2959" y1="8015.7466" x2="407.36697" y2="7986.2241"/>
+    <linearGradient id="linearGradient42443-7-52-0">
+      <stop id="stop42445-53-8-3" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-2-7"/>
+      <stop id="stop42449-3-19-2" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-9-5"
-       id="linearGradient146496-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-18.559388,-432.42507)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-9-5">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-6-4" />
-      <stop
-         id="stop76664-9-25-9-0"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-21-6" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-9-5" id="linearGradient146496-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-18.559388,-432.42507)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-9-5">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-6-4"/>
+      <stop id="stop76664-9-25-9-0" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-21-6"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45434-5-3-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45430-8-1-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0"
-       id="linearGradient146498-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-20.251492,-432.42507)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient136584">
-      <stop
-         id="stop136586"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop136588" />
-      <stop
-         id="stop136590"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect45434-5-3-2" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect45430-8-1-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0" id="linearGradient146498-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-20.251492,-432.42507)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient136584">
+      <stop id="stop136586" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop136588"/>
+      <stop id="stop136590" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45449-51-8-3"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45451-306-5-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-6-8"
-       id="linearGradient146500-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,-0.02945495,1.0535452,-19.316631,-432.42507)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-6-8">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-76-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-7-9" />
+    <inkscape:path-effect is_visible="true" id="path-effect45449-51-8-3" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect45451-306-5-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-6-8" id="linearGradient146500-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,-0.02945495,1.0535452,-19.316631,-432.42507)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-6-8">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-76-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-7-9"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-5-4"
-       id="linearGradient146502-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-27.112939,-432.49535)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-5-4">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-5-2" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-28-8" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-5-4" id="linearGradient146502-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-27.112939,-432.49535)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-5-4">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-5-2"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-28-8"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="139.01199"
-     inkscape:cy="50.474265"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="110"
-     inkscape:window-y="145"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata136714">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="139.01199" inkscape:cy="50.474265" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="110" inkscape:window-y="145" inkscape:window-maximized="0"/>
+  <metadata id="metadata136714">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-235.98801,-556.16753)">
-    <g
-       style="display:inline"
-       id="g45783-3-0-8"
-       transform="translate(-507.88306,-7207.1367)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_2U_server_3D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         transform="translate(0,-80)"
-         id="g47631-7-3-1">
-        <g
-           id="g48073-1-1-0"
-           transform="matrix(1.0266398,0,0,1.0266398,382.18931,-70.5375)">
-          <g
-             id="g61747-8-5"
-             transform="translate(-7.2319631,-275.15898)">
-            <g
-               id="g146209-3">
-              <path
-                 sodipodi:nodetypes="ccccccc"
-                 id="path47635-7-3-1"
-                 style="fill:url(#linearGradient146494-0);fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 365.13604,7992.6125 0.13246,16.455 113.50577,0.3686 -0.26297,-16.8448 -30.98725,-8.9432 -52.35964,0 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 365.62668,7993.0681 112.45301,0 0,16.1013 -112.45301,0 z"
-                 style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.92312402;stroke-opacity:1"
-                 id="path47637-4-5-0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47639-2-7-6"
-                 d="m 477.39368,7993.2997 c -0.74174,0 -1.36725,0.8063 -1.41556,1.8075 l -0.60439,12.222 c -0.0483,1.0015 0.51476,1.8077 1.25651,1.8077 l 5.40774,0 c 0.74174,0 1.36729,-0.8062 1.41556,-1.8077 l 0.14314,-2.9477 -0.82707,-0.1297 0,-5.6591 1.11336,0.1506 0.17496,-3.6366 c 0.0483,-1.0014 -0.51477,-1.8074 -1.25651,-1.8074 l -5.40774,0 z m 2.65615,5.9174 c 0.23534,0.014 0.41593,0.5454 0.39763,1.1835 -0.0183,0.6382 -0.2259,1.1314 -0.46124,1.119 -0.23534,-0.014 -0.40001,-0.5238 -0.38172,-1.162 0.0182,-0.638 0.21,-1.1528 0.44533,-1.1405 z"
-                 style="fill:url(#linearGradient146496-0);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31618708;stroke-miterlimit:4;stroke-dasharray:none" />
-              <path
-                 sodipodi:nodetypes="cccccccccc"
-                 inkscape:connector-curvature="0"
-                 inkscape:original-d="m 479.46683,7994.9041 c 0.06,-0.8238 0.42995,-0.5498 1.09002,-0.077 l 1.32985,1.7765 -0.31713,11.9685 c -0.29789,0.6523 -0.6651,0.2926 -1.09462,0.1297 l -1.53602,-2.1201 c 0.31257,-0.5462 0.395,-0.2684 0.90554,-0.053 l 0.67055,0.5054 0.28767,-10.2639 z"
-                 inkscape:path-effect="#path-effect45434-5-3-2"
-                 id="path47641-0-8-4"
-                 d="m 479.46683,7994.9041 1.09002,-0.077 1.32985,1.7765 -0.31713,11.9685 -1.09462,0.1297 -1.53602,-2.1201 0.90554,-0.053 0.67055,0.5054 0.28767,-10.2639 -1.33586,-1.8661"
-                 style="fill:#808080;fill-opacity:1;stroke:none" />
-              <path
-                 sodipodi:nodetypes="ccccccccc"
-                 inkscape:connector-curvature="0"
-                 inkscape:original-d="m 479.39949,7997.4654 0.99846,0.9997 -0.23452,8.8505 -1.22441,-0.7311 -0.0368,1.4362 1.57904,0.6833 0.34912,-11.9841 -1.36885,-1.8172 z"
-                 inkscape:path-effect="#path-effect45430-8-1-9"
-                 id="path47643-7-6-2"
-                 d="m 479.39949,7997.4654 0.99846,0.9997 -0.23452,8.8505 -1.22441,-0.7311 -0.0368,1.4362 1.57904,0.6833 0.34912,-11.9841 -1.36885,-1.8172 -0.062,2.5627"
-                 style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path47645-2-1-4"
-                 style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.92319888;stroke-opacity:1"
-                 d="m 365.62671,7993.0681 73.51722,0 0,16.1013 -73.51722,0 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 style="fill:url(#linearGradient146498-8);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21079138;stroke-miterlimit:4;stroke-dasharray:none"
-                 d="m 366.31282,7993.5372 c 0.74177,0 1.36728,0.8059 1.41558,1.8075 l 0.60441,12.2221 c 0.0482,1.0014 -0.51478,1.8075 -1.25653,1.8075 l -5.40779,0 c -0.74173,0 -1.36732,-0.8061 -1.41557,-1.8075 l -0.14315,-2.9478 0.82707,-0.1298 0,-5.6591 -1.11336,0.1504 -0.17495,-3.6364 c -0.0483,-1.0014 0.51476,-1.8075 1.2565,-1.8075 l 5.40779,0 z m -2.65617,5.9174 c -0.23534,0.014 -0.41593,0.5454 -0.39764,1.1836 0.0183,0.6381 0.22592,1.1311 0.46126,1.1189 0.23534,-0.014 0.40002,-0.5241 0.38173,-1.1621 -0.0183,-0.6382 -0.21002,-1.1528 -0.44535,-1.1404 z"
-                 id="path47647-5-9-5"
-                 inkscape:connector-curvature="0" />
-              <path
-                 style="fill:#808080;stroke:none"
-                 d="m 364.23966,7995.1415 -1.09002,-0.077 -1.32988,1.7765 0.31715,11.9686 1.09461,0.1298 1.53604,-2.1202 -0.90554,-0.053 -0.67055,0.5054 -0.28768,-10.264 1.33587,-1.8661"
-                 id="path47649-7-02-5"
-                 inkscape:path-effect="#path-effect45449-51-8-3"
-                 inkscape:original-d="m 364.23966,7995.1415 c -0.0599,-0.8241 -0.42995,-0.55 -1.09002,-0.077 l -1.32988,1.7765 0.31715,11.9686 c 0.29789,0.6524 0.66511,0.2927 1.09461,0.1298 l 1.53604,-2.1202 c -0.31257,-0.5459 -0.39501,-0.2683 -0.90554,-0.053 l -0.67055,0.5054 -0.28768,-10.264 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccccc" />
-              <path
-                 style="fill:#4d4d4d;stroke:none"
-                 d="m 364.307,7997.7028 -0.99847,0.9997 0.23453,8.8506 1.22442,-0.7312 0.0368,1.4364 -1.57905,0.6833 -0.34911,-11.9843 1.36887,-1.8173 0.062,2.5628"
-                 id="path47651-2-7-2"
-                 inkscape:path-effect="#path-effect45451-306-5-5"
-                 inkscape:original-d="m 364.307,7997.7028 -0.99847,0.9997 0.23453,8.8506 1.22442,-0.7312 0.0368,1.4364 -1.57905,0.6833 -0.34911,-11.9843 1.36887,-1.8173 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 369.46174,7994.5215 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z"
-                 style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-                 id="path47653-8-8-8" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47655-6-3-2"
-                 d="m 372.69366,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z"
-                 style="fill:#000000;stroke:none" />
-              <path
-                 sodipodi:nodetypes="cccccccccccccccccc"
-                 inkscape:connector-curvature="0"
-                 id="path47657-2-7-7"
-                 d="m 390.39286,7996.0173 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z"
-                 style="fill:#000000;stroke:none" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 381.2188,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z"
-                 id="path47659-8-3-8" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 372.89723,7997.5061 7.18911,0 0,0.4071 -7.18911,0 z"
-                 id="path47661-6-53-9" />
-              <path
-                 id="path47663-7-34-9"
-                 d="m 381.42237,7997.5061 7.18912,0 0,0.4071 -7.18912,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path47665-4-4-8"
-                 d="m 373.04993,7998.5915 7.18911,0 0,0.407 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 381.57507,7998.5915 7.18912,0 0,0.407 -7.18912,0 z"
-                 id="path47667-1-1-7" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 373.10082,7999.6317 7.18912,0 0,0.4069 -7.18912,0 z"
-                 id="path47669-0-9-2" />
-              <path
-                 id="path47671-9-4-3"
-                 d="m 381.62597,7999.6317 7.18911,0 0,0.4069 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 390.27835,7999.6317 7.18912,0 0,0.4069 -7.18912,0 z"
-                 id="path47673-8-36-7" />
-              <path
-                 sodipodi:nodetypes="ccsssccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 369.46174,7995.5616 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-                 style="fill:#000000;stroke:none"
-                 id="path47675-7-3-0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 401.13052,7994.9712 0.47457,-0.011 c 0.24733,-0.011 0.46443,0.131 0.48672,0.3059 l 0.031,0.2425 c 0.0223,0.175 -0.15884,0.3201 -0.40618,0.3255 l -0.47457,0.011 c -0.24735,0.01 -0.46445,-0.131 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3253 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path47677-7-0-1" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 403.83999,7994.9124 0.47457,-0.011 c 0.24735,-0.01 0.46444,0.1311 0.48676,0.3059 l 0.0309,0.2425 c 0.0222,0.1749 -0.15886,0.3201 -0.40621,0.3255 l -0.47456,0.01 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15886,-0.32 0.40621,-0.3252 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path47679-5-3-2" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47681-4-98-3"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 401.17662,7997.096 0.47457,-0.01 c 0.24734,-0.011 0.46444,0.1313 0.48673,0.306 l 0.031,0.2426 c 0.0223,0.1747 -0.15884,0.32 -0.40619,0.3254 l -0.47457,0.011 c -0.24735,0 -0.46445,-0.1312 -0.48677,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1747 0.15885,-0.3201 0.40621,-0.3254 z" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47683-1-0-7"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 403.88609,7997.0372 0.47458,-0.01 c 0.24734,-0.011 0.46443,0.1313 0.48675,0.3061 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3254 z" />
-              <path
-                 d="m 401.22664,7999.4017 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1312 0.48674,0.3061 l 0.031,0.2424 c 0.0224,0.1751 -0.15883,0.3203 -0.40618,0.3257 l -0.47457,0.011 c -0.24735,0.011 -0.46444,-0.1311 -0.48677,-0.3061 l -0.0309,-0.2424 c -0.0223,-0.175 0.15885,-0.3202 0.4062,-0.3256 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path47685-4-5-9"
-                 inkscape:connector-curvature="0" />
-              <path
-                 d="m 403.93612,7999.343 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.1313 0.48676,0.3061 l 0.0309,0.2425 c 0.0222,0.175 -0.15885,0.3202 -0.4062,0.3256 l -0.47457,0.01 c -0.24733,0.011 -0.46444,-0.1312 -0.48675,-0.3062 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.32 0.4062,-0.3254 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path47687-8-2-0"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path47689-0-2-5"
-                 style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-                 d="m 406.58427,7994.5214 29.32904,-0.045 0.0637,6.3309 -29.20179,0 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 style="fill:#000000;stroke:none"
-                 d="m 409.8162,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z"
-                 id="path47691-9-7-6"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccccccccccccccc"
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 427.5154,7996.0173 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1023 0,2.9844 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9844 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-                 id="path47693-7-1-2" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path47695-3-0-1"
-                 d="m 418.34134,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path47697-2-50-8"
-                 d="m 410.01977,7997.5061 7.18913,0 0,0.4071 -7.18913,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 418.54491,7997.5061 7.18913,0 0,0.4071 -7.18913,0 z"
-                 id="path47699-4-8-9" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 410.17247,7998.5915 7.18911,0 0,0.407 -7.18911,0 z"
-                 id="path47701-8-0-5" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path47703-2-3-2"
-                 d="m 418.69761,7998.5915 7.18911,0 0,0.407 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path47705-5-8-9"
-                 d="m 410.22338,7999.6317 7.1891,0 0,0.4069 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 418.74852,7999.6317 7.1891,0 0,0.4069 -7.1891,0 z"
-                 id="path47707-4-6-2" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path47709-9-7-6"
-                 d="m 427.40089,7999.6317 7.18911,0 0,0.4069 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path47711-6-3-6"
-                 style="fill:#000000;stroke:none"
-                 d="m 406.58427,7995.5616 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.059,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccsssccccccc" />
-              <path
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 394.22384,7995.9982 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path47713-9-42-3" />
-              <path
-                 id="path47715-3-1-9"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 394.22392,7999.2317 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccc" />
-              <path
-                 id="path47717-3-9-1"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 431.17483,7995.9982 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccc" />
-              <path
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 431.1749,7999.2317 0,-0.4635 2.11403,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path47719-2-2-2" />
-              <path
-                 id="path47721-7-9-0"
-                 style="fill:url(#linearGradient146500-8);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.50041842"
-                 d="m 441.70238,7995.8111 31.74661,0 -0.11348,4.0591 -31.74662,0 z"
-                 inkscape:connector-curvature="0" />
-              <g
-                 id="g47723-9-9-5"
-                 style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-                 transform="matrix(0.14942814,0,-0.03044284,0.12343177,389.80533,6930.2532)">
-                <path
-                   inkscape:connector-curvature="0"
-                   d="m 2304.2619,8640.1281 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z m -6.9816,6.5971 -2.8381,-7.9403 1.7386,0 2.0094,5.8767 1.9445,-5.8767 1.7007,0 -2.8436,7.9403 z m -10.0472,-7.9403 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z"
-                   style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Arial Bold"
-                   id="path47725-9-2-0" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-235.98801,-556.16753)">
+    <g style="display:inline" id="g45783-3-0-8" transform="translate(-507.88306,-7207.1367)">
+      <g transform="translate(0,-80)" id="g47631-7-3-1">
+        <g id="g48073-1-1-0" transform="matrix(1.0266398,0,0,1.0266398,382.18931,-70.5375)">
+          <g id="g61747-8-5" transform="translate(-7.2319631,-275.15898)">
+            <g id="g146209-3">
+              <path sodipodi:nodetypes="ccccccc" id="path47635-7-3-1" style="fill:url(#linearGradient146494-0);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 365.13604,7992.6125 0.13246,16.455 113.50577,0.3686 -0.26297,-16.8448 -30.98725,-8.9432 -52.35964,0 z" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" d="m 365.62668,7993.0681 112.45301,0 0,16.1013 -112.45301,0 z" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.92312402;stroke-opacity:1" id="path47637-4-5-0" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" id="path47639-2-7-6" d="m 477.39368,7993.2997 c -0.74174,0 -1.36725,0.8063 -1.41556,1.8075 l -0.60439,12.222 c -0.0483,1.0015 0.51476,1.8077 1.25651,1.8077 l 5.40774,0 c 0.74174,0 1.36729,-0.8062 1.41556,-1.8077 l 0.14314,-2.9477 -0.82707,-0.1297 0,-5.6591 1.11336,0.1506 0.17496,-3.6366 c 0.0483,-1.0014 -0.51477,-1.8074 -1.25651,-1.8074 l -5.40774,0 z m 2.65615,5.9174 c 0.23534,0.014 0.41593,0.5454 0.39763,1.1835 -0.0183,0.6382 -0.2259,1.1314 -0.46124,1.119 -0.23534,-0.014 -0.40001,-0.5238 -0.38172,-1.162 0.0182,-0.638 0.21,-1.1528 0.44533,-1.1405 z" style="fill:url(#linearGradient146496-0);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31618708;stroke-miterlimit:4;stroke-dasharray:none"/>
+              <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 479.46683,7994.9041 c 0.06,-0.8238 0.42995,-0.5498 1.09002,-0.077 l 1.32985,1.7765 -0.31713,11.9685 c -0.29789,0.6523 -0.6651,0.2926 -1.09462,0.1297 l -1.53602,-2.1201 c 0.31257,-0.5462 0.395,-0.2684 0.90554,-0.053 l 0.67055,0.5054 0.28767,-10.2639 z" inkscape:path-effect="#path-effect45434-5-3-2" id="path47641-0-8-4" d="m 479.46683,7994.9041 1.09002,-0.077 1.32985,1.7765 -0.31713,11.9685 -1.09462,0.1297 -1.53602,-2.1201 0.90554,-0.053 0.67055,0.5054 0.28767,-10.2639 -1.33586,-1.8661" style="fill:#808080;fill-opacity:1;stroke:none"/>
+              <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 479.39949,7997.4654 0.99846,0.9997 -0.23452,8.8505 -1.22441,-0.7311 -0.0368,1.4362 1.57904,0.6833 0.34912,-11.9841 -1.36885,-1.8172 z" inkscape:path-effect="#path-effect45430-8-1-9" id="path47643-7-6-2" d="m 479.39949,7997.4654 0.99846,0.9997 -0.23452,8.8505 -1.22441,-0.7311 -0.0368,1.4362 1.57904,0.6833 0.34912,-11.9841 -1.36885,-1.8172 -0.062,2.5627" style="fill:#4d4d4d;fill-opacity:1;stroke:none"/>
+              <path sodipodi:nodetypes="ccccc" id="path47645-2-1-4" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.92319888;stroke-opacity:1" d="m 365.62671,7993.0681 73.51722,0 0,16.1013 -73.51722,0 z" inkscape:connector-curvature="0"/>
+              <path style="fill:url(#linearGradient146498-8);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21079138;stroke-miterlimit:4;stroke-dasharray:none" d="m 366.31282,7993.5372 c 0.74177,0 1.36728,0.8059 1.41558,1.8075 l 0.60441,12.2221 c 0.0482,1.0014 -0.51478,1.8075 -1.25653,1.8075 l -5.40779,0 c -0.74173,0 -1.36732,-0.8061 -1.41557,-1.8075 l -0.14315,-2.9478 0.82707,-0.1298 0,-5.6591 -1.11336,0.1504 -0.17495,-3.6364 c -0.0483,-1.0014 0.51476,-1.8075 1.2565,-1.8075 l 5.40779,0 z m -2.65617,5.9174 c -0.23534,0.014 -0.41593,0.5454 -0.39764,1.1836 0.0183,0.6381 0.22592,1.1311 0.46126,1.1189 0.23534,-0.014 0.40002,-0.5241 0.38173,-1.1621 -0.0183,-0.6382 -0.21002,-1.1528 -0.44535,-1.1404 z" id="path47647-5-9-5" inkscape:connector-curvature="0"/>
+              <path style="fill:#808080;stroke:none" d="m 364.23966,7995.1415 -1.09002,-0.077 -1.32988,1.7765 0.31715,11.9686 1.09461,0.1298 1.53604,-2.1202 -0.90554,-0.053 -0.67055,0.5054 -0.28768,-10.264 1.33587,-1.8661" id="path47649-7-02-5" inkscape:path-effect="#path-effect45449-51-8-3" inkscape:original-d="m 364.23966,7995.1415 c -0.0599,-0.8241 -0.42995,-0.55 -1.09002,-0.077 l -1.32988,1.7765 0.31715,11.9686 c 0.29789,0.6524 0.66511,0.2927 1.09461,0.1298 l 1.53604,-2.1202 c -0.31257,-0.5459 -0.39501,-0.2683 -0.90554,-0.053 l -0.67055,0.5054 -0.28768,-10.264 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+              <path style="fill:#4d4d4d;stroke:none" d="m 364.307,7997.7028 -0.99847,0.9997 0.23453,8.8506 1.22442,-0.7312 0.0368,1.4364 -1.57905,0.6833 -0.34911,-11.9843 1.36887,-1.8173 0.062,2.5628" id="path47651-2-7-2" inkscape:path-effect="#path-effect45451-306-5-5" inkscape:original-d="m 364.307,7997.7028 -0.99847,0.9997 0.23453,8.8506 1.22442,-0.7312 0.0368,1.4364 -1.57905,0.6833 -0.34911,-11.9843 1.36887,-1.8173 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 369.46174,7994.5215 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path47653-8-8-8"/>
+              <path inkscape:connector-curvature="0" id="path47655-6-3-2" d="m 372.69366,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none"/>
+              <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path47657-2-7-7" d="m 390.39286,7996.0173 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z" style="fill:#000000;stroke:none"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.2188,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z" id="path47659-8-3-8"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 372.89723,7997.5061 7.18911,0 0,0.4071 -7.18911,0 z" id="path47661-6-53-9"/>
+              <path id="path47663-7-34-9" d="m 381.42237,7997.5061 7.18912,0 0,0.4071 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path47665-4-4-8" d="m 373.04993,7998.5915 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.57507,7998.5915 7.18912,0 0,0.407 -7.18912,0 z" id="path47667-1-1-7"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.10082,7999.6317 7.18912,0 0,0.4069 -7.18912,0 z" id="path47669-0-9-2"/>
+              <path id="path47671-9-4-3" d="m 381.62597,7999.6317 7.18911,0 0,0.4069 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 390.27835,7999.6317 7.18912,0 0,0.4069 -7.18912,0 z" id="path47673-8-36-7"/>
+              <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 369.46174,7995.5616 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" style="fill:#000000;stroke:none" id="path47675-7-3-0"/>
+              <path inkscape:connector-curvature="0" d="m 401.13052,7994.9712 0.47457,-0.011 c 0.24733,-0.011 0.46443,0.131 0.48672,0.3059 l 0.031,0.2425 c 0.0223,0.175 -0.15884,0.3201 -0.40618,0.3255 l -0.47457,0.011 c -0.24735,0.01 -0.46445,-0.131 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3253 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path47677-7-0-1"/>
+              <path inkscape:connector-curvature="0" d="m 403.83999,7994.9124 0.47457,-0.011 c 0.24735,-0.01 0.46444,0.1311 0.48676,0.3059 l 0.0309,0.2425 c 0.0222,0.1749 -0.15886,0.3201 -0.40621,0.3255 l -0.47456,0.01 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15886,-0.32 0.40621,-0.3252 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path47679-5-3-2"/>
+              <path inkscape:connector-curvature="0" id="path47681-4-98-3" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.17662,7997.096 0.47457,-0.01 c 0.24734,-0.011 0.46444,0.1313 0.48673,0.306 l 0.031,0.2426 c 0.0223,0.1747 -0.15884,0.32 -0.40619,0.3254 l -0.47457,0.011 c -0.24735,0 -0.46445,-0.1312 -0.48677,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1747 0.15885,-0.3201 0.40621,-0.3254 z"/>
+              <path inkscape:connector-curvature="0" id="path47683-1-0-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.88609,7997.0372 0.47458,-0.01 c 0.24734,-0.011 0.46443,0.1313 0.48675,0.3061 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3254 z"/>
+              <path d="m 401.22664,7999.4017 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1312 0.48674,0.3061 l 0.031,0.2424 c 0.0224,0.1751 -0.15883,0.3203 -0.40618,0.3257 l -0.47457,0.011 c -0.24735,0.011 -0.46444,-0.1311 -0.48677,-0.3061 l -0.0309,-0.2424 c -0.0223,-0.175 0.15885,-0.3202 0.4062,-0.3256 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path47685-4-5-9" inkscape:connector-curvature="0"/>
+              <path d="m 403.93612,7999.343 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.1313 0.48676,0.3061 l 0.0309,0.2425 c 0.0222,0.175 -0.15885,0.3202 -0.4062,0.3256 l -0.47457,0.01 c -0.24733,0.011 -0.46444,-0.1312 -0.48675,-0.3062 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.32 0.4062,-0.3254 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path47687-8-2-0" inkscape:connector-curvature="0"/>
+              <path id="path47689-0-2-5" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" d="m 406.58427,7994.5214 29.32904,-0.045 0.0637,6.3309 -29.20179,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 409.8162,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z" id="path47691-9-7-6" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.5154,7996.0173 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1023 0,2.9844 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9844 0.9543,0 0.0159,-0.1132 -1.65414,0 z" id="path47693-7-1-2"/>
+              <path sodipodi:nodetypes="ccccc" id="path47695-3-0-1" d="m 418.34134,7996.1495 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccc" id="path47697-2-50-8" d="m 410.01977,7997.5061 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.54491,7997.5061 7.18913,0 0,0.4071 -7.18913,0 z" id="path47699-4-8-9"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.17247,7998.5915 7.18911,0 0,0.407 -7.18911,0 z" id="path47701-8-0-5"/>
+              <path sodipodi:nodetypes="ccccc" id="path47703-2-3-2" d="m 418.69761,7998.5915 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccc" id="path47705-5-8-9" d="m 410.22338,7999.6317 7.1891,0 0,0.4069 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.74852,7999.6317 7.1891,0 0,0.4069 -7.1891,0 z" id="path47707-4-6-2"/>
+              <path sodipodi:nodetypes="ccccc" id="path47709-9-7-6" d="m 427.40089,7999.6317 7.18911,0 0,0.4069 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path47711-6-3-6" style="fill:#000000;stroke:none" d="m 406.58427,7995.5616 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.059,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+              <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.22384,7995.9982 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47713-9-42-3"/>
+              <path id="path47715-3-1-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.22392,7999.2317 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+              <path id="path47717-3-9-1" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.17483,7995.9982 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+              <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.1749,7999.2317 0,-0.4635 2.11403,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47719-2-2-2"/>
+              <path id="path47721-7-9-0" style="fill:url(#linearGradient146500-8);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.50041842" d="m 441.70238,7995.8111 31.74661,0 -0.11348,4.0591 -31.74662,0 z" inkscape:connector-curvature="0"/>
+              <g id="g47723-9-9-5" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" transform="matrix(0.14942814,0,-0.03044284,0.12343177,389.80533,6930.2532)">
+                <path inkscape:connector-curvature="0" d="m 2304.2619,8640.1281 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z m -6.9816,6.5971 -2.8381,-7.9403 1.7386,0 2.0094,5.8767 1.9445,-5.8767 1.7007,0 -2.8436,7.9403 z m -10.0472,-7.9403 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z" style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Arial Bold" id="path47725-9-2-0"/>
               </g>
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47727-0-2-9"
-                 d="m 470.27084,7998.0012 c -1.08707,0 -1.96833,0.1211 -1.96833,0.2713 0,0.15 0.88126,0.2712 1.96833,0.2712 1.08709,0 1.96834,-0.1212 1.96834,-0.2712 0,-0.1502 -0.88125,-0.2713 -1.96834,-0.2713 z m 0,0.1961 c 0.30515,0 0.55253,0.034 0.55253,0.075 0,0.042 -0.24738,0.075 -0.55253,0.075 -0.30514,0 -0.55251,-0.034 -0.55251,-0.075 0,-0.042 0.24737,-0.075 0.55251,-0.075 z"
-                 style="fill:#ffffff;stroke:none" />
-              <text
-                 transform="scale(1.0170762,0.9832105)"
-                 sodipodi:linespacing="125%"
-                 id="text47729-5-5-4"
-                 y="8135.8271"
-                 x="461.62274"
-                 style="font-size:0.64422148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-                 xml:space="preserve"><tspan
-                   y="8135.8271"
-                   x="461.62274"
-                   id="tspan47731-4-8-6"
-                   sodipodi:role="line">ROM</tspan></text>
-              <g
-                 style="fill:#ffffff"
-                 id="g47733-6-6-2"
-                 transform="matrix(0.02255355,0,0,-0.02180257,456.42108,8000.0463)">
-                <g
-                   style="fill:#ffffff"
-                   transform="translate(8.50391,150.1943)"
-                   id="g47735-9-88-8">
-                  <path
-                     id="path47737-4-8-1"
-                     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-                     d="m 121.00809,-7.9961 c 0,0 -4.304,0 -4.304,0 0,0 0,5.5352 0,5.5352 0,0 4.458,0 4.458,0 2.152,0 3.229,-0.8721 3.229,-2.6113 0,-1.9522 -1.13,-2.9239 -3.383,-2.9239 z m 34.29,-2.7656 c -0.617,-3.0781 -2.206,-4.6123 -4.768,-4.6123 -3.587,0 -5.381,2.252 -5.381,6.7647 0,4.4043 1.794,6.6113 5.381,6.6113 2.562,0 4.101,-1.1309 4.613,-3.3828 0,0 2.153,0 2.153,0 -0.718,3.5869 -2.975,5.3808 -6.766,5.3808 -5.126,0 -7.687,-2.8701 -7.687,-8.6093 0,-5.7432 2.457,-8.6133 7.379,-8.6133 4.204,0 6.611,2.1523 7.228,6.4609 0,0 -2.152,0 -2.152,0 z M 82.41409,0 c -5.3311,0 -7.9951,-2.8701 -7.9951,-8.6093 0,-5.7432 2.664,-8.6133 7.9951,-8.6133 5.331,0 7.9961,2.8701 7.9961,8.6133 0,5.7392 -2.6651,8.6093 -7.9961,8.6093 z m -12.9131,-10.7617 c -0.5166,-3.0781 -2.0528,-4.6123 -4.6133,-4.6123 -3.6914,0 -5.5352,2.252 -5.5352,6.7647 0,4.4043 1.794,6.6113 5.3809,6.6113 2.5615,0 4.0996,-1.1309 4.6133,-3.3828 0,0 2.1523,0 2.1523,0 C 71.08989,-1.7939 68.83299,0 64.73339,0 c -5.0215,0 -7.5332,-2.8701 -7.5332,-8.6093 0,-5.7432 2.4072,-8.6133 7.2246,-8.6133 4.2041,0 6.6113,2.1523 7.2285,6.4609 0,0 -2.1523,0 -2.1523,0 z m 102.4011,10.3028 c 0,0 -13.221,0 -13.221,0 0,0 0,-2.002 0,-2.002 0,0 5.534,0 5.534,0 0,0 0,-14.4522 0,-14.4522 0,0 2.152,0 2.152,0 0,0 0,14.4522 0,14.4522 0,0 5.535,0 5.535,0 0,0 0,2.002 0,2.002 z m -35.824,0 c 0,0 -2.461,0 -2.461,0 0,0 -6.148,-16.4542 -6.148,-16.4542 0,0 2.302,0 2.302,0 0,0 1.694,4.7667 1.694,4.7667 0,0 6.611,0 6.611,0 0,0 1.539,-4.7667 1.539,-4.7667 0,0 2.461,0 2.461,0 0,0 -5.998,16.4542 -5.998,16.4542 z m -14.298,0 c 0,0 -7.228,0 -7.228,0 0,0 0,-16.4542 0,-16.4542 0,0 2.152,0 2.152,0 0,0 0,6.919 0,6.919 0,0 5.076,0 5.076,0 3.279,0 4.917,1.6396 4.917,4.9219 0,3.0742 -1.638,4.6133 -4.917,4.6133 z m -11.996,0 c 0,0 -3.074,0 -3.074,0 0,0 -4.768,-13.8399 -4.768,-13.8399 0,0 -4.612,13.8399 -4.612,13.8399 0,0 -3.229,0 -3.229,0 0,0 0,-16.4542 0,-16.4542 0,0 2.153,0 2.153,0 0,0 0,13.6836 0,13.6836 0,0 4.612,-13.6836 4.612,-13.6836 0,0 2.152,0 2.152,0 0,0 4.768,13.8389 4.768,13.8389 0,0 -0.154,-4.1504 -0.154,-4.1504 0,0 0,-9.6885 0,-9.6885 0,0 2.152,0 2.152,0 0,0 0,16.4542 0,16.4542 z m -61.8095,-2.9239 c 0,1.2305 -0.6172,1.8477 -1.8476,1.8477 0,0 -16.7598,0 -16.7598,0 -1.2295,0 -1.8428,-0.6172 -1.8428,-1.8477 0,0 0,-17.372 0,-17.372 0,-0.8223 -0.4131,-1.2315 -1.2304,-1.2315 0,0 -15.375,0 -15.375,0 -3.1778,0 -5.793,-1.0508 -7.8448,-3.1523 C 1.02148,-27.2412 0,-29.8808 0,-33.0595 c 0,0 0,-38.2848 0,-38.2848 0,-3.079 1.05078,-5.69 3.15329,-7.842 2.1026,-2.153 4.6875,-3.229 7.7657,-3.229 0,0 35.208,0 35.208,0 1.2304,0 1.8476,0.663 1.8476,1.998 0,0 0,77.0345 0,77.0345 z m 127.7735,-53.6601 c 0,1.331 -0.617,1.998 -1.848,1.998 0,0 -15.374,0 -15.374,0 -1.335,0 -1.998,-0.667 -1.998,-1.998 0,0 0,-8.9174 0,-8.9174 0,-2.565 -1.23,-3.845 -3.691,-3.845 -2.566,0 -3.846,1.28 -3.846,3.845 0,0 0,27.3656 0,27.3656 0,2.5615 1.28,3.8457 3.846,3.8457 2.461,0 3.691,-1.2842 3.691,-3.8457 0,0 0,-7.2236 0,-7.2236 0,-1.2344 0.663,-1.8477 1.998,-1.8477 0,0 15.374,0 15.374,0 1.231,0 1.848,0.6133 1.848,1.8477 0,0 0,12.7588 0,12.7588 0,3.0742 -1.076,5.6894 -3.229,7.8418 -2.152,2.1523 -4.767,3.2314 -7.84,3.2314 0,0 -23.679,0 -23.679,0 -3.078,0 -5.693,-1.0791 -7.846,-3.2314 -2.152,-2.1524 -3.228,-4.7676 -3.228,-7.8418 0,0 0,-38.1308 0,-38.1308 0,-3.179 1.05,-5.844 3.153,-7.996 2.103,-2.153 4.742,-3.229 7.921,-3.229 0,0 23.679,0 23.679,0 3.173,0 5.813,1.076 7.916,3.229 2.102,2.152 3.153,4.817 3.153,7.996 0,0 0,14.1474 0,14.1474 z m -50.895,3.2285 c 0,3.0742 -1.076,5.6894 -3.227,7.8418 -2.152,2.1513 -4.768,3.2285 -7.842,3.2285 0,0 -14.303,0 -14.303,0 -1.538,0 -2.305,0.7676 -2.305,2.3057 0,1.6396 0.767,2.4619 2.305,2.4619 0,0 21.527,0 21.527,0 1.23,0 1.847,0.6123 1.847,1.8427 0,0 0,12.3008 0,12.3008 0,1.2305 -0.617,1.8467 -1.847,1.8467 0,0 -30.4436,0 -30.4436,0 -3.0782,0 -5.6895,-1.0791 -7.8418,-3.2314 -2.1514,-2.1524 -3.2286,-4.7676 -3.2286,-7.8418 0,0 0,-16.2959 0,-16.2959 0,-3.0782 1.0772,-5.6895 3.2286,-7.8419 2.1523,-2.152 4.7636,-3.228 7.8418,-3.228 0,0 14.3016,0 14.3016,0 1.944,0 2.92,-1.026 2.92,-3.079 0,-1.842 -0.976,-2.764 -2.92,-2.764 0,0 -23.5282,0 -23.5282,0 -1.2305,0 -1.8438,-0.668 -1.8438,-1.998 0,0 0,-12.151 0,-12.151 0,-1.335 0.6133,-1.998 1.8438,-1.998 0,0 32.4462,0 32.4462,0 3.174,0 5.815,1.076 7.916,3.229 2.103,2.152 3.153,4.817 3.153,7.996 0,0 0,17.3759 0,17.3759 z m 46.59,-51.5119 c 0,0 -9.843,0 -9.843,0 0,0 0,5.535 0,5.535 0,0 8.917,0 8.917,0 0,0 0,1.848 0,1.848 0,0 -8.917,0 -8.917,0 0,0 0,5.072 0,5.072 0,0 9.689,0 9.689,0 0,0 0,2.002 0,2.002 0,0 -11.841,0 -11.841,0 0,0 0,-16.3 0,-16.3 0,0 11.995,0 11.995,0 0,0 0,1.843 0,1.843 z m -15.991,6.766 c 0,0 -7.228,0 -7.228,0 0,0 0,-1.844 0,-1.844 0,0 5.076,0 5.076,0 0,-3.587 -1.694,-5.38 -5.076,-5.38 -3.587,0 -5.381,2.252 -5.381,6.765 0,4.404 1.794,6.611 5.381,6.611 2.665,0 4.254,-1.131 4.767,-3.383 0,0 2.152,0 2.152,0 -0.409,3.587 -2.715,5.381 -6.919,5.381 -5.126,0 -7.687,-2.87 -7.687,-8.609 0,-2.869 0.742,-5.026 2.227,-6.461 1.485,-1.435 3.253,-2.152 5.305,-2.152 2.461,0 4.255,0.872 5.385,2.615 0,0 0.613,-2.152 0.613,-2.152 0,0 1.385,0 1.385,0 0,0 0,8.609 0,8.609 z m -21.526,7.691 c 0,0 -2.461,0 -2.461,0 0,0 -6.303,-16.3 -6.303,-16.3 0,0 2.307,0 2.307,0 0,0 1.689,4.613 1.689,4.613 0,0 6.611,0 6.611,0 0,0 1.694,-4.613 1.694,-4.613 0,0 2.306,0 2.306,0 0,0 -5.843,16.3 -5.843,16.3 z m -9.227,-15.991 c -0.513,0.2 -0.767,0.763 -0.767,1.688 0,0 -0.155,2.924 -0.155,2.924 -0.103,1.331 -0.771,2.358 -1.997,3.075 1.534,0.817 2.306,2.102 2.306,3.845 0,2.97 -1.797,4.459 -5.385,4.459 0,0 -7.686,0 -7.686,0 0,0 0,-16.3 0,-16.3 0,0 2.306,0 2.306,0 0,0 0,6.919 0,6.919 0,0 5.38,0 5.38,0 1.844,0 2.82,-0.975 2.925,-2.923 0,0 0.304,-3.996 0.304,-3.996 0,0 2.769,0.309 2.769,0.309 z m -23.833,16.45 c -5.33,0 -7.995,-2.87 -7.995,-8.609 0,-2.461 0.718,-4.513 2.152,-6.153 1.435,-1.642 3.382,-2.46 5.843,-2.46 5.331,0 7.996,2.87 7.996,8.613 0,5.739 -2.665,8.609 -7.996,8.609 z m -7.995,-0.459 c 0,0 -13.377,0 -13.377,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.1523,0 2.1523,0 0,0 0,14.298 0,14.298 0,0 5.5352,0 5.5352,0 0,0 0,2.002 0,2.002 z m -17.5264,-7.383 c 0,0 -4.6132,1.077 -4.6132,1.077 -1.335,0.308 -2.002,0.971 -2.002,1.998 0,1.947 1.2295,2.923 3.6904,2.923 2.7696,0 4.1543,-1.13 4.1543,-3.382 0,0 1.9981,0 1.9981,0 0,3.482 -2.1016,5.226 -6.3057,5.226 -3.7959,0 -5.6894,-1.693 -5.6894,-5.072 0,-2.052 1.1767,-3.337 3.5371,-3.846 0,0 3.2275,-0.767 3.2275,-0.767 2.3564,-0.517 3.5371,-1.49 3.5371,-2.924 0,-1.844 -1.4346,-2.765 -4.3047,-2.765 -2.9726,0 -4.458,1.28 -4.458,3.841 0,0 -1.998,0 -1.998,0 0,-3.796 2.1523,-5.689 6.456,-5.689 4.3047,0 6.4571,1.639 6.4571,4.921 0,2.357 -1.2305,3.842 -3.6866,4.459 z m -24.6054,7.383 c 0,0 -2.4561,0 -2.4561,0 0,0 -6.1523,-16.3 -6.1523,-16.3 0,0 2.3066,0 2.3066,0 0,0 1.6895,4.613 1.6895,4.613 0,0 6.6152,0 6.6152,0 0,0 1.5342,-4.613 1.5342,-4.613 0,0 2.4609,0 2.4609,0 0,0 -5.998,16.3 -5.998,16.3 z m -5.6885,0 c 0,0 -13.376,0 -13.376,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.3056,0 2.3056,0 0,0 0,14.298 0,14.298 0,0 5.3809,0 5.3809,0 0,0 0,2.002 0,2.002 z m -17.5264,0 c 0,0 -2.6152,0 -2.6152,0 0,0 -6.1485,-16.3 -6.1485,-16.3 0,0 2.3067,0 2.3067,0 0,0 1.6894,4.613 1.6894,4.613 0,0 6.6104,0 6.6104,0 0,0 1.6934,-4.613 1.6934,-4.613 0,0 2.4619,0 2.4619,0 0,0 -5.9981,16.3 -5.9981,16.3 z m -16.9131,0 c 0,0 -6.7656,0 -6.7656,0 0,0 0,-16.3 0,-16.3 0,0 6.6104,0 6.6104,0 4.6142,0 6.9199,2.765 6.9199,8.304 0,5.331 -2.2559,7.996 -6.7647,7.996 z m 121.4668,80.7209 c 0,0 2.77,7.2285 2.77,7.2285 0,0 2.306,-7.2285 2.306,-7.2285 0,0 -5.076,0 -5.076,0 z m -49.664,-5.2256 c -3.7959,0 -5.6885,2.252 -5.6885,6.7647 0,4.4043 1.8926,6.6113 5.6885,6.6113 3.792,0 5.6894,-2.207 5.6894,-6.6113 0,-4.5127 -1.8974,-6.7647 -5.6894,-6.7647 z m -38.8985,-63.5043 c 0,0 -32.5966,0 -32.5966,0 -2.1553,0 -3.9493,0.718 -5.3838,2.153 -1.4356,1.434 -2.1524,3.228 -2.1524,5.381 0,0 0,38.2848 0,38.2848 0,2.1523 0.7168,3.9502 2.1524,5.3847 1.4345,1.4346 3.2285,2.1524 5.3838,2.1524 0,0 18.1445,0 18.1445,0 1.2265,0 1.8437,0.6631 1.8437,1.998 0,0 0,17.376 0,17.376 0,0.8174 0.4082,1.2305 1.2305,1.2305 0,0 11.3779,0 11.3779,0 0.7178,-0.7168 1.0762,-1.1309 1.0762,-1.2305 0,0 0,-71.6529 0,-71.6529 0,-0.208 -0.3584,-0.568 -1.0762,-1.077 z m 126.6185,2.228 c -1.485,-1.485 -3.304,-2.228 -5.455,-2.228 0,0 -23.679,0 -23.679,0 -2.156,0 -4.005,0.743 -5.539,2.228 -1.535,1.484 -2.303,3.308 -2.303,5.46 0,0 0,38.1308 0,38.1308 0,2.1523 0.768,3.9502 2.303,5.3847 1.534,1.4346 3.383,2.1524 5.539,2.1524 0,0 23.679,0 23.679,0 2.252,0 4.099,-0.6924 5.534,-2.0772 1.435,-1.3847 2.152,-3.207 2.152,-5.4599 0,0 0,-10.1475 0,-10.1475 0,-0.7178 -0.358,-1.0771 -1.076,-1.0771 0,0 -10.147,0 -10.147,0 -0.718,0 -1.077,0.3593 -1.077,1.0771 0,0 0,4.6123 0,4.6123 0,2.0527 -0.692,3.7666 -2.077,5.1514 -1.385,1.3847 -3.103,2.0771 -5.151,2.0771 -2.052,0 -3.767,-0.6924 -5.152,-2.0771 -1.384,-1.3848 -2.077,-3.0987 -2.077,-5.1514 0,0 0,-27.3656 0,-27.3656 0,-2.052 0.693,-3.77 2.077,-5.155 1.385,-1.385 3.1,-2.073 5.152,-2.073 2.048,0 3.766,0.688 5.151,2.073 1.385,1.385 2.077,3.103 2.077,5.155 0,0 0,6.456 0,6.456 0,0.718 0.359,1.077 1.077,1.077 0,0 10.147,0 10.147,0 0.205,0 0.563,-0.359 1.076,-1.077 0,0 0,-11.686 0,-11.686 0,-2.152 -0.746,-3.976 -2.231,-5.46 z m -50.895,0 c -1.484,-1.485 -3.303,-2.228 -5.455,-2.228 0,0 -29.6767,0 -29.6767,0 -0.8213,0 -1.2304,0.36 -1.2304,1.077 0,0 0,6.919 0,6.919 0,0.717 0.4091,1.077 1.2304,1.077 0,0 20.7587,0 20.7587,0 1.739,0 3.225,0.613 4.455,1.843 1.231,1.231 1.848,2.715 1.848,4.458 0,1.844 -0.593,3.383 -1.769,4.614 -1.18,1.23 -2.69,1.8474 -4.534,1.8474 0,0 -14.3016,0 -14.3016,0 -2.1524,0 -3.9746,0.7422 -5.46,2.2275 -1.4854,1.4854 -2.2275,3.3076 -2.2275,5.46 0,0 0,16.2959 0,16.2959 0,2.1523 0.7421,3.9502 2.2275,5.3847 1.4854,1.4346 3.3076,2.1524 5.46,2.1524 0,0 27.6786,0 27.6786,0 0.717,0 1.076,-0.3584 1.076,-1.0762 0,0 0,-6.7656 0,-6.7656 0,-0.8213 -0.359,-1.2305 -1.076,-1.2305 0,0 -18.762,0 -18.762,0 -3.795,0 -5.688,-1.9473 -5.688,-5.8437 0,-1.5381 0.562,-2.8741 1.689,-3.9991 1.126,-1.1259 2.461,-1.6894 3.999,-1.6894 0,0 14.303,0 14.303,0 2.048,0 3.842,-0.7715 5.381,-2.3067 1.534,-1.539 2.306,-3.333 2.306,-5.3808 0,0 0,-17.3759 0,-17.3759 0,-2.152 -0.746,-3.976 -2.232,-5.46 z m -46.6649,-5.765 c 0,0 -16.7588,0 -16.7588,0 -1.2304,0 -1.8427,0.663 -1.8427,1.998 0,0 0,56.5843 0,56.5843 0,1.2305 0.6123,1.8467 1.8427,1.8467 0,0 16.7588,0 16.7588,0 1.2266,0 1.8448,-0.6162 1.8448,-1.8467 0,0 0,-56.5843 0,-56.5843 0,-1.335 -0.6182,-1.998 -1.8448,-1.998 z m 45.9729,-15.837 c 0,0 -5.226,0 -5.226,0 0,0 0,5.536 0,5.536 0,0 5.535,0 5.535,0 1.948,0 2.924,-0.922 2.924,-2.766 0,-1.848 -1.081,-2.77 -3.233,-2.77 z m 11.379,-2.152 c 0,0 2.615,7.229 2.615,7.229 0,0 2.461,-7.229 2.461,-7.229 0,0 -5.076,0 -5.076,0 z m -83.182,0 c 0,0 2.7647,7.229 2.7647,7.229 0,0 2.3076,-7.229 2.3076,-7.229 0,0 -5.0723,0 -5.0723,0 z m -23.2197,0 c 0,0 2.6153,7.229 2.6153,7.229 0,0 2.4609,-7.229 2.4609,-7.229 0,0 -5.0762,0 -5.0762,0 z m -13.0683,-4.922 c 0,0 -4.3037,0 -4.3037,0 0,0 0,12.61 0,12.61 0,0 3.996,0 3.996,0 3.3819,0 5.0752,-2.103 5.0752,-6.303 0,-4.204 -1.5888,-6.307 -4.7675,-6.307 z m 90.41,-0.458 c -3.795,0 -5.688,2.252 -5.688,6.765 0,4.404 1.893,6.611 5.688,6.611 3.897,0 5.844,-2.207 5.844,-6.611 0,-4.513 -1.947,-6.765 -5.844,-6.765 z m -29.83,79.1857 c 0,0.7178 -0.3593,1.0762 -1.0771,1.0762 0,0 -11.3779,0 -11.3779,0 -0.7178,0 -1.0762,-0.3584 -1.0762,-1.0762 0,0 0,-51.2027 0,-51.2027 0,-0.717 0.3584,-1.077 1.0762,-1.077 0,0 11.3779,0 11.3779,0 0.7178,0 1.0771,0.36 1.0771,1.077 0,0 0,51.2027 0,51.2027 z m -39.9755,-11.6875 c 0,1.9443 -0.6915,3.6123 -2.0762,4.9971 -1.3858,1.3847 -3.0537,2.0771 -4.9971,2.0771 -1.9482,0 -3.5869,-0.6924 -4.9219,-2.0771 -1.3339,-1.3848 -1.998,-3.0528 -1.998,-4.9971 0,0 0,-28.1372 0,-28.1372 0,-2.052 0.6377,-3.742 1.9228,-5.076 1.2813,-1.335 2.9454,-1.998 4.9971,-1.998 1.9434,0 3.6113,0.693 4.9971,2.077 1.3847,1.385 2.0762,3.049 2.0762,4.997 0,0 0,28.1372 0,28.1372 z m -7.0733,-31.6742 c -2.3613,0 -3.5371,1.176 -3.5371,3.537 0,0 0,28.1372 0,28.1372 0,2.3564 1.1758,3.5371 3.5371,3.5371 2.2529,0 3.3828,-1.1807 3.3828,-3.5371 0,0 0,-28.1372 0,-28.1372 0,-2.361 -1.1299,-3.537 -3.3828,-3.537 z"
-                     inkscape:connector-curvature="0" />
+              <path inkscape:connector-curvature="0" id="path47727-0-2-9" d="m 470.27084,7998.0012 c -1.08707,0 -1.96833,0.1211 -1.96833,0.2713 0,0.15 0.88126,0.2712 1.96833,0.2712 1.08709,0 1.96834,-0.1212 1.96834,-0.2712 0,-0.1502 -0.88125,-0.2713 -1.96834,-0.2713 z m 0,0.1961 c 0.30515,0 0.55253,0.034 0.55253,0.075 0,0.042 -0.24738,0.075 -0.55253,0.075 -0.30514,0 -0.55251,-0.034 -0.55251,-0.075 0,-0.042 0.24737,-0.075 0.55251,-0.075 z" style="fill:#ffffff;stroke:none"/>
+              <text transform="scale(1.0170762,0.9832105)" sodipodi:linespacing="125%" id="text47729-5-5-4" y="8135.8271" x="461.62274" style="font-size:0.64422148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="8135.8271" x="461.62274" id="tspan47731-4-8-6" sodipodi:role="line">ROM</tspan></text>
+              <g style="fill:#ffffff" id="g47733-6-6-2" transform="matrix(0.02255355,0,0,-0.02180257,456.42108,8000.0463)">
+                <g style="fill:#ffffff" transform="translate(8.50391,150.1943)" id="g47735-9-88-8">
+                  <path id="path47737-4-8-1" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 121.00809,-7.9961 c 0,0 -4.304,0 -4.304,0 0,0 0,5.5352 0,5.5352 0,0 4.458,0 4.458,0 2.152,0 3.229,-0.8721 3.229,-2.6113 0,-1.9522 -1.13,-2.9239 -3.383,-2.9239 z m 34.29,-2.7656 c -0.617,-3.0781 -2.206,-4.6123 -4.768,-4.6123 -3.587,0 -5.381,2.252 -5.381,6.7647 0,4.4043 1.794,6.6113 5.381,6.6113 2.562,0 4.101,-1.1309 4.613,-3.3828 0,0 2.153,0 2.153,0 -0.718,3.5869 -2.975,5.3808 -6.766,5.3808 -5.126,0 -7.687,-2.8701 -7.687,-8.6093 0,-5.7432 2.457,-8.6133 7.379,-8.6133 4.204,0 6.611,2.1523 7.228,6.4609 0,0 -2.152,0 -2.152,0 z M 82.41409,0 c -5.3311,0 -7.9951,-2.8701 -7.9951,-8.6093 0,-5.7432 2.664,-8.6133 7.9951,-8.6133 5.331,0 7.9961,2.8701 7.9961,8.6133 0,5.7392 -2.6651,8.6093 -7.9961,8.6093 z m -12.9131,-10.7617 c -0.5166,-3.0781 -2.0528,-4.6123 -4.6133,-4.6123 -3.6914,0 -5.5352,2.252 -5.5352,6.7647 0,4.4043 1.794,6.6113 5.3809,6.6113 2.5615,0 4.0996,-1.1309 4.6133,-3.3828 0,0 2.1523,0 2.1523,0 C 71.08989,-1.7939 68.83299,0 64.73339,0 c -5.0215,0 -7.5332,-2.8701 -7.5332,-8.6093 0,-5.7432 2.4072,-8.6133 7.2246,-8.6133 4.2041,0 6.6113,2.1523 7.2285,6.4609 0,0 -2.1523,0 -2.1523,0 z m 102.4011,10.3028 c 0,0 -13.221,0 -13.221,0 0,0 0,-2.002 0,-2.002 0,0 5.534,0 5.534,0 0,0 0,-14.4522 0,-14.4522 0,0 2.152,0 2.152,0 0,0 0,14.4522 0,14.4522 0,0 5.535,0 5.535,0 0,0 0,2.002 0,2.002 z m -35.824,0 c 0,0 -2.461,0 -2.461,0 0,0 -6.148,-16.4542 -6.148,-16.4542 0,0 2.302,0 2.302,0 0,0 1.694,4.7667 1.694,4.7667 0,0 6.611,0 6.611,0 0,0 1.539,-4.7667 1.539,-4.7667 0,0 2.461,0 2.461,0 0,0 -5.998,16.4542 -5.998,16.4542 z m -14.298,0 c 0,0 -7.228,0 -7.228,0 0,0 0,-16.4542 0,-16.4542 0,0 2.152,0 2.152,0 0,0 0,6.919 0,6.919 0,0 5.076,0 5.076,0 3.279,0 4.917,1.6396 4.917,4.9219 0,3.0742 -1.638,4.6133 -4.917,4.6133 z m -11.996,0 c 0,0 -3.074,0 -3.074,0 0,0 -4.768,-13.8399 -4.768,-13.8399 0,0 -4.612,13.8399 -4.612,13.8399 0,0 -3.229,0 -3.229,0 0,0 0,-16.4542 0,-16.4542 0,0 2.153,0 2.153,0 0,0 0,13.6836 0,13.6836 0,0 4.612,-13.6836 4.612,-13.6836 0,0 2.152,0 2.152,0 0,0 4.768,13.8389 4.768,13.8389 0,0 -0.154,-4.1504 -0.154,-4.1504 0,0 0,-9.6885 0,-9.6885 0,0 2.152,0 2.152,0 0,0 0,16.4542 0,16.4542 z m -61.8095,-2.9239 c 0,1.2305 -0.6172,1.8477 -1.8476,1.8477 0,0 -16.7598,0 -16.7598,0 -1.2295,0 -1.8428,-0.6172 -1.8428,-1.8477 0,0 0,-17.372 0,-17.372 0,-0.8223 -0.4131,-1.2315 -1.2304,-1.2315 0,0 -15.375,0 -15.375,0 -3.1778,0 -5.793,-1.0508 -7.8448,-3.1523 C 1.02148,-27.2412 0,-29.8808 0,-33.0595 c 0,0 0,-38.2848 0,-38.2848 0,-3.079 1.05078,-5.69 3.15329,-7.842 2.1026,-2.153 4.6875,-3.229 7.7657,-3.229 0,0 35.208,0 35.208,0 1.2304,0 1.8476,0.663 1.8476,1.998 0,0 0,77.0345 0,77.0345 z m 127.7735,-53.6601 c 0,1.331 -0.617,1.998 -1.848,1.998 0,0 -15.374,0 -15.374,0 -1.335,0 -1.998,-0.667 -1.998,-1.998 0,0 0,-8.9174 0,-8.9174 0,-2.565 -1.23,-3.845 -3.691,-3.845 -2.566,0 -3.846,1.28 -3.846,3.845 0,0 0,27.3656 0,27.3656 0,2.5615 1.28,3.8457 3.846,3.8457 2.461,0 3.691,-1.2842 3.691,-3.8457 0,0 0,-7.2236 0,-7.2236 0,-1.2344 0.663,-1.8477 1.998,-1.8477 0,0 15.374,0 15.374,0 1.231,0 1.848,0.6133 1.848,1.8477 0,0 0,12.7588 0,12.7588 0,3.0742 -1.076,5.6894 -3.229,7.8418 -2.152,2.1523 -4.767,3.2314 -7.84,3.2314 0,0 -23.679,0 -23.679,0 -3.078,0 -5.693,-1.0791 -7.846,-3.2314 -2.152,-2.1524 -3.228,-4.7676 -3.228,-7.8418 0,0 0,-38.1308 0,-38.1308 0,-3.179 1.05,-5.844 3.153,-7.996 2.103,-2.153 4.742,-3.229 7.921,-3.229 0,0 23.679,0 23.679,0 3.173,0 5.813,1.076 7.916,3.229 2.102,2.152 3.153,4.817 3.153,7.996 0,0 0,14.1474 0,14.1474 z m -50.895,3.2285 c 0,3.0742 -1.076,5.6894 -3.227,7.8418 -2.152,2.1513 -4.768,3.2285 -7.842,3.2285 0,0 -14.303,0 -14.303,0 -1.538,0 -2.305,0.7676 -2.305,2.3057 0,1.6396 0.767,2.4619 2.305,2.4619 0,0 21.527,0 21.527,0 1.23,0 1.847,0.6123 1.847,1.8427 0,0 0,12.3008 0,12.3008 0,1.2305 -0.617,1.8467 -1.847,1.8467 0,0 -30.4436,0 -30.4436,0 -3.0782,0 -5.6895,-1.0791 -7.8418,-3.2314 -2.1514,-2.1524 -3.2286,-4.7676 -3.2286,-7.8418 0,0 0,-16.2959 0,-16.2959 0,-3.0782 1.0772,-5.6895 3.2286,-7.8419 2.1523,-2.152 4.7636,-3.228 7.8418,-3.228 0,0 14.3016,0 14.3016,0 1.944,0 2.92,-1.026 2.92,-3.079 0,-1.842 -0.976,-2.764 -2.92,-2.764 0,0 -23.5282,0 -23.5282,0 -1.2305,0 -1.8438,-0.668 -1.8438,-1.998 0,0 0,-12.151 0,-12.151 0,-1.335 0.6133,-1.998 1.8438,-1.998 0,0 32.4462,0 32.4462,0 3.174,0 5.815,1.076 7.916,3.229 2.103,2.152 3.153,4.817 3.153,7.996 0,0 0,17.3759 0,17.3759 z m 46.59,-51.5119 c 0,0 -9.843,0 -9.843,0 0,0 0,5.535 0,5.535 0,0 8.917,0 8.917,0 0,0 0,1.848 0,1.848 0,0 -8.917,0 -8.917,0 0,0 0,5.072 0,5.072 0,0 9.689,0 9.689,0 0,0 0,2.002 0,2.002 0,0 -11.841,0 -11.841,0 0,0 0,-16.3 0,-16.3 0,0 11.995,0 11.995,0 0,0 0,1.843 0,1.843 z m -15.991,6.766 c 0,0 -7.228,0 -7.228,0 0,0 0,-1.844 0,-1.844 0,0 5.076,0 5.076,0 0,-3.587 -1.694,-5.38 -5.076,-5.38 -3.587,0 -5.381,2.252 -5.381,6.765 0,4.404 1.794,6.611 5.381,6.611 2.665,0 4.254,-1.131 4.767,-3.383 0,0 2.152,0 2.152,0 -0.409,3.587 -2.715,5.381 -6.919,5.381 -5.126,0 -7.687,-2.87 -7.687,-8.609 0,-2.869 0.742,-5.026 2.227,-6.461 1.485,-1.435 3.253,-2.152 5.305,-2.152 2.461,0 4.255,0.872 5.385,2.615 0,0 0.613,-2.152 0.613,-2.152 0,0 1.385,0 1.385,0 0,0 0,8.609 0,8.609 z m -21.526,7.691 c 0,0 -2.461,0 -2.461,0 0,0 -6.303,-16.3 -6.303,-16.3 0,0 2.307,0 2.307,0 0,0 1.689,4.613 1.689,4.613 0,0 6.611,0 6.611,0 0,0 1.694,-4.613 1.694,-4.613 0,0 2.306,0 2.306,0 0,0 -5.843,16.3 -5.843,16.3 z m -9.227,-15.991 c -0.513,0.2 -0.767,0.763 -0.767,1.688 0,0 -0.155,2.924 -0.155,2.924 -0.103,1.331 -0.771,2.358 -1.997,3.075 1.534,0.817 2.306,2.102 2.306,3.845 0,2.97 -1.797,4.459 -5.385,4.459 0,0 -7.686,0 -7.686,0 0,0 0,-16.3 0,-16.3 0,0 2.306,0 2.306,0 0,0 0,6.919 0,6.919 0,0 5.38,0 5.38,0 1.844,0 2.82,-0.975 2.925,-2.923 0,0 0.304,-3.996 0.304,-3.996 0,0 2.769,0.309 2.769,0.309 z m -23.833,16.45 c -5.33,0 -7.995,-2.87 -7.995,-8.609 0,-2.461 0.718,-4.513 2.152,-6.153 1.435,-1.642 3.382,-2.46 5.843,-2.46 5.331,0 7.996,2.87 7.996,8.613 0,5.739 -2.665,8.609 -7.996,8.609 z m -7.995,-0.459 c 0,0 -13.377,0 -13.377,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.1523,0 2.1523,0 0,0 0,14.298 0,14.298 0,0 5.5352,0 5.5352,0 0,0 0,2.002 0,2.002 z m -17.5264,-7.383 c 0,0 -4.6132,1.077 -4.6132,1.077 -1.335,0.308 -2.002,0.971 -2.002,1.998 0,1.947 1.2295,2.923 3.6904,2.923 2.7696,0 4.1543,-1.13 4.1543,-3.382 0,0 1.9981,0 1.9981,0 0,3.482 -2.1016,5.226 -6.3057,5.226 -3.7959,0 -5.6894,-1.693 -5.6894,-5.072 0,-2.052 1.1767,-3.337 3.5371,-3.846 0,0 3.2275,-0.767 3.2275,-0.767 2.3564,-0.517 3.5371,-1.49 3.5371,-2.924 0,-1.844 -1.4346,-2.765 -4.3047,-2.765 -2.9726,0 -4.458,1.28 -4.458,3.841 0,0 -1.998,0 -1.998,0 0,-3.796 2.1523,-5.689 6.456,-5.689 4.3047,0 6.4571,1.639 6.4571,4.921 0,2.357 -1.2305,3.842 -3.6866,4.459 z m -24.6054,7.383 c 0,0 -2.4561,0 -2.4561,0 0,0 -6.1523,-16.3 -6.1523,-16.3 0,0 2.3066,0 2.3066,0 0,0 1.6895,4.613 1.6895,4.613 0,0 6.6152,0 6.6152,0 0,0 1.5342,-4.613 1.5342,-4.613 0,0 2.4609,0 2.4609,0 0,0 -5.998,16.3 -5.998,16.3 z m -5.6885,0 c 0,0 -13.376,0 -13.376,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.3056,0 2.3056,0 0,0 0,14.298 0,14.298 0,0 5.3809,0 5.3809,0 0,0 0,2.002 0,2.002 z m -17.5264,0 c 0,0 -2.6152,0 -2.6152,0 0,0 -6.1485,-16.3 -6.1485,-16.3 0,0 2.3067,0 2.3067,0 0,0 1.6894,4.613 1.6894,4.613 0,0 6.6104,0 6.6104,0 0,0 1.6934,-4.613 1.6934,-4.613 0,0 2.4619,0 2.4619,0 0,0 -5.9981,16.3 -5.9981,16.3 z m -16.9131,0 c 0,0 -6.7656,0 -6.7656,0 0,0 0,-16.3 0,-16.3 0,0 6.6104,0 6.6104,0 4.6142,0 6.9199,2.765 6.9199,8.304 0,5.331 -2.2559,7.996 -6.7647,7.996 z m 121.4668,80.7209 c 0,0 2.77,7.2285 2.77,7.2285 0,0 2.306,-7.2285 2.306,-7.2285 0,0 -5.076,0 -5.076,0 z m -49.664,-5.2256 c -3.7959,0 -5.6885,2.252 -5.6885,6.7647 0,4.4043 1.8926,6.6113 5.6885,6.6113 3.792,0 5.6894,-2.207 5.6894,-6.6113 0,-4.5127 -1.8974,-6.7647 -5.6894,-6.7647 z m -38.8985,-63.5043 c 0,0 -32.5966,0 -32.5966,0 -2.1553,0 -3.9493,0.718 -5.3838,2.153 -1.4356,1.434 -2.1524,3.228 -2.1524,5.381 0,0 0,38.2848 0,38.2848 0,2.1523 0.7168,3.9502 2.1524,5.3847 1.4345,1.4346 3.2285,2.1524 5.3838,2.1524 0,0 18.1445,0 18.1445,0 1.2265,0 1.8437,0.6631 1.8437,1.998 0,0 0,17.376 0,17.376 0,0.8174 0.4082,1.2305 1.2305,1.2305 0,0 11.3779,0 11.3779,0 0.7178,-0.7168 1.0762,-1.1309 1.0762,-1.2305 0,0 0,-71.6529 0,-71.6529 0,-0.208 -0.3584,-0.568 -1.0762,-1.077 z m 126.6185,2.228 c -1.485,-1.485 -3.304,-2.228 -5.455,-2.228 0,0 -23.679,0 -23.679,0 -2.156,0 -4.005,0.743 -5.539,2.228 -1.535,1.484 -2.303,3.308 -2.303,5.46 0,0 0,38.1308 0,38.1308 0,2.1523 0.768,3.9502 2.303,5.3847 1.534,1.4346 3.383,2.1524 5.539,2.1524 0,0 23.679,0 23.679,0 2.252,0 4.099,-0.6924 5.534,-2.0772 1.435,-1.3847 2.152,-3.207 2.152,-5.4599 0,0 0,-10.1475 0,-10.1475 0,-0.7178 -0.358,-1.0771 -1.076,-1.0771 0,0 -10.147,0 -10.147,0 -0.718,0 -1.077,0.3593 -1.077,1.0771 0,0 0,4.6123 0,4.6123 0,2.0527 -0.692,3.7666 -2.077,5.1514 -1.385,1.3847 -3.103,2.0771 -5.151,2.0771 -2.052,0 -3.767,-0.6924 -5.152,-2.0771 -1.384,-1.3848 -2.077,-3.0987 -2.077,-5.1514 0,0 0,-27.3656 0,-27.3656 0,-2.052 0.693,-3.77 2.077,-5.155 1.385,-1.385 3.1,-2.073 5.152,-2.073 2.048,0 3.766,0.688 5.151,2.073 1.385,1.385 2.077,3.103 2.077,5.155 0,0 0,6.456 0,6.456 0,0.718 0.359,1.077 1.077,1.077 0,0 10.147,0 10.147,0 0.205,0 0.563,-0.359 1.076,-1.077 0,0 0,-11.686 0,-11.686 0,-2.152 -0.746,-3.976 -2.231,-5.46 z m -50.895,0 c -1.484,-1.485 -3.303,-2.228 -5.455,-2.228 0,0 -29.6767,0 -29.6767,0 -0.8213,0 -1.2304,0.36 -1.2304,1.077 0,0 0,6.919 0,6.919 0,0.717 0.4091,1.077 1.2304,1.077 0,0 20.7587,0 20.7587,0 1.739,0 3.225,0.613 4.455,1.843 1.231,1.231 1.848,2.715 1.848,4.458 0,1.844 -0.593,3.383 -1.769,4.614 -1.18,1.23 -2.69,1.8474 -4.534,1.8474 0,0 -14.3016,0 -14.3016,0 -2.1524,0 -3.9746,0.7422 -5.46,2.2275 -1.4854,1.4854 -2.2275,3.3076 -2.2275,5.46 0,0 0,16.2959 0,16.2959 0,2.1523 0.7421,3.9502 2.2275,5.3847 1.4854,1.4346 3.3076,2.1524 5.46,2.1524 0,0 27.6786,0 27.6786,0 0.717,0 1.076,-0.3584 1.076,-1.0762 0,0 0,-6.7656 0,-6.7656 0,-0.8213 -0.359,-1.2305 -1.076,-1.2305 0,0 -18.762,0 -18.762,0 -3.795,0 -5.688,-1.9473 -5.688,-5.8437 0,-1.5381 0.562,-2.8741 1.689,-3.9991 1.126,-1.1259 2.461,-1.6894 3.999,-1.6894 0,0 14.303,0 14.303,0 2.048,0 3.842,-0.7715 5.381,-2.3067 1.534,-1.539 2.306,-3.333 2.306,-5.3808 0,0 0,-17.3759 0,-17.3759 0,-2.152 -0.746,-3.976 -2.232,-5.46 z m -46.6649,-5.765 c 0,0 -16.7588,0 -16.7588,0 -1.2304,0 -1.8427,0.663 -1.8427,1.998 0,0 0,56.5843 0,56.5843 0,1.2305 0.6123,1.8467 1.8427,1.8467 0,0 16.7588,0 16.7588,0 1.2266,0 1.8448,-0.6162 1.8448,-1.8467 0,0 0,-56.5843 0,-56.5843 0,-1.335 -0.6182,-1.998 -1.8448,-1.998 z m 45.9729,-15.837 c 0,0 -5.226,0 -5.226,0 0,0 0,5.536 0,5.536 0,0 5.535,0 5.535,0 1.948,0 2.924,-0.922 2.924,-2.766 0,-1.848 -1.081,-2.77 -3.233,-2.77 z m 11.379,-2.152 c 0,0 2.615,7.229 2.615,7.229 0,0 2.461,-7.229 2.461,-7.229 0,0 -5.076,0 -5.076,0 z m -83.182,0 c 0,0 2.7647,7.229 2.7647,7.229 0,0 2.3076,-7.229 2.3076,-7.229 0,0 -5.0723,0 -5.0723,0 z m -23.2197,0 c 0,0 2.6153,7.229 2.6153,7.229 0,0 2.4609,-7.229 2.4609,-7.229 0,0 -5.0762,0 -5.0762,0 z m -13.0683,-4.922 c 0,0 -4.3037,0 -4.3037,0 0,0 0,12.61 0,12.61 0,0 3.996,0 3.996,0 3.3819,0 5.0752,-2.103 5.0752,-6.303 0,-4.204 -1.5888,-6.307 -4.7675,-6.307 z m 90.41,-0.458 c -3.795,0 -5.688,2.252 -5.688,6.765 0,4.404 1.893,6.611 5.688,6.611 3.897,0 5.844,-2.207 5.844,-6.611 0,-4.513 -1.947,-6.765 -5.844,-6.765 z m -29.83,79.1857 c 0,0.7178 -0.3593,1.0762 -1.0771,1.0762 0,0 -11.3779,0 -11.3779,0 -0.7178,0 -1.0762,-0.3584 -1.0762,-1.0762 0,0 0,-51.2027 0,-51.2027 0,-0.717 0.3584,-1.077 1.0762,-1.077 0,0 11.3779,0 11.3779,0 0.7178,0 1.0771,0.36 1.0771,1.077 0,0 0,51.2027 0,51.2027 z m -39.9755,-11.6875 c 0,1.9443 -0.6915,3.6123 -2.0762,4.9971 -1.3858,1.3847 -3.0537,2.0771 -4.9971,2.0771 -1.9482,0 -3.5869,-0.6924 -4.9219,-2.0771 -1.3339,-1.3848 -1.998,-3.0528 -1.998,-4.9971 0,0 0,-28.1372 0,-28.1372 0,-2.052 0.6377,-3.742 1.9228,-5.076 1.2813,-1.335 2.9454,-1.998 4.9971,-1.998 1.9434,0 3.6113,0.693 4.9971,2.077 1.3847,1.385 2.0762,3.049 2.0762,4.997 0,0 0,28.1372 0,28.1372 z m -7.0733,-31.6742 c -2.3613,0 -3.5371,1.176 -3.5371,3.537 0,0 0,28.1372 0,28.1372 0,2.3564 1.1758,3.5371 3.5371,3.5371 2.2529,0 3.3828,-1.1807 3.3828,-3.5371 0,0 0,-28.1372 0,-28.1372 0,-2.361 -1.1299,-3.537 -3.3828,-3.537 z" inkscape:connector-curvature="0"/>
                 </g>
               </g>
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 471.22906,8002.2149 1.90862,0 0,2.4099 -1.90862,0 z"
-                 style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path47739-5-0-4" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47741-8-0-6"
-                 style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 468.87511,8002.2148 1.9086,0 0,2.41 -1.9086,0 z" />
-              <path
-                 inkscape:connector-curvature="0"
-                 d="m 467.18673,8002.1704 1.21366,0 0,4.2539 -1.21366,0 z"
-                 style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4"
-                 id="path47743-2-9-6" />
-              <path
-                 id="path47745-7-6-5"
-                 style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4"
-                 d="m 467.92553,8002.1704 0.47486,0 0,4.2539 -0.47486,0 z"
-                 inkscape:connector-curvature="0" />
-              <rect
-                 style="fill:url(#linearGradient146502-6);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554"
-                 id="rect47747-2-1-6"
-                 width="23.795719"
-                 height="4.7188153"
-                 x="585.95044"
-                 y="8003.6514"
-                 transform="matrix(1,0,-0.01802634,0.99983751,0,0)" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 442.96371,8003.0165 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path47749-6-6-1"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47751-3-8-3"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 446.15365,8003.0165 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z"
-                 sodipodi:nodetypes="ssccssccs" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 449.37599,8003.0165 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path47753-8-9-5"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path47755-5-6-2"
-                 style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-                 d="m 369.77778,8001.7698 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 style="fill:#000000;stroke:none"
-                 d="m 373.0097,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z"
-                 id="path47757-5-8-6"
-                 inkscape:connector-curvature="0" />
-              <path
-                 style="fill:#000000;stroke:none"
-                 d="m 390.7089,8003.2656 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z"
-                 id="path47759-1-8-9"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccccccccccccc" />
-              <path
-                 id="path47761-4-4-4"
-                 d="m 381.53484,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path47763-5-0-6"
-                 d="m 373.21327,8004.7544 7.18911,0 0,0.4071 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 381.73841,8004.7544 7.18912,0 0,0.4071 -7.18912,0 z"
-                 id="path47765-1-4-7" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 373.36597,8005.8398 7.18911,0 0,0.407 -7.18911,0 z"
-                 id="path47767-8-3-3" />
-              <path
-                 id="path47769-6-4-0"
-                 d="m 381.89111,8005.8398 7.18912,0 0,0.407 -7.18912,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path47771-0-3-5"
-                 d="m 373.41686,8006.8799 7.18912,0 0,0.407 -7.18912,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 381.94201,8006.8799 7.18911,0 0,0.407 -7.18911,0 z"
-                 id="path47773-0-7-8" />
-              <path
-                 id="path47775-4-4-9"
-                 d="m 390.59439,8006.8799 7.18912,0 0,0.407 -7.18912,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path47777-7-9-5"
-                 style="fill:#000000;stroke:none"
-                 d="m 369.77778,8002.8099 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccsssccccccc" />
-              <path
-                 id="path47779-1-9-7"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 401.28774,8002.2178 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path47781-0-9-7"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 403.99722,8002.1589 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 d="m 401.33384,8004.3425 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path47783-9-9-7"
-                 inkscape:connector-curvature="0" />
-              <path
-                 d="m 404.04332,8004.2838 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 id="path47785-4-0-0"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47787-8-4-8"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 401.38387,8006.6483 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47789-2-4-9"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-                 d="m 404.09334,8006.5895 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z" />
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 406.58427,8001.7697 29.32904,-0.045 0.0637,6.331 -29.20179,0 z"
-                 style="fill:#808080;stroke:#000000;stroke-width:0.42910308"
-                 id="path47791-7-5-2" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47793-6-9-1"
-                 d="m 409.8162,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path47795-4-7-8"
-                 d="m 427.5154,8003.2656 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccccccccccccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 418.34134,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z"
-                 id="path47797-8-1-0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 410.01977,8004.7544 7.18913,0 0,0.4071 -7.18913,0 z"
-                 id="path47799-9-7-1"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path47801-7-19-7"
-                 d="m 418.54491,8004.7544 7.18913,0 0,0.4071 -7.18913,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path47803-0-1-8"
-                 d="m 410.17247,8005.8398 7.18911,0 0,0.407 -7.18911,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 418.69761,8005.8398 7.18911,0 0,0.407 -7.18911,0 z"
-                 id="path47805-5-0-0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 410.22338,8006.8799 7.1891,0 0,0.407 -7.1891,0 z"
-                 id="path47807-4-76-0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 id="path47809-2-2-3"
-                 d="m 418.74852,8006.8799 7.1891,0 0,0.407 -7.1891,0 z"
-                 style="fill:#000000;stroke:none"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#000000;stroke:none"
-                 d="m 427.40089,8006.8799 7.18911,0 0,0.407 -7.18911,0 z"
-                 id="path47811-5-1-0"
-                 sodipodi:nodetypes="ccccc" />
-              <path
-                 sodipodi:nodetypes="ccsssccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 406.58427,8002.8099 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-                 style="fill:#000000;stroke:none"
-                 id="path47813-2-9-4" />
-              <path
-                 id="path47815-1-5-0"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 394.53988,8003.2465 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccc" />
-              <path
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 394.53996,8006.48 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path47817-5-4-6" />
-              <path
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:connector-curvature="0"
-                 d="m 431.17483,8003.2465 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path47819-6-5-8" />
-              <path
-                 id="path47821-0-4-6"
-                 style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 431.1749,8006.48 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-                 inkscape:connector-curvature="0"
-                 sodipodi:nodetypes="cccccccc" />
-              <path
-                 id="path47823-4-4-9"
-                 style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 d="m 471.22906,8005.5294 1.90862,0 0,1.0539 -1.90862,0 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 d="m 468.87511,8005.5293 1.9086,0 0,1.054 -1.9086,0 z"
-                 style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-                 id="path47825-1-48-2"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47827-7-40-7"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 442.96371,8005.1912 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z"
-                 sodipodi:nodetypes="ssccssccs" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 446.15365,8005.1912 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path47829-2-3-5"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47831-2-2-7"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 449.37599,8005.1912 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z"
-                 sodipodi:nodetypes="ssccssccs" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 452.6521,8005.1912 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path47833-2-4-6"
-                 inkscape:connector-curvature="0" />
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path47835-9-0-2"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 d="m 455.84203,8005.1912 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z"
-                 sodipodi:nodetypes="ssccssccs" />
-              <path
-                 sodipodi:nodetypes="ssccssccs"
-                 d="m 459.06437,8005.1912 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-                 id="path47837-9-2-3"
-                 inkscape:connector-curvature="0" />
+              <path inkscape:connector-curvature="0" d="m 471.22906,8002.2149 1.90862,0 0,2.4099 -1.90862,0 z" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47739-5-0-4"/>
+              <path inkscape:connector-curvature="0" id="path47741-8-0-6" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 468.87511,8002.2148 1.9086,0 0,2.41 -1.9086,0 z"/>
+              <path inkscape:connector-curvature="0" d="m 467.18673,8002.1704 1.21366,0 0,4.2539 -1.21366,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4" id="path47743-2-9-6"/>
+              <path id="path47745-7-6-5" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4" d="m 467.92553,8002.1704 0.47486,0 0,4.2539 -0.47486,0 z" inkscape:connector-curvature="0"/>
+              <rect style="fill:url(#linearGradient146502-6);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554" id="rect47747-2-1-6" width="23.795719" height="4.7188153" x="585.95044" y="8003.6514" transform="matrix(1,0,-0.01802634,0.99983751,0,0)"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 442.96371,8003.0165 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path47749-6-6-1" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path47751-3-8-3" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 446.15365,8003.0165 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 449.37599,8003.0165 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path47753-8-9-5" inkscape:connector-curvature="0"/>
+              <path id="path47755-5-6-2" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" d="m 369.77778,8001.7698 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path style="fill:#000000;stroke:none" d="m 373.0097,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z" id="path47757-5-8-6" inkscape:connector-curvature="0"/>
+              <path style="fill:#000000;stroke:none" d="m 390.7089,8003.2656 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z" id="path47759-1-8-9" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+              <path id="path47761-4-4-4" d="m 381.53484,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path47763-5-0-6" d="m 373.21327,8004.7544 7.18911,0 0,0.4071 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.73841,8004.7544 7.18912,0 0,0.4071 -7.18912,0 z" id="path47765-1-4-7"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.36597,8005.8398 7.18911,0 0,0.407 -7.18911,0 z" id="path47767-8-3-3"/>
+              <path id="path47769-6-4-0" d="m 381.89111,8005.8398 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path47771-0-3-5" d="m 373.41686,8006.8799 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.94201,8006.8799 7.18911,0 0,0.407 -7.18911,0 z" id="path47773-0-7-8"/>
+              <path id="path47775-4-4-9" d="m 390.59439,8006.8799 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+              <path id="path47777-7-9-5" style="fill:#000000;stroke:none" d="m 369.77778,8002.8099 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+              <path id="path47779-1-9-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.28774,8002.2178 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z" inkscape:connector-curvature="0"/>
+              <path id="path47781-0-9-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.99722,8002.1589 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z" inkscape:connector-curvature="0"/>
+              <path d="m 401.33384,8004.3425 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path47783-9-9-7" inkscape:connector-curvature="0"/>
+              <path d="m 404.04332,8004.2838 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path47785-4-0-0" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path47787-8-4-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.38387,8006.6483 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z"/>
+              <path inkscape:connector-curvature="0" id="path47789-2-4-9" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 404.09334,8006.5895 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z"/>
+              <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 406.58427,8001.7697 29.32904,-0.045 0.0637,6.331 -29.20179,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.42910308" id="path47791-7-5-2"/>
+              <path inkscape:connector-curvature="0" id="path47793-6-9-1" d="m 409.8162,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+              <path id="path47795-4-7-8" d="m 427.5154,8003.2656 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.34134,8003.3978 7.1891,0 0,0.7235 -7.1891,0 z" id="path47797-8-1-0" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.01977,8004.7544 7.18913,0 0,0.4071 -7.18913,0 z" id="path47799-9-7-1" sodipodi:nodetypes="ccccc"/>
+              <path id="path47801-7-19-7" d="m 418.54491,8004.7544 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path id="path47803-0-1-8" d="m 410.17247,8005.8398 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.69761,8005.8398 7.18911,0 0,0.407 -7.18911,0 z" id="path47805-5-0-0" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.22338,8006.8799 7.1891,0 0,0.407 -7.1891,0 z" id="path47807-4-76-0" sodipodi:nodetypes="ccccc"/>
+              <path id="path47809-2-2-3" d="m 418.74852,8006.8799 7.1891,0 0,0.407 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+              <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.40089,8006.8799 7.18911,0 0,0.407 -7.18911,0 z" id="path47811-5-1-0" sodipodi:nodetypes="ccccc"/>
+              <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 406.58427,8002.8099 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" style="fill:#000000;stroke:none" id="path47813-2-9-4"/>
+              <path id="path47815-1-5-0" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.53988,8003.2465 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+              <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.53996,8006.48 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47817-5-4-6"/>
+              <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.17483,8003.2465 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47819-6-5-8"/>
+              <path id="path47821-0-4-6" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.1749,8006.48 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+              <path id="path47823-4-4-9" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.22906,8005.5294 1.90862,0 0,1.0539 -1.90862,0 z" inkscape:connector-curvature="0"/>
+              <path d="m 468.87511,8005.5293 1.9086,0 0,1.054 -1.9086,0 z" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47825-1-48-2" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path47827-7-40-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 442.96371,8005.1912 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 446.15365,8005.1912 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path47829-2-3-5" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path47831-2-2-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 449.37599,8005.1912 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 452.6521,8005.1912 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path47833-2-4-6" inkscape:connector-curvature="0"/>
+              <path inkscape:connector-curvature="0" id="path47835-9-0-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 455.84203,8005.1912 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+              <path sodipodi:nodetypes="ssccssccs" d="m 459.06437,8005.1912 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path47837-9-2-3" inkscape:connector-curvature="0"/>
             </g>
           </g>
         </g>
diff --git a/misc/images/svg/elements/Rackmountable_3U_server_2D.svg b/misc/images/svg/elements/Rackmountable_3U_server_2D.svg
index 230982bba9c..fdb2b735a13 100644
--- a/misc/images/svg/elements/Rackmountable_3U_server_2D.svg
+++ b/misc/images/svg/elements/Rackmountable_3U_server_2D.svg
@@ -1,1069 +1,209 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="127.98325"
-   height="26.243481"
-   id="svg142446"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 38">
-  <defs
-     id="defs142448">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-12-7-2"
-       id="linearGradient150270"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0447673,0,0,1.633851,-14.364864,-5127.8395)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-12-7-2">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-03-3-0" />
-      <stop
-         id="stop76664-9-25-1-90-3"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-4-9-0" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="127.98325" height="26.243481" id="svg142446" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 38">
+  <defs id="defs142448">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-12-7-2" id="linearGradient150270" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0447673,0,0,1.633851,-14.364864,-5127.8395)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-12-7-2">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-03-3-0"/>
+      <stop id="stop76664-9-25-1-90-3" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-4-9-0"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45434-5-9-6-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45430-8-4-4-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-46-9-5"
-       id="linearGradient150272"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.6424083,-20.375326,-5196.8227)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient42443-7-46-9-5">
-      <stop
-         id="stop42445-53-9-36-2"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-7-3-7" />
-      <stop
-         id="stop42449-3-8-96-2"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect45434-5-9-6-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect45430-8-4-4-3" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-46-9-5" id="linearGradient150272" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.6424083,-20.375326,-5196.8227)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient42443-7-46-9-5">
+      <stop id="stop42445-53-9-36-2" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-7-3-7"/>
+      <stop id="stop42449-3-8-96-2" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45449-51-0-22-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45451-306-1-9-9"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-1-5-8"
-       id="linearGradient150274"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,-0.02945495,1.0535452,-19.316631,-491.54306)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-1-5-8">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-4-7-3" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-9-7-2" />
+    <inkscape:path-effect is_visible="true" id="path-effect45449-51-0-22-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect45451-306-1-9-9" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-1-5-8" id="linearGradient150274" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,-0.02945495,1.0535452,-19.316631,-491.54306)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-1-5-8">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-4-7-3"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-9-7-2"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-4-4-0"
-       id="linearGradient150276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-28.178793,-491.62295)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-4-4-0">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-7-9-8" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-5-9-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-4-4-0" id="linearGradient150276" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-28.178793,-491.62295)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-4-4-0">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-7-9-8"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-5-9-2"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="118.98665"
-     inkscape:cy="-12.592174"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="88"
-     inkscape:window-y="116"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata142451">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="118.98665" inkscape:cy="-12.592174" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="88" inkscape:window-y="116" inkscape:window-maximized="0"/>
+  <metadata id="metadata142451">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-256.01335,-493.52653)">
-    <g
-       style="display:inline"
-       id="g149942"
-       transform="matrix(1.0266398,0,0,1.0266398,-112.96436,-7650.9995)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_3U_server_2D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g149944">
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path149948"
-           style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:1.13534141;stroke-opacity:1"
-           d="m 365.73279,7933.7677 112.24079,0 0,24.4014 -112.24079,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:url(#linearGradient150270);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.39195597;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 477.26393,7933.7756 c -0.73528,0 -1.35533,1.2499 -1.40322,2.802 l -0.59912,18.9466 c -0.0479,1.5525 0.51027,2.8023 1.24555,2.8023 l 5.36059,0 c 0.73528,0 1.35537,-1.2498 1.40322,-2.8023 l 0.14189,-4.5695 -0.81986,-0.2011 0,-8.7728 1.10366,0.2335 0.17343,-5.6375 c 0.0479,-1.5524 -0.51028,-2.8018 -1.24555,-2.8018 l -5.36059,0 z m 2.63299,9.1732 c 0.23329,0.022 0.4123,0.8455 0.39416,1.8346 -0.0181,0.9894 -0.22393,1.7539 -0.45722,1.7347 -0.23329,-0.022 -0.39652,-0.812 -0.37839,-1.8013 0.018,-0.989 0.20817,-1.7871 0.44145,-1.768 z"
-           id="path149950"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#808080;fill-opacity:1;stroke:none"
-           d="m 479.319,7936.2627 1.08052,-0.1193 1.31825,2.7539 -0.31436,18.5537 -1.08508,0.201 -1.52263,-3.2866 0.89765,-0.082 0.6647,0.7834 0.28516,-15.9111 -1.32421,-2.893"
-           id="path149952"
-           inkscape:path-effect="#path-effect45434-5-9-6-8"
-           inkscape:original-d="m 479.319,7936.2627 c 0.0595,-1.277 0.4262,-0.8523 1.08052,-0.1193 l 1.31825,2.7539 -0.31436,18.5537 c -0.2953,1.0112 -0.6593,0.4535 -1.08508,0.201 l -1.52263,-3.2866 c 0.30985,-0.8467 0.39156,-0.416 0.89765,-0.082 l 0.6647,0.7834 0.28516,-15.9111 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccc" />
-        <path
-           style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-           d="m 479.25225,7940.2333 0.98975,1.5497 -0.23247,13.7201 -1.21374,-1.1333 -0.0365,2.2264 1.56528,1.0592 0.34607,-18.5778 -1.35691,-2.817 -0.0615,3.9727"
-           id="path149954"
-           inkscape:path-effect="#path-effect45430-8-4-4-3"
-           inkscape:original-d="m 479.25225,7940.2333 0.98975,1.5497 -0.23247,13.7201 -1.21374,-1.1333 -0.0365,2.2264 1.56528,1.0592 0.34607,-18.5778 -1.35691,-2.817 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 365.73255,7933.7675 73.30554,0 0,24.4019 -73.30554,0 z"
-           style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:1.13487971;stroke-opacity:1"
-           id="path149956"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149958"
-           d="m 366.18898,7933.5725 c 0.74177,0 1.36728,1.2559 1.41558,2.8167 l 0.60441,19.046 c 0.0482,1.5605 -0.51478,2.8167 -1.25653,2.8167 l -5.40779,0 c -0.74173,0 -1.36732,-1.2562 -1.41557,-2.8167 l -0.14315,-4.5936 0.82707,-0.2023 0,-8.8187 -1.11336,0.2344 -0.17495,-5.6667 c -0.0483,-1.5605 0.51476,-2.8167 1.2565,-2.8167 l 5.40779,0 z m -2.65617,9.2213 c -0.23534,0.022 -0.41593,0.8499 -0.39764,1.8444 0.0183,0.9944 0.22592,1.7626 0.46126,1.7436 0.23534,-0.022 0.40002,-0.8167 0.38173,-1.8109 -0.0183,-0.9945 -0.21002,-1.7965 -0.44535,-1.7771 z"
-           style="fill:url(#linearGradient150272);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.26313704;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 364.11582,7936.0726 c -0.0599,-1.2843 -0.42995,-0.8571 -1.09002,-0.12 l -1.32988,2.7683 0.31715,18.651 c 0.29789,1.0167 0.66511,0.4561 1.09461,0.2023 l 1.53604,-3.304 c -0.31257,-0.8507 -0.39501,-0.4181 -0.90554,-0.083 l -0.67055,0.7876 -0.28768,-15.9947 z"
-           inkscape:path-effect="#path-effect45449-51-0-22-5"
-           id="path149960"
-           d="m 364.11582,7936.0726 -1.09002,-0.12 -1.32988,2.7683 0.31715,18.651 1.09461,0.2023 1.53604,-3.304 -0.90554,-0.083 -0.67055,0.7876 -0.28768,-15.9947 1.33587,-2.9075"
-           style="fill:#808080;stroke:none" />
-        <path
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 364.18316,7940.0639 -0.99847,1.5579 0.23453,13.7921 1.22442,-1.1395 0.0368,2.2384 -1.57905,1.0648 -0.34911,-18.6754 1.36887,-2.832 z"
-           inkscape:path-effect="#path-effect45451-306-1-9-9"
-           id="path149962"
-           d="m 364.18316,7940.0639 -0.99847,1.5579 0.23453,13.7921 1.22442,-1.1395 0.0368,2.2384 -1.57905,1.0648 -0.34911,-18.6754 1.36887,-2.832 0.062,3.9937"
-           style="fill:#4d4d4d;stroke:none" />
-        <path
-           id="path149964"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           d="m 369.46174,7950.056 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 372.69366,7951.684 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path149966"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 390.39286,7951.5518 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z"
-           id="path149968"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path149970"
-           d="m 381.2188,7951.684 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path149972"
-           d="m 372.89723,7953.0406 7.18911,0 0,0.4071 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.42237,7953.0406 7.18912,0 0,0.4071 -7.18912,0 z"
-           id="path149974" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 373.04993,7954.126 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path149976" />
-        <path
-           id="path149978"
-           d="m 381.57507,7954.126 7.18912,0 0,0.407 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path149980"
-           d="m 373.10082,7955.1662 7.18912,0 0,0.4069 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.62597,7955.1662 7.18911,0 0,0.4069 -7.18911,0 z"
-           id="path149982" />
-        <path
-           id="path149984"
-           d="m 390.27835,7955.1662 7.18912,0 0,0.4069 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path149986"
-           style="fill:#000000;stroke:none"
-           d="m 369.46174,7951.0961 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path149988"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.13052,7935.9363 0.47457,-0.011 c 0.24733,-0.011 0.46443,0.131 0.48672,0.3059 l 0.031,0.2425 c 0.0223,0.175 -0.15884,0.3201 -0.40618,0.3255 l -0.47457,0.011 c -0.24735,0.01 -0.46445,-0.131 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3253 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path149990"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 403.83999,7935.8775 0.47457,-0.011 c 0.24735,-0.01 0.46444,0.1311 0.48676,0.3059 l 0.0309,0.2425 c 0.0222,0.1749 -0.15886,0.3201 -0.40621,0.3255 l -0.47456,0.01 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15886,-0.32 0.40621,-0.3252 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 401.17662,7938.0611 0.47457,-0.01 c 0.24734,-0.011 0.46444,0.1313 0.48673,0.306 l 0.031,0.2426 c 0.0223,0.1747 -0.15884,0.32 -0.40619,0.3254 l -0.47457,0.011 c -0.24735,0 -0.46445,-0.1312 -0.48677,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1747 0.15885,-0.3201 0.40621,-0.3254 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path149992"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 403.88609,7938.0023 0.47458,-0.01 c 0.24734,-0.011 0.46443,0.1313 0.48675,0.3061 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3254 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path149994"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149996"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.22664,7940.3668 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1312 0.48674,0.3061 l 0.031,0.2424 c 0.0224,0.1751 -0.15883,0.3203 -0.40618,0.3257 l -0.47457,0.011 c -0.24735,0.011 -0.46444,-0.1311 -0.48677,-0.3061 l -0.0309,-0.2424 c -0.0223,-0.175 0.15885,-0.3202 0.4062,-0.3256 z" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path149998"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 403.93612,7940.3081 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.1313 0.48676,0.3061 l 0.0309,0.2425 c 0.0222,0.175 -0.15885,0.3202 -0.4062,0.3256 l -0.47457,0.01 c -0.24733,0.011 -0.46444,-0.1312 -0.48675,-0.3062 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.32 0.4062,-0.3254 z" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 406.58427,7935.4865 29.32904,-0.045 0.0637,6.3309 -29.20179,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           id="path150000" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150002"
-           d="m 409.8162,7937.1146 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path150004"
-           d="m 427.5154,7936.9824 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1023 0,2.9844 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9844 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.34134,7937.1146 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path150006"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.01977,7938.4712 7.18913,0 0,0.4071 -7.18913,0 z"
-           id="path150008"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path150010"
-           d="m 418.54491,7938.4712 7.18913,0 0,0.4071 -7.18913,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path150012"
-           d="m 410.17247,7939.5566 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.69761,7939.5566 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path150014"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.22338,7940.5968 7.1891,0 0,0.4069 -7.1891,0 z"
-           id="path150016"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path150018"
-           d="m 418.74852,7940.5968 7.1891,0 0,0.4069 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 427.40089,7940.5968 7.18911,0 0,0.4069 -7.18911,0 z"
-           id="path150020"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 406.58427,7936.5267 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.059,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-           style="fill:#000000;stroke:none"
-           id="path150022" />
-        <path
-           id="path150024"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 394.22384,7951.5327 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 394.22392,7954.7662 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150026" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.17483,7936.9633 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150028" />
-        <path
-           id="path150030"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 431.1749,7940.1968 0,-0.4635 2.11403,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 441.70238,7936.6931 31.74661,0 -0.11348,4.0591 -31.74662,0 z"
-           style="fill:url(#linearGradient150274);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.50041842"
-           id="path150032" />
-        <g
-           transform="matrix(0.14942814,0,-0.03044284,0.12343177,389.80533,6871.1352)"
-           style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           id="g150034">
-          <path
-             id="path150036"
-             style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Arial Bold"
-             d="m 2304.2619,8640.1281 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z m -6.9816,6.5971 -2.8381,-7.9403 1.7386,0 2.0094,5.8767 1.9445,-5.8767 1.7007,0 -2.8436,7.9403 z m -10.0472,-7.9403 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z"
-             inkscape:connector-curvature="0" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-256.01335,-493.52653)">
+    <g style="display:inline" id="g149942" transform="matrix(1.0266398,0,0,1.0266398,-112.96436,-7650.9995)">
+      <g id="g149944">
+        <path sodipodi:nodetypes="ccccc" id="path149948" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:1.13534141;stroke-opacity:1" d="m 365.73279,7933.7677 112.24079,0 0,24.4014 -112.24079,0 z" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#linearGradient150270);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.39195597;stroke-miterlimit:4;stroke-dasharray:none" d="m 477.26393,7933.7756 c -0.73528,0 -1.35533,1.2499 -1.40322,2.802 l -0.59912,18.9466 c -0.0479,1.5525 0.51027,2.8023 1.24555,2.8023 l 5.36059,0 c 0.73528,0 1.35537,-1.2498 1.40322,-2.8023 l 0.14189,-4.5695 -0.81986,-0.2011 0,-8.7728 1.10366,0.2335 0.17343,-5.6375 c 0.0479,-1.5524 -0.51028,-2.8018 -1.24555,-2.8018 l -5.36059,0 z m 2.63299,9.1732 c 0.23329,0.022 0.4123,0.8455 0.39416,1.8346 -0.0181,0.9894 -0.22393,1.7539 -0.45722,1.7347 -0.23329,-0.022 -0.39652,-0.812 -0.37839,-1.8013 0.018,-0.989 0.20817,-1.7871 0.44145,-1.768 z" id="path149950" inkscape:connector-curvature="0"/>
+        <path style="fill:#808080;fill-opacity:1;stroke:none" d="m 479.319,7936.2627 1.08052,-0.1193 1.31825,2.7539 -0.31436,18.5537 -1.08508,0.201 -1.52263,-3.2866 0.89765,-0.082 0.6647,0.7834 0.28516,-15.9111 -1.32421,-2.893" id="path149952" inkscape:path-effect="#path-effect45434-5-9-6-8" inkscape:original-d="m 479.319,7936.2627 c 0.0595,-1.277 0.4262,-0.8523 1.08052,-0.1193 l 1.31825,2.7539 -0.31436,18.5537 c -0.2953,1.0112 -0.6593,0.4535 -1.08508,0.201 l -1.52263,-3.2866 c 0.30985,-0.8467 0.39156,-0.416 0.89765,-0.082 l 0.6647,0.7834 0.28516,-15.9111 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+        <path style="fill:#4d4d4d;fill-opacity:1;stroke:none" d="m 479.25225,7940.2333 0.98975,1.5497 -0.23247,13.7201 -1.21374,-1.1333 -0.0365,2.2264 1.56528,1.0592 0.34607,-18.5778 -1.35691,-2.817 -0.0615,3.9727" id="path149954" inkscape:path-effect="#path-effect45430-8-4-4-3" inkscape:original-d="m 479.25225,7940.2333 0.98975,1.5497 -0.23247,13.7201 -1.21374,-1.1333 -0.0365,2.2264 1.56528,1.0592 0.34607,-18.5778 -1.35691,-2.817 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+        <path inkscape:connector-curvature="0" d="m 365.73255,7933.7675 73.30554,0 0,24.4019 -73.30554,0 z" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:1.13487971;stroke-opacity:1" id="path149956" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" id="path149958" d="m 366.18898,7933.5725 c 0.74177,0 1.36728,1.2559 1.41558,2.8167 l 0.60441,19.046 c 0.0482,1.5605 -0.51478,2.8167 -1.25653,2.8167 l -5.40779,0 c -0.74173,0 -1.36732,-1.2562 -1.41557,-2.8167 l -0.14315,-4.5936 0.82707,-0.2023 0,-8.8187 -1.11336,0.2344 -0.17495,-5.6667 c -0.0483,-1.5605 0.51476,-2.8167 1.2565,-2.8167 l 5.40779,0 z m -2.65617,9.2213 c -0.23534,0.022 -0.41593,0.8499 -0.39764,1.8444 0.0183,0.9944 0.22592,1.7626 0.46126,1.7436 0.23534,-0.022 0.40002,-0.8167 0.38173,-1.8109 -0.0183,-0.9945 -0.21002,-1.7965 -0.44535,-1.7771 z" style="fill:url(#linearGradient150272);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.26313704;stroke-miterlimit:4;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 364.11582,7936.0726 c -0.0599,-1.2843 -0.42995,-0.8571 -1.09002,-0.12 l -1.32988,2.7683 0.31715,18.651 c 0.29789,1.0167 0.66511,0.4561 1.09461,0.2023 l 1.53604,-3.304 c -0.31257,-0.8507 -0.39501,-0.4181 -0.90554,-0.083 l -0.67055,0.7876 -0.28768,-15.9947 z" inkscape:path-effect="#path-effect45449-51-0-22-5" id="path149960" d="m 364.11582,7936.0726 -1.09002,-0.12 -1.32988,2.7683 0.31715,18.651 1.09461,0.2023 1.53604,-3.304 -0.90554,-0.083 -0.67055,0.7876 -0.28768,-15.9947 1.33587,-2.9075" style="fill:#808080;stroke:none"/>
+        <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 364.18316,7940.0639 -0.99847,1.5579 0.23453,13.7921 1.22442,-1.1395 0.0368,2.2384 -1.57905,1.0648 -0.34911,-18.6754 1.36887,-2.832 z" inkscape:path-effect="#path-effect45451-306-1-9-9" id="path149962" d="m 364.18316,7940.0639 -0.99847,1.5579 0.23453,13.7921 1.22442,-1.1395 0.0368,2.2384 -1.57905,1.0648 -0.34911,-18.6754 1.36887,-2.832 0.062,3.9937" style="fill:#4d4d4d;stroke:none"/>
+        <path id="path149964" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" d="m 369.46174,7950.056 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 372.69366,7951.684 7.1891,0 0,0.7235 -7.1891,0 z" id="path149966" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 390.39286,7951.5518 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z" id="path149968" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path149970" d="m 381.2188,7951.684 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path149972" d="m 372.89723,7953.0406 7.18911,0 0,0.4071 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.42237,7953.0406 7.18912,0 0,0.4071 -7.18912,0 z" id="path149974"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.04993,7954.126 7.18911,0 0,0.407 -7.18911,0 z" id="path149976"/>
+        <path id="path149978" d="m 381.57507,7954.126 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path149980" d="m 373.10082,7955.1662 7.18912,0 0,0.4069 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.62597,7955.1662 7.18911,0 0,0.4069 -7.18911,0 z" id="path149982"/>
+        <path id="path149984" d="m 390.27835,7955.1662 7.18912,0 0,0.4069 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path149986" style="fill:#000000;stroke:none" d="m 369.46174,7951.0961 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path149988" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.13052,7935.9363 0.47457,-0.011 c 0.24733,-0.011 0.46443,0.131 0.48672,0.3059 l 0.031,0.2425 c 0.0223,0.175 -0.15884,0.3201 -0.40618,0.3255 l -0.47457,0.011 c -0.24735,0.01 -0.46445,-0.131 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3253 z" inkscape:connector-curvature="0"/>
+        <path id="path149990" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.83999,7935.8775 0.47457,-0.011 c 0.24735,-0.01 0.46444,0.1311 0.48676,0.3059 l 0.0309,0.2425 c 0.0222,0.1749 -0.15886,0.3201 -0.40621,0.3255 l -0.47456,0.01 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15886,-0.32 0.40621,-0.3252 z" inkscape:connector-curvature="0"/>
+        <path d="m 401.17662,7938.0611 0.47457,-0.01 c 0.24734,-0.011 0.46444,0.1313 0.48673,0.306 l 0.031,0.2426 c 0.0223,0.1747 -0.15884,0.32 -0.40619,0.3254 l -0.47457,0.011 c -0.24735,0 -0.46445,-0.1312 -0.48677,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1747 0.15885,-0.3201 0.40621,-0.3254 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149992" inkscape:connector-curvature="0"/>
+        <path d="m 403.88609,7938.0023 0.47458,-0.01 c 0.24734,-0.011 0.46443,0.1313 0.48675,0.3061 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3254 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path149994" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path149996" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.22664,7940.3668 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1312 0.48674,0.3061 l 0.031,0.2424 c 0.0224,0.1751 -0.15883,0.3203 -0.40618,0.3257 l -0.47457,0.011 c -0.24735,0.011 -0.46444,-0.1311 -0.48677,-0.3061 l -0.0309,-0.2424 c -0.0223,-0.175 0.15885,-0.3202 0.4062,-0.3256 z"/>
+        <path inkscape:connector-curvature="0" id="path149998" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.93612,7940.3081 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.1313 0.48676,0.3061 l 0.0309,0.2425 c 0.0222,0.175 -0.15885,0.3202 -0.4062,0.3256 l -0.47457,0.01 c -0.24733,0.011 -0.46444,-0.1312 -0.48675,-0.3062 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.32 0.4062,-0.3254 z"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 406.58427,7935.4865 29.32904,-0.045 0.0637,6.3309 -29.20179,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path150000"/>
+        <path inkscape:connector-curvature="0" id="path150002" d="m 409.8162,7937.1146 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path150004" d="m 427.5154,7936.9824 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1023 0,2.9844 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9844 0.9543,0 0.0159,-0.1132 -1.65414,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.34134,7937.1146 7.1891,0 0,0.7235 -7.1891,0 z" id="path150006" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.01977,7938.4712 7.18913,0 0,0.4071 -7.18913,0 z" id="path150008" sodipodi:nodetypes="ccccc"/>
+        <path id="path150010" d="m 418.54491,7938.4712 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path150012" d="m 410.17247,7939.5566 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.69761,7939.5566 7.18911,0 0,0.407 -7.18911,0 z" id="path150014" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.22338,7940.5968 7.1891,0 0,0.4069 -7.1891,0 z" id="path150016" sodipodi:nodetypes="ccccc"/>
+        <path id="path150018" d="m 418.74852,7940.5968 7.1891,0 0,0.4069 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.40089,7940.5968 7.18911,0 0,0.4069 -7.18911,0 z" id="path150020" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 406.58427,7936.5267 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.059,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" style="fill:#000000;stroke:none" id="path150022"/>
+        <path id="path150024" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.22384,7951.5327 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.22392,7954.7662 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150026"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.17483,7936.9633 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150028"/>
+        <path id="path150030" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.1749,7940.1968 0,-0.4635 2.11403,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path inkscape:connector-curvature="0" d="m 441.70238,7936.6931 31.74661,0 -0.11348,4.0591 -31.74662,0 z" style="fill:url(#linearGradient150274);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.50041842" id="path150032"/>
+        <g transform="matrix(0.14942814,0,-0.03044284,0.12343177,389.80533,6871.1352)" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="g150034">
+          <path id="path150036" style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Arial Bold" d="m 2304.2619,8640.1281 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z m -6.9816,6.5971 -2.8381,-7.9403 1.7386,0 2.0094,5.8767 1.9445,-5.8767 1.7007,0 -2.8436,7.9403 z m -10.0472,-7.9403 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z" inkscape:connector-curvature="0"/>
         </g>
-        <path
-           style="fill:#ffffff;stroke:none"
-           d="m 470.27084,7938.8832 c -1.08707,0 -1.96833,0.1211 -1.96833,0.2713 0,0.15 0.88126,0.2712 1.96833,0.2712 1.08709,0 1.96834,-0.1212 1.96834,-0.2712 0,-0.1502 -0.88125,-0.2713 -1.96834,-0.2713 z m 0,0.1961 c 0.30515,0 0.55253,0.034 0.55253,0.075 0,0.042 -0.24738,0.075 -0.55253,0.075 -0.30514,0 -0.55251,-0.034 -0.55251,-0.075 0,-0.042 0.24737,-0.075 0.55251,-0.075 z"
-           id="path150038"
-           inkscape:connector-curvature="0" />
-        <text
-           xml:space="preserve"
-           style="font-size:0.64422148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="461.62274"
-           y="8075.6997"
-           id="text150040"
-           sodipodi:linespacing="125%"
-           transform="scale(1.0170762,0.9832105)"><tspan
-             sodipodi:role="line"
-             id="tspan150042"
-             x="461.62274"
-             y="8075.6997">ROM</tspan></text>
-        <g
-           transform="matrix(0.02255355,0,0,-0.02180257,456.42108,7940.9283)"
-           id="g150044"
-           style="fill:#ffffff">
-          <g
-             id="g150046"
-             transform="translate(8.50391,150.1943)"
-             style="fill:#ffffff">
-            <path
-               inkscape:connector-curvature="0"
-               d="m 121.00809,-7.9961 c 0,0 -4.304,0 -4.304,0 0,0 0,5.5352 0,5.5352 0,0 4.458,0 4.458,0 2.152,0 3.229,-0.8721 3.229,-2.6113 0,-1.9522 -1.13,-2.9239 -3.383,-2.9239 z m 34.29,-2.7656 c -0.617,-3.0781 -2.206,-4.6123 -4.768,-4.6123 -3.587,0 -5.381,2.252 -5.381,6.7647 0,4.4043 1.794,6.6113 5.381,6.6113 2.562,0 4.101,-1.1309 4.613,-3.3828 0,0 2.153,0 2.153,0 -0.718,3.5869 -2.975,5.3808 -6.766,5.3808 -5.126,0 -7.687,-2.8701 -7.687,-8.6093 0,-5.7432 2.457,-8.6133 7.379,-8.6133 4.204,0 6.611,2.1523 7.228,6.4609 0,0 -2.152,0 -2.152,0 z M 82.41409,0 c -5.3311,0 -7.9951,-2.8701 -7.9951,-8.6093 0,-5.7432 2.664,-8.6133 7.9951,-8.6133 5.331,0 7.9961,2.8701 7.9961,8.6133 0,5.7392 -2.6651,8.6093 -7.9961,8.6093 z m -12.9131,-10.7617 c -0.5166,-3.0781 -2.0528,-4.6123 -4.6133,-4.6123 -3.6914,0 -5.5352,2.252 -5.5352,6.7647 0,4.4043 1.794,6.6113 5.3809,6.6113 2.5615,0 4.0996,-1.1309 4.6133,-3.3828 0,0 2.1523,0 2.1523,0 C 71.08989,-1.7939 68.83299,0 64.73339,0 c -5.0215,0 -7.5332,-2.8701 -7.5332,-8.6093 0,-5.7432 2.4072,-8.6133 7.2246,-8.6133 4.2041,0 6.6113,2.1523 7.2285,6.4609 0,0 -2.1523,0 -2.1523,0 z m 102.4011,10.3028 c 0,0 -13.221,0 -13.221,0 0,0 0,-2.002 0,-2.002 0,0 5.534,0 5.534,0 0,0 0,-14.4522 0,-14.4522 0,0 2.152,0 2.152,0 0,0 0,14.4522 0,14.4522 0,0 5.535,0 5.535,0 0,0 0,2.002 0,2.002 z m -35.824,0 c 0,0 -2.461,0 -2.461,0 0,0 -6.148,-16.4542 -6.148,-16.4542 0,0 2.302,0 2.302,0 0,0 1.694,4.7667 1.694,4.7667 0,0 6.611,0 6.611,0 0,0 1.539,-4.7667 1.539,-4.7667 0,0 2.461,0 2.461,0 0,0 -5.998,16.4542 -5.998,16.4542 z m -14.298,0 c 0,0 -7.228,0 -7.228,0 0,0 0,-16.4542 0,-16.4542 0,0 2.152,0 2.152,0 0,0 0,6.919 0,6.919 0,0 5.076,0 5.076,0 3.279,0 4.917,1.6396 4.917,4.9219 0,3.0742 -1.638,4.6133 -4.917,4.6133 z m -11.996,0 c 0,0 -3.074,0 -3.074,0 0,0 -4.768,-13.8399 -4.768,-13.8399 0,0 -4.612,13.8399 -4.612,13.8399 0,0 -3.229,0 -3.229,0 0,0 0,-16.4542 0,-16.4542 0,0 2.153,0 2.153,0 0,0 0,13.6836 0,13.6836 0,0 4.612,-13.6836 4.612,-13.6836 0,0 2.152,0 2.152,0 0,0 4.768,13.8389 4.768,13.8389 0,0 -0.154,-4.1504 -0.154,-4.1504 0,0 0,-9.6885 0,-9.6885 0,0 2.152,0 2.152,0 0,0 0,16.4542 0,16.4542 z m -61.8095,-2.9239 c 0,1.2305 -0.6172,1.8477 -1.8476,1.8477 0,0 -16.7598,0 -16.7598,0 -1.2295,0 -1.8428,-0.6172 -1.8428,-1.8477 0,0 0,-17.372 0,-17.372 0,-0.8223 -0.4131,-1.2315 -1.2304,-1.2315 0,0 -15.375,0 -15.375,0 -3.1778,0 -5.793,-1.0508 -7.8448,-3.1523 C 1.02148,-27.2412 0,-29.8808 0,-33.0595 c 0,0 0,-38.2848 0,-38.2848 0,-3.079 1.05078,-5.69 3.15329,-7.842 2.1026,-2.153 4.6875,-3.229 7.7657,-3.229 0,0 35.208,0 35.208,0 1.2304,0 1.8476,0.663 1.8476,1.998 0,0 0,77.0345 0,77.0345 z m 127.7735,-53.6601 c 0,1.331 -0.617,1.998 -1.848,1.998 0,0 -15.374,0 -15.374,0 -1.335,0 -1.998,-0.667 -1.998,-1.998 0,0 0,-8.9174 0,-8.9174 0,-2.565 -1.23,-3.845 -3.691,-3.845 -2.566,0 -3.846,1.28 -3.846,3.845 0,0 0,27.3656 0,27.3656 0,2.5615 1.28,3.8457 3.846,3.8457 2.461,0 3.691,-1.2842 3.691,-3.8457 0,0 0,-7.2236 0,-7.2236 0,-1.2344 0.663,-1.8477 1.998,-1.8477 0,0 15.374,0 15.374,0 1.231,0 1.848,0.6133 1.848,1.8477 0,0 0,12.7588 0,12.7588 0,3.0742 -1.076,5.6894 -3.229,7.8418 -2.152,2.1523 -4.767,3.2314 -7.84,3.2314 0,0 -23.679,0 -23.679,0 -3.078,0 -5.693,-1.0791 -7.846,-3.2314 -2.152,-2.1524 -3.228,-4.7676 -3.228,-7.8418 0,0 0,-38.1308 0,-38.1308 0,-3.179 1.05,-5.844 3.153,-7.996 2.103,-2.153 4.742,-3.229 7.921,-3.229 0,0 23.679,0 23.679,0 3.173,0 5.813,1.076 7.916,3.229 2.102,2.152 3.153,4.817 3.153,7.996 0,0 0,14.1474 0,14.1474 z m -50.895,3.2285 c 0,3.0742 -1.076,5.6894 -3.227,7.8418 -2.152,2.1513 -4.768,3.2285 -7.842,3.2285 0,0 -14.303,0 -14.303,0 -1.538,0 -2.305,0.7676 -2.305,2.3057 0,1.6396 0.767,2.4619 2.305,2.4619 0,0 21.527,0 21.527,0 1.23,0 1.847,0.6123 1.847,1.8427 0,0 0,12.3008 0,12.3008 0,1.2305 -0.617,1.8467 -1.847,1.8467 0,0 -30.4436,0 -30.4436,0 -3.0782,0 -5.6895,-1.0791 -7.8418,-3.2314 -2.1514,-2.1524 -3.2286,-4.7676 -3.2286,-7.8418 0,0 0,-16.2959 0,-16.2959 0,-3.0782 1.0772,-5.6895 3.2286,-7.8419 2.1523,-2.152 4.7636,-3.228 7.8418,-3.228 0,0 14.3016,0 14.3016,0 1.944,0 2.92,-1.026 2.92,-3.079 0,-1.842 -0.976,-2.764 -2.92,-2.764 0,0 -23.5282,0 -23.5282,0 -1.2305,0 -1.8438,-0.668 -1.8438,-1.998 0,0 0,-12.151 0,-12.151 0,-1.335 0.6133,-1.998 1.8438,-1.998 0,0 32.4462,0 32.4462,0 3.174,0 5.815,1.076 7.916,3.229 2.103,2.152 3.153,4.817 3.153,7.996 0,0 0,17.3759 0,17.3759 z m 46.59,-51.5119 c 0,0 -9.843,0 -9.843,0 0,0 0,5.535 0,5.535 0,0 8.917,0 8.917,0 0,0 0,1.848 0,1.848 0,0 -8.917,0 -8.917,0 0,0 0,5.072 0,5.072 0,0 9.689,0 9.689,0 0,0 0,2.002 0,2.002 0,0 -11.841,0 -11.841,0 0,0 0,-16.3 0,-16.3 0,0 11.995,0 11.995,0 0,0 0,1.843 0,1.843 z m -15.991,6.766 c 0,0 -7.228,0 -7.228,0 0,0 0,-1.844 0,-1.844 0,0 5.076,0 5.076,0 0,-3.587 -1.694,-5.38 -5.076,-5.38 -3.587,0 -5.381,2.252 -5.381,6.765 0,4.404 1.794,6.611 5.381,6.611 2.665,0 4.254,-1.131 4.767,-3.383 0,0 2.152,0 2.152,0 -0.409,3.587 -2.715,5.381 -6.919,5.381 -5.126,0 -7.687,-2.87 -7.687,-8.609 0,-2.869 0.742,-5.026 2.227,-6.461 1.485,-1.435 3.253,-2.152 5.305,-2.152 2.461,0 4.255,0.872 5.385,2.615 0,0 0.613,-2.152 0.613,-2.152 0,0 1.385,0 1.385,0 0,0 0,8.609 0,8.609 z m -21.526,7.691 c 0,0 -2.461,0 -2.461,0 0,0 -6.303,-16.3 -6.303,-16.3 0,0 2.307,0 2.307,0 0,0 1.689,4.613 1.689,4.613 0,0 6.611,0 6.611,0 0,0 1.694,-4.613 1.694,-4.613 0,0 2.306,0 2.306,0 0,0 -5.843,16.3 -5.843,16.3 z m -9.227,-15.991 c -0.513,0.2 -0.767,0.763 -0.767,1.688 0,0 -0.155,2.924 -0.155,2.924 -0.103,1.331 -0.771,2.358 -1.997,3.075 1.534,0.817 2.306,2.102 2.306,3.845 0,2.97 -1.797,4.459 -5.385,4.459 0,0 -7.686,0 -7.686,0 0,0 0,-16.3 0,-16.3 0,0 2.306,0 2.306,0 0,0 0,6.919 0,6.919 0,0 5.38,0 5.38,0 1.844,0 2.82,-0.975 2.925,-2.923 0,0 0.304,-3.996 0.304,-3.996 0,0 2.769,0.309 2.769,0.309 z m -23.833,16.45 c -5.33,0 -7.995,-2.87 -7.995,-8.609 0,-2.461 0.718,-4.513 2.152,-6.153 1.435,-1.642 3.382,-2.46 5.843,-2.46 5.331,0 7.996,2.87 7.996,8.613 0,5.739 -2.665,8.609 -7.996,8.609 z m -7.995,-0.459 c 0,0 -13.377,0 -13.377,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.1523,0 2.1523,0 0,0 0,14.298 0,14.298 0,0 5.5352,0 5.5352,0 0,0 0,2.002 0,2.002 z m -17.5264,-7.383 c 0,0 -4.6132,1.077 -4.6132,1.077 -1.335,0.308 -2.002,0.971 -2.002,1.998 0,1.947 1.2295,2.923 3.6904,2.923 2.7696,0 4.1543,-1.13 4.1543,-3.382 0,0 1.9981,0 1.9981,0 0,3.482 -2.1016,5.226 -6.3057,5.226 -3.7959,0 -5.6894,-1.693 -5.6894,-5.072 0,-2.052 1.1767,-3.337 3.5371,-3.846 0,0 3.2275,-0.767 3.2275,-0.767 2.3564,-0.517 3.5371,-1.49 3.5371,-2.924 0,-1.844 -1.4346,-2.765 -4.3047,-2.765 -2.9726,0 -4.458,1.28 -4.458,3.841 0,0 -1.998,0 -1.998,0 0,-3.796 2.1523,-5.689 6.456,-5.689 4.3047,0 6.4571,1.639 6.4571,4.921 0,2.357 -1.2305,3.842 -3.6866,4.459 z m -24.6054,7.383 c 0,0 -2.4561,0 -2.4561,0 0,0 -6.1523,-16.3 -6.1523,-16.3 0,0 2.3066,0 2.3066,0 0,0 1.6895,4.613 1.6895,4.613 0,0 6.6152,0 6.6152,0 0,0 1.5342,-4.613 1.5342,-4.613 0,0 2.4609,0 2.4609,0 0,0 -5.998,16.3 -5.998,16.3 z m -5.6885,0 c 0,0 -13.376,0 -13.376,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.3056,0 2.3056,0 0,0 0,14.298 0,14.298 0,0 5.3809,0 5.3809,0 0,0 0,2.002 0,2.002 z m -17.5264,0 c 0,0 -2.6152,0 -2.6152,0 0,0 -6.1485,-16.3 -6.1485,-16.3 0,0 2.3067,0 2.3067,0 0,0 1.6894,4.613 1.6894,4.613 0,0 6.6104,0 6.6104,0 0,0 1.6934,-4.613 1.6934,-4.613 0,0 2.4619,0 2.4619,0 0,0 -5.9981,16.3 -5.9981,16.3 z m -16.9131,0 c 0,0 -6.7656,0 -6.7656,0 0,0 0,-16.3 0,-16.3 0,0 6.6104,0 6.6104,0 4.6142,0 6.9199,2.765 6.9199,8.304 0,5.331 -2.2559,7.996 -6.7647,7.996 z m 121.4668,80.7209 c 0,0 2.77,7.2285 2.77,7.2285 0,0 2.306,-7.2285 2.306,-7.2285 0,0 -5.076,0 -5.076,0 z m -49.664,-5.2256 c -3.7959,0 -5.6885,2.252 -5.6885,6.7647 0,4.4043 1.8926,6.6113 5.6885,6.6113 3.792,0 5.6894,-2.207 5.6894,-6.6113 0,-4.5127 -1.8974,-6.7647 -5.6894,-6.7647 z m -38.8985,-63.5043 c 0,0 -32.5966,0 -32.5966,0 -2.1553,0 -3.9493,0.718 -5.3838,2.153 -1.4356,1.434 -2.1524,3.228 -2.1524,5.381 0,0 0,38.2848 0,38.2848 0,2.1523 0.7168,3.9502 2.1524,5.3847 1.4345,1.4346 3.2285,2.1524 5.3838,2.1524 0,0 18.1445,0 18.1445,0 1.2265,0 1.8437,0.6631 1.8437,1.998 0,0 0,17.376 0,17.376 0,0.8174 0.4082,1.2305 1.2305,1.2305 0,0 11.3779,0 11.3779,0 0.7178,-0.7168 1.0762,-1.1309 1.0762,-1.2305 0,0 0,-71.6529 0,-71.6529 0,-0.208 -0.3584,-0.568 -1.0762,-1.077 z m 126.6185,2.228 c -1.485,-1.485 -3.304,-2.228 -5.455,-2.228 0,0 -23.679,0 -23.679,0 -2.156,0 -4.005,0.743 -5.539,2.228 -1.535,1.484 -2.303,3.308 -2.303,5.46 0,0 0,38.1308 0,38.1308 0,2.1523 0.768,3.9502 2.303,5.3847 1.534,1.4346 3.383,2.1524 5.539,2.1524 0,0 23.679,0 23.679,0 2.252,0 4.099,-0.6924 5.534,-2.0772 1.435,-1.3847 2.152,-3.207 2.152,-5.4599 0,0 0,-10.1475 0,-10.1475 0,-0.7178 -0.358,-1.0771 -1.076,-1.0771 0,0 -10.147,0 -10.147,0 -0.718,0 -1.077,0.3593 -1.077,1.0771 0,0 0,4.6123 0,4.6123 0,2.0527 -0.692,3.7666 -2.077,5.1514 -1.385,1.3847 -3.103,2.0771 -5.151,2.0771 -2.052,0 -3.767,-0.6924 -5.152,-2.0771 -1.384,-1.3848 -2.077,-3.0987 -2.077,-5.1514 0,0 0,-27.3656 0,-27.3656 0,-2.052 0.693,-3.77 2.077,-5.155 1.385,-1.385 3.1,-2.073 5.152,-2.073 2.048,0 3.766,0.688 5.151,2.073 1.385,1.385 2.077,3.103 2.077,5.155 0,0 0,6.456 0,6.456 0,0.718 0.359,1.077 1.077,1.077 0,0 10.147,0 10.147,0 0.205,0 0.563,-0.359 1.076,-1.077 0,0 0,-11.686 0,-11.686 0,-2.152 -0.746,-3.976 -2.231,-5.46 z m -50.895,0 c -1.484,-1.485 -3.303,-2.228 -5.455,-2.228 0,0 -29.6767,0 -29.6767,0 -0.8213,0 -1.2304,0.36 -1.2304,1.077 0,0 0,6.919 0,6.919 0,0.717 0.4091,1.077 1.2304,1.077 0,0 20.7587,0 20.7587,0 1.739,0 3.225,0.613 4.455,1.843 1.231,1.231 1.848,2.715 1.848,4.458 0,1.844 -0.593,3.383 -1.769,4.614 -1.18,1.23 -2.69,1.8474 -4.534,1.8474 0,0 -14.3016,0 -14.3016,0 -2.1524,0 -3.9746,0.7422 -5.46,2.2275 -1.4854,1.4854 -2.2275,3.3076 -2.2275,5.46 0,0 0,16.2959 0,16.2959 0,2.1523 0.7421,3.9502 2.2275,5.3847 1.4854,1.4346 3.3076,2.1524 5.46,2.1524 0,0 27.6786,0 27.6786,0 0.717,0 1.076,-0.3584 1.076,-1.0762 0,0 0,-6.7656 0,-6.7656 0,-0.8213 -0.359,-1.2305 -1.076,-1.2305 0,0 -18.762,0 -18.762,0 -3.795,0 -5.688,-1.9473 -5.688,-5.8437 0,-1.5381 0.562,-2.8741 1.689,-3.9991 1.126,-1.1259 2.461,-1.6894 3.999,-1.6894 0,0 14.303,0 14.303,0 2.048,0 3.842,-0.7715 5.381,-2.3067 1.534,-1.539 2.306,-3.333 2.306,-5.3808 0,0 0,-17.3759 0,-17.3759 0,-2.152 -0.746,-3.976 -2.232,-5.46 z m -46.6649,-5.765 c 0,0 -16.7588,0 -16.7588,0 -1.2304,0 -1.8427,0.663 -1.8427,1.998 0,0 0,56.5843 0,56.5843 0,1.2305 0.6123,1.8467 1.8427,1.8467 0,0 16.7588,0 16.7588,0 1.2266,0 1.8448,-0.6162 1.8448,-1.8467 0,0 0,-56.5843 0,-56.5843 0,-1.335 -0.6182,-1.998 -1.8448,-1.998 z m 45.9729,-15.837 c 0,0 -5.226,0 -5.226,0 0,0 0,5.536 0,5.536 0,0 5.535,0 5.535,0 1.948,0 2.924,-0.922 2.924,-2.766 0,-1.848 -1.081,-2.77 -3.233,-2.77 z m 11.379,-2.152 c 0,0 2.615,7.229 2.615,7.229 0,0 2.461,-7.229 2.461,-7.229 0,0 -5.076,0 -5.076,0 z m -83.182,0 c 0,0 2.7647,7.229 2.7647,7.229 0,0 2.3076,-7.229 2.3076,-7.229 0,0 -5.0723,0 -5.0723,0 z m -23.2197,0 c 0,0 2.6153,7.229 2.6153,7.229 0,0 2.4609,-7.229 2.4609,-7.229 0,0 -5.0762,0 -5.0762,0 z m -13.0683,-4.922 c 0,0 -4.3037,0 -4.3037,0 0,0 0,12.61 0,12.61 0,0 3.996,0 3.996,0 3.3819,0 5.0752,-2.103 5.0752,-6.303 0,-4.204 -1.5888,-6.307 -4.7675,-6.307 z m 90.41,-0.458 c -3.795,0 -5.688,2.252 -5.688,6.765 0,4.404 1.893,6.611 5.688,6.611 3.897,0 5.844,-2.207 5.844,-6.611 0,-4.513 -1.947,-6.765 -5.844,-6.765 z m -29.83,79.1857 c 0,0.7178 -0.3593,1.0762 -1.0771,1.0762 0,0 -11.3779,0 -11.3779,0 -0.7178,0 -1.0762,-0.3584 -1.0762,-1.0762 0,0 0,-51.2027 0,-51.2027 0,-0.717 0.3584,-1.077 1.0762,-1.077 0,0 11.3779,0 11.3779,0 0.7178,0 1.0771,0.36 1.0771,1.077 0,0 0,51.2027 0,51.2027 z m -39.9755,-11.6875 c 0,1.9443 -0.6915,3.6123 -2.0762,4.9971 -1.3858,1.3847 -3.0537,2.0771 -4.9971,2.0771 -1.9482,0 -3.5869,-0.6924 -4.9219,-2.0771 -1.3339,-1.3848 -1.998,-3.0528 -1.998,-4.9971 0,0 0,-28.1372 0,-28.1372 0,-2.052 0.6377,-3.742 1.9228,-5.076 1.2813,-1.335 2.9454,-1.998 4.9971,-1.998 1.9434,0 3.6113,0.693 4.9971,2.077 1.3847,1.385 2.0762,3.049 2.0762,4.997 0,0 0,28.1372 0,28.1372 z m -7.0733,-31.6742 c -2.3613,0 -3.5371,1.176 -3.5371,3.537 0,0 0,28.1372 0,28.1372 0,2.3564 1.1758,3.5371 3.5371,3.5371 2.2529,0 3.3828,-1.1807 3.3828,-3.5371 0,0 0,-28.1372 0,-28.1372 0,-2.361 -1.1299,-3.537 -3.3828,-3.537 z"
-               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-               id="path150048" />
+        <path style="fill:#ffffff;stroke:none" d="m 470.27084,7938.8832 c -1.08707,0 -1.96833,0.1211 -1.96833,0.2713 0,0.15 0.88126,0.2712 1.96833,0.2712 1.08709,0 1.96834,-0.1212 1.96834,-0.2712 0,-0.1502 -0.88125,-0.2713 -1.96834,-0.2713 z m 0,0.1961 c 0.30515,0 0.55253,0.034 0.55253,0.075 0,0.042 -0.24738,0.075 -0.55253,0.075 -0.30514,0 -0.55251,-0.034 -0.55251,-0.075 0,-0.042 0.24737,-0.075 0.55251,-0.075 z" id="path150038" inkscape:connector-curvature="0"/>
+        <text xml:space="preserve" style="font-size:0.64422148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="461.62274" y="8075.6997" id="text150040" sodipodi:linespacing="125%" transform="scale(1.0170762,0.9832105)"><tspan sodipodi:role="line" id="tspan150042" x="461.62274" y="8075.6997">ROM</tspan></text>
+        <g transform="matrix(0.02255355,0,0,-0.02180257,456.42108,7940.9283)" id="g150044" style="fill:#ffffff">
+          <g id="g150046" transform="translate(8.50391,150.1943)" style="fill:#ffffff">
+            <path inkscape:connector-curvature="0" d="m 121.00809,-7.9961 c 0,0 -4.304,0 -4.304,0 0,0 0,5.5352 0,5.5352 0,0 4.458,0 4.458,0 2.152,0 3.229,-0.8721 3.229,-2.6113 0,-1.9522 -1.13,-2.9239 -3.383,-2.9239 z m 34.29,-2.7656 c -0.617,-3.0781 -2.206,-4.6123 -4.768,-4.6123 -3.587,0 -5.381,2.252 -5.381,6.7647 0,4.4043 1.794,6.6113 5.381,6.6113 2.562,0 4.101,-1.1309 4.613,-3.3828 0,0 2.153,0 2.153,0 -0.718,3.5869 -2.975,5.3808 -6.766,5.3808 -5.126,0 -7.687,-2.8701 -7.687,-8.6093 0,-5.7432 2.457,-8.6133 7.379,-8.6133 4.204,0 6.611,2.1523 7.228,6.4609 0,0 -2.152,0 -2.152,0 z M 82.41409,0 c -5.3311,0 -7.9951,-2.8701 -7.9951,-8.6093 0,-5.7432 2.664,-8.6133 7.9951,-8.6133 5.331,0 7.9961,2.8701 7.9961,8.6133 0,5.7392 -2.6651,8.6093 -7.9961,8.6093 z m -12.9131,-10.7617 c -0.5166,-3.0781 -2.0528,-4.6123 -4.6133,-4.6123 -3.6914,0 -5.5352,2.252 -5.5352,6.7647 0,4.4043 1.794,6.6113 5.3809,6.6113 2.5615,0 4.0996,-1.1309 4.6133,-3.3828 0,0 2.1523,0 2.1523,0 C 71.08989,-1.7939 68.83299,0 64.73339,0 c -5.0215,0 -7.5332,-2.8701 -7.5332,-8.6093 0,-5.7432 2.4072,-8.6133 7.2246,-8.6133 4.2041,0 6.6113,2.1523 7.2285,6.4609 0,0 -2.1523,0 -2.1523,0 z m 102.4011,10.3028 c 0,0 -13.221,0 -13.221,0 0,0 0,-2.002 0,-2.002 0,0 5.534,0 5.534,0 0,0 0,-14.4522 0,-14.4522 0,0 2.152,0 2.152,0 0,0 0,14.4522 0,14.4522 0,0 5.535,0 5.535,0 0,0 0,2.002 0,2.002 z m -35.824,0 c 0,0 -2.461,0 -2.461,0 0,0 -6.148,-16.4542 -6.148,-16.4542 0,0 2.302,0 2.302,0 0,0 1.694,4.7667 1.694,4.7667 0,0 6.611,0 6.611,0 0,0 1.539,-4.7667 1.539,-4.7667 0,0 2.461,0 2.461,0 0,0 -5.998,16.4542 -5.998,16.4542 z m -14.298,0 c 0,0 -7.228,0 -7.228,0 0,0 0,-16.4542 0,-16.4542 0,0 2.152,0 2.152,0 0,0 0,6.919 0,6.919 0,0 5.076,0 5.076,0 3.279,0 4.917,1.6396 4.917,4.9219 0,3.0742 -1.638,4.6133 -4.917,4.6133 z m -11.996,0 c 0,0 -3.074,0 -3.074,0 0,0 -4.768,-13.8399 -4.768,-13.8399 0,0 -4.612,13.8399 -4.612,13.8399 0,0 -3.229,0 -3.229,0 0,0 0,-16.4542 0,-16.4542 0,0 2.153,0 2.153,0 0,0 0,13.6836 0,13.6836 0,0 4.612,-13.6836 4.612,-13.6836 0,0 2.152,0 2.152,0 0,0 4.768,13.8389 4.768,13.8389 0,0 -0.154,-4.1504 -0.154,-4.1504 0,0 0,-9.6885 0,-9.6885 0,0 2.152,0 2.152,0 0,0 0,16.4542 0,16.4542 z m -61.8095,-2.9239 c 0,1.2305 -0.6172,1.8477 -1.8476,1.8477 0,0 -16.7598,0 -16.7598,0 -1.2295,0 -1.8428,-0.6172 -1.8428,-1.8477 0,0 0,-17.372 0,-17.372 0,-0.8223 -0.4131,-1.2315 -1.2304,-1.2315 0,0 -15.375,0 -15.375,0 -3.1778,0 -5.793,-1.0508 -7.8448,-3.1523 C 1.02148,-27.2412 0,-29.8808 0,-33.0595 c 0,0 0,-38.2848 0,-38.2848 0,-3.079 1.05078,-5.69 3.15329,-7.842 2.1026,-2.153 4.6875,-3.229 7.7657,-3.229 0,0 35.208,0 35.208,0 1.2304,0 1.8476,0.663 1.8476,1.998 0,0 0,77.0345 0,77.0345 z m 127.7735,-53.6601 c 0,1.331 -0.617,1.998 -1.848,1.998 0,0 -15.374,0 -15.374,0 -1.335,0 -1.998,-0.667 -1.998,-1.998 0,0 0,-8.9174 0,-8.9174 0,-2.565 -1.23,-3.845 -3.691,-3.845 -2.566,0 -3.846,1.28 -3.846,3.845 0,0 0,27.3656 0,27.3656 0,2.5615 1.28,3.8457 3.846,3.8457 2.461,0 3.691,-1.2842 3.691,-3.8457 0,0 0,-7.2236 0,-7.2236 0,-1.2344 0.663,-1.8477 1.998,-1.8477 0,0 15.374,0 15.374,0 1.231,0 1.848,0.6133 1.848,1.8477 0,0 0,12.7588 0,12.7588 0,3.0742 -1.076,5.6894 -3.229,7.8418 -2.152,2.1523 -4.767,3.2314 -7.84,3.2314 0,0 -23.679,0 -23.679,0 -3.078,0 -5.693,-1.0791 -7.846,-3.2314 -2.152,-2.1524 -3.228,-4.7676 -3.228,-7.8418 0,0 0,-38.1308 0,-38.1308 0,-3.179 1.05,-5.844 3.153,-7.996 2.103,-2.153 4.742,-3.229 7.921,-3.229 0,0 23.679,0 23.679,0 3.173,0 5.813,1.076 7.916,3.229 2.102,2.152 3.153,4.817 3.153,7.996 0,0 0,14.1474 0,14.1474 z m -50.895,3.2285 c 0,3.0742 -1.076,5.6894 -3.227,7.8418 -2.152,2.1513 -4.768,3.2285 -7.842,3.2285 0,0 -14.303,0 -14.303,0 -1.538,0 -2.305,0.7676 -2.305,2.3057 0,1.6396 0.767,2.4619 2.305,2.4619 0,0 21.527,0 21.527,0 1.23,0 1.847,0.6123 1.847,1.8427 0,0 0,12.3008 0,12.3008 0,1.2305 -0.617,1.8467 -1.847,1.8467 0,0 -30.4436,0 -30.4436,0 -3.0782,0 -5.6895,-1.0791 -7.8418,-3.2314 -2.1514,-2.1524 -3.2286,-4.7676 -3.2286,-7.8418 0,0 0,-16.2959 0,-16.2959 0,-3.0782 1.0772,-5.6895 3.2286,-7.8419 2.1523,-2.152 4.7636,-3.228 7.8418,-3.228 0,0 14.3016,0 14.3016,0 1.944,0 2.92,-1.026 2.92,-3.079 0,-1.842 -0.976,-2.764 -2.92,-2.764 0,0 -23.5282,0 -23.5282,0 -1.2305,0 -1.8438,-0.668 -1.8438,-1.998 0,0 0,-12.151 0,-12.151 0,-1.335 0.6133,-1.998 1.8438,-1.998 0,0 32.4462,0 32.4462,0 3.174,0 5.815,1.076 7.916,3.229 2.103,2.152 3.153,4.817 3.153,7.996 0,0 0,17.3759 0,17.3759 z m 46.59,-51.5119 c 0,0 -9.843,0 -9.843,0 0,0 0,5.535 0,5.535 0,0 8.917,0 8.917,0 0,0 0,1.848 0,1.848 0,0 -8.917,0 -8.917,0 0,0 0,5.072 0,5.072 0,0 9.689,0 9.689,0 0,0 0,2.002 0,2.002 0,0 -11.841,0 -11.841,0 0,0 0,-16.3 0,-16.3 0,0 11.995,0 11.995,0 0,0 0,1.843 0,1.843 z m -15.991,6.766 c 0,0 -7.228,0 -7.228,0 0,0 0,-1.844 0,-1.844 0,0 5.076,0 5.076,0 0,-3.587 -1.694,-5.38 -5.076,-5.38 -3.587,0 -5.381,2.252 -5.381,6.765 0,4.404 1.794,6.611 5.381,6.611 2.665,0 4.254,-1.131 4.767,-3.383 0,0 2.152,0 2.152,0 -0.409,3.587 -2.715,5.381 -6.919,5.381 -5.126,0 -7.687,-2.87 -7.687,-8.609 0,-2.869 0.742,-5.026 2.227,-6.461 1.485,-1.435 3.253,-2.152 5.305,-2.152 2.461,0 4.255,0.872 5.385,2.615 0,0 0.613,-2.152 0.613,-2.152 0,0 1.385,0 1.385,0 0,0 0,8.609 0,8.609 z m -21.526,7.691 c 0,0 -2.461,0 -2.461,0 0,0 -6.303,-16.3 -6.303,-16.3 0,0 2.307,0 2.307,0 0,0 1.689,4.613 1.689,4.613 0,0 6.611,0 6.611,0 0,0 1.694,-4.613 1.694,-4.613 0,0 2.306,0 2.306,0 0,0 -5.843,16.3 -5.843,16.3 z m -9.227,-15.991 c -0.513,0.2 -0.767,0.763 -0.767,1.688 0,0 -0.155,2.924 -0.155,2.924 -0.103,1.331 -0.771,2.358 -1.997,3.075 1.534,0.817 2.306,2.102 2.306,3.845 0,2.97 -1.797,4.459 -5.385,4.459 0,0 -7.686,0 -7.686,0 0,0 0,-16.3 0,-16.3 0,0 2.306,0 2.306,0 0,0 0,6.919 0,6.919 0,0 5.38,0 5.38,0 1.844,0 2.82,-0.975 2.925,-2.923 0,0 0.304,-3.996 0.304,-3.996 0,0 2.769,0.309 2.769,0.309 z m -23.833,16.45 c -5.33,0 -7.995,-2.87 -7.995,-8.609 0,-2.461 0.718,-4.513 2.152,-6.153 1.435,-1.642 3.382,-2.46 5.843,-2.46 5.331,0 7.996,2.87 7.996,8.613 0,5.739 -2.665,8.609 -7.996,8.609 z m -7.995,-0.459 c 0,0 -13.377,0 -13.377,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.1523,0 2.1523,0 0,0 0,14.298 0,14.298 0,0 5.5352,0 5.5352,0 0,0 0,2.002 0,2.002 z m -17.5264,-7.383 c 0,0 -4.6132,1.077 -4.6132,1.077 -1.335,0.308 -2.002,0.971 -2.002,1.998 0,1.947 1.2295,2.923 3.6904,2.923 2.7696,0 4.1543,-1.13 4.1543,-3.382 0,0 1.9981,0 1.9981,0 0,3.482 -2.1016,5.226 -6.3057,5.226 -3.7959,0 -5.6894,-1.693 -5.6894,-5.072 0,-2.052 1.1767,-3.337 3.5371,-3.846 0,0 3.2275,-0.767 3.2275,-0.767 2.3564,-0.517 3.5371,-1.49 3.5371,-2.924 0,-1.844 -1.4346,-2.765 -4.3047,-2.765 -2.9726,0 -4.458,1.28 -4.458,3.841 0,0 -1.998,0 -1.998,0 0,-3.796 2.1523,-5.689 6.456,-5.689 4.3047,0 6.4571,1.639 6.4571,4.921 0,2.357 -1.2305,3.842 -3.6866,4.459 z m -24.6054,7.383 c 0,0 -2.4561,0 -2.4561,0 0,0 -6.1523,-16.3 -6.1523,-16.3 0,0 2.3066,0 2.3066,0 0,0 1.6895,4.613 1.6895,4.613 0,0 6.6152,0 6.6152,0 0,0 1.5342,-4.613 1.5342,-4.613 0,0 2.4609,0 2.4609,0 0,0 -5.998,16.3 -5.998,16.3 z m -5.6885,0 c 0,0 -13.376,0 -13.376,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.3056,0 2.3056,0 0,0 0,14.298 0,14.298 0,0 5.3809,0 5.3809,0 0,0 0,2.002 0,2.002 z m -17.5264,0 c 0,0 -2.6152,0 -2.6152,0 0,0 -6.1485,-16.3 -6.1485,-16.3 0,0 2.3067,0 2.3067,0 0,0 1.6894,4.613 1.6894,4.613 0,0 6.6104,0 6.6104,0 0,0 1.6934,-4.613 1.6934,-4.613 0,0 2.4619,0 2.4619,0 0,0 -5.9981,16.3 -5.9981,16.3 z m -16.9131,0 c 0,0 -6.7656,0 -6.7656,0 0,0 0,-16.3 0,-16.3 0,0 6.6104,0 6.6104,0 4.6142,0 6.9199,2.765 6.9199,8.304 0,5.331 -2.2559,7.996 -6.7647,7.996 z m 121.4668,80.7209 c 0,0 2.77,7.2285 2.77,7.2285 0,0 2.306,-7.2285 2.306,-7.2285 0,0 -5.076,0 -5.076,0 z m -49.664,-5.2256 c -3.7959,0 -5.6885,2.252 -5.6885,6.7647 0,4.4043 1.8926,6.6113 5.6885,6.6113 3.792,0 5.6894,-2.207 5.6894,-6.6113 0,-4.5127 -1.8974,-6.7647 -5.6894,-6.7647 z m -38.8985,-63.5043 c 0,0 -32.5966,0 -32.5966,0 -2.1553,0 -3.9493,0.718 -5.3838,2.153 -1.4356,1.434 -2.1524,3.228 -2.1524,5.381 0,0 0,38.2848 0,38.2848 0,2.1523 0.7168,3.9502 2.1524,5.3847 1.4345,1.4346 3.2285,2.1524 5.3838,2.1524 0,0 18.1445,0 18.1445,0 1.2265,0 1.8437,0.6631 1.8437,1.998 0,0 0,17.376 0,17.376 0,0.8174 0.4082,1.2305 1.2305,1.2305 0,0 11.3779,0 11.3779,0 0.7178,-0.7168 1.0762,-1.1309 1.0762,-1.2305 0,0 0,-71.6529 0,-71.6529 0,-0.208 -0.3584,-0.568 -1.0762,-1.077 z m 126.6185,2.228 c -1.485,-1.485 -3.304,-2.228 -5.455,-2.228 0,0 -23.679,0 -23.679,0 -2.156,0 -4.005,0.743 -5.539,2.228 -1.535,1.484 -2.303,3.308 -2.303,5.46 0,0 0,38.1308 0,38.1308 0,2.1523 0.768,3.9502 2.303,5.3847 1.534,1.4346 3.383,2.1524 5.539,2.1524 0,0 23.679,0 23.679,0 2.252,0 4.099,-0.6924 5.534,-2.0772 1.435,-1.3847 2.152,-3.207 2.152,-5.4599 0,0 0,-10.1475 0,-10.1475 0,-0.7178 -0.358,-1.0771 -1.076,-1.0771 0,0 -10.147,0 -10.147,0 -0.718,0 -1.077,0.3593 -1.077,1.0771 0,0 0,4.6123 0,4.6123 0,2.0527 -0.692,3.7666 -2.077,5.1514 -1.385,1.3847 -3.103,2.0771 -5.151,2.0771 -2.052,0 -3.767,-0.6924 -5.152,-2.0771 -1.384,-1.3848 -2.077,-3.0987 -2.077,-5.1514 0,0 0,-27.3656 0,-27.3656 0,-2.052 0.693,-3.77 2.077,-5.155 1.385,-1.385 3.1,-2.073 5.152,-2.073 2.048,0 3.766,0.688 5.151,2.073 1.385,1.385 2.077,3.103 2.077,5.155 0,0 0,6.456 0,6.456 0,0.718 0.359,1.077 1.077,1.077 0,0 10.147,0 10.147,0 0.205,0 0.563,-0.359 1.076,-1.077 0,0 0,-11.686 0,-11.686 0,-2.152 -0.746,-3.976 -2.231,-5.46 z m -50.895,0 c -1.484,-1.485 -3.303,-2.228 -5.455,-2.228 0,0 -29.6767,0 -29.6767,0 -0.8213,0 -1.2304,0.36 -1.2304,1.077 0,0 0,6.919 0,6.919 0,0.717 0.4091,1.077 1.2304,1.077 0,0 20.7587,0 20.7587,0 1.739,0 3.225,0.613 4.455,1.843 1.231,1.231 1.848,2.715 1.848,4.458 0,1.844 -0.593,3.383 -1.769,4.614 -1.18,1.23 -2.69,1.8474 -4.534,1.8474 0,0 -14.3016,0 -14.3016,0 -2.1524,0 -3.9746,0.7422 -5.46,2.2275 -1.4854,1.4854 -2.2275,3.3076 -2.2275,5.46 0,0 0,16.2959 0,16.2959 0,2.1523 0.7421,3.9502 2.2275,5.3847 1.4854,1.4346 3.3076,2.1524 5.46,2.1524 0,0 27.6786,0 27.6786,0 0.717,0 1.076,-0.3584 1.076,-1.0762 0,0 0,-6.7656 0,-6.7656 0,-0.8213 -0.359,-1.2305 -1.076,-1.2305 0,0 -18.762,0 -18.762,0 -3.795,0 -5.688,-1.9473 -5.688,-5.8437 0,-1.5381 0.562,-2.8741 1.689,-3.9991 1.126,-1.1259 2.461,-1.6894 3.999,-1.6894 0,0 14.303,0 14.303,0 2.048,0 3.842,-0.7715 5.381,-2.3067 1.534,-1.539 2.306,-3.333 2.306,-5.3808 0,0 0,-17.3759 0,-17.3759 0,-2.152 -0.746,-3.976 -2.232,-5.46 z m -46.6649,-5.765 c 0,0 -16.7588,0 -16.7588,0 -1.2304,0 -1.8427,0.663 -1.8427,1.998 0,0 0,56.5843 0,56.5843 0,1.2305 0.6123,1.8467 1.8427,1.8467 0,0 16.7588,0 16.7588,0 1.2266,0 1.8448,-0.6162 1.8448,-1.8467 0,0 0,-56.5843 0,-56.5843 0,-1.335 -0.6182,-1.998 -1.8448,-1.998 z m 45.9729,-15.837 c 0,0 -5.226,0 -5.226,0 0,0 0,5.536 0,5.536 0,0 5.535,0 5.535,0 1.948,0 2.924,-0.922 2.924,-2.766 0,-1.848 -1.081,-2.77 -3.233,-2.77 z m 11.379,-2.152 c 0,0 2.615,7.229 2.615,7.229 0,0 2.461,-7.229 2.461,-7.229 0,0 -5.076,0 -5.076,0 z m -83.182,0 c 0,0 2.7647,7.229 2.7647,7.229 0,0 2.3076,-7.229 2.3076,-7.229 0,0 -5.0723,0 -5.0723,0 z m -23.2197,0 c 0,0 2.6153,7.229 2.6153,7.229 0,0 2.4609,-7.229 2.4609,-7.229 0,0 -5.0762,0 -5.0762,0 z m -13.0683,-4.922 c 0,0 -4.3037,0 -4.3037,0 0,0 0,12.61 0,12.61 0,0 3.996,0 3.996,0 3.3819,0 5.0752,-2.103 5.0752,-6.303 0,-4.204 -1.5888,-6.307 -4.7675,-6.307 z m 90.41,-0.458 c -3.795,0 -5.688,2.252 -5.688,6.765 0,4.404 1.893,6.611 5.688,6.611 3.897,0 5.844,-2.207 5.844,-6.611 0,-4.513 -1.947,-6.765 -5.844,-6.765 z m -29.83,79.1857 c 0,0.7178 -0.3593,1.0762 -1.0771,1.0762 0,0 -11.3779,0 -11.3779,0 -0.7178,0 -1.0762,-0.3584 -1.0762,-1.0762 0,0 0,-51.2027 0,-51.2027 0,-0.717 0.3584,-1.077 1.0762,-1.077 0,0 11.3779,0 11.3779,0 0.7178,0 1.0771,0.36 1.0771,1.077 0,0 0,51.2027 0,51.2027 z m -39.9755,-11.6875 c 0,1.9443 -0.6915,3.6123 -2.0762,4.9971 -1.3858,1.3847 -3.0537,2.0771 -4.9971,2.0771 -1.9482,0 -3.5869,-0.6924 -4.9219,-2.0771 -1.3339,-1.3848 -1.998,-3.0528 -1.998,-4.9971 0,0 0,-28.1372 0,-28.1372 0,-2.052 0.6377,-3.742 1.9228,-5.076 1.2813,-1.335 2.9454,-1.998 4.9971,-1.998 1.9434,0 3.6113,0.693 4.9971,2.077 1.3847,1.385 2.0762,3.049 2.0762,4.997 0,0 0,28.1372 0,28.1372 z m -7.0733,-31.6742 c -2.3613,0 -3.5371,1.176 -3.5371,3.537 0,0 0,28.1372 0,28.1372 0,2.3564 1.1758,3.5371 3.5371,3.5371 2.2529,0 3.3828,-1.1807 3.3828,-3.5371 0,0 0,-28.1372 0,-28.1372 0,-2.361 -1.1299,-3.537 -3.3828,-3.537 z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path150048"/>
           </g>
         </g>
-        <path
-           id="path150050"
-           style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 471.22906,7943.0969 1.90862,0 0,2.4099 -1.90862,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 468.87511,7943.0968 1.9086,0 0,2.41 -1.9086,0 z"
-           style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150052"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150054"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4"
-           d="m 467.18673,7943.0524 1.21366,0 0,4.2539 -1.21366,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 467.92553,7943.0524 0.47486,0 0,4.2539 -0.47486,0 z"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4"
-           id="path150056" />
-        <rect
-           transform="matrix(1,0,-0.01802634,0.99983751,0,0)"
-           y="7944.5239"
-           x="584.88458"
-           height="4.7188153"
-           width="23.795719"
-           id="rect150058"
-           style="fill:url(#linearGradient150276);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150060"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 442.96371,7943.8985 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 446.15365,7943.8985 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path150062"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150064"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 449.37599,7943.8985 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 401.28774,7943.1829 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path150066" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 403.99722,7943.124 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path150068" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150070"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.33384,7945.3076 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150072"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 404.04332,7945.2489 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z" />
-        <path
-           d="m 401.38387,7947.6134 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path150074"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 404.09334,7947.5546 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path150076"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150078"
-           style="fill:#808080;stroke:#000000;stroke-width:0.42910308"
-           d="m 406.58427,7942.7348 29.32904,-0.045 0.0637,6.331 -29.20179,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 409.8162,7944.3629 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path150080"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 427.5154,7944.2307 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-           id="path150082" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path150084"
-           d="m 418.34134,7944.3629 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path150086"
-           d="m 410.01977,7945.7195 7.18913,0 0,0.4071 -7.18913,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.54491,7945.7195 7.18913,0 0,0.4071 -7.18913,0 z"
-           id="path150088" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.17247,7946.8049 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path150090" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path150092"
-           d="m 418.69761,7946.8049 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path150094"
-           d="m 410.22338,7947.845 7.1891,0 0,0.407 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.74852,7947.845 7.1891,0 0,0.407 -7.1891,0 z"
-           id="path150096" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path150098"
-           d="m 427.40089,7947.845 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150100"
-           style="fill:#000000;stroke:none"
-           d="m 406.58427,7943.775 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path150102"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 431.17483,7944.2116 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.1749,7947.4451 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150104" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 471.22906,7946.4114 1.90862,0 0,1.0539 -1.90862,0 z"
-           style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150106" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150108"
-           style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 468.87511,7946.4113 1.9086,0 0,1.054 -1.9086,0 z" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 442.96371,7946.0732 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path150110"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150112"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 446.15365,7946.0732 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 449.37599,7946.0732 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path150114"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150116"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 452.6521,7946.0732 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 455.84203,7946.0732 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path150118"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150120"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 459.06437,7946.0732 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 369.07258,7935.4452 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           id="path150122" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150124"
-           d="m 372.3045,7937.0732 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path150126"
-           d="m 390.0037,7936.941 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 380.82964,7937.0732 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path150128" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 372.50807,7938.4298 7.18911,0 0,0.4071 -7.18911,0 z"
-           id="path150130" />
-        <path
-           id="path150132"
-           d="m 381.03321,7938.4298 7.18912,0 0,0.4071 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150134"
-           d="m 372.66077,7939.5152 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.18591,7939.5152 7.18912,0 0,0.407 -7.18912,0 z"
-           id="path150136" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 372.71166,7940.5554 7.18912,0 0,0.4069 -7.18912,0 z"
-           id="path150138" />
-        <path
-           id="path150140"
-           d="m 381.23681,7940.5554 7.18911,0 0,0.4069 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 389.88919,7940.5554 7.18912,0 0,0.4069 -7.18912,0 z"
-           id="path150142" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 369.07258,7936.4853 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-           style="fill:#000000;stroke:none"
-           id="path150144" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 393.83468,7936.9219 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150146" />
-        <path
-           id="path150148"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 393.83476,7940.1554 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path150150"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           d="m 369.38862,7942.6935 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 372.62054,7944.3215 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path150152"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 390.31974,7944.1893 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z"
-           id="path150154"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path150156"
-           d="m 381.14568,7944.3215 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150158"
-           d="m 372.82411,7945.6781 7.18911,0 0,0.4071 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.34925,7945.6781 7.18912,0 0,0.4071 -7.18912,0 z"
-           id="path150160" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 372.97681,7946.7635 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path150162" />
-        <path
-           id="path150164"
-           d="m 381.50195,7946.7635 7.18912,0 0,0.407 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150166"
-           d="m 373.0277,7947.8036 7.18912,0 0,0.407 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.55285,7947.8036 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path150168" />
-        <path
-           id="path150170"
-           d="m 390.20523,7947.8036 7.18912,0 0,0.407 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150172"
-           style="fill:#000000;stroke:none"
-           d="m 369.38862,7943.7336 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path150174"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 394.15072,7944.1702 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 394.1508,7947.4037 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150176" />
-        <path
-           id="path150178"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.28774,7950.6052 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150180"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 403.99722,7950.5463 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 401.33384,7952.7299 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path150182"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 404.04332,7952.6712 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path150184"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150186"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.38387,7955.0357 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150188"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 404.09334,7954.9769 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 406.58427,7950.1571 29.32904,-0.045 0.0637,6.331 -29.20179,0 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.42910308"
-           id="path150190" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path150192"
-           d="m 409.8162,7951.7852 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path150194"
-           d="m 427.5154,7951.653 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.34134,7951.7852 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path150196"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.01977,7953.1418 7.18913,0 0,0.4071 -7.18913,0 z"
-           id="path150198"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path150200"
-           d="m 418.54491,7953.1418 7.18913,0 0,0.4071 -7.18913,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path150202"
-           d="m 410.17247,7954.2272 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.69761,7954.2272 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path150204"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.22338,7955.2673 7.1891,0 0,0.407 -7.1891,0 z"
-           id="path150206"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path150208"
-           d="m 418.74852,7955.2673 7.1891,0 0,0.407 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 427.40089,7955.2673 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path150210"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 406.58427,7951.1973 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-           style="fill:#000000;stroke:none"
-           id="path150212" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.17483,7951.6339 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150214" />
-        <path
-           id="path150216"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 431.1749,7954.8674 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.61633438"
-           id="rect150218"
-           width="31.550442"
-           height="6.1957226"
-           x="586.43988"
-           y="7951.1172"
-           transform="matrix(1,0,-0.01820351,0.9998343,0,0)" />
-        <path
-           id="path150220"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 445.26828,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 448.86009,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150222" />
-        <path
-           id="path150224"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 452.63454,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 456.28723,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150226" />
-        <path
-           id="path150228"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 460.0008,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 463.6535,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150230" />
-        <path
-           id="path150232"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 467.30619,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 471.01976,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150234" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 446.97287,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150236" />
-        <path
-           id="path150238"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 450.56468,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 454.33913,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150240" />
-        <path
-           id="path150242"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 457.99182,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 461.70539,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150244" />
-        <path
-           id="path150246"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 465.35809,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 469.01078,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150248" />
-        <path
-           id="path150250"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 472.72435,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path150252"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 444.90301,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 448.49482,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150254" />
-        <path
-           id="path150256"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 452.26927,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 455.92196,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150258" />
-        <path
-           id="path150260"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 459.63553,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 463.28823,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150262" />
-        <path
-           id="path150264"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 466.94092,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 470.65449,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path150266" />
+        <path id="path150050" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.22906,7943.0969 1.90862,0 0,2.4099 -1.90862,0 z" inkscape:connector-curvature="0"/>
+        <path d="m 468.87511,7943.0968 1.9086,0 0,2.41 -1.9086,0 z" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150052" inkscape:connector-curvature="0"/>
+        <path id="path150054" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4" d="m 467.18673,7943.0524 1.21366,0 0,4.2539 -1.21366,0 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 467.92553,7943.0524 0.47486,0 0,4.2539 -0.47486,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4" id="path150056"/>
+        <rect transform="matrix(1,0,-0.01802634,0.99983751,0,0)" y="7944.5239" x="584.88458" height="4.7188153" width="23.795719" id="rect150058" style="fill:url(#linearGradient150276);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554"/>
+        <path inkscape:connector-curvature="0" id="path150060" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 442.96371,7943.8985 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 446.15365,7943.8985 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path150062" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path150064" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 449.37599,7943.8985 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+        <path inkscape:connector-curvature="0" d="m 401.28774,7943.1829 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path150066"/>
+        <path inkscape:connector-curvature="0" d="m 403.99722,7943.124 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path150068"/>
+        <path inkscape:connector-curvature="0" id="path150070" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.33384,7945.3076 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z"/>
+        <path inkscape:connector-curvature="0" id="path150072" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 404.04332,7945.2489 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z"/>
+        <path d="m 401.38387,7947.6134 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path150074" inkscape:connector-curvature="0"/>
+        <path d="m 404.09334,7947.5546 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path150076" inkscape:connector-curvature="0"/>
+        <path id="path150078" style="fill:#808080;stroke:#000000;stroke-width:0.42910308" d="m 406.58427,7942.7348 29.32904,-0.045 0.0637,6.331 -29.20179,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 409.8162,7944.3629 7.1891,0 0,0.7235 -7.1891,0 z" id="path150080" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.5154,7944.2307 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z" id="path150082"/>
+        <path sodipodi:nodetypes="ccccc" id="path150084" d="m 418.34134,7944.3629 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path150086" d="m 410.01977,7945.7195 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.54491,7945.7195 7.18913,0 0,0.4071 -7.18913,0 z" id="path150088"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.17247,7946.8049 7.18911,0 0,0.407 -7.18911,0 z" id="path150090"/>
+        <path sodipodi:nodetypes="ccccc" id="path150092" d="m 418.69761,7946.8049 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path150094" d="m 410.22338,7947.845 7.1891,0 0,0.407 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.74852,7947.845 7.1891,0 0,0.407 -7.1891,0 z" id="path150096"/>
+        <path sodipodi:nodetypes="ccccc" id="path150098" d="m 427.40089,7947.845 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path150100" style="fill:#000000;stroke:none" d="m 406.58427,7943.775 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path150102" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.17483,7944.2116 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.1749,7947.4451 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150104"/>
+        <path inkscape:connector-curvature="0" d="m 471.22906,7946.4114 1.90862,0 0,1.0539 -1.90862,0 z" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150106"/>
+        <path inkscape:connector-curvature="0" id="path150108" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 468.87511,7946.4113 1.9086,0 0,1.054 -1.9086,0 z"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 442.96371,7946.0732 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path150110" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path150112" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 446.15365,7946.0732 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 449.37599,7946.0732 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path150114" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path150116" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 452.6521,7946.0732 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 455.84203,7946.0732 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path150118" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path150120" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 459.06437,7946.0732 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 369.07258,7935.4452 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path150122"/>
+        <path inkscape:connector-curvature="0" id="path150124" d="m 372.3045,7937.0732 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path150126" d="m 390.0037,7936.941 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 380.82964,7937.0732 7.1891,0 0,0.7235 -7.1891,0 z" id="path150128"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 372.50807,7938.4298 7.18911,0 0,0.4071 -7.18911,0 z" id="path150130"/>
+        <path id="path150132" d="m 381.03321,7938.4298 7.18912,0 0,0.4071 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path150134" d="m 372.66077,7939.5152 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.18591,7939.5152 7.18912,0 0,0.407 -7.18912,0 z" id="path150136"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 372.71166,7940.5554 7.18912,0 0,0.4069 -7.18912,0 z" id="path150138"/>
+        <path id="path150140" d="m 381.23681,7940.5554 7.18911,0 0,0.4069 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 389.88919,7940.5554 7.18912,0 0,0.4069 -7.18912,0 z" id="path150142"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 369.07258,7936.4853 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" style="fill:#000000;stroke:none" id="path150144"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 393.83468,7936.9219 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150146"/>
+        <path id="path150148" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 393.83476,7940.1554 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path150150" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" d="m 369.38862,7942.6935 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 372.62054,7944.3215 7.1891,0 0,0.7235 -7.1891,0 z" id="path150152" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 390.31974,7944.1893 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z" id="path150154" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path150156" d="m 381.14568,7944.3215 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path150158" d="m 372.82411,7945.6781 7.18911,0 0,0.4071 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.34925,7945.6781 7.18912,0 0,0.4071 -7.18912,0 z" id="path150160"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 372.97681,7946.7635 7.18911,0 0,0.407 -7.18911,0 z" id="path150162"/>
+        <path id="path150164" d="m 381.50195,7946.7635 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path150166" d="m 373.0277,7947.8036 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.55285,7947.8036 7.18911,0 0,0.407 -7.18911,0 z" id="path150168"/>
+        <path id="path150170" d="m 390.20523,7947.8036 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path150172" style="fill:#000000;stroke:none" d="m 369.38862,7943.7336 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path150174" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.15072,7944.1702 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.1508,7947.4037 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150176"/>
+        <path id="path150178" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.28774,7950.6052 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z" inkscape:connector-curvature="0"/>
+        <path id="path150180" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.99722,7950.5463 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z" inkscape:connector-curvature="0"/>
+        <path d="m 401.33384,7952.7299 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path150182" inkscape:connector-curvature="0"/>
+        <path d="m 404.04332,7952.6712 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path150184" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path150186" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.38387,7955.0357 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z"/>
+        <path inkscape:connector-curvature="0" id="path150188" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 404.09334,7954.9769 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 406.58427,7950.1571 29.32904,-0.045 0.0637,6.331 -29.20179,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.42910308" id="path150190"/>
+        <path inkscape:connector-curvature="0" id="path150192" d="m 409.8162,7951.7852 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path150194" d="m 427.5154,7951.653 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.34134,7951.7852 7.1891,0 0,0.7235 -7.1891,0 z" id="path150196" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.01977,7953.1418 7.18913,0 0,0.4071 -7.18913,0 z" id="path150198" sodipodi:nodetypes="ccccc"/>
+        <path id="path150200" d="m 418.54491,7953.1418 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path150202" d="m 410.17247,7954.2272 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.69761,7954.2272 7.18911,0 0,0.407 -7.18911,0 z" id="path150204" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.22338,7955.2673 7.1891,0 0,0.407 -7.1891,0 z" id="path150206" sodipodi:nodetypes="ccccc"/>
+        <path id="path150208" d="m 418.74852,7955.2673 7.1891,0 0,0.407 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.40089,7955.2673 7.18911,0 0,0.407 -7.18911,0 z" id="path150210" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 406.58427,7951.1973 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" style="fill:#000000;stroke:none" id="path150212"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.17483,7951.6339 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150214"/>
+        <path id="path150216" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.1749,7954.8674 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <rect style="fill:#666666;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.61633438" id="rect150218" width="31.550442" height="6.1957226" x="586.43988" y="7951.1172" transform="matrix(1,0,-0.01820351,0.9998343,0,0)"/>
+        <path id="path150220" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 445.26828,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 448.86009,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150222"/>
+        <path id="path150224" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 452.63454,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 456.28723,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150226"/>
+        <path id="path150228" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 460.0008,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 463.6535,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150230"/>
+        <path id="path150232" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 467.30619,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 471.01976,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150234"/>
+        <path inkscape:connector-curvature="0" d="m 446.97287,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150236"/>
+        <path id="path150238" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 450.56468,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 454.33913,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150240"/>
+        <path id="path150242" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 457.99182,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 461.70539,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150244"/>
+        <path id="path150246" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 465.35809,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 469.01078,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150248"/>
+        <path id="path150250" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 472.72435,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path id="path150252" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 444.90301,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 448.49482,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150254"/>
+        <path id="path150256" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 452.26927,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 455.92196,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150258"/>
+        <path id="path150260" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 459.63553,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 463.28823,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150262"/>
+        <path id="path150264" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 466.94092,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 470.65449,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150266"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Rackmountable_3U_server_3D.svg b/misc/images/svg/elements/Rackmountable_3U_server_3D.svg
index eba6c1b2a81..34d0085fa81 100644
--- a/misc/images/svg/elements/Rackmountable_3U_server_3D.svg
+++ b/misc/images/svg/elements/Rackmountable_3U_server_3D.svg
@@ -1,1100 +1,216 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="127.98325"
-   height="35.490631"
-   id="svg141859"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 36">
-  <defs
-     id="defs141861">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-46-9-5"
-       id="linearGradient146484-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-19.316631,-491.85743)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.36697"
-       y2="7986.2241" />
-    <linearGradient
-       id="linearGradient42443-7-46-9-5">
-      <stop
-         id="stop42445-53-9-36-2"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-7-3-7" />
-      <stop
-         id="stop42449-3-8-96-2"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="127.98325" height="35.490631" id="svg141859" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 36">
+  <defs id="defs141861">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-46-9-5" id="linearGradient146484-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-19.316631,-491.85743)" x1="407.2959" y1="8015.7466" x2="407.36697" y2="7986.2241"/>
+    <linearGradient id="linearGradient42443-7-46-9-5">
+      <stop id="stop42445-53-9-36-2" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-7-3-7"/>
+      <stop id="stop42449-3-8-96-2" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-12-7-2"
-       id="linearGradient146486-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0447673,0,0,1.633851,-14.364864,-5127.8395)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-12-7-2">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-03-3-0" />
-      <stop
-         id="stop76664-9-25-1-90-3"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-4-9-0" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-12-7-2" id="linearGradient146486-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0447673,0,0,1.633851,-14.364864,-5127.8395)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-12-7-2">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-03-3-0"/>
+      <stop id="stop76664-9-25-1-90-3" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-4-9-0"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45434-5-9-6-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45430-8-4-4-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-46-9-5"
-       id="linearGradient146488-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.6424083,-20.375326,-5196.8227)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient141678">
-      <stop
-         id="stop141680"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop141682" />
-      <stop
-         id="stop141684"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect45434-5-9-6-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect45430-8-4-4-3" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-46-9-5" id="linearGradient146488-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.6424083,-20.375326,-5196.8227)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient141678">
+      <stop id="stop141680" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop141682"/>
+      <stop id="stop141684" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45449-51-0-22-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45451-306-1-9-9"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-1-5-8"
-       id="linearGradient146490-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,-0.02945495,1.0535452,-19.316631,-491.54306)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-1-5-8">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-4-7-3" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-9-7-2" />
+    <inkscape:path-effect is_visible="true" id="path-effect45449-51-0-22-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect45451-306-1-9-9" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-1-5-8" id="linearGradient146490-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,-0.02945495,1.0535452,-19.316631,-491.54306)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-1-5-8">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-4-7-3"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-9-7-2"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-4-4-0"
-       id="linearGradient146492-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0539569,0,0,1.0539569,-28.178793,-491.62295)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-4-4-0">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-7-9-8" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-5-9-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-4-4-0" id="linearGradient146492-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0539569,0,0,1.0539569,-28.178793,-491.62295)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-4-4-0">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-7-9-8"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-5-9-2"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-158.1562"
-     inkscape:cy="43.459569"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="22"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata141864">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-158.1562" inkscape:cy="43.459569" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="22" inkscape:window-y="29" inkscape:window-maximized="0"/>
+  <metadata id="metadata141864">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-533.1562,-540.33112)">
-    <g
-       style="display:inline"
-       transform="matrix(1.0266398,0,0,1.0266398,164.17849,-7594.9841)"
-       id="g88480-5-2"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_3U_server_3D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g146313-0">
-        <path
-           sodipodi:nodetypes="ccccccc"
-           id="path79128-2-8-8"
-           style="fill:url(#linearGradient146484-8);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 365.13604,7933.1801 0.13246,25.2367 113.20138,0.3686 0.0414,-25.6265 -30.98725,-8.9432 -52.35964,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 365.73279,7933.7677 112.24079,0 0,24.4014 -112.24079,0 z"
-           style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:1.13534141;stroke-opacity:1"
-           id="path79130-5-5-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79132-2-47-5"
-           d="m 477.26393,7933.7756 c -0.73528,0 -1.35533,1.2499 -1.40322,2.802 l -0.59912,18.9466 c -0.0479,1.5525 0.51027,2.8023 1.24555,2.8023 l 5.36059,0 c 0.73528,0 1.35537,-1.2498 1.40322,-2.8023 l 0.14189,-4.5695 -0.81986,-0.2011 0,-8.7728 1.10366,0.2335 0.17343,-5.6375 c 0.0479,-1.5524 -0.51028,-2.8018 -1.24555,-2.8018 l -5.36059,0 z m 2.63299,9.1732 c 0.23329,0.022 0.4123,0.8455 0.39416,1.8346 -0.0181,0.9894 -0.22393,1.7539 -0.45722,1.7347 -0.23329,-0.022 -0.39652,-0.812 -0.37839,-1.8013 0.018,-0.989 0.20817,-1.7871 0.44145,-1.768 z"
-           style="fill:url(#linearGradient146486-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.39195597;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 479.319,7936.2627 c 0.0595,-1.277 0.4262,-0.8523 1.08052,-0.1193 l 1.31825,2.7539 -0.31436,18.5537 c -0.2953,1.0112 -0.6593,0.4535 -1.08508,0.201 l -1.52263,-3.2866 c 0.30985,-0.8467 0.39156,-0.416 0.89765,-0.082 l 0.6647,0.7834 0.28516,-15.9111 z"
-           inkscape:path-effect="#path-effect45434-5-9-6-8"
-           id="path79134-8-1-0"
-           d="m 479.319,7936.2627 1.08052,-0.1193 1.31825,2.7539 -0.31436,18.5537 -1.08508,0.201 -1.52263,-3.2866 0.89765,-0.082 0.6647,0.7834 0.28516,-15.9111 -1.32421,-2.893"
-           style="fill:#808080;fill-opacity:1;stroke:none" />
-        <path
-           sodipodi:nodetypes="ccccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 479.25225,7940.2333 0.98975,1.5497 -0.23247,13.7201 -1.21374,-1.1333 -0.0365,2.2264 1.56528,1.0592 0.34607,-18.5778 -1.35691,-2.817 z"
-           inkscape:path-effect="#path-effect45430-8-4-4-3"
-           id="path79136-7-4-4"
-           d="m 479.25225,7940.2333 0.98975,1.5497 -0.23247,13.7201 -1.21374,-1.1333 -0.0365,2.2264 1.56528,1.0592 0.34607,-18.5778 -1.35691,-2.817 -0.0615,3.9727"
-           style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path79138-8-5-8"
-           style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:1.13487971;stroke-opacity:1"
-           d="m 365.73255,7933.7675 73.30554,0 0,24.4019 -73.30554,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:url(#linearGradient146488-7);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.26313704;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 366.18898,7933.5725 c 0.74177,0 1.36728,1.2559 1.41558,2.8167 l 0.60441,19.046 c 0.0482,1.5605 -0.51478,2.8167 -1.25653,2.8167 l -5.40779,0 c -0.74173,0 -1.36732,-1.2562 -1.41557,-2.8167 l -0.14315,-4.5936 0.82707,-0.2023 0,-8.8187 -1.11336,0.2344 -0.17495,-5.6667 c -0.0483,-1.5605 0.51476,-2.8167 1.2565,-2.8167 l 5.40779,0 z m -2.65617,9.2213 c -0.23534,0.022 -0.41593,0.8499 -0.39764,1.8444 0.0183,0.9944 0.22592,1.7626 0.46126,1.7436 0.23534,-0.022 0.40002,-0.8167 0.38173,-1.8109 -0.0183,-0.9945 -0.21002,-1.7965 -0.44535,-1.7771 z"
-           id="path79140-4-8-7"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#808080;stroke:none"
-           d="m 364.11582,7936.0726 -1.09002,-0.12 -1.32988,2.7683 0.31715,18.651 1.09461,0.2023 1.53604,-3.304 -0.90554,-0.083 -0.67055,0.7876 -0.28768,-15.9947 1.33587,-2.9075"
-           id="path79142-8-9-2"
-           inkscape:path-effect="#path-effect45449-51-0-22-5"
-           inkscape:original-d="m 364.11582,7936.0726 c -0.0599,-1.2843 -0.42995,-0.8571 -1.09002,-0.12 l -1.32988,2.7683 0.31715,18.651 c 0.29789,1.0167 0.66511,0.4561 1.09461,0.2023 l 1.53604,-3.304 c -0.31257,-0.8507 -0.39501,-0.4181 -0.90554,-0.083 l -0.67055,0.7876 -0.28768,-15.9947 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccc" />
-        <path
-           style="fill:#4d4d4d;stroke:none"
-           d="m 364.18316,7940.0639 -0.99847,1.5579 0.23453,13.7921 1.22442,-1.1395 0.0368,2.2384 -1.57905,1.0648 -0.34911,-18.6754 1.36887,-2.832 0.062,3.9937"
-           id="path79144-7-0-4"
-           inkscape:path-effect="#path-effect45451-306-1-9-9"
-           inkscape:original-d="m 364.18316,7940.0639 -0.99847,1.5579 0.23453,13.7921 1.22442,-1.1395 0.0368,2.2384 -1.57905,1.0648 -0.34911,-18.6754 1.36887,-2.832 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 369.46174,7950.056 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           id="path79146-6-7-7" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79148-9-1-9"
-           d="m 372.69366,7951.684 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path79150-9-3-2"
-           d="m 390.39286,7951.5518 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.2188,7951.684 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path79152-5-1-5" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 372.89723,7953.0406 7.18911,0 0,0.4071 -7.18911,0 z"
-           id="path79154-7-2-6" />
-        <path
-           id="path79156-5-3-8"
-           d="m 381.42237,7953.0406 7.18912,0 0,0.4071 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path79158-1-9-6"
-           d="m 373.04993,7954.126 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.57507,7954.126 7.18912,0 0,0.407 -7.18912,0 z"
-           id="path79160-6-8-9" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 373.10082,7955.1662 7.18912,0 0,0.4069 -7.18912,0 z"
-           id="path79162-4-8-1" />
-        <path
-           id="path79164-1-9-7"
-           d="m 381.62597,7955.1662 7.18911,0 0,0.4069 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 390.27835,7955.1662 7.18912,0 0,0.4069 -7.18912,0 z"
-           id="path79166-7-6-0" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 369.46174,7951.0961 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-           style="fill:#000000;stroke:none"
-           id="path79168-8-7-7" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 401.13052,7935.9363 0.47457,-0.011 c 0.24733,-0.011 0.46443,0.131 0.48672,0.3059 l 0.031,0.2425 c 0.0223,0.175 -0.15884,0.3201 -0.40618,0.3255 l -0.47457,0.011 c -0.24735,0.01 -0.46445,-0.131 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3253 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path79170-4-3-6" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 403.83999,7935.8775 0.47457,-0.011 c 0.24735,-0.01 0.46444,0.1311 0.48676,0.3059 l 0.0309,0.2425 c 0.0222,0.1749 -0.15886,0.3201 -0.40621,0.3255 l -0.47456,0.01 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15886,-0.32 0.40621,-0.3252 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path79172-0-7-8" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79174-3-60-1"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.17662,7938.0611 0.47457,-0.01 c 0.24734,-0.011 0.46444,0.1313 0.48673,0.306 l 0.031,0.2426 c 0.0223,0.1747 -0.15884,0.32 -0.40619,0.3254 l -0.47457,0.011 c -0.24735,0 -0.46445,-0.1312 -0.48677,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1747 0.15885,-0.3201 0.40621,-0.3254 z" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79176-3-7-1"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 403.88609,7938.0023 0.47458,-0.01 c 0.24734,-0.011 0.46443,0.1313 0.48675,0.3061 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3254 z" />
-        <path
-           d="m 401.22664,7940.3668 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1312 0.48674,0.3061 l 0.031,0.2424 c 0.0224,0.1751 -0.15883,0.3203 -0.40618,0.3257 l -0.47457,0.011 c -0.24735,0.011 -0.46444,-0.1311 -0.48677,-0.3061 l -0.0309,-0.2424 c -0.0223,-0.175 0.15885,-0.3202 0.4062,-0.3256 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path79178-3-7-4"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 403.93612,7940.3081 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.1313 0.48676,0.3061 l 0.0309,0.2425 c 0.0222,0.175 -0.15885,0.3202 -0.4062,0.3256 l -0.47457,0.01 c -0.24733,0.011 -0.46444,-0.1312 -0.48675,-0.3062 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.32 0.4062,-0.3254 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path79180-4-3-7"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path79182-3-7-5"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           d="m 406.58427,7935.4865 29.32904,-0.045 0.0637,6.3309 -29.20179,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 409.8162,7937.1146 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path79184-7-4-8"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 427.5154,7936.9824 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1023 0,2.9844 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9844 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-           id="path79186-7-6-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path79188-8-8-7"
-           d="m 418.34134,7937.1146 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path79190-5-5-6"
-           d="m 410.01977,7938.4712 7.18913,0 0,0.4071 -7.18913,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.54491,7938.4712 7.18913,0 0,0.4071 -7.18913,0 z"
-           id="path79192-7-3-6" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.17247,7939.5566 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path79194-3-8-8" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path79196-6-5-1"
-           d="m 418.69761,7939.5566 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path79198-8-8-8"
-           d="m 410.22338,7940.5968 7.1891,0 0,0.4069 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.74852,7940.5968 7.1891,0 0,0.4069 -7.1891,0 z"
-           id="path79200-8-5-9" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path79202-8-7-1"
-           d="m 427.40089,7940.5968 7.18911,0 0,0.4069 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path79204-6-2-1"
-           style="fill:#000000;stroke:none"
-           d="m 406.58427,7936.5267 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.059,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 394.22384,7951.5327 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path79206-5-4-1" />
-        <path
-           id="path79208-2-3-6"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 394.22392,7954.7662 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path79210-2-8-7"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 431.17483,7936.9633 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.1749,7940.1968 0,-0.4635 2.11403,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path79212-5-9-7" />
-        <path
-           id="path79214-4-9-9"
-           style="fill:url(#linearGradient146490-7);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.50041842"
-           d="m 441.70238,7936.6931 31.74661,0 -0.11348,4.0591 -31.74662,0 z"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g79216-6-5-8"
-           style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           transform="matrix(0.14942814,0,-0.03044284,0.12343177,389.80533,6871.1352)">
-          <path
-             inkscape:connector-curvature="0"
-             d="m 2304.2619,8640.1281 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z m -6.9816,6.5971 -2.8381,-7.9403 1.7386,0 2.0094,5.8767 1.9445,-5.8767 1.7007,0 -2.8436,7.9403 z m -10.0472,-7.9403 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z"
-             style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Arial Bold"
-             id="path79218-2-4-3" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-533.1562,-540.33112)">
+    <g style="display:inline" transform="matrix(1.0266398,0,0,1.0266398,164.17849,-7594.9841)" id="g88480-5-2">
+      <g id="g146313-0">
+        <path sodipodi:nodetypes="ccccccc" id="path79128-2-8-8" style="fill:url(#linearGradient146484-8);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 365.13604,7933.1801 0.13246,25.2367 113.20138,0.3686 0.0414,-25.6265 -30.98725,-8.9432 -52.35964,0 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 365.73279,7933.7677 112.24079,0 0,24.4014 -112.24079,0 z" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:1.13534141;stroke-opacity:1" id="path79130-5-5-0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" id="path79132-2-47-5" d="m 477.26393,7933.7756 c -0.73528,0 -1.35533,1.2499 -1.40322,2.802 l -0.59912,18.9466 c -0.0479,1.5525 0.51027,2.8023 1.24555,2.8023 l 5.36059,0 c 0.73528,0 1.35537,-1.2498 1.40322,-2.8023 l 0.14189,-4.5695 -0.81986,-0.2011 0,-8.7728 1.10366,0.2335 0.17343,-5.6375 c 0.0479,-1.5524 -0.51028,-2.8018 -1.24555,-2.8018 l -5.36059,0 z m 2.63299,9.1732 c 0.23329,0.022 0.4123,0.8455 0.39416,1.8346 -0.0181,0.9894 -0.22393,1.7539 -0.45722,1.7347 -0.23329,-0.022 -0.39652,-0.812 -0.37839,-1.8013 0.018,-0.989 0.20817,-1.7871 0.44145,-1.768 z" style="fill:url(#linearGradient146486-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.39195597;stroke-miterlimit:4;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 479.319,7936.2627 c 0.0595,-1.277 0.4262,-0.8523 1.08052,-0.1193 l 1.31825,2.7539 -0.31436,18.5537 c -0.2953,1.0112 -0.6593,0.4535 -1.08508,0.201 l -1.52263,-3.2866 c 0.30985,-0.8467 0.39156,-0.416 0.89765,-0.082 l 0.6647,0.7834 0.28516,-15.9111 z" inkscape:path-effect="#path-effect45434-5-9-6-8" id="path79134-8-1-0" d="m 479.319,7936.2627 1.08052,-0.1193 1.31825,2.7539 -0.31436,18.5537 -1.08508,0.201 -1.52263,-3.2866 0.89765,-0.082 0.6647,0.7834 0.28516,-15.9111 -1.32421,-2.893" style="fill:#808080;fill-opacity:1;stroke:none"/>
+        <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 479.25225,7940.2333 0.98975,1.5497 -0.23247,13.7201 -1.21374,-1.1333 -0.0365,2.2264 1.56528,1.0592 0.34607,-18.5778 -1.35691,-2.817 z" inkscape:path-effect="#path-effect45430-8-4-4-3" id="path79136-7-4-4" d="m 479.25225,7940.2333 0.98975,1.5497 -0.23247,13.7201 -1.21374,-1.1333 -0.0365,2.2264 1.56528,1.0592 0.34607,-18.5778 -1.35691,-2.817 -0.0615,3.9727" style="fill:#4d4d4d;fill-opacity:1;stroke:none"/>
+        <path sodipodi:nodetypes="ccccc" id="path79138-8-5-8" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:1.13487971;stroke-opacity:1" d="m 365.73255,7933.7675 73.30554,0 0,24.4019 -73.30554,0 z" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#linearGradient146488-7);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.26313704;stroke-miterlimit:4;stroke-dasharray:none" d="m 366.18898,7933.5725 c 0.74177,0 1.36728,1.2559 1.41558,2.8167 l 0.60441,19.046 c 0.0482,1.5605 -0.51478,2.8167 -1.25653,2.8167 l -5.40779,0 c -0.74173,0 -1.36732,-1.2562 -1.41557,-2.8167 l -0.14315,-4.5936 0.82707,-0.2023 0,-8.8187 -1.11336,0.2344 -0.17495,-5.6667 c -0.0483,-1.5605 0.51476,-2.8167 1.2565,-2.8167 l 5.40779,0 z m -2.65617,9.2213 c -0.23534,0.022 -0.41593,0.8499 -0.39764,1.8444 0.0183,0.9944 0.22592,1.7626 0.46126,1.7436 0.23534,-0.022 0.40002,-0.8167 0.38173,-1.8109 -0.0183,-0.9945 -0.21002,-1.7965 -0.44535,-1.7771 z" id="path79140-4-8-7" inkscape:connector-curvature="0"/>
+        <path style="fill:#808080;stroke:none" d="m 364.11582,7936.0726 -1.09002,-0.12 -1.32988,2.7683 0.31715,18.651 1.09461,0.2023 1.53604,-3.304 -0.90554,-0.083 -0.67055,0.7876 -0.28768,-15.9947 1.33587,-2.9075" id="path79142-8-9-2" inkscape:path-effect="#path-effect45449-51-0-22-5" inkscape:original-d="m 364.11582,7936.0726 c -0.0599,-1.2843 -0.42995,-0.8571 -1.09002,-0.12 l -1.32988,2.7683 0.31715,18.651 c 0.29789,1.0167 0.66511,0.4561 1.09461,0.2023 l 1.53604,-3.304 c -0.31257,-0.8507 -0.39501,-0.4181 -0.90554,-0.083 l -0.67055,0.7876 -0.28768,-15.9947 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+        <path style="fill:#4d4d4d;stroke:none" d="m 364.18316,7940.0639 -0.99847,1.5579 0.23453,13.7921 1.22442,-1.1395 0.0368,2.2384 -1.57905,1.0648 -0.34911,-18.6754 1.36887,-2.832 0.062,3.9937" id="path79144-7-0-4" inkscape:path-effect="#path-effect45451-306-1-9-9" inkscape:original-d="m 364.18316,7940.0639 -0.99847,1.5579 0.23453,13.7921 1.22442,-1.1395 0.0368,2.2384 -1.57905,1.0648 -0.34911,-18.6754 1.36887,-2.832 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 369.46174,7950.056 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path79146-6-7-7"/>
+        <path inkscape:connector-curvature="0" id="path79148-9-1-9" d="m 372.69366,7951.684 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path79150-9-3-2" d="m 390.39286,7951.5518 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.2188,7951.684 7.1891,0 0,0.7235 -7.1891,0 z" id="path79152-5-1-5"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 372.89723,7953.0406 7.18911,0 0,0.4071 -7.18911,0 z" id="path79154-7-2-6"/>
+        <path id="path79156-5-3-8" d="m 381.42237,7953.0406 7.18912,0 0,0.4071 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path79158-1-9-6" d="m 373.04993,7954.126 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.57507,7954.126 7.18912,0 0,0.407 -7.18912,0 z" id="path79160-6-8-9"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.10082,7955.1662 7.18912,0 0,0.4069 -7.18912,0 z" id="path79162-4-8-1"/>
+        <path id="path79164-1-9-7" d="m 381.62597,7955.1662 7.18911,0 0,0.4069 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 390.27835,7955.1662 7.18912,0 0,0.4069 -7.18912,0 z" id="path79166-7-6-0"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 369.46174,7951.0961 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" style="fill:#000000;stroke:none" id="path79168-8-7-7"/>
+        <path inkscape:connector-curvature="0" d="m 401.13052,7935.9363 0.47457,-0.011 c 0.24733,-0.011 0.46443,0.131 0.48672,0.3059 l 0.031,0.2425 c 0.0223,0.175 -0.15884,0.3201 -0.40618,0.3255 l -0.47457,0.011 c -0.24735,0.01 -0.46445,-0.131 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3253 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path79170-4-3-6"/>
+        <path inkscape:connector-curvature="0" d="m 403.83999,7935.8775 0.47457,-0.011 c 0.24735,-0.01 0.46444,0.1311 0.48676,0.3059 l 0.0309,0.2425 c 0.0222,0.1749 -0.15886,0.3201 -0.40621,0.3255 l -0.47456,0.01 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15886,-0.32 0.40621,-0.3252 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path79172-0-7-8"/>
+        <path inkscape:connector-curvature="0" id="path79174-3-60-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.17662,7938.0611 0.47457,-0.01 c 0.24734,-0.011 0.46444,0.1313 0.48673,0.306 l 0.031,0.2426 c 0.0223,0.1747 -0.15884,0.32 -0.40619,0.3254 l -0.47457,0.011 c -0.24735,0 -0.46445,-0.1312 -0.48677,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1747 0.15885,-0.3201 0.40621,-0.3254 z"/>
+        <path inkscape:connector-curvature="0" id="path79176-3-7-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.88609,7938.0023 0.47458,-0.01 c 0.24734,-0.011 0.46443,0.1313 0.48675,0.3061 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.4062,-0.3254 z"/>
+        <path d="m 401.22664,7940.3668 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1312 0.48674,0.3061 l 0.031,0.2424 c 0.0224,0.1751 -0.15883,0.3203 -0.40618,0.3257 l -0.47457,0.011 c -0.24735,0.011 -0.46444,-0.1311 -0.48677,-0.3061 l -0.0309,-0.2424 c -0.0223,-0.175 0.15885,-0.3202 0.4062,-0.3256 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path79178-3-7-4" inkscape:connector-curvature="0"/>
+        <path d="m 403.93612,7940.3081 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.1313 0.48676,0.3061 l 0.0309,0.2425 c 0.0222,0.175 -0.15885,0.3202 -0.4062,0.3256 l -0.47457,0.01 c -0.24733,0.011 -0.46444,-0.1312 -0.48675,-0.3062 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.32 0.4062,-0.3254 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path79180-4-3-7" inkscape:connector-curvature="0"/>
+        <path id="path79182-3-7-5" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" d="m 406.58427,7935.4865 29.32904,-0.045 0.0637,6.3309 -29.20179,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 409.8162,7937.1146 7.1891,0 0,0.7235 -7.1891,0 z" id="path79184-7-4-8" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.5154,7936.9824 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1023 0,2.9844 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9844 0.9543,0 0.0159,-0.1132 -1.65414,0 z" id="path79186-7-6-4"/>
+        <path sodipodi:nodetypes="ccccc" id="path79188-8-8-7" d="m 418.34134,7937.1146 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path79190-5-5-6" d="m 410.01977,7938.4712 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.54491,7938.4712 7.18913,0 0,0.4071 -7.18913,0 z" id="path79192-7-3-6"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.17247,7939.5566 7.18911,0 0,0.407 -7.18911,0 z" id="path79194-3-8-8"/>
+        <path sodipodi:nodetypes="ccccc" id="path79196-6-5-1" d="m 418.69761,7939.5566 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path79198-8-8-8" d="m 410.22338,7940.5968 7.1891,0 0,0.4069 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.74852,7940.5968 7.1891,0 0,0.4069 -7.1891,0 z" id="path79200-8-5-9"/>
+        <path sodipodi:nodetypes="ccccc" id="path79202-8-7-1" d="m 427.40089,7940.5968 7.18911,0 0,0.4069 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path79204-6-2-1" style="fill:#000000;stroke:none" d="m 406.58427,7936.5267 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.059,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.22384,7951.5327 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path79206-5-4-1"/>
+        <path id="path79208-2-3-6" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.22392,7954.7662 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path79210-2-8-7" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.17483,7936.9633 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.1749,7940.1968 0,-0.4635 2.11403,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path79212-5-9-7"/>
+        <path id="path79214-4-9-9" style="fill:url(#linearGradient146490-7);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.50041842" d="m 441.70238,7936.6931 31.74661,0 -0.11348,4.0591 -31.74662,0 z" inkscape:connector-curvature="0"/>
+        <g id="g79216-6-5-8" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" transform="matrix(0.14942814,0,-0.03044284,0.12343177,389.80533,6871.1352)">
+          <path inkscape:connector-curvature="0" d="m 2304.2619,8640.1281 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z m -6.9816,6.5971 -2.8381,-7.9403 1.7386,0 2.0094,5.8767 1.9445,-5.8767 1.7007,0 -2.8436,7.9403 z m -10.0472,-7.9403 2.9302,0 c 0.6608,0 1.1645,0.05 1.5111,0.1516 0.4658,0.1373 0.8648,0.381 1.197,0.7312 0.3322,0.3503 0.585,0.7791 0.7583,1.2864 0.1733,0.5073 0.26,1.1329 0.26,1.8767 0,0.6536 -0.081,1.2169 -0.2437,1.6899 -0.1986,0.5778 -0.4821,1.0454 -0.8504,1.4028 -0.278,0.2709 -0.6536,0.4821 -1.1266,0.6338 -0.3538,0.1119 -0.8269,0.1679 -1.419,0.1679 l -3.0169,0 z m 1.6032,1.3432 0,5.2592 1.197,0 c 0.4477,0 0.7709,-0.025 0.9695,-0.076 0.26,-0.065 0.4757,-0.1751 0.6473,-0.3304 0.1715,-0.1553 0.3114,-0.4107 0.4197,-0.7664 0.1083,-0.3557 0.1625,-0.8404 0.1625,-1.4543 0,-0.6138 -0.054,-1.085 -0.1625,-1.4136 -0.1083,-0.3286 -0.26,-0.585 -0.4549,-0.7691 -0.195,-0.1842 -0.4424,-0.3088 -0.7421,-0.3738 -0.2239,-0.05 -0.6626,-0.076 -1.3161,-0.076 z" style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Arial Bold" id="path79218-2-4-3"/>
         </g>
-        <path
-           inkscape:connector-curvature="0"
-           id="path79220-7-1-0"
-           d="m 470.27084,7938.8832 c -1.08707,0 -1.96833,0.1211 -1.96833,0.2713 0,0.15 0.88126,0.2712 1.96833,0.2712 1.08709,0 1.96834,-0.1212 1.96834,-0.2712 0,-0.1502 -0.88125,-0.2713 -1.96834,-0.2713 z m 0,0.1961 c 0.30515,0 0.55253,0.034 0.55253,0.075 0,0.042 -0.24738,0.075 -0.55253,0.075 -0.30514,0 -0.55251,-0.034 -0.55251,-0.075 0,-0.042 0.24737,-0.075 0.55251,-0.075 z"
-           style="fill:#ffffff;stroke:none" />
-        <text
-           transform="scale(1.0170762,0.9832105)"
-           sodipodi:linespacing="125%"
-           id="text79222-6-7-1"
-           y="8075.6997"
-           x="461.62274"
-           style="font-size:0.64422148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="8075.6997"
-             x="461.62274"
-             id="tspan79224-2-3-6"
-             sodipodi:role="line">ROM</tspan></text>
-        <g
-           style="fill:#ffffff"
-           id="g79226-0-9-6"
-           transform="matrix(0.02255355,0,0,-0.02180257,456.42108,7940.9283)">
-          <g
-             style="fill:#ffffff"
-             transform="translate(8.50391,150.1943)"
-             id="g79228-7-8-5">
-            <path
-               id="path79230-5-8-6"
-               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-               d="m 121.00809,-7.9961 c 0,0 -4.304,0 -4.304,0 0,0 0,5.5352 0,5.5352 0,0 4.458,0 4.458,0 2.152,0 3.229,-0.8721 3.229,-2.6113 0,-1.9522 -1.13,-2.9239 -3.383,-2.9239 z m 34.29,-2.7656 c -0.617,-3.0781 -2.206,-4.6123 -4.768,-4.6123 -3.587,0 -5.381,2.252 -5.381,6.7647 0,4.4043 1.794,6.6113 5.381,6.6113 2.562,0 4.101,-1.1309 4.613,-3.3828 0,0 2.153,0 2.153,0 -0.718,3.5869 -2.975,5.3808 -6.766,5.3808 -5.126,0 -7.687,-2.8701 -7.687,-8.6093 0,-5.7432 2.457,-8.6133 7.379,-8.6133 4.204,0 6.611,2.1523 7.228,6.4609 0,0 -2.152,0 -2.152,0 z M 82.41409,0 c -5.3311,0 -7.9951,-2.8701 -7.9951,-8.6093 0,-5.7432 2.664,-8.6133 7.9951,-8.6133 5.331,0 7.9961,2.8701 7.9961,8.6133 0,5.7392 -2.6651,8.6093 -7.9961,8.6093 z m -12.9131,-10.7617 c -0.5166,-3.0781 -2.0528,-4.6123 -4.6133,-4.6123 -3.6914,0 -5.5352,2.252 -5.5352,6.7647 0,4.4043 1.794,6.6113 5.3809,6.6113 2.5615,0 4.0996,-1.1309 4.6133,-3.3828 0,0 2.1523,0 2.1523,0 C 71.08989,-1.7939 68.83299,0 64.73339,0 c -5.0215,0 -7.5332,-2.8701 -7.5332,-8.6093 0,-5.7432 2.4072,-8.6133 7.2246,-8.6133 4.2041,0 6.6113,2.1523 7.2285,6.4609 0,0 -2.1523,0 -2.1523,0 z m 102.4011,10.3028 c 0,0 -13.221,0 -13.221,0 0,0 0,-2.002 0,-2.002 0,0 5.534,0 5.534,0 0,0 0,-14.4522 0,-14.4522 0,0 2.152,0 2.152,0 0,0 0,14.4522 0,14.4522 0,0 5.535,0 5.535,0 0,0 0,2.002 0,2.002 z m -35.824,0 c 0,0 -2.461,0 -2.461,0 0,0 -6.148,-16.4542 -6.148,-16.4542 0,0 2.302,0 2.302,0 0,0 1.694,4.7667 1.694,4.7667 0,0 6.611,0 6.611,0 0,0 1.539,-4.7667 1.539,-4.7667 0,0 2.461,0 2.461,0 0,0 -5.998,16.4542 -5.998,16.4542 z m -14.298,0 c 0,0 -7.228,0 -7.228,0 0,0 0,-16.4542 0,-16.4542 0,0 2.152,0 2.152,0 0,0 0,6.919 0,6.919 0,0 5.076,0 5.076,0 3.279,0 4.917,1.6396 4.917,4.9219 0,3.0742 -1.638,4.6133 -4.917,4.6133 z m -11.996,0 c 0,0 -3.074,0 -3.074,0 0,0 -4.768,-13.8399 -4.768,-13.8399 0,0 -4.612,13.8399 -4.612,13.8399 0,0 -3.229,0 -3.229,0 0,0 0,-16.4542 0,-16.4542 0,0 2.153,0 2.153,0 0,0 0,13.6836 0,13.6836 0,0 4.612,-13.6836 4.612,-13.6836 0,0 2.152,0 2.152,0 0,0 4.768,13.8389 4.768,13.8389 0,0 -0.154,-4.1504 -0.154,-4.1504 0,0 0,-9.6885 0,-9.6885 0,0 2.152,0 2.152,0 0,0 0,16.4542 0,16.4542 z m -61.8095,-2.9239 c 0,1.2305 -0.6172,1.8477 -1.8476,1.8477 0,0 -16.7598,0 -16.7598,0 -1.2295,0 -1.8428,-0.6172 -1.8428,-1.8477 0,0 0,-17.372 0,-17.372 0,-0.8223 -0.4131,-1.2315 -1.2304,-1.2315 0,0 -15.375,0 -15.375,0 -3.1778,0 -5.793,-1.0508 -7.8448,-3.1523 C 1.02148,-27.2412 0,-29.8808 0,-33.0595 c 0,0 0,-38.2848 0,-38.2848 0,-3.079 1.05078,-5.69 3.15329,-7.842 2.1026,-2.153 4.6875,-3.229 7.7657,-3.229 0,0 35.208,0 35.208,0 1.2304,0 1.8476,0.663 1.8476,1.998 0,0 0,77.0345 0,77.0345 z m 127.7735,-53.6601 c 0,1.331 -0.617,1.998 -1.848,1.998 0,0 -15.374,0 -15.374,0 -1.335,0 -1.998,-0.667 -1.998,-1.998 0,0 0,-8.9174 0,-8.9174 0,-2.565 -1.23,-3.845 -3.691,-3.845 -2.566,0 -3.846,1.28 -3.846,3.845 0,0 0,27.3656 0,27.3656 0,2.5615 1.28,3.8457 3.846,3.8457 2.461,0 3.691,-1.2842 3.691,-3.8457 0,0 0,-7.2236 0,-7.2236 0,-1.2344 0.663,-1.8477 1.998,-1.8477 0,0 15.374,0 15.374,0 1.231,0 1.848,0.6133 1.848,1.8477 0,0 0,12.7588 0,12.7588 0,3.0742 -1.076,5.6894 -3.229,7.8418 -2.152,2.1523 -4.767,3.2314 -7.84,3.2314 0,0 -23.679,0 -23.679,0 -3.078,0 -5.693,-1.0791 -7.846,-3.2314 -2.152,-2.1524 -3.228,-4.7676 -3.228,-7.8418 0,0 0,-38.1308 0,-38.1308 0,-3.179 1.05,-5.844 3.153,-7.996 2.103,-2.153 4.742,-3.229 7.921,-3.229 0,0 23.679,0 23.679,0 3.173,0 5.813,1.076 7.916,3.229 2.102,2.152 3.153,4.817 3.153,7.996 0,0 0,14.1474 0,14.1474 z m -50.895,3.2285 c 0,3.0742 -1.076,5.6894 -3.227,7.8418 -2.152,2.1513 -4.768,3.2285 -7.842,3.2285 0,0 -14.303,0 -14.303,0 -1.538,0 -2.305,0.7676 -2.305,2.3057 0,1.6396 0.767,2.4619 2.305,2.4619 0,0 21.527,0 21.527,0 1.23,0 1.847,0.6123 1.847,1.8427 0,0 0,12.3008 0,12.3008 0,1.2305 -0.617,1.8467 -1.847,1.8467 0,0 -30.4436,0 -30.4436,0 -3.0782,0 -5.6895,-1.0791 -7.8418,-3.2314 -2.1514,-2.1524 -3.2286,-4.7676 -3.2286,-7.8418 0,0 0,-16.2959 0,-16.2959 0,-3.0782 1.0772,-5.6895 3.2286,-7.8419 2.1523,-2.152 4.7636,-3.228 7.8418,-3.228 0,0 14.3016,0 14.3016,0 1.944,0 2.92,-1.026 2.92,-3.079 0,-1.842 -0.976,-2.764 -2.92,-2.764 0,0 -23.5282,0 -23.5282,0 -1.2305,0 -1.8438,-0.668 -1.8438,-1.998 0,0 0,-12.151 0,-12.151 0,-1.335 0.6133,-1.998 1.8438,-1.998 0,0 32.4462,0 32.4462,0 3.174,0 5.815,1.076 7.916,3.229 2.103,2.152 3.153,4.817 3.153,7.996 0,0 0,17.3759 0,17.3759 z m 46.59,-51.5119 c 0,0 -9.843,0 -9.843,0 0,0 0,5.535 0,5.535 0,0 8.917,0 8.917,0 0,0 0,1.848 0,1.848 0,0 -8.917,0 -8.917,0 0,0 0,5.072 0,5.072 0,0 9.689,0 9.689,0 0,0 0,2.002 0,2.002 0,0 -11.841,0 -11.841,0 0,0 0,-16.3 0,-16.3 0,0 11.995,0 11.995,0 0,0 0,1.843 0,1.843 z m -15.991,6.766 c 0,0 -7.228,0 -7.228,0 0,0 0,-1.844 0,-1.844 0,0 5.076,0 5.076,0 0,-3.587 -1.694,-5.38 -5.076,-5.38 -3.587,0 -5.381,2.252 -5.381,6.765 0,4.404 1.794,6.611 5.381,6.611 2.665,0 4.254,-1.131 4.767,-3.383 0,0 2.152,0 2.152,0 -0.409,3.587 -2.715,5.381 -6.919,5.381 -5.126,0 -7.687,-2.87 -7.687,-8.609 0,-2.869 0.742,-5.026 2.227,-6.461 1.485,-1.435 3.253,-2.152 5.305,-2.152 2.461,0 4.255,0.872 5.385,2.615 0,0 0.613,-2.152 0.613,-2.152 0,0 1.385,0 1.385,0 0,0 0,8.609 0,8.609 z m -21.526,7.691 c 0,0 -2.461,0 -2.461,0 0,0 -6.303,-16.3 -6.303,-16.3 0,0 2.307,0 2.307,0 0,0 1.689,4.613 1.689,4.613 0,0 6.611,0 6.611,0 0,0 1.694,-4.613 1.694,-4.613 0,0 2.306,0 2.306,0 0,0 -5.843,16.3 -5.843,16.3 z m -9.227,-15.991 c -0.513,0.2 -0.767,0.763 -0.767,1.688 0,0 -0.155,2.924 -0.155,2.924 -0.103,1.331 -0.771,2.358 -1.997,3.075 1.534,0.817 2.306,2.102 2.306,3.845 0,2.97 -1.797,4.459 -5.385,4.459 0,0 -7.686,0 -7.686,0 0,0 0,-16.3 0,-16.3 0,0 2.306,0 2.306,0 0,0 0,6.919 0,6.919 0,0 5.38,0 5.38,0 1.844,0 2.82,-0.975 2.925,-2.923 0,0 0.304,-3.996 0.304,-3.996 0,0 2.769,0.309 2.769,0.309 z m -23.833,16.45 c -5.33,0 -7.995,-2.87 -7.995,-8.609 0,-2.461 0.718,-4.513 2.152,-6.153 1.435,-1.642 3.382,-2.46 5.843,-2.46 5.331,0 7.996,2.87 7.996,8.613 0,5.739 -2.665,8.609 -7.996,8.609 z m -7.995,-0.459 c 0,0 -13.377,0 -13.377,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.1523,0 2.1523,0 0,0 0,14.298 0,14.298 0,0 5.5352,0 5.5352,0 0,0 0,2.002 0,2.002 z m -17.5264,-7.383 c 0,0 -4.6132,1.077 -4.6132,1.077 -1.335,0.308 -2.002,0.971 -2.002,1.998 0,1.947 1.2295,2.923 3.6904,2.923 2.7696,0 4.1543,-1.13 4.1543,-3.382 0,0 1.9981,0 1.9981,0 0,3.482 -2.1016,5.226 -6.3057,5.226 -3.7959,0 -5.6894,-1.693 -5.6894,-5.072 0,-2.052 1.1767,-3.337 3.5371,-3.846 0,0 3.2275,-0.767 3.2275,-0.767 2.3564,-0.517 3.5371,-1.49 3.5371,-2.924 0,-1.844 -1.4346,-2.765 -4.3047,-2.765 -2.9726,0 -4.458,1.28 -4.458,3.841 0,0 -1.998,0 -1.998,0 0,-3.796 2.1523,-5.689 6.456,-5.689 4.3047,0 6.4571,1.639 6.4571,4.921 0,2.357 -1.2305,3.842 -3.6866,4.459 z m -24.6054,7.383 c 0,0 -2.4561,0 -2.4561,0 0,0 -6.1523,-16.3 -6.1523,-16.3 0,0 2.3066,0 2.3066,0 0,0 1.6895,4.613 1.6895,4.613 0,0 6.6152,0 6.6152,0 0,0 1.5342,-4.613 1.5342,-4.613 0,0 2.4609,0 2.4609,0 0,0 -5.998,16.3 -5.998,16.3 z m -5.6885,0 c 0,0 -13.376,0 -13.376,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.3056,0 2.3056,0 0,0 0,14.298 0,14.298 0,0 5.3809,0 5.3809,0 0,0 0,2.002 0,2.002 z m -17.5264,0 c 0,0 -2.6152,0 -2.6152,0 0,0 -6.1485,-16.3 -6.1485,-16.3 0,0 2.3067,0 2.3067,0 0,0 1.6894,4.613 1.6894,4.613 0,0 6.6104,0 6.6104,0 0,0 1.6934,-4.613 1.6934,-4.613 0,0 2.4619,0 2.4619,0 0,0 -5.9981,16.3 -5.9981,16.3 z m -16.9131,0 c 0,0 -6.7656,0 -6.7656,0 0,0 0,-16.3 0,-16.3 0,0 6.6104,0 6.6104,0 4.6142,0 6.9199,2.765 6.9199,8.304 0,5.331 -2.2559,7.996 -6.7647,7.996 z m 121.4668,80.7209 c 0,0 2.77,7.2285 2.77,7.2285 0,0 2.306,-7.2285 2.306,-7.2285 0,0 -5.076,0 -5.076,0 z m -49.664,-5.2256 c -3.7959,0 -5.6885,2.252 -5.6885,6.7647 0,4.4043 1.8926,6.6113 5.6885,6.6113 3.792,0 5.6894,-2.207 5.6894,-6.6113 0,-4.5127 -1.8974,-6.7647 -5.6894,-6.7647 z m -38.8985,-63.5043 c 0,0 -32.5966,0 -32.5966,0 -2.1553,0 -3.9493,0.718 -5.3838,2.153 -1.4356,1.434 -2.1524,3.228 -2.1524,5.381 0,0 0,38.2848 0,38.2848 0,2.1523 0.7168,3.9502 2.1524,5.3847 1.4345,1.4346 3.2285,2.1524 5.3838,2.1524 0,0 18.1445,0 18.1445,0 1.2265,0 1.8437,0.6631 1.8437,1.998 0,0 0,17.376 0,17.376 0,0.8174 0.4082,1.2305 1.2305,1.2305 0,0 11.3779,0 11.3779,0 0.7178,-0.7168 1.0762,-1.1309 1.0762,-1.2305 0,0 0,-71.6529 0,-71.6529 0,-0.208 -0.3584,-0.568 -1.0762,-1.077 z m 126.6185,2.228 c -1.485,-1.485 -3.304,-2.228 -5.455,-2.228 0,0 -23.679,0 -23.679,0 -2.156,0 -4.005,0.743 -5.539,2.228 -1.535,1.484 -2.303,3.308 -2.303,5.46 0,0 0,38.1308 0,38.1308 0,2.1523 0.768,3.9502 2.303,5.3847 1.534,1.4346 3.383,2.1524 5.539,2.1524 0,0 23.679,0 23.679,0 2.252,0 4.099,-0.6924 5.534,-2.0772 1.435,-1.3847 2.152,-3.207 2.152,-5.4599 0,0 0,-10.1475 0,-10.1475 0,-0.7178 -0.358,-1.0771 -1.076,-1.0771 0,0 -10.147,0 -10.147,0 -0.718,0 -1.077,0.3593 -1.077,1.0771 0,0 0,4.6123 0,4.6123 0,2.0527 -0.692,3.7666 -2.077,5.1514 -1.385,1.3847 -3.103,2.0771 -5.151,2.0771 -2.052,0 -3.767,-0.6924 -5.152,-2.0771 -1.384,-1.3848 -2.077,-3.0987 -2.077,-5.1514 0,0 0,-27.3656 0,-27.3656 0,-2.052 0.693,-3.77 2.077,-5.155 1.385,-1.385 3.1,-2.073 5.152,-2.073 2.048,0 3.766,0.688 5.151,2.073 1.385,1.385 2.077,3.103 2.077,5.155 0,0 0,6.456 0,6.456 0,0.718 0.359,1.077 1.077,1.077 0,0 10.147,0 10.147,0 0.205,0 0.563,-0.359 1.076,-1.077 0,0 0,-11.686 0,-11.686 0,-2.152 -0.746,-3.976 -2.231,-5.46 z m -50.895,0 c -1.484,-1.485 -3.303,-2.228 -5.455,-2.228 0,0 -29.6767,0 -29.6767,0 -0.8213,0 -1.2304,0.36 -1.2304,1.077 0,0 0,6.919 0,6.919 0,0.717 0.4091,1.077 1.2304,1.077 0,0 20.7587,0 20.7587,0 1.739,0 3.225,0.613 4.455,1.843 1.231,1.231 1.848,2.715 1.848,4.458 0,1.844 -0.593,3.383 -1.769,4.614 -1.18,1.23 -2.69,1.8474 -4.534,1.8474 0,0 -14.3016,0 -14.3016,0 -2.1524,0 -3.9746,0.7422 -5.46,2.2275 -1.4854,1.4854 -2.2275,3.3076 -2.2275,5.46 0,0 0,16.2959 0,16.2959 0,2.1523 0.7421,3.9502 2.2275,5.3847 1.4854,1.4346 3.3076,2.1524 5.46,2.1524 0,0 27.6786,0 27.6786,0 0.717,0 1.076,-0.3584 1.076,-1.0762 0,0 0,-6.7656 0,-6.7656 0,-0.8213 -0.359,-1.2305 -1.076,-1.2305 0,0 -18.762,0 -18.762,0 -3.795,0 -5.688,-1.9473 -5.688,-5.8437 0,-1.5381 0.562,-2.8741 1.689,-3.9991 1.126,-1.1259 2.461,-1.6894 3.999,-1.6894 0,0 14.303,0 14.303,0 2.048,0 3.842,-0.7715 5.381,-2.3067 1.534,-1.539 2.306,-3.333 2.306,-5.3808 0,0 0,-17.3759 0,-17.3759 0,-2.152 -0.746,-3.976 -2.232,-5.46 z m -46.6649,-5.765 c 0,0 -16.7588,0 -16.7588,0 -1.2304,0 -1.8427,0.663 -1.8427,1.998 0,0 0,56.5843 0,56.5843 0,1.2305 0.6123,1.8467 1.8427,1.8467 0,0 16.7588,0 16.7588,0 1.2266,0 1.8448,-0.6162 1.8448,-1.8467 0,0 0,-56.5843 0,-56.5843 0,-1.335 -0.6182,-1.998 -1.8448,-1.998 z m 45.9729,-15.837 c 0,0 -5.226,0 -5.226,0 0,0 0,5.536 0,5.536 0,0 5.535,0 5.535,0 1.948,0 2.924,-0.922 2.924,-2.766 0,-1.848 -1.081,-2.77 -3.233,-2.77 z m 11.379,-2.152 c 0,0 2.615,7.229 2.615,7.229 0,0 2.461,-7.229 2.461,-7.229 0,0 -5.076,0 -5.076,0 z m -83.182,0 c 0,0 2.7647,7.229 2.7647,7.229 0,0 2.3076,-7.229 2.3076,-7.229 0,0 -5.0723,0 -5.0723,0 z m -23.2197,0 c 0,0 2.6153,7.229 2.6153,7.229 0,0 2.4609,-7.229 2.4609,-7.229 0,0 -5.0762,0 -5.0762,0 z m -13.0683,-4.922 c 0,0 -4.3037,0 -4.3037,0 0,0 0,12.61 0,12.61 0,0 3.996,0 3.996,0 3.3819,0 5.0752,-2.103 5.0752,-6.303 0,-4.204 -1.5888,-6.307 -4.7675,-6.307 z m 90.41,-0.458 c -3.795,0 -5.688,2.252 -5.688,6.765 0,4.404 1.893,6.611 5.688,6.611 3.897,0 5.844,-2.207 5.844,-6.611 0,-4.513 -1.947,-6.765 -5.844,-6.765 z m -29.83,79.1857 c 0,0.7178 -0.3593,1.0762 -1.0771,1.0762 0,0 -11.3779,0 -11.3779,0 -0.7178,0 -1.0762,-0.3584 -1.0762,-1.0762 0,0 0,-51.2027 0,-51.2027 0,-0.717 0.3584,-1.077 1.0762,-1.077 0,0 11.3779,0 11.3779,0 0.7178,0 1.0771,0.36 1.0771,1.077 0,0 0,51.2027 0,51.2027 z m -39.9755,-11.6875 c 0,1.9443 -0.6915,3.6123 -2.0762,4.9971 -1.3858,1.3847 -3.0537,2.0771 -4.9971,2.0771 -1.9482,0 -3.5869,-0.6924 -4.9219,-2.0771 -1.3339,-1.3848 -1.998,-3.0528 -1.998,-4.9971 0,0 0,-28.1372 0,-28.1372 0,-2.052 0.6377,-3.742 1.9228,-5.076 1.2813,-1.335 2.9454,-1.998 4.9971,-1.998 1.9434,0 3.6113,0.693 4.9971,2.077 1.3847,1.385 2.0762,3.049 2.0762,4.997 0,0 0,28.1372 0,28.1372 z m -7.0733,-31.6742 c -2.3613,0 -3.5371,1.176 -3.5371,3.537 0,0 0,28.1372 0,28.1372 0,2.3564 1.1758,3.5371 3.5371,3.5371 2.2529,0 3.3828,-1.1807 3.3828,-3.5371 0,0 0,-28.1372 0,-28.1372 0,-2.361 -1.1299,-3.537 -3.3828,-3.537 z"
-               inkscape:connector-curvature="0" />
+        <path inkscape:connector-curvature="0" id="path79220-7-1-0" d="m 470.27084,7938.8832 c -1.08707,0 -1.96833,0.1211 -1.96833,0.2713 0,0.15 0.88126,0.2712 1.96833,0.2712 1.08709,0 1.96834,-0.1212 1.96834,-0.2712 0,-0.1502 -0.88125,-0.2713 -1.96834,-0.2713 z m 0,0.1961 c 0.30515,0 0.55253,0.034 0.55253,0.075 0,0.042 -0.24738,0.075 -0.55253,0.075 -0.30514,0 -0.55251,-0.034 -0.55251,-0.075 0,-0.042 0.24737,-0.075 0.55251,-0.075 z" style="fill:#ffffff;stroke:none"/>
+        <text transform="scale(1.0170762,0.9832105)" sodipodi:linespacing="125%" id="text79222-6-7-1" y="8075.6997" x="461.62274" style="font-size:0.64422148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="8075.6997" x="461.62274" id="tspan79224-2-3-6" sodipodi:role="line">ROM</tspan></text>
+        <g style="fill:#ffffff" id="g79226-0-9-6" transform="matrix(0.02255355,0,0,-0.02180257,456.42108,7940.9283)">
+          <g style="fill:#ffffff" transform="translate(8.50391,150.1943)" id="g79228-7-8-5">
+            <path id="path79230-5-8-6" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 121.00809,-7.9961 c 0,0 -4.304,0 -4.304,0 0,0 0,5.5352 0,5.5352 0,0 4.458,0 4.458,0 2.152,0 3.229,-0.8721 3.229,-2.6113 0,-1.9522 -1.13,-2.9239 -3.383,-2.9239 z m 34.29,-2.7656 c -0.617,-3.0781 -2.206,-4.6123 -4.768,-4.6123 -3.587,0 -5.381,2.252 -5.381,6.7647 0,4.4043 1.794,6.6113 5.381,6.6113 2.562,0 4.101,-1.1309 4.613,-3.3828 0,0 2.153,0 2.153,0 -0.718,3.5869 -2.975,5.3808 -6.766,5.3808 -5.126,0 -7.687,-2.8701 -7.687,-8.6093 0,-5.7432 2.457,-8.6133 7.379,-8.6133 4.204,0 6.611,2.1523 7.228,6.4609 0,0 -2.152,0 -2.152,0 z M 82.41409,0 c -5.3311,0 -7.9951,-2.8701 -7.9951,-8.6093 0,-5.7432 2.664,-8.6133 7.9951,-8.6133 5.331,0 7.9961,2.8701 7.9961,8.6133 0,5.7392 -2.6651,8.6093 -7.9961,8.6093 z m -12.9131,-10.7617 c -0.5166,-3.0781 -2.0528,-4.6123 -4.6133,-4.6123 -3.6914,0 -5.5352,2.252 -5.5352,6.7647 0,4.4043 1.794,6.6113 5.3809,6.6113 2.5615,0 4.0996,-1.1309 4.6133,-3.3828 0,0 2.1523,0 2.1523,0 C 71.08989,-1.7939 68.83299,0 64.73339,0 c -5.0215,0 -7.5332,-2.8701 -7.5332,-8.6093 0,-5.7432 2.4072,-8.6133 7.2246,-8.6133 4.2041,0 6.6113,2.1523 7.2285,6.4609 0,0 -2.1523,0 -2.1523,0 z m 102.4011,10.3028 c 0,0 -13.221,0 -13.221,0 0,0 0,-2.002 0,-2.002 0,0 5.534,0 5.534,0 0,0 0,-14.4522 0,-14.4522 0,0 2.152,0 2.152,0 0,0 0,14.4522 0,14.4522 0,0 5.535,0 5.535,0 0,0 0,2.002 0,2.002 z m -35.824,0 c 0,0 -2.461,0 -2.461,0 0,0 -6.148,-16.4542 -6.148,-16.4542 0,0 2.302,0 2.302,0 0,0 1.694,4.7667 1.694,4.7667 0,0 6.611,0 6.611,0 0,0 1.539,-4.7667 1.539,-4.7667 0,0 2.461,0 2.461,0 0,0 -5.998,16.4542 -5.998,16.4542 z m -14.298,0 c 0,0 -7.228,0 -7.228,0 0,0 0,-16.4542 0,-16.4542 0,0 2.152,0 2.152,0 0,0 0,6.919 0,6.919 0,0 5.076,0 5.076,0 3.279,0 4.917,1.6396 4.917,4.9219 0,3.0742 -1.638,4.6133 -4.917,4.6133 z m -11.996,0 c 0,0 -3.074,0 -3.074,0 0,0 -4.768,-13.8399 -4.768,-13.8399 0,0 -4.612,13.8399 -4.612,13.8399 0,0 -3.229,0 -3.229,0 0,0 0,-16.4542 0,-16.4542 0,0 2.153,0 2.153,0 0,0 0,13.6836 0,13.6836 0,0 4.612,-13.6836 4.612,-13.6836 0,0 2.152,0 2.152,0 0,0 4.768,13.8389 4.768,13.8389 0,0 -0.154,-4.1504 -0.154,-4.1504 0,0 0,-9.6885 0,-9.6885 0,0 2.152,0 2.152,0 0,0 0,16.4542 0,16.4542 z m -61.8095,-2.9239 c 0,1.2305 -0.6172,1.8477 -1.8476,1.8477 0,0 -16.7598,0 -16.7598,0 -1.2295,0 -1.8428,-0.6172 -1.8428,-1.8477 0,0 0,-17.372 0,-17.372 0,-0.8223 -0.4131,-1.2315 -1.2304,-1.2315 0,0 -15.375,0 -15.375,0 -3.1778,0 -5.793,-1.0508 -7.8448,-3.1523 C 1.02148,-27.2412 0,-29.8808 0,-33.0595 c 0,0 0,-38.2848 0,-38.2848 0,-3.079 1.05078,-5.69 3.15329,-7.842 2.1026,-2.153 4.6875,-3.229 7.7657,-3.229 0,0 35.208,0 35.208,0 1.2304,0 1.8476,0.663 1.8476,1.998 0,0 0,77.0345 0,77.0345 z m 127.7735,-53.6601 c 0,1.331 -0.617,1.998 -1.848,1.998 0,0 -15.374,0 -15.374,0 -1.335,0 -1.998,-0.667 -1.998,-1.998 0,0 0,-8.9174 0,-8.9174 0,-2.565 -1.23,-3.845 -3.691,-3.845 -2.566,0 -3.846,1.28 -3.846,3.845 0,0 0,27.3656 0,27.3656 0,2.5615 1.28,3.8457 3.846,3.8457 2.461,0 3.691,-1.2842 3.691,-3.8457 0,0 0,-7.2236 0,-7.2236 0,-1.2344 0.663,-1.8477 1.998,-1.8477 0,0 15.374,0 15.374,0 1.231,0 1.848,0.6133 1.848,1.8477 0,0 0,12.7588 0,12.7588 0,3.0742 -1.076,5.6894 -3.229,7.8418 -2.152,2.1523 -4.767,3.2314 -7.84,3.2314 0,0 -23.679,0 -23.679,0 -3.078,0 -5.693,-1.0791 -7.846,-3.2314 -2.152,-2.1524 -3.228,-4.7676 -3.228,-7.8418 0,0 0,-38.1308 0,-38.1308 0,-3.179 1.05,-5.844 3.153,-7.996 2.103,-2.153 4.742,-3.229 7.921,-3.229 0,0 23.679,0 23.679,0 3.173,0 5.813,1.076 7.916,3.229 2.102,2.152 3.153,4.817 3.153,7.996 0,0 0,14.1474 0,14.1474 z m -50.895,3.2285 c 0,3.0742 -1.076,5.6894 -3.227,7.8418 -2.152,2.1513 -4.768,3.2285 -7.842,3.2285 0,0 -14.303,0 -14.303,0 -1.538,0 -2.305,0.7676 -2.305,2.3057 0,1.6396 0.767,2.4619 2.305,2.4619 0,0 21.527,0 21.527,0 1.23,0 1.847,0.6123 1.847,1.8427 0,0 0,12.3008 0,12.3008 0,1.2305 -0.617,1.8467 -1.847,1.8467 0,0 -30.4436,0 -30.4436,0 -3.0782,0 -5.6895,-1.0791 -7.8418,-3.2314 -2.1514,-2.1524 -3.2286,-4.7676 -3.2286,-7.8418 0,0 0,-16.2959 0,-16.2959 0,-3.0782 1.0772,-5.6895 3.2286,-7.8419 2.1523,-2.152 4.7636,-3.228 7.8418,-3.228 0,0 14.3016,0 14.3016,0 1.944,0 2.92,-1.026 2.92,-3.079 0,-1.842 -0.976,-2.764 -2.92,-2.764 0,0 -23.5282,0 -23.5282,0 -1.2305,0 -1.8438,-0.668 -1.8438,-1.998 0,0 0,-12.151 0,-12.151 0,-1.335 0.6133,-1.998 1.8438,-1.998 0,0 32.4462,0 32.4462,0 3.174,0 5.815,1.076 7.916,3.229 2.103,2.152 3.153,4.817 3.153,7.996 0,0 0,17.3759 0,17.3759 z m 46.59,-51.5119 c 0,0 -9.843,0 -9.843,0 0,0 0,5.535 0,5.535 0,0 8.917,0 8.917,0 0,0 0,1.848 0,1.848 0,0 -8.917,0 -8.917,0 0,0 0,5.072 0,5.072 0,0 9.689,0 9.689,0 0,0 0,2.002 0,2.002 0,0 -11.841,0 -11.841,0 0,0 0,-16.3 0,-16.3 0,0 11.995,0 11.995,0 0,0 0,1.843 0,1.843 z m -15.991,6.766 c 0,0 -7.228,0 -7.228,0 0,0 0,-1.844 0,-1.844 0,0 5.076,0 5.076,0 0,-3.587 -1.694,-5.38 -5.076,-5.38 -3.587,0 -5.381,2.252 -5.381,6.765 0,4.404 1.794,6.611 5.381,6.611 2.665,0 4.254,-1.131 4.767,-3.383 0,0 2.152,0 2.152,0 -0.409,3.587 -2.715,5.381 -6.919,5.381 -5.126,0 -7.687,-2.87 -7.687,-8.609 0,-2.869 0.742,-5.026 2.227,-6.461 1.485,-1.435 3.253,-2.152 5.305,-2.152 2.461,0 4.255,0.872 5.385,2.615 0,0 0.613,-2.152 0.613,-2.152 0,0 1.385,0 1.385,0 0,0 0,8.609 0,8.609 z m -21.526,7.691 c 0,0 -2.461,0 -2.461,0 0,0 -6.303,-16.3 -6.303,-16.3 0,0 2.307,0 2.307,0 0,0 1.689,4.613 1.689,4.613 0,0 6.611,0 6.611,0 0,0 1.694,-4.613 1.694,-4.613 0,0 2.306,0 2.306,0 0,0 -5.843,16.3 -5.843,16.3 z m -9.227,-15.991 c -0.513,0.2 -0.767,0.763 -0.767,1.688 0,0 -0.155,2.924 -0.155,2.924 -0.103,1.331 -0.771,2.358 -1.997,3.075 1.534,0.817 2.306,2.102 2.306,3.845 0,2.97 -1.797,4.459 -5.385,4.459 0,0 -7.686,0 -7.686,0 0,0 0,-16.3 0,-16.3 0,0 2.306,0 2.306,0 0,0 0,6.919 0,6.919 0,0 5.38,0 5.38,0 1.844,0 2.82,-0.975 2.925,-2.923 0,0 0.304,-3.996 0.304,-3.996 0,0 2.769,0.309 2.769,0.309 z m -23.833,16.45 c -5.33,0 -7.995,-2.87 -7.995,-8.609 0,-2.461 0.718,-4.513 2.152,-6.153 1.435,-1.642 3.382,-2.46 5.843,-2.46 5.331,0 7.996,2.87 7.996,8.613 0,5.739 -2.665,8.609 -7.996,8.609 z m -7.995,-0.459 c 0,0 -13.377,0 -13.377,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.1523,0 2.1523,0 0,0 0,14.298 0,14.298 0,0 5.5352,0 5.5352,0 0,0 0,2.002 0,2.002 z m -17.5264,-7.383 c 0,0 -4.6132,1.077 -4.6132,1.077 -1.335,0.308 -2.002,0.971 -2.002,1.998 0,1.947 1.2295,2.923 3.6904,2.923 2.7696,0 4.1543,-1.13 4.1543,-3.382 0,0 1.9981,0 1.9981,0 0,3.482 -2.1016,5.226 -6.3057,5.226 -3.7959,0 -5.6894,-1.693 -5.6894,-5.072 0,-2.052 1.1767,-3.337 3.5371,-3.846 0,0 3.2275,-0.767 3.2275,-0.767 2.3564,-0.517 3.5371,-1.49 3.5371,-2.924 0,-1.844 -1.4346,-2.765 -4.3047,-2.765 -2.9726,0 -4.458,1.28 -4.458,3.841 0,0 -1.998,0 -1.998,0 0,-3.796 2.1523,-5.689 6.456,-5.689 4.3047,0 6.4571,1.639 6.4571,4.921 0,2.357 -1.2305,3.842 -3.6866,4.459 z m -24.6054,7.383 c 0,0 -2.4561,0 -2.4561,0 0,0 -6.1523,-16.3 -6.1523,-16.3 0,0 2.3066,0 2.3066,0 0,0 1.6895,4.613 1.6895,4.613 0,0 6.6152,0 6.6152,0 0,0 1.5342,-4.613 1.5342,-4.613 0,0 2.4609,0 2.4609,0 0,0 -5.998,16.3 -5.998,16.3 z m -5.6885,0 c 0,0 -13.376,0 -13.376,0 0,0 0,-2.002 0,-2.002 0,0 5.6895,0 5.6895,0 0,0 0,-14.298 0,-14.298 0,0 2.3056,0 2.3056,0 0,0 0,14.298 0,14.298 0,0 5.3809,0 5.3809,0 0,0 0,2.002 0,2.002 z m -17.5264,0 c 0,0 -2.6152,0 -2.6152,0 0,0 -6.1485,-16.3 -6.1485,-16.3 0,0 2.3067,0 2.3067,0 0,0 1.6894,4.613 1.6894,4.613 0,0 6.6104,0 6.6104,0 0,0 1.6934,-4.613 1.6934,-4.613 0,0 2.4619,0 2.4619,0 0,0 -5.9981,16.3 -5.9981,16.3 z m -16.9131,0 c 0,0 -6.7656,0 -6.7656,0 0,0 0,-16.3 0,-16.3 0,0 6.6104,0 6.6104,0 4.6142,0 6.9199,2.765 6.9199,8.304 0,5.331 -2.2559,7.996 -6.7647,7.996 z m 121.4668,80.7209 c 0,0 2.77,7.2285 2.77,7.2285 0,0 2.306,-7.2285 2.306,-7.2285 0,0 -5.076,0 -5.076,0 z m -49.664,-5.2256 c -3.7959,0 -5.6885,2.252 -5.6885,6.7647 0,4.4043 1.8926,6.6113 5.6885,6.6113 3.792,0 5.6894,-2.207 5.6894,-6.6113 0,-4.5127 -1.8974,-6.7647 -5.6894,-6.7647 z m -38.8985,-63.5043 c 0,0 -32.5966,0 -32.5966,0 -2.1553,0 -3.9493,0.718 -5.3838,2.153 -1.4356,1.434 -2.1524,3.228 -2.1524,5.381 0,0 0,38.2848 0,38.2848 0,2.1523 0.7168,3.9502 2.1524,5.3847 1.4345,1.4346 3.2285,2.1524 5.3838,2.1524 0,0 18.1445,0 18.1445,0 1.2265,0 1.8437,0.6631 1.8437,1.998 0,0 0,17.376 0,17.376 0,0.8174 0.4082,1.2305 1.2305,1.2305 0,0 11.3779,0 11.3779,0 0.7178,-0.7168 1.0762,-1.1309 1.0762,-1.2305 0,0 0,-71.6529 0,-71.6529 0,-0.208 -0.3584,-0.568 -1.0762,-1.077 z m 126.6185,2.228 c -1.485,-1.485 -3.304,-2.228 -5.455,-2.228 0,0 -23.679,0 -23.679,0 -2.156,0 -4.005,0.743 -5.539,2.228 -1.535,1.484 -2.303,3.308 -2.303,5.46 0,0 0,38.1308 0,38.1308 0,2.1523 0.768,3.9502 2.303,5.3847 1.534,1.4346 3.383,2.1524 5.539,2.1524 0,0 23.679,0 23.679,0 2.252,0 4.099,-0.6924 5.534,-2.0772 1.435,-1.3847 2.152,-3.207 2.152,-5.4599 0,0 0,-10.1475 0,-10.1475 0,-0.7178 -0.358,-1.0771 -1.076,-1.0771 0,0 -10.147,0 -10.147,0 -0.718,0 -1.077,0.3593 -1.077,1.0771 0,0 0,4.6123 0,4.6123 0,2.0527 -0.692,3.7666 -2.077,5.1514 -1.385,1.3847 -3.103,2.0771 -5.151,2.0771 -2.052,0 -3.767,-0.6924 -5.152,-2.0771 -1.384,-1.3848 -2.077,-3.0987 -2.077,-5.1514 0,0 0,-27.3656 0,-27.3656 0,-2.052 0.693,-3.77 2.077,-5.155 1.385,-1.385 3.1,-2.073 5.152,-2.073 2.048,0 3.766,0.688 5.151,2.073 1.385,1.385 2.077,3.103 2.077,5.155 0,0 0,6.456 0,6.456 0,0.718 0.359,1.077 1.077,1.077 0,0 10.147,0 10.147,0 0.205,0 0.563,-0.359 1.076,-1.077 0,0 0,-11.686 0,-11.686 0,-2.152 -0.746,-3.976 -2.231,-5.46 z m -50.895,0 c -1.484,-1.485 -3.303,-2.228 -5.455,-2.228 0,0 -29.6767,0 -29.6767,0 -0.8213,0 -1.2304,0.36 -1.2304,1.077 0,0 0,6.919 0,6.919 0,0.717 0.4091,1.077 1.2304,1.077 0,0 20.7587,0 20.7587,0 1.739,0 3.225,0.613 4.455,1.843 1.231,1.231 1.848,2.715 1.848,4.458 0,1.844 -0.593,3.383 -1.769,4.614 -1.18,1.23 -2.69,1.8474 -4.534,1.8474 0,0 -14.3016,0 -14.3016,0 -2.1524,0 -3.9746,0.7422 -5.46,2.2275 -1.4854,1.4854 -2.2275,3.3076 -2.2275,5.46 0,0 0,16.2959 0,16.2959 0,2.1523 0.7421,3.9502 2.2275,5.3847 1.4854,1.4346 3.3076,2.1524 5.46,2.1524 0,0 27.6786,0 27.6786,0 0.717,0 1.076,-0.3584 1.076,-1.0762 0,0 0,-6.7656 0,-6.7656 0,-0.8213 -0.359,-1.2305 -1.076,-1.2305 0,0 -18.762,0 -18.762,0 -3.795,0 -5.688,-1.9473 -5.688,-5.8437 0,-1.5381 0.562,-2.8741 1.689,-3.9991 1.126,-1.1259 2.461,-1.6894 3.999,-1.6894 0,0 14.303,0 14.303,0 2.048,0 3.842,-0.7715 5.381,-2.3067 1.534,-1.539 2.306,-3.333 2.306,-5.3808 0,0 0,-17.3759 0,-17.3759 0,-2.152 -0.746,-3.976 -2.232,-5.46 z m -46.6649,-5.765 c 0,0 -16.7588,0 -16.7588,0 -1.2304,0 -1.8427,0.663 -1.8427,1.998 0,0 0,56.5843 0,56.5843 0,1.2305 0.6123,1.8467 1.8427,1.8467 0,0 16.7588,0 16.7588,0 1.2266,0 1.8448,-0.6162 1.8448,-1.8467 0,0 0,-56.5843 0,-56.5843 0,-1.335 -0.6182,-1.998 -1.8448,-1.998 z m 45.9729,-15.837 c 0,0 -5.226,0 -5.226,0 0,0 0,5.536 0,5.536 0,0 5.535,0 5.535,0 1.948,0 2.924,-0.922 2.924,-2.766 0,-1.848 -1.081,-2.77 -3.233,-2.77 z m 11.379,-2.152 c 0,0 2.615,7.229 2.615,7.229 0,0 2.461,-7.229 2.461,-7.229 0,0 -5.076,0 -5.076,0 z m -83.182,0 c 0,0 2.7647,7.229 2.7647,7.229 0,0 2.3076,-7.229 2.3076,-7.229 0,0 -5.0723,0 -5.0723,0 z m -23.2197,0 c 0,0 2.6153,7.229 2.6153,7.229 0,0 2.4609,-7.229 2.4609,-7.229 0,0 -5.0762,0 -5.0762,0 z m -13.0683,-4.922 c 0,0 -4.3037,0 -4.3037,0 0,0 0,12.61 0,12.61 0,0 3.996,0 3.996,0 3.3819,0 5.0752,-2.103 5.0752,-6.303 0,-4.204 -1.5888,-6.307 -4.7675,-6.307 z m 90.41,-0.458 c -3.795,0 -5.688,2.252 -5.688,6.765 0,4.404 1.893,6.611 5.688,6.611 3.897,0 5.844,-2.207 5.844,-6.611 0,-4.513 -1.947,-6.765 -5.844,-6.765 z m -29.83,79.1857 c 0,0.7178 -0.3593,1.0762 -1.0771,1.0762 0,0 -11.3779,0 -11.3779,0 -0.7178,0 -1.0762,-0.3584 -1.0762,-1.0762 0,0 0,-51.2027 0,-51.2027 0,-0.717 0.3584,-1.077 1.0762,-1.077 0,0 11.3779,0 11.3779,0 0.7178,0 1.0771,0.36 1.0771,1.077 0,0 0,51.2027 0,51.2027 z m -39.9755,-11.6875 c 0,1.9443 -0.6915,3.6123 -2.0762,4.9971 -1.3858,1.3847 -3.0537,2.0771 -4.9971,2.0771 -1.9482,0 -3.5869,-0.6924 -4.9219,-2.0771 -1.3339,-1.3848 -1.998,-3.0528 -1.998,-4.9971 0,0 0,-28.1372 0,-28.1372 0,-2.052 0.6377,-3.742 1.9228,-5.076 1.2813,-1.335 2.9454,-1.998 4.9971,-1.998 1.9434,0 3.6113,0.693 4.9971,2.077 1.3847,1.385 2.0762,3.049 2.0762,4.997 0,0 0,28.1372 0,28.1372 z m -7.0733,-31.6742 c -2.3613,0 -3.5371,1.176 -3.5371,3.537 0,0 0,28.1372 0,28.1372 0,2.3564 1.1758,3.5371 3.5371,3.5371 2.2529,0 3.3828,-1.1807 3.3828,-3.5371 0,0 0,-28.1372 0,-28.1372 0,-2.361 -1.1299,-3.537 -3.3828,-3.537 z" inkscape:connector-curvature="0"/>
           </g>
         </g>
-        <path
-           inkscape:connector-curvature="0"
-           d="m 471.22906,7943.0969 1.90862,0 0,2.4099 -1.90862,0 z"
-           style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path79232-0-9-3" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79234-4-4-9"
-           style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 468.87511,7943.0968 1.9086,0 0,2.41 -1.9086,0 z" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 467.18673,7943.0524 1.21366,0 0,4.2539 -1.21366,0 z"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4"
-           id="path79236-9-34-1" />
-        <path
-           id="path79238-4-2-2"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4"
-           d="m 467.92553,7943.0524 0.47486,0 0,4.2539 -0.47486,0 z"
-           inkscape:connector-curvature="0" />
-        <rect
-           style="fill:url(#linearGradient146492-5);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554"
-           id="rect79240-5-8-4"
-           width="23.795719"
-           height="4.7188153"
-           x="584.88458"
-           y="7944.5239"
-           transform="matrix(1,0,-0.01802634,0.99983751,0,0)" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 442.96371,7943.8985 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path79242-9-1-1"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79244-7-7-2"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 446.15365,7943.8985 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 449.37599,7943.8985 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path79246-3-1-6"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path79272-9-3-8"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.28774,7943.1829 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path79274-5-1-4"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 403.99722,7943.124 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 401.33384,7945.3076 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path79276-1-9-4"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 404.04332,7945.2489 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path79278-3-4-5"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79280-8-1-6"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.38387,7947.6134 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79282-6-8-8"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 404.09334,7947.5546 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 406.58427,7942.7348 29.32904,-0.045 0.0637,6.331 -29.20179,0 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.42910308"
-           id="path79284-8-2-4" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79286-1-0-5"
-           d="m 409.8162,7944.3629 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path79288-4-7-8"
-           d="m 427.5154,7944.2307 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.34134,7944.3629 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path79290-9-0-4"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.01977,7945.7195 7.18913,0 0,0.4071 -7.18913,0 z"
-           id="path79292-0-0-4"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path79294-0-7-1"
-           d="m 418.54491,7945.7195 7.18913,0 0,0.4071 -7.18913,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path79296-3-3-2"
-           d="m 410.17247,7946.8049 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.69761,7946.8049 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path79298-2-9-8"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.22338,7947.845 7.1891,0 0,0.407 -7.1891,0 z"
-           id="path79300-3-4-3"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path79302-5-7-2"
-           d="m 418.74852,7947.845 7.1891,0 0,0.407 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 427.40089,7947.845 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path79304-6-4-6"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 406.58427,7943.775 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-           style="fill:#000000;stroke:none"
-           id="path79306-7-4-6" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.17483,7944.2116 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path79312-1-8-0" />
-        <path
-           id="path79314-4-0-4"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 431.1749,7947.4451 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path79316-0-5-8"
-           style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 471.22906,7946.4114 1.90862,0 0,1.0539 -1.90862,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 468.87511,7946.4113 1.9086,0 0,1.054 -1.9086,0 z"
-           style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path79318-7-1-1"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79320-1-0-8"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 442.96371,7946.0732 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 446.15365,7946.0732 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path79322-7-66-4"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79324-3-2-2"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 449.37599,7946.0732 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 452.6521,7946.0732 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path79326-5-0-2"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path79328-8-4-9"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           d="m 455.84203,7946.0732 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 459.06437,7946.0732 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954"
-           id="path79330-9-2-1"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path86691-9-6"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           d="m 369.07258,7935.4452 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 372.3045,7937.0732 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path86693-6-8"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 390.0037,7936.941 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z"
-           id="path86695-4-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path86697-0-9"
-           d="m 380.82964,7937.0732 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path86699-5-5"
-           d="m 372.50807,7938.4298 7.18911,0 0,0.4071 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.03321,7938.4298 7.18912,0 0,0.4071 -7.18912,0 z"
-           id="path86701-7-9" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 372.66077,7939.5152 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path86703-2-4" />
-        <path
-           id="path86705-4-7"
-           d="m 381.18591,7939.5152 7.18912,0 0,0.407 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path86707-1-2"
-           d="m 372.71166,7940.5554 7.18912,0 0,0.4069 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.23681,7940.5554 7.18911,0 0,0.4069 -7.18911,0 z"
-           id="path86709-3-9" />
-        <path
-           id="path86711-6-7"
-           d="m 389.88919,7940.5554 7.18912,0 0,0.4069 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path86713-0-0"
-           style="fill:#000000;stroke:none"
-           d="m 369.07258,7936.4853 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path86715-3-4"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 393.83468,7936.9219 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 393.83476,7940.1554 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path86717-0-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 369.38862,7942.6935 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308"
-           id="path86719-04-2" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path86721-6-0"
-           d="m 372.62054,7944.3215 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path86723-47-9"
-           d="m 390.31974,7944.1893 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.14568,7944.3215 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path86725-5-8" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 372.82411,7945.6781 7.18911,0 0,0.4071 -7.18911,0 z"
-           id="path86727-3-4" />
-        <path
-           id="path86729-8-3"
-           d="m 381.34925,7945.6781 7.18912,0 0,0.4071 -7.18912,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path86731-72-8"
-           d="m 372.97681,7946.7635 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 381.50195,7946.7635 7.18912,0 0,0.407 -7.18912,0 z"
-           id="path86733-3-0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 373.0277,7947.8036 7.18912,0 0,0.407 -7.18912,0 z"
-           id="path86735-4-9" />
-        <path
-           id="path86737-5-7"
-           d="m 381.55285,7947.8036 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 390.20523,7947.8036 7.18912,0 0,0.407 -7.18912,0 z"
-           id="path86739-8-7" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 369.38862,7943.7336 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z"
-           style="fill:#000000;stroke:none"
-           id="path86741-8-7" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 394.15072,7944.1702 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path86743-7-2" />
-        <path
-           id="path86745-8-4"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 394.1508,7947.4037 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 401.28774,7950.6052 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path86833-9-7" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 403.99722,7950.5463 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path86835-6-1" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path86837-8-1"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 401.33384,7952.7299 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path86839-3-6"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           d="m 404.04332,7952.6712 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z" />
-        <path
-           d="m 401.38387,7955.0357 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path86841-9-5"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 404.09334,7954.9769 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622"
-           id="path86843-6-8"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path86845-0-0"
-           style="fill:#808080;stroke:#000000;stroke-width:0.42910308"
-           d="m 406.58427,7950.1571 29.32904,-0.045 0.0637,6.331 -29.20179,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 409.8162,7951.7852 7.1891,0 0,0.7235 -7.1891,0 z"
-           id="path86847-2-4"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 427.5154,7951.653 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z"
-           id="path86849-44-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path86851-5-7"
-           d="m 418.34134,7951.7852 7.1891,0 0,0.7235 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path86853-2-4"
-           d="m 410.01977,7953.1418 7.18913,0 0,0.4071 -7.18913,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.54491,7953.1418 7.18913,0 0,0.4071 -7.18913,0 z"
-           id="path86855-24-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 410.17247,7954.2272 7.18911,0 0,0.407 -7.18911,0 z"
-           id="path86857-0-2" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path86859-6-0"
-           d="m 418.69761,7954.2272 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path86861-7-3"
-           d="m 410.22338,7955.2673 7.1891,0 0,0.407 -7.1891,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 418.74852,7955.2673 7.1891,0 0,0.407 -7.1891,0 z"
-           id="path86863-0-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path86865-4-6"
-           d="m 427.40089,7955.2673 7.18911,0 0,0.407 -7.18911,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path86867-4-9"
-           style="fill:#000000;stroke:none"
-           d="m 406.58427,7951.1973 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path86869-8-2"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 431.17483,7951.6339 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 431.1749,7954.8674 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path86871-33-0" />
-        <rect
-           transform="matrix(1,0,-0.01820351,0.9998343,0,0)"
-           y="7951.1172"
-           x="586.43988"
-           height="6.1957226"
-           width="31.550442"
-           id="rect88426-2-2"
-           style="fill:#666666;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.61633438" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 445.26828,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88430-8-0" />
-        <path
-           id="path88434-0-5"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 448.86009,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 452.63454,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88436-80-4" />
-        <path
-           id="path88438-1-3"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 456.28723,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 460.0008,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88440-7-4" />
-        <path
-           id="path88442-7-8"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 463.6535,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 467.30619,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88444-6-2" />
-        <path
-           id="path88446-3-8"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 471.01976,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path88448-5-2"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 446.97287,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 450.56468,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88450-7-5" />
-        <path
-           id="path88452-9-5"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 454.33913,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 457.99182,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88454-0-0" />
-        <path
-           id="path88456-4-2"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 461.70539,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 465.35809,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88458-1-1" />
-        <path
-           id="path88460-7-2"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 469.01078,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 472.72435,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88462-4-8" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 444.90301,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88464-7-0" />
-        <path
-           id="path88466-8-5"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 448.49482,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 452.26927,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88468-4-1" />
-        <path
-           id="path88470-6-6"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 455.92196,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 459.63553,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88472-9-6" />
-        <path
-           id="path88474-5-8"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 463.28823,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 466.94092,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path88476-6-8" />
-        <path
-           id="path88478-3-0"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 470.65449,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z"
-           inkscape:connector-curvature="0" />
+        <path inkscape:connector-curvature="0" d="m 471.22906,7943.0969 1.90862,0 0,2.4099 -1.90862,0 z" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path79232-0-9-3"/>
+        <path inkscape:connector-curvature="0" id="path79234-4-4-9" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 468.87511,7943.0968 1.9086,0 0,2.41 -1.9086,0 z"/>
+        <path inkscape:connector-curvature="0" d="m 467.18673,7943.0524 1.21366,0 0,4.2539 -1.21366,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.20532669;stroke-miterlimit:4" id="path79236-9-34-1"/>
+        <path id="path79238-4-2-2" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.12843297;stroke-miterlimit:4" d="m 467.92553,7943.0524 0.47486,0 0,4.2539 -0.47486,0 z" inkscape:connector-curvature="0"/>
+        <rect style="fill:url(#linearGradient146492-5);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.46712554" id="rect79240-5-8-4" width="23.795719" height="4.7188153" x="584.88458" y="7944.5239" transform="matrix(1,0,-0.01802634,0.99983751,0,0)"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 442.96371,7943.8985 1.53996,0 c 0.20885,0 0.38956,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2817 0.13993,-0.5087 0.34879,-0.5087 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path79242-9-1-1" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path79244-7-7-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 446.15365,7943.8985 1.53997,0 c 0.20884,0 0.38957,0.227 0.40519,0.5087 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2817 0.13994,-0.5087 0.34878,-0.5087 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 449.37599,7943.8985 1.53996,0 c 0.20885,0 0.38957,0.227 0.4052,0.5087 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2817 0.13992,-0.5087 0.34878,-0.5087 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path79246-3-1-6" inkscape:connector-curvature="0"/>
+        <path id="path79272-9-3-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.28774,7943.1829 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z" inkscape:connector-curvature="0"/>
+        <path id="path79274-5-1-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 403.99722,7943.124 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z" inkscape:connector-curvature="0"/>
+        <path d="m 401.33384,7945.3076 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path79276-1-9-4" inkscape:connector-curvature="0"/>
+        <path d="m 404.04332,7945.2489 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path79278-3-4-5" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path79280-8-1-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.38387,7947.6134 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z"/>
+        <path inkscape:connector-curvature="0" id="path79282-6-8-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 404.09334,7947.5546 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 406.58427,7942.7348 29.32904,-0.045 0.0637,6.331 -29.20179,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.42910308" id="path79284-8-2-4"/>
+        <path inkscape:connector-curvature="0" id="path79286-1-0-5" d="m 409.8162,7944.3629 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path79288-4-7-8" d="m 427.5154,7944.2307 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.34134,7944.3629 7.1891,0 0,0.7235 -7.1891,0 z" id="path79290-9-0-4" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.01977,7945.7195 7.18913,0 0,0.4071 -7.18913,0 z" id="path79292-0-0-4" sodipodi:nodetypes="ccccc"/>
+        <path id="path79294-0-7-1" d="m 418.54491,7945.7195 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path79296-3-3-2" d="m 410.17247,7946.8049 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.69761,7946.8049 7.18911,0 0,0.407 -7.18911,0 z" id="path79298-2-9-8" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.22338,7947.845 7.1891,0 0,0.407 -7.1891,0 z" id="path79300-3-4-3" sodipodi:nodetypes="ccccc"/>
+        <path id="path79302-5-7-2" d="m 418.74852,7947.845 7.1891,0 0,0.407 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.40089,7947.845 7.18911,0 0,0.407 -7.18911,0 z" id="path79304-6-4-6" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 406.58427,7943.775 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" style="fill:#000000;stroke:none" id="path79306-7-4-6"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.17483,7944.2116 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path79312-1-8-0"/>
+        <path id="path79314-4-0-4" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.1749,7947.4451 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path79316-0-5-8" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.22906,7946.4114 1.90862,0 0,1.0539 -1.90862,0 z" inkscape:connector-curvature="0"/>
+        <path d="m 468.87511,7946.4113 1.9086,0 0,1.054 -1.9086,0 z" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path79318-7-1-1" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path79320-1-0-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 442.96371,7946.0732 1.53996,0 c 0.20885,0 0.38956,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13993,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34879,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 446.15365,7946.0732 1.53997,0 c 0.20884,0 0.38957,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13994,-0.5086 0.34878,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path79322-7-66-4" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path79324-3-2-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 449.37599,7946.0732 1.53996,0 c 0.20885,0 0.38957,0.2268 0.4052,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13991,0.5085 -0.34876,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13992,-0.5086 0.34878,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 452.6521,7946.0732 1.53995,0 c 0.20886,0 0.38957,0.2268 0.4052,0.5086 l 0.0217,0.3906 c 0.0157,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53996,0 c -0.20886,0 -0.38958,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.3488,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path79326-5-0-2" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path79328-8-4-9" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" d="m 455.84203,7946.0732 1.53997,0 c 0.20884,0 0.38958,0.2268 0.40519,0.5086 l 0.0217,0.3906 c 0.0156,0.2817 -0.13993,0.5085 -0.34878,0.5085 l -1.53996,0 c -0.20886,0 -0.38957,-0.2268 -0.40521,-0.5085 l -0.0217,-0.3906 c -0.0157,-0.2818 0.13993,-0.5086 0.34877,-0.5086 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 459.06437,7946.0732 1.53997,0 c 0.20884,0 0.38956,0.2268 0.40519,0.5086 l 0.0216,0.3906 c 0.0156,0.2817 -0.13992,0.5085 -0.34877,0.5085 l -1.53997,0 c -0.20885,0 -0.38957,-0.2268 -0.4052,-0.5085 l -0.0216,-0.3906 c -0.0156,-0.2818 0.13993,-0.5086 0.34878,-0.5086 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.45442954" id="path79330-9-2-1" inkscape:connector-curvature="0"/>
+        <path id="path86691-9-6" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" d="m 369.07258,7935.4452 29.46876,0.048 0.17837,6.2378 -29.40061,-0.046 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 372.3045,7937.0732 7.1891,0 0,0.7235 -7.1891,0 z" id="path86693-6-8" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 390.0037,7936.941 0,3.2108 3.05379,0 0,-2.762 0,-0.2376 0,-0.2112 -1.39965,0 0.71572,0.012 -0.0159,0.1023 0,2.9845 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.95431,0 0.0159,-0.1131 z" id="path86695-4-6" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path86697-0-9" d="m 380.82964,7937.0732 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path86699-5-5" d="m 372.50807,7938.4298 7.18911,0 0,0.4071 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.03321,7938.4298 7.18912,0 0,0.4071 -7.18912,0 z" id="path86701-7-9"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 372.66077,7939.5152 7.18911,0 0,0.407 -7.18911,0 z" id="path86703-2-4"/>
+        <path id="path86705-4-7" d="m 381.18591,7939.5152 7.18912,0 0,0.407 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path86707-1-2" d="m 372.71166,7940.5554 7.18912,0 0,0.4069 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.23681,7940.5554 7.18911,0 0,0.4069 -7.18911,0 z" id="path86709-3-9"/>
+        <path id="path86711-6-7" d="m 389.88919,7940.5554 7.18912,0 0,0.4069 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path86713-0-0" style="fill:#000000;stroke:none" d="m 369.07258,7936.4853 0.89068,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31778,0.044 0.62178,0.079 0.078,0.011 0.006,-1.1937 -0.0344,-2.2881 -0.0189,-0.4991 -0.0885,-1.2121 -0.0591,-1.5205 2.80269,-0.051 21.67587,-0.01 24.40467,0 0.0162,0.2886 0.0172,0.2219 0.009,0.3166 -0.99487,0.011 -23.89633,-0.01 -23.88279,0 0.1428,1.3782 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path86715-3-4" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 393.83468,7936.9219 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 393.83476,7940.1554 0,-0.4635 2.11402,0 0.0159,-0.7801 0.51296,0 -0.003,0.7793 0,0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path86717-0-3"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 369.38862,7942.6935 29.32903,-0.045 0.17837,6.2844 -29.2143,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.42910308" id="path86719-04-2"/>
+        <path inkscape:connector-curvature="0" id="path86721-6-0" d="m 372.62054,7944.3215 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path86723-47-9" d="m 390.31974,7944.1893 0,3.2108 3.05379,0 0,-2.762 0,-0.2375 0,-0.2113 -1.39965,0 0.71572,0.012 -0.0159,0.1022 0,2.9846 -1.00203,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9846 0.95431,0 0.0159,-0.1131 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.14568,7944.3215 7.1891,0 0,0.7235 -7.1891,0 z" id="path86725-5-8"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 372.82411,7945.6781 7.18911,0 0,0.4071 -7.18911,0 z" id="path86727-3-4"/>
+        <path id="path86729-8-3" d="m 381.34925,7945.6781 7.18912,0 0,0.4071 -7.18912,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path86731-72-8" d="m 372.97681,7946.7635 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 381.50195,7946.7635 7.18912,0 0,0.407 -7.18912,0 z" id="path86733-3-0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 373.0277,7947.8036 7.18912,0 0,0.407 -7.18912,0 z" id="path86735-4-9"/>
+        <path id="path86737-5-7" d="m 381.55285,7947.8036 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 390.20523,7947.8036 7.18912,0 0,0.407 -7.18912,0 z" id="path86739-8-7"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 369.38862,7943.7336 0.89068,0 c 0,0 0.2474,2.2637 0.37105,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.0591,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.24072,0.044 -2.01589,0.044 z" style="fill:#000000;stroke:none" id="path86741-8-7"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 394.15072,7944.1702 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path86743-7-2"/>
+        <path id="path86745-8-4" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 394.1508,7947.4037 0,-0.4636 2.11402,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path inkscape:connector-curvature="0" d="m 401.28774,7950.6052 0.47458,-0.011 c 0.24733,-0.01 0.46443,0.1311 0.48672,0.3061 l 0.031,0.2424 c 0.0223,0.1749 -0.15884,0.3201 -0.40619,0.3255 l -0.47457,0.011 c -0.24734,0.011 -0.46444,-0.1312 -0.48676,-0.3061 l -0.0309,-0.2425 c -0.0223,-0.1748 0.15885,-0.32 0.40619,-0.3253 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path86833-9-7"/>
+        <path inkscape:connector-curvature="0" d="m 403.99722,7950.5463 0.47457,-0.011 c 0.24735,-0.011 0.46443,0.131 0.48675,0.306 l 0.0309,0.2425 c 0.0222,0.1748 -0.15886,0.3201 -0.40621,0.3254 l -0.47457,0.011 c -0.24734,0.01 -0.46443,-0.1311 -0.48674,-0.306 l -0.031,-0.2425 c -0.0223,-0.175 0.15885,-0.3201 0.40621,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path86835-6-1"/>
+        <path inkscape:connector-curvature="0" id="path86837-8-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 401.33384,7952.7299 0.47458,-0.01 c 0.24733,-0.011 0.46443,0.1312 0.48673,0.3061 l 0.031,0.2425 c 0.0223,0.1748 -0.15884,0.3201 -0.4062,0.3254 l -0.47456,0.011 c -0.24735,0.011 -0.46445,-0.1311 -0.48677,-0.306 l -0.0309,-0.2425 c -0.0224,-0.1749 0.15885,-0.3202 0.40619,-0.3256 z"/>
+        <path inkscape:connector-curvature="0" id="path86839-3-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" d="m 404.04332,7952.6712 0.47457,-0.011 c 0.24735,-0.011 0.46444,0.1313 0.48675,0.3061 l 0.0309,0.2426 c 0.0222,0.1747 -0.15886,0.32 -0.4062,0.3253 l -0.47457,0.011 c -0.24734,0.01 -0.46444,-0.1312 -0.48674,-0.3061 l -0.031,-0.2425 c -0.0223,-0.1749 0.15884,-0.3201 0.4062,-0.3255 z"/>
+        <path d="m 401.38387,7955.0357 0.47457,-0.011 c 0.24734,-0.011 0.46444,0.1312 0.48673,0.3062 l 0.031,0.2424 c 0.0223,0.1751 -0.15884,0.3203 -0.40618,0.3256 l -0.47457,0.01 c -0.24735,0.011 -0.46445,-0.1312 -0.48678,-0.3062 l -0.0309,-0.2424 c -0.0223,-0.1749 0.15884,-0.3202 0.40619,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path86841-9-5" inkscape:connector-curvature="0"/>
+        <path d="m 404.09334,7954.9769 0.47458,-0.011 c 0.24734,-0.011 0.46443,0.1311 0.48676,0.3061 l 0.0309,0.2424 c 0.0222,0.1751 -0.15884,0.3203 -0.4062,0.3257 l -0.47456,0.011 c -0.24734,0.011 -0.46444,-0.1311 -0.48675,-0.3062 l -0.031,-0.2424 c -0.0223,-0.1749 0.15885,-0.3202 0.4062,-0.3255 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.39020622" id="path86843-6-8" inkscape:connector-curvature="0"/>
+        <path id="path86845-0-0" style="fill:#808080;stroke:#000000;stroke-width:0.42910308" d="m 406.58427,7950.1571 29.32904,-0.045 0.0637,6.331 -29.20179,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 409.8162,7951.7852 7.1891,0 0,0.7235 -7.1891,0 z" id="path86847-2-4" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 427.5154,7951.653 0,3.2108 3.05379,0 0,-3.2108 -1.39965,0 0.71574,0.012 -0.0159,0.1022 0,2.9845 -1.00201,0 -0.0159,0.091 -0.65211,0 0,-0.091 0,-2.9845 0.9543,0 0.0159,-0.1132 -1.65414,0 z" id="path86849-44-3"/>
+        <path sodipodi:nodetypes="ccccc" id="path86851-5-7" d="m 418.34134,7951.7852 7.1891,0 0,0.7235 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path86853-2-4" d="m 410.01977,7953.1418 7.18913,0 0,0.4071 -7.18913,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.54491,7953.1418 7.18913,0 0,0.4071 -7.18913,0 z" id="path86855-24-4"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 410.17247,7954.2272 7.18911,0 0,0.407 -7.18911,0 z" id="path86857-0-2"/>
+        <path sodipodi:nodetypes="ccccc" id="path86859-6-0" d="m 418.69761,7954.2272 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path86861-7-3" d="m 410.22338,7955.2673 7.1891,0 0,0.407 -7.1891,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 418.74852,7955.2673 7.1891,0 0,0.407 -7.1891,0 z" id="path86863-0-4"/>
+        <path sodipodi:nodetypes="ccccc" id="path86865-4-6" d="m 427.40089,7955.2673 7.18911,0 0,0.407 -7.18911,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path86867-4-9" style="fill:#000000;stroke:none" d="m 406.58427,7951.1973 0.89069,0 c 0,0 0.2474,2.2637 0.37106,3.3957 0.005,0.041 0.31779,0.044 0.62179,0.079 0.078,0.01 0.006,-1.1936 -0.0344,-2.2881 -0.0189,-0.499 -0.0885,-1.2121 -0.059,-1.5204 2.80269,-0.051 21.67587,-0.011 24.40467,0 0.0162,0.2885 0.0172,0.2217 0.009,0.3165 -0.99487,0.011 -23.89633,-0.011 -23.88279,0 0.1428,1.3781 0.0747,3.5776 0.20311,4.6307 -0.79906,-0.014 -1.62243,0.044 -2.39761,0.044 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path86869-8-2" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 431.17483,7951.6339 0,0.4637 2.11414,0 0.0159,0.78 0.513,0 -0.003,-0.7793 0,-0.4634 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 431.1749,7954.8674 0,-0.4636 2.11403,0 0.0159,-0.78 0.51296,0 -0.003,0.7793 0,0.4635 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path86871-33-0"/>
+        <rect transform="matrix(1,0,-0.01820351,0.9998343,0,0)" y="7951.1172" x="586.43988" height="6.1957226" width="31.550442" id="rect88426-2-2" style="fill:#666666;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.61633438"/>
+        <path inkscape:connector-curvature="0" d="m 445.26828,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88430-8-0"/>
+        <path id="path88434-0-5" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 448.86009,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 452.63454,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88436-80-4"/>
+        <path id="path88438-1-3" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 456.28723,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 460.0008,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88440-7-4"/>
+        <path id="path88442-7-8" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 463.6535,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 467.30619,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88444-6-2"/>
+        <path id="path88446-3-8" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.01976,7951.1469 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path id="path88448-5-2" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 446.97287,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 450.56468,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88450-7-5"/>
+        <path id="path88452-9-5" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 454.33913,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 457.99182,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88454-0-0"/>
+        <path id="path88456-4-2" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 461.70539,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 465.35809,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88458-1-1"/>
+        <path id="path88460-7-2" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 469.01078,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 472.72435,7952.7906 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88462-4-8"/>
+        <path inkscape:connector-curvature="0" d="m 444.90301,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88464-7-0"/>
+        <path id="path88466-8-5" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 448.49482,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 452.26927,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88468-4-1"/>
+        <path id="path88470-6-6" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 455.92196,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 459.63553,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88472-9-6"/>
+        <path id="path88474-5-8" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 463.28823,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 466.94092,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path88476-6-8"/>
+        <path id="path88478-3-0" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 470.65449,7954.3126 c 0,0.3698 -0.48507,0.6697 -1.08353,0.6697 -0.59846,0 -1.08354,-0.2999 -1.08354,-0.6697 0,-0.3699 0.48508,-0.6697 1.08354,-0.6697 0.59846,0 1.08353,0.2998 1.08353,0.6697 z" inkscape:connector-curvature="0"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Rackmountable_4U_server_2D.svg b/misc/images/svg/elements/Rackmountable_4U_server_2D.svg
index ef4ebf51fff..ba608a4f892 100644
--- a/misc/images/svg/elements/Rackmountable_4U_server_2D.svg
+++ b/misc/images/svg/elements/Rackmountable_4U_server_2D.svg
@@ -1,1676 +1,309 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.00577"
-   height="34.9375"
-   id="svg144030"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 42">
-  <defs
-     id="defs144032">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-49-0-6"
-       id="linearGradient150812-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0705895,0,0,2.2552383,2681.571,-9998.0671)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient42443-7-49-0-6">
-      <stop
-         id="stop42445-53-90-5-1"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-6-8-1" />
-      <stop
-         id="stop42449-3-2-0-1"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.00577" height="34.9375" id="svg144030" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 42">
+  <defs id="defs144032">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-49-0-6" id="linearGradient150812-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0705895,0,0,2.2552383,2681.571,-9998.0671)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient42443-7-49-0-6">
+      <stop id="stop42445-53-90-5-1" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-6-8-1"/>
+      <stop id="stop42449-3-2-0-1" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect115151-0-9-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect115148-1-3-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-00-0-5"
-       id="linearGradient150814-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,-0.03023962,1.0816114,2678.599,-619.60771)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-00-0-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-3-1-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-1-2-9" />
+    <inkscape:path-effect is_visible="true" id="path-effect115151-0-9-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect115148-1-3-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-00-0-5" id="linearGradient150814-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,-0.03023962,1.0816114,2678.599,-619.60771)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-00-0-5">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-3-1-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-1-2-9"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-7-1-3"
-       id="linearGradient150816-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,2.2448329,2679.0644,-9914.2367)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-7-1-3">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-20-1-0" />
-      <stop
-         id="stop76664-9-25-24-5-0"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-1-0-3" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-7-1-3" id="linearGradient150816-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,2.2448329,2679.0644,-9914.2367)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-7-1-3">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-20-1-0"/>
+      <stop id="stop76664-9-25-24-5-0" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-1-0-3"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect114909-4-2-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect114906-4-1-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-48-4-1"
-       id="linearGradient150818-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7085349,0,-0.04882499,1.0818583,1892.3114,-626.81389)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-48-4-1">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-3-6-3" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-52-4-2" />
+    <inkscape:path-effect effect="spiro" id="path-effect114909-4-2-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect114906-4-1-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-48-4-1" id="linearGradient150818-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.7085349,0,-0.04882499,1.0818583,1892.3114,-626.81389)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-48-4-1">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-3-6-3"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-52-4-2"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-146.71568"
-     inkscape:cy="43.187567"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="22"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata144035">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-146.71568" inkscape:cy="43.187567" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="22" inkscape:window-y="29" inkscape:window-maximized="0"/>
+  <metadata id="metadata144035">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-521.71568,-540.61225)">
-    <g
-       style="display:inline"
-       id="g150278"
-       transform="translate(-2545.5938,-7490.419)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_4U_server_2D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150282"
-         style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.81043929;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 3073.8783,8031.4227 115.5848,0 0,34.1455 -115.5848,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cccssccccccscccscsc"
-         style="fill:url(#linearGradient150812-5);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31076902;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 3074.2358,8031.6583 c 0.7535,0 1.3888,1.7244 1.4379,3.8676 l 0.6139,26.1527 c 0.049,2.1428 -0.5229,3.8676 -1.2763,3.8676 l -5.4931,0 c -0.7535,0 -1.3889,-1.7248 -1.438,-3.8676 l -0.1454,-6.3076 0.8402,-0.2778 0,-12.1092 -1.131,0.3218 -0.1777,-7.7811 c -0.049,-2.1428 0.5229,-3.8676 1.2764,-3.8676 l 5.4931,0 z m -2.6981,13.6342 c -0.2391,0.03 -0.4225,0.1948 -0.4039,1.5605 0.019,1.3653 0.2295,1.448 0.4685,1.4219 0.2391,-0.03 0.4063,-0.1492 0.3878,-1.5144 -0.019,-1.3657 -0.2134,-1.4945 -0.4524,-1.468 z"
-         id="path150284"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#808080;stroke:none"
-         d="m 3072.1299,8035.0912 -1.1072,-0.1648 -1.3509,3.8013 0.3222,25.6103 1.1119,0.2777 1.5602,-4.5367 -0.9198,-0.1135 -0.6811,1.0815 -0.2922,-21.9628 1.3569,-3.993"
-         id="path150286"
-         inkscape:path-effect="#path-effect115151-0-9-1"
-         inkscape:original-d="m 3072.1299,8035.0912 c -0.061,-1.7634 -0.4367,-1.1769 -1.1072,-0.1648 l -1.3509,3.8013 0.3222,25.6103 c 0.3026,1.3959 0.6756,0.6262 1.1119,0.2777 l 1.5602,-4.5367 c -0.3175,-1.1682 -0.4012,-0.5742 -0.9198,-0.1135 l -0.6811,1.0815 -0.2922,-21.9628 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-      <path
-         style="fill:#4d4d4d;stroke:none"
-         d="m 3072.1983,8040.5718 -1.0142,2.1392 0.2382,18.9383 1.2437,-1.5646 0.037,3.0736 -1.6039,1.4621 -0.3547,-25.6438 1.3905,-3.8886 0.063,5.4838"
-         id="path150288"
-         inkscape:path-effect="#path-effect115148-1-3-3"
-         inkscape:original-d="m 3072.1983,8040.5718 -1.0142,2.1392 0.2382,18.9383 1.2437,-1.5646 0.037,3.0736 -1.6039,1.4621 -0.3547,-25.6438 1.3905,-3.8886 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         id="path150290"
-         style="fill:url(#linearGradient150814-4);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.51374948"
-         d="m 3151.8994,8033.155 32.5924,0 -0.1165,4.1673 -32.5924,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150292"
-         style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-         d="m 3182.077,8034.0876 0.4495,0 c 0.1013,0 0.1771,0.01 0.2271,0.02 0.067,0.017 0.1207,0.048 0.1607,0.092 0.04,0.044 0.065,0.099 0.076,0.1631 0.011,0.065 0,0.1435 -0.019,0.2377 -0.02,0.083 -0.05,0.1542 -0.09,0.2142 -0.049,0.073 -0.1066,0.1324 -0.1743,0.1777 -0.051,0.034 -0.1154,0.062 -0.1926,0.08 -0.058,0.014 -0.1322,0.021 -0.223,0.021 l -0.4628,0 z m 0.2039,0.1702 -0.1643,0.6665 0.1836,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.078,-0.023 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.098 0.028,-0.045 0.051,-0.1064 0.07,-0.1842 0.019,-0.078 0.026,-0.1375 0.019,-0.1792 -0.01,-0.042 -0.022,-0.074 -0.046,-0.097 -0.024,-0.024 -0.058,-0.039 -0.1022,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z m -1.2772,0.836 -0.1872,-1.0062 0.2667,0 0.1246,0.7447 0.482,-0.7447 0.2609,0 -0.6844,1.0062 z m -1.2932,-1.0062 0.4496,0 c 0.1013,0 0.1771,0.01 0.227,0.02 0.067,0.017 0.1208,0.048 0.1608,0.092 0.04,0.044 0.065,0.099 0.076,0.1631 0.011,0.065 0,0.1435 -0.019,0.2377 -0.02,0.083 -0.05,0.1542 -0.09,0.2142 -0.049,0.073 -0.1067,0.1324 -0.1743,0.1777 -0.051,0.034 -0.1154,0.062 -0.1927,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4628,0 z m 0.204,0.1702 -0.1644,0.6665 0.1837,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.078,-0.023 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.098 0.028,-0.045 0.051,-0.1064 0.07,-0.1842 0.019,-0.078 0.026,-0.1375 0.019,-0.1792 -0.01,-0.042 -0.022,-0.074 -0.046,-0.097 -0.024,-0.024 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150294"
-         d="m 3181.2289,8035.4035 c -1.116,0 -2.0207,0.1243 -2.0207,0.2785 0,0.154 0.9047,0.2784 2.0207,0.2784 1.1161,0 2.0208,-0.1244 2.0208,-0.2784 0,-0.1542 -0.9047,-0.2785 -2.0208,-0.2785 z m 0,0.2013 c 0.3133,0 0.5673,0.035 0.5673,0.077 0,0.043 -0.254,0.077 -0.5673,0.077 -0.3132,0 -0.5672,-0.035 -0.5672,-0.077 0,-0.043 0.254,-0.077 0.5672,-0.077 z"
-         style="fill:#ffffff;stroke:none" />
-      <text
-         transform="scale(1.0170762,0.98321049)"
-         sodipodi:linespacing="125%"
-         id="text150296"
-         y="8173.9023"
-         x="3127.0452"
-         style="font-size:0.66138339px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         xml:space="preserve"><tspan
-           y="8173.9023"
-           x="3127.0452"
-           id="tspan150298"
-           sodipodi:role="line">ROM</tspan></text>
-      <path
-         id="path150300"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         d="m 3170.009,8034.3202 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1032,0 0.1032,0 0.05,0 0.075,0.02 0.075,0.058 0,0.044 -0.026,0.065 -0.078,0.065 z m 0.7939,0.062 c -0.014,0.069 -0.051,0.1032 -0.1104,0.1032 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.017,-0.08 -0.069,-0.1204 -0.1567,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.1286 0.057,0.1928 0.1709,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m -1.6876,-0.2409 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.1286 0.062,0.1928 0.1851,0.1928 0.1235,0 0.1852,-0.064 0.1852,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1852,-0.1927 z m -0.2989,0.2409 c -0.012,0.069 -0.048,0.1032 -0.1069,0.1032 -0.085,0 -0.1281,-0.05 -0.1281,-0.1514 0,-0.099 0.041,-0.148 0.1246,-0.148 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.062,-0.1204 -0.1566,-0.1204 -0.1163,0 -0.1745,0.064 -0.1745,0.1927 0,0.1286 0.056,0.1928 0.1673,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m 2.371,-0.2306 c 0,0 -0.3061,0 -0.3061,0 0,0 0,0.045 0,0.045 0,0 0.1281,0 0.1281,0 0,0 0,0.3235 0,0.3235 0,0 0.05,0 0.05,0 0,0 0,-0.3235 0,-0.3235 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.8295,0 c 0,0 -0.057,0 -0.057,0 0,0 -0.1423,0.3683 -0.1423,0.3683 0,0 0.053,0 0.053,0 0,0 0.039,-0.1067 0.039,-0.1067 0,0 0.1531,0 0.1531,0 0,0 0.036,0.1067 0.036,0.1067 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3683 -0.1389,-0.3683 z m -0.3311,0 c 0,0 -0.1673,0 -0.1673,0 0,0 0,0.3683 0,0.3683 0,0 0.05,0 0.05,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1175,0 0.1175,0 0.076,0 0.1139,-0.037 0.1139,-0.1102 0,-0.069 -0.038,-0.1032 -0.1139,-0.1032 z m -0.2777,0 c 0,0 -0.071,0 -0.071,0 0,0 -0.1104,0.3098 -0.1104,0.3098 0,0 -0.1068,-0.3098 -0.1068,-0.3098 0,0 -0.075,0 -0.075,0 0,0 0,0.3683 0,0.3683 0,0 0.05,0 0.05,0 0,0 0,-0.3063 0,-0.3063 0,0 0.1068,0.3063 0.1068,0.3063 0,0 0.05,0 0.05,0 0,0 0.1104,-0.3098 0.1104,-0.3098 0,0 0,0.093 0,0.093 0,0 0,0.2169 0,0.2169 0,0 0.05,0 0.05,0 0,0 0,-0.3683 0,-0.3683 z m -1.4312,0.065 c 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,0.014 -0.043,0.041 0,0 0,0.3889 0,0.3889 0,0.018 -0.01,0.028 -0.028,0.028 0,0 -0.356,0 -0.356,0 -0.074,0 -0.1341,0.023 -0.1816,0.071 -0.048,0.047 -0.071,0.1061 -0.071,0.1773 0,0 0,0.8569 0,0.8569 0,0.069 0.024,0.1274 0.073,0.1756 0.049,0.048 0.1085,0.072 0.1798,0.072 0,0 0.8152,0 0.8152,0 0.029,0 0.043,-0.015 0.043,-0.045 0,0 0,-1.7243 0,-1.7243 z m 2.9585,1.2011 c 0,-0.03 -0.014,-0.045 -0.043,-0.045 0,0 -0.3559,0 -0.3559,0 -0.031,0 -0.046,0.015 -0.046,0.045 0,0 0,0.1996 0,0.1996 0,0.057 -0.028,0.086 -0.086,0.086 -0.059,0 -0.089,-0.029 -0.089,-0.086 0,0 0,-0.6125 0,-0.6125 0,-0.057 0.03,-0.086 0.089,-0.086 0.057,0 0.086,0.029 0.086,0.086 0,0 0,0.1617 0,0.1617 0,0.028 0.015,0.041 0.046,0.041 0,0 0.3559,0 0.3559,0 0.029,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2856 0,-0.2856 0,-0.069 -0.025,-0.1274 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.5482,0 -0.5482,0 -0.071,0 -0.1318,0.024 -0.1817,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.8535 0,0.8535 0,0.071 0.024,0.1308 0.073,0.179 0.049,0.048 0.1098,0.072 0.1834,0.072 0,0 0.5482,0 0.5482,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.179 0,0 0,-0.3167 0,-0.3167 z m -1.1784,-0.072 c 0,-0.069 -0.025,-0.1273 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.3312,0 -0.3312,0 -0.036,0 -0.053,-0.017 -0.053,-0.052 0,-0.037 0.018,-0.055 0.053,-0.055 0,0 0.4985,0 0.4985,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2753 0,-0.2753 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.7049,0 -0.7049,0 -0.071,0 -0.1318,0.024 -0.1816,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.3647 0,0.3647 0,0.069 0.025,0.1274 0.075,0.1756 0.05,0.048 0.1103,0.072 0.1816,0.072 0,0 0.3311,0 0.3311,0 0.045,0 0.068,0.023 0.068,0.069 0,0.041 -0.023,0.062 -0.068,0.062 0,0 -0.5448,0 -0.5448,0 -0.028,0 -0.043,0.015 -0.043,0.045 0,0 0,0.272 0,0.272 0,0.03 0.014,0.045 0.043,0.045 0,0 0.7513,0 0.7513,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.179 0,0 0,-0.389 0,-0.389 z m 1.0788,1.1531 c 0,0 -0.228,0 -0.228,0 0,0 0,-0.1239 0,-0.1239 0,0 0.2065,0 0.2065,0 0,0 0,-0.041 0,-0.041 0,0 -0.2065,0 -0.2065,0 0,0 0,-0.1135 0,-0.1135 0,0 0.2244,0 0.2244,0 0,0 0,-0.045 0,-0.045 0,0 -0.2742,0 -0.2742,0 0,0 0,0.3648 0,0.3648 0,0 0.2778,0 0.2778,0 0,0 0,-0.041 0,-0.041 z m -0.3703,-0.1515 c 0,0 -0.1674,0 -0.1674,0 0,0 0,0.041 0,0.041 0,0 0.1176,0 0.1176,0 0,0.08 -0.039,0.1204 -0.1176,0.1204 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.062,0 0.099,0.025 0.1104,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.063,-0.1204 -0.1602,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.064 0.017,0.1125 0.052,0.1446 0.034,0.032 0.075,0.048 0.1228,0.048 0.057,0 0.099,-0.02 0.1247,-0.059 0,0 0.014,0.048 0.014,0.048 0,0 0.032,0 0.032,0 0,0 0,-0.1927 0,-0.1927 z m -0.4984,-0.1721 c 0,0 -0.057,0 -0.057,0 0,0 -0.146,0.3648 -0.146,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.053,0 0.053,0 0,0 -0.1353,-0.3648 -0.1353,-0.3648 z m -0.2137,0.3579 c -0.012,0 -0.018,-0.017 -0.018,-0.038 0,0 0,-0.065 0,-0.065 0,-0.03 -0.018,-0.053 -0.046,-0.069 0.036,-0.018 0.053,-0.047 0.053,-0.086 0,-0.066 -0.042,-0.1 -0.1247,-0.1 0,0 -0.1779,0 -0.1779,0 0,0 0,0.3648 0,0.3648 0,0 0.053,0 0.053,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1245,0 0.1245,0 0.043,0 0.065,0.022 0.068,0.065 0,0 0.01,0.089 0.01,0.089 0,0 0.064,-0.01 0.064,-0.01 z m -0.5518,-0.3682 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.055 0.017,0.101 0.05,0.1377 0.033,0.037 0.078,0.055 0.1353,0.055 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1851,-0.1927 z m -0.1851,0.01 c 0,0 -0.3098,0 -0.3098,0 0,0 0,0.045 0,0.045 0,0 0.1318,0 0.1318,0 0,0 0,0.32 0,0.32 0,0 0.05,0 0.05,0 0,0 0,-0.32 0,-0.32 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0.1652 c 0,0 -0.1069,-0.024 -0.1069,-0.024 -0.031,-0.01 -0.046,-0.022 -0.046,-0.045 0,-0.044 0.029,-0.065 0.085,-0.065 0.064,0 0.096,0.025 0.096,0.076 0,0 0.046,0 0.046,0 0,-0.078 -0.049,-0.117 -0.146,-0.117 -0.088,0 -0.1317,0.038 -0.1317,0.1135 0,0.046 0.027,0.075 0.082,0.086 0,0 0.075,0.017 0.075,0.017 0.055,0.012 0.082,0.033 0.082,0.065 0,0.041 -0.033,0.062 -0.1,0.062 -0.069,0 -0.1032,-0.029 -0.1032,-0.086 0,0 -0.046,0 -0.046,0 0,0.085 0.05,0.1274 0.1495,0.1274 0.1,0 0.1495,-0.037 0.1495,-0.1102 0,-0.053 -0.028,-0.086 -0.085,-0.1 z m -0.5698,-0.1652 c 0,0 -0.057,0 -0.057,0 0,0 -0.1425,0.3648 -0.1425,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1532,0 0.1532,0 0,0 0.035,0.1032 0.035,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.1317,0 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1317,0 0.1317,0 0,0 0,0.32 0,0.32 0,0 0.053,0 0.053,0 0,0 0,-0.32 0,-0.32 0,0 0.1246,0 0.1246,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0 c 0,0 -0.061,0 -0.061,0 0,0 -0.1424,0.3648 -0.1424,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1531,0 0.1531,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.3916,0 c 0,0 -0.1567,0 -0.1567,0 0,0 0,0.3648 0,0.3648 0,0 0.1531,0 0.1531,0 0.1068,0 0.1602,-0.062 0.1602,-0.1859 0,-0.1193 -0.052,-0.1789 -0.1566,-0.1789 z m 2.8125,-1.8068 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.15,0.1169 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.088,0 0.1318,0.049 0.1318,0.148 0,0.101 -0.044,0.1514 -0.1318,0.1514 z m -0.9006,1.4215 c 0,0 -0.7548,0 -0.7548,0 -0.05,0 -0.091,-0.016 -0.1246,-0.048 -0.033,-0.032 -0.05,-0.072 -0.05,-0.1205 0,0 0,-0.8569 0,-0.8569 0,-0.048 0.017,-0.088 0.05,-0.1205 0.033,-0.032 0.075,-0.048 0.1246,-0.048 0,0 0.4201,0 0.4201,0 0.028,0 0.043,-0.015 0.043,-0.045 0,0 0,-0.389 0,-0.389 0,-0.018 0.01,-0.028 0.028,-0.028 0,0 0.2635,0 0.2635,0 0.017,0.016 0.025,0.025 0.025,0.028 0,0 0,1.6039 0,1.6039 0,0 -0.01,0.013 -0.025,0.024 z m 2.9317,-0.05 c -0.034,0.033 -0.077,0.05 -0.1263,0.05 0,0 -0.5482,0 -0.5482,0 -0.05,0 -0.093,-0.017 -0.1283,-0.05 -0.035,-0.033 -0.053,-0.074 -0.053,-0.1222 0,0 0,-0.8535 0,-0.8535 0,-0.048 0.018,-0.088 0.053,-0.1205 0.035,-0.032 0.078,-0.048 0.1283,-0.048 0,0 0.5482,0 0.5482,0 0.052,0 0.095,0.016 0.1282,0.047 0.033,0.031 0.05,0.072 0.05,0.1222 0,0 0,0.2271 0,0.2271 0,0.016 -0.01,0.024 -0.025,0.024 0,0 -0.235,0 -0.235,0 -0.017,0 -0.025,-0.01 -0.025,-0.024 0,0 0,-0.1032 0,-0.1032 0,-0.046 -0.016,-0.084 -0.048,-0.1153 -0.032,-0.031 -0.072,-0.046 -0.1193,-0.046 -0.047,0 -0.087,0.015 -0.1192,0.046 -0.032,0.031 -0.048,0.069 -0.048,0.1153 0,0 0,0.6125 0,0.6125 0,0.046 0.016,0.084 0.048,0.1154 0.032,0.031 0.072,0.046 0.1192,0.046 0.048,0 0.087,-0.015 0.1193,-0.046 0.032,-0.031 0.048,-0.07 0.048,-0.1154 0,0 0,-0.1445 0,-0.1445 0,-0.016 0.01,-0.024 0.025,-0.024 0,0 0.235,0 0.235,0 0,0 0.013,0.01 0.025,0.024 0,0 0,0.2616 0,0.2616 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.1784,0 c -0.034,0.033 -0.076,0.05 -0.1263,0.05 0,0 -0.6871,0 -0.6871,0 -0.019,0 -0.028,-0.01 -0.028,-0.024 0,0 0,-0.1549 0,-0.1549 0,-0.016 0.01,-0.024 0.028,-0.024 0,0 0.4806,0 0.4806,0 0.04,0 0.075,-0.014 0.1032,-0.041 0.028,-0.028 0.043,-0.061 0.043,-0.1 0,-0.041 -0.014,-0.076 -0.041,-0.1032 -0.027,-0.028 -0.062,-0.041 -0.105,-0.041 0,0 -0.3311,0 -0.3311,0 -0.05,0 -0.092,-0.017 -0.1265,-0.05 -0.034,-0.033 -0.052,-0.074 -0.052,-0.1223 0,0 0,-0.3647 0,-0.3647 0,-0.048 0.017,-0.088 0.052,-0.1205 0.034,-0.032 0.077,-0.048 0.1265,-0.048 0,0 0.6408,0 0.6408,0 0.017,0 0.025,0.01 0.025,0.024 0,0 0,0.1514 0,0.1514 0,0.018 -0.01,0.028 -0.025,0.028 0,0 -0.4344,0 -0.4344,0 -0.088,0 -0.1317,0.044 -0.1317,0.1308 0,0.034 0.013,0.064 0.039,0.09 0.026,0.025 0.057,0.038 0.093,0.038 0,0 0.3312,0 0.3312,0 0.047,0 0.089,0.017 0.1246,0.052 0.035,0.034 0.053,0.075 0.053,0.1204 0,0 0,0.389 0,0.389 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.0805,0.129 c 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,-0.015 -0.043,-0.045 0,0 0,-1.2665 0,-1.2665 0,-0.028 0.014,-0.041 0.043,-0.041 0,0 0.388,0 0.388,0 0.028,0 0.043,0.014 0.043,0.041 0,0 0,1.2665 0,1.2665 0,0.03 -0.014,0.045 -0.043,0.045 z m 1.0645,0.3545 c 0,0 -0.121,0 -0.121,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1281,0 0.1281,0 0.045,0 0.068,0.021 0.068,0.062 0,0.041 -0.025,0.062 -0.075,0.062 z m 0.2635,0.048 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.9261,0 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.5376,0 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.3026,0.1102 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.2823 0,-0.2823 0,0 0.093,0 0.093,0 0.078,0 0.1175,0.047 0.1175,0.1411 0,0.094 -0.037,0.1412 -0.1104,0.1412 z m 2.0934,0.01 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.09,0 0.1353,0.049 0.1353,0.148 0,0.101 -0.045,0.1514 -0.1353,0.1514 z m -0.6907,-1.7724 c 0,-0.016 -0.01,-0.024 -0.025,-0.024 0,0 -0.2635,0 -0.2635,0 -0.017,0 -0.025,0.01 -0.025,0.024 0,0 0,1.1461 0,1.1461 0,0.016 0.01,0.024 0.025,0.024 0,0 0.2635,0 0.2635,0 0.017,0 0.025,-0.01 0.025,-0.024 0,0 0,-1.1461 0,-1.1461 z m -0.9256,0.2616 c 0,-0.043 -0.016,-0.081 -0.048,-0.1119 -0.032,-0.031 -0.071,-0.047 -0.1157,-0.047 -0.045,0 -0.083,0.016 -0.114,0.047 -0.031,0.031 -0.046,0.068 -0.046,0.1119 0,0 0,0.6298 0,0.6298 0,0.046 0.015,0.084 0.044,0.1136 0.03,0.03 0.068,0.045 0.1157,0.045 0.045,0 0.084,-0.015 0.1157,-0.046 0.032,-0.031 0.048,-0.068 0.048,-0.1118 0,0 0,-0.6298 0,-0.6298 z m -0.1638,0.7089 c -0.055,0 -0.082,-0.026 -0.082,-0.079 0,0 0,-0.6298 0,-0.6298 0,-0.053 0.027,-0.079 0.082,-0.079 0.052,0 0.078,0.026 0.078,0.079 0,0 0,0.6298 0,0.6298 0,0.053 -0.026,0.079 -0.078,0.079 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3146.3642,8032.8231 1.9594,0 0,2.4741 -1.9594,0 z"
-         style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150302" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150304"
-         style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3143.5056,8032.823 1.9594,0 0,2.4742 -1.9594,0 z" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3140.3884,8032.7774 1.246,0 0,4.3672 -1.246,0 z"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.21079655;stroke-miterlimit:4"
-         id="path150306" />
-      <path
-         id="path150308"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.1318544;stroke-miterlimit:4"
-         d="m 3141.1469,8032.7774 0.4875,0 0,4.3672 -0.4875,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150310"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3146.3642,8036.2259 1.9594,0 0,1.082 -1.9594,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3143.5056,8036.2258 1.9594,0 0,1.0821 -1.9594,0 z"
-         style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150312"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150314"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         d="m 3077.334,8051.8344 30.2538,0.049 0.1832,6.404 -30.1839,-0.047 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 3080.6521,8053.5058 7.3806,0 0,0.7428 -7.3806,0 z"
-         id="path150316"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 3098.8228,8053.3701 0,3.2963 3.1351,0 0,-2.8356 0,-0.2439 0,-0.2168 -1.4369,0 0.7347,0.012 -0.016,0.105 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z"
-         id="path150318"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path150320"
-         d="m 3089.4043,8053.5058 7.3806,0 0,0.7428 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150322"
-         d="m 3080.861,8054.8985 7.3807,0 0,0.418 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.6133,8054.8985 7.3806,0 0,0.418 -7.3806,0 z"
-         id="path150324" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3081.0178,8056.0129 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path150326" />
-      <path
-         id="path150328"
-         d="m 3089.7701,8056.0129 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150330"
-         d="m 3081.0701,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.8223,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z"
-         id="path150332" />
-      <path
-         id="path150334"
-         d="m 3098.7052,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150336"
-         style="fill:#000000;stroke:none"
-         d="m 3077.334,8052.9022 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2443 -0.061,-1.561 2.8774,-0.052 22.2534,-0.01 25.0548,0 0.017,0.2963 0.018,0.2279 0.01,0.3251 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.4149 0.077,3.6729 0.2085,4.754 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path150338"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3102.7558,8053.3505 0,0.476 2.1705,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3102.7559,8056.6701 0,-0.4758 2.1703,0 0.016,-0.8009 0.5267,0 0,0.8 0,0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150340" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3077.6585,8058.4759 30.1103,-0.046 0.1832,6.4518 -29.9926,2e-4 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         id="path150342" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150344"
-         d="m 3080.9765,8060.1472 7.3806,0 0,0.7428 -7.3806,0 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path150346"
-         d="m 3099.1472,8060.0115 0,3.2963 3.1352,0 0,-2.8355 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0641 -1.0287,0 -0.016,0.093 -0.6694,0 0,-0.093 0,-3.0641 0.9797,0 0.016,-0.1162 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.7288,8060.1472 7.3806,0 0,0.7428 -7.3806,0 z"
-         id="path150348" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3081.1855,8061.54 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path150350" />
-      <path
-         id="path150352"
-         d="m 3089.9378,8061.54 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150354"
-         d="m 3081.3423,8062.6543 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3090.0945,8062.6543 7.3807,0 0,0.4178 -7.3807,0 z"
-         id="path150356" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3081.3945,8063.7221 7.3807,0 0,0.4178 -7.3807,0 z"
-         id="path150358" />
-      <path
-         id="path150360"
-         d="m 3090.1468,8063.7221 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3099.0297,8063.7221 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path150362" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3077.6585,8059.5437 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4861 0.01,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.349 -0.019,-0.5123 -0.091,-1.2444 -0.061,-1.5609 2.8774,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2962 0.018,0.2276 0.01,0.3249 -1.0213,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.7541 -0.8203,-0.014 -1.2737,0.045 -2.0695,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path150364" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3103.0803,8059.9919 0,0.4761 2.1704,0 0.016,0.8007 0.5267,0 0,-0.8 0,-0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150366" />
-      <path
-         id="path150368"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3103.0803,8063.3115 0,-0.4759 2.1704,0 0.016,-0.8008 0.5266,0 0,0.8001 0,0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3076.9343,8038.7375 30.2538,0.049 0.1831,6.4039 -30.1838,-0.047 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         id="path150370" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150372"
-         d="m 3080.2523,8040.4088 7.3806,0 0,0.7428 -7.3806,0 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path150374"
-         d="m 3098.423,8040.2731 0,3.2964 3.1352,0 0,-2.8356 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.1051 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.0046,8040.4088 7.3806,0 0,0.7428 -7.3806,0 z"
-         id="path150376" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3080.4613,8041.8016 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path150378" />
-      <path
-         id="path150380"
-         d="m 3089.2136,8041.8016 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150382"
-         d="m 3080.6181,8042.9159 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.3703,8042.9159 7.3807,0 0,0.4178 -7.3807,0 z"
-         id="path150384" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3080.6703,8043.9838 7.3807,0 0,0.4178 -7.3807,0 z"
-         id="path150386" />
-      <path
-         id="path150388"
-         d="m 3089.4226,8043.9838 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3098.3055,8043.9838 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path150390" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3076.9343,8039.8053 0.9144,0 c 0,0 0.254,2.324 0.381,3.4861 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.533,-0.01 -24.5191,0 0.1466,1.4149 0.077,3.6729 0.2086,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path150392" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3102.3561,8040.2535 0,0.4761 2.1704,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4759 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150394" />
-      <path
-         id="path150396"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3102.3562,8043.5732 0,-0.4759 2.1703,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path150398"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         d="m 3077.2588,8045.3798 30.1103,-0.046 0.1831,6.4519 -29.9925,2e-4 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 3080.5768,8047.0512 7.3806,0 0,0.7428 -7.3806,0 z"
-         id="path150400"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 3098.7475,8046.9155 0,3.2963 3.1351,0 0,-2.8356 0,-0.2438 0,-0.2169 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.0641 -1.0288,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0641 0.9798,0 0.016,-0.1161 z"
-         id="path150402"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path150404"
-         d="m 3089.329,8047.0512 7.3807,0 0,0.7428 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150406"
-         d="m 3080.7858,8048.4439 7.3806,0 0,0.418 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.538,8048.4439 7.3807,0 0,0.418 -7.3807,0 z"
-         id="path150408" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3080.9426,8049.5583 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path150410" />
-      <path
-         id="path150412"
-         d="m 3089.6948,8049.5583 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150414"
-         d="m 3080.9948,8050.6261 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.7471,8050.6261 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path150416" />
-      <path
-         id="path150418"
-         d="m 3098.6299,8050.6261 7.3807,0 0,0.4178 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150420"
-         style="fill:#000000;stroke:none"
-         d="m 3077.2588,8046.4476 0.9144,0 c 0,0 0.254,2.3241 0.3809,3.4862 0.01,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.349 -0.019,-0.5123 -0.091,-1.2444 -0.061,-1.5609 2.8773,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2961 0.018,0.2276 0.01,0.3249 -1.0214,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.754 -0.8203,-0.014 -1.2738,0.045 -2.0696,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path150422"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3102.6805,8046.8959 0,0.476 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8 0,-0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3102.6806,8050.2155 0,-0.4759 2.1703,0 0.016,-0.8008 0.5266,0 0,0.8 0,0.4759 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150424" />
-      <path
-         id="path150426"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3109.8465,8038.792 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1797 -0.1631,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.254,0.01 -0.4768,-0.1345 -0.4998,-0.3142 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.334 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150428"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3112.6281,8038.7316 0.4872,-0.011 c 0.254,-0.01 0.4768,0.1346 0.4998,0.3141 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3287 -0.4171,0.3342 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.3339 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3109.8938,8040.9734 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.163,0.3286 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3286 0.4171,-0.3341 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150430"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3112.6754,8040.913 0.4873,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.1631,0.3285 -0.417,0.3339 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.4171,-0.334 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150432"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150434"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3109.9451,8043.3405 0.4873,-0.011 c 0.2539,-0.01 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1798 -0.1631,0.3289 -0.417,0.3344 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.1631,-0.3287 0.417,-0.3343 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150436"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3112.7268,8043.2803 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1796 -0.1631,0.3287 -0.4171,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3285 0.417,-0.3341 z" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3110.0079,8045.5317 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1346 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.417,-0.3339 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150438" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3112.7895,8045.4712 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1345 0.4998,0.3142 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4873,0.011 c -0.2539,0.01 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.1631,-0.3286 0.417,-0.3342 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150440" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150442"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.0552,8047.713 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2489 c 0.023,0.1795 -0.163,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1796 0.163,-0.3288 0.417,-0.3343 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150444"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3112.8369,8047.6527 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3143 l 0.032,0.249 c 0.023,0.1794 -0.1631,0.3286 -0.417,0.334 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1796 0.1631,-0.3286 0.4171,-0.3342 z" />
-      <path
-         d="m 3110.1066,8050.0802 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3144 l 0.032,0.2488 c 0.023,0.1798 -0.1631,0.3289 -0.417,0.3343 l -0.4872,0.01 c -0.254,0.011 -0.4768,-0.1347 -0.4998,-0.3144 l -0.032,-0.2488 c -0.023,-0.1796 0.1631,-0.3288 0.417,-0.3342 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150446"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3112.8882,8050.0198 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1346 0.4998,0.3143 l 0.032,0.2489 c 0.023,0.1797 -0.1631,0.3288 -0.417,0.3343 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1346 -0.4998,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3287 0.417,-0.3342 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150448"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3110.1462,8052.292 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1797 -0.163,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1345 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1795 0.163,-0.3286 0.417,-0.334 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150450" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3112.9279,8052.2316 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1346 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3287 -0.417,0.3342 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.4171,-0.3339 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150452" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150454"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.1935,8054.4734 0.4872,-0.01 c 0.254,-0.011 0.4769,0.1348 0.4997,0.3142 l 0.032,0.2491 c 0.023,0.1793 -0.1631,0.3285 -0.417,0.334 l -0.4873,0.011 c -0.2539,0 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3286 0.417,-0.3341 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150456"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3112.9752,8054.413 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.163,0.3285 -0.417,0.334 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.417,-0.334 z" />
-      <path
-         d="m 3110.2449,8056.8405 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1798 -0.163,0.3289 -0.417,0.3344 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.163,-0.3287 0.417,-0.3343 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150458"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3113.0265,8056.7803 0.4873,-0.011 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1796 -0.1631,0.3287 -0.417,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3285 0.4171,-0.3341 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150460"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150462"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.3076,8059.032 0.4872,-0.011 c 0.254,-0.01 0.4768,0.1346 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1796 -0.163,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.334 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150464"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3113.0893,8058.9715 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1346 -0.4997,-0.3141 l -0.032,-0.249 c -0.023,-0.1797 0.1631,-0.3286 0.4171,-0.3342 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3110.3549,8061.2133 0.4873,-0.01 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.254,0.011 -0.4769,-0.1346 -0.4998,-0.3141 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3287 0.417,-0.3343 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150466"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3113.1366,8061.153 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1348 0.4997,0.3143 l 0.032,0.2491 c 0.023,0.1793 -0.1631,0.3285 -0.4171,0.3339 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3286 0.417,-0.3342 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150468"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150470"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.4063,8063.5805 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3144 l 0.032,0.2488 c 0.023,0.1798 -0.163,0.3289 -0.417,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3144 l -0.032,-0.2488 c -0.023,-0.1796 0.163,-0.3288 0.417,-0.3342 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150472"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3113.188,8063.5202 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1346 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1797 -0.163,0.3288 -0.417,0.3343 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1345 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.163,-0.3287 0.417,-0.3341 z" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3115.4455,8038.8188 30.1104,-0.046 0.065,6.4995 -29.9798,0 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         id="path150474" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150476"
-         d="m 3118.7635,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150478"
-         d="m 3136.9342,8040.3545 0,3.2964 3.1352,0 0,-3.2964 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9797,0 0.016,-0.1162 -1.6982,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.5158,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z"
-         id="path150480"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3118.9725,8041.883 7.3807,0 0,0.4179 -7.3807,0 z"
-         id="path150482"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150484"
-         d="m 3127.7248,8041.883 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150486"
-         d="m 3119.1293,8042.9973 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.8815,8042.9973 7.3807,0 0,0.4179 -7.3807,0 z"
-         id="path150488"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.1816,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path150490"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150492"
-         d="m 3127.9338,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3136.8167,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path150494"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3115.4455,8039.8867 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path150496" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3140.6911,8040.3349 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150498" />
-      <path
-         id="path150500"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3140.6912,8043.6546 0,-0.4759 2.1704,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path150502"
-         style="fill:#808080;stroke:#000000;stroke-width:0.43947119"
-         d="m 3115.591,8045.4602 29.9652,-0.046 0.065,6.4997 -29.8352,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 3118.893,8047.1317 7.345,0 0,0.7428 -7.345,0 z"
-         id="path150504"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3136.9761,8046.996 0,3.2963 3.12,0 0,-3.2963 -1.43,0 0.7313,0.012 -0.016,0.1049 0,3.064 -1.0238,0 -0.016,0.093 -0.6662,0 0,-0.093 0,-3.064 0.975,0 0.016,-0.1162 -1.69,0 z"
-         id="path150506" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150508"
-         d="m 3127.6031,8047.1317 7.345,0 0,0.7428 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150510"
-         d="m 3119.101,8048.5244 7.345,0 0,0.418 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.811,8048.5244 7.3451,0 0,0.418 -7.3451,0 z"
-         id="path150512" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.257,8049.6388 7.345,0 0,0.4178 -7.345,0 z"
-         id="path150514" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150516"
-         d="m 3127.9671,8049.6388 7.345,0 0,0.4178 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150518"
-         d="m 3119.309,8050.7066 7.345,0 0,0.4178 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3128.0191,8050.7066 7.345,0 0,0.4178 -7.345,0 z"
-         id="path150520" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150522"
-         d="m 3136.8591,8050.7066 7.3451,0 0,0.4178 -7.3451,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150524"
-         style="fill:#000000;stroke:none"
-         d="m 3115.591,8046.5281 0.91,0 c 0,0 0.2527,2.324 0.3791,3.4862 0.01,0.042 0.3247,0.045 0.6353,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5122 -0.091,-1.2443 -0.06,-1.5609 2.8635,-0.052 22.146,-0.011 24.934,0 0.017,0.2962 0.018,0.2276 0.01,0.325 -1.0165,0.011 -24.4147,-0.011 -24.4009,0 0.1459,1.4148 0.076,3.6729 0.2075,4.754 -0.8163,-0.014 -1.6576,0.045 -2.4496,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path150526"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3140.7149,8046.9764 0,0.476 2.16,0 0.016,0.8008 0.5242,0 0,-0.8001 0,-0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3140.715,8050.296 0,-0.4759 2.1599,0 0.016,-0.8008 0.5241,0 0,0.8 0,0.4759 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150528" />
-      <path
-         id="path150530"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.43793881"
-         d="m 3115.8,8051.8466 29.7566,-0.046 0.065,6.4996 -29.6275,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 3119.0791,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z"
-         id="path150532"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3137.0363,8053.3824 0,3.2963 3.0983,0 0,-3.2963 -1.4201,0 0.7262,0.012 -0.016,0.105 0,3.0639 -1.0166,0 -0.016,0.093 -0.6616,0 0,-0.093 0,-3.0639 0.9682,0 0.016,-0.1162 -1.6783,0 z"
-         id="path150534" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150536"
-         d="m 3127.7285,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150538"
-         d="m 3119.2856,8054.9109 7.2939,0 0,0.4179 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.935,8054.9109 7.294,0 0,0.4179 -7.294,0 z"
-         id="path150540" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.4405,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z"
-         id="path150542" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150544"
-         d="m 3128.09,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150546"
-         d="m 3119.4922,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3128.1416,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         id="path150548" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150550"
-         d="m 3136.9201,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150552"
-         style="fill:#000000;stroke:none"
-         d="m 3115.8,8052.9146 0.9037,0 c 0,0 0.251,2.324 0.3765,3.4861 0.01,0.042 0.3224,0.045 0.6308,0.081 0.079,0.011 0.01,-1.2255 -0.035,-2.349 -0.019,-0.5124 -0.09,-1.2444 -0.06,-1.561 2.8435,-0.052 21.9918,-0.01 24.7604,0 0.016,0.2962 0.018,0.2278 0.01,0.325 -1.0093,0.011 -24.2447,-0.01 -24.2309,0 0.1449,1.4149 0.076,3.6729 0.2061,4.7541 -0.8108,-0.014 -1.6461,0.045 -2.4326,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path150554"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3140.7491,8053.3628 0,0.476 2.1449,0 0.016,0.8008 0.5205,0 0,-0.8 0,-0.4759 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3140.7491,8056.6824 0,-0.4758 2.1449,0 0.016,-0.8009 0.5205,0 0,0.8001 0,0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150556" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3115.9438,8058.4881 29.6131,-0.046 0.064,6.4996 -29.4847,0 z"
-         style="fill:#808080;stroke:#000000;stroke-width:0.43688199"
-         id="path150558" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150560"
-         d="m 3119.207,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150562"
-         d="m 3137.0777,8060.0238 0,3.2964 3.0834,0 0,-3.2964 -1.4133,0 0.7227,0.012 -0.016,0.105 0,3.064 -1.0117,0 -0.016,0.093 -0.6585,0 0,-0.093 0,-3.064 0.9636,0 0.016,-0.1162 -1.6702,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.8147,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z"
-         id="path150564"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.4126,8061.5523 7.2587,0 0,0.4179 -7.2587,0 z"
-         id="path150566"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150568"
-         d="m 3128.0203,8061.5523 7.2588,0 0,0.4179 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150570"
-         d="m 3119.5667,8062.6666 7.2588,0 0,0.4178 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3128.1745,8062.6666 7.2587,0 0,0.4178 -7.2587,0 z"
-         id="path150572"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.6181,8063.7344 7.2588,0 0,0.4179 -7.2588,0 z"
-         id="path150574"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150576"
-         d="m 3128.2259,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3136.9621,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z"
-         id="path150578"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3115.9438,8059.556 0.8993,0 c 0,0 0.2498,2.324 0.3747,3.4862 0.01,0.042 0.3208,0.045 0.6278,0.081 0.079,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5123 -0.09,-1.2444 -0.06,-1.5609 2.8299,-0.052 21.8859,-0.011 24.6411,0 0.016,0.2962 0.017,0.2276 0.01,0.3249 -1.0045,0.011 -24.1279,-0.011 -24.1142,0 0.1442,1.4148 0.075,3.6729 0.2051,4.7541 -0.8068,-0.014 -1.6382,0.045 -2.4208,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path150580" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3140.7726,8060.0042 0,0.4761 2.1346,0 0.016,0.8008 0.518,0 0,-0.8001 0,-0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150582" />
-      <path
-         id="path150584"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3140.7726,8063.3239 0,-0.476 2.1345,0 0.016,-0.8008 0.5179,0 0,0.8001 0,0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3148.3782,8038.7453 0.4873,0 c 0.2541,0 0.4732,0.1467 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.327 l -0.025,-0.2496 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3231 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150586" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3151.1604,8038.7569 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1801 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4731,-0.1469 -0.4914,-0.3271 l -0.025,-0.2496 c -0.018,-0.18 0.1716,-0.3242 0.4256,-0.323 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150588" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150590"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.369,8040.9272 0.4874,0 c 0.2541,0 0.4731,0.147 0.4914,0.3269 l 0.025,0.2499 c 0.018,0.1798 -0.1715,0.3241 -0.4255,0.323 l -0.4873,0 c -0.2539,-0.01 -0.4732,-0.147 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3243 0.4255,-0.3232 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150592"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.1513,8040.9388 0.4874,0 c 0.2541,0 0.4731,0.147 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1799 -0.1715,0.3242 -0.4255,0.3231 l -0.4873,0 c -0.2542,0 -0.4732,-0.1471 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3242 0.4255,-0.3232 z" />
-      <path
-         d="m 3148.3591,8043.2948 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3245 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.3271 l -0.025,-0.2496 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150594"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3151.1414,8043.3065 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3234 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2497 c -0.018,-0.18 0.1716,-0.3242 0.4256,-0.3232 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150596"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150598"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3652,8045.4869 0.4873,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1801 -0.1716,0.3242 -0.4255,0.3232 l -0.4874,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2498 c -0.018,-0.18 0.1715,-0.3241 0.4255,-0.323 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150600"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.1475,8045.4984 0.4873,0 c 0.2541,0 0.4732,0.1467 0.4914,0.3269 l 0.025,0.2498 c 0.018,0.18 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1803 0.1716,-0.3243 0.4256,-0.3233 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3148.3561,8047.6686 0.4873,0 c 0.2541,0 0.4731,0.147 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1801 -0.1715,0.3243 -0.4255,0.3232 l -0.4873,0 c -0.2542,0 -0.4732,-0.1468 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150602"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3151.1383,8047.6804 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.18 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2498 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3232 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150604"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150606"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3462,8050.0365 0.4873,0 c 0.2541,0 0.4732,0.147 0.4914,0.3272 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3245 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1802 0.1715,-0.3245 0.4255,-0.3233 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150608"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.1284,8050.0481 0.4874,0 c 0.2541,0 0.4731,0.1468 0.4914,0.3271 l 0.025,0.2495 c 0.018,0.1803 -0.1715,0.3246 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1802 0.1716,-0.3245 0.4256,-0.3233 z" />
-      <path
-         id="path150610"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3286,8052.2485 0.4873,0 c 0.2541,0 0.4732,0.1468 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3243 -0.4255,0.3233 l -0.4874,0 c -0.2541,0 -0.4732,-0.1467 -0.4914,-0.327 l -0.025,-0.2496 c -0.018,-0.18 0.1715,-0.3243 0.4255,-0.3231 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150612"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.1108,8052.2602 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4731,-0.1468 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3229 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3148.3194,8054.4304 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.327 l 0.025,0.2498 c 0.018,0.1798 -0.1715,0.3242 -0.4255,0.3231 l -0.4873,0 c -0.2539,-0.01 -0.4732,-0.147 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1799 0.1715,-0.3243 0.4255,-0.3232 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150614"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3151.1017,8054.442 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1799 -0.1715,0.3242 -0.4255,0.323 l -0.4873,0 c -0.2542,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3232 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150616"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150618"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3095,8056.7981 0.4874,0 c 0.2541,0 0.4732,0.147 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1804 -0.1715,0.3245 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1802 0.1715,-0.3243 0.4255,-0.3233 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150620"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.0918,8056.8098 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.1802 -0.1716,0.3243 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2498 c -0.018,-0.1801 0.1716,-0.3241 0.4256,-0.3231 z" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3148.3156,8058.9904 0.4873,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1801 -0.1716,0.3243 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3231 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150622" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3151.0979,8059.0019 0.4873,0 c 0.2541,0 0.4732,0.1468 0.4914,0.327 l 0.025,0.2497 c 0.018,0.1799 -0.1716,0.3243 -0.4256,0.3232 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1802 0.1716,-0.3243 0.4256,-0.3233 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150624" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150626"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3064,8061.1722 0.4874,0 c 0.2541,0 0.4731,0.1469 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.18 -0.1715,0.3243 -0.4255,0.3232 l -0.4873,0 c -0.2542,0 -0.4732,-0.1469 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150628"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.0887,8061.1839 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.1799 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3243 0.4255,-0.3233 z" />
-      <path
-         d="m 3148.2965,8063.54 0.4874,0 c 0.2541,0 0.4732,0.147 0.4914,0.3272 l 0.025,0.2495 c 0.018,0.1803 -0.1716,0.3246 -0.4255,0.3234 l -0.4874,0 c -0.2541,0 -0.4731,-0.147 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1801 0.1715,-0.3245 0.4256,-0.3233 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150630"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3151.0788,8063.5516 0.4874,0 c 0.2541,0 0.4731,0.1469 0.4914,0.3271 l 0.025,0.2495 c 0.018,0.1803 -0.1716,0.3246 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1801 0.1716,-0.3245 0.4256,-0.3233 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path150632"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150634"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         d="m 3154.0074,8038.8188 30.361,-0.025 -0.2471,6.4782 -30.1139,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 3157.2635,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z"
-         id="path150636"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3175.4342,8040.3545 0,3.2964 3.1352,0 0,-3.2964 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9797,0 0.016,-0.1162 -1.6982,0 z"
-         id="path150638" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150640"
-         d="m 3166.0158,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150642"
-         d="m 3157.4725,8041.883 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.2248,8041.883 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path150644" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.6293,8042.9973 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path150646" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150648"
-         d="m 3166.3815,8042.9973 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150650"
-         d="m 3157.6816,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.4338,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path150652" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150654"
-         d="m 3175.3167,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150656"
-         style="fill:#000000;stroke:none"
-         d="m 3153.9455,8039.8867 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path150658"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3179.1911,8040.3349 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3179.1912,8043.6546 0,-0.4759 2.1704,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150660" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3154.0074,8045.4602 30.0488,-0.046 -0.1224,6.4997 -29.9264,-0.088 z"
-         style="fill:#808080;stroke:#000000;stroke-width:0.43947119"
-         id="path150662" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150664"
-         d="m 3157.393,8047.1317 7.345,0 0,0.7428 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150666"
-         d="m 3175.4761,8046.996 0,3.2963 3.12,0 0,-3.2963 -1.43,0 0.7313,0.012 -0.016,0.1049 0,3.064 -1.0238,0 -0.016,0.093 -0.6662,0 0,-0.093 0,-3.064 0.975,0 0.016,-0.1162 -1.6901,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.1031,8047.1317 7.345,0 0,0.7428 -7.345,0 z"
-         id="path150668"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.601,8048.5244 7.345,0 0,0.418 -7.345,0 z"
-         id="path150670"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150672"
-         d="m 3166.311,8048.5244 7.3451,0 0,0.418 -7.3451,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150674"
-         d="m 3157.757,8049.6388 7.345,0 0,0.4178 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.4671,8049.6388 7.345,0 0,0.4178 -7.345,0 z"
-         id="path150676"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.809,8050.7066 7.345,0 0,0.4178 -7.345,0 z"
-         id="path150678"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150680"
-         d="m 3166.5191,8050.7066 7.345,0 0,0.4178 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3175.3591,8050.7066 7.3451,0 0,0.4178 -7.3451,0 z"
-         id="path150682"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3154.091,8046.5281 0.91,0 c 0,0 0.2527,2.324 0.3791,3.4862 0.01,0.042 0.3247,0.045 0.6353,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5122 -0.09,-1.2443 -0.06,-1.5609 2.8635,-0.052 22.146,-0.011 24.934,0 0.017,0.2962 0.018,0.2276 0.01,0.325 -1.0165,0.011 -24.4147,-0.011 -24.4009,0 0.1459,1.4148 0.076,3.6729 0.2075,4.754 -0.8163,-0.014 -1.6576,0.045 -2.4496,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path150684" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3179.2149,8046.9764 0,0.476 2.16,0 0.016,0.8008 0.5242,0 0,-0.8001 0,-0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150686" />
-      <path
-         id="path150688"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3179.215,8050.296 0,-0.4759 2.1599,0 0.016,-0.8008 0.5241,0 0,0.8 0,0.4759 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3154.0074,8051.8466 29.9242,-0.046 -0.1228,6.4996 -29.8014,0 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.43793881"
-         id="path150690" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150692"
-         d="m 3157.5791,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150694"
-         d="m 3175.5363,8053.3824 0,3.2963 3.0983,0 0,-3.2963 -1.4201,0 0.7262,0.012 -0.016,0.105 0,3.0639 -1.0166,0 -0.016,0.093 -0.6616,0 0,-0.093 0,-3.0639 0.9682,0 0.016,-0.1162 -1.6783,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.2285,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z"
-         id="path150696"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.7856,8054.9109 7.2939,0 0,0.4179 -7.2939,0 z"
-         id="path150698"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150700"
-         d="m 3166.435,8054.9109 7.294,0 0,0.4179 -7.294,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150702"
-         d="m 3157.9405,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.59,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z"
-         id="path150704"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.9922,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         id="path150706"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path150708"
-         d="m 3166.6416,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3175.4201,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         id="path150710"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3154.0074,8052.9146 1.1963,0 c 0,0 0.251,2.324 0.3765,3.4861 0.01,0.042 0.3224,0.045 0.6308,0.081 0.079,0.011 0.01,-1.2255 -0.035,-2.349 -0.019,-0.5124 -0.09,-1.2444 -0.06,-1.561 2.8435,-0.052 21.9918,-0.01 24.7604,0 0.016,0.2962 0.018,0.2278 0.01,0.325 -1.0093,0.011 -24.2447,-0.01 -24.2309,0 0.1449,1.4149 0.076,3.6729 0.2061,4.7541 -0.8108,-0.014 -2.0672,-0.043 -2.8537,-0.043 z"
-         style="fill:#000000;stroke:none"
-         id="path150712" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3179.2491,8053.3628 0,0.476 2.1449,0 0.016,0.8008 0.5205,0 0,-0.8 0,-0.4759 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150714" />
-      <path
-         id="path150716"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3179.2491,8056.6824 0,-0.4758 2.1449,0 0.016,-0.8009 0.5205,0 0,0.8001 0,0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path150718"
-         style="fill:#808080;stroke:#000000;stroke-width:0.43688199"
-         d="m 3154.0074,8058.4881 29.862,-0.046 -0.061,6.4996 -29.8014,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 3157.707,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z"
-         id="path150720"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3175.5777,8060.0238 0,3.2964 3.0834,0 0,-3.2964 -1.4133,0 0.7227,0.012 -0.016,0.105 0,3.064 -1.0117,0 -0.016,0.093 -0.6585,0 0,-0.093 0,-3.064 0.9636,0 0.016,-0.1162 -1.6702,0 z"
-         id="path150722" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150724"
-         d="m 3166.3147,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150726"
-         d="m 3157.9126,8061.5523 7.2587,0 0,0.4179 -7.2587,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.5203,8061.5523 7.2588,0 0,0.4179 -7.2588,0 z"
-         id="path150728" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3158.0667,8062.6666 7.2588,0 0,0.4178 -7.2588,0 z"
-         id="path150730" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150732"
-         d="m 3166.6745,8062.6666 7.2587,0 0,0.4178 -7.2587,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150734"
-         d="m 3158.1181,8063.7344 7.2588,0 0,0.4179 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.7259,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z"
-         id="path150736" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path150738"
-         d="m 3175.4621,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150740"
-         style="fill:#000000;stroke:none"
-         d="m 3154.0074,8059.556 1.3357,0 c 0,0 0.2498,2.324 0.3747,3.4862 0.01,0.042 0.3208,0.045 0.6278,0.081 0.079,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5123 -0.09,-1.2444 -0.06,-1.5609 2.8299,-0.052 21.8859,-0.011 24.6411,0 0.016,0.2962 0.017,0.2276 0.01,0.3249 -1.0045,0.011 -24.1279,-0.011 -24.1142,0 0.1442,1.4148 0.075,3.6729 0.2051,4.7541 -0.8068,-0.014 -2.2025,-0.1316 -2.9852,-0.1316 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path150742"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3179.2726,8060.0042 0,0.4761 2.1346,0 0.016,0.8008 0.518,0 0,-0.8001 0,-0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3179.2726,8063.3239 0,-0.476 2.1345,0 0.016,-0.8008 0.5179,0 0,0.8001 0,0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path150744" />
-      <path
-         sodipodi:nodetypes="cccssccccccscccsccc"
-         inkscape:connector-curvature="0"
-         id="path150746"
-         d="m 3188.2295,8031.7948 c -0.7615,0 -1.4036,1.7174 -1.4532,3.8499 l -0.6205,26.0317 c -0.05,2.1332 0.5285,3.8502 1.29,3.8502 l 5.5518,0 c 0.7615,0 1.4037,-1.717 1.4532,-3.8502 l 0.147,-6.2782 -0.8491,-0.2764 0,-12.0533 1.143,0.3208 0.1796,-7.7456 c 0.05,-2.133 -0.5284,-3.8497 -1.2899,-3.8497 l -5.5519,0 z m 2.727,13.6037 c 0.2416,0.031 0.427,0.1615 0.4082,1.5207 -0.019,1.3592 -0.2319,1.7847 -0.4735,1.7583 -0.2417,-0.031 -0.4107,-0.4907 -0.3919,-1.8499 0.019,-1.3589 0.2156,-1.4553 0.4572,-1.4291 z"
-         style="fill:url(#linearGradient150816-2);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.46755612;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 3190.3579,8035.2121 c 0.062,-1.7546 0.4414,-1.171 1.1191,-0.164 l 1.3653,3.7837 -0.3256,25.492 c -0.3058,1.3892 -0.6828,0.6232 -1.1238,0.2762 l -1.5769,-4.5157 c 0.3209,-1.1632 0.4055,-0.5716 0.9296,-0.1129 l 0.6884,1.0765 0.2954,-21.8612 z"
-         inkscape:path-effect="#path-effect114909-4-2-8"
-         id="path150748"
-         d="m 3190.3579,8035.2121 1.1191,-0.164 1.3653,3.7837 -0.3256,25.492 -1.1238,0.2762 -1.5769,-4.5157 0.9296,-0.1129 0.6884,1.0765 0.2954,-21.8612 -1.3715,-3.9746"
-         style="fill:#808080;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 3190.2888,8040.6674 1.0251,2.1293 -0.2408,18.8508 -1.257,-1.5571 -0.038,3.0588 1.6211,1.4554 0.3584,-25.525 -1.4053,-3.8706 z"
-         inkscape:path-effect="#path-effect114906-4-1-1"
-         id="path150750"
-         d="m 3190.2888,8040.6674 1.0251,2.1293 -0.2408,18.8508 -1.257,-1.5571 -0.038,3.0588 1.6211,1.4554 0.3584,-25.525 -1.4053,-3.8706 -0.064,5.4584"
-         style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3076.8263,8032.663 61.066,0 0.039,4.8436 -60.8082,0 z"
-         style="fill:url(#linearGradient150818-5);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.75868785"
-         id="path150752" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150754"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3078.1898,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3081.4647,8033.2463 1.581,0 c 0.2144,0 0.4,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1436,-0.5222 0.358,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150756"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150758"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3084.7729,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1436,-0.5222 0.358,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3078.1898,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150760"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150762"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3081.4647,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1436,-0.5222 0.358,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3084.7729,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1436,-0.5222 0.358,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150764"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150766"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3088.1363,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3091.4112,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150768"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150770"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3094.7194,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3117.4035,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150772"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150774"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3120.6784,8033.2463 1.581,0 c 0.2144,0 0.4,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3123.9866,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150776"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150778"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3117.4035,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3120.6784,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150780"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150782"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3123.9866,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3127.35,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150784"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150786"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3130.6249,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3133.9331,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path150788"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path150790"
-         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3149.0158,8032.8231 1.9595,0 0,4.4187 -1.9595,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150792"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3097.7189,8036.8948 1.5808,0 c 0.2144,0 0.3999,-0.2331 0.416,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.3581,0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3100.9935,8036.8948 1.5809,0 c 0.2144,0 0.3999,-0.2331 0.4159,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.358,0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path150794"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150796"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3104.3014,8036.8948 1.5809,0 c 0.2144,0 0.3999,-0.2331 0.4159,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.358,0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3097.7189,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.3581,0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path150798"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150800"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3100.9935,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3104.3014,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path150802"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150804"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3107.6645,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3110.9392,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path150806"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path150808"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3114.2471,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1437,-0.5221 -0.3581,-0.5221 l -1.5808,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1437,0.5221 0.3581,0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-521.71568,-540.61225)">
+    <g style="display:inline" id="g150278" transform="translate(-2545.5938,-7490.419)">
+      <path sodipodi:nodetypes="ccccc" id="path150282" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.81043929;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 3073.8783,8031.4227 115.5848,0 0,34.1455 -115.5848,0 z" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="cccssccccccscccscsc" style="fill:url(#linearGradient150812-5);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31076902;stroke-miterlimit:4;stroke-dasharray:none" d="m 3074.2358,8031.6583 c 0.7535,0 1.3888,1.7244 1.4379,3.8676 l 0.6139,26.1527 c 0.049,2.1428 -0.5229,3.8676 -1.2763,3.8676 l -5.4931,0 c -0.7535,0 -1.3889,-1.7248 -1.438,-3.8676 l -0.1454,-6.3076 0.8402,-0.2778 0,-12.1092 -1.131,0.3218 -0.1777,-7.7811 c -0.049,-2.1428 0.5229,-3.8676 1.2764,-3.8676 l 5.4931,0 z m -2.6981,13.6342 c -0.2391,0.03 -0.4225,0.1948 -0.4039,1.5605 0.019,1.3653 0.2295,1.448 0.4685,1.4219 0.2391,-0.03 0.4063,-0.1492 0.3878,-1.5144 -0.019,-1.3657 -0.2134,-1.4945 -0.4524,-1.468 z" id="path150284" inkscape:connector-curvature="0"/>
+      <path style="fill:#808080;stroke:none" d="m 3072.1299,8035.0912 -1.1072,-0.1648 -1.3509,3.8013 0.3222,25.6103 1.1119,0.2777 1.5602,-4.5367 -0.9198,-0.1135 -0.6811,1.0815 -0.2922,-21.9628 1.3569,-3.993" id="path150286" inkscape:path-effect="#path-effect115151-0-9-1" inkscape:original-d="m 3072.1299,8035.0912 c -0.061,-1.7634 -0.4367,-1.1769 -1.1072,-0.1648 l -1.3509,3.8013 0.3222,25.6103 c 0.3026,1.3959 0.6756,0.6262 1.1119,0.2777 l 1.5602,-4.5367 c -0.3175,-1.1682 -0.4012,-0.5742 -0.9198,-0.1135 l -0.6811,1.0815 -0.2922,-21.9628 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+      <path style="fill:#4d4d4d;stroke:none" d="m 3072.1983,8040.5718 -1.0142,2.1392 0.2382,18.9383 1.2437,-1.5646 0.037,3.0736 -1.6039,1.4621 -0.3547,-25.6438 1.3905,-3.8886 0.063,5.4838" id="path150288" inkscape:path-effect="#path-effect115148-1-3-3" inkscape:original-d="m 3072.1983,8040.5718 -1.0142,2.1392 0.2382,18.9383 1.2437,-1.5646 0.037,3.0736 -1.6039,1.4621 -0.3547,-25.6438 1.3905,-3.8886 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path id="path150290" style="fill:url(#linearGradient150814-4);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.51374948" d="m 3151.8994,8033.155 32.5924,0 -0.1165,4.1673 -32.5924,0 z" inkscape:connector-curvature="0"/>
+      <path id="path150292" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold" d="m 3182.077,8034.0876 0.4495,0 c 0.1013,0 0.1771,0.01 0.2271,0.02 0.067,0.017 0.1207,0.048 0.1607,0.092 0.04,0.044 0.065,0.099 0.076,0.1631 0.011,0.065 0,0.1435 -0.019,0.2377 -0.02,0.083 -0.05,0.1542 -0.09,0.2142 -0.049,0.073 -0.1066,0.1324 -0.1743,0.1777 -0.051,0.034 -0.1154,0.062 -0.1926,0.08 -0.058,0.014 -0.1322,0.021 -0.223,0.021 l -0.4628,0 z m 0.2039,0.1702 -0.1643,0.6665 0.1836,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.078,-0.023 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.098 0.028,-0.045 0.051,-0.1064 0.07,-0.1842 0.019,-0.078 0.026,-0.1375 0.019,-0.1792 -0.01,-0.042 -0.022,-0.074 -0.046,-0.097 -0.024,-0.024 -0.058,-0.039 -0.1022,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z m -1.2772,0.836 -0.1872,-1.0062 0.2667,0 0.1246,0.7447 0.482,-0.7447 0.2609,0 -0.6844,1.0062 z m -1.2932,-1.0062 0.4496,0 c 0.1013,0 0.1771,0.01 0.227,0.02 0.067,0.017 0.1208,0.048 0.1608,0.092 0.04,0.044 0.065,0.099 0.076,0.1631 0.011,0.065 0,0.1435 -0.019,0.2377 -0.02,0.083 -0.05,0.1542 -0.09,0.2142 -0.049,0.073 -0.1067,0.1324 -0.1743,0.1777 -0.051,0.034 -0.1154,0.062 -0.1927,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4628,0 z m 0.204,0.1702 -0.1644,0.6665 0.1837,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.078,-0.023 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.098 0.028,-0.045 0.051,-0.1064 0.07,-0.1842 0.019,-0.078 0.026,-0.1375 0.019,-0.1792 -0.01,-0.042 -0.022,-0.074 -0.046,-0.097 -0.024,-0.024 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150294" d="m 3181.2289,8035.4035 c -1.116,0 -2.0207,0.1243 -2.0207,0.2785 0,0.154 0.9047,0.2784 2.0207,0.2784 1.1161,0 2.0208,-0.1244 2.0208,-0.2784 0,-0.1542 -0.9047,-0.2785 -2.0208,-0.2785 z m 0,0.2013 c 0.3133,0 0.5673,0.035 0.5673,0.077 0,0.043 -0.254,0.077 -0.5673,0.077 -0.3132,0 -0.5672,-0.035 -0.5672,-0.077 0,-0.043 0.254,-0.077 0.5672,-0.077 z" style="fill:#ffffff;stroke:none"/>
+      <text transform="scale(1.0170762,0.98321049)" sodipodi:linespacing="125%" id="text150296" y="8173.9023" x="3127.0452" style="font-size:0.66138339px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="8173.9023" x="3127.0452" id="tspan150298" sodipodi:role="line">ROM</tspan></text>
+      <path id="path150300" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 3170.009,8034.3202 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1032,0 0.1032,0 0.05,0 0.075,0.02 0.075,0.058 0,0.044 -0.026,0.065 -0.078,0.065 z m 0.7939,0.062 c -0.014,0.069 -0.051,0.1032 -0.1104,0.1032 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.017,-0.08 -0.069,-0.1204 -0.1567,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.1286 0.057,0.1928 0.1709,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m -1.6876,-0.2409 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.1286 0.062,0.1928 0.1851,0.1928 0.1235,0 0.1852,-0.064 0.1852,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1852,-0.1927 z m -0.2989,0.2409 c -0.012,0.069 -0.048,0.1032 -0.1069,0.1032 -0.085,0 -0.1281,-0.05 -0.1281,-0.1514 0,-0.099 0.041,-0.148 0.1246,-0.148 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.062,-0.1204 -0.1566,-0.1204 -0.1163,0 -0.1745,0.064 -0.1745,0.1927 0,0.1286 0.056,0.1928 0.1673,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m 2.371,-0.2306 c 0,0 -0.3061,0 -0.3061,0 0,0 0,0.045 0,0.045 0,0 0.1281,0 0.1281,0 0,0 0,0.3235 0,0.3235 0,0 0.05,0 0.05,0 0,0 0,-0.3235 0,-0.3235 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.8295,0 c 0,0 -0.057,0 -0.057,0 0,0 -0.1423,0.3683 -0.1423,0.3683 0,0 0.053,0 0.053,0 0,0 0.039,-0.1067 0.039,-0.1067 0,0 0.1531,0 0.1531,0 0,0 0.036,0.1067 0.036,0.1067 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3683 -0.1389,-0.3683 z m -0.3311,0 c 0,0 -0.1673,0 -0.1673,0 0,0 0,0.3683 0,0.3683 0,0 0.05,0 0.05,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1175,0 0.1175,0 0.076,0 0.1139,-0.037 0.1139,-0.1102 0,-0.069 -0.038,-0.1032 -0.1139,-0.1032 z m -0.2777,0 c 0,0 -0.071,0 -0.071,0 0,0 -0.1104,0.3098 -0.1104,0.3098 0,0 -0.1068,-0.3098 -0.1068,-0.3098 0,0 -0.075,0 -0.075,0 0,0 0,0.3683 0,0.3683 0,0 0.05,0 0.05,0 0,0 0,-0.3063 0,-0.3063 0,0 0.1068,0.3063 0.1068,0.3063 0,0 0.05,0 0.05,0 0,0 0.1104,-0.3098 0.1104,-0.3098 0,0 0,0.093 0,0.093 0,0 0,0.2169 0,0.2169 0,0 0.05,0 0.05,0 0,0 0,-0.3683 0,-0.3683 z m -1.4312,0.065 c 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,0.014 -0.043,0.041 0,0 0,0.3889 0,0.3889 0,0.018 -0.01,0.028 -0.028,0.028 0,0 -0.356,0 -0.356,0 -0.074,0 -0.1341,0.023 -0.1816,0.071 -0.048,0.047 -0.071,0.1061 -0.071,0.1773 0,0 0,0.8569 0,0.8569 0,0.069 0.024,0.1274 0.073,0.1756 0.049,0.048 0.1085,0.072 0.1798,0.072 0,0 0.8152,0 0.8152,0 0.029,0 0.043,-0.015 0.043,-0.045 0,0 0,-1.7243 0,-1.7243 z m 2.9585,1.2011 c 0,-0.03 -0.014,-0.045 -0.043,-0.045 0,0 -0.3559,0 -0.3559,0 -0.031,0 -0.046,0.015 -0.046,0.045 0,0 0,0.1996 0,0.1996 0,0.057 -0.028,0.086 -0.086,0.086 -0.059,0 -0.089,-0.029 -0.089,-0.086 0,0 0,-0.6125 0,-0.6125 0,-0.057 0.03,-0.086 0.089,-0.086 0.057,0 0.086,0.029 0.086,0.086 0,0 0,0.1617 0,0.1617 0,0.028 0.015,0.041 0.046,0.041 0,0 0.3559,0 0.3559,0 0.029,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2856 0,-0.2856 0,-0.069 -0.025,-0.1274 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.5482,0 -0.5482,0 -0.071,0 -0.1318,0.024 -0.1817,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.8535 0,0.8535 0,0.071 0.024,0.1308 0.073,0.179 0.049,0.048 0.1098,0.072 0.1834,0.072 0,0 0.5482,0 0.5482,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.179 0,0 0,-0.3167 0,-0.3167 z m -1.1784,-0.072 c 0,-0.069 -0.025,-0.1273 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.3312,0 -0.3312,0 -0.036,0 -0.053,-0.017 -0.053,-0.052 0,-0.037 0.018,-0.055 0.053,-0.055 0,0 0.4985,0 0.4985,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2753 0,-0.2753 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.7049,0 -0.7049,0 -0.071,0 -0.1318,0.024 -0.1816,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.3647 0,0.3647 0,0.069 0.025,0.1274 0.075,0.1756 0.05,0.048 0.1103,0.072 0.1816,0.072 0,0 0.3311,0 0.3311,0 0.045,0 0.068,0.023 0.068,0.069 0,0.041 -0.023,0.062 -0.068,0.062 0,0 -0.5448,0 -0.5448,0 -0.028,0 -0.043,0.015 -0.043,0.045 0,0 0,0.272 0,0.272 0,0.03 0.014,0.045 0.043,0.045 0,0 0.7513,0 0.7513,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.179 0,0 0,-0.389 0,-0.389 z m 1.0788,1.1531 c 0,0 -0.228,0 -0.228,0 0,0 0,-0.1239 0,-0.1239 0,0 0.2065,0 0.2065,0 0,0 0,-0.041 0,-0.041 0,0 -0.2065,0 -0.2065,0 0,0 0,-0.1135 0,-0.1135 0,0 0.2244,0 0.2244,0 0,0 0,-0.045 0,-0.045 0,0 -0.2742,0 -0.2742,0 0,0 0,0.3648 0,0.3648 0,0 0.2778,0 0.2778,0 0,0 0,-0.041 0,-0.041 z m -0.3703,-0.1515 c 0,0 -0.1674,0 -0.1674,0 0,0 0,0.041 0,0.041 0,0 0.1176,0 0.1176,0 0,0.08 -0.039,0.1204 -0.1176,0.1204 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.062,0 0.099,0.025 0.1104,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.063,-0.1204 -0.1602,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.064 0.017,0.1125 0.052,0.1446 0.034,0.032 0.075,0.048 0.1228,0.048 0.057,0 0.099,-0.02 0.1247,-0.059 0,0 0.014,0.048 0.014,0.048 0,0 0.032,0 0.032,0 0,0 0,-0.1927 0,-0.1927 z m -0.4984,-0.1721 c 0,0 -0.057,0 -0.057,0 0,0 -0.146,0.3648 -0.146,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.053,0 0.053,0 0,0 -0.1353,-0.3648 -0.1353,-0.3648 z m -0.2137,0.3579 c -0.012,0 -0.018,-0.017 -0.018,-0.038 0,0 0,-0.065 0,-0.065 0,-0.03 -0.018,-0.053 -0.046,-0.069 0.036,-0.018 0.053,-0.047 0.053,-0.086 0,-0.066 -0.042,-0.1 -0.1247,-0.1 0,0 -0.1779,0 -0.1779,0 0,0 0,0.3648 0,0.3648 0,0 0.053,0 0.053,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1245,0 0.1245,0 0.043,0 0.065,0.022 0.068,0.065 0,0 0.01,0.089 0.01,0.089 0,0 0.064,-0.01 0.064,-0.01 z m -0.5518,-0.3682 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.055 0.017,0.101 0.05,0.1377 0.033,0.037 0.078,0.055 0.1353,0.055 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1851,-0.1927 z m -0.1851,0.01 c 0,0 -0.3098,0 -0.3098,0 0,0 0,0.045 0,0.045 0,0 0.1318,0 0.1318,0 0,0 0,0.32 0,0.32 0,0 0.05,0 0.05,0 0,0 0,-0.32 0,-0.32 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0.1652 c 0,0 -0.1069,-0.024 -0.1069,-0.024 -0.031,-0.01 -0.046,-0.022 -0.046,-0.045 0,-0.044 0.029,-0.065 0.085,-0.065 0.064,0 0.096,0.025 0.096,0.076 0,0 0.046,0 0.046,0 0,-0.078 -0.049,-0.117 -0.146,-0.117 -0.088,0 -0.1317,0.038 -0.1317,0.1135 0,0.046 0.027,0.075 0.082,0.086 0,0 0.075,0.017 0.075,0.017 0.055,0.012 0.082,0.033 0.082,0.065 0,0.041 -0.033,0.062 -0.1,0.062 -0.069,0 -0.1032,-0.029 -0.1032,-0.086 0,0 -0.046,0 -0.046,0 0,0.085 0.05,0.1274 0.1495,0.1274 0.1,0 0.1495,-0.037 0.1495,-0.1102 0,-0.053 -0.028,-0.086 -0.085,-0.1 z m -0.5698,-0.1652 c 0,0 -0.057,0 -0.057,0 0,0 -0.1425,0.3648 -0.1425,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1532,0 0.1532,0 0,0 0.035,0.1032 0.035,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.1317,0 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1317,0 0.1317,0 0,0 0,0.32 0,0.32 0,0 0.053,0 0.053,0 0,0 0,-0.32 0,-0.32 0,0 0.1246,0 0.1246,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0 c 0,0 -0.061,0 -0.061,0 0,0 -0.1424,0.3648 -0.1424,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1531,0 0.1531,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.3916,0 c 0,0 -0.1567,0 -0.1567,0 0,0 0,0.3648 0,0.3648 0,0 0.1531,0 0.1531,0 0.1068,0 0.1602,-0.062 0.1602,-0.1859 0,-0.1193 -0.052,-0.1789 -0.1566,-0.1789 z m 2.8125,-1.8068 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.15,0.1169 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.088,0 0.1318,0.049 0.1318,0.148 0,0.101 -0.044,0.1514 -0.1318,0.1514 z m -0.9006,1.4215 c 0,0 -0.7548,0 -0.7548,0 -0.05,0 -0.091,-0.016 -0.1246,-0.048 -0.033,-0.032 -0.05,-0.072 -0.05,-0.1205 0,0 0,-0.8569 0,-0.8569 0,-0.048 0.017,-0.088 0.05,-0.1205 0.033,-0.032 0.075,-0.048 0.1246,-0.048 0,0 0.4201,0 0.4201,0 0.028,0 0.043,-0.015 0.043,-0.045 0,0 0,-0.389 0,-0.389 0,-0.018 0.01,-0.028 0.028,-0.028 0,0 0.2635,0 0.2635,0 0.017,0.016 0.025,0.025 0.025,0.028 0,0 0,1.6039 0,1.6039 0,0 -0.01,0.013 -0.025,0.024 z m 2.9317,-0.05 c -0.034,0.033 -0.077,0.05 -0.1263,0.05 0,0 -0.5482,0 -0.5482,0 -0.05,0 -0.093,-0.017 -0.1283,-0.05 -0.035,-0.033 -0.053,-0.074 -0.053,-0.1222 0,0 0,-0.8535 0,-0.8535 0,-0.048 0.018,-0.088 0.053,-0.1205 0.035,-0.032 0.078,-0.048 0.1283,-0.048 0,0 0.5482,0 0.5482,0 0.052,0 0.095,0.016 0.1282,0.047 0.033,0.031 0.05,0.072 0.05,0.1222 0,0 0,0.2271 0,0.2271 0,0.016 -0.01,0.024 -0.025,0.024 0,0 -0.235,0 -0.235,0 -0.017,0 -0.025,-0.01 -0.025,-0.024 0,0 0,-0.1032 0,-0.1032 0,-0.046 -0.016,-0.084 -0.048,-0.1153 -0.032,-0.031 -0.072,-0.046 -0.1193,-0.046 -0.047,0 -0.087,0.015 -0.1192,0.046 -0.032,0.031 -0.048,0.069 -0.048,0.1153 0,0 0,0.6125 0,0.6125 0,0.046 0.016,0.084 0.048,0.1154 0.032,0.031 0.072,0.046 0.1192,0.046 0.048,0 0.087,-0.015 0.1193,-0.046 0.032,-0.031 0.048,-0.07 0.048,-0.1154 0,0 0,-0.1445 0,-0.1445 0,-0.016 0.01,-0.024 0.025,-0.024 0,0 0.235,0 0.235,0 0,0 0.013,0.01 0.025,0.024 0,0 0,0.2616 0,0.2616 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.1784,0 c -0.034,0.033 -0.076,0.05 -0.1263,0.05 0,0 -0.6871,0 -0.6871,0 -0.019,0 -0.028,-0.01 -0.028,-0.024 0,0 0,-0.1549 0,-0.1549 0,-0.016 0.01,-0.024 0.028,-0.024 0,0 0.4806,0 0.4806,0 0.04,0 0.075,-0.014 0.1032,-0.041 0.028,-0.028 0.043,-0.061 0.043,-0.1 0,-0.041 -0.014,-0.076 -0.041,-0.1032 -0.027,-0.028 -0.062,-0.041 -0.105,-0.041 0,0 -0.3311,0 -0.3311,0 -0.05,0 -0.092,-0.017 -0.1265,-0.05 -0.034,-0.033 -0.052,-0.074 -0.052,-0.1223 0,0 0,-0.3647 0,-0.3647 0,-0.048 0.017,-0.088 0.052,-0.1205 0.034,-0.032 0.077,-0.048 0.1265,-0.048 0,0 0.6408,0 0.6408,0 0.017,0 0.025,0.01 0.025,0.024 0,0 0,0.1514 0,0.1514 0,0.018 -0.01,0.028 -0.025,0.028 0,0 -0.4344,0 -0.4344,0 -0.088,0 -0.1317,0.044 -0.1317,0.1308 0,0.034 0.013,0.064 0.039,0.09 0.026,0.025 0.057,0.038 0.093,0.038 0,0 0.3312,0 0.3312,0 0.047,0 0.089,0.017 0.1246,0.052 0.035,0.034 0.053,0.075 0.053,0.1204 0,0 0,0.389 0,0.389 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.0805,0.129 c 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,-0.015 -0.043,-0.045 0,0 0,-1.2665 0,-1.2665 0,-0.028 0.014,-0.041 0.043,-0.041 0,0 0.388,0 0.388,0 0.028,0 0.043,0.014 0.043,0.041 0,0 0,1.2665 0,1.2665 0,0.03 -0.014,0.045 -0.043,0.045 z m 1.0645,0.3545 c 0,0 -0.121,0 -0.121,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1281,0 0.1281,0 0.045,0 0.068,0.021 0.068,0.062 0,0.041 -0.025,0.062 -0.075,0.062 z m 0.2635,0.048 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.9261,0 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.5376,0 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.3026,0.1102 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.2823 0,-0.2823 0,0 0.093,0 0.093,0 0.078,0 0.1175,0.047 0.1175,0.1411 0,0.094 -0.037,0.1412 -0.1104,0.1412 z m 2.0934,0.01 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.09,0 0.1353,0.049 0.1353,0.148 0,0.101 -0.045,0.1514 -0.1353,0.1514 z m -0.6907,-1.7724 c 0,-0.016 -0.01,-0.024 -0.025,-0.024 0,0 -0.2635,0 -0.2635,0 -0.017,0 -0.025,0.01 -0.025,0.024 0,0 0,1.1461 0,1.1461 0,0.016 0.01,0.024 0.025,0.024 0,0 0.2635,0 0.2635,0 0.017,0 0.025,-0.01 0.025,-0.024 0,0 0,-1.1461 0,-1.1461 z m -0.9256,0.2616 c 0,-0.043 -0.016,-0.081 -0.048,-0.1119 -0.032,-0.031 -0.071,-0.047 -0.1157,-0.047 -0.045,0 -0.083,0.016 -0.114,0.047 -0.031,0.031 -0.046,0.068 -0.046,0.1119 0,0 0,0.6298 0,0.6298 0,0.046 0.015,0.084 0.044,0.1136 0.03,0.03 0.068,0.045 0.1157,0.045 0.045,0 0.084,-0.015 0.1157,-0.046 0.032,-0.031 0.048,-0.068 0.048,-0.1118 0,0 0,-0.6298 0,-0.6298 z m -0.1638,0.7089 c -0.055,0 -0.082,-0.026 -0.082,-0.079 0,0 0,-0.6298 0,-0.6298 0,-0.053 0.027,-0.079 0.082,-0.079 0.052,0 0.078,0.026 0.078,0.079 0,0 0,0.6298 0,0.6298 0,0.053 -0.026,0.079 -0.078,0.079 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 3146.3642,8032.8231 1.9594,0 0,2.4741 -1.9594,0 z" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150302"/>
+      <path inkscape:connector-curvature="0" id="path150304" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3143.5056,8032.823 1.9594,0 0,2.4742 -1.9594,0 z"/>
+      <path inkscape:connector-curvature="0" d="m 3140.3884,8032.7774 1.246,0 0,4.3672 -1.246,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.21079655;stroke-miterlimit:4" id="path150306"/>
+      <path id="path150308" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.1318544;stroke-miterlimit:4" d="m 3141.1469,8032.7774 0.4875,0 0,4.3672 -0.4875,0 z" inkscape:connector-curvature="0"/>
+      <path id="path150310" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3146.3642,8036.2259 1.9594,0 0,1.082 -1.9594,0 z" inkscape:connector-curvature="0"/>
+      <path d="m 3143.5056,8036.2258 1.9594,0 0,1.0821 -1.9594,0 z" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150312" inkscape:connector-curvature="0"/>
+      <path id="path150314" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" d="m 3077.334,8051.8344 30.2538,0.049 0.1832,6.404 -30.1839,-0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#000000;stroke:none" d="m 3080.6521,8053.5058 7.3806,0 0,0.7428 -7.3806,0 z" id="path150316" inkscape:connector-curvature="0"/>
+      <path style="fill:#000000;stroke:none" d="m 3098.8228,8053.3701 0,3.2963 3.1351,0 0,-2.8356 0,-0.2439 0,-0.2168 -1.4369,0 0.7347,0.012 -0.016,0.105 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z" id="path150318" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path150320" d="m 3089.4043,8053.5058 7.3806,0 0,0.7428 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150322" d="m 3080.861,8054.8985 7.3807,0 0,0.418 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.6133,8054.8985 7.3806,0 0,0.418 -7.3806,0 z" id="path150324"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3081.0178,8056.0129 7.3806,0 0,0.4178 -7.3806,0 z" id="path150326"/>
+      <path id="path150328" d="m 3089.7701,8056.0129 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150330" d="m 3081.0701,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.8223,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z" id="path150332"/>
+      <path id="path150334" d="m 3098.7052,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150336" style="fill:#000000;stroke:none" d="m 3077.334,8052.9022 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2443 -0.061,-1.561 2.8774,-0.052 22.2534,-0.01 25.0548,0 0.017,0.2963 0.018,0.2279 0.01,0.3251 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.4149 0.077,3.6729 0.2085,4.754 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path150338" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3102.7558,8053.3505 0,0.476 2.1705,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3102.7559,8056.6701 0,-0.4758 2.1703,0 0.016,-0.8009 0.5267,0 0,0.8 0,0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150340"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3077.6585,8058.4759 30.1103,-0.046 0.1832,6.4518 -29.9926,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" id="path150342"/>
+      <path inkscape:connector-curvature="0" id="path150344" d="m 3080.9765,8060.1472 7.3806,0 0,0.7428 -7.3806,0 z" style="fill:#000000;stroke:none"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path150346" d="m 3099.1472,8060.0115 0,3.2963 3.1352,0 0,-2.8355 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0641 -1.0287,0 -0.016,0.093 -0.6694,0 0,-0.093 0,-3.0641 0.9797,0 0.016,-0.1162 z" style="fill:#000000;stroke:none"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.7288,8060.1472 7.3806,0 0,0.7428 -7.3806,0 z" id="path150348"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3081.1855,8061.54 7.3806,0 0,0.4179 -7.3806,0 z" id="path150350"/>
+      <path id="path150352" d="m 3089.9378,8061.54 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150354" d="m 3081.3423,8062.6543 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3090.0945,8062.6543 7.3807,0 0,0.4178 -7.3807,0 z" id="path150356"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3081.3945,8063.7221 7.3807,0 0,0.4178 -7.3807,0 z" id="path150358"/>
+      <path id="path150360" d="m 3090.1468,8063.7221 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3099.0297,8063.7221 7.3806,0 0,0.4178 -7.3806,0 z" id="path150362"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3077.6585,8059.5437 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4861 0.01,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.349 -0.019,-0.5123 -0.091,-1.2444 -0.061,-1.5609 2.8774,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2962 0.018,0.2276 0.01,0.3249 -1.0213,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.7541 -0.8203,-0.014 -1.2737,0.045 -2.0695,0.045 z" style="fill:#000000;stroke:none" id="path150364"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3103.0803,8059.9919 0,0.4761 2.1704,0 0.016,0.8007 0.5267,0 0,-0.8 0,-0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150366"/>
+      <path id="path150368" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3103.0803,8063.3115 0,-0.4759 2.1704,0 0.016,-0.8008 0.5266,0 0,0.8001 0,0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3076.9343,8038.7375 30.2538,0.049 0.1831,6.4039 -30.1838,-0.047 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" id="path150370"/>
+      <path inkscape:connector-curvature="0" id="path150372" d="m 3080.2523,8040.4088 7.3806,0 0,0.7428 -7.3806,0 z" style="fill:#000000;stroke:none"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path150374" d="m 3098.423,8040.2731 0,3.2964 3.1352,0 0,-2.8356 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.1051 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z" style="fill:#000000;stroke:none"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.0046,8040.4088 7.3806,0 0,0.7428 -7.3806,0 z" id="path150376"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3080.4613,8041.8016 7.3806,0 0,0.4179 -7.3806,0 z" id="path150378"/>
+      <path id="path150380" d="m 3089.2136,8041.8016 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150382" d="m 3080.6181,8042.9159 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.3703,8042.9159 7.3807,0 0,0.4178 -7.3807,0 z" id="path150384"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3080.6703,8043.9838 7.3807,0 0,0.4178 -7.3807,0 z" id="path150386"/>
+      <path id="path150388" d="m 3089.4226,8043.9838 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3098.3055,8043.9838 7.3806,0 0,0.4178 -7.3806,0 z" id="path150390"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3076.9343,8039.8053 0.9144,0 c 0,0 0.254,2.324 0.381,3.4861 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.533,-0.01 -24.5191,0 0.1466,1.4149 0.077,3.6729 0.2086,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z" style="fill:#000000;stroke:none" id="path150392"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3102.3561,8040.2535 0,0.4761 2.1704,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4759 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150394"/>
+      <path id="path150396" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3102.3562,8043.5732 0,-0.4759 2.1703,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path150398" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" d="m 3077.2588,8045.3798 30.1103,-0.046 0.1831,6.4519 -29.9925,2e-4 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#000000;stroke:none" d="m 3080.5768,8047.0512 7.3806,0 0,0.7428 -7.3806,0 z" id="path150400" inkscape:connector-curvature="0"/>
+      <path style="fill:#000000;stroke:none" d="m 3098.7475,8046.9155 0,3.2963 3.1351,0 0,-2.8356 0,-0.2438 0,-0.2169 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.0641 -1.0288,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0641 0.9798,0 0.016,-0.1161 z" id="path150402" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path150404" d="m 3089.329,8047.0512 7.3807,0 0,0.7428 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150406" d="m 3080.7858,8048.4439 7.3806,0 0,0.418 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.538,8048.4439 7.3807,0 0,0.418 -7.3807,0 z" id="path150408"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3080.9426,8049.5583 7.3806,0 0,0.4178 -7.3806,0 z" id="path150410"/>
+      <path id="path150412" d="m 3089.6948,8049.5583 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150414" d="m 3080.9948,8050.6261 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.7471,8050.6261 7.3806,0 0,0.4178 -7.3806,0 z" id="path150416"/>
+      <path id="path150418" d="m 3098.6299,8050.6261 7.3807,0 0,0.4178 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150420" style="fill:#000000;stroke:none" d="m 3077.2588,8046.4476 0.9144,0 c 0,0 0.254,2.3241 0.3809,3.4862 0.01,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.349 -0.019,-0.5123 -0.091,-1.2444 -0.061,-1.5609 2.8773,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2961 0.018,0.2276 0.01,0.3249 -1.0214,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.754 -0.8203,-0.014 -1.2738,0.045 -2.0696,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path150422" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3102.6805,8046.8959 0,0.476 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8 0,-0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3102.6806,8050.2155 0,-0.4759 2.1703,0 0.016,-0.8008 0.5266,0 0,0.8 0,0.4759 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150424"/>
+      <path id="path150426" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3109.8465,8038.792 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1797 -0.1631,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.254,0.01 -0.4768,-0.1345 -0.4998,-0.3142 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.334 z" inkscape:connector-curvature="0"/>
+      <path id="path150428" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3112.6281,8038.7316 0.4872,-0.011 c 0.254,-0.01 0.4768,0.1346 0.4998,0.3141 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3287 -0.4171,0.3342 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.3339 z" inkscape:connector-curvature="0"/>
+      <path d="m 3109.8938,8040.9734 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.163,0.3286 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3286 0.4171,-0.3341 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150430" inkscape:connector-curvature="0"/>
+      <path d="m 3112.6754,8040.913 0.4873,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.1631,0.3285 -0.417,0.3339 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.4171,-0.334 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150432" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150434" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3109.9451,8043.3405 0.4873,-0.011 c 0.2539,-0.01 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1798 -0.1631,0.3289 -0.417,0.3344 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.1631,-0.3287 0.417,-0.3343 z"/>
+      <path inkscape:connector-curvature="0" id="path150436" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3112.7268,8043.2803 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1796 -0.1631,0.3287 -0.4171,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3285 0.417,-0.3341 z"/>
+      <path inkscape:connector-curvature="0" d="m 3110.0079,8045.5317 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1346 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.417,-0.3339 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150438"/>
+      <path inkscape:connector-curvature="0" d="m 3112.7895,8045.4712 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1345 0.4998,0.3142 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4873,0.011 c -0.2539,0.01 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.1631,-0.3286 0.417,-0.3342 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150440"/>
+      <path inkscape:connector-curvature="0" id="path150442" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.0552,8047.713 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2489 c 0.023,0.1795 -0.163,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1796 0.163,-0.3288 0.417,-0.3343 z"/>
+      <path inkscape:connector-curvature="0" id="path150444" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3112.8369,8047.6527 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3143 l 0.032,0.249 c 0.023,0.1794 -0.1631,0.3286 -0.417,0.334 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1796 0.1631,-0.3286 0.4171,-0.3342 z"/>
+      <path d="m 3110.1066,8050.0802 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3144 l 0.032,0.2488 c 0.023,0.1798 -0.1631,0.3289 -0.417,0.3343 l -0.4872,0.01 c -0.254,0.011 -0.4768,-0.1347 -0.4998,-0.3144 l -0.032,-0.2488 c -0.023,-0.1796 0.1631,-0.3288 0.417,-0.3342 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150446" inkscape:connector-curvature="0"/>
+      <path d="m 3112.8882,8050.0198 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1346 0.4998,0.3143 l 0.032,0.2489 c 0.023,0.1797 -0.1631,0.3288 -0.417,0.3343 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1346 -0.4998,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3287 0.417,-0.3342 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150448" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 3110.1462,8052.292 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1797 -0.163,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1345 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1795 0.163,-0.3286 0.417,-0.334 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150450"/>
+      <path inkscape:connector-curvature="0" d="m 3112.9279,8052.2316 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1346 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3287 -0.417,0.3342 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.4171,-0.3339 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150452"/>
+      <path inkscape:connector-curvature="0" id="path150454" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.1935,8054.4734 0.4872,-0.01 c 0.254,-0.011 0.4769,0.1348 0.4997,0.3142 l 0.032,0.2491 c 0.023,0.1793 -0.1631,0.3285 -0.417,0.334 l -0.4873,0.011 c -0.2539,0 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3286 0.417,-0.3341 z"/>
+      <path inkscape:connector-curvature="0" id="path150456" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3112.9752,8054.413 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.163,0.3285 -0.417,0.334 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.417,-0.334 z"/>
+      <path d="m 3110.2449,8056.8405 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1798 -0.163,0.3289 -0.417,0.3344 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.163,-0.3287 0.417,-0.3343 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150458" inkscape:connector-curvature="0"/>
+      <path d="m 3113.0265,8056.7803 0.4873,-0.011 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1796 -0.1631,0.3287 -0.417,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3285 0.4171,-0.3341 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150460" inkscape:connector-curvature="0"/>
+      <path id="path150462" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.3076,8059.032 0.4872,-0.011 c 0.254,-0.01 0.4768,0.1346 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1796 -0.163,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.334 z" inkscape:connector-curvature="0"/>
+      <path id="path150464" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3113.0893,8058.9715 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1346 -0.4997,-0.3141 l -0.032,-0.249 c -0.023,-0.1797 0.1631,-0.3286 0.4171,-0.3342 z" inkscape:connector-curvature="0"/>
+      <path d="m 3110.3549,8061.2133 0.4873,-0.01 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.254,0.011 -0.4769,-0.1346 -0.4998,-0.3141 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3287 0.417,-0.3343 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150466" inkscape:connector-curvature="0"/>
+      <path d="m 3113.1366,8061.153 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1348 0.4997,0.3143 l 0.032,0.2491 c 0.023,0.1793 -0.1631,0.3285 -0.4171,0.3339 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3286 0.417,-0.3342 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150468" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150470" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.4063,8063.5805 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3144 l 0.032,0.2488 c 0.023,0.1798 -0.163,0.3289 -0.417,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3144 l -0.032,-0.2488 c -0.023,-0.1796 0.163,-0.3288 0.417,-0.3342 z"/>
+      <path inkscape:connector-curvature="0" id="path150472" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3113.188,8063.5202 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1346 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1797 -0.163,0.3288 -0.417,0.3343 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1345 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.163,-0.3287 0.417,-0.3341 z"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3115.4455,8038.8188 30.1104,-0.046 0.065,6.4995 -29.9798,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" id="path150474"/>
+      <path inkscape:connector-curvature="0" id="path150476" d="m 3118.7635,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path150478" d="m 3136.9342,8040.3545 0,3.2964 3.1352,0 0,-3.2964 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9797,0 0.016,-0.1162 -1.6982,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.5158,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z" id="path150480" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3118.9725,8041.883 7.3807,0 0,0.4179 -7.3807,0 z" id="path150482" sodipodi:nodetypes="ccccc"/>
+      <path id="path150484" d="m 3127.7248,8041.883 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path150486" d="m 3119.1293,8042.9973 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.8815,8042.9973 7.3807,0 0,0.4179 -7.3807,0 z" id="path150488" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.1816,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" id="path150490" sodipodi:nodetypes="ccccc"/>
+      <path id="path150492" d="m 3127.9338,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3136.8167,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" id="path150494" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3115.4455,8039.8867 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z" style="fill:#000000;stroke:none" id="path150496"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3140.6911,8040.3349 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150498"/>
+      <path id="path150500" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3140.6912,8043.6546 0,-0.4759 2.1704,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path150502" style="fill:#808080;stroke:#000000;stroke-width:0.43947119" d="m 3115.591,8045.4602 29.9652,-0.046 0.065,6.4997 -29.8352,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 3118.893,8047.1317 7.345,0 0,0.7428 -7.345,0 z" id="path150504" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3136.9761,8046.996 0,3.2963 3.12,0 0,-3.2963 -1.43,0 0.7313,0.012 -0.016,0.1049 0,3.064 -1.0238,0 -0.016,0.093 -0.6662,0 0,-0.093 0,-3.064 0.975,0 0.016,-0.1162 -1.69,0 z" id="path150506"/>
+      <path sodipodi:nodetypes="ccccc" id="path150508" d="m 3127.6031,8047.1317 7.345,0 0,0.7428 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path150510" d="m 3119.101,8048.5244 7.345,0 0,0.418 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.811,8048.5244 7.3451,0 0,0.418 -7.3451,0 z" id="path150512"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.257,8049.6388 7.345,0 0,0.4178 -7.345,0 z" id="path150514"/>
+      <path sodipodi:nodetypes="ccccc" id="path150516" d="m 3127.9671,8049.6388 7.345,0 0,0.4178 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path150518" d="m 3119.309,8050.7066 7.345,0 0,0.4178 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3128.0191,8050.7066 7.345,0 0,0.4178 -7.345,0 z" id="path150520"/>
+      <path sodipodi:nodetypes="ccccc" id="path150522" d="m 3136.8591,8050.7066 7.3451,0 0,0.4178 -7.3451,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150524" style="fill:#000000;stroke:none" d="m 3115.591,8046.5281 0.91,0 c 0,0 0.2527,2.324 0.3791,3.4862 0.01,0.042 0.3247,0.045 0.6353,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5122 -0.091,-1.2443 -0.06,-1.5609 2.8635,-0.052 22.146,-0.011 24.934,0 0.017,0.2962 0.018,0.2276 0.01,0.325 -1.0165,0.011 -24.4147,-0.011 -24.4009,0 0.1459,1.4148 0.076,3.6729 0.2075,4.754 -0.8163,-0.014 -1.6576,0.045 -2.4496,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path150526" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3140.7149,8046.9764 0,0.476 2.16,0 0.016,0.8008 0.5242,0 0,-0.8001 0,-0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3140.715,8050.296 0,-0.4759 2.1599,0 0.016,-0.8008 0.5241,0 0,0.8 0,0.4759 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150528"/>
+      <path id="path150530" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.43793881" d="m 3115.8,8051.8466 29.7566,-0.046 0.065,6.4996 -29.6275,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 3119.0791,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z" id="path150532" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3137.0363,8053.3824 0,3.2963 3.0983,0 0,-3.2963 -1.4201,0 0.7262,0.012 -0.016,0.105 0,3.0639 -1.0166,0 -0.016,0.093 -0.6616,0 0,-0.093 0,-3.0639 0.9682,0 0.016,-0.1162 -1.6783,0 z" id="path150534"/>
+      <path sodipodi:nodetypes="ccccc" id="path150536" d="m 3127.7285,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path150538" d="m 3119.2856,8054.9109 7.2939,0 0,0.4179 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.935,8054.9109 7.294,0 0,0.4179 -7.294,0 z" id="path150540"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.4405,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z" id="path150542"/>
+      <path sodipodi:nodetypes="ccccc" id="path150544" d="m 3128.09,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path150546" d="m 3119.4922,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3128.1416,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" id="path150548"/>
+      <path sodipodi:nodetypes="ccccc" id="path150550" d="m 3136.9201,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150552" style="fill:#000000;stroke:none" d="m 3115.8,8052.9146 0.9037,0 c 0,0 0.251,2.324 0.3765,3.4861 0.01,0.042 0.3224,0.045 0.6308,0.081 0.079,0.011 0.01,-1.2255 -0.035,-2.349 -0.019,-0.5124 -0.09,-1.2444 -0.06,-1.561 2.8435,-0.052 21.9918,-0.01 24.7604,0 0.016,0.2962 0.018,0.2278 0.01,0.325 -1.0093,0.011 -24.2447,-0.01 -24.2309,0 0.1449,1.4149 0.076,3.6729 0.2061,4.7541 -0.8108,-0.014 -1.6461,0.045 -2.4326,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path150554" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3140.7491,8053.3628 0,0.476 2.1449,0 0.016,0.8008 0.5205,0 0,-0.8 0,-0.4759 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3140.7491,8056.6824 0,-0.4758 2.1449,0 0.016,-0.8009 0.5205,0 0,0.8001 0,0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150556"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3115.9438,8058.4881 29.6131,-0.046 0.064,6.4996 -29.4847,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.43688199" id="path150558"/>
+      <path inkscape:connector-curvature="0" id="path150560" d="m 3119.207,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path150562" d="m 3137.0777,8060.0238 0,3.2964 3.0834,0 0,-3.2964 -1.4133,0 0.7227,0.012 -0.016,0.105 0,3.064 -1.0117,0 -0.016,0.093 -0.6585,0 0,-0.093 0,-3.064 0.9636,0 0.016,-0.1162 -1.6702,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.8147,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z" id="path150564" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.4126,8061.5523 7.2587,0 0,0.4179 -7.2587,0 z" id="path150566" sodipodi:nodetypes="ccccc"/>
+      <path id="path150568" d="m 3128.0203,8061.5523 7.2588,0 0,0.4179 -7.2588,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path150570" d="m 3119.5667,8062.6666 7.2588,0 0,0.4178 -7.2588,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3128.1745,8062.6666 7.2587,0 0,0.4178 -7.2587,0 z" id="path150572" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.6181,8063.7344 7.2588,0 0,0.4179 -7.2588,0 z" id="path150574" sodipodi:nodetypes="ccccc"/>
+      <path id="path150576" d="m 3128.2259,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3136.9621,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z" id="path150578" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3115.9438,8059.556 0.8993,0 c 0,0 0.2498,2.324 0.3747,3.4862 0.01,0.042 0.3208,0.045 0.6278,0.081 0.079,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5123 -0.09,-1.2444 -0.06,-1.5609 2.8299,-0.052 21.8859,-0.011 24.6411,0 0.016,0.2962 0.017,0.2276 0.01,0.3249 -1.0045,0.011 -24.1279,-0.011 -24.1142,0 0.1442,1.4148 0.075,3.6729 0.2051,4.7541 -0.8068,-0.014 -1.6382,0.045 -2.4208,0.045 z" style="fill:#000000;stroke:none" id="path150580"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3140.7726,8060.0042 0,0.4761 2.1346,0 0.016,0.8008 0.518,0 0,-0.8001 0,-0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150582"/>
+      <path id="path150584" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3140.7726,8063.3239 0,-0.476 2.1345,0 0.016,-0.8008 0.5179,0 0,0.8001 0,0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path inkscape:connector-curvature="0" d="m 3148.3782,8038.7453 0.4873,0 c 0.2541,0 0.4732,0.1467 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.327 l -0.025,-0.2496 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3231 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150586"/>
+      <path inkscape:connector-curvature="0" d="m 3151.1604,8038.7569 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1801 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4731,-0.1469 -0.4914,-0.3271 l -0.025,-0.2496 c -0.018,-0.18 0.1716,-0.3242 0.4256,-0.323 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150588"/>
+      <path inkscape:connector-curvature="0" id="path150590" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.369,8040.9272 0.4874,0 c 0.2541,0 0.4731,0.147 0.4914,0.3269 l 0.025,0.2499 c 0.018,0.1798 -0.1715,0.3241 -0.4255,0.323 l -0.4873,0 c -0.2539,-0.01 -0.4732,-0.147 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3243 0.4255,-0.3232 z"/>
+      <path inkscape:connector-curvature="0" id="path150592" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.1513,8040.9388 0.4874,0 c 0.2541,0 0.4731,0.147 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1799 -0.1715,0.3242 -0.4255,0.3231 l -0.4873,0 c -0.2542,0 -0.4732,-0.1471 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3242 0.4255,-0.3232 z"/>
+      <path d="m 3148.3591,8043.2948 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3245 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.3271 l -0.025,-0.2496 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150594" inkscape:connector-curvature="0"/>
+      <path d="m 3151.1414,8043.3065 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3234 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2497 c -0.018,-0.18 0.1716,-0.3242 0.4256,-0.3232 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150596" inkscape:connector-curvature="0"/>
+      <path id="path150598" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3652,8045.4869 0.4873,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1801 -0.1716,0.3242 -0.4255,0.3232 l -0.4874,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2498 c -0.018,-0.18 0.1715,-0.3241 0.4255,-0.323 z" inkscape:connector-curvature="0"/>
+      <path id="path150600" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.1475,8045.4984 0.4873,0 c 0.2541,0 0.4732,0.1467 0.4914,0.3269 l 0.025,0.2498 c 0.018,0.18 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1803 0.1716,-0.3243 0.4256,-0.3233 z" inkscape:connector-curvature="0"/>
+      <path d="m 3148.3561,8047.6686 0.4873,0 c 0.2541,0 0.4731,0.147 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1801 -0.1715,0.3243 -0.4255,0.3232 l -0.4873,0 c -0.2542,0 -0.4732,-0.1468 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150602" inkscape:connector-curvature="0"/>
+      <path d="m 3151.1383,8047.6804 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.18 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2498 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3232 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150604" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150606" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3462,8050.0365 0.4873,0 c 0.2541,0 0.4732,0.147 0.4914,0.3272 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3245 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1802 0.1715,-0.3245 0.4255,-0.3233 z"/>
+      <path inkscape:connector-curvature="0" id="path150608" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.1284,8050.0481 0.4874,0 c 0.2541,0 0.4731,0.1468 0.4914,0.3271 l 0.025,0.2495 c 0.018,0.1803 -0.1715,0.3246 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1802 0.1716,-0.3245 0.4256,-0.3233 z"/>
+      <path id="path150610" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3286,8052.2485 0.4873,0 c 0.2541,0 0.4732,0.1468 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3243 -0.4255,0.3233 l -0.4874,0 c -0.2541,0 -0.4732,-0.1467 -0.4914,-0.327 l -0.025,-0.2496 c -0.018,-0.18 0.1715,-0.3243 0.4255,-0.3231 z" inkscape:connector-curvature="0"/>
+      <path id="path150612" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.1108,8052.2602 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4731,-0.1468 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3229 z" inkscape:connector-curvature="0"/>
+      <path d="m 3148.3194,8054.4304 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.327 l 0.025,0.2498 c 0.018,0.1798 -0.1715,0.3242 -0.4255,0.3231 l -0.4873,0 c -0.2539,-0.01 -0.4732,-0.147 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1799 0.1715,-0.3243 0.4255,-0.3232 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150614" inkscape:connector-curvature="0"/>
+      <path d="m 3151.1017,8054.442 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1799 -0.1715,0.3242 -0.4255,0.323 l -0.4873,0 c -0.2542,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3232 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150616" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150618" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3095,8056.7981 0.4874,0 c 0.2541,0 0.4732,0.147 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1804 -0.1715,0.3245 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1802 0.1715,-0.3243 0.4255,-0.3233 z"/>
+      <path inkscape:connector-curvature="0" id="path150620" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.0918,8056.8098 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.1802 -0.1716,0.3243 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2498 c -0.018,-0.1801 0.1716,-0.3241 0.4256,-0.3231 z"/>
+      <path inkscape:connector-curvature="0" d="m 3148.3156,8058.9904 0.4873,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1801 -0.1716,0.3243 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3231 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150622"/>
+      <path inkscape:connector-curvature="0" d="m 3151.0979,8059.0019 0.4873,0 c 0.2541,0 0.4732,0.1468 0.4914,0.327 l 0.025,0.2497 c 0.018,0.1799 -0.1716,0.3243 -0.4256,0.3232 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1802 0.1716,-0.3243 0.4256,-0.3233 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150624"/>
+      <path inkscape:connector-curvature="0" id="path150626" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3064,8061.1722 0.4874,0 c 0.2541,0 0.4731,0.1469 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.18 -0.1715,0.3243 -0.4255,0.3232 l -0.4873,0 c -0.2542,0 -0.4732,-0.1469 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z"/>
+      <path inkscape:connector-curvature="0" id="path150628" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.0887,8061.1839 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.1799 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3243 0.4255,-0.3233 z"/>
+      <path d="m 3148.2965,8063.54 0.4874,0 c 0.2541,0 0.4732,0.147 0.4914,0.3272 l 0.025,0.2495 c 0.018,0.1803 -0.1716,0.3246 -0.4255,0.3234 l -0.4874,0 c -0.2541,0 -0.4731,-0.147 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1801 0.1715,-0.3245 0.4256,-0.3233 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150630" inkscape:connector-curvature="0"/>
+      <path d="m 3151.0788,8063.5516 0.4874,0 c 0.2541,0 0.4731,0.1469 0.4914,0.3271 l 0.025,0.2495 c 0.018,0.1803 -0.1716,0.3246 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1801 0.1716,-0.3245 0.4256,-0.3233 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path150632" inkscape:connector-curvature="0"/>
+      <path id="path150634" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" d="m 3154.0074,8038.8188 30.361,-0.025 -0.2471,6.4782 -30.1139,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 3157.2635,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z" id="path150636" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3175.4342,8040.3545 0,3.2964 3.1352,0 0,-3.2964 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9797,0 0.016,-0.1162 -1.6982,0 z" id="path150638"/>
+      <path sodipodi:nodetypes="ccccc" id="path150640" d="m 3166.0158,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path150642" d="m 3157.4725,8041.883 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.2248,8041.883 7.3806,0 0,0.4179 -7.3806,0 z" id="path150644"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.6293,8042.9973 7.3806,0 0,0.4179 -7.3806,0 z" id="path150646"/>
+      <path sodipodi:nodetypes="ccccc" id="path150648" d="m 3166.3815,8042.9973 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path150650" d="m 3157.6816,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.4338,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" id="path150652"/>
+      <path sodipodi:nodetypes="ccccc" id="path150654" d="m 3175.3167,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150656" style="fill:#000000;stroke:none" d="m 3153.9455,8039.8867 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path150658" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3179.1911,8040.3349 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3179.1912,8043.6546 0,-0.4759 2.1704,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150660"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3154.0074,8045.4602 30.0488,-0.046 -0.1224,6.4997 -29.9264,-0.088 z" style="fill:#808080;stroke:#000000;stroke-width:0.43947119" id="path150662"/>
+      <path inkscape:connector-curvature="0" id="path150664" d="m 3157.393,8047.1317 7.345,0 0,0.7428 -7.345,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path150666" d="m 3175.4761,8046.996 0,3.2963 3.12,0 0,-3.2963 -1.43,0 0.7313,0.012 -0.016,0.1049 0,3.064 -1.0238,0 -0.016,0.093 -0.6662,0 0,-0.093 0,-3.064 0.975,0 0.016,-0.1162 -1.6901,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.1031,8047.1317 7.345,0 0,0.7428 -7.345,0 z" id="path150668" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.601,8048.5244 7.345,0 0,0.418 -7.345,0 z" id="path150670" sodipodi:nodetypes="ccccc"/>
+      <path id="path150672" d="m 3166.311,8048.5244 7.3451,0 0,0.418 -7.3451,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path150674" d="m 3157.757,8049.6388 7.345,0 0,0.4178 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.4671,8049.6388 7.345,0 0,0.4178 -7.345,0 z" id="path150676" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.809,8050.7066 7.345,0 0,0.4178 -7.345,0 z" id="path150678" sodipodi:nodetypes="ccccc"/>
+      <path id="path150680" d="m 3166.5191,8050.7066 7.345,0 0,0.4178 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3175.3591,8050.7066 7.3451,0 0,0.4178 -7.3451,0 z" id="path150682" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3154.091,8046.5281 0.91,0 c 0,0 0.2527,2.324 0.3791,3.4862 0.01,0.042 0.3247,0.045 0.6353,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5122 -0.09,-1.2443 -0.06,-1.5609 2.8635,-0.052 22.146,-0.011 24.934,0 0.017,0.2962 0.018,0.2276 0.01,0.325 -1.0165,0.011 -24.4147,-0.011 -24.4009,0 0.1459,1.4148 0.076,3.6729 0.2075,4.754 -0.8163,-0.014 -1.6576,0.045 -2.4496,0.045 z" style="fill:#000000;stroke:none" id="path150684"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3179.2149,8046.9764 0,0.476 2.16,0 0.016,0.8008 0.5242,0 0,-0.8001 0,-0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150686"/>
+      <path id="path150688" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3179.215,8050.296 0,-0.4759 2.1599,0 0.016,-0.8008 0.5241,0 0,0.8 0,0.4759 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3154.0074,8051.8466 29.9242,-0.046 -0.1228,6.4996 -29.8014,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.43793881" id="path150690"/>
+      <path inkscape:connector-curvature="0" id="path150692" d="m 3157.5791,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path150694" d="m 3175.5363,8053.3824 0,3.2963 3.0983,0 0,-3.2963 -1.4201,0 0.7262,0.012 -0.016,0.105 0,3.0639 -1.0166,0 -0.016,0.093 -0.6616,0 0,-0.093 0,-3.0639 0.9682,0 0.016,-0.1162 -1.6783,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.2285,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z" id="path150696" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.7856,8054.9109 7.2939,0 0,0.4179 -7.2939,0 z" id="path150698" sodipodi:nodetypes="ccccc"/>
+      <path id="path150700" d="m 3166.435,8054.9109 7.294,0 0,0.4179 -7.294,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path150702" d="m 3157.9405,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.59,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z" id="path150704" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.9922,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" id="path150706" sodipodi:nodetypes="ccccc"/>
+      <path id="path150708" d="m 3166.6416,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3175.4201,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" id="path150710" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3154.0074,8052.9146 1.1963,0 c 0,0 0.251,2.324 0.3765,3.4861 0.01,0.042 0.3224,0.045 0.6308,0.081 0.079,0.011 0.01,-1.2255 -0.035,-2.349 -0.019,-0.5124 -0.09,-1.2444 -0.06,-1.561 2.8435,-0.052 21.9918,-0.01 24.7604,0 0.016,0.2962 0.018,0.2278 0.01,0.325 -1.0093,0.011 -24.2447,-0.01 -24.2309,0 0.1449,1.4149 0.076,3.6729 0.2061,4.7541 -0.8108,-0.014 -2.0672,-0.043 -2.8537,-0.043 z" style="fill:#000000;stroke:none" id="path150712"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3179.2491,8053.3628 0,0.476 2.1449,0 0.016,0.8008 0.5205,0 0,-0.8 0,-0.4759 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150714"/>
+      <path id="path150716" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3179.2491,8056.6824 0,-0.4758 2.1449,0 0.016,-0.8009 0.5205,0 0,0.8001 0,0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path150718" style="fill:#808080;stroke:#000000;stroke-width:0.43688199" d="m 3154.0074,8058.4881 29.862,-0.046 -0.061,6.4996 -29.8014,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 3157.707,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z" id="path150720" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3175.5777,8060.0238 0,3.2964 3.0834,0 0,-3.2964 -1.4133,0 0.7227,0.012 -0.016,0.105 0,3.064 -1.0117,0 -0.016,0.093 -0.6585,0 0,-0.093 0,-3.064 0.9636,0 0.016,-0.1162 -1.6702,0 z" id="path150722"/>
+      <path sodipodi:nodetypes="ccccc" id="path150724" d="m 3166.3147,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path150726" d="m 3157.9126,8061.5523 7.2587,0 0,0.4179 -7.2587,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.5203,8061.5523 7.2588,0 0,0.4179 -7.2588,0 z" id="path150728"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3158.0667,8062.6666 7.2588,0 0,0.4178 -7.2588,0 z" id="path150730"/>
+      <path sodipodi:nodetypes="ccccc" id="path150732" d="m 3166.6745,8062.6666 7.2587,0 0,0.4178 -7.2587,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path150734" d="m 3158.1181,8063.7344 7.2588,0 0,0.4179 -7.2588,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.7259,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z" id="path150736"/>
+      <path sodipodi:nodetypes="ccccc" id="path150738" d="m 3175.4621,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path150740" style="fill:#000000;stroke:none" d="m 3154.0074,8059.556 1.3357,0 c 0,0 0.2498,2.324 0.3747,3.4862 0.01,0.042 0.3208,0.045 0.6278,0.081 0.079,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5123 -0.09,-1.2444 -0.06,-1.5609 2.8299,-0.052 21.8859,-0.011 24.6411,0 0.016,0.2962 0.017,0.2276 0.01,0.3249 -1.0045,0.011 -24.1279,-0.011 -24.1142,0 0.1442,1.4148 0.075,3.6729 0.2051,4.7541 -0.8068,-0.014 -2.2025,-0.1316 -2.9852,-0.1316 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path150742" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3179.2726,8060.0042 0,0.4761 2.1346,0 0.016,0.8008 0.518,0 0,-0.8001 0,-0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3179.2726,8063.3239 0,-0.476 2.1345,0 0.016,-0.8008 0.5179,0 0,0.8001 0,0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path150744"/>
+      <path sodipodi:nodetypes="cccssccccccscccsccc" inkscape:connector-curvature="0" id="path150746" d="m 3188.2295,8031.7948 c -0.7615,0 -1.4036,1.7174 -1.4532,3.8499 l -0.6205,26.0317 c -0.05,2.1332 0.5285,3.8502 1.29,3.8502 l 5.5518,0 c 0.7615,0 1.4037,-1.717 1.4532,-3.8502 l 0.147,-6.2782 -0.8491,-0.2764 0,-12.0533 1.143,0.3208 0.1796,-7.7456 c 0.05,-2.133 -0.5284,-3.8497 -1.2899,-3.8497 l -5.5519,0 z m 2.727,13.6037 c 0.2416,0.031 0.427,0.1615 0.4082,1.5207 -0.019,1.3592 -0.2319,1.7847 -0.4735,1.7583 -0.2417,-0.031 -0.4107,-0.4907 -0.3919,-1.8499 0.019,-1.3589 0.2156,-1.4553 0.4572,-1.4291 z" style="fill:url(#linearGradient150816-2);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.46755612;stroke-miterlimit:4;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 3190.3579,8035.2121 c 0.062,-1.7546 0.4414,-1.171 1.1191,-0.164 l 1.3653,3.7837 -0.3256,25.492 c -0.3058,1.3892 -0.6828,0.6232 -1.1238,0.2762 l -1.5769,-4.5157 c 0.3209,-1.1632 0.4055,-0.5716 0.9296,-0.1129 l 0.6884,1.0765 0.2954,-21.8612 z" inkscape:path-effect="#path-effect114909-4-2-8" id="path150748" d="m 3190.3579,8035.2121 1.1191,-0.164 1.3653,3.7837 -0.3256,25.492 -1.1238,0.2762 -1.5769,-4.5157 0.9296,-0.1129 0.6884,1.0765 0.2954,-21.8612 -1.3715,-3.9746" style="fill:#808080;fill-opacity:1;stroke:none"/>
+      <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 3190.2888,8040.6674 1.0251,2.1293 -0.2408,18.8508 -1.257,-1.5571 -0.038,3.0588 1.6211,1.4554 0.3584,-25.525 -1.4053,-3.8706 z" inkscape:path-effect="#path-effect114906-4-1-1" id="path150750" d="m 3190.2888,8040.6674 1.0251,2.1293 -0.2408,18.8508 -1.257,-1.5571 -0.038,3.0588 1.6211,1.4554 0.3584,-25.525 -1.4053,-3.8706 -0.064,5.4584" style="fill:#4d4d4d;fill-opacity:1;stroke:none"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3076.8263,8032.663 61.066,0 0.039,4.8436 -60.8082,0 z" style="fill:url(#linearGradient150818-5);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.75868785" id="path150752"/>
+      <path inkscape:connector-curvature="0" id="path150754" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3078.1898,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3081.4647,8033.2463 1.581,0 c 0.2144,0 0.4,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1436,-0.5222 0.358,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150756" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150758" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3084.7729,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1436,-0.5222 0.358,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3078.1898,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150760" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150762" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3081.4647,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1436,-0.5222 0.358,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3084.7729,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1436,-0.5222 0.358,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150764" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150766" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3088.1363,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3091.4112,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150768" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150770" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3094.7194,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3117.4035,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150772" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150774" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3120.6784,8033.2463 1.581,0 c 0.2144,0 0.4,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3123.9866,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150776" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150778" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3117.4035,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3120.6784,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150780" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150782" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3123.9866,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3127.35,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150784" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150786" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3130.6249,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3133.9331,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path150788" inkscape:connector-curvature="0"/>
+      <path id="path150790" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3149.0158,8032.8231 1.9595,0 0,4.4187 -1.9595,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150792" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3097.7189,8036.8948 1.5808,0 c 0.2144,0 0.3999,-0.2331 0.416,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.3581,0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3100.9935,8036.8948 1.5809,0 c 0.2144,0 0.3999,-0.2331 0.4159,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.358,0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path150794" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150796" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3104.3014,8036.8948 1.5809,0 c 0.2144,0 0.3999,-0.2331 0.4159,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.358,0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3097.7189,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.3581,0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path150798" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150800" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3100.9935,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3104.3014,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path150802" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150804" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3107.6645,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3110.9392,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path150806" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path150808" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3114.2471,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1437,-0.5221 -0.3581,-0.5221 l -1.5808,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1437,0.5221 0.3581,0.5221 z" sodipodi:nodetypes="ssccssccs"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Rackmountable_4U_server_3D.svg b/misc/images/svg/elements/Rackmountable_4U_server_3D.svg
index acd9eae74fa..5b2bdd4d07c 100644
--- a/misc/images/svg/elements/Rackmountable_4U_server_3D.svg
+++ b/misc/images/svg/elements/Rackmountable_4U_server_3D.svg
@@ -1,1707 +1,316 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.00577"
-   height="44.138649"
-   id="svg143134"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 40">
-  <defs
-     id="defs143136">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-49-0-6"
-       id="linearGradient116558-78-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,1.0820341,2678.7738,-618.44543)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.36697"
-       y2="7986.2241" />
-    <linearGradient
-       id="linearGradient42443-7-49-0-6">
-      <stop
-         id="stop42445-53-90-5-1"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-6-8-1" />
-      <stop
-         id="stop42449-3-2-0-1"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.00577" height="44.138649" id="svg143134" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 40">
+  <defs id="defs143136">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-49-0-6" id="linearGradient116558-78-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,1.0820341,2678.7738,-618.44543)" x1="407.2959" y1="8015.7466" x2="407.36697" y2="7986.2241"/>
+    <linearGradient id="linearGradient42443-7-49-0-6">
+      <stop id="stop42445-53-90-5-1" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-6-8-1"/>
+      <stop id="stop42449-3-2-0-1" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-49-0-6"
-       id="linearGradient116554-6-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0705895,0,0,2.2552383,2681.571,-9998.0671)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient142843">
-      <stop
-         id="stop142845"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop142847" />
-      <stop
-         id="stop142849"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-49-0-6" id="linearGradient116554-6-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0705895,0,0,2.2552383,2681.571,-9998.0671)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient142843">
+      <stop id="stop142845" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop142847"/>
+      <stop id="stop142849" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect115151-0-9-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect115148-1-3-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-00-0-5"
-       id="linearGradient116549-0-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,-0.03023962,1.0816114,2678.599,-619.60771)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-00-0-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-3-1-6" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-1-2-9" />
+    <inkscape:path-effect is_visible="true" id="path-effect115151-0-9-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect115148-1-3-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-00-0-5" id="linearGradient116549-0-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,-0.03023962,1.0816114,2678.599,-619.60771)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-00-0-5">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-3-1-6"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-1-2-9"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-7-1-3"
-       id="linearGradient116318-2-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,2.2448329,2679.0644,-9914.2367)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-7-1-3">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-20-1-0" />
-      <stop
-         id="stop76664-9-25-24-5-0"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-1-0-3" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-7-1-3" id="linearGradient116318-2-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,2.2448329,2679.0644,-9914.2367)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-7-1-3">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-20-1-0"/>
+      <stop id="stop76664-9-25-24-5-0" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-1-0-3"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect114909-4-2-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect114906-4-1-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-48-4-1"
-       id="linearGradient116313-9-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7085349,0,-0.04882499,1.0818583,1892.3114,-626.81389)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-48-4-1">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-3-6-3" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-52-4-2" />
+    <inkscape:path-effect effect="spiro" id="path-effect114909-4-2-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect114906-4-1-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-48-4-1" id="linearGradient116313-9-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.7085349,0,-0.04882499,1.0818583,1892.3114,-626.81389)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-48-4-1">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-3-6-3"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-52-4-2"/>
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="147.57002"
-     inkscape:cy="-40.790133"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="154"
-     inkscape:window-y="203"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata143139">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="147.57002" inkscape:cy="-40.790133" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="154" inkscape:window-y="203" inkscape:window-maximized="0"/>
+  <metadata id="metadata143139">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-227.42998,-447.4334)">
-    <g
-       style="display:inline"
-       transform="translate(-2839.8795,-7574.3967)"
-       id="g116566-7-1"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_4U_server_3D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3073.4683,8031.0333 0.1359,33.5103 116.5296,0.3784 -0.27,-33.9105 -31.8127,-9.1814 -53.7545,0 z"
-         style="fill:url(#linearGradient116558-78-7);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98543-3-9"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3073.8783,8031.4227 115.5848,0 0,34.1455 -115.5848,0 z"
-         style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.81043929;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path98545-1-4"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98547-9-6"
-         d="m 3074.2358,8031.6583 c 0.7535,0 1.3888,1.7244 1.4379,3.8676 l 0.6139,26.1527 c 0.049,2.1428 -0.5229,3.8676 -1.2763,3.8676 l -5.4931,0 c -0.7535,0 -1.3889,-1.7248 -1.438,-3.8676 l -0.1454,-6.3076 0.8402,-0.2778 0,-12.1092 -1.131,0.3218 -0.1777,-7.7811 c -0.049,-2.1428 0.5229,-3.8676 1.2764,-3.8676 l 5.4931,0 z m -2.6981,13.6342 c -0.2391,0.03 -0.4225,0.1948 -0.4039,1.5605 0.019,1.3653 0.2295,1.448 0.4685,1.4219 0.2391,-0.03 0.4063,-0.1492 0.3878,-1.5144 -0.019,-1.3657 -0.2134,-1.4945 -0.4524,-1.468 z"
-         style="fill:url(#linearGradient116554-6-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31076902;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:nodetypes="cccssccccccscccscsc" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 3072.1299,8035.0912 c -0.061,-1.7634 -0.4367,-1.1769 -1.1072,-0.1648 l -1.3509,3.8013 0.3222,25.6103 c 0.3026,1.3959 0.6756,0.6262 1.1119,0.2777 l 1.5602,-4.5367 c -0.3175,-1.1682 -0.4012,-0.5742 -0.9198,-0.1135 l -0.6811,1.0815 -0.2922,-21.9628 z"
-         inkscape:path-effect="#path-effect115151-0-9-1"
-         id="path98549-1-3"
-         d="m 3072.1299,8035.0912 -1.1072,-0.1648 -1.3509,3.8013 0.3222,25.6103 1.1119,0.2777 1.5602,-4.5367 -0.9198,-0.1135 -0.6811,1.0815 -0.2922,-21.9628 1.3569,-3.993"
-         style="fill:#808080;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 3072.1983,8040.5718 -1.0142,2.1392 0.2382,18.9383 1.2437,-1.5646 0.037,3.0736 -1.6039,1.4621 -0.3547,-25.6438 1.3905,-3.8886 z"
-         inkscape:path-effect="#path-effect115148-1-3-3"
-         id="path98551-13-0"
-         d="m 3072.1983,8040.5718 -1.0142,2.1392 0.2382,18.9383 1.2437,-1.5646 0.037,3.0736 -1.6039,1.4621 -0.3547,-25.6438 1.3905,-3.8886 0.063,5.4838"
-         style="fill:#4d4d4d;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3151.8994,8033.155 32.5924,0 -0.1165,4.1673 -32.5924,0 z"
-         style="fill:url(#linearGradient116549-0-8);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.51374948"
-         id="path98553-5-4" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3182.077,8034.0876 0.4495,0 c 0.1013,0 0.1771,0.01 0.2271,0.02 0.067,0.017 0.1207,0.048 0.1607,0.092 0.04,0.044 0.065,0.099 0.076,0.1631 0.011,0.065 0,0.1435 -0.019,0.2377 -0.02,0.083 -0.05,0.1542 -0.09,0.2142 -0.049,0.073 -0.1066,0.1324 -0.1743,0.1777 -0.051,0.034 -0.1154,0.062 -0.1926,0.08 -0.058,0.014 -0.1322,0.021 -0.223,0.021 l -0.4628,0 z m 0.2039,0.1702 -0.1643,0.6665 0.1836,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.078,-0.023 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.098 0.028,-0.045 0.051,-0.1064 0.07,-0.1842 0.019,-0.078 0.026,-0.1375 0.019,-0.1792 -0.01,-0.042 -0.022,-0.074 -0.046,-0.097 -0.024,-0.024 -0.058,-0.039 -0.1022,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z m -1.2772,0.836 -0.1872,-1.0062 0.2667,0 0.1246,0.7447 0.482,-0.7447 0.2609,0 -0.6844,1.0062 z m -1.2932,-1.0062 0.4496,0 c 0.1013,0 0.1771,0.01 0.227,0.02 0.067,0.017 0.1208,0.048 0.1608,0.092 0.04,0.044 0.065,0.099 0.076,0.1631 0.011,0.065 0,0.1435 -0.019,0.2377 -0.02,0.083 -0.05,0.1542 -0.09,0.2142 -0.049,0.073 -0.1067,0.1324 -0.1743,0.1777 -0.051,0.034 -0.1154,0.062 -0.1927,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4628,0 z m 0.204,0.1702 -0.1644,0.6665 0.1837,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.078,-0.023 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.098 0.028,-0.045 0.051,-0.1064 0.07,-0.1842 0.019,-0.078 0.026,-0.1375 0.019,-0.1792 -0.01,-0.042 -0.022,-0.074 -0.046,-0.097 -0.024,-0.024 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z"
-         style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-         id="path98557-8-1" />
-      <path
-         style="fill:#ffffff;stroke:none"
-         d="m 3181.2289,8035.4035 c -1.116,0 -2.0207,0.1243 -2.0207,0.2785 0,0.154 0.9047,0.2784 2.0207,0.2784 1.1161,0 2.0208,-0.1244 2.0208,-0.2784 0,-0.1542 -0.9047,-0.2785 -2.0208,-0.2785 z m 0,0.2013 c 0.3133,0 0.5673,0.035 0.5673,0.077 0,0.043 -0.254,0.077 -0.5673,0.077 -0.3132,0 -0.5672,-0.035 -0.5672,-0.077 0,-0.043 0.254,-0.077 0.5672,-0.077 z"
-         id="path98559-4-6"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-size:0.66138339px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         x="3127.0452"
-         y="8173.9023"
-         id="text98561-3-5"
-         sodipodi:linespacing="125%"
-         transform="scale(1.0170762,0.98321049)"><tspan
-           sodipodi:role="line"
-           id="tspan98563-1-9"
-           x="3127.0452"
-           y="8173.9023">ROM</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3170.009,8034.3202 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1032,0 0.1032,0 0.05,0 0.075,0.02 0.075,0.058 0,0.044 -0.026,0.065 -0.078,0.065 z m 0.7939,0.062 c -0.014,0.069 -0.051,0.1032 -0.1104,0.1032 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.017,-0.08 -0.069,-0.1204 -0.1567,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.1286 0.057,0.1928 0.1709,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m -1.6876,-0.2409 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.1286 0.062,0.1928 0.1851,0.1928 0.1235,0 0.1852,-0.064 0.1852,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1852,-0.1927 z m -0.2989,0.2409 c -0.012,0.069 -0.048,0.1032 -0.1069,0.1032 -0.085,0 -0.1281,-0.05 -0.1281,-0.1514 0,-0.099 0.041,-0.148 0.1246,-0.148 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.062,-0.1204 -0.1566,-0.1204 -0.1163,0 -0.1745,0.064 -0.1745,0.1927 0,0.1286 0.056,0.1928 0.1673,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m 2.371,-0.2306 c 0,0 -0.3061,0 -0.3061,0 0,0 0,0.045 0,0.045 0,0 0.1281,0 0.1281,0 0,0 0,0.3235 0,0.3235 0,0 0.05,0 0.05,0 0,0 0,-0.3235 0,-0.3235 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.8295,0 c 0,0 -0.057,0 -0.057,0 0,0 -0.1423,0.3683 -0.1423,0.3683 0,0 0.053,0 0.053,0 0,0 0.039,-0.1067 0.039,-0.1067 0,0 0.1531,0 0.1531,0 0,0 0.036,0.1067 0.036,0.1067 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3683 -0.1389,-0.3683 z m -0.3311,0 c 0,0 -0.1673,0 -0.1673,0 0,0 0,0.3683 0,0.3683 0,0 0.05,0 0.05,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1175,0 0.1175,0 0.076,0 0.1139,-0.037 0.1139,-0.1102 0,-0.069 -0.038,-0.1032 -0.1139,-0.1032 z m -0.2777,0 c 0,0 -0.071,0 -0.071,0 0,0 -0.1104,0.3098 -0.1104,0.3098 0,0 -0.1068,-0.3098 -0.1068,-0.3098 0,0 -0.075,0 -0.075,0 0,0 0,0.3683 0,0.3683 0,0 0.05,0 0.05,0 0,0 0,-0.3063 0,-0.3063 0,0 0.1068,0.3063 0.1068,0.3063 0,0 0.05,0 0.05,0 0,0 0.1104,-0.3098 0.1104,-0.3098 0,0 0,0.093 0,0.093 0,0 0,0.2169 0,0.2169 0,0 0.05,0 0.05,0 0,0 0,-0.3683 0,-0.3683 z m -1.4312,0.065 c 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,0.014 -0.043,0.041 0,0 0,0.3889 0,0.3889 0,0.018 -0.01,0.028 -0.028,0.028 0,0 -0.356,0 -0.356,0 -0.074,0 -0.1341,0.023 -0.1816,0.071 -0.048,0.047 -0.071,0.1061 -0.071,0.1773 0,0 0,0.8569 0,0.8569 0,0.069 0.024,0.1274 0.073,0.1756 0.049,0.048 0.1085,0.072 0.1798,0.072 0,0 0.8152,0 0.8152,0 0.029,0 0.043,-0.015 0.043,-0.045 0,0 0,-1.7243 0,-1.7243 z m 2.9585,1.2011 c 0,-0.03 -0.014,-0.045 -0.043,-0.045 0,0 -0.3559,0 -0.3559,0 -0.031,0 -0.046,0.015 -0.046,0.045 0,0 0,0.1996 0,0.1996 0,0.057 -0.028,0.086 -0.086,0.086 -0.059,0 -0.089,-0.029 -0.089,-0.086 0,0 0,-0.6125 0,-0.6125 0,-0.057 0.03,-0.086 0.089,-0.086 0.057,0 0.086,0.029 0.086,0.086 0,0 0,0.1617 0,0.1617 0,0.028 0.015,0.041 0.046,0.041 0,0 0.3559,0 0.3559,0 0.029,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2856 0,-0.2856 0,-0.069 -0.025,-0.1274 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.5482,0 -0.5482,0 -0.071,0 -0.1318,0.024 -0.1817,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.8535 0,0.8535 0,0.071 0.024,0.1308 0.073,0.179 0.049,0.048 0.1098,0.072 0.1834,0.072 0,0 0.5482,0 0.5482,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.179 0,0 0,-0.3167 0,-0.3167 z m -1.1784,-0.072 c 0,-0.069 -0.025,-0.1273 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.3312,0 -0.3312,0 -0.036,0 -0.053,-0.017 -0.053,-0.052 0,-0.037 0.018,-0.055 0.053,-0.055 0,0 0.4985,0 0.4985,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2753 0,-0.2753 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.7049,0 -0.7049,0 -0.071,0 -0.1318,0.024 -0.1816,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.3647 0,0.3647 0,0.069 0.025,0.1274 0.075,0.1756 0.05,0.048 0.1103,0.072 0.1816,0.072 0,0 0.3311,0 0.3311,0 0.045,0 0.068,0.023 0.068,0.069 0,0.041 -0.023,0.062 -0.068,0.062 0,0 -0.5448,0 -0.5448,0 -0.028,0 -0.043,0.015 -0.043,0.045 0,0 0,0.272 0,0.272 0,0.03 0.014,0.045 0.043,0.045 0,0 0.7513,0 0.7513,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.179 0,0 0,-0.389 0,-0.389 z m 1.0788,1.1531 c 0,0 -0.228,0 -0.228,0 0,0 0,-0.1239 0,-0.1239 0,0 0.2065,0 0.2065,0 0,0 0,-0.041 0,-0.041 0,0 -0.2065,0 -0.2065,0 0,0 0,-0.1135 0,-0.1135 0,0 0.2244,0 0.2244,0 0,0 0,-0.045 0,-0.045 0,0 -0.2742,0 -0.2742,0 0,0 0,0.3648 0,0.3648 0,0 0.2778,0 0.2778,0 0,0 0,-0.041 0,-0.041 z m -0.3703,-0.1515 c 0,0 -0.1674,0 -0.1674,0 0,0 0,0.041 0,0.041 0,0 0.1176,0 0.1176,0 0,0.08 -0.039,0.1204 -0.1176,0.1204 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.062,0 0.099,0.025 0.1104,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.063,-0.1204 -0.1602,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.064 0.017,0.1125 0.052,0.1446 0.034,0.032 0.075,0.048 0.1228,0.048 0.057,0 0.099,-0.02 0.1247,-0.059 0,0 0.014,0.048 0.014,0.048 0,0 0.032,0 0.032,0 0,0 0,-0.1927 0,-0.1927 z m -0.4984,-0.1721 c 0,0 -0.057,0 -0.057,0 0,0 -0.146,0.3648 -0.146,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.053,0 0.053,0 0,0 -0.1353,-0.3648 -0.1353,-0.3648 z m -0.2137,0.3579 c -0.012,0 -0.018,-0.017 -0.018,-0.038 0,0 0,-0.065 0,-0.065 0,-0.03 -0.018,-0.053 -0.046,-0.069 0.036,-0.018 0.053,-0.047 0.053,-0.086 0,-0.066 -0.042,-0.1 -0.1247,-0.1 0,0 -0.1779,0 -0.1779,0 0,0 0,0.3648 0,0.3648 0,0 0.053,0 0.053,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1245,0 0.1245,0 0.043,0 0.065,0.022 0.068,0.065 0,0 0.01,0.089 0.01,0.089 0,0 0.064,-0.01 0.064,-0.01 z m -0.5518,-0.3682 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.055 0.017,0.101 0.05,0.1377 0.033,0.037 0.078,0.055 0.1353,0.055 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1851,-0.1927 z m -0.1851,0.01 c 0,0 -0.3098,0 -0.3098,0 0,0 0,0.045 0,0.045 0,0 0.1318,0 0.1318,0 0,0 0,0.32 0,0.32 0,0 0.05,0 0.05,0 0,0 0,-0.32 0,-0.32 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0.1652 c 0,0 -0.1069,-0.024 -0.1069,-0.024 -0.031,-0.01 -0.046,-0.022 -0.046,-0.045 0,-0.044 0.029,-0.065 0.085,-0.065 0.064,0 0.096,0.025 0.096,0.076 0,0 0.046,0 0.046,0 0,-0.078 -0.049,-0.117 -0.146,-0.117 -0.088,0 -0.1317,0.038 -0.1317,0.1135 0,0.046 0.027,0.075 0.082,0.086 0,0 0.075,0.017 0.075,0.017 0.055,0.012 0.082,0.033 0.082,0.065 0,0.041 -0.033,0.062 -0.1,0.062 -0.069,0 -0.1032,-0.029 -0.1032,-0.086 0,0 -0.046,0 -0.046,0 0,0.085 0.05,0.1274 0.1495,0.1274 0.1,0 0.1495,-0.037 0.1495,-0.1102 0,-0.053 -0.028,-0.086 -0.085,-0.1 z m -0.5698,-0.1652 c 0,0 -0.057,0 -0.057,0 0,0 -0.1425,0.3648 -0.1425,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1532,0 0.1532,0 0,0 0.035,0.1032 0.035,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.1317,0 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1317,0 0.1317,0 0,0 0,0.32 0,0.32 0,0 0.053,0 0.053,0 0,0 0,-0.32 0,-0.32 0,0 0.1246,0 0.1246,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0 c 0,0 -0.061,0 -0.061,0 0,0 -0.1424,0.3648 -0.1424,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1531,0 0.1531,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.3916,0 c 0,0 -0.1567,0 -0.1567,0 0,0 0,0.3648 0,0.3648 0,0 0.1531,0 0.1531,0 0.1068,0 0.1602,-0.062 0.1602,-0.1859 0,-0.1193 -0.052,-0.1789 -0.1566,-0.1789 z m 2.8125,-1.8068 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.15,0.1169 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.088,0 0.1318,0.049 0.1318,0.148 0,0.101 -0.044,0.1514 -0.1318,0.1514 z m -0.9006,1.4215 c 0,0 -0.7548,0 -0.7548,0 -0.05,0 -0.091,-0.016 -0.1246,-0.048 -0.033,-0.032 -0.05,-0.072 -0.05,-0.1205 0,0 0,-0.8569 0,-0.8569 0,-0.048 0.017,-0.088 0.05,-0.1205 0.033,-0.032 0.075,-0.048 0.1246,-0.048 0,0 0.4201,0 0.4201,0 0.028,0 0.043,-0.015 0.043,-0.045 0,0 0,-0.389 0,-0.389 0,-0.018 0.01,-0.028 0.028,-0.028 0,0 0.2635,0 0.2635,0 0.017,0.016 0.025,0.025 0.025,0.028 0,0 0,1.6039 0,1.6039 0,0 -0.01,0.013 -0.025,0.024 z m 2.9317,-0.05 c -0.034,0.033 -0.077,0.05 -0.1263,0.05 0,0 -0.5482,0 -0.5482,0 -0.05,0 -0.093,-0.017 -0.1283,-0.05 -0.035,-0.033 -0.053,-0.074 -0.053,-0.1222 0,0 0,-0.8535 0,-0.8535 0,-0.048 0.018,-0.088 0.053,-0.1205 0.035,-0.032 0.078,-0.048 0.1283,-0.048 0,0 0.5482,0 0.5482,0 0.052,0 0.095,0.016 0.1282,0.047 0.033,0.031 0.05,0.072 0.05,0.1222 0,0 0,0.2271 0,0.2271 0,0.016 -0.01,0.024 -0.025,0.024 0,0 -0.235,0 -0.235,0 -0.017,0 -0.025,-0.01 -0.025,-0.024 0,0 0,-0.1032 0,-0.1032 0,-0.046 -0.016,-0.084 -0.048,-0.1153 -0.032,-0.031 -0.072,-0.046 -0.1193,-0.046 -0.047,0 -0.087,0.015 -0.1192,0.046 -0.032,0.031 -0.048,0.069 -0.048,0.1153 0,0 0,0.6125 0,0.6125 0,0.046 0.016,0.084 0.048,0.1154 0.032,0.031 0.072,0.046 0.1192,0.046 0.048,0 0.087,-0.015 0.1193,-0.046 0.032,-0.031 0.048,-0.07 0.048,-0.1154 0,0 0,-0.1445 0,-0.1445 0,-0.016 0.01,-0.024 0.025,-0.024 0,0 0.235,0 0.235,0 0,0 0.013,0.01 0.025,0.024 0,0 0,0.2616 0,0.2616 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.1784,0 c -0.034,0.033 -0.076,0.05 -0.1263,0.05 0,0 -0.6871,0 -0.6871,0 -0.019,0 -0.028,-0.01 -0.028,-0.024 0,0 0,-0.1549 0,-0.1549 0,-0.016 0.01,-0.024 0.028,-0.024 0,0 0.4806,0 0.4806,0 0.04,0 0.075,-0.014 0.1032,-0.041 0.028,-0.028 0.043,-0.061 0.043,-0.1 0,-0.041 -0.014,-0.076 -0.041,-0.1032 -0.027,-0.028 -0.062,-0.041 -0.105,-0.041 0,0 -0.3311,0 -0.3311,0 -0.05,0 -0.092,-0.017 -0.1265,-0.05 -0.034,-0.033 -0.052,-0.074 -0.052,-0.1223 0,0 0,-0.3647 0,-0.3647 0,-0.048 0.017,-0.088 0.052,-0.1205 0.034,-0.032 0.077,-0.048 0.1265,-0.048 0,0 0.6408,0 0.6408,0 0.017,0 0.025,0.01 0.025,0.024 0,0 0,0.1514 0,0.1514 0,0.018 -0.01,0.028 -0.025,0.028 0,0 -0.4344,0 -0.4344,0 -0.088,0 -0.1317,0.044 -0.1317,0.1308 0,0.034 0.013,0.064 0.039,0.09 0.026,0.025 0.057,0.038 0.093,0.038 0,0 0.3312,0 0.3312,0 0.047,0 0.089,0.017 0.1246,0.052 0.035,0.034 0.053,0.075 0.053,0.1204 0,0 0,0.389 0,0.389 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.0805,0.129 c 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,-0.015 -0.043,-0.045 0,0 0,-1.2665 0,-1.2665 0,-0.028 0.014,-0.041 0.043,-0.041 0,0 0.388,0 0.388,0 0.028,0 0.043,0.014 0.043,0.041 0,0 0,1.2665 0,1.2665 0,0.03 -0.014,0.045 -0.043,0.045 z m 1.0645,0.3545 c 0,0 -0.121,0 -0.121,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1281,0 0.1281,0 0.045,0 0.068,0.021 0.068,0.062 0,0.041 -0.025,0.062 -0.075,0.062 z m 0.2635,0.048 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.9261,0 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.5376,0 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.3026,0.1102 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.2823 0,-0.2823 0,0 0.093,0 0.093,0 0.078,0 0.1175,0.047 0.1175,0.1411 0,0.094 -0.037,0.1412 -0.1104,0.1412 z m 2.0934,0.01 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.09,0 0.1353,0.049 0.1353,0.148 0,0.101 -0.045,0.1514 -0.1353,0.1514 z m -0.6907,-1.7724 c 0,-0.016 -0.01,-0.024 -0.025,-0.024 0,0 -0.2635,0 -0.2635,0 -0.017,0 -0.025,0.01 -0.025,0.024 0,0 0,1.1461 0,1.1461 0,0.016 0.01,0.024 0.025,0.024 0,0 0.2635,0 0.2635,0 0.017,0 0.025,-0.01 0.025,-0.024 0,0 0,-1.1461 0,-1.1461 z m -0.9256,0.2616 c 0,-0.043 -0.016,-0.081 -0.048,-0.1119 -0.032,-0.031 -0.071,-0.047 -0.1157,-0.047 -0.045,0 -0.083,0.016 -0.114,0.047 -0.031,0.031 -0.046,0.068 -0.046,0.1119 0,0 0,0.6298 0,0.6298 0,0.046 0.015,0.084 0.044,0.1136 0.03,0.03 0.068,0.045 0.1157,0.045 0.045,0 0.084,-0.015 0.1157,-0.046 0.032,-0.031 0.048,-0.068 0.048,-0.1118 0,0 0,-0.6298 0,-0.6298 z m -0.1638,0.7089 c -0.055,0 -0.082,-0.026 -0.082,-0.079 0,0 0,-0.6298 0,-0.6298 0,-0.053 0.027,-0.079 0.082,-0.079 0.052,0 0.078,0.026 0.078,0.079 0,0 0,0.6298 0,0.6298 0,0.053 -0.026,0.079 -0.078,0.079 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="path98569-4-8" />
-      <path
-         id="path98571-7-2"
-         style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3146.3642,8032.8231 1.9594,0 0,2.4741 -1.9594,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3143.5056,8032.823 1.9594,0 0,2.4742 -1.9594,0 z"
-         style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98573-7-1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98575-8-1"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.21079655;stroke-miterlimit:4"
-         d="m 3140.3884,8032.7774 1.246,0 0,4.3672 -1.246,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3141.1469,8032.7774 0.4875,0 0,4.3672 -0.4875,0 z"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.1318544;stroke-miterlimit:4"
-         id="path98577-6-4" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3146.3642,8036.2259 1.9594,0 0,1.082 -1.9594,0 z"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98579-0-8" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98581-7-7"
-         style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3143.5056,8036.2258 1.9594,0 0,1.0821 -1.9594,0 z" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3077.334,8051.8344 30.2538,0.049 0.1832,6.404 -30.1839,-0.047 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         id="path98583-4-8" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98585-5-1"
-         d="m 3080.6521,8053.5058 7.3806,0 0,0.7428 -7.3806,0 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path98587-5-7"
-         d="m 3098.8228,8053.3701 0,3.2963 3.1351,0 0,-2.8356 0,-0.2439 0,-0.2168 -1.4369,0 0.7347,0.012 -0.016,0.105 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.4043,8053.5058 7.3806,0 0,0.7428 -7.3806,0 z"
-         id="path98589-6-1" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3080.861,8054.8985 7.3807,0 0,0.418 -7.3807,0 z"
-         id="path98591-2-7" />
-      <path
-         id="path98593-0-1"
-         d="m 3089.6133,8054.8985 7.3806,0 0,0.418 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98595-6-4"
-         d="m 3081.0178,8056.0129 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.7701,8056.0129 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98597-9-0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3081.0701,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z"
-         id="path98599-6-4" />
-      <path
-         id="path98601-0-7"
-         d="m 3089.8223,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3098.7052,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z"
-         id="path98603-3-6" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3077.334,8052.9022 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2443 -0.061,-1.561 2.8774,-0.052 22.2534,-0.01 25.0548,0 0.017,0.2963 0.018,0.2279 0.01,0.3251 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.4149 0.077,3.6729 0.2085,4.754 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path98605-22-4" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3102.7558,8053.3505 0,0.476 2.1705,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98607-9-4" />
-      <path
-         id="path98609-4-4"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3102.7559,8056.6701 0,-0.4758 2.1703,0 0.016,-0.8009 0.5267,0 0,0.8 0,0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path98611-1-2"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         d="m 3077.6585,8058.4759 30.1103,-0.046 0.1832,6.4518 -29.9926,2e-4 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 3080.9765,8060.1472 7.3806,0 0,0.7428 -7.3806,0 z"
-         id="path98613-2-2"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 3099.1472,8060.0115 0,3.2963 3.1352,0 0,-2.8355 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0641 -1.0287,0 -0.016,0.093 -0.6694,0 0,-0.093 0,-3.0641 0.9797,0 0.016,-0.1162 z"
-         id="path98615-98-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path98617-4-4"
-         d="m 3089.7288,8060.1472 7.3806,0 0,0.7428 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98619-2-8"
-         d="m 3081.1855,8061.54 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.9378,8061.54 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path98621-5-1" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3081.3423,8062.6543 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98623-32-9" />
-      <path
-         id="path98625-9-2"
-         d="m 3090.0945,8062.6543 7.3807,0 0,0.4178 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98627-1-8"
-         d="m 3081.3945,8063.7221 7.3807,0 0,0.4178 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3090.1468,8063.7221 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98629-1-0" />
-      <path
-         id="path98631-8-3"
-         d="m 3099.0297,8063.7221 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98633-8-9"
-         style="fill:#000000;stroke:none"
-         d="m 3077.6585,8059.5437 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4861 0.01,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.349 -0.019,-0.5123 -0.091,-1.2444 -0.061,-1.5609 2.8774,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2962 0.018,0.2276 0.01,0.3249 -1.0213,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.7541 -0.8203,-0.014 -1.2737,0.045 -2.0695,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path98635-6-9"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3103.0803,8059.9919 0,0.4761 2.1704,0 0.016,0.8007 0.5267,0 0,-0.8 0,-0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3103.0803,8063.3115 0,-0.4759 2.1704,0 0.016,-0.8008 0.5266,0 0,0.8001 0,0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98637-4-9" />
-      <path
-         id="path98639-0-0"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         d="m 3076.9343,8038.7375 30.2538,0.049 0.1831,6.4039 -30.1838,-0.047 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 3080.2523,8040.4088 7.3806,0 0,0.7428 -7.3806,0 z"
-         id="path98641-1-9"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 3098.423,8040.2731 0,3.2964 3.1352,0 0,-2.8356 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.1051 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z"
-         id="path98643-4-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path98645-1-5"
-         d="m 3089.0046,8040.4088 7.3806,0 0,0.7428 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98647-57-2"
-         d="m 3080.4613,8041.8016 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.2136,8041.8016 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path98649-4-0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3080.6181,8042.9159 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98651-70-8" />
-      <path
-         id="path98653-8-3"
-         d="m 3089.3703,8042.9159 7.3807,0 0,0.4178 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98655-7-7"
-         d="m 3080.6703,8043.9838 7.3807,0 0,0.4178 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.4226,8043.9838 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98657-7-7" />
-      <path
-         id="path98659-6-0"
-         d="m 3098.3055,8043.9838 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98661-5-9"
-         style="fill:#000000;stroke:none"
-         d="m 3076.9343,8039.8053 0.9144,0 c 0,0 0.254,2.324 0.381,3.4861 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.533,-0.01 -24.5191,0 0.1466,1.4149 0.077,3.6729 0.2086,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path98663-5-2"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3102.3561,8040.2535 0,0.4761 2.1704,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4759 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3102.3562,8043.5732 0,-0.4759 2.1703,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98665-7-7" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3077.2588,8045.3798 30.1103,-0.046 0.1831,6.4519 -29.9925,2e-4 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         id="path98667-0-2" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98669-4-6"
-         d="m 3080.5768,8047.0512 7.3806,0 0,0.7428 -7.3806,0 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path98671-4-0"
-         d="m 3098.7475,8046.9155 0,3.2963 3.1351,0 0,-2.8356 0,-0.2438 0,-0.2169 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.0641 -1.0288,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0641 0.9798,0 0.016,-0.1161 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.329,8047.0512 7.3807,0 0,0.7428 -7.3807,0 z"
-         id="path98673-35-3" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3080.7858,8048.4439 7.3806,0 0,0.418 -7.3806,0 z"
-         id="path98675-9-2" />
-      <path
-         id="path98677-3-8"
-         d="m 3089.538,8048.4439 7.3807,0 0,0.418 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98679-6-4"
-         d="m 3080.9426,8049.5583 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3089.6948,8049.5583 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98681-7-9" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3080.9948,8050.6261 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98683-3-6" />
-      <path
-         id="path98685-1-8"
-         d="m 3089.7471,8050.6261 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3098.6299,8050.6261 7.3807,0 0,0.4178 -7.3807,0 z"
-         id="path98687-0-4" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3077.2588,8046.4476 0.9144,0 c 0,0 0.254,2.3241 0.3809,3.4862 0.01,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.349 -0.019,-0.5123 -0.091,-1.2444 -0.061,-1.5609 2.8773,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2961 0.018,0.2276 0.01,0.3249 -1.0214,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.754 -0.8203,-0.014 -1.2738,0.045 -2.0696,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path98689-37-7" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3102.6805,8046.8959 0,0.476 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8 0,-0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98691-0-0" />
-      <path
-         id="path98693-0-3"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3102.6806,8050.2155 0,-0.4759 2.1703,0 0.016,-0.8008 0.5266,0 0,0.8 0,0.4759 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3109.8465,8038.792 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1797 -0.1631,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.254,0.01 -0.4768,-0.1345 -0.4998,-0.3142 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.334 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98695-4-0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3112.6281,8038.7316 0.4872,-0.011 c 0.254,-0.01 0.4768,0.1346 0.4998,0.3141 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3287 -0.4171,0.3342 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.3339 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98697-8-8" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98699-3-5"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3109.8938,8040.9734 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.163,0.3286 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3286 0.4171,-0.3341 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98701-6-5"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3112.6754,8040.913 0.4873,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.1631,0.3285 -0.417,0.3339 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.4171,-0.334 z" />
-      <path
-         d="m 3109.9451,8043.3405 0.4873,-0.011 c 0.2539,-0.01 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1798 -0.1631,0.3289 -0.417,0.3344 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.1631,-0.3287 0.417,-0.3343 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98703-51-0"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3112.7268,8043.2803 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1796 -0.1631,0.3287 -0.4171,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3285 0.417,-0.3341 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98705-1-9"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98707-61-0"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.0079,8045.5317 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1346 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.417,-0.3339 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98709-3-8"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3112.7895,8045.4712 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1345 0.4998,0.3142 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4873,0.011 c -0.2539,0.01 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.1631,-0.3286 0.417,-0.3342 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3110.0552,8047.713 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2489 c 0.023,0.1795 -0.163,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1796 0.163,-0.3288 0.417,-0.3343 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98711-4-4"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3112.8369,8047.6527 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3143 l 0.032,0.249 c 0.023,0.1794 -0.1631,0.3286 -0.417,0.334 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1796 0.1631,-0.3286 0.4171,-0.3342 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98713-00-9"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98715-4-6"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.1066,8050.0802 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3144 l 0.032,0.2488 c 0.023,0.1798 -0.1631,0.3289 -0.417,0.3343 l -0.4872,0.01 c -0.254,0.011 -0.4768,-0.1347 -0.4998,-0.3144 l -0.032,-0.2488 c -0.023,-0.1796 0.1631,-0.3288 0.417,-0.3342 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98717-4-4"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3112.8882,8050.0198 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1346 0.4998,0.3143 l 0.032,0.2489 c 0.023,0.1797 -0.1631,0.3288 -0.417,0.3343 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1346 -0.4998,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3287 0.417,-0.3342 z" />
-      <path
-         id="path98719-6-9"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.1462,8052.292 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1797 -0.163,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1345 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1795 0.163,-0.3286 0.417,-0.334 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98721-4-7"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3112.9279,8052.2316 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1346 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3287 -0.417,0.3342 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.4171,-0.3339 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3110.1935,8054.4734 0.4872,-0.01 c 0.254,-0.011 0.4769,0.1348 0.4997,0.3142 l 0.032,0.2491 c 0.023,0.1793 -0.1631,0.3285 -0.417,0.334 l -0.4873,0.011 c -0.2539,0 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3286 0.417,-0.3341 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98723-7-9"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3112.9752,8054.413 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.163,0.3285 -0.417,0.334 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.417,-0.334 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98725-2-3"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98727-14-1"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.2449,8056.8405 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1798 -0.163,0.3289 -0.417,0.3344 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.163,-0.3287 0.417,-0.3343 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98729-7-3"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3113.0265,8056.7803 0.4873,-0.011 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1796 -0.1631,0.3287 -0.417,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3285 0.4171,-0.3341 z" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3110.3076,8059.032 0.4872,-0.011 c 0.254,-0.01 0.4768,0.1346 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1796 -0.163,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.334 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98731-5-5" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3113.0893,8058.9715 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1346 -0.4997,-0.3141 l -0.032,-0.249 c -0.023,-0.1797 0.1631,-0.3286 0.4171,-0.3342 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98733-1-3" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98735-6-7"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3110.3549,8061.2133 0.4873,-0.01 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.254,0.011 -0.4769,-0.1346 -0.4998,-0.3141 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3287 0.417,-0.3343 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98737-0-1"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3113.1366,8061.153 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1348 0.4997,0.3143 l 0.032,0.2491 c 0.023,0.1793 -0.1631,0.3285 -0.4171,0.3339 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3286 0.417,-0.3342 z" />
-      <path
-         d="m 3110.4063,8063.5805 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3144 l 0.032,0.2488 c 0.023,0.1798 -0.163,0.3289 -0.417,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3144 l -0.032,-0.2488 c -0.023,-0.1796 0.163,-0.3288 0.417,-0.3342 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98739-1-3"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3113.188,8063.5202 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1346 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1797 -0.163,0.3288 -0.417,0.3343 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1345 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.163,-0.3287 0.417,-0.3341 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98741-6-6"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98743-1-9"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         d="m 3115.4455,8038.8188 30.1104,-0.046 0.065,6.4995 -29.9798,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 3118.7635,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z"
-         id="path98745-3-6"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3136.9342,8040.3545 0,3.2964 3.1352,0 0,-3.2964 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9797,0 0.016,-0.1162 -1.6982,0 z"
-         id="path98747-5-7" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98749-6-1"
-         d="m 3127.5158,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98751-96-5"
-         d="m 3118.9725,8041.883 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.7248,8041.883 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path98753-6-5" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.1293,8042.9973 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path98755-4-6" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98757-2-0"
-         d="m 3127.8815,8042.9973 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98759-7-4"
-         d="m 3119.1816,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.9338,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98761-5-7" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98763-7-8"
-         d="m 3136.8167,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98765-5-6"
-         style="fill:#000000;stroke:none"
-         d="m 3115.4455,8039.8867 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path98767-2-9"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3140.6911,8040.3349 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3140.6912,8043.6546 0,-0.4759 2.1704,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98769-9-5" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3115.591,8045.4602 29.9652,-0.046 0.065,6.4997 -29.8352,0 z"
-         style="fill:#808080;stroke:#000000;stroke-width:0.43947119"
-         id="path98771-3-1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98773-7-2"
-         d="m 3118.893,8047.1317 7.345,0 0,0.7428 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98775-1-5"
-         d="m 3136.9761,8046.996 0,3.2963 3.12,0 0,-3.2963 -1.43,0 0.7313,0.012 -0.016,0.1049 0,3.064 -1.0238,0 -0.016,0.093 -0.6662,0 0,-0.093 0,-3.064 0.975,0 0.016,-0.1162 -1.69,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.6031,8047.1317 7.345,0 0,0.7428 -7.345,0 z"
-         id="path98777-7-9"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.101,8048.5244 7.345,0 0,0.418 -7.345,0 z"
-         id="path98779-7-3"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98781-1-2"
-         d="m 3127.811,8048.5244 7.3451,0 0,0.418 -7.3451,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98783-65-5"
-         d="m 3119.257,8049.6388 7.345,0 0,0.4178 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.9671,8049.6388 7.345,0 0,0.4178 -7.345,0 z"
-         id="path98785-1-2"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.309,8050.7066 7.345,0 0,0.4178 -7.345,0 z"
-         id="path98787-3-4"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98789-7-6"
-         d="m 3128.0191,8050.7066 7.345,0 0,0.4178 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3136.8591,8050.7066 7.3451,0 0,0.4178 -7.3451,0 z"
-         id="path98791-0-7"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3115.591,8046.5281 0.91,0 c 0,0 0.2527,2.324 0.3791,3.4862 0.01,0.042 0.3247,0.045 0.6353,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5122 -0.091,-1.2443 -0.06,-1.5609 2.8635,-0.052 22.146,-0.011 24.934,0 0.017,0.2962 0.018,0.2276 0.01,0.325 -1.0165,0.011 -24.4147,-0.011 -24.4009,0 0.1459,1.4148 0.076,3.6729 0.2075,4.754 -0.8163,-0.014 -1.6576,0.045 -2.4496,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path98793-1-7" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3140.7149,8046.9764 0,0.476 2.16,0 0.016,0.8008 0.5242,0 0,-0.8001 0,-0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98795-4-9" />
-      <path
-         id="path98797-92-1"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3140.715,8050.296 0,-0.4759 2.1599,0 0.016,-0.8008 0.5241,0 0,0.8 0,0.4759 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3115.8,8051.8466 29.7566,-0.046 0.065,6.4996 -29.6275,0 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.43793881"
-         id="path98799-7-3" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98801-7-2"
-         d="m 3119.0791,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98803-6-8"
-         d="m 3137.0363,8053.3824 0,3.2963 3.0983,0 0,-3.2963 -1.4201,0 0.7262,0.012 -0.016,0.105 0,3.0639 -1.0166,0 -0.016,0.093 -0.6616,0 0,-0.093 0,-3.0639 0.9682,0 0.016,-0.1162 -1.6783,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3127.7285,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z"
-         id="path98805-5-6"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.2856,8054.9109 7.2939,0 0,0.4179 -7.2939,0 z"
-         id="path98807-8-5"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98809-3-2"
-         d="m 3127.935,8054.9109 7.294,0 0,0.4179 -7.294,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98811-2-5"
-         d="m 3119.4405,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3128.09,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z"
-         id="path98813-6-9"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.4922,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         id="path98815-7-1"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98817-4-7"
-         d="m 3128.1416,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3136.9201,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         id="path98819-9-0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3115.8,8052.9146 0.9037,0 c 0,0 0.251,2.324 0.3765,3.4861 0.01,0.042 0.3224,0.045 0.6308,0.081 0.079,0.011 0.01,-1.2255 -0.035,-2.349 -0.019,-0.5124 -0.09,-1.2444 -0.06,-1.561 2.8435,-0.052 21.9918,-0.01 24.7604,0 0.016,0.2962 0.018,0.2278 0.01,0.325 -1.0093,0.011 -24.2447,-0.01 -24.2309,0 0.1449,1.4149 0.076,3.6729 0.2061,4.7541 -0.8108,-0.014 -1.6461,0.045 -2.4326,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path98821-3-0" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3140.7491,8053.3628 0,0.476 2.1449,0 0.016,0.8008 0.5205,0 0,-0.8 0,-0.4759 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98823-5-2" />
-      <path
-         id="path98825-0-5"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3140.7491,8056.6824 0,-0.4758 2.1449,0 0.016,-0.8009 0.5205,0 0,0.8001 0,0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path98827-9-3"
-         style="fill:#808080;stroke:#000000;stroke-width:0.43688199"
-         d="m 3115.9438,8058.4881 29.6131,-0.046 0.064,6.4996 -29.4847,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 3119.207,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z"
-         id="path98829-1-6"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3137.0777,8060.0238 0,3.2964 3.0834,0 0,-3.2964 -1.4133,0 0.7227,0.012 -0.016,0.105 0,3.064 -1.0117,0 -0.016,0.093 -0.6585,0 0,-0.093 0,-3.064 0.9636,0 0.016,-0.1162 -1.6702,0 z"
-         id="path98831-2-5" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98833-9-5"
-         d="m 3127.8147,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98835-9-6"
-         d="m 3119.4126,8061.5523 7.2587,0 0,0.4179 -7.2587,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3128.0203,8061.5523 7.2588,0 0,0.4179 -7.2588,0 z"
-         id="path98837-7-7" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3119.5667,8062.6666 7.2588,0 0,0.4178 -7.2588,0 z"
-         id="path98839-06-9" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98841-5-0"
-         d="m 3128.1745,8062.6666 7.2587,0 0,0.4178 -7.2587,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98843-9-3"
-         d="m 3119.6181,8063.7344 7.2588,0 0,0.4179 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3128.2259,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z"
-         id="path98845-3-1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98847-4-0"
-         d="m 3136.9621,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98849-5-4"
-         style="fill:#000000;stroke:none"
-         d="m 3115.9438,8059.556 0.8993,0 c 0,0 0.2498,2.324 0.3747,3.4862 0.01,0.042 0.3208,0.045 0.6278,0.081 0.079,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5123 -0.09,-1.2444 -0.06,-1.5609 2.8299,-0.052 21.8859,-0.011 24.6411,0 0.016,0.2962 0.017,0.2276 0.01,0.3249 -1.0045,0.011 -24.1279,-0.011 -24.1142,0 0.1442,1.4148 0.075,3.6729 0.2051,4.7541 -0.8068,-0.014 -1.6382,0.045 -2.4208,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path98851-4-5"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3140.7726,8060.0042 0,0.4761 2.1346,0 0.016,0.8008 0.518,0 0,-0.8001 0,-0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3140.7726,8063.3239 0,-0.476 2.1345,0 0.016,-0.8008 0.5179,0 0,0.8001 0,0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98853-8-3" />
-      <path
-         id="path98855-0-4"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3782,8038.7453 0.4873,0 c 0.2541,0 0.4732,0.1467 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.327 l -0.025,-0.2496 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3231 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98857-7-6"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.1604,8038.7569 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1801 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4731,-0.1469 -0.4914,-0.3271 l -0.025,-0.2496 c -0.018,-0.18 0.1716,-0.3242 0.4256,-0.323 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3148.369,8040.9272 0.4874,0 c 0.2541,0 0.4731,0.147 0.4914,0.3269 l 0.025,0.2499 c 0.018,0.1798 -0.1715,0.3241 -0.4255,0.323 l -0.4873,0 c -0.2539,-0.01 -0.4732,-0.147 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3243 0.4255,-0.3232 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98859-7-5"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3151.1513,8040.9388 0.4874,0 c 0.2541,0 0.4731,0.147 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1799 -0.1715,0.3242 -0.4255,0.3231 l -0.4873,0 c -0.2542,0 -0.4732,-0.1471 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3242 0.4255,-0.3232 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98861-1-0"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98863-8-9"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3591,8043.2948 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3245 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.3271 l -0.025,-0.2496 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98865-7-4"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.1414,8043.3065 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3234 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2497 c -0.018,-0.18 0.1716,-0.3242 0.4256,-0.3232 z" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3148.3652,8045.4869 0.4873,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1801 -0.1716,0.3242 -0.4255,0.3232 l -0.4874,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2498 c -0.018,-0.18 0.1715,-0.3241 0.4255,-0.323 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98867-2-5" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3151.1475,8045.4984 0.4873,0 c 0.2541,0 0.4732,0.1467 0.4914,0.3269 l 0.025,0.2498 c 0.018,0.18 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1803 0.1716,-0.3243 0.4256,-0.3233 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98869-8-9" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98871-15-6"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3561,8047.6686 0.4873,0 c 0.2541,0 0.4731,0.147 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1801 -0.1715,0.3243 -0.4255,0.3232 l -0.4873,0 c -0.2542,0 -0.4732,-0.1468 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98873-6-1"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.1383,8047.6804 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.18 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2498 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3232 z" />
-      <path
-         d="m 3148.3462,8050.0365 0.4873,0 c 0.2541,0 0.4732,0.147 0.4914,0.3272 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3245 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1802 0.1715,-0.3245 0.4255,-0.3233 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98875-3-7"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3151.1284,8050.0481 0.4874,0 c 0.2541,0 0.4731,0.1468 0.4914,0.3271 l 0.025,0.2495 c 0.018,0.1803 -0.1715,0.3246 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1802 0.1716,-0.3245 0.4256,-0.3233 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98877-8-7"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3148.3286,8052.2485 0.4873,0 c 0.2541,0 0.4732,0.1468 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3243 -0.4255,0.3233 l -0.4874,0 c -0.2541,0 -0.4732,-0.1467 -0.4914,-0.327 l -0.025,-0.2496 c -0.018,-0.18 0.1715,-0.3243 0.4255,-0.3231 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98879-6-9" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3151.1108,8052.2602 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4731,-0.1468 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3229 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98881-4-5" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98883-6-1"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3194,8054.4304 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.327 l 0.025,0.2498 c 0.018,0.1798 -0.1715,0.3242 -0.4255,0.3231 l -0.4873,0 c -0.2539,-0.01 -0.4732,-0.147 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1799 0.1715,-0.3243 0.4255,-0.3232 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98885-4-8"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.1017,8054.442 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1799 -0.1715,0.3242 -0.4255,0.323 l -0.4873,0 c -0.2542,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3232 z" />
-      <path
-         d="m 3148.3095,8056.7981 0.4874,0 c 0.2541,0 0.4732,0.147 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1804 -0.1715,0.3245 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1802 0.1715,-0.3243 0.4255,-0.3233 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98887-4-7"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3151.0918,8056.8098 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.1802 -0.1716,0.3243 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2498 c -0.018,-0.1801 0.1716,-0.3241 0.4256,-0.3231 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98889-5-0"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98891-3-4"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.3156,8058.9904 0.4873,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1801 -0.1716,0.3243 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3231 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98893-4-2"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.0979,8059.0019 0.4873,0 c 0.2541,0 0.4732,0.1468 0.4914,0.327 l 0.025,0.2497 c 0.018,0.1799 -0.1716,0.3243 -0.4256,0.3232 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1802 0.1716,-0.3243 0.4256,-0.3233 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3148.3064,8061.1722 0.4874,0 c 0.2541,0 0.4731,0.1469 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.18 -0.1715,0.3243 -0.4255,0.3232 l -0.4873,0 c -0.2542,0 -0.4732,-0.1469 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98895-7-4"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3151.0887,8061.1839 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.1799 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3243 0.4255,-0.3233 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         id="path98897-4-9"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98899-1-5"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3148.2965,8063.54 0.4874,0 c 0.2541,0 0.4732,0.147 0.4914,0.3272 l 0.025,0.2495 c 0.018,0.1803 -0.1716,0.3246 -0.4255,0.3234 l -0.4874,0 c -0.2541,0 -0.4731,-0.147 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1801 0.1715,-0.3245 0.4256,-0.3233 z" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98901-5-2"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124"
-         d="m 3151.0788,8063.5516 0.4874,0 c 0.2541,0 0.4731,0.1469 0.4914,0.3271 l 0.025,0.2495 c 0.018,0.1803 -0.1716,0.3246 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1801 0.1716,-0.3245 0.4256,-0.3233 z" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3154.0074,8038.8188 30.361,-0.025 -0.2471,6.4782 -30.1139,0 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         id="path98903-30-5" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98905-7-1"
-         d="m 3157.2635,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98907-6-7"
-         d="m 3175.4342,8040.3545 0,3.2964 3.1352,0 0,-3.2964 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9797,0 0.016,-0.1162 -1.6982,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.0158,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z"
-         id="path98909-1-2"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.4725,8041.883 7.3807,0 0,0.4179 -7.3807,0 z"
-         id="path98911-6-9"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98913-8-3"
-         d="m 3166.2248,8041.883 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98915-0-6"
-         d="m 3157.6293,8042.9973 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.3815,8042.9973 7.3807,0 0,0.4179 -7.3807,0 z"
-         id="path98917-6-6"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.6816,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98919-2-3"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98921-69-6"
-         d="m 3166.4338,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3175.3167,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path98923-2-8"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3153.9455,8039.8867 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path98925-91-2" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3179.1911,8040.3349 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98927-6-0" />
-      <path
-         id="path98929-0-1"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3179.1912,8043.6546 0,-0.4759 2.1704,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path98931-9-2"
-         style="fill:#808080;stroke:#000000;stroke-width:0.43947119"
-         d="m 3154.0074,8045.4602 30.0488,-0.046 -0.1224,6.4997 -29.9264,-0.088 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 3157.393,8047.1317 7.345,0 0,0.7428 -7.345,0 z"
-         id="path98933-8-4"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3175.4761,8046.996 0,3.2963 3.12,0 0,-3.2963 -1.43,0 0.7313,0.012 -0.016,0.1049 0,3.064 -1.0238,0 -0.016,0.093 -0.6662,0 0,-0.093 0,-3.064 0.975,0 0.016,-0.1162 -1.6901,0 z"
-         id="path98935-5-6" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98937-1-1"
-         d="m 3166.1031,8047.1317 7.345,0 0,0.7428 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98939-8-3"
-         d="m 3157.601,8048.5244 7.345,0 0,0.418 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.311,8048.5244 7.3451,0 0,0.418 -7.3451,0 z"
-         id="path98941-4-4" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.757,8049.6388 7.345,0 0,0.4178 -7.345,0 z"
-         id="path98943-6-3" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98945-69-3"
-         d="m 3166.4671,8049.6388 7.345,0 0,0.4178 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98947-8-2"
-         d="m 3157.809,8050.7066 7.345,0 0,0.4178 -7.345,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.5191,8050.7066 7.345,0 0,0.4178 -7.345,0 z"
-         id="path98949-2-1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98951-6-5"
-         d="m 3175.3591,8050.7066 7.3451,0 0,0.4178 -7.3451,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98953-81-3"
-         style="fill:#000000;stroke:none"
-         d="m 3154.091,8046.5281 0.91,0 c 0,0 0.2527,2.324 0.3791,3.4862 0.01,0.042 0.3247,0.045 0.6353,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5122 -0.09,-1.2443 -0.06,-1.5609 2.8635,-0.052 22.146,-0.011 24.934,0 0.017,0.2962 0.018,0.2276 0.01,0.325 -1.0165,0.011 -24.4147,-0.011 -24.4009,0 0.1459,1.4148 0.076,3.6729 0.2075,4.754 -0.8163,-0.014 -1.6576,0.045 -2.4496,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path98955-9-6"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3179.2149,8046.9764 0,0.476 2.16,0 0.016,0.8008 0.5242,0 0,-0.8001 0,-0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3179.215,8050.296 0,-0.4759 2.1599,0 0.016,-0.8008 0.5241,0 0,0.8 0,0.4759 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98957-4-8" />
-      <path
-         id="path98959-6-6"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.43793881"
-         d="m 3154.0074,8051.8466 29.9242,-0.046 -0.1228,6.4996 -29.8014,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 3157.5791,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z"
-         id="path98961-7-1"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3175.5363,8053.3824 0,3.2963 3.0983,0 0,-3.2963 -1.4201,0 0.7262,0.012 -0.016,0.105 0,3.0639 -1.0166,0 -0.016,0.093 -0.6616,0 0,-0.093 0,-3.0639 0.9682,0 0.016,-0.1162 -1.6783,0 z"
-         id="path98963-4-2" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98965-4-6"
-         d="m 3166.2285,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98967-5-4"
-         d="m 3157.7856,8054.9109 7.2939,0 0,0.4179 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.435,8054.9109 7.294,0 0,0.4179 -7.294,0 z"
-         id="path98969-3-3" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.9405,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z"
-         id="path98971-6-7" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98973-3-3"
-         d="m 3166.59,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98975-9-1"
-         d="m 3157.9922,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.6416,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         id="path98977-2-5" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path98979-7-6"
-         d="m 3175.4201,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path98981-8-6"
-         style="fill:#000000;stroke:none"
-         d="m 3154.0074,8052.9146 1.1963,0 c 0,0 0.251,2.324 0.3765,3.4861 0.01,0.042 0.3224,0.045 0.6308,0.081 0.079,0.011 0.01,-1.2255 -0.035,-2.349 -0.019,-0.5124 -0.09,-1.2444 -0.06,-1.561 2.8435,-0.052 21.9918,-0.01 24.7604,0 0.016,0.2962 0.018,0.2278 0.01,0.325 -1.0093,0.011 -24.2447,-0.01 -24.2309,0 0.1449,1.4149 0.076,3.6729 0.2061,4.7541 -0.8108,-0.014 -2.0672,-0.043 -2.8537,-0.043 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         id="path98983-57-3"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3179.2491,8053.3628 0,0.476 2.1449,0 0.016,0.8008 0.5205,0 0,-0.8 0,-0.4759 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3179.2491,8056.6824 0,-0.4758 2.1449,0 0.016,-0.8009 0.5205,0 0,0.8001 0,0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path98985-4-6" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 3154.0074,8058.4881 29.862,-0.046 -0.061,6.4996 -29.8014,0 z"
-         style="fill:#808080;stroke:#000000;stroke-width:0.43688199"
-         id="path98987-4-2" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path98989-2-7"
-         d="m 3157.707,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98991-2-1"
-         d="m 3175.5777,8060.0238 0,3.2964 3.0834,0 0,-3.2964 -1.4133,0 0.7227,0.012 -0.016,0.105 0,3.064 -1.0117,0 -0.016,0.093 -0.6585,0 0,-0.093 0,-3.064 0.9636,0 0.016,-0.1162 -1.6702,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.3147,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z"
-         id="path98993-5-3"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3157.9126,8061.5523 7.2587,0 0,0.4179 -7.2587,0 z"
-         id="path98995-1-8"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98997-2-2"
-         d="m 3166.5203,8061.5523 7.2588,0 0,0.4179 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path98999-1-8"
-         d="m 3158.0667,8062.6666 7.2588,0 0,0.4178 -7.2588,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3166.6745,8062.6666 7.2587,0 0,0.4178 -7.2587,0 z"
-         id="path99001-9-0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3158.1181,8063.7344 7.2588,0 0,0.4179 -7.2588,0 z"
-         id="path99003-6-9"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path99005-6-5"
-         d="m 3166.7259,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 3175.4621,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z"
-         id="path99007-3-8"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3154.0074,8059.556 1.3357,0 c 0,0 0.2498,2.324 0.3747,3.4862 0.01,0.042 0.3208,0.045 0.6278,0.081 0.079,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5123 -0.09,-1.2444 -0.06,-1.5609 2.8299,-0.052 21.8859,-0.011 24.6411,0 0.016,0.2962 0.017,0.2276 0.01,0.3249 -1.0045,0.011 -24.1279,-0.011 -24.1142,0 0.1442,1.4148 0.075,3.6729 0.2051,4.7541 -0.8068,-0.014 -2.2025,-0.1316 -2.9852,-0.1316 z"
-         style="fill:#000000;stroke:none"
-         id="path99009-1-4" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 3179.2726,8060.0042 0,0.4761 2.1346,0 0.016,0.8008 0.518,0 0,-0.8001 0,-0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path99011-9-7" />
-      <path
-         id="path99013-0-0"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 3179.2726,8063.3239 0,-0.476 2.1345,0 0.016,-0.8008 0.5179,0 0,0.8001 0,0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         style="fill:url(#linearGradient116318-2-2);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.46755612;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 3188.2295,8031.7948 c -0.7615,0 -1.4036,1.7174 -1.4532,3.8499 l -0.6205,26.0317 c -0.05,2.1332 0.5285,3.8502 1.29,3.8502 l 5.5518,0 c 0.7615,0 1.4037,-1.717 1.4532,-3.8502 l 0.147,-6.2782 -0.8491,-0.2764 0,-12.0533 1.143,0.3208 0.1796,-7.7456 c 0.05,-2.133 -0.5284,-3.8497 -1.2899,-3.8497 l -5.5519,0 z m 2.727,13.6037 c 0.2416,0.031 0.427,0.1615 0.4082,1.5207 -0.019,1.3592 -0.2319,1.7847 -0.4735,1.7583 -0.2417,-0.031 -0.4107,-0.4907 -0.3919,-1.8499 0.019,-1.3589 0.2156,-1.4553 0.4572,-1.4291 z"
-         id="path99015-0-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccssccccccscccsccc" />
-      <path
-         style="fill:#808080;fill-opacity:1;stroke:none"
-         d="m 3190.3579,8035.2121 1.1191,-0.164 1.3653,3.7837 -0.3256,25.492 -1.1238,0.2762 -1.5769,-4.5157 0.9296,-0.1129 0.6884,1.0765 0.2954,-21.8612 -1.3715,-3.9746"
-         id="path99017-47-4"
-         inkscape:path-effect="#path-effect114909-4-2-8"
-         inkscape:original-d="m 3190.3579,8035.2121 c 0.062,-1.7546 0.4414,-1.171 1.1191,-0.164 l 1.3653,3.7837 -0.3256,25.492 c -0.3058,1.3892 -0.6828,0.6232 -1.1238,0.2762 l -1.5769,-4.5157 c 0.3209,-1.1632 0.4055,-0.5716 0.9296,-0.1129 l 0.6884,1.0765 0.2954,-21.8612 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-      <path
-         style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-         d="m 3190.2888,8040.6674 1.0251,2.1293 -0.2408,18.8508 -1.257,-1.5571 -0.038,3.0588 1.6211,1.4554 0.3584,-25.525 -1.4053,-3.8706 -0.064,5.4584"
-         id="path99019-3-3"
-         inkscape:path-effect="#path-effect114906-4-1-1"
-         inkscape:original-d="m 3190.2888,8040.6674 1.0251,2.1293 -0.2408,18.8508 -1.257,-1.5571 -0.038,3.0588 1.6211,1.4554 0.3584,-25.525 -1.4053,-3.8706 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         id="path99021-7-6"
-         style="fill:url(#linearGradient116313-9-1);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.75868785"
-         d="m 3076.8263,8032.663 61.066,0 0.039,4.8436 -60.8082,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3078.1898,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99023-8-1"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99025-85-7"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3081.4647,8033.2463 1.581,0 c 0.2144,0 0.4,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1436,-0.5222 0.358,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3084.7729,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1436,-0.5222 0.358,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99027-3-8"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99029-0-2"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3078.1898,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3081.4647,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1436,-0.5222 0.358,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99031-0-6"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99033-7-7"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3084.7729,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1436,-0.5222 0.358,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3088.1363,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99035-9-4"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99037-04-0"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3091.4112,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3094.7194,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99039-6-0"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99041-1-7"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3117.4035,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3120.6784,8033.2463 1.581,0 c 0.2144,0 0.4,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99043-7-1"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99045-6-8"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3123.9866,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3117.4035,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99047-1-0"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99049-1-9"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3120.6784,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3123.9866,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99051-8-1"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99053-3-6"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3127.35,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3130.6249,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path99055-9-8"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99057-9-2"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 3133.9331,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 3149.0158,8032.8231 1.9595,0 0,4.4187 -1.9595,0 z"
-         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path99059-78-7" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3097.7189,8036.8948 1.5808,0 c 0.2144,0 0.3999,-0.2331 0.416,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.3581,0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path99061-4-0"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99063-5-2"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3100.9935,8036.8948 1.5809,0 c 0.2144,0 0.3999,-0.2331 0.4159,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.358,0.5222 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3104.3014,8036.8948 1.5809,0 c 0.2144,0 0.3999,-0.2331 0.4159,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.358,0.5222 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path99065-2-0"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99067-81-4"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3097.7189,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.3581,0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3100.9935,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path99069-8-3"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99071-2-5"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3104.3014,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3107.6645,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path99073-9-5"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path99075-7-0"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         d="m 3110.9392,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 3114.2471,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1437,-0.5221 -0.3581,-0.5221 l -1.5808,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1437,0.5221 0.3581,0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647"
-         id="path99077-2-9"
-         inkscape:connector-curvature="0" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-227.42998,-447.4334)">
+    <g style="display:inline" transform="translate(-2839.8795,-7574.3967)" id="g116566-7-1">
+      <path inkscape:connector-curvature="0" d="m 3073.4683,8031.0333 0.1359,33.5103 116.5296,0.3784 -0.27,-33.9105 -31.8127,-9.1814 -53.7545,0 z" style="fill:url(#linearGradient116558-78-7);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98543-3-9" sodipodi:nodetypes="ccccccc"/>
+      <path inkscape:connector-curvature="0" d="m 3073.8783,8031.4227 115.5848,0 0,34.1455 -115.5848,0 z" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.81043929;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path98545-1-4" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path98547-9-6" d="m 3074.2358,8031.6583 c 0.7535,0 1.3888,1.7244 1.4379,3.8676 l 0.6139,26.1527 c 0.049,2.1428 -0.5229,3.8676 -1.2763,3.8676 l -5.4931,0 c -0.7535,0 -1.3889,-1.7248 -1.438,-3.8676 l -0.1454,-6.3076 0.8402,-0.2778 0,-12.1092 -1.131,0.3218 -0.1777,-7.7811 c -0.049,-2.1428 0.5229,-3.8676 1.2764,-3.8676 l 5.4931,0 z m -2.6981,13.6342 c -0.2391,0.03 -0.4225,0.1948 -0.4039,1.5605 0.019,1.3653 0.2295,1.448 0.4685,1.4219 0.2391,-0.03 0.4063,-0.1492 0.3878,-1.5144 -0.019,-1.3657 -0.2134,-1.4945 -0.4524,-1.468 z" style="fill:url(#linearGradient116554-6-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31076902;stroke-miterlimit:4;stroke-dasharray:none" sodipodi:nodetypes="cccssccccccscccscsc"/>
+      <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 3072.1299,8035.0912 c -0.061,-1.7634 -0.4367,-1.1769 -1.1072,-0.1648 l -1.3509,3.8013 0.3222,25.6103 c 0.3026,1.3959 0.6756,0.6262 1.1119,0.2777 l 1.5602,-4.5367 c -0.3175,-1.1682 -0.4012,-0.5742 -0.9198,-0.1135 l -0.6811,1.0815 -0.2922,-21.9628 z" inkscape:path-effect="#path-effect115151-0-9-1" id="path98549-1-3" d="m 3072.1299,8035.0912 -1.1072,-0.1648 -1.3509,3.8013 0.3222,25.6103 1.1119,0.2777 1.5602,-4.5367 -0.9198,-0.1135 -0.6811,1.0815 -0.2922,-21.9628 1.3569,-3.993" style="fill:#808080;stroke:none"/>
+      <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 3072.1983,8040.5718 -1.0142,2.1392 0.2382,18.9383 1.2437,-1.5646 0.037,3.0736 -1.6039,1.4621 -0.3547,-25.6438 1.3905,-3.8886 z" inkscape:path-effect="#path-effect115148-1-3-3" id="path98551-13-0" d="m 3072.1983,8040.5718 -1.0142,2.1392 0.2382,18.9383 1.2437,-1.5646 0.037,3.0736 -1.6039,1.4621 -0.3547,-25.6438 1.3905,-3.8886 0.063,5.4838" style="fill:#4d4d4d;stroke:none"/>
+      <path inkscape:connector-curvature="0" d="m 3151.8994,8033.155 32.5924,0 -0.1165,4.1673 -32.5924,0 z" style="fill:url(#linearGradient116549-0-8);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.51374948" id="path98553-5-4"/>
+      <path inkscape:connector-curvature="0" d="m 3182.077,8034.0876 0.4495,0 c 0.1013,0 0.1771,0.01 0.2271,0.02 0.067,0.017 0.1207,0.048 0.1607,0.092 0.04,0.044 0.065,0.099 0.076,0.1631 0.011,0.065 0,0.1435 -0.019,0.2377 -0.02,0.083 -0.05,0.1542 -0.09,0.2142 -0.049,0.073 -0.1066,0.1324 -0.1743,0.1777 -0.051,0.034 -0.1154,0.062 -0.1926,0.08 -0.058,0.014 -0.1322,0.021 -0.223,0.021 l -0.4628,0 z m 0.2039,0.1702 -0.1643,0.6665 0.1836,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.078,-0.023 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.098 0.028,-0.045 0.051,-0.1064 0.07,-0.1842 0.019,-0.078 0.026,-0.1375 0.019,-0.1792 -0.01,-0.042 -0.022,-0.074 -0.046,-0.097 -0.024,-0.024 -0.058,-0.039 -0.1022,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z m -1.2772,0.836 -0.1872,-1.0062 0.2667,0 0.1246,0.7447 0.482,-0.7447 0.2609,0 -0.6844,1.0062 z m -1.2932,-1.0062 0.4496,0 c 0.1013,0 0.1771,0.01 0.227,0.02 0.067,0.017 0.1208,0.048 0.1608,0.092 0.04,0.044 0.065,0.099 0.076,0.1631 0.011,0.065 0,0.1435 -0.019,0.2377 -0.02,0.083 -0.05,0.1542 -0.09,0.2142 -0.049,0.073 -0.1067,0.1324 -0.1743,0.1777 -0.051,0.034 -0.1154,0.062 -0.1927,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4628,0 z m 0.204,0.1702 -0.1644,0.6665 0.1837,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.078,-0.023 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.098 0.028,-0.045 0.051,-0.1064 0.07,-0.1842 0.019,-0.078 0.026,-0.1375 0.019,-0.1792 -0.01,-0.042 -0.022,-0.074 -0.046,-0.097 -0.024,-0.024 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold" id="path98557-8-1"/>
+      <path style="fill:#ffffff;stroke:none" d="m 3181.2289,8035.4035 c -1.116,0 -2.0207,0.1243 -2.0207,0.2785 0,0.154 0.9047,0.2784 2.0207,0.2784 1.1161,0 2.0208,-0.1244 2.0208,-0.2784 0,-0.1542 -0.9047,-0.2785 -2.0208,-0.2785 z m 0,0.2013 c 0.3133,0 0.5673,0.035 0.5673,0.077 0,0.043 -0.254,0.077 -0.5673,0.077 -0.3132,0 -0.5672,-0.035 -0.5672,-0.077 0,-0.043 0.254,-0.077 0.5672,-0.077 z" id="path98559-4-6" inkscape:connector-curvature="0"/>
+      <text xml:space="preserve" style="font-size:0.66138339px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="3127.0452" y="8173.9023" id="text98561-3-5" sodipodi:linespacing="125%" transform="scale(1.0170762,0.98321049)"><tspan sodipodi:role="line" id="tspan98563-1-9" x="3127.0452" y="8173.9023">ROM</tspan></text>
+      <path inkscape:connector-curvature="0" d="m 3170.009,8034.3202 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1032,0 0.1032,0 0.05,0 0.075,0.02 0.075,0.058 0,0.044 -0.026,0.065 -0.078,0.065 z m 0.7939,0.062 c -0.014,0.069 -0.051,0.1032 -0.1104,0.1032 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.017,-0.08 -0.069,-0.1204 -0.1567,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.1286 0.057,0.1928 0.1709,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m -1.6876,-0.2409 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.1286 0.062,0.1928 0.1851,0.1928 0.1235,0 0.1852,-0.064 0.1852,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1852,-0.1927 z m -0.2989,0.2409 c -0.012,0.069 -0.048,0.1032 -0.1069,0.1032 -0.085,0 -0.1281,-0.05 -0.1281,-0.1514 0,-0.099 0.041,-0.148 0.1246,-0.148 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.062,-0.1204 -0.1566,-0.1204 -0.1163,0 -0.1745,0.064 -0.1745,0.1927 0,0.1286 0.056,0.1928 0.1673,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m 2.371,-0.2306 c 0,0 -0.3061,0 -0.3061,0 0,0 0,0.045 0,0.045 0,0 0.1281,0 0.1281,0 0,0 0,0.3235 0,0.3235 0,0 0.05,0 0.05,0 0,0 0,-0.3235 0,-0.3235 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.8295,0 c 0,0 -0.057,0 -0.057,0 0,0 -0.1423,0.3683 -0.1423,0.3683 0,0 0.053,0 0.053,0 0,0 0.039,-0.1067 0.039,-0.1067 0,0 0.1531,0 0.1531,0 0,0 0.036,0.1067 0.036,0.1067 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3683 -0.1389,-0.3683 z m -0.3311,0 c 0,0 -0.1673,0 -0.1673,0 0,0 0,0.3683 0,0.3683 0,0 0.05,0 0.05,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1175,0 0.1175,0 0.076,0 0.1139,-0.037 0.1139,-0.1102 0,-0.069 -0.038,-0.1032 -0.1139,-0.1032 z m -0.2777,0 c 0,0 -0.071,0 -0.071,0 0,0 -0.1104,0.3098 -0.1104,0.3098 0,0 -0.1068,-0.3098 -0.1068,-0.3098 0,0 -0.075,0 -0.075,0 0,0 0,0.3683 0,0.3683 0,0 0.05,0 0.05,0 0,0 0,-0.3063 0,-0.3063 0,0 0.1068,0.3063 0.1068,0.3063 0,0 0.05,0 0.05,0 0,0 0.1104,-0.3098 0.1104,-0.3098 0,0 0,0.093 0,0.093 0,0 0,0.2169 0,0.2169 0,0 0.05,0 0.05,0 0,0 0,-0.3683 0,-0.3683 z m -1.4312,0.065 c 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,0.014 -0.043,0.041 0,0 0,0.3889 0,0.3889 0,0.018 -0.01,0.028 -0.028,0.028 0,0 -0.356,0 -0.356,0 -0.074,0 -0.1341,0.023 -0.1816,0.071 -0.048,0.047 -0.071,0.1061 -0.071,0.1773 0,0 0,0.8569 0,0.8569 0,0.069 0.024,0.1274 0.073,0.1756 0.049,0.048 0.1085,0.072 0.1798,0.072 0,0 0.8152,0 0.8152,0 0.029,0 0.043,-0.015 0.043,-0.045 0,0 0,-1.7243 0,-1.7243 z m 2.9585,1.2011 c 0,-0.03 -0.014,-0.045 -0.043,-0.045 0,0 -0.3559,0 -0.3559,0 -0.031,0 -0.046,0.015 -0.046,0.045 0,0 0,0.1996 0,0.1996 0,0.057 -0.028,0.086 -0.086,0.086 -0.059,0 -0.089,-0.029 -0.089,-0.086 0,0 0,-0.6125 0,-0.6125 0,-0.057 0.03,-0.086 0.089,-0.086 0.057,0 0.086,0.029 0.086,0.086 0,0 0,0.1617 0,0.1617 0,0.028 0.015,0.041 0.046,0.041 0,0 0.3559,0 0.3559,0 0.029,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2856 0,-0.2856 0,-0.069 -0.025,-0.1274 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.5482,0 -0.5482,0 -0.071,0 -0.1318,0.024 -0.1817,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.8535 0,0.8535 0,0.071 0.024,0.1308 0.073,0.179 0.049,0.048 0.1098,0.072 0.1834,0.072 0,0 0.5482,0 0.5482,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.179 0,0 0,-0.3167 0,-0.3167 z m -1.1784,-0.072 c 0,-0.069 -0.025,-0.1273 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.3312,0 -0.3312,0 -0.036,0 -0.053,-0.017 -0.053,-0.052 0,-0.037 0.018,-0.055 0.053,-0.055 0,0 0.4985,0 0.4985,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2753 0,-0.2753 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.7049,0 -0.7049,0 -0.071,0 -0.1318,0.024 -0.1816,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.3647 0,0.3647 0,0.069 0.025,0.1274 0.075,0.1756 0.05,0.048 0.1103,0.072 0.1816,0.072 0,0 0.3311,0 0.3311,0 0.045,0 0.068,0.023 0.068,0.069 0,0.041 -0.023,0.062 -0.068,0.062 0,0 -0.5448,0 -0.5448,0 -0.028,0 -0.043,0.015 -0.043,0.045 0,0 0,0.272 0,0.272 0,0.03 0.014,0.045 0.043,0.045 0,0 0.7513,0 0.7513,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.179 0,0 0,-0.389 0,-0.389 z m 1.0788,1.1531 c 0,0 -0.228,0 -0.228,0 0,0 0,-0.1239 0,-0.1239 0,0 0.2065,0 0.2065,0 0,0 0,-0.041 0,-0.041 0,0 -0.2065,0 -0.2065,0 0,0 0,-0.1135 0,-0.1135 0,0 0.2244,0 0.2244,0 0,0 0,-0.045 0,-0.045 0,0 -0.2742,0 -0.2742,0 0,0 0,0.3648 0,0.3648 0,0 0.2778,0 0.2778,0 0,0 0,-0.041 0,-0.041 z m -0.3703,-0.1515 c 0,0 -0.1674,0 -0.1674,0 0,0 0,0.041 0,0.041 0,0 0.1176,0 0.1176,0 0,0.08 -0.039,0.1204 -0.1176,0.1204 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.062,0 0.099,0.025 0.1104,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.063,-0.1204 -0.1602,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.064 0.017,0.1125 0.052,0.1446 0.034,0.032 0.075,0.048 0.1228,0.048 0.057,0 0.099,-0.02 0.1247,-0.059 0,0 0.014,0.048 0.014,0.048 0,0 0.032,0 0.032,0 0,0 0,-0.1927 0,-0.1927 z m -0.4984,-0.1721 c 0,0 -0.057,0 -0.057,0 0,0 -0.146,0.3648 -0.146,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.053,0 0.053,0 0,0 -0.1353,-0.3648 -0.1353,-0.3648 z m -0.2137,0.3579 c -0.012,0 -0.018,-0.017 -0.018,-0.038 0,0 0,-0.065 0,-0.065 0,-0.03 -0.018,-0.053 -0.046,-0.069 0.036,-0.018 0.053,-0.047 0.053,-0.086 0,-0.066 -0.042,-0.1 -0.1247,-0.1 0,0 -0.1779,0 -0.1779,0 0,0 0,0.3648 0,0.3648 0,0 0.053,0 0.053,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1245,0 0.1245,0 0.043,0 0.065,0.022 0.068,0.065 0,0 0.01,0.089 0.01,0.089 0,0 0.064,-0.01 0.064,-0.01 z m -0.5518,-0.3682 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.055 0.017,0.101 0.05,0.1377 0.033,0.037 0.078,0.055 0.1353,0.055 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1851,-0.1927 z m -0.1851,0.01 c 0,0 -0.3098,0 -0.3098,0 0,0 0,0.045 0,0.045 0,0 0.1318,0 0.1318,0 0,0 0,0.32 0,0.32 0,0 0.05,0 0.05,0 0,0 0,-0.32 0,-0.32 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0.1652 c 0,0 -0.1069,-0.024 -0.1069,-0.024 -0.031,-0.01 -0.046,-0.022 -0.046,-0.045 0,-0.044 0.029,-0.065 0.085,-0.065 0.064,0 0.096,0.025 0.096,0.076 0,0 0.046,0 0.046,0 0,-0.078 -0.049,-0.117 -0.146,-0.117 -0.088,0 -0.1317,0.038 -0.1317,0.1135 0,0.046 0.027,0.075 0.082,0.086 0,0 0.075,0.017 0.075,0.017 0.055,0.012 0.082,0.033 0.082,0.065 0,0.041 -0.033,0.062 -0.1,0.062 -0.069,0 -0.1032,-0.029 -0.1032,-0.086 0,0 -0.046,0 -0.046,0 0,0.085 0.05,0.1274 0.1495,0.1274 0.1,0 0.1495,-0.037 0.1495,-0.1102 0,-0.053 -0.028,-0.086 -0.085,-0.1 z m -0.5698,-0.1652 c 0,0 -0.057,0 -0.057,0 0,0 -0.1425,0.3648 -0.1425,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1532,0 0.1532,0 0,0 0.035,0.1032 0.035,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.1317,0 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1317,0 0.1317,0 0,0 0,0.32 0,0.32 0,0 0.053,0 0.053,0 0,0 0,-0.32 0,-0.32 0,0 0.1246,0 0.1246,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0 c 0,0 -0.061,0 -0.061,0 0,0 -0.1424,0.3648 -0.1424,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1531,0 0.1531,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.3916,0 c 0,0 -0.1567,0 -0.1567,0 0,0 0,0.3648 0,0.3648 0,0 0.1531,0 0.1531,0 0.1068,0 0.1602,-0.062 0.1602,-0.1859 0,-0.1193 -0.052,-0.1789 -0.1566,-0.1789 z m 2.8125,-1.8068 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.15,0.1169 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.088,0 0.1318,0.049 0.1318,0.148 0,0.101 -0.044,0.1514 -0.1318,0.1514 z m -0.9006,1.4215 c 0,0 -0.7548,0 -0.7548,0 -0.05,0 -0.091,-0.016 -0.1246,-0.048 -0.033,-0.032 -0.05,-0.072 -0.05,-0.1205 0,0 0,-0.8569 0,-0.8569 0,-0.048 0.017,-0.088 0.05,-0.1205 0.033,-0.032 0.075,-0.048 0.1246,-0.048 0,0 0.4201,0 0.4201,0 0.028,0 0.043,-0.015 0.043,-0.045 0,0 0,-0.389 0,-0.389 0,-0.018 0.01,-0.028 0.028,-0.028 0,0 0.2635,0 0.2635,0 0.017,0.016 0.025,0.025 0.025,0.028 0,0 0,1.6039 0,1.6039 0,0 -0.01,0.013 -0.025,0.024 z m 2.9317,-0.05 c -0.034,0.033 -0.077,0.05 -0.1263,0.05 0,0 -0.5482,0 -0.5482,0 -0.05,0 -0.093,-0.017 -0.1283,-0.05 -0.035,-0.033 -0.053,-0.074 -0.053,-0.1222 0,0 0,-0.8535 0,-0.8535 0,-0.048 0.018,-0.088 0.053,-0.1205 0.035,-0.032 0.078,-0.048 0.1283,-0.048 0,0 0.5482,0 0.5482,0 0.052,0 0.095,0.016 0.1282,0.047 0.033,0.031 0.05,0.072 0.05,0.1222 0,0 0,0.2271 0,0.2271 0,0.016 -0.01,0.024 -0.025,0.024 0,0 -0.235,0 -0.235,0 -0.017,0 -0.025,-0.01 -0.025,-0.024 0,0 0,-0.1032 0,-0.1032 0,-0.046 -0.016,-0.084 -0.048,-0.1153 -0.032,-0.031 -0.072,-0.046 -0.1193,-0.046 -0.047,0 -0.087,0.015 -0.1192,0.046 -0.032,0.031 -0.048,0.069 -0.048,0.1153 0,0 0,0.6125 0,0.6125 0,0.046 0.016,0.084 0.048,0.1154 0.032,0.031 0.072,0.046 0.1192,0.046 0.048,0 0.087,-0.015 0.1193,-0.046 0.032,-0.031 0.048,-0.07 0.048,-0.1154 0,0 0,-0.1445 0,-0.1445 0,-0.016 0.01,-0.024 0.025,-0.024 0,0 0.235,0 0.235,0 0,0 0.013,0.01 0.025,0.024 0,0 0,0.2616 0,0.2616 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.1784,0 c -0.034,0.033 -0.076,0.05 -0.1263,0.05 0,0 -0.6871,0 -0.6871,0 -0.019,0 -0.028,-0.01 -0.028,-0.024 0,0 0,-0.1549 0,-0.1549 0,-0.016 0.01,-0.024 0.028,-0.024 0,0 0.4806,0 0.4806,0 0.04,0 0.075,-0.014 0.1032,-0.041 0.028,-0.028 0.043,-0.061 0.043,-0.1 0,-0.041 -0.014,-0.076 -0.041,-0.1032 -0.027,-0.028 -0.062,-0.041 -0.105,-0.041 0,0 -0.3311,0 -0.3311,0 -0.05,0 -0.092,-0.017 -0.1265,-0.05 -0.034,-0.033 -0.052,-0.074 -0.052,-0.1223 0,0 0,-0.3647 0,-0.3647 0,-0.048 0.017,-0.088 0.052,-0.1205 0.034,-0.032 0.077,-0.048 0.1265,-0.048 0,0 0.6408,0 0.6408,0 0.017,0 0.025,0.01 0.025,0.024 0,0 0,0.1514 0,0.1514 0,0.018 -0.01,0.028 -0.025,0.028 0,0 -0.4344,0 -0.4344,0 -0.088,0 -0.1317,0.044 -0.1317,0.1308 0,0.034 0.013,0.064 0.039,0.09 0.026,0.025 0.057,0.038 0.093,0.038 0,0 0.3312,0 0.3312,0 0.047,0 0.089,0.017 0.1246,0.052 0.035,0.034 0.053,0.075 0.053,0.1204 0,0 0,0.389 0,0.389 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.0805,0.129 c 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,-0.015 -0.043,-0.045 0,0 0,-1.2665 0,-1.2665 0,-0.028 0.014,-0.041 0.043,-0.041 0,0 0.388,0 0.388,0 0.028,0 0.043,0.014 0.043,0.041 0,0 0,1.2665 0,1.2665 0,0.03 -0.014,0.045 -0.043,0.045 z m 1.0645,0.3545 c 0,0 -0.121,0 -0.121,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1281,0 0.1281,0 0.045,0 0.068,0.021 0.068,0.062 0,0.041 -0.025,0.062 -0.075,0.062 z m 0.2635,0.048 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.9261,0 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.5376,0 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.3026,0.1102 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.2823 0,-0.2823 0,0 0.093,0 0.093,0 0.078,0 0.1175,0.047 0.1175,0.1411 0,0.094 -0.037,0.1412 -0.1104,0.1412 z m 2.0934,0.01 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.09,0 0.1353,0.049 0.1353,0.148 0,0.101 -0.045,0.1514 -0.1353,0.1514 z m -0.6907,-1.7724 c 0,-0.016 -0.01,-0.024 -0.025,-0.024 0,0 -0.2635,0 -0.2635,0 -0.017,0 -0.025,0.01 -0.025,0.024 0,0 0,1.1461 0,1.1461 0,0.016 0.01,0.024 0.025,0.024 0,0 0.2635,0 0.2635,0 0.017,0 0.025,-0.01 0.025,-0.024 0,0 0,-1.1461 0,-1.1461 z m -0.9256,0.2616 c 0,-0.043 -0.016,-0.081 -0.048,-0.1119 -0.032,-0.031 -0.071,-0.047 -0.1157,-0.047 -0.045,0 -0.083,0.016 -0.114,0.047 -0.031,0.031 -0.046,0.068 -0.046,0.1119 0,0 0,0.6298 0,0.6298 0,0.046 0.015,0.084 0.044,0.1136 0.03,0.03 0.068,0.045 0.1157,0.045 0.045,0 0.084,-0.015 0.1157,-0.046 0.032,-0.031 0.048,-0.068 0.048,-0.1118 0,0 0,-0.6298 0,-0.6298 z m -0.1638,0.7089 c -0.055,0 -0.082,-0.026 -0.082,-0.079 0,0 0,-0.6298 0,-0.6298 0,-0.053 0.027,-0.079 0.082,-0.079 0.052,0 0.078,0.026 0.078,0.079 0,0 0,0.6298 0,0.6298 0,0.053 -0.026,0.079 -0.078,0.079 z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path98569-4-8"/>
+      <path id="path98571-7-2" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3146.3642,8032.8231 1.9594,0 0,2.4741 -1.9594,0 z" inkscape:connector-curvature="0"/>
+      <path d="m 3143.5056,8032.823 1.9594,0 0,2.4742 -1.9594,0 z" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98573-7-1" inkscape:connector-curvature="0"/>
+      <path id="path98575-8-1" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.21079655;stroke-miterlimit:4" d="m 3140.3884,8032.7774 1.246,0 0,4.3672 -1.246,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 3141.1469,8032.7774 0.4875,0 0,4.3672 -0.4875,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.1318544;stroke-miterlimit:4" id="path98577-6-4"/>
+      <path inkscape:connector-curvature="0" d="m 3146.3642,8036.2259 1.9594,0 0,1.082 -1.9594,0 z" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98579-0-8"/>
+      <path inkscape:connector-curvature="0" id="path98581-7-7" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3143.5056,8036.2258 1.9594,0 0,1.0821 -1.9594,0 z"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3077.334,8051.8344 30.2538,0.049 0.1832,6.404 -30.1839,-0.047 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" id="path98583-4-8"/>
+      <path inkscape:connector-curvature="0" id="path98585-5-1" d="m 3080.6521,8053.5058 7.3806,0 0,0.7428 -7.3806,0 z" style="fill:#000000;stroke:none"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path98587-5-7" d="m 3098.8228,8053.3701 0,3.2963 3.1351,0 0,-2.8356 0,-0.2439 0,-0.2168 -1.4369,0 0.7347,0.012 -0.016,0.105 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z" style="fill:#000000;stroke:none"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.4043,8053.5058 7.3806,0 0,0.7428 -7.3806,0 z" id="path98589-6-1"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3080.861,8054.8985 7.3807,0 0,0.418 -7.3807,0 z" id="path98591-2-7"/>
+      <path id="path98593-0-1" d="m 3089.6133,8054.8985 7.3806,0 0,0.418 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98595-6-4" d="m 3081.0178,8056.0129 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.7701,8056.0129 7.3806,0 0,0.4178 -7.3806,0 z" id="path98597-9-0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3081.0701,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z" id="path98599-6-4"/>
+      <path id="path98601-0-7" d="m 3089.8223,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3098.7052,8057.0808 7.3806,0 0,0.4177 -7.3806,0 z" id="path98603-3-6"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3077.334,8052.9022 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2443 -0.061,-1.561 2.8774,-0.052 22.2534,-0.01 25.0548,0 0.017,0.2963 0.018,0.2279 0.01,0.3251 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.4149 0.077,3.6729 0.2085,4.754 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z" style="fill:#000000;stroke:none" id="path98605-22-4"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3102.7558,8053.3505 0,0.476 2.1705,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98607-9-4"/>
+      <path id="path98609-4-4" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3102.7559,8056.6701 0,-0.4758 2.1703,0 0.016,-0.8009 0.5267,0 0,0.8 0,0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path98611-1-2" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" d="m 3077.6585,8058.4759 30.1103,-0.046 0.1832,6.4518 -29.9926,2e-4 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#000000;stroke:none" d="m 3080.9765,8060.1472 7.3806,0 0,0.7428 -7.3806,0 z" id="path98613-2-2" inkscape:connector-curvature="0"/>
+      <path style="fill:#000000;stroke:none" d="m 3099.1472,8060.0115 0,3.2963 3.1352,0 0,-2.8355 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0641 -1.0287,0 -0.016,0.093 -0.6694,0 0,-0.093 0,-3.0641 0.9797,0 0.016,-0.1162 z" id="path98615-98-7" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path98617-4-4" d="m 3089.7288,8060.1472 7.3806,0 0,0.7428 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98619-2-8" d="m 3081.1855,8061.54 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.9378,8061.54 7.3806,0 0,0.4179 -7.3806,0 z" id="path98621-5-1"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3081.3423,8062.6543 7.3806,0 0,0.4178 -7.3806,0 z" id="path98623-32-9"/>
+      <path id="path98625-9-2" d="m 3090.0945,8062.6543 7.3807,0 0,0.4178 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98627-1-8" d="m 3081.3945,8063.7221 7.3807,0 0,0.4178 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3090.1468,8063.7221 7.3806,0 0,0.4178 -7.3806,0 z" id="path98629-1-0"/>
+      <path id="path98631-8-3" d="m 3099.0297,8063.7221 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98633-8-9" style="fill:#000000;stroke:none" d="m 3077.6585,8059.5437 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4861 0.01,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.349 -0.019,-0.5123 -0.091,-1.2444 -0.061,-1.5609 2.8774,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2962 0.018,0.2276 0.01,0.3249 -1.0213,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.7541 -0.8203,-0.014 -1.2737,0.045 -2.0695,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path98635-6-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3103.0803,8059.9919 0,0.4761 2.1704,0 0.016,0.8007 0.5267,0 0,-0.8 0,-0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3103.0803,8063.3115 0,-0.4759 2.1704,0 0.016,-0.8008 0.5266,0 0,0.8001 0,0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98637-4-9"/>
+      <path id="path98639-0-0" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" d="m 3076.9343,8038.7375 30.2538,0.049 0.1831,6.4039 -30.1838,-0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#000000;stroke:none" d="m 3080.2523,8040.4088 7.3806,0 0,0.7428 -7.3806,0 z" id="path98641-1-9" inkscape:connector-curvature="0"/>
+      <path style="fill:#000000;stroke:none" d="m 3098.423,8040.2731 0,3.2964 3.1352,0 0,-2.8356 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.1051 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z" id="path98643-4-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path98645-1-5" d="m 3089.0046,8040.4088 7.3806,0 0,0.7428 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98647-57-2" d="m 3080.4613,8041.8016 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.2136,8041.8016 7.3806,0 0,0.4179 -7.3806,0 z" id="path98649-4-0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3080.6181,8042.9159 7.3806,0 0,0.4178 -7.3806,0 z" id="path98651-70-8"/>
+      <path id="path98653-8-3" d="m 3089.3703,8042.9159 7.3807,0 0,0.4178 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98655-7-7" d="m 3080.6703,8043.9838 7.3807,0 0,0.4178 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.4226,8043.9838 7.3806,0 0,0.4178 -7.3806,0 z" id="path98657-7-7"/>
+      <path id="path98659-6-0" d="m 3098.3055,8043.9838 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98661-5-9" style="fill:#000000;stroke:none" d="m 3076.9343,8039.8053 0.9144,0 c 0,0 0.254,2.324 0.381,3.4861 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.533,-0.01 -24.5191,0 0.1466,1.4149 0.077,3.6729 0.2086,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path98663-5-2" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3102.3561,8040.2535 0,0.4761 2.1704,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4759 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3102.3562,8043.5732 0,-0.4759 2.1703,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98665-7-7"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3077.2588,8045.3798 30.1103,-0.046 0.1831,6.4519 -29.9925,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" id="path98667-0-2"/>
+      <path inkscape:connector-curvature="0" id="path98669-4-6" d="m 3080.5768,8047.0512 7.3806,0 0,0.7428 -7.3806,0 z" style="fill:#000000;stroke:none"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path98671-4-0" d="m 3098.7475,8046.9155 0,3.2963 3.1351,0 0,-2.8356 0,-0.2438 0,-0.2169 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.0641 -1.0288,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0641 0.9798,0 0.016,-0.1161 z" style="fill:#000000;stroke:none"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.329,8047.0512 7.3807,0 0,0.7428 -7.3807,0 z" id="path98673-35-3"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3080.7858,8048.4439 7.3806,0 0,0.418 -7.3806,0 z" id="path98675-9-2"/>
+      <path id="path98677-3-8" d="m 3089.538,8048.4439 7.3807,0 0,0.418 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98679-6-4" d="m 3080.9426,8049.5583 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3089.6948,8049.5583 7.3806,0 0,0.4178 -7.3806,0 z" id="path98681-7-9"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3080.9948,8050.6261 7.3806,0 0,0.4178 -7.3806,0 z" id="path98683-3-6"/>
+      <path id="path98685-1-8" d="m 3089.7471,8050.6261 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3098.6299,8050.6261 7.3807,0 0,0.4178 -7.3807,0 z" id="path98687-0-4"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3077.2588,8046.4476 0.9144,0 c 0,0 0.254,2.3241 0.3809,3.4862 0.01,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.349 -0.019,-0.5123 -0.091,-1.2444 -0.061,-1.5609 2.8773,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2961 0.018,0.2276 0.01,0.3249 -1.0214,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.754 -0.8203,-0.014 -1.2738,0.045 -2.0696,0.045 z" style="fill:#000000;stroke:none" id="path98689-37-7"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3102.6805,8046.8959 0,0.476 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8 0,-0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98691-0-0"/>
+      <path id="path98693-0-3" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3102.6806,8050.2155 0,-0.4759 2.1703,0 0.016,-0.8008 0.5266,0 0,0.8 0,0.4759 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path inkscape:connector-curvature="0" d="m 3109.8465,8038.792 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1797 -0.1631,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.254,0.01 -0.4768,-0.1345 -0.4998,-0.3142 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.334 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98695-4-0"/>
+      <path inkscape:connector-curvature="0" d="m 3112.6281,8038.7316 0.4872,-0.011 c 0.254,-0.01 0.4768,0.1346 0.4998,0.3141 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3287 -0.4171,0.3342 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.3339 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98697-8-8"/>
+      <path inkscape:connector-curvature="0" id="path98699-3-5" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3109.8938,8040.9734 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.163,0.3286 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3286 0.4171,-0.3341 z"/>
+      <path inkscape:connector-curvature="0" id="path98701-6-5" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3112.6754,8040.913 0.4873,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.1631,0.3285 -0.417,0.3339 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.4171,-0.334 z"/>
+      <path d="m 3109.9451,8043.3405 0.4873,-0.011 c 0.2539,-0.01 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1798 -0.1631,0.3289 -0.417,0.3344 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.1631,-0.3287 0.417,-0.3343 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98703-51-0" inkscape:connector-curvature="0"/>
+      <path d="m 3112.7268,8043.2803 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1796 -0.1631,0.3287 -0.4171,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3285 0.417,-0.3341 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98705-1-9" inkscape:connector-curvature="0"/>
+      <path id="path98707-61-0" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.0079,8045.5317 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1346 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.417,-0.3339 z" inkscape:connector-curvature="0"/>
+      <path id="path98709-3-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3112.7895,8045.4712 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1345 0.4998,0.3142 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4873,0.011 c -0.2539,0.01 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.1631,-0.3286 0.417,-0.3342 z" inkscape:connector-curvature="0"/>
+      <path d="m 3110.0552,8047.713 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2489 c 0.023,0.1795 -0.163,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1796 0.163,-0.3288 0.417,-0.3343 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98711-4-4" inkscape:connector-curvature="0"/>
+      <path d="m 3112.8369,8047.6527 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3143 l 0.032,0.249 c 0.023,0.1794 -0.1631,0.3286 -0.417,0.334 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1796 0.1631,-0.3286 0.4171,-0.3342 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98713-00-9" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path98715-4-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.1066,8050.0802 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3144 l 0.032,0.2488 c 0.023,0.1798 -0.1631,0.3289 -0.417,0.3343 l -0.4872,0.01 c -0.254,0.011 -0.4768,-0.1347 -0.4998,-0.3144 l -0.032,-0.2488 c -0.023,-0.1796 0.1631,-0.3288 0.417,-0.3342 z"/>
+      <path inkscape:connector-curvature="0" id="path98717-4-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3112.8882,8050.0198 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1346 0.4998,0.3143 l 0.032,0.2489 c 0.023,0.1797 -0.1631,0.3288 -0.417,0.3343 l -0.4872,0.011 c -0.254,0.011 -0.4768,-0.1346 -0.4998,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3287 0.417,-0.3342 z"/>
+      <path id="path98719-6-9" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.1462,8052.292 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1797 -0.163,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1345 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1795 0.163,-0.3286 0.417,-0.334 z" inkscape:connector-curvature="0"/>
+      <path id="path98721-4-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3112.9279,8052.2316 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1346 0.4997,0.3141 l 0.032,0.2489 c 0.023,0.1796 -0.1631,0.3287 -0.417,0.3342 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.4171,-0.3339 z" inkscape:connector-curvature="0"/>
+      <path d="m 3110.1935,8054.4734 0.4872,-0.01 c 0.254,-0.011 0.4769,0.1348 0.4997,0.3142 l 0.032,0.2491 c 0.023,0.1793 -0.1631,0.3285 -0.417,0.334 l -0.4873,0.011 c -0.2539,0 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3286 0.417,-0.3341 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98723-7-9" inkscape:connector-curvature="0"/>
+      <path d="m 3112.9752,8054.413 0.4872,-0.01 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1794 -0.163,0.3285 -0.417,0.334 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1794 0.1631,-0.3285 0.417,-0.334 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98725-2-3" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path98727-14-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.2449,8056.8405 0.4872,-0.011 c 0.2539,-0.01 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1798 -0.163,0.3289 -0.417,0.3344 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1346 -0.4997,-0.3142 l -0.032,-0.2489 c -0.023,-0.1797 0.163,-0.3287 0.417,-0.3343 z"/>
+      <path inkscape:connector-curvature="0" id="path98729-7-3" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3113.0265,8056.7803 0.4873,-0.011 c 0.2539,-0.011 0.4768,0.1348 0.4997,0.3142 l 0.032,0.249 c 0.023,0.1796 -0.1631,0.3287 -0.417,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3285 0.4171,-0.3341 z"/>
+      <path inkscape:connector-curvature="0" d="m 3110.3076,8059.032 0.4872,-0.011 c 0.254,-0.01 0.4768,0.1346 0.4997,0.3143 l 0.032,0.2488 c 0.023,0.1796 -0.163,0.3286 -0.417,0.3342 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.1631,-0.3286 0.417,-0.334 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98731-5-5"/>
+      <path inkscape:connector-curvature="0" d="m 3113.0893,8058.9715 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1345 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1346 -0.4997,-0.3141 l -0.032,-0.249 c -0.023,-0.1797 0.1631,-0.3286 0.4171,-0.3342 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98733-1-3"/>
+      <path inkscape:connector-curvature="0" id="path98735-6-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3110.3549,8061.2133 0.4873,-0.01 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3143 l 0.032,0.2489 c 0.023,0.1795 -0.1631,0.3287 -0.417,0.3341 l -0.4872,0.011 c -0.254,0.011 -0.4769,-0.1346 -0.4998,-0.3141 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3287 0.417,-0.3343 z"/>
+      <path inkscape:connector-curvature="0" id="path98737-0-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3113.1366,8061.153 0.4872,-0.011 c 0.254,-0.011 0.4768,0.1348 0.4997,0.3143 l 0.032,0.2491 c 0.023,0.1793 -0.1631,0.3285 -0.4171,0.3339 l -0.4872,0.011 c -0.2539,0.01 -0.4768,-0.1347 -0.4997,-0.3142 l -0.032,-0.249 c -0.023,-0.1796 0.1631,-0.3286 0.417,-0.3342 z"/>
+      <path d="m 3110.4063,8063.5805 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1347 0.4997,0.3144 l 0.032,0.2488 c 0.023,0.1798 -0.163,0.3289 -0.417,0.3343 l -0.4872,0.01 c -0.2539,0.011 -0.4768,-0.1347 -0.4997,-0.3144 l -0.032,-0.2488 c -0.023,-0.1796 0.163,-0.3288 0.417,-0.3342 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98739-1-3" inkscape:connector-curvature="0"/>
+      <path d="m 3113.188,8063.5202 0.4872,-0.011 c 0.2539,-0.011 0.4768,0.1346 0.4997,0.3142 l 0.032,0.2489 c 0.023,0.1797 -0.163,0.3288 -0.417,0.3343 l -0.4872,0.011 c -0.2539,0.011 -0.4768,-0.1345 -0.4997,-0.3143 l -0.032,-0.2489 c -0.023,-0.1795 0.163,-0.3287 0.417,-0.3341 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98741-6-6" inkscape:connector-curvature="0"/>
+      <path id="path98743-1-9" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" d="m 3115.4455,8038.8188 30.1104,-0.046 0.065,6.4995 -29.9798,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 3118.7635,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z" id="path98745-3-6" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3136.9342,8040.3545 0,3.2964 3.1352,0 0,-3.2964 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9797,0 0.016,-0.1162 -1.6982,0 z" id="path98747-5-7"/>
+      <path sodipodi:nodetypes="ccccc" id="path98749-6-1" d="m 3127.5158,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path98751-96-5" d="m 3118.9725,8041.883 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.7248,8041.883 7.3806,0 0,0.4179 -7.3806,0 z" id="path98753-6-5"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.1293,8042.9973 7.3806,0 0,0.4179 -7.3806,0 z" id="path98755-4-6"/>
+      <path sodipodi:nodetypes="ccccc" id="path98757-2-0" d="m 3127.8815,8042.9973 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path98759-7-4" d="m 3119.1816,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.9338,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" id="path98761-5-7"/>
+      <path sodipodi:nodetypes="ccccc" id="path98763-7-8" d="m 3136.8167,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98765-5-6" style="fill:#000000;stroke:none" d="m 3115.4455,8039.8867 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path98767-2-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3140.6911,8040.3349 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3140.6912,8043.6546 0,-0.4759 2.1704,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98769-9-5"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3115.591,8045.4602 29.9652,-0.046 0.065,6.4997 -29.8352,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.43947119" id="path98771-3-1"/>
+      <path inkscape:connector-curvature="0" id="path98773-7-2" d="m 3118.893,8047.1317 7.345,0 0,0.7428 -7.345,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path98775-1-5" d="m 3136.9761,8046.996 0,3.2963 3.12,0 0,-3.2963 -1.43,0 0.7313,0.012 -0.016,0.1049 0,3.064 -1.0238,0 -0.016,0.093 -0.6662,0 0,-0.093 0,-3.064 0.975,0 0.016,-0.1162 -1.69,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.6031,8047.1317 7.345,0 0,0.7428 -7.345,0 z" id="path98777-7-9" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.101,8048.5244 7.345,0 0,0.418 -7.345,0 z" id="path98779-7-3" sodipodi:nodetypes="ccccc"/>
+      <path id="path98781-1-2" d="m 3127.811,8048.5244 7.3451,0 0,0.418 -7.3451,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path98783-65-5" d="m 3119.257,8049.6388 7.345,0 0,0.4178 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.9671,8049.6388 7.345,0 0,0.4178 -7.345,0 z" id="path98785-1-2" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.309,8050.7066 7.345,0 0,0.4178 -7.345,0 z" id="path98787-3-4" sodipodi:nodetypes="ccccc"/>
+      <path id="path98789-7-6" d="m 3128.0191,8050.7066 7.345,0 0,0.4178 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3136.8591,8050.7066 7.3451,0 0,0.4178 -7.3451,0 z" id="path98791-0-7" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3115.591,8046.5281 0.91,0 c 0,0 0.2527,2.324 0.3791,3.4862 0.01,0.042 0.3247,0.045 0.6353,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5122 -0.091,-1.2443 -0.06,-1.5609 2.8635,-0.052 22.146,-0.011 24.934,0 0.017,0.2962 0.018,0.2276 0.01,0.325 -1.0165,0.011 -24.4147,-0.011 -24.4009,0 0.1459,1.4148 0.076,3.6729 0.2075,4.754 -0.8163,-0.014 -1.6576,0.045 -2.4496,0.045 z" style="fill:#000000;stroke:none" id="path98793-1-7"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3140.7149,8046.9764 0,0.476 2.16,0 0.016,0.8008 0.5242,0 0,-0.8001 0,-0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98795-4-9"/>
+      <path id="path98797-92-1" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3140.715,8050.296 0,-0.4759 2.1599,0 0.016,-0.8008 0.5241,0 0,0.8 0,0.4759 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3115.8,8051.8466 29.7566,-0.046 0.065,6.4996 -29.6275,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.43793881" id="path98799-7-3"/>
+      <path inkscape:connector-curvature="0" id="path98801-7-2" d="m 3119.0791,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path98803-6-8" d="m 3137.0363,8053.3824 0,3.2963 3.0983,0 0,-3.2963 -1.4201,0 0.7262,0.012 -0.016,0.105 0,3.0639 -1.0166,0 -0.016,0.093 -0.6616,0 0,-0.093 0,-3.0639 0.9682,0 0.016,-0.1162 -1.6783,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3127.7285,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z" id="path98805-5-6" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.2856,8054.9109 7.2939,0 0,0.4179 -7.2939,0 z" id="path98807-8-5" sodipodi:nodetypes="ccccc"/>
+      <path id="path98809-3-2" d="m 3127.935,8054.9109 7.294,0 0,0.4179 -7.294,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path98811-2-5" d="m 3119.4405,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3128.09,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z" id="path98813-6-9" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.4922,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" id="path98815-7-1" sodipodi:nodetypes="ccccc"/>
+      <path id="path98817-4-7" d="m 3128.1416,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3136.9201,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" id="path98819-9-0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3115.8,8052.9146 0.9037,0 c 0,0 0.251,2.324 0.3765,3.4861 0.01,0.042 0.3224,0.045 0.6308,0.081 0.079,0.011 0.01,-1.2255 -0.035,-2.349 -0.019,-0.5124 -0.09,-1.2444 -0.06,-1.561 2.8435,-0.052 21.9918,-0.01 24.7604,0 0.016,0.2962 0.018,0.2278 0.01,0.325 -1.0093,0.011 -24.2447,-0.01 -24.2309,0 0.1449,1.4149 0.076,3.6729 0.2061,4.7541 -0.8108,-0.014 -1.6461,0.045 -2.4326,0.045 z" style="fill:#000000;stroke:none" id="path98821-3-0"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3140.7491,8053.3628 0,0.476 2.1449,0 0.016,0.8008 0.5205,0 0,-0.8 0,-0.4759 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98823-5-2"/>
+      <path id="path98825-0-5" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3140.7491,8056.6824 0,-0.4758 2.1449,0 0.016,-0.8009 0.5205,0 0,0.8001 0,0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path98827-9-3" style="fill:#808080;stroke:#000000;stroke-width:0.43688199" d="m 3115.9438,8058.4881 29.6131,-0.046 0.064,6.4996 -29.4847,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 3119.207,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z" id="path98829-1-6" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3137.0777,8060.0238 0,3.2964 3.0834,0 0,-3.2964 -1.4133,0 0.7227,0.012 -0.016,0.105 0,3.064 -1.0117,0 -0.016,0.093 -0.6585,0 0,-0.093 0,-3.064 0.9636,0 0.016,-0.1162 -1.6702,0 z" id="path98831-2-5"/>
+      <path sodipodi:nodetypes="ccccc" id="path98833-9-5" d="m 3127.8147,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path98835-9-6" d="m 3119.4126,8061.5523 7.2587,0 0,0.4179 -7.2587,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3128.0203,8061.5523 7.2588,0 0,0.4179 -7.2588,0 z" id="path98837-7-7"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3119.5667,8062.6666 7.2588,0 0,0.4178 -7.2588,0 z" id="path98839-06-9"/>
+      <path sodipodi:nodetypes="ccccc" id="path98841-5-0" d="m 3128.1745,8062.6666 7.2587,0 0,0.4178 -7.2587,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path98843-9-3" d="m 3119.6181,8063.7344 7.2588,0 0,0.4179 -7.2588,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3128.2259,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z" id="path98845-3-1"/>
+      <path sodipodi:nodetypes="ccccc" id="path98847-4-0" d="m 3136.9621,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98849-5-4" style="fill:#000000;stroke:none" d="m 3115.9438,8059.556 0.8993,0 c 0,0 0.2498,2.324 0.3747,3.4862 0.01,0.042 0.3208,0.045 0.6278,0.081 0.079,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5123 -0.09,-1.2444 -0.06,-1.5609 2.8299,-0.052 21.8859,-0.011 24.6411,0 0.016,0.2962 0.017,0.2276 0.01,0.3249 -1.0045,0.011 -24.1279,-0.011 -24.1142,0 0.1442,1.4148 0.075,3.6729 0.2051,4.7541 -0.8068,-0.014 -1.6382,0.045 -2.4208,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path98851-4-5" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3140.7726,8060.0042 0,0.4761 2.1346,0 0.016,0.8008 0.518,0 0,-0.8001 0,-0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3140.7726,8063.3239 0,-0.476 2.1345,0 0.016,-0.8008 0.5179,0 0,0.8001 0,0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98853-8-3"/>
+      <path id="path98855-0-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3782,8038.7453 0.4873,0 c 0.2541,0 0.4732,0.1467 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.327 l -0.025,-0.2496 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3231 z" inkscape:connector-curvature="0"/>
+      <path id="path98857-7-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.1604,8038.7569 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1801 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4731,-0.1469 -0.4914,-0.3271 l -0.025,-0.2496 c -0.018,-0.18 0.1716,-0.3242 0.4256,-0.323 z" inkscape:connector-curvature="0"/>
+      <path d="m 3148.369,8040.9272 0.4874,0 c 0.2541,0 0.4731,0.147 0.4914,0.3269 l 0.025,0.2499 c 0.018,0.1798 -0.1715,0.3241 -0.4255,0.323 l -0.4873,0 c -0.2539,-0.01 -0.4732,-0.147 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3243 0.4255,-0.3232 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98859-7-5" inkscape:connector-curvature="0"/>
+      <path d="m 3151.1513,8040.9388 0.4874,0 c 0.2541,0 0.4731,0.147 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1799 -0.1715,0.3242 -0.4255,0.3231 l -0.4873,0 c -0.2542,0 -0.4732,-0.1471 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3242 0.4255,-0.3232 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98861-1-0" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path98863-8-9" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3591,8043.2948 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3245 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.3271 l -0.025,-0.2496 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z"/>
+      <path inkscape:connector-curvature="0" id="path98865-7-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.1414,8043.3065 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3234 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2497 c -0.018,-0.18 0.1716,-0.3242 0.4256,-0.3232 z"/>
+      <path inkscape:connector-curvature="0" d="m 3148.3652,8045.4869 0.4873,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1801 -0.1716,0.3242 -0.4255,0.3232 l -0.4874,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2498 c -0.018,-0.18 0.1715,-0.3241 0.4255,-0.323 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98867-2-5"/>
+      <path inkscape:connector-curvature="0" d="m 3151.1475,8045.4984 0.4873,0 c 0.2541,0 0.4732,0.1467 0.4914,0.3269 l 0.025,0.2498 c 0.018,0.18 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1803 0.1716,-0.3243 0.4256,-0.3233 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98869-8-9"/>
+      <path inkscape:connector-curvature="0" id="path98871-15-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3561,8047.6686 0.4873,0 c 0.2541,0 0.4731,0.147 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1801 -0.1715,0.3243 -0.4255,0.3232 l -0.4873,0 c -0.2542,0 -0.4732,-0.1468 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z"/>
+      <path inkscape:connector-curvature="0" id="path98873-6-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.1383,8047.6804 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.18 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2498 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3232 z"/>
+      <path d="m 3148.3462,8050.0365 0.4873,0 c 0.2541,0 0.4732,0.147 0.4914,0.3272 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3245 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1802 0.1715,-0.3245 0.4255,-0.3233 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98875-3-7" inkscape:connector-curvature="0"/>
+      <path d="m 3151.1284,8050.0481 0.4874,0 c 0.2541,0 0.4731,0.1468 0.4914,0.3271 l 0.025,0.2495 c 0.018,0.1803 -0.1715,0.3246 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1802 0.1716,-0.3245 0.4256,-0.3233 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98877-8-7" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 3148.3286,8052.2485 0.4873,0 c 0.2541,0 0.4732,0.1468 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1803 -0.1716,0.3243 -0.4255,0.3233 l -0.4874,0 c -0.2541,0 -0.4732,-0.1467 -0.4914,-0.327 l -0.025,-0.2496 c -0.018,-0.18 0.1715,-0.3243 0.4255,-0.3231 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98879-6-9"/>
+      <path inkscape:connector-curvature="0" d="m 3151.1108,8052.2602 0.4874,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3269 l 0.025,0.2496 c 0.018,0.1802 -0.1716,0.3244 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4731,-0.1468 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3229 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98881-4-5"/>
+      <path inkscape:connector-curvature="0" id="path98883-6-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3194,8054.4304 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.327 l 0.025,0.2498 c 0.018,0.1798 -0.1715,0.3242 -0.4255,0.3231 l -0.4873,0 c -0.2539,-0.01 -0.4732,-0.147 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1799 0.1715,-0.3243 0.4255,-0.3232 z"/>
+      <path inkscape:connector-curvature="0" id="path98885-4-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.1017,8054.442 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.1799 -0.1715,0.3242 -0.4255,0.323 l -0.4873,0 c -0.2542,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3232 z"/>
+      <path d="m 3148.3095,8056.7981 0.4874,0 c 0.2541,0 0.4732,0.147 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1804 -0.1715,0.3245 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1802 0.1715,-0.3243 0.4255,-0.3233 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98887-4-7" inkscape:connector-curvature="0"/>
+      <path d="m 3151.0918,8056.8098 0.4874,0 c 0.2541,0 0.4731,0.1471 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.1802 -0.1716,0.3243 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3272 l -0.025,-0.2498 c -0.018,-0.1801 0.1716,-0.3241 0.4256,-0.3231 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98889-5-0" inkscape:connector-curvature="0"/>
+      <path id="path98891-3-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.3156,8058.9904 0.4873,0 c 0.2541,0 0.4732,0.1469 0.4914,0.3271 l 0.025,0.2496 c 0.018,0.1801 -0.1716,0.3243 -0.4256,0.3233 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.18 0.1715,-0.3242 0.4255,-0.3231 z" inkscape:connector-curvature="0"/>
+      <path id="path98893-4-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.0979,8059.0019 0.4873,0 c 0.2541,0 0.4732,0.1468 0.4914,0.327 l 0.025,0.2497 c 0.018,0.1799 -0.1716,0.3243 -0.4256,0.3232 l -0.4873,0 c -0.2541,0 -0.4732,-0.1469 -0.4914,-0.327 l -0.025,-0.2497 c -0.018,-0.1802 0.1716,-0.3243 0.4256,-0.3233 z" inkscape:connector-curvature="0"/>
+      <path d="m 3148.3064,8061.1722 0.4874,0 c 0.2541,0 0.4731,0.1469 0.4914,0.3271 l 0.025,0.2497 c 0.018,0.18 -0.1715,0.3243 -0.4255,0.3232 l -0.4873,0 c -0.2542,0 -0.4732,-0.1469 -0.4915,-0.327 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3244 0.4255,-0.3234 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98895-7-4" inkscape:connector-curvature="0"/>
+      <path d="m 3151.0887,8061.1839 0.4874,0 c 0.2541,0 0.4731,0.1472 0.4914,0.3271 l 0.025,0.2498 c 0.018,0.1799 -0.1716,0.3242 -0.4256,0.3231 l -0.4873,0 c -0.2541,0 -0.4732,-0.147 -0.4914,-0.3271 l -0.025,-0.2497 c -0.018,-0.1801 0.1715,-0.3243 0.4255,-0.3233 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" id="path98897-4-9" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path98899-1-5" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3148.2965,8063.54 0.4874,0 c 0.2541,0 0.4732,0.147 0.4914,0.3272 l 0.025,0.2495 c 0.018,0.1803 -0.1716,0.3246 -0.4255,0.3234 l -0.4874,0 c -0.2541,0 -0.4731,-0.147 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1801 0.1715,-0.3245 0.4256,-0.3233 z"/>
+      <path inkscape:connector-curvature="0" id="path98901-5-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40060124" d="m 3151.0788,8063.5516 0.4874,0 c 0.2541,0 0.4731,0.1469 0.4914,0.3271 l 0.025,0.2495 c 0.018,0.1803 -0.1716,0.3246 -0.4256,0.3235 l -0.4873,0 c -0.2541,0 -0.4732,-0.1468 -0.4914,-0.3272 l -0.025,-0.2495 c -0.018,-0.1801 0.1716,-0.3245 0.4256,-0.3233 z"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3154.0074,8038.8188 30.361,-0.025 -0.2471,6.4782 -30.1139,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" id="path98903-30-5"/>
+      <path inkscape:connector-curvature="0" id="path98905-7-1" d="m 3157.2635,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path98907-6-7" d="m 3175.4342,8040.3545 0,3.2964 3.1352,0 0,-3.2964 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9797,0 0.016,-0.1162 -1.6982,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.0158,8040.4903 7.3806,0 0,0.7427 -7.3806,0 z" id="path98909-1-2" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.4725,8041.883 7.3807,0 0,0.4179 -7.3807,0 z" id="path98911-6-9" sodipodi:nodetypes="ccccc"/>
+      <path id="path98913-8-3" d="m 3166.2248,8041.883 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path98915-0-6" d="m 3157.6293,8042.9973 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.3815,8042.9973 7.3807,0 0,0.4179 -7.3807,0 z" id="path98917-6-6" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.6816,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" id="path98919-2-3" sodipodi:nodetypes="ccccc"/>
+      <path id="path98921-69-6" d="m 3166.4338,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3175.3167,8044.0652 7.3806,0 0,0.4178 -7.3806,0 z" id="path98923-2-8" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3153.9455,8039.8867 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0.01,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5124 -0.091,-1.2444 -0.061,-1.561 2.8774,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2963 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z" style="fill:#000000;stroke:none" id="path98925-91-2"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3179.1911,8040.3349 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98927-6-0"/>
+      <path id="path98929-0-1" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3179.1912,8043.6546 0,-0.4759 2.1704,0 0.016,-0.8009 0.5266,0 0,0.8001 0,0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path98931-9-2" style="fill:#808080;stroke:#000000;stroke-width:0.43947119" d="m 3154.0074,8045.4602 30.0488,-0.046 -0.1224,6.4997 -29.9264,-0.088 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 3157.393,8047.1317 7.345,0 0,0.7428 -7.345,0 z" id="path98933-8-4" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3175.4761,8046.996 0,3.2963 3.12,0 0,-3.2963 -1.43,0 0.7313,0.012 -0.016,0.1049 0,3.064 -1.0238,0 -0.016,0.093 -0.6662,0 0,-0.093 0,-3.064 0.975,0 0.016,-0.1162 -1.6901,0 z" id="path98935-5-6"/>
+      <path sodipodi:nodetypes="ccccc" id="path98937-1-1" d="m 3166.1031,8047.1317 7.345,0 0,0.7428 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path98939-8-3" d="m 3157.601,8048.5244 7.345,0 0,0.418 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.311,8048.5244 7.3451,0 0,0.418 -7.3451,0 z" id="path98941-4-4"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.757,8049.6388 7.345,0 0,0.4178 -7.345,0 z" id="path98943-6-3"/>
+      <path sodipodi:nodetypes="ccccc" id="path98945-69-3" d="m 3166.4671,8049.6388 7.345,0 0,0.4178 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path98947-8-2" d="m 3157.809,8050.7066 7.345,0 0,0.4178 -7.345,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.5191,8050.7066 7.345,0 0,0.4178 -7.345,0 z" id="path98949-2-1"/>
+      <path sodipodi:nodetypes="ccccc" id="path98951-6-5" d="m 3175.3591,8050.7066 7.3451,0 0,0.4178 -7.3451,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98953-81-3" style="fill:#000000;stroke:none" d="m 3154.091,8046.5281 0.91,0 c 0,0 0.2527,2.324 0.3791,3.4862 0.01,0.042 0.3247,0.045 0.6353,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5122 -0.09,-1.2443 -0.06,-1.5609 2.8635,-0.052 22.146,-0.011 24.934,0 0.017,0.2962 0.018,0.2276 0.01,0.325 -1.0165,0.011 -24.4147,-0.011 -24.4009,0 0.1459,1.4148 0.076,3.6729 0.2075,4.754 -0.8163,-0.014 -1.6576,0.045 -2.4496,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path98955-9-6" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3179.2149,8046.9764 0,0.476 2.16,0 0.016,0.8008 0.5242,0 0,-0.8001 0,-0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3179.215,8050.296 0,-0.4759 2.1599,0 0.016,-0.8008 0.5241,0 0,0.8 0,0.4759 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98957-4-8"/>
+      <path id="path98959-6-6" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.43793881" d="m 3154.0074,8051.8466 29.9242,-0.046 -0.1228,6.4996 -29.8014,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 3157.5791,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z" id="path98961-7-1" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3175.5363,8053.3824 0,3.2963 3.0983,0 0,-3.2963 -1.4201,0 0.7262,0.012 -0.016,0.105 0,3.0639 -1.0166,0 -0.016,0.093 -0.6616,0 0,-0.093 0,-3.0639 0.9682,0 0.016,-0.1162 -1.6783,0 z" id="path98963-4-2"/>
+      <path sodipodi:nodetypes="ccccc" id="path98965-4-6" d="m 3166.2285,8053.5181 7.2939,0 0,0.7428 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path98967-5-4" d="m 3157.7856,8054.9109 7.2939,0 0,0.4179 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.435,8054.9109 7.294,0 0,0.4179 -7.294,0 z" id="path98969-3-3"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.9405,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z" id="path98971-6-7"/>
+      <path sodipodi:nodetypes="ccccc" id="path98973-3-3" d="m 3166.59,8056.0252 7.2939,0 0,0.4178 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path98975-9-1" d="m 3157.9922,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.6416,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" id="path98977-2-5"/>
+      <path sodipodi:nodetypes="ccccc" id="path98979-7-6" d="m 3175.4201,8057.0931 7.2939,0 0,0.4177 -7.2939,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path98981-8-6" style="fill:#000000;stroke:none" d="m 3154.0074,8052.9146 1.1963,0 c 0,0 0.251,2.324 0.3765,3.4861 0.01,0.042 0.3224,0.045 0.6308,0.081 0.079,0.011 0.01,-1.2255 -0.035,-2.349 -0.019,-0.5124 -0.09,-1.2444 -0.06,-1.561 2.8435,-0.052 21.9918,-0.01 24.7604,0 0.016,0.2962 0.018,0.2278 0.01,0.325 -1.0093,0.011 -24.2447,-0.01 -24.2309,0 0.1449,1.4149 0.076,3.6729 0.2061,4.7541 -0.8108,-0.014 -2.0672,-0.043 -2.8537,-0.043 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path id="path98983-57-3" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3179.2491,8053.3628 0,0.476 2.1449,0 0.016,0.8008 0.5205,0 0,-0.8 0,-0.4759 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3179.2491,8056.6824 0,-0.4758 2.1449,0 0.016,-0.8009 0.5205,0 0,0.8001 0,0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path98985-4-6"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 3154.0074,8058.4881 29.862,-0.046 -0.061,6.4996 -29.8014,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.43688199" id="path98987-4-2"/>
+      <path inkscape:connector-curvature="0" id="path98989-2-7" d="m 3157.707,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path98991-2-1" d="m 3175.5777,8060.0238 0,3.2964 3.0834,0 0,-3.2964 -1.4133,0 0.7227,0.012 -0.016,0.105 0,3.064 -1.0117,0 -0.016,0.093 -0.6585,0 0,-0.093 0,-3.064 0.9636,0 0.016,-0.1162 -1.6702,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.3147,8060.1596 7.2588,0 0,0.7427 -7.2588,0 z" id="path98993-5-3" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3157.9126,8061.5523 7.2587,0 0,0.4179 -7.2587,0 z" id="path98995-1-8" sodipodi:nodetypes="ccccc"/>
+      <path id="path98997-2-2" d="m 3166.5203,8061.5523 7.2588,0 0,0.4179 -7.2588,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path98999-1-8" d="m 3158.0667,8062.6666 7.2588,0 0,0.4178 -7.2588,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3166.6745,8062.6666 7.2587,0 0,0.4178 -7.2587,0 z" id="path99001-9-0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3158.1181,8063.7344 7.2588,0 0,0.4179 -7.2588,0 z" id="path99003-6-9" sodipodi:nodetypes="ccccc"/>
+      <path id="path99005-6-5" d="m 3166.7259,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 3175.4621,8063.7344 7.2587,0 0,0.4179 -7.2587,0 z" id="path99007-3-8" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 3154.0074,8059.556 1.3357,0 c 0,0 0.2498,2.324 0.3747,3.4862 0.01,0.042 0.3208,0.045 0.6278,0.081 0.079,0.01 0.01,-1.2254 -0.035,-2.3491 -0.019,-0.5123 -0.09,-1.2444 -0.06,-1.5609 2.8299,-0.052 21.8859,-0.011 24.6411,0 0.016,0.2962 0.017,0.2276 0.01,0.3249 -1.0045,0.011 -24.1279,-0.011 -24.1142,0 0.1442,1.4148 0.075,3.6729 0.2051,4.7541 -0.8068,-0.014 -2.2025,-0.1316 -2.9852,-0.1316 z" style="fill:#000000;stroke:none" id="path99009-1-4"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 3179.2726,8060.0042 0,0.4761 2.1346,0 0.016,0.8008 0.518,0 0,-0.8001 0,-0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path99011-9-7"/>
+      <path id="path99013-0-0" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3179.2726,8063.3239 0,-0.476 2.1345,0 0.016,-0.8008 0.5179,0 0,0.8001 0,0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path style="fill:url(#linearGradient116318-2-2);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.46755612;stroke-miterlimit:4;stroke-dasharray:none" d="m 3188.2295,8031.7948 c -0.7615,0 -1.4036,1.7174 -1.4532,3.8499 l -0.6205,26.0317 c -0.05,2.1332 0.5285,3.8502 1.29,3.8502 l 5.5518,0 c 0.7615,0 1.4037,-1.717 1.4532,-3.8502 l 0.147,-6.2782 -0.8491,-0.2764 0,-12.0533 1.143,0.3208 0.1796,-7.7456 c 0.05,-2.133 -0.5284,-3.8497 -1.2899,-3.8497 l -5.5519,0 z m 2.727,13.6037 c 0.2416,0.031 0.427,0.1615 0.4082,1.5207 -0.019,1.3592 -0.2319,1.7847 -0.4735,1.7583 -0.2417,-0.031 -0.4107,-0.4907 -0.3919,-1.8499 0.019,-1.3589 0.2156,-1.4553 0.4572,-1.4291 z" id="path99015-0-7" inkscape:connector-curvature="0" sodipodi:nodetypes="cccssccccccscccsccc"/>
+      <path style="fill:#808080;fill-opacity:1;stroke:none" d="m 3190.3579,8035.2121 1.1191,-0.164 1.3653,3.7837 -0.3256,25.492 -1.1238,0.2762 -1.5769,-4.5157 0.9296,-0.1129 0.6884,1.0765 0.2954,-21.8612 -1.3715,-3.9746" id="path99017-47-4" inkscape:path-effect="#path-effect114909-4-2-8" inkscape:original-d="m 3190.3579,8035.2121 c 0.062,-1.7546 0.4414,-1.171 1.1191,-0.164 l 1.3653,3.7837 -0.3256,25.492 c -0.3058,1.3892 -0.6828,0.6232 -1.1238,0.2762 l -1.5769,-4.5157 c 0.3209,-1.1632 0.4055,-0.5716 0.9296,-0.1129 l 0.6884,1.0765 0.2954,-21.8612 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+      <path style="fill:#4d4d4d;fill-opacity:1;stroke:none" d="m 3190.2888,8040.6674 1.0251,2.1293 -0.2408,18.8508 -1.257,-1.5571 -0.038,3.0588 1.6211,1.4554 0.3584,-25.525 -1.4053,-3.8706 -0.064,5.4584" id="path99019-3-3" inkscape:path-effect="#path-effect114906-4-1-1" inkscape:original-d="m 3190.2888,8040.6674 1.0251,2.1293 -0.2408,18.8508 -1.257,-1.5571 -0.038,3.0588 1.6211,1.4554 0.3584,-25.525 -1.4053,-3.8706 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path id="path99021-7-6" style="fill:url(#linearGradient116313-9-1);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.75868785" d="m 3076.8263,8032.663 61.066,0 0.039,4.8436 -60.8082,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3078.1898,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99023-8-1" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99025-85-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3081.4647,8033.2463 1.581,0 c 0.2144,0 0.4,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1436,-0.5222 0.358,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3084.7729,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1436,-0.5222 0.358,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99027-3-8" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99029-0-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3078.1898,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3081.4647,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1436,-0.5222 0.358,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99031-0-6" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99033-7-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3084.7729,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1436,-0.5222 0.358,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3088.1363,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99035-9-4" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99037-04-0" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3091.4112,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3094.7194,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99039-6-0" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99041-1-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3117.4035,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3120.6784,8033.2463 1.581,0 c 0.2144,0 0.4,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99043-7-1" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99045-6-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3123.9866,8033.2463 1.581,0 c 0.2144,0 0.3999,0.233 0.416,0.5222 l 0.022,0.401 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.401 c -0.016,-0.2892 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3117.4035,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99047-1-0" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99049-1-9" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3120.6784,8035.4789 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3123.9866,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99051-8-1" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99053-3-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3127.35,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3130.6249,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path99055-9-8" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99057-9-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 3133.9331,8035.4789 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5222 l 0.022,0.401 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.401 c -0.016,-0.2893 0.1437,-0.5222 0.3581,-0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path inkscape:connector-curvature="0" d="m 3149.0158,8032.8231 1.9595,0 0,4.4187 -1.9595,0 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path99059-78-7"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3097.7189,8036.8948 1.5808,0 c 0.2144,0 0.3999,-0.2331 0.416,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.3581,0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path99061-4-0" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99063-5-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3100.9935,8036.8948 1.5809,0 c 0.2144,0 0.3999,-0.2331 0.4159,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.358,0.5222 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3104.3014,8036.8948 1.5809,0 c 0.2144,0 0.3999,-0.2331 0.4159,-0.5222 l 0.022,-0.401 c 0.016,-0.2892 -0.1436,-0.522 -0.358,-0.522 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.522 l -0.022,0.401 c -0.016,0.2891 0.1436,0.5222 0.358,0.5222 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path99065-2-0" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99067-81-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3097.7189,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.3581,0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3100.9935,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path99069-8-3" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99071-2-5" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3104.3014,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3107.6645,8034.6623 1.5809,0 c 0.2144,0 0.3999,-0.2328 0.4159,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path99073-9-5" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path99075-7-0" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" d="m 3110.9392,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1436,-0.5221 -0.358,-0.5221 l -1.5809,0 c -0.2144,0 -0.3999,0.2328 -0.4159,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1436,0.5221 0.358,0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 3114.2471,8034.6623 1.5808,0 c 0.2144,0 0.3999,-0.2328 0.416,-0.5221 l 0.022,-0.4009 c 0.016,-0.2893 -0.1437,-0.5221 -0.3581,-0.5221 l -1.5808,0 c -0.2144,0 -0.3999,0.2328 -0.416,0.5221 l -0.022,0.4009 c -0.016,0.2893 0.1437,0.5221 0.3581,0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46649647" id="path99077-2-9" inkscape:connector-curvature="0"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Rackmountable_5U_server_2D.svg b/misc/images/svg/elements/Rackmountable_5U_server_2D.svg
index 71285fa4eee..d9fb36dc5c6 100644
--- a/misc/images/svg/elements/Rackmountable_5U_server_2D.svg
+++ b/misc/images/svg/elements/Rackmountable_5U_server_2D.svg
@@ -1,2436 +1,433 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="127.99995"
-   height="43.694916"
-   id="svg146316"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 46">
-  <defs
-     id="defs146318">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-00-0-9-7"
-       id="linearGradient106446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1471966,0,-0.03206072,0.87264571,332.33193,-4736.142)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-00-0-9-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-3-1-4-7" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-1-2-6-2" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="127.99995" height="43.694916" id="svg146316" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 46">
+  <defs id="defs146318">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-00-0-9-7" id="linearGradient106446" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1471966,0,-0.03206072,0.87264571,332.33193,-4736.142)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-00-0-9-7">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-3-1-4-7"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-1-2-6-2"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-48-4-1-9"
-       id="linearGradient106448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.9846258,0,-0.0538019,0.73061289,-557.14711,-3602.8101)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-48-4-1-9">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-3-6-5-4" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-52-4-8-1" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-48-4-1-9" id="linearGradient106448" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.9846258,0,-0.0538019,0.73061289,-557.14711,-3602.8101)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-48-4-1-9">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-3-6-5-4"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-52-4-8-1"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-7-1-8-6"
-       id="linearGradient106450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1471966,0,0.04925749,2.7706929,-62.652908,-19902.753)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-7-1-8-6">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-20-1-8-9" />
-      <stop
-         id="stop76664-9-25-24-5-2-8"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-1-0-8-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-7-1-8-6" id="linearGradient106450" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1471966,0,0.04925749,2.7706929,-62.652908,-19902.753)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-7-1-8-6">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-20-1-8-9"/>
+      <stop id="stop76664-9-25-24-5-2-8" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-1-0-8-2"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect29991-6-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect29988-5-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-7-1-8-6"
-       id="linearGradient106452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.147175,0,-0.04925657,2.7701444,1679.5499,-19898.364)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient145918">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop145920" />
-      <stop
-         id="stop145922"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop145924" />
+    <inkscape:path-effect is_visible="true" id="path-effect29991-6-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect29988-5-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-7-1-8-6" id="linearGradient106452" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.147175,0,-0.04925657,2.7701444,1679.5499,-19898.364)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient145918">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop145920"/>
+      <stop id="stop145922" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop145924"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect31563-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect31565-1"
-       is_visible="true" />
+    <inkscape:path-effect effect="spiro" id="path-effect31563-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect31565-1" is_visible="true"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="144.71426"
-     inkscape:cy="-58.15258"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="154"
-     inkscape:window-y="203"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata146321">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="144.71426" inkscape:cy="-58.15258" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="154" inkscape:window-y="203" inkscape:window-maximized="0"/>
+  <metadata id="metadata146321">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-230.28574,-430.51469)">
-    <g
-       style="display:inline"
-       transform="translate(-3608.3055,-7613.54)"
-       id="g106843"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_5U_server_2D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         transform="matrix(0.94319853,0,0,0.94319853,3140.0847,5927.6491)"
-         id="g102928">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 746.89881,2244.3452 122.43444,0 0,45.3562 -122.43444,0 z"
-           style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.97012049;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path102950"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path102963"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44614804"
-           d="m 748.44391,2276.0072 29.96981,0.051 0.18149,6.6304 -29.90058,-0.049 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 751.87937,2277.7378 7.64162,0 0,0.769 -7.64162,0 z"
-           id="path102982"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 770.69271,2277.5973 0,3.4128 3.24598,0 0,-2.9359 0,-0.2524 0,-0.2245 -1.48773,0 0.76069,0.013 -0.0166,0.1088 0,3.1724 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1724 1.01435,0 0.0166,-0.1202 z"
-           id="path102987"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path102989"
-           d="m 760.9411,2277.7378 7.64163,0 0,0.769 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path102991"
-           d="m 752.09565,2279.1797 7.64174,0 0,0.4328 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.15749,2279.1797 7.64163,0 0,0.4328 -7.64163,0 z"
-           id="path102993" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.258,2280.3336 7.64163,0 0,0.4325 -7.64163,0 z"
-           id="path102995" />
-        <path
-           id="path102997"
-           d="m 761.31984,2280.3336 7.64163,0 0,0.4325 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path102999"
-           d="m 752.31215,2281.4392 7.64162,0 0,0.4324 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.37389,2281.4392 7.64163,0 0,0.4324 -7.64163,0 z"
-           id="path103001" />
-        <path
-           id="path103003"
-           d="m 770.57095,2281.4392 7.64163,0 0,0.4324 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path103005"
-           style="fill:#000000;stroke:none"
-           d="m 748.44391,2277.1128 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6095 0.0103,0.043 0.33774,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2689 -0.0362,-2.4322 -0.0196,-0.5306 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04044,-0.011 25.94092,0 0.0176,0.3067 0.0187,0.2359 0.0104,0.3366 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8027 0.21587,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path103007"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.76481,2277.5769 0,0.4929 2.24726,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4926 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.76492,2281.0139 0,-0.4925 2.24705,0 0.0166,-0.8292 0.54533,0 0,0.8282 0,0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path103009" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.77988,2282.8836 29.83384,-0.048 0.18152,6.68 -29.71722,2e-4 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.4461942"
-           id="path103011" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path103013"
-           d="m 752.21523,2284.614 7.64164,0 0,0.7691 -7.64164,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path103015"
-           d="m 771.02858,2284.4736 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1724 -1.06509,0 -0.0166,0.097 -0.69307,0 0,-0.097 0,-3.1724 1.01435,0 0.0166,-0.1203 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.27707,2284.614 7.64164,0 0,0.7691 -7.64164,0 z"
-           id="path103017" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.43163,2286.0561 7.64162,0 0,0.4327 -7.64162,0 z"
-           id="path103019" />
-        <path
-           id="path103021"
-           d="m 761.49347,2286.0561 7.64163,0 0,0.4327 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path103023"
-           d="m 752.59397,2287.2098 7.64164,0 0,0.4326 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.65571,2287.2098 7.64174,0 0,0.4326 -7.64174,0 z"
-           id="path103031" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.64801,2288.3154 7.64175,0 0,0.4326 -7.64175,0 z"
-           id="path103055" />
-        <path
-           id="path103302"
-           d="m 761.70986,2288.3154 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 770.90693,2288.3154 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path103324" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.77988,2283.9892 0.94674,0 c 0,0 0.26299,2.4061 0.39438,3.6094 0.0104,0.044 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0197,-0.5303 -0.0942,-1.2883 -0.0632,-1.6161 2.97917,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05742,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4648 0.0797,3.8028 0.21588,4.9222 -0.84931,-0.015 -1.31874,0.047 -2.14269,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path103348" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 775.10078,2284.4533 0,0.4929 2.24717,0 0.0166,0.829 0.54533,0 0,-0.8283 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path103350" />
-        <path
-           id="path103352"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 775.10078,2287.8903 0,-0.4928 2.24717,0 0.0166,-0.8291 0.54522,0 0,0.8284 0,0.4926 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.26435,2262.4471 29.77249,0.051 0.18161,6.6305 -29.93734,-0.049 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44642299"
-           id="path103354" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path103356"
-           d="m 751.46542,2264.1775 7.64163,0 0,0.7691 -7.64163,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path103358"
-           d="m 770.27877,2264.0371 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1088 0,3.1723 -1.0651,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.52726,2264.1775 7.64164,0 0,0.7691 -7.64164,0 z"
-           id="path103360" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 751.68182,2265.6196 7.64162,0 0,0.4327 -7.64162,0 z"
-           id="path103362" />
-        <path
-           id="path103364"
-           d="m 760.74366,2265.6196 7.64162,0 0,0.4327 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path103366"
-           d="m 751.84416,2266.7733 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.90589,2266.7733 7.64175,0 0,0.4326 -7.64175,0 z"
-           id="path103368" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 751.8982,2267.8789 7.64174,0 0,0.4327 -7.64174,0 z"
-           id="path103370" />
-        <path
-           id="path103372"
-           d="m 760.96004,2267.8789 7.64164,0 0,0.4327 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 770.15711,2267.8789 7.64164,0 0,0.4327 -7.64164,0 z"
-           id="path103374" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.03007,2263.5527 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6094 0.0104,0.044 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4321 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6163 2.97917,-0.054 23.04033,-0.011 25.94092,0 0.0176,0.3069 0.0186,0.236 0.0104,0.3366 -1.05752,0.012 -25.40066,-0.011 -25.38627,0 0.15178,1.4649 0.0797,3.8028 0.21598,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path103376" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.35097,2264.0168 0,0.4929 2.24716,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path103378" />
-        <path
-           id="path103380"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.35107,2267.4539 0,-0.4927 2.24706,0 0.0166,-0.8293 0.54522,0 0,0.8284 0,0.4926 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path103382"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44610023"
-           d="m 748.36605,2269.3244 29.82127,-0.048 0.18134,6.6801 -29.70461,2e-4 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 751.8014,2271.0549 7.64163,0 0,0.769 -7.64163,0 z"
-           id="path103384"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 770.61474,2270.9144 0,3.4129 3.24598,0 0,-2.936 0,-0.2523 0,-0.2246 -1.48771,0 0.76078,0.013 -0.0166,0.1086 0,3.1725 -1.06519,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1725 1.01445,0 0.0166,-0.1202 z"
-           id="path103386"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path103388"
-           d="m 760.86314,2271.0549 7.64173,0 0,0.769 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path103390"
-           d="m 752.01779,2272.4968 7.64163,0 0,0.4328 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.07953,2272.4968 7.64174,0 0,0.4328 -7.64174,0 z"
-           id="path103392" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.18014,2273.6506 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path103394" />
-        <path
-           id="path103400"
-           d="m 761.24188,2273.6506 7.64162,0 0,0.4326 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path103420"
-           d="m 752.23418,2274.7563 7.64163,0 0,0.4325 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.29603,2274.7563 7.64162,0 0,0.4325 -7.64162,0 z"
-           id="path103442" />
-        <path
-           id="path103466"
-           d="m 770.49299,2274.7563 7.64173,0 0,0.4325 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path103468"
-           style="fill:#000000;stroke:none"
-           d="m 748.36605,2270.4299 0.94674,0 c 0,0 0.26299,2.4063 0.39437,3.6096 0.0104,0.043 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.432 -0.0197,-0.5304 -0.0942,-1.2884 -0.0632,-1.6161 2.97907,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3066 0.0187,0.2357 0.0103,0.3363 -1.05752,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4649 0.0797,3.8029 0.21588,4.9222 -0.84931,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path103470"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.68684,2270.8941 0,0.4928 2.24727,0 0.0166,0.8291 0.54533,0 0,-0.8283 0,-0.4926 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.68695,2274.3311 0,-0.4927 2.24705,0 0.0166,-0.8292 0.54523,0 0,0.8283 0,0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path103472" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.40169,2262.548 29.98233,-0.048 0.0647,6.7293 -29.85228,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44730246"
-           id="path103474" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path103476"
-           d="m 781.83704,2264.2786 7.64164,0 0,0.7689 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path103478"
-           d="m 800.65039,2264.138 0,3.413 3.24608,0 0,-3.413 -1.48782,0 0.76079,0.013 -0.0166,0.1086 0,3.1723 -1.06509,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 790.89888,2264.2786 7.64164,0 0,0.7689 -7.64164,0 z"
-           id="path103480"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.05344,2265.7206 7.64173,0 0,0.4327 -7.64173,0 z"
-           id="path103482"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path103484"
-           d="m 791.11528,2265.7206 7.64162,0 0,0.4327 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path103486"
-           d="m 782.21578,2266.8743 7.64163,0 0,0.4327 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.27752,2266.8743 7.64174,0 0,0.4327 -7.64174,0 z"
-           id="path103488"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.26993,2267.9799 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path103490"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path103492"
-           d="m 791.33166,2267.9799 7.64164,0 0,0.4326 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.52873,2267.9799 7.64164,0 0,0.4326 -7.64164,0 z"
-           id="path103494"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.40169,2263.6537 0.94674,0 c 0,0 0.26299,2.4061 0.39447,3.6094 0.0104,0.043 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04034,-0.011 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40056,-0.011 -25.38617,0 0.15179,1.4651 0.0797,3.8028 0.21588,4.9223 -0.84942,-0.015 -1.72461,0.047 -2.54856,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path103496" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.54016,2264.1177 0,0.4929 2.24726,0 0.0166,0.8292 0.54532,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path103498" />
-        <path
-           id="path103500"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.54026,2267.5548 0,-0.4927 2.24716,0 0.0166,-0.8292 0.54523,0 0,0.8284 0,0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path103502"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44695815"
-           d="m 778.55233,2269.4243 29.93614,-0.048 0.0649,6.7297 -29.80626,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 781.97112,2271.1549 7.60477,0 0,0.769 -7.60477,0 z"
-           id="path103504"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.69377,2271.0144 0,3.4129 3.23035,0 0,-3.4129 -1.48058,0 0.75717,0.013 -0.0166,0.1086 0,3.1724 -1.06001,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1724 1.00948,0 0.0166,-0.1203 -1.74978,0 z"
-           id="path103506" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103508"
-           d="m 790.98927,2271.1549 7.60477,0 0,0.769 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103510"
-           d="m 782.18647,2272.5968 7.60478,0 0,0.4328 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.20453,2272.5968 7.60487,0 0,0.4328 -7.60487,0 z"
-           id="path103512" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.348,2273.7507 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path103518" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103538"
-           d="m 791.36615,2273.7507 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103587"
-           d="m 782.40183,2274.8563 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.41998,2274.8563 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path103630" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103674"
-           d="m 800.57264,2274.8563 7.60486,0 0,0.4325 -7.60486,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path103822"
-           style="fill:#000000;stroke:none"
-           d="m 778.55233,2270.5299 0.9422,0 c 0,0 0.26163,2.4062 0.3925,3.6096 0.0104,0.043 0.33618,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5303 -0.0942,-1.2883 -0.0621,-1.6161 2.96478,-0.054 22.92926,-0.012 25.81586,0 0.0176,0.3067 0.0186,0.2357 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15106,1.4649 0.0787,3.8028 0.21484,4.9221 -0.84517,-0.015 -1.71623,0.047 -2.53624,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path103970"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.5648,2270.9941 0,0.4928 2.23639,0 0.0166,0.8291 0.54275,0 0,-0.8284 0,-0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.56491,2274.4311 0,-0.4927 2.23628,0 0.0166,-0.8291 0.54265,0 0,0.8282 0,0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path103972" />
-        <path
-           id="path103974"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44598696"
-           d="m 778.76873,2276.0365 29.80618,-0.048 0.065,6.7295 -29.67685,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 782.16381,2277.7672 7.55186,0 0,0.769 -7.55186,0 z"
-           id="path103976"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.7561,2277.6266 0,3.4129 3.20787,0 0,-3.4129 -1.47032,0 0.75189,0.013 -0.0166,0.1088 0,3.1723 -1.05255,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00244,0 0.0166,-0.1203 -1.73766,0 z"
-           id="path103978" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103980"
-           d="m 791.11911,2277.7672 7.55187,0 0,0.769 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103982"
-           d="m 782.37761,2279.2093 7.55187,0 0,0.4326 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.33291,2279.2093 7.55197,0 0,0.4326 -7.55197,0 z"
-           id="path103984" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.53799,2280.363 7.55186,0 0,0.4325 -7.55186,0 z"
-           id="path103986" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103988"
-           d="m 791.49339,2280.363 7.55187,0 0,0.4325 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103990"
-           d="m 782.59151,2281.4686 7.55187,0 0,0.4324 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.54682,2281.4686 7.55186,0 0,0.4324 -7.55186,0 z"
-           id="path103992" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path103994"
-           d="m 800.63579,2281.4686 7.55186,0 0,0.4324 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path103996"
-           style="fill:#000000;stroke:none"
-           d="m 778.76873,2277.1423 0.93566,0 c 0,0 0.25988,2.4062 0.38982,3.6094 0.0104,0.043 0.3338,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0197,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94408,-0.054 22.76961,-0.011 25.63612,0 0.0166,0.3066 0.0186,0.2358 0.0104,0.3365 -1.04499,0.012 -25.10216,-0.011 -25.08788,0 0.15003,1.4649 0.0787,3.8027 0.2134,4.9223 -0.83948,-0.015 -1.70433,0.047 -2.51864,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path103998"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.60021,2277.6063 0,0.4929 2.22076,0 0.0166,0.8291 0.53891,0 0,-0.8283 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.60021,2281.0433 0,-0.4925 2.22076,0 0.0166,-0.8292 0.53891,0 0,0.8283 0,0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104000" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.91762,2282.9129 29.72384,-0.048 0.0643,6.7294 -29.59495,0 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44537091"
-           id="path104002" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path104004"
-           d="m 782.29623,2284.6435 7.51552,0 0,0.769 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104006"
-           d="m 800.79896,2284.503 0,3.4129 3.19245,0 0,-3.4129 -1.46328,0 0.74826,0.013 -0.0166,0.1087 0,3.1723 -1.04749,0 -0.0166,0.097 -0.68179,0 0,-0.097 0,-3.1723 0.99768,0 0.0166,-0.1204 -1.72927,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.20835,2284.6435 7.51553,0 0,0.769 -7.51553,0 z"
-           id="path104008"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.5091,2286.0855 7.51541,0 0,0.4327 -7.51541,0 z"
-           id="path104010"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104012"
-           d="m 791.42122,2286.0855 7.51554,0 0,0.4327 -7.51554,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104014"
-           d="m 782.66865,2287.2392 7.51552,0 0,0.4326 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.58088,2287.2392 7.51543,0 0,0.4326 -7.51543,0 z"
-           id="path104016"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.72187,2288.3447 7.51552,0 0,0.4328 -7.51552,0 z"
-           id="path104018"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104020"
-           d="m 791.6341,2288.3447 7.51542,0 0,0.4328 -7.51542,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.67928,2288.3447 7.51541,0 0,0.4328 -7.51541,0 z"
-           id="path104022"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.91762,2284.0186 0.9311,0 c 0,0 0.25864,2.4061 0.38795,3.6095 0.0103,0.044 0.33215,0.047 0.65001,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6162 2.92998,-0.054 22.65994,-0.012 25.51258,0 0.0166,0.3068 0.0176,0.2358 0.0104,0.3364 -1.04002,0.012 -24.98123,-0.012 -24.96705,0 0.14931,1.4649 0.0776,3.8029 0.21236,4.9223 -0.83533,-0.015 -1.69614,0.047 -2.50642,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path104024" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.62455,2284.4827 0,0.4929 2.21009,0 0.0166,0.8291 0.53632,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104026" />
-        <path
-           id="path104028"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.62455,2287.9198 0,-0.4929 2.20998,0 0.0166,-0.8291 0.53622,0 0,0.8284 0,0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path104030"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327"
-           d="m 808.55075,2262.5239 30.07268,-0.026 -0.24475,6.7074 -29.82793,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 811.92201,2264.2545 7.64164,0 0,0.7689 -7.64164,0 z"
-           id="path104032"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.73536,2264.1138 0,3.4131 3.24608,0 0,-3.4131 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75827,0 z"
-           id="path104034" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104036"
-           d="m 820.98386,2264.2545 7.64163,0 0,0.7689 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104038"
-           d="m 812.13841,2265.6964 7.64173,0 0,0.4328 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.20025,2265.6964 7.64164,0 0,0.4328 -7.64164,0 z"
-           id="path104040" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.30075,2266.8501 7.64164,0 0,0.4328 -7.64164,0 z"
-           id="path104042" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104044"
-           d="m 821.3625,2266.8501 7.64173,0 0,0.4328 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104046"
-           d="m 812.3549,2267.9558 7.64164,0 0,0.4326 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.41665,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path104048" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104050"
-           d="m 830.61371,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104052"
-           style="fill:#000000;stroke:none"
-           d="m 808.48667,2263.6296 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0104,0.043 0.33774,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40055,-0.011 -25.38616,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path104054"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.62513,2264.0936 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.62524,2267.5307 0,-0.4928 2.24715,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104056" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.55075,2269.4001 29.88415,-0.048 -0.12173,6.7296 -29.76242,-0.091 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44594821"
-           id="path104058" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path104060"
-           d="m 812.05609,2271.1308 7.60477,0 0,0.769 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104062"
-           d="m 830.77875,2270.9903 0,3.4128 3.23034,0 0,-3.4128 -1.48058,0 0.75717,0.013 -0.0166,0.1085 0,3.1725 -1.06002,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74988,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.07424,2271.1308 7.60478,0 0,0.769 -7.60478,0 z"
-           id="path104064"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.27145,2272.5727 7.60477,0 0,0.4328 -7.60477,0 z"
-           id="path104066"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104068"
-           d="m 821.2895,2272.5727 7.60488,0 0,0.4328 -7.60488,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104070"
-           d="m 812.43297,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.45112,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z"
-           id="path104072"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.48681,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path104074"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104076"
-           d="m 821.50497,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.65761,2274.8321 7.60487,0 0,0.4325 -7.60487,0 z"
-           id="path104078"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.63732,2270.5058 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33618,0.047 0.65776,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96477,-0.054 22.92924,-0.012 25.81584,0 0.0176,0.3066 0.0186,0.2356 0.0104,0.3365 -1.05244,0.012 -25.27817,-0.012 -25.26388,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53624,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path104080" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.64978,2270.9699 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104082" />
-        <path
-           id="path104084"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.64988,2274.4069 0,-0.4926 2.23629,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.55075,2276.0124 29.82592,-0.048 -0.1224,6.7296 -29.70352,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44488338"
-           id="path104086" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path104088"
-           d="m 812.24878,2277.7431 7.55186,0 0,0.769 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104090"
-           d="m 830.84107,2277.6025 0,3.4129 3.20788,0 0,-3.4129 -1.47032,0 0.75188,0.013 -0.0166,0.1088 0,3.1723 -1.05256,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00245,0 0.0166,-0.1203 -1.73766,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.20409,2277.7431 7.55186,0 0,0.769 -7.55186,0 z"
-           id="path104092"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.46259,2279.1851 7.55186,0 0,0.4326 -7.55186,0 z"
-           id="path104094"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104096"
-           d="m 821.41789,2279.1851 7.55196,0 0,0.4326 -7.55196,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104098"
-           d="m 812.62296,2280.3388 7.55187,0 0,0.4326 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.57837,2280.3388 7.55186,0 0,0.4326 -7.55186,0 z"
-           id="path104100"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.67649,2281.4445 7.55186,0 0,0.4324 -7.55186,0 z"
-           id="path104102"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104104"
-           d="m 821.63179,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.72076,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z"
-           id="path104106"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.55075,2277.1182 1.23862,0 c 0,0 0.25987,2.4062 0.38981,3.6094 0.0104,0.043 0.33381,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0196,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94407,-0.054 22.76959,-0.011 25.6361,0 0.0166,0.3066 0.0187,0.2358 0.0104,0.3365 -1.04501,0.012 -25.10217,-0.011 -25.08789,0 0.15003,1.4649 0.0787,3.8027 0.21339,4.9222 -0.83948,-0.015 -2.14031,-0.045 -2.95463,-0.045 z"
-           style="fill:#000000;stroke:none"
-           id="path104108" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.68519,2277.5822 0,0.4929 2.22076,0 0.0166,0.8291 0.5389,0 0,-0.8283 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104110" />
-        <path
-           id="path104112"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.68519,2281.0192 0,-0.4926 2.22076,0 0.0166,-0.8292 0.5389,0 0,0.8284 0,0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path104114"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44321227"
-           d="m 808.55073,2282.8888 29.68383,-0.048 -0.0606,6.7294 -29.62359,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 812.3812,2284.6194 7.51552,0 0,0.769 -7.51552,0 z"
-           id="path104116"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.88394,2284.4789 0,3.4129 3.19245,0 0,-3.4129 -1.46329,0 0.74827,0.013 -0.0166,0.1087 0,3.1724 -1.04749,0 -0.0166,0.097 -0.68179,0 0,-0.097 0,-3.1724 0.99768,0 0.0166,-0.1203 -1.72927,0 z"
-           id="path104118" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104120"
-           d="m 821.29334,2284.6194 7.51552,0 0,0.769 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104122"
-           d="m 812.59407,2286.0614 7.51542,0 0,0.4327 -7.51542,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.50621,2286.0614 7.51552,0 0,0.4327 -7.51552,0 z"
-           id="path104124" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.75362,2287.2151 7.51553,0 0,0.4326 -7.51553,0 z"
-           id="path104126" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104128"
-           d="m 821.66586,2287.2151 7.51542,0 0,0.4326 -7.51542,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104130"
-           d="m 812.80684,2288.3206 7.51552,0 0,0.4327 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.71908,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z"
-           id="path104132" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104134"
-           d="m 830.76425,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104136"
-           style="fill:#000000;stroke:none"
-           d="m 808.55075,2283.9945 1.38294,0 c 0,0 0.25865,2.4061 0.38796,3.6094 0.0104,0.044 0.33215,0.047 0.65001,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5305 -0.0932,-1.2885 -0.0621,-1.6162 2.92999,-0.054 22.65994,-0.012 25.51259,0 0.0166,0.3067 0.0176,0.2357 0.0104,0.3364 -1.04002,0.012 -24.98124,-0.012 -24.96705,0 0.1493,1.4649 0.0776,3.8028 0.21236,4.9223 -0.83534,-0.015 -2.2804,-0.1363 -3.09079,-0.1363 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path104138"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.70952,2284.4585 0,0.493 2.21009,0 0.0166,0.8291 0.53633,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.70952,2287.8956 0,-0.4928 2.20998,0 0.0166,-0.8291 0.53621,0 0,0.8284 0,0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104140" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.96467,2262.5239 29.83839,-0.026 -0.0105,6.7074 -29.82792,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327"
-           id="path104142" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path104144"
-           d="m 842.33593,2264.2545 7.64163,0 0,0.7689 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104146"
-           d="m 861.14927,2264.1138 0,3.4131 3.24609,0 0,-3.4131 -1.48782,0 0.76078,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.39778,2264.2545 7.64162,0 0,0.7689 -7.64162,0 z"
-           id="path104148"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.55232,2265.6964 7.64174,0 0,0.4328 -7.64174,0 z"
-           id="path104150"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104152"
-           d="m 851.61416,2265.6964 7.64164,0 0,0.4328 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104154"
-           d="m 842.71467,2266.8501 7.64163,0 0,0.4328 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.77641,2266.8501 7.64173,0 0,0.4328 -7.64173,0 z"
-           id="path104156"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.76882,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path104158"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104160"
-           d="m 851.83056,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.02763,2267.9558 7.64162,0 0,0.4326 -7.64162,0 z"
-           id="path104162"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.90059,2263.6296 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0103,0.043 0.33773,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0187,0.2358 0.0104,0.3365 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path104164" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.03905,2264.0936 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104166" />
-        <path
-           id="path104168"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.03915,2267.5307 0,-0.4928 2.24716,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path104170"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44594821"
-           d="m 838.96467,2269.4001 29.88414,-0.048 -0.12173,6.7296 -29.76241,-0.091 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 842.47001,2271.1308 7.60477,0 0,0.769 -7.60477,0 z"
-           id="path104177"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.19266,2270.9903 0,3.4128 3.23035,0 0,-3.4128 -1.48058,0 0.75716,0.013 -0.0166,0.1085 0,3.1725 -1.06001,0 -0.0166,0.097 -0.68977,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74987,0 z"
-           id="path104190" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104193"
-           d="m 851.48816,2271.1308 7.60478,0 0,0.769 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104199"
-           d="m 842.68537,2272.5727 7.60477,0 0,0.4328 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.70341,2272.5727 7.60488,0 0,0.4328 -7.60488,0 z"
-           id="path104201" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.84688,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z"
-           id="path104203" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104205"
-           d="m 851.86503,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104212"
-           d="m 842.90073,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.91888,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path104648" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104650"
-           d="m 861.07152,2274.8321 7.60488,0 0,0.4325 -7.60488,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104652"
-           style="fill:#000000;stroke:none"
-           d="m 839.05123,2270.5058 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33619,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96478,-0.054 22.92924,-0.012 25.81585,0 0.0176,0.3066 0.0187,0.2356 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53623,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path104654"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.0637,2270.9699 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.06379,2274.4069 0,-0.4926 2.2363,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104656" />
-        <path
-           id="path104658"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44488338"
-           d="m 838.96467,2276.0124 29.82592,-0.048 -0.1224,6.7296 -29.70352,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 842.66269,2277.7431 7.55186,0 0,0.769 -7.55186,0 z"
-           id="path104660"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.25499,2277.6025 0,3.4129 3.20788,0 0,-3.4129 -1.47032,0 0.75188,0.013 -0.0166,0.1088 0,3.1723 -1.05256,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00245,0 0.0166,-0.1203 -1.73765,0 z"
-           id="path104662" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104664"
-           d="m 851.618,2277.7431 7.55186,0 0,0.769 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104666"
-           d="m 842.8765,2279.1851 7.55186,0 0,0.4326 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.8318,2279.1851 7.55197,0 0,0.4326 -7.55197,0 z"
-           id="path104668" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 843.03687,2280.3388 7.55187,0 0,0.4326 -7.55187,0 z"
-           id="path104670" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104672"
-           d="m 851.99229,2280.3388 7.55186,0 0,0.4326 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104674"
-           d="m 843.09041,2281.4445 7.55186,0 0,0.4324 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 852.0457,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z"
-           id="path104676" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104678"
-           d="m 861.13468,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104680"
-           style="fill:#000000;stroke:none"
-           d="m 838.96467,2277.1182 1.23861,0 c 0,0 0.25988,2.4062 0.38982,3.6094 0.0104,0.043 0.3338,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0196,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94406,-0.054 22.76958,-0.011 25.6361,0 0.0166,0.3066 0.0186,0.2358 0.0104,0.3365 -1.045,0.012 -25.10217,-0.011 -25.08788,0 0.15003,1.4649 0.0787,3.8027 0.21339,4.9222 -0.83948,-0.015 -2.14031,-0.045 -2.95463,-0.045 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path104682"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.09911,2277.5822 0,0.4929 2.22075,0 0.0166,0.8291 0.5389,0 0,-0.8283 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.09911,2281.0192 0,-0.4926 2.22075,0 0.0166,-0.8292 0.5389,0 0,0.8284 0,0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104684" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.96465,2282.8888 29.68383,-0.048 -0.0607,6.7294 -29.62358,0 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44321227"
-           id="path104686" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path104688"
-           d="m 842.79511,2284.6194 7.51553,0 0,0.769 -7.51553,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104690"
-           d="m 861.29786,2284.4789 0,3.4129 3.19244,0 0,-3.4129 -1.46328,0 0.74826,0.013 -0.0166,0.1087 0,3.1724 -1.04748,0 -0.0166,0.097 -0.6818,0 0,-0.097 0,-3.1724 0.99768,0 0.0166,-0.1203 -1.72927,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.70725,2284.6194 7.51552,0 0,0.769 -7.51552,0 z"
-           id="path104692"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 843.00798,2286.0614 7.51543,0 0,0.4327 -7.51543,0 z"
-           id="path104694"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104696"
-           d="m 851.92012,2286.0614 7.51552,0 0,0.4327 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104698"
-           d="m 843.16753,2287.2151 7.51554,0 0,0.4326 -7.51554,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 852.07978,2287.2151 7.51541,0 0,0.4326 -7.51541,0 z"
-           id="path104700"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 843.22076,2288.3206 7.51552,0 0,0.4327 -7.51552,0 z"
-           id="path104702"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104704"
-           d="m 852.13299,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.17816,2288.3206 7.51543,0 0,0.4327 -7.51543,0 z"
-           id="path104706"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.96467,2283.9945 1.38294,0 c 0,0 0.25864,2.4061 0.38796,3.6094 0.0104,0.044 0.33214,0.047 0.65,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5305 -0.0932,-1.2885 -0.0621,-1.6162 2.93,-0.054 22.65995,-0.012 25.5126,0 0.0166,0.3067 0.0176,0.2357 0.0104,0.3364 -1.04002,0.012 -24.98124,-0.012 -24.96705,0 0.14929,1.4649 0.0776,3.8028 0.21235,4.9223 -0.83534,-0.015 -2.2804,-0.1363 -3.09078,-0.1363 z"
-           style="fill:#000000;stroke:none"
-           id="path104708" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.12343,2284.4585 0,0.493 2.2101,0 0.0166,0.8291 0.53632,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104710" />
-        <path
-           id="path104712"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.12343,2287.8956 0,-0.4928 2.20999,0 0.0166,-0.8291 0.53622,0 0,0.8284 0,0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path104714"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44642299"
-           d="m 748.03007,2248.9762 30.00677,0.051 0.18161,6.6305 -29.93734,-0.049 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 751.46542,2250.7066 7.64163,0 0,0.7691 -7.64163,0 z"
-           id="path104716"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 770.27877,2250.5662 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1088 0,3.1723 -1.0651,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 z"
-           id="path104718"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path104720"
-           d="m 760.52726,2250.7066 7.64164,0 0,0.7691 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104722"
-           d="m 751.68182,2252.1487 7.64162,0 0,0.4327 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.74366,2252.1487 7.64162,0 0,0.4327 -7.64162,0 z"
-           id="path104724" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 751.84416,2253.3024 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path104726" />
-        <path
-           id="path104728"
-           d="m 760.90589,2253.3024 7.64175,0 0,0.4326 -7.64175,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104730"
-           d="m 751.8982,2254.408 7.64174,0 0,0.4327 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.96004,2254.408 7.64164,0 0,0.4327 -7.64164,0 z"
-           id="path104732" />
-        <path
-           id="path104734"
-           d="m 770.15711,2254.408 7.64164,0 0,0.4327 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104736"
-           style="fill:#000000;stroke:none"
-           d="m 748.03007,2250.0818 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6094 0.0104,0.044 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4321 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6163 2.97917,-0.054 23.04033,-0.011 25.94092,0 0.0176,0.3069 0.0186,0.236 0.0104,0.3366 -1.05752,0.012 -25.40066,-0.011 -25.38627,0 0.15178,1.4649 0.0797,3.8028 0.21598,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path104738"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.35097,2250.5459 0,0.4929 2.24716,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.35107,2253.983 0,-0.4927 2.24706,0 0.0166,-0.8293 0.54522,0 0,0.8284 0,0.4926 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104740" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.36605,2255.8535 29.82127,-0.048 0.18134,6.6801 -29.98574,2e-4 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44610023"
-           id="path104742" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path104744"
-           d="m 751.8014,2257.584 7.64163,0 0,0.769 -7.64163,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path104746"
-           d="m 770.61474,2257.4435 0,3.4129 3.24598,0 0,-2.936 0,-0.2523 0,-0.2246 -1.48771,0 0.76078,0.013 -0.0166,0.1086 0,3.1725 -1.06519,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1725 1.01445,0 0.0166,-0.1202 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.86314,2257.584 7.64173,0 0,0.769 -7.64173,0 z"
-           id="path104748" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.01779,2259.0259 7.64163,0 0,0.4328 -7.64163,0 z"
-           id="path104750" />
-        <path
-           id="path104752"
-           d="m 761.07953,2259.0259 7.64174,0 0,0.4328 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104754"
-           d="m 752.18014,2260.1797 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.24188,2260.1797 7.64162,0 0,0.4326 -7.64162,0 z"
-           id="path104756" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.23418,2261.2854 7.64163,0 0,0.4325 -7.64163,0 z"
-           id="path104758" />
-        <path
-           id="path104760"
-           d="m 761.29603,2261.2854 7.64162,0 0,0.4325 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 770.49299,2261.2854 7.64173,0 0,0.4325 -7.64173,0 z"
-           id="path104762" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.36605,2256.959 0.94674,0 c 0,0 0.26299,2.4063 0.39437,3.6096 0.0104,0.043 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.432 -0.0197,-0.5304 -0.0942,-1.2884 -0.0632,-1.6161 2.97907,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3066 0.0187,0.2357 0.0103,0.3363 -1.05752,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4649 0.0797,3.8029 0.21588,4.9222 -0.84931,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path104764" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.68684,2257.4232 0,0.4928 2.24727,0 0.0166,0.8291 0.54533,0 0,-0.8283 0,-0.4926 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104766" />
-        <path
-           id="path104768"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.68695,2260.8602 0,-0.4927 2.24705,0 0.0166,-0.8292 0.54523,0 0,0.8283 0,0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path104770"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44730246"
-           d="m 778.40169,2249.0771 29.98233,-0.048 0.0647,6.7293 -29.85228,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 781.83704,2250.8077 7.64164,0 0,0.7689 -7.64164,0 z"
-           id="path104772"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.65039,2250.6671 0,3.413 3.24608,0 0,-3.413 -1.48782,0 0.76079,0.013 -0.0166,0.1086 0,3.1723 -1.06509,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z"
-           id="path104774" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104776"
-           d="m 790.89888,2250.8077 7.64164,0 0,0.7689 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104778"
-           d="m 782.05344,2252.2497 7.64173,0 0,0.4327 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.11528,2252.2497 7.64162,0 0,0.4327 -7.64162,0 z"
-           id="path104780" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.21578,2253.4034 7.64163,0 0,0.4327 -7.64163,0 z"
-           id="path104782" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104784"
-           d="m 791.27752,2253.4034 7.64174,0 0,0.4327 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104786"
-           d="m 782.26993,2254.509 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.33166,2254.509 7.64164,0 0,0.4326 -7.64164,0 z"
-           id="path104788" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104790"
-           d="m 800.52873,2254.509 7.64164,0 0,0.4326 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104792"
-           style="fill:#000000;stroke:none"
-           d="m 778.40169,2250.1828 0.94674,0 c 0,0 0.26299,2.4061 0.39447,3.6094 0.0104,0.043 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04034,-0.011 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40056,-0.011 -25.38617,0 0.15179,1.4651 0.0797,3.8028 0.21588,4.9223 -0.84942,-0.015 -1.72461,0.047 -2.54856,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path104794"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.54016,2250.6468 0,0.4929 2.24726,0 0.0166,0.8292 0.54532,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.54026,2254.0839 0,-0.4927 2.24716,0 0.0166,-0.8292 0.54523,0 0,0.8284 0,0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104796" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.55233,2255.9534 29.93614,-0.048 0.0649,6.7297 -29.80626,0 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44695815"
-           id="path104798" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path104800"
-           d="m 781.97112,2257.684 7.60477,0 0,0.769 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104802"
-           d="m 800.69377,2257.5435 0,3.4129 3.23035,0 0,-3.4129 -1.48058,0 0.75717,0.013 -0.0166,0.1086 0,3.1724 -1.06001,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1724 1.00948,0 0.0166,-0.1203 -1.74978,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 790.98927,2257.684 7.60477,0 0,0.769 -7.60477,0 z"
-           id="path104804"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.18647,2259.1259 7.60478,0 0,0.4328 -7.60478,0 z"
-           id="path104806"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104808"
-           d="m 791.20453,2259.1259 7.60487,0 0,0.4328 -7.60487,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104810"
-           d="m 782.348,2260.2798 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.36615,2260.2798 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path104812"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.40183,2261.3854 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path104814"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104816"
-           d="m 791.41998,2261.3854 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.57264,2261.3854 7.60486,0 0,0.4325 -7.60486,0 z"
-           id="path104818"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.55233,2257.059 0.9422,0 c 0,0 0.26163,2.4062 0.3925,3.6096 0.0104,0.043 0.33618,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5303 -0.0942,-1.2883 -0.0621,-1.6161 2.96478,-0.054 22.92926,-0.012 25.81586,0 0.0176,0.3067 0.0186,0.2357 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15106,1.4649 0.0787,3.8028 0.21484,4.9221 -0.84517,-0.015 -1.71623,0.047 -2.53624,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path104820" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.5648,2257.5232 0,0.4928 2.23639,0 0.0166,0.8291 0.54275,0 0,-0.8284 0,-0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104822" />
-        <path
-           id="path104824"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.56491,2260.9602 0,-0.4927 2.23628,0 0.0166,-0.8291 0.54265,0 0,0.8282 0,0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.55075,2249.053 30.07268,-0.026 -0.24475,6.7074 -29.82793,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327"
-           id="path104826" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path104828"
-           d="m 811.92201,2250.7836 7.64164,0 0,0.7689 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104830"
-           d="m 830.73536,2250.6429 0,3.4131 3.24608,0 0,-3.4131 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75827,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 820.98386,2250.7836 7.64163,0 0,0.7689 -7.64163,0 z"
-           id="path104832"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.13841,2252.2255 7.64173,0 0,0.4328 -7.64173,0 z"
-           id="path104834"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104836"
-           d="m 821.20025,2252.2255 7.64164,0 0,0.4328 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104838"
-           d="m 812.30075,2253.3792 7.64164,0 0,0.4328 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.3625,2253.3792 7.64173,0 0,0.4328 -7.64173,0 z"
-           id="path104840"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.3549,2254.4849 7.64164,0 0,0.4326 -7.64164,0 z"
-           id="path104842"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path104844"
-           d="m 821.41665,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.61371,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path104846"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.48667,2250.1587 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0104,0.043 0.33774,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40055,-0.011 -25.38616,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path104848" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.62513,2250.6227 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104850" />
-        <path
-           id="path104852"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.62524,2254.0598 0,-0.4928 2.24715,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path104854"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44594821"
-           d="m 808.55075,2255.9292 29.88415,-0.048 -0.12173,6.7296 -29.76242,-0.091 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 812.05609,2257.6599 7.60477,0 0,0.769 -7.60477,0 z"
-           id="path104856"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.77875,2257.5194 0,3.4128 3.23034,0 0,-3.4128 -1.48058,0 0.75717,0.013 -0.0166,0.1085 0,3.1725 -1.06002,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74988,0 z"
-           id="path104858" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104860"
-           d="m 821.07424,2257.6599 7.60478,0 0,0.769 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104862"
-           d="m 812.27145,2259.1018 7.60477,0 0,0.4328 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.2895,2259.1018 7.60488,0 0,0.4328 -7.60488,0 z"
-           id="path104864" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.43297,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z"
-           id="path104866" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104868"
-           d="m 821.45112,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104870"
-           d="m 812.48681,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.50497,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path104872" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104874"
-           d="m 830.65761,2261.3612 7.60487,0 0,0.4325 -7.60487,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path104876"
-           style="fill:#000000;stroke:none"
-           d="m 808.63732,2257.0349 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33618,0.047 0.65776,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96477,-0.054 22.92924,-0.012 25.81584,0 0.0176,0.3066 0.0186,0.2356 0.0104,0.3365 -1.05244,0.012 -25.27817,-0.012 -25.26388,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53624,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path104878"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.64978,2257.499 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.64988,2260.936 0,-0.4926 2.23629,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path104880" />
-        <path
-           id="path104882"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327"
-           d="m 838.96467,2249.053 29.74135,-0.026 0.0866,6.7074 -29.82792,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 842.33593,2250.7836 7.64163,0 0,0.7689 -7.64163,0 z"
-           id="path104884"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.14927,2250.6429 0,3.4131 3.24609,0 0,-3.4131 -1.48782,0 0.76078,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z"
-           id="path104886" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path104968"
-           d="m 851.39778,2250.7836 7.64162,0 0,0.7689 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path105000"
-           d="m 842.55232,2252.2255 7.64174,0 0,0.4328 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.61416,2252.2255 7.64164,0 0,0.4328 -7.64164,0 z"
-           id="path105012" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.71467,2253.3792 7.64163,0 0,0.4328 -7.64163,0 z"
-           id="path105288" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path105290"
-           d="m 851.77641,2253.3792 7.64173,0 0,0.4328 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path105292"
-           d="m 842.76882,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.83056,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path105301" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path105334"
-           d="m 861.02763,2254.4849 7.64162,0 0,0.4326 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path105347"
-           style="fill:#000000;stroke:none"
-           d="m 838.90059,2250.1587 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0103,0.043 0.33773,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0187,0.2358 0.0104,0.3365 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path105859"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.03905,2250.6227 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.03915,2254.0598 0,-0.4928 2.24716,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path105871" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.96467,2255.9292 29.88414,-0.048 -0.12173,6.7296 -29.76241,-0.091 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44594821"
-           id="path105873" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path105910"
-           d="m 842.47001,2257.6599 7.60477,0 0,0.769 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path106103"
-           d="m 861.19266,2257.5194 0,3.4128 3.23035,0 0,-3.4128 -1.48058,0 0.75716,0.013 -0.0166,0.1085 0,3.1725 -1.06001,0 -0.0166,0.097 -0.68977,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74987,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.48816,2257.6599 7.60478,0 0,0.769 -7.60478,0 z"
-           id="path106115"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.68537,2259.1018 7.60477,0 0,0.4328 -7.60477,0 z"
-           id="path106117"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path106129"
-           d="m 851.70341,2259.1018 7.60488,0 0,0.4328 -7.60488,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path106141"
-           d="m 842.84688,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.86503,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z"
-           id="path106153"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.90073,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path106165"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path106167"
-           d="m 851.91888,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.07152,2261.3612 7.60488,0 0,0.4325 -7.60488,0 z"
-           id="path106179"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 839.05123,2257.0349 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33619,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96478,-0.054 22.92924,-0.012 25.81585,0 0.0176,0.3066 0.0187,0.2356 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53623,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path106191" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.0637,2257.499 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path106203" />
-        <path
-           id="path106215"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.06379,2260.936 0,-0.4926 2.2363,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path106217"
-           style="fill:url(#linearGradient106446);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47515267"
-           d="m 834.13554,2244.9202 34.55518,0 -0.12351,3.3621 -34.55519,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path106229"
-           style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-           d="m 864.91226,2245.2773 0.47657,0 c 0.1074,0 0.18775,0.011 0.24076,0.021 0.071,0.018 0.12797,0.051 0.17038,0.098 0.0424,0.047 0.0689,0.1049 0.0806,0.1729 0.0117,0.069 0,0.1521 -0.0202,0.252 -0.0212,0.088 -0.053,0.1635 -0.0954,0.2271 -0.052,0.077 -0.11302,0.1404 -0.18479,0.1884 -0.0541,0.036 -0.12235,0.066 -0.2042,0.085 -0.0615,0.015 -0.14016,0.022 -0.23643,0.022 l -0.49067,0 z m 0.21617,0.1805 -0.1742,0.7066 0.19467,0 c 0.0731,0 0.12616,0 0.1602,-0.011 0.0445,-0.011 0.0827,-0.024 0.1162,-0.044 0.0329,-0.021 0.0647,-0.055 0.0933,-0.1039 0.0297,-0.048 0.0541,-0.1128 0.0742,-0.1953 0.0202,-0.083 0.0276,-0.1458 0.0202,-0.19 -0.0106,-0.044 -0.0233,-0.079 -0.0488,-0.1028 -0.0254,-0.025 -0.0615,-0.041 -0.10836,-0.05 -0.035,-0.011 -0.10497,-0.011 -0.21151,-0.011 z m -1.35412,0.8863 -0.19846,-1.0668 0.28276,0 0.13209,0.7896 0.51104,-0.7896 0.2766,0 -0.72561,1.0668 z m -1.37108,-1.0668 0.47669,0 c 0.1074,0 0.18775,0.011 0.24067,0.021 0.071,0.018 0.12806,0.051 0.17047,0.098 0.0424,0.047 0.0689,0.1049 0.0806,0.1729 0.0117,0.069 0,0.1521 -0.0202,0.252 -0.0212,0.088 -0.053,0.1635 -0.0954,0.2271 -0.052,0.077 -0.11312,0.1404 -0.18479,0.1884 -0.0541,0.036 -0.12235,0.066 -0.20432,0.085 -0.0615,0.015 -0.14004,0.022 -0.23631,0.022 l -0.49067,0 z m 0.2163,0.1805 -0.17431,0.7066 0.19477,0 c 0.0731,0 0.12616,0 0.1602,-0.011 0.0445,-0.011 0.0827,-0.024 0.1162,-0.044 0.0329,-0.021 0.0647,-0.055 0.0933,-0.1039 0.0297,-0.048 0.0541,-0.1128 0.0742,-0.1953 0.0202,-0.083 0.0276,-0.1458 0.0202,-0.19 -0.0106,-0.044 -0.0233,-0.079 -0.0488,-0.1028 -0.0255,-0.025 -0.0615,-0.041 -0.10825,-0.05 -0.035,-0.011 -0.10496,-0.011 -0.21152,-0.011 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106241"
-           d="m 864.01307,2246.6725 c -1.1832,0 -2.14239,0.1318 -2.14239,0.2952 0,0.1633 0.95919,0.2952 2.14239,0.2952 1.18333,0 2.1425,-0.1319 2.1425,-0.2952 0,-0.1634 -0.95917,-0.2952 -2.1425,-0.2952 z m 0,0.2134 c 0.33217,0 0.60148,0.037 0.60148,0.082 0,0.046 -0.26931,0.082 -0.60148,0.082 -0.33206,0 -0.60135,-0.037 -0.60135,-0.082 0,-0.046 0.26929,-0.082 0.60135,-0.082 z"
-           style="fill:#ffffff;stroke:none" />
-        <text
-           transform="scale(1.0170762,0.9832105)"
-           sodipodi:linespacing="125%"
-           id="text106243"
-           y="2286.3989"
-           x="848.68781"
-           style="font-size:0.70121336px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             y="2286.3989"
-             x="848.68781"
-             id="tspan106245"
-             sodipodi:role="line">ROM</tspan></text>
-        <path
-           id="path106253"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 852.11749,2245.5239 c 0,0 -0.10603,0 -0.10603,0 0,0 0,-0.1313 0,-0.1313 0,0 0.10942,0 0.10942,0 0.053,0 0.0795,0.021 0.0795,0.062 0,0.047 -0.0276,0.069 -0.0827,0.069 z m 0.84171,0.066 c -0.0148,0.073 -0.0541,0.1094 -0.11705,0.1094 -0.088,0 -0.13211,-0.053 -0.13211,-0.1605 0,-0.105 0.0445,-0.1569 0.13211,-0.1569 0.0625,0 0.10072,0.026 0.11323,0.081 0,0 0.053,0 0.053,0 -0.018,-0.085 -0.0732,-0.1276 -0.16614,-0.1276 -0.12584,0 -0.18872,0.068 -0.18872,0.2043 0,0.1363 0.0604,0.2044 0.1812,0.2044 0.10284,0 0.16232,-0.051 0.17748,-0.1533 0,0 -0.053,0 -0.053,0 z m -1.78923,-0.2554 c -0.13084,0 -0.19625,0.068 -0.19625,0.2043 0,0.1363 0.0657,0.2044 0.19625,0.2044 0.13093,0 0.19635,-0.068 0.19635,-0.2044 0,-0.1363 -0.0657,-0.2043 -0.19635,-0.2043 z m -0.3169,0.2554 c -0.0127,0.073 -0.0509,0.1094 -0.11334,0.1094 -0.0901,0 -0.13582,-0.053 -0.13582,-0.1605 0,-0.105 0.0435,-0.1569 0.13211,-0.1569 0.0625,0 0.10072,0.026 0.11323,0.081 0,0 0.053,0 0.053,0 -0.0106,-0.085 -0.0657,-0.1276 -0.16603,-0.1276 -0.12331,0 -0.18501,0.068 -0.18501,0.2043 0,0.1363 0.0594,0.2044 0.17737,0.2044 0.10286,0 0.16232,-0.051 0.17749,-0.1533 0,0 -0.053,0 -0.053,0 z m 2.51378,-0.2445 c 0,0 -0.32453,0 -0.32453,0 0,0 0,0.048 0,0.048 0,0 0.13581,0 0.13581,0 0,0 0,0.343 0,0.343 0,0 0.053,0 0.053,0 0,0 0,-0.343 0,-0.343 0,0 0.13592,0 0.13592,0 0,0 0,-0.048 0,-0.048 z m -0.87945,0 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.15086,0.3905 -0.15086,0.3905 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1132 0.0413,-0.1132 0,0 0.16232,0 0.16232,0 0,0 0.0382,0.1132 0.0382,0.1132 0,0 0.0604,0 0.0604,0 0,0 -0.14727,-0.3905 -0.14727,-0.3905 z m -0.35104,0 c 0,0 -0.17738,0 -0.17738,0 0,0 0,0.3905 0,0.3905 0,0 0.053,0 0.053,0 0,0 0,-0.1643 0,-0.1643 0,0 0.12458,0 0.12458,0 0.0806,0 0.12076,-0.039 0.12076,-0.1168 0,-0.073 -0.0403,-0.1094 -0.12076,-0.1094 z m -0.29443,0 c 0,0 -0.0753,0 -0.0753,0 0,0 -0.11705,0.3284 -0.11705,0.3284 0,0 -0.11323,-0.3284 -0.11323,-0.3284 0,0 -0.0795,0 -0.0795,0 0,0 0,0.3905 0,0.3905 0,0 0.053,0 0.053,0 0,0 0,-0.3248 0,-0.3248 0,0 0.11323,0.3248 0.11323,0.3248 0,0 0.053,0 0.053,0 0,0 0.11704,-0.3285 0.11704,-0.3285 0,0 0,0.099 0,0.099 0,0 0,0.23 0,0.23 0,0 0.053,0 0.053,0 0,0 0,-0.3905 0,-0.3905 z m -1.51739,0.069 c 0,-0.03 -0.0148,-0.044 -0.0456,-0.044 0,0 -0.41136,0 -0.41136,0 -0.0297,0 -0.0456,0.015 -0.0456,0.044 0,0 0,0.4123 0,0.4123 0,0.019 -0.0106,0.03 -0.0297,0.03 0,0 -0.37744,0 -0.37744,0 -0.0784,0 -0.14217,0.024 -0.19253,0.075 -0.0509,0.05 -0.0753,0.1125 -0.0753,0.188 0,0 0,0.9085 0,0.9085 0,0.073 0.0255,0.135 0.0774,0.1861 0.052,0.051 0.11502,0.076 0.19063,0.076 0,0 0.86429,0 0.86429,0 0.0308,0 0.0456,-0.016 0.0456,-0.048 0,0 0,-1.8282 0,-1.8282 z m 3.13667,1.2734 c 0,-0.032 -0.0148,-0.048 -0.0456,-0.048 0,0 -0.37733,0 -0.37733,0 -0.0329,0 -0.0488,0.016 -0.0488,0.048 0,0 0,0.2117 0,0.2117 0,0.06 -0.0297,0.091 -0.0912,0.091 -0.0625,0 -0.0944,-0.031 -0.0944,-0.091 0,0 0,-0.6494 0,-0.6494 0,-0.061 0.0318,-0.091 0.0944,-0.091 0.0604,0 0.0912,0.031 0.0912,0.091 0,0 0,0.1714 0,0.1714 0,0.03 0.0159,0.043 0.0488,0.043 0,0 0.37733,0 0.37733,0 0.0308,0 0.0456,-0.015 0.0456,-0.043 0,0 0,-0.3028 0,-0.3028 0,-0.073 -0.0265,-0.1351 -0.0795,-0.1861 -0.053,-0.051 -0.11704,-0.076 -0.19253,-0.076 0,0 -0.58122,0 -0.58122,0 -0.0753,0 -0.13973,0.025 -0.19264,0.076 -0.053,0.051 -0.0795,0.1132 -0.0795,0.1861 0,0 0,0.9049 0,0.9049 0,0.075 0.0254,0.1387 0.0774,0.1898 0.052,0.051 0.11641,0.076 0.19445,0.076 0,0 0.58121,0 0.58121,0 0.0774,0 0.14271,-0.025 0.19434,-0.076 0.052,-0.051 0.0774,-0.1144 0.0774,-0.1898 0,0 0,-0.3358 0,-0.3358 z m -1.24936,-0.076 c 0,-0.073 -0.0265,-0.135 -0.0795,-0.1861 -0.053,-0.051 -0.11705,-0.076 -0.19254,-0.076 0,0 -0.35114,0 -0.35114,0 -0.0382,0 -0.0562,-0.018 -0.0562,-0.055 0,-0.039 0.0191,-0.058 0.0562,-0.058 0,0 0.52852,0 0.52852,0 0.0297,0 0.0456,-0.015 0.0456,-0.043 0,0 0,-0.2919 0,-0.2919 0,-0.03 -0.0149,-0.043 -0.0456,-0.043 0,0 -0.74735,0 -0.74735,0 -0.0753,0 -0.13974,0.025 -0.19254,0.076 -0.053,0.051 -0.0795,0.1131 -0.0795,0.186 0,0 0,0.3867 0,0.3867 0,0.073 0.0265,0.1351 0.0795,0.1862 0.053,0.051 0.11694,0.076 0.19254,0.076 0,0 0.35104,0 0.35104,0 0.0477,0 0.0721,0.024 0.0721,0.073 0,0.043 -0.0244,0.066 -0.0721,0.066 0,0 -0.57761,0 -0.57761,0 -0.0297,0 -0.0456,0.016 -0.0456,0.048 0,0 0,0.2884 0,0.2884 0,0.032 0.0148,0.048 0.0456,0.048 0,0 0.79654,0 0.79654,0 0.0774,0 0.14271,-0.025 0.19434,-0.076 0.052,-0.051 0.0774,-0.1144 0.0774,-0.1898 0,0 0,-0.4124 0,-0.4124 z m 1.14376,1.2225 c 0,0 -0.24173,0 -0.24173,0 0,0 0,-0.1313 0,-0.1313 0,0 0.21894,0 0.21894,0 0,0 0,-0.043 0,-0.043 0,0 -0.21894,0 -0.21894,0 0,0 0,-0.1203 0,-0.1203 0,0 0.23792,0 0.23792,0 0,0 0,-0.048 0,-0.048 0,0 -0.29072,0 -0.29072,0 0,0 0,0.3867 0,0.3867 0,0 0.29453,0 0.29453,0 0,0 0,-0.043 0,-0.043 z m -0.3926,-0.1606 c 0,0 -0.17748,0 -0.17748,0 0,0 0,0.044 0,0.044 0,0 0.12468,0 0.12468,0 0,0.085 -0.0413,0.1276 -0.12468,0.1276 -0.088,0 -0.1321,-0.053 -0.1321,-0.1605 0,-0.1049 0.0445,-0.1569 0.1321,-0.1569 0.0657,0 0.10496,0.026 0.11705,0.081 0,0 0.053,0 0.053,0 -0.0106,-0.085 -0.0668,-0.1277 -0.16985,-0.1277 -0.12584,0 -0.18872,0.068 -0.18872,0.2043 0,0.068 0.018,0.1193 0.0551,0.1533 0.036,0.034 0.0795,0.051 0.13019,0.051 0.0604,0 0.10496,-0.021 0.13221,-0.062 0,0 0.0148,0.051 0.0148,0.051 0,0 0.0339,0 0.0339,0 0,0 0,-0.2043 0,-0.2043 z m -0.52841,-0.1824 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.1548,0.3867 -0.1548,0.3867 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16222,0 0.16222,0 0,0 0.0413,0.1094 0.0413,0.1094 0,0 0.0562,0 0.0562,0 0,0 -0.14345,-0.3867 -0.14345,-0.3867 z m -0.22657,0.3794 c -0.0127,0 -0.0191,-0.018 -0.0191,-0.04 0,0 0,-0.069 0,-0.069 0,-0.032 -0.0191,-0.056 -0.0488,-0.073 0.0382,-0.019 0.0562,-0.05 0.0562,-0.091 0,-0.07 -0.0445,-0.1061 -0.13221,-0.1061 0,0 -0.18862,0 -0.18862,0 0,0 0,0.3868 0,0.3868 0,0 0.0562,0 0.0562,0 0,0 0,-0.1642 0,-0.1642 0,0 0.13199,0 0.13199,0 0.0456,0 0.0689,0.023 0.0721,0.069 0,0 0.0106,0.094 0.0106,0.094 0,0 0.0679,-0.011 0.0679,-0.011 z m -0.58503,-0.3904 c -0.13083,0 -0.19625,0.068 -0.19625,0.2043 0,0.058 0.018,0.1071 0.053,0.146 0.035,0.039 0.0827,0.058 0.14345,0.058 0.13083,0 0.19625,-0.068 0.19625,-0.2044 0,-0.1362 -0.0657,-0.2043 -0.19625,-0.2043 z m -0.19625,0.011 c 0,0 -0.32846,0 -0.32846,0 0,0 0,0.048 0,0.048 0,0 0.13974,0 0.13974,0 0,0 0,0.3393 0,0.3393 0,0 0.053,0 0.053,0 0,0 0,-0.3393 0,-0.3393 0,0 0.13592,0 0.13592,0 0,0 0,-0.048 0,-0.048 z m -0.43024,0.1752 c 0,0 -0.11333,-0.025 -0.11333,-0.025 -0.0329,-0.011 -0.0488,-0.023 -0.0488,-0.048 0,-0.047 0.0307,-0.069 0.0901,-0.069 0.0679,0 0.10179,0.026 0.10179,0.081 0,0 0.0488,0 0.0488,0 0,-0.083 -0.052,-0.1241 -0.1548,-0.1241 -0.0933,0 -0.13963,0.04 -0.13963,0.1204 0,0.049 0.0286,0.08 0.0869,0.091 0,0 0.0795,0.018 0.0795,0.018 0.0583,0.013 0.0869,0.035 0.0869,0.069 0,0.044 -0.035,0.066 -0.10602,0.066 -0.0731,0 -0.10941,-0.031 -0.10941,-0.091 0,0 -0.0488,0 -0.0488,0 0,0.09 0.053,0.1351 0.1585,0.1351 0.10602,0 0.1585,-0.039 0.1585,-0.1168 0,-0.056 -0.0297,-0.091 -0.0901,-0.106 z m -0.60411,-0.1752 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.15109,0.3868 -0.15109,0.3868 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16243,0 0.16243,0 0,0 0.0371,0.1094 0.0371,0.1094 0,0 0.0604,0 0.0604,0 0,0 -0.14726,-0.3868 -0.14726,-0.3868 z m -0.13963,0 c 0,0 -0.32835,0 -0.32835,0 0,0 0,0.048 0,0.048 0,0 0.13963,0 0.13963,0 0,0 0,0.3393 0,0.3393 0,0 0.0562,0 0.0562,0 0,0 0,-0.3393 0,-0.3393 0,0 0.13209,0 0.13209,0 0,0 0,-0.048 0,-0.048 z m -0.43024,0 c 0,0 -0.0647,0 -0.0647,0 0,0 -0.15098,0.3868 -0.15098,0.3868 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16232,0 0.16232,0 0,0 0.0413,0.1094 0.0413,0.1094 0,0 0.0604,0 0.0604,0 0,0 -0.14726,-0.3868 -0.14726,-0.3868 z m -0.41518,0 c 0,0 -0.16614,0 -0.16614,0 0,0 0,0.3868 0,0.3868 0,0 0.16232,0 0.16232,0 0.11323,0 0.16985,-0.066 0.16985,-0.1971 0,-0.1265 -0.0551,-0.1897 -0.16603,-0.1897 z m 2.98187,-1.9156 c 0,0 0.0679,-0.1715 0.0679,-0.1715 0,0 0.0562,0.1715 0.0562,0.1715 0,0 -0.12458,0 -0.12458,0 z m -1.21925,0.124 c -0.0933,0 -0.13964,-0.053 -0.13964,-0.1606 0,-0.1049 0.0466,-0.1569 0.13964,-0.1569 0.0933,0 0.13973,0.052 0.13973,0.1569 0,0.1071 -0.0466,0.1606 -0.13973,0.1606 z m -0.95484,1.5071 c 0,0 -0.80026,0 -0.80026,0 -0.053,0 -0.0965,-0.017 -0.1321,-0.051 -0.035,-0.034 -0.053,-0.076 -0.053,-0.1278 0,0 0,-0.9085 0,-0.9085 0,-0.051 0.018,-0.093 0.053,-0.1277 0.035,-0.034 0.0795,-0.051 0.1321,-0.051 0,0 0.4454,0 0.4454,0 0.0297,0 0.0456,-0.016 0.0456,-0.048 0,0 0,-0.4125 0,-0.4125 0,-0.019 0.0106,-0.03 0.0297,-0.03 0,0 0.27937,0 0.27937,0 0.018,0.017 0.0265,0.027 0.0265,0.03 0,0 0,1.7005 0,1.7005 0,0 -0.0106,0.014 -0.0265,0.026 z m 3.10825,-0.053 c -0.036,0.035 -0.0816,0.053 -0.1339,0.053 0,0 -0.58122,0 -0.58122,0 -0.053,0 -0.0986,-0.018 -0.13602,-0.053 -0.0371,-0.035 -0.0562,-0.079 -0.0562,-0.1296 0,0 0,-0.9049 0,-0.9049 0,-0.051 0.0191,-0.093 0.0562,-0.1278 0.0371,-0.034 0.0827,-0.051 0.13602,-0.051 0,0 0.58122,0 0.58122,0 0.0551,0 0.10072,0.017 0.13592,0.05 0.035,0.033 0.053,0.076 0.053,0.1295 0,0 0,0.2408 0,0.2408 0,0.017 -0.0106,0.026 -0.0265,0.026 0,0 -0.24915,0 -0.24915,0 -0.018,0 -0.0265,-0.011 -0.0265,-0.026 0,0 0,-0.1094 0,-0.1094 0,-0.049 -0.017,-0.089 -0.0509,-0.1222 -0.0339,-0.033 -0.0763,-0.049 -0.12648,-0.049 -0.0498,0 -0.0922,0.016 -0.12638,0.049 -0.0339,0.033 -0.0509,0.073 -0.0509,0.1222 0,0 0,0.6494 0,0.6494 0,0.049 0.017,0.089 0.0509,0.1223 0.0339,0.033 0.0763,0.049 0.12638,0.049 0.0509,0 0.0922,-0.016 0.12648,-0.049 0.0339,-0.033 0.0509,-0.074 0.0509,-0.1223 0,0 0,-0.1532 0,-0.1532 0,-0.017 0.0106,-0.026 0.0265,-0.026 0,0 0.24915,0 0.24915,0 0,0 0.0138,0.011 0.0265,0.026 0,0 0,0.2773 0,0.2773 0,0.051 -0.018,0.094 -0.0551,0.1296 z m -1.24936,0 c -0.036,0.035 -0.0806,0.053 -0.13391,0.053 0,0 -0.72848,0 -0.72848,0 -0.0201,0 -0.0297,-0.011 -0.0297,-0.026 0,0 0,-0.1642 0,-0.1642 0,-0.017 0.0106,-0.026 0.0297,-0.026 0,0 0.50954,0 0.50954,0 0.0424,0 0.0795,-0.015 0.10942,-0.043 0.0297,-0.03 0.0456,-0.065 0.0456,-0.106 0,-0.044 -0.0148,-0.081 -0.0435,-0.1095 -0.0286,-0.03 -0.0657,-0.043 -0.11132,-0.043 0,0 -0.35104,0 -0.35104,0 -0.053,0 -0.0975,-0.018 -0.13412,-0.053 -0.0361,-0.035 -0.0551,-0.079 -0.0551,-0.1297 0,0 0,-0.3867 0,-0.3867 0,-0.051 0.018,-0.093 0.0551,-0.1277 0.036,-0.034 0.0816,-0.051 0.13412,-0.051 0,0 0.67939,0 0.67939,0 0.018,0 0.0265,0.011 0.0265,0.025 0,0 0,0.1606 0,0.1606 0,0.019 -0.0106,0.03 -0.0265,0.03 0,0 -0.46056,0 -0.46056,0 -0.0933,0 -0.13963,0.047 -0.13963,0.1387 0,0.036 0.0138,0.068 0.0413,0.095 0.0276,0.026 0.0604,0.04 0.0986,0.04 0,0 0.35114,0 0.35114,0 0.0498,0 0.0944,0.018 0.1321,0.055 0.0371,0.036 0.0562,0.079 0.0562,0.1276 0,0 0,0.4124 0,0.4124 0,0.051 -0.018,0.094 -0.0551,0.1296 z m -1.14557,0.1367 c 0,0 -0.41137,0 -0.41137,0 -0.0297,0 -0.0456,-0.016 -0.0456,-0.048 0,0 0,-1.3428 0,-1.3428 0,-0.03 0.0148,-0.043 0.0456,-0.043 0,0 0.41137,0 0.41137,0 0.0297,0 0.0456,0.015 0.0456,0.043 0,0 0,1.3428 0,1.3428 0,0.032 -0.0149,0.048 -0.0456,0.048 z m 1.1286,0.3759 c 0,0 -0.12828,0 -0.12828,0 0,0 0,-0.1314 0,-0.1314 0,0 0.13581,0 0.13581,0 0.0477,0 0.0721,0.022 0.0721,0.066 0,0.043 -0.0265,0.066 -0.0795,0.066 z m 0.27937,0.051 c 0,0 0.0647,-0.1716 0.0647,-0.1716 0,0 0.0604,0.1716 0.0604,0.1716 0,0 -0.12458,0 -0.12458,0 z m -2.04209,0 c 0,0 0.0679,-0.1716 0.0679,-0.1716 0,0 0.0562,0.1716 0.0562,0.1716 0,0 -0.12457,0 -0.12457,0 z m -0.56998,0 c 0,0 0.0647,-0.1716 0.0647,-0.1716 0,0 0.0604,0.1716 0.0604,0.1716 0,0 -0.12458,0 -0.12458,0 z m -0.32082,0.1168 c 0,0 -0.10602,0 -0.10602,0 0,0 0,-0.2993 0,-0.2993 0,0 0.0986,0 0.0986,0 0.0827,0 0.12457,0.05 0.12457,0.1496 0,0.1 -0.0392,0.1497 -0.11704,0.1497 z m 2.21947,0.011 c -0.0933,0 -0.13963,-0.053 -0.13963,-0.1605 0,-0.105 0.0466,-0.1569 0.13963,-0.1569 0.0954,0 0.14345,0.052 0.14345,0.1569 0,0.1071 -0.0477,0.1605 -0.14345,0.1605 z m -0.7323,-1.8791 c 0,-0.017 -0.0106,-0.026 -0.0265,-0.026 0,0 -0.27937,0 -0.27937,0 -0.018,0 -0.0265,0.011 -0.0265,0.026 0,0 0,1.2151 0,1.2151 0,0.017 0.0106,0.025 0.0265,0.025 0,0 0.27937,0 0.27937,0 0.018,0 0.0265,-0.011 0.0265,-0.025 0,0 0,-1.2151 0,-1.2151 z m -0.98134,0.2773 c 0,-0.046 -0.017,-0.086 -0.0509,-0.1186 -0.0339,-0.033 -0.0753,-0.05 -0.12267,-0.05 -0.0477,0 -0.088,0.017 -0.12086,0.05 -0.0329,0.033 -0.0488,0.072 -0.0488,0.1186 0,0 0,0.6677 0,0.6677 0,0.049 0.0159,0.089 0.0466,0.1205 0.0318,0.032 0.0721,0.048 0.12266,0.048 0.0477,0 0.0891,-0.016 0.12267,-0.049 0.0339,-0.033 0.0509,-0.072 0.0509,-0.1185 0,0 0,-0.6677 0,-0.6677 z m -0.17366,0.7516 c -0.0583,0 -0.0869,-0.028 -0.0869,-0.084 0,0 0,-0.6678 0,-0.6678 0,-0.056 0.0286,-0.084 0.0869,-0.084 0.0551,0 0.0827,0.028 0.0827,0.084 0,0 0,0.6678 0,0.6678 0,0.056 -0.0276,0.084 -0.0827,0.084 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 824.73596,2245.3148 2.15913,0 0,1.6709 -2.15913,0 z"
-           style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path106265" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106267"
-           style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 821.58598,2245.3148 2.15913,0 0,1.6709 -2.15913,0 z" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 818.15103,2245.2839 1.37302,0 0,2.9493 -1.37302,0 z"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.18184429;stroke-miterlimit:4"
-           id="path106269" />
-        <path
-           id="path106271"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.11374462;stroke-miterlimit:4"
-           d="m 818.98685,2245.2839 0.5372,0 0,2.9493 -0.5372,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path106273"
-           style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 824.73596,2247.6128 2.15913,0 0,0.7308 -2.15913,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 821.58598,2247.6128 2.15913,0 0,0.7308 -2.15913,0 z"
-           style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path106275"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.10981,2245.2067 67.29069,0 0.0429,3.271 -67.00661,0 z"
-           style="fill:url(#linearGradient106448);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.65448451"
-           id="path106277" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106279"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 749.6123,2245.6006 1.74215,0 c 0.23626,0 0.44067,0.1574 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15834,-0.3527 0.3946,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 753.22102,2245.6006 1.74215,0 c 0.23627,0 0.44078,0.1574 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.39459,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1572 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15824,-0.3527 0.39449,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106281"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106283"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 756.86644,2245.6006 1.74215,0 c 0.23626,0 0.44066,0.1574 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15824,-0.3527 0.39449,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 749.6123,2247.1083 1.74215,0 c 0.23626,0 0.44067,0.1573 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.3946,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106285"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106287"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 753.22102,2247.1083 1.74215,0 c 0.23627,0 0.44078,0.1573 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.39459,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15824,-0.3527 0.39449,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 756.86644,2247.1083 1.74215,0 c 0.23626,0 0.44066,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15824,-0.3527 0.39449,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106289"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106291"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 760.57268,2247.1083 1.74216,0 c 0.23625,0 0.44067,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.3945,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 764.1814,2247.1083 1.74216,0 c 0.23626,0 0.44077,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106293"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106295"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 767.82682,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.3945,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 792.8232,2245.6006 1.74216,0 c 0.23625,0 0.44066,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15824,0.3526 -0.39449,0.3526 l -1.74216,0 c -0.23626,0 -0.44077,-0.1572 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15834,-0.3527 0.39459,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106297"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106299"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 796.43192,2245.6006 1.74216,0 c 0.23625,0 0.44077,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15836,0.3526 -0.39461,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15836,-0.3527 0.39461,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 800.07734,2245.6006 1.74216,0 c 0.23625,0 0.44066,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44067,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15835,-0.3527 0.39461,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106301"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106303"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 792.8232,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.39449,0.3526 l -1.74216,0 c -0.23626,0 -0.44077,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.39459,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 796.43192,2247.1083 1.74216,0 c 0.23625,0 0.44077,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15836,0.3526 -0.39461,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15836,-0.3527 0.39461,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106305"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106307"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 800.07734,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44067,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 803.78358,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.39449,0.3526 l -1.74217,0 c -0.23625,0 -0.44077,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.3946,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106309"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106311"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 807.3923,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15836,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 811.03772,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15823,0.3526 -0.39448,0.3526 l -1.74217,0 c -0.23625,0 -0.44077,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path106313"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path106315"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 827.65786,2245.3148 2.15923,0 0,2.9841 -2.15923,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106317"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 771.13208,2248.0646 1.74193,0 c 0.23626,0 0.44066,-0.1575 0.4584,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15824,-0.3525 -0.3945,-0.3525 l -1.74204,0 c -0.23626,0 -0.44066,0.1572 -0.4583,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15824,0.3527 0.3946,0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 774.74046,2248.0646 1.74206,0 c 0.23625,0 0.44066,-0.1575 0.45828,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15825,-0.3525 -0.3945,-0.3525 l -1.74206,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15823,0.3527 0.39448,0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path106319"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106321"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 778.38555,2248.0646 1.74205,0 c 0.23626,0 0.44066,-0.1575 0.45829,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15825,-0.3525 -0.39451,-0.3525 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.45829,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15824,0.3527 0.39449,0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 771.13208,2246.5568 1.74193,0 c 0.23626,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15824,-0.3527 -0.3945,-0.3527 l -1.74204,0 c -0.23626,0 -0.44066,0.1572 -0.4583,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.3946,0.3525 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path106323"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106325"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 774.74046,2246.5568 1.74206,0 c 0.23625,0 0.44066,-0.1572 0.45828,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.3945,-0.3527 l -1.74206,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15823,0.3525 0.39448,0.3525 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 778.38555,2246.5568 1.74205,0 c 0.23626,0 0.44066,-0.1572 0.45829,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.39451,-0.3527 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.45829,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.39449,0.3525 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path106327"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106329"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 782.09146,2246.5568 1.74205,0 c 0.23626,0 0.44066,-0.1572 0.45829,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.39451,-0.3527 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.3945,0.3525 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 785.69996,2246.5568 1.74194,0 c 0.23625,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15824,-0.3527 -0.39449,-0.3527 l -1.74205,0 c -0.23626,0 -0.44066,0.1572 -0.45829,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.39449,0.3525 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path106331"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path106333"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 789.34505,2246.5568 1.74194,0 c 0.23625,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15837,-0.3527 -0.39462,-0.3527 l -1.74194,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15835,0.3525 0.3946,0.3525 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <g
-           transform="matrix(0.77587723,0,0,1,194.59487,0.99590896)"
-           id="g106335">
-          <path
-             style="fill:url(#linearGradient106450);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53485292;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 870.95805,2247.1999 c -0.80735,0 -1.45044,2.1197 -1.45624,4.7517 l -0.0867,32.1297 c -0.006,2.633 0.64481,4.7522 1.45217,4.7522 l 5.88614,0 c 0.80736,0 1.45056,-2.1192 1.45623,-4.7522 l 0.0181,-7.7489 -0.90631,-0.3411 -0.26448,-14.8768 1.21888,0.3959 0.0204,-9.5601 c 0.006,-2.6326 -0.64469,-4.7514 -1.45205,-4.7514 l -5.88625,0 z m 3.18973,19.2422 c 0.25682,0.038 0.78758,0.133 0.79746,1.8106 0.01,1.6776 -0.53801,2.2691 -0.79474,2.2365 -0.25694,-0.038 -0.77753,-0.6057 -0.78741,-2.2832 -0.01,-1.6773 0.52796,-1.7963 0.78469,-1.7639 z"
-             id="path106337"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccssccccccscccsccc" />
-          <path
-             style="fill:#808080;fill-opacity:1;stroke:none"
-             d="m 873.5847,2251.4177 1.1865,-0.2024 1.44752,4.67 -0.34521,31.4636 -1.19148,0.3409 -1.67186,-5.5735 0.98558,-0.1394 0.72986,1.3287 0.31319,-26.9823 -1.4541,-4.9056"
-             id="path106339"
-             inkscape:path-effect="#path-effect29991-6-5"
-             inkscape:original-d="m 873.5847,2251.4177 c 0.0657,-2.1656 0.46798,-1.4454 1.1865,-0.2024 l 1.44752,4.67 -0.34521,31.4636 c -0.32422,1.7146 -0.72392,0.7692 -1.19148,0.3409 l -1.67186,-5.5735 c 0.34022,-1.4357 0.42992,-0.7055 0.98558,-0.1394 l 0.72986,1.3287 0.31319,-26.9823 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccccccc" />
-          <path
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             d="m 873.51144,2258.1509 1.08683,2.6281 -0.2553,23.2666 -1.3327,-1.9218 -0.0403,3.7754 1.71873,1.7962 0.37998,-31.5042 -1.48993,-4.7773 -0.0673,6.737"
-             id="path106421"
-             inkscape:path-effect="#path-effect29988-5-5"
-             inkscape:original-d="m 873.51144,2258.1509 1.08683,2.6281 -0.2553,23.2666 -1.3327,-1.9218 -0.0403,3.7754 1.71873,1.7962 0.37998,-31.5042 -1.48993,-4.7773 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-230.28574,-430.51469)">
+    <g style="display:inline" transform="translate(-3608.3055,-7613.54)" id="g106843">
+      <g transform="matrix(0.94319853,0,0,0.94319853,3140.0847,5927.6491)" id="g102928">
+        <path inkscape:connector-curvature="0" d="m 746.89881,2244.3452 122.43444,0 0,45.3562 -122.43444,0 z" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.97012049;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path102950" sodipodi:nodetypes="ccccc"/>
+        <path id="path102963" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44614804" d="m 748.44391,2276.0072 29.96981,0.051 0.18149,6.6304 -29.90058,-0.049 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 751.87937,2277.7378 7.64162,0 0,0.769 -7.64162,0 z" id="path102982" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 770.69271,2277.5973 0,3.4128 3.24598,0 0,-2.9359 0,-0.2524 0,-0.2245 -1.48773,0 0.76069,0.013 -0.0166,0.1088 0,3.1724 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1724 1.01435,0 0.0166,-0.1202 z" id="path102987" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path102989" d="m 760.9411,2277.7378 7.64163,0 0,0.769 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path102991" d="m 752.09565,2279.1797 7.64174,0 0,0.4328 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.15749,2279.1797 7.64163,0 0,0.4328 -7.64163,0 z" id="path102993"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.258,2280.3336 7.64163,0 0,0.4325 -7.64163,0 z" id="path102995"/>
+        <path id="path102997" d="m 761.31984,2280.3336 7.64163,0 0,0.4325 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path102999" d="m 752.31215,2281.4392 7.64162,0 0,0.4324 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.37389,2281.4392 7.64163,0 0,0.4324 -7.64163,0 z" id="path103001"/>
+        <path id="path103003" d="m 770.57095,2281.4392 7.64163,0 0,0.4324 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path103005" style="fill:#000000;stroke:none" d="m 748.44391,2277.1128 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6095 0.0103,0.043 0.33774,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2689 -0.0362,-2.4322 -0.0196,-0.5306 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04044,-0.011 25.94092,0 0.0176,0.3067 0.0187,0.2359 0.0104,0.3366 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8027 0.21587,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path103007" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.76481,2277.5769 0,0.4929 2.24726,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4926 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.76492,2281.0139 0,-0.4925 2.24705,0 0.0166,-0.8292 0.54533,0 0,0.8282 0,0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path103009"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 748.77988,2282.8836 29.83384,-0.048 0.18152,6.68 -29.71722,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.4461942" id="path103011"/>
+        <path inkscape:connector-curvature="0" id="path103013" d="m 752.21523,2284.614 7.64164,0 0,0.7691 -7.64164,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path103015" d="m 771.02858,2284.4736 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1724 -1.06509,0 -0.0166,0.097 -0.69307,0 0,-0.097 0,-3.1724 1.01435,0 0.0166,-0.1203 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.27707,2284.614 7.64164,0 0,0.7691 -7.64164,0 z" id="path103017"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.43163,2286.0561 7.64162,0 0,0.4327 -7.64162,0 z" id="path103019"/>
+        <path id="path103021" d="m 761.49347,2286.0561 7.64163,0 0,0.4327 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path103023" d="m 752.59397,2287.2098 7.64164,0 0,0.4326 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.65571,2287.2098 7.64174,0 0,0.4326 -7.64174,0 z" id="path103031"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.64801,2288.3154 7.64175,0 0,0.4326 -7.64175,0 z" id="path103055"/>
+        <path id="path103302" d="m 761.70986,2288.3154 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 770.90693,2288.3154 7.64163,0 0,0.4326 -7.64163,0 z" id="path103324"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 748.77988,2283.9892 0.94674,0 c 0,0 0.26299,2.4061 0.39438,3.6094 0.0104,0.044 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0197,-0.5303 -0.0942,-1.2883 -0.0632,-1.6161 2.97917,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05742,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4648 0.0797,3.8028 0.21588,4.9222 -0.84931,-0.015 -1.31874,0.047 -2.14269,0.047 z" style="fill:#000000;stroke:none" id="path103348"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 775.10078,2284.4533 0,0.4929 2.24717,0 0.0166,0.829 0.54533,0 0,-0.8283 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path103350"/>
+        <path id="path103352" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 775.10078,2287.8903 0,-0.4928 2.24717,0 0.0166,-0.8291 0.54522,0 0,0.8284 0,0.4926 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 748.26435,2262.4471 29.77249,0.051 0.18161,6.6305 -29.93734,-0.049 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44642299" id="path103354"/>
+        <path inkscape:connector-curvature="0" id="path103356" d="m 751.46542,2264.1775 7.64163,0 0,0.7691 -7.64163,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path103358" d="m 770.27877,2264.0371 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1088 0,3.1723 -1.0651,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.52726,2264.1775 7.64164,0 0,0.7691 -7.64164,0 z" id="path103360"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 751.68182,2265.6196 7.64162,0 0,0.4327 -7.64162,0 z" id="path103362"/>
+        <path id="path103364" d="m 760.74366,2265.6196 7.64162,0 0,0.4327 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path103366" d="m 751.84416,2266.7733 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.90589,2266.7733 7.64175,0 0,0.4326 -7.64175,0 z" id="path103368"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 751.8982,2267.8789 7.64174,0 0,0.4327 -7.64174,0 z" id="path103370"/>
+        <path id="path103372" d="m 760.96004,2267.8789 7.64164,0 0,0.4327 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 770.15711,2267.8789 7.64164,0 0,0.4327 -7.64164,0 z" id="path103374"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 748.03007,2263.5527 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6094 0.0104,0.044 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4321 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6163 2.97917,-0.054 23.04033,-0.011 25.94092,0 0.0176,0.3069 0.0186,0.236 0.0104,0.3366 -1.05752,0.012 -25.40066,-0.011 -25.38627,0 0.15178,1.4649 0.0797,3.8028 0.21598,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z" style="fill:#000000;stroke:none" id="path103376"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.35097,2264.0168 0,0.4929 2.24716,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path103378"/>
+        <path id="path103380" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.35107,2267.4539 0,-0.4927 2.24706,0 0.0166,-0.8293 0.54522,0 0,0.8284 0,0.4926 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path103382" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44610023" d="m 748.36605,2269.3244 29.82127,-0.048 0.18134,6.6801 -29.70461,2e-4 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 751.8014,2271.0549 7.64163,0 0,0.769 -7.64163,0 z" id="path103384" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 770.61474,2270.9144 0,3.4129 3.24598,0 0,-2.936 0,-0.2523 0,-0.2246 -1.48771,0 0.76078,0.013 -0.0166,0.1086 0,3.1725 -1.06519,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1725 1.01445,0 0.0166,-0.1202 z" id="path103386" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path103388" d="m 760.86314,2271.0549 7.64173,0 0,0.769 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path103390" d="m 752.01779,2272.4968 7.64163,0 0,0.4328 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.07953,2272.4968 7.64174,0 0,0.4328 -7.64174,0 z" id="path103392"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.18014,2273.6506 7.64163,0 0,0.4326 -7.64163,0 z" id="path103394"/>
+        <path id="path103400" d="m 761.24188,2273.6506 7.64162,0 0,0.4326 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path103420" d="m 752.23418,2274.7563 7.64163,0 0,0.4325 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.29603,2274.7563 7.64162,0 0,0.4325 -7.64162,0 z" id="path103442"/>
+        <path id="path103466" d="m 770.49299,2274.7563 7.64173,0 0,0.4325 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path103468" style="fill:#000000;stroke:none" d="m 748.36605,2270.4299 0.94674,0 c 0,0 0.26299,2.4063 0.39437,3.6096 0.0104,0.043 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.432 -0.0197,-0.5304 -0.0942,-1.2884 -0.0632,-1.6161 2.97907,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3066 0.0187,0.2357 0.0103,0.3363 -1.05752,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4649 0.0797,3.8029 0.21588,4.9222 -0.84931,-0.015 -1.31885,0.047 -2.1428,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path103470" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.68684,2270.8941 0,0.4928 2.24727,0 0.0166,0.8291 0.54533,0 0,-0.8283 0,-0.4926 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.68695,2274.3311 0,-0.4927 2.24705,0 0.0166,-0.8292 0.54523,0 0,0.8283 0,0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path103472"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 778.40169,2262.548 29.98233,-0.048 0.0647,6.7293 -29.85228,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44730246" id="path103474"/>
+        <path inkscape:connector-curvature="0" id="path103476" d="m 781.83704,2264.2786 7.64164,0 0,0.7689 -7.64164,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path103478" d="m 800.65039,2264.138 0,3.413 3.24608,0 0,-3.413 -1.48782,0 0.76079,0.013 -0.0166,0.1086 0,3.1723 -1.06509,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 790.89888,2264.2786 7.64164,0 0,0.7689 -7.64164,0 z" id="path103480" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.05344,2265.7206 7.64173,0 0,0.4327 -7.64173,0 z" id="path103482" sodipodi:nodetypes="ccccc"/>
+        <path id="path103484" d="m 791.11528,2265.7206 7.64162,0 0,0.4327 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path103486" d="m 782.21578,2266.8743 7.64163,0 0,0.4327 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.27752,2266.8743 7.64174,0 0,0.4327 -7.64174,0 z" id="path103488" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.26993,2267.9799 7.64163,0 0,0.4326 -7.64163,0 z" id="path103490" sodipodi:nodetypes="ccccc"/>
+        <path id="path103492" d="m 791.33166,2267.9799 7.64164,0 0,0.4326 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.52873,2267.9799 7.64164,0 0,0.4326 -7.64164,0 z" id="path103494" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 778.40169,2263.6537 0.94674,0 c 0,0 0.26299,2.4061 0.39447,3.6094 0.0104,0.043 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04034,-0.011 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40056,-0.011 -25.38617,0 0.15179,1.4651 0.0797,3.8028 0.21588,4.9223 -0.84942,-0.015 -1.72461,0.047 -2.54856,0.047 z" style="fill:#000000;stroke:none" id="path103496"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.54016,2264.1177 0,0.4929 2.24726,0 0.0166,0.8292 0.54532,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path103498"/>
+        <path id="path103500" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.54026,2267.5548 0,-0.4927 2.24716,0 0.0166,-0.8292 0.54523,0 0,0.8284 0,0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path103502" style="fill:#808080;stroke:#000000;stroke-width:0.44695815" d="m 778.55233,2269.4243 29.93614,-0.048 0.0649,6.7297 -29.80626,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 781.97112,2271.1549 7.60477,0 0,0.769 -7.60477,0 z" id="path103504" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.69377,2271.0144 0,3.4129 3.23035,0 0,-3.4129 -1.48058,0 0.75717,0.013 -0.0166,0.1086 0,3.1724 -1.06001,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1724 1.00948,0 0.0166,-0.1203 -1.74978,0 z" id="path103506"/>
+        <path sodipodi:nodetypes="ccccc" id="path103508" d="m 790.98927,2271.1549 7.60477,0 0,0.769 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path103510" d="m 782.18647,2272.5968 7.60478,0 0,0.4328 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.20453,2272.5968 7.60487,0 0,0.4328 -7.60487,0 z" id="path103512"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.348,2273.7507 7.60477,0 0,0.4325 -7.60477,0 z" id="path103518"/>
+        <path sodipodi:nodetypes="ccccc" id="path103538" d="m 791.36615,2273.7507 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path103587" d="m 782.40183,2274.8563 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.41998,2274.8563 7.60477,0 0,0.4325 -7.60477,0 z" id="path103630"/>
+        <path sodipodi:nodetypes="ccccc" id="path103674" d="m 800.57264,2274.8563 7.60486,0 0,0.4325 -7.60486,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path103822" style="fill:#000000;stroke:none" d="m 778.55233,2270.5299 0.9422,0 c 0,0 0.26163,2.4062 0.3925,3.6096 0.0104,0.043 0.33618,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5303 -0.0942,-1.2883 -0.0621,-1.6161 2.96478,-0.054 22.92926,-0.012 25.81586,0 0.0176,0.3067 0.0186,0.2357 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15106,1.4649 0.0787,3.8028 0.21484,4.9221 -0.84517,-0.015 -1.71623,0.047 -2.53624,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path103970" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.5648,2270.9941 0,0.4928 2.23639,0 0.0166,0.8291 0.54275,0 0,-0.8284 0,-0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.56491,2274.4311 0,-0.4927 2.23628,0 0.0166,-0.8291 0.54265,0 0,0.8282 0,0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path103972"/>
+        <path id="path103974" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44598696" d="m 778.76873,2276.0365 29.80618,-0.048 0.065,6.7295 -29.67685,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 782.16381,2277.7672 7.55186,0 0,0.769 -7.55186,0 z" id="path103976" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.7561,2277.6266 0,3.4129 3.20787,0 0,-3.4129 -1.47032,0 0.75189,0.013 -0.0166,0.1088 0,3.1723 -1.05255,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00244,0 0.0166,-0.1203 -1.73766,0 z" id="path103978"/>
+        <path sodipodi:nodetypes="ccccc" id="path103980" d="m 791.11911,2277.7672 7.55187,0 0,0.769 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path103982" d="m 782.37761,2279.2093 7.55187,0 0,0.4326 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.33291,2279.2093 7.55197,0 0,0.4326 -7.55197,0 z" id="path103984"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.53799,2280.363 7.55186,0 0,0.4325 -7.55186,0 z" id="path103986"/>
+        <path sodipodi:nodetypes="ccccc" id="path103988" d="m 791.49339,2280.363 7.55187,0 0,0.4325 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path103990" d="m 782.59151,2281.4686 7.55187,0 0,0.4324 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.54682,2281.4686 7.55186,0 0,0.4324 -7.55186,0 z" id="path103992"/>
+        <path sodipodi:nodetypes="ccccc" id="path103994" d="m 800.63579,2281.4686 7.55186,0 0,0.4324 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path103996" style="fill:#000000;stroke:none" d="m 778.76873,2277.1423 0.93566,0 c 0,0 0.25988,2.4062 0.38982,3.6094 0.0104,0.043 0.3338,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0197,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94408,-0.054 22.76961,-0.011 25.63612,0 0.0166,0.3066 0.0186,0.2358 0.0104,0.3365 -1.04499,0.012 -25.10216,-0.011 -25.08788,0 0.15003,1.4649 0.0787,3.8027 0.2134,4.9223 -0.83948,-0.015 -1.70433,0.047 -2.51864,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path103998" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.60021,2277.6063 0,0.4929 2.22076,0 0.0166,0.8291 0.53891,0 0,-0.8283 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.60021,2281.0433 0,-0.4925 2.22076,0 0.0166,-0.8292 0.53891,0 0,0.8283 0,0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104000"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 778.91762,2282.9129 29.72384,-0.048 0.0643,6.7294 -29.59495,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.44537091" id="path104002"/>
+        <path inkscape:connector-curvature="0" id="path104004" d="m 782.29623,2284.6435 7.51552,0 0,0.769 -7.51552,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path104006" d="m 800.79896,2284.503 0,3.4129 3.19245,0 0,-3.4129 -1.46328,0 0.74826,0.013 -0.0166,0.1087 0,3.1723 -1.04749,0 -0.0166,0.097 -0.68179,0 0,-0.097 0,-3.1723 0.99768,0 0.0166,-0.1204 -1.72927,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.20835,2284.6435 7.51553,0 0,0.769 -7.51553,0 z" id="path104008" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.5091,2286.0855 7.51541,0 0,0.4327 -7.51541,0 z" id="path104010" sodipodi:nodetypes="ccccc"/>
+        <path id="path104012" d="m 791.42122,2286.0855 7.51554,0 0,0.4327 -7.51554,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path104014" d="m 782.66865,2287.2392 7.51552,0 0,0.4326 -7.51552,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.58088,2287.2392 7.51543,0 0,0.4326 -7.51543,0 z" id="path104016" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.72187,2288.3447 7.51552,0 0,0.4328 -7.51552,0 z" id="path104018" sodipodi:nodetypes="ccccc"/>
+        <path id="path104020" d="m 791.6341,2288.3447 7.51542,0 0,0.4328 -7.51542,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.67928,2288.3447 7.51541,0 0,0.4328 -7.51541,0 z" id="path104022" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 778.91762,2284.0186 0.9311,0 c 0,0 0.25864,2.4061 0.38795,3.6095 0.0103,0.044 0.33215,0.047 0.65001,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6162 2.92998,-0.054 22.65994,-0.012 25.51258,0 0.0166,0.3068 0.0176,0.2358 0.0104,0.3364 -1.04002,0.012 -24.98123,-0.012 -24.96705,0 0.14931,1.4649 0.0776,3.8029 0.21236,4.9223 -0.83533,-0.015 -1.69614,0.047 -2.50642,0.047 z" style="fill:#000000;stroke:none" id="path104024"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.62455,2284.4827 0,0.4929 2.21009,0 0.0166,0.8291 0.53632,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104026"/>
+        <path id="path104028" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.62455,2287.9198 0,-0.4929 2.20998,0 0.0166,-0.8291 0.53622,0 0,0.8284 0,0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path104030" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327" d="m 808.55075,2262.5239 30.07268,-0.026 -0.24475,6.7074 -29.82793,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 811.92201,2264.2545 7.64164,0 0,0.7689 -7.64164,0 z" id="path104032" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.73536,2264.1138 0,3.4131 3.24608,0 0,-3.4131 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75827,0 z" id="path104034"/>
+        <path sodipodi:nodetypes="ccccc" id="path104036" d="m 820.98386,2264.2545 7.64163,0 0,0.7689 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104038" d="m 812.13841,2265.6964 7.64173,0 0,0.4328 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.20025,2265.6964 7.64164,0 0,0.4328 -7.64164,0 z" id="path104040"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.30075,2266.8501 7.64164,0 0,0.4328 -7.64164,0 z" id="path104042"/>
+        <path sodipodi:nodetypes="ccccc" id="path104044" d="m 821.3625,2266.8501 7.64173,0 0,0.4328 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104046" d="m 812.3549,2267.9558 7.64164,0 0,0.4326 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.41665,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z" id="path104048"/>
+        <path sodipodi:nodetypes="ccccc" id="path104050" d="m 830.61371,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104052" style="fill:#000000;stroke:none" d="m 808.48667,2263.6296 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0104,0.043 0.33774,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40055,-0.011 -25.38616,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path104054" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.62513,2264.0936 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.62524,2267.5307 0,-0.4928 2.24715,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104056"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.55075,2269.4001 29.88415,-0.048 -0.12173,6.7296 -29.76242,-0.091 z" style="fill:#808080;stroke:#000000;stroke-width:0.44594821" id="path104058"/>
+        <path inkscape:connector-curvature="0" id="path104060" d="m 812.05609,2271.1308 7.60477,0 0,0.769 -7.60477,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path104062" d="m 830.77875,2270.9903 0,3.4128 3.23034,0 0,-3.4128 -1.48058,0 0.75717,0.013 -0.0166,0.1085 0,3.1725 -1.06002,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74988,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.07424,2271.1308 7.60478,0 0,0.769 -7.60478,0 z" id="path104064" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.27145,2272.5727 7.60477,0 0,0.4328 -7.60477,0 z" id="path104066" sodipodi:nodetypes="ccccc"/>
+        <path id="path104068" d="m 821.2895,2272.5727 7.60488,0 0,0.4328 -7.60488,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path104070" d="m 812.43297,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.45112,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z" id="path104072" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.48681,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z" id="path104074" sodipodi:nodetypes="ccccc"/>
+        <path id="path104076" d="m 821.50497,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.65761,2274.8321 7.60487,0 0,0.4325 -7.60487,0 z" id="path104078" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 808.63732,2270.5058 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33618,0.047 0.65776,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96477,-0.054 22.92924,-0.012 25.81584,0 0.0176,0.3066 0.0186,0.2356 0.0104,0.3365 -1.05244,0.012 -25.27817,-0.012 -25.26388,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53624,0.047 z" style="fill:#000000;stroke:none" id="path104080"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.64978,2270.9699 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104082"/>
+        <path id="path104084" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.64988,2274.4069 0,-0.4926 2.23629,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.55075,2276.0124 29.82592,-0.048 -0.1224,6.7296 -29.70352,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44488338" id="path104086"/>
+        <path inkscape:connector-curvature="0" id="path104088" d="m 812.24878,2277.7431 7.55186,0 0,0.769 -7.55186,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path104090" d="m 830.84107,2277.6025 0,3.4129 3.20788,0 0,-3.4129 -1.47032,0 0.75188,0.013 -0.0166,0.1088 0,3.1723 -1.05256,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00245,0 0.0166,-0.1203 -1.73766,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.20409,2277.7431 7.55186,0 0,0.769 -7.55186,0 z" id="path104092" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.46259,2279.1851 7.55186,0 0,0.4326 -7.55186,0 z" id="path104094" sodipodi:nodetypes="ccccc"/>
+        <path id="path104096" d="m 821.41789,2279.1851 7.55196,0 0,0.4326 -7.55196,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path104098" d="m 812.62296,2280.3388 7.55187,0 0,0.4326 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.57837,2280.3388 7.55186,0 0,0.4326 -7.55186,0 z" id="path104100" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.67649,2281.4445 7.55186,0 0,0.4324 -7.55186,0 z" id="path104102" sodipodi:nodetypes="ccccc"/>
+        <path id="path104104" d="m 821.63179,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.72076,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z" id="path104106" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 808.55075,2277.1182 1.23862,0 c 0,0 0.25987,2.4062 0.38981,3.6094 0.0104,0.043 0.33381,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0196,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94407,-0.054 22.76959,-0.011 25.6361,0 0.0166,0.3066 0.0187,0.2358 0.0104,0.3365 -1.04501,0.012 -25.10217,-0.011 -25.08789,0 0.15003,1.4649 0.0787,3.8027 0.21339,4.9222 -0.83948,-0.015 -2.14031,-0.045 -2.95463,-0.045 z" style="fill:#000000;stroke:none" id="path104108"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.68519,2277.5822 0,0.4929 2.22076,0 0.0166,0.8291 0.5389,0 0,-0.8283 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104110"/>
+        <path id="path104112" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.68519,2281.0192 0,-0.4926 2.22076,0 0.0166,-0.8292 0.5389,0 0,0.8284 0,0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path104114" style="fill:#808080;stroke:#000000;stroke-width:0.44321227" d="m 808.55073,2282.8888 29.68383,-0.048 -0.0606,6.7294 -29.62359,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 812.3812,2284.6194 7.51552,0 0,0.769 -7.51552,0 z" id="path104116" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.88394,2284.4789 0,3.4129 3.19245,0 0,-3.4129 -1.46329,0 0.74827,0.013 -0.0166,0.1087 0,3.1724 -1.04749,0 -0.0166,0.097 -0.68179,0 0,-0.097 0,-3.1724 0.99768,0 0.0166,-0.1203 -1.72927,0 z" id="path104118"/>
+        <path sodipodi:nodetypes="ccccc" id="path104120" d="m 821.29334,2284.6194 7.51552,0 0,0.769 -7.51552,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104122" d="m 812.59407,2286.0614 7.51542,0 0,0.4327 -7.51542,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.50621,2286.0614 7.51552,0 0,0.4327 -7.51552,0 z" id="path104124"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.75362,2287.2151 7.51553,0 0,0.4326 -7.51553,0 z" id="path104126"/>
+        <path sodipodi:nodetypes="ccccc" id="path104128" d="m 821.66586,2287.2151 7.51542,0 0,0.4326 -7.51542,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104130" d="m 812.80684,2288.3206 7.51552,0 0,0.4327 -7.51552,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.71908,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z" id="path104132"/>
+        <path sodipodi:nodetypes="ccccc" id="path104134" d="m 830.76425,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104136" style="fill:#000000;stroke:none" d="m 808.55075,2283.9945 1.38294,0 c 0,0 0.25865,2.4061 0.38796,3.6094 0.0104,0.044 0.33215,0.047 0.65001,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5305 -0.0932,-1.2885 -0.0621,-1.6162 2.92999,-0.054 22.65994,-0.012 25.51259,0 0.0166,0.3067 0.0176,0.2357 0.0104,0.3364 -1.04002,0.012 -24.98124,-0.012 -24.96705,0 0.1493,1.4649 0.0776,3.8028 0.21236,4.9223 -0.83534,-0.015 -2.2804,-0.1363 -3.09079,-0.1363 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path104138" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.70952,2284.4585 0,0.493 2.21009,0 0.0166,0.8291 0.53633,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.70952,2287.8956 0,-0.4928 2.20998,0 0.0166,-0.8291 0.53621,0 0,0.8284 0,0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104140"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 838.96467,2262.5239 29.83839,-0.026 -0.0105,6.7074 -29.82792,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327" id="path104142"/>
+        <path inkscape:connector-curvature="0" id="path104144" d="m 842.33593,2264.2545 7.64163,0 0,0.7689 -7.64163,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path104146" d="m 861.14927,2264.1138 0,3.4131 3.24609,0 0,-3.4131 -1.48782,0 0.76078,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.39778,2264.2545 7.64162,0 0,0.7689 -7.64162,0 z" id="path104148" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.55232,2265.6964 7.64174,0 0,0.4328 -7.64174,0 z" id="path104150" sodipodi:nodetypes="ccccc"/>
+        <path id="path104152" d="m 851.61416,2265.6964 7.64164,0 0,0.4328 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path104154" d="m 842.71467,2266.8501 7.64163,0 0,0.4328 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.77641,2266.8501 7.64173,0 0,0.4328 -7.64173,0 z" id="path104156" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.76882,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z" id="path104158" sodipodi:nodetypes="ccccc"/>
+        <path id="path104160" d="m 851.83056,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.02763,2267.9558 7.64162,0 0,0.4326 -7.64162,0 z" id="path104162" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 838.90059,2263.6296 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0103,0.043 0.33773,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0187,0.2358 0.0104,0.3365 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z" style="fill:#000000;stroke:none" id="path104164"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.03905,2264.0936 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104166"/>
+        <path id="path104168" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.03915,2267.5307 0,-0.4928 2.24716,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path104170" style="fill:#808080;stroke:#000000;stroke-width:0.44594821" d="m 838.96467,2269.4001 29.88414,-0.048 -0.12173,6.7296 -29.76241,-0.091 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 842.47001,2271.1308 7.60477,0 0,0.769 -7.60477,0 z" id="path104177" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.19266,2270.9903 0,3.4128 3.23035,0 0,-3.4128 -1.48058,0 0.75716,0.013 -0.0166,0.1085 0,3.1725 -1.06001,0 -0.0166,0.097 -0.68977,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74987,0 z" id="path104190"/>
+        <path sodipodi:nodetypes="ccccc" id="path104193" d="m 851.48816,2271.1308 7.60478,0 0,0.769 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104199" d="m 842.68537,2272.5727 7.60477,0 0,0.4328 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.70341,2272.5727 7.60488,0 0,0.4328 -7.60488,0 z" id="path104201"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.84688,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z" id="path104203"/>
+        <path sodipodi:nodetypes="ccccc" id="path104205" d="m 851.86503,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104212" d="m 842.90073,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.91888,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z" id="path104648"/>
+        <path sodipodi:nodetypes="ccccc" id="path104650" d="m 861.07152,2274.8321 7.60488,0 0,0.4325 -7.60488,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104652" style="fill:#000000;stroke:none" d="m 839.05123,2270.5058 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33619,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96478,-0.054 22.92924,-0.012 25.81585,0 0.0176,0.3066 0.0187,0.2356 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53623,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path104654" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.0637,2270.9699 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.06379,2274.4069 0,-0.4926 2.2363,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104656"/>
+        <path id="path104658" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44488338" d="m 838.96467,2276.0124 29.82592,-0.048 -0.1224,6.7296 -29.70352,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 842.66269,2277.7431 7.55186,0 0,0.769 -7.55186,0 z" id="path104660" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.25499,2277.6025 0,3.4129 3.20788,0 0,-3.4129 -1.47032,0 0.75188,0.013 -0.0166,0.1088 0,3.1723 -1.05256,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00245,0 0.0166,-0.1203 -1.73765,0 z" id="path104662"/>
+        <path sodipodi:nodetypes="ccccc" id="path104664" d="m 851.618,2277.7431 7.55186,0 0,0.769 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104666" d="m 842.8765,2279.1851 7.55186,0 0,0.4326 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.8318,2279.1851 7.55197,0 0,0.4326 -7.55197,0 z" id="path104668"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 843.03687,2280.3388 7.55187,0 0,0.4326 -7.55187,0 z" id="path104670"/>
+        <path sodipodi:nodetypes="ccccc" id="path104672" d="m 851.99229,2280.3388 7.55186,0 0,0.4326 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104674" d="m 843.09041,2281.4445 7.55186,0 0,0.4324 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 852.0457,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z" id="path104676"/>
+        <path sodipodi:nodetypes="ccccc" id="path104678" d="m 861.13468,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104680" style="fill:#000000;stroke:none" d="m 838.96467,2277.1182 1.23861,0 c 0,0 0.25988,2.4062 0.38982,3.6094 0.0104,0.043 0.3338,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0196,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94406,-0.054 22.76958,-0.011 25.6361,0 0.0166,0.3066 0.0186,0.2358 0.0104,0.3365 -1.045,0.012 -25.10217,-0.011 -25.08788,0 0.15003,1.4649 0.0787,3.8027 0.21339,4.9222 -0.83948,-0.015 -2.14031,-0.045 -2.95463,-0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path104682" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.09911,2277.5822 0,0.4929 2.22075,0 0.0166,0.8291 0.5389,0 0,-0.8283 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.09911,2281.0192 0,-0.4926 2.22075,0 0.0166,-0.8292 0.5389,0 0,0.8284 0,0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104684"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 838.96465,2282.8888 29.68383,-0.048 -0.0607,6.7294 -29.62358,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.44321227" id="path104686"/>
+        <path inkscape:connector-curvature="0" id="path104688" d="m 842.79511,2284.6194 7.51553,0 0,0.769 -7.51553,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path104690" d="m 861.29786,2284.4789 0,3.4129 3.19244,0 0,-3.4129 -1.46328,0 0.74826,0.013 -0.0166,0.1087 0,3.1724 -1.04748,0 -0.0166,0.097 -0.6818,0 0,-0.097 0,-3.1724 0.99768,0 0.0166,-0.1203 -1.72927,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.70725,2284.6194 7.51552,0 0,0.769 -7.51552,0 z" id="path104692" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 843.00798,2286.0614 7.51543,0 0,0.4327 -7.51543,0 z" id="path104694" sodipodi:nodetypes="ccccc"/>
+        <path id="path104696" d="m 851.92012,2286.0614 7.51552,0 0,0.4327 -7.51552,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path104698" d="m 843.16753,2287.2151 7.51554,0 0,0.4326 -7.51554,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 852.07978,2287.2151 7.51541,0 0,0.4326 -7.51541,0 z" id="path104700" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 843.22076,2288.3206 7.51552,0 0,0.4327 -7.51552,0 z" id="path104702" sodipodi:nodetypes="ccccc"/>
+        <path id="path104704" d="m 852.13299,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.17816,2288.3206 7.51543,0 0,0.4327 -7.51543,0 z" id="path104706" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 838.96467,2283.9945 1.38294,0 c 0,0 0.25864,2.4061 0.38796,3.6094 0.0104,0.044 0.33214,0.047 0.65,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5305 -0.0932,-1.2885 -0.0621,-1.6162 2.93,-0.054 22.65995,-0.012 25.5126,0 0.0166,0.3067 0.0176,0.2357 0.0104,0.3364 -1.04002,0.012 -24.98124,-0.012 -24.96705,0 0.14929,1.4649 0.0776,3.8028 0.21235,4.9223 -0.83534,-0.015 -2.2804,-0.1363 -3.09078,-0.1363 z" style="fill:#000000;stroke:none" id="path104708"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.12343,2284.4585 0,0.493 2.2101,0 0.0166,0.8291 0.53632,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104710"/>
+        <path id="path104712" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.12343,2287.8956 0,-0.4928 2.20999,0 0.0166,-0.8291 0.53622,0 0,0.8284 0,0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path104714" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44642299" d="m 748.03007,2248.9762 30.00677,0.051 0.18161,6.6305 -29.93734,-0.049 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 751.46542,2250.7066 7.64163,0 0,0.7691 -7.64163,0 z" id="path104716" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 770.27877,2250.5662 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1088 0,3.1723 -1.0651,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 z" id="path104718" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path104720" d="m 760.52726,2250.7066 7.64164,0 0,0.7691 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104722" d="m 751.68182,2252.1487 7.64162,0 0,0.4327 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.74366,2252.1487 7.64162,0 0,0.4327 -7.64162,0 z" id="path104724"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 751.84416,2253.3024 7.64163,0 0,0.4326 -7.64163,0 z" id="path104726"/>
+        <path id="path104728" d="m 760.90589,2253.3024 7.64175,0 0,0.4326 -7.64175,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104730" d="m 751.8982,2254.408 7.64174,0 0,0.4327 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.96004,2254.408 7.64164,0 0,0.4327 -7.64164,0 z" id="path104732"/>
+        <path id="path104734" d="m 770.15711,2254.408 7.64164,0 0,0.4327 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104736" style="fill:#000000;stroke:none" d="m 748.03007,2250.0818 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6094 0.0104,0.044 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4321 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6163 2.97917,-0.054 23.04033,-0.011 25.94092,0 0.0176,0.3069 0.0186,0.236 0.0104,0.3366 -1.05752,0.012 -25.40066,-0.011 -25.38627,0 0.15178,1.4649 0.0797,3.8028 0.21598,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path104738" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.35097,2250.5459 0,0.4929 2.24716,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.35107,2253.983 0,-0.4927 2.24706,0 0.0166,-0.8293 0.54522,0 0,0.8284 0,0.4926 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104740"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 748.36605,2255.8535 29.82127,-0.048 0.18134,6.6801 -29.98574,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44610023" id="path104742"/>
+        <path inkscape:connector-curvature="0" id="path104744" d="m 751.8014,2257.584 7.64163,0 0,0.769 -7.64163,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path104746" d="m 770.61474,2257.4435 0,3.4129 3.24598,0 0,-2.936 0,-0.2523 0,-0.2246 -1.48771,0 0.76078,0.013 -0.0166,0.1086 0,3.1725 -1.06519,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1725 1.01445,0 0.0166,-0.1202 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.86314,2257.584 7.64173,0 0,0.769 -7.64173,0 z" id="path104748"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.01779,2259.0259 7.64163,0 0,0.4328 -7.64163,0 z" id="path104750"/>
+        <path id="path104752" d="m 761.07953,2259.0259 7.64174,0 0,0.4328 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104754" d="m 752.18014,2260.1797 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.24188,2260.1797 7.64162,0 0,0.4326 -7.64162,0 z" id="path104756"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.23418,2261.2854 7.64163,0 0,0.4325 -7.64163,0 z" id="path104758"/>
+        <path id="path104760" d="m 761.29603,2261.2854 7.64162,0 0,0.4325 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 770.49299,2261.2854 7.64173,0 0,0.4325 -7.64173,0 z" id="path104762"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 748.36605,2256.959 0.94674,0 c 0,0 0.26299,2.4063 0.39437,3.6096 0.0104,0.043 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.432 -0.0197,-0.5304 -0.0942,-1.2884 -0.0632,-1.6161 2.97907,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3066 0.0187,0.2357 0.0103,0.3363 -1.05752,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4649 0.0797,3.8029 0.21588,4.9222 -0.84931,-0.015 -1.31885,0.047 -2.1428,0.047 z" style="fill:#000000;stroke:none" id="path104764"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.68684,2257.4232 0,0.4928 2.24727,0 0.0166,0.8291 0.54533,0 0,-0.8283 0,-0.4926 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104766"/>
+        <path id="path104768" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.68695,2260.8602 0,-0.4927 2.24705,0 0.0166,-0.8292 0.54523,0 0,0.8283 0,0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path104770" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44730246" d="m 778.40169,2249.0771 29.98233,-0.048 0.0647,6.7293 -29.85228,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 781.83704,2250.8077 7.64164,0 0,0.7689 -7.64164,0 z" id="path104772" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.65039,2250.6671 0,3.413 3.24608,0 0,-3.413 -1.48782,0 0.76079,0.013 -0.0166,0.1086 0,3.1723 -1.06509,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z" id="path104774"/>
+        <path sodipodi:nodetypes="ccccc" id="path104776" d="m 790.89888,2250.8077 7.64164,0 0,0.7689 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104778" d="m 782.05344,2252.2497 7.64173,0 0,0.4327 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.11528,2252.2497 7.64162,0 0,0.4327 -7.64162,0 z" id="path104780"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.21578,2253.4034 7.64163,0 0,0.4327 -7.64163,0 z" id="path104782"/>
+        <path sodipodi:nodetypes="ccccc" id="path104784" d="m 791.27752,2253.4034 7.64174,0 0,0.4327 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104786" d="m 782.26993,2254.509 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.33166,2254.509 7.64164,0 0,0.4326 -7.64164,0 z" id="path104788"/>
+        <path sodipodi:nodetypes="ccccc" id="path104790" d="m 800.52873,2254.509 7.64164,0 0,0.4326 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104792" style="fill:#000000;stroke:none" d="m 778.40169,2250.1828 0.94674,0 c 0,0 0.26299,2.4061 0.39447,3.6094 0.0104,0.043 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04034,-0.011 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40056,-0.011 -25.38617,0 0.15179,1.4651 0.0797,3.8028 0.21588,4.9223 -0.84942,-0.015 -1.72461,0.047 -2.54856,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path104794" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.54016,2250.6468 0,0.4929 2.24726,0 0.0166,0.8292 0.54532,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.54026,2254.0839 0,-0.4927 2.24716,0 0.0166,-0.8292 0.54523,0 0,0.8284 0,0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104796"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 778.55233,2255.9534 29.93614,-0.048 0.0649,6.7297 -29.80626,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.44695815" id="path104798"/>
+        <path inkscape:connector-curvature="0" id="path104800" d="m 781.97112,2257.684 7.60477,0 0,0.769 -7.60477,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path104802" d="m 800.69377,2257.5435 0,3.4129 3.23035,0 0,-3.4129 -1.48058,0 0.75717,0.013 -0.0166,0.1086 0,3.1724 -1.06001,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1724 1.00948,0 0.0166,-0.1203 -1.74978,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 790.98927,2257.684 7.60477,0 0,0.769 -7.60477,0 z" id="path104804" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.18647,2259.1259 7.60478,0 0,0.4328 -7.60478,0 z" id="path104806" sodipodi:nodetypes="ccccc"/>
+        <path id="path104808" d="m 791.20453,2259.1259 7.60487,0 0,0.4328 -7.60487,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path104810" d="m 782.348,2260.2798 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.36615,2260.2798 7.60477,0 0,0.4325 -7.60477,0 z" id="path104812" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.40183,2261.3854 7.60477,0 0,0.4325 -7.60477,0 z" id="path104814" sodipodi:nodetypes="ccccc"/>
+        <path id="path104816" d="m 791.41998,2261.3854 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.57264,2261.3854 7.60486,0 0,0.4325 -7.60486,0 z" id="path104818" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 778.55233,2257.059 0.9422,0 c 0,0 0.26163,2.4062 0.3925,3.6096 0.0104,0.043 0.33618,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5303 -0.0942,-1.2883 -0.0621,-1.6161 2.96478,-0.054 22.92926,-0.012 25.81586,0 0.0176,0.3067 0.0186,0.2357 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15106,1.4649 0.0787,3.8028 0.21484,4.9221 -0.84517,-0.015 -1.71623,0.047 -2.53624,0.047 z" style="fill:#000000;stroke:none" id="path104820"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.5648,2257.5232 0,0.4928 2.23639,0 0.0166,0.8291 0.54275,0 0,-0.8284 0,-0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104822"/>
+        <path id="path104824" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.56491,2260.9602 0,-0.4927 2.23628,0 0.0166,-0.8291 0.54265,0 0,0.8282 0,0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.55075,2249.053 30.07268,-0.026 -0.24475,6.7074 -29.82793,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327" id="path104826"/>
+        <path inkscape:connector-curvature="0" id="path104828" d="m 811.92201,2250.7836 7.64164,0 0,0.7689 -7.64164,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path104830" d="m 830.73536,2250.6429 0,3.4131 3.24608,0 0,-3.4131 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75827,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 820.98386,2250.7836 7.64163,0 0,0.7689 -7.64163,0 z" id="path104832" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.13841,2252.2255 7.64173,0 0,0.4328 -7.64173,0 z" id="path104834" sodipodi:nodetypes="ccccc"/>
+        <path id="path104836" d="m 821.20025,2252.2255 7.64164,0 0,0.4328 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path104838" d="m 812.30075,2253.3792 7.64164,0 0,0.4328 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.3625,2253.3792 7.64173,0 0,0.4328 -7.64173,0 z" id="path104840" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.3549,2254.4849 7.64164,0 0,0.4326 -7.64164,0 z" id="path104842" sodipodi:nodetypes="ccccc"/>
+        <path id="path104844" d="m 821.41665,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.61371,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z" id="path104846" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 808.48667,2250.1587 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0104,0.043 0.33774,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40055,-0.011 -25.38616,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z" style="fill:#000000;stroke:none" id="path104848"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.62513,2250.6227 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104850"/>
+        <path id="path104852" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.62524,2254.0598 0,-0.4928 2.24715,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path104854" style="fill:#808080;stroke:#000000;stroke-width:0.44594821" d="m 808.55075,2255.9292 29.88415,-0.048 -0.12173,6.7296 -29.76242,-0.091 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 812.05609,2257.6599 7.60477,0 0,0.769 -7.60477,0 z" id="path104856" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.77875,2257.5194 0,3.4128 3.23034,0 0,-3.4128 -1.48058,0 0.75717,0.013 -0.0166,0.1085 0,3.1725 -1.06002,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74988,0 z" id="path104858"/>
+        <path sodipodi:nodetypes="ccccc" id="path104860" d="m 821.07424,2257.6599 7.60478,0 0,0.769 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104862" d="m 812.27145,2259.1018 7.60477,0 0,0.4328 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.2895,2259.1018 7.60488,0 0,0.4328 -7.60488,0 z" id="path104864"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.43297,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z" id="path104866"/>
+        <path sodipodi:nodetypes="ccccc" id="path104868" d="m 821.45112,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path104870" d="m 812.48681,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.50497,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z" id="path104872"/>
+        <path sodipodi:nodetypes="ccccc" id="path104874" d="m 830.65761,2261.3612 7.60487,0 0,0.4325 -7.60487,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path104876" style="fill:#000000;stroke:none" d="m 808.63732,2257.0349 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33618,0.047 0.65776,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96477,-0.054 22.92924,-0.012 25.81584,0 0.0176,0.3066 0.0186,0.2356 0.0104,0.3365 -1.05244,0.012 -25.27817,-0.012 -25.26388,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53624,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path104878" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.64978,2257.499 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.64988,2260.936 0,-0.4926 2.23629,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path104880"/>
+        <path id="path104882" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327" d="m 838.96467,2249.053 29.74135,-0.026 0.0866,6.7074 -29.82792,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 842.33593,2250.7836 7.64163,0 0,0.7689 -7.64163,0 z" id="path104884" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.14927,2250.6429 0,3.4131 3.24609,0 0,-3.4131 -1.48782,0 0.76078,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z" id="path104886"/>
+        <path sodipodi:nodetypes="ccccc" id="path104968" d="m 851.39778,2250.7836 7.64162,0 0,0.7689 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path105000" d="m 842.55232,2252.2255 7.64174,0 0,0.4328 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.61416,2252.2255 7.64164,0 0,0.4328 -7.64164,0 z" id="path105012"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.71467,2253.3792 7.64163,0 0,0.4328 -7.64163,0 z" id="path105288"/>
+        <path sodipodi:nodetypes="ccccc" id="path105290" d="m 851.77641,2253.3792 7.64173,0 0,0.4328 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path105292" d="m 842.76882,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.83056,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z" id="path105301"/>
+        <path sodipodi:nodetypes="ccccc" id="path105334" d="m 861.02763,2254.4849 7.64162,0 0,0.4326 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path105347" style="fill:#000000;stroke:none" d="m 838.90059,2250.1587 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0103,0.043 0.33773,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0187,0.2358 0.0104,0.3365 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path105859" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.03905,2250.6227 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.03915,2254.0598 0,-0.4928 2.24716,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path105871"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 838.96467,2255.9292 29.88414,-0.048 -0.12173,6.7296 -29.76241,-0.091 z" style="fill:#808080;stroke:#000000;stroke-width:0.44594821" id="path105873"/>
+        <path inkscape:connector-curvature="0" id="path105910" d="m 842.47001,2257.6599 7.60477,0 0,0.769 -7.60477,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path106103" d="m 861.19266,2257.5194 0,3.4128 3.23035,0 0,-3.4128 -1.48058,0 0.75716,0.013 -0.0166,0.1085 0,3.1725 -1.06001,0 -0.0166,0.097 -0.68977,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74987,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.48816,2257.6599 7.60478,0 0,0.769 -7.60478,0 z" id="path106115" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.68537,2259.1018 7.60477,0 0,0.4328 -7.60477,0 z" id="path106117" sodipodi:nodetypes="ccccc"/>
+        <path id="path106129" d="m 851.70341,2259.1018 7.60488,0 0,0.4328 -7.60488,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path106141" d="m 842.84688,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.86503,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z" id="path106153" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.90073,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z" id="path106165" sodipodi:nodetypes="ccccc"/>
+        <path id="path106167" d="m 851.91888,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.07152,2261.3612 7.60488,0 0,0.4325 -7.60488,0 z" id="path106179" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 839.05123,2257.0349 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33619,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96478,-0.054 22.92924,-0.012 25.81585,0 0.0176,0.3066 0.0187,0.2356 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53623,0.047 z" style="fill:#000000;stroke:none" id="path106191"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.0637,2257.499 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path106203"/>
+        <path id="path106215" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.06379,2260.936 0,-0.4926 2.2363,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path106217" style="fill:url(#linearGradient106446);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47515267" d="m 834.13554,2244.9202 34.55518,0 -0.12351,3.3621 -34.55519,0 z" inkscape:connector-curvature="0"/>
+        <path id="path106229" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold" d="m 864.91226,2245.2773 0.47657,0 c 0.1074,0 0.18775,0.011 0.24076,0.021 0.071,0.018 0.12797,0.051 0.17038,0.098 0.0424,0.047 0.0689,0.1049 0.0806,0.1729 0.0117,0.069 0,0.1521 -0.0202,0.252 -0.0212,0.088 -0.053,0.1635 -0.0954,0.2271 -0.052,0.077 -0.11302,0.1404 -0.18479,0.1884 -0.0541,0.036 -0.12235,0.066 -0.2042,0.085 -0.0615,0.015 -0.14016,0.022 -0.23643,0.022 l -0.49067,0 z m 0.21617,0.1805 -0.1742,0.7066 0.19467,0 c 0.0731,0 0.12616,0 0.1602,-0.011 0.0445,-0.011 0.0827,-0.024 0.1162,-0.044 0.0329,-0.021 0.0647,-0.055 0.0933,-0.1039 0.0297,-0.048 0.0541,-0.1128 0.0742,-0.1953 0.0202,-0.083 0.0276,-0.1458 0.0202,-0.19 -0.0106,-0.044 -0.0233,-0.079 -0.0488,-0.1028 -0.0254,-0.025 -0.0615,-0.041 -0.10836,-0.05 -0.035,-0.011 -0.10497,-0.011 -0.21151,-0.011 z m -1.35412,0.8863 -0.19846,-1.0668 0.28276,0 0.13209,0.7896 0.51104,-0.7896 0.2766,0 -0.72561,1.0668 z m -1.37108,-1.0668 0.47669,0 c 0.1074,0 0.18775,0.011 0.24067,0.021 0.071,0.018 0.12806,0.051 0.17047,0.098 0.0424,0.047 0.0689,0.1049 0.0806,0.1729 0.0117,0.069 0,0.1521 -0.0202,0.252 -0.0212,0.088 -0.053,0.1635 -0.0954,0.2271 -0.052,0.077 -0.11312,0.1404 -0.18479,0.1884 -0.0541,0.036 -0.12235,0.066 -0.20432,0.085 -0.0615,0.015 -0.14004,0.022 -0.23631,0.022 l -0.49067,0 z m 0.2163,0.1805 -0.17431,0.7066 0.19477,0 c 0.0731,0 0.12616,0 0.1602,-0.011 0.0445,-0.011 0.0827,-0.024 0.1162,-0.044 0.0329,-0.021 0.0647,-0.055 0.0933,-0.1039 0.0297,-0.048 0.0541,-0.1128 0.0742,-0.1953 0.0202,-0.083 0.0276,-0.1458 0.0202,-0.19 -0.0106,-0.044 -0.0233,-0.079 -0.0488,-0.1028 -0.0255,-0.025 -0.0615,-0.041 -0.10825,-0.05 -0.035,-0.011 -0.10496,-0.011 -0.21152,-0.011 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106241" d="m 864.01307,2246.6725 c -1.1832,0 -2.14239,0.1318 -2.14239,0.2952 0,0.1633 0.95919,0.2952 2.14239,0.2952 1.18333,0 2.1425,-0.1319 2.1425,-0.2952 0,-0.1634 -0.95917,-0.2952 -2.1425,-0.2952 z m 0,0.2134 c 0.33217,0 0.60148,0.037 0.60148,0.082 0,0.046 -0.26931,0.082 -0.60148,0.082 -0.33206,0 -0.60135,-0.037 -0.60135,-0.082 0,-0.046 0.26929,-0.082 0.60135,-0.082 z" style="fill:#ffffff;stroke:none"/>
+        <text transform="scale(1.0170762,0.9832105)" sodipodi:linespacing="125%" id="text106243" y="2286.3989" x="848.68781" style="font-size:0.70121336px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="2286.3989" x="848.68781" id="tspan106245" sodipodi:role="line">ROM</tspan></text>
+        <path id="path106253" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 852.11749,2245.5239 c 0,0 -0.10603,0 -0.10603,0 0,0 0,-0.1313 0,-0.1313 0,0 0.10942,0 0.10942,0 0.053,0 0.0795,0.021 0.0795,0.062 0,0.047 -0.0276,0.069 -0.0827,0.069 z m 0.84171,0.066 c -0.0148,0.073 -0.0541,0.1094 -0.11705,0.1094 -0.088,0 -0.13211,-0.053 -0.13211,-0.1605 0,-0.105 0.0445,-0.1569 0.13211,-0.1569 0.0625,0 0.10072,0.026 0.11323,0.081 0,0 0.053,0 0.053,0 -0.018,-0.085 -0.0732,-0.1276 -0.16614,-0.1276 -0.12584,0 -0.18872,0.068 -0.18872,0.2043 0,0.1363 0.0604,0.2044 0.1812,0.2044 0.10284,0 0.16232,-0.051 0.17748,-0.1533 0,0 -0.053,0 -0.053,0 z m -1.78923,-0.2554 c -0.13084,0 -0.19625,0.068 -0.19625,0.2043 0,0.1363 0.0657,0.2044 0.19625,0.2044 0.13093,0 0.19635,-0.068 0.19635,-0.2044 0,-0.1363 -0.0657,-0.2043 -0.19635,-0.2043 z m -0.3169,0.2554 c -0.0127,0.073 -0.0509,0.1094 -0.11334,0.1094 -0.0901,0 -0.13582,-0.053 -0.13582,-0.1605 0,-0.105 0.0435,-0.1569 0.13211,-0.1569 0.0625,0 0.10072,0.026 0.11323,0.081 0,0 0.053,0 0.053,0 -0.0106,-0.085 -0.0657,-0.1276 -0.16603,-0.1276 -0.12331,0 -0.18501,0.068 -0.18501,0.2043 0,0.1363 0.0594,0.2044 0.17737,0.2044 0.10286,0 0.16232,-0.051 0.17749,-0.1533 0,0 -0.053,0 -0.053,0 z m 2.51378,-0.2445 c 0,0 -0.32453,0 -0.32453,0 0,0 0,0.048 0,0.048 0,0 0.13581,0 0.13581,0 0,0 0,0.343 0,0.343 0,0 0.053,0 0.053,0 0,0 0,-0.343 0,-0.343 0,0 0.13592,0 0.13592,0 0,0 0,-0.048 0,-0.048 z m -0.87945,0 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.15086,0.3905 -0.15086,0.3905 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1132 0.0413,-0.1132 0,0 0.16232,0 0.16232,0 0,0 0.0382,0.1132 0.0382,0.1132 0,0 0.0604,0 0.0604,0 0,0 -0.14727,-0.3905 -0.14727,-0.3905 z m -0.35104,0 c 0,0 -0.17738,0 -0.17738,0 0,0 0,0.3905 0,0.3905 0,0 0.053,0 0.053,0 0,0 0,-0.1643 0,-0.1643 0,0 0.12458,0 0.12458,0 0.0806,0 0.12076,-0.039 0.12076,-0.1168 0,-0.073 -0.0403,-0.1094 -0.12076,-0.1094 z m -0.29443,0 c 0,0 -0.0753,0 -0.0753,0 0,0 -0.11705,0.3284 -0.11705,0.3284 0,0 -0.11323,-0.3284 -0.11323,-0.3284 0,0 -0.0795,0 -0.0795,0 0,0 0,0.3905 0,0.3905 0,0 0.053,0 0.053,0 0,0 0,-0.3248 0,-0.3248 0,0 0.11323,0.3248 0.11323,0.3248 0,0 0.053,0 0.053,0 0,0 0.11704,-0.3285 0.11704,-0.3285 0,0 0,0.099 0,0.099 0,0 0,0.23 0,0.23 0,0 0.053,0 0.053,0 0,0 0,-0.3905 0,-0.3905 z m -1.51739,0.069 c 0,-0.03 -0.0148,-0.044 -0.0456,-0.044 0,0 -0.41136,0 -0.41136,0 -0.0297,0 -0.0456,0.015 -0.0456,0.044 0,0 0,0.4123 0,0.4123 0,0.019 -0.0106,0.03 -0.0297,0.03 0,0 -0.37744,0 -0.37744,0 -0.0784,0 -0.14217,0.024 -0.19253,0.075 -0.0509,0.05 -0.0753,0.1125 -0.0753,0.188 0,0 0,0.9085 0,0.9085 0,0.073 0.0255,0.135 0.0774,0.1861 0.052,0.051 0.11502,0.076 0.19063,0.076 0,0 0.86429,0 0.86429,0 0.0308,0 0.0456,-0.016 0.0456,-0.048 0,0 0,-1.8282 0,-1.8282 z m 3.13667,1.2734 c 0,-0.032 -0.0148,-0.048 -0.0456,-0.048 0,0 -0.37733,0 -0.37733,0 -0.0329,0 -0.0488,0.016 -0.0488,0.048 0,0 0,0.2117 0,0.2117 0,0.06 -0.0297,0.091 -0.0912,0.091 -0.0625,0 -0.0944,-0.031 -0.0944,-0.091 0,0 0,-0.6494 0,-0.6494 0,-0.061 0.0318,-0.091 0.0944,-0.091 0.0604,0 0.0912,0.031 0.0912,0.091 0,0 0,0.1714 0,0.1714 0,0.03 0.0159,0.043 0.0488,0.043 0,0 0.37733,0 0.37733,0 0.0308,0 0.0456,-0.015 0.0456,-0.043 0,0 0,-0.3028 0,-0.3028 0,-0.073 -0.0265,-0.1351 -0.0795,-0.1861 -0.053,-0.051 -0.11704,-0.076 -0.19253,-0.076 0,0 -0.58122,0 -0.58122,0 -0.0753,0 -0.13973,0.025 -0.19264,0.076 -0.053,0.051 -0.0795,0.1132 -0.0795,0.1861 0,0 0,0.9049 0,0.9049 0,0.075 0.0254,0.1387 0.0774,0.1898 0.052,0.051 0.11641,0.076 0.19445,0.076 0,0 0.58121,0 0.58121,0 0.0774,0 0.14271,-0.025 0.19434,-0.076 0.052,-0.051 0.0774,-0.1144 0.0774,-0.1898 0,0 0,-0.3358 0,-0.3358 z m -1.24936,-0.076 c 0,-0.073 -0.0265,-0.135 -0.0795,-0.1861 -0.053,-0.051 -0.11705,-0.076 -0.19254,-0.076 0,0 -0.35114,0 -0.35114,0 -0.0382,0 -0.0562,-0.018 -0.0562,-0.055 0,-0.039 0.0191,-0.058 0.0562,-0.058 0,0 0.52852,0 0.52852,0 0.0297,0 0.0456,-0.015 0.0456,-0.043 0,0 0,-0.2919 0,-0.2919 0,-0.03 -0.0149,-0.043 -0.0456,-0.043 0,0 -0.74735,0 -0.74735,0 -0.0753,0 -0.13974,0.025 -0.19254,0.076 -0.053,0.051 -0.0795,0.1131 -0.0795,0.186 0,0 0,0.3867 0,0.3867 0,0.073 0.0265,0.1351 0.0795,0.1862 0.053,0.051 0.11694,0.076 0.19254,0.076 0,0 0.35104,0 0.35104,0 0.0477,0 0.0721,0.024 0.0721,0.073 0,0.043 -0.0244,0.066 -0.0721,0.066 0,0 -0.57761,0 -0.57761,0 -0.0297,0 -0.0456,0.016 -0.0456,0.048 0,0 0,0.2884 0,0.2884 0,0.032 0.0148,0.048 0.0456,0.048 0,0 0.79654,0 0.79654,0 0.0774,0 0.14271,-0.025 0.19434,-0.076 0.052,-0.051 0.0774,-0.1144 0.0774,-0.1898 0,0 0,-0.4124 0,-0.4124 z m 1.14376,1.2225 c 0,0 -0.24173,0 -0.24173,0 0,0 0,-0.1313 0,-0.1313 0,0 0.21894,0 0.21894,0 0,0 0,-0.043 0,-0.043 0,0 -0.21894,0 -0.21894,0 0,0 0,-0.1203 0,-0.1203 0,0 0.23792,0 0.23792,0 0,0 0,-0.048 0,-0.048 0,0 -0.29072,0 -0.29072,0 0,0 0,0.3867 0,0.3867 0,0 0.29453,0 0.29453,0 0,0 0,-0.043 0,-0.043 z m -0.3926,-0.1606 c 0,0 -0.17748,0 -0.17748,0 0,0 0,0.044 0,0.044 0,0 0.12468,0 0.12468,0 0,0.085 -0.0413,0.1276 -0.12468,0.1276 -0.088,0 -0.1321,-0.053 -0.1321,-0.1605 0,-0.1049 0.0445,-0.1569 0.1321,-0.1569 0.0657,0 0.10496,0.026 0.11705,0.081 0,0 0.053,0 0.053,0 -0.0106,-0.085 -0.0668,-0.1277 -0.16985,-0.1277 -0.12584,0 -0.18872,0.068 -0.18872,0.2043 0,0.068 0.018,0.1193 0.0551,0.1533 0.036,0.034 0.0795,0.051 0.13019,0.051 0.0604,0 0.10496,-0.021 0.13221,-0.062 0,0 0.0148,0.051 0.0148,0.051 0,0 0.0339,0 0.0339,0 0,0 0,-0.2043 0,-0.2043 z m -0.52841,-0.1824 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.1548,0.3867 -0.1548,0.3867 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16222,0 0.16222,0 0,0 0.0413,0.1094 0.0413,0.1094 0,0 0.0562,0 0.0562,0 0,0 -0.14345,-0.3867 -0.14345,-0.3867 z m -0.22657,0.3794 c -0.0127,0 -0.0191,-0.018 -0.0191,-0.04 0,0 0,-0.069 0,-0.069 0,-0.032 -0.0191,-0.056 -0.0488,-0.073 0.0382,-0.019 0.0562,-0.05 0.0562,-0.091 0,-0.07 -0.0445,-0.1061 -0.13221,-0.1061 0,0 -0.18862,0 -0.18862,0 0,0 0,0.3868 0,0.3868 0,0 0.0562,0 0.0562,0 0,0 0,-0.1642 0,-0.1642 0,0 0.13199,0 0.13199,0 0.0456,0 0.0689,0.023 0.0721,0.069 0,0 0.0106,0.094 0.0106,0.094 0,0 0.0679,-0.011 0.0679,-0.011 z m -0.58503,-0.3904 c -0.13083,0 -0.19625,0.068 -0.19625,0.2043 0,0.058 0.018,0.1071 0.053,0.146 0.035,0.039 0.0827,0.058 0.14345,0.058 0.13083,0 0.19625,-0.068 0.19625,-0.2044 0,-0.1362 -0.0657,-0.2043 -0.19625,-0.2043 z m -0.19625,0.011 c 0,0 -0.32846,0 -0.32846,0 0,0 0,0.048 0,0.048 0,0 0.13974,0 0.13974,0 0,0 0,0.3393 0,0.3393 0,0 0.053,0 0.053,0 0,0 0,-0.3393 0,-0.3393 0,0 0.13592,0 0.13592,0 0,0 0,-0.048 0,-0.048 z m -0.43024,0.1752 c 0,0 -0.11333,-0.025 -0.11333,-0.025 -0.0329,-0.011 -0.0488,-0.023 -0.0488,-0.048 0,-0.047 0.0307,-0.069 0.0901,-0.069 0.0679,0 0.10179,0.026 0.10179,0.081 0,0 0.0488,0 0.0488,0 0,-0.083 -0.052,-0.1241 -0.1548,-0.1241 -0.0933,0 -0.13963,0.04 -0.13963,0.1204 0,0.049 0.0286,0.08 0.0869,0.091 0,0 0.0795,0.018 0.0795,0.018 0.0583,0.013 0.0869,0.035 0.0869,0.069 0,0.044 -0.035,0.066 -0.10602,0.066 -0.0731,0 -0.10941,-0.031 -0.10941,-0.091 0,0 -0.0488,0 -0.0488,0 0,0.09 0.053,0.1351 0.1585,0.1351 0.10602,0 0.1585,-0.039 0.1585,-0.1168 0,-0.056 -0.0297,-0.091 -0.0901,-0.106 z m -0.60411,-0.1752 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.15109,0.3868 -0.15109,0.3868 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16243,0 0.16243,0 0,0 0.0371,0.1094 0.0371,0.1094 0,0 0.0604,0 0.0604,0 0,0 -0.14726,-0.3868 -0.14726,-0.3868 z m -0.13963,0 c 0,0 -0.32835,0 -0.32835,0 0,0 0,0.048 0,0.048 0,0 0.13963,0 0.13963,0 0,0 0,0.3393 0,0.3393 0,0 0.0562,0 0.0562,0 0,0 0,-0.3393 0,-0.3393 0,0 0.13209,0 0.13209,0 0,0 0,-0.048 0,-0.048 z m -0.43024,0 c 0,0 -0.0647,0 -0.0647,0 0,0 -0.15098,0.3868 -0.15098,0.3868 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16232,0 0.16232,0 0,0 0.0413,0.1094 0.0413,0.1094 0,0 0.0604,0 0.0604,0 0,0 -0.14726,-0.3868 -0.14726,-0.3868 z m -0.41518,0 c 0,0 -0.16614,0 -0.16614,0 0,0 0,0.3868 0,0.3868 0,0 0.16232,0 0.16232,0 0.11323,0 0.16985,-0.066 0.16985,-0.1971 0,-0.1265 -0.0551,-0.1897 -0.16603,-0.1897 z m 2.98187,-1.9156 c 0,0 0.0679,-0.1715 0.0679,-0.1715 0,0 0.0562,0.1715 0.0562,0.1715 0,0 -0.12458,0 -0.12458,0 z m -1.21925,0.124 c -0.0933,0 -0.13964,-0.053 -0.13964,-0.1606 0,-0.1049 0.0466,-0.1569 0.13964,-0.1569 0.0933,0 0.13973,0.052 0.13973,0.1569 0,0.1071 -0.0466,0.1606 -0.13973,0.1606 z m -0.95484,1.5071 c 0,0 -0.80026,0 -0.80026,0 -0.053,0 -0.0965,-0.017 -0.1321,-0.051 -0.035,-0.034 -0.053,-0.076 -0.053,-0.1278 0,0 0,-0.9085 0,-0.9085 0,-0.051 0.018,-0.093 0.053,-0.1277 0.035,-0.034 0.0795,-0.051 0.1321,-0.051 0,0 0.4454,0 0.4454,0 0.0297,0 0.0456,-0.016 0.0456,-0.048 0,0 0,-0.4125 0,-0.4125 0,-0.019 0.0106,-0.03 0.0297,-0.03 0,0 0.27937,0 0.27937,0 0.018,0.017 0.0265,0.027 0.0265,0.03 0,0 0,1.7005 0,1.7005 0,0 -0.0106,0.014 -0.0265,0.026 z m 3.10825,-0.053 c -0.036,0.035 -0.0816,0.053 -0.1339,0.053 0,0 -0.58122,0 -0.58122,0 -0.053,0 -0.0986,-0.018 -0.13602,-0.053 -0.0371,-0.035 -0.0562,-0.079 -0.0562,-0.1296 0,0 0,-0.9049 0,-0.9049 0,-0.051 0.0191,-0.093 0.0562,-0.1278 0.0371,-0.034 0.0827,-0.051 0.13602,-0.051 0,0 0.58122,0 0.58122,0 0.0551,0 0.10072,0.017 0.13592,0.05 0.035,0.033 0.053,0.076 0.053,0.1295 0,0 0,0.2408 0,0.2408 0,0.017 -0.0106,0.026 -0.0265,0.026 0,0 -0.24915,0 -0.24915,0 -0.018,0 -0.0265,-0.011 -0.0265,-0.026 0,0 0,-0.1094 0,-0.1094 0,-0.049 -0.017,-0.089 -0.0509,-0.1222 -0.0339,-0.033 -0.0763,-0.049 -0.12648,-0.049 -0.0498,0 -0.0922,0.016 -0.12638,0.049 -0.0339,0.033 -0.0509,0.073 -0.0509,0.1222 0,0 0,0.6494 0,0.6494 0,0.049 0.017,0.089 0.0509,0.1223 0.0339,0.033 0.0763,0.049 0.12638,0.049 0.0509,0 0.0922,-0.016 0.12648,-0.049 0.0339,-0.033 0.0509,-0.074 0.0509,-0.1223 0,0 0,-0.1532 0,-0.1532 0,-0.017 0.0106,-0.026 0.0265,-0.026 0,0 0.24915,0 0.24915,0 0,0 0.0138,0.011 0.0265,0.026 0,0 0,0.2773 0,0.2773 0,0.051 -0.018,0.094 -0.0551,0.1296 z m -1.24936,0 c -0.036,0.035 -0.0806,0.053 -0.13391,0.053 0,0 -0.72848,0 -0.72848,0 -0.0201,0 -0.0297,-0.011 -0.0297,-0.026 0,0 0,-0.1642 0,-0.1642 0,-0.017 0.0106,-0.026 0.0297,-0.026 0,0 0.50954,0 0.50954,0 0.0424,0 0.0795,-0.015 0.10942,-0.043 0.0297,-0.03 0.0456,-0.065 0.0456,-0.106 0,-0.044 -0.0148,-0.081 -0.0435,-0.1095 -0.0286,-0.03 -0.0657,-0.043 -0.11132,-0.043 0,0 -0.35104,0 -0.35104,0 -0.053,0 -0.0975,-0.018 -0.13412,-0.053 -0.0361,-0.035 -0.0551,-0.079 -0.0551,-0.1297 0,0 0,-0.3867 0,-0.3867 0,-0.051 0.018,-0.093 0.0551,-0.1277 0.036,-0.034 0.0816,-0.051 0.13412,-0.051 0,0 0.67939,0 0.67939,0 0.018,0 0.0265,0.011 0.0265,0.025 0,0 0,0.1606 0,0.1606 0,0.019 -0.0106,0.03 -0.0265,0.03 0,0 -0.46056,0 -0.46056,0 -0.0933,0 -0.13963,0.047 -0.13963,0.1387 0,0.036 0.0138,0.068 0.0413,0.095 0.0276,0.026 0.0604,0.04 0.0986,0.04 0,0 0.35114,0 0.35114,0 0.0498,0 0.0944,0.018 0.1321,0.055 0.0371,0.036 0.0562,0.079 0.0562,0.1276 0,0 0,0.4124 0,0.4124 0,0.051 -0.018,0.094 -0.0551,0.1296 z m -1.14557,0.1367 c 0,0 -0.41137,0 -0.41137,0 -0.0297,0 -0.0456,-0.016 -0.0456,-0.048 0,0 0,-1.3428 0,-1.3428 0,-0.03 0.0148,-0.043 0.0456,-0.043 0,0 0.41137,0 0.41137,0 0.0297,0 0.0456,0.015 0.0456,0.043 0,0 0,1.3428 0,1.3428 0,0.032 -0.0149,0.048 -0.0456,0.048 z m 1.1286,0.3759 c 0,0 -0.12828,0 -0.12828,0 0,0 0,-0.1314 0,-0.1314 0,0 0.13581,0 0.13581,0 0.0477,0 0.0721,0.022 0.0721,0.066 0,0.043 -0.0265,0.066 -0.0795,0.066 z m 0.27937,0.051 c 0,0 0.0647,-0.1716 0.0647,-0.1716 0,0 0.0604,0.1716 0.0604,0.1716 0,0 -0.12458,0 -0.12458,0 z m -2.04209,0 c 0,0 0.0679,-0.1716 0.0679,-0.1716 0,0 0.0562,0.1716 0.0562,0.1716 0,0 -0.12457,0 -0.12457,0 z m -0.56998,0 c 0,0 0.0647,-0.1716 0.0647,-0.1716 0,0 0.0604,0.1716 0.0604,0.1716 0,0 -0.12458,0 -0.12458,0 z m -0.32082,0.1168 c 0,0 -0.10602,0 -0.10602,0 0,0 0,-0.2993 0,-0.2993 0,0 0.0986,0 0.0986,0 0.0827,0 0.12457,0.05 0.12457,0.1496 0,0.1 -0.0392,0.1497 -0.11704,0.1497 z m 2.21947,0.011 c -0.0933,0 -0.13963,-0.053 -0.13963,-0.1605 0,-0.105 0.0466,-0.1569 0.13963,-0.1569 0.0954,0 0.14345,0.052 0.14345,0.1569 0,0.1071 -0.0477,0.1605 -0.14345,0.1605 z m -0.7323,-1.8791 c 0,-0.017 -0.0106,-0.026 -0.0265,-0.026 0,0 -0.27937,0 -0.27937,0 -0.018,0 -0.0265,0.011 -0.0265,0.026 0,0 0,1.2151 0,1.2151 0,0.017 0.0106,0.025 0.0265,0.025 0,0 0.27937,0 0.27937,0 0.018,0 0.0265,-0.011 0.0265,-0.025 0,0 0,-1.2151 0,-1.2151 z m -0.98134,0.2773 c 0,-0.046 -0.017,-0.086 -0.0509,-0.1186 -0.0339,-0.033 -0.0753,-0.05 -0.12267,-0.05 -0.0477,0 -0.088,0.017 -0.12086,0.05 -0.0329,0.033 -0.0488,0.072 -0.0488,0.1186 0,0 0,0.6677 0,0.6677 0,0.049 0.0159,0.089 0.0466,0.1205 0.0318,0.032 0.0721,0.048 0.12266,0.048 0.0477,0 0.0891,-0.016 0.12267,-0.049 0.0339,-0.033 0.0509,-0.072 0.0509,-0.1185 0,0 0,-0.6677 0,-0.6677 z m -0.17366,0.7516 c -0.0583,0 -0.0869,-0.028 -0.0869,-0.084 0,0 0,-0.6678 0,-0.6678 0,-0.056 0.0286,-0.084 0.0869,-0.084 0.0551,0 0.0827,0.028 0.0827,0.084 0,0 0,0.6678 0,0.6678 0,0.056 -0.0276,0.084 -0.0827,0.084 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 824.73596,2245.3148 2.15913,0 0,1.6709 -2.15913,0 z" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path106265"/>
+        <path inkscape:connector-curvature="0" id="path106267" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 821.58598,2245.3148 2.15913,0 0,1.6709 -2.15913,0 z"/>
+        <path inkscape:connector-curvature="0" d="m 818.15103,2245.2839 1.37302,0 0,2.9493 -1.37302,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.18184429;stroke-miterlimit:4" id="path106269"/>
+        <path id="path106271" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.11374462;stroke-miterlimit:4" d="m 818.98685,2245.2839 0.5372,0 0,2.9493 -0.5372,0 z" inkscape:connector-curvature="0"/>
+        <path id="path106273" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 824.73596,2247.6128 2.15913,0 0,0.7308 -2.15913,0 z" inkscape:connector-curvature="0"/>
+        <path d="m 821.58598,2247.6128 2.15913,0 0,0.7308 -2.15913,0 z" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path106275" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 748.10981,2245.2067 67.29069,0 0.0429,3.271 -67.00661,0 z" style="fill:url(#linearGradient106448);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.65448451" id="path106277"/>
+        <path inkscape:connector-curvature="0" id="path106279" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 749.6123,2245.6006 1.74215,0 c 0.23626,0 0.44067,0.1574 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15834,-0.3527 0.3946,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 753.22102,2245.6006 1.74215,0 c 0.23627,0 0.44078,0.1574 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.39459,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1572 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15824,-0.3527 0.39449,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106281" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106283" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 756.86644,2245.6006 1.74215,0 c 0.23626,0 0.44066,0.1574 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15824,-0.3527 0.39449,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 749.6123,2247.1083 1.74215,0 c 0.23626,0 0.44067,0.1573 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.3946,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106285" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106287" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 753.22102,2247.1083 1.74215,0 c 0.23627,0 0.44078,0.1573 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.39459,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15824,-0.3527 0.39449,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 756.86644,2247.1083 1.74215,0 c 0.23626,0 0.44066,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15824,-0.3527 0.39449,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106289" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106291" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 760.57268,2247.1083 1.74216,0 c 0.23625,0 0.44067,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.3945,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 764.1814,2247.1083 1.74216,0 c 0.23626,0 0.44077,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106293" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106295" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 767.82682,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.3945,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 792.8232,2245.6006 1.74216,0 c 0.23625,0 0.44066,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15824,0.3526 -0.39449,0.3526 l -1.74216,0 c -0.23626,0 -0.44077,-0.1572 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15834,-0.3527 0.39459,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106297" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106299" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 796.43192,2245.6006 1.74216,0 c 0.23625,0 0.44077,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15836,0.3526 -0.39461,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15836,-0.3527 0.39461,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 800.07734,2245.6006 1.74216,0 c 0.23625,0 0.44066,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44067,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15835,-0.3527 0.39461,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106301" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106303" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 792.8232,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.39449,0.3526 l -1.74216,0 c -0.23626,0 -0.44077,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.39459,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 796.43192,2247.1083 1.74216,0 c 0.23625,0 0.44077,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15836,0.3526 -0.39461,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15836,-0.3527 0.39461,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106305" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106307" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 800.07734,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44067,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 803.78358,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.39449,0.3526 l -1.74217,0 c -0.23625,0 -0.44077,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.3946,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106309" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106311" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 807.3923,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15836,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 811.03772,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15823,0.3526 -0.39448,0.3526 l -1.74217,0 c -0.23625,0 -0.44077,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path106313" inkscape:connector-curvature="0"/>
+        <path id="path106315" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 827.65786,2245.3148 2.15923,0 0,2.9841 -2.15923,0 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106317" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 771.13208,2248.0646 1.74193,0 c 0.23626,0 0.44066,-0.1575 0.4584,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15824,-0.3525 -0.3945,-0.3525 l -1.74204,0 c -0.23626,0 -0.44066,0.1572 -0.4583,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15824,0.3527 0.3946,0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 774.74046,2248.0646 1.74206,0 c 0.23625,0 0.44066,-0.1575 0.45828,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15825,-0.3525 -0.3945,-0.3525 l -1.74206,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15823,0.3527 0.39448,0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path106319" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106321" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 778.38555,2248.0646 1.74205,0 c 0.23626,0 0.44066,-0.1575 0.45829,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15825,-0.3525 -0.39451,-0.3525 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.45829,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15824,0.3527 0.39449,0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 771.13208,2246.5568 1.74193,0 c 0.23626,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15824,-0.3527 -0.3945,-0.3527 l -1.74204,0 c -0.23626,0 -0.44066,0.1572 -0.4583,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.3946,0.3525 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path106323" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106325" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 774.74046,2246.5568 1.74206,0 c 0.23625,0 0.44066,-0.1572 0.45828,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.3945,-0.3527 l -1.74206,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15823,0.3525 0.39448,0.3525 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 778.38555,2246.5568 1.74205,0 c 0.23626,0 0.44066,-0.1572 0.45829,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.39451,-0.3527 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.45829,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.39449,0.3525 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path106327" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106329" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 782.09146,2246.5568 1.74205,0 c 0.23626,0 0.44066,-0.1572 0.45829,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.39451,-0.3527 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.3945,0.3525 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 785.69996,2246.5568 1.74194,0 c 0.23625,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15824,-0.3527 -0.39449,-0.3527 l -1.74205,0 c -0.23626,0 -0.44066,0.1572 -0.45829,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.39449,0.3525 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path106331" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path106333" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 789.34505,2246.5568 1.74194,0 c 0.23625,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15837,-0.3527 -0.39462,-0.3527 l -1.74194,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15835,0.3525 0.3946,0.3525 z" sodipodi:nodetypes="ssccssccs"/>
+        <g transform="matrix(0.77587723,0,0,1,194.59487,0.99590896)" id="g106335">
+          <path style="fill:url(#linearGradient106450);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53485292;stroke-miterlimit:4;stroke-dasharray:none" d="m 870.95805,2247.1999 c -0.80735,0 -1.45044,2.1197 -1.45624,4.7517 l -0.0867,32.1297 c -0.006,2.633 0.64481,4.7522 1.45217,4.7522 l 5.88614,0 c 0.80736,0 1.45056,-2.1192 1.45623,-4.7522 l 0.0181,-7.7489 -0.90631,-0.3411 -0.26448,-14.8768 1.21888,0.3959 0.0204,-9.5601 c 0.006,-2.6326 -0.64469,-4.7514 -1.45205,-4.7514 l -5.88625,0 z m 3.18973,19.2422 c 0.25682,0.038 0.78758,0.133 0.79746,1.8106 0.01,1.6776 -0.53801,2.2691 -0.79474,2.2365 -0.25694,-0.038 -0.77753,-0.6057 -0.78741,-2.2832 -0.01,-1.6773 0.52796,-1.7963 0.78469,-1.7639 z" id="path106337" inkscape:connector-curvature="0" sodipodi:nodetypes="cccssccccccscccsccc"/>
+          <path style="fill:#808080;fill-opacity:1;stroke:none" d="m 873.5847,2251.4177 1.1865,-0.2024 1.44752,4.67 -0.34521,31.4636 -1.19148,0.3409 -1.67186,-5.5735 0.98558,-0.1394 0.72986,1.3287 0.31319,-26.9823 -1.4541,-4.9056" id="path106339" inkscape:path-effect="#path-effect29991-6-5" inkscape:original-d="m 873.5847,2251.4177 c 0.0657,-2.1656 0.46798,-1.4454 1.1865,-0.2024 l 1.44752,4.67 -0.34521,31.4636 c -0.32422,1.7146 -0.72392,0.7692 -1.19148,0.3409 l -1.67186,-5.5735 c 0.34022,-1.4357 0.42992,-0.7055 0.98558,-0.1394 l 0.72986,1.3287 0.31319,-26.9823 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+          <path style="fill:#4d4d4d;fill-opacity:1;stroke:none" d="m 873.51144,2258.1509 1.08683,2.6281 -0.2553,23.2666 -1.3327,-1.9218 -0.0403,3.7754 1.71873,1.7962 0.37998,-31.5042 -1.48993,-4.7773 -0.0673,6.737" id="path106421" inkscape:path-effect="#path-effect29988-5-5" inkscape:original-d="m 873.51144,2258.1509 1.08683,2.6281 -0.2553,23.2666 -1.3327,-1.9218 -0.0403,3.7754 1.71873,1.7962 0.37998,-31.5042 -1.48993,-4.7773 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
         </g>
-        <g
-           transform="matrix(0.77589221,0,0,1.0001917,167.71934,0.55710916)"
-           id="g106423">
-          <path
-             sodipodi:nodetypes="cccssccccccscccsccc"
-             inkscape:connector-curvature="0"
-             id="path106428"
-             d="m 745.9566,2247.204 c 0.80732,0 1.45041,2.1193 1.45621,4.7508 l 0.0867,32.1233 c 0.006,2.6325 -0.64479,4.7513 -1.45214,4.7513 l -5.88603,0 c -0.80734,0 -1.45053,-2.1188 -1.4562,-4.7513 l -0.0181,-7.7473 0.90629,-0.3411 0.26447,-14.8738 -1.21885,0.3958 -0.0204,-9.5582 c -0.006,-2.6321 0.64468,-4.7505 1.45202,-4.7505 l 5.88614,0 z m -3.18967,19.2384 c -0.25683,0.038 -0.78757,0.133 -0.79745,1.8103 -0.0103,1.6772 0.538,2.2686 0.79472,2.236 0.25694,-0.038 0.77751,-0.6056 0.7874,-2.2827 0.0103,-1.677 -0.52795,-1.796 -0.78467,-1.7636 z"
-             style="fill:url(#linearGradient106452);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53479499;stroke-miterlimit:4;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cccccccccc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 743.33,2251.421 c -0.0657,-2.1652 -0.46797,-1.4451 -1.18649,-0.2024 l -1.44749,4.6691 0.34521,31.4574 c 0.32421,1.7142 0.72391,0.769 1.19146,0.3408 l 1.67182,-5.5724 c -0.34021,-1.4354 -0.42991,-0.7054 -0.98556,-0.1394 l -0.72985,1.3285 -0.31318,-26.977 z"
-             inkscape:path-effect="#path-effect31563-9"
-             id="path106430"
-             d="m 743.33,2251.421 -1.18649,-0.2024 -1.44749,4.6691 0.34521,31.4574 1.19146,0.3408 1.67182,-5.5724 -0.98556,-0.1394 -0.72985,1.3285 -0.31318,-26.977 1.45408,-4.9046"
-             style="fill:#808080;fill-opacity:1;stroke:none" />
-          <path
-             sodipodi:nodetypes="ccccccccc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 743.40325,2258.1529 -1.08681,2.6275 0.2553,23.262 1.33268,-1.9214 0.0403,3.7747 -1.7187,1.7958 -0.37997,-31.498 1.4899,-4.7763 z"
-             inkscape:path-effect="#path-effect31565-1"
-             id="path106432"
-             d="m 743.40325,2258.1529 -1.08681,2.6275 0.2553,23.262 1.33268,-1.9214 0.0403,3.7747 -1.7187,1.7958 -0.37997,-31.498 1.4899,-4.7763 0.0673,6.7357"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+        <g transform="matrix(0.77589221,0,0,1.0001917,167.71934,0.55710916)" id="g106423">
+          <path sodipodi:nodetypes="cccssccccccscccsccc" inkscape:connector-curvature="0" id="path106428" d="m 745.9566,2247.204 c 0.80732,0 1.45041,2.1193 1.45621,4.7508 l 0.0867,32.1233 c 0.006,2.6325 -0.64479,4.7513 -1.45214,4.7513 l -5.88603,0 c -0.80734,0 -1.45053,-2.1188 -1.4562,-4.7513 l -0.0181,-7.7473 0.90629,-0.3411 0.26447,-14.8738 -1.21885,0.3958 -0.0204,-9.5582 c -0.006,-2.6321 0.64468,-4.7505 1.45202,-4.7505 l 5.88614,0 z m -3.18967,19.2384 c -0.25683,0.038 -0.78757,0.133 -0.79745,1.8103 -0.0103,1.6772 0.538,2.2686 0.79472,2.236 0.25694,-0.038 0.77751,-0.6056 0.7874,-2.2827 0.0103,-1.677 -0.52795,-1.796 -0.78467,-1.7636 z" style="fill:url(#linearGradient106452);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53479499;stroke-miterlimit:4;stroke-dasharray:none"/>
+          <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 743.33,2251.421 c -0.0657,-2.1652 -0.46797,-1.4451 -1.18649,-0.2024 l -1.44749,4.6691 0.34521,31.4574 c 0.32421,1.7142 0.72391,0.769 1.19146,0.3408 l 1.67182,-5.5724 c -0.34021,-1.4354 -0.42991,-0.7054 -0.98556,-0.1394 l -0.72985,1.3285 -0.31318,-26.977 z" inkscape:path-effect="#path-effect31563-9" id="path106430" d="m 743.33,2251.421 -1.18649,-0.2024 -1.44749,4.6691 0.34521,31.4574 1.19146,0.3408 1.67182,-5.5724 -0.98556,-0.1394 -0.72985,1.3285 -0.31318,-26.977 1.45408,-4.9046" style="fill:#808080;fill-opacity:1;stroke:none"/>
+          <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 743.40325,2258.1529 -1.08681,2.6275 0.2553,23.262 1.33268,-1.9214 0.0403,3.7747 -1.7187,1.7958 -0.37997,-31.498 1.4899,-4.7763 z" inkscape:path-effect="#path-effect31565-1" id="path106432" d="m 743.40325,2258.1529 -1.08681,2.6275 0.2553,23.262 1.33268,-1.9214 0.0403,3.7747 -1.7187,1.7958 -0.37997,-31.498 1.4899,-4.7763 0.0673,6.7357" style="fill:#4d4d4d;fill-opacity:1;stroke:none"/>
         </g>
       </g>
     </g>
diff --git a/misc/images/svg/elements/Rackmountable_5U_server_3D.svg b/misc/images/svg/elements/Rackmountable_5U_server_3D.svg
index c67a20cbfda..edf28d0db63 100644
--- a/misc/images/svg/elements/Rackmountable_5U_server_3D.svg
+++ b/misc/images/svg/elements/Rackmountable_5U_server_3D.svg
@@ -1,2466 +1,440 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="127.99995"
-   height="52.87624"
-   id="svg145047"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 44">
-  <defs
-     id="defs145049">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-49-0-4-5"
-       id="linearGradient30237-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1471966,0,0,1.1471966,327.95143,-6926.4861)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.36697"
-       y2="7986.2241" />
-    <linearGradient
-       id="linearGradient42443-7-49-0-4-5">
-      <stop
-         id="stop42445-53-90-5-2-2"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-6-8-0-5" />
-      <stop
-         id="stop42449-3-2-0-9-8"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="127.99995" height="52.87624" id="svg145047" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 44">
+  <defs id="defs145049">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-49-0-4-5" id="linearGradient30237-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1471966,0,0,1.1471966,327.95143,-6926.4861)" x1="407.2959" y1="8015.7466" x2="407.36697" y2="7986.2241"/>
+    <linearGradient id="linearGradient42443-7-49-0-4-5">
+      <stop id="stop42445-53-90-5-2-2" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-6-8-0-5"/>
+      <stop id="stop42449-3-2-0-9-8" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       y2="7999.9312"
-       x2="675.54651"
-       y1="8005.3086"
-       x1="675.60059"
-       gradientTransform="matrix(1.1471966,0,-0.03206072,0.87264571,332.33193,-4736.142)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient31399-6"
-       xlink:href="#linearGradient48206-5-00-0-9-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient48206-5-00-0-9-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-3-1-4-7" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-1-2-6-2" />
+    <linearGradient y2="7999.9312" x2="675.54651" y1="8005.3086" x1="675.60059" gradientTransform="matrix(1.1471966,0,-0.03206072,0.87264571,332.33193,-4736.142)" gradientUnits="userSpaceOnUse" id="linearGradient31399-6" xlink:href="#linearGradient48206-5-00-0-9-7" inkscape:collect="always"/>
+    <linearGradient id="linearGradient48206-5-00-0-9-7">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-3-1-4-7"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-1-2-6-2"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-48-4-1-9"
-       id="linearGradient29985-8-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.9846258,0,-0.0538019,0.73061289,-557.14711,-3602.8101)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-48-4-1-9">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-3-6-5-4" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-52-4-8-1" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-48-4-1-9" id="linearGradient29985-8-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.9846258,0,-0.0538019,0.73061289,-557.14711,-3602.8101)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-48-4-1-9">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-3-6-5-4"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-52-4-8-1"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-7-1-8-6"
-       id="linearGradient31581-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1471966,0,0.04925749,2.7706929,-62.652908,-19902.753)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-7-1-8-6">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-20-1-8-9" />
-      <stop
-         id="stop76664-9-25-24-5-2-8"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-1-0-8-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-7-1-8-6" id="linearGradient31581-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1471966,0,0.04925749,2.7706929,-62.652908,-19902.753)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-7-1-8-6">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-20-1-8-9"/>
+      <stop id="stop76664-9-25-24-5-2-8" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-1-0-8-2"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect29991-6-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect29988-5-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-7-1-8-6"
-       id="linearGradient31579-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.147175,0,-0.04925657,2.7701444,1679.5499,-19898.364)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient144648">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop144650" />
-      <stop
-         id="stop144652"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop144654" />
+    <inkscape:path-effect is_visible="true" id="path-effect29991-6-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect29988-5-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-7-1-8-6" id="linearGradient31579-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.147175,0,-0.04925657,2.7701444,1679.5499,-19898.364)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient144648">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop144650"/>
+      <stop id="stop144652" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop144654"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect31563-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect31565-1"
-       is_visible="true" />
+    <inkscape:path-effect effect="spiro" id="path-effect31563-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect31565-1" is_visible="true"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-109.57145"
-     inkscape:cy="117.86672"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="88"
-     inkscape:window-y="116"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata145052">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-109.57145" inkscape:cy="117.86672" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="88" inkscape:window-y="116" inkscape:window-maximized="0"/>
+  <metadata id="metadata145052">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-484.57145,-597.35266)">
-    <g
-       style="display:inline"
-       transform="matrix(0.94319853,0,0,0.94319853,-213.93509,-1509.8716)"
-       id="g31583-2"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rackmountable_5U_server_3D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g106454">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 746.4153,2243.8833 0.14409,45.545 123.54727,0.4011 -0.28626,-45.9692 -33.72854,-9.7343 -56.99171,0 z"
-           style="fill:url(#linearGradient30237-2);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115108-7-5"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path47637-4-5-0-3-0"
-           style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.97012049;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 746.89881,2244.3452 122.43444,0 0,45.3562 -122.43444,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.44391,2276.0072 29.96981,0.051 0.18149,6.6304 -29.90058,-0.049 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44614804"
-           id="path115142-5-8" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115144-8-3"
-           d="m 751.87937,2277.7378 7.64162,0 0,0.769 -7.64162,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path115146-8-9"
-           d="m 770.69271,2277.5973 0,3.4128 3.24598,0 0,-2.9359 0,-0.2524 0,-0.2245 -1.48773,0 0.76069,0.013 -0.0166,0.1088 0,3.1724 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1724 1.01435,0 0.0166,-0.1202 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.9411,2277.7378 7.64163,0 0,0.769 -7.64163,0 z"
-           id="path115148-9-3" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.09565,2279.1797 7.64174,0 0,0.4328 -7.64174,0 z"
-           id="path115150-5-9" />
-        <path
-           id="path115152-7-6"
-           d="m 761.15749,2279.1797 7.64163,0 0,0.4328 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115154-3-7"
-           d="m 752.258,2280.3336 7.64163,0 0,0.4325 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.31984,2280.3336 7.64163,0 0,0.4325 -7.64163,0 z"
-           id="path115156-2-9" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.31215,2281.4392 7.64162,0 0,0.4324 -7.64162,0 z"
-           id="path115158-2-9" />
-        <path
-           id="path115160-2-7"
-           d="m 761.37389,2281.4392 7.64163,0 0,0.4324 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 770.57095,2281.4392 7.64163,0 0,0.4324 -7.64163,0 z"
-           id="path115162-0-6" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.44391,2277.1128 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6095 0.0103,0.043 0.33774,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2689 -0.0362,-2.4322 -0.0196,-0.5306 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04044,-0.011 25.94092,0 0.0176,0.3067 0.0187,0.2359 0.0104,0.3366 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8027 0.21587,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path115164-0-9" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.76481,2277.5769 0,0.4929 2.24726,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4926 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115166-2-3" />
-        <path
-           id="path115168-3-5"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.76492,2281.0139 0,-0.4925 2.24705,0 0.0166,-0.8292 0.54533,0 0,0.8282 0,0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path115170-1-7"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.4461942"
-           d="m 748.77988,2282.8836 29.83384,-0.048 0.18152,6.68 -29.71722,2e-4 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 752.21523,2284.614 7.64164,0 0,0.7691 -7.64164,0 z"
-           id="path115172-6-6"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 771.02858,2284.4736 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1724 -1.06509,0 -0.0166,0.097 -0.69307,0 0,-0.097 0,-3.1724 1.01435,0 0.0166,-0.1203 z"
-           id="path115174-8-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path115176-7-5"
-           d="m 761.27707,2284.614 7.64164,0 0,0.7691 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115178-7-8"
-           d="m 752.43163,2286.0561 7.64162,0 0,0.4327 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.49347,2286.0561 7.64163,0 0,0.4327 -7.64163,0 z"
-           id="path115180-2-2" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.59397,2287.2098 7.64164,0 0,0.4326 -7.64164,0 z"
-           id="path115182-8-5" />
-        <path
-           id="path115184-7-4"
-           d="m 761.65571,2287.2098 7.64174,0 0,0.4326 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115186-9-4"
-           d="m 752.64801,2288.3154 7.64175,0 0,0.4326 -7.64175,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.70986,2288.3154 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path115188-5-1" />
-        <path
-           id="path115190-9-6"
-           d="m 770.90693,2288.3154 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115192-2-1"
-           style="fill:#000000;stroke:none"
-           d="m 748.77988,2283.9892 0.94674,0 c 0,0 0.26299,2.4061 0.39438,3.6094 0.0104,0.044 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0197,-0.5303 -0.0942,-1.2883 -0.0632,-1.6161 2.97917,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05742,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4648 0.0797,3.8028 0.21588,4.9222 -0.84931,-0.015 -1.31874,0.047 -2.14269,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path115194-9-6"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 775.10078,2284.4533 0,0.4929 2.24717,0 0.0166,0.829 0.54533,0 0,-0.8283 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 775.10078,2287.8903 0,-0.4928 2.24717,0 0.0166,-0.8291 0.54522,0 0,0.8284 0,0.4926 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115196-1-3" />
-        <path
-           id="path115198-3-3"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44642299"
-           d="m 748.26435,2262.4471 29.77249,0.051 0.18161,6.6305 -29.93734,-0.049 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 751.46542,2264.1775 7.64163,0 0,0.7691 -7.64163,0 z"
-           id="path115200-0-5"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 770.27877,2264.0371 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1088 0,3.1723 -1.0651,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 z"
-           id="path115202-8-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path115204-1-3"
-           d="m 760.52726,2264.1775 7.64164,0 0,0.7691 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115206-9-2"
-           d="m 751.68182,2265.6196 7.64162,0 0,0.4327 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.74366,2265.6196 7.64162,0 0,0.4327 -7.64162,0 z"
-           id="path115208-2-8" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 751.84416,2266.7733 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path115210-0-2" />
-        <path
-           id="path115213-2-5"
-           d="m 760.90589,2266.7733 7.64175,0 0,0.4326 -7.64175,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115215-4-3"
-           d="m 751.8982,2267.8789 7.64174,0 0,0.4327 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.96004,2267.8789 7.64164,0 0,0.4327 -7.64164,0 z"
-           id="path115217-7-6" />
-        <path
-           id="path115219-5-1"
-           d="m 770.15711,2267.8789 7.64164,0 0,0.4327 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115221-8-8"
-           style="fill:#000000;stroke:none"
-           d="m 748.03007,2263.5527 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6094 0.0104,0.044 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4321 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6163 2.97917,-0.054 23.04033,-0.011 25.94092,0 0.0176,0.3069 0.0186,0.236 0.0104,0.3366 -1.05752,0.012 -25.40066,-0.011 -25.38627,0 0.15178,1.4649 0.0797,3.8028 0.21598,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path115223-1-6"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.35097,2264.0168 0,0.4929 2.24716,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.35107,2267.4539 0,-0.4927 2.24706,0 0.0166,-0.8293 0.54522,0 0,0.8284 0,0.4926 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115225-0-2" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.36605,2269.3244 29.82127,-0.048 0.18134,6.6801 -29.70461,2e-4 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44610023"
-           id="path115227-0-1" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115229-7-4"
-           d="m 751.8014,2271.0549 7.64163,0 0,0.769 -7.64163,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path115231-1-6"
-           d="m 770.61474,2270.9144 0,3.4129 3.24598,0 0,-2.936 0,-0.2523 0,-0.2246 -1.48771,0 0.76078,0.013 -0.0166,0.1086 0,3.1725 -1.06519,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1725 1.01445,0 0.0166,-0.1202 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.86314,2271.0549 7.64173,0 0,0.769 -7.64173,0 z"
-           id="path115233-6-2" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.01779,2272.4968 7.64163,0 0,0.4328 -7.64163,0 z"
-           id="path115235-9-9" />
-        <path
-           id="path115237-3-1"
-           d="m 761.07953,2272.4968 7.64174,0 0,0.4328 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115239-0-5"
-           d="m 752.18014,2273.6506 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.24188,2273.6506 7.64162,0 0,0.4326 -7.64162,0 z"
-           id="path115241-3-0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.23418,2274.7563 7.64163,0 0,0.4325 -7.64163,0 z"
-           id="path115243-7-3" />
-        <path
-           id="path115245-3-6"
-           d="m 761.29603,2274.7563 7.64162,0 0,0.4325 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 770.49299,2274.7563 7.64173,0 0,0.4325 -7.64173,0 z"
-           id="path115247-0-4" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.36605,2270.4299 0.94674,0 c 0,0 0.26299,2.4063 0.39437,3.6096 0.0104,0.043 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.432 -0.0197,-0.5304 -0.0942,-1.2884 -0.0632,-1.6161 2.97907,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3066 0.0187,0.2357 0.0103,0.3363 -1.05752,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4649 0.0797,3.8029 0.21588,4.9222 -0.84931,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path115249-4-9" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.68684,2270.8941 0,0.4928 2.24727,0 0.0166,0.8291 0.54533,0 0,-0.8283 0,-0.4926 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115251-3-2" />
-        <path
-           id="path115253-2-9"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.68695,2274.3311 0,-0.4927 2.24705,0 0.0166,-0.8292 0.54523,0 0,0.8283 0,0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path115303-6-3"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44730246"
-           d="m 778.40169,2262.548 29.98233,-0.048 0.0647,6.7293 -29.85228,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 781.83704,2264.2786 7.64164,0 0,0.7689 -7.64164,0 z"
-           id="path115305-2-4"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.65039,2264.138 0,3.413 3.24608,0 0,-3.413 -1.48782,0 0.76079,0.013 -0.0166,0.1086 0,3.1723 -1.06509,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z"
-           id="path115307-2-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115309-7-0"
-           d="m 790.89888,2264.2786 7.64164,0 0,0.7689 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115311-3-5"
-           d="m 782.05344,2265.7206 7.64173,0 0,0.4327 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.11528,2265.7206 7.64162,0 0,0.4327 -7.64162,0 z"
-           id="path115313-0-9" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.21578,2266.8743 7.64163,0 0,0.4327 -7.64163,0 z"
-           id="path115315-7-6" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115317-3-3"
-           d="m 791.27752,2266.8743 7.64174,0 0,0.4327 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115319-0-4"
-           d="m 782.26993,2267.9799 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.33166,2267.9799 7.64164,0 0,0.4326 -7.64164,0 z"
-           id="path115321-7-2" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115323-3-8"
-           d="m 800.52873,2267.9799 7.64164,0 0,0.4326 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115325-6-8"
-           style="fill:#000000;stroke:none"
-           d="m 778.40169,2263.6537 0.94674,0 c 0,0 0.26299,2.4061 0.39447,3.6094 0.0104,0.043 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04034,-0.011 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40056,-0.011 -25.38617,0 0.15179,1.4651 0.0797,3.8028 0.21588,4.9223 -0.84942,-0.015 -1.72461,0.047 -2.54856,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path115327-4-7"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.54016,2264.1177 0,0.4929 2.24726,0 0.0166,0.8292 0.54532,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.54026,2267.5548 0,-0.4927 2.24716,0 0.0166,-0.8292 0.54523,0 0,0.8284 0,0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115329-6-5" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.55233,2269.4243 29.93614,-0.048 0.0649,6.7297 -29.80626,0 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44695815"
-           id="path115331-7-8" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115333-4-1"
-           d="m 781.97112,2271.1549 7.60477,0 0,0.769 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115335-0-2"
-           d="m 800.69377,2271.0144 0,3.4129 3.23035,0 0,-3.4129 -1.48058,0 0.75717,0.013 -0.0166,0.1086 0,3.1724 -1.06001,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1724 1.00948,0 0.0166,-0.1203 -1.74978,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 790.98927,2271.1549 7.60477,0 0,0.769 -7.60477,0 z"
-           id="path115337-1-5"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.18647,2272.5968 7.60478,0 0,0.4328 -7.60478,0 z"
-           id="path115339-2-7"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115341-4-4"
-           d="m 791.20453,2272.5968 7.60487,0 0,0.4328 -7.60487,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115343-4-4"
-           d="m 782.348,2273.7507 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.36615,2273.7507 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path115345-6-4"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.40183,2274.8563 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path115347-3-4"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115349-4-4"
-           d="m 791.41998,2274.8563 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.57264,2274.8563 7.60486,0 0,0.4325 -7.60486,0 z"
-           id="path115351-5-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.55233,2270.5299 0.9422,0 c 0,0 0.26163,2.4062 0.3925,3.6096 0.0104,0.043 0.33618,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5303 -0.0942,-1.2883 -0.0621,-1.6161 2.96478,-0.054 22.92926,-0.012 25.81586,0 0.0176,0.3067 0.0186,0.2357 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15106,1.4649 0.0787,3.8028 0.21484,4.9221 -0.84517,-0.015 -1.71623,0.047 -2.53624,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path115353-0-9" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.5648,2270.9941 0,0.4928 2.23639,0 0.0166,0.8291 0.54275,0 0,-0.8284 0,-0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115355-2-3" />
-        <path
-           id="path115357-0-0"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.56491,2274.4311 0,-0.4927 2.23628,0 0.0166,-0.8291 0.54265,0 0,0.8282 0,0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.76873,2276.0365 29.80618,-0.048 0.065,6.7295 -29.67685,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44598696"
-           id="path115359-1-7" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115361-6-7"
-           d="m 782.16381,2277.7672 7.55186,0 0,0.769 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115363-9-8"
-           d="m 800.7561,2277.6266 0,3.4129 3.20787,0 0,-3.4129 -1.47032,0 0.75189,0.013 -0.0166,0.1088 0,3.1723 -1.05255,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00244,0 0.0166,-0.1203 -1.73766,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.11911,2277.7672 7.55187,0 0,0.769 -7.55187,0 z"
-           id="path115365-3-7"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.37761,2279.2093 7.55187,0 0,0.4326 -7.55187,0 z"
-           id="path115367-7-3"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115369-9-0"
-           d="m 791.33291,2279.2093 7.55197,0 0,0.4326 -7.55197,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115371-1-3"
-           d="m 782.53799,2280.363 7.55186,0 0,0.4325 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.49339,2280.363 7.55187,0 0,0.4325 -7.55187,0 z"
-           id="path115373-5-8"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.59151,2281.4686 7.55187,0 0,0.4324 -7.55187,0 z"
-           id="path115375-2-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115377-4-5"
-           d="m 791.54682,2281.4686 7.55186,0 0,0.4324 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.63579,2281.4686 7.55186,0 0,0.4324 -7.55186,0 z"
-           id="path115379-4-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.76873,2277.1423 0.93566,0 c 0,0 0.25988,2.4062 0.38982,3.6094 0.0104,0.043 0.3338,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0197,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94408,-0.054 22.76961,-0.011 25.63612,0 0.0166,0.3066 0.0186,0.2358 0.0104,0.3365 -1.04499,0.012 -25.10216,-0.011 -25.08788,0 0.15003,1.4649 0.0787,3.8027 0.2134,4.9223 -0.83948,-0.015 -1.70433,0.047 -2.51864,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path115381-1-0" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.60021,2277.6063 0,0.4929 2.22076,0 0.0166,0.8291 0.53891,0 0,-0.8283 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115383-3-3" />
-        <path
-           id="path115385-4-7"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.60021,2281.0433 0,-0.4925 2.22076,0 0.0166,-0.8292 0.53891,0 0,0.8283 0,0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path115387-6-2"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44537091"
-           d="m 778.91762,2282.9129 29.72384,-0.048 0.0643,6.7294 -29.59495,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 782.29623,2284.6435 7.51552,0 0,0.769 -7.51552,0 z"
-           id="path115389-8-9"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.79896,2284.503 0,3.4129 3.19245,0 0,-3.4129 -1.46328,0 0.74826,0.013 -0.0166,0.1087 0,3.1723 -1.04749,0 -0.0166,0.097 -0.68179,0 0,-0.097 0,-3.1723 0.99768,0 0.0166,-0.1204 -1.72927,0 z"
-           id="path115391-8-7" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115393-7-5"
-           d="m 791.20835,2284.6435 7.51553,0 0,0.769 -7.51553,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115395-0-3"
-           d="m 782.5091,2286.0855 7.51541,0 0,0.4327 -7.51541,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.42122,2286.0855 7.51554,0 0,0.4327 -7.51554,0 z"
-           id="path115397-3-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.66865,2287.2392 7.51552,0 0,0.4326 -7.51552,0 z"
-           id="path115399-4-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115401-4-2"
-           d="m 791.58088,2287.2392 7.51543,0 0,0.4326 -7.51543,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115403-6-1"
-           d="m 782.72187,2288.3447 7.51552,0 0,0.4328 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.6341,2288.3447 7.51542,0 0,0.4328 -7.51542,0 z"
-           id="path115405-7-1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115407-1-3"
-           d="m 800.67928,2288.3447 7.51541,0 0,0.4328 -7.51541,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115409-8-2"
-           style="fill:#000000;stroke:none"
-           d="m 778.91762,2284.0186 0.9311,0 c 0,0 0.25864,2.4061 0.38795,3.6095 0.0103,0.044 0.33215,0.047 0.65001,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6162 2.92998,-0.054 22.65994,-0.012 25.51258,0 0.0166,0.3068 0.0176,0.2358 0.0104,0.3364 -1.04002,0.012 -24.98123,-0.012 -24.96705,0 0.14931,1.4649 0.0776,3.8029 0.21236,4.9223 -0.83533,-0.015 -1.69614,0.047 -2.50642,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path115411-1-5"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.62455,2284.4827 0,0.4929 2.21009,0 0.0166,0.8291 0.53632,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.62455,2287.9198 0,-0.4929 2.20998,0 0.0166,-0.8291 0.53622,0 0,0.8284 0,0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115413-2-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.55075,2262.5239 30.07268,-0.026 -0.24475,6.7074 -29.82793,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327"
-           id="path115463-3-5" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115465-9-1"
-           d="m 811.92201,2264.2545 7.64164,0 0,0.7689 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115467-3-2"
-           d="m 830.73536,2264.1138 0,3.4131 3.24608,0 0,-3.4131 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75827,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 820.98386,2264.2545 7.64163,0 0,0.7689 -7.64163,0 z"
-           id="path115469-1-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.13841,2265.6964 7.64173,0 0,0.4328 -7.64173,0 z"
-           id="path115471-3-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115473-9-6"
-           d="m 821.20025,2265.6964 7.64164,0 0,0.4328 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115475-6-4"
-           d="m 812.30075,2266.8501 7.64164,0 0,0.4328 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.3625,2266.8501 7.64173,0 0,0.4328 -7.64173,0 z"
-           id="path115477-3-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.3549,2267.9558 7.64164,0 0,0.4326 -7.64164,0 z"
-           id="path115479-7-7"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115481-5-0"
-           d="m 821.41665,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.61371,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path115483-2-3"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.48667,2263.6296 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0104,0.043 0.33774,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40055,-0.011 -25.38616,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path115485-0-4" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.62513,2264.0936 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115487-7-0" />
-        <path
-           id="path115489-1-0"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.62524,2267.5307 0,-0.4928 2.24715,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path115491-7-5"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44594821"
-           d="m 808.55075,2269.4001 29.88415,-0.048 -0.12173,6.7296 -29.76242,-0.091 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 812.05609,2271.1308 7.60477,0 0,0.769 -7.60477,0 z"
-           id="path115493-0-3"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.77875,2270.9903 0,3.4128 3.23034,0 0,-3.4128 -1.48058,0 0.75717,0.013 -0.0166,0.1085 0,3.1725 -1.06002,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74988,0 z"
-           id="path115495-6-1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115497-7-0"
-           d="m 821.07424,2271.1308 7.60478,0 0,0.769 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115499-1-6"
-           d="m 812.27145,2272.5727 7.60477,0 0,0.4328 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.2895,2272.5727 7.60488,0 0,0.4328 -7.60488,0 z"
-           id="path115501-7-7" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.43297,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z"
-           id="path115503-5-5" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115505-4-0"
-           d="m 821.45112,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115507-8-0"
-           d="m 812.48681,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.50497,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path115509-1-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115511-7-5"
-           d="m 830.65761,2274.8321 7.60487,0 0,0.4325 -7.60487,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115513-5-4"
-           style="fill:#000000;stroke:none"
-           d="m 808.63732,2270.5058 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33618,0.047 0.65776,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96477,-0.054 22.92924,-0.012 25.81584,0 0.0176,0.3066 0.0186,0.2356 0.0104,0.3365 -1.05244,0.012 -25.27817,-0.012 -25.26388,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53624,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path115515-2-9"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.64978,2270.9699 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.64988,2274.4069 0,-0.4926 2.23629,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115517-1-5" />
-        <path
-           id="path115519-7-6"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44488338"
-           d="m 808.55075,2276.0124 29.82592,-0.048 -0.1224,6.7296 -29.70352,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 812.24878,2277.7431 7.55186,0 0,0.769 -7.55186,0 z"
-           id="path115521-5-4"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.84107,2277.6025 0,3.4129 3.20788,0 0,-3.4129 -1.47032,0 0.75188,0.013 -0.0166,0.1088 0,3.1723 -1.05256,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00245,0 0.0166,-0.1203 -1.73766,0 z"
-           id="path115523-3-8" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115525-1-2"
-           d="m 821.20409,2277.7431 7.55186,0 0,0.769 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115527-0-1"
-           d="m 812.46259,2279.1851 7.55186,0 0,0.4326 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.41789,2279.1851 7.55196,0 0,0.4326 -7.55196,0 z"
-           id="path115529-0-6" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.62296,2280.3388 7.55187,0 0,0.4326 -7.55187,0 z"
-           id="path115531-0-8" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115533-5-3"
-           d="m 821.57837,2280.3388 7.55186,0 0,0.4326 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115535-0-1"
-           d="m 812.67649,2281.4445 7.55186,0 0,0.4324 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.63179,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z"
-           id="path115537-0-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path115539-7-8"
-           d="m 830.72076,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115541-8-4"
-           style="fill:#000000;stroke:none"
-           d="m 808.55075,2277.1182 1.23862,0 c 0,0 0.25987,2.4062 0.38981,3.6094 0.0104,0.043 0.33381,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0196,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94407,-0.054 22.76959,-0.011 25.6361,0 0.0166,0.3066 0.0187,0.2358 0.0104,0.3365 -1.04501,0.012 -25.10217,-0.011 -25.08789,0 0.15003,1.4649 0.0787,3.8027 0.21339,4.9222 -0.83948,-0.015 -2.14031,-0.045 -2.95463,-0.045 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path115543-6-9"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.68519,2277.5822 0,0.4929 2.22076,0 0.0166,0.8291 0.5389,0 0,-0.8283 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.68519,2281.0192 0,-0.4926 2.22076,0 0.0166,-0.8292 0.5389,0 0,0.8284 0,0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115545-4-2" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.55073,2282.8888 29.68383,-0.048 -0.0606,6.7294 -29.62359,0 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44321227"
-           id="path115547-9-0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115549-1-7"
-           d="m 812.3812,2284.6194 7.51552,0 0,0.769 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115551-4-0"
-           d="m 830.88394,2284.4789 0,3.4129 3.19245,0 0,-3.4129 -1.46329,0 0.74827,0.013 -0.0166,0.1087 0,3.1724 -1.04749,0 -0.0166,0.097 -0.68179,0 0,-0.097 0,-3.1724 0.99768,0 0.0166,-0.1203 -1.72927,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.29334,2284.6194 7.51552,0 0,0.769 -7.51552,0 z"
-           id="path115553-8-6"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.59407,2286.0614 7.51542,0 0,0.4327 -7.51542,0 z"
-           id="path115555-0-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115557-8-7"
-           d="m 821.50621,2286.0614 7.51552,0 0,0.4327 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115559-9-0"
-           d="m 812.75362,2287.2151 7.51553,0 0,0.4326 -7.51553,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.66586,2287.2151 7.51542,0 0,0.4326 -7.51542,0 z"
-           id="path115561-9-5"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.80684,2288.3206 7.51552,0 0,0.4327 -7.51552,0 z"
-           id="path115563-7-6"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path115565-9-7"
-           d="m 821.71908,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.76425,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z"
-           id="path115567-9-3"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.55075,2283.9945 1.38294,0 c 0,0 0.25865,2.4061 0.38796,3.6094 0.0104,0.044 0.33215,0.047 0.65001,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5305 -0.0932,-1.2885 -0.0621,-1.6162 2.92999,-0.054 22.65994,-0.012 25.51259,0 0.0166,0.3067 0.0176,0.2357 0.0104,0.3364 -1.04002,0.012 -24.98124,-0.012 -24.96705,0 0.1493,1.4649 0.0776,3.8028 0.21236,4.9223 -0.83534,-0.015 -2.2804,-0.1363 -3.09079,-0.1363 z"
-           style="fill:#000000;stroke:none"
-           id="path115569-9-8" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.70952,2284.4585 0,0.493 2.21009,0 0.0166,0.8291 0.53633,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115571-6-4" />
-        <path
-           id="path115573-0-9"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.70952,2287.8956 0,-0.4928 2.20998,0 0.0166,-0.8291 0.53621,0 0,0.8284 0,0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path31004-7-2"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327"
-           d="m 838.96467,2262.5239 29.83839,-0.026 -0.0105,6.7074 -29.82792,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 842.33593,2264.2545 7.64163,0 0,0.7689 -7.64163,0 z"
-           id="path31006-2-6"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.14927,2264.1138 0,3.4131 3.24609,0 0,-3.4131 -1.48782,0 0.76078,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z"
-           id="path31008-6-5" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31010-0-7"
-           d="m 851.39778,2264.2545 7.64162,0 0,0.7689 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31012-1-7"
-           d="m 842.55232,2265.6964 7.64174,0 0,0.4328 -7.64174,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.61416,2265.6964 7.64164,0 0,0.4328 -7.64164,0 z"
-           id="path31014-6-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.71467,2266.8501 7.64163,0 0,0.4328 -7.64163,0 z"
-           id="path31016-5-5" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31018-7-7"
-           d="m 851.77641,2266.8501 7.64173,0 0,0.4328 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31020-5-9"
-           d="m 842.76882,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.83056,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path31022-4-8" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31024-1-3"
-           d="m 861.02763,2267.9558 7.64162,0 0,0.4326 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31026-2-0"
-           style="fill:#000000;stroke:none"
-           d="m 838.90059,2263.6296 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0103,0.043 0.33773,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0187,0.2358 0.0104,0.3365 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path31028-0-2"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.03905,2264.0936 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.03915,2267.5307 0,-0.4928 2.24716,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31030-0-2" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.96467,2269.4001 29.88414,-0.048 -0.12173,6.7296 -29.76241,-0.091 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44594821"
-           id="path31032-1-3" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path31034-4-6"
-           d="m 842.47001,2271.1308 7.60477,0 0,0.769 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31036-6-7"
-           d="m 861.19266,2270.9903 0,3.4128 3.23035,0 0,-3.4128 -1.48058,0 0.75716,0.013 -0.0166,0.1085 0,3.1725 -1.06001,0 -0.0166,0.097 -0.68977,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74987,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.48816,2271.1308 7.60478,0 0,0.769 -7.60478,0 z"
-           id="path31038-0-1"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.68537,2272.5727 7.60477,0 0,0.4328 -7.60477,0 z"
-           id="path31040-7-5"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31042-1-5"
-           d="m 851.70341,2272.5727 7.60488,0 0,0.4328 -7.60488,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31044-7-4"
-           d="m 842.84688,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.86503,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z"
-           id="path31046-7-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.90073,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path31048-7-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31050-7-6"
-           d="m 851.91888,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.07152,2274.8321 7.60488,0 0,0.4325 -7.60488,0 z"
-           id="path31052-3-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 839.05123,2270.5058 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33619,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96478,-0.054 22.92924,-0.012 25.81585,0 0.0176,0.3066 0.0187,0.2356 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53623,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path31054-3-6" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.0637,2270.9699 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31056-5-1" />
-        <path
-           id="path31058-9-1"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.06379,2274.4069 0,-0.4926 2.2363,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.96467,2276.0124 29.82592,-0.048 -0.1224,6.7296 -29.70352,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44488338"
-           id="path31060-9-1" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path31062-8-7"
-           d="m 842.66269,2277.7431 7.55186,0 0,0.769 -7.55186,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31064-1-3"
-           d="m 861.25499,2277.6025 0,3.4129 3.20788,0 0,-3.4129 -1.47032,0 0.75188,0.013 -0.0166,0.1088 0,3.1723 -1.05256,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00245,0 0.0166,-0.1203 -1.73765,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.618,2277.7431 7.55186,0 0,0.769 -7.55186,0 z"
-           id="path31066-8-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.8765,2279.1851 7.55186,0 0,0.4326 -7.55186,0 z"
-           id="path31068-2-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31070-6-4"
-           d="m 851.8318,2279.1851 7.55197,0 0,0.4326 -7.55197,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31072-6-8"
-           d="m 843.03687,2280.3388 7.55187,0 0,0.4326 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.99229,2280.3388 7.55186,0 0,0.4326 -7.55186,0 z"
-           id="path31074-0-3"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 843.09041,2281.4445 7.55186,0 0,0.4324 -7.55186,0 z"
-           id="path31076-3-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31078-8-1"
-           d="m 852.0457,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.13468,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z"
-           id="path31080-0-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.96467,2277.1182 1.23861,0 c 0,0 0.25988,2.4062 0.38982,3.6094 0.0104,0.043 0.3338,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0196,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94406,-0.054 22.76958,-0.011 25.6361,0 0.0166,0.3066 0.0186,0.2358 0.0104,0.3365 -1.045,0.012 -25.10217,-0.011 -25.08788,0 0.15003,1.4649 0.0787,3.8027 0.21339,4.9222 -0.83948,-0.015 -2.14031,-0.045 -2.95463,-0.045 z"
-           style="fill:#000000;stroke:none"
-           id="path31082-1-9" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.09911,2277.5822 0,0.4929 2.22075,0 0.0166,0.8291 0.5389,0 0,-0.8283 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31084-2-0" />
-        <path
-           id="path31086-5-3"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.09911,2281.0192 0,-0.4926 2.22075,0 0.0166,-0.8292 0.5389,0 0,0.8284 0,0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path31088-0-8"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44321227"
-           d="m 838.96465,2282.8888 29.68383,-0.048 -0.0607,6.7294 -29.62358,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 842.79511,2284.6194 7.51553,0 0,0.769 -7.51553,0 z"
-           id="path31090-9-8"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.29786,2284.4789 0,3.4129 3.19244,0 0,-3.4129 -1.46328,0 0.74826,0.013 -0.0166,0.1087 0,3.1724 -1.04748,0 -0.0166,0.097 -0.6818,0 0,-0.097 0,-3.1724 0.99768,0 0.0166,-0.1203 -1.72927,0 z"
-           id="path31092-4-5" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31094-7-7"
-           d="m 851.70725,2284.6194 7.51552,0 0,0.769 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31096-8-7"
-           d="m 843.00798,2286.0614 7.51543,0 0,0.4327 -7.51543,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.92012,2286.0614 7.51552,0 0,0.4327 -7.51552,0 z"
-           id="path31098-3-0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 843.16753,2287.2151 7.51554,0 0,0.4326 -7.51554,0 z"
-           id="path31100-5-8" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31102-1-9"
-           d="m 852.07978,2287.2151 7.51541,0 0,0.4326 -7.51541,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31104-2-3"
-           d="m 843.22076,2288.3206 7.51552,0 0,0.4327 -7.51552,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 852.13299,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z"
-           id="path31106-0-0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31108-1-7"
-           d="m 861.17816,2288.3206 7.51543,0 0,0.4327 -7.51543,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31110-6-4"
-           style="fill:#000000;stroke:none"
-           d="m 838.96467,2283.9945 1.38294,0 c 0,0 0.25864,2.4061 0.38796,3.6094 0.0104,0.044 0.33214,0.047 0.65,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5305 -0.0932,-1.2885 -0.0621,-1.6162 2.93,-0.054 22.65995,-0.012 25.5126,0 0.0166,0.3067 0.0176,0.2357 0.0104,0.3364 -1.04002,0.012 -24.98124,-0.012 -24.96705,0 0.14929,1.4649 0.0776,3.8028 0.21235,4.9223 -0.83534,-0.015 -2.2804,-0.1363 -3.09078,-0.1363 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path31112-4-7"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.12343,2284.4585 0,0.493 2.2101,0 0.0166,0.8291 0.53632,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.12343,2287.8956 0,-0.4928 2.20999,0 0.0166,-0.8291 0.53622,0 0,0.8284 0,0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31114-0-8" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.03007,2248.9762 30.00677,0.051 0.18161,6.6305 -29.93734,-0.049 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44642299"
-           id="path31116-6-3" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path31118-1-7"
-           d="m 751.46542,2250.7066 7.64163,0 0,0.7691 -7.64163,0 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           id="path31120-8-1"
-           d="m 770.27877,2250.5662 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1088 0,3.1723 -1.0651,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 z"
-           style="fill:#000000;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.52726,2250.7066 7.64164,0 0,0.7691 -7.64164,0 z"
-           id="path31122-9-0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 751.68182,2252.1487 7.64162,0 0,0.4327 -7.64162,0 z"
-           id="path31124-8-0" />
-        <path
-           id="path31126-4-8"
-           d="m 760.74366,2252.1487 7.64162,0 0,0.4327 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31128-1-3"
-           d="m 751.84416,2253.3024 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 760.90589,2253.3024 7.64175,0 0,0.4326 -7.64175,0 z"
-           id="path31130-4-4" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 751.8982,2254.408 7.64174,0 0,0.4327 -7.64174,0 z"
-           id="path31132-3-5" />
-        <path
-           id="path31134-9-0"
-           d="m 760.96004,2254.408 7.64164,0 0,0.4327 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 770.15711,2254.408 7.64164,0 0,0.4327 -7.64164,0 z"
-           id="path31136-8-1" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 748.03007,2250.0818 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6094 0.0104,0.044 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4321 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6163 2.97917,-0.054 23.04033,-0.011 25.94092,0 0.0176,0.3069 0.0186,0.236 0.0104,0.3366 -1.05752,0.012 -25.40066,-0.011 -25.38627,0 0.15178,1.4649 0.0797,3.8028 0.21598,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path31138-8-4" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.35097,2250.5459 0,0.4929 2.24716,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31140-0-5" />
-        <path
-           id="path31142-8-6"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.35107,2253.983 0,-0.4927 2.24706,0 0.0166,-0.8293 0.54522,0 0,0.8284 0,0.4926 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path31144-7-2"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44610023"
-           d="m 748.36605,2255.8535 29.82127,-0.048 0.18134,6.6801 -29.98574,2e-4 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 751.8014,2257.584 7.64163,0 0,0.769 -7.64163,0 z"
-           id="path31146-7-0"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;stroke:none"
-           d="m 770.61474,2257.4435 0,3.4129 3.24598,0 0,-2.936 0,-0.2523 0,-0.2246 -1.48771,0 0.76078,0.013 -0.0166,0.1086 0,3.1725 -1.06519,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1725 1.01445,0 0.0166,-0.1202 z"
-           id="path31148-8-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccccccccccccc" />
-        <path
-           id="path31150-3-5"
-           d="m 760.86314,2257.584 7.64173,0 0,0.769 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31152-8-6"
-           d="m 752.01779,2259.0259 7.64163,0 0,0.4328 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.07953,2259.0259 7.64174,0 0,0.4328 -7.64174,0 z"
-           id="path31154-3-6" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 752.18014,2260.1797 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path31156-7-6" />
-        <path
-           id="path31158-1-7"
-           d="m 761.24188,2260.1797 7.64162,0 0,0.4326 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31160-0-6"
-           d="m 752.23418,2261.2854 7.64163,0 0,0.4325 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 761.29603,2261.2854 7.64162,0 0,0.4325 -7.64162,0 z"
-           id="path31162-7-7" />
-        <path
-           id="path31164-3-7"
-           d="m 770.49299,2261.2854 7.64173,0 0,0.4325 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31166-4-1"
-           style="fill:#000000;stroke:none"
-           d="m 748.36605,2256.959 0.94674,0 c 0,0 0.26299,2.4063 0.39437,3.6096 0.0104,0.043 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.432 -0.0197,-0.5304 -0.0942,-1.2884 -0.0632,-1.6161 2.97907,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3066 0.0187,0.2357 0.0103,0.3363 -1.05752,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4649 0.0797,3.8029 0.21588,4.9222 -0.84931,-0.015 -1.31885,0.047 -2.1428,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path31168-9-9"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 774.68684,2257.4232 0,0.4928 2.24727,0 0.0166,0.8291 0.54533,0 0,-0.8283 0,-0.4926 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 774.68695,2260.8602 0,-0.4927 2.24705,0 0.0166,-0.8292 0.54523,0 0,0.8283 0,0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31170-6-1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.40169,2249.0771 29.98233,-0.048 0.0647,6.7293 -29.85228,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44730246"
-           id="path31172-5-6" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path31174-1-2"
-           d="m 781.83704,2250.8077 7.64164,0 0,0.7689 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31176-0-7"
-           d="m 800.65039,2250.6671 0,3.413 3.24608,0 0,-3.413 -1.48782,0 0.76079,0.013 -0.0166,0.1086 0,3.1723 -1.06509,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 790.89888,2250.8077 7.64164,0 0,0.7689 -7.64164,0 z"
-           id="path31178-9-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.05344,2252.2497 7.64173,0 0,0.4327 -7.64173,0 z"
-           id="path31180-9-7"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31182-6-6"
-           d="m 791.11528,2252.2497 7.64162,0 0,0.4327 -7.64162,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31184-8-5"
-           d="m 782.21578,2253.4034 7.64163,0 0,0.4327 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.27752,2253.4034 7.64174,0 0,0.4327 -7.64174,0 z"
-           id="path31186-3-1"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.26993,2254.509 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path31188-4-3"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31190-8-9"
-           d="m 791.33166,2254.509 7.64164,0 0,0.4326 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.52873,2254.509 7.64164,0 0,0.4326 -7.64164,0 z"
-           id="path31192-4-9"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 778.40169,2250.1828 0.94674,0 c 0,0 0.26299,2.4061 0.39447,3.6094 0.0104,0.043 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04034,-0.011 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40056,-0.011 -25.38617,0 0.15179,1.4651 0.0797,3.8028 0.21588,4.9223 -0.84942,-0.015 -1.72461,0.047 -2.54856,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path31194-9-5" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.54016,2250.6468 0,0.4929 2.24726,0 0.0166,0.8292 0.54532,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31196-9-9" />
-        <path
-           id="path31198-2-2"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.54026,2254.0839 0,-0.4927 2.24716,0 0.0166,-0.8292 0.54523,0 0,0.8284 0,0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path31200-5-6"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44695815"
-           d="m 778.55233,2255.9534 29.93614,-0.048 0.0649,6.7297 -29.80626,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 781.97112,2257.684 7.60477,0 0,0.769 -7.60477,0 z"
-           id="path31202-5-5"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 800.69377,2257.5435 0,3.4129 3.23035,0 0,-3.4129 -1.48058,0 0.75717,0.013 -0.0166,0.1086 0,3.1724 -1.06001,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1724 1.00948,0 0.0166,-0.1203 -1.74978,0 z"
-           id="path31204-3-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31206-3-2"
-           d="m 790.98927,2257.684 7.60477,0 0,0.769 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31208-3-4"
-           d="m 782.18647,2259.1259 7.60478,0 0,0.4328 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.20453,2259.1259 7.60487,0 0,0.4328 -7.60487,0 z"
-           id="path31210-7-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 782.348,2260.2798 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path31212-4-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31214-3-2"
-           d="m 791.36615,2260.2798 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31216-8-7"
-           d="m 782.40183,2261.3854 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 791.41998,2261.3854 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path31218-0-9" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31220-8-2"
-           d="m 800.57264,2261.3854 7.60486,0 0,0.4325 -7.60486,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31222-8-3"
-           style="fill:#000000;stroke:none"
-           d="m 778.55233,2257.059 0.9422,0 c 0,0 0.26163,2.4062 0.3925,3.6096 0.0104,0.043 0.33618,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5303 -0.0942,-1.2883 -0.0621,-1.6161 2.96478,-0.054 22.92926,-0.012 25.81586,0 0.0176,0.3067 0.0186,0.2357 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15106,1.4649 0.0787,3.8028 0.21484,4.9221 -0.84517,-0.015 -1.71623,0.047 -2.53624,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path31224-0-7"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 804.5648,2257.5232 0,0.4928 2.23639,0 0.0166,0.8291 0.54275,0 0,-0.8284 0,-0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 804.56491,2260.9602 0,-0.4927 2.23628,0 0.0166,-0.8291 0.54265,0 0,0.8282 0,0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31226-6-3" />
-        <path
-           id="path31228-8-1"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327"
-           d="m 808.55075,2249.053 30.07268,-0.026 -0.24475,6.7074 -29.82793,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 811.92201,2250.7836 7.64164,0 0,0.7689 -7.64164,0 z"
-           id="path31230-1-5"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.73536,2250.6429 0,3.4131 3.24608,0 0,-3.4131 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75827,0 z"
-           id="path31232-9-7" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31234-8-8"
-           d="m 820.98386,2250.7836 7.64163,0 0,0.7689 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31236-9-5"
-           d="m 812.13841,2252.2255 7.64173,0 0,0.4328 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.20025,2252.2255 7.64164,0 0,0.4328 -7.64164,0 z"
-           id="path31238-7-8" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.30075,2253.3792 7.64164,0 0,0.4328 -7.64164,0 z"
-           id="path31240-2-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31242-2-2"
-           d="m 821.3625,2253.3792 7.64173,0 0,0.4328 -7.64173,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31244-8-4"
-           d="m 812.3549,2254.4849 7.64164,0 0,0.4326 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.41665,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path31246-2-1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31248-8-1"
-           d="m 830.61371,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31250-9-5"
-           style="fill:#000000;stroke:none"
-           d="m 808.48667,2250.1587 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0104,0.043 0.33774,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40055,-0.011 -25.38616,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path31252-0-9"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.62513,2250.6227 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.62524,2254.0598 0,-0.4928 2.24715,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31254-7-5" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.55075,2255.9292 29.88415,-0.048 -0.12173,6.7296 -29.76242,-0.091 z"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44594821"
-           id="path31256-8-1" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path31258-1-0"
-           d="m 812.05609,2257.6599 7.60477,0 0,0.769 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31260-5-6"
-           d="m 830.77875,2257.5194 0,3.4128 3.23034,0 0,-3.4128 -1.48058,0 0.75717,0.013 -0.0166,0.1085 0,3.1725 -1.06002,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74988,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.07424,2257.6599 7.60478,0 0,0.769 -7.60478,0 z"
-           id="path31262-8-4"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.27145,2259.1018 7.60477,0 0,0.4328 -7.60477,0 z"
-           id="path31264-6-5"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31266-1-3"
-           d="m 821.2895,2259.1018 7.60488,0 0,0.4328 -7.60488,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31268-2-0"
-           d="m 812.43297,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 821.45112,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z"
-           id="path31270-4-8"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 812.48681,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path31272-2-9"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31274-5-1"
-           d="m 821.50497,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 830.65761,2261.3612 7.60487,0 0,0.4325 -7.60487,0 z"
-           id="path31276-8-3"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 808.63732,2257.0349 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33618,0.047 0.65776,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96477,-0.054 22.92924,-0.012 25.81584,0 0.0176,0.3066 0.0186,0.2356 0.0104,0.3365 -1.05244,0.012 -25.27817,-0.012 -25.26388,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53624,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path31278-6-4" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 834.64978,2257.499 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31280-2-7" />
-        <path
-           id="path31282-6-4"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 834.64988,2260.936 0,-0.4926 2.23629,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.96467,2249.053 29.74135,-0.026 0.0866,6.7074 -29.82792,0 z"
-           style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327"
-           id="path31284-5-6" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path31286-3-3"
-           d="m 842.33593,2250.7836 7.64163,0 0,0.7689 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31288-9-6"
-           d="m 861.14927,2250.6429 0,3.4131 3.24609,0 0,-3.4131 -1.48782,0 0.76078,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.39778,2250.7836 7.64162,0 0,0.7689 -7.64162,0 z"
-           id="path31290-2-5"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.55232,2252.2255 7.64174,0 0,0.4328 -7.64174,0 z"
-           id="path31292-4-2"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31294-6-8"
-           d="m 851.61416,2252.2255 7.64164,0 0,0.4328 -7.64164,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31296-1-1"
-           d="m 842.71467,2253.3792 7.64163,0 0,0.4328 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.77641,2253.3792 7.64173,0 0,0.4328 -7.64173,0 z"
-           id="path31298-8-0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.76882,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z"
-           id="path31300-2-3"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path31302-1-1"
-           d="m 851.83056,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.02763,2254.4849 7.64162,0 0,0.4326 -7.64162,0 z"
-           id="path31304-1-5"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccsssccccccc"
-           inkscape:connector-curvature="0"
-           d="m 838.90059,2250.1587 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0103,0.043 0.33773,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0187,0.2358 0.0104,0.3365 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z"
-           style="fill:#000000;stroke:none"
-           id="path31306-9-5" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.03905,2250.6227 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31308-7-2" />
-        <path
-           id="path31310-6-2"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.03915,2254.0598 0,-0.4928 2.24716,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           id="path31312-2-1"
-           style="fill:#808080;stroke:#000000;stroke-width:0.44594821"
-           d="m 838.96467,2255.9292 29.88414,-0.048 -0.12173,6.7296 -29.76241,-0.091 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#000000;stroke:none"
-           d="m 842.47001,2257.6599 7.60477,0 0,0.769 -7.60477,0 z"
-           id="path31314-9-7"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 861.19266,2257.5194 0,3.4128 3.23035,0 0,-3.4128 -1.48058,0 0.75716,0.013 -0.0166,0.1085 0,3.1725 -1.06001,0 -0.0166,0.097 -0.68977,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74987,0 z"
-           id="path31316-5-4" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31318-2-8"
-           d="m 851.48816,2257.6599 7.60478,0 0,0.769 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31320-0-2"
-           d="m 842.68537,2259.1018 7.60477,0 0,0.4328 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.70341,2259.1018 7.60488,0 0,0.4328 -7.60488,0 z"
-           id="path31322-0-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 842.84688,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z"
-           id="path31324-3-6" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31326-9-3"
-           d="m 851.86503,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31328-1-0"
-           d="m 842.90073,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           style="fill:#000000;stroke:none"
-           d="m 851.91888,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z"
-           id="path31330-8-3" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path31332-1-5"
-           d="m 861.07152,2261.3612 7.60488,0 0,0.4325 -7.60488,0 z"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path31334-9-2"
-           style="fill:#000000;stroke:none"
-           d="m 839.05123,2257.0349 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33619,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96478,-0.054 22.92924,-0.012 25.81585,0 0.0176,0.3066 0.0187,0.2356 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53623,0.047 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssccccccc" />
-        <path
-           id="path31336-5-8"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 865.0637,2257.499 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           d="m 865.06379,2260.936 0,-0.4926 2.2363,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z"
-           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path31338-3-0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 834.13554,2244.9202 34.55518,0 -0.12351,3.3621 -34.55519,0 z"
-           style="fill:url(#linearGradient31399-6);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47515267"
-           id="path115118-6-7" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 864.91226,2245.2773 0.47657,0 c 0.1074,0 0.18775,0.011 0.24076,0.021 0.071,0.018 0.12797,0.051 0.17038,0.098 0.0424,0.047 0.0689,0.1049 0.0806,0.1729 0.0117,0.069 0,0.1521 -0.0202,0.252 -0.0212,0.088 -0.053,0.1635 -0.0954,0.2271 -0.052,0.077 -0.11302,0.1404 -0.18479,0.1884 -0.0541,0.036 -0.12235,0.066 -0.2042,0.085 -0.0615,0.015 -0.14016,0.022 -0.23643,0.022 l -0.49067,0 z m 0.21617,0.1805 -0.1742,0.7066 0.19467,0 c 0.0731,0 0.12616,0 0.1602,-0.011 0.0445,-0.011 0.0827,-0.024 0.1162,-0.044 0.0329,-0.021 0.0647,-0.055 0.0933,-0.1039 0.0297,-0.048 0.0541,-0.1128 0.0742,-0.1953 0.0202,-0.083 0.0276,-0.1458 0.0202,-0.19 -0.0106,-0.044 -0.0233,-0.079 -0.0488,-0.1028 -0.0254,-0.025 -0.0615,-0.041 -0.10836,-0.05 -0.035,-0.011 -0.10497,-0.011 -0.21151,-0.011 z m -1.35412,0.8863 -0.19846,-1.0668 0.28276,0 0.13209,0.7896 0.51104,-0.7896 0.2766,0 -0.72561,1.0668 z m -1.37108,-1.0668 0.47669,0 c 0.1074,0 0.18775,0.011 0.24067,0.021 0.071,0.018 0.12806,0.051 0.17047,0.098 0.0424,0.047 0.0689,0.1049 0.0806,0.1729 0.0117,0.069 0,0.1521 -0.0202,0.252 -0.0212,0.088 -0.053,0.1635 -0.0954,0.2271 -0.052,0.077 -0.11312,0.1404 -0.18479,0.1884 -0.0541,0.036 -0.12235,0.066 -0.20432,0.085 -0.0615,0.015 -0.14004,0.022 -0.23631,0.022 l -0.49067,0 z m 0.2163,0.1805 -0.17431,0.7066 0.19477,0 c 0.0731,0 0.12616,0 0.1602,-0.011 0.0445,-0.011 0.0827,-0.024 0.1162,-0.044 0.0329,-0.021 0.0647,-0.055 0.0933,-0.1039 0.0297,-0.048 0.0541,-0.1128 0.0742,-0.1953 0.0202,-0.083 0.0276,-0.1458 0.0202,-0.19 -0.0106,-0.044 -0.0233,-0.079 -0.0488,-0.1028 -0.0255,-0.025 -0.0615,-0.041 -0.10825,-0.05 -0.035,-0.011 -0.10496,-0.011 -0.21152,-0.011 z"
-           style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-           id="path115120-2-2" />
-        <path
-           style="fill:#ffffff;stroke:none"
-           d="m 864.01307,2246.6725 c -1.1832,0 -2.14239,0.1318 -2.14239,0.2952 0,0.1633 0.95919,0.2952 2.14239,0.2952 1.18333,0 2.1425,-0.1319 2.1425,-0.2952 0,-0.1634 -0.95917,-0.2952 -2.1425,-0.2952 z m 0,0.2134 c 0.33217,0 0.60148,0.037 0.60148,0.082 0,0.046 -0.26931,0.082 -0.60148,0.082 -0.33206,0 -0.60135,-0.037 -0.60135,-0.082 0,-0.046 0.26929,-0.082 0.60135,-0.082 z"
-           id="path115122-8-2"
-           inkscape:connector-curvature="0" />
-        <text
-           xml:space="preserve"
-           style="font-size:0.70121336px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-           x="848.68781"
-           y="2286.3989"
-           id="text115124-8-5"
-           sodipodi:linespacing="125%"
-           transform="scale(1.0170762,0.9832105)"><tspan
-             sodipodi:role="line"
-             id="tspan115126-1-9"
-             x="848.68781"
-             y="2286.3989">ROM</tspan></text>
-        <path
-           inkscape:connector-curvature="0"
-           d="m 852.11749,2245.5239 c 0,0 -0.10603,0 -0.10603,0 0,0 0,-0.1313 0,-0.1313 0,0 0.10942,0 0.10942,0 0.053,0 0.0795,0.021 0.0795,0.062 0,0.047 -0.0276,0.069 -0.0827,0.069 z m 0.84171,0.066 c -0.0148,0.073 -0.0541,0.1094 -0.11705,0.1094 -0.088,0 -0.13211,-0.053 -0.13211,-0.1605 0,-0.105 0.0445,-0.1569 0.13211,-0.1569 0.0625,0 0.10072,0.026 0.11323,0.081 0,0 0.053,0 0.053,0 -0.018,-0.085 -0.0732,-0.1276 -0.16614,-0.1276 -0.12584,0 -0.18872,0.068 -0.18872,0.2043 0,0.1363 0.0604,0.2044 0.1812,0.2044 0.10284,0 0.16232,-0.051 0.17748,-0.1533 0,0 -0.053,0 -0.053,0 z m -1.78923,-0.2554 c -0.13084,0 -0.19625,0.068 -0.19625,0.2043 0,0.1363 0.0657,0.2044 0.19625,0.2044 0.13093,0 0.19635,-0.068 0.19635,-0.2044 0,-0.1363 -0.0657,-0.2043 -0.19635,-0.2043 z m -0.3169,0.2554 c -0.0127,0.073 -0.0509,0.1094 -0.11334,0.1094 -0.0901,0 -0.13582,-0.053 -0.13582,-0.1605 0,-0.105 0.0435,-0.1569 0.13211,-0.1569 0.0625,0 0.10072,0.026 0.11323,0.081 0,0 0.053,0 0.053,0 -0.0106,-0.085 -0.0657,-0.1276 -0.16603,-0.1276 -0.12331,0 -0.18501,0.068 -0.18501,0.2043 0,0.1363 0.0594,0.2044 0.17737,0.2044 0.10286,0 0.16232,-0.051 0.17749,-0.1533 0,0 -0.053,0 -0.053,0 z m 2.51378,-0.2445 c 0,0 -0.32453,0 -0.32453,0 0,0 0,0.048 0,0.048 0,0 0.13581,0 0.13581,0 0,0 0,0.343 0,0.343 0,0 0.053,0 0.053,0 0,0 0,-0.343 0,-0.343 0,0 0.13592,0 0.13592,0 0,0 0,-0.048 0,-0.048 z m -0.87945,0 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.15086,0.3905 -0.15086,0.3905 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1132 0.0413,-0.1132 0,0 0.16232,0 0.16232,0 0,0 0.0382,0.1132 0.0382,0.1132 0,0 0.0604,0 0.0604,0 0,0 -0.14727,-0.3905 -0.14727,-0.3905 z m -0.35104,0 c 0,0 -0.17738,0 -0.17738,0 0,0 0,0.3905 0,0.3905 0,0 0.053,0 0.053,0 0,0 0,-0.1643 0,-0.1643 0,0 0.12458,0 0.12458,0 0.0806,0 0.12076,-0.039 0.12076,-0.1168 0,-0.073 -0.0403,-0.1094 -0.12076,-0.1094 z m -0.29443,0 c 0,0 -0.0753,0 -0.0753,0 0,0 -0.11705,0.3284 -0.11705,0.3284 0,0 -0.11323,-0.3284 -0.11323,-0.3284 0,0 -0.0795,0 -0.0795,0 0,0 0,0.3905 0,0.3905 0,0 0.053,0 0.053,0 0,0 0,-0.3248 0,-0.3248 0,0 0.11323,0.3248 0.11323,0.3248 0,0 0.053,0 0.053,0 0,0 0.11704,-0.3285 0.11704,-0.3285 0,0 0,0.099 0,0.099 0,0 0,0.23 0,0.23 0,0 0.053,0 0.053,0 0,0 0,-0.3905 0,-0.3905 z m -1.51739,0.069 c 0,-0.03 -0.0148,-0.044 -0.0456,-0.044 0,0 -0.41136,0 -0.41136,0 -0.0297,0 -0.0456,0.015 -0.0456,0.044 0,0 0,0.4123 0,0.4123 0,0.019 -0.0106,0.03 -0.0297,0.03 0,0 -0.37744,0 -0.37744,0 -0.0784,0 -0.14217,0.024 -0.19253,0.075 -0.0509,0.05 -0.0753,0.1125 -0.0753,0.188 0,0 0,0.9085 0,0.9085 0,0.073 0.0255,0.135 0.0774,0.1861 0.052,0.051 0.11502,0.076 0.19063,0.076 0,0 0.86429,0 0.86429,0 0.0308,0 0.0456,-0.016 0.0456,-0.048 0,0 0,-1.8282 0,-1.8282 z m 3.13667,1.2734 c 0,-0.032 -0.0148,-0.048 -0.0456,-0.048 0,0 -0.37733,0 -0.37733,0 -0.0329,0 -0.0488,0.016 -0.0488,0.048 0,0 0,0.2117 0,0.2117 0,0.06 -0.0297,0.091 -0.0912,0.091 -0.0625,0 -0.0944,-0.031 -0.0944,-0.091 0,0 0,-0.6494 0,-0.6494 0,-0.061 0.0318,-0.091 0.0944,-0.091 0.0604,0 0.0912,0.031 0.0912,0.091 0,0 0,0.1714 0,0.1714 0,0.03 0.0159,0.043 0.0488,0.043 0,0 0.37733,0 0.37733,0 0.0308,0 0.0456,-0.015 0.0456,-0.043 0,0 0,-0.3028 0,-0.3028 0,-0.073 -0.0265,-0.1351 -0.0795,-0.1861 -0.053,-0.051 -0.11704,-0.076 -0.19253,-0.076 0,0 -0.58122,0 -0.58122,0 -0.0753,0 -0.13973,0.025 -0.19264,0.076 -0.053,0.051 -0.0795,0.1132 -0.0795,0.1861 0,0 0,0.9049 0,0.9049 0,0.075 0.0254,0.1387 0.0774,0.1898 0.052,0.051 0.11641,0.076 0.19445,0.076 0,0 0.58121,0 0.58121,0 0.0774,0 0.14271,-0.025 0.19434,-0.076 0.052,-0.051 0.0774,-0.1144 0.0774,-0.1898 0,0 0,-0.3358 0,-0.3358 z m -1.24936,-0.076 c 0,-0.073 -0.0265,-0.135 -0.0795,-0.1861 -0.053,-0.051 -0.11705,-0.076 -0.19254,-0.076 0,0 -0.35114,0 -0.35114,0 -0.0382,0 -0.0562,-0.018 -0.0562,-0.055 0,-0.039 0.0191,-0.058 0.0562,-0.058 0,0 0.52852,0 0.52852,0 0.0297,0 0.0456,-0.015 0.0456,-0.043 0,0 0,-0.2919 0,-0.2919 0,-0.03 -0.0149,-0.043 -0.0456,-0.043 0,0 -0.74735,0 -0.74735,0 -0.0753,0 -0.13974,0.025 -0.19254,0.076 -0.053,0.051 -0.0795,0.1131 -0.0795,0.186 0,0 0,0.3867 0,0.3867 0,0.073 0.0265,0.1351 0.0795,0.1862 0.053,0.051 0.11694,0.076 0.19254,0.076 0,0 0.35104,0 0.35104,0 0.0477,0 0.0721,0.024 0.0721,0.073 0,0.043 -0.0244,0.066 -0.0721,0.066 0,0 -0.57761,0 -0.57761,0 -0.0297,0 -0.0456,0.016 -0.0456,0.048 0,0 0,0.2884 0,0.2884 0,0.032 0.0148,0.048 0.0456,0.048 0,0 0.79654,0 0.79654,0 0.0774,0 0.14271,-0.025 0.19434,-0.076 0.052,-0.051 0.0774,-0.1144 0.0774,-0.1898 0,0 0,-0.4124 0,-0.4124 z m 1.14376,1.2225 c 0,0 -0.24173,0 -0.24173,0 0,0 0,-0.1313 0,-0.1313 0,0 0.21894,0 0.21894,0 0,0 0,-0.043 0,-0.043 0,0 -0.21894,0 -0.21894,0 0,0 0,-0.1203 0,-0.1203 0,0 0.23792,0 0.23792,0 0,0 0,-0.048 0,-0.048 0,0 -0.29072,0 -0.29072,0 0,0 0,0.3867 0,0.3867 0,0 0.29453,0 0.29453,0 0,0 0,-0.043 0,-0.043 z m -0.3926,-0.1606 c 0,0 -0.17748,0 -0.17748,0 0,0 0,0.044 0,0.044 0,0 0.12468,0 0.12468,0 0,0.085 -0.0413,0.1276 -0.12468,0.1276 -0.088,0 -0.1321,-0.053 -0.1321,-0.1605 0,-0.1049 0.0445,-0.1569 0.1321,-0.1569 0.0657,0 0.10496,0.026 0.11705,0.081 0,0 0.053,0 0.053,0 -0.0106,-0.085 -0.0668,-0.1277 -0.16985,-0.1277 -0.12584,0 -0.18872,0.068 -0.18872,0.2043 0,0.068 0.018,0.1193 0.0551,0.1533 0.036,0.034 0.0795,0.051 0.13019,0.051 0.0604,0 0.10496,-0.021 0.13221,-0.062 0,0 0.0148,0.051 0.0148,0.051 0,0 0.0339,0 0.0339,0 0,0 0,-0.2043 0,-0.2043 z m -0.52841,-0.1824 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.1548,0.3867 -0.1548,0.3867 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16222,0 0.16222,0 0,0 0.0413,0.1094 0.0413,0.1094 0,0 0.0562,0 0.0562,0 0,0 -0.14345,-0.3867 -0.14345,-0.3867 z m -0.22657,0.3794 c -0.0127,0 -0.0191,-0.018 -0.0191,-0.04 0,0 0,-0.069 0,-0.069 0,-0.032 -0.0191,-0.056 -0.0488,-0.073 0.0382,-0.019 0.0562,-0.05 0.0562,-0.091 0,-0.07 -0.0445,-0.1061 -0.13221,-0.1061 0,0 -0.18862,0 -0.18862,0 0,0 0,0.3868 0,0.3868 0,0 0.0562,0 0.0562,0 0,0 0,-0.1642 0,-0.1642 0,0 0.13199,0 0.13199,0 0.0456,0 0.0689,0.023 0.0721,0.069 0,0 0.0106,0.094 0.0106,0.094 0,0 0.0679,-0.011 0.0679,-0.011 z m -0.58503,-0.3904 c -0.13083,0 -0.19625,0.068 -0.19625,0.2043 0,0.058 0.018,0.1071 0.053,0.146 0.035,0.039 0.0827,0.058 0.14345,0.058 0.13083,0 0.19625,-0.068 0.19625,-0.2044 0,-0.1362 -0.0657,-0.2043 -0.19625,-0.2043 z m -0.19625,0.011 c 0,0 -0.32846,0 -0.32846,0 0,0 0,0.048 0,0.048 0,0 0.13974,0 0.13974,0 0,0 0,0.3393 0,0.3393 0,0 0.053,0 0.053,0 0,0 0,-0.3393 0,-0.3393 0,0 0.13592,0 0.13592,0 0,0 0,-0.048 0,-0.048 z m -0.43024,0.1752 c 0,0 -0.11333,-0.025 -0.11333,-0.025 -0.0329,-0.011 -0.0488,-0.023 -0.0488,-0.048 0,-0.047 0.0307,-0.069 0.0901,-0.069 0.0679,0 0.10179,0.026 0.10179,0.081 0,0 0.0488,0 0.0488,0 0,-0.083 -0.052,-0.1241 -0.1548,-0.1241 -0.0933,0 -0.13963,0.04 -0.13963,0.1204 0,0.049 0.0286,0.08 0.0869,0.091 0,0 0.0795,0.018 0.0795,0.018 0.0583,0.013 0.0869,0.035 0.0869,0.069 0,0.044 -0.035,0.066 -0.10602,0.066 -0.0731,0 -0.10941,-0.031 -0.10941,-0.091 0,0 -0.0488,0 -0.0488,0 0,0.09 0.053,0.1351 0.1585,0.1351 0.10602,0 0.1585,-0.039 0.1585,-0.1168 0,-0.056 -0.0297,-0.091 -0.0901,-0.106 z m -0.60411,-0.1752 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.15109,0.3868 -0.15109,0.3868 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16243,0 0.16243,0 0,0 0.0371,0.1094 0.0371,0.1094 0,0 0.0604,0 0.0604,0 0,0 -0.14726,-0.3868 -0.14726,-0.3868 z m -0.13963,0 c 0,0 -0.32835,0 -0.32835,0 0,0 0,0.048 0,0.048 0,0 0.13963,0 0.13963,0 0,0 0,0.3393 0,0.3393 0,0 0.0562,0 0.0562,0 0,0 0,-0.3393 0,-0.3393 0,0 0.13209,0 0.13209,0 0,0 0,-0.048 0,-0.048 z m -0.43024,0 c 0,0 -0.0647,0 -0.0647,0 0,0 -0.15098,0.3868 -0.15098,0.3868 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16232,0 0.16232,0 0,0 0.0413,0.1094 0.0413,0.1094 0,0 0.0604,0 0.0604,0 0,0 -0.14726,-0.3868 -0.14726,-0.3868 z m -0.41518,0 c 0,0 -0.16614,0 -0.16614,0 0,0 0,0.3868 0,0.3868 0,0 0.16232,0 0.16232,0 0.11323,0 0.16985,-0.066 0.16985,-0.1971 0,-0.1265 -0.0551,-0.1897 -0.16603,-0.1897 z m 2.98187,-1.9156 c 0,0 0.0679,-0.1715 0.0679,-0.1715 0,0 0.0562,0.1715 0.0562,0.1715 0,0 -0.12458,0 -0.12458,0 z m -1.21925,0.124 c -0.0933,0 -0.13964,-0.053 -0.13964,-0.1606 0,-0.1049 0.0466,-0.1569 0.13964,-0.1569 0.0933,0 0.13973,0.052 0.13973,0.1569 0,0.1071 -0.0466,0.1606 -0.13973,0.1606 z m -0.95484,1.5071 c 0,0 -0.80026,0 -0.80026,0 -0.053,0 -0.0965,-0.017 -0.1321,-0.051 -0.035,-0.034 -0.053,-0.076 -0.053,-0.1278 0,0 0,-0.9085 0,-0.9085 0,-0.051 0.018,-0.093 0.053,-0.1277 0.035,-0.034 0.0795,-0.051 0.1321,-0.051 0,0 0.4454,0 0.4454,0 0.0297,0 0.0456,-0.016 0.0456,-0.048 0,0 0,-0.4125 0,-0.4125 0,-0.019 0.0106,-0.03 0.0297,-0.03 0,0 0.27937,0 0.27937,0 0.018,0.017 0.0265,0.027 0.0265,0.03 0,0 0,1.7005 0,1.7005 0,0 -0.0106,0.014 -0.0265,0.026 z m 3.10825,-0.053 c -0.036,0.035 -0.0816,0.053 -0.1339,0.053 0,0 -0.58122,0 -0.58122,0 -0.053,0 -0.0986,-0.018 -0.13602,-0.053 -0.0371,-0.035 -0.0562,-0.079 -0.0562,-0.1296 0,0 0,-0.9049 0,-0.9049 0,-0.051 0.0191,-0.093 0.0562,-0.1278 0.0371,-0.034 0.0827,-0.051 0.13602,-0.051 0,0 0.58122,0 0.58122,0 0.0551,0 0.10072,0.017 0.13592,0.05 0.035,0.033 0.053,0.076 0.053,0.1295 0,0 0,0.2408 0,0.2408 0,0.017 -0.0106,0.026 -0.0265,0.026 0,0 -0.24915,0 -0.24915,0 -0.018,0 -0.0265,-0.011 -0.0265,-0.026 0,0 0,-0.1094 0,-0.1094 0,-0.049 -0.017,-0.089 -0.0509,-0.1222 -0.0339,-0.033 -0.0763,-0.049 -0.12648,-0.049 -0.0498,0 -0.0922,0.016 -0.12638,0.049 -0.0339,0.033 -0.0509,0.073 -0.0509,0.1222 0,0 0,0.6494 0,0.6494 0,0.049 0.017,0.089 0.0509,0.1223 0.0339,0.033 0.0763,0.049 0.12638,0.049 0.0509,0 0.0922,-0.016 0.12648,-0.049 0.0339,-0.033 0.0509,-0.074 0.0509,-0.1223 0,0 0,-0.1532 0,-0.1532 0,-0.017 0.0106,-0.026 0.0265,-0.026 0,0 0.24915,0 0.24915,0 0,0 0.0138,0.011 0.0265,0.026 0,0 0,0.2773 0,0.2773 0,0.051 -0.018,0.094 -0.0551,0.1296 z m -1.24936,0 c -0.036,0.035 -0.0806,0.053 -0.13391,0.053 0,0 -0.72848,0 -0.72848,0 -0.0201,0 -0.0297,-0.011 -0.0297,-0.026 0,0 0,-0.1642 0,-0.1642 0,-0.017 0.0106,-0.026 0.0297,-0.026 0,0 0.50954,0 0.50954,0 0.0424,0 0.0795,-0.015 0.10942,-0.043 0.0297,-0.03 0.0456,-0.065 0.0456,-0.106 0,-0.044 -0.0148,-0.081 -0.0435,-0.1095 -0.0286,-0.03 -0.0657,-0.043 -0.11132,-0.043 0,0 -0.35104,0 -0.35104,0 -0.053,0 -0.0975,-0.018 -0.13412,-0.053 -0.0361,-0.035 -0.0551,-0.079 -0.0551,-0.1297 0,0 0,-0.3867 0,-0.3867 0,-0.051 0.018,-0.093 0.0551,-0.1277 0.036,-0.034 0.0816,-0.051 0.13412,-0.051 0,0 0.67939,0 0.67939,0 0.018,0 0.0265,0.011 0.0265,0.025 0,0 0,0.1606 0,0.1606 0,0.019 -0.0106,0.03 -0.0265,0.03 0,0 -0.46056,0 -0.46056,0 -0.0933,0 -0.13963,0.047 -0.13963,0.1387 0,0.036 0.0138,0.068 0.0413,0.095 0.0276,0.026 0.0604,0.04 0.0986,0.04 0,0 0.35114,0 0.35114,0 0.0498,0 0.0944,0.018 0.1321,0.055 0.0371,0.036 0.0562,0.079 0.0562,0.1276 0,0 0,0.4124 0,0.4124 0,0.051 -0.018,0.094 -0.0551,0.1296 z m -1.14557,0.1367 c 0,0 -0.41137,0 -0.41137,0 -0.0297,0 -0.0456,-0.016 -0.0456,-0.048 0,0 0,-1.3428 0,-1.3428 0,-0.03 0.0148,-0.043 0.0456,-0.043 0,0 0.41137,0 0.41137,0 0.0297,0 0.0456,0.015 0.0456,0.043 0,0 0,1.3428 0,1.3428 0,0.032 -0.0149,0.048 -0.0456,0.048 z m 1.1286,0.3759 c 0,0 -0.12828,0 -0.12828,0 0,0 0,-0.1314 0,-0.1314 0,0 0.13581,0 0.13581,0 0.0477,0 0.0721,0.022 0.0721,0.066 0,0.043 -0.0265,0.066 -0.0795,0.066 z m 0.27937,0.051 c 0,0 0.0647,-0.1716 0.0647,-0.1716 0,0 0.0604,0.1716 0.0604,0.1716 0,0 -0.12458,0 -0.12458,0 z m -2.04209,0 c 0,0 0.0679,-0.1716 0.0679,-0.1716 0,0 0.0562,0.1716 0.0562,0.1716 0,0 -0.12457,0 -0.12457,0 z m -0.56998,0 c 0,0 0.0647,-0.1716 0.0647,-0.1716 0,0 0.0604,0.1716 0.0604,0.1716 0,0 -0.12458,0 -0.12458,0 z m -0.32082,0.1168 c 0,0 -0.10602,0 -0.10602,0 0,0 0,-0.2993 0,-0.2993 0,0 0.0986,0 0.0986,0 0.0827,0 0.12457,0.05 0.12457,0.1496 0,0.1 -0.0392,0.1497 -0.11704,0.1497 z m 2.21947,0.011 c -0.0933,0 -0.13963,-0.053 -0.13963,-0.1605 0,-0.105 0.0466,-0.1569 0.13963,-0.1569 0.0954,0 0.14345,0.052 0.14345,0.1569 0,0.1071 -0.0477,0.1605 -0.14345,0.1605 z m -0.7323,-1.8791 c 0,-0.017 -0.0106,-0.026 -0.0265,-0.026 0,0 -0.27937,0 -0.27937,0 -0.018,0 -0.0265,0.011 -0.0265,0.026 0,0 0,1.2151 0,1.2151 0,0.017 0.0106,0.025 0.0265,0.025 0,0 0.27937,0 0.27937,0 0.018,0 0.0265,-0.011 0.0265,-0.025 0,0 0,-1.2151 0,-1.2151 z m -0.98134,0.2773 c 0,-0.046 -0.017,-0.086 -0.0509,-0.1186 -0.0339,-0.033 -0.0753,-0.05 -0.12267,-0.05 -0.0477,0 -0.088,0.017 -0.12086,0.05 -0.0329,0.033 -0.0488,0.072 -0.0488,0.1186 0,0 0,0.6677 0,0.6677 0,0.049 0.0159,0.089 0.0466,0.1205 0.0318,0.032 0.0721,0.048 0.12266,0.048 0.0477,0 0.0891,-0.016 0.12267,-0.049 0.0339,-0.033 0.0509,-0.072 0.0509,-0.1185 0,0 0,-0.6677 0,-0.6677 z m -0.17366,0.7516 c -0.0583,0 -0.0869,-0.028 -0.0869,-0.084 0,0 0,-0.6678 0,-0.6678 0,-0.056 0.0286,-0.084 0.0869,-0.084 0.0551,0 0.0827,0.028 0.0827,0.084 0,0 0,0.6678 0,0.6678 0,0.056 -0.0276,0.084 -0.0827,0.084 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           id="path115128-6-1" />
-        <path
-           id="path115130-8-0"
-           style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 824.73596,2245.3148 2.15913,0 0,1.6709 -2.15913,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 821.58598,2245.3148 2.15913,0 0,1.6709 -2.15913,0 z"
-           style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115132-7-8"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path115134-8-5"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.18184429;stroke-miterlimit:4"
-           d="m 818.15103,2245.2839 1.37302,0 0,2.9493 -1.37302,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 818.98685,2245.2839 0.5372,0 0,2.9493 -0.5372,0 z"
-           style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.11374462;stroke-miterlimit:4"
-           id="path115136-9-0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 824.73596,2247.6128 2.15913,0 0,0.7308 -2.15913,0 z"
-           style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115138-7-7" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115140-9-9"
-           style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 821.58598,2247.6128 2.15913,0 0,0.7308 -2.15913,0 z" />
-        <path
-           id="path115581-0-0"
-           style="fill:url(#linearGradient29985-8-2);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.65448451"
-           d="m 748.10981,2245.2067 67.29069,0 0.0429,3.271 -67.00661,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 749.6123,2245.6006 1.74215,0 c 0.23626,0 0.44067,0.1574 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15834,-0.3527 0.3946,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115583-5-5"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115585-8-3"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 753.22102,2245.6006 1.74215,0 c 0.23627,0 0.44078,0.1574 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.39459,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1572 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15824,-0.3527 0.39449,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 756.86644,2245.6006 1.74215,0 c 0.23626,0 0.44066,0.1574 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15824,-0.3527 0.39449,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115587-2-4"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115589-6-1"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 749.6123,2247.1083 1.74215,0 c 0.23626,0 0.44067,0.1573 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.3946,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 753.22102,2247.1083 1.74215,0 c 0.23627,0 0.44078,0.1573 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.39459,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15824,-0.3527 0.39449,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115591-9-0"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115593-7-4"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 756.86644,2247.1083 1.74215,0 c 0.23626,0 0.44066,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15824,-0.3527 0.39449,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 760.57268,2247.1083 1.74216,0 c 0.23625,0 0.44067,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.3945,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115595-1-8"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115597-7-5"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 764.1814,2247.1083 1.74216,0 c 0.23626,0 0.44077,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 767.82682,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.3945,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115599-5-9"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115601-1-2"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 792.8232,2245.6006 1.74216,0 c 0.23625,0 0.44066,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15824,0.3526 -0.39449,0.3526 l -1.74216,0 c -0.23626,0 -0.44077,-0.1572 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15834,-0.3527 0.39459,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 796.43192,2245.6006 1.74216,0 c 0.23625,0 0.44077,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15836,0.3526 -0.39461,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15836,-0.3527 0.39461,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115603-6-5"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115605-4-4"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 800.07734,2245.6006 1.74216,0 c 0.23625,0 0.44066,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44067,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15835,-0.3527 0.39461,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 792.8232,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.39449,0.3526 l -1.74216,0 c -0.23626,0 -0.44077,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.39459,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115607-4-1"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115609-9-3"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 796.43192,2247.1083 1.74216,0 c 0.23625,0 0.44077,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15836,0.3526 -0.39461,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15836,-0.3527 0.39461,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 800.07734,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44067,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115611-9-9"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115613-6-5"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 803.78358,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.39449,0.3526 l -1.74217,0 c -0.23625,0 -0.44077,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.3946,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 807.3923,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15836,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           id="path115615-1-8"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115617-5-2"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825"
-           d="m 811.03772,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15823,0.3526 -0.39448,0.3526 l -1.74217,0 c -0.23625,0 -0.44077,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 827.65786,2245.3148 2.15923,0 0,2.9841 -2.15923,0 z"
-           style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path115619-5-7" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 771.13208,2248.0646 1.74193,0 c 0.23626,0 0.44066,-0.1575 0.4584,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15824,-0.3525 -0.3945,-0.3525 l -1.74204,0 c -0.23626,0 -0.44066,0.1572 -0.4583,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15824,0.3527 0.3946,0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path115621-6-9"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115623-0-6"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 774.74046,2248.0646 1.74206,0 c 0.23625,0 0.44066,-0.1575 0.45828,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15825,-0.3525 -0.3945,-0.3525 l -1.74206,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15823,0.3527 0.39448,0.3527 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 778.38555,2248.0646 1.74205,0 c 0.23626,0 0.44066,-0.1575 0.45829,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15825,-0.3525 -0.39451,-0.3525 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.45829,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15824,0.3527 0.39449,0.3527 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path115625-7-1"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115627-5-7"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 771.13208,2246.5568 1.74193,0 c 0.23626,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15824,-0.3527 -0.3945,-0.3527 l -1.74204,0 c -0.23626,0 -0.44066,0.1572 -0.4583,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.3946,0.3525 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 774.74046,2246.5568 1.74206,0 c 0.23625,0 0.44066,-0.1572 0.45828,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.3945,-0.3527 l -1.74206,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15823,0.3525 0.39448,0.3525 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path115629-0-7"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115631-7-1"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 778.38555,2246.5568 1.74205,0 c 0.23626,0 0.44066,-0.1572 0.45829,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.39451,-0.3527 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.45829,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.39449,0.3525 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 782.09146,2246.5568 1.74205,0 c 0.23626,0 0.44066,-0.1572 0.45829,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.39451,-0.3527 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.3945,0.3525 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path115633-9-9"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path115635-5-0"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           d="m 785.69996,2246.5568 1.74194,0 c 0.23625,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15824,-0.3527 -0.39449,-0.3527 l -1.74205,0 c -0.23626,0 -0.44066,0.1572 -0.45829,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.39449,0.3525 z"
-           sodipodi:nodetypes="ssccssccs" />
-        <path
-           sodipodi:nodetypes="ssccssccs"
-           d="m 789.34505,2246.5568 1.74194,0 c 0.23625,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15837,-0.3527 -0.39462,-0.3527 l -1.74194,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15835,0.3525 0.3946,0.3525 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463"
-           id="path115637-6-3"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g31567-4"
-           transform="matrix(0.77587723,0,0,1,194.59487,0.99590896)">
-          <path
-             sodipodi:nodetypes="cccssccccccscccsccc"
-             inkscape:connector-curvature="0"
-             id="path115575-5-1"
-             d="m 870.95805,2247.1999 c -0.80735,0 -1.45044,2.1197 -1.45624,4.7517 l -0.0867,32.1297 c -0.006,2.633 0.64481,4.7522 1.45217,4.7522 l 5.88614,0 c 0.80736,0 1.45056,-2.1192 1.45623,-4.7522 l 0.0181,-7.7489 -0.90631,-0.3411 -0.26448,-14.8768 1.21888,0.3959 0.0204,-9.5601 c 0.006,-2.6326 -0.64469,-4.7514 -1.45205,-4.7514 l -5.88625,0 z m 3.18973,19.2422 c 0.25682,0.038 0.78758,0.133 0.79746,1.8106 0.01,1.6776 -0.53801,2.2691 -0.79474,2.2365 -0.25694,-0.038 -0.77753,-0.6057 -0.78741,-2.2832 -0.01,-1.6773 0.52796,-1.7963 0.78469,-1.7639 z"
-             style="fill:url(#linearGradient31581-9);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53485292;stroke-miterlimit:4;stroke-dasharray:none" />
-          <path
-             sodipodi:nodetypes="cccccccccc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 873.5847,2251.4177 c 0.0657,-2.1656 0.46798,-1.4454 1.1865,-0.2024 l 1.44752,4.67 -0.34521,31.4636 c -0.32422,1.7146 -0.72392,0.7692 -1.19148,0.3409 l -1.67186,-5.5735 c 0.34022,-1.4357 0.42992,-0.7055 0.98558,-0.1394 l 0.72986,1.3287 0.31319,-26.9823 z"
-             inkscape:path-effect="#path-effect29991-6-5"
-             id="path115577-2-7"
-             d="m 873.5847,2251.4177 1.1865,-0.2024 1.44752,4.67 -0.34521,31.4636 -1.19148,0.3409 -1.67186,-5.5735 0.98558,-0.1394 0.72986,1.3287 0.31319,-26.9823 -1.4541,-4.9056"
-             style="fill:#808080;fill-opacity:1;stroke:none" />
-          <path
-             sodipodi:nodetypes="ccccccccc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 873.51144,2258.1509 1.08683,2.6281 -0.2553,23.2666 -1.3327,-1.9218 -0.0403,3.7754 1.71873,1.7962 0.37998,-31.5042 -1.48993,-4.7773 z"
-             inkscape:path-effect="#path-effect29988-5-5"
-             id="path115579-7-5"
-             d="m 873.51144,2258.1509 1.08683,2.6281 -0.2553,23.2666 -1.3327,-1.9218 -0.0403,3.7754 1.71873,1.7962 0.37998,-31.5042 -1.48993,-4.7773 -0.0673,6.737"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-484.57145,-597.35266)">
+    <g style="display:inline" transform="matrix(0.94319853,0,0,0.94319853,-213.93509,-1509.8716)" id="g31583-2">
+      <g id="g106454">
+        <path inkscape:connector-curvature="0" d="m 746.4153,2243.8833 0.14409,45.545 123.54727,0.4011 -0.28626,-45.9692 -33.72854,-9.7343 -56.99171,0 z" style="fill:url(#linearGradient30237-2);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115108-7-5" sodipodi:nodetypes="ccccccc"/>
+        <path sodipodi:nodetypes="ccccc" id="path47637-4-5-0-3-0" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.97012049;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 746.89881,2244.3452 122.43444,0 0,45.3562 -122.43444,0 z" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 748.44391,2276.0072 29.96981,0.051 0.18149,6.6304 -29.90058,-0.049 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44614804" id="path115142-5-8"/>
+        <path inkscape:connector-curvature="0" id="path115144-8-3" d="m 751.87937,2277.7378 7.64162,0 0,0.769 -7.64162,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path115146-8-9" d="m 770.69271,2277.5973 0,3.4128 3.24598,0 0,-2.9359 0,-0.2524 0,-0.2245 -1.48773,0 0.76069,0.013 -0.0166,0.1088 0,3.1724 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1724 1.01435,0 0.0166,-0.1202 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.9411,2277.7378 7.64163,0 0,0.769 -7.64163,0 z" id="path115148-9-3"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.09565,2279.1797 7.64174,0 0,0.4328 -7.64174,0 z" id="path115150-5-9"/>
+        <path id="path115152-7-6" d="m 761.15749,2279.1797 7.64163,0 0,0.4328 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115154-3-7" d="m 752.258,2280.3336 7.64163,0 0,0.4325 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.31984,2280.3336 7.64163,0 0,0.4325 -7.64163,0 z" id="path115156-2-9"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.31215,2281.4392 7.64162,0 0,0.4324 -7.64162,0 z" id="path115158-2-9"/>
+        <path id="path115160-2-7" d="m 761.37389,2281.4392 7.64163,0 0,0.4324 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 770.57095,2281.4392 7.64163,0 0,0.4324 -7.64163,0 z" id="path115162-0-6"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 748.44391,2277.1128 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6095 0.0103,0.043 0.33774,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2689 -0.0362,-2.4322 -0.0196,-0.5306 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04044,-0.011 25.94092,0 0.0176,0.3067 0.0187,0.2359 0.0104,0.3366 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8027 0.21587,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z" style="fill:#000000;stroke:none" id="path115164-0-9"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.76481,2277.5769 0,0.4929 2.24726,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4926 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115166-2-3"/>
+        <path id="path115168-3-5" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.76492,2281.0139 0,-0.4925 2.24705,0 0.0166,-0.8292 0.54533,0 0,0.8282 0,0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path115170-1-7" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.4461942" d="m 748.77988,2282.8836 29.83384,-0.048 0.18152,6.68 -29.71722,2e-4 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 752.21523,2284.614 7.64164,0 0,0.7691 -7.64164,0 z" id="path115172-6-6" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 771.02858,2284.4736 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1724 -1.06509,0 -0.0166,0.097 -0.69307,0 0,-0.097 0,-3.1724 1.01435,0 0.0166,-0.1203 z" id="path115174-8-6" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path115176-7-5" d="m 761.27707,2284.614 7.64164,0 0,0.7691 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115178-7-8" d="m 752.43163,2286.0561 7.64162,0 0,0.4327 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.49347,2286.0561 7.64163,0 0,0.4327 -7.64163,0 z" id="path115180-2-2"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.59397,2287.2098 7.64164,0 0,0.4326 -7.64164,0 z" id="path115182-8-5"/>
+        <path id="path115184-7-4" d="m 761.65571,2287.2098 7.64174,0 0,0.4326 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115186-9-4" d="m 752.64801,2288.3154 7.64175,0 0,0.4326 -7.64175,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.70986,2288.3154 7.64163,0 0,0.4326 -7.64163,0 z" id="path115188-5-1"/>
+        <path id="path115190-9-6" d="m 770.90693,2288.3154 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115192-2-1" style="fill:#000000;stroke:none" d="m 748.77988,2283.9892 0.94674,0 c 0,0 0.26299,2.4061 0.39438,3.6094 0.0104,0.044 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0197,-0.5303 -0.0942,-1.2883 -0.0632,-1.6161 2.97917,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05742,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4648 0.0797,3.8028 0.21588,4.9222 -0.84931,-0.015 -1.31874,0.047 -2.14269,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path115194-9-6" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 775.10078,2284.4533 0,0.4929 2.24717,0 0.0166,0.829 0.54533,0 0,-0.8283 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 775.10078,2287.8903 0,-0.4928 2.24717,0 0.0166,-0.8291 0.54522,0 0,0.8284 0,0.4926 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115196-1-3"/>
+        <path id="path115198-3-3" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44642299" d="m 748.26435,2262.4471 29.77249,0.051 0.18161,6.6305 -29.93734,-0.049 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 751.46542,2264.1775 7.64163,0 0,0.7691 -7.64163,0 z" id="path115200-0-5" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 770.27877,2264.0371 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1088 0,3.1723 -1.0651,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 z" id="path115202-8-5" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path115204-1-3" d="m 760.52726,2264.1775 7.64164,0 0,0.7691 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115206-9-2" d="m 751.68182,2265.6196 7.64162,0 0,0.4327 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.74366,2265.6196 7.64162,0 0,0.4327 -7.64162,0 z" id="path115208-2-8"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 751.84416,2266.7733 7.64163,0 0,0.4326 -7.64163,0 z" id="path115210-0-2"/>
+        <path id="path115213-2-5" d="m 760.90589,2266.7733 7.64175,0 0,0.4326 -7.64175,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115215-4-3" d="m 751.8982,2267.8789 7.64174,0 0,0.4327 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.96004,2267.8789 7.64164,0 0,0.4327 -7.64164,0 z" id="path115217-7-6"/>
+        <path id="path115219-5-1" d="m 770.15711,2267.8789 7.64164,0 0,0.4327 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115221-8-8" style="fill:#000000;stroke:none" d="m 748.03007,2263.5527 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6094 0.0104,0.044 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4321 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6163 2.97917,-0.054 23.04033,-0.011 25.94092,0 0.0176,0.3069 0.0186,0.236 0.0104,0.3366 -1.05752,0.012 -25.40066,-0.011 -25.38627,0 0.15178,1.4649 0.0797,3.8028 0.21598,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path115223-1-6" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.35097,2264.0168 0,0.4929 2.24716,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.35107,2267.4539 0,-0.4927 2.24706,0 0.0166,-0.8293 0.54522,0 0,0.8284 0,0.4926 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115225-0-2"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 748.36605,2269.3244 29.82127,-0.048 0.18134,6.6801 -29.70461,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44610023" id="path115227-0-1"/>
+        <path inkscape:connector-curvature="0" id="path115229-7-4" d="m 751.8014,2271.0549 7.64163,0 0,0.769 -7.64163,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path115231-1-6" d="m 770.61474,2270.9144 0,3.4129 3.24598,0 0,-2.936 0,-0.2523 0,-0.2246 -1.48771,0 0.76078,0.013 -0.0166,0.1086 0,3.1725 -1.06519,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1725 1.01445,0 0.0166,-0.1202 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.86314,2271.0549 7.64173,0 0,0.769 -7.64173,0 z" id="path115233-6-2"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.01779,2272.4968 7.64163,0 0,0.4328 -7.64163,0 z" id="path115235-9-9"/>
+        <path id="path115237-3-1" d="m 761.07953,2272.4968 7.64174,0 0,0.4328 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115239-0-5" d="m 752.18014,2273.6506 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.24188,2273.6506 7.64162,0 0,0.4326 -7.64162,0 z" id="path115241-3-0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.23418,2274.7563 7.64163,0 0,0.4325 -7.64163,0 z" id="path115243-7-3"/>
+        <path id="path115245-3-6" d="m 761.29603,2274.7563 7.64162,0 0,0.4325 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 770.49299,2274.7563 7.64173,0 0,0.4325 -7.64173,0 z" id="path115247-0-4"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 748.36605,2270.4299 0.94674,0 c 0,0 0.26299,2.4063 0.39437,3.6096 0.0104,0.043 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.432 -0.0197,-0.5304 -0.0942,-1.2884 -0.0632,-1.6161 2.97907,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3066 0.0187,0.2357 0.0103,0.3363 -1.05752,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4649 0.0797,3.8029 0.21588,4.9222 -0.84931,-0.015 -1.31885,0.047 -2.1428,0.047 z" style="fill:#000000;stroke:none" id="path115249-4-9"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.68684,2270.8941 0,0.4928 2.24727,0 0.0166,0.8291 0.54533,0 0,-0.8283 0,-0.4926 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115251-3-2"/>
+        <path id="path115253-2-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.68695,2274.3311 0,-0.4927 2.24705,0 0.0166,-0.8292 0.54523,0 0,0.8283 0,0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path115303-6-3" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44730246" d="m 778.40169,2262.548 29.98233,-0.048 0.0647,6.7293 -29.85228,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 781.83704,2264.2786 7.64164,0 0,0.7689 -7.64164,0 z" id="path115305-2-4" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.65039,2264.138 0,3.413 3.24608,0 0,-3.413 -1.48782,0 0.76079,0.013 -0.0166,0.1086 0,3.1723 -1.06509,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z" id="path115307-2-4"/>
+        <path sodipodi:nodetypes="ccccc" id="path115309-7-0" d="m 790.89888,2264.2786 7.64164,0 0,0.7689 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path115311-3-5" d="m 782.05344,2265.7206 7.64173,0 0,0.4327 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.11528,2265.7206 7.64162,0 0,0.4327 -7.64162,0 z" id="path115313-0-9"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.21578,2266.8743 7.64163,0 0,0.4327 -7.64163,0 z" id="path115315-7-6"/>
+        <path sodipodi:nodetypes="ccccc" id="path115317-3-3" d="m 791.27752,2266.8743 7.64174,0 0,0.4327 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path115319-0-4" d="m 782.26993,2267.9799 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.33166,2267.9799 7.64164,0 0,0.4326 -7.64164,0 z" id="path115321-7-2"/>
+        <path sodipodi:nodetypes="ccccc" id="path115323-3-8" d="m 800.52873,2267.9799 7.64164,0 0,0.4326 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115325-6-8" style="fill:#000000;stroke:none" d="m 778.40169,2263.6537 0.94674,0 c 0,0 0.26299,2.4061 0.39447,3.6094 0.0104,0.043 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04034,-0.011 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40056,-0.011 -25.38617,0 0.15179,1.4651 0.0797,3.8028 0.21588,4.9223 -0.84942,-0.015 -1.72461,0.047 -2.54856,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path115327-4-7" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.54016,2264.1177 0,0.4929 2.24726,0 0.0166,0.8292 0.54532,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.54026,2267.5548 0,-0.4927 2.24716,0 0.0166,-0.8292 0.54523,0 0,0.8284 0,0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115329-6-5"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 778.55233,2269.4243 29.93614,-0.048 0.0649,6.7297 -29.80626,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.44695815" id="path115331-7-8"/>
+        <path inkscape:connector-curvature="0" id="path115333-4-1" d="m 781.97112,2271.1549 7.60477,0 0,0.769 -7.60477,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path115335-0-2" d="m 800.69377,2271.0144 0,3.4129 3.23035,0 0,-3.4129 -1.48058,0 0.75717,0.013 -0.0166,0.1086 0,3.1724 -1.06001,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1724 1.00948,0 0.0166,-0.1203 -1.74978,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 790.98927,2271.1549 7.60477,0 0,0.769 -7.60477,0 z" id="path115337-1-5" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.18647,2272.5968 7.60478,0 0,0.4328 -7.60478,0 z" id="path115339-2-7" sodipodi:nodetypes="ccccc"/>
+        <path id="path115341-4-4" d="m 791.20453,2272.5968 7.60487,0 0,0.4328 -7.60487,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path115343-4-4" d="m 782.348,2273.7507 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.36615,2273.7507 7.60477,0 0,0.4325 -7.60477,0 z" id="path115345-6-4" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.40183,2274.8563 7.60477,0 0,0.4325 -7.60477,0 z" id="path115347-3-4" sodipodi:nodetypes="ccccc"/>
+        <path id="path115349-4-4" d="m 791.41998,2274.8563 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.57264,2274.8563 7.60486,0 0,0.4325 -7.60486,0 z" id="path115351-5-2" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 778.55233,2270.5299 0.9422,0 c 0,0 0.26163,2.4062 0.3925,3.6096 0.0104,0.043 0.33618,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5303 -0.0942,-1.2883 -0.0621,-1.6161 2.96478,-0.054 22.92926,-0.012 25.81586,0 0.0176,0.3067 0.0186,0.2357 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15106,1.4649 0.0787,3.8028 0.21484,4.9221 -0.84517,-0.015 -1.71623,0.047 -2.53624,0.047 z" style="fill:#000000;stroke:none" id="path115353-0-9"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.5648,2270.9941 0,0.4928 2.23639,0 0.0166,0.8291 0.54275,0 0,-0.8284 0,-0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115355-2-3"/>
+        <path id="path115357-0-0" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.56491,2274.4311 0,-0.4927 2.23628,0 0.0166,-0.8291 0.54265,0 0,0.8282 0,0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 778.76873,2276.0365 29.80618,-0.048 0.065,6.7295 -29.67685,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44598696" id="path115359-1-7"/>
+        <path inkscape:connector-curvature="0" id="path115361-6-7" d="m 782.16381,2277.7672 7.55186,0 0,0.769 -7.55186,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path115363-9-8" d="m 800.7561,2277.6266 0,3.4129 3.20787,0 0,-3.4129 -1.47032,0 0.75189,0.013 -0.0166,0.1088 0,3.1723 -1.05255,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00244,0 0.0166,-0.1203 -1.73766,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.11911,2277.7672 7.55187,0 0,0.769 -7.55187,0 z" id="path115365-3-7" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.37761,2279.2093 7.55187,0 0,0.4326 -7.55187,0 z" id="path115367-7-3" sodipodi:nodetypes="ccccc"/>
+        <path id="path115369-9-0" d="m 791.33291,2279.2093 7.55197,0 0,0.4326 -7.55197,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path115371-1-3" d="m 782.53799,2280.363 7.55186,0 0,0.4325 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.49339,2280.363 7.55187,0 0,0.4325 -7.55187,0 z" id="path115373-5-8" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.59151,2281.4686 7.55187,0 0,0.4324 -7.55187,0 z" id="path115375-2-2" sodipodi:nodetypes="ccccc"/>
+        <path id="path115377-4-5" d="m 791.54682,2281.4686 7.55186,0 0,0.4324 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.63579,2281.4686 7.55186,0 0,0.4324 -7.55186,0 z" id="path115379-4-2" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 778.76873,2277.1423 0.93566,0 c 0,0 0.25988,2.4062 0.38982,3.6094 0.0104,0.043 0.3338,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0197,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94408,-0.054 22.76961,-0.011 25.63612,0 0.0166,0.3066 0.0186,0.2358 0.0104,0.3365 -1.04499,0.012 -25.10216,-0.011 -25.08788,0 0.15003,1.4649 0.0787,3.8027 0.2134,4.9223 -0.83948,-0.015 -1.70433,0.047 -2.51864,0.047 z" style="fill:#000000;stroke:none" id="path115381-1-0"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.60021,2277.6063 0,0.4929 2.22076,0 0.0166,0.8291 0.53891,0 0,-0.8283 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115383-3-3"/>
+        <path id="path115385-4-7" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.60021,2281.0433 0,-0.4925 2.22076,0 0.0166,-0.8292 0.53891,0 0,0.8283 0,0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path115387-6-2" style="fill:#808080;stroke:#000000;stroke-width:0.44537091" d="m 778.91762,2282.9129 29.72384,-0.048 0.0643,6.7294 -29.59495,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 782.29623,2284.6435 7.51552,0 0,0.769 -7.51552,0 z" id="path115389-8-9" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.79896,2284.503 0,3.4129 3.19245,0 0,-3.4129 -1.46328,0 0.74826,0.013 -0.0166,0.1087 0,3.1723 -1.04749,0 -0.0166,0.097 -0.68179,0 0,-0.097 0,-3.1723 0.99768,0 0.0166,-0.1204 -1.72927,0 z" id="path115391-8-7"/>
+        <path sodipodi:nodetypes="ccccc" id="path115393-7-5" d="m 791.20835,2284.6435 7.51553,0 0,0.769 -7.51553,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path115395-0-3" d="m 782.5091,2286.0855 7.51541,0 0,0.4327 -7.51541,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.42122,2286.0855 7.51554,0 0,0.4327 -7.51554,0 z" id="path115397-3-4"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.66865,2287.2392 7.51552,0 0,0.4326 -7.51552,0 z" id="path115399-4-3"/>
+        <path sodipodi:nodetypes="ccccc" id="path115401-4-2" d="m 791.58088,2287.2392 7.51543,0 0,0.4326 -7.51543,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path115403-6-1" d="m 782.72187,2288.3447 7.51552,0 0,0.4328 -7.51552,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.6341,2288.3447 7.51542,0 0,0.4328 -7.51542,0 z" id="path115405-7-1"/>
+        <path sodipodi:nodetypes="ccccc" id="path115407-1-3" d="m 800.67928,2288.3447 7.51541,0 0,0.4328 -7.51541,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115409-8-2" style="fill:#000000;stroke:none" d="m 778.91762,2284.0186 0.9311,0 c 0,0 0.25864,2.4061 0.38795,3.6095 0.0103,0.044 0.33215,0.047 0.65001,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6162 2.92998,-0.054 22.65994,-0.012 25.51258,0 0.0166,0.3068 0.0176,0.2358 0.0104,0.3364 -1.04002,0.012 -24.98123,-0.012 -24.96705,0 0.14931,1.4649 0.0776,3.8029 0.21236,4.9223 -0.83533,-0.015 -1.69614,0.047 -2.50642,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path115411-1-5" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.62455,2284.4827 0,0.4929 2.21009,0 0.0166,0.8291 0.53632,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.62455,2287.9198 0,-0.4929 2.20998,0 0.0166,-0.8291 0.53622,0 0,0.8284 0,0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115413-2-3"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.55075,2262.5239 30.07268,-0.026 -0.24475,6.7074 -29.82793,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327" id="path115463-3-5"/>
+        <path inkscape:connector-curvature="0" id="path115465-9-1" d="m 811.92201,2264.2545 7.64164,0 0,0.7689 -7.64164,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path115467-3-2" d="m 830.73536,2264.1138 0,3.4131 3.24608,0 0,-3.4131 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75827,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 820.98386,2264.2545 7.64163,0 0,0.7689 -7.64163,0 z" id="path115469-1-2" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.13841,2265.6964 7.64173,0 0,0.4328 -7.64173,0 z" id="path115471-3-2" sodipodi:nodetypes="ccccc"/>
+        <path id="path115473-9-6" d="m 821.20025,2265.6964 7.64164,0 0,0.4328 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path115475-6-4" d="m 812.30075,2266.8501 7.64164,0 0,0.4328 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.3625,2266.8501 7.64173,0 0,0.4328 -7.64173,0 z" id="path115477-3-0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.3549,2267.9558 7.64164,0 0,0.4326 -7.64164,0 z" id="path115479-7-7" sodipodi:nodetypes="ccccc"/>
+        <path id="path115481-5-0" d="m 821.41665,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.61371,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z" id="path115483-2-3" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 808.48667,2263.6296 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0104,0.043 0.33774,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40055,-0.011 -25.38616,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z" style="fill:#000000;stroke:none" id="path115485-0-4"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.62513,2264.0936 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115487-7-0"/>
+        <path id="path115489-1-0" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.62524,2267.5307 0,-0.4928 2.24715,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path115491-7-5" style="fill:#808080;stroke:#000000;stroke-width:0.44594821" d="m 808.55075,2269.4001 29.88415,-0.048 -0.12173,6.7296 -29.76242,-0.091 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 812.05609,2271.1308 7.60477,0 0,0.769 -7.60477,0 z" id="path115493-0-3" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.77875,2270.9903 0,3.4128 3.23034,0 0,-3.4128 -1.48058,0 0.75717,0.013 -0.0166,0.1085 0,3.1725 -1.06002,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74988,0 z" id="path115495-6-1"/>
+        <path sodipodi:nodetypes="ccccc" id="path115497-7-0" d="m 821.07424,2271.1308 7.60478,0 0,0.769 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path115499-1-6" d="m 812.27145,2272.5727 7.60477,0 0,0.4328 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.2895,2272.5727 7.60488,0 0,0.4328 -7.60488,0 z" id="path115501-7-7"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.43297,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z" id="path115503-5-5"/>
+        <path sodipodi:nodetypes="ccccc" id="path115505-4-0" d="m 821.45112,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path115507-8-0" d="m 812.48681,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.50497,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z" id="path115509-1-4"/>
+        <path sodipodi:nodetypes="ccccc" id="path115511-7-5" d="m 830.65761,2274.8321 7.60487,0 0,0.4325 -7.60487,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115513-5-4" style="fill:#000000;stroke:none" d="m 808.63732,2270.5058 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33618,0.047 0.65776,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96477,-0.054 22.92924,-0.012 25.81584,0 0.0176,0.3066 0.0186,0.2356 0.0104,0.3365 -1.05244,0.012 -25.27817,-0.012 -25.26388,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53624,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path115515-2-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.64978,2270.9699 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.64988,2274.4069 0,-0.4926 2.23629,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115517-1-5"/>
+        <path id="path115519-7-6" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44488338" d="m 808.55075,2276.0124 29.82592,-0.048 -0.1224,6.7296 -29.70352,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 812.24878,2277.7431 7.55186,0 0,0.769 -7.55186,0 z" id="path115521-5-4" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.84107,2277.6025 0,3.4129 3.20788,0 0,-3.4129 -1.47032,0 0.75188,0.013 -0.0166,0.1088 0,3.1723 -1.05256,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00245,0 0.0166,-0.1203 -1.73766,0 z" id="path115523-3-8"/>
+        <path sodipodi:nodetypes="ccccc" id="path115525-1-2" d="m 821.20409,2277.7431 7.55186,0 0,0.769 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path115527-0-1" d="m 812.46259,2279.1851 7.55186,0 0,0.4326 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.41789,2279.1851 7.55196,0 0,0.4326 -7.55196,0 z" id="path115529-0-6"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.62296,2280.3388 7.55187,0 0,0.4326 -7.55187,0 z" id="path115531-0-8"/>
+        <path sodipodi:nodetypes="ccccc" id="path115533-5-3" d="m 821.57837,2280.3388 7.55186,0 0,0.4326 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path115535-0-1" d="m 812.67649,2281.4445 7.55186,0 0,0.4324 -7.55186,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.63179,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z" id="path115537-0-4"/>
+        <path sodipodi:nodetypes="ccccc" id="path115539-7-8" d="m 830.72076,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path115541-8-4" style="fill:#000000;stroke:none" d="m 808.55075,2277.1182 1.23862,0 c 0,0 0.25987,2.4062 0.38981,3.6094 0.0104,0.043 0.33381,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0196,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94407,-0.054 22.76959,-0.011 25.6361,0 0.0166,0.3066 0.0187,0.2358 0.0104,0.3365 -1.04501,0.012 -25.10217,-0.011 -25.08789,0 0.15003,1.4649 0.0787,3.8027 0.21339,4.9222 -0.83948,-0.015 -2.14031,-0.045 -2.95463,-0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path115543-6-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.68519,2277.5822 0,0.4929 2.22076,0 0.0166,0.8291 0.5389,0 0,-0.8283 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.68519,2281.0192 0,-0.4926 2.22076,0 0.0166,-0.8292 0.5389,0 0,0.8284 0,0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115545-4-2"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.55073,2282.8888 29.68383,-0.048 -0.0606,6.7294 -29.62359,0 z" style="fill:#808080;stroke:#000000;stroke-width:0.44321227" id="path115547-9-0"/>
+        <path inkscape:connector-curvature="0" id="path115549-1-7" d="m 812.3812,2284.6194 7.51552,0 0,0.769 -7.51552,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path115551-4-0" d="m 830.88394,2284.4789 0,3.4129 3.19245,0 0,-3.4129 -1.46329,0 0.74827,0.013 -0.0166,0.1087 0,3.1724 -1.04749,0 -0.0166,0.097 -0.68179,0 0,-0.097 0,-3.1724 0.99768,0 0.0166,-0.1203 -1.72927,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.29334,2284.6194 7.51552,0 0,0.769 -7.51552,0 z" id="path115553-8-6" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.59407,2286.0614 7.51542,0 0,0.4327 -7.51542,0 z" id="path115555-0-0" sodipodi:nodetypes="ccccc"/>
+        <path id="path115557-8-7" d="m 821.50621,2286.0614 7.51552,0 0,0.4327 -7.51552,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path115559-9-0" d="m 812.75362,2287.2151 7.51553,0 0,0.4326 -7.51553,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.66586,2287.2151 7.51542,0 0,0.4326 -7.51542,0 z" id="path115561-9-5" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.80684,2288.3206 7.51552,0 0,0.4327 -7.51552,0 z" id="path115563-7-6" sodipodi:nodetypes="ccccc"/>
+        <path id="path115565-9-7" d="m 821.71908,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.76425,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z" id="path115567-9-3" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 808.55075,2283.9945 1.38294,0 c 0,0 0.25865,2.4061 0.38796,3.6094 0.0104,0.044 0.33215,0.047 0.65001,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5305 -0.0932,-1.2885 -0.0621,-1.6162 2.92999,-0.054 22.65994,-0.012 25.51259,0 0.0166,0.3067 0.0176,0.2357 0.0104,0.3364 -1.04002,0.012 -24.98124,-0.012 -24.96705,0 0.1493,1.4649 0.0776,3.8028 0.21236,4.9223 -0.83534,-0.015 -2.2804,-0.1363 -3.09079,-0.1363 z" style="fill:#000000;stroke:none" id="path115569-9-8"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.70952,2284.4585 0,0.493 2.21009,0 0.0166,0.8291 0.53633,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115571-6-4"/>
+        <path id="path115573-0-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.70952,2287.8956 0,-0.4928 2.20998,0 0.0166,-0.8291 0.53621,0 0,0.8284 0,0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path31004-7-2" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327" d="m 838.96467,2262.5239 29.83839,-0.026 -0.0105,6.7074 -29.82792,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 842.33593,2264.2545 7.64163,0 0,0.7689 -7.64163,0 z" id="path31006-2-6" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.14927,2264.1138 0,3.4131 3.24609,0 0,-3.4131 -1.48782,0 0.76078,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z" id="path31008-6-5"/>
+        <path sodipodi:nodetypes="ccccc" id="path31010-0-7" d="m 851.39778,2264.2545 7.64162,0 0,0.7689 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31012-1-7" d="m 842.55232,2265.6964 7.64174,0 0,0.4328 -7.64174,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.61416,2265.6964 7.64164,0 0,0.4328 -7.64164,0 z" id="path31014-6-4"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.71467,2266.8501 7.64163,0 0,0.4328 -7.64163,0 z" id="path31016-5-5"/>
+        <path sodipodi:nodetypes="ccccc" id="path31018-7-7" d="m 851.77641,2266.8501 7.64173,0 0,0.4328 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31020-5-9" d="m 842.76882,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.83056,2267.9558 7.64163,0 0,0.4326 -7.64163,0 z" id="path31022-4-8"/>
+        <path sodipodi:nodetypes="ccccc" id="path31024-1-3" d="m 861.02763,2267.9558 7.64162,0 0,0.4326 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31026-2-0" style="fill:#000000;stroke:none" d="m 838.90059,2263.6296 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0103,0.043 0.33773,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0187,0.2358 0.0104,0.3365 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path31028-0-2" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.03905,2264.0936 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.03915,2267.5307 0,-0.4928 2.24716,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31030-0-2"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 838.96467,2269.4001 29.88414,-0.048 -0.12173,6.7296 -29.76241,-0.091 z" style="fill:#808080;stroke:#000000;stroke-width:0.44594821" id="path31032-1-3"/>
+        <path inkscape:connector-curvature="0" id="path31034-4-6" d="m 842.47001,2271.1308 7.60477,0 0,0.769 -7.60477,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path31036-6-7" d="m 861.19266,2270.9903 0,3.4128 3.23035,0 0,-3.4128 -1.48058,0 0.75716,0.013 -0.0166,0.1085 0,3.1725 -1.06001,0 -0.0166,0.097 -0.68977,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74987,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.48816,2271.1308 7.60478,0 0,0.769 -7.60478,0 z" id="path31038-0-1" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.68537,2272.5727 7.60477,0 0,0.4328 -7.60477,0 z" id="path31040-7-5" sodipodi:nodetypes="ccccc"/>
+        <path id="path31042-1-5" d="m 851.70341,2272.5727 7.60488,0 0,0.4328 -7.60488,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path31044-7-4" d="m 842.84688,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.86503,2273.7266 7.60478,0 0,0.4325 -7.60478,0 z" id="path31046-7-0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.90073,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z" id="path31048-7-2" sodipodi:nodetypes="ccccc"/>
+        <path id="path31050-7-6" d="m 851.91888,2274.8321 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.07152,2274.8321 7.60488,0 0,0.4325 -7.60488,0 z" id="path31052-3-0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 839.05123,2270.5058 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33619,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96478,-0.054 22.92924,-0.012 25.81585,0 0.0176,0.3066 0.0187,0.2356 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53623,0.047 z" style="fill:#000000;stroke:none" id="path31054-3-6"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.0637,2270.9699 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31056-5-1"/>
+        <path id="path31058-9-1" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.06379,2274.4069 0,-0.4926 2.2363,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 838.96467,2276.0124 29.82592,-0.048 -0.1224,6.7296 -29.70352,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44488338" id="path31060-9-1"/>
+        <path inkscape:connector-curvature="0" id="path31062-8-7" d="m 842.66269,2277.7431 7.55186,0 0,0.769 -7.55186,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path31064-1-3" d="m 861.25499,2277.6025 0,3.4129 3.20788,0 0,-3.4129 -1.47032,0 0.75188,0.013 -0.0166,0.1088 0,3.1723 -1.05256,0 -0.0166,0.097 -0.685,0 0,-0.097 0,-3.1723 1.00245,0 0.0166,-0.1203 -1.73765,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.618,2277.7431 7.55186,0 0,0.769 -7.55186,0 z" id="path31066-8-0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.8765,2279.1851 7.55186,0 0,0.4326 -7.55186,0 z" id="path31068-2-0" sodipodi:nodetypes="ccccc"/>
+        <path id="path31070-6-4" d="m 851.8318,2279.1851 7.55197,0 0,0.4326 -7.55197,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path31072-6-8" d="m 843.03687,2280.3388 7.55187,0 0,0.4326 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.99229,2280.3388 7.55186,0 0,0.4326 -7.55186,0 z" id="path31074-0-3" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 843.09041,2281.4445 7.55186,0 0,0.4324 -7.55186,0 z" id="path31076-3-0" sodipodi:nodetypes="ccccc"/>
+        <path id="path31078-8-1" d="m 852.0457,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.13468,2281.4445 7.55187,0 0,0.4324 -7.55187,0 z" id="path31080-0-2" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 838.96467,2277.1182 1.23861,0 c 0,0 0.25988,2.4062 0.38982,3.6094 0.0104,0.043 0.3338,0.047 0.65311,0.084 0.0818,0.012 0.0104,-1.2689 -0.0362,-2.4321 -0.0196,-0.5306 -0.0932,-1.2885 -0.0621,-1.6162 2.94406,-0.054 22.76958,-0.011 25.6361,0 0.0166,0.3066 0.0186,0.2358 0.0104,0.3365 -1.045,0.012 -25.10217,-0.011 -25.08788,0 0.15003,1.4649 0.0787,3.8027 0.21339,4.9222 -0.83948,-0.015 -2.14031,-0.045 -2.95463,-0.045 z" style="fill:#000000;stroke:none" id="path31082-1-9"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.09911,2277.5822 0,0.4929 2.22075,0 0.0166,0.8291 0.5389,0 0,-0.8283 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31084-2-0"/>
+        <path id="path31086-5-3" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.09911,2281.0192 0,-0.4926 2.22075,0 0.0166,-0.8292 0.5389,0 0,0.8284 0,0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path31088-0-8" style="fill:#808080;stroke:#000000;stroke-width:0.44321227" d="m 838.96465,2282.8888 29.68383,-0.048 -0.0607,6.7294 -29.62358,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 842.79511,2284.6194 7.51553,0 0,0.769 -7.51553,0 z" id="path31090-9-8" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.29786,2284.4789 0,3.4129 3.19244,0 0,-3.4129 -1.46328,0 0.74826,0.013 -0.0166,0.1087 0,3.1724 -1.04748,0 -0.0166,0.097 -0.6818,0 0,-0.097 0,-3.1724 0.99768,0 0.0166,-0.1203 -1.72927,0 z" id="path31092-4-5"/>
+        <path sodipodi:nodetypes="ccccc" id="path31094-7-7" d="m 851.70725,2284.6194 7.51552,0 0,0.769 -7.51552,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31096-8-7" d="m 843.00798,2286.0614 7.51543,0 0,0.4327 -7.51543,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.92012,2286.0614 7.51552,0 0,0.4327 -7.51552,0 z" id="path31098-3-0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 843.16753,2287.2151 7.51554,0 0,0.4326 -7.51554,0 z" id="path31100-5-8"/>
+        <path sodipodi:nodetypes="ccccc" id="path31102-1-9" d="m 852.07978,2287.2151 7.51541,0 0,0.4326 -7.51541,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31104-2-3" d="m 843.22076,2288.3206 7.51552,0 0,0.4327 -7.51552,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 852.13299,2288.3206 7.51542,0 0,0.4327 -7.51542,0 z" id="path31106-0-0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31108-1-7" d="m 861.17816,2288.3206 7.51543,0 0,0.4327 -7.51543,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31110-6-4" style="fill:#000000;stroke:none" d="m 838.96467,2283.9945 1.38294,0 c 0,0 0.25864,2.4061 0.38796,3.6094 0.0104,0.044 0.33214,0.047 0.65,0.084 0.0818,0.011 0.0104,-1.2687 -0.0362,-2.4321 -0.0196,-0.5305 -0.0932,-1.2885 -0.0621,-1.6162 2.93,-0.054 22.65995,-0.012 25.5126,0 0.0166,0.3067 0.0176,0.2357 0.0104,0.3364 -1.04002,0.012 -24.98124,-0.012 -24.96705,0 0.14929,1.4649 0.0776,3.8028 0.21235,4.9223 -0.83534,-0.015 -2.2804,-0.1363 -3.09078,-0.1363 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path31112-4-7" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.12343,2284.4585 0,0.493 2.2101,0 0.0166,0.8291 0.53632,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.12343,2287.8956 0,-0.4928 2.20999,0 0.0166,-0.8291 0.53622,0 0,0.8284 0,0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31114-0-8"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 748.03007,2248.9762 30.00677,0.051 0.18161,6.6305 -29.93734,-0.049 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44642299" id="path31116-6-3"/>
+        <path inkscape:connector-curvature="0" id="path31118-1-7" d="m 751.46542,2250.7066 7.64163,0 0,0.7691 -7.64163,0 z" style="fill:#000000;stroke:none"/>
+        <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path31120-8-1" d="m 770.27877,2250.5662 0,3.4129 3.24608,0 0,-2.9359 0,-0.2525 0,-0.2245 -1.48782,0 0.76079,0.013 -0.0166,0.1088 0,3.1723 -1.0651,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 z" style="fill:#000000;stroke:none"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.52726,2250.7066 7.64164,0 0,0.7691 -7.64164,0 z" id="path31122-9-0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 751.68182,2252.1487 7.64162,0 0,0.4327 -7.64162,0 z" id="path31124-8-0"/>
+        <path id="path31126-4-8" d="m 760.74366,2252.1487 7.64162,0 0,0.4327 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31128-1-3" d="m 751.84416,2253.3024 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 760.90589,2253.3024 7.64175,0 0,0.4326 -7.64175,0 z" id="path31130-4-4"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 751.8982,2254.408 7.64174,0 0,0.4327 -7.64174,0 z" id="path31132-3-5"/>
+        <path id="path31134-9-0" d="m 760.96004,2254.408 7.64164,0 0,0.4327 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 770.15711,2254.408 7.64164,0 0,0.4327 -7.64164,0 z" id="path31136-8-1"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 748.03007,2250.0818 0.94674,0 c 0,0 0.26299,2.4062 0.39447,3.6094 0.0104,0.044 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4321 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6163 2.97917,-0.054 23.04033,-0.011 25.94092,0 0.0176,0.3069 0.0186,0.236 0.0104,0.3366 -1.05752,0.012 -25.40066,-0.011 -25.38627,0 0.15178,1.4649 0.0797,3.8028 0.21598,4.9222 -0.84942,-0.015 -1.31885,0.047 -2.1428,0.047 z" style="fill:#000000;stroke:none" id="path31138-8-4"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.35097,2250.5459 0,0.4929 2.24716,0 0.0166,0.8291 0.54522,0 0,-0.8284 0,-0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31140-0-5"/>
+        <path id="path31142-8-6" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.35107,2253.983 0,-0.4927 2.24706,0 0.0166,-0.8293 0.54522,0 0,0.8284 0,0.4926 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path31144-7-2" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44610023" d="m 748.36605,2255.8535 29.82127,-0.048 0.18134,6.6801 -29.98574,2e-4 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#000000;stroke:none" d="m 751.8014,2257.584 7.64163,0 0,0.769 -7.64163,0 z" id="path31146-7-0" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;stroke:none" d="m 770.61474,2257.4435 0,3.4129 3.24598,0 0,-2.936 0,-0.2523 0,-0.2246 -1.48771,0 0.76078,0.013 -0.0166,0.1086 0,3.1725 -1.06519,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1725 1.01445,0 0.0166,-0.1202 z" id="path31148-8-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+        <path id="path31150-3-5" d="m 760.86314,2257.584 7.64173,0 0,0.769 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31152-8-6" d="m 752.01779,2259.0259 7.64163,0 0,0.4328 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.07953,2259.0259 7.64174,0 0,0.4328 -7.64174,0 z" id="path31154-3-6"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 752.18014,2260.1797 7.64163,0 0,0.4326 -7.64163,0 z" id="path31156-7-6"/>
+        <path id="path31158-1-7" d="m 761.24188,2260.1797 7.64162,0 0,0.4326 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31160-0-6" d="m 752.23418,2261.2854 7.64163,0 0,0.4325 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 761.29603,2261.2854 7.64162,0 0,0.4325 -7.64162,0 z" id="path31162-7-7"/>
+        <path id="path31164-3-7" d="m 770.49299,2261.2854 7.64173,0 0,0.4325 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31166-4-1" style="fill:#000000;stroke:none" d="m 748.36605,2256.959 0.94674,0 c 0,0 0.26299,2.4063 0.39437,3.6096 0.0104,0.043 0.33784,0.047 0.66098,0.084 0.0828,0.011 0.0104,-1.2687 -0.0362,-2.432 -0.0197,-0.5304 -0.0942,-1.2884 -0.0632,-1.6161 2.97907,-0.054 23.04034,-0.012 25.94092,0 0.0176,0.3066 0.0187,0.2357 0.0103,0.3363 -1.05752,0.012 -25.40055,-0.012 -25.38617,0 0.15179,1.4649 0.0797,3.8029 0.21588,4.9222 -0.84931,-0.015 -1.31885,0.047 -2.1428,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path31168-9-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 774.68684,2257.4232 0,0.4928 2.24727,0 0.0166,0.8291 0.54533,0 0,-0.8283 0,-0.4926 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 774.68695,2260.8602 0,-0.4927 2.24705,0 0.0166,-0.8292 0.54523,0 0,0.8283 0,0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31170-6-1"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 778.40169,2249.0771 29.98233,-0.048 0.0647,6.7293 -29.85228,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44730246" id="path31172-5-6"/>
+        <path inkscape:connector-curvature="0" id="path31174-1-2" d="m 781.83704,2250.8077 7.64164,0 0,0.7689 -7.64164,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path31176-0-7" d="m 800.65039,2250.6671 0,3.413 3.24608,0 0,-3.413 -1.48782,0 0.76079,0.013 -0.0166,0.1086 0,3.1723 -1.06509,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 790.89888,2250.8077 7.64164,0 0,0.7689 -7.64164,0 z" id="path31178-9-2" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.05344,2252.2497 7.64173,0 0,0.4327 -7.64173,0 z" id="path31180-9-7" sodipodi:nodetypes="ccccc"/>
+        <path id="path31182-6-6" d="m 791.11528,2252.2497 7.64162,0 0,0.4327 -7.64162,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path31184-8-5" d="m 782.21578,2253.4034 7.64163,0 0,0.4327 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.27752,2253.4034 7.64174,0 0,0.4327 -7.64174,0 z" id="path31186-3-1" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.26993,2254.509 7.64163,0 0,0.4326 -7.64163,0 z" id="path31188-4-3" sodipodi:nodetypes="ccccc"/>
+        <path id="path31190-8-9" d="m 791.33166,2254.509 7.64164,0 0,0.4326 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.52873,2254.509 7.64164,0 0,0.4326 -7.64164,0 z" id="path31192-4-9" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 778.40169,2250.1828 0.94674,0 c 0,0 0.26299,2.4061 0.39447,3.6094 0.0104,0.043 0.33775,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97917,-0.054 23.04034,-0.011 25.94092,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40056,-0.011 -25.38617,0 0.15179,1.4651 0.0797,3.8028 0.21588,4.9223 -0.84942,-0.015 -1.72461,0.047 -2.54856,0.047 z" style="fill:#000000;stroke:none" id="path31194-9-5"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.54016,2250.6468 0,0.4929 2.24726,0 0.0166,0.8292 0.54532,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31196-9-9"/>
+        <path id="path31198-2-2" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.54026,2254.0839 0,-0.4927 2.24716,0 0.0166,-0.8292 0.54523,0 0,0.8284 0,0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path31200-5-6" style="fill:#808080;stroke:#000000;stroke-width:0.44695815" d="m 778.55233,2255.9534 29.93614,-0.048 0.0649,6.7297 -29.80626,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 781.97112,2257.684 7.60477,0 0,0.769 -7.60477,0 z" id="path31202-5-5" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 800.69377,2257.5435 0,3.4129 3.23035,0 0,-3.4129 -1.48058,0 0.75717,0.013 -0.0166,0.1086 0,3.1724 -1.06001,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1724 1.00948,0 0.0166,-0.1203 -1.74978,0 z" id="path31204-3-3"/>
+        <path sodipodi:nodetypes="ccccc" id="path31206-3-2" d="m 790.98927,2257.684 7.60477,0 0,0.769 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31208-3-4" d="m 782.18647,2259.1259 7.60478,0 0,0.4328 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.20453,2259.1259 7.60487,0 0,0.4328 -7.60487,0 z" id="path31210-7-4"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 782.348,2260.2798 7.60477,0 0,0.4325 -7.60477,0 z" id="path31212-4-4"/>
+        <path sodipodi:nodetypes="ccccc" id="path31214-3-2" d="m 791.36615,2260.2798 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31216-8-7" d="m 782.40183,2261.3854 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 791.41998,2261.3854 7.60477,0 0,0.4325 -7.60477,0 z" id="path31218-0-9"/>
+        <path sodipodi:nodetypes="ccccc" id="path31220-8-2" d="m 800.57264,2261.3854 7.60486,0 0,0.4325 -7.60486,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31222-8-3" style="fill:#000000;stroke:none" d="m 778.55233,2257.059 0.9422,0 c 0,0 0.26163,2.4062 0.3925,3.6096 0.0104,0.043 0.33618,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5303 -0.0942,-1.2883 -0.0621,-1.6161 2.96478,-0.054 22.92926,-0.012 25.81586,0 0.0176,0.3067 0.0186,0.2357 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15106,1.4649 0.0787,3.8028 0.21484,4.9221 -0.84517,-0.015 -1.71623,0.047 -2.53624,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path31224-0-7" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 804.5648,2257.5232 0,0.4928 2.23639,0 0.0166,0.8291 0.54275,0 0,-0.8284 0,-0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 804.56491,2260.9602 0,-0.4927 2.23628,0 0.0166,-0.8291 0.54265,0 0,0.8282 0,0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31226-6-3"/>
+        <path id="path31228-8-1" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327" d="m 808.55075,2249.053 30.07268,-0.026 -0.24475,6.7074 -29.82793,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 811.92201,2250.7836 7.64164,0 0,0.7689 -7.64164,0 z" id="path31230-1-5" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.73536,2250.6429 0,3.4131 3.24608,0 0,-3.4131 -1.48782,0 0.76079,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75827,0 z" id="path31232-9-7"/>
+        <path sodipodi:nodetypes="ccccc" id="path31234-8-8" d="m 820.98386,2250.7836 7.64163,0 0,0.7689 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31236-9-5" d="m 812.13841,2252.2255 7.64173,0 0,0.4328 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.20025,2252.2255 7.64164,0 0,0.4328 -7.64164,0 z" id="path31238-7-8"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.30075,2253.3792 7.64164,0 0,0.4328 -7.64164,0 z" id="path31240-2-3"/>
+        <path sodipodi:nodetypes="ccccc" id="path31242-2-2" d="m 821.3625,2253.3792 7.64173,0 0,0.4328 -7.64173,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31244-8-4" d="m 812.3549,2254.4849 7.64164,0 0,0.4326 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.41665,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z" id="path31246-2-1"/>
+        <path sodipodi:nodetypes="ccccc" id="path31248-8-1" d="m 830.61371,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31250-9-5" style="fill:#000000;stroke:none" d="m 808.48667,2250.1587 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0104,0.043 0.33774,0.047 0.66088,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0186,0.2358 0.0104,0.3365 -1.05752,0.012 -25.40055,-0.011 -25.38616,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path31252-0-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.62513,2250.6227 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.62524,2254.0598 0,-0.4928 2.24715,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31254-7-5"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.55075,2255.9292 29.88415,-0.048 -0.12173,6.7296 -29.76242,-0.091 z" style="fill:#808080;stroke:#000000;stroke-width:0.44594821" id="path31256-8-1"/>
+        <path inkscape:connector-curvature="0" id="path31258-1-0" d="m 812.05609,2257.6599 7.60477,0 0,0.769 -7.60477,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path31260-5-6" d="m 830.77875,2257.5194 0,3.4128 3.23034,0 0,-3.4128 -1.48058,0 0.75717,0.013 -0.0166,0.1085 0,3.1725 -1.06002,0 -0.0166,0.097 -0.68976,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74988,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.07424,2257.6599 7.60478,0 0,0.769 -7.60478,0 z" id="path31262-8-4" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.27145,2259.1018 7.60477,0 0,0.4328 -7.60477,0 z" id="path31264-6-5" sodipodi:nodetypes="ccccc"/>
+        <path id="path31266-1-3" d="m 821.2895,2259.1018 7.60488,0 0,0.4328 -7.60488,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path31268-2-0" d="m 812.43297,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 821.45112,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z" id="path31270-4-8" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 812.48681,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z" id="path31272-2-9" sodipodi:nodetypes="ccccc"/>
+        <path id="path31274-5-1" d="m 821.50497,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 830.65761,2261.3612 7.60487,0 0,0.4325 -7.60487,0 z" id="path31276-8-3" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 808.63732,2257.0349 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33618,0.047 0.65776,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96477,-0.054 22.92924,-0.012 25.81584,0 0.0176,0.3066 0.0186,0.2356 0.0104,0.3365 -1.05244,0.012 -25.27817,-0.012 -25.26388,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53624,0.047 z" style="fill:#000000;stroke:none" id="path31278-6-4"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 834.64978,2257.499 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31280-2-7"/>
+        <path id="path31282-6-4" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 834.64988,2260.936 0,-0.4926 2.23629,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 838.96467,2249.053 29.74135,-0.026 0.0866,6.7074 -29.82792,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44612327" id="path31284-5-6"/>
+        <path inkscape:connector-curvature="0" id="path31286-3-3" d="m 842.33593,2250.7836 7.64163,0 0,0.7689 -7.64163,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+        <path id="path31288-9-6" d="m 861.14927,2250.6429 0,3.4131 3.24609,0 0,-3.4131 -1.48782,0 0.76078,0.013 -0.0166,0.1087 0,3.1723 -1.06508,0 -0.0166,0.097 -0.69318,0 0,-0.097 0,-3.1723 1.01435,0 0.0166,-0.1203 -1.75826,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.39778,2250.7836 7.64162,0 0,0.7689 -7.64162,0 z" id="path31290-2-5" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.55232,2252.2255 7.64174,0 0,0.4328 -7.64174,0 z" id="path31292-4-2" sodipodi:nodetypes="ccccc"/>
+        <path id="path31294-6-8" d="m 851.61416,2252.2255 7.64164,0 0,0.4328 -7.64164,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path31296-1-1" d="m 842.71467,2253.3792 7.64163,0 0,0.4328 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.77641,2253.3792 7.64173,0 0,0.4328 -7.64173,0 z" id="path31298-8-0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.76882,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z" id="path31300-2-3" sodipodi:nodetypes="ccccc"/>
+        <path id="path31302-1-1" d="m 851.83056,2254.4849 7.64163,0 0,0.4326 -7.64163,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.02763,2254.4849 7.64162,0 0,0.4326 -7.64162,0 z" id="path31304-1-5" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 838.90059,2250.1587 0.94673,0 c 0,0 0.26299,2.4061 0.39448,3.6094 0.0103,0.043 0.33773,0.047 0.66087,0.084 0.0828,0.012 0.0104,-1.2688 -0.0362,-2.4322 -0.0196,-0.5305 -0.0942,-1.2884 -0.0632,-1.6162 2.97916,-0.054 23.04033,-0.011 25.94091,0 0.0176,0.3068 0.0187,0.2358 0.0104,0.3365 -1.05753,0.012 -25.40056,-0.011 -25.38617,0 0.15178,1.465 0.0797,3.8028 0.21587,4.9222 -0.84941,-0.015 -1.72461,0.047 -2.54855,0.047 z" style="fill:#000000;stroke:none" id="path31306-9-5"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.03905,2250.6227 0,0.4929 2.24726,0 0.0166,0.8292 0.54533,0 0,-0.8284 0,-0.4927 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31308-7-2"/>
+        <path id="path31310-6-2" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.03915,2254.0598 0,-0.4928 2.24716,0 0.0166,-0.8292 0.54522,0 0,0.8285 0,0.4924 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path id="path31312-2-1" style="fill:#808080;stroke:#000000;stroke-width:0.44594821" d="m 838.96467,2255.9292 29.88414,-0.048 -0.12173,6.7296 -29.76241,-0.091 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 842.47001,2257.6599 7.60477,0 0,0.769 -7.60477,0 z" id="path31314-9-7" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 861.19266,2257.5194 0,3.4128 3.23035,0 0,-3.4128 -1.48058,0 0.75716,0.013 -0.0166,0.1085 0,3.1725 -1.06001,0 -0.0166,0.097 -0.68977,0 0,-0.097 0,-3.1725 1.00949,0 0.0166,-0.1203 -1.74987,0 z" id="path31316-5-4"/>
+        <path sodipodi:nodetypes="ccccc" id="path31318-2-8" d="m 851.48816,2257.6599 7.60478,0 0,0.769 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31320-0-2" d="m 842.68537,2259.1018 7.60477,0 0,0.4328 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.70341,2259.1018 7.60488,0 0,0.4328 -7.60488,0 z" id="path31322-0-3"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 842.84688,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z" id="path31324-3-6"/>
+        <path sodipodi:nodetypes="ccccc" id="path31326-9-3" d="m 851.86503,2260.2557 7.60478,0 0,0.4325 -7.60478,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" id="path31328-1-0" d="m 842.90073,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 851.91888,2261.3612 7.60477,0 0,0.4325 -7.60477,0 z" id="path31330-8-3"/>
+        <path sodipodi:nodetypes="ccccc" id="path31332-1-5" d="m 861.07152,2261.3612 7.60488,0 0,0.4325 -7.60488,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+        <path id="path31334-9-2" style="fill:#000000;stroke:none" d="m 839.05123,2257.0349 0.94218,0 c 0,0 0.26164,2.4062 0.39251,3.6095 0.0104,0.043 0.33619,0.047 0.65777,0.084 0.0828,0.011 0.0104,-1.2686 -0.0362,-2.4321 -0.0196,-0.5304 -0.0932,-1.2884 -0.0621,-1.6161 2.96478,-0.054 22.92924,-0.012 25.81585,0 0.0176,0.3066 0.0187,0.2356 0.0104,0.3365 -1.05245,0.012 -25.27818,-0.012 -25.26389,0 0.15105,1.4649 0.0787,3.8027 0.21483,4.9221 -0.84517,-0.015 -1.71622,0.047 -2.53623,0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+        <path id="path31336-5-8" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 865.0637,2257.499 0,0.4929 2.23639,0 0.0166,0.8291 0.54274,0 0,-0.8284 0,-0.4925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 865.06379,2260.936 0,-0.4926 2.2363,0 0.0166,-0.8291 0.54263,0 0,0.8282 0,0.4928 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path31338-3-0"/>
+        <path inkscape:connector-curvature="0" d="m 834.13554,2244.9202 34.55518,0 -0.12351,3.3621 -34.55519,0 z" style="fill:url(#linearGradient31399-6);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47515267" id="path115118-6-7"/>
+        <path inkscape:connector-curvature="0" d="m 864.91226,2245.2773 0.47657,0 c 0.1074,0 0.18775,0.011 0.24076,0.021 0.071,0.018 0.12797,0.051 0.17038,0.098 0.0424,0.047 0.0689,0.1049 0.0806,0.1729 0.0117,0.069 0,0.1521 -0.0202,0.252 -0.0212,0.088 -0.053,0.1635 -0.0954,0.2271 -0.052,0.077 -0.11302,0.1404 -0.18479,0.1884 -0.0541,0.036 -0.12235,0.066 -0.2042,0.085 -0.0615,0.015 -0.14016,0.022 -0.23643,0.022 l -0.49067,0 z m 0.21617,0.1805 -0.1742,0.7066 0.19467,0 c 0.0731,0 0.12616,0 0.1602,-0.011 0.0445,-0.011 0.0827,-0.024 0.1162,-0.044 0.0329,-0.021 0.0647,-0.055 0.0933,-0.1039 0.0297,-0.048 0.0541,-0.1128 0.0742,-0.1953 0.0202,-0.083 0.0276,-0.1458 0.0202,-0.19 -0.0106,-0.044 -0.0233,-0.079 -0.0488,-0.1028 -0.0254,-0.025 -0.0615,-0.041 -0.10836,-0.05 -0.035,-0.011 -0.10497,-0.011 -0.21151,-0.011 z m -1.35412,0.8863 -0.19846,-1.0668 0.28276,0 0.13209,0.7896 0.51104,-0.7896 0.2766,0 -0.72561,1.0668 z m -1.37108,-1.0668 0.47669,0 c 0.1074,0 0.18775,0.011 0.24067,0.021 0.071,0.018 0.12806,0.051 0.17047,0.098 0.0424,0.047 0.0689,0.1049 0.0806,0.1729 0.0117,0.069 0,0.1521 -0.0202,0.252 -0.0212,0.088 -0.053,0.1635 -0.0954,0.2271 -0.052,0.077 -0.11312,0.1404 -0.18479,0.1884 -0.0541,0.036 -0.12235,0.066 -0.20432,0.085 -0.0615,0.015 -0.14004,0.022 -0.23631,0.022 l -0.49067,0 z m 0.2163,0.1805 -0.17431,0.7066 0.19477,0 c 0.0731,0 0.12616,0 0.1602,-0.011 0.0445,-0.011 0.0827,-0.024 0.1162,-0.044 0.0329,-0.021 0.0647,-0.055 0.0933,-0.1039 0.0297,-0.048 0.0541,-0.1128 0.0742,-0.1953 0.0202,-0.083 0.0276,-0.1458 0.0202,-0.19 -0.0106,-0.044 -0.0233,-0.079 -0.0488,-0.1028 -0.0255,-0.025 -0.0615,-0.041 -0.10825,-0.05 -0.035,-0.011 -0.10496,-0.011 -0.21152,-0.011 z" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold" id="path115120-2-2"/>
+        <path style="fill:#ffffff;stroke:none" d="m 864.01307,2246.6725 c -1.1832,0 -2.14239,0.1318 -2.14239,0.2952 0,0.1633 0.95919,0.2952 2.14239,0.2952 1.18333,0 2.1425,-0.1319 2.1425,-0.2952 0,-0.1634 -0.95917,-0.2952 -2.1425,-0.2952 z m 0,0.2134 c 0.33217,0 0.60148,0.037 0.60148,0.082 0,0.046 -0.26931,0.082 -0.60148,0.082 -0.33206,0 -0.60135,-0.037 -0.60135,-0.082 0,-0.046 0.26929,-0.082 0.60135,-0.082 z" id="path115122-8-2" inkscape:connector-curvature="0"/>
+        <text xml:space="preserve" style="font-size:0.70121336px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="848.68781" y="2286.3989" id="text115124-8-5" sodipodi:linespacing="125%" transform="scale(1.0170762,0.9832105)"><tspan sodipodi:role="line" id="tspan115126-1-9" x="848.68781" y="2286.3989">ROM</tspan></text>
+        <path inkscape:connector-curvature="0" d="m 852.11749,2245.5239 c 0,0 -0.10603,0 -0.10603,0 0,0 0,-0.1313 0,-0.1313 0,0 0.10942,0 0.10942,0 0.053,0 0.0795,0.021 0.0795,0.062 0,0.047 -0.0276,0.069 -0.0827,0.069 z m 0.84171,0.066 c -0.0148,0.073 -0.0541,0.1094 -0.11705,0.1094 -0.088,0 -0.13211,-0.053 -0.13211,-0.1605 0,-0.105 0.0445,-0.1569 0.13211,-0.1569 0.0625,0 0.10072,0.026 0.11323,0.081 0,0 0.053,0 0.053,0 -0.018,-0.085 -0.0732,-0.1276 -0.16614,-0.1276 -0.12584,0 -0.18872,0.068 -0.18872,0.2043 0,0.1363 0.0604,0.2044 0.1812,0.2044 0.10284,0 0.16232,-0.051 0.17748,-0.1533 0,0 -0.053,0 -0.053,0 z m -1.78923,-0.2554 c -0.13084,0 -0.19625,0.068 -0.19625,0.2043 0,0.1363 0.0657,0.2044 0.19625,0.2044 0.13093,0 0.19635,-0.068 0.19635,-0.2044 0,-0.1363 -0.0657,-0.2043 -0.19635,-0.2043 z m -0.3169,0.2554 c -0.0127,0.073 -0.0509,0.1094 -0.11334,0.1094 -0.0901,0 -0.13582,-0.053 -0.13582,-0.1605 0,-0.105 0.0435,-0.1569 0.13211,-0.1569 0.0625,0 0.10072,0.026 0.11323,0.081 0,0 0.053,0 0.053,0 -0.0106,-0.085 -0.0657,-0.1276 -0.16603,-0.1276 -0.12331,0 -0.18501,0.068 -0.18501,0.2043 0,0.1363 0.0594,0.2044 0.17737,0.2044 0.10286,0 0.16232,-0.051 0.17749,-0.1533 0,0 -0.053,0 -0.053,0 z m 2.51378,-0.2445 c 0,0 -0.32453,0 -0.32453,0 0,0 0,0.048 0,0.048 0,0 0.13581,0 0.13581,0 0,0 0,0.343 0,0.343 0,0 0.053,0 0.053,0 0,0 0,-0.343 0,-0.343 0,0 0.13592,0 0.13592,0 0,0 0,-0.048 0,-0.048 z m -0.87945,0 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.15086,0.3905 -0.15086,0.3905 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1132 0.0413,-0.1132 0,0 0.16232,0 0.16232,0 0,0 0.0382,0.1132 0.0382,0.1132 0,0 0.0604,0 0.0604,0 0,0 -0.14727,-0.3905 -0.14727,-0.3905 z m -0.35104,0 c 0,0 -0.17738,0 -0.17738,0 0,0 0,0.3905 0,0.3905 0,0 0.053,0 0.053,0 0,0 0,-0.1643 0,-0.1643 0,0 0.12458,0 0.12458,0 0.0806,0 0.12076,-0.039 0.12076,-0.1168 0,-0.073 -0.0403,-0.1094 -0.12076,-0.1094 z m -0.29443,0 c 0,0 -0.0753,0 -0.0753,0 0,0 -0.11705,0.3284 -0.11705,0.3284 0,0 -0.11323,-0.3284 -0.11323,-0.3284 0,0 -0.0795,0 -0.0795,0 0,0 0,0.3905 0,0.3905 0,0 0.053,0 0.053,0 0,0 0,-0.3248 0,-0.3248 0,0 0.11323,0.3248 0.11323,0.3248 0,0 0.053,0 0.053,0 0,0 0.11704,-0.3285 0.11704,-0.3285 0,0 0,0.099 0,0.099 0,0 0,0.23 0,0.23 0,0 0.053,0 0.053,0 0,0 0,-0.3905 0,-0.3905 z m -1.51739,0.069 c 0,-0.03 -0.0148,-0.044 -0.0456,-0.044 0,0 -0.41136,0 -0.41136,0 -0.0297,0 -0.0456,0.015 -0.0456,0.044 0,0 0,0.4123 0,0.4123 0,0.019 -0.0106,0.03 -0.0297,0.03 0,0 -0.37744,0 -0.37744,0 -0.0784,0 -0.14217,0.024 -0.19253,0.075 -0.0509,0.05 -0.0753,0.1125 -0.0753,0.188 0,0 0,0.9085 0,0.9085 0,0.073 0.0255,0.135 0.0774,0.1861 0.052,0.051 0.11502,0.076 0.19063,0.076 0,0 0.86429,0 0.86429,0 0.0308,0 0.0456,-0.016 0.0456,-0.048 0,0 0,-1.8282 0,-1.8282 z m 3.13667,1.2734 c 0,-0.032 -0.0148,-0.048 -0.0456,-0.048 0,0 -0.37733,0 -0.37733,0 -0.0329,0 -0.0488,0.016 -0.0488,0.048 0,0 0,0.2117 0,0.2117 0,0.06 -0.0297,0.091 -0.0912,0.091 -0.0625,0 -0.0944,-0.031 -0.0944,-0.091 0,0 0,-0.6494 0,-0.6494 0,-0.061 0.0318,-0.091 0.0944,-0.091 0.0604,0 0.0912,0.031 0.0912,0.091 0,0 0,0.1714 0,0.1714 0,0.03 0.0159,0.043 0.0488,0.043 0,0 0.37733,0 0.37733,0 0.0308,0 0.0456,-0.015 0.0456,-0.043 0,0 0,-0.3028 0,-0.3028 0,-0.073 -0.0265,-0.1351 -0.0795,-0.1861 -0.053,-0.051 -0.11704,-0.076 -0.19253,-0.076 0,0 -0.58122,0 -0.58122,0 -0.0753,0 -0.13973,0.025 -0.19264,0.076 -0.053,0.051 -0.0795,0.1132 -0.0795,0.1861 0,0 0,0.9049 0,0.9049 0,0.075 0.0254,0.1387 0.0774,0.1898 0.052,0.051 0.11641,0.076 0.19445,0.076 0,0 0.58121,0 0.58121,0 0.0774,0 0.14271,-0.025 0.19434,-0.076 0.052,-0.051 0.0774,-0.1144 0.0774,-0.1898 0,0 0,-0.3358 0,-0.3358 z m -1.24936,-0.076 c 0,-0.073 -0.0265,-0.135 -0.0795,-0.1861 -0.053,-0.051 -0.11705,-0.076 -0.19254,-0.076 0,0 -0.35114,0 -0.35114,0 -0.0382,0 -0.0562,-0.018 -0.0562,-0.055 0,-0.039 0.0191,-0.058 0.0562,-0.058 0,0 0.52852,0 0.52852,0 0.0297,0 0.0456,-0.015 0.0456,-0.043 0,0 0,-0.2919 0,-0.2919 0,-0.03 -0.0149,-0.043 -0.0456,-0.043 0,0 -0.74735,0 -0.74735,0 -0.0753,0 -0.13974,0.025 -0.19254,0.076 -0.053,0.051 -0.0795,0.1131 -0.0795,0.186 0,0 0,0.3867 0,0.3867 0,0.073 0.0265,0.1351 0.0795,0.1862 0.053,0.051 0.11694,0.076 0.19254,0.076 0,0 0.35104,0 0.35104,0 0.0477,0 0.0721,0.024 0.0721,0.073 0,0.043 -0.0244,0.066 -0.0721,0.066 0,0 -0.57761,0 -0.57761,0 -0.0297,0 -0.0456,0.016 -0.0456,0.048 0,0 0,0.2884 0,0.2884 0,0.032 0.0148,0.048 0.0456,0.048 0,0 0.79654,0 0.79654,0 0.0774,0 0.14271,-0.025 0.19434,-0.076 0.052,-0.051 0.0774,-0.1144 0.0774,-0.1898 0,0 0,-0.4124 0,-0.4124 z m 1.14376,1.2225 c 0,0 -0.24173,0 -0.24173,0 0,0 0,-0.1313 0,-0.1313 0,0 0.21894,0 0.21894,0 0,0 0,-0.043 0,-0.043 0,0 -0.21894,0 -0.21894,0 0,0 0,-0.1203 0,-0.1203 0,0 0.23792,0 0.23792,0 0,0 0,-0.048 0,-0.048 0,0 -0.29072,0 -0.29072,0 0,0 0,0.3867 0,0.3867 0,0 0.29453,0 0.29453,0 0,0 0,-0.043 0,-0.043 z m -0.3926,-0.1606 c 0,0 -0.17748,0 -0.17748,0 0,0 0,0.044 0,0.044 0,0 0.12468,0 0.12468,0 0,0.085 -0.0413,0.1276 -0.12468,0.1276 -0.088,0 -0.1321,-0.053 -0.1321,-0.1605 0,-0.1049 0.0445,-0.1569 0.1321,-0.1569 0.0657,0 0.10496,0.026 0.11705,0.081 0,0 0.053,0 0.053,0 -0.0106,-0.085 -0.0668,-0.1277 -0.16985,-0.1277 -0.12584,0 -0.18872,0.068 -0.18872,0.2043 0,0.068 0.018,0.1193 0.0551,0.1533 0.036,0.034 0.0795,0.051 0.13019,0.051 0.0604,0 0.10496,-0.021 0.13221,-0.062 0,0 0.0148,0.051 0.0148,0.051 0,0 0.0339,0 0.0339,0 0,0 0,-0.2043 0,-0.2043 z m -0.52841,-0.1824 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.1548,0.3867 -0.1548,0.3867 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16222,0 0.16222,0 0,0 0.0413,0.1094 0.0413,0.1094 0,0 0.0562,0 0.0562,0 0,0 -0.14345,-0.3867 -0.14345,-0.3867 z m -0.22657,0.3794 c -0.0127,0 -0.0191,-0.018 -0.0191,-0.04 0,0 0,-0.069 0,-0.069 0,-0.032 -0.0191,-0.056 -0.0488,-0.073 0.0382,-0.019 0.0562,-0.05 0.0562,-0.091 0,-0.07 -0.0445,-0.1061 -0.13221,-0.1061 0,0 -0.18862,0 -0.18862,0 0,0 0,0.3868 0,0.3868 0,0 0.0562,0 0.0562,0 0,0 0,-0.1642 0,-0.1642 0,0 0.13199,0 0.13199,0 0.0456,0 0.0689,0.023 0.0721,0.069 0,0 0.0106,0.094 0.0106,0.094 0,0 0.0679,-0.011 0.0679,-0.011 z m -0.58503,-0.3904 c -0.13083,0 -0.19625,0.068 -0.19625,0.2043 0,0.058 0.018,0.1071 0.053,0.146 0.035,0.039 0.0827,0.058 0.14345,0.058 0.13083,0 0.19625,-0.068 0.19625,-0.2044 0,-0.1362 -0.0657,-0.2043 -0.19625,-0.2043 z m -0.19625,0.011 c 0,0 -0.32846,0 -0.32846,0 0,0 0,0.048 0,0.048 0,0 0.13974,0 0.13974,0 0,0 0,0.3393 0,0.3393 0,0 0.053,0 0.053,0 0,0 0,-0.3393 0,-0.3393 0,0 0.13592,0 0.13592,0 0,0 0,-0.048 0,-0.048 z m -0.43024,0.1752 c 0,0 -0.11333,-0.025 -0.11333,-0.025 -0.0329,-0.011 -0.0488,-0.023 -0.0488,-0.048 0,-0.047 0.0307,-0.069 0.0901,-0.069 0.0679,0 0.10179,0.026 0.10179,0.081 0,0 0.0488,0 0.0488,0 0,-0.083 -0.052,-0.1241 -0.1548,-0.1241 -0.0933,0 -0.13963,0.04 -0.13963,0.1204 0,0.049 0.0286,0.08 0.0869,0.091 0,0 0.0795,0.018 0.0795,0.018 0.0583,0.013 0.0869,0.035 0.0869,0.069 0,0.044 -0.035,0.066 -0.10602,0.066 -0.0731,0 -0.10941,-0.031 -0.10941,-0.091 0,0 -0.0488,0 -0.0488,0 0,0.09 0.053,0.1351 0.1585,0.1351 0.10602,0 0.1585,-0.039 0.1585,-0.1168 0,-0.056 -0.0297,-0.091 -0.0901,-0.106 z m -0.60411,-0.1752 c 0,0 -0.0604,0 -0.0604,0 0,0 -0.15109,0.3868 -0.15109,0.3868 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16243,0 0.16243,0 0,0 0.0371,0.1094 0.0371,0.1094 0,0 0.0604,0 0.0604,0 0,0 -0.14726,-0.3868 -0.14726,-0.3868 z m -0.13963,0 c 0,0 -0.32835,0 -0.32835,0 0,0 0,0.048 0,0.048 0,0 0.13963,0 0.13963,0 0,0 0,0.3393 0,0.3393 0,0 0.0562,0 0.0562,0 0,0 0,-0.3393 0,-0.3393 0,0 0.13209,0 0.13209,0 0,0 0,-0.048 0,-0.048 z m -0.43024,0 c 0,0 -0.0647,0 -0.0647,0 0,0 -0.15098,0.3868 -0.15098,0.3868 0,0 0.0562,0 0.0562,0 0,0 0.0413,-0.1094 0.0413,-0.1094 0,0 0.16232,0 0.16232,0 0,0 0.0413,0.1094 0.0413,0.1094 0,0 0.0604,0 0.0604,0 0,0 -0.14726,-0.3868 -0.14726,-0.3868 z m -0.41518,0 c 0,0 -0.16614,0 -0.16614,0 0,0 0,0.3868 0,0.3868 0,0 0.16232,0 0.16232,0 0.11323,0 0.16985,-0.066 0.16985,-0.1971 0,-0.1265 -0.0551,-0.1897 -0.16603,-0.1897 z m 2.98187,-1.9156 c 0,0 0.0679,-0.1715 0.0679,-0.1715 0,0 0.0562,0.1715 0.0562,0.1715 0,0 -0.12458,0 -0.12458,0 z m -1.21925,0.124 c -0.0933,0 -0.13964,-0.053 -0.13964,-0.1606 0,-0.1049 0.0466,-0.1569 0.13964,-0.1569 0.0933,0 0.13973,0.052 0.13973,0.1569 0,0.1071 -0.0466,0.1606 -0.13973,0.1606 z m -0.95484,1.5071 c 0,0 -0.80026,0 -0.80026,0 -0.053,0 -0.0965,-0.017 -0.1321,-0.051 -0.035,-0.034 -0.053,-0.076 -0.053,-0.1278 0,0 0,-0.9085 0,-0.9085 0,-0.051 0.018,-0.093 0.053,-0.1277 0.035,-0.034 0.0795,-0.051 0.1321,-0.051 0,0 0.4454,0 0.4454,0 0.0297,0 0.0456,-0.016 0.0456,-0.048 0,0 0,-0.4125 0,-0.4125 0,-0.019 0.0106,-0.03 0.0297,-0.03 0,0 0.27937,0 0.27937,0 0.018,0.017 0.0265,0.027 0.0265,0.03 0,0 0,1.7005 0,1.7005 0,0 -0.0106,0.014 -0.0265,0.026 z m 3.10825,-0.053 c -0.036,0.035 -0.0816,0.053 -0.1339,0.053 0,0 -0.58122,0 -0.58122,0 -0.053,0 -0.0986,-0.018 -0.13602,-0.053 -0.0371,-0.035 -0.0562,-0.079 -0.0562,-0.1296 0,0 0,-0.9049 0,-0.9049 0,-0.051 0.0191,-0.093 0.0562,-0.1278 0.0371,-0.034 0.0827,-0.051 0.13602,-0.051 0,0 0.58122,0 0.58122,0 0.0551,0 0.10072,0.017 0.13592,0.05 0.035,0.033 0.053,0.076 0.053,0.1295 0,0 0,0.2408 0,0.2408 0,0.017 -0.0106,0.026 -0.0265,0.026 0,0 -0.24915,0 -0.24915,0 -0.018,0 -0.0265,-0.011 -0.0265,-0.026 0,0 0,-0.1094 0,-0.1094 0,-0.049 -0.017,-0.089 -0.0509,-0.1222 -0.0339,-0.033 -0.0763,-0.049 -0.12648,-0.049 -0.0498,0 -0.0922,0.016 -0.12638,0.049 -0.0339,0.033 -0.0509,0.073 -0.0509,0.1222 0,0 0,0.6494 0,0.6494 0,0.049 0.017,0.089 0.0509,0.1223 0.0339,0.033 0.0763,0.049 0.12638,0.049 0.0509,0 0.0922,-0.016 0.12648,-0.049 0.0339,-0.033 0.0509,-0.074 0.0509,-0.1223 0,0 0,-0.1532 0,-0.1532 0,-0.017 0.0106,-0.026 0.0265,-0.026 0,0 0.24915,0 0.24915,0 0,0 0.0138,0.011 0.0265,0.026 0,0 0,0.2773 0,0.2773 0,0.051 -0.018,0.094 -0.0551,0.1296 z m -1.24936,0 c -0.036,0.035 -0.0806,0.053 -0.13391,0.053 0,0 -0.72848,0 -0.72848,0 -0.0201,0 -0.0297,-0.011 -0.0297,-0.026 0,0 0,-0.1642 0,-0.1642 0,-0.017 0.0106,-0.026 0.0297,-0.026 0,0 0.50954,0 0.50954,0 0.0424,0 0.0795,-0.015 0.10942,-0.043 0.0297,-0.03 0.0456,-0.065 0.0456,-0.106 0,-0.044 -0.0148,-0.081 -0.0435,-0.1095 -0.0286,-0.03 -0.0657,-0.043 -0.11132,-0.043 0,0 -0.35104,0 -0.35104,0 -0.053,0 -0.0975,-0.018 -0.13412,-0.053 -0.0361,-0.035 -0.0551,-0.079 -0.0551,-0.1297 0,0 0,-0.3867 0,-0.3867 0,-0.051 0.018,-0.093 0.0551,-0.1277 0.036,-0.034 0.0816,-0.051 0.13412,-0.051 0,0 0.67939,0 0.67939,0 0.018,0 0.0265,0.011 0.0265,0.025 0,0 0,0.1606 0,0.1606 0,0.019 -0.0106,0.03 -0.0265,0.03 0,0 -0.46056,0 -0.46056,0 -0.0933,0 -0.13963,0.047 -0.13963,0.1387 0,0.036 0.0138,0.068 0.0413,0.095 0.0276,0.026 0.0604,0.04 0.0986,0.04 0,0 0.35114,0 0.35114,0 0.0498,0 0.0944,0.018 0.1321,0.055 0.0371,0.036 0.0562,0.079 0.0562,0.1276 0,0 0,0.4124 0,0.4124 0,0.051 -0.018,0.094 -0.0551,0.1296 z m -1.14557,0.1367 c 0,0 -0.41137,0 -0.41137,0 -0.0297,0 -0.0456,-0.016 -0.0456,-0.048 0,0 0,-1.3428 0,-1.3428 0,-0.03 0.0148,-0.043 0.0456,-0.043 0,0 0.41137,0 0.41137,0 0.0297,0 0.0456,0.015 0.0456,0.043 0,0 0,1.3428 0,1.3428 0,0.032 -0.0149,0.048 -0.0456,0.048 z m 1.1286,0.3759 c 0,0 -0.12828,0 -0.12828,0 0,0 0,-0.1314 0,-0.1314 0,0 0.13581,0 0.13581,0 0.0477,0 0.0721,0.022 0.0721,0.066 0,0.043 -0.0265,0.066 -0.0795,0.066 z m 0.27937,0.051 c 0,0 0.0647,-0.1716 0.0647,-0.1716 0,0 0.0604,0.1716 0.0604,0.1716 0,0 -0.12458,0 -0.12458,0 z m -2.04209,0 c 0,0 0.0679,-0.1716 0.0679,-0.1716 0,0 0.0562,0.1716 0.0562,0.1716 0,0 -0.12457,0 -0.12457,0 z m -0.56998,0 c 0,0 0.0647,-0.1716 0.0647,-0.1716 0,0 0.0604,0.1716 0.0604,0.1716 0,0 -0.12458,0 -0.12458,0 z m -0.32082,0.1168 c 0,0 -0.10602,0 -0.10602,0 0,0 0,-0.2993 0,-0.2993 0,0 0.0986,0 0.0986,0 0.0827,0 0.12457,0.05 0.12457,0.1496 0,0.1 -0.0392,0.1497 -0.11704,0.1497 z m 2.21947,0.011 c -0.0933,0 -0.13963,-0.053 -0.13963,-0.1605 0,-0.105 0.0466,-0.1569 0.13963,-0.1569 0.0954,0 0.14345,0.052 0.14345,0.1569 0,0.1071 -0.0477,0.1605 -0.14345,0.1605 z m -0.7323,-1.8791 c 0,-0.017 -0.0106,-0.026 -0.0265,-0.026 0,0 -0.27937,0 -0.27937,0 -0.018,0 -0.0265,0.011 -0.0265,0.026 0,0 0,1.2151 0,1.2151 0,0.017 0.0106,0.025 0.0265,0.025 0,0 0.27937,0 0.27937,0 0.018,0 0.0265,-0.011 0.0265,-0.025 0,0 0,-1.2151 0,-1.2151 z m -0.98134,0.2773 c 0,-0.046 -0.017,-0.086 -0.0509,-0.1186 -0.0339,-0.033 -0.0753,-0.05 -0.12267,-0.05 -0.0477,0 -0.088,0.017 -0.12086,0.05 -0.0329,0.033 -0.0488,0.072 -0.0488,0.1186 0,0 0,0.6677 0,0.6677 0,0.049 0.0159,0.089 0.0466,0.1205 0.0318,0.032 0.0721,0.048 0.12266,0.048 0.0477,0 0.0891,-0.016 0.12267,-0.049 0.0339,-0.033 0.0509,-0.072 0.0509,-0.1185 0,0 0,-0.6677 0,-0.6677 z m -0.17366,0.7516 c -0.0583,0 -0.0869,-0.028 -0.0869,-0.084 0,0 0,-0.6678 0,-0.6678 0,-0.056 0.0286,-0.084 0.0869,-0.084 0.0551,0 0.0827,0.028 0.0827,0.084 0,0 0,0.6678 0,0.6678 0,0.056 -0.0276,0.084 -0.0827,0.084 z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path115128-6-1"/>
+        <path id="path115130-8-0" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 824.73596,2245.3148 2.15913,0 0,1.6709 -2.15913,0 z" inkscape:connector-curvature="0"/>
+        <path d="m 821.58598,2245.3148 2.15913,0 0,1.6709 -2.15913,0 z" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115132-7-8" inkscape:connector-curvature="0"/>
+        <path id="path115134-8-5" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.18184429;stroke-miterlimit:4" d="m 818.15103,2245.2839 1.37302,0 0,2.9493 -1.37302,0 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 818.98685,2245.2839 0.5372,0 0,2.9493 -0.5372,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.11374462;stroke-miterlimit:4" id="path115136-9-0"/>
+        <path inkscape:connector-curvature="0" d="m 824.73596,2247.6128 2.15913,0 0,0.7308 -2.15913,0 z" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115138-7-7"/>
+        <path inkscape:connector-curvature="0" id="path115140-9-9" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 821.58598,2247.6128 2.15913,0 0,0.7308 -2.15913,0 z"/>
+        <path id="path115581-0-0" style="fill:url(#linearGradient29985-8-2);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.65448451" d="m 748.10981,2245.2067 67.29069,0 0.0429,3.271 -67.00661,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 749.6123,2245.6006 1.74215,0 c 0.23626,0 0.44067,0.1574 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15834,-0.3527 0.3946,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115583-5-5" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115585-8-3" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 753.22102,2245.6006 1.74215,0 c 0.23627,0 0.44078,0.1574 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.39459,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1572 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15824,-0.3527 0.39449,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 756.86644,2245.6006 1.74215,0 c 0.23626,0 0.44066,0.1574 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15834,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15824,-0.3527 0.39449,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115587-2-4" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115589-6-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 749.6123,2247.1083 1.74215,0 c 0.23626,0 0.44067,0.1573 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.3946,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 753.22102,2247.1083 1.74215,0 c 0.23627,0 0.44078,0.1573 0.45842,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.39459,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15824,-0.3527 0.39449,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115591-9-0" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115593-7-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 756.86644,2247.1083 1.74215,0 c 0.23626,0 0.44066,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15834,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15824,-0.3527 0.39449,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 760.57268,2247.1083 1.74216,0 c 0.23625,0 0.44067,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.3945,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115595-1-8" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115597-7-5" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 764.1814,2247.1083 1.74216,0 c 0.23626,0 0.44077,0.1573 0.45841,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23626,0 -0.44067,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 767.82682,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.3945,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115599-5-9" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115601-1-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 792.8232,2245.6006 1.74216,0 c 0.23625,0 0.44066,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15824,0.3526 -0.39449,0.3526 l -1.74216,0 c -0.23626,0 -0.44077,-0.1572 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15834,-0.3527 0.39459,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 796.43192,2245.6006 1.74216,0 c 0.23625,0 0.44077,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15836,0.3526 -0.39461,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15836,-0.3527 0.39461,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115603-6-5" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115605-4-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 800.07734,2245.6006 1.74216,0 c 0.23625,0 0.44066,0.1574 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1954 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44067,-0.1572 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1953 0.15835,-0.3527 0.39461,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 792.8232,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.39449,0.3526 l -1.74216,0 c -0.23626,0 -0.44077,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.39459,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115607-4-1" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115609-9-3" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 796.43192,2247.1083 1.74216,0 c 0.23625,0 0.44077,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15836,0.3526 -0.39461,0.3526 l -1.74216,0 c -0.23625,0 -0.44066,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15836,-0.3527 0.39461,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 800.07734,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15835,0.3526 -0.3946,0.3526 l -1.74216,0 c -0.23625,0 -0.44067,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.39461,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115611-9-9" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115613-6-5" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 803.78358,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15824,0.3526 -0.39449,0.3526 l -1.74217,0 c -0.23625,0 -0.44077,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15834,-0.3527 0.3946,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 807.3923,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15836,0.3526 -0.39461,0.3526 l -1.74215,0 c -0.23626,0 -0.44078,-0.1573 -0.45841,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" id="path115615-1-8" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115617-5-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40245825" d="m 811.03772,2247.1083 1.74216,0 c 0.23625,0 0.44066,0.1573 0.4584,0.3527 l 0.0242,0.2708 c 0.0177,0.1953 -0.15823,0.3526 -0.39448,0.3526 l -1.74217,0 c -0.23625,0 -0.44077,-0.1573 -0.4584,-0.3526 l -0.0242,-0.2708 c -0.0177,-0.1954 0.15835,-0.3527 0.3946,-0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path inkscape:connector-curvature="0" d="m 827.65786,2245.3148 2.15923,0 0,2.9841 -2.15923,0 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path115619-5-7"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 771.13208,2248.0646 1.74193,0 c 0.23626,0 0.44066,-0.1575 0.4584,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15824,-0.3525 -0.3945,-0.3525 l -1.74204,0 c -0.23626,0 -0.44066,0.1572 -0.4583,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15824,0.3527 0.3946,0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path115621-6-9" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115623-0-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 774.74046,2248.0646 1.74206,0 c 0.23625,0 0.44066,-0.1575 0.45828,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15825,-0.3525 -0.3945,-0.3525 l -1.74206,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15823,0.3527 0.39448,0.3527 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 778.38555,2248.0646 1.74205,0 c 0.23626,0 0.44066,-0.1575 0.45829,-0.3527 l 0.0242,-0.2708 c 0.0177,-0.1953 -0.15825,-0.3525 -0.39451,-0.3525 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.45829,0.3525 l -0.0242,0.2708 c -0.0177,0.1952 0.15824,0.3527 0.39449,0.3527 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path115625-7-1" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115627-5-7" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 771.13208,2246.5568 1.74193,0 c 0.23626,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15824,-0.3527 -0.3945,-0.3527 l -1.74204,0 c -0.23626,0 -0.44066,0.1572 -0.4583,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.3946,0.3525 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 774.74046,2246.5568 1.74206,0 c 0.23625,0 0.44066,-0.1572 0.45828,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.3945,-0.3527 l -1.74206,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15823,0.3525 0.39448,0.3525 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path115629-0-7" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115631-7-1" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 778.38555,2246.5568 1.74205,0 c 0.23626,0 0.44066,-0.1572 0.45829,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.39451,-0.3527 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.45829,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.39449,0.3525 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 782.09146,2246.5568 1.74205,0 c 0.23626,0 0.44066,-0.1572 0.45829,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15825,-0.3527 -0.39451,-0.3527 l -1.74205,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.3945,0.3525 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path115633-9-9" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" id="path115635-5-0" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" d="m 785.69996,2246.5568 1.74194,0 c 0.23625,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15824,-0.3527 -0.39449,-0.3527 l -1.74205,0 c -0.23626,0 -0.44066,0.1572 -0.45829,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15824,0.3525 0.39449,0.3525 z" sodipodi:nodetypes="ssccssccs"/>
+        <path sodipodi:nodetypes="ssccssccs" d="m 789.34505,2246.5568 1.74194,0 c 0.23625,0 0.44066,-0.1572 0.4584,-0.3525 l 0.0242,-0.2707 c 0.0177,-0.1955 -0.15837,-0.3527 -0.39462,-0.3527 l -1.74194,0 c -0.23625,0 -0.44066,0.1572 -0.4584,0.3527 l -0.0242,0.2707 c -0.0177,0.1953 0.15835,0.3525 0.3946,0.3525 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.40242463" id="path115637-6-3" inkscape:connector-curvature="0"/>
+        <g id="g31567-4" transform="matrix(0.77587723,0,0,1,194.59487,0.99590896)">
+          <path sodipodi:nodetypes="cccssccccccscccsccc" inkscape:connector-curvature="0" id="path115575-5-1" d="m 870.95805,2247.1999 c -0.80735,0 -1.45044,2.1197 -1.45624,4.7517 l -0.0867,32.1297 c -0.006,2.633 0.64481,4.7522 1.45217,4.7522 l 5.88614,0 c 0.80736,0 1.45056,-2.1192 1.45623,-4.7522 l 0.0181,-7.7489 -0.90631,-0.3411 -0.26448,-14.8768 1.21888,0.3959 0.0204,-9.5601 c 0.006,-2.6326 -0.64469,-4.7514 -1.45205,-4.7514 l -5.88625,0 z m 3.18973,19.2422 c 0.25682,0.038 0.78758,0.133 0.79746,1.8106 0.01,1.6776 -0.53801,2.2691 -0.79474,2.2365 -0.25694,-0.038 -0.77753,-0.6057 -0.78741,-2.2832 -0.01,-1.6773 0.52796,-1.7963 0.78469,-1.7639 z" style="fill:url(#linearGradient31581-9);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53485292;stroke-miterlimit:4;stroke-dasharray:none"/>
+          <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 873.5847,2251.4177 c 0.0657,-2.1656 0.46798,-1.4454 1.1865,-0.2024 l 1.44752,4.67 -0.34521,31.4636 c -0.32422,1.7146 -0.72392,0.7692 -1.19148,0.3409 l -1.67186,-5.5735 c 0.34022,-1.4357 0.42992,-0.7055 0.98558,-0.1394 l 0.72986,1.3287 0.31319,-26.9823 z" inkscape:path-effect="#path-effect29991-6-5" id="path115577-2-7" d="m 873.5847,2251.4177 1.1865,-0.2024 1.44752,4.67 -0.34521,31.4636 -1.19148,0.3409 -1.67186,-5.5735 0.98558,-0.1394 0.72986,1.3287 0.31319,-26.9823 -1.4541,-4.9056" style="fill:#808080;fill-opacity:1;stroke:none"/>
+          <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 873.51144,2258.1509 1.08683,2.6281 -0.2553,23.2666 -1.3327,-1.9218 -0.0403,3.7754 1.71873,1.7962 0.37998,-31.5042 -1.48993,-4.7773 z" inkscape:path-effect="#path-effect29988-5-5" id="path115579-7-5" d="m 873.51144,2258.1509 1.08683,2.6281 -0.2553,23.2666 -1.3327,-1.9218 -0.0403,3.7754 1.71873,1.7962 0.37998,-31.5042 -1.48993,-4.7773 -0.0673,6.737" style="fill:#4d4d4d;fill-opacity:1;stroke:none"/>
         </g>
-        <g
-           id="g31572-3"
-           transform="matrix(0.77589221,0,0,1.0001917,167.71934,0.55710916)">
-          <path
-             style="fill:url(#linearGradient31579-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53479499;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 745.9566,2247.204 c 0.80732,0 1.45041,2.1193 1.45621,4.7508 l 0.0867,32.1233 c 0.006,2.6325 -0.64479,4.7513 -1.45214,4.7513 l -5.88603,0 c -0.80734,0 -1.45053,-2.1188 -1.4562,-4.7513 l -0.0181,-7.7473 0.90629,-0.3411 0.26447,-14.8738 -1.21885,0.3958 -0.0204,-9.5582 c -0.006,-2.6321 0.64468,-4.7505 1.45202,-4.7505 l 5.88614,0 z m -3.18967,19.2384 c -0.25683,0.038 -0.78757,0.133 -0.79745,1.8103 -0.0103,1.6772 0.538,2.2686 0.79472,2.236 0.25694,-0.038 0.77751,-0.6056 0.7874,-2.2827 0.0103,-1.677 -0.52795,-1.796 -0.78467,-1.7636 z"
-             id="path31555-3"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccssccccccscccsccc" />
-          <path
-             style="fill:#808080;fill-opacity:1;stroke:none"
-             d="m 743.33,2251.421 -1.18649,-0.2024 -1.44749,4.6691 0.34521,31.4574 1.19146,0.3408 1.67182,-5.5724 -0.98556,-0.1394 -0.72985,1.3285 -0.31318,-26.977 1.45408,-4.9046"
-             id="path31557-2"
-             inkscape:path-effect="#path-effect31563-9"
-             inkscape:original-d="m 743.33,2251.421 c -0.0657,-2.1652 -0.46797,-1.4451 -1.18649,-0.2024 l -1.44749,4.6691 0.34521,31.4574 c 0.32421,1.7142 0.72391,0.769 1.19146,0.3408 l 1.67182,-5.5724 c -0.34021,-1.4354 -0.42991,-0.7054 -0.98556,-0.1394 l -0.72985,1.3285 -0.31318,-26.977 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccccccc" />
-          <path
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             d="m 743.40325,2258.1529 -1.08681,2.6275 0.2553,23.262 1.33268,-1.9214 0.0403,3.7747 -1.7187,1.7958 -0.37997,-31.498 1.4899,-4.7763 0.0673,6.7357"
-             id="path31559-4"
-             inkscape:path-effect="#path-effect31565-1"
-             inkscape:original-d="m 743.40325,2258.1529 -1.08681,2.6275 0.2553,23.262 1.33268,-1.9214 0.0403,3.7747 -1.7187,1.7958 -0.37997,-31.498 1.4899,-4.7763 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
+        <g id="g31572-3" transform="matrix(0.77589221,0,0,1.0001917,167.71934,0.55710916)">
+          <path style="fill:url(#linearGradient31579-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53479499;stroke-miterlimit:4;stroke-dasharray:none" d="m 745.9566,2247.204 c 0.80732,0 1.45041,2.1193 1.45621,4.7508 l 0.0867,32.1233 c 0.006,2.6325 -0.64479,4.7513 -1.45214,4.7513 l -5.88603,0 c -0.80734,0 -1.45053,-2.1188 -1.4562,-4.7513 l -0.0181,-7.7473 0.90629,-0.3411 0.26447,-14.8738 -1.21885,0.3958 -0.0204,-9.5582 c -0.006,-2.6321 0.64468,-4.7505 1.45202,-4.7505 l 5.88614,0 z m -3.18967,19.2384 c -0.25683,0.038 -0.78757,0.133 -0.79745,1.8103 -0.0103,1.6772 0.538,2.2686 0.79472,2.236 0.25694,-0.038 0.77751,-0.6056 0.7874,-2.2827 0.0103,-1.677 -0.52795,-1.796 -0.78467,-1.7636 z" id="path31555-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccssccccccscccsccc"/>
+          <path style="fill:#808080;fill-opacity:1;stroke:none" d="m 743.33,2251.421 -1.18649,-0.2024 -1.44749,4.6691 0.34521,31.4574 1.19146,0.3408 1.67182,-5.5724 -0.98556,-0.1394 -0.72985,1.3285 -0.31318,-26.977 1.45408,-4.9046" id="path31557-2" inkscape:path-effect="#path-effect31563-9" inkscape:original-d="m 743.33,2251.421 c -0.0657,-2.1652 -0.46797,-1.4451 -1.18649,-0.2024 l -1.44749,4.6691 0.34521,31.4574 c 0.32421,1.7142 0.72391,0.769 1.19146,0.3408 l 1.67182,-5.5724 c -0.34021,-1.4354 -0.42991,-0.7054 -0.98556,-0.1394 l -0.72985,1.3285 -0.31318,-26.977 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+          <path style="fill:#4d4d4d;fill-opacity:1;stroke:none" d="m 743.40325,2258.1529 -1.08681,2.6275 0.2553,23.262 1.33268,-1.9214 0.0403,3.7747 -1.7187,1.7958 -0.37997,-31.498 1.4899,-4.7763 0.0673,6.7357" id="path31559-4" inkscape:path-effect="#path-effect31565-1" inkscape:original-d="m 743.40325,2258.1529 -1.08681,2.6275 0.2553,23.262 1.33268,-1.9214 0.0403,3.7747 -1.7187,1.7958 -0.37997,-31.498 1.4899,-4.7763 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
         </g>
       </g>
     </g>
diff --git a/misc/images/svg/elements/Router.svg b/misc/images/svg/elements/Router.svg
index ec2e262a710..bfeb396c051 100644
--- a/misc/images/svg/elements/Router.svg
+++ b/misc/images/svg/elements/Router.svg
@@ -1,508 +1,104 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="118.20541"
-   id="svg147239"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="Router.svg">
-  <defs
-     id="defs147241">
-    <linearGradient
-       id="linearGradient4781-3-7-8">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2-2-1" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5-5-0" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="118.20541" id="svg147239" version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="Router.svg">
+  <defs id="defs147241">
+    <linearGradient id="linearGradient4781-3-7-8">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2-2-1"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5-5-0"/>
     </linearGradient>
-    <linearGradient
-       id="linearGradient147164">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop147166" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop147168" />
+    <linearGradient id="linearGradient147164">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop147166"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop147168"/>
     </linearGradient>
-    <linearGradient
-       id="linearGradient5801-7-0">
-      <stop
-         id="stop5803-7-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5805-9-5"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
+    <linearGradient id="linearGradient5801-7-0">
+      <stop id="stop5803-7-9" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop5805-9-5" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       id="linearGradient147177">
-      <stop
-         id="stop147179"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop147181"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
+    <linearGradient id="linearGradient147177">
+      <stop id="stop147179" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop147181" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       id="linearGradient147184">
-      <stop
-         id="stop147186"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop147188"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
+    <linearGradient id="linearGradient147184">
+      <stop id="stop147186" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop147188" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5763-1"
-       x="-0.068371981"
-       width="1.136744"
-       y="-0.13107832"
-       height="1.2621566">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.29772692"
-         id="feGaussianBlur5765-4" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5763-1" x="-0.068371981" width="1.136744" y="-0.13107832" height="1.2621566">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.29772692" id="feGaussianBlur5765-4"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5755-4"
-       x="-0.07161101"
-       width="1.143222"
-       y="-0.14175981"
-       height="1.2835196">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.31559987"
-         id="feGaussianBlur5757-5" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5755-4" x="-0.07161101" width="1.143222" y="-0.14175981" height="1.2835196">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.31559987" id="feGaussianBlur5757-5"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5771-9"
-       x="-0.072505891"
-       width="1.1450118"
-       y="-0.13837889"
-       height="1.2767578">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.31063639"
-         id="feGaussianBlur5773-5" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5771-9" x="-0.072505891" width="1.1450118" y="-0.13837889" height="1.2767578">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.31063639" id="feGaussianBlur5773-5"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5775-6"
-       x="-0.077720456"
-       width="1.1554409"
-       y="-0.14193143"
-       height="1.2838629">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.32433816"
-         id="feGaussianBlur5777-4" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5775-6" x="-0.077720456" width="1.1554409" y="-0.14193143" height="1.2838629">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.32433816" id="feGaussianBlur5777-4"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter3898">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.7915937"
-         id="feGaussianBlur3900" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3898">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.7915937" id="feGaussianBlur3900"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-7-8"
-       id="linearGradient3100"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.92079395,0,0,0.91399597,1290.2334,1569.6328)"
-       x1="460.23651"
-       y1="-965.29681"
-       x2="462.87714"
-       y2="-965.26556" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-7-8"
-       id="linearGradient3102"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.83048079,0,0,0.77212194,1204.5803,1419.6347)"
-       x1="460.23651"
-       y1="-965.29681"
-       x2="462.87714"
-       y2="-965.26556" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-0"
-       id="linearGradient3104"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)"
-       x1="158.86479"
-       y1="706.07477"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-0"
-       id="linearGradient3106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83220867,0,0,0.83220867,677.4018,118.77864)"
-       x1="173.61505"
-       y1="760.87512"
-       x2="65.997429"
-       y2="689.16925" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-7-0"
-       id="linearGradient3108"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83220867,0,0,0.83220867,677.4018,118.77864)"
-       x1="319.22894"
-       y1="667.52386"
-       x2="188.08318"
-       y2="761.83972" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-7-8" id="linearGradient3100" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.92079395,0,0,0.91399597,1290.2334,1569.6328)" x1="460.23651" y1="-965.29681" x2="462.87714" y2="-965.26556"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-7-8" id="linearGradient3102" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.83048079,0,0,0.77212194,1204.5803,1419.6347)" x1="460.23651" y1="-965.29681" x2="462.87714" y2="-965.26556"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-0" id="linearGradient3104" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)" x1="158.86479" y1="706.07477" x2="319.51733" y2="742.35919"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-0" id="linearGradient3106" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.83220867,0,0,0.83220867,677.4018,118.77864)" x1="173.61505" y1="760.87512" x2="65.997429" y2="689.16925"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-7-0" id="linearGradient3108" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.83220867,0,0,0.83220867,677.4018,118.77864)" x1="319.22894" y1="667.52386" x2="188.08318" y2="761.83972"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="103.54718"
-     inkscape:cy="76.825051"
-     inkscape:document-units="px"
-     inkscape:current-layer="g89934"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata147244">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8284271" inkscape:cx="103.54718" inkscape:cy="76.825051" inkscape:document-units="px" inkscape:current-layer="g89934" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="968" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1"/>
+  <metadata id="metadata147244">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-327.57323,-516.3356)">
-    <g
-       style="display:inline"
-       transform="matrix(1.0365867,0,0,1.0365867,-452.88956,-164.77549)"
-       id="g89934"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Router.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g3056"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Icons reduced whitespace\Tiny\Router.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90"
-         transform="translate(-1.5128053e-5,-2.8498035e-6)">
-        <g
-           transform="translate(-6.8214919,8.5268649)"
-           inkscape:export-ydpi="90"
-           inkscape:export-xdpi="90"
-           inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Tiny\Router.png"
-           id="g3066">
-          <path
-             transform="matrix(0.87980278,0,0,0.97962534,640.13198,14.728005)"
-             id="path5323-3-6-7-9-5"
-             style="opacity:0.85650222;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter3898)"
-             d="m 190.21338,691.0295 81.78485,38.21794 c -17.02861,10.15729 -38.79737,19.30636 -55.52846,29.8563 l -76.22402,-41.7465 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path89936"
-             style="fill:url(#linearGradient3100);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 866.45041,659.40291 -4.02848,0 0,51.97328 4.02848,0 z"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 822.36278,650.69428 -3.63336,0 0,43.90579 3.63336,0 z"
-             style="fill:url(#linearGradient3102);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89938" />
-          <path
-             transform="matrix(0.9968419,0,0,1.6992852,489.83601,-626.48723)"
-             d="m 333.57762,751.60089 c 0,0.0732 -0.81619,0.13258 -1.82301,0.13258 -1.00682,0 -1.82301,-0.0594 -1.82301,-0.13258 0,-0.0732 0.81619,-0.13258 1.82301,-0.13258 1.00682,0 1.82301,0.0594 1.82301,0.13258 z"
-             sodipodi:ry="0.13258252"
-             sodipodi:rx="1.8230097"
-             sodipodi:cy="751.60089"
-             sodipodi:cx="331.75461"
-             id="path89942"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             d="m 809.16432,687.1293 69.3832,24.9714 -0.0369,16.25107 -48.87853,11.99026 -64.73254,-37.37331 z"
-             style="fill:url(#linearGradient3104);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89944" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 764.89955,702.96873 64.7325,37.37332 4e-5,16.57651 -64.73254,-38.13037 z"
-             style="fill:url(#linearGradient3106);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89946" />
-          <path
-             sodipodi:nodetypes="ccc"
-             inkscape:connector-curvature="0"
-             d="m 777.47181,710.22732 38.66842,22.32523 c -24.04646,3.23533 -38.66842,-15.25458 -38.66842,-22.32523 z"
-             style="fill:#8fa2b0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89948" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 829.63209,740.34205 48.91544,-28.24135 0,16.56853 -48.91544,28.24933 z"
-             style="fill:url(#linearGradient3108);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89950" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 814.36891,731.5299 32.88745,-17.83608 1.38492,0.50406 -32.79847,18.18296 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89952" />
-          <path
-             id="path89954"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 811.28508,729.74946 32.53038,-17.53301 1.82792,0.66532 -32.88439,17.71863 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 808.26279,728.00454 32.342,-17.1487 1.86491,0.67877 -32.733,17.32088 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89956" />
-          <path
-             id="path89958"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 805.09138,726.17353 32.42707,-16.63868 1.68439,0.61306 -32.63754,16.87657 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 802.00756,724.39309 32.73488,-16.13851 1.66092,0.70502 -32.92189,16.28443 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89960" />
-          <path
-             id="path89962"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 798.98527,722.64818 32.79349,-15.6516 1.77273,0.75248 -33.09231,15.75006 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path89964"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 795.87039,720.84976 32.98929,-15.09226 1.65456,0.70231 -33.16994,15.24089 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 792.78656,719.06932 32.84487,-14.68213 1.79074,0.76013 -33.1617,14.77294 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89966" />
-          <path
-             id="path89968"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 789.76427,717.32441 32.61117,-14.31931 1.63949,0.69593 -32.77675,14.47432 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 786.59287,715.4934 32.11302,-14.04593 2.11552,0.89799 -32.75463,13.99888 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89970" />
-          <path
-             id="path89972"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 783.50904,713.71297 31.61514,-13.67678 1.82715,0.66653 -31.96839,13.86119 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 780.19608,711.77427 31.27303,-13.39863 2.15636,0.91533 -31.66482,13.52802 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89974" />
-          <path
-             id="path89976"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 777.17328,710.05502 30.80742,-13.16012 1.89898,0.80607 -31.23248,13.20499 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 777.19064,710.065 1.50592,0.86945 -0.14397,3.37756 c -0.46246,-1.13728 -0.93244,-2.03035 -1.36195,-4.23871 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89978" />
-          <path
-             id="path89980"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 780.18588,711.76647 1.77236,1.05112 -0.14396,6.64463 c -0.46831,-0.59132 -0.92812,-1.19108 -1.36195,-1.81684 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 783.51304,713.71524 1.50591,0.86945 -0.14397,8.18227 c -0.45952,-0.43621 -0.91931,-0.87158 -1.36194,-1.35848 z"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89982" />
-          <path
-             id="path89984"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 786.56139,715.47521 1.50591,0.86945 -0.14397,9.01122 c -0.45748,-0.35504 -0.91305,-0.71202 -1.36194,-1.07567 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 789.75583,717.31951 1.50592,0.86945 -0.14397,9.33956 c -0.45399,-0.27783 -0.90797,-0.56074 -1.36195,-0.86436 z"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89986" />
-          <path
-             id="path89988"
-             style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 792.76244,719.05538 1.50592,0.86945 -0.14397,9.24204 c -0.45399,-0.21734 -0.90797,-0.44664 -1.36195,-0.69857 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 795.80896,720.8663 1.50592,0.81744 -0.14397,8.80662 c -0.45087,-0.18098 -0.90255,-0.36277 -1.36195,-0.55228 z"
-             style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89990" />
-          <path
-             id="path89992"
-             style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 798.96894,722.63871 1.50592,0.86945 -0.14398,8.02623 c -0.45086,-0.13439 -0.90255,-0.26959 -1.36194,-0.4125 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 801.99527,724.38595 1.50591,0.86945 -0.14398,6.98922 c -0.45397,-0.0897 -0.90796,-0.18521 -1.36193,-0.29221 z"
-             style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89994" />
-          <path
-             id="path89996"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 805.05031,726.14979 1.50592,0.86945 -0.14397,5.68692 c -0.45397,-0.0451 -0.90796,-0.10836 -1.36195,-0.18819 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 808.25678,728.00105 1.50591,0.86945 -0.14397,4.05047 -1.36194,-0.0614 z"
-             style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path89998" />
-          <path
-             id="path90000"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 811.2645,729.73755 1.50592,0.86945 -0.14398,2.26903 c -0.45398,0.0367 -0.90796,0.0433 -1.36194,0.0458 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 814.32603,731.50513 1.50591,0.86945 -0.005,0.22103 c -0.50059,0.0748 -1.00117,0.11948 -1.50173,0.15964 z"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path90002" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 808.80153,724.24458 4.35558,2.79097 -3.38813,1.83855 -4.66528,-2.6935 z"
-             style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path90004" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 168.97267,729.02876 5.53505,3.29122 -4.85888,2.16006 -5.59196,-3.22851 z"
-             style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5763-1)"
-             id="path90006"
-             transform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 160.72395,724.79949 6.15668,3.30299 -4.80265,2.04013 -5.77449,-3.40035 z"
-             style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5755-4)"
-             id="path90008"
-             transform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 176.36093,733.32799 5.42473,3.1111 -4.80067,2.27648 -5.48163,-3.16481 z"
-             style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5771-9)"
-             id="path90010"
-             transform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 183.77308,737.49097 5.15796,3.14973 -4.56782,2.33469 -5.44771,-3.14523 z"
-             style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5775-6)"
-             id="path90012"
-             transform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path90014"
-             sodipodi:cx="331.75461"
-             sodipodi:cy="751.60089"
-             sodipodi:rx="1.8230097"
-             sodipodi:ry="0.13258252"
-             d="m 333.57762,751.60089 c 0,0.0732 -0.81619,0.13258 -1.82301,0.13258 -1.00682,0 -1.82301,-0.0594 -1.82301,-0.13258 0,-0.0732 0.81619,-0.13258 1.82301,-0.13258 1.00682,0 1.82301,0.0594 1.82301,0.13258 z"
-             transform="matrix(1.1052465,0,0,2.0115215,497.762,-852.45512)" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-327.57323,-516.3356)">
+    <g style="display:inline" transform="matrix(1.0365867,0,0,1.0365867,-452.88956,-164.77549)" id="g89934">
+      <g id="g3056" transform="translate(-1.5128053e-5,-2.8498035e-6)">
+        <g transform="translate(-6.8214919,8.5268649)" id="g3066">
+          <path transform="matrix(0.87980278,0,0,0.97962534,640.13198,14.728005)" id="path5323-3-6-7-9-5" style="opacity:0.85650222;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter3898)" d="m 190.21338,691.0295 81.78485,38.21794 c -17.02861,10.15729 -38.79737,19.30636 -55.52846,29.8563 l -76.22402,-41.7465 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path89936" style="fill:url(#linearGradient3100);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 866.45041,659.40291 -4.02848,0 0,51.97328 4.02848,0 z" inkscape:connector-curvature="0"/>
+          <path inkscape:connector-curvature="0" d="m 822.36278,650.69428 -3.63336,0 0,43.90579 3.63336,0 z" style="fill:url(#linearGradient3102);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89938"/>
+          <path transform="matrix(0.9968419,0,0,1.6992852,489.83601,-626.48723)" d="m 333.57762,751.60089 c 0,0.0732 -0.81619,0.13258 -1.82301,0.13258 -1.00682,0 -1.82301,-0.0594 -1.82301,-0.13258 0,-0.0732 0.81619,-0.13258 1.82301,-0.13258 1.00682,0 1.82301,0.0594 1.82301,0.13258 z" sodipodi:ry="0.13258252" sodipodi:rx="1.8230097" sodipodi:cy="751.60089" sodipodi:cx="331.75461" id="path89942" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" d="m 809.16432,687.1293 69.3832,24.9714 -0.0369,16.25107 -48.87853,11.99026 -64.73254,-37.37331 z" style="fill:url(#linearGradient3104);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89944"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 764.89955,702.96873 64.7325,37.37332 4e-5,16.57651 -64.73254,-38.13037 z" style="fill:url(#linearGradient3106);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89946"/>
+          <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" d="m 777.47181,710.22732 38.66842,22.32523 c -24.04646,3.23533 -38.66842,-15.25458 -38.66842,-22.32523 z" style="fill:#8fa2b0;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89948"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 829.63209,740.34205 48.91544,-28.24135 0,16.56853 -48.91544,28.24933 z" style="fill:url(#linearGradient3108);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89950"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 814.36891,731.5299 32.88745,-17.83608 1.38492,0.50406 -32.79847,18.18296 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89952"/>
+          <path id="path89954" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 811.28508,729.74946 32.53038,-17.53301 1.82792,0.66532 -32.88439,17.71863 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.26279,728.00454 32.342,-17.1487 1.86491,0.67877 -32.733,17.32088 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89956"/>
+          <path id="path89958" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 805.09138,726.17353 32.42707,-16.63868 1.68439,0.61306 -32.63754,16.87657 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 802.00756,724.39309 32.73488,-16.13851 1.66092,0.70502 -32.92189,16.28443 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89960"/>
+          <path id="path89962" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 798.98527,722.64818 32.79349,-15.6516 1.77273,0.75248 -33.09231,15.75006 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path89964" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 795.87039,720.84976 32.98929,-15.09226 1.65456,0.70231 -33.16994,15.24089 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 792.78656,719.06932 32.84487,-14.68213 1.79074,0.76013 -33.1617,14.77294 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89966"/>
+          <path id="path89968" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 789.76427,717.32441 32.61117,-14.31931 1.63949,0.69593 -32.77675,14.47432 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 786.59287,715.4934 32.11302,-14.04593 2.11552,0.89799 -32.75463,13.99888 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89970"/>
+          <path id="path89972" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 783.50904,713.71297 31.61514,-13.67678 1.82715,0.66653 -31.96839,13.86119 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 780.19608,711.77427 31.27303,-13.39863 2.15636,0.91533 -31.66482,13.52802 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89974"/>
+          <path id="path89976" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 777.17328,710.05502 30.80742,-13.16012 1.89898,0.80607 -31.23248,13.20499 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 777.19064,710.065 1.50592,0.86945 -0.14397,3.37756 c -0.46246,-1.13728 -0.93244,-2.03035 -1.36195,-4.23871 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89978"/>
+          <path id="path89980" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 780.18588,711.76647 1.77236,1.05112 -0.14396,6.64463 c -0.46831,-0.59132 -0.92812,-1.19108 -1.36195,-1.81684 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 783.51304,713.71524 1.50591,0.86945 -0.14397,8.18227 c -0.45952,-0.43621 -0.91931,-0.87158 -1.36194,-1.35848 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89982"/>
+          <path id="path89984" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 786.56139,715.47521 1.50591,0.86945 -0.14397,9.01122 c -0.45748,-0.35504 -0.91305,-0.71202 -1.36194,-1.07567 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 789.75583,717.31951 1.50592,0.86945 -0.14397,9.33956 c -0.45399,-0.27783 -0.90797,-0.56074 -1.36195,-0.86436 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89986"/>
+          <path id="path89988" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 792.76244,719.05538 1.50592,0.86945 -0.14397,9.24204 c -0.45399,-0.21734 -0.90797,-0.44664 -1.36195,-0.69857 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 795.80896,720.8663 1.50592,0.81744 -0.14397,8.80662 c -0.45087,-0.18098 -0.90255,-0.36277 -1.36195,-0.55228 z" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89990"/>
+          <path id="path89992" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 798.96894,722.63871 1.50592,0.86945 -0.14398,8.02623 c -0.45086,-0.13439 -0.90255,-0.26959 -1.36194,-0.4125 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 801.99527,724.38595 1.50591,0.86945 -0.14398,6.98922 c -0.45397,-0.0897 -0.90796,-0.18521 -1.36193,-0.29221 z" style="fill:#caca00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89994"/>
+          <path id="path89996" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 805.05031,726.14979 1.50592,0.86945 -0.14397,5.68692 c -0.45397,-0.0451 -0.90796,-0.10836 -1.36195,-0.18819 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.25678,728.00105 1.50591,0.86945 -0.14397,4.05047 -1.36194,-0.0614 z" style="fill:#00bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path89998"/>
+          <path id="path90000" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 811.2645,729.73755 1.50592,0.86945 -0.14398,2.26903 c -0.45398,0.0367 -0.90796,0.0433 -1.36194,0.0458 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 814.32603,731.50513 1.50591,0.86945 -0.005,0.22103 c -0.50059,0.0748 -1.00117,0.11948 -1.50173,0.15964 z" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path90002"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 808.80153,724.24458 4.35558,2.79097 -3.38813,1.83855 -4.66528,-2.6935 z" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path90004"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 168.97267,729.02876 5.53505,3.29122 -4.85888,2.16006 -5.59196,-3.22851 z" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5763-1)" id="path90006" transform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 160.72395,724.79949 6.15668,3.30299 -4.80265,2.04013 -5.77449,-3.40035 z" style="fill:#1aff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5755-4)" id="path90008" transform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 176.36093,733.32799 5.42473,3.1111 -4.80067,2.27648 -5.48163,-3.16481 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5771-9)" id="path90010" transform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 183.77308,737.49097 5.15796,3.14973 -4.56782,2.33469 -5.44771,-3.14523 z" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5775-6)" id="path90012" transform="matrix(0.83220867,0,0,0.83220867,650.09198,106.95606)"/>
+          <path sodipodi:type="arc" style="fill:#4e6271;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path90014" sodipodi:cx="331.75461" sodipodi:cy="751.60089" sodipodi:rx="1.8230097" sodipodi:ry="0.13258252" d="m 333.57762,751.60089 c 0,0.0732 -0.81619,0.13258 -1.82301,0.13258 -1.00682,0 -1.82301,-0.0594 -1.82301,-0.13258 0,-0.0732 0.81619,-0.13258 1.82301,-0.13258 1.00682,0 1.82301,0.0594 1.82301,0.13258 z" transform="matrix(1.1052465,0,0,2.0115215,497.762,-852.45512)"/>
         </g>
-        <rect
-           transform="matrix(0.96470464,0,0,0.96470464,752.77652,663.29874)"
-           y="-6.4555554"
-           x="3.1819806"
-           height="1.767767"
-           width="122.68303"
-           id="rect3054"
-           style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <rect transform="matrix(0.96470464,0,0,0.96470464,752.77652,663.29874)" y="-6.4555554" x="3.1819806" height="1.767767" width="122.68303" id="rect3054" style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Router_symbol.svg b/misc/images/svg/elements/Router_symbol.svg
index 45d6c8ff996..aeb25ed0ec3 100644
--- a/misc/images/svg/elements/Router_symbol.svg
+++ b/misc/images/svg/elements/Router_symbol.svg
@@ -1,385 +1,73 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="73.129166"
-   id="svg147506"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 50">
-  <defs
-     id="defs147508">
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter9216"
-       x="-0.069969781"
-       width="1.1399395"
-       y="-0.182404"
-       height="1.364808">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.5101205"
-         id="feGaussianBlur9218" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="73.129166" id="svg147506" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 50">
+  <defs id="defs147508">
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter9216" x="-0.069969781" width="1.1399395" y="-0.182404" height="1.364808">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="5.5101205" id="feGaussianBlur9218"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9232"
-       id="linearGradient9251"
-       gradientUnits="userSpaceOnUse"
-       x1="798.18555"
-       y1="-320.4082"
-       x2="831.51312"
-       y2="-382.40469" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9232">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop9234" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop9236" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9232" id="linearGradient9251" gradientUnits="userSpaceOnUse" x1="798.18555" y1="-320.4082" x2="831.51312" y2="-382.40469"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9232">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop9234"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop9236"/>
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44599"
-       id="radialGradient9253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8399617,0,0,2.0180867,-786.11994,670.14274)"
-       cx="997.38855"
-       cy="-662.14374"
-       fx="997.38855"
-       fy="-662.14374"
-       r="109.43819" />
-    <linearGradient
-       id="linearGradient44599">
-      <stop
-         id="stop44601"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.74646086"
-         id="stop44603" />
-      <stop
-         id="stop44605"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient44599" id="radialGradient9253" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.8399617,0,0,2.0180867,-786.11994,670.14274)" cx="997.38855" cy="-662.14374" fx="997.38855" fy="-662.14374" r="109.43819"/>
+    <linearGradient id="linearGradient44599">
+      <stop id="stop44601" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.74646086" id="stop44603"/>
+      <stop id="stop44605" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44589"
-       id="radialGradient9255"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0029987,-0.02499486,0.00775171,0.87105506,-1717.6929,-22.539722)"
-       cx="869.76385"
-       cy="-381.34979"
-       fx="869.76385"
-       fy="-381.34979"
-       r="94.5" />
-    <linearGradient
-       id="linearGradient44589">
-      <stop
-         id="stop44591"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.84582919"
-         id="stop44593-1" />
-      <stop
-         id="stop44595-7"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient44589" id="radialGradient9255" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.0029987,-0.02499486,0.00775171,0.87105506,-1717.6929,-22.539722)" cx="869.76385" cy="-381.34979" fx="869.76385" fy="-381.34979" r="94.5"/>
+    <linearGradient id="linearGradient44589">
+      <stop id="stop44591" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.84582919" id="stop44593-1"/>
+      <stop id="stop44595-7" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient70015"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9154">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9156" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop9158" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient70015" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9154">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop9156"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop9158"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient70017"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9178">
-      <stop
-         style="stop-color:#576274;stop-opacity:1;"
-         offset="0"
-         id="stop9180" />
-      <stop
-         style="stop-color:#576274;stop-opacity:0;"
-         offset="1"
-         id="stop9182" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient70017" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9178">
+      <stop style="stop-color:#576274;stop-opacity:1;" offset="0" id="stop9180"/>
+      <stop style="stop-color:#576274;stop-opacity:0;" offset="1" id="stop9182"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient9257"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient9259"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9080"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient9261"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient9263"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9088"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient9265"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient9267"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9098"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9154"
-       id="linearGradient9269"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="879.32739"
-       y2="-846.79266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9178"
-       id="linearGradient9272"
-       gradientUnits="userSpaceOnUse"
-       x1="929.86853"
-       y1="-754.46265"
-       x2="920.79816"
-       y2="-703.55096" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9112"
-       is_visible="true" />
-    <linearGradient
-       y2="-846.79266"
-       x2="879.32739"
-       y1="-754.46265"
-       x1="929.86853"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient147502"
-       xlink:href="#linearGradient9154"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-703.55096"
-       x2="920.79816"
-       y1="-754.46265"
-       x1="929.86853"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient147504"
-       xlink:href="#linearGradient9178"
-       inkscape:collect="always" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient9257" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient9259" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9080" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient9261" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient9263" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9088" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient9265" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient9267" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9098" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9154" id="linearGradient9269" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="879.32739" y2="-846.79266"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9178" id="linearGradient9272" gradientUnits="userSpaceOnUse" x1="929.86853" y1="-754.46265" x2="920.79816" y2="-703.55096"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9112" is_visible="true"/>
+    <linearGradient y2="-846.79266" x2="879.32739" y1="-754.46265" x1="929.86853" gradientUnits="userSpaceOnUse" id="linearGradient147502" xlink:href="#linearGradient9154" inkscape:collect="always"/>
+    <linearGradient y2="-703.55096" x2="920.79816" y1="-754.46265" x1="929.86853" gradientUnits="userSpaceOnUse" id="linearGradient147504" xlink:href="#linearGradient9178" inkscape:collect="always"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="201.85715"
-     inkscape:cy="-94.863989"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="88"
-     inkscape:window-y="116"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata147511">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="201.85715" inkscape:cy="-94.863989" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="88" inkscape:window-y="116" inkscape:window-maximized="0"/>
+  <metadata id="metadata147511">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-173.14285,-364.36903)">
-    <g
-       style="display:inline"
-       transform="matrix(0.49500498,0,0,0.49500498,-223.50389,752.89066)"
-       id="g9278"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Router_symbol.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         sodipodi:open="true"
-         sodipodi:end="6.2158485"
-         sodipodi:start="0"
-         transform="matrix(1.2002087,0,0,1.112967,-100.98926,-310.03403)"
-         d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089"
-         sodipodi:ry="36.25"
-         sodipodi:rx="94.5"
-         sodipodi:cy="-343.38782"
-         sodipodi:cx="859.5"
-         id="path9212"
-         style="opacity:0.60096154;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216)"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.6057692;fill:url(#linearGradient9251);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216)"
-         id="path9230"
-         sodipodi:cx="859.5"
-         sodipodi:cy="-343.38782"
-         sodipodi:rx="94.5"
-         sodipodi:ry="36.25"
-         d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089"
-         transform="matrix(1.2002087,0,0,1.112967,-100.98926,-310.03403)"
-         sodipodi:start="0"
-         sodipodi:end="6.2158485"
-         sodipodi:open="true" />
-      <path
-         style="fill:url(#radialGradient9253);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 826.46295,-741.3125 0,44.34562 c -0.003,0.13487 0,0.27109 0,0.40625 0,23.97362 48.99684,43.40625 109.4375,43.40625 60.44066,0 109.43755,-19.43263 109.43755,-43.40625 0,-0.13543 -0.028,-0.27111 -0.031,-0.40625 l 0.031,0 0,-44.34562 z"
-         id="rect9073"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccssscccc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient9255);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path9071"
-         sodipodi:cx="859.5"
-         sodipodi:cy="-343.38782"
-         sodipodi:rx="94.5"
-         sodipodi:ry="36.25"
-         d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089"
-         transform="matrix(1.1580688,0,0,1.197464,-59.460328,-330.28167)"
-         sodipodi:start="0"
-         sodipodi:end="6.2158485"
-         sodipodi:open="true" />
-      <g
-         id="g9132"
-         transform="matrix(1.1399016,0,0,1.1399016,-132.1887,105.34687)"
-         style="fill:url(#linearGradient147502);fill-opacity:1;stroke:url(#linearGradient147504);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 z"
-           inkscape:path-effect="#path-effect9080"
-           id="path9078"
-           d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 -30.68741,-10.69953"
-           style="fill:url(#linearGradient9257);fill-opacity:1;stroke:url(#linearGradient9259);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 c 23.36516,-0.0531 24.68121,-4.90539 38.49395,-6.86895 l -9.3618,16.54834 -7.77996,-2.58496 z"
-           inkscape:path-effect="#path-effect9088"
-           id="path9086"
-           d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 38.49395,-6.86895 -9.3618,16.54834 -7.77996,-2.58496 -20.5683,10.27791"
-           style="fill:url(#linearGradient9261);fill-opacity:1;stroke:url(#linearGradient9263);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 z"
-           inkscape:path-effect="#path-effect9098"
-           id="path9096"
-           d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 -40.66977,-1.68129"
-           style="fill:url(#linearGradient9265);fill-opacity:1;stroke:url(#linearGradient9267);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 z"
-           inkscape:path-effect="#path-effect9112"
-           id="path9110"
-           d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 21.33124,-9.9955"
-           style="fill:url(#linearGradient9269);fill-opacity:1;stroke:url(#linearGradient9272);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-173.14285,-364.36903)">
+    <g style="display:inline" transform="matrix(0.49500498,0,0,0.49500498,-223.50389,752.89066)" id="g9278">
+      <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(1.2002087,0,0,1.112967,-100.98926,-310.03403)" d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089" sodipodi:ry="36.25" sodipodi:rx="94.5" sodipodi:cy="-343.38782" sodipodi:cx="859.5" id="path9212" style="opacity:0.60096154;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216)" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="opacity:0.6057692;fill:url(#linearGradient9251);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter9216)" id="path9230" sodipodi:cx="859.5" sodipodi:cy="-343.38782" sodipodi:rx="94.5" sodipodi:ry="36.25" d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089" transform="matrix(1.2002087,0,0,1.112967,-100.98926,-310.03403)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+      <path style="fill:url(#radialGradient9253);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 826.46295,-741.3125 0,44.34562 c -0.003,0.13487 0,0.27109 0,0.40625 0,23.97362 48.99684,43.40625 109.4375,43.40625 60.44066,0 109.43755,-19.43263 109.43755,-43.40625 0,-0.13543 -0.028,-0.27111 -0.031,-0.40625 l 0.031,0 0,-44.34562 z" id="rect9073" inkscape:connector-curvature="0" sodipodi:nodetypes="ccssscccc"/>
+      <path sodipodi:type="arc" style="fill:url(#radialGradient9255);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path9071" sodipodi:cx="859.5" sodipodi:cy="-343.38782" sodipodi:rx="94.5" sodipodi:ry="36.25" d="m 954,-343.38782 c 0,20.02032 -42.30909,36.25 -94.5,36.25 -52.19091,0 -94.5,-16.22968 -94.5,-36.25 0,-20.02032 42.30909,-36.25 94.5,-36.25 49.72285,0 90.94019,14.78053 94.28584,33.81089" transform="matrix(1.1580688,0,0,1.197464,-59.460328,-330.28167)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+      <g id="g9132" transform="matrix(1.1399016,0,0,1.1399016,-132.1887,105.34687)" style="fill:url(#linearGradient147502);fill-opacity:1;stroke:url(#linearGradient147504);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 z" inkscape:path-effect="#path-effect9080" id="path9078" d="m 865.9218,-764.14305 12.90254,-5.34349 30.58621,10.31771 6.01169,-2.68869 14.70319,14.61805 -43.48395,-1.74606 9.96773,-4.45799 -30.68741,-10.69953" style="fill:url(#linearGradient9257);fill-opacity:1;stroke:url(#linearGradient9259);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 c 23.36516,-0.0531 24.68121,-4.90539 38.49395,-6.86895 l -9.3618,16.54834 -7.77996,-2.58496 z" inkscape:path-effect="#path-effect9088" id="path9086" d="m 951.45783,-745.39285 -15.23917,-5.05508 21.18275,-10.08201 -6.72747,-2.23525 38.49395,-6.86895 -9.3618,16.54834 -7.77996,-2.58496 -20.5683,10.27791" style="fill:url(#linearGradient9261);fill-opacity:1;stroke:url(#linearGradient9263);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 z" inkscape:path-effect="#path-effect9098" id="path9096" d="m 944.67241,-742.30491 13.67975,16.04373 6.42021,-3.41645 30.45328,10.6179 12.85375,-7.4065 -30.22778,-10.17137 7.49056,-3.98602 -40.66977,-1.68129" style="fill:url(#linearGradient9265);fill-opacity:1;stroke:url(#linearGradient9267);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+        <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 z" inkscape:path-effect="#path-effect9112" id="path9110" d="m 922.87415,-744.28594 15.53147,5.41523 -21.46693,10.72695 7.49957,2.99416 -41.52367,7.07158 13.10972,-18.41569 5.5186,2.20327 21.33124,-9.9955" style="fill:url(#linearGradient9269);fill-opacity:1;stroke:url(#linearGradient9272);stroke-width:0.80000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/SAN.svg b/misc/images/svg/elements/SAN.svg
index 45ffa760e2e..dda6df40536 100644
--- a/misc/images/svg/elements/SAN.svg
+++ b/misc/images/svg/elements/SAN.svg
@@ -1,12238 +1,2067 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="127.99998"
-   height="106.52017"
-   id="svg150482"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 52">
-  <defs
-     id="defs150484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20649-2"
-       id="linearGradient24026"
-       gradientUnits="userSpaceOnUse"
-       x1="-403.96698"
-       y1="379.52612"
-       x2="-401.74063"
-       y2="353.43774"
-       gradientTransform="matrix(1.0004329,0,0,1.0004329,0.20185976,-0.17447818)" />
-    <linearGradient
-       id="linearGradient20649-2">
-      <stop
-         style="stop-color:#c31f1f;stop-opacity:1;"
-         offset="0"
-         id="stop20651-5" />
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="1"
-         id="stop20653-5" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect20629-1"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter22688-0">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.9025261"
-         id="feGaussianBlur22690-1" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="127.99998" height="106.52017" id="svg150482" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 52">
+  <defs id="defs150484">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient20649-2" id="linearGradient24026" gradientUnits="userSpaceOnUse" x1="-403.96698" y1="379.52612" x2="-401.74063" y2="353.43774" gradientTransform="matrix(1.0004329,0,0,1.0004329,0.20185976,-0.17447818)"/>
+    <linearGradient id="linearGradient20649-2">
+      <stop style="stop-color:#c31f1f;stop-opacity:1;" offset="0" id="stop20651-5"/>
+      <stop style="stop-color:#878787;stop-opacity:1;" offset="1" id="stop20653-5"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect20629-1" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter22688-0">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.9025261" id="feGaussianBlur22690-1"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14963-51"
-       id="linearGradient24028"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31675482,0,0,0.31675482,-375.51828,223.64362)"
-       x1="106.12733"
-       y1="683.47302"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       id="linearGradient14963-51">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop14965-7" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop14967-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14963-51"
-       id="linearGradient24030"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.43389213,0,0,0.43389213,-323.07387,282.20946)"
-       x1="197.08134"
-       y1="392.5202"
-       x2="268.86612"
-       y2="427.5202" />
-    <linearGradient
-       id="linearGradient147689">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop147691" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop147693" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14963-51"
-       id="linearGradient24032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.43389213,0,0,0.43389213,-323.07387,282.20946)"
-       x1="359.86612"
-       y1="397.52554"
-       x2="280.77579"
-       y2="434.02554" />
-    <linearGradient
-       id="linearGradient147696">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop147698" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop147700" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.39297758,0,0,0.39297758,-258.55254,-652.987)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5538-4-0">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop5540-8-0" />
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:0;"
-         offset="1"
-         id="stop5542-8-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.39297758,0,0,0.39297758,-259.82419,-652.2572)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.36939914,0,0,0.36939914,-265.534,-588.15804)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.36939914,0,0,0.36939914,-266.72935,-587.47204)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24042"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.35367971,0,0,0.35367971,-268.96498,-545.63967)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.35367971,0,0,0.35367971,-270.10946,-544.9828)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24046"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.34581994,0,0,0.34581994,-268.80681,-525.45552)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24048"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.34581994,0,0,0.34581994,-269.92586,-524.81327)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24050"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.33796059,0,0,0.33796059,-268.93527,-505.08326)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24052"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.33796059,0,0,0.33796059,-270.02889,-504.45558)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24054"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.33010162,0,0,0.33010162,-269.26985,-484.64332)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.33010162,0,0,0.33010162,-270.33804,-484.03025)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32677-3"
-       id="linearGradient31189-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0911919,0,0,1.037025,-797.50928,-7873.4799)"
-       x1="419.40567"
-       y1="7968.9097"
-       x2="418.9826"
-       y2="8009.5396" />
-    <linearGradient
-       id="linearGradient32677-3">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop32679-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop32681-6" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter20900"
-       x="-0.041303825"
-       width="1.0826076"
-       y="-0.15563066"
-       height="1.3112613">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.958105"
-         id="feGaussianBlur20902" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14963-51" id="linearGradient24028" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.31675482,0,0,0.31675482,-375.51828,223.64362)" x1="106.12733" y1="683.47302" x2="319.51733" y2="742.35919"/>
+    <linearGradient id="linearGradient14963-51">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop14965-7"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop14967-6"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14963-51" id="linearGradient24030" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.43389213,0,0,0.43389213,-323.07387,282.20946)" x1="197.08134" y1="392.5202" x2="268.86612" y2="427.5202"/>
+    <linearGradient id="linearGradient147689">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop147691"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop147693"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14963-51" id="linearGradient24032" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.43389213,0,0,0.43389213,-323.07387,282.20946)" x1="359.86612" y1="397.52554" x2="280.77579" y2="434.02554"/>
+    <linearGradient id="linearGradient147696">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop147698"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop147700"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24034" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.39297758,0,0,0.39297758,-258.55254,-652.987)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5538-4-0">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop5540-8-0"/>
+      <stop style="stop-color:#1a1a1a;stop-opacity:0;" offset="1" id="stop5542-8-2"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24036" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.39297758,0,0,0.39297758,-259.82419,-652.2572)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24038" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.36939914,0,0,0.36939914,-265.534,-588.15804)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24040" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.36939914,0,0,0.36939914,-266.72935,-587.47204)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24042" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.35367971,0,0,0.35367971,-268.96498,-545.63967)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24044" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.35367971,0,0,0.35367971,-270.10946,-544.9828)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24046" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.34581994,0,0,0.34581994,-268.80681,-525.45552)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24048" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.34581994,0,0,0.34581994,-269.92586,-524.81327)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24050" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.33796059,0,0,0.33796059,-268.93527,-505.08326)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24052" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.33796059,0,0,0.33796059,-270.02889,-504.45558)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24054" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.33010162,0,0,0.33010162,-269.26985,-484.64332)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24056" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.33010162,0,0,0.33010162,-270.33804,-484.03025)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient32677-3" id="linearGradient31189-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0911919,0,0,1.037025,-797.50928,-7873.4799)" x1="419.40567" y1="7968.9097" x2="418.9826" y2="8009.5396"/>
+    <linearGradient id="linearGradient32677-3">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop32679-3"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop32681-6"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter20900" x="-0.041303825" width="1.0826076" y="-0.15563066" height="1.3112613">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.958105" id="feGaussianBlur20902"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0-4-7-2"
-       id="linearGradient24060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72502783,0,0,0.68903735,-705.98568,-5165.9312)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.36697"
-       y2="7986.2241" />
-    <linearGradient
-       id="linearGradient42443-7-52-0-4-7-2">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop42445-53-8-3-5-8-8" />
-      <stop
-         id="stop42447-0-2-7-5-1-2"
-         offset="0.3702293"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop42449-3-19-2-1-5-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427-4"
-       id="linearGradient24062"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,284.47059)"
-       x1="159.92857"
-       y1="361.98718"
-       x2="210.83929"
-       y2="333.23718" />
-    <linearGradient
-       id="linearGradient76427-4">
-      <stop
-         id="stop76429-3"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop76431-43"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427-4"
-       id="linearGradient24064"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,284.47059)"
-       x1="355.42856"
-       y1="451.72647"
-       x2="327.83929"
-       y2="256.22647" />
-    <linearGradient
-       id="linearGradient147799">
-      <stop
-         id="stop147801"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop147803"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient24066"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,284.5158)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient76456-6">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76458-8" />
-      <stop
-         id="stop76460-4"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76462-7" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4612-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4614-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4616-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4618-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24068"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,284.51581)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient5345-0">
-      <stop
-         id="stop5347-8"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop5349-8"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4620-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4622-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5365-14"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,284.47059)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       id="linearGradient5369-3"
-       inkscape:collect="always">
-      <stop
-         id="stop5371-6"
-         offset="0"
-         style="stop-color:#333333;stop-opacity:1;" />
-      <stop
-         id="stop5373-3"
-         offset="1"
-         style="stop-color:#333333;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-404.70403)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient24074"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,289.62444)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient147833">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop147835" />
-      <stop
-         id="stop147837"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop147839" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5439-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5441-2"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5443-19"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5445-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,289.62445)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient147846">
-      <stop
-         id="stop147848"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop147850"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5449-23"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5451-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5453-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24078"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,289.57923)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24080"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-409.81267)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient24082"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,294.72676)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient147870">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop147872" />
-      <stop
-         id="stop147874"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop147876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5515-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5517-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5519-19"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5521-89"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24084"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,294.72677)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient147883">
-      <stop
-         id="stop147885"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop147887"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5525-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5527-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5529-13"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24086"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,294.68155)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24088"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-414.91499)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient24090-51"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,284.5158)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient147907">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop147909" />
-      <stop
-         id="stop147911"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop147913" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5699-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5701-2"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5703-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5705-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24092"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,284.51581)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient147920">
-      <stop
-         id="stop147922"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop147924"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5709-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5711-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5713-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24094"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,284.47059)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24096"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-404.70403)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient24098"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,289.62444)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient147944">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop147946" />
-      <stop
-         id="stop147948"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop147950" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5721-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5723-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5725-01"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5727-48"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24100"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,289.62445)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient147957">
-      <stop
-         id="stop147959"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop147961"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5731-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5733-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5735-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24102"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,289.57923)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24104"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-409.81267)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient24106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,294.72676)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient147981">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop147983" />
-      <stop
-         id="stop147985"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop147987" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5743-59"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5745-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5747-98"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5749-01"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24108"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,294.72677)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient147994">
-      <stop
-         id="stop147996"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop147998"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5753-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5755-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5757-55"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,294.68155)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24112"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-414.91499)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient24114"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,284.5158)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient6289-5">
-      <stop
-         id="stop6291-0"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop6293-9" />
-      <stop
-         id="stop6295-2"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6155-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6157-24"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6159-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6161-04"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24116-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,284.51581)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148027">
-      <stop
-         id="stop148029"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148031"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6165-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6167-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6169-1"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,284.47059)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24120"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-404.70403)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient24122"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,289.62716)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148051">
-      <stop
-         id="stop148053"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148055" />
-      <stop
-         id="stop148057"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6353-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6355-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6357-08"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6359-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24124"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,289.62716)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148064">
-      <stop
-         id="stop148066"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148068"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6363-87"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6365-26"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6367-93"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,289.58194)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24128"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-409.81539)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient24130"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,294.73354)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148088">
-      <stop
-         id="stop148090"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148092" />
-      <stop
-         id="stop148094"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6431-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6433-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6435-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6437-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24132"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,294.73355)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148101">
-      <stop
-         id="stop148103"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148105"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6441-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6443-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6445-4"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24134"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,294.68834)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24136"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-414.92177)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient24138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,284.5158)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148125">
-      <stop
-         id="stop148127"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148129" />
-      <stop
-         id="stop148131"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6615-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6617-0"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6619-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6621-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24140"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,284.51581)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148138">
-      <stop
-         id="stop148140"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148142"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6625-13"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6627-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6629-35"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,284.47059)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-404.70403)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient24146"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,289.62716)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148162">
-      <stop
-         id="stop148164"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148166" />
-      <stop
-         id="stop148168"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6637-85"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6639-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6641-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6643-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,289.62716)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148175">
-      <stop
-         id="stop148177"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148179"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6647-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6649-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6651-36"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,289.58194)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24152"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-409.81539)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient24154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,294.73354)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148199">
-      <stop
-         id="stop148201"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148203" />
-      <stop
-         id="stop148205"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6659-0"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6661-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6663-97"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6665-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient24156"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,294.73355)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148212">
-      <stop
-         id="stop148214"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148216"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6669-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6671-41"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6673-5"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24158"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,294.68834)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient24160"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-414.92177)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0-4-7-2"
-       id="linearGradient36602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72502783,0,0,0.68903735,-705.98568,-5185.2985)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.36697"
-       y2="7986.2241" />
-    <linearGradient
-       id="linearGradient148236">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148238" />
-      <stop
-         id="stop148240"
-         offset="0.3702293"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148242" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427-4"
-       id="linearGradient36600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,265.1035)"
-       x1="159.92857"
-       y1="361.98718"
-       x2="210.83929"
-       y2="333.23718" />
-    <linearGradient
-       id="linearGradient148245">
-      <stop
-         id="stop148247"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop148249"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427-4"
-       id="linearGradient36598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,265.1035)"
-       x1="355.42856"
-       y1="451.72647"
-       x2="327.83929"
-       y2="256.22647" />
-    <linearGradient
-       id="linearGradient148252">
-      <stop
-         id="stop148254"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop148256"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,265.14871)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148259">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148261" />
-      <stop
-         id="stop148263"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148265" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17260-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17262-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17264-66"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17266-7"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,265.14871)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148272">
-      <stop
-         id="stop148274"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148276"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17270-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17272-0"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17274-6"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36592"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,265.1035)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36590"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-385.33693)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36588"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,270.25734)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148296">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148298" />
-      <stop
-         id="stop148300"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148302" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17282-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17284-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17286-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17288-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36586"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,270.25735)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148309">
-      <stop
-         id="stop148311"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148313"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17292-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17294-52"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17296-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36584"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,270.21215)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-390.44559)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36580"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,275.35966)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148333">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148335" />
-      <stop
-         id="stop148337"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148339" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17304-16"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17306-88"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17308-27"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17310-71"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36578"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,275.35967)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148346">
-      <stop
-         id="stop148348"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148350"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17314-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17316-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17318-60"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36576"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,275.31447)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36574"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-395.54789)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36572"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,265.14871)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148370">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148372" />
-      <stop
-         id="stop148374"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148376" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17326-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17328-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17330-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17332-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36570"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,265.14871)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148383">
-      <stop
-         id="stop148385"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148387"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17336-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17338-245"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17340-2"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36568"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,265.1035)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-385.33693)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,270.25734)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148407">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148409" />
-      <stop
-         id="stop148411"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148413" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17348-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17350-98"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17352-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17354-6"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36562"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,270.25735)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148420">
-      <stop
-         id="stop148422"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148424"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17358-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17360-2"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17362-7"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36560"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,270.21215)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36558"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-390.44559)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36556"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,275.35966)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148444">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148446" />
-      <stop
-         id="stop148448"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148450" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17370-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17372-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17374-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17376-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,275.35967)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148457">
-      <stop
-         id="stop148459"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148461"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17380-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17382-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17384-05"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36552"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,275.31447)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36550"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-395.54789)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36548"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,265.14871)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148481">
-      <stop
-         id="stop148483"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148485" />
-      <stop
-         id="stop148487"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17392-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17394-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17396-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17398-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36546"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,265.14871)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148494">
-      <stop
-         id="stop148496"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148498"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17402-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17404-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17406-89"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,265.1035)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-385.33693)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36540"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,270.26006)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148518">
-      <stop
-         id="stop148520"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148522" />
-      <stop
-         id="stop148524"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17414-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17416-00"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17418-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17420-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36538"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,270.26007)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148531">
-      <stop
-         id="stop148533"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148535"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17424-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17426-52"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17428-1"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36536"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,270.21486)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36534"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-390.4483)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36532"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,275.36646)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148555">
-      <stop
-         id="stop148557"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148559" />
-      <stop
-         id="stop148561"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17436-86"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17438-46"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17440-89"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17442-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36530"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,275.36646)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148568">
-      <stop
-         id="stop148570"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148572"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17446-3"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17448-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17450-5"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36528"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,275.32124)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36526"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-395.55468)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,265.14871)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148592">
-      <stop
-         id="stop148594"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148596" />
-      <stop
-         id="stop148598"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17458-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17460-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17462-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17464-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,265.14871)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148605">
-      <stop
-         id="stop148607"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148609"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17468-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17470-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17472-4"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,265.1035)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-385.33693)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,270.26006)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148629">
-      <stop
-         id="stop148631"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148633" />
-      <stop
-         id="stop148635"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17480-2"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17482-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17484-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17486-9"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,270.26007)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148642">
-      <stop
-         id="stop148644"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148646"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17490-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17492-0"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17494-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,270.21486)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-390.4483)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,275.36646)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148666">
-      <stop
-         id="stop148668"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148670" />
-      <stop
-         id="stop148672"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17502-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17504-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17506-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17508-7"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36506"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,275.36646)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148679">
-      <stop
-         id="stop148681"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148683"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17512-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect17514-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect17516-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,275.32124)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36502"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-395.55468)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0-4-7-2"
-       id="linearGradient36500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72502783,0,0,0.68903735,-705.98568,-5204.6656)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.36697"
-       y2="7986.2241" />
-    <linearGradient
-       id="linearGradient148703">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148705" />
-      <stop
-         id="stop148707"
-         offset="0.3702293"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148709" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427-4"
-       id="linearGradient36498"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,245.73641)"
-       x1="159.92857"
-       y1="361.98718"
-       x2="210.83929"
-       y2="333.23718" />
-    <linearGradient
-       id="linearGradient148712">
-      <stop
-         id="stop148714"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop148716"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427-4"
-       id="linearGradient36496"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,245.73641)"
-       x1="355.42856"
-       y1="451.72647"
-       x2="327.83929"
-       y2="256.22647" />
-    <linearGradient
-       id="linearGradient148719">
-      <stop
-         id="stop148721"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop148723"
-         offset="1"
-         style="stop-color:#27343c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,245.78162)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148726">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148728" />
-      <stop
-         id="stop148730"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148732" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18838-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18840-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18842-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18844-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,245.78163)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148739">
-      <stop
-         id="stop148741"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148743"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18848-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18850-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18852-73"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,245.73641)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-365.96985)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,250.89026)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148763">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148765" />
-      <stop
-         id="stop148767"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148769" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18860-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18862-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18864-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18866-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,250.89027)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148776">
-      <stop
-         id="stop148778"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148780"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18870-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18872-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18874-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,250.84506)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-371.07849)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,255.99257)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148800">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148802" />
-      <stop
-         id="stop148804"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148806" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18882-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18884-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18886-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18888-6"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36476"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,255.99259)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148813">
-      <stop
-         id="stop148815"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148817"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18892-2"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18894-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18896-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36474"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,255.94736)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-376.18081)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36470"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,245.78162)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148837">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148839" />
-      <stop
-         id="stop148841"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148843" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18904-93"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18906-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18908-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18910-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36468"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,245.78163)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148850">
-      <stop
-         id="stop148852"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148854"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18914-95"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18916-55"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18918-6"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,245.73641)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36464"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-365.96985)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,250.89026)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148874">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148876" />
-      <stop
-         id="stop148878"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148880" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18927-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18929-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18931-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18933-6"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,250.89027)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148887">
-      <stop
-         id="stop148889"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148891"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18937-3"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18939-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18941-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,250.84506)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-371.07849)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76456-6"
-       id="linearGradient36454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,255.99257)"
-       x1="278.21426"
-       y1="254.68361"
-       x2="409.46429"
-       y2="275.68808" />
-    <linearGradient
-       id="linearGradient148911">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop148913" />
-      <stop
-         id="stop148915"
-         offset="0.2624054"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop148917" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18949-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18951-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18953-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18955-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,255.99259)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148924">
-      <stop
-         id="stop148926"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148928"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18959-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18961-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18963-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,255.94736)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-376.18081)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,245.78162)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148948">
-      <stop
-         id="stop148950"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148952" />
-      <stop
-         id="stop148954"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18971-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18973-60"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18975-2"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18977-4"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,245.78163)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148961">
-      <stop
-         id="stop148963"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop148965"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18981-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect18983-0"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18985-22"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,245.73641)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36440"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-365.96985)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,250.89298)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient148985">
-      <stop
-         id="stop148987"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop148989" />
-      <stop
-         id="stop148991"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18993-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18995-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18997-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect18999-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,250.89298)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient148998">
-      <stop
-         id="stop149000"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop149002"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19003-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19005-50"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19007-4"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36434"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,250.84776)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36432"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-371.0812)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,255.99936)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient149022">
-      <stop
-         id="stop149024"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop149026" />
-      <stop
-         id="stop149028"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19015-1"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19017-2"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19019-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19021-7"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36428"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,255.99937)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient149035">
-      <stop
-         id="stop149037"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop149039"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19025-95"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19027-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19029-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,255.95416)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36424"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-376.18758)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36422"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,245.78162)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient149059">
-      <stop
-         id="stop149061"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop149063" />
-      <stop
-         id="stop149065"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19037-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19039-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19041-12"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19043-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36420"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,245.78163)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient149072">
-      <stop
-         id="stop149074"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop149076"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19047-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19049-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19051-22"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36418"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,245.73641)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36416"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-365.96985)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36414"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,250.89298)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient149096">
-      <stop
-         id="stop149098"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop149100" />
-      <stop
-         id="stop149102"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19059-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19061-5"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19063-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19065-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36412"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,250.89298)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient149109">
-      <stop
-         id="stop149111"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop149113"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19069-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19071-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19073-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36410"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,250.84776)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36408"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-371.0812)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6289-5"
-       id="linearGradient36406"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,255.99936)"
-       x1="289.71426"
-       y1="254.48363"
-       x2="394.96429"
-       y2="275.4881" />
-    <linearGradient
-       id="linearGradient149133">
-      <stop
-         id="stop149135"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.2624054"
-         id="stop149137" />
-      <stop
-         id="stop149139"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19081-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19083-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19085-56"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19087-6"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5345-0"
-       id="linearGradient36404"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,255.99937)"
-       x1="352.96841"
-       y1="265.73416"
-       x2="377.92957"
-       y2="266.04523" />
-    <linearGradient
-       id="linearGradient149146">
-      <stop
-         id="stop149148"
-         offset="0"
-         style="stop-color:#ff8080;stop-opacity:1;" />
-      <stop
-         id="stop149150"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19091-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect19093-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect19095-2"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36402"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,255.95416)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5369-3"
-       id="linearGradient36400"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-376.18758)"
-       x1="334.06375"
-       y1="259.60709"
-       x2="334.06375"
-       y2="257.13223" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14963-51"
-       id="linearGradient24366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31675482,0,0,0.31675482,-375.51828,223.64362)"
-       x1="106.12733"
-       y1="683.47302"
-       x2="319.51733"
-       y2="742.35919" />
-    <linearGradient
-       id="linearGradient149174">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop149176" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop149178" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14963-51"
-       id="linearGradient24368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.43389213,0,0,0.43389213,-323.07387,282.20946)"
-       x1="197.08134"
-       y1="392.5202"
-       x2="268.86612"
-       y2="427.5202" />
-    <linearGradient
-       id="linearGradient149181">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop149183" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop149185" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14963-51"
-       id="linearGradient24370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.43389213,0,0,0.43389213,-323.07387,282.20946)"
-       x1="359.86612"
-       y1="397.52554"
-       x2="280.77579"
-       y2="434.02554" />
-    <linearGradient
-       id="linearGradient149188">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop149190" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop149192" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24372"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.39297758,0,0,0.39297758,-258.55254,-652.987)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24374"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.39297758,0,0,0.39297758,-259.82419,-652.2572)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24376"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.36939914,0,0,0.36939914,-265.534,-588.15804)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.36939914,0,0,0.36939914,-266.72935,-587.47204)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.35367971,0,0,0.35367971,-268.96498,-545.63967)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24382"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.35367971,0,0,0.35367971,-270.10946,-544.9828)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24384"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.34581994,0,0,0.34581994,-268.80681,-525.45552)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24386"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.34581994,0,0,0.34581994,-269.92586,-524.81327)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24388"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.33796059,0,0,0.33796059,-268.93527,-505.08326)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.33796059,0,0,0.33796059,-270.02889,-504.45558)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24392"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.33010162,0,0,0.33010162,-269.26985,-484.64332)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5538-4-0"
-       id="linearGradient24394-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.33010162,0,0,0.33010162,-270.33804,-484.03025)"
-       x1="461.4122"
-       y1="2842.7937"
-       x2="458.44904"
-       y2="2841.1069" />
-    <linearGradient
-       y2="8009.5396"
-       x2="418.9826"
-       y1="7968.9097"
-       x1="419.40567"
-       gradientTransform="matrix(1.0911919,0,0,1.037025,-797.50928,-7873.4799)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient40609"
-       xlink:href="#linearGradient32677-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient149279">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop149281" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop149283" />
-    </linearGradient>
-    <linearGradient
-       y2="8009.5396"
-       x2="418.9826"
-       y1="7968.9097"
-       x1="419.40567"
-       gradientTransform="matrix(1.0911919,0,0,1.037025,-797.50928,-7873.4799)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient150480"
-       xlink:href="#linearGradient32677-3"
-       inkscape:collect="always" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0-4-7-2" id="linearGradient24060" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.72502783,0,0,0.68903735,-705.98568,-5165.9312)" x1="407.2959" y1="8015.7466" x2="407.36697" y2="7986.2241"/>
+    <linearGradient id="linearGradient42443-7-52-0-4-7-2">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop42445-53-8-3-5-8-8"/>
+      <stop id="stop42447-0-2-7-5-1-2" offset="0.3702293" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop42449-3-19-2-1-5-3"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427-4" id="linearGradient24062" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,284.47059)" x1="159.92857" y1="361.98718" x2="210.83929" y2="333.23718"/>
+    <linearGradient id="linearGradient76427-4">
+      <stop id="stop76429-3" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop76431-43" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427-4" id="linearGradient24064" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,284.47059)" x1="355.42856" y1="451.72647" x2="327.83929" y2="256.22647"/>
+    <linearGradient id="linearGradient147799">
+      <stop id="stop147801" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop147803" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient24066" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,284.5158)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient76456-6">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76458-8"/>
+      <stop id="stop76460-4" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76462-7"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect4612-3" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4614-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4616-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4618-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,284.51581)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient5345-0">
+      <stop id="stop5347-8" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop5349-8" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect4620-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4622-5" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5365-14" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24070" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,284.47059)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient id="linearGradient5369-3" inkscape:collect="always">
+      <stop id="stop5371-6" offset="0" style="stop-color:#333333;stop-opacity:1;"/>
+      <stop id="stop5373-3" offset="1" style="stop-color:#333333;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24072" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-404.70403)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient24074" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,289.62444)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient147833">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop147835"/>
+      <stop id="stop147837" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop147839"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5439-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5441-2" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5443-19" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5445-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24076" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,289.62445)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient147846">
+      <stop id="stop147848" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop147850" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5449-23" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5451-4" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5453-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24078" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,289.57923)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24080" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-409.81267)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient24082" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,294.72676)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient147870">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop147872"/>
+      <stop id="stop147874" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop147876"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect5515-2" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5517-3" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5519-19" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5521-89" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24084" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,294.72677)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient147883">
+      <stop id="stop147885" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop147887" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect5525-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5527-9" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5529-13" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24086" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,294.68155)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24088" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-414.91499)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient24090-51" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,284.5158)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient147907">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop147909"/>
+      <stop id="stop147911" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop147913"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5699-4" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5701-2" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5703-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5705-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24092" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,284.51581)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient147920">
+      <stop id="stop147922" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop147924" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5709-8" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5711-9" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5713-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24094" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,284.47059)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24096" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-404.70403)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient24098" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,289.62444)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient147944">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop147946"/>
+      <stop id="stop147948" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop147950"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect5721-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5723-7" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5725-01" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5727-48" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24100" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,289.62445)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient147957">
+      <stop id="stop147959" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop147961" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect5731-1" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5733-9" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5735-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24102" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,289.57923)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24104" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-409.81267)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient24106" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,294.72676)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient147981">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop147983"/>
+      <stop id="stop147985" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop147987"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5743-59" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5745-7" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5747-98" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5749-01" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24108" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,294.72677)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient147994">
+      <stop id="stop147996" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop147998" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5753-4" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect5755-7" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5757-55" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24110" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,294.68155)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24112" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-414.91499)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient24114" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,284.5158)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient6289-5">
+      <stop id="stop6291-0" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop6293-9"/>
+      <stop id="stop6295-2" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6155-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6157-24" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6159-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6161-04" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24116-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,284.51581)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148027">
+      <stop id="stop148029" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148031" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6165-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6167-1" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6169-1" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24118" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,284.47059)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24120" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-404.70403)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient24122" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,289.62716)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148051">
+      <stop id="stop148053" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148055"/>
+      <stop id="stop148057" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6353-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6355-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6357-08" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6359-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24124" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,289.62716)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148064">
+      <stop id="stop148066" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148068" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6363-87" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6365-26" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6367-93" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24126" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,289.58194)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24128" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-409.81539)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient24130" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,294.73354)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148088">
+      <stop id="stop148090" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148092"/>
+      <stop id="stop148094" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6431-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6433-1" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6435-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6437-3" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24132" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,294.73355)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148101">
+      <stop id="stop148103" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148105" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6441-3" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6443-8" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6445-4" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24134" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,294.68834)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24136" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-414.92177)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient24138" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,284.5158)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148125">
+      <stop id="stop148127" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148129"/>
+      <stop id="stop148131" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6615-8" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6617-0" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6619-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6621-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24140" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,284.51581)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148138">
+      <stop id="stop148140" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148142" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6625-13" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6627-7" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6629-35" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24142" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,284.47059)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24144" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-404.70403)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient24146" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,289.62716)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148162">
+      <stop id="stop148164" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148166"/>
+      <stop id="stop148168" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6637-85" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6639-6" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6641-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6643-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24148" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,289.62716)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148175">
+      <stop id="stop148177" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148179" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6647-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6649-9" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6651-36" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24150" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,289.58194)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24152" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-409.81539)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient24154" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,294.73354)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148199">
+      <stop id="stop148201" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148203"/>
+      <stop id="stop148205" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6659-0" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6661-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6663-97" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6665-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient24156" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,294.73355)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148212">
+      <stop id="stop148214" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148216" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6669-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect6671-41" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6673-5" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24158" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,294.68834)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient24160" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-414.92177)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0-4-7-2" id="linearGradient36602" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.72502783,0,0,0.68903735,-705.98568,-5185.2985)" x1="407.2959" y1="8015.7466" x2="407.36697" y2="7986.2241"/>
+    <linearGradient id="linearGradient148236">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148238"/>
+      <stop id="stop148240" offset="0.3702293" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148242"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427-4" id="linearGradient36600" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,265.1035)" x1="159.92857" y1="361.98718" x2="210.83929" y2="333.23718"/>
+    <linearGradient id="linearGradient148245">
+      <stop id="stop148247" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop148249" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427-4" id="linearGradient36598" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,265.1035)" x1="355.42856" y1="451.72647" x2="327.83929" y2="256.22647"/>
+    <linearGradient id="linearGradient148252">
+      <stop id="stop148254" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop148256" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36596" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,265.14871)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148259">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148261"/>
+      <stop id="stop148263" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148265"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17260-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17262-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17264-66" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17266-7" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36594" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,265.14871)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148272">
+      <stop id="stop148274" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148276" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17270-4" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17272-0" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17274-6" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36592" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,265.1035)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36590" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-385.33693)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36588" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,270.25734)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148296">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148298"/>
+      <stop id="stop148300" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148302"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17282-1" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17284-2" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17286-1" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17288-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36586" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,270.25735)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148309">
+      <stop id="stop148311" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148313" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17292-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17294-52" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17296-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36584" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,270.21215)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36582" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-390.44559)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36580" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,275.35966)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148333">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148335"/>
+      <stop id="stop148337" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148339"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17304-16" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17306-88" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17308-27" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17310-71" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36578" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,275.35967)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148346">
+      <stop id="stop148348" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148350" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17314-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17316-4" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17318-60" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36576" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,275.31447)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36574" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-395.54789)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36572" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,265.14871)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148370">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148372"/>
+      <stop id="stop148374" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148376"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17326-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17328-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17330-1" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17332-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36570" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,265.14871)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148383">
+      <stop id="stop148385" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148387" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17336-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17338-245" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17340-2" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36568" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,265.1035)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36566" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-385.33693)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36564" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,270.25734)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148407">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148409"/>
+      <stop id="stop148411" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148413"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17348-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17350-98" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17352-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17354-6" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36562" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,270.25735)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148420">
+      <stop id="stop148422" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148424" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17358-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17360-2" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17362-7" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36560" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,270.21215)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36558" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-390.44559)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36556" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,275.35966)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148444">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148446"/>
+      <stop id="stop148448" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148450"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17370-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17372-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17374-2" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17376-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36554" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,275.35967)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148457">
+      <stop id="stop148459" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148461" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17380-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17382-2" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17384-05" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36552" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,275.31447)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36550" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-395.54789)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36548" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,265.14871)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148481">
+      <stop id="stop148483" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148485"/>
+      <stop id="stop148487" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17392-7" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17394-8" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17396-7" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17398-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36546" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,265.14871)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148494">
+      <stop id="stop148496" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148498" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17402-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17404-5" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17406-89" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36544" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,265.1035)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36542" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-385.33693)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36540" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,270.26006)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148518">
+      <stop id="stop148520" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148522"/>
+      <stop id="stop148524" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17414-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17416-00" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17418-7" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17420-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36538" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,270.26007)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148531">
+      <stop id="stop148533" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148535" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17424-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17426-52" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17428-1" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36536" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,270.21486)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36534" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-390.4483)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36532" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,275.36646)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148555">
+      <stop id="stop148557" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148559"/>
+      <stop id="stop148561" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17436-86" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17438-46" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17440-89" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17442-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36530" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,275.36646)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148568">
+      <stop id="stop148570" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148572" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17446-3" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17448-5" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17450-5" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36528" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,275.32124)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36526" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-395.55468)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36524" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,265.14871)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148592">
+      <stop id="stop148594" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148596"/>
+      <stop id="stop148598" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17458-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17460-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17462-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17464-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36522" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,265.14871)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148605">
+      <stop id="stop148607" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148609" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17468-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17470-5" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17472-4" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36520" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,265.1035)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36518" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-385.33693)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36516" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,270.26006)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148629">
+      <stop id="stop148631" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148633"/>
+      <stop id="stop148635" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17480-2" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17482-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17484-4" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17486-9" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36514" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,270.26007)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148642">
+      <stop id="stop148644" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148646" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect17490-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17492-0" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17494-3" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36512" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,270.21486)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36510" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-390.4483)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36508" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,275.36646)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148666">
+      <stop id="stop148668" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148670"/>
+      <stop id="stop148672" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17502-3" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17504-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17506-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17508-7" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36506" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,275.36646)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148679">
+      <stop id="stop148681" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148683" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect17512-6" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect17514-7" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect17516-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36504" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,275.32124)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36502" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-395.55468)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0-4-7-2" id="linearGradient36500" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.72502783,0,0,0.68903735,-705.98568,-5204.6656)" x1="407.2959" y1="8015.7466" x2="407.36697" y2="7986.2241"/>
+    <linearGradient id="linearGradient148703">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148705"/>
+      <stop id="stop148707" offset="0.3702293" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148709"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427-4" id="linearGradient36498" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,245.73641)" x1="159.92857" y1="361.98718" x2="210.83929" y2="333.23718"/>
+    <linearGradient id="linearGradient148712">
+      <stop id="stop148714" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop148716" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427-4" id="linearGradient36496" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.31207,245.73641)" x1="355.42856" y1="451.72647" x2="327.83929" y2="256.22647"/>
+    <linearGradient id="linearGradient148719">
+      <stop id="stop148721" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop148723" offset="1" style="stop-color:#27343c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36494" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,245.78162)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148726">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148728"/>
+      <stop id="stop148730" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148732"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect18838-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18840-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18842-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18844-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36492" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,245.78163)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148739">
+      <stop id="stop148741" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148743" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect18848-7" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18850-4" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18852-73" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36490" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,245.73641)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36488" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-365.96985)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36486" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,250.89026)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148763">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148765"/>
+      <stop id="stop148767" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148769"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect18860-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18862-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18864-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18866-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36484" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,250.89027)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148776">
+      <stop id="stop148778" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148780" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect18870-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18872-2" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18874-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36482" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,250.84506)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36480" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-371.07849)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36478" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,255.99257)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148800">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148802"/>
+      <stop id="stop148804" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148806"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect18882-4" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18884-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18886-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18888-6" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36476" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-488.17652,255.99259)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148813">
+      <stop id="stop148815" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148817" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect18892-2" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18894-9" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18896-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36474" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,255.94736)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36472" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-488.17649,-376.18081)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36470" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,245.78162)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148837">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148839"/>
+      <stop id="stop148841" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148843"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect18904-93" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18906-1" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18908-1" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18910-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36468" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,245.78163)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148850">
+      <stop id="stop148852" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148854" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect18914-95" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18916-55" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18918-6" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36466" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,245.73641)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36464" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-365.96985)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36462" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,250.89026)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148874">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148876"/>
+      <stop id="stop148878" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148880"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect18927-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18929-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18931-4" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18933-6" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36460" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,250.89027)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148887">
+      <stop id="stop148889" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148891" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect18937-3" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18939-4" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18941-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36458" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,250.84506)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36456" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-371.07849)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76456-6" id="linearGradient36454" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,255.99257)" x1="278.21426" y1="254.68361" x2="409.46429" y2="275.68808"/>
+    <linearGradient id="linearGradient148911">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop148913"/>
+      <stop id="stop148915" offset="0.2624054" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop148917"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect18949-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18951-3" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18953-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18955-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36452" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-507.53282,255.99259)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148924">
+      <stop id="stop148926" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148928" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect18959-2" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18961-8" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18963-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36450" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,255.94736)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36448" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-507.53281,-376.18081)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36446" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,245.78162)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148948">
+      <stop id="stop148950" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148952"/>
+      <stop id="stop148954" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect18971-8" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18973-60" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18975-2" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18977-4" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36444" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,245.78163)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148961">
+      <stop id="stop148963" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop148965" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect18981-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect18983-0" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18985-22" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36442" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,245.73641)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36440" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-365.96985)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36438" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,250.89298)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient148985">
+      <stop id="stop148987" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop148989"/>
+      <stop id="stop148991" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect18993-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18995-4" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18997-4" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect18999-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36436" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,250.89298)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient148998">
+      <stop id="stop149000" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop149002" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect19003-2" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19005-50" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19007-4" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36434" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,250.84776)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36432" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-371.0812)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36430" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,255.99936)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient149022">
+      <stop id="stop149024" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop149026"/>
+      <stop id="stop149028" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect19015-1" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19017-2" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19019-7" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19021-7" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36428" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-468.80508,255.99937)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient149035">
+      <stop id="stop149037" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop149039" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect19025-95" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19027-5" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19029-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36426" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,255.95416)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36424" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-468.80505,-376.18758)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36422" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,245.78162)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient149059">
+      <stop id="stop149061" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop149063"/>
+      <stop id="stop149065" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect19037-3" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19039-4" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19041-12" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19043-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36420" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,245.78163)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient149072">
+      <stop id="stop149074" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop149076" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect19047-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19049-8" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19051-22" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36418" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,245.73641)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36416" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-365.96985)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36414" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,250.89298)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient149096">
+      <stop id="stop149098" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop149100"/>
+      <stop id="stop149102" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect19059-8" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19061-5" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19063-8" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19065-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36412" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,250.89298)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient149109">
+      <stop id="stop149111" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop149113" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect19069-9" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19071-4" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19073-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36410" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,250.84776)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36408" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-371.0812)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6289-5" id="linearGradient36406" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,255.99936)" x1="289.71426" y1="254.48363" x2="394.96429" y2="275.4881"/>
+    <linearGradient id="linearGradient149133">
+      <stop id="stop149135" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.2624054" id="stop149137"/>
+      <stop id="stop149139" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect19081-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19083-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19085-56" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19087-6" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5345-0" id="linearGradient36404" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.2260461,0,0,0.2260461,-449.47132,255.99937)" x1="352.96841" y1="265.73416" x2="377.92957" y2="266.04523"/>
+    <linearGradient id="linearGradient149146">
+      <stop id="stop149148" offset="0" style="stop-color:#ff8080;stop-opacity:1;"/>
+      <stop id="stop149150" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect19091-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect19093-7" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect19095-2" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36402" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,255.95416)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5369-3" id="linearGradient36400" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22604609,0,0,0.22604609,-449.4713,-376.18758)" x1="334.06375" y1="259.60709" x2="334.06375" y2="257.13223"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14963-51" id="linearGradient24366" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.31675482,0,0,0.31675482,-375.51828,223.64362)" x1="106.12733" y1="683.47302" x2="319.51733" y2="742.35919"/>
+    <linearGradient id="linearGradient149174">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop149176"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop149178"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14963-51" id="linearGradient24368" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.43389213,0,0,0.43389213,-323.07387,282.20946)" x1="197.08134" y1="392.5202" x2="268.86612" y2="427.5202"/>
+    <linearGradient id="linearGradient149181">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop149183"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop149185"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14963-51" id="linearGradient24370" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.43389213,0,0,0.43389213,-323.07387,282.20946)" x1="359.86612" y1="397.52554" x2="280.77579" y2="434.02554"/>
+    <linearGradient id="linearGradient149188">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop149190"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop149192"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24372" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.39297758,0,0,0.39297758,-258.55254,-652.987)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24374" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.39297758,0,0,0.39297758,-259.82419,-652.2572)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24376" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.36939914,0,0,0.36939914,-265.534,-588.15804)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24378" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.36939914,0,0,0.36939914,-266.72935,-587.47204)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24380" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.35367971,0,0,0.35367971,-268.96498,-545.63967)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24382" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.35367971,0,0,0.35367971,-270.10946,-544.9828)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24384" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.34581994,0,0,0.34581994,-268.80681,-525.45552)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24386" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.34581994,0,0,0.34581994,-269.92586,-524.81327)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24388" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.33796059,0,0,0.33796059,-268.93527,-505.08326)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24390" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.33796059,0,0,0.33796059,-270.02889,-504.45558)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24392" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.33010162,0,0,0.33010162,-269.26985,-484.64332)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5538-4-0" id="linearGradient24394-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.33010162,0,0,0.33010162,-270.33804,-484.03025)" x1="461.4122" y1="2842.7937" x2="458.44904" y2="2841.1069"/>
+    <linearGradient y2="8009.5396" x2="418.9826" y1="7968.9097" x1="419.40567" gradientTransform="matrix(1.0911919,0,0,1.037025,-797.50928,-7873.4799)" gradientUnits="userSpaceOnUse" id="linearGradient40609" xlink:href="#linearGradient32677-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient149279">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop149281"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop149283"/>
+    </linearGradient>
+    <linearGradient y2="8009.5396" x2="418.9826" y1="7968.9097" x1="419.40567" gradientTransform="matrix(1.0911919,0,0,1.037025,-797.50928,-7873.4799)" gradientUnits="userSpaceOnUse" id="linearGradient150480" xlink:href="#linearGradient32677-3" inkscape:collect="always"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-143.85715"
-     inkscape:cy="76.117231"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="154"
-     inkscape:window-y="203"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata150487">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-143.85715" inkscape:cy="76.117231" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="154" inkscape:window-y="203" inkscape:window-maximized="0"/>
+  <metadata id="metadata150487">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-518.85715,-501.95924)">
-    <g
-       style="display:inline"
-       transform="matrix(1.0083315,0,0,1.0083315,989.0867,202.03489)"
-       id="g36604"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\SAN.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         style="fill:none;stroke:url(#linearGradient24026);stroke-width:1.346735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -431.19399,379.52975 29.91491,-25.91296 33.8758,22.43647"
-         id="path20627"
-         inkscape:path-effect="#path-effect20629-1"
-         inkscape:original-d="m -431.19399,379.52975 29.91491,-25.91296 33.8758,22.43647"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <g
-         id="g28386"
-         transform="matrix(1.0856695,0,0,1.0856695,37.660668,-110.81758)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 190.21338,691.0295 84.30377,36.12543 -58.77787,33.93541 -83.42033,-45.25626 z"
-           style="opacity:0.73991029;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22688-0)"
-           id="path21218"
-           transform="matrix(-0.32633859,0,0,0.35269389,-373.15854,203.30963)" />
-        <g
-           id="g24206">
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -436.06431,444.46885 -26.4086,9.50458 18.61817,10.74923 24.63847,-14.22504 z"
-             style="fill:url(#linearGradient24028);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21222" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -419.21627,450.49766 -24.63846,14.225 -10e-6,6.30935 24.63847,-14.51319 z"
-             style="fill:url(#linearGradient24030);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21224" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -443.85474,464.72266 -18.61817,-10.74923 0,6.30633 18.61817,10.75225 z"
-             style="fill:url(#linearGradient24032);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21226" />
-          <path
-             id="path21228"
-             d="m -438.76868,464.68199 0,2.14855 -2.76633,1.62737 0.004,-2.2442 0.61387,-0.3361 -0.0141,-0.31866 1.4721,-0.85213 0,0.35809 z"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -440.87183,465.86616 -0.66728,0.33834 -0.0107,2.26218 2.78116,-1.63825 z"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21230" />
-          <path
-             inkscape:connector-curvature="0"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -430.87531,460.0863 -0.0114,2.13882 -2.6937,1.61835 0,-2.10402 0.60114,-0.36317 0.0165,-0.41255 1.41125,-0.81481 0,0.35066 z"
-             id="path21242"
-             sodipodi:nodetypes="ccccccccc" />
-          <path
-             id="path21246"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -431.34477,462.46415 -1.89574,-0.92888 -0.0991,0.0584 1.83954,0.96604 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -431.64534,462.66453 -1.93332,-0.9414 -0.0114,0.12102 1.78944,0.91594 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21248" />
-          <path
-             id="path21250"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -431.99601,462.87738 -1.58265,-0.7723 9.9e-4,0.12105 1.42625,0.74686 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path21244"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -432.93487,461.36258 -0.65345,0.36833 0.0125,2.07822 2.68327,-1.58054 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path21256"
-             d="m -427.22318,458.0024 0,2.07145 -2.60903,1.55217 0,-2.02921 0.57979,-0.35026 0,-0.38878 1.37698,-0.79503 0,0.33823 z"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
-          <path
-             id="path21262"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -427.96584,460.48893 -1.86461,-0.90793 -0.0109,0.11677 1.72585,0.88334 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -428.30405,460.69428 -1.5264,-0.74488 9.8e-4,0.11672 1.37558,0.72034 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21264" />
-          <path
-             id="path21266"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -428.69661,460.92984 -1.13988,-0.55763 0.007,0.12274 0.983,0.52707 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -429.20955,459.23329 -0.63022,0.35522 0,2.04506 2.61659,-1.55972 z"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21258" />
-          <path
-             inkscape:connector-curvature="0"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -423.71863,456.04168 0,1.97414 -2.51359,1.48059 0,-1.91864 0.55857,-0.33747 0,-0.43938 1.32662,-0.76592 0,0.39068 z"
-             id="path21270"
-             sodipodi:nodetypes="ccccccccc" />
-          <path
-             id="path21272"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -425.63234,457.22756 -0.60718,0.34224 0,1.97023 2.52089,-1.54525 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path21274"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -424.15485,458.25107 -1.76149,-0.86302 -0.092,0.0542 1.70928,0.89763 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -424.43413,458.43729 -1.7964,-0.87474 -0.0106,0.11245 1.66273,0.8511 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21276" />
-          <path
-             id="path21278"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -424.75997,458.63512 -1.47056,-0.71766 9.8e-4,0.11249 1.32525,0.69398 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -425.13817,458.86205 -1.09819,-0.53725 0.007,0.11825 0.94705,0.50782 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21280" />
-          <path
-             id="path21282"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -425.54547,459.11223 -0.68507,-0.33938 -0.0105,0.13569 0.55139,0.2925 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccccccc"
-             inkscape:connector-curvature="0"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -434.7228,462.35121 0,2.14855 -2.76633,1.62737 0.004,-2.2442 0.61387,-0.3361 -0.0141,-0.31866 1.47209,-0.85213 0,0.35809 z"
-             id="path21284" />
-          <path
-             id="path21286"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -436.82595,463.53537 -0.66729,0.33835 -0.0107,2.26218 2.78118,-1.63825 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path21288"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -435.20219,464.75217 -1.93586,-1.05811 -0.10116,0.0539 1.87848,1.09285 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -435.50913,464.93944 -1.97423,-1.07312 -0.0116,0.12293 1.82733,1.03881 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21290" />
-          <path
-             id="path21292"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -435.86722,465.13655 -1.61614,-0.88018 9.8e-4,0.12366 1.45644,0.84515 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -436.28286,465.36241 -1.2069,-0.65877 0.008,0.13041 1.0408,0.61698 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21294" />
-          <path
-             id="path21296"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -436.73049,465.61203 -0.75288,-0.41562 -0.0116,0.14847 0.60598,0.35578 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccccccc"
-             id="path21298"
-             d="m -420.42047,454.12591 0,1.97414 -2.51359,1.48059 0,-1.91863 0.55858,-0.33747 0,-0.43938 1.32661,-0.76593 0,0.39069 z"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -422.33418,455.31179 -0.60717,0.34224 0,1.97024 2.52088,-1.54525 z"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21300" />
-          <path
-             id="path21312"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24034);stroke-width:0.10124438;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -439.21546,462.7963 -0.73559,0.42217 0,1.58313 0.79658,-0.4293 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.2558035"
-             inkscape:transform-center-y="-3.6310978e-005" />
-          <path
-             inkscape:transform-center-x="-1.2558024"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -440.48711,463.52611 -0.73558,0.42209 0,1.58322 0.79657,-0.42939 z"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24036);stroke-width:0.10124438;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path21314"
-             inkscape:transform-center-y="-2.0065162e-005" />
-          <path
-             inkscape:transform-center-y="-4.317584e-005"
-             inkscape:transform-center-x="-1.1804582"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -435.35725,460.67877 -0.69145,0.39685 0,1.48814 0.74878,-0.40355 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24038);stroke-width:0.09516977;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path21316" />
-          <path
-             inkscape:transform-center-y="-3.0421108e-005"
-             id="path21318"
-             style="fill:#15cc01;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24040);stroke-width:0.09516977;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -436.5526,461.3648 -0.69145,0.39676 0,1.48822 0.74878,-0.40359 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.1804515" />
-          <path
-             id="path21320"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24042);stroke-width:0.09111991;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -431.56156,458.56493 -0.66202,0.37995 0,1.42483 0.71692,-0.38641 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.1302209"
-             inkscape:transform-center-y="-3.5812256e-005" />
-          <path
-             inkscape:transform-center-x="-1.1302206"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -432.70604,459.22178 -0.66202,0.37986 0,1.42487 0.71692,-0.38641 z"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24044);stroke-width:0.09111991;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path21322"
-             inkscape:transform-center-y="-3.033866e-005" />
-          <path
-             inkscape:transform-center-y="-5.2712879e-005"
-             inkscape:transform-center-x="-1.1051084"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -427.79004,456.43272 -0.6473,0.37151 0,1.39316 0.70098,-0.37781 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24046);stroke-width:0.08909495;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path21324" />
-          <path
-             inkscape:transform-center-y="-1.8005608e-005"
-             id="path21326"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24048);stroke-width:0.08909495;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -428.90908,457.07499 -0.64731,0.37139 0,1.39324 0.70098,-0.37781 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.1051041" />
-          <path
-             id="path21328"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24050);stroke-width:0.08707013;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -424.30532,454.4899 -0.6326,0.36309 0,1.36148 0.68505,-0.36923 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.079995"
-             inkscape:transform-center-y="-7.1262664e-005" />
-          <path
-             inkscape:transform-center-x="-1.0799904"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -425.39894,455.11761 -0.63259,0.36291 0,1.36161 0.68505,-0.36922 z"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24052);stroke-width:0.08707013;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path21330" />
-          <path
-             inkscape:transform-center-y="-8.7449368e-005"
-             inkscape:transform-center-x="-1.0548787"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -421.02692,452.61584 -0.61789,0.35465 0,1.32981 0.66912,-0.36063 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24054);stroke-width:0.08504539;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path21332" />
-          <path
-             id="path21334"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24056);stroke-width:0.08504539;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -422.0951,453.22898 -0.61789,0.35444 0,1.32997 0.66912,-0.36063 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.0548741"
-             inkscape:transform-center-y="1.6019424e-005" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21336"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.27181,296.42921)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.42639,297.59108)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21338"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21340"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-423.58086,298.75302)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.63397,295.99873)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21342"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21344"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.78844,297.16067)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-424.9429,298.32262)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21346"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.07446,296.76287)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21348"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21350"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.22904,297.92475)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-424.38354,299.08668)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21352"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21354"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.43662,296.3324)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.5911,297.49434)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21356"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21358"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.74556,298.65629)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21360"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.87712,297.09655)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.03171,298.25841)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21362"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21364"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.18619,299.42036)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.23928,296.66607)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21366"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21368"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.39374,297.82802)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.54821,298.98997)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21370"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.67978,297.4302)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21372"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21374"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.83435,298.59208)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.98881,299.75402)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21376"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21378"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.04189,296.99974)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.19637,298.16167)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21380"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21382"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.35084,299.32361)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21384"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.49698,297.76995)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.65157,298.93181)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21386"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21388"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.80605,300.09376)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.85914,297.33947)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21390"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21392"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.01361,298.50141)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.16807,299.66337)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21394"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21396"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.31424,298.10967)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.46883,299.27154)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21398"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21400"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.62327,300.43349)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.67638,297.67921)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21402"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21404"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.83086,298.84114)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.98531,300.0031)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21406"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.11688,298.44335)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21408"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21410"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.27148,299.60522)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.42594,300.76716)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21412"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21414"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.47905,298.01286)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.63351,299.17481)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21416"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21418"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.78797,300.33677)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21420"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.91954,298.777)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.07411,299.93887)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21422"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21424"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.22857,301.10083)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-434.28169,298.34653)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21426"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21428"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.43613,299.50848)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.59061,300.67042)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21430"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.7222,299.11068)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21432"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21434"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.87677,300.27255)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.03124,301.43449)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21436"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21438"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-435.08433,298.6802)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.23881,299.84214)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21440"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21442"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.39327,301.00409)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21444"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-434.5248,299.44435)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.67941,300.60621)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path21446"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path21448"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.83387,301.76815)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-518.85715,-501.95924)">
+    <g style="display:inline" transform="matrix(1.0083315,0,0,1.0083315,989.0867,202.03489)" id="g36604">
+      <path style="fill:none;stroke:url(#linearGradient24026);stroke-width:1.346735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -431.19399,379.52975 29.91491,-25.91296 33.8758,22.43647" id="path20627" inkscape:path-effect="#path-effect20629-1" inkscape:original-d="m -431.19399,379.52975 29.91491,-25.91296 33.8758,22.43647" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <g id="g28386" transform="matrix(1.0856695,0,0,1.0856695,37.660668,-110.81758)">
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 190.21338,691.0295 84.30377,36.12543 -58.77787,33.93541 -83.42033,-45.25626 z" style="opacity:0.73991029;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22688-0)" id="path21218" transform="matrix(-0.32633859,0,0,0.35269389,-373.15854,203.30963)"/>
+        <g id="g24206">
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -436.06431,444.46885 -26.4086,9.50458 18.61817,10.74923 24.63847,-14.22504 z" style="fill:url(#linearGradient24028);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21222"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -419.21627,450.49766 -24.63846,14.225 -10e-6,6.30935 24.63847,-14.51319 z" style="fill:url(#linearGradient24030);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21224"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -443.85474,464.72266 -18.61817,-10.74923 0,6.30633 18.61817,10.75225 z" style="fill:url(#linearGradient24032);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21226"/>
+          <path id="path21228" d="m -438.76868,464.68199 0,2.14855 -2.76633,1.62737 0.004,-2.2442 0.61387,-0.3361 -0.0141,-0.31866 1.4721,-0.85213 0,0.35809 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -440.87183,465.86616 -0.66728,0.33834 -0.0107,2.26218 2.78116,-1.63825 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21230"/>
+          <path inkscape:connector-curvature="0" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -430.87531,460.0863 -0.0114,2.13882 -2.6937,1.61835 0,-2.10402 0.60114,-0.36317 0.0165,-0.41255 1.41125,-0.81481 0,0.35066 z" id="path21242" sodipodi:nodetypes="ccccccccc"/>
+          <path id="path21246" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -431.34477,462.46415 -1.89574,-0.92888 -0.0991,0.0584 1.83954,0.96604 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -431.64534,462.66453 -1.93332,-0.9414 -0.0114,0.12102 1.78944,0.91594 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21248"/>
+          <path id="path21250" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -431.99601,462.87738 -1.58265,-0.7723 9.9e-4,0.12105 1.42625,0.74686 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path21244" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -432.93487,461.36258 -0.65345,0.36833 0.0125,2.07822 2.68327,-1.58054 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path21256" d="m -427.22318,458.0024 0,2.07145 -2.60903,1.55217 0,-2.02921 0.57979,-0.35026 0,-0.38878 1.37698,-0.79503 0,0.33823 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+          <path id="path21262" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -427.96584,460.48893 -1.86461,-0.90793 -0.0109,0.11677 1.72585,0.88334 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -428.30405,460.69428 -1.5264,-0.74488 9.8e-4,0.11672 1.37558,0.72034 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21264"/>
+          <path id="path21266" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -428.69661,460.92984 -1.13988,-0.55763 0.007,0.12274 0.983,0.52707 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -429.20955,459.23329 -0.63022,0.35522 0,2.04506 2.61659,-1.55972 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21258"/>
+          <path inkscape:connector-curvature="0" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -423.71863,456.04168 0,1.97414 -2.51359,1.48059 0,-1.91864 0.55857,-0.33747 0,-0.43938 1.32662,-0.76592 0,0.39068 z" id="path21270" sodipodi:nodetypes="ccccccccc"/>
+          <path id="path21272" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.63234,457.22756 -0.60718,0.34224 0,1.97023 2.52089,-1.54525 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path21274" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.15485,458.25107 -1.76149,-0.86302 -0.092,0.0542 1.70928,0.89763 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -424.43413,458.43729 -1.7964,-0.87474 -0.0106,0.11245 1.66273,0.8511 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21276"/>
+          <path id="path21278" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.75997,458.63512 -1.47056,-0.71766 9.8e-4,0.11249 1.32525,0.69398 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -425.13817,458.86205 -1.09819,-0.53725 0.007,0.11825 0.94705,0.50782 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21280"/>
+          <path id="path21282" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.54547,459.11223 -0.68507,-0.33938 -0.0105,0.13569 0.55139,0.2925 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -434.7228,462.35121 0,2.14855 -2.76633,1.62737 0.004,-2.2442 0.61387,-0.3361 -0.0141,-0.31866 1.47209,-0.85213 0,0.35809 z" id="path21284"/>
+          <path id="path21286" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.82595,463.53537 -0.66729,0.33835 -0.0107,2.26218 2.78118,-1.63825 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path21288" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -435.20219,464.75217 -1.93586,-1.05811 -0.10116,0.0539 1.87848,1.09285 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -435.50913,464.93944 -1.97423,-1.07312 -0.0116,0.12293 1.82733,1.03881 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21290"/>
+          <path id="path21292" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -435.86722,465.13655 -1.61614,-0.88018 9.8e-4,0.12366 1.45644,0.84515 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -436.28286,465.36241 -1.2069,-0.65877 0.008,0.13041 1.0408,0.61698 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21294"/>
+          <path id="path21296" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.73049,465.61203 -0.75288,-0.41562 -0.0116,0.14847 0.60598,0.35578 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccccccc" id="path21298" d="m -420.42047,454.12591 0,1.97414 -2.51359,1.48059 0,-1.91863 0.55858,-0.33747 0,-0.43938 1.32661,-0.76593 0,0.39069 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -422.33418,455.31179 -0.60717,0.34224 0,1.97024 2.52088,-1.54525 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21300"/>
+          <path id="path21312" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24034);stroke-width:0.10124438;stroke-miterlimit:4;stroke-dasharray:none" d="m -439.21546,462.7963 -0.73559,0.42217 0,1.58313 0.79658,-0.4293 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.2558035" inkscape:transform-center-y="-3.6310978e-005"/>
+          <path inkscape:transform-center-x="-1.2558024" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -440.48711,463.52611 -0.73558,0.42209 0,1.58322 0.79657,-0.42939 z" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24036);stroke-width:0.10124438;stroke-miterlimit:4;stroke-dasharray:none" id="path21314" inkscape:transform-center-y="-2.0065162e-005"/>
+          <path inkscape:transform-center-y="-4.317584e-005" inkscape:transform-center-x="-1.1804582" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -435.35725,460.67877 -0.69145,0.39685 0,1.48814 0.74878,-0.40355 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24038);stroke-width:0.09516977;stroke-miterlimit:4;stroke-dasharray:none" id="path21316"/>
+          <path inkscape:transform-center-y="-3.0421108e-005" id="path21318" style="fill:#15cc01;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24040);stroke-width:0.09516977;stroke-miterlimit:4;stroke-dasharray:none" d="m -436.5526,461.3648 -0.69145,0.39676 0,1.48822 0.74878,-0.40359 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.1804515"/>
+          <path id="path21320" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24042);stroke-width:0.09111991;stroke-miterlimit:4;stroke-dasharray:none" d="m -431.56156,458.56493 -0.66202,0.37995 0,1.42483 0.71692,-0.38641 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.1302209" inkscape:transform-center-y="-3.5812256e-005"/>
+          <path inkscape:transform-center-x="-1.1302206" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -432.70604,459.22178 -0.66202,0.37986 0,1.42487 0.71692,-0.38641 z" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24044);stroke-width:0.09111991;stroke-miterlimit:4;stroke-dasharray:none" id="path21322" inkscape:transform-center-y="-3.033866e-005"/>
+          <path inkscape:transform-center-y="-5.2712879e-005" inkscape:transform-center-x="-1.1051084" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -427.79004,456.43272 -0.6473,0.37151 0,1.39316 0.70098,-0.37781 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24046);stroke-width:0.08909495;stroke-miterlimit:4;stroke-dasharray:none" id="path21324"/>
+          <path inkscape:transform-center-y="-1.8005608e-005" id="path21326" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24048);stroke-width:0.08909495;stroke-miterlimit:4;stroke-dasharray:none" d="m -428.90908,457.07499 -0.64731,0.37139 0,1.39324 0.70098,-0.37781 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.1051041"/>
+          <path id="path21328" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24050);stroke-width:0.08707013;stroke-miterlimit:4;stroke-dasharray:none" d="m -424.30532,454.4899 -0.6326,0.36309 0,1.36148 0.68505,-0.36923 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.079995" inkscape:transform-center-y="-7.1262664e-005"/>
+          <path inkscape:transform-center-x="-1.0799904" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -425.39894,455.11761 -0.63259,0.36291 0,1.36161 0.68505,-0.36922 z" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24052);stroke-width:0.08707013;stroke-miterlimit:4;stroke-dasharray:none" id="path21330"/>
+          <path inkscape:transform-center-y="-8.7449368e-005" inkscape:transform-center-x="-1.0548787" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -421.02692,452.61584 -0.61789,0.35465 0,1.32981 0.66912,-0.36063 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24054);stroke-width:0.08504539;stroke-miterlimit:4;stroke-dasharray:none" id="path21332"/>
+          <path id="path21334" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24056);stroke-width:0.08504539;stroke-miterlimit:4;stroke-dasharray:none" d="m -422.0951,453.22898 -0.61789,0.35444 0,1.32997 0.66912,-0.36063 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.0548741" inkscape:transform-center-y="1.6019424e-005"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21336" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.27181,296.42921)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.42639,297.59108)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21338" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21340" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-423.58086,298.75302)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.63397,295.99873)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21342" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21344" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.78844,297.16067)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-424.9429,298.32262)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21346" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.07446,296.76287)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21348" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21350" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.22904,297.92475)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-424.38354,299.08668)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21352" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21354" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.43662,296.3324)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.5911,297.49434)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21356" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21358" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.74556,298.65629)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21360" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.87712,297.09655)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.03171,298.25841)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21362" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21364" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.18619,299.42036)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.23928,296.66607)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21366" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21368" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.39374,297.82802)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.54821,298.98997)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21370" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.67978,297.4302)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21372" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21374" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.83435,298.59208)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.98881,299.75402)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21376" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21378" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.04189,296.99974)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.19637,298.16167)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21380" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21382" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.35084,299.32361)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21384" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.49698,297.76995)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.65157,298.93181)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21386" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21388" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.80605,300.09376)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.85914,297.33947)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21390" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21392" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.01361,298.50141)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.16807,299.66337)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21394" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21396" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.31424,298.10967)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.46883,299.27154)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21398" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21400" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.62327,300.43349)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.67638,297.67921)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21402" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21404" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.83086,298.84114)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.98531,300.0031)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21406" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.11688,298.44335)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21408" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21410" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.27148,299.60522)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.42594,300.76716)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21412" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21414" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.47905,298.01286)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.63351,299.17481)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21416" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21418" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.78797,300.33677)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21420" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.91954,298.777)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.07411,299.93887)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21422" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21424" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.22857,301.10083)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-434.28169,298.34653)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21426" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21428" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.43613,299.50848)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.59061,300.67042)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21430" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.7222,299.11068)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21432" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21434" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.87677,300.27255)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.03124,301.43449)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21436" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21438" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-435.08433,298.6802)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.23881,299.84214)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21440" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21442" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.39327,301.00409)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21444" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-434.5248,299.44435)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.67941,300.60621)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path21446" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path21448" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.83387,301.76815)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
         </g>
       </g>
-      <path
-         inkscape:connector-curvature="0"
-         d="m -398.81908,407.68163 c 6.47687,-0.82802 6.58225,24.18313 19.6463,25.78953 13.06405,1.6064 60.30098,0.5539 79.87188,0.64155 4.29744,0.0192 10.48547,-23.17875 15.73202,-23.15476 l -10.94523,-5.18549 -46.76632,1.61566 -27.10472,0 -20.62236,-3.21336 z"
-         style="opacity:0.57847535;fill:url(#linearGradient31189-4);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20900)"
-         id="path21058"
-         sodipodi:nodetypes="csscccccc"
-         transform="matrix(0.71433696,-0.02277265,0,0.49143042,-158.00288,147.97395)" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="path47635-7-3-1-9-1"
-         style="fill:url(#linearGradient24060);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -441.51671,342.041 0,15.18518 77.98371,0 -10e-6,-15.18518 -21.30816,-5.86064 -36.01873,0 z"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient24062);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect3526"
-         width="78.530823"
-         height="15.6214"
-         x="-441.64969"
-         y="342.04086"
-         ry="0" />
-      <path
-         id="rect5355"
-         style="fill:url(#linearGradient24064);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -441.64971,342.04083 78.53084,0 0,15.16446 -78.53084,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -421.26785,342.2002 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.11461 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path4480" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,342.57042 16.42871,0 0,4.01634 -16.42871,0 0,-0.90822 0.46419,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.36999 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.35248,-0.009 0.007,1.37275 -0.46488,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient24066);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4482" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,343.00772 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4484" />
-      <path
-         id="path4486"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,343.87827 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,344.79164 0.65649,0 0,0.48521 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4488" />
-      <path
-         id="path4490"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,345.69073 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,343.39304 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4492" />
-      <path
-         id="path4494"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,344.30641 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,345.20551 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4496" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -403.71413,343.09334 0,3.11115"
-         inkscape:path-effect="#path-effect4612-3"
-         id="path4498"
-         d="m -403.71413,343.09334 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,342.97917 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4500" />
-      <path
-         id="path4502"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,345.69073 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -416.81519,342.3227 0,1.02753 10.3895,0"
-         inkscape:path-effect="#path-effect4614-9"
-         id="path4504"
-         d="m -416.81519,342.3227 0,1.02753 10.3895,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -408.50929,343.35023 0,2.48321 1.82673,0"
-         inkscape:path-effect="#path-effect4616-8"
-         id="path4506"
-         d="m -408.50929,343.35023 0,2.48321 1.82673,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -408.48074,345.83344 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97045"
-         inkscape:path-effect="#path-effect4618-0"
-         id="path4508"
-         d="m -408.48074,345.83344 -8.36298,0 0,0.97045"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -408.27541,343.54891 2.06414,0 0,2.07008 -2.06414,0 z"
-         style="fill:url(#linearGradient24068);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path4510" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -405.99162,343.43585 0,2.29769"
-         inkscape:path-effect="#path-effect4620-0"
-         id="path4512"
-         d="m -405.99162,343.43585 0,2.29769"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -418.55631,342.76214 1.36234,0 0,3.63289 -1.36234,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4514" />
-      <path
-         d="m -416.70958,342.76214 0.86784,0 0,0.47429 -0.86784,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4516"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4518"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.72978,345.94092 0.86786,0 0,0.44402 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -418.44531,342.31813 0,4.08698"
-         inkscape:path-effect="#path-effect4622-5"
-         id="path4520"
-         d="m -418.44531,342.31813 0,4.08698"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.25574,342.35959 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.4243 c -0.34563,0 -0.89155,0 -1.31691,-1e-5 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4522" />
-      <path
-         id="path5353"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,342.57042 1.7578,0 -0.004,0.18722 -0.8343,1.1e-4 -0.0183,3.61087 0.85628,0.0356 0,0.18246 -1.75779,0 0,-0.90821 0.46419,0 -10e-4,-0.68622 0.45201,0.0122 0.004,1.37001 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.0138 -0.83871,-0.009 0.007,1.37277 -0.4649,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path5359"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.22048,342.35606 c 0.0546,-0.001 0.0998,-0.001 0.11963,6.6e-4 l 5e-5,4.43206 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -419.98945,342.55187 0,4.02903"
-         id="path5363"
-         inkscape:path-effect="#path-effect5365-14"
-         inkscape:original-d="m -419.98945,342.55187 0,4.02903"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient24070);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect5367"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="342.75418" />
-      <rect
-         y="-346.42047"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect5379"
-         style="fill:url(#linearGradient24072);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path5383"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -421.26785,347.30884 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path5385"
-         style="fill:url(#linearGradient24074);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,347.67905 16.42871,0 0,4.01635 -16.42871,0 0,-0.90822 0.46419,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.61527 -0.0142,-0.98508 -1.35248,-0.009 0.007,1.37275 -0.46488,0.0203 -10e-4,-0.90716 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path5387"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,348.11637 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,348.98691 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5389" />
-      <path
-         id="path5391"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,349.90028 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,350.79938 0.65649,0 0,0.48521 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5393" />
-      <path
-         id="path5395"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,348.50168 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,349.41505 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5397" />
-      <path
-         id="path5399"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,350.31415 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -403.71413,348.20199 0,3.11114"
-         id="path5401"
-         inkscape:path-effect="#path-effect5439-9"
-         inkscape:original-d="m -403.71413,348.20199 0,3.11114"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path5403"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,348.08782 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,350.79938 0.50802,0 0,0.4424 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5405" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -416.81519,347.43134 0,1.02754 10.3895,0"
-         id="path5407"
-         inkscape:path-effect="#path-effect5441-2"
-         inkscape:original-d="m -416.81519,347.43134 0,1.02754 10.3895,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -408.50929,348.45888 0,2.48321 1.82673,0"
-         id="path5409"
-         inkscape:path-effect="#path-effect5443-19"
-         inkscape:original-d="m -408.50929,348.45888 0,2.48321 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.48074,350.94209 -8.36298,0 0,0.97045"
-         id="path5411"
-         inkscape:path-effect="#path-effect5445-8"
-         inkscape:original-d="m -408.48074,350.94209 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97045"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path5413"
-         style="fill:url(#linearGradient24076);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.27541,348.65755 2.06414,0 0,2.07009 -2.06414,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -405.99162,348.54449 0,2.29769"
-         id="path5415"
-         inkscape:path-effect="#path-effect5449-23"
-         inkscape:original-d="m -405.99162,348.54449 0,2.29769"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path5417"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -418.55631,347.87079 1.36234,0 0,3.63288 -1.36234,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5419"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.70958,347.87079 0.86784,0 0,0.47429 -0.86784,0 z" />
-      <path
-         d="m -416.72978,351.04957 0.86786,0 0,0.44401 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5421"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -418.44531,347.42676 0,4.08701"
-         id="path5423"
-         inkscape:path-effect="#path-effect5451-4"
-         inkscape:original-d="m -418.44531,347.42676 0,4.08701"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path5425"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.25574,347.46823 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42429 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,347.67905 1.7578,0 -0.004,0.18722 -0.8343,1.2e-4 -0.0183,3.61087 0.85628,0.0356 0,0.18246 -1.75779,0 0,-0.90822 0.46419,0 -10e-4,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62142 0.85626,0.0138 -0.83871,-0.009 0.007,1.37274 -0.4649,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5427" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.22048,347.4647 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.6e-4 l 5e-5,4.43206 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5429" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -419.98945,347.66052 0,4.02902"
-         inkscape:path-effect="#path-effect5453-0"
-         id="path5431"
-         d="m -419.98945,347.66052 0,4.02902"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="347.86285"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect5433"
-         style="fill:url(#linearGradient24078);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient24080);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect5435"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="-351.52911" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -421.26785,352.41115 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25687 l 0,4.23265 c 0,0.14231 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25689 l 0,-4.23265 c 0,-0.14231 0.1146,-0.25687 0.25687,-0.25687 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path5459" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,352.78136 16.42871,0 0,4.01636 -16.42871,0 0,-0.90822 0.46419,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.36999 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.35248,-0.009 0.007,1.37276 -0.46488,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient24082);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5461" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,353.21867 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5463" />
-      <path
-         id="path5465"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,354.08922 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,355.00258 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5467" />
-      <path
-         id="path5469"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,355.90167 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,353.604 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5471" />
-      <path
-         id="path5473"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,354.51737 0.65648,0 0,0.48521 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,355.41646 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5475" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -403.71413,353.3043 0,3.11115"
-         inkscape:path-effect="#path-effect5515-2"
-         id="path5477"
-         d="m -403.71413,353.3043 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,353.19013 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5479" />
-      <path
-         id="path5481"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,355.90169 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -416.81519,352.53366 0,1.02752 10.3895,0"
-         inkscape:path-effect="#path-effect5517-3"
-         id="path5483"
-         d="m -416.81519,352.53366 0,1.02752 10.3895,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -408.50929,353.56118 0,2.48322 1.82673,0"
-         inkscape:path-effect="#path-effect5519-19"
-         id="path5485"
-         d="m -408.50929,353.56118 0,2.48322 1.82673,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -408.48074,356.0444 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97045"
-         inkscape:path-effect="#path-effect5521-89"
-         id="path5487"
-         d="m -408.48074,356.0444 -8.36298,0 0,0.97045"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -408.27541,353.75987 2.06414,0 0,2.07006 -2.06414,0 z"
-         style="fill:url(#linearGradient24084);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path5489" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -405.99162,353.64681 0,2.29768"
-         inkscape:path-effect="#path-effect5525-8"
-         id="path5491"
-         d="m -405.99162,353.64681 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -418.55631,352.9731 1.36234,0 0,3.63288 -1.36234,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5493" />
-      <path
-         d="m -416.70958,352.9731 0.86784,0 0,0.47429 -0.86784,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5495"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path5497"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.72978,356.15186 0.86786,0 0,0.44403 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -418.44531,352.52908 0,4.08698"
-         inkscape:path-effect="#path-effect5527-9"
-         id="path5499"
-         d="m -418.44531,352.52908 0,4.08698"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.25574,352.57052 c 0.36888,-0.004 1.10825,-9e-5 1.31691,0.004 l 0,4.42427 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5501" />
-      <path
-         id="path5503"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,352.78136 1.7578,0 -0.004,0.18723 -0.8343,1.2e-4 -0.0183,3.61085 0.85628,0.0356 0,0.18249 -1.75779,0 0,-0.90823 0.46419,0 -10e-4,-0.68621 0.45201,0.0122 0.004,1.36999 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.0138 -0.83871,-0.009 0.007,1.37276 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path5505"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.22048,352.56702 c 0.0546,-0.001 0.0998,-0.001 0.11963,6.6e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,-1e-5 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -419.98945,352.76283 0,4.02903"
-         id="path5507"
-         inkscape:path-effect="#path-effect5529-13"
-         inkscape:original-d="m -419.98945,352.76283 0,4.02903"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient24086);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect5509"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="352.96512" />
-      <rect
-         y="-356.63147"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect5511"
-         style="fill:url(#linearGradient24088);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path5535"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -440.62416,342.2002 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25688 l 0,4.23264 c 0,0.1423 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.11461 -0.2569,-0.25688 l 0,-4.23264 c 0,-0.14232 0.11461,-0.25688 0.2569,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path5537"
-         style="fill:url(#linearGradient24090-51);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,342.57042 16.42872,0 0,4.01634 -16.42872,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45202,0.0122 0.004,1.36999 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.3525,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90717 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path5539"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,343.00772 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,343.87827 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5541" />
-      <path
-         id="path5543"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,344.79164 0.65648,0 0,0.48521 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,345.69073 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5545" />
-      <path
-         id="path5547"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,343.39304 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,344.30641 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5549" />
-      <path
-         id="path5551"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,345.20551 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -423.07046,343.09334 0,3.11115"
-         id="path5553"
-         inkscape:path-effect="#path-effect5699-4"
-         inkscape:original-d="m -423.07046,343.09334 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path5555"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,342.97917 0.50801,0 0,0.44241 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,345.69073 0.50801,0 0,0.44241 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5557" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -436.17152,342.3227 0,1.02753 10.38953,0"
-         id="path5559"
-         inkscape:path-effect="#path-effect5701-2"
-         inkscape:original-d="m -436.17152,342.3227 0,1.02753 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -427.8656,343.35023 0,2.48321 1.82672,0"
-         id="path5561"
-         inkscape:path-effect="#path-effect5703-5"
-         inkscape:original-d="m -427.8656,343.35023 0,2.48321 1.82672,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -427.83708,345.83344 -8.36298,0 0,0.97045"
-         id="path5563"
-         inkscape:path-effect="#path-effect5705-3"
-         inkscape:original-d="m -427.83708,345.83344 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97045"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path5565"
-         style="fill:url(#linearGradient24092);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -427.63173,343.54891 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -425.34794,343.43585 0,2.29769"
-         id="path5567"
-         inkscape:path-effect="#path-effect5709-8"
-         inkscape:original-d="m -425.34794,343.43585 0,2.29769"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path5569"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -437.91264,342.76214 1.36233,0 0,3.63289 -1.36233,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5571"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.06592,342.76214 0.86786,0 0,0.47429 -0.86786,0 z" />
-      <path
-         d="m -436.08611,345.94092 0.86786,0 0,0.44402 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5573"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -437.80163,342.31813 0,4.08698"
-         id="path5575"
-         inkscape:path-effect="#path-effect5711-9"
-         inkscape:original-d="m -437.80163,342.31813 0,4.08698"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path5577"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.61207,342.35959 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.4243 c -0.34564,0 -0.89156,0 -1.31692,-1e-5 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,342.57042 1.75781,0 -0.004,0.18722 -0.83431,1.1e-4 -0.0183,3.61087 0.85629,0.0356 0,0.18246 -1.75779,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.37001 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.0138 -0.83871,-0.009 0.007,1.37277 -0.46489,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5579" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.57679,342.35606 c 0.0546,-0.001 0.0996,-0.001 0.11961,6.6e-4 l 4e-5,4.43206 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5581" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -439.34576,342.55187 0,4.02903"
-         inkscape:path-effect="#path-effect5713-2"
-         id="path5583"
-         d="m -439.34576,342.55187 0,4.02903"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="342.75418"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect5585"
-         style="fill:url(#linearGradient24094);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient24096);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect5587"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="-346.42047" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -440.62416,347.30884 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25688 l 0,-4.23264 c 0,-0.14232 0.11461,-0.25688 0.2569,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path5589" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,347.67905 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.61527 -0.0142,-0.98508 -1.3525,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90716 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient24098);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5591" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,348.11637 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5593" />
-      <path
-         id="path5595"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,348.98691 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,349.90028 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5597" />
-      <path
-         id="path5599"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,350.79938 0.65648,0 0,0.48521 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,348.50168 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5601" />
-      <path
-         id="path5603"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,349.41505 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,350.31415 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5605" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -423.07046,348.20199 0,3.11114"
-         inkscape:path-effect="#path-effect5721-8"
-         id="path5607"
-         d="m -423.07046,348.20199 0,3.11114"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,348.08782 0.50801,0 0,0.44241 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5609" />
-      <path
-         id="path5611"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,350.79938 0.50801,0 0,0.4424 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -436.17152,347.43134 0,1.02754 10.38953,0"
-         inkscape:path-effect="#path-effect5723-7"
-         id="path5613"
-         d="m -436.17152,347.43134 0,1.02754 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.8656,348.45888 0,2.48321 1.82672,0"
-         inkscape:path-effect="#path-effect5725-01"
-         id="path5615"
-         d="m -427.8656,348.45888 0,2.48321 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.83708,350.94209 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97045"
-         inkscape:path-effect="#path-effect5727-48"
-         id="path5617"
-         d="m -427.83708,350.94209 -8.36298,0 0,0.97045"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -427.63173,348.65755 2.06412,0 0,2.07009 -2.06412,0 z"
-         style="fill:url(#linearGradient24100);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path5619" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -425.34794,348.54449 0,2.29769"
-         inkscape:path-effect="#path-effect5731-1"
-         id="path5621"
-         d="m -425.34794,348.54449 0,2.29769"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -437.91264,347.87079 1.36233,0 0,3.63288 -1.36233,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5623" />
-      <path
-         d="m -436.06592,347.87079 0.86786,0 0,0.47429 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5625"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path5627"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.08611,351.04957 0.86786,0 0,0.44401 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -437.80163,347.42676 0,4.08701"
-         inkscape:path-effect="#path-effect5733-9"
-         id="path5629"
-         d="m -437.80163,347.42676 0,4.08701"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.61207,347.46823 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5631" />
-      <path
-         id="path5633"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,347.67905 1.75781,0 -0.004,0.18722 -0.83431,1.2e-4 -0.0183,3.61087 0.85629,0.0356 0,0.18246 -1.75779,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62142 0.85627,0.0138 -0.83871,-0.009 0.007,1.37274 -0.46489,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path5635"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.57679,347.4647 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.6e-4 l 4e-5,4.43206 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -439.34576,347.66052 0,4.02902"
-         id="path5637"
-         inkscape:path-effect="#path-effect5735-3"
-         inkscape:original-d="m -439.34576,347.66052 0,4.02902"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient24102);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect5639"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="347.86285" />
-      <rect
-         y="-351.52911"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect5641"
-         style="fill:url(#linearGradient24104);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path5643"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -440.62416,352.41115 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25687 l 0,4.23265 c 0,0.14231 -0.1146,0.25689 -0.25689,0.25689 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25689 l 0,-4.23265 c 0,-0.14231 0.11461,-0.25687 0.2569,-0.25687 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path5645"
-         style="fill:url(#linearGradient24106);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,352.78136 16.42872,0 0,4.01636 -16.42872,0 0,-0.90822 0.4642,0 -10e-4,-0.68622 0.45202,0.0122 0.004,1.36999 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.3525,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90717 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path5647"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,353.21867 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,354.08922 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5649" />
-      <path
-         id="path5651"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,355.00258 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,355.90167 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5653" />
-      <path
-         id="path5655"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,353.604 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,354.51737 0.65649,0 0,0.48521 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5657" />
-      <path
-         id="path5659"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,355.41646 0.65649,0 0,0.48521 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -423.07046,353.3043 0,3.11115"
-         id="path5661"
-         inkscape:path-effect="#path-effect5743-59"
-         inkscape:original-d="m -423.07046,353.3043 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path5663"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,353.19013 0.50801,0 0,0.44241 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,355.90169 0.50801,0 0,0.44241 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5665" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -436.17152,352.53366 0,1.02752 10.38953,0"
-         id="path5667"
-         inkscape:path-effect="#path-effect5745-7"
-         inkscape:original-d="m -436.17152,352.53366 0,1.02752 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -427.8656,353.56118 0,2.48322 1.82672,0"
-         id="path5669"
-         inkscape:path-effect="#path-effect5747-98"
-         inkscape:original-d="m -427.8656,353.56118 0,2.48322 1.82672,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -427.83708,356.0444 -8.36298,0 0,0.97045"
-         id="path5671"
-         inkscape:path-effect="#path-effect5749-01"
-         inkscape:original-d="m -427.83708,356.0444 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97045"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path5673"
-         style="fill:url(#linearGradient24108);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -427.63173,353.75987 2.06412,0 0,2.07006 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -425.34794,353.64681 0,2.29768"
-         id="path5675"
-         inkscape:path-effect="#path-effect5753-4"
-         inkscape:original-d="m -425.34794,353.64681 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path5677"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -437.91264,352.9731 1.36233,0 0,3.63288 -1.36233,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5679"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.06592,352.9731 0.86786,0 0,0.47429 -0.86786,0 z" />
-      <path
-         d="m -436.08611,356.15186 0.86786,0 0,0.44403 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5681"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -437.80163,352.52908 0,4.08698"
-         id="path5683"
-         inkscape:path-effect="#path-effect5755-7"
-         inkscape:original-d="m -437.80163,352.52908 0,4.08698"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path5685"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.61207,352.57052 c 0.36888,-0.004 1.10825,-9e-5 1.31692,0.004 l 0,4.42427 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,352.78136 1.75781,0 -0.004,0.18723 -0.83431,1.2e-4 -0.0183,3.61085 0.85629,0.0356 0,0.18249 -1.75779,0 0,-0.90823 0.4642,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.36999 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.0138 -0.83871,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5687" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.57679,352.56702 c 0.0546,-0.001 0.0996,-0.001 0.11961,6.6e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,-1e-5 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5689" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -439.34576,352.76283 0,4.02903"
-         inkscape:path-effect="#path-effect5757-55"
-         id="path5691"
-         d="m -439.34576,352.76283 0,4.02903"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="352.96512"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect5693"
-         style="fill:url(#linearGradient24110);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient24112);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect5695"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="-356.63147" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -401.89641,342.2002 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.1423 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.11461 -0.25689,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25689,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path5925" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -400.10319,342.57042 16.42872,0 0,4.01634 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.35247,-0.009 0.007,1.37275 -0.46491,0.0203 -10e-4,-0.90717 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient24114);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5927" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,343.00772 0.65647,0 0,0.48522 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5929" />
-      <path
-         id="path5931"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,343.87827 0.65647,0 0,0.48522 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,344.79164 0.65647,0 0,0.48521 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5933" />
-      <path
-         id="path5935"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,345.69073 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,343.39304 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5937" />
-      <path
-         id="path5939"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,344.30641 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,345.20551 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5941" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -384.34269,343.09334 0,3.11115"
-         inkscape:path-effect="#path-effect6155-8"
-         id="path5943"
-         d="m -384.34269,343.09334 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,342.97917 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5945" />
-      <path
-         id="path5947"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,345.69073 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -397.44375,342.3227 0,1.02753 10.38953,0"
-         inkscape:path-effect="#path-effect6157-24"
-         id="path5949"
-         d="m -397.44375,342.3227 0,1.02753 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -389.13785,343.35023 0,2.48321 1.82673,0"
-         inkscape:path-effect="#path-effect6159-5"
-         id="path5951"
-         d="m -389.13785,343.35023 0,2.48321 1.82673,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -389.10931,345.83344 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97045"
-         inkscape:path-effect="#path-effect6161-04"
-         id="path5953"
-         d="m -389.10931,345.83344 -8.36298,0 0,0.97045"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -388.90396,343.54891 2.06412,0 0,2.07008 -2.06412,0 z"
-         style="fill:url(#linearGradient24116-4);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path5955" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -386.62019,343.43585 0,2.29769"
-         inkscape:path-effect="#path-effect6165-5"
-         id="path5957"
-         d="m -386.62019,343.43585 0,2.29769"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18487,342.76214 1.36232,0 0,3.63289 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5959" />
-      <path
-         d="m -397.33816,342.76214 0.86786,0 0,0.47429 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5961"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path5963"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.35834,345.94092 0.86785,0 0,0.44402 -0.86785,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -399.07387,342.31813 0,4.08698"
-         inkscape:path-effect="#path-effect6167-1"
-         id="path5965"
-         d="m -399.07387,342.31813 0,4.08698"
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.88432,342.35959 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.4243 c -0.34563,0 -0.89156,0 -1.31693,-1e-5 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15641,-0.15291 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path5967" />
-      <path
-         id="path5969"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18412,342.57042 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18246 1.68872,0 0,-0.90821 -0.44597,0 10e-4,-0.68622 -0.43426,0.0122 -0.004,1.37001 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37277 0.44663,0.0203 10e-4,-0.90717 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path5971"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.84903,342.35606 c 0.0546,-0.001 0.0995,-0.001 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -400.7179,342.55187 0,4.02903"
-         id="path5973"
-         inkscape:path-effect="#path-effect6169-1"
-         inkscape:original-d="m -400.7179,342.55187 0,4.02903"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient24118);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect5975"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="342.75418" />
-      <rect
-         y="-346.42047"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect5977"
-         style="fill:url(#linearGradient24120);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path6297"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -401.89641,347.31155 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.14231 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25689,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path6299"
-         style="fill:url(#linearGradient24122);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -400.10319,347.68177 16.42872,0 0,4.01635 -16.42872,0 0,-0.90823 0.4642,0 -0.001,-0.6862 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98508 -1.35247,-0.009 0.007,1.37276 -0.46491,0.0203 -10e-4,-0.90718 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path6301"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,348.11907 0.65647,0 0,0.48522 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,348.98962 0.65647,0 0,0.48522 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6303" />
-      <path
-         id="path6305"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,349.90299 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,350.80208 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6307" />
-      <path
-         id="path6309"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,348.50439 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,349.41777 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6311" />
-      <path
-         id="path6313"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,350.31686 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -384.34269,348.20469 0,3.11116"
-         id="path6315"
-         inkscape:path-effect="#path-effect6353-5"
-         inkscape:original-d="m -384.34269,348.20469 0,3.11116"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path6317"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,348.09053 0.50802,0 0,0.44243 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,350.80208 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6319" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -397.44375,347.43405 0,1.02754 10.38953,0"
-         id="path6321"
-         inkscape:path-effect="#path-effect6355-9"
-         inkscape:original-d="m -397.44375,347.43405 0,1.02754 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -389.13785,348.46159 0,2.4832 1.82673,0"
-         id="path6323"
-         inkscape:path-effect="#path-effect6357-08"
-         inkscape:original-d="m -389.13785,348.46159 0,2.4832 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -389.10931,350.94479 -8.36298,0 0,0.97045"
-         id="path6325"
-         inkscape:path-effect="#path-effect6359-3"
-         inkscape:original-d="m -389.10931,350.94479 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97045"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path6327"
-         style="fill:url(#linearGradient24124);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -388.90396,348.66026 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -386.62019,348.54721 0,2.2977"
-         id="path6329"
-         inkscape:path-effect="#path-effect6363-87"
-         inkscape:original-d="m -386.62019,348.54721 0,2.2977"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path6331"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18487,347.87349 1.36232,0 0,3.63289 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6333"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.33816,347.87349 0.86786,0 0,0.4743 -0.86786,0 z" />
-      <path
-         d="m -397.35834,351.05227 0.86785,0 0,0.44402 -0.86785,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6335"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -399.07387,347.42948 0,4.087"
-         id="path6337"
-         inkscape:path-effect="#path-effect6365-26"
-         inkscape:original-d="m -399.07387,347.42948 0,4.087"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path6339"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.88432,347.47094 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42429 c -0.34563,0 -0.89156,0 -1.31693,-10e-6 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15289 l 0,-4.12343 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18412,347.68177 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90824 -0.44597,0 10e-4,-0.68619 -0.43426,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90718 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6341" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.84903,347.46742 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27041,0 -0.15496,-1e-5 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15301 0.15641,-0.15301 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6343" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -400.7179,347.66324 0,4.02902"
-         inkscape:path-effect="#path-effect6367-93"
-         id="path6345"
-         d="m -400.7179,347.66324 0,4.02902"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="347.86551"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect6347"
-         style="fill:url(#linearGradient24126);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient24128);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect6349"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="-351.5318" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -401.89641,352.41793 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.11459,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25689 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25689,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path6375" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -400.10319,352.78815 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98508 -1.35247,-0.009 0.007,1.37274 -0.46491,0.0203 -10e-4,-0.90718 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient24130);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6377" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,353.22545 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6379" />
-      <path
-         id="path6381"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,354.096 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,355.00937 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6383" />
-      <path
-         id="path6385"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,355.90847 0.65647,0 0,0.48522 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,353.61077 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6387" />
-      <path
-         id="path6389"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,354.52414 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,355.42324 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6391" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -384.34269,353.31107 0,3.11115"
-         inkscape:path-effect="#path-effect6431-8"
-         id="path6393"
-         d="m -384.34269,353.31107 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,353.19691 0.50802,0 0,0.44243 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6395" />
-      <path
-         id="path6397"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,355.90847 0.50802,0 0,0.4424 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -397.44375,352.54043 0,1.02755 10.38953,0"
-         inkscape:path-effect="#path-effect6433-1"
-         id="path6399"
-         d="m -397.44375,352.54043 0,1.02755 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -389.13785,353.56798 0,2.48319 1.82673,0"
-         inkscape:path-effect="#path-effect6435-0"
-         id="path6401"
-         d="m -389.13785,353.56798 0,2.48319 1.82673,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -389.10931,356.05117 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:path-effect="#path-effect6437-3"
-         id="path6403"
-         d="m -389.10931,356.05117 -8.36298,0 0,0.97046"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -388.90396,353.76664 2.06412,0 0,2.07009 -2.06412,0 z"
-         style="fill:url(#linearGradient24132);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path6405" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -386.62019,353.65359 0,2.29768"
-         inkscape:path-effect="#path-effect6441-3"
-         id="path6407"
-         d="m -386.62019,353.65359 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18487,352.97988 1.36232,0 0,3.63288 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6409" />
-      <path
-         d="m -397.33816,352.97988 0.86786,0 0,0.47429 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6411"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path6413"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.35834,356.15865 0.86785,0 0,0.44402 -0.86785,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -399.07387,352.53586 0,4.087"
-         inkscape:path-effect="#path-effect6443-8"
-         id="path6415"
-         d="m -399.07387,352.53586 0,4.087"
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.88432,352.57732 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42429 c -0.34563,0 -0.89156,0 -1.31693,0 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15289 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15291 0.15641,-0.15291 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6417" />
-      <path
-         id="path6419"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18412,352.78815 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44597,0 10e-4,-0.68621 -0.43426,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90716 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path6421"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.84903,352.57379 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.7e-4 l 5e-5,4.43206 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -400.7179,352.76962 0,4.02901"
-         id="path6423"
-         inkscape:path-effect="#path-effect6445-4"
-         inkscape:original-d="m -400.7179,352.76962 0,4.02901"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient24134);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect6425"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="352.97192" />
-      <rect
-         y="-356.63818"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect6427"
-         style="fill:url(#linearGradient24136);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path6451"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -382.56265,342.2002 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.11461 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path6453"
-         style="fill:url(#linearGradient24138);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -380.76942,342.57042 16.42868,0 0,4.01634 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98506 -1.35248,-0.009 0.007,1.37275 -0.46491,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path6455"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,343.00772 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,343.87827 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6457-6" />
-      <path
-         id="path6459-0"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,344.79164 0.65648,0 0,0.48521 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,345.69073 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6461-1" />
-      <path
-         id="path6463-26"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,343.39304 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,344.30641 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6465-0" />
-      <path
-         id="path6467"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,345.20551 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -365.00892,343.09334 0,3.11115"
-         id="path6469"
-         inkscape:path-effect="#path-effect6615-8"
-         inkscape:original-d="m -365.00892,343.09334 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path6471"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,342.97917 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,345.69073 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6473" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -378.10999,342.3227 0,1.02753 10.38952,0"
-         id="path6475"
-         inkscape:path-effect="#path-effect6617-0"
-         inkscape:original-d="m -378.10999,342.3227 0,1.02753 10.38952,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -369.80409,343.35023 0,2.48321 1.82672,0"
-         id="path6477"
-         inkscape:path-effect="#path-effect6619-1"
-         inkscape:original-d="m -369.80409,343.35023 0,2.48321 1.82672,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -369.77555,345.83344 -8.36298,0 0,0.97045"
-         id="path6479-5"
-         inkscape:path-effect="#path-effect6621-5"
-         inkscape:original-d="m -369.77555,345.83344 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97045"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path6481-4"
-         style="fill:url(#linearGradient24140);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -369.57021,343.54891 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -367.28643,343.43585 0,2.29769"
-         id="path6483-6"
-         inkscape:path-effect="#path-effect6625-13"
-         inkscape:original-d="m -367.28643,343.43585 0,2.29769"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path6485-7"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85112,342.76214 1.36232,0 0,3.63289 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6487-9"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.00441,342.76214 0.86787,0 0,0.47429 -0.86787,0 z" />
-      <path
-         d="m -378.02459,345.94092 0.86786,0 0,0.44402 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6489"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -379.74011,342.31813 0,4.08698"
-         id="path6491"
-         inkscape:path-effect="#path-effect6627-7"
-         inkscape:original-d="m -379.74011,342.31813 0,4.08698"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path6493"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.55056,342.35959 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.4243 c -0.34562,0 -0.89155,0 -1.31692,-1e-5 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15641,-0.15291 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85037,342.57042 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18246 1.68872,0 0,-0.90821 -0.44596,0 10e-4,-0.68622 -0.43424,0.0122 -0.004,1.37001 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37277 0.44661,0.0203 0.001,-0.90717 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6495" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.51528,342.35606 c 0.0546,-0.001 0.0995,-0.001 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6497" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -381.38414,342.55187 0,4.02903"
-         inkscape:path-effect="#path-effect6629-35"
-         id="path6499"
-         d="m -381.38414,342.55187 0,4.02903"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="342.75418"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect6501"
-         style="fill:url(#linearGradient24142);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient24144);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect6503"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="-346.42047" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -382.56265,347.31155 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.14231 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path6505-3" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -380.76942,347.68177 16.42868,0 0,4.01635 -16.42868,0 0,-0.90823 0.4642,0 -10e-4,-0.6862 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98508 -1.35248,-0.009 0.007,1.37276 -0.46491,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient24146);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6507-4" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,348.11907 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6509-7" />
-      <path
-         id="path6511"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,348.98962 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,349.90299 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6513" />
-      <path
-         id="path6515"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,350.80208 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,348.50439 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6517" />
-      <path
-         id="path6519"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,349.41777 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,350.31686 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6521" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -365.00892,348.20469 0,3.11116"
-         inkscape:path-effect="#path-effect6637-85"
-         id="path6523-8"
-         d="m -365.00892,348.20469 0,3.11116"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,348.09053 0.50802,0 0,0.44243 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6525-8" />
-      <path
-         id="path6527-1"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,350.80208 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -378.10999,347.43405 0,1.02754 10.38952,0"
-         inkscape:path-effect="#path-effect6639-6"
-         id="path6529-6"
-         d="m -378.10999,347.43405 0,1.02754 10.38952,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.80409,348.46159 0,2.4832 1.82672,0"
-         inkscape:path-effect="#path-effect6641-9"
-         id="path6531-3"
-         d="m -369.80409,348.46159 0,2.4832 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.77555,350.94479 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97045"
-         inkscape:path-effect="#path-effect6643-0"
-         id="path6533"
-         d="m -369.77555,350.94479 -8.36298,0 0,0.97045"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -369.57021,348.66026 2.06412,0 0,2.07008 -2.06412,0 z"
-         style="fill:url(#linearGradient24148);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path6535" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -367.28643,348.54721 0,2.2977"
-         inkscape:path-effect="#path-effect6647-8"
-         id="path6537"
-         d="m -367.28643,348.54721 0,2.2977"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85112,347.87349 1.36232,0 0,3.63289 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6539" />
-      <path
-         d="m -378.00441,347.87349 0.86787,0 0,0.4743 -0.86787,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6541"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path6543"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.02459,351.05227 0.86786,0 0,0.44402 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -379.74011,347.42948 0,4.087"
-         inkscape:path-effect="#path-effect6649-9"
-         id="path6545"
-         d="m -379.74011,347.42948 0,4.087"
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.55056,347.47094 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34562,0 -0.89155,0 -1.31692,-10e-6 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15289 l 0,-4.12343 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6547" />
-      <path
-         id="path6549"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85037,347.68177 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90824 -0.44596,0 10e-4,-0.68619 -0.43424,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90718 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path6551"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.51528,347.46742 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27042,0 -0.15495,-1e-5 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15301 0.15641,-0.15301 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -381.38414,347.66324 0,4.02902"
-         id="path6553"
-         inkscape:path-effect="#path-effect6651-36"
-         inkscape:original-d="m -381.38414,347.66324 0,4.02902"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient24150);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect6555"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="347.86551" />
-      <rect
-         y="-351.5318"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect6557"
-         style="fill:url(#linearGradient24152);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path6559"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -382.56265,352.41793 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25689 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path6561"
-         style="fill:url(#linearGradient24154);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -380.76942,352.78815 16.42868,0 0,4.01635 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98508 -1.35248,-0.009 0.007,1.37274 -0.46491,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path6563"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,353.22545 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,354.096 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6565" />
-      <path
-         id="path6567"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,355.00937 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,355.90847 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6569" />
-      <path
-         id="path6571"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,353.61077 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,354.52414 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6573" />
-      <path
-         id="path6575"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,355.42324 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -365.00892,353.31107 0,3.11115"
-         id="path6577"
-         inkscape:path-effect="#path-effect6659-0"
-         inkscape:original-d="m -365.00892,353.31107 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path6579"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,353.19691 0.50802,0 0,0.44243 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,355.90847 0.50802,0 0,0.4424 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6581" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -378.10999,352.54043 0,1.02755 10.38952,0"
-         id="path6583"
-         inkscape:path-effect="#path-effect6661-6"
-         inkscape:original-d="m -378.10999,352.54043 0,1.02755 10.38952,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -369.80409,353.56798 0,2.48319 1.82672,0"
-         id="path6585"
-         inkscape:path-effect="#path-effect6663-97"
-         inkscape:original-d="m -369.80409,353.56798 0,2.48319 1.82672,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -369.77555,356.05117 -8.36298,0 0,0.97046"
-         id="path6587"
-         inkscape:path-effect="#path-effect6665-8"
-         inkscape:original-d="m -369.77555,356.05117 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path6589"
-         style="fill:url(#linearGradient24156);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -369.57021,353.76664 2.06412,0 0,2.07009 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -367.28643,353.65359 0,2.29768"
-         id="path6591"
-         inkscape:path-effect="#path-effect6669-9"
-         inkscape:original-d="m -367.28643,353.65359 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path6593"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85112,352.97988 1.36232,0 0,3.63288 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6595"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.00441,352.97988 0.86787,0 0,0.47429 -0.86787,0 z" />
-      <path
-         d="m -378.02459,356.15865 0.86786,0 0,0.44402 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6597"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -379.74011,352.53586 0,4.087"
-         id="path6599"
-         inkscape:path-effect="#path-effect6671-41"
-         inkscape:original-d="m -379.74011,352.53586 0,4.087"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path6601"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.55056,352.57732 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34562,0 -0.89155,0 -1.31692,0 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15289 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15291 0.15641,-0.15291 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85037,352.78815 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44596,0 10e-4,-0.68621 -0.43424,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90716 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6603" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.51528,352.57379 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.7e-4 l 5e-5,4.43206 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6605" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -381.38414,352.76962 0,4.02901"
-         inkscape:path-effect="#path-effect6673-5"
-         id="path6607"
-         d="m -381.38414,352.76962 0,4.02901"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="352.97192"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect6609"
-         style="fill:url(#linearGradient24158);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient24160);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect6611"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="-356.63818" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -441.51671,322.67392 0,15.18517 77.98371,0 -10e-6,-15.18517 -21.30816,-5.86066 -36.01873,0 z"
-         style="fill:url(#linearGradient36602);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16598"
-         sodipodi:nodetypes="ccccccc" />
-      <rect
-         ry="0"
-         y="322.67377"
-         x="-441.64969"
-         height="15.6214"
-         width="78.530823"
-         id="rect16600"
-         style="fill:url(#linearGradient36600);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -441.64971,322.67373 78.53084,0 0,15.16447 -78.53084,0 z"
-         style="fill:url(#linearGradient36598);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16602" />
-      <path
-         id="path16604"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -421.26785,322.8331 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.2569 l 0,4.23262 c 0,0.14232 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23262 c 0,-0.14233 0.1146,-0.2569 0.25687,-0.2569 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path16606"
-         style="fill:url(#linearGradient36596);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,323.20333 16.42871,0 0,4.01634 -16.42871,0 0,-0.90821 0.46419,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.35248,-0.009 0.007,1.37277 -0.46488,0.0203 -10e-4,-0.90719 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path16608"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,323.64062 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,324.51118 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16610" />
-      <path
-         id="path16612"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,325.42454 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,326.32364 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16614" />
-      <path
-         id="path16616"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,324.02595 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,324.93933 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16618" />
-      <path
-         id="path16620"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,325.83842 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -403.71413,323.72626 0,3.11115"
-         id="path16622"
-         inkscape:path-effect="#path-effect17260-6"
-         inkscape:original-d="m -403.71413,323.72626 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path16624"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,323.61209 0.50802,0 0,0.4424 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,326.32364 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16626" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -416.81519,322.9556 0,1.02754 10.3895,0"
-         id="path16628"
-         inkscape:path-effect="#path-effect17262-6"
-         inkscape:original-d="m -416.81519,322.9556 0,1.02754 10.3895,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -408.50929,323.98314 0,2.48321 1.82673,0"
-         id="path16630"
-         inkscape:path-effect="#path-effect17264-66"
-         inkscape:original-d="m -408.50929,323.98314 0,2.48321 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.48074,326.46635 -8.36298,0 0,0.97046"
-         id="path16632"
-         inkscape:path-effect="#path-effect17266-7"
-         inkscape:original-d="m -408.48074,326.46635 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97046"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path16634"
-         style="fill:url(#linearGradient36594);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.27541,324.18183 2.06414,0 0,2.07006 -2.06414,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -405.99162,324.06877 0,2.29768"
-         id="path16636"
-         inkscape:path-effect="#path-effect17270-4"
-         inkscape:original-d="m -405.99162,324.06877 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path16638"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -418.55631,323.39506 1.36234,0 0,3.63287 -1.36234,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path16640"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.70958,323.39506 0.86784,0 0,0.47428 -0.86784,0 z" />
-      <path
-         d="m -416.72978,326.57382 0.86786,0 0,0.44404 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16642"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -418.44531,322.95104 0,4.08698"
-         id="path16644"
-         inkscape:path-effect="#path-effect17272-0"
-         inkscape:original-d="m -418.44531,322.95104 0,4.08698"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path16646"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.25574,322.99248 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42431 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.15292 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15643,-0.1529 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,323.20333 1.7578,0 -0.004,0.18722 -0.8343,1.1e-4 -0.0183,3.61086 0.85628,0.0356 0,0.18249 -1.75779,0 0,-0.90823 0.46419,0 -10e-4,-0.6862 0.45201,0.0122 0.004,1.37001 -0.007,-0.007 -0.0122,-3.62143 0.85626,0.0139 -0.83871,-0.009 0.007,1.37275 -0.4649,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16648" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.22048,322.98896 c 0.0546,-0.001 0.0998,-0.001 0.11963,6.6e-4 l 5e-5,4.43208 c -0.34565,0 0.27039,0 -0.15496,-2e-5 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16650" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -419.98945,323.18478 0,4.02904"
-         inkscape:path-effect="#path-effect17274-6"
-         id="path16652"
-         d="m -419.98945,323.18478 0,4.02904"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="323.38708"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect16654"
-         style="fill:url(#linearGradient36592);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36590);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect16656"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="-327.05338" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -421.26785,327.94175 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25687 l 0,4.23265 c 0,0.14231 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.1423,0 -0.25687,-0.11461 -0.25687,-0.25689 l 0,-4.23265 c 0,-0.1423 0.1146,-0.25687 0.25687,-0.25687 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path16658" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,328.31197 16.42871,0 0,4.01634 -16.42871,0 0,-0.90821 0.46419,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.36999 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.35248,-0.009 0.007,1.37277 -0.46488,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient36588);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16660" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,328.74927 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16662" />
-      <path
-         id="path16664"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,329.61982 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,330.53318 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16666" />
-      <path
-         id="path16668"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,331.43228 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,329.1346 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16670" />
-      <path
-         id="path16672"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,330.04797 0.65648,0 0,0.48521 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,330.94707 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16674" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -403.71413,328.8349 0,3.11115"
-         inkscape:path-effect="#path-effect17282-1"
-         id="path16676"
-         d="m -403.71413,328.8349 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,328.72072 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16678" />
-      <path
-         id="path16680"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,331.43228 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -416.81519,328.06424 0,1.02754 10.3895,0"
-         inkscape:path-effect="#path-effect17284-2"
-         id="path16682"
-         d="m -416.81519,328.06424 0,1.02754 10.3895,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -408.50929,329.09178 0,2.48321 1.82673,0"
-         inkscape:path-effect="#path-effect17286-1"
-         id="path16684"
-         d="m -408.50929,329.09178 0,2.48321 1.82673,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -408.48074,331.57499 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97046"
-         inkscape:path-effect="#path-effect17288-4"
-         id="path16686"
-         d="m -408.48074,331.57499 -8.36298,0 0,0.97046"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -408.27541,329.29047 2.06414,0 0,2.07006 -2.06414,0 z"
-         style="fill:url(#linearGradient36586);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path16688" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -405.99162,329.17741 0,2.29768"
-         inkscape:path-effect="#path-effect17292-9"
-         id="path16690"
-         d="m -405.99162,329.17741 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -418.55631,328.5037 1.36234,0 0,3.63288 -1.36234,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16692" />
-      <path
-         d="m -416.70958,328.5037 0.86784,0 0,0.47429 -0.86784,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16694"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path16696"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.72978,331.68246 0.86786,0 0,0.44403 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -418.44531,328.05968 0,4.08698"
-         inkscape:path-effect="#path-effect17294-52"
-         id="path16698"
-         d="m -418.44531,328.05968 0,4.08698"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.25574,328.10112 c 0.36888,-0.004 1.10825,-10e-5 1.31691,0.004 l 0,4.42429 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.15292 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16700" />
-      <path
-         id="path16702"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,328.31197 1.7578,0 -0.004,0.18722 -0.8343,1.2e-4 -0.0183,3.61085 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.46419,0 -10e-4,-0.68622 0.45201,0.0122 0.004,1.36999 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.0138 -0.83871,-0.009 0.007,1.37276 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path16704"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.22048,328.0976 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.7e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15304 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -419.98945,328.29342 0,4.02904"
-         id="path16706"
-         inkscape:path-effect="#path-effect17296-3"
-         inkscape:original-d="m -419.98945,328.29342 0,4.02904"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36584);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect16708"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="328.49579" />
-      <rect
-         y="-332.16205"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect16710"
-         style="fill:url(#linearGradient36582);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path16712"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -421.26785,333.04406 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25687 l 0,4.23265 c 0,0.14232 -0.1146,0.2569 -0.25688,0.2569 l -18.39573,0 c -0.1423,0 -0.25687,-0.11461 -0.25687,-0.2569 l 0,-4.23265 c 0,-0.1423 0.1146,-0.25687 0.25687,-0.25687 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path16714"
-         style="fill:url(#linearGradient36580);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,333.41426 16.42871,0 0,4.01637 -16.42871,0 0,-0.90823 0.46419,0 -0.001,-0.6862 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.61529 -0.0142,-0.98506 -1.35248,-0.009 0.007,1.37275 -0.46488,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path16716"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,333.85158 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,334.72214 0.65649,0 0,0.48521 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16718" />
-      <path
-         id="path16720"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,335.63549 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,336.53459 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16722" />
-      <path
-         id="path16724"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,334.23691 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,335.15026 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16726" />
-      <path
-         id="path16728"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,336.04936 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -403.71413,333.93721 0,3.11115"
-         id="path16730"
-         inkscape:path-effect="#path-effect17304-16"
-         inkscape:original-d="m -403.71413,333.93721 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path16732"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,333.82304 0.50802,0 0,0.44242 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,336.53459 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16734" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -416.81519,333.16656 0,1.02753 10.3895,0"
-         id="path16736"
-         inkscape:path-effect="#path-effect17306-88"
-         inkscape:original-d="m -416.81519,333.16656 0,1.02753 10.3895,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -408.50929,334.19409 0,2.48322 1.82673,0"
-         id="path16738"
-         inkscape:path-effect="#path-effect17308-27"
-         inkscape:original-d="m -408.50929,334.19409 0,2.48322 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.48074,336.67731 -8.36298,0 0,0.97044"
-         id="path16740"
-         inkscape:path-effect="#path-effect17310-71"
-         inkscape:original-d="m -408.48074,336.67731 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97044"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path16742"
-         style="fill:url(#linearGradient36578);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.27541,334.39279 2.06414,0 0,2.07006 -2.06414,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -405.99162,334.27972 0,2.29768"
-         id="path16744"
-         inkscape:path-effect="#path-effect17314-9"
-         inkscape:original-d="m -405.99162,334.27972 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path16746"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -418.55631,333.606 1.36234,0 0,3.6329 -1.36234,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path16748"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.70958,333.606 0.86784,0 0,0.4743 -0.86784,0 z" />
-      <path
-         d="m -416.72978,336.78478 0.86786,0 0,0.44402 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16750"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -418.44531,333.16199 0,4.08698"
-         id="path16752"
-         inkscape:path-effect="#path-effect17316-4"
-         inkscape:original-d="m -418.44531,333.16199 0,4.08698"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path16754"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.25574,333.20344 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42431 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.15291 l 0,-4.12342 c 0,-0.0846 0.0697,-0.1529 0.15643,-0.1529 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,333.41426 1.7578,0 -0.004,0.18723 -0.8343,1.2e-4 -0.0183,3.61087 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90822 0.46419,0 -10e-4,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.6214 0.85626,0.0139 -0.83871,-0.009 0.007,1.37278 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16756" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.22048,333.19992 c 0.0546,-0.001 0.0998,-0.001 0.11963,6.7e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,-10e-6 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15303 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16758" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -419.98945,333.39574 0,4.02902"
-         inkscape:path-effect="#path-effect17318-60"
-         id="path16760"
-         d="m -419.98945,333.39574 0,4.02902"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="333.59805"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect16762"
-         style="fill:url(#linearGradient36576);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36574);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect16764"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="-337.26437" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -440.62416,322.8331 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.2569 l 0,4.23262 c 0,0.14232 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25688 l 0,-4.23262 c 0,-0.14233 0.11461,-0.2569 0.2569,-0.2569 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path16766" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,323.20333 16.42872,0 0,4.01634 -16.42872,0 0,-0.90821 0.4642,0 -10e-4,-0.68622 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.3525,-0.009 0.007,1.37277 -0.46489,0.0203 -0.001,-0.90719 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient36572);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16768" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,323.64062 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16770" />
-      <path
-         id="path16772"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,324.51118 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,325.42454 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16774" />
-      <path
-         id="path16776"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,326.32364 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,324.02595 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16778" />
-      <path
-         id="path16780"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,324.93933 0.65649,0 0,0.48521 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,325.83842 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16782" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -423.07046,323.72626 0,3.11115"
-         inkscape:path-effect="#path-effect17326-8"
-         id="path16784"
-         d="m -423.07046,323.72626 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,323.61209 0.50801,0 0,0.4424 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16786" />
-      <path
-         id="path16788"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,326.32364 0.50801,0 0,0.44241 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -436.17152,322.9556 0,1.02754 10.38953,0"
-         inkscape:path-effect="#path-effect17328-8"
-         id="path16790"
-         d="m -436.17152,322.9556 0,1.02754 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.8656,323.98314 0,2.48321 1.82672,0"
-         inkscape:path-effect="#path-effect17330-1"
-         id="path16792"
-         d="m -427.8656,323.98314 0,2.48321 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.83708,326.46635 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97046"
-         inkscape:path-effect="#path-effect17332-2"
-         id="path16794"
-         d="m -427.83708,326.46635 -8.36298,0 0,0.97046"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -427.63173,324.18183 2.06412,0 0,2.07006 -2.06412,0 z"
-         style="fill:url(#linearGradient36570);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path16796" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -425.34794,324.06877 0,2.29768"
-         inkscape:path-effect="#path-effect17336-8"
-         id="path16798"
-         d="m -425.34794,324.06877 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -437.91264,323.39506 1.36233,0 0,3.63287 -1.36233,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16800" />
-      <path
-         d="m -436.06592,323.39506 0.86786,0 0,0.47428 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16802"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path16804"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.08611,326.57382 0.86786,0 0,0.44404 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -437.80163,322.95104 0,4.08698"
-         inkscape:path-effect="#path-effect17338-245"
-         id="path16806"
-         d="m -437.80163,322.95104 0,4.08698"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.61207,322.99248 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42431 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.15292 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15643,-0.1529 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16808" />
-      <path
-         id="path16810"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,323.20333 1.75781,0 -0.004,0.18722 -0.83431,1.1e-4 -0.0183,3.61086 0.85629,0.0356 0,0.18249 -1.75779,0 0,-0.90823 0.4642,0 -0.001,-0.6862 0.45201,0.0122 0.004,1.37001 -0.007,-0.007 -0.0122,-3.62143 0.85627,0.0139 -0.83871,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path16812"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.57679,322.98896 c 0.0546,-0.001 0.0996,-0.001 0.11961,6.6e-4 l 4e-5,4.43208 c -0.34564,0 0.27041,0 -0.15495,-2e-5 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -439.34576,323.18478 0,4.02904"
-         id="path16814"
-         inkscape:path-effect="#path-effect17340-2"
-         inkscape:original-d="m -439.34576,323.18478 0,4.02904"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36568);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect16816"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="323.38708" />
-      <rect
-         y="-327.05338"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect16818"
-         style="fill:url(#linearGradient36566);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path16820"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -440.62416,327.94175 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25687 l 0,4.23265 c 0,0.14231 -0.1146,0.25689 -0.25689,0.25689 l -18.39572,0 c -0.14231,0 -0.2569,-0.11461 -0.2569,-0.25689 l 0,-4.23265 c 0,-0.1423 0.11461,-0.25687 0.2569,-0.25687 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path16822"
-         style="fill:url(#linearGradient36564);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,328.31197 16.42872,0 0,4.01634 -16.42872,0 0,-0.90821 0.4642,0 -10e-4,-0.68622 0.45202,0.0122 0.004,1.36999 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.3525,-0.009 0.007,1.37277 -0.46489,0.0203 -0.001,-0.90718 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path16824"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,328.74927 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,329.61982 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16826" />
-      <path
-         id="path16828"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,330.53318 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,331.43228 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16830" />
-      <path
-         id="path16832"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,329.1346 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,330.04797 0.65649,0 0,0.48521 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16834" />
-      <path
-         id="path16836"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,330.94707 0.65649,0 0,0.48521 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -423.07046,328.8349 0,3.11115"
-         id="path16838"
-         inkscape:path-effect="#path-effect17348-6"
-         inkscape:original-d="m -423.07046,328.8349 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path16840"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,328.72072 0.50801,0 0,0.44241 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,331.43228 0.50801,0 0,0.44241 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16842" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -436.17152,328.06424 0,1.02754 10.38953,0"
-         id="path16844"
-         inkscape:path-effect="#path-effect17350-98"
-         inkscape:original-d="m -436.17152,328.06424 0,1.02754 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -427.8656,329.09178 0,2.48321 1.82672,0"
-         id="path16846"
-         inkscape:path-effect="#path-effect17352-6"
-         inkscape:original-d="m -427.8656,329.09178 0,2.48321 1.82672,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -427.83708,331.57499 -8.36298,0 0,0.97046"
-         id="path16848"
-         inkscape:path-effect="#path-effect17354-6"
-         inkscape:original-d="m -427.83708,331.57499 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97046"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path16850"
-         style="fill:url(#linearGradient36562);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -427.63173,329.29047 2.06412,0 0,2.07006 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -425.34794,329.17741 0,2.29768"
-         id="path16852"
-         inkscape:path-effect="#path-effect17358-6"
-         inkscape:original-d="m -425.34794,329.17741 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path16854"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -437.91264,328.5037 1.36233,0 0,3.63288 -1.36233,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path16856"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.06592,328.5037 0.86786,0 0,0.47429 -0.86786,0 z" />
-      <path
-         d="m -436.08611,331.68246 0.86786,0 0,0.44403 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16858"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -437.80163,328.05968 0,4.08698"
-         id="path16860"
-         inkscape:path-effect="#path-effect17360-2"
-         inkscape:original-d="m -437.80163,328.05968 0,4.08698"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path16862"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.61207,328.10112 c 0.36888,-0.004 1.10825,-10e-5 1.31692,0.004 l 0,4.42429 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.15292 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,328.31197 1.75781,0 -0.004,0.18722 -0.83431,1.2e-4 -0.0183,3.61085 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.36999 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.0138 -0.83871,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16864" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.57679,328.0976 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.7e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15304 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16866" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -439.34576,328.29342 0,4.02904"
-         inkscape:path-effect="#path-effect17362-7"
-         id="path16868"
-         d="m -439.34576,328.29342 0,4.02904"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="328.49579"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect16870"
-         style="fill:url(#linearGradient36560);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36558);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect16872"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="-332.16205" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -440.62416,333.04406 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25687 l 0,4.23265 c 0,0.14232 -0.1146,0.2569 -0.25689,0.2569 l -18.39572,0 c -0.14231,0 -0.2569,-0.11461 -0.2569,-0.2569 l 0,-4.23265 c 0,-0.1423 0.11461,-0.25687 0.2569,-0.25687 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path16874" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,333.41426 16.42872,0 0,4.01637 -16.42872,0 0,-0.90823 0.4642,0 -10e-4,-0.6862 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.61529 -0.0142,-0.98506 -1.3525,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90717 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient36556);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16876" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,333.85158 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16878" />
-      <path
-         id="path16880"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,334.72214 0.65648,0 0,0.48521 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,335.63549 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16882" />
-      <path
-         id="path16884"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,336.53459 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,334.23691 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16886" />
-      <path
-         id="path16888"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,335.15026 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,336.04936 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16890" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -423.07046,333.93721 0,3.11115"
-         inkscape:path-effect="#path-effect17370-8"
-         id="path16892"
-         d="m -423.07046,333.93721 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,333.82304 0.50801,0 0,0.44242 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16894" />
-      <path
-         id="path16896"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,336.53459 0.50801,0 0,0.44241 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -436.17152,333.16656 0,1.02753 10.38953,0"
-         inkscape:path-effect="#path-effect17372-0"
-         id="path16898"
-         d="m -436.17152,333.16656 0,1.02753 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.8656,334.19409 0,2.48322 1.82672,0"
-         inkscape:path-effect="#path-effect17374-2"
-         id="path16900"
-         d="m -427.8656,334.19409 0,2.48322 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.83708,336.67731 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97044"
-         inkscape:path-effect="#path-effect17376-0"
-         id="path16902"
-         d="m -427.83708,336.67731 -8.36298,0 0,0.97044"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -427.63173,334.39279 2.06412,0 0,2.07006 -2.06412,0 z"
-         style="fill:url(#linearGradient36554);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path16904" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -425.34794,334.27972 0,2.29768"
-         inkscape:path-effect="#path-effect17380-8"
-         id="path16906"
-         d="m -425.34794,334.27972 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -437.91264,333.606 1.36233,0 0,3.6329 -1.36233,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16908" />
-      <path
-         d="m -436.06592,333.606 0.86786,0 0,0.4743 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16910"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path16912"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.08611,336.78478 0.86786,0 0,0.44402 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -437.80163,333.16199 0,4.08698"
-         inkscape:path-effect="#path-effect17382-2"
-         id="path16914"
-         d="m -437.80163,333.16199 0,4.08698"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.61207,333.20344 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42431 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.15291 l 0,-4.12342 c 0,-0.0846 0.0697,-0.1529 0.15643,-0.1529 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16916" />
-      <path
-         id="path16918"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,333.41426 1.75781,0 -0.004,0.18723 -0.83431,1.2e-4 -0.0183,3.61087 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.6214 0.85627,0.0139 -0.83871,-0.009 0.007,1.37278 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path16920"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.57679,333.19992 c 0.0546,-0.001 0.0996,-0.001 0.11961,6.7e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,-10e-6 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15303 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -439.34576,333.39574 0,4.02902"
-         id="path16922"
-         inkscape:path-effect="#path-effect17384-05"
-         inkscape:original-d="m -439.34576,333.39574 0,4.02902"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36552);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect16924"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="333.59805" />
-      <rect
-         y="-337.26437"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect16926"
-         style="fill:url(#linearGradient36550);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path16928"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -401.89641,322.8331 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.2569 l 0,4.23262 c 0,0.14232 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25688 l 0,-4.23262 c 0,-0.14233 0.1146,-0.2569 0.25689,-0.2569 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path16930"
-         style="fill:url(#linearGradient36548);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -400.10319,323.20333 16.42872,0 0,4.01634 -16.42872,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45202,0.0122 0.004,1.37001 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.35247,-0.009 0.007,1.37277 -0.46491,0.0203 -10e-4,-0.90719 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path16932"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,323.64062 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,324.51118 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16934" />
-      <path
-         id="path16936"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,325.42454 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,326.32364 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16938" />
-      <path
-         id="path16940"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,324.02595 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,324.93933 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16942" />
-      <path
-         id="path16944"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,325.83842 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -384.34269,323.72626 0,3.11115"
-         id="path16946"
-         inkscape:path-effect="#path-effect17392-7"
-         inkscape:original-d="m -384.34269,323.72626 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path16948"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,323.61209 0.50802,0 0,0.4424 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,326.32364 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16950" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -397.44375,322.9556 0,1.02754 10.38953,0"
-         id="path16952"
-         inkscape:path-effect="#path-effect17394-8"
-         inkscape:original-d="m -397.44375,322.9556 0,1.02754 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -389.13785,323.98314 0,2.48321 1.82673,0"
-         id="path16954"
-         inkscape:path-effect="#path-effect17396-7"
-         inkscape:original-d="m -389.13785,323.98314 0,2.48321 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -389.10931,326.46635 -8.36298,0 0,0.97046"
-         id="path16956"
-         inkscape:path-effect="#path-effect17398-8"
-         inkscape:original-d="m -389.10931,326.46635 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path16958"
-         style="fill:url(#linearGradient36546);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -388.90396,324.18183 2.06412,0 0,2.07006 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -386.62019,324.06877 0,2.29768"
-         id="path16960"
-         inkscape:path-effect="#path-effect17402-9"
-         inkscape:original-d="m -386.62019,324.06877 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path16962"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18487,323.39506 1.36232,0 0,3.63287 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path16964"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.33816,323.39506 0.86786,0 0,0.47428 -0.86786,0 z" />
-      <path
-         d="m -397.35834,326.57382 0.86785,0 0,0.44404 -0.86785,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16966"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -399.07387,322.95104 0,4.08698"
-         id="path16968"
-         inkscape:path-effect="#path-effect17404-5"
-         inkscape:original-d="m -399.07387,322.95104 0,4.08698"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path16970"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.88432,322.99248 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42431 c -0.34563,0 -0.89156,0 -1.31693,0 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15292 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18412,323.20333 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61086 -0.82262,0.0356 0,0.18249 1.68872,0 0,-0.90823 -0.44597,0 10e-4,-0.6862 -0.43426,0.0122 -0.004,1.37001 0.005,-0.007 0.0108,-3.62143 -0.82262,0.0139 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90717 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16972" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.84903,322.98896 c 0.0546,-0.001 0.0995,-0.001 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27041,0 -0.15496,-2e-5 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15641,-0.15304 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16974" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -400.7179,323.18478 0,4.02904"
-         inkscape:path-effect="#path-effect17406-89"
-         id="path16976"
-         d="m -400.7179,323.18478 0,4.02904"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="323.38708"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect16978"
-         style="fill:url(#linearGradient36544);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36542);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect16980"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="-327.05338" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -401.89641,327.94445 18.39573,0 c 0.14231,0 0.25688,0.11461 0.25688,0.2569 l 0,4.23264 c 0,0.1423 -0.11459,0.25687 -0.25688,0.25687 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25687 l 0,-4.23264 c 0,-0.14232 0.1146,-0.2569 0.25689,-0.2569 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path16982" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -400.10319,328.31468 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68622 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61529 -0.0142,-0.98506 -1.35247,-0.009 0.007,1.37275 -0.46491,0.0203 -10e-4,-0.90717 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient36540);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16984" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,328.75198 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16986" />
-      <path
-         id="path16988"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,329.62253 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,330.53589 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16990" />
-      <path
-         id="path16992"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,331.43499 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,329.13731 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16994" />
-      <path
-         id="path16996"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,330.05068 0.65648,0 0,0.48521 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,330.94977 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16998" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -384.34269,328.83761 0,3.11115"
-         inkscape:path-effect="#path-effect17414-0"
-         id="path17000"
-         d="m -384.34269,328.83761 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,328.72343 0.50802,0 0,0.44243 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17002" />
-      <path
-         id="path17004"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,331.43499 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -397.44375,328.06695 0,1.02755 10.38953,0"
-         inkscape:path-effect="#path-effect17416-00"
-         id="path17006"
-         d="m -397.44375,328.06695 0,1.02755 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -389.13785,329.0945 0,2.4832 1.82673,0"
-         inkscape:path-effect="#path-effect17418-7"
-         id="path17008"
-         d="m -389.13785,329.0945 0,2.4832 1.82673,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -389.10931,331.5777 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:path-effect="#path-effect17420-2"
-         id="path17010"
-         d="m -389.10931,331.5777 -8.36298,0 0,0.97046"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -388.90396,329.29318 2.06412,0 0,2.07008 -2.06412,0 z"
-         style="fill:url(#linearGradient36538);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path17012" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -386.62019,329.18013 0,2.29768"
-         inkscape:path-effect="#path-effect17424-5"
-         id="path17014"
-         d="m -386.62019,329.18013 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18487,328.50641 1.36232,0 0,3.63287 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17016" />
-      <path
-         d="m -397.33816,328.50641 0.86786,0 0,0.47429 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17018"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path17020"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.35834,331.68518 0.86785,0 0,0.44403 -0.86785,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -399.07387,328.06239 0,4.08699"
-         inkscape:path-effect="#path-effect17426-52"
-         id="path17022"
-         d="m -399.07387,328.06239 0,4.08699"
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.88432,328.10386 c 0.3689,-0.004 1.10827,-1.3e-4 1.31693,0.004 l 0,4.4243 c -0.34563,0 -0.89156,0 -1.31693,-10e-6 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15289 0.15641,-0.15289 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17024" />
-      <path
-         id="path17026"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18412,328.31468 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61086 -0.82262,0.0356 0,0.18248 1.68872,0 0,-0.90823 -0.44597,0 10e-4,-0.68622 -0.43426,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62142 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90717 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path17028"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.84903,328.10031 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15304 0.15641,-0.15304 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -400.7179,328.29614 0,4.02903"
-         id="path17030"
-         inkscape:path-effect="#path-effect17428-1"
-         inkscape:original-d="m -400.7179,328.29614 0,4.02903"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36536);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17032"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="328.49844" />
-      <rect
-         y="-332.16473"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17034"
-         style="fill:url(#linearGradient36534);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path17036"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -401.89641,333.05084 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25689 l 0,4.23264 c 0,0.1423 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.11461 -0.25689,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25689 0.25689,-0.25689 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path17038"
-         style="fill:url(#linearGradient36532);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -400.10319,333.42106 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68622 0.45202,0.0122 0.004,1.37 1.3351,-0.0138 0.0309,-2.6153 -0.0142,-0.98505 -1.35247,-0.009 0.007,1.37276 -0.46491,0.0203 -10e-4,-0.90719 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path17040"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,333.85837 0.65647,0 0,0.48522 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,334.72892 0.65647,0 0,0.48522 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17042" />
-      <path
-         id="path17044"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,335.64229 0.65647,0 0,0.48521 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,336.54138 0.65647,0 0,0.48522 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17046" />
-      <path
-         id="path17048"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,334.24369 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,335.15706 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17050" />
-      <path
-         id="path17052"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,336.05615 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -384.34269,333.94399 0,3.11115"
-         id="path17054"
-         inkscape:path-effect="#path-effect17436-86"
-         inkscape:original-d="m -384.34269,333.94399 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path17056"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,333.82982 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,336.54138 0.50802,0 0,0.4424 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17058" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -397.44375,333.17333 0,1.02754 10.38953,0"
-         id="path17060"
-         inkscape:path-effect="#path-effect17438-46"
-         inkscape:original-d="m -397.44375,333.17333 0,1.02754 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -389.13785,334.20087 0,2.48321 1.82673,0"
-         id="path17062"
-         inkscape:path-effect="#path-effect17440-89"
-         inkscape:original-d="m -389.13785,334.20087 0,2.48321 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -389.10931,336.68408 -8.36298,0 0,0.97046"
-         id="path17064"
-         inkscape:path-effect="#path-effect17442-8"
-         inkscape:original-d="m -389.10931,336.68408 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path17066"
-         style="fill:url(#linearGradient36530);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -388.90396,334.39956 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -386.62019,334.28651 0,2.29767"
-         id="path17068"
-         inkscape:path-effect="#path-effect17446-3"
-         inkscape:original-d="m -386.62019,334.28651 0,2.29767"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17070"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18487,333.61279 1.36232,0 0,3.63288 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path17072"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.33816,333.61279 0.86786,0 0,0.47428 -0.86786,0 z" />
-      <path
-         d="m -397.35834,336.79156 0.86785,0 0,0.44403 -0.86785,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17074"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -399.07387,333.16877 0,4.08699"
-         id="path17076"
-         inkscape:path-effect="#path-effect17448-5"
-         inkscape:original-d="m -399.07387,333.16877 0,4.08699"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17078"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.88432,333.21022 c 0.3689,-0.004 1.10827,-1.2e-4 1.31693,0.004 l 0,4.4243 c -0.34563,0 -0.89156,0 -1.31693,-2e-5 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18412,333.42106 -1.68872,0 0.003,0.18722 0.80152,1.2e-4 0.0176,3.61085 -0.82262,0.0356 0,0.18248 1.68872,0 0,-0.90823 -0.44597,0 10e-4,-0.68622 -0.43426,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62142 -0.82262,0.014 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90718 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17080" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.84903,333.20669 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.7e-4 l 5e-5,4.43207 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17082" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -400.7179,333.40252 0,4.02903"
-         inkscape:path-effect="#path-effect17450-5"
-         id="path17084"
-         d="m -400.7179,333.40252 0,4.02903"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="333.60483"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17086"
-         style="fill:url(#linearGradient36528);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36526);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17088"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="-337.27112" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -382.56265,322.8331 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.2569 l 0,4.23262 c 0,0.14232 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23262 c 0,-0.14233 0.1146,-0.2569 0.25687,-0.2569 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path17090" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -380.76942,323.20333 16.42868,0 0,4.01634 -16.42868,0 0,-0.90821 0.4642,0 -10e-4,-0.68622 0.45199,0.0122 0.004,1.37001 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98507 -1.35248,-0.009 0.007,1.37277 -0.46491,0.0203 -0.001,-0.90719 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient36524);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17092" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,323.64062 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17094" />
-      <path
-         id="path17096"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,324.51118 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,325.42454 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17098" />
-      <path
-         id="path17100"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,326.32364 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,324.02595 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17102" />
-      <path
-         id="path17104"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,324.93933 0.65649,0 0,0.48521 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,325.83842 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17106" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -365.00892,323.72626 0,3.11115"
-         inkscape:path-effect="#path-effect17458-5"
-         id="path17108"
-         d="m -365.00892,323.72626 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,323.61209 0.50802,0 0,0.4424 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17110" />
-      <path
-         id="path17112"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,326.32364 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -378.10999,322.9556 0,1.02754 10.38952,0"
-         inkscape:path-effect="#path-effect17460-5"
-         id="path17114"
-         d="m -378.10999,322.9556 0,1.02754 10.38952,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.80409,323.98314 0,2.48321 1.82672,0"
-         inkscape:path-effect="#path-effect17462-8"
-         id="path17116"
-         d="m -369.80409,323.98314 0,2.48321 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.77555,326.46635 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:path-effect="#path-effect17464-4"
-         id="path17118"
-         d="m -369.77555,326.46635 -8.36298,0 0,0.97046"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -369.57021,324.18183 2.06412,0 0,2.07006 -2.06412,0 z"
-         style="fill:url(#linearGradient36522);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path17120" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -367.28643,324.06877 0,2.29768"
-         inkscape:path-effect="#path-effect17468-0"
-         id="path17122"
-         d="m -367.28643,324.06877 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85112,323.39506 1.36232,0 0,3.63287 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17124" />
-      <path
-         d="m -378.00441,323.39506 0.86787,0 0,0.47428 -0.86787,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17126"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path17128"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.02459,326.57382 0.86786,0 0,0.44404 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -379.74011,322.95104 0,4.08698"
-         inkscape:path-effect="#path-effect17470-5"
-         id="path17130"
-         d="m -379.74011,322.95104 0,4.08698"
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.55056,322.99248 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42431 c -0.34562,0 -0.89155,0 -1.31692,0 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15292 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17132" />
-      <path
-         id="path17134"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85037,323.20333 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61086 -0.82263,0.0356 0,0.18249 1.68872,0 0,-0.90823 -0.44596,0 10e-4,-0.6862 -0.43424,0.0122 -0.004,1.37001 0.005,-0.007 0.0108,-3.62143 -0.82261,0.0139 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90717 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path17136"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.51528,322.98896 c 0.0546,-0.001 0.0995,-0.001 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27042,0 -0.15495,-2e-5 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15641,-0.15304 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -381.38414,323.18478 0,4.02904"
-         id="path17138"
-         inkscape:path-effect="#path-effect17472-4"
-         inkscape:original-d="m -381.38414,323.18478 0,4.02904"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36520);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17140"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="323.38708" />
-      <rect
-         y="-327.05338"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17142"
-         style="fill:url(#linearGradient36518);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path17144"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -382.56265,327.94445 18.39573,0 c 0.14232,0 0.25688,0.11461 0.25688,0.2569 l 0,4.23264 c 0,0.1423 -0.1146,0.25687 -0.25688,0.25687 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25687 l 0,-4.23264 c 0,-0.14232 0.1146,-0.2569 0.25687,-0.2569 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path17146"
-         style="fill:url(#linearGradient36516);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -380.76942,328.31468 16.42868,0 0,4.01635 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68622 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61529 -0.0143,-0.98506 -1.35248,-0.009 0.007,1.37275 -0.46491,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path17148"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,328.75198 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,329.62253 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17150" />
-      <path
-         id="path17152"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,330.53589 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,331.43499 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17154" />
-      <path
-         id="path17156"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,329.13731 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,330.05068 0.65649,0 0,0.48521 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17158" />
-      <path
-         id="path17160"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,330.94977 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -365.00892,328.83761 0,3.11115"
-         id="path17162"
-         inkscape:path-effect="#path-effect17480-2"
-         inkscape:original-d="m -365.00892,328.83761 0,3.11115"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path17164"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,328.72343 0.50802,0 0,0.44243 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,331.43499 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17166" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -378.10999,328.06695 0,1.02755 10.38952,0"
-         id="path17168"
-         inkscape:path-effect="#path-effect17482-1"
-         inkscape:original-d="m -378.10999,328.06695 0,1.02755 10.38952,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -369.80409,329.0945 0,2.4832 1.82672,0"
-         id="path17170"
-         inkscape:path-effect="#path-effect17484-4"
-         inkscape:original-d="m -369.80409,329.0945 0,2.4832 1.82672,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -369.77555,331.5777 -8.36298,0 0,0.97046"
-         id="path17172"
-         inkscape:path-effect="#path-effect17486-9"
-         inkscape:original-d="m -369.77555,331.5777 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path17174"
-         style="fill:url(#linearGradient36514);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -369.57021,329.29318 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -367.28643,329.18013 0,2.29768"
-         id="path17176"
-         inkscape:path-effect="#path-effect17490-9"
-         inkscape:original-d="m -367.28643,329.18013 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17178"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85112,328.50641 1.36232,0 0,3.63287 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path17180"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.00441,328.50641 0.86787,0 0,0.47429 -0.86787,0 z" />
-      <path
-         d="m -378.02459,331.68518 0.86786,0 0,0.44403 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17182"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -379.74011,328.06239 0,4.08699"
-         id="path17184"
-         inkscape:path-effect="#path-effect17492-0"
-         inkscape:original-d="m -379.74011,328.06239 0,4.08699"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17186"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.55056,328.10386 c 0.36889,-0.004 1.10827,-1.3e-4 1.31692,0.004 l 0,4.4243 c -0.34562,0 -0.89155,0 -1.31692,-10e-6 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15289 0.15641,-0.15289 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85037,328.31468 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61086 -0.82263,0.0356 0,0.18248 1.68872,0 0,-0.90823 -0.44596,0 10e-4,-0.68622 -0.43424,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62142 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90717 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17188" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.51528,328.10031 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15304 0.15641,-0.15304 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17190" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -381.38414,328.29614 0,4.02903"
-         inkscape:path-effect="#path-effect17494-3"
-         id="path17192"
-         d="m -381.38414,328.29614 0,4.02903"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="328.49844"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17194"
-         style="fill:url(#linearGradient36512);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36510);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17196"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="-332.16473" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -382.56265,333.05084 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25689 l 0,4.23264 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.11461 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25689 0.25687,-0.25689 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path17198" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -380.76942,333.42106 16.42868,0 0,4.01635 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68622 0.45199,0.0122 0.004,1.37 1.33509,-0.0138 0.0309,-2.6153 -0.0143,-0.98505 -1.35248,-0.009 0.007,1.37276 -0.46491,0.0203 -0.001,-0.90719 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient36508);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17200" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,333.85837 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17202" />
-      <path
-         id="path17204"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,334.72892 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,335.64229 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17206" />
-      <path
-         id="path17208"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,336.54138 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,334.24369 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17210" />
-      <path
-         id="path17212"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,335.15706 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,336.05615 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17214" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -365.00892,333.94399 0,3.11115"
-         inkscape:path-effect="#path-effect17502-3"
-         id="path17216"
-         d="m -365.00892,333.94399 0,3.11115"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,333.82982 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17218" />
-      <path
-         id="path17220"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,336.54138 0.50802,0 0,0.4424 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -378.10999,333.17333 0,1.02754 10.38952,0"
-         inkscape:path-effect="#path-effect17504-5"
-         id="path17222"
-         d="m -378.10999,333.17333 0,1.02754 10.38952,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.80409,334.20087 0,2.48321 1.82672,0"
-         inkscape:path-effect="#path-effect17506-0"
-         id="path17224"
-         d="m -369.80409,334.20087 0,2.48321 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.77555,336.68408 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:path-effect="#path-effect17508-7"
-         id="path17226"
-         d="m -369.77555,336.68408 -8.36298,0 0,0.97046"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -369.57021,334.39956 2.06412,0 0,2.07008 -2.06412,0 z"
-         style="fill:url(#linearGradient36506);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path17228" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -367.28643,334.28651 0,2.29767"
-         inkscape:path-effect="#path-effect17512-6"
-         id="path17230"
-         d="m -367.28643,334.28651 0,2.29767"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85112,333.61279 1.36232,0 0,3.63288 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17232" />
-      <path
-         d="m -378.00441,333.61279 0.86787,0 0,0.47428 -0.86787,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17234"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path17236"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.02459,336.79156 0.86786,0 0,0.44403 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -379.74011,333.16877 0,4.08699"
-         inkscape:path-effect="#path-effect17514-7"
-         id="path17238"
-         d="m -379.74011,333.16877 0,4.08699"
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.55056,333.21022 c 0.36889,-0.004 1.10827,-1.2e-4 1.31692,0.004 l 0,4.4243 c -0.34562,0 -0.89155,0 -1.31692,-2e-5 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17240" />
-      <path
-         id="path17242"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85037,333.42106 -1.68871,0 0.003,0.18722 0.80151,1.2e-4 0.0176,3.61085 -0.82263,0.0356 0,0.18248 1.68872,0 0,-0.90823 -0.44596,0 10e-4,-0.68622 -0.43424,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62142 -0.82261,0.014 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90718 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path17244"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.51528,333.20669 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.7e-4 l 5e-5,4.43207 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -381.38414,333.40252 0,4.02903"
-         id="path17246"
-         inkscape:path-effect="#path-effect17516-8"
-         inkscape:original-d="m -381.38414,333.40252 0,4.02903"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36504);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17248"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="333.60483" />
-      <rect
-         y="-337.27112"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17250"
-         style="fill:url(#linearGradient36502);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -441.51671,303.30682 0,15.18517 77.98371,0 -10e-6,-15.18517 -21.30816,-5.86064 -36.01873,0 z"
-         style="fill:url(#linearGradient36500);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17522"
-         sodipodi:nodetypes="ccccccc" />
-      <rect
-         ry="0"
-         y="303.3067"
-         x="-441.64969"
-         height="15.6214"
-         width="78.530823"
-         id="rect17524"
-         style="fill:url(#linearGradient36498);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -441.64971,303.30664 78.53084,0 0,15.16448 -78.53084,0 z"
-         style="fill:url(#linearGradient36496);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17526" />
-      <path
-         id="path17528"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -421.26785,303.46601 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path17530"
-         style="fill:url(#linearGradient36494);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,303.83622 16.42871,0 0,4.01636 -16.42871,0 0,-0.90822 0.46419,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.61527 -0.0142,-0.98506 -1.35248,-0.009 0.007,1.37277 -0.46488,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path17532"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,304.27354 0.65649,0 0,0.48521 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,305.14408 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17534" />
-      <path
-         id="path17536"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,306.05745 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,306.95655 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17538" />
-      <path
-         id="path17540"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,304.65886 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,305.57223 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17542" />
-      <path
-         id="path17544"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,306.47132 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -403.71413,304.35917 0,3.11114"
-         id="path17546"
-         inkscape:path-effect="#path-effect18838-1"
-         inkscape:original-d="m -403.71413,304.35917 0,3.11114"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path17548"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,304.245 0.50802,0 0,0.4424 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,306.95655 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17550" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -416.81519,303.58852 0,1.02754 10.3895,0"
-         id="path17552"
-         inkscape:path-effect="#path-effect18840-9"
-         inkscape:original-d="m -416.81519,303.58852 0,1.02754 10.3895,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -408.50929,304.61606 0,2.48321 1.82673,0"
-         id="path17554"
-         inkscape:path-effect="#path-effect18842-5"
-         inkscape:original-d="m -408.50929,304.61606 0,2.48321 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.48074,307.09927 -8.36298,0 0,0.97044"
-         id="path17556"
-         inkscape:path-effect="#path-effect18844-5"
-         inkscape:original-d="m -408.48074,307.09927 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97044"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path17558"
-         style="fill:url(#linearGradient36492);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.27541,304.81473 2.06414,0 0,2.07008 -2.06414,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -405.99162,304.70167 0,2.29768"
-         id="path17560"
-         inkscape:path-effect="#path-effect18848-7"
-         inkscape:original-d="m -405.99162,304.70167 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17562"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -418.55631,304.02796 1.36234,0 0,3.63289 -1.36234,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path17564"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.70958,304.02796 0.86784,0 0,0.47429 -0.86784,0 z" />
-      <path
-         d="m -416.72978,307.20672 0.86786,0 0,0.44403 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17566"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -418.44531,303.58393 0,4.087"
-         id="path17568"
-         inkscape:path-effect="#path-effect18850-4"
-         inkscape:original-d="m -418.44531,303.58393 0,4.087"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17570"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.25574,303.6254 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42432 c -0.34563,0 -0.89155,0 -1.31691,-2e-5 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,303.83622 1.7578,0 -0.004,0.18723 -0.8343,1.2e-4 -0.0183,3.61087 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.46419,0 -10e-4,-0.68622 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.014 -0.83871,-0.009 0.007,1.37276 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17572" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.22048,303.62188 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.6e-4 l 5e-5,4.43206 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17574" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -419.98945,303.8177 0,4.02902"
-         inkscape:path-effect="#path-effect18852-73"
-         id="path17576"
-         d="m -419.98945,303.8177 0,4.02902"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="304.02005"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17578"
-         style="fill:url(#linearGradient36490);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36488);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17580"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="-307.68631" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -421.26785,308.57464 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.2569 l 0,4.23264 c 0,0.14232 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.2569 0.25687,-0.2569 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path17582" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,308.94486 16.42871,0 0,4.01637 -16.42871,0 0,-0.90823 0.46419,0 -0.001,-0.6862 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.6153 -0.0142,-0.98505 -1.35248,-0.009 0.007,1.37276 -0.46488,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient36486);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17584" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,309.38218 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17586" />
-      <path
-         id="path17588"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,310.25274 0.65649,0 0,0.48521 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,311.1661 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17590" />
-      <path
-         id="path17592"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,312.06519 0.65649,0 0,0.48521 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,309.76751 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17594" />
-      <path
-         id="path17596"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,310.68087 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,311.57996 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17598" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -403.71413,309.46781 0,3.11114"
-         inkscape:path-effect="#path-effect18860-0"
-         id="path17600"
-         d="m -403.71413,309.46781 0,3.11114"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,309.35364 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17602" />
-      <path
-         id="path17604"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,312.06519 0.50802,0 0,0.44242 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -416.81519,308.69716 0,1.02753 10.3895,0"
-         inkscape:path-effect="#path-effect18862-8"
-         id="path17606"
-         d="m -416.81519,308.69716 0,1.02753 10.3895,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -408.50929,309.72469 0,2.48322 1.82673,0"
-         inkscape:path-effect="#path-effect18864-8"
-         id="path17608"
-         d="m -408.50929,309.72469 0,2.48322 1.82673,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -408.48074,312.20791 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97044"
-         inkscape:path-effect="#path-effect18866-1"
-         id="path17610"
-         d="m -408.48074,312.20791 -8.36298,0 0,0.97044"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -408.27541,309.92337 2.06414,0 0,2.07008 -2.06414,0 z"
-         style="fill:url(#linearGradient36484);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path17612" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -405.99162,309.81031 0,2.29769"
-         inkscape:path-effect="#path-effect18870-5"
-         id="path17614"
-         d="m -405.99162,309.81031 0,2.29769"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -418.55631,309.1366 1.36234,0 0,3.63288 -1.36234,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17616" />
-      <path
-         d="m -416.70958,309.1366 0.86784,0 0,0.4743 -0.86784,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17618"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path17620"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.72978,312.31538 0.86786,0 0,0.44402 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -418.44531,308.69258 0,4.08699"
-         inkscape:path-effect="#path-effect18872-2"
-         id="path17622"
-         d="m -418.44531,308.69258 0,4.08699"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.25574,308.73403 c 0.36888,-0.004 1.10825,-1e-4 1.31691,0.004 l 0,4.4243 c -0.34563,0 -0.89155,0 -1.31691,-10e-6 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17624" />
-      <path
-         id="path17626"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,308.94486 1.7578,0 -0.004,0.18723 -0.8343,1.3e-4 -0.0183,3.61086 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90822 0.46419,0 -10e-4,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.0138 -0.83871,-0.009 0.007,1.37276 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path17628"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.22048,308.73051 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.7e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15304 l 0,-4.12663 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -419.98945,308.92634 0,4.02902"
-         id="path17630"
-         inkscape:path-effect="#path-effect18874-3"
-         inkscape:original-d="m -419.98945,308.92634 0,4.02902"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36482);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17632"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="309.12869" />
-      <rect
-         y="-312.79498"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17634"
-         style="fill:url(#linearGradient36480);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path17636"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -421.26785,313.67696 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.2569 -0.25688,0.2569 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.2569 l 0,-4.23264 c 0,-0.1423 0.1146,-0.25688 0.25687,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path17638"
-         style="fill:url(#linearGradient36478);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -419.47462,314.04718 16.42871,0 0,4.01635 -16.42871,0 0,-0.90821 0.46419,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.36999 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98508 -1.35248,-0.009 0.007,1.37276 -0.46488,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path17640"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,314.48448 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,315.35504 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17642" />
-      <path
-         id="path17644"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -404.74166,316.2684 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -404.74166,317.16749 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17646" />
-      <path
-         id="path17648"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,314.86981 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -405.42668,315.78318 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17650" />
-      <path
-         id="path17652"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -405.42668,316.68226 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -403.71413,314.57013 0,3.11112"
-         id="path17654"
-         inkscape:path-effect="#path-effect18882-4"
-         inkscape:original-d="m -403.71413,314.57013 0,3.11112"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path17656"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -406.14025,314.45596 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -406.14025,317.16751 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17658" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -416.81519,313.79947 0,1.02753 10.3895,0"
-         id="path17660"
-         inkscape:path-effect="#path-effect18884-6"
-         inkscape:original-d="m -416.81519,313.79947 0,1.02753 10.3895,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -408.50929,314.827 0,2.4832 1.82673,0"
-         id="path17662"
-         inkscape:path-effect="#path-effect18886-6"
-         inkscape:original-d="m -408.50929,314.827 0,2.4832 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.48074,317.3102 -8.36298,0 0,0.97046"
-         id="path17664"
-         inkscape:path-effect="#path-effect18888-6"
-         inkscape:original-d="m -408.48074,317.3102 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97046"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path17666"
-         style="fill:url(#linearGradient36476);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -408.27541,315.02569 2.06414,0 0,2.07006 -2.06414,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -405.99162,314.91263 0,2.29767"
-         id="path17668"
-         inkscape:path-effect="#path-effect18892-2"
-         inkscape:original-d="m -405.99162,314.91263 0,2.29767"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17670"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -418.55631,314.23891 1.36234,0 0,3.63289 -1.36234,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path17672"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -416.70958,314.23891 0.86784,0 0,0.4743 -0.86784,0 z" />
-      <path
-         d="m -416.72978,317.41768 0.86786,0 0,0.44402 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17674"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -418.44531,313.79489 0,4.087"
-         id="path17676"
-         inkscape:path-effect="#path-effect18894-9"
-         inkscape:original-d="m -418.44531,313.79489 0,4.087"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17678"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -421.25574,313.83635 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42429 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -419.47462,314.04718 1.7578,0 -0.004,0.18722 -0.8343,1.3e-4 -0.0183,3.61086 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.46419,0 -10e-4,-0.68622 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.014 -0.83871,-0.009 0.007,1.37275 -0.4649,0.0203 -10e-4,-0.90716 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17680" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -421.22048,313.83283 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.6e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17682" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -419.98945,314.02865 0,4.02903"
-         inkscape:path-effect="#path-effect18896-0"
-         id="path17684"
-         d="m -419.98945,314.02865 0,4.02903"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="314.23096"
-         x="-415.86942"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17686"
-         style="fill:url(#linearGradient36474);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36472);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17688"
-         width="8.3515739"
-         height="0.41957662"
-         x="-415.86942"
-         y="-317.89728" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -440.62416,303.46601 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25688 l 0,4.23265 c 0,0.1423 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25688 l 0,-4.23265 c 0,-0.14232 0.11461,-0.25688 0.2569,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path17690" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,303.83622 16.42872,0 0,4.01636 -16.42872,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.61527 -0.0142,-0.98506 -1.3525,-0.009 0.007,1.37277 -0.46489,0.0203 -0.001,-0.90718 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient36470);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17692" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,304.27354 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17694" />
-      <path
-         id="path17696"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,305.14408 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,306.05745 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17698" />
-      <path
-         id="path17700"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,306.95655 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,304.65886 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17702" />
-      <path
-         id="path17704"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,305.57223 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,306.47132 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17706" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -423.07046,304.35917 0,3.11114"
-         inkscape:path-effect="#path-effect18904-93"
-         id="path17708"
-         d="m -423.07046,304.35917 0,3.11114"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,304.245 0.50801,0 0,0.4424 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17710" />
-      <path
-         id="path17712"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,306.95655 0.50801,0 0,0.44241 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -436.17152,303.58852 0,1.02754 10.38953,0"
-         inkscape:path-effect="#path-effect18906-1"
-         id="path17714"
-         d="m -436.17152,303.58852 0,1.02754 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.8656,304.61606 0,2.48321 1.82672,0"
-         inkscape:path-effect="#path-effect18908-1"
-         id="path17716"
-         d="m -427.8656,304.61606 0,2.48321 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.83708,307.09927 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97044"
-         inkscape:path-effect="#path-effect18910-9"
-         id="path17718"
-         d="m -427.83708,307.09927 -8.36298,0 0,0.97044"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -427.63173,304.81473 2.06412,0 0,2.07008 -2.06412,0 z"
-         style="fill:url(#linearGradient36468);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path17720" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -425.34794,304.70167 0,2.29768"
-         inkscape:path-effect="#path-effect18914-95"
-         id="path17722"
-         d="m -425.34794,304.70167 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -437.91264,304.02796 1.36233,0 0,3.63289 -1.36233,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17724" />
-      <path
-         d="m -436.06592,304.02796 0.86786,0 0,0.47429 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17726"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path17728"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.08611,307.20672 0.86786,0 0,0.44403 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -437.80163,303.58393 0,4.087"
-         inkscape:path-effect="#path-effect18916-55"
-         id="path17730"
-         d="m -437.80163,303.58393 0,4.087"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.61207,303.6254 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42432 c -0.34564,0 -0.89156,0 -1.31692,-2e-5 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17732" />
-      <path
-         id="path17734"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,303.83622 1.75781,0 -0.004,0.18723 -0.83431,1.2e-4 -0.0183,3.61087 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.014 -0.83871,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path17736"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.57679,303.62188 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.6e-4 l 4e-5,4.43206 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -439.34576,303.8177 0,4.02902"
-         id="path17738"
-         inkscape:path-effect="#path-effect18918-6"
-         inkscape:original-d="m -439.34576,303.8177 0,4.02902"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36466);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17740"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="304.02005" />
-      <rect
-         y="-307.68631"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17742"
-         style="fill:url(#linearGradient36464);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path17744"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -440.62416,308.57464 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.2569 l 0,4.23264 c 0,0.14232 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25688 l 0,-4.23264 c 0,-0.14232 0.11461,-0.2569 0.2569,-0.2569 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path17746"
-         style="fill:url(#linearGradient36462);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,308.94486 16.42872,0 0,4.01637 -16.42872,0 0,-0.90823 0.4642,0 -10e-4,-0.6862 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.6153 -0.0142,-0.98505 -1.3525,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path17748"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,309.38218 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,310.25274 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17750" />
-      <path
-         id="path17752"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,311.1661 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,312.06519 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17754" />
-      <path
-         id="path17756"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,309.76751 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,310.68087 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17758" />
-      <path
-         id="path17760"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,311.57996 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -423.07046,309.46781 0,3.11114"
-         id="path17762"
-         inkscape:path-effect="#path-effect18927-5"
-         inkscape:original-d="m -423.07046,309.46781 0,3.11114"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path17764"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,309.35364 0.50801,0 0,0.44241 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,312.06519 0.50801,0 0,0.44242 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17766" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -436.17152,308.69716 0,1.02753 10.38953,0"
-         id="path17768"
-         inkscape:path-effect="#path-effect18929-9"
-         inkscape:original-d="m -436.17152,308.69716 0,1.02753 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -427.8656,309.72469 0,2.48322 1.82672,0"
-         id="path17770"
-         inkscape:path-effect="#path-effect18931-4"
-         inkscape:original-d="m -427.8656,309.72469 0,2.48322 1.82672,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -427.83708,312.20791 -8.36298,0 0,0.97044"
-         id="path17772"
-         inkscape:path-effect="#path-effect18933-6"
-         inkscape:original-d="m -427.83708,312.20791 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97044"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path17774"
-         style="fill:url(#linearGradient36460);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -427.63173,309.92337 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -425.34794,309.81031 0,2.29769"
-         id="path17776"
-         inkscape:path-effect="#path-effect18937-3"
-         inkscape:original-d="m -425.34794,309.81031 0,2.29769"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17778"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -437.91264,309.1366 1.36233,0 0,3.63288 -1.36233,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path17780"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.06592,309.1366 0.86786,0 0,0.4743 -0.86786,0 z" />
-      <path
-         d="m -436.08611,312.31538 0.86786,0 0,0.44402 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17782"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -437.80163,308.69258 0,4.08699"
-         id="path17784"
-         inkscape:path-effect="#path-effect18939-4"
-         inkscape:original-d="m -437.80163,308.69258 0,4.08699"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17786"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.61207,308.73403 c 0.36888,-0.004 1.10825,-1e-4 1.31692,0.004 l 0,4.4243 c -0.34564,0 -0.89156,0 -1.31692,-10e-6 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,308.94486 1.75781,0 -0.004,0.18723 -0.83431,1.3e-4 -0.0183,3.61086 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.0138 -0.83871,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17788" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.57679,308.73051 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.7e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15304 l 0,-4.12663 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17790" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -439.34576,308.92634 0,4.02902"
-         inkscape:path-effect="#path-effect18941-9"
-         id="path17792"
-         d="m -439.34576,308.92634 0,4.02902"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="309.12869"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17794"
-         style="fill:url(#linearGradient36458);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36456);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17796"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="-312.79498" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -440.62416,313.67696 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.2569 -0.25689,0.2569 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.2569 l 0,-4.23264 c 0,-0.1423 0.11461,-0.25688 0.2569,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path17798" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -438.83096,314.04718 16.42872,0 0,4.01635 -16.42872,0 0,-0.90821 0.4642,0 -10e-4,-0.68622 0.45202,0.0122 0.004,1.36999 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98508 -1.3525,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90717 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient36454);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17800" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,314.48448 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17802" />
-      <path
-         id="path17804"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,315.35504 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.09798,316.2684 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17806" />
-      <path
-         id="path17808"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.09798,317.16749 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,314.86981 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17810" />
-      <path
-         id="path17812"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -424.78301,315.78318 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -424.78301,316.68226 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17814" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -423.07046,314.57013 0,3.11112"
-         inkscape:path-effect="#path-effect18949-5"
-         id="path17816"
-         d="m -423.07046,314.57013 0,3.11112"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -425.49657,314.45596 0.50801,0 0,0.44241 -0.50801,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17818" />
-      <path
-         id="path17820"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -425.49657,317.16751 0.50801,0 0,0.44241 -0.50801,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -436.17152,313.79947 0,1.02753 10.38953,0"
-         inkscape:path-effect="#path-effect18951-3"
-         id="path17822"
-         d="m -436.17152,313.79947 0,1.02753 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.8656,314.827 0,2.4832 1.82672,0"
-         inkscape:path-effect="#path-effect18953-9"
-         id="path17824"
-         d="m -427.8656,314.827 0,2.4832 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -427.83708,317.3102 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97046"
-         inkscape:path-effect="#path-effect18955-1"
-         id="path17826"
-         d="m -427.83708,317.3102 -8.36298,0 0,0.97046"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -427.63173,315.02569 2.06412,0 0,2.07006 -2.06412,0 z"
-         style="fill:url(#linearGradient36452);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path17828" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -425.34794,314.91263 0,2.29767"
-         inkscape:path-effect="#path-effect18959-2"
-         id="path17830"
-         d="m -425.34794,314.91263 0,2.29767"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -437.91264,314.23891 1.36233,0 0,3.63289 -1.36233,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17832" />
-      <path
-         d="m -436.06592,314.23891 0.86786,0 0,0.4743 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17834"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path17836"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -436.08611,317.41768 0.86786,0 0,0.44402 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -437.80163,313.79489 0,4.087"
-         inkscape:path-effect="#path-effect18961-8"
-         id="path17838"
-         d="m -437.80163,313.79489 0,4.087"
-         style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -440.61207,313.83635 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17840" />
-      <path
-         id="path17842"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -438.83096,314.04718 1.75781,0 -0.004,0.18722 -0.83431,1.3e-4 -0.0183,3.61086 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.014 -0.83871,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90716 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path17844"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -440.57679,313.83283 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.6e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -439.34576,314.02865 0,4.02903"
-         id="path17846"
-         inkscape:path-effect="#path-effect18963-8"
-         inkscape:original-d="m -439.34576,314.02865 0,4.02903"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36450);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17848"
-         width="8.3515739"
-         height="0.41957662"
-         x="-435.22577"
-         y="314.23096" />
-      <rect
-         y="-317.89728"
-         x="-435.22577"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17850"
-         style="fill:url(#linearGradient36448);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path17852"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -401.89641,303.46601 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.1423 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25689,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path17854"
-         style="fill:url(#linearGradient36446);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -400.10319,303.83622 16.42872,0 0,4.01636 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45202,0.0122 0.004,1.37001 1.3351,-0.0138 0.0309,-2.61527 -0.0142,-0.98506 -1.35247,-0.009 0.007,1.37277 -0.46491,0.0203 -10e-4,-0.90718 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path17856"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,304.27354 0.65647,0 0,0.48521 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,305.14408 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17858" />
-      <path
-         id="path17860"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,306.05745 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,306.95655 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17862" />
-      <path
-         id="path17864"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,304.65886 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,305.57223 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17866" />
-      <path
-         id="path17868"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,306.47132 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -384.34269,304.35917 0,3.11114"
-         id="path17870"
-         inkscape:path-effect="#path-effect18971-8"
-         inkscape:original-d="m -384.34269,304.35917 0,3.11114"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path17872"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,304.245 0.50802,0 0,0.4424 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,306.95655 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17874" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -397.44375,303.58852 0,1.02754 10.38953,0"
-         id="path17876"
-         inkscape:path-effect="#path-effect18973-60"
-         inkscape:original-d="m -397.44375,303.58852 0,1.02754 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -389.13785,304.61606 0,2.48321 1.82673,0"
-         id="path17878"
-         inkscape:path-effect="#path-effect18975-2"
-         inkscape:original-d="m -389.13785,304.61606 0,2.48321 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -389.10931,307.09927 -8.36298,0 0,0.97044"
-         id="path17880"
-         inkscape:path-effect="#path-effect18977-4"
-         inkscape:original-d="m -389.10931,307.09927 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97044"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path17882"
-         style="fill:url(#linearGradient36444);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -388.90396,304.81473 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -386.62019,304.70167 0,2.29768"
-         id="path17884"
-         inkscape:path-effect="#path-effect18981-9"
-         inkscape:original-d="m -386.62019,304.70167 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17886"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18487,304.02796 1.36232,0 0,3.63289 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path17888"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.33816,304.02796 0.86786,0 0,0.47429 -0.86786,0 z" />
-      <path
-         d="m -397.35834,307.20672 0.86785,0 0,0.44403 -0.86785,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17890"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -399.07387,303.58393 0,4.087"
-         id="path17892"
-         inkscape:path-effect="#path-effect18983-0"
-         inkscape:original-d="m -399.07387,303.58393 0,4.087"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17894"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.88432,303.6254 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42432 c -0.34563,0 -0.89156,0 -1.31693,-2e-5 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18412,303.83622 -1.68872,0 0.003,0.18723 0.80152,1.2e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90821 -0.44597,0 10e-4,-0.68622 -0.43426,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82262,0.014 0.80576,-0.009 -0.007,1.37276 0.44663,0.0203 10e-4,-0.90718 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17896" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.84903,303.62188 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17898" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -400.7179,303.8177 0,4.02902"
-         inkscape:path-effect="#path-effect18985-22"
-         id="path17900"
-         d="m -400.7179,303.8177 0,4.02902"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="304.02005"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17902"
-         style="fill:url(#linearGradient36442);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36440);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17904"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="-307.68631" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -401.89641,308.57737 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.11459,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25689 l 0,-4.23264 c 0,-0.14233 0.1146,-0.25688 0.25689,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path17906" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -400.10319,308.94758 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.6862 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61529 -0.0142,-0.98507 -1.35247,-0.009 0.007,1.37277 -0.46491,0.0203 -10e-4,-0.90719 -0.45861,-0.0213 z"
-         style="fill:url(#linearGradient36438);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17908" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,309.38489 0.65647,0 0,0.48521 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17910" />
-      <path
-         id="path17912"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,310.25544 0.65647,0 0,0.48522 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,311.16881 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17914" />
-      <path
-         id="path17916"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,312.06791 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,309.77021 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17918" />
-      <path
-         id="path17920"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,310.68359 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,311.58268 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17922" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -384.34269,309.47052 0,3.11116"
-         inkscape:path-effect="#path-effect18993-5"
-         id="path17924"
-         d="m -384.34269,309.47052 0,3.11116"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,309.35635 0.50802,0 0,0.4424 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17926" />
-      <path
-         id="path17928"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,312.06791 0.50802,0 0,0.4424 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -397.44375,308.69987 0,1.02754 10.38953,0"
-         inkscape:path-effect="#path-effect18995-4"
-         id="path17930"
-         d="m -397.44375,308.69987 0,1.02754 10.38953,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -389.13785,309.72741 0,2.48321 1.82673,0"
-         inkscape:path-effect="#path-effect18997-4"
-         id="path17932"
-         d="m -389.13785,309.72741 0,2.48321 1.82673,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -389.10931,312.21062 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97044"
-         inkscape:path-effect="#path-effect18999-4"
-         id="path17934"
-         d="m -389.10931,312.21062 -8.36298,0 0,0.97044"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -388.90396,309.92608 2.06412,0 0,2.07008 -2.06412,0 z"
-         style="fill:url(#linearGradient36436);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path17936" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -386.62019,309.81304 0,2.29768"
-         inkscape:path-effect="#path-effect19003-2"
-         id="path17938"
-         d="m -386.62019,309.81304 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18487,309.13931 1.36232,0 0,3.63289 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17940" />
-      <path
-         d="m -397.33816,309.13931 0.86786,0 0,0.47429 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17942"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path17944"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.35834,312.31809 0.86785,0 0,0.44402 -0.86785,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -399.07387,308.69529 0,4.087"
-         inkscape:path-effect="#path-effect19005-50"
-         id="path17946"
-         d="m -399.07387,308.69529 0,4.087"
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.88432,308.73675 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42431 c -0.34563,0 -0.89156,0 -1.31693,-2e-5 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17948" />
-      <path
-         id="path17950"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18412,308.94758 -1.68872,0 0.003,0.18722 0.80152,1.2e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44597,0 10e-4,-0.68621 -0.43426,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37277 0.44663,0.0203 10e-4,-0.9072 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path17952"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.84903,308.73323 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27041,0 -0.15496,-2e-5 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -400.7179,308.92905 0,4.02903"
-         id="path17954"
-         inkscape:path-effect="#path-effect19007-4"
-         inkscape:original-d="m -400.7179,308.92905 0,4.02903"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36434);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect17956"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="309.13138" />
-      <rect
-         y="-312.79767"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect17958"
-         style="fill:url(#linearGradient36432);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path17960"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -401.89641,313.68374 18.39573,0 c 0.14231,0 0.25688,0.11461 0.25688,0.25689 l 0,4.23264 c 0,0.14232 -0.11459,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25689 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25689 0.25689,-0.25689 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path17962"
-         style="fill:url(#linearGradient36430);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -400.10319,314.05395 16.42872,0 0,4.01637 -16.42872,0 0,-0.90823 0.4642,0 -0.001,-0.6862 0.45202,0.0122 0.004,1.37001 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.35247,-0.009 0.007,1.37275 -0.46491,0.0203 -10e-4,-0.90719 -0.45861,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path17964"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,314.49127 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,315.36183 0.65647,0 0,0.48522 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17966" />
-      <path
-         id="path17968"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -385.37022,316.27519 0.65647,0 0,0.48523 -0.65647,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -385.37022,317.17428 0.65647,0 0,0.48523 -0.65647,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17970" />
-      <path
-         id="path17972"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,314.8766 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.05524,315.78996 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17974" />
-      <path
-         id="path17976"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.05524,316.68906 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -384.34269,314.5769 0,3.11114"
-         id="path17978"
-         inkscape:path-effect="#path-effect19015-1"
-         inkscape:original-d="m -384.34269,314.5769 0,3.11114"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path17980"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -386.76881,314.46273 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -386.76881,317.17428 0.50802,0 0,0.44242 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17982" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -397.44375,313.80625 0,1.02754 10.38953,0"
-         id="path17984"
-         inkscape:path-effect="#path-effect19017-2"
-         inkscape:original-d="m -397.44375,313.80625 0,1.02754 10.38953,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -389.13785,314.83379 0,2.48321 1.82673,0"
-         id="path17986"
-         inkscape:path-effect="#path-effect19019-7"
-         inkscape:original-d="m -389.13785,314.83379 0,2.48321 1.82673,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -389.10931,317.317 -8.36298,0 0,0.97046"
-         id="path17988"
-         inkscape:path-effect="#path-effect19021-7"
-         inkscape:original-d="m -389.10931,317.317 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path17990"
-         style="fill:url(#linearGradient36428);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -388.90396,315.03246 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -386.62019,314.91942 0,2.29767"
-         id="path17992"
-         inkscape:path-effect="#path-effect19025-95"
-         inkscape:original-d="m -386.62019,314.91942 0,2.29767"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path17994"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -399.18487,314.24571 1.36232,0 0,3.63287 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path17996"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -397.33816,314.24571 0.86786,0 0,0.47427 -0.86786,0 z" />
-      <path
-         d="m -397.35834,317.42447 0.86785,0 0,0.44403 -0.86785,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path17998"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -399.07387,313.80167 0,4.087"
-         id="path18000"
-         inkscape:path-effect="#path-effect19027-5"
-         inkscape:original-d="m -399.07387,313.80167 0,4.087"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path18002"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -401.88432,313.84313 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42429 c -0.34563,0 -0.89156,0 -1.31693,0 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -399.18412,314.05395 -1.68872,0 0.003,0.18725 0.80152,1.1e-4 0.0176,3.61086 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44597,0 10e-4,-0.68621 -0.43426,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0139 0.80576,-0.009 -0.007,1.37277 0.44663,0.0203 10e-4,-0.9072 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18004" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -401.84903,313.83961 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0683 -0.15641,-0.15304 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18006" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -400.7179,314.03543 0,4.02902"
-         inkscape:path-effect="#path-effect19029-4"
-         id="path18008"
-         d="m -400.7179,314.03543 0,4.02902"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="314.23776"
-         x="-396.49802"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect18010"
-         style="fill:url(#linearGradient36426);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36424);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect18012"
-         width="8.3515739"
-         height="0.41957662"
-         x="-396.49802"
-         y="-317.90408" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -382.56265,303.46601 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path18014" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -380.76942,303.83622 16.42868,0 0,4.01636 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45199,0.0122 0.004,1.37001 1.33509,-0.0138 0.0309,-2.61527 -0.0143,-0.98506 -1.35248,-0.009 0.007,1.37277 -0.46491,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient36422);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18016" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,304.27354 0.65648,0 0,0.48521 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18018" />
-      <path
-         id="path18020"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,305.14408 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,306.05745 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18022" />
-      <path
-         id="path18024"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,306.95655 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,304.65886 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18026" />
-      <path
-         id="path18028"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,305.57223 0.65649,0 0,0.48522 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,306.47132 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18030" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -365.00892,304.35917 0,3.11114"
-         inkscape:path-effect="#path-effect19037-3"
-         id="path18032"
-         d="m -365.00892,304.35917 0,3.11114"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,304.245 0.50802,0 0,0.4424 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18034" />
-      <path
-         id="path18036"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,306.95655 0.50802,0 0,0.44241 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -378.10999,303.58852 0,1.02754 10.38952,0"
-         inkscape:path-effect="#path-effect19039-4"
-         id="path18038"
-         d="m -378.10999,303.58852 0,1.02754 10.38952,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.80409,304.61606 0,2.48321 1.82672,0"
-         inkscape:path-effect="#path-effect19041-12"
-         id="path18040"
-         d="m -369.80409,304.61606 0,2.48321 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.77555,307.09927 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97044"
-         inkscape:path-effect="#path-effect19043-2"
-         id="path18042"
-         d="m -369.77555,307.09927 -8.36298,0 0,0.97044"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -369.57021,304.81473 2.06412,0 0,2.07008 -2.06412,0 z"
-         style="fill:url(#linearGradient36420);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path18044" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -367.28643,304.70167 0,2.29768"
-         inkscape:path-effect="#path-effect19047-9"
-         id="path18046"
-         d="m -367.28643,304.70167 0,2.29768"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85112,304.02796 1.36232,0 0,3.63289 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18048" />
-      <path
-         d="m -378.00441,304.02796 0.86787,0 0,0.47429 -0.86787,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18050"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path18052"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.02459,307.20672 0.86786,0 0,0.44403 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -379.74011,303.58393 0,4.087"
-         inkscape:path-effect="#path-effect19049-8"
-         id="path18054"
-         d="m -379.74011,303.58393 0,4.087"
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.55056,303.6254 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42432 c -0.34562,0 -0.89155,0 -1.31692,-2e-5 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18056" />
-      <path
-         id="path18058"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85037,303.83622 -1.68871,0 0.003,0.18723 0.80151,1.2e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90821 -0.44596,0 10e-4,-0.68622 -0.43424,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82261,0.014 0.80576,-0.009 -0.007,1.37276 0.44661,0.0203 0.001,-0.90718 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path18060"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.51528,303.62188 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -381.38414,303.8177 0,4.02902"
-         id="path18062"
-         inkscape:path-effect="#path-effect19051-22"
-         inkscape:original-d="m -381.38414,303.8177 0,4.02902"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36418);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect18064"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="304.02005" />
-      <rect
-         y="-307.68631"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect18066"
-         style="fill:url(#linearGradient36416);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <path
-         id="path18068"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -382.56265,308.57737 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25689 l 0,-4.23264 c 0,-0.14233 0.1146,-0.25688 0.25687,-0.25688 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         id="path18070"
-         style="fill:url(#linearGradient36414);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -380.76942,308.94758 16.42868,0 0,4.01635 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.6862 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61529 -0.0143,-0.98507 -1.35248,-0.009 0.007,1.37277 -0.46491,0.0203 -0.001,-0.90719 -0.45862,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path18072"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,309.38489 0.65648,0 0,0.48521 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,310.25544 0.65648,0 0,0.48522 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18074" />
-      <path
-         id="path18076"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,311.16881 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,312.06791 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18078" />
-      <path
-         id="path18080"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,309.77021 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,310.68359 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18082" />
-      <path
-         id="path18084"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,311.58268 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -365.00892,309.47052 0,3.11116"
-         id="path18086"
-         inkscape:path-effect="#path-effect19059-8"
-         inkscape:original-d="m -365.00892,309.47052 0,3.11116"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path18088"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,309.35635 0.50802,0 0,0.4424 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,312.06791 0.50802,0 0,0.4424 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18090" />
-      <path
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -378.10999,308.69987 0,1.02754 10.38952,0"
-         id="path18092"
-         inkscape:path-effect="#path-effect19061-5"
-         inkscape:original-d="m -378.10999,308.69987 0,1.02754 10.38952,0"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -369.80409,309.72741 0,2.48321 1.82672,0"
-         id="path18094"
-         inkscape:path-effect="#path-effect19063-8"
-         inkscape:original-d="m -369.80409,309.72741 0,2.48321 1.82672,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -369.77555,312.21062 -8.36298,0 0,0.97044"
-         id="path18096"
-         inkscape:path-effect="#path-effect19065-3"
-         inkscape:original-d="m -369.77555,312.21062 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97044"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path18098"
-         style="fill:url(#linearGradient36412);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -369.57021,309.92608 2.06412,0 0,2.07008 -2.06412,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -367.28643,309.81304 0,2.29768"
-         id="path18100"
-         inkscape:path-effect="#path-effect19069-9"
-         inkscape:original-d="m -367.28643,309.81304 0,2.29768"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path18102"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85112,309.13931 1.36232,0 0,3.63289 -1.36232,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path18104"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.00441,309.13931 0.86787,0 0,0.47429 -0.86787,0 z" />
-      <path
-         d="m -378.02459,312.31809 0.86786,0 0,0.44402 -0.86786,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18106"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -379.74011,308.69529 0,4.087"
-         id="path18108"
-         inkscape:path-effect="#path-effect19071-4"
-         inkscape:original-d="m -379.74011,308.69529 0,4.087"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         id="path18110"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.55056,308.73675 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42431 c -0.34562,0 -0.89155,0 -1.31692,-2e-5 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85037,308.94758 -1.68871,0 0.003,0.18722 0.80151,1.2e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44596,0 10e-4,-0.68621 -0.43424,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37277 0.44661,0.0203 0.001,-0.9072 0.44058,-0.0213 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18112" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.51528,308.73323 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27042,0 -0.15495,-2e-5 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18114" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -381.38414,308.92905 0,4.02903"
-         inkscape:path-effect="#path-effect19073-4"
-         id="path18116"
-         d="m -381.38414,308.92905 0,4.02903"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="309.13138"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect18118"
-         style="fill:url(#linearGradient36410);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         transform="scale(1,-1)"
-         style="fill:url(#linearGradient36408);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect18120"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="-312.79767" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m -382.56265,313.68374 18.39573,0 c 0.14232,0 0.25688,0.11461 0.25688,0.25689 l 0,4.23264 c 0,0.14232 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25689 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25689 0.25687,-0.25689 z"
-         style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path18122" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -380.76942,314.05395 16.42868,0 0,4.01637 -16.42868,0 0,-0.90823 0.4642,0 -10e-4,-0.6862 0.45199,0.0122 0.004,1.37001 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98507 -1.35248,-0.009 0.007,1.37275 -0.46491,0.0203 -0.001,-0.90719 -0.45862,-0.0213 z"
-         style="fill:url(#linearGradient36406);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18124" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,314.49127 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18126" />
-      <path
-         id="path18128"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,315.36183 0.65648,0 0,0.48522 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.03646,316.27519 0.65648,0 0,0.48523 -0.65648,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18130" />
-      <path
-         id="path18132"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.03646,317.17428 0.65648,0 0,0.48523 -0.65648,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,314.8766 0.65649,0 0,0.48523 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18134" />
-      <path
-         id="path18136"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -366.72149,315.78996 0.65649,0 0,0.48523 -0.65649,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -366.72149,316.68906 0.65649,0 0,0.48522 -0.65649,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18138" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -365.00892,314.5769 0,3.11114"
-         inkscape:path-effect="#path-effect19081-9"
-         id="path18140"
-         d="m -365.00892,314.5769 0,3.11114"
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -367.43506,314.46273 0.50802,0 0,0.44241 -0.50802,0 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18142" />
-      <path
-         id="path18144"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -367.43506,317.17428 0.50802,0 0,0.44242 -0.50802,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -378.10999,313.80625 0,1.02754 10.38952,0"
-         inkscape:path-effect="#path-effect19083-8"
-         id="path18146"
-         d="m -378.10999,313.80625 0,1.02754 10.38952,0"
-         style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.80409,314.83379 0,2.48321 1.82672,0"
-         inkscape:path-effect="#path-effect19085-56"
-         id="path18148"
-         d="m -369.80409,314.83379 0,2.48321 1.82672,0"
-         style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -369.77555,317.317 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046"
-         inkscape:path-effect="#path-effect19087-6"
-         id="path18150"
-         d="m -369.77555,317.317 -8.36298,0 0,0.97046"
-         style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -369.57021,315.03246 2.06412,0 0,2.07008 -2.06412,0 z"
-         style="fill:url(#linearGradient36404);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path18152" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -367.28643,314.91942 0,2.29767"
-         inkscape:path-effect="#path-effect19091-0"
-         id="path18154"
-         d="m -367.28643,314.91942 0,2.29767"
-         style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -379.85112,314.24571 1.36232,0 0,3.63287 -1.36232,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18156" />
-      <path
-         d="m -378.00441,314.24571 0.86787,0 0,0.47427 -0.86787,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18158"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path18160"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -378.02459,317.42447 0.86786,0 0,0.44403 -0.86786,0 z" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m -379.74011,313.80167 0,4.087"
-         inkscape:path-effect="#path-effect19093-7"
-         id="path18162"
-         d="m -379.74011,313.80167 0,4.087"
-         style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccsscc"
-         inkscape:connector-curvature="0"
-         d="m -382.55056,313.84313 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34562,0 -0.89155,0 -1.31692,0 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z"
-         style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18164" />
-      <path
-         id="path18166"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -379.85037,314.05395 -1.68871,0 0.003,0.18725 0.80151,1.1e-4 0.0176,3.61086 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44596,0 10e-4,-0.68621 -0.43424,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0139 0.80576,-0.009 -0.007,1.37277 0.44661,0.0203 0.001,-0.9072 0.44058,-0.0213 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path18168"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -382.51528,313.83961 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0683 -0.15641,-0.15304 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsscc" />
-      <path
-         style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m -381.38414,314.03543 0,4.02902"
-         id="path18170"
-         inkscape:path-effect="#path-effect19095-2"
-         inkscape:original-d="m -381.38414,314.03543 0,4.02902"
-         inkscape:connector-curvature="0" />
-      <rect
-         style="fill:url(#linearGradient36402);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect18172"
-         width="8.3515739"
-         height="0.41957662"
-         x="-377.16425"
-         y="314.23776" />
-      <rect
-         y="-317.90408"
-         x="-377.16425"
-         height="0.41957662"
-         width="8.3515739"
-         id="rect18174"
-         style="fill:url(#linearGradient36400);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(1,-1)" />
-      <g
-         transform="matrix(-0.9145536,0,0,0.91455512,-763.96886,-42.419616)"
-         id="g20657">
-        <path
-           transform="matrix(-0.32633859,0,0,0.35269389,-373.15854,203.30963)"
-           id="path20659"
-           style="opacity:0.73991029;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22688-0)"
-           d="m 190.21338,691.0295 84.30377,36.12543 -58.77787,33.93541 -83.42033,-45.25626 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <g
-           id="g20661">
-          <path
-             id="path20663"
-             style="fill:url(#linearGradient24366);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -436.06431,444.46885 -26.4086,9.50458 18.61817,10.74923 24.63847,-14.22504 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path20665"
-             style="fill:url(#linearGradient24368);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -419.21627,450.49766 -24.63846,14.225 -10e-6,6.30935 24.63847,-14.51319 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path20667"
-             style="fill:url(#linearGradient24370);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -443.85474,464.72266 -18.61817,-10.74923 0,6.30633 18.61817,10.75225 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccccccc"
-             inkscape:connector-curvature="0"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -438.76868,464.68199 0,2.14855 -2.76633,1.62737 0.004,-2.2442 0.61387,-0.3361 -0.0141,-0.31866 1.4721,-0.85213 0,0.35809 z"
-             id="path20669" />
-          <path
-             id="path20671"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -440.87183,465.86616 -0.66728,0.33834 -0.0107,2.26218 2.78116,-1.63825 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccccccc"
-             id="path20673"
-             d="m -430.87531,460.0863 -0.0114,2.13882 -2.6937,1.61835 0,-2.10402 0.60114,-0.36317 0.0165,-0.41255 1.41125,-0.81481 0,0.35066 z"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -431.34477,462.46415 -1.89574,-0.92888 -0.0991,0.0584 1.83954,0.96604 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20675" />
-          <path
-             id="path20677"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -431.64534,462.66453 -1.93332,-0.9414 -0.0114,0.12102 1.78944,0.91594 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -431.99601,462.87738 -1.58265,-0.7723 9.9e-4,0.12105 1.42625,0.74686 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20679" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -432.93487,461.36258 -0.65345,0.36833 0.0125,2.07822 2.68327,-1.58054 z"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20681" />
-          <path
-             sodipodi:nodetypes="ccccccccc"
-             inkscape:connector-curvature="0"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -427.22318,458.0024 0,2.07145 -2.60903,1.55217 0,-2.02921 0.57979,-0.35026 0,-0.38878 1.37698,-0.79503 0,0.33823 z"
-             id="path20683" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -427.96584,460.48893 -1.86461,-0.90793 -0.0109,0.11677 1.72585,0.88334 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20685" />
-          <path
-             id="path20687"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -428.30405,460.69428 -1.5264,-0.74488 9.8e-4,0.11672 1.37558,0.72034 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -428.69661,460.92984 -1.13988,-0.55763 0.007,0.12274 0.983,0.52707 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20689" />
-          <path
-             id="path20691"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -429.20955,459.23329 -0.63022,0.35522 0,2.04506 2.61659,-1.55972 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccccccc"
-             id="path20693"
-             d="m -423.71863,456.04168 0,1.97414 -2.51359,1.48059 0,-1.91864 0.55857,-0.33747 0,-0.43938 1.32662,-0.76592 0,0.39068 z"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -425.63234,457.22756 -0.60718,0.34224 0,1.97023 2.52089,-1.54525 z"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20695" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -424.15485,458.25107 -1.76149,-0.86302 -0.092,0.0542 1.70928,0.89763 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20697" />
-          <path
-             id="path20699"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -424.43413,458.43729 -1.7964,-0.87474 -0.0106,0.11245 1.66273,0.8511 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -424.75997,458.63512 -1.47056,-0.71766 9.8e-4,0.11249 1.32525,0.69398 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20701" />
-          <path
-             id="path20703"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -425.13817,458.86205 -1.09819,-0.53725 0.007,0.11825 0.94705,0.50782 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -425.54547,459.11223 -0.68507,-0.33938 -0.0105,0.13569 0.55139,0.2925 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20705" />
-          <path
-             id="path20707"
-             d="m -434.7228,462.35121 0,2.14855 -2.76633,1.62737 0.004,-2.2442 0.61387,-0.3361 -0.0141,-0.31866 1.47209,-0.85213 0,0.35809 z"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -436.82595,463.53537 -0.66729,0.33835 -0.0107,2.26218 2.78118,-1.63825 z"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20709" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -435.20219,464.75217 -1.93586,-1.05811 -0.10116,0.0539 1.87848,1.09285 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20711" />
-          <path
-             id="path20713"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -435.50913,464.93944 -1.97423,-1.07312 -0.0116,0.12293 1.82733,1.03881 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -435.86722,465.13655 -1.61614,-0.88018 9.8e-4,0.12366 1.45644,0.84515 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20715" />
-          <path
-             id="path20717"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -436.28286,465.36241 -1.2069,-0.65877 0.008,0.13041 1.0408,0.61698 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -436.73049,465.61203 -0.75288,-0.41562 -0.0116,0.14847 0.60598,0.35578 z"
-             style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20719" />
-          <path
-             inkscape:connector-curvature="0"
-             style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -420.42047,454.12591 0,1.97414 -2.51359,1.48059 0,-1.91863 0.55858,-0.33747 0,-0.43938 1.32661,-0.76593 0,0.39069 z"
-             id="path20721"
-             sodipodi:nodetypes="ccccccccc" />
-          <path
-             id="path20723"
-             style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m -422.33418,455.31179 -0.60717,0.34224 0,1.97024 2.52088,-1.54525 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             inkscape:transform-center-y="-3.6310978e-005"
-             inkscape:transform-center-x="-1.2558035"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -439.21546,462.7963 -0.73559,0.42217 0,1.58313 0.79658,-0.4293 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24372);stroke-width:0.10124438;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path20725" />
-          <path
-             inkscape:transform-center-y="-2.0065162e-005"
-             id="path20727"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24374);stroke-width:0.10124438;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -440.48711,463.52611 -0.73558,0.42209 0,1.58322 0.79657,-0.42939 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.2558024" />
-          <path
-             id="path20729"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24376);stroke-width:0.09516977;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -435.35725,460.67877 -0.69145,0.39685 0,1.48814 0.74878,-0.40355 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.1804582"
-             inkscape:transform-center-y="-4.317584e-005" />
-          <path
-             inkscape:transform-center-x="-1.1804515"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -436.5526,461.3648 -0.69145,0.39676 0,1.48822 0.74878,-0.40359 z"
-             style="fill:#15cc01;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24378);stroke-width:0.09516977;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path20731"
-             inkscape:transform-center-y="-3.0421108e-005" />
-          <path
-             inkscape:transform-center-y="-3.5812256e-005"
-             inkscape:transform-center-x="-1.1302209"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -431.56156,458.56493 -0.66202,0.37995 0,1.42483 0.71692,-0.38641 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24380);stroke-width:0.09111991;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path20733" />
-          <path
-             inkscape:transform-center-y="-3.033866e-005"
-             id="path20735"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24382);stroke-width:0.09111991;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -432.70604,459.22178 -0.66202,0.37986 0,1.42487 0.71692,-0.38641 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.1302206" />
-          <path
-             id="path20737"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24384);stroke-width:0.08909495;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -427.79004,456.43272 -0.6473,0.37151 0,1.39316 0.70098,-0.37781 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.1051084"
-             inkscape:transform-center-y="-5.2712879e-005" />
-          <path
-             inkscape:transform-center-x="-1.1051041"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -428.90908,457.07499 -0.64731,0.37139 0,1.39324 0.70098,-0.37781 z"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24386);stroke-width:0.08909495;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path20739"
-             inkscape:transform-center-y="-1.8005608e-005" />
-          <path
-             inkscape:transform-center-y="-7.1262664e-005"
-             inkscape:transform-center-x="-1.079995"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -424.30532,454.4899 -0.6326,0.36309 0,1.36148 0.68505,-0.36923 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24388);stroke-width:0.08707013;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path20741" />
-          <path
-             id="path20743"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24390);stroke-width:0.08707013;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -425.39894,455.11761 -0.63259,0.36291 0,1.36161 0.68505,-0.36922 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.0799904" />
-          <path
-             id="path20745"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24392);stroke-width:0.08504539;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -421.02692,452.61584 -0.61789,0.35465 0,1.32981 0.66912,-0.36063 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-1.0548787"
-             inkscape:transform-center-y="-8.7449368e-005" />
-          <path
-             inkscape:transform-center-y="1.6019424e-005"
-             inkscape:transform-center-x="-1.0548741"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m -422.0951,453.22898 -0.61789,0.35444 0,1.32997 0.66912,-0.36063 z"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24394-3);stroke-width:0.08504539;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path20747" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.27181,296.42921)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20749"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20751"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.42639,297.59108)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-423.58086,298.75302)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20753"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20755"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.63397,295.99873)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.78844,297.16067)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20757"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20759"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-424.9429,298.32262)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20761"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.07446,296.76287)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.22904,297.92475)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20763"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20765"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-424.38354,299.08668)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.43662,296.3324)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20767"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20769"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.5911,297.49434)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.74556,298.65629)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20771"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.87712,297.09655)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20773"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20775"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.03171,298.25841)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.18619,299.42036)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20777"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20779"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.23928,296.66607)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.39374,297.82802)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20781"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20783"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.54821,298.98997)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20785"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.67978,297.4302)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.83435,298.59208)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20787"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20789"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.98881,299.75402)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.04189,296.99974)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20791"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20793"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.19637,298.16167)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.35084,299.32361)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20795"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.49698,297.76995)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20797"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20799"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.65157,298.93181)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.80605,300.09376)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20801"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20803"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.85914,297.33947)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.01361,298.50141)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20805"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20807"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.16807,299.66337)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.31424,298.10967)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20809"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20811"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.46883,299.27154)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.62327,300.43349)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20814"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20816"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.67638,297.67921)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.83086,298.84114)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20818"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20820"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.98531,300.0031)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20822"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.11688,298.44335)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.27148,299.60522)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20824"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20826"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.42594,300.76716)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.47905,298.01286)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20828"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20830"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.63351,299.17481)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.78797,300.33677)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20832"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.91954,298.777)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20834"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20836"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.07411,299.93887)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.22857,301.10083)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20838"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20840"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-434.28169,298.34653)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.43613,299.50848)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20842"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20844"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.59061,300.67042)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20846"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.7222,299.11068)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.87677,300.27255)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20848"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20850"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.03124,301.43449)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-435.08433,298.6802)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20852"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20854"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.23881,299.84214)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.39327,301.00409)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20856"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-434.5248,299.44435)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20858"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path20860"
-             sodipodi:cx="1962.25"
-             sodipodi:cy="403.48718"
-             sodipodi:rx="2.25"
-             sodipodi:ry="2.125"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.67941,300.60621)"
-             sodipodi:start="0"
-             sodipodi:end="6.2158485"
-             sodipodi:open="true" />
-          <path
-             sodipodi:open="true"
-             sodipodi:end="6.2158485"
-             sodipodi:start="0"
-             transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.83387,301.76815)"
-             d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202"
-             sodipodi:ry="2.125"
-             sodipodi:rx="2.25"
-             sodipodi:cy="403.48718"
-             sodipodi:cx="1962.25"
-             id="path20862"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             sodipodi:type="arc" />
+      <path inkscape:connector-curvature="0" d="m -398.81908,407.68163 c 6.47687,-0.82802 6.58225,24.18313 19.6463,25.78953 13.06405,1.6064 60.30098,0.5539 79.87188,0.64155 4.29744,0.0192 10.48547,-23.17875 15.73202,-23.15476 l -10.94523,-5.18549 -46.76632,1.61566 -27.10472,0 -20.62236,-3.21336 z" style="opacity:0.57847535;fill:url(#linearGradient31189-4);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20900)" id="path21058" sodipodi:nodetypes="csscccccc" transform="matrix(0.71433696,-0.02277265,0,0.49143042,-158.00288,147.97395)"/>
+      <path sodipodi:nodetypes="ccccccc" id="path47635-7-3-1-9-1" style="fill:url(#linearGradient24060);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -441.51671,342.041 0,15.18518 77.98371,0 -10e-6,-15.18518 -21.30816,-5.86064 -36.01873,0 z" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient24062);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect3526" width="78.530823" height="15.6214" x="-441.64969" y="342.04086" ry="0"/>
+      <path id="rect5355" style="fill:url(#linearGradient24064);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -441.64971,342.04083 78.53084,0 0,15.16446 -78.53084,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -421.26785,342.2002 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.11461 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path4480"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,342.57042 16.42871,0 0,4.01634 -16.42871,0 0,-0.90822 0.46419,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.36999 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.35248,-0.009 0.007,1.37275 -0.46488,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z" style="fill:url(#linearGradient24066);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4482"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,343.00772 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4484"/>
+      <path id="path4486" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,343.87827 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,344.79164 0.65649,0 0,0.48521 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4488"/>
+      <path id="path4490" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,345.69073 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,343.39304 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4492"/>
+      <path id="path4494" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,344.30641 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,345.20551 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4496"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -403.71413,343.09334 0,3.11115" inkscape:path-effect="#path-effect4612-3" id="path4498" d="m -403.71413,343.09334 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,342.97917 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4500"/>
+      <path id="path4502" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,345.69073 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -416.81519,342.3227 0,1.02753 10.3895,0" inkscape:path-effect="#path-effect4614-9" id="path4504" d="m -416.81519,342.3227 0,1.02753 10.3895,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -408.50929,343.35023 0,2.48321 1.82673,0" inkscape:path-effect="#path-effect4616-8" id="path4506" d="m -408.50929,343.35023 0,2.48321 1.82673,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -408.48074,345.83344 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97045" inkscape:path-effect="#path-effect4618-0" id="path4508" d="m -408.48074,345.83344 -8.36298,0 0,0.97045" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -408.27541,343.54891 2.06414,0 0,2.07008 -2.06414,0 z" style="fill:url(#linearGradient24068);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4510"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -405.99162,343.43585 0,2.29769" inkscape:path-effect="#path-effect4620-0" id="path4512" d="m -405.99162,343.43585 0,2.29769" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -418.55631,342.76214 1.36234,0 0,3.63289 -1.36234,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4514"/>
+      <path d="m -416.70958,342.76214 0.86784,0 0,0.47429 -0.86784,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4516" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4518" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.72978,345.94092 0.86786,0 0,0.44402 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -418.44531,342.31813 0,4.08698" inkscape:path-effect="#path-effect4622-5" id="path4520" d="m -418.44531,342.31813 0,4.08698" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.25574,342.35959 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.4243 c -0.34563,0 -0.89155,0 -1.31691,-1e-5 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4522"/>
+      <path id="path5353" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,342.57042 1.7578,0 -0.004,0.18722 -0.8343,1.1e-4 -0.0183,3.61087 0.85628,0.0356 0,0.18246 -1.75779,0 0,-0.90821 0.46419,0 -10e-4,-0.68622 0.45201,0.0122 0.004,1.37001 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.0138 -0.83871,-0.009 0.007,1.37277 -0.4649,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path5359" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.22048,342.35606 c 0.0546,-0.001 0.0998,-0.001 0.11963,6.6e-4 l 5e-5,4.43206 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -419.98945,342.55187 0,4.02903" id="path5363" inkscape:path-effect="#path-effect5365-14" inkscape:original-d="m -419.98945,342.55187 0,4.02903" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient24070);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect5367" width="8.3515739" height="0.41957662" x="-415.86942" y="342.75418"/>
+      <rect y="-346.42047" x="-415.86942" height="0.41957662" width="8.3515739" id="rect5379" style="fill:url(#linearGradient24072);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path5383" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -421.26785,347.30884 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path5385" style="fill:url(#linearGradient24074);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,347.67905 16.42871,0 0,4.01635 -16.42871,0 0,-0.90822 0.46419,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.61527 -0.0142,-0.98508 -1.35248,-0.009 0.007,1.37275 -0.46488,0.0203 -10e-4,-0.90716 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path5387" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,348.11637 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,348.98691 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5389"/>
+      <path id="path5391" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,349.90028 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,350.79938 0.65649,0 0,0.48521 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5393"/>
+      <path id="path5395" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,348.50168 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,349.41505 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5397"/>
+      <path id="path5399" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,350.31415 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -403.71413,348.20199 0,3.11114" id="path5401" inkscape:path-effect="#path-effect5439-9" inkscape:original-d="m -403.71413,348.20199 0,3.11114" inkscape:connector-curvature="0"/>
+      <path id="path5403" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,348.08782 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,350.79938 0.50802,0 0,0.4424 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5405"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -416.81519,347.43134 0,1.02754 10.3895,0" id="path5407" inkscape:path-effect="#path-effect5441-2" inkscape:original-d="m -416.81519,347.43134 0,1.02754 10.3895,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -408.50929,348.45888 0,2.48321 1.82673,0" id="path5409" inkscape:path-effect="#path-effect5443-19" inkscape:original-d="m -408.50929,348.45888 0,2.48321 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.48074,350.94209 -8.36298,0 0,0.97045" id="path5411" inkscape:path-effect="#path-effect5445-8" inkscape:original-d="m -408.48074,350.94209 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97045" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path5413" style="fill:url(#linearGradient24076);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.27541,348.65755 2.06414,0 0,2.07009 -2.06414,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -405.99162,348.54449 0,2.29769" id="path5415" inkscape:path-effect="#path-effect5449-23" inkscape:original-d="m -405.99162,348.54449 0,2.29769" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path5417" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -418.55631,347.87079 1.36234,0 0,3.63288 -1.36234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path5419" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.70958,347.87079 0.86784,0 0,0.47429 -0.86784,0 z"/>
+      <path d="m -416.72978,351.04957 0.86786,0 0,0.44401 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5421" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -418.44531,347.42676 0,4.08701" id="path5423" inkscape:path-effect="#path-effect5451-4" inkscape:original-d="m -418.44531,347.42676 0,4.08701" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path5425" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.25574,347.46823 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42429 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,347.67905 1.7578,0 -0.004,0.18722 -0.8343,1.2e-4 -0.0183,3.61087 0.85628,0.0356 0,0.18246 -1.75779,0 0,-0.90822 0.46419,0 -10e-4,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62142 0.85626,0.0138 -0.83871,-0.009 0.007,1.37274 -0.4649,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5427"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.22048,347.4647 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.6e-4 l 5e-5,4.43206 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5429"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -419.98945,347.66052 0,4.02902" inkscape:path-effect="#path-effect5453-0" id="path5431" d="m -419.98945,347.66052 0,4.02902" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="347.86285" x="-415.86942" height="0.41957662" width="8.3515739" id="rect5433" style="fill:url(#linearGradient24078);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient24080);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect5435" width="8.3515739" height="0.41957662" x="-415.86942" y="-351.52911"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -421.26785,352.41115 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25687 l 0,4.23265 c 0,0.14231 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25689 l 0,-4.23265 c 0,-0.14231 0.1146,-0.25687 0.25687,-0.25687 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path5459"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,352.78136 16.42871,0 0,4.01636 -16.42871,0 0,-0.90822 0.46419,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.36999 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.35248,-0.009 0.007,1.37276 -0.46488,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z" style="fill:url(#linearGradient24082);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5461"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,353.21867 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5463"/>
+      <path id="path5465" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,354.08922 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,355.00258 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5467"/>
+      <path id="path5469" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,355.90167 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,353.604 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5471"/>
+      <path id="path5473" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,354.51737 0.65648,0 0,0.48521 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,355.41646 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5475"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -403.71413,353.3043 0,3.11115" inkscape:path-effect="#path-effect5515-2" id="path5477" d="m -403.71413,353.3043 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,353.19013 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5479"/>
+      <path id="path5481" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,355.90169 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -416.81519,352.53366 0,1.02752 10.3895,0" inkscape:path-effect="#path-effect5517-3" id="path5483" d="m -416.81519,352.53366 0,1.02752 10.3895,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -408.50929,353.56118 0,2.48322 1.82673,0" inkscape:path-effect="#path-effect5519-19" id="path5485" d="m -408.50929,353.56118 0,2.48322 1.82673,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -408.48074,356.0444 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97045" inkscape:path-effect="#path-effect5521-89" id="path5487" d="m -408.48074,356.0444 -8.36298,0 0,0.97045" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -408.27541,353.75987 2.06414,0 0,2.07006 -2.06414,0 z" style="fill:url(#linearGradient24084);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path5489"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -405.99162,353.64681 0,2.29768" inkscape:path-effect="#path-effect5525-8" id="path5491" d="m -405.99162,353.64681 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -418.55631,352.9731 1.36234,0 0,3.63288 -1.36234,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5493"/>
+      <path d="m -416.70958,352.9731 0.86784,0 0,0.47429 -0.86784,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5495" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path5497" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.72978,356.15186 0.86786,0 0,0.44403 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -418.44531,352.52908 0,4.08698" inkscape:path-effect="#path-effect5527-9" id="path5499" d="m -418.44531,352.52908 0,4.08698" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.25574,352.57052 c 0.36888,-0.004 1.10825,-9e-5 1.31691,0.004 l 0,4.42427 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5501"/>
+      <path id="path5503" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,352.78136 1.7578,0 -0.004,0.18723 -0.8343,1.2e-4 -0.0183,3.61085 0.85628,0.0356 0,0.18249 -1.75779,0 0,-0.90823 0.46419,0 -10e-4,-0.68621 0.45201,0.0122 0.004,1.36999 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.0138 -0.83871,-0.009 0.007,1.37276 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path5505" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.22048,352.56702 c 0.0546,-0.001 0.0998,-0.001 0.11963,6.6e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,-1e-5 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -419.98945,352.76283 0,4.02903" id="path5507" inkscape:path-effect="#path-effect5529-13" inkscape:original-d="m -419.98945,352.76283 0,4.02903" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient24086);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect5509" width="8.3515739" height="0.41957662" x="-415.86942" y="352.96512"/>
+      <rect y="-356.63147" x="-415.86942" height="0.41957662" width="8.3515739" id="rect5511" style="fill:url(#linearGradient24088);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path5535" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -440.62416,342.2002 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25688 l 0,4.23264 c 0,0.1423 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.11461 -0.2569,-0.25688 l 0,-4.23264 c 0,-0.14232 0.11461,-0.25688 0.2569,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path5537" style="fill:url(#linearGradient24090-51);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,342.57042 16.42872,0 0,4.01634 -16.42872,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45202,0.0122 0.004,1.36999 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.3525,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90717 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path5539" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,343.00772 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,343.87827 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5541"/>
+      <path id="path5543" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,344.79164 0.65648,0 0,0.48521 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,345.69073 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5545"/>
+      <path id="path5547" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,343.39304 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,344.30641 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5549"/>
+      <path id="path5551" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,345.20551 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -423.07046,343.09334 0,3.11115" id="path5553" inkscape:path-effect="#path-effect5699-4" inkscape:original-d="m -423.07046,343.09334 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path5555" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,342.97917 0.50801,0 0,0.44241 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,345.69073 0.50801,0 0,0.44241 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5557"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -436.17152,342.3227 0,1.02753 10.38953,0" id="path5559" inkscape:path-effect="#path-effect5701-2" inkscape:original-d="m -436.17152,342.3227 0,1.02753 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -427.8656,343.35023 0,2.48321 1.82672,0" id="path5561" inkscape:path-effect="#path-effect5703-5" inkscape:original-d="m -427.8656,343.35023 0,2.48321 1.82672,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -427.83708,345.83344 -8.36298,0 0,0.97045" id="path5563" inkscape:path-effect="#path-effect5705-3" inkscape:original-d="m -427.83708,345.83344 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97045" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path5565" style="fill:url(#linearGradient24092);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -427.63173,343.54891 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -425.34794,343.43585 0,2.29769" id="path5567" inkscape:path-effect="#path-effect5709-8" inkscape:original-d="m -425.34794,343.43585 0,2.29769" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path5569" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -437.91264,342.76214 1.36233,0 0,3.63289 -1.36233,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path5571" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.06592,342.76214 0.86786,0 0,0.47429 -0.86786,0 z"/>
+      <path d="m -436.08611,345.94092 0.86786,0 0,0.44402 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5573" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -437.80163,342.31813 0,4.08698" id="path5575" inkscape:path-effect="#path-effect5711-9" inkscape:original-d="m -437.80163,342.31813 0,4.08698" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path5577" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.61207,342.35959 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.4243 c -0.34564,0 -0.89156,0 -1.31692,-1e-5 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,342.57042 1.75781,0 -0.004,0.18722 -0.83431,1.1e-4 -0.0183,3.61087 0.85629,0.0356 0,0.18246 -1.75779,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.37001 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.0138 -0.83871,-0.009 0.007,1.37277 -0.46489,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5579"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.57679,342.35606 c 0.0546,-0.001 0.0996,-0.001 0.11961,6.6e-4 l 4e-5,4.43206 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5581"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -439.34576,342.55187 0,4.02903" inkscape:path-effect="#path-effect5713-2" id="path5583" d="m -439.34576,342.55187 0,4.02903" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="342.75418" x="-435.22577" height="0.41957662" width="8.3515739" id="rect5585" style="fill:url(#linearGradient24094);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient24096);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect5587" width="8.3515739" height="0.41957662" x="-435.22577" y="-346.42047"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -440.62416,347.30884 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25688 l 0,-4.23264 c 0,-0.14232 0.11461,-0.25688 0.2569,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path5589"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,347.67905 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.61527 -0.0142,-0.98508 -1.3525,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90716 -0.45861,-0.0213 z" style="fill:url(#linearGradient24098);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5591"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,348.11637 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5593"/>
+      <path id="path5595" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,348.98691 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,349.90028 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5597"/>
+      <path id="path5599" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,350.79938 0.65648,0 0,0.48521 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,348.50168 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5601"/>
+      <path id="path5603" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,349.41505 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,350.31415 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5605"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -423.07046,348.20199 0,3.11114" inkscape:path-effect="#path-effect5721-8" id="path5607" d="m -423.07046,348.20199 0,3.11114" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,348.08782 0.50801,0 0,0.44241 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5609"/>
+      <path id="path5611" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,350.79938 0.50801,0 0,0.4424 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -436.17152,347.43134 0,1.02754 10.38953,0" inkscape:path-effect="#path-effect5723-7" id="path5613" d="m -436.17152,347.43134 0,1.02754 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.8656,348.45888 0,2.48321 1.82672,0" inkscape:path-effect="#path-effect5725-01" id="path5615" d="m -427.8656,348.45888 0,2.48321 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.83708,350.94209 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97045" inkscape:path-effect="#path-effect5727-48" id="path5617" d="m -427.83708,350.94209 -8.36298,0 0,0.97045" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -427.63173,348.65755 2.06412,0 0,2.07009 -2.06412,0 z" style="fill:url(#linearGradient24100);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path5619"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -425.34794,348.54449 0,2.29769" inkscape:path-effect="#path-effect5731-1" id="path5621" d="m -425.34794,348.54449 0,2.29769" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -437.91264,347.87079 1.36233,0 0,3.63288 -1.36233,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5623"/>
+      <path d="m -436.06592,347.87079 0.86786,0 0,0.47429 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5625" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path5627" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.08611,351.04957 0.86786,0 0,0.44401 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -437.80163,347.42676 0,4.08701" inkscape:path-effect="#path-effect5733-9" id="path5629" d="m -437.80163,347.42676 0,4.08701" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.61207,347.46823 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5631"/>
+      <path id="path5633" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,347.67905 1.75781,0 -0.004,0.18722 -0.83431,1.2e-4 -0.0183,3.61087 0.85629,0.0356 0,0.18246 -1.75779,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62142 0.85627,0.0138 -0.83871,-0.009 0.007,1.37274 -0.46489,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path5635" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.57679,347.4647 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.6e-4 l 4e-5,4.43206 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -439.34576,347.66052 0,4.02902" id="path5637" inkscape:path-effect="#path-effect5735-3" inkscape:original-d="m -439.34576,347.66052 0,4.02902" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient24102);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect5639" width="8.3515739" height="0.41957662" x="-435.22577" y="347.86285"/>
+      <rect y="-351.52911" x="-435.22577" height="0.41957662" width="8.3515739" id="rect5641" style="fill:url(#linearGradient24104);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path5643" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -440.62416,352.41115 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25687 l 0,4.23265 c 0,0.14231 -0.1146,0.25689 -0.25689,0.25689 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25689 l 0,-4.23265 c 0,-0.14231 0.11461,-0.25687 0.2569,-0.25687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path5645" style="fill:url(#linearGradient24106);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,352.78136 16.42872,0 0,4.01636 -16.42872,0 0,-0.90822 0.4642,0 -10e-4,-0.68622 0.45202,0.0122 0.004,1.36999 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.3525,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90717 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path5647" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,353.21867 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,354.08922 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5649"/>
+      <path id="path5651" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,355.00258 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,355.90167 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5653"/>
+      <path id="path5655" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,353.604 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,354.51737 0.65649,0 0,0.48521 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5657"/>
+      <path id="path5659" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,355.41646 0.65649,0 0,0.48521 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -423.07046,353.3043 0,3.11115" id="path5661" inkscape:path-effect="#path-effect5743-59" inkscape:original-d="m -423.07046,353.3043 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path5663" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,353.19013 0.50801,0 0,0.44241 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,355.90169 0.50801,0 0,0.44241 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5665"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -436.17152,352.53366 0,1.02752 10.38953,0" id="path5667" inkscape:path-effect="#path-effect5745-7" inkscape:original-d="m -436.17152,352.53366 0,1.02752 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -427.8656,353.56118 0,2.48322 1.82672,0" id="path5669" inkscape:path-effect="#path-effect5747-98" inkscape:original-d="m -427.8656,353.56118 0,2.48322 1.82672,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -427.83708,356.0444 -8.36298,0 0,0.97045" id="path5671" inkscape:path-effect="#path-effect5749-01" inkscape:original-d="m -427.83708,356.0444 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97045" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path5673" style="fill:url(#linearGradient24108);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -427.63173,353.75987 2.06412,0 0,2.07006 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -425.34794,353.64681 0,2.29768" id="path5675" inkscape:path-effect="#path-effect5753-4" inkscape:original-d="m -425.34794,353.64681 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path5677" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -437.91264,352.9731 1.36233,0 0,3.63288 -1.36233,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path5679" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.06592,352.9731 0.86786,0 0,0.47429 -0.86786,0 z"/>
+      <path d="m -436.08611,356.15186 0.86786,0 0,0.44403 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5681" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -437.80163,352.52908 0,4.08698" id="path5683" inkscape:path-effect="#path-effect5755-7" inkscape:original-d="m -437.80163,352.52908 0,4.08698" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path5685" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.61207,352.57052 c 0.36888,-0.004 1.10825,-9e-5 1.31692,0.004 l 0,4.42427 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,352.78136 1.75781,0 -0.004,0.18723 -0.83431,1.2e-4 -0.0183,3.61085 0.85629,0.0356 0,0.18249 -1.75779,0 0,-0.90823 0.4642,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.36999 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.0138 -0.83871,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5687"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.57679,352.56702 c 0.0546,-0.001 0.0996,-0.001 0.11961,6.6e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,-1e-5 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5689"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -439.34576,352.76283 0,4.02903" inkscape:path-effect="#path-effect5757-55" id="path5691" d="m -439.34576,352.76283 0,4.02903" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="352.96512" x="-435.22577" height="0.41957662" width="8.3515739" id="rect5693" style="fill:url(#linearGradient24110);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient24112);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect5695" width="8.3515739" height="0.41957662" x="-435.22577" y="-356.63147"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -401.89641,342.2002 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.1423 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.11461 -0.25689,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25689,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path5925"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -400.10319,342.57042 16.42872,0 0,4.01634 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.35247,-0.009 0.007,1.37275 -0.46491,0.0203 -10e-4,-0.90717 -0.45861,-0.0213 z" style="fill:url(#linearGradient24114);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5927"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,343.00772 0.65647,0 0,0.48522 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5929"/>
+      <path id="path5931" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,343.87827 0.65647,0 0,0.48522 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,344.79164 0.65647,0 0,0.48521 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5933"/>
+      <path id="path5935" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,345.69073 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,343.39304 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5937"/>
+      <path id="path5939" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,344.30641 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,345.20551 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5941"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -384.34269,343.09334 0,3.11115" inkscape:path-effect="#path-effect6155-8" id="path5943" d="m -384.34269,343.09334 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,342.97917 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5945"/>
+      <path id="path5947" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,345.69073 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -397.44375,342.3227 0,1.02753 10.38953,0" inkscape:path-effect="#path-effect6157-24" id="path5949" d="m -397.44375,342.3227 0,1.02753 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -389.13785,343.35023 0,2.48321 1.82673,0" inkscape:path-effect="#path-effect6159-5" id="path5951" d="m -389.13785,343.35023 0,2.48321 1.82673,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -389.10931,345.83344 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97045" inkscape:path-effect="#path-effect6161-04" id="path5953" d="m -389.10931,345.83344 -8.36298,0 0,0.97045" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -388.90396,343.54891 2.06412,0 0,2.07008 -2.06412,0 z" style="fill:url(#linearGradient24116-4);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path5955"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -386.62019,343.43585 0,2.29769" inkscape:path-effect="#path-effect6165-5" id="path5957" d="m -386.62019,343.43585 0,2.29769" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -399.18487,342.76214 1.36232,0 0,3.63289 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5959"/>
+      <path d="m -397.33816,342.76214 0.86786,0 0,0.47429 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5961" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path5963" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.35834,345.94092 0.86785,0 0,0.44402 -0.86785,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -399.07387,342.31813 0,4.08698" inkscape:path-effect="#path-effect6167-1" id="path5965" d="m -399.07387,342.31813 0,4.08698" style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.88432,342.35959 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.4243 c -0.34563,0 -0.89156,0 -1.31693,-1e-5 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15641,-0.15291 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5967"/>
+      <path id="path5969" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18412,342.57042 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18246 1.68872,0 0,-0.90821 -0.44597,0 10e-4,-0.68622 -0.43426,0.0122 -0.004,1.37001 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37277 0.44663,0.0203 10e-4,-0.90717 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path5971" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.84903,342.35606 c 0.0546,-0.001 0.0995,-0.001 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -400.7179,342.55187 0,4.02903" id="path5973" inkscape:path-effect="#path-effect6169-1" inkscape:original-d="m -400.7179,342.55187 0,4.02903" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient24118);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect5975" width="8.3515739" height="0.41957662" x="-396.49802" y="342.75418"/>
+      <rect y="-346.42047" x="-396.49802" height="0.41957662" width="8.3515739" id="rect5977" style="fill:url(#linearGradient24120);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path6297" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -401.89641,347.31155 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.14231 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25689,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path6299" style="fill:url(#linearGradient24122);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -400.10319,347.68177 16.42872,0 0,4.01635 -16.42872,0 0,-0.90823 0.4642,0 -0.001,-0.6862 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98508 -1.35247,-0.009 0.007,1.37276 -0.46491,0.0203 -10e-4,-0.90718 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path6301" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,348.11907 0.65647,0 0,0.48522 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,348.98962 0.65647,0 0,0.48522 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6303"/>
+      <path id="path6305" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,349.90299 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,350.80208 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6307"/>
+      <path id="path6309" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,348.50439 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,349.41777 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6311"/>
+      <path id="path6313" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,350.31686 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -384.34269,348.20469 0,3.11116" id="path6315" inkscape:path-effect="#path-effect6353-5" inkscape:original-d="m -384.34269,348.20469 0,3.11116" inkscape:connector-curvature="0"/>
+      <path id="path6317" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,348.09053 0.50802,0 0,0.44243 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,350.80208 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6319"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -397.44375,347.43405 0,1.02754 10.38953,0" id="path6321" inkscape:path-effect="#path-effect6355-9" inkscape:original-d="m -397.44375,347.43405 0,1.02754 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -389.13785,348.46159 0,2.4832 1.82673,0" id="path6323" inkscape:path-effect="#path-effect6357-08" inkscape:original-d="m -389.13785,348.46159 0,2.4832 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -389.10931,350.94479 -8.36298,0 0,0.97045" id="path6325" inkscape:path-effect="#path-effect6359-3" inkscape:original-d="m -389.10931,350.94479 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97045" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path6327" style="fill:url(#linearGradient24124);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -388.90396,348.66026 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -386.62019,348.54721 0,2.2977" id="path6329" inkscape:path-effect="#path-effect6363-87" inkscape:original-d="m -386.62019,348.54721 0,2.2977" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path6331" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18487,347.87349 1.36232,0 0,3.63289 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path6333" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.33816,347.87349 0.86786,0 0,0.4743 -0.86786,0 z"/>
+      <path d="m -397.35834,351.05227 0.86785,0 0,0.44402 -0.86785,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6335" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -399.07387,347.42948 0,4.087" id="path6337" inkscape:path-effect="#path-effect6365-26" inkscape:original-d="m -399.07387,347.42948 0,4.087" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path6339" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.88432,347.47094 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42429 c -0.34563,0 -0.89156,0 -1.31693,-10e-6 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15289 l 0,-4.12343 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -399.18412,347.68177 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90824 -0.44597,0 10e-4,-0.68619 -0.43426,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90718 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6341"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.84903,347.46742 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27041,0 -0.15496,-1e-5 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15301 0.15641,-0.15301 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6343"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -400.7179,347.66324 0,4.02902" inkscape:path-effect="#path-effect6367-93" id="path6345" d="m -400.7179,347.66324 0,4.02902" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="347.86551" x="-396.49802" height="0.41957662" width="8.3515739" id="rect6347" style="fill:url(#linearGradient24126);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient24128);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect6349" width="8.3515739" height="0.41957662" x="-396.49802" y="-351.5318"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -401.89641,352.41793 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.11459,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25689 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25689,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path6375"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -400.10319,352.78815 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98508 -1.35247,-0.009 0.007,1.37274 -0.46491,0.0203 -10e-4,-0.90718 -0.45861,-0.0213 z" style="fill:url(#linearGradient24130);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6377"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,353.22545 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6379"/>
+      <path id="path6381" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,354.096 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,355.00937 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6383"/>
+      <path id="path6385" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,355.90847 0.65647,0 0,0.48522 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,353.61077 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6387"/>
+      <path id="path6389" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,354.52414 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,355.42324 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6391"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -384.34269,353.31107 0,3.11115" inkscape:path-effect="#path-effect6431-8" id="path6393" d="m -384.34269,353.31107 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,353.19691 0.50802,0 0,0.44243 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6395"/>
+      <path id="path6397" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,355.90847 0.50802,0 0,0.4424 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -397.44375,352.54043 0,1.02755 10.38953,0" inkscape:path-effect="#path-effect6433-1" id="path6399" d="m -397.44375,352.54043 0,1.02755 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -389.13785,353.56798 0,2.48319 1.82673,0" inkscape:path-effect="#path-effect6435-0" id="path6401" d="m -389.13785,353.56798 0,2.48319 1.82673,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -389.10931,356.05117 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:path-effect="#path-effect6437-3" id="path6403" d="m -389.10931,356.05117 -8.36298,0 0,0.97046" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -388.90396,353.76664 2.06412,0 0,2.07009 -2.06412,0 z" style="fill:url(#linearGradient24132);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path6405"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -386.62019,353.65359 0,2.29768" inkscape:path-effect="#path-effect6441-3" id="path6407" d="m -386.62019,353.65359 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -399.18487,352.97988 1.36232,0 0,3.63288 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6409"/>
+      <path d="m -397.33816,352.97988 0.86786,0 0,0.47429 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6411" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path6413" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.35834,356.15865 0.86785,0 0,0.44402 -0.86785,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -399.07387,352.53586 0,4.087" inkscape:path-effect="#path-effect6443-8" id="path6415" d="m -399.07387,352.53586 0,4.087" style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.88432,352.57732 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42429 c -0.34563,0 -0.89156,0 -1.31693,0 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15289 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15291 0.15641,-0.15291 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6417"/>
+      <path id="path6419" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18412,352.78815 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44597,0 10e-4,-0.68621 -0.43426,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90716 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path6421" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.84903,352.57379 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.7e-4 l 5e-5,4.43206 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -400.7179,352.76962 0,4.02901" id="path6423" inkscape:path-effect="#path-effect6445-4" inkscape:original-d="m -400.7179,352.76962 0,4.02901" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient24134);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect6425" width="8.3515739" height="0.41957662" x="-396.49802" y="352.97192"/>
+      <rect y="-356.63818" x="-396.49802" height="0.41957662" width="8.3515739" id="rect6427" style="fill:url(#linearGradient24136);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path6451" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -382.56265,342.2002 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.11461 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path6453" style="fill:url(#linearGradient24138);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -380.76942,342.57042 16.42868,0 0,4.01634 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98506 -1.35248,-0.009 0.007,1.37275 -0.46491,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path6455" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,343.00772 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,343.87827 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6457-6"/>
+      <path id="path6459-0" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,344.79164 0.65648,0 0,0.48521 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,345.69073 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6461-1"/>
+      <path id="path6463-26" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,343.39304 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,344.30641 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6465-0"/>
+      <path id="path6467" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,345.20551 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -365.00892,343.09334 0,3.11115" id="path6469" inkscape:path-effect="#path-effect6615-8" inkscape:original-d="m -365.00892,343.09334 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path6471" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,342.97917 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,345.69073 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6473"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -378.10999,342.3227 0,1.02753 10.38952,0" id="path6475" inkscape:path-effect="#path-effect6617-0" inkscape:original-d="m -378.10999,342.3227 0,1.02753 10.38952,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -369.80409,343.35023 0,2.48321 1.82672,0" id="path6477" inkscape:path-effect="#path-effect6619-1" inkscape:original-d="m -369.80409,343.35023 0,2.48321 1.82672,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -369.77555,345.83344 -8.36298,0 0,0.97045" id="path6479-5" inkscape:path-effect="#path-effect6621-5" inkscape:original-d="m -369.77555,345.83344 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97045" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path6481-4" style="fill:url(#linearGradient24140);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -369.57021,343.54891 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -367.28643,343.43585 0,2.29769" id="path6483-6" inkscape:path-effect="#path-effect6625-13" inkscape:original-d="m -367.28643,343.43585 0,2.29769" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path6485-7" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85112,342.76214 1.36232,0 0,3.63289 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path6487-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.00441,342.76214 0.86787,0 0,0.47429 -0.86787,0 z"/>
+      <path d="m -378.02459,345.94092 0.86786,0 0,0.44402 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6489" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -379.74011,342.31813 0,4.08698" id="path6491" inkscape:path-effect="#path-effect6627-7" inkscape:original-d="m -379.74011,342.31813 0,4.08698" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path6493" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.55056,342.35959 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.4243 c -0.34562,0 -0.89155,0 -1.31692,-1e-5 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15291 0.15641,-0.15291 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -379.85037,342.57042 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18246 1.68872,0 0,-0.90821 -0.44596,0 10e-4,-0.68622 -0.43424,0.0122 -0.004,1.37001 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37277 0.44661,0.0203 0.001,-0.90717 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6495"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.51528,342.35606 c 0.0546,-0.001 0.0995,-0.001 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6497"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -381.38414,342.55187 0,4.02903" inkscape:path-effect="#path-effect6629-35" id="path6499" d="m -381.38414,342.55187 0,4.02903" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="342.75418" x="-377.16425" height="0.41957662" width="8.3515739" id="rect6501" style="fill:url(#linearGradient24142);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient24144);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect6503" width="8.3515739" height="0.41957662" x="-377.16425" y="-346.42047"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -382.56265,347.31155 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.14231 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path6505-3"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -380.76942,347.68177 16.42868,0 0,4.01635 -16.42868,0 0,-0.90823 0.4642,0 -10e-4,-0.6862 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98508 -1.35248,-0.009 0.007,1.37276 -0.46491,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z" style="fill:url(#linearGradient24146);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6507-4"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,348.11907 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6509-7"/>
+      <path id="path6511" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,348.98962 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,349.90299 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6513"/>
+      <path id="path6515" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,350.80208 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,348.50439 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6517"/>
+      <path id="path6519" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,349.41777 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,350.31686 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6521"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -365.00892,348.20469 0,3.11116" inkscape:path-effect="#path-effect6637-85" id="path6523-8" d="m -365.00892,348.20469 0,3.11116" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,348.09053 0.50802,0 0,0.44243 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6525-8"/>
+      <path id="path6527-1" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,350.80208 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -378.10999,347.43405 0,1.02754 10.38952,0" inkscape:path-effect="#path-effect6639-6" id="path6529-6" d="m -378.10999,347.43405 0,1.02754 10.38952,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.80409,348.46159 0,2.4832 1.82672,0" inkscape:path-effect="#path-effect6641-9" id="path6531-3" d="m -369.80409,348.46159 0,2.4832 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.77555,350.94479 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97045" inkscape:path-effect="#path-effect6643-0" id="path6533" d="m -369.77555,350.94479 -8.36298,0 0,0.97045" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -369.57021,348.66026 2.06412,0 0,2.07008 -2.06412,0 z" style="fill:url(#linearGradient24148);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path6535"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -367.28643,348.54721 0,2.2977" inkscape:path-effect="#path-effect6647-8" id="path6537" d="m -367.28643,348.54721 0,2.2977" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -379.85112,347.87349 1.36232,0 0,3.63289 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6539"/>
+      <path d="m -378.00441,347.87349 0.86787,0 0,0.4743 -0.86787,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6541" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path6543" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.02459,351.05227 0.86786,0 0,0.44402 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -379.74011,347.42948 0,4.087" inkscape:path-effect="#path-effect6649-9" id="path6545" d="m -379.74011,347.42948 0,4.087" style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.55056,347.47094 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34562,0 -0.89155,0 -1.31692,-10e-6 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15289 l 0,-4.12343 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6547"/>
+      <path id="path6549" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85037,347.68177 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90824 -0.44596,0 10e-4,-0.68619 -0.43424,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90718 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path6551" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.51528,347.46742 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27042,0 -0.15495,-1e-5 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15301 0.15641,-0.15301 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -381.38414,347.66324 0,4.02902" id="path6553" inkscape:path-effect="#path-effect6651-36" inkscape:original-d="m -381.38414,347.66324 0,4.02902" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient24150);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect6555" width="8.3515739" height="0.41957662" x="-377.16425" y="347.86551"/>
+      <rect y="-351.5318" x="-377.16425" height="0.41957662" width="8.3515739" id="rect6557" style="fill:url(#linearGradient24152);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path6559" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -382.56265,352.41793 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25689 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path6561" style="fill:url(#linearGradient24154);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -380.76942,352.78815 16.42868,0 0,4.01635 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98508 -1.35248,-0.009 0.007,1.37274 -0.46491,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path6563" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,353.22545 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,354.096 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6565"/>
+      <path id="path6567" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,355.00937 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,355.90847 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6569"/>
+      <path id="path6571" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,353.61077 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,354.52414 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6573"/>
+      <path id="path6575" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,355.42324 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -365.00892,353.31107 0,3.11115" id="path6577" inkscape:path-effect="#path-effect6659-0" inkscape:original-d="m -365.00892,353.31107 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path6579" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,353.19691 0.50802,0 0,0.44243 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,355.90847 0.50802,0 0,0.4424 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6581"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -378.10999,352.54043 0,1.02755 10.38952,0" id="path6583" inkscape:path-effect="#path-effect6661-6" inkscape:original-d="m -378.10999,352.54043 0,1.02755 10.38952,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -369.80409,353.56798 0,2.48319 1.82672,0" id="path6585" inkscape:path-effect="#path-effect6663-97" inkscape:original-d="m -369.80409,353.56798 0,2.48319 1.82672,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -369.77555,356.05117 -8.36298,0 0,0.97046" id="path6587" inkscape:path-effect="#path-effect6665-8" inkscape:original-d="m -369.77555,356.05117 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path6589" style="fill:url(#linearGradient24156);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -369.57021,353.76664 2.06412,0 0,2.07009 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -367.28643,353.65359 0,2.29768" id="path6591" inkscape:path-effect="#path-effect6669-9" inkscape:original-d="m -367.28643,353.65359 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path6593" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85112,352.97988 1.36232,0 0,3.63288 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path6595" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.00441,352.97988 0.86787,0 0,0.47429 -0.86787,0 z"/>
+      <path d="m -378.02459,356.15865 0.86786,0 0,0.44402 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6597" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -379.74011,352.53586 0,4.087" id="path6599" inkscape:path-effect="#path-effect6671-41" inkscape:original-d="m -379.74011,352.53586 0,4.087" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path6601" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.55056,352.57732 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34562,0 -0.89155,0 -1.31692,0 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15289 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15291 0.15641,-0.15291 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -379.85037,352.78815 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44596,0 10e-4,-0.68621 -0.43424,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90716 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6603"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.51528,352.57379 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.7e-4 l 5e-5,4.43206 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6605"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -381.38414,352.76962 0,4.02901" inkscape:path-effect="#path-effect6673-5" id="path6607" d="m -381.38414,352.76962 0,4.02901" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="352.97192" x="-377.16425" height="0.41957662" width="8.3515739" id="rect6609" style="fill:url(#linearGradient24158);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient24160);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect6611" width="8.3515739" height="0.41957662" x="-377.16425" y="-356.63818"/>
+      <path inkscape:connector-curvature="0" d="m -441.51671,322.67392 0,15.18517 77.98371,0 -10e-6,-15.18517 -21.30816,-5.86066 -36.01873,0 z" style="fill:url(#linearGradient36602);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16598" sodipodi:nodetypes="ccccccc"/>
+      <rect ry="0" y="322.67377" x="-441.64969" height="15.6214" width="78.530823" id="rect16600" style="fill:url(#linearGradient36600);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -441.64971,322.67373 78.53084,0 0,15.16447 -78.53084,0 z" style="fill:url(#linearGradient36598);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16602"/>
+      <path id="path16604" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -421.26785,322.8331 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.2569 l 0,4.23262 c 0,0.14232 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23262 c 0,-0.14233 0.1146,-0.2569 0.25687,-0.2569 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path16606" style="fill:url(#linearGradient36596);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,323.20333 16.42871,0 0,4.01634 -16.42871,0 0,-0.90821 0.46419,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.35248,-0.009 0.007,1.37277 -0.46488,0.0203 -10e-4,-0.90719 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path16608" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,323.64062 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,324.51118 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16610"/>
+      <path id="path16612" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,325.42454 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,326.32364 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16614"/>
+      <path id="path16616" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,324.02595 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,324.93933 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16618"/>
+      <path id="path16620" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,325.83842 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -403.71413,323.72626 0,3.11115" id="path16622" inkscape:path-effect="#path-effect17260-6" inkscape:original-d="m -403.71413,323.72626 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path16624" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,323.61209 0.50802,0 0,0.4424 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,326.32364 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16626"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -416.81519,322.9556 0,1.02754 10.3895,0" id="path16628" inkscape:path-effect="#path-effect17262-6" inkscape:original-d="m -416.81519,322.9556 0,1.02754 10.3895,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -408.50929,323.98314 0,2.48321 1.82673,0" id="path16630" inkscape:path-effect="#path-effect17264-66" inkscape:original-d="m -408.50929,323.98314 0,2.48321 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.48074,326.46635 -8.36298,0 0,0.97046" id="path16632" inkscape:path-effect="#path-effect17266-7" inkscape:original-d="m -408.48074,326.46635 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97046" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path16634" style="fill:url(#linearGradient36594);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.27541,324.18183 2.06414,0 0,2.07006 -2.06414,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -405.99162,324.06877 0,2.29768" id="path16636" inkscape:path-effect="#path-effect17270-4" inkscape:original-d="m -405.99162,324.06877 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path16638" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -418.55631,323.39506 1.36234,0 0,3.63287 -1.36234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path16640" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.70958,323.39506 0.86784,0 0,0.47428 -0.86784,0 z"/>
+      <path d="m -416.72978,326.57382 0.86786,0 0,0.44404 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16642" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -418.44531,322.95104 0,4.08698" id="path16644" inkscape:path-effect="#path-effect17272-0" inkscape:original-d="m -418.44531,322.95104 0,4.08698" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path16646" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.25574,322.99248 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42431 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.15292 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15643,-0.1529 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,323.20333 1.7578,0 -0.004,0.18722 -0.8343,1.1e-4 -0.0183,3.61086 0.85628,0.0356 0,0.18249 -1.75779,0 0,-0.90823 0.46419,0 -10e-4,-0.6862 0.45201,0.0122 0.004,1.37001 -0.007,-0.007 -0.0122,-3.62143 0.85626,0.0139 -0.83871,-0.009 0.007,1.37275 -0.4649,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16648"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.22048,322.98896 c 0.0546,-0.001 0.0998,-0.001 0.11963,6.6e-4 l 5e-5,4.43208 c -0.34565,0 0.27039,0 -0.15496,-2e-5 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16650"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -419.98945,323.18478 0,4.02904" inkscape:path-effect="#path-effect17274-6" id="path16652" d="m -419.98945,323.18478 0,4.02904" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="323.38708" x="-415.86942" height="0.41957662" width="8.3515739" id="rect16654" style="fill:url(#linearGradient36592);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36590);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect16656" width="8.3515739" height="0.41957662" x="-415.86942" y="-327.05338"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -421.26785,327.94175 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25687 l 0,4.23265 c 0,0.14231 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.1423,0 -0.25687,-0.11461 -0.25687,-0.25689 l 0,-4.23265 c 0,-0.1423 0.1146,-0.25687 0.25687,-0.25687 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path16658"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,328.31197 16.42871,0 0,4.01634 -16.42871,0 0,-0.90821 0.46419,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.36999 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.35248,-0.009 0.007,1.37277 -0.46488,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z" style="fill:url(#linearGradient36588);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16660"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,328.74927 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16662"/>
+      <path id="path16664" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,329.61982 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,330.53318 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16666"/>
+      <path id="path16668" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,331.43228 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,329.1346 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16670"/>
+      <path id="path16672" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,330.04797 0.65648,0 0,0.48521 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,330.94707 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16674"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -403.71413,328.8349 0,3.11115" inkscape:path-effect="#path-effect17282-1" id="path16676" d="m -403.71413,328.8349 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,328.72072 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16678"/>
+      <path id="path16680" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,331.43228 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -416.81519,328.06424 0,1.02754 10.3895,0" inkscape:path-effect="#path-effect17284-2" id="path16682" d="m -416.81519,328.06424 0,1.02754 10.3895,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -408.50929,329.09178 0,2.48321 1.82673,0" inkscape:path-effect="#path-effect17286-1" id="path16684" d="m -408.50929,329.09178 0,2.48321 1.82673,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -408.48074,331.57499 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97046" inkscape:path-effect="#path-effect17288-4" id="path16686" d="m -408.48074,331.57499 -8.36298,0 0,0.97046" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -408.27541,329.29047 2.06414,0 0,2.07006 -2.06414,0 z" style="fill:url(#linearGradient36586);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path16688"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -405.99162,329.17741 0,2.29768" inkscape:path-effect="#path-effect17292-9" id="path16690" d="m -405.99162,329.17741 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -418.55631,328.5037 1.36234,0 0,3.63288 -1.36234,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16692"/>
+      <path d="m -416.70958,328.5037 0.86784,0 0,0.47429 -0.86784,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16694" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path16696" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.72978,331.68246 0.86786,0 0,0.44403 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -418.44531,328.05968 0,4.08698" inkscape:path-effect="#path-effect17294-52" id="path16698" d="m -418.44531,328.05968 0,4.08698" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.25574,328.10112 c 0.36888,-0.004 1.10825,-10e-5 1.31691,0.004 l 0,4.42429 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.15292 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16700"/>
+      <path id="path16702" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,328.31197 1.7578,0 -0.004,0.18722 -0.8343,1.2e-4 -0.0183,3.61085 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.46419,0 -10e-4,-0.68622 0.45201,0.0122 0.004,1.36999 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.0138 -0.83871,-0.009 0.007,1.37276 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path16704" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.22048,328.0976 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.7e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15304 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -419.98945,328.29342 0,4.02904" id="path16706" inkscape:path-effect="#path-effect17296-3" inkscape:original-d="m -419.98945,328.29342 0,4.02904" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36584);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect16708" width="8.3515739" height="0.41957662" x="-415.86942" y="328.49579"/>
+      <rect y="-332.16205" x="-415.86942" height="0.41957662" width="8.3515739" id="rect16710" style="fill:url(#linearGradient36582);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path16712" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -421.26785,333.04406 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25687 l 0,4.23265 c 0,0.14232 -0.1146,0.2569 -0.25688,0.2569 l -18.39573,0 c -0.1423,0 -0.25687,-0.11461 -0.25687,-0.2569 l 0,-4.23265 c 0,-0.1423 0.1146,-0.25687 0.25687,-0.25687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path16714" style="fill:url(#linearGradient36580);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,333.41426 16.42871,0 0,4.01637 -16.42871,0 0,-0.90823 0.46419,0 -0.001,-0.6862 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.61529 -0.0142,-0.98506 -1.35248,-0.009 0.007,1.37275 -0.46488,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path16716" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,333.85158 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,334.72214 0.65649,0 0,0.48521 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16718"/>
+      <path id="path16720" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,335.63549 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,336.53459 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16722"/>
+      <path id="path16724" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,334.23691 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,335.15026 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16726"/>
+      <path id="path16728" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,336.04936 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -403.71413,333.93721 0,3.11115" id="path16730" inkscape:path-effect="#path-effect17304-16" inkscape:original-d="m -403.71413,333.93721 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path16732" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,333.82304 0.50802,0 0,0.44242 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,336.53459 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16734"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -416.81519,333.16656 0,1.02753 10.3895,0" id="path16736" inkscape:path-effect="#path-effect17306-88" inkscape:original-d="m -416.81519,333.16656 0,1.02753 10.3895,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -408.50929,334.19409 0,2.48322 1.82673,0" id="path16738" inkscape:path-effect="#path-effect17308-27" inkscape:original-d="m -408.50929,334.19409 0,2.48322 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.48074,336.67731 -8.36298,0 0,0.97044" id="path16740" inkscape:path-effect="#path-effect17310-71" inkscape:original-d="m -408.48074,336.67731 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97044" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path16742" style="fill:url(#linearGradient36578);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.27541,334.39279 2.06414,0 0,2.07006 -2.06414,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -405.99162,334.27972 0,2.29768" id="path16744" inkscape:path-effect="#path-effect17314-9" inkscape:original-d="m -405.99162,334.27972 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path16746" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -418.55631,333.606 1.36234,0 0,3.6329 -1.36234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path16748" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.70958,333.606 0.86784,0 0,0.4743 -0.86784,0 z"/>
+      <path d="m -416.72978,336.78478 0.86786,0 0,0.44402 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16750" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -418.44531,333.16199 0,4.08698" id="path16752" inkscape:path-effect="#path-effect17316-4" inkscape:original-d="m -418.44531,333.16199 0,4.08698" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path16754" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.25574,333.20344 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42431 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.15291 l 0,-4.12342 c 0,-0.0846 0.0697,-0.1529 0.15643,-0.1529 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,333.41426 1.7578,0 -0.004,0.18723 -0.8343,1.2e-4 -0.0183,3.61087 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90822 0.46419,0 -10e-4,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.6214 0.85626,0.0139 -0.83871,-0.009 0.007,1.37278 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16756"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.22048,333.19992 c 0.0546,-0.001 0.0998,-0.001 0.11963,6.7e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,-10e-6 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15303 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16758"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -419.98945,333.39574 0,4.02902" inkscape:path-effect="#path-effect17318-60" id="path16760" d="m -419.98945,333.39574 0,4.02902" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="333.59805" x="-415.86942" height="0.41957662" width="8.3515739" id="rect16762" style="fill:url(#linearGradient36576);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36574);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect16764" width="8.3515739" height="0.41957662" x="-415.86942" y="-337.26437"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -440.62416,322.8331 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.2569 l 0,4.23262 c 0,0.14232 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25688 l 0,-4.23262 c 0,-0.14233 0.11461,-0.2569 0.2569,-0.2569 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path16766"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,323.20333 16.42872,0 0,4.01634 -16.42872,0 0,-0.90821 0.4642,0 -10e-4,-0.68622 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.3525,-0.009 0.007,1.37277 -0.46489,0.0203 -0.001,-0.90719 -0.45861,-0.0213 z" style="fill:url(#linearGradient36572);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16768"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,323.64062 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16770"/>
+      <path id="path16772" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,324.51118 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,325.42454 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16774"/>
+      <path id="path16776" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,326.32364 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,324.02595 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16778"/>
+      <path id="path16780" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,324.93933 0.65649,0 0,0.48521 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,325.83842 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16782"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -423.07046,323.72626 0,3.11115" inkscape:path-effect="#path-effect17326-8" id="path16784" d="m -423.07046,323.72626 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,323.61209 0.50801,0 0,0.4424 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16786"/>
+      <path id="path16788" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,326.32364 0.50801,0 0,0.44241 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -436.17152,322.9556 0,1.02754 10.38953,0" inkscape:path-effect="#path-effect17328-8" id="path16790" d="m -436.17152,322.9556 0,1.02754 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.8656,323.98314 0,2.48321 1.82672,0" inkscape:path-effect="#path-effect17330-1" id="path16792" d="m -427.8656,323.98314 0,2.48321 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.83708,326.46635 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97046" inkscape:path-effect="#path-effect17332-2" id="path16794" d="m -427.83708,326.46635 -8.36298,0 0,0.97046" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -427.63173,324.18183 2.06412,0 0,2.07006 -2.06412,0 z" style="fill:url(#linearGradient36570);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path16796"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -425.34794,324.06877 0,2.29768" inkscape:path-effect="#path-effect17336-8" id="path16798" d="m -425.34794,324.06877 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -437.91264,323.39506 1.36233,0 0,3.63287 -1.36233,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16800"/>
+      <path d="m -436.06592,323.39506 0.86786,0 0,0.47428 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16802" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path16804" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.08611,326.57382 0.86786,0 0,0.44404 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -437.80163,322.95104 0,4.08698" inkscape:path-effect="#path-effect17338-245" id="path16806" d="m -437.80163,322.95104 0,4.08698" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.61207,322.99248 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42431 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.15292 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15643,-0.1529 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16808"/>
+      <path id="path16810" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,323.20333 1.75781,0 -0.004,0.18722 -0.83431,1.1e-4 -0.0183,3.61086 0.85629,0.0356 0,0.18249 -1.75779,0 0,-0.90823 0.4642,0 -0.001,-0.6862 0.45201,0.0122 0.004,1.37001 -0.007,-0.007 -0.0122,-3.62143 0.85627,0.0139 -0.83871,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path16812" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.57679,322.98896 c 0.0546,-0.001 0.0996,-0.001 0.11961,6.6e-4 l 4e-5,4.43208 c -0.34564,0 0.27041,0 -0.15495,-2e-5 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -439.34576,323.18478 0,4.02904" id="path16814" inkscape:path-effect="#path-effect17340-2" inkscape:original-d="m -439.34576,323.18478 0,4.02904" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36568);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect16816" width="8.3515739" height="0.41957662" x="-435.22577" y="323.38708"/>
+      <rect y="-327.05338" x="-435.22577" height="0.41957662" width="8.3515739" id="rect16818" style="fill:url(#linearGradient36566);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path16820" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -440.62416,327.94175 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25687 l 0,4.23265 c 0,0.14231 -0.1146,0.25689 -0.25689,0.25689 l -18.39572,0 c -0.14231,0 -0.2569,-0.11461 -0.2569,-0.25689 l 0,-4.23265 c 0,-0.1423 0.11461,-0.25687 0.2569,-0.25687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path16822" style="fill:url(#linearGradient36564);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,328.31197 16.42872,0 0,4.01634 -16.42872,0 0,-0.90821 0.4642,0 -10e-4,-0.68622 0.45202,0.0122 0.004,1.36999 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98506 -1.3525,-0.009 0.007,1.37277 -0.46489,0.0203 -0.001,-0.90718 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path16824" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,328.74927 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,329.61982 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16826"/>
+      <path id="path16828" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,330.53318 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,331.43228 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16830"/>
+      <path id="path16832" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,329.1346 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,330.04797 0.65649,0 0,0.48521 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16834"/>
+      <path id="path16836" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,330.94707 0.65649,0 0,0.48521 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -423.07046,328.8349 0,3.11115" id="path16838" inkscape:path-effect="#path-effect17348-6" inkscape:original-d="m -423.07046,328.8349 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path16840" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,328.72072 0.50801,0 0,0.44241 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,331.43228 0.50801,0 0,0.44241 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16842"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -436.17152,328.06424 0,1.02754 10.38953,0" id="path16844" inkscape:path-effect="#path-effect17350-98" inkscape:original-d="m -436.17152,328.06424 0,1.02754 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -427.8656,329.09178 0,2.48321 1.82672,0" id="path16846" inkscape:path-effect="#path-effect17352-6" inkscape:original-d="m -427.8656,329.09178 0,2.48321 1.82672,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -427.83708,331.57499 -8.36298,0 0,0.97046" id="path16848" inkscape:path-effect="#path-effect17354-6" inkscape:original-d="m -427.83708,331.57499 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97046" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path16850" style="fill:url(#linearGradient36562);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -427.63173,329.29047 2.06412,0 0,2.07006 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -425.34794,329.17741 0,2.29768" id="path16852" inkscape:path-effect="#path-effect17358-6" inkscape:original-d="m -425.34794,329.17741 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path16854" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -437.91264,328.5037 1.36233,0 0,3.63288 -1.36233,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path16856" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.06592,328.5037 0.86786,0 0,0.47429 -0.86786,0 z"/>
+      <path d="m -436.08611,331.68246 0.86786,0 0,0.44403 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16858" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -437.80163,328.05968 0,4.08698" id="path16860" inkscape:path-effect="#path-effect17360-2" inkscape:original-d="m -437.80163,328.05968 0,4.08698" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path16862" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.61207,328.10112 c 0.36888,-0.004 1.10825,-10e-5 1.31692,0.004 l 0,4.42429 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.15292 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,328.31197 1.75781,0 -0.004,0.18722 -0.83431,1.2e-4 -0.0183,3.61085 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.36999 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.0138 -0.83871,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16864"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.57679,328.0976 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.7e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15304 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16866"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -439.34576,328.29342 0,4.02904" inkscape:path-effect="#path-effect17362-7" id="path16868" d="m -439.34576,328.29342 0,4.02904" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="328.49579" x="-435.22577" height="0.41957662" width="8.3515739" id="rect16870" style="fill:url(#linearGradient36560);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36558);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect16872" width="8.3515739" height="0.41957662" x="-435.22577" y="-332.16205"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -440.62416,333.04406 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25687 l 0,4.23265 c 0,0.14232 -0.1146,0.2569 -0.25689,0.2569 l -18.39572,0 c -0.14231,0 -0.2569,-0.11461 -0.2569,-0.2569 l 0,-4.23265 c 0,-0.1423 0.11461,-0.25687 0.2569,-0.25687 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path16874"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,333.41426 16.42872,0 0,4.01637 -16.42872,0 0,-0.90823 0.4642,0 -10e-4,-0.6862 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.61529 -0.0142,-0.98506 -1.3525,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90717 -0.45861,-0.0213 z" style="fill:url(#linearGradient36556);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16876"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,333.85158 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16878"/>
+      <path id="path16880" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,334.72214 0.65648,0 0,0.48521 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,335.63549 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16882"/>
+      <path id="path16884" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,336.53459 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,334.23691 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16886"/>
+      <path id="path16888" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,335.15026 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,336.04936 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16890"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -423.07046,333.93721 0,3.11115" inkscape:path-effect="#path-effect17370-8" id="path16892" d="m -423.07046,333.93721 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,333.82304 0.50801,0 0,0.44242 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16894"/>
+      <path id="path16896" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,336.53459 0.50801,0 0,0.44241 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -436.17152,333.16656 0,1.02753 10.38953,0" inkscape:path-effect="#path-effect17372-0" id="path16898" d="m -436.17152,333.16656 0,1.02753 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.8656,334.19409 0,2.48322 1.82672,0" inkscape:path-effect="#path-effect17374-2" id="path16900" d="m -427.8656,334.19409 0,2.48322 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.83708,336.67731 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97044" inkscape:path-effect="#path-effect17376-0" id="path16902" d="m -427.83708,336.67731 -8.36298,0 0,0.97044" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -427.63173,334.39279 2.06412,0 0,2.07006 -2.06412,0 z" style="fill:url(#linearGradient36554);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path16904"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -425.34794,334.27972 0,2.29768" inkscape:path-effect="#path-effect17380-8" id="path16906" d="m -425.34794,334.27972 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -437.91264,333.606 1.36233,0 0,3.6329 -1.36233,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16908"/>
+      <path d="m -436.06592,333.606 0.86786,0 0,0.4743 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16910" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path16912" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.08611,336.78478 0.86786,0 0,0.44402 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -437.80163,333.16199 0,4.08698" inkscape:path-effect="#path-effect17382-2" id="path16914" d="m -437.80163,333.16199 0,4.08698" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.61207,333.20344 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42431 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.15291 l 0,-4.12342 c 0,-0.0846 0.0697,-0.1529 0.15643,-0.1529 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16916"/>
+      <path id="path16918" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,333.41426 1.75781,0 -0.004,0.18723 -0.83431,1.2e-4 -0.0183,3.61087 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.6214 0.85627,0.0139 -0.83871,-0.009 0.007,1.37278 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path16920" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.57679,333.19992 c 0.0546,-0.001 0.0996,-0.001 0.11961,6.7e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,-10e-6 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15303 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15642,-0.15304 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -439.34576,333.39574 0,4.02902" id="path16922" inkscape:path-effect="#path-effect17384-05" inkscape:original-d="m -439.34576,333.39574 0,4.02902" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36552);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect16924" width="8.3515739" height="0.41957662" x="-435.22577" y="333.59805"/>
+      <rect y="-337.26437" x="-435.22577" height="0.41957662" width="8.3515739" id="rect16926" style="fill:url(#linearGradient36550);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path16928" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -401.89641,322.8331 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.2569 l 0,4.23262 c 0,0.14232 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25688 l 0,-4.23262 c 0,-0.14233 0.1146,-0.2569 0.25689,-0.2569 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path16930" style="fill:url(#linearGradient36548);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -400.10319,323.20333 16.42872,0 0,4.01634 -16.42872,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45202,0.0122 0.004,1.37001 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.35247,-0.009 0.007,1.37277 -0.46491,0.0203 -10e-4,-0.90719 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path16932" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,323.64062 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,324.51118 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16934"/>
+      <path id="path16936" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,325.42454 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,326.32364 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16938"/>
+      <path id="path16940" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,324.02595 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,324.93933 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16942"/>
+      <path id="path16944" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,325.83842 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -384.34269,323.72626 0,3.11115" id="path16946" inkscape:path-effect="#path-effect17392-7" inkscape:original-d="m -384.34269,323.72626 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path16948" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,323.61209 0.50802,0 0,0.4424 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,326.32364 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16950"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -397.44375,322.9556 0,1.02754 10.38953,0" id="path16952" inkscape:path-effect="#path-effect17394-8" inkscape:original-d="m -397.44375,322.9556 0,1.02754 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -389.13785,323.98314 0,2.48321 1.82673,0" id="path16954" inkscape:path-effect="#path-effect17396-7" inkscape:original-d="m -389.13785,323.98314 0,2.48321 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -389.10931,326.46635 -8.36298,0 0,0.97046" id="path16956" inkscape:path-effect="#path-effect17398-8" inkscape:original-d="m -389.10931,326.46635 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path16958" style="fill:url(#linearGradient36546);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -388.90396,324.18183 2.06412,0 0,2.07006 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -386.62019,324.06877 0,2.29768" id="path16960" inkscape:path-effect="#path-effect17402-9" inkscape:original-d="m -386.62019,324.06877 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path16962" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18487,323.39506 1.36232,0 0,3.63287 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path16964" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.33816,323.39506 0.86786,0 0,0.47428 -0.86786,0 z"/>
+      <path d="m -397.35834,326.57382 0.86785,0 0,0.44404 -0.86785,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16966" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -399.07387,322.95104 0,4.08698" id="path16968" inkscape:path-effect="#path-effect17404-5" inkscape:original-d="m -399.07387,322.95104 0,4.08698" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path16970" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.88432,322.99248 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42431 c -0.34563,0 -0.89156,0 -1.31693,0 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15292 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -399.18412,323.20333 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61086 -0.82262,0.0356 0,0.18249 1.68872,0 0,-0.90823 -0.44597,0 10e-4,-0.6862 -0.43426,0.0122 -0.004,1.37001 0.005,-0.007 0.0108,-3.62143 -0.82262,0.0139 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90717 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16972"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.84903,322.98896 c 0.0546,-0.001 0.0995,-0.001 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27041,0 -0.15496,-2e-5 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15641,-0.15304 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16974"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -400.7179,323.18478 0,4.02904" inkscape:path-effect="#path-effect17406-89" id="path16976" d="m -400.7179,323.18478 0,4.02904" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="323.38708" x="-396.49802" height="0.41957662" width="8.3515739" id="rect16978" style="fill:url(#linearGradient36544);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36542);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect16980" width="8.3515739" height="0.41957662" x="-396.49802" y="-327.05338"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -401.89641,327.94445 18.39573,0 c 0.14231,0 0.25688,0.11461 0.25688,0.2569 l 0,4.23264 c 0,0.1423 -0.11459,0.25687 -0.25688,0.25687 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25687 l 0,-4.23264 c 0,-0.14232 0.1146,-0.2569 0.25689,-0.2569 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path16982"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -400.10319,328.31468 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68622 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61529 -0.0142,-0.98506 -1.35247,-0.009 0.007,1.37275 -0.46491,0.0203 -10e-4,-0.90717 -0.45861,-0.0213 z" style="fill:url(#linearGradient36540);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16984"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,328.75198 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16986"/>
+      <path id="path16988" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,329.62253 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,330.53589 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16990"/>
+      <path id="path16992" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,331.43499 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,329.13731 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16994"/>
+      <path id="path16996" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,330.05068 0.65648,0 0,0.48521 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,330.94977 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path16998"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -384.34269,328.83761 0,3.11115" inkscape:path-effect="#path-effect17414-0" id="path17000" d="m -384.34269,328.83761 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,328.72343 0.50802,0 0,0.44243 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17002"/>
+      <path id="path17004" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,331.43499 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -397.44375,328.06695 0,1.02755 10.38953,0" inkscape:path-effect="#path-effect17416-00" id="path17006" d="m -397.44375,328.06695 0,1.02755 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -389.13785,329.0945 0,2.4832 1.82673,0" inkscape:path-effect="#path-effect17418-7" id="path17008" d="m -389.13785,329.0945 0,2.4832 1.82673,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -389.10931,331.5777 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:path-effect="#path-effect17420-2" id="path17010" d="m -389.10931,331.5777 -8.36298,0 0,0.97046" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -388.90396,329.29318 2.06412,0 0,2.07008 -2.06412,0 z" style="fill:url(#linearGradient36538);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path17012"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -386.62019,329.18013 0,2.29768" inkscape:path-effect="#path-effect17424-5" id="path17014" d="m -386.62019,329.18013 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -399.18487,328.50641 1.36232,0 0,3.63287 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17016"/>
+      <path d="m -397.33816,328.50641 0.86786,0 0,0.47429 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17018" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path17020" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.35834,331.68518 0.86785,0 0,0.44403 -0.86785,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -399.07387,328.06239 0,4.08699" inkscape:path-effect="#path-effect17426-52" id="path17022" d="m -399.07387,328.06239 0,4.08699" style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.88432,328.10386 c 0.3689,-0.004 1.10827,-1.3e-4 1.31693,0.004 l 0,4.4243 c -0.34563,0 -0.89156,0 -1.31693,-10e-6 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15289 0.15641,-0.15289 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17024"/>
+      <path id="path17026" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18412,328.31468 -1.68872,0 0.003,0.18722 0.80152,1.1e-4 0.0176,3.61086 -0.82262,0.0356 0,0.18248 1.68872,0 0,-0.90823 -0.44597,0 10e-4,-0.68622 -0.43426,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62142 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90717 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path17028" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.84903,328.10031 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15304 0.15641,-0.15304 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -400.7179,328.29614 0,4.02903" id="path17030" inkscape:path-effect="#path-effect17428-1" inkscape:original-d="m -400.7179,328.29614 0,4.02903" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36536);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17032" width="8.3515739" height="0.41957662" x="-396.49802" y="328.49844"/>
+      <rect y="-332.16473" x="-396.49802" height="0.41957662" width="8.3515739" id="rect17034" style="fill:url(#linearGradient36534);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path17036" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -401.89641,333.05084 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25689 l 0,4.23264 c 0,0.1423 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.11461 -0.25689,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25689 0.25689,-0.25689 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path17038" style="fill:url(#linearGradient36532);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -400.10319,333.42106 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68622 0.45202,0.0122 0.004,1.37 1.3351,-0.0138 0.0309,-2.6153 -0.0142,-0.98505 -1.35247,-0.009 0.007,1.37276 -0.46491,0.0203 -10e-4,-0.90719 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path17040" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,333.85837 0.65647,0 0,0.48522 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,334.72892 0.65647,0 0,0.48522 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17042"/>
+      <path id="path17044" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,335.64229 0.65647,0 0,0.48521 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,336.54138 0.65647,0 0,0.48522 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17046"/>
+      <path id="path17048" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,334.24369 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,335.15706 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17050"/>
+      <path id="path17052" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,336.05615 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -384.34269,333.94399 0,3.11115" id="path17054" inkscape:path-effect="#path-effect17436-86" inkscape:original-d="m -384.34269,333.94399 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path17056" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,333.82982 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,336.54138 0.50802,0 0,0.4424 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17058"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -397.44375,333.17333 0,1.02754 10.38953,0" id="path17060" inkscape:path-effect="#path-effect17438-46" inkscape:original-d="m -397.44375,333.17333 0,1.02754 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -389.13785,334.20087 0,2.48321 1.82673,0" id="path17062" inkscape:path-effect="#path-effect17440-89" inkscape:original-d="m -389.13785,334.20087 0,2.48321 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -389.10931,336.68408 -8.36298,0 0,0.97046" id="path17064" inkscape:path-effect="#path-effect17442-8" inkscape:original-d="m -389.10931,336.68408 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path17066" style="fill:url(#linearGradient36530);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -388.90396,334.39956 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -386.62019,334.28651 0,2.29767" id="path17068" inkscape:path-effect="#path-effect17446-3" inkscape:original-d="m -386.62019,334.28651 0,2.29767" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17070" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18487,333.61279 1.36232,0 0,3.63288 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path17072" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.33816,333.61279 0.86786,0 0,0.47428 -0.86786,0 z"/>
+      <path d="m -397.35834,336.79156 0.86785,0 0,0.44403 -0.86785,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17074" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -399.07387,333.16877 0,4.08699" id="path17076" inkscape:path-effect="#path-effect17448-5" inkscape:original-d="m -399.07387,333.16877 0,4.08699" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17078" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.88432,333.21022 c 0.3689,-0.004 1.10827,-1.2e-4 1.31693,0.004 l 0,4.4243 c -0.34563,0 -0.89156,0 -1.31693,-2e-5 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -399.18412,333.42106 -1.68872,0 0.003,0.18722 0.80152,1.2e-4 0.0176,3.61085 -0.82262,0.0356 0,0.18248 1.68872,0 0,-0.90823 -0.44597,0 10e-4,-0.68622 -0.43426,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62142 -0.82262,0.014 0.80576,-0.009 -0.007,1.37275 0.44663,0.0203 10e-4,-0.90718 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17080"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.84903,333.20669 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.7e-4 l 5e-5,4.43207 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17082"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -400.7179,333.40252 0,4.02903" inkscape:path-effect="#path-effect17450-5" id="path17084" d="m -400.7179,333.40252 0,4.02903" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="333.60483" x="-396.49802" height="0.41957662" width="8.3515739" id="rect17086" style="fill:url(#linearGradient36528);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36526);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17088" width="8.3515739" height="0.41957662" x="-396.49802" y="-337.27112"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -382.56265,322.8331 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.2569 l 0,4.23262 c 0,0.14232 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23262 c 0,-0.14233 0.1146,-0.2569 0.25687,-0.2569 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path17090"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -380.76942,323.20333 16.42868,0 0,4.01634 -16.42868,0 0,-0.90821 0.4642,0 -10e-4,-0.68622 0.45199,0.0122 0.004,1.37001 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98507 -1.35248,-0.009 0.007,1.37277 -0.46491,0.0203 -0.001,-0.90719 -0.45862,-0.0213 z" style="fill:url(#linearGradient36524);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17092"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,323.64062 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17094"/>
+      <path id="path17096" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,324.51118 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,325.42454 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17098"/>
+      <path id="path17100" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,326.32364 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,324.02595 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17102"/>
+      <path id="path17104" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,324.93933 0.65649,0 0,0.48521 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,325.83842 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17106"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -365.00892,323.72626 0,3.11115" inkscape:path-effect="#path-effect17458-5" id="path17108" d="m -365.00892,323.72626 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,323.61209 0.50802,0 0,0.4424 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17110"/>
+      <path id="path17112" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,326.32364 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -378.10999,322.9556 0,1.02754 10.38952,0" inkscape:path-effect="#path-effect17460-5" id="path17114" d="m -378.10999,322.9556 0,1.02754 10.38952,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.80409,323.98314 0,2.48321 1.82672,0" inkscape:path-effect="#path-effect17462-8" id="path17116" d="m -369.80409,323.98314 0,2.48321 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.77555,326.46635 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:path-effect="#path-effect17464-4" id="path17118" d="m -369.77555,326.46635 -8.36298,0 0,0.97046" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -369.57021,324.18183 2.06412,0 0,2.07006 -2.06412,0 z" style="fill:url(#linearGradient36522);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path17120"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -367.28643,324.06877 0,2.29768" inkscape:path-effect="#path-effect17468-0" id="path17122" d="m -367.28643,324.06877 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -379.85112,323.39506 1.36232,0 0,3.63287 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17124"/>
+      <path d="m -378.00441,323.39506 0.86787,0 0,0.47428 -0.86787,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17126" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path17128" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.02459,326.57382 0.86786,0 0,0.44404 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -379.74011,322.95104 0,4.08698" inkscape:path-effect="#path-effect17470-5" id="path17130" d="m -379.74011,322.95104 0,4.08698" style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.55056,322.99248 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42431 c -0.34562,0 -0.89155,0 -1.31692,0 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15292 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17132"/>
+      <path id="path17134" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85037,323.20333 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61086 -0.82263,0.0356 0,0.18249 1.68872,0 0,-0.90823 -0.44596,0 10e-4,-0.6862 -0.43424,0.0122 -0.004,1.37001 0.005,-0.007 0.0108,-3.62143 -0.82261,0.0139 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90717 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path17136" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.51528,322.98896 c 0.0546,-0.001 0.0995,-0.001 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27042,0 -0.15495,-2e-5 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12662 c 0,-0.0848 0.0697,-0.15304 0.15641,-0.15304 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -381.38414,323.18478 0,4.02904" id="path17138" inkscape:path-effect="#path-effect17472-4" inkscape:original-d="m -381.38414,323.18478 0,4.02904" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36520);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17140" width="8.3515739" height="0.41957662" x="-377.16425" y="323.38708"/>
+      <rect y="-327.05338" x="-377.16425" height="0.41957662" width="8.3515739" id="rect17142" style="fill:url(#linearGradient36518);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path17144" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -382.56265,327.94445 18.39573,0 c 0.14232,0 0.25688,0.11461 0.25688,0.2569 l 0,4.23264 c 0,0.1423 -0.1146,0.25687 -0.25688,0.25687 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25687 l 0,-4.23264 c 0,-0.14232 0.1146,-0.2569 0.25687,-0.2569 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path17146" style="fill:url(#linearGradient36516);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -380.76942,328.31468 16.42868,0 0,4.01635 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68622 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61529 -0.0143,-0.98506 -1.35248,-0.009 0.007,1.37275 -0.46491,0.0203 -0.001,-0.90717 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path17148" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,328.75198 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,329.62253 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17150"/>
+      <path id="path17152" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,330.53589 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,331.43499 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17154"/>
+      <path id="path17156" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,329.13731 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,330.05068 0.65649,0 0,0.48521 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17158"/>
+      <path id="path17160" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,330.94977 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -365.00892,328.83761 0,3.11115" id="path17162" inkscape:path-effect="#path-effect17480-2" inkscape:original-d="m -365.00892,328.83761 0,3.11115" inkscape:connector-curvature="0"/>
+      <path id="path17164" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,328.72343 0.50802,0 0,0.44243 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,331.43499 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17166"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -378.10999,328.06695 0,1.02755 10.38952,0" id="path17168" inkscape:path-effect="#path-effect17482-1" inkscape:original-d="m -378.10999,328.06695 0,1.02755 10.38952,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -369.80409,329.0945 0,2.4832 1.82672,0" id="path17170" inkscape:path-effect="#path-effect17484-4" inkscape:original-d="m -369.80409,329.0945 0,2.4832 1.82672,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -369.77555,331.5777 -8.36298,0 0,0.97046" id="path17172" inkscape:path-effect="#path-effect17486-9" inkscape:original-d="m -369.77555,331.5777 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path17174" style="fill:url(#linearGradient36514);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -369.57021,329.29318 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -367.28643,329.18013 0,2.29768" id="path17176" inkscape:path-effect="#path-effect17490-9" inkscape:original-d="m -367.28643,329.18013 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17178" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85112,328.50641 1.36232,0 0,3.63287 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path17180" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.00441,328.50641 0.86787,0 0,0.47429 -0.86787,0 z"/>
+      <path d="m -378.02459,331.68518 0.86786,0 0,0.44403 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17182" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -379.74011,328.06239 0,4.08699" id="path17184" inkscape:path-effect="#path-effect17492-0" inkscape:original-d="m -379.74011,328.06239 0,4.08699" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17186" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.55056,328.10386 c 0.36889,-0.004 1.10827,-1.3e-4 1.31692,0.004 l 0,4.4243 c -0.34562,0 -0.89155,0 -1.31692,-10e-6 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15289 0.15641,-0.15289 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -379.85037,328.31468 -1.68871,0 0.003,0.18722 0.80151,1.1e-4 0.0176,3.61086 -0.82263,0.0356 0,0.18248 1.68872,0 0,-0.90823 -0.44596,0 10e-4,-0.68622 -0.43424,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62142 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90717 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17188"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.51528,328.10031 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15304 0.15641,-0.15304 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17190"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -381.38414,328.29614 0,4.02903" inkscape:path-effect="#path-effect17494-3" id="path17192" d="m -381.38414,328.29614 0,4.02903" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="328.49844" x="-377.16425" height="0.41957662" width="8.3515739" id="rect17194" style="fill:url(#linearGradient36512);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36510);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17196" width="8.3515739" height="0.41957662" x="-377.16425" y="-332.16473"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -382.56265,333.05084 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25689 l 0,4.23264 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.11461 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25689 0.25687,-0.25689 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path17198"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -380.76942,333.42106 16.42868,0 0,4.01635 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68622 0.45199,0.0122 0.004,1.37 1.33509,-0.0138 0.0309,-2.6153 -0.0143,-0.98505 -1.35248,-0.009 0.007,1.37276 -0.46491,0.0203 -0.001,-0.90719 -0.45862,-0.0213 z" style="fill:url(#linearGradient36508);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17200"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,333.85837 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17202"/>
+      <path id="path17204" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,334.72892 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,335.64229 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17206"/>
+      <path id="path17208" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,336.54138 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,334.24369 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17210"/>
+      <path id="path17212" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,335.15706 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,336.05615 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17214"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -365.00892,333.94399 0,3.11115" inkscape:path-effect="#path-effect17502-3" id="path17216" d="m -365.00892,333.94399 0,3.11115" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,333.82982 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17218"/>
+      <path id="path17220" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,336.54138 0.50802,0 0,0.4424 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -378.10999,333.17333 0,1.02754 10.38952,0" inkscape:path-effect="#path-effect17504-5" id="path17222" d="m -378.10999,333.17333 0,1.02754 10.38952,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.80409,334.20087 0,2.48321 1.82672,0" inkscape:path-effect="#path-effect17506-0" id="path17224" d="m -369.80409,334.20087 0,2.48321 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.77555,336.68408 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:path-effect="#path-effect17508-7" id="path17226" d="m -369.77555,336.68408 -8.36298,0 0,0.97046" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -369.57021,334.39956 2.06412,0 0,2.07008 -2.06412,0 z" style="fill:url(#linearGradient36506);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path17228"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -367.28643,334.28651 0,2.29767" inkscape:path-effect="#path-effect17512-6" id="path17230" d="m -367.28643,334.28651 0,2.29767" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -379.85112,333.61279 1.36232,0 0,3.63288 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17232"/>
+      <path d="m -378.00441,333.61279 0.86787,0 0,0.47428 -0.86787,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17234" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path17236" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.02459,336.79156 0.86786,0 0,0.44403 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -379.74011,333.16877 0,4.08699" inkscape:path-effect="#path-effect17514-7" id="path17238" d="m -379.74011,333.16877 0,4.08699" style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.55056,333.21022 c 0.36889,-0.004 1.10827,-1.2e-4 1.31692,0.004 l 0,4.4243 c -0.34562,0 -0.89155,0 -1.31692,-2e-5 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.1529 0.15641,-0.1529 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17240"/>
+      <path id="path17242" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85037,333.42106 -1.68871,0 0.003,0.18722 0.80151,1.2e-4 0.0176,3.61085 -0.82263,0.0356 0,0.18248 1.68872,0 0,-0.90823 -0.44596,0 10e-4,-0.68622 -0.43424,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62142 -0.82261,0.014 0.80576,-0.009 -0.007,1.37275 0.44661,0.0203 0.001,-0.90718 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path17244" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.51528,333.20669 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.7e-4 l 5e-5,4.43207 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15301 l 0,-4.12665 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -381.38414,333.40252 0,4.02903" id="path17246" inkscape:path-effect="#path-effect17516-8" inkscape:original-d="m -381.38414,333.40252 0,4.02903" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36504);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17248" width="8.3515739" height="0.41957662" x="-377.16425" y="333.60483"/>
+      <rect y="-337.27112" x="-377.16425" height="0.41957662" width="8.3515739" id="rect17250" style="fill:url(#linearGradient36502);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path inkscape:connector-curvature="0" d="m -441.51671,303.30682 0,15.18517 77.98371,0 -10e-6,-15.18517 -21.30816,-5.86064 -36.01873,0 z" style="fill:url(#linearGradient36500);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17522" sodipodi:nodetypes="ccccccc"/>
+      <rect ry="0" y="303.3067" x="-441.64969" height="15.6214" width="78.530823" id="rect17524" style="fill:url(#linearGradient36498);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -441.64971,303.30664 78.53084,0 0,15.16448 -78.53084,0 z" style="fill:url(#linearGradient36496);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17526"/>
+      <path id="path17528" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -421.26785,303.46601 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path17530" style="fill:url(#linearGradient36494);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,303.83622 16.42871,0 0,4.01636 -16.42871,0 0,-0.90822 0.46419,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.61527 -0.0142,-0.98506 -1.35248,-0.009 0.007,1.37277 -0.46488,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path17532" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,304.27354 0.65649,0 0,0.48521 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,305.14408 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17534"/>
+      <path id="path17536" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,306.05745 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,306.95655 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17538"/>
+      <path id="path17540" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,304.65886 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,305.57223 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17542"/>
+      <path id="path17544" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,306.47132 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -403.71413,304.35917 0,3.11114" id="path17546" inkscape:path-effect="#path-effect18838-1" inkscape:original-d="m -403.71413,304.35917 0,3.11114" inkscape:connector-curvature="0"/>
+      <path id="path17548" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,304.245 0.50802,0 0,0.4424 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,306.95655 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17550"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -416.81519,303.58852 0,1.02754 10.3895,0" id="path17552" inkscape:path-effect="#path-effect18840-9" inkscape:original-d="m -416.81519,303.58852 0,1.02754 10.3895,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -408.50929,304.61606 0,2.48321 1.82673,0" id="path17554" inkscape:path-effect="#path-effect18842-5" inkscape:original-d="m -408.50929,304.61606 0,2.48321 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.48074,307.09927 -8.36298,0 0,0.97044" id="path17556" inkscape:path-effect="#path-effect18844-5" inkscape:original-d="m -408.48074,307.09927 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97044" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path17558" style="fill:url(#linearGradient36492);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.27541,304.81473 2.06414,0 0,2.07008 -2.06414,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -405.99162,304.70167 0,2.29768" id="path17560" inkscape:path-effect="#path-effect18848-7" inkscape:original-d="m -405.99162,304.70167 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17562" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -418.55631,304.02796 1.36234,0 0,3.63289 -1.36234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path17564" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.70958,304.02796 0.86784,0 0,0.47429 -0.86784,0 z"/>
+      <path d="m -416.72978,307.20672 0.86786,0 0,0.44403 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17566" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -418.44531,303.58393 0,4.087" id="path17568" inkscape:path-effect="#path-effect18850-4" inkscape:original-d="m -418.44531,303.58393 0,4.087" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17570" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.25574,303.6254 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42432 c -0.34563,0 -0.89155,0 -1.31691,-2e-5 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,303.83622 1.7578,0 -0.004,0.18723 -0.8343,1.2e-4 -0.0183,3.61087 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.46419,0 -10e-4,-0.68622 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.014 -0.83871,-0.009 0.007,1.37276 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17572"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.22048,303.62188 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.6e-4 l 5e-5,4.43206 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17574"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -419.98945,303.8177 0,4.02902" inkscape:path-effect="#path-effect18852-73" id="path17576" d="m -419.98945,303.8177 0,4.02902" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="304.02005" x="-415.86942" height="0.41957662" width="8.3515739" id="rect17578" style="fill:url(#linearGradient36490);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36488);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17580" width="8.3515739" height="0.41957662" x="-415.86942" y="-307.68631"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -421.26785,308.57464 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.2569 l 0,4.23264 c 0,0.14232 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23264 c 0,-0.14232 0.1146,-0.2569 0.25687,-0.2569 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path17582"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,308.94486 16.42871,0 0,4.01637 -16.42871,0 0,-0.90823 0.46419,0 -0.001,-0.6862 0.45201,0.0122 0.004,1.37001 1.33508,-0.0138 0.0309,-2.6153 -0.0142,-0.98505 -1.35248,-0.009 0.007,1.37276 -0.46488,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z" style="fill:url(#linearGradient36486);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17584"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,309.38218 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17586"/>
+      <path id="path17588" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,310.25274 0.65649,0 0,0.48521 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,311.1661 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17590"/>
+      <path id="path17592" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,312.06519 0.65649,0 0,0.48521 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,309.76751 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17594"/>
+      <path id="path17596" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,310.68087 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,311.57996 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17598"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -403.71413,309.46781 0,3.11114" inkscape:path-effect="#path-effect18860-0" id="path17600" d="m -403.71413,309.46781 0,3.11114" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,309.35364 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17602"/>
+      <path id="path17604" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,312.06519 0.50802,0 0,0.44242 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -416.81519,308.69716 0,1.02753 10.3895,0" inkscape:path-effect="#path-effect18862-8" id="path17606" d="m -416.81519,308.69716 0,1.02753 10.3895,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -408.50929,309.72469 0,2.48322 1.82673,0" inkscape:path-effect="#path-effect18864-8" id="path17608" d="m -408.50929,309.72469 0,2.48322 1.82673,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -408.48074,312.20791 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97044" inkscape:path-effect="#path-effect18866-1" id="path17610" d="m -408.48074,312.20791 -8.36298,0 0,0.97044" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -408.27541,309.92337 2.06414,0 0,2.07008 -2.06414,0 z" style="fill:url(#linearGradient36484);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path17612"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -405.99162,309.81031 0,2.29769" inkscape:path-effect="#path-effect18870-5" id="path17614" d="m -405.99162,309.81031 0,2.29769" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -418.55631,309.1366 1.36234,0 0,3.63288 -1.36234,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17616"/>
+      <path d="m -416.70958,309.1366 0.86784,0 0,0.4743 -0.86784,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17618" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path17620" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.72978,312.31538 0.86786,0 0,0.44402 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -418.44531,308.69258 0,4.08699" inkscape:path-effect="#path-effect18872-2" id="path17622" d="m -418.44531,308.69258 0,4.08699" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.25574,308.73403 c 0.36888,-0.004 1.10825,-1e-4 1.31691,0.004 l 0,4.4243 c -0.34563,0 -0.89155,0 -1.31691,-10e-6 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17624"/>
+      <path id="path17626" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,308.94486 1.7578,0 -0.004,0.18723 -0.8343,1.3e-4 -0.0183,3.61086 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90822 0.46419,0 -10e-4,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.0138 -0.83871,-0.009 0.007,1.37276 -0.4649,0.0203 -10e-4,-0.90718 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path17628" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.22048,308.73051 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.7e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15304 l 0,-4.12663 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -419.98945,308.92634 0,4.02902" id="path17630" inkscape:path-effect="#path-effect18874-3" inkscape:original-d="m -419.98945,308.92634 0,4.02902" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36482);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17632" width="8.3515739" height="0.41957662" x="-415.86942" y="309.12869"/>
+      <rect y="-312.79498" x="-415.86942" height="0.41957662" width="8.3515739" id="rect17634" style="fill:url(#linearGradient36480);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path17636" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -421.26785,313.67696 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.2569 -0.25688,0.2569 l -18.39573,0 c -0.1423,0 -0.25687,-0.1146 -0.25687,-0.2569 l 0,-4.23264 c 0,-0.1423 0.1146,-0.25688 0.25687,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path17638" style="fill:url(#linearGradient36478);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.47462,314.04718 16.42871,0 0,4.01635 -16.42871,0 0,-0.90821 0.46419,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.36999 1.33508,-0.0138 0.0309,-2.61528 -0.0142,-0.98508 -1.35248,-0.009 0.007,1.37276 -0.46488,0.0203 -10e-4,-0.90717 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path17640" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,314.48448 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,315.35504 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17642"/>
+      <path id="path17644" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -404.74166,316.2684 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -404.74166,317.16749 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17646"/>
+      <path id="path17648" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,314.86981 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -405.42668,315.78318 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17650"/>
+      <path id="path17652" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -405.42668,316.68226 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -403.71413,314.57013 0,3.11112" id="path17654" inkscape:path-effect="#path-effect18882-4" inkscape:original-d="m -403.71413,314.57013 0,3.11112" inkscape:connector-curvature="0"/>
+      <path id="path17656" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -406.14025,314.45596 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -406.14025,317.16751 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17658"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -416.81519,313.79947 0,1.02753 10.3895,0" id="path17660" inkscape:path-effect="#path-effect18884-6" inkscape:original-d="m -416.81519,313.79947 0,1.02753 10.3895,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -408.50929,314.827 0,2.4832 1.82673,0" id="path17662" inkscape:path-effect="#path-effect18886-6" inkscape:original-d="m -408.50929,314.827 0,2.4832 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.48074,317.3102 -8.36298,0 0,0.97046" id="path17664" inkscape:path-effect="#path-effect18888-6" inkscape:original-d="m -408.48074,317.3102 c -2.78766,0 -5.57533,0 -8.36298,0 l 0,0.97046" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path17666" style="fill:url(#linearGradient36476);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -408.27541,315.02569 2.06414,0 0,2.07006 -2.06414,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -405.99162,314.91263 0,2.29767" id="path17668" inkscape:path-effect="#path-effect18892-2" inkscape:original-d="m -405.99162,314.91263 0,2.29767" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17670" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -418.55631,314.23891 1.36234,0 0,3.63289 -1.36234,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path17672" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -416.70958,314.23891 0.86784,0 0,0.4743 -0.86784,0 z"/>
+      <path d="m -416.72978,317.41768 0.86786,0 0,0.44402 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17674" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -418.44531,313.79489 0,4.087" id="path17676" inkscape:path-effect="#path-effect18894-9" inkscape:original-d="m -418.44531,313.79489 0,4.087" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17678" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -421.25574,313.83635 c 0.36888,-0.004 1.10825,-1.1e-4 1.31691,0.004 l 0,4.42429 c -0.34563,0 -0.89155,0 -1.31691,0 -0.10418,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -419.47462,314.04718 1.7578,0 -0.004,0.18722 -0.8343,1.3e-4 -0.0183,3.61086 0.85628,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.46419,0 -10e-4,-0.68622 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85626,0.014 -0.83871,-0.009 0.007,1.37275 -0.4649,0.0203 -10e-4,-0.90716 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17680"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -421.22048,313.83283 c 0.0546,-10e-4 0.0998,-10e-4 0.11963,6.6e-4 l 5e-5,4.43207 c -0.34565,0 0.27039,0 -0.15496,0 -0.10417,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17682"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -419.98945,314.02865 0,4.02903" inkscape:path-effect="#path-effect18896-0" id="path17684" d="m -419.98945,314.02865 0,4.02903" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="314.23096" x="-415.86942" height="0.41957662" width="8.3515739" id="rect17686" style="fill:url(#linearGradient36474);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36472);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17688" width="8.3515739" height="0.41957662" x="-415.86942" y="-317.89728"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -440.62416,303.46601 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25688 l 0,4.23265 c 0,0.1423 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25688 l 0,-4.23265 c 0,-0.14232 0.11461,-0.25688 0.2569,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path17690"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,303.83622 16.42872,0 0,4.01636 -16.42872,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.61527 -0.0142,-0.98506 -1.3525,-0.009 0.007,1.37277 -0.46489,0.0203 -0.001,-0.90718 -0.45861,-0.0213 z" style="fill:url(#linearGradient36470);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17692"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,304.27354 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17694"/>
+      <path id="path17696" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,305.14408 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,306.05745 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17698"/>
+      <path id="path17700" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,306.95655 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,304.65886 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17702"/>
+      <path id="path17704" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,305.57223 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,306.47132 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17706"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -423.07046,304.35917 0,3.11114" inkscape:path-effect="#path-effect18904-93" id="path17708" d="m -423.07046,304.35917 0,3.11114" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,304.245 0.50801,0 0,0.4424 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17710"/>
+      <path id="path17712" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,306.95655 0.50801,0 0,0.44241 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -436.17152,303.58852 0,1.02754 10.38953,0" inkscape:path-effect="#path-effect18906-1" id="path17714" d="m -436.17152,303.58852 0,1.02754 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.8656,304.61606 0,2.48321 1.82672,0" inkscape:path-effect="#path-effect18908-1" id="path17716" d="m -427.8656,304.61606 0,2.48321 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.83708,307.09927 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97044" inkscape:path-effect="#path-effect18910-9" id="path17718" d="m -427.83708,307.09927 -8.36298,0 0,0.97044" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -427.63173,304.81473 2.06412,0 0,2.07008 -2.06412,0 z" style="fill:url(#linearGradient36468);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path17720"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -425.34794,304.70167 0,2.29768" inkscape:path-effect="#path-effect18914-95" id="path17722" d="m -425.34794,304.70167 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -437.91264,304.02796 1.36233,0 0,3.63289 -1.36233,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17724"/>
+      <path d="m -436.06592,304.02796 0.86786,0 0,0.47429 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17726" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path17728" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.08611,307.20672 0.86786,0 0,0.44403 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -437.80163,303.58393 0,4.087" inkscape:path-effect="#path-effect18916-55" id="path17730" d="m -437.80163,303.58393 0,4.087" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.61207,303.6254 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42432 c -0.34564,0 -0.89156,0 -1.31692,-2e-5 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17732"/>
+      <path id="path17734" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,303.83622 1.75781,0 -0.004,0.18723 -0.83431,1.2e-4 -0.0183,3.61087 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.014 -0.83871,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path17736" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.57679,303.62188 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.6e-4 l 4e-5,4.43206 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -439.34576,303.8177 0,4.02902" id="path17738" inkscape:path-effect="#path-effect18918-6" inkscape:original-d="m -439.34576,303.8177 0,4.02902" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36466);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17740" width="8.3515739" height="0.41957662" x="-435.22577" y="304.02005"/>
+      <rect y="-307.68631" x="-435.22577" height="0.41957662" width="8.3515739" id="rect17742" style="fill:url(#linearGradient36464);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path17744" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -440.62416,308.57464 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.2569 l 0,4.23264 c 0,0.14232 -0.1146,0.25688 -0.25689,0.25688 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.25688 l 0,-4.23264 c 0,-0.14232 0.11461,-0.2569 0.2569,-0.2569 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path17746" style="fill:url(#linearGradient36462);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,308.94486 16.42872,0 0,4.01637 -16.42872,0 0,-0.90823 0.4642,0 -10e-4,-0.6862 0.45202,0.0122 0.004,1.37001 1.33511,-0.0138 0.0309,-2.6153 -0.0142,-0.98505 -1.3525,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path17748" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,309.38218 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,310.25274 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17750"/>
+      <path id="path17752" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,311.1661 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,312.06519 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17754"/>
+      <path id="path17756" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,309.76751 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,310.68087 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17758"/>
+      <path id="path17760" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,311.57996 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -423.07046,309.46781 0,3.11114" id="path17762" inkscape:path-effect="#path-effect18927-5" inkscape:original-d="m -423.07046,309.46781 0,3.11114" inkscape:connector-curvature="0"/>
+      <path id="path17764" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,309.35364 0.50801,0 0,0.44241 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,312.06519 0.50801,0 0,0.44242 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17766"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -436.17152,308.69716 0,1.02753 10.38953,0" id="path17768" inkscape:path-effect="#path-effect18929-9" inkscape:original-d="m -436.17152,308.69716 0,1.02753 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -427.8656,309.72469 0,2.48322 1.82672,0" id="path17770" inkscape:path-effect="#path-effect18931-4" inkscape:original-d="m -427.8656,309.72469 0,2.48322 1.82672,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -427.83708,312.20791 -8.36298,0 0,0.97044" id="path17772" inkscape:path-effect="#path-effect18933-6" inkscape:original-d="m -427.83708,312.20791 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97044" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path17774" style="fill:url(#linearGradient36460);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -427.63173,309.92337 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -425.34794,309.81031 0,2.29769" id="path17776" inkscape:path-effect="#path-effect18937-3" inkscape:original-d="m -425.34794,309.81031 0,2.29769" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17778" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -437.91264,309.1366 1.36233,0 0,3.63288 -1.36233,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path17780" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.06592,309.1366 0.86786,0 0,0.4743 -0.86786,0 z"/>
+      <path d="m -436.08611,312.31538 0.86786,0 0,0.44402 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17782" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -437.80163,308.69258 0,4.08699" id="path17784" inkscape:path-effect="#path-effect18939-4" inkscape:original-d="m -437.80163,308.69258 0,4.08699" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17786" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.61207,308.73403 c 0.36888,-0.004 1.10825,-1e-4 1.31692,0.004 l 0,4.4243 c -0.34564,0 -0.89156,0 -1.31692,-10e-6 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15643,-0.15292 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,308.94486 1.75781,0 -0.004,0.18723 -0.83431,1.3e-4 -0.0183,3.61086 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.0138 -0.83871,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17788"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.57679,308.73051 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.7e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15304 l 0,-4.12663 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17790"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -439.34576,308.92634 0,4.02902" inkscape:path-effect="#path-effect18941-9" id="path17792" d="m -439.34576,308.92634 0,4.02902" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="309.12869" x="-435.22577" height="0.41957662" width="8.3515739" id="rect17794" style="fill:url(#linearGradient36458);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36456);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17796" width="8.3515739" height="0.41957662" x="-435.22577" y="-312.79498"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -440.62416,313.67696 18.39572,0 c 0.14231,0 0.25689,0.1146 0.25689,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.2569 -0.25689,0.2569 l -18.39572,0 c -0.14231,0 -0.2569,-0.1146 -0.2569,-0.2569 l 0,-4.23264 c 0,-0.1423 0.11461,-0.25688 0.2569,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path17798"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -438.83096,314.04718 16.42872,0 0,4.01635 -16.42872,0 0,-0.90821 0.4642,0 -10e-4,-0.68622 0.45202,0.0122 0.004,1.36999 1.33511,-0.0138 0.0309,-2.61528 -0.0142,-0.98508 -1.3525,-0.009 0.007,1.37276 -0.46489,0.0203 -0.001,-0.90717 -0.45861,-0.0213 z" style="fill:url(#linearGradient36454);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17800"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,314.48448 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17802"/>
+      <path id="path17804" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,315.35504 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.09798,316.2684 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17806"/>
+      <path id="path17808" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.09798,317.16749 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,314.86981 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17810"/>
+      <path id="path17812" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.78301,315.78318 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -424.78301,316.68226 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17814"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -423.07046,314.57013 0,3.11112" inkscape:path-effect="#path-effect18949-5" id="path17816" d="m -423.07046,314.57013 0,3.11112" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -425.49657,314.45596 0.50801,0 0,0.44241 -0.50801,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17818"/>
+      <path id="path17820" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.49657,317.16751 0.50801,0 0,0.44241 -0.50801,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -436.17152,313.79947 0,1.02753 10.38953,0" inkscape:path-effect="#path-effect18951-3" id="path17822" d="m -436.17152,313.79947 0,1.02753 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.8656,314.827 0,2.4832 1.82672,0" inkscape:path-effect="#path-effect18953-9" id="path17824" d="m -427.8656,314.827 0,2.4832 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -427.83708,317.3102 c -2.78766,0 -5.57531,0 -8.36298,0 l 0,0.97046" inkscape:path-effect="#path-effect18955-1" id="path17826" d="m -427.83708,317.3102 -8.36298,0 0,0.97046" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -427.63173,315.02569 2.06412,0 0,2.07006 -2.06412,0 z" style="fill:url(#linearGradient36452);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path17828"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -425.34794,314.91263 0,2.29767" inkscape:path-effect="#path-effect18959-2" id="path17830" d="m -425.34794,314.91263 0,2.29767" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -437.91264,314.23891 1.36233,0 0,3.63289 -1.36233,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17832"/>
+      <path d="m -436.06592,314.23891 0.86786,0 0,0.4743 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17834" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path17836" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.08611,317.41768 0.86786,0 0,0.44402 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -437.80163,313.79489 0,4.087" inkscape:path-effect="#path-effect18961-8" id="path17838" d="m -437.80163,313.79489 0,4.087" style="fill:none;stroke:#0000bc;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -440.61207,313.83635 c 0.36888,-0.004 1.10825,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34564,0 -0.89156,0 -1.31692,0 -0.10417,-0.004 -0.15643,-0.0681 -0.15643,-0.1529 l 0,-4.12342 c 0,-0.0846 0.0697,-0.15291 0.15643,-0.15291 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17840"/>
+      <path id="path17842" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.83096,314.04718 1.75781,0 -0.004,0.18722 -0.83431,1.3e-4 -0.0183,3.61086 0.85629,0.0356 0,0.18247 -1.75779,0 0,-0.90821 0.4642,0 -0.001,-0.68622 0.45201,0.0122 0.004,1.37 -0.007,-0.007 -0.0122,-3.62141 0.85627,0.014 -0.83871,-0.009 0.007,1.37275 -0.46489,0.0203 -0.001,-0.90716 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path17844" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.57679,313.83283 c 0.0546,-10e-4 0.0996,-10e-4 0.11961,6.6e-4 l 4e-5,4.43207 c -0.34564,0 0.27041,0 -0.15495,0 -0.10416,-0.004 -0.15642,-0.0682 -0.15642,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15642,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -439.34576,314.02865 0,4.02903" id="path17846" inkscape:path-effect="#path-effect18963-8" inkscape:original-d="m -439.34576,314.02865 0,4.02903" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36450);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17848" width="8.3515739" height="0.41957662" x="-435.22577" y="314.23096"/>
+      <rect y="-317.89728" x="-435.22577" height="0.41957662" width="8.3515739" id="rect17850" style="fill:url(#linearGradient36448);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path17852" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -401.89641,303.46601 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.1423 -0.11459,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25689,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path17854" style="fill:url(#linearGradient36446);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -400.10319,303.83622 16.42872,0 0,4.01636 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.68621 0.45202,0.0122 0.004,1.37001 1.3351,-0.0138 0.0309,-2.61527 -0.0142,-0.98506 -1.35247,-0.009 0.007,1.37277 -0.46491,0.0203 -10e-4,-0.90718 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path17856" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,304.27354 0.65647,0 0,0.48521 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,305.14408 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17858"/>
+      <path id="path17860" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,306.05745 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,306.95655 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17862"/>
+      <path id="path17864" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,304.65886 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,305.57223 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17866"/>
+      <path id="path17868" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,306.47132 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -384.34269,304.35917 0,3.11114" id="path17870" inkscape:path-effect="#path-effect18971-8" inkscape:original-d="m -384.34269,304.35917 0,3.11114" inkscape:connector-curvature="0"/>
+      <path id="path17872" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,304.245 0.50802,0 0,0.4424 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,306.95655 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17874"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -397.44375,303.58852 0,1.02754 10.38953,0" id="path17876" inkscape:path-effect="#path-effect18973-60" inkscape:original-d="m -397.44375,303.58852 0,1.02754 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -389.13785,304.61606 0,2.48321 1.82673,0" id="path17878" inkscape:path-effect="#path-effect18975-2" inkscape:original-d="m -389.13785,304.61606 0,2.48321 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -389.10931,307.09927 -8.36298,0 0,0.97044" id="path17880" inkscape:path-effect="#path-effect18977-4" inkscape:original-d="m -389.10931,307.09927 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97044" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path17882" style="fill:url(#linearGradient36444);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -388.90396,304.81473 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -386.62019,304.70167 0,2.29768" id="path17884" inkscape:path-effect="#path-effect18981-9" inkscape:original-d="m -386.62019,304.70167 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17886" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18487,304.02796 1.36232,0 0,3.63289 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path17888" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.33816,304.02796 0.86786,0 0,0.47429 -0.86786,0 z"/>
+      <path d="m -397.35834,307.20672 0.86785,0 0,0.44403 -0.86785,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17890" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -399.07387,303.58393 0,4.087" id="path17892" inkscape:path-effect="#path-effect18983-0" inkscape:original-d="m -399.07387,303.58393 0,4.087" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17894" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.88432,303.6254 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42432 c -0.34563,0 -0.89156,0 -1.31693,-2e-5 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -399.18412,303.83622 -1.68872,0 0.003,0.18723 0.80152,1.2e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90821 -0.44597,0 10e-4,-0.68622 -0.43426,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82262,0.014 0.80576,-0.009 -0.007,1.37276 0.44663,0.0203 10e-4,-0.90718 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17896"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.84903,303.62188 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17898"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -400.7179,303.8177 0,4.02902" inkscape:path-effect="#path-effect18985-22" id="path17900" d="m -400.7179,303.8177 0,4.02902" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="304.02005" x="-396.49802" height="0.41957662" width="8.3515739" id="rect17902" style="fill:url(#linearGradient36442);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36440);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17904" width="8.3515739" height="0.41957662" x="-396.49802" y="-307.68631"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -401.89641,308.57737 18.39573,0 c 0.14231,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.11459,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25689 l 0,-4.23264 c 0,-0.14233 0.1146,-0.25688 0.25689,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path17906"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -400.10319,308.94758 16.42872,0 0,4.01635 -16.42872,0 0,-0.90822 0.4642,0 -0.001,-0.6862 0.45202,0.0122 0.004,1.36999 1.3351,-0.0138 0.0309,-2.61529 -0.0142,-0.98507 -1.35247,-0.009 0.007,1.37277 -0.46491,0.0203 -10e-4,-0.90719 -0.45861,-0.0213 z" style="fill:url(#linearGradient36438);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17908"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,309.38489 0.65647,0 0,0.48521 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17910"/>
+      <path id="path17912" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,310.25544 0.65647,0 0,0.48522 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,311.16881 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17914"/>
+      <path id="path17916" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,312.06791 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,309.77021 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17918"/>
+      <path id="path17920" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,310.68359 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,311.58268 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17922"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -384.34269,309.47052 0,3.11116" inkscape:path-effect="#path-effect18993-5" id="path17924" d="m -384.34269,309.47052 0,3.11116" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,309.35635 0.50802,0 0,0.4424 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17926"/>
+      <path id="path17928" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,312.06791 0.50802,0 0,0.4424 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -397.44375,308.69987 0,1.02754 10.38953,0" inkscape:path-effect="#path-effect18995-4" id="path17930" d="m -397.44375,308.69987 0,1.02754 10.38953,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -389.13785,309.72741 0,2.48321 1.82673,0" inkscape:path-effect="#path-effect18997-4" id="path17932" d="m -389.13785,309.72741 0,2.48321 1.82673,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -389.10931,312.21062 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97044" inkscape:path-effect="#path-effect18999-4" id="path17934" d="m -389.10931,312.21062 -8.36298,0 0,0.97044" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -388.90396,309.92608 2.06412,0 0,2.07008 -2.06412,0 z" style="fill:url(#linearGradient36436);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path17936"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -386.62019,309.81304 0,2.29768" inkscape:path-effect="#path-effect19003-2" id="path17938" d="m -386.62019,309.81304 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -399.18487,309.13931 1.36232,0 0,3.63289 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17940"/>
+      <path d="m -397.33816,309.13931 0.86786,0 0,0.47429 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17942" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path17944" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.35834,312.31809 0.86785,0 0,0.44402 -0.86785,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -399.07387,308.69529 0,4.087" inkscape:path-effect="#path-effect19005-50" id="path17946" d="m -399.07387,308.69529 0,4.087" style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.88432,308.73675 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42431 c -0.34563,0 -0.89156,0 -1.31693,-2e-5 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17948"/>
+      <path id="path17950" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18412,308.94758 -1.68872,0 0.003,0.18722 0.80152,1.2e-4 0.0176,3.61087 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44597,0 10e-4,-0.68621 -0.43426,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0138 0.80576,-0.009 -0.007,1.37277 0.44663,0.0203 10e-4,-0.9072 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path17952" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.84903,308.73323 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27041,0 -0.15496,-2e-5 -0.10417,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -400.7179,308.92905 0,4.02903" id="path17954" inkscape:path-effect="#path-effect19007-4" inkscape:original-d="m -400.7179,308.92905 0,4.02903" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36434);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect17956" width="8.3515739" height="0.41957662" x="-396.49802" y="309.13138"/>
+      <rect y="-312.79767" x="-396.49802" height="0.41957662" width="8.3515739" id="rect17958" style="fill:url(#linearGradient36432);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path17960" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -401.89641,313.68374 18.39573,0 c 0.14231,0 0.25688,0.11461 0.25688,0.25689 l 0,4.23264 c 0,0.14232 -0.11459,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25689,-0.1146 -0.25689,-0.25689 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25689 0.25689,-0.25689 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path17962" style="fill:url(#linearGradient36430);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -400.10319,314.05395 16.42872,0 0,4.01637 -16.42872,0 0,-0.90823 0.4642,0 -0.001,-0.6862 0.45202,0.0122 0.004,1.37001 1.3351,-0.0138 0.0309,-2.61528 -0.0142,-0.98507 -1.35247,-0.009 0.007,1.37275 -0.46491,0.0203 -10e-4,-0.90719 -0.45861,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path17964" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,314.49127 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,315.36183 0.65647,0 0,0.48522 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17966"/>
+      <path id="path17968" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -385.37022,316.27519 0.65647,0 0,0.48523 -0.65647,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -385.37022,317.17428 0.65647,0 0,0.48523 -0.65647,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17970"/>
+      <path id="path17972" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,314.8766 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.05524,315.78996 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17974"/>
+      <path id="path17976" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.05524,316.68906 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -384.34269,314.5769 0,3.11114" id="path17978" inkscape:path-effect="#path-effect19015-1" inkscape:original-d="m -384.34269,314.5769 0,3.11114" inkscape:connector-curvature="0"/>
+      <path id="path17980" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -386.76881,314.46273 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -386.76881,317.17428 0.50802,0 0,0.44242 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17982"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -397.44375,313.80625 0,1.02754 10.38953,0" id="path17984" inkscape:path-effect="#path-effect19017-2" inkscape:original-d="m -397.44375,313.80625 0,1.02754 10.38953,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -389.13785,314.83379 0,2.48321 1.82673,0" id="path17986" inkscape:path-effect="#path-effect19019-7" inkscape:original-d="m -389.13785,314.83379 0,2.48321 1.82673,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -389.10931,317.317 -8.36298,0 0,0.97046" id="path17988" inkscape:path-effect="#path-effect19021-7" inkscape:original-d="m -389.10931,317.317 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path17990" style="fill:url(#linearGradient36428);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -388.90396,315.03246 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -386.62019,314.91942 0,2.29767" id="path17992" inkscape:path-effect="#path-effect19025-95" inkscape:original-d="m -386.62019,314.91942 0,2.29767" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path17994" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -399.18487,314.24571 1.36232,0 0,3.63287 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path17996" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -397.33816,314.24571 0.86786,0 0,0.47427 -0.86786,0 z"/>
+      <path d="m -397.35834,317.42447 0.86785,0 0,0.44403 -0.86785,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path17998" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -399.07387,313.80167 0,4.087" id="path18000" inkscape:path-effect="#path-effect19027-5" inkscape:original-d="m -399.07387,313.80167 0,4.087" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path18002" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -401.88432,313.84313 c 0.3689,-0.004 1.10827,-1.1e-4 1.31693,0.004 l 0,4.42429 c -0.34563,0 -0.89156,0 -1.31693,0 -0.10417,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -399.18412,314.05395 -1.68872,0 0.003,0.18725 0.80152,1.1e-4 0.0176,3.61086 -0.82262,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44597,0 10e-4,-0.68621 -0.43426,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82262,0.0139 0.80576,-0.009 -0.007,1.37277 0.44663,0.0203 10e-4,-0.9072 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18004"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -401.84903,313.83961 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27041,0 -0.15496,0 -0.10417,-0.004 -0.15641,-0.0683 -0.15641,-0.15304 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18006"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -400.7179,314.03543 0,4.02902" inkscape:path-effect="#path-effect19029-4" id="path18008" d="m -400.7179,314.03543 0,4.02902" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="314.23776" x="-396.49802" height="0.41957662" width="8.3515739" id="rect18010" style="fill:url(#linearGradient36426);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36424);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect18012" width="8.3515739" height="0.41957662" x="-396.49802" y="-317.90408"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -382.56265,303.46601 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23265 c 0,0.1423 -0.1146,0.25688 -0.25688,0.25688 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25688 l 0,-4.23265 c 0,-0.14232 0.1146,-0.25688 0.25687,-0.25688 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path18014"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -380.76942,303.83622 16.42868,0 0,4.01636 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.68621 0.45199,0.0122 0.004,1.37001 1.33509,-0.0138 0.0309,-2.61527 -0.0143,-0.98506 -1.35248,-0.009 0.007,1.37277 -0.46491,0.0203 -0.001,-0.90718 -0.45862,-0.0213 z" style="fill:url(#linearGradient36422);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18016"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,304.27354 0.65648,0 0,0.48521 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18018"/>
+      <path id="path18020" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,305.14408 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,306.05745 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18022"/>
+      <path id="path18024" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,306.95655 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,304.65886 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18026"/>
+      <path id="path18028" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,305.57223 0.65649,0 0,0.48522 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,306.47132 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18030"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -365.00892,304.35917 0,3.11114" inkscape:path-effect="#path-effect19037-3" id="path18032" d="m -365.00892,304.35917 0,3.11114" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,304.245 0.50802,0 0,0.4424 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18034"/>
+      <path id="path18036" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,306.95655 0.50802,0 0,0.44241 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -378.10999,303.58852 0,1.02754 10.38952,0" inkscape:path-effect="#path-effect19039-4" id="path18038" d="m -378.10999,303.58852 0,1.02754 10.38952,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.80409,304.61606 0,2.48321 1.82672,0" inkscape:path-effect="#path-effect19041-12" id="path18040" d="m -369.80409,304.61606 0,2.48321 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.77555,307.09927 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97044" inkscape:path-effect="#path-effect19043-2" id="path18042" d="m -369.77555,307.09927 -8.36298,0 0,0.97044" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -369.57021,304.81473 2.06412,0 0,2.07008 -2.06412,0 z" style="fill:url(#linearGradient36420);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path18044"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -367.28643,304.70167 0,2.29768" inkscape:path-effect="#path-effect19047-9" id="path18046" d="m -367.28643,304.70167 0,2.29768" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -379.85112,304.02796 1.36232,0 0,3.63289 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18048"/>
+      <path d="m -378.00441,304.02796 0.86787,0 0,0.47429 -0.86787,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18050" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path18052" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.02459,307.20672 0.86786,0 0,0.44403 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -379.74011,303.58393 0,4.087" inkscape:path-effect="#path-effect19049-8" id="path18054" d="m -379.74011,303.58393 0,4.087" style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.55056,303.6254 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42432 c -0.34562,0 -0.89155,0 -1.31692,-2e-5 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18056"/>
+      <path id="path18058" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85037,303.83622 -1.68871,0 0.003,0.18723 0.80151,1.2e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90821 -0.44596,0 10e-4,-0.68622 -0.43424,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82261,0.014 0.80576,-0.009 -0.007,1.37276 0.44661,0.0203 0.001,-0.90718 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path18060" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.51528,303.62188 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43206 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -381.38414,303.8177 0,4.02902" id="path18062" inkscape:path-effect="#path-effect19051-22" inkscape:original-d="m -381.38414,303.8177 0,4.02902" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36418);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect18064" width="8.3515739" height="0.41957662" x="-377.16425" y="304.02005"/>
+      <rect y="-307.68631" x="-377.16425" height="0.41957662" width="8.3515739" id="rect18066" style="fill:url(#linearGradient36416);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <path id="path18068" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" d="m -382.56265,308.57737 18.39573,0 c 0.14232,0 0.25688,0.1146 0.25688,0.25688 l 0,4.23264 c 0,0.14232 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25689 l 0,-4.23264 c 0,-0.14233 0.1146,-0.25688 0.25687,-0.25688 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path id="path18070" style="fill:url(#linearGradient36414);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -380.76942,308.94758 16.42868,0 0,4.01635 -16.42868,0 0,-0.90822 0.4642,0 -10e-4,-0.6862 0.45199,0.0122 0.004,1.36999 1.33509,-0.0138 0.0309,-2.61529 -0.0143,-0.98507 -1.35248,-0.009 0.007,1.37277 -0.46491,0.0203 -0.001,-0.90719 -0.45862,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path18072" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,309.38489 0.65648,0 0,0.48521 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,310.25544 0.65648,0 0,0.48522 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18074"/>
+      <path id="path18076" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,311.16881 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,312.06791 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18078"/>
+      <path id="path18080" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,309.77021 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,310.68359 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18082"/>
+      <path id="path18084" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,311.58268 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -365.00892,309.47052 0,3.11116" id="path18086" inkscape:path-effect="#path-effect19059-8" inkscape:original-d="m -365.00892,309.47052 0,3.11116" inkscape:connector-curvature="0"/>
+      <path id="path18088" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,309.35635 0.50802,0 0,0.4424 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,312.06791 0.50802,0 0,0.4424 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18090"/>
+      <path style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -378.10999,308.69987 0,1.02754 10.38952,0" id="path18092" inkscape:path-effect="#path-effect19061-5" inkscape:original-d="m -378.10999,308.69987 0,1.02754 10.38952,0" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -369.80409,309.72741 0,2.48321 1.82672,0" id="path18094" inkscape:path-effect="#path-effect19063-8" inkscape:original-d="m -369.80409,309.72741 0,2.48321 1.82672,0" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -369.77555,312.21062 -8.36298,0 0,0.97044" id="path18096" inkscape:path-effect="#path-effect19065-3" inkscape:original-d="m -369.77555,312.21062 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97044" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="path18098" style="fill:url(#linearGradient36412);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -369.57021,309.92608 2.06412,0 0,2.07008 -2.06412,0 z" inkscape:connector-curvature="0"/>
+      <path style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -367.28643,309.81304 0,2.29768" id="path18100" inkscape:path-effect="#path-effect19069-9" inkscape:original-d="m -367.28643,309.81304 0,2.29768" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path18102" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85112,309.13931 1.36232,0 0,3.63289 -1.36232,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path18104" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.00441,309.13931 0.86787,0 0,0.47429 -0.86787,0 z"/>
+      <path d="m -378.02459,312.31809 0.86786,0 0,0.44402 -0.86786,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18106" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -379.74011,308.69529 0,4.087" id="path18108" inkscape:path-effect="#path-effect19071-4" inkscape:original-d="m -379.74011,308.69529 0,4.087" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path id="path18110" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.55056,308.73675 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42431 c -0.34562,0 -0.89155,0 -1.31692,-2e-5 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.1529 l 0,-4.12341 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -379.85037,308.94758 -1.68871,0 0.003,0.18722 0.80151,1.2e-4 0.0176,3.61087 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44596,0 10e-4,-0.68621 -0.43424,0.0122 -0.004,1.36999 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0138 0.80576,-0.009 -0.007,1.37277 0.44661,0.0203 0.001,-0.9072 0.44058,-0.0213 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18112"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.51528,308.73323 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27042,0 -0.15495,-2e-5 -0.10416,-0.004 -0.15641,-0.0682 -0.15641,-0.15302 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18114"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -381.38414,308.92905 0,4.02903" inkscape:path-effect="#path-effect19073-4" id="path18116" d="m -381.38414,308.92905 0,4.02903" style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <rect y="309.13138" x="-377.16425" height="0.41957662" width="8.3515739" id="rect18118" style="fill:url(#linearGradient36410);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <rect transform="scale(1,-1)" style="fill:url(#linearGradient36408);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect18120" width="8.3515739" height="0.41957662" x="-377.16425" y="-312.79767"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m -382.56265,313.68374 18.39573,0 c 0.14232,0 0.25688,0.11461 0.25688,0.25689 l 0,4.23264 c 0,0.14232 -0.1146,0.25689 -0.25688,0.25689 l -18.39573,0 c -0.14231,0 -0.25687,-0.1146 -0.25687,-0.25689 l 0,-4.23264 c 0,-0.14232 0.1146,-0.25689 0.25687,-0.25689 z" style="fill:#848484;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.31646451;stroke-miterlimit:4;stroke-dasharray:none" id="path18122"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" d="m -380.76942,314.05395 16.42868,0 0,4.01637 -16.42868,0 0,-0.90823 0.4642,0 -10e-4,-0.6862 0.45199,0.0122 0.004,1.37001 1.33509,-0.0138 0.0309,-2.61528 -0.0143,-0.98507 -1.35248,-0.009 0.007,1.37275 -0.46491,0.0203 -0.001,-0.90719 -0.45862,-0.0213 z" style="fill:url(#linearGradient36406);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18124"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,314.49127 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18126"/>
+      <path id="path18128" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,315.36183 0.65648,0 0,0.48522 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.03646,316.27519 0.65648,0 0,0.48523 -0.65648,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18130"/>
+      <path id="path18132" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.03646,317.17428 0.65648,0 0,0.48523 -0.65648,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,314.8766 0.65649,0 0,0.48523 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18134"/>
+      <path id="path18136" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -366.72149,315.78996 0.65649,0 0,0.48523 -0.65649,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -366.72149,316.68906 0.65649,0 0,0.48522 -0.65649,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18138"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -365.00892,314.5769 0,3.11114" inkscape:path-effect="#path-effect19081-9" id="path18140" d="m -365.00892,314.5769 0,3.11114" style="fill:none;stroke:#b3b3b3;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" d="m -367.43506,314.46273 0.50802,0 0,0.44241 -0.50802,0 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18142"/>
+      <path id="path18144" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -367.43506,317.17428 0.50802,0 0,0.44242 -0.50802,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m -378.10999,313.80625 0,1.02754 10.38952,0" inkscape:path-effect="#path-effect19083-8" id="path18146" d="m -378.10999,313.80625 0,1.02754 10.38952,0" style="fill:none;stroke:#313131;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.80409,314.83379 0,2.48321 1.82672,0" inkscape:path-effect="#path-effect19085-56" id="path18148" d="m -369.80409,314.83379 0,2.48321 1.82672,0" style="fill:none;stroke:#353535;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m -369.77555,317.317 c -2.78766,0 -5.57532,0 -8.36298,0 l 0,0.97046" inkscape:path-effect="#path-effect19087-6" id="path18150" d="m -369.77555,317.317 -8.36298,0 0,0.97046" style="fill:none;stroke:#303030;stroke-width:0.36167377;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" d="m -369.57021,315.03246 2.06412,0 0,2.07008 -2.06412,0 z" style="fill:url(#linearGradient36404);fill-opacity:1;fill-rule:nonzero;stroke:#440000;stroke-width:0.22791912;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path18152"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -367.28643,314.91942 0,2.29767" inkscape:path-effect="#path-effect19091-0" id="path18154" d="m -367.28643,314.91942 0,2.29767" style="fill:none;stroke:#910000;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -379.85112,314.24571 1.36232,0 0,3.63287 -1.36232,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18156"/>
+      <path d="m -378.00441,314.24571 0.86787,0 0,0.47427 -0.86787,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18158" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path18160" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -378.02459,317.42447 0.86786,0 0,0.44403 -0.86786,0 z"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m -379.74011,313.80167 0,4.087" inkscape:path-effect="#path-effect19093-7" id="path18162" d="m -379.74011,313.80167 0,4.087" style="fill:#008080;stroke:#d45500;stroke-width:0.22604609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" d="m -382.55056,313.84313 c 0.36889,-0.004 1.10827,-1.1e-4 1.31692,0.004 l 0,4.42429 c -0.34562,0 -0.89155,0 -1.31692,0 -0.10416,-0.004 -0.15641,-0.0681 -0.15641,-0.15291 l 0,-4.1234 c 0,-0.0846 0.0697,-0.15292 0.15641,-0.15292 z" style="fill:#7c7c7c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path18164"/>
+      <path id="path18166" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -379.85037,314.05395 -1.68871,0 0.003,0.18725 0.80151,1.1e-4 0.0176,3.61086 -0.82263,0.0356 0,0.18247 1.68872,0 0,-0.90822 -0.44596,0 10e-4,-0.68621 -0.43424,0.0122 -0.004,1.37 0.005,-0.007 0.0108,-3.62141 -0.82261,0.0139 0.80576,-0.009 -0.007,1.37277 0.44661,0.0203 0.001,-0.9072 0.44058,-0.0213 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccc"/>
+      <path id="path18168" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -382.51528,313.83961 c 0.0546,-10e-4 0.0995,-10e-4 0.11962,6.6e-4 l 5e-5,4.43208 c -0.34563,0 0.27042,0 -0.15495,0 -0.10416,-0.004 -0.15641,-0.0683 -0.15641,-0.15304 l 0,-4.12664 c 0,-0.0848 0.0697,-0.15302 0.15641,-0.15302 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc"/>
+      <path style="fill:none;stroke:#b3b3b3;stroke-width:0.25723919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m -381.38414,314.03543 0,4.02902" id="path18170" inkscape:path-effect="#path-effect19095-2" inkscape:original-d="m -381.38414,314.03543 0,4.02902" inkscape:connector-curvature="0"/>
+      <rect style="fill:url(#linearGradient36402);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect18172" width="8.3515739" height="0.41957662" x="-377.16425" y="314.23776"/>
+      <rect y="-317.90408" x="-377.16425" height="0.41957662" width="8.3515739" id="rect18174" style="fill:url(#linearGradient36400);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1,-1)"/>
+      <g transform="matrix(-0.9145536,0,0,0.91455512,-763.96886,-42.419616)" id="g20657">
+        <path transform="matrix(-0.32633859,0,0,0.35269389,-373.15854,203.30963)" id="path20659" style="opacity:0.73991029;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22688-0)" d="m 190.21338,691.0295 84.30377,36.12543 -58.77787,33.93541 -83.42033,-45.25626 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <g id="g20661">
+          <path id="path20663" style="fill:url(#linearGradient24366);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.06431,444.46885 -26.4086,9.50458 18.61817,10.74923 24.63847,-14.22504 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path20665" style="fill:url(#linearGradient24368);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -419.21627,450.49766 -24.63846,14.225 -10e-6,6.30935 24.63847,-14.51319 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path20667" style="fill:url(#linearGradient24370);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -443.85474,464.72266 -18.61817,-10.74923 0,6.30633 18.61817,10.75225 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -438.76868,464.68199 0,2.14855 -2.76633,1.62737 0.004,-2.2442 0.61387,-0.3361 -0.0141,-0.31866 1.4721,-0.85213 0,0.35809 z" id="path20669"/>
+          <path id="path20671" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -440.87183,465.86616 -0.66728,0.33834 -0.0107,2.26218 2.78116,-1.63825 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccccccc" id="path20673" d="m -430.87531,460.0863 -0.0114,2.13882 -2.6937,1.61835 0,-2.10402 0.60114,-0.36317 0.0165,-0.41255 1.41125,-0.81481 0,0.35066 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -431.34477,462.46415 -1.89574,-0.92888 -0.0991,0.0584 1.83954,0.96604 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20675"/>
+          <path id="path20677" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -431.64534,462.66453 -1.93332,-0.9414 -0.0114,0.12102 1.78944,0.91594 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -431.99601,462.87738 -1.58265,-0.7723 9.9e-4,0.12105 1.42625,0.74686 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20679"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -432.93487,461.36258 -0.65345,0.36833 0.0125,2.07822 2.68327,-1.58054 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20681"/>
+          <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -427.22318,458.0024 0,2.07145 -2.60903,1.55217 0,-2.02921 0.57979,-0.35026 0,-0.38878 1.37698,-0.79503 0,0.33823 z" id="path20683"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -427.96584,460.48893 -1.86461,-0.90793 -0.0109,0.11677 1.72585,0.88334 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20685"/>
+          <path id="path20687" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -428.30405,460.69428 -1.5264,-0.74488 9.8e-4,0.11672 1.37558,0.72034 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -428.69661,460.92984 -1.13988,-0.55763 0.007,0.12274 0.983,0.52707 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20689"/>
+          <path id="path20691" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -429.20955,459.23329 -0.63022,0.35522 0,2.04506 2.61659,-1.55972 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccccccc" id="path20693" d="m -423.71863,456.04168 0,1.97414 -2.51359,1.48059 0,-1.91864 0.55857,-0.33747 0,-0.43938 1.32662,-0.76592 0,0.39068 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -425.63234,457.22756 -0.60718,0.34224 0,1.97023 2.52089,-1.54525 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20695"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -424.15485,458.25107 -1.76149,-0.86302 -0.092,0.0542 1.70928,0.89763 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20697"/>
+          <path id="path20699" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -424.43413,458.43729 -1.7964,-0.87474 -0.0106,0.11245 1.66273,0.8511 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -424.75997,458.63512 -1.47056,-0.71766 9.8e-4,0.11249 1.32525,0.69398 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20701"/>
+          <path id="path20703" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -425.13817,458.86205 -1.09819,-0.53725 0.007,0.11825 0.94705,0.50782 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -425.54547,459.11223 -0.68507,-0.33938 -0.0105,0.13569 0.55139,0.2925 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20705"/>
+          <path id="path20707" d="m -434.7228,462.35121 0,2.14855 -2.76633,1.62737 0.004,-2.2442 0.61387,-0.3361 -0.0141,-0.31866 1.47209,-0.85213 0,0.35809 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -436.82595,463.53537 -0.66729,0.33835 -0.0107,2.26218 2.78118,-1.63825 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20709"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -435.20219,464.75217 -1.93586,-1.05811 -0.10116,0.0539 1.87848,1.09285 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20711"/>
+          <path id="path20713" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -435.50913,464.93944 -1.97423,-1.07312 -0.0116,0.12293 1.82733,1.03881 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -435.86722,465.13655 -1.61614,-0.88018 9.8e-4,0.12366 1.45644,0.84515 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20715"/>
+          <path id="path20717" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -436.28286,465.36241 -1.2069,-0.65877 0.008,0.13041 1.0408,0.61698 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -436.73049,465.61203 -0.75288,-0.41562 -0.0116,0.14847 0.60598,0.35578 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20719"/>
+          <path inkscape:connector-curvature="0" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -420.42047,454.12591 0,1.97414 -2.51359,1.48059 0,-1.91863 0.55858,-0.33747 0,-0.43938 1.32661,-0.76593 0,0.39069 z" id="path20721" sodipodi:nodetypes="ccccccccc"/>
+          <path id="path20723" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -422.33418,455.31179 -0.60717,0.34224 0,1.97024 2.52088,-1.54525 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path inkscape:transform-center-y="-3.6310978e-005" inkscape:transform-center-x="-1.2558035" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -439.21546,462.7963 -0.73559,0.42217 0,1.58313 0.79658,-0.4293 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24372);stroke-width:0.10124438;stroke-miterlimit:4;stroke-dasharray:none" id="path20725"/>
+          <path inkscape:transform-center-y="-2.0065162e-005" id="path20727" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24374);stroke-width:0.10124438;stroke-miterlimit:4;stroke-dasharray:none" d="m -440.48711,463.52611 -0.73558,0.42209 0,1.58322 0.79657,-0.42939 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.2558024"/>
+          <path id="path20729" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24376);stroke-width:0.09516977;stroke-miterlimit:4;stroke-dasharray:none" d="m -435.35725,460.67877 -0.69145,0.39685 0,1.48814 0.74878,-0.40355 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.1804582" inkscape:transform-center-y="-4.317584e-005"/>
+          <path inkscape:transform-center-x="-1.1804515" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -436.5526,461.3648 -0.69145,0.39676 0,1.48822 0.74878,-0.40359 z" style="fill:#15cc01;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24378);stroke-width:0.09516977;stroke-miterlimit:4;stroke-dasharray:none" id="path20731" inkscape:transform-center-y="-3.0421108e-005"/>
+          <path inkscape:transform-center-y="-3.5812256e-005" inkscape:transform-center-x="-1.1302209" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -431.56156,458.56493 -0.66202,0.37995 0,1.42483 0.71692,-0.38641 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24380);stroke-width:0.09111991;stroke-miterlimit:4;stroke-dasharray:none" id="path20733"/>
+          <path inkscape:transform-center-y="-3.033866e-005" id="path20735" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24382);stroke-width:0.09111991;stroke-miterlimit:4;stroke-dasharray:none" d="m -432.70604,459.22178 -0.66202,0.37986 0,1.42487 0.71692,-0.38641 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.1302206"/>
+          <path id="path20737" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24384);stroke-width:0.08909495;stroke-miterlimit:4;stroke-dasharray:none" d="m -427.79004,456.43272 -0.6473,0.37151 0,1.39316 0.70098,-0.37781 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.1051084" inkscape:transform-center-y="-5.2712879e-005"/>
+          <path inkscape:transform-center-x="-1.1051041" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -428.90908,457.07499 -0.64731,0.37139 0,1.39324 0.70098,-0.37781 z" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24386);stroke-width:0.08909495;stroke-miterlimit:4;stroke-dasharray:none" id="path20739" inkscape:transform-center-y="-1.8005608e-005"/>
+          <path inkscape:transform-center-y="-7.1262664e-005" inkscape:transform-center-x="-1.079995" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -424.30532,454.4899 -0.6326,0.36309 0,1.36148 0.68505,-0.36923 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24388);stroke-width:0.08707013;stroke-miterlimit:4;stroke-dasharray:none" id="path20741"/>
+          <path id="path20743" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24390);stroke-width:0.08707013;stroke-miterlimit:4;stroke-dasharray:none" d="m -425.39894,455.11761 -0.63259,0.36291 0,1.36161 0.68505,-0.36922 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.0799904"/>
+          <path id="path20745" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24392);stroke-width:0.08504539;stroke-miterlimit:4;stroke-dasharray:none" d="m -421.02692,452.61584 -0.61789,0.35465 0,1.32981 0.66912,-0.36063 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-1.0548787" inkscape:transform-center-y="-8.7449368e-005"/>
+          <path inkscape:transform-center-y="1.6019424e-005" inkscape:transform-center-x="-1.0548741" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -422.0951,453.22898 -0.61789,0.35444 0,1.32997 0.66912,-0.36063 z" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24394-3);stroke-width:0.08504539;stroke-miterlimit:4;stroke-dasharray:none" id="path20747"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.27181,296.42921)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20749" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20751" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.42639,297.59108)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-423.58086,298.75302)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20753" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20755" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.63397,295.99873)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.78844,297.16067)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20757" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20759" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-424.9429,298.32262)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20761" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.07446,296.76287)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.22904,297.92475)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20763" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20765" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-424.38354,299.08668)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.43662,296.3324)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20767" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20769" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.5911,297.49434)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.74556,298.65629)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20771" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.87712,297.09655)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20773" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20775" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.03171,298.25841)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.18619,299.42036)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20777" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20779" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.23928,296.66607)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.39374,297.82802)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20781" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20783" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.54821,298.98997)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20785" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.67978,297.4302)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.83435,298.59208)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20787" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20789" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-425.98881,299.75402)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.04189,296.99974)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20791" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20793" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.19637,298.16167)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.35084,299.32361)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20795" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.49698,297.76995)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20797" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20799" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.65157,298.93181)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-426.80605,300.09376)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20801" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20803" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.85914,297.33947)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.01361,298.50141)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20805" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20807" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.16807,299.66337)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.31424,298.10967)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20809" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20811" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.46883,299.27154)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-427.62327,300.43349)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20814" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20816" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.67638,297.67921)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.83086,298.84114)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20818" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20820" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.98531,300.0031)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20822" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.11688,298.44335)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.27148,299.60522)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20824" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20826" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-428.42594,300.76716)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.47905,298.01286)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20828" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20830" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.63351,299.17481)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.78797,300.33677)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20832" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.91954,298.777)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20834" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20836" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.07411,299.93887)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-429.22857,301.10083)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20838" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20840" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-434.28169,298.34653)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.43613,299.50848)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20842" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20844" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.59061,300.67042)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20846" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.7222,299.11068)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.87677,300.27255)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20848" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20850" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.03124,301.43449)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-435.08433,298.6802)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20852" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20854" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-433.23881,299.84214)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-431.39327,301.00409)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20856" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-434.5248,299.44435)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20858" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path20860" sodipodi:cx="1962.25" sodipodi:cy="403.48718" sodipodi:rx="2.25" sodipodi:ry="2.125" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-432.67941,300.60621)" sodipodi:start="0" sodipodi:end="6.2158485" sodipodi:open="true"/>
+          <path sodipodi:open="true" sodipodi:end="6.2158485" sodipodi:start="0" transform="matrix(-0.08255367,0.0343183,0.34799354,0.21909583,-430.83387,301.76815)" d="m 1964.5,403.48718 c 0,1.17361 -1.0074,2.125 -2.25,2.125 -1.2426,0 -2.25,-0.95139 -2.25,-2.125 0,-1.1736 1.0074,-2.125 2.25,-2.125 1.1839,0 2.1652,0.86645 2.2449,1.98202" sodipodi:ry="2.125" sodipodi:rx="2.25" sodipodi:cy="403.48718" sodipodi:cx="1962.25" id="path20862" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
         </g>
       </g>
-      <path
-         inkscape:connector-curvature="0"
-         d="m -398.81908,407.68163 c 6.47687,-0.82802 6.58225,24.18313 19.6463,25.78953 13.06405,1.6064 60.30098,0.5539 79.87188,0.64155 4.29744,0.0192 10.48547,-23.17875 15.73202,-23.15476 l -11.6394,-3.30569 -43.98965,-0.64563 -8.70931,-1.05954 -41.10027,-1.77233 z"
-         style="opacity:0.59641269;fill:url(#linearGradient150480);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20900)"
-         id="path31195"
-         sodipodi:nodetypes="csscccccc"
-         transform="matrix(0.71433696,0.02403625,0,-0.5186991,-158.00288,578.26363)" />
+      <path inkscape:connector-curvature="0" d="m -398.81908,407.68163 c 6.47687,-0.82802 6.58225,24.18313 19.6463,25.78953 13.06405,1.6064 60.30098,0.5539 79.87188,0.64155 4.29744,0.0192 10.48547,-23.17875 15.73202,-23.15476 l -11.6394,-3.30569 -43.98965,-0.64563 -8.70931,-1.05954 -41.10027,-1.77233 z" style="opacity:0.59641269;fill:url(#linearGradient150480);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter20900)" id="path31195" sodipodi:nodetypes="csscccccc" transform="matrix(0.71433696,0.02403625,0,-0.5186991,-158.00288,578.26363)"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Satellite.svg b/misc/images/svg/elements/Satellite.svg
index 4d33316384d..bf61c35aeec 100644
--- a/misc/images/svg/elements/Satellite.svg
+++ b/misc/images/svg/elements/Satellite.svg
@@ -1,1613 +1,322 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="78.220161"
-   id="svg155279"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 54">
-  <defs
-     id="defs155281">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12484"
-       id="linearGradient12490"
-       x1="225.54323"
-       y1="963.40863"
-       x2="76.283188"
-       y2="910.54272"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12484">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop12486" />
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:0;"
-         offset="1"
-         id="stop12488" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="78.220161" id="svg155279" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 54">
+  <defs id="defs155281">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient12484" id="linearGradient12490" x1="225.54323" y1="963.40863" x2="76.283188" y2="910.54272" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient12484">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop12486"/>
+      <stop style="stop-color:#1a1a1a;stop-opacity:0;" offset="1" id="stop12488"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter12480">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.5734115"
-         id="feGaussianBlur12482" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter12480">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.5734115" id="feGaussianBlur12482"/>
     </filter>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect11511"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter11513">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.32213656"
-         id="feGaussianBlur11515" />
+    <inkscape:path-effect effect="spiro" id="path-effect11511" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter11513">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.32213656" id="feGaussianBlur11515"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11231"
-       id="linearGradient11359"
-       x1="132.60861"
-       y1="937.27411"
-       x2="138.95612"
-       y2="926.77411"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)" />
-    <linearGradient
-       id="linearGradient11231">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11233" />
-      <stop
-         id="stop11235"
-         offset="0.36476168"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop11237" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11231" id="linearGradient11359" x1="132.60861" y1="937.27411" x2="138.95612" y2="926.77411" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)"/>
+    <linearGradient id="linearGradient11231">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11233"/>
+      <stop id="stop11235" offset="0.36476168" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop11237"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11361"
-       id="linearGradient11367"
-       x1="126.10861"
-       y1="930.27411"
-       x2="146.45612"
-       y2="930.27411"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11361">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11363" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11365" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11361" id="linearGradient11367" x1="126.10861" y1="930.27411" x2="146.45612" y2="930.27411" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11361">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11363"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11365"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10733"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11519"
-       id="linearGradient11525"
-       x1="178.65152"
-       y1="965.68427"
-       x2="179.72421"
-       y2="968.04425"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11519">
-      <stop
-         style="stop-color:#ffff00;stop-opacity:1;"
-         offset="0"
-         id="stop11521" />
-      <stop
-         style="stop-color:#ffff00;stop-opacity:0;"
-         offset="1"
-         id="stop11523" />
+    <inkscape:path-effect effect="spiro" id="path-effect10733" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11519" id="linearGradient11525" x1="178.65152" y1="965.68427" x2="179.72421" y2="968.04425" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11519">
+      <stop style="stop-color:#ffff00;stop-opacity:1;" offset="0" id="stop11521"/>
+      <stop style="stop-color:#ffff00;stop-opacity:0;" offset="1" id="stop11523"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect155000"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11031-1"
-       id="linearGradient11087"
-       x1="106.41803"
-       y1="965.65967"
-       x2="201.29054"
-       y2="951.84937"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37550046,0.50294877,-0.50294877,0.37550046,588.39153,504.91428)" />
-    <linearGradient
-       id="linearGradient11031-1">
-      <stop
-         id="stop11033"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.69732076"
-         id="stop11035" />
-      <stop
-         id="stop11037"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect155000" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11031-1" id="linearGradient11087" x1="106.41803" y1="965.65967" x2="201.29054" y2="951.84937" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.37550046,0.50294877,-0.50294877,0.37550046,588.39153,504.91428)"/>
+    <linearGradient id="linearGradient11031-1">
+      <stop id="stop11033" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.69732076" id="stop11035"/>
+      <stop id="stop11037" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11231"
-       id="linearGradient11371"
-       gradientUnits="userSpaceOnUse"
-       x1="132.60861"
-       y1="937.27411"
-       x2="138.95612"
-       y2="926.77411"
-       gradientTransform="matrix(0.78947404,0.24576814,-0.24576814,0.78947404,262.24295,156.25626)" />
-    <linearGradient
-       id="linearGradient155012">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop155014" />
-      <stop
-         id="stop155016"
-         offset="0.36476168"
-         style="stop-color:#939393;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop155018" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11231" id="linearGradient11371" gradientUnits="userSpaceOnUse" x1="132.60861" y1="937.27411" x2="138.95612" y2="926.77411" gradientTransform="matrix(0.78947404,0.24576814,-0.24576814,0.78947404,262.24295,156.25626)"/>
+    <linearGradient id="linearGradient155012">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop155014"/>
+      <stop id="stop155016" offset="0.36476168" style="stop-color:#939393;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop155018"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11361"
-       id="linearGradient11373"
-       gradientUnits="userSpaceOnUse"
-       x1="126.10861"
-       y1="930.27411"
-       x2="146.45612"
-       y2="930.27411"
-       gradientTransform="matrix(0.78947404,0.24576814,-0.24576814,0.78947404,262.24295,156.25626)" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect11375"
-       effect="spiro" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11013-7"
-       id="radialGradient12572"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49202033,0.84031859,-0.68021839,0.39827903,734.12242,433.21923)"
-       cx="137.54016"
-       cy="958.35223"
-       fx="137.54016"
-       fy="958.35223"
-       r="34.489914" />
-    <linearGradient
-       id="linearGradient11013-7">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11015" />
-      <stop
-         id="stop11017"
-         offset="0.83645713"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop11019" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11361" id="linearGradient11373" gradientUnits="userSpaceOnUse" x1="126.10861" y1="930.27411" x2="146.45612" y2="930.27411" gradientTransform="matrix(0.78947404,0.24576814,-0.24576814,0.78947404,262.24295,156.25626)"/>
+    <inkscape:path-effect is_visible="true" id="path-effect11375" effect="spiro"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient11013-7" id="radialGradient12572" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.49202033,0.84031859,-0.68021839,0.39827903,734.12242,433.21923)" cx="137.54016" cy="958.35223" fx="137.54016" fy="958.35223" r="34.489914"/>
+    <linearGradient id="linearGradient11013-7">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11015"/>
+      <stop id="stop11017" offset="0.83645713" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop11019"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11329"
-       id="linearGradient11335"
-       x1="176.75"
-       y1="928.86218"
-       x2="178.25"
-       y2="933.61218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)" />
-    <linearGradient
-       id="linearGradient11329">
-      <stop
-         style="stop-color:#636363;stop-opacity:1;"
-         offset="0"
-         id="stop11331" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop11333" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11329" id="linearGradient11335" x1="176.75" y1="928.86218" x2="178.25" y2="933.61218" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)"/>
+    <linearGradient id="linearGradient11329">
+      <stop style="stop-color:#636363;stop-opacity:1;" offset="0" id="stop11331"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop11333"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10737"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11057"
-       id="linearGradient11055"
-       x1="138.72414"
-       y1="958.04742"
-       x2="179.53412"
-       y2="975.04742"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37550046,0.50294877,-0.50294877,0.37550046,582.33832,502.64432)" />
-    <linearGradient
-       id="linearGradient11057">
-      <stop
-         id="stop11059"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="1"
-         id="stop11061" />
-      <stop
-         id="stop11063"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect10737" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11057" id="linearGradient11055" x1="138.72414" y1="958.04742" x2="179.53412" y2="975.04742" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.37550046,0.50294877,-0.50294877,0.37550046,582.33832,502.64432)"/>
+    <linearGradient id="linearGradient11057">
+      <stop id="stop11059" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="1" id="stop11061"/>
+      <stop id="stop11063" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10729"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10680-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10668-09"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10950"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10672-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10676-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10692-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10688-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10700-45"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10696-51"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10708-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10704-11"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76427-9-5"
-       id="linearGradient11079"
-       x1="104.30226"
-       y1="947.48761"
-       x2="188.03168"
-       y2="951.97314"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37550046,0.50294877,-0.50294877,0.37550046,582.33832,502.64432)" />
-    <linearGradient
-       id="linearGradient76427-9-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop76429-8-2" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop76431-2-7" />
+    <inkscape:path-effect effect="spiro" id="path-effect10729" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10680-4" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10668-09" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10950" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10672-4" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10676-8" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10692-8" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10688-2" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10700-45" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10696-51" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10708-7" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10704-11" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76427-9-5" id="linearGradient11079" x1="104.30226" y1="947.48761" x2="188.03168" y2="951.97314" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.37550046,0.50294877,-0.50294877,0.37550046,582.33832,502.64432)"/>
+    <linearGradient id="linearGradient76427-9-5">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop76429-8-2"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop76431-2-7"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10721"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11031-1"
-       id="linearGradient11071"
-       x1="121.91554"
-       y1="952.00195"
-       x2="133.32211"
-       y2="952.00195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37550046,0.50294877,-0.50294877,0.37550046,582.33832,502.64432)" />
-    <linearGradient
-       id="linearGradient155061">
-      <stop
-         id="stop155063"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.69732076"
-         id="stop155065" />
-      <stop
-         id="stop155067"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect10721" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11031-1" id="linearGradient11071" x1="121.91554" y1="952.00195" x2="133.32211" y2="952.00195" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.37550046,0.50294877,-0.50294877,0.37550046,582.33832,502.64432)"/>
+    <linearGradient id="linearGradient155061">
+      <stop id="stop155063" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.69732076" id="stop155065"/>
+      <stop id="stop155067" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10725"
-       is_visible="true" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76447-6"
-       id="radialGradient11047"
-       cx="170.55353"
-       cy="987.68842"
-       fx="170.55353"
-       fy="987.68842"
-       r="27.526018"
-       gradientTransform="matrix(0.37550046,0.50294877,-0.44219247,0.33013994,522.71173,547.16142)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient76447-6">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76449" />
-      <stop
-         id="stop76451"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76453" />
+    <inkscape:path-effect effect="spiro" id="path-effect10725" is_visible="true"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient76447-6" id="radialGradient11047" cx="170.55353" cy="987.68842" fx="170.55353" fy="987.68842" r="27.526018" gradientTransform="matrix(0.37550046,0.50294877,-0.44219247,0.33013994,522.71173,547.16142)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient76447-6">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76449"/>
+      <stop id="stop76451" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76453"/>
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11145-1"
-       id="radialGradient11039"
-       cx="225.93976"
-       cy="1081.9637"
-       fx="225.93976"
-       fy="1081.9637"
-       r="26.75"
-       gradientTransform="matrix(-2.0077743,-0.30533056,0.97734354,-0.89965668,-378.27038,2140.2569)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient11145-1">
-      <stop
-         id="stop11147"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.45645112"
-         id="stop11149" />
-      <stop
-         id="stop11151"
-         offset="1"
-         style="stop-color:#425ca0;stop-opacity:1;" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient11145-1" id="radialGradient11039" cx="225.93976" cy="1081.9637" fx="225.93976" fy="1081.9637" r="26.75" gradientTransform="matrix(-2.0077743,-0.30533056,0.97734354,-0.89965668,-378.27038,2140.2569)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient11145-1">
+      <stop id="stop11147" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.45645112" id="stop11149"/>
+      <stop id="stop11151" offset="1" style="stop-color:#425ca0;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect11505"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect11503"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10790-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10794-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10798-32"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10802-21"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10828-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10832-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10836-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10840-76"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10848-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10852-8"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10856-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10860-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10864-7"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10868-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10872-54"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10876"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10880"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10836-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10905"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10909"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10836-1-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10934-31"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10938-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10942-33"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10946-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10954-11"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10958-38"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10962"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10970-74"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10972"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10974-277"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10974-9-9"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10999"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect11003"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11155-1"
-       id="linearGradient11161-3"
-       x1="236.5"
-       y1="943.11218"
-       x2="154.5"
-       y2="914.61218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11155-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11157" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11159" />
+    <inkscape:path-effect is_visible="true" id="path-effect11505" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect11503" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10790-4" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10794-2" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10798-32" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10802-21" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10828-6" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10832-8" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10836-5" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10840-76" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10848-1" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10852-8" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10856-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10860-2" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10864-7" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10868-9" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10872-54" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10876" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10880" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10836-1" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10905" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10909" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10836-1-3" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10934-31" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10938-2" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10942-33" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10946-4" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10954-11" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10958-38" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10962" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10970-74" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10972" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10974-277" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10974-9-9" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10999" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect11003" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11155-1" id="linearGradient11161-3" x1="236.5" y1="943.11218" x2="154.5" y2="914.61218" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11155-1">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11157"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11159"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect11501"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11165-8"
-       id="linearGradient11171-9"
-       x1="234.25"
-       y1="916.23718"
-       x2="165.75"
-       y2="915.11218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11165-8">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11167" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11169" />
+    <inkscape:path-effect is_visible="true" id="path-effect11501" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11165-8" id="linearGradient11171-9" x1="234.25" y1="916.23718" x2="165.75" y2="915.11218" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11165-8">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11167"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11169"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect11499"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11175"
-       id="linearGradient11181"
-       x1="233.96396"
-       y1="905.37238"
-       x2="167.4838"
-       y2="905.28656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11175">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11177" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11179" />
+    <inkscape:path-effect effect="spiro" id="path-effect11499" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11175" id="linearGradient11181" x1="233.96396" y1="905.37238" x2="167.4838" y2="905.28656" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11175">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11177"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11179"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect11497"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11185"
-       id="linearGradient11191"
-       x1="96.246468"
-       y1="921.07147"
-       x2="131.69864"
-       y2="924.28748"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2175629,0,0,1.2175629,-22.857692,-202.62836)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11185">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11187" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11189" />
+    <inkscape:path-effect is_visible="true" id="path-effect11497" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11185" id="linearGradient11191" x1="96.246468" y1="921.07147" x2="131.69864" y2="924.28748" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2175629,0,0,1.2175629,-22.857692,-202.62836)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11185">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11187"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11189"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect11341"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11195"
-       id="linearGradient11201"
-       x1="103.7051"
-       y1="908.71857"
-       x2="137.86806"
-       y2="917.02185"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2175629,0,0,1.2175629,-22.857692,-202.62836)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11195">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11197" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11199" />
+    <inkscape:path-effect is_visible="true" id="path-effect11341" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11195" id="linearGradient11201" x1="103.7051" y1="908.71857" x2="137.86806" y2="917.02185" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2175629,0,0,1.2175629,-22.857692,-202.62836)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11195">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11197"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11199"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect11339"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11205"
-       id="linearGradient11211"
-       x1="121.5"
-       y1="903.36218"
-       x2="139.375"
-       y2="915.86218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2175629,0,0,1.2175629,-22.857692,-202.62836)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11205">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11207" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11209" />
+    <inkscape:path-effect effect="spiro" id="path-effect11339" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11205" id="linearGradient11211" x1="121.5" y1="903.36218" x2="139.375" y2="915.86218" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2175629,0,0,1.2175629,-22.857692,-202.62836)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11205">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11207"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11209"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect11337"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11303-5"
-       id="linearGradient11309-6"
-       x1="135.04024"
-       y1="954.54626"
-       x2="169.20236"
-       y2="989.5481"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11303-5">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11305" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11307" />
+    <inkscape:path-effect is_visible="true" id="path-effect11337" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11303-5" id="linearGradient11309-6" x1="135.04024" y1="954.54626" x2="169.20236" y2="989.5481" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11303-5">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11305"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11307"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10751"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter11267">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.29359811"
-         id="feGaussianBlur11269" />
+    <inkscape:path-effect effect="spiro" id="path-effect10751" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter11267">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.29359811" id="feGaussianBlur11269"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11311-0"
-       id="linearGradient11317"
-       x1="155.06441"
-       y1="959.83905"
-       x2="162.3956"
-       y2="957.49896"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11311-0">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop11313" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:0;"
-         offset="1"
-         id="stop11315" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11311-0" id="linearGradient11317" x1="155.06441" y1="959.83905" x2="162.3956" y2="957.49896" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11311-0">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop11313"/>
+      <stop style="stop-color:#e6e6e6;stop-opacity:0;" offset="1" id="stop11315"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11319"
-       id="linearGradient11325"
-       x1="162.3956"
-       y1="957.49896"
-       x2="155.06441"
-       y2="959.83905"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11319">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11321" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop11323" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11319" id="linearGradient11325" x1="162.3956" y1="957.49896" x2="155.06441" y2="959.83905" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient11319">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop11321"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop11323"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10755"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter11291"
-       x="-0.16034822"
-       width="1.3206964"
-       y="-0.23403682"
-       height="1.4680736">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25755264"
-         id="feGaussianBlur11293" />
+    <inkscape:path-effect effect="spiro" id="path-effect10755" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter11291" x="-0.16034822" width="1.3206964" y="-0.23403682" height="1.4680736">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.25755264" id="feGaussianBlur11293"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76436"
-       id="radialGradient12964"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6956315,-0.10813922,0.03186768,0.79438031,-160.0516,174.1386)"
-       cx="98.595474"
-       cy="940.00989"
-       fx="98.595474"
-       fy="940.00989"
-       r="16.040424" />
-    <linearGradient
-       id="linearGradient76436">
-      <stop
-         id="stop76438-2"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop76440" />
-      <stop
-         id="stop76442"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient76436" id="radialGradient12964" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.6956315,-0.10813922,0.03186768,0.79438031,-160.0516,174.1386)" cx="98.595474" cy="940.00989" fx="98.595474" fy="940.00989" r="16.040424"/>
+    <linearGradient id="linearGradient76436">
+      <stop id="stop76438-2" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop76440"/>
+      <stop id="stop76442" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11343"
-       id="linearGradient11349"
-       x1="171.25"
-       y1="913.98718"
-       x2="158.9375"
-       y2="926.42468"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008867,0,0,1.008867,-0.45175098,-9.5453309)" />
-    <linearGradient
-       id="linearGradient11343">
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0"
-         id="stop11345" />
-      <stop
-         id="stop11351"
-         offset="0.14881642"
-         style="stop-color:#c0c0c0;stop-opacity:1;" />
-      <stop
-         style="stop-color:#8f8972;stop-opacity:1;"
-         offset="1"
-         id="stop11347" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11343" id="linearGradient11349" x1="171.25" y1="913.98718" x2="158.9375" y2="926.42468" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.008867,0,0,1.008867,-0.45175098,-9.5453309)"/>
+    <linearGradient id="linearGradient11343">
+      <stop style="stop-color:#dbdbdb;stop-opacity:1;" offset="0" id="stop11345"/>
+      <stop id="stop11351" offset="0.14881642" style="stop-color:#c0c0c0;stop-opacity:1;"/>
+      <stop style="stop-color:#8f8972;stop-opacity:1;" offset="1" id="stop11347"/>
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76447-6"
-       id="radialGradient11103"
-       cx="115.09618"
-       cy="936.96252"
-       fx="115.09618"
-       fy="936.96252"
-       r="11.553581"
-       gradientTransform="matrix(0.37550046,0.50294877,-0.77293293,0.57707004,835.73362,312.92049)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient155175">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop155177" />
-      <stop
-         id="stop155179"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop155181" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient76447-6" id="radialGradient11103" cx="115.09618" cy="936.96252" fx="115.09618" fy="936.96252" r="11.553581" gradientTransform="matrix(0.37550046,0.50294877,-0.77293293,0.57707004,835.73362,312.92049)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient155175">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop155177"/>
+      <stop id="stop155179" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop155181"/>
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11608"
-       id="radialGradient11616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.9769634,-0.31910049,0.20203305,1.2516807,-332.71192,-189.68316)"
-       cx="150.27367"
-       cy="920.34589"
-       fx="150.27367"
-       fy="920.34589"
-       r="8.0719891" />
-    <linearGradient
-       id="linearGradient11608">
-      <stop
-         id="stop11610"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0.36476168"
-         id="stop11612" />
-      <stop
-         id="stop11614"
-         offset="1"
-         style="stop-color:#e4e4e4;stop-opacity:1;" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient11608" id="radialGradient11616" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.9769634,-0.31910049,0.20203305,1.2516807,-332.71192,-189.68316)" cx="150.27367" cy="920.34589" fx="150.27367" fy="920.34589" r="8.0719891"/>
+    <linearGradient id="linearGradient11608">
+      <stop id="stop11610" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop style="stop-color:#939393;stop-opacity:1;" offset="0.36476168" id="stop11612"/>
+      <stop id="stop11614" offset="1" style="stop-color:#e4e4e4;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76447-0"
-       id="linearGradient11624"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008867,0,0,1.008867,-0.45175098,-9.5453309)"
-       x1="154.96791"
-       y1="906.07184"
-       x2="156.11557"
-       y2="940.9798" />
-    <linearGradient
-       id="linearGradient76447-0">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76449-2" />
-      <stop
-         id="stop76451-8"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76453-3" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76447-0" id="linearGradient11624" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.008867,0,0,1.008867,-0.45175098,-9.5453309)" x1="154.96791" y1="906.07184" x2="156.11557" y2="940.9798"/>
+    <linearGradient id="linearGradient76447-0">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76449-2"/>
+      <stop id="stop76451-8" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76453-3"/>
     </linearGradient>
-    <linearGradient
-       y2="1112.4785"
-       x2="228.41652"
-       y1="1100.464"
-       x1="196.68877"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient133582"
-       xlink:href="#linearGradient11165-8"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="1112.4785"
-       x2="228.41652"
-       y1="1100.464"
-       x1="196.68877"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient155277"
-       xlink:href="#linearGradient11165-8"
-       inkscape:collect="always" />
+    <linearGradient y2="1112.4785" x2="228.41652" y1="1100.464" x1="196.68877" gradientUnits="userSpaceOnUse" id="linearGradient133582" xlink:href="#linearGradient11165-8" inkscape:collect="always"/>
+    <linearGradient y2="1112.4785" x2="228.41652" y1="1100.464" x1="196.68877" gradientUnits="userSpaceOnUse" id="linearGradient155277" xlink:href="#linearGradient11165-8" inkscape:collect="always"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-81"
-     inkscape:cy="61.96722"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="22"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata155284">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-81" inkscape:cy="61.96722" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="22" inkscape:window-y="29" inkscape:window-maximized="0"/>
+  <metadata id="metadata155284">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-456,-516.10924)">
-    <g
-       style="display:inline"
-       transform="translate(356.53394,-387.19507)"
-       id="g83393"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Satellite.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         transform="matrix(0.90010886,0,0,0.91621998,18.310961,78.451161)"
-         inkscape:connector-curvature="0"
-         id="path11509-7"
-         d="m 218.78125,905.7812 -36.40625,2.5938 -5.5,4.5 0.5,1.0312 0.5,-0.0312 -3.9375,3.5625 -1.96875,-5.6875 c -0.002,-0.0101 0.002,-0.0212 0,-0.0312 -0.91068,-4.7239 -8.71461,-6.7848 -17.4375,-4.625 -0.88346,0.2187 -1.73311,0.4655 -2.5625,0.75 l -14.6875,0.6874 -7.9375,4.0313 0.40625,0.4687 -7.1875,0.125 -14.1875,7.4688 0.4375,0.5 2.03125,-0.0938 -10.34375,5.5626 0.65625,1.375 22.0625,1.4062 22.59375,6.0625 1.5625,4.5937 0.46875,1.1563 c 0.68092,2.0833 1.67464,4.9632 2.71875,7.9063 l 0.1875,1.1562 c -5.07108,0.9261 -9.35689,3.1485 -11.1875,5 -0.68844,0.4937 -1.27432,1.0685 -1.71875,1.7188 -2.99355,4.38 1.00673,10.815 9.03125,15.25 l 2.40625,4.6562 -1.46875,3.2188 3.03125,1.7812 1.71875,-3.7812 c -0.036,-0.1507 -0.0858,-0.2437 -0.125,-0.375 l 4.40625,-1.75 c 7.78328,1.716 14.9222,0.5986 17.53125,-3.2188 0.61248,-0.8961 0.94679,-1.9038 1,-2.9375 l 1.71875,1.9063 1.25,-2.0313 2.53125,1.5937 -0.21875,-2.2812 2.5625,-0.5938 0.3125,-1.7812 1.875,1.2188 -0.0937,-0.125 0.6875,0.4374 -2.6875,-3.5624 -0.0625,0.0624 c 0.30405,-0.6596 0.39809,-1.2766 0.15625,-1.7812 l -0.0312,-0.0625 c -0.0101,-0.014 -0.0211,-0.0173 -0.0312,-0.0313 l -2.125,-4.125 c 3.08962,-2.4069 4.81443,-5.2711 4.3125,-7.875 -0.0403,-0.209 -0.12073,-0.3951 -0.1875,-0.5937 l -5.4375,-15.6563 15.25,-1.9374 12.71875,0.4687 3.1875,-9.5937 -0.84375,-1.75 16.40625,-0.3126 1.875,-8.5312 -0.21875,-1.8125 -0.15625,0 -0.125,0 -10.34375,0.5625 1.625,-4.8125 -0.5,-1 0,-0.0313 z m -78.3125,14.125 0.0937,0.3126 -0.4375,-0.0313 0.34375,-0.2813 z m 0.4375,1.3126 1.25,3.6562 -3.3125,-2.0625 2.0625,-1.5937 z M 137,924.25 l 6.3125,3.9688 1.375,4 L 131.15625,928.75 137,924.25 z"
-         style="opacity:0.75784757;fill:url(#linearGradient12490);fill-opacity:1;stroke:none;filter:url(#filter12480)" />
-      <path
-         style="fill:#d45500;stroke:none;filter:url(#filter11513)"
-         d="m 182.5,961.86218 3,4 -2.75773,-1.7951 -0.36727,2.0451 -2.87584,0.68508 0.25084,2.56492 -2.8494,-1.78242 -1.4006,2.28242 -2.20711,-2.44194 6.18211,-1.95136 3.025,-3.6067"
-         id="path11509-8"
-         inkscape:path-effect="#path-effect11511"
-         inkscape:original-d="m 182.5,961.86218 3,4 -2.75773,-1.7951 -0.36727,2.0451 -2.87584,0.68508 0.25084,2.56492 -2.8494,-1.78242 -1.4006,2.28242 -2.20711,-2.44194 6.18211,-1.95136 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccc"
-         transform="matrix(0.8907466,0,0,0.8907466,19.732253,105.3381)" />
-      <path
-         style="fill:url(#linearGradient11359);fill-opacity:1;stroke:url(#linearGradient11367);stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 116.23511,922.68657 29.56742,7.61179 1.4023,3.3029 -32.8963,-8.80136 1.92658,-2.11333"
-         id="path10731"
-         inkscape:path-effect="#path-effect10733"
-         inkscape:original-d="m 116.23511,922.68657 29.56742,7.61179 1.4023,3.3029 -32.8963,-8.80136 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         transform="matrix(0.82397747,0,0,0.82397747,31.516414,169.50918)"
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 182.5,961.86218 3,4 -2.75773,-1.7951 -0.36727,2.0451 -2.87584,0.68508 0.25084,2.56492 -2.8494,-1.78242 -1.4006,2.28242 -2.20711,-2.44194 6.18211,-1.95136 z"
-         inkscape:path-effect="#path-effect11511"
-         id="path11517-6"
-         d="m 182.5,961.86218 3,4 -2.75773,-1.7951 -0.36727,2.0451 -2.87584,0.68508 0.25084,2.56492 -2.8494,-1.78242 -1.4006,2.28242 -2.20711,-2.44194 6.18211,-1.95136 3.025,-3.6067"
-         style="opacity:0.58295964;fill:url(#linearGradient11525);fill-opacity:1;stroke:none;filter:url(#filter11513)" />
-      <path
-         style="fill:url(#linearGradient11087);fill-opacity:1;stroke:none"
-         d="m 174.28301,944.77723 c -0.59369,-0.73015 -2.35483,-0.63054 -4.10083,0.27524 -1.77889,0.92282 -2.89817,2.34196 -2.59257,3.24965 l 3.58785,17.38054 0.0101,-0.007 c 0.0275,0.13236 0.0644,0.26085 0.12599,0.38088 0.75367,1.46688 3.83677,1.38173 6.88154,-0.19814 3.01977,-1.5669 4.87302,-4.01556 4.16802,-5.48663 l -0.0127,-0.0379 c -0.0101,-0.0135 -0.0202,-0.0271 -0.0304,-0.0407 l -7.93098,-15.37286 -0.0101,0.007 c -0.0277,-0.0519 -0.0592,-0.10444 -0.0962,-0.14983 z"
-         id="path10805-0"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 127.00165,913.61781 21.28327,13.15935 0.29278,2.92624 -23.59843,-14.90118 z"
-         inkscape:path-effect="#path-effect11375"
-         id="path11369-2"
-         d="m 127.00165,913.61781 21.28327,13.15935 0.29278,2.92624 -23.59843,-14.90118 2.02238,-1.18441"
-         style="fill:url(#linearGradient11371);fill-opacity:1;stroke:url(#linearGradient11373);stroke-width:0.33271757px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient12572);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 170.94409,909.25706 -31.5535,8.06993 6.94267,20.20798 6.65126,16.32831 -6.95341,-17.95052 c -0.18922,0.75804 6.72697,19.4769 6.86826,20.20962 0.91057,4.72412 8.72768,6.80759 17.4506,4.64778 0.81777,-0.20249 1.60288,-0.43726 2.37463,-0.69636 l 0.1069,-0.0126 0.11848,-0.0682 c 7.33785,-2.52857 12.3607,-7.45219 11.54378,-11.69007 -0.0403,-0.20905 -0.10394,-0.40455 -0.17071,-0.6031 z"
-         id="path10664"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccscccccc" />
-      <path
-         style="fill:url(#linearGradient11335);fill-opacity:1;stroke:#333333;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 165.97266,930.63068 c -0.37675,0.45924 -0.51985,1.10077 -0.37398,1.67659 0.14654,0.57847 0.58124,1.07627 1.13469,1.29941 l 32.08441,-4.10335 -14.91232,-0.79128 -17.9328,1.91863"
-         id="path10735"
-         inkscape:path-effect="#path-effect10737"
-         inkscape:original-d="m 165.97266,930.63068 c -0.31554,0.60658 -0.47048,1.17301 -0.37398,1.67659 0.0966,0.50356 0.44445,0.94428 1.13469,1.29941 l 32.08441,-4.10335 -14.91232,-0.79128 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscccc" />
-      <path
-         style="fill:url(#linearGradient11055);fill-opacity:1;stroke:none"
-         d="m 154.36812,926.53336 10.65184,24.39193 c -0.62112,-0.0579 -1.24177,-0.12071 -1.86188,-0.18859 -1.66397,-0.18214 -3.32384,-0.40032 -4.9809,-0.63726 -0.9546,-0.13649 -1.90831,-0.27922 -2.86105,-0.42815 l -5.5715,-1.74272 -3.47315,-22.02168 0.30531,0.21391 0.73912,0.29197 c 0.36938,0.0815 0.73982,0.15808 1.11119,0.22988 0.49043,0.0948 0.9825,0.18118 1.4759,0.25906 0.27076,-0.003 0.54153,-0.005 0.8123,-0.006 0.57861,-0.002 1.15723,0.002 1.73576,0.0115 0.3581,-0.0757 0.71687,-0.14824 1.07625,-0.21759 0.27991,-0.054 0.56019,-0.10611 0.84081,-0.15626"
-         id="path10727"
-         inkscape:path-effect="#path-effect10729"
-         inkscape:original-d="m 154.36812,926.53336 10.65184,24.39193 -1.86188,-0.18859 -4.9809,-0.63726 -2.86105,-0.42815 -5.5715,-1.74272 -3.47315,-22.02168 0.30531,0.21391 0.73912,0.29197 1.11119,0.22988 1.4759,0.25906 0.8123,-0.006 1.73576,0.0115 1.07625,-0.21759 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 148.49951,909.83881 -9.39689,7.8645 1.94009,0.13901 -12.28598,9.47451 -28.64978,-1.84448 -0.638812,-1.36288 11.352182,-5.62226 -3.04597,0.15598 -0.43927,-0.52126 4.16615,-0.02 -4.16569,0.0207 14.28318,-7.4077 5.66739,-0.0965 1.67072,0.18631 -0.64783,-0.72386 7.94711,-4.03027 16.1658,-0.67185 z"
-         inkscape:path-effect="#path-effect10680-4"
-         id="path10678"
-         d="m 148.49951,909.83881 -9.39689,7.8645 1.94009,0.13901 -12.28598,9.47451 -28.64978,-1.84448 -0.638812,-1.36288 11.352182,-5.62226 -3.04597,0.15598 -0.43927,-0.52126 4.16615,-0.02 -4.16569,0.0207 14.28318,-7.4077 5.66739,-0.0965 1.67072,0.18631 -0.64783,-0.72386 7.94711,-4.03027 16.1658,-0.67185 -3.9224,4.46005"
-         style="fill:#000037;fill-opacity:1;stroke:none"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         style="fill:#3c3c60;fill-opacity:1;stroke:none"
-         d="m 151.55674,905.32426 -3.8807,4.42718 -19.36623,0.32809 7.93894,-4.03502 15.30799,-0.72025"
-         id="path10666"
-         inkscape:path-effect="#path-effect10668-09"
-         inkscape:original-d="m 151.55674,905.32426 -3.8807,4.42718 -19.36623,0.32809 7.93894,-4.03502 z"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 134.85274,906.90344 16.24888,-0.4558"
-         inkscape:path-effect="#path-effect10950"
-         id="path10948-4"
-         d="m 134.85274,906.90344 16.24888,-0.4558"
-         style="fill:none;stroke:#7480bd;stroke-width:0.15473038px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 146.86675,910.25287 -9.26415,7.59318 -30.26535,0.27752 14.19526,-7.4605 z"
-         inkscape:path-effect="#path-effect10672-4"
-         id="path10670"
-         d="m 146.86675,910.25287 -9.26415,7.59318 -30.26535,0.27752 14.19526,-7.4605 25.33424,-0.4102"
-         style="fill:#39406e;fill-opacity:1;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#324376;fill-opacity:1;stroke:none"
-         d="m 139.23569,918.20922 -10.67328,7.98415 -29.09635,-2.08428 10.57659,-5.69879 29.19304,-0.20108"
-         id="path10674"
-         inkscape:path-effect="#path-effect10676-8"
-         inkscape:original-d="m 139.23569,918.20922 -10.67328,7.98415 -29.09635,-2.08428 10.57659,-5.69879 z"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 176.32755,911.41918 -0.47941,-1.03127 5.97932,-3.48535 35.92207,-3.59745 0.48439,1.02609 -1.70742,5.11593 z"
-         inkscape:path-effect="#path-effect10692-8"
-         id="path10690"
-         d="m 176.32755,911.41918 -0.47941,-1.03127 5.97932,-3.48535 35.92207,-3.59745 0.48439,1.02609 -1.70742,5.11593 -40.19895,1.97205"
-         style="fill:#000037;fill-opacity:1;stroke:none" />
-      <path
-         style="fill:#3c3d6b;fill-opacity:1;stroke:none"
-         d="m 175.84859,910.38945 5.49609,-4.51375 36.40647,-2.57139 -1.70742,5.11594 -40.19514,1.9692"
-         id="path10686"
-         inkscape:path-effect="#path-effect10688-2"
-         inkscape:original-d="m 175.84859,910.38945 5.49609,-4.51375 36.40647,-2.57139 -1.70742,5.11594 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#000037;fill-opacity:1;stroke:none"
-         d="m 169.56807,919.95098 -0.12571,-1.88049 7.6304,-4.93282 50.1592,-4.56316 0.2341,1.81841 -1.88142,8.53297 -56.01657,1.02509"
-         id="path10698"
-         inkscape:path-effect="#path-effect10700-45"
-         inkscape:original-d="m 169.56807,919.95098 -0.12571,-1.88049 7.6304,-4.93282 50.1592,-4.56316 0.2341,1.81841 -1.88142,8.53297 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 169.44228,918.06827 7.41977,-6.71229 50.11831,-2.7832 -2.0926,8.80941 z"
-         inkscape:path-effect="#path-effect10696-51"
-         id="path10694"
-         d="m 169.44228,918.06827 7.41977,-6.71229 50.11831,-2.7832 -2.0926,8.80941 -55.44548,0.68608"
-         style="fill:#33366e;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 166.30314,921.67401 -9.04387,5.40409 0.85183,1.70727 48.7373,1.78761 3.16576,-9.58818 -0.84069,-1.76389 z"
-         inkscape:path-effect="#path-effect10708-7"
-         id="path10706"
-         d="m 166.30314,921.67401 -9.04387,5.40409 0.85183,1.70727 48.7373,1.78761 3.16576,-9.58818 -0.84069,-1.76389 -42.87033,2.4531"
-         style="fill:#000037;fill-opacity:1;stroke:none" />
-      <path
-         style="fill:#384276;fill-opacity:1;stroke:none"
-         d="m 166.33123,920.01047 -9.07228,7.06908 49.01703,1.76548 2.90053,-9.62167 -42.84528,0.78711"
-         id="path10702"
-         inkscape:path-effect="#path-effect10704-11"
-         inkscape:original-d="m 166.33123,920.01047 -9.07228,7.06908 49.01703,1.76548 2.90053,-9.62167 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:url(#linearGradient11079);fill-opacity:1;stroke:none"
-         d="m 154.36216,926.48299 2.96566,-3.00789 13.86505,33.4141 -1.30482,-0.66327 -2.96362,-2.67822 -1.89426,-2.40939 -10.66801,-24.65533"
-         id="path10719-8"
-         inkscape:path-effect="#path-effect10721"
-         inkscape:original-d="m 154.36216,926.48299 2.96566,-3.00789 13.86505,33.4141 -1.30482,-0.66327 -2.96362,-2.67822 -1.89426,-2.40939 c -4.91238,-5.22764 -4.27727,-21.40695 -10.66801,-24.65533 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:url(#linearGradient11071);fill-opacity:1;stroke:none"
-         d="m 157.32911,923.47347 c -1.88346,0.57944 -3.85197,0.8816 -5.8225,0.89374 -1.76517,0.0109 -3.53164,-0.21065 -5.23946,-0.65706 l 0.0282,2.39832 c 1.3296,0.45839 2.72514,0.725 4.13007,0.78905 1.35657,0.0618 2.72161,-0.0651 4.04351,-0.37605 l 2.86018,-3.048"
-         id="path10723-6"
-         inkscape:path-effect="#path-effect10725"
-         inkscape:original-d="m 157.32911,923.47347 c 0,0 -3.85909,0.86668 -5.8225,0.89374 -1.75999,0.0242 -5.23946,-0.65706 -5.23946,-0.65706 l 0.0282,2.39832 c 1.6952,0.3972 2.58271,0.78943 4.13007,0.78905 1.54741,-4.1e-4 4.04351,-0.37605 4.04351,-0.37605 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csccscc" />
-      <path
-         id="path10715-5"
-         style="fill:url(#radialGradient11047);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 173.76866,967.77652 c -1.95722,3.27902 -4.94723,9.52986 -23.10905,3.78779 -14.70377,-4.64886 -14.79437,-14.71436 -12.83707,-17.9935 1.95721,-3.27905 14.20876,-8.87629 24.22771,-4.88168 10.23562,4.08097 13.67564,15.80827 11.71841,19.08739 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssss" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path10711-0"
-         sodipodi:cx="226.25"
-         sodipodi:cy="1097.3622"
-         sodipodi:rx="26.75"
-         sodipodi:ry="13"
-         d="m 253,1097.3622 c 0,7.1797 -11.97638,13 -26.75,13 -14.77362,0 -26.75,-5.8203 -26.75,-13 0,-7.1797 11.97638,-13 26.75,-13 14.77362,0 26.75,5.8203 26.75,13 z"
-         transform="matrix(0.68300213,0.29488888,-0.46856335,0.6855768,514.73355,143.31066)" />
-      <path
-         transform="matrix(0.65801263,0.28409957,-0.45141968,0.66049316,501.5746,173.27766)"
-         d="m 253,1097.3622 c 0,7.1797 -11.97638,13 -26.75,13 -14.77362,0 -26.75,-5.8203 -26.75,-13 0,-7.1797 11.97638,-13 26.75,-13 14.77362,0 26.75,5.8203 26.75,13 z"
-         sodipodi:ry="13"
-         sodipodi:rx="26.75"
-         sodipodi:cy="1097.3622"
-         sodipodi:cx="226.25"
-         id="path10713-9"
-         style="fill:url(#radialGradient11039);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         style="fill:none;stroke:#535353;stroke-width:0.70822465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 137.34901,954.99638 11.80701,21.09722 24.46676,-8.61956"
-         id="path10749"
-         inkscape:path-effect="#path-effect11505"
-         inkscape:original-d="m 137.34901,954.99638 11.80701,21.09722 24.46676,-8.61956"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="rect10757"
-         style="fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.13718231;stroke-miterlimit:4;stroke-opacity:1"
-         d="m 149.80316,979.36785 -3.0239,-1.75381 1.71399,-3.75084 c 1.18447,-0.45591 2.37643,-0.95748 3.02391,1.7536 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#535353;stroke-width:0.70822465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 162.24778,954.41592 -12.91935,21.46879"
-         id="path10753"
-         inkscape:path-effect="#path-effect11503"
-         inkscape:original-d="m 162.24778,954.41592 -12.91935,21.46879"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 178.47084,908.48053 38.07555,-1.96225"
-         id="path10788"
-         inkscape:path-effect="#path-effect10790-4"
-         inkscape:original-d="m 178.47084,908.48053 38.07555,-1.96225"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 198.6825,904.69924 -1.69875,4.53156"
-         id="path10792"
-         inkscape:path-effect="#path-effect10794-2"
-         inkscape:original-d="m 198.6825,904.69924 -1.69875,4.53156"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 188.09528,905.57322 -2.25769,4.1428"
-         inkscape:path-effect="#path-effect10798-32"
-         id="path10796"
-         d="m 188.09528,905.57322 -2.25769,4.1428"
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 209.95095,904.07793 -1.69876,4.53156"
-         id="path10800"
-         inkscape:path-effect="#path-effect10802-21"
-         inkscape:original-d="m 209.95095,904.07793 -1.69876,4.53156"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 180.31095,907.04338 36.61448,-2.13798"
-         inkscape:path-effect="#path-effect10828-6"
-         id="path10826"
-         d="m 180.31095,907.04338 36.61448,-2.13798"
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 175.72141,912.68641 50.80869,-2.224"
-         inkscape:path-effect="#path-effect10832-8"
-         id="path10830"
-         d="m 175.72141,912.68641 50.80869,-2.224"
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 174.05856,914.2762 51.7764,-1.52161"
-         id="path10834"
-         inkscape:path-effect="#path-effect10836-5"
-         inkscape:original-d="m 174.05856,914.2762 51.7764,-1.52161"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 172.07529,916.2002 53.45055,-1.31497"
-         inkscape:path-effect="#path-effect10840-76"
-         id="path10838"
-         d="m 172.07529,916.2002 53.45055,-1.31497"
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 187.68791,910.88029 -3.95365,6.96055"
-         id="path10846"
-         inkscape:path-effect="#path-effect10848-1"
-         inkscape:original-d="m 187.68791,910.88029 -3.95365,6.96055"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 199.35551,910.30695 -3.82246,7.30592"
-         inkscape:path-effect="#path-effect10852-8"
-         id="path10850"
-         d="m 199.35551,910.30695 -3.82246,7.30592"
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 211.94622,909.73879 -2.62377,7.70718"
-         id="path10854"
-         inkscape:path-effect="#path-effect10856-9"
-         inkscape:original-d="m 211.94622,909.73879 c -1.71427,3.64923 -1.28337,5.14854 -2.62377,7.70718"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 164.61746,921.51751 43.68427,0.20276"
-         id="path10858"
-         inkscape:path-effect="#path-effect10860-2"
-         inkscape:original-d="m 164.61746,921.51751 43.68427,0.20276"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 162.58207,923.1211 45.10493,0.65051"
-         inkscape:path-effect="#path-effect10864-7"
-         id="path10862"
-         d="m 162.58207,923.1211 45.10493,0.65051"
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 159.84623,925.17021 46.96936,1.32902"
-         id="path10866"
-         inkscape:path-effect="#path-effect10868-9"
-         inkscape:original-d="m 159.84623,925.17021 46.96936,1.32902"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 173.85422,919.89304 -4.27108,7.5091"
-         inkscape:path-effect="#path-effect10872-54"
-         id="path10870"
-         d="m 173.85422,919.89304 -4.27108,7.5091"
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 186.1263,919.73118 -3.60104,8.08198"
-         id="path10874"
-         inkscape:path-effect="#path-effect10876"
-         inkscape:original-d="m 186.1263,919.73118 -3.60104,8.08198"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 199.48603,919.44963 -3.62478,8.79206"
-         inkscape:path-effect="#path-effect10880"
-         id="path10878"
-         d="m 199.48603,919.44963 -3.62478,8.79206"
-         style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 108.03791,919.58485 28.12221,0.72879"
-         id="path10834-5"
-         inkscape:path-effect="#path-effect10836-1"
-         inkscape:original-d="m 108.03791,919.58485 28.12221,0.72879"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 105.48301,920.99012 28.24916,1.13621"
-         inkscape:path-effect="#path-effect10905"
-         id="path10903-0"
-         d="m 105.48301,920.99012 28.24916,1.13621"
-         style="fill:none;stroke:#7480bd;stroke-width:0.23255244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 102.57375,922.57729 28.74412,1.35155"
-         id="path10907-0"
-         inkscape:path-effect="#path-effect10909"
-         inkscape:original-d="m 102.57375,922.57729 28.74412,1.35155"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 111.35,916.24339 28.75959,-0.63333"
-         id="path10834-5-3"
-         inkscape:path-effect="#path-effect10836-1-3"
-         inkscape:original-d="m 111.35,916.24339 28.75959,-0.63333"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 115.17046,914.15912 27.61394,-0.66424"
-         inkscape:path-effect="#path-effect10934-31"
-         id="path10932-6"
-         d="m 115.17046,914.15912 27.61394,-0.66424"
-         style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 118.5453,912.34848 26.46828,-0.69515"
-         id="path10936-13"
-         inkscape:path-effect="#path-effect10938-2"
-         inkscape:original-d="m 118.5453,912.34848 26.46828,-0.69515"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 130.25534,909.21326 17.60293,-0.46231"
-         inkscape:path-effect="#path-effect10942-33"
-         id="path10940-8"
-         d="m 130.25534,909.21326 17.60293,-0.46231"
-         style="fill:none;stroke:#7480bd;stroke-width:0.15473038px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;stroke:#7480bd;stroke-width:0.15473038px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 132.67265,907.94025 16.2489,-0.4558"
-         id="path10944-93"
-         inkscape:path-effect="#path-effect10946-4"
-         inkscape:original-d="m 132.67265,907.94025 16.2489,-0.4558"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.23255244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 116.92476,918.45226 -8.78355,6.20147"
-         id="path10952-4"
-         inkscape:path-effect="#path-effect10954-11"
-         inkscape:original-d="m 116.92476,918.45226 -8.78355,6.20147"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 123.30676,918.34359 -9.14248,6.75205"
-         inkscape:path-effect="#path-effect10958-38"
-         id="path10956"
-         d="m 123.30676,918.34359 -9.14248,6.75205"
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.23255244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.23255244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 130.56957,918.41529 -9.9088,7.12127"
-         id="path10960-4"
-         inkscape:path-effect="#path-effect10962"
-         inkscape:original-d="m 130.56957,918.41529 -9.9088,7.12127"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 126.91228,910.70017 -11.28497,7.1828"
-         inkscape:path-effect="#path-effect10970-74"
-         id="path10964"
-         d="m 126.91228,910.70017 -11.28497,7.1828"
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.24923341;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.24016692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 132.71581,910.60982 -10.52503,7.19343"
-         id="path10966"
-         inkscape:path-effect="#path-effect10972"
-         inkscape:original-d="m 132.71581,910.60982 -10.52503,7.19343"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 139.64001,910.46165 -10.21324,7.34857"
-         inkscape:path-effect="#path-effect10974-277"
-         id="path10968-6"
-         d="m 139.64001,910.46165 -10.21324,7.34857"
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.23614579;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 140.47898,905.87555 -6.26853,4.03074"
-         inkscape:path-effect="#path-effect10974-9-9"
-         id="path10968-0-0"
-         d="m 140.47898,905.87555 -6.26853,4.03074"
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.12635595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.12635595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 145.05238,905.67796 -6.40944,4.17772"
-         id="path10997-6"
-         inkscape:path-effect="#path-effect10999"
-         inkscape:original-d="m 145.05238,905.67796 -6.40944,4.17772"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 150.42047,904.61435 -6.23171,4.23782"
-         inkscape:path-effect="#path-effect11003"
-         id="path11001-6"
-         d="m 150.42047,904.61435 -6.23171,4.23782"
-         style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.12635595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 166.28664,920.01047 -9.02769,7.06908 49.01703,1.76548 2.90053,-9.62167 z"
-         inkscape:path-effect="#path-effect11501"
-         id="path11153"
-         d="m 166.28664,920.01047 -9.02769,7.06908 49.01703,1.76548 2.90053,-9.62167 -42.88987,0.78711"
-         style="fill:url(#linearGradient11161-3);fill-opacity:1;stroke:none" />
-      <path
-         style="fill:url(#linearGradient11171-9);fill-opacity:1;stroke:none"
-         d="m 169.44228,918.06827 7.41977,-6.71229 50.24442,-2.7832 -2.0926,8.80941 -55.57159,0.68608"
-         id="path11163"
-         inkscape:path-effect="#path-effect11499"
-         inkscape:original-d="m 169.44228,918.06827 7.41977,-6.71229 50.24442,-2.7832 -2.0926,8.80941 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 175.84859,910.38945 5.49609,-4.51375 36.40647,-2.57139 -1.70742,5.11594 z"
-         inkscape:path-effect="#path-effect11497"
-         id="path11173"
-         d="m 175.84859,910.38945 5.49609,-4.51375 36.40647,-2.57139 -1.70742,5.11594 -40.19514,1.9692"
-         style="fill:url(#linearGradient11181);fill-opacity:1;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 139.23569,918.20922 -10.67328,7.98415 -29.09635,-2.08428 10.57659,-5.69879 z"
-         inkscape:path-effect="#path-effect11341"
-         id="path11183-1"
-         d="m 139.23569,918.20922 -10.67328,7.98415 -29.09635,-2.08428 10.57659,-5.69879 29.19304,-0.20108"
-         style="fill:url(#linearGradient11191);fill-opacity:1;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:url(#linearGradient11201);fill-opacity:1;stroke:none"
-         d="m 146.86675,910.25287 -9.26415,7.59318 -30.26535,0.27752 14.19526,-7.4605 25.33424,-0.4102"
-         id="path11193-8"
-         inkscape:path-effect="#path-effect11339"
-         inkscape:original-d="m 146.86675,910.25287 -9.26415,7.59318 -30.26535,0.27752 14.19526,-7.4605 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 151.55674,905.32426 -3.8807,4.42718 -19.36623,0.32809 7.93894,-4.03502 z"
-         inkscape:path-effect="#path-effect11337"
-         id="path11203-4"
-         d="m 151.55674,905.32426 -3.8807,4.42718 -19.36623,0.32809 7.93894,-4.03502 15.30799,-0.72025"
-         style="fill:url(#linearGradient11211);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 138.06739,955.56163 17.8564,4.24073 15.90827,7.16354"
-         inkscape:path-effect="#path-effect10751"
-         id="path11239-9"
-         d="m 138.06739,955.56163 17.8564,4.24073 15.90827,7.16354"
-         style="opacity:0.444;fill:none;stroke:url(#linearGradient11309-6);stroke-width:0.40239453px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter11267)"
-         transform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 160.99509,955.64978 -4.82717,3.87858"
-         inkscape:path-effect="#path-effect10755"
-         id="path11261-6"
-         d="m 160.99509,955.64978 -4.82717,3.87858"
-         style="opacity:0.444;fill:url(#linearGradient11317);fill-opacity:1;stroke:url(#linearGradient11325);stroke-width:0.40239453px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter11291)"
-         transform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)" />
-      <path
-         d="m 156.79278,921.69997 c -8.72289,2.15977 -16.53249,0.0811 -17.4431,-4.64296 -0.91066,-4.72404 5.42246,-10.30457 14.14547,-12.4645 8.72289,-2.15985 16.53244,-0.0811 17.44312,4.64289 0.91061,4.72407 -5.42246,10.30458 -14.14549,12.46457 z"
-         style="fill:url(#radialGradient12964);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path10662"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path10660"
-         style="fill:url(#linearGradient11349);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 156.23817,918.33153 c -6.33012,1.56735 -11.9975,0.0589 -12.65835,-3.36931 -0.66082,-3.42825 3.93508,-7.47801 10.2653,-9.04544 6.33016,-1.5674 11.99749,-0.0589 12.65829,3.36935 0.66086,3.42819 -3.93498,7.47791 -10.26524,9.0454 z" />
-      <path
-         d="m 155.93071,917.66204 c -6.28297,1.5557 -11.90804,0.0585 -12.56398,-3.34415 -0.65588,-3.40266 3.90571,-7.4222 10.18872,-8.97794 6.28296,-1.55573 11.90797,-0.0584 12.56391,3.34417 0.65588,3.40265 -3.90571,7.42219 -10.18865,8.97792 z"
-         style="fill:url(#radialGradient11103);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path10658"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:url(#radialGradient11616);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 161.08683,905.31412 -1.63483,0.3973 c -1.53582,-0.35988 -3.5807,-0.26526 -5.75533,0.37058 -1.96575,0.57475 -3.69295,1.49113 -4.97356,2.54167 l -2.59463,0.70224 c -0.42685,1.39522 -0.18163,2.28236 0.46639,3.72063 0.71009,2.0374 4.30004,2.73052 8.36963,1.54062 4.33257,-1.26675 7.56068,-4.19023 7.21249,-6.54057 -0.0435,-0.2938 -0.14448,-0.56607 -0.29003,-0.81254 -0.002,-0.004 -0.006,-0.007 -0.007,-0.0102 z"
-         id="path10648"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccscccssccc" />
-      <path
-         id="path10646"
-         style="fill:url(#linearGradient11624);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 154.26323,912.3208 c -4.21194,1.23149 -7.90075,0.37756 -8.23926,-1.90726 -0.33854,-2.28483 2.80146,-5.13539 7.01341,-6.36689 4.21187,-1.23148 7.90073,-0.37757 8.23926,1.90725 0.33852,2.28483 -2.80153,5.13543 -7.01341,6.3669 z"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient155277);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path11604"
-         sodipodi:cx="226.25"
-         sodipodi:cy="1097.3622"
-         sodipodi:rx="26.75"
-         sodipodi:ry="13"
-         d="m 253,1097.3622 c 0,7.1797 -11.97638,13 -26.75,13 -14.77362,0 -26.75,-5.8203 -26.75,-13 0,-7.1797 11.97638,-13 26.75,-13 14.77362,0 26.75,5.8203 26.75,13 z"
-         transform="matrix(0.65801263,0.28409957,-0.45141968,0.66049316,501.5746,173.27766)" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-456,-516.10924)">
+    <g style="display:inline" transform="translate(356.53394,-387.19507)" id="g83393">
+      <path transform="matrix(0.90010886,0,0,0.91621998,18.310961,78.451161)" inkscape:connector-curvature="0" id="path11509-7" d="m 218.78125,905.7812 -36.40625,2.5938 -5.5,4.5 0.5,1.0312 0.5,-0.0312 -3.9375,3.5625 -1.96875,-5.6875 c -0.002,-0.0101 0.002,-0.0212 0,-0.0312 -0.91068,-4.7239 -8.71461,-6.7848 -17.4375,-4.625 -0.88346,0.2187 -1.73311,0.4655 -2.5625,0.75 l -14.6875,0.6874 -7.9375,4.0313 0.40625,0.4687 -7.1875,0.125 -14.1875,7.4688 0.4375,0.5 2.03125,-0.0938 -10.34375,5.5626 0.65625,1.375 22.0625,1.4062 22.59375,6.0625 1.5625,4.5937 0.46875,1.1563 c 0.68092,2.0833 1.67464,4.9632 2.71875,7.9063 l 0.1875,1.1562 c -5.07108,0.9261 -9.35689,3.1485 -11.1875,5 -0.68844,0.4937 -1.27432,1.0685 -1.71875,1.7188 -2.99355,4.38 1.00673,10.815 9.03125,15.25 l 2.40625,4.6562 -1.46875,3.2188 3.03125,1.7812 1.71875,-3.7812 c -0.036,-0.1507 -0.0858,-0.2437 -0.125,-0.375 l 4.40625,-1.75 c 7.78328,1.716 14.9222,0.5986 17.53125,-3.2188 0.61248,-0.8961 0.94679,-1.9038 1,-2.9375 l 1.71875,1.9063 1.25,-2.0313 2.53125,1.5937 -0.21875,-2.2812 2.5625,-0.5938 0.3125,-1.7812 1.875,1.2188 -0.0937,-0.125 0.6875,0.4374 -2.6875,-3.5624 -0.0625,0.0624 c 0.30405,-0.6596 0.39809,-1.2766 0.15625,-1.7812 l -0.0312,-0.0625 c -0.0101,-0.014 -0.0211,-0.0173 -0.0312,-0.0313 l -2.125,-4.125 c 3.08962,-2.4069 4.81443,-5.2711 4.3125,-7.875 -0.0403,-0.209 -0.12073,-0.3951 -0.1875,-0.5937 l -5.4375,-15.6563 15.25,-1.9374 12.71875,0.4687 3.1875,-9.5937 -0.84375,-1.75 16.40625,-0.3126 1.875,-8.5312 -0.21875,-1.8125 -0.15625,0 -0.125,0 -10.34375,0.5625 1.625,-4.8125 -0.5,-1 0,-0.0313 z m -78.3125,14.125 0.0937,0.3126 -0.4375,-0.0313 0.34375,-0.2813 z m 0.4375,1.3126 1.25,3.6562 -3.3125,-2.0625 2.0625,-1.5937 z M 137,924.25 l 6.3125,3.9688 1.375,4 L 131.15625,928.75 137,924.25 z" style="opacity:0.75784757;fill:url(#linearGradient12490);fill-opacity:1;stroke:none;filter:url(#filter12480)"/>
+      <path style="fill:#d45500;stroke:none;filter:url(#filter11513)" d="m 182.5,961.86218 3,4 -2.75773,-1.7951 -0.36727,2.0451 -2.87584,0.68508 0.25084,2.56492 -2.8494,-1.78242 -1.4006,2.28242 -2.20711,-2.44194 6.18211,-1.95136 3.025,-3.6067" id="path11509-8" inkscape:path-effect="#path-effect11511" inkscape:original-d="m 182.5,961.86218 3,4 -2.75773,-1.7951 -0.36727,2.0451 -2.87584,0.68508 0.25084,2.56492 -2.8494,-1.78242 -1.4006,2.28242 -2.20711,-2.44194 6.18211,-1.95136 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccc" transform="matrix(0.8907466,0,0,0.8907466,19.732253,105.3381)"/>
+      <path style="fill:url(#linearGradient11359);fill-opacity:1;stroke:url(#linearGradient11367);stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 116.23511,922.68657 29.56742,7.61179 1.4023,3.3029 -32.8963,-8.80136 1.92658,-2.11333" id="path10731" inkscape:path-effect="#path-effect10733" inkscape:original-d="m 116.23511,922.68657 29.56742,7.61179 1.4023,3.3029 -32.8963,-8.80136 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path transform="matrix(0.82397747,0,0,0.82397747,31.516414,169.50918)" sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 182.5,961.86218 3,4 -2.75773,-1.7951 -0.36727,2.0451 -2.87584,0.68508 0.25084,2.56492 -2.8494,-1.78242 -1.4006,2.28242 -2.20711,-2.44194 6.18211,-1.95136 z" inkscape:path-effect="#path-effect11511" id="path11517-6" d="m 182.5,961.86218 3,4 -2.75773,-1.7951 -0.36727,2.0451 -2.87584,0.68508 0.25084,2.56492 -2.8494,-1.78242 -1.4006,2.28242 -2.20711,-2.44194 6.18211,-1.95136 3.025,-3.6067" style="opacity:0.58295964;fill:url(#linearGradient11525);fill-opacity:1;stroke:none;filter:url(#filter11513)"/>
+      <path style="fill:url(#linearGradient11087);fill-opacity:1;stroke:none" d="m 174.28301,944.77723 c -0.59369,-0.73015 -2.35483,-0.63054 -4.10083,0.27524 -1.77889,0.92282 -2.89817,2.34196 -2.59257,3.24965 l 3.58785,17.38054 0.0101,-0.007 c 0.0275,0.13236 0.0644,0.26085 0.12599,0.38088 0.75367,1.46688 3.83677,1.38173 6.88154,-0.19814 3.01977,-1.5669 4.87302,-4.01556 4.16802,-5.48663 l -0.0127,-0.0379 c -0.0101,-0.0135 -0.0202,-0.0271 -0.0304,-0.0407 l -7.93098,-15.37286 -0.0101,0.007 c -0.0277,-0.0519 -0.0592,-0.10444 -0.0962,-0.14983 z" id="path10805-0" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 127.00165,913.61781 21.28327,13.15935 0.29278,2.92624 -23.59843,-14.90118 z" inkscape:path-effect="#path-effect11375" id="path11369-2" d="m 127.00165,913.61781 21.28327,13.15935 0.29278,2.92624 -23.59843,-14.90118 2.02238,-1.18441" style="fill:url(#linearGradient11371);fill-opacity:1;stroke:url(#linearGradient11373);stroke-width:0.33271757px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:url(#radialGradient12572);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 170.94409,909.25706 -31.5535,8.06993 6.94267,20.20798 6.65126,16.32831 -6.95341,-17.95052 c -0.18922,0.75804 6.72697,19.4769 6.86826,20.20962 0.91057,4.72412 8.72768,6.80759 17.4506,4.64778 0.81777,-0.20249 1.60288,-0.43726 2.37463,-0.69636 l 0.1069,-0.0126 0.11848,-0.0682 c 7.33785,-2.52857 12.3607,-7.45219 11.54378,-11.69007 -0.0403,-0.20905 -0.10394,-0.40455 -0.17071,-0.6031 z" id="path10664" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccscccccc"/>
+      <path style="fill:url(#linearGradient11335);fill-opacity:1;stroke:#333333;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 165.97266,930.63068 c -0.37675,0.45924 -0.51985,1.10077 -0.37398,1.67659 0.14654,0.57847 0.58124,1.07627 1.13469,1.29941 l 32.08441,-4.10335 -14.91232,-0.79128 -17.9328,1.91863" id="path10735" inkscape:path-effect="#path-effect10737" inkscape:original-d="m 165.97266,930.63068 c -0.31554,0.60658 -0.47048,1.17301 -0.37398,1.67659 0.0966,0.50356 0.44445,0.94428 1.13469,1.29941 l 32.08441,-4.10335 -14.91232,-0.79128 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccc"/>
+      <path style="fill:url(#linearGradient11055);fill-opacity:1;stroke:none" d="m 154.36812,926.53336 10.65184,24.39193 c -0.62112,-0.0579 -1.24177,-0.12071 -1.86188,-0.18859 -1.66397,-0.18214 -3.32384,-0.40032 -4.9809,-0.63726 -0.9546,-0.13649 -1.90831,-0.27922 -2.86105,-0.42815 l -5.5715,-1.74272 -3.47315,-22.02168 0.30531,0.21391 0.73912,0.29197 c 0.36938,0.0815 0.73982,0.15808 1.11119,0.22988 0.49043,0.0948 0.9825,0.18118 1.4759,0.25906 0.27076,-0.003 0.54153,-0.005 0.8123,-0.006 0.57861,-0.002 1.15723,0.002 1.73576,0.0115 0.3581,-0.0757 0.71687,-0.14824 1.07625,-0.21759 0.27991,-0.054 0.56019,-0.10611 0.84081,-0.15626" id="path10727" inkscape:path-effect="#path-effect10729" inkscape:original-d="m 154.36812,926.53336 10.65184,24.39193 -1.86188,-0.18859 -4.9809,-0.63726 -2.86105,-0.42815 -5.5715,-1.74272 -3.47315,-22.02168 0.30531,0.21391 0.73912,0.29197 1.11119,0.22988 1.4759,0.25906 0.8123,-0.006 1.73576,0.0115 1.07625,-0.21759 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 148.49951,909.83881 -9.39689,7.8645 1.94009,0.13901 -12.28598,9.47451 -28.64978,-1.84448 -0.638812,-1.36288 11.352182,-5.62226 -3.04597,0.15598 -0.43927,-0.52126 4.16615,-0.02 -4.16569,0.0207 14.28318,-7.4077 5.66739,-0.0965 1.67072,0.18631 -0.64783,-0.72386 7.94711,-4.03027 16.1658,-0.67185 z" inkscape:path-effect="#path-effect10680-4" id="path10678" d="m 148.49951,909.83881 -9.39689,7.8645 1.94009,0.13901 -12.28598,9.47451 -28.64978,-1.84448 -0.638812,-1.36288 11.352182,-5.62226 -3.04597,0.15598 -0.43927,-0.52126 4.16615,-0.02 -4.16569,0.0207 14.28318,-7.4077 5.66739,-0.0965 1.67072,0.18631 -0.64783,-0.72386 7.94711,-4.03027 16.1658,-0.67185 -3.9224,4.46005" style="fill:#000037;fill-opacity:1;stroke:none" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path style="fill:#3c3c60;fill-opacity:1;stroke:none" d="m 151.55674,905.32426 -3.8807,4.42718 -19.36623,0.32809 7.93894,-4.03502 15.30799,-0.72025" id="path10666" inkscape:path-effect="#path-effect10668-09" inkscape:original-d="m 151.55674,905.32426 -3.8807,4.42718 -19.36623,0.32809 7.93894,-4.03502 z" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 134.85274,906.90344 16.24888,-0.4558" inkscape:path-effect="#path-effect10950" id="path10948-4" d="m 134.85274,906.90344 16.24888,-0.4558" style="fill:none;stroke:#7480bd;stroke-width:0.15473038px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 146.86675,910.25287 -9.26415,7.59318 -30.26535,0.27752 14.19526,-7.4605 z" inkscape:path-effect="#path-effect10672-4" id="path10670" d="m 146.86675,910.25287 -9.26415,7.59318 -30.26535,0.27752 14.19526,-7.4605 25.33424,-0.4102" style="fill:#39406e;fill-opacity:1;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#324376;fill-opacity:1;stroke:none" d="m 139.23569,918.20922 -10.67328,7.98415 -29.09635,-2.08428 10.57659,-5.69879 29.19304,-0.20108" id="path10674" inkscape:path-effect="#path-effect10676-8" inkscape:original-d="m 139.23569,918.20922 -10.67328,7.98415 -29.09635,-2.08428 10.57659,-5.69879 z" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 176.32755,911.41918 -0.47941,-1.03127 5.97932,-3.48535 35.92207,-3.59745 0.48439,1.02609 -1.70742,5.11593 z" inkscape:path-effect="#path-effect10692-8" id="path10690" d="m 176.32755,911.41918 -0.47941,-1.03127 5.97932,-3.48535 35.92207,-3.59745 0.48439,1.02609 -1.70742,5.11593 -40.19895,1.97205" style="fill:#000037;fill-opacity:1;stroke:none"/>
+      <path style="fill:#3c3d6b;fill-opacity:1;stroke:none" d="m 175.84859,910.38945 5.49609,-4.51375 36.40647,-2.57139 -1.70742,5.11594 -40.19514,1.9692" id="path10686" inkscape:path-effect="#path-effect10688-2" inkscape:original-d="m 175.84859,910.38945 5.49609,-4.51375 36.40647,-2.57139 -1.70742,5.11594 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#000037;fill-opacity:1;stroke:none" d="m 169.56807,919.95098 -0.12571,-1.88049 7.6304,-4.93282 50.1592,-4.56316 0.2341,1.81841 -1.88142,8.53297 -56.01657,1.02509" id="path10698" inkscape:path-effect="#path-effect10700-45" inkscape:original-d="m 169.56807,919.95098 -0.12571,-1.88049 7.6304,-4.93282 50.1592,-4.56316 0.2341,1.81841 -1.88142,8.53297 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 169.44228,918.06827 7.41977,-6.71229 50.11831,-2.7832 -2.0926,8.80941 z" inkscape:path-effect="#path-effect10696-51" id="path10694" d="m 169.44228,918.06827 7.41977,-6.71229 50.11831,-2.7832 -2.0926,8.80941 -55.44548,0.68608" style="fill:#33366e;fill-opacity:1;stroke:none"/>
+      <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 166.30314,921.67401 -9.04387,5.40409 0.85183,1.70727 48.7373,1.78761 3.16576,-9.58818 -0.84069,-1.76389 z" inkscape:path-effect="#path-effect10708-7" id="path10706" d="m 166.30314,921.67401 -9.04387,5.40409 0.85183,1.70727 48.7373,1.78761 3.16576,-9.58818 -0.84069,-1.76389 -42.87033,2.4531" style="fill:#000037;fill-opacity:1;stroke:none"/>
+      <path style="fill:#384276;fill-opacity:1;stroke:none" d="m 166.33123,920.01047 -9.07228,7.06908 49.01703,1.76548 2.90053,-9.62167 -42.84528,0.78711" id="path10702" inkscape:path-effect="#path-effect10704-11" inkscape:original-d="m 166.33123,920.01047 -9.07228,7.06908 49.01703,1.76548 2.90053,-9.62167 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:url(#linearGradient11079);fill-opacity:1;stroke:none" d="m 154.36216,926.48299 2.96566,-3.00789 13.86505,33.4141 -1.30482,-0.66327 -2.96362,-2.67822 -1.89426,-2.40939 -10.66801,-24.65533" id="path10719-8" inkscape:path-effect="#path-effect10721" inkscape:original-d="m 154.36216,926.48299 2.96566,-3.00789 13.86505,33.4141 -1.30482,-0.66327 -2.96362,-2.67822 -1.89426,-2.40939 c -4.91238,-5.22764 -4.27727,-21.40695 -10.66801,-24.65533 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+      <path style="fill:url(#linearGradient11071);fill-opacity:1;stroke:none" d="m 157.32911,923.47347 c -1.88346,0.57944 -3.85197,0.8816 -5.8225,0.89374 -1.76517,0.0109 -3.53164,-0.21065 -5.23946,-0.65706 l 0.0282,2.39832 c 1.3296,0.45839 2.72514,0.725 4.13007,0.78905 1.35657,0.0618 2.72161,-0.0651 4.04351,-0.37605 l 2.86018,-3.048" id="path10723-6" inkscape:path-effect="#path-effect10725" inkscape:original-d="m 157.32911,923.47347 c 0,0 -3.85909,0.86668 -5.8225,0.89374 -1.75999,0.0242 -5.23946,-0.65706 -5.23946,-0.65706 l 0.0282,2.39832 c 1.6952,0.3972 2.58271,0.78943 4.13007,0.78905 1.54741,-4.1e-4 4.04351,-0.37605 4.04351,-0.37605 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csccscc"/>
+      <path id="path10715-5" style="fill:url(#radialGradient11047);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 173.76866,967.77652 c -1.95722,3.27902 -4.94723,9.52986 -23.10905,3.78779 -14.70377,-4.64886 -14.79437,-14.71436 -12.83707,-17.9935 1.95721,-3.27905 14.20876,-8.87629 24.22771,-4.88168 10.23562,4.08097 13.67564,15.80827 11.71841,19.08739 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssss"/>
+      <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path10711-0" sodipodi:cx="226.25" sodipodi:cy="1097.3622" sodipodi:rx="26.75" sodipodi:ry="13" d="m 253,1097.3622 c 0,7.1797 -11.97638,13 -26.75,13 -14.77362,0 -26.75,-5.8203 -26.75,-13 0,-7.1797 11.97638,-13 26.75,-13 14.77362,0 26.75,5.8203 26.75,13 z" transform="matrix(0.68300213,0.29488888,-0.46856335,0.6855768,514.73355,143.31066)"/>
+      <path transform="matrix(0.65801263,0.28409957,-0.45141968,0.66049316,501.5746,173.27766)" d="m 253,1097.3622 c 0,7.1797 -11.97638,13 -26.75,13 -14.77362,0 -26.75,-5.8203 -26.75,-13 0,-7.1797 11.97638,-13 26.75,-13 14.77362,0 26.75,5.8203 26.75,13 z" sodipodi:ry="13" sodipodi:rx="26.75" sodipodi:cy="1097.3622" sodipodi:cx="226.25" id="path10713-9" style="fill:url(#radialGradient11039);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path style="fill:none;stroke:#535353;stroke-width:0.70822465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 137.34901,954.99638 11.80701,21.09722 24.46676,-8.61956" id="path10749" inkscape:path-effect="#path-effect11505" inkscape:original-d="m 137.34901,954.99638 11.80701,21.09722 24.46676,-8.61956" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path id="rect10757" style="fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.13718231;stroke-miterlimit:4;stroke-opacity:1" d="m 149.80316,979.36785 -3.0239,-1.75381 1.71399,-3.75084 c 1.18447,-0.45591 2.37643,-0.95748 3.02391,1.7536 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:none;stroke:#535353;stroke-width:0.70822465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 162.24778,954.41592 -12.91935,21.46879" id="path10753" inkscape:path-effect="#path-effect11503" inkscape:original-d="m 162.24778,954.41592 -12.91935,21.46879" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 178.47084,908.48053 38.07555,-1.96225" id="path10788" inkscape:path-effect="#path-effect10790-4" inkscape:original-d="m 178.47084,908.48053 38.07555,-1.96225" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 198.6825,904.69924 -1.69875,4.53156" id="path10792" inkscape:path-effect="#path-effect10794-2" inkscape:original-d="m 198.6825,904.69924 -1.69875,4.53156" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 188.09528,905.57322 -2.25769,4.1428" inkscape:path-effect="#path-effect10798-32" id="path10796" d="m 188.09528,905.57322 -2.25769,4.1428" style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 209.95095,904.07793 -1.69876,4.53156" id="path10800" inkscape:path-effect="#path-effect10802-21" inkscape:original-d="m 209.95095,904.07793 -1.69876,4.53156" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 180.31095,907.04338 36.61448,-2.13798" inkscape:path-effect="#path-effect10828-6" id="path10826" d="m 180.31095,907.04338 36.61448,-2.13798" style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 175.72141,912.68641 50.80869,-2.224" inkscape:path-effect="#path-effect10832-8" id="path10830" d="m 175.72141,912.68641 50.80869,-2.224" style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 174.05856,914.2762 51.7764,-1.52161" id="path10834" inkscape:path-effect="#path-effect10836-5" inkscape:original-d="m 174.05856,914.2762 51.7764,-1.52161" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 172.07529,916.2002 53.45055,-1.31497" inkscape:path-effect="#path-effect10840-76" id="path10838" d="m 172.07529,916.2002 53.45055,-1.31497" style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 187.68791,910.88029 -3.95365,6.96055" id="path10846" inkscape:path-effect="#path-effect10848-1" inkscape:original-d="m 187.68791,910.88029 -3.95365,6.96055" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 199.35551,910.30695 -3.82246,7.30592" inkscape:path-effect="#path-effect10852-8" id="path10850" d="m 199.35551,910.30695 -3.82246,7.30592" style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 211.94622,909.73879 -2.62377,7.70718" id="path10854" inkscape:path-effect="#path-effect10856-9" inkscape:original-d="m 211.94622,909.73879 c -1.71427,3.64923 -1.28337,5.14854 -2.62377,7.70718" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 164.61746,921.51751 43.68427,0.20276" id="path10858" inkscape:path-effect="#path-effect10860-2" inkscape:original-d="m 164.61746,921.51751 43.68427,0.20276" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 162.58207,923.1211 45.10493,0.65051" inkscape:path-effect="#path-effect10864-7" id="path10862" d="m 162.58207,923.1211 45.10493,0.65051" style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 159.84623,925.17021 46.96936,1.32902" id="path10866" inkscape:path-effect="#path-effect10868-9" inkscape:original-d="m 159.84623,925.17021 46.96936,1.32902" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 173.85422,919.89304 -4.27108,7.5091" inkscape:path-effect="#path-effect10872-54" id="path10870" d="m 173.85422,919.89304 -4.27108,7.5091" style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 186.1263,919.73118 -3.60104,8.08198" id="path10874" inkscape:path-effect="#path-effect10876" inkscape:original-d="m 186.1263,919.73118 -3.60104,8.08198" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 199.48603,919.44963 -3.62478,8.79206" inkscape:path-effect="#path-effect10880" id="path10878" d="m 199.48603,919.44963 -3.62478,8.79206" style="fill:none;stroke:#7480bd;stroke-width:0.40596256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 108.03791,919.58485 28.12221,0.72879" id="path10834-5" inkscape:path-effect="#path-effect10836-1" inkscape:original-d="m 108.03791,919.58485 28.12221,0.72879" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 105.48301,920.99012 28.24916,1.13621" inkscape:path-effect="#path-effect10905" id="path10903-0" d="m 105.48301,920.99012 28.24916,1.13621" style="fill:none;stroke:#7480bd;stroke-width:0.23255244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 102.57375,922.57729 28.74412,1.35155" id="path10907-0" inkscape:path-effect="#path-effect10909" inkscape:original-d="m 102.57375,922.57729 28.74412,1.35155" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 111.35,916.24339 28.75959,-0.63333" id="path10834-5-3" inkscape:path-effect="#path-effect10836-1-3" inkscape:original-d="m 111.35,916.24339 28.75959,-0.63333" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 115.17046,914.15912 27.61394,-0.66424" inkscape:path-effect="#path-effect10934-31" id="path10932-6" d="m 115.17046,914.15912 27.61394,-0.66424" style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.23265718px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 118.5453,912.34848 26.46828,-0.69515" id="path10936-13" inkscape:path-effect="#path-effect10938-2" inkscape:original-d="m 118.5453,912.34848 26.46828,-0.69515" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 130.25534,909.21326 17.60293,-0.46231" inkscape:path-effect="#path-effect10942-33" id="path10940-8" d="m 130.25534,909.21326 17.60293,-0.46231" style="fill:none;stroke:#7480bd;stroke-width:0.15473038px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="fill:none;stroke:#7480bd;stroke-width:0.15473038px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 132.67265,907.94025 16.2489,-0.4558" id="path10944-93" inkscape:path-effect="#path-effect10946-4" inkscape:original-d="m 132.67265,907.94025 16.2489,-0.4558" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.23255244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 116.92476,918.45226 -8.78355,6.20147" id="path10952-4" inkscape:path-effect="#path-effect10954-11" inkscape:original-d="m 116.92476,918.45226 -8.78355,6.20147" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 123.30676,918.34359 -9.14248,6.75205" inkscape:path-effect="#path-effect10958-38" id="path10956" d="m 123.30676,918.34359 -9.14248,6.75205" style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.23255244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.23255244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 130.56957,918.41529 -9.9088,7.12127" id="path10960-4" inkscape:path-effect="#path-effect10962" inkscape:original-d="m 130.56957,918.41529 -9.9088,7.12127" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 126.91228,910.70017 -11.28497,7.1828" inkscape:path-effect="#path-effect10970-74" id="path10964" d="m 126.91228,910.70017 -11.28497,7.1828" style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.24923341;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.24016692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 132.71581,910.60982 -10.52503,7.19343" id="path10966" inkscape:path-effect="#path-effect10972" inkscape:original-d="m 132.71581,910.60982 -10.52503,7.19343" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 139.64001,910.46165 -10.21324,7.34857" inkscape:path-effect="#path-effect10974-277" id="path10968-6" d="m 139.64001,910.46165 -10.21324,7.34857" style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.23614579;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 140.47898,905.87555 -6.26853,4.03074" inkscape:path-effect="#path-effect10974-9-9" id="path10968-0-0" d="m 140.47898,905.87555 -6.26853,4.03074" style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.12635595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.12635595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 145.05238,905.67796 -6.40944,4.17772" id="path10997-6" inkscape:path-effect="#path-effect10999" inkscape:original-d="m 145.05238,905.67796 -6.40944,4.17772" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 150.42047,904.61435 -6.23171,4.23782" inkscape:path-effect="#path-effect11003" id="path11001-6" d="m 150.42047,904.61435 -6.23171,4.23782" style="fill:#7480bd;fill-opacity:1;stroke:#7480bd;stroke-width:0.12635595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 166.28664,920.01047 -9.02769,7.06908 49.01703,1.76548 2.90053,-9.62167 z" inkscape:path-effect="#path-effect11501" id="path11153" d="m 166.28664,920.01047 -9.02769,7.06908 49.01703,1.76548 2.90053,-9.62167 -42.88987,0.78711" style="fill:url(#linearGradient11161-3);fill-opacity:1;stroke:none"/>
+      <path style="fill:url(#linearGradient11171-9);fill-opacity:1;stroke:none" d="m 169.44228,918.06827 7.41977,-6.71229 50.24442,-2.7832 -2.0926,8.80941 -55.57159,0.68608" id="path11163" inkscape:path-effect="#path-effect11499" inkscape:original-d="m 169.44228,918.06827 7.41977,-6.71229 50.24442,-2.7832 -2.0926,8.80941 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 175.84859,910.38945 5.49609,-4.51375 36.40647,-2.57139 -1.70742,5.11594 z" inkscape:path-effect="#path-effect11497" id="path11173" d="m 175.84859,910.38945 5.49609,-4.51375 36.40647,-2.57139 -1.70742,5.11594 -40.19514,1.9692" style="fill:url(#linearGradient11181);fill-opacity:1;stroke:none"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 139.23569,918.20922 -10.67328,7.98415 -29.09635,-2.08428 10.57659,-5.69879 z" inkscape:path-effect="#path-effect11341" id="path11183-1" d="m 139.23569,918.20922 -10.67328,7.98415 -29.09635,-2.08428 10.57659,-5.69879 29.19304,-0.20108" style="fill:url(#linearGradient11191);fill-opacity:1;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:url(#linearGradient11201);fill-opacity:1;stroke:none" d="m 146.86675,910.25287 -9.26415,7.59318 -30.26535,0.27752 14.19526,-7.4605 25.33424,-0.4102" id="path11193-8" inkscape:path-effect="#path-effect11339" inkscape:original-d="m 146.86675,910.25287 -9.26415,7.59318 -30.26535,0.27752 14.19526,-7.4605 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 151.55674,905.32426 -3.8807,4.42718 -19.36623,0.32809 7.93894,-4.03502 z" inkscape:path-effect="#path-effect11337" id="path11203-4" d="m 151.55674,905.32426 -3.8807,4.42718 -19.36623,0.32809 7.93894,-4.03502 15.30799,-0.72025" style="fill:url(#linearGradient11211);fill-opacity:1;stroke:none"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 138.06739,955.56163 17.8564,4.24073 15.90827,7.16354" inkscape:path-effect="#path-effect10751" id="path11239-9" d="m 138.06739,955.56163 17.8564,4.24073 15.90827,7.16354" style="opacity:0.444;fill:none;stroke:url(#linearGradient11309-6);stroke-width:0.40239453px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter11267)" transform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 160.99509,955.64978 -4.82717,3.87858" inkscape:path-effect="#path-effect10755" id="path11261-6" d="m 160.99509,955.64978 -4.82717,3.87858" style="opacity:0.444;fill:url(#linearGradient11317);fill-opacity:1;stroke:url(#linearGradient11325);stroke-width:0.40239453px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter11291)" transform="matrix(1.008867,0,0,1.008867,-0.88196506,-8.6846581)"/>
+      <path d="m 156.79278,921.69997 c -8.72289,2.15977 -16.53249,0.0811 -17.4431,-4.64296 -0.91066,-4.72404 5.42246,-10.30457 14.14547,-12.4645 8.72289,-2.15985 16.53244,-0.0811 17.44312,4.64289 0.91061,4.72407 -5.42246,10.30458 -14.14549,12.46457 z" style="fill:url(#radialGradient12964);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path10662" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path10660" style="fill:url(#linearGradient11349);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 156.23817,918.33153 c -6.33012,1.56735 -11.9975,0.0589 -12.65835,-3.36931 -0.66082,-3.42825 3.93508,-7.47801 10.2653,-9.04544 6.33016,-1.5674 11.99749,-0.0589 12.65829,3.36935 0.66086,3.42819 -3.93498,7.47791 -10.26524,9.0454 z"/>
+      <path d="m 155.93071,917.66204 c -6.28297,1.5557 -11.90804,0.0585 -12.56398,-3.34415 -0.65588,-3.40266 3.90571,-7.4222 10.18872,-8.97794 6.28296,-1.55573 11.90797,-0.0584 12.56391,3.34417 0.65588,3.40265 -3.90571,7.42219 -10.18865,8.97792 z" style="fill:url(#radialGradient11103);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path10658" inkscape:connector-curvature="0"/>
+      <path style="fill:url(#radialGradient11616);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 161.08683,905.31412 -1.63483,0.3973 c -1.53582,-0.35988 -3.5807,-0.26526 -5.75533,0.37058 -1.96575,0.57475 -3.69295,1.49113 -4.97356,2.54167 l -2.59463,0.70224 c -0.42685,1.39522 -0.18163,2.28236 0.46639,3.72063 0.71009,2.0374 4.30004,2.73052 8.36963,1.54062 4.33257,-1.26675 7.56068,-4.19023 7.21249,-6.54057 -0.0435,-0.2938 -0.14448,-0.56607 -0.29003,-0.81254 -0.002,-0.004 -0.006,-0.007 -0.007,-0.0102 z" id="path10648" inkscape:connector-curvature="0" sodipodi:nodetypes="ccscccssccc"/>
+      <path id="path10646" style="fill:url(#linearGradient11624);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 154.26323,912.3208 c -4.21194,1.23149 -7.90075,0.37756 -8.23926,-1.90726 -0.33854,-2.28483 2.80146,-5.13539 7.01341,-6.36689 4.21187,-1.23148 7.90073,-0.37757 8.23926,1.90725 0.33852,2.28483 -2.80153,5.13543 -7.01341,6.3669 z" inkscape:connector-curvature="0"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient155277);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path11604" sodipodi:cx="226.25" sodipodi:cy="1097.3622" sodipodi:rx="26.75" sodipodi:ry="13" d="m 253,1097.3622 c 0,7.1797 -11.97638,13 -26.75,13 -14.77362,0 -26.75,-5.8203 -26.75,-13 0,-7.1797 11.97638,-13 26.75,-13 14.77362,0 26.75,5.8203 26.75,13 z" transform="matrix(0.65801263,0.28409957,-0.45141968,0.66049316,501.5746,173.27766)"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Satellite_antenna.svg b/misc/images/svg/elements/Satellite_antenna.svg
index fec54df3f09..6716ed7d2be 100644
--- a/misc/images/svg/elements/Satellite_antenna.svg
+++ b/misc/images/svg/elements/Satellite_antenna.svg
@@ -1,1827 +1,407 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="91.96788"
-   height="128"
-   id="svg156375"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 56">
-  <defs
-     id="defs156377">
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter41624-5"
-       x="-0.11335076"
-       width="1.2267015"
-       y="-0.39923647"
-       height="1.798473">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0706192"
-         id="feGaussianBlur41626-6" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="91.96788" height="128" id="svg156375" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 56">
+  <defs id="defs156377">
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter41624-5" x="-0.11335076" width="1.2267015" y="-0.39923647" height="1.798473">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.0706192" id="feGaussianBlur41626-6"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter41628-4"
-       x="-0.067173488"
-       width="1.134347"
-       y="-0.46107465"
-       height="1.9221493">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0706192"
-         id="feGaussianBlur41630-8" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter41628-4" x="-0.067173488" width="1.134347" y="-0.46107465" height="1.9221493">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.0706192" id="feGaussianBlur41630-8"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter41632-2"
-       x="-0.069871008"
-       width="1.139742"
-       y="-0.44849968"
-       height="1.8969994">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0706192"
-         id="feGaussianBlur41634-1" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter41632-2" x="-0.069871008" width="1.139742" y="-0.44849968" height="1.8969994">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.0706192" id="feGaussianBlur41634-1"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter41636-6"
-       x="-0.10641892"
-       width="1.2128378"
-       y="-0.40069583"
-       height="1.8013916">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0706192"
-         id="feGaussianBlur41638-8" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter41636-6" x="-0.10641892" width="1.2128378" y="-0.40069583" height="1.8013916">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.0706192" id="feGaussianBlur41638-8"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41715-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-878.91724"
-       y1="-455.68262"
-       x2="-870.82068"
-       y2="-455.68262" />
-    <linearGradient
-       id="linearGradient41308-1">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop41310-4" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop41312-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41717-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,60.98737,-66.424386)"
-       x1="-779.83362"
-       y1="732.29407"
-       x2="-778.5907"
-       y2="732.29407" />
-    <linearGradient
-       id="linearGradient155875">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155877" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155879" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41719-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-951.38843"
-       y1="-479.39673"
-       x2="-940.42896"
-       y2="-479.39673" />
-    <linearGradient
-       id="linearGradient40934-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop40936-0" />
-      <stop
-         id="stop40938-7"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop40940-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41721-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,90.093716,-3.8445505)"
-       x1="-1072.5181"
-       y1="-35.062698"
-       x2="-1071.2751"
-       y2="-35.062698" />
-    <linearGradient
-       id="linearGradient155887">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155889" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155891" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5020-3-8-7"
-       id="linearGradient41723-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-938.87567"
-       y1="-434.51706"
-       x2="-915.16553"
-       y2="-469.16528" />
-    <linearGradient
-       id="linearGradient5020-3-8-7">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop5022-7-5-0" />
-      <stop
-         id="stop5024-3-7-5"
-         offset="0.30869097"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop5026-1-3-6" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect40625-7"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41727-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-956.53723"
-       y1="-480.51157"
-       x2="-945.34924"
-       y2="-480.51157" />
-    <linearGradient
-       id="linearGradient155900">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop155902" />
-      <stop
-         id="stop155904"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop155906" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41729-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-956.06763"
-       y1="-468.10971"
-       x2="-924.05206"
-       y2="-468.10971" />
-    <linearGradient
-       id="linearGradient155909">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155911" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155913" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient42594-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-930.75684"
-       y1="-480.51321"
-       x2="-943.69757"
-       y2="-456.33359" />
-    <linearGradient
-       id="linearGradient155916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop155918" />
-      <stop
-         id="stop155920"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop155922" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41731-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-950.65967"
-       y1="-478.58353"
-       x2="-929.68762"
-       y2="-478.58353" />
-    <linearGradient
-       id="linearGradient155925">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155927" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155929" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41733-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-932.54004"
-       y1="-473.03586"
-       x2="-923.45337"
-       y2="-473.03586" />
-    <linearGradient
-       id="linearGradient155932">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop155934" />
-      <stop
-         id="stop155936"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop155938" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41735-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-932.90503"
-       y1="-462.26428"
-       x2="-906.9964"
-       y2="-462.26428" />
-    <linearGradient
-       id="linearGradient155941">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155943" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155945" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41737-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-911.13525"
-       y1="-463.30887"
-       x2="-906.96564"
-       y2="-463.30887" />
-    <linearGradient
-       id="linearGradient155948">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155950" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155952" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41739-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-910.4668"
-       y1="-459.56503"
-       x2="-902.56543"
-       y2="-459.56503" />
-    <linearGradient
-       id="linearGradient155955">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155957" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155959" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41741-98"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-907.88654"
-       y1="-457.30777"
-       x2="-884.86737"
-       y2="-457.30777" />
-    <linearGradient
-       id="linearGradient155962">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop155964" />
-      <stop
-         id="stop155966"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop155968" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41743-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-903.24915"
-       y1="-459.49179"
-       x2="-901.38495"
-       y2="-459.49179" />
-    <linearGradient
-       id="linearGradient155971">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155973" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155975" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41745-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-905.49384"
-       y1="-463.32935"
-       x2="-902.10657"
-       y2="-463.32935" />
-    <linearGradient
-       id="linearGradient155978">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop155980" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop155982" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41747-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-886.98199"
-       y1="-454.60495"
-       x2="-877.61304"
-       y2="-454.60495" />
-    <linearGradient
-       id="linearGradient155985">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop155987" />
-      <stop
-         id="stop155989"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop155991" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient42596-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-902.18445"
-       y1="-463.25656"
-       x2="-899.27045"
-       y2="-446.69061" />
-    <linearGradient
-       id="linearGradient155994">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop155996" />
-      <stop
-         id="stop155998"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156000" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41751-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-894.9834"
-       y1="-454.16202"
-       x2="-871.67725"
-       y2="-454.16202" />
-    <linearGradient
-       id="linearGradient156003">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop156005" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop156007" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41753-55"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-890.48358"
-       y1="-454.26666"
-       x2="-879.07782"
-       y2="-454.26666" />
-    <linearGradient
-       id="linearGradient156010">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop156012" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop156014" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41755-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-896.88879"
-       y1="-453.6319"
-       x2="-880.28955"
-       y2="-453.6319" />
-    <linearGradient
-       id="linearGradient156017">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156019" />
-      <stop
-         id="stop156021"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156023" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41757-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-903.38391"
-       y1="-453.58759"
-       x2="-886.63696"
-       y2="-453.58759" />
-    <linearGradient
-       id="linearGradient156026">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop156028" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop156030" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41759-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-908.47034"
-       y1="-450.08463"
-       x2="-905.38849"
-       y2="-450.08463" />
-    <linearGradient
-       id="linearGradient156033">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop156035" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop156037" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41761-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-926.64764"
-       y1="-452.08707"
-       x2="-907.16693"
-       y2="-452.08707" />
-    <linearGradient
-       id="linearGradient156040">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156042" />
-      <stop
-         id="stop156044"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156046" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41763-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-913.74487"
-       y1="-454.6582"
-       x2="-911.88068"
-       y2="-454.6582" />
-    <linearGradient
-       id="linearGradient156049">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156051" />
-      <stop
-         id="stop156053"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156055" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient41308-1"
-       id="linearGradient41765-61"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-915.81281"
-       y1="-460.07797"
-       x2="-912.54706"
-       y2="-460.07797" />
-    <linearGradient
-       id="linearGradient156058">
-      <stop
-         style="stop-color:#c8d1df;stop-opacity:1;"
-         offset="0"
-         id="stop156060" />
-      <stop
-         style="stop-color:#7f8ea7;stop-opacity:1;"
-         offset="1"
-         id="stop156062" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient42592-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-924.30878"
-       y1="-456.66382"
-       x2="-920.23303"
-       y2="-456.66382" />
-    <linearGradient
-       id="linearGradient156065">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156067" />
-      <stop
-         id="stop156069"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156071" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient43192-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-939.08618"
-       y1="-453.76562"
-       x2="-909.1662"
-       y2="-451.49921" />
-    <linearGradient
-       id="linearGradient156074">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156076" />
-      <stop
-         id="stop156078"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156080" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41771-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-934.56299"
-       y1="-440.01395"
-       x2="-908.04346"
-       y2="-440.01395" />
-    <linearGradient
-       id="linearGradient156083">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156085" />
-      <stop
-         id="stop156087"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156089" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect40829-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41773-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)"
-       x1="-938.45374"
-       y1="-426.85611"
-       x2="-914.69452"
-       y2="-426.10611" />
-    <linearGradient
-       id="linearGradient156093">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156095" />
-      <stop
-         id="stop156097"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156099" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect40833-0"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect40837-4"
-       is_visible="true" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="radialGradient41775-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.8845648,1.078424,-0.20395957,0.54555034,1624.3488,759.08326)"
-       cx="-912.29608"
-       cy="-472.74799"
-       fx="-912.29608"
-       fy="-472.74799"
-       r="40.655468" />
-    <linearGradient
-       id="linearGradient156104">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156106" />
-      <stop
-         id="stop156108"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156110" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="radialGradient41787-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62181626,-0.78316316,0.35762998,0.28395121,-200.52998,-1022.0751)"
-       cx="-926.49725"
-       cy="-418.41003"
-       fx="-926.49725"
-       fy="-418.41003"
-       r="13.346115" />
-    <linearGradient
-       id="linearGradient156113">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156115" />
-      <stop
-         id="stop156117"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156119" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect40869-0"
-       is_visible="true" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="radialGradient41789-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5140229,-1.225747,0.88503219,1.0931775,842.85678,-1097.2735)"
-       cx="-924.58423"
-       cy="-409.51547"
-       fx="-924.58423"
-       fy="-409.51547"
-       r="6.3226752" />
-    <linearGradient
-       id="linearGradient156123">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156125" />
-      <stop
-         id="stop156127"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41791-2"
-       gradientUnits="userSpaceOnUse"
-       x1="-932.98389"
-       y1="-433.56689"
-       x2="-910.52728"
-       y2="-415.06689" />
-    <linearGradient
-       id="linearGradient156132">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156134" />
-      <stop
-         id="stop156136"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156138" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect40882-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41793-0"
-       gradientUnits="userSpaceOnUse"
-       x1="-927.68274"
-       y1="-427.26315"
-       x2="-889.6759"
-       y2="-411.26315" />
-    <linearGradient
-       id="linearGradient156146">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156148" />
-      <stop
-         id="stop156150"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156152" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect40886-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41795-8"
-       gradientUnits="userSpaceOnUse"
-       x1="-937.89941"
-       y1="-402.89059"
-       x2="-876.12476"
-       y2="-409.14059" />
-    <linearGradient
-       id="linearGradient156160">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156162" />
-      <stop
-         id="stop156164"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156166" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="linearGradient41797-85"
-       gradientUnits="userSpaceOnUse"
-       x1="-959.14587"
-       y1="-405.24295"
-       x2="-924.00085"
-       y2="-402.49295" />
-    <linearGradient
-       id="linearGradient156173">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156175" />
-      <stop
-         id="stop156177"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156179" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76812-7"
-       id="linearGradient41857-7"
-       gradientUnits="userSpaceOnUse"
-       x1="-936.57001"
-       y1="-499.3092"
-       x2="-899.85065"
-       y2="-504.71051"
-       gradientTransform="matrix(0.4479671,0.49247258,-0.47052778,0.4249171,-749.90736,179.54773)" />
-    <linearGradient
-       id="linearGradient76812-7">
-      <stop
-         id="stop76814-0"
-         offset="0"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d9e2;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop76816-8" />
-      <stop
-         id="stop76818-93"
-         offset="1"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter41992-0">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.10960931"
-         id="feGaussianBlur41994-7" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41715-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-878.91724" y1="-455.68262" x2="-870.82068" y2="-455.68262"/>
+    <linearGradient id="linearGradient41308-1">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop41310-4"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop41312-8"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41717-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,60.98737,-66.424386)" x1="-779.83362" y1="732.29407" x2="-778.5907" y2="732.29407"/>
+    <linearGradient id="linearGradient155875">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155877"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155879"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41719-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-951.38843" y1="-479.39673" x2="-940.42896" y2="-479.39673"/>
+    <linearGradient id="linearGradient40934-2">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop40936-0"/>
+      <stop id="stop40938-7" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop40940-0"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41721-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,90.093716,-3.8445505)" x1="-1072.5181" y1="-35.062698" x2="-1071.2751" y2="-35.062698"/>
+    <linearGradient id="linearGradient155887">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155889"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155891"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5020-3-8-7" id="linearGradient41723-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-938.87567" y1="-434.51706" x2="-915.16553" y2="-469.16528"/>
+    <linearGradient id="linearGradient5020-3-8-7">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop5022-7-5-0"/>
+      <stop id="stop5024-3-7-5" offset="0.30869097" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop5026-1-3-6"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect40625-7" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41727-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-956.53723" y1="-480.51157" x2="-945.34924" y2="-480.51157"/>
+    <linearGradient id="linearGradient155900">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop155902"/>
+      <stop id="stop155904" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop155906"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41729-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-956.06763" y1="-468.10971" x2="-924.05206" y2="-468.10971"/>
+    <linearGradient id="linearGradient155909">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155911"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155913"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient42594-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-930.75684" y1="-480.51321" x2="-943.69757" y2="-456.33359"/>
+    <linearGradient id="linearGradient155916">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop155918"/>
+      <stop id="stop155920" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop155922"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41731-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-950.65967" y1="-478.58353" x2="-929.68762" y2="-478.58353"/>
+    <linearGradient id="linearGradient155925">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155927"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155929"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41733-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-932.54004" y1="-473.03586" x2="-923.45337" y2="-473.03586"/>
+    <linearGradient id="linearGradient155932">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop155934"/>
+      <stop id="stop155936" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop155938"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41735-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-932.90503" y1="-462.26428" x2="-906.9964" y2="-462.26428"/>
+    <linearGradient id="linearGradient155941">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155943"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155945"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41737-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-911.13525" y1="-463.30887" x2="-906.96564" y2="-463.30887"/>
+    <linearGradient id="linearGradient155948">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155950"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155952"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41739-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-910.4668" y1="-459.56503" x2="-902.56543" y2="-459.56503"/>
+    <linearGradient id="linearGradient155955">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155957"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155959"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41741-98" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-907.88654" y1="-457.30777" x2="-884.86737" y2="-457.30777"/>
+    <linearGradient id="linearGradient155962">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop155964"/>
+      <stop id="stop155966" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop155968"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41743-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-903.24915" y1="-459.49179" x2="-901.38495" y2="-459.49179"/>
+    <linearGradient id="linearGradient155971">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155973"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155975"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41745-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-905.49384" y1="-463.32935" x2="-902.10657" y2="-463.32935"/>
+    <linearGradient id="linearGradient155978">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop155980"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop155982"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41747-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-886.98199" y1="-454.60495" x2="-877.61304" y2="-454.60495"/>
+    <linearGradient id="linearGradient155985">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop155987"/>
+      <stop id="stop155989" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop155991"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient42596-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-902.18445" y1="-463.25656" x2="-899.27045" y2="-446.69061"/>
+    <linearGradient id="linearGradient155994">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop155996"/>
+      <stop id="stop155998" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156000"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41751-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-894.9834" y1="-454.16202" x2="-871.67725" y2="-454.16202"/>
+    <linearGradient id="linearGradient156003">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop156005"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop156007"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41753-55" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-890.48358" y1="-454.26666" x2="-879.07782" y2="-454.26666"/>
+    <linearGradient id="linearGradient156010">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop156012"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop156014"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41755-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-896.88879" y1="-453.6319" x2="-880.28955" y2="-453.6319"/>
+    <linearGradient id="linearGradient156017">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156019"/>
+      <stop id="stop156021" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156023"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41757-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-903.38391" y1="-453.58759" x2="-886.63696" y2="-453.58759"/>
+    <linearGradient id="linearGradient156026">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop156028"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop156030"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41759-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-908.47034" y1="-450.08463" x2="-905.38849" y2="-450.08463"/>
+    <linearGradient id="linearGradient156033">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop156035"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop156037"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41761-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-926.64764" y1="-452.08707" x2="-907.16693" y2="-452.08707"/>
+    <linearGradient id="linearGradient156040">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156042"/>
+      <stop id="stop156044" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156046"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41763-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-913.74487" y1="-454.6582" x2="-911.88068" y2="-454.6582"/>
+    <linearGradient id="linearGradient156049">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156051"/>
+      <stop id="stop156053" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156055"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient41308-1" id="linearGradient41765-61" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-915.81281" y1="-460.07797" x2="-912.54706" y2="-460.07797"/>
+    <linearGradient id="linearGradient156058">
+      <stop style="stop-color:#c8d1df;stop-opacity:1;" offset="0" id="stop156060"/>
+      <stop style="stop-color:#7f8ea7;stop-opacity:1;" offset="1" id="stop156062"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient42592-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-924.30878" y1="-456.66382" x2="-920.23303" y2="-456.66382"/>
+    <linearGradient id="linearGradient156065">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156067"/>
+      <stop id="stop156069" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156071"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient43192-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-939.08618" y1="-453.76562" x2="-909.1662" y2="-451.49921"/>
+    <linearGradient id="linearGradient156074">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156076"/>
+      <stop id="stop156078" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156080"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41771-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-934.56299" y1="-440.01395" x2="-908.04346" y2="-440.01395"/>
+    <linearGradient id="linearGradient156083">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156085"/>
+      <stop id="stop156087" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156089"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect40829-3" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41773-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0868292,0,0,1.0868292,83.154277,34.885877)" x1="-938.45374" y1="-426.85611" x2="-914.69452" y2="-426.10611"/>
+    <linearGradient id="linearGradient156093">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156095"/>
+      <stop id="stop156097" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156099"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect40833-0" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect40837-4" is_visible="true"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="radialGradient41775-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.8845648,1.078424,-0.20395957,0.54555034,1624.3488,759.08326)" cx="-912.29608" cy="-472.74799" fx="-912.29608" fy="-472.74799" r="40.655468"/>
+    <linearGradient id="linearGradient156104">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156106"/>
+      <stop id="stop156108" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156110"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="radialGradient41787-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.62181626,-0.78316316,0.35762998,0.28395121,-200.52998,-1022.0751)" cx="-926.49725" cy="-418.41003" fx="-926.49725" fy="-418.41003" r="13.346115"/>
+    <linearGradient id="linearGradient156113">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156115"/>
+      <stop id="stop156117" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156119"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect40869-0" is_visible="true"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="radialGradient41789-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5140229,-1.225747,0.88503219,1.0931775,842.85678,-1097.2735)" cx="-924.58423" cy="-409.51547" fx="-924.58423" fy="-409.51547" r="6.3226752"/>
+    <linearGradient id="linearGradient156123">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156125"/>
+      <stop id="stop156127" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156129"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41791-2" gradientUnits="userSpaceOnUse" x1="-932.98389" y1="-433.56689" x2="-910.52728" y2="-415.06689"/>
+    <linearGradient id="linearGradient156132">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156134"/>
+      <stop id="stop156136" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156138"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect40882-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41793-0" gradientUnits="userSpaceOnUse" x1="-927.68274" y1="-427.26315" x2="-889.6759" y2="-411.26315"/>
+    <linearGradient id="linearGradient156146">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156148"/>
+      <stop id="stop156150" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156152"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect40886-3" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41795-8" gradientUnits="userSpaceOnUse" x1="-937.89941" y1="-402.89059" x2="-876.12476" y2="-409.14059"/>
+    <linearGradient id="linearGradient156160">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156162"/>
+      <stop id="stop156164" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156166"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="linearGradient41797-85" gradientUnits="userSpaceOnUse" x1="-959.14587" y1="-405.24295" x2="-924.00085" y2="-402.49295"/>
+    <linearGradient id="linearGradient156173">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156175"/>
+      <stop id="stop156177" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156179"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76812-7" id="linearGradient41857-7" gradientUnits="userSpaceOnUse" x1="-936.57001" y1="-499.3092" x2="-899.85065" y2="-504.71051" gradientTransform="matrix(0.4479671,0.49247258,-0.47052778,0.4249171,-749.90736,179.54773)"/>
+    <linearGradient id="linearGradient76812-7">
+      <stop id="stop76814-0" offset="0" style="stop-color:#3f4958;stop-opacity:1;"/>
+      <stop style="stop-color:#d8d9e2;stop-opacity:1;" offset="0.61109358" id="stop76816-8"/>
+      <stop id="stop76818-93" offset="1" style="stop-color:#3f4958;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter41992-0">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.10960931" id="feGaussianBlur41994-7"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76812-7"
-       id="linearGradient41861-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13878866,0.45717668,-0.46292926,0.15797638,-1023.6737,10.540615)"
-       x1="-936.57001"
-       y1="-499.3092"
-       x2="-899.85065"
-       y2="-504.71051" />
-    <linearGradient
-       id="linearGradient156193">
-      <stop
-         id="stop156195"
-         offset="0"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d9e2;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop156197" />
-      <stop
-         id="stop156199"
-         offset="1"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter41988-7">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.10960931"
-         id="feGaussianBlur41990-8" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76812-7" id="linearGradient41861-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.13878866,0.45717668,-0.46292926,0.15797638,-1023.6737,10.540615)" x1="-936.57001" y1="-499.3092" x2="-899.85065" y2="-504.71051"/>
+    <linearGradient id="linearGradient156193">
+      <stop id="stop156195" offset="0" style="stop-color:#3f4958;stop-opacity:1;"/>
+      <stop style="stop-color:#d8d9e2;stop-opacity:1;" offset="0.61109358" id="stop156197"/>
+      <stop id="stop156199" offset="1" style="stop-color:#3f4958;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter41988-7">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.10960931" id="feGaussianBlur41990-8"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76812-7"
-       id="linearGradient41865-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.48625218,0.40789504,-0.41680016,0.47586319,-658.22979,133.60614)"
-       x1="-936.57001"
-       y1="-499.3092"
-       x2="-899.85065"
-       y2="-504.71051" />
-    <linearGradient
-       id="linearGradient156204">
-      <stop
-         id="stop156206"
-         offset="0"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d9e2;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop156208" />
-      <stop
-         id="stop156210"
-         offset="1"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter41984-7">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.10960931"
-         id="feGaussianBlur41986-1" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76812-7" id="linearGradient41865-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.48625218,0.40789504,-0.41680016,0.47586319,-658.22979,133.60614)" x1="-936.57001" y1="-499.3092" x2="-899.85065" y2="-504.71051"/>
+    <linearGradient id="linearGradient156204">
+      <stop id="stop156206" offset="0" style="stop-color:#3f4958;stop-opacity:1;"/>
+      <stop style="stop-color:#d8d9e2;stop-opacity:1;" offset="0.61109358" id="stop156208"/>
+      <stop id="stop156210" offset="1" style="stop-color:#3f4958;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter41984-7">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.10960931" id="feGaussianBlur41986-1"/>
     </filter>
-    <linearGradient
-       y2="-504.71051"
-       x2="-899.85065"
-       y1="-499.3092"
-       x1="-936.57001"
-       gradientTransform="matrix(0.22391065,0.50477283,-0.51320483,0.22023178,-951.44935,99.66315)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient41883-0"
-       xlink:href="#linearGradient76812-6-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient76812-6-0">
-      <stop
-         id="stop76814-3-8"
-         offset="0"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d9e2;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop76816-4-3" />
-      <stop
-         id="stop76818-1-4"
-         offset="1"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter41996-5">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.10960931"
-         id="feGaussianBlur41998-0" />
+    <linearGradient y2="-504.71051" x2="-899.85065" y1="-499.3092" x1="-936.57001" gradientTransform="matrix(0.22391065,0.50477283,-0.51320483,0.22023178,-951.44935,99.66315)" gradientUnits="userSpaceOnUse" id="linearGradient41883-0" xlink:href="#linearGradient76812-6-0" inkscape:collect="always"/>
+    <linearGradient id="linearGradient76812-6-0">
+      <stop id="stop76814-3-8" offset="0" style="stop-color:#3f4958;stop-opacity:1;"/>
+      <stop style="stop-color:#d8d9e2;stop-opacity:1;" offset="0.61109358" id="stop76816-4-3"/>
+      <stop id="stop76818-1-4" offset="1" style="stop-color:#3f4958;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter41996-5">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.10960931" id="feGaussianBlur41998-0"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76812-7"
-       id="linearGradient41851-1"
-       x1="-894.03613"
-       y1="-491.57193"
-       x2="-886.03235"
-       y2="-491.57193"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient156222">
-      <stop
-         id="stop156224"
-         offset="0"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d9e2;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop156226" />
-      <stop
-         id="stop156228"
-         offset="1"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76812-7"
-       id="linearGradient41847-45"
-       x1="-936.57001"
-       y1="-499.3092"
-       x2="-899.85065"
-       y2="-504.71051"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient156231">
-      <stop
-         id="stop156233"
-         offset="0"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d9e2;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop156235" />
-      <stop
-         id="stop156237"
-         offset="1"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76812-7"
-       id="linearGradient41849-6"
-       x1="-892.85425"
-       y1="-497.11566"
-       x2="-879.20886"
-       y2="-497.11566"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient156240">
-      <stop
-         id="stop156242"
-         offset="0"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d9e2;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop156244" />
-      <stop
-         id="stop156246"
-         offset="1"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76812-7"
-       id="linearGradient41845-2"
-       x1="-926.68475"
-       y1="-506.66406"
-       x2="-898.47382"
-       y2="-506.66406"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient156249">
-      <stop
-         id="stop156251"
-         offset="0"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d9e2;stop-opacity:1;"
-         offset="0.61109358"
-         id="stop156253" />
-      <stop
-         id="stop156255"
-         offset="1"
-         style="stop-color:#3f4958;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="radialGradient41777-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.61065995,0,-199.72176)"
-       cx="-897.64551"
-       cy="-512.97516"
-       fx="-897.64551"
-       fy="-512.97516"
-       r="8.62714" />
-    <linearGradient
-       id="linearGradient156258">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156260" />
-      <stop
-         id="stop156262"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156264" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="radialGradient41779-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.6728935,1.5198806,-0.17782078,0.42971585,2302.6901,1067.1298)"
-       cx="-895.84674"
-       cy="-516.32214"
-       fx="-895.84674"
-       fy="-516.32214"
-       r="4.7701116" />
-    <linearGradient
-       id="linearGradient156267">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156269" />
-      <stop
-         id="stop156271"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156273" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="radialGradient41781-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2566317,0.20257669,-0.18557385,1.1511591,133.25964,259.69789)"
-       cx="-894.63147"
-       cy="-519.09833"
-       fx="-894.63147"
-       fy="-519.09833"
-       r="2.8756051" />
-    <linearGradient
-       id="linearGradient156276">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156278" />
-      <stop
-         id="stop156280"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156282" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40934-2"
-       id="radialGradient41783-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.2224527,1.0001886,-0.20189006,0.44860652,986.85158,605.93529)"
-       cx="-893.4325"
-       cy="-521.70673"
-       fx="-893.4325"
-       fy="-521.70673"
-       r="1.6871818" />
-    <linearGradient
-       id="linearGradient156285">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156287" />
-      <stop
-         id="stop156289"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156291" />
-    </linearGradient>
-    <linearGradient
-       y2="-525.67389"
-       x2="-889.61505"
-       y1="-525.67389"
-       x1="-893.72705"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient43786"
-       xlink:href="#linearGradient40934-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient156294">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop156296" />
-      <stop
-         id="stop156298"
-         offset="0.45770872"
-         style="stop-color:#91a4bd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop156300" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect40619-6"
-       is_visible="true" />
-    <linearGradient
-       y2="-525.67389"
-       x2="-889.61505"
-       y1="-525.67389"
-       x1="-893.72705"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient156373"
-       xlink:href="#linearGradient40934-2"
-       inkscape:collect="always" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76812-7" id="linearGradient41851-1" x1="-894.03613" y1="-491.57193" x2="-886.03235" y2="-491.57193" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient156222">
+      <stop id="stop156224" offset="0" style="stop-color:#3f4958;stop-opacity:1;"/>
+      <stop style="stop-color:#d8d9e2;stop-opacity:1;" offset="0.61109358" id="stop156226"/>
+      <stop id="stop156228" offset="1" style="stop-color:#3f4958;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76812-7" id="linearGradient41847-45" x1="-936.57001" y1="-499.3092" x2="-899.85065" y2="-504.71051" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient156231">
+      <stop id="stop156233" offset="0" style="stop-color:#3f4958;stop-opacity:1;"/>
+      <stop style="stop-color:#d8d9e2;stop-opacity:1;" offset="0.61109358" id="stop156235"/>
+      <stop id="stop156237" offset="1" style="stop-color:#3f4958;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76812-7" id="linearGradient41849-6" x1="-892.85425" y1="-497.11566" x2="-879.20886" y2="-497.11566" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient156240">
+      <stop id="stop156242" offset="0" style="stop-color:#3f4958;stop-opacity:1;"/>
+      <stop style="stop-color:#d8d9e2;stop-opacity:1;" offset="0.61109358" id="stop156244"/>
+      <stop id="stop156246" offset="1" style="stop-color:#3f4958;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76812-7" id="linearGradient41845-2" x1="-926.68475" y1="-506.66406" x2="-898.47382" y2="-506.66406" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient156249">
+      <stop id="stop156251" offset="0" style="stop-color:#3f4958;stop-opacity:1;"/>
+      <stop style="stop-color:#d8d9e2;stop-opacity:1;" offset="0.61109358" id="stop156253"/>
+      <stop id="stop156255" offset="1" style="stop-color:#3f4958;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="radialGradient41777-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.61065995,0,-199.72176)" cx="-897.64551" cy="-512.97516" fx="-897.64551" fy="-512.97516" r="8.62714"/>
+    <linearGradient id="linearGradient156258">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156260"/>
+      <stop id="stop156262" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156264"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="radialGradient41779-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.6728935,1.5198806,-0.17782078,0.42971585,2302.6901,1067.1298)" cx="-895.84674" cy="-516.32214" fx="-895.84674" fy="-516.32214" r="4.7701116"/>
+    <linearGradient id="linearGradient156267">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156269"/>
+      <stop id="stop156271" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156273"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="radialGradient41781-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2566317,0.20257669,-0.18557385,1.1511591,133.25964,259.69789)" cx="-894.63147" cy="-519.09833" fx="-894.63147" fy="-519.09833" r="2.8756051"/>
+    <linearGradient id="linearGradient156276">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156278"/>
+      <stop id="stop156280" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156282"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient40934-2" id="radialGradient41783-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.2224527,1.0001886,-0.20189006,0.44860652,986.85158,605.93529)" cx="-893.4325" cy="-521.70673" fx="-893.4325" fy="-521.70673" r="1.6871818"/>
+    <linearGradient id="linearGradient156285">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156287"/>
+      <stop id="stop156289" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156291"/>
+    </linearGradient>
+    <linearGradient y2="-525.67389" x2="-889.61505" y1="-525.67389" x1="-893.72705" gradientUnits="userSpaceOnUse" id="linearGradient43786" xlink:href="#linearGradient40934-2" inkscape:collect="always"/>
+    <linearGradient id="linearGradient156294">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop156296"/>
+      <stop id="stop156298" offset="0.45770872" style="stop-color:#91a4bd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop156300"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect40619-6" is_visible="true"/>
+    <linearGradient y2="-525.67389" x2="-889.61505" y1="-525.67389" x1="-893.72705" gradientUnits="userSpaceOnUse" id="linearGradient156373" xlink:href="#linearGradient40934-2" inkscape:collect="always"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="106.69823"
-     inkscape:cy="44"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="88"
-     inkscape:window-y="116"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata156380">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="106.69823" inkscape:cy="44" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="88" inkscape:window-y="116" inkscape:window-maximized="0"/>
+  <metadata id="metadata156380">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-268.30177,-448.36218)">
-    <g
-       style="display:inline"
-       transform="matrix(0.9719878,0,0,0.9719878,1199.152,963.29805)"
-       id="g43194"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Satellite_antenna.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         sodipodi:nodetypes="ccccc"
-         d="m -911.79354,-410.37974 22.66845,2.88058 0,3.55542 -22.66845,-2.88058 z"
-         style="opacity:0.46188343;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41624-5)"
-         id="path41600-7"
-         inkscape:connector-curvature="0"
-         transform="matrix(1,0,0,1.0998016,0,40.960864)" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path41602-7"
-         style="opacity:0.46188343;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41628-4)"
-         d="m -949.9152,-408.40548 38.25149,-2.01741 0,3.55541 -38.25149,2.01741 z"
-         inkscape:connector-curvature="0"
-         transform="matrix(1,0,0,1.0998016,0,40.960864)" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -925.89944,-405.33147 36.77471,-2.17366 0,3.55541 -36.77471,2.17366 z"
-         style="opacity:0.46188343;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41632-2)"
-         id="path41604-1"
-         transform="matrix(1,0,0,1.0998016,0,40.960864)" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path41606-9"
-         style="opacity:0.46188343;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41636-6)"
-         d="m -949.89587,-408.19923 24.14501,2.85714 0,3.55542 -24.14501,-2.85714 z"
-         transform="matrix(1,0,0,1.0998016,0,40.960864)" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path41504-1"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -911.79354,-410.37974 22.66845,2.88058 0,3.55542 -22.66845,-2.88058 z"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -949.9152,-408.40548 38.25149,-2.01741 0,3.55541 -38.25149,2.01741 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path41502-6"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path40783"
-         style="fill:url(#linearGradient41715-3);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -864.40408,-466.13302 1.12503,0.41616 -7.67449,11.12332 -1.12503,-0.41616 z"
-         inkscape:connector-curvature="0" />
-      <rect
-         transform="matrix(0.33868709,0.94089907,-0.94089907,0.33868709,0,0)"
-         ry="0"
-         y="724.87634"
-         x="-786.55853"
-         height="9.1556826"
-         width="1.3508385"
-         id="rect40629"
-         style="fill:url(#linearGradient41717-4);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="rect40643"
-         style="fill:url(#linearGradient41719-9);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -950.84238,-495.24419 1.52448,-0.95917 10.38658,19.17463 -1.52447,0.95916 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <rect
-         style="fill:url(#linearGradient41721-6);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect40627"
-         width="1.3508385"
-         height="9.1556826"
-         x="-1075.5502"
-         y="-46.529556"
-         ry="0"
-         transform="matrix(0.90480405,0.42582817,-0.42582817,0.90480405,0,0)" />
-      <path
-         style="fill:url(#linearGradient41723-0);fill-opacity:1;stroke:none"
-         d="m -946.50035,-504.74801 c -1.25958,-0.24502 -2.59182,-0.10252 -3.77109,0.40336 -1.06577,0.45719 -2.00373,1.20822 -2.68292,2.14822 -0.4138,1.00538 -0.53132,2.13063 -0.33418,3.19982 0.201,1.09012 0.72866,2.11785 1.4974,2.91647 l 6.15383,6.6041 c 1.44496,1.94449 2.94674,3.84676 4.50279,5.70355 0.59256,0.70708 1.19298,1.40757 1.80112,2.10129 l -1.62255,8.2913 1.20845,3.83777 5.66197,5.79783 6.30931,4.58824 12.15754,2.40033 11.25699,3.90243 8.40522,-0.88085 5.33099,-2.10024 4.19992,-5.12395 6.22887,0 c 1.74147,0 3.48316,-0.0516 5.21938,-0.18674 1.69901,-0.13224 3.40032,-0.31257 5.05715,-0.71133 1.42813,-0.34372 2.81728,-0.84911 4.13241,-1.50342 0.56098,-0.23512 1.07499,-0.58166 1.50334,-1.01351 0.37624,-0.37932 0.68636,-0.82406 0.91223,-1.30824 0.14855,-0.3295 0.24637,-0.68181 0.28897,-1.04073 0.039,-0.32892 0.0317,-0.66331 -0.0216,-0.99022 -0.0226,-0.21742 -0.057,-0.43361 -0.10314,-0.64728 -0.0431,-0.19954 -0.0963,-0.39687 -0.15947,-0.59099 l -83.13293,-35.79721"
-         id="path40623-2"
-         inkscape:path-effect="#path-effect40625-7"
-         inkscape:original-d="m -946.50035,-504.74801 c -0.23765,0.25015 -2.29518,-0.1376 -3.77109,0.40336 -1.47592,0.54097 -2.37022,1.78549 -2.68292,2.14822 -0.22081,1.05182 -0.58021,2.24323 -0.33418,3.19982 0.24604,0.95657 1.09754,1.90345 1.4974,2.91647 l 6.15383,6.6041 4.50279,5.70355 1.80112,2.10129 -1.62255,8.2913 1.20845,3.83777 5.66197,5.79783 6.30931,4.58824 12.15754,2.40033 11.25699,3.90243 8.40522,-0.88085 c 2.52313,-0.0148 2.85418,-1.60492 5.33099,-2.10024 l 4.19992,-5.12395 6.22887,0 c 1.72349,0.0888 3.47245,-0.0428 5.21938,-0.18674 1.74694,-0.14394 3.49184,-0.30027 5.05715,-0.71133 1.47324,-0.39441 2.64791,-0.91474 4.13241,-1.50342 0.47082,-0.34668 1.0801,-0.64302 1.50334,-1.01351 0.42322,-0.37049 0.66038,-0.81511 0.91223,-1.30824 0.0845,-0.33675 0.25014,-0.69295 0.28897,-1.04073 0.0388,-0.34778 -0.0491,-0.68715 -0.0216,-0.99022 -0.072,-0.20638 -0.0313,-0.4409 -0.10314,-0.64728 -0.0719,-0.20638 -0.0876,-0.38461 -0.15947,-0.59099 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscsccccccccccccccsccscscscc" />
-      <path
-         id="rect40635"
-         style="fill:#8e8eb1;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -956.62408,-491.49426 8.77003,1.7422 0.95498,1.77419 -9.99268,-2.48939 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect40637"
-         style="fill:url(#linearGradient41727-3);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -955.91823,-491.18422 10.54408,5.98926 0.95943,1.78484 -12.02358,-6.84894 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -955.21416,-490.49179 16.8849,16.08114 0.97543,-1.02685 9.03891,3.13672 1.21794,0.0908 1.73115,1.56768 -0.65902,1.97091 -1.31084,-0.16477 -3.20921,-1.10292 0.50262,3.18068 -1.45596,-1.39778 -0.41502,-3.29467 4.71414,1.61267 -0.0655,-1.08841 -9.66724,-2.59841 15.79944,15.49246 -0.71372,0.78548 -8.75564,-8.33885 -5.80192,-1.25763 -2.42054,-1.86487 -0.80963,-5.60242 1.41701,1.20562 0.61436,4.70549 5.50737,1.39155 -23.83274,-22.69824 z"
-         style="fill:url(#linearGradient41729-4);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40641-7" />
-      <path
-         id="rect40631"
-         style="fill:url(#linearGradient42594-9);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -939.07779,-469.12968 9.13201,7.77183 0.94417,-1.46153 3.2572,1.34652 -2.86459,3.39191 -1.80866,-0.8331 -9.76375,-9.43665 -17.49546,-23.12392 1.27344,-0.9488 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccccccc"
-         inkscape:connector-curvature="0"
-         d="m -945.92061,-489.71979 -4.12976,-4.48183 16.27981,14.83244 2.12196,0.59243 -6.66877,-7.38256 2.55623,1.32174 8.50381,8.15479 -13.10925,0.36211 0.49747,-2.53218 2.38324,1.23467 1.78696,-0.97325 z"
-         style="fill:url(#linearGradient41731-6);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40647-2" />
-      <path
-         id="rect40649"
-         style="fill:url(#linearGradient41733-5);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -930.3574,-482.38036 2.50956,1.49082 1.14836,1.02745 4.75797,1.29207 1.45973,0.58586 -5.58025,-0.88957 2.0819,2.73601 -1.21896,0.0715 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         id="rect40653"
-         style="fill:url(#linearGradient41735-7);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -924.02986,-476.23492 2.18208,1.89585 3.00563,-2.01051 -1.16234,-1.40495 c 1.61415,0.85911 3.44078,1.71251 4.92645,2.38386 l -1.19518,0.24084 1.57151,1.29581 0.9434,-1.05723 1.53609,0.69852 -1.92871,1.3229 1.80597,1.79742 1.19714,-2.81353 1.37573,0.59998 -1.40394,3.0019 2.09241,2.18042 -0.35688,-5.10744 1.08736,0.32769 0.56824,6.13316 5.18908,5.40736 -0.43007,1.60178 -8.7753,-9.07931 -1.97303,5.73262 0.18609,5.80946 -1.22402,-0.60526 -0.53523,-5.33144 2.45575,-6.63942 -2.14782,-2.21946 -0.70931,0.68953 1.93172,1.667 3.11493,2.26689 -6.78213,0.0949 0.0528,-1.87624 1.40328,0.056 -0.47467,-1.47556 -4.42512,4.30167 -4.49796,-1.27815 3.67952,9.14021 -1.75334,-1.84703 -3.05921,-7.3917 0.2943,-0.70381 4.41507,1.41291 5.90929,-5.98748 -1.56659,-1.92551 -1.01417,0.43293 2.173,2.41925 -1.36023,0.25713 -1.63814,-2.2953 -1.45398,0.68724 2.29853,1.99704 -1.04413,1.20175 -3.0188,-2.65266 -1.95274,0.88262 2.49528,2.23853 -1.0197,1.04854 -3.52206,-3.38917 -1.05838,-2.08582 0.70499,-0.18133 1.24248,1.23064 1.97772,-0.73908 -0.95231,-0.83682 -3.94326,-0.097 0.27737,2.16615 -2.43872,-2.39299 1.16065,-0.84446 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
-      <path
-         id="rect40657"
-         style="fill:url(#linearGradient41737-4);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -907.09408,-472.31599 1.45234,0.477 3.07929,6.41594 -1.14014,0.4356 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -906.3676,-466.38575 0.61593,-1.0537 7.97153,4.65958 -0.61592,1.05372 z"
-         style="fill:url(#linearGradient41739-7);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40661-7" />
-      <path
-         id="path40663-6"
-         style="fill:url(#linearGradient41741-98);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -903.10566,-459.82315 -1.22616,-1.25296 23.53958,-3.35986 2.24683,0.86872 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path40665-5"
-         style="fill:url(#linearGradient41743-0);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -898.52323,-467.83025 1.21582,-0.0784 0.81023,6.73248 -1.23982,-0.44999 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -900.96285,-470.3105 1.90683,0.64358 1.77459,1.77205 -1.10229,0.85741 z"
-         style="fill:url(#linearGradient41745-2);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40667-1"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -880.8436,-464.45345 1.92377,0.2078 8.24166,9.26553 -0.706,1.04951 z"
-         style="fill:url(#linearGradient41747-3);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40781"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -903.55513,-452.12231 -0.49828,-1.19322 32.50452,-1.91609 0.16302,1.30141 z"
-         style="fill:url(#linearGradient42596-6);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40785"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -872.05686,-462.11742 7.84686,-2.10519 -2.1556,1.22739 -4.81776,1.78596 -17.43079,8.26236 -2.99741,0.14981 z"
-         style="fill:url(#linearGradient41751-1);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40787"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path40789"
-         style="fill:url(#linearGradient41753-55);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -884.5772,-462.65813 1.88037,-0.28857 12.03995,7.94114 -0.72298,1.07716 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -890.84214,-461.68295 2.76314,-0.42694 17.10715,7.58796 -0.38424,0.57361 z"
-         style="fill:url(#linearGradient41755-4);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40791"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path40793"
-         style="fill:url(#linearGradient41757-0);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -898.52562,-461.84338 0.66915,-0.95103 17.38783,8.11112 -0.49461,1.29534 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="rect40795"
-         style="fill:url(#linearGradient41759-2);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -903.17649,-459.89514 2.17203,-0.25173 -3.2831,14.30641 0.0898,-1.97066 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path40665-3"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -908.31765,-453.87018 0.93398,0.44514 -8.15515,11.90721 -1.13681,-0.47993 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -903.38158,-457.32156 -0.35577,4.61849 -20.21604,-5.69929 -0.59884,0.0676 z"
-         style="fill:url(#linearGradient41761-6);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40799"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -911.00485,-443.7753 -0.77621,1.30071 -7.96351,-10.76679 0.75781,-0.97386 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40857" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -909.79822,-461.82049 1.16778,-0.35455 0.72618,6.25217 -1.21581,0.0784 z"
-         style="fill:url(#linearGradient41763-0);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40801"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path40803"
-         style="fill:url(#linearGradient41765-61);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -912.27388,-467.43478 0.44189,-1.44581 3.20354,6.7313 -1.16235,0.36509 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path40859"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -925.77812,-445.20949 -0.87148,-0.85138 7.753,-10.04054 1.13681,0.47992 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect40795-6"
-         style="fill:url(#linearGradient42592-1);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -919.56922,-470.4066 1.31187,-1.48971 1.65979,-0.37442 -2.03124,20.53845 -2.01104,-0.29729 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -928.84425,-450.31652 -0.33648,-1.21073 16.37258,-3.62372 0.64032,1.06395 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40861" />
-      <path
-         id="rect40823"
-         style="fill:url(#linearGradient43192-1);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -932.6022,-460.01514 29.15344,3.60954 -0.28431,3.82073 -3.83514,-0.60155 -24.91003,-3.02708 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         style="fill:url(#linearGradient41771-7);fill-opacity:1;stroke:none"
-         d="m -932.55602,-456.25993 7.58419,24.52496 20.00586,1.32665 1.23215,-22.27375 -2.76603,-0.39468 -2.39301,15.87604 -13.21342,-0.74293 -9.15282,-18.08063 -1.29692,-0.23566"
-         id="path40827"
-         inkscape:path-effect="#path-effect40829-3"
-         inkscape:original-d="m -932.55602,-456.25993 7.58419,24.52496 20.00586,1.32665 1.23215,-22.27375 -2.76603,-0.39468 -2.39301,15.87604 -13.21342,-0.74293 -9.15282,-18.08063 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         id="rect40863"
-         style="fill:url(#linearGradient41773-0);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -928.63337,-430.08993 17.67096,-0.31839 0,4.0609 -17.67096,0.3184 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#1a1a1a;stroke:none"
-         d="m -932.5072,-456.25145 -1.69811,-0.053 0.68986,26.47991 10.45399,-0.21226 -0.053,3.87381 -6.79244,0.053 0.053,1.22052 4.08607,-0.1592 4.51061,2.70637 -0.0973,-2.81486 5.24468,0.79836 3.44929,0.053 0.053,1.06131 1.27358,-0.053 0,-3.23703 -1.37972,-0.26534 -0.053,-3.60848 -1.32665,0.10608 0.1592,3.60849 -0.95518,0 -0.1592,-3.66156 -1.48584,0.15921 0.15919,3.34315 -3.50236,0.053 0,-3.29008 c 0.93749,0.005 1.87501,0.005 2.8125,0 4.03299,-0.0201 8.06555,-0.12658 12.09398,-0.31938 l -19.98754,-1.32567 -7.54861,-24.51635"
-         id="path40831"
-         inkscape:path-effect="#path-effect40833-0"
-         inkscape:original-d="m -932.5072,-456.25145 -1.69811,-0.053 0.68986,26.47991 10.45399,-0.21226 -0.053,3.87381 -6.79244,0.053 0.053,1.22052 4.08607,-0.1592 4.51061,2.70637 -0.0973,-2.81486 c 3.31873,-1.50048 3.46255,1.76368 5.24468,0.79836 l 3.44929,0.053 0.053,1.06131 1.27358,-0.053 0,-3.23703 -1.37972,-0.26534 -0.053,-3.60848 -1.32665,0.10608 0.1592,3.60849 -0.95518,0 -0.1592,-3.66156 -1.48584,0.15921 0.15919,3.34315 -3.50236,0.053 0,-3.29008 2.8125,0 12.09398,-0.31938 c -6.63741,-0.61057 -13.33341,-0.96538 -19.98754,-1.32567 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccccccccccc" />
-      <path
-         style="fill:#232d3c;fill-opacity:1;stroke:none"
-         d="m -930.54376,-455.98612 12.53208,14.20048 -3.9354,-0.35027 -4.0394,-3.19243 3.93327,7.43771 2.22877,0.10183 4.19225,0.23138 6.79244,0.3566 2.80346,-15.7806 1.6131,0.27272 -3.06589,-0.537 -4.9634,11.78054 -3.04175,-0.15706 -13.22583,-14.07716 -1.8237,-0.28674"
-         id="path40835"
-         inkscape:path-effect="#path-effect40837-4"
-         inkscape:original-d="m -930.54376,-455.98612 12.53208,14.20048 -3.9354,-0.35027 -4.0394,-3.19243 3.93327,7.43771 2.22877,0.10183 c -0.56271,-3.43641 4.75685,-4.59418 4.19225,0.23138 l 6.79244,0.3566 2.80346,-15.7806 1.6131,0.27272 -3.06589,-0.537 -4.9634,11.78054 -3.04175,-0.15706 -13.22583,-14.07716 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccc" />
-      <path
-         sodipodi:nodetypes="sssss"
-         inkscape:connector-curvature="0"
-         d="m -863.68265,-467.39036 c -2.9497,6.14076 -24.06415,1.59568 -48.27134,-8.11508 -24.20719,-9.71078 -42.71694,-21.1055 -39.39065,-27.05071 3.09978,-5.5404 24.51444,-1.59568 48.72162,8.11508 24.2072,9.71077 41.89007,20.90995 38.94037,27.05071 z"
-         style="fill:url(#radialGradient41775-8);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40083" />
-      <path
-         style="fill:url(#radialGradient41787-3);fill-opacity:1;stroke:none"
-         d="m -929.96003,-426.05692 -2.60024,2.91862 0,1.22052 0.58373,0.10608 0,0.74292 -15.17687,14.32781 -0.68984,1.43278 3.60848,0.053 10.02946,-10.50706 5.39681,-7.02711 c -1.7982,2.50721 -3.5795,5.02654 -5.34375,7.55776 -0.99601,1.429 -1.98658,2.8618 -2.97169,4.29834 l -1.48584,3.87382 -0.90212,1.80425 -1.96344,0.1592 -0.053,0.58372 5.04126,0 0.21226,-1.22052 9.3396,-10.13559 3.97996,-5.04127 1.80424,-1.85731 -2.70636,-1.11439 c -2.35276,2.87231 -4.67021,5.77354 -6.95164,8.70282 -1.51958,1.95108 -3.02318,3.91461 -4.5106,5.89032 1.92366,-2.84649 3.76432,-5.74907 5.51885,-8.70282 1.39963,-2.35627 2.74445,-4.7451 4.03302,-7.1639 l -2.75944,0 -1.43284,-0.90199"
-         id="path40867"
-         inkscape:path-effect="#path-effect40869-0"
-         inkscape:original-d="m -929.96003,-426.05692 -2.60024,2.91862 0,1.22052 0.58373,0.10608 0,0.74292 -15.17687,14.32781 -0.68984,1.43278 3.60848,0.053 10.02946,-10.50706 5.39681,-7.02711 -5.34375,7.55776 -2.97169,4.29834 -1.48584,3.87382 -0.90212,1.80425 -1.96344,0.1592 -0.053,0.58372 5.04126,0 0.21226,-1.22052 9.3396,-10.13559 3.97996,-5.04127 1.80424,-1.85731 -2.70636,-1.11439 -6.95164,8.70282 -4.5106,5.89032 5.51885,-8.70282 4.03302,-7.1639 -2.75944,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccccccccc" />
-      <path
-         style="fill:url(#radialGradient41789-1);fill-opacity:1;stroke:none"
-         d="m -921.09708,-423.03335 -1.38836,1.52608 -1.05066,4.2525 -5.18152,7.74047 -2.51104,-1.71191 -1.84561,1.98957 2.80274,1.75669 -1.65102,2.23263 3.65853,0 0.75045,-1.91369 1.85741,0.0938 -0.22514,1.81987 3.93995,-0.16885 -0.22515,-2.38273 0.90057,-10.09376 0.91932,-4.55909 z m -2.3452,9.49339 -1.25703,4.46527 -1.59475,-0.43152 z"
-         id="path40871"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccc" />
-      <path
-         style="fill:url(#linearGradient41791-2);fill-opacity:1;stroke:none"
-         d="m -921.32763,-422.73251 2.8829,3.25576 2.28184,13.79716 2.3349,-0.10618 -2.4941,-11.78065 7.11084,11.09079 0.95519,1.06132 2.22877,0.15919 -10.2948,-15.44219 -2.61508,-4.5467 -4.61138,0.0625 -0.28591,1.30284 2.50683,1.14616"
-         id="path40880-3"
-         inkscape:path-effect="#path-effect40882-9"
-         inkscape:original-d="m -921.32763,-422.73251 2.8829,3.25576 2.28184,13.79716 2.3349,-0.10618 -2.4941,-11.78065 7.11084,11.09079 0.95519,1.06132 2.22877,0.15919 -10.2948,-15.44219 -2.61508,-4.5467 -4.61138,0.0625 -0.28591,1.30284 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
-      <path
-         transform="matrix(1,0,0,0.75049597,0,-99.381775)"
-         inkscape:connector-curvature="0"
-         id="path41640-9"
-         style="opacity:0.35426007;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41624-5)"
-         d="m -911.79354,-410.37974 22.66845,2.88058 0,3.55542 -22.66845,-2.88058 z"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:url(#linearGradient41793-0);fill-opacity:1;stroke:none"
-         d="m -918.07326,-423.1383 c 1.99069,2.91509 3.972,5.83659 5.94387,8.76444 1.82664,2.71221 3.64519,5.42987 5.45561,8.15293 l 0.80569,0.96585 1.8573,-0.053 -5.48173,-13.56203 4.68575,8.41468 2.28183,5.09433 2.22877,0 -8.17215,-15.22992 15.28299,15.60139 2.75943,0 -20.54318,-21.53526 -0.41169,-0.0118 -0.006,3.14225 -1.227,0.14514 1.227,3.40137 1.06133,4.5106 -5.76637,-9.03904 -2.84093,-0.86945 0.85948,2.10752"
-         id="path40884-9"
-         inkscape:path-effect="#path-effect40886-3"
-         inkscape:original-d="m -918.07326,-423.1383 5.94387,8.76444 5.45561,8.15293 0.80569,0.96585 1.8573,-0.053 -5.48173,-13.56203 4.68575,8.41468 2.28183,5.09433 2.22877,0 -8.17215,-15.22992 15.28299,15.60139 2.75943,0 -20.54318,-21.53526 -0.41169,-0.0118 -0.006,3.14225 -1.227,0.14514 1.227,3.40137 1.06133,4.5106 -5.76637,-9.03904 -2.84093,-0.86945 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccc" />
-      <path
-         transform="matrix(1,0,0,0.75049597,0,-99.381775)"
-         inkscape:connector-curvature="0"
-         d="m -949.9152,-408.40548 38.25149,-2.01741 0,3.55541 -38.25149,2.01741 z"
-         style="opacity:0.35426007;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41628-4)"
-         id="path41642-5"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect40888"
-         style="fill:url(#linearGradient41795-8);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -925.89944,-405.33147 36.77471,-2.17366 0,3.55541 -36.77471,2.17366 z"
-         inkscape:connector-curvature="0" />
-      <path
-         transform="matrix(1,0,0,0.75049597,0,-99.381775)"
-         id="path41644-9"
-         style="opacity:0.35426007;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41632-2)"
-         d="m -925.89944,-405.33147 36.77471,-2.17366 0,3.55541 -36.77471,2.17366 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -949.89587,-408.19923 24.14501,2.85714 0,3.55542 -24.14501,-2.85714 z"
-         style="fill:url(#linearGradient41797-85);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40892-2"
-         inkscape:connector-curvature="0" />
-      <path
-         transform="matrix(1,0,0,0.75049597,0,-99.381775)"
-         d="m -949.89587,-408.19923 24.14501,2.85714 0,3.55542 -24.14501,-2.85714 z"
-         style="opacity:0.35426007;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41636-6)"
-         id="path41646-6"
-         inkscape:connector-curvature="0" />
-      <path
-         id="rect41476"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -934.23732,-460.01944 1.6811,0 0.0721,3.79449 -1.71713,-0.048 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path41855"
-         style="opacity:0.264574;fill:url(#linearGradient41857-7);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41992-0)"
-         d="m -909.71067,-484.13085 -0.16608,0.96091 -29.39967,-8.5345 c -0.17913,-0.4164 -0.23064,-0.78051 0.16608,-0.96092 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -908.91869,-483.08574 -0.43637,0.60504 -17.11518,-13.89305 c 0.0183,-0.33147 0.10594,-0.59229 0.43636,-0.60502 z"
-         style="opacity:0.264574;fill:url(#linearGradient41861-4);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41988-7)"
-         id="path41859" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -880.34625,-480.27583 -0.0662,0.94629 -29.54073,-3.94032 c -0.21631,-0.37376 -0.30288,-0.71578 0.0662,-0.9463 z"
-         style="opacity:0.264574;fill:url(#linearGradient41865-3);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41984-7)"
-         id="path41863" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -887.32868,-469.08022 -0.42045,0.72365 -21.71371,-14.18298 c -0.0248,-0.37664 0.0403,-0.67959 0.42043,-0.72361 z"
-         style="opacity:0.264574;fill:url(#linearGradient41883-0);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41996-5)"
-         id="path41859-1" />
-      <path
-         id="rect40087"
-         style="fill:url(#linearGradient41851-1);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -894.03611,-514.56109 1.48227,-0.30515 6.52148,46.28175 c -0.5195,0.45678 -1.10573,0.31286 -1.69453,0.14595 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <rect
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect40621"
-         width="2.122638"
-         height="3.6084845"
-         x="-1031.6484"
-         y="-74.507393"
-         transform="matrix(0.90300847,0.42962274,-0.42962274,0.90300847,0,0)"
-         ry="1.014852" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -900.75475,-517.94001 0.90409,1.21362 -39.11222,25.24541 c -0.64456,-0.23295 -1.10234,-0.55928 -0.90409,-1.21363 z"
-         style="fill:url(#linearGradient41847-45);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40091" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -892.85427,-514.42383 1.64281,-0.33379 12.0026,34.73224 c -0.26814,0.31426 -0.41001,0.7127 -1.49272,0.4839 z"
-         style="fill:url(#linearGradient41849-6);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40093" />
-      <path
-         id="path40095"
-         style="fill:url(#linearGradient41845-2);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -899.16988,-516.85425 0.69605,0.85281 -27.11689,19.49663 c -0.50368,0.14831 -0.92988,-0.26379 -1.09404,-0.66709 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -900.54,-518.24338 c 2.80533,2.71825 6.01859,3.58906 9.42129,3.9178 l 2.10035,6.06549 c -5.55507,2.04429 -14.02559,-1.93787 -17.25428,-6.04725 z"
-         style="fill:url(#radialGradient41777-0);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40101" />
-      <path
-         id="path40327"
-         style="fill:url(#radialGradient41779-3);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -891.11134,-514.41002 c -0.31845,0.6729 -2.59788,0.17486 -5.2112,-0.88923 -2.61331,-1.06408 -4.61157,-2.31268 -4.25247,-2.96414 0.33465,-0.6071 2.6465,-0.17485 5.25981,0.88924 2.61332,1.06407 4.5223,2.29124 4.20386,2.96413 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssss" />
-      <path
-         id="rect40607"
-         style="fill:url(#radialGradient41781-5);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m -895.09834,-522.43885 c 1.09931,1.14133 1.95333,1.34748 3.34251,1.43231 l -2.42745,5.24873 c -1.22943,-0.0686 -2.93772,-0.75558 -3.32376,-1.47922 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="sssss"
-         inkscape:connector-curvature="0"
-         d="m -891.75759,-520.99131 c -0.11263,0.25177 -0.91888,0.0654 -1.8432,-0.33271 -0.92432,-0.39811 -1.63109,-0.86528 -1.50409,-1.10903 0.11837,-0.22714 0.93607,-0.0654 1.86038,0.33271 0.92434,0.39812 1.59954,0.85727 1.48691,1.10903 z"
-         style="fill:url(#radialGradient41783-6);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40611-5" />
-      <path
-         style="fill:url(#linearGradient156373);fill-opacity:1;stroke:none"
-         d="m -892.93139,-521.57172 3.31635,-8.20434 -4.11202,7.84237 c 0.10516,0.1149 0.23468,0.2074 0.37749,0.26958 0.1317,0.0573 0.27458,0.0889 0.41818,0.0924"
-         id="path40617-3"
-         inkscape:path-effect="#path-effect40619-6"
-         inkscape:original-d="m -892.93139,-521.57172 3.31635,-8.20434 -4.11202,7.84237 c 0.11644,0.14404 0.24495,0.21936 0.37749,0.26958 0.13254,0.0502 0.27241,0.0488 0.41818,0.0924 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccsc" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-268.30177,-448.36218)">
+    <g style="display:inline" transform="matrix(0.9719878,0,0,0.9719878,1199.152,963.29805)" id="g43194">
+      <path sodipodi:nodetypes="ccccc" d="m -911.79354,-410.37974 22.66845,2.88058 0,3.55542 -22.66845,-2.88058 z" style="opacity:0.46188343;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41624-5)" id="path41600-7" inkscape:connector-curvature="0" transform="matrix(1,0,0,1.0998016,0,40.960864)"/>
+      <path sodipodi:nodetypes="ccccc" id="path41602-7" style="opacity:0.46188343;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41628-4)" d="m -949.9152,-408.40548 38.25149,-2.01741 0,3.55541 -38.25149,2.01741 z" inkscape:connector-curvature="0" transform="matrix(1,0,0,1.0998016,0,40.960864)"/>
+      <path inkscape:connector-curvature="0" d="m -925.89944,-405.33147 36.77471,-2.17366 0,3.55541 -36.77471,2.17366 z" style="opacity:0.46188343;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41632-2)" id="path41604-1" transform="matrix(1,0,0,1.0998016,0,40.960864)"/>
+      <path inkscape:connector-curvature="0" id="path41606-9" style="opacity:0.46188343;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41636-6)" d="m -949.89587,-408.19923 24.14501,2.85714 0,3.55542 -24.14501,-2.85714 z" transform="matrix(1,0,0,1.0998016,0,40.960864)"/>
+      <path inkscape:connector-curvature="0" id="path41504-1" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -911.79354,-410.37974 22.66845,2.88058 0,3.55542 -22.66845,-2.88058 z" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" d="m -949.9152,-408.40548 38.25149,-2.01741 0,3.55541 -38.25149,2.01741 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path41502-6" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" id="path40783" style="fill:url(#linearGradient41715-3);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -864.40408,-466.13302 1.12503,0.41616 -7.67449,11.12332 -1.12503,-0.41616 z" inkscape:connector-curvature="0"/>
+      <rect transform="matrix(0.33868709,0.94089907,-0.94089907,0.33868709,0,0)" ry="0" y="724.87634" x="-786.55853" height="9.1556826" width="1.3508385" id="rect40629" style="fill:url(#linearGradient41717-4);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path id="rect40643" style="fill:url(#linearGradient41719-9);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -950.84238,-495.24419 1.52448,-0.95917 10.38658,19.17463 -1.52447,0.95916 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <rect style="fill:url(#linearGradient41721-6);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect40627" width="1.3508385" height="9.1556826" x="-1075.5502" y="-46.529556" ry="0" transform="matrix(0.90480405,0.42582817,-0.42582817,0.90480405,0,0)"/>
+      <path style="fill:url(#linearGradient41723-0);fill-opacity:1;stroke:none" d="m -946.50035,-504.74801 c -1.25958,-0.24502 -2.59182,-0.10252 -3.77109,0.40336 -1.06577,0.45719 -2.00373,1.20822 -2.68292,2.14822 -0.4138,1.00538 -0.53132,2.13063 -0.33418,3.19982 0.201,1.09012 0.72866,2.11785 1.4974,2.91647 l 6.15383,6.6041 c 1.44496,1.94449 2.94674,3.84676 4.50279,5.70355 0.59256,0.70708 1.19298,1.40757 1.80112,2.10129 l -1.62255,8.2913 1.20845,3.83777 5.66197,5.79783 6.30931,4.58824 12.15754,2.40033 11.25699,3.90243 8.40522,-0.88085 5.33099,-2.10024 4.19992,-5.12395 6.22887,0 c 1.74147,0 3.48316,-0.0516 5.21938,-0.18674 1.69901,-0.13224 3.40032,-0.31257 5.05715,-0.71133 1.42813,-0.34372 2.81728,-0.84911 4.13241,-1.50342 0.56098,-0.23512 1.07499,-0.58166 1.50334,-1.01351 0.37624,-0.37932 0.68636,-0.82406 0.91223,-1.30824 0.14855,-0.3295 0.24637,-0.68181 0.28897,-1.04073 0.039,-0.32892 0.0317,-0.66331 -0.0216,-0.99022 -0.0226,-0.21742 -0.057,-0.43361 -0.10314,-0.64728 -0.0431,-0.19954 -0.0963,-0.39687 -0.15947,-0.59099 l -83.13293,-35.79721" id="path40623-2" inkscape:path-effect="#path-effect40625-7" inkscape:original-d="m -946.50035,-504.74801 c -0.23765,0.25015 -2.29518,-0.1376 -3.77109,0.40336 -1.47592,0.54097 -2.37022,1.78549 -2.68292,2.14822 -0.22081,1.05182 -0.58021,2.24323 -0.33418,3.19982 0.24604,0.95657 1.09754,1.90345 1.4974,2.91647 l 6.15383,6.6041 4.50279,5.70355 1.80112,2.10129 -1.62255,8.2913 1.20845,3.83777 5.66197,5.79783 6.30931,4.58824 12.15754,2.40033 11.25699,3.90243 8.40522,-0.88085 c 2.52313,-0.0148 2.85418,-1.60492 5.33099,-2.10024 l 4.19992,-5.12395 6.22887,0 c 1.72349,0.0888 3.47245,-0.0428 5.21938,-0.18674 1.74694,-0.14394 3.49184,-0.30027 5.05715,-0.71133 1.47324,-0.39441 2.64791,-0.91474 4.13241,-1.50342 0.47082,-0.34668 1.0801,-0.64302 1.50334,-1.01351 0.42322,-0.37049 0.66038,-0.81511 0.91223,-1.30824 0.0845,-0.33675 0.25014,-0.69295 0.28897,-1.04073 0.0388,-0.34778 -0.0491,-0.68715 -0.0216,-0.99022 -0.072,-0.20638 -0.0313,-0.4409 -0.10314,-0.64728 -0.0719,-0.20638 -0.0876,-0.38461 -0.15947,-0.59099 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cscsccccccccccccccsccscscscc"/>
+      <path id="rect40635" style="fill:#8e8eb1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -956.62408,-491.49426 8.77003,1.7422 0.95498,1.77419 -9.99268,-2.48939 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect40637" style="fill:url(#linearGradient41727-3);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -955.91823,-491.18422 10.54408,5.98926 0.95943,1.78484 -12.02358,-6.84894 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="cccccccccccccccccccccccccc" inkscape:connector-curvature="0" d="m -955.21416,-490.49179 16.8849,16.08114 0.97543,-1.02685 9.03891,3.13672 1.21794,0.0908 1.73115,1.56768 -0.65902,1.97091 -1.31084,-0.16477 -3.20921,-1.10292 0.50262,3.18068 -1.45596,-1.39778 -0.41502,-3.29467 4.71414,1.61267 -0.0655,-1.08841 -9.66724,-2.59841 15.79944,15.49246 -0.71372,0.78548 -8.75564,-8.33885 -5.80192,-1.25763 -2.42054,-1.86487 -0.80963,-5.60242 1.41701,1.20562 0.61436,4.70549 5.50737,1.39155 -23.83274,-22.69824 z" style="fill:url(#linearGradient41729-4);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40641-7"/>
+      <path id="rect40631" style="fill:url(#linearGradient42594-9);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -939.07779,-469.12968 9.13201,7.77183 0.94417,-1.46153 3.2572,1.34652 -2.86459,3.39191 -1.80866,-0.8331 -9.76375,-9.43665 -17.49546,-23.12392 1.27344,-0.9488 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+      <path sodipodi:nodetypes="cccccccccccc" inkscape:connector-curvature="0" d="m -945.92061,-489.71979 -4.12976,-4.48183 16.27981,14.83244 2.12196,0.59243 -6.66877,-7.38256 2.55623,1.32174 8.50381,8.15479 -13.10925,0.36211 0.49747,-2.53218 2.38324,1.23467 1.78696,-0.97325 z" style="fill:url(#linearGradient41731-6);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40647-2"/>
+      <path id="rect40649" style="fill:url(#linearGradient41733-5);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -930.3574,-482.38036 2.50956,1.49082 1.14836,1.02745 4.75797,1.29207 1.45973,0.58586 -5.58025,-0.88957 2.0819,2.73601 -1.21896,0.0715 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path id="rect40653" style="fill:url(#linearGradient41735-7);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -924.02986,-476.23492 2.18208,1.89585 3.00563,-2.01051 -1.16234,-1.40495 c 1.61415,0.85911 3.44078,1.71251 4.92645,2.38386 l -1.19518,0.24084 1.57151,1.29581 0.9434,-1.05723 1.53609,0.69852 -1.92871,1.3229 1.80597,1.79742 1.19714,-2.81353 1.37573,0.59998 -1.40394,3.0019 2.09241,2.18042 -0.35688,-5.10744 1.08736,0.32769 0.56824,6.13316 5.18908,5.40736 -0.43007,1.60178 -8.7753,-9.07931 -1.97303,5.73262 0.18609,5.80946 -1.22402,-0.60526 -0.53523,-5.33144 2.45575,-6.63942 -2.14782,-2.21946 -0.70931,0.68953 1.93172,1.667 3.11493,2.26689 -6.78213,0.0949 0.0528,-1.87624 1.40328,0.056 -0.47467,-1.47556 -4.42512,4.30167 -4.49796,-1.27815 3.67952,9.14021 -1.75334,-1.84703 -3.05921,-7.3917 0.2943,-0.70381 4.41507,1.41291 5.90929,-5.98748 -1.56659,-1.92551 -1.01417,0.43293 2.173,2.41925 -1.36023,0.25713 -1.63814,-2.2953 -1.45398,0.68724 2.29853,1.99704 -1.04413,1.20175 -3.0188,-2.65266 -1.95274,0.88262 2.49528,2.23853 -1.0197,1.04854 -3.52206,-3.38917 -1.05838,-2.08582 0.70499,-0.18133 1.24248,1.23064 1.97772,-0.73908 -0.95231,-0.83682 -3.94326,-0.097 0.27737,2.16615 -2.43872,-2.39299 1.16065,-0.84446 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"/>
+      <path id="rect40657" style="fill:url(#linearGradient41737-4);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -907.09408,-472.31599 1.45234,0.477 3.07929,6.41594 -1.14014,0.4356 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" d="m -906.3676,-466.38575 0.61593,-1.0537 7.97153,4.65958 -0.61592,1.05372 z" style="fill:url(#linearGradient41739-7);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40661-7"/>
+      <path id="path40663-6" style="fill:url(#linearGradient41741-98);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -903.10566,-459.82315 -1.22616,-1.25296 23.53958,-3.35986 2.24683,0.86872 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path40665-5" style="fill:url(#linearGradient41743-0);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -898.52323,-467.83025 1.21582,-0.0784 0.81023,6.73248 -1.23982,-0.44999 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" d="m -900.96285,-470.3105 1.90683,0.64358 1.77459,1.77205 -1.10229,0.85741 z" style="fill:url(#linearGradient41745-2);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40667-1" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" d="m -880.8436,-464.45345 1.92377,0.2078 8.24166,9.26553 -0.706,1.04951 z" style="fill:url(#linearGradient41747-3);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40781" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" d="m -903.55513,-452.12231 -0.49828,-1.19322 32.50452,-1.91609 0.16302,1.30141 z" style="fill:url(#linearGradient42596-6);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40785" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" d="m -872.05686,-462.11742 7.84686,-2.10519 -2.1556,1.22739 -4.81776,1.78596 -17.43079,8.26236 -2.99741,0.14981 z" style="fill:url(#linearGradient41751-1);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40787" sodipodi:nodetypes="ccccccc"/>
+      <path sodipodi:nodetypes="ccccc" id="path40789" style="fill:url(#linearGradient41753-55);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -884.5772,-462.65813 1.88037,-0.28857 12.03995,7.94114 -0.72298,1.07716 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m -890.84214,-461.68295 2.76314,-0.42694 17.10715,7.58796 -0.38424,0.57361 z" style="fill:url(#linearGradient41755-4);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40791" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" id="path40793" style="fill:url(#linearGradient41757-0);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -898.52562,-461.84338 0.66915,-0.95103 17.38783,8.11112 -0.49461,1.29534 z" inkscape:connector-curvature="0"/>
+      <path id="rect40795" style="fill:url(#linearGradient41759-2);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -903.17649,-459.89514 2.17203,-0.25173 -3.2831,14.30641 0.0898,-1.97066 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path40665-3" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -908.31765,-453.87018 0.93398,0.44514 -8.15515,11.90721 -1.13681,-0.47993 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" d="m -903.38158,-457.32156 -0.35577,4.61849 -20.21604,-5.69929 -0.59884,0.0676 z" style="fill:url(#linearGradient41761-6);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40799" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -911.00485,-443.7753 -0.77621,1.30071 -7.96351,-10.76679 0.75781,-0.97386 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40857"/>
+      <path inkscape:connector-curvature="0" d="m -909.79822,-461.82049 1.16778,-0.35455 0.72618,6.25217 -1.21581,0.0784 z" style="fill:url(#linearGradient41763-0);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40801" sodipodi:nodetypes="ccccc"/>
+      <path id="path40803" style="fill:url(#linearGradient41765-61);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -912.27388,-467.43478 0.44189,-1.44581 3.20354,6.7313 -1.16235,0.36509 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path40859" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -925.77812,-445.20949 -0.87148,-0.85138 7.753,-10.04054 1.13681,0.47992 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect40795-6" style="fill:url(#linearGradient42592-1);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -919.56922,-470.4066 1.31187,-1.48971 1.65979,-0.37442 -2.03124,20.53845 -2.01104,-0.29729 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -928.84425,-450.31652 -0.33648,-1.21073 16.37258,-3.62372 0.64032,1.06395 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40861"/>
+      <path id="rect40823" style="fill:url(#linearGradient43192-1);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -932.6022,-460.01514 29.15344,3.60954 -0.28431,3.82073 -3.83514,-0.60155 -24.91003,-3.02708 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+      <path style="fill:url(#linearGradient41771-7);fill-opacity:1;stroke:none" d="m -932.55602,-456.25993 7.58419,24.52496 20.00586,1.32665 1.23215,-22.27375 -2.76603,-0.39468 -2.39301,15.87604 -13.21342,-0.74293 -9.15282,-18.08063 -1.29692,-0.23566" id="path40827" inkscape:path-effect="#path-effect40829-3" inkscape:original-d="m -932.55602,-456.25993 7.58419,24.52496 20.00586,1.32665 1.23215,-22.27375 -2.76603,-0.39468 -2.39301,15.87604 -13.21342,-0.74293 -9.15282,-18.08063 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path id="rect40863" style="fill:url(#linearGradient41773-0);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -928.63337,-430.08993 17.67096,-0.31839 0,4.0609 -17.67096,0.3184 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#1a1a1a;stroke:none" d="m -932.5072,-456.25145 -1.69811,-0.053 0.68986,26.47991 10.45399,-0.21226 -0.053,3.87381 -6.79244,0.053 0.053,1.22052 4.08607,-0.1592 4.51061,2.70637 -0.0973,-2.81486 5.24468,0.79836 3.44929,0.053 0.053,1.06131 1.27358,-0.053 0,-3.23703 -1.37972,-0.26534 -0.053,-3.60848 -1.32665,0.10608 0.1592,3.60849 -0.95518,0 -0.1592,-3.66156 -1.48584,0.15921 0.15919,3.34315 -3.50236,0.053 0,-3.29008 c 0.93749,0.005 1.87501,0.005 2.8125,0 4.03299,-0.0201 8.06555,-0.12658 12.09398,-0.31938 l -19.98754,-1.32567 -7.54861,-24.51635" id="path40831" inkscape:path-effect="#path-effect40833-0" inkscape:original-d="m -932.5072,-456.25145 -1.69811,-0.053 0.68986,26.47991 10.45399,-0.21226 -0.053,3.87381 -6.79244,0.053 0.053,1.22052 4.08607,-0.1592 4.51061,2.70637 -0.0973,-2.81486 c 3.31873,-1.50048 3.46255,1.76368 5.24468,0.79836 l 3.44929,0.053 0.053,1.06131 1.27358,-0.053 0,-3.23703 -1.37972,-0.26534 -0.053,-3.60848 -1.32665,0.10608 0.1592,3.60849 -0.95518,0 -0.1592,-3.66156 -1.48584,0.15921 0.15919,3.34315 -3.50236,0.053 0,-3.29008 2.8125,0 12.09398,-0.31938 c -6.63741,-0.61057 -13.33341,-0.96538 -19.98754,-1.32567 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccccccccc"/>
+      <path style="fill:#232d3c;fill-opacity:1;stroke:none" d="m -930.54376,-455.98612 12.53208,14.20048 -3.9354,-0.35027 -4.0394,-3.19243 3.93327,7.43771 2.22877,0.10183 4.19225,0.23138 6.79244,0.3566 2.80346,-15.7806 1.6131,0.27272 -3.06589,-0.537 -4.9634,11.78054 -3.04175,-0.15706 -13.22583,-14.07716 -1.8237,-0.28674" id="path40835" inkscape:path-effect="#path-effect40837-4" inkscape:original-d="m -930.54376,-455.98612 12.53208,14.20048 -3.9354,-0.35027 -4.0394,-3.19243 3.93327,7.43771 2.22877,0.10183 c -0.56271,-3.43641 4.75685,-4.59418 4.19225,0.23138 l 6.79244,0.3566 2.80346,-15.7806 1.6131,0.27272 -3.06589,-0.537 -4.9634,11.78054 -3.04175,-0.15706 -13.22583,-14.07716 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccc"/>
+      <path sodipodi:nodetypes="sssss" inkscape:connector-curvature="0" d="m -863.68265,-467.39036 c -2.9497,6.14076 -24.06415,1.59568 -48.27134,-8.11508 -24.20719,-9.71078 -42.71694,-21.1055 -39.39065,-27.05071 3.09978,-5.5404 24.51444,-1.59568 48.72162,8.11508 24.2072,9.71077 41.89007,20.90995 38.94037,27.05071 z" style="fill:url(#radialGradient41775-8);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40083"/>
+      <path style="fill:url(#radialGradient41787-3);fill-opacity:1;stroke:none" d="m -929.96003,-426.05692 -2.60024,2.91862 0,1.22052 0.58373,0.10608 0,0.74292 -15.17687,14.32781 -0.68984,1.43278 3.60848,0.053 10.02946,-10.50706 5.39681,-7.02711 c -1.7982,2.50721 -3.5795,5.02654 -5.34375,7.55776 -0.99601,1.429 -1.98658,2.8618 -2.97169,4.29834 l -1.48584,3.87382 -0.90212,1.80425 -1.96344,0.1592 -0.053,0.58372 5.04126,0 0.21226,-1.22052 9.3396,-10.13559 3.97996,-5.04127 1.80424,-1.85731 -2.70636,-1.11439 c -2.35276,2.87231 -4.67021,5.77354 -6.95164,8.70282 -1.51958,1.95108 -3.02318,3.91461 -4.5106,5.89032 1.92366,-2.84649 3.76432,-5.74907 5.51885,-8.70282 1.39963,-2.35627 2.74445,-4.7451 4.03302,-7.1639 l -2.75944,0 -1.43284,-0.90199" id="path40867" inkscape:path-effect="#path-effect40869-0" inkscape:original-d="m -929.96003,-426.05692 -2.60024,2.91862 0,1.22052 0.58373,0.10608 0,0.74292 -15.17687,14.32781 -0.68984,1.43278 3.60848,0.053 10.02946,-10.50706 5.39681,-7.02711 -5.34375,7.55776 -2.97169,4.29834 -1.48584,3.87382 -0.90212,1.80425 -1.96344,0.1592 -0.053,0.58372 5.04126,0 0.21226,-1.22052 9.3396,-10.13559 3.97996,-5.04127 1.80424,-1.85731 -2.70636,-1.11439 -6.95164,8.70282 -4.5106,5.89032 5.51885,-8.70282 4.03302,-7.1639 -2.75944,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccccc"/>
+      <path style="fill:url(#radialGradient41789-1);fill-opacity:1;stroke:none" d="m -921.09708,-423.03335 -1.38836,1.52608 -1.05066,4.2525 -5.18152,7.74047 -2.51104,-1.71191 -1.84561,1.98957 2.80274,1.75669 -1.65102,2.23263 3.65853,0 0.75045,-1.91369 1.85741,0.0938 -0.22514,1.81987 3.93995,-0.16885 -0.22515,-2.38273 0.90057,-10.09376 0.91932,-4.55909 z m -2.3452,9.49339 -1.25703,4.46527 -1.59475,-0.43152 z" id="path40871" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccc"/>
+      <path style="fill:url(#linearGradient41791-2);fill-opacity:1;stroke:none" d="m -921.32763,-422.73251 2.8829,3.25576 2.28184,13.79716 2.3349,-0.10618 -2.4941,-11.78065 7.11084,11.09079 0.95519,1.06132 2.22877,0.15919 -10.2948,-15.44219 -2.61508,-4.5467 -4.61138,0.0625 -0.28591,1.30284 2.50683,1.14616" id="path40880-3" inkscape:path-effect="#path-effect40882-9" inkscape:original-d="m -921.32763,-422.73251 2.8829,3.25576 2.28184,13.79716 2.3349,-0.10618 -2.4941,-11.78065 7.11084,11.09079 0.95519,1.06132 2.22877,0.15919 -10.2948,-15.44219 -2.61508,-4.5467 -4.61138,0.0625 -0.28591,1.30284 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc"/>
+      <path transform="matrix(1,0,0,0.75049597,0,-99.381775)" inkscape:connector-curvature="0" id="path41640-9" style="opacity:0.35426007;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41624-5)" d="m -911.79354,-410.37974 22.66845,2.88058 0,3.55542 -22.66845,-2.88058 z" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:url(#linearGradient41793-0);fill-opacity:1;stroke:none" d="m -918.07326,-423.1383 c 1.99069,2.91509 3.972,5.83659 5.94387,8.76444 1.82664,2.71221 3.64519,5.42987 5.45561,8.15293 l 0.80569,0.96585 1.8573,-0.053 -5.48173,-13.56203 4.68575,8.41468 2.28183,5.09433 2.22877,0 -8.17215,-15.22992 15.28299,15.60139 2.75943,0 -20.54318,-21.53526 -0.41169,-0.0118 -0.006,3.14225 -1.227,0.14514 1.227,3.40137 1.06133,4.5106 -5.76637,-9.03904 -2.84093,-0.86945 0.85948,2.10752" id="path40884-9" inkscape:path-effect="#path-effect40886-3" inkscape:original-d="m -918.07326,-423.1383 5.94387,8.76444 5.45561,8.15293 0.80569,0.96585 1.8573,-0.053 -5.48173,-13.56203 4.68575,8.41468 2.28183,5.09433 2.22877,0 -8.17215,-15.22992 15.28299,15.60139 2.75943,0 -20.54318,-21.53526 -0.41169,-0.0118 -0.006,3.14225 -1.227,0.14514 1.227,3.40137 1.06133,4.5106 -5.76637,-9.03904 -2.84093,-0.86945 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccc"/>
+      <path transform="matrix(1,0,0,0.75049597,0,-99.381775)" inkscape:connector-curvature="0" d="m -949.9152,-408.40548 38.25149,-2.01741 0,3.55541 -38.25149,2.01741 z" style="opacity:0.35426007;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41628-4)" id="path41642-5" sodipodi:nodetypes="ccccc"/>
+      <path id="rect40888" style="fill:url(#linearGradient41795-8);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -925.89944,-405.33147 36.77471,-2.17366 0,3.55541 -36.77471,2.17366 z" inkscape:connector-curvature="0"/>
+      <path transform="matrix(1,0,0,0.75049597,0,-99.381775)" id="path41644-9" style="opacity:0.35426007;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41632-2)" d="m -925.89944,-405.33147 36.77471,-2.17366 0,3.55541 -36.77471,2.17366 z" inkscape:connector-curvature="0"/>
+      <path d="m -949.89587,-408.19923 24.14501,2.85714 0,3.55542 -24.14501,-2.85714 z" style="fill:url(#linearGradient41797-85);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40892-2" inkscape:connector-curvature="0"/>
+      <path transform="matrix(1,0,0,0.75049597,0,-99.381775)" d="m -949.89587,-408.19923 24.14501,2.85714 0,3.55542 -24.14501,-2.85714 z" style="opacity:0.35426007;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41636-6)" id="path41646-6" inkscape:connector-curvature="0"/>
+      <path id="rect41476" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -934.23732,-460.01944 1.6811,0 0.0721,3.79449 -1.71713,-0.048 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path41855" style="opacity:0.264574;fill:url(#linearGradient41857-7);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41992-0)" d="m -909.71067,-484.13085 -0.16608,0.96091 -29.39967,-8.5345 c -0.17913,-0.4164 -0.23064,-0.78051 0.16608,-0.96092 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -908.91869,-483.08574 -0.43637,0.60504 -17.11518,-13.89305 c 0.0183,-0.33147 0.10594,-0.59229 0.43636,-0.60502 z" style="opacity:0.264574;fill:url(#linearGradient41861-4);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41988-7)" id="path41859"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -880.34625,-480.27583 -0.0662,0.94629 -29.54073,-3.94032 c -0.21631,-0.37376 -0.30288,-0.71578 0.0662,-0.9463 z" style="opacity:0.264574;fill:url(#linearGradient41865-3);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41984-7)" id="path41863"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -887.32868,-469.08022 -0.42045,0.72365 -21.71371,-14.18298 c -0.0248,-0.37664 0.0403,-0.67959 0.42043,-0.72361 z" style="opacity:0.264574;fill:url(#linearGradient41883-0);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter41996-5)" id="path41859-1"/>
+      <path id="rect40087" style="fill:url(#linearGradient41851-1);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -894.03611,-514.56109 1.48227,-0.30515 6.52148,46.28175 c -0.5195,0.45678 -1.10573,0.31286 -1.69453,0.14595 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <rect style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect40621" width="2.122638" height="3.6084845" x="-1031.6484" y="-74.507393" transform="matrix(0.90300847,0.42962274,-0.42962274,0.90300847,0,0)" ry="1.014852"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -900.75475,-517.94001 0.90409,1.21362 -39.11222,25.24541 c -0.64456,-0.23295 -1.10234,-0.55928 -0.90409,-1.21363 z" style="fill:url(#linearGradient41847-45);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40091"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -892.85427,-514.42383 1.64281,-0.33379 12.0026,34.73224 c -0.26814,0.31426 -0.41001,0.7127 -1.49272,0.4839 z" style="fill:url(#linearGradient41849-6);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40093"/>
+      <path id="path40095" style="fill:url(#linearGradient41845-2);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -899.16988,-516.85425 0.69605,0.85281 -27.11689,19.49663 c -0.50368,0.14831 -0.92988,-0.26379 -1.09404,-0.66709 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -900.54,-518.24338 c 2.80533,2.71825 6.01859,3.58906 9.42129,3.9178 l 2.10035,6.06549 c -5.55507,2.04429 -14.02559,-1.93787 -17.25428,-6.04725 z" style="fill:url(#radialGradient41777-0);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40101"/>
+      <path id="path40327" style="fill:url(#radialGradient41779-3);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -891.11134,-514.41002 c -0.31845,0.6729 -2.59788,0.17486 -5.2112,-0.88923 -2.61331,-1.06408 -4.61157,-2.31268 -4.25247,-2.96414 0.33465,-0.6071 2.6465,-0.17485 5.25981,0.88924 2.61332,1.06407 4.5223,2.29124 4.20386,2.96413 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssss"/>
+      <path id="rect40607" style="fill:url(#radialGradient41781-5);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -895.09834,-522.43885 c 1.09931,1.14133 1.95333,1.34748 3.34251,1.43231 l -2.42745,5.24873 c -1.22943,-0.0686 -2.93772,-0.75558 -3.32376,-1.47922 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="sssss" inkscape:connector-curvature="0" d="m -891.75759,-520.99131 c -0.11263,0.25177 -0.91888,0.0654 -1.8432,-0.33271 -0.92432,-0.39811 -1.63109,-0.86528 -1.50409,-1.10903 0.11837,-0.22714 0.93607,-0.0654 1.86038,0.33271 0.92434,0.39812 1.59954,0.85727 1.48691,1.10903 z" style="fill:url(#radialGradient41783-6);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path40611-5"/>
+      <path style="fill:url(#linearGradient156373);fill-opacity:1;stroke:none" d="m -892.93139,-521.57172 3.31635,-8.20434 -4.11202,7.84237 c 0.10516,0.1149 0.23468,0.2074 0.37749,0.26958 0.1317,0.0573 0.27458,0.0889 0.41818,0.0924" id="path40617-3" inkscape:path-effect="#path-effect40619-6" inkscape:original-d="m -892.93139,-521.57172 3.31635,-8.20434 -4.11202,7.84237 c 0.11644,0.14404 0.24495,0.21936 0.37749,0.26958 0.13254,0.0502 0.27241,0.0488 0.41818,0.0924 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccsc"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Server.svg b/misc/images/svg/elements/Server.svg
index fabfbe08d8e..f261fcf8de6 100644
--- a/misc/images/svg/elements/Server.svg
+++ b/misc/images/svg/elements/Server.svg
@@ -1,2745 +1,379 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96.361847"
-   height="127.99921"
-   id="svg157592"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 58">
-  <defs
-     id="defs157594">
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect13979"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter13981"
-       x="-0.045167144"
-       width="1.0903343"
-       y="-0.20475768"
-       height="1.4095154">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.7147294"
-         id="feGaussianBlur13983" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="96.361847" height="127.99921" id="svg157592" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 58">
+  <defs id="defs157594">
+    <inkscape:path-effect effect="spiro" id="path-effect13979" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter13981" x="-0.045167144" width="1.0903343" y="-0.20475768" height="1.4095154">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="2.7147294" id="feGaussianBlur13983"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11215"
-       id="linearGradient13919"
-       x1="666.40302"
-       y1="442.30399"
-       x2="546.12354"
-       y2="719.80835"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75170096,0,0,0.75170096,134.1009,193.56658)" />
-    <linearGradient
-       id="linearGradient11215">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop11217" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop11219" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11215" id="linearGradient13919" x1="666.40302" y1="442.30399" x2="546.12354" y2="719.80835" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.75170096,0,0,0.75170096,134.1009,193.56658)"/>
+    <linearGradient id="linearGradient11215">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop11217"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop11219"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11215"
-       id="linearGradient13735"
-       x1="667.21594"
-       y1="805.14307"
-       x2="522.25897"
-       y2="818.57806"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75170091,0,0,-0.75170091,193.85279,1291.6651)" />
-    <linearGradient
-       id="linearGradient157082">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop157084" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop157086" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11215" id="linearGradient13735" x1="667.21594" y1="805.14307" x2="522.25897" y2="818.57806" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.75170091,0,0,-0.75170091,193.85279,1291.6651)"/>
+    <linearGradient id="linearGradient157082">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop157084"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop157086"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14191"
-       id="linearGradient14197"
-       x1="570.6228"
-       y1="715.52228"
-       x2="560.63184"
-       y2="818.52228"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient14191">
-      <stop
-         style="stop-color:#82878f;stop-opacity:1;"
-         offset="0"
-         id="stop14193" />
-      <stop
-         style="stop-color:#82878f;stop-opacity:0;"
-         offset="1"
-         id="stop14195" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14191" id="linearGradient14197" x1="570.6228" y1="715.52228" x2="560.63184" y2="818.52228" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient14191">
+      <stop style="stop-color:#82878f;stop-opacity:1;" offset="0" id="stop14193"/>
+      <stop style="stop-color:#82878f;stop-opacity:0;" offset="1" id="stop14195"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14141"
-       id="linearGradient14129"
-       x1="-571"
-       y1="-679.48718"
-       x2="-570.625"
-       y2="-738.48718"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient14141">
-      <stop
-         style="stop-color:#b3b3b3;stop-opacity:1;"
-         offset="0"
-         id="stop14143" />
-      <stop
-         style="stop-color:#b3b3b3;stop-opacity:0;"
-         offset="1"
-         id="stop14145" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14141" id="linearGradient14129" x1="-571" y1="-679.48718" x2="-570.625" y2="-738.48718" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient14141">
+      <stop style="stop-color:#b3b3b3;stop-opacity:1;" offset="0" id="stop14143"/>
+      <stop style="stop-color:#b3b3b3;stop-opacity:0;" offset="1" id="stop14145"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14141"
-       id="linearGradient14131"
-       x1="-571"
-       y1="-679.48718"
-       x2="-570.625"
-       y2="-738.48718"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14141"
-       id="linearGradient14133"
-       x1="-571"
-       y1="-679.48718"
-       x2="-570.625"
-       y2="-738.48718"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14141"
-       id="linearGradient14135"
-       x1="-571"
-       y1="-679.48718"
-       x2="-570.625"
-       y2="-738.48718"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14141"
-       id="linearGradient14137"
-       x1="-571"
-       y1="-679.48718"
-       x2="-570.625"
-       y2="-738.48718"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14141"
-       id="linearGradient14139"
-       x1="-571"
-       y1="-679.48718"
-       x2="-570.625"
-       y2="-738.48718"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14340"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient14334">
-      <stop
-         style="stop-color:#82878f;stop-opacity:1;"
-         offset="0"
-         id="stop14336" />
-      <stop
-         style="stop-color:#82878f;stop-opacity:0;"
-         offset="1"
-         id="stop14338" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14141" id="linearGradient14131" x1="-571" y1="-679.48718" x2="-570.625" y2="-738.48718" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14141" id="linearGradient14133" x1="-571" y1="-679.48718" x2="-570.625" y2="-738.48718" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14141" id="linearGradient14135" x1="-571" y1="-679.48718" x2="-570.625" y2="-738.48718" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14141" id="linearGradient14137" x1="-571" y1="-679.48718" x2="-570.625" y2="-738.48718" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14141" id="linearGradient14139" x1="-571" y1="-679.48718" x2="-570.625" y2="-738.48718" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14340" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient14334">
+      <stop style="stop-color:#82878f;stop-opacity:1;" offset="0" id="stop14336"/>
+      <stop style="stop-color:#82878f;stop-opacity:0;" offset="1" id="stop14338"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14342"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14344"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14346"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14348"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14350"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14352"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14354"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14356"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14358"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14360"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14362"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14364"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14366"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14368"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14370"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14372"
-       x1="-570.5"
-       y1="-668.61218"
-       x2="-571.5"
-       y2="-551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14334"
-       id="linearGradient14374"
-       x1="570.5"
-       y1="668.61218"
-       x2="571.5"
-       y2="551.11218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14155"
-       id="linearGradient13963"
-       x1="-613.53467"
-       y1="-670.3681"
-       x2="-615.70654"
-       y2="-677.99286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75170096,0,0,0.75170096,-134.1009,-193.56658)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient14155">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop14157" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:0;"
-         offset="1"
-         id="stop14159" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14342" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14344" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14346" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14348" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14350" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14352" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14354" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14356" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14358" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14360" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14362" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14364" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14366" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14368" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14370" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14372" x1="-570.5" y1="-668.61218" x2="-571.5" y2="-551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14334" id="linearGradient14374" x1="570.5" y1="668.61218" x2="571.5" y2="551.11218" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14155" id="linearGradient13963" x1="-613.53467" y1="-670.3681" x2="-615.70654" y2="-677.99286" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.75170096,0,0,0.75170096,-134.1009,-193.56658)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient14155">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop14157"/>
+      <stop style="stop-color:#e6e6e6;stop-opacity:0;" offset="1" id="stop14159"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14147"
-       id="linearGradient14153"
-       x1="-596.9281"
-       y1="-703.21448"
-       x2="-590.30341"
-       y2="-699.76733"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient14147">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop14149" />
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:0;"
-         offset="1"
-         id="stop14151" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14147" id="linearGradient14153" x1="-596.9281" y1="-703.21448" x2="-590.30341" y2="-699.76733" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient14147">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop14149"/>
+      <stop style="stop-color:#1a1a1a;stop-opacity:0;" offset="1" id="stop14151"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11215"
-       id="linearGradient13965"
-       x1="531.7099"
-       y1="824.20416"
-       x2="486.9599"
-       y2="823.20416"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient157263">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop157265" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop157267" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11215" id="linearGradient13965" x1="531.7099" y1="824.20416" x2="486.9599" y2="823.20416" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient157263">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop157265"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop157267"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11215"
-       id="linearGradient13967"
-       x1="531.7099"
-       y1="814.51678"
-       x2="486.9599"
-       y2="813.51678"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient157270">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop157272" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop157274" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11215" id="linearGradient13967" x1="531.7099" y1="814.51678" x2="486.9599" y2="813.51678" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient157270">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop157272"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop157274"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11215"
-       id="linearGradient13969"
-       x1="531.7099"
-       y1="804.45416"
-       x2="486.9599"
-       y2="803.45416"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient157277">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop157279" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop157281" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11215" id="linearGradient13969" x1="531.7099" y1="804.45416" x2="486.9599" y2="803.45416" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient157277">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop157279"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop157281"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11215"
-       id="linearGradient13971"
-       x1="531.7099"
-       y1="794.26666"
-       x2="486.9599"
-       y2="793.26666"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient157284">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop157286" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop157288" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11215" id="linearGradient13971" x1="531.7099" y1="794.26666" x2="486.9599" y2="793.26666" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient157284">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop157286"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop157288"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11215"
-       id="linearGradient13973"
-       x1="531.7099"
-       y1="784.39166"
-       x2="486.9599"
-       y2="783.39166"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient157291">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop157293" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop157295" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11215" id="linearGradient13973" x1="531.7099" y1="784.39166" x2="486.9599" y2="783.39166" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient157291">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop157293"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop157295"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11215"
-       id="linearGradient13975"
-       x1="531.7099"
-       y1="774.07916"
-       x2="486.9599"
-       y2="773.07916"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient157298">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop157300" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop157302" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient11215" id="linearGradient13975" x1="531.7099" y1="774.07916" x2="486.9599" y2="773.07916" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient157298">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop157300"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop157302"/>
     </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14045"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14047" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14045" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14047"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14049"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14051" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14049" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14051"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14053"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14055" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14053" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14055"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14057"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14059" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14057" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14059"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14061"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14063" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14061" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14063"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14065"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14067" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14065" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14067"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14069"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14071" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14069" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14071"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14073"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14075" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14073" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14075"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14077"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14079" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14077" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14079"/>
     </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter14081"
-       x="-0.077435479"
-       width="1.154871"
-       y="-0.83935249"
-       height="2.678705">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.064883"
-         id="feGaussianBlur14083" />
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter14081" x="-0.077435479" width="1.154871" y="-0.83935249" height="2.678705">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.064883" id="feGaussianBlur14083"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14173"
-       id="linearGradient14179"
-       x1="615.53644"
-       y1="653.55396"
-       x2="575.23132"
-       y2="699.51593"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient14173">
-      <stop
-         style="stop-color:#ececec;stop-opacity:1;"
-         offset="0"
-         id="stop14175" />
-      <stop
-         style="stop-color:#ececec;stop-opacity:0;"
-         offset="1"
-         id="stop14177" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14173" id="linearGradient14179" x1="615.53644" y1="653.55396" x2="575.23132" y2="699.51593" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient14173">
+      <stop style="stop-color:#ececec;stop-opacity:1;" offset="0" id="stop14175"/>
+      <stop style="stop-color:#ececec;stop-opacity:0;" offset="1" id="stop14177"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14173"
-       id="linearGradient14181"
-       x1="615.53644"
-       y1="653.55396"
-       x2="575.23132"
-       y2="699.51593"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14173"
-       id="linearGradient14183"
-       x1="615.53644"
-       y1="653.55396"
-       x2="575.23132"
-       y2="699.51593"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14173"
-       id="linearGradient14185"
-       x1="615.53644"
-       y1="653.55396"
-       x2="575.23132"
-       y2="699.51593"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14173"
-       id="linearGradient14187"
-       x1="615.53644"
-       y1="653.55396"
-       x2="575.23132"
-       y2="699.51593"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14173"
-       id="linearGradient14189"
-       x1="615.53644"
-       y1="653.55396"
-       x2="575.23132"
-       y2="699.51593"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="750.86218"
-       x2="601"
-       y1="771.36218"
-       x1="619"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient136362"
-       xlink:href="#linearGradient14201"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient14201">
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1"
-         offset="0"
-         id="stop14203" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop14205" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14173" id="linearGradient14181" x1="615.53644" y1="653.55396" x2="575.23132" y2="699.51593" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14173" id="linearGradient14183" x1="615.53644" y1="653.55396" x2="575.23132" y2="699.51593" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14173" id="linearGradient14185" x1="615.53644" y1="653.55396" x2="575.23132" y2="699.51593" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14173" id="linearGradient14187" x1="615.53644" y1="653.55396" x2="575.23132" y2="699.51593" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient14173" id="linearGradient14189" x1="615.53644" y1="653.55396" x2="575.23132" y2="699.51593" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="750.86218" x2="601" y1="771.36218" x1="619" gradientUnits="userSpaceOnUse" id="linearGradient136362" xlink:href="#linearGradient14201" inkscape:collect="always"/>
+    <linearGradient inkscape:collect="always" id="linearGradient14201">
+      <stop style="stop-color:#232d3c;stop-opacity:1" offset="0" id="stop14203"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop14205"/>
     </linearGradient>
-    <linearGradient
-       y2="750.86218"
-       x2="601"
-       y1="771.36218"
-       x1="619"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient157590"
-       xlink:href="#linearGradient14201"
-       inkscape:collect="always" />
+    <linearGradient y2="750.86218" x2="601" y1="771.36218" x1="619" gradientUnits="userSpaceOnUse" id="linearGradient157590" xlink:href="#linearGradient14201" inkscape:collect="always"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="160.32378"
-     inkscape:cy="109.71429"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="154"
-     inkscape:window-y="203"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata157597">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="160.32378" inkscape:cy="109.71429" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="154" inkscape:window-y="203" inkscape:window-maximized="0"/>
+  <metadata id="metadata157597">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-214.67622,-514.07726)">
-    <g
-       style="display:inline"
-       transform="matrix(0.75282695,0,0,0.75282695,-185.03038,52.664916)"
-       id="g14376"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Server.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         transform="matrix(0.68548736,0,0,0.80317542,171.99898,154.66229)"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 530.14556,768.1472 96.04051,7.56844 c 28.43117,-6.60871 56.60791,-11.53305 77.65725,-28.82358 l -56.64823,-0.65686 z"
-         inkscape:path-effect="#path-effect13979"
-         id="path13977"
-         d="m 530.14556,768.1472 96.04051,7.56844 77.65725,-28.82358 -56.64823,-0.65686 -117.04953,21.912"
-         style="opacity:0.53811657;fill:#1a1a1a;stroke:none;filter:url(#filter13981)" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 596.71269,774.15274 -50.33077,-3.35265 0,-155.53658 50.33077,-1.97787 z"
-         style="fill:url(#linearGradient13919);fill-opacity:1;fill-rule:nonzero;stroke:#454e5a;stroke-width:0.75170094;stroke-opacity:1"
-         id="rect13381" />
-      <path
-         id="path13385"
-         style="fill:url(#linearGradient13735);fill-opacity:1;fill-rule:nonzero;stroke:#454e5a;stroke-width:0.75170094;stroke-opacity:1"
-         d="m 596.79309,774.05357 0.24717,0.0863 19.04314,-11.86584 0,-141.43757 -19.03721,-7.55541 -0.34057,0.0383 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         sodipodi:nodetypes="cscccc"
-         inkscape:connector-curvature="0"
-         d="m 588.63186,763.10961 c -8.11271,1.28921 -13.25056,1.56326 -19.16873,1.24003 -5.91817,-0.32323 -10.95247,-1 -16.34031,-2.56067 l 0,-143.32702 35.50904,-0.89092 z"
-         style="fill:url(#linearGradient14197);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13397" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,718.88348,809.33113)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13405"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13407"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,717.53117,808.77857)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13409"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,716.18147,808.22707)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,714.83179,807.67561)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13411"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13413"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,713.45522,807.11317)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,712.10291,806.56065)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13415"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,710.75323,806.00918)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13417"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13455"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,718.88348,808.10297)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,717.53117,807.55043)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13457"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,716.18147,806.99894)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13459"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13461"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,714.83179,806.44747)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,713.45522,805.88504)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13463"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13465"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,712.10291,805.33249)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13467"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,710.75323,804.78101)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13471"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,718.88348,806.32897)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,717.53117,805.78325)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13473"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,716.18147,805.23856)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13475"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13477"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,714.83179,804.69388)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,713.45522,804.13834)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13479"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13481"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,712.10291,803.59263)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13483"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,710.75323,803.04793)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,718.88348,805.12338)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13487"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13489"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,717.53117,804.57759)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13491"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,716.18147,804.03293)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,714.83179,803.48822)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13493"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13495"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,713.45522,802.9327)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,712.10291,802.38697)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13497"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,710.75323,801.84231)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13499"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,718.88348,803.33679)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13503"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13505"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,717.53117,802.79784)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13507"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,716.18147,802.25993)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,714.83179,801.72202)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13509"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13511"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,713.45522,801.17339)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,712.10291,800.63446)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13513"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,710.75323,800.09658)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13515"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13519"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,718.88348,802.08613)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,717.53117,801.54714)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13521"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,716.18147,801.00924)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13523"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13525"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,714.83179,800.47135)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,713.45522,799.92272)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13527"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13529"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,712.10291,799.38378)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13531"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,710.75323,798.8459)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13535"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,718.88348,800.28252)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,717.53117,799.75033)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13537"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,716.18147,799.21921)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13539"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13541"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,714.83179,798.68808)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,713.45522,798.14639)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13543"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13545"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,712.10291,797.61424)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13547"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,710.75323,797.08311)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,718.88348,799.00929)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13551"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13553"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,717.53117,798.47712)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13555"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,716.18147,797.946)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,714.83179,797.41489)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13557"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13559"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,713.45522,796.87318)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,712.10291,796.34103)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13561"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,710.75323,795.80995)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13563"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,718.88348,797.19029)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13567"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13569"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,717.53117,796.66493)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13571"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,716.18147,796.1406)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,714.83179,795.61625)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13573"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13575"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,713.45522,795.08145)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,712.10291,794.55613)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13577"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,710.75323,794.0318)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13579"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13583"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,718.88348,795.91694)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,717.53117,795.39161)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13585"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,716.18147,794.86726)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13587"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13589"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,714.83179,794.34295)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,713.45522,793.80815)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13591"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13593"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,712.10291,793.28279)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13595"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,710.75323,792.75849)" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 588.63186,717.68647 -35.4426,-0.69927 0,-6.17701 35.4426,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13601" />
-      <path
-         id="path13605"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 588.63186,709.87781 -35.50904,0 0,-6.64321 35.50904,0.11655 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path13607"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 588.63186,702.53532 -35.50904,-0.23308 0,-6.64321 35.50904,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 588.63186,694.72664 -35.50904,0 0,-6.64319 35.50904,0.11655 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13609" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 588.63186,687.38417 -35.50904,-0.2331 0,-6.6432 35.50904,0 z"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13611" />
-      <path
-         id="path13613"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 588.63186,679.57549 -35.50904,0 0,-6.64319 35.50904,0.11653 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 586.87044,716.69766 -32.14922,-0.33472 c 0,1.38489 0,-3.49373 0,-4.91171 l 32.14922,0 z"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13615" />
-      <rect
-         transform="scale(-1,-1)"
-         y="-714.77283"
-         x="-574.04712"
-         height="0.93237871"
-         width="6.2455354"
-         id="rect13619"
-         style="fill:url(#linearGradient14129);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path13621"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 586.87044,709.07602 -32.14922,-0.0704 0,-4.98128 32.14922,0 z" />
-      <rect
-         transform="scale(-1,-1)"
-         style="fill:url(#linearGradient14131);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13623"
-         width="6.2455354"
-         height="0.93237871"
-         x="-574.04712"
-         y="-707.72168" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         d="m 586.87044,701.59349 -32.14922,0 0,-5.12223 32.14922,0 z"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13625"
-         inkscape:connector-curvature="0" />
-      <rect
-         transform="scale(-1,-1)"
-         y="-700.26263"
-         x="-574.04712"
-         height="0.93237871"
-         width="6.2455354"
-         id="rect13627"
-         style="fill:url(#linearGradient14133);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path13629"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 586.87044,694.03102 -32.14922,0 0,-5.02827 32.14922,0 z" />
-      <rect
-         transform="scale(-1,-1)"
-         style="fill:url(#linearGradient14135);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13631"
-         width="6.2455354"
-         height="0.93237871"
-         x="-574.04712"
-         y="-692.51221" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         d="m 586.87044,686.53629 -32.14922,0 0,-5.21618 32.14922,0 z"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13633"
-         inkscape:connector-curvature="0" />
-      <rect
-         transform="scale(-1,-1)"
-         y="-685.11139"
-         x="-574.04712"
-         height="0.93237871"
-         width="6.2455354"
-         id="rect13635"
-         style="fill:url(#linearGradient14137);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path13637"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 586.87044,678.75021 -32.14922,0 0,-4.9343 32.14922,0 z" />
-      <rect
-         transform="scale(-1,-1)"
-         style="fill:url(#linearGradient14139);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13639"
-         width="6.2455354"
-         height="0.93237871"
-         x="-574.04712"
-         y="-677.41931" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 588.63186,671.70916 -35.50904,-0.0583 0,-52.67582 35.50904,-1.40401 z"
-         style="fill:#303947;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13641" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 588.63186,624.71883 -35.50904,0.625 0,-3.5547 35.50904,-1.14945 z"
-         style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13645" />
-      <path
-         id="path13649"
-         style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 588.63186,634.19516 -35.50904,0.0169 0,-3.55471 35.50904,-0.54136 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 588.63186,643.60899 -35.50904,-0.34964 0,-3.55471 35.50904,-0.17481 z"
-         style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13651" />
-      <path
-         id="path13653"
-         style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 588.63186,652.89783 -35.50904,-0.34966 0,-3.5547 35.50904,-0.17481 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 588.63186,662.18665 -35.50904,-0.34965 0,-3.55469 35.50904,-0.17482 z"
-         style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13655" />
-      <path
-         id="path13657"
-         style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 588.63186,671.47548 -35.50904,-0.34964 0,-3.55471 35.50904,-0.1748 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -588.63184,-671.69208 0.85753,0 0,54.12106 -0.85753,0 z"
-         style="fill:url(#linearGradient14340);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13659" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -586.61163,-671.69208 0.85752,0 0,54.04886 -0.85752,0 z"
-         style="fill:url(#linearGradient14342);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13661" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -584.44598,-671.69208 0.85752,0 0,53.97626 -0.85752,0 z"
-         style="fill:url(#linearGradient14344);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13663" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -582.42578,-671.69208 0.85752,0 0,53.89505 -0.85752,0 z"
-         style="fill:url(#linearGradient14346);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13665" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -580.39307,-671.69208 0.85753,0 0,53.81333 -0.85753,0 z"
-         style="fill:url(#linearGradient14348);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13667" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -578.37286,-671.69208 0.85752,0 0,53.73212 -0.85752,0 z"
-         style="fill:url(#linearGradient14350);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13669" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -576.20721,-671.69208 0.85752,0 0,53.64506 -0.85752,0 z"
-         style="fill:url(#linearGradient14352);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13671" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -574.18701,-671.69208 0.85752,0 0,53.56384 -0.85752,0 z"
-         style="fill:url(#linearGradient14354);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13673" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -572.28711,-671.69208 0.85753,0 0,53.48747 -0.85753,0 z"
-         style="fill:url(#linearGradient14356);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13675" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -570.26691,-671.69208 0.85753,0 0,53.40625 -0.85753,0 z"
-         style="fill:url(#linearGradient14358);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13677" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -568.10132,-671.69208 0.85753,0 0,53.31919 -0.85753,0 z"
-         style="fill:url(#linearGradient14360);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13679" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -566.08112,-671.69208 0.85753,0 0,53.23798 -0.85753,0 z"
-         style="fill:url(#linearGradient14362);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13681" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -564.18121,-671.69208 0.85752,0 0,53.1616 -0.85752,0 z"
-         style="fill:url(#linearGradient14364);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13683" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -562.16101,-671.69208 0.85752,0 0,53.08039 -0.85752,0 z"
-         style="fill:url(#linearGradient14366);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13685" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -559.99536,-671.69208 0.85752,0 0,52.99333 -0.85752,0 z"
-         style="fill:url(#linearGradient14368);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13687" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -557.97516,-671.69208 0.85753,0 0,52.91211 -0.85753,0 z"
-         style="fill:url(#linearGradient14370);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13689" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m -556.00055,-671.69208 0.85753,0 0,52.83273 -0.85753,0 z"
-         style="fill:url(#linearGradient14372);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         transform="scale(-1,-1)"
-         id="rect13691" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 553.98035,671.69208 -0.85753,0 0,-52.71704 0.85753,0 z"
-         style="fill:url(#linearGradient14374);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect13693" />
-      <rect
-         transform="scale(-1,-1)"
-         ry="1.8356209"
-         y="-704.22528"
-         x="-594.55487"
-         height="8.9158745"
-         width="3.9111922"
-         id="rect13697"
-         style="fill:url(#linearGradient13963);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient14153);stroke-width:0.68049592" />
-      <path
-         transform="matrix(0.7517009,0,0,-0.7517009,193.58706,1291.7981)"
-         sodipodi:end="5.479758"
-         sodipodi:start="0"
-         d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z"
-         sodipodi:ry="1.9003495"
-         sodipodi:rx="1.8561553"
-         sodipodi:cy="787.86005"
-         sodipodi:cx="530.94879"
-         id="path13699"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1306.1338)"
-         sodipodi:end="5.479758"
-         sodipodi:start="0"
-         d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z"
-         sodipodi:ry="1.9003495"
-         sodipodi:rx="1.8561553"
-         sodipodi:cy="787.86005"
-         sodipodi:cx="530.94879"
-         id="path13699-4"
-         style="fill:url(#linearGradient13965);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient13967);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path13719"
-         sodipodi:cx="530.94879"
-         sodipodi:cy="787.86005"
-         sodipodi:rx="1.8561553"
-         sodipodi:ry="1.9003495"
-         d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z"
-         sodipodi:start="0"
-         sodipodi:end="5.479758"
-         transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1298.8518)" />
-      <path
-         transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1291.2877)"
-         sodipodi:end="5.479758"
-         sodipodi:start="0"
-         d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z"
-         sodipodi:ry="1.9003495"
-         sodipodi:rx="1.8561553"
-         sodipodi:cy="787.86005"
-         sodipodi:cx="530.94879"
-         id="path13721"
-         style="fill:url(#linearGradient13969);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient13971);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path13723"
-         sodipodi:cx="530.94879"
-         sodipodi:cy="787.86005"
-         sodipodi:rx="1.8561553"
-         sodipodi:ry="1.9003495"
-         d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z"
-         sodipodi:start="0"
-         sodipodi:end="5.479758"
-         transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1283.6298)" />
-      <path
-         transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1276.2067)"
-         sodipodi:end="5.479758"
-         sodipodi:start="0"
-         d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z"
-         sodipodi:ry="1.9003495"
-         sodipodi:rx="1.8561553"
-         sodipodi:cy="787.86005"
-         sodipodi:cx="530.94879"
-         id="path13725"
-         style="fill:url(#linearGradient13973);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient13975);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path13727"
-         sodipodi:cx="530.94879"
-         sodipodi:cy="787.86005"
-         sodipodi:rx="1.8561553"
-         sodipodi:ry="1.9003495"
-         d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z"
-         sodipodi:start="0"
-         sodipodi:end="5.479758"
-         transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1268.4548)" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13749"
-         d="m 554.27303,719.66983 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 554.27303,723.90732 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         id="path13755"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 554.27303,728.14483 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         id="path13757"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13759"
-         d="m 554.27303,732.38234 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13761"
-         d="m 554.27303,736.61981 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 554.27303,740.85732 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z"
-         id="path13763"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 554.27303,745.09483 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z"
-         id="path13765"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13767"
-         d="m 554.27303,749.33232 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13769"
-         d="m 554.27303,753.56982 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 554.27303,757.80731 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         id="path13771"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13773"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,718.88348,825.14424)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,717.53117,824.59168)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13775"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,716.18147,824.04018)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13777"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13779"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,714.83179,823.48871)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,713.45522,822.92628)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13781"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13783"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,712.10291,822.37375)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13785"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,710.75323,821.82228)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,718.88348,823.91607)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13787"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13789"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,717.53117,823.36353)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13791"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,716.18147,822.81204)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,714.83179,822.26058)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13793"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13795"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,713.45522,821.69814)" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,712.10291,821.14559)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13797"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,710.75323,820.59412)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13799"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,718.88348,822.14208)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13801"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13803"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,717.53117,821.59636)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13805"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,716.18147,821.05167)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,714.83179,820.50699)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13807"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13809"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,713.45522,819.95144)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,712.10291,819.40574)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13811"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,710.75323,818.86103)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13813"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13815"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,718.88348,820.93649)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,717.53117,820.3907)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13817"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,716.18147,819.84603)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13819"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13821"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,714.83179,819.30133)" />
-      <path
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,713.45522,818.7458)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13823"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13825"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,712.10291,818.20008)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13827"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,710.75323,817.65542)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13829"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,718.88348,819.1499)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,717.53117,818.61094)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13831"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,716.18147,818.07303)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13833"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13835"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,714.83179,817.53512)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,713.45522,816.98649)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13837"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13839"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,712.10291,816.44757)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13841"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,710.75323,815.90968)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,718.88348,817.89924)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13843"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13845"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,717.53117,817.36025)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13847"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,716.18147,816.82234)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,714.83179,816.28446)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13849"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13851"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,713.45522,815.73583)" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,712.10291,815.19688)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13853"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,710.75323,814.659)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13855"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,718.88348,816.09562)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13857"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13859"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,717.53117,815.56343)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13861"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,716.18147,815.03231)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,714.83179,814.50118)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13863"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13865"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,713.45522,813.95949)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,712.10291,813.42735)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13867"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,710.75323,812.89622)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13869"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13871"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,718.88348,814.82239)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,717.53117,814.29022)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13873"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,716.18147,813.7591)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13875"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13877"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,714.83179,813.228)" />
-      <path
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,713.45522,812.68628)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13879"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13881"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,712.10291,812.15413)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13883"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,710.75323,811.62305)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13885"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,718.88348,813.0034)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,717.53117,812.47803)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13887"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,716.18147,811.9537)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13889"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13891"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,714.83179,811.42936)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,713.45522,810.89456)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13893"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13895"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,712.10291,810.36923)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13897"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,710.75323,809.84491)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,718.88348,811.73004)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13899"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13901"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,717.53117,811.20471)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13903"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,716.18147,810.68036)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,714.83179,810.15606)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13905"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path13907"
-         sodipodi:cx="345.46585"
-         sodipodi:cy="698.49945"
-         sodipodi:rx="2.2539029"
-         sodipodi:ry="1.1048543"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,713.45522,809.62126)" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,712.10291,809.0959)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13909"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,710.75323,808.57159)"
-         d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z"
-         sodipodi:ry="1.1048543"
-         sodipodi:rx="2.2539029"
-         sodipodi:cy="698.49945"
-         sodipodi:cx="345.46585"
-         id="path13911"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14045)"
-         d="m 554.27303,719.66983 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         id="path13985"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13987"
-         d="m 554.27303,723.90732 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14049)" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13989"
-         d="m 554.27303,728.14483 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14053)" />
-      <path
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14057)"
-         d="m 554.27303,732.38234 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         id="path13991"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14061)"
-         d="m 554.27303,736.61981 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z"
-         id="path13993"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13995"
-         d="m 554.27303,740.85732 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z"
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14065)" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path13997"
-         d="m 554.27303,745.09483 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z"
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14069)" />
-      <path
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14073)"
-         d="m 554.27303,749.33232 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z"
-         id="path13999"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14077)"
-         d="m 554.27303,753.56982 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         id="path14001"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-      <path
-         sodipodi:nodetypes="cscc"
-         inkscape:connector-curvature="0"
-         id="path14003"
-         d="m 554.27303,757.80731 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z"
-         style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14081)" />
-      <path
-         id="path14161"
-         style="fill:url(#linearGradient14179);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 586.87044,716.69766 -32.14922,-0.33472 c 0,1.38489 0,-3.49373 0,-4.91171 l 32.14922,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         d="m 586.87044,709.07602 -32.14922,-0.0704 0,-4.98128 32.14922,0 z"
-         style="fill:url(#linearGradient14181);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path14163"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path14165"
-         style="fill:url(#linearGradient14183);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 586.87044,701.59349 -32.14922,0 0,-5.12223 32.14922,0 z"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         d="m 586.87044,694.03102 -32.14922,0 0,-5.02827 32.14922,0 z"
-         style="fill:url(#linearGradient14185);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path14167"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path14169"
-         style="fill:url(#linearGradient14187);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 586.87044,686.53629 -32.14922,0 0,-5.21618 32.14922,0 z"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         d="m 586.87044,678.75021 -32.14922,0 0,-4.9343 32.14922,0 z"
-         style="fill:url(#linearGradient14189);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path14171"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         d="m 596.79309,774.05357 0.24717,0.0863 19.04314,-11.86584 0,-141.43757 -19.03721,-7.55541 -0.34057,0.0383 z"
-         style="fill:url(#linearGradient157590);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path14199" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-214.67622,-514.07726)">
+    <g style="display:inline" transform="matrix(0.75282695,0,0,0.75282695,-185.03038,52.664916)" id="g14376">
+      <path transform="matrix(0.68548736,0,0,0.80317542,171.99898,154.66229)" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 530.14556,768.1472 96.04051,7.56844 c 28.43117,-6.60871 56.60791,-11.53305 77.65725,-28.82358 l -56.64823,-0.65686 z" inkscape:path-effect="#path-effect13979" id="path13977" d="m 530.14556,768.1472 96.04051,7.56844 77.65725,-28.82358 -56.64823,-0.65686 -117.04953,21.912" style="opacity:0.53811657;fill:#1a1a1a;stroke:none;filter:url(#filter13981)"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 596.71269,774.15274 -50.33077,-3.35265 0,-155.53658 50.33077,-1.97787 z" style="fill:url(#linearGradient13919);fill-opacity:1;fill-rule:nonzero;stroke:#454e5a;stroke-width:0.75170094;stroke-opacity:1" id="rect13381"/>
+      <path id="path13385" style="fill:url(#linearGradient13735);fill-opacity:1;fill-rule:nonzero;stroke:#454e5a;stroke-width:0.75170094;stroke-opacity:1" d="m 596.79309,774.05357 0.24717,0.0863 19.04314,-11.86584 0,-141.43757 -19.03721,-7.55541 -0.34057,0.0383 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+      <path sodipodi:nodetypes="cscccc" inkscape:connector-curvature="0" d="m 588.63186,763.10961 c -8.11271,1.28921 -13.25056,1.56326 -19.16873,1.24003 -5.91817,-0.32323 -10.95247,-1 -16.34031,-2.56067 l 0,-143.32702 35.50904,-0.89092 z" style="fill:url(#linearGradient14197);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13397"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,718.88348,809.33113)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13405" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13407" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,717.53117,808.77857)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13409" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,716.18147,808.22707)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,714.83179,807.67561)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13411" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13413" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,713.45522,807.11317)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,712.10291,806.56065)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13415" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,710.75323,806.00918)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13417" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13455" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,718.88348,808.10297)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,717.53117,807.55043)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13457" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,716.18147,806.99894)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13459" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13461" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,714.83179,806.44747)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,713.45522,805.88504)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13463" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13465" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,712.10291,805.33249)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13467" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,710.75323,804.78101)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13471" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,718.88348,806.32897)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,717.53117,805.78325)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13473" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,716.18147,805.23856)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13475" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13477" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,714.83179,804.69388)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,713.45522,804.13834)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13479" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13481" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,712.10291,803.59263)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13483" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,710.75323,803.04793)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,718.88348,805.12338)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13487" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13489" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,717.53117,804.57759)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13491" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,716.18147,804.03293)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,714.83179,803.48822)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13493" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13495" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,713.45522,802.9327)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,712.10291,802.38697)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13497" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,710.75323,801.84231)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13499" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,718.88348,803.33679)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13503" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13505" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,717.53117,802.79784)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13507" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,716.18147,802.25993)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,714.83179,801.72202)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13509" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13511" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,713.45522,801.17339)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,712.10291,800.63446)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13513" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,710.75323,800.09658)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13515" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13519" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,718.88348,802.08613)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,717.53117,801.54714)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13521" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,716.18147,801.00924)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13523" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13525" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,714.83179,800.47135)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,713.45522,799.92272)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13527" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13529" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,712.10291,799.38378)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13531" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,710.75323,798.8459)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13535" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,718.88348,800.28252)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,717.53117,799.75033)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13537" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,716.18147,799.21921)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13539" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13541" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,714.83179,798.68808)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,713.45522,798.14639)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13543" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13545" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,712.10291,797.61424)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13547" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,710.75323,797.08311)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,718.88348,799.00929)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13551" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13553" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,717.53117,798.47712)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13555" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,716.18147,797.946)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,714.83179,797.41489)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13557" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13559" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,713.45522,796.87318)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,712.10291,796.34103)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13561" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,710.75323,795.80995)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13563" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,718.88348,797.19029)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13567" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13569" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,717.53117,796.66493)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13571" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,716.18147,796.1406)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,714.83179,795.61625)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13573" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13575" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,713.45522,795.08145)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,712.10291,794.55613)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13577" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,710.75323,794.0318)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13579" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13583" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,718.88348,795.91694)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,717.53117,795.39161)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13585" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,716.18147,794.86726)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13587" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13589" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,714.83179,794.34295)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,713.45522,793.80815)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13591" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13593" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,712.10291,793.28279)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13595" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,710.75323,792.75849)"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 588.63186,717.68647 -35.4426,-0.69927 0,-6.17701 35.4426,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13601"/>
+      <path id="path13605" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 588.63186,709.87781 -35.50904,0 0,-6.64321 35.50904,0.11655 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path13607" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 588.63186,702.53532 -35.50904,-0.23308 0,-6.64321 35.50904,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 588.63186,694.72664 -35.50904,0 0,-6.64319 35.50904,0.11655 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13609"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 588.63186,687.38417 -35.50904,-0.2331 0,-6.6432 35.50904,0 z" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13611"/>
+      <path id="path13613" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 588.63186,679.57549 -35.50904,0 0,-6.64319 35.50904,0.11653 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 586.87044,716.69766 -32.14922,-0.33472 c 0,1.38489 0,-3.49373 0,-4.91171 l 32.14922,0 z" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13615"/>
+      <rect transform="scale(-1,-1)" y="-714.77283" x="-574.04712" height="0.93237871" width="6.2455354" id="rect13619" style="fill:url(#linearGradient14129);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path13621" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 586.87044,709.07602 -32.14922,-0.0704 0,-4.98128 32.14922,0 z"/>
+      <rect transform="scale(-1,-1)" style="fill:url(#linearGradient14131);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13623" width="6.2455354" height="0.93237871" x="-574.04712" y="-707.72168"/>
+      <path sodipodi:nodetypes="ccccc" d="m 586.87044,701.59349 -32.14922,0 0,-5.12223 32.14922,0 z" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13625" inkscape:connector-curvature="0"/>
+      <rect transform="scale(-1,-1)" y="-700.26263" x="-574.04712" height="0.93237871" width="6.2455354" id="rect13627" style="fill:url(#linearGradient14133);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path13629" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 586.87044,694.03102 -32.14922,0 0,-5.02827 32.14922,0 z"/>
+      <rect transform="scale(-1,-1)" style="fill:url(#linearGradient14135);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13631" width="6.2455354" height="0.93237871" x="-574.04712" y="-692.51221"/>
+      <path sodipodi:nodetypes="ccccc" d="m 586.87044,686.53629 -32.14922,0 0,-5.21618 32.14922,0 z" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13633" inkscape:connector-curvature="0"/>
+      <rect transform="scale(-1,-1)" y="-685.11139" x="-574.04712" height="0.93237871" width="6.2455354" id="rect13635" style="fill:url(#linearGradient14137);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path13637" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 586.87044,678.75021 -32.14922,0 0,-4.9343 32.14922,0 z"/>
+      <rect transform="scale(-1,-1)" style="fill:url(#linearGradient14139);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13639" width="6.2455354" height="0.93237871" x="-574.04712" y="-677.41931"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 588.63186,671.70916 -35.50904,-0.0583 0,-52.67582 35.50904,-1.40401 z" style="fill:#303947;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13641"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 588.63186,624.71883 -35.50904,0.625 0,-3.5547 35.50904,-1.14945 z" style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13645"/>
+      <path id="path13649" style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 588.63186,634.19516 -35.50904,0.0169 0,-3.55471 35.50904,-0.54136 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 588.63186,643.60899 -35.50904,-0.34964 0,-3.55471 35.50904,-0.17481 z" style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13651"/>
+      <path id="path13653" style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 588.63186,652.89783 -35.50904,-0.34966 0,-3.5547 35.50904,-0.17481 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 588.63186,662.18665 -35.50904,-0.34965 0,-3.55469 35.50904,-0.17482 z" style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13655"/>
+      <path id="path13657" style="fill:#b1b4b8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 588.63186,671.47548 -35.50904,-0.34964 0,-3.55471 35.50904,-0.1748 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" d="m -588.63184,-671.69208 0.85753,0 0,54.12106 -0.85753,0 z" style="fill:url(#linearGradient14340);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13659"/>
+      <path inkscape:connector-curvature="0" d="m -586.61163,-671.69208 0.85752,0 0,54.04886 -0.85752,0 z" style="fill:url(#linearGradient14342);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13661"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -584.44598,-671.69208 0.85752,0 0,53.97626 -0.85752,0 z" style="fill:url(#linearGradient14344);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13663"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -582.42578,-671.69208 0.85752,0 0,53.89505 -0.85752,0 z" style="fill:url(#linearGradient14346);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13665"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -580.39307,-671.69208 0.85753,0 0,53.81333 -0.85753,0 z" style="fill:url(#linearGradient14348);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13667"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -578.37286,-671.69208 0.85752,0 0,53.73212 -0.85752,0 z" style="fill:url(#linearGradient14350);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13669"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -576.20721,-671.69208 0.85752,0 0,53.64506 -0.85752,0 z" style="fill:url(#linearGradient14352);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13671"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -574.18701,-671.69208 0.85752,0 0,53.56384 -0.85752,0 z" style="fill:url(#linearGradient14354);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13673"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -572.28711,-671.69208 0.85753,0 0,53.48747 -0.85753,0 z" style="fill:url(#linearGradient14356);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13675"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -570.26691,-671.69208 0.85753,0 0,53.40625 -0.85753,0 z" style="fill:url(#linearGradient14358);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13677"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -568.10132,-671.69208 0.85753,0 0,53.31919 -0.85753,0 z" style="fill:url(#linearGradient14360);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13679"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -566.08112,-671.69208 0.85753,0 0,53.23798 -0.85753,0 z" style="fill:url(#linearGradient14362);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13681"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -564.18121,-671.69208 0.85752,0 0,53.1616 -0.85752,0 z" style="fill:url(#linearGradient14364);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13683"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -562.16101,-671.69208 0.85752,0 0,53.08039 -0.85752,0 z" style="fill:url(#linearGradient14366);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13685"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -559.99536,-671.69208 0.85752,0 0,52.99333 -0.85752,0 z" style="fill:url(#linearGradient14368);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13687"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -557.97516,-671.69208 0.85753,0 0,52.91211 -0.85753,0 z" style="fill:url(#linearGradient14370);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13689"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -556.00055,-671.69208 0.85753,0 0,52.83273 -0.85753,0 z" style="fill:url(#linearGradient14372);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(-1,-1)" id="rect13691"/>
+      <path inkscape:connector-curvature="0" d="m 553.98035,671.69208 -0.85753,0 0,-52.71704 0.85753,0 z" style="fill:url(#linearGradient14374);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect13693"/>
+      <rect transform="scale(-1,-1)" ry="1.8356209" y="-704.22528" x="-594.55487" height="8.9158745" width="3.9111922" id="rect13697" style="fill:url(#linearGradient13963);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient14153);stroke-width:0.68049592"/>
+      <path transform="matrix(0.7517009,0,0,-0.7517009,193.58706,1291.7981)" sodipodi:end="5.479758" sodipodi:start="0" d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z" sodipodi:ry="1.9003495" sodipodi:rx="1.8561553" sodipodi:cy="787.86005" sodipodi:cx="530.94879" id="path13699" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <path transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1306.1338)" sodipodi:end="5.479758" sodipodi:start="0" d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z" sodipodi:ry="1.9003495" sodipodi:rx="1.8561553" sodipodi:cy="787.86005" sodipodi:cx="530.94879" id="path13699-4" style="fill:url(#linearGradient13965);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient13967);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path13719" sodipodi:cx="530.94879" sodipodi:cy="787.86005" sodipodi:rx="1.8561553" sodipodi:ry="1.9003495" d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z" sodipodi:start="0" sodipodi:end="5.479758" transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1298.8518)"/>
+      <path transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1291.2877)" sodipodi:end="5.479758" sodipodi:start="0" d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z" sodipodi:ry="1.9003495" sodipodi:rx="1.8561553" sodipodi:cy="787.86005" sodipodi:cx="530.94879" id="path13721" style="fill:url(#linearGradient13969);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient13971);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path13723" sodipodi:cx="530.94879" sodipodi:cy="787.86005" sodipodi:rx="1.8561553" sodipodi:ry="1.9003495" d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z" sodipodi:start="0" sodipodi:end="5.479758" transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1283.6298)"/>
+      <path transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1276.2067)" sodipodi:end="5.479758" sodipodi:start="0" d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z" sodipodi:ry="1.9003495" sodipodi:rx="1.8561553" sodipodi:cy="787.86005" sodipodi:cx="530.94879" id="path13725" style="fill:url(#linearGradient13973);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient13975);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.70200002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path13727" sodipodi:cx="530.94879" sodipodi:cy="787.86005" sodipodi:rx="1.8561553" sodipodi:ry="1.9003495" d="m 532.80495,787.86005 c 0,1.04953 -0.83103,1.90035 -1.85616,1.90035 -1.02512,0 -1.85615,-0.85082 -1.85615,-1.90035 0,-1.04954 0.83103,-1.90035 1.85615,-1.90035 0.4807,0 0.94265,0.19092 1.28863,0.53259 l -1.28863,1.36776 z" sodipodi:start="0" sodipodi:end="5.479758" transform="matrix(0.7517009,0,0,-0.7517009,184.49502,1268.4548)"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13749" d="m 554.27303,719.66983 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 554.27303,723.90732 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" id="path13755" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 554.27303,728.14483 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" id="path13757" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13759" d="m 554.27303,732.38234 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13761" d="m 554.27303,736.61981 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 554.27303,740.85732 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z" id="path13763" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 554.27303,745.09483 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z" id="path13765" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13767" d="m 554.27303,749.33232 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13769" d="m 554.27303,753.56982 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path style="fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 554.27303,757.80731 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" id="path13771" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13773" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,718.88348,825.14424)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,717.53117,824.59168)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13775" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,716.18147,824.04018)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13777" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13779" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,714.83179,823.48871)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,713.45522,822.92628)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13781" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13783" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,712.10291,822.37375)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13785" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,710.75323,821.82228)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,718.88348,823.91607)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13787" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13789" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,717.53117,823.36353)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13791" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,716.18147,822.81204)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,714.83179,822.26058)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13793" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13795" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,713.45522,821.69814)"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,712.10291,821.14559)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13797" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.079728,-0.03822381,-0.21107635,710.75323,820.59412)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13799" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,718.88348,822.14208)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13801" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13803" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,717.53117,821.59636)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13805" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,716.18147,821.05167)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,714.83179,820.50699)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13807" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13809" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,713.45522,819.95144)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,712.10291,819.40574)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13811" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,710.75323,818.86103)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13813" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13815" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,718.88348,820.93649)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,717.53117,820.3907)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13817" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,716.18147,819.84603)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13819" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13821" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,714.83179,819.30133)"/>
+      <path transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,713.45522,818.7458)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13823" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13825" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,712.10291,818.20008)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13827" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07859594,-0.03822381,-0.21088424,710.75323,817.65542)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13829" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,718.88348,819.1499)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,717.53117,818.61094)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13831" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,716.18147,818.07303)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13833" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13835" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,714.83179,817.53512)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,713.45522,816.98649)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13837" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13839" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,712.10291,816.44757)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13841" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,710.75323,815.90968)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,718.88348,817.89924)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13843" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13845" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,717.53117,817.36025)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13847" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,716.18147,816.82234)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,714.83179,816.28446)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13849" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13851" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,713.45522,815.73583)"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,712.10291,815.19688)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13853" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07746387,-0.03822381,-0.21069213,710.75323,814.659)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13855" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,718.88348,816.09562)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13857" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13859" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,717.53117,815.56343)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13861" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,716.18147,815.03231)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,714.83179,814.50118)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13863" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13865" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,713.45522,813.95949)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,712.10291,813.42735)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13867" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,710.75323,812.89622)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13869" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13871" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,718.88348,814.82239)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,717.53117,814.29022)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13873" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,716.18147,813.7591)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13875" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13877" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,714.83179,813.228)"/>
+      <path transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,713.45522,812.68628)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13879" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13881" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,712.10291,812.15413)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13883" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.0763318,-0.03822381,-0.2105,710.75323,811.62305)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13885" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,718.88348,813.0034)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,717.53117,812.47803)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13887" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,716.18147,811.9537)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13889" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13891" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,714.83179,811.42936)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,713.45522,810.89456)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13893" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13895" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,712.10291,810.36923)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13897" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,710.75323,809.84491)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,718.88348,811.73004)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13899" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13901" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,717.53117,811.20471)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13903" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,716.18147,810.68036)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,714.83179,810.15606)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13905" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path13907" sodipodi:cx="345.46585" sodipodi:cy="698.49945" sodipodi:rx="2.2539029" sodipodi:ry="1.1048543" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,713.45522,809.62126)"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,712.10291,809.0959)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13909" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.22523598,-0.07519973,-0.03822381,-0.21030789,710.75323,808.57159)" d="m 347.71975,698.49945 c 0,0.61019 -1.0091,1.10486 -2.2539,1.10486 -1.2448,0 -2.2539,-0.49467 -2.2539,-1.10486 0,-0.61019 1.0091,-1.10485 2.2539,-1.10485 1.2448,0 2.2539,0.49466 2.2539,1.10485 z" sodipodi:ry="1.1048543" sodipodi:rx="2.2539029" sodipodi:cy="698.49945" sodipodi:cx="345.46585" id="path13911" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14045)" d="m 554.27303,719.66983 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" id="path13985" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13987" d="m 554.27303,723.90732 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14049)"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13989" d="m 554.27303,728.14483 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14053)"/>
+      <path style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14057)" d="m 554.27303,732.38234 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" id="path13991" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14061)" d="m 554.27303,736.61981 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z" id="path13993" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13995" d="m 554.27303,740.85732 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z" style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14065)"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path13997" d="m 554.27303,745.09483 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z" style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14069)"/>
+      <path style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14073)" d="m 554.27303,749.33232 c 1.08782,1.56288 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23676 15.78064,-2.34561 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69926 z" id="path13999" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14077)" d="m 554.27303,753.56982 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" id="path14001" inkscape:connector-curvature="0" sodipodi:nodetypes="cscc"/>
+      <path sodipodi:nodetypes="cscc" inkscape:connector-curvature="0" id="path14003" d="m 554.27303,757.80731 c 1.08782,1.56287 8.65668,3.04487 17.22386,3.04487 6.85308,0 13.13765,-1.23677 15.78064,-2.34562 -11.71949,-0.21044 -22.7453,-0.4819 -33.0045,-0.69925 z" style="opacity:0.77073167;fill:#232d3c;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter14081)"/>
+      <path id="path14161" style="fill:url(#linearGradient14179);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 586.87044,716.69766 -32.14922,-0.33472 c 0,1.38489 0,-3.49373 0,-4.91171 l 32.14922,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path d="m 586.87044,709.07602 -32.14922,-0.0704 0,-4.98128 32.14922,0 z" style="fill:url(#linearGradient14181);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14163" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path14165" style="fill:url(#linearGradient14183);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 586.87044,701.59349 -32.14922,0 0,-5.12223 32.14922,0 z" sodipodi:nodetypes="ccccc"/>
+      <path d="m 586.87044,694.03102 -32.14922,0 0,-5.02827 32.14922,0 z" style="fill:url(#linearGradient14185);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14167" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" id="path14169" style="fill:url(#linearGradient14187);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 586.87044,686.53629 -32.14922,0 0,-5.21618 32.14922,0 z" sodipodi:nodetypes="ccccc"/>
+      <path d="m 586.87044,678.75021 -32.14922,0 0,-4.9343 32.14922,0 z" style="fill:url(#linearGradient14189);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14171" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 596.79309,774.05357 0.24717,0.0863 19.04314,-11.86584 0,-141.43757 -19.03721,-7.55541 -0.34057,0.0383 z" style="fill:url(#linearGradient157590);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path14199"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Switch.svg b/misc/images/svg/elements/Switch.svg
index 6e676466861..5f561dc5d5e 100644
--- a/misc/images/svg/elements/Switch.svg
+++ b/misc/images/svg/elements/Switch.svg
@@ -1,1052 +1,207 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="79.935867"
-   id="svg158717"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="Switch.svg">
-  <defs
-     id="defs158719">
-    <linearGradient
-       gradientTransform="matrix(0.86261245,0,0,0.86261245,93.740585,-230.19124)"
-       y2="742.35919"
-       x2="319.51733"
-       y1="706.07477"
-       x1="158.86479"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient34043-2-4"
-       xlink:href="#linearGradient5801-0-4-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5801-0-4-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5803-5-77-9" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop5805-98-0-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.86261245,0,0,0.86261245,122.04814,-217.93673)"
-       y2="689.16925"
-       x2="65.997429"
-       y1="760.87512"
-       x1="173.61505"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient34040-1-8"
-       xlink:href="#linearGradient5801-0-4-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient158452">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158454" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158456" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient158459">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158461" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158463" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.0701885,0,0,1.0701885,-224.79,-2617.5028)"
-       gradientUnits="userSpaceOnUse"
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       id="linearGradient5544"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5538"
-       inkscape:collect="always">
-      <stop
-         id="stop5540"
-         offset="0"
-         style="stop-color:#1a1a1a;stop-opacity:1;" />
-      <stop
-         id="stop5542"
-         offset="1"
-         style="stop-color:#1a1a1a;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.0701885,0,0,1.0701885,-221.32695,-2615.5154)"
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5548"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(1.0059778,0,0,1.0059778,-205.77751,-2440.9555)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5554"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(1.0059778,0,0,1.0059778,-202.52225,-2439.0874)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5556"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(0.96316931,0,0,0.96316931,-196.434,-2325.1658)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5570"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(0.96316931,0,0,0.96316931,-193.31725,-2323.3771)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5572"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(0.94176494,0,0,0.94176494,-196.86474,-2270.1989)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5578"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(0.94176494,0,0,0.94176494,-193.81725,-2268.4498)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5580"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(0.92036172,0,0,0.92036172,-196.51492,-2214.7194)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5586"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(0.92036172,0,0,0.92036172,-193.53669,-2213.0101)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5588"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(0.89895957,0,0,0.89895957,-195.60375,-2159.0557)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5594"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2841.1069"
-       x2="458.44904"
-       y1="2842.7937"
-       x1="461.4122"
-       gradientTransform="matrix(0.89895957,0,0,0.89895957,-192.69478,-2157.3862)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5596"
-       xlink:href="#linearGradient5538"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3312"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158547">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158549" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158551" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3310"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158554">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158556" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158558" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3308"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158561">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158563" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158565" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3306"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158568">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158570" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158572" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3304"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158575">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158577" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3302"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158582">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158584" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158586" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3300"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158589">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158591" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158593" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3298"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158596">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158598" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158600" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3296"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158603">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158605" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158607" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3294"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158610">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158612" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158614" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3292"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158617">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158619" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158621" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3290"
-       x1="210.02457"
-       y1="381.27121"
-       x2="287.1091"
-       y2="383.56842"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       id="linearGradient158624">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158626" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158628" />
-    </linearGradient>
-    <linearGradient
-       y2="383.56842"
-       x2="287.1091"
-       y1="381.27121"
-       x1="210.02457"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient137756"
-       xlink:href="#linearGradient5801-0-4-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient158631">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop158633" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop158635" />
-    </linearGradient>
-    <linearGradient
-       y2="383.56842"
-       x2="287.1091"
-       y1="381.27121"
-       x1="210.02457"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient158715"
-       xlink:href="#linearGradient5801-0-4-0"
-       inkscape:collect="always"
-       gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5801-0-4-0"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.86261245,0,0,0.86261245,122.04814,-217.93673)"
-       x1="319.22894"
-       y1="667.52386"
-       x2="118.96131"
-       y2="815.45764" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter3898">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.7915937"
-         id="feGaussianBlur3900" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="79.935867" id="svg158717" version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="Switch.svg">
+  <defs id="defs158719">
+    <linearGradient gradientTransform="matrix(0.86261245,0,0,0.86261245,93.740585,-230.19124)" y2="742.35919" x2="319.51733" y1="706.07477" x1="158.86479" gradientUnits="userSpaceOnUse" id="linearGradient34043-2-4" xlink:href="#linearGradient5801-0-4-0" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5801-0-4-0">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop5803-5-77-9"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop5805-98-0-4"/>
+    </linearGradient>
+    <linearGradient gradientTransform="matrix(0.86261245,0,0,0.86261245,122.04814,-217.93673)" y2="689.16925" x2="65.997429" y1="760.87512" x1="173.61505" gradientUnits="userSpaceOnUse" id="linearGradient34040-1-8" xlink:href="#linearGradient5801-0-4-0" inkscape:collect="always"/>
+    <linearGradient id="linearGradient158452">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158454"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158456"/>
+    </linearGradient>
+    <linearGradient id="linearGradient158459">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158461"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158463"/>
+    </linearGradient>
+    <linearGradient gradientTransform="matrix(1.0701885,0,0,1.0701885,-224.79,-2617.5028)" gradientUnits="userSpaceOnUse" y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" id="linearGradient5544" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5538" inkscape:collect="always">
+      <stop id="stop5540" offset="0" style="stop-color:#1a1a1a;stop-opacity:1;"/>
+      <stop id="stop5542" offset="1" style="stop-color:#1a1a1a;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient gradientTransform="matrix(1.0701885,0,0,1.0701885,-221.32695,-2615.5154)" y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientUnits="userSpaceOnUse" id="linearGradient5548" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(1.0059778,0,0,1.0059778,-205.77751,-2440.9555)" gradientUnits="userSpaceOnUse" id="linearGradient5554" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(1.0059778,0,0,1.0059778,-202.52225,-2439.0874)" gradientUnits="userSpaceOnUse" id="linearGradient5556" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(0.96316931,0,0,0.96316931,-196.434,-2325.1658)" gradientUnits="userSpaceOnUse" id="linearGradient5570" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(0.96316931,0,0,0.96316931,-193.31725,-2323.3771)" gradientUnits="userSpaceOnUse" id="linearGradient5572" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(0.94176494,0,0,0.94176494,-196.86474,-2270.1989)" gradientUnits="userSpaceOnUse" id="linearGradient5578" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(0.94176494,0,0,0.94176494,-193.81725,-2268.4498)" gradientUnits="userSpaceOnUse" id="linearGradient5580" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(0.92036172,0,0,0.92036172,-196.51492,-2214.7194)" gradientUnits="userSpaceOnUse" id="linearGradient5586" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(0.92036172,0,0,0.92036172,-193.53669,-2213.0101)" gradientUnits="userSpaceOnUse" id="linearGradient5588" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(0.89895957,0,0,0.89895957,-195.60375,-2159.0557)" gradientUnits="userSpaceOnUse" id="linearGradient5594" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient y2="2841.1069" x2="458.44904" y1="2842.7937" x1="461.4122" gradientTransform="matrix(0.89895957,0,0,0.89895957,-192.69478,-2157.3862)" gradientUnits="userSpaceOnUse" id="linearGradient5596" xlink:href="#linearGradient5538" inkscape:collect="always"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3312" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158547">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158549"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158551"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3310" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158554">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158556"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158558"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3308" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158561">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158563"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158565"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3306" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158568">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158570"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158572"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3304" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158575">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158577"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158579"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3302" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158582">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158584"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158586"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3300" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158589">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158591"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158593"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3298" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158596">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158598"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158600"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3296" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158603">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158605"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158607"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3294" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158610">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158612"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158614"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3292" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158617">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158619"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158621"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3290" x1="210.02457" y1="381.27121" x2="287.1091" y2="383.56842" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient id="linearGradient158624">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158626"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158628"/>
+    </linearGradient>
+    <linearGradient y2="383.56842" x2="287.1091" y1="381.27121" x1="210.02457" gradientUnits="userSpaceOnUse" id="linearGradient137756" xlink:href="#linearGradient5801-0-4-0" inkscape:collect="always"/>
+    <linearGradient id="linearGradient158631">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop158633"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop158635"/>
+    </linearGradient>
+    <linearGradient y2="383.56842" x2="287.1091" y1="381.27121" x1="210.02457" gradientUnits="userSpaceOnUse" id="linearGradient158715" xlink:href="#linearGradient5801-0-4-0" inkscape:collect="always" gradientTransform="matrix(1.1816103,0,0,1.1816103,-49.080287,-70.699982)"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5801-0-4-0" id="linearGradient3142" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.86261245,0,0,0.86261245,122.04814,-217.93673)" x1="319.22894" y1="667.52386" x2="118.96131" y2="815.45764"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3898">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.7915937" id="feGaussianBlur3900"/>
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-4.7471596"
-     inkscape:cy="54.286992"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3314"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata158722">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" inkscape:cx="-4.7471596" inkscape:cy="54.286992" inkscape:document-units="px" inkscape:current-layer="g3314" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="968" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1"/>
+  <metadata id="metadata158722">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.16128,-661.07255)">
-    <g
-       style="display:inline"
-       transform="translate(191.42858,291.42857)"
-       id="g3314"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Switch.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g3145"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Icons reduced whitespace\Tiny\Switch.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90"
-         transform="translate(-4.1742745e-6,-5.5249687e-6)">
-        <g
-           id="g3290">
-          <path
-             transform="matrix(0.91199186,0,0,1.0154666,82.751129,-326.38098)"
-             id="path5323-3-6-7-9-5"
-             style="opacity:0.85650222;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter3898)"
-             d="m 190.21338,691.0295 81.78485,38.21794 c -17.02861,10.15729 -36.60437,20.04494 -53.33546,30.59488 l -78.41702,-42.48508 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="cccccc"
-             inkscape:connector-curvature="0"
-             d="m 258.62446,371.17796 71.91804,25.88366 -0.27968,16.85718 -50.42284,12.41598 -67.09747,-38.73877 z"
-             style="fill:url(#linearGradient34043-2-4);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect3607-2-2-8-4" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 212.74251,387.59611 67.09745,38.73867 2e-5,17.18214 -67.09747,-39.52349 z"
-             style="fill:url(#linearGradient34040-1-8);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect3628-2-7-5-5" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 279.83998,426.33478 50.70253,-29.27316 0,17.17389 -50.70253,29.28141 z"
-             style="fill:url(#linearGradient3142);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect3636-9-1-1-5" />
-          <g
-             transform="matrix(1.1144931,-0.06311154,0,1.1144931,-185.70544,-2677.6134)"
-             id="g34130-8-1">
-            <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
-               style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 340,2793.75 0,5.25 6.75957,4.3593 -0.01,-5.4843 -1.5,-0.9062 0.0346,-0.7767 -3.59709,-2.2859 0,0.875 z"
-               transform="translate(65.29157,14.177646)"
-               id="rect34046-8-7" />
-            <path
-               id="rect34056-44-1"
-               transform="matrix(0.85313008,0.52169825,0,1,0,0)"
-               style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 481.08801,2560.1294 1.91121,-0.078 0.0308,5.5131 -7.96576,-0.2322 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="rect34063-3-1"
-               transform="matrix(0.91628321,-0.40053099,0.40053099,0.91628321,0,0)"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m -754.60323,2741.0944 5.26259,-0.229 0.16812,0.2325 -5.17129,0.3702 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 407.21298,2814.3608 4.82406,-2.349 0.0284,0.302 -4.46509,2.2855 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34067-3-5" />
-            <path
-               id="path34069-5-2"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 408.08798,2814.892 3.94906,-1.9271 -0.003,0.302 -3.55884,1.8636 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 409.10361,2815.5014 2.94906,-1.4427 -0.0185,0.3176 -2.54321,1.3636 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34071-2-7" />
-            <path
-               id="path34073-20-6"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 410.19737,2816.1733 1.83968,-0.9114 0.0284,0.3644 -1.48071,0.7855 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-398.16128,-661.07255)">
+    <g style="display:inline" transform="translate(191.42858,291.42857)" id="g3314">
+      <g id="g3145" transform="translate(-4.1742745e-6,-5.5249687e-6)">
+        <g id="g3290">
+          <path transform="matrix(0.91199186,0,0,1.0154666,82.751129,-326.38098)" id="path5323-3-6-7-9-5" style="opacity:0.85650222;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter3898)" d="m 190.21338,691.0295 81.78485,38.21794 c -17.02861,10.15729 -36.60437,20.04494 -53.33546,30.59488 l -78.41702,-42.48508 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" d="m 258.62446,371.17796 71.91804,25.88366 -0.27968,16.85718 -50.42284,12.41598 -67.09747,-38.73877 z" style="fill:url(#linearGradient34043-2-4);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect3607-2-2-8-4"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 212.74251,387.59611 67.09745,38.73867 2e-5,17.18214 -67.09747,-39.52349 z" style="fill:url(#linearGradient34040-1-8);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect3628-2-7-5-5"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 279.83998,426.33478 50.70253,-29.27316 0,17.17389 -50.70253,29.28141 z" style="fill:url(#linearGradient3142);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect3636-9-1-1-5"/>
+          <g transform="matrix(1.1144931,-0.06311154,0,1.1144931,-185.70544,-2677.6134)" id="g34130-8-1">
+            <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 340,2793.75 0,5.25 6.75957,4.3593 -0.01,-5.4843 -1.5,-0.9062 0.0346,-0.7767 -3.59709,-2.2859 0,0.875 z" transform="translate(65.29157,14.177646)" id="rect34046-8-7"/>
+            <path id="rect34056-44-1" transform="matrix(0.85313008,0.52169825,0,1,0,0)" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 481.08801,2560.1294 1.91121,-0.078 0.0308,5.5131 -7.96576,-0.2322 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="rect34063-3-1" transform="matrix(0.91628321,-0.40053099,0.40053099,0.91628321,0,0)" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m -754.60323,2741.0944 5.26259,-0.229 0.16812,0.2325 -5.17129,0.3702 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 407.21298,2814.3608 4.82406,-2.349 0.0284,0.302 -4.46509,2.2855 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34067-3-5"/>
+            <path id="path34069-5-2" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 408.08798,2814.892 3.94906,-1.9271 -0.003,0.302 -3.55884,1.8636 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 409.10361,2815.5014 2.94906,-1.4427 -0.0185,0.3176 -2.54321,1.3636 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34071-2-7"/>
+            <path id="path34073-20-6" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 410.19737,2816.1733 1.83968,-0.9114 0.0284,0.3644 -1.48071,0.7855 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
           </g>
-          <g
-             transform="matrix(1.1514944,0,0,1.1514944,-208.43922,-2811.957)"
-             id="g34121-5-1">
-            <path
-               sodipodi:nodetypes="ccccccccc"
-               id="path34075-0-4"
-               d="m 393.34327,2801.2865 0.0271,5.0583 6.3706,3.8274 0,-4.976 -1.42171,-0.8589 -0.039,-0.9757 -3.3376,-1.927 0,0.8293 z"
-               style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               inkscape:connector-curvature="0" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 398.21412,2804.3049 1.54541,0.8711 -0.0295,4.915 -6.34593,-3.738 z"
-               style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34077-4-2" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 394.45354,2806.9101 4.48342,-2.1968 0.23426,0.1381 -4.35052,2.2847 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34079-32-3" />
-            <path
-               id="path34081-6-2"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 395.16439,2807.384 4.57228,-2.2264 0.0269,0.2862 -4.23204,2.1662 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 395.99373,2807.8874 3.74294,-1.8265 -0.003,0.2863 -3.3731,1.7663 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34083-8-2" />
-            <path
-               id="path34085-8-1"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 396.95635,2808.465 2.79513,-1.3674 -0.0175,0.3011 -2.41047,1.2924 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 397.99302,2809.1019 1.74366,-0.8639 0.0269,0.3454 -1.40343,0.7445 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34087-1-6" />
+          <g transform="matrix(1.1514944,0,0,1.1514944,-208.43922,-2811.957)" id="g34121-5-1">
+            <path sodipodi:nodetypes="ccccccccc" id="path34075-0-4" d="m 393.34327,2801.2865 0.0271,5.0583 6.3706,3.8274 0,-4.976 -1.42171,-0.8589 -0.039,-0.9757 -3.3376,-1.927 0,0.8293 z" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 398.21412,2804.3049 1.54541,0.8711 -0.0295,4.915 -6.34593,-3.738 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34077-4-2"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 394.45354,2806.9101 4.48342,-2.1968 0.23426,0.1381 -4.35052,2.2847 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34079-32-3"/>
+            <path id="path34081-6-2" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 395.16439,2807.384 4.57228,-2.2264 0.0269,0.2862 -4.23204,2.1662 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 395.99373,2807.8874 3.74294,-1.8265 -0.003,0.2863 -3.3731,1.7663 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34083-8-2"/>
+            <path id="path34085-8-1" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 396.95635,2808.465 2.79513,-1.3674 -0.0175,0.3011 -2.41047,1.2924 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 397.99302,2809.1019 1.74366,-0.8639 0.0269,0.3454 -1.40343,0.7445 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34087-1-6"/>
           </g>
-          <g
-             transform="matrix(1.1959169,0,0,1.1959169,-218.46484,-2931.5303)"
-             id="g34139-5-8">
-            <path
-               sodipodi:nodetypes="ccccccccc"
-               inkscape:connector-curvature="0"
-               style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 378.79924,2792.4716 0,4.717 5.94115,3.5345 0,-4.6208 -1.32025,-0.7976 0,-0.8853 -3.13561,-1.8104 0,0.7702 z"
-               id="path34089-6-5" />
-            <path
-               id="path34091-2-7"
-               style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 383.32251,2795.2745 1.43511,0.8089 0,4.6569 -5.95838,-3.5517 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path34093-3-6"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 379.83028,2797.6937 4.16348,-2.0399 0.21755,0.1282 -4.04007,2.1217 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 380.49041,2798.1338 4.24599,-2.0675 0.0249,0.2659 -3.93003,2.0115 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34095-8-1" />
-            <path
-               id="path34097-9-8"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 381.26055,2798.6014 3.47585,-1.6962 -0.003,0.2658 -3.13239,1.6403 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 382.15448,2799.1378 2.59567,-1.2698 -0.0163,0.2795 -2.23845,1.2002 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34099-1-9" />
-            <path
-               id="path34101-1-2"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 383.11718,2799.7291 1.61923,-0.8021 0.0249,0.3207 -1.30327,0.6914 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
+          <g transform="matrix(1.1959169,0,0,1.1959169,-218.46484,-2931.5303)" id="g34139-5-8">
+            <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 378.79924,2792.4716 0,4.717 5.94115,3.5345 0,-4.6208 -1.32025,-0.7976 0,-0.8853 -3.13561,-1.8104 0,0.7702 z" id="path34089-6-5"/>
+            <path id="path34091-2-7" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 383.32251,2795.2745 1.43511,0.8089 0,4.6569 -5.95838,-3.5517 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path34093-3-6" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 379.83028,2797.6937 4.16348,-2.0399 0.21755,0.1282 -4.04007,2.1217 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 380.49041,2798.1338 4.24599,-2.0675 0.0249,0.2659 -3.93003,2.0115 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34095-8-1"/>
+            <path id="path34097-9-8" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 381.26055,2798.6014 3.47585,-1.6962 -0.003,0.2658 -3.13239,1.6403 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 382.15448,2799.1378 2.59567,-1.2698 -0.0163,0.2795 -2.23845,1.2002 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34099-1-9"/>
+            <path id="path34101-1-2" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 383.11718,2799.7291 1.61923,-0.8021 0.0249,0.3207 -1.30327,0.6914 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
           </g>
-          <g
-             transform="matrix(1.1809704,0,0,1.1809704,-210.98015,-2888.4321)"
-             id="g34148-5-7">
-            <path
-               sodipodi:nodetypes="ccccccccc"
-               id="path34103-68-9"
-               d="m 369.17424,2786.7982 0,4.5523 5.79627,3.4142 0,-4.4243 -1.28806,-0.7782 0,-1.0132 -3.05914,-1.7662 0,0.9009 z"
-               style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               inkscape:connector-curvature="0" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 373.5872,2789.5328 1.40013,0.7892 0,4.5433 -5.81309,-3.5633 z"
-               style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34105-1-5" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 370.18014,2791.893 4.06195,-1.9901 0.21224,0.125 -3.94155,2.0699 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34107-8-4" />
-            <path
-               id="path34109-7-3"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 370.82417,2792.3224 4.14245,-2.0171 0.0244,0.2593 -3.8342,1.9626 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 371.57553,2792.7786 3.39109,-1.6549 -0.003,0.2594 -3.05599,1.6003 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34111-19-1" />
-            <path
-               id="path34113-9-2"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 372.44766,2793.3019 2.53238,-1.2389 -0.0159,0.2727 -2.18386,1.171 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 373.38688,2793.8788 1.57975,-0.7826 0.0243,0.3129 -1.27149,0.6745 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path34115-2-3" />
+          <g transform="matrix(1.1809704,0,0,1.1809704,-210.98015,-2888.4321)" id="g34148-5-7">
+            <path sodipodi:nodetypes="ccccccccc" id="path34103-68-9" d="m 369.17424,2786.7982 0,4.5523 5.79627,3.4142 0,-4.4243 -1.28806,-0.7782 0,-1.0132 -3.05914,-1.7662 0,0.9009 z" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 373.5872,2789.5328 1.40013,0.7892 0,4.5433 -5.81309,-3.5633 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34105-1-5"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 370.18014,2791.893 4.06195,-1.9901 0.21224,0.125 -3.94155,2.0699 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34107-8-4"/>
+            <path id="path34109-7-3" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 370.82417,2792.3224 4.14245,-2.0171 0.0244,0.2593 -3.8342,1.9626 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 371.57553,2792.7786 3.39109,-1.6549 -0.003,0.2594 -3.05599,1.6003 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34111-19-1"/>
+            <path id="path34113-9-2" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 372.44766,2793.3019 2.53238,-1.2389 -0.0159,0.2727 -2.18386,1.171 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 373.38688,2793.8788 1.57975,-0.7826 0.0243,0.3129 -1.27149,0.6745 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34115-2-3"/>
           </g>
-          <g
-             id="g4733"
-             transform="matrix(1.1144931,-0.06311154,0,1.1144931,-196.7235,-2683.9607)">
-            <path
-               id="path4735"
-               transform="translate(65.29157,14.177646)"
-               d="m 340,2793.75 0,5.25 6.75957,4.3593 -0.01,-5.4843 -1.5,-0.9062 0.0346,-0.7767 -3.59709,-2.2859 0,0.875 z"
-               style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 481.08801,2560.1294 1.91121,-0.078 0.0308,5.5131 -7.96576,-0.2322 z"
-               style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               transform="matrix(0.85313008,0.52169825,0,1,0,0)"
-               id="path4737" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m -754.60323,2741.0944 5.26259,-0.229 0.16812,0.2325 -5.17129,0.3702 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               transform="matrix(0.91628321,-0.40053099,0.40053099,0.91628321,0,0)"
-               id="path4739" />
-            <path
-               id="path4741"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 407.21298,2814.3608 4.82406,-2.349 0.0284,0.302 -4.46509,2.2855 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 408.08798,2814.892 3.94906,-1.9271 -0.003,0.302 -3.55884,1.8636 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path4743" />
-            <path
-               id="path4745"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 409.10361,2815.5014 2.94906,-1.4427 -0.0185,0.3176 -2.54321,1.3636 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 410.19737,2816.1733 1.83968,-0.9114 0.0284,0.3644 -1.48071,0.7855 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path4747" />
+          <g id="g4733" transform="matrix(1.1144931,-0.06311154,0,1.1144931,-196.7235,-2683.9607)">
+            <path id="path4735" transform="translate(65.29157,14.177646)" d="m 340,2793.75 0,5.25 6.75957,4.3593 -0.01,-5.4843 -1.5,-0.9062 0.0346,-0.7767 -3.59709,-2.2859 0,0.875 z" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 481.08801,2560.1294 1.91121,-0.078 0.0308,5.5131 -7.96576,-0.2322 z" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.85313008,0.52169825,0,1,0,0)" id="path4737"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m -754.60323,2741.0944 5.26259,-0.229 0.16812,0.2325 -5.17129,0.3702 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.91628321,-0.40053099,0.40053099,0.91628321,0,0)" id="path4739"/>
+            <path id="path4741" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 407.21298,2814.3608 4.82406,-2.349 0.0284,0.302 -4.46509,2.2855 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 408.08798,2814.892 3.94906,-1.9271 -0.003,0.302 -3.55884,1.8636 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4743"/>
+            <path id="path4745" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 409.10361,2815.5014 2.94906,-1.4427 -0.0185,0.3176 -2.54321,1.3636 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 410.19737,2816.1733 1.83968,-0.9114 0.0284,0.3644 -1.48071,0.7855 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4747"/>
           </g>
-          <g
-             id="g4749"
-             transform="matrix(1.1809704,0,0,1.1809704,-219.96197,-2893.6493)">
-            <path
-               inkscape:connector-curvature="0"
-               style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 369.17424,2786.7982 0,4.5523 5.79627,3.4142 0,-4.4243 -1.28806,-0.7782 0,-1.0132 -3.05914,-1.7662 0,0.9009 z"
-               id="path4751"
-               sodipodi:nodetypes="ccccccccc" />
-            <path
-               id="path4753"
-               style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 373.5872,2789.5328 1.40013,0.7892 0,4.5433 -5.81309,-3.5633 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="path4755"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 370.18014,2791.893 4.06195,-1.9901 0.21224,0.125 -3.94155,2.0699 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 370.82417,2792.3224 4.14245,-2.0171 0.0244,0.2593 -3.8342,1.9626 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path4757" />
-            <path
-               id="path4759"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 371.57553,2792.7786 3.39109,-1.6549 -0.003,0.2594 -3.05599,1.6003 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0"
-               d="m 372.44766,2793.3019 2.53238,-1.2389 -0.0159,0.2727 -2.18386,1.171 z"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path4761" />
-            <path
-               id="path4763"
-               style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 373.38688,2793.8788 1.57975,-0.7826 0.0243,0.3129 -1.27149,0.6745 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
+          <g id="g4749" transform="matrix(1.1809704,0,0,1.1809704,-219.96197,-2893.6493)">
+            <path inkscape:connector-curvature="0" style="fill:#262f36;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 369.17424,2786.7982 0,4.5523 5.79627,3.4142 0,-4.4243 -1.28806,-0.7782 0,-1.0132 -3.05914,-1.7662 0,0.9009 z" id="path4751" sodipodi:nodetypes="ccccccccc"/>
+            <path id="path4753" style="fill:#3f505c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 373.5872,2789.5328 1.40013,0.7892 0,4.5433 -5.81309,-3.5633 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="path4755" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 370.18014,2791.893 4.06195,-1.9901 0.21224,0.125 -3.94155,2.0699 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 370.82417,2792.3224 4.14245,-2.0171 0.0244,0.2593 -3.8342,1.9626 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4757"/>
+            <path id="path4759" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 371.57553,2792.7786 3.39109,-1.6549 -0.003,0.2594 -3.05599,1.6003 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 372.44766,2793.3019 2.53238,-1.2389 -0.0159,0.2727 -2.18386,1.171 z" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4761"/>
+            <path id="path4763" style="fill:#eded00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 373.38688,2793.8788 1.57975,-0.7826 0.0243,0.3129 -1.27149,0.6745 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
           </g>
-          <path
-             id="path5536"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5544);stroke-width:0.2757169;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 267.20593,421.08875 2.0032,1.14971 0,4.3113 -2.16929,-1.16909 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-2.8080868"
-             inkscape:transform-center-y="-8.4018035e-005" />
-          <path
-             inkscape:transform-center-x="-2.8080835"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 270.66898,423.07623 2.0032,1.14948 0,4.31153 -2.16929,-1.16933 z"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5548);stroke-width:0.2757169;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path5546"
-             inkscape:transform-center-y="-5.5800107e-005" />
-          <path
-             inkscape:transform-center-y="-9.6682266e-005"
-             inkscape:transform-center-x="-2.6396107"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 256.69893,415.32214 1.88301,1.08072 0,4.05263 -2.03913,-1.09899 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5554);stroke-width:0.25917405;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path5550" />
-          <path
-             inkscape:transform-center-y="-7.5401895e-005"
-             id="path5552"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5556);stroke-width:0.25917405;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 259.9542,417.19037 1.883,1.0805 0,4.05285 -2.03913,-1.09911 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-2.6395989" />
-          <path
-             id="path5566"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5570);stroke-width:0.24814513;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 246.36219,409.56556 1.80287,1.0347 0,3.88022 -1.95235,-1.05231 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-2.5272786"
-             inkscape:transform-center-y="-7.1947534e-005" />
-          <path
-             inkscape:transform-center-x="-2.5272718"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 249.47894,411.35433 1.80286,1.03446 0,3.88034 -1.95235,-1.05231 z"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5572);stroke-width:0.24814513;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path5568"
-             inkscape:transform-center-y="-6.7806005e-005" />
-          <path
-             inkscape:transform-center-y="-0.00011569046"
-             inkscape:transform-center-x="-2.4711216"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 236.09127,403.75894 1.7628,1.01174 0,3.79396 -1.90896,-1.0289 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5578);stroke-width:0.24263062;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path5574" />
-          <path
-             inkscape:transform-center-y="-3.8962611e-005"
-             id="path5576"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5580);stroke-width:0.24263062;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 239.13875,405.50803 1.76281,1.0114 0,3.79418 -1.90897,-1.0289 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-2.4711172" />
-          <path
-             id="path5582"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5586);stroke-width:0.23711644;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 226.60143,398.46811 1.72274,0.98877 0,3.70771 -1.86559,-1.00551 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-2.4149604"
-             inkscape:transform-center-y="-0.00015547681" />
-          <path
-             inkscape:transform-center-x="-2.4149515"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 229.57964,400.17752 1.72274,0.98832 0,3.70804 -1.86558,-1.00549 z"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5588);stroke-width:0.23711644;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path5584" />
-          <path
-             inkscape:transform-center-y="-0.00019222366"
-             inkscape:transform-center-x="-2.3588028"
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 217.67342,393.36451 1.68268,0.96581 0,3.62144 -1.8222,-0.98209 z"
-             style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5594);stroke-width:0.23160252;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path5590" />
-          <path
-             id="path5592"
-             style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5596);stroke-width:0.23160252;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m 220.58238,395.03424 1.68268,0.96526 0,3.62189 -1.8222,-0.9821 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc"
-             inkscape:transform-center-x="-2.3587943"
-             inkscape:transform-center-y="3.4638094e-005" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 276.26415,408.6296 34.8337,-18.55975 1.61129,0.53886 -34.84301,18.81305 z"
-             style="fill:url(#linearGradient3312);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect3648-1-2-5-3" />
-          <path
-             id="path3656-7-5-7-4"
-             style="fill:url(#linearGradient3310);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 273.34126,407.18429 34.43199,-18.3172 1.62759,0.5861 -34.56479,18.47025 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 270.2262,405.64396 34.34758,-17.929 1.66815,0.6007 -34.4702,18.09253 z"
-             style="fill:url(#linearGradient3308);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3658-5-8-4-1" />
-          <path
-             id="path3660-0-5-3-1"
-             style="fill:url(#linearGradient3306);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 267.02702,404.06202 34.3335,-17.50416 1.59004,0.57257 -34.38938,17.69021 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 263.89012,402.51088 34.58652,-16.99152 1.55497,0.55996 -34.57718,17.20508 z"
-             style="fill:url(#linearGradient3304);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3662-9-8-7-3" />
-          <path
-             id="path3664-9-4-2-8"
-             style="fill:url(#linearGradient3302);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 260.86219,401.01363 34.6484,-16.56235 1.64966,0.59404 -34.83139,16.69355 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             id="path3666-8-6-9-7"
-             style="fill:url(#linearGradient3300);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 257.70247,399.45121 34.64859,-16.13768 1.6692,0.60109 -34.75325,16.31023 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 254.55841,397.89653 34.55876,-15.74753 1.67198,0.60209 -34.65171,15.92625 z"
-             style="fill:url(#linearGradient3298);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3668-9-8-2-4" />
-          <path
-             id="path3670-8-5-2-2"
-             style="fill:url(#linearGradient3296);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 251.42526,396.34725 34.39065,-15.38704 1.66936,0.60114 -34.40997,15.60181 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 248.17371,394.73942 33.97366,-15.10026 2.02787,0.73024 -34.39642,15.16372 z"
-             style="fill:url(#linearGradient3294);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3672-0-8-5-7" />
-          <path
-             id="path3674-1-5-2-7"
-             style="fill:url(#linearGradient3292);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 245.04449,393.19208 33.49046,-14.85375 1.9525,0.70309 -33.84172,14.94244 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 241.60719,391.4924 33.28189,-14.46696 1.83458,0.66064 -33.2408,14.7338 z"
-             style="fill:url(#linearGradient3290);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3676-8-9-50-9" />
-          <path
-             id="path3678-0-7-4-3"
-             style="fill:url(#linearGradient158715);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 238.57402,389.99256 32.61221,-14.30052 1.98836,0.71601 -33.06257,14.34502 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+          <path id="path5536" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5544);stroke-width:0.2757169;stroke-miterlimit:4;stroke-dasharray:none" d="m 267.20593,421.08875 2.0032,1.14971 0,4.3113 -2.16929,-1.16909 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-2.8080868" inkscape:transform-center-y="-8.4018035e-005"/>
+          <path inkscape:transform-center-x="-2.8080835" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 270.66898,423.07623 2.0032,1.14948 0,4.31153 -2.16929,-1.16933 z" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5548);stroke-width:0.2757169;stroke-miterlimit:4;stroke-dasharray:none" id="path5546" inkscape:transform-center-y="-5.5800107e-005"/>
+          <path inkscape:transform-center-y="-9.6682266e-005" inkscape:transform-center-x="-2.6396107" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 256.69893,415.32214 1.88301,1.08072 0,4.05263 -2.03913,-1.09899 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5554);stroke-width:0.25917405;stroke-miterlimit:4;stroke-dasharray:none" id="path5550"/>
+          <path inkscape:transform-center-y="-7.5401895e-005" id="path5552" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5556);stroke-width:0.25917405;stroke-miterlimit:4;stroke-dasharray:none" d="m 259.9542,417.19037 1.883,1.0805 0,4.05285 -2.03913,-1.09911 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-2.6395989"/>
+          <path id="path5566" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5570);stroke-width:0.24814513;stroke-miterlimit:4;stroke-dasharray:none" d="m 246.36219,409.56556 1.80287,1.0347 0,3.88022 -1.95235,-1.05231 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-2.5272786" inkscape:transform-center-y="-7.1947534e-005"/>
+          <path inkscape:transform-center-x="-2.5272718" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 249.47894,411.35433 1.80286,1.03446 0,3.88034 -1.95235,-1.05231 z" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5572);stroke-width:0.24814513;stroke-miterlimit:4;stroke-dasharray:none" id="path5568" inkscape:transform-center-y="-6.7806005e-005"/>
+          <path inkscape:transform-center-y="-0.00011569046" inkscape:transform-center-x="-2.4711216" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 236.09127,403.75894 1.7628,1.01174 0,3.79396 -1.90896,-1.0289 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5578);stroke-width:0.24263062;stroke-miterlimit:4;stroke-dasharray:none" id="path5574"/>
+          <path inkscape:transform-center-y="-3.8962611e-005" id="path5576" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5580);stroke-width:0.24263062;stroke-miterlimit:4;stroke-dasharray:none" d="m 239.13875,405.50803 1.76281,1.0114 0,3.79418 -1.90897,-1.0289 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-2.4711172"/>
+          <path id="path5582" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5586);stroke-width:0.23711644;stroke-miterlimit:4;stroke-dasharray:none" d="m 226.60143,398.46811 1.72274,0.98877 0,3.70771 -1.86559,-1.00551 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-2.4149604" inkscape:transform-center-y="-0.00015547681"/>
+          <path inkscape:transform-center-x="-2.4149515" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 229.57964,400.17752 1.72274,0.98832 0,3.70804 -1.86558,-1.00549 z" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5588);stroke-width:0.23711644;stroke-miterlimit:4;stroke-dasharray:none" id="path5584"/>
+          <path inkscape:transform-center-y="-0.00019222366" inkscape:transform-center-x="-2.3588028" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 217.67342,393.36451 1.68268,0.96581 0,3.62144 -1.8222,-0.98209 z" style="fill:#ffc02a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5594);stroke-width:0.23160252;stroke-miterlimit:4;stroke-dasharray:none" id="path5590"/>
+          <path id="path5592" style="fill:#15d200;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5596);stroke-width:0.23160252;stroke-miterlimit:4;stroke-dasharray:none" d="m 220.58238,395.03424 1.68268,0.96526 0,3.62189 -1.8222,-0.9821 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" inkscape:transform-center-x="-2.3587943" inkscape:transform-center-y="3.4638094e-005"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 276.26415,408.6296 34.8337,-18.55975 1.61129,0.53886 -34.84301,18.81305 z" style="fill:url(#linearGradient3312);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect3648-1-2-5-3"/>
+          <path id="path3656-7-5-7-4" style="fill:url(#linearGradient3310);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 273.34126,407.18429 34.43199,-18.3172 1.62759,0.5861 -34.56479,18.47025 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 270.2262,405.64396 34.34758,-17.929 1.66815,0.6007 -34.4702,18.09253 z" style="fill:url(#linearGradient3308);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path3658-5-8-4-1"/>
+          <path id="path3660-0-5-3-1" style="fill:url(#linearGradient3306);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 267.02702,404.06202 34.3335,-17.50416 1.59004,0.57257 -34.38938,17.69021 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 263.89012,402.51088 34.58652,-16.99152 1.55497,0.55996 -34.57718,17.20508 z" style="fill:url(#linearGradient3304);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path3662-9-8-7-3"/>
+          <path id="path3664-9-4-2-8" style="fill:url(#linearGradient3302);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 260.86219,401.01363 34.6484,-16.56235 1.64966,0.59404 -34.83139,16.69355 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path id="path3666-8-6-9-7" style="fill:url(#linearGradient3300);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 257.70247,399.45121 34.64859,-16.13768 1.6692,0.60109 -34.75325,16.31023 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 254.55841,397.89653 34.55876,-15.74753 1.67198,0.60209 -34.65171,15.92625 z" style="fill:url(#linearGradient3298);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path3668-9-8-2-4"/>
+          <path id="path3670-8-5-2-2" style="fill:url(#linearGradient3296);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 251.42526,396.34725 34.39065,-15.38704 1.66936,0.60114 -34.40997,15.60181 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 248.17371,394.73942 33.97366,-15.10026 2.02787,0.73024 -34.39642,15.16372 z" style="fill:url(#linearGradient3294);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path3672-0-8-5-7"/>
+          <path id="path3674-1-5-2-7" style="fill:url(#linearGradient3292);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 245.04449,393.19208 33.49046,-14.85375 1.9525,0.70309 -33.84172,14.94244 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 241.60719,391.4924 33.28189,-14.46696 1.83458,0.66064 -33.2408,14.7338 z" style="fill:url(#linearGradient3290);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path3676-8-9-50-9"/>
+          <path id="path3678-0-7-4-3" style="fill:url(#linearGradient158715);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 238.57402,389.99256 32.61221,-14.30052 1.98836,0.71601 -33.06257,14.34502 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
         </g>
-        <rect
-           y="369.64398"
-           x="207.96428"
-           height="1.5944523"
-           width="123.75"
-           id="rect3143"
-           style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <rect y="369.64398" x="207.96428" height="1.5944523" width="123.75" id="rect3143" style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/UPS.svg b/misc/images/svg/elements/UPS.svg
index 11c1831ebbf..b43ff072cbd 100644
--- a/misc/images/svg/elements/UPS.svg
+++ b/misc/images/svg/elements/UPS.svg
@@ -1,758 +1,134 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="127.93075"
-   height="166.09358"
-   id="svg159223"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="UPS.svg">
-  <defs
-     id="defs159225">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5756"
-       id="linearGradient6002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="701.65778"
-       y1="1093.507"
-       x2="665.51025"
-       y2="807.69647" />
-    <linearGradient
-       id="linearGradient5756">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop5758" />
-      <stop
-         id="stop5764"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop5760" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="127.93075" height="166.09358" id="svg159223" version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="UPS.svg">
+  <defs id="defs159225">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5756" id="linearGradient6002" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="701.65778" y1="1093.507" x2="665.51025" y2="807.69647"/>
+    <linearGradient id="linearGradient5756">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop5758"/>
+      <stop id="stop5764" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop5760"/>
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="radialGradient6004"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30117285,-0.02338471,0.07101177,0.91456424,299.60355,490.87705)"
-       cx="490.32803"
-       cy="1041.4089"
-       fx="490.32803"
-       fy="1041.4089"
-       r="121.33981" />
-    <linearGradient
-       id="linearGradient5774">
-      <stop
-         id="stop5776"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop5778" />
-      <stop
-         id="stop5780"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="radialGradient6004" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.30117285,-0.02338471,0.07101177,0.91456424,299.60355,490.87705)" cx="490.32803" cy="1041.4089" fx="490.32803" fy="1041.4089" r="121.33981"/>
+    <linearGradient id="linearGradient5774">
+      <stop id="stop5776" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop5778"/>
+      <stop id="stop5780" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="linearGradient6006"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="374.7666"
-       y1="796.79358"
-       x2="663.64978"
-       y2="754.95197" />
-    <linearGradient
-       id="linearGradient159139">
-      <stop
-         id="stop159141"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop159143" />
-      <stop
-         id="stop159145"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="linearGradient6006" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="374.7666" y1="796.79358" x2="663.64978" y2="754.95197"/>
+    <linearGradient id="linearGradient159139">
+      <stop id="stop159141" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop159143"/>
+      <stop id="stop159145" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5784"
-       id="linearGradient6008"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="427.08405"
-       y1="771.34052"
-       x2="579.42773"
-       y2="771.34052" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5784">
-      <stop
-         style="stop-color:#15161c;stop-opacity:1;"
-         offset="0"
-         id="stop5786" />
-      <stop
-         style="stop-color:#15161c;stop-opacity:0;"
-         offset="1"
-         id="stop5788" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5784" id="linearGradient6008" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="427.08405" y1="771.34052" x2="579.42773" y2="771.34052"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5784">
+      <stop style="stop-color:#15161c;stop-opacity:1;" offset="0" id="stop5786"/>
+      <stop style="stop-color:#15161c;stop-opacity:0;" offset="1" id="stop5788"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4000"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5784"
-       id="linearGradient6010"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="554.00549"
-       y1="774.26379"
-       x2="675.35284"
-       y2="763.65717" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4004"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4008"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="linearGradient6012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.9986,1124.5145)"
-       x1="278.57144"
-       y1="978.42749"
-       x2="516.11334"
-       y2="979.84167" />
-    <linearGradient
-       id="linearGradient159162">
-      <stop
-         id="stop159164"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop159166" />
-      <stop
-         id="stop159168"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect4000" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5784" id="linearGradient6010" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="554.00549" y1="774.26379" x2="675.35284" y2="763.65717"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4004" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4008" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="linearGradient6012" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.9986,1124.5145)" x1="278.57144" y1="978.42749" x2="516.11334" y2="979.84167"/>
+    <linearGradient id="linearGradient159162">
+      <stop id="stop159164" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop159166"/>
+      <stop id="stop159168" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4028"
-       id="linearGradient6014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.57468844,0,0,0.28803315,220.26474,1124.5145)"
-       x1="563.43274"
-       y1="1191.8391"
-       x2="551.6571"
-       y2="1192.1926" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4028">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4030" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4032" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4028" id="linearGradient6014" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.57468844,0,0,0.28803315,220.26474,1124.5145)" x1="563.43274" y1="1191.8391" x2="551.6571" y2="1192.1926"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4028">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop4030"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop4032"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4038"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4042"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4929"
-       id="linearGradient6016"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="699.66272"
-       y1="1145.9584"
-       x2="660.47681"
-       y2="1085.1471" />
-    <linearGradient
-       id="linearGradient4929">
-      <stop
-         id="stop4931"
-         offset="0"
-         style="stop-color:#e6e6e6;stop-opacity:1;" />
-      <stop
-         id="stop4933"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
+    <inkscape:path-effect effect="spiro" id="path-effect4038" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4042" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4929" id="linearGradient6016" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="699.66272" y1="1145.9584" x2="660.47681" y2="1085.1471"/>
+    <linearGradient id="linearGradient4929">
+      <stop id="stop4931" offset="0" style="stop-color:#e6e6e6;stop-opacity:1;"/>
+      <stop id="stop4933" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4046"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4050"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5954"
-       id="linearGradient6018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="730.60693"
-       y1="1069.1471"
-       x2="641.90491"
-       y2="1198.6471" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5954">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop5956" />
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:0;"
-         offset="1"
-         id="stop5958" />
+    <inkscape:path-effect effect="spiro" id="path-effect4046" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4050" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5954" id="linearGradient6018" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="730.60693" y1="1069.1471" x2="641.90491" y2="1198.6471"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5954">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop5956"/>
+      <stop style="stop-color:#1a1a1a;stop-opacity:0;" offset="1" id="stop5958"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4054"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4828"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4832"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4893"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5903-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5907-5"
-       is_visible="true" />
-    <filter
-       inkscape:collect="always"
-       id="filter3833"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="7.1022182"
-         id="feGaussianBlur3835" />
+    <inkscape:path-effect effect="spiro" id="path-effect4054" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4828" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect4832" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4893" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5903-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect5907-5" is_visible="true"/>
+    <filter inkscape:collect="always" id="filter3833" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="7.1022182" id="feGaussianBlur3835"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5756"
-       id="linearGradient3869"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="701.65778"
-       y1="1093.507"
-       x2="665.51025"
-       y2="807.69647" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="radialGradient3871"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30117285,-0.02338471,0.07101177,0.91456424,299.60355,490.87705)"
-       cx="490.32803"
-       cy="1041.4089"
-       fx="490.32803"
-       fy="1041.4089"
-       r="121.33981" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="linearGradient3873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="374.7666"
-       y1="796.79358"
-       x2="663.64978"
-       y2="754.95197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5784"
-       id="linearGradient3875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="427.08405"
-       y1="771.34052"
-       x2="579.42773"
-       y2="771.34052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5784"
-       id="linearGradient3877"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="554.00549"
-       y1="774.26379"
-       x2="675.35284"
-       y2="763.65717" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="linearGradient3879"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.9986,1124.5145)"
-       x1="278.57144"
-       y1="978.42749"
-       x2="516.11334"
-       y2="979.84167" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4028"
-       id="linearGradient3881"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.57468844,0,0,0.28803315,220.26474,1124.5145)"
-       x1="563.43274"
-       y1="1191.8391"
-       x2="551.6571"
-       y2="1192.1926" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4929"
-       id="linearGradient3883"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="699.66272"
-       y1="1145.9584"
-       x2="660.47681"
-       y2="1085.1471" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5954"
-       id="linearGradient3885"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="730.60693"
-       y1="1069.1471"
-       x2="641.90491"
-       y2="1198.6471" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5756"
-       id="linearGradient3919"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="701.65778"
-       y1="1093.507"
-       x2="665.51025"
-       y2="807.69647" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="radialGradient3921"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30117285,-0.02338471,0.07101177,0.91456424,299.60355,490.87705)"
-       cx="490.32803"
-       cy="1041.4089"
-       fx="490.32803"
-       fy="1041.4089"
-       r="121.33981" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="linearGradient3923"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="374.7666"
-       y1="796.79358"
-       x2="663.64978"
-       y2="754.95197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5784"
-       id="linearGradient3925"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="427.08405"
-       y1="771.34052"
-       x2="579.42773"
-       y2="771.34052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5784"
-       id="linearGradient3927"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="554.00549"
-       y1="774.26379"
-       x2="675.35284"
-       y2="763.65717" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5774"
-       id="linearGradient3929"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.9986,1124.5145)"
-       x1="278.57144"
-       y1="978.42749"
-       x2="516.11334"
-       y2="979.84167" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4028"
-       id="linearGradient3931"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.57468844,0,0,0.28803315,220.26474,1124.5145)"
-       x1="563.43274"
-       y1="1191.8391"
-       x2="551.6571"
-       y2="1192.1926" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4929"
-       id="linearGradient3933"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="699.66272"
-       y1="1145.9584"
-       x2="660.47681"
-       y2="1085.1471" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5954"
-       id="linearGradient3935"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)"
-       x1="730.60693"
-       y1="1069.1471"
-       x2="641.90491"
-       y2="1198.6471" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5756" id="linearGradient3869" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="701.65778" y1="1093.507" x2="665.51025" y2="807.69647"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="radialGradient3871" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.30117285,-0.02338471,0.07101177,0.91456424,299.60355,490.87705)" cx="490.32803" cy="1041.4089" fx="490.32803" fy="1041.4089" r="121.33981"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="linearGradient3873" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="374.7666" y1="796.79358" x2="663.64978" y2="754.95197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5784" id="linearGradient3875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="427.08405" y1="771.34052" x2="579.42773" y2="771.34052"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5784" id="linearGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="554.00549" y1="774.26379" x2="675.35284" y2="763.65717"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="linearGradient3879" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.9986,1124.5145)" x1="278.57144" y1="978.42749" x2="516.11334" y2="979.84167"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4028" id="linearGradient3881" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.57468844,0,0,0.28803315,220.26474,1124.5145)" x1="563.43274" y1="1191.8391" x2="551.6571" y2="1192.1926"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4929" id="linearGradient3883" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="699.66272" y1="1145.9584" x2="660.47681" y2="1085.1471"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5954" id="linearGradient3885" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="730.60693" y1="1069.1471" x2="641.90491" y2="1198.6471"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5756" id="linearGradient3919" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="701.65778" y1="1093.507" x2="665.51025" y2="807.69647"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="radialGradient3921" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.30117285,-0.02338471,0.07101177,0.91456424,299.60355,490.87705)" cx="490.32803" cy="1041.4089" fx="490.32803" fy="1041.4089" r="121.33981"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="linearGradient3923" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="374.7666" y1="796.79358" x2="663.64978" y2="754.95197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5784" id="linearGradient3925" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="427.08405" y1="771.34052" x2="579.42773" y2="771.34052"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5784" id="linearGradient3927" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="554.00549" y1="774.26379" x2="675.35284" y2="763.65717"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5774" id="linearGradient3929" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.9986,1124.5145)" x1="278.57144" y1="978.42749" x2="516.11334" y2="979.84167"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4028" id="linearGradient3931" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.57468844,0,0,0.28803315,220.26474,1124.5145)" x1="563.43274" y1="1191.8391" x2="551.6571" y2="1192.1926"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4929" id="linearGradient3933" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="699.66272" y1="1145.9584" x2="660.47681" y2="1085.1471"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5954" id="linearGradient3935" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.28803315,0,0,0.28803315,379.99861,1124.5145)" x1="730.60693" y1="1069.1471" x2="641.90491" y2="1198.6471"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="-22.548188"
-     inkscape:cy="64.587044"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3837"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata159228">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" inkscape:cx="-22.548188" inkscape:cy="64.587044" inkscape:document-units="px" inkscape:current-layer="g3837" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="968" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1"/>
+  <metadata id="metadata159228">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-327.0958,-481.56042)">
-    <g
-       style="display:inline"
-       id="g5970"
-       transform="matrix(0.84894966,0,0,0.84894966,-72.162571,-623.2361)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\UPS.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g3837"
-         transform="matrix(1.2701484,0,0,1.2701484,-138.992,-389.60662)">
-        <g
-           id="g3087"
-           transform="matrix(0.99846954,0,0,0.99846954,0.73416892,2.2211107)"
-           inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Icons reduced whitespace\Tiny\UPS.png"
-           inkscape:export-xdpi="90"
-           inkscape:export-ydpi="90">
-          <g
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Normal\UPS.png"
-             transform="matrix(1.0309437,0,0,1.0309437,-14.810345,-46.000982)"
-             id="g3887">
-            <path
-               id="rect5962"
-               style="opacity:0.79820628;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.60000002;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter3833)"
-               d="M 557.20016,1067.9185 734.52659,1052.2316 632.53804,1227.946 383.05399,1199.6011 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc"
-               transform="matrix(0.29740241,0,0,0.29740241,371.16681,1114.9418)" />
-            <path
-               id="rect3986"
-               style="fill:url(#linearGradient3919);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.06999206;stroke-miterlimit:4;stroke-opacity:1"
-               d="m 557.77358,1356.6361 31.13245,-14.1134 0,86.2709 -31.13244,48.8808 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="rect3990"
-               style="fill:url(#radialGradient3921);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.06999206;stroke-miterlimit:4;stroke-opacity:1"
-               d="m 487.94381,1354.0175 c 12.42024,-1.2366 24.2222,-1.673 35.8605,-1.2366 11.6383,0.4365 16.58457,1.0911 33.96928,3.8552 l 0,121.0383 -69.82979,-7.4194 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccccc" />
-            <path
-               id="rect3994"
-               style="fill:url(#linearGradient3923);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.06999206;stroke-miterlimit:4;stroke-opacity:1"
-               d="m 535.9625,1340.8617 c 12.6469,-1.1698 18.73893,-1.2648 27.56285,-0.988 8.82393,0.2769 15.17471,0.8447 25.38068,2.649 l -31.13244,14.1134 c -19.61292,-3.1368 -23.20386,-2.9096 -34.84215,-3.346 -11.6383,-0.4364 -22.69469,-0.3637 -34.98764,0.7274 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccc" />
-            <path
-               style="fill:none;stroke:url(#linearGradient3925);stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 546.74899,1340.2659 -40.69051,11.6147 -2.9015,1.2258"
-               id="path3998"
-               inkscape:path-effect="#path-effect4000"
-               inkscape:original-d="m 546.74899,1340.2659 -40.69051,11.6147 -2.9015,1.2258"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccc" />
-            <path
-               sodipodi:nodetypes="ccc"
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 575.80429,1340.7847 c -10.93255,4.1067 -21.94334,7.9948 -32.94962,11.8975 l -3.1401,1.5895"
-               inkscape:path-effect="#path-effect4004"
-               id="path4002"
-               d="m 575.80429,1340.7847 -32.94962,11.8975 -3.1401,1.5895"
-               style="fill:none;stroke:url(#linearGradient3927);stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-            <path
-               style="fill:none;stroke:#000000;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 503.1827,1353.1446 0,118.7295"
-               id="path4006"
-               inkscape:path-effect="#path-effect4008"
-               inkscape:original-d="m 503.1827,1353.1446 0,118.7295"
-               inkscape:connector-curvature="0" />
-            <path
-               id="rect4010"
-               style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 539.6433,1354.1448 c 0.37314,0.023 0.74586,0.051 1.11836,0.082 l -0.26368,106.0267 -1.16382,0.5456 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               id="rect4014"
-               style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 503.22531,1457.3728 1.34114,0.09 0,14.5583 -1.25876,-0.1337 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <path
-               sodipodi:nodetypes="cccccc"
-               inkscape:connector-curvature="0"
-               d="m 503.32567,1353.1657 c 7.09859,-0.3383 13.58907,-0.6431 20.47864,-0.3848 6.25608,0.2346 10.47029,0.6914 15.83045,1.3459 0.11404,30.0051 -0.30207,75.6924 -0.30207,106.6717 -12.00242,-0.9339 -24.00484,-1.9438 -36.00726,-3.4141 -0.0429,-24.0392 -0.38463,-75.8739 2.4e-4,-104.2187 z"
-               style="fill:url(#linearGradient3929);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path4022" />
-            <path
-               id="rect4024"
-               style="fill:url(#linearGradient3931);fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 536.56994,1460.7516 1.44802,-0.08 1.38122,0.093 1.10108,-0.5132 -0.22239,15.5753 -3.75872,-0.2002 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccc" />
-            <path
-               style="fill:none;stroke:#000000;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 492.62336,1352.9055 13.44709,-1.092 c 5.91531,-0.3588 11.84567,-0.4692 17.77023,-0.331 6.34593,0.148 12.6852,0.5814 18.99224,1.2984 2.79279,0.3048 5.57898,0.67 8.35596,1.0954 3.04741,0.4668 6.08372,1.006 9.10551,1.6171"
-               id="path4036"
-               inkscape:path-effect="#path-effect4038"
-               inkscape:original-d="m 492.62336,1352.9055 13.44709,-1.092 c 6.12708,0.1612 11.64315,-0.4922 17.77023,-0.331 6.12707,0.1613 12.86516,1.1372 18.99224,1.2984 3.42577,0.509 5.57382,0.6569 8.35596,1.0954 2.78214,0.4385 6.19839,1.1676 9.10551,1.6171"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccsc" />
-            <path
-               style="fill:none;stroke:#000000;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 560.07778,1355.5916 -0.73138,119.6133"
-               id="path4040"
-               inkscape:path-effect="#path-effect4042"
-               inkscape:original-d="m 560.07778,1355.5916 -0.73138,119.6133"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:url(#linearGradient3933);fill-opacity:1;stroke:#4d4d4d;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 587.2021,1431.4689 -0.0356,-7.5836 -21.74651,30.9636 -0.0449,10.8905 21.82701,-34.2705"
-               id="path4044"
-               inkscape:path-effect="#path-effect4046"
-               inkscape:original-d="m 587.2021,1431.4689 -0.0356,-7.5836 -21.74651,30.9636 -0.0449,10.8905 z"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:#1a1a1a;stroke:#333333;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 587.09444,1424.0293 -1.33216,7.4709 1.44876,-0.045 -0.1166,-7.4259"
-               id="path4048"
-               inkscape:path-effect="#path-effect4050"
-               inkscape:original-d="m 587.09444,1424.0293 -1.33216,7.4709 1.44876,-0.045 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cccc" />
-            <path
-               style="fill:none;stroke:url(#linearGradient3935);stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 585.76228,1431.5272 -20.37289,31.4011 -0.0107,2.8053 21.83233,-34.2788 -1.44874,0.072"
-               id="path4052"
-               inkscape:path-effect="#path-effect4054"
-               inkscape:original-d="m 585.76228,1431.5272 -20.37289,31.4011 -0.0107,2.8053 21.83233,-34.2788 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccc" />
-            <rect
-               style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="rect4056"
-               width="23.886515"
-               height="24.622839"
-               x="510.00229"
-               y="1349.5568"
-               ry="0.77386063"
-               transform="matrix(0.99933921,0.0363476,0,1,0,0)" />
-            <path
-               style="fill:#363a3c;fill-opacity:1;stroke:none"
-               d="m 509.73652,1392.4966 -1.52753,1.5276 0.10183,-27.2918 26.22254,0.8656 -1.22202,1.3238 -23.67666,-0.6619 0.10184,24.2367"
-               id="path4826"
-               inkscape:path-effect="#path-effect4828"
-               inkscape:original-d="m 509.73652,1392.4966 -1.52753,1.5276 0.10183,-27.2918 26.22254,0.8656 -1.22202,1.3238 -23.67666,-0.6619 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccc" />
-            <path
-               sodipodi:nodetypes="ccccccc"
-               inkscape:connector-curvature="0"
-               inkscape:original-d="m 533.31714,1368.92 1.21525,-1.3224 -0.10715,27.3492 -26.24054,-0.9196 1.54606,-1.5069 23.73323,1.1474 z"
-               inkscape:path-effect="#path-effect4832"
-               id="path4830"
-               d="m 533.31714,1368.92 1.21525,-1.3224 -0.10715,27.3492 -26.24054,-0.9196 1.54606,-1.5069 23.73323,1.1474 -0.14685,-24.7477"
-               style="fill:#8d928f;fill-opacity:1;stroke:none" />
-            <path
-               sodipodi:type="arc"
-               style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               id="path4838"
-               sodipodi:cx="466.5"
-               sodipodi:cy="968.98718"
-               sodipodi:rx="11.5"
-               sodipodi:ry="12.125"
-               d="m 478,968.98718 c 0,6.69646 -5.14873,12.125 -11.5,12.125 -6.35127,0 -11.5,-5.42854 -11.5,-12.125 0,-6.69645 5.14873,-12.125 11.5,-12.125 6.35127,0 11.5,5.42855 11.5,12.125 z"
-               transform="matrix(0.72100425,0,0,0.72100425,184.40262,739.22053)" />
-            <path
-               transform="matrix(0.56714054,0,0,0.56714054,256.18001,888.3125)"
-               d="m 478,968.98718 c 0,6.69646 -5.14873,12.125 -11.5,12.125 -6.35127,0 -11.5,-5.42854 -11.5,-12.125 0,-6.69645 5.14873,-12.125 11.5,-12.125 6.35127,0 11.5,5.42855 11.5,12.125 z"
-               sodipodi:ry="12.125"
-               sodipodi:rx="11.5"
-               sodipodi:cy="968.98718"
-               sodipodi:cx="466.5"
-               id="path4840"
-               style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.60000002;stroke-miterlimit:4;stroke-dasharray:none"
-               sodipodi:type="arc" />
-            <path
-               transform="matrix(0.72100425,0,0,0.72100425,184.31414,712.80265)"
-               d="m 478,968.98718 c 0,6.69646 -5.14873,12.125 -11.5,12.125 -6.35127,0 -11.5,-5.42854 -11.5,-12.125 0,-6.69645 5.14873,-12.125 11.5,-12.125 6.35127,0 11.5,5.42855 11.5,12.125 z"
-               sodipodi:ry="12.125"
-               sodipodi:rx="11.5"
-               sodipodi:cy="968.98718"
-               sodipodi:cx="466.5"
-               id="path4842"
-               style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               sodipodi:type="arc" />
-            <path
-               sodipodi:type="arc"
-               style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.60000002;stroke-miterlimit:4;stroke-dasharray:none"
-               id="path4844"
-               sodipodi:cx="466.5"
-               sodipodi:cy="968.98718"
-               sodipodi:rx="11.5"
-               sodipodi:ry="12.125"
-               d="m 478,968.98718 c 0,6.69646 -5.14873,12.125 -11.5,12.125 -6.35127,0 -11.5,-5.42854 -11.5,-12.125 0,-6.69645 5.14873,-12.125 11.5,-12.125 6.35127,0 11.5,5.42855 11.5,12.125 z"
-               transform="matrix(0.56714054,0,0,0.56714054,256.09156,861.89461)" />
-            <path
-               style="fill:#dc2128;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.28803316"
-               d="m 525.02379,1370.2076 c -0.45865,-0.016 -0.8252,0.3428 -0.8252,0.8017 l 0,0.8016 -0.94308,-0.035 c -1.25309,-0.045 -2.2634,0.927 -2.2634,2.1809 l 0,15.6552 c 0,1.2539 1.01031,2.3003 2.2634,2.3459 l 5.84711,0.2122 c 1.25309,0.046 2.2634,-0.927 2.2634,-2.1809 l 0,-15.6552 c 0,-1.2539 -1.01031,-2.3003 -2.2634,-2.3459 l -0.94308,-0.035 0,-0.8017 c 0,-0.4589 -0.36655,-0.8445 -0.8252,-0.8605 l -2.31055,-0.083 z m -3.54835,5.022 9.17148,0.3654 c 0.13946,0.01 0.24756,0.1169 0.24756,0.2476 0,0.1306 -0.1081,0.2294 -0.24756,0.224 l -9.17148,-0.3655 c -0.13946,-0.01 -0.24756,-0.1052 -0.24756,-0.2358 0,-0.1306 0.1081,-0.2412 0.24756,-0.2357 z m 0,4.3381 9.17148,0.3655 c 0.13946,0.01 0.24756,0.1169 0.24756,0.2475 0,0.1307 -0.1081,0.2295 -0.24756,0.224 l -9.17148,-0.3654 c -0.13946,-0.01 -0.24756,-0.1052 -0.24756,-0.2358 0,-0.1306 0.1081,-0.2412 0.24756,-0.2358 z m 0,4.4561 9.17148,0.3183 c 0.13946,0 0.24756,0.1169 0.24756,0.2476 0,0.1306 -0.1081,0.2287 -0.24756,0.2239 l -9.17148,-0.3183 c -0.13946,0 -0.24756,-0.1051 -0.24756,-0.2357 0,-0.1306 0.1081,-0.2406 0.24756,-0.2358 z m 0,4.3382 9.17148,0.3183 c 0.13946,0 0.24756,0.1169 0.24756,0.2475 0,0.1306 -0.1081,0.2288 -0.24756,0.224 l -9.17148,-0.3183 c -0.13946,0 -0.24756,-0.1051 -0.24756,-0.2357 0,-0.1307 0.1081,-0.2406 0.24756,-0.2358 z"
-               id="rect4864"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:#dc2128;fill-opacity:1;stroke:#000000;stroke-width:0.17335254px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 515.9096,1374.0762 0,2.1992 3.09191,0.1644 0.0202,0.7515 -3.11208,-0.131 0,1.0989 -1.27815,-0.068 -0.20302,-0.6398 -3.34323,-1.7799 0,-1.1192 3.51224,-1.4965 0.26114,-0.7951 1.05102,0.056 0,1.028 3.13083,0.1728 -0.003,0.7362 -3.12786,-0.1775"
-               id="path4891"
-               inkscape:path-effect="#path-effect4893"
-               inkscape:original-d="m 515.9096,1374.0762 0,2.1992 3.09191,0.1644 0.0202,0.7515 -3.11208,-0.131 0,1.0989 -1.27815,-0.068 -0.20302,-0.6398 -3.34323,-1.7799 0,-1.1192 3.51224,-1.4965 0.26114,-0.7951 1.05102,0.056 0,1.028 3.13083,0.1728 -0.003,0.7362 z"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccccccccccccc" />
-            <path
-               style="fill:#dc2128;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 519.93248,1407.1871 0,5.0866 1.27606,0 0,-5.0866 -1.27606,0 z m -0.77983,1.3293 c -1.31037,0.5543 -2.23311,1.8552 -2.23311,3.3674 0,2.0165 1.63459,3.6509 3.65098,3.6509 2.01637,0 3.65096,-1.6344 3.65096,-3.6509 0,-1.4982 -0.90663,-2.787 -2.19767,-3.3497 l -0.26584,1.223 c 0.74905,0.418 1.25834,1.2079 1.25834,2.1267 0,1.3507 -1.09503,2.4459 -2.44579,2.4459 -1.35078,0 -2.44581,-1.0952 -2.44581,-2.4459 0,-0.9386 0.53571,-1.7345 1.31152,-2.1445 l -0.28358,-1.2229 z"
-               id="path5884"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:#dc2128;fill-opacity:1;stroke:none"
-               d="m 520.68788,1433.5042 -2.15554,0 0,2.5063 2.00515,0 1.77957,1.7796 0,-5.7899 -1.62918,1.504"
-               id="path5901-8"
-               inkscape:path-effect="#path-effect5903-8"
-               inkscape:original-d="m 520.68788,1433.5042 -2.15554,0 0,2.5063 2.00515,0 1.77957,1.7796 0,-5.7899 z"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:none;stroke:#000000;stroke-width:0.56714058px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 516.22644,1438.0658 9.27378,0.1496"
-               id="path5905-1"
-               inkscape:path-effect="#path-effect5907-5"
-               inkscape:original-d="m 516.22644,1438.0658 9.27378,0.1496"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
-            <rect
-               style="fill:none;stroke:#dc2128;stroke-width:0.56717902;stroke-opacity:1"
-               id="rect5909-2"
-               width="5.5148969"
-               height="3.6092603"
-               x="517.90082"
-               y="1430.6361"
-               transform="matrix(0.99986413,0.01648394,0,1,0,0)" />
-            <rect
-               y="1439.6442"
-               x="519.15833"
-               height="1.612592"
-               width="3.0652895"
-               id="rect5911-1"
-               style="fill:#dc2128;fill-opacity:1;stroke:none" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-327.0958,-481.56042)">
+    <g style="display:inline" id="g5970" transform="matrix(0.84894966,0,0,0.84894966,-72.162571,-623.2361)">
+      <g id="g3837" transform="matrix(1.2701484,0,0,1.2701484,-138.992,-389.60662)">
+        <g id="g3087" transform="matrix(0.99846954,0,0,0.99846954,0.73416892,2.2211107)">
+          <g transform="matrix(1.0309437,0,0,1.0309437,-14.810345,-46.000982)" id="g3887">
+            <path id="rect5962" style="opacity:0.79820628;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.60000002;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter3833)" d="M 557.20016,1067.9185 734.52659,1052.2316 632.53804,1227.946 383.05399,1199.6011 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(0.29740241,0,0,0.29740241,371.16681,1114.9418)"/>
+            <path id="rect3986" style="fill:url(#linearGradient3919);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.06999206;stroke-miterlimit:4;stroke-opacity:1" d="m 557.77358,1356.6361 31.13245,-14.1134 0,86.2709 -31.13244,48.8808 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="rect3990" style="fill:url(#radialGradient3921);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.06999206;stroke-miterlimit:4;stroke-opacity:1" d="m 487.94381,1354.0175 c 12.42024,-1.2366 24.2222,-1.673 35.8605,-1.2366 11.6383,0.4365 16.58457,1.0911 33.96928,3.8552 l 0,121.0383 -69.82979,-7.4194 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+            <path id="rect3994" style="fill:url(#linearGradient3923);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.06999206;stroke-miterlimit:4;stroke-opacity:1" d="m 535.9625,1340.8617 c 12.6469,-1.1698 18.73893,-1.2648 27.56285,-0.988 8.82393,0.2769 15.17471,0.8447 25.38068,2.649 l -31.13244,14.1134 c -19.61292,-3.1368 -23.20386,-2.9096 -34.84215,-3.346 -11.6383,-0.4364 -22.69469,-0.3637 -34.98764,0.7274 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+            <path style="fill:none;stroke:url(#linearGradient3925);stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 546.74899,1340.2659 -40.69051,11.6147 -2.9015,1.2258" id="path3998" inkscape:path-effect="#path-effect4000" inkscape:original-d="m 546.74899,1340.2659 -40.69051,11.6147 -2.9015,1.2258" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+            <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 575.80429,1340.7847 c -10.93255,4.1067 -21.94334,7.9948 -32.94962,11.8975 l -3.1401,1.5895" inkscape:path-effect="#path-effect4004" id="path4002" d="m 575.80429,1340.7847 -32.94962,11.8975 -3.1401,1.5895" style="fill:none;stroke:url(#linearGradient3927);stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+            <path style="fill:none;stroke:#000000;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 503.1827,1353.1446 0,118.7295" id="path4006" inkscape:path-effect="#path-effect4008" inkscape:original-d="m 503.1827,1353.1446 0,118.7295" inkscape:connector-curvature="0"/>
+            <path id="rect4010" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 539.6433,1354.1448 c 0.37314,0.023 0.74586,0.051 1.11836,0.082 l -0.26368,106.0267 -1.16382,0.5456 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path id="rect4014" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 503.22531,1457.3728 1.34114,0.09 0,14.5583 -1.25876,-0.1337 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" d="m 503.32567,1353.1657 c 7.09859,-0.3383 13.58907,-0.6431 20.47864,-0.3848 6.25608,0.2346 10.47029,0.6914 15.83045,1.3459 0.11404,30.0051 -0.30207,75.6924 -0.30207,106.6717 -12.00242,-0.9339 -24.00484,-1.9438 -36.00726,-3.4141 -0.0429,-24.0392 -0.38463,-75.8739 2.4e-4,-104.2187 z" style="fill:url(#linearGradient3929);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4022"/>
+            <path id="rect4024" style="fill:url(#linearGradient3931);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 536.56994,1460.7516 1.44802,-0.08 1.38122,0.093 1.10108,-0.5132 -0.22239,15.5753 -3.75872,-0.2002 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+            <path style="fill:none;stroke:#000000;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 492.62336,1352.9055 13.44709,-1.092 c 5.91531,-0.3588 11.84567,-0.4692 17.77023,-0.331 6.34593,0.148 12.6852,0.5814 18.99224,1.2984 2.79279,0.3048 5.57898,0.67 8.35596,1.0954 3.04741,0.4668 6.08372,1.006 9.10551,1.6171" id="path4036" inkscape:path-effect="#path-effect4038" inkscape:original-d="m 492.62336,1352.9055 13.44709,-1.092 c 6.12708,0.1612 11.64315,-0.4922 17.77023,-0.331 6.12707,0.1613 12.86516,1.1372 18.99224,1.2984 3.42577,0.509 5.57382,0.6569 8.35596,1.0954 2.78214,0.4385 6.19839,1.1676 9.10551,1.6171" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsc"/>
+            <path style="fill:none;stroke:#000000;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 560.07778,1355.5916 -0.73138,119.6133" id="path4040" inkscape:path-effect="#path-effect4042" inkscape:original-d="m 560.07778,1355.5916 -0.73138,119.6133" inkscape:connector-curvature="0"/>
+            <path style="fill:url(#linearGradient3933);fill-opacity:1;stroke:#4d4d4d;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 587.2021,1431.4689 -0.0356,-7.5836 -21.74651,30.9636 -0.0449,10.8905 21.82701,-34.2705" id="path4044" inkscape:path-effect="#path-effect4046" inkscape:original-d="m 587.2021,1431.4689 -0.0356,-7.5836 -21.74651,30.9636 -0.0449,10.8905 z" inkscape:connector-curvature="0"/>
+            <path style="fill:#1a1a1a;stroke:#333333;stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 587.09444,1424.0293 -1.33216,7.4709 1.44876,-0.045 -0.1166,-7.4259" id="path4048" inkscape:path-effect="#path-effect4050" inkscape:original-d="m 587.09444,1424.0293 -1.33216,7.4709 1.44876,-0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+            <path style="fill:none;stroke:url(#linearGradient3935);stroke-width:0.28803316px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 585.76228,1431.5272 -20.37289,31.4011 -0.0107,2.8053 21.83233,-34.2788 -1.44874,0.072" id="path4052" inkscape:path-effect="#path-effect4054" inkscape:original-d="m 585.76228,1431.5272 -20.37289,31.4011 -0.0107,2.8053 21.83233,-34.2788 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+            <rect style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect4056" width="23.886515" height="24.622839" x="510.00229" y="1349.5568" ry="0.77386063" transform="matrix(0.99933921,0.0363476,0,1,0,0)"/>
+            <path style="fill:#363a3c;fill-opacity:1;stroke:none" d="m 509.73652,1392.4966 -1.52753,1.5276 0.10183,-27.2918 26.22254,0.8656 -1.22202,1.3238 -23.67666,-0.6619 0.10184,24.2367" id="path4826" inkscape:path-effect="#path-effect4828" inkscape:original-d="m 509.73652,1392.4966 -1.52753,1.5276 0.10183,-27.2918 26.22254,0.8656 -1.22202,1.3238 -23.67666,-0.6619 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+            <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 533.31714,1368.92 1.21525,-1.3224 -0.10715,27.3492 -26.24054,-0.9196 1.54606,-1.5069 23.73323,1.1474 z" inkscape:path-effect="#path-effect4832" id="path4830" d="m 533.31714,1368.92 1.21525,-1.3224 -0.10715,27.3492 -26.24054,-0.9196 1.54606,-1.5069 23.73323,1.1474 -0.14685,-24.7477" style="fill:#8d928f;fill-opacity:1;stroke:none"/>
+            <path sodipodi:type="arc" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path4838" sodipodi:cx="466.5" sodipodi:cy="968.98718" sodipodi:rx="11.5" sodipodi:ry="12.125" d="m 478,968.98718 c 0,6.69646 -5.14873,12.125 -11.5,12.125 -6.35127,0 -11.5,-5.42854 -11.5,-12.125 0,-6.69645 5.14873,-12.125 11.5,-12.125 6.35127,0 11.5,5.42855 11.5,12.125 z" transform="matrix(0.72100425,0,0,0.72100425,184.40262,739.22053)"/>
+            <path transform="matrix(0.56714054,0,0,0.56714054,256.18001,888.3125)" d="m 478,968.98718 c 0,6.69646 -5.14873,12.125 -11.5,12.125 -6.35127,0 -11.5,-5.42854 -11.5,-12.125 0,-6.69645 5.14873,-12.125 11.5,-12.125 6.35127,0 11.5,5.42855 11.5,12.125 z" sodipodi:ry="12.125" sodipodi:rx="11.5" sodipodi:cy="968.98718" sodipodi:cx="466.5" id="path4840" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.60000002;stroke-miterlimit:4;stroke-dasharray:none" sodipodi:type="arc"/>
+            <path transform="matrix(0.72100425,0,0,0.72100425,184.31414,712.80265)" d="m 478,968.98718 c 0,6.69646 -5.14873,12.125 -11.5,12.125 -6.35127,0 -11.5,-5.42854 -11.5,-12.125 0,-6.69645 5.14873,-12.125 11.5,-12.125 6.35127,0 11.5,5.42855 11.5,12.125 z" sodipodi:ry="12.125" sodipodi:rx="11.5" sodipodi:cy="968.98718" sodipodi:cx="466.5" id="path4842" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+            <path sodipodi:type="arc" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.60000002;stroke-miterlimit:4;stroke-dasharray:none" id="path4844" sodipodi:cx="466.5" sodipodi:cy="968.98718" sodipodi:rx="11.5" sodipodi:ry="12.125" d="m 478,968.98718 c 0,6.69646 -5.14873,12.125 -11.5,12.125 -6.35127,0 -11.5,-5.42854 -11.5,-12.125 0,-6.69645 5.14873,-12.125 11.5,-12.125 6.35127,0 11.5,5.42855 11.5,12.125 z" transform="matrix(0.56714054,0,0,0.56714054,256.09156,861.89461)"/>
+            <path style="fill:#dc2128;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.28803316" d="m 525.02379,1370.2076 c -0.45865,-0.016 -0.8252,0.3428 -0.8252,0.8017 l 0,0.8016 -0.94308,-0.035 c -1.25309,-0.045 -2.2634,0.927 -2.2634,2.1809 l 0,15.6552 c 0,1.2539 1.01031,2.3003 2.2634,2.3459 l 5.84711,0.2122 c 1.25309,0.046 2.2634,-0.927 2.2634,-2.1809 l 0,-15.6552 c 0,-1.2539 -1.01031,-2.3003 -2.2634,-2.3459 l -0.94308,-0.035 0,-0.8017 c 0,-0.4589 -0.36655,-0.8445 -0.8252,-0.8605 l -2.31055,-0.083 z m -3.54835,5.022 9.17148,0.3654 c 0.13946,0.01 0.24756,0.1169 0.24756,0.2476 0,0.1306 -0.1081,0.2294 -0.24756,0.224 l -9.17148,-0.3655 c -0.13946,-0.01 -0.24756,-0.1052 -0.24756,-0.2358 0,-0.1306 0.1081,-0.2412 0.24756,-0.2357 z m 0,4.3381 9.17148,0.3655 c 0.13946,0.01 0.24756,0.1169 0.24756,0.2475 0,0.1307 -0.1081,0.2295 -0.24756,0.224 l -9.17148,-0.3654 c -0.13946,-0.01 -0.24756,-0.1052 -0.24756,-0.2358 0,-0.1306 0.1081,-0.2412 0.24756,-0.2358 z m 0,4.4561 9.17148,0.3183 c 0.13946,0 0.24756,0.1169 0.24756,0.2476 0,0.1306 -0.1081,0.2287 -0.24756,0.2239 l -9.17148,-0.3183 c -0.13946,0 -0.24756,-0.1051 -0.24756,-0.2357 0,-0.1306 0.1081,-0.2406 0.24756,-0.2358 z m 0,4.3382 9.17148,0.3183 c 0.13946,0 0.24756,0.1169 0.24756,0.2475 0,0.1306 -0.1081,0.2288 -0.24756,0.224 l -9.17148,-0.3183 c -0.13946,0 -0.24756,-0.1051 -0.24756,-0.2357 0,-0.1307 0.1081,-0.2406 0.24756,-0.2358 z" id="rect4864" inkscape:connector-curvature="0"/>
+            <path style="fill:#dc2128;fill-opacity:1;stroke:#000000;stroke-width:0.17335254px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 515.9096,1374.0762 0,2.1992 3.09191,0.1644 0.0202,0.7515 -3.11208,-0.131 0,1.0989 -1.27815,-0.068 -0.20302,-0.6398 -3.34323,-1.7799 0,-1.1192 3.51224,-1.4965 0.26114,-0.7951 1.05102,0.056 0,1.028 3.13083,0.1728 -0.003,0.7362 -3.12786,-0.1775" id="path4891" inkscape:path-effect="#path-effect4893" inkscape:original-d="m 515.9096,1374.0762 0,2.1992 3.09191,0.1644 0.0202,0.7515 -3.11208,-0.131 0,1.0989 -1.27815,-0.068 -0.20302,-0.6398 -3.34323,-1.7799 0,-1.1192 3.51224,-1.4965 0.26114,-0.7951 1.05102,0.056 0,1.028 3.13083,0.1728 -0.003,0.7362 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+            <path style="fill:#dc2128;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 519.93248,1407.1871 0,5.0866 1.27606,0 0,-5.0866 -1.27606,0 z m -0.77983,1.3293 c -1.31037,0.5543 -2.23311,1.8552 -2.23311,3.3674 0,2.0165 1.63459,3.6509 3.65098,3.6509 2.01637,0 3.65096,-1.6344 3.65096,-3.6509 0,-1.4982 -0.90663,-2.787 -2.19767,-3.3497 l -0.26584,1.223 c 0.74905,0.418 1.25834,1.2079 1.25834,2.1267 0,1.3507 -1.09503,2.4459 -2.44579,2.4459 -1.35078,0 -2.44581,-1.0952 -2.44581,-2.4459 0,-0.9386 0.53571,-1.7345 1.31152,-2.1445 l -0.28358,-1.2229 z" id="path5884" inkscape:connector-curvature="0"/>
+            <path style="fill:#dc2128;fill-opacity:1;stroke:none" d="m 520.68788,1433.5042 -2.15554,0 0,2.5063 2.00515,0 1.77957,1.7796 0,-5.7899 -1.62918,1.504" id="path5901-8" inkscape:path-effect="#path-effect5903-8" inkscape:original-d="m 520.68788,1433.5042 -2.15554,0 0,2.5063 2.00515,0 1.77957,1.7796 0,-5.7899 z" inkscape:connector-curvature="0"/>
+            <path style="fill:none;stroke:#000000;stroke-width:0.56714058px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 516.22644,1438.0658 9.27378,0.1496" id="path5905-1" inkscape:path-effect="#path-effect5907-5" inkscape:original-d="m 516.22644,1438.0658 9.27378,0.1496" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+            <rect style="fill:none;stroke:#dc2128;stroke-width:0.56717902;stroke-opacity:1" id="rect5909-2" width="5.5148969" height="3.6092603" x="517.90082" y="1430.6361" transform="matrix(0.99986413,0.01648394,0,1,0,0)"/>
+            <rect y="1439.6442" x="519.15833" height="1.612592" width="3.0652895" id="rect5911-1" style="fill:#dc2128;fill-opacity:1;stroke:none"/>
           </g>
-          <rect
-             transform="matrix(0.92739254,0,0,0.92739254,486.32319,1361.4762)"
-             y="-32.714287"
-             x="-7.1428571"
-             height="3.5714285"
-             width="127.85714"
-             id="rect3085"
-             style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+          <rect transform="matrix(0.92739254,0,0,0.92739254,486.32319,1361.4762)" y="-32.714287" x="-7.1428571" height="3.5714285" width="127.85714" id="rect3085" style="opacity:0;fill:#a7aab1;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
         </g>
       </g>
     </g>
diff --git a/misc/images/svg/elements/UPS_rackmountable_2D.svg b/misc/images/svg/elements/UPS_rackmountable_2D.svg
index 60f3c7af50c..b00c0d458e2 100644
--- a/misc/images/svg/elements/UPS_rackmountable_2D.svg
+++ b/misc/images/svg/elements/UPS_rackmountable_2D.svg
@@ -1,736 +1,163 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.00916"
-   height="26.211397"
-   id="svg160059"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 66">
-  <defs
-     id="defs160061">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient86123-9"
-       id="linearGradient101177"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0714114,0,0,0.97379444,-562.6901,7221.5145)"
-       x1="845.4054"
-       y1="755.81116"
-       x2="1014.6011"
-       y2="733.34076" />
-    <linearGradient
-       id="linearGradient86123-9">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop86125-4" />
-      <stop
-         id="stop86127-8"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop86129-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101179"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,10.159023)"
-       x1="438.18936"
-       y1="7934.2939"
-       x2="456.08151"
-       y2="7934.6001" />
-    <linearGradient
-       id="linearGradient6446-6">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6448-7" />
-      <stop
-         id="stop6450-4"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop6452-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101181"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,12.580272)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159899">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159901" />
-      <stop
-         id="stop159903"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159905" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101183"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,5.3157985)"
-       x1="438.18936"
-       y1="7934.2939"
-       x2="456.08151"
-       y2="7934.6001" />
-    <linearGradient
-       id="linearGradient159908">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159910" />
-      <stop
-         id="stop159912"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159914" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101185"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,7.7370925)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159917">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159919" />
-      <stop
-         id="stop159921"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159923" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,2.8945186)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159926">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159928" />
-      <stop
-         id="stop159930"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159932" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter6993-4">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25763391"
-         id="feGaussianBlur6995-0" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.00916" height="26.211397" id="svg160059" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 66">
+  <defs id="defs160061">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient86123-9" id="linearGradient101177" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0714114,0,0,0.97379444,-562.6901,7221.5145)" x1="845.4054" y1="755.81116" x2="1014.6011" y2="733.34076"/>
+    <linearGradient id="linearGradient86123-9">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop86125-4"/>
+      <stop id="stop86127-8" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop86129-8"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101179" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,10.159023)" x1="438.18936" y1="7934.2939" x2="456.08151" y2="7934.6001"/>
+    <linearGradient id="linearGradient6446-6">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6448-7"/>
+      <stop id="stop6450-4" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop6452-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101181" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,12.580272)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159899">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159901"/>
+      <stop id="stop159903" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159905"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101183" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,5.3157985)" x1="438.18936" y1="7934.2939" x2="456.08151" y2="7934.6001"/>
+    <linearGradient id="linearGradient159908">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159910"/>
+      <stop id="stop159912" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159914"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101185" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,7.7370925)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159917">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159919"/>
+      <stop id="stop159921" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159923"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101187" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,2.8945186)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159926">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159928"/>
+      <stop id="stop159930" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159932"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter6993-4">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.25763391" id="feGaussianBlur6995-0"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4929-4"
-       id="linearGradient101189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8604269,0,0,1.9433017,-260.0827,-7498.1469)"
-       x1="375.59125"
-       y1="7950.7256"
-       x2="376.15009"
-       y2="7941.2324" />
-    <linearGradient
-       id="linearGradient4929-4">
-      <stop
-         id="stop4931-8"
-         offset="0"
-         style="stop-color:#e6e6e6;stop-opacity:1;" />
-      <stop
-         id="stop4933-6"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,0.47312767)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159941">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159943" />
-      <stop
-         id="stop159945"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159947" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101193"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,15.001677)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159950">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159952" />
-      <stop
-         id="stop159954"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159956" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5873-2-4-7-4-3"
-       x="-0.10375404"
-       width="1.2075081"
-       y="-0.14227811"
-       height="1.2845562">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.5708651"
-         id="feGaussianBlur5875-7-9-8-8-9" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4929-4" id="linearGradient101189" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.8604269,0,0,1.9433017,-260.0827,-7498.1469)" x1="375.59125" y1="7950.7256" x2="376.15009" y2="7941.2324"/>
+    <linearGradient id="linearGradient4929-4">
+      <stop id="stop4931-8" offset="0" style="stop-color:#e6e6e6;stop-opacity:1;"/>
+      <stop id="stop4933-6" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101191" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,0.47312767)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159941">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159943"/>
+      <stop id="stop159945" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159947"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101193" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,15.001677)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159950">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159952"/>
+      <stop id="stop159954" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159956"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5873-2-4-7-4-3" x="-0.10375404" width="1.2075081" y="-0.14227811" height="1.2845562">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="2.5708651" id="feGaussianBlur5875-7-9-8-8-9"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5287-17-8"
-       id="linearGradient101195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22951748,0,0,0.25373864,272.02689,7822.8441)"
-       x1="440"
-       y1="473.86218"
-       x2="441"
-       y2="532.36218" />
-    <linearGradient
-       id="linearGradient5287-17-8">
-      <stop
-         style="stop-color:#ffd27a;stop-opacity:1;"
-         offset="0"
-         id="stop5289-30-6" />
-      <stop
-         style="stop-color:#ffb912;stop-opacity:1;"
-         offset="1"
-         id="stop5291-04-4" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6953-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6965-5"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101197"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,-1.9481033)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159967">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159969" />
-      <stop
-         id="stop159971"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159973" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient101199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,17.423226)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159976">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159978" />
-      <stop
-         id="stop159980"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159982" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6762-1-5"
-       id="radialGradient101201"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(9.5392139,0.49335527,-0.05304687,1.1190974,-7888.9153,6679.3161)"
-       cx="878.66486"
-       cy="747.02252"
-       fx="878.66486"
-       fy="747.02252"
-       r="8.140625" />
-    <linearGradient
-       id="linearGradient6762-1-5">
-      <stop
-         style="stop-color:#016f1b;stop-opacity:1;"
-         offset="0"
-         id="stop6764-9-0" />
-      <stop
-         id="stop6770-8-8"
-         offset="0.5"
-         style="stop-color:#31cb4d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#09991b;stop-opacity:1;"
-         offset="1"
-         id="stop6766-6-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-1-5-8-5"
-       id="linearGradient101203"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.673611,0,0,1.9433017,-578.9174,-7498.1469)"
-       x1="391.64554"
-       y1="7946.6997"
-       x2="392.62979"
-       y2="7946.6143" />
-    <linearGradient
-       id="linearGradient48206-5-1-5-8-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-4-7-3-0" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-9-7-2-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-7-2-9"
-       id="linearGradient101205"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481408,0,0,1.8928759,-1348.459,6538.8495)"
-       x1="887.84375"
-       y1="743.03125"
-       x2="888.44055"
-       y2="745.89954" />
-    <linearGradient
-       id="linearGradient4781-3-7-2-9">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2-2-4" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5-5-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4929-4"
-       id="linearGradient101207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1027027,0,0,1.9433017,-355.03776,-7498.1469)"
-       x1="392.87219"
-       y1="7946.3711"
-       x2="393.55365"
-       y2="7944.6973" />
-    <linearGradient
-       id="linearGradient159998">
-      <stop
-         id="stop160000"
-         offset="0"
-         style="stop-color:#e6e6e6;stop-opacity:1;" />
-      <stop
-         id="stop160002"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9341"
-       id="linearGradient101209"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.97405146,0,0,0.97405146,-555.69167,7138.344)"
-       x1="1035.7803"
-       y1="827.69031"
-       x2="1038.0626"
-       y2="827.69031" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9341">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9343" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop9345" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect101219"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9341"
-       id="linearGradient101211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.68158099,-1.9481029)"
-       x1="460.32245"
-       y1="7946.5049"
-       x2="462.54556"
-       y2="7946.5049" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect101217"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9341"
-       id="linearGradient101213"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.68158099,-1.9481029)"
-       x1="444.73764"
-       y1="7946.5049"
-       x2="446.96075"
-       y2="7946.5049" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect101215"
-       effect="spiro" />
-    <linearGradient
-       y2="7946.5049"
-       x2="446.96075"
-       y1="7946.5049"
-       x1="444.73764"
-       gradientTransform="translate(0.68158099,-1.9481029)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient160057"
-       xlink:href="#linearGradient9341"
-       inkscape:collect="always" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5287-17-8" id="linearGradient101195" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22951748,0,0,0.25373864,272.02689,7822.8441)" x1="440" y1="473.86218" x2="441" y2="532.36218"/>
+    <linearGradient id="linearGradient5287-17-8">
+      <stop style="stop-color:#ffd27a;stop-opacity:1;" offset="0" id="stop5289-30-6"/>
+      <stop style="stop-color:#ffb912;stop-opacity:1;" offset="1" id="stop5291-04-4"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6953-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6965-5" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101197" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,-1.9481033)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159967">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159969"/>
+      <stop id="stop159971" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159973"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient101199" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,17.423226)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159976">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159978"/>
+      <stop id="stop159980" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159982"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6762-1-5" id="radialGradient101201" gradientUnits="userSpaceOnUse" gradientTransform="matrix(9.5392139,0.49335527,-0.05304687,1.1190974,-7888.9153,6679.3161)" cx="878.66486" cy="747.02252" fx="878.66486" fy="747.02252" r="8.140625"/>
+    <linearGradient id="linearGradient6762-1-5">
+      <stop style="stop-color:#016f1b;stop-opacity:1;" offset="0" id="stop6764-9-0"/>
+      <stop id="stop6770-8-8" offset="0.5" style="stop-color:#31cb4d;stop-opacity:1;"/>
+      <stop style="stop-color:#09991b;stop-opacity:1;" offset="1" id="stop6766-6-7"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-1-5-8-5" id="linearGradient101203" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.673611,0,0,1.9433017,-578.9174,-7498.1469)" x1="391.64554" y1="7946.6997" x2="392.62979" y2="7946.6143"/>
+    <linearGradient id="linearGradient48206-5-1-5-8-5">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-4-7-3-0"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-9-7-2-9"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-7-2-9" id="linearGradient101205" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.0481408,0,0,1.8928759,-1348.459,6538.8495)" x1="887.84375" y1="743.03125" x2="888.44055" y2="745.89954"/>
+    <linearGradient id="linearGradient4781-3-7-2-9">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2-2-4"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5-5-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4929-4" id="linearGradient101207" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.1027027,0,0,1.9433017,-355.03776,-7498.1469)" x1="392.87219" y1="7946.3711" x2="393.55365" y2="7944.6973"/>
+    <linearGradient id="linearGradient159998">
+      <stop id="stop160000" offset="0" style="stop-color:#e6e6e6;stop-opacity:1;"/>
+      <stop id="stop160002" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9341" id="linearGradient101209" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.97405146,0,0,0.97405146,-555.69167,7138.344)" x1="1035.7803" y1="827.69031" x2="1038.0626" y2="827.69031"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9341">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop9343"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop9345"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect101219" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9341" id="linearGradient101211" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.68158099,-1.9481029)" x1="460.32245" y1="7946.5049" x2="462.54556" y2="7946.5049"/>
+    <inkscape:path-effect effect="spiro" id="path-effect101217" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9341" id="linearGradient101213" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.68158099,-1.9481029)" x1="444.73764" y1="7946.5049" x2="446.96075" y2="7946.5049"/>
+    <inkscape:path-effect is_visible="true" id="path-effect101215" effect="spiro"/>
+    <linearGradient y2="7946.5049" x2="446.96075" y1="7946.5049" x1="444.73764" gradientTransform="translate(0.68158099,-1.9481029)" gradientUnits="userSpaceOnUse" id="linearGradient160057" xlink:href="#linearGradient9341" inkscape:collect="always"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-63.846228"
-     inkscape:cy="113.10375"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="22"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata160064">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-63.846228" inkscape:cy="113.10375" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="22" inkscape:window-y="29" inkscape:window-maximized="0"/>
+  <metadata id="metadata160064">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-438.84623,-619.25453)">
-    <g
-       style="display:inline"
-       id="g101107"
-       transform="matrix(1.0266398,0,0,1.0266398,70.66753,-7523.2503)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\UPS_rackmountable_2D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 365.40996,7931.7997 112.81794,0 0.004,24.3833 -112.81794,0 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.55278182;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path101112"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:url(#linearGradient101177);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.67925596;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 358.97526,7931.5476 0,4.9755 c 2.67779,1.2626 4.83761,4.0077 4.83761,7.2122 0,3.2044 -2.15982,5.9494 -4.83761,7.2121 l 0,5.4776 123.99933,0 0,-5.508 c -2.45708,-1.3416 -4.52071,-3.9903 -4.52071,-7.0297 0,-3.0393 2.05038,-5.688 4.50747,-7.0295 l 0,-5.3102 z"
-         id="path101114"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsccccsccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 435.9512,7933.9695 39.83305,0 -0.11053,20.4212 -39.83305,0 z"
-         style="fill:#111422;fill-opacity:1;stroke:#cccccc;stroke-width:0.50790304;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path101116" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 382.59899,7945.8751 51.92389,0 0,1.3776 -51.92389,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101179);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101118" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 382.59899,7948.2965 51.92389,0 0,1.3775 -51.92389,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101181);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101120" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 382.59899,7941.0324 51.92389,0 0,1.3775 -51.92389,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101183);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101122" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 382.59899,7943.4538 51.92389,0 0,1.3775 -51.92389,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101185);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101124" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 382.59899,7938.611 51.92389,0 0,1.3775 -51.92389,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101187);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101126" />
-      <g
-         style="fill:#000000;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter6993-4)"
-         transform="matrix(0,1.9978198,-1.7784467,0,14588.308,7181.4549)"
-         id="g101128">
-        <path
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 377.65692,7955.6119 0.03,0 c 0.1914,0.2964 1.9778,0.5165 4.1702,0.5165 2.1922,0 3.9787,-0.2201 4.1701,-0.5165 l 0.03,0 0,-0.678 c 0,-0.01 0,-0.026 0,-0.032 0,-0.321 -1.8807,-0.5812 -4.2006,-0.5812 -2.32,0 -4.2006,0.2602 -4.2006,0.5812 0,0.01 0,0.026 0,0.032 l 0,0.678 z"
-           id="path101130"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 377.64672,7954.9228 c 0,0.3209 1.8806,0.5811 4.2006,0.5811 2.3199,0 4.2006,-0.2602 4.2006,-0.5811 l 0,-16.2396 -8.4012,0 0,16.2396 z"
-           id="path101132"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path101134"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 381.83482,7938.1021 c 2.3199,0 4.2005,0.2602 4.2005,0.5811 0,0.321 -1.8806,0.5812 -4.2005,0.5812 -2.32,0 -4.2006,-0.2602 -4.2006,-0.5812 0,-0.3209 1.8806,-0.5811 4.2006,-0.5811 z"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 379.86872,7938.5864 c 0,0.1372 0.8042,0.2583 1.7959,0.2583 0.9916,0 1.7959,-0.1211 1.7959,-0.2583 l 0,-1.2269 -3.5918,0 0,1.2269 z"
-           id="path101136"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 381.65242,7937.1222 c 0.9916,0 1.7955,0.1112 1.7955,0.2484 0,0.1372 -0.8039,0.2484 -1.7955,0.2484 -0.9917,0 -1.7955,-0.1112 -1.7955,-0.2484 0,-0.1372 0.8038,-0.2484 1.7955,-0.2484 z"
-           id="path101138"
-           inkscape:connector-curvature="0" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-438.84623,-619.25453)">
+    <g style="display:inline" id="g101107" transform="matrix(1.0266398,0,0,1.0266398,70.66753,-7523.2503)">
+      <path inkscape:connector-curvature="0" d="m 365.40996,7931.7997 112.81794,0 0.004,24.3833 -112.81794,0 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.55278182;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path101112" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:url(#linearGradient101177);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.67925596;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 358.97526,7931.5476 0,4.9755 c 2.67779,1.2626 4.83761,4.0077 4.83761,7.2122 0,3.2044 -2.15982,5.9494 -4.83761,7.2121 l 0,5.4776 123.99933,0 0,-5.508 c -2.45708,-1.3416 -4.52071,-3.9903 -4.52071,-7.0297 0,-3.0393 2.05038,-5.688 4.50747,-7.0295 l 0,-5.3102 z" id="path101114" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsccccsccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 435.9512,7933.9695 39.83305,0 -0.11053,20.4212 -39.83305,0 z" style="fill:#111422;fill-opacity:1;stroke:#cccccc;stroke-width:0.50790304;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path101116"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 382.59899,7945.8751 51.92389,0 0,1.3776 -51.92389,0 z" style="opacity:0.8699552;fill:url(#linearGradient101179);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101118"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 382.59899,7948.2965 51.92389,0 0,1.3775 -51.92389,0 z" style="opacity:0.8699552;fill:url(#linearGradient101181);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101120"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 382.59899,7941.0324 51.92389,0 0,1.3775 -51.92389,0 z" style="opacity:0.8699552;fill:url(#linearGradient101183);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101122"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 382.59899,7943.4538 51.92389,0 0,1.3775 -51.92389,0 z" style="opacity:0.8699552;fill:url(#linearGradient101185);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101124"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 382.59899,7938.611 51.92389,0 0,1.3775 -51.92389,0 z" style="opacity:0.8699552;fill:url(#linearGradient101187);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101126"/>
+      <g style="fill:#000000;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter6993-4)" transform="matrix(0,1.9978198,-1.7784467,0,14588.308,7181.4549)" id="g101128">
+        <path style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" d="m 377.65692,7955.6119 0.03,0 c 0.1914,0.2964 1.9778,0.5165 4.1702,0.5165 2.1922,0 3.9787,-0.2201 4.1701,-0.5165 l 0.03,0 0,-0.678 c 0,-0.01 0,-0.026 0,-0.032 0,-0.321 -1.8807,-0.5812 -4.2006,-0.5812 -2.32,0 -4.2006,0.2602 -4.2006,0.5812 0,0.01 0,0.026 0,0.032 l 0,0.678 z" id="path101130" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" d="m 377.64672,7954.9228 c 0,0.3209 1.8806,0.5811 4.2006,0.5811 2.3199,0 4.2006,-0.2602 4.2006,-0.5811 l 0,-16.2396 -8.4012,0 0,16.2396 z" id="path101132" inkscape:connector-curvature="0"/>
+        <path id="path101134" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" d="m 381.83482,7938.1021 c 2.3199,0 4.2005,0.2602 4.2005,0.5811 0,0.321 -1.8806,0.5812 -4.2005,0.5812 -2.32,0 -4.2006,-0.2602 -4.2006,-0.5812 0,-0.3209 1.8806,-0.5811 4.2006,-0.5811 z" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" d="m 379.86872,7938.5864 c 0,0.1372 0.8042,0.2583 1.7959,0.2583 0.9916,0 1.7959,-0.1211 1.7959,-0.2583 l 0,-1.2269 -3.5918,0 0,1.2269 z" id="path101136" inkscape:connector-curvature="0"/>
+        <path style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" d="m 381.65242,7937.1222 c 0.9916,0 1.7955,0.1112 1.7955,0.2484 0,0.1372 -0.8039,0.2484 -1.7955,0.2484 -0.9917,0 -1.7955,-0.1112 -1.7955,-0.2484 0,-0.1372 0.8038,-0.2484 1.7955,-0.2484 z" id="path101138" inkscape:connector-curvature="0"/>
       </g>
-      <path
-         sodipodi:nodetypes="ccsccssssscc"
-         style="fill:url(#linearGradient101189);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.13221817;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 439.66351,7936.4033 0,0.058 c -0.51989,0.372 -1.39299,3.8435 -1.39299,8.1039 0,4.2602 0.8731,7.7318 1.39299,8.1038 l 0,0.058 1.18923,0 c 0.0176,0 0.0456,0 0.0561,0 0.56305,0 1.01945,-3.6548 1.01945,-8.1631 0,-4.5085 -0.4564,-8.1631 -1.01945,-8.1631 -0.0175,0 -0.0456,0 -0.0561,0 l -1.18923,0 z"
-         id="path101140"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 367.18802,7936.1896 67.33486,0 0,1.3775 -67.33486,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101191);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101142" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 367.18802,7950.7179 67.33486,0 0,1.3775 -67.33486,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101193);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101144" />
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\notification.png"
-         transform="matrix(0.25373864,0,0,0.25373864,261.23245,7822.8439)"
-         id="path101146"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5873-2-4-7-4-3)"
-         d="m 417.27208,495.58948 26.89545,-38.18376 c 0.82778,-1.17521 2.1606,-1.17521 2.98838,0 l 26.89546,38.18376 c 2.32414,3.29961 1.17066,4.24016 0,4.24264 l -26.89545,0.057 c -1.17066,0.002 -1.81773,0.002 -2.98839,0 l -26.89545,-0.057 c -1.17066,-0.002 -2.32414,-0.94303 0,-4.24264 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss" />
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\notification.png"
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 367.79812,7948.5944 6.17297,-9.6888 c 0.18999,-0.2981 0.49591,-0.2981 0.68591,0 l 6.17298,9.6888 c 0.53341,0.8372 0.26868,1.0758 0,1.0764 l -6.17298,0.014 c -0.26869,2e-4 -0.41722,2e-4 -0.68591,0 l -6.17297,-0.014 c -0.26868,-2e-4 -0.53343,-0.2392 0,-1.0764 z"
-         style="fill:url(#linearGradient101195);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101148" />
-      <g
-         id="g101150"
-         transform="matrix(1.1830105,0,0,1.1830105,-66.724357,-1448.0105)">
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 373.07183,7936.948 -2.09297,3.1698 3.66271,0 -2.22379,2.5661"
-           inkscape:path-effect="#path-effect6953-5"
-           id="path101152"
-           d="m 373.07183,7936.948 -2.09297,3.1698 3.66271,0 -2.22379,2.5661"
-           style="fill:none;stroke:#000000;stroke-width:0.5620749px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 373.84646,7942.6245 -1.45787,0.014 -0.2513,-1.2747"
-           inkscape:path-effect="#path-effect6965-5"
-           id="path101154"
-           d="m 373.84646,7942.6245 -1.45787,0.014 -0.2513,-1.2747"
-           style="fill:none;stroke:#000000;stroke-width:0.47424683px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:nodetypes="ccc" />
+      <path sodipodi:nodetypes="ccsccssssscc" style="fill:url(#linearGradient101189);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.13221817;stroke-miterlimit:4;stroke-dasharray:none" d="m 439.66351,7936.4033 0,0.058 c -0.51989,0.372 -1.39299,3.8435 -1.39299,8.1039 0,4.2602 0.8731,7.7318 1.39299,8.1038 l 0,0.058 1.18923,0 c 0.0176,0 0.0456,0 0.0561,0 0.56305,0 1.01945,-3.6548 1.01945,-8.1631 0,-4.5085 -0.4564,-8.1631 -1.01945,-8.1631 -0.0175,0 -0.0456,0 -0.0561,0 l -1.18923,0 z" id="path101140" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 367.18802,7936.1896 67.33486,0 0,1.3775 -67.33486,0 z" style="opacity:0.8699552;fill:url(#linearGradient101191);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101142"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 367.18802,7950.7179 67.33486,0 0,1.3775 -67.33486,0 z" style="opacity:0.8699552;fill:url(#linearGradient101193);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101144"/>
+      <path transform="matrix(0.25373864,0,0,0.25373864,261.23245,7822.8439)" id="path101146" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5873-2-4-7-4-3)" d="m 417.27208,495.58948 26.89545,-38.18376 c 0.82778,-1.17521 2.1606,-1.17521 2.98838,0 l 26.89546,38.18376 c 2.32414,3.29961 1.17066,4.24016 0,4.24264 l -26.89545,0.057 c -1.17066,0.002 -1.81773,0.002 -2.98839,0 l -26.89545,-0.057 c -1.17066,-0.002 -2.32414,-0.94303 0,-4.24264 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 367.79812,7948.5944 6.17297,-9.6888 c 0.18999,-0.2981 0.49591,-0.2981 0.68591,0 l 6.17298,9.6888 c 0.53341,0.8372 0.26868,1.0758 0,1.0764 l -6.17298,0.014 c -0.26869,2e-4 -0.41722,2e-4 -0.68591,0 l -6.17297,-0.014 c -0.26868,-2e-4 -0.53343,-0.2392 0,-1.0764 z" style="fill:url(#linearGradient101195);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101148"/>
+      <g id="g101150" transform="matrix(1.1830105,0,0,1.1830105,-66.724357,-1448.0105)">
+        <path inkscape:connector-curvature="0" inkscape:original-d="m 373.07183,7936.948 -2.09297,3.1698 3.66271,0 -2.22379,2.5661" inkscape:path-effect="#path-effect6953-5" id="path101152" d="m 373.07183,7936.948 -2.09297,3.1698 3.66271,0 -2.22379,2.5661" style="fill:none;stroke:#000000;stroke-width:0.5620749px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path inkscape:connector-curvature="0" inkscape:original-d="m 373.84646,7942.6245 -1.45787,0.014 -0.2513,-1.2747" inkscape:path-effect="#path-effect6965-5" id="path101154" d="m 373.84646,7942.6245 -1.45787,0.014 -0.2513,-1.2747" style="fill:none;stroke:#000000;stroke-width:0.47424683px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="ccc"/>
       </g>
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 367.18802,7933.7682 67.33486,0 0,1.3775 -67.33486,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101197);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101156" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 367.18802,7953.1393 67.33486,0 0,1.3775 -67.33486,0 z"
-         style="opacity:0.8699552;fill:url(#linearGradient101199);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path101158" />
-      <path
-         sodipodi:nodetypes="sssccs"
-         inkscape:connector-curvature="0"
-         id="path101160"
-         d="m 440.85623,7936.3791 c -0.56287,0 -1.41498,3.6546 -1.41498,8.163 0,4.5082 0.85211,8.1631 1.41498,8.1631 l 28.38367,0 c -0.62946,-5.7646 -0.63725,-10.9326 0,-16.3261 z"
-         style="fill:url(#radialGradient101201);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.13221818;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         id="path101162"
-         style="fill:url(#linearGradient101203);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.1585017;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 470.82188,7944.5222 c 0,4.5082 -0.65589,8.1628 -1.46479,8.1628 -0.80916,0 -1.46505,-3.6546 -1.46505,-8.1628 0,-4.5085 0.65589,-8.1631 1.46505,-8.1631 0.8089,0 1.46479,3.6546 1.46479,8.1631 z"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:url(#linearGradient101205);fill-opacity:1;fill-rule:nonzero;stroke:#f9f9f9;stroke-width:0.14056389;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 469.58584,7940.7015 c -0.27199,0 -0.51207,1.5628 -0.51207,3.4899 0,1.927 0.24008,3.4901 0.51207,3.4901 l 2.43228,0 0,-6.98 -2.43228,0 z"
-         id="path101164"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:url(#linearGradient101207);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.14056389;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 472.48856,7944.1678 c 0,1.9269 -0.22046,3.4892 -0.49245,3.4892 -0.27199,0 -0.49244,-1.5623 -0.49244,-3.4892 0,-1.9273 0.22045,-3.4893 0.49244,-3.4893 0.27199,0 0.49245,1.562 0.49245,3.4893 z"
-         id="path101166"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="csc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 455.03897,7936.4145 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914"
-         inkscape:path-effect="#path-effect101219"
-         id="path101168"
-         d="m 455.03897,7936.4145 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914"
-         style="fill:none;stroke:url(#linearGradient101209);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:url(#linearGradient101211);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 462.83137,7936.4145 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914"
-         id="path101170"
-         inkscape:path-effect="#path-effect101217"
-         inkscape:original-d="m 462.83137,7936.4145 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csc" />
-      <path
-         sodipodi:nodetypes="csc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 447.24657,7936.4145 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914"
-         inkscape:path-effect="#path-effect101215"
-         id="path101172"
-         d="m 447.24657,7936.4145 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914"
-         style="fill:none;stroke:url(#linearGradient160057);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 367.18802,7933.7682 67.33486,0 0,1.3775 -67.33486,0 z" style="opacity:0.8699552;fill:url(#linearGradient101197);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101156"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 367.18802,7953.1393 67.33486,0 0,1.3775 -67.33486,0 z" style="opacity:0.8699552;fill:url(#linearGradient101199);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path101158"/>
+      <path sodipodi:nodetypes="sssccs" inkscape:connector-curvature="0" id="path101160" d="m 440.85623,7936.3791 c -0.56287,0 -1.41498,3.6546 -1.41498,8.163 0,4.5082 0.85211,8.1631 1.41498,8.1631 l 28.38367,0 c -0.62946,-5.7646 -0.63725,-10.9326 0,-16.3261 z" style="fill:url(#radialGradient101201);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.13221818;stroke-miterlimit:4;stroke-dasharray:none"/>
+      <path id="path101162" style="fill:url(#linearGradient101203);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.1585017;stroke-miterlimit:4;stroke-dasharray:none" d="m 470.82188,7944.5222 c 0,4.5082 -0.65589,8.1628 -1.46479,8.1628 -0.80916,0 -1.46505,-3.6546 -1.46505,-8.1628 0,-4.5085 0.65589,-8.1631 1.46505,-8.1631 0.8089,0 1.46479,3.6546 1.46479,8.1631 z" inkscape:connector-curvature="0"/>
+      <path style="fill:url(#linearGradient101205);fill-opacity:1;fill-rule:nonzero;stroke:#f9f9f9;stroke-width:0.14056389;stroke-miterlimit:4;stroke-dasharray:none" d="m 469.58584,7940.7015 c -0.27199,0 -0.51207,1.5628 -0.51207,3.4899 0,1.927 0.24008,3.4901 0.51207,3.4901 l 2.43228,0 0,-6.98 -2.43228,0 z" id="path101164" inkscape:connector-curvature="0"/>
+      <path style="fill:url(#linearGradient101207);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.14056389;stroke-miterlimit:4;stroke-dasharray:none" d="m 472.48856,7944.1678 c 0,1.9269 -0.22046,3.4892 -0.49245,3.4892 -0.27199,0 -0.49244,-1.5623 -0.49244,-3.4892 0,-1.9273 0.22045,-3.4893 0.49244,-3.4893 0.27199,0 0.49245,1.562 0.49245,3.4893 z" id="path101166" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="csc" inkscape:connector-curvature="0" inkscape:original-d="m 455.03897,7936.4145 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914" inkscape:path-effect="#path-effect101219" id="path101168" d="m 455.03897,7936.4145 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914" style="fill:none;stroke:url(#linearGradient101209);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path style="fill:none;stroke:url(#linearGradient101211);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 462.83137,7936.4145 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914" id="path101170" inkscape:path-effect="#path-effect101217" inkscape:original-d="m 462.83137,7936.4145 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914" inkscape:connector-curvature="0" sodipodi:nodetypes="csc"/>
+      <path sodipodi:nodetypes="csc" inkscape:connector-curvature="0" inkscape:original-d="m 447.24657,7936.4145 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914" inkscape:path-effect="#path-effect101215" id="path101172" d="m 447.24657,7936.4145 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914" style="fill:none;stroke:url(#linearGradient160057);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/UPS_rackmountable_3D.svg b/misc/images/svg/elements/UPS_rackmountable_3D.svg
index 75d48096f2b..f882acdd2d0 100644
--- a/misc/images/svg/elements/UPS_rackmountable_3D.svg
+++ b/misc/images/svg/elements/UPS_rackmountable_3D.svg
@@ -1,768 +1,170 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.00916"
-   height="35.012245"
-   id="svg159595"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 64">
-  <defs
-     id="defs159597">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0-4-7-1-1"
-       id="linearGradient9271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0565182,0,0,1.0040725,62.692205,-10.140279)"
-       x1="407.2959"
-       y1="8015.7466"
-       x2="407.82794"
-       y2="7976.5229" />
-    <linearGradient
-       id="linearGradient42443-7-52-0-4-7-1-1">
-      <stop
-         id="stop42445-53-8-3-5-8-7-7"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-2-7-5-1-4-4" />
-      <stop
-         id="stop42449-3-19-2-1-5-0-0"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient86123-9"
-       id="linearGradient6866-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0714114,0,0,0.97379444,-562.6901,7223.4626)"
-       x1="845.4054"
-       y1="755.81116"
-       x2="1014.6011"
-       y2="733.34076" />
-    <linearGradient
-       id="linearGradient86123-9">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop86125-4" />
-      <stop
-         id="stop86127-8"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop86129-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient6484-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,12.107126)"
-       x1="438.18936"
-       y1="7934.2939"
-       x2="456.08151"
-       y2="7934.6001" />
-    <linearGradient
-       id="linearGradient6446-6">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6448-7" />
-      <stop
-         id="stop6450-4"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop6452-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient6486-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,14.528375)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159434">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159436" />
-      <stop
-         id="stop159438"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159440" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient6494-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,7.2639014)"
-       x1="438.18936"
-       y1="7934.2939"
-       x2="456.08151"
-       y2="7934.6001" />
-    <linearGradient
-       id="linearGradient159443">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159445" />
-      <stop
-         id="stop159447"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159449" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient6496-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,9.6851954)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159452">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159454" />
-      <stop
-         id="stop159456"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159458" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient6500-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,4.8426215)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159461">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159463" />
-      <stop
-         id="stop159465"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159467" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter6993-4">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25763391"
-         id="feGaussianBlur6995-0" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.00916" height="35.012245" id="svg159595" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 64">
+  <defs id="defs159597">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0-4-7-1-1" id="linearGradient9271" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0565182,0,0,1.0040725,62.692205,-10.140279)" x1="407.2959" y1="8015.7466" x2="407.82794" y2="7976.5229"/>
+    <linearGradient id="linearGradient42443-7-52-0-4-7-1-1">
+      <stop id="stop42445-53-8-3-5-8-7-7" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-2-7-5-1-4-4"/>
+      <stop id="stop42449-3-19-2-1-5-0-0" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient86123-9" id="linearGradient6866-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0714114,0,0,0.97379444,-562.6901,7223.4626)" x1="845.4054" y1="755.81116" x2="1014.6011" y2="733.34076"/>
+    <linearGradient id="linearGradient86123-9">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop86125-4"/>
+      <stop id="stop86127-8" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop86129-8"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient6484-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,12.107126)" x1="438.18936" y1="7934.2939" x2="456.08151" y2="7934.6001"/>
+    <linearGradient id="linearGradient6446-6">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6448-7"/>
+      <stop id="stop6450-4" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop6452-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient6486-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,14.528375)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159434">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159436"/>
+      <stop id="stop159438" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159440"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient6494-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,7.2639014)" x1="438.18936" y1="7934.2939" x2="456.08151" y2="7934.6001"/>
+    <linearGradient id="linearGradient159443">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159445"/>
+      <stop id="stop159447" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159449"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient6496-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,9.6851954)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159452">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159454"/>
+      <stop id="stop159456" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159458"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient6500-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,4.8426215)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159461">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159463"/>
+      <stop id="stop159465" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159467"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter6993-4">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.25763391" id="feGaussianBlur6995-0"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4929-4"
-       id="linearGradient9313"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8604269,0,0,1.9433017,-260.0827,-7496.1988)"
-       x1="375.59125"
-       y1="7950.7256"
-       x2="376.15009"
-       y2="7941.2324" />
-    <linearGradient
-       id="linearGradient4929-4">
-      <stop
-         id="stop4931-8"
-         offset="0"
-         style="stop-color:#e6e6e6;stop-opacity:1;" />
-      <stop
-         id="stop4933-6"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient6898-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,2.4212306)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159476">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159478" />
-      <stop
-         id="stop159480"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159482" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient6902-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,16.94978)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159485">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159487" />
-      <stop
-         id="stop159489"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159491" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5873-2-4-7-4-3"
-       x="-0.10375404"
-       width="1.2075081"
-       y="-0.14227811"
-       height="1.2845562">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.5708651"
-         id="feGaussianBlur5875-7-9-8-8-9" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4929-4" id="linearGradient9313" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.8604269,0,0,1.9433017,-260.0827,-7496.1988)" x1="375.59125" y1="7950.7256" x2="376.15009" y2="7941.2324"/>
+    <linearGradient id="linearGradient4929-4">
+      <stop id="stop4931-8" offset="0" style="stop-color:#e6e6e6;stop-opacity:1;"/>
+      <stop id="stop4933-6" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient6898-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,2.4212306)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159476">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159478"/>
+      <stop id="stop159480" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159482"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient6902-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,16.94978)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159485">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159487"/>
+      <stop id="stop159489" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159491"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5873-2-4-7-4-3" x="-0.10375404" width="1.2075081" y="-0.14227811" height="1.2845562">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="2.5708651" id="feGaussianBlur5875-7-9-8-8-9"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5287-17-8"
-       id="linearGradient9388"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22951748,0,0,0.25373864,272.02689,7824.7922)"
-       x1="440"
-       y1="473.86218"
-       x2="441"
-       y2="532.36218" />
-    <linearGradient
-       id="linearGradient5287-17-8">
-      <stop
-         style="stop-color:#ffd27a;stop-opacity:1;"
-         offset="0"
-         id="stop5289-30-6" />
-      <stop
-         style="stop-color:#ffb912;stop-opacity:1;"
-         offset="1"
-         id="stop5291-04-4" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6953-5"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6965-5"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient8776"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,-3.8710087e-7)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159502">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159504" />
-      <stop
-         id="stop159506"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159508" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6446-6"
-       id="linearGradient8780"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.73870267,0,0,1,93.295667,19.371329)"
-       x1="438.18936"
-       y1="7931.8833"
-       x2="456.08151"
-       y2="7932.1895" />
-    <linearGradient
-       id="linearGradient159511">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop159513" />
-      <stop
-         id="stop159515"
-         offset="0.3702293"
-         style="stop-color:#6a6a6a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop159517" />
-    </linearGradient>
-    <radialGradient
-       r="8.140625"
-       fy="747.02252"
-       fx="878.66486"
-       cy="747.02252"
-       cx="878.66486"
-       gradientTransform="matrix(9.5392139,0.49335527,-0.05304687,1.1190974,-7888.9153,6681.2642)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient8800"
-       xlink:href="#linearGradient6762-1-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6762-1-5">
-      <stop
-         style="stop-color:#016f1b;stop-opacity:1;"
-         offset="0"
-         id="stop6764-9-0" />
-      <stop
-         id="stop6770-8-8"
-         offset="0.5"
-         style="stop-color:#31cb4d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#09991b;stop-opacity:1;"
-         offset="1"
-         id="stop6766-6-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-1-5-8-5"
-       id="linearGradient9310"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.673611,0,0,1.9433017,-578.9174,-7496.1988)"
-       x1="391.64554"
-       y1="7946.6997"
-       x2="392.62979"
-       y2="7946.6143" />
-    <linearGradient
-       id="linearGradient48206-5-1-5-8-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-4-7-3-0" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-9-7-2-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4781-3-7-2-9"
-       id="linearGradient9307"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481408,0,0,1.8928759,-1348.459,6540.7976)"
-       x1="887.84375"
-       y1="743.03125"
-       x2="888.44055"
-       y2="745.89954" />
-    <linearGradient
-       id="linearGradient4781-3-7-2-9">
-      <stop
-         style="stop-color:#4e6271;stop-opacity:1;"
-         offset="0"
-         id="stop4783-2-2-4" />
-      <stop
-         style="stop-color:#b2bac0;stop-opacity:1;"
-         offset="1"
-         id="stop4785-5-5-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4929-4"
-       id="linearGradient9304"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1027027,0,0,1.9433017,-355.03776,-7496.1988)"
-       x1="392.87219"
-       y1="7946.3711"
-       x2="393.55365"
-       y2="7944.6973" />
-    <linearGradient
-       id="linearGradient159533">
-      <stop
-         id="stop159535"
-         offset="0"
-         style="stop-color:#e6e6e6;stop-opacity:1;" />
-      <stop
-         id="stop159537"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9341"
-       id="linearGradient9351"
-       x1="1035.7803"
-       y1="827.69031"
-       x2="1038.0626"
-       y2="827.69031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.97405146,0,0,0.97405146,-555.69167,7140.2921)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9341">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9343" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop9345" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9331"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9341"
-       id="linearGradient9349"
-       x1="460.32245"
-       y1="7946.5049"
-       x2="462.54556"
-       y2="7946.5049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.68158099,0)" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect9335"
-       effect="spiro" />
-    <linearGradient
-       y2="7946.5049"
-       x2="446.96075"
-       y1="7946.5049"
-       x1="444.73764"
-       gradientTransform="translate(0.68158099,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient140460"
-       xlink:href="#linearGradient9341"
-       inkscape:collect="always" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9339"
-       is_visible="true" />
-    <linearGradient
-       y2="7946.5049"
-       x2="446.96075"
-       y1="7946.5049"
-       x1="444.73764"
-       gradientTransform="translate(0.68158099,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient159593"
-       xlink:href="#linearGradient9341"
-       inkscape:collect="always" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5287-17-8" id="linearGradient9388" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22951748,0,0,0.25373864,272.02689,7824.7922)" x1="440" y1="473.86218" x2="441" y2="532.36218"/>
+    <linearGradient id="linearGradient5287-17-8">
+      <stop style="stop-color:#ffd27a;stop-opacity:1;" offset="0" id="stop5289-30-6"/>
+      <stop style="stop-color:#ffb912;stop-opacity:1;" offset="1" id="stop5291-04-4"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6953-5" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6965-5" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient8776" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,-3.8710087e-7)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159502">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159504"/>
+      <stop id="stop159506" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159508"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6446-6" id="linearGradient8780" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.73870267,0,0,1,93.295667,19.371329)" x1="438.18936" y1="7931.8833" x2="456.08151" y2="7932.1895"/>
+    <linearGradient id="linearGradient159511">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop159513"/>
+      <stop id="stop159515" offset="0.3702293" style="stop-color:#6a6a6a;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop159517"/>
+    </linearGradient>
+    <radialGradient r="8.140625" fy="747.02252" fx="878.66486" cy="747.02252" cx="878.66486" gradientTransform="matrix(9.5392139,0.49335527,-0.05304687,1.1190974,-7888.9153,6681.2642)" gradientUnits="userSpaceOnUse" id="radialGradient8800" xlink:href="#linearGradient6762-1-5" inkscape:collect="always"/>
+    <linearGradient id="linearGradient6762-1-5">
+      <stop style="stop-color:#016f1b;stop-opacity:1;" offset="0" id="stop6764-9-0"/>
+      <stop id="stop6770-8-8" offset="0.5" style="stop-color:#31cb4d;stop-opacity:1;"/>
+      <stop style="stop-color:#09991b;stop-opacity:1;" offset="1" id="stop6766-6-7"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-1-5-8-5" id="linearGradient9310" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.673611,0,0,1.9433017,-578.9174,-7496.1988)" x1="391.64554" y1="7946.6997" x2="392.62979" y2="7946.6143"/>
+    <linearGradient id="linearGradient48206-5-1-5-8-5">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-4-7-3-0"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-9-7-2-9"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4781-3-7-2-9" id="linearGradient9307" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.0481408,0,0,1.8928759,-1348.459,6540.7976)" x1="887.84375" y1="743.03125" x2="888.44055" y2="745.89954"/>
+    <linearGradient id="linearGradient4781-3-7-2-9">
+      <stop style="stop-color:#4e6271;stop-opacity:1;" offset="0" id="stop4783-2-2-4"/>
+      <stop style="stop-color:#b2bac0;stop-opacity:1;" offset="1" id="stop4785-5-5-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4929-4" id="linearGradient9304" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.1027027,0,0,1.9433017,-355.03776,-7496.1988)" x1="392.87219" y1="7946.3711" x2="393.55365" y2="7944.6973"/>
+    <linearGradient id="linearGradient159533">
+      <stop id="stop159535" offset="0" style="stop-color:#e6e6e6;stop-opacity:1;"/>
+      <stop id="stop159537" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9341" id="linearGradient9351" x1="1035.7803" y1="827.69031" x2="1038.0626" y2="827.69031" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.97405146,0,0,0.97405146,-555.69167,7140.2921)"/>
+    <linearGradient inkscape:collect="always" id="linearGradient9341">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop9343"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop9345"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect9331" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient9341" id="linearGradient9349" x1="460.32245" y1="7946.5049" x2="462.54556" y2="7946.5049" gradientUnits="userSpaceOnUse" gradientTransform="translate(0.68158099,0)"/>
+    <inkscape:path-effect is_visible="true" id="path-effect9335" effect="spiro"/>
+    <linearGradient y2="7946.5049" x2="446.96075" y1="7946.5049" x1="444.73764" gradientTransform="translate(0.68158099,0)" gradientUnits="userSpaceOnUse" id="linearGradient140460" xlink:href="#linearGradient9341" inkscape:collect="always"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9339" is_visible="true"/>
+    <linearGradient y2="7946.5049" x2="446.96075" y1="7946.5049" x1="444.73764" gradientTransform="translate(0.68158099,0)" gradientUnits="userSpaceOnUse" id="linearGradient159593" xlink:href="#linearGradient9341" inkscape:collect="always"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="81.868058"
-     inkscape:cy="-56.776457"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="154"
-     inkscape:window-y="203"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata159600">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="81.868058" inkscape:cy="-56.776457" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="154" inkscape:window-y="203" inkscape:window-maximized="0"/>
+  <metadata id="metadata159600">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-293.13194,-440.57348)">
-    <g
-       style="display:inline"
-       transform="matrix(1.0266398,0,0,1.0266398,-75.046756,-7695.1517)"
-       id="g9390"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\UPS_rackmountable_3D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         transform="translate(-83.923573,-82.979778)"
-         sodipodi:nodetypes="ccccccc"
-         id="path47635-7-3-1-9-1-5"
-         style="fill:url(#linearGradient9271);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 448.07915,8016.135 0,22.128 113.63868,0 -1e-5,-22.128 -31.05047,-8.5402 -52.48688,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path79130-5-5-0-1"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.55278182;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 365.40996,7933.7478 112.81794,0 0.004,24.3833 -112.81794,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccsccccsccc"
-         inkscape:connector-curvature="0"
-         id="path79138-8-5-8-3"
-         d="m 358.97526,7933.4957 0,4.9755 c 2.67779,1.2626 4.83761,4.0077 4.83761,7.2122 0,3.2044 -2.15982,5.9494 -4.83761,7.2121 l 0,5.4776 123.99933,0 0,-5.508 c -2.45708,-1.3416 -4.52071,-3.9903 -4.52071,-7.0297 0,-3.0393 2.05038,-5.688 4.50747,-7.0295 l 0,-5.3102 z"
-         style="fill:url(#linearGradient6866-8);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.67925596;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         id="rect88426-2-2-8"
-         style="fill:#111422;fill-opacity:1;stroke:#cccccc;stroke-width:0.50790304;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 435.9512,7935.9176 39.83305,0 -0.11053,20.4212 -39.83305,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect6480-9"
-         style="opacity:0.8699552;fill:url(#linearGradient6484-1);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 382.59899,7947.8232 51.92389,0 0,1.3776 -51.92389,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect6482-8"
-         style="opacity:0.8699552;fill:url(#linearGradient6486-8);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 382.59899,7950.2446 51.92389,0 0,1.3775 -51.92389,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect6490-3"
-         style="opacity:0.8699552;fill:url(#linearGradient6494-5);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 382.59899,7942.9805 51.92389,0 0,1.3775 -51.92389,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect6492-9"
-         style="opacity:0.8699552;fill:url(#linearGradient6496-5);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 382.59899,7945.4019 51.92389,0 0,1.3775 -51.92389,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect6498-1"
-         style="opacity:0.8699552;fill:url(#linearGradient6500-4);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 382.59899,7940.5591 51.92389,0 0,1.3775 -51.92389,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <g
-         id="g6967-9"
-         transform="matrix(0,1.9978198,-1.7784467,0,14588.308,7183.403)"
-         style="fill:#000000;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter6993-4)">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6969-7"
-           d="m 377.65692,7955.6119 0.03,0 c 0.1914,0.2964 1.9778,0.5165 4.1702,0.5165 2.1922,0 3.9787,-0.2201 4.1701,-0.5165 l 0.03,0 0,-0.678 c 0,-0.01 0,-0.026 0,-0.032 0,-0.321 -1.8807,-0.5812 -4.2006,-0.5812 -2.32,0 -4.2006,0.2602 -4.2006,0.5812 0,0.01 0,0.026 0,0.032 l 0,0.678 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path6971-4"
-           d="m 377.64672,7954.9228 c 0,0.3209 1.8806,0.5811 4.2006,0.5811 2.3199,0 4.2006,-0.2602 4.2006,-0.5811 l 0,-16.2396 -8.4012,0 0,16.2396 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 381.83482,7938.1021 c 2.3199,0 4.2005,0.2602 4.2005,0.5811 0,0.321 -1.8806,0.5812 -4.2005,0.5812 -2.32,0 -4.2006,-0.2602 -4.2006,-0.5812 0,-0.3209 1.8806,-0.5811 4.2006,-0.5811 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"
-           id="path6973-4" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path6975-5"
-           d="m 379.86872,7938.5864 c 0,0.1372 0.8042,0.2583 1.7959,0.2583 0.9916,0 1.7959,-0.1211 1.7959,-0.2583 l 0,-1.2269 -3.5918,0 0,1.2269 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path6977-2"
-           d="m 381.65242,7937.1222 c 0.9916,0 1.7955,0.1112 1.7955,0.2484 0,0.1372 -0.8039,0.2484 -1.7955,0.2484 -0.9917,0 -1.7955,-0.1112 -1.7955,-0.2484 0,-0.1372 0.8038,-0.2484 1.7955,-0.2484 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-293.13194,-440.57348)">
+    <g style="display:inline" transform="matrix(1.0266398,0,0,1.0266398,-75.046756,-7695.1517)" id="g9390">
+      <path transform="translate(-83.923573,-82.979778)" sodipodi:nodetypes="ccccccc" id="path47635-7-3-1-9-1-5" style="fill:url(#linearGradient9271);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 448.07915,8016.135 0,22.128 113.63868,0 -1e-5,-22.128 -31.05047,-8.5402 -52.48688,0 z" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path79130-5-5-0-1" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.55278182;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 365.40996,7933.7478 112.81794,0 0.004,24.3833 -112.81794,0 z" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccsccccsccc" inkscape:connector-curvature="0" id="path79138-8-5-8-3" d="m 358.97526,7933.4957 0,4.9755 c 2.67779,1.2626 4.83761,4.0077 4.83761,7.2122 0,3.2044 -2.15982,5.9494 -4.83761,7.2121 l 0,5.4776 123.99933,0 0,-5.508 c -2.45708,-1.3416 -4.52071,-3.9903 -4.52071,-7.0297 0,-3.0393 2.05038,-5.688 4.50747,-7.0295 l 0,-5.3102 z" style="fill:url(#linearGradient6866-8);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.67925596;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path id="rect88426-2-2-8" style="fill:#111422;fill-opacity:1;stroke:#cccccc;stroke-width:0.50790304;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 435.9512,7935.9176 39.83305,0 -0.11053,20.4212 -39.83305,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect6480-9" style="opacity:0.8699552;fill:url(#linearGradient6484-1);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 382.59899,7947.8232 51.92389,0 0,1.3776 -51.92389,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect6482-8" style="opacity:0.8699552;fill:url(#linearGradient6486-8);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 382.59899,7950.2446 51.92389,0 0,1.3775 -51.92389,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect6490-3" style="opacity:0.8699552;fill:url(#linearGradient6494-5);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 382.59899,7942.9805 51.92389,0 0,1.3775 -51.92389,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect6492-9" style="opacity:0.8699552;fill:url(#linearGradient6496-5);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 382.59899,7945.4019 51.92389,0 0,1.3775 -51.92389,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect6498-1" style="opacity:0.8699552;fill:url(#linearGradient6500-4);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 382.59899,7940.5591 51.92389,0 0,1.3775 -51.92389,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <g id="g6967-9" transform="matrix(0,1.9978198,-1.7784467,0,14588.308,7183.403)" style="fill:#000000;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none;filter:url(#filter6993-4)">
+        <path inkscape:connector-curvature="0" id="path6969-7" d="m 377.65692,7955.6119 0.03,0 c 0.1914,0.2964 1.9778,0.5165 4.1702,0.5165 2.1922,0 3.9787,-0.2201 4.1701,-0.5165 l 0.03,0 0,-0.678 c 0,-0.01 0,-0.026 0,-0.032 0,-0.321 -1.8807,-0.5812 -4.2006,-0.5812 -2.32,0 -4.2006,0.2602 -4.2006,0.5812 0,0.01 0,0.026 0,0.032 l 0,0.678 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"/>
+        <path inkscape:connector-curvature="0" id="path6971-4" d="m 377.64672,7954.9228 c 0,0.3209 1.8806,0.5811 4.2006,0.5811 2.3199,0 4.2006,-0.2602 4.2006,-0.5811 l 0,-16.2396 -8.4012,0 0,16.2396 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"/>
+        <path inkscape:connector-curvature="0" d="m 381.83482,7938.1021 c 2.3199,0 4.2005,0.2602 4.2005,0.5811 0,0.321 -1.8806,0.5812 -4.2005,0.5812 -2.32,0 -4.2006,-0.2602 -4.2006,-0.5812 0,-0.3209 1.8806,-0.5811 4.2006,-0.5811 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none" id="path6973-4"/>
+        <path inkscape:connector-curvature="0" id="path6975-5" d="m 379.86872,7938.5864 c 0,0.1372 0.8042,0.2583 1.7959,0.2583 0.9916,0 1.7959,-0.1211 1.7959,-0.2583 l 0,-1.2269 -3.5918,0 0,1.2269 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"/>
+        <path inkscape:connector-curvature="0" id="path6977-2" d="m 381.65242,7937.1222 c 0.9916,0 1.7955,0.1112 1.7955,0.2484 0,0.1372 -0.8039,0.2484 -1.7955,0.2484 -0.9917,0 -1.7955,-0.1112 -1.7955,-0.2484 0,-0.1372 0.8038,-0.2484 1.7955,-0.2484 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.07161465;stroke-miterlimit:4;stroke-dasharray:none"/>
       </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="path6772-3"
-         d="m 439.66351,7938.3514 0,0.058 c -0.51989,0.372 -1.39299,3.8435 -1.39299,8.1039 0,4.2602 0.8731,7.7318 1.39299,8.1038 l 0,0.058 1.18923,0 c 0.0176,0 0.0456,0 0.0561,0 0.56305,0 1.01945,-3.6548 1.01945,-8.1631 0,-4.5085 -0.4564,-8.1631 -1.01945,-8.1631 -0.0175,0 -0.0456,0 -0.0561,0 l -1.18923,0 z"
-         style="fill:url(#linearGradient9313);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.13221817;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:nodetypes="ccsccssssscc" />
-      <path
-         id="rect6896-5"
-         style="opacity:0.8699552;fill:url(#linearGradient6898-8);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 367.18802,7938.1377 67.33486,0 0,1.3775 -67.33486,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect6900-9"
-         style="opacity:0.8699552;fill:url(#linearGradient6902-0);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 367.18802,7952.666 67.33486,0 0,1.3775 -67.33486,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 417.27208,495.58948 26.89545,-38.18376 c 0.82778,-1.17521 2.1606,-1.17521 2.98838,0 l 26.89546,38.18376 c 2.32414,3.29961 1.17066,4.24016 0,4.24264 l -26.89545,0.057 c -1.17066,0.002 -1.81773,0.002 -2.98839,0 l -26.89545,-0.057 c -1.17066,-0.002 -2.32414,-0.94303 0,-4.24264 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5873-2-4-7-4-3)"
-         id="path5871-9-5-7-5-1"
-         transform="matrix(0.25373864,0,0,0.25373864,261.23245,7824.792)"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\notification.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-      <path
-         id="rect5861-0-4-3-4-1"
-         style="fill:url(#linearGradient9388);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 367.79812,7950.5425 6.17297,-9.6888 c 0.18999,-0.2981 0.49591,-0.2981 0.68591,0 l 6.17298,9.6888 c 0.53341,0.8372 0.26868,1.0758 0,1.0764 l -6.17298,0.014 c -0.26869,2e-4 -0.41722,2e-4 -0.68591,0 l -6.17297,-0.014 c -0.26868,-2e-4 -0.53343,-0.2392 0,-1.0764 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\notification.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-      <g
-         transform="matrix(1.1830105,0,0,1.1830105,-66.724357,-1446.0624)"
-         id="g6997-1">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.5620749px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 373.07183,7936.948 -2.09297,3.1698 3.66271,0 -2.22379,2.5661"
-           id="path6951-4"
-           inkscape:path-effect="#path-effect6953-5"
-           inkscape:original-d="m 373.07183,7936.948 -2.09297,3.1698 3.66271,0 -2.22379,2.5661"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="ccc"
-           style="fill:none;stroke:#000000;stroke-width:0.47424683px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 373.84646,7942.6245 -1.45787,0.014 -0.2513,-1.2747"
-           id="path6963-3"
-           inkscape:path-effect="#path-effect6965-5"
-           inkscape:original-d="m 373.84646,7942.6245 -1.45787,0.014 -0.2513,-1.2747"
-           inkscape:connector-curvature="0" />
+      <path inkscape:connector-curvature="0" id="path6772-3" d="m 439.66351,7938.3514 0,0.058 c -0.51989,0.372 -1.39299,3.8435 -1.39299,8.1039 0,4.2602 0.8731,7.7318 1.39299,8.1038 l 0,0.058 1.18923,0 c 0.0176,0 0.0456,0 0.0561,0 0.56305,0 1.01945,-3.6548 1.01945,-8.1631 0,-4.5085 -0.4564,-8.1631 -1.01945,-8.1631 -0.0175,0 -0.0456,0 -0.0561,0 l -1.18923,0 z" style="fill:url(#linearGradient9313);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.13221817;stroke-miterlimit:4;stroke-dasharray:none" sodipodi:nodetypes="ccsccssssscc"/>
+      <path id="rect6896-5" style="opacity:0.8699552;fill:url(#linearGradient6898-8);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 367.18802,7938.1377 67.33486,0 0,1.3775 -67.33486,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect6900-9" style="opacity:0.8699552;fill:url(#linearGradient6902-0);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 367.18802,7952.666 67.33486,0 0,1.3775 -67.33486,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 417.27208,495.58948 26.89545,-38.18376 c 0.82778,-1.17521 2.1606,-1.17521 2.98838,0 l 26.89546,38.18376 c 2.32414,3.29961 1.17066,4.24016 0,4.24264 l -26.89545,0.057 c -1.17066,0.002 -1.81773,0.002 -2.98839,0 l -26.89545,-0.057 c -1.17066,-0.002 -2.32414,-0.94303 0,-4.24264 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5873-2-4-7-4-3)" id="path5871-9-5-7-5-1" transform="matrix(0.25373864,0,0,0.25373864,261.23245,7824.792)"/>
+      <path id="rect5861-0-4-3-4-1" style="fill:url(#linearGradient9388);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 367.79812,7950.5425 6.17297,-9.6888 c 0.18999,-0.2981 0.49591,-0.2981 0.68591,0 l 6.17298,9.6888 c 0.53341,0.8372 0.26868,1.0758 0,1.0764 l -6.17298,0.014 c -0.26869,2e-4 -0.41722,2e-4 -0.68591,0 l -6.17297,-0.014 c -0.26868,-2e-4 -0.53343,-0.2392 0,-1.0764 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+      <g transform="matrix(1.1830105,0,0,1.1830105,-66.724357,-1446.0624)" id="g6997-1">
+        <path style="fill:none;stroke:#000000;stroke-width:0.5620749px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 373.07183,7936.948 -2.09297,3.1698 3.66271,0 -2.22379,2.5661" id="path6951-4" inkscape:path-effect="#path-effect6953-5" inkscape:original-d="m 373.07183,7936.948 -2.09297,3.1698 3.66271,0 -2.22379,2.5661" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccc" style="fill:none;stroke:#000000;stroke-width:0.47424683px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 373.84646,7942.6245 -1.45787,0.014 -0.2513,-1.2747" id="path6963-3" inkscape:path-effect="#path-effect6965-5" inkscape:original-d="m 373.84646,7942.6245 -1.45787,0.014 -0.2513,-1.2747" inkscape:connector-curvature="0"/>
       </g>
-      <path
-         id="rect8774"
-         style="opacity:0.8699552;fill:url(#linearGradient8776);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 367.18802,7935.7163 67.33486,0 0,1.3775 -67.33486,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="rect8778"
-         style="opacity:0.8699552;fill:url(#linearGradient8780);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 367.18802,7955.0874 67.33486,0 0,1.3775 -67.33486,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:url(#radialGradient8800);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.13221818;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 440.85623,7938.3272 c -0.56287,0 -1.41498,3.6546 -1.41498,8.163 0,4.5082 0.85211,8.1631 1.41498,8.1631 l 28.38367,0 c -0.62946,-5.7646 -0.63725,-10.9326 0,-16.3261 z"
-         id="path6734-2-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssccs" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 470.82188,7946.4703 c 0,4.5082 -0.65589,8.1628 -1.46479,8.1628 -0.80916,0 -1.46505,-3.6546 -1.46505,-8.1628 0,-4.5085 0.65589,-8.1631 1.46505,-8.1631 0.8089,0 1.46479,3.6546 1.46479,8.1631 z"
-         style="fill:url(#linearGradient9310);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.1585017;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path6736-2" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6740-6"
-         d="m 469.58584,7942.6496 c -0.27199,0 -0.51207,1.5628 -0.51207,3.4899 0,1.927 0.24008,3.4901 0.51207,3.4901 l 2.43228,0 0,-6.98 -2.43228,0 z"
-         style="fill:url(#linearGradient9307);fill-opacity:1;fill-rule:nonzero;stroke:#f9f9f9;stroke-width:0.14056389;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6752-2"
-         d="m 472.48856,7946.1159 c 0,1.9269 -0.22046,3.4892 -0.49245,3.4892 -0.27199,0 -0.49244,-1.5623 -0.49244,-3.4892 0,-1.9273 0.22045,-3.4893 0.49244,-3.4893 0.27199,0 0.49245,1.562 0.49245,3.4893 z"
-         style="fill:url(#linearGradient9304);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.14056389;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:url(#linearGradient9351);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 455.03897,7938.3626 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914"
-         id="path9329"
-         inkscape:path-effect="#path-effect9331"
-         inkscape:original-d="m 455.03897,7938.3626 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csc" />
-      <path
-         sodipodi:nodetypes="csc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 462.83137,7938.3626 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914"
-         inkscape:path-effect="#path-effect9335"
-         id="path9333"
-         d="m 462.83137,7938.3626 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914"
-         style="fill:none;stroke:url(#linearGradient9349);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:url(#linearGradient159593);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 447.24657,7938.3626 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914"
-         id="path9337"
-         inkscape:path-effect="#path-effect9339"
-         inkscape:original-d="m 447.24657,7938.3626 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csc" />
+      <path id="rect8774" style="opacity:0.8699552;fill:url(#linearGradient8776);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 367.18802,7935.7163 67.33486,0 0,1.3775 -67.33486,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="rect8778" style="opacity:0.8699552;fill:url(#linearGradient8780);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 367.18802,7955.0874 67.33486,0 0,1.3775 -67.33486,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:url(#radialGradient8800);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.13221818;stroke-miterlimit:4;stroke-dasharray:none" d="m 440.85623,7938.3272 c -0.56287,0 -1.41498,3.6546 -1.41498,8.163 0,4.5082 0.85211,8.1631 1.41498,8.1631 l 28.38367,0 c -0.62946,-5.7646 -0.63725,-10.9326 0,-16.3261 z" id="path6734-2-0" inkscape:connector-curvature="0" sodipodi:nodetypes="sssccs"/>
+      <path inkscape:connector-curvature="0" d="m 470.82188,7946.4703 c 0,4.5082 -0.65589,8.1628 -1.46479,8.1628 -0.80916,0 -1.46505,-3.6546 -1.46505,-8.1628 0,-4.5085 0.65589,-8.1631 1.46505,-8.1631 0.8089,0 1.46479,3.6546 1.46479,8.1631 z" style="fill:url(#linearGradient9310);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.1585017;stroke-miterlimit:4;stroke-dasharray:none" id="path6736-2"/>
+      <path inkscape:connector-curvature="0" id="path6740-6" d="m 469.58584,7942.6496 c -0.27199,0 -0.51207,1.5628 -0.51207,3.4899 0,1.927 0.24008,3.4901 0.51207,3.4901 l 2.43228,0 0,-6.98 -2.43228,0 z" style="fill:url(#linearGradient9307);fill-opacity:1;fill-rule:nonzero;stroke:#f9f9f9;stroke-width:0.14056389;stroke-miterlimit:4;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" id="path6752-2" d="m 472.48856,7946.1159 c 0,1.9269 -0.22046,3.4892 -0.49245,3.4892 -0.27199,0 -0.49244,-1.5623 -0.49244,-3.4892 0,-1.9273 0.22045,-3.4893 0.49244,-3.4893 0.27199,0 0.49245,1.562 0.49245,3.4893 z" style="fill:url(#linearGradient9304);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.14056389;stroke-miterlimit:4;stroke-dasharray:none"/>
+      <path style="fill:none;stroke:url(#linearGradient9351);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 455.03897,7938.3626 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914" id="path9329" inkscape:path-effect="#path-effect9331" inkscape:original-d="m 455.03897,7938.3626 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914" inkscape:connector-curvature="0" sodipodi:nodetypes="csc"/>
+      <path sodipodi:nodetypes="csc" inkscape:connector-curvature="0" inkscape:original-d="m 462.83137,7938.3626 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914" inkscape:path-effect="#path-effect9335" id="path9333" d="m 462.83137,7938.3626 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914" style="fill:none;stroke:url(#linearGradient9349);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path style="fill:none;stroke:url(#linearGradient159593);stroke-width:0.48702574;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 447.24657,7938.3626 c -1.09431,2.6421 -1.63591,5.5117 -1.57991,8.3709 0.0532,2.7173 0.64541,5.4229 1.73215,7.914" id="path9337" inkscape:path-effect="#path-effect9339" inkscape:original-d="m 447.24657,7938.3626 c -1.46332,1.8422 -1.62258,5.6596 -1.57991,8.3709 0.0428,2.7113 1.04837,5.1689 1.73215,7.914" inkscape:connector-curvature="0" sodipodi:nodetypes="csc"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Video_terminal.svg b/misc/images/svg/elements/Video_terminal.svg
index 6be85333ed3..39e8663d938 100644
--- a/misc/images/svg/elements/Video_terminal.svg
+++ b/misc/images/svg/elements/Video_terminal.svg
@@ -1,1179 +1,243 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="123.26974"
-   height="128.00035"
-   id="svg160560"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 68">
-  <defs
-     id="defs160562">
-    <filter
-       color-interpolation-filters="sRGB"
-       height="1.3249732"
-       y="-0.1624866"
-       width="1.0574832"
-       x="-0.02874162"
-       id="filter5308-1-9"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur5310-60-7"
-         stdDeviation="2.4980839"
-         inkscape:collect="always" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="123.26974" height="128.00035" id="svg160560" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 68">
+  <defs id="defs160562">
+    <filter color-interpolation-filters="sRGB" height="1.3249732" y="-0.1624866" width="1.0574832" x="-0.02874162" id="filter5308-1-9" inkscape:collect="always">
+      <feGaussianBlur id="feGaussianBlur5310-60-7" stdDeviation="2.4980839" inkscape:collect="always"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5262-4-4"
-       id="radialGradient9489"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.227387,-0.01047135,0,0.04979398,964.43665,204.18988)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient5262-4-4">
-      <stop
-         id="stop5264-5-7"
-         offset="0"
-         style="stop-color:#9ca0a5;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop5266-51-7" />
-      <stop
-         id="stop5268-9-5"
-         offset="1"
-         style="stop-color:#303d53;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       r="104.29825"
-       fy="1398.1375"
-       fx="744.58344"
-       cy="1398.1375"
-       cx="744.58344"
-       gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6587-0-3"
-       xlink:href="#linearGradient6313-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient6313-4-9">
-      <stop
-         style="stop-color:#474a4e;stop-opacity:1;"
-         offset="0"
-         id="stop6315-3-1" />
-      <stop
-         id="stop6317-5-2"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0f131a;stop-opacity:1;"
-         offset="1"
-         id="stop6319-9-9" />
-    </linearGradient>
-    <linearGradient
-       y2="1427.665"
-       x2="476.56497"
-       y1="1419.8461"
-       x1="476.92038"
-       gradientTransform="matrix(0.85239472,0,0,0.85239472,57.13651,187.49264)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6589-7-6"
-       xlink:href="#linearGradient5188-0-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5188-0-1">
-      <stop
-         id="stop5190-6-1"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:0;"
-         offset="1"
-         id="stop5192-2-4" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6294-69-9"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter5200-0-8"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur5202-2-6"
-         stdDeviation="0.12989622"
-         inkscape:collect="always" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5262-4-4" id="radialGradient9489" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.227387,-0.01047135,0,0.04979398,964.43665,204.18988)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient5262-4-4">
+      <stop id="stop5264-5-7" offset="0" style="stop-color:#9ca0a5;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop5266-51-7"/>
+      <stop id="stop5268-9-5" offset="1" style="stop-color:#303d53;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient r="104.29825" fy="1398.1375" fx="744.58344" cy="1398.1375" cx="744.58344" gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)" gradientUnits="userSpaceOnUse" id="radialGradient6587-0-3" xlink:href="#linearGradient6313-4-9" inkscape:collect="always"/>
+    <linearGradient id="linearGradient6313-4-9">
+      <stop style="stop-color:#474a4e;stop-opacity:1;" offset="0" id="stop6315-3-1"/>
+      <stop id="stop6317-5-2" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#0f131a;stop-opacity:1;" offset="1" id="stop6319-9-9"/>
+    </linearGradient>
+    <linearGradient y2="1427.665" x2="476.56497" y1="1419.8461" x1="476.92038" gradientTransform="matrix(0.85239472,0,0,0.85239472,57.13651,187.49264)" gradientUnits="userSpaceOnUse" id="linearGradient6589-7-6" xlink:href="#linearGradient5188-0-1" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5188-0-1">
+      <stop id="stop5190-6-1" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:0;" offset="1" id="stop5192-2-4"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6294-69-9" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" id="filter5200-0-8" inkscape:collect="always">
+      <feGaussianBlur id="feGaussianBlur5202-2-6" stdDeviation="0.12989622" inkscape:collect="always"/>
     </filter>
-    <radialGradient
-       r="104.29825"
-       fy="1398.1375"
-       fx="744.58344"
-       cy="1398.1375"
-       cx="744.58344"
-       gradientTransform="matrix(1,0,0,0.17288136,0,1156.4255)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6591-0-9"
-       xlink:href="#linearGradient5262-4-4"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient160360">
-      <stop
-         id="stop160362"
-         offset="0"
-         style="stop-color:#9ca0a5;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop160364" />
-      <stop
-         id="stop160366"
-         offset="1"
-         style="stop-color:#303d53;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6576-60-7"
-       id="radialGradient9483"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7361489,-0.1057429,0.24811776,4.0737432,-14.157949,-5369.4009)"
-       cx="462.20682"
-       cy="1394.1276"
-       fx="462.20682"
-       fy="1394.1276"
-       r="7.4508848" />
-    <linearGradient
-       id="linearGradient6576-60-7">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop6578-2-4" />
-      <stop
-         id="stop6580-2-8"
-         offset="0.52657253"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop6582-5-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313-4-9"
-       id="radialGradient9479"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5321984,0.96961912,-0.25784454,0.40744768,777.19135,-776.81278)"
-       cx="461.34637"
-       cy="1361.1923"
-       fx="461.34637"
-       fy="1361.1923"
-       r="39.277084" />
-    <linearGradient
-       id="linearGradient160374">
-      <stop
-         style="stop-color:#474a4e;stop-opacity:1;"
-         offset="0"
-         id="stop160376" />
-      <stop
-         id="stop160378"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0f131a;stop-opacity:1;"
-         offset="1"
-         id="stop160380" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6353-6-5"
-       id="linearGradient9476"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22509783,0,0,0.22509783,969.16572,-48.278177)"
-       x1="666.09454"
-       y1="1080.6464"
-       x2="949.8515"
-       y2="1293.1321" />
-    <linearGradient
-       id="linearGradient6353-6-5">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6355-33-8" />
-      <stop
-         style="stop-color:#9a9a9d;stop-opacity:1;"
-         offset="1"
-         id="stop6357-3-2" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6247-90-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6345-3-6"
-       id="linearGradient9473"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22509783,0,0,0.22509783,969.16571,-48.278177)"
-       x1="897.6601"
-       y1="1334.4812"
-       x2="586.69891"
-       y2="1369.8365" />
-    <linearGradient
-       id="linearGradient6345-3-6">
-      <stop
-         style="stop-color:#adb8c9;stop-opacity:1;"
-         offset="0"
-         id="stop6347-1-1" />
-      <stop
-         id="stop6349-9-9"
-         offset="0.35951823"
-         style="stop-color:#939aa4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop6351-8-3" />
-    </linearGradient>
-    <radialGradient
-       r="5.5625"
-       fy="1324.2997"
-       fx="874.3125"
-       cy="1324.2997"
-       cx="874.3125"
-       gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6601-3-7"
-       xlink:href="#linearGradient5020-9-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5020-9-1">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop5022-78-3" />
-      <stop
-         id="stop5024-0-2"
-         offset="0.30869097"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop5026-7-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4904-5-6"
-       id="linearGradient9469"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22509783,0,0,0.22509783,969.18356,-48.282554)"
-       x1="556.0246"
-       y1="1099.3903"
-       x2="968.59534"
-       y2="1330.6199" />
-    <linearGradient
-       id="linearGradient4904-5-6">
-      <stop
-         id="stop4906-1-8"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop4950-8-9" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop4948-5-9" />
-      <stop
-         id="stop4908-2-3"
-         offset="1"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6247-9-1-9"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4956-7-1"
-       id="linearGradient9465"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22509783,0,0,0.22509783,969.18356,-48.282554)"
-       x1="1154.8738"
-       y1="1067.8448"
-       x2="785.32184"
-       y2="1353.5291" />
-    <linearGradient
-       id="linearGradient4956-7-1">
-      <stop
-         style="stop-color:#01397d;stop-opacity:0"
-         offset="0"
-         id="stop4958-9-1" />
-      <stop
-         id="stop4960-6-3"
-         offset="0.46410909"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-      <stop
-         id="stop4962-3-4"
-         offset="0.74663347"
-         style="stop-color:#c0f4fe;stop-opacity:1;" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="1"
-         id="stop4964-9-8" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5008-6-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4988-8-4"
-       id="linearGradient9462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.22509783,0,0,0.22509783,969.18356,-48.282554)"
-       x1="1093.0221"
-       y1="911.74304"
-       x2="653.22003"
-       y2="1274.0055" />
-    <linearGradient
-       id="linearGradient4988-8-4">
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0"
-         id="stop4990-2-9" />
-      <stop
-         id="stop4992-4-1"
-         offset="0.46410909"
-         style="stop-color:#01397d;stop-opacity:1;" />
-      <stop
-         id="stop4994-7-4"
-         offset="0.74663347"
-         style="stop-color:#c0f4fe;stop-opacity:1;" />
-      <stop
-         style="stop-color:#1a97cb;stop-opacity:0.40568627"
-         offset="1"
-         id="stop4996-6-3" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5006-0-9"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect9459"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect8542-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect8540-9"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter6246-9-0-2-9-5"
-       x="-0.11814149"
-       width="1.2362829"
-       y="-0.12191792"
-       height="1.2438358">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="7.7728196"
-         id="feGaussianBlur6248-8-9-6-2-2" />
+    <radialGradient r="104.29825" fy="1398.1375" fx="744.58344" cy="1398.1375" cx="744.58344" gradientTransform="matrix(1,0,0,0.17288136,0,1156.4255)" gradientUnits="userSpaceOnUse" id="radialGradient6591-0-9" xlink:href="#linearGradient5262-4-4" inkscape:collect="always"/>
+    <linearGradient id="linearGradient160360">
+      <stop id="stop160362" offset="0" style="stop-color:#9ca0a5;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop160364"/>
+      <stop id="stop160366" offset="1" style="stop-color:#303d53;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6576-60-7" id="radialGradient9483" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.7361489,-0.1057429,0.24811776,4.0737432,-14.157949,-5369.4009)" cx="462.20682" cy="1394.1276" fx="462.20682" fy="1394.1276" r="7.4508848"/>
+    <linearGradient id="linearGradient6576-60-7">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop6578-2-4"/>
+      <stop id="stop6580-2-8" offset="0.52657253" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop6582-5-2"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6313-4-9" id="radialGradient9479" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5321984,0.96961912,-0.25784454,0.40744768,777.19135,-776.81278)" cx="461.34637" cy="1361.1923" fx="461.34637" fy="1361.1923" r="39.277084"/>
+    <linearGradient id="linearGradient160374">
+      <stop style="stop-color:#474a4e;stop-opacity:1;" offset="0" id="stop160376"/>
+      <stop id="stop160378" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#0f131a;stop-opacity:1;" offset="1" id="stop160380"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6353-6-5" id="linearGradient9476" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22509783,0,0,0.22509783,969.16572,-48.278177)" x1="666.09454" y1="1080.6464" x2="949.8515" y2="1293.1321"/>
+    <linearGradient id="linearGradient6353-6-5">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6355-33-8"/>
+      <stop style="stop-color:#9a9a9d;stop-opacity:1;" offset="1" id="stop6357-3-2"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6247-90-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6345-3-6" id="linearGradient9473" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22509783,0,0,0.22509783,969.16571,-48.278177)" x1="897.6601" y1="1334.4812" x2="586.69891" y2="1369.8365"/>
+    <linearGradient id="linearGradient6345-3-6">
+      <stop style="stop-color:#adb8c9;stop-opacity:1;" offset="0" id="stop6347-1-1"/>
+      <stop id="stop6349-9-9" offset="0.35951823" style="stop-color:#939aa4;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop6351-8-3"/>
+    </linearGradient>
+    <radialGradient r="5.5625" fy="1324.2997" fx="874.3125" cy="1324.2997" cx="874.3125" gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)" gradientUnits="userSpaceOnUse" id="radialGradient6601-3-7" xlink:href="#linearGradient5020-9-1" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5020-9-1">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop5022-78-3"/>
+      <stop id="stop5024-0-2" offset="0.30869097" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop5026-7-0"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4904-5-6" id="linearGradient9469" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22509783,0,0,0.22509783,969.18356,-48.282554)" x1="556.0246" y1="1099.3903" x2="968.59534" y2="1330.6199"/>
+    <linearGradient id="linearGradient4904-5-6">
+      <stop id="stop4906-1-8" offset="0" style="stop-color:#01397d;stop-opacity:1;"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="0.46410909" id="stop4950-8-9"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop4948-5-9"/>
+      <stop id="stop4908-2-3" offset="1" style="stop-color:#21aae3;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6247-9-1-9" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4956-7-1" id="linearGradient9465" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22509783,0,0,0.22509783,969.18356,-48.282554)" x1="1154.8738" y1="1067.8448" x2="785.32184" y2="1353.5291"/>
+    <linearGradient id="linearGradient4956-7-1">
+      <stop style="stop-color:#01397d;stop-opacity:0" offset="0" id="stop4958-9-1"/>
+      <stop id="stop4960-6-3" offset="0.46410909" style="stop-color:#21aae3;stop-opacity:1;"/>
+      <stop id="stop4962-3-4" offset="0.74663347" style="stop-color:#c0f4fe;stop-opacity:1;"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="1" id="stop4964-9-8"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect5008-6-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4988-8-4" id="linearGradient9462" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.22509783,0,0,0.22509783,969.18356,-48.282554)" x1="1093.0221" y1="911.74304" x2="653.22003" y2="1274.0055"/>
+    <linearGradient id="linearGradient4988-8-4">
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0" id="stop4990-2-9"/>
+      <stop id="stop4992-4-1" offset="0.46410909" style="stop-color:#01397d;stop-opacity:1;"/>
+      <stop id="stop4994-7-4" offset="0.74663347" style="stop-color:#c0f4fe;stop-opacity:1;"/>
+      <stop style="stop-color:#1a97cb;stop-opacity:0.40568627" offset="1" id="stop4996-6-3"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect5006-0-9" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect9459" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect8542-4" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect8540-9" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter6246-9-0-2-9-5" x="-0.11814149" width="1.2362829" y="-0.12191792" height="1.2438358">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="7.7728196" id="feGaussianBlur6248-8-9-6-2-2"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5244-2-1"
-       id="linearGradient9431"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0942299,0,0,1.0942299,628.2706,-1264.325)"
-       x1="485.21152"
-       y1="1282.5083"
-       x2="413.37195"
-       y2="1401.8518" />
-    <linearGradient
-       id="linearGradient5244-2-1"
-       inkscape:collect="always">
-      <stop
-         id="stop5246-57-6"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5248-6-7"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44471-2"
-       id="radialGradient9428"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.9912066,0.0133294,-0.00287986,0.64625738,-2371.8097,56.62655)"
-       cx="1171.1038"
-       cy="191.18689"
-       fx="1171.1038"
-       fy="191.18689"
-       r="8.3527002" />
-    <linearGradient
-       id="linearGradient44471-2">
-      <stop
-         id="stop44473-5"
-         offset="0"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop44475-1" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect46544-8"
-       is_visible="true" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44559-7"
-       id="radialGradient46524-0"
-       cx="969.19202"
-       cy="273.78632"
-       fx="969.19202"
-       fy="273.78632"
-       r="66.614487"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.31087,-0.2542083,0.34689739,3.153456,-1322.9703,-337.51797)" />
-    <linearGradient
-       id="linearGradient44559-7">
-      <stop
-         id="stop44561-5"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.26671347"
-         id="stop44563-7" />
-      <stop
-         id="stop44565-4"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46462-9"
-       id="radialGradient46540-2"
-       cx="966.26141"
-       cy="257.9277"
-       fx="966.26141"
-       fy="257.9277"
-       r="66.614487"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient46462-9">
-      <stop
-         style="stop-color:#c4c4ff;stop-opacity:1;"
-         offset="0"
-         id="stop46464-1" />
-      <stop
-         style="stop-color:#143eff;stop-opacity:1;"
-         offset="1"
-         id="stop46466-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6696-45-4"
-       id="linearGradient46502-4"
-       x1="904.72516"
-       y1="274.6777"
-       x2="920.58728"
-       y2="285.37958"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient6696-45-4">
-      <stop
-         id="stop6698-2-8"
-         offset="0"
-         style="stop-color:#d3d9e2;stop-opacity:1;" />
-      <stop
-         style="stop-color:#38485d;stop-opacity:1;"
-         offset="0.52657253"
-         id="stop6700-6-1" />
-      <stop
-         id="stop6702-1-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect46508-8"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient44559-7"
-       id="linearGradient9416"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.14392078,0.01328052,-0.01328052,0.14392078,997.9507,132.56521)"
-       x1="862.78021"
-       y1="154.59695"
-       x2="1006.6914"
-       y2="217.32349" />
-    <linearGradient
-       id="linearGradient160452">
-      <stop
-         id="stop160454"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.26671347"
-         id="stop160456" />
-      <stop
-         id="stop160458"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect46512-4"
-       is_visible="true" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46474-7"
-       id="radialGradient46480-6"
-       cx="966.26141"
-       cy="257.9277"
-       fx="966.26141"
-       fy="257.9277"
-       r="66.114487"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient46474-7">
-      <stop
-         style="stop-color:#00ff00;stop-opacity:1;"
-         offset="0"
-         id="stop46476-3" />
-      <stop
-         style="stop-color:#005f00;stop-opacity:1;"
-         offset="1"
-         id="stop46478-1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter8427-5">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.95271513"
-         id="feGaussianBlur8429-8" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5244-2-1" id="linearGradient9431" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0942299,0,0,1.0942299,628.2706,-1264.325)" x1="485.21152" y1="1282.5083" x2="413.37195" y2="1401.8518"/>
+    <linearGradient id="linearGradient5244-2-1" inkscape:collect="always">
+      <stop id="stop5246-57-6" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+      <stop id="stop5248-6-7" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient44471-2" id="radialGradient9428" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.9912066,0.0133294,-0.00287986,0.64625738,-2371.8097,56.62655)" cx="1171.1038" cy="191.18689" fx="1171.1038" fy="191.18689" r="8.3527002"/>
+    <linearGradient id="linearGradient44471-2">
+      <stop id="stop44473-5" offset="0" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop44475-1"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect46544-8" is_visible="true"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient44559-7" id="radialGradient46524-0" cx="969.19202" cy="273.78632" fx="969.19202" fy="273.78632" r="66.614487" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.31087,-0.2542083,0.34689739,3.153456,-1322.9703,-337.51797)"/>
+    <linearGradient id="linearGradient44559-7">
+      <stop id="stop44561-5" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.26671347" id="stop44563-7"/>
+      <stop id="stop44565-4" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient46462-9" id="radialGradient46540-2" cx="966.26141" cy="257.9277" fx="966.26141" fy="257.9277" r="66.614487" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient46462-9">
+      <stop style="stop-color:#c4c4ff;stop-opacity:1;" offset="0" id="stop46464-1"/>
+      <stop style="stop-color:#143eff;stop-opacity:1;" offset="1" id="stop46466-8"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6696-45-4" id="linearGradient46502-4" x1="904.72516" y1="274.6777" x2="920.58728" y2="285.37958" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient6696-45-4">
+      <stop id="stop6698-2-8" offset="0" style="stop-color:#d3d9e2;stop-opacity:1;"/>
+      <stop style="stop-color:#38485d;stop-opacity:1;" offset="0.52657253" id="stop6700-6-1"/>
+      <stop id="stop6702-1-2" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect46508-8" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient44559-7" id="linearGradient9416" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.14392078,0.01328052,-0.01328052,0.14392078,997.9507,132.56521)" x1="862.78021" y1="154.59695" x2="1006.6914" y2="217.32349"/>
+    <linearGradient id="linearGradient160452">
+      <stop id="stop160454" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.26671347" id="stop160456"/>
+      <stop id="stop160458" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect46512-4" is_visible="true"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient46474-7" id="radialGradient46480-6" cx="966.26141" cy="257.9277" fx="966.26141" fy="257.9277" r="66.114487" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient46474-7">
+      <stop style="stop-color:#00ff00;stop-opacity:1;" offset="0" id="stop46476-3"/>
+      <stop style="stop-color:#005f00;stop-opacity:1;" offset="1" id="stop46478-1"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter8427-5">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.95271513" id="feGaussianBlur8429-8"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8441-5"
-       id="linearGradient9542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0739988,0,0,1.0739988,-134.04643,-88.838839)"
-       x1="1216.3435"
-       y1="334.09363"
-       x2="1210.6635"
-       y2="323.13348" />
-    <linearGradient
-       id="linearGradient8441-5">
-      <stop
-         style="stop-color:#22211d;stop-opacity:1;"
-         offset="0"
-         id="stop8443-4" />
-      <stop
-         style="stop-color:#706d60;stop-opacity:1;"
-         offset="1"
-         id="stop8445-2" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect8453-6"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect8677-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect8681-4"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect8685-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10448"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect10450"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect10452"
-       effect="spiro" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient8441-5" id="linearGradient9542" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0739988,0,0,1.0739988,-134.04643,-88.838839)" x1="1216.3435" y1="334.09363" x2="1210.6635" y2="323.13348"/>
+    <linearGradient id="linearGradient8441-5">
+      <stop style="stop-color:#22211d;stop-opacity:1;" offset="0" id="stop8443-4"/>
+      <stop style="stop-color:#706d60;stop-opacity:1;" offset="1" id="stop8445-2"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect8453-6" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect8677-6" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect8681-4" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect8685-6" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10448" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect10450" is_visible="true"/>
+    <inkscape:path-effect is_visible="true" id="path-effect10452" effect="spiro"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-54.793699"
-     inkscape:cy="-13.142825"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="88"
-     inkscape:window-y="116"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata160565">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-54.793699" inkscape:cy="-13.142825" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="88" inkscape:window-y="116" inkscape:window-maximized="0"/>
+  <metadata id="metadata160565">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-429.7937,-391.21901)">
-    <g
-       style="display:inline"
-       transform="translate(-659.61865,218.52551)"
-       id="g10529"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Video_terminal.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-         style="opacity:0.68609864;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5308-1-9)"
-         transform="matrix(0.23068892,-0.01057214,0,0.29079594,961.60199,-132.54646)"
-         id="path5270-3"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path6278-0"
-         style="fill:url(#radialGradient9489);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1157.4613,264.91985 c 0,2.86831 -10.6181,5.68256 -23.7161,6.28559 -13.098,0.60325 -23.7161,-1.23298 -23.7161,-4.10128 0,-2.8682 10.6181,-5.68245 23.7161,-6.28559 13.098,-0.60303 23.7161,1.23298 23.7161,4.10128 z"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient6587-0-3);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6280-1"
-         sodipodi:cx="744.58344"
-         sodipodi:cy="1398.1375"
-         sodipodi:rx="104.29825"
-         sodipodi:ry="18.031223"
-         d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-         transform="matrix(0.21667214,-0.00952421,0,0.26197202,972.2522,-93.967747)" />
-      <path
-         style="fill:url(#linearGradient6589-7-6);fill-opacity:1;stroke:none;filter:url(#filter5200-0-8)"
-         d="m 454.79268,1401.7435 c 0.0184,-0.5559 0.0186,-1.1123 6.2e-4,-1.6682 -0.0244,-0.7521 -0.0821,-1.5032 -0.17296,-2.2502 l 14.53854,-0.8732 -0.86471,4.5641 c -2.22704,0.3256 -4.47494,0.5085 -6.72533,0.5472 -2.26244,0.039 -4.52738,-0.068 -6.77611,-0.3197 l -5e-5,0"
-         id="path6292-7"
-         inkscape:path-effect="#path-effect6294-69-9"
-         inkscape:original-d="m 454.79268,1401.7435 c 0.32318,-0.7586 0.0627,-0.9297 6.2e-4,-1.6682 -0.0622,-0.7385 0.25383,-1.5451 -0.17296,-2.2502 l 14.53854,-0.8732 c -0.26236,1.9711 -0.58448,2.7627 -0.86471,4.5641 -2.23925,0.3472 -4.46092,0.4766 -6.72533,0.5472 -2.26442,0.071 -4.46873,0.083 -6.77611,-0.3197 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscccscc"
-         transform="matrix(1.0942299,0,0,1.0942299,628.27052,-1264.3253)" />
-      <path
-         transform="matrix(0.09340315,-0.00492744,0,0.09355698,1064.1822,136.92045)"
-         d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-         sodipodi:ry="18.031223"
-         sodipodi:rx="104.29825"
-         sodipodi:cy="1398.1375"
-         sodipodi:cx="744.58344"
-         id="path6282-3"
-         style="fill:url(#radialGradient6591-0-9);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="cccscsscccc"
-         inkscape:connector-curvature="0"
-         id="path6284-4"
-         d="m 1141.3374,257.07401 -15.6724,1.03415 c 0.1474,1.5398 0.3714,4.76078 -0.02,5.93719 -0.054,0.0733 -0.084,0.14006 -0.084,0.21009 0,0 0,0.0295 0,0.0295 0.021,0.8012 3.6627,1.25049 8.1528,1.00593 4.5025,-0.24522 8.1528,-1.09379 8.1528,-1.89948 0,-0.0295 9e-4,-0.0295 0,-0.035 -9e-4,-0.0296 -0.01,-0.0296 -0.01,-0.0405 -0.6458,-2.09129 -0.7557,-4.5555 -0.5205,-6.21851 z"
-         style="fill:url(#radialGradient9483);fill-opacity:1;stroke:none" />
-      <path
-         id="path6276-28"
-         style="fill:#8e959f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1091.4892,191.28891 78.6153,6.24728 c 0.7911,0.0646 1.3816,0.64089 1.4325,1.43279 l 3.3425,52.0477 c 0.051,0.79222 -0.8106,1.28933 -1.4325,1.43267 -25.1167,6.09027 -52.9441,6.80524 -79.9024,6.44644 -0.7911,0.0646 -1.3995,-0.63958 -1.4325,-1.43267 l -2.6987,-64.7492 c -0.033,-0.7931 0.7121,-1.53323 2.0758,-1.42501 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssssccsss" />
-      <path
-         sodipodi:nodetypes="ssssccsss"
-         inkscape:connector-curvature="0"
-         d="m 1091.7252,191.47131 79.3852,5.88915 c 0.7914,0.058 1.3817,0.64045 1.4325,1.43278 l 3.3425,52.04771 c 0.051,0.79222 -0.8106,1.28911 -1.4325,1.43267 -25.1167,6.09027 -52.9442,6.80524 -79.9024,6.44611 -0.7911,0.0646 -1.3978,-0.63925 -1.4326,-1.43235 l -2.8252,-64.38361 c -0.035,-0.79277 0.6411,-1.49111 1.4325,-1.43246 z"
-         style="fill:url(#radialGradient9479);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.36015657;stroke-miterlimit:4;stroke-opacity:1"
-         id="rect6253-9" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1094.3256,195.45059 76.3471,5.25252 2.865,45.68104 -76.2416,5.09353 z"
-         inkscape:path-effect="#path-effect6247-90-5"
-         id="path6245-9"
-         d="m 1094.3256,195.45059 76.3471,5.25252 2.865,45.68104 -76.2416,5.09353 -2.9705,-56.02709"
-         style="fill:url(#linearGradient9476);fill-opacity:1;stroke:#666666;stroke-width:0.22509786px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path6269-9"
-         d="m 1093.2346,257.16034 c 0.035,0.79255 0.6418,1.49877 1.4302,1.43508 26.8666,0.3588 54.5997,-0.35321 79.631,-6.44348 0.6198,-0.14312 1.4738,-0.64308 1.4231,-1.43508 l -0.1264,-1.98373 c -0.2571,0.46527 -0.8408,0.76684 -1.2969,0.87221 -25.0313,6.09027 -52.7644,6.80261 -79.6311,6.44348 -1.4444,-0.0295 -1.4221,-0.11971 -1.4301,1.11152 z"
-         style="fill:url(#linearGradient9473);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         transform="matrix(0.22031476,0.05435309,-0.02411816,0.20870235,1005.0059,-74.298198)"
-         d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z"
-         sodipodi:ry="6.5625"
-         sodipodi:rx="5.0625"
-         sodipodi:cy="1324.2997"
-         sodipodi:cx="874.3125"
-         id="path6274-0"
-         style="fill:url(#radialGradient6601-3-7);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 z"
-         inkscape:path-effect="#path-effect6247-9-1-9"
-         id="path6245-4-1"
-         d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 -2.9705,-56.02709"
-         style="fill:url(#linearGradient9469);fill-opacity:1;stroke:#666666;stroke-width:0.22509786px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="opacity:0.27354264;fill:url(#linearGradient9465);fill-opacity:1;stroke:#666666;stroke-width:0.22509786px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 -2.9705,-56.02709"
-         id="path4952-0"
-         inkscape:path-effect="#path-effect5008-6-2"
-         inkscape:original-d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 z"
-         inkscape:path-effect="#path-effect5006-0-9"
-         id="path4974-63"
-         d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 -2.9705,-56.02709"
-         style="opacity:0.63677135;fill:url(#linearGradient9462);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.22509786px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="opacity:0.63677135;fill:#f9f9f9;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.43794248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1096.3541,200.50757 73.4082,3.83156 2.5919,38.42169 -73.3247,2.40545 -2.6754,-44.6587"
-         id="path8449"
-         inkscape:path-effect="#path-effect9459"
-         inkscape:original-d="m 1096.3541,200.50757 73.4082,3.83156 2.5919,38.42169 -73.3247,2.40545 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1136.6396,202.61944 33.1227,1.71969 2.5919,38.42169 -33.5265,0.94367 z"
-         inkscape:path-effect="#path-effect8542-4"
-         id="path8508"
-         d="m 1136.6396,202.61944 33.1227,1.71969 2.5919,38.42169 -33.5265,0.94367 -2.1881,-41.08505"
-         style="opacity:0.63677135;fill:#f9f9f9;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.43794248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#f9f9f9;fill-opacity:1;stroke:#333333;stroke-width:0.43794248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1137.8206,223.43147 33.2038,0.50149 1.3298,18.82786 -33.5265,0.94367 -1.0071,-20.27302"
-         id="path8510"
-         inkscape:path-effect="#path-effect8540-9"
-         inkscape:original-d="m 1137.8206,223.43147 33.2038,0.50149 1.3298,18.82786 -33.5265,0.94367 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ssssssssssssssscccsssssssssssss"
-         inkscape:connector-curvature="0"
-         id="path8520"
-         d="m 895.09375,10.71875 c -4.89014,0.216719 -8.9448,1.858112 -12.09375,4.875 -1.59759,1.530586 -4.8116,3.669737 -7.125,4.78125 -3.48742,1.675586 -4.60803,2.971118 -6.5,7.53125 -1.98958,4.795395 -2.20562,6.588936 -1.6875,14 0.32684,4.675 1.03173,10.449445 1.5625,12.84375 0.66284,2.990057 0.60921,5.338672 -0.15625,7.5 -1.69611,4.78904 1.1929,17.46626 4.59375,20.21875 1.9377,1.56828 2.75991,3.55419 3.53125,8.34375 0.55646,3.45534 1.96032,7.52946 3.09375,9.0625 2.52251,3.41188 2.09711,6.41111 -0.9375,6.84375 -1.55228,0.22131 -3.03996,1.87541 -4.75,5.25 -3.00542,5.93093 -4.01657,6.48488 -27.46875,15 -20.35415,7.39028 -23.40627,9.10357 -25.46875,14.21875 -1.54323,3.82737 -2.18837,20.71788 -0.84375,22.0625 0.37,0.36999 35.8075,0.54708 78.75,0.40625 l 78.0625,-0.25 0.3125,-9 c 0.354,-10.88614 -1.301,-16.03118 -6.0625,-19.03125 -1.7852,-1.12478 -11.125,-4.91156 -20.75,-8.40625 -23.45217,-8.51512 -24.46333,-9.06907 -27.46875,-15 -1.71004,-3.37459 -3.19772,-5.02869 -4.75,-5.25 -3.03461,-0.43264 -3.42876,-3.43187 -0.90625,-6.84375 1.13343,-1.53304 2.50604,-5.60716 3.0625,-9.0625 0.77134,-4.78956 1.6248,-6.77547 3.5625,-8.34375 3.40085,-2.75249 6.25861,-15.42971 4.5625,-20.21875 -0.7789,-2.199274 -0.79207,-4.477673 -0.0937,-7.59375 0.54954,-2.452163 1.07819,-8.088755 1.1875,-12.53125 0.17935,-7.289277 -0.12954,-8.730788 -3.03125,-14.625 -3.56517,-7.24189 -6.22518,-9.577032 -15.1875,-13.21875 -6.3848,-2.594377 -12.10986,-3.779219 -17,-3.5625 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter6246-9-0-2-9-5)"
-         transform="matrix(0.10485045,-0.00354508,0.00735026,0.10563,1060.9781,229.02453)" />
-      <path
-         style="fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1154.7311,226.89518 c -0.5111,0.0402 -0.9242,0.22799 -1.2322,0.55782 -0.1562,0.16734 -0.4775,0.40469 -0.7119,0.53031 -0.3533,0.18935 -0.4613,0.33017 -0.6262,0.81856 -0.1733,0.51359 -0.1828,0.70381 -0.074,1.48481 0.069,0.49266 0.185,1.10011 0.2582,1.35114 0.091,0.31349 0.1032,0.56177 0.039,0.79278 -0.1426,0.51188 0.2535,1.84073 0.6303,2.11942 0.2147,0.15879 0.3155,0.36565 0.4315,0.86883 0.084,0.36302 0.2609,0.78839 0.391,0.94631 0.2896,0.35145 0.267,0.66977 -0.048,0.72623 -0.1611,0.0289 -0.3049,0.20887 -0.4594,0.57139 -0.2715,0.63714 -0.3735,0.69924 -2.7699,1.68183 -2.0798,0.8528 -2.3872,1.04459 -2.5659,1.59222 -0.1336,0.40975 -0.077,2.19619 0.074,2.33345 0.042,0.0378 3.7585,-0.0692 8.26,-0.23626 l 8.183,-0.30315 -0.033,-0.95178 c -0.043,-1.15116 -0.2543,-1.68876 -0.7756,-1.98878 -0.1954,-0.11248 -1.2025,-0.47937 -2.2374,-0.81439 -2.5216,-0.81631 -2.6317,-0.87124 -2.9904,-1.48707 -0.2041,-0.3504 -0.3722,-0.51984 -0.5366,-0.53772 -0.3214,-0.0349 -0.3847,-0.35035 -0.1453,-0.71969 0.1076,-0.16595 0.2215,-0.60117 0.2545,-0.96813 0.046,-0.50866 0.1205,-0.72145 0.3122,-0.89398 0.3363,-0.3028 0.5428,-1.65203 0.3297,-2.15188 -0.098,-0.22955 -0.1159,-0.47017 -0.066,-0.8018 0.04,-0.26097 0.054,-0.85823 0.032,-1.32788 -0.035,-0.7706 -0.078,-0.92178 -0.4253,-1.5341 -0.427,-0.75232 -0.7231,-0.98955 -1.6896,-1.34245 -0.6885,-0.25141 -1.2975,-0.35627 -1.8086,-0.31604 z"
-         id="path8522"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssssssssssssssscccsssssssssssss" />
-      <path
-         transform="matrix(0.09173574,0.00214794,0.00643089,0.0927858,1071.5593,206.47035)"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter6246-9-0-2-9-5)"
-         d="m 895.09375,10.71875 c -4.89014,0.216719 -8.9448,1.858112 -12.09375,4.875 -1.59759,1.530586 -4.8116,3.669737 -7.125,4.78125 -3.48742,1.675586 -4.60803,2.971118 -6.5,7.53125 -1.98958,4.795395 -2.20562,6.588936 -1.6875,14 0.32684,4.675 1.03173,10.449445 1.5625,12.84375 0.66284,2.990057 0.60921,5.338672 -0.15625,7.5 -1.69611,4.78904 1.1929,17.46626 4.59375,20.21875 1.9377,1.56828 2.75991,3.55419 3.53125,8.34375 0.55646,3.45534 1.96032,7.52946 3.09375,9.0625 2.52251,3.41188 2.09711,6.41111 -0.9375,6.84375 -1.55228,0.22131 -3.03996,1.87541 -4.75,5.25 -3.00542,5.93093 -4.01657,6.48488 -27.46875,15 -20.35415,7.39028 -23.40627,9.10357 -25.46875,14.21875 -1.54323,3.82737 -2.18837,20.71788 -0.84375,22.0625 0.37,0.36999 35.8075,0.54708 78.75,0.40625 l 78.0625,-0.25 0.3125,-9 c 0.354,-10.88614 -1.301,-16.03118 -6.0625,-19.03125 -1.7852,-1.12478 -11.125,-4.91156 -20.75,-8.40625 -23.45217,-8.51512 -24.46333,-9.06907 -27.46875,-15 -1.71004,-3.37459 -3.19772,-5.02869 -4.75,-5.25 -3.03461,-0.43264 -3.42876,-3.43187 -0.90625,-6.84375 1.13343,-1.53304 2.50604,-5.60716 3.0625,-9.0625 0.77134,-4.78956 1.6248,-6.77547 3.5625,-8.34375 3.40085,-2.75249 6.25861,-15.42971 4.5625,-20.21875 -0.7789,-2.199274 -0.79207,-4.477673 -0.0937,-7.59375 0.54954,-2.452163 1.07819,-8.088755 1.1875,-12.53125 0.17935,-7.289277 -0.12954,-8.730788 -3.03125,-14.625 -3.56517,-7.24189 -6.22518,-9.577032 -15.1875,-13.21875 -6.3848,-2.594377 -12.10986,-3.779219 -17,-3.5625 z"
-         id="path8534"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssssssssssssssscccsssssssssssss" />
-      <path
-         sodipodi:nodetypes="ssssssssssssssscccsssssssssssss"
-         inkscape:connector-curvature="0"
-         id="path8536"
-         d="m 1153.7403,209.3875 c -0.4472,0.01 -0.8086,0.1532 -1.0781,0.42636 -0.1367,0.13858 -0.4178,0.33016 -0.6229,0.42833 -0.3091,0.14798 -0.4036,0.26578 -0.5478,0.68483 -0.1517,0.44067 -0.16,0.60662 -0.065,1.29537 0.06,0.43448 0.1619,0.97178 0.226,1.19508 0.08,0.27886 0.09,0.49666 0.034,0.69556 -0.1248,0.44071 0.2217,1.62318 0.5514,1.88588 0.1878,0.14967 0.276,0.3357 0.3776,0.78176 0.073,0.3218 0.2282,0.70284 0.3421,0.84752 0.2533,0.32199 0.2336,0.59936 -0.042,0.63299 -0.141,0.0172 -0.2668,0.16748 -0.402,0.47692 -0.2376,0.54385 -0.3267,0.59308 -2.4234,1.33279 -1.8197,0.64199 -2.0886,0.7944 -2.2449,1.26459 -0.117,0.35181 -0.068,1.91763 0.064,2.04527 0.036,0.0351 3.2884,0.12768 7.2268,0.20685 l 7.1595,0.14448 -0.029,-0.83441 c -0.038,-1.00932 -0.2224,-1.49026 -0.6785,-1.77885 -0.171,-0.1082 -1.0521,-0.47962 -1.9576,-0.82455 -2.2061,-0.84046 -2.3025,-0.89403 -2.6163,-1.45079 -0.1786,-0.31679 -0.3257,-0.47346 -0.4695,-0.49733 -0.2812,-0.0467 -0.3366,-0.32579 -0.1271,-0.63695 0.094,-0.13981 0.1938,-0.51488 0.2226,-0.83429 0.04,-0.44275 0.1055,-0.62518 0.2732,-0.76653 0.2942,-0.24809 0.4749,-1.41821 0.2885,-1.86621 -0.086,-0.20574 -0.1015,-0.41717 -0.057,-0.70479 0.035,-0.22635 0.047,-0.74821 0.028,-1.16018 -0.03,-0.67595 -0.068,-0.81037 -0.3721,-1.3635 -0.3736,-0.6796 -0.6327,-0.90198 -1.4783,-1.25913 -0.6024,-0.25444 -1.1352,-0.37667 -1.5824,-0.36707 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         id="path5230-9"
-         style="opacity:0.32743363;fill:url(#linearGradient9431);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1091.7252,191.47131 79.3852,5.88915 c 0.7914,0.058 2.2028,1.24151 1.4325,1.43278 -55.3148,-3.60778 -62.9633,59.21984 -77.9924,59.92649 -0.7911,0.0646 -1.3978,-0.63925 -1.4326,-1.43235 l -2.8252,-64.38361 c -0.035,-0.79277 0.6411,-1.49111 1.4325,-1.43246 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssccsss" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1134.6927,194.60442 3.3272,0.33949 -0.1361,2.91944 -4.8205,-0.47524 -0.3394,-0.95052 -1.0185,0 -0.8146,0.67893 -1.426,0.33948 -4.2773,-0.40735 0.2716,-2.98739 3.1911,-0.0678 2.5607,0.25903 -0.8691,-1.69522 4.099,0.22302 -1.664,1.63064 z"
-         inkscape:path-effect="#path-effect46544-8"
-         id="path46542"
-         d="m 1134.6927,194.60442 c 1.1091,0.11244 2.2182,0.2256 3.3272,0.33949 l -0.1361,2.91944 -4.8205,-0.47524 -0.3394,-0.95052 -1.0185,0 -0.8146,0.67893 -1.426,0.33948 -4.2773,-0.40735 0.2716,-2.98739 3.1911,-0.0678 2.5607,0.25903 -0.8691,-1.69522 4.099,0.22302 -1.664,1.63064 c 0.6387,0.0643 1.2773,0.12875 1.9159,0.19349"
-         style="fill:url(#radialGradient9428);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.1536278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         transform="matrix(0.15012923,0.03162224,-0.03162224,0.15012923,996.261,113.63824)"
-         d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z"
-         sodipodi:ry="66.114487"
-         sodipodi:rx="66.114487"
-         sodipodi:cy="257.9277"
-         sodipodi:cx="966.26141"
-         id="path46446"
-         style="fill:url(#radialGradient46524-0);fill-opacity:1;fill-rule:nonzero;stroke:#333333"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#333333"
-         id="path46448"
-         sodipodi:cx="966.26141"
-         sodipodi:cy="257.9277"
-         sodipodi:rx="66.114487"
-         sodipodi:ry="66.114487"
-         d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z"
-         transform="matrix(0.07393806,-0.01963754,-0.0010355,0.07364743,1066.8794,186.5313)" />
-      <path
-         transform="matrix(0.06429404,-0.01707612,-9.0042728e-4,0.06404127,1076.5081,186.84739)"
-         d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z"
-         sodipodi:ry="66.114487"
-         sodipodi:rx="66.114487"
-         sodipodi:cy="257.9277"
-         sodipodi:cx="966.26141"
-         id="path46450"
-         style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-         id="path46452"
-         sodipodi:cx="966.26141"
-         sodipodi:cy="257.9277"
-         sodipodi:rx="66.114487"
-         sodipodi:ry="66.114487"
-         d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z"
-         transform="matrix(0.05313361,-0.01411199,-7.4414325e-4,0.05292474,1087.1422,186.68388)" />
-      <path
-         transform="matrix(0.04399208,-0.01168403,-6.1610996e-4,0.04381917,1095.7185,186.20055)"
-         d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z"
-         sodipodi:ry="66.114487"
-         sodipodi:rx="66.114487"
-         sodipodi:cy="257.9277"
-         sodipodi:cx="966.26141"
-         id="path46454"
-         style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-         id="path46456"
-         sodipodi:cx="966.26141"
-         sodipodi:cy="257.9277"
-         sodipodi:rx="66.114487"
-         sodipodi:ry="66.114487"
-         d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z"
-         transform="matrix(0.03749145,-0.00995754,-5.2506119e-4,0.03734409,1101.8056,185.89695)" />
-      <path
-         transform="matrix(0.02794369,-0.00742168,-3.9135019e-4,0.02783383,1110.7029,185.3736)"
-         d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z"
-         sodipodi:ry="66.114487"
-         sodipodi:rx="66.114487"
-         sodipodi:cy="257.9277"
-         sodipodi:cx="966.26141"
-         id="path46458"
-         style="fill:url(#radialGradient46540-2);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.14285638,-0.02194566,0.02194566,0.14285638,988.8318,163.84567)"
-         d="m 911.81417,278.43381 c 0,6.05312 -3.16582,10.96015 -7.07107,10.96015 -3.90524,0 -7.07106,-4.90703 -7.07106,-10.96015 0,-6.05313 3.16582,-10.96016 7.07106,-10.96016 3.90525,0 7.07107,4.90703 7.07107,10.96016 z"
-         sodipodi:ry="10.960155"
-         sodipodi:rx="7.0710678"
-         sodipodi:cy="278.43381"
-         sodipodi:cx="904.7431"
-         id="path46494"
-         style="fill:url(#linearGradient46502-4);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="csc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1137.848,181.77374 c 0.029,-0.19447 -0.059,-0.41624 -0.099,-0.59448 -0.043,-0.17821 -0.043,-0.31365 -0.2028,-0.4609"
-         inkscape:path-effect="#path-effect46508-8"
-         id="path46506"
-         d="m 1137.848,181.77374 c -0.01,-0.20142 -0.039,-0.40203 -0.099,-0.59448 -0.05,-0.16065 -0.1181,-0.3156 -0.2028,-0.4609"
-         style="fill:none;stroke:#000000;stroke-width:0.14453222px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccscscscscccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1127.6626,174.47147 c 0.9246,0.28536 1.7193,0.79379 2.4713,1.38724 0.9532,0.84104 1.9474,1.86657 2.9105,2.63988 0.8864,0.65907 1.5149,1.22688 2.145,1.60666 0.6349,0.32985 1.1418,0.52681 1.6558,0.60163 0.7269,0.0693 1.1426,0.0461 1.4926,-0.12537 0.4045,-0.28926 0.6538,-0.50526 0.8451,-0.737 0.1921,-0.23183 0.3233,-0.47917 0.4917,-0.83131 0.1227,-0.41663 0.1841,-0.75308 0.168,-1.07197 -0.027,-0.31886 -0.104,-0.62018 -0.279,-0.96639 -0.5287,-1.08244 -1.3594,-2.00095 -2.3382,-2.66034 -0.9788,-0.65947 -2.1056,-1.05986 -2.9029,-1.4036 -0.2855,-0.0547 -0.5301,-0.0368 -0.8054,-0.0618 -0.2756,-0.024 -0.5509,-0.0349 -0.8356,-0.0307 -1.098,0.1019 -1.3874,0.0107 -2.3392,0.3899 -0.6595,0.29028 -1.3704,0.40856 -1.9578,0.81949 -0.093,0.0675 -0.6299,0.37622 -0.7224,0.44376 z"
-         inkscape:path-effect="#path-effect46512-4"
-         id="path46510"
-         d="m 1127.6626,174.47147 c 0.8821,0.34635 1.7162,0.81459 2.4713,1.38724 1.0441,0.79187 1.9273,1.77349 2.9105,2.63988 0.6709,0.59125 1.3889,1.12906 2.145,1.60666 0.4949,0.32599 1.0671,0.53387 1.6558,0.60163 0.4993,0.0575 1.0099,0.0146 1.4926,-0.12537 0.3211,-0.19487 0.6084,-0.44537 0.8451,-0.737 0.2036,-0.25087 0.3699,-0.53201 0.4917,-0.83131 0.1441,-0.33588 0.2024,-0.70812 0.168,-1.07197 -0.032,-0.33534 -0.1403,-0.65945 -0.279,-0.96639 -0.4921,-1.08883 -1.3603,-1.97374 -2.3382,-2.66034 -0.8835,-0.62032 -1.868,-1.09636 -2.9029,-1.4036 -0.268,-0.0259 -0.5366,-0.0465 -0.8054,-0.0618 -0.2783,-0.0159 -0.5569,-0.0261 -0.8356,-0.0307 -0.7917,0.0344 -1.5791,0.16568 -2.3392,0.3899 -0.6799,0.20058 -1.338,0.47551 -1.9578,0.81949 -0.2472,0.13718 -0.4883,0.28529 -0.7224,0.44376 l 5e-4,-8e-5"
-         style="fill:url(#linearGradient9416);fill-opacity:1;stroke:none" />
-      <path
-         transform="matrix(0.02520639,0.01654821,-0.02189826,0.01905945,1118.2988,157.68417)"
-         d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z"
-         sodipodi:ry="66.114487"
-         sodipodi:rx="66.114487"
-         sodipodi:cy="257.9277"
-         sodipodi:cx="966.26141"
-         id="path46470"
-         style="fill:url(#radialGradient46480-6);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="cccccccccscccccssccccccscccsccccccccccccccccccccssccsccccsccc"
-         id="path8369"
-         transform="matrix(1.056862,0,0,0.89823663,-103.66416,-12.041492)"
-         d="m 1221.25,309.84375 c -2.5054,-0.0352 -5.0071,0.3976 -7.75,1.28125 l -2.2188,0.71875 -0.9374,-0.21875 c -2.5439,-0.54275 -4.5121,-0.35202 -7.375,0.65625 -2.2603,0.79599 -3.4044,1.43773 -4.6876,2.6875 -1.8937,1.96872 -3.2521,4.61672 -2.5,6.53125 0.1848,0.93721 1.0319,2.55188 1.7813,3.40625 1.0579,1.20594 2.572,1.87933 4.9687,2.21875 2.366,0.33504 3.4433,0.24473 5.8438,-0.5 2.3521,-0.7297 3.7034,-1.42972 5.0938,-2.59375 3.4077,-2.8532 4.1014,-6.25712 1.8437,-9.15625 -0.309,-0.39669 -0.5325,-0.7818 -0.5,-0.84375 0.121,-0.23137 3.4632,-0.48354 5.0313,-0.375 1.9707,0.13638 3.9215,0.58137 6.5312,1.5 2.4576,0.86505 3.3438,1.31386 3.3438,1.65625 0,0.40339 0.4286,0.82708 2.2187,2.3125 3.0582,2.53762 4.7099,4.39676 5.9375,6.59375 0.4282,0.76607 0.4458,0.87354 0.3438,1.5625 -0.1482,0.9973 -1.808,3.85685 -2.4376,4.1875 -1.1668,0.61299 -3.0655,1.38779 -4.8124,1.9375 -2.7404,0.86219 -8.3949,2.28638 -8.6563,2.1875 -0.1215,-0.046 -0.2831,-0.3007 -0.375,-0.59375 -0.3167,-1.01101 -1.4296,-2.27521 -3.375,-3.8125 -1.2069,-0.95372 -3.5437,-2.11972 -5.3437,-2.65625 -1.0532,-0.31385 -3.8066,-0.69632 -5.4063,-0.75 -2.1717,-0.0729 -4.9639,0.7181 -6.0625,1.6875 -1.9236,1.69755 -2.1806,1.96261 -2.5938,2.78125 -0.4113,0.81488 -0.4716,0.87353 -0.8124,0.78125 -0.2026,-0.0548 -0.492,2.71241 -1.1563,2.59375 -0.3422,-0.0913 -0.7182,-0.14933 -1.0937,-0.21875 -0.038,-0.58392 -0.2197,-1.02126 -0.375,-0.59375 -0.069,0.19038 -0.1326,0.33772 -0.1876,0.5 -12.8386,-1.95537 -25.2272,13.19036 -15.3497,-1.45707 0.2304,0.21741 0.534,0.34997 0.875,0.3125 l 0.875,-0.0937 c 0.6172,-0.0678 1.0678,-0.63279 1,-1.25 l -0.125,-1.1875 c -0.068,-0.61721 -0.6328,-1.06783 -1.25,-1 l -0.875,0.0937 c -0.6172,0.0678 -1.0678,0.63279 -1,1.25 l 0,0.0625 c -0.2901,0.17571 -0.5733,0.93391 -1.0625,1.8125 -9.0479,17.31444 -1.201,1.562 16.1622,2.95707 l 0.6563,0.0312 c 0.021,0.0531 0.034,0.10248 0.062,0.15625 0.209,0.39772 0.6224,0.6611 2.1562,1.4375 1.6667,0.84339 2.0132,1.12393 2.8438,2.03125 1.3494,1.47418 2.3023,2.20461 3.9688,3.125 4.0987,2.26369 8.6749,2.88586 12.5,1.6875 2.3106,-0.72389 3.7097,-1.7813 4.5312,-3.4375 0.1548,-0.31241 0.409,-0.62955 0.5938,-0.6875 0.1829,-0.0574 2.2631,-0.24947 4.625,-0.4375 5.1021,-0.40618 6.0393,-0.53177 8.5312,-1.3125 3.7076,-1.16154 5.8054,-2.76097 7.1562,-5.5 0.8665,-1.75689 1.0579,-4.52796 0.5626,-7.78125 -0.3048,-2.00319 -1.3169,-4.87977 -2.2188,-6.3125 -0.8388,-1.33272 -2.8709,-3.44182 -4.5,-4.6875 -1.6844,-1.28798 -4.97,-3.01563 -7.1875,-3.78125 -2.7846,-0.96147 -5.307,-1.46474 -7.8125,-1.5 z"
-         style="opacity:0.20179372;fill:#000000;filter:url(#filter8427-5)"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cccccccccscccccssccccccscccsccccccccccccccccccccssccsccccsccc"
-         inkscape:connector-curvature="0"
-         style="fill:#4d4d4d"
-         d="m 1188.0461,260.04295 c -2.6908,-0.0378 -5.3776,0.42702 -8.3235,1.37605 l -2.383,0.77194 -1.0068,-0.23494 c -2.7321,-0.58291 -4.846,-0.37806 -7.9207,0.70482 -2.4276,0.85489 -3.6563,1.54412 -5.0345,2.88637 -2.0338,2.1144 -3.4927,4.95835 -2.685,7.01455 0.1985,1.00656 1.1083,2.74072 1.9131,3.65831 1.1362,1.29518 2.7624,2.0184 5.3364,2.38293 2.5411,0.35984 3.6981,0.26284 6.2762,-0.53699 2.5262,-0.7837 3.9775,-1.53552 5.4708,-2.78569 3.6598,-3.06433 4.4049,-6.72014 1.9801,-9.8338 -0.3319,-0.42604 -0.5719,-0.83965 -0.537,-0.90619 0.13,-0.24849 3.7195,-0.51932 5.4036,-0.40275 2.1165,0.14648 4.2117,0.62439 7.0145,1.611 2.6395,0.92906 3.5913,1.41109 3.5913,1.77881 0,0.43324 0.4603,0.88829 2.3828,2.48362 3.2845,2.72541 5.0585,4.72212 6.3769,7.08168 0.4599,0.82276 0.4788,0.93818 0.3692,1.67813 -0.1591,1.0711 -1.9417,4.14225 -2.6179,4.49737 -1.2532,0.65835 -3.2924,1.49048 -5.1685,2.08087 -2.9432,0.92599 -9.0162,2.45557 -9.2969,2.34937 -0.1305,-0.0494 -0.3041,-0.32295 -0.4028,-0.63768 -0.3401,-1.08583 -1.5353,-2.44358 -3.6247,-4.09463 -1.2962,-1.02429 -3.8059,-2.27657 -5.7391,-2.8528 -1.1312,-0.33708 -4.0883,-0.74785 -5.8064,-0.8055 -2.3324,-0.0783 -5.3312,0.77123 -6.5111,1.81237 -2.0659,1.82317 -2.342,2.10784 -2.7857,2.98706 -0.4418,0.87518 -0.5065,0.93817 -0.8726,0.83906 -0.2176,-0.0589 -0.5284,2.91312 -1.2418,2.78568 -0.3675,-0.0981 -0.7714,-0.16038 -1.1747,-0.23493 -0.041,-0.62713 -0.2359,-1.09683 -0.4027,-0.63769 -0.074,0.20447 -0.1424,0.36271 -0.2015,0.537 -13.3629,5.69201 -28.4875,12.84873 -17.8791,-2.88259 0.2475,0.2335 0.5736,0.37587 0.9398,0.33562 l 0.9397,-0.10063 c 0.6629,-0.0728 1.1469,-0.67962 1.074,-1.3425 l -0.1342,-1.27537 c -0.073,-0.66289 -0.6796,-1.14685 -1.3425,-1.074 l -0.9398,0.10063 c -0.6628,0.0728 -1.1468,0.67962 -1.074,1.3425 l 0,0.0671 c -0.3115,0.18871 -0.6157,1.00301 -1.1411,1.94662 -9.7174,18.59569 2.3141,12.16919 18.7517,4.49359 l 0.7049,0.0335 c 0.023,0.057 0.036,0.11006 0.067,0.16781 0.2244,0.42715 0.6684,0.71002 2.3157,1.54387 1.7901,0.9058 2.1622,1.2071 3.0543,2.18156 1.4492,1.58327 2.4726,2.36775 4.2624,3.35625 4.402,2.4312 9.3169,3.09941 13.425,1.81237 2.4816,-0.77746 3.9842,-1.91311 4.8665,-3.69187 0.1663,-0.33553 0.4393,-0.67614 0.6378,-0.73837 0.1964,-0.0617 2.4305,-0.26793 4.9672,-0.46988 5.4797,-0.43623 6.4862,-0.57112 9.1625,-1.40962 3.982,-1.24749 6.235,-2.96528 7.6858,-5.90699 0.9306,-1.8869 1.1362,-4.86303 0.6042,-8.35706 -0.3274,-2.15142 -1.4144,-5.24086 -2.383,-6.77961 -0.9009,-1.43134 -3.0833,-3.69652 -4.833,-5.03437 -1.809,-1.38329 -5.3378,-3.23879 -7.7194,-4.06106 -2.9906,-1.03262 -5.6997,-1.57313 -8.3906,-1.611 z"
-         id="path7557" />
-      <path
-         style="fill:#6f6e6c"
-         d="m 1163.0569,285.07925 c 0.7327,0.23469 0.9564,0.0949 1.5883,-0.99173 0.3967,-0.68191 1.0142,-1.37584 1.9982,-2.24481 1.3953,-1.23226 1.4551,-1.26743 2.9512,-1.73655 2.3806,-0.74653 3.5631,-0.80645 6.9551,-0.35236 2.4902,0.33336 4.0233,0.83157 6.4014,2.08029 2.7222,1.42932 5.1834,3.76943 5.719,5.43741 0.098,0.3036 0.2877,0.59733 0.4229,0.65271 0.135,0.0553 1.3299,-0.15982 2.6557,-0.47825 2.2659,-0.5443 3.1499,-0.70001 4.9163,-0.86586 1.3005,-0.12207 5.4418,-1.58288 6.7376,-2.37649 0.3419,-0.20933 0.3487,-0.23855 0.058,-0.24836 -0.2586,-0.009 -0.2094,-0.075 0.2287,-0.30814 0.4308,-0.22934 0.7873,-0.69853 1.5641,-2.05863 1.0399,-1.82096 1.4373,-3.10567 1.1975,-3.87098 -0.1703,-0.54337 -1.2448,-2.2331 -2.1622,-3.40019 -0.8396,-1.06815 -2.648,-2.78581 -4.9567,-4.7083 -1.3812,-1.14999 -1.7737,-1.56373 -1.9168,-2.02094 -0.16,-0.51073 -0.3045,-0.62851 -1.2935,-1.05479 -5.4001,-2.32722 -10.3262,-3.13551 -14.3279,-2.3509 -1.1652,0.22845 -1.183,-0.0172 0.1526,2.08692 0.7077,1.1143 0.7764,1.29052 0.8704,2.22915 0.1258,1.25449 -0.06,2.38373 -0.5663,3.44454 -0.804,1.68335 -2.7414,3.53081 -4.9236,4.69479 -1.5103,0.8057 -4.7062,1.81838 -6.0397,1.91377 -3.4581,0.2474 -6.8208,-0.65582 -8.3752,-2.24957 -0.725,-0.74328 -1.5126,-2.17767 -1.8983,-3.45699 1.484,-5.76908 1.6951,-4.5942 2.5254,-7.12123 1.7184,-1.58819 2.8541,-2.20946 5.6143,-3.07113 2.2182,-0.69245 2.5786,-0.76331 3.9445,-0.77554 0.8268,-0.008 2.1049,0.10246 2.8401,0.24395 l 1.3367,0.25742 3.062,-0.91934 c 3.3222,-0.99758 5.0363,-1.27103 7.6633,-1.22267 8.1355,0.14978 17.3181,4.92241 20.9295,10.87829 1.0711,1.7664 2.1569,5.25252 2.3953,7.69075 0.1857,1.89948 0.09,4.55725 -0.206,5.67642 -0.6807,2.58058 -3.2642,5.30017 -5.7847,6.0898 -0.7982,0.25008 -0.8084,0.24781 -0.9529,-0.21373 -0.2318,-0.73967 -1.3198,-1.37151 -2.3401,-1.35919 -1.5582,0.0188 -3.0481,0.46291 -5.0032,1.49123 -1.9487,1.02487 -2.4715,1.4351 -2.4735,1.94037 0,0.36972 0.074,0.35176 -2.5724,0.61815 -3.5621,0.35861 -3.3753,0.31731 -3.6518,0.80774 -0.3052,0.54212 -0.4253,0.59389 -0.4445,0.19188 -0.023,-0.46609 -0.6037,-0.44131 -0.7711,0.033 -0.074,0.20863 -0.2722,0.7777 -0.4414,1.26462 -0.4893,1.40858 -1.0553,1.82129 -3.5459,2.58585 -1.7645,0.54159 -2.2685,0.63463 -3.4836,0.64307 -3.1847,0.0221 -6.2766,-0.72565 -9.0168,-2.18078 -2.1011,-1.11571 -2.9255,-1.74096 -4.4628,-3.3844 -1.1149,-1.19211 -1.4212,-1.41348 -3.1518,-2.27869 -1.0543,-0.52707 -2.0829,-1.15399 -2.286,-1.39313 -0.4888,-0.57566 -0.5257,-1.4468 -0.1102,-2.59227 0.172,-0.47286 0.2988,-0.90306 0.2823,-0.956 0.5699,-1.38162 0.7582,-1.08042 2.1485,-0.71014 z m 1.5699,5.27795 c 0.3946,0.18479 0.7646,0.28152 0.8222,0.21497 0.058,-0.0666 0.1776,-0.029 0.2666,0.0832 0.1737,0.21902 3.3211,1.57327 3.5152,1.51245 0.062,-0.0201 0.2451,0.074 0.4024,0.20891 0.1574,0.13494 0.4227,0.20254 0.5898,0.1502 0.1684,-0.0528 0.3357,0.008 0.3755,0.13361 0.04,0.12711 0.2072,0.18632 0.3767,0.13322 0.1717,-0.0538 0.337,0.006 0.3779,0.13699 0.04,0.12793 0.2489,0.24308 0.464,0.25595 0.2151,0.0129 0.5169,0.10493 0.6707,0.20443 0.1538,0.0997 0.3575,0.158 0.4524,0.12982 0.096,-0.028 0.392,0.0706 0.6594,0.21966 0.5634,0.31368 0.97,0.1722 0.8916,-0.31015 -0.04,-0.25028 -0.2141,-0.35735 -0.6872,-0.42374 -0.3479,-0.049 -0.7009,-0.17484 -0.7841,-0.27995 -0.084,-0.10504 -0.274,-0.15275 -0.4239,-0.10579 -0.1498,0.0469 -0.3449,-0.006 -0.4335,-0.11794 -0.089,-0.1118 -0.3551,-0.21488 -0.5922,-0.22906 -0.2369,-0.0142 -0.453,-0.0961 -0.48,-0.18207 -0.026,-0.086 -0.1816,-0.1148 -0.3438,-0.064 -0.1619,0.0508 -0.3812,-0.0311 -0.4871,-0.18236 -0.1064,-0.15109 -0.2837,-0.24613 -0.3953,-0.21117 -0.2239,0.0701 -1.1851,-0.29694 -1.9875,-0.75914 -0.2848,-0.16409 -0.604,-0.27137 -0.7094,-0.23841 -0.1052,0.033 -0.3572,-0.0765 -0.5604,-0.24311 -0.2031,-0.16667 -0.4987,-0.2625 -0.6569,-0.21295 -0.1581,0.0494 -0.3189,-0.0113 -0.3575,-0.13335 -0.039,-0.12295 -0.2501,-0.25729 -0.4705,-0.2987 -0.2202,-0.0415 -0.5084,-0.15442 -0.6407,-0.25114 -0.2616,-0.19154 -0.7165,0.0618 -0.6266,0.34874 0.03,0.0961 0.3776,0.32607 0.7722,0.51085 z m 12.0356,4.20088 c 0.442,0.25991 0.9729,0.10525 0.7919,-0.23071 -0.2163,-0.40171 -1.2852,-0.45929 -1.1609,-0.0625 0.016,0.0513 0.1823,0.18331 0.369,0.29325 z m 1.6922,0.44025 c 0.4615,0.0876 0.6824,0.003 0.6093,-0.2285 -0.076,-0.2438 -0.7658,-0.43035 -0.9224,-0.24955 -0.1864,0.21538 -0.06,0.40695 0.3131,0.47805 z m 0.5364,-11.95609 c 0.6297,0.24593 1.873,0.78022 2.7627,1.18736 0.8896,0.40712 1.6434,0.69094 1.6747,0.63072 0.124,-0.23735 -1.0198,-1.17832 -2.1075,-1.7337 -1.0086,-0.51495 -3.2266,-1.07411 -3.6877,-0.92966 -0.292,0.0915 0.1804,0.38554 1.3578,0.84528 z"
-         id="path7555"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccsssccscsccssccssscccsssccscccsscscscsccscccccsscssscccccccccccccccccccccccccccccccccccccccccccccsccc" />
-      <path
-         style="fill:#504f4c"
-         d="m 1160.5691,287.37766 c 0.6053,-1.79482 0.6699,-2.84619 1.7823,-2.35331 0.7432,0.18017 1.4653,0.29314 1.6044,0.25104 0.1395,-0.0422 0.4594,-0.39706 0.7111,-0.78878 0.2518,-0.39171 1.0844,-1.37323 1.8504,-2.1811 1.2111,-1.2774 1.523,-1.52205 2.3925,-1.87663 1.2805,-0.52229 3.4541,-0.89801 4.8276,-0.83455 1.8051,0.0833 4.3241,0.45082 5.5849,0.81452 4.0891,1.17977 7.8298,3.92107 9.1581,6.71169 0.2497,0.52441 0.5419,0.97594 0.6496,1.0034 0.1063,0.0274 0.8698,-0.1083 1.694,-0.30154 0.8244,-0.19329 1.8077,-0.33868 2.1853,-0.32313 1.0363,0.0429 3.8275,-0.46969 5.6526,-1.03786 5.3724,-1.67229 9.1657,-4.13897 10.5673,-6.87164 0.5377,-1.04864 0.6244,-1.68165 0.1102,-0.80496 -0.6404,1.09149 -1.8631,2.36161 -3.181,3.30403 -1.547,1.10623 -1.6142,1.00332 -0.5779,-0.88261 1.0638,-1.93563 1.2953,-2.98604 0.8538,-3.87227 -1.0485,-2.10495 -3.089,-4.45729 -5.9974,-6.91413 -2.2702,-1.91776 -2.9767,-2.64449 -3.0024,-3.08829 -0.017,-0.30611 -0.2924,-0.48167 -1.6266,-1.03935 -5.1483,-2.15209 -9.8456,-2.93431 -13.7321,-2.28676 -1.5319,0.25523 -1.5758,0.34877 -0.7199,1.53517 1.6851,2.33579 1.8462,4.4288 0.5286,6.86371 -0.5492,1.01458 -2.3961,2.82905 -3.6847,3.61967 -2.2563,1.3845 -5.1509,2.32231 -7.5271,2.43859 -1.6673,0.0816 -4.5324,-0.37639 -5.7422,-0.91799 -1.8363,-0.82206 -3.4912,-2.95028 -3.9098,-5.02766 -0.022,-4.75234 0.6407,-4.1986 2.4003,-6.49315 1.6015,-1.54386 3.4064,-2.58193 5.7841,-3.32683 2.472,-0.77445 5.0046,-0.91385 7.0757,-0.38944 l 0.9371,0.23729 3.2672,-0.97242 c 4.1766,-1.24303 5.9365,-1.43929 9.6038,-1.07071 5.067,0.50926 10.7604,2.87978 14.5866,6.07343 3.4649,2.89187 5.0766,5.50183 6.0732,9.83383 0.7787,3.38542 0.7606,6.82785 -0.047,8.89858 -0.6877,1.76355 -2.5061,3.78533 -3.91,4.34731 -0.4526,0.18114 -0.4864,0.16337 -0.6504,-0.34138 -0.1031,-0.31487 -0.3838,-0.68639 -0.689,-0.90908 -6.3322,-3.10415 -9.4568,0.99945 -14.2579,3.4361 -0.4772,0.24136 -1.3264,0.53792 -1.8874,0.65902 -0.5608,0.12106 -1.4418,0.31641 -1.9577,0.434 -0.5158,0.11756 -1.1636,0.24578 -1.4395,0.28483 -0.4034,0.0571 -0.4986,0.13459 -0.486,0.39611 0.014,0.27963 0.1063,0.30392 0.6605,0.17366 0.4442,-0.10428 0.6836,-0.0795 0.7685,0.0798 0.2273,0.4251 -0.4393,1.84929 -1.228,2.62382 -0.6698,0.65776 -0.9251,0.79823 -2.3511,1.29398 -1.3327,0.46329 -1.8746,0.57064 -3.2474,0.64314 -1.8878,0.0998 -4.9379,-0.32881 -6.6577,-0.93537 -2.6586,-0.93759 -5.5542,-2.77124 -6.8871,-4.36126 -1.0418,-1.24278 -1.4051,-1.5087 -3.5118,-2.56948 -1.8464,-0.92978 -2.1237,-1.12286 -2.3563,-1.6412 -0.2107,-0.46975 -0.2196,-0.77905 -0.044,-1.54374 z m 1.9141,2.23482 c 0.4588,0.21474 0.9041,0.3353 0.9898,0.26793 0.086,-0.0673 0.2454,0.0141 0.355,0.18069 0.1604,0.24373 4.8021,2.25093 6.7208,2.90623 0.2444,0.0836 0.6157,0.21741 0.8254,0.29748 1.2665,0.48463 2.9844,0.98242 3.1004,0.89856 0.075,-0.0541 0.1885,-0.27809 0.2523,-0.4978 0.1063,-0.36672 0.069,-0.42289 -0.4581,-0.6848 -0.3156,-0.15692 -0.7656,-0.33829 -1.0001,-0.40306 -0.4301,-0.11881 -1.6004,-0.52361 -2.0296,-0.70206 -0.1281,-0.0531 -0.2719,-0.0843 -0.3201,-0.0694 -0.1339,0.0419 -2.0597,-0.71129 -2.1656,-0.84714 -0.052,-0.0659 -0.1857,-0.091 -0.2984,-0.0559 -0.1126,0.0352 -0.3937,-0.0651 -0.6245,-0.22313 -0.2307,-0.15804 -0.4782,-0.26949 -0.5504,-0.24769 -0.1164,0.0352 -1.575,-0.59681 -2.692,-1.16625 -0.223,-0.11367 -0.4891,-0.18067 -0.5909,-0.14874 -0.101,0.0321 -0.2159,-0.0395 -0.2534,-0.15885 -0.076,-0.24555 -1.5902,-0.93851 -1.863,-0.85309 -0.1658,0.0521 -0.3329,0.67561 -0.2627,0.98109 0.017,0.0745 0.4062,0.31094 0.8651,0.52569 z m 15.8361,-6.52394 c 1.3112,0.50941 3.1864,1.32288 4.1674,1.80771 1.7555,0.8675 2.2365,0.99028 2.0935,0.53424 -0.039,-0.12696 -0.032,-0.38401 0.016,-0.57119 0.2438,-0.93695 -3.4746,-3.07344 -6.4383,-3.69913 -1.0087,-0.21297 -1.0632,-0.20693 -1.3881,0.15334 -0.1941,0.21542 -0.4979,0.38268 -0.7137,0.39299 -0.7905,0.0379 -0.081,0.47163 2.2628,1.38204 z m 9.2487,-21.47153 c 0.3613,0.14811 0.777,0.94417 0.6522,1.24867 -0.077,0.19061 0.2191,0.33306 1.2906,0.61853 0.7658,0.20398 2.1575,0.58333 3.093,0.84298 4.8927,1.35801 4.4643,1.33675 5.0915,0.25257 0.2809,-0.48542 0.4886,-0.95271 0.4617,-1.03846 -0.1322,-0.42153 -4.293,-1.80664 -6.514,-2.16845 -1.0072,-0.16406 -3.9388,-0.28428 -4.2853,-0.17571 -0.207,0.065 -0.091,0.29628 0.2103,0.41988 z"
-         id="path7553"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccscssccccscsssscccscccssccsccsssscccccccscccssssccccccccccccscccccccccccccccccccccccccscccccc" />
-      <path
-         style="fill:#42413d"
-         d="m 1160.5317,288.1096 c 0.9623,-3.59898 0.8812,-3.26926 2.4083,-2.85248 0.43,0.14408 0.8916,0.22756 1.0259,0.18545 0.1342,-0.0421 0.6042,-0.49087 1.0442,-0.99729 0.858,-0.98719 1.6443,-1.60027 2.6922,-2.09955 0.9817,-0.46775 1.5585,-0.90612 1.488,-1.13108 -0.07,-0.22552 -0.439,-0.28086 -0.9371,-0.14067 -0.3118,0.0877 -0.3118,0.0761 -5e-4,-0.17719 0.4915,-0.39993 2.9319,-1.12224 4.0624,-1.20241 1.2226,-0.0867 2.9251,0.0364 4.9076,0.35488 1.9661,0.31581 2.5763,0.5023 4.7222,1.44331 3.0477,1.33641 5.99,4.02035 6.6474,6.06321 0.1992,0.61925 0.6546,0.85372 1.2783,0.65829 0.2713,-0.0849 1.0212,-0.14041 1.6664,-0.1232 1.1086,0.0295 1.1498,0.0452 0.7493,0.28326 -0.9562,0.56872 -0.9368,0.53864 -0.667,1.04572 0.2367,0.44514 0.2223,0.4981 -0.2239,0.81826 -0.5584,0.40065 -4.3671,1.90674 -4.6433,1.83618 -0.1042,-0.0264 -0.3646,0.0279 -0.5795,0.12095 -0.2152,0.093 -0.4573,0.11193 -0.538,0.0422 -0.08,-0.0698 -0.3246,-0.0294 -0.5421,0.0898 -0.2639,0.14446 -0.488,0.15699 -0.6724,0.0377 -0.31,-0.20078 -0.8069,-0.10064 -0.8778,0.17682 -0.069,0.26805 -0.7936,0.45063 -1.3762,0.34637 -0.7917,-0.14174 -2.3041,0.38974 -2.5994,0.91345 -0.1957,0.34786 -0.3057,0.41144 -0.6117,0.35333 -0.205,-0.0389 -0.4161,-0.20818 -0.4687,-0.37599 -0.069,-0.21796 -0.3263,-0.32856 -0.9032,-0.38725 -0.7926,-0.0806 -3.8694,-1.10613 -8.3845,-2.79467 -1.2522,-0.46827 -2.9562,-1.09569 -3.7867,-1.39427 -0.8306,-0.29857 -1.9804,-0.75482 -2.5553,-1.01387 l -1.0451,-0.47097 -0.2319,0.53814 c -0.4065,0.94362 -0.5892,0.80127 3.6835,2.8708 2.4781,1.20029 5.2712,2.30547 8.4215,3.33201 2.4676,0.80416 4.0011,1.12212 5.1371,1.06514 0.3877,-0.0195 0.7085,0.0524 0.7206,0.16142 0.013,0.10804 0.1411,0.14812 0.287,0.0891 0.2147,-0.0869 0.2437,-0.0544 0.152,0.16922 -0.075,0.18593 -0.2773,0.29494 -0.6136,0.33258 -0.3648,0.0407 -0.1227,0.14488 0.8953,0.3845 0.8129,0.19138 1.6847,0.27962 2.0885,0.21138 0.6475,-0.10942 0.7352,-0.18084 1.3327,-1.0856 0.3809,-0.5765 0.8973,-1.12647 1.276,-1.35883 0.7572,-0.46466 1.741,-0.62442 1.8428,-0.29934 0.1346,0.42931 -0.8173,1.94842 -1.6294,2.60065 -1.1543,0.92694 -3.4276,1.60575 -5.4998,1.64214 -2.6757,0.047 -5.6415,-0.56473 -8.1317,-1.67726 -2.0383,-0.91053 -4.8362,-3.093 -5.1178,-3.99213 -0.1399,-0.44685 -0.7217,-0.83133 -3.3094,-2.18737 -1.2712,-0.66618 -2.3237,-1.32668 -2.4365,-1.5292 -0.1089,-0.19605 -0.1752,-0.58999 -0.1464,-0.87542 z m 13.0693,7.18493 c 0.3102,0.10728 0.5952,0.29583 0.6339,0.41917 0.039,0.1233 0.1751,0.19133 0.3034,0.15116 0.1282,-0.0402 0.7045,0.004 1.2808,0.10031 0.9172,0.15165 1.0918,0.24228 1.4,0.72681 0.4407,0.69271 0.7542,0.79649 0.5631,0.1864 -0.078,-0.25166 -0.085,-0.52458 -0.014,-0.60649 0.14,-0.16161 -0.2541,-0.50158 -0.4941,-0.42637 -0.073,0.0226 -0.6851,-0.0986 -1.3622,-0.26972 -2.3389,-0.59056 -2.9489,-0.71543 -2.9116,-0.596 0.02,0.0659 0.2913,0.20761 0.6011,0.31482 z m 2.3066,-12.81813 c 2.5723,0.75872 4.1049,1.38575 7.0796,2.89662 2.0549,1.04369 2.6341,1.24171 2.5145,0.85981 -0.025,-0.0839 0.1239,-0.20628 0.3334,-0.27199 0.4731,-0.14819 0.4343,-0.2791 -0.3092,-1.04173 -1.9942,-2.04593 -6.0895,-3.972 -9.2322,-4.34197 -1.7058,-0.20081 -1.9436,-0.14898 -2.2822,0.49729 -0.1608,0.30735 -0.2877,0.60465 -0.282,0.66067 0.013,0.0561 0.9859,0.38962 2.1781,0.7413 z m -13.1001,-15.01603 c 1.5124,-2.25608 2.9932,-3.35738 5.9168,-4.4008 2.9038,-1.03615 5.0589,-1.20505 7.6251,-0.59752 1.2361,0.29262 1.2685,0.29075 1.9226,-0.11067 0.8283,-0.50821 4.293,-1.44718 6.2676,-1.69866 4.4611,-0.56818 8.6609,0.1046 13.6495,2.1867 3.3164,1.38412 5.6793,3.0011 8.1782,5.59657 1.696,1.7614 3.3405,4.18373 2.9276,4.313 -0.083,0.0258 -0.016,0.60373 0.1464,1.2841 0.4691,1.95816 0.081,3.90422 -1.1364,5.68519 -0.5961,0.87242 -1.9897,2.15725 -2.7255,2.5125 l -0.5604,0.27064 0.7777,-1.46144 c 0.5063,-0.95113 0.8198,-1.79339 0.8979,-2.41212 l 0.1201,-0.95071 -0.9204,-1.49403 c -1.1644,-1.88966 -2.9141,-3.75421 -5.9012,-6.28878 -1.8098,-1.5355 -2.335,-2.06656 -2.47,-2.49746 -0.1542,-0.49238 -0.3115,-0.60564 -1.5678,-1.12887 -4.6024,-1.9166 -8.6472,-2.76449 -12.2471,-2.56725 -1.4884,0.0816 -2.8853,0.40741 -3.0436,0.70985 -0.074,0.14011 0.1412,0.54756 0.6754,1.28405 0.6584,0.90697 0.8337,1.27636 1.1014,2.319 0.2665,1.03732 0.2838,1.42398 0.1077,2.3638 -0.2705,1.43619 -1.0288,2.7098 -2.3557,3.95702 -1.7901,1.68234 -3.0086,2.35006 -6.0118,3.29429 -2.5382,0.79809 -2.6252,0.81398 -4.1881,0.76573 -5.1539,-0.15915 -7.7868,-1.85984 -8.8033,-5.68644 0.092,-4.29135 0.334,-3.53321 1.6179,-5.24775 z m 17.3288,-3.57425 c 0.089,0.0683 1.0567,-0.0271 2.1502,-0.21226 2.4017,-0.40682 3.815,-0.43983 5.9028,-0.13789 1.6386,0.23695 5.7183,1.34696 7.6766,2.08867 0.6192,0.23455 1.2122,0.39942 1.3176,0.36639 0.1064,-0.0331 0.2801,-0.33267 0.3881,-0.66589 0.1077,-0.33319 0.3355,-0.82575 0.5059,-1.09461 0.1703,-0.26883 0.2711,-0.61255 0.2236,-0.76378 -0.1214,-0.38904 -2.9556,-1.54533 -4.895,-1.99736 -3.8158,-0.88936 -7.8713,-0.87362 -10.7934,0.0419 -1.4454,0.45282 -1.9541,0.79602 -2.4535,1.65486 -0.2654,0.45714 -0.268,0.53176 -0.023,0.71998 z m 23.9848,20.52909 c 0.1896,-0.14923 0.4372,-0.30025 0.5499,-0.33556 0.1127,-0.0353 0.7806,-0.47406 1.4843,-0.97491 2.1686,-1.54399 3.4787,-3.26916 4.09,-5.38648 l 0.309,-1.06976 0.2312,0.56785 c 0.4413,1.08354 0.559,4.57427 0.2234,6.63069 -0.2318,1.41985 -1.2353,3.29155 -2.3141,4.31658 -0.4718,0.4479 -1.0266,0.84218 -1.2331,0.87617 -0.3283,0.0541 -0.3917,-0.0113 -0.5025,-0.51449 -0.1514,-0.68723 -0.5934,-1.10704 -1.7851,-1.69587 -0.8146,-0.40249 -0.8732,-0.46903 -1.1282,-1.28369 -0.2451,-0.78197 -0.2384,-0.8836 0.075,-1.13053 z"
-         id="path7551"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccsccsscccccccccccccccccccccscccccccscccssscccccccccccccscccsccsssccsccccsssccssccccccccsccccsssccccssccscscccccccsccccccscccc" />
-      <path
-         style="fill:#2e2d2a"
-         d="m 1162.9526,285.36356 c 0.58,0.19649 0.7398,0.18163 1.3833,-0.12862 0.4003,-0.1929 1.1331,-0.50012 1.6285,-0.68267 0.4956,-0.18255 1.7754,-0.6691 2.8438,-1.08121 1.0686,-0.41213 2.1977,-0.77708 2.5096,-0.81098 0.3119,-0.034 1.0001,-0.12245 1.5296,-0.19673 0.9446,-0.13252 2.5291,0.11042 4.5329,0.69515 1.0766,0.31408 3.4511,1.40543 6.0045,2.7598 1.9902,1.05556 2.5998,1.26108 2.9402,0.99129 0.1102,-0.0874 0.3551,-0.12952 0.5439,-0.0937 0.4506,0.0856 0.3689,-0.18231 -0.325,-1.06397 -1.8472,-2.3473 -6.3542,-4.71297 -10.1703,-5.33827 -1.4505,-0.23765 -3.8105,-0.25923 -5.6428,-0.0515 -1.1615,0.13166 -1.3862,0.12057 -0.9884,-0.0487 0.7162,-0.30452 2.812,-0.62003 3.9152,-0.58941 1.668,0.0465 5.2142,0.64662 6.4585,1.09333 3.0209,1.08446 5.6664,2.847 7.2513,4.83092 0.8724,1.09218 1.5867,2.68522 1.2513,2.79031 -0.3386,0.10601 -0.1884,0.35525 0.215,0.35674 0.9271,0.002 -0.054,0.45268 -2.9381,1.34542 -3.2912,1.01869 -5.2254,1.45402 -6.7967,1.52971 -1.0292,0.0496 -3.1708,-0.0826 -3.991,-0.24654 l -0.489,-0.0976 0.5243,-0.0641 c 0.2884,-0.0352 0.5134,-0.0991 0.4999,-0.14209 -0.014,-0.0428 -0.6142,-0.21632 -1.335,-0.38549 -4.52,-1.06067 -12.6751,-4.23676 -12.9247,-5.03372 0.099,-0.69458 0.6395,-0.64663 1.5692,-0.33737 z m 9.7612,2.82163 c 1.1575,0.53661 2.0837,0.60249 2.1121,0.15027 0.038,-0.59878 -2.1152,-1.2735 -3.0948,-0.96991 -0.3961,0.12282 -0.2403,0.25269 0.9827,0.81964 z m -10.4565,-19.45388 c 1.1247,-1.66978 3.1714,-3.3565 5.5946,-4.61075 2.1308,-1.10297 6.6609,-1.62199 9.6224,-1.10245 0.5849,0.10269 1.1297,0.19397 1.2107,0.20298 0.082,0.009 -0.015,-0.11707 -0.2138,-0.28013 -0.1987,-0.16309 -0.3298,-0.35694 -0.2912,-0.43077 0.039,-0.0738 0.9718,-0.40446 2.0734,-0.73475 1.7197,-0.51554 1.8567,-0.53908 0.9669,-0.16632 -1.3046,0.5465 -1.4302,0.66414 -1.5411,1.44331 -0.088,0.61468 -0.075,0.64594 0.3578,0.96247 0.2465,0.17994 0.4857,0.44652 0.5314,0.5924 0.046,0.14585 0.4462,0.79598 0.8901,1.44471 1.0215,1.4926 1.2813,2.53057 1.0335,4.12806 -0.4272,2.75546 -3.0262,5.35458 -6.9283,6.92883 -2.8376,1.14479 -5.2137,1.42047 -8.1432,0.94488 -2.093,-0.33978 -3.2259,-0.85689 -4.2539,-1.94171 -1.1101,-1.17156 -1.9436,-2.73576 -1.986,-3.72734 -0.5227,-1.5348 -0.013,-2.33577 1.0767,-3.65342 z m 4.5155,23.87158 c 0.1064,-0.0333 0.5249,0.0391 0.9299,0.16104 0.7934,0.23878 0.9325,0.29182 1.7602,0.67113 0.2984,0.1368 0.8173,0.35112 1.1529,0.47627 0.3356,0.12519 0.6478,0.34528 0.6937,0.48917 0.046,0.14389 0.2728,0.29891 0.5044,0.3445 0.2314,0.0455 0.8359,0.26976 1.3433,0.49811 0.8493,0.38216 0.9266,0.45787 0.9712,0.95191 0.047,0.5236 0.054,0.52791 0.2629,0.17648 0.2829,-0.47537 0.3604,-0.48938 1.4768,-0.26677 0.7768,0.15491 1.0358,0.29639 1.3963,0.76302 0.5775,0.74745 0.9212,0.76343 0.692,0.0323 l -0.1716,-0.54806 1.5752,0.25715 c 0.8662,0.14143 1.6344,0.30851 1.7069,0.37127 0.073,0.0628 0.5037,0.0887 0.9582,0.0579 0.7828,-0.0534 0.8519,-0.0875 1.3032,-0.64262 0.2621,-0.32244 0.5393,-0.6059 0.616,-0.62994 0.076,-0.024 0.1469,-0.16249 0.156,-0.30768 0.043,-0.67217 2.1405,-1.71815 2.5105,-1.25137 0.2513,0.31729 -0.6668,1.82801 -1.486,2.44548 -0.355,0.26739 -1.2871,0.72336 -2.0713,1.01328 -1.1927,0.44087 -1.6879,0.54038 -3.0263,0.60822 -4.6711,0.23681 -9.8195,-1.63344 -12.7057,-4.61547 -0.7119,-0.73542 -0.8318,-0.96627 -0.5487,-1.05502 z m 21.2685,-28.93939 c 0.166,-0.0528 2.0581,0.35568 2.0879,0.4506 0.024,0.0783 -0.8057,-0.0557 -1.6531,-0.26656 -0.3126,-0.0779 -0.5082,-0.16063 -0.4348,-0.18404 z m 2.6142,0.52634 c 0.7866,0.1348 4.1042,1.1512 5.36,1.64215 0.6716,0.2626 1.2794,0.45914 1.3509,0.43677 0.071,-0.0224 0.1883,-0.27706 0.26,-0.56599 0.071,-0.28894 0.3251,-0.93845 0.5635,-1.44335 0.4202,-0.89024 0.4467,-0.91423 0.8743,-0.79291 0.2427,0.0688 1.1928,0.58621 2.1115,1.1497 6.8351,4.19264 9.8027,9.79819 7.4968,14.16019 -0.6186,1.17039 -1.9927,2.6939 -2.8789,3.19261 -0.608,0.34203 -0.5719,0.1555 0.2471,-1.27396 0.63,-1.09947 0.9563,-2.45594 0.7527,-3.12814 -0.067,-0.21764 -0.3961,-0.87442 -0.7338,-1.45954 -0.3377,-0.58514 -0.6715,-1.24735 -0.7419,-1.47158 -0.07,-0.22424 -0.3478,-0.55186 -0.6166,-0.72805 -0.2688,-0.17616 -1.0103,-0.83526 -1.6477,-1.46465 -0.6375,-0.62939 -1.5241,-1.44453 -1.9704,-1.81139 -0.4462,-0.36686 -1.1682,-0.96978 -1.6045,-1.33978 -0.4362,-0.36997 -0.9771,-0.81936 -1.2016,-0.9986 -0.2245,-0.17927 -0.4911,-0.5899 -0.592,-0.91256 -0.1768,-0.56415 -0.2663,-0.61888 -2.3312,-1.42629 -1.1811,-0.46182 -2.7319,-1.02119 -3.4462,-1.24306 -1.4816,-0.46012 -1.8923,-0.63126 -1.252,-0.52157 z m 14.1109,20.31462 c 0.06,-0.17272 0.6018,-0.66239 1.2016,-1.08817 1.8202,-1.29206 3.0035,-2.59438 3.8794,-4.26953 0.431,-0.82394 0.8326,-1.47232 0.8928,-1.44085 0.1532,0.08 0.3571,2.27649 0.3307,3.55831 -0.061,2.98321 -0.7458,5.09213 -2.0835,6.42355 -0.8062,0.80259 -0.8718,0.79118 -1.5325,-0.26676 -0.209,-0.33466 -0.538,-0.68415 -0.7313,-0.77664 -0.3515,-0.16827 -1.9831,-1.55405 -2.0387,-1.73164 -0.016,-0.0518 0.02,-0.23555 0.082,-0.40827 z"
-         id="path7549"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccscccccccccccccccsccsccsccccccccsssssccccsccccccccccsccccccccsccccccccccscscccccccsscccccccccccccccccc" />
-      <path
-         style="fill:url(#linearGradient9542);fill-opacity:1"
-         d="m 1162.5875,285.43002 c 0.5623,0.50709 2.6581,0.1198 4.0133,-0.74158 1.2274,-0.78021 3.5819,-1.47816 5.1038,-1.51299 1.6117,-0.0368 1.6569,-0.006 2.0184,1.36481 0.2176,0.82545 0.3645,1.15611 0.515,1.15914 0.1563,0.002 0.1164,-0.29463 -0.1516,-1.15238 -0.4361,-1.3914 -0.4053,-1.41543 1.497,-1.16918 2.0445,0.26464 2.0187,0.24383 1.662,1.3402 -0.3325,1.02232 -0.335,1.19141 -0.015,1.09129 0.1177,-0.0369 0.313,-0.43714 0.4334,-0.88917 0.1202,-0.45202 0.2972,-0.8467 0.3934,-0.87703 0.2517,-0.0794 3.1602,1.34504 3.2351,1.58434 0.037,0.11356 -0.3067,0.44998 -0.7899,0.77616 -0.469,0.31665 -0.8545,0.67008 -0.8566,0.78538 -0.013,0.3452 0.6499,0.036 1.4233,-0.67076 l 0.7161,-0.65451 0.6866,0.42322 c 0.3776,0.23277 1.0397,0.70954 1.4714,1.05949 0.7629,0.61849 1.3384,0.72181 1.3652,0.24509 0.013,-0.13737 0.233,-0.0888 0.6335,0.1365 0.3418,0.19231 0.7553,0.30771 0.919,0.25651 0.3364,-0.10548 0.7151,0.25766 0.4541,0.43547 -1.3537,0.92161 -5.5619,2.22578 -7.8095,2.42009 -3.3348,0.28831 -7.2882,-0.57354 -13.321,-2.90411 -1.6848,-0.65087 -2.0335,-0.84466 -2.0686,-1.1497 -0.037,-0.31144 -0.09,-0.33781 -0.3565,-0.17445 -0.2521,0.15431 -0.4957,0.0758 -1.2312,-0.3968 -0.6067,-0.2808 -1.377,-1.24477 0.059,-0.78503 z m 7.4987,1.91832 c 0.2488,-0.0396 0.3686,0.0367 0.4019,0.25549 0.1031,0.67495 4.8113,2.16025 5.8334,1.84005 0.1639,-0.0513 0.8537,-0.0474 1.5328,0.009 1.5596,0.12898 1.9502,0.11906 2.0993,-0.0532 0.2901,-0.33493 -0.592,-0.84545 -2.3673,-1.37005 -2.2672,-0.67 -2.9883,-0.9964 -3.0423,-1.37689 -0.1076,-0.75411 -2.8142,-1.12541 -3.9287,-0.53881 -1.0406,0.5477 -1.394,1.37227 -0.5291,1.2346 z m 13.071,1.69276 c 0.4656,-0.20451 0.8936,-0.46254 0.9508,-0.57342 0.07,-0.13528 -0.013,-0.13107 -0.2471,0.0129 -0.1934,0.11793 -0.643,0.30671 -0.9992,0.41955 -0.3562,0.11293 -0.6259,0.2744 -0.5993,0.35902 0.03,0.0969 0.3618,0.0161 0.8948,-0.21798 z m -20.9934,-19.87274 c 0.9025,-1.42782 2.1977,-2.64761 4.048,-3.8121 1.1019,-0.69353 1.718,-0.96647 3.4002,-1.50655 2.1704,-0.69678 3.1376,-0.8466 5.3514,-0.829 2.2469,0.0179 4.2487,0.61935 5.0436,1.29297 -1.2213,-0.81227 0.9964,-0.0623 2.1025,4.07938 0.1367,0.13877 0.1502,0.29858 0.04,0.46851 -0.091,0.14183 -0.119,0.41041 -0.06,0.59686 0.058,0.18647 0.013,0.50625 -0.1126,0.71064 -0.1202,0.20442 -0.1812,0.49092 -0.1355,0.63673 0.045,0.14579 0,0.33312 -0.1077,0.4163 -0.1052,0.0831 -0.1658,0.30991 -0.1353,0.5038 0.03,0.19392 -0.055,0.47011 -0.1886,0.61373 -0.1345,0.14361 -0.3702,0.46963 -0.524,0.7245 -0.1537,0.25485 -0.4006,0.4629 -0.5486,0.46234 -0.148,-5.5e-4 -0.4693,0.2514 -0.7142,0.55987 -0.245,0.30845 -0.5052,0.5796 -0.5784,0.60253 -0.073,0.0229 -0.1349,0.13653 -0.1374,0.25243 -1.612,1.15817 -3.3623,1.98032 -4.7076,2.42887 -0.1535,0.15639 -0.631,0.25292 -1.506,0.30434 -0.7048,0.0415 -1.4058,0.11431 -1.5573,0.16181 -1.9045,0.0726 -4.0779,-0.16444 -5.8454,-0.51376 -0.9245,-0.27884 -1.2245,-0.47046 -1.9792,-1.26425 -1.3087,-1.37666 -2.007,-2.86002 -2.018,-4.28669 0.1623,-1.68699 0.149,-1.46708 0.8705,-2.60327 z m 4.9986,23.81498 c 0.2237,-0.07 3.9772,1.4047 4.0337,1.58493 0.025,0.0832 -0.021,0.17286 -0.1052,0.19915 -0.085,0.0263 -0.1312,0.11643 -0.1053,0.20032 0.025,0.0839 0.2511,0.0887 0.4996,0.0113 0.31,-0.0971 0.7567,-0.0131 1.4211,0.26664 0.906,0.38157 0.976,0.44709 1.0726,1.00395 0.1089,0.62468 0.2937,0.70834 0.4928,0.22247 0.1668,-0.4068 0.4473,-0.45564 1.4267,-0.24842 0.6813,0.14416 0.9699,0.3146 1.4082,0.83145 0.6248,0.73668 1.0232,0.68435 0.7077,-0.0929 -0.1063,-0.26397 -0.1349,-0.47259 -0.061,-0.4636 0.8128,0.0992 2.8622,0.50719 3.1156,0.62001 0.1795,0.0799 0.7373,0.0561 1.2396,-0.0531 0.7916,-0.1718 0.9388,-0.25348 1.103,-0.61156 0.1042,-0.2273 0.3425,-0.46117 0.5295,-0.51974 0.2108,-0.0661 0.334,-0.23096 0.3243,-0.43455 -0.02,-0.42254 0.5048,-0.83024 1.4521,-1.12697 0.9049,-0.28346 1.0254,-0.10407 0.529,0.78765 -0.7336,1.31762 -1.9533,2.0894 -4.2146,2.66655 -3.1882,0.81368 -7.0044,0.28315 -10.6894,-1.48603 -1.9279,-0.92571 -4.7381,-3.18245 -4.1805,-3.35719 z m 11.5109,-12.41472 c 0.2969,0.0522 0.6095,0.15503 0.6946,0.22875 0.085,0.0738 -0.089,0.0914 -0.3851,0.0393 -0.297,-0.0522 -0.6097,-0.15503 -0.6948,-0.22874 -0.085,-0.0738 0.089,-0.0914 0.3853,-0.0394 z m 2.291,0.80467 c 0.2154,0.0992 0.4024,0.21483 0.4154,0.25679 0.014,0.042 -0.1522,-0.003 -0.3677,-0.10428 -0.2152,-0.0992 -0.4022,-0.21482 -0.4154,-0.25676 -0.014,-0.042 0.1524,0.003 0.3677,0.10416 z m 0.7398,0.35445 c 0.2354,-0.0738 2.2632,1.01825 3.1192,1.67961 1.0146,0.7839 2.8789,2.73995 2.8739,3.01546 0,0.11117 -0.3733,-0.19884 -0.8254,-0.68894 -1.0444,-1.13238 -2.4862,-2.27527 -4.0638,-3.22138 -0.681,-0.40844 -1.1779,-0.76158 -1.1039,-0.78475 z m 16.0502,-15.9647 c 0.1972,-0.83421 0.7866,-2.03963 1.0352,-2.1176 0.2922,-0.0914 3.4694,1.74684 4.753,2.75 1.4275,1.11583 3.4333,3.25094 4.2171,4.48941 0.8649,1.36601 1.6166,3.83112 1.5465,5.071 -0.081,1.42389 -0.482,2.53107 -1.3198,3.63893 -0.7391,0.97731 -1.8913,2.08292 -2.166,2.07795 -0.077,-10e-4 0.076,-0.32912 0.3452,-0.72817 0.8133,-1.20954 1.3442,-3.74152 0.8514,-4.06058 -0.1378,-0.0892 -0.2529,-0.35896 -0.2787,-0.65419 -0.03,-0.34097 -0.1592,-0.59678 -0.4021,-0.79623 -0.197,-0.16159 -0.4403,-0.55337 -0.5407,-0.87059 -0.2868,-0.90512 -1.1078,-2.10258 -1.5277,-2.22766 -0.2067,-0.0618 -0.4043,-0.2027 -0.4391,-0.31349 -0.092,-0.29625 -0.9964,-1.09446 -1.7673,-1.56104 -0.37,-0.22401 -0.798,-0.64242 -0.9509,-0.9298 -0.1555,-0.29218 -0.3978,-0.52261 -0.55,-0.52279 -0.5428,-6.5e-4 -1.0624,-0.11718 -1.1032,-0.24735 -0.023,-0.0733 -0.2177,-0.23317 -0.4325,-0.35545 -0.3902,-0.2219 -1.2927,-1.36395 -1.3843,-1.75147 -0.026,-0.11255 0.025,-0.51344 0.114,-0.89088 z m 9.7757,16.60323 c 0.6892,-0.66726 1.5644,-1.66331 1.9447,-2.21341 l 0.6917,-1.00021 0.209,0.48973 c 0.1152,0.26936 0.2272,0.95636 0.2498,1.52671 0.03,0.77868 -0.045,1.15155 -0.3079,1.49693 -0.2941,0.38818 -0.3114,0.52499 -0.1101,0.87666 0.1973,0.34482 0.1742,0.59631 -0.1334,1.45772 -0.4154,1.16247 -0.7384,1.49937 -1.4177,1.47773 -0.5113,-0.0163 -1.3385,-0.6469 -1.4923,-1.13758 -0.055,-0.17389 -0.181,-0.33709 -0.2812,-0.36266 -0.1009,-0.0256 -0.2773,-0.35065 -0.3938,-0.72245 l -0.2117,-0.67595 z"
-         id="path7547"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccccssccccccccccccccccccccccssscccccccscsscccccccccccccccccsccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccc" />
-      <path
-         style="fill:#171613"
-         d="m 1164.459,286.52116 c 0.284,-0.67318 3.1152,-2.33263 4.6272,-2.71212 0.4349,-0.10916 0.5129,-0.0547 1.0353,0.72167 0.3107,0.46184 0.5591,0.93285 0.5519,1.0467 -0.013,0.11382 -0.3403,0.40962 -0.74,0.65719 -0.5678,0.35164 -0.7327,0.54768 -0.7535,0.8958 -0.021,0.35772 0.038,0.46768 0.3015,0.55723 0.1803,0.0614 0.3836,0.0943 0.4514,0.0728 0.069,-0.0213 0.1538,0.0583 0.191,0.17706 0.089,0.28418 2.941,1.38195 4.2154,1.62255 1.3056,0.24653 6.2707,0.39702 6.3231,0.19167 0.048,-0.19086 0.5247,-0.18334 0.585,0.01 0.024,0.0749 -0.082,0.17491 -0.2322,0.22222 -0.1508,0.0474 -0.3258,0.18455 -0.3887,0.30498 -0.2251,0.43028 -3.7473,0.49971 -6.0554,0.11931 -1.993,-0.32845 -7.3127,-2.05003 -9.3518,-3.02644 -0.9197,-0.44052 -0.9316,-0.45373 -0.7602,-0.86 z m 3.1893,6.74675 c 0.1239,0.0279 0.9438,0.31764 1.8223,0.64357 l 1.5971,0.59265 -0.5186,0.44354 c -0.6265,0.5355 -0.6728,0.52265 -2.0064,-0.5569 -1.0009,-0.81011 -1.3281,-1.22093 -0.8944,-1.12286 z m 3.5446,1.97677 c 0.8252,-0.25237 0.9451,-0.24166 1.7989,0.161 0.9025,0.42551 0.915,0.43979 0.9152,1.04664 0,0.33838 -0.069,0.63583 -0.154,0.66097 -0.2321,0.0688 -2.8861,-1.05047 -3.1845,-1.34308 -0.2466,-0.24212 -0.2147,-0.26895 0.6244,-0.52553 z m 3.2492,1.45265 0.3883,-0.57561 0.9878,0.1928 c 0.8742,0.17066 1.0437,0.27067 1.4762,0.87079 0.3593,0.49923 0.5655,0.65381 0.781,0.58628 0.2332,-0.073 0.2587,-0.2009 0.1252,-0.62748 l -0.1677,-0.53575 1.2798,0.20946 c 0.704,0.11519 1.4739,0.28262 1.7111,0.37203 0.2369,0.0894 0.7951,0.10107 1.2404,0.0262 0.6988,-0.11769 0.8596,-0.20493 1.175,-0.6368 0.2129,-0.29178 0.5474,-0.54257 0.8023,-0.60162 0.3881,-0.0899 0.4142,-0.13878 0.2322,-0.43574 -0.1843,-0.30092 -0.1411,-0.37359 0.4297,-0.7238 0.7514,-0.46097 1.3504,-0.66817 1.5163,-0.52454 0.1974,0.17093 -0.5182,1.31767 -1.2158,1.94814 -0.5816,0.5258 -0.8767,0.65923 -2.7141,1.22779 -1.9194,0.59405 -2.1715,0.63484 -3.6641,0.59353 -1.223,-0.0339 -4.7103,-0.59264 -4.7637,-0.76333 -0.013,-0.0146 0.1665,-0.2857 0.3804,-0.6023 z m -4.1793,-13.2275 c 0.4059,-0.12721 2.7023,-0.12419 2.8566,0.003 0.2455,0.20339 0.6863,1.69747 0.5483,1.85706 -0.1511,0.17431 -1.9658,0.22854 -2.2662,0.0678 -0.2434,-0.13027 -1.1529,-1.3392 -1.2565,-1.67026 -0.035,-0.11092 0.018,-0.22713 0.1176,-0.2583 z m 3.8174,-0.0235 c 0.2395,-0.075 2.9266,0.39094 3.095,0.53674 0.083,0.0709 0.029,0.48151 -0.1202,0.91263 -0.1479,0.43111 -0.2302,0.90755 -0.1827,1.05881 0.1531,0.48865 0.5431,0.15132 0.8187,-0.70825 0.1479,-0.46086 0.3479,-0.86269 0.4444,-0.89298 0.1968,-0.0615 2.3172,0.83698 2.7472,1.16433 0.329,0.25043 0.3041,0.28363 -0.6571,0.87254 -0.902,0.55282 -1.0959,0.9018 -0.6348,1.1429 0.2953,0.15442 0.3877,0.11105 1.1288,-0.52957 0.444,-0.38375 0.9283,-0.73567 1.0763,-0.78205 0.1479,-0.0463 0.6052,0.16547 1.0158,0.47076 0.7715,0.57354 1.5374,1.20812 1.5653,1.29666 0.013,0.0279 -0.4957,0.25431 -1.121,0.50334 -0.6249,0.24904 -1.1868,0.54898 -1.2483,0.66654 -0.1796,0.34339 -0.312,0.31069 -0.6528,-0.16108 -0.3499,-0.48414 -0.9736,-0.78601 -3.2888,-1.59145 -0.8362,-0.29092 -1.9576,-0.80325 -2.4923,-1.13852 -0.9584,-0.60119 -0.9763,-0.62442 -1.3105,-1.69103 -0.199,-0.63495 -0.2746,-1.10163 -0.183,-1.13032 z m 9.1319,5.77061 c 0.3001,-0.14528 0.7948,-0.40957 1.0997,-0.58729 0.9576,-0.55844 1.8708,-0.21118 1.1484,0.43672 -0.4385,0.39332 -2.1723,0.93192 -2.4808,0.77062 -0.3933,-0.20572 -0.3424,-0.3414 0.2327,-0.62005 z m 14.7941,-23.56732 c 0.1431,-0.81599 0.5663,-1.76864 0.8214,-1.84852 0.097,-0.0301 0.8086,0.29309 1.5837,0.71815 5.3071,2.91015 8.7401,7.28232 8.7497,11.1432 0,1.19782 -0.3082,2.41727 -0.6439,2.52241 -0.3247,0.10182 -0.4499,-0.47538 -0.1443,-0.66661 0.1507,-0.0944 0.2369,-0.36619 0.2065,-0.65097 -0.029,-0.26892 -0.062,-0.68265 -0.076,-0.91942 -0.02,-0.35346 -0.077,-0.41389 -0.3208,-0.33781 -0.3519,0.1103 -1.1339,-0.64057 -1.3693,-1.31491 -0.1215,-0.34713 -0.555,-0.40178 -0.4467,-0.0564 0.041,0.13282 0.014,0.26062 -0.06,0.28402 -0.075,0.0235 -0.218,-0.30573 -0.319,-0.7314 -0.1009,-0.42566 -0.262,-0.79409 -0.3586,-0.81874 -0.097,-0.0247 -0.2353,-0.23602 -0.3085,-0.46974 -0.073,-0.23371 -0.3095,-0.50615 -0.5248,-0.60542 -0.2153,-0.0992 -0.437,-0.32582 -0.4926,-0.50341 -0.055,-0.17762 -0.385,-0.50792 -0.7317,-0.73401 -0.3467,-0.22612 -0.8753,-0.69951 -1.1746,-1.052 -0.2993,-0.3525 -0.6484,-0.68362 -0.7756,-0.73586 -0.1274,-0.0522 -0.6647,-0.41149 -1.1941,-0.7984 -0.5293,-0.38689 -1.1515,-0.80953 -1.3829,-0.93917 -0.9404,-0.5271 -1.1355,-0.64793 -1.1482,-0.71059 -0.013,-0.0361 0.043,-0.3846 0.1115,-0.77451 z m 5.3627,3.33762 c 0.092,0.0238 0.1909,-0.0401 0.2169,-0.14177 0.1432,-0.56231 0.4002,-0.19681 1.1907,1.69398 0.2828,0.67642 0.6122,1.11522 0.4511,0.60097 -0.04,-0.12952 -0.013,-0.34115 0.077,-0.47025 0.1639,-0.25311 -0.1063,-1.13703 -0.4324,-1.41285 -0.1102,-0.0931 -0.4542,-0.44746 -0.7652,-0.78761 -0.3109,-0.34014 -0.6236,-0.60024 -0.6946,-0.578 -0.386,0.12095 -0.4216,0.99922 -0.044,1.09554 z m 2.6029,2.12286 c 0.1257,-0.0394 0.2086,-0.13626 0.1837,-0.21523 -0.06,-0.19232 -0.3415,-0.25545 -0.4253,-0.0953 -0.1177,0.22557 0.013,0.38451 0.2416,0.31062 z m 1.2443,2.96001 c 0.1164,-0.0366 0.2873,0.0279 0.3788,0.14321 0.091,0.11544 0.222,0.14543 0.29,0.0667 0.2039,-0.23553 0.075,-0.37792 -0.3945,-0.43645 -0.5417,-0.0675 -0.5952,-0.0533 -0.5345,0.14052 0.025,0.0839 0.1434,0.12258 0.2602,0.086 z m 0.8154,8.4543 c 0.048,-0.0151 0.2494,0.0142 0.4461,0.0655 0.2835,0.0738 0.3851,0.0408 0.4894,-0.15882 0.1064,-0.20237 0.059,-0.24847 -0.2367,-0.2343 -0.5288,0.0252 -0.5324,-0.22694 -0.013,-0.39196 0.3222,-0.10096 0.5046,-0.0584 0.6518,0.15174 0.1127,0.16053 0.1541,0.35477 0.091,0.43167 -0.061,0.0769 -0.1189,0.27868 -0.1276,0.44844 -0.013,0.22904 -0.1474,0.33651 -0.5272,0.41644 -0.4268,0.0899 -0.5417,0.0406 -0.6914,-0.29656 -0.098,-0.22236 -0.1399,-0.41679 -0.091,-0.43202 z"
-         id="path7545"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccsccccccccscccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccsccccccccccccccccccccccsccccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1097.6041,222.25758 73.4707,1.70656 1.2794,18.79668 -73.3247,2.40545 z"
-         inkscape:path-effect="#path-effect8453-6"
-         id="path9401"
-         d="m 1097.6041,222.25758 73.4707,1.70656 1.2794,18.79668 -73.3247,2.40545 -1.4254,-22.90869"
-         style="opacity:0.63677135;fill:#f9f9f9;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.43794248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <g
-         id="g280"
-         transform="matrix(0.0957337,0,0,0.0957337,1124.6919,216.13019)">
-        <path
-           id="path282"
-           d="m 329.88856,106.33165 c 0,0 -42.69233,-14.987947 -59.01833,27.63355 -7.06654,18.44975 -3.7522,39.36332 -5.26727,52.93603 -1.98615,17.78367 -7.4941,25.62769 -7.4941,25.62769 0,0 0.58423,0.19776 4.80991,-4.13884 4.22568,-4.33661 4.91376,-10.13906 4.91376,-10.13906 0,0 2.64177,12.42866 0.44199,19.59669 -2.19977,7.16803 -5.74004,14.82167 -5.74004,14.82167 0,0 5.39477,-6.22121 7.52465,-9.389 2.13075,-3.16894 3.98694,-10.85585 3.98694,-10.85585 0,0 1.95432,15.951 0.0632,25.63803 -1.89213,9.68718 -9.72507,18.83715 -9.72507,18.83715 0,0 5.22197,-3.06097 8.62288,-7.27321 3.40178,-4.21339 5.2925,-9.34133 5.2925,-9.34133 l -4.67654,21.21654 6.49534,-15.50487 c 0,0 4.70529,4.14048 5.80322,10.81636 1.09781,6.67488 0.75254,15.27534 0.75254,15.27534 0,0 14.3268,-13.25654 16.38871,-19.26445 2.0629,-6.00806 -2.43423,-19.868 -2.43423,-19.868 l -4.25454,-21.02143 42.20083,-89.52131 -8.68633,-16.0817 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path284"
-           d="m 328.58322,107.09611 c 0,0 17.00725,-18.786692 41.31178,44.83167 24.30441,63.61737 -16.16687,98.73581 -16.16687,98.73581 0,0 5.25768,-7.34021 9.31259,-15.35594 4.05503,-8.01472 3.67843,-13.37384 3.67843,-13.37384 l -9.86315,17.71829 3.88555,-16.25409 c 0,0 -3.5724,2.05359 -4.82207,6.32497 -1.2477,4.27109 -1.09015,9.37682 -1.09015,9.37682 0,0 -2.69829,-15.93445 -2.95974,-21.88003 -0.26244,-5.94543 0.11797,-15.78535 0.11797,-15.78535 l -23.40434,-94.33831 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path286"
-           d="m 284.59194,166.01473 c 0,0 0.70374,28.58091 7.22718,40.71318 6.52357,12.13327 24.7951,22.69906 27.74944,23.967 2.95337,1.26809 10.9687,-1.83079 14.06155,-4.00308 3.09186,-2.17216 18.69027,-19.51293 20.73124,-33.30686 1.16616,-7.8831 -1.86191,-29.96166 -7.95876,-46.68418 -4.57008,-12.53743 -12.54434,-21.68086 -12.54434,-21.68086 l -49.26631,40.9948 z"
-           inkscape:connector-curvature="0"
-           style="fill:#dec7ab;stroke:#8b5e3c" />
-        <path
-           id="path288"
-           d="m 304.12457,119.11329 c -21.08067,5.5202 -23.20704,37.10376 -26.77066,57.86263 -1.80664,10.52367 -8.90019,18.71378 -8.90019,18.71378 0,0 6.62934,-0.7073 10.33975,-2.40169 3.70929,-1.69524 10.13479,-6.35981 10.13479,-6.35981 0,0 -0.61917,1.80236 -3.60727,4.81336 -2.98993,3.0123 -7.59272,4.27091 -7.59272,4.27091 0,0 18.54746,2.92579 33.83872,-20.73357 15.29027,-23.65921 31.19802,-40.00144 31.19802,-40.00144 0,0 -3.12207,-25.46571 -38.64044,-16.16417 z"
-           inkscape:connector-curvature="0" />
-        <linearGradient
-           y2="94.209801"
-           x2="350.2742"
-           y1="213.9805"
-           x1="252.89059"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3416">
-          <stop
-             id="stop3418"
-             style="stop-color:#FFFFFF"
-             offset="0" />
-          <stop
-             id="stop3420"
-             style="stop-color:#000000"
-             offset="0.3846" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-429.7937,-391.21901)">
+    <g style="display:inline" transform="translate(-659.61865,218.52551)" id="g10529">
+      <path d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" style="opacity:0.68609864;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5308-1-9)" transform="matrix(0.23068892,-0.01057214,0,0.29079594,961.60199,-132.54646)" id="path5270-3" inkscape:connector-curvature="0"/>
+      <path id="path6278-0" style="fill:url(#radialGradient9489);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1157.4613,264.91985 c 0,2.86831 -10.6181,5.68256 -23.7161,6.28559 -13.098,0.60325 -23.7161,-1.23298 -23.7161,-4.10128 0,-2.8682 10.6181,-5.68245 23.7161,-6.28559 13.098,-0.60303 23.7161,1.23298 23.7161,4.10128 z" inkscape:connector-curvature="0"/>
+      <path sodipodi:type="arc" style="fill:url(#radialGradient6587-0-3);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6280-1" sodipodi:cx="744.58344" sodipodi:cy="1398.1375" sodipodi:rx="104.29825" sodipodi:ry="18.031223" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" transform="matrix(0.21667214,-0.00952421,0,0.26197202,972.2522,-93.967747)"/>
+      <path style="fill:url(#linearGradient6589-7-6);fill-opacity:1;stroke:none;filter:url(#filter5200-0-8)" d="m 454.79268,1401.7435 c 0.0184,-0.5559 0.0186,-1.1123 6.2e-4,-1.6682 -0.0244,-0.7521 -0.0821,-1.5032 -0.17296,-2.2502 l 14.53854,-0.8732 -0.86471,4.5641 c -2.22704,0.3256 -4.47494,0.5085 -6.72533,0.5472 -2.26244,0.039 -4.52738,-0.068 -6.77611,-0.3197 l -5e-5,0" id="path6292-7" inkscape:path-effect="#path-effect6294-69-9" inkscape:original-d="m 454.79268,1401.7435 c 0.32318,-0.7586 0.0627,-0.9297 6.2e-4,-1.6682 -0.0622,-0.7385 0.25383,-1.5451 -0.17296,-2.2502 l 14.53854,-0.8732 c -0.26236,1.9711 -0.58448,2.7627 -0.86471,4.5641 -2.23925,0.3472 -4.46092,0.4766 -6.72533,0.5472 -2.26442,0.071 -4.46873,0.083 -6.77611,-0.3197 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccscc" transform="matrix(1.0942299,0,0,1.0942299,628.27052,-1264.3253)"/>
+      <path transform="matrix(0.09340315,-0.00492744,0,0.09355698,1064.1822,136.92045)" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" sodipodi:ry="18.031223" sodipodi:rx="104.29825" sodipodi:cy="1398.1375" sodipodi:cx="744.58344" id="path6282-3" style="fill:url(#radialGradient6591-0-9);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:nodetypes="cccscsscccc" inkscape:connector-curvature="0" id="path6284-4" d="m 1141.3374,257.07401 -15.6724,1.03415 c 0.1474,1.5398 0.3714,4.76078 -0.02,5.93719 -0.054,0.0733 -0.084,0.14006 -0.084,0.21009 0,0 0,0.0295 0,0.0295 0.021,0.8012 3.6627,1.25049 8.1528,1.00593 4.5025,-0.24522 8.1528,-1.09379 8.1528,-1.89948 0,-0.0295 9e-4,-0.0295 0,-0.035 -9e-4,-0.0296 -0.01,-0.0296 -0.01,-0.0405 -0.6458,-2.09129 -0.7557,-4.5555 -0.5205,-6.21851 z" style="fill:url(#radialGradient9483);fill-opacity:1;stroke:none"/>
+      <path id="path6276-28" style="fill:#8e959f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1091.4892,191.28891 78.6153,6.24728 c 0.7911,0.0646 1.3816,0.64089 1.4325,1.43279 l 3.3425,52.0477 c 0.051,0.79222 -0.8106,1.28933 -1.4325,1.43267 -25.1167,6.09027 -52.9441,6.80524 -79.9024,6.44644 -0.7911,0.0646 -1.3995,-0.63958 -1.4325,-1.43267 l -2.6987,-64.7492 c -0.033,-0.7931 0.7121,-1.53323 2.0758,-1.42501 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ssssccsss"/>
+      <path sodipodi:nodetypes="ssssccsss" inkscape:connector-curvature="0" d="m 1091.7252,191.47131 79.3852,5.88915 c 0.7914,0.058 1.3817,0.64045 1.4325,1.43278 l 3.3425,52.04771 c 0.051,0.79222 -0.8106,1.28911 -1.4325,1.43267 -25.1167,6.09027 -52.9442,6.80524 -79.9024,6.44611 -0.7911,0.0646 -1.3978,-0.63925 -1.4326,-1.43235 l -2.8252,-64.38361 c -0.035,-0.79277 0.6411,-1.49111 1.4325,-1.43246 z" style="fill:url(#radialGradient9479);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.36015657;stroke-miterlimit:4;stroke-opacity:1" id="rect6253-9"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 1094.3256,195.45059 76.3471,5.25252 2.865,45.68104 -76.2416,5.09353 z" inkscape:path-effect="#path-effect6247-90-5" id="path6245-9" d="m 1094.3256,195.45059 76.3471,5.25252 2.865,45.68104 -76.2416,5.09353 -2.9705,-56.02709" style="fill:url(#linearGradient9476);fill-opacity:1;stroke:#666666;stroke-width:0.22509786px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" id="path6269-9" d="m 1093.2346,257.16034 c 0.035,0.79255 0.6418,1.49877 1.4302,1.43508 26.8666,0.3588 54.5997,-0.35321 79.631,-6.44348 0.6198,-0.14312 1.4738,-0.64308 1.4231,-1.43508 l -0.1264,-1.98373 c -0.2571,0.46527 -0.8408,0.76684 -1.2969,0.87221 -25.0313,6.09027 -52.7644,6.80261 -79.6311,6.44348 -1.4444,-0.0295 -1.4221,-0.11971 -1.4301,1.11152 z" style="fill:url(#linearGradient9473);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path transform="matrix(0.22031476,0.05435309,-0.02411816,0.20870235,1005.0059,-74.298198)" d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z" sodipodi:ry="6.5625" sodipodi:rx="5.0625" sodipodi:cy="1324.2997" sodipodi:cx="874.3125" id="path6274-0" style="fill:url(#radialGradient6601-3-7);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" sodipodi:type="arc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 z" inkscape:path-effect="#path-effect6247-9-1-9" id="path6245-4-1" d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 -2.9705,-56.02709" style="fill:url(#linearGradient9469);fill-opacity:1;stroke:#666666;stroke-width:0.22509786px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="opacity:0.27354264;fill:url(#linearGradient9465);fill-opacity:1;stroke:#666666;stroke-width:0.22509786px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 -2.9705,-56.02709" id="path4952-0" inkscape:path-effect="#path-effect5008-6-2" inkscape:original-d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 z" inkscape:path-effect="#path-effect5006-0-9" id="path4974-63" d="m 1094.3435,195.44621 76.347,5.25253 2.865,45.68103 -76.2415,5.09353 -2.9705,-56.02709" style="opacity:0.63677135;fill:url(#linearGradient9462);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.22509786px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path style="opacity:0.63677135;fill:#f9f9f9;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.43794248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 1096.3541,200.50757 73.4082,3.83156 2.5919,38.42169 -73.3247,2.40545 -2.6754,-44.6587" id="path8449" inkscape:path-effect="#path-effect9459" inkscape:original-d="m 1096.3541,200.50757 73.4082,3.83156 2.5919,38.42169 -73.3247,2.40545 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 1136.6396,202.61944 33.1227,1.71969 2.5919,38.42169 -33.5265,0.94367 z" inkscape:path-effect="#path-effect8542-4" id="path8508" d="m 1136.6396,202.61944 33.1227,1.71969 2.5919,38.42169 -33.5265,0.94367 -2.1881,-41.08505" style="opacity:0.63677135;fill:#f9f9f9;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.43794248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path style="fill:#f9f9f9;fill-opacity:1;stroke:#333333;stroke-width:0.43794248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 1137.8206,223.43147 33.2038,0.50149 1.3298,18.82786 -33.5265,0.94367 -1.0071,-20.27302" id="path8510" inkscape:path-effect="#path-effect8540-9" inkscape:original-d="m 1137.8206,223.43147 33.2038,0.50149 1.3298,18.82786 -33.5265,0.94367 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ssssssssssssssscccsssssssssssss" inkscape:connector-curvature="0" id="path8520" d="m 895.09375,10.71875 c -4.89014,0.216719 -8.9448,1.858112 -12.09375,4.875 -1.59759,1.530586 -4.8116,3.669737 -7.125,4.78125 -3.48742,1.675586 -4.60803,2.971118 -6.5,7.53125 -1.98958,4.795395 -2.20562,6.588936 -1.6875,14 0.32684,4.675 1.03173,10.449445 1.5625,12.84375 0.66284,2.990057 0.60921,5.338672 -0.15625,7.5 -1.69611,4.78904 1.1929,17.46626 4.59375,20.21875 1.9377,1.56828 2.75991,3.55419 3.53125,8.34375 0.55646,3.45534 1.96032,7.52946 3.09375,9.0625 2.52251,3.41188 2.09711,6.41111 -0.9375,6.84375 -1.55228,0.22131 -3.03996,1.87541 -4.75,5.25 -3.00542,5.93093 -4.01657,6.48488 -27.46875,15 -20.35415,7.39028 -23.40627,9.10357 -25.46875,14.21875 -1.54323,3.82737 -2.18837,20.71788 -0.84375,22.0625 0.37,0.36999 35.8075,0.54708 78.75,0.40625 l 78.0625,-0.25 0.3125,-9 c 0.354,-10.88614 -1.301,-16.03118 -6.0625,-19.03125 -1.7852,-1.12478 -11.125,-4.91156 -20.75,-8.40625 -23.45217,-8.51512 -24.46333,-9.06907 -27.46875,-15 -1.71004,-3.37459 -3.19772,-5.02869 -4.75,-5.25 -3.03461,-0.43264 -3.42876,-3.43187 -0.90625,-6.84375 1.13343,-1.53304 2.50604,-5.60716 3.0625,-9.0625 0.77134,-4.78956 1.6248,-6.77547 3.5625,-8.34375 3.40085,-2.75249 6.25861,-15.42971 4.5625,-20.21875 -0.7789,-2.199274 -0.79207,-4.477673 -0.0937,-7.59375 0.54954,-2.452163 1.07819,-8.088755 1.1875,-12.53125 0.17935,-7.289277 -0.12954,-8.730788 -3.03125,-14.625 -3.56517,-7.24189 -6.22518,-9.577032 -15.1875,-13.21875 -6.3848,-2.594377 -12.10986,-3.779219 -17,-3.5625 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter6246-9-0-2-9-5)" transform="matrix(0.10485045,-0.00354508,0.00735026,0.10563,1060.9781,229.02453)"/>
+      <path style="fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1154.7311,226.89518 c -0.5111,0.0402 -0.9242,0.22799 -1.2322,0.55782 -0.1562,0.16734 -0.4775,0.40469 -0.7119,0.53031 -0.3533,0.18935 -0.4613,0.33017 -0.6262,0.81856 -0.1733,0.51359 -0.1828,0.70381 -0.074,1.48481 0.069,0.49266 0.185,1.10011 0.2582,1.35114 0.091,0.31349 0.1032,0.56177 0.039,0.79278 -0.1426,0.51188 0.2535,1.84073 0.6303,2.11942 0.2147,0.15879 0.3155,0.36565 0.4315,0.86883 0.084,0.36302 0.2609,0.78839 0.391,0.94631 0.2896,0.35145 0.267,0.66977 -0.048,0.72623 -0.1611,0.0289 -0.3049,0.20887 -0.4594,0.57139 -0.2715,0.63714 -0.3735,0.69924 -2.7699,1.68183 -2.0798,0.8528 -2.3872,1.04459 -2.5659,1.59222 -0.1336,0.40975 -0.077,2.19619 0.074,2.33345 0.042,0.0378 3.7585,-0.0692 8.26,-0.23626 l 8.183,-0.30315 -0.033,-0.95178 c -0.043,-1.15116 -0.2543,-1.68876 -0.7756,-1.98878 -0.1954,-0.11248 -1.2025,-0.47937 -2.2374,-0.81439 -2.5216,-0.81631 -2.6317,-0.87124 -2.9904,-1.48707 -0.2041,-0.3504 -0.3722,-0.51984 -0.5366,-0.53772 -0.3214,-0.0349 -0.3847,-0.35035 -0.1453,-0.71969 0.1076,-0.16595 0.2215,-0.60117 0.2545,-0.96813 0.046,-0.50866 0.1205,-0.72145 0.3122,-0.89398 0.3363,-0.3028 0.5428,-1.65203 0.3297,-2.15188 -0.098,-0.22955 -0.1159,-0.47017 -0.066,-0.8018 0.04,-0.26097 0.054,-0.85823 0.032,-1.32788 -0.035,-0.7706 -0.078,-0.92178 -0.4253,-1.5341 -0.427,-0.75232 -0.7231,-0.98955 -1.6896,-1.34245 -0.6885,-0.25141 -1.2975,-0.35627 -1.8086,-0.31604 z" id="path8522" inkscape:connector-curvature="0" sodipodi:nodetypes="ssssssssssssssscccsssssssssssss"/>
+      <path transform="matrix(0.09173574,0.00214794,0.00643089,0.0927858,1071.5593,206.47035)" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter6246-9-0-2-9-5)" d="m 895.09375,10.71875 c -4.89014,0.216719 -8.9448,1.858112 -12.09375,4.875 -1.59759,1.530586 -4.8116,3.669737 -7.125,4.78125 -3.48742,1.675586 -4.60803,2.971118 -6.5,7.53125 -1.98958,4.795395 -2.20562,6.588936 -1.6875,14 0.32684,4.675 1.03173,10.449445 1.5625,12.84375 0.66284,2.990057 0.60921,5.338672 -0.15625,7.5 -1.69611,4.78904 1.1929,17.46626 4.59375,20.21875 1.9377,1.56828 2.75991,3.55419 3.53125,8.34375 0.55646,3.45534 1.96032,7.52946 3.09375,9.0625 2.52251,3.41188 2.09711,6.41111 -0.9375,6.84375 -1.55228,0.22131 -3.03996,1.87541 -4.75,5.25 -3.00542,5.93093 -4.01657,6.48488 -27.46875,15 -20.35415,7.39028 -23.40627,9.10357 -25.46875,14.21875 -1.54323,3.82737 -2.18837,20.71788 -0.84375,22.0625 0.37,0.36999 35.8075,0.54708 78.75,0.40625 l 78.0625,-0.25 0.3125,-9 c 0.354,-10.88614 -1.301,-16.03118 -6.0625,-19.03125 -1.7852,-1.12478 -11.125,-4.91156 -20.75,-8.40625 -23.45217,-8.51512 -24.46333,-9.06907 -27.46875,-15 -1.71004,-3.37459 -3.19772,-5.02869 -4.75,-5.25 -3.03461,-0.43264 -3.42876,-3.43187 -0.90625,-6.84375 1.13343,-1.53304 2.50604,-5.60716 3.0625,-9.0625 0.77134,-4.78956 1.6248,-6.77547 3.5625,-8.34375 3.40085,-2.75249 6.25861,-15.42971 4.5625,-20.21875 -0.7789,-2.199274 -0.79207,-4.477673 -0.0937,-7.59375 0.54954,-2.452163 1.07819,-8.088755 1.1875,-12.53125 0.17935,-7.289277 -0.12954,-8.730788 -3.03125,-14.625 -3.56517,-7.24189 -6.22518,-9.577032 -15.1875,-13.21875 -6.3848,-2.594377 -12.10986,-3.779219 -17,-3.5625 z" id="path8534" inkscape:connector-curvature="0" sodipodi:nodetypes="ssssssssssssssscccsssssssssssss"/>
+      <path sodipodi:nodetypes="ssssssssssssssscccsssssssssssss" inkscape:connector-curvature="0" id="path8536" d="m 1153.7403,209.3875 c -0.4472,0.01 -0.8086,0.1532 -1.0781,0.42636 -0.1367,0.13858 -0.4178,0.33016 -0.6229,0.42833 -0.3091,0.14798 -0.4036,0.26578 -0.5478,0.68483 -0.1517,0.44067 -0.16,0.60662 -0.065,1.29537 0.06,0.43448 0.1619,0.97178 0.226,1.19508 0.08,0.27886 0.09,0.49666 0.034,0.69556 -0.1248,0.44071 0.2217,1.62318 0.5514,1.88588 0.1878,0.14967 0.276,0.3357 0.3776,0.78176 0.073,0.3218 0.2282,0.70284 0.3421,0.84752 0.2533,0.32199 0.2336,0.59936 -0.042,0.63299 -0.141,0.0172 -0.2668,0.16748 -0.402,0.47692 -0.2376,0.54385 -0.3267,0.59308 -2.4234,1.33279 -1.8197,0.64199 -2.0886,0.7944 -2.2449,1.26459 -0.117,0.35181 -0.068,1.91763 0.064,2.04527 0.036,0.0351 3.2884,0.12768 7.2268,0.20685 l 7.1595,0.14448 -0.029,-0.83441 c -0.038,-1.00932 -0.2224,-1.49026 -0.6785,-1.77885 -0.171,-0.1082 -1.0521,-0.47962 -1.9576,-0.82455 -2.2061,-0.84046 -2.3025,-0.89403 -2.6163,-1.45079 -0.1786,-0.31679 -0.3257,-0.47346 -0.4695,-0.49733 -0.2812,-0.0467 -0.3366,-0.32579 -0.1271,-0.63695 0.094,-0.13981 0.1938,-0.51488 0.2226,-0.83429 0.04,-0.44275 0.1055,-0.62518 0.2732,-0.76653 0.2942,-0.24809 0.4749,-1.41821 0.2885,-1.86621 -0.086,-0.20574 -0.1015,-0.41717 -0.057,-0.70479 0.035,-0.22635 0.047,-0.74821 0.028,-1.16018 -0.03,-0.67595 -0.068,-0.81037 -0.3721,-1.3635 -0.3736,-0.6796 -0.6327,-0.90198 -1.4783,-1.25913 -0.6024,-0.25444 -1.1352,-0.37667 -1.5824,-0.36707 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path id="path5230-9" style="opacity:0.32743363;fill:url(#linearGradient9431);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1091.7252,191.47131 79.3852,5.88915 c 0.7914,0.058 2.2028,1.24151 1.4325,1.43278 -55.3148,-3.60778 -62.9633,59.21984 -77.9924,59.92649 -0.7911,0.0646 -1.3978,-0.63925 -1.4326,-1.43235 l -2.8252,-64.38361 c -0.035,-0.79277 0.6411,-1.49111 1.4325,-1.43246 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ssccsss"/>
+      <path sodipodi:nodetypes="cccccccccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 1134.6927,194.60442 3.3272,0.33949 -0.1361,2.91944 -4.8205,-0.47524 -0.3394,-0.95052 -1.0185,0 -0.8146,0.67893 -1.426,0.33948 -4.2773,-0.40735 0.2716,-2.98739 3.1911,-0.0678 2.5607,0.25903 -0.8691,-1.69522 4.099,0.22302 -1.664,1.63064 z" inkscape:path-effect="#path-effect46544-8" id="path46542" d="m 1134.6927,194.60442 c 1.1091,0.11244 2.2182,0.2256 3.3272,0.33949 l -0.1361,2.91944 -4.8205,-0.47524 -0.3394,-0.95052 -1.0185,0 -0.8146,0.67893 -1.426,0.33948 -4.2773,-0.40735 0.2716,-2.98739 3.1911,-0.0678 2.5607,0.25903 -0.8691,-1.69522 4.099,0.22302 -1.664,1.63064 c 0.6387,0.0643 1.2773,0.12875 1.9159,0.19349" style="fill:url(#radialGradient9428);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.1536278;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path transform="matrix(0.15012923,0.03162224,-0.03162224,0.15012923,996.261,113.63824)" d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z" sodipodi:ry="66.114487" sodipodi:rx="66.114487" sodipodi:cy="257.9277" sodipodi:cx="966.26141" id="path46446" style="fill:url(#radialGradient46524-0);fill-opacity:1;fill-rule:nonzero;stroke:#333333" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#333333" id="path46448" sodipodi:cx="966.26141" sodipodi:cy="257.9277" sodipodi:rx="66.114487" sodipodi:ry="66.114487" d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z" transform="matrix(0.07393806,-0.01963754,-0.0010355,0.07364743,1066.8794,186.5313)"/>
+      <path transform="matrix(0.06429404,-0.01707612,-9.0042728e-4,0.06404127,1076.5081,186.84739)" d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z" sodipodi:ry="66.114487" sodipodi:rx="66.114487" sodipodi:cy="257.9277" sodipodi:cx="966.26141" id="path46450" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" id="path46452" sodipodi:cx="966.26141" sodipodi:cy="257.9277" sodipodi:rx="66.114487" sodipodi:ry="66.114487" d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z" transform="matrix(0.05313361,-0.01411199,-7.4414325e-4,0.05292474,1087.1422,186.68388)"/>
+      <path transform="matrix(0.04399208,-0.01168403,-6.1610996e-4,0.04381917,1095.7185,186.20055)" d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z" sodipodi:ry="66.114487" sodipodi:rx="66.114487" sodipodi:cy="257.9277" sodipodi:cx="966.26141" id="path46454" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" id="path46456" sodipodi:cx="966.26141" sodipodi:cy="257.9277" sodipodi:rx="66.114487" sodipodi:ry="66.114487" d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z" transform="matrix(0.03749145,-0.00995754,-5.2506119e-4,0.03734409,1101.8056,185.89695)"/>
+      <path transform="matrix(0.02794369,-0.00742168,-3.9135019e-4,0.02783383,1110.7029,185.3736)" d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z" sodipodi:ry="66.114487" sodipodi:rx="66.114487" sodipodi:cy="257.9277" sodipodi:cx="966.26141" id="path46458" style="fill:url(#radialGradient46540-2);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" sodipodi:type="arc"/>
+      <path transform="matrix(0.14285638,-0.02194566,0.02194566,0.14285638,988.8318,163.84567)" d="m 911.81417,278.43381 c 0,6.05312 -3.16582,10.96015 -7.07107,10.96015 -3.90524,0 -7.07106,-4.90703 -7.07106,-10.96015 0,-6.05313 3.16582,-10.96016 7.07106,-10.96016 3.90525,0 7.07107,4.90703 7.07107,10.96016 z" sodipodi:ry="10.960155" sodipodi:rx="7.0710678" sodipodi:cy="278.43381" sodipodi:cx="904.7431" id="path46494" style="fill:url(#linearGradient46502-4);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:nodetypes="csc" inkscape:connector-curvature="0" inkscape:original-d="m 1137.848,181.77374 c 0.029,-0.19447 -0.059,-0.41624 -0.099,-0.59448 -0.043,-0.17821 -0.043,-0.31365 -0.2028,-0.4609" inkscape:path-effect="#path-effect46508-8" id="path46506" d="m 1137.848,181.77374 c -0.01,-0.20142 -0.039,-0.40203 -0.099,-0.59448 -0.05,-0.16065 -0.1181,-0.3156 -0.2028,-0.4609" style="fill:none;stroke:#000000;stroke-width:0.14453222px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      <path sodipodi:nodetypes="ccccccscscscscccc" inkscape:connector-curvature="0" inkscape:original-d="m 1127.6626,174.47147 c 0.9246,0.28536 1.7193,0.79379 2.4713,1.38724 0.9532,0.84104 1.9474,1.86657 2.9105,2.63988 0.8864,0.65907 1.5149,1.22688 2.145,1.60666 0.6349,0.32985 1.1418,0.52681 1.6558,0.60163 0.7269,0.0693 1.1426,0.0461 1.4926,-0.12537 0.4045,-0.28926 0.6538,-0.50526 0.8451,-0.737 0.1921,-0.23183 0.3233,-0.47917 0.4917,-0.83131 0.1227,-0.41663 0.1841,-0.75308 0.168,-1.07197 -0.027,-0.31886 -0.104,-0.62018 -0.279,-0.96639 -0.5287,-1.08244 -1.3594,-2.00095 -2.3382,-2.66034 -0.9788,-0.65947 -2.1056,-1.05986 -2.9029,-1.4036 -0.2855,-0.0547 -0.5301,-0.0368 -0.8054,-0.0618 -0.2756,-0.024 -0.5509,-0.0349 -0.8356,-0.0307 -1.098,0.1019 -1.3874,0.0107 -2.3392,0.3899 -0.6595,0.29028 -1.3704,0.40856 -1.9578,0.81949 -0.093,0.0675 -0.6299,0.37622 -0.7224,0.44376 z" inkscape:path-effect="#path-effect46512-4" id="path46510" d="m 1127.6626,174.47147 c 0.8821,0.34635 1.7162,0.81459 2.4713,1.38724 1.0441,0.79187 1.9273,1.77349 2.9105,2.63988 0.6709,0.59125 1.3889,1.12906 2.145,1.60666 0.4949,0.32599 1.0671,0.53387 1.6558,0.60163 0.4993,0.0575 1.0099,0.0146 1.4926,-0.12537 0.3211,-0.19487 0.6084,-0.44537 0.8451,-0.737 0.2036,-0.25087 0.3699,-0.53201 0.4917,-0.83131 0.1441,-0.33588 0.2024,-0.70812 0.168,-1.07197 -0.032,-0.33534 -0.1403,-0.65945 -0.279,-0.96639 -0.4921,-1.08883 -1.3603,-1.97374 -2.3382,-2.66034 -0.8835,-0.62032 -1.868,-1.09636 -2.9029,-1.4036 -0.268,-0.0259 -0.5366,-0.0465 -0.8054,-0.0618 -0.2783,-0.0159 -0.5569,-0.0261 -0.8356,-0.0307 -0.7917,0.0344 -1.5791,0.16568 -2.3392,0.3899 -0.6799,0.20058 -1.338,0.47551 -1.9578,0.81949 -0.2472,0.13718 -0.4883,0.28529 -0.7224,0.44376 l 5e-4,-8e-5" style="fill:url(#linearGradient9416);fill-opacity:1;stroke:none"/>
+      <path transform="matrix(0.02520639,0.01654821,-0.02189826,0.01905945,1118.2988,157.68417)" d="m 1032.3759,257.9277 c 0,36.51403 -29.6005,66.11449 -66.11449,66.11449 -36.51402,0 -66.11448,-29.60046 -66.11448,-66.11449 0,-36.51402 29.60046,-66.11448 66.11448,-66.11448 36.51399,0 66.11449,29.60046 66.11449,66.11448 z" sodipodi:ry="66.114487" sodipodi:rx="66.114487" sodipodi:cy="257.9277" sodipodi:cx="966.26141" id="path46470" style="fill:url(#radialGradient46480-6);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+      <path sodipodi:nodetypes="cccccccccscccccssccccccscccsccccccccccccccccccccssccsccccsccc" id="path8369" transform="matrix(1.056862,0,0,0.89823663,-103.66416,-12.041492)" d="m 1221.25,309.84375 c -2.5054,-0.0352 -5.0071,0.3976 -7.75,1.28125 l -2.2188,0.71875 -0.9374,-0.21875 c -2.5439,-0.54275 -4.5121,-0.35202 -7.375,0.65625 -2.2603,0.79599 -3.4044,1.43773 -4.6876,2.6875 -1.8937,1.96872 -3.2521,4.61672 -2.5,6.53125 0.1848,0.93721 1.0319,2.55188 1.7813,3.40625 1.0579,1.20594 2.572,1.87933 4.9687,2.21875 2.366,0.33504 3.4433,0.24473 5.8438,-0.5 2.3521,-0.7297 3.7034,-1.42972 5.0938,-2.59375 3.4077,-2.8532 4.1014,-6.25712 1.8437,-9.15625 -0.309,-0.39669 -0.5325,-0.7818 -0.5,-0.84375 0.121,-0.23137 3.4632,-0.48354 5.0313,-0.375 1.9707,0.13638 3.9215,0.58137 6.5312,1.5 2.4576,0.86505 3.3438,1.31386 3.3438,1.65625 0,0.40339 0.4286,0.82708 2.2187,2.3125 3.0582,2.53762 4.7099,4.39676 5.9375,6.59375 0.4282,0.76607 0.4458,0.87354 0.3438,1.5625 -0.1482,0.9973 -1.808,3.85685 -2.4376,4.1875 -1.1668,0.61299 -3.0655,1.38779 -4.8124,1.9375 -2.7404,0.86219 -8.3949,2.28638 -8.6563,2.1875 -0.1215,-0.046 -0.2831,-0.3007 -0.375,-0.59375 -0.3167,-1.01101 -1.4296,-2.27521 -3.375,-3.8125 -1.2069,-0.95372 -3.5437,-2.11972 -5.3437,-2.65625 -1.0532,-0.31385 -3.8066,-0.69632 -5.4063,-0.75 -2.1717,-0.0729 -4.9639,0.7181 -6.0625,1.6875 -1.9236,1.69755 -2.1806,1.96261 -2.5938,2.78125 -0.4113,0.81488 -0.4716,0.87353 -0.8124,0.78125 -0.2026,-0.0548 -0.492,2.71241 -1.1563,2.59375 -0.3422,-0.0913 -0.7182,-0.14933 -1.0937,-0.21875 -0.038,-0.58392 -0.2197,-1.02126 -0.375,-0.59375 -0.069,0.19038 -0.1326,0.33772 -0.1876,0.5 -12.8386,-1.95537 -25.2272,13.19036 -15.3497,-1.45707 0.2304,0.21741 0.534,0.34997 0.875,0.3125 l 0.875,-0.0937 c 0.6172,-0.0678 1.0678,-0.63279 1,-1.25 l -0.125,-1.1875 c -0.068,-0.61721 -0.6328,-1.06783 -1.25,-1 l -0.875,0.0937 c -0.6172,0.0678 -1.0678,0.63279 -1,1.25 l 0,0.0625 c -0.2901,0.17571 -0.5733,0.93391 -1.0625,1.8125 -9.0479,17.31444 -1.201,1.562 16.1622,2.95707 l 0.6563,0.0312 c 0.021,0.0531 0.034,0.10248 0.062,0.15625 0.209,0.39772 0.6224,0.6611 2.1562,1.4375 1.6667,0.84339 2.0132,1.12393 2.8438,2.03125 1.3494,1.47418 2.3023,2.20461 3.9688,3.125 4.0987,2.26369 8.6749,2.88586 12.5,1.6875 2.3106,-0.72389 3.7097,-1.7813 4.5312,-3.4375 0.1548,-0.31241 0.409,-0.62955 0.5938,-0.6875 0.1829,-0.0574 2.2631,-0.24947 4.625,-0.4375 5.1021,-0.40618 6.0393,-0.53177 8.5312,-1.3125 3.7076,-1.16154 5.8054,-2.76097 7.1562,-5.5 0.8665,-1.75689 1.0579,-4.52796 0.5626,-7.78125 -0.3048,-2.00319 -1.3169,-4.87977 -2.2188,-6.3125 -0.8388,-1.33272 -2.8709,-3.44182 -4.5,-4.6875 -1.6844,-1.28798 -4.97,-3.01563 -7.1875,-3.78125 -2.7846,-0.96147 -5.307,-1.46474 -7.8125,-1.5 z" style="opacity:0.20179372;fill:#000000;filter:url(#filter8427-5)" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="cccccccccscccccssccccccscccsccccccccccccccccccccssccsccccsccc" inkscape:connector-curvature="0" style="fill:#4d4d4d" d="m 1188.0461,260.04295 c -2.6908,-0.0378 -5.3776,0.42702 -8.3235,1.37605 l -2.383,0.77194 -1.0068,-0.23494 c -2.7321,-0.58291 -4.846,-0.37806 -7.9207,0.70482 -2.4276,0.85489 -3.6563,1.54412 -5.0345,2.88637 -2.0338,2.1144 -3.4927,4.95835 -2.685,7.01455 0.1985,1.00656 1.1083,2.74072 1.9131,3.65831 1.1362,1.29518 2.7624,2.0184 5.3364,2.38293 2.5411,0.35984 3.6981,0.26284 6.2762,-0.53699 2.5262,-0.7837 3.9775,-1.53552 5.4708,-2.78569 3.6598,-3.06433 4.4049,-6.72014 1.9801,-9.8338 -0.3319,-0.42604 -0.5719,-0.83965 -0.537,-0.90619 0.13,-0.24849 3.7195,-0.51932 5.4036,-0.40275 2.1165,0.14648 4.2117,0.62439 7.0145,1.611 2.6395,0.92906 3.5913,1.41109 3.5913,1.77881 0,0.43324 0.4603,0.88829 2.3828,2.48362 3.2845,2.72541 5.0585,4.72212 6.3769,7.08168 0.4599,0.82276 0.4788,0.93818 0.3692,1.67813 -0.1591,1.0711 -1.9417,4.14225 -2.6179,4.49737 -1.2532,0.65835 -3.2924,1.49048 -5.1685,2.08087 -2.9432,0.92599 -9.0162,2.45557 -9.2969,2.34937 -0.1305,-0.0494 -0.3041,-0.32295 -0.4028,-0.63768 -0.3401,-1.08583 -1.5353,-2.44358 -3.6247,-4.09463 -1.2962,-1.02429 -3.8059,-2.27657 -5.7391,-2.8528 -1.1312,-0.33708 -4.0883,-0.74785 -5.8064,-0.8055 -2.3324,-0.0783 -5.3312,0.77123 -6.5111,1.81237 -2.0659,1.82317 -2.342,2.10784 -2.7857,2.98706 -0.4418,0.87518 -0.5065,0.93817 -0.8726,0.83906 -0.2176,-0.0589 -0.5284,2.91312 -1.2418,2.78568 -0.3675,-0.0981 -0.7714,-0.16038 -1.1747,-0.23493 -0.041,-0.62713 -0.2359,-1.09683 -0.4027,-0.63769 -0.074,0.20447 -0.1424,0.36271 -0.2015,0.537 -13.3629,5.69201 -28.4875,12.84873 -17.8791,-2.88259 0.2475,0.2335 0.5736,0.37587 0.9398,0.33562 l 0.9397,-0.10063 c 0.6629,-0.0728 1.1469,-0.67962 1.074,-1.3425 l -0.1342,-1.27537 c -0.073,-0.66289 -0.6796,-1.14685 -1.3425,-1.074 l -0.9398,0.10063 c -0.6628,0.0728 -1.1468,0.67962 -1.074,1.3425 l 0,0.0671 c -0.3115,0.18871 -0.6157,1.00301 -1.1411,1.94662 -9.7174,18.59569 2.3141,12.16919 18.7517,4.49359 l 0.7049,0.0335 c 0.023,0.057 0.036,0.11006 0.067,0.16781 0.2244,0.42715 0.6684,0.71002 2.3157,1.54387 1.7901,0.9058 2.1622,1.2071 3.0543,2.18156 1.4492,1.58327 2.4726,2.36775 4.2624,3.35625 4.402,2.4312 9.3169,3.09941 13.425,1.81237 2.4816,-0.77746 3.9842,-1.91311 4.8665,-3.69187 0.1663,-0.33553 0.4393,-0.67614 0.6378,-0.73837 0.1964,-0.0617 2.4305,-0.26793 4.9672,-0.46988 5.4797,-0.43623 6.4862,-0.57112 9.1625,-1.40962 3.982,-1.24749 6.235,-2.96528 7.6858,-5.90699 0.9306,-1.8869 1.1362,-4.86303 0.6042,-8.35706 -0.3274,-2.15142 -1.4144,-5.24086 -2.383,-6.77961 -0.9009,-1.43134 -3.0833,-3.69652 -4.833,-5.03437 -1.809,-1.38329 -5.3378,-3.23879 -7.7194,-4.06106 -2.9906,-1.03262 -5.6997,-1.57313 -8.3906,-1.611 z" id="path7557"/>
+      <path style="fill:#6f6e6c" d="m 1163.0569,285.07925 c 0.7327,0.23469 0.9564,0.0949 1.5883,-0.99173 0.3967,-0.68191 1.0142,-1.37584 1.9982,-2.24481 1.3953,-1.23226 1.4551,-1.26743 2.9512,-1.73655 2.3806,-0.74653 3.5631,-0.80645 6.9551,-0.35236 2.4902,0.33336 4.0233,0.83157 6.4014,2.08029 2.7222,1.42932 5.1834,3.76943 5.719,5.43741 0.098,0.3036 0.2877,0.59733 0.4229,0.65271 0.135,0.0553 1.3299,-0.15982 2.6557,-0.47825 2.2659,-0.5443 3.1499,-0.70001 4.9163,-0.86586 1.3005,-0.12207 5.4418,-1.58288 6.7376,-2.37649 0.3419,-0.20933 0.3487,-0.23855 0.058,-0.24836 -0.2586,-0.009 -0.2094,-0.075 0.2287,-0.30814 0.4308,-0.22934 0.7873,-0.69853 1.5641,-2.05863 1.0399,-1.82096 1.4373,-3.10567 1.1975,-3.87098 -0.1703,-0.54337 -1.2448,-2.2331 -2.1622,-3.40019 -0.8396,-1.06815 -2.648,-2.78581 -4.9567,-4.7083 -1.3812,-1.14999 -1.7737,-1.56373 -1.9168,-2.02094 -0.16,-0.51073 -0.3045,-0.62851 -1.2935,-1.05479 -5.4001,-2.32722 -10.3262,-3.13551 -14.3279,-2.3509 -1.1652,0.22845 -1.183,-0.0172 0.1526,2.08692 0.7077,1.1143 0.7764,1.29052 0.8704,2.22915 0.1258,1.25449 -0.06,2.38373 -0.5663,3.44454 -0.804,1.68335 -2.7414,3.53081 -4.9236,4.69479 -1.5103,0.8057 -4.7062,1.81838 -6.0397,1.91377 -3.4581,0.2474 -6.8208,-0.65582 -8.3752,-2.24957 -0.725,-0.74328 -1.5126,-2.17767 -1.8983,-3.45699 1.484,-5.76908 1.6951,-4.5942 2.5254,-7.12123 1.7184,-1.58819 2.8541,-2.20946 5.6143,-3.07113 2.2182,-0.69245 2.5786,-0.76331 3.9445,-0.77554 0.8268,-0.008 2.1049,0.10246 2.8401,0.24395 l 1.3367,0.25742 3.062,-0.91934 c 3.3222,-0.99758 5.0363,-1.27103 7.6633,-1.22267 8.1355,0.14978 17.3181,4.92241 20.9295,10.87829 1.0711,1.7664 2.1569,5.25252 2.3953,7.69075 0.1857,1.89948 0.09,4.55725 -0.206,5.67642 -0.6807,2.58058 -3.2642,5.30017 -5.7847,6.0898 -0.7982,0.25008 -0.8084,0.24781 -0.9529,-0.21373 -0.2318,-0.73967 -1.3198,-1.37151 -2.3401,-1.35919 -1.5582,0.0188 -3.0481,0.46291 -5.0032,1.49123 -1.9487,1.02487 -2.4715,1.4351 -2.4735,1.94037 0,0.36972 0.074,0.35176 -2.5724,0.61815 -3.5621,0.35861 -3.3753,0.31731 -3.6518,0.80774 -0.3052,0.54212 -0.4253,0.59389 -0.4445,0.19188 -0.023,-0.46609 -0.6037,-0.44131 -0.7711,0.033 -0.074,0.20863 -0.2722,0.7777 -0.4414,1.26462 -0.4893,1.40858 -1.0553,1.82129 -3.5459,2.58585 -1.7645,0.54159 -2.2685,0.63463 -3.4836,0.64307 -3.1847,0.0221 -6.2766,-0.72565 -9.0168,-2.18078 -2.1011,-1.11571 -2.9255,-1.74096 -4.4628,-3.3844 -1.1149,-1.19211 -1.4212,-1.41348 -3.1518,-2.27869 -1.0543,-0.52707 -2.0829,-1.15399 -2.286,-1.39313 -0.4888,-0.57566 -0.5257,-1.4468 -0.1102,-2.59227 0.172,-0.47286 0.2988,-0.90306 0.2823,-0.956 0.5699,-1.38162 0.7582,-1.08042 2.1485,-0.71014 z m 1.5699,5.27795 c 0.3946,0.18479 0.7646,0.28152 0.8222,0.21497 0.058,-0.0666 0.1776,-0.029 0.2666,0.0832 0.1737,0.21902 3.3211,1.57327 3.5152,1.51245 0.062,-0.0201 0.2451,0.074 0.4024,0.20891 0.1574,0.13494 0.4227,0.20254 0.5898,0.1502 0.1684,-0.0528 0.3357,0.008 0.3755,0.13361 0.04,0.12711 0.2072,0.18632 0.3767,0.13322 0.1717,-0.0538 0.337,0.006 0.3779,0.13699 0.04,0.12793 0.2489,0.24308 0.464,0.25595 0.2151,0.0129 0.5169,0.10493 0.6707,0.20443 0.1538,0.0997 0.3575,0.158 0.4524,0.12982 0.096,-0.028 0.392,0.0706 0.6594,0.21966 0.5634,0.31368 0.97,0.1722 0.8916,-0.31015 -0.04,-0.25028 -0.2141,-0.35735 -0.6872,-0.42374 -0.3479,-0.049 -0.7009,-0.17484 -0.7841,-0.27995 -0.084,-0.10504 -0.274,-0.15275 -0.4239,-0.10579 -0.1498,0.0469 -0.3449,-0.006 -0.4335,-0.11794 -0.089,-0.1118 -0.3551,-0.21488 -0.5922,-0.22906 -0.2369,-0.0142 -0.453,-0.0961 -0.48,-0.18207 -0.026,-0.086 -0.1816,-0.1148 -0.3438,-0.064 -0.1619,0.0508 -0.3812,-0.0311 -0.4871,-0.18236 -0.1064,-0.15109 -0.2837,-0.24613 -0.3953,-0.21117 -0.2239,0.0701 -1.1851,-0.29694 -1.9875,-0.75914 -0.2848,-0.16409 -0.604,-0.27137 -0.7094,-0.23841 -0.1052,0.033 -0.3572,-0.0765 -0.5604,-0.24311 -0.2031,-0.16667 -0.4987,-0.2625 -0.6569,-0.21295 -0.1581,0.0494 -0.3189,-0.0113 -0.3575,-0.13335 -0.039,-0.12295 -0.2501,-0.25729 -0.4705,-0.2987 -0.2202,-0.0415 -0.5084,-0.15442 -0.6407,-0.25114 -0.2616,-0.19154 -0.7165,0.0618 -0.6266,0.34874 0.03,0.0961 0.3776,0.32607 0.7722,0.51085 z m 12.0356,4.20088 c 0.442,0.25991 0.9729,0.10525 0.7919,-0.23071 -0.2163,-0.40171 -1.2852,-0.45929 -1.1609,-0.0625 0.016,0.0513 0.1823,0.18331 0.369,0.29325 z m 1.6922,0.44025 c 0.4615,0.0876 0.6824,0.003 0.6093,-0.2285 -0.076,-0.2438 -0.7658,-0.43035 -0.9224,-0.24955 -0.1864,0.21538 -0.06,0.40695 0.3131,0.47805 z m 0.5364,-11.95609 c 0.6297,0.24593 1.873,0.78022 2.7627,1.18736 0.8896,0.40712 1.6434,0.69094 1.6747,0.63072 0.124,-0.23735 -1.0198,-1.17832 -2.1075,-1.7337 -1.0086,-0.51495 -3.2266,-1.07411 -3.6877,-0.92966 -0.292,0.0915 0.1804,0.38554 1.3578,0.84528 z" id="path7555" inkscape:connector-curvature="0" sodipodi:nodetypes="cccsssccscsccssccssscccsssccscccsscscscsccscccccsscssscccccccccccccccccccccccccccccccccccccccccccccsccc"/>
+      <path style="fill:#504f4c" d="m 1160.5691,287.37766 c 0.6053,-1.79482 0.6699,-2.84619 1.7823,-2.35331 0.7432,0.18017 1.4653,0.29314 1.6044,0.25104 0.1395,-0.0422 0.4594,-0.39706 0.7111,-0.78878 0.2518,-0.39171 1.0844,-1.37323 1.8504,-2.1811 1.2111,-1.2774 1.523,-1.52205 2.3925,-1.87663 1.2805,-0.52229 3.4541,-0.89801 4.8276,-0.83455 1.8051,0.0833 4.3241,0.45082 5.5849,0.81452 4.0891,1.17977 7.8298,3.92107 9.1581,6.71169 0.2497,0.52441 0.5419,0.97594 0.6496,1.0034 0.1063,0.0274 0.8698,-0.1083 1.694,-0.30154 0.8244,-0.19329 1.8077,-0.33868 2.1853,-0.32313 1.0363,0.0429 3.8275,-0.46969 5.6526,-1.03786 5.3724,-1.67229 9.1657,-4.13897 10.5673,-6.87164 0.5377,-1.04864 0.6244,-1.68165 0.1102,-0.80496 -0.6404,1.09149 -1.8631,2.36161 -3.181,3.30403 -1.547,1.10623 -1.6142,1.00332 -0.5779,-0.88261 1.0638,-1.93563 1.2953,-2.98604 0.8538,-3.87227 -1.0485,-2.10495 -3.089,-4.45729 -5.9974,-6.91413 -2.2702,-1.91776 -2.9767,-2.64449 -3.0024,-3.08829 -0.017,-0.30611 -0.2924,-0.48167 -1.6266,-1.03935 -5.1483,-2.15209 -9.8456,-2.93431 -13.7321,-2.28676 -1.5319,0.25523 -1.5758,0.34877 -0.7199,1.53517 1.6851,2.33579 1.8462,4.4288 0.5286,6.86371 -0.5492,1.01458 -2.3961,2.82905 -3.6847,3.61967 -2.2563,1.3845 -5.1509,2.32231 -7.5271,2.43859 -1.6673,0.0816 -4.5324,-0.37639 -5.7422,-0.91799 -1.8363,-0.82206 -3.4912,-2.95028 -3.9098,-5.02766 -0.022,-4.75234 0.6407,-4.1986 2.4003,-6.49315 1.6015,-1.54386 3.4064,-2.58193 5.7841,-3.32683 2.472,-0.77445 5.0046,-0.91385 7.0757,-0.38944 l 0.9371,0.23729 3.2672,-0.97242 c 4.1766,-1.24303 5.9365,-1.43929 9.6038,-1.07071 5.067,0.50926 10.7604,2.87978 14.5866,6.07343 3.4649,2.89187 5.0766,5.50183 6.0732,9.83383 0.7787,3.38542 0.7606,6.82785 -0.047,8.89858 -0.6877,1.76355 -2.5061,3.78533 -3.91,4.34731 -0.4526,0.18114 -0.4864,0.16337 -0.6504,-0.34138 -0.1031,-0.31487 -0.3838,-0.68639 -0.689,-0.90908 -6.3322,-3.10415 -9.4568,0.99945 -14.2579,3.4361 -0.4772,0.24136 -1.3264,0.53792 -1.8874,0.65902 -0.5608,0.12106 -1.4418,0.31641 -1.9577,0.434 -0.5158,0.11756 -1.1636,0.24578 -1.4395,0.28483 -0.4034,0.0571 -0.4986,0.13459 -0.486,0.39611 0.014,0.27963 0.1063,0.30392 0.6605,0.17366 0.4442,-0.10428 0.6836,-0.0795 0.7685,0.0798 0.2273,0.4251 -0.4393,1.84929 -1.228,2.62382 -0.6698,0.65776 -0.9251,0.79823 -2.3511,1.29398 -1.3327,0.46329 -1.8746,0.57064 -3.2474,0.64314 -1.8878,0.0998 -4.9379,-0.32881 -6.6577,-0.93537 -2.6586,-0.93759 -5.5542,-2.77124 -6.8871,-4.36126 -1.0418,-1.24278 -1.4051,-1.5087 -3.5118,-2.56948 -1.8464,-0.92978 -2.1237,-1.12286 -2.3563,-1.6412 -0.2107,-0.46975 -0.2196,-0.77905 -0.044,-1.54374 z m 1.9141,2.23482 c 0.4588,0.21474 0.9041,0.3353 0.9898,0.26793 0.086,-0.0673 0.2454,0.0141 0.355,0.18069 0.1604,0.24373 4.8021,2.25093 6.7208,2.90623 0.2444,0.0836 0.6157,0.21741 0.8254,0.29748 1.2665,0.48463 2.9844,0.98242 3.1004,0.89856 0.075,-0.0541 0.1885,-0.27809 0.2523,-0.4978 0.1063,-0.36672 0.069,-0.42289 -0.4581,-0.6848 -0.3156,-0.15692 -0.7656,-0.33829 -1.0001,-0.40306 -0.4301,-0.11881 -1.6004,-0.52361 -2.0296,-0.70206 -0.1281,-0.0531 -0.2719,-0.0843 -0.3201,-0.0694 -0.1339,0.0419 -2.0597,-0.71129 -2.1656,-0.84714 -0.052,-0.0659 -0.1857,-0.091 -0.2984,-0.0559 -0.1126,0.0352 -0.3937,-0.0651 -0.6245,-0.22313 -0.2307,-0.15804 -0.4782,-0.26949 -0.5504,-0.24769 -0.1164,0.0352 -1.575,-0.59681 -2.692,-1.16625 -0.223,-0.11367 -0.4891,-0.18067 -0.5909,-0.14874 -0.101,0.0321 -0.2159,-0.0395 -0.2534,-0.15885 -0.076,-0.24555 -1.5902,-0.93851 -1.863,-0.85309 -0.1658,0.0521 -0.3329,0.67561 -0.2627,0.98109 0.017,0.0745 0.4062,0.31094 0.8651,0.52569 z m 15.8361,-6.52394 c 1.3112,0.50941 3.1864,1.32288 4.1674,1.80771 1.7555,0.8675 2.2365,0.99028 2.0935,0.53424 -0.039,-0.12696 -0.032,-0.38401 0.016,-0.57119 0.2438,-0.93695 -3.4746,-3.07344 -6.4383,-3.69913 -1.0087,-0.21297 -1.0632,-0.20693 -1.3881,0.15334 -0.1941,0.21542 -0.4979,0.38268 -0.7137,0.39299 -0.7905,0.0379 -0.081,0.47163 2.2628,1.38204 z m 9.2487,-21.47153 c 0.3613,0.14811 0.777,0.94417 0.6522,1.24867 -0.077,0.19061 0.2191,0.33306 1.2906,0.61853 0.7658,0.20398 2.1575,0.58333 3.093,0.84298 4.8927,1.35801 4.4643,1.33675 5.0915,0.25257 0.2809,-0.48542 0.4886,-0.95271 0.4617,-1.03846 -0.1322,-0.42153 -4.293,-1.80664 -6.514,-2.16845 -1.0072,-0.16406 -3.9388,-0.28428 -4.2853,-0.17571 -0.207,0.065 -0.091,0.29628 0.2103,0.41988 z" id="path7553" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccscssccccscsssscccscccssccsccsssscccccccscccssssccccccccccccscccccccccccccccccccccccccscccccc"/>
+      <path style="fill:#42413d" d="m 1160.5317,288.1096 c 0.9623,-3.59898 0.8812,-3.26926 2.4083,-2.85248 0.43,0.14408 0.8916,0.22756 1.0259,0.18545 0.1342,-0.0421 0.6042,-0.49087 1.0442,-0.99729 0.858,-0.98719 1.6443,-1.60027 2.6922,-2.09955 0.9817,-0.46775 1.5585,-0.90612 1.488,-1.13108 -0.07,-0.22552 -0.439,-0.28086 -0.9371,-0.14067 -0.3118,0.0877 -0.3118,0.0761 -5e-4,-0.17719 0.4915,-0.39993 2.9319,-1.12224 4.0624,-1.20241 1.2226,-0.0867 2.9251,0.0364 4.9076,0.35488 1.9661,0.31581 2.5763,0.5023 4.7222,1.44331 3.0477,1.33641 5.99,4.02035 6.6474,6.06321 0.1992,0.61925 0.6546,0.85372 1.2783,0.65829 0.2713,-0.0849 1.0212,-0.14041 1.6664,-0.1232 1.1086,0.0295 1.1498,0.0452 0.7493,0.28326 -0.9562,0.56872 -0.9368,0.53864 -0.667,1.04572 0.2367,0.44514 0.2223,0.4981 -0.2239,0.81826 -0.5584,0.40065 -4.3671,1.90674 -4.6433,1.83618 -0.1042,-0.0264 -0.3646,0.0279 -0.5795,0.12095 -0.2152,0.093 -0.4573,0.11193 -0.538,0.0422 -0.08,-0.0698 -0.3246,-0.0294 -0.5421,0.0898 -0.2639,0.14446 -0.488,0.15699 -0.6724,0.0377 -0.31,-0.20078 -0.8069,-0.10064 -0.8778,0.17682 -0.069,0.26805 -0.7936,0.45063 -1.3762,0.34637 -0.7917,-0.14174 -2.3041,0.38974 -2.5994,0.91345 -0.1957,0.34786 -0.3057,0.41144 -0.6117,0.35333 -0.205,-0.0389 -0.4161,-0.20818 -0.4687,-0.37599 -0.069,-0.21796 -0.3263,-0.32856 -0.9032,-0.38725 -0.7926,-0.0806 -3.8694,-1.10613 -8.3845,-2.79467 -1.2522,-0.46827 -2.9562,-1.09569 -3.7867,-1.39427 -0.8306,-0.29857 -1.9804,-0.75482 -2.5553,-1.01387 l -1.0451,-0.47097 -0.2319,0.53814 c -0.4065,0.94362 -0.5892,0.80127 3.6835,2.8708 2.4781,1.20029 5.2712,2.30547 8.4215,3.33201 2.4676,0.80416 4.0011,1.12212 5.1371,1.06514 0.3877,-0.0195 0.7085,0.0524 0.7206,0.16142 0.013,0.10804 0.1411,0.14812 0.287,0.0891 0.2147,-0.0869 0.2437,-0.0544 0.152,0.16922 -0.075,0.18593 -0.2773,0.29494 -0.6136,0.33258 -0.3648,0.0407 -0.1227,0.14488 0.8953,0.3845 0.8129,0.19138 1.6847,0.27962 2.0885,0.21138 0.6475,-0.10942 0.7352,-0.18084 1.3327,-1.0856 0.3809,-0.5765 0.8973,-1.12647 1.276,-1.35883 0.7572,-0.46466 1.741,-0.62442 1.8428,-0.29934 0.1346,0.42931 -0.8173,1.94842 -1.6294,2.60065 -1.1543,0.92694 -3.4276,1.60575 -5.4998,1.64214 -2.6757,0.047 -5.6415,-0.56473 -8.1317,-1.67726 -2.0383,-0.91053 -4.8362,-3.093 -5.1178,-3.99213 -0.1399,-0.44685 -0.7217,-0.83133 -3.3094,-2.18737 -1.2712,-0.66618 -2.3237,-1.32668 -2.4365,-1.5292 -0.1089,-0.19605 -0.1752,-0.58999 -0.1464,-0.87542 z m 13.0693,7.18493 c 0.3102,0.10728 0.5952,0.29583 0.6339,0.41917 0.039,0.1233 0.1751,0.19133 0.3034,0.15116 0.1282,-0.0402 0.7045,0.004 1.2808,0.10031 0.9172,0.15165 1.0918,0.24228 1.4,0.72681 0.4407,0.69271 0.7542,0.79649 0.5631,0.1864 -0.078,-0.25166 -0.085,-0.52458 -0.014,-0.60649 0.14,-0.16161 -0.2541,-0.50158 -0.4941,-0.42637 -0.073,0.0226 -0.6851,-0.0986 -1.3622,-0.26972 -2.3389,-0.59056 -2.9489,-0.71543 -2.9116,-0.596 0.02,0.0659 0.2913,0.20761 0.6011,0.31482 z m 2.3066,-12.81813 c 2.5723,0.75872 4.1049,1.38575 7.0796,2.89662 2.0549,1.04369 2.6341,1.24171 2.5145,0.85981 -0.025,-0.0839 0.1239,-0.20628 0.3334,-0.27199 0.4731,-0.14819 0.4343,-0.2791 -0.3092,-1.04173 -1.9942,-2.04593 -6.0895,-3.972 -9.2322,-4.34197 -1.7058,-0.20081 -1.9436,-0.14898 -2.2822,0.49729 -0.1608,0.30735 -0.2877,0.60465 -0.282,0.66067 0.013,0.0561 0.9859,0.38962 2.1781,0.7413 z m -13.1001,-15.01603 c 1.5124,-2.25608 2.9932,-3.35738 5.9168,-4.4008 2.9038,-1.03615 5.0589,-1.20505 7.6251,-0.59752 1.2361,0.29262 1.2685,0.29075 1.9226,-0.11067 0.8283,-0.50821 4.293,-1.44718 6.2676,-1.69866 4.4611,-0.56818 8.6609,0.1046 13.6495,2.1867 3.3164,1.38412 5.6793,3.0011 8.1782,5.59657 1.696,1.7614 3.3405,4.18373 2.9276,4.313 -0.083,0.0258 -0.016,0.60373 0.1464,1.2841 0.4691,1.95816 0.081,3.90422 -1.1364,5.68519 -0.5961,0.87242 -1.9897,2.15725 -2.7255,2.5125 l -0.5604,0.27064 0.7777,-1.46144 c 0.5063,-0.95113 0.8198,-1.79339 0.8979,-2.41212 l 0.1201,-0.95071 -0.9204,-1.49403 c -1.1644,-1.88966 -2.9141,-3.75421 -5.9012,-6.28878 -1.8098,-1.5355 -2.335,-2.06656 -2.47,-2.49746 -0.1542,-0.49238 -0.3115,-0.60564 -1.5678,-1.12887 -4.6024,-1.9166 -8.6472,-2.76449 -12.2471,-2.56725 -1.4884,0.0816 -2.8853,0.40741 -3.0436,0.70985 -0.074,0.14011 0.1412,0.54756 0.6754,1.28405 0.6584,0.90697 0.8337,1.27636 1.1014,2.319 0.2665,1.03732 0.2838,1.42398 0.1077,2.3638 -0.2705,1.43619 -1.0288,2.7098 -2.3557,3.95702 -1.7901,1.68234 -3.0086,2.35006 -6.0118,3.29429 -2.5382,0.79809 -2.6252,0.81398 -4.1881,0.76573 -5.1539,-0.15915 -7.7868,-1.85984 -8.8033,-5.68644 0.092,-4.29135 0.334,-3.53321 1.6179,-5.24775 z m 17.3288,-3.57425 c 0.089,0.0683 1.0567,-0.0271 2.1502,-0.21226 2.4017,-0.40682 3.815,-0.43983 5.9028,-0.13789 1.6386,0.23695 5.7183,1.34696 7.6766,2.08867 0.6192,0.23455 1.2122,0.39942 1.3176,0.36639 0.1064,-0.0331 0.2801,-0.33267 0.3881,-0.66589 0.1077,-0.33319 0.3355,-0.82575 0.5059,-1.09461 0.1703,-0.26883 0.2711,-0.61255 0.2236,-0.76378 -0.1214,-0.38904 -2.9556,-1.54533 -4.895,-1.99736 -3.8158,-0.88936 -7.8713,-0.87362 -10.7934,0.0419 -1.4454,0.45282 -1.9541,0.79602 -2.4535,1.65486 -0.2654,0.45714 -0.268,0.53176 -0.023,0.71998 z m 23.9848,20.52909 c 0.1896,-0.14923 0.4372,-0.30025 0.5499,-0.33556 0.1127,-0.0353 0.7806,-0.47406 1.4843,-0.97491 2.1686,-1.54399 3.4787,-3.26916 4.09,-5.38648 l 0.309,-1.06976 0.2312,0.56785 c 0.4413,1.08354 0.559,4.57427 0.2234,6.63069 -0.2318,1.41985 -1.2353,3.29155 -2.3141,4.31658 -0.4718,0.4479 -1.0266,0.84218 -1.2331,0.87617 -0.3283,0.0541 -0.3917,-0.0113 -0.5025,-0.51449 -0.1514,-0.68723 -0.5934,-1.10704 -1.7851,-1.69587 -0.8146,-0.40249 -0.8732,-0.46903 -1.1282,-1.28369 -0.2451,-0.78197 -0.2384,-0.8836 0.075,-1.13053 z" id="path7551" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccsccsscccccccccccccccccccccscccccccscccssscccccccccccccscccsccsssccsccccsssccssccccccccsccccsssccccssccscscccccccsccccccscccc"/>
+      <path style="fill:#2e2d2a" d="m 1162.9526,285.36356 c 0.58,0.19649 0.7398,0.18163 1.3833,-0.12862 0.4003,-0.1929 1.1331,-0.50012 1.6285,-0.68267 0.4956,-0.18255 1.7754,-0.6691 2.8438,-1.08121 1.0686,-0.41213 2.1977,-0.77708 2.5096,-0.81098 0.3119,-0.034 1.0001,-0.12245 1.5296,-0.19673 0.9446,-0.13252 2.5291,0.11042 4.5329,0.69515 1.0766,0.31408 3.4511,1.40543 6.0045,2.7598 1.9902,1.05556 2.5998,1.26108 2.9402,0.99129 0.1102,-0.0874 0.3551,-0.12952 0.5439,-0.0937 0.4506,0.0856 0.3689,-0.18231 -0.325,-1.06397 -1.8472,-2.3473 -6.3542,-4.71297 -10.1703,-5.33827 -1.4505,-0.23765 -3.8105,-0.25923 -5.6428,-0.0515 -1.1615,0.13166 -1.3862,0.12057 -0.9884,-0.0487 0.7162,-0.30452 2.812,-0.62003 3.9152,-0.58941 1.668,0.0465 5.2142,0.64662 6.4585,1.09333 3.0209,1.08446 5.6664,2.847 7.2513,4.83092 0.8724,1.09218 1.5867,2.68522 1.2513,2.79031 -0.3386,0.10601 -0.1884,0.35525 0.215,0.35674 0.9271,0.002 -0.054,0.45268 -2.9381,1.34542 -3.2912,1.01869 -5.2254,1.45402 -6.7967,1.52971 -1.0292,0.0496 -3.1708,-0.0826 -3.991,-0.24654 l -0.489,-0.0976 0.5243,-0.0641 c 0.2884,-0.0352 0.5134,-0.0991 0.4999,-0.14209 -0.014,-0.0428 -0.6142,-0.21632 -1.335,-0.38549 -4.52,-1.06067 -12.6751,-4.23676 -12.9247,-5.03372 0.099,-0.69458 0.6395,-0.64663 1.5692,-0.33737 z m 9.7612,2.82163 c 1.1575,0.53661 2.0837,0.60249 2.1121,0.15027 0.038,-0.59878 -2.1152,-1.2735 -3.0948,-0.96991 -0.3961,0.12282 -0.2403,0.25269 0.9827,0.81964 z m -10.4565,-19.45388 c 1.1247,-1.66978 3.1714,-3.3565 5.5946,-4.61075 2.1308,-1.10297 6.6609,-1.62199 9.6224,-1.10245 0.5849,0.10269 1.1297,0.19397 1.2107,0.20298 0.082,0.009 -0.015,-0.11707 -0.2138,-0.28013 -0.1987,-0.16309 -0.3298,-0.35694 -0.2912,-0.43077 0.039,-0.0738 0.9718,-0.40446 2.0734,-0.73475 1.7197,-0.51554 1.8567,-0.53908 0.9669,-0.16632 -1.3046,0.5465 -1.4302,0.66414 -1.5411,1.44331 -0.088,0.61468 -0.075,0.64594 0.3578,0.96247 0.2465,0.17994 0.4857,0.44652 0.5314,0.5924 0.046,0.14585 0.4462,0.79598 0.8901,1.44471 1.0215,1.4926 1.2813,2.53057 1.0335,4.12806 -0.4272,2.75546 -3.0262,5.35458 -6.9283,6.92883 -2.8376,1.14479 -5.2137,1.42047 -8.1432,0.94488 -2.093,-0.33978 -3.2259,-0.85689 -4.2539,-1.94171 -1.1101,-1.17156 -1.9436,-2.73576 -1.986,-3.72734 -0.5227,-1.5348 -0.013,-2.33577 1.0767,-3.65342 z m 4.5155,23.87158 c 0.1064,-0.0333 0.5249,0.0391 0.9299,0.16104 0.7934,0.23878 0.9325,0.29182 1.7602,0.67113 0.2984,0.1368 0.8173,0.35112 1.1529,0.47627 0.3356,0.12519 0.6478,0.34528 0.6937,0.48917 0.046,0.14389 0.2728,0.29891 0.5044,0.3445 0.2314,0.0455 0.8359,0.26976 1.3433,0.49811 0.8493,0.38216 0.9266,0.45787 0.9712,0.95191 0.047,0.5236 0.054,0.52791 0.2629,0.17648 0.2829,-0.47537 0.3604,-0.48938 1.4768,-0.26677 0.7768,0.15491 1.0358,0.29639 1.3963,0.76302 0.5775,0.74745 0.9212,0.76343 0.692,0.0323 l -0.1716,-0.54806 1.5752,0.25715 c 0.8662,0.14143 1.6344,0.30851 1.7069,0.37127 0.073,0.0628 0.5037,0.0887 0.9582,0.0579 0.7828,-0.0534 0.8519,-0.0875 1.3032,-0.64262 0.2621,-0.32244 0.5393,-0.6059 0.616,-0.62994 0.076,-0.024 0.1469,-0.16249 0.156,-0.30768 0.043,-0.67217 2.1405,-1.71815 2.5105,-1.25137 0.2513,0.31729 -0.6668,1.82801 -1.486,2.44548 -0.355,0.26739 -1.2871,0.72336 -2.0713,1.01328 -1.1927,0.44087 -1.6879,0.54038 -3.0263,0.60822 -4.6711,0.23681 -9.8195,-1.63344 -12.7057,-4.61547 -0.7119,-0.73542 -0.8318,-0.96627 -0.5487,-1.05502 z m 21.2685,-28.93939 c 0.166,-0.0528 2.0581,0.35568 2.0879,0.4506 0.024,0.0783 -0.8057,-0.0557 -1.6531,-0.26656 -0.3126,-0.0779 -0.5082,-0.16063 -0.4348,-0.18404 z m 2.6142,0.52634 c 0.7866,0.1348 4.1042,1.1512 5.36,1.64215 0.6716,0.2626 1.2794,0.45914 1.3509,0.43677 0.071,-0.0224 0.1883,-0.27706 0.26,-0.56599 0.071,-0.28894 0.3251,-0.93845 0.5635,-1.44335 0.4202,-0.89024 0.4467,-0.91423 0.8743,-0.79291 0.2427,0.0688 1.1928,0.58621 2.1115,1.1497 6.8351,4.19264 9.8027,9.79819 7.4968,14.16019 -0.6186,1.17039 -1.9927,2.6939 -2.8789,3.19261 -0.608,0.34203 -0.5719,0.1555 0.2471,-1.27396 0.63,-1.09947 0.9563,-2.45594 0.7527,-3.12814 -0.067,-0.21764 -0.3961,-0.87442 -0.7338,-1.45954 -0.3377,-0.58514 -0.6715,-1.24735 -0.7419,-1.47158 -0.07,-0.22424 -0.3478,-0.55186 -0.6166,-0.72805 -0.2688,-0.17616 -1.0103,-0.83526 -1.6477,-1.46465 -0.6375,-0.62939 -1.5241,-1.44453 -1.9704,-1.81139 -0.4462,-0.36686 -1.1682,-0.96978 -1.6045,-1.33978 -0.4362,-0.36997 -0.9771,-0.81936 -1.2016,-0.9986 -0.2245,-0.17927 -0.4911,-0.5899 -0.592,-0.91256 -0.1768,-0.56415 -0.2663,-0.61888 -2.3312,-1.42629 -1.1811,-0.46182 -2.7319,-1.02119 -3.4462,-1.24306 -1.4816,-0.46012 -1.8923,-0.63126 -1.252,-0.52157 z m 14.1109,20.31462 c 0.06,-0.17272 0.6018,-0.66239 1.2016,-1.08817 1.8202,-1.29206 3.0035,-2.59438 3.8794,-4.26953 0.431,-0.82394 0.8326,-1.47232 0.8928,-1.44085 0.1532,0.08 0.3571,2.27649 0.3307,3.55831 -0.061,2.98321 -0.7458,5.09213 -2.0835,6.42355 -0.8062,0.80259 -0.8718,0.79118 -1.5325,-0.26676 -0.209,-0.33466 -0.538,-0.68415 -0.7313,-0.77664 -0.3515,-0.16827 -1.9831,-1.55405 -2.0387,-1.73164 -0.016,-0.0518 0.02,-0.23555 0.082,-0.40827 z" id="path7549" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccscccccccccccccccsccsccsccccccccsssssccccsccccccccccsccccccccsccccccccccscscccccccsscccccccccccccccccc"/>
+      <path style="fill:url(#linearGradient9542);fill-opacity:1" d="m 1162.5875,285.43002 c 0.5623,0.50709 2.6581,0.1198 4.0133,-0.74158 1.2274,-0.78021 3.5819,-1.47816 5.1038,-1.51299 1.6117,-0.0368 1.6569,-0.006 2.0184,1.36481 0.2176,0.82545 0.3645,1.15611 0.515,1.15914 0.1563,0.002 0.1164,-0.29463 -0.1516,-1.15238 -0.4361,-1.3914 -0.4053,-1.41543 1.497,-1.16918 2.0445,0.26464 2.0187,0.24383 1.662,1.3402 -0.3325,1.02232 -0.335,1.19141 -0.015,1.09129 0.1177,-0.0369 0.313,-0.43714 0.4334,-0.88917 0.1202,-0.45202 0.2972,-0.8467 0.3934,-0.87703 0.2517,-0.0794 3.1602,1.34504 3.2351,1.58434 0.037,0.11356 -0.3067,0.44998 -0.7899,0.77616 -0.469,0.31665 -0.8545,0.67008 -0.8566,0.78538 -0.013,0.3452 0.6499,0.036 1.4233,-0.67076 l 0.7161,-0.65451 0.6866,0.42322 c 0.3776,0.23277 1.0397,0.70954 1.4714,1.05949 0.7629,0.61849 1.3384,0.72181 1.3652,0.24509 0.013,-0.13737 0.233,-0.0888 0.6335,0.1365 0.3418,0.19231 0.7553,0.30771 0.919,0.25651 0.3364,-0.10548 0.7151,0.25766 0.4541,0.43547 -1.3537,0.92161 -5.5619,2.22578 -7.8095,2.42009 -3.3348,0.28831 -7.2882,-0.57354 -13.321,-2.90411 -1.6848,-0.65087 -2.0335,-0.84466 -2.0686,-1.1497 -0.037,-0.31144 -0.09,-0.33781 -0.3565,-0.17445 -0.2521,0.15431 -0.4957,0.0758 -1.2312,-0.3968 -0.6067,-0.2808 -1.377,-1.24477 0.059,-0.78503 z m 7.4987,1.91832 c 0.2488,-0.0396 0.3686,0.0367 0.4019,0.25549 0.1031,0.67495 4.8113,2.16025 5.8334,1.84005 0.1639,-0.0513 0.8537,-0.0474 1.5328,0.009 1.5596,0.12898 1.9502,0.11906 2.0993,-0.0532 0.2901,-0.33493 -0.592,-0.84545 -2.3673,-1.37005 -2.2672,-0.67 -2.9883,-0.9964 -3.0423,-1.37689 -0.1076,-0.75411 -2.8142,-1.12541 -3.9287,-0.53881 -1.0406,0.5477 -1.394,1.37227 -0.5291,1.2346 z m 13.071,1.69276 c 0.4656,-0.20451 0.8936,-0.46254 0.9508,-0.57342 0.07,-0.13528 -0.013,-0.13107 -0.2471,0.0129 -0.1934,0.11793 -0.643,0.30671 -0.9992,0.41955 -0.3562,0.11293 -0.6259,0.2744 -0.5993,0.35902 0.03,0.0969 0.3618,0.0161 0.8948,-0.21798 z m -20.9934,-19.87274 c 0.9025,-1.42782 2.1977,-2.64761 4.048,-3.8121 1.1019,-0.69353 1.718,-0.96647 3.4002,-1.50655 2.1704,-0.69678 3.1376,-0.8466 5.3514,-0.829 2.2469,0.0179 4.2487,0.61935 5.0436,1.29297 -1.2213,-0.81227 0.9964,-0.0623 2.1025,4.07938 0.1367,0.13877 0.1502,0.29858 0.04,0.46851 -0.091,0.14183 -0.119,0.41041 -0.06,0.59686 0.058,0.18647 0.013,0.50625 -0.1126,0.71064 -0.1202,0.20442 -0.1812,0.49092 -0.1355,0.63673 0.045,0.14579 0,0.33312 -0.1077,0.4163 -0.1052,0.0831 -0.1658,0.30991 -0.1353,0.5038 0.03,0.19392 -0.055,0.47011 -0.1886,0.61373 -0.1345,0.14361 -0.3702,0.46963 -0.524,0.7245 -0.1537,0.25485 -0.4006,0.4629 -0.5486,0.46234 -0.148,-5.5e-4 -0.4693,0.2514 -0.7142,0.55987 -0.245,0.30845 -0.5052,0.5796 -0.5784,0.60253 -0.073,0.0229 -0.1349,0.13653 -0.1374,0.25243 -1.612,1.15817 -3.3623,1.98032 -4.7076,2.42887 -0.1535,0.15639 -0.631,0.25292 -1.506,0.30434 -0.7048,0.0415 -1.4058,0.11431 -1.5573,0.16181 -1.9045,0.0726 -4.0779,-0.16444 -5.8454,-0.51376 -0.9245,-0.27884 -1.2245,-0.47046 -1.9792,-1.26425 -1.3087,-1.37666 -2.007,-2.86002 -2.018,-4.28669 0.1623,-1.68699 0.149,-1.46708 0.8705,-2.60327 z m 4.9986,23.81498 c 0.2237,-0.07 3.9772,1.4047 4.0337,1.58493 0.025,0.0832 -0.021,0.17286 -0.1052,0.19915 -0.085,0.0263 -0.1312,0.11643 -0.1053,0.20032 0.025,0.0839 0.2511,0.0887 0.4996,0.0113 0.31,-0.0971 0.7567,-0.0131 1.4211,0.26664 0.906,0.38157 0.976,0.44709 1.0726,1.00395 0.1089,0.62468 0.2937,0.70834 0.4928,0.22247 0.1668,-0.4068 0.4473,-0.45564 1.4267,-0.24842 0.6813,0.14416 0.9699,0.3146 1.4082,0.83145 0.6248,0.73668 1.0232,0.68435 0.7077,-0.0929 -0.1063,-0.26397 -0.1349,-0.47259 -0.061,-0.4636 0.8128,0.0992 2.8622,0.50719 3.1156,0.62001 0.1795,0.0799 0.7373,0.0561 1.2396,-0.0531 0.7916,-0.1718 0.9388,-0.25348 1.103,-0.61156 0.1042,-0.2273 0.3425,-0.46117 0.5295,-0.51974 0.2108,-0.0661 0.334,-0.23096 0.3243,-0.43455 -0.02,-0.42254 0.5048,-0.83024 1.4521,-1.12697 0.9049,-0.28346 1.0254,-0.10407 0.529,0.78765 -0.7336,1.31762 -1.9533,2.0894 -4.2146,2.66655 -3.1882,0.81368 -7.0044,0.28315 -10.6894,-1.48603 -1.9279,-0.92571 -4.7381,-3.18245 -4.1805,-3.35719 z m 11.5109,-12.41472 c 0.2969,0.0522 0.6095,0.15503 0.6946,0.22875 0.085,0.0738 -0.089,0.0914 -0.3851,0.0393 -0.297,-0.0522 -0.6097,-0.15503 -0.6948,-0.22874 -0.085,-0.0738 0.089,-0.0914 0.3853,-0.0394 z m 2.291,0.80467 c 0.2154,0.0992 0.4024,0.21483 0.4154,0.25679 0.014,0.042 -0.1522,-0.003 -0.3677,-0.10428 -0.2152,-0.0992 -0.4022,-0.21482 -0.4154,-0.25676 -0.014,-0.042 0.1524,0.003 0.3677,0.10416 z m 0.7398,0.35445 c 0.2354,-0.0738 2.2632,1.01825 3.1192,1.67961 1.0146,0.7839 2.8789,2.73995 2.8739,3.01546 0,0.11117 -0.3733,-0.19884 -0.8254,-0.68894 -1.0444,-1.13238 -2.4862,-2.27527 -4.0638,-3.22138 -0.681,-0.40844 -1.1779,-0.76158 -1.1039,-0.78475 z m 16.0502,-15.9647 c 0.1972,-0.83421 0.7866,-2.03963 1.0352,-2.1176 0.2922,-0.0914 3.4694,1.74684 4.753,2.75 1.4275,1.11583 3.4333,3.25094 4.2171,4.48941 0.8649,1.36601 1.6166,3.83112 1.5465,5.071 -0.081,1.42389 -0.482,2.53107 -1.3198,3.63893 -0.7391,0.97731 -1.8913,2.08292 -2.166,2.07795 -0.077,-10e-4 0.076,-0.32912 0.3452,-0.72817 0.8133,-1.20954 1.3442,-3.74152 0.8514,-4.06058 -0.1378,-0.0892 -0.2529,-0.35896 -0.2787,-0.65419 -0.03,-0.34097 -0.1592,-0.59678 -0.4021,-0.79623 -0.197,-0.16159 -0.4403,-0.55337 -0.5407,-0.87059 -0.2868,-0.90512 -1.1078,-2.10258 -1.5277,-2.22766 -0.2067,-0.0618 -0.4043,-0.2027 -0.4391,-0.31349 -0.092,-0.29625 -0.9964,-1.09446 -1.7673,-1.56104 -0.37,-0.22401 -0.798,-0.64242 -0.9509,-0.9298 -0.1555,-0.29218 -0.3978,-0.52261 -0.55,-0.52279 -0.5428,-6.5e-4 -1.0624,-0.11718 -1.1032,-0.24735 -0.023,-0.0733 -0.2177,-0.23317 -0.4325,-0.35545 -0.3902,-0.2219 -1.2927,-1.36395 -1.3843,-1.75147 -0.026,-0.11255 0.025,-0.51344 0.114,-0.89088 z m 9.7757,16.60323 c 0.6892,-0.66726 1.5644,-1.66331 1.9447,-2.21341 l 0.6917,-1.00021 0.209,0.48973 c 0.1152,0.26936 0.2272,0.95636 0.2498,1.52671 0.03,0.77868 -0.045,1.15155 -0.3079,1.49693 -0.2941,0.38818 -0.3114,0.52499 -0.1101,0.87666 0.1973,0.34482 0.1742,0.59631 -0.1334,1.45772 -0.4154,1.16247 -0.7384,1.49937 -1.4177,1.47773 -0.5113,-0.0163 -1.3385,-0.6469 -1.4923,-1.13758 -0.055,-0.17389 -0.181,-0.33709 -0.2812,-0.36266 -0.1009,-0.0256 -0.2773,-0.35065 -0.3938,-0.72245 l -0.2117,-0.67595 z" id="path7547" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccssccccccccccccccccccccccssscccccccscsscccccccccccccccccsccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccc"/>
+      <path style="fill:#171613" d="m 1164.459,286.52116 c 0.284,-0.67318 3.1152,-2.33263 4.6272,-2.71212 0.4349,-0.10916 0.5129,-0.0547 1.0353,0.72167 0.3107,0.46184 0.5591,0.93285 0.5519,1.0467 -0.013,0.11382 -0.3403,0.40962 -0.74,0.65719 -0.5678,0.35164 -0.7327,0.54768 -0.7535,0.8958 -0.021,0.35772 0.038,0.46768 0.3015,0.55723 0.1803,0.0614 0.3836,0.0943 0.4514,0.0728 0.069,-0.0213 0.1538,0.0583 0.191,0.17706 0.089,0.28418 2.941,1.38195 4.2154,1.62255 1.3056,0.24653 6.2707,0.39702 6.3231,0.19167 0.048,-0.19086 0.5247,-0.18334 0.585,0.01 0.024,0.0749 -0.082,0.17491 -0.2322,0.22222 -0.1508,0.0474 -0.3258,0.18455 -0.3887,0.30498 -0.2251,0.43028 -3.7473,0.49971 -6.0554,0.11931 -1.993,-0.32845 -7.3127,-2.05003 -9.3518,-3.02644 -0.9197,-0.44052 -0.9316,-0.45373 -0.7602,-0.86 z m 3.1893,6.74675 c 0.1239,0.0279 0.9438,0.31764 1.8223,0.64357 l 1.5971,0.59265 -0.5186,0.44354 c -0.6265,0.5355 -0.6728,0.52265 -2.0064,-0.5569 -1.0009,-0.81011 -1.3281,-1.22093 -0.8944,-1.12286 z m 3.5446,1.97677 c 0.8252,-0.25237 0.9451,-0.24166 1.7989,0.161 0.9025,0.42551 0.915,0.43979 0.9152,1.04664 0,0.33838 -0.069,0.63583 -0.154,0.66097 -0.2321,0.0688 -2.8861,-1.05047 -3.1845,-1.34308 -0.2466,-0.24212 -0.2147,-0.26895 0.6244,-0.52553 z m 3.2492,1.45265 0.3883,-0.57561 0.9878,0.1928 c 0.8742,0.17066 1.0437,0.27067 1.4762,0.87079 0.3593,0.49923 0.5655,0.65381 0.781,0.58628 0.2332,-0.073 0.2587,-0.2009 0.1252,-0.62748 l -0.1677,-0.53575 1.2798,0.20946 c 0.704,0.11519 1.4739,0.28262 1.7111,0.37203 0.2369,0.0894 0.7951,0.10107 1.2404,0.0262 0.6988,-0.11769 0.8596,-0.20493 1.175,-0.6368 0.2129,-0.29178 0.5474,-0.54257 0.8023,-0.60162 0.3881,-0.0899 0.4142,-0.13878 0.2322,-0.43574 -0.1843,-0.30092 -0.1411,-0.37359 0.4297,-0.7238 0.7514,-0.46097 1.3504,-0.66817 1.5163,-0.52454 0.1974,0.17093 -0.5182,1.31767 -1.2158,1.94814 -0.5816,0.5258 -0.8767,0.65923 -2.7141,1.22779 -1.9194,0.59405 -2.1715,0.63484 -3.6641,0.59353 -1.223,-0.0339 -4.7103,-0.59264 -4.7637,-0.76333 -0.013,-0.0146 0.1665,-0.2857 0.3804,-0.6023 z m -4.1793,-13.2275 c 0.4059,-0.12721 2.7023,-0.12419 2.8566,0.003 0.2455,0.20339 0.6863,1.69747 0.5483,1.85706 -0.1511,0.17431 -1.9658,0.22854 -2.2662,0.0678 -0.2434,-0.13027 -1.1529,-1.3392 -1.2565,-1.67026 -0.035,-0.11092 0.018,-0.22713 0.1176,-0.2583 z m 3.8174,-0.0235 c 0.2395,-0.075 2.9266,0.39094 3.095,0.53674 0.083,0.0709 0.029,0.48151 -0.1202,0.91263 -0.1479,0.43111 -0.2302,0.90755 -0.1827,1.05881 0.1531,0.48865 0.5431,0.15132 0.8187,-0.70825 0.1479,-0.46086 0.3479,-0.86269 0.4444,-0.89298 0.1968,-0.0615 2.3172,0.83698 2.7472,1.16433 0.329,0.25043 0.3041,0.28363 -0.6571,0.87254 -0.902,0.55282 -1.0959,0.9018 -0.6348,1.1429 0.2953,0.15442 0.3877,0.11105 1.1288,-0.52957 0.444,-0.38375 0.9283,-0.73567 1.0763,-0.78205 0.1479,-0.0463 0.6052,0.16547 1.0158,0.47076 0.7715,0.57354 1.5374,1.20812 1.5653,1.29666 0.013,0.0279 -0.4957,0.25431 -1.121,0.50334 -0.6249,0.24904 -1.1868,0.54898 -1.2483,0.66654 -0.1796,0.34339 -0.312,0.31069 -0.6528,-0.16108 -0.3499,-0.48414 -0.9736,-0.78601 -3.2888,-1.59145 -0.8362,-0.29092 -1.9576,-0.80325 -2.4923,-1.13852 -0.9584,-0.60119 -0.9763,-0.62442 -1.3105,-1.69103 -0.199,-0.63495 -0.2746,-1.10163 -0.183,-1.13032 z m 9.1319,5.77061 c 0.3001,-0.14528 0.7948,-0.40957 1.0997,-0.58729 0.9576,-0.55844 1.8708,-0.21118 1.1484,0.43672 -0.4385,0.39332 -2.1723,0.93192 -2.4808,0.77062 -0.3933,-0.20572 -0.3424,-0.3414 0.2327,-0.62005 z m 14.7941,-23.56732 c 0.1431,-0.81599 0.5663,-1.76864 0.8214,-1.84852 0.097,-0.0301 0.8086,0.29309 1.5837,0.71815 5.3071,2.91015 8.7401,7.28232 8.7497,11.1432 0,1.19782 -0.3082,2.41727 -0.6439,2.52241 -0.3247,0.10182 -0.4499,-0.47538 -0.1443,-0.66661 0.1507,-0.0944 0.2369,-0.36619 0.2065,-0.65097 -0.029,-0.26892 -0.062,-0.68265 -0.076,-0.91942 -0.02,-0.35346 -0.077,-0.41389 -0.3208,-0.33781 -0.3519,0.1103 -1.1339,-0.64057 -1.3693,-1.31491 -0.1215,-0.34713 -0.555,-0.40178 -0.4467,-0.0564 0.041,0.13282 0.014,0.26062 -0.06,0.28402 -0.075,0.0235 -0.218,-0.30573 -0.319,-0.7314 -0.1009,-0.42566 -0.262,-0.79409 -0.3586,-0.81874 -0.097,-0.0247 -0.2353,-0.23602 -0.3085,-0.46974 -0.073,-0.23371 -0.3095,-0.50615 -0.5248,-0.60542 -0.2153,-0.0992 -0.437,-0.32582 -0.4926,-0.50341 -0.055,-0.17762 -0.385,-0.50792 -0.7317,-0.73401 -0.3467,-0.22612 -0.8753,-0.69951 -1.1746,-1.052 -0.2993,-0.3525 -0.6484,-0.68362 -0.7756,-0.73586 -0.1274,-0.0522 -0.6647,-0.41149 -1.1941,-0.7984 -0.5293,-0.38689 -1.1515,-0.80953 -1.3829,-0.93917 -0.9404,-0.5271 -1.1355,-0.64793 -1.1482,-0.71059 -0.013,-0.0361 0.043,-0.3846 0.1115,-0.77451 z m 5.3627,3.33762 c 0.092,0.0238 0.1909,-0.0401 0.2169,-0.14177 0.1432,-0.56231 0.4002,-0.19681 1.1907,1.69398 0.2828,0.67642 0.6122,1.11522 0.4511,0.60097 -0.04,-0.12952 -0.013,-0.34115 0.077,-0.47025 0.1639,-0.25311 -0.1063,-1.13703 -0.4324,-1.41285 -0.1102,-0.0931 -0.4542,-0.44746 -0.7652,-0.78761 -0.3109,-0.34014 -0.6236,-0.60024 -0.6946,-0.578 -0.386,0.12095 -0.4216,0.99922 -0.044,1.09554 z m 2.6029,2.12286 c 0.1257,-0.0394 0.2086,-0.13626 0.1837,-0.21523 -0.06,-0.19232 -0.3415,-0.25545 -0.4253,-0.0953 -0.1177,0.22557 0.013,0.38451 0.2416,0.31062 z m 1.2443,2.96001 c 0.1164,-0.0366 0.2873,0.0279 0.3788,0.14321 0.091,0.11544 0.222,0.14543 0.29,0.0667 0.2039,-0.23553 0.075,-0.37792 -0.3945,-0.43645 -0.5417,-0.0675 -0.5952,-0.0533 -0.5345,0.14052 0.025,0.0839 0.1434,0.12258 0.2602,0.086 z m 0.8154,8.4543 c 0.048,-0.0151 0.2494,0.0142 0.4461,0.0655 0.2835,0.0738 0.3851,0.0408 0.4894,-0.15882 0.1064,-0.20237 0.059,-0.24847 -0.2367,-0.2343 -0.5288,0.0252 -0.5324,-0.22694 -0.013,-0.39196 0.3222,-0.10096 0.5046,-0.0584 0.6518,0.15174 0.1127,0.16053 0.1541,0.35477 0.091,0.43167 -0.061,0.0769 -0.1189,0.27868 -0.1276,0.44844 -0.013,0.22904 -0.1474,0.33651 -0.5272,0.41644 -0.4268,0.0899 -0.5417,0.0406 -0.6914,-0.29656 -0.098,-0.22236 -0.1399,-0.41679 -0.091,-0.43202 z" id="path7545" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccsccccccccscccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccsccccccccccccccccccccccsccccccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 1097.6041,222.25758 73.4707,1.70656 1.2794,18.79668 -73.3247,2.40545 z" inkscape:path-effect="#path-effect8453-6" id="path9401" d="m 1097.6041,222.25758 73.4707,1.70656 1.2794,18.79668 -73.3247,2.40545 -1.4254,-22.90869" style="opacity:0.63677135;fill:#f9f9f9;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.43794248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <g id="g280" transform="matrix(0.0957337,0,0,0.0957337,1124.6919,216.13019)">
+        <path id="path282" d="m 329.88856,106.33165 c 0,0 -42.69233,-14.987947 -59.01833,27.63355 -7.06654,18.44975 -3.7522,39.36332 -5.26727,52.93603 -1.98615,17.78367 -7.4941,25.62769 -7.4941,25.62769 0,0 0.58423,0.19776 4.80991,-4.13884 4.22568,-4.33661 4.91376,-10.13906 4.91376,-10.13906 0,0 2.64177,12.42866 0.44199,19.59669 -2.19977,7.16803 -5.74004,14.82167 -5.74004,14.82167 0,0 5.39477,-6.22121 7.52465,-9.389 2.13075,-3.16894 3.98694,-10.85585 3.98694,-10.85585 0,0 1.95432,15.951 0.0632,25.63803 -1.89213,9.68718 -9.72507,18.83715 -9.72507,18.83715 0,0 5.22197,-3.06097 8.62288,-7.27321 3.40178,-4.21339 5.2925,-9.34133 5.2925,-9.34133 l -4.67654,21.21654 6.49534,-15.50487 c 0,0 4.70529,4.14048 5.80322,10.81636 1.09781,6.67488 0.75254,15.27534 0.75254,15.27534 0,0 14.3268,-13.25654 16.38871,-19.26445 2.0629,-6.00806 -2.43423,-19.868 -2.43423,-19.868 l -4.25454,-21.02143 42.20083,-89.52131 -8.68633,-16.0817 z" inkscape:connector-curvature="0"/>
+        <path id="path284" d="m 328.58322,107.09611 c 0,0 17.00725,-18.786692 41.31178,44.83167 24.30441,63.61737 -16.16687,98.73581 -16.16687,98.73581 0,0 5.25768,-7.34021 9.31259,-15.35594 4.05503,-8.01472 3.67843,-13.37384 3.67843,-13.37384 l -9.86315,17.71829 3.88555,-16.25409 c 0,0 -3.5724,2.05359 -4.82207,6.32497 -1.2477,4.27109 -1.09015,9.37682 -1.09015,9.37682 0,0 -2.69829,-15.93445 -2.95974,-21.88003 -0.26244,-5.94543 0.11797,-15.78535 0.11797,-15.78535 l -23.40434,-94.33831 z" inkscape:connector-curvature="0"/>
+        <path id="path286" d="m 284.59194,166.01473 c 0,0 0.70374,28.58091 7.22718,40.71318 6.52357,12.13327 24.7951,22.69906 27.74944,23.967 2.95337,1.26809 10.9687,-1.83079 14.06155,-4.00308 3.09186,-2.17216 18.69027,-19.51293 20.73124,-33.30686 1.16616,-7.8831 -1.86191,-29.96166 -7.95876,-46.68418 -4.57008,-12.53743 -12.54434,-21.68086 -12.54434,-21.68086 l -49.26631,40.9948 z" inkscape:connector-curvature="0" style="fill:#dec7ab;stroke:#8b5e3c"/>
+        <path id="path288" d="m 304.12457,119.11329 c -21.08067,5.5202 -23.20704,37.10376 -26.77066,57.86263 -1.80664,10.52367 -8.90019,18.71378 -8.90019,18.71378 0,0 6.62934,-0.7073 10.33975,-2.40169 3.70929,-1.69524 10.13479,-6.35981 10.13479,-6.35981 0,0 -0.61917,1.80236 -3.60727,4.81336 -2.98993,3.0123 -7.59272,4.27091 -7.59272,4.27091 0,0 18.54746,2.92579 33.83872,-20.73357 15.29027,-23.65921 31.19802,-40.00144 31.19802,-40.00144 0,0 -3.12207,-25.46571 -38.64044,-16.16417 z" inkscape:connector-curvature="0"/>
+        <linearGradient y2="94.209801" x2="350.2742" y1="213.9805" x1="252.89059" gradientUnits="userSpaceOnUse" id="linearGradient3416">
+          <stop id="stop3418" style="stop-color:#FFFFFF" offset="0"/>
+          <stop id="stop3420" style="stop-color:#000000" offset="0.3846"/>
         </linearGradient>
       </g>
-      <g
-         id="g297"
-         transform="matrix(0.06964887,0,0,0.06964887,1120.3434,202.92106)">
-        <path
-           id="path299"
-           d="m 526.85,166.087 c 0,0 5.621,20.399 12.033,39.863 6.413,19.463 -7.966,55.451 -7.966,55.451 l 7.398,-36.273 c 0,0 -7.908,19.793 -9.414,32.963 -1.507,13.17 1.194,19.466 1.194,19.466 0,0 -13,-25.434 -10.347,-50.874 2.653,-25.44 -3.916,15.545 -3.916,15.545 l -4.448,-58.324 15.466,-17.817"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path301"
-           d="m 485.407,113.628 c -19.521,2.163 -41.032,33.607 -41.032,33.607 0,0 1.233,29.506 10.351,48.839 9.115,19.334 23.625,34.873 36.162,29.997 6.114,-2.378 20.615,-14.294 27.984,-28.092 7.742,-14.496 8.208,-30.843 8.208,-30.843 l -9.624,-26.543 c 0,0.001 -12.525,-29.127 -32.049,-26.965 z"
-           inkscape:connector-curvature="0"
-           style="fill:#dec7ab;stroke:#8b5e3c" />
-        <path
-           style="fill:#552200"
-           id="path303"
-           d="m 465.939,227.313 c 0,0 -1.436,-1.458 -3.616,-3.79 2.174,2.45 3.616,3.79 3.616,3.79 z m -35.528,-80.301 8.377,-12.998 c 0,0 -4.623,14.154 -5.2,18.775 -0.577,4.621 2.888,23.686 2.888,23.686 l 2.6,-19.931 c 0,0 -2.021,30.618 3.178,41.306 3.752,7.711 14.418,19.631 20.07,25.673 -6.698,-7.549 -20.359,-25.673 -20.359,-47.914 0,-29.463 4.622,-30.908 3.178,-11.843 -1.443,19.064 8.377,33.217 8.377,33.217 0,0 -11.555,-25.13 0.577,-46.505 8.466,-14.914 27.335,-21.39 37.969,-23.943 -0.346,0.459 -0.68,0.929 -0.996,1.412 -4.159,6.348 -3.673,13.688 -3.193,16.872 -0.21,-1.795 -0.202,-4.881 1.461,-8.207 2.6,-5.199 5.487,-6.932 5.487,-6.932 l 0.578,22.819 1.733,-11.554 2.311,13.576 1.733,-14.731 c 0,0 5.199,10.398 8.954,20.508 3.064,8.25 0.551,16.69 -0.478,19.518 0.827,-2.184 2.761,-7.701 3.654,-13.74 1.155,-7.799 1.155,-12.709 1.155,-12.709 0,0 -0.431,15.166 1.88,30.186 2.311,15.02 0.865,44.627 0.865,44.627 0,0 4.767,-33.218 3.9,-42.461 -0.567,-6.051 5.466,-17.093 7.706,-23.8 0.483,10.467 0.092,19.178 0.092,19.178 l 4.91,28.885 3.467,-2.6 c 0,0 1.155,13.865 0,25.997 -1.156,12.132 2.6,44.195 2.6,44.195 0,0 -2.312,-20.509 -0.289,-33.795 2.022,-13.288 4.621,-26.575 4.621,-26.575 0,0 2.022,6.644 3.178,14.731 1.156,8.087 -1.733,17.042 -1.733,17.042 0,0 4.333,-7.221 3.466,-19.931 -0.866,-12.709 -5.198,-27.441 -5.198,-27.441 0,0 4.621,11.265 7.798,18.776 3.178,7.51 0.579,21.664 0.579,21.664 0,0 3.402,-8.124 0.865,-21.953 -2.009,-10.954 -10.191,-27.193 -9.531,-33.795 1.733,-17.332 -6.933,-53.438 -6.933,-53.438 l 6.933,11.265 -8.376,-24.552 9.242,5.199 -14.153,-14.153 14.731,4.911 -20.22,-8.955 11.265,-8.377 -13.575,6.933 -4.622,-16.176 2.311,14.154 -13.864,-18.775 9.243,19.93 c 0,0 -11.843,-11.554 -40.728,-9.82 -28.885,1.733 -40.729,27.152 -40.729,27.152 l 8.955,-6.066 -12.709,12.42 10.109,-6.932 -12.132,15.021 7.51,-3.177 -5.488,14.151 z m 57.77,-0.578 c 0,0 -0.153,-0.597 -0.306,-1.614 0.117,1.011 0.306,1.614 0.306,1.614 z m 21.085,34.373 c 0,0 0.157,-0.354 0.39,-0.991 -0.242,0.636 -0.39,0.991 -0.39,0.991 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path305"
-           d="m 526.695,166.146 c 0,0 0.875,-16.97 8.811,-8.893 7.936,8.078 -7.635,19.657 -6.944,25.291 0.689,5.633 -7.818,6.799 -8.512,3.438 -0.694,-3.361 6.645,-19.836 6.645,-19.836 z"
-           inkscape:connector-curvature="0"
-           style="fill:#dec7ab;stroke:#8b5e3c;stroke-width:0.25" />
-        <path
-           style="fill:#aa4400"
-           id="path307"
-           d="m 496.427,123.192 c 0,0 -24.952,19.635 -31.497,29.861 -6.545,10.227 -5.728,27.407 -5.728,27.407 0,0 -3.682,-15.135 -2.045,-26.18 1.637,-11.044 7.363,-21.68 7.363,-21.68 0,0 -9.817,13.499 -12.271,26.998 -2.455,13.499 5.317,49.087 5.317,49.087 0,0 -5.727,-21.271 -7.772,-35.588 -1.168,-8.176 -2.448,-23.424 1.228,-34.77 2.761,-8.523 10.636,-14.726 10.636,-14.726 l 34.769,-0.409 z"
-           inkscape:connector-curvature="0" />
+      <g id="g297" transform="matrix(0.06964887,0,0,0.06964887,1120.3434,202.92106)">
+        <path id="path299" d="m 526.85,166.087 c 0,0 5.621,20.399 12.033,39.863 6.413,19.463 -7.966,55.451 -7.966,55.451 l 7.398,-36.273 c 0,0 -7.908,19.793 -9.414,32.963 -1.507,13.17 1.194,19.466 1.194,19.466 0,0 -13,-25.434 -10.347,-50.874 2.653,-25.44 -3.916,15.545 -3.916,15.545 l -4.448,-58.324 15.466,-17.817" inkscape:connector-curvature="0"/>
+        <path id="path301" d="m 485.407,113.628 c -19.521,2.163 -41.032,33.607 -41.032,33.607 0,0 1.233,29.506 10.351,48.839 9.115,19.334 23.625,34.873 36.162,29.997 6.114,-2.378 20.615,-14.294 27.984,-28.092 7.742,-14.496 8.208,-30.843 8.208,-30.843 l -9.624,-26.543 c 0,0.001 -12.525,-29.127 -32.049,-26.965 z" inkscape:connector-curvature="0" style="fill:#dec7ab;stroke:#8b5e3c"/>
+        <path style="fill:#552200" id="path303" d="m 465.939,227.313 c 0,0 -1.436,-1.458 -3.616,-3.79 2.174,2.45 3.616,3.79 3.616,3.79 z m -35.528,-80.301 8.377,-12.998 c 0,0 -4.623,14.154 -5.2,18.775 -0.577,4.621 2.888,23.686 2.888,23.686 l 2.6,-19.931 c 0,0 -2.021,30.618 3.178,41.306 3.752,7.711 14.418,19.631 20.07,25.673 -6.698,-7.549 -20.359,-25.673 -20.359,-47.914 0,-29.463 4.622,-30.908 3.178,-11.843 -1.443,19.064 8.377,33.217 8.377,33.217 0,0 -11.555,-25.13 0.577,-46.505 8.466,-14.914 27.335,-21.39 37.969,-23.943 -0.346,0.459 -0.68,0.929 -0.996,1.412 -4.159,6.348 -3.673,13.688 -3.193,16.872 -0.21,-1.795 -0.202,-4.881 1.461,-8.207 2.6,-5.199 5.487,-6.932 5.487,-6.932 l 0.578,22.819 1.733,-11.554 2.311,13.576 1.733,-14.731 c 0,0 5.199,10.398 8.954,20.508 3.064,8.25 0.551,16.69 -0.478,19.518 0.827,-2.184 2.761,-7.701 3.654,-13.74 1.155,-7.799 1.155,-12.709 1.155,-12.709 0,0 -0.431,15.166 1.88,30.186 2.311,15.02 0.865,44.627 0.865,44.627 0,0 4.767,-33.218 3.9,-42.461 -0.567,-6.051 5.466,-17.093 7.706,-23.8 0.483,10.467 0.092,19.178 0.092,19.178 l 4.91,28.885 3.467,-2.6 c 0,0 1.155,13.865 0,25.997 -1.156,12.132 2.6,44.195 2.6,44.195 0,0 -2.312,-20.509 -0.289,-33.795 2.022,-13.288 4.621,-26.575 4.621,-26.575 0,0 2.022,6.644 3.178,14.731 1.156,8.087 -1.733,17.042 -1.733,17.042 0,0 4.333,-7.221 3.466,-19.931 -0.866,-12.709 -5.198,-27.441 -5.198,-27.441 0,0 4.621,11.265 7.798,18.776 3.178,7.51 0.579,21.664 0.579,21.664 0,0 3.402,-8.124 0.865,-21.953 -2.009,-10.954 -10.191,-27.193 -9.531,-33.795 1.733,-17.332 -6.933,-53.438 -6.933,-53.438 l 6.933,11.265 -8.376,-24.552 9.242,5.199 -14.153,-14.153 14.731,4.911 -20.22,-8.955 11.265,-8.377 -13.575,6.933 -4.622,-16.176 2.311,14.154 -13.864,-18.775 9.243,19.93 c 0,0 -11.843,-11.554 -40.728,-9.82 -28.885,1.733 -40.729,27.152 -40.729,27.152 l 8.955,-6.066 -12.709,12.42 10.109,-6.932 -12.132,15.021 7.51,-3.177 -5.488,14.151 z m 57.77,-0.578 c 0,0 -0.153,-0.597 -0.306,-1.614 0.117,1.011 0.306,1.614 0.306,1.614 z m 21.085,34.373 c 0,0 0.157,-0.354 0.39,-0.991 -0.242,0.636 -0.39,0.991 -0.39,0.991 z" inkscape:connector-curvature="0"/>
+        <path id="path305" d="m 526.695,166.146 c 0,0 0.875,-16.97 8.811,-8.893 7.936,8.078 -7.635,19.657 -6.944,25.291 0.689,5.633 -7.818,6.799 -8.512,3.438 -0.694,-3.361 6.645,-19.836 6.645,-19.836 z" inkscape:connector-curvature="0" style="fill:#dec7ab;stroke:#8b5e3c;stroke-width:0.25"/>
+        <path style="fill:#aa4400" id="path307" d="m 496.427,123.192 c 0,0 -24.952,19.635 -31.497,29.861 -6.545,10.227 -5.728,27.407 -5.728,27.407 0,0 -3.682,-15.135 -2.045,-26.18 1.637,-11.044 7.363,-21.68 7.363,-21.68 0,0 -9.817,13.499 -12.271,26.998 -2.455,13.499 5.317,49.087 5.317,49.087 0,0 -5.727,-21.271 -7.772,-35.588 -1.168,-8.176 -2.448,-23.424 1.228,-34.77 2.761,-8.523 10.636,-14.726 10.636,-14.726 l 34.769,-0.409 z" inkscape:connector-curvature="0"/>
       </g>
-      <path
-         transform="matrix(0.11808159,-0.00399243,0.00827779,0.11895952,1011.6343,228.52081)"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter6246-9-0-2-9-5)"
-         d="m 895.09375,10.71875 c -4.89014,0.216719 -8.9448,1.858112 -12.09375,4.875 -1.59759,1.530586 -4.8116,3.669737 -7.125,4.78125 -3.48742,1.675586 -4.60803,2.971118 -6.5,7.53125 -1.98958,4.795395 -2.20562,6.588936 -1.6875,14 0.32684,4.675 1.03173,10.449445 1.5625,12.84375 0.66284,2.990057 0.60921,5.338672 -0.15625,7.5 -1.69611,4.78904 1.1929,17.46626 4.59375,20.21875 1.9377,1.56828 2.75991,3.55419 3.53125,8.34375 0.55646,3.45534 1.96032,7.52946 3.09375,9.0625 2.52251,3.41188 2.09711,6.41111 -0.9375,6.84375 -1.55228,0.22131 -3.03996,1.87541 -4.75,5.25 -3.00542,5.93093 -4.01657,6.48488 -27.46875,15 -20.35415,7.39028 -23.40627,9.10357 -25.46875,14.21875 -1.54323,3.82737 -2.18837,20.71788 -0.84375,22.0625 0.37,0.36999 35.8075,0.54708 78.75,0.40625 l 78.0625,-0.25 0.3125,-9 c 0.354,-10.88614 -1.301,-16.03118 -6.0625,-19.03125 -1.7852,-1.12478 -11.125,-4.91156 -20.75,-8.40625 -23.45217,-8.51512 -24.46333,-9.06907 -27.46875,-15 -1.71004,-3.37459 -3.19772,-5.02869 -4.75,-5.25 -3.03461,-0.43264 -3.42876,-3.43187 -0.90625,-6.84375 1.13343,-1.53304 2.50604,-5.60716 3.0625,-9.0625 0.77134,-4.78956 1.6248,-6.77547 3.5625,-8.34375 3.40085,-2.75249 6.25861,-15.42971 4.5625,-20.21875 -0.7789,-2.199274 -0.79207,-4.477673 -0.0937,-7.59375 0.54954,-2.452163 1.07819,-8.088755 1.1875,-12.53125 0.17935,-7.289277 -0.12954,-8.730788 -3.03125,-14.625 -3.56517,-7.24189 -6.22518,-9.577032 -15.1875,-13.21875 -6.3848,-2.594377 -12.10986,-3.779219 -17,-3.5625 z"
-         id="path21877-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssssssssssssssscccsssssssssssss" />
-      <path
-         sodipodi:nodetypes="cssssssssssscccsssssssssscc"
-         inkscape:connector-curvature="0"
-         id="path21879-1"
-         d="m 1114.5224,228.36959 c -0.1953,0.57841 -0.2058,0.79264 -0.084,1.67218 0.077,0.55483 0.2084,1.23894 0.2909,1.52164 0.1032,0.35305 0.1162,0.63266 0.044,0.89283 -0.1607,0.57648 0.2854,2.07302 0.7097,2.38686 0.2419,0.17884 0.3554,0.41179 0.4861,0.97848 0.094,0.40882 0.2939,0.88788 0.4404,1.06571 0.3261,0.39582 0.3006,0.7543 -0.054,0.81787 -0.1815,0.0325 -0.3435,0.23525 -0.5174,0.64351 -0.3058,0.71755 -0.4206,0.78747 -3.1194,1.89407 -2.3422,0.96039 -2.6885,1.1764 -2.8897,1.79313 -0.1506,0.46146 -0.087,2.47333 0.084,2.62792 0.046,0.0425 4.2327,-0.078 9.3022,-0.26605 l 9.2157,-0.34136 -0.037,-1.07188 c -0.048,-1.29644 -0.2863,-1.90188 -0.8734,-2.23975 -0.2201,-0.12667 -1.3543,-0.53986 -2.5198,-0.91715 -2.8397,-0.91933 -2.9637,-0.98119 -3.3677,-1.67473 -0.2298,-0.39461 -0.4191,-0.58546 -0.6044,-0.60557 -0.3619,-0.0394 -0.4333,-0.39457 -0.1636,-0.81053 0.1212,-0.18689 0.2494,-0.67702 0.2866,-1.09029 0.052,-0.57284 0.1358,-0.81249 0.3515,-1.00679 0.3789,-0.34101 0.6115,-1.86049 0.3715,-2.42343 -0.1102,-0.25851 -0.1306,-0.5295 -0.074,-0.90296 0.044,-0.29392 0.061,-0.96655 0.037,-1.49546 -0.039,-0.86785 -0.088,-1.0381 -0.4791,-1.72769 -1.8686,0.43939 -5.6289,0.33885 -6.8343,0.27944 z"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.20648061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1118.4021,238.61093 0.5808,2.38743 -3.0327,-2.45196"
-         id="path8675"
-         inkscape:path-effect="#path-effect8677-6"
-         inkscape:original-d="m 1118.4021,238.61093 0.5808,2.38743 -3.0327,-2.45196"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1119.1665,238.67545 0.268,2.25837 2.5295,-2.38743"
-         inkscape:path-effect="#path-effect8681-4"
-         id="path8679"
-         d="m 1119.1665,238.67545 0.268,2.25837 2.5295,-2.38743"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.20472343;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1119.241,241.12741 0.1289,2.96816"
-         inkscape:path-effect="#path-effect8685-6"
-         id="path8683"
-         d="m 1119.241,241.12741 0.1289,2.96816"
-         style="fill:none;stroke:#ffffff;stroke-width:0.20648061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <g
-         id="g385"
-         transform="matrix(0.07627499,-0.01053122,0.00943033,0.07755553,1089.3221,197.71254)">
-        <path
-           sodipodi:nodetypes="cccccccccc"
-           id="path387"
-           d="m 321.52049,424.67593 46.39443,23.81444 4.33626,35.00642 c 0,0 3.04145,27.67211 -3.61155,44.67311 -6.653,17.002 -14.95813,43.23868 -18.65513,45.45568 -16.46089,23.36417 -41.8175,13.13887 -46.2535,10.92187 -4.434,-2.219 -27.686,-36.63745 -32.614,-54.13345 -2.815,-9.998 -4.74221,-39.54154 0.60379,-62.41154 4.008,-17.148 2.03231,-30.8747 2.03231,-30.8747 z"
-           inkscape:connector-curvature="0"
-           style="fill:#dec7ab;stroke:#8b5e3c" />
-        <path
-           sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-           id="path254"
-           style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 329.97842,532.06687 c 1.4597,0.74514 2.64786,1.72936 2.80811,3.60917 -5.88197,-0.697 -6.87412,4.66361 -11.36752,3.39845 -2.0509,-0.57734 -1.8213,-2.985 -3.75028,-4.1857 -1.39314,-0.86893 -5.03239,-0.4414 -7.07433,-1.74758 0.40477,-1.91392 3.12664,-1.24205 4.27071,-2.33048 2.31495,1.63016 3.77662,5.16162 6.10222,5.39435 1.58359,-0.62522 2.71833,-1.59775 4.25379,0.0161 2.33516,-0.54823 3.33051,-2.59223 4.7573,-4.15431 z m -51.35159,11.75673 c 0.75156,1.25308 4.7173,3.84597 6.33735,3.76946 -1.60207,-0.50123 -0.45158,-1.61269 0.48611,-1.82307 -0.61773,0.55337 -0.63564,1.67521 0.4579,1.93089 1.15072,-0.5038 0.30192,-0.90457 0.95518,-1.3001 1.21601,1.41299 -1.02323,1.63838 -1.43803,2.65432 1.67013,0.44442 1.17397,-1.52969 2.8441,-1.08451 -0.91147,0.97676 1.57598,1.54542 2.34295,2.61606 0.9906,1.38212 1.21341,5.35191 3.74192,5.12474 -1.52321,-1.31246 -2.45054,-3.14338 -3.74547,-4.65576 0.68173,-0.17314 1.1387,1.96112 1.41274,0.63152 -2.90634,-2.03661 -2.57215,-4.45172 -4.6752,-6.64058 2.72867,-0.0384 2.99028,4.52105 4.22121,4.23997 0.0148,-0.70098 -1.73977,-2.1202 -0.45431,-2.40033 0.4659,1.9239 1.40472,3.43566 2.80083,4.54696 0.10864,-0.35213 0.0195,-0.92412 0.47945,-0.88432 0.0491,0.57846 0.13255,1.12772 0.93736,1.04613 0.0348,-1.83688 -0.98605,-1.56766 -1.40253,-2.03877 0.82173,-2.08081 3.40283,-2.19538 4.75419,-3.68415 0.18033,0.82762 -0.70972,1.12264 -0.0103,1.40817 0.63601,-1.02547 2.11964,-1.10468 3.31909,-1.50041 -0.13669,0.69064 -2.04469,1.74459 -0.96185,2.23903 1.4497,-1.31242 1.40501,0.068 3.30884,-0.0914 2.23318,-4.79266 3.86047,-1.73321 -0.003,0.46899 2.75376,-0.25518 3.14745,-2.84707 5.68719,-2.16866 -0.0293,0.59727 -0.60919,0.58074 -0.4821,1.35384 1.84775,0.16925 1.25488,-2.38513 2.38578,-3.01546 1.32085,1.51924 0.59978,-1.33606 2.36841,-0.66853 0.33454,1.31898 -0.94649,0.83668 -0.95969,1.76943 2.36645,0.32883 -0.45434,2.24808 -0.48876,2.29215 -0.67409,0.85413 2.67539,-1.72196 4.7559,-4.15365 -0.0378,2.04729 1.11008,-1.09852 1.88322,1.15464 -1.12711,0.069 -2.75801,1.63719 -0.96279,2.23846 0.0798,-1.34697 1.43425,-1.97057 2.38888,-3.48494 -0.79259,2.46261 0.45352,0.71626 1.41679,0.16185 -0.75004,0.71038 -0.53525,3.20759 0.9195,3.39317 0.9452,-0.97524 -0.11472,-0.53451 -0.46163,-1.46212 1.17437,0.0641 1.95753,0.46667 2.35415,1.20891 -0.47627,-0.0494 -0.6002,0.75478 -0.007,0.93823 0.66092,-0.68263 0.41669,-2.37385 1.43774,-2.6539 -0.82489,1.5295 0.83627,4.78043 -0.99039,5.99298 -0.82221,-0.98235 -0.98127,0.0105 -2.36487,0.19924 -0.59153,-0.25956 -0.96031,-0.71512 -0.93375,-1.51509 0.90402,-0.44968 1.10255,-1.05355 0.0143,-1.87792 -0.63489,0.7103 0.14949,3.007 -1.43822,2.65433 -0.51931,-1.7231 2.00544,-2.44384 0.50165,-3.70036 -0.10722,0.35353 -0.39981,0.50105 -0.94758,0.36145 0.69765,4.31122 -2.40598,3.22718 -4.2676,1.86145 0.12876,1.93213 -0.98854,0.13758 -1.89252,0.25321 0.073,1.18516 -1.06648,1.01837 -1.43059,1.71567 -0.62535,-0.5416 -1.42028,-0.93667 -1.8784,-1.62394 0.41929,-0.78028 1.5907,-1.27257 0.0142,-1.87744 -0.51544,1.16022 -0.32429,3.10957 -1.44518,3.59273 -0.57947,-1.10745 -3.50528,-1.22466 -3.78474,0.50722 5.03615,0.19706 11.33803,-0.46609 16.99111,2.87984 1.74886,-1.62477 3.83929,-0.0998 5.21269,-1.75255 -0.59467,1.4646 4.72073,0.17995 7.07835,1.27786 0.0854,-1.78449 -2.22455,-1.47583 -2.33938,-3.08499 -0.2331,0.52768 -0.51131,1.00567 -0.9547,1.29936 -1.37918,-0.85398 -1.75808,0.33054 -2.35414,-1.20796 0.84405,-1.48241 1.0613,-2.6138 1.44486,-3.59231 1.65316,0.39883 0.95117,2.12953 1.39926,2.5078 1.78443,-1.05845 -0.46226,-3.11491 0.50398,-4.16946 0.0165,2.013 2.41367,3.98412 2.34652,2.1471 0.10809,0.68147 0.77249,0.87975 0.93425,1.51516 -0.55365,-0.66076 -1.78174,-0.40218 -2.36389,0.20013 1.2,0.35017 -0.50533,3.2374 1.87017,2.56207 -0.0208,-1.45695 -0.81336,-1.91747 0.0214,-2.81617 0.95888,2.01407 0.76189,-1.73579 2.82551,1.26228 0.14767,-1.2524 -2.5164,-2.41531 -1.39399,-2.97703 1.53978,1.16914 2.80383,3.10856 2.82861,0.79293 4.5209,3.27952 4.89288,4.27925 8.94373,4.77891 0.055,2.27053 -2.04992,2.12918 -1.45651,5.00065 -0.82116,-0.12942 -1.46925,-0.0629 -1.89205,0.25325 0.4892,-2.53654 -1.93512,-0.86468 -2.82955,-0.79257 -0.5365,-1.49829 0.23263,-1.47209 -1.41275,-0.6312 -0.68319,-1.95662 -1.82025,-1.09276 -3.29457,-1.78552 0.10295,1.89703 -3.54642,0.11617 -5.69154,2.63785 -0.66964,-1.82711 -0.62035,-1.25828 -1.41709,-0.16187 -0.0693,-0.56087 0.0919,-1.32307 -0.46035,-1.46148 -2.9871,0.42095 -7.34104,1.28719 -13.69824,-1.09527 -2.2793,1.93741 -10.4136,-1.7438 -12.73775,-2.86433 -0.17535,1.27348 -1.4183,0.38181 -2.37509,1.60826 0.19104,-1.8827 -2.41818,-1.76822 -0.46875,-0.52371 -1.16449,-0.0706 -2.27595,-0.18866 -2.82987,-0.7926 0.21225,1.49869 -1.27976,1.09451 -1.43416,2.18414 2.36873,-0.0768 -0.64161,1.65794 0.93019,1.98532 -0.1806,-1.71422 0.86709,-0.5446 0.46829,0.52379 0.87594,0.54862 1.58939,-1.22564 1.88895,0.21579 -0.19893,0.88108 -1.8334,0.16129 -1.43061,1.71519 1.68658,-0.60725 2.07553,-0.72842 3.30124,0.84645 -1.43794,0.95405 0.32553,1.1898 0.46207,1.46215 -0.662,0.25146 -2.2142,1.88554 -1.43463,2.18457 0.10724,-0.35371 0.3995,-0.50032 0.94758,-0.36114 -0.96034,1.52597 0.20925,-0.0152 0.46564,0.99224 -0.43612,0.77572 -1.66097,0.66935 -2.37198,1.13844 -0.0517,1.27533 0.77974,1.03433 -0.0142,1.87695 1.60749,0.29731 1.76619,-0.69586 2.36484,-0.19955 -0.33343,1.71857 -1.56688,-0.52595 -1.89935,1.19242 0.85097,1.12123 2.12322,1.87493 2.33582,3.55476 1.30701,0.0907 1.62765,-0.71058 0.9406,0.57714 2.25233,0.0838 2.58637,0.13815 4.7292,-0.3989 -0.0519,1.27485 0.77974,1.03434 -0.0142,1.87697 1.51876,-0.21698 0.98203,-0.28793 1.88539,0.68519 -0.0192,-0.81016 0.37247,-1.16211 0.9547,-1.30032 -0.002,0.46906 -0.007,0.9387 -0.0103,1.40818 1.77399,-0.38558 2.10067,-2.38808 3.8026,-2.8541 -0.77565,1.34237 -2.38635,1.75311 -2.86214,3.43137 1.7704,0.55572 1.0432,-1.67511 2.37554,-1.60789 -0.89148,0.79281 -0.0611,1.17344 -0.0179,2.34641 2.08057,0.47901 2.02262,-3.94056 3.78832,-0.97619 1.5871,-0.80143 -1.80748,-1.97199 -0.45447,-2.40066 0.30959,1.53745 1.56228,1.06469 1.87745,1.62365 -1.09047,-0.53444 -1.10208,2.26449 -0.47805,0.88492 1.48138,-1.34346 1.96388,-3.80188 4.28543,-4.20767 -2.72911,0.57235 -2.77983,7.17853 -1.48181,8.28572 0.0541,-3.6137 -0.73177,-6.24044 0.99088,-5.99336 0.15486,0.0201 -0.1893,1.65319 0.4624,1.462 0.39734,-0.11789 -0.20858,-2.6077 0.95843,-1.76956 -0.59092,1.91593 0.0113,3.70179 0.90475,5.27037 0.96122,-2.63083 -1.08345,-3.32894 0.0392,-5.16254 1.54614,1.60708 0.76968,5.62615 1.37426,5.79385 0.10981,-1.61307 0.96849,-2.38925 1.4444,-3.59283 0.16174,1.37684 0.45214,-1.8939 1.4199,-0.3075 -0.25041,0.66613 -0.70643,1.10313 -0.9583,1.76958 2.03182,0.009 0.59451,1.33236 1.40643,1.57002 0.91247,-0.45057 -1.00588,-3.08819 0.96915,-3.17771 -0.14037,0.27221 -1.18806,1.6725 -0.0144,1.87739 0.73835,-0.75313 1.3121,-1.69003 1.90945,-2.60046 0.50392,1.26081 -1.45101,2.07351 -0.0214,2.81612 0.65603,-1.74431 0.37385,-1.79318 0.96962,-3.17765 1.5705,1.01158 1.24407,1.07105 2.36436,-0.19933 1.61508,2.67254 9.31136,1.15639 5.70921,-4.98473 1.59877,-0.23644 0.64329,-2.67646 0.0179,-2.34641 1.89283,-0.80953 -0.56561,-3.19631 0.508,-4.6393 -1.2828,0.9185 -5.29282,2.28453 -3.80613,3.32352 -1.30254,-0.0206 -3.65157,-0.5042 -4.26358,1.39161 -0.80796,-1.76089 -3.51979,0.44025 -4.25299,-0.016 -0.40284,-0.2512 0.61966,-3.29346 -0.4624,-1.46219 -0.0503,0.7317 0.0505,1.63444 -0.95472,1.30031 0.0727,-0.5468 0.84906,-0.96803 0.0103,-1.40816 -0.84602,0.85576 -1.92283,0.09 -0.48303,1.35418 -1.64933,-0.67531 -4.36514,2.11 -3.30886,0.0914 -1.48097,-0.39159 -1.25684,1.1209 -2.37198,1.13827 -6.10003,-3.87411 -13.9893,-2.15174 -16.96253,-6.63467 0.51206,0.17069 1.12769,0.90183 0.46518,0.99266 -0.67752,-0.34065 -1.14704,-0.86319 -1.40606,-1.56996 1.24131,0.28141 0.38513,-1.7784 1.89917,-1.19199 -1.21187,1.39458 2.14185,1.05308 2.83716,-0.14565 -1.28633,-0.48911 -0.95827,0.82383 -1.89624,0.72246 -0.0211,-0.60256 -0.60011,-0.7184 -0.46148,-1.46114 0.62453,0.0764 0.42563,0.87195 0.93736,1.04611 1.44338,-0.66378 -1.27772,-1.6002 0.0144,-1.87742 0.41476,1.61952 1.0525,0.53058 1.88815,0.21565 6.09834,4.89641 17.98728,2.47376 22.65808,3.52807 -0.16698,-1.44953 1.7228,-0.60094 1.90372,-1.66208 1.03989,0.79503 -0.60408,1.07788 0.46067,1.46183 0.63996,-0.8641 1.11655,-1.90871 2.37911,-2.07668 -2.434,2.65519 -3.98053,4.12289 -6.19145,6.33855 1.44175,-0.22407 2.40462,0.21928 2.83622,-0.14575 -1.20511,-1.32461 1.30478,-2.49575 0.95113,-0.83089 0.32342,-1.53271 1.54172,-2.06453 2.38626,-3.01556 1.89721,1.73978 4.77716,-2.47141 6.6284,-1.59132 -1.87472,0.86768 -1.02826,3.85828 0.44762,3.33925 -1.4369,-3.74454 2.2943,-1.05614 1.89577,-0.72313 1.29909,-1.08827 -0.20282,-2.34073 1.91657,-3.53874 0.181,0.82819 -0.70928,1.12349 -0.0103,1.40802 1.39538,-1.43964 1.54273,-4.27308 2.88078,-5.77749 -0.14218,3.32497 2.65749,-1.50736 2.35334,1.2088 1.31534,-0.5529 -0.80464,-2.0137 0.48955,-2.29252 0.10394,0.37545 0.005,0.92694 0.46612,0.99229 0.54758,-0.49257 0.54676,-1.59775 0.49263,-2.76231 2.98418,-0.0767 2.57481,-4.79418 3.35541,-6.19236 -0.15324,0.97501 -1.6357,-0.68028 -1.40563,-1.56977 1.57461,2.28086 5.09866,-1.98397 4.75015,-3.21475 0.33892,0.80614 -0.95343,1.93433 -0.9513,0.8304 -0.0683,-1.21808 2.41964,-1.9809 1.43868,-2.65381 -0.10486,0.51456 -0.53094,0.67062 -0.95162,0.83087 0.20853,-0.87132 1.02512,-1.06336 0.96231,-2.23854 -1.46889,-0.23472 0.0439,-1.57351 -1.87512,-2.09339 0.71578,-1.22137 1.92523,1.03485 2.36388,-0.19968 -0.81054,-0.0675 -1.20776,-0.50031 -1.40825,-1.09991 4.83652,-6.12446 10.81931,-23.18248 7.3068,-28.75769 0.72451,-1.07221 0.56533,-2.39568 0.50878,-4.63921 -0.0149,-0.56008 0.47941,-7.00376 -1.37428,-5.79338 -1.16796,-2.36473 1.6476,-6.01713 0.0821,-10.79468 -0.98661,-3.01187 -1.62989,-0.86675 0.0143,-1.87649 -0.41772,-0.1864 -2.05774,-1.50663 -0.93345,-1.51599 0.47325,0.0527 0.55844,0.44372 0.94059,0.57712 0.41321,-1.04858 -1.63562,-2.21063 -0.45399,-2.40028 0.10849,0.52231 0.76867,1.21588 0.94041,0.5768 -1.90024,-2.05868 1.44489,-0.6754 -0.44355,-3.80801 0.96201,0.24733 0.91624,1.37534 1.87731,1.62287 -1.49253,-2.71384 -1.31748,-5.4118 -1.35875,-7.67019 0.83134,-0.0367 0.84259,2.90304 1.40516,1.56972 -1.01969,-2.44502 1.3447,-4.99137 0.0534,-7.0395 -1.21187,0.69626 0.28148,4.4151 -0.98327,5.05469 -1.07363,-2.46096 -3.1987,-4.96094 -1.82748,-8.1945 -2.18802,-1.43282 -2.48351,-6.20538 -2.77633,-7.83209 -0.23342,0.52799 -0.5118,1.00561 -0.95566,1.29974 -0.37594,-2.40473 -0.41254,-3.29953 -2.33533,-3.55487 0.47216,0.0539 0.94494,0.10793 1.41633,0.16182 -0.0746,-0.71166 0.18227,-1.71253 -0.45711,-1.93078 10e-4,2.81963 -0.42712,-0.40761 -1.42394,0.7764 0.78227,-1.80337 -0.38849,-0.63644 -0.45526,-2.40042 0.0199,0.80977 -0.37247,1.16162 -0.95469,1.30032 0.17125,-1.43735 -1.07671,-2.36705 0.025,-3.28509 -1.51373,-0.58683 -0.6585,1.47238 -1.89934,1.19195 0.5504,-1.31436 0.29212,-1.71103 -0.92615,-2.45422 0.95935,1.23221 -0.99715,2.85175 -1.43513,2.18449 0.14318,-0.53969 1.91618,-1.55548 0.49111,-2.29234 -0.26089,1.85765 -1.15615,0.39495 -1.9003,1.19183 1.93684,1.40199 -0.89856,1.3762 0.9268,2.45433 -1.99662,2.22955 -1.96524,-1.60794 -1.42037,0.3079 -1.27365,-4.47642 0.19555,-5.10198 -4.68279,-5.70189 -0.13638,2.09024 -3.0087,1.10486 -0.94403,-0.10787 -2.16227,-0.52095 -2.21345,1.31499 -3.3231,1.96886 -0.0957,-0.57846 -0.5215,-0.34799 -0.94464,-0.10781 -0.18055,-0.82861 0.71067,-1.12255 0.0103,-1.40771 -1.27772,-1.8248 -0.26472,1.72427 -2.38611,3.01543 -0.51944,-1.72359 2.00483,-2.44392 0.50165,-3.70051 -0.47768,0.59172 -0.77695,-0.28912 -1.42437,0.77637 -0.3798,-1.37076 0.67455,-1.1399 0.49015,-2.29246 -1.92863,0.68585 -4.26047,0.92319 -5.21919,2.69197 -0.47508,-1.91048 -3.13391,0.96365 -5.19039,-1.06222 0.9591,0.51057 2.9362,-0.0735 1.42427,-0.77685 -1.36695,9.4e-4 -3.89882,1.65738 -6.16105,2.11437 0.27193,-0.92692 1.42769,-0.75795 0.48751,-1.82288 -1.89629,0.626 -4.09412,-1.2848 -7.5623,0.0753 -0.0987,-0.89927 0.54029,-0.97425 0.48517,-1.82317 -5.64401,1.40649 -11.29146,-0.41978 -15.57444,-2.71849 -1.81402,-0.29045 -1.8432,1.41226 -3.3191,1.49996 -0.64546,-2.66383 -3.44002,0.57348 -3.77789,-0.43153 0.25026,-0.41965 2.13049,-1.31574 0.95923,-1.76949 -0.74806,0.90021 -1.97337,1.268 -2.38268,2.54596 0.35401,-1.24125 -0.93123,-1.05118 -0.9302,-1.98484 0.66126,0.11035 1.80652,0.10103 0.94803,-0.36155 -0.31431,-0.0359 -0.62985,-0.072 -0.94447,-0.1078 0.39522,1.4985 -2.64272,3.3665 -4.27086,2.33047 0.7045,-0.66056 4.112,-0.73624 2.85096,-2.02282 -0.15727,0.52271 -2.0722,1.38037 -2.36436,0.19916 1.07266,0.20672 2.76415,-1.27054 1.90276,-1.66124 -1.54646,3.0374 -8.40453,1.27521 -6.14941,0.70697 -1.90188,0.4792 -1.94932,3.05739 -4.74659,2.74579 0.28395,-0.94545 1.0038,-1.40345 1.43448,-2.18459 -3.25136,0.62934 -4.4071,3.59861 -6.65695,5.34541 0.1373,-0.69011 2.04529,-1.74375 0.96187,-2.23857 -0.76988,1.69343 -4.59776,5.9029 -2.87222,4.83895 -0.29343,3.46444 -3.58094,6.09125 -2.90451,9.06245 0.2331,-0.52865 0.51178,-1.0061 0.95516,-1.29983 -0.27372,1.10244 -2.11808,5.91138 -0.9766,4.11597 0.73819,-2.29442 2.51392,-5.00756 2.88311,-6.24709 0.0956,0.57847 0.5218,0.34802 0.944,0.10787 -1.00396,2.00092 -1.24124,4.08587 0.44741,3.33904 -0.0618,1.07212 -2.60886,1.77011 -0.96916,3.17774 1.20547,-2.46562 0.4756,2.12893 -0.47574,0.41503 0.002,0.88702 -1.58839,3.64194 -0.49374,2.76219 0.23361,-0.52888 0.51181,-1.00656 0.9552,-1.3001 0.0755,0.71125 -0.18182,1.71259 0.45758,1.93086 0.34502,-0.22215 -1.5874,4.39362 -1.92776,4.94699 0.055,-0.3676 1.57175,-1.24444 1.42021,-0.30764 -0.30711,1.19459 -0.0868,2.84876 1.40608,1.56999 -4.70624,6.46408 -2.86819,18.2199 -4.91837,25.27222 0.81129,0.27813 1.21584,-0.55805 1.41632,0.16182 -3.7647,7.32588 2.3957,19.21038 4.51863,27.28984 0.62858,-1.22046 -0.12236,6.0208 0.41521,7.56336 -1.44833,-3.65951 -6.80113,-7.46461 -6.06748,-10.08773 -0.10363,0.51564 -0.52907,0.67096 -0.95113,0.83103 -1.36187,-1.9198 -3.02233,-3.5774 -4.21065,-5.64812 1.07466,0.18613 1.80779,3.0344 2.8224,1.7313 -1.3147,-0.63975 0.23684,-2.72195 0.95472,-1.29986 -2.13952,-5.12079 -4.66285,-10.52773 -4.13507,-15.50292 -3.6e-4,0.26012 -0.38645,0.48909 -0.47186,-0.0539 0.80039,-0.0984 1.597,-2.57374 0.49682,-3.23168 0.12375,1.08492 -0.12722,1.75146 -0.95873,1.76971 0.38677,-4.37764 -1.17702,-7.05254 -1.81012,-10.54049 0.96929,0.52232 2.12974,-0.9746 0.95518,-1.30027 -5.6e-4,0.26103 -0.38645,0.48908 -0.47217,-0.0539 1.37244,-14.05981 -0.84759,-24.33369 0.28197,-37.07523 2.88574,-6.02 4.71631,-15.7172 11.01733,-19.40904 2.77435,-1.62552 6.5415,-5.81987 9.03934,-7.89186 6.21607,-5.15702 23.49236,-11.23732 32.67385,-8.48023 1.99072,-0.46394 1.99068,-0.68575 3.77761,0.43149 10.56834,-3.74817 21.91859,6.59146 30.17758,9.08335 5.62482,5.02314 11.53949,8.98638 15.94669,15.91254 0.12897,-0.64568 1.03973,-0.4166 1.42426,-0.77698 1.22005,2.66484 2.57719,5.2079 4.6716,7.10967 7.92403,9.96414 6.30757,30.8177 6.26453,46.27844 -0.47362,-0.0533 -0.55924,-0.44474 -0.94189,-0.5779 -8.9e-4,10.31659 -1.0115,19.65822 -1.63633,28.93569 -0.65091,9.64214 -8.4189,15.38765 -8.68511,23.43355 0.091,-1.63399 -0.10237,-3.01868 -0.91686,-3.86284 -0.66171,0.52224 -0.22233,2.27551 -1.43418,2.18508 -0.22846,-0.94542 1.05236,-2.87732 0.0142,-1.87713 -1.66471,3.50383 -2.67284,7.74214 -4.3385,11.2471 5.04224,2.41415 -2.97883,5.56298 -0.0643,8.44731 -3.42758,6.15759 -0.29022,14.95624 -8.0987,8.46947 3.03513,4.1891 -0.80733,3.98092 -0.98295,5.05443 11.21325,5.1641 -57.77176,57.39803 -72.32743,-26.80762 z m -1.2879,-112.18232 c -1.01494,3.54856 2.51249,-1.51112 1.43449,-2.18409 -0.44206,0.69488 -1.28664,1.66779 -1.43449,2.18409 z m -8.17368,18.32496 c 1.28875,-1.76307 2.46821,-5.40897 1.93488,-5.88507 -1.02409,2.20227 -2.07181,3.95962 -1.93488,5.88507 z m -1.44845,4.06221 c 0.10846,-0.35261 0.0195,-0.92428 0.47931,-0.88494 0.6398,-5.26388 -1.37198,-2.66497 -0.47265,-0.054 -0.47578,-0.0496 -0.60019,0.75526 -0.007,0.93892 z m -1.9248,4.47731 c 0.23638,-1.18372 1.92989,-3.17267 0.97677,-4.11592 -0.18541,1.24063 -2.05774,3.03009 -0.97677,4.11592 z m 93.34768,91.92337 c -0.002,0.31234 -0.005,0.62556 -0.007,0.93838 0.28835,0.0596 0.55844,0.13408 0.46953,0.52332 0.3143,0.0354 0.62938,0.0719 0.944,0.10787 0.029,-0.28324 0.0743,-0.54805 0.47637,-0.41528 0.003,-0.31279 0.005,-0.62557 0.007,-0.9384 -0.28799,-0.0601 -0.55842,-0.13458 -0.46919,-0.52374 -0.31463,-0.0364 -0.62972,-0.072 -0.94402,-0.10787 -0.0287,0.28329 -0.0746,0.548 -0.47669,0.41572 z m -10.06543,18.57777 c 2.06813,-2.42397 3.44745,-5.6151 4.32488,-9.3699 0.64948,2.4838 2.02669,-2.52606 1.91036,-2.59962 0.022,0.49609 0.60129,0.43757 0.47494,-0.41588 -0.0396,-1.6688 -1.56865,0.81888 -1.41181,-0.63064 0.26199,0.0309 0.53876,-0.31886 0.003,-0.46948 -1.2983,4.35318 -9.38457,7.75132 -5.30194,13.48548 z m -60.39333,-13.00455 c 1.3243,1.882 2.00262,0.41018 1.3952,2.97765 0.67289,0.18916 0.78996,0.86386 1.40918,1.10095 -0.18142,-2.2811 -1.29888,-0.50232 -0.44711,-3.33902 -2.0934,0.32391 -0.5652,-1.99955 -1.40609,-1.57 -0.0109,0.61863 -0.83096,0.3344 -0.95118,0.83042 z m 3.75957,2.77834 c 0.0288,-0.28326 0.0746,-0.54752 0.47542,-0.41586 1.00114,2.10882 -1.98749,2.1382 -0.96589,2.70827 0.94876,-1.03151 2.01127,1.02279 2.3684,-0.66856 -0.56976,-0.16497 -0.28675,-0.55494 0.007,-0.93915 -0.99611,-0.55271 -2.56242,-2.42631 -1.88508,-0.68468 z M 278.77341,429.45723 c 1.07847,0.67269 -2.4499,5.73259 -1.43449,2.18459 0.14786,-0.51682 0.99243,-1.48971 1.43449,-2.18459 z m -7.67283,14.62401 c 0.53319,0.4761 -0.64659,4.12243 -1.93534,5.88504 -0.13697,-1.92592 0.9108,-3.68281 1.93534,-5.88504 z m -3.37665,9.00837 c -0.89936,-2.61097 1.11165,-5.20951 0.47218,0.0539 -0.45945,-0.0399 -0.37084,0.53264 -0.47977,0.8852 -0.5926,-0.18387 -0.46866,-0.98779 0.008,-0.93913 z m -0.95516,1.30028 c 0.95312,0.94324 -0.74039,2.93267 -0.97677,4.11591 -1.08098,-1.08583 0.79136,-2.87482 0.97677,-4.11591 z m 39.93279,31.33537 c -0.35248,0.79491 -0.85927,-0.031 -1.41678,-0.16185 0.67261,0.90266 0.42514,1.11888 -0.9516,0.83039 0.89366,1.61007 1.80756,0.49829 3.29455,1.78568 0.0834,0.40882 -0.18745,0.4214 -0.47591,0.41486 -0.40075,-0.132 -0.44699,0.13202 -0.47523,0.41555 -2.0305,-2.99554 -5.25462,-2.64095 -10.36316,-4.47121 0.59436,1.12097 -2.77658,1.22023 -3.30575,-0.37757 -0.5404,1.97233 -7.85146,-1.62419 -8.49207,-1.90968 -2.06005,-0.91763 -3.10395,0.35649 -1.89252,0.2532 -1.62987,0.13881 -3.89387,0.12313 -6.14553,0.23797 1.04882,-2.08587 2.44373,-1.08035 4.26761,-1.86189 -1.39258,-0.08 -1.99334,-0.81403 -3.30885,0.0925 -1.02852,-1.18079 2.32538,-1.48189 2.38578,-3.01545 1.58783,-0.075 4.33227,0.30237 7.56933,-1.01415 3.65291,2.0282 7.5622,2.03362 12.74179,2.3946 1.34272,2.62809 3.66486,1.50741 5.1694,3.87845 -1.91627,-0.11614 0.19752,1.52433 1.39894,2.50867 z m 46.2883,3.40752 c -1.27247,-1.01529 1.07909,0.24439 0.93749,1.04706 0.72271,-1.2052 1.29392,-0.69573 2.37818,-2.07678 0.6386,1.30711 2.4624,1.57972 3.28744,2.72393 0.99954,-0.031 -0.48334,-1.68637 -1.40469,-1.56967 3.79818,0.45932 7.13311,3.51097 7.51222,6.49446 0.33951,1.4842 -1.30361,0.75413 -0.96328,2.23887 -0.80371,0.0807 -0.88815,-0.46831 -0.93688,-1.04652 -1.28543,0.27968 0.46856,1.69911 0.45449,2.40063 -2.01133,-0.0906 -5.41103,-4.96482 -7.53378,-3.67909 -6.57311,-1.83337 -17.49256,-1.60572 -23.1554,-0.29644 0.99705,-1.54293 0.0222,-0.85732 -0.93331,-1.51598 0.29391,-0.38378 0.57645,-0.77366 0.007,-0.93824 0.71741,-0.54941 4.55501,0.31343 2.3791,-2.07714 0.17161,-0.59671 0.83644,-0.64317 0.95473,-1.2994 0.4418,0.44887 0.30409,1.19141 0.45084,2.86931 0.31464,0.036 0.63018,0.072 0.94494,0.10793 0.74045,-0.0815 -0.40716,-0.87345 0.47853,-0.88442 -0.0863,-0.544 -0.47127,-0.31541 -0.4714,-0.0539 -1.76759,-1.85294 2.39842,-1.0809 1.44395,-3.59288 0.93364,1.24388 0.7426,0.55684 2.35414,1.20796 0.18047,-0.77898 -0.36114,-0.92704 -0.93735,-1.04612 3.17042,0.97408 8.08977,-0.36821 11.32982,1.76378 0.70185,-0.125 -0.18266,-0.62269 0.0103,-1.40799 0.96123,0.24755 0.91545,1.37554 1.87745,1.62367 -0.087,-0.39031 -0.47048,-0.52219 -0.46516,-0.99313 z m -51.56477,6.79277 c -0.14738,6.51653 -10.74358,6.46674 -9.91226,-1.60192 -2.94074,0.26629 -3.64369,1.89436 -5.68796,2.16845 0.74006,1.87785 -0.53392,1.75826 -0.0179,2.34638 -0.094,0.52295 -0.47556,0.20725 -0.47185,-0.0539 -0.77836,0.4676 -1.2374,-0.96157 -2.83344,-0.32364 -0.69918,-0.28505 0.19085,-0.57914 0.0103,-1.40725 -1.88365,0.42105 -3.58351,0.20449 -3.28387,-3.19367 1.79545,2.31884 5.00369,-0.67492 9.45827,-0.79841 7.39627,-0.20556 16.66347,1.53228 19.79968,6.48876 -2.59182,-1.51733 0.0329,0.83768 -0.0179,2.34686 -0.78645,-0.0897 -1.57432,-0.17978 -2.36079,-0.26964 -0.13576,-1.09914 1.36796,-0.36549 1.42702,-1.24638 -1.97246,-1.54134 -3.17157,-3.75771 -6.10983,-4.45568 z m 33.96494,8.10674 c -1.39677,0.2494 1.09138,0.82778 0.45838,1.93139 -0.3785,-0.36907 -1.28728,-0.87796 -1.41664,-0.16184 1.22743,-11.94707 22.94651,-0.90426 29.31149,-1.34929 -1.59204,-0.77049 -1.43873,-2.51851 0.47945,-0.88429 0.003,-0.31313 0.005,-0.62558 0.007,-0.93871 -0.18972,1.70548 1.50658,1.63162 -0.0179,2.34687 0.25888,0.6075 1.82965,-0.14103 1.40284,2.03882 -0.64496,-0.98244 -2.14128,-1.76391 -2.36485,0.19974 0.4587,0.0381 0.37035,-0.53286 0.479,-0.88453 1.65438,0.31664 -0.86911,1.98062 0.45802,1.93108 -0.92981,-0.53334 -2.11771,0.0922 -3.31968,1.49941 -0.68528,-0.28702 0.0514,-0.4062 0.007,-0.93871 -0.98233,0.16567 -1.61649,0.71963 -1.90274,1.66175 0.0325,-2.41962 -5.28839,1.82061 -6.60746,-1.22443 0.45878,0.0663 0.3621,0.61588 0.46502,0.99264 2.84878,-1.16056 0.28303,-3.65806 2.3965,-4.42358 -1.57549,-0.95486 -2.64784,-2.34973 -4.70375,-2.8862 -0.34592,6.70914 -9.98327,6.6249 -9.44042,-1.548 -2.80867,-0.45422 -3.76004,1.16551 -5.21532,2.22289 -0.13848,0.74229 0.44008,0.85903 0.46159,1.46209 1.27294,1.01535 -1.07909,-0.24392 -0.9378,-1.0471"
-           inkscape:connector-curvature="0" />
+      <path transform="matrix(0.11808159,-0.00399243,0.00827779,0.11895952,1011.6343,228.52081)" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter6246-9-0-2-9-5)" d="m 895.09375,10.71875 c -4.89014,0.216719 -8.9448,1.858112 -12.09375,4.875 -1.59759,1.530586 -4.8116,3.669737 -7.125,4.78125 -3.48742,1.675586 -4.60803,2.971118 -6.5,7.53125 -1.98958,4.795395 -2.20562,6.588936 -1.6875,14 0.32684,4.675 1.03173,10.449445 1.5625,12.84375 0.66284,2.990057 0.60921,5.338672 -0.15625,7.5 -1.69611,4.78904 1.1929,17.46626 4.59375,20.21875 1.9377,1.56828 2.75991,3.55419 3.53125,8.34375 0.55646,3.45534 1.96032,7.52946 3.09375,9.0625 2.52251,3.41188 2.09711,6.41111 -0.9375,6.84375 -1.55228,0.22131 -3.03996,1.87541 -4.75,5.25 -3.00542,5.93093 -4.01657,6.48488 -27.46875,15 -20.35415,7.39028 -23.40627,9.10357 -25.46875,14.21875 -1.54323,3.82737 -2.18837,20.71788 -0.84375,22.0625 0.37,0.36999 35.8075,0.54708 78.75,0.40625 l 78.0625,-0.25 0.3125,-9 c 0.354,-10.88614 -1.301,-16.03118 -6.0625,-19.03125 -1.7852,-1.12478 -11.125,-4.91156 -20.75,-8.40625 -23.45217,-8.51512 -24.46333,-9.06907 -27.46875,-15 -1.71004,-3.37459 -3.19772,-5.02869 -4.75,-5.25 -3.03461,-0.43264 -3.42876,-3.43187 -0.90625,-6.84375 1.13343,-1.53304 2.50604,-5.60716 3.0625,-9.0625 0.77134,-4.78956 1.6248,-6.77547 3.5625,-8.34375 3.40085,-2.75249 6.25861,-15.42971 4.5625,-20.21875 -0.7789,-2.199274 -0.79207,-4.477673 -0.0937,-7.59375 0.54954,-2.452163 1.07819,-8.088755 1.1875,-12.53125 0.17935,-7.289277 -0.12954,-8.730788 -3.03125,-14.625 -3.56517,-7.24189 -6.22518,-9.577032 -15.1875,-13.21875 -6.3848,-2.594377 -12.10986,-3.779219 -17,-3.5625 z" id="path21877-0" inkscape:connector-curvature="0" sodipodi:nodetypes="ssssssssssssssscccsssssssssssss"/>
+      <path sodipodi:nodetypes="cssssssssssscccsssssssssscc" inkscape:connector-curvature="0" id="path21879-1" d="m 1114.5224,228.36959 c -0.1953,0.57841 -0.2058,0.79264 -0.084,1.67218 0.077,0.55483 0.2084,1.23894 0.2909,1.52164 0.1032,0.35305 0.1162,0.63266 0.044,0.89283 -0.1607,0.57648 0.2854,2.07302 0.7097,2.38686 0.2419,0.17884 0.3554,0.41179 0.4861,0.97848 0.094,0.40882 0.2939,0.88788 0.4404,1.06571 0.3261,0.39582 0.3006,0.7543 -0.054,0.81787 -0.1815,0.0325 -0.3435,0.23525 -0.5174,0.64351 -0.3058,0.71755 -0.4206,0.78747 -3.1194,1.89407 -2.3422,0.96039 -2.6885,1.1764 -2.8897,1.79313 -0.1506,0.46146 -0.087,2.47333 0.084,2.62792 0.046,0.0425 4.2327,-0.078 9.3022,-0.26605 l 9.2157,-0.34136 -0.037,-1.07188 c -0.048,-1.29644 -0.2863,-1.90188 -0.8734,-2.23975 -0.2201,-0.12667 -1.3543,-0.53986 -2.5198,-0.91715 -2.8397,-0.91933 -2.9637,-0.98119 -3.3677,-1.67473 -0.2298,-0.39461 -0.4191,-0.58546 -0.6044,-0.60557 -0.3619,-0.0394 -0.4333,-0.39457 -0.1636,-0.81053 0.1212,-0.18689 0.2494,-0.67702 0.2866,-1.09029 0.052,-0.57284 0.1358,-0.81249 0.3515,-1.00679 0.3789,-0.34101 0.6115,-1.86049 0.3715,-2.42343 -0.1102,-0.25851 -0.1306,-0.5295 -0.074,-0.90296 0.044,-0.29392 0.061,-0.96655 0.037,-1.49546 -0.039,-0.86785 -0.088,-1.0381 -0.4791,-1.72769 -1.8686,0.43939 -5.6289,0.33885 -6.8343,0.27944 z" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+      <path style="fill:#ffffff;stroke:#ffffff;stroke-width:0.20648061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 1118.4021,238.61093 0.5808,2.38743 -3.0327,-2.45196" id="path8675" inkscape:path-effect="#path-effect8677-6" inkscape:original-d="m 1118.4021,238.61093 0.5808,2.38743 -3.0327,-2.45196" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 1119.1665,238.67545 0.268,2.25837 2.5295,-2.38743" inkscape:path-effect="#path-effect8681-4" id="path8679" d="m 1119.1665,238.67545 0.268,2.25837 2.5295,-2.38743" style="fill:#ffffff;stroke:#ffffff;stroke-width:0.20472343;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 1119.241,241.12741 0.1289,2.96816" inkscape:path-effect="#path-effect8685-6" id="path8683" d="m 1119.241,241.12741 0.1289,2.96816" style="fill:none;stroke:#ffffff;stroke-width:0.20648061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <g id="g385" transform="matrix(0.07627499,-0.01053122,0.00943033,0.07755553,1089.3221,197.71254)">
+        <path sodipodi:nodetypes="cccccccccc" id="path387" d="m 321.52049,424.67593 46.39443,23.81444 4.33626,35.00642 c 0,0 3.04145,27.67211 -3.61155,44.67311 -6.653,17.002 -14.95813,43.23868 -18.65513,45.45568 -16.46089,23.36417 -41.8175,13.13887 -46.2535,10.92187 -4.434,-2.219 -27.686,-36.63745 -32.614,-54.13345 -2.815,-9.998 -4.74221,-39.54154 0.60379,-62.41154 4.008,-17.148 2.03231,-30.8747 2.03231,-30.8747 z" inkscape:connector-curvature="0" style="fill:#dec7ab;stroke:#8b5e3c"/>
+        <path sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" id="path254" style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 329.97842,532.06687 c 1.4597,0.74514 2.64786,1.72936 2.80811,3.60917 -5.88197,-0.697 -6.87412,4.66361 -11.36752,3.39845 -2.0509,-0.57734 -1.8213,-2.985 -3.75028,-4.1857 -1.39314,-0.86893 -5.03239,-0.4414 -7.07433,-1.74758 0.40477,-1.91392 3.12664,-1.24205 4.27071,-2.33048 2.31495,1.63016 3.77662,5.16162 6.10222,5.39435 1.58359,-0.62522 2.71833,-1.59775 4.25379,0.0161 2.33516,-0.54823 3.33051,-2.59223 4.7573,-4.15431 z m -51.35159,11.75673 c 0.75156,1.25308 4.7173,3.84597 6.33735,3.76946 -1.60207,-0.50123 -0.45158,-1.61269 0.48611,-1.82307 -0.61773,0.55337 -0.63564,1.67521 0.4579,1.93089 1.15072,-0.5038 0.30192,-0.90457 0.95518,-1.3001 1.21601,1.41299 -1.02323,1.63838 -1.43803,2.65432 1.67013,0.44442 1.17397,-1.52969 2.8441,-1.08451 -0.91147,0.97676 1.57598,1.54542 2.34295,2.61606 0.9906,1.38212 1.21341,5.35191 3.74192,5.12474 -1.52321,-1.31246 -2.45054,-3.14338 -3.74547,-4.65576 0.68173,-0.17314 1.1387,1.96112 1.41274,0.63152 -2.90634,-2.03661 -2.57215,-4.45172 -4.6752,-6.64058 2.72867,-0.0384 2.99028,4.52105 4.22121,4.23997 0.0148,-0.70098 -1.73977,-2.1202 -0.45431,-2.40033 0.4659,1.9239 1.40472,3.43566 2.80083,4.54696 0.10864,-0.35213 0.0195,-0.92412 0.47945,-0.88432 0.0491,0.57846 0.13255,1.12772 0.93736,1.04613 0.0348,-1.83688 -0.98605,-1.56766 -1.40253,-2.03877 0.82173,-2.08081 3.40283,-2.19538 4.75419,-3.68415 0.18033,0.82762 -0.70972,1.12264 -0.0103,1.40817 0.63601,-1.02547 2.11964,-1.10468 3.31909,-1.50041 -0.13669,0.69064 -2.04469,1.74459 -0.96185,2.23903 1.4497,-1.31242 1.40501,0.068 3.30884,-0.0914 2.23318,-4.79266 3.86047,-1.73321 -0.003,0.46899 2.75376,-0.25518 3.14745,-2.84707 5.68719,-2.16866 -0.0293,0.59727 -0.60919,0.58074 -0.4821,1.35384 1.84775,0.16925 1.25488,-2.38513 2.38578,-3.01546 1.32085,1.51924 0.59978,-1.33606 2.36841,-0.66853 0.33454,1.31898 -0.94649,0.83668 -0.95969,1.76943 2.36645,0.32883 -0.45434,2.24808 -0.48876,2.29215 -0.67409,0.85413 2.67539,-1.72196 4.7559,-4.15365 -0.0378,2.04729 1.11008,-1.09852 1.88322,1.15464 -1.12711,0.069 -2.75801,1.63719 -0.96279,2.23846 0.0798,-1.34697 1.43425,-1.97057 2.38888,-3.48494 -0.79259,2.46261 0.45352,0.71626 1.41679,0.16185 -0.75004,0.71038 -0.53525,3.20759 0.9195,3.39317 0.9452,-0.97524 -0.11472,-0.53451 -0.46163,-1.46212 1.17437,0.0641 1.95753,0.46667 2.35415,1.20891 -0.47627,-0.0494 -0.6002,0.75478 -0.007,0.93823 0.66092,-0.68263 0.41669,-2.37385 1.43774,-2.6539 -0.82489,1.5295 0.83627,4.78043 -0.99039,5.99298 -0.82221,-0.98235 -0.98127,0.0105 -2.36487,0.19924 -0.59153,-0.25956 -0.96031,-0.71512 -0.93375,-1.51509 0.90402,-0.44968 1.10255,-1.05355 0.0143,-1.87792 -0.63489,0.7103 0.14949,3.007 -1.43822,2.65433 -0.51931,-1.7231 2.00544,-2.44384 0.50165,-3.70036 -0.10722,0.35353 -0.39981,0.50105 -0.94758,0.36145 0.69765,4.31122 -2.40598,3.22718 -4.2676,1.86145 0.12876,1.93213 -0.98854,0.13758 -1.89252,0.25321 0.073,1.18516 -1.06648,1.01837 -1.43059,1.71567 -0.62535,-0.5416 -1.42028,-0.93667 -1.8784,-1.62394 0.41929,-0.78028 1.5907,-1.27257 0.0142,-1.87744 -0.51544,1.16022 -0.32429,3.10957 -1.44518,3.59273 -0.57947,-1.10745 -3.50528,-1.22466 -3.78474,0.50722 5.03615,0.19706 11.33803,-0.46609 16.99111,2.87984 1.74886,-1.62477 3.83929,-0.0998 5.21269,-1.75255 -0.59467,1.4646 4.72073,0.17995 7.07835,1.27786 0.0854,-1.78449 -2.22455,-1.47583 -2.33938,-3.08499 -0.2331,0.52768 -0.51131,1.00567 -0.9547,1.29936 -1.37918,-0.85398 -1.75808,0.33054 -2.35414,-1.20796 0.84405,-1.48241 1.0613,-2.6138 1.44486,-3.59231 1.65316,0.39883 0.95117,2.12953 1.39926,2.5078 1.78443,-1.05845 -0.46226,-3.11491 0.50398,-4.16946 0.0165,2.013 2.41367,3.98412 2.34652,2.1471 0.10809,0.68147 0.77249,0.87975 0.93425,1.51516 -0.55365,-0.66076 -1.78174,-0.40218 -2.36389,0.20013 1.2,0.35017 -0.50533,3.2374 1.87017,2.56207 -0.0208,-1.45695 -0.81336,-1.91747 0.0214,-2.81617 0.95888,2.01407 0.76189,-1.73579 2.82551,1.26228 0.14767,-1.2524 -2.5164,-2.41531 -1.39399,-2.97703 1.53978,1.16914 2.80383,3.10856 2.82861,0.79293 4.5209,3.27952 4.89288,4.27925 8.94373,4.77891 0.055,2.27053 -2.04992,2.12918 -1.45651,5.00065 -0.82116,-0.12942 -1.46925,-0.0629 -1.89205,0.25325 0.4892,-2.53654 -1.93512,-0.86468 -2.82955,-0.79257 -0.5365,-1.49829 0.23263,-1.47209 -1.41275,-0.6312 -0.68319,-1.95662 -1.82025,-1.09276 -3.29457,-1.78552 0.10295,1.89703 -3.54642,0.11617 -5.69154,2.63785 -0.66964,-1.82711 -0.62035,-1.25828 -1.41709,-0.16187 -0.0693,-0.56087 0.0919,-1.32307 -0.46035,-1.46148 -2.9871,0.42095 -7.34104,1.28719 -13.69824,-1.09527 -2.2793,1.93741 -10.4136,-1.7438 -12.73775,-2.86433 -0.17535,1.27348 -1.4183,0.38181 -2.37509,1.60826 0.19104,-1.8827 -2.41818,-1.76822 -0.46875,-0.52371 -1.16449,-0.0706 -2.27595,-0.18866 -2.82987,-0.7926 0.21225,1.49869 -1.27976,1.09451 -1.43416,2.18414 2.36873,-0.0768 -0.64161,1.65794 0.93019,1.98532 -0.1806,-1.71422 0.86709,-0.5446 0.46829,0.52379 0.87594,0.54862 1.58939,-1.22564 1.88895,0.21579 -0.19893,0.88108 -1.8334,0.16129 -1.43061,1.71519 1.68658,-0.60725 2.07553,-0.72842 3.30124,0.84645 -1.43794,0.95405 0.32553,1.1898 0.46207,1.46215 -0.662,0.25146 -2.2142,1.88554 -1.43463,2.18457 0.10724,-0.35371 0.3995,-0.50032 0.94758,-0.36114 -0.96034,1.52597 0.20925,-0.0152 0.46564,0.99224 -0.43612,0.77572 -1.66097,0.66935 -2.37198,1.13844 -0.0517,1.27533 0.77974,1.03433 -0.0142,1.87695 1.60749,0.29731 1.76619,-0.69586 2.36484,-0.19955 -0.33343,1.71857 -1.56688,-0.52595 -1.89935,1.19242 0.85097,1.12123 2.12322,1.87493 2.33582,3.55476 1.30701,0.0907 1.62765,-0.71058 0.9406,0.57714 2.25233,0.0838 2.58637,0.13815 4.7292,-0.3989 -0.0519,1.27485 0.77974,1.03434 -0.0142,1.87697 1.51876,-0.21698 0.98203,-0.28793 1.88539,0.68519 -0.0192,-0.81016 0.37247,-1.16211 0.9547,-1.30032 -0.002,0.46906 -0.007,0.9387 -0.0103,1.40818 1.77399,-0.38558 2.10067,-2.38808 3.8026,-2.8541 -0.77565,1.34237 -2.38635,1.75311 -2.86214,3.43137 1.7704,0.55572 1.0432,-1.67511 2.37554,-1.60789 -0.89148,0.79281 -0.0611,1.17344 -0.0179,2.34641 2.08057,0.47901 2.02262,-3.94056 3.78832,-0.97619 1.5871,-0.80143 -1.80748,-1.97199 -0.45447,-2.40066 0.30959,1.53745 1.56228,1.06469 1.87745,1.62365 -1.09047,-0.53444 -1.10208,2.26449 -0.47805,0.88492 1.48138,-1.34346 1.96388,-3.80188 4.28543,-4.20767 -2.72911,0.57235 -2.77983,7.17853 -1.48181,8.28572 0.0541,-3.6137 -0.73177,-6.24044 0.99088,-5.99336 0.15486,0.0201 -0.1893,1.65319 0.4624,1.462 0.39734,-0.11789 -0.20858,-2.6077 0.95843,-1.76956 -0.59092,1.91593 0.0113,3.70179 0.90475,5.27037 0.96122,-2.63083 -1.08345,-3.32894 0.0392,-5.16254 1.54614,1.60708 0.76968,5.62615 1.37426,5.79385 0.10981,-1.61307 0.96849,-2.38925 1.4444,-3.59283 0.16174,1.37684 0.45214,-1.8939 1.4199,-0.3075 -0.25041,0.66613 -0.70643,1.10313 -0.9583,1.76958 2.03182,0.009 0.59451,1.33236 1.40643,1.57002 0.91247,-0.45057 -1.00588,-3.08819 0.96915,-3.17771 -0.14037,0.27221 -1.18806,1.6725 -0.0144,1.87739 0.73835,-0.75313 1.3121,-1.69003 1.90945,-2.60046 0.50392,1.26081 -1.45101,2.07351 -0.0214,2.81612 0.65603,-1.74431 0.37385,-1.79318 0.96962,-3.17765 1.5705,1.01158 1.24407,1.07105 2.36436,-0.19933 1.61508,2.67254 9.31136,1.15639 5.70921,-4.98473 1.59877,-0.23644 0.64329,-2.67646 0.0179,-2.34641 1.89283,-0.80953 -0.56561,-3.19631 0.508,-4.6393 -1.2828,0.9185 -5.29282,2.28453 -3.80613,3.32352 -1.30254,-0.0206 -3.65157,-0.5042 -4.26358,1.39161 -0.80796,-1.76089 -3.51979,0.44025 -4.25299,-0.016 -0.40284,-0.2512 0.61966,-3.29346 -0.4624,-1.46219 -0.0503,0.7317 0.0505,1.63444 -0.95472,1.30031 0.0727,-0.5468 0.84906,-0.96803 0.0103,-1.40816 -0.84602,0.85576 -1.92283,0.09 -0.48303,1.35418 -1.64933,-0.67531 -4.36514,2.11 -3.30886,0.0914 -1.48097,-0.39159 -1.25684,1.1209 -2.37198,1.13827 -6.10003,-3.87411 -13.9893,-2.15174 -16.96253,-6.63467 0.51206,0.17069 1.12769,0.90183 0.46518,0.99266 -0.67752,-0.34065 -1.14704,-0.86319 -1.40606,-1.56996 1.24131,0.28141 0.38513,-1.7784 1.89917,-1.19199 -1.21187,1.39458 2.14185,1.05308 2.83716,-0.14565 -1.28633,-0.48911 -0.95827,0.82383 -1.89624,0.72246 -0.0211,-0.60256 -0.60011,-0.7184 -0.46148,-1.46114 0.62453,0.0764 0.42563,0.87195 0.93736,1.04611 1.44338,-0.66378 -1.27772,-1.6002 0.0144,-1.87742 0.41476,1.61952 1.0525,0.53058 1.88815,0.21565 6.09834,4.89641 17.98728,2.47376 22.65808,3.52807 -0.16698,-1.44953 1.7228,-0.60094 1.90372,-1.66208 1.03989,0.79503 -0.60408,1.07788 0.46067,1.46183 0.63996,-0.8641 1.11655,-1.90871 2.37911,-2.07668 -2.434,2.65519 -3.98053,4.12289 -6.19145,6.33855 1.44175,-0.22407 2.40462,0.21928 2.83622,-0.14575 -1.20511,-1.32461 1.30478,-2.49575 0.95113,-0.83089 0.32342,-1.53271 1.54172,-2.06453 2.38626,-3.01556 1.89721,1.73978 4.77716,-2.47141 6.6284,-1.59132 -1.87472,0.86768 -1.02826,3.85828 0.44762,3.33925 -1.4369,-3.74454 2.2943,-1.05614 1.89577,-0.72313 1.29909,-1.08827 -0.20282,-2.34073 1.91657,-3.53874 0.181,0.82819 -0.70928,1.12349 -0.0103,1.40802 1.39538,-1.43964 1.54273,-4.27308 2.88078,-5.77749 -0.14218,3.32497 2.65749,-1.50736 2.35334,1.2088 1.31534,-0.5529 -0.80464,-2.0137 0.48955,-2.29252 0.10394,0.37545 0.005,0.92694 0.46612,0.99229 0.54758,-0.49257 0.54676,-1.59775 0.49263,-2.76231 2.98418,-0.0767 2.57481,-4.79418 3.35541,-6.19236 -0.15324,0.97501 -1.6357,-0.68028 -1.40563,-1.56977 1.57461,2.28086 5.09866,-1.98397 4.75015,-3.21475 0.33892,0.80614 -0.95343,1.93433 -0.9513,0.8304 -0.0683,-1.21808 2.41964,-1.9809 1.43868,-2.65381 -0.10486,0.51456 -0.53094,0.67062 -0.95162,0.83087 0.20853,-0.87132 1.02512,-1.06336 0.96231,-2.23854 -1.46889,-0.23472 0.0439,-1.57351 -1.87512,-2.09339 0.71578,-1.22137 1.92523,1.03485 2.36388,-0.19968 -0.81054,-0.0675 -1.20776,-0.50031 -1.40825,-1.09991 4.83652,-6.12446 10.81931,-23.18248 7.3068,-28.75769 0.72451,-1.07221 0.56533,-2.39568 0.50878,-4.63921 -0.0149,-0.56008 0.47941,-7.00376 -1.37428,-5.79338 -1.16796,-2.36473 1.6476,-6.01713 0.0821,-10.79468 -0.98661,-3.01187 -1.62989,-0.86675 0.0143,-1.87649 -0.41772,-0.1864 -2.05774,-1.50663 -0.93345,-1.51599 0.47325,0.0527 0.55844,0.44372 0.94059,0.57712 0.41321,-1.04858 -1.63562,-2.21063 -0.45399,-2.40028 0.10849,0.52231 0.76867,1.21588 0.94041,0.5768 -1.90024,-2.05868 1.44489,-0.6754 -0.44355,-3.80801 0.96201,0.24733 0.91624,1.37534 1.87731,1.62287 -1.49253,-2.71384 -1.31748,-5.4118 -1.35875,-7.67019 0.83134,-0.0367 0.84259,2.90304 1.40516,1.56972 -1.01969,-2.44502 1.3447,-4.99137 0.0534,-7.0395 -1.21187,0.69626 0.28148,4.4151 -0.98327,5.05469 -1.07363,-2.46096 -3.1987,-4.96094 -1.82748,-8.1945 -2.18802,-1.43282 -2.48351,-6.20538 -2.77633,-7.83209 -0.23342,0.52799 -0.5118,1.00561 -0.95566,1.29974 -0.37594,-2.40473 -0.41254,-3.29953 -2.33533,-3.55487 0.47216,0.0539 0.94494,0.10793 1.41633,0.16182 -0.0746,-0.71166 0.18227,-1.71253 -0.45711,-1.93078 10e-4,2.81963 -0.42712,-0.40761 -1.42394,0.7764 0.78227,-1.80337 -0.38849,-0.63644 -0.45526,-2.40042 0.0199,0.80977 -0.37247,1.16162 -0.95469,1.30032 0.17125,-1.43735 -1.07671,-2.36705 0.025,-3.28509 -1.51373,-0.58683 -0.6585,1.47238 -1.89934,1.19195 0.5504,-1.31436 0.29212,-1.71103 -0.92615,-2.45422 0.95935,1.23221 -0.99715,2.85175 -1.43513,2.18449 0.14318,-0.53969 1.91618,-1.55548 0.49111,-2.29234 -0.26089,1.85765 -1.15615,0.39495 -1.9003,1.19183 1.93684,1.40199 -0.89856,1.3762 0.9268,2.45433 -1.99662,2.22955 -1.96524,-1.60794 -1.42037,0.3079 -1.27365,-4.47642 0.19555,-5.10198 -4.68279,-5.70189 -0.13638,2.09024 -3.0087,1.10486 -0.94403,-0.10787 -2.16227,-0.52095 -2.21345,1.31499 -3.3231,1.96886 -0.0957,-0.57846 -0.5215,-0.34799 -0.94464,-0.10781 -0.18055,-0.82861 0.71067,-1.12255 0.0103,-1.40771 -1.27772,-1.8248 -0.26472,1.72427 -2.38611,3.01543 -0.51944,-1.72359 2.00483,-2.44392 0.50165,-3.70051 -0.47768,0.59172 -0.77695,-0.28912 -1.42437,0.77637 -0.3798,-1.37076 0.67455,-1.1399 0.49015,-2.29246 -1.92863,0.68585 -4.26047,0.92319 -5.21919,2.69197 -0.47508,-1.91048 -3.13391,0.96365 -5.19039,-1.06222 0.9591,0.51057 2.9362,-0.0735 1.42427,-0.77685 -1.36695,9.4e-4 -3.89882,1.65738 -6.16105,2.11437 0.27193,-0.92692 1.42769,-0.75795 0.48751,-1.82288 -1.89629,0.626 -4.09412,-1.2848 -7.5623,0.0753 -0.0987,-0.89927 0.54029,-0.97425 0.48517,-1.82317 -5.64401,1.40649 -11.29146,-0.41978 -15.57444,-2.71849 -1.81402,-0.29045 -1.8432,1.41226 -3.3191,1.49996 -0.64546,-2.66383 -3.44002,0.57348 -3.77789,-0.43153 0.25026,-0.41965 2.13049,-1.31574 0.95923,-1.76949 -0.74806,0.90021 -1.97337,1.268 -2.38268,2.54596 0.35401,-1.24125 -0.93123,-1.05118 -0.9302,-1.98484 0.66126,0.11035 1.80652,0.10103 0.94803,-0.36155 -0.31431,-0.0359 -0.62985,-0.072 -0.94447,-0.1078 0.39522,1.4985 -2.64272,3.3665 -4.27086,2.33047 0.7045,-0.66056 4.112,-0.73624 2.85096,-2.02282 -0.15727,0.52271 -2.0722,1.38037 -2.36436,0.19916 1.07266,0.20672 2.76415,-1.27054 1.90276,-1.66124 -1.54646,3.0374 -8.40453,1.27521 -6.14941,0.70697 -1.90188,0.4792 -1.94932,3.05739 -4.74659,2.74579 0.28395,-0.94545 1.0038,-1.40345 1.43448,-2.18459 -3.25136,0.62934 -4.4071,3.59861 -6.65695,5.34541 0.1373,-0.69011 2.04529,-1.74375 0.96187,-2.23857 -0.76988,1.69343 -4.59776,5.9029 -2.87222,4.83895 -0.29343,3.46444 -3.58094,6.09125 -2.90451,9.06245 0.2331,-0.52865 0.51178,-1.0061 0.95516,-1.29983 -0.27372,1.10244 -2.11808,5.91138 -0.9766,4.11597 0.73819,-2.29442 2.51392,-5.00756 2.88311,-6.24709 0.0956,0.57847 0.5218,0.34802 0.944,0.10787 -1.00396,2.00092 -1.24124,4.08587 0.44741,3.33904 -0.0618,1.07212 -2.60886,1.77011 -0.96916,3.17774 1.20547,-2.46562 0.4756,2.12893 -0.47574,0.41503 0.002,0.88702 -1.58839,3.64194 -0.49374,2.76219 0.23361,-0.52888 0.51181,-1.00656 0.9552,-1.3001 0.0755,0.71125 -0.18182,1.71259 0.45758,1.93086 0.34502,-0.22215 -1.5874,4.39362 -1.92776,4.94699 0.055,-0.3676 1.57175,-1.24444 1.42021,-0.30764 -0.30711,1.19459 -0.0868,2.84876 1.40608,1.56999 -4.70624,6.46408 -2.86819,18.2199 -4.91837,25.27222 0.81129,0.27813 1.21584,-0.55805 1.41632,0.16182 -3.7647,7.32588 2.3957,19.21038 4.51863,27.28984 0.62858,-1.22046 -0.12236,6.0208 0.41521,7.56336 -1.44833,-3.65951 -6.80113,-7.46461 -6.06748,-10.08773 -0.10363,0.51564 -0.52907,0.67096 -0.95113,0.83103 -1.36187,-1.9198 -3.02233,-3.5774 -4.21065,-5.64812 1.07466,0.18613 1.80779,3.0344 2.8224,1.7313 -1.3147,-0.63975 0.23684,-2.72195 0.95472,-1.29986 -2.13952,-5.12079 -4.66285,-10.52773 -4.13507,-15.50292 -3.6e-4,0.26012 -0.38645,0.48909 -0.47186,-0.0539 0.80039,-0.0984 1.597,-2.57374 0.49682,-3.23168 0.12375,1.08492 -0.12722,1.75146 -0.95873,1.76971 0.38677,-4.37764 -1.17702,-7.05254 -1.81012,-10.54049 0.96929,0.52232 2.12974,-0.9746 0.95518,-1.30027 -5.6e-4,0.26103 -0.38645,0.48908 -0.47217,-0.0539 1.37244,-14.05981 -0.84759,-24.33369 0.28197,-37.07523 2.88574,-6.02 4.71631,-15.7172 11.01733,-19.40904 2.77435,-1.62552 6.5415,-5.81987 9.03934,-7.89186 6.21607,-5.15702 23.49236,-11.23732 32.67385,-8.48023 1.99072,-0.46394 1.99068,-0.68575 3.77761,0.43149 10.56834,-3.74817 21.91859,6.59146 30.17758,9.08335 5.62482,5.02314 11.53949,8.98638 15.94669,15.91254 0.12897,-0.64568 1.03973,-0.4166 1.42426,-0.77698 1.22005,2.66484 2.57719,5.2079 4.6716,7.10967 7.92403,9.96414 6.30757,30.8177 6.26453,46.27844 -0.47362,-0.0533 -0.55924,-0.44474 -0.94189,-0.5779 -8.9e-4,10.31659 -1.0115,19.65822 -1.63633,28.93569 -0.65091,9.64214 -8.4189,15.38765 -8.68511,23.43355 0.091,-1.63399 -0.10237,-3.01868 -0.91686,-3.86284 -0.66171,0.52224 -0.22233,2.27551 -1.43418,2.18508 -0.22846,-0.94542 1.05236,-2.87732 0.0142,-1.87713 -1.66471,3.50383 -2.67284,7.74214 -4.3385,11.2471 5.04224,2.41415 -2.97883,5.56298 -0.0643,8.44731 -3.42758,6.15759 -0.29022,14.95624 -8.0987,8.46947 3.03513,4.1891 -0.80733,3.98092 -0.98295,5.05443 11.21325,5.1641 -57.77176,57.39803 -72.32743,-26.80762 z m -1.2879,-112.18232 c -1.01494,3.54856 2.51249,-1.51112 1.43449,-2.18409 -0.44206,0.69488 -1.28664,1.66779 -1.43449,2.18409 z m -8.17368,18.32496 c 1.28875,-1.76307 2.46821,-5.40897 1.93488,-5.88507 -1.02409,2.20227 -2.07181,3.95962 -1.93488,5.88507 z m -1.44845,4.06221 c 0.10846,-0.35261 0.0195,-0.92428 0.47931,-0.88494 0.6398,-5.26388 -1.37198,-2.66497 -0.47265,-0.054 -0.47578,-0.0496 -0.60019,0.75526 -0.007,0.93892 z m -1.9248,4.47731 c 0.23638,-1.18372 1.92989,-3.17267 0.97677,-4.11592 -0.18541,1.24063 -2.05774,3.03009 -0.97677,4.11592 z m 93.34768,91.92337 c -0.002,0.31234 -0.005,0.62556 -0.007,0.93838 0.28835,0.0596 0.55844,0.13408 0.46953,0.52332 0.3143,0.0354 0.62938,0.0719 0.944,0.10787 0.029,-0.28324 0.0743,-0.54805 0.47637,-0.41528 0.003,-0.31279 0.005,-0.62557 0.007,-0.9384 -0.28799,-0.0601 -0.55842,-0.13458 -0.46919,-0.52374 -0.31463,-0.0364 -0.62972,-0.072 -0.94402,-0.10787 -0.0287,0.28329 -0.0746,0.548 -0.47669,0.41572 z m -10.06543,18.57777 c 2.06813,-2.42397 3.44745,-5.6151 4.32488,-9.3699 0.64948,2.4838 2.02669,-2.52606 1.91036,-2.59962 0.022,0.49609 0.60129,0.43757 0.47494,-0.41588 -0.0396,-1.6688 -1.56865,0.81888 -1.41181,-0.63064 0.26199,0.0309 0.53876,-0.31886 0.003,-0.46948 -1.2983,4.35318 -9.38457,7.75132 -5.30194,13.48548 z m -60.39333,-13.00455 c 1.3243,1.882 2.00262,0.41018 1.3952,2.97765 0.67289,0.18916 0.78996,0.86386 1.40918,1.10095 -0.18142,-2.2811 -1.29888,-0.50232 -0.44711,-3.33902 -2.0934,0.32391 -0.5652,-1.99955 -1.40609,-1.57 -0.0109,0.61863 -0.83096,0.3344 -0.95118,0.83042 z m 3.75957,2.77834 c 0.0288,-0.28326 0.0746,-0.54752 0.47542,-0.41586 1.00114,2.10882 -1.98749,2.1382 -0.96589,2.70827 0.94876,-1.03151 2.01127,1.02279 2.3684,-0.66856 -0.56976,-0.16497 -0.28675,-0.55494 0.007,-0.93915 -0.99611,-0.55271 -2.56242,-2.42631 -1.88508,-0.68468 z M 278.77341,429.45723 c 1.07847,0.67269 -2.4499,5.73259 -1.43449,2.18459 0.14786,-0.51682 0.99243,-1.48971 1.43449,-2.18459 z m -7.67283,14.62401 c 0.53319,0.4761 -0.64659,4.12243 -1.93534,5.88504 -0.13697,-1.92592 0.9108,-3.68281 1.93534,-5.88504 z m -3.37665,9.00837 c -0.89936,-2.61097 1.11165,-5.20951 0.47218,0.0539 -0.45945,-0.0399 -0.37084,0.53264 -0.47977,0.8852 -0.5926,-0.18387 -0.46866,-0.98779 0.008,-0.93913 z m -0.95516,1.30028 c 0.95312,0.94324 -0.74039,2.93267 -0.97677,4.11591 -1.08098,-1.08583 0.79136,-2.87482 0.97677,-4.11591 z m 39.93279,31.33537 c -0.35248,0.79491 -0.85927,-0.031 -1.41678,-0.16185 0.67261,0.90266 0.42514,1.11888 -0.9516,0.83039 0.89366,1.61007 1.80756,0.49829 3.29455,1.78568 0.0834,0.40882 -0.18745,0.4214 -0.47591,0.41486 -0.40075,-0.132 -0.44699,0.13202 -0.47523,0.41555 -2.0305,-2.99554 -5.25462,-2.64095 -10.36316,-4.47121 0.59436,1.12097 -2.77658,1.22023 -3.30575,-0.37757 -0.5404,1.97233 -7.85146,-1.62419 -8.49207,-1.90968 -2.06005,-0.91763 -3.10395,0.35649 -1.89252,0.2532 -1.62987,0.13881 -3.89387,0.12313 -6.14553,0.23797 1.04882,-2.08587 2.44373,-1.08035 4.26761,-1.86189 -1.39258,-0.08 -1.99334,-0.81403 -3.30885,0.0925 -1.02852,-1.18079 2.32538,-1.48189 2.38578,-3.01545 1.58783,-0.075 4.33227,0.30237 7.56933,-1.01415 3.65291,2.0282 7.5622,2.03362 12.74179,2.3946 1.34272,2.62809 3.66486,1.50741 5.1694,3.87845 -1.91627,-0.11614 0.19752,1.52433 1.39894,2.50867 z m 46.2883,3.40752 c -1.27247,-1.01529 1.07909,0.24439 0.93749,1.04706 0.72271,-1.2052 1.29392,-0.69573 2.37818,-2.07678 0.6386,1.30711 2.4624,1.57972 3.28744,2.72393 0.99954,-0.031 -0.48334,-1.68637 -1.40469,-1.56967 3.79818,0.45932 7.13311,3.51097 7.51222,6.49446 0.33951,1.4842 -1.30361,0.75413 -0.96328,2.23887 -0.80371,0.0807 -0.88815,-0.46831 -0.93688,-1.04652 -1.28543,0.27968 0.46856,1.69911 0.45449,2.40063 -2.01133,-0.0906 -5.41103,-4.96482 -7.53378,-3.67909 -6.57311,-1.83337 -17.49256,-1.60572 -23.1554,-0.29644 0.99705,-1.54293 0.0222,-0.85732 -0.93331,-1.51598 0.29391,-0.38378 0.57645,-0.77366 0.007,-0.93824 0.71741,-0.54941 4.55501,0.31343 2.3791,-2.07714 0.17161,-0.59671 0.83644,-0.64317 0.95473,-1.2994 0.4418,0.44887 0.30409,1.19141 0.45084,2.86931 0.31464,0.036 0.63018,0.072 0.94494,0.10793 0.74045,-0.0815 -0.40716,-0.87345 0.47853,-0.88442 -0.0863,-0.544 -0.47127,-0.31541 -0.4714,-0.0539 -1.76759,-1.85294 2.39842,-1.0809 1.44395,-3.59288 0.93364,1.24388 0.7426,0.55684 2.35414,1.20796 0.18047,-0.77898 -0.36114,-0.92704 -0.93735,-1.04612 3.17042,0.97408 8.08977,-0.36821 11.32982,1.76378 0.70185,-0.125 -0.18266,-0.62269 0.0103,-1.40799 0.96123,0.24755 0.91545,1.37554 1.87745,1.62367 -0.087,-0.39031 -0.47048,-0.52219 -0.46516,-0.99313 z m -51.56477,6.79277 c -0.14738,6.51653 -10.74358,6.46674 -9.91226,-1.60192 -2.94074,0.26629 -3.64369,1.89436 -5.68796,2.16845 0.74006,1.87785 -0.53392,1.75826 -0.0179,2.34638 -0.094,0.52295 -0.47556,0.20725 -0.47185,-0.0539 -0.77836,0.4676 -1.2374,-0.96157 -2.83344,-0.32364 -0.69918,-0.28505 0.19085,-0.57914 0.0103,-1.40725 -1.88365,0.42105 -3.58351,0.20449 -3.28387,-3.19367 1.79545,2.31884 5.00369,-0.67492 9.45827,-0.79841 7.39627,-0.20556 16.66347,1.53228 19.79968,6.48876 -2.59182,-1.51733 0.0329,0.83768 -0.0179,2.34686 -0.78645,-0.0897 -1.57432,-0.17978 -2.36079,-0.26964 -0.13576,-1.09914 1.36796,-0.36549 1.42702,-1.24638 -1.97246,-1.54134 -3.17157,-3.75771 -6.10983,-4.45568 z m 33.96494,8.10674 c -1.39677,0.2494 1.09138,0.82778 0.45838,1.93139 -0.3785,-0.36907 -1.28728,-0.87796 -1.41664,-0.16184 1.22743,-11.94707 22.94651,-0.90426 29.31149,-1.34929 -1.59204,-0.77049 -1.43873,-2.51851 0.47945,-0.88429 0.003,-0.31313 0.005,-0.62558 0.007,-0.93871 -0.18972,1.70548 1.50658,1.63162 -0.0179,2.34687 0.25888,0.6075 1.82965,-0.14103 1.40284,2.03882 -0.64496,-0.98244 -2.14128,-1.76391 -2.36485,0.19974 0.4587,0.0381 0.37035,-0.53286 0.479,-0.88453 1.65438,0.31664 -0.86911,1.98062 0.45802,1.93108 -0.92981,-0.53334 -2.11771,0.0922 -3.31968,1.49941 -0.68528,-0.28702 0.0514,-0.4062 0.007,-0.93871 -0.98233,0.16567 -1.61649,0.71963 -1.90274,1.66175 0.0325,-2.41962 -5.28839,1.82061 -6.60746,-1.22443 0.45878,0.0663 0.3621,0.61588 0.46502,0.99264 2.84878,-1.16056 0.28303,-3.65806 2.3965,-4.42358 -1.57549,-0.95486 -2.64784,-2.34973 -4.70375,-2.8862 -0.34592,6.70914 -9.98327,6.6249 -9.44042,-1.548 -2.80867,-0.45422 -3.76004,1.16551 -5.21532,2.22289 -0.13848,0.74229 0.44008,0.85903 0.46159,1.46209 1.27294,1.01535 -1.07909,-0.24392 -0.9378,-1.0471" inkscape:connector-curvature="0"/>
       </g>
-      <path
-         sodipodi:nodetypes="ssssssssssssssscccsssssssssssss"
-         inkscape:connector-curvature="0"
-         id="path10432"
-         d="m 895.09375,10.71875 c -4.89014,0.216719 -8.9448,1.858112 -12.09375,4.875 -1.59759,1.530586 -4.8116,3.669737 -7.125,4.78125 -3.48742,1.675586 -4.60803,2.971118 -6.5,7.53125 -1.98958,4.795395 -2.20562,6.588936 -1.6875,14 0.32684,4.675 1.03173,10.449445 1.5625,12.84375 0.66284,2.990057 0.60921,5.338672 -0.15625,7.5 -1.69611,4.78904 1.1929,17.46626 4.59375,20.21875 1.9377,1.56828 2.75991,3.55419 3.53125,8.34375 0.55646,3.45534 1.96032,7.52946 3.09375,9.0625 2.52251,3.41188 2.09711,6.41111 -0.9375,6.84375 -1.55228,0.22131 -3.03996,1.87541 -4.75,5.25 -3.00542,5.93093 -4.01657,6.48488 -27.46875,15 -20.35415,7.39028 -23.40627,9.10357 -25.46875,14.21875 -1.54323,3.82737 -2.18837,20.71788 -0.84375,22.0625 0.37,0.36999 35.8075,0.54708 78.75,0.40625 l 78.0625,-0.25 0.3125,-9 c 0.354,-10.88614 -1.301,-16.03118 -6.0625,-19.03125 -1.7852,-1.12478 -11.125,-4.91156 -20.75,-8.40625 -23.45217,-8.51512 -24.46333,-9.06907 -27.46875,-15 -1.71004,-3.37459 -3.19772,-5.02869 -4.75,-5.25 -3.03461,-0.43264 -3.42876,-3.43187 -0.90625,-6.84375 1.13343,-1.53304 2.50604,-5.60716 3.0625,-9.0625 0.77134,-4.78956 1.6248,-6.77547 3.5625,-8.34375 3.40085,-2.75249 6.25861,-15.42971 4.5625,-20.21875 -0.7789,-2.199274 -0.79207,-4.477673 -0.0937,-7.59375 0.54954,-2.452163 1.07819,-8.088755 1.1875,-12.53125 0.17935,-7.289277 -0.12954,-8.730788 -3.03125,-14.625 -3.56517,-7.24189 -6.22518,-9.577032 -15.1875,-13.21875 -6.3848,-2.594377 -12.10986,-3.779219 -17,-3.5625 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter6246-9-0-2-9-5)"
-         transform="matrix(0.11808159,0.00239897,0.00827779,0.11940757,1009.071,200.79088)" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1111.9591,206.20868 c -0.1953,0.56784 -0.2058,0.7815 -0.084,1.66763 0.077,0.559 0.2084,1.25022 0.2909,1.53739 0.1032,0.35863 0.1162,0.63895 0.044,0.89521 -0.1607,0.56778 0.2854,2.08847 0.7097,2.42527 0.2419,0.19194 0.3554,0.43103 0.4861,1.00479 0.094,0.41391 0.2939,0.90379 0.4404,1.08955 0.3261,0.41347 0.3006,0.77057 -0.054,0.81495 -0.1815,0.0227 -0.3435,0.21666 -0.5174,0.6155 -0.3058,0.701 -0.4206,0.76471 -3.1194,1.72523 -2.3422,0.83361 -2.6885,1.03088 -2.8897,1.63672 -0.1506,0.45331 -0.087,2.46862 0.084,2.63247 0.046,0.045 4.2327,0.1511 9.3022,0.23744 l 9.2157,0.15746 -0.037,-1.07388 c -0.048,-1.29904 -0.2863,-1.91738 -0.8734,-2.28702 -0.2201,-0.13859 -1.3543,-0.61317 -2.5198,-1.05354 -2.8397,-1.07304 -2.9637,-1.14161 -3.3677,-1.85702 -0.2298,-0.40705 -0.4191,-0.60814 -0.6044,-0.63828 -0.3619,-0.059 -0.4333,-0.41802 -0.1636,-0.81939 0.1212,-0.18033 0.2494,-0.66352 0.2866,-1.07477 0.052,-0.57003 0.1358,-0.80514 0.3515,-0.98777 0.3789,-0.3205 0.6115,-1.82739 0.3715,-2.40332 -0.1102,-0.26447 -0.1306,-0.53657 -0.074,-0.90697 0.044,-0.29153 0.061,-0.96324 0.037,-1.49345 -0.039,-0.86996 -0.088,-1.04287 -0.4791,-1.75362 -1.8686,0.33824 -5.6289,0.0342 -6.8343,-0.0905 z"
-         id="path10434"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssssssssscccsssssssssscc" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1115.8388,216.66001 0.5808,2.41887 -3.3752,-2.35094"
-         inkscape:path-effect="#path-effect10448"
-         id="path10436"
-         d="m 1115.8388,216.66001 0.5808,2.41887 -3.3752,-2.35094"
-         style="fill:#ffffff;stroke:#000000;stroke-width:0.20648061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:#ffffff;stroke:#000000;stroke-width:0.20472343;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1116.6032,216.76591 0.268,2.27287 2.7836,-1.9522"
-         id="path10438"
-         inkscape:path-effect="#path-effect10450"
-         inkscape:original-d="m 1116.6032,216.76591 0.268,2.27287 2.7836,-1.9522"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;stroke:#333333;stroke-width:0.20648061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1116.6777,219.2219 0.1289,2.97514"
-         id="path10440"
-         inkscape:path-effect="#path-effect10452"
-         inkscape:original-d="m 1116.6777,219.2219 0.1289,2.97514"
-         inkscape:connector-curvature="0" />
-      <g
-         transform="matrix(0.07627499,-0.00640269,0.00943033,0.07806597,1086.7588,174.18761)"
-         id="g10442">
-        <path
-           style="fill:#734138;fill-opacity:1;stroke:#8b5e3c"
-           inkscape:connector-curvature="0"
-           d="m 321.52049,424.67593 46.39443,23.81444 4.33626,35.00642 c 0,0 3.04145,27.67211 -3.61155,44.67311 -6.653,17.002 -14.95813,43.23868 -18.65513,45.45568 -16.46089,23.36417 -41.8175,13.13887 -46.2535,10.92187 -4.434,-2.219 -27.686,-36.63745 -32.614,-54.13345 -2.815,-9.998 -4.74221,-39.54154 0.60379,-62.41154 4.008,-17.148 2.03231,-30.8747 2.03231,-30.8747 z"
-           id="path10444"
-           sodipodi:nodetypes="cccccccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 329.97842,532.06687 c 1.4597,0.74514 2.64786,1.72936 2.80811,3.60917 -5.88197,-0.697 -6.87412,4.66361 -11.36752,3.39845 -2.0509,-0.57734 -1.8213,-2.985 -3.75028,-4.1857 -1.39314,-0.86893 -5.03239,-0.4414 -7.07433,-1.74758 0.40477,-1.91392 3.12664,-1.24205 4.27071,-2.33048 2.31495,1.63016 3.77662,5.16162 6.10222,5.39435 1.58359,-0.62522 2.71833,-1.59775 4.25379,0.0161 2.33516,-0.54823 3.33051,-2.59223 4.7573,-4.15431 z m -51.35159,11.75673 c 0.75156,1.25308 4.7173,3.84597 6.33735,3.76946 -1.60207,-0.50123 -0.45158,-1.61269 0.48611,-1.82307 -0.61773,0.55337 -0.63564,1.67521 0.4579,1.93089 1.15072,-0.5038 0.30192,-0.90457 0.95518,-1.3001 1.21601,1.41299 -1.02323,1.63838 -1.43803,2.65432 1.67013,0.44442 1.17397,-1.52969 2.8441,-1.08451 -0.91147,0.97676 1.57598,1.54542 2.34295,2.61606 0.9906,1.38212 1.21341,5.35191 3.74192,5.12474 -1.52321,-1.31246 -2.45054,-3.14338 -3.74547,-4.65576 0.68173,-0.17314 1.1387,1.96112 1.41274,0.63152 -2.90634,-2.03661 -2.57215,-4.45172 -4.6752,-6.64058 2.72867,-0.0384 2.99028,4.52105 4.22121,4.23997 0.0148,-0.70098 -1.73977,-2.1202 -0.45431,-2.40033 0.4659,1.9239 1.40472,3.43566 2.80083,4.54696 0.10864,-0.35213 0.0195,-0.92412 0.47945,-0.88432 0.0491,0.57846 0.13255,1.12772 0.93736,1.04613 0.0348,-1.83688 -0.98605,-1.56766 -1.40253,-2.03877 0.82173,-2.08081 3.40283,-2.19538 4.75419,-3.68415 0.18033,0.82762 -0.70972,1.12264 -0.0103,1.40817 0.63601,-1.02547 2.11964,-1.10468 3.31909,-1.50041 -0.13669,0.69064 -2.04469,1.74459 -0.96185,2.23903 1.4497,-1.31242 1.40501,0.068 3.30884,-0.0914 2.23318,-4.79266 3.86047,-1.73321 -0.003,0.46899 2.75376,-0.25518 3.14745,-2.84707 5.68719,-2.16866 -0.0293,0.59727 -0.60919,0.58074 -0.4821,1.35384 1.84775,0.16925 1.25488,-2.38513 2.38578,-3.01546 1.32085,1.51924 0.59978,-1.33606 2.36841,-0.66853 0.33454,1.31898 -0.94649,0.83668 -0.95969,1.76943 2.36645,0.32883 -0.45434,2.24808 -0.48876,2.29215 -0.67409,0.85413 2.67539,-1.72196 4.7559,-4.15365 -0.0378,2.04729 1.11008,-1.09852 1.88322,1.15464 -1.12711,0.069 -2.75801,1.63719 -0.96279,2.23846 0.0798,-1.34697 1.43425,-1.97057 2.38888,-3.48494 -0.79259,2.46261 0.45352,0.71626 1.41679,0.16185 -0.75004,0.71038 -0.53525,3.20759 0.9195,3.39317 0.9452,-0.97524 -0.11472,-0.53451 -0.46163,-1.46212 1.17437,0.0641 1.95753,0.46667 2.35415,1.20891 -0.47627,-0.0494 -0.6002,0.75478 -0.007,0.93823 0.66092,-0.68263 0.41669,-2.37385 1.43774,-2.6539 -0.82489,1.5295 0.83627,4.78043 -0.99039,5.99298 -0.82221,-0.98235 -0.98127,0.0105 -2.36487,0.19924 -0.59153,-0.25956 -0.96031,-0.71512 -0.93375,-1.51509 0.90402,-0.44968 1.10255,-1.05355 0.0143,-1.87792 -0.63489,0.7103 0.14949,3.007 -1.43822,2.65433 -0.51931,-1.7231 2.00544,-2.44384 0.50165,-3.70036 -0.10722,0.35353 -0.39981,0.50105 -0.94758,0.36145 0.69765,4.31122 -2.40598,3.22718 -4.2676,1.86145 0.12876,1.93213 -0.98854,0.13758 -1.89252,0.25321 0.073,1.18516 -1.06648,1.01837 -1.43059,1.71567 -0.62535,-0.5416 -1.42028,-0.93667 -1.8784,-1.62394 0.41929,-0.78028 1.5907,-1.27257 0.0142,-1.87744 -0.51544,1.16022 -0.32429,3.10957 -1.44518,3.59273 -0.57947,-1.10745 -3.50528,-1.22466 -3.78474,0.50722 5.03615,0.19706 11.33803,-0.46609 16.99111,2.87984 1.74886,-1.62477 3.83929,-0.0998 5.21269,-1.75255 -0.59467,1.4646 4.72073,0.17995 7.07835,1.27786 0.0854,-1.78449 -2.22455,-1.47583 -2.33938,-3.08499 -0.2331,0.52768 -0.51131,1.00567 -0.9547,1.29936 -1.37918,-0.85398 -1.75808,0.33054 -2.35414,-1.20796 0.84405,-1.48241 1.0613,-2.6138 1.44486,-3.59231 1.65316,0.39883 0.95117,2.12953 1.39926,2.5078 1.78443,-1.05845 -0.46226,-3.11491 0.50398,-4.16946 0.0165,2.013 2.41367,3.98412 2.34652,2.1471 0.10809,0.68147 0.77249,0.87975 0.93425,1.51516 -0.55365,-0.66076 -1.78174,-0.40218 -2.36389,0.20013 1.2,0.35017 -0.50533,3.2374 1.87017,2.56207 -0.0208,-1.45695 -0.81336,-1.91747 0.0214,-2.81617 0.95888,2.01407 0.76189,-1.73579 2.82551,1.26228 0.14767,-1.2524 -2.5164,-2.41531 -1.39399,-2.97703 1.53978,1.16914 2.80383,3.10856 2.82861,0.79293 4.5209,3.27952 4.89288,4.27925 8.94373,4.77891 0.055,2.27053 -2.04992,2.12918 -1.45651,5.00065 -0.82116,-0.12942 -1.46925,-0.0629 -1.89205,0.25325 0.4892,-2.53654 -1.93512,-0.86468 -2.82955,-0.79257 -0.5365,-1.49829 0.23263,-1.47209 -1.41275,-0.6312 -0.68319,-1.95662 -1.82025,-1.09276 -3.29457,-1.78552 0.10295,1.89703 -3.54642,0.11617 -5.69154,2.63785 -0.66964,-1.82711 -0.62035,-1.25828 -1.41709,-0.16187 -0.0693,-0.56087 0.0919,-1.32307 -0.46035,-1.46148 -2.9871,0.42095 -7.34104,1.28719 -13.69824,-1.09527 -2.2793,1.93741 -10.4136,-1.7438 -12.73775,-2.86433 -0.17535,1.27348 -1.4183,0.38181 -2.37509,1.60826 0.19104,-1.8827 -2.41818,-1.76822 -0.46875,-0.52371 -1.16449,-0.0706 -2.27595,-0.18866 -2.82987,-0.7926 0.21225,1.49869 -1.27976,1.09451 -1.43416,2.18414 2.36873,-0.0768 -0.64161,1.65794 0.93019,1.98532 -0.1806,-1.71422 0.86709,-0.5446 0.46829,0.52379 0.87594,0.54862 1.58939,-1.22564 1.88895,0.21579 -0.19893,0.88108 -1.8334,0.16129 -1.43061,1.71519 1.68658,-0.60725 2.07553,-0.72842 3.30124,0.84645 -1.43794,0.95405 0.32553,1.1898 0.46207,1.46215 -0.662,0.25146 -2.2142,1.88554 -1.43463,2.18457 0.10724,-0.35371 0.3995,-0.50032 0.94758,-0.36114 -0.96034,1.52597 0.20925,-0.0152 0.46564,0.99224 -0.43612,0.77572 -1.66097,0.66935 -2.37198,1.13844 -0.0517,1.27533 0.77974,1.03433 -0.0142,1.87695 1.60749,0.29731 1.76619,-0.69586 2.36484,-0.19955 -0.33343,1.71857 -1.56688,-0.52595 -1.89935,1.19242 0.85097,1.12123 2.12322,1.87493 2.33582,3.55476 1.30701,0.0907 1.62765,-0.71058 0.9406,0.57714 2.25233,0.0838 2.58637,0.13815 4.7292,-0.3989 -0.0519,1.27485 0.77974,1.03434 -0.0142,1.87697 1.51876,-0.21698 0.98203,-0.28793 1.88539,0.68519 -0.0192,-0.81016 0.37247,-1.16211 0.9547,-1.30032 -0.002,0.46906 -0.007,0.9387 -0.0103,1.40818 1.77399,-0.38558 2.10067,-2.38808 3.8026,-2.8541 -0.77565,1.34237 -2.38635,1.75311 -2.86214,3.43137 1.7704,0.55572 1.0432,-1.67511 2.37554,-1.60789 -0.89148,0.79281 -0.0611,1.17344 -0.0179,2.34641 2.08057,0.47901 2.02262,-3.94056 3.78832,-0.97619 1.5871,-0.80143 -1.80748,-1.97199 -0.45447,-2.40066 0.30959,1.53745 1.56228,1.06469 1.87745,1.62365 -1.09047,-0.53444 -1.10208,2.26449 -0.47805,0.88492 1.48138,-1.34346 1.96388,-3.80188 4.28543,-4.20767 -2.72911,0.57235 -2.77983,7.17853 -1.48181,8.28572 0.0541,-3.6137 -0.73177,-6.24044 0.99088,-5.99336 0.15486,0.0201 -0.1893,1.65319 0.4624,1.462 0.39734,-0.11789 -0.20858,-2.6077 0.95843,-1.76956 -0.59092,1.91593 0.0113,3.70179 0.90475,5.27037 0.96122,-2.63083 -1.08345,-3.32894 0.0392,-5.16254 1.54614,1.60708 0.76968,5.62615 1.37426,5.79385 0.10981,-1.61307 0.96849,-2.38925 1.4444,-3.59283 0.16174,1.37684 0.45214,-1.8939 1.4199,-0.3075 -0.25041,0.66613 -0.70643,1.10313 -0.9583,1.76958 2.03182,0.009 0.59451,1.33236 1.40643,1.57002 0.91247,-0.45057 -1.00588,-3.08819 0.96915,-3.17771 -0.14037,0.27221 -1.18806,1.6725 -0.0144,1.87739 0.73835,-0.75313 1.3121,-1.69003 1.90945,-2.60046 0.50392,1.26081 -1.45101,2.07351 -0.0214,2.81612 0.65603,-1.74431 0.37385,-1.79318 0.96962,-3.17765 1.5705,1.01158 1.24407,1.07105 2.36436,-0.19933 1.61508,2.67254 9.31136,1.15639 5.70921,-4.98473 1.59877,-0.23644 0.64329,-2.67646 0.0179,-2.34641 1.89283,-0.80953 -0.56561,-3.19631 0.508,-4.6393 -1.2828,0.9185 -5.29282,2.28453 -3.80613,3.32352 -1.30254,-0.0206 -3.65157,-0.5042 -4.26358,1.39161 -0.80796,-1.76089 -3.51979,0.44025 -4.25299,-0.016 -0.40284,-0.2512 0.61966,-3.29346 -0.4624,-1.46219 -0.0503,0.7317 0.0505,1.63444 -0.95472,1.30031 0.0727,-0.5468 0.84906,-0.96803 0.0103,-1.40816 -0.84602,0.85576 -1.92283,0.09 -0.48303,1.35418 -1.64933,-0.67531 -4.36514,2.11 -3.30886,0.0914 -1.48097,-0.39159 -1.25684,1.1209 -2.37198,1.13827 -6.10003,-3.87411 -13.9893,-2.15174 -16.96253,-6.63467 0.51206,0.17069 1.12769,0.90183 0.46518,0.99266 -0.67752,-0.34065 -1.14704,-0.86319 -1.40606,-1.56996 1.24131,0.28141 0.38513,-1.7784 1.89917,-1.19199 -1.21187,1.39458 2.14185,1.05308 2.83716,-0.14565 -1.28633,-0.48911 -0.95827,0.82383 -1.89624,0.72246 -0.0211,-0.60256 -0.60011,-0.7184 -0.46148,-1.46114 0.62453,0.0764 0.42563,0.87195 0.93736,1.04611 1.44338,-0.66378 -1.27772,-1.6002 0.0144,-1.87742 0.41476,1.61952 1.0525,0.53058 1.88815,0.21565 6.09834,4.89641 17.98728,2.47376 22.65808,3.52807 -0.16698,-1.44953 1.7228,-0.60094 1.90372,-1.66208 1.03989,0.79503 -0.60408,1.07788 0.46067,1.46183 0.63996,-0.8641 1.11655,-1.90871 2.37911,-2.07668 -2.434,2.65519 -3.98053,4.12289 -6.19145,6.33855 1.44175,-0.22407 2.40462,0.21928 2.83622,-0.14575 -1.20511,-1.32461 1.30478,-2.49575 0.95113,-0.83089 0.32342,-1.53271 1.54172,-2.06453 2.38626,-3.01556 1.89721,1.73978 4.77716,-2.47141 6.6284,-1.59132 -1.87472,0.86768 -1.02826,3.85828 0.44762,3.33925 -1.4369,-3.74454 2.2943,-1.05614 1.89577,-0.72313 1.29909,-1.08827 -0.20282,-2.34073 1.91657,-3.53874 0.181,0.82819 -0.70928,1.12349 -0.0103,1.40802 1.39538,-1.43964 1.54273,-4.27308 2.88078,-5.77749 -0.14218,3.32497 2.65749,-1.50736 2.35334,1.2088 1.31534,-0.5529 -0.80464,-2.0137 0.48955,-2.29252 0.10394,0.37545 0.005,0.92694 0.46612,0.99229 0.54758,-0.49257 0.54676,-1.59775 0.49263,-2.76231 2.98418,-0.0767 2.57481,-4.79418 3.35541,-6.19236 -0.15324,0.97501 -1.6357,-0.68028 -1.40563,-1.56977 1.57461,2.28086 5.09866,-1.98397 4.75015,-3.21475 0.33892,0.80614 -0.95343,1.93433 -0.9513,0.8304 -0.0683,-1.21808 2.41964,-1.9809 1.43868,-2.65381 -0.10486,0.51456 -0.53094,0.67062 -0.95162,0.83087 0.20853,-0.87132 1.02512,-1.06336 0.96231,-2.23854 -1.46889,-0.23472 0.0439,-1.57351 -1.87512,-2.09339 0.71578,-1.22137 1.92523,1.03485 2.36388,-0.19968 -0.81054,-0.0675 -1.20776,-0.50031 -1.40825,-1.09991 4.83652,-6.12446 10.81931,-23.18248 7.3068,-28.75769 0.72451,-1.07221 0.56533,-2.39568 0.50878,-4.63921 -0.0149,-0.56008 0.47941,-7.00376 -1.37428,-5.79338 -1.16796,-2.36473 1.6476,-6.01713 0.0821,-10.79468 -0.98661,-3.01187 -1.62989,-0.86675 0.0143,-1.87649 -0.41772,-0.1864 -2.05774,-1.50663 -0.93345,-1.51599 0.47325,0.0527 0.55844,0.44372 0.94059,0.57712 0.41321,-1.04858 -1.63562,-2.21063 -0.45399,-2.40028 0.10849,0.52231 0.76867,1.21588 0.94041,0.5768 -1.90024,-2.05868 1.44489,-0.6754 -0.44355,-3.80801 0.96201,0.24733 0.91624,1.37534 1.87731,1.62287 -1.49253,-2.71384 -1.31748,-5.4118 -1.35875,-7.67019 0.83134,-0.0367 0.84259,2.90304 1.40516,1.56972 -1.01969,-2.44502 1.3447,-4.99137 0.0534,-7.0395 -1.21187,0.69626 0.28148,4.4151 -0.98327,5.05469 -1.07363,-2.46096 -3.1987,-4.96094 -1.82748,-8.1945 -2.18802,-1.43282 -2.48351,-6.20538 -2.77633,-7.83209 -0.23342,0.52799 -0.5118,1.00561 -0.95566,1.29974 -0.37594,-2.40473 -0.41254,-3.29953 -2.33533,-3.55487 0.47216,0.0539 0.94494,0.10793 1.41633,0.16182 -0.0746,-0.71166 0.18227,-1.71253 -0.45711,-1.93078 10e-4,2.81963 -0.42712,-0.40761 -1.42394,0.7764 0.78227,-1.80337 -0.38849,-0.63644 -0.45526,-2.40042 0.0199,0.80977 -0.37247,1.16162 -0.95469,1.30032 0.17125,-1.43735 -1.07671,-2.36705 0.025,-3.28509 -1.51373,-0.58683 -0.6585,1.47238 -1.89934,1.19195 0.5504,-1.31436 0.29212,-1.71103 -0.92615,-2.45422 0.95935,1.23221 -0.99715,2.85175 -1.43513,2.18449 0.14318,-0.53969 1.91618,-1.55548 0.49111,-2.29234 -0.26089,1.85765 -1.15615,0.39495 -1.9003,1.19183 1.93684,1.40199 -0.89856,1.3762 0.9268,2.45433 -1.99662,2.22955 -1.96524,-1.60794 -1.42037,0.3079 -1.27365,-4.47642 0.19555,-5.10198 -4.68279,-5.70189 -0.13638,2.09024 -3.0087,1.10486 -0.94403,-0.10787 -2.16227,-0.52095 -2.21345,1.31499 -3.3231,1.96886 -0.0957,-0.57846 -0.5215,-0.34799 -0.94464,-0.10781 -0.18055,-0.82861 0.71067,-1.12255 0.0103,-1.40771 -1.27772,-1.8248 -0.26472,1.72427 -2.38611,3.01543 -0.51944,-1.72359 2.00483,-2.44392 0.50165,-3.70051 -0.47768,0.59172 -0.77695,-0.28912 -1.42437,0.77637 -0.3798,-1.37076 0.67455,-1.1399 0.49015,-2.29246 -1.92863,0.68585 -4.26047,0.92319 -5.21919,2.69197 -0.47508,-1.91048 -3.13391,0.96365 -5.19039,-1.06222 0.9591,0.51057 2.9362,-0.0735 1.42427,-0.77685 -1.36695,9.4e-4 -3.89882,1.65738 -6.16105,2.11437 0.27193,-0.92692 1.42769,-0.75795 0.48751,-1.82288 -1.89629,0.626 -4.09412,-1.2848 -7.5623,0.0753 -0.0987,-0.89927 0.54029,-0.97425 0.48517,-1.82317 -5.64401,1.40649 -11.29146,-0.41978 -15.57444,-2.71849 -1.81402,-0.29045 -1.8432,1.41226 -3.3191,1.49996 -0.64546,-2.66383 -3.44002,0.57348 -3.77789,-0.43153 0.25026,-0.41965 2.13049,-1.31574 0.95923,-1.76949 -0.74806,0.90021 -1.97337,1.268 -2.38268,2.54596 0.35401,-1.24125 -0.93123,-1.05118 -0.9302,-1.98484 0.66126,0.11035 1.80652,0.10103 0.94803,-0.36155 -0.31431,-0.0359 -0.62985,-0.072 -0.94447,-0.1078 0.39522,1.4985 -2.64272,3.3665 -4.27086,2.33047 0.7045,-0.66056 4.112,-0.73624 2.85096,-2.02282 -0.15727,0.52271 -2.0722,1.38037 -2.36436,0.19916 1.07266,0.20672 2.76415,-1.27054 1.90276,-1.66124 -1.54646,3.0374 -8.40453,1.27521 -6.14941,0.70697 -1.90188,0.4792 -1.94932,3.05739 -4.74659,2.74579 0.28395,-0.94545 1.0038,-1.40345 1.43448,-2.18459 -3.25136,0.62934 -4.4071,3.59861 -6.65695,5.34541 0.1373,-0.69011 2.04529,-1.74375 0.96187,-2.23857 -0.76988,1.69343 -4.59776,5.9029 -2.87222,4.83895 -0.29343,3.46444 -3.58094,6.09125 -2.90451,9.06245 0.2331,-0.52865 0.51178,-1.0061 0.95516,-1.29983 -0.27372,1.10244 -2.11808,5.91138 -0.9766,4.11597 0.73819,-2.29442 2.51392,-5.00756 2.88311,-6.24709 0.0956,0.57847 0.5218,0.34802 0.944,0.10787 -1.00396,2.00092 -1.24124,4.08587 0.44741,3.33904 -0.0618,1.07212 -2.60886,1.77011 -0.96916,3.17774 1.20547,-2.46562 0.4756,2.12893 -0.47574,0.41503 0.002,0.88702 -1.58839,3.64194 -0.49374,2.76219 0.23361,-0.52888 0.51181,-1.00656 0.9552,-1.3001 0.0755,0.71125 -0.18182,1.71259 0.45758,1.93086 0.34502,-0.22215 -1.5874,4.39362 -1.92776,4.94699 0.055,-0.3676 1.57175,-1.24444 1.42021,-0.30764 -0.30711,1.19459 -0.0868,2.84876 1.40608,1.56999 -4.70624,6.46408 -2.86819,18.2199 -4.91837,25.27222 0.81129,0.27813 1.21584,-0.55805 1.41632,0.16182 -3.7647,7.32588 2.3957,19.21038 4.51863,27.28984 0.62858,-1.22046 -0.12236,6.0208 0.41521,7.56336 -1.44833,-3.65951 -6.80113,-7.46461 -6.06748,-10.08773 -0.10363,0.51564 -0.52907,0.67096 -0.95113,0.83103 -1.36187,-1.9198 -3.02233,-3.5774 -4.21065,-5.64812 1.07466,0.18613 1.80779,3.0344 2.8224,1.7313 -1.3147,-0.63975 0.23684,-2.72195 0.95472,-1.29986 -2.13952,-5.12079 -4.66285,-10.52773 -4.13507,-15.50292 -3.6e-4,0.26012 -0.38645,0.48909 -0.47186,-0.0539 0.80039,-0.0984 1.597,-2.57374 0.49682,-3.23168 0.12375,1.08492 -0.12722,1.75146 -0.95873,1.76971 0.38677,-4.37764 -1.17702,-7.05254 -1.81012,-10.54049 0.96929,0.52232 2.12974,-0.9746 0.95518,-1.30027 -5.6e-4,0.26103 -0.38645,0.48908 -0.47217,-0.0539 1.37244,-14.05981 -0.84759,-24.33369 0.28197,-37.07523 2.88574,-6.02 4.71631,-15.7172 11.01733,-19.40904 2.77435,-1.62552 6.5415,-5.81987 9.03934,-7.89186 6.21607,-5.15702 23.49236,-11.23732 32.67385,-8.48023 1.99072,-0.46394 1.99068,-0.68575 3.77761,0.43149 10.56834,-3.74817 21.91859,6.59146 30.17758,9.08335 5.62482,5.02314 11.53949,8.98638 15.94669,15.91254 0.12897,-0.64568 1.03973,-0.4166 1.42426,-0.77698 1.22005,2.66484 2.57719,5.2079 4.6716,7.10967 7.92403,9.96414 6.30757,30.8177 6.26453,46.27844 -0.47362,-0.0533 -0.55924,-0.44474 -0.94189,-0.5779 -8.9e-4,10.31659 -1.0115,19.65822 -1.63633,28.93569 -0.65091,9.64214 -8.4189,15.38765 -8.68511,23.43355 0.091,-1.63399 -0.10237,-3.01868 -0.91686,-3.86284 -0.66171,0.52224 -0.22233,2.27551 -1.43418,2.18508 -0.22846,-0.94542 1.05236,-2.87732 0.0142,-1.87713 -1.66471,3.50383 -2.67284,7.74214 -4.3385,11.2471 5.04224,2.41415 -2.97883,5.56298 -0.0643,8.44731 -3.42758,6.15759 -0.29022,14.95624 -8.0987,8.46947 3.03513,4.1891 -0.80733,3.98092 -0.98295,5.05443 11.21325,5.1641 -57.77176,57.39803 -72.32743,-26.80762 z m -1.2879,-112.18232 c -1.01494,3.54856 2.51249,-1.51112 1.43449,-2.18409 -0.44206,0.69488 -1.28664,1.66779 -1.43449,2.18409 z m -8.17368,18.32496 c 1.28875,-1.76307 2.46821,-5.40897 1.93488,-5.88507 -1.02409,2.20227 -2.07181,3.95962 -1.93488,5.88507 z m -1.44845,4.06221 c 0.10846,-0.35261 0.0195,-0.92428 0.47931,-0.88494 0.6398,-5.26388 -1.37198,-2.66497 -0.47265,-0.054 -0.47578,-0.0496 -0.60019,0.75526 -0.007,0.93892 z m -1.9248,4.47731 c 0.23638,-1.18372 1.92989,-3.17267 0.97677,-4.11592 -0.18541,1.24063 -2.05774,3.03009 -0.97677,4.11592 z m 93.34768,91.92337 c -0.002,0.31234 -0.005,0.62556 -0.007,0.93838 0.28835,0.0596 0.55844,0.13408 0.46953,0.52332 0.3143,0.0354 0.62938,0.0719 0.944,0.10787 0.029,-0.28324 0.0743,-0.54805 0.47637,-0.41528 0.003,-0.31279 0.005,-0.62557 0.007,-0.9384 -0.28799,-0.0601 -0.55842,-0.13458 -0.46919,-0.52374 -0.31463,-0.0364 -0.62972,-0.072 -0.94402,-0.10787 -0.0287,0.28329 -0.0746,0.548 -0.47669,0.41572 z m -10.06543,18.57777 c 2.06813,-2.42397 3.44745,-5.6151 4.32488,-9.3699 0.64948,2.4838 2.02669,-2.52606 1.91036,-2.59962 0.022,0.49609 0.60129,0.43757 0.47494,-0.41588 -0.0396,-1.6688 -1.56865,0.81888 -1.41181,-0.63064 0.26199,0.0309 0.53876,-0.31886 0.003,-0.46948 -1.2983,4.35318 -9.38457,7.75132 -5.30194,13.48548 z m -60.39333,-13.00455 c 1.3243,1.882 2.00262,0.41018 1.3952,2.97765 0.67289,0.18916 0.78996,0.86386 1.40918,1.10095 -0.18142,-2.2811 -1.29888,-0.50232 -0.44711,-3.33902 -2.0934,0.32391 -0.5652,-1.99955 -1.40609,-1.57 -0.0109,0.61863 -0.83096,0.3344 -0.95118,0.83042 z m 3.75957,2.77834 c 0.0288,-0.28326 0.0746,-0.54752 0.47542,-0.41586 1.00114,2.10882 -1.98749,2.1382 -0.96589,2.70827 0.94876,-1.03151 2.01127,1.02279 2.3684,-0.66856 -0.56976,-0.16497 -0.28675,-0.55494 0.007,-0.93915 -0.99611,-0.55271 -2.56242,-2.42631 -1.88508,-0.68468 z M 278.77341,429.45723 c 1.07847,0.67269 -2.4499,5.73259 -1.43449,2.18459 0.14786,-0.51682 0.99243,-1.48971 1.43449,-2.18459 z m -7.67283,14.62401 c 0.53319,0.4761 -0.64659,4.12243 -1.93534,5.88504 -0.13697,-1.92592 0.9108,-3.68281 1.93534,-5.88504 z m -3.37665,9.00837 c -0.89936,-2.61097 1.11165,-5.20951 0.47218,0.0539 -0.45945,-0.0399 -0.37084,0.53264 -0.47977,0.8852 -0.5926,-0.18387 -0.46866,-0.98779 0.008,-0.93913 z m -0.95516,1.30028 c 0.95312,0.94324 -0.74039,2.93267 -0.97677,4.11591 -1.08098,-1.08583 0.79136,-2.87482 0.97677,-4.11591 z m 39.93279,31.33537 c -0.35248,0.79491 -0.85927,-0.031 -1.41678,-0.16185 0.67261,0.90266 0.42514,1.11888 -0.9516,0.83039 0.89366,1.61007 1.80756,0.49829 3.29455,1.78568 0.0834,0.40882 -0.18745,0.4214 -0.47591,0.41486 -0.40075,-0.132 -0.44699,0.13202 -0.47523,0.41555 -2.0305,-2.99554 -5.25462,-2.64095 -10.36316,-4.47121 0.59436,1.12097 -2.77658,1.22023 -3.30575,-0.37757 -0.5404,1.97233 -7.85146,-1.62419 -8.49207,-1.90968 -2.06005,-0.91763 -3.10395,0.35649 -1.89252,0.2532 -1.62987,0.13881 -3.89387,0.12313 -6.14553,0.23797 1.04882,-2.08587 2.44373,-1.08035 4.26761,-1.86189 -1.39258,-0.08 -1.99334,-0.81403 -3.30885,0.0925 -1.02852,-1.18079 2.32538,-1.48189 2.38578,-3.01545 1.58783,-0.075 4.33227,0.30237 7.56933,-1.01415 3.65291,2.0282 7.5622,2.03362 12.74179,2.3946 1.34272,2.62809 3.66486,1.50741 5.1694,3.87845 -1.91627,-0.11614 0.19752,1.52433 1.39894,2.50867 z m 46.2883,3.40752 c -1.27247,-1.01529 1.07909,0.24439 0.93749,1.04706 0.72271,-1.2052 1.29392,-0.69573 2.37818,-2.07678 0.6386,1.30711 2.4624,1.57972 3.28744,2.72393 0.99954,-0.031 -0.48334,-1.68637 -1.40469,-1.56967 3.79818,0.45932 7.13311,3.51097 7.51222,6.49446 0.33951,1.4842 -1.30361,0.75413 -0.96328,2.23887 -0.80371,0.0807 -0.88815,-0.46831 -0.93688,-1.04652 -1.28543,0.27968 0.46856,1.69911 0.45449,2.40063 -2.01133,-0.0906 -5.41103,-4.96482 -7.53378,-3.67909 -6.57311,-1.83337 -17.49256,-1.60572 -23.1554,-0.29644 0.99705,-1.54293 0.0222,-0.85732 -0.93331,-1.51598 0.29391,-0.38378 0.57645,-0.77366 0.007,-0.93824 0.71741,-0.54941 4.55501,0.31343 2.3791,-2.07714 0.17161,-0.59671 0.83644,-0.64317 0.95473,-1.2994 0.4418,0.44887 0.30409,1.19141 0.45084,2.86931 0.31464,0.036 0.63018,0.072 0.94494,0.10793 0.74045,-0.0815 -0.40716,-0.87345 0.47853,-0.88442 -0.0863,-0.544 -0.47127,-0.31541 -0.4714,-0.0539 -1.76759,-1.85294 2.39842,-1.0809 1.44395,-3.59288 0.93364,1.24388 0.7426,0.55684 2.35414,1.20796 0.18047,-0.77898 -0.36114,-0.92704 -0.93735,-1.04612 3.17042,0.97408 8.08977,-0.36821 11.32982,1.76378 0.70185,-0.125 -0.18266,-0.62269 0.0103,-1.40799 0.96123,0.24755 0.91545,1.37554 1.87745,1.62367 -0.087,-0.39031 -0.47048,-0.52219 -0.46516,-0.99313 z m -51.56477,6.79277 c -0.14738,6.51653 -10.74358,6.46674 -9.91226,-1.60192 -2.94074,0.26629 -3.64369,1.89436 -5.68796,2.16845 0.74006,1.87785 -0.53392,1.75826 -0.0179,2.34638 -0.094,0.52295 -0.47556,0.20725 -0.47185,-0.0539 -0.77836,0.4676 -1.2374,-0.96157 -2.83344,-0.32364 -0.69918,-0.28505 0.19085,-0.57914 0.0103,-1.40725 -1.88365,0.42105 -3.58351,0.20449 -3.28387,-3.19367 1.79545,2.31884 5.00369,-0.67492 9.45827,-0.79841 7.39627,-0.20556 16.66347,1.53228 19.79968,6.48876 -2.59182,-1.51733 0.0329,0.83768 -0.0179,2.34686 -0.78645,-0.0897 -1.57432,-0.17978 -2.36079,-0.26964 -0.13576,-1.09914 1.36796,-0.36549 1.42702,-1.24638 -1.97246,-1.54134 -3.17157,-3.75771 -6.10983,-4.45568 z m 33.96494,8.10674 c -1.39677,0.2494 1.09138,0.82778 0.45838,1.93139 -0.3785,-0.36907 -1.28728,-0.87796 -1.41664,-0.16184 1.22743,-11.94707 22.94651,-0.90426 29.31149,-1.34929 -1.59204,-0.77049 -1.43873,-2.51851 0.47945,-0.88429 0.003,-0.31313 0.005,-0.62558 0.007,-0.93871 -0.18972,1.70548 1.50658,1.63162 -0.0179,2.34687 0.25888,0.6075 1.82965,-0.14103 1.40284,2.03882 -0.64496,-0.98244 -2.14128,-1.76391 -2.36485,0.19974 0.4587,0.0381 0.37035,-0.53286 0.479,-0.88453 1.65438,0.31664 -0.86911,1.98062 0.45802,1.93108 -0.92981,-0.53334 -2.11771,0.0922 -3.31968,1.49941 -0.68528,-0.28702 0.0514,-0.4062 0.007,-0.93871 -0.98233,0.16567 -1.61649,0.71963 -1.90274,1.66175 0.0325,-2.41962 -5.28839,1.82061 -6.60746,-1.22443 0.45878,0.0663 0.3621,0.61588 0.46502,0.99264 2.84878,-1.16056 0.28303,-3.65806 2.3965,-4.42358 -1.57549,-0.95486 -2.64784,-2.34973 -4.70375,-2.8862 -0.34592,6.70914 -9.98327,6.6249 -9.44042,-1.548 -2.80867,-0.45422 -3.76004,1.16551 -5.21532,2.22289 -0.13848,0.74229 0.44008,0.85903 0.46159,1.46209 1.27294,1.01535 -1.07909,-0.24392 -0.9378,-1.0471"
-           style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           id="path10446"
-           sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+      <path sodipodi:nodetypes="ssssssssssssssscccsssssssssssss" inkscape:connector-curvature="0" id="path10432" d="m 895.09375,10.71875 c -4.89014,0.216719 -8.9448,1.858112 -12.09375,4.875 -1.59759,1.530586 -4.8116,3.669737 -7.125,4.78125 -3.48742,1.675586 -4.60803,2.971118 -6.5,7.53125 -1.98958,4.795395 -2.20562,6.588936 -1.6875,14 0.32684,4.675 1.03173,10.449445 1.5625,12.84375 0.66284,2.990057 0.60921,5.338672 -0.15625,7.5 -1.69611,4.78904 1.1929,17.46626 4.59375,20.21875 1.9377,1.56828 2.75991,3.55419 3.53125,8.34375 0.55646,3.45534 1.96032,7.52946 3.09375,9.0625 2.52251,3.41188 2.09711,6.41111 -0.9375,6.84375 -1.55228,0.22131 -3.03996,1.87541 -4.75,5.25 -3.00542,5.93093 -4.01657,6.48488 -27.46875,15 -20.35415,7.39028 -23.40627,9.10357 -25.46875,14.21875 -1.54323,3.82737 -2.18837,20.71788 -0.84375,22.0625 0.37,0.36999 35.8075,0.54708 78.75,0.40625 l 78.0625,-0.25 0.3125,-9 c 0.354,-10.88614 -1.301,-16.03118 -6.0625,-19.03125 -1.7852,-1.12478 -11.125,-4.91156 -20.75,-8.40625 -23.45217,-8.51512 -24.46333,-9.06907 -27.46875,-15 -1.71004,-3.37459 -3.19772,-5.02869 -4.75,-5.25 -3.03461,-0.43264 -3.42876,-3.43187 -0.90625,-6.84375 1.13343,-1.53304 2.50604,-5.60716 3.0625,-9.0625 0.77134,-4.78956 1.6248,-6.77547 3.5625,-8.34375 3.40085,-2.75249 6.25861,-15.42971 4.5625,-20.21875 -0.7789,-2.199274 -0.79207,-4.477673 -0.0937,-7.59375 0.54954,-2.452163 1.07819,-8.088755 1.1875,-12.53125 0.17935,-7.289277 -0.12954,-8.730788 -3.03125,-14.625 -3.56517,-7.24189 -6.22518,-9.577032 -15.1875,-13.21875 -6.3848,-2.594377 -12.10986,-3.779219 -17,-3.5625 z" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter6246-9-0-2-9-5)" transform="matrix(0.11808159,0.00239897,0.00827779,0.11940757,1009.071,200.79088)"/>
+      <path style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1111.9591,206.20868 c -0.1953,0.56784 -0.2058,0.7815 -0.084,1.66763 0.077,0.559 0.2084,1.25022 0.2909,1.53739 0.1032,0.35863 0.1162,0.63895 0.044,0.89521 -0.1607,0.56778 0.2854,2.08847 0.7097,2.42527 0.2419,0.19194 0.3554,0.43103 0.4861,1.00479 0.094,0.41391 0.2939,0.90379 0.4404,1.08955 0.3261,0.41347 0.3006,0.77057 -0.054,0.81495 -0.1815,0.0227 -0.3435,0.21666 -0.5174,0.6155 -0.3058,0.701 -0.4206,0.76471 -3.1194,1.72523 -2.3422,0.83361 -2.6885,1.03088 -2.8897,1.63672 -0.1506,0.45331 -0.087,2.46862 0.084,2.63247 0.046,0.045 4.2327,0.1511 9.3022,0.23744 l 9.2157,0.15746 -0.037,-1.07388 c -0.048,-1.29904 -0.2863,-1.91738 -0.8734,-2.28702 -0.2201,-0.13859 -1.3543,-0.61317 -2.5198,-1.05354 -2.8397,-1.07304 -2.9637,-1.14161 -3.3677,-1.85702 -0.2298,-0.40705 -0.4191,-0.60814 -0.6044,-0.63828 -0.3619,-0.059 -0.4333,-0.41802 -0.1636,-0.81939 0.1212,-0.18033 0.2494,-0.66352 0.2866,-1.07477 0.052,-0.57003 0.1358,-0.80514 0.3515,-0.98777 0.3789,-0.3205 0.6115,-1.82739 0.3715,-2.40332 -0.1102,-0.26447 -0.1306,-0.53657 -0.074,-0.90697 0.044,-0.29153 0.061,-0.96324 0.037,-1.49345 -0.039,-0.86996 -0.088,-1.04287 -0.4791,-1.75362 -1.8686,0.33824 -5.6289,0.0342 -6.8343,-0.0905 z" id="path10434" inkscape:connector-curvature="0" sodipodi:nodetypes="cssssssssssscccsssssssssscc"/>
+      <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" inkscape:original-d="m 1115.8388,216.66001 0.5808,2.41887 -3.3752,-2.35094" inkscape:path-effect="#path-effect10448" id="path10436" d="m 1115.8388,216.66001 0.5808,2.41887 -3.3752,-2.35094" style="fill:#ffffff;stroke:#000000;stroke-width:0.20648061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+      <path style="fill:#ffffff;stroke:#000000;stroke-width:0.20472343;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 1116.6032,216.76591 0.268,2.27287 2.7836,-1.9522" id="path10438" inkscape:path-effect="#path-effect10450" inkscape:original-d="m 1116.6032,216.76591 0.268,2.27287 2.7836,-1.9522" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      <path style="fill:none;stroke:#333333;stroke-width:0.20648061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 1116.6777,219.2219 0.1289,2.97514" id="path10440" inkscape:path-effect="#path-effect10452" inkscape:original-d="m 1116.6777,219.2219 0.1289,2.97514" inkscape:connector-curvature="0"/>
+      <g transform="matrix(0.07627499,-0.00640269,0.00943033,0.07806597,1086.7588,174.18761)" id="g10442">
+        <path style="fill:#734138;fill-opacity:1;stroke:#8b5e3c" inkscape:connector-curvature="0" d="m 321.52049,424.67593 46.39443,23.81444 4.33626,35.00642 c 0,0 3.04145,27.67211 -3.61155,44.67311 -6.653,17.002 -14.95813,43.23868 -18.65513,45.45568 -16.46089,23.36417 -41.8175,13.13887 -46.2535,10.92187 -4.434,-2.219 -27.686,-36.63745 -32.614,-54.13345 -2.815,-9.998 -4.74221,-39.54154 0.60379,-62.41154 4.008,-17.148 2.03231,-30.8747 2.03231,-30.8747 z" id="path10444" sodipodi:nodetypes="cccccccccc"/>
+        <path inkscape:connector-curvature="0" d="m 329.97842,532.06687 c 1.4597,0.74514 2.64786,1.72936 2.80811,3.60917 -5.88197,-0.697 -6.87412,4.66361 -11.36752,3.39845 -2.0509,-0.57734 -1.8213,-2.985 -3.75028,-4.1857 -1.39314,-0.86893 -5.03239,-0.4414 -7.07433,-1.74758 0.40477,-1.91392 3.12664,-1.24205 4.27071,-2.33048 2.31495,1.63016 3.77662,5.16162 6.10222,5.39435 1.58359,-0.62522 2.71833,-1.59775 4.25379,0.0161 2.33516,-0.54823 3.33051,-2.59223 4.7573,-4.15431 z m -51.35159,11.75673 c 0.75156,1.25308 4.7173,3.84597 6.33735,3.76946 -1.60207,-0.50123 -0.45158,-1.61269 0.48611,-1.82307 -0.61773,0.55337 -0.63564,1.67521 0.4579,1.93089 1.15072,-0.5038 0.30192,-0.90457 0.95518,-1.3001 1.21601,1.41299 -1.02323,1.63838 -1.43803,2.65432 1.67013,0.44442 1.17397,-1.52969 2.8441,-1.08451 -0.91147,0.97676 1.57598,1.54542 2.34295,2.61606 0.9906,1.38212 1.21341,5.35191 3.74192,5.12474 -1.52321,-1.31246 -2.45054,-3.14338 -3.74547,-4.65576 0.68173,-0.17314 1.1387,1.96112 1.41274,0.63152 -2.90634,-2.03661 -2.57215,-4.45172 -4.6752,-6.64058 2.72867,-0.0384 2.99028,4.52105 4.22121,4.23997 0.0148,-0.70098 -1.73977,-2.1202 -0.45431,-2.40033 0.4659,1.9239 1.40472,3.43566 2.80083,4.54696 0.10864,-0.35213 0.0195,-0.92412 0.47945,-0.88432 0.0491,0.57846 0.13255,1.12772 0.93736,1.04613 0.0348,-1.83688 -0.98605,-1.56766 -1.40253,-2.03877 0.82173,-2.08081 3.40283,-2.19538 4.75419,-3.68415 0.18033,0.82762 -0.70972,1.12264 -0.0103,1.40817 0.63601,-1.02547 2.11964,-1.10468 3.31909,-1.50041 -0.13669,0.69064 -2.04469,1.74459 -0.96185,2.23903 1.4497,-1.31242 1.40501,0.068 3.30884,-0.0914 2.23318,-4.79266 3.86047,-1.73321 -0.003,0.46899 2.75376,-0.25518 3.14745,-2.84707 5.68719,-2.16866 -0.0293,0.59727 -0.60919,0.58074 -0.4821,1.35384 1.84775,0.16925 1.25488,-2.38513 2.38578,-3.01546 1.32085,1.51924 0.59978,-1.33606 2.36841,-0.66853 0.33454,1.31898 -0.94649,0.83668 -0.95969,1.76943 2.36645,0.32883 -0.45434,2.24808 -0.48876,2.29215 -0.67409,0.85413 2.67539,-1.72196 4.7559,-4.15365 -0.0378,2.04729 1.11008,-1.09852 1.88322,1.15464 -1.12711,0.069 -2.75801,1.63719 -0.96279,2.23846 0.0798,-1.34697 1.43425,-1.97057 2.38888,-3.48494 -0.79259,2.46261 0.45352,0.71626 1.41679,0.16185 -0.75004,0.71038 -0.53525,3.20759 0.9195,3.39317 0.9452,-0.97524 -0.11472,-0.53451 -0.46163,-1.46212 1.17437,0.0641 1.95753,0.46667 2.35415,1.20891 -0.47627,-0.0494 -0.6002,0.75478 -0.007,0.93823 0.66092,-0.68263 0.41669,-2.37385 1.43774,-2.6539 -0.82489,1.5295 0.83627,4.78043 -0.99039,5.99298 -0.82221,-0.98235 -0.98127,0.0105 -2.36487,0.19924 -0.59153,-0.25956 -0.96031,-0.71512 -0.93375,-1.51509 0.90402,-0.44968 1.10255,-1.05355 0.0143,-1.87792 -0.63489,0.7103 0.14949,3.007 -1.43822,2.65433 -0.51931,-1.7231 2.00544,-2.44384 0.50165,-3.70036 -0.10722,0.35353 -0.39981,0.50105 -0.94758,0.36145 0.69765,4.31122 -2.40598,3.22718 -4.2676,1.86145 0.12876,1.93213 -0.98854,0.13758 -1.89252,0.25321 0.073,1.18516 -1.06648,1.01837 -1.43059,1.71567 -0.62535,-0.5416 -1.42028,-0.93667 -1.8784,-1.62394 0.41929,-0.78028 1.5907,-1.27257 0.0142,-1.87744 -0.51544,1.16022 -0.32429,3.10957 -1.44518,3.59273 -0.57947,-1.10745 -3.50528,-1.22466 -3.78474,0.50722 5.03615,0.19706 11.33803,-0.46609 16.99111,2.87984 1.74886,-1.62477 3.83929,-0.0998 5.21269,-1.75255 -0.59467,1.4646 4.72073,0.17995 7.07835,1.27786 0.0854,-1.78449 -2.22455,-1.47583 -2.33938,-3.08499 -0.2331,0.52768 -0.51131,1.00567 -0.9547,1.29936 -1.37918,-0.85398 -1.75808,0.33054 -2.35414,-1.20796 0.84405,-1.48241 1.0613,-2.6138 1.44486,-3.59231 1.65316,0.39883 0.95117,2.12953 1.39926,2.5078 1.78443,-1.05845 -0.46226,-3.11491 0.50398,-4.16946 0.0165,2.013 2.41367,3.98412 2.34652,2.1471 0.10809,0.68147 0.77249,0.87975 0.93425,1.51516 -0.55365,-0.66076 -1.78174,-0.40218 -2.36389,0.20013 1.2,0.35017 -0.50533,3.2374 1.87017,2.56207 -0.0208,-1.45695 -0.81336,-1.91747 0.0214,-2.81617 0.95888,2.01407 0.76189,-1.73579 2.82551,1.26228 0.14767,-1.2524 -2.5164,-2.41531 -1.39399,-2.97703 1.53978,1.16914 2.80383,3.10856 2.82861,0.79293 4.5209,3.27952 4.89288,4.27925 8.94373,4.77891 0.055,2.27053 -2.04992,2.12918 -1.45651,5.00065 -0.82116,-0.12942 -1.46925,-0.0629 -1.89205,0.25325 0.4892,-2.53654 -1.93512,-0.86468 -2.82955,-0.79257 -0.5365,-1.49829 0.23263,-1.47209 -1.41275,-0.6312 -0.68319,-1.95662 -1.82025,-1.09276 -3.29457,-1.78552 0.10295,1.89703 -3.54642,0.11617 -5.69154,2.63785 -0.66964,-1.82711 -0.62035,-1.25828 -1.41709,-0.16187 -0.0693,-0.56087 0.0919,-1.32307 -0.46035,-1.46148 -2.9871,0.42095 -7.34104,1.28719 -13.69824,-1.09527 -2.2793,1.93741 -10.4136,-1.7438 -12.73775,-2.86433 -0.17535,1.27348 -1.4183,0.38181 -2.37509,1.60826 0.19104,-1.8827 -2.41818,-1.76822 -0.46875,-0.52371 -1.16449,-0.0706 -2.27595,-0.18866 -2.82987,-0.7926 0.21225,1.49869 -1.27976,1.09451 -1.43416,2.18414 2.36873,-0.0768 -0.64161,1.65794 0.93019,1.98532 -0.1806,-1.71422 0.86709,-0.5446 0.46829,0.52379 0.87594,0.54862 1.58939,-1.22564 1.88895,0.21579 -0.19893,0.88108 -1.8334,0.16129 -1.43061,1.71519 1.68658,-0.60725 2.07553,-0.72842 3.30124,0.84645 -1.43794,0.95405 0.32553,1.1898 0.46207,1.46215 -0.662,0.25146 -2.2142,1.88554 -1.43463,2.18457 0.10724,-0.35371 0.3995,-0.50032 0.94758,-0.36114 -0.96034,1.52597 0.20925,-0.0152 0.46564,0.99224 -0.43612,0.77572 -1.66097,0.66935 -2.37198,1.13844 -0.0517,1.27533 0.77974,1.03433 -0.0142,1.87695 1.60749,0.29731 1.76619,-0.69586 2.36484,-0.19955 -0.33343,1.71857 -1.56688,-0.52595 -1.89935,1.19242 0.85097,1.12123 2.12322,1.87493 2.33582,3.55476 1.30701,0.0907 1.62765,-0.71058 0.9406,0.57714 2.25233,0.0838 2.58637,0.13815 4.7292,-0.3989 -0.0519,1.27485 0.77974,1.03434 -0.0142,1.87697 1.51876,-0.21698 0.98203,-0.28793 1.88539,0.68519 -0.0192,-0.81016 0.37247,-1.16211 0.9547,-1.30032 -0.002,0.46906 -0.007,0.9387 -0.0103,1.40818 1.77399,-0.38558 2.10067,-2.38808 3.8026,-2.8541 -0.77565,1.34237 -2.38635,1.75311 -2.86214,3.43137 1.7704,0.55572 1.0432,-1.67511 2.37554,-1.60789 -0.89148,0.79281 -0.0611,1.17344 -0.0179,2.34641 2.08057,0.47901 2.02262,-3.94056 3.78832,-0.97619 1.5871,-0.80143 -1.80748,-1.97199 -0.45447,-2.40066 0.30959,1.53745 1.56228,1.06469 1.87745,1.62365 -1.09047,-0.53444 -1.10208,2.26449 -0.47805,0.88492 1.48138,-1.34346 1.96388,-3.80188 4.28543,-4.20767 -2.72911,0.57235 -2.77983,7.17853 -1.48181,8.28572 0.0541,-3.6137 -0.73177,-6.24044 0.99088,-5.99336 0.15486,0.0201 -0.1893,1.65319 0.4624,1.462 0.39734,-0.11789 -0.20858,-2.6077 0.95843,-1.76956 -0.59092,1.91593 0.0113,3.70179 0.90475,5.27037 0.96122,-2.63083 -1.08345,-3.32894 0.0392,-5.16254 1.54614,1.60708 0.76968,5.62615 1.37426,5.79385 0.10981,-1.61307 0.96849,-2.38925 1.4444,-3.59283 0.16174,1.37684 0.45214,-1.8939 1.4199,-0.3075 -0.25041,0.66613 -0.70643,1.10313 -0.9583,1.76958 2.03182,0.009 0.59451,1.33236 1.40643,1.57002 0.91247,-0.45057 -1.00588,-3.08819 0.96915,-3.17771 -0.14037,0.27221 -1.18806,1.6725 -0.0144,1.87739 0.73835,-0.75313 1.3121,-1.69003 1.90945,-2.60046 0.50392,1.26081 -1.45101,2.07351 -0.0214,2.81612 0.65603,-1.74431 0.37385,-1.79318 0.96962,-3.17765 1.5705,1.01158 1.24407,1.07105 2.36436,-0.19933 1.61508,2.67254 9.31136,1.15639 5.70921,-4.98473 1.59877,-0.23644 0.64329,-2.67646 0.0179,-2.34641 1.89283,-0.80953 -0.56561,-3.19631 0.508,-4.6393 -1.2828,0.9185 -5.29282,2.28453 -3.80613,3.32352 -1.30254,-0.0206 -3.65157,-0.5042 -4.26358,1.39161 -0.80796,-1.76089 -3.51979,0.44025 -4.25299,-0.016 -0.40284,-0.2512 0.61966,-3.29346 -0.4624,-1.46219 -0.0503,0.7317 0.0505,1.63444 -0.95472,1.30031 0.0727,-0.5468 0.84906,-0.96803 0.0103,-1.40816 -0.84602,0.85576 -1.92283,0.09 -0.48303,1.35418 -1.64933,-0.67531 -4.36514,2.11 -3.30886,0.0914 -1.48097,-0.39159 -1.25684,1.1209 -2.37198,1.13827 -6.10003,-3.87411 -13.9893,-2.15174 -16.96253,-6.63467 0.51206,0.17069 1.12769,0.90183 0.46518,0.99266 -0.67752,-0.34065 -1.14704,-0.86319 -1.40606,-1.56996 1.24131,0.28141 0.38513,-1.7784 1.89917,-1.19199 -1.21187,1.39458 2.14185,1.05308 2.83716,-0.14565 -1.28633,-0.48911 -0.95827,0.82383 -1.89624,0.72246 -0.0211,-0.60256 -0.60011,-0.7184 -0.46148,-1.46114 0.62453,0.0764 0.42563,0.87195 0.93736,1.04611 1.44338,-0.66378 -1.27772,-1.6002 0.0144,-1.87742 0.41476,1.61952 1.0525,0.53058 1.88815,0.21565 6.09834,4.89641 17.98728,2.47376 22.65808,3.52807 -0.16698,-1.44953 1.7228,-0.60094 1.90372,-1.66208 1.03989,0.79503 -0.60408,1.07788 0.46067,1.46183 0.63996,-0.8641 1.11655,-1.90871 2.37911,-2.07668 -2.434,2.65519 -3.98053,4.12289 -6.19145,6.33855 1.44175,-0.22407 2.40462,0.21928 2.83622,-0.14575 -1.20511,-1.32461 1.30478,-2.49575 0.95113,-0.83089 0.32342,-1.53271 1.54172,-2.06453 2.38626,-3.01556 1.89721,1.73978 4.77716,-2.47141 6.6284,-1.59132 -1.87472,0.86768 -1.02826,3.85828 0.44762,3.33925 -1.4369,-3.74454 2.2943,-1.05614 1.89577,-0.72313 1.29909,-1.08827 -0.20282,-2.34073 1.91657,-3.53874 0.181,0.82819 -0.70928,1.12349 -0.0103,1.40802 1.39538,-1.43964 1.54273,-4.27308 2.88078,-5.77749 -0.14218,3.32497 2.65749,-1.50736 2.35334,1.2088 1.31534,-0.5529 -0.80464,-2.0137 0.48955,-2.29252 0.10394,0.37545 0.005,0.92694 0.46612,0.99229 0.54758,-0.49257 0.54676,-1.59775 0.49263,-2.76231 2.98418,-0.0767 2.57481,-4.79418 3.35541,-6.19236 -0.15324,0.97501 -1.6357,-0.68028 -1.40563,-1.56977 1.57461,2.28086 5.09866,-1.98397 4.75015,-3.21475 0.33892,0.80614 -0.95343,1.93433 -0.9513,0.8304 -0.0683,-1.21808 2.41964,-1.9809 1.43868,-2.65381 -0.10486,0.51456 -0.53094,0.67062 -0.95162,0.83087 0.20853,-0.87132 1.02512,-1.06336 0.96231,-2.23854 -1.46889,-0.23472 0.0439,-1.57351 -1.87512,-2.09339 0.71578,-1.22137 1.92523,1.03485 2.36388,-0.19968 -0.81054,-0.0675 -1.20776,-0.50031 -1.40825,-1.09991 4.83652,-6.12446 10.81931,-23.18248 7.3068,-28.75769 0.72451,-1.07221 0.56533,-2.39568 0.50878,-4.63921 -0.0149,-0.56008 0.47941,-7.00376 -1.37428,-5.79338 -1.16796,-2.36473 1.6476,-6.01713 0.0821,-10.79468 -0.98661,-3.01187 -1.62989,-0.86675 0.0143,-1.87649 -0.41772,-0.1864 -2.05774,-1.50663 -0.93345,-1.51599 0.47325,0.0527 0.55844,0.44372 0.94059,0.57712 0.41321,-1.04858 -1.63562,-2.21063 -0.45399,-2.40028 0.10849,0.52231 0.76867,1.21588 0.94041,0.5768 -1.90024,-2.05868 1.44489,-0.6754 -0.44355,-3.80801 0.96201,0.24733 0.91624,1.37534 1.87731,1.62287 -1.49253,-2.71384 -1.31748,-5.4118 -1.35875,-7.67019 0.83134,-0.0367 0.84259,2.90304 1.40516,1.56972 -1.01969,-2.44502 1.3447,-4.99137 0.0534,-7.0395 -1.21187,0.69626 0.28148,4.4151 -0.98327,5.05469 -1.07363,-2.46096 -3.1987,-4.96094 -1.82748,-8.1945 -2.18802,-1.43282 -2.48351,-6.20538 -2.77633,-7.83209 -0.23342,0.52799 -0.5118,1.00561 -0.95566,1.29974 -0.37594,-2.40473 -0.41254,-3.29953 -2.33533,-3.55487 0.47216,0.0539 0.94494,0.10793 1.41633,0.16182 -0.0746,-0.71166 0.18227,-1.71253 -0.45711,-1.93078 10e-4,2.81963 -0.42712,-0.40761 -1.42394,0.7764 0.78227,-1.80337 -0.38849,-0.63644 -0.45526,-2.40042 0.0199,0.80977 -0.37247,1.16162 -0.95469,1.30032 0.17125,-1.43735 -1.07671,-2.36705 0.025,-3.28509 -1.51373,-0.58683 -0.6585,1.47238 -1.89934,1.19195 0.5504,-1.31436 0.29212,-1.71103 -0.92615,-2.45422 0.95935,1.23221 -0.99715,2.85175 -1.43513,2.18449 0.14318,-0.53969 1.91618,-1.55548 0.49111,-2.29234 -0.26089,1.85765 -1.15615,0.39495 -1.9003,1.19183 1.93684,1.40199 -0.89856,1.3762 0.9268,2.45433 -1.99662,2.22955 -1.96524,-1.60794 -1.42037,0.3079 -1.27365,-4.47642 0.19555,-5.10198 -4.68279,-5.70189 -0.13638,2.09024 -3.0087,1.10486 -0.94403,-0.10787 -2.16227,-0.52095 -2.21345,1.31499 -3.3231,1.96886 -0.0957,-0.57846 -0.5215,-0.34799 -0.94464,-0.10781 -0.18055,-0.82861 0.71067,-1.12255 0.0103,-1.40771 -1.27772,-1.8248 -0.26472,1.72427 -2.38611,3.01543 -0.51944,-1.72359 2.00483,-2.44392 0.50165,-3.70051 -0.47768,0.59172 -0.77695,-0.28912 -1.42437,0.77637 -0.3798,-1.37076 0.67455,-1.1399 0.49015,-2.29246 -1.92863,0.68585 -4.26047,0.92319 -5.21919,2.69197 -0.47508,-1.91048 -3.13391,0.96365 -5.19039,-1.06222 0.9591,0.51057 2.9362,-0.0735 1.42427,-0.77685 -1.36695,9.4e-4 -3.89882,1.65738 -6.16105,2.11437 0.27193,-0.92692 1.42769,-0.75795 0.48751,-1.82288 -1.89629,0.626 -4.09412,-1.2848 -7.5623,0.0753 -0.0987,-0.89927 0.54029,-0.97425 0.48517,-1.82317 -5.64401,1.40649 -11.29146,-0.41978 -15.57444,-2.71849 -1.81402,-0.29045 -1.8432,1.41226 -3.3191,1.49996 -0.64546,-2.66383 -3.44002,0.57348 -3.77789,-0.43153 0.25026,-0.41965 2.13049,-1.31574 0.95923,-1.76949 -0.74806,0.90021 -1.97337,1.268 -2.38268,2.54596 0.35401,-1.24125 -0.93123,-1.05118 -0.9302,-1.98484 0.66126,0.11035 1.80652,0.10103 0.94803,-0.36155 -0.31431,-0.0359 -0.62985,-0.072 -0.94447,-0.1078 0.39522,1.4985 -2.64272,3.3665 -4.27086,2.33047 0.7045,-0.66056 4.112,-0.73624 2.85096,-2.02282 -0.15727,0.52271 -2.0722,1.38037 -2.36436,0.19916 1.07266,0.20672 2.76415,-1.27054 1.90276,-1.66124 -1.54646,3.0374 -8.40453,1.27521 -6.14941,0.70697 -1.90188,0.4792 -1.94932,3.05739 -4.74659,2.74579 0.28395,-0.94545 1.0038,-1.40345 1.43448,-2.18459 -3.25136,0.62934 -4.4071,3.59861 -6.65695,5.34541 0.1373,-0.69011 2.04529,-1.74375 0.96187,-2.23857 -0.76988,1.69343 -4.59776,5.9029 -2.87222,4.83895 -0.29343,3.46444 -3.58094,6.09125 -2.90451,9.06245 0.2331,-0.52865 0.51178,-1.0061 0.95516,-1.29983 -0.27372,1.10244 -2.11808,5.91138 -0.9766,4.11597 0.73819,-2.29442 2.51392,-5.00756 2.88311,-6.24709 0.0956,0.57847 0.5218,0.34802 0.944,0.10787 -1.00396,2.00092 -1.24124,4.08587 0.44741,3.33904 -0.0618,1.07212 -2.60886,1.77011 -0.96916,3.17774 1.20547,-2.46562 0.4756,2.12893 -0.47574,0.41503 0.002,0.88702 -1.58839,3.64194 -0.49374,2.76219 0.23361,-0.52888 0.51181,-1.00656 0.9552,-1.3001 0.0755,0.71125 -0.18182,1.71259 0.45758,1.93086 0.34502,-0.22215 -1.5874,4.39362 -1.92776,4.94699 0.055,-0.3676 1.57175,-1.24444 1.42021,-0.30764 -0.30711,1.19459 -0.0868,2.84876 1.40608,1.56999 -4.70624,6.46408 -2.86819,18.2199 -4.91837,25.27222 0.81129,0.27813 1.21584,-0.55805 1.41632,0.16182 -3.7647,7.32588 2.3957,19.21038 4.51863,27.28984 0.62858,-1.22046 -0.12236,6.0208 0.41521,7.56336 -1.44833,-3.65951 -6.80113,-7.46461 -6.06748,-10.08773 -0.10363,0.51564 -0.52907,0.67096 -0.95113,0.83103 -1.36187,-1.9198 -3.02233,-3.5774 -4.21065,-5.64812 1.07466,0.18613 1.80779,3.0344 2.8224,1.7313 -1.3147,-0.63975 0.23684,-2.72195 0.95472,-1.29986 -2.13952,-5.12079 -4.66285,-10.52773 -4.13507,-15.50292 -3.6e-4,0.26012 -0.38645,0.48909 -0.47186,-0.0539 0.80039,-0.0984 1.597,-2.57374 0.49682,-3.23168 0.12375,1.08492 -0.12722,1.75146 -0.95873,1.76971 0.38677,-4.37764 -1.17702,-7.05254 -1.81012,-10.54049 0.96929,0.52232 2.12974,-0.9746 0.95518,-1.30027 -5.6e-4,0.26103 -0.38645,0.48908 -0.47217,-0.0539 1.37244,-14.05981 -0.84759,-24.33369 0.28197,-37.07523 2.88574,-6.02 4.71631,-15.7172 11.01733,-19.40904 2.77435,-1.62552 6.5415,-5.81987 9.03934,-7.89186 6.21607,-5.15702 23.49236,-11.23732 32.67385,-8.48023 1.99072,-0.46394 1.99068,-0.68575 3.77761,0.43149 10.56834,-3.74817 21.91859,6.59146 30.17758,9.08335 5.62482,5.02314 11.53949,8.98638 15.94669,15.91254 0.12897,-0.64568 1.03973,-0.4166 1.42426,-0.77698 1.22005,2.66484 2.57719,5.2079 4.6716,7.10967 7.92403,9.96414 6.30757,30.8177 6.26453,46.27844 -0.47362,-0.0533 -0.55924,-0.44474 -0.94189,-0.5779 -8.9e-4,10.31659 -1.0115,19.65822 -1.63633,28.93569 -0.65091,9.64214 -8.4189,15.38765 -8.68511,23.43355 0.091,-1.63399 -0.10237,-3.01868 -0.91686,-3.86284 -0.66171,0.52224 -0.22233,2.27551 -1.43418,2.18508 -0.22846,-0.94542 1.05236,-2.87732 0.0142,-1.87713 -1.66471,3.50383 -2.67284,7.74214 -4.3385,11.2471 5.04224,2.41415 -2.97883,5.56298 -0.0643,8.44731 -3.42758,6.15759 -0.29022,14.95624 -8.0987,8.46947 3.03513,4.1891 -0.80733,3.98092 -0.98295,5.05443 11.21325,5.1641 -57.77176,57.39803 -72.32743,-26.80762 z m -1.2879,-112.18232 c -1.01494,3.54856 2.51249,-1.51112 1.43449,-2.18409 -0.44206,0.69488 -1.28664,1.66779 -1.43449,2.18409 z m -8.17368,18.32496 c 1.28875,-1.76307 2.46821,-5.40897 1.93488,-5.88507 -1.02409,2.20227 -2.07181,3.95962 -1.93488,5.88507 z m -1.44845,4.06221 c 0.10846,-0.35261 0.0195,-0.92428 0.47931,-0.88494 0.6398,-5.26388 -1.37198,-2.66497 -0.47265,-0.054 -0.47578,-0.0496 -0.60019,0.75526 -0.007,0.93892 z m -1.9248,4.47731 c 0.23638,-1.18372 1.92989,-3.17267 0.97677,-4.11592 -0.18541,1.24063 -2.05774,3.03009 -0.97677,4.11592 z m 93.34768,91.92337 c -0.002,0.31234 -0.005,0.62556 -0.007,0.93838 0.28835,0.0596 0.55844,0.13408 0.46953,0.52332 0.3143,0.0354 0.62938,0.0719 0.944,0.10787 0.029,-0.28324 0.0743,-0.54805 0.47637,-0.41528 0.003,-0.31279 0.005,-0.62557 0.007,-0.9384 -0.28799,-0.0601 -0.55842,-0.13458 -0.46919,-0.52374 -0.31463,-0.0364 -0.62972,-0.072 -0.94402,-0.10787 -0.0287,0.28329 -0.0746,0.548 -0.47669,0.41572 z m -10.06543,18.57777 c 2.06813,-2.42397 3.44745,-5.6151 4.32488,-9.3699 0.64948,2.4838 2.02669,-2.52606 1.91036,-2.59962 0.022,0.49609 0.60129,0.43757 0.47494,-0.41588 -0.0396,-1.6688 -1.56865,0.81888 -1.41181,-0.63064 0.26199,0.0309 0.53876,-0.31886 0.003,-0.46948 -1.2983,4.35318 -9.38457,7.75132 -5.30194,13.48548 z m -60.39333,-13.00455 c 1.3243,1.882 2.00262,0.41018 1.3952,2.97765 0.67289,0.18916 0.78996,0.86386 1.40918,1.10095 -0.18142,-2.2811 -1.29888,-0.50232 -0.44711,-3.33902 -2.0934,0.32391 -0.5652,-1.99955 -1.40609,-1.57 -0.0109,0.61863 -0.83096,0.3344 -0.95118,0.83042 z m 3.75957,2.77834 c 0.0288,-0.28326 0.0746,-0.54752 0.47542,-0.41586 1.00114,2.10882 -1.98749,2.1382 -0.96589,2.70827 0.94876,-1.03151 2.01127,1.02279 2.3684,-0.66856 -0.56976,-0.16497 -0.28675,-0.55494 0.007,-0.93915 -0.99611,-0.55271 -2.56242,-2.42631 -1.88508,-0.68468 z M 278.77341,429.45723 c 1.07847,0.67269 -2.4499,5.73259 -1.43449,2.18459 0.14786,-0.51682 0.99243,-1.48971 1.43449,-2.18459 z m -7.67283,14.62401 c 0.53319,0.4761 -0.64659,4.12243 -1.93534,5.88504 -0.13697,-1.92592 0.9108,-3.68281 1.93534,-5.88504 z m -3.37665,9.00837 c -0.89936,-2.61097 1.11165,-5.20951 0.47218,0.0539 -0.45945,-0.0399 -0.37084,0.53264 -0.47977,0.8852 -0.5926,-0.18387 -0.46866,-0.98779 0.008,-0.93913 z m -0.95516,1.30028 c 0.95312,0.94324 -0.74039,2.93267 -0.97677,4.11591 -1.08098,-1.08583 0.79136,-2.87482 0.97677,-4.11591 z m 39.93279,31.33537 c -0.35248,0.79491 -0.85927,-0.031 -1.41678,-0.16185 0.67261,0.90266 0.42514,1.11888 -0.9516,0.83039 0.89366,1.61007 1.80756,0.49829 3.29455,1.78568 0.0834,0.40882 -0.18745,0.4214 -0.47591,0.41486 -0.40075,-0.132 -0.44699,0.13202 -0.47523,0.41555 -2.0305,-2.99554 -5.25462,-2.64095 -10.36316,-4.47121 0.59436,1.12097 -2.77658,1.22023 -3.30575,-0.37757 -0.5404,1.97233 -7.85146,-1.62419 -8.49207,-1.90968 -2.06005,-0.91763 -3.10395,0.35649 -1.89252,0.2532 -1.62987,0.13881 -3.89387,0.12313 -6.14553,0.23797 1.04882,-2.08587 2.44373,-1.08035 4.26761,-1.86189 -1.39258,-0.08 -1.99334,-0.81403 -3.30885,0.0925 -1.02852,-1.18079 2.32538,-1.48189 2.38578,-3.01545 1.58783,-0.075 4.33227,0.30237 7.56933,-1.01415 3.65291,2.0282 7.5622,2.03362 12.74179,2.3946 1.34272,2.62809 3.66486,1.50741 5.1694,3.87845 -1.91627,-0.11614 0.19752,1.52433 1.39894,2.50867 z m 46.2883,3.40752 c -1.27247,-1.01529 1.07909,0.24439 0.93749,1.04706 0.72271,-1.2052 1.29392,-0.69573 2.37818,-2.07678 0.6386,1.30711 2.4624,1.57972 3.28744,2.72393 0.99954,-0.031 -0.48334,-1.68637 -1.40469,-1.56967 3.79818,0.45932 7.13311,3.51097 7.51222,6.49446 0.33951,1.4842 -1.30361,0.75413 -0.96328,2.23887 -0.80371,0.0807 -0.88815,-0.46831 -0.93688,-1.04652 -1.28543,0.27968 0.46856,1.69911 0.45449,2.40063 -2.01133,-0.0906 -5.41103,-4.96482 -7.53378,-3.67909 -6.57311,-1.83337 -17.49256,-1.60572 -23.1554,-0.29644 0.99705,-1.54293 0.0222,-0.85732 -0.93331,-1.51598 0.29391,-0.38378 0.57645,-0.77366 0.007,-0.93824 0.71741,-0.54941 4.55501,0.31343 2.3791,-2.07714 0.17161,-0.59671 0.83644,-0.64317 0.95473,-1.2994 0.4418,0.44887 0.30409,1.19141 0.45084,2.86931 0.31464,0.036 0.63018,0.072 0.94494,0.10793 0.74045,-0.0815 -0.40716,-0.87345 0.47853,-0.88442 -0.0863,-0.544 -0.47127,-0.31541 -0.4714,-0.0539 -1.76759,-1.85294 2.39842,-1.0809 1.44395,-3.59288 0.93364,1.24388 0.7426,0.55684 2.35414,1.20796 0.18047,-0.77898 -0.36114,-0.92704 -0.93735,-1.04612 3.17042,0.97408 8.08977,-0.36821 11.32982,1.76378 0.70185,-0.125 -0.18266,-0.62269 0.0103,-1.40799 0.96123,0.24755 0.91545,1.37554 1.87745,1.62367 -0.087,-0.39031 -0.47048,-0.52219 -0.46516,-0.99313 z m -51.56477,6.79277 c -0.14738,6.51653 -10.74358,6.46674 -9.91226,-1.60192 -2.94074,0.26629 -3.64369,1.89436 -5.68796,2.16845 0.74006,1.87785 -0.53392,1.75826 -0.0179,2.34638 -0.094,0.52295 -0.47556,0.20725 -0.47185,-0.0539 -0.77836,0.4676 -1.2374,-0.96157 -2.83344,-0.32364 -0.69918,-0.28505 0.19085,-0.57914 0.0103,-1.40725 -1.88365,0.42105 -3.58351,0.20449 -3.28387,-3.19367 1.79545,2.31884 5.00369,-0.67492 9.45827,-0.79841 7.39627,-0.20556 16.66347,1.53228 19.79968,6.48876 -2.59182,-1.51733 0.0329,0.83768 -0.0179,2.34686 -0.78645,-0.0897 -1.57432,-0.17978 -2.36079,-0.26964 -0.13576,-1.09914 1.36796,-0.36549 1.42702,-1.24638 -1.97246,-1.54134 -3.17157,-3.75771 -6.10983,-4.45568 z m 33.96494,8.10674 c -1.39677,0.2494 1.09138,0.82778 0.45838,1.93139 -0.3785,-0.36907 -1.28728,-0.87796 -1.41664,-0.16184 1.22743,-11.94707 22.94651,-0.90426 29.31149,-1.34929 -1.59204,-0.77049 -1.43873,-2.51851 0.47945,-0.88429 0.003,-0.31313 0.005,-0.62558 0.007,-0.93871 -0.18972,1.70548 1.50658,1.63162 -0.0179,2.34687 0.25888,0.6075 1.82965,-0.14103 1.40284,2.03882 -0.64496,-0.98244 -2.14128,-1.76391 -2.36485,0.19974 0.4587,0.0381 0.37035,-0.53286 0.479,-0.88453 1.65438,0.31664 -0.86911,1.98062 0.45802,1.93108 -0.92981,-0.53334 -2.11771,0.0922 -3.31968,1.49941 -0.68528,-0.28702 0.0514,-0.4062 0.007,-0.93871 -0.98233,0.16567 -1.61649,0.71963 -1.90274,1.66175 0.0325,-2.41962 -5.28839,1.82061 -6.60746,-1.22443 0.45878,0.0663 0.3621,0.61588 0.46502,0.99264 2.84878,-1.16056 0.28303,-3.65806 2.3965,-4.42358 -1.57549,-0.95486 -2.64784,-2.34973 -4.70375,-2.8862 -0.34592,6.70914 -9.98327,6.6249 -9.44042,-1.548 -2.80867,-0.45422 -3.76004,1.16551 -5.21532,2.22289 -0.13848,0.74229 0.44008,0.85903 0.46159,1.46209 1.27294,1.01535 -1.07909,-0.24392 -0.9378,-1.0471" style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path10446" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/elements/Workstation.svg b/misc/images/svg/elements/Workstation.svg
index 547a4aabfc7..5c818fb4e52 100644
--- a/misc/images/svg/elements/Workstation.svg
+++ b/misc/images/svg/elements/Workstation.svg
@@ -1,3496 +1,628 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.00003"
-   height="117.13119"
-   id="svg162068"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 70">
-  <defs
-     id="defs162070">
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5322"
-       is_visible="true" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5324"
-       x="-0.044872452"
-       width="1.0897449"
-       y="-0.21104075"
-       height="1.4220815">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.4069383"
-         id="feGaussianBlur5326" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.00003" height="117.13119" id="svg162068" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 70">
+  <defs id="defs162070">
+    <inkscape:path-effect effect="spiro" id="path-effect5322" is_visible="true"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5324" x="-0.044872452" width="1.0897449" y="-0.21104075" height="1.4220815">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.4069383" id="feGaussianBlur5326"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5366"
-       id="linearGradient187525"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.932238,0,0,0.932238,-3.2593393,65.407402)"
-       x1="530.68365"
-       y1="1452.9382"
-       x2="528.20874"
-       y2="1460.7163" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5366">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5368" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5370" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5348"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5332"
-       id="linearGradient187527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.932238,0,0,0.932238,27.805075,99.108584)"
-       x1="512.75"
-       y1="1407.6572"
-       x2="520.05798"
-       y2="1425.6685" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5332">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5334" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5336" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5330"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6219"
-       id="linearGradient187529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="14.5"
-       y1="1137.7454"
-       x2="175.5"
-       y2="1379.5989" />
-    <linearGradient
-       id="linearGradient6219">
-      <stop
-         style="stop-color:#b3b6ba;stop-opacity:1;"
-         offset="0"
-         id="stop6221" />
-      <stop
-         id="stop6223"
-         offset="0.32092565"
-         style="stop-color:#8f96a0;stop-opacity:1;" />
-      <stop
-         style="stop-color:#343c4a;stop-opacity:1;"
-         offset="1"
-         id="stop6225" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6211"
-       id="linearGradient187531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-108.71829"
-       y1="1244.37"
-       x2="14.5"
-       y2="1244.37" />
-    <linearGradient
-       id="linearGradient6211">
-      <stop
-         style="stop-color:#8e99aa;stop-opacity:1;"
-         offset="0"
-         id="stop6213" />
-      <stop
-         id="stop6215"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c7cacf;stop-opacity:1;"
-         offset="1"
-         id="stop6217" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313"
-       id="linearGradient187533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)"
-       x1="-39.281124"
-       y1="1443.3173"
-       x2="-73.271439"
-       y2="1333.3821" />
-    <linearGradient
-       id="linearGradient6313">
-      <stop
-         id="stop6315"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop6317" />
-      <stop
-         id="stop6319"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)"
-       x1="-39.281124"
-       y1="1443.3173"
-       x2="-73.271439"
-       y2="1333.3821" />
-    <linearGradient
-       id="linearGradient6592">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop6594" />
-      <stop
-         id="stop6596"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop6598" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313"
-       id="linearGradient187537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="55.912369"
-       y1="1052.4017"
-       x2="-108.71829"
-       y2="1193.9476" />
-    <linearGradient
-       id="linearGradient161021">
-      <stop
-         id="stop161023"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop161025" />
-      <stop
-         id="stop161027"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)"
-       x1="-64.791161"
-       y1="1351.6451"
-       x2="-63.195164"
-       y2="1351.6451" />
-    <linearGradient
-       id="linearGradient161030">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161032" />
-      <stop
-         id="stop161034"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161036" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6417"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)"
-       x1="-38.628212"
-       y1="1355.1805"
-       x2="-37.032211"
-       y2="1355.1805" />
-    <linearGradient
-       id="linearGradient161040">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161042" />
-      <stop
-         id="stop161044"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161046" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6421"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)"
-       x1="-89.772232"
-       y1="1347.5793"
-       x2="-7.2781744"
-       y2="1347.5793" />
-    <linearGradient
-       id="linearGradient161050">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161052" />
-      <stop
-         id="stop161054"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161056" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6451"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)"
-       x1="-89.418678"
-       y1="1351.6451"
-       x2="-7.2781744"
-       y2="1351.6451" />
-    <linearGradient
-       id="linearGradient161060">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161062" />
-      <stop
-         id="stop161064"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161066" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6453"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)"
-       x1="-89.772232"
-       y1="1355.5341"
-       x2="-7.2781744"
-       y2="1355.5341" />
-    <linearGradient
-       id="linearGradient161070">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161072" />
-      <stop
-         id="stop161074"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161076" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6455"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)"
-       x1="-89.418678"
-       y1="1359.5999"
-       x2="-7.2781744"
-       y2="1359.5999" />
-    <linearGradient
-       id="linearGradient161080">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161082" />
-      <stop
-         id="stop161084"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161086" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6457"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313"
-       id="linearGradient187551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-34.753441"
-       y1="1441.974"
-       x2="-78.221184"
-       y2="1375.1013" />
-    <linearGradient
-       id="linearGradient161090">
-      <stop
-         id="stop161092"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop161094" />
-      <stop
-         id="stop161096"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187553"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-34.753441"
-       y1="1441.974"
-       x2="-78.221184"
-       y2="1375.1013" />
-    <linearGradient
-       id="linearGradient161099">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161101" />
-      <stop
-         id="stop161103"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161105" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187555"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-64.791161"
-       y1="1379.5336"
-       x2="-63.195164"
-       y2="1379.5336" />
-    <linearGradient
-       id="linearGradient161108">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161110" />
-      <stop
-         id="stop161112"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161114" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6473"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187557"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-38.628212"
-       y1="1383.7273"
-       x2="-37.032211"
-       y2="1383.7273" />
-    <linearGradient
-       id="linearGradient161118">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161120" />
-      <stop
-         id="stop161122"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161124" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6475"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187559"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-89.772232"
-       y1="1375.8571"
-       x2="-7.2781744"
-       y2="1375.8571" />
-    <linearGradient
-       id="linearGradient161128">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161130" />
-      <stop
-         id="stop161132"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161134" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6477"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-89.418678"
-       y1="1379.9272"
-       x2="-7.2781744"
-       y2="1379.9272" />
-    <linearGradient
-       id="linearGradient161138">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161140" />
-      <stop
-         id="stop161142"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161144" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6479"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-89.772232"
-       y1="1383.8118"
-       x2="-7.2781744"
-       y2="1383.8118" />
-    <linearGradient
-       id="linearGradient161148">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161150" />
-      <stop
-         id="stop161152"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161154" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6481"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6592"
-       id="linearGradient187565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="-89.418678"
-       y1="1387.882"
-       x2="-7.2781744"
-       y2="1387.882" />
-    <linearGradient
-       id="linearGradient161158">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop161160" />
-      <stop
-         id="stop161162"
-         offset="0.45770872"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161164" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6483"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6712"
-       id="linearGradient187567"
-       gradientUnits="userSpaceOnUse"
-       x1="-59.341415"
-       y1="1282.7023"
-       x2="-37.178658"
-       y2="1282.7023" />
-    <linearGradient
-       id="linearGradient6712">
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0"
-         id="stop6716" />
-      <stop
-         id="stop6718"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6720"
-       id="linearGradient187569"
-       gradientUnits="userSpaceOnUse"
-       x1="-59.341415"
-       y1="1282.7023"
-       x2="-37.178658"
-       y2="1282.7023" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6720">
-      <stop
-         style="stop-color:#e4e8ef;stop-opacity:1;"
-         offset="0"
-         id="stop6722" />
-      <stop
-         style="stop-color:#e4e8ef;stop-opacity:0;"
-         offset="1"
-         id="stop6724" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6696"
-       id="radialGradient187571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0942637,0.02373313,-0.01127498,2.4044314,67.997122,-1800.2247)"
-       cx="-49.657665"
-       cy="1282.702"
-       fx="-49.657665"
-       fy="1282.702"
-       r="11.081379" />
-    <linearGradient
-       id="linearGradient6696">
-      <stop
-         style="stop-color:#d3d9e2;stop-opacity:1;"
-         offset="0"
-         id="stop6698" />
-      <stop
-         id="stop6700"
-         offset="0.52657253"
-         style="stop-color:#38485d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop6702" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient93113-7"
-       id="linearGradient187573"
-       gradientUnits="userSpaceOnUse"
-       x1="377.36343"
-       y1="1379.0061"
-       x2="345.10242"
-       y2="1382.9125" />
-    <linearGradient
-       id="linearGradient93113-7">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop93115" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop93117" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6538"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5756-4"
-       id="linearGradient187575"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="5.6297703"
-       y1="1183.1012"
-       x2="-71.114281"
-       y2="1175.2642" />
-    <linearGradient
-       id="linearGradient5756-4">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop5758-0" />
-      <stop
-         id="stop5764-9"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop5760-4" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6542"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6337"
-       id="linearGradient187577"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)"
-       x1="11.480935"
-       y1="1185.524"
-       x2="-80.107224"
-       y2="1201.5145" />
-    <linearGradient
-       id="linearGradient6337">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop6339" />
-      <stop
-         id="stop6341"
-         offset="0.35951823"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop6343" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6546"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6550"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4812"
-       id="linearGradient187579"
-       gradientUnits="userSpaceOnUse"
-       x1="390.17303"
-       y1="1381.9246"
-       x2="345.0076"
-       y2="1387.4393" />
-    <linearGradient
-       id="linearGradient4812">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4814" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop4816" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6554"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6558"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient93113-7"
-       id="linearGradient187581"
-       gradientUnits="userSpaceOnUse"
-       x1="394.32849"
-       y1="1371.3672"
-       x2="338.50247"
-       y2="1378.7202" />
-    <linearGradient
-       id="linearGradient161205">
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="0"
-         id="stop161207" />
-      <stop
-         style="stop-color:#232d3c;stop-opacity:1;"
-         offset="1"
-         id="stop161209" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6562"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5358"
-       id="linearGradient187583"
-       gradientUnits="userSpaceOnUse"
-       x1="350.51001"
-       y1="1382.8936"
-       x2="355.68015"
-       y2="1382.8361" />
-    <linearGradient
-       id="linearGradient5358">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop5360" />
-      <stop
-         id="stop5362"
-         offset="0.52657253"
-         style="stop-color:#c6d0dd;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="1"
-         id="stop5364" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6566"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6285"
-       id="linearGradient187585"
-       gradientUnits="userSpaceOnUse"
-       x1="352.49628"
-       y1="1392.4073"
-       x2="375.83511"
-       y2="1389.8796" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6285">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop6287" />
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:0;"
-         offset="1"
-         id="stop6289" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6660"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6712"
-       id="linearGradient187587"
-       gradientUnits="userSpaceOnUse"
-       x1="-59.341415"
-       y1="1282.7023"
-       x2="-37.178658"
-       y2="1282.7023" />
-    <linearGradient
-       id="linearGradient161224">
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0"
-         id="stop161226" />
-      <stop
-         id="stop161228"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6720"
-       id="linearGradient187589"
-       gradientUnits="userSpaceOnUse"
-       x1="-59.341415"
-       y1="1282.7023"
-       x2="-37.178658"
-       y2="1282.7023" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6696"
-       id="radialGradient187591"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0942637,0.02373313,-0.01127498,2.4044314,67.997122,-1800.2247)"
-       cx="-49.657665"
-       cy="1282.702"
-       fx="-49.657665"
-       fy="1282.702"
-       r="11.081379" />
-    <linearGradient
-       id="linearGradient161238">
-      <stop
-         style="stop-color:#d3d9e2;stop-opacity:1;"
-         offset="0"
-         id="stop161240" />
-      <stop
-         id="stop161242"
-         offset="0.52657253"
-         style="stop-color:#38485d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop161244" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5308"
-       x="-0.02874162"
-       width="1.0574832"
-       y="-0.1624866"
-       height="1.3249732">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.4980839"
-         id="feGaussianBlur5310" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5366" id="linearGradient187525" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.932238,0,0,0.932238,-3.2593393,65.407402)" x1="530.68365" y1="1452.9382" x2="528.20874" y2="1460.7163"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5366">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop5368"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop5370"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect5348" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5332" id="linearGradient187527" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.932238,0,0,0.932238,27.805075,99.108584)" x1="512.75" y1="1407.6572" x2="520.05798" y2="1425.6685"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5332">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop5334"/>
+      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop5336"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect5330" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6219" id="linearGradient187529" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="14.5" y1="1137.7454" x2="175.5" y2="1379.5989"/>
+    <linearGradient id="linearGradient6219">
+      <stop style="stop-color:#b3b6ba;stop-opacity:1;" offset="0" id="stop6221"/>
+      <stop id="stop6223" offset="0.32092565" style="stop-color:#8f96a0;stop-opacity:1;"/>
+      <stop style="stop-color:#343c4a;stop-opacity:1;" offset="1" id="stop6225"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6211" id="linearGradient187531" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-108.71829" y1="1244.37" x2="14.5" y2="1244.37"/>
+    <linearGradient id="linearGradient6211">
+      <stop style="stop-color:#8e99aa;stop-opacity:1;" offset="0" id="stop6213"/>
+      <stop id="stop6215" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#c7cacf;stop-opacity:1;" offset="1" id="stop6217"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6313" id="linearGradient187533" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)" x1="-39.281124" y1="1443.3173" x2="-73.271439" y2="1333.3821"/>
+    <linearGradient id="linearGradient6313">
+      <stop id="stop6315" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop6317"/>
+      <stop id="stop6319" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187535" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)" x1="-39.281124" y1="1443.3173" x2="-73.271439" y2="1333.3821"/>
+    <linearGradient id="linearGradient6592">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop6594"/>
+      <stop id="stop6596" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop6598"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6313" id="linearGradient187537" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="55.912369" y1="1052.4017" x2="-108.71829" y2="1193.9476"/>
+    <linearGradient id="linearGradient161021">
+      <stop id="stop161023" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop161025"/>
+      <stop id="stop161027" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187539" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)" x1="-64.791161" y1="1351.6451" x2="-63.195164" y2="1351.6451"/>
+    <linearGradient id="linearGradient161030">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161032"/>
+      <stop id="stop161034" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161036"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6417" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187541" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)" x1="-38.628212" y1="1355.1805" x2="-37.032211" y2="1355.1805"/>
+    <linearGradient id="linearGradient161040">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161042"/>
+      <stop id="stop161044" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161046"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6421" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187543" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)" x1="-89.772232" y1="1347.5793" x2="-7.2781744" y2="1347.5793"/>
+    <linearGradient id="linearGradient161050">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161052"/>
+      <stop id="stop161054" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161056"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6451" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187545" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)" x1="-89.418678" y1="1351.6451" x2="-7.2781744" y2="1351.6451"/>
+    <linearGradient id="linearGradient161060">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161062"/>
+      <stop id="stop161064" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161066"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6453" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187547" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)" x1="-89.772232" y1="1355.5341" x2="-7.2781744" y2="1355.5341"/>
+    <linearGradient id="linearGradient161070">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161072"/>
+      <stop id="stop161074" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161076"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6455" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187549" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1150.3923)" x1="-89.418678" y1="1359.5999" x2="-7.2781744" y2="1359.5999"/>
+    <linearGradient id="linearGradient161080">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161082"/>
+      <stop id="stop161084" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161086"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6457" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6313" id="linearGradient187551" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-34.753441" y1="1441.974" x2="-78.221184" y2="1375.1013"/>
+    <linearGradient id="linearGradient161090">
+      <stop id="stop161092" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop161094"/>
+      <stop id="stop161096" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187553" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-34.753441" y1="1441.974" x2="-78.221184" y2="1375.1013"/>
+    <linearGradient id="linearGradient161099">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161101"/>
+      <stop id="stop161103" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161105"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187555" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-64.791161" y1="1379.5336" x2="-63.195164" y2="1379.5336"/>
+    <linearGradient id="linearGradient161108">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161110"/>
+      <stop id="stop161112" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161114"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6473" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187557" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-38.628212" y1="1383.7273" x2="-37.032211" y2="1383.7273"/>
+    <linearGradient id="linearGradient161118">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161120"/>
+      <stop id="stop161122" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161124"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6475" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187559" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-89.772232" y1="1375.8571" x2="-7.2781744" y2="1375.8571"/>
+    <linearGradient id="linearGradient161128">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161130"/>
+      <stop id="stop161132" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161134"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6477" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187561" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-89.418678" y1="1379.9272" x2="-7.2781744" y2="1379.9272"/>
+    <linearGradient id="linearGradient161138">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161140"/>
+      <stop id="stop161142" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161144"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6479" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187563" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-89.772232" y1="1383.8118" x2="-7.2781744" y2="1383.8118"/>
+    <linearGradient id="linearGradient161148">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161150"/>
+      <stop id="stop161152" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161154"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6481" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6592" id="linearGradient187565" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="-89.418678" y1="1387.882" x2="-7.2781744" y2="1387.882"/>
+    <linearGradient id="linearGradient161158">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop161160"/>
+      <stop id="stop161162" offset="0.45770872" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161164"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6483" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6712" id="linearGradient187567" gradientUnits="userSpaceOnUse" x1="-59.341415" y1="1282.7023" x2="-37.178658" y2="1282.7023"/>
+    <linearGradient id="linearGradient6712">
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0" id="stop6716"/>
+      <stop id="stop6718" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6720" id="linearGradient187569" gradientUnits="userSpaceOnUse" x1="-59.341415" y1="1282.7023" x2="-37.178658" y2="1282.7023"/>
+    <linearGradient inkscape:collect="always" id="linearGradient6720">
+      <stop style="stop-color:#e4e8ef;stop-opacity:1;" offset="0" id="stop6722"/>
+      <stop style="stop-color:#e4e8ef;stop-opacity:0;" offset="1" id="stop6724"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6696" id="radialGradient187571" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.0942637,0.02373313,-0.01127498,2.4044314,67.997122,-1800.2247)" cx="-49.657665" cy="1282.702" fx="-49.657665" fy="1282.702" r="11.081379"/>
+    <linearGradient id="linearGradient6696">
+      <stop style="stop-color:#d3d9e2;stop-opacity:1;" offset="0" id="stop6698"/>
+      <stop id="stop6700" offset="0.52657253" style="stop-color:#38485d;stop-opacity:1;"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop6702"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient93113-7" id="linearGradient187573" gradientUnits="userSpaceOnUse" x1="377.36343" y1="1379.0061" x2="345.10242" y2="1382.9125"/>
+    <linearGradient id="linearGradient93113-7">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop93115"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop93117"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6538" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5756-4" id="linearGradient187575" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="5.6297703" y1="1183.1012" x2="-71.114281" y2="1175.2642"/>
+    <linearGradient id="linearGradient5756-4">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop5758-0"/>
+      <stop id="stop5764-9" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop5760-4"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6542" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6337" id="linearGradient187577" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,368.64836,1151.2651)" x1="11.480935" y1="1185.524" x2="-80.107224" y2="1201.5145"/>
+    <linearGradient id="linearGradient6337">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop6339"/>
+      <stop id="stop6341" offset="0.35951823" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop6343"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6546" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6550" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4812" id="linearGradient187579" gradientUnits="userSpaceOnUse" x1="390.17303" y1="1381.9246" x2="345.0076" y2="1387.4393"/>
+    <linearGradient id="linearGradient4812">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4814"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop4816"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6554" effect="spiro"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6558" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient93113-7" id="linearGradient187581" gradientUnits="userSpaceOnUse" x1="394.32849" y1="1371.3672" x2="338.50247" y2="1378.7202"/>
+    <linearGradient id="linearGradient161205">
+      <stop style="stop-color:#e6e6e6;stop-opacity:1;" offset="0" id="stop161207"/>
+      <stop style="stop-color:#232d3c;stop-opacity:1;" offset="1" id="stop161209"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6562" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5358" id="linearGradient187583" gradientUnits="userSpaceOnUse" x1="350.51001" y1="1382.8936" x2="355.68015" y2="1382.8361"/>
+    <linearGradient id="linearGradient5358">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop5360"/>
+      <stop id="stop5362" offset="0.52657253" style="stop-color:#c6d0dd;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1" offset="1" id="stop5364"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6566" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6285" id="linearGradient187585" gradientUnits="userSpaceOnUse" x1="352.49628" y1="1392.4073" x2="375.83511" y2="1389.8796"/>
+    <linearGradient inkscape:collect="always" id="linearGradient6285">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop6287"/>
+      <stop style="stop-color:#1a1a1a;stop-opacity:0;" offset="1" id="stop6289"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6660" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6712" id="linearGradient187587" gradientUnits="userSpaceOnUse" x1="-59.341415" y1="1282.7023" x2="-37.178658" y2="1282.7023"/>
+    <linearGradient id="linearGradient161224">
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0" id="stop161226"/>
+      <stop id="stop161228" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6720" id="linearGradient187589" gradientUnits="userSpaceOnUse" x1="-59.341415" y1="1282.7023" x2="-37.178658" y2="1282.7023"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6696" id="radialGradient187591" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.0942637,0.02373313,-0.01127498,2.4044314,67.997122,-1800.2247)" cx="-49.657665" cy="1282.702" fx="-49.657665" fy="1282.702" r="11.081379"/>
+    <linearGradient id="linearGradient161238">
+      <stop style="stop-color:#d3d9e2;stop-opacity:1;" offset="0" id="stop161240"/>
+      <stop id="stop161242" offset="0.52657253" style="stop-color:#38485d;stop-opacity:1;"/>
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="1" id="stop161244"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5308" x="-0.02874162" width="1.0574832" y="-0.1624866" height="1.3249732">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="2.4980839" id="feGaussianBlur5310"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5262"
-       id="radialGradient187593"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.17288162,0,1156.4252)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient5262">
-      <stop
-         style="stop-color:#9ca0a5;stop-opacity:1;"
-         offset="0"
-         id="stop5264" />
-      <stop
-         id="stop5266"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#303d53;stop-opacity:1;"
-         offset="1"
-         id="stop5268" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313"
-       id="radialGradient187595"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient161254">
-      <stop
-         id="stop161256"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop161258" />
-      <stop
-         id="stop161260"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5188"
-       id="linearGradient187597"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85239486,0,0,0.85239486,57.136448,187.49243)"
-       x1="476.92038"
-       y1="1419.8461"
-       x2="476.56497"
-       y2="1427.665" />
-    <linearGradient
-       id="linearGradient5188">
-      <stop
-         style="stop-color:#3b475a;stop-opacity:1;"
-         offset="0"
-         id="stop5190" />
-      <stop
-         id="stop5192"
-         offset="1"
-         style="stop-color:#c6d0dd;stop-opacity:0;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6294"
-       effect="spiro" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5200">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.12989622"
-         id="feGaussianBlur5202" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5262" id="radialGradient187593" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.17288162,0,1156.4252)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient5262">
+      <stop style="stop-color:#9ca0a5;stop-opacity:1;" offset="0" id="stop5264"/>
+      <stop id="stop5266" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#303d53;stop-opacity:1;" offset="1" id="stop5268"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6313" id="radialGradient187595" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.66995299,-0.03019752,0.01431704,0.17290432,225.73034,1178.878)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient161254">
+      <stop id="stop161256" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop161258"/>
+      <stop id="stop161260" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5188" id="linearGradient187597" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.85239486,0,0,0.85239486,57.136448,187.49243)" x1="476.92038" y1="1419.8461" x2="476.56497" y2="1427.665"/>
+    <linearGradient id="linearGradient5188">
+      <stop style="stop-color:#3b475a;stop-opacity:1;" offset="0" id="stop5190"/>
+      <stop id="stop5192" offset="1" style="stop-color:#c6d0dd;stop-opacity:0;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6294" effect="spiro"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter5200">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.12989622" id="feGaussianBlur5202"/>
     </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5262"
-       id="radialGradient187599"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.17288136,0,1156.4255)"
-       cx="744.58344"
-       cy="1398.1375"
-       fx="744.58344"
-       fy="1398.1375"
-       r="104.29825" />
-    <linearGradient
-       id="linearGradient161270">
-      <stop
-         style="stop-color:#9ca0a5;stop-opacity:1;"
-         offset="0"
-         id="stop161272" />
-      <stop
-         id="stop161274"
-         offset="0.32092565"
-         style="stop-color:#5d646e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#303d53;stop-opacity:1;"
-         offset="1"
-         id="stop161276" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6576"
-       id="radialGradient187601"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5866403,-0.09663684,0.22675106,3.7229321,-587.10574,-3751.5668)"
-       cx="462.20682"
-       cy="1394.1276"
-       fx="462.20682"
-       fy="1394.1276"
-       r="7.4508848" />
-    <linearGradient
-       id="linearGradient6576">
-      <stop
-         id="stop6578"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.52657253"
-         id="stop6580" />
-      <stop
-         id="stop6582"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6313"
-       id="radialGradient187603"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.400253,0.88612027,-0.23564026,0.37236026,136.09643,445.52997)"
-       cx="461.34637"
-       cy="1361.1923"
-       fx="461.34637"
-       fy="1361.1923"
-       r="39.277084" />
-    <linearGradient
-       id="linearGradient161284">
-      <stop
-         id="stop161286"
-         offset="0"
-         style="stop-color:#474a4e;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5d646e;stop-opacity:1;"
-         offset="0.32092565"
-         id="stop161288" />
-      <stop
-         id="stop161290"
-         offset="1"
-         style="stop-color:#0f131a;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6353"
-       id="linearGradient187605"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.53889,1111.3268)"
-       x1="666.09454"
-       y1="1080.6464"
-       x2="949.8515"
-       y2="1293.1321" />
-    <linearGradient
-       id="linearGradient6353">
-      <stop
-         id="stop6355"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop6357"
-         offset="1"
-         style="stop-color:#9a9a9d;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6247"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6345"
-       id="linearGradient187607"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.53889,1111.3268)"
-       x1="897.6601"
-       y1="1334.4812"
-       x2="586.69891"
-       y2="1369.8365" />
-    <linearGradient
-       id="linearGradient6345">
-      <stop
-         id="stop6347"
-         offset="0"
-         style="stop-color:#adb8c9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#939aa4;stop-opacity:1;"
-         offset="0.35951823"
-         id="stop6349" />
-      <stop
-         id="stop6351"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5020"
-       id="radialGradient187609"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)"
-       cx="874.3125"
-       cy="1324.2997"
-       fx="874.3125"
-       fy="1324.2997"
-       r="5.5625" />
-    <linearGradient
-       id="linearGradient5020">
-      <stop
-         id="stop5022"
-         offset="0"
-         style="stop-color:#3b475a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6d0dd;stop-opacity:1;"
-         offset="0.30869097"
-         id="stop5024" />
-      <stop
-         id="stop5026"
-         offset="1"
-         style="stop-color:#232d3c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4904"
-       id="linearGradient187611"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)"
-       x1="556.0246"
-       y1="1099.3903"
-       x2="968.59534"
-       y2="1330.6199" />
-    <linearGradient
-       id="linearGradient4904">
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0"
-         id="stop4906" />
-      <stop
-         id="stop4950"
-         offset="0.46410909"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-      <stop
-         id="stop4948"
-         offset="0.74663347"
-         style="stop-color:#c0f4fe;stop-opacity:1;" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="1"
-         id="stop4908" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6247-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4956"
-       id="linearGradient187613"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)"
-       x1="1154.8738"
-       y1="1067.8448"
-       x2="785.32184"
-       y2="1353.5291" />
-    <linearGradient
-       id="linearGradient4956">
-      <stop
-         id="stop4958"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:0" />
-      <stop
-         style="stop-color:#21aae3;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop4960" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop4962" />
-      <stop
-         id="stop4964"
-         offset="1"
-         style="stop-color:#21aae3;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5008"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4988"
-       id="linearGradient187615"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)"
-       x1="1093.0221"
-       y1="911.74304"
-       x2="653.22003"
-       y2="1274.0055" />
-    <linearGradient
-       id="linearGradient4988">
-      <stop
-         id="stop4990"
-         offset="0"
-         style="stop-color:#01397d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#01397d;stop-opacity:1;"
-         offset="0.46410909"
-         id="stop4992" />
-      <stop
-         style="stop-color:#c0f4fe;stop-opacity:1;"
-         offset="0.74663347"
-         id="stop4994" />
-      <stop
-         id="stop4996"
-         offset="1"
-         style="stop-color:#1a97cb;stop-opacity:0.40568627" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect5006"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5244"
-       id="linearGradient187617"
-       gradientUnits="userSpaceOnUse"
-       x1="485.21152"
-       y1="1282.5083"
-       x2="413.37195"
-       y2="1401.8518" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5244">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5246" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5248" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect6808"
-       effect="spiro" />
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter7271"
-       x="-0.042689584"
-       width="1.0853792"
-       y="-0.12341323"
-       height="1.2468265">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.606943"
-         id="feGaussianBlur7273" />
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5262" id="radialGradient187599" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.17288136,0,1156.4255)" cx="744.58344" cy="1398.1375" fx="744.58344" fy="1398.1375" r="104.29825"/>
+    <linearGradient id="linearGradient161270">
+      <stop style="stop-color:#9ca0a5;stop-opacity:1;" offset="0" id="stop161272"/>
+      <stop id="stop161274" offset="0.32092565" style="stop-color:#5d646e;stop-opacity:1;"/>
+      <stop style="stop-color:#303d53;stop-opacity:1;" offset="1" id="stop161276"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6576" id="radialGradient187601" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5866403,-0.09663684,0.22675106,3.7229321,-587.10574,-3751.5668)" cx="462.20682" cy="1394.1276" fx="462.20682" fy="1394.1276" r="7.4508848"/>
+    <linearGradient id="linearGradient6576">
+      <stop id="stop6578" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.52657253" id="stop6580"/>
+      <stop id="stop6582" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6313" id="radialGradient187603" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.400253,0.88612027,-0.23564026,0.37236026,136.09643,445.52997)" cx="461.34637" cy="1361.1923" fx="461.34637" fy="1361.1923" r="39.277084"/>
+    <linearGradient id="linearGradient161284">
+      <stop id="stop161286" offset="0" style="stop-color:#474a4e;stop-opacity:1;"/>
+      <stop style="stop-color:#5d646e;stop-opacity:1;" offset="0.32092565" id="stop161288"/>
+      <stop id="stop161290" offset="1" style="stop-color:#0f131a;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6353" id="linearGradient187605" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.53889,1111.3268)" x1="666.09454" y1="1080.6464" x2="949.8515" y2="1293.1321"/>
+    <linearGradient id="linearGradient6353">
+      <stop id="stop6355" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop id="stop6357" offset="1" style="stop-color:#9a9a9d;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6247" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient6345" id="linearGradient187607" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.53889,1111.3268)" x1="897.6601" y1="1334.4812" x2="586.69891" y2="1369.8365"/>
+    <linearGradient id="linearGradient6345">
+      <stop id="stop6347" offset="0" style="stop-color:#adb8c9;stop-opacity:1;"/>
+      <stop style="stop-color:#939aa4;stop-opacity:1;" offset="0.35951823" id="stop6349"/>
+      <stop id="stop6351" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5020" id="radialGradient187609" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.7548141,2.0229133,-0.76801234,3.0047477,357.13501,-4423.5452)" cx="874.3125" cy="1324.2997" fx="874.3125" fy="1324.2997" r="5.5625"/>
+    <linearGradient id="linearGradient5020">
+      <stop id="stop5022" offset="0" style="stop-color:#3b475a;stop-opacity:1;"/>
+      <stop style="stop-color:#c6d0dd;stop-opacity:1;" offset="0.30869097" id="stop5024"/>
+      <stop id="stop5026" offset="1" style="stop-color:#232d3c;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4904" id="linearGradient187611" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)" x1="556.0246" y1="1099.3903" x2="968.59534" y2="1330.6199"/>
+    <linearGradient id="linearGradient4904">
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0" id="stop4906"/>
+      <stop id="stop4950" offset="0.46410909" style="stop-color:#21aae3;stop-opacity:1;"/>
+      <stop id="stop4948" offset="0.74663347" style="stop-color:#c0f4fe;stop-opacity:1;"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="1" id="stop4908"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6247-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4956" id="linearGradient187613" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)" x1="1154.8738" y1="1067.8448" x2="785.32184" y2="1353.5291"/>
+    <linearGradient id="linearGradient4956">
+      <stop id="stop4958" offset="0" style="stop-color:#01397d;stop-opacity:0"/>
+      <stop style="stop-color:#21aae3;stop-opacity:1;" offset="0.46410909" id="stop4960"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop4962"/>
+      <stop id="stop4964" offset="1" style="stop-color:#21aae3;stop-opacity:1;"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5008" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4988" id="linearGradient187615" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.20571352,0,0,0.20571352,311.55521,1111.3228)" x1="1093.0221" y1="911.74304" x2="653.22003" y2="1274.0055"/>
+    <linearGradient id="linearGradient4988">
+      <stop id="stop4990" offset="0" style="stop-color:#01397d;stop-opacity:1;"/>
+      <stop style="stop-color:#01397d;stop-opacity:1;" offset="0.46410909" id="stop4992"/>
+      <stop style="stop-color:#c0f4fe;stop-opacity:1;" offset="0.74663347" id="stop4994"/>
+      <stop id="stop4996" offset="1" style="stop-color:#1a97cb;stop-opacity:0.40568627"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect5006" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5244" id="linearGradient187617" gradientUnits="userSpaceOnUse" x1="485.21152" y1="1282.5083" x2="413.37195" y2="1401.8518"/>
+    <linearGradient inkscape:collect="always" id="linearGradient5244">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop5246"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop5248"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect6808" effect="spiro"/>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter7271" x="-0.042689584" width="1.0853792" y="-0.12341323" height="1.2468265">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.606943" id="feGaussianBlur7273"/>
     </filter>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3858"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4628"
-       id="linearGradient187619"
-       gradientUnits="userSpaceOnUse"
-       x1="419.73904"
-       y1="1459.7787"
-       x2="523.4317"
-       y2="1426.0287" />
-    <linearGradient
-       id="linearGradient4628">
-      <stop
-         style="stop-color:#dde2e3;stop-opacity:1;"
-         offset="0"
-         id="stop4630" />
-      <stop
-         style="stop-color:#86989b;stop-opacity:1;"
-         offset="1"
-         id="stop4632" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6796"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6804"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187767"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4848">
-      <stop
-         style="stop-color:#373f41;stop-opacity:1;"
-         offset="0"
-         id="stop4850" />
-      <stop
-         style="stop-color:#373f41;stop-opacity:0;"
-         offset="1"
-         id="stop4852" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187621"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187623"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187625"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187627"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187629"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187631"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187633"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187635"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187637"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187639"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187641"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187643"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187645"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187647"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187649"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187651"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187653"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187655"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187657"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187659"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187661"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187663"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187665"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187667"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187669"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187671"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187673"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187675"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187677"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187679"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187681"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187683"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187685"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187687"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187689"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187691"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187693"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187695"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187697"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187699"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187701"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187703"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187705"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187707"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187709"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187711"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187713"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187715"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187717"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187719"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187721"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187723"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187725"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187727"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187729"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187731"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187733"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187735"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187737"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187739"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187741"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187743"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187745"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187747"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187749"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187751"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187753"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187755"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187757"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187759"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187761"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187763"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4848"
-       id="linearGradient187765"
-       gradientUnits="userSpaceOnUse"
-       x1="474.40436"
-       y1="1419.2762"
-       x2="513.44733"
-       y2="1471.5197" />
+    <inkscape:path-effect effect="spiro" id="path-effect3858" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4628" id="linearGradient187619" gradientUnits="userSpaceOnUse" x1="419.73904" y1="1459.7787" x2="523.4317" y2="1426.0287"/>
+    <linearGradient id="linearGradient4628">
+      <stop style="stop-color:#dde2e3;stop-opacity:1;" offset="0" id="stop4630"/>
+      <stop style="stop-color:#86989b;stop-opacity:1;" offset="1" id="stop4632"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect6796" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect6804" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187767" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4848">
+      <stop style="stop-color:#373f41;stop-opacity:1;" offset="0" id="stop4850"/>
+      <stop style="stop-color:#373f41;stop-opacity:0;" offset="1" id="stop4852"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187621" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187623" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187625" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187627" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187629" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187631" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187633" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187635" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187637" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187639" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187641" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187643" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187645" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187647" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187649" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187651" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187653" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187655" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187657" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187659" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187661" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187663" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187665" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187667" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187669" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187671" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187673" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187675" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187677" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187679" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187681" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187683" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187685" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187687" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187689" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187691" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187693" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187695" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187697" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187699" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187701" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187703" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187705" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187707" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187709" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187711" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187713" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187715" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187717" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187719" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187721" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187723" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187725" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187727" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187729" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187731" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187733" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187735" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187737" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187739" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187741" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187743" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187745" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187747" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187749" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187751" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187753" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187755" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187757" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187759" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187761" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187763" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4848" id="linearGradient187765" gradientUnits="userSpaceOnUse" x1="474.40436" y1="1419.2762" x2="513.44733" y2="1471.5197"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="159.00001"
-     inkscape:cy="-1.4344087"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="154"
-     inkscape:window-y="203"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata162073">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="159.00001" inkscape:cy="-1.4344087" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="154" inkscape:window-y="203" inkscape:window-maximized="0"/>
+  <metadata id="metadata162073">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-215.99999,-413.79659)">
-    <g
-       style="display:inline"
-       id="g6330"
-       transform="translate(-194.33431,-931.67042)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Workstation.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         sodipodi:nodetypes="ccccc"
-         transform="matrix(1.050736,0,0,1.412929,-33.355693,-581.6149)"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 540.70865,1416.4458 -33.49745,9.6827 -43.9612,-14.7663 20.75,-2.75 z"
-         inkscape:path-effect="#path-effect5322"
-         id="path5320"
-         d="m 540.70865,1416.4458 -33.49745,9.6827 -43.9612,-14.7663 20.75,-2.75 56.70865,7.8336"
-         style="opacity:0.48878922;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5324)" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 502.05238,1427.3075 -42.39427,-12.5246 42.29127,15.1201 z"
-         inkscape:path-effect="#path-effect5348"
-         id="path5346"
-         d="m 502.05238,1427.3075 -42.39427,-12.5246 42.29127,15.1201 0.103,-2.5955"
-         style="opacity:0.63677135;fill:url(#linearGradient187525);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 529.99417,1420.9134 -28.08781,9.3026 0.40786,-8.2736 z"
-         inkscape:path-effect="#path-effect5330"
-         id="path5328"
-         d="m 529.99417,1420.9134 -28.08781,9.3026 0.40786,-8.2736 27.67995,-1.029"
-         style="fill:url(#linearGradient187527);fill-opacity:1;stroke:none" />
-      <path
-         id="rect6381"
-         style="fill:url(#linearGradient187529);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 371.63121,1369.6049 c 11.223,3.2895 22.69346,6.6515 33.11988,9.7076 l 0,55.7548 -33.11988,9.8255 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         id="rect6399-5"
-         style="fill:url(#linearGradient187531);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 346.28354,1375.099 25.34767,-5.4941 0,75.2879 -25.34767,-5.9264 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         id="rect6403"
-         style="fill:url(#linearGradient187533);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient187535);stroke-width:0.32831877;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 351.32877,1425.6463 14.78369,1.9552 c 0.61918,0.082 1.11765,0.6506 1.11765,1.2752 l 0,2.0174 c 0,0.6246 -0.50017,1.3644 -1.11765,1.2705 l -14.78369,-2.2461 c -0.61917,-0.082 -1.11764,-0.6507 -1.11764,-1.2752 l 0,-2.0175 c 0,-0.6245 0.49847,-1.0615 1.11764,-0.9795 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csssscssc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         id="rect6407"
-         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 350.55326,1374.7605 16.5075,-3.5914 c 1.90957,-0.4155 3.44687,0.8234 3.44687,2.7776 l 0,27.9983 c 0,2.427 -0.80179,4.2846 -3.44687,4.2774 l -16.5075,-0.045 c -1.95422,-0.01 -3.44687,-1.0415 -3.44687,-2.9957 l 0,-24.1436 c 0,-2.8089 1.5373,-3.862 3.44687,-4.2774 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssss"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         sodipodi:nodetypes="sssssssss"
-         inkscape:connector-curvature="0"
-         d="m 351.09423,1375.4832 16.05998,-3.5089 c 1.85779,-0.4059 3.35342,0.8045 3.35342,2.7137 l 0,27.3553 c 0,2.3713 -0.78005,4.1862 -3.35342,4.1791 l -16.05998,-0.044 c -1.90125,-0.01 -3.35343,-1.0177 -3.35343,-2.9271 l 0,-23.589 c 0,-2.7443 1.49563,-3.7732 3.35343,-4.1791 z"
-         style="fill:url(#linearGradient187537);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path6534"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="opacity:0.57399101;fill:none;stroke:url(#linearGradient187539);stroke-width:0.32831877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 355.4841,1426.2985 0,4.2911"
-         id="path6415-7"
-         inkscape:path-effect="#path-effect6417"
-         inkscape:original-d="m 355.4841,1426.2985 0,4.2911"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 360.86617,1427.0258 0,4.2911"
-         inkscape:path-effect="#path-effect6421"
-         id="path6419-6"
-         d="m 360.86617,1427.0258 0,4.2911"
-         style="opacity:0.57399101;fill:none;stroke:url(#linearGradient187541);stroke-width:0.32831877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 350.28385,1426.5166 16.76444,2.182"
-         inkscape:path-effect="#path-effect6451"
-         id="path6443-1"
-         d="m 350.28385,1426.5166 16.76444,2.182"
-         style="fill:none;stroke:url(#linearGradient187543);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="fill:none;stroke:url(#linearGradient187545);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 350.35659,1427.3894 16.6917,2.2365"
-         id="path6445"
-         inkscape:path-effect="#path-effect6453"
-         inkscape:original-d="m 350.35659,1427.3894 16.6917,2.2365"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 350.28385,1428.1531 16.72807,2.3637"
-         inkscape:path-effect="#path-effect6455"
-         id="path6447"
-         d="m 350.28385,1428.1531 16.72807,2.3637"
-         style="fill:none;stroke:url(#linearGradient187547);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         sodipodi:nodetypes="cc"
-         style="fill:none;stroke:url(#linearGradient187549);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 350.35659,1429.0258 16.4735,2.4365"
-         id="path6449"
-         inkscape:path-effect="#path-effect6457"
-         inkscape:original-d="m 350.35659,1429.0258 16.4735,2.4365"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 351.32877,1432.1516 14.78369,2.3271 c 0.61918,0.097 1.11765,0.6787 1.11765,1.3033 l 0,2.6356 c 0,0.6246 -0.50293,1.0739 -1.11765,0.9514 l -14.78369,-2.9453 c -0.61917,-0.097 -1.11764,-0.6787 -1.11764,-1.3033 l 0,-2.0174 c 0,-0.6246 0.49847,-1.0489 1.11764,-0.9514 z"
-         style="fill:url(#linearGradient187551);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient187553);stroke-width:0.32831877;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path6459-8"
-         sodipodi:nodetypes="csssscssc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 355.4841,1432.9083 0,4.2911"
-         inkscape:path-effect="#path-effect6473"
-         id="path6461-9"
-         d="m 355.4841,1432.9083 0,4.2911"
-         style="opacity:0.57399101;fill:none;stroke:url(#linearGradient187555);stroke-width:0.32831877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="opacity:0.57399101;fill:none;stroke:url(#linearGradient187557);stroke-width:0.32831877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 360.86617,1433.7709 0,4.2912"
-         id="path6463-2"
-         inkscape:path-effect="#path-effect6475"
-         inkscape:original-d="m 360.86617,1433.7709 0,4.2912"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         sodipodi:nodetypes="cc"
-         style="fill:none;stroke:url(#linearGradient187559);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 350.28385,1432.9957 16.76444,2.6036"
-         id="path6465-7"
-         inkscape:path-effect="#path-effect6477"
-         inkscape:original-d="m 350.28385,1432.9957 16.76444,2.6036"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 350.35659,1433.8702 16.76442,2.6746"
-         inkscape:path-effect="#path-effect6479"
-         id="path6467-9"
-         d="m 350.35659,1433.8702 16.76442,2.6746"
-         style="fill:none;stroke:url(#linearGradient187561);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         sodipodi:nodetypes="cc"
-         style="fill:none;stroke:url(#linearGradient187563);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 350.28385,1434.6321 16.83716,2.7855"
-         id="path6469-5"
-         inkscape:path-effect="#path-effect6481"
-         inkscape:original-d="m 350.28385,1434.6321 16.83716,2.7855"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 350.35659,1435.5067 16.72806,2.9655"
-         inkscape:path-effect="#path-effect6483"
-         id="path6471-4"
-         d="m 350.35659,1435.5067 16.72806,2.9655"
-         style="fill:none;stroke:url(#linearGradient187565);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         transform="matrix(-0.26280472,6.5356424e-4,6.9865786e-4,0.28093705,502.74593,1034.5959)"
-         d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z"
-         sodipodi:ry="12.551146"
-         sodipodi:rx="10.783379"
-         sodipodi:cy="1282.7023"
-         sodipodi:cx="-48.260036"
-         id="path6487-3"
-         style="fill:url(#linearGradient187567);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient187569);stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient187571);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path6485-1"
-         sodipodi:cx="-48.260036"
-         sodipodi:cy="1282.7023"
-         sodipodi:rx="10.783379"
-         sodipodi:ry="12.551146"
-         d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z"
-         transform="matrix(-0.21547777,0.00646568,0.00622751,0.22371846,497.65366,1108.2707)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path6522"
-         sodipodi:cx="-48.260036"
-         sodipodi:cy="1282.7023"
-         sodipodi:rx="10.783379"
-         sodipodi:ry="12.551146"
-         d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z"
-         transform="matrix(-0.05129181,0.00153908,0.00148238,0.0532534,519.42763,1313.6318)" />
-      <path
-         transform="matrix(-0.02800337,8.4027482e-4,8.0932388e-4,0.02907432,521.39463,1344.6211)"
-         d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z"
-         sodipodi:ry="12.551146"
-         sodipodi:rx="10.783379"
-         sodipodi:cy="1282.7023"
-         sodipodi:cx="-48.260036"
-         id="path6491-0"
-         style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.05012109,0.00150395,0.00144855,0.0520379,517.0656,1315.1892)"
-         d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z"
-         sodipodi:ry="12.551146"
-         sodipodi:rx="10.783379"
-         sodipodi:cy="1282.7023"
-         sodipodi:cx="-48.260036"
-         id="path6524"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path6526"
-         sodipodi:cx="-48.260036"
-         sodipodi:cy="1282.7023"
-         sodipodi:rx="10.783379"
-         sodipodi:ry="12.551146"
-         d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z"
-         transform="matrix(-0.02736419,8.2109638e-4,7.9085045e-4,0.02841071,518.9877,1345.4713)" />
-      <path
-         id="rect6528"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.12260526;stroke-miterlimit:4;stroke-opacity:1"
-         d="m 362.50262,1401.7155 c 0.22161,0 0.40002,0.1783 0.40002,0.4 l 0,1.9637 c 0,0.2216 -0.17841,0.4 -0.40002,0.4 -0.22161,0 -0.40002,-0.1784 -0.40002,-0.4 l 0,-1.9637 c 0,-0.2217 0.17841,-0.4 0.40002,-0.4 z"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         d="m 364.17543,1401.7155 c 0.2216,0 0.40001,0.1783 0.40001,0.4 l 0,1.9637 c 0,0.2216 -0.17841,0.4 -0.40001,0.4 -0.22162,0 -0.40002,-0.1784 -0.40002,-0.4 l 0,-1.9637 c 0,-0.2217 0.1784,-0.4 0.40002,-0.4 z"
-         style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.12260526;stroke-miterlimit:4;stroke-opacity:1"
-         id="path6532"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="fill:url(#linearGradient187573);fill-opacity:1;stroke:#000000;stroke-width:0.4816272;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 348.28376,1378.0053 20.65552,-3.9275 0.0727,7.7822 -20.72825,2.7638 3e-5,-6.6185"
-         id="path6536"
-         inkscape:path-effect="#path-effect6538"
-         inkscape:original-d="m 348.28376,1378.0053 20.65552,-3.9275 0.0727,7.7822 -20.72825,2.7638 z"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="fill:url(#linearGradient187575);fill-opacity:1;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 354.24768,1390.8059 0,3.8547 14.54614,-1.0182 0,-4.5093 -14.54614,1.6728"
-         id="path6540"
-         inkscape:path-effect="#path-effect6542"
-         inkscape:original-d="m 354.24768,1390.8059 0,3.8547 14.54614,-1.0182 0,-4.5093 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 354.24768,1395.3151 0,4.1458 14.54614,-0.5092 0,-4.5093 z"
-         inkscape:path-effect="#path-effect6546"
-         id="path6544"
-         d="m 354.24768,1395.3151 0,4.1458 14.54614,-0.5092 0,-4.5093 -14.54614,0.8727"
-         style="fill:url(#linearGradient187577);fill-opacity:1;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="ccccc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 369.66659,1400.1154 -21.23737,0.7274"
-         id="path6548"
-         inkscape:path-effect="#path-effect6550"
-         inkscape:original-d="m 369.66659,1400.1154 -21.23737,0.7274"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 348.28376,1385.4238 0,5.5275 20.51006,-2.4001 0,-5.8911 z"
-         inkscape:path-effect="#path-effect6554"
-         id="path6552"
-         d="m 348.28376,1385.4238 0,5.5275 20.51006,-2.4001 0,-5.8911 -20.51006,2.7637"
-         style="fill:url(#linearGradient187579);fill-opacity:1;stroke:#000000;stroke-width:0.4816272;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="ccccc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="fill:#000000;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 368.94062,1374.7455 -0.0143,-0.6676 -20.64093,3.9677 0.0142,6.5694 0.50856,-0.07 -0.0152,-6.0305 20.11004,-3.7456"
-         id="path6556"
-         inkscape:path-effect="#path-effect6558"
-         inkscape:original-d="m 368.94062,1374.7455 -0.0143,-0.6676 -20.64093,3.9677 0.0142,6.5694 0.50856,-0.07 -0.0152,-6.0305 20.11004,-3.7456"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="fill:url(#linearGradient187581);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.29780003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 349.73837,1381.4236 0,-2.2183 18.07359,-3.4183 0,2.6183 -18.07359,3.0183"
-         id="path6560"
-         inkscape:path-effect="#path-effect6562"
-         inkscape:original-d="m 349.73837,1381.4236 0,-2.2183 18.07359,-3.4183 0,2.6183 z"
-         inkscape:connector-curvature="0"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         style="fill:url(#linearGradient187583);fill-opacity:1;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 349.75465,1382.5301 0,1.1092 2.87286,-0.4001 0,-1.1455 -2.87286,0.4364"
-         id="path6564"
-         inkscape:path-effect="#path-effect6566"
-         inkscape:original-d="m 349.75465,1382.5301 0,1.1092 2.87286,-0.4001 0,-1.1455 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 356.40263,1392.4766 0,-0.9608 10.01133,-1.0162 0,1.1341 z"
-         inkscape:path-effect="#path-effect6660"
-         id="path6658"
-         d="m 356.40263,1392.4766 0,-0.9608 10.01133,-1.0162 0,1.1341 -10.01133,0.8429"
-         style="fill:url(#linearGradient187585);fill-opacity:1;stroke:none"
-         transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient187587);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient187589);stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path6757"
-         sodipodi:cx="-48.260036"
-         sodipodi:cy="1282.7023"
-         sodipodi:rx="10.783379"
-         sodipodi:ry="12.551146"
-         d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z"
-         transform="matrix(-0.11146514,2.7719996e-4,2.9632692e-4,0.11915574,510.56564,1235.5484)" />
-      <path
-         transform="matrix(-0.09139206,0.00274233,0.00264132,0.09488723,508.40583,1266.7966)"
-         d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z"
-         sodipodi:ry="12.551146"
-         sodipodi:rx="10.783379"
-         sodipodi:cy="1282.7023"
-         sodipodi:cx="-48.260036"
-         id="path6759"
-         style="fill:url(#radialGradient187591);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <g
-         transform="matrix(1.08797,0,0,1.08797,-48.169452,-95.640446)"
-         id="g4675">
-        <path
-           inkscape:connector-curvature="0"
-           id="path5270"
-           transform="matrix(0.21082311,-0.00966172,0,0.26575403,304.62653,1034.3155)"
-           style="opacity:0.68609864;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5308)"
-           d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-           style="fill:url(#radialGradient187593);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="matrix(0.20780553,-0.00956961,0,0.26322031,307.21707,1037.6591)"
-           id="path6278" />
-        <path
-           transform="matrix(0.1980134,-0.00870404,0,0.23941226,314.3596,1069.5719)"
-           d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-           sodipodi:ry="18.031223"
-           sodipodi:rx="104.29825"
-           sodipodi:cy="1398.1375"
-           sodipodi:cx="744.58344"
-           id="path6280"
-           style="fill:url(#radialGradient187595);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:type="arc" />
-        <path
-           sodipodi:nodetypes="cscccscc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 454.79268,1401.7435 c 0.32318,-0.7586 0.0627,-0.9297 6.2e-4,-1.6682 -0.0622,-0.7385 0.25383,-1.5451 -0.17296,-2.2502 l 14.53854,-0.8732 c -0.26236,1.9711 -0.58448,2.7627 -0.86471,4.5641 -2.23925,0.3472 -4.46092,0.4766 -6.72533,0.5472 -2.26442,0.071 -4.46873,0.083 -6.77611,-0.3197 z"
-           inkscape:path-effect="#path-effect6294"
-           id="path6292"
-           d="m 454.79268,1401.7435 c 0.0184,-0.5559 0.0186,-1.1123 6.2e-4,-1.6682 -0.0244,-0.7521 -0.0821,-1.5032 -0.17296,-2.2502 l 14.53854,-0.8732 -0.86471,4.5641 c -2.22704,0.3256 -4.47494,0.5085 -6.72533,0.5472 -2.26244,0.039 -4.52738,-0.068 -6.77611,-0.3197 l -5e-5,0"
-           style="fill:url(#linearGradient187597);fill-opacity:1;stroke:none;filter:url(#filter5200)" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient187599);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path6282"
-           sodipodi:cx="744.58344"
-           sodipodi:cy="1398.1375"
-           sodipodi:rx="104.29825"
-           sodipodi:ry="18.031223"
-           d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"
-           transform="matrix(0.08535972,-0.00450311,0,0.0855003,398.37302,1280.5771)" />
-        <path
-           style="fill:url(#radialGradient187601);fill-opacity:1;stroke:none"
-           d="m 468.88402,1390.3837 -14.3228,0.945 c 0.13455,1.4072 0.33944,4.3508 -0.0193,5.4257 -0.0492,0.065 -0.0771,0.1286 -0.0771,0.1928 0,0 -5e-5,0.01 0,0.01 0.0182,0.7323 3.34727,1.1429 7.45069,0.9193 4.11472,-0.2244 7.45068,-0.9996 7.45068,-1.7358 0,-0.01 8.5e-4,-0.022 0,-0.032 -8.2e-4,-0.013 -0.005,-0.025 -0.007,-0.038 -0.5902,-1.9111 -0.69061,-4.1629 -0.47571,-5.6828 z"
-           id="path6284"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccscsscccc" />
-        <path
-           sodipodi:nodetypes="ssssccsss"
-           inkscape:connector-curvature="0"
-           d="m 423.32844,1330.2636 71.84537,5.7095 c 0.72298,0.057 1.26267,0.5854 1.30915,1.3091 l 3.05468,47.5659 c 0.0465,0.7238 -0.74078,1.1782 -1.30915,1.3092 -22.95377,5.5659 -48.38487,6.2191 -73.02164,5.8911 -0.72293,0.059 -1.27894,-0.5845 -1.30915,-1.3091 l -2.46623,-59.1734 c -0.0302,-0.7246 0.65071,-1.4013 1.89697,-1.3023 z"
-           style="fill:#8e959f;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path6276" />
-        <path
-           id="rect6253"
-           style="fill:url(#radialGradient187603);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.32914165;stroke-miterlimit:4;stroke-opacity:1"
-           d="m 423.54419,1330.4303 72.5489,5.3821 c 0.72328,0.054 1.26267,0.5854 1.30915,1.3092 l 3.05468,47.5658 c 0.0465,0.7238 -0.74078,1.1781 -1.30915,1.3092 -22.95376,5.5658 -48.38487,6.2192 -73.02164,5.8912 -0.72292,0.058 -1.27736,-0.5846 -1.30915,-1.3092 l -2.58194,-58.8392 c -0.0318,-0.7245 0.58587,-1.3628 1.30915,-1.3091 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ssssccsss" />
-        <path
-           style="fill:url(#linearGradient187605);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 425.92067,1334.0668 69.77239,4.8003 2.6183,41.7474 -69.67602,4.6548 -2.71467,-51.2025"
-           id="path6245"
-           inkscape:path-effect="#path-effect6247"
-           inkscape:original-d="m 425.92067,1334.0668 69.77239,4.8003 2.6183,41.7474 -69.67602,4.6548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:url(#linearGradient187607);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 424.92361,1390.4625 c 0.0317,0.7245 0.5865,1.3697 1.30697,1.3114 24.55302,0.328 49.89789,-0.3227 72.77363,-5.8885 0.56644,-0.1311 1.34688,-0.5877 1.30056,-1.3115 l -0.11532,-1.8128 c -0.23506,0.4251 -0.76842,0.7006 -1.18524,0.7971 -22.87574,5.5658 -48.22061,6.2166 -72.77363,5.8886 -1.32,-0.012 -1.29964,-0.1096 -1.30697,1.0157 z"
-           id="path6269"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient187609);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
-           id="path6274"
-           sodipodi:cx="874.3125"
-           sodipodi:cy="1324.2997"
-           sodipodi:rx="5.0625"
-           sodipodi:ry="6.5625"
-           d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z"
-           transform="matrix(0.20134232,0.04967248,-0.02204121,0.19072995,344.29271,1087.5475)" />
-        <path
-           style="fill:url(#linearGradient187611);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025"
-           id="path6245-4"
-           inkscape:path-effect="#path-effect6247-9"
-           inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z"
-           inkscape:path-effect="#path-effect5008"
-           id="path4952"
-           d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025"
-           style="opacity:0.27354264;fill:url(#linearGradient187613);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           style="opacity:0.63677135;fill:url(#linearGradient187615);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025"
-           id="path4974"
-           inkscape:path-effect="#path-effect5006"
-           inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ssccsss"
-           inkscape:connector-curvature="0"
-           d="m 423.54419,1330.4303 72.5489,5.3821 c 0.72328,0.054 2.01309,1.1345 1.30915,1.3092 -50.55136,-3.2968 -57.54122,54.12 -71.27611,54.7662 -0.72292,0.058 -1.27736,-0.5846 -1.30915,-1.3092 l -2.58194,-58.8392 c -0.0318,-0.7245 0.58587,-1.3628 1.30915,-1.3091 z"
-           style="opacity:0.24215249;fill:url(#linearGradient187617);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path5230" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-215.99999,-413.79659)">
+    <g style="display:inline" id="g6330" transform="translate(-194.33431,-931.67042)">
+      <path sodipodi:nodetypes="ccccc" transform="matrix(1.050736,0,0,1.412929,-33.355693,-581.6149)" inkscape:connector-curvature="0" inkscape:original-d="m 540.70865,1416.4458 -33.49745,9.6827 -43.9612,-14.7663 20.75,-2.75 z" inkscape:path-effect="#path-effect5322" id="path5320" d="m 540.70865,1416.4458 -33.49745,9.6827 -43.9612,-14.7663 20.75,-2.75 56.70865,7.8336" style="opacity:0.48878922;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5324)"/>
+      <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" inkscape:original-d="m 502.05238,1427.3075 -42.39427,-12.5246 42.29127,15.1201 z" inkscape:path-effect="#path-effect5348" id="path5346" d="m 502.05238,1427.3075 -42.39427,-12.5246 42.29127,15.1201 0.103,-2.5955" style="opacity:0.63677135;fill:url(#linearGradient187525);fill-opacity:1;stroke:none"/>
+      <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" inkscape:original-d="m 529.99417,1420.9134 -28.08781,9.3026 0.40786,-8.2736 z" inkscape:path-effect="#path-effect5330" id="path5328" d="m 529.99417,1420.9134 -28.08781,9.3026 0.40786,-8.2736 27.67995,-1.029" style="fill:url(#linearGradient187527);fill-opacity:1;stroke:none"/>
+      <path id="rect6381" style="fill:url(#linearGradient187529);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 371.63121,1369.6049 c 11.223,3.2895 22.69346,6.6515 33.11988,9.7076 l 0,55.7548 -33.11988,9.8255 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path id="rect6399-5" style="fill:url(#linearGradient187531);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 346.28354,1375.099 25.34767,-5.4941 0,75.2879 -25.34767,-5.9264 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path id="rect6403" style="fill:url(#linearGradient187533);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient187535);stroke-width:0.32831877;stroke-miterlimit:4;stroke-dasharray:none" d="m 351.32877,1425.6463 14.78369,1.9552 c 0.61918,0.082 1.11765,0.6506 1.11765,1.2752 l 0,2.0174 c 0,0.6246 -0.50017,1.3644 -1.11765,1.2705 l -14.78369,-2.2461 c -0.61917,-0.082 -1.11764,-0.6507 -1.11764,-1.2752 l 0,-2.0175 c 0,-0.6245 0.49847,-1.0615 1.11764,-0.9795 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssscssc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path id="rect6407" style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 350.55326,1374.7605 16.5075,-3.5914 c 1.90957,-0.4155 3.44687,0.8234 3.44687,2.7776 l 0,27.9983 c 0,2.427 -0.80179,4.2846 -3.44687,4.2774 l -16.5075,-0.045 c -1.95422,-0.01 -3.44687,-1.0415 -3.44687,-2.9957 l 0,-24.1436 c 0,-2.8089 1.5373,-3.862 3.44687,-4.2774 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 351.09423,1375.4832 16.05998,-3.5089 c 1.85779,-0.4059 3.35342,0.8045 3.35342,2.7137 l 0,27.3553 c 0,2.3713 -0.78005,4.1862 -3.35342,4.1791 l -16.05998,-0.044 c -1.90125,-0.01 -3.35343,-1.0177 -3.35343,-2.9271 l 0,-23.589 c 0,-2.7443 1.49563,-3.7732 3.35343,-4.1791 z" style="fill:url(#linearGradient187537);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6534" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="opacity:0.57399101;fill:none;stroke:url(#linearGradient187539);stroke-width:0.32831877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 355.4841,1426.2985 0,4.2911" id="path6415-7" inkscape:path-effect="#path-effect6417" inkscape:original-d="m 355.4841,1426.2985 0,4.2911" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 360.86617,1427.0258 0,4.2911" inkscape:path-effect="#path-effect6421" id="path6419-6" d="m 360.86617,1427.0258 0,4.2911" style="opacity:0.57399101;fill:none;stroke:url(#linearGradient187541);stroke-width:0.32831877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 350.28385,1426.5166 16.76444,2.182" inkscape:path-effect="#path-effect6451" id="path6443-1" d="m 350.28385,1426.5166 16.76444,2.182" style="fill:none;stroke:url(#linearGradient187543);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="cc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="fill:none;stroke:url(#linearGradient187545);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 350.35659,1427.3894 16.6917,2.2365" id="path6445" inkscape:path-effect="#path-effect6453" inkscape:original-d="m 350.35659,1427.3894 16.6917,2.2365" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 350.28385,1428.1531 16.72807,2.3637" inkscape:path-effect="#path-effect6455" id="path6447" d="m 350.28385,1428.1531 16.72807,2.3637" style="fill:none;stroke:url(#linearGradient187547);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="cc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path sodipodi:nodetypes="cc" style="fill:none;stroke:url(#linearGradient187549);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 350.35659,1429.0258 16.4735,2.4365" id="path6449" inkscape:path-effect="#path-effect6457" inkscape:original-d="m 350.35659,1429.0258 16.4735,2.4365" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" d="m 351.32877,1432.1516 14.78369,2.3271 c 0.61918,0.097 1.11765,0.6787 1.11765,1.3033 l 0,2.6356 c 0,0.6246 -0.50293,1.0739 -1.11765,0.9514 l -14.78369,-2.9453 c -0.61917,-0.097 -1.11764,-0.6787 -1.11764,-1.3033 l 0,-2.0174 c 0,-0.6246 0.49847,-1.0489 1.11764,-0.9514 z" style="fill:url(#linearGradient187551);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient187553);stroke-width:0.32831877;stroke-miterlimit:4;stroke-dasharray:none" id="path6459-8" sodipodi:nodetypes="csssscssc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 355.4841,1432.9083 0,4.2911" inkscape:path-effect="#path-effect6473" id="path6461-9" d="m 355.4841,1432.9083 0,4.2911" style="opacity:0.57399101;fill:none;stroke:url(#linearGradient187555);stroke-width:0.32831877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="opacity:0.57399101;fill:none;stroke:url(#linearGradient187557);stroke-width:0.32831877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 360.86617,1433.7709 0,4.2912" id="path6463-2" inkscape:path-effect="#path-effect6475" inkscape:original-d="m 360.86617,1433.7709 0,4.2912" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path sodipodi:nodetypes="cc" style="fill:none;stroke:url(#linearGradient187559);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 350.28385,1432.9957 16.76444,2.6036" id="path6465-7" inkscape:path-effect="#path-effect6477" inkscape:original-d="m 350.28385,1432.9957 16.76444,2.6036" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 350.35659,1433.8702 16.76442,2.6746" inkscape:path-effect="#path-effect6479" id="path6467-9" d="m 350.35659,1433.8702 16.76442,2.6746" style="fill:none;stroke:url(#linearGradient187561);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path sodipodi:nodetypes="cc" style="fill:none;stroke:url(#linearGradient187563);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 350.28385,1434.6321 16.83716,2.7855" id="path6469-5" inkscape:path-effect="#path-effect6481" inkscape:original-d="m 350.28385,1434.6321 16.83716,2.7855" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 350.35659,1435.5067 16.72806,2.9655" inkscape:path-effect="#path-effect6483" id="path6471-4" d="m 350.35659,1435.5067 16.72806,2.9655" style="fill:none;stroke:url(#linearGradient187565);stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="cc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path transform="matrix(-0.26280472,6.5356424e-4,6.9865786e-4,0.28093705,502.74593,1034.5959)" d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z" sodipodi:ry="12.551146" sodipodi:rx="10.783379" sodipodi:cy="1282.7023" sodipodi:cx="-48.260036" id="path6487-3" style="fill:url(#linearGradient187567);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient187569);stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#radialGradient187571);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path6485-1" sodipodi:cx="-48.260036" sodipodi:cy="1282.7023" sodipodi:rx="10.783379" sodipodi:ry="12.551146" d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z" transform="matrix(-0.21547777,0.00646568,0.00622751,0.22371846,497.65366,1108.2707)"/>
+      <path sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path6522" sodipodi:cx="-48.260036" sodipodi:cy="1282.7023" sodipodi:rx="10.783379" sodipodi:ry="12.551146" d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z" transform="matrix(-0.05129181,0.00153908,0.00148238,0.0532534,519.42763,1313.6318)"/>
+      <path transform="matrix(-0.02800337,8.4027482e-4,8.0932388e-4,0.02907432,521.39463,1344.6211)" d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z" sodipodi:ry="12.551146" sodipodi:rx="10.783379" sodipodi:cy="1282.7023" sodipodi:cx="-48.260036" id="path6491-0" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <path transform="matrix(-0.05012109,0.00150395,0.00144855,0.0520379,517.0656,1315.1892)" d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z" sodipodi:ry="12.551146" sodipodi:rx="10.783379" sodipodi:cy="1282.7023" sodipodi:cx="-48.260036" id="path6524" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path6526" sodipodi:cx="-48.260036" sodipodi:cy="1282.7023" sodipodi:rx="10.783379" sodipodi:ry="12.551146" d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z" transform="matrix(-0.02736419,8.2109638e-4,7.9085045e-4,0.02841071,518.9877,1345.4713)"/>
+      <path id="rect6528" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.12260526;stroke-miterlimit:4;stroke-opacity:1" d="m 362.50262,1401.7155 c 0.22161,0 0.40002,0.1783 0.40002,0.4 l 0,1.9637 c 0,0.2216 -0.17841,0.4 -0.40002,0.4 -0.22161,0 -0.40002,-0.1784 -0.40002,-0.4 l 0,-1.9637 c 0,-0.2217 0.17841,-0.4 0.40002,-0.4 z" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path d="m 364.17543,1401.7155 c 0.2216,0 0.40001,0.1783 0.40001,0.4 l 0,1.9637 c 0,0.2216 -0.17841,0.4 -0.40001,0.4 -0.22162,0 -0.40002,-0.1784 -0.40002,-0.4 l 0,-1.9637 c 0,-0.2217 0.1784,-0.4 0.40002,-0.4 z" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.12260526;stroke-miterlimit:4;stroke-opacity:1" id="path6532" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="fill:url(#linearGradient187573);fill-opacity:1;stroke:#000000;stroke-width:0.4816272;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 348.28376,1378.0053 20.65552,-3.9275 0.0727,7.7822 -20.72825,2.7638 3e-5,-6.6185" id="path6536" inkscape:path-effect="#path-effect6538" inkscape:original-d="m 348.28376,1378.0053 20.65552,-3.9275 0.0727,7.7822 -20.72825,2.7638 z" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="fill:url(#linearGradient187575);fill-opacity:1;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 354.24768,1390.8059 0,3.8547 14.54614,-1.0182 0,-4.5093 -14.54614,1.6728" id="path6540" inkscape:path-effect="#path-effect6542" inkscape:original-d="m 354.24768,1390.8059 0,3.8547 14.54614,-1.0182 0,-4.5093 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 354.24768,1395.3151 0,4.1458 14.54614,-0.5092 0,-4.5093 z" inkscape:path-effect="#path-effect6546" id="path6544" d="m 354.24768,1395.3151 0,4.1458 14.54614,-0.5092 0,-4.5093 -14.54614,0.8727" style="fill:url(#linearGradient187577);fill-opacity:1;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" sodipodi:nodetypes="ccccc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="fill:none;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 369.66659,1400.1154 -21.23737,0.7274" id="path6548" inkscape:path-effect="#path-effect6550" inkscape:original-d="m 369.66659,1400.1154 -21.23737,0.7274" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 348.28376,1385.4238 0,5.5275 20.51006,-2.4001 0,-5.8911 z" inkscape:path-effect="#path-effect6554" id="path6552" d="m 348.28376,1385.4238 0,5.5275 20.51006,-2.4001 0,-5.8911 -20.51006,2.7637" style="fill:url(#linearGradient187579);fill-opacity:1;stroke:#000000;stroke-width:0.4816272;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="ccccc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="fill:#000000;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 368.94062,1374.7455 -0.0143,-0.6676 -20.64093,3.9677 0.0142,6.5694 0.50856,-0.07 -0.0152,-6.0305 20.11004,-3.7456" id="path6556" inkscape:path-effect="#path-effect6558" inkscape:original-d="m 368.94062,1374.7455 -0.0143,-0.6676 -20.64093,3.9677 0.0142,6.5694 0.50856,-0.07 -0.0152,-6.0305 20.11004,-3.7456" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="fill:url(#linearGradient187581);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.29780003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 349.73837,1381.4236 0,-2.2183 18.07359,-3.4183 0,2.6183 -18.07359,3.0183" id="path6560" inkscape:path-effect="#path-effect6562" inkscape:original-d="m 349.73837,1381.4236 0,-2.2183 18.07359,-3.4183 0,2.6183 z" inkscape:connector-curvature="0" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path style="fill:url(#linearGradient187583);fill-opacity:1;stroke:#000000;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 349.75465,1382.5301 0,1.1092 2.87286,-0.4001 0,-1.1455 -2.87286,0.4364" id="path6564" inkscape:path-effect="#path-effect6566" inkscape:original-d="m 349.75465,1382.5301 0,1.1092 2.87286,-0.4001 0,-1.1455 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path inkscape:connector-curvature="0" inkscape:original-d="m 356.40263,1392.4766 0,-0.9608 10.01133,-1.0162 0,1.1341 z" inkscape:path-effect="#path-effect6660" id="path6658" d="m 356.40263,1392.4766 0,-0.9608 10.01133,-1.0162 0,1.1341 -10.01133,0.8429" style="fill:url(#linearGradient187585);fill-opacity:1;stroke:none" transform="matrix(-1.0879784,0,0,1.0879784,906.40982,-144.63354)"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient187587);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient187589);stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path6757" sodipodi:cx="-48.260036" sodipodi:cy="1282.7023" sodipodi:rx="10.783379" sodipodi:ry="12.551146" d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z" transform="matrix(-0.11146514,2.7719996e-4,2.9632692e-4,0.11915574,510.56564,1235.5484)"/>
+      <path transform="matrix(-0.09139206,0.00274233,0.00264132,0.09488723,508.40583,1266.7966)" d="m -37.476658,1282.7023 c 0,6.9318 -4.827883,12.5511 -10.783378,12.5511 -5.955496,0 -10.783379,-5.6193 -10.783379,-12.5511 0,-6.9318 4.827883,-12.5512 10.783379,-12.5512 5.955495,0 10.783378,5.6194 10.783378,12.5512 z" sodipodi:ry="12.551146" sodipodi:rx="10.783379" sodipodi:cy="1282.7023" sodipodi:cx="-48.260036" id="path6759" style="fill:url(#radialGradient187591);fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:0.59600002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <g transform="matrix(1.08797,0,0,1.08797,-48.169452,-95.640446)" id="g4675">
+        <path inkscape:connector-curvature="0" id="path5270" transform="matrix(0.21082311,-0.00966172,0,0.26575403,304.62653,1034.3155)" style="opacity:0.68609864;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter5308)" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z"/>
+        <path inkscape:connector-curvature="0" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" style="fill:url(#radialGradient187593);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.20780553,-0.00956961,0,0.26322031,307.21707,1037.6591)" id="path6278"/>
+        <path transform="matrix(0.1980134,-0.00870404,0,0.23941226,314.3596,1069.5719)" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" sodipodi:ry="18.031223" sodipodi:rx="104.29825" sodipodi:cy="1398.1375" sodipodi:cx="744.58344" id="path6280" style="fill:url(#radialGradient187595);fill-opacity:1;fill-rule:nonzero;stroke:none" sodipodi:type="arc"/>
+        <path sodipodi:nodetypes="cscccscc" inkscape:connector-curvature="0" inkscape:original-d="m 454.79268,1401.7435 c 0.32318,-0.7586 0.0627,-0.9297 6.2e-4,-1.6682 -0.0622,-0.7385 0.25383,-1.5451 -0.17296,-2.2502 l 14.53854,-0.8732 c -0.26236,1.9711 -0.58448,2.7627 -0.86471,4.5641 -2.23925,0.3472 -4.46092,0.4766 -6.72533,0.5472 -2.26442,0.071 -4.46873,0.083 -6.77611,-0.3197 z" inkscape:path-effect="#path-effect6294" id="path6292" d="m 454.79268,1401.7435 c 0.0184,-0.5559 0.0186,-1.1123 6.2e-4,-1.6682 -0.0244,-0.7521 -0.0821,-1.5032 -0.17296,-2.2502 l 14.53854,-0.8732 -0.86471,4.5641 c -2.22704,0.3256 -4.47494,0.5085 -6.72533,0.5472 -2.26244,0.039 -4.52738,-0.068 -6.77611,-0.3197 l -5e-5,0" style="fill:url(#linearGradient187597);fill-opacity:1;stroke:none;filter:url(#filter5200)"/>
+        <path sodipodi:type="arc" style="fill:url(#radialGradient187599);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6282" sodipodi:cx="744.58344" sodipodi:cy="1398.1375" sodipodi:rx="104.29825" sodipodi:ry="18.031223" d="m 848.88168,1398.1375 c 0,9.9583 -46.69591,18.0312 -104.29824,18.0312 -57.60234,0 -104.29825,-8.0729 -104.29825,-18.0312 0,-9.9584 46.69591,-18.0313 104.29825,-18.0313 57.60233,0 104.29824,8.0729 104.29824,18.0313 z" transform="matrix(0.08535972,-0.00450311,0,0.0855003,398.37302,1280.5771)"/>
+        <path style="fill:url(#radialGradient187601);fill-opacity:1;stroke:none" d="m 468.88402,1390.3837 -14.3228,0.945 c 0.13455,1.4072 0.33944,4.3508 -0.0193,5.4257 -0.0492,0.065 -0.0771,0.1286 -0.0771,0.1928 0,0 -5e-5,0.01 0,0.01 0.0182,0.7323 3.34727,1.1429 7.45069,0.9193 4.11472,-0.2244 7.45068,-0.9996 7.45068,-1.7358 0,-0.01 8.5e-4,-0.022 0,-0.032 -8.2e-4,-0.013 -0.005,-0.025 -0.007,-0.038 -0.5902,-1.9111 -0.69061,-4.1629 -0.47571,-5.6828 z" id="path6284" inkscape:connector-curvature="0" sodipodi:nodetypes="cccscsscccc"/>
+        <path sodipodi:nodetypes="ssssccsss" inkscape:connector-curvature="0" d="m 423.32844,1330.2636 71.84537,5.7095 c 0.72298,0.057 1.26267,0.5854 1.30915,1.3091 l 3.05468,47.5659 c 0.0465,0.7238 -0.74078,1.1782 -1.30915,1.3092 -22.95377,5.5659 -48.38487,6.2191 -73.02164,5.8911 -0.72293,0.059 -1.27894,-0.5845 -1.30915,-1.3091 l -2.46623,-59.1734 c -0.0302,-0.7246 0.65071,-1.4013 1.89697,-1.3023 z" style="fill:#8e959f;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6276"/>
+        <path id="rect6253" style="fill:url(#radialGradient187603);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.32914165;stroke-miterlimit:4;stroke-opacity:1" d="m 423.54419,1330.4303 72.5489,5.3821 c 0.72328,0.054 1.26267,0.5854 1.30915,1.3092 l 3.05468,47.5658 c 0.0465,0.7238 -0.74078,1.1781 -1.30915,1.3092 -22.95376,5.5658 -48.38487,6.2192 -73.02164,5.8912 -0.72292,0.058 -1.27736,-0.5846 -1.30915,-1.3092 l -2.58194,-58.8392 c -0.0318,-0.7245 0.58587,-1.3628 1.30915,-1.3091 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ssssccsss"/>
+        <path style="fill:url(#linearGradient187605);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 425.92067,1334.0668 69.77239,4.8003 2.6183,41.7474 -69.67602,4.6548 -2.71467,-51.2025" id="path6245" inkscape:path-effect="#path-effect6247" inkscape:original-d="m 425.92067,1334.0668 69.77239,4.8003 2.6183,41.7474 -69.67602,4.6548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:url(#linearGradient187607);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 424.92361,1390.4625 c 0.0317,0.7245 0.5865,1.3697 1.30697,1.3114 24.55302,0.328 49.89789,-0.3227 72.77363,-5.8885 0.56644,-0.1311 1.34688,-0.5877 1.30056,-1.3115 l -0.11532,-1.8128 c -0.23506,0.4251 -0.76842,0.7006 -1.18524,0.7971 -22.87574,5.5658 -48.22061,6.2166 -72.77363,5.8886 -1.32,-0.012 -1.29964,-0.1096 -1.30697,1.0157 z" id="path6269" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+        <path sodipodi:type="arc" style="fill:url(#radialGradient187609);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff" id="path6274" sodipodi:cx="874.3125" sodipodi:cy="1324.2997" sodipodi:rx="5.0625" sodipodi:ry="6.5625" d="m 879.375,1324.2997 c 0,3.6244 -2.26656,6.5625 -5.0625,6.5625 -2.79594,0 -5.0625,-2.9381 -5.0625,-6.5625 0,-3.6244 2.26656,-6.5625 5.0625,-6.5625 2.79594,0 5.0625,2.9381 5.0625,6.5625 z" transform="matrix(0.20134232,0.04967248,-0.02204121,0.19072995,344.29271,1087.5475)"/>
+        <path style="fill:url(#linearGradient187611);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025" id="path6245-4" inkscape:path-effect="#path-effect6247-9" inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z" inkscape:path-effect="#path-effect5008" id="path4952" d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025" style="opacity:0.27354264;fill:url(#linearGradient187613);fill-opacity:1;stroke:#666666;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path style="opacity:0.63677135;fill:url(#linearGradient187615);fill-opacity:1;stroke:#f2f2f2;stroke-width:0.20571353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 -2.71467,-51.2025" id="path4974" inkscape:path-effect="#path-effect5006" inkscape:original-d="m 425.93699,1334.0628 69.7724,4.8003 2.6183,41.7474 -69.67603,4.6548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ssccsss" inkscape:connector-curvature="0" d="m 423.54419,1330.4303 72.5489,5.3821 c 0.72328,0.054 2.01309,1.1345 1.30915,1.3092 -50.55136,-3.2968 -57.54122,54.12 -71.27611,54.7662 -0.72292,0.058 -1.27736,-0.5846 -1.30915,-1.3092 l -2.58194,-58.8392 c -0.0318,-0.7245 0.58587,-1.3628 1.30915,-1.3091 z" style="opacity:0.24215249;fill:url(#linearGradient187617);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5230"/>
       </g>
-      <g
-         transform="matrix(1.2776262,0,0,1.2776262,-139.59141,-396.14844)"
-         id="g4693">
-        <path
-           sodipodi:nodetypes="ccccscccccc"
-           style="opacity:0.8699552;fill:#5e6b6a;fill-opacity:1;stroke:none;filter:url(#filter7271)"
-           d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.10844,0.2803 0.10113,0.6035 -0.0199,0.8786 -0.10048,0.2284 -0.27746,0.4224 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 -12.37498,-23.875"
-           id="path7269"
-           inkscape:path-effect="#path-effect6808"
-           inkscape:original-d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.0752,0.4655 0.0673,0.7 -0.0199,0.8786 -0.0872,0.1786 -0.2537,0.3014 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 z"
-           inkscape:connector-curvature="0"
-           transform="matrix(0.85239486,0,0,0.85239486,57.386448,214.74243)" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 436.48906,1430.4597 57.53666,-5.5406 17.68719,9.8026 1.7181,0.3862 c 0.0641,0.3968 0.0574,0.5967 -0.017,0.7489 -0.0743,0.1522 -0.21625,0.2569 -0.42257,0.4631 l -63.29031,15.13 -1.17205,0.1066 -1.06549,-0.1066 -0.4262,-0.6393 z"
-           inkscape:path-effect="#path-effect3858"
-           id="path6806"
-           d="m 436.48906,1430.4597 57.53666,-5.5406 17.68719,9.8026 1.7181,0.3862 c 0.0924,0.239 0.0862,0.5144 -0.017,0.7489 -0.0856,0.1947 -0.23651,0.36 -0.42257,0.4631 l -63.29031,15.13 -1.17205,0.1066 -1.06549,-0.1066 -0.4262,-0.6393 -10.54833,-20.3509"
-           style="fill:#a5b0af;fill-opacity:1;stroke:none"
-           sodipodi:nodetypes="ccccscccccc" />
-        <path
-           style="fill:url(#linearGradient187619);fill-opacity:1;stroke:none"
-           d="m 436.48906,1429.5007 57.53666,-5.5405 c 6.06778,2.9433 11.97516,6.2173 17.68719,9.8025 0.50543,0.3172 1.00932,0.6369 1.51167,0.959 0.073,0.03 0.13466,0.086 0.17063,0.156 0.036,0.07 0.0459,0.1531 0.0274,0.2296 -0.0166,0.069 -0.0559,0.132 -0.11029,0.1773 -0.0544,0.045 -0.12362,0.072 -0.19431,0.076 l -63.41685,15.13 -1.17204,0.1065 -1.06549,-0.1065 -0.4262,-0.6393 -10.54839,-20.351"
-           id="path6794"
-           inkscape:path-effect="#path-effect6796"
-           inkscape:original-d="m 436.48906,1429.5007 57.53666,-5.5405 17.68719,9.8025 1.51167,0.959 c 0.20338,0.1091 0.30253,0.2833 0.19805,0.3856 -0.10449,0.1023 -0.23283,0.2292 -0.3046,0.2537 l -63.41685,15.13 -1.17204,0.1065 -1.06549,-0.1065 -0.4262,-0.6393 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccscccccc" />
-        <path
-           id="rect6798"
-           style="fill:#717c7d;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none"
-           d="m 436.48906,1429.5041 1.61908,3.1178 -0.23717,2.4694 -1.61384,-2.8106 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#5d686c;fill-opacity:1;stroke:none"
-           d="m 437.86849,1435.086 1.42732,-0.1778 -1.18854,-2.2825 -0.23878,2.4603"
-           id="path6802"
-           inkscape:path-effect="#path-effect6804"
-           inkscape:original-d="m 437.86849,1435.086 1.42732,-0.1778 -1.18854,-2.2825 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-        <g
-           id="g7046"
-           style="fill:url(#linearGradient187767);fill-opacity:1"
-           transform="matrix(0.85239486,0,0,0.85239486,57.386448,214.74243)">
-          <path
-             sodipodi:nodetypes="cssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 47.697778,1511.0581 6.087718,0.2141 c 0.349743,0.012 0.522843,0.3039 0.632435,0.6325 l 1.203138,3.6075 c 0.109592,0.3286 -0.2994,0.553 -0.649558,0.5485 l -6.40556,-0.082 c -0.350353,0 -0.552167,-0.2944 -0.632435,-0.6324 l -0.868173,-3.6557 c -0.08027,-0.338 0.282107,-0.6335 0.632435,-0.6325 z"
-             style="fill:url(#linearGradient187621);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             transform="matrix(0.97211389,-0.23450924,0.27190603,0.96232381,0,0)"
-             id="rect6814" />
-          <path
-             inkscape:transform-center-y="0.95777293"
-             inkscape:transform-center-x="0.50002642"
-             id="path6822-2"
-             style="fill:url(#linearGradient187623);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 465.21397,1441.2337 5.97648,-1.17 c 0.34326,-0.067 0.59092,0.1627 0.78681,0.4409 l 2.1506,3.0546 c 0.19589,0.2783 -0.10119,0.6506 -0.44287,0.7249 l -5.82422,1.267 c -0.34184,0.075 -0.58591,-0.1659 -0.78679,-0.4408 l -2.3029,-3.1518 c -0.20088,-0.275 0.10199,-0.6472 0.44285,-0.725 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssssssssc" />
-          <path
-             sodipodi:nodetypes="csssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 472.86949,1439.7116 4.96651,-1.0132 c 0.30643,-0.062 0.49497,0.1853 0.70013,0.4425 l 2.25743,2.8304 c 0.20521,0.2573 -0.0888,0.6579 -0.39408,0.7275 l -5.01763,1.1439 c -0.3055,0.069 -0.50641,-0.1768 -0.70011,-0.4424 l -2.21416,-3.0355 c -0.10992,-0.1507 -0.0581,-0.2652 0.0559,-0.4146 0.087,-0.114 0.34415,-0.246 0.34595,-0.2388 z"
-             style="fill:url(#linearGradient187625);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6828-3"
-             inkscape:transform-center-x="0.44493633"
-             inkscape:transform-center-y="0.9612254" />
-          <path
-             inkscape:transform-center-y="0.93458356"
-             inkscape:transform-center-x="0.44493633"
-             id="path6830-3"
-             style="fill:url(#linearGradient187627);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 479.44154,1438.3333 6.18042,-1.2097 c 0.30632,-0.06 0.69706,0.086 0.92161,0.3193 l 2.56679,2.6635 c 0.22455,0.233 -0.0892,0.638 -0.39408,0.7073 l -6.76238,1.5361 c -0.30499,0.069 -0.50641,-0.1719 -0.70011,-0.4301 l -2.21416,-2.9513 c -0.10992,-0.1465 -0.0581,-0.2579 0.0559,-0.4031 0.087,-0.1109 0.34415,-0.2392 0.34595,-0.2322 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="csssssssssc" />
-          <path
-             sodipodi:nodetypes="csssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 487.69681,1436.6835 22.45389,-4.6258 c 0.30535,-0.063 0.67279,0.1096 0.92161,0.3096 l 2.70741,2.1765 c 0.24824,0.1995 -0.0895,0.6168 -0.39408,0.6858 l -22.60384,5.1149 c -0.30455,0.069 -0.6324,0.01 -0.84854,-0.2218 l -2.63836,-2.8234 c -0.12261,-0.1312 -0.0581,-0.2501 0.0559,-0.3909 0.087,-0.1075 0.34393,-0.2318 0.34595,-0.2251 z"
-             style="fill:url(#linearGradient187629);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6832"
-             inkscape:transform-center-x="0.44493633"
-             inkscape:transform-center-y="0.90626211" />
-          <path
-             sodipodi:nodetypes="csssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 512.01768,1431.6827 3.27189,-0.679 c 0.25053,-0.052 0.54511,0.1046 0.75544,0.2617 l 2.90858,2.1734 c 0.21252,0.1588 -0.0731,0.523 -0.32303,0.5798 l -3.397,0.7716 c -0.25009,0.057 -0.36195,-0.1942 -0.57387,-0.3526 l -2.89964,-2.168 c -0.12014,-0.09 -0.1139,-0.2887 -0.0205,-0.4078 0.0713,-0.091 0.27612,-0.1848 0.27806,-0.1793 z"
-             style="fill:url(#linearGradient187631);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6834"
-             inkscape:transform-center-x="0.36471052"
-             inkscape:transform-center-y="0.76615965" />
-          <path
-             inkscape:transform-center-y="0.74552444"
-             inkscape:transform-center-x="0.36471052"
-             id="path6836"
-             style="fill:url(#linearGradient187633);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 516.87631,1430.6627 2.69737,-0.5392 c 0.2507,-0.05 0.54512,0.1018 0.75544,0.2547 l 2.90858,2.1148 c 0.21251,0.1545 -0.0732,0.5085 -0.32303,0.5642 l -2.82248,0.6293 c -0.25014,0.056 -0.36195,-0.189 -0.57387,-0.3431 l -2.89964,-2.1096 c -0.12014,-0.088 -0.1139,-0.2809 -0.0205,-0.3968 0.0713,-0.089 0.27612,-0.1798 0.27806,-0.1745 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="csssssssssc" />
-          <path
-             sodipodi:nodetypes="csssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 520.94699,1429.8131 2.69737,-0.5258 c 0.2507,-0.049 0.54512,0.099 0.75544,0.2484 l 2.90858,2.0623 c 0.21251,0.1507 -0.0732,0.4959 -0.32303,0.5502 l -2.82248,0.6137 c -0.25014,0.055 -0.36195,-0.1843 -0.57387,-0.3346 l -2.89964,-2.0573 c -0.12014,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27612,-0.1754 0.27806,-0.1702 z"
-             style="fill:url(#linearGradient187635);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6838"
-             inkscape:transform-center-x="0.36471052"
-             inkscape:transform-center-y="0.72705418" />
-          <path
-             inkscape:transform-center-y="0.72705418"
-             inkscape:transform-center-x="0.36471052"
-             id="path6840"
-             style="fill:url(#linearGradient187637);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 525.09132,1428.99 1.81349,-0.3726 c 0.25019,-0.051 0.53014,0.1227 0.75544,0.2484 l 3.34419,1.8652 c 0.22753,0.1269 -0.0737,0.4935 -0.32303,0.5502 l -2.53192,0.5751 c -0.24975,0.057 -0.36305,-0.1828 -0.57387,-0.3346 l -2.74193,-1.9748 c -0.11989,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27622,-0.1754 0.27806,-0.1702 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="csssssssssc" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 454.69085,1438.2936 14.72061,-2.4946 c 0.34338,-0.058 0.58523,0.1452 0.78678,0.3809 l 2.02413,2.3671 c 0.2016,0.2358 -0.14123,0.4959 -0.48231,0.5629 l -15.16831,2.9835 c -0.34077,0.067 -0.63951,-0.1135 -0.78675,-0.381 l -1.53697,-2.7924 c -0.1472,-0.2675 0.10031,-0.5684 0.44282,-0.6264 z"
-             style="fill:url(#linearGradient187639);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="rect6814-3" />
-          <path
-             id="path6864"
-             style="fill:url(#linearGradient187641);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 471.24017,1435.5075 4.73892,-0.8214 c 0.34247,-0.059 0.58137,0.1383 0.78678,0.353 l 2.13814,2.235 c 0.20554,0.2149 -0.14214,0.4547 -0.48231,0.5216 l -4.87836,0.9596 c -0.33985,0.067 -0.60051,-0.133 -0.78675,-0.353 l -1.95924,-2.3144 c -0.1863,-0.2201 0.10119,-0.5212 0.44282,-0.5804 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 477.72189,1434.3908 4.25555,-0.7477 c 0.34178,-0.06 0.58135,0.1322 0.78678,0.3375 l 2.13814,2.1367 c 0.20553,0.2054 -0.1427,0.4318 -0.48231,0.4986 l -4.30471,0.8467 c -0.33932,0.067 -0.59426,-0.1328 -0.78675,-0.3375 l -2.04952,-2.1795 c -0.19251,-0.2048 0.10176,-0.4949 0.44282,-0.5548 z"
-             style="fill:url(#linearGradient187643);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6866" />
-          <path
-             id="path6868"
-             style="fill:url(#linearGradient187645);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 483.80361,1433.3299 3.93266,-0.6732 c 0.33258,-0.057 0.56567,0.1263 0.76558,0.3224 l 2.08052,2.0409 c 0.2,0.1961 -0.13885,0.4124 -0.46932,0.4762 l -3.9805,0.7678 c -0.33023,0.064 -0.57824,-0.1269 -0.76554,-0.3224 l -1.99429,-2.0818 c -0.18732,-0.1956 0.0989,-0.4731 0.43089,-0.5299 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 489.56243,1432.3586 3.49706,-0.6074 c 0.33196,-0.058 0.56568,0.12 0.76558,0.3063 l 2.08052,1.9391 c 0.19999,0.1864 -0.13966,0.3877 -0.46932,0.4525 l -3.5449,0.6973 c -0.3295,0.065 -0.57824,-0.1206 -0.76554,-0.3063 l -1.99429,-1.978 c -0.18732,-0.1858 0.0995,-0.4459 0.43089,-0.5035 z"
-             style="fill:url(#linearGradient187647);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6870" />
-          <path
-             id="path6872"
-             style="fill:url(#linearGradient187649);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 494.85266,1431.4662 3.05202,-0.5246 c 0.33162,-0.057 0.56568,0.1136 0.76558,0.29 l 2.08052,1.836 c 0.19999,0.1765 -0.1403,0.3638 -0.46932,0.4285 l -3.09986,0.6097 c -0.32898,0.065 -0.57824,-0.1142 -0.76554,-0.29 l -1.99429,-1.8728 c -0.18732,-0.176 0.0999,-0.4199 0.43089,-0.4768 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 499.48759,1430.684 3.05202,-0.4988 c 0.33162,-0.054 0.56568,0.108 0.76558,0.2757 l 2.08052,1.746 c 0.19999,0.1679 -0.1403,0.346 -0.46932,0.4075 l -3.09986,0.5798 c -0.32898,0.062 -0.57824,-0.1086 -0.76554,-0.2758 l -1.99429,-1.7809 c -0.18732,-0.1674 0.0999,-0.3993 0.43089,-0.4535 z"
-             style="fill:url(#linearGradient187651);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6874" />
-          <path
-             id="path6876"
-             style="fill:url(#linearGradient187653);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 504.17762,1429.868 2.70166,-0.4632 c 0.33085,-0.057 0.5657,0.1034 0.76558,0.264 l 2.08052,1.6719 c 0.20004,0.1607 -0.14135,0.3257 -0.46932,0.3902 l -2.7495,0.5408 c -0.32795,0.064 -0.57824,-0.104 -0.76554,-0.2641 l -1.99429,-1.7053 c -0.18732,-0.1603 0.10067,-0.3777 0.43089,-0.4343 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 508.45089,1429.1633 2.70166,-0.4371 c 0.33085,-0.054 0.5657,0.098 0.76558,0.2491 l 2.08052,1.5775 c 0.20004,0.1516 -0.14135,0.3073 -0.46932,0.3681 l -2.7495,0.5103 c -0.32795,0.06 -0.57824,-0.098 -0.76554,-0.2492 l -1.99429,-1.609 c -0.18732,-0.1512 0.10067,-0.3563 0.43089,-0.4097 z"
-             style="fill:url(#linearGradient187655);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6878" />
-          <path
-             id="path6880"
-             style="fill:url(#linearGradient187657);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 512.60906,1428.4424 2.70166,-0.4184 c 0.33085,-0.052 0.5657,0.094 0.76558,0.2384 l 2.08052,1.5101 c 0.20004,0.1451 -0.14135,0.2941 -0.46932,0.3523 l -2.7495,0.4885 c -0.32795,0.057 -0.57824,-0.094 -0.76554,-0.2385 l -1.99429,-1.5403 c -0.18732,-0.1447 0.10067,-0.341 0.43089,-0.3921 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 516.77633,1427.7726 2.62492,-0.4448 c 0.3299,-0.056 0.5657,0.09 0.76558,0.2284 l 2.08052,1.4469 c 0.20004,0.139 -0.14135,0.2818 -0.46932,0.3376 l -2.7495,0.468 c -0.32795,0.055 -0.57889,-0.089 -0.76554,-0.2285 l -1.91755,-1.4319 c -0.18676,-0.1394 0.10174,-0.3199 0.43089,-0.3757 z"
-             style="fill:url(#linearGradient187659);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6882" />
-          <path
-             id="path6884"
-             style="fill:url(#linearGradient187661);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 521.03501,1427.051 2.42068,-0.3892 c 0.32986,-0.053 0.55745,0.099 0.76558,0.2176 l 2.32063,1.317 c 0.20863,0.1184 -0.14135,0.2685 -0.46932,0.3217 l -2.7495,0.4459 c -0.32795,0.052 -0.57643,-0.088 -0.76554,-0.2177 l -1.95342,-1.3373 c -0.18911,-0.1295 0.1017,-0.3051 0.43089,-0.358 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             id="path6890"
-             style="fill:url(#linearGradient187663);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 452.57798,1434.6551 11.12923,-1.6317 c 0.259,-0.038 0.41871,0.208 0.59558,0.4431 l 1.50759,2.0044 c 0.17693,0.2352 -0.1074,0.4817 -0.36511,0.5247 l -11.38645,1.8987 c -0.25749,0.043 -0.44999,-0.1804 -0.59556,-0.4433 l -1.22049,-2.2045 c -0.14557,-0.2629 0.0768,-0.5535 0.33521,-0.5914 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 465.14481,1432.8122 4.899,-0.7203 c 0.25873,-0.038 0.40063,0.2129 0.59558,0.4201 l 1.77321,1.8851 c 0.19503,0.2073 -0.10774,0.4547 -0.36511,0.4976 l -5.17296,0.8626 c -0.2572,0.043 -0.42263,-0.1893 -0.59556,-0.4204 l -1.46937,-1.9639 c -0.17299,-0.2312 0.0771,-0.5229 0.33521,-0.5608 z"
-             style="fill:url(#linearGradient187665);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6892" />
-          <path
-             id="path6894"
-             style="fill:url(#linearGradient187667);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 471.62681,1431.8596 4.86438,-0.7161 c 0.25852,-0.038 0.39723,0.2086 0.59563,0.405 l 1.80467,1.7862 c 0.19848,0.1964 -0.10793,0.4368 -0.36505,0.4797 l -5.0158,0.8364 c -0.25706,0.043 -0.40931,-0.1935 -0.59561,-0.4053 l -1.62336,-1.8453 c -0.18633,-0.2118 0.0772,-0.5026 0.33514,-0.5406 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 478.00171,1430.898 4.18042,-0.6063 c 0.25845,-0.037 0.39724,0.201 0.59563,0.3902 l 1.80467,1.7213 c 0.19842,0.1893 -0.10819,0.4194 -0.36505,0.4622 l -4.17981,0.697 c -0.25679,0.043 -0.39478,-0.2008 -0.59561,-0.3906 l -1.83789,-1.7372 c -0.20084,-0.1898 0.1398,-0.4992 0.39764,-0.5366 z"
-             style="fill:url(#linearGradient187669);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6896" />
-          <path
-             id="path6898"
-             style="fill:url(#linearGradient187671);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 483.79892,1430.0354 3.67118,-0.504 c 0.25839,-0.036 0.40547,0.171 0.60385,0.3528 l 1.80467,1.654 c 0.19844,0.1819 -0.10847,0.4013 -0.36505,0.4441 l -3.67879,0.6134 c -0.2565,0.043 -0.39478,-0.193 -0.59561,-0.3753 l -1.83789,-1.6694 c -0.20084,-0.1823 0.13971,-0.4802 0.39764,-0.5156 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 489.09271,1429.2929 3.5803,-0.5261 c 0.25798,-0.038 0.40547,0.1653 0.60385,0.3409 l 1.80467,1.5984 c 0.19844,0.1758 -0.10847,0.3879 -0.36505,0.4292 l -3.67879,0.5928 c -0.2565,0.042 -0.39478,-0.1865 -0.59561,-0.3627 l -1.83789,-1.6133 c -0.20084,-0.1761 0.2311,-0.4213 0.48852,-0.4592 z"
-             style="fill:url(#linearGradient187673);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6900" />
-          <path
-             id="path6902"
-             style="fill:url(#linearGradient187675);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 494.19377,1428.5433 3.20991,-0.4717 c 0.25793,-0.038 0.42396,0.1214 0.62227,0.2912 l 1.80473,1.5451 c 0.19845,0.1699 -0.10891,0.3722 -0.36504,0.4149 l -3.35786,0.5599 c -0.25623,0.043 -0.39548,-0.1795 -0.59562,-0.3506 l -1.8069,-1.5449 c -0.20009,-0.1711 0.23124,-0.4061 0.48851,-0.4439 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 498.9165,1427.8332 2.74646,-0.3973 c 0.25789,-0.037 0.42394,0.1174 0.62227,0.2816 l 1.80473,1.4939 c 0.19847,0.1643 -0.10913,0.3585 -0.36504,0.4012 l -2.89441,0.4826 c -0.25611,0.043 -0.39548,-0.1736 -0.59562,-0.339 l -1.8069,-1.4938 c -0.20009,-0.1654 0.23134,-0.392 0.48851,-0.4292 z"
-             style="fill:url(#linearGradient187677);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6904" />
-          <path
-             id="path6906"
-             style="fill:url(#linearGradient187679);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 503.16635,1427.2047 2.74646,-0.3835 c 0.25789,-0.036 0.42394,0.1133 0.62227,0.2718 l 1.80473,1.4421 c 0.19847,0.1586 -0.10913,0.3461 -0.36504,0.3873 l -2.89441,0.4659 c -0.25611,0.042 -0.39548,-0.1676 -0.59562,-0.3273 l -1.8069,-1.442 c -0.20009,-0.1597 0.23134,-0.3784 0.48851,-0.4143 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 507.34415,1426.5781 2.48328,-0.359 c 0.25757,-0.037 0.42392,0.1096 0.62227,0.2629 l 1.80473,1.3947 c 0.19843,0.1533 -0.10958,0.3319 -0.36504,0.3745 l -2.63123,0.4387 c -0.25584,0.043 -0.39548,-0.1621 -0.59562,-0.3165 l -1.8069,-1.3946 c -0.20009,-0.1545 0.23168,-0.3636 0.48851,-0.4007 z"
-             style="fill:url(#linearGradient187681);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6908" />
-          <path
-             id="path6910"
-             style="fill:url(#linearGradient187683);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 511.51931,1425.9526 1.99681,-0.2827 c 0.25755,-0.037 0.42389,0.1061 0.62227,0.2544 l 1.80473,1.3494 c 0.19847,0.1484 -0.10982,0.3196 -0.36504,0.3624 l -2.14476,0.3598 c -0.25564,0.043 -0.39548,-0.1568 -0.59562,-0.3062 l -1.8069,-1.3494 c -0.20009,-0.1495 0.23173,-0.3513 0.48851,-0.3877 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 515.04488,1425.4534 1.99681,-0.2702 c 0.25755,-0.035 0.42389,0.1014 0.62227,0.2431 l 1.80473,1.2895 c 0.19847,0.1418 -0.10982,0.3054 -0.36504,0.3463 l -2.14476,0.3438 c -0.25564,0.041 -0.39548,-0.1498 -0.59562,-0.2926 l -1.8069,-1.2895 c -0.20009,-0.1428 0.23173,-0.3357 0.48851,-0.3704 z"
-             style="fill:url(#linearGradient187685);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6912" />
-          <path
-             id="path6914"
-             style="fill:url(#linearGradient187687);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 518.52859,1424.9356 1.76656,-0.2279 c 0.25765,-0.033 0.41505,0.1117 0.62227,0.2355 l 2.03498,1.2156 c 0.20723,0.1238 -0.10982,0.2959 -0.36504,0.3356 l -2.14476,0.3331 c -0.25564,0.04 -0.39548,-0.1452 -0.59562,-0.2835 l -1.8069,-1.2495 c -0.20009,-0.1384 0.23167,-0.3258 0.48851,-0.3589 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 450.58393,1431.1152 9.10708,-1.1496 c 0.25925,-0.033 0.42916,0.1753 0.59554,0.3916 l 1.42588,1.8534 c 0.16646,0.2164 -0.10732,0.4265 -0.36515,0.4637 l -9.40234,1.355 c -0.25759,0.037 -0.46337,-0.1516 -0.59552,-0.3917 l -1.10075,-1.9998 c -0.1322,-0.2402 0.0768,-0.49 0.33526,-0.5226 z"
-             style="fill:url(#linearGradient187689);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6920" />
-          <path
-             id="path6922"
-             style="fill:url(#linearGradient187691);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 461.14009,1429.7827 5.07055,-0.6277 c 0.25912,-0.032 0.4291,0.1669 0.59554,0.373 l 1.42588,1.7652 c 0.16648,0.206 -0.10756,0.4044 -0.36515,0.4416 l -5.111,0.7365 c -0.2573,0.037 -0.43762,-0.1614 -0.59552,-0.3731 l -1.35556,-1.8178 c -0.15792,-0.2118 0.0769,-0.4657 0.33526,-0.4977 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 467.76368,1428.9131 4.67261,-0.5673 c 0.25312,-0.031 0.41909,0.1617 0.58168,0.3611 l 1.3927,1.7087 c 0.16255,0.1995 -0.10505,0.3916 -0.35666,0.4275 l -4.71211,0.6726 c -0.25134,0.036 -0.42744,-0.1562 -0.58167,-0.3612 l -1.32401,-1.7596 c -0.15424,-0.205 0.0751,-0.4512 0.32746,-0.4818 z"
-             style="fill:url(#linearGradient187693);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6924" />
-          <path
-             id="path6926"
-             style="fill:url(#linearGradient187695);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 473.8017,1428.1844 4.13261,-0.4996 c 0.25888,-0.031 0.42252,0.1618 0.59554,0.3486 l 1.47529,1.5921 c 0.17295,0.1866 -0.1075,0.3784 -0.36515,0.4127 l -4.28877,0.5706 c -0.2574,0.034 -0.43729,-0.1511 -0.59552,-0.3487 l -1.28926,-1.6105 c -0.15825,-0.1977 0.077,-0.434 0.33526,-0.4652 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 479.37869,1427.4803 3.87442,-0.5106 c 0.25849,-0.034 0.41253,0.1699 0.59554,0.3448 l 1.60236,1.5308 c 0.18286,0.1746 -0.10794,0.371 -0.36515,0.4081 l -4.03058,0.5808 c -0.25698,0.037 -0.42586,-0.1592 -0.59552,-0.3448 l -1.41633,-1.5491 c -0.16973,-0.1856 0.0774,-0.426 0.33526,-0.46 z"
-             style="fill:url(#linearGradient187697);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6928" />
-          <path
-             id="path6930"
-             style="fill:url(#linearGradient187699);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 484.58967,1426.8298 3.57896,-0.4467 c 0.25858,-0.032 0.40179,0.1753 0.59554,0.3304 l 1.79531,1.4368 c 0.19356,0.1549 -0.10792,0.3557 -0.36515,0.3911 l -3.73512,0.514 c -0.25693,0.035 -0.41319,-0.1656 -0.59552,-0.3304 l -1.60928,-1.4544 c -0.18242,-0.1649 0.0774,-0.4086 0.33526,-0.4408 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 489.53231,1426.1828 3.35692,-0.441 c 0.25821,-0.034 0.40175,0.1702 0.59554,0.3208 l 1.79531,1.3946 c 0.19358,0.1504 -0.10828,0.3427 -0.36515,0.3797 l -3.51308,0.5063 c -0.25652,0.037 -0.41319,-0.1607 -0.59552,-0.3207 l -1.60928,-1.4118 c -0.18242,-0.16 0.0777,-0.3941 0.33526,-0.4279 z"
-             style="fill:url(#linearGradient187701);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6932" />
-          <path
-             id="path6934"
-             style="fill:url(#linearGradient187703);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 494.30488,1425.5933 2.97943,-0.3895 c 0.25799,-0.034 0.40174,0.1625 0.59554,0.3062 l 1.79531,1.3311 c 0.19361,0.1436 -0.10852,0.3254 -0.36515,0.3624 l -3.13559,0.4519 c -0.25625,0.037 -0.41319,-0.1534 -0.59552,-0.3061 l -1.60928,-1.3475 c -0.18242,-0.1528 0.0779,-0.3749 0.33526,-0.4085 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 498.68156,1425.0421 2.68932,-0.3501 c 0.25791,-0.034 0.40171,0.1562 0.59554,0.2944 l 1.79531,1.2798 c 0.1936,0.138 -0.10872,0.3114 -0.36515,0.3484 l -2.84548,0.4101 c -0.25612,0.037 -0.41319,-0.1475 -0.59552,-0.2943 l -1.60928,-1.2956 c -0.18242,-0.1469 0.0781,-0.3592 0.33526,-0.3927 z"
-             style="fill:url(#linearGradient187705);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6936" />
-          <path
-             id="path6938"
-             style="fill:url(#linearGradient187707);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 502.81699,1424.5193 2.68932,-0.3371 c 0.25791,-0.033 0.40171,0.1504 0.59554,0.2835 l 1.79531,1.2325 c 0.1936,0.1329 -0.10872,0.2999 -0.36515,0.3355 l -2.84548,0.395 c -0.25612,0.036 -0.41319,-0.1421 -0.59552,-0.2834 l -1.60928,-1.2478 c -0.18242,-0.1414 0.0781,-0.3459 0.33526,-0.3782 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 506.81318,1424.0041 2.23999,-0.2893 c 0.25775,-0.033 0.40168,0.1457 0.59554,0.2745 l 1.79531,1.1933 c 0.19361,0.1287 -0.10906,0.288 -0.36515,0.3249 l -2.39615,0.3453 c -0.25586,0.037 -0.41319,-0.1376 -0.59552,-0.2744 l -1.60928,-1.2081 c -0.18242,-0.1369 0.0783,-0.333 0.33526,-0.3662 z"
-             style="fill:url(#linearGradient187709);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6940" />
-          <path
-             id="path6942"
-             style="fill:url(#linearGradient187711);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 510.41945,1423.5572 2.23999,-0.278 c 0.25775,-0.032 0.40168,0.14 0.59554,0.2638 l 1.79531,1.1466 c 0.19361,0.1237 -0.10906,0.2767 -0.36515,0.3122 l -2.39615,0.3318 c -0.25586,0.036 -0.41319,-0.1322 -0.59552,-0.2637 l -1.60928,-1.1608 c -0.18242,-0.1316 0.0783,-0.32 0.33526,-0.3519 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 514.00115,1423.0964 2.70057,-0.3596 c 0.25733,-0.034 0.40169,0.1356 0.59554,0.2555 l 1.79531,1.1106 c 0.19362,0.1198 -0.1094,0.2655 -0.36515,0.3024 l -2.85673,0.4117 c -0.2556,0.037 -0.41319,-0.1281 -0.59552,-0.2554 l -1.60928,-1.1244 c -0.18242,-0.1275 0.0787,-0.3066 0.33526,-0.3408 z"
-             style="fill:url(#linearGradient187713);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6944" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 448.90855,1428.1161 5.63036,-0.6248 c 0.25928,-0.029 0.44294,0.1441 0.59554,0.3466 l 1.3325,1.7687 c 0.15272,0.2027 -0.10729,0.3777 -0.36515,0.4105 l -5.93657,0.7538 c -0.25763,0.033 -0.47664,-0.1265 -0.59552,-0.3467 l -0.99642,-1.8456 c -0.11894,-0.2203 0.0768,-0.4338 0.33526,-0.4625 z"
-             style="fill:url(#linearGradient187715);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6920-4" />
-          <path
-             id="path6990"
-             style="fill:url(#linearGradient187717);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 456.07139,1427.3009 5.11456,-0.5881 c 0.25908,-0.03 0.44295,0.1407 0.59554,0.3385 l 1.3325,1.7273 c 0.15269,0.1979 -0.10734,0.3684 -0.36515,0.4009 l -5.10827,0.6437 c -0.25757,0.033 -0.44735,-0.1425 -0.59552,-0.3386 l -1.30892,-1.7321 c -0.14819,-0.1961 0.077,-0.4219 0.33526,-0.4516 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 462.56281,1426.5463 4.61648,-0.5268 c 0.25902,-0.03 0.44291,0.1371 0.59554,0.33 l 1.3325,1.6838 c 0.15272,0.193 -0.10744,0.3584 -0.36515,0.3909 l -4.61019,0.581 c -0.25751,0.033 -0.44735,-0.1389 -0.59552,-0.3301 l -1.30892,-1.6886 c -0.14819,-0.1911 0.0771,-0.4107 0.33526,-0.4402 z"
-             style="fill:url(#linearGradient187719);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6992" />
-          <path
-             id="path6994"
-             style="fill:url(#linearGradient187721);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 468.60056,1425.854 4.33762,-0.4931 c 0.25897,-0.029 0.44286,0.1332 0.59554,0.3208 l 1.3325,1.6368 c 0.15272,0.1876 -0.10754,0.3475 -0.36515,0.38 l -4.33133,0.5458 c -0.25745,0.032 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 474.32467,1425.2135 3.86408,-0.4391 c 0.25887,-0.029 0.43837,0.137 0.59554,0.3208 l 1.33459,1.5614 c 0.15718,0.1839 -0.10826,0.3422 -0.36515,0.38 l -3.85988,0.5672 c -0.25667,0.038 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z"
-             style="fill:url(#linearGradient187723);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path6996" />
-          <path
-             id="path6998"
-             style="fill:url(#linearGradient187725);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 479.60347,1424.6159 3.70783,-0.4235 c 0.25881,-0.029 0.42624,0.1482 0.59554,0.3208 l 1.45362,1.4828 c 0.16936,0.1728 -0.10753,0.3476 -0.36515,0.38 l -3.88516,0.4896 c -0.25743,0.032 -0.44364,-0.138 -0.59552,-0.3209 l -1.24642,-1.5009 c -0.15184,-0.1828 0.0772,-0.3984 0.33526,-0.4279 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 484.88205,1424.0301 2.91038,-0.3245 c 0.25872,-0.029 0.41533,0.1566 0.59554,0.3134 l 1.60987,1.4015 c 0.18036,0.157 -0.10763,0.3387 -0.36515,0.3712 l -3.08771,0.3891 c -0.25725,0.032 -0.43066,-0.1467 -0.59552,-0.3135 l -1.40267,-1.4193 c -0.16473,-0.1666 0.0772,-0.3891 0.33526,-0.4179 z"
-             style="fill:url(#linearGradient187727);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7000" />
-          <path
-             id="path7002"
-             style="fill:url(#linearGradient187729);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 489.26317,1423.5327 2.91038,-0.315 c 0.25872,-0.028 0.40668,0.1629 0.59554,0.3042 l 1.79737,1.345 c 0.18905,0.1415 -0.10763,0.3288 -0.36515,0.3604 l -3.08771,0.3777 c -0.25725,0.031 -0.42004,-0.154 -0.59552,-0.3043 l -1.59017,-1.3623 c -0.17535,-0.1502 0.0772,-0.3777 0.33526,-0.4057 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 493.62818,1423.0779 2.91038,-0.3006 c 0.25872,-0.027 0.40668,0.1555 0.59554,0.2903 l 1.79737,1.2832 c 0.18905,0.135 -0.10763,0.3137 -0.36515,0.3438 l -3.08771,0.3604 c -0.25725,0.03 -0.42004,-0.1469 -0.59552,-0.2903 l -1.59017,-1.2998 c -0.17535,-0.1433 0.0772,-0.3603 0.33526,-0.387 z"
-             style="fill:url(#linearGradient187731);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7004" />
-          <path
-             id="path7006"
-             style="fill:url(#linearGradient187733);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 497.91616,1422.631 2.45855,-0.2751 c 0.25841,-0.029 0.4067,0.1481 0.59554,0.2766 l 1.79737,1.2225 c 0.18905,0.1286 -0.10808,0.2951 -0.36515,0.3275 l -2.63588,0.3321 c -0.25685,0.032 -0.42004,-0.14 -0.59552,-0.2766 l -1.59017,-1.2383 c -0.17535,-0.1365 0.0776,-0.3399 0.33526,-0.3687 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 501.78123,1422.2229 2.43762,-0.275 c 0.25829,-0.029 0.40672,0.142 0.59554,0.265 l 1.79737,1.1713 c 0.18905,0.1232 -0.10821,0.2815 -0.36515,0.3138 l -2.61495,0.3296 c -0.25674,0.032 -0.42004,-0.1341 -0.59552,-0.265 l -1.59017,-1.1865 c -0.17535,-0.1307 0.0777,-0.3241 0.33526,-0.3532 z"
-             style="fill:url(#linearGradient187735);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7008" />
-          <path
-             id="path7010"
-             style="fill:url(#linearGradient187737);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 505.5518,1421.8696 2.11562,-0.238 c 0.25807,-0.029 0.40674,0.1323 0.59554,0.2471 l 1.79737,1.0922 c 0.18906,0.1148 -0.10848,0.2602 -0.36515,0.2926 l -2.29295,0.2889 c -0.25646,0.032 -0.42004,-0.125 -0.59552,-0.2471 l -1.59017,-1.1063 c -0.17535,-0.1219 0.0779,-0.3004 0.33526,-0.3294 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 509.17441,1421.5029 1.86761,-0.2095 c 0.25786,-0.029 0.4067,0.1254 0.59554,0.234 l 1.79737,1.0338 c 0.18904,0.1087 -0.10869,0.2447 -0.36515,0.277 l -2.04494,0.2577 c -0.25618,0.032 -0.42004,-0.1183 -0.59552,-0.2339 l -1.59017,-1.0472 c -0.17535,-0.1154 0.078,-0.283 0.33526,-0.3119 z"
-             style="fill:url(#linearGradient187739);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7012" />
-          <path
-             id="path7014"
-             style="fill:url(#linearGradient187741);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 512.35472,1421.1789 1.40841,-0.1539 c 0.25784,-0.028 0.40673,0.1193 0.59554,0.2227 l 1.79737,0.984 c 0.189,0.1035 -0.10889,0.2313 -0.36515,0.2636 l -1.58574,0.1998 c -0.25602,0.032 -0.42004,-0.1126 -0.59552,-0.2226 l -1.59017,-0.9967 c -0.17535,-0.1098 0.0781,-0.2688 0.33526,-0.2969 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 450.26701,1477.3135 6.35126,0.077 0.97049,1.2438 -6.64425,-0.031 z"
-             style="fill:url(#linearGradient187743);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             transform="matrix(0.99360958,-0.1128716,0,1,0,0)"
-             id="rect7020" />
-          <path
-             id="path7024"
-             style="fill:url(#linearGradient187745);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 454.46572,1425.7741 5.72964,-0.5831 1.2141,1.0589 -5.89416,0.7012 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 461.19718,1425.0866 5.72964,-0.5831 1.29638,1.0032 -5.71936,0.6238 z"
-             style="fill:url(#linearGradient187747);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7026" />
-          <path
-             id="path7028"
-             style="fill:url(#linearGradient187749);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 467.4812,1424.4577 5.01441,-0.5172 1.32369,0.9827 -4.96903,0.5151 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 473.2652,1423.8598 4.71239,-0.4766 1.22552,0.9605 -4.66701,0.4745 z"
-             style="fill:url(#linearGradient187751);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7030" />
-          <path
-             id="path7032"
-             style="fill:url(#linearGradient187753);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 478.62568,1423.325 4.22215,-0.3799 1.0076,0.8765 -4.07063,0.4241 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 483.31976,1422.8503 4.10186,-0.4272 1.00482,0.8801 -4.10634,0.4479 z"
-             style="fill:url(#linearGradient187755);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7034" />
-          <path
-             id="path7036"
-             style="fill:url(#linearGradient187757);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 488.02944,1422.373 3.94836,-0.4001 1.08523,0.8246 -4.10634,0.4479 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 492.53573,1421.9164 4.0649,-0.4119 1.08523,0.8014 -4.10634,0.4353 z"
-             style="fill:url(#linearGradient187759);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7038" />
-          <path
-             id="path7040"
-             style="fill:url(#linearGradient187761);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 497.12539,1421.4513 4.14103,-0.4196 1.08523,0.778 -4.10634,0.4226 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 501.78284,1420.9794 4.08424,-0.4139 0.96099,0.7307 -3.9821,0.4343 z"
-             style="fill:url(#linearGradient187763);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7042" />
-          <path
-             id="path7044"
-             style="fill:url(#linearGradient187765);fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 506.50535,1420.4878 4.08424,-0.4009 0.96099,0.7078 -3.9821,0.4207 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+      <g transform="matrix(1.2776262,0,0,1.2776262,-139.59141,-396.14844)" id="g4693">
+        <path sodipodi:nodetypes="ccccscccccc" style="opacity:0.8699552;fill:#5e6b6a;fill-opacity:1;stroke:none;filter:url(#filter7271)" d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.10844,0.2803 0.10113,0.6035 -0.0199,0.8786 -0.10048,0.2284 -0.27746,0.4224 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 -12.37498,-23.875" id="path7269" inkscape:path-effect="#path-effect6808" inkscape:original-d="m 444.75,1426.2372 67.5,-6.5 20.75,11.5 2.01562,0.4531 c 0.0752,0.4655 0.0673,0.7 -0.0199,0.8786 -0.0872,0.1786 -0.2537,0.3014 -0.49574,0.5433 l -74.25,17.75 -1.375,0.125 -1.25,-0.125 -0.5,-0.75 z" inkscape:connector-curvature="0" transform="matrix(0.85239486,0,0,0.85239486,57.386448,214.74243)"/>
+        <path inkscape:connector-curvature="0" inkscape:original-d="m 436.48906,1430.4597 57.53666,-5.5406 17.68719,9.8026 1.7181,0.3862 c 0.0641,0.3968 0.0574,0.5967 -0.017,0.7489 -0.0743,0.1522 -0.21625,0.2569 -0.42257,0.4631 l -63.29031,15.13 -1.17205,0.1066 -1.06549,-0.1066 -0.4262,-0.6393 z" inkscape:path-effect="#path-effect3858" id="path6806" d="m 436.48906,1430.4597 57.53666,-5.5406 17.68719,9.8026 1.7181,0.3862 c 0.0924,0.239 0.0862,0.5144 -0.017,0.7489 -0.0856,0.1947 -0.23651,0.36 -0.42257,0.4631 l -63.29031,15.13 -1.17205,0.1066 -1.06549,-0.1066 -0.4262,-0.6393 -10.54833,-20.3509" style="fill:#a5b0af;fill-opacity:1;stroke:none" sodipodi:nodetypes="ccccscccccc"/>
+        <path style="fill:url(#linearGradient187619);fill-opacity:1;stroke:none" d="m 436.48906,1429.5007 57.53666,-5.5405 c 6.06778,2.9433 11.97516,6.2173 17.68719,9.8025 0.50543,0.3172 1.00932,0.6369 1.51167,0.959 0.073,0.03 0.13466,0.086 0.17063,0.156 0.036,0.07 0.0459,0.1531 0.0274,0.2296 -0.0166,0.069 -0.0559,0.132 -0.11029,0.1773 -0.0544,0.045 -0.12362,0.072 -0.19431,0.076 l -63.41685,15.13 -1.17204,0.1065 -1.06549,-0.1065 -0.4262,-0.6393 -10.54839,-20.351" id="path6794" inkscape:path-effect="#path-effect6796" inkscape:original-d="m 436.48906,1429.5007 57.53666,-5.5405 17.68719,9.8025 1.51167,0.959 c 0.20338,0.1091 0.30253,0.2833 0.19805,0.3856 -0.10449,0.1023 -0.23283,0.2292 -0.3046,0.2537 l -63.41685,15.13 -1.17204,0.1065 -1.06549,-0.1065 -0.4262,-0.6393 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccscccccc"/>
+        <path id="rect6798" style="fill:#717c7d;fill-opacity:0.74901961;fill-rule:nonzero;stroke:none" d="m 436.48906,1429.5041 1.61908,3.1178 -0.23717,2.4694 -1.61384,-2.8106 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:#5d686c;fill-opacity:1;stroke:none" d="m 437.86849,1435.086 1.42732,-0.1778 -1.18854,-2.2825 -0.23878,2.4603" id="path6802" inkscape:path-effect="#path-effect6804" inkscape:original-d="m 437.86849,1435.086 1.42732,-0.1778 -1.18854,-2.2825 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+        <g id="g7046" style="fill:url(#linearGradient187767);fill-opacity:1" transform="matrix(0.85239486,0,0,0.85239486,57.386448,214.74243)">
+          <path sodipodi:nodetypes="cssssssssc" inkscape:connector-curvature="0" d="m 47.697778,1511.0581 6.087718,0.2141 c 0.349743,0.012 0.522843,0.3039 0.632435,0.6325 l 1.203138,3.6075 c 0.109592,0.3286 -0.2994,0.553 -0.649558,0.5485 l -6.40556,-0.082 c -0.350353,0 -0.552167,-0.2944 -0.632435,-0.6324 l -0.868173,-3.6557 c -0.08027,-0.338 0.282107,-0.6335 0.632435,-0.6325 z" style="fill:url(#linearGradient187621);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.97211389,-0.23450924,0.27190603,0.96232381,0,0)" id="rect6814"/>
+          <path inkscape:transform-center-y="0.95777293" inkscape:transform-center-x="0.50002642" id="path6822-2" style="fill:url(#linearGradient187623);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 465.21397,1441.2337 5.97648,-1.17 c 0.34326,-0.067 0.59092,0.1627 0.78681,0.4409 l 2.1506,3.0546 c 0.19589,0.2783 -0.10119,0.6506 -0.44287,0.7249 l -5.82422,1.267 c -0.34184,0.075 -0.58591,-0.1659 -0.78679,-0.4408 l -2.3029,-3.1518 c -0.20088,-0.275 0.10199,-0.6472 0.44285,-0.725 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cssssssssc"/>
+          <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 472.86949,1439.7116 4.96651,-1.0132 c 0.30643,-0.062 0.49497,0.1853 0.70013,0.4425 l 2.25743,2.8304 c 0.20521,0.2573 -0.0888,0.6579 -0.39408,0.7275 l -5.01763,1.1439 c -0.3055,0.069 -0.50641,-0.1768 -0.70011,-0.4424 l -2.21416,-3.0355 c -0.10992,-0.1507 -0.0581,-0.2652 0.0559,-0.4146 0.087,-0.114 0.34415,-0.246 0.34595,-0.2388 z" style="fill:url(#linearGradient187625);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6828-3" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.9612254"/>
+          <path inkscape:transform-center-y="0.93458356" inkscape:transform-center-x="0.44493633" id="path6830-3" style="fill:url(#linearGradient187627);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 479.44154,1438.3333 6.18042,-1.2097 c 0.30632,-0.06 0.69706,0.086 0.92161,0.3193 l 2.56679,2.6635 c 0.22455,0.233 -0.0892,0.638 -0.39408,0.7073 l -6.76238,1.5361 c -0.30499,0.069 -0.50641,-0.1719 -0.70011,-0.4301 l -2.21416,-2.9513 c -0.10992,-0.1465 -0.0581,-0.2579 0.0559,-0.4031 0.087,-0.1109 0.34415,-0.2392 0.34595,-0.2322 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+          <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 487.69681,1436.6835 22.45389,-4.6258 c 0.30535,-0.063 0.67279,0.1096 0.92161,0.3096 l 2.70741,2.1765 c 0.24824,0.1995 -0.0895,0.6168 -0.39408,0.6858 l -22.60384,5.1149 c -0.30455,0.069 -0.6324,0.01 -0.84854,-0.2218 l -2.63836,-2.8234 c -0.12261,-0.1312 -0.0581,-0.2501 0.0559,-0.3909 0.087,-0.1075 0.34393,-0.2318 0.34595,-0.2251 z" style="fill:url(#linearGradient187629);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6832" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.90626211"/>
+          <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 512.01768,1431.6827 3.27189,-0.679 c 0.25053,-0.052 0.54511,0.1046 0.75544,0.2617 l 2.90858,2.1734 c 0.21252,0.1588 -0.0731,0.523 -0.32303,0.5798 l -3.397,0.7716 c -0.25009,0.057 -0.36195,-0.1942 -0.57387,-0.3526 l -2.89964,-2.168 c -0.12014,-0.09 -0.1139,-0.2887 -0.0205,-0.4078 0.0713,-0.091 0.27612,-0.1848 0.27806,-0.1793 z" style="fill:url(#linearGradient187631);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6834" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.76615965"/>
+          <path inkscape:transform-center-y="0.74552444" inkscape:transform-center-x="0.36471052" id="path6836" style="fill:url(#linearGradient187633);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 516.87631,1430.6627 2.69737,-0.5392 c 0.2507,-0.05 0.54512,0.1018 0.75544,0.2547 l 2.90858,2.1148 c 0.21251,0.1545 -0.0732,0.5085 -0.32303,0.5642 l -2.82248,0.6293 c -0.25014,0.056 -0.36195,-0.189 -0.57387,-0.3431 l -2.89964,-2.1096 c -0.12014,-0.088 -0.1139,-0.2809 -0.0205,-0.3968 0.0713,-0.089 0.27612,-0.1798 0.27806,-0.1745 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+          <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 520.94699,1429.8131 2.69737,-0.5258 c 0.2507,-0.049 0.54512,0.099 0.75544,0.2484 l 2.90858,2.0623 c 0.21251,0.1507 -0.0732,0.4959 -0.32303,0.5502 l -2.82248,0.6137 c -0.25014,0.055 -0.36195,-0.1843 -0.57387,-0.3346 l -2.89964,-2.0573 c -0.12014,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27612,-0.1754 0.27806,-0.1702 z" style="fill:url(#linearGradient187635);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6838" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.72705418"/>
+          <path inkscape:transform-center-y="0.72705418" inkscape:transform-center-x="0.36471052" id="path6840" style="fill:url(#linearGradient187637);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 525.09132,1428.99 1.81349,-0.3726 c 0.25019,-0.051 0.53014,0.1227 0.75544,0.2484 l 3.34419,1.8652 c 0.22753,0.1269 -0.0737,0.4935 -0.32303,0.5502 l -2.53192,0.5751 c -0.24975,0.057 -0.36305,-0.1828 -0.57387,-0.3346 l -2.74193,-1.9748 c -0.11989,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27622,-0.1754 0.27806,-0.1702 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 454.69085,1438.2936 14.72061,-2.4946 c 0.34338,-0.058 0.58523,0.1452 0.78678,0.3809 l 2.02413,2.3671 c 0.2016,0.2358 -0.14123,0.4959 -0.48231,0.5629 l -15.16831,2.9835 c -0.34077,0.067 -0.63951,-0.1135 -0.78675,-0.381 l -1.53697,-2.7924 c -0.1472,-0.2675 0.10031,-0.5684 0.44282,-0.6264 z" style="fill:url(#linearGradient187639);fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect6814-3"/>
+          <path id="path6864" style="fill:url(#linearGradient187641);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.24017,1435.5075 4.73892,-0.8214 c 0.34247,-0.059 0.58137,0.1383 0.78678,0.353 l 2.13814,2.235 c 0.20554,0.2149 -0.14214,0.4547 -0.48231,0.5216 l -4.87836,0.9596 c -0.33985,0.067 -0.60051,-0.133 -0.78675,-0.353 l -1.95924,-2.3144 c -0.1863,-0.2201 0.10119,-0.5212 0.44282,-0.5804 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 477.72189,1434.3908 4.25555,-0.7477 c 0.34178,-0.06 0.58135,0.1322 0.78678,0.3375 l 2.13814,2.1367 c 0.20553,0.2054 -0.1427,0.4318 -0.48231,0.4986 l -4.30471,0.8467 c -0.33932,0.067 -0.59426,-0.1328 -0.78675,-0.3375 l -2.04952,-2.1795 c -0.19251,-0.2048 0.10176,-0.4949 0.44282,-0.5548 z" style="fill:url(#linearGradient187643);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6866"/>
+          <path id="path6868" style="fill:url(#linearGradient187645);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 483.80361,1433.3299 3.93266,-0.6732 c 0.33258,-0.057 0.56567,0.1263 0.76558,0.3224 l 2.08052,2.0409 c 0.2,0.1961 -0.13885,0.4124 -0.46932,0.4762 l -3.9805,0.7678 c -0.33023,0.064 -0.57824,-0.1269 -0.76554,-0.3224 l -1.99429,-2.0818 c -0.18732,-0.1956 0.0989,-0.4731 0.43089,-0.5299 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 489.56243,1432.3586 3.49706,-0.6074 c 0.33196,-0.058 0.56568,0.12 0.76558,0.3063 l 2.08052,1.9391 c 0.19999,0.1864 -0.13966,0.3877 -0.46932,0.4525 l -3.5449,0.6973 c -0.3295,0.065 -0.57824,-0.1206 -0.76554,-0.3063 l -1.99429,-1.978 c -0.18732,-0.1858 0.0995,-0.4459 0.43089,-0.5035 z" style="fill:url(#linearGradient187647);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6870"/>
+          <path id="path6872" style="fill:url(#linearGradient187649);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 494.85266,1431.4662 3.05202,-0.5246 c 0.33162,-0.057 0.56568,0.1136 0.76558,0.29 l 2.08052,1.836 c 0.19999,0.1765 -0.1403,0.3638 -0.46932,0.4285 l -3.09986,0.6097 c -0.32898,0.065 -0.57824,-0.1142 -0.76554,-0.29 l -1.99429,-1.8728 c -0.18732,-0.176 0.0999,-0.4199 0.43089,-0.4768 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 499.48759,1430.684 3.05202,-0.4988 c 0.33162,-0.054 0.56568,0.108 0.76558,0.2757 l 2.08052,1.746 c 0.19999,0.1679 -0.1403,0.346 -0.46932,0.4075 l -3.09986,0.5798 c -0.32898,0.062 -0.57824,-0.1086 -0.76554,-0.2758 l -1.99429,-1.7809 c -0.18732,-0.1674 0.0999,-0.3993 0.43089,-0.4535 z" style="fill:url(#linearGradient187651);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6874"/>
+          <path id="path6876" style="fill:url(#linearGradient187653);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 504.17762,1429.868 2.70166,-0.4632 c 0.33085,-0.057 0.5657,0.1034 0.76558,0.264 l 2.08052,1.6719 c 0.20004,0.1607 -0.14135,0.3257 -0.46932,0.3902 l -2.7495,0.5408 c -0.32795,0.064 -0.57824,-0.104 -0.76554,-0.2641 l -1.99429,-1.7053 c -0.18732,-0.1603 0.10067,-0.3777 0.43089,-0.4343 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 508.45089,1429.1633 2.70166,-0.4371 c 0.33085,-0.054 0.5657,0.098 0.76558,0.2491 l 2.08052,1.5775 c 0.20004,0.1516 -0.14135,0.3073 -0.46932,0.3681 l -2.7495,0.5103 c -0.32795,0.06 -0.57824,-0.098 -0.76554,-0.2492 l -1.99429,-1.609 c -0.18732,-0.1512 0.10067,-0.3563 0.43089,-0.4097 z" style="fill:url(#linearGradient187655);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6878"/>
+          <path id="path6880" style="fill:url(#linearGradient187657);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 512.60906,1428.4424 2.70166,-0.4184 c 0.33085,-0.052 0.5657,0.094 0.76558,0.2384 l 2.08052,1.5101 c 0.20004,0.1451 -0.14135,0.2941 -0.46932,0.3523 l -2.7495,0.4885 c -0.32795,0.057 -0.57824,-0.094 -0.76554,-0.2385 l -1.99429,-1.5403 c -0.18732,-0.1447 0.10067,-0.341 0.43089,-0.3921 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 516.77633,1427.7726 2.62492,-0.4448 c 0.3299,-0.056 0.5657,0.09 0.76558,0.2284 l 2.08052,1.4469 c 0.20004,0.139 -0.14135,0.2818 -0.46932,0.3376 l -2.7495,0.468 c -0.32795,0.055 -0.57889,-0.089 -0.76554,-0.2285 l -1.91755,-1.4319 c -0.18676,-0.1394 0.10174,-0.3199 0.43089,-0.3757 z" style="fill:url(#linearGradient187659);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6882"/>
+          <path id="path6884" style="fill:url(#linearGradient187661);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 521.03501,1427.051 2.42068,-0.3892 c 0.32986,-0.053 0.55745,0.099 0.76558,0.2176 l 2.32063,1.317 c 0.20863,0.1184 -0.14135,0.2685 -0.46932,0.3217 l -2.7495,0.4459 c -0.32795,0.052 -0.57643,-0.088 -0.76554,-0.2177 l -1.95342,-1.3373 c -0.18911,-0.1295 0.1017,-0.3051 0.43089,-0.358 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path id="path6890" style="fill:url(#linearGradient187663);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 452.57798,1434.6551 11.12923,-1.6317 c 0.259,-0.038 0.41871,0.208 0.59558,0.4431 l 1.50759,2.0044 c 0.17693,0.2352 -0.1074,0.4817 -0.36511,0.5247 l -11.38645,1.8987 c -0.25749,0.043 -0.44999,-0.1804 -0.59556,-0.4433 l -1.22049,-2.2045 c -0.14557,-0.2629 0.0768,-0.5535 0.33521,-0.5914 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 465.14481,1432.8122 4.899,-0.7203 c 0.25873,-0.038 0.40063,0.2129 0.59558,0.4201 l 1.77321,1.8851 c 0.19503,0.2073 -0.10774,0.4547 -0.36511,0.4976 l -5.17296,0.8626 c -0.2572,0.043 -0.42263,-0.1893 -0.59556,-0.4204 l -1.46937,-1.9639 c -0.17299,-0.2312 0.0771,-0.5229 0.33521,-0.5608 z" style="fill:url(#linearGradient187665);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6892"/>
+          <path id="path6894" style="fill:url(#linearGradient187667);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 471.62681,1431.8596 4.86438,-0.7161 c 0.25852,-0.038 0.39723,0.2086 0.59563,0.405 l 1.80467,1.7862 c 0.19848,0.1964 -0.10793,0.4368 -0.36505,0.4797 l -5.0158,0.8364 c -0.25706,0.043 -0.40931,-0.1935 -0.59561,-0.4053 l -1.62336,-1.8453 c -0.18633,-0.2118 0.0772,-0.5026 0.33514,-0.5406 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 478.00171,1430.898 4.18042,-0.6063 c 0.25845,-0.037 0.39724,0.201 0.59563,0.3902 l 1.80467,1.7213 c 0.19842,0.1893 -0.10819,0.4194 -0.36505,0.4622 l -4.17981,0.697 c -0.25679,0.043 -0.39478,-0.2008 -0.59561,-0.3906 l -1.83789,-1.7372 c -0.20084,-0.1898 0.1398,-0.4992 0.39764,-0.5366 z" style="fill:url(#linearGradient187669);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6896"/>
+          <path id="path6898" style="fill:url(#linearGradient187671);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 483.79892,1430.0354 3.67118,-0.504 c 0.25839,-0.036 0.40547,0.171 0.60385,0.3528 l 1.80467,1.654 c 0.19844,0.1819 -0.10847,0.4013 -0.36505,0.4441 l -3.67879,0.6134 c -0.2565,0.043 -0.39478,-0.193 -0.59561,-0.3753 l -1.83789,-1.6694 c -0.20084,-0.1823 0.13971,-0.4802 0.39764,-0.5156 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 489.09271,1429.2929 3.5803,-0.5261 c 0.25798,-0.038 0.40547,0.1653 0.60385,0.3409 l 1.80467,1.5984 c 0.19844,0.1758 -0.10847,0.3879 -0.36505,0.4292 l -3.67879,0.5928 c -0.2565,0.042 -0.39478,-0.1865 -0.59561,-0.3627 l -1.83789,-1.6133 c -0.20084,-0.1761 0.2311,-0.4213 0.48852,-0.4592 z" style="fill:url(#linearGradient187673);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6900"/>
+          <path id="path6902" style="fill:url(#linearGradient187675);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 494.19377,1428.5433 3.20991,-0.4717 c 0.25793,-0.038 0.42396,0.1214 0.62227,0.2912 l 1.80473,1.5451 c 0.19845,0.1699 -0.10891,0.3722 -0.36504,0.4149 l -3.35786,0.5599 c -0.25623,0.043 -0.39548,-0.1795 -0.59562,-0.3506 l -1.8069,-1.5449 c -0.20009,-0.1711 0.23124,-0.4061 0.48851,-0.4439 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 498.9165,1427.8332 2.74646,-0.3973 c 0.25789,-0.037 0.42394,0.1174 0.62227,0.2816 l 1.80473,1.4939 c 0.19847,0.1643 -0.10913,0.3585 -0.36504,0.4012 l -2.89441,0.4826 c -0.25611,0.043 -0.39548,-0.1736 -0.59562,-0.339 l -1.8069,-1.4938 c -0.20009,-0.1654 0.23134,-0.392 0.48851,-0.4292 z" style="fill:url(#linearGradient187677);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6904"/>
+          <path id="path6906" style="fill:url(#linearGradient187679);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 503.16635,1427.2047 2.74646,-0.3835 c 0.25789,-0.036 0.42394,0.1133 0.62227,0.2718 l 1.80473,1.4421 c 0.19847,0.1586 -0.10913,0.3461 -0.36504,0.3873 l -2.89441,0.4659 c -0.25611,0.042 -0.39548,-0.1676 -0.59562,-0.3273 l -1.8069,-1.442 c -0.20009,-0.1597 0.23134,-0.3784 0.48851,-0.4143 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 507.34415,1426.5781 2.48328,-0.359 c 0.25757,-0.037 0.42392,0.1096 0.62227,0.2629 l 1.80473,1.3947 c 0.19843,0.1533 -0.10958,0.3319 -0.36504,0.3745 l -2.63123,0.4387 c -0.25584,0.043 -0.39548,-0.1621 -0.59562,-0.3165 l -1.8069,-1.3946 c -0.20009,-0.1545 0.23168,-0.3636 0.48851,-0.4007 z" style="fill:url(#linearGradient187681);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6908"/>
+          <path id="path6910" style="fill:url(#linearGradient187683);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 511.51931,1425.9526 1.99681,-0.2827 c 0.25755,-0.037 0.42389,0.1061 0.62227,0.2544 l 1.80473,1.3494 c 0.19847,0.1484 -0.10982,0.3196 -0.36504,0.3624 l -2.14476,0.3598 c -0.25564,0.043 -0.39548,-0.1568 -0.59562,-0.3062 l -1.8069,-1.3494 c -0.20009,-0.1495 0.23173,-0.3513 0.48851,-0.3877 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 515.04488,1425.4534 1.99681,-0.2702 c 0.25755,-0.035 0.42389,0.1014 0.62227,0.2431 l 1.80473,1.2895 c 0.19847,0.1418 -0.10982,0.3054 -0.36504,0.3463 l -2.14476,0.3438 c -0.25564,0.041 -0.39548,-0.1498 -0.59562,-0.2926 l -1.8069,-1.2895 c -0.20009,-0.1428 0.23173,-0.3357 0.48851,-0.3704 z" style="fill:url(#linearGradient187685);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6912"/>
+          <path id="path6914" style="fill:url(#linearGradient187687);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 518.52859,1424.9356 1.76656,-0.2279 c 0.25765,-0.033 0.41505,0.1117 0.62227,0.2355 l 2.03498,1.2156 c 0.20723,0.1238 -0.10982,0.2959 -0.36504,0.3356 l -2.14476,0.3331 c -0.25564,0.04 -0.39548,-0.1452 -0.59562,-0.2835 l -1.8069,-1.2495 c -0.20009,-0.1384 0.23167,-0.3258 0.48851,-0.3589 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 450.58393,1431.1152 9.10708,-1.1496 c 0.25925,-0.033 0.42916,0.1753 0.59554,0.3916 l 1.42588,1.8534 c 0.16646,0.2164 -0.10732,0.4265 -0.36515,0.4637 l -9.40234,1.355 c -0.25759,0.037 -0.46337,-0.1516 -0.59552,-0.3917 l -1.10075,-1.9998 c -0.1322,-0.2402 0.0768,-0.49 0.33526,-0.5226 z" style="fill:url(#linearGradient187689);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6920"/>
+          <path id="path6922" style="fill:url(#linearGradient187691);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 461.14009,1429.7827 5.07055,-0.6277 c 0.25912,-0.032 0.4291,0.1669 0.59554,0.373 l 1.42588,1.7652 c 0.16648,0.206 -0.10756,0.4044 -0.36515,0.4416 l -5.111,0.7365 c -0.2573,0.037 -0.43762,-0.1614 -0.59552,-0.3731 l -1.35556,-1.8178 c -0.15792,-0.2118 0.0769,-0.4657 0.33526,-0.4977 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 467.76368,1428.9131 4.67261,-0.5673 c 0.25312,-0.031 0.41909,0.1617 0.58168,0.3611 l 1.3927,1.7087 c 0.16255,0.1995 -0.10505,0.3916 -0.35666,0.4275 l -4.71211,0.6726 c -0.25134,0.036 -0.42744,-0.1562 -0.58167,-0.3612 l -1.32401,-1.7596 c -0.15424,-0.205 0.0751,-0.4512 0.32746,-0.4818 z" style="fill:url(#linearGradient187693);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6924"/>
+          <path id="path6926" style="fill:url(#linearGradient187695);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 473.8017,1428.1844 4.13261,-0.4996 c 0.25888,-0.031 0.42252,0.1618 0.59554,0.3486 l 1.47529,1.5921 c 0.17295,0.1866 -0.1075,0.3784 -0.36515,0.4127 l -4.28877,0.5706 c -0.2574,0.034 -0.43729,-0.1511 -0.59552,-0.3487 l -1.28926,-1.6105 c -0.15825,-0.1977 0.077,-0.434 0.33526,-0.4652 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 479.37869,1427.4803 3.87442,-0.5106 c 0.25849,-0.034 0.41253,0.1699 0.59554,0.3448 l 1.60236,1.5308 c 0.18286,0.1746 -0.10794,0.371 -0.36515,0.4081 l -4.03058,0.5808 c -0.25698,0.037 -0.42586,-0.1592 -0.59552,-0.3448 l -1.41633,-1.5491 c -0.16973,-0.1856 0.0774,-0.426 0.33526,-0.46 z" style="fill:url(#linearGradient187697);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6928"/>
+          <path id="path6930" style="fill:url(#linearGradient187699);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 484.58967,1426.8298 3.57896,-0.4467 c 0.25858,-0.032 0.40179,0.1753 0.59554,0.3304 l 1.79531,1.4368 c 0.19356,0.1549 -0.10792,0.3557 -0.36515,0.3911 l -3.73512,0.514 c -0.25693,0.035 -0.41319,-0.1656 -0.59552,-0.3304 l -1.60928,-1.4544 c -0.18242,-0.1649 0.0774,-0.4086 0.33526,-0.4408 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 489.53231,1426.1828 3.35692,-0.441 c 0.25821,-0.034 0.40175,0.1702 0.59554,0.3208 l 1.79531,1.3946 c 0.19358,0.1504 -0.10828,0.3427 -0.36515,0.3797 l -3.51308,0.5063 c -0.25652,0.037 -0.41319,-0.1607 -0.59552,-0.3207 l -1.60928,-1.4118 c -0.18242,-0.16 0.0777,-0.3941 0.33526,-0.4279 z" style="fill:url(#linearGradient187701);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6932"/>
+          <path id="path6934" style="fill:url(#linearGradient187703);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 494.30488,1425.5933 2.97943,-0.3895 c 0.25799,-0.034 0.40174,0.1625 0.59554,0.3062 l 1.79531,1.3311 c 0.19361,0.1436 -0.10852,0.3254 -0.36515,0.3624 l -3.13559,0.4519 c -0.25625,0.037 -0.41319,-0.1534 -0.59552,-0.3061 l -1.60928,-1.3475 c -0.18242,-0.1528 0.0779,-0.3749 0.33526,-0.4085 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 498.68156,1425.0421 2.68932,-0.3501 c 0.25791,-0.034 0.40171,0.1562 0.59554,0.2944 l 1.79531,1.2798 c 0.1936,0.138 -0.10872,0.3114 -0.36515,0.3484 l -2.84548,0.4101 c -0.25612,0.037 -0.41319,-0.1475 -0.59552,-0.2943 l -1.60928,-1.2956 c -0.18242,-0.1469 0.0781,-0.3592 0.33526,-0.3927 z" style="fill:url(#linearGradient187705);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6936"/>
+          <path id="path6938" style="fill:url(#linearGradient187707);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 502.81699,1424.5193 2.68932,-0.3371 c 0.25791,-0.033 0.40171,0.1504 0.59554,0.2835 l 1.79531,1.2325 c 0.1936,0.1329 -0.10872,0.2999 -0.36515,0.3355 l -2.84548,0.395 c -0.25612,0.036 -0.41319,-0.1421 -0.59552,-0.2834 l -1.60928,-1.2478 c -0.18242,-0.1414 0.0781,-0.3459 0.33526,-0.3782 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 506.81318,1424.0041 2.23999,-0.2893 c 0.25775,-0.033 0.40168,0.1457 0.59554,0.2745 l 1.79531,1.1933 c 0.19361,0.1287 -0.10906,0.288 -0.36515,0.3249 l -2.39615,0.3453 c -0.25586,0.037 -0.41319,-0.1376 -0.59552,-0.2744 l -1.60928,-1.2081 c -0.18242,-0.1369 0.0783,-0.333 0.33526,-0.3662 z" style="fill:url(#linearGradient187709);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6940"/>
+          <path id="path6942" style="fill:url(#linearGradient187711);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 510.41945,1423.5572 2.23999,-0.278 c 0.25775,-0.032 0.40168,0.14 0.59554,0.2638 l 1.79531,1.1466 c 0.19361,0.1237 -0.10906,0.2767 -0.36515,0.3122 l -2.39615,0.3318 c -0.25586,0.036 -0.41319,-0.1322 -0.59552,-0.2637 l -1.60928,-1.1608 c -0.18242,-0.1316 0.0783,-0.32 0.33526,-0.3519 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 514.00115,1423.0964 2.70057,-0.3596 c 0.25733,-0.034 0.40169,0.1356 0.59554,0.2555 l 1.79531,1.1106 c 0.19362,0.1198 -0.1094,0.2655 -0.36515,0.3024 l -2.85673,0.4117 c -0.2556,0.037 -0.41319,-0.1281 -0.59552,-0.2554 l -1.60928,-1.1244 c -0.18242,-0.1275 0.0787,-0.3066 0.33526,-0.3408 z" style="fill:url(#linearGradient187713);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6944"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 448.90855,1428.1161 5.63036,-0.6248 c 0.25928,-0.029 0.44294,0.1441 0.59554,0.3466 l 1.3325,1.7687 c 0.15272,0.2027 -0.10729,0.3777 -0.36515,0.4105 l -5.93657,0.7538 c -0.25763,0.033 -0.47664,-0.1265 -0.59552,-0.3467 l -0.99642,-1.8456 c -0.11894,-0.2203 0.0768,-0.4338 0.33526,-0.4625 z" style="fill:url(#linearGradient187715);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6920-4"/>
+          <path id="path6990" style="fill:url(#linearGradient187717);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 456.07139,1427.3009 5.11456,-0.5881 c 0.25908,-0.03 0.44295,0.1407 0.59554,0.3385 l 1.3325,1.7273 c 0.15269,0.1979 -0.10734,0.3684 -0.36515,0.4009 l -5.10827,0.6437 c -0.25757,0.033 -0.44735,-0.1425 -0.59552,-0.3386 l -1.30892,-1.7321 c -0.14819,-0.1961 0.077,-0.4219 0.33526,-0.4516 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 462.56281,1426.5463 4.61648,-0.5268 c 0.25902,-0.03 0.44291,0.1371 0.59554,0.33 l 1.3325,1.6838 c 0.15272,0.193 -0.10744,0.3584 -0.36515,0.3909 l -4.61019,0.581 c -0.25751,0.033 -0.44735,-0.1389 -0.59552,-0.3301 l -1.30892,-1.6886 c -0.14819,-0.1911 0.0771,-0.4107 0.33526,-0.4402 z" style="fill:url(#linearGradient187719);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6992"/>
+          <path id="path6994" style="fill:url(#linearGradient187721);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 468.60056,1425.854 4.33762,-0.4931 c 0.25897,-0.029 0.44286,0.1332 0.59554,0.3208 l 1.3325,1.6368 c 0.15272,0.1876 -0.10754,0.3475 -0.36515,0.38 l -4.33133,0.5458 c -0.25745,0.032 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 474.32467,1425.2135 3.86408,-0.4391 c 0.25887,-0.029 0.43837,0.137 0.59554,0.3208 l 1.33459,1.5614 c 0.15718,0.1839 -0.10826,0.3422 -0.36515,0.38 l -3.85988,0.5672 c -0.25667,0.038 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z" style="fill:url(#linearGradient187723);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path6996"/>
+          <path id="path6998" style="fill:url(#linearGradient187725);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 479.60347,1424.6159 3.70783,-0.4235 c 0.25881,-0.029 0.42624,0.1482 0.59554,0.3208 l 1.45362,1.4828 c 0.16936,0.1728 -0.10753,0.3476 -0.36515,0.38 l -3.88516,0.4896 c -0.25743,0.032 -0.44364,-0.138 -0.59552,-0.3209 l -1.24642,-1.5009 c -0.15184,-0.1828 0.0772,-0.3984 0.33526,-0.4279 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 484.88205,1424.0301 2.91038,-0.3245 c 0.25872,-0.029 0.41533,0.1566 0.59554,0.3134 l 1.60987,1.4015 c 0.18036,0.157 -0.10763,0.3387 -0.36515,0.3712 l -3.08771,0.3891 c -0.25725,0.032 -0.43066,-0.1467 -0.59552,-0.3135 l -1.40267,-1.4193 c -0.16473,-0.1666 0.0772,-0.3891 0.33526,-0.4179 z" style="fill:url(#linearGradient187727);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7000"/>
+          <path id="path7002" style="fill:url(#linearGradient187729);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.26317,1423.5327 2.91038,-0.315 c 0.25872,-0.028 0.40668,0.1629 0.59554,0.3042 l 1.79737,1.345 c 0.18905,0.1415 -0.10763,0.3288 -0.36515,0.3604 l -3.08771,0.3777 c -0.25725,0.031 -0.42004,-0.154 -0.59552,-0.3043 l -1.59017,-1.3623 c -0.17535,-0.1502 0.0772,-0.3777 0.33526,-0.4057 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 493.62818,1423.0779 2.91038,-0.3006 c 0.25872,-0.027 0.40668,0.1555 0.59554,0.2903 l 1.79737,1.2832 c 0.18905,0.135 -0.10763,0.3137 -0.36515,0.3438 l -3.08771,0.3604 c -0.25725,0.03 -0.42004,-0.1469 -0.59552,-0.2903 l -1.59017,-1.2998 c -0.17535,-0.1433 0.0772,-0.3603 0.33526,-0.387 z" style="fill:url(#linearGradient187731);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7004"/>
+          <path id="path7006" style="fill:url(#linearGradient187733);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 497.91616,1422.631 2.45855,-0.2751 c 0.25841,-0.029 0.4067,0.1481 0.59554,0.2766 l 1.79737,1.2225 c 0.18905,0.1286 -0.10808,0.2951 -0.36515,0.3275 l -2.63588,0.3321 c -0.25685,0.032 -0.42004,-0.14 -0.59552,-0.2766 l -1.59017,-1.2383 c -0.17535,-0.1365 0.0776,-0.3399 0.33526,-0.3687 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 501.78123,1422.2229 2.43762,-0.275 c 0.25829,-0.029 0.40672,0.142 0.59554,0.265 l 1.79737,1.1713 c 0.18905,0.1232 -0.10821,0.2815 -0.36515,0.3138 l -2.61495,0.3296 c -0.25674,0.032 -0.42004,-0.1341 -0.59552,-0.265 l -1.59017,-1.1865 c -0.17535,-0.1307 0.0777,-0.3241 0.33526,-0.3532 z" style="fill:url(#linearGradient187735);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7008"/>
+          <path id="path7010" style="fill:url(#linearGradient187737);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 505.5518,1421.8696 2.11562,-0.238 c 0.25807,-0.029 0.40674,0.1323 0.59554,0.2471 l 1.79737,1.0922 c 0.18906,0.1148 -0.10848,0.2602 -0.36515,0.2926 l -2.29295,0.2889 c -0.25646,0.032 -0.42004,-0.125 -0.59552,-0.2471 l -1.59017,-1.1063 c -0.17535,-0.1219 0.0779,-0.3004 0.33526,-0.3294 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 509.17441,1421.5029 1.86761,-0.2095 c 0.25786,-0.029 0.4067,0.1254 0.59554,0.234 l 1.79737,1.0338 c 0.18904,0.1087 -0.10869,0.2447 -0.36515,0.277 l -2.04494,0.2577 c -0.25618,0.032 -0.42004,-0.1183 -0.59552,-0.2339 l -1.59017,-1.0472 c -0.17535,-0.1154 0.078,-0.283 0.33526,-0.3119 z" style="fill:url(#linearGradient187739);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7012"/>
+          <path id="path7014" style="fill:url(#linearGradient187741);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 512.35472,1421.1789 1.40841,-0.1539 c 0.25784,-0.028 0.40673,0.1193 0.59554,0.2227 l 1.79737,0.984 c 0.189,0.1035 -0.10889,0.2313 -0.36515,0.2636 l -1.58574,0.1998 c -0.25602,0.032 -0.42004,-0.1126 -0.59552,-0.2226 l -1.59017,-0.9967 c -0.17535,-0.1098 0.0781,-0.2688 0.33526,-0.2969 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 450.26701,1477.3135 6.35126,0.077 0.97049,1.2438 -6.64425,-0.031 z" style="fill:url(#linearGradient187743);fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(0.99360958,-0.1128716,0,1,0,0)" id="rect7020"/>
+          <path id="path7024" style="fill:url(#linearGradient187745);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 454.46572,1425.7741 5.72964,-0.5831 1.2141,1.0589 -5.89416,0.7012 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 461.19718,1425.0866 5.72964,-0.5831 1.29638,1.0032 -5.71936,0.6238 z" style="fill:url(#linearGradient187747);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7026"/>
+          <path id="path7028" style="fill:url(#linearGradient187749);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 467.4812,1424.4577 5.01441,-0.5172 1.32369,0.9827 -4.96903,0.5151 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 473.2652,1423.8598 4.71239,-0.4766 1.22552,0.9605 -4.66701,0.4745 z" style="fill:url(#linearGradient187751);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7030"/>
+          <path id="path7032" style="fill:url(#linearGradient187753);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 478.62568,1423.325 4.22215,-0.3799 1.0076,0.8765 -4.07063,0.4241 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 483.31976,1422.8503 4.10186,-0.4272 1.00482,0.8801 -4.10634,0.4479 z" style="fill:url(#linearGradient187755);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7034"/>
+          <path id="path7036" style="fill:url(#linearGradient187757);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 488.02944,1422.373 3.94836,-0.4001 1.08523,0.8246 -4.10634,0.4479 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 492.53573,1421.9164 4.0649,-0.4119 1.08523,0.8014 -4.10634,0.4353 z" style="fill:url(#linearGradient187759);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7038"/>
+          <path id="path7040" style="fill:url(#linearGradient187761);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 497.12539,1421.4513 4.14103,-0.4196 1.08523,0.778 -4.10634,0.4226 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 501.78284,1420.9794 4.08424,-0.4139 0.96099,0.7307 -3.9821,0.4343 z" style="fill:url(#linearGradient187763);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7042"/>
+          <path id="path7044" style="fill:url(#linearGradient187765);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 506.50535,1420.4878 4.08424,-0.4009 0.96099,0.7078 -3.9821,0.4207 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
         </g>
-        <g
-           style="fill:#fafbfb;fill-opacity:1"
-           id="g7121"
-           transform="matrix(0.85239486,0,0,0.85239486,57.642494,214.40186)">
-          <path
-             id="path7123"
-             transform="matrix(0.97211389,-0.23450924,0.27190603,0.96232381,0,0)"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 47.697778,1511.0581 6.087718,0.2141 c 0.349743,0.012 0.522843,0.3039 0.632435,0.6325 l 1.203138,3.6075 c 0.109592,0.3286 -0.2994,0.553 -0.649558,0.5485 l -6.40556,-0.082 c -0.350353,0 -0.552167,-0.2944 -0.632435,-0.6324 l -0.868173,-3.6557 c -0.08027,-0.338 0.282107,-0.6335 0.632435,-0.6325 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cssssssssc" />
-          <path
-             sodipodi:nodetypes="cssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 465.21397,1441.2337 5.97648,-1.17 c 0.34326,-0.067 0.59092,0.1627 0.78681,0.4409 l 2.1506,3.0546 c 0.19589,0.2783 -0.10119,0.6506 -0.44287,0.7249 l -5.82422,1.267 c -0.34184,0.075 -0.58591,-0.1659 -0.78679,-0.4408 l -2.3029,-3.1518 c -0.20088,-0.275 0.10199,-0.6472 0.44285,-0.725 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7125"
-             inkscape:transform-center-x="0.50002642"
-             inkscape:transform-center-y="0.95777293" />
-          <path
-             inkscape:transform-center-y="0.9612254"
-             inkscape:transform-center-x="0.44493633"
-             id="path7127"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 472.86949,1439.7116 4.96651,-1.0132 c 0.30643,-0.062 0.49497,0.1853 0.70013,0.4425 l 2.25743,2.8304 c 0.20521,0.2573 -0.0888,0.6579 -0.39408,0.7275 l -5.01763,1.1439 c -0.3055,0.069 -0.50641,-0.1768 -0.70011,-0.4424 l -2.21416,-3.0355 c -0.10992,-0.1507 -0.0581,-0.2652 0.0559,-0.4146 0.087,-0.114 0.34415,-0.246 0.34595,-0.2388 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="csssssssssc" />
-          <path
-             sodipodi:nodetypes="csssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 479.44154,1438.3333 6.18042,-1.2097 c 0.30632,-0.06 0.69706,0.086 0.92161,0.3193 l 2.56679,2.6635 c 0.22455,0.233 -0.0892,0.638 -0.39408,0.7073 l -6.76238,1.5361 c -0.30499,0.069 -0.50641,-0.1719 -0.70011,-0.4301 l -2.21416,-2.9513 c -0.10992,-0.1465 -0.0581,-0.2579 0.0559,-0.4031 0.087,-0.1109 0.34415,-0.2392 0.34595,-0.2322 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7129"
-             inkscape:transform-center-x="0.44493633"
-             inkscape:transform-center-y="0.93458356" />
-          <path
-             inkscape:transform-center-y="0.90626211"
-             inkscape:transform-center-x="0.44493633"
-             id="path7131"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 487.69681,1436.6835 22.45389,-4.6258 c 0.30535,-0.063 0.67279,0.1096 0.92161,0.3096 l 2.70741,2.1765 c 0.24824,0.1995 -0.0895,0.6168 -0.39408,0.6858 l -22.60384,5.1149 c -0.30455,0.069 -0.6324,0.01 -0.84854,-0.2218 l -2.63836,-2.8234 c -0.12261,-0.1312 -0.0581,-0.2501 0.0559,-0.3909 0.087,-0.1075 0.34393,-0.2318 0.34595,-0.2251 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="csssssssssc" />
-          <path
-             inkscape:transform-center-y="0.76615965"
-             inkscape:transform-center-x="0.36471052"
-             id="path7133"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 512.01768,1431.6827 3.27189,-0.679 c 0.25053,-0.052 0.54511,0.1046 0.75544,0.2617 l 2.90858,2.1734 c 0.21252,0.1588 -0.0731,0.523 -0.32303,0.5798 l -3.397,0.7716 c -0.25009,0.057 -0.36195,-0.1942 -0.57387,-0.3526 l -2.89964,-2.168 c -0.12014,-0.09 -0.1139,-0.2887 -0.0205,-0.4078 0.0713,-0.091 0.27612,-0.1848 0.27806,-0.1793 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="csssssssssc" />
-          <path
-             sodipodi:nodetypes="csssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 516.87631,1430.6627 2.69737,-0.5392 c 0.2507,-0.05 0.54512,0.1018 0.75544,0.2547 l 2.90858,2.1148 c 0.21251,0.1545 -0.0732,0.5085 -0.32303,0.5642 l -2.82248,0.6293 c -0.25014,0.056 -0.36195,-0.189 -0.57387,-0.3431 l -2.89964,-2.1096 c -0.12014,-0.088 -0.1139,-0.2809 -0.0205,-0.3968 0.0713,-0.089 0.27612,-0.1798 0.27806,-0.1745 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7135"
-             inkscape:transform-center-x="0.36471052"
-             inkscape:transform-center-y="0.74552444" />
-          <path
-             inkscape:transform-center-y="0.72705418"
-             inkscape:transform-center-x="0.36471052"
-             id="path7137"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 520.94699,1429.8131 2.69737,-0.5258 c 0.2507,-0.049 0.54512,0.099 0.75544,0.2484 l 2.90858,2.0623 c 0.21251,0.1507 -0.0732,0.4959 -0.32303,0.5502 l -2.82248,0.6137 c -0.25014,0.055 -0.36195,-0.1843 -0.57387,-0.3346 l -2.89964,-2.0573 c -0.12014,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27612,-0.1754 0.27806,-0.1702 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="csssssssssc" />
-          <path
-             sodipodi:nodetypes="csssssssssc"
-             inkscape:connector-curvature="0"
-             d="m 525.09132,1428.99 1.81349,-0.3726 c 0.25019,-0.051 0.53014,0.1227 0.75544,0.2484 l 3.34419,1.8652 c 0.22753,0.1269 -0.0737,0.4935 -0.32303,0.5502 l -2.53192,0.5751 c -0.24975,0.057 -0.36305,-0.1828 -0.57387,-0.3346 l -2.74193,-1.9748 c -0.11989,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27622,-0.1754 0.27806,-0.1702 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7139"
-             inkscape:transform-center-x="0.36471052"
-             inkscape:transform-center-y="0.72705418" />
-          <path
-             id="path7141"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 454.69085,1438.2936 14.72061,-2.4946 c 0.34338,-0.058 0.58523,0.1452 0.78678,0.3809 l 2.02413,2.3671 c 0.2016,0.2358 -0.14123,0.4959 -0.48231,0.5629 l -15.16831,2.9835 c -0.34077,0.067 -0.63951,-0.1135 -0.78675,-0.381 l -1.53697,-2.7924 c -0.1472,-0.2675 0.10031,-0.5684 0.44282,-0.6264 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 471.24017,1435.5075 4.73892,-0.8214 c 0.34247,-0.059 0.58137,0.1383 0.78678,0.353 l 2.13814,2.235 c 0.20554,0.2149 -0.14214,0.4547 -0.48231,0.5216 l -4.87836,0.9596 c -0.33985,0.067 -0.60051,-0.133 -0.78675,-0.353 l -1.95924,-2.3144 c -0.1863,-0.2201 0.10119,-0.5212 0.44282,-0.5804 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7143" />
-          <path
-             id="path7145"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 477.72189,1434.3908 4.25555,-0.7477 c 0.34178,-0.06 0.58135,0.1322 0.78678,0.3375 l 2.13814,2.1367 c 0.20553,0.2054 -0.1427,0.4318 -0.48231,0.4986 l -4.30471,0.8467 c -0.33932,0.067 -0.59426,-0.1328 -0.78675,-0.3375 l -2.04952,-2.1795 c -0.19251,-0.2048 0.10176,-0.4949 0.44282,-0.5548 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 483.80361,1433.3299 3.93266,-0.6732 c 0.33258,-0.057 0.56567,0.1263 0.76558,0.3224 l 2.08052,2.0409 c 0.2,0.1961 -0.13885,0.4124 -0.46932,0.4762 l -3.9805,0.7678 c -0.33023,0.064 -0.57824,-0.1269 -0.76554,-0.3224 l -1.99429,-2.0818 c -0.18732,-0.1956 0.0989,-0.4731 0.43089,-0.5299 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7147" />
-          <path
-             id="path7149"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 489.56243,1432.3586 3.49706,-0.6074 c 0.33196,-0.058 0.56568,0.12 0.76558,0.3063 l 2.08052,1.9391 c 0.19999,0.1864 -0.13966,0.3877 -0.46932,0.4525 l -3.5449,0.6973 c -0.3295,0.065 -0.57824,-0.1206 -0.76554,-0.3063 l -1.99429,-1.978 c -0.18732,-0.1858 0.0995,-0.4459 0.43089,-0.5035 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 494.85266,1431.4662 3.05202,-0.5246 c 0.33162,-0.057 0.56568,0.1136 0.76558,0.29 l 2.08052,1.836 c 0.19999,0.1765 -0.1403,0.3638 -0.46932,0.4285 l -3.09986,0.6097 c -0.32898,0.065 -0.57824,-0.1142 -0.76554,-0.29 l -1.99429,-1.8728 c -0.18732,-0.176 0.0999,-0.4199 0.43089,-0.4768 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7151" />
-          <path
-             id="path7153"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 499.48759,1430.684 3.05202,-0.4988 c 0.33162,-0.054 0.56568,0.108 0.76558,0.2757 l 2.08052,1.746 c 0.19999,0.1679 -0.1403,0.346 -0.46932,0.4075 l -3.09986,0.5798 c -0.32898,0.062 -0.57824,-0.1086 -0.76554,-0.2758 l -1.99429,-1.7809 c -0.18732,-0.1674 0.0999,-0.3993 0.43089,-0.4535 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 504.17762,1429.868 2.70166,-0.4632 c 0.33085,-0.057 0.5657,0.1034 0.76558,0.264 l 2.08052,1.6719 c 0.20004,0.1607 -0.14135,0.3257 -0.46932,0.3902 l -2.7495,0.5408 c -0.32795,0.064 -0.57824,-0.104 -0.76554,-0.2641 l -1.99429,-1.7053 c -0.18732,-0.1603 0.10067,-0.3777 0.43089,-0.4343 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7155" />
-          <path
-             id="path7157"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 508.45089,1429.1633 2.70166,-0.4371 c 0.33085,-0.054 0.5657,0.098 0.76558,0.2491 l 2.08052,1.5775 c 0.20004,0.1516 -0.14135,0.3073 -0.46932,0.3681 l -2.7495,0.5103 c -0.32795,0.06 -0.57824,-0.098 -0.76554,-0.2492 l -1.99429,-1.609 c -0.18732,-0.1512 0.10067,-0.3563 0.43089,-0.4097 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 512.60906,1428.4424 2.70166,-0.4184 c 0.33085,-0.052 0.5657,0.094 0.76558,0.2384 l 2.08052,1.5101 c 0.20004,0.1451 -0.14135,0.2941 -0.46932,0.3523 l -2.7495,0.4885 c -0.32795,0.057 -0.57824,-0.094 -0.76554,-0.2385 l -1.99429,-1.5403 c -0.18732,-0.1447 0.10067,-0.341 0.43089,-0.3921 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7159" />
-          <path
-             id="path7161"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 516.77633,1427.7726 2.62492,-0.4448 c 0.3299,-0.056 0.5657,0.09 0.76558,0.2284 l 2.08052,1.4469 c 0.20004,0.139 -0.14135,0.2818 -0.46932,0.3376 l -2.7495,0.468 c -0.32795,0.055 -0.57889,-0.089 -0.76554,-0.2285 l -1.91755,-1.4319 c -0.18676,-0.1394 0.10174,-0.3199 0.43089,-0.3757 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 521.03501,1427.051 2.42068,-0.3892 c 0.32986,-0.053 0.55745,0.099 0.76558,0.2176 l 2.32063,1.317 c 0.20863,0.1184 -0.14135,0.2685 -0.46932,0.3217 l -2.7495,0.4459 c -0.32795,0.052 -0.57643,-0.088 -0.76554,-0.2177 l -1.95342,-1.3373 c -0.18911,-0.1295 0.1017,-0.3051 0.43089,-0.358 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7163" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 452.57798,1434.6551 11.12923,-1.6317 c 0.259,-0.038 0.41871,0.208 0.59558,0.4431 l 1.50759,2.0044 c 0.17693,0.2352 -0.1074,0.4817 -0.36511,0.5247 l -11.38645,1.8987 c -0.25749,0.043 -0.44999,-0.1804 -0.59556,-0.4433 l -1.22049,-2.2045 c -0.14557,-0.2629 0.0768,-0.5535 0.33521,-0.5914 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7165" />
-          <path
-             id="path7167"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 465.14481,1432.8122 4.899,-0.7203 c 0.25873,-0.038 0.40063,0.2129 0.59558,0.4201 l 1.77321,1.8851 c 0.19503,0.2073 -0.10774,0.4547 -0.36511,0.4976 l -5.17296,0.8626 c -0.2572,0.043 -0.42263,-0.1893 -0.59556,-0.4204 l -1.46937,-1.9639 c -0.17299,-0.2312 0.0771,-0.5229 0.33521,-0.5608 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 471.62681,1431.8596 4.86438,-0.7161 c 0.25852,-0.038 0.39723,0.2086 0.59563,0.405 l 1.80467,1.7862 c 0.19848,0.1964 -0.10793,0.4368 -0.36505,0.4797 l -5.0158,0.8364 c -0.25706,0.043 -0.40931,-0.1935 -0.59561,-0.4053 l -1.62336,-1.8453 c -0.18633,-0.2118 0.0772,-0.5026 0.33514,-0.5406 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7169" />
-          <path
-             id="path7171"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 478.00171,1430.898 4.18042,-0.6063 c 0.25845,-0.037 0.39724,0.201 0.59563,0.3902 l 1.80467,1.7213 c 0.19842,0.1893 -0.10819,0.4194 -0.36505,0.4622 l -4.17981,0.697 c -0.25679,0.043 -0.39478,-0.2008 -0.59561,-0.3906 l -1.83789,-1.7372 c -0.20084,-0.1898 0.1398,-0.4992 0.39764,-0.5366 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 483.79892,1430.0354 3.67118,-0.504 c 0.25839,-0.036 0.40547,0.171 0.60385,0.3528 l 1.80467,1.654 c 0.19844,0.1819 -0.10847,0.4013 -0.36505,0.4441 l -3.67879,0.6134 c -0.2565,0.043 -0.39478,-0.193 -0.59561,-0.3753 l -1.83789,-1.6694 c -0.20084,-0.1823 0.13971,-0.4802 0.39764,-0.5156 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7173" />
-          <path
-             id="path7175"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 489.09271,1429.2929 3.5803,-0.5261 c 0.25798,-0.038 0.40547,0.1653 0.60385,0.3409 l 1.80467,1.5984 c 0.19844,0.1758 -0.10847,0.3879 -0.36505,0.4292 l -3.67879,0.5928 c -0.2565,0.042 -0.39478,-0.1865 -0.59561,-0.3627 l -1.83789,-1.6133 c -0.20084,-0.1761 0.2311,-0.4213 0.48852,-0.4592 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 494.19377,1428.5433 3.20991,-0.4717 c 0.25793,-0.038 0.42396,0.1214 0.62227,0.2912 l 1.80473,1.5451 c 0.19845,0.1699 -0.10891,0.3722 -0.36504,0.4149 l -3.35786,0.5599 c -0.25623,0.043 -0.39548,-0.1795 -0.59562,-0.3506 l -1.8069,-1.5449 c -0.20009,-0.1711 0.23124,-0.4061 0.48851,-0.4439 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7177" />
-          <path
-             id="path7179"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 498.9165,1427.8332 2.74646,-0.3973 c 0.25789,-0.037 0.42394,0.1174 0.62227,0.2816 l 1.80473,1.4939 c 0.19847,0.1643 -0.10913,0.3585 -0.36504,0.4012 l -2.89441,0.4826 c -0.25611,0.043 -0.39548,-0.1736 -0.59562,-0.339 l -1.8069,-1.4938 c -0.20009,-0.1654 0.23134,-0.392 0.48851,-0.4292 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 503.16635,1427.2047 2.74646,-0.3835 c 0.25789,-0.036 0.42394,0.1133 0.62227,0.2718 l 1.80473,1.4421 c 0.19847,0.1586 -0.10913,0.3461 -0.36504,0.3873 l -2.89441,0.4659 c -0.25611,0.042 -0.39548,-0.1676 -0.59562,-0.3273 l -1.8069,-1.442 c -0.20009,-0.1597 0.23134,-0.3784 0.48851,-0.4143 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7181" />
-          <path
-             id="path7183"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 507.34415,1426.5781 2.48328,-0.359 c 0.25757,-0.037 0.42392,0.1096 0.62227,0.2629 l 1.80473,1.3947 c 0.19843,0.1533 -0.10958,0.3319 -0.36504,0.3745 l -2.63123,0.4387 c -0.25584,0.043 -0.39548,-0.1621 -0.59562,-0.3165 l -1.8069,-1.3946 c -0.20009,-0.1545 0.23168,-0.3636 0.48851,-0.4007 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 511.51931,1425.9526 1.99681,-0.2827 c 0.25755,-0.037 0.42389,0.1061 0.62227,0.2544 l 1.80473,1.3494 c 0.19847,0.1484 -0.10982,0.3196 -0.36504,0.3624 l -2.14476,0.3598 c -0.25564,0.043 -0.39548,-0.1568 -0.59562,-0.3062 l -1.8069,-1.3494 c -0.20009,-0.1495 0.23173,-0.3513 0.48851,-0.3877 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7185" />
-          <path
-             id="path7187"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 515.04488,1425.4534 1.99681,-0.2702 c 0.25755,-0.035 0.42389,0.1014 0.62227,0.2431 l 1.80473,1.2895 c 0.19847,0.1418 -0.10982,0.3054 -0.36504,0.3463 l -2.14476,0.3438 c -0.25564,0.041 -0.39548,-0.1498 -0.59562,-0.2926 l -1.8069,-1.2895 c -0.20009,-0.1428 0.23173,-0.3357 0.48851,-0.3704 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 518.52859,1424.9356 1.76656,-0.2279 c 0.25765,-0.033 0.41505,0.1117 0.62227,0.2355 l 2.03498,1.2156 c 0.20723,0.1238 -0.10982,0.2959 -0.36504,0.3356 l -2.14476,0.3331 c -0.25564,0.04 -0.39548,-0.1452 -0.59562,-0.2835 l -1.8069,-1.2495 c -0.20009,-0.1384 0.23167,-0.3258 0.48851,-0.3589 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7189" />
-          <path
-             id="path7191"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 450.58393,1431.1152 9.10708,-1.1496 c 0.25925,-0.033 0.42916,0.1753 0.59554,0.3916 l 1.42588,1.8534 c 0.16646,0.2164 -0.10732,0.4265 -0.36515,0.4637 l -9.40234,1.355 c -0.25759,0.037 -0.46337,-0.1516 -0.59552,-0.3917 l -1.10075,-1.9998 c -0.1322,-0.2402 0.0768,-0.49 0.33526,-0.5226 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 461.14009,1429.7827 5.07055,-0.6277 c 0.25912,-0.032 0.4291,0.1669 0.59554,0.373 l 1.42588,1.7652 c 0.16648,0.206 -0.10756,0.4044 -0.36515,0.4416 l -5.111,0.7365 c -0.2573,0.037 -0.43762,-0.1614 -0.59552,-0.3731 l -1.35556,-1.8178 c -0.15792,-0.2118 0.0769,-0.4657 0.33526,-0.4977 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7193" />
-          <path
-             id="path7195"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 467.76368,1428.9131 4.67261,-0.5673 c 0.25312,-0.031 0.41909,0.1617 0.58168,0.3611 l 1.3927,1.7087 c 0.16255,0.1995 -0.10505,0.3916 -0.35666,0.4275 l -4.71211,0.6726 c -0.25134,0.036 -0.42744,-0.1562 -0.58167,-0.3612 l -1.32401,-1.7596 c -0.15424,-0.205 0.0751,-0.4512 0.32746,-0.4818 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 473.8017,1428.1844 4.13261,-0.4996 c 0.25888,-0.031 0.42252,0.1618 0.59554,0.3486 l 1.47529,1.5921 c 0.17295,0.1866 -0.1075,0.3784 -0.36515,0.4127 l -4.28877,0.5706 c -0.2574,0.034 -0.43729,-0.1511 -0.59552,-0.3487 l -1.28926,-1.6105 c -0.15825,-0.1977 0.077,-0.434 0.33526,-0.4652 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7197" />
-          <path
-             id="path7199"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 479.37869,1427.4803 3.87442,-0.5106 c 0.25849,-0.034 0.41253,0.1699 0.59554,0.3448 l 1.60236,1.5308 c 0.18286,0.1746 -0.10794,0.371 -0.36515,0.4081 l -4.03058,0.5808 c -0.25698,0.037 -0.42586,-0.1592 -0.59552,-0.3448 l -1.41633,-1.5491 c -0.16973,-0.1856 0.0774,-0.426 0.33526,-0.46 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 484.58967,1426.8298 3.57896,-0.4467 c 0.25858,-0.032 0.40179,0.1753 0.59554,0.3304 l 1.79531,1.4368 c 0.19356,0.1549 -0.10792,0.3557 -0.36515,0.3911 l -3.73512,0.514 c -0.25693,0.035 -0.41319,-0.1656 -0.59552,-0.3304 l -1.60928,-1.4544 c -0.18242,-0.1649 0.0774,-0.4086 0.33526,-0.4408 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7201" />
-          <path
-             id="path7203"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 489.53231,1426.1828 3.35692,-0.441 c 0.25821,-0.034 0.40175,0.1702 0.59554,0.3208 l 1.79531,1.3946 c 0.19358,0.1504 -0.10828,0.3427 -0.36515,0.3797 l -3.51308,0.5063 c -0.25652,0.037 -0.41319,-0.1607 -0.59552,-0.3207 l -1.60928,-1.4118 c -0.18242,-0.16 0.0777,-0.3941 0.33526,-0.4279 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 494.30488,1425.5933 2.97943,-0.3895 c 0.25799,-0.034 0.40174,0.1625 0.59554,0.3062 l 1.79531,1.3311 c 0.19361,0.1436 -0.10852,0.3254 -0.36515,0.3624 l -3.13559,0.4519 c -0.25625,0.037 -0.41319,-0.1534 -0.59552,-0.3061 l -1.60928,-1.3475 c -0.18242,-0.1528 0.0779,-0.3749 0.33526,-0.4085 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7205" />
-          <path
-             id="path7207"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 498.68156,1425.0421 2.68932,-0.3501 c 0.25791,-0.034 0.40171,0.1562 0.59554,0.2944 l 1.79531,1.2798 c 0.1936,0.138 -0.10872,0.3114 -0.36515,0.3484 l -2.84548,0.4101 c -0.25612,0.037 -0.41319,-0.1475 -0.59552,-0.2943 l -1.60928,-1.2956 c -0.18242,-0.1469 0.0781,-0.3592 0.33526,-0.3927 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 502.81699,1424.5193 2.68932,-0.3371 c 0.25791,-0.033 0.40171,0.1504 0.59554,0.2835 l 1.79531,1.2325 c 0.1936,0.1329 -0.10872,0.2999 -0.36515,0.3355 l -2.84548,0.395 c -0.25612,0.036 -0.41319,-0.1421 -0.59552,-0.2834 l -1.60928,-1.2478 c -0.18242,-0.1414 0.0781,-0.3459 0.33526,-0.3782 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7209" />
-          <path
-             id="path7211"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 506.81318,1424.0041 2.23999,-0.2893 c 0.25775,-0.033 0.40168,0.1457 0.59554,0.2745 l 1.79531,1.1933 c 0.19361,0.1287 -0.10906,0.288 -0.36515,0.3249 l -2.39615,0.3453 c -0.25586,0.037 -0.41319,-0.1376 -0.59552,-0.2744 l -1.60928,-1.2081 c -0.18242,-0.1369 0.0783,-0.333 0.33526,-0.3662 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 510.41945,1423.5572 2.23999,-0.278 c 0.25775,-0.032 0.40168,0.14 0.59554,0.2638 l 1.79531,1.1466 c 0.19361,0.1237 -0.10906,0.2767 -0.36515,0.3122 l -2.39615,0.3318 c -0.25586,0.036 -0.41319,-0.1322 -0.59552,-0.2637 l -1.60928,-1.1608 c -0.18242,-0.1316 0.0783,-0.32 0.33526,-0.3519 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7213" />
-          <path
-             id="path7215"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 514.00115,1423.0964 2.70057,-0.3596 c 0.25733,-0.034 0.40169,0.1356 0.59554,0.2555 l 1.79531,1.1106 c 0.19362,0.1198 -0.1094,0.2655 -0.36515,0.3024 l -2.85673,0.4117 c -0.2556,0.037 -0.41319,-0.1281 -0.59552,-0.2554 l -1.60928,-1.1244 c -0.18242,-0.1275 0.0787,-0.3066 0.33526,-0.3408 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             id="path7217"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 448.90855,1428.1161 5.63036,-0.6248 c 0.25928,-0.029 0.44294,0.1441 0.59554,0.3466 l 1.3325,1.7687 c 0.15272,0.2027 -0.10729,0.3777 -0.36515,0.4105 l -5.93657,0.7538 c -0.25763,0.033 -0.47664,-0.1265 -0.59552,-0.3467 l -0.99642,-1.8456 c -0.11894,-0.2203 0.0768,-0.4338 0.33526,-0.4625 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 456.07139,1427.3009 5.11456,-0.5881 c 0.25908,-0.03 0.44295,0.1407 0.59554,0.3385 l 1.3325,1.7273 c 0.15269,0.1979 -0.10734,0.3684 -0.36515,0.4009 l -5.10827,0.6437 c -0.25757,0.033 -0.44735,-0.1425 -0.59552,-0.3386 l -1.30892,-1.7321 c -0.14819,-0.1961 0.077,-0.4219 0.33526,-0.4516 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7219" />
-          <path
-             id="path7221"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 462.56281,1426.5463 4.61648,-0.5268 c 0.25902,-0.03 0.44291,0.1371 0.59554,0.33 l 1.3325,1.6838 c 0.15272,0.193 -0.10744,0.3584 -0.36515,0.3909 l -4.61019,0.581 c -0.25751,0.033 -0.44735,-0.1389 -0.59552,-0.3301 l -1.30892,-1.6886 c -0.14819,-0.1911 0.0771,-0.4107 0.33526,-0.4402 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 468.60056,1425.854 4.33762,-0.4931 c 0.25897,-0.029 0.44286,0.1332 0.59554,0.3208 l 1.3325,1.6368 c 0.15272,0.1876 -0.10754,0.3475 -0.36515,0.38 l -4.33133,0.5458 c -0.25745,0.032 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7223" />
-          <path
-             id="path7225"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 474.32467,1425.2135 3.86408,-0.4391 c 0.25887,-0.029 0.43837,0.137 0.59554,0.3208 l 1.33459,1.5614 c 0.15718,0.1839 -0.10826,0.3422 -0.36515,0.38 l -3.85988,0.5672 c -0.25667,0.038 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 479.60347,1424.6159 3.70783,-0.4235 c 0.25881,-0.029 0.42624,0.1482 0.59554,0.3208 l 1.45362,1.4828 c 0.16936,0.1728 -0.10753,0.3476 -0.36515,0.38 l -3.88516,0.4896 c -0.25743,0.032 -0.44364,-0.138 -0.59552,-0.3209 l -1.24642,-1.5009 c -0.15184,-0.1828 0.0772,-0.3984 0.33526,-0.4279 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7227" />
-          <path
-             id="path7229"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 484.88205,1424.0301 2.91038,-0.3245 c 0.25872,-0.029 0.41533,0.1566 0.59554,0.3134 l 1.60987,1.4015 c 0.18036,0.157 -0.10763,0.3387 -0.36515,0.3712 l -3.08771,0.3891 c -0.25725,0.032 -0.43066,-0.1467 -0.59552,-0.3135 l -1.40267,-1.4193 c -0.16473,-0.1666 0.0772,-0.3891 0.33526,-0.4179 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 489.26317,1423.5327 2.91038,-0.315 c 0.25872,-0.028 0.40668,0.1629 0.59554,0.3042 l 1.79737,1.345 c 0.18905,0.1415 -0.10763,0.3288 -0.36515,0.3604 l -3.08771,0.3777 c -0.25725,0.031 -0.42004,-0.154 -0.59552,-0.3043 l -1.59017,-1.3623 c -0.17535,-0.1502 0.0772,-0.3777 0.33526,-0.4057 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7231" />
-          <path
-             id="path7233"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 493.62818,1423.0779 2.91038,-0.3006 c 0.25872,-0.027 0.40668,0.1555 0.59554,0.2903 l 1.79737,1.2832 c 0.18905,0.135 -0.10763,0.3137 -0.36515,0.3438 l -3.08771,0.3604 c -0.25725,0.03 -0.42004,-0.1469 -0.59552,-0.2903 l -1.59017,-1.2998 c -0.17535,-0.1433 0.0772,-0.3603 0.33526,-0.387 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 497.91616,1422.631 2.45855,-0.2751 c 0.25841,-0.029 0.4067,0.1481 0.59554,0.2766 l 1.79737,1.2225 c 0.18905,0.1286 -0.10808,0.2951 -0.36515,0.3275 l -2.63588,0.3321 c -0.25685,0.032 -0.42004,-0.14 -0.59552,-0.2766 l -1.59017,-1.2383 c -0.17535,-0.1365 0.0776,-0.3399 0.33526,-0.3687 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7235" />
-          <path
-             id="path7237"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 501.78123,1422.2229 2.43762,-0.275 c 0.25829,-0.029 0.40672,0.142 0.59554,0.265 l 1.79737,1.1713 c 0.18905,0.1232 -0.10821,0.2815 -0.36515,0.3138 l -2.61495,0.3296 c -0.25674,0.032 -0.42004,-0.1341 -0.59552,-0.265 l -1.59017,-1.1865 c -0.17535,-0.1307 0.0777,-0.3241 0.33526,-0.3532 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 505.5518,1421.8696 2.11562,-0.238 c 0.25807,-0.029 0.40674,0.1323 0.59554,0.2471 l 1.79737,1.0922 c 0.18906,0.1148 -0.10848,0.2602 -0.36515,0.2926 l -2.29295,0.2889 c -0.25646,0.032 -0.42004,-0.125 -0.59552,-0.2471 l -1.59017,-1.1063 c -0.17535,-0.1219 0.0779,-0.3004 0.33526,-0.3294 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7239" />
-          <path
-             id="path7241"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 509.17441,1421.5029 1.86761,-0.2095 c 0.25786,-0.029 0.4067,0.1254 0.59554,0.234 l 1.79737,1.0338 c 0.18904,0.1087 -0.10869,0.2447 -0.36515,0.277 l -2.04494,0.2577 c -0.25618,0.032 -0.42004,-0.1183 -0.59552,-0.2339 l -1.59017,-1.0472 c -0.17535,-0.1154 0.078,-0.283 0.33526,-0.3119 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="sssssssss" />
-          <path
-             sodipodi:nodetypes="sssssssss"
-             inkscape:connector-curvature="0"
-             d="m 512.35472,1421.1789 1.40841,-0.1539 c 0.25784,-0.028 0.40673,0.1193 0.59554,0.2227 l 1.79737,0.984 c 0.189,0.1035 -0.10889,0.2313 -0.36515,0.2636 l -1.58574,0.1998 c -0.25602,0.032 -0.42004,-0.1126 -0.59552,-0.2226 l -1.59017,-0.9967 c -0.17535,-0.1098 0.0781,-0.2688 0.33526,-0.2969 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7243" />
-          <path
-             id="path7245"
-             transform="matrix(0.99360958,-0.1128716,0,1,0,0)"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 450.26701,1477.3135 6.35126,0.077 0.97049,1.2438 -6.64425,-0.031 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 454.46572,1425.7741 5.72964,-0.5831 1.2141,1.0589 -5.89416,0.7012 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7247" />
-          <path
-             id="path7249"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 461.19718,1425.0866 5.72964,-0.5831 1.29638,1.0032 -5.71936,0.6238 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 467.4812,1424.4577 5.01441,-0.5172 1.32369,0.9827 -4.96903,0.5151 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7251" />
-          <path
-             id="path7253"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 473.2652,1423.8598 4.71239,-0.4766 1.22552,0.9605 -4.66701,0.4745 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 478.62568,1423.325 4.22215,-0.3799 1.0076,0.8765 -4.07063,0.4241 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7255" />
-          <path
-             id="path7257"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 483.31976,1422.8503 4.10186,-0.4272 1.00482,0.8801 -4.10634,0.4479 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 488.02944,1422.373 3.94836,-0.4001 1.08523,0.8246 -4.10634,0.4479 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7259" />
-          <path
-             id="path7261"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 492.53573,1421.9164 4.0649,-0.4119 1.08523,0.8014 -4.10634,0.4353 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 497.12539,1421.4513 4.14103,-0.4196 1.08523,0.778 -4.10634,0.4226 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7263" />
-          <path
-             id="path7265"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 501.78284,1420.9794 4.08424,-0.4139 0.96099,0.7307 -3.9821,0.4343 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 506.50535,1420.4878 4.08424,-0.4009 0.96099,0.7078 -3.9821,0.4207 z"
-             style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path7267" />
+        <g style="fill:#fafbfb;fill-opacity:1" id="g7121" transform="matrix(0.85239486,0,0,0.85239486,57.642494,214.40186)">
+          <path id="path7123" transform="matrix(0.97211389,-0.23450924,0.27190603,0.96232381,0,0)" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 47.697778,1511.0581 6.087718,0.2141 c 0.349743,0.012 0.522843,0.3039 0.632435,0.6325 l 1.203138,3.6075 c 0.109592,0.3286 -0.2994,0.553 -0.649558,0.5485 l -6.40556,-0.082 c -0.350353,0 -0.552167,-0.2944 -0.632435,-0.6324 l -0.868173,-3.6557 c -0.08027,-0.338 0.282107,-0.6335 0.632435,-0.6325 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cssssssssc"/>
+          <path sodipodi:nodetypes="cssssssssc" inkscape:connector-curvature="0" d="m 465.21397,1441.2337 5.97648,-1.17 c 0.34326,-0.067 0.59092,0.1627 0.78681,0.4409 l 2.1506,3.0546 c 0.19589,0.2783 -0.10119,0.6506 -0.44287,0.7249 l -5.82422,1.267 c -0.34184,0.075 -0.58591,-0.1659 -0.78679,-0.4408 l -2.3029,-3.1518 c -0.20088,-0.275 0.10199,-0.6472 0.44285,-0.725 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7125" inkscape:transform-center-x="0.50002642" inkscape:transform-center-y="0.95777293"/>
+          <path inkscape:transform-center-y="0.9612254" inkscape:transform-center-x="0.44493633" id="path7127" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 472.86949,1439.7116 4.96651,-1.0132 c 0.30643,-0.062 0.49497,0.1853 0.70013,0.4425 l 2.25743,2.8304 c 0.20521,0.2573 -0.0888,0.6579 -0.39408,0.7275 l -5.01763,1.1439 c -0.3055,0.069 -0.50641,-0.1768 -0.70011,-0.4424 l -2.21416,-3.0355 c -0.10992,-0.1507 -0.0581,-0.2652 0.0559,-0.4146 0.087,-0.114 0.34415,-0.246 0.34595,-0.2388 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+          <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 479.44154,1438.3333 6.18042,-1.2097 c 0.30632,-0.06 0.69706,0.086 0.92161,0.3193 l 2.56679,2.6635 c 0.22455,0.233 -0.0892,0.638 -0.39408,0.7073 l -6.76238,1.5361 c -0.30499,0.069 -0.50641,-0.1719 -0.70011,-0.4301 l -2.21416,-2.9513 c -0.10992,-0.1465 -0.0581,-0.2579 0.0559,-0.4031 0.087,-0.1109 0.34415,-0.2392 0.34595,-0.2322 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7129" inkscape:transform-center-x="0.44493633" inkscape:transform-center-y="0.93458356"/>
+          <path inkscape:transform-center-y="0.90626211" inkscape:transform-center-x="0.44493633" id="path7131" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 487.69681,1436.6835 22.45389,-4.6258 c 0.30535,-0.063 0.67279,0.1096 0.92161,0.3096 l 2.70741,2.1765 c 0.24824,0.1995 -0.0895,0.6168 -0.39408,0.6858 l -22.60384,5.1149 c -0.30455,0.069 -0.6324,0.01 -0.84854,-0.2218 l -2.63836,-2.8234 c -0.12261,-0.1312 -0.0581,-0.2501 0.0559,-0.3909 0.087,-0.1075 0.34393,-0.2318 0.34595,-0.2251 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+          <path inkscape:transform-center-y="0.76615965" inkscape:transform-center-x="0.36471052" id="path7133" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 512.01768,1431.6827 3.27189,-0.679 c 0.25053,-0.052 0.54511,0.1046 0.75544,0.2617 l 2.90858,2.1734 c 0.21252,0.1588 -0.0731,0.523 -0.32303,0.5798 l -3.397,0.7716 c -0.25009,0.057 -0.36195,-0.1942 -0.57387,-0.3526 l -2.89964,-2.168 c -0.12014,-0.09 -0.1139,-0.2887 -0.0205,-0.4078 0.0713,-0.091 0.27612,-0.1848 0.27806,-0.1793 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+          <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 516.87631,1430.6627 2.69737,-0.5392 c 0.2507,-0.05 0.54512,0.1018 0.75544,0.2547 l 2.90858,2.1148 c 0.21251,0.1545 -0.0732,0.5085 -0.32303,0.5642 l -2.82248,0.6293 c -0.25014,0.056 -0.36195,-0.189 -0.57387,-0.3431 l -2.89964,-2.1096 c -0.12014,-0.088 -0.1139,-0.2809 -0.0205,-0.3968 0.0713,-0.089 0.27612,-0.1798 0.27806,-0.1745 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7135" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.74552444"/>
+          <path inkscape:transform-center-y="0.72705418" inkscape:transform-center-x="0.36471052" id="path7137" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 520.94699,1429.8131 2.69737,-0.5258 c 0.2507,-0.049 0.54512,0.099 0.75544,0.2484 l 2.90858,2.0623 c 0.21251,0.1507 -0.0732,0.4959 -0.32303,0.5502 l -2.82248,0.6137 c -0.25014,0.055 -0.36195,-0.1843 -0.57387,-0.3346 l -2.89964,-2.0573 c -0.12014,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27612,-0.1754 0.27806,-0.1702 z" inkscape:connector-curvature="0" sodipodi:nodetypes="csssssssssc"/>
+          <path sodipodi:nodetypes="csssssssssc" inkscape:connector-curvature="0" d="m 525.09132,1428.99 1.81349,-0.3726 c 0.25019,-0.051 0.53014,0.1227 0.75544,0.2484 l 3.34419,1.8652 c 0.22753,0.1269 -0.0737,0.4935 -0.32303,0.5502 l -2.53192,0.5751 c -0.24975,0.057 -0.36305,-0.1828 -0.57387,-0.3346 l -2.74193,-1.9748 c -0.11989,-0.086 -0.1139,-0.2739 -0.0205,-0.3869 0.0713,-0.087 0.27622,-0.1754 0.27806,-0.1702 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7139" inkscape:transform-center-x="0.36471052" inkscape:transform-center-y="0.72705418"/>
+          <path id="path7141" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 454.69085,1438.2936 14.72061,-2.4946 c 0.34338,-0.058 0.58523,0.1452 0.78678,0.3809 l 2.02413,2.3671 c 0.2016,0.2358 -0.14123,0.4959 -0.48231,0.5629 l -15.16831,2.9835 c -0.34077,0.067 -0.63951,-0.1135 -0.78675,-0.381 l -1.53697,-2.7924 c -0.1472,-0.2675 0.10031,-0.5684 0.44282,-0.6264 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 471.24017,1435.5075 4.73892,-0.8214 c 0.34247,-0.059 0.58137,0.1383 0.78678,0.353 l 2.13814,2.235 c 0.20554,0.2149 -0.14214,0.4547 -0.48231,0.5216 l -4.87836,0.9596 c -0.33985,0.067 -0.60051,-0.133 -0.78675,-0.353 l -1.95924,-2.3144 c -0.1863,-0.2201 0.10119,-0.5212 0.44282,-0.5804 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7143"/>
+          <path id="path7145" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 477.72189,1434.3908 4.25555,-0.7477 c 0.34178,-0.06 0.58135,0.1322 0.78678,0.3375 l 2.13814,2.1367 c 0.20553,0.2054 -0.1427,0.4318 -0.48231,0.4986 l -4.30471,0.8467 c -0.33932,0.067 -0.59426,-0.1328 -0.78675,-0.3375 l -2.04952,-2.1795 c -0.19251,-0.2048 0.10176,-0.4949 0.44282,-0.5548 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 483.80361,1433.3299 3.93266,-0.6732 c 0.33258,-0.057 0.56567,0.1263 0.76558,0.3224 l 2.08052,2.0409 c 0.2,0.1961 -0.13885,0.4124 -0.46932,0.4762 l -3.9805,0.7678 c -0.33023,0.064 -0.57824,-0.1269 -0.76554,-0.3224 l -1.99429,-2.0818 c -0.18732,-0.1956 0.0989,-0.4731 0.43089,-0.5299 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7147"/>
+          <path id="path7149" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.56243,1432.3586 3.49706,-0.6074 c 0.33196,-0.058 0.56568,0.12 0.76558,0.3063 l 2.08052,1.9391 c 0.19999,0.1864 -0.13966,0.3877 -0.46932,0.4525 l -3.5449,0.6973 c -0.3295,0.065 -0.57824,-0.1206 -0.76554,-0.3063 l -1.99429,-1.978 c -0.18732,-0.1858 0.0995,-0.4459 0.43089,-0.5035 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 494.85266,1431.4662 3.05202,-0.5246 c 0.33162,-0.057 0.56568,0.1136 0.76558,0.29 l 2.08052,1.836 c 0.19999,0.1765 -0.1403,0.3638 -0.46932,0.4285 l -3.09986,0.6097 c -0.32898,0.065 -0.57824,-0.1142 -0.76554,-0.29 l -1.99429,-1.8728 c -0.18732,-0.176 0.0999,-0.4199 0.43089,-0.4768 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7151"/>
+          <path id="path7153" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 499.48759,1430.684 3.05202,-0.4988 c 0.33162,-0.054 0.56568,0.108 0.76558,0.2757 l 2.08052,1.746 c 0.19999,0.1679 -0.1403,0.346 -0.46932,0.4075 l -3.09986,0.5798 c -0.32898,0.062 -0.57824,-0.1086 -0.76554,-0.2758 l -1.99429,-1.7809 c -0.18732,-0.1674 0.0999,-0.3993 0.43089,-0.4535 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 504.17762,1429.868 2.70166,-0.4632 c 0.33085,-0.057 0.5657,0.1034 0.76558,0.264 l 2.08052,1.6719 c 0.20004,0.1607 -0.14135,0.3257 -0.46932,0.3902 l -2.7495,0.5408 c -0.32795,0.064 -0.57824,-0.104 -0.76554,-0.2641 l -1.99429,-1.7053 c -0.18732,-0.1603 0.10067,-0.3777 0.43089,-0.4343 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7155"/>
+          <path id="path7157" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 508.45089,1429.1633 2.70166,-0.4371 c 0.33085,-0.054 0.5657,0.098 0.76558,0.2491 l 2.08052,1.5775 c 0.20004,0.1516 -0.14135,0.3073 -0.46932,0.3681 l -2.7495,0.5103 c -0.32795,0.06 -0.57824,-0.098 -0.76554,-0.2492 l -1.99429,-1.609 c -0.18732,-0.1512 0.10067,-0.3563 0.43089,-0.4097 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 512.60906,1428.4424 2.70166,-0.4184 c 0.33085,-0.052 0.5657,0.094 0.76558,0.2384 l 2.08052,1.5101 c 0.20004,0.1451 -0.14135,0.2941 -0.46932,0.3523 l -2.7495,0.4885 c -0.32795,0.057 -0.57824,-0.094 -0.76554,-0.2385 l -1.99429,-1.5403 c -0.18732,-0.1447 0.10067,-0.341 0.43089,-0.3921 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7159"/>
+          <path id="path7161" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 516.77633,1427.7726 2.62492,-0.4448 c 0.3299,-0.056 0.5657,0.09 0.76558,0.2284 l 2.08052,1.4469 c 0.20004,0.139 -0.14135,0.2818 -0.46932,0.3376 l -2.7495,0.468 c -0.32795,0.055 -0.57889,-0.089 -0.76554,-0.2285 l -1.91755,-1.4319 c -0.18676,-0.1394 0.10174,-0.3199 0.43089,-0.3757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 521.03501,1427.051 2.42068,-0.3892 c 0.32986,-0.053 0.55745,0.099 0.76558,0.2176 l 2.32063,1.317 c 0.20863,0.1184 -0.14135,0.2685 -0.46932,0.3217 l -2.7495,0.4459 c -0.32795,0.052 -0.57643,-0.088 -0.76554,-0.2177 l -1.95342,-1.3373 c -0.18911,-0.1295 0.1017,-0.3051 0.43089,-0.358 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7163"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 452.57798,1434.6551 11.12923,-1.6317 c 0.259,-0.038 0.41871,0.208 0.59558,0.4431 l 1.50759,2.0044 c 0.17693,0.2352 -0.1074,0.4817 -0.36511,0.5247 l -11.38645,1.8987 c -0.25749,0.043 -0.44999,-0.1804 -0.59556,-0.4433 l -1.22049,-2.2045 c -0.14557,-0.2629 0.0768,-0.5535 0.33521,-0.5914 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7165"/>
+          <path id="path7167" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 465.14481,1432.8122 4.899,-0.7203 c 0.25873,-0.038 0.40063,0.2129 0.59558,0.4201 l 1.77321,1.8851 c 0.19503,0.2073 -0.10774,0.4547 -0.36511,0.4976 l -5.17296,0.8626 c -0.2572,0.043 -0.42263,-0.1893 -0.59556,-0.4204 l -1.46937,-1.9639 c -0.17299,-0.2312 0.0771,-0.5229 0.33521,-0.5608 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 471.62681,1431.8596 4.86438,-0.7161 c 0.25852,-0.038 0.39723,0.2086 0.59563,0.405 l 1.80467,1.7862 c 0.19848,0.1964 -0.10793,0.4368 -0.36505,0.4797 l -5.0158,0.8364 c -0.25706,0.043 -0.40931,-0.1935 -0.59561,-0.4053 l -1.62336,-1.8453 c -0.18633,-0.2118 0.0772,-0.5026 0.33514,-0.5406 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7169"/>
+          <path id="path7171" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 478.00171,1430.898 4.18042,-0.6063 c 0.25845,-0.037 0.39724,0.201 0.59563,0.3902 l 1.80467,1.7213 c 0.19842,0.1893 -0.10819,0.4194 -0.36505,0.4622 l -4.17981,0.697 c -0.25679,0.043 -0.39478,-0.2008 -0.59561,-0.3906 l -1.83789,-1.7372 c -0.20084,-0.1898 0.1398,-0.4992 0.39764,-0.5366 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 483.79892,1430.0354 3.67118,-0.504 c 0.25839,-0.036 0.40547,0.171 0.60385,0.3528 l 1.80467,1.654 c 0.19844,0.1819 -0.10847,0.4013 -0.36505,0.4441 l -3.67879,0.6134 c -0.2565,0.043 -0.39478,-0.193 -0.59561,-0.3753 l -1.83789,-1.6694 c -0.20084,-0.1823 0.13971,-0.4802 0.39764,-0.5156 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7173"/>
+          <path id="path7175" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.09271,1429.2929 3.5803,-0.5261 c 0.25798,-0.038 0.40547,0.1653 0.60385,0.3409 l 1.80467,1.5984 c 0.19844,0.1758 -0.10847,0.3879 -0.36505,0.4292 l -3.67879,0.5928 c -0.2565,0.042 -0.39478,-0.1865 -0.59561,-0.3627 l -1.83789,-1.6133 c -0.20084,-0.1761 0.2311,-0.4213 0.48852,-0.4592 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 494.19377,1428.5433 3.20991,-0.4717 c 0.25793,-0.038 0.42396,0.1214 0.62227,0.2912 l 1.80473,1.5451 c 0.19845,0.1699 -0.10891,0.3722 -0.36504,0.4149 l -3.35786,0.5599 c -0.25623,0.043 -0.39548,-0.1795 -0.59562,-0.3506 l -1.8069,-1.5449 c -0.20009,-0.1711 0.23124,-0.4061 0.48851,-0.4439 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7177"/>
+          <path id="path7179" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 498.9165,1427.8332 2.74646,-0.3973 c 0.25789,-0.037 0.42394,0.1174 0.62227,0.2816 l 1.80473,1.4939 c 0.19847,0.1643 -0.10913,0.3585 -0.36504,0.4012 l -2.89441,0.4826 c -0.25611,0.043 -0.39548,-0.1736 -0.59562,-0.339 l -1.8069,-1.4938 c -0.20009,-0.1654 0.23134,-0.392 0.48851,-0.4292 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 503.16635,1427.2047 2.74646,-0.3835 c 0.25789,-0.036 0.42394,0.1133 0.62227,0.2718 l 1.80473,1.4421 c 0.19847,0.1586 -0.10913,0.3461 -0.36504,0.3873 l -2.89441,0.4659 c -0.25611,0.042 -0.39548,-0.1676 -0.59562,-0.3273 l -1.8069,-1.442 c -0.20009,-0.1597 0.23134,-0.3784 0.48851,-0.4143 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7181"/>
+          <path id="path7183" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 507.34415,1426.5781 2.48328,-0.359 c 0.25757,-0.037 0.42392,0.1096 0.62227,0.2629 l 1.80473,1.3947 c 0.19843,0.1533 -0.10958,0.3319 -0.36504,0.3745 l -2.63123,0.4387 c -0.25584,0.043 -0.39548,-0.1621 -0.59562,-0.3165 l -1.8069,-1.3946 c -0.20009,-0.1545 0.23168,-0.3636 0.48851,-0.4007 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 511.51931,1425.9526 1.99681,-0.2827 c 0.25755,-0.037 0.42389,0.1061 0.62227,0.2544 l 1.80473,1.3494 c 0.19847,0.1484 -0.10982,0.3196 -0.36504,0.3624 l -2.14476,0.3598 c -0.25564,0.043 -0.39548,-0.1568 -0.59562,-0.3062 l -1.8069,-1.3494 c -0.20009,-0.1495 0.23173,-0.3513 0.48851,-0.3877 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7185"/>
+          <path id="path7187" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 515.04488,1425.4534 1.99681,-0.2702 c 0.25755,-0.035 0.42389,0.1014 0.62227,0.2431 l 1.80473,1.2895 c 0.19847,0.1418 -0.10982,0.3054 -0.36504,0.3463 l -2.14476,0.3438 c -0.25564,0.041 -0.39548,-0.1498 -0.59562,-0.2926 l -1.8069,-1.2895 c -0.20009,-0.1428 0.23173,-0.3357 0.48851,-0.3704 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 518.52859,1424.9356 1.76656,-0.2279 c 0.25765,-0.033 0.41505,0.1117 0.62227,0.2355 l 2.03498,1.2156 c 0.20723,0.1238 -0.10982,0.2959 -0.36504,0.3356 l -2.14476,0.3331 c -0.25564,0.04 -0.39548,-0.1452 -0.59562,-0.2835 l -1.8069,-1.2495 c -0.20009,-0.1384 0.23167,-0.3258 0.48851,-0.3589 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7189"/>
+          <path id="path7191" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 450.58393,1431.1152 9.10708,-1.1496 c 0.25925,-0.033 0.42916,0.1753 0.59554,0.3916 l 1.42588,1.8534 c 0.16646,0.2164 -0.10732,0.4265 -0.36515,0.4637 l -9.40234,1.355 c -0.25759,0.037 -0.46337,-0.1516 -0.59552,-0.3917 l -1.10075,-1.9998 c -0.1322,-0.2402 0.0768,-0.49 0.33526,-0.5226 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 461.14009,1429.7827 5.07055,-0.6277 c 0.25912,-0.032 0.4291,0.1669 0.59554,0.373 l 1.42588,1.7652 c 0.16648,0.206 -0.10756,0.4044 -0.36515,0.4416 l -5.111,0.7365 c -0.2573,0.037 -0.43762,-0.1614 -0.59552,-0.3731 l -1.35556,-1.8178 c -0.15792,-0.2118 0.0769,-0.4657 0.33526,-0.4977 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7193"/>
+          <path id="path7195" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 467.76368,1428.9131 4.67261,-0.5673 c 0.25312,-0.031 0.41909,0.1617 0.58168,0.3611 l 1.3927,1.7087 c 0.16255,0.1995 -0.10505,0.3916 -0.35666,0.4275 l -4.71211,0.6726 c -0.25134,0.036 -0.42744,-0.1562 -0.58167,-0.3612 l -1.32401,-1.7596 c -0.15424,-0.205 0.0751,-0.4512 0.32746,-0.4818 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 473.8017,1428.1844 4.13261,-0.4996 c 0.25888,-0.031 0.42252,0.1618 0.59554,0.3486 l 1.47529,1.5921 c 0.17295,0.1866 -0.1075,0.3784 -0.36515,0.4127 l -4.28877,0.5706 c -0.2574,0.034 -0.43729,-0.1511 -0.59552,-0.3487 l -1.28926,-1.6105 c -0.15825,-0.1977 0.077,-0.434 0.33526,-0.4652 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7197"/>
+          <path id="path7199" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 479.37869,1427.4803 3.87442,-0.5106 c 0.25849,-0.034 0.41253,0.1699 0.59554,0.3448 l 1.60236,1.5308 c 0.18286,0.1746 -0.10794,0.371 -0.36515,0.4081 l -4.03058,0.5808 c -0.25698,0.037 -0.42586,-0.1592 -0.59552,-0.3448 l -1.41633,-1.5491 c -0.16973,-0.1856 0.0774,-0.426 0.33526,-0.46 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 484.58967,1426.8298 3.57896,-0.4467 c 0.25858,-0.032 0.40179,0.1753 0.59554,0.3304 l 1.79531,1.4368 c 0.19356,0.1549 -0.10792,0.3557 -0.36515,0.3911 l -3.73512,0.514 c -0.25693,0.035 -0.41319,-0.1656 -0.59552,-0.3304 l -1.60928,-1.4544 c -0.18242,-0.1649 0.0774,-0.4086 0.33526,-0.4408 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7201"/>
+          <path id="path7203" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 489.53231,1426.1828 3.35692,-0.441 c 0.25821,-0.034 0.40175,0.1702 0.59554,0.3208 l 1.79531,1.3946 c 0.19358,0.1504 -0.10828,0.3427 -0.36515,0.3797 l -3.51308,0.5063 c -0.25652,0.037 -0.41319,-0.1607 -0.59552,-0.3207 l -1.60928,-1.4118 c -0.18242,-0.16 0.0777,-0.3941 0.33526,-0.4279 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 494.30488,1425.5933 2.97943,-0.3895 c 0.25799,-0.034 0.40174,0.1625 0.59554,0.3062 l 1.79531,1.3311 c 0.19361,0.1436 -0.10852,0.3254 -0.36515,0.3624 l -3.13559,0.4519 c -0.25625,0.037 -0.41319,-0.1534 -0.59552,-0.3061 l -1.60928,-1.3475 c -0.18242,-0.1528 0.0779,-0.3749 0.33526,-0.4085 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7205"/>
+          <path id="path7207" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 498.68156,1425.0421 2.68932,-0.3501 c 0.25791,-0.034 0.40171,0.1562 0.59554,0.2944 l 1.79531,1.2798 c 0.1936,0.138 -0.10872,0.3114 -0.36515,0.3484 l -2.84548,0.4101 c -0.25612,0.037 -0.41319,-0.1475 -0.59552,-0.2943 l -1.60928,-1.2956 c -0.18242,-0.1469 0.0781,-0.3592 0.33526,-0.3927 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 502.81699,1424.5193 2.68932,-0.3371 c 0.25791,-0.033 0.40171,0.1504 0.59554,0.2835 l 1.79531,1.2325 c 0.1936,0.1329 -0.10872,0.2999 -0.36515,0.3355 l -2.84548,0.395 c -0.25612,0.036 -0.41319,-0.1421 -0.59552,-0.2834 l -1.60928,-1.2478 c -0.18242,-0.1414 0.0781,-0.3459 0.33526,-0.3782 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7209"/>
+          <path id="path7211" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 506.81318,1424.0041 2.23999,-0.2893 c 0.25775,-0.033 0.40168,0.1457 0.59554,0.2745 l 1.79531,1.1933 c 0.19361,0.1287 -0.10906,0.288 -0.36515,0.3249 l -2.39615,0.3453 c -0.25586,0.037 -0.41319,-0.1376 -0.59552,-0.2744 l -1.60928,-1.2081 c -0.18242,-0.1369 0.0783,-0.333 0.33526,-0.3662 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 510.41945,1423.5572 2.23999,-0.278 c 0.25775,-0.032 0.40168,0.14 0.59554,0.2638 l 1.79531,1.1466 c 0.19361,0.1237 -0.10906,0.2767 -0.36515,0.3122 l -2.39615,0.3318 c -0.25586,0.036 -0.41319,-0.1322 -0.59552,-0.2637 l -1.60928,-1.1608 c -0.18242,-0.1316 0.0783,-0.32 0.33526,-0.3519 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7213"/>
+          <path id="path7215" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 514.00115,1423.0964 2.70057,-0.3596 c 0.25733,-0.034 0.40169,0.1356 0.59554,0.2555 l 1.79531,1.1106 c 0.19362,0.1198 -0.1094,0.2655 -0.36515,0.3024 l -2.85673,0.4117 c -0.2556,0.037 -0.41319,-0.1281 -0.59552,-0.2554 l -1.60928,-1.1244 c -0.18242,-0.1275 0.0787,-0.3066 0.33526,-0.3408 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path id="path7217" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 448.90855,1428.1161 5.63036,-0.6248 c 0.25928,-0.029 0.44294,0.1441 0.59554,0.3466 l 1.3325,1.7687 c 0.15272,0.2027 -0.10729,0.3777 -0.36515,0.4105 l -5.93657,0.7538 c -0.25763,0.033 -0.47664,-0.1265 -0.59552,-0.3467 l -0.99642,-1.8456 c -0.11894,-0.2203 0.0768,-0.4338 0.33526,-0.4625 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 456.07139,1427.3009 5.11456,-0.5881 c 0.25908,-0.03 0.44295,0.1407 0.59554,0.3385 l 1.3325,1.7273 c 0.15269,0.1979 -0.10734,0.3684 -0.36515,0.4009 l -5.10827,0.6437 c -0.25757,0.033 -0.44735,-0.1425 -0.59552,-0.3386 l -1.30892,-1.7321 c -0.14819,-0.1961 0.077,-0.4219 0.33526,-0.4516 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7219"/>
+          <path id="path7221" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 462.56281,1426.5463 4.61648,-0.5268 c 0.25902,-0.03 0.44291,0.1371 0.59554,0.33 l 1.3325,1.6838 c 0.15272,0.193 -0.10744,0.3584 -0.36515,0.3909 l -4.61019,0.581 c -0.25751,0.033 -0.44735,-0.1389 -0.59552,-0.3301 l -1.30892,-1.6886 c -0.14819,-0.1911 0.0771,-0.4107 0.33526,-0.4402 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 468.60056,1425.854 4.33762,-0.4931 c 0.25897,-0.029 0.44286,0.1332 0.59554,0.3208 l 1.3325,1.6368 c 0.15272,0.1876 -0.10754,0.3475 -0.36515,0.38 l -4.33133,0.5458 c -0.25745,0.032 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7223"/>
+          <path id="path7225" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 474.32467,1425.2135 3.86408,-0.4391 c 0.25887,-0.029 0.43837,0.137 0.59554,0.3208 l 1.33459,1.5614 c 0.15718,0.1839 -0.10826,0.3422 -0.36515,0.38 l -3.85988,0.5672 c -0.25667,0.038 -0.44735,-0.135 -0.59552,-0.3209 l -1.30892,-1.6415 c -0.14819,-0.1858 0.0772,-0.3986 0.33526,-0.4279 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 479.60347,1424.6159 3.70783,-0.4235 c 0.25881,-0.029 0.42624,0.1482 0.59554,0.3208 l 1.45362,1.4828 c 0.16936,0.1728 -0.10753,0.3476 -0.36515,0.38 l -3.88516,0.4896 c -0.25743,0.032 -0.44364,-0.138 -0.59552,-0.3209 l -1.24642,-1.5009 c -0.15184,-0.1828 0.0772,-0.3984 0.33526,-0.4279 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7227"/>
+          <path id="path7229" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 484.88205,1424.0301 2.91038,-0.3245 c 0.25872,-0.029 0.41533,0.1566 0.59554,0.3134 l 1.60987,1.4015 c 0.18036,0.157 -0.10763,0.3387 -0.36515,0.3712 l -3.08771,0.3891 c -0.25725,0.032 -0.43066,-0.1467 -0.59552,-0.3135 l -1.40267,-1.4193 c -0.16473,-0.1666 0.0772,-0.3891 0.33526,-0.4179 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 489.26317,1423.5327 2.91038,-0.315 c 0.25872,-0.028 0.40668,0.1629 0.59554,0.3042 l 1.79737,1.345 c 0.18905,0.1415 -0.10763,0.3288 -0.36515,0.3604 l -3.08771,0.3777 c -0.25725,0.031 -0.42004,-0.154 -0.59552,-0.3043 l -1.59017,-1.3623 c -0.17535,-0.1502 0.0772,-0.3777 0.33526,-0.4057 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7231"/>
+          <path id="path7233" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 493.62818,1423.0779 2.91038,-0.3006 c 0.25872,-0.027 0.40668,0.1555 0.59554,0.2903 l 1.79737,1.2832 c 0.18905,0.135 -0.10763,0.3137 -0.36515,0.3438 l -3.08771,0.3604 c -0.25725,0.03 -0.42004,-0.1469 -0.59552,-0.2903 l -1.59017,-1.2998 c -0.17535,-0.1433 0.0772,-0.3603 0.33526,-0.387 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 497.91616,1422.631 2.45855,-0.2751 c 0.25841,-0.029 0.4067,0.1481 0.59554,0.2766 l 1.79737,1.2225 c 0.18905,0.1286 -0.10808,0.2951 -0.36515,0.3275 l -2.63588,0.3321 c -0.25685,0.032 -0.42004,-0.14 -0.59552,-0.2766 l -1.59017,-1.2383 c -0.17535,-0.1365 0.0776,-0.3399 0.33526,-0.3687 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7235"/>
+          <path id="path7237" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 501.78123,1422.2229 2.43762,-0.275 c 0.25829,-0.029 0.40672,0.142 0.59554,0.265 l 1.79737,1.1713 c 0.18905,0.1232 -0.10821,0.2815 -0.36515,0.3138 l -2.61495,0.3296 c -0.25674,0.032 -0.42004,-0.1341 -0.59552,-0.265 l -1.59017,-1.1865 c -0.17535,-0.1307 0.0777,-0.3241 0.33526,-0.3532 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 505.5518,1421.8696 2.11562,-0.238 c 0.25807,-0.029 0.40674,0.1323 0.59554,0.2471 l 1.79737,1.0922 c 0.18906,0.1148 -0.10848,0.2602 -0.36515,0.2926 l -2.29295,0.2889 c -0.25646,0.032 -0.42004,-0.125 -0.59552,-0.2471 l -1.59017,-1.1063 c -0.17535,-0.1219 0.0779,-0.3004 0.33526,-0.3294 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7239"/>
+          <path id="path7241" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 509.17441,1421.5029 1.86761,-0.2095 c 0.25786,-0.029 0.4067,0.1254 0.59554,0.234 l 1.79737,1.0338 c 0.18904,0.1087 -0.10869,0.2447 -0.36515,0.277 l -2.04494,0.2577 c -0.25618,0.032 -0.42004,-0.1183 -0.59552,-0.2339 l -1.59017,-1.0472 c -0.17535,-0.1154 0.078,-0.283 0.33526,-0.3119 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssss"/>
+          <path sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" d="m 512.35472,1421.1789 1.40841,-0.1539 c 0.25784,-0.028 0.40673,0.1193 0.59554,0.2227 l 1.79737,0.984 c 0.189,0.1035 -0.10889,0.2313 -0.36515,0.2636 l -1.58574,0.1998 c -0.25602,0.032 -0.42004,-0.1126 -0.59552,-0.2226 l -1.59017,-0.9967 c -0.17535,-0.1098 0.0781,-0.2688 0.33526,-0.2969 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7243"/>
+          <path id="path7245" transform="matrix(0.99360958,-0.1128716,0,1,0,0)" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 450.26701,1477.3135 6.35126,0.077 0.97049,1.2438 -6.64425,-0.031 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 454.46572,1425.7741 5.72964,-0.5831 1.2141,1.0589 -5.89416,0.7012 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7247"/>
+          <path id="path7249" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 461.19718,1425.0866 5.72964,-0.5831 1.29638,1.0032 -5.71936,0.6238 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 467.4812,1424.4577 5.01441,-0.5172 1.32369,0.9827 -4.96903,0.5151 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7251"/>
+          <path id="path7253" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 473.2652,1423.8598 4.71239,-0.4766 1.22552,0.9605 -4.66701,0.4745 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 478.62568,1423.325 4.22215,-0.3799 1.0076,0.8765 -4.07063,0.4241 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7255"/>
+          <path id="path7257" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 483.31976,1422.8503 4.10186,-0.4272 1.00482,0.8801 -4.10634,0.4479 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 488.02944,1422.373 3.94836,-0.4001 1.08523,0.8246 -4.10634,0.4479 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7259"/>
+          <path id="path7261" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 492.53573,1421.9164 4.0649,-0.4119 1.08523,0.8014 -4.10634,0.4353 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 497.12539,1421.4513 4.14103,-0.4196 1.08523,0.778 -4.10634,0.4226 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7263"/>
+          <path id="path7265" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 501.78284,1420.9794 4.08424,-0.4139 0.96099,0.7307 -3.9821,0.4343 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 506.50535,1420.4878 4.08424,-0.4009 0.96099,0.7078 -3.9821,0.4207 z" style="fill:#fafbfb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path7267"/>
         </g>
       </g>
     </g>
diff --git a/misc/images/svg/elements/Zabbix_server_2D.svg b/misc/images/svg/elements/Zabbix_server_2D.svg
index 495be62a7c1..902e28fcf1c 100644
--- a/misc/images/svg/elements/Zabbix_server_2D.svg
+++ b/misc/images/svg/elements/Zabbix_server_2D.svg
@@ -1,701 +1,134 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.00603"
-   height="17.46875"
-   id="svg164138"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 74">
-  <defs
-     id="defs164140">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0-7-9"
-       id="linearGradient31597"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,1.0820341,-318.97332,-1470.1571)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient42443-7-52-0-7-9">
-      <stop
-         id="stop42445-53-8-3-8-0"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-2-7-4-5-0" />
-      <stop
-         id="stop42449-3-19-2-9-6"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.00603" height="17.46875" id="svg164138" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 74">
+  <defs id="defs164140">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0-7-9" id="linearGradient31597" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,1.0820341,-318.97332,-1470.1571)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient42443-7-52-0-7-9">
+      <stop id="stop42445-53-8-3-8-0" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-2-7-4-5-0"/>
+      <stop id="stop42449-3-19-2-9-6" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect32175"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect32177"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-6-8-6-4"
-       id="linearGradient31599"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,-0.03023962,1.0816114,-316.11372,-1470.1571)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-6-8-6-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-76-6-4-8" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-7-9-74-6" />
+    <inkscape:path-effect effect="spiro" id="path-effect32175" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect32177" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-6-8-6-4" id="linearGradient31599" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,-0.03023962,1.0816114,-316.11372,-1470.1571)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-6-8-6-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-76-6-4-8"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-7-9-74-6"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-5-4-29-6"
-       id="linearGradient31601"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,1.0820341,-342.61954,-1470.3957)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-5-4-29-6">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-5-2-0-0" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-28-8-8-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-5-4-29-6" id="linearGradient31601" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,1.0820341,-342.61954,-1470.3957)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-5-4-29-6">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-5-2-0-0"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-28-8-8-2"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-9-5-1-5"
-       id="linearGradient31603"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,1.0820341,-317.23612,-1470.1571)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-9-5-1-5">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-6-4-9-0" />
-      <stop
-         id="stop76664-9-25-9-0-8-2"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-21-6-7-8" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-9-5-1-5" id="linearGradient31603" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,1.0820341,-317.23612,-1470.1571)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-9-5-1-5">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-6-4-9-0"/>
+      <stop id="stop76664-9-25-9-0-8-2" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-21-6-7-8"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect32179"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect32181"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect32183"
-       effect="spiro" />
+    <inkscape:path-effect is_visible="true" id="path-effect32179" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect32181" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect32183" effect="spiro"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="16.144336"
-     inkscape:cy="63.012067"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="88"
-     inkscape:window-y="116"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata164143">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="16.144336" inkscape:cy="63.012067" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="88" inkscape:window-y="116" inkscape:window-maximized="0"/>
+  <metadata id="metadata164143">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-358.85566,-577.9055)">
-    <g
-       transform="translate(287.92106,-6601.407)"
-       style="display:inline"
-       id="g113383"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Zabbix_server_2D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path31417"
-         style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.94771594;stroke-opacity:1;display:inline"
-         d="m 77.18458,7179.7898 115.4487,0 0,16.5302 -115.4487,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 94.245779,7179.7898 62.155701,0 0,16.5302 -62.155701,0 z"
-         style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.86010271;stroke-opacity:1;display:inline"
-         id="path31419"
-         sodipodi:nodetypes="ccccc" />
-      <rect
-         style="fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         id="rect31421"
-         width="15.593775"
-         height="15.593775"
-         x="78.265373"
-         y="7180.1841"
-         ry="0"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\text4214.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31423"
-         d="m 77.88898,7180.2714 c 0.7616,0 1.4037,0.8273 1.4533,1.8556 l 0.6205,12.5477 c 0.05,1.0281 -0.5285,1.8557 -1.29,1.8557 l -5.5518,0 c -0.7615,0 -1.4038,-0.8276 -1.4533,-1.8557 l -0.147,-3.0263 0.8491,-0.1333 0,-5.8098 -1.143,0.1544 -0.1796,-3.7333 c -0.05,-1.0281 0.5285,-1.8557 1.29,-1.8557 l 5.5518,0 z m -2.7269,6.075 c -0.2416,0.014 -0.427,0.5598 -0.4082,1.2151 0.019,0.655 0.2319,1.1613 0.4735,1.1487 0.2416,-0.014 0.4107,-0.538 0.3919,-1.193 -0.019,-0.6552 -0.2156,-1.1835 -0.4572,-1.1708 z"
-         style="fill:url(#linearGradient31597);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21640682;stroke-miterlimit:4;stroke-dasharray:none;display:inline" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 75.76058,7181.9184 c -0.062,-0.846 -0.4414,-0.5646 -1.119,-0.079 l -1.3653,1.8238 0.3256,12.2874 c 0.3058,0.6698 0.6828,0.3005 1.1237,0.1333 l 1.577,-2.1767 c -0.3209,-0.5604 -0.4055,-0.2753 -0.9297,-0.054 l -0.6884,0.5188 -0.2953,-10.5374 z"
-         inkscape:path-effect="#path-effect32175"
-         id="path31425"
-         d="m 75.76058,7181.9184 -1.119,-0.079 -1.3653,1.8238 0.3256,12.2874 1.1237,0.1333 1.577,-2.1767 -0.9297,-0.054 -0.6884,0.5188 -0.2953,-10.5374 1.3714,-1.9162"
-         style="fill:#808080;stroke:none;display:inline" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 75.82978,7184.5479 -1.0251,1.0264 0.2408,9.0864 1.257,-0.7507 0.038,1.4746 -1.6211,0.7015 -0.3584,-12.3035 1.4053,-1.8657 z"
-         inkscape:path-effect="#path-effect32177"
-         id="path31427"
-         d="m 75.82978,7184.5479 -1.0251,1.0264 0.2408,9.0864 1.257,-0.7507 0.038,1.4746 -1.6211,0.7015 -0.3584,-12.3035 1.4053,-1.8657 0.0635,2.631"
-         style="fill:#4d4d4d;stroke:none;display:inline" />
-      <path
-         id="path31429"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429;display:inline"
-         d="m 94.921679,7181.2819 30.253801,0.049 0.1831,6.4038 -30.183801,-0.047 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 98.239679,7182.9533 7.380601,0 0,0.7427 -7.380601,0 z"
-         id="path31431"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 116.41038,7182.8175 0,3.2964 3.1352,0 0,-2.8356 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.064 -1.0287,0 -0.016,0.093 -0.6694,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z"
-         id="path31433"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path31435"
-         d="m 106.99198,7182.9533 7.3806,0 0,0.7427 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path31437"
-         d="m 98.448679,7184.346 7.380601,0 0,0.4179 -7.380601,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 107.20098,7184.346 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path31439" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 98.605479,7185.4603 7.380601,0 0,0.4179 -7.380601,0 z"
-         id="path31441" />
-      <path
-         id="path31443"
-         d="m 107.35768,7185.4603 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path31445"
-         d="m 98.657679,7186.5282 7.380701,0 0,0.4178 -7.380701,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 107.40998,7186.5282 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path31447" />
-      <path
-         id="path31449"
-         d="m 116.29288,7186.5282 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path31451"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 94.921679,7182.3497 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5125 -0.091,-1.2445 -0.061,-1.561 2.8773,-0.052 22.253301,-0.01 25.054801,0 0.017,0.2962 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.532901,-0.01 -24.519001,0 0.1466,1.415 0.077,3.6728 0.2085,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 125.33358,7181.2818 30.1103,-0.046 0.065,6.4995 -29.9797,0 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429;display:inline"
-         id="path31453" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31455"
-         d="m 128.65158,7182.9533 7.3806,0 0,0.7427 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path31457"
-         d="m 146.82228,7182.8175 0,3.2964 3.1351,0 0,-3.2964 -1.4369,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9798,0 0.016,-0.1162 -1.6983,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 137.40388,7182.9533 7.3806,0 0,0.7427 -7.3806,0 z"
-         id="path31459"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 128.86058,7184.346 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path31461"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path31463"
-         d="m 137.61278,7184.346 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path31465"
-         d="m 129.01738,7185.4603 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 137.76958,7185.4603 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path31467"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 129.06958,7186.5282 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path31469"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path31471"
-         d="m 137.82188,7186.5282 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 146.70468,7186.5282 7.3807,0 0,0.4178 -7.3807,0 z"
-         id="path31473"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 125.33358,7182.3497 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5125 -0.091,-1.2445 -0.061,-1.561 2.8773,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2962 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6728 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z"
-         style="fill:#000000;stroke:none;display:inline"
-         id="path31475" />
-      <path
-         id="path31477"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         d="m 120.34348,7182.7979 0,0.4761 2.1704,0 0.016,0.8008 0.5267,0 0,-0.8002 0,-0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 120.34348,7186.1175 0,-0.4758 2.1704,0 0.016,-0.801 0.5266,0 0,0.8002 0,0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         id="path31479" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 150.57918,7182.7979 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8002 0,-0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         id="path31481" />
-      <path
-         id="path31483"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         d="m 150.57928,7186.1175 0,-0.4758 2.1703,0 0.016,-0.801 0.5267,0 0,0.8002 0,0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 157.18678,7182.6058 32.5924,0 -0.1165,4.1673 -32.5924,0 z"
-         style="fill:url(#linearGradient31599);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.51374948;display:inline"
-         id="path31485" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 187.36438,7183.5385 0.4495,0 c 0.1014,0 0.1771,0.01 0.2271,0.019 0.067,0.017 0.1207,0.048 0.1608,0.093 0.04,0.044 0.065,0.099 0.076,0.163 0.011,0.064 0,0.1435 -0.019,0.2378 -0.02,0.083 -0.05,0.1542 -0.09,0.2141 -0.049,0.073 -0.1067,0.1325 -0.1743,0.1778 -0.051,0.034 -0.1154,0.061 -0.1927,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4628,0 z m 0.204,0.1702 -0.1644,0.6664 0.1836,0 c 0.069,0 0.1191,0 0.1511,-0.01 0.042,-0.01 0.078,-0.022 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.097 0.028,-0.045 0.051,-0.1065 0.07,-0.1843 0.019,-0.078 0.026,-0.1374 0.019,-0.1791 -0.01,-0.041 -0.022,-0.074 -0.046,-0.097 -0.024,-0.023 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z m -1.2773,0.836 -0.1872,-1.0062 0.2667,0 0.1246,0.7447 0.482,-0.7447 0.2609,0 -0.6844,1.0062 z m -1.2931,-1.0062 0.4495,0 c 0.1014,0 0.1771,0.01 0.2271,0.019 0.067,0.017 0.1207,0.048 0.1607,0.093 0.04,0.044 0.065,0.099 0.076,0.163 0.011,0.064 0,0.1435 -0.019,0.2378 -0.02,0.083 -0.051,0.1542 -0.09,0.2141 -0.048,0.073 -0.1066,0.1325 -0.1743,0.1778 -0.051,0.034 -0.1153,0.061 -0.1926,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4629,0 z m 0.2039,0.1702 -0.1643,0.6664 0.1836,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.079,-0.022 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.097 0.028,-0.045 0.051,-0.1065 0.07,-0.1843 0.019,-0.078 0.026,-0.1374 0.019,-0.1791 -0.01,-0.041 -0.022,-0.074 -0.046,-0.097 -0.024,-0.023 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1996,-0.01 z"
-         style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial Bold"
-         id="path31487" />
-      <path
-         style="fill:#ffffff;stroke:none;display:inline"
-         d="m 186.51628,7184.8543 c -1.116,0 -2.0207,0.1242 -2.0207,0.2784 0,0.1541 0.9047,0.2785 2.0207,0.2785 1.1161,0 2.0208,-0.1244 2.0208,-0.2785 0,-0.1542 -0.9047,-0.2784 -2.0208,-0.2784 z m 0,0.2013 c 0.3133,0 0.5673,0.035 0.5673,0.077 0,0.043 -0.254,0.077 -0.5673,0.077 -0.3132,0 -0.5672,-0.035 -0.5672,-0.077 0,-0.043 0.254,-0.077 0.5672,-0.077 z"
-         id="path31489"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-size:0.66138339px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial"
-         x="182.6122"
-         y="7308.8276"
-         id="text31491"
-         sodipodi:linespacing="125%"
-         transform="scale(1.0170762,0.9832105)"><tspan
-           sodipodi:role="line"
-           id="tspan31493"
-           x="182.6122"
-           y="7308.8276">ROM</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         d="m 175.29638,7183.771 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1032,0 0.1032,0 0.05,0 0.075,0.019 0.075,0.057 0,0.044 -0.026,0.065 -0.078,0.065 z m 0.794,0.062 c -0.014,0.069 -0.051,0.1031 -0.1104,0.1031 -0.083,0 -0.1246,-0.05 -0.1246,-0.1513 0,-0.099 0.042,-0.1481 0.1246,-0.1481 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.017,-0.08 -0.069,-0.1204 -0.1567,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.1286 0.057,0.1928 0.1709,0.1928 0.097,0 0.153,-0.048 0.1673,-0.1446 0,0 -0.05,0 -0.05,0 z m -1.6876,-0.241 c -0.1235,0 -0.1852,0.064 -0.1852,0.1928 0,0.1285 0.062,0.1928 0.1852,0.1928 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1286 -0.062,-0.1928 -0.1851,-0.1928 z m -0.299,0.241 c -0.012,0.069 -0.047,0.1031 -0.1068,0.1031 -0.085,0 -0.1282,-0.05 -0.1282,-0.1513 0,-0.099 0.041,-0.1481 0.1246,-0.1481 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.062,-0.1204 -0.1566,-0.1204 -0.1163,0 -0.1745,0.064 -0.1745,0.1927 0,0.1286 0.056,0.1928 0.1673,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m 2.371,-0.2307 c 0,0 -0.3061,0 -0.3061,0 0,0 0,0.045 0,0.045 0,0 0.1281,0 0.1281,0 0,0 0,0.3236 0,0.3236 0,0 0.05,0 0.05,0 0,0 0,-0.3236 0,-0.3236 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.8295,0 c 0,0 -0.057,0 -0.057,0 0,0 -0.1423,0.3684 -0.1423,0.3684 0,0 0.053,0 0.053,0 0,0 0.039,-0.1068 0.039,-0.1068 0,0 0.153,0 0.153,0 0,0 0.036,0.1068 0.036,0.1068 0,0 0.057,0 0.057,0 0,0 -0.1388,-0.3684 -0.1388,-0.3684 z m -0.331,0 c 0,0 -0.1674,0 -0.1674,0 0,0 0,0.3684 0,0.3684 0,0 0.05,0 0.05,0 0,0 0,-0.155 0,-0.155 0,0 0.1175,0 0.1175,0 0.076,0 0.1139,-0.037 0.1139,-0.1102 0,-0.069 -0.038,-0.1032 -0.1139,-0.1032 z m -0.2778,0 c 0,0 -0.071,0 -0.071,0 0,0 -0.1104,0.3098 -0.1104,0.3098 0,0 -0.1068,-0.3098 -0.1068,-0.3098 0,0 -0.075,0 -0.075,0 0,0 0,0.3684 0,0.3684 0,0 0.05,0 0.05,0 0,0 0,-0.3064 0,-0.3064 0,0 0.1068,0.3064 0.1068,0.3064 0,0 0.05,0 0.05,0 0,0 0.1104,-0.3099 0.1104,-0.3099 0,0 0,0.093 0,0.093 0,0 0,0.217 0,0.217 0,0 0.05,0 0.05,0 0,0 0,-0.3684 0,-0.3684 z m -1.4312,0.065 c 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,0.014 -0.043,0.041 0,0 0,0.3889 0,0.3889 0,0.018 -0.01,0.028 -0.028,0.028 0,0 -0.356,0 -0.356,0 -0.074,0 -0.1341,0.023 -0.1817,0.071 -0.048,0.047 -0.071,0.1061 -0.071,0.1773 0,0 0,0.8569 0,0.8569 0,0.069 0.024,0.1274 0.073,0.1756 0.049,0.048 0.1086,0.072 0.1799,0.072 0,0 0.8152,0 0.8152,0 0.029,0 0.043,-0.015 0.043,-0.045 0,0 0,-1.7243 0,-1.7243 z m 2.9586,1.2011 c 0,-0.03 -0.014,-0.045 -0.043,-0.045 0,0 -0.356,0 -0.356,0 -0.031,0 -0.046,0.015 -0.046,0.045 0,0 0,0.1996 0,0.1996 0,0.057 -0.029,0.086 -0.086,0.086 -0.059,0 -0.089,-0.029 -0.089,-0.086 0,0 0,-0.6124 0,-0.6124 0,-0.057 0.03,-0.086 0.089,-0.086 0.057,0 0.086,0.029 0.086,0.086 0,0 0,0.1616 0,0.1616 0,0.028 0.015,0.041 0.046,0.041 0,0 0.356,0 0.356,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2856 0,-0.2856 0,-0.069 -0.025,-0.1274 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.5482,0 -0.5482,0 -0.071,0 -0.1319,0.024 -0.1817,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.8535 0,0.8535 0,0.071 0.024,0.1309 0.073,0.1791 0.049,0.048 0.1098,0.072 0.1834,0.072 0,0 0.5483,0 0.5483,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.1791 0,0 0,-0.3167 0,-0.3167 z m -1.1785,-0.072 c 0,-0.069 -0.025,-0.1273 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.3311,0 -0.3311,0 -0.036,0 -0.053,-0.017 -0.053,-0.052 0,-0.037 0.018,-0.055 0.053,-0.055 0,0 0.4984,0 0.4984,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2753 0,-0.2753 0,-0.028 -0.014,-0.042 -0.043,-0.042 0,0 -0.7049,0 -0.7049,0 -0.071,0 -0.1317,0.025 -0.1816,0.072 -0.05,0.048 -0.075,0.1066 -0.075,0.1754 0,0 0,0.3647 0,0.3647 0,0.069 0.025,0.1275 0.075,0.1757 0.05,0.048 0.1103,0.072 0.1816,0.072 0,0 0.3311,0 0.3311,0 0.045,0 0.068,0.023 0.068,0.069 0,0.042 -0.023,0.062 -0.068,0.062 0,0 -0.5447,0 -0.5447,0 -0.029,0 -0.043,0.015 -0.043,0.045 0,0 0,0.272 0,0.272 0,0.03 0.014,0.045 0.043,0.045 0,0 0.7512,0 0.7512,0 0.073,0 0.1347,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1078 0.073,-0.1789 0,0 0,-0.3891 0,-0.3891 z m 1.0788,1.1531 c 0,0 -0.2279,0 -0.2279,0 0,0 0,-0.1239 0,-0.1239 0,0 0.2064,0 0.2064,0 0,0 0,-0.041 0,-0.041 0,0 -0.2064,0 -0.2064,0 0,0 0,-0.1134 0,-0.1134 0,0 0.2243,0 0.2243,0 0,0 0,-0.045 0,-0.045 0,0 -0.2742,0 -0.2742,0 0,0 0,0.3648 0,0.3648 0,0 0.2778,0 0.2778,0 0,0 0,-0.041 0,-0.041 z m -0.3703,-0.1515 c 0,0 -0.1673,0 -0.1673,0 0,0 0,0.042 0,0.042 0,0 0.1175,0 0.1175,0 0,0.08 -0.039,0.1204 -0.1175,0.1204 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.062,0 0.099,0.024 0.1103,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.063,-0.1205 -0.1602,-0.1205 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.064 0.017,0.1126 0.052,0.1446 0.034,0.032 0.075,0.048 0.1229,0.048 0.057,0 0.099,-0.02 0.1247,-0.059 0,0 0.014,0.048 0.014,0.048 0,0 0.032,0 0.032,0 0,0 0,-0.1927 0,-0.1927 z m -0.4984,-0.1721 c 0,0 -0.057,0 -0.057,0 0,0 -0.1459,0.3648 -0.1459,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.053,0 0.053,0 0,0 -0.1353,-0.3648 -0.1353,-0.3648 z m -0.2136,0.3579 c -0.012,0 -0.018,-0.017 -0.018,-0.038 0,0 0,-0.065 0,-0.065 0,-0.03 -0.018,-0.053 -0.046,-0.069 0.035,-0.018 0.053,-0.047 0.053,-0.086 0,-0.066 -0.042,-0.1001 -0.1247,-0.1001 0,0 -0.178,0 -0.178,0 0,0 0,0.3649 0,0.3649 0,0 0.053,0 0.053,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1246,0 0.1246,0 0.043,0 0.065,0.022 0.068,0.065 0,0 0.01,0.089 0.01,0.089 0,0 0.064,-0.01 0.064,-0.01 z m -0.5519,-0.3682 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.055 0.017,0.101 0.05,0.1377 0.033,0.037 0.078,0.055 0.1353,0.055 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1851,-0.1927 z m -0.1851,0.01 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1317,0 0.1317,0 0,0 0,0.32 0,0.32 0,0 0.05,0 0.05,0 0,0 0,-0.32 0,-0.32 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0.1652 c 0,0 -0.1068,-0.025 -0.1068,-0.025 -0.031,-0.01 -0.046,-0.022 -0.046,-0.045 0,-0.044 0.029,-0.065 0.085,-0.065 0.064,0 0.096,0.024 0.096,0.076 0,0 0.046,0 0.046,0 0,-0.078 -0.049,-0.117 -0.146,-0.117 -0.088,0 -0.1318,0.038 -0.1318,0.1135 0,0.046 0.027,0.074 0.082,0.086 0,0 0.075,0.017 0.075,0.017 0.055,0.012 0.082,0.033 0.082,0.065 0,0.041 -0.033,0.062 -0.1,0.062 -0.069,0 -0.1032,-0.029 -0.1032,-0.086 0,0 -0.046,0 -0.046,0 0,0.085 0.05,0.1275 0.1495,0.1275 0.1,0 0.1495,-0.037 0.1495,-0.1102 0,-0.053 -0.029,-0.086 -0.086,-0.1001 z m -0.5697,-0.1652 c 0,0 -0.057,0 -0.057,0 0,0 -0.1425,0.3648 -0.1425,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1532,0 0.1532,0 0,0 0.035,0.1032 0.035,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.1318,0 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1318,0 0.1318,0 0,0 0,0.32 0,0.32 0,0 0.053,0 0.053,0 0,0 0,-0.32 0,-0.32 0,0 0.1246,0 0.1246,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0 c 0,0 -0.061,0 -0.061,0 0,0 -0.1423,0.3648 -0.1423,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1388,-0.3648 -0.1388,-0.3648 z m -0.3916,0 c 0,0 -0.1566,0 -0.1566,0 0,0 0,0.3648 0,0.3648 0,0 0.153,0 0.153,0 0.1069,0 0.1603,-0.062 0.1603,-0.1859 0,-0.1193 -0.052,-0.1789 -0.1567,-0.1789 z m 2.8125,-1.8068 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.1499,0.1169 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.088,0 0.1317,0.049 0.1317,0.148 0,0.101 -0.044,0.1514 -0.1317,0.1514 z m -0.9007,1.4215 c 0,0 -0.7548,0 -0.7548,0 -0.05,0 -0.091,-0.016 -0.1246,-0.048 -0.033,-0.032 -0.05,-0.072 -0.05,-0.1205 0,0 0,-0.8569 0,-0.8569 0,-0.048 0.017,-0.088 0.05,-0.1205 0.033,-0.032 0.075,-0.048 0.1246,-0.048 0,0 0.4202,0 0.4202,0 0.028,0 0.043,-0.015 0.043,-0.045 0,0 0,-0.389 0,-0.389 0,-0.018 0.01,-0.028 0.028,-0.028 0,0 0.2634,0 0.2634,0 0.017,0.016 0.025,0.024 0.025,0.028 0,0 0,1.6039 0,1.6039 0,0 -0.01,0.013 -0.025,0.024 z m 2.9318,-0.05 c -0.034,0.033 -0.077,0.05 -0.1263,0.05 0,0 -0.5483,0 -0.5483,0 -0.05,0 -0.093,-0.017 -0.1283,-0.05 -0.036,-0.033 -0.053,-0.074 -0.053,-0.1221 0,0 0,-0.8535 0,-0.8535 0,-0.048 0.018,-0.088 0.053,-0.1205 0.035,-0.032 0.078,-0.048 0.1283,-0.048 0,0 0.5483,0 0.5483,0 0.052,0 0.095,0.016 0.1281,0.047 0.033,0.031 0.05,0.072 0.05,0.1221 0,0 0,0.2271 0,0.2271 0,0.016 -0.01,0.024 -0.025,0.024 0,0 -0.2349,0 -0.2349,0 -0.017,0 -0.025,-0.01 -0.025,-0.024 0,0 0,-0.1032 0,-0.1032 0,-0.046 -0.016,-0.084 -0.048,-0.1153 -0.032,-0.031 -0.072,-0.046 -0.1193,-0.046 -0.047,0 -0.087,0.015 -0.1193,0.046 -0.032,0.031 -0.048,0.069 -0.048,0.1153 0,0 0,0.6126 0,0.6126 0,0.046 0.016,0.084 0.048,0.1153 0.032,0.031 0.072,0.046 0.1193,0.046 0.047,0 0.087,-0.015 0.1193,-0.046 0.032,-0.031 0.048,-0.07 0.048,-0.1153 0,0 0,-0.1445 0,-0.1445 0,-0.016 0.01,-0.024 0.025,-0.024 0,0 0.2349,0 0.2349,0 0.01,0 0.013,0.01 0.025,0.024 0,0 0,0.2615 0,0.2615 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.1785,0 c -0.034,0.033 -0.076,0.05 -0.1263,0.05 0,0 -0.6871,0 -0.6871,0 -0.019,0 -0.028,-0.01 -0.028,-0.024 0,0 0,-0.1548 0,-0.1548 0,-0.016 0.01,-0.024 0.028,-0.024 0,0 0.4806,0 0.4806,0 0.04,0 0.075,-0.014 0.1032,-0.041 0.028,-0.028 0.043,-0.061 0.043,-0.1001 0,-0.041 -0.014,-0.076 -0.041,-0.1032 -0.027,-0.028 -0.062,-0.041 -0.105,-0.041 0,0 -0.3311,0 -0.3311,0 -0.05,0 -0.092,-0.017 -0.1265,-0.05 -0.034,-0.033 -0.052,-0.074 -0.052,-0.1222 0,0 0,-0.3648 0,-0.3648 0,-0.048 0.017,-0.088 0.052,-0.1204 0.034,-0.032 0.077,-0.048 0.1265,-0.048 0,0 0.6408,0 0.6408,0 0.017,0 0.025,0.01 0.025,0.024 0,0 0,0.1514 0,0.1514 0,0.018 -0.01,0.028 -0.025,0.028 0,0 -0.4344,0 -0.4344,0 -0.088,0 -0.1317,0.044 -0.1317,0.1308 0,0.034 0.013,0.064 0.039,0.09 0.026,0.025 0.057,0.038 0.093,0.038 0,0 0.3312,0 0.3312,0 0.047,0 0.089,0.017 0.1246,0.052 0.035,0.034 0.053,0.075 0.053,0.1204 0,0 0,0.389 0,0.389 0,0.048 -0.017,0.089 -0.052,0.1223 z m -1.0805,0.1291 c 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,-0.015 -0.043,-0.045 0,0 0,-1.2666 0,-1.2666 0,-0.028 0.014,-0.041 0.043,-0.041 0,0 0.388,0 0.388,0 0.028,0 0.043,0.014 0.043,0.041 0,0 0,1.2666 0,1.2666 0,0.03 -0.014,0.045 -0.043,0.045 z m 1.0645,0.3545 c 0,0 -0.121,0 -0.121,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1282,0 0.1282,0 0.045,0 0.068,0.021 0.068,0.062 0,0.041 -0.025,0.062 -0.075,0.062 z m 0.2635,0.048 c 0,0 0.06,-0.1618 0.06,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.926,0 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.5377,0 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.3026,0.1102 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.2823 0,-0.2823 0,0 0.092,0 0.092,0 0.078,0 0.1175,0.047 0.1175,0.1411 0,0.094 -0.037,0.1412 -0.1104,0.1412 z m 2.0934,0.01 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.09,0 0.1353,0.049 0.1353,0.148 0,0.101 -0.045,0.1514 -0.1353,0.1514 z m -0.6907,-1.7724 c 0,-0.016 -0.01,-0.025 -0.025,-0.025 0,0 -0.2634,0 -0.2634,0 -0.017,0 -0.025,0.01 -0.025,0.025 0,0 0,1.1461 0,1.1461 0,0.016 0.01,0.024 0.025,0.024 0,0 0.2634,0 0.2634,0 0.017,0 0.025,-0.01 0.025,-0.024 0,0 0,-1.1461 0,-1.1461 z m -0.9256,0.2616 c 0,-0.043 -0.016,-0.081 -0.048,-0.1119 -0.032,-0.031 -0.071,-0.047 -0.1157,-0.047 -0.045,0 -0.083,0.016 -0.114,0.047 -0.031,0.031 -0.046,0.068 -0.046,0.1119 0,0 0,0.6297 0,0.6297 0,0.046 0.015,0.084 0.044,0.1137 0.03,0.03 0.068,0.045 0.1157,0.045 0.045,0 0.084,-0.015 0.1158,-0.046 0.032,-0.031 0.048,-0.068 0.048,-0.1118 0,0 0,-0.6297 0,-0.6297 z m -0.1638,0.7089 c -0.055,0 -0.082,-0.026 -0.082,-0.079 0,0 0,-0.6298 0,-0.6298 0,-0.053 0.027,-0.079 0.082,-0.079 0.052,0 0.078,0.026 0.078,0.079 0,0 0,0.6298 0,0.6298 0,0.053 -0.026,0.079 -0.078,0.079 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
-         id="path31495" />
-      <path
-         id="path31497"
-         style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         d="m 187.50008,7189.1802 1.9595,0 0,2.4741 -1.9595,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 185.08338,7189.1801 1.9595,0 0,2.4742 -1.9595,0 z"
-         style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         id="path31499"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path31501"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.21079655;stroke-miterlimit:4;display:inline"
-         d="m 183.35008,7189.1346 1.246,0 0,4.3671 -1.246,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 184.10858,7189.1346 0.4875,0 0,4.3671 -0.4875,0 z"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.1318544;stroke-miterlimit:4;display:inline"
-         id="path31503" />
-      <rect
-         transform="matrix(1,0,-0.01802634,0.99983751,0,0)"
-         y="7190.4883"
-         x="286.77554"
-         height="4.8445239"
-         width="24.429632"
-         id="rect31505"
-         style="fill:url(#linearGradient31601);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47956967;display:inline" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31507"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         d="m 158.48178,7190.0031 1.5809,0 c 0.2145,0 0.4,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1436,-0.5224 0.3581,-0.5224 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 161.75668,7190.0031 1.581,0 c 0.2144,0 0.3999,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1437,-0.5224 0.3581,-0.5224 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         id="path31509"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31511"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         d="m 165.06488,7190.0031 1.5809,0 c 0.2145,0 0.4,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1436,-0.5224 0.3581,-0.5224 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 95.246179,7188.7233 30.110301,-0.046 0.1831,6.4518 -29.992501,2e-4 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429;display:inline"
-         id="path31513" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31515"
-         d="m 98.564179,7190.3947 7.380601,0 0,0.7426 -7.380601,0 z"
-         style="fill:#000000;stroke:none;display:inline" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path31517"
-         d="m 116.73488,7190.2588 0,3.2965 3.1351,0 0,-2.8356 0,-0.2438 0,-0.2171 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.0641 -1.0288,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0641 0.9798,0 0.016,-0.1161 z"
-         style="fill:#000000;stroke:none;display:inline" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 107.31638,7190.3947 7.3806,0 0,0.7426 -7.3806,0 z"
-         id="path31519" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 98.773179,7191.7874 7.380601,0 0,0.4179 -7.380601,0 z"
-         id="path31521" />
-      <path
-         id="path31523"
-         d="m 107.52538,7191.7874 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path31525"
-         d="m 98.929879,7192.9017 7.380701,0 0,0.4179 -7.380701,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 107.68218,7192.9017 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path31527" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 98.982179,7193.9695 7.380601,0 0,0.4179 -7.380601,0 z"
-         id="path31529" />
-      <path
-         id="path31531"
-         d="m 107.73438,7193.9695 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 116.61728,7193.9695 7.3807,0 0,0.4179 -7.3807,0 z"
-         id="path31533" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 95.246179,7189.7911 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3492 -0.019,-0.5122 -0.091,-1.2443 -0.061,-1.5609 2.8774,-0.052 22.253301,-0.011 25.054801,0 0.017,0.2963 0.018,0.2276 0.01,0.325 -1.0213,0.011 -24.532901,-0.011 -24.519001,0 0.1466,1.4148 0.077,3.6729 0.2086,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0697,0.045 z"
-         style="fill:#000000;stroke:none;display:inline"
-         id="path31535" />
-      <path
-         id="path31537"
-         style="fill:#808080;stroke:#000000;stroke-width:0.44053429;display:inline"
-         d="m 125.33358,7188.7232 30.1103,-0.046 0.065,6.4996 -29.9797,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 128.65158,7190.3947 7.3806,0 0,0.7426 -7.3806,0 z"
-         id="path31539"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 146.82228,7190.2588 0,3.2965 3.1351,0 0,-3.2965 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9798,0 0.016,-0.1162 -1.6983,0 z"
-         id="path31541" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path31543"
-         d="m 137.40388,7190.3947 7.3806,0 0,0.7426 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path31545"
-         d="m 128.86058,7191.7874 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 137.61278,7191.7874 7.3807,0 0,0.4179 -7.3807,0 z"
-         id="path31547" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 129.01738,7192.9017 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path31549" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path31551"
-         d="m 137.76958,7192.9017 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path31553"
-         d="m 129.06958,7193.9695 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 137.82188,7193.9695 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path31555" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path31557"
-         d="m 146.70468,7193.9695 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path31559"
-         style="fill:#000000;stroke:none;display:inline"
-         d="m 125.33358,7189.7911 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3492 -0.019,-0.5122 -0.091,-1.2443 -0.061,-1.5609 2.8773,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2963 0.018,0.2276 0.01,0.325 -1.0214,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 120.66788,7190.2393 0,0.4761 2.1705,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         id="path31561" />
-      <path
-         id="path31563"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         d="m 120.66798,7193.559 0,-0.476 2.1703,0 0.016,-0.8008 0.5267,0 0,0.8001 0,0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path31565"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         d="m 150.57918,7190.2393 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 150.57928,7193.559 0,-0.476 2.1703,0 0.016,-0.8008 0.5267,0 0,0.8001 0,0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         id="path31567" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 187.50008,7192.583 1.9595,0 0,1.082 -1.9595,0 z"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         id="path31569" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31571"
-         style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-         d="m 185.08338,7192.5829 1.9595,0 0,1.0821 -1.9595,0 z" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 158.48178,7192.2358 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         id="path31573"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31575"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         d="m 161.75668,7192.2358 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1437,-0.5221 0.3581,-0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 165.06488,7192.2358 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         id="path31577"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31579"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         d="m 168.42818,7192.2358 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.5809,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 171.70318,7192.2358 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.5809,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.358,-0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         id="path31581"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path31583"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline"
-         d="m 175.01128,7192.2358 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.4159,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.358,-0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         style="fill:url(#linearGradient31603);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.32461023;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-         d="m 191.92908,7180.0275 c -0.7615,0 -1.4037,0.8277 -1.4533,1.8556 l -0.6205,12.5477 c -0.05,1.0282 0.5285,1.8557 1.29,1.8557 l 5.5518,0 c 0.7615,0 1.4037,-0.8275 1.4533,-1.8557 l 0.1469,-3.0263 -0.8491,-0.1331 0,-5.8099 1.143,0.1546 0.1797,-3.7334 c 0.05,-1.0281 -0.5285,-1.8556 -1.29,-1.8556 l -5.5518,0 z m 2.7269,6.075 c 0.2416,0.014 0.427,0.56 0.4082,1.2151 -0.019,0.6552 -0.2319,1.1616 -0.4735,1.1488 -0.2416,-0.014 -0.4107,-0.5377 -0.3919,-1.1929 0.019,-0.655 0.2156,-1.1835 0.4572,-1.171 z"
-         id="path31585"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
-         d="m 194.05738,7181.6747 1.1191,-0.079 1.3653,1.824 -0.3256,12.2872 -1.1238,0.1333 -1.5769,-2.1767 0.9296,-0.054 0.6884,0.5189 0.2954,-10.5373 -1.3715,-1.9164"
-         id="path31587"
-         inkscape:path-effect="#path-effect32179"
-         inkscape:original-d="m 194.05738,7181.6747 c 0.062,-0.8459 0.4414,-0.5645 1.1191,-0.079 l 1.3653,1.824 -0.3256,12.2872 c -0.3058,0.6698 -0.6828,0.3004 -1.1238,0.1333 l -1.5769,-2.1767 c 0.3209,-0.5608 0.4055,-0.2756 0.9296,-0.054 l 0.6884,0.5189 0.2954,-10.5373 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-      <path
-         style="fill:#4d4d4d;fill-opacity:1;stroke:none;display:inline"
-         d="m 193.98828,7184.3041 1.0251,1.0264 -0.2408,9.0862 -1.257,-0.7506 -0.038,1.4746 1.6211,0.7015 0.3584,-12.3034 -1.4053,-1.8656 -0.0635,2.6309"
-         id="path31589"
-         inkscape:path-effect="#path-effect32181"
-         inkscape:original-d="m 193.98828,7184.3041 1.0251,1.0264 -0.2408,9.0862 -1.257,-0.7506 -0.038,1.4746 1.6211,0.7015 0.3584,-12.3034 -1.4053,-1.8656 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:1.10487461px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="m 80.976879,7182.4054 10.7304,0 -9.5579,11.1507 10.766,0"
-         id="path31591"
-         inkscape:path-effect="#path-effect32183"
-         inkscape:original-d="m 80.976879,7182.4054 10.7304,0 -9.5579,11.1507 c 0,0 11.6187,0 10.766,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\text4214.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-358.85566,-577.9055)">
+    <g transform="translate(287.92106,-6601.407)" style="display:inline" id="g113383">
+      <path sodipodi:nodetypes="ccccc" id="path31417" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.94771594;stroke-opacity:1;display:inline" d="m 77.18458,7179.7898 115.4487,0 0,16.5302 -115.4487,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 94.245779,7179.7898 62.155701,0 0,16.5302 -62.155701,0 z" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.86010271;stroke-opacity:1;display:inline" id="path31419" sodipodi:nodetypes="ccccc"/>
+      <rect style="fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="rect31421" width="15.593775" height="15.593775" x="78.265373" y="7180.1841" ry="0"/>
+      <path inkscape:connector-curvature="0" id="path31423" d="m 77.88898,7180.2714 c 0.7616,0 1.4037,0.8273 1.4533,1.8556 l 0.6205,12.5477 c 0.05,1.0281 -0.5285,1.8557 -1.29,1.8557 l -5.5518,0 c -0.7615,0 -1.4038,-0.8276 -1.4533,-1.8557 l -0.147,-3.0263 0.8491,-0.1333 0,-5.8098 -1.143,0.1544 -0.1796,-3.7333 c -0.05,-1.0281 0.5285,-1.8557 1.29,-1.8557 l 5.5518,0 z m -2.7269,6.075 c -0.2416,0.014 -0.427,0.5598 -0.4082,1.2151 0.019,0.655 0.2319,1.1613 0.4735,1.1487 0.2416,-0.014 0.4107,-0.538 0.3919,-1.193 -0.019,-0.6552 -0.2156,-1.1835 -0.4572,-1.1708 z" style="fill:url(#linearGradient31597);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21640682;stroke-miterlimit:4;stroke-dasharray:none;display:inline"/>
+      <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 75.76058,7181.9184 c -0.062,-0.846 -0.4414,-0.5646 -1.119,-0.079 l -1.3653,1.8238 0.3256,12.2874 c 0.3058,0.6698 0.6828,0.3005 1.1237,0.1333 l 1.577,-2.1767 c -0.3209,-0.5604 -0.4055,-0.2753 -0.9297,-0.054 l -0.6884,0.5188 -0.2953,-10.5374 z" inkscape:path-effect="#path-effect32175" id="path31425" d="m 75.76058,7181.9184 -1.119,-0.079 -1.3653,1.8238 0.3256,12.2874 1.1237,0.1333 1.577,-2.1767 -0.9297,-0.054 -0.6884,0.5188 -0.2953,-10.5374 1.3714,-1.9162" style="fill:#808080;stroke:none;display:inline"/>
+      <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 75.82978,7184.5479 -1.0251,1.0264 0.2408,9.0864 1.257,-0.7507 0.038,1.4746 -1.6211,0.7015 -0.3584,-12.3035 1.4053,-1.8657 z" inkscape:path-effect="#path-effect32177" id="path31427" d="m 75.82978,7184.5479 -1.0251,1.0264 0.2408,9.0864 1.257,-0.7507 0.038,1.4746 -1.6211,0.7015 -0.3584,-12.3035 1.4053,-1.8657 0.0635,2.631" style="fill:#4d4d4d;stroke:none;display:inline"/>
+      <path id="path31429" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429;display:inline" d="m 94.921679,7181.2819 30.253801,0.049 0.1831,6.4038 -30.183801,-0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#000000;stroke:none;display:inline" d="m 98.239679,7182.9533 7.380601,0 0,0.7427 -7.380601,0 z" id="path31431" inkscape:connector-curvature="0"/>
+      <path style="fill:#000000;stroke:none;display:inline" d="m 116.41038,7182.8175 0,3.2964 3.1352,0 0,-2.8356 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.064 -1.0287,0 -0.016,0.093 -0.6694,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z" id="path31433" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path31435" d="m 106.99198,7182.9533 7.3806,0 0,0.7427 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path id="path31437" d="m 98.448679,7184.346 7.380601,0 0,0.4179 -7.380601,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 107.20098,7184.346 7.3806,0 0,0.4179 -7.3806,0 z" id="path31439"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 98.605479,7185.4603 7.380601,0 0,0.4179 -7.380601,0 z" id="path31441"/>
+      <path id="path31443" d="m 107.35768,7185.4603 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path id="path31445" d="m 98.657679,7186.5282 7.380701,0 0,0.4178 -7.380701,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 107.40998,7186.5282 7.3806,0 0,0.4178 -7.3806,0 z" id="path31447"/>
+      <path id="path31449" d="m 116.29288,7186.5282 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path id="path31451" style="fill:#000000;stroke:none;display:inline" d="m 94.921679,7182.3497 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5125 -0.091,-1.2445 -0.061,-1.561 2.8773,-0.052 22.253301,-0.01 25.054801,0 0.017,0.2962 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.532901,-0.01 -24.519001,0 0.1466,1.415 0.077,3.6728 0.2085,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 125.33358,7181.2818 30.1103,-0.046 0.065,6.4995 -29.9797,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429;display:inline" id="path31453"/>
+      <path inkscape:connector-curvature="0" id="path31455" d="m 128.65158,7182.9533 7.3806,0 0,0.7427 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" sodipodi:nodetypes="ccccc"/>
+      <path id="path31457" d="m 146.82228,7182.8175 0,3.2964 3.1351,0 0,-3.2964 -1.4369,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9798,0 0.016,-0.1162 -1.6983,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 137.40388,7182.9533 7.3806,0 0,0.7427 -7.3806,0 z" id="path31459" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 128.86058,7184.346 7.3806,0 0,0.4179 -7.3806,0 z" id="path31461" sodipodi:nodetypes="ccccc"/>
+      <path id="path31463" d="m 137.61278,7184.346 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path31465" d="m 129.01738,7185.4603 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 137.76958,7185.4603 7.3806,0 0,0.4179 -7.3806,0 z" id="path31467" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 129.06958,7186.5282 7.3806,0 0,0.4178 -7.3806,0 z" id="path31469" sodipodi:nodetypes="ccccc"/>
+      <path id="path31471" d="m 137.82188,7186.5282 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 146.70468,7186.5282 7.3807,0 0,0.4178 -7.3807,0 z" id="path31473" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 125.33358,7182.3497 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5125 -0.091,-1.2445 -0.061,-1.561 2.8773,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2962 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6728 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z" style="fill:#000000;stroke:none;display:inline" id="path31475"/>
+      <path id="path31477" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 120.34348,7182.7979 0,0.4761 2.1704,0 0.016,0.8008 0.5267,0 0,-0.8002 0,-0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 120.34348,7186.1175 0,-0.4758 2.1704,0 0.016,-0.801 0.5266,0 0,0.8002 0,0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path31479"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 150.57918,7182.7979 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8002 0,-0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path31481"/>
+      <path id="path31483" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 150.57928,7186.1175 0,-0.4758 2.1703,0 0.016,-0.801 0.5267,0 0,0.8002 0,0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path inkscape:connector-curvature="0" d="m 157.18678,7182.6058 32.5924,0 -0.1165,4.1673 -32.5924,0 z" style="fill:url(#linearGradient31599);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.51374948;display:inline" id="path31485"/>
+      <path inkscape:connector-curvature="0" d="m 187.36438,7183.5385 0.4495,0 c 0.1014,0 0.1771,0.01 0.2271,0.019 0.067,0.017 0.1207,0.048 0.1608,0.093 0.04,0.044 0.065,0.099 0.076,0.163 0.011,0.064 0,0.1435 -0.019,0.2378 -0.02,0.083 -0.05,0.1542 -0.09,0.2141 -0.049,0.073 -0.1067,0.1325 -0.1743,0.1778 -0.051,0.034 -0.1154,0.061 -0.1927,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4628,0 z m 0.204,0.1702 -0.1644,0.6664 0.1836,0 c 0.069,0 0.1191,0 0.1511,-0.01 0.042,-0.01 0.078,-0.022 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.097 0.028,-0.045 0.051,-0.1065 0.07,-0.1843 0.019,-0.078 0.026,-0.1374 0.019,-0.1791 -0.01,-0.041 -0.022,-0.074 -0.046,-0.097 -0.024,-0.023 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z m -1.2773,0.836 -0.1872,-1.0062 0.2667,0 0.1246,0.7447 0.482,-0.7447 0.2609,0 -0.6844,1.0062 z m -1.2931,-1.0062 0.4495,0 c 0.1014,0 0.1771,0.01 0.2271,0.019 0.067,0.017 0.1207,0.048 0.1607,0.093 0.04,0.044 0.065,0.099 0.076,0.163 0.011,0.064 0,0.1435 -0.019,0.2378 -0.02,0.083 -0.051,0.1542 -0.09,0.2141 -0.048,0.073 -0.1066,0.1325 -0.1743,0.1778 -0.051,0.034 -0.1153,0.061 -0.1926,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4629,0 z m 0.2039,0.1702 -0.1643,0.6664 0.1836,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.079,-0.022 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.097 0.028,-0.045 0.051,-0.1065 0.07,-0.1843 0.019,-0.078 0.026,-0.1374 0.019,-0.1791 -0.01,-0.041 -0.022,-0.074 -0.046,-0.097 -0.024,-0.023 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1996,-0.01 z" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial Bold" id="path31487"/>
+      <path style="fill:#ffffff;stroke:none;display:inline" d="m 186.51628,7184.8543 c -1.116,0 -2.0207,0.1242 -2.0207,0.2784 0,0.1541 0.9047,0.2785 2.0207,0.2785 1.1161,0 2.0208,-0.1244 2.0208,-0.2785 0,-0.1542 -0.9047,-0.2784 -2.0208,-0.2784 z m 0,0.2013 c 0.3133,0 0.5673,0.035 0.5673,0.077 0,0.043 -0.254,0.077 -0.5673,0.077 -0.3132,0 -0.5672,-0.035 -0.5672,-0.077 0,-0.043 0.254,-0.077 0.5672,-0.077 z" id="path31489" inkscape:connector-curvature="0"/>
+      <text xml:space="preserve" style="font-size:0.66138339px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial" x="182.6122" y="7308.8276" id="text31491" sodipodi:linespacing="125%" transform="scale(1.0170762,0.9832105)"><tspan sodipodi:role="line" id="tspan31493" x="182.6122" y="7308.8276">ROM</tspan></text>
+      <path inkscape:connector-curvature="0" d="m 175.29638,7183.771 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1032,0 0.1032,0 0.05,0 0.075,0.019 0.075,0.057 0,0.044 -0.026,0.065 -0.078,0.065 z m 0.794,0.062 c -0.014,0.069 -0.051,0.1031 -0.1104,0.1031 -0.083,0 -0.1246,-0.05 -0.1246,-0.1513 0,-0.099 0.042,-0.1481 0.1246,-0.1481 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.017,-0.08 -0.069,-0.1204 -0.1567,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.1286 0.057,0.1928 0.1709,0.1928 0.097,0 0.153,-0.048 0.1673,-0.1446 0,0 -0.05,0 -0.05,0 z m -1.6876,-0.241 c -0.1235,0 -0.1852,0.064 -0.1852,0.1928 0,0.1285 0.062,0.1928 0.1852,0.1928 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1286 -0.062,-0.1928 -0.1851,-0.1928 z m -0.299,0.241 c -0.012,0.069 -0.047,0.1031 -0.1068,0.1031 -0.085,0 -0.1282,-0.05 -0.1282,-0.1513 0,-0.099 0.041,-0.1481 0.1246,-0.1481 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.062,-0.1204 -0.1566,-0.1204 -0.1163,0 -0.1745,0.064 -0.1745,0.1927 0,0.1286 0.056,0.1928 0.1673,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m 2.371,-0.2307 c 0,0 -0.3061,0 -0.3061,0 0,0 0,0.045 0,0.045 0,0 0.1281,0 0.1281,0 0,0 0,0.3236 0,0.3236 0,0 0.05,0 0.05,0 0,0 0,-0.3236 0,-0.3236 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.8295,0 c 0,0 -0.057,0 -0.057,0 0,0 -0.1423,0.3684 -0.1423,0.3684 0,0 0.053,0 0.053,0 0,0 0.039,-0.1068 0.039,-0.1068 0,0 0.153,0 0.153,0 0,0 0.036,0.1068 0.036,0.1068 0,0 0.057,0 0.057,0 0,0 -0.1388,-0.3684 -0.1388,-0.3684 z m -0.331,0 c 0,0 -0.1674,0 -0.1674,0 0,0 0,0.3684 0,0.3684 0,0 0.05,0 0.05,0 0,0 0,-0.155 0,-0.155 0,0 0.1175,0 0.1175,0 0.076,0 0.1139,-0.037 0.1139,-0.1102 0,-0.069 -0.038,-0.1032 -0.1139,-0.1032 z m -0.2778,0 c 0,0 -0.071,0 -0.071,0 0,0 -0.1104,0.3098 -0.1104,0.3098 0,0 -0.1068,-0.3098 -0.1068,-0.3098 0,0 -0.075,0 -0.075,0 0,0 0,0.3684 0,0.3684 0,0 0.05,0 0.05,0 0,0 0,-0.3064 0,-0.3064 0,0 0.1068,0.3064 0.1068,0.3064 0,0 0.05,0 0.05,0 0,0 0.1104,-0.3099 0.1104,-0.3099 0,0 0,0.093 0,0.093 0,0 0,0.217 0,0.217 0,0 0.05,0 0.05,0 0,0 0,-0.3684 0,-0.3684 z m -1.4312,0.065 c 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,0.014 -0.043,0.041 0,0 0,0.3889 0,0.3889 0,0.018 -0.01,0.028 -0.028,0.028 0,0 -0.356,0 -0.356,0 -0.074,0 -0.1341,0.023 -0.1817,0.071 -0.048,0.047 -0.071,0.1061 -0.071,0.1773 0,0 0,0.8569 0,0.8569 0,0.069 0.024,0.1274 0.073,0.1756 0.049,0.048 0.1086,0.072 0.1799,0.072 0,0 0.8152,0 0.8152,0 0.029,0 0.043,-0.015 0.043,-0.045 0,0 0,-1.7243 0,-1.7243 z m 2.9586,1.2011 c 0,-0.03 -0.014,-0.045 -0.043,-0.045 0,0 -0.356,0 -0.356,0 -0.031,0 -0.046,0.015 -0.046,0.045 0,0 0,0.1996 0,0.1996 0,0.057 -0.029,0.086 -0.086,0.086 -0.059,0 -0.089,-0.029 -0.089,-0.086 0,0 0,-0.6124 0,-0.6124 0,-0.057 0.03,-0.086 0.089,-0.086 0.057,0 0.086,0.029 0.086,0.086 0,0 0,0.1616 0,0.1616 0,0.028 0.015,0.041 0.046,0.041 0,0 0.356,0 0.356,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2856 0,-0.2856 0,-0.069 -0.025,-0.1274 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.5482,0 -0.5482,0 -0.071,0 -0.1319,0.024 -0.1817,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.8535 0,0.8535 0,0.071 0.024,0.1309 0.073,0.1791 0.049,0.048 0.1098,0.072 0.1834,0.072 0,0 0.5483,0 0.5483,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.1791 0,0 0,-0.3167 0,-0.3167 z m -1.1785,-0.072 c 0,-0.069 -0.025,-0.1273 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.3311,0 -0.3311,0 -0.036,0 -0.053,-0.017 -0.053,-0.052 0,-0.037 0.018,-0.055 0.053,-0.055 0,0 0.4984,0 0.4984,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2753 0,-0.2753 0,-0.028 -0.014,-0.042 -0.043,-0.042 0,0 -0.7049,0 -0.7049,0 -0.071,0 -0.1317,0.025 -0.1816,0.072 -0.05,0.048 -0.075,0.1066 -0.075,0.1754 0,0 0,0.3647 0,0.3647 0,0.069 0.025,0.1275 0.075,0.1757 0.05,0.048 0.1103,0.072 0.1816,0.072 0,0 0.3311,0 0.3311,0 0.045,0 0.068,0.023 0.068,0.069 0,0.042 -0.023,0.062 -0.068,0.062 0,0 -0.5447,0 -0.5447,0 -0.029,0 -0.043,0.015 -0.043,0.045 0,0 0,0.272 0,0.272 0,0.03 0.014,0.045 0.043,0.045 0,0 0.7512,0 0.7512,0 0.073,0 0.1347,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1078 0.073,-0.1789 0,0 0,-0.3891 0,-0.3891 z m 1.0788,1.1531 c 0,0 -0.2279,0 -0.2279,0 0,0 0,-0.1239 0,-0.1239 0,0 0.2064,0 0.2064,0 0,0 0,-0.041 0,-0.041 0,0 -0.2064,0 -0.2064,0 0,0 0,-0.1134 0,-0.1134 0,0 0.2243,0 0.2243,0 0,0 0,-0.045 0,-0.045 0,0 -0.2742,0 -0.2742,0 0,0 0,0.3648 0,0.3648 0,0 0.2778,0 0.2778,0 0,0 0,-0.041 0,-0.041 z m -0.3703,-0.1515 c 0,0 -0.1673,0 -0.1673,0 0,0 0,0.042 0,0.042 0,0 0.1175,0 0.1175,0 0,0.08 -0.039,0.1204 -0.1175,0.1204 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.062,0 0.099,0.024 0.1103,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.063,-0.1205 -0.1602,-0.1205 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.064 0.017,0.1126 0.052,0.1446 0.034,0.032 0.075,0.048 0.1229,0.048 0.057,0 0.099,-0.02 0.1247,-0.059 0,0 0.014,0.048 0.014,0.048 0,0 0.032,0 0.032,0 0,0 0,-0.1927 0,-0.1927 z m -0.4984,-0.1721 c 0,0 -0.057,0 -0.057,0 0,0 -0.1459,0.3648 -0.1459,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.053,0 0.053,0 0,0 -0.1353,-0.3648 -0.1353,-0.3648 z m -0.2136,0.3579 c -0.012,0 -0.018,-0.017 -0.018,-0.038 0,0 0,-0.065 0,-0.065 0,-0.03 -0.018,-0.053 -0.046,-0.069 0.035,-0.018 0.053,-0.047 0.053,-0.086 0,-0.066 -0.042,-0.1001 -0.1247,-0.1001 0,0 -0.178,0 -0.178,0 0,0 0,0.3649 0,0.3649 0,0 0.053,0 0.053,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1246,0 0.1246,0 0.043,0 0.065,0.022 0.068,0.065 0,0 0.01,0.089 0.01,0.089 0,0 0.064,-0.01 0.064,-0.01 z m -0.5519,-0.3682 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.055 0.017,0.101 0.05,0.1377 0.033,0.037 0.078,0.055 0.1353,0.055 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1851,-0.1927 z m -0.1851,0.01 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1317,0 0.1317,0 0,0 0,0.32 0,0.32 0,0 0.05,0 0.05,0 0,0 0,-0.32 0,-0.32 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0.1652 c 0,0 -0.1068,-0.025 -0.1068,-0.025 -0.031,-0.01 -0.046,-0.022 -0.046,-0.045 0,-0.044 0.029,-0.065 0.085,-0.065 0.064,0 0.096,0.024 0.096,0.076 0,0 0.046,0 0.046,0 0,-0.078 -0.049,-0.117 -0.146,-0.117 -0.088,0 -0.1318,0.038 -0.1318,0.1135 0,0.046 0.027,0.074 0.082,0.086 0,0 0.075,0.017 0.075,0.017 0.055,0.012 0.082,0.033 0.082,0.065 0,0.041 -0.033,0.062 -0.1,0.062 -0.069,0 -0.1032,-0.029 -0.1032,-0.086 0,0 -0.046,0 -0.046,0 0,0.085 0.05,0.1275 0.1495,0.1275 0.1,0 0.1495,-0.037 0.1495,-0.1102 0,-0.053 -0.029,-0.086 -0.086,-0.1001 z m -0.5697,-0.1652 c 0,0 -0.057,0 -0.057,0 0,0 -0.1425,0.3648 -0.1425,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1532,0 0.1532,0 0,0 0.035,0.1032 0.035,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.1318,0 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1318,0 0.1318,0 0,0 0,0.32 0,0.32 0,0 0.053,0 0.053,0 0,0 0,-0.32 0,-0.32 0,0 0.1246,0 0.1246,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0 c 0,0 -0.061,0 -0.061,0 0,0 -0.1423,0.3648 -0.1423,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1388,-0.3648 -0.1388,-0.3648 z m -0.3916,0 c 0,0 -0.1566,0 -0.1566,0 0,0 0,0.3648 0,0.3648 0,0 0.153,0 0.153,0 0.1069,0 0.1603,-0.062 0.1603,-0.1859 0,-0.1193 -0.052,-0.1789 -0.1567,-0.1789 z m 2.8125,-1.8068 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.1499,0.1169 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.088,0 0.1317,0.049 0.1317,0.148 0,0.101 -0.044,0.1514 -0.1317,0.1514 z m -0.9007,1.4215 c 0,0 -0.7548,0 -0.7548,0 -0.05,0 -0.091,-0.016 -0.1246,-0.048 -0.033,-0.032 -0.05,-0.072 -0.05,-0.1205 0,0 0,-0.8569 0,-0.8569 0,-0.048 0.017,-0.088 0.05,-0.1205 0.033,-0.032 0.075,-0.048 0.1246,-0.048 0,0 0.4202,0 0.4202,0 0.028,0 0.043,-0.015 0.043,-0.045 0,0 0,-0.389 0,-0.389 0,-0.018 0.01,-0.028 0.028,-0.028 0,0 0.2634,0 0.2634,0 0.017,0.016 0.025,0.024 0.025,0.028 0,0 0,1.6039 0,1.6039 0,0 -0.01,0.013 -0.025,0.024 z m 2.9318,-0.05 c -0.034,0.033 -0.077,0.05 -0.1263,0.05 0,0 -0.5483,0 -0.5483,0 -0.05,0 -0.093,-0.017 -0.1283,-0.05 -0.036,-0.033 -0.053,-0.074 -0.053,-0.1221 0,0 0,-0.8535 0,-0.8535 0,-0.048 0.018,-0.088 0.053,-0.1205 0.035,-0.032 0.078,-0.048 0.1283,-0.048 0,0 0.5483,0 0.5483,0 0.052,0 0.095,0.016 0.1281,0.047 0.033,0.031 0.05,0.072 0.05,0.1221 0,0 0,0.2271 0,0.2271 0,0.016 -0.01,0.024 -0.025,0.024 0,0 -0.2349,0 -0.2349,0 -0.017,0 -0.025,-0.01 -0.025,-0.024 0,0 0,-0.1032 0,-0.1032 0,-0.046 -0.016,-0.084 -0.048,-0.1153 -0.032,-0.031 -0.072,-0.046 -0.1193,-0.046 -0.047,0 -0.087,0.015 -0.1193,0.046 -0.032,0.031 -0.048,0.069 -0.048,0.1153 0,0 0,0.6126 0,0.6126 0,0.046 0.016,0.084 0.048,0.1153 0.032,0.031 0.072,0.046 0.1193,0.046 0.047,0 0.087,-0.015 0.1193,-0.046 0.032,-0.031 0.048,-0.07 0.048,-0.1153 0,0 0,-0.1445 0,-0.1445 0,-0.016 0.01,-0.024 0.025,-0.024 0,0 0.2349,0 0.2349,0 0.01,0 0.013,0.01 0.025,0.024 0,0 0,0.2615 0,0.2615 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.1785,0 c -0.034,0.033 -0.076,0.05 -0.1263,0.05 0,0 -0.6871,0 -0.6871,0 -0.019,0 -0.028,-0.01 -0.028,-0.024 0,0 0,-0.1548 0,-0.1548 0,-0.016 0.01,-0.024 0.028,-0.024 0,0 0.4806,0 0.4806,0 0.04,0 0.075,-0.014 0.1032,-0.041 0.028,-0.028 0.043,-0.061 0.043,-0.1001 0,-0.041 -0.014,-0.076 -0.041,-0.1032 -0.027,-0.028 -0.062,-0.041 -0.105,-0.041 0,0 -0.3311,0 -0.3311,0 -0.05,0 -0.092,-0.017 -0.1265,-0.05 -0.034,-0.033 -0.052,-0.074 -0.052,-0.1222 0,0 0,-0.3648 0,-0.3648 0,-0.048 0.017,-0.088 0.052,-0.1204 0.034,-0.032 0.077,-0.048 0.1265,-0.048 0,0 0.6408,0 0.6408,0 0.017,0 0.025,0.01 0.025,0.024 0,0 0,0.1514 0,0.1514 0,0.018 -0.01,0.028 -0.025,0.028 0,0 -0.4344,0 -0.4344,0 -0.088,0 -0.1317,0.044 -0.1317,0.1308 0,0.034 0.013,0.064 0.039,0.09 0.026,0.025 0.057,0.038 0.093,0.038 0,0 0.3312,0 0.3312,0 0.047,0 0.089,0.017 0.1246,0.052 0.035,0.034 0.053,0.075 0.053,0.1204 0,0 0,0.389 0,0.389 0,0.048 -0.017,0.089 -0.052,0.1223 z m -1.0805,0.1291 c 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,-0.015 -0.043,-0.045 0,0 0,-1.2666 0,-1.2666 0,-0.028 0.014,-0.041 0.043,-0.041 0,0 0.388,0 0.388,0 0.028,0 0.043,0.014 0.043,0.041 0,0 0,1.2666 0,1.2666 0,0.03 -0.014,0.045 -0.043,0.045 z m 1.0645,0.3545 c 0,0 -0.121,0 -0.121,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1282,0 0.1282,0 0.045,0 0.068,0.021 0.068,0.062 0,0.041 -0.025,0.062 -0.075,0.062 z m 0.2635,0.048 c 0,0 0.06,-0.1618 0.06,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.926,0 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.5377,0 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.3026,0.1102 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.2823 0,-0.2823 0,0 0.092,0 0.092,0 0.078,0 0.1175,0.047 0.1175,0.1411 0,0.094 -0.037,0.1412 -0.1104,0.1412 z m 2.0934,0.01 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.09,0 0.1353,0.049 0.1353,0.148 0,0.101 -0.045,0.1514 -0.1353,0.1514 z m -0.6907,-1.7724 c 0,-0.016 -0.01,-0.025 -0.025,-0.025 0,0 -0.2634,0 -0.2634,0 -0.017,0 -0.025,0.01 -0.025,0.025 0,0 0,1.1461 0,1.1461 0,0.016 0.01,0.024 0.025,0.024 0,0 0.2634,0 0.2634,0 0.017,0 0.025,-0.01 0.025,-0.024 0,0 0,-1.1461 0,-1.1461 z m -0.9256,0.2616 c 0,-0.043 -0.016,-0.081 -0.048,-0.1119 -0.032,-0.031 -0.071,-0.047 -0.1157,-0.047 -0.045,0 -0.083,0.016 -0.114,0.047 -0.031,0.031 -0.046,0.068 -0.046,0.1119 0,0 0,0.6297 0,0.6297 0,0.046 0.015,0.084 0.044,0.1137 0.03,0.03 0.068,0.045 0.1157,0.045 0.045,0 0.084,-0.015 0.1158,-0.046 0.032,-0.031 0.048,-0.068 0.048,-0.1118 0,0 0,-0.6297 0,-0.6297 z m -0.1638,0.7089 c -0.055,0 -0.082,-0.026 -0.082,-0.079 0,0 0,-0.6298 0,-0.6298 0,-0.053 0.027,-0.079 0.082,-0.079 0.052,0 0.078,0.026 0.078,0.079 0,0 0,0.6298 0,0.6298 0,0.053 -0.026,0.079 -0.078,0.079 z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" id="path31495"/>
+      <path id="path31497" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 187.50008,7189.1802 1.9595,0 0,2.4741 -1.9595,0 z" inkscape:connector-curvature="0"/>
+      <path d="m 185.08338,7189.1801 1.9595,0 0,2.4742 -1.9595,0 z" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path31499" inkscape:connector-curvature="0"/>
+      <path id="path31501" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.21079655;stroke-miterlimit:4;display:inline" d="m 183.35008,7189.1346 1.246,0 0,4.3671 -1.246,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 184.10858,7189.1346 0.4875,0 0,4.3671 -0.4875,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.1318544;stroke-miterlimit:4;display:inline" id="path31503"/>
+      <rect transform="matrix(1,0,-0.01802634,0.99983751,0,0)" y="7190.4883" x="286.77554" height="4.8445239" width="24.429632" id="rect31505" style="fill:url(#linearGradient31601);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47956967;display:inline"/>
+      <path inkscape:connector-curvature="0" id="path31507" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" d="m 158.48178,7190.0031 1.5809,0 c 0.2145,0 0.4,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1436,-0.5224 0.3581,-0.5224 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 161.75668,7190.0031 1.581,0 c 0.2144,0 0.3999,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1437,-0.5224 0.3581,-0.5224 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" id="path31509" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path31511" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" d="m 165.06488,7190.0031 1.5809,0 c 0.2145,0 0.4,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1436,-0.5224 0.3581,-0.5224 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 95.246179,7188.7233 30.110301,-0.046 0.1831,6.4518 -29.992501,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429;display:inline" id="path31513"/>
+      <path inkscape:connector-curvature="0" id="path31515" d="m 98.564179,7190.3947 7.380601,0 0,0.7426 -7.380601,0 z" style="fill:#000000;stroke:none;display:inline"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path31517" d="m 116.73488,7190.2588 0,3.2965 3.1351,0 0,-2.8356 0,-0.2438 0,-0.2171 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.0641 -1.0288,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0641 0.9798,0 0.016,-0.1161 z" style="fill:#000000;stroke:none;display:inline"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 107.31638,7190.3947 7.3806,0 0,0.7426 -7.3806,0 z" id="path31519"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 98.773179,7191.7874 7.380601,0 0,0.4179 -7.380601,0 z" id="path31521"/>
+      <path id="path31523" d="m 107.52538,7191.7874 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path id="path31525" d="m 98.929879,7192.9017 7.380701,0 0,0.4179 -7.380701,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 107.68218,7192.9017 7.3806,0 0,0.4179 -7.3806,0 z" id="path31527"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 98.982179,7193.9695 7.380601,0 0,0.4179 -7.380601,0 z" id="path31529"/>
+      <path id="path31531" d="m 107.73438,7193.9695 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 116.61728,7193.9695 7.3807,0 0,0.4179 -7.3807,0 z" id="path31533"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 95.246179,7189.7911 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3492 -0.019,-0.5122 -0.091,-1.2443 -0.061,-1.5609 2.8774,-0.052 22.253301,-0.011 25.054801,0 0.017,0.2963 0.018,0.2276 0.01,0.325 -1.0213,0.011 -24.532901,-0.011 -24.519001,0 0.1466,1.4148 0.077,3.6729 0.2086,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0697,0.045 z" style="fill:#000000;stroke:none;display:inline" id="path31535"/>
+      <path id="path31537" style="fill:#808080;stroke:#000000;stroke-width:0.44053429;display:inline" d="m 125.33358,7188.7232 30.1103,-0.046 0.065,6.4996 -29.9797,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none;display:inline" d="m 128.65158,7190.3947 7.3806,0 0,0.7426 -7.3806,0 z" id="path31539" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 146.82228,7190.2588 0,3.2965 3.1351,0 0,-3.2965 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9798,0 0.016,-0.1162 -1.6983,0 z" id="path31541"/>
+      <path sodipodi:nodetypes="ccccc" id="path31543" d="m 137.40388,7190.3947 7.3806,0 0,0.7426 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path31545" d="m 128.86058,7191.7874 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 137.61278,7191.7874 7.3807,0 0,0.4179 -7.3807,0 z" id="path31547"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 129.01738,7192.9017 7.3806,0 0,0.4179 -7.3806,0 z" id="path31549"/>
+      <path sodipodi:nodetypes="ccccc" id="path31551" d="m 137.76958,7192.9017 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path31553" d="m 129.06958,7193.9695 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none;display:inline" d="m 137.82188,7193.9695 7.3806,0 0,0.4179 -7.3806,0 z" id="path31555"/>
+      <path sodipodi:nodetypes="ccccc" id="path31557" d="m 146.70468,7193.9695 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none;display:inline" inkscape:connector-curvature="0"/>
+      <path id="path31559" style="fill:#000000;stroke:none;display:inline" d="m 125.33358,7189.7911 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3492 -0.019,-0.5122 -0.091,-1.2443 -0.061,-1.5609 2.8773,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2963 0.018,0.2276 0.01,0.325 -1.0214,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 120.66788,7190.2393 0,0.4761 2.1705,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path31561"/>
+      <path id="path31563" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 120.66798,7193.559 0,-0.476 2.1703,0 0.016,-0.8008 0.5267,0 0,0.8001 0,0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path31565" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 150.57918,7190.2393 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 150.57928,7193.559 0,-0.476 2.1703,0 0.016,-0.8008 0.5267,0 0,0.8001 0,0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path31567"/>
+      <path inkscape:connector-curvature="0" d="m 187.50008,7192.583 1.9595,0 0,1.082 -1.9595,0 z" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" id="path31569"/>
+      <path inkscape:connector-curvature="0" id="path31571" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" d="m 185.08338,7192.5829 1.9595,0 0,1.0821 -1.9595,0 z"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 158.48178,7192.2358 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" id="path31573" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path31575" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" d="m 161.75668,7192.2358 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1437,-0.5221 0.3581,-0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 165.06488,7192.2358 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" id="path31577" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path31579" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" d="m 168.42818,7192.2358 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.5809,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 171.70318,7192.2358 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.5809,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.358,-0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" id="path31581" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path31583" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545;display:inline" d="m 175.01128,7192.2358 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.4159,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.358,-0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path style="fill:url(#linearGradient31603);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.32461023;stroke-miterlimit:4;stroke-dasharray:none;display:inline" d="m 191.92908,7180.0275 c -0.7615,0 -1.4037,0.8277 -1.4533,1.8556 l -0.6205,12.5477 c -0.05,1.0282 0.5285,1.8557 1.29,1.8557 l 5.5518,0 c 0.7615,0 1.4037,-0.8275 1.4533,-1.8557 l 0.1469,-3.0263 -0.8491,-0.1331 0,-5.8099 1.143,0.1546 0.1797,-3.7334 c 0.05,-1.0281 -0.5285,-1.8556 -1.29,-1.8556 l -5.5518,0 z m 2.7269,6.075 c 0.2416,0.014 0.427,0.56 0.4082,1.2151 -0.019,0.6552 -0.2319,1.1616 -0.4735,1.1488 -0.2416,-0.014 -0.4107,-0.5377 -0.3919,-1.1929 0.019,-0.655 0.2156,-1.1835 0.4572,-1.171 z" id="path31585" inkscape:connector-curvature="0"/>
+      <path style="fill:#808080;fill-opacity:1;stroke:none;display:inline" d="m 194.05738,7181.6747 1.1191,-0.079 1.3653,1.824 -0.3256,12.2872 -1.1238,0.1333 -1.5769,-2.1767 0.9296,-0.054 0.6884,0.5189 0.2954,-10.5373 -1.3715,-1.9164" id="path31587" inkscape:path-effect="#path-effect32179" inkscape:original-d="m 194.05738,7181.6747 c 0.062,-0.8459 0.4414,-0.5645 1.1191,-0.079 l 1.3653,1.824 -0.3256,12.2872 c -0.3058,0.6698 -0.6828,0.3004 -1.1238,0.1333 l -1.5769,-2.1767 c 0.3209,-0.5608 0.4055,-0.2756 0.9296,-0.054 l 0.6884,0.5189 0.2954,-10.5373 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+      <path style="fill:#4d4d4d;fill-opacity:1;stroke:none;display:inline" d="m 193.98828,7184.3041 1.0251,1.0264 -0.2408,9.0862 -1.257,-0.7506 -0.038,1.4746 1.6211,0.7015 0.3584,-12.3034 -1.4053,-1.8656 -0.0635,2.6309" id="path31589" inkscape:path-effect="#path-effect32181" inkscape:original-d="m 193.98828,7184.3041 1.0251,1.0264 -0.2408,9.0862 -1.257,-0.7506 -0.038,1.4746 1.6211,0.7015 0.3584,-12.3034 -1.4053,-1.8656 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path style="fill:none;stroke:#ffffff;stroke-width:1.10487461px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" d="m 80.976879,7182.4054 10.7304,0 -9.5579,11.1507 10.766,0" id="path31591" inkscape:path-effect="#path-effect32183" inkscape:original-d="m 80.976879,7182.4054 10.7304,0 -9.5579,11.1507 c 0,0 11.6187,0 10.766,0" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/elements/Zabbix_server_3D.svg b/misc/images/svg/elements/Zabbix_server_3D.svg
index e284bbb99c0..2de40f6d045 100644
--- a/misc/images/svg/elements/Zabbix_server_3D.svg
+++ b/misc/images/svg/elements/Zabbix_server_3D.svg
@@ -1,732 +1,141 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128.00603"
-   height="26.677349"
-   id="svg163767"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 72">
-  <defs
-     id="defs163769">
-    <linearGradient
-       y2="7986.2241"
-       x2="407.36697"
-       y1="8015.7466"
-       x1="407.2959"
-       gradientTransform="matrix(1.0820341,0,0,1.0820341,1141.4661,-641.17195)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient33761-8-3"
-       xlink:href="#linearGradient42443-7-52-0-7-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient42443-7-52-0-7-9">
-      <stop
-         id="stop42445-53-8-3-8-0"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop42447-0-2-7-4-5-0" />
-      <stop
-         id="stop42449-3-19-2-9-6"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128.00603" height="26.677349" id="svg163767" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 72">
+  <defs id="defs163769">
+    <linearGradient y2="7986.2241" x2="407.36697" y1="8015.7466" x1="407.2959" gradientTransform="matrix(1.0820341,0,0,1.0820341,1141.4661,-641.17195)" gradientUnits="userSpaceOnUse" id="linearGradient33761-8-3" xlink:href="#linearGradient42443-7-52-0-7-9" inkscape:collect="always"/>
+    <linearGradient id="linearGradient42443-7-52-0-7-9">
+      <stop id="stop42445-53-8-3-8-0" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop42447-0-2-7-4-5-0"/>
+      <stop id="stop42449-3-19-2-9-6" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient42443-7-52-0-7-9"
-       id="linearGradient33387-4-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,1.0820341,1140.5063,-641.17195)"
-       x1="364.44846"
-       y1="8003.1118"
-       x2="393.69363"
-       y2="8012.6118" />
-    <linearGradient
-       id="linearGradient163651">
-      <stop
-         id="stop163653"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.3702293"
-         id="stop163655" />
-      <stop
-         id="stop163657"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient42443-7-52-0-7-9" id="linearGradient33387-4-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,1.0820341,1140.5063,-641.17195)" x1="364.44846" y1="8003.1118" x2="393.69363" y2="8012.6118"/>
+    <linearGradient id="linearGradient163651">
+      <stop id="stop163653" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.3702293" id="stop163655"/>
+      <stop id="stop163657" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
     </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45449-51-8-3-9-0"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect45451-306-5-5-5-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48206-5-6-8-6-4"
-       id="linearGradient33354-7-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,-0.03023962,1.0816114,1143.3659,-641.17195)"
-       x1="675.60059"
-       y1="8005.3086"
-       x2="675.54651"
-       y2="7999.9312" />
-    <linearGradient
-       id="linearGradient48206-5-6-8-6-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop48208-6-76-6-4-8" />
-      <stop
-         style="stop-color:#27343c;stop-opacity:1;"
-         offset="1"
-         id="stop48210-0-7-9-74-6" />
+    <inkscape:path-effect is_visible="true" id="path-effect45449-51-8-3-9-0" effect="spiro"/>
+    <inkscape:path-effect is_visible="true" id="path-effect45451-306-5-5-5-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient48206-5-6-8-6-4" id="linearGradient33354-7-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,-0.03023962,1.0816114,1143.3659,-641.17195)" x1="675.60059" y1="8005.3086" x2="675.54651" y2="7999.9312"/>
+    <linearGradient id="linearGradient48206-5-6-8-6-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop48208-6-76-6-4-8"/>
+      <stop style="stop-color:#27343c;stop-opacity:1;" offset="1" id="stop48210-0-7-9-74-6"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient46818-2-5-4-29-6"
-       id="linearGradient33342-1-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,1.0820341,1131.8061,-641.27598)"
-       x1="596.23846"
-       y1="8003.4058"
-       x2="596.36462"
-       y2="8010.4072" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient46818-2-5-4-29-6">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop46820-7-5-2-0-0" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop46822-37-28-8-8-2" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient46818-2-5-4-29-6" id="linearGradient33342-1-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,1.0820341,1131.8061,-641.27598)" x1="596.23846" y1="8003.4058" x2="596.36462" y2="8010.4072"/>
+    <linearGradient inkscape:collect="always" id="linearGradient46818-2-5-4-29-6">
+      <stop style="stop-color:#333333;stop-opacity:1;" offset="0" id="stop46820-7-5-2-0-0"/>
+      <stop style="stop-color:#333333;stop-opacity:0;" offset="1" id="stop46822-37-28-8-8-2"/>
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76654-2-7-9-5-1-5"
-       id="linearGradient33300-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0820341,0,0,1.0820341,1142.2435,-641.17195)"
-       x1="491.4574"
-       y1="8005.355"
-       x2="471.42123"
-       y2="8002.9468" />
-    <linearGradient
-       id="linearGradient76654-2-7-9-5-1-5">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop76656-2-2-6-4-9-0" />
-      <stop
-         id="stop76664-9-25-9-0-8-2"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop76658-9-5-21-6-7-8" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient76654-2-7-9-5-1-5" id="linearGradient33300-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0820341,0,0,1.0820341,1142.2435,-641.17195)" x1="491.4574" y1="8005.355" x2="471.42123" y2="8002.9468"/>
+    <linearGradient id="linearGradient76654-2-7-9-5-1-5">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop76656-2-2-6-4-9-0"/>
+      <stop id="stop76664-9-25-9-0-8-2" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop76658-9-5-21-6-7-8"/>
     </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45434-5-3-2-9-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect45430-8-1-9-6-8"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4332-2-9"
-       is_visible="true" />
+    <inkscape:path-effect effect="spiro" id="path-effect45434-5-3-2-9-6" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect45430-8-1-9-6-8" is_visible="true"/>
+    <inkscape:path-effect effect="spiro" id="path-effect4332-2-9" is_visible="true"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="150.44095"
-     inkscape:cy="104.76837"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="22"
-     inkscape:window-y="29"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata163772">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="150.44095" inkscape:cy="104.76837" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="22" inkscape:window-y="29" inkscape:window-maximized="0"/>
+  <metadata id="metadata163772">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-224.55905,-610.4532)">
-    <g
-       transform="translate(-1305.8443,-7388.6507)"
-       style="display:inline"
-       id="g31319"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Zabbix_server_3D.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 1536.1605,8008.3071 0.136,16.8934 116.5295,0.3783 -0.2699,-17.2934 -31.8128,-9.1815 -53.7545,0 z"
-         style="fill:url(#linearGradient33761-8-3);fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path47635-7-3-1-0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path47637-4-5-0-4"
-         style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.94771594;stroke-opacity:1"
-         d="m 1536.6642,8008.7749 115.4487,0 0,16.5302 -115.4487,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 1553.7254,8008.7749 62.1557,0 0,16.5302 -62.1557,0 z"
-         style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.86010271;stroke-opacity:1"
-         id="path47645-2-1-4-7"
-         sodipodi:nodetypes="ccccc" />
-      <rect
-         style="fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="rect4314"
-         width="15.593775"
-         height="15.593775"
-         x="1537.745"
-         y="8009.1689"
-         ry="0"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\text4214.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47647-5-9-5-7"
-         d="m 1537.3686,8009.2565 c 0.7616,0 1.4037,0.8273 1.4533,1.8556 l 0.6205,12.5477 c 0.05,1.0281 -0.5285,1.8557 -1.29,1.8557 l -5.5518,0 c -0.7615,0 -1.4038,-0.8276 -1.4533,-1.8557 l -0.147,-3.0263 0.8491,-0.1333 0,-5.8098 -1.143,0.1544 -0.1796,-3.7333 c -0.05,-1.0281 0.5285,-1.8557 1.29,-1.8557 l 5.5518,0 z m -2.7269,6.075 c -0.2416,0.014 -0.427,0.5598 -0.4082,1.2151 0.019,0.655 0.2319,1.1613 0.4735,1.1487 0.2416,-0.014 0.4107,-0.538 0.3919,-1.193 -0.019,-0.6552 -0.2156,-1.1835 -0.4572,-1.1708 z"
-         style="fill:url(#linearGradient33387-4-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21640682;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1535.2402,8010.9035 c -0.062,-0.846 -0.4414,-0.5646 -1.119,-0.079 l -1.3653,1.8238 0.3256,12.2874 c 0.3058,0.6698 0.6828,0.3005 1.1237,0.1333 l 1.577,-2.1767 c -0.3209,-0.5604 -0.4055,-0.2753 -0.9297,-0.054 l -0.6884,0.5188 -0.2953,-10.5374 z"
-         inkscape:path-effect="#path-effect45449-51-8-3-9-0"
-         id="path47649-7-02-5-4"
-         d="m 1535.2402,8010.9035 -1.119,-0.079 -1.3653,1.8238 0.3256,12.2874 1.1237,0.1333 1.577,-2.1767 -0.9297,-0.054 -0.6884,0.5188 -0.2953,-10.5374 1.3714,-1.9162"
-         style="fill:#808080;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 1535.3094,8013.533 -1.0251,1.0264 0.2408,9.0864 1.257,-0.7507 0.038,1.4746 -1.6211,0.7015 -0.3584,-12.3035 1.4053,-1.8657 z"
-         inkscape:path-effect="#path-effect45451-306-5-5-5-5"
-         id="path47651-2-7-2-3"
-         d="m 1535.3094,8013.533 -1.0251,1.0264 0.2408,9.0864 1.257,-0.7507 0.038,1.4746 -1.6211,0.7015 -0.3584,-12.3035 1.4053,-1.8657 0.064,2.631"
-         style="fill:#4d4d4d;stroke:none" />
-      <path
-         id="path47653-8-8-8-1"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         d="m 1554.4013,8010.267 30.2538,0.049 0.1831,6.4038 -30.1838,-0.047 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 1557.7193,8011.9384 7.3806,0 0,0.7427 -7.3806,0 z"
-         id="path47655-6-3-2-3"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         d="m 1575.89,8011.8026 0,3.2964 3.1352,0 0,-2.8356 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.064 -1.0287,0 -0.016,0.093 -0.6694,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z"
-         id="path47657-2-7-7-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccc" />
-      <path
-         id="path47659-8-3-8-3"
-         d="m 1566.4716,8011.9384 7.3806,0 0,0.7427 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path47661-6-53-9-0"
-         d="m 1557.9283,8013.3311 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1566.6806,8013.3311 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47663-7-34-9-1" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1558.0851,8014.4454 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47665-4-4-8-9" />
-      <path
-         id="path47667-1-1-7-0"
-         d="m 1566.8373,8014.4454 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path47669-0-9-2-4"
-         d="m 1558.1373,8015.5133 7.3807,0 0,0.4178 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1566.8896,8015.5133 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path47671-9-4-3-2" />
-      <path
-         id="path47673-8-36-7-9"
-         d="m 1575.7725,8015.5133 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path47675-7-3-0-3"
-         style="fill:#000000;stroke:none"
-         d="m 1554.4013,8011.3348 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5125 -0.091,-1.2445 -0.061,-1.561 2.8773,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2962 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6728 0.2085,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 1584.8132,8010.2669 30.1103,-0.046 0.065,6.4995 -29.9797,0 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         id="path47689-0-2-5-1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47691-9-7-6-4"
-         d="m 1588.1312,8011.9384 7.3806,0 0,0.7427 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path47693-7-1-2-8"
-         d="m 1606.3019,8011.8026 0,3.2964 3.1351,0 0,-3.2964 -1.4369,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9798,0 0.016,-0.1162 -1.6983,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1596.8835,8011.9384 7.3806,0 0,0.7427 -7.3806,0 z"
-         id="path47695-3-0-1-2"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1588.3402,8013.3311 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47697-2-50-8-0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path47699-4-8-9-5"
-         d="m 1597.0924,8013.3311 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path47701-8-0-5-5"
-         d="m 1588.497,8014.4454 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1597.2492,8014.4454 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47703-2-3-2-9"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1588.5492,8015.5133 7.3806,0 0,0.4178 -7.3806,0 z"
-         id="path47705-5-8-9-3"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         id="path47707-4-6-2-2"
-         d="m 1597.3015,8015.5133 7.3806,0 0,0.4178 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1606.1843,8015.5133 7.3807,0 0,0.4178 -7.3807,0 z"
-         id="path47709-9-7-6-8"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 1584.8132,8011.3348 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5125 -0.091,-1.2445 -0.061,-1.561 2.8773,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2962 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6728 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path47711-6-3-6-7" />
-      <path
-         id="path47713-9-42-3-4"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1579.8231,8011.783 0,0.4761 2.1704,0 0.016,0.8008 0.5267,0 0,-0.8002 0,-0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 1579.8231,8015.1026 0,-0.4758 2.1704,0 0.016,-0.801 0.5266,0 0,0.8002 0,0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path47715-3-1-9-8" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 1610.0588,8011.783 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8002 0,-0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path47717-3-9-1-1" />
-      <path
-         id="path47719-2-2-2-4"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1610.0589,8015.1026 0,-0.4758 2.1703,0 0.016,-0.801 0.5267,0 0,0.8002 0,0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 1616.6664,8011.5909 32.5924,0 -0.1165,4.1673 -32.5924,0 z"
-         style="fill:url(#linearGradient33354-7-6);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.51374948"
-         id="path47721-7-9-0-3" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 1646.844,8012.5236 0.4495,0 c 0.1014,0 0.1771,0.01 0.2271,0.019 0.067,0.017 0.1207,0.048 0.1608,0.093 0.04,0.044 0.065,0.099 0.076,0.163 0.011,0.064 0,0.1435 -0.019,0.2378 -0.02,0.083 -0.05,0.1542 -0.09,0.2141 -0.049,0.073 -0.1067,0.1325 -0.1743,0.1778 -0.051,0.034 -0.1154,0.061 -0.1927,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4628,0 z m 0.204,0.1702 -0.1644,0.6664 0.1836,0 c 0.069,0 0.1191,0 0.1511,-0.01 0.042,-0.01 0.078,-0.022 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.097 0.028,-0.045 0.051,-0.1065 0.07,-0.1843 0.019,-0.078 0.026,-0.1374 0.019,-0.1791 -0.01,-0.041 -0.022,-0.074 -0.046,-0.097 -0.024,-0.023 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z m -1.2773,0.836 -0.1872,-1.0062 0.2667,0 0.1246,0.7447 0.482,-0.7447 0.2609,0 -0.6844,1.0062 z m -1.2931,-1.0062 0.4495,0 c 0.1014,0 0.1771,0.01 0.2271,0.019 0.067,0.017 0.1207,0.048 0.1607,0.093 0.04,0.044 0.065,0.099 0.076,0.163 0.011,0.064 0,0.1435 -0.019,0.2378 -0.02,0.083 -0.051,0.1542 -0.09,0.2141 -0.048,0.073 -0.1066,0.1325 -0.1743,0.1778 -0.051,0.034 -0.1153,0.061 -0.1926,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4629,0 z m 0.2039,0.1702 -0.1643,0.6664 0.1836,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.079,-0.022 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.097 0.028,-0.045 0.051,-0.1065 0.07,-0.1843 0.019,-0.078 0.026,-0.1374 0.019,-0.1791 -0.01,-0.041 -0.022,-0.074 -0.046,-0.097 -0.024,-0.023 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1996,-0.01 z"
-         style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-         id="path47725-9-2-0-5" />
-      <path
-         style="fill:#ffffff;stroke:none"
-         d="m 1645.9959,8013.8394 c -1.116,0 -2.0207,0.1242 -2.0207,0.2784 0,0.1541 0.9047,0.2785 2.0207,0.2785 1.1161,0 2.0208,-0.1244 2.0208,-0.2785 0,-0.1542 -0.9047,-0.2784 -2.0208,-0.2784 z m 0,0.2013 c 0.3133,0 0.5673,0.035 0.5673,0.077 0,0.043 -0.254,0.077 -0.5673,0.077 -0.3132,0 -0.5672,-0.035 -0.5672,-0.077 0,-0.043 0.254,-0.077 0.5672,-0.077 z"
-         id="path47727-0-2-9-5"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-size:0.66138339px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
-         x="1617.5879"
-         y="8151.9688"
-         id="text47729-5-5-4-2"
-         sodipodi:linespacing="125%"
-         transform="scale(1.0170762,0.9832105)"><tspan
-           sodipodi:role="line"
-           id="tspan47731-4-8-6-6"
-           x="1617.5879"
-           y="8151.9688">ROM</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         d="m 1634.776,8012.7561 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1032,0 0.1032,0 0.05,0 0.075,0.019 0.075,0.057 0,0.044 -0.026,0.065 -0.078,0.065 z m 0.794,0.062 c -0.014,0.069 -0.051,0.1031 -0.1104,0.1031 -0.083,0 -0.1246,-0.05 -0.1246,-0.1513 0,-0.099 0.042,-0.1481 0.1246,-0.1481 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.017,-0.08 -0.069,-0.1204 -0.1567,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.1286 0.057,0.1928 0.1709,0.1928 0.097,0 0.153,-0.048 0.1673,-0.1446 0,0 -0.05,0 -0.05,0 z m -1.6876,-0.241 c -0.1235,0 -0.1852,0.064 -0.1852,0.1928 0,0.1285 0.062,0.1928 0.1852,0.1928 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1286 -0.062,-0.1928 -0.1851,-0.1928 z m -0.299,0.241 c -0.012,0.069 -0.047,0.1031 -0.1068,0.1031 -0.085,0 -0.1282,-0.05 -0.1282,-0.1513 0,-0.099 0.041,-0.1481 0.1246,-0.1481 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.062,-0.1204 -0.1566,-0.1204 -0.1163,0 -0.1745,0.064 -0.1745,0.1927 0,0.1286 0.056,0.1928 0.1673,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m 2.371,-0.2307 c 0,0 -0.3061,0 -0.3061,0 0,0 0,0.045 0,0.045 0,0 0.1281,0 0.1281,0 0,0 0,0.3236 0,0.3236 0,0 0.05,0 0.05,0 0,0 0,-0.3236 0,-0.3236 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.8295,0 c 0,0 -0.057,0 -0.057,0 0,0 -0.1423,0.3684 -0.1423,0.3684 0,0 0.053,0 0.053,0 0,0 0.039,-0.1068 0.039,-0.1068 0,0 0.153,0 0.153,0 0,0 0.036,0.1068 0.036,0.1068 0,0 0.057,0 0.057,0 0,0 -0.1388,-0.3684 -0.1388,-0.3684 z m -0.331,0 c 0,0 -0.1674,0 -0.1674,0 0,0 0,0.3684 0,0.3684 0,0 0.05,0 0.05,0 0,0 0,-0.155 0,-0.155 0,0 0.1175,0 0.1175,0 0.076,0 0.1139,-0.037 0.1139,-0.1102 0,-0.069 -0.038,-0.1032 -0.1139,-0.1032 z m -0.2778,0 c 0,0 -0.071,0 -0.071,0 0,0 -0.1104,0.3098 -0.1104,0.3098 0,0 -0.1068,-0.3098 -0.1068,-0.3098 0,0 -0.075,0 -0.075,0 0,0 0,0.3684 0,0.3684 0,0 0.05,0 0.05,0 0,0 0,-0.3064 0,-0.3064 0,0 0.1068,0.3064 0.1068,0.3064 0,0 0.05,0 0.05,0 0,0 0.1104,-0.3099 0.1104,-0.3099 0,0 0,0.093 0,0.093 0,0 0,0.217 0,0.217 0,0 0.05,0 0.05,0 0,0 0,-0.3684 0,-0.3684 z m -1.4312,0.065 c 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,0.014 -0.043,0.041 0,0 0,0.3889 0,0.3889 0,0.018 -0.01,0.028 -0.028,0.028 0,0 -0.356,0 -0.356,0 -0.074,0 -0.1341,0.023 -0.1817,0.071 -0.048,0.047 -0.071,0.1061 -0.071,0.1773 0,0 0,0.8569 0,0.8569 0,0.069 0.024,0.1274 0.073,0.1756 0.049,0.048 0.1086,0.072 0.1799,0.072 0,0 0.8152,0 0.8152,0 0.029,0 0.043,-0.015 0.043,-0.045 0,0 0,-1.7243 0,-1.7243 z m 2.9586,1.2011 c 0,-0.03 -0.014,-0.045 -0.043,-0.045 0,0 -0.356,0 -0.356,0 -0.031,0 -0.046,0.015 -0.046,0.045 0,0 0,0.1996 0,0.1996 0,0.057 -0.029,0.086 -0.086,0.086 -0.059,0 -0.089,-0.029 -0.089,-0.086 0,0 0,-0.6124 0,-0.6124 0,-0.057 0.03,-0.086 0.089,-0.086 0.057,0 0.086,0.029 0.086,0.086 0,0 0,0.1616 0,0.1616 0,0.028 0.015,0.041 0.046,0.041 0,0 0.356,0 0.356,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2856 0,-0.2856 0,-0.069 -0.025,-0.1274 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.5482,0 -0.5482,0 -0.071,0 -0.1319,0.024 -0.1817,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.8535 0,0.8535 0,0.071 0.024,0.1309 0.073,0.1791 0.049,0.048 0.1098,0.072 0.1834,0.072 0,0 0.5483,0 0.5483,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.1791 0,0 0,-0.3167 0,-0.3167 z m -1.1785,-0.072 c 0,-0.069 -0.025,-0.1273 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.3311,0 -0.3311,0 -0.036,0 -0.053,-0.017 -0.053,-0.052 0,-0.037 0.018,-0.055 0.053,-0.055 0,0 0.4984,0 0.4984,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2753 0,-0.2753 0,-0.028 -0.014,-0.042 -0.043,-0.042 0,0 -0.7049,0 -0.7049,0 -0.071,0 -0.1317,0.025 -0.1816,0.072 -0.05,0.048 -0.075,0.1066 -0.075,0.1754 0,0 0,0.3647 0,0.3647 0,0.069 0.025,0.1275 0.075,0.1757 0.05,0.048 0.1103,0.072 0.1816,0.072 0,0 0.3311,0 0.3311,0 0.045,0 0.068,0.023 0.068,0.069 0,0.042 -0.023,0.062 -0.068,0.062 0,0 -0.5447,0 -0.5447,0 -0.029,0 -0.043,0.015 -0.043,0.045 0,0 0,0.272 0,0.272 0,0.03 0.014,0.045 0.043,0.045 0,0 0.7512,0 0.7512,0 0.073,0 0.1347,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1078 0.073,-0.1789 0,0 0,-0.3891 0,-0.3891 z m 1.0788,1.1531 c 0,0 -0.2279,0 -0.2279,0 0,0 0,-0.1239 0,-0.1239 0,0 0.2064,0 0.2064,0 0,0 0,-0.041 0,-0.041 0,0 -0.2064,0 -0.2064,0 0,0 0,-0.1134 0,-0.1134 0,0 0.2243,0 0.2243,0 0,0 0,-0.045 0,-0.045 0,0 -0.2742,0 -0.2742,0 0,0 0,0.3648 0,0.3648 0,0 0.2778,0 0.2778,0 0,0 0,-0.041 0,-0.041 z m -0.3703,-0.1515 c 0,0 -0.1673,0 -0.1673,0 0,0 0,0.042 0,0.042 0,0 0.1175,0 0.1175,0 0,0.08 -0.039,0.1204 -0.1175,0.1204 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.062,0 0.099,0.024 0.1103,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.063,-0.1205 -0.1602,-0.1205 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.064 0.017,0.1126 0.052,0.1446 0.034,0.032 0.075,0.048 0.1229,0.048 0.057,0 0.099,-0.02 0.1247,-0.059 0,0 0.014,0.048 0.014,0.048 0,0 0.032,0 0.032,0 0,0 0,-0.1927 0,-0.1927 z m -0.4984,-0.1721 c 0,0 -0.057,0 -0.057,0 0,0 -0.1459,0.3648 -0.1459,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.053,0 0.053,0 0,0 -0.1353,-0.3648 -0.1353,-0.3648 z m -0.2136,0.3579 c -0.012,0 -0.018,-0.017 -0.018,-0.038 0,0 0,-0.065 0,-0.065 0,-0.03 -0.018,-0.053 -0.046,-0.069 0.035,-0.018 0.053,-0.047 0.053,-0.086 0,-0.066 -0.042,-0.1001 -0.1247,-0.1001 0,0 -0.178,0 -0.178,0 0,0 0,0.3649 0,0.3649 0,0 0.053,0 0.053,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1246,0 0.1246,0 0.043,0 0.065,0.022 0.068,0.065 0,0 0.01,0.089 0.01,0.089 0,0 0.064,-0.01 0.064,-0.01 z m -0.5519,-0.3682 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.055 0.017,0.101 0.05,0.1377 0.033,0.037 0.078,0.055 0.1353,0.055 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1851,-0.1927 z m -0.1851,0.01 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1317,0 0.1317,0 0,0 0,0.32 0,0.32 0,0 0.05,0 0.05,0 0,0 0,-0.32 0,-0.32 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0.1652 c 0,0 -0.1068,-0.025 -0.1068,-0.025 -0.031,-0.01 -0.046,-0.022 -0.046,-0.045 0,-0.044 0.029,-0.065 0.085,-0.065 0.064,0 0.096,0.024 0.096,0.076 0,0 0.046,0 0.046,0 0,-0.078 -0.049,-0.117 -0.146,-0.117 -0.088,0 -0.1318,0.038 -0.1318,0.1135 0,0.046 0.027,0.074 0.082,0.086 0,0 0.075,0.017 0.075,0.017 0.055,0.012 0.082,0.033 0.082,0.065 0,0.041 -0.033,0.062 -0.1,0.062 -0.069,0 -0.1032,-0.029 -0.1032,-0.086 0,0 -0.046,0 -0.046,0 0,0.085 0.05,0.1275 0.1495,0.1275 0.1,0 0.1495,-0.037 0.1495,-0.1102 0,-0.053 -0.029,-0.086 -0.086,-0.1001 z m -0.5697,-0.1652 c 0,0 -0.057,0 -0.057,0 0,0 -0.1425,0.3648 -0.1425,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1532,0 0.1532,0 0,0 0.035,0.1032 0.035,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.1318,0 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1318,0 0.1318,0 0,0 0,0.32 0,0.32 0,0 0.053,0 0.053,0 0,0 0,-0.32 0,-0.32 0,0 0.1246,0 0.1246,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0 c 0,0 -0.061,0 -0.061,0 0,0 -0.1423,0.3648 -0.1423,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1388,-0.3648 -0.1388,-0.3648 z m -0.3916,0 c 0,0 -0.1566,0 -0.1566,0 0,0 0,0.3648 0,0.3648 0,0 0.153,0 0.153,0 0.1069,0 0.1603,-0.062 0.1603,-0.1859 0,-0.1193 -0.052,-0.1789 -0.1567,-0.1789 z m 2.8125,-1.8068 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.1499,0.1169 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.088,0 0.1317,0.049 0.1317,0.148 0,0.101 -0.044,0.1514 -0.1317,0.1514 z m -0.9007,1.4215 c 0,0 -0.7548,0 -0.7548,0 -0.05,0 -0.091,-0.016 -0.1246,-0.048 -0.033,-0.032 -0.05,-0.072 -0.05,-0.1205 0,0 0,-0.8569 0,-0.8569 0,-0.048 0.017,-0.088 0.05,-0.1205 0.033,-0.032 0.075,-0.048 0.1246,-0.048 0,0 0.4202,0 0.4202,0 0.028,0 0.043,-0.015 0.043,-0.045 0,0 0,-0.389 0,-0.389 0,-0.018 0.01,-0.028 0.028,-0.028 0,0 0.2634,0 0.2634,0 0.017,0.016 0.025,0.024 0.025,0.028 0,0 0,1.6039 0,1.6039 0,0 -0.01,0.013 -0.025,0.024 z m 2.9318,-0.05 c -0.034,0.033 -0.077,0.05 -0.1263,0.05 0,0 -0.5483,0 -0.5483,0 -0.05,0 -0.093,-0.017 -0.1283,-0.05 -0.036,-0.033 -0.053,-0.074 -0.053,-0.1221 0,0 0,-0.8535 0,-0.8535 0,-0.048 0.018,-0.088 0.053,-0.1205 0.035,-0.032 0.078,-0.048 0.1283,-0.048 0,0 0.5483,0 0.5483,0 0.052,0 0.095,0.016 0.1281,0.047 0.033,0.031 0.05,0.072 0.05,0.1221 0,0 0,0.2271 0,0.2271 0,0.016 -0.01,0.024 -0.025,0.024 0,0 -0.2349,0 -0.2349,0 -0.017,0 -0.025,-0.01 -0.025,-0.024 0,0 0,-0.1032 0,-0.1032 0,-0.046 -0.016,-0.084 -0.048,-0.1153 -0.032,-0.031 -0.072,-0.046 -0.1193,-0.046 -0.047,0 -0.087,0.015 -0.1193,0.046 -0.032,0.031 -0.048,0.069 -0.048,0.1153 0,0 0,0.6126 0,0.6126 0,0.046 0.016,0.084 0.048,0.1153 0.032,0.031 0.072,0.046 0.1193,0.046 0.047,0 0.087,-0.015 0.1193,-0.046 0.032,-0.031 0.048,-0.07 0.048,-0.1153 0,0 0,-0.1445 0,-0.1445 0,-0.016 0.01,-0.024 0.025,-0.024 0,0 0.2349,0 0.2349,0 0.01,0 0.013,0.01 0.025,0.024 0,0 0,0.2615 0,0.2615 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.1785,0 c -0.034,0.033 -0.076,0.05 -0.1263,0.05 0,0 -0.6871,0 -0.6871,0 -0.019,0 -0.028,-0.01 -0.028,-0.024 0,0 0,-0.1548 0,-0.1548 0,-0.016 0.01,-0.024 0.028,-0.024 0,0 0.4806,0 0.4806,0 0.04,0 0.075,-0.014 0.1032,-0.041 0.028,-0.028 0.043,-0.061 0.043,-0.1001 0,-0.041 -0.014,-0.076 -0.041,-0.1032 -0.027,-0.028 -0.062,-0.041 -0.105,-0.041 0,0 -0.3311,0 -0.3311,0 -0.05,0 -0.092,-0.017 -0.1265,-0.05 -0.034,-0.033 -0.052,-0.074 -0.052,-0.1222 0,0 0,-0.3648 0,-0.3648 0,-0.048 0.017,-0.088 0.052,-0.1204 0.034,-0.032 0.077,-0.048 0.1265,-0.048 0,0 0.6408,0 0.6408,0 0.017,0 0.025,0.01 0.025,0.024 0,0 0,0.1514 0,0.1514 0,0.018 -0.01,0.028 -0.025,0.028 0,0 -0.4344,0 -0.4344,0 -0.088,0 -0.1317,0.044 -0.1317,0.1308 0,0.034 0.013,0.064 0.039,0.09 0.026,0.025 0.057,0.038 0.093,0.038 0,0 0.3312,0 0.3312,0 0.047,0 0.089,0.017 0.1246,0.052 0.035,0.034 0.053,0.075 0.053,0.1204 0,0 0,0.389 0,0.389 0,0.048 -0.017,0.089 -0.052,0.1223 z m -1.0805,0.1291 c 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,-0.015 -0.043,-0.045 0,0 0,-1.2666 0,-1.2666 0,-0.028 0.014,-0.041 0.043,-0.041 0,0 0.388,0 0.388,0 0.028,0 0.043,0.014 0.043,0.041 0,0 0,1.2666 0,1.2666 0,0.03 -0.014,0.045 -0.043,0.045 z m 1.0645,0.3545 c 0,0 -0.121,0 -0.121,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1282,0 0.1282,0 0.045,0 0.068,0.021 0.068,0.062 0,0.041 -0.025,0.062 -0.075,0.062 z m 0.2635,0.048 c 0,0 0.06,-0.1618 0.06,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.926,0 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.5377,0 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.3026,0.1102 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.2823 0,-0.2823 0,0 0.092,0 0.092,0 0.078,0 0.1175,0.047 0.1175,0.1411 0,0.094 -0.037,0.1412 -0.1104,0.1412 z m 2.0934,0.01 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.09,0 0.1353,0.049 0.1353,0.148 0,0.101 -0.045,0.1514 -0.1353,0.1514 z m -0.6907,-1.7724 c 0,-0.016 -0.01,-0.025 -0.025,-0.025 0,0 -0.2634,0 -0.2634,0 -0.017,0 -0.025,0.01 -0.025,0.025 0,0 0,1.1461 0,1.1461 0,0.016 0.01,0.024 0.025,0.024 0,0 0.2634,0 0.2634,0 0.017,0 0.025,-0.01 0.025,-0.024 0,0 0,-1.1461 0,-1.1461 z m -0.9256,0.2616 c 0,-0.043 -0.016,-0.081 -0.048,-0.1119 -0.032,-0.031 -0.071,-0.047 -0.1157,-0.047 -0.045,0 -0.083,0.016 -0.114,0.047 -0.031,0.031 -0.046,0.068 -0.046,0.1119 0,0 0,0.6297 0,0.6297 0,0.046 0.015,0.084 0.044,0.1137 0.03,0.03 0.068,0.045 0.1157,0.045 0.045,0 0.084,-0.015 0.1158,-0.046 0.032,-0.031 0.048,-0.068 0.048,-0.1118 0,0 0,-0.6297 0,-0.6297 z m -0.1638,0.7089 c -0.055,0 -0.082,-0.026 -0.082,-0.079 0,0 0,-0.6298 0,-0.6298 0,-0.053 0.027,-0.079 0.082,-0.079 0.052,0 0.078,0.026 0.078,0.079 0,0 0,0.6298 0,0.6298 0,0.053 -0.026,0.079 -0.078,0.079 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="path47737-4-8-1-8" />
-      <path
-         id="path47739-5-0-4-9"
-         style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1646.9797,8018.1653 1.9595,0 0,2.4741 -1.9595,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1644.563,8018.1652 1.9595,0 0,2.4742 -1.9595,0 z"
-         style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path47741-8-0-6-2"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path47743-2-9-6-9"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.21079655;stroke-miterlimit:4"
-         d="m 1642.8297,8018.1197 1.246,0 0,4.3671 -1.246,0 z"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 1643.5882,8018.1197 0.4875,0 0,4.3671 -0.4875,0 z"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.1318544;stroke-miterlimit:4"
-         id="path47745-7-6-5-5" />
-      <rect
-         transform="matrix(1,0,-0.01802634,0.99983751,0,0)"
-         y="8019.6079"
-         x="1761.2012"
-         height="4.8445239"
-         width="24.429632"
-         id="rect47747-2-1-6-9"
-         style="fill:url(#linearGradient33342-1-0);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47956967" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47749-6-6-1-4"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 1617.9614,8018.9882 1.5809,0 c 0.2145,0 0.4,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1436,-0.5224 0.3581,-0.5224 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 1621.2363,8018.9882 1.581,0 c 0.2144,0 0.3999,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1437,-0.5224 0.3581,-0.5224 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path47751-3-8-3-5"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47753-8-9-5-0"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 1624.5445,8018.9882 1.5809,0 c 0.2145,0 0.4,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1436,-0.5224 0.3581,-0.5224 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         d="m 1554.7258,8017.7084 30.1103,-0.046 0.1831,6.4518 -29.9925,2e-4 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429"
-         id="path47755-5-6-2-5" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47757-5-8-6-8"
-         d="m 1558.0438,8019.3798 7.3806,0 0,0.7426 -7.3806,0 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path47759-1-8-9-8"
-         d="m 1576.2145,8019.2439 0,3.2965 3.1351,0 0,-2.8356 0,-0.2438 0,-0.2171 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.0641 -1.0288,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0641 0.9798,0 0.016,-0.1161 z"
-         style="fill:#000000;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1566.796,8019.3798 7.3806,0 0,0.7426 -7.3806,0 z"
-         id="path47761-4-4-4-0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1558.2528,8020.7725 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47763-5-0-6-1" />
-      <path
-         id="path47765-1-4-7-3"
-         d="m 1567.005,8020.7725 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path47767-8-3-3-2"
-         d="m 1558.4095,8021.8868 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1567.1618,8021.8868 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47769-6-4-0-2" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1558.4618,8022.9546 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47771-0-3-5-2" />
-      <path
-         id="path47773-0-7-8-7"
-         d="m 1567.214,8022.9546 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1576.0969,8022.9546 7.3807,0 0,0.4179 -7.3807,0 z"
-         id="path47775-4-4-9-0" />
-      <path
-         sodipodi:nodetypes="ccsssccccccc"
-         inkscape:connector-curvature="0"
-         d="m 1554.7258,8018.7762 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3492 -0.019,-0.5122 -0.091,-1.2443 -0.061,-1.5609 2.8774,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2963 0.018,0.2276 0.01,0.325 -1.0213,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2086,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0697,0.045 z"
-         style="fill:#000000;stroke:none"
-         id="path47777-7-9-5-3" />
-      <path
-         id="path47791-7-5-2-1"
-         style="fill:#808080;stroke:#000000;stroke-width:0.44053429"
-         d="m 1584.8132,8017.7083 30.1103,-0.046 0.065,6.4996 -29.9797,0 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;stroke:none"
-         d="m 1588.1312,8019.3798 7.3806,0 0,0.7426 -7.3806,0 z"
-         id="path47793-6-9-1-3"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1606.3019,8019.2439 0,3.2965 3.1351,0 0,-3.2965 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9798,0 0.016,-0.1162 -1.6983,0 z"
-         id="path47795-4-7-8-3" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path47797-8-1-0-7"
-         d="m 1596.8835,8019.3798 7.3806,0 0,0.7426 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path47799-9-7-1-0"
-         d="m 1588.3402,8020.7725 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1597.0924,8020.7725 7.3807,0 0,0.4179 -7.3807,0 z"
-         id="path47801-7-19-7-9" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1588.497,8021.8868 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47803-0-1-8-5" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path47805-5-0-0-5"
-         d="m 1597.2492,8021.8868 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path47807-4-76-0-8"
-         d="m 1588.5492,8022.9546 7.3806,0 0,0.4179 -7.3806,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:#000000;stroke:none"
-         d="m 1597.3015,8022.9546 7.3806,0 0,0.4179 -7.3806,0 z"
-         id="path47809-2-2-3-3" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path47811-5-1-0-7"
-         d="m 1606.1843,8022.9546 7.3807,0 0,0.4179 -7.3807,0 z"
-         style="fill:#000000;stroke:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path47813-2-9-4-8"
-         style="fill:#000000;stroke:none"
-         d="m 1584.8132,8018.7762 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3492 -0.019,-0.5122 -0.091,-1.2443 -0.061,-1.5609 2.8773,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2963 0.018,0.2276 0.01,0.325 -1.0214,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsssccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 1580.1475,8019.2244 0,0.4761 2.1705,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4757 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path47815-1-5-0-3" />
-      <path
-         id="path47817-5-4-6-7"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1580.1476,8022.5441 0,-0.476 2.1703,0 0.016,-0.8008 0.5267,0 0,0.8001 0,0.4758 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path47819-6-5-8-9"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1610.0588,8019.2244 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4757 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         d="m 1610.0589,8022.5441 0,-0.476 2.1703,0 0.016,-0.8008 0.5267,0 0,0.8001 0,0.4758 z"
-         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path47821-0-4-6-3" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 1646.9797,8021.5681 1.9595,0 0,1.082 -1.9595,0 z"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path47823-4-4-9-9" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47825-1-48-2-1"
-         style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1644.563,8021.568 1.9595,0 0,1.0821 -1.9595,0 z" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 1617.9614,8021.2209 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path47827-7-40-7-8"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47829-2-3-5-2"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 1621.2363,8021.2209 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1437,-0.5221 0.3581,-0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 1624.5445,8021.2209 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path47831-2-2-7-8"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47833-2-4-6-0"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 1627.9078,8021.2209 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.5809,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         sodipodi:nodetypes="ssccssccs"
-         d="m 1631.1828,8021.2209 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.5809,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.358,-0.5221 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         id="path47835-9-0-2-1"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path47837-9-2-3-8"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545"
-         d="m 1634.4909,8021.2209 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.4159,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.358,-0.5221 z"
-         sodipodi:nodetypes="ssccssccs" />
-      <path
-         style="fill:url(#linearGradient33300-6);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.32461023;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m 1651.4087,8009.0126 c -0.7615,0 -1.4037,0.8277 -1.4533,1.8556 l -0.6205,12.5477 c -0.05,1.0282 0.5285,1.8557 1.29,1.8557 l 5.5518,0 c 0.7615,0 1.4037,-0.8275 1.4533,-1.8557 l 0.1469,-3.0263 -0.8491,-0.1331 0,-5.8099 1.143,0.1546 0.1797,-3.7334 c 0.05,-1.0281 -0.5285,-1.8556 -1.29,-1.8556 l -5.5518,0 z m 2.7269,6.075 c 0.2416,0.014 0.427,0.56 0.4082,1.2151 -0.019,0.6552 -0.2319,1.1616 -0.4735,1.1488 -0.2416,-0.014 -0.4107,-0.5377 -0.3919,-1.1929 0.019,-0.655 0.2156,-1.1835 0.4572,-1.171 z"
-         id="path47639-2-7-6-4"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:#808080;fill-opacity:1;stroke:none"
-         d="m 1653.537,8010.6598 1.1191,-0.079 1.3653,1.824 -0.3256,12.2872 -1.1238,0.1333 -1.5769,-2.1767 0.9296,-0.054 0.6884,0.5189 0.2954,-10.5373 -1.3715,-1.9164"
-         id="path47641-0-8-4-8"
-         inkscape:path-effect="#path-effect45434-5-3-2-9-6"
-         inkscape:original-d="m 1653.537,8010.6598 c 0.062,-0.8459 0.4414,-0.5645 1.1191,-0.079 l 1.3653,1.824 -0.3256,12.2872 c -0.3058,0.6698 -0.6828,0.3004 -1.1238,0.1333 l -1.5769,-2.1767 c 0.3209,-0.5608 0.4055,-0.2756 0.9296,-0.054 l 0.6884,0.5189 0.2954,-10.5373 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
-      <path
-         style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-         d="m 1653.4679,8013.2892 1.0251,1.0264 -0.2408,9.0862 -1.257,-0.7506 -0.038,1.4746 1.6211,0.7015 0.3584,-12.3034 -1.4053,-1.8656 -0.063,2.6309"
-         id="path47643-7-6-2-6"
-         inkscape:path-effect="#path-effect45430-8-1-9-6-8"
-         inkscape:original-d="m 1653.4679,8013.2892 1.0251,1.0264 -0.2408,9.0862 -1.257,-0.7506 -0.038,1.4746 1.6211,0.7015 0.3584,-12.3034 -1.4053,-1.8656 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:1.10487461px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1540.4565,8011.3905 10.7304,0 -9.5579,11.1507 10.766,0"
-         id="path4316"
-         inkscape:path-effect="#path-effect4332-2-9"
-         inkscape:original-d="m 1540.4565,8011.3905 10.7304,0 -9.5579,11.1507 c 0,0 11.6187,0 10.766,0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc"
-         inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\text4214.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-224.55905,-610.4532)">
+    <g transform="translate(-1305.8443,-7388.6507)" style="display:inline" id="g31319">
+      <path inkscape:connector-curvature="0" d="m 1536.1605,8008.3071 0.136,16.8934 116.5295,0.3783 -0.2699,-17.2934 -31.8128,-9.1815 -53.7545,0 z" style="fill:url(#linearGradient33761-8-3);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47635-7-3-1-0" sodipodi:nodetypes="ccccccc"/>
+      <path sodipodi:nodetypes="ccccc" id="path47637-4-5-0-4" style="fill:#3e424b;fill-opacity:1;fill-rule:nonzero;stroke:#7b7b7b;stroke-width:0.94771594;stroke-opacity:1" d="m 1536.6642,8008.7749 115.4487,0 0,16.5302 -115.4487,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 1553.7254,8008.7749 62.1557,0 0,16.5302 -62.1557,0 z" style="fill:#474f51;fill-opacity:1;fill-rule:nonzero;stroke:#848484;stroke-width:0.86010271;stroke-opacity:1" id="path47645-2-1-4-7" sodipodi:nodetypes="ccccc"/>
+      <rect style="fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect4314" width="15.593775" height="15.593775" x="1537.745" y="8009.1689" ry="0"/>
+      <path inkscape:connector-curvature="0" id="path47647-5-9-5-7" d="m 1537.3686,8009.2565 c 0.7616,0 1.4037,0.8273 1.4533,1.8556 l 0.6205,12.5477 c 0.05,1.0281 -0.5285,1.8557 -1.29,1.8557 l -5.5518,0 c -0.7615,0 -1.4038,-0.8276 -1.4533,-1.8557 l -0.147,-3.0263 0.8491,-0.1333 0,-5.8098 -1.143,0.1544 -0.1796,-3.7333 c -0.05,-1.0281 0.5285,-1.8557 1.29,-1.8557 l 5.5518,0 z m -2.7269,6.075 c -0.2416,0.014 -0.427,0.5598 -0.4082,1.2151 0.019,0.655 0.2319,1.1613 0.4735,1.1487 0.2416,-0.014 0.4107,-0.538 0.3919,-1.193 -0.019,-0.6552 -0.2156,-1.1835 -0.4572,-1.1708 z" style="fill:url(#linearGradient33387-4-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21640682;stroke-miterlimit:4;stroke-dasharray:none"/>
+      <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 1535.2402,8010.9035 c -0.062,-0.846 -0.4414,-0.5646 -1.119,-0.079 l -1.3653,1.8238 0.3256,12.2874 c 0.3058,0.6698 0.6828,0.3005 1.1237,0.1333 l 1.577,-2.1767 c -0.3209,-0.5604 -0.4055,-0.2753 -0.9297,-0.054 l -0.6884,0.5188 -0.2953,-10.5374 z" inkscape:path-effect="#path-effect45449-51-8-3-9-0" id="path47649-7-02-5-4" d="m 1535.2402,8010.9035 -1.119,-0.079 -1.3653,1.8238 0.3256,12.2874 1.1237,0.1333 1.577,-2.1767 -0.9297,-0.054 -0.6884,0.5188 -0.2953,-10.5374 1.3714,-1.9162" style="fill:#808080;stroke:none"/>
+      <path sodipodi:nodetypes="ccccccccc" inkscape:connector-curvature="0" inkscape:original-d="m 1535.3094,8013.533 -1.0251,1.0264 0.2408,9.0864 1.257,-0.7507 0.038,1.4746 -1.6211,0.7015 -0.3584,-12.3035 1.4053,-1.8657 z" inkscape:path-effect="#path-effect45451-306-5-5-5-5" id="path47651-2-7-2-3" d="m 1535.3094,8013.533 -1.0251,1.0264 0.2408,9.0864 1.257,-0.7507 0.038,1.4746 -1.6211,0.7015 -0.3584,-12.3035 1.4053,-1.8657 0.064,2.631" style="fill:#4d4d4d;stroke:none"/>
+      <path id="path47653-8-8-8-1" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" d="m 1554.4013,8010.267 30.2538,0.049 0.1831,6.4038 -30.1838,-0.047 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path style="fill:#000000;stroke:none" d="m 1557.7193,8011.9384 7.3806,0 0,0.7427 -7.3806,0 z" id="path47655-6-3-2-3" inkscape:connector-curvature="0"/>
+      <path style="fill:#000000;stroke:none" d="m 1575.89,8011.8026 0,3.2964 3.1352,0 0,-2.8356 0,-0.2439 0,-0.2169 -1.437,0 0.7348,0.012 -0.016,0.105 0,3.064 -1.0287,0 -0.016,0.093 -0.6694,0 0,-0.093 0,-3.064 0.9797,0 0.016,-0.1161 z" id="path47657-2-7-7-6" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccc"/>
+      <path id="path47659-8-3-8-3" d="m 1566.4716,8011.9384 7.3806,0 0,0.7427 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path47661-6-53-9-0" d="m 1557.9283,8013.3311 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1566.6806,8013.3311 7.3806,0 0,0.4179 -7.3806,0 z" id="path47663-7-34-9-1"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1558.0851,8014.4454 7.3806,0 0,0.4179 -7.3806,0 z" id="path47665-4-4-8-9"/>
+      <path id="path47667-1-1-7-0" d="m 1566.8373,8014.4454 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path47669-0-9-2-4" d="m 1558.1373,8015.5133 7.3807,0 0,0.4178 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1566.8896,8015.5133 7.3806,0 0,0.4178 -7.3806,0 z" id="path47671-9-4-3-2"/>
+      <path id="path47673-8-36-7-9" d="m 1575.7725,8015.5133 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path47675-7-3-0-3" style="fill:#000000;stroke:none" d="m 1554.4013,8011.3348 0.9144,0 c 0,0 0.254,2.324 0.381,3.4862 0,0.042 0.3262,0.045 0.6383,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5125 -0.091,-1.2445 -0.061,-1.561 2.8773,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2962 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6728 0.2085,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0696,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 1584.8132,8010.2669 30.1103,-0.046 0.065,6.4995 -29.9797,0 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" id="path47689-0-2-5-1"/>
+      <path inkscape:connector-curvature="0" id="path47691-9-7-6-4" d="m 1588.1312,8011.9384 7.3806,0 0,0.7427 -7.3806,0 z" style="fill:#000000;stroke:none" sodipodi:nodetypes="ccccc"/>
+      <path id="path47693-7-1-2-8" d="m 1606.3019,8011.8026 0,3.2964 3.1351,0 0,-3.2964 -1.4369,0 0.7348,0.012 -0.016,0.105 0,3.0639 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0639 0.9798,0 0.016,-0.1162 -1.6983,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1596.8835,8011.9384 7.3806,0 0,0.7427 -7.3806,0 z" id="path47695-3-0-1-2" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1588.3402,8013.3311 7.3806,0 0,0.4179 -7.3806,0 z" id="path47697-2-50-8-0" sodipodi:nodetypes="ccccc"/>
+      <path id="path47699-4-8-9-5" d="m 1597.0924,8013.3311 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path id="path47701-8-0-5-5" d="m 1588.497,8014.4454 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1597.2492,8014.4454 7.3806,0 0,0.4179 -7.3806,0 z" id="path47703-2-3-2-9" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1588.5492,8015.5133 7.3806,0 0,0.4178 -7.3806,0 z" id="path47705-5-8-9-3" sodipodi:nodetypes="ccccc"/>
+      <path id="path47707-4-6-2-2" d="m 1597.3015,8015.5133 7.3806,0 0,0.4178 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1606.1843,8015.5133 7.3807,0 0,0.4178 -7.3807,0 z" id="path47709-9-7-6-8" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 1584.8132,8011.3348 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.011 0.01,-1.2255 -0.035,-2.3491 -0.019,-0.5125 -0.091,-1.2445 -0.061,-1.561 2.8773,-0.052 22.2533,-0.01 25.0548,0 0.017,0.2962 0.018,0.2278 0.01,0.325 -1.0214,0.011 -24.5329,-0.01 -24.519,0 0.1466,1.415 0.077,3.6728 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z" style="fill:#000000;stroke:none" id="path47711-6-3-6-7"/>
+      <path id="path47713-9-42-3-4" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1579.8231,8011.783 0,0.4761 2.1704,0 0.016,0.8008 0.5267,0 0,-0.8002 0,-0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 1579.8231,8015.1026 0,-0.4758 2.1704,0 0.016,-0.801 0.5266,0 0,0.8002 0,0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47715-3-1-9-8"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 1610.0588,8011.783 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8002 0,-0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47717-3-9-1-1"/>
+      <path id="path47719-2-2-2-4" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1610.0589,8015.1026 0,-0.4758 2.1703,0 0.016,-0.801 0.5267,0 0,0.8002 0,0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path inkscape:connector-curvature="0" d="m 1616.6664,8011.5909 32.5924,0 -0.1165,4.1673 -32.5924,0 z" style="fill:url(#linearGradient33354-7-6);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.51374948" id="path47721-7-9-0-3"/>
+      <path inkscape:connector-curvature="0" d="m 1646.844,8012.5236 0.4495,0 c 0.1014,0 0.1771,0.01 0.2271,0.019 0.067,0.017 0.1207,0.048 0.1608,0.093 0.04,0.044 0.065,0.099 0.076,0.163 0.011,0.064 0,0.1435 -0.019,0.2378 -0.02,0.083 -0.05,0.1542 -0.09,0.2141 -0.049,0.073 -0.1067,0.1325 -0.1743,0.1778 -0.051,0.034 -0.1154,0.061 -0.1927,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4628,0 z m 0.204,0.1702 -0.1644,0.6664 0.1836,0 c 0.069,0 0.1191,0 0.1511,-0.01 0.042,-0.01 0.078,-0.022 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.097 0.028,-0.045 0.051,-0.1065 0.07,-0.1843 0.019,-0.078 0.026,-0.1374 0.019,-0.1791 -0.01,-0.041 -0.022,-0.074 -0.046,-0.097 -0.024,-0.023 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1995,-0.01 z m -1.2773,0.836 -0.1872,-1.0062 0.2667,0 0.1246,0.7447 0.482,-0.7447 0.2609,0 -0.6844,1.0062 z m -1.2931,-1.0062 0.4495,0 c 0.1014,0 0.1771,0.01 0.2271,0.019 0.067,0.017 0.1207,0.048 0.1607,0.093 0.04,0.044 0.065,0.099 0.076,0.163 0.011,0.064 0,0.1435 -0.019,0.2378 -0.02,0.083 -0.051,0.1542 -0.09,0.2141 -0.048,0.073 -0.1066,0.1325 -0.1743,0.1778 -0.051,0.034 -0.1153,0.061 -0.1926,0.08 -0.058,0.014 -0.1321,0.021 -0.2229,0.021 l -0.4629,0 z m 0.2039,0.1702 -0.1643,0.6664 0.1836,0 c 0.069,0 0.119,0 0.1511,-0.01 0.042,-0.01 0.079,-0.022 0.1096,-0.042 0.031,-0.02 0.061,-0.052 0.088,-0.097 0.028,-0.045 0.051,-0.1065 0.07,-0.1843 0.019,-0.078 0.026,-0.1374 0.019,-0.1791 -0.01,-0.041 -0.022,-0.074 -0.046,-0.097 -0.024,-0.023 -0.058,-0.039 -0.1021,-0.047 -0.033,-0.01 -0.099,-0.01 -0.1996,-0.01 z" style="font-size:11.09256554px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold" id="path47725-9-2-0-5"/>
+      <path style="fill:#ffffff;stroke:none" d="m 1645.9959,8013.8394 c -1.116,0 -2.0207,0.1242 -2.0207,0.2784 0,0.1541 0.9047,0.2785 2.0207,0.2785 1.1161,0 2.0208,-0.1244 2.0208,-0.2785 0,-0.1542 -0.9047,-0.2784 -2.0208,-0.2784 z m 0,0.2013 c 0.3133,0 0.5673,0.035 0.5673,0.077 0,0.043 -0.254,0.077 -0.5673,0.077 -0.3132,0 -0.5672,-0.035 -0.5672,-0.077 0,-0.043 0.254,-0.077 0.5672,-0.077 z" id="path47727-0-2-9-5" inkscape:connector-curvature="0"/>
+      <text xml:space="preserve" style="font-size:0.66138339px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="1617.5879" y="8151.9688" id="text47729-5-5-4-2" sodipodi:linespacing="125%" transform="scale(1.0170762,0.9832105)"><tspan sodipodi:role="line" id="tspan47731-4-8-6-6" x="1617.5879" y="8151.9688">ROM</tspan></text>
+      <path inkscape:connector-curvature="0" d="m 1634.776,8012.7561 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1032,0 0.1032,0 0.05,0 0.075,0.019 0.075,0.057 0,0.044 -0.026,0.065 -0.078,0.065 z m 0.794,0.062 c -0.014,0.069 -0.051,0.1031 -0.1104,0.1031 -0.083,0 -0.1246,-0.05 -0.1246,-0.1513 0,-0.099 0.042,-0.1481 0.1246,-0.1481 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.017,-0.08 -0.069,-0.1204 -0.1567,-0.1204 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.1286 0.057,0.1928 0.1709,0.1928 0.097,0 0.153,-0.048 0.1673,-0.1446 0,0 -0.05,0 -0.05,0 z m -1.6876,-0.241 c -0.1235,0 -0.1852,0.064 -0.1852,0.1928 0,0.1285 0.062,0.1928 0.1852,0.1928 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1286 -0.062,-0.1928 -0.1851,-0.1928 z m -0.299,0.241 c -0.012,0.069 -0.047,0.1031 -0.1068,0.1031 -0.085,0 -0.1282,-0.05 -0.1282,-0.1513 0,-0.099 0.041,-0.1481 0.1246,-0.1481 0.059,0 0.095,0.025 0.1068,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.062,-0.1204 -0.1566,-0.1204 -0.1163,0 -0.1745,0.064 -0.1745,0.1927 0,0.1286 0.056,0.1928 0.1673,0.1928 0.097,0 0.1531,-0.048 0.1674,-0.1446 0,0 -0.05,0 -0.05,0 z m 2.371,-0.2307 c 0,0 -0.3061,0 -0.3061,0 0,0 0,0.045 0,0.045 0,0 0.1281,0 0.1281,0 0,0 0,0.3236 0,0.3236 0,0 0.05,0 0.05,0 0,0 0,-0.3236 0,-0.3236 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.8295,0 c 0,0 -0.057,0 -0.057,0 0,0 -0.1423,0.3684 -0.1423,0.3684 0,0 0.053,0 0.053,0 0,0 0.039,-0.1068 0.039,-0.1068 0,0 0.153,0 0.153,0 0,0 0.036,0.1068 0.036,0.1068 0,0 0.057,0 0.057,0 0,0 -0.1388,-0.3684 -0.1388,-0.3684 z m -0.331,0 c 0,0 -0.1674,0 -0.1674,0 0,0 0,0.3684 0,0.3684 0,0 0.05,0 0.05,0 0,0 0,-0.155 0,-0.155 0,0 0.1175,0 0.1175,0 0.076,0 0.1139,-0.037 0.1139,-0.1102 0,-0.069 -0.038,-0.1032 -0.1139,-0.1032 z m -0.2778,0 c 0,0 -0.071,0 -0.071,0 0,0 -0.1104,0.3098 -0.1104,0.3098 0,0 -0.1068,-0.3098 -0.1068,-0.3098 0,0 -0.075,0 -0.075,0 0,0 0,0.3684 0,0.3684 0,0 0.05,0 0.05,0 0,0 0,-0.3064 0,-0.3064 0,0 0.1068,0.3064 0.1068,0.3064 0,0 0.05,0 0.05,0 0,0 0.1104,-0.3099 0.1104,-0.3099 0,0 0,0.093 0,0.093 0,0 0,0.217 0,0.217 0,0 0.05,0 0.05,0 0,0 0,-0.3684 0,-0.3684 z m -1.4312,0.065 c 0,-0.028 -0.014,-0.041 -0.043,-0.041 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,0.014 -0.043,0.041 0,0 0,0.3889 0,0.3889 0,0.018 -0.01,0.028 -0.028,0.028 0,0 -0.356,0 -0.356,0 -0.074,0 -0.1341,0.023 -0.1817,0.071 -0.048,0.047 -0.071,0.1061 -0.071,0.1773 0,0 0,0.8569 0,0.8569 0,0.069 0.024,0.1274 0.073,0.1756 0.049,0.048 0.1086,0.072 0.1799,0.072 0,0 0.8152,0 0.8152,0 0.029,0 0.043,-0.015 0.043,-0.045 0,0 0,-1.7243 0,-1.7243 z m 2.9586,1.2011 c 0,-0.03 -0.014,-0.045 -0.043,-0.045 0,0 -0.356,0 -0.356,0 -0.031,0 -0.046,0.015 -0.046,0.045 0,0 0,0.1996 0,0.1996 0,0.057 -0.029,0.086 -0.086,0.086 -0.059,0 -0.089,-0.029 -0.089,-0.086 0,0 0,-0.6124 0,-0.6124 0,-0.057 0.03,-0.086 0.089,-0.086 0.057,0 0.086,0.029 0.086,0.086 0,0 0,0.1616 0,0.1616 0,0.028 0.015,0.041 0.046,0.041 0,0 0.356,0 0.356,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2856 0,-0.2856 0,-0.069 -0.025,-0.1274 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.5482,0 -0.5482,0 -0.071,0 -0.1319,0.024 -0.1817,0.072 -0.05,0.048 -0.075,0.1067 -0.075,0.1755 0,0 0,0.8535 0,0.8535 0,0.071 0.024,0.1309 0.073,0.1791 0.049,0.048 0.1098,0.072 0.1834,0.072 0,0 0.5483,0 0.5483,0 0.073,0 0.1346,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1079 0.073,-0.1791 0,0 0,-0.3167 0,-0.3167 z m -1.1785,-0.072 c 0,-0.069 -0.025,-0.1273 -0.075,-0.1755 -0.05,-0.048 -0.1104,-0.072 -0.1816,-0.072 0,0 -0.3311,0 -0.3311,0 -0.036,0 -0.053,-0.017 -0.053,-0.052 0,-0.037 0.018,-0.055 0.053,-0.055 0,0 0.4984,0 0.4984,0 0.028,0 0.043,-0.014 0.043,-0.041 0,0 0,-0.2753 0,-0.2753 0,-0.028 -0.014,-0.042 -0.043,-0.042 0,0 -0.7049,0 -0.7049,0 -0.071,0 -0.1317,0.025 -0.1816,0.072 -0.05,0.048 -0.075,0.1066 -0.075,0.1754 0,0 0,0.3647 0,0.3647 0,0.069 0.025,0.1275 0.075,0.1757 0.05,0.048 0.1103,0.072 0.1816,0.072 0,0 0.3311,0 0.3311,0 0.045,0 0.068,0.023 0.068,0.069 0,0.042 -0.023,0.062 -0.068,0.062 0,0 -0.5447,0 -0.5447,0 -0.029,0 -0.043,0.015 -0.043,0.045 0,0 0,0.272 0,0.272 0,0.03 0.014,0.045 0.043,0.045 0,0 0.7512,0 0.7512,0 0.073,0 0.1347,-0.024 0.1833,-0.072 0.049,-0.048 0.073,-0.1078 0.073,-0.1789 0,0 0,-0.3891 0,-0.3891 z m 1.0788,1.1531 c 0,0 -0.2279,0 -0.2279,0 0,0 0,-0.1239 0,-0.1239 0,0 0.2064,0 0.2064,0 0,0 0,-0.041 0,-0.041 0,0 -0.2064,0 -0.2064,0 0,0 0,-0.1134 0,-0.1134 0,0 0.2243,0 0.2243,0 0,0 0,-0.045 0,-0.045 0,0 -0.2742,0 -0.2742,0 0,0 0,0.3648 0,0.3648 0,0 0.2778,0 0.2778,0 0,0 0,-0.041 0,-0.041 z m -0.3703,-0.1515 c 0,0 -0.1673,0 -0.1673,0 0,0 0,0.042 0,0.042 0,0 0.1175,0 0.1175,0 0,0.08 -0.039,0.1204 -0.1175,0.1204 -0.083,0 -0.1246,-0.05 -0.1246,-0.1514 0,-0.099 0.042,-0.148 0.1246,-0.148 0.062,0 0.099,0.024 0.1103,0.076 0,0 0.05,0 0.05,0 -0.01,-0.08 -0.063,-0.1205 -0.1602,-0.1205 -0.1187,0 -0.178,0.064 -0.178,0.1927 0,0.064 0.017,0.1126 0.052,0.1446 0.034,0.032 0.075,0.048 0.1229,0.048 0.057,0 0.099,-0.02 0.1247,-0.059 0,0 0.014,0.048 0.014,0.048 0,0 0.032,0 0.032,0 0,0 0,-0.1927 0,-0.1927 z m -0.4984,-0.1721 c 0,0 -0.057,0 -0.057,0 0,0 -0.1459,0.3648 -0.1459,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.053,0 0.053,0 0,0 -0.1353,-0.3648 -0.1353,-0.3648 z m -0.2136,0.3579 c -0.012,0 -0.018,-0.017 -0.018,-0.038 0,0 0,-0.065 0,-0.065 0,-0.03 -0.018,-0.053 -0.046,-0.069 0.035,-0.018 0.053,-0.047 0.053,-0.086 0,-0.066 -0.042,-0.1001 -0.1247,-0.1001 0,0 -0.178,0 -0.178,0 0,0 0,0.3649 0,0.3649 0,0 0.053,0 0.053,0 0,0 0,-0.1549 0,-0.1549 0,0 0.1246,0 0.1246,0 0.043,0 0.065,0.022 0.068,0.065 0,0 0.01,0.089 0.01,0.089 0,0 0.064,-0.01 0.064,-0.01 z m -0.5519,-0.3682 c -0.1234,0 -0.1851,0.064 -0.1851,0.1927 0,0.055 0.017,0.101 0.05,0.1377 0.033,0.037 0.078,0.055 0.1353,0.055 0.1234,0 0.1851,-0.064 0.1851,-0.1928 0,-0.1285 -0.062,-0.1927 -0.1851,-0.1927 z m -0.1851,0.01 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1317,0 0.1317,0 0,0 0,0.32 0,0.32 0,0 0.05,0 0.05,0 0,0 0,-0.32 0,-0.32 0,0 0.1282,0 0.1282,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0.1652 c 0,0 -0.1068,-0.025 -0.1068,-0.025 -0.031,-0.01 -0.046,-0.022 -0.046,-0.045 0,-0.044 0.029,-0.065 0.085,-0.065 0.064,0 0.096,0.024 0.096,0.076 0,0 0.046,0 0.046,0 0,-0.078 -0.049,-0.117 -0.146,-0.117 -0.088,0 -0.1318,0.038 -0.1318,0.1135 0,0.046 0.027,0.074 0.082,0.086 0,0 0.075,0.017 0.075,0.017 0.055,0.012 0.082,0.033 0.082,0.065 0,0.041 -0.033,0.062 -0.1,0.062 -0.069,0 -0.1032,-0.029 -0.1032,-0.086 0,0 -0.046,0 -0.046,0 0,0.085 0.05,0.1275 0.1495,0.1275 0.1,0 0.1495,-0.037 0.1495,-0.1102 0,-0.053 -0.029,-0.086 -0.086,-0.1001 z m -0.5697,-0.1652 c 0,0 -0.057,0 -0.057,0 0,0 -0.1425,0.3648 -0.1425,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.1532,0 0.1532,0 0,0 0.035,0.1032 0.035,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1389,-0.3648 -0.1389,-0.3648 z m -0.1318,0 c 0,0 -0.3097,0 -0.3097,0 0,0 0,0.045 0,0.045 0,0 0.1318,0 0.1318,0 0,0 0,0.32 0,0.32 0,0 0.053,0 0.053,0 0,0 0,-0.32 0,-0.32 0,0 0.1246,0 0.1246,0 0,0 0,-0.045 0,-0.045 z m -0.4058,0 c 0,0 -0.061,0 -0.061,0 0,0 -0.1423,0.3648 -0.1423,0.3648 0,0 0.053,0 0.053,0 0,0 0.039,-0.1032 0.039,-0.1032 0,0 0.153,0 0.153,0 0,0 0.039,0.1032 0.039,0.1032 0,0 0.057,0 0.057,0 0,0 -0.1388,-0.3648 -0.1388,-0.3648 z m -0.3916,0 c 0,0 -0.1566,0 -0.1566,0 0,0 0,0.3648 0,0.3648 0,0 0.153,0 0.153,0 0.1069,0 0.1603,-0.062 0.1603,-0.1859 0,-0.1193 -0.052,-0.1789 -0.1567,-0.1789 z m 2.8125,-1.8068 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.1499,0.1169 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.088,0 0.1317,0.049 0.1317,0.148 0,0.101 -0.044,0.1514 -0.1317,0.1514 z m -0.9007,1.4215 c 0,0 -0.7548,0 -0.7548,0 -0.05,0 -0.091,-0.016 -0.1246,-0.048 -0.033,-0.032 -0.05,-0.072 -0.05,-0.1205 0,0 0,-0.8569 0,-0.8569 0,-0.048 0.017,-0.088 0.05,-0.1205 0.033,-0.032 0.075,-0.048 0.1246,-0.048 0,0 0.4202,0 0.4202,0 0.028,0 0.043,-0.015 0.043,-0.045 0,0 0,-0.389 0,-0.389 0,-0.018 0.01,-0.028 0.028,-0.028 0,0 0.2634,0 0.2634,0 0.017,0.016 0.025,0.024 0.025,0.028 0,0 0,1.6039 0,1.6039 0,0 -0.01,0.013 -0.025,0.024 z m 2.9318,-0.05 c -0.034,0.033 -0.077,0.05 -0.1263,0.05 0,0 -0.5483,0 -0.5483,0 -0.05,0 -0.093,-0.017 -0.1283,-0.05 -0.036,-0.033 -0.053,-0.074 -0.053,-0.1221 0,0 0,-0.8535 0,-0.8535 0,-0.048 0.018,-0.088 0.053,-0.1205 0.035,-0.032 0.078,-0.048 0.1283,-0.048 0,0 0.5483,0 0.5483,0 0.052,0 0.095,0.016 0.1281,0.047 0.033,0.031 0.05,0.072 0.05,0.1221 0,0 0,0.2271 0,0.2271 0,0.016 -0.01,0.024 -0.025,0.024 0,0 -0.2349,0 -0.2349,0 -0.017,0 -0.025,-0.01 -0.025,-0.024 0,0 0,-0.1032 0,-0.1032 0,-0.046 -0.016,-0.084 -0.048,-0.1153 -0.032,-0.031 -0.072,-0.046 -0.1193,-0.046 -0.047,0 -0.087,0.015 -0.1193,0.046 -0.032,0.031 -0.048,0.069 -0.048,0.1153 0,0 0,0.6126 0,0.6126 0,0.046 0.016,0.084 0.048,0.1153 0.032,0.031 0.072,0.046 0.1193,0.046 0.047,0 0.087,-0.015 0.1193,-0.046 0.032,-0.031 0.048,-0.07 0.048,-0.1153 0,0 0,-0.1445 0,-0.1445 0,-0.016 0.01,-0.024 0.025,-0.024 0,0 0.2349,0 0.2349,0 0.01,0 0.013,0.01 0.025,0.024 0,0 0,0.2615 0,0.2615 0,0.048 -0.017,0.089 -0.052,0.1222 z m -1.1785,0 c -0.034,0.033 -0.076,0.05 -0.1263,0.05 0,0 -0.6871,0 -0.6871,0 -0.019,0 -0.028,-0.01 -0.028,-0.024 0,0 0,-0.1548 0,-0.1548 0,-0.016 0.01,-0.024 0.028,-0.024 0,0 0.4806,0 0.4806,0 0.04,0 0.075,-0.014 0.1032,-0.041 0.028,-0.028 0.043,-0.061 0.043,-0.1001 0,-0.041 -0.014,-0.076 -0.041,-0.1032 -0.027,-0.028 -0.062,-0.041 -0.105,-0.041 0,0 -0.3311,0 -0.3311,0 -0.05,0 -0.092,-0.017 -0.1265,-0.05 -0.034,-0.033 -0.052,-0.074 -0.052,-0.1222 0,0 0,-0.3648 0,-0.3648 0,-0.048 0.017,-0.088 0.052,-0.1204 0.034,-0.032 0.077,-0.048 0.1265,-0.048 0,0 0.6408,0 0.6408,0 0.017,0 0.025,0.01 0.025,0.024 0,0 0,0.1514 0,0.1514 0,0.018 -0.01,0.028 -0.025,0.028 0,0 -0.4344,0 -0.4344,0 -0.088,0 -0.1317,0.044 -0.1317,0.1308 0,0.034 0.013,0.064 0.039,0.09 0.026,0.025 0.057,0.038 0.093,0.038 0,0 0.3312,0 0.3312,0 0.047,0 0.089,0.017 0.1246,0.052 0.035,0.034 0.053,0.075 0.053,0.1204 0,0 0,0.389 0,0.389 0,0.048 -0.017,0.089 -0.052,0.1223 z m -1.0805,0.1291 c 0,0 -0.388,0 -0.388,0 -0.028,0 -0.043,-0.015 -0.043,-0.045 0,0 0,-1.2666 0,-1.2666 0,-0.028 0.014,-0.041 0.043,-0.041 0,0 0.388,0 0.388,0 0.028,0 0.043,0.014 0.043,0.041 0,0 0,1.2666 0,1.2666 0,0.03 -0.014,0.045 -0.043,0.045 z m 1.0645,0.3545 c 0,0 -0.121,0 -0.121,0 0,0 0,-0.1239 0,-0.1239 0,0 0.1282,0 0.1282,0 0.045,0 0.068,0.021 0.068,0.062 0,0.041 -0.025,0.062 -0.075,0.062 z m 0.2635,0.048 c 0,0 0.06,-0.1618 0.06,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -1.926,0 c 0,0 0.064,-0.1618 0.064,-0.1618 0,0 0.053,0.1618 0.053,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.5377,0 c 0,0 0.061,-0.1618 0.061,-0.1618 0,0 0.057,0.1618 0.057,0.1618 0,0 -0.1175,0 -0.1175,0 z m -0.3026,0.1102 c 0,0 -0.1,0 -0.1,0 0,0 0,-0.2823 0,-0.2823 0,0 0.092,0 0.092,0 0.078,0 0.1175,0.047 0.1175,0.1411 0,0.094 -0.037,0.1412 -0.1104,0.1412 z m 2.0934,0.01 c -0.088,0 -0.1317,-0.05 -0.1317,-0.1514 0,-0.099 0.044,-0.148 0.1317,-0.148 0.09,0 0.1353,0.049 0.1353,0.148 0,0.101 -0.045,0.1514 -0.1353,0.1514 z m -0.6907,-1.7724 c 0,-0.016 -0.01,-0.025 -0.025,-0.025 0,0 -0.2634,0 -0.2634,0 -0.017,0 -0.025,0.01 -0.025,0.025 0,0 0,1.1461 0,1.1461 0,0.016 0.01,0.024 0.025,0.024 0,0 0.2634,0 0.2634,0 0.017,0 0.025,-0.01 0.025,-0.024 0,0 0,-1.1461 0,-1.1461 z m -0.9256,0.2616 c 0,-0.043 -0.016,-0.081 -0.048,-0.1119 -0.032,-0.031 -0.071,-0.047 -0.1157,-0.047 -0.045,0 -0.083,0.016 -0.114,0.047 -0.031,0.031 -0.046,0.068 -0.046,0.1119 0,0 0,0.6297 0,0.6297 0,0.046 0.015,0.084 0.044,0.1137 0.03,0.03 0.068,0.045 0.1157,0.045 0.045,0 0.084,-0.015 0.1158,-0.046 0.032,-0.031 0.048,-0.068 0.048,-0.1118 0,0 0,-0.6297 0,-0.6297 z m -0.1638,0.7089 c -0.055,0 -0.082,-0.026 -0.082,-0.079 0,0 0,-0.6298 0,-0.6298 0,-0.053 0.027,-0.079 0.082,-0.079 0.052,0 0.078,0.026 0.078,0.079 0,0 0,0.6298 0,0.6298 0,0.053 -0.026,0.079 -0.078,0.079 z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path47737-4-8-1-8"/>
+      <path id="path47739-5-0-4-9" style="fill:#00b7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1646.9797,8018.1653 1.9595,0 0,2.4741 -1.9595,0 z" inkscape:connector-curvature="0"/>
+      <path d="m 1644.563,8018.1652 1.9595,0 0,2.4742 -1.9595,0 z" style="fill:#e51d00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47741-8-0-6-2" inkscape:connector-curvature="0"/>
+      <path id="path47743-2-9-6-9" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.21079655;stroke-miterlimit:4" d="m 1642.8297,8018.1197 1.246,0 0,4.3671 -1.246,0 z" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" d="m 1643.5882,8018.1197 0.4875,0 0,4.3671 -0.4875,0 z" style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.1318544;stroke-miterlimit:4" id="path47745-7-6-5-5"/>
+      <rect transform="matrix(1,0,-0.01802634,0.99983751,0,0)" y="8019.6079" x="1761.2012" height="4.8445239" width="24.429632" id="rect47747-2-1-6-9" style="fill:url(#linearGradient33342-1-0);fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47956967"/>
+      <path inkscape:connector-curvature="0" id="path47749-6-6-1-4" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 1617.9614,8018.9882 1.5809,0 c 0.2145,0 0.4,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1436,-0.5224 0.3581,-0.5224 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 1621.2363,8018.9882 1.581,0 c 0.2144,0 0.3999,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1437,0.5221 -0.3581,0.5221 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1437,-0.5224 0.3581,-0.5224 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path47751-3-8-3-5" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path47753-8-9-5-0" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 1624.5445,8018.9882 1.5809,0 c 0.2145,0 0.4,0.2331 0.416,0.5224 l 0.022,0.4009 c 0.016,0.2893 -0.1436,0.5221 -0.358,0.5221 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.5221 l -0.022,-0.4009 c -0.016,-0.2893 0.1436,-0.5224 0.3581,-0.5224 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 1554.7258,8017.7084 30.1103,-0.046 0.1831,6.4518 -29.9925,2e-4 z" style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.44053429" id="path47755-5-6-2-5"/>
+      <path inkscape:connector-curvature="0" id="path47757-5-8-6-8" d="m 1558.0438,8019.3798 7.3806,0 0,0.7426 -7.3806,0 z" style="fill:#000000;stroke:none"/>
+      <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path47759-1-8-9-8" d="m 1576.2145,8019.2439 0,3.2965 3.1351,0 0,-2.8356 0,-0.2438 0,-0.2171 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.0641 -1.0288,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.0641 0.9798,0 0.016,-0.1161 z" style="fill:#000000;stroke:none"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1566.796,8019.3798 7.3806,0 0,0.7426 -7.3806,0 z" id="path47761-4-4-4-0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1558.2528,8020.7725 7.3806,0 0,0.4179 -7.3806,0 z" id="path47763-5-0-6-1"/>
+      <path id="path47765-1-4-7-3" d="m 1567.005,8020.7725 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path47767-8-3-3-2" d="m 1558.4095,8021.8868 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1567.1618,8021.8868 7.3806,0 0,0.4179 -7.3806,0 z" id="path47769-6-4-0-2"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1558.4618,8022.9546 7.3806,0 0,0.4179 -7.3806,0 z" id="path47771-0-3-5-2"/>
+      <path id="path47773-0-7-8-7" d="m 1567.214,8022.9546 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1576.0969,8022.9546 7.3807,0 0,0.4179 -7.3807,0 z" id="path47775-4-4-9-0"/>
+      <path sodipodi:nodetypes="ccsssccccccc" inkscape:connector-curvature="0" d="m 1554.7258,8018.7762 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3492 -0.019,-0.5122 -0.091,-1.2443 -0.061,-1.5609 2.8774,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2963 0.018,0.2276 0.01,0.325 -1.0213,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2086,4.7541 -0.8204,-0.014 -1.2738,0.045 -2.0697,0.045 z" style="fill:#000000;stroke:none" id="path47777-7-9-5-3"/>
+      <path id="path47791-7-5-2-1" style="fill:#808080;stroke:#000000;stroke-width:0.44053429" d="m 1584.8132,8017.7083 30.1103,-0.046 0.065,6.4996 -29.9797,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+      <path sodipodi:nodetypes="ccccc" style="fill:#000000;stroke:none" d="m 1588.1312,8019.3798 7.3806,0 0,0.7426 -7.3806,0 z" id="path47793-6-9-1-3" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1606.3019,8019.2439 0,3.2965 3.1351,0 0,-3.2965 -1.4369,0 0.7348,0.012 -0.016,0.1049 0,3.064 -1.0287,0 -0.016,0.093 -0.6695,0 0,-0.093 0,-3.064 0.9798,0 0.016,-0.1162 -1.6983,0 z" id="path47795-4-7-8-3"/>
+      <path sodipodi:nodetypes="ccccc" id="path47797-8-1-0-7" d="m 1596.8835,8019.3798 7.3806,0 0,0.7426 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path47799-9-7-1-0" d="m 1588.3402,8020.7725 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1597.0924,8020.7725 7.3807,0 0,0.4179 -7.3807,0 z" id="path47801-7-19-7-9"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1588.497,8021.8868 7.3806,0 0,0.4179 -7.3806,0 z" id="path47803-0-1-8-5"/>
+      <path sodipodi:nodetypes="ccccc" id="path47805-5-0-0-5" d="m 1597.2492,8021.8868 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" id="path47807-4-76-0-8" d="m 1588.5492,8022.9546 7.3806,0 0,0.4179 -7.3806,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="fill:#000000;stroke:none" d="m 1597.3015,8022.9546 7.3806,0 0,0.4179 -7.3806,0 z" id="path47809-2-2-3-3"/>
+      <path sodipodi:nodetypes="ccccc" id="path47811-5-1-0-7" d="m 1606.1843,8022.9546 7.3807,0 0,0.4179 -7.3807,0 z" style="fill:#000000;stroke:none" inkscape:connector-curvature="0"/>
+      <path id="path47813-2-9-4-8" style="fill:#000000;stroke:none" d="m 1584.8132,8018.7762 0.9144,0 c 0,0 0.254,2.324 0.3809,3.4862 0,0.042 0.3263,0.045 0.6384,0.081 0.08,0.01 0.01,-1.2254 -0.035,-2.3492 -0.019,-0.5122 -0.091,-1.2443 -0.061,-1.5609 2.8773,-0.052 22.2533,-0.011 25.0548,0 0.017,0.2963 0.018,0.2276 0.01,0.325 -1.0214,0.011 -24.5329,-0.011 -24.519,0 0.1466,1.4148 0.077,3.6729 0.2085,4.7541 -0.8204,-0.014 -1.6657,0.045 -2.4615,0.045 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsssccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 1580.1475,8019.2244 0,0.4761 2.1705,0 0.016,0.8008 0.5266,0 0,-0.8001 0,-0.4757 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47815-1-5-0-3"/>
+      <path id="path47817-5-4-6-7" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1580.1476,8022.5441 0,-0.476 2.1703,0 0.016,-0.8008 0.5267,0 0,0.8001 0,0.4758 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path id="path47819-6-5-8-9" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1610.0588,8019.2244 0,0.4761 2.1705,0 0.016,0.8008 0.5267,0 0,-0.8001 0,-0.4757 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
+      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" d="m 1610.0589,8022.5441 0,-0.476 2.1703,0 0.016,-0.8008 0.5267,0 0,0.8001 0,0.4758 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47821-0-4-6-3"/>
+      <path inkscape:connector-curvature="0" d="m 1646.9797,8021.5681 1.9595,0 0,1.082 -1.9595,0 z" style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path47823-4-4-9-9"/>
+      <path inkscape:connector-curvature="0" id="path47825-1-48-2-1" style="fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1644.563,8021.568 1.9595,0 0,1.0821 -1.9595,0 z"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 1617.9614,8021.2209 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path47827-7-40-7-8" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path47829-2-3-5-2" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 1621.2363,8021.2209 1.581,0 c 0.2144,0 0.3999,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1437,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1437,-0.5221 0.3581,-0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 1624.5445,8021.2209 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.358,0.522 l -1.581,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path47831-2-2-7-8" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path47833-2-4-6-0" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 1627.9078,8021.2209 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.5809,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.3581,-0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path sodipodi:nodetypes="ssccssccs" d="m 1631.1828,8021.2209 1.5809,0 c 0.2145,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.5809,0 c -0.2144,0 -0.4,-0.2328 -0.416,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.358,-0.5221 z" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" id="path47835-9-0-2-1" inkscape:connector-curvature="0"/>
+      <path inkscape:connector-curvature="0" id="path47837-9-2-3-8" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:0.46653545" d="m 1634.4909,8021.2209 1.581,0 c 0.2144,0 0.4,0.2329 0.416,0.5221 l 0.022,0.4011 c 0.016,0.2892 -0.1436,0.522 -0.3581,0.522 l -1.581,0 c -0.2144,0 -0.3999,-0.2328 -0.4159,-0.522 l -0.022,-0.4011 c -0.016,-0.2892 0.1436,-0.5221 0.358,-0.5221 z" sodipodi:nodetypes="ssccssccs"/>
+      <path style="fill:url(#linearGradient33300-6);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.32461023;stroke-miterlimit:4;stroke-dasharray:none" d="m 1651.4087,8009.0126 c -0.7615,0 -1.4037,0.8277 -1.4533,1.8556 l -0.6205,12.5477 c -0.05,1.0282 0.5285,1.8557 1.29,1.8557 l 5.5518,0 c 0.7615,0 1.4037,-0.8275 1.4533,-1.8557 l 0.1469,-3.0263 -0.8491,-0.1331 0,-5.8099 1.143,0.1546 0.1797,-3.7334 c 0.05,-1.0281 -0.5285,-1.8556 -1.29,-1.8556 l -5.5518,0 z m 2.7269,6.075 c 0.2416,0.014 0.427,0.56 0.4082,1.2151 -0.019,0.6552 -0.2319,1.1616 -0.4735,1.1488 -0.2416,-0.014 -0.4107,-0.5377 -0.3919,-1.1929 0.019,-0.655 0.2156,-1.1835 0.4572,-1.171 z" id="path47639-2-7-6-4" inkscape:connector-curvature="0"/>
+      <path style="fill:#808080;fill-opacity:1;stroke:none" d="m 1653.537,8010.6598 1.1191,-0.079 1.3653,1.824 -0.3256,12.2872 -1.1238,0.1333 -1.5769,-2.1767 0.9296,-0.054 0.6884,0.5189 0.2954,-10.5373 -1.3715,-1.9164" id="path47641-0-8-4-8" inkscape:path-effect="#path-effect45434-5-3-2-9-6" inkscape:original-d="m 1653.537,8010.6598 c 0.062,-0.8459 0.4414,-0.5645 1.1191,-0.079 l 1.3653,1.824 -0.3256,12.2872 c -0.3058,0.6698 -0.6828,0.3004 -1.1238,0.1333 l -1.5769,-2.1767 c 0.3209,-0.5608 0.4055,-0.2756 0.9296,-0.054 l 0.6884,0.5189 0.2954,-10.5373 z" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc"/>
+      <path style="fill:#4d4d4d;fill-opacity:1;stroke:none" d="m 1653.4679,8013.2892 1.0251,1.0264 -0.2408,9.0862 -1.257,-0.7506 -0.038,1.4746 1.6211,0.7015 0.3584,-12.3034 -1.4053,-1.8656 -0.063,2.6309" id="path47643-7-6-2-6" inkscape:path-effect="#path-effect45430-8-1-9-6-8" inkscape:original-d="m 1653.4679,8013.2892 1.0251,1.0264 -0.2408,9.0862 -1.257,-0.7506 -0.038,1.4746 1.6211,0.7015 0.3584,-12.3034 -1.4053,-1.8656 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc"/>
+      <path style="fill:none;stroke:#ffffff;stroke-width:1.10487461px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1540.4565,8011.3905 10.7304,0 -9.5579,11.1507 10.766,0" id="path4316" inkscape:path-effect="#path-effect4332-2-9" inkscape:original-d="m 1540.4565,8011.3905 10.7304,0 -9.5579,11.1507 c 0,0 11.6187,0 10.766,0" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
     </g>
   </g>
 </svg>
diff --git a/misc/images/svg/equipment_rack/Rack_42.svg b/misc/images/svg/equipment_rack/Rack_42.svg
index bee10e53e54..b08e8184e69 100644
--- a/misc/images/svg/equipment_rack/Rack_42.svg
+++ b/misc/images/svg/equipment_rack/Rack_42.svg
@@ -1,3326 +1,709 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="139.97456"
-   height="454.88248"
-   id="svg138308"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 32">
-  <defs
-     id="defs138310">
-    <filter
-       inkscape:collect="always"
-       id="filter66343"
-       x="-0.081202835"
-       width="1.1624057"
-       y="-0.28421265"
-       height="1.5684253"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.66988921"
-         id="feGaussianBlur66345" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="139.97456" height="454.88248" id="svg138308" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 32">
+  <defs id="defs138310">
+    <filter inkscape:collect="always" id="filter66343" x="-0.081202835" width="1.1624057" y="-0.28421265" height="1.5684253" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.66988921" id="feGaussianBlur66345"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter66323"
-       x="-0.012292516"
-       width="1.024585"
-       y="-0.17442797"
-       height="1.3488559"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.2522766"
-         id="feGaussianBlur66325" />
+    <filter inkscape:collect="always" id="filter66323" x="-0.012292516" width="1.024585" y="-0.17442797" height="1.3488559" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.2522766" id="feGaussianBlur66325"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66225"
-       id="linearGradient143011"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1135.7692,-682.85102)"
-       x1="513.6272"
-       y1="8109.6055"
-       x2="514.33374"
-       y2="8169.9551" />
-    <linearGradient
-       id="linearGradient66225">
-      <stop
-         id="stop66227"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.36715987"
-         id="stop66229" />
-      <stop
-         id="stop66231"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66241"
-       id="linearGradient143013"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0000924,0,0,0.99425392,1135.9347,-636.45507)"
-       x1="300.41592"
-       y1="7825.5479"
-       x2="390.40842"
-       y2="7829.3926" />
-    <linearGradient
-       id="linearGradient66241">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop66243" />
-      <stop
-         id="stop66245"
-         offset="0.47634247"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop66247" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66225"
-       id="linearGradient143015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-110,0)"
-       x1="579.40479"
-       y1="7867.4097"
-       x2="720.3927"
-       y2="7858.3389" />
-    <linearGradient
-       id="linearGradient137434">
-      <stop
-         id="stop137436"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.36715987"
-         id="stop137438" />
-      <stop
-         id="stop137440"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66273"
-       id="linearGradient143017"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1135.7692,-717.08144)"
-       x1="474.88556"
-       y1="7726.3086"
-       x2="476.6871"
-       y2="7758.7476" />
-    <linearGradient
-       id="linearGradient66273">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop66275" />
-      <stop
-         id="stop66277"
-         offset="0.45602524"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop66279" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143019"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1135.7692,-717.08144)"
-       x1="409.33176"
-       y1="7726.3315"
-       x2="476.6871"
-       y2="7758.7476" />
-    <linearGradient
-       id="linearGradient66349">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop66351" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop66353" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-357.88577)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137452">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137454" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137456" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141936"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143023"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-337.46971)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137460">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137462" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137464" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141931"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143025"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-346.74423)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137468">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137470" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137472" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141922"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-328.15092)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137476">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137478" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137480" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141917"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-397.2195)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137484">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137486" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137488" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141908"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-376.86594)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137492">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137494" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137496" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141903"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-386.14058)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137500">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137502" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137504" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141894"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-367.54727)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137508">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137510" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137512" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141889"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143037"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-436.67825)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137516">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137518" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137520" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141880"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143039"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-416.26231)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137524">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137526" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137528" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141875"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143041"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-425.53683)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137532">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137534" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137536" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141866"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-406.94365)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137540">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137542" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137544" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141861"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143045"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-476.1371)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137548">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137550" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137552" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141852"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143047"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-455.65867)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137556">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137558" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137560" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141847"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-464.93331)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137564">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137566" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137568" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141838"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143051"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-446.33988)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137572">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137574" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137576" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141833"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143053"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-515.47093)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137580">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137582" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137584" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141824"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143055"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-495.05499)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137588">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137590" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137592" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141819"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143057"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-504.32964)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137596">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137598" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137600" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141206"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-485.73621)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137604">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137606" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137608" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141201"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143061"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-554.80491)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137612">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137614" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137616" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141810"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143063"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-534.45123)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137620">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137622" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137624" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141805"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-543.72587)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137628">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137630" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137632" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141796"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-525.13268)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137636">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137638" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137640" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141791"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143069"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-594.26378)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137644">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137646" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137648" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141064"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143071"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-573.8476)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137652">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137654" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137656" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141059"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143073"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-583.12224)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137660">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137662" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137664" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141092"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-564.52881)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137668">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137670" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137672" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141087"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-633.47251)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137676">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137678" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137680" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141008"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-613.24408)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137684">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137686" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137688" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141003"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-622.51847)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137692">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137694" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137696" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141036"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143083"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-603.92529)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137700">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137702" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137704" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141031"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-653.29573)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137708">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137710" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137712" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140795"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143087"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-642.21669)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137716">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137718" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137720" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140809"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143089"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-692.75456)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137724">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137726" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137728" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141120"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143091"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-672.33838)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137732">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137734" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137736" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141115"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143093"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-681.61304)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137740">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137742" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137744" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141782"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143095"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-663.01961)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137748">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137750" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137752" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141777"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-731.96328)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137756">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137758" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137760" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141768"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-711.73485)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137764">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137766" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137768" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141763"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143101"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-721.00927)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137772">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137774" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137776" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141754"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-702.41609)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137780">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137782" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137784" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141749"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient80069"
-       id="linearGradient143105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0027998,808.355,6382.2297)"
-       x1="618.53314"
-       y1="622.74634"
-       x2="691.36908"
-       y2="1092.4669" />
-    <linearGradient
-       id="linearGradient80069">
-      <stop
-         id="stop80071"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.26005435"
-         id="stop80073" />
-      <stop
-         id="stop80075"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient80069"
-       id="linearGradient143107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0027998,932.62072,6382.4301)"
-       x1="618.53314"
-       y1="622.74634"
-       x2="691.36908"
-       y2="1092.4669" />
-    <linearGradient
-       id="linearGradient137793">
-      <stop
-         id="stop137795"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.26005435"
-         id="stop137797" />
-      <stop
-         id="stop137799"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter46858-5-0"
-       x="-0.017784396"
-       width="1.0355688"
-       y="-0.21916859"
-       height="1.4383372">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.1502059"
-         id="feGaussianBlur46860-75-0" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66225" id="linearGradient143011" gradientUnits="userSpaceOnUse" gradientTransform="translate(1135.7692,-682.85102)" x1="513.6272" y1="8109.6055" x2="514.33374" y2="8169.9551"/>
+    <linearGradient id="linearGradient66225">
+      <stop id="stop66227" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.36715987" id="stop66229"/>
+      <stop id="stop66231" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66241" id="linearGradient143013" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0000924,0,0,0.99425392,1135.9347,-636.45507)" x1="300.41592" y1="7825.5479" x2="390.40842" y2="7829.3926"/>
+    <linearGradient id="linearGradient66241">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop66243"/>
+      <stop id="stop66245" offset="0.47634247" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop66247"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66225" id="linearGradient143015" gradientUnits="userSpaceOnUse" gradientTransform="translate(-110,0)" x1="579.40479" y1="7867.4097" x2="720.3927" y2="7858.3389"/>
+    <linearGradient id="linearGradient137434">
+      <stop id="stop137436" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.36715987" id="stop137438"/>
+      <stop id="stop137440" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66273" id="linearGradient143017" gradientUnits="userSpaceOnUse" gradientTransform="translate(1135.7692,-717.08144)" x1="474.88556" y1="7726.3086" x2="476.6871" y2="7758.7476"/>
+    <linearGradient id="linearGradient66273">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop66275"/>
+      <stop id="stop66277" offset="0.45602524" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop66279"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143019" gradientUnits="userSpaceOnUse" gradientTransform="translate(1135.7692,-717.08144)" x1="409.33176" y1="7726.3315" x2="476.6871" y2="7758.7476"/>
+    <linearGradient id="linearGradient66349">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop66351"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop66353"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143021" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-357.88577)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137452">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137454"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137456"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141936" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143023" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-337.46971)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137460">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137462"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137464"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141931" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143025" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-346.74423)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137468">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137470"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137472"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141922" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143027" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-328.15092)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137476">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137478"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137480"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141917" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143029" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-397.2195)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137484">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137486"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137488"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141908" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143031" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-376.86594)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137492">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137494"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137496"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141903" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-386.14058)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137500">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137502"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137504"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141894" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143035" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-367.54727)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137508">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137510"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137512"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141889" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143037" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-436.67825)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137516">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137518"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137520"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141880" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143039" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-416.26231)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137524">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137526"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137528"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141875" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-425.53683)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137532">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137534"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137536"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141866" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-406.94365)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137540">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137542"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137544"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141861" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143045" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-476.1371)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137548">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137550"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137552"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141852" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143047" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-455.65867)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137556">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137558"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137560"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141847" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143049" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-464.93331)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137564">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137566"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137568"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141838" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143051" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-446.33988)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137572">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137574"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137576"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141833" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143053" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-515.47093)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137580">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137582"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137584"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141824" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143055" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-495.05499)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137588">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137590"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137592"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141819" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143057" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-504.32964)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137596">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137598"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137600"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141206" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143059" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-485.73621)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137604">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137606"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137608"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141201" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143061" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-554.80491)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137612">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137614"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137616"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141810" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143063" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-534.45123)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137620">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137622"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137624"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141805" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143065" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-543.72587)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137628">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137630"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137632"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141796" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143067" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-525.13268)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137636">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137638"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137640"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141791" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143069" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-594.26378)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137644">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137646"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137648"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141064" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143071" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-573.8476)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137652">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137654"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137656"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141059" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143073" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-583.12224)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137660">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137662"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137664"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141092" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143075" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-564.52881)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137668">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137670"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137672"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141087" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143077" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-633.47251)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137676">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137678"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137680"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141008" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143079" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-613.24408)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137684">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137686"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137688"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141003" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143081" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-622.51847)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137692">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137694"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137696"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141036" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143083" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-603.92529)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137700">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137702"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137704"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141031" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143085" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-653.29573)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137708">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137710"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137712"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140795" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143087" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-642.21669)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137716">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137718"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137720"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140809" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143089" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-692.75456)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137724">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137726"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137728"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141120" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143091" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-672.33838)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137732">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137734"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137736"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141115" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143093" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-681.61304)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137740">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137742"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137744"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141782" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143095" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-663.01961)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137748">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137750"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137752"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141777" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143097" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-731.96328)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137756">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137758"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137760"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141768" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143099" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-711.73485)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137764">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137766"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137768"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141763" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143101" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-721.00927)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137772">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137774"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137776"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141754" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143103" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-702.41609)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137780">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137782"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137784"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141749" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient80069" id="linearGradient143105" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,1.0027998,808.355,6382.2297)" x1="618.53314" y1="622.74634" x2="691.36908" y2="1092.4669"/>
+    <linearGradient id="linearGradient80069">
+      <stop id="stop80071" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.26005435" id="stop80073"/>
+      <stop id="stop80075" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient80069" id="linearGradient143107" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,1.0027998,932.62072,6382.4301)" x1="618.53314" y1="622.74634" x2="691.36908" y2="1092.4669"/>
+    <linearGradient id="linearGradient137793">
+      <stop id="stop137795" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.26005435" id="stop137797"/>
+      <stop id="stop137799" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter46858-5-0" x="-0.017784396" width="1.0355688" y="-0.21916859" height="1.4383372">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.1502059" id="feGaussianBlur46860-75-0"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter138305"
-       x="-0.22026432"
-       width="1.4405286"
-       y="-0.030036043"
-       height="1.0600721"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2312775"
-         id="feGaussianBlur138307" />
+    <filter inkscape:collect="always" id="filter138305" x="-0.22026432" width="1.4405286" y="-0.030036043" height="1.0600721" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="5.2312775" id="feGaussianBlur138307"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-357.88577)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137806">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137808" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137810" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137812"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-337.46971)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137815">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137817" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137819" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137821"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143113"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-346.74423)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137824">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137826" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137828" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect137830"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143115"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-328.15092)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137833">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137835" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137837" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137839"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143117"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-397.2195)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137842">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137844" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137846" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137848"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143119"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-376.86594)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137851">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137853" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137855" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137857"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143121"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-386.14058)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137860">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137862" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137864" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect137866"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143123"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-367.54727)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137869">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137871" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137873" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137875"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143125"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-436.67825)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137878">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137880" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137882" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-416.26231)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137887">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137889" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137891" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137893"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143129"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-425.53683)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137896">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137898" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137900" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect137902"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143131"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-406.94365)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137905">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137907" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137909" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137911"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143133"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-476.1371)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137914">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137916" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137918" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137920"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143135"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-455.65867)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137923">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137925" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137927" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137929"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143137"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-464.93331)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137932">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137934" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137936" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect137938"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143139"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-446.33988)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137941">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137943" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137945" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137947"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143141"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-515.47093)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137950">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137952" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137954" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137956"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143143"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-495.05499)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137959">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137961" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137963" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137965"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143145"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-504.32964)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137968">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137970" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137972" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect137974"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143147"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-485.73621)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137977">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137979" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137981" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137983"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143149"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-554.80491)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137986">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137988" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137990" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect137992"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143151"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-534.45123)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient137995">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop137997" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop137999" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138001"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143153"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-543.72587)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138004">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138006" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138008" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect138010"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143155"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-525.13268)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138013">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138015" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138017" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138019"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143157"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-594.26378)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138022">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138024" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138026" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138028"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-573.8476)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138031">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138033" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138035" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138037"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143161"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-583.12224)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138040">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138042" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138044" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect138046"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-564.52881)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138049">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138051" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138053" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138055"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143165"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-633.47251)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138058">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138060" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138062" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138064"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143167"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-613.24408)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138067">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138069" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138071" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138073"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-622.51847)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138076">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138078" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138080" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect138082"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143171"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-603.92529)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138085">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138087" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138089" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138091"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143173"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-653.29573)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138094">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138096" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138098" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138100"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-642.21669)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138103">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138105" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138107" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect138109"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143177"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-692.75456)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138112">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138114" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138116" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138118"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143179"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-672.33838)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138121">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138123" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138125" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138127"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143181"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-681.61304)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138130">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138132" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138134" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect138136"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143183"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-663.01961)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138139">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138141" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138143" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138145"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143185"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-731.96328)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138148">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138150" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138152" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138154"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-711.73485)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138157">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138159" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138161" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138163"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-721.00927)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138166">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138168" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138170" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect138172"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349"
-       id="linearGradient143191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-702.41609)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient138175">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop138177" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop138179" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect138181"
-       is_visible="true" />
-    <filter
-       inkscape:collect="always"
-       id="filter142702"
-       x="-0.40059263"
-       width="1.8011853"
-       y="-0.054626267"
-       height="1.1092525"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="9.5140751"
-         id="feGaussianBlur142704" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143109" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-357.88577)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137806">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137808"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137810"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137812" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143111" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-337.46971)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137815">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137817"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137819"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137821" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143113" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-346.74423)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137824">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137826"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137828"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect137830" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143115" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-328.15092)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137833">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137835"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137837"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137839" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143117" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-397.2195)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137842">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137844"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137846"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137848" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143119" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-376.86594)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137851">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137853"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137855"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137857" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143121" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-386.14058)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137860">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137862"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137864"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect137866" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143123" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-367.54727)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137869">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137871"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137873"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137875" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143125" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-436.67825)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137878">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137880"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137882"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137884" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143127" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-416.26231)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137887">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137889"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137891"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137893" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143129" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-425.53683)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137896">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137898"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137900"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect137902" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143131" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-406.94365)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137905">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137907"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137909"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137911" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143133" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-476.1371)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137914">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137916"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137918"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137920" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143135" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-455.65867)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137923">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137925"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137927"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137929" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143137" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-464.93331)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137932">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137934"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137936"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect137938" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143139" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-446.33988)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137941">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137943"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137945"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137947" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143141" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-515.47093)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137950">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137952"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137954"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137956" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143143" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-495.05499)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137959">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137961"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137963"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137965" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143145" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-504.32964)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137968">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137970"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137972"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect137974" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143147" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-485.73621)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137977">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137979"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137981"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137983" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143149" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-554.80491)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137986">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137988"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137990"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect137992" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143151" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-534.45123)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient137995">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop137997"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop137999"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138001" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143153" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-543.72587)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138004">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138006"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138008"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect138010" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143155" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-525.13268)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138013">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138015"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138017"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138019" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143157" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-594.26378)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138022">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138024"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138026"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138028" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143159" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-573.8476)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138031">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138033"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138035"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138037" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143161" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-583.12224)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138040">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138042"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138044"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect138046" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143163" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-564.52881)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138049">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138051"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138053"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138055" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143165" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-633.47251)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138058">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138060"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138062"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138064" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143167" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-613.24408)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138067">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138069"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138071"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138073" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143169" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-622.51847)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138076">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138078"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138080"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect138082" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143171" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-603.92529)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138085">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138087"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138089"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138091" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143173" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-653.29573)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138094">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138096"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138098"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138100" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143175" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-642.21669)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138103">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138105"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138107"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect138109" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143177" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-692.75456)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138112">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138114"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138116"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138118" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143179" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-672.33838)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138121">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138123"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138125"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138127" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143181" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-681.61304)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138130">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138132"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138134"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect138136" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143183" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-663.01961)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138139">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138141"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138143"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138145" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143185" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-731.96328)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138148">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138150"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138152"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138154" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143187" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-711.73485)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138157">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138159"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138161"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138163" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143189" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-721.00927)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138166">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138168"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138170"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect138172" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349" id="linearGradient143191" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-702.41609)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient138175">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop138177"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop138179"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect138181" is_visible="true"/>
+    <filter inkscape:collect="always" id="filter142702" x="-0.40059263" width="1.8011853" y="-0.054626267" height="1.1092525" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="9.5140751" id="feGaussianBlur142704"/>
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="304.9873"
-     inkscape:cy="193.11824"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="44"
-     inkscape:window-y="58"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata138313">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="304.9873" inkscape:cy="193.11824" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="44" inkscape:window-y="58" inkscape:window-maximized="0"/>
+  <metadata id="metadata138313">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-70.0127,-270.59795)">
-    <g
-       style="display:inline"
-       transform="translate(-1420.3083,-6737.2018)"
-       id="g142154"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rack_42.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g142706"
-         transform="translate(2,0)">
-        <g
-           id="g135315"
-           transform="matrix(0.63739135,0,0,0.63739135,1346.8375,2254.9771)">
-          <path
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             sodipodi:ry="4.596179"
-             sodipodi:rx="4.8613591"
-             sodipodi:cy="8116.7231"
-             sodipodi:cx="369.02136"
-             id="path135317"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:nodetypes="cccccccc"
-             id="path135319"
-             style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccccc"
-             inkscape:connector-curvature="0"
-             d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path135321" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path135323"
-             sodipodi:cx="369.02136"
-             sodipodi:cy="8116.7231"
-             sodipodi:rx="4.8613591"
-             sodipodi:ry="4.596179"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-70.0127,-270.59795)">
+    <g style="display:inline" transform="translate(-1420.3083,-6737.2018)" id="g142154">
+      <g id="g142706" transform="translate(2,0)">
+        <g id="g135315" transform="matrix(0.63739135,0,0,0.63739135,1346.8375,2254.9771)">
+          <path transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" sodipodi:ry="4.596179" sodipodi:rx="4.8613591" sodipodi:cy="8116.7231" sodipodi:cx="369.02136" id="path135317" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+          <path sodipodi:nodetypes="cccccccc" id="path135319" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135321"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path135323" sodipodi:cx="369.02136" sodipodi:cy="8116.7231" sodipodi:rx="4.8613591" sodipodi:ry="4.596179" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)"/>
         </g>
-        <path
-           id="path135325"
-           transform="matrix(0.54007273,0,0,0.54007273,1382.7241,3055.6875)"
-           style="opacity:0.23414636;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343)"
-           d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z"
-           inkscape:connector-curvature="0" />
-        <g
-           transform="matrix(0.63739135,0,0,0.63739135,1289.2083,2254.9771)"
-           id="g135327">
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path135329"
-             sodipodi:cx="369.02136"
-             sodipodi:cy="8116.7231"
-             sodipodi:rx="4.8613591"
-             sodipodi:ry="4.596179"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z"
-             style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path135331"
-             sodipodi:nodetypes="cccccccc" />
-          <path
-             id="path135333"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc" />
-          <path
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             sodipodi:ry="4.596179"
-             sodipodi:rx="4.8613591"
-             sodipodi:cy="8116.7231"
-             sodipodi:cx="369.02136"
-             id="path135335"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+        <path id="path135325" transform="matrix(0.54007273,0,0,0.54007273,1382.7241,3055.6875)" style="opacity:0.23414636;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343)" d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z" inkscape:connector-curvature="0"/>
+        <g transform="matrix(0.63739135,0,0,0.63739135,1289.2083,2254.9771)" id="g135327">
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path135329" sodipodi:cx="369.02136" sodipodi:cy="8116.7231" sodipodi:rx="4.8613591" sodipodi:ry="4.596179" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)"/>
+          <path inkscape:connector-curvature="0" d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135331" sodipodi:nodetypes="cccccccc"/>
+          <path id="path135333" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+          <path transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" sodipodi:ry="4.596179" sodipodi:rx="4.8613591" sodipodi:cy="8116.7231" sodipodi:cx="369.02136" id="path135335" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
         </g>
-        <path
-           transform="matrix(0.56559402,0,0,1,1288.6077,-682.85102)"
-           id="path135339"
-           style="opacity:0.43487806;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66323)"
-           d="m 431.92283,8122.0833 99.31824,1.6642 66.33948,18.7598 c -83.86708,0.1348 -149.47557,-0.4318 -236.53917,-0.6464 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z"
-           style="opacity:0.2585366;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343)"
-           transform="matrix(0.54007273,0,0,0.54007273,1325.0949,3055.4875)"
-           id="path135337" />
-        <g
-           transform="translate(1228.1279,-684.79556)"
-           id="g135341">
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path135343"
-             sodipodi:cx="369.02136"
-             sodipodi:cy="8116.7231"
-             sodipodi:rx="4.8613591"
-             sodipodi:ry="4.596179"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z"
-             style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path135345"
-             sodipodi:nodetypes="cccccccc" />
-          <path
-             id="path135347"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc" />
-          <path
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             sodipodi:ry="4.596179"
-             sodipodi:rx="4.8613591"
-             sodipodi:cy="8116.7231"
-             sodipodi:cx="369.02136"
-             id="path135349"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+        <path transform="matrix(0.56559402,0,0,1,1288.6077,-682.85102)" id="path135339" style="opacity:0.43487806;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66323)" d="m 431.92283,8122.0833 99.31824,1.6642 66.33948,18.7598 c -83.86708,0.1348 -149.47557,-0.4318 -236.53917,-0.6464 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path inkscape:connector-curvature="0" d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z" style="opacity:0.2585366;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343)" transform="matrix(0.54007273,0,0,0.54007273,1325.0949,3055.4875)" id="path135337"/>
+        <g transform="translate(1228.1279,-684.79556)" id="g135341">
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path135343" sodipodi:cx="369.02136" sodipodi:cy="8116.7231" sodipodi:rx="4.8613591" sodipodi:ry="4.596179" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)"/>
+          <path inkscape:connector-curvature="0" d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135345" sodipodi:nodetypes="cccccccc"/>
+          <path id="path135347" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+          <path transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" sodipodi:ry="4.596179" sodipodi:rx="4.8613591" sodipodi:cy="8116.7231" sodipodi:cx="369.02136" id="path135349" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
         </g>
-        <g
-           id="g135351"
-           transform="translate(1140.728,-684.79556)">
-          <path
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             sodipodi:ry="4.596179"
-             sodipodi:rx="4.8613591"
-             sodipodi:cy="8116.7231"
-             sodipodi:cx="369.02136"
-             id="path135353"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:nodetypes="cccccccc"
-             id="path135355"
-             style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccccc"
-             inkscape:connector-curvature="0"
-             d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path135357" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path135359"
-             sodipodi:cx="369.02136"
-             sodipodi:cy="8116.7231"
-             sodipodi:rx="4.8613591"
-             sodipodi:ry="4.596179"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)" />
+        <g id="g135351" transform="translate(1140.728,-684.79556)">
+          <path transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" sodipodi:ry="4.596179" sodipodi:rx="4.8613591" sodipodi:cy="8116.7231" sodipodi:cx="369.02136" id="path135353" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+          <path sodipodi:nodetypes="cccccccc" id="path135355" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135357"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path135359" sodipodi:cx="369.02136" sodipodi:cy="8116.7231" sodipodi:rx="4.8613591" sodipodi:ry="4.596179" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)"/>
         </g>
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 1526.2714,7431.6294 55.144,-0.031 31.7889,12.1367 -117.8079,-0.2811 z"
-           style="fill:url(#linearGradient143011);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a"
-           id="path135363" />
-        <path
-           d="m 1526.3792,7011.5151 -30.6294,6.9705 -0.1547,424.6692 30.7841,-11.5409 z"
-           style="fill:url(#linearGradient143013);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.99716866"
-           id="path135365"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           id="path135367"
-           transform="matrix(0.84731732,0,0,0.84731732,1197.0303,570.1794)"
-           style="opacity:0.32682926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343)"
-           d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z"
-           style="opacity:0.32682926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343)"
-           transform="matrix(0.84731732,0,0,0.84731732,1285.0125,570.533)"
-           id="path135369" />
-        <g
-           id="g135371"
-           transform="translate(1118.9076,-682.85102)">
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             id="path135373"
-             style="fill:url(#linearGradient143015);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a"
-             d="m 462.33373,7693.9469 31.63259,7.4781 0,424.8797 -31.63259,-11.8555 z" />
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 1526.2714,7431.6294 55.144,-0.031 31.7889,12.1367 -117.8079,-0.2811 z" style="fill:url(#linearGradient143011);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a" id="path135363"/>
+        <path d="m 1526.3792,7011.5151 -30.6294,6.9705 -0.1547,424.6692 30.7841,-11.5409 z" style="fill:url(#linearGradient143013);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.99716866" id="path135365" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path id="path135367" transform="matrix(0.84731732,0,0,0.84731732,1197.0303,570.1794)" style="opacity:0.32682926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343)" d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z" inkscape:connector-curvature="0"/>
+        <path inkscape:connector-curvature="0" d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z" style="opacity:0.32682926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343)" transform="matrix(0.84731732,0,0,0.84731732,1285.0125,570.533)" id="path135369"/>
+        <g id="g135371" transform="translate(1118.9076,-682.85102)">
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path135373" style="fill:url(#linearGradient143015);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a" d="m 462.33373,7693.9469 31.63259,7.4781 0,424.8797 -31.63259,-11.8555 z"/>
         </g>
-        <path
-           id="path135375"
-           style="fill:url(#linearGradient143017);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient143019)"
-           d="m 1526.6117,7010.9999 54.452,0 32.0506,7.4773 -117.7179,-0.016 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <g
-           id="g141938">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7403.2821 -30.125,-8.8591"
-             inkscape:path-effect="#path-effect141936"
-             id="path135391"
-             d="m 1612.1213,7403.2821 -30.125,-8.8591"
-             style="fill:none;stroke:url(#linearGradient143021);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143023);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7422.9802 -30.125,-8.9469"
-             id="path135393"
-             inkscape:path-effect="#path-effect141931"
-             inkscape:original-d="m 1612.1213,7422.9802 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143025);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7413.1312 -30.125,-8.8457"
-             id="path135405"
-             inkscape:path-effect="#path-effect141922"
-             inkscape:original-d="m 1612.1213,7413.1312 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7432.8294 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141917"
-             id="path135407"
-             d="m 1612.1213,7432.8294 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143027);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143029);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7363.8858 -30.125,-8.7966"
-             id="path135421"
-             inkscape:path-effect="#path-effect141908"
-             inkscape:original-d="m 1612.1213,7363.8858 -30.125,-8.7966"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7383.584 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141903"
-             id="path135423"
-             d="m 1612.1213,7383.584 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143031);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7373.7348 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141894"
-             id="path135435"
-             d="m 1612.1213,7373.7348 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143033);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143035);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7393.433 -30.125,-8.8849"
-             id="path135437"
-             inkscape:path-effect="#path-effect141889"
-             inkscape:original-d="m 1612.1213,7393.433 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143037);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7324.4895 -30.125,-8.859"
-             id="path135453"
-             inkscape:path-effect="#path-effect141880"
-             inkscape:original-d="m 1612.1213,7324.4895 -30.125,-8.859"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7344.1876 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141875"
-             id="path135455"
-             d="m 1612.1213,7344.1876 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143039);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7334.3386 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141866"
-             id="path135467"
-             d="m 1612.1213,7334.3386 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143041);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143043);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7354.0367 -30.125,-8.8849"
-             id="path135469"
-             inkscape:path-effect="#path-effect141861"
-             inkscape:original-d="m 1612.1213,7354.0367 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1611.9963,7285.0931 -30,-8.9216"
-             inkscape:path-effect="#path-effect141852"
-             id="path135483"
-             d="m 1611.9963,7285.0931 -30,-8.9216"
-             style="fill:none;stroke:url(#linearGradient143045);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143047);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7304.7913 -30.125,-8.9469"
-             id="path135485"
-             inkscape:path-effect="#path-effect141847"
-             inkscape:original-d="m 1612.1213,7304.7913 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143049);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7294.9421 -30.125,-8.8457"
-             id="path135497"
-             inkscape:path-effect="#path-effect141838"
-             inkscape:original-d="m 1612.1213,7294.9421 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7314.6404 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141833"
-             id="path135499"
-             d="m 1612.1213,7314.6404 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143051);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143053);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7245.6968 -30.125,-8.8591"
-             id="path135515"
-             inkscape:path-effect="#path-effect141824"
-             inkscape:original-d="m 1612.1213,7245.6968 -30.125,-8.8591"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7265.395 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141819"
-             id="path135517"
-             d="m 1612.1213,7265.395 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143055);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7255.5458 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141206"
-             id="path135529"
-             d="m 1612.1213,7255.5458 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143057);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143059);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7275.2441 -30.125,-8.8849"
-             id="path135531"
-             inkscape:path-effect="#path-effect141201"
-             inkscape:original-d="m 1612.1213,7275.2441 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7206.3004 -30.125,-8.7966"
-             inkscape:path-effect="#path-effect141810"
-             id="path135545"
-             d="m 1612.1213,7206.3004 -30.125,-8.7966"
-             style="fill:none;stroke:url(#linearGradient143061);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143063);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7225.9987 -30.125,-8.9469"
-             id="path135547"
-             inkscape:path-effect="#path-effect141805"
-             inkscape:original-d="m 1612.1213,7225.9987 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143065);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7216.1496 -30.125,-8.8457"
-             id="path135559"
-             inkscape:path-effect="#path-effect141796"
-             inkscape:original-d="m 1612.1213,7216.1496 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7235.8476 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141791"
-             id="path135561"
-             d="m 1612.1213,7235.8476 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143067);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7166.9041 -30.125,-8.8591"
-             inkscape:path-effect="#path-effect141064"
-             id="path135577"
-             d="m 1612.1213,7166.9041 -30.125,-8.8591"
-             style="fill:none;stroke:url(#linearGradient143069);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143071);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7186.6024 -30.125,-8.9469"
-             id="path135579"
-             inkscape:path-effect="#path-effect141059"
-             inkscape:original-d="m 1612.1213,7186.6024 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143073);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7176.7532 -30.125,-8.8457"
-             id="path135591"
-             inkscape:path-effect="#path-effect141092"
-             inkscape:original-d="m 1612.1213,7176.7532 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7196.4515 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141087"
-             id="path135593"
-             d="m 1612.1213,7196.4515 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143075);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143077);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7127.5078 -30.125,-8.6716"
-             id="path135607"
-             inkscape:path-effect="#path-effect141008"
-             inkscape:original-d="m 1612.1213,7127.5078 -30.125,-8.6716"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7147.206 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141003"
-             id="path135609"
-             d="m 1612.1213,7147.206 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143079);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7137.3569 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141036"
-             id="path135621"
-             d="m 1612.1213,7137.3569 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143081);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143083);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7157.055 -30.125,-8.8849"
-             id="path135623"
-             inkscape:path-effect="#path-effect141031"
-             inkscape:original-d="m 1612.1213,7157.055 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143085);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7107.8096 -30.125,-8.7966"
-             id="path135639"
-             inkscape:path-effect="#path-effect140795"
-             inkscape:original-d="m 1612.1213,7107.8096 -30.125,-8.7966"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7117.6587 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect140809"
-             id="path135649"
-             d="m 1612.1213,7117.6587 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143087);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143089);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7068.4132 -30.125,-8.8591"
-             id="path135665"
-             inkscape:path-effect="#path-effect141120"
-             inkscape:original-d="m 1612.1213,7068.4132 -30.125,-8.8591"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7088.1116 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141115"
-             id="path135667"
-             d="m 1612.1213,7088.1116 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143091);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7078.2624 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141782"
-             id="path135679"
-             d="m 1612.1213,7078.2624 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143093);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143095);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7097.9607 -30.125,-8.8849"
-             id="path135681"
-             inkscape:path-effect="#path-effect141777"
-             inkscape:original-d="m 1612.1213,7097.9607 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7029.017 -30.125,-8.6716"
-             inkscape:path-effect="#path-effect141768"
-             id="path135695"
-             d="m 1612.1213,7029.017 -30.125,-8.6716"
-             style="fill:none;stroke:url(#linearGradient143097);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143099);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7048.7152 -30.125,-8.9469"
-             id="path135697"
-             inkscape:path-effect="#path-effect141763"
-             inkscape:original-d="m 1612.1213,7048.7152 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143101);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7038.8661 -30.125,-8.8457"
-             id="path135709"
-             inkscape:path-effect="#path-effect141754"
-             inkscape:original-d="m 1612.1213,7038.8661 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7058.5642 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141749"
-             id="path135711"
-             d="m 1612.1213,7058.5642 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143103);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path id="path135375" style="fill:url(#linearGradient143017);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient143019)" d="m 1526.6117,7010.9999 54.452,0 32.0506,7.4773 -117.7179,-0.016 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <g id="g141938">
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7403.2821 -30.125,-8.8591" inkscape:path-effect="#path-effect141936" id="path135391" d="m 1612.1213,7403.2821 -30.125,-8.8591" style="fill:none;stroke:url(#linearGradient143021);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143023);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7422.9802 -30.125,-8.9469" id="path135393" inkscape:path-effect="#path-effect141931" inkscape:original-d="m 1612.1213,7422.9802 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143025);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7413.1312 -30.125,-8.8457" id="path135405" inkscape:path-effect="#path-effect141922" inkscape:original-d="m 1612.1213,7413.1312 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7432.8294 -30.125,-8.8849" inkscape:path-effect="#path-effect141917" id="path135407" d="m 1612.1213,7432.8294 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143027);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143029);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7363.8858 -30.125,-8.7966" id="path135421" inkscape:path-effect="#path-effect141908" inkscape:original-d="m 1612.1213,7363.8858 -30.125,-8.7966" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7383.584 -30.125,-8.9469" inkscape:path-effect="#path-effect141903" id="path135423" d="m 1612.1213,7383.584 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143031);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7373.7348 -30.125,-8.8457" inkscape:path-effect="#path-effect141894" id="path135435" d="m 1612.1213,7373.7348 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143033);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143035);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7393.433 -30.125,-8.8849" id="path135437" inkscape:path-effect="#path-effect141889" inkscape:original-d="m 1612.1213,7393.433 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143037);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7324.4895 -30.125,-8.859" id="path135453" inkscape:path-effect="#path-effect141880" inkscape:original-d="m 1612.1213,7324.4895 -30.125,-8.859" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7344.1876 -30.125,-8.9469" inkscape:path-effect="#path-effect141875" id="path135455" d="m 1612.1213,7344.1876 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143039);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7334.3386 -30.125,-8.8457" inkscape:path-effect="#path-effect141866" id="path135467" d="m 1612.1213,7334.3386 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143041);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143043);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7354.0367 -30.125,-8.8849" id="path135469" inkscape:path-effect="#path-effect141861" inkscape:original-d="m 1612.1213,7354.0367 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1611.9963,7285.0931 -30,-8.9216" inkscape:path-effect="#path-effect141852" id="path135483" d="m 1611.9963,7285.0931 -30,-8.9216" style="fill:none;stroke:url(#linearGradient143045);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143047);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7304.7913 -30.125,-8.9469" id="path135485" inkscape:path-effect="#path-effect141847" inkscape:original-d="m 1612.1213,7304.7913 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143049);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7294.9421 -30.125,-8.8457" id="path135497" inkscape:path-effect="#path-effect141838" inkscape:original-d="m 1612.1213,7294.9421 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7314.6404 -30.125,-8.8849" inkscape:path-effect="#path-effect141833" id="path135499" d="m 1612.1213,7314.6404 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143051);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143053);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7245.6968 -30.125,-8.8591" id="path135515" inkscape:path-effect="#path-effect141824" inkscape:original-d="m 1612.1213,7245.6968 -30.125,-8.8591" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7265.395 -30.125,-8.9469" inkscape:path-effect="#path-effect141819" id="path135517" d="m 1612.1213,7265.395 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143055);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7255.5458 -30.125,-8.8457" inkscape:path-effect="#path-effect141206" id="path135529" d="m 1612.1213,7255.5458 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143057);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143059);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7275.2441 -30.125,-8.8849" id="path135531" inkscape:path-effect="#path-effect141201" inkscape:original-d="m 1612.1213,7275.2441 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7206.3004 -30.125,-8.7966" inkscape:path-effect="#path-effect141810" id="path135545" d="m 1612.1213,7206.3004 -30.125,-8.7966" style="fill:none;stroke:url(#linearGradient143061);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143063);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7225.9987 -30.125,-8.9469" id="path135547" inkscape:path-effect="#path-effect141805" inkscape:original-d="m 1612.1213,7225.9987 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143065);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7216.1496 -30.125,-8.8457" id="path135559" inkscape:path-effect="#path-effect141796" inkscape:original-d="m 1612.1213,7216.1496 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7235.8476 -30.125,-8.8849" inkscape:path-effect="#path-effect141791" id="path135561" d="m 1612.1213,7235.8476 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143067);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7166.9041 -30.125,-8.8591" inkscape:path-effect="#path-effect141064" id="path135577" d="m 1612.1213,7166.9041 -30.125,-8.8591" style="fill:none;stroke:url(#linearGradient143069);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143071);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7186.6024 -30.125,-8.9469" id="path135579" inkscape:path-effect="#path-effect141059" inkscape:original-d="m 1612.1213,7186.6024 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143073);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7176.7532 -30.125,-8.8457" id="path135591" inkscape:path-effect="#path-effect141092" inkscape:original-d="m 1612.1213,7176.7532 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7196.4515 -30.125,-8.8849" inkscape:path-effect="#path-effect141087" id="path135593" d="m 1612.1213,7196.4515 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143075);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143077);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7127.5078 -30.125,-8.6716" id="path135607" inkscape:path-effect="#path-effect141008" inkscape:original-d="m 1612.1213,7127.5078 -30.125,-8.6716" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7147.206 -30.125,-8.9469" inkscape:path-effect="#path-effect141003" id="path135609" d="m 1612.1213,7147.206 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143079);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7137.3569 -30.125,-8.8457" inkscape:path-effect="#path-effect141036" id="path135621" d="m 1612.1213,7137.3569 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143081);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143083);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7157.055 -30.125,-8.8849" id="path135623" inkscape:path-effect="#path-effect141031" inkscape:original-d="m 1612.1213,7157.055 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143085);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7107.8096 -30.125,-8.7966" id="path135639" inkscape:path-effect="#path-effect140795" inkscape:original-d="m 1612.1213,7107.8096 -30.125,-8.7966" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7117.6587 -30.125,-8.8457" inkscape:path-effect="#path-effect140809" id="path135649" d="m 1612.1213,7117.6587 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143087);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143089);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7068.4132 -30.125,-8.8591" id="path135665" inkscape:path-effect="#path-effect141120" inkscape:original-d="m 1612.1213,7068.4132 -30.125,-8.8591" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7088.1116 -30.125,-8.9469" inkscape:path-effect="#path-effect141115" id="path135667" d="m 1612.1213,7088.1116 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143091);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7078.2624 -30.125,-8.8457" inkscape:path-effect="#path-effect141782" id="path135679" d="m 1612.1213,7078.2624 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143093);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143095);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7097.9607 -30.125,-8.8849" id="path135681" inkscape:path-effect="#path-effect141777" inkscape:original-d="m 1612.1213,7097.9607 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7029.017 -30.125,-8.6716" inkscape:path-effect="#path-effect141768" id="path135695" d="m 1612.1213,7029.017 -30.125,-8.6716" style="fill:none;stroke:url(#linearGradient143097);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143099);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7048.7152 -30.125,-8.9469" id="path135697" inkscape:path-effect="#path-effect141763" inkscape:original-d="m 1612.1213,7048.7152 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143101);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7038.8661 -30.125,-8.8457" id="path135709" inkscape:path-effect="#path-effect141754" inkscape:original-d="m 1612.1213,7038.8661 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7058.5642 -30.125,-8.8849" inkscape:path-effect="#path-effect141749" id="path135711" d="m 1612.1213,7058.5642 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143103);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
         </g>
-        <path
-           id="path135719"
-           style="fill:url(#linearGradient143105);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 1488.321,7017.98 7.2458,0 0,425.994 -7.2458,0 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 1612.5863,7017.9929 7.2458,0 0,426.2478 -7.1599,-0.01 z"
-           style="fill:url(#linearGradient143107);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path138309" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path137361"
-           style="opacity:0.57847535;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46858-5-0)"
-           d="m 363.31667,8006.2094 129.70351,0.2807 -39.03694,-6.0055 -47.52299,-0.1493 z"
-           inkscape:connector-curvature="0"
-           transform="matrix(0.782857,0,0,1.1835744,1219.3935,-2034.2271)" />
-        <rect
-           style="opacity:0.632287;fill:none;stroke:#000000;stroke-width:2.62032771;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter138305)"
-           id="rect138303"
-           width="57"
-           height="418"
-           x="1524"
-           y="6996.9277"
-           transform="matrix(0.85724747,0,0,0.97822603,222.97895,176.77897)" />
-        <g
-           id="g141982"
-           transform="matrix(-1.0249987,0,0,0.99996992,3148.3148,0.22361906)">
-          <path
-             style="fill:none;stroke:url(#linearGradient143109);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7403.2821 -30.125,-8.8591"
-             id="path141984"
-             inkscape:path-effect="#path-effect141936"
-             inkscape:original-d="m 1612.1213,7403.2821 -30.125,-8.8591"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7422.9802 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141931"
-             id="path141986"
-             d="m 1612.1213,7422.9802 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143111);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7413.1312 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141922"
-             id="path141988"
-             d="m 1612.1213,7413.1312 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143113);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143115);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7432.8294 -30.125,-8.8849"
-             id="path141990"
-             inkscape:path-effect="#path-effect141917"
-             inkscape:original-d="m 1612.1213,7432.8294 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7363.8858 -30.125,-8.7966"
-             inkscape:path-effect="#path-effect141908"
-             id="path141992"
-             d="m 1612.1213,7363.8858 -30.125,-8.7966"
-             style="fill:none;stroke:url(#linearGradient143117);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143119);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7383.584 -30.125,-8.9469"
-             id="path141994"
-             inkscape:path-effect="#path-effect141903"
-             inkscape:original-d="m 1612.1213,7383.584 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143121);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7373.7348 -30.125,-8.8457"
-             id="path141996"
-             inkscape:path-effect="#path-effect141894"
-             inkscape:original-d="m 1612.1213,7373.7348 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7393.433 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141889"
-             id="path141998"
-             d="m 1612.1213,7393.433 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143123);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7324.4895 -30.125,-8.859"
-             inkscape:path-effect="#path-effect141880"
-             id="path142000"
-             d="m 1612.1213,7324.4895 -30.125,-8.859"
-             style="fill:none;stroke:url(#linearGradient143125);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143127);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7344.1876 -30.125,-8.9469"
-             id="path142002"
-             inkscape:path-effect="#path-effect141875"
-             inkscape:original-d="m 1612.1213,7344.1876 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143129);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7334.3386 -30.125,-8.8457"
-             id="path142004"
-             inkscape:path-effect="#path-effect141866"
-             inkscape:original-d="m 1612.1213,7334.3386 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7354.0367 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141861"
-             id="path142006"
-             d="m 1612.1213,7354.0367 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143131);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143133);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1611.9963,7285.0931 -30,-8.9216"
-             id="path142008"
-             inkscape:path-effect="#path-effect141852"
-             inkscape:original-d="m 1611.9963,7285.0931 -30,-8.9216"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7304.7913 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141847"
-             id="path142010"
-             d="m 1612.1213,7304.7913 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143135);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7294.9421 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141838"
-             id="path142012"
-             d="m 1612.1213,7294.9421 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143137);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143139);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7314.6404 -30.125,-8.8849"
-             id="path142014"
-             inkscape:path-effect="#path-effect141833"
-             inkscape:original-d="m 1612.1213,7314.6404 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7245.6968 -30.125,-8.8591"
-             inkscape:path-effect="#path-effect141824"
-             id="path142016"
-             d="m 1612.1213,7245.6968 -30.125,-8.8591"
-             style="fill:none;stroke:url(#linearGradient143141);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143143);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7265.395 -30.125,-8.9469"
-             id="path142018"
-             inkscape:path-effect="#path-effect141819"
-             inkscape:original-d="m 1612.1213,7265.395 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143145);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7255.5458 -30.125,-8.8457"
-             id="path142020"
-             inkscape:path-effect="#path-effect141206"
-             inkscape:original-d="m 1612.1213,7255.5458 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7275.2441 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141201"
-             id="path142022"
-             d="m 1612.1213,7275.2441 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143147);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143149);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7206.3004 -30.125,-8.7966"
-             id="path142024"
-             inkscape:path-effect="#path-effect141810"
-             inkscape:original-d="m 1612.1213,7206.3004 -30.125,-8.7966"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7225.9987 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141805"
-             id="path142026"
-             d="m 1612.1213,7225.9987 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143151);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7216.1496 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141796"
-             id="path142028"
-             d="m 1612.1213,7216.1496 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143153);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143155);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7235.8476 -30.125,-8.8849"
-             id="path142030"
-             inkscape:path-effect="#path-effect141791"
-             inkscape:original-d="m 1612.1213,7235.8476 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143157);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7166.9041 -30.125,-8.8591"
-             id="path142032"
-             inkscape:path-effect="#path-effect141064"
-             inkscape:original-d="m 1612.1213,7166.9041 -30.125,-8.8591"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7186.6024 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141059"
-             id="path142034"
-             d="m 1612.1213,7186.6024 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143159);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7176.7532 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141092"
-             id="path142036"
-             d="m 1612.1213,7176.7532 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143161);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143163);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7196.4515 -30.125,-8.8849"
-             id="path142038"
-             inkscape:path-effect="#path-effect141087"
-             inkscape:original-d="m 1612.1213,7196.4515 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7127.5078 -30.125,-8.6716"
-             inkscape:path-effect="#path-effect141008"
-             id="path142040"
-             d="m 1612.1213,7127.5078 -30.125,-8.6716"
-             style="fill:none;stroke:url(#linearGradient143165);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143167);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7147.206 -30.125,-8.9469"
-             id="path142042"
-             inkscape:path-effect="#path-effect141003"
-             inkscape:original-d="m 1612.1213,7147.206 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143169);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7137.3569 -30.125,-8.8457"
-             id="path142044"
-             inkscape:path-effect="#path-effect141036"
-             inkscape:original-d="m 1612.1213,7137.3569 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7157.055 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141031"
-             id="path142046"
-             d="m 1612.1213,7157.055 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143171);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7107.8096 -30.125,-8.7966"
-             inkscape:path-effect="#path-effect140795"
-             id="path142048"
-             d="m 1612.1213,7107.8096 -30.125,-8.7966"
-             style="fill:none;stroke:url(#linearGradient143173);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143175);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7117.6587 -30.125,-8.8457"
-             id="path142050"
-             inkscape:path-effect="#path-effect140809"
-             inkscape:original-d="m 1612.1213,7117.6587 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7068.4132 -30.125,-8.8591"
-             inkscape:path-effect="#path-effect141120"
-             id="path142052"
-             d="m 1612.1213,7068.4132 -30.125,-8.8591"
-             style="fill:none;stroke:url(#linearGradient143177);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143179);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7088.1116 -30.125,-8.9469"
-             id="path142054"
-             inkscape:path-effect="#path-effect141115"
-             inkscape:original-d="m 1612.1213,7088.1116 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143181);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7078.2624 -30.125,-8.8457"
-             id="path142056"
-             inkscape:path-effect="#path-effect141782"
-             inkscape:original-d="m 1612.1213,7078.2624 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7097.9607 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141777"
-             id="path142058"
-             d="m 1612.1213,7097.9607 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143183);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143185);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7029.017 -30.125,-8.6716"
-             id="path142060"
-             inkscape:path-effect="#path-effect141768"
-             inkscape:original-d="m 1612.1213,7029.017 -30.125,-8.6716"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7048.7152 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141763"
-             id="path142062"
-             d="m 1612.1213,7048.7152 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143187);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7038.8661 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141754"
-             id="path142064"
-             d="m 1612.1213,7038.8661 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143189);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143191);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7058.5642 -30.125,-8.8849"
-             id="path142066"
-             inkscape:path-effect="#path-effect141749"
-             inkscape:original-d="m 1612.1213,7058.5642 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
+        <path id="path135719" style="fill:url(#linearGradient143105);fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1488.321,7017.98 7.2458,0 0,425.994 -7.2458,0 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 1612.5863,7017.9929 7.2458,0 0,426.2478 -7.1599,-0.01 z" style="fill:url(#linearGradient143107);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path138309"/>
+        <path sodipodi:nodetypes="ccccc" id="path137361" style="opacity:0.57847535;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46858-5-0)" d="m 363.31667,8006.2094 129.70351,0.2807 -39.03694,-6.0055 -47.52299,-0.1493 z" inkscape:connector-curvature="0" transform="matrix(0.782857,0,0,1.1835744,1219.3935,-2034.2271)"/>
+        <rect style="opacity:0.632287;fill:none;stroke:#000000;stroke-width:2.62032771;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter138305)" id="rect138303" width="57" height="418" x="1524" y="6996.9277" transform="matrix(0.85724747,0,0,0.97822603,222.97895,176.77897)"/>
+        <g id="g141982" transform="matrix(-1.0249987,0,0,0.99996992,3148.3148,0.22361906)">
+          <path style="fill:none;stroke:url(#linearGradient143109);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7403.2821 -30.125,-8.8591" id="path141984" inkscape:path-effect="#path-effect141936" inkscape:original-d="m 1612.1213,7403.2821 -30.125,-8.8591" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7422.9802 -30.125,-8.9469" inkscape:path-effect="#path-effect141931" id="path141986" d="m 1612.1213,7422.9802 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143111);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7413.1312 -30.125,-8.8457" inkscape:path-effect="#path-effect141922" id="path141988" d="m 1612.1213,7413.1312 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143113);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143115);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7432.8294 -30.125,-8.8849" id="path141990" inkscape:path-effect="#path-effect141917" inkscape:original-d="m 1612.1213,7432.8294 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7363.8858 -30.125,-8.7966" inkscape:path-effect="#path-effect141908" id="path141992" d="m 1612.1213,7363.8858 -30.125,-8.7966" style="fill:none;stroke:url(#linearGradient143117);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143119);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7383.584 -30.125,-8.9469" id="path141994" inkscape:path-effect="#path-effect141903" inkscape:original-d="m 1612.1213,7383.584 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143121);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7373.7348 -30.125,-8.8457" id="path141996" inkscape:path-effect="#path-effect141894" inkscape:original-d="m 1612.1213,7373.7348 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7393.433 -30.125,-8.8849" inkscape:path-effect="#path-effect141889" id="path141998" d="m 1612.1213,7393.433 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143123);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7324.4895 -30.125,-8.859" inkscape:path-effect="#path-effect141880" id="path142000" d="m 1612.1213,7324.4895 -30.125,-8.859" style="fill:none;stroke:url(#linearGradient143125);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143127);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7344.1876 -30.125,-8.9469" id="path142002" inkscape:path-effect="#path-effect141875" inkscape:original-d="m 1612.1213,7344.1876 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143129);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7334.3386 -30.125,-8.8457" id="path142004" inkscape:path-effect="#path-effect141866" inkscape:original-d="m 1612.1213,7334.3386 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7354.0367 -30.125,-8.8849" inkscape:path-effect="#path-effect141861" id="path142006" d="m 1612.1213,7354.0367 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143131);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143133);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1611.9963,7285.0931 -30,-8.9216" id="path142008" inkscape:path-effect="#path-effect141852" inkscape:original-d="m 1611.9963,7285.0931 -30,-8.9216" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7304.7913 -30.125,-8.9469" inkscape:path-effect="#path-effect141847" id="path142010" d="m 1612.1213,7304.7913 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143135);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7294.9421 -30.125,-8.8457" inkscape:path-effect="#path-effect141838" id="path142012" d="m 1612.1213,7294.9421 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143137);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143139);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7314.6404 -30.125,-8.8849" id="path142014" inkscape:path-effect="#path-effect141833" inkscape:original-d="m 1612.1213,7314.6404 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7245.6968 -30.125,-8.8591" inkscape:path-effect="#path-effect141824" id="path142016" d="m 1612.1213,7245.6968 -30.125,-8.8591" style="fill:none;stroke:url(#linearGradient143141);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143143);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7265.395 -30.125,-8.9469" id="path142018" inkscape:path-effect="#path-effect141819" inkscape:original-d="m 1612.1213,7265.395 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143145);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7255.5458 -30.125,-8.8457" id="path142020" inkscape:path-effect="#path-effect141206" inkscape:original-d="m 1612.1213,7255.5458 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7275.2441 -30.125,-8.8849" inkscape:path-effect="#path-effect141201" id="path142022" d="m 1612.1213,7275.2441 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143147);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143149);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7206.3004 -30.125,-8.7966" id="path142024" inkscape:path-effect="#path-effect141810" inkscape:original-d="m 1612.1213,7206.3004 -30.125,-8.7966" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7225.9987 -30.125,-8.9469" inkscape:path-effect="#path-effect141805" id="path142026" d="m 1612.1213,7225.9987 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143151);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7216.1496 -30.125,-8.8457" inkscape:path-effect="#path-effect141796" id="path142028" d="m 1612.1213,7216.1496 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143153);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143155);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7235.8476 -30.125,-8.8849" id="path142030" inkscape:path-effect="#path-effect141791" inkscape:original-d="m 1612.1213,7235.8476 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143157);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7166.9041 -30.125,-8.8591" id="path142032" inkscape:path-effect="#path-effect141064" inkscape:original-d="m 1612.1213,7166.9041 -30.125,-8.8591" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7186.6024 -30.125,-8.9469" inkscape:path-effect="#path-effect141059" id="path142034" d="m 1612.1213,7186.6024 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143159);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7176.7532 -30.125,-8.8457" inkscape:path-effect="#path-effect141092" id="path142036" d="m 1612.1213,7176.7532 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143161);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143163);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7196.4515 -30.125,-8.8849" id="path142038" inkscape:path-effect="#path-effect141087" inkscape:original-d="m 1612.1213,7196.4515 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7127.5078 -30.125,-8.6716" inkscape:path-effect="#path-effect141008" id="path142040" d="m 1612.1213,7127.5078 -30.125,-8.6716" style="fill:none;stroke:url(#linearGradient143165);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143167);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7147.206 -30.125,-8.9469" id="path142042" inkscape:path-effect="#path-effect141003" inkscape:original-d="m 1612.1213,7147.206 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143169);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7137.3569 -30.125,-8.8457" id="path142044" inkscape:path-effect="#path-effect141036" inkscape:original-d="m 1612.1213,7137.3569 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7157.055 -30.125,-8.8849" inkscape:path-effect="#path-effect141031" id="path142046" d="m 1612.1213,7157.055 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143171);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7107.8096 -30.125,-8.7966" inkscape:path-effect="#path-effect140795" id="path142048" d="m 1612.1213,7107.8096 -30.125,-8.7966" style="fill:none;stroke:url(#linearGradient143173);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143175);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7117.6587 -30.125,-8.8457" id="path142050" inkscape:path-effect="#path-effect140809" inkscape:original-d="m 1612.1213,7117.6587 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7068.4132 -30.125,-8.8591" inkscape:path-effect="#path-effect141120" id="path142052" d="m 1612.1213,7068.4132 -30.125,-8.8591" style="fill:none;stroke:url(#linearGradient143177);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143179);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7088.1116 -30.125,-8.9469" id="path142054" inkscape:path-effect="#path-effect141115" inkscape:original-d="m 1612.1213,7088.1116 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143181);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7078.2624 -30.125,-8.8457" id="path142056" inkscape:path-effect="#path-effect141782" inkscape:original-d="m 1612.1213,7078.2624 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7097.9607 -30.125,-8.8849" inkscape:path-effect="#path-effect141777" id="path142058" d="m 1612.1213,7097.9607 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143183);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143185);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7029.017 -30.125,-8.6716" id="path142060" inkscape:path-effect="#path-effect141768" inkscape:original-d="m 1612.1213,7029.017 -30.125,-8.6716" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7048.7152 -30.125,-8.9469" inkscape:path-effect="#path-effect141763" id="path142062" d="m 1612.1213,7048.7152 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143187);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7038.8661 -30.125,-8.8457" inkscape:path-effect="#path-effect141754" id="path142064" d="m 1612.1213,7038.8661 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143189);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143191);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7058.5642 -30.125,-8.8849" id="path142066" inkscape:path-effect="#path-effect141749" inkscape:original-d="m 1612.1213,7058.5642 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
         </g>
-        <rect
-           transform="matrix(0.85724747,0,0,0.93747488,222.97895,475.10261)"
-           y="6996.9277"
-           x="1524"
-           height="418"
-           width="57"
-           id="rect142700"
-           style="opacity:0.632287;fill:none;stroke:#000000;stroke-width:2.62032771;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter142702)" />
+        <rect transform="matrix(0.85724747,0,0,0.93747488,222.97895,475.10261)" y="6996.9277" x="1524" height="418" width="57" id="rect142700" style="opacity:0.632287;fill:none;stroke:#000000;stroke-width:2.62032771;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter142702)"/>
       </g>
     </g>
   </g>
diff --git a/misc/images/svg/equipment_rack/Rack_42_with_door.svg b/misc/images/svg/equipment_rack/Rack_42_with_door.svg
index c618962e2fa..ea237d8a914 100644
--- a/misc/images/svg/equipment_rack/Rack_42_with_door.svg
+++ b/misc/images/svg/equipment_rack/Rack_42_with_door.svg
@@ -1,3399 +1,727 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="208.84982"
-   height="461.5925"
-   id="svg140428"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 34">
-  <defs
-     id="defs140430">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66309-1"
-       id="linearGradient108822-7"
-       gradientUnits="userSpaceOnUse"
-       x1="483.10858"
-       y1="8180.0669"
-       x2="495.57455"
-       y2="7730.4277"
-       gradientTransform="matrix(0.92084604,0,0,0.99527412,948.46137,-166.68373)" />
-    <linearGradient
-       id="linearGradient66309-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop66311-7" />
-      <stop
-         id="stop66313-4"
-         offset="0.36715987"
-         style="stop-color:#2d2d2d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#222222;stop-opacity:1;"
-         offset="1"
-         id="stop66315-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient80003-9"
-       id="linearGradient108994-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0013355,-232.1991,-164.4803)"
-       x1="1611.2722"
-       y1="7969.0654"
-       x2="1792.8528"
-       y2="7710.2651" />
-    <linearGradient
-       id="linearGradient80003-9">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop80005-4" />
-      <stop
-         id="stop80007-8"
-         offset="0.35685185"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop80009-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient107168-2"
-       id="linearGradient108996-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0013355,-232.1991,-164.4803)"
-       x1="1678"
-       y1="8077.4785"
-       x2="1640"
-       y2="7869.9277" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient107168-2">
-      <stop
-         style="stop-color:#808080;stop-opacity:1;"
-         offset="0"
-         id="stop107170-4" />
-      <stop
-         style="stop-color:#808080;stop-opacity:0;"
-         offset="1"
-         id="stop107172-5" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter66343-1"
-       x="-0.081202835"
-       width="1.1624057"
-       y="-0.28421265"
-       height="1.5684253"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.66988921"
-         id="feGaussianBlur66345-7" />
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="208.84982" height="461.5925" id="svg140428" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="New document 34">
+  <defs id="defs140430">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66309-1" id="linearGradient108822-7" gradientUnits="userSpaceOnUse" x1="483.10858" y1="8180.0669" x2="495.57455" y2="7730.4277" gradientTransform="matrix(0.92084604,0,0,0.99527412,948.46137,-166.68373)"/>
+    <linearGradient id="linearGradient66309-1">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop66311-7"/>
+      <stop id="stop66313-4" offset="0.36715987" style="stop-color:#2d2d2d;stop-opacity:1;"/>
+      <stop style="stop-color:#222222;stop-opacity:1;" offset="1" id="stop66315-0"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient80003-9" id="linearGradient108994-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,1.0013355,-232.1991,-164.4803)" x1="1611.2722" y1="7969.0654" x2="1792.8528" y2="7710.2651"/>
+    <linearGradient id="linearGradient80003-9">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop80005-4"/>
+      <stop id="stop80007-8" offset="0.35685185" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop80009-8"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient107168-2" id="linearGradient108996-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,1.0013355,-232.1991,-164.4803)" x1="1678" y1="8077.4785" x2="1640" y2="7869.9277"/>
+    <linearGradient inkscape:collect="always" id="linearGradient107168-2">
+      <stop style="stop-color:#808080;stop-opacity:1;" offset="0" id="stop107170-4"/>
+      <stop style="stop-color:#808080;stop-opacity:0;" offset="1" id="stop107172-5"/>
+    </linearGradient>
+    <filter inkscape:collect="always" id="filter66343-1" x="-0.081202835" width="1.1624057" y="-0.28421265" height="1.5684253" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.66988921" id="feGaussianBlur66345-7"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter66323-4"
-       x="-0.012292516"
-       width="1.024585"
-       y="-0.17442797"
-       height="1.3488559"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.2522766"
-         id="feGaussianBlur66325-0" />
+    <filter inkscape:collect="always" id="filter66323-4" x="-0.012292516" width="1.024585" y="-0.17442797" height="1.3488559" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.2522766" id="feGaussianBlur66325-0"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66225-48"
-       id="linearGradient143011-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1135.7692,-682.85102)"
-       x1="513.6272"
-       y1="8109.6055"
-       x2="514.33374"
-       y2="8169.9551" />
-    <linearGradient
-       id="linearGradient66225-48">
-      <stop
-         id="stop66227-8"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.36715987"
-         id="stop66229-2" />
-      <stop
-         id="stop66231-4"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66241-5"
-       id="linearGradient143013-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0000924,0,0,0.99425392,1135.9347,-636.45507)"
-       x1="300.41592"
-       y1="7825.5479"
-       x2="390.40842"
-       y2="7829.3926" />
-    <linearGradient
-       id="linearGradient66241-5">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop66243-17" />
-      <stop
-         id="stop66245-1"
-         offset="0.47634247"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop66247-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66225-48"
-       id="linearGradient143015-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-110,0)"
-       x1="579.40479"
-       y1="7867.4097"
-       x2="720.3927"
-       y2="7858.3389" />
-    <linearGradient
-       id="linearGradient139558">
-      <stop
-         id="stop139560"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.36715987"
-         id="stop139562" />
-      <stop
-         id="stop139564"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66273-7"
-       id="linearGradient143017-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1135.7692,-717.08144)"
-       x1="474.88556"
-       y1="7726.3086"
-       x2="476.6871"
-       y2="7758.7476" />
-    <linearGradient
-       id="linearGradient66273-7">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop66275-61" />
-      <stop
-         id="stop66277-42"
-         offset="0.45602524"
-         style="stop-color:#bbbbbb;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop66279-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143019-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1135.7692,-717.08144)"
-       x1="409.33176"
-       y1="7726.3315"
-       x2="476.6871"
-       y2="7758.7476" />
-    <linearGradient
-       id="linearGradient66349-2">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop66351-1-5" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop66353-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143021-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-357.88577)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139576">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139578" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139580" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141936-57"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143023-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-337.46971)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139584">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139586" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139588" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141931-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143025-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-346.74423)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139592">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139594" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139596" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141922-9"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143027-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-328.15092)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139600">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139602" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139604" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141917-79"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143029-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-397.2195)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139608">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139610" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139612" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141908-43"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143031-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-376.86594)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139616">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139618" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139620" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141903-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143033-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-386.14058)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139624">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139626" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139628" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141894-3"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143035-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-367.54727)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139632">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139634" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139636" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141889-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143037-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-436.67825)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139640">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139642" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139644" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141880-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143039-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-416.26231)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139648">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139650" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139652" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141875-7"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143041-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-425.53683)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139656">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139658" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139660" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141866-27"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143043-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-406.94365)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139664">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139666" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139668" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141861-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143045-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-476.1371)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139672">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139674" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139676" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141852-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143047-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-455.65867)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139680">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139682" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139684" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141847-8"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143049-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-464.93331)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139688">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139690" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139692" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141838-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143051-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-446.33988)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139696">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139698" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139700" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141833-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143053-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-515.47093)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139704">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139706" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139708" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141824-6"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143055-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-495.05499)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139712">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139714" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139716" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141819-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143057-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-504.32964)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139720">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139722" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139724" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141206-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143059-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-485.73621)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139728">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139730" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139732" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141201-5"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143061-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-554.80491)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139736">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139738" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139740" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141810-9"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143063-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-534.45123)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139744">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139746" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139748" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141805-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143065-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-543.72587)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139752">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139754" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139756" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141796-1"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143067-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-525.13268)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139760">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139762" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139764" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141791-8"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143069-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-594.26378)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139768">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139770" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139772" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141064-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143071-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-573.8476)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139776">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139778" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139780" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141059-46"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143073-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-583.12224)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139784">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139786" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139788" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141092-6"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143075-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-564.52881)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139792">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139794" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139796" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141087-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143077-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-633.47251)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139800">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139802" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139804" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141008-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143079-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-613.24408)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139808">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139810" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139812" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141003-63"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143081-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-622.51847)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139816">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139818" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139820" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141036-8"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143083-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-603.92529)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139824">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139826" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139828" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141031-2"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143085-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-653.29573)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139832">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139834" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139836" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140795-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143087-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-642.21669)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139840">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139842" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139844" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140809-5"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143089-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-692.75456)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139848">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139850" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139852" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141120-8"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143091-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-672.33838)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139856">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139858" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139860" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141115-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143093-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-681.61304)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139864">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139866" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139868" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141782-63"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143095-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-663.01961)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139872">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139874" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141777-1"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143097-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-731.96328)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139880">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139882" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139884" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141768-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143099-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-711.73485)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139888">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139890" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139892" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141763-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143101-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-721.00927)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139896">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139898" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139900" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect141754-7"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143103-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-702.41609)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139904">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139906" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139908" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect141749-7"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient80069-6"
-       id="linearGradient143105-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0027998,808.355,6382.2297)"
-       x1="618.53314"
-       y1="622.74634"
-       x2="691.36908"
-       y2="1092.4669" />
-    <linearGradient
-       id="linearGradient80069-6">
-      <stop
-         id="stop80071-0"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1;"
-         offset="0.26005435"
-         id="stop80073-1" />
-      <stop
-         id="stop80075-6"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter46858-5-0-7"
-       x="-0.017784396"
-       width="1.0355688"
-       y="-0.21916859"
-       height="1.4383372">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.1502059"
-         id="feGaussianBlur46860-75-0-5" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66225-48" id="linearGradient143011-9" gradientUnits="userSpaceOnUse" gradientTransform="translate(1135.7692,-682.85102)" x1="513.6272" y1="8109.6055" x2="514.33374" y2="8169.9551"/>
+    <linearGradient id="linearGradient66225-48">
+      <stop id="stop66227-8" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.36715987" id="stop66229-2"/>
+      <stop id="stop66231-4" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66241-5" id="linearGradient143013-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0000924,0,0,0.99425392,1135.9347,-636.45507)" x1="300.41592" y1="7825.5479" x2="390.40842" y2="7829.3926"/>
+    <linearGradient id="linearGradient66241-5">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop66243-17"/>
+      <stop id="stop66245-1" offset="0.47634247" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop66247-1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66225-48" id="linearGradient143015-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-110,0)" x1="579.40479" y1="7867.4097" x2="720.3927" y2="7858.3389"/>
+    <linearGradient id="linearGradient139558">
+      <stop id="stop139560" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.36715987" id="stop139562"/>
+      <stop id="stop139564" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66273-7" id="linearGradient143017-2" gradientUnits="userSpaceOnUse" gradientTransform="translate(1135.7692,-717.08144)" x1="474.88556" y1="7726.3086" x2="476.6871" y2="7758.7476"/>
+    <linearGradient id="linearGradient66273-7">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop66275-61"/>
+      <stop id="stop66277-42" offset="0.45602524" style="stop-color:#bbbbbb;stop-opacity:1;"/>
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop66279-3"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143019-2" gradientUnits="userSpaceOnUse" gradientTransform="translate(1135.7692,-717.08144)" x1="409.33176" y1="7726.3315" x2="476.6871" y2="7758.7476"/>
+    <linearGradient id="linearGradient66349-2">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop66351-1-5"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop66353-6"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143021-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-357.88577)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139576">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139578"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139580"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141936-57" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143023-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-337.46971)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139584">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139586"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139588"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141931-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143025-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-346.74423)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139592">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139594"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139596"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141922-9" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143027-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-328.15092)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139600">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139602"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139604"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141917-79" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143029-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-397.2195)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139608">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139610"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139612"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141908-43" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143031-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-376.86594)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139616">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139618"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139620"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141903-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143033-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-386.14058)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139624">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139626"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139628"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141894-3" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143035-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-367.54727)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139632">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139634"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139636"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141889-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143037-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-436.67825)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139640">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139642"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139644"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141880-3" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143039-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-416.26231)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139648">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139650"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139652"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141875-7" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143041-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-425.53683)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139656">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139658"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139660"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141866-27" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143043-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-406.94365)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139664">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139666"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139668"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141861-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143045-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-476.1371)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139672">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139674"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139676"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141852-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143047-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-455.65867)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139680">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139682"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139684"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141847-8" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143049-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-464.93331)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139688">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139690"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139692"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141838-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143051-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-446.33988)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139696">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139698"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139700"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141833-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143053-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-515.47093)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139704">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139706"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139708"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141824-6" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143055-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-495.05499)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139712">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139714"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139716"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141819-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143057-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-504.32964)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139720">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139722"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139724"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141206-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143059-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-485.73621)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139728">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139730"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139732"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141201-5" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143061-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-554.80491)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139736">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139738"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139740"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141810-9" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143063-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-534.45123)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139744">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139746"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139748"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141805-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143065-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-543.72587)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139752">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139754"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139756"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141796-1" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143067-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-525.13268)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139760">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139762"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139764"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141791-8" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143069-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-594.26378)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139768">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139770"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139772"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141064-3" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143071-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-573.8476)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139776">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139778"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139780"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141059-46" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143073-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-583.12224)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139784">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139786"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139788"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141092-6" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143075-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-564.52881)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139792">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139794"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139796"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141087-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143077-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-633.47251)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139800">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139802"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139804"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141008-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143079-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-613.24408)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139808">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139810"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139812"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141003-63" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143081-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-622.51847)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139816">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139818"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139820"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141036-8" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143083-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-603.92529)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139824">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139826"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139828"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141031-2" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143085-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-653.29573)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139832">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139834"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139836"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140795-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143087-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-642.21669)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139840">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139842"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139844"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140809-5" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143089-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-692.75456)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139848">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139850"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139852"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141120-8" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143091-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-672.33838)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139856">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139858"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139860"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141115-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143093-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-681.61304)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139864">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139866"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139868"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141782-63" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143095-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-663.01961)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139872">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139874"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139876"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141777-1" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143097-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-731.96328)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139880">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139882"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139884"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141768-4" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143099-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-711.73485)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139888">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139890"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139892"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141763-0" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143101-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-721.00927)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139896">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139898"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139900"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect141754-7" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143103-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-702.41609)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139904">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139906"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139908"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect141749-7" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient80069-6" id="linearGradient143105-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,1.0027998,808.355,6382.2297)" x1="618.53314" y1="622.74634" x2="691.36908" y2="1092.4669"/>
+    <linearGradient id="linearGradient80069-6">
+      <stop id="stop80071-0" offset="0" style="stop-color:#000000;stop-opacity:1;"/>
+      <stop style="stop-color:#bbbbbb;stop-opacity:1;" offset="0.26005435" id="stop80073-1"/>
+      <stop id="stop80075-6" offset="1" style="stop-color:#000000;stop-opacity:1;"/>
+    </linearGradient>
+    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter46858-5-0-7" x="-0.017784396" width="1.0355688" y="-0.21916859" height="1.4383372">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="1.1502059" id="feGaussianBlur46860-75-0-5"/>
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter138305-4"
-       x="-0.22026432"
-       width="1.4405286"
-       y="-0.030036043"
-       height="1.0600721"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2312775"
-         id="feGaussianBlur138307-12" />
+    <filter inkscape:collect="always" id="filter138305-4" x="-0.22026432" width="1.4405286" y="-0.030036043" height="1.0600721" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="5.2312775" id="feGaussianBlur138307-12"/>
     </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143109-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-357.88577)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139921">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139923" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139925" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect139927"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143111-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-337.46971)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139930">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139932" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139934" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect139936"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143113-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-346.74423)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139939">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139941" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139943" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect139945"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143115-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-328.15092)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139948">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139950" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139952" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect139954"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143117-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-397.2195)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139957">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139959" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139961" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect139963"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143119-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-376.86594)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139966">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139968" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139970" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect139972"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143121-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-386.14058)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139975">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139977" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139979" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect139981"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143123-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-367.54727)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139984">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139986" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139988" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect139990"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143125-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-436.67825)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient139993">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop139995" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop139997" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect139999"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143127-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-416.26231)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140002">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140004" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140006" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140008"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143129-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-425.53683)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140011">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140013" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140015" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140017"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143131-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-406.94365)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140020">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140022" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140024" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140026"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143133-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-476.1371)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140029">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140031" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140033" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140035"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143135-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-455.65867)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140038">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140040" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140042" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140044"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143137-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-464.93331)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140047">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140049" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140051" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140053"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143139-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-446.33988)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140056">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140058" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140060" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140062"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143141-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-515.47093)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140065">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140067" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140069" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140071"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143143-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-495.05499)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140074">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140076" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140078" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140080"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143145-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-504.32964)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140083">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140085" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140087" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140089"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143147-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-485.73621)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140092">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140094" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140096" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140098"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143149-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-554.80491)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140101">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140103" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140105" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140107"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143151-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-534.45123)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140110">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140112" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140114" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140116"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143153-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-543.72587)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140119">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140121" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140123" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140125"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143155-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-525.13268)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140128">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140130" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140132" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140134"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143157-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-594.26378)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140137">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140139" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140141" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140143"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143159-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-573.8476)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140146">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140148" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140150" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140152"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143161-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-583.12224)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140155">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140157" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140159" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140161"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143163-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-564.52881)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140164">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140166" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140168" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140170"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143165-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-633.47251)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140173">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140175" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140177" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140179"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143167-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-613.24408)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140182">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140184" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140186" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140188"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143169-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-622.51847)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140191">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140193" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140195" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140197"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143171-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-603.92529)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140200">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140202" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140204" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140206"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143173-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-653.29573)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140209">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140211" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140213" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140215"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143175-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-642.21669)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140218">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140220" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140222" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140224"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143177-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-692.75456)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140227">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140229" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140231" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140233"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143179-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-672.33838)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140236">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140238" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140240" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140242"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143181-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-681.61304)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140245">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140247" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140249" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140251"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143183-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-663.01961)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140254">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140256" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140258" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140260"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143185-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-731.96328)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140263">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140265" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140267" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140269"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143187-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-711.73485)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140272">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140274" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140276" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140278"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143189-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-721.00927)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140281">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140283" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140285" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect140287"
-       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient66349-2"
-       id="linearGradient143191-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1973.5876,-702.41609)"
-       x1="387.34131"
-       y1="7751.168"
-       x2="364.46631"
-       y2="7759.793" />
-    <linearGradient
-       id="linearGradient140290">
-      <stop
-         style="stop-color:#1a1a1a;stop-opacity:1;"
-         offset="0"
-         id="stop140292" />
-      <stop
-         style="stop-color:#515151;stop-opacity:1;"
-         offset="1"
-         id="stop140294" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect140296"
-       is_visible="true" />
-    <filter
-       inkscape:collect="always"
-       id="filter142702-4"
-       x="-0.40059263"
-       width="1.8011853"
-       y="-0.054626267"
-       height="1.1092525"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="9.5140751"
-         id="feGaussianBlur142704-0" />
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143109-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-357.88577)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139921">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139923"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139925"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect139927" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143111-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-337.46971)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139930">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139932"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139934"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect139936" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143113-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-346.74423)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139939">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139941"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139943"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect139945" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143115-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-328.15092)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139948">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139950"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139952"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect139954" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143117-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-397.2195)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139957">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139959"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139961"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect139963" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143119-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-376.86594)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139966">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139968"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139970"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect139972" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143121-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-386.14058)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139975">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139977"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139979"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect139981" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143123-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-367.54727)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139984">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139986"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139988"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect139990" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143125-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-436.67825)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient139993">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop139995"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop139997"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect139999" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143127-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-416.26231)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140002">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140004"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140006"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140008" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143129-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-425.53683)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140011">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140013"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140015"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140017" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143131-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-406.94365)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140020">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140022"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140024"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140026" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143133-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-476.1371)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140029">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140031"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140033"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140035" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143135-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-455.65867)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140038">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140040"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140042"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140044" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143137-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-464.93331)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140047">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140049"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140051"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140053" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143139-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-446.33988)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140056">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140058"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140060"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140062" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143141-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-515.47093)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140065">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140067"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140069"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140071" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143143-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-495.05499)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140074">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140076"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140078"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140080" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143145-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-504.32964)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140083">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140085"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140087"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140089" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143147-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-485.73621)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140092">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140094"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140096"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140098" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143149-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-554.80491)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140101">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140103"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140105"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140107" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143151-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-534.45123)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140110">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140112"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140114"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140116" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143153-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-543.72587)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140119">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140121"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140123"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140125" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143155-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-525.13268)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140128">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140130"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140132"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140134" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143157-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-594.26378)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140137">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140139"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140141"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140143" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143159-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-573.8476)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140146">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140148"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140150"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140152" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143161-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-583.12224)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140155">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140157"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140159"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140161" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143163-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-564.52881)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140164">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140166"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140168"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140170" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143165-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-633.47251)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140173">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140175"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140177"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140179" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143167-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-613.24408)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140182">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140184"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140186"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140188" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143169-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-622.51847)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140191">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140193"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140195"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140197" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143171-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-603.92529)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140200">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140202"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140204"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140206" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143173-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-653.29573)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140209">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140211"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140213"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140215" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143175-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-642.21669)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140218">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140220"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140222"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140224" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143177-8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-692.75456)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140227">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140229"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140231"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140233" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143179-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-672.33838)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140236">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140238"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140240"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140242" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143181-5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-681.61304)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140245">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140247"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140249"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140251" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143183-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-663.01961)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140254">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140256"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140258"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140260" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143185-2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-731.96328)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140263">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140265"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140267"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140269" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143187-0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-711.73485)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140272">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140274"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140276"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140278" is_visible="true"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143189-1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-721.00927)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140281">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140283"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140285"/>
+    </linearGradient>
+    <inkscape:path-effect is_visible="true" id="path-effect140287" effect="spiro"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient66349-2" id="linearGradient143191-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,1973.5876,-702.41609)" x1="387.34131" y1="7751.168" x2="364.46631" y2="7759.793"/>
+    <linearGradient id="linearGradient140290">
+      <stop style="stop-color:#1a1a1a;stop-opacity:1;" offset="0" id="stop140292"/>
+      <stop style="stop-color:#515151;stop-opacity:1;" offset="1" id="stop140294"/>
+    </linearGradient>
+    <inkscape:path-effect effect="spiro" id="path-effect140296" is_visible="true"/>
+    <filter inkscape:collect="always" id="filter142702-4" x="-0.40059263" width="1.8011853" y="-0.054626267" height="1.1092525" color-interpolation-filters="sRGB">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="9.5140751" id="feGaussianBlur142704-0"/>
     </filter>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-63.432235"
-     inkscape:cy="342.18752"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="471"
-     inkscape:window-height="431"
-     inkscape:window-x="110"
-     inkscape:window-y="145"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata140433">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-63.432235" inkscape:cy="342.18752" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="471" inkscape:window-height="431" inkscape:window-x="110" inkscape:window-y="145" inkscape:window-maximized="0"/>
+  <metadata id="metadata140433">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-438.43224,-412.9572)">
-    <g
-       style="display:inline"
-       id="g19900"
-       transform="matrix(0.94319853,0,0,0.94319853,218.81481,-969.97064)"
-       inkscape:export-filename="C:\Documents and Settings\Elvis Čauss\Desktop\Zabbix Frontend\Default map icons\Large\Rack_42_with_door.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         id="g108266"
-         transform="matrix(1.0602222,0,0,1.0602222,-1110.4064,-6455.8326)">
-        <g
-           id="g70695"
-           transform="translate(0,0.55091405)">
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 1304.9382,7475.1746 55.0957,0 0.8444,420.1633 -56.1028,0 z"
-             style="fill:url(#linearGradient108822-7);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.95733708"
-             id="path91059" />
-          <path
-             sodipodi:nodetypes="cccccccccc"
-             inkscape:connector-curvature="0"
-             id="rect107153"
-             d="m 1391.8009,7481.6978 0,426.3386 84,15.7398 0,-430.5869 z m 9.1875,11.5158 58.5625,7.9556 0,408.4477 -58.5625,-12.2037 z"
-             style="fill:url(#linearGradient108994-9);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-          <path
-             sodipodi:nodetypes="ccccc"
-             inkscape:connector-curvature="0"
-             d="m 1401.0059,7493.1927 58.5442,7.9765 0,408.4465 -58.5442,-12.2097 z"
-             style="opacity:0.32682926;fill:#72748e;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:1.00066757"
-             id="path107159" />
-          <path
-             sodipodi:nodetypes="sscccs"
-             inkscape:connector-curvature="0"
-             id="path107162"
-             d="m 1456.3634,7755.2702 c -30.4609,0 -55.1563,56.7343 -55.1563,126.7315 0,4.2789 0.1011,11.07 0.2813,15.2398 l 58.0625,12.11 0,-153.8623 c -1.0537,-0.1378 -2.1188,-0.219 -3.1875,-0.219 z"
-             style="opacity:0.32682926;fill:url(#linearGradient108996-5);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-438.43224,-412.9572)">
+    <g style="display:inline" id="g19900" transform="matrix(0.94319853,0,0,0.94319853,218.81481,-969.97064)">
+      <g id="g108266" transform="matrix(1.0602222,0,0,1.0602222,-1110.4064,-6455.8326)">
+        <g id="g70695" transform="translate(0,0.55091405)">
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 1304.9382,7475.1746 55.0957,0 0.8444,420.1633 -56.1028,0 z" style="fill:url(#linearGradient108822-7);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.95733708" id="path91059"/>
+          <path sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" id="rect107153" d="m 1391.8009,7481.6978 0,426.3386 84,15.7398 0,-430.5869 z m 9.1875,11.5158 58.5625,7.9556 0,408.4477 -58.5625,-12.2037 z" style="fill:url(#linearGradient108994-9);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+          <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 1401.0059,7493.1927 58.5442,7.9765 0,408.4465 -58.5442,-12.2097 z" style="opacity:0.32682926;fill:#72748e;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:1.00066757" id="path107159"/>
+          <path sodipodi:nodetypes="sscccs" inkscape:connector-curvature="0" id="path107162" d="m 1456.3634,7755.2702 c -30.4609,0 -55.1563,56.7343 -55.1563,126.7315 0,4.2789 0.1011,11.07 0.2813,15.2398 l 58.0625,12.11 0,-153.8623 c -1.0537,-0.1378 -2.1188,-0.219 -3.1875,-0.219 z" style="opacity:0.32682926;fill:url(#linearGradient108996-5);fill-opacity:1;fill-rule:nonzero;stroke:none"/>
         </g>
       </g>
-      <g
-         transform="matrix(1.0602222,0,0,1.0602222,-1345.1077,-5963.6141)"
-         id="g142706-6">
-        <g
-           transform="matrix(0.63739135,0,0,0.63739135,1346.8375,2254.9771)"
-           id="g135315-1">
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path135317-8"
-             sodipodi:cx="369.02136"
-             sodipodi:cy="8116.7231"
-             sodipodi:rx="4.8613591"
-             sodipodi:ry="4.596179"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z"
-             style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path135319-9"
-             sodipodi:nodetypes="cccccccc" />
-          <path
-             id="path135321-8"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc" />
-          <path
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             sodipodi:ry="4.596179"
-             sodipodi:rx="4.8613591"
-             sodipodi:cy="8116.7231"
-             sodipodi:cx="369.02136"
-             id="path135323-4"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+      <g transform="matrix(1.0602222,0,0,1.0602222,-1345.1077,-5963.6141)" id="g142706-6">
+        <g transform="matrix(0.63739135,0,0,0.63739135,1346.8375,2254.9771)" id="g135315-1">
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path135317-8" sodipodi:cx="369.02136" sodipodi:cy="8116.7231" sodipodi:rx="4.8613591" sodipodi:ry="4.596179" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)"/>
+          <path inkscape:connector-curvature="0" d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135319-9" sodipodi:nodetypes="cccccccc"/>
+          <path id="path135321-8" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+          <path transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" sodipodi:ry="4.596179" sodipodi:rx="4.8613591" sodipodi:cy="8116.7231" sodipodi:cx="369.02136" id="path135323-4" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
         </g>
-        <path
-           inkscape:connector-curvature="0"
-           d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z"
-           style="opacity:0.23414636;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343-1)"
-           transform="matrix(0.54007273,0,0,0.54007273,1382.7241,3055.6875)"
-           id="path135325-1" />
-        <g
-           id="g135327-4"
-           transform="matrix(0.63739135,0,0,0.63739135,1289.2083,2254.9771)">
-          <path
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             sodipodi:ry="4.596179"
-             sodipodi:rx="4.8613591"
-             sodipodi:cy="8116.7231"
-             sodipodi:cx="369.02136"
-             id="path135329-3"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:nodetypes="cccccccc"
-             id="path135331-9"
-             style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccccc"
-             inkscape:connector-curvature="0"
-             d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path135333-8" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path135335-8"
-             sodipodi:cx="369.02136"
-             sodipodi:cy="8116.7231"
-             sodipodi:rx="4.8613591"
-             sodipodi:ry="4.596179"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)" />
+        <path inkscape:connector-curvature="0" d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z" style="opacity:0.23414636;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343-1)" transform="matrix(0.54007273,0,0,0.54007273,1382.7241,3055.6875)" id="path135325-1"/>
+        <g id="g135327-4" transform="matrix(0.63739135,0,0,0.63739135,1289.2083,2254.9771)">
+          <path transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" sodipodi:ry="4.596179" sodipodi:rx="4.8613591" sodipodi:cy="8116.7231" sodipodi:cx="369.02136" id="path135329-3" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+          <path sodipodi:nodetypes="cccccccc" id="path135331-9" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135333-8"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path135335-8" sodipodi:cx="369.02136" sodipodi:cy="8116.7231" sodipodi:rx="4.8613591" sodipodi:ry="4.596179" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)"/>
         </g>
-        <path
-           sodipodi:nodetypes="cccsscc"
-           inkscape:connector-curvature="0"
-           d="m 431.92283,8122.0833 99.31824,1.6642 67.58968,17.3456 c -3.39724,0.01 90.75124,8.1417 87.41129,8.1447 -3.33995,0 -105.41853,-6.7075 -108.70649,-6.7075 -74.5934,0.023 -136.484,-0.4687 -216.49417,-0.6659 z"
-           style="opacity:0.43487806;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66323-4)"
-           id="path135339-0"
-           transform="matrix(0.56559402,0,0,1,1288.6077,-682.85102)" />
-        <path
-           id="path135337-8"
-           transform="matrix(0.54007273,0,0,0.54007273,1325.0949,3055.4875)"
-           style="opacity:0.2585366;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343-1)"
-           d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g135341-7"
-           transform="translate(1228.1279,-684.79556)">
-          <path
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             sodipodi:ry="4.596179"
-             sodipodi:rx="4.8613591"
-             sodipodi:cy="8116.7231"
-             sodipodi:cx="369.02136"
-             id="path135343-7"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:nodetypes="cccccccc"
-             id="path135345-8"
-             style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="ccccccc"
-             inkscape:connector-curvature="0"
-             d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path135347-3" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path135349-8"
-             sodipodi:cx="369.02136"
-             sodipodi:cy="8116.7231"
-             sodipodi:rx="4.8613591"
-             sodipodi:ry="4.596179"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)" />
+        <path sodipodi:nodetypes="cccsscc" inkscape:connector-curvature="0" d="m 431.92283,8122.0833 99.31824,1.6642 67.58968,17.3456 c -3.39724,0.01 90.75124,8.1417 87.41129,8.1447 -3.33995,0 -105.41853,-6.7075 -108.70649,-6.7075 -74.5934,0.023 -136.484,-0.4687 -216.49417,-0.6659 z" style="opacity:0.43487806;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66323-4)" id="path135339-0" transform="matrix(0.56559402,0,0,1,1288.6077,-682.85102)"/>
+        <path id="path135337-8" transform="matrix(0.54007273,0,0,0.54007273,1325.0949,3055.4875)" style="opacity:0.2585366;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343-1)" d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z" inkscape:connector-curvature="0"/>
+        <g id="g135341-7" transform="translate(1228.1279,-684.79556)">
+          <path transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" sodipodi:ry="4.596179" sodipodi:rx="4.8613591" sodipodi:cy="8116.7231" sodipodi:cx="369.02136" id="path135343-7" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+          <path sodipodi:nodetypes="cccccccc" id="path135345-8" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135347-3"/>
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path135349-8" sodipodi:cx="369.02136" sodipodi:cy="8116.7231" sodipodi:rx="4.8613591" sodipodi:ry="4.596179" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)"/>
         </g>
-        <g
-           transform="translate(1140.728,-684.79556)"
-           id="g135351-3">
-          <path
-             sodipodi:type="arc"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path135353-7"
-             sodipodi:cx="369.02136"
-             sodipodi:cy="8116.7231"
-             sodipodi:rx="4.8613591"
-             sodipodi:ry="4.596179"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)" />
-          <path
-             inkscape:connector-curvature="0"
-             d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z"
-             style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path135355-1"
-             sodipodi:nodetypes="cccccccc" />
-          <path
-             id="path135357-0"
-             style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc" />
-          <path
-             transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)"
-             d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z"
-             sodipodi:ry="4.596179"
-             sodipodi:rx="4.8613591"
-             sodipodi:cy="8116.7231"
-             sodipodi:cx="369.02136"
-             id="path135359-7"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+        <g transform="translate(1140.728,-684.79556)" id="g135351-3">
+          <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path135353-7" sodipodi:cx="369.02136" sodipodi:cy="8116.7231" sodipodi:rx="4.8613591" sodipodi:ry="4.596179" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" transform="matrix(1.2354241,0.13873004,0,1.3930271,-83.585188,-3224.0364)"/>
+          <path inkscape:connector-curvature="0" d="m 372.71632,8123.7053 4.875,-0.125 0,11.65 -1.87747,1.1049 -6.37253,-1.1049 3.1175,-3.8381 -1.44813,-6.7264 z" style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135355-1" sodipodi:nodetypes="cccccccc"/>
+          <path id="path135357-0" style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 370.96632,8131.7053 0,-7 4.75,0 0,11.65 -8.25,0 0,-4.8749 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
+          <path transform="matrix(1.2354241,0.13873004,0,1.3930271,-87.120722,-3221.208)" d="m 373.88272,8116.7231 c 0,2.5384 -2.1765,4.5962 -4.86136,4.5962 -2.68485,0 -4.86136,-2.0578 -4.86136,-4.5962 0,-2.5384 2.17651,-4.5961 4.86136,-4.5961 2.68486,0 4.86136,2.0577 4.86136,4.5961 z" sodipodi:ry="4.596179" sodipodi:rx="4.8613591" sodipodi:cy="8116.7231" sodipodi:cx="369.02136" id="path135359-7" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
         </g>
-        <path
-           id="path135363-3"
-           style="fill:url(#linearGradient143011-9);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a"
-           d="m 1526.2714,7431.6294 55.144,-0.031 31.7889,12.1367 -117.8079,-0.2811 z"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path135365-4"
-           style="fill:url(#linearGradient143013-5);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.99716866"
-           d="m 1526.3792,7011.5151 -30.6294,6.9705 -0.1547,424.6692 30.7841,-11.5409 z" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z"
-           style="opacity:0.32682926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343-1)"
-           transform="matrix(0.84731732,0,0,0.84731732,1197.0303,570.1794)"
-           id="path135367-9" />
-        <path
-           id="path135369-6"
-           transform="matrix(0.84731732,0,0,0.84731732,1285.0125,570.533)"
-           style="opacity:0.32682926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343-1)"
-           d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z"
-           inkscape:connector-curvature="0" />
-        <g
-           transform="translate(1118.9076,-682.85102)"
-           id="g135371-5">
-          <path
-             d="m 462.33373,7693.9469 31.63259,7.4781 0,424.8797 -31.63259,-11.8555 z"
-             style="fill:url(#linearGradient143015-5);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a"
-             id="path135373-1"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
+        <path id="path135363-3" style="fill:url(#linearGradient143011-9);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a" d="m 1526.2714,7431.6294 55.144,-0.031 31.7889,12.1367 -117.8079,-0.2811 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path135365-4" style="fill:url(#linearGradient143013-5);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.99716866" d="m 1526.3792,7011.5151 -30.6294,6.9705 -0.1547,424.6692 30.7841,-11.5409 z"/>
+        <path inkscape:connector-curvature="0" d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z" style="opacity:0.32682926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343-1)" transform="matrix(0.84731732,0,0,0.84731732,1197.0303,570.1794)" id="path135367-9"/>
+        <path id="path135369-6" transform="matrix(0.84731732,0,0,0.84731732,1285.0125,570.533)" style="opacity:0.32682926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter66343-1)" d="m 381.83767,8127.6831 c 0,1.5621 -4.43216,2.8284 -9.8995,2.8284 -5.46734,0 -9.89949,-1.2663 -9.89949,-2.8284 0,-1.5621 4.43215,-2.8284 9.89949,-2.8284 5.46734,0 9.8995,1.2663 9.8995,2.8284 z" inkscape:connector-curvature="0"/>
+        <g transform="translate(1118.9076,-682.85102)" id="g135371-5">
+          <path d="m 462.33373,7693.9469 31.63259,7.4781 0,424.8797 -31.63259,-11.8555 z" style="fill:url(#linearGradient143015-5);fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a" id="path135373-1" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
         </g>
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 1526.6117,7010.9999 54.452,0 32.0506,7.4773 -117.7179,-0.016 z"
-           style="fill:url(#linearGradient143017-2);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient143019-2)"
-           id="path135375-0" />
-        <g
-           id="g141938-9">
-          <path
-             style="fill:none;stroke:url(#linearGradient143021-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7403.2821 -30.125,-8.8591"
-             id="path135391-9"
-             inkscape:path-effect="#path-effect141936-57"
-             inkscape:original-d="m 1612.1213,7403.2821 -30.125,-8.8591"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7422.9802 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141931-1"
-             id="path135393-6"
-             d="m 1612.1213,7422.9802 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143023-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7413.1312 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141922-9"
-             id="path135405-8"
-             d="m 1612.1213,7413.1312 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143025-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143027-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7432.8294 -30.125,-8.8849"
-             id="path135407-3"
-             inkscape:path-effect="#path-effect141917-79"
-             inkscape:original-d="m 1612.1213,7432.8294 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7363.8858 -30.125,-8.7966"
-             inkscape:path-effect="#path-effect141908-43"
-             id="path135421-4"
-             d="m 1612.1213,7363.8858 -30.125,-8.7966"
-             style="fill:none;stroke:url(#linearGradient143029-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143031-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7383.584 -30.125,-8.9469"
-             id="path135423-8"
-             inkscape:path-effect="#path-effect141903-2"
-             inkscape:original-d="m 1612.1213,7383.584 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143033-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7373.7348 -30.125,-8.8457"
-             id="path135435-4"
-             inkscape:path-effect="#path-effect141894-3"
-             inkscape:original-d="m 1612.1213,7373.7348 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7393.433 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141889-1"
-             id="path135437-9"
-             d="m 1612.1213,7393.433 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143035-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7324.4895 -30.125,-8.859"
-             inkscape:path-effect="#path-effect141880-3"
-             id="path135453-9"
-             d="m 1612.1213,7324.4895 -30.125,-8.859"
-             style="fill:none;stroke:url(#linearGradient143037-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143039-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7344.1876 -30.125,-8.9469"
-             id="path135455-2"
-             inkscape:path-effect="#path-effect141875-7"
-             inkscape:original-d="m 1612.1213,7344.1876 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143041-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7334.3386 -30.125,-8.8457"
-             id="path135467-5"
-             inkscape:path-effect="#path-effect141866-27"
-             inkscape:original-d="m 1612.1213,7334.3386 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7354.0367 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141861-9"
-             id="path135469-5"
-             d="m 1612.1213,7354.0367 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143043-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143045-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1611.9963,7285.0931 -30,-8.9216"
-             id="path135483-3"
-             inkscape:path-effect="#path-effect141852-1"
-             inkscape:original-d="m 1611.9963,7285.0931 -30,-8.9216"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7304.7913 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141847-8"
-             id="path135485-3"
-             d="m 1612.1213,7304.7913 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143047-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7294.9421 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141838-5"
-             id="path135497-3"
-             d="m 1612.1213,7294.9421 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143049-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143051-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7314.6404 -30.125,-8.8849"
-             id="path135499-7"
-             inkscape:path-effect="#path-effect141833-2"
-             inkscape:original-d="m 1612.1213,7314.6404 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7245.6968 -30.125,-8.8591"
-             inkscape:path-effect="#path-effect141824-6"
-             id="path135515-4"
-             d="m 1612.1213,7245.6968 -30.125,-8.8591"
-             style="fill:none;stroke:url(#linearGradient143053-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143055-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7265.395 -30.125,-8.9469"
-             id="path135517-3"
-             inkscape:path-effect="#path-effect141819-2"
-             inkscape:original-d="m 1612.1213,7265.395 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143057-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7255.5458 -30.125,-8.8457"
-             id="path135529-8"
-             inkscape:path-effect="#path-effect141206-8"
-             inkscape:original-d="m 1612.1213,7255.5458 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7275.2441 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141201-5"
-             id="path135531-0"
-             d="m 1612.1213,7275.2441 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143059-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143061-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7206.3004 -30.125,-8.7966"
-             id="path135545-8"
-             inkscape:path-effect="#path-effect141810-9"
-             inkscape:original-d="m 1612.1213,7206.3004 -30.125,-8.7966"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7225.9987 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141805-0"
-             id="path135547-8"
-             d="m 1612.1213,7225.9987 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143063-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7216.1496 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141796-1"
-             id="path135559-0"
-             d="m 1612.1213,7216.1496 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143065-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143067-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7235.8476 -30.125,-8.8849"
-             id="path135561-6"
-             inkscape:path-effect="#path-effect141791-8"
-             inkscape:original-d="m 1612.1213,7235.8476 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143069-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7166.9041 -30.125,-8.8591"
-             id="path135577-8"
-             inkscape:path-effect="#path-effect141064-3"
-             inkscape:original-d="m 1612.1213,7166.9041 -30.125,-8.8591"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7186.6024 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141059-46"
-             id="path135579-1"
-             d="m 1612.1213,7186.6024 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143071-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7176.7532 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141092-6"
-             id="path135591-9"
-             d="m 1612.1213,7176.7532 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143073-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143075-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7196.4515 -30.125,-8.8849"
-             id="path135593-8"
-             inkscape:path-effect="#path-effect141087-1"
-             inkscape:original-d="m 1612.1213,7196.4515 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7127.5078 -30.125,-8.6716"
-             inkscape:path-effect="#path-effect141008-4"
-             id="path135607-9"
-             d="m 1612.1213,7127.5078 -30.125,-8.6716"
-             style="fill:none;stroke:url(#linearGradient143077-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143079-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7147.206 -30.125,-8.9469"
-             id="path135609-7"
-             inkscape:path-effect="#path-effect141003-63"
-             inkscape:original-d="m 1612.1213,7147.206 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143081-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7137.3569 -30.125,-8.8457"
-             id="path135621-2"
-             inkscape:path-effect="#path-effect141036-8"
-             inkscape:original-d="m 1612.1213,7137.3569 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7157.055 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141031-2"
-             id="path135623-2"
-             d="m 1612.1213,7157.055 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143083-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7107.8096 -30.125,-8.7966"
-             inkscape:path-effect="#path-effect140795-1"
-             id="path135639-8"
-             d="m 1612.1213,7107.8096 -30.125,-8.7966"
-             style="fill:none;stroke:url(#linearGradient143085-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143087-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7117.6587 -30.125,-8.8457"
-             id="path135649-2"
-             inkscape:path-effect="#path-effect140809-5"
-             inkscape:original-d="m 1612.1213,7117.6587 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7068.4132 -30.125,-8.8591"
-             inkscape:path-effect="#path-effect141120-8"
-             id="path135665-8"
-             d="m 1612.1213,7068.4132 -30.125,-8.8591"
-             style="fill:none;stroke:url(#linearGradient143089-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143091-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7088.1116 -30.125,-8.9469"
-             id="path135667-9"
-             inkscape:path-effect="#path-effect141115-0"
-             inkscape:original-d="m 1612.1213,7088.1116 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143093-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7078.2624 -30.125,-8.8457"
-             id="path135679-0"
-             inkscape:path-effect="#path-effect141782-63"
-             inkscape:original-d="m 1612.1213,7078.2624 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7097.9607 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141777-1"
-             id="path135681-7"
-             d="m 1612.1213,7097.9607 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143095-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143097-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7029.017 -30.125,-8.6716"
-             id="path135695-8"
-             inkscape:path-effect="#path-effect141768-4"
-             inkscape:original-d="m 1612.1213,7029.017 -30.125,-8.6716"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7048.7152 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141763-0"
-             id="path135697-1"
-             d="m 1612.1213,7048.7152 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143099-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7038.8661 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141754-7"
-             id="path135709-5"
-             d="m 1612.1213,7038.8661 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143101-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143103-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7058.5642 -30.125,-8.8849"
-             id="path135711-8"
-             inkscape:path-effect="#path-effect141749-7"
-             inkscape:original-d="m 1612.1213,7058.5642 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 1526.6117,7010.9999 54.452,0 32.0506,7.4773 -117.7179,-0.016 z" style="fill:url(#linearGradient143017-2);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient143019-2)" id="path135375-0"/>
+        <g id="g141938-9">
+          <path style="fill:none;stroke:url(#linearGradient143021-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7403.2821 -30.125,-8.8591" id="path135391-9" inkscape:path-effect="#path-effect141936-57" inkscape:original-d="m 1612.1213,7403.2821 -30.125,-8.8591" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7422.9802 -30.125,-8.9469" inkscape:path-effect="#path-effect141931-1" id="path135393-6" d="m 1612.1213,7422.9802 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143023-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7413.1312 -30.125,-8.8457" inkscape:path-effect="#path-effect141922-9" id="path135405-8" d="m 1612.1213,7413.1312 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143025-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143027-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7432.8294 -30.125,-8.8849" id="path135407-3" inkscape:path-effect="#path-effect141917-79" inkscape:original-d="m 1612.1213,7432.8294 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7363.8858 -30.125,-8.7966" inkscape:path-effect="#path-effect141908-43" id="path135421-4" d="m 1612.1213,7363.8858 -30.125,-8.7966" style="fill:none;stroke:url(#linearGradient143029-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143031-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7383.584 -30.125,-8.9469" id="path135423-8" inkscape:path-effect="#path-effect141903-2" inkscape:original-d="m 1612.1213,7383.584 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143033-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7373.7348 -30.125,-8.8457" id="path135435-4" inkscape:path-effect="#path-effect141894-3" inkscape:original-d="m 1612.1213,7373.7348 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7393.433 -30.125,-8.8849" inkscape:path-effect="#path-effect141889-1" id="path135437-9" d="m 1612.1213,7393.433 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143035-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7324.4895 -30.125,-8.859" inkscape:path-effect="#path-effect141880-3" id="path135453-9" d="m 1612.1213,7324.4895 -30.125,-8.859" style="fill:none;stroke:url(#linearGradient143037-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143039-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7344.1876 -30.125,-8.9469" id="path135455-2" inkscape:path-effect="#path-effect141875-7" inkscape:original-d="m 1612.1213,7344.1876 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143041-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7334.3386 -30.125,-8.8457" id="path135467-5" inkscape:path-effect="#path-effect141866-27" inkscape:original-d="m 1612.1213,7334.3386 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7354.0367 -30.125,-8.8849" inkscape:path-effect="#path-effect141861-9" id="path135469-5" d="m 1612.1213,7354.0367 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143043-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143045-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1611.9963,7285.0931 -30,-8.9216" id="path135483-3" inkscape:path-effect="#path-effect141852-1" inkscape:original-d="m 1611.9963,7285.0931 -30,-8.9216" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7304.7913 -30.125,-8.9469" inkscape:path-effect="#path-effect141847-8" id="path135485-3" d="m 1612.1213,7304.7913 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143047-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7294.9421 -30.125,-8.8457" inkscape:path-effect="#path-effect141838-5" id="path135497-3" d="m 1612.1213,7294.9421 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143049-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143051-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7314.6404 -30.125,-8.8849" id="path135499-7" inkscape:path-effect="#path-effect141833-2" inkscape:original-d="m 1612.1213,7314.6404 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7245.6968 -30.125,-8.8591" inkscape:path-effect="#path-effect141824-6" id="path135515-4" d="m 1612.1213,7245.6968 -30.125,-8.8591" style="fill:none;stroke:url(#linearGradient143053-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143055-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7265.395 -30.125,-8.9469" id="path135517-3" inkscape:path-effect="#path-effect141819-2" inkscape:original-d="m 1612.1213,7265.395 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143057-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7255.5458 -30.125,-8.8457" id="path135529-8" inkscape:path-effect="#path-effect141206-8" inkscape:original-d="m 1612.1213,7255.5458 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7275.2441 -30.125,-8.8849" inkscape:path-effect="#path-effect141201-5" id="path135531-0" d="m 1612.1213,7275.2441 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143059-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143061-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7206.3004 -30.125,-8.7966" id="path135545-8" inkscape:path-effect="#path-effect141810-9" inkscape:original-d="m 1612.1213,7206.3004 -30.125,-8.7966" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7225.9987 -30.125,-8.9469" inkscape:path-effect="#path-effect141805-0" id="path135547-8" d="m 1612.1213,7225.9987 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143063-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7216.1496 -30.125,-8.8457" inkscape:path-effect="#path-effect141796-1" id="path135559-0" d="m 1612.1213,7216.1496 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143065-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143067-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7235.8476 -30.125,-8.8849" id="path135561-6" inkscape:path-effect="#path-effect141791-8" inkscape:original-d="m 1612.1213,7235.8476 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143069-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7166.9041 -30.125,-8.8591" id="path135577-8" inkscape:path-effect="#path-effect141064-3" inkscape:original-d="m 1612.1213,7166.9041 -30.125,-8.8591" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7186.6024 -30.125,-8.9469" inkscape:path-effect="#path-effect141059-46" id="path135579-1" d="m 1612.1213,7186.6024 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143071-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7176.7532 -30.125,-8.8457" inkscape:path-effect="#path-effect141092-6" id="path135591-9" d="m 1612.1213,7176.7532 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143073-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143075-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7196.4515 -30.125,-8.8849" id="path135593-8" inkscape:path-effect="#path-effect141087-1" inkscape:original-d="m 1612.1213,7196.4515 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7127.5078 -30.125,-8.6716" inkscape:path-effect="#path-effect141008-4" id="path135607-9" d="m 1612.1213,7127.5078 -30.125,-8.6716" style="fill:none;stroke:url(#linearGradient143077-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143079-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7147.206 -30.125,-8.9469" id="path135609-7" inkscape:path-effect="#path-effect141003-63" inkscape:original-d="m 1612.1213,7147.206 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143081-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7137.3569 -30.125,-8.8457" id="path135621-2" inkscape:path-effect="#path-effect141036-8" inkscape:original-d="m 1612.1213,7137.3569 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7157.055 -30.125,-8.8849" inkscape:path-effect="#path-effect141031-2" id="path135623-2" d="m 1612.1213,7157.055 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143083-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7107.8096 -30.125,-8.7966" inkscape:path-effect="#path-effect140795-1" id="path135639-8" d="m 1612.1213,7107.8096 -30.125,-8.7966" style="fill:none;stroke:url(#linearGradient143085-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143087-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7117.6587 -30.125,-8.8457" id="path135649-2" inkscape:path-effect="#path-effect140809-5" inkscape:original-d="m 1612.1213,7117.6587 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7068.4132 -30.125,-8.8591" inkscape:path-effect="#path-effect141120-8" id="path135665-8" d="m 1612.1213,7068.4132 -30.125,-8.8591" style="fill:none;stroke:url(#linearGradient143089-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143091-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7088.1116 -30.125,-8.9469" id="path135667-9" inkscape:path-effect="#path-effect141115-0" inkscape:original-d="m 1612.1213,7088.1116 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143093-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7078.2624 -30.125,-8.8457" id="path135679-0" inkscape:path-effect="#path-effect141782-63" inkscape:original-d="m 1612.1213,7078.2624 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7097.9607 -30.125,-8.8849" inkscape:path-effect="#path-effect141777-1" id="path135681-7" d="m 1612.1213,7097.9607 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143095-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143097-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7029.017 -30.125,-8.6716" id="path135695-8" inkscape:path-effect="#path-effect141768-4" inkscape:original-d="m 1612.1213,7029.017 -30.125,-8.6716" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7048.7152 -30.125,-8.9469" inkscape:path-effect="#path-effect141763-0" id="path135697-1" d="m 1612.1213,7048.7152 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143099-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7038.8661 -30.125,-8.8457" inkscape:path-effect="#path-effect141754-7" id="path135709-5" d="m 1612.1213,7038.8661 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143101-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143103-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7058.5642 -30.125,-8.8849" id="path135711-8" inkscape:path-effect="#path-effect141749-7" inkscape:original-d="m 1612.1213,7058.5642 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
         </g>
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           d="m 1488.321,7017.98 7.2458,0 0,425.994 -7.2458,0 z"
-           style="fill:url(#linearGradient143105-2);fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path135719-6" />
-        <path
-           transform="matrix(0.782857,0,0,1.1835744,1219.3935,-2034.2271)"
-           inkscape:connector-curvature="0"
-           d="m 363.31667,8006.2094 129.70351,0.2807 -39.03694,-6.0055 -47.52299,-0.1493 z"
-           style="opacity:0.57847535;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46858-5-0-7)"
-           id="path137361-2"
-           sodipodi:nodetypes="ccccc" />
-        <rect
-           transform="matrix(0.85724747,0,0,0.97822603,222.97895,176.77897)"
-           y="6996.9277"
-           x="1524"
-           height="418"
-           width="57"
-           id="rect138303-4"
-           style="opacity:0.632287;fill:none;stroke:#000000;stroke-width:2.62032771;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter138305-4)" />
-        <g
-           transform="matrix(-1.0249987,0,0,0.99996992,3148.3148,0.22361906)"
-           id="g141982-2">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7403.2821 -30.125,-8.8591"
-             inkscape:path-effect="#path-effect141936-57"
-             id="path141984-5"
-             d="m 1612.1213,7403.2821 -30.125,-8.8591"
-             style="fill:none;stroke:url(#linearGradient143109-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143111-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7422.9802 -30.125,-8.9469"
-             id="path141986-8"
-             inkscape:path-effect="#path-effect141931-1"
-             inkscape:original-d="m 1612.1213,7422.9802 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143113-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7413.1312 -30.125,-8.8457"
-             id="path141988-6"
-             inkscape:path-effect="#path-effect141922-9"
-             inkscape:original-d="m 1612.1213,7413.1312 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7432.8294 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141917-79"
-             id="path141990-2"
-             d="m 1612.1213,7432.8294 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143115-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143117-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7363.8858 -30.125,-8.7966"
-             id="path141992-6"
-             inkscape:path-effect="#path-effect141908-43"
-             inkscape:original-d="m 1612.1213,7363.8858 -30.125,-8.7966"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7383.584 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141903-2"
-             id="path141994-5"
-             d="m 1612.1213,7383.584 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143119-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7373.7348 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141894-3"
-             id="path141996-3"
-             d="m 1612.1213,7373.7348 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143121-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143123-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7393.433 -30.125,-8.8849"
-             id="path141998-9"
-             inkscape:path-effect="#path-effect141889-1"
-             inkscape:original-d="m 1612.1213,7393.433 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143125-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7324.4895 -30.125,-8.859"
-             id="path142000-2"
-             inkscape:path-effect="#path-effect141880-3"
-             inkscape:original-d="m 1612.1213,7324.4895 -30.125,-8.859"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7344.1876 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141875-7"
-             id="path142002-4"
-             d="m 1612.1213,7344.1876 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143127-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7334.3386 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141866-27"
-             id="path142004-6"
-             d="m 1612.1213,7334.3386 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143129-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143131-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7354.0367 -30.125,-8.8849"
-             id="path142006-1"
-             inkscape:path-effect="#path-effect141861-9"
-             inkscape:original-d="m 1612.1213,7354.0367 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1611.9963,7285.0931 -30,-8.9216"
-             inkscape:path-effect="#path-effect141852-1"
-             id="path142008-8"
-             d="m 1611.9963,7285.0931 -30,-8.9216"
-             style="fill:none;stroke:url(#linearGradient143133-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143135-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7304.7913 -30.125,-8.9469"
-             id="path142010-2"
-             inkscape:path-effect="#path-effect141847-8"
-             inkscape:original-d="m 1612.1213,7304.7913 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143137-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7294.9421 -30.125,-8.8457"
-             id="path142012-1"
-             inkscape:path-effect="#path-effect141838-5"
-             inkscape:original-d="m 1612.1213,7294.9421 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7314.6404 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141833-2"
-             id="path142014-1"
-             d="m 1612.1213,7314.6404 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143139-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143141-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7245.6968 -30.125,-8.8591"
-             id="path142016-9"
-             inkscape:path-effect="#path-effect141824-6"
-             inkscape:original-d="m 1612.1213,7245.6968 -30.125,-8.8591"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7265.395 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141819-2"
-             id="path142018-7"
-             d="m 1612.1213,7265.395 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143143-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7255.5458 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141206-8"
-             id="path142020-6"
-             d="m 1612.1213,7255.5458 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143145-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143147-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7275.2441 -30.125,-8.8849"
-             id="path142022-2"
-             inkscape:path-effect="#path-effect141201-5"
-             inkscape:original-d="m 1612.1213,7275.2441 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7206.3004 -30.125,-8.7966"
-             inkscape:path-effect="#path-effect141810-9"
-             id="path142024-9"
-             d="m 1612.1213,7206.3004 -30.125,-8.7966"
-             style="fill:none;stroke:url(#linearGradient143149-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143151-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7225.9987 -30.125,-8.9469"
-             id="path142026-5"
-             inkscape:path-effect="#path-effect141805-0"
-             inkscape:original-d="m 1612.1213,7225.9987 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143153-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7216.1496 -30.125,-8.8457"
-             id="path142028-2"
-             inkscape:path-effect="#path-effect141796-1"
-             inkscape:original-d="m 1612.1213,7216.1496 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7235.8476 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141791-8"
-             id="path142030-0"
-             d="m 1612.1213,7235.8476 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143155-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7166.9041 -30.125,-8.8591"
-             inkscape:path-effect="#path-effect141064-3"
-             id="path142032-0"
-             d="m 1612.1213,7166.9041 -30.125,-8.8591"
-             style="fill:none;stroke:url(#linearGradient143157-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143159-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7186.6024 -30.125,-8.9469"
-             id="path142034-3"
-             inkscape:path-effect="#path-effect141059-46"
-             inkscape:original-d="m 1612.1213,7186.6024 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143161-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7176.7532 -30.125,-8.8457"
-             id="path142036-9"
-             inkscape:path-effect="#path-effect141092-6"
-             inkscape:original-d="m 1612.1213,7176.7532 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7196.4515 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141087-1"
-             id="path142038-1"
-             d="m 1612.1213,7196.4515 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143163-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143165-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7127.5078 -30.125,-8.6716"
-             id="path142040-8"
-             inkscape:path-effect="#path-effect141008-4"
-             inkscape:original-d="m 1612.1213,7127.5078 -30.125,-8.6716"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7147.206 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141003-63"
-             id="path142042-1"
-             d="m 1612.1213,7147.206 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143167-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7137.3569 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141036-8"
-             id="path142044-9"
-             d="m 1612.1213,7137.3569 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143169-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143171-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7157.055 -30.125,-8.8849"
-             id="path142046-5"
-             inkscape:path-effect="#path-effect141031-2"
-             inkscape:original-d="m 1612.1213,7157.055 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143173-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7107.8096 -30.125,-8.7966"
-             id="path142048-3"
-             inkscape:path-effect="#path-effect140795-1"
-             inkscape:original-d="m 1612.1213,7107.8096 -30.125,-8.7966"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7117.6587 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect140809-5"
-             id="path142050-2"
-             d="m 1612.1213,7117.6587 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143175-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143177-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7068.4132 -30.125,-8.8591"
-             id="path142052-5"
-             inkscape:path-effect="#path-effect141120-8"
-             inkscape:original-d="m 1612.1213,7068.4132 -30.125,-8.8591"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7088.1116 -30.125,-8.9469"
-             inkscape:path-effect="#path-effect141115-0"
-             id="path142054-2"
-             d="m 1612.1213,7088.1116 -30.125,-8.9469"
-             style="fill:none;stroke:url(#linearGradient143179-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7078.2624 -30.125,-8.8457"
-             inkscape:path-effect="#path-effect141782-63"
-             id="path142056-5"
-             d="m 1612.1213,7078.2624 -30.125,-8.8457"
-             style="fill:none;stroke:url(#linearGradient143181-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143183-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7097.9607 -30.125,-8.8849"
-             id="path142058-8"
-             inkscape:path-effect="#path-effect141777-1"
-             inkscape:original-d="m 1612.1213,7097.9607 -30.125,-8.8849"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7029.017 -30.125,-8.6716"
-             inkscape:path-effect="#path-effect141768-4"
-             id="path142060-6"
-             d="m 1612.1213,7029.017 -30.125,-8.6716"
-             style="fill:none;stroke:url(#linearGradient143185-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143187-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7048.7152 -30.125,-8.9469"
-             id="path142062-7"
-             inkscape:path-effect="#path-effect141763-0"
-             inkscape:original-d="m 1612.1213,7048.7152 -30.125,-8.9469"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:url(#linearGradient143189-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 1612.1213,7038.8661 -30.125,-8.8457"
-             id="path142064-7"
-             inkscape:path-effect="#path-effect141754-7"
-             inkscape:original-d="m 1612.1213,7038.8661 -30.125,-8.8457"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             inkscape:original-d="m 1612.1213,7058.5642 -30.125,-8.8849"
-             inkscape:path-effect="#path-effect141749-7"
-             id="path142066-2"
-             d="m 1612.1213,7058.5642 -30.125,-8.8849"
-             style="fill:none;stroke:url(#linearGradient143191-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" d="m 1488.321,7017.98 7.2458,0 0,425.994 -7.2458,0 z" style="fill:url(#linearGradient143105-2);fill-opacity:1;fill-rule:nonzero;stroke:none" id="path135719-6"/>
+        <path transform="matrix(0.782857,0,0,1.1835744,1219.3935,-2034.2271)" inkscape:connector-curvature="0" d="m 363.31667,8006.2094 129.70351,0.2807 -39.03694,-6.0055 -47.52299,-0.1493 z" style="opacity:0.57847535;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter46858-5-0-7)" id="path137361-2" sodipodi:nodetypes="ccccc"/>
+        <rect transform="matrix(0.85724747,0,0,0.97822603,222.97895,176.77897)" y="6996.9277" x="1524" height="418" width="57" id="rect138303-4" style="opacity:0.632287;fill:none;stroke:#000000;stroke-width:2.62032771;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter138305-4)"/>
+        <g transform="matrix(-1.0249987,0,0,0.99996992,3148.3148,0.22361906)" id="g141982-2">
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7403.2821 -30.125,-8.8591" inkscape:path-effect="#path-effect141936-57" id="path141984-5" d="m 1612.1213,7403.2821 -30.125,-8.8591" style="fill:none;stroke:url(#linearGradient143109-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143111-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7422.9802 -30.125,-8.9469" id="path141986-8" inkscape:path-effect="#path-effect141931-1" inkscape:original-d="m 1612.1213,7422.9802 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143113-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7413.1312 -30.125,-8.8457" id="path141988-6" inkscape:path-effect="#path-effect141922-9" inkscape:original-d="m 1612.1213,7413.1312 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7432.8294 -30.125,-8.8849" inkscape:path-effect="#path-effect141917-79" id="path141990-2" d="m 1612.1213,7432.8294 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143115-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143117-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7363.8858 -30.125,-8.7966" id="path141992-6" inkscape:path-effect="#path-effect141908-43" inkscape:original-d="m 1612.1213,7363.8858 -30.125,-8.7966" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7383.584 -30.125,-8.9469" inkscape:path-effect="#path-effect141903-2" id="path141994-5" d="m 1612.1213,7383.584 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143119-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7373.7348 -30.125,-8.8457" inkscape:path-effect="#path-effect141894-3" id="path141996-3" d="m 1612.1213,7373.7348 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143121-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143123-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7393.433 -30.125,-8.8849" id="path141998-9" inkscape:path-effect="#path-effect141889-1" inkscape:original-d="m 1612.1213,7393.433 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143125-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7324.4895 -30.125,-8.859" id="path142000-2" inkscape:path-effect="#path-effect141880-3" inkscape:original-d="m 1612.1213,7324.4895 -30.125,-8.859" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7344.1876 -30.125,-8.9469" inkscape:path-effect="#path-effect141875-7" id="path142002-4" d="m 1612.1213,7344.1876 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143127-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7334.3386 -30.125,-8.8457" inkscape:path-effect="#path-effect141866-27" id="path142004-6" d="m 1612.1213,7334.3386 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143129-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143131-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7354.0367 -30.125,-8.8849" id="path142006-1" inkscape:path-effect="#path-effect141861-9" inkscape:original-d="m 1612.1213,7354.0367 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1611.9963,7285.0931 -30,-8.9216" inkscape:path-effect="#path-effect141852-1" id="path142008-8" d="m 1611.9963,7285.0931 -30,-8.9216" style="fill:none;stroke:url(#linearGradient143133-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143135-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7304.7913 -30.125,-8.9469" id="path142010-2" inkscape:path-effect="#path-effect141847-8" inkscape:original-d="m 1612.1213,7304.7913 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143137-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7294.9421 -30.125,-8.8457" id="path142012-1" inkscape:path-effect="#path-effect141838-5" inkscape:original-d="m 1612.1213,7294.9421 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7314.6404 -30.125,-8.8849" inkscape:path-effect="#path-effect141833-2" id="path142014-1" d="m 1612.1213,7314.6404 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143139-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143141-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7245.6968 -30.125,-8.8591" id="path142016-9" inkscape:path-effect="#path-effect141824-6" inkscape:original-d="m 1612.1213,7245.6968 -30.125,-8.8591" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7265.395 -30.125,-8.9469" inkscape:path-effect="#path-effect141819-2" id="path142018-7" d="m 1612.1213,7265.395 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143143-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7255.5458 -30.125,-8.8457" inkscape:path-effect="#path-effect141206-8" id="path142020-6" d="m 1612.1213,7255.5458 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143145-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143147-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7275.2441 -30.125,-8.8849" id="path142022-2" inkscape:path-effect="#path-effect141201-5" inkscape:original-d="m 1612.1213,7275.2441 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7206.3004 -30.125,-8.7966" inkscape:path-effect="#path-effect141810-9" id="path142024-9" d="m 1612.1213,7206.3004 -30.125,-8.7966" style="fill:none;stroke:url(#linearGradient143149-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143151-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7225.9987 -30.125,-8.9469" id="path142026-5" inkscape:path-effect="#path-effect141805-0" inkscape:original-d="m 1612.1213,7225.9987 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143153-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7216.1496 -30.125,-8.8457" id="path142028-2" inkscape:path-effect="#path-effect141796-1" inkscape:original-d="m 1612.1213,7216.1496 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7235.8476 -30.125,-8.8849" inkscape:path-effect="#path-effect141791-8" id="path142030-0" d="m 1612.1213,7235.8476 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143155-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7166.9041 -30.125,-8.8591" inkscape:path-effect="#path-effect141064-3" id="path142032-0" d="m 1612.1213,7166.9041 -30.125,-8.8591" style="fill:none;stroke:url(#linearGradient143157-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143159-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7186.6024 -30.125,-8.9469" id="path142034-3" inkscape:path-effect="#path-effect141059-46" inkscape:original-d="m 1612.1213,7186.6024 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143161-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7176.7532 -30.125,-8.8457" id="path142036-9" inkscape:path-effect="#path-effect141092-6" inkscape:original-d="m 1612.1213,7176.7532 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7196.4515 -30.125,-8.8849" inkscape:path-effect="#path-effect141087-1" id="path142038-1" d="m 1612.1213,7196.4515 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143163-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143165-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7127.5078 -30.125,-8.6716" id="path142040-8" inkscape:path-effect="#path-effect141008-4" inkscape:original-d="m 1612.1213,7127.5078 -30.125,-8.6716" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7147.206 -30.125,-8.9469" inkscape:path-effect="#path-effect141003-63" id="path142042-1" d="m 1612.1213,7147.206 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143167-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7137.3569 -30.125,-8.8457" inkscape:path-effect="#path-effect141036-8" id="path142044-9" d="m 1612.1213,7137.3569 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143169-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143171-9);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7157.055 -30.125,-8.8849" id="path142046-5" inkscape:path-effect="#path-effect141031-2" inkscape:original-d="m 1612.1213,7157.055 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143173-4);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7107.8096 -30.125,-8.7966" id="path142048-3" inkscape:path-effect="#path-effect140795-1" inkscape:original-d="m 1612.1213,7107.8096 -30.125,-8.7966" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7117.6587 -30.125,-8.8457" inkscape:path-effect="#path-effect140809-5" id="path142050-2" d="m 1612.1213,7117.6587 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143175-7);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143177-8);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7068.4132 -30.125,-8.8591" id="path142052-5" inkscape:path-effect="#path-effect141120-8" inkscape:original-d="m 1612.1213,7068.4132 -30.125,-8.8591" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7088.1116 -30.125,-8.9469" inkscape:path-effect="#path-effect141115-0" id="path142054-2" d="m 1612.1213,7088.1116 -30.125,-8.9469" style="fill:none;stroke:url(#linearGradient143179-3);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7078.2624 -30.125,-8.8457" inkscape:path-effect="#path-effect141782-63" id="path142056-5" d="m 1612.1213,7078.2624 -30.125,-8.8457" style="fill:none;stroke:url(#linearGradient143181-5);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143183-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7097.9607 -30.125,-8.8849" id="path142058-8" inkscape:path-effect="#path-effect141777-1" inkscape:original-d="m 1612.1213,7097.9607 -30.125,-8.8849" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7029.017 -30.125,-8.6716" inkscape:path-effect="#path-effect141768-4" id="path142060-6" d="m 1612.1213,7029.017 -30.125,-8.6716" style="fill:none;stroke:url(#linearGradient143185-2);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+          <path style="fill:none;stroke:url(#linearGradient143187-0);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7048.7152 -30.125,-8.9469" id="path142062-7" inkscape:path-effect="#path-effect141763-0" inkscape:original-d="m 1612.1213,7048.7152 -30.125,-8.9469" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path style="fill:none;stroke:url(#linearGradient143189-1);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1612.1213,7038.8661 -30.125,-8.8457" id="path142064-7" inkscape:path-effect="#path-effect141754-7" inkscape:original-d="m 1612.1213,7038.8661 -30.125,-8.8457" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" inkscape:original-d="m 1612.1213,7058.5642 -30.125,-8.8849" inkscape:path-effect="#path-effect141749-7" id="path142066-2" d="m 1612.1213,7058.5642 -30.125,-8.8849" style="fill:none;stroke:url(#linearGradient143191-6);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
         </g>
-        <rect
-           style="opacity:0.632287;fill:none;stroke:#000000;stroke-width:2.62032771;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter142702-4)"
-           id="rect142700-2"
-           width="57"
-           height="418"
-           x="1524"
-           y="6996.9277"
-           transform="matrix(0.85724747,0,0,0.93747488,222.97895,475.10261)" />
+        <rect style="opacity:0.632287;fill:none;stroke:#000000;stroke-width:2.62032771;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter142702-4)" id="rect142700-2" width="57" height="418" x="1524" y="6996.9277" transform="matrix(0.85724747,0,0,0.93747488,222.97895,475.10261)"/>
       </g>
     </g>
   </g>
diff --git a/src/libs/zbxalgo/Makefile.am b/src/libs/zbxalgo/Makefile.am
index d75ce0fae20..661ce9a2c72 100644
--- a/src/libs/zbxalgo/Makefile.am
+++ b/src/libs/zbxalgo/Makefile.am
@@ -2,11 +2,20 @@
 
 noinst_LIBRARIES = libzbxalgo.a
 
+if SERVER
+EVALUATE_C = evaluate.c
+else
+if PROXY
+EVALUATE_C = evaluate.c
+endif
+endif
+
 libzbxalgo_a_SOURCES = \
 	algodefs.c \
 	binaryheap.c \
+	$(EVALUATE_C) \
 	hashmap.c \
 	hashset.c \
-	vector.c \
 	int128.c \
+	vector.c \
 	vectorimpl.h
diff --git a/src/libs/zbxalgo/binaryheap.c b/src/libs/zbxalgo/binaryheap.c
index f38099dcc04..782f3a9350b 100644
--- a/src/libs/zbxalgo/binaryheap.c
+++ b/src/libs/zbxalgo/binaryheap.c
@@ -201,7 +201,7 @@ zbx_binary_heap_elem_t	*zbx_binary_heap_find_min(zbx_binary_heap_t *heap)
 	if (0 == heap->elems_num)
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "asking for a minimum in an empty heap");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	return &heap->elems[0];
@@ -214,7 +214,7 @@ void	zbx_binary_heap_insert(zbx_binary_heap_t *heap, zbx_binary_heap_elem_t *ele
 	if (HAS_DIRECT_OPTION(heap) && FAIL != zbx_hashmap_get(heap->key_index, elem->key))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "inserting a duplicate key into a heap with direct option");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	__binary_heap_ensure_free_space(heap);
@@ -235,7 +235,7 @@ void	zbx_binary_heap_update_direct(zbx_binary_heap_t *heap, zbx_binary_heap_elem
 	if (!HAS_DIRECT_OPTION(heap))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "direct update operation is not supported for this heap");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (FAIL != (index = zbx_hashmap_get(heap->key_index, elem->key)))
@@ -248,7 +248,7 @@ void	zbx_binary_heap_update_direct(zbx_binary_heap_t *heap, zbx_binary_heap_elem
 	else
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "element with key " ZBX_FS_UI64 " not found in heap for update", elem->key);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 }
 
@@ -259,7 +259,7 @@ void	zbx_binary_heap_remove_min(zbx_binary_heap_t *heap)
 	if (0 == heap->elems_num)
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "removing a minimum from an empty heap");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (HAS_DIRECT_OPTION(heap))
@@ -282,7 +282,7 @@ void	zbx_binary_heap_remove_direct(zbx_binary_heap_t *heap, zbx_uint64_t key)
 	if (!HAS_DIRECT_OPTION(heap))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "direct remove operation is not supported for this heap");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (FAIL != (index = zbx_hashmap_get(heap->key_index, key)))
@@ -293,14 +293,15 @@ void	zbx_binary_heap_remove_direct(zbx_binary_heap_t *heap, zbx_uint64_t key)
 		{
 			heap->elems[index] = heap->elems[heap->elems_num];
 
-			if (index == __binary_heap_bubble_down(heap, index))
-				zbx_hashmap_set(heap->key_index, heap->elems[index].key, index);
+			if (index == __binary_heap_bubble_up(heap, index))
+				if (index == __binary_heap_bubble_down(heap, index))
+					zbx_hashmap_set(heap->key_index, heap->elems[index].key, index);
 		}
 	}
 	else
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "element with key " ZBX_FS_UI64 " not found in heap for remove", key);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 }
 
diff --git a/src/libs/zbxalgo/evaluate.c b/src/libs/zbxalgo/evaluate.c
new file mode 100644
index 00000000000..c02ec605a20
--- /dev/null
+++ b/src/libs/zbxalgo/evaluate.c
@@ -0,0 +1,483 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2014 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+#include "common.h"
+#include "zbxalgo.h"
+
+#include "log.h"
+
+/******************************************************************************
+ *                                                                            *
+ *                     Module for evaluating expressions                      *
+ *                  ---------------------------------------                   *
+ *                                                                            *
+ * Global variables are used for efficiency reasons so that arguments do not  *
+ * have to be passed to each of evaluate_termX() functions. For this reason,  *
+ * too, this module is isolated into a separate file.                         *
+ *                                                                            *
+ * The priority of supported operators is as follows:                         *
+ *                                                                            *
+ *   - (unary)   evaluate_term8()                                             *
+ *   not         evaluate_term7()                                             *
+ *   * /         evaluate_term6()                                             *
+ *   + -         evaluate_term5()                                             *
+ *   < <= >= >   evaluate_term4()                                             *
+ *   = <>        evaluate_term3()                                             *
+ *   and         evaluate_term2()                                             *
+ *   or          evaluate_term1()                                             *
+ *                                                                            *
+ * Function evaluate_term9() is used for parsing tokens on the lowest level:  *
+ * those can be suffixed numbers like "12.345K" or parenthesized expressions. *
+ *                                                                            *
+ ******************************************************************************/
+
+#define ZBX_INFINITY	(1.0 / 0.0)	/* value used as an error code */
+
+static const char	*ptr;		/* character being looked at */
+static int		level;		/* expression nesting level  */
+
+static char		*buffer;	/* error message buffer      */
+static int		max_buffer_len;	/* error message buffer size */
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: check whether the character delimits a numeric token              *
+ *                                                                            *
+ ******************************************************************************/
+static int	is_number_delimiter(unsigned char c)
+{
+	return 0 == isdigit(c) && '.' != c && 0 == isalpha(c) ? SUCCEED : FAIL;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: check whether the character delimits a symbolic operator token    *
+ *                                                                            *
+ ******************************************************************************/
+static int	is_operator_delimiter(char c)
+{
+	return ' ' == c || '(' == c || '\r' == c || '\n' == c || '\t' == c || ')' == c || '\0' == c ? SUCCEED : FAIL;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate a suffixed number like "12.345K"                         *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_number()
+{
+	int		digits = 0, dots = 0;
+	const char	*iter = ptr;
+	double		result;
+	zbx_uint64_t	factor = 1;
+
+	while (1)
+	{
+		if (0 != isdigit((unsigned char)*iter))
+		{
+			iter++;
+			digits++;
+			continue;
+		}
+
+		if ('.' == *iter)
+		{
+			iter++;
+			dots++;
+			continue;
+		}
+
+		if (1 > digits || 1 < dots)
+			return ZBX_INFINITY;
+
+		if (0 != isalpha((unsigned char)*iter))
+		{
+			if (NULL == strchr("KMGTsmhdw", *iter))
+				return ZBX_INFINITY;
+
+			factor = suffix2factor(*iter++);
+		}
+
+		if (SUCCEED != is_number_delimiter(*iter))
+			return ZBX_INFINITY;
+
+		result = atof(ptr) * factor;
+
+		ptr = iter;
+
+		return result;
+	}
+}
+
+static double	evaluate_term1();
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate a suffixed number or a parenthesized expression          *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term9()
+{
+	double	result;
+
+	while (' ' == *ptr || '\r' == *ptr || '\n' == *ptr || '\t' == *ptr)
+		ptr++;
+
+	if ('\0' == *ptr)
+	{
+		zbx_strlcpy(buffer, "Cannot evaluate expression: unexpected end of expression.", max_buffer_len);
+		return ZBX_INFINITY;
+	}
+
+	if ('(' == *ptr)
+	{
+		ptr++;
+
+		if (ZBX_INFINITY == (result = evaluate_term1()))
+			return ZBX_INFINITY;
+
+		if (')' != *ptr)
+		{
+			zbx_snprintf(buffer, max_buffer_len, "Cannot evaluate expression:"
+					" expected closing parenthesis at \"%s\".", ptr);
+			return ZBX_INFINITY;
+		}
+
+		ptr++;
+	}
+	else
+	{
+		if (ZBX_INFINITY == (result = evaluate_number()))
+		{
+			zbx_snprintf(buffer, max_buffer_len, "Cannot evaluate expression:"
+					" expected numeric token at \"%s\".", ptr);
+			return ZBX_INFINITY;
+		}
+	}
+
+	while ('\0' != *ptr && (' ' == *ptr || '\r' == *ptr || '\n' == *ptr || '\t' == *ptr))
+		ptr++;
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate "-" (unary)                                              *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term8()
+{
+	double	result;
+
+	while (' ' == *ptr || '\r' == *ptr || '\n' == *ptr || '\t' == *ptr)
+		ptr++;
+
+	if ('-' == *ptr)
+	{
+		ptr++;
+
+		if (ZBX_INFINITY == (result = evaluate_term9()))
+			return ZBX_INFINITY;
+
+		result = -result;
+	}
+	else
+		result = evaluate_term9();
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate "not"                                                    *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term7()
+{
+	double	result;
+
+	while (' ' == *ptr || '\r' == *ptr || '\n' == *ptr || '\t' == *ptr)
+		ptr++;
+
+	if ('n' == ptr[0] && 'o' == ptr[1] && 't' == ptr[2] && SUCCEED == is_operator_delimiter(ptr[3]))
+	{
+		ptr += 3;
+
+		if (ZBX_INFINITY == (result = evaluate_term8()))
+			return ZBX_INFINITY;
+
+		result = (SUCCEED == zbx_double_compare(result, 0) ? 1 : 0);
+	}
+	else
+		result = evaluate_term8();
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate "*" and "/"                                              *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term6()
+{
+	char	op;
+	double	result, operand;
+
+	if (ZBX_INFINITY == (result = evaluate_term7()))
+		return ZBX_INFINITY;
+
+	while ('*' == *ptr || '/' == *ptr)
+	{
+		op = *ptr++;
+
+		if (ZBX_INFINITY == (operand = evaluate_term7()))
+			return ZBX_INFINITY;
+
+		if ('*' == op)
+		{
+			result *= operand;
+		}
+		else
+		{
+			if (SUCCEED == zbx_double_compare(operand, 0))
+			{
+				zbx_strlcpy(buffer, "Cannot evaluate expression: division by zero.", max_buffer_len);
+				return ZBX_INFINITY;
+			}
+
+			result /= operand;
+		}
+	}
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate "+" and "-"                                              *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term5()
+{
+	char	op;
+	double	result, operand;
+
+	if (ZBX_INFINITY == (result = evaluate_term6()))
+		return ZBX_INFINITY;
+
+	while ('+' == *ptr || '-' == *ptr)
+	{
+		op = *ptr++;
+
+		if (ZBX_INFINITY == (operand = evaluate_term6()))
+			return ZBX_INFINITY;
+
+		if ('+' == op)
+			result += operand;
+		else
+			result -= operand;
+	}
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate "<", "<=", ">=", ">"                                     *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term4()
+{
+	char	op;
+	double	result, operand;
+
+	if (ZBX_INFINITY == (result = evaluate_term5()))
+		return ZBX_INFINITY;
+
+	while (1)
+	{
+		if ('<' == ptr[0] && '=' == ptr[1])
+		{
+			op = 'l';
+			ptr += 2;
+		}
+		else if ('>' == ptr[0] && '=' == ptr[1])
+		{
+			op = 'g';
+			ptr += 2;
+		}
+		else if (('<' == ptr[0] && '>' != ptr[1]) || '>' == ptr[0])
+		{
+			op = *ptr++;
+		}
+		else
+			break;
+
+		if (ZBX_INFINITY == (operand = evaluate_term5()))
+			return ZBX_INFINITY;
+
+		if ('<' == op)
+			result = (result <= operand - ZBX_DOUBLE_EPSILON);
+		else if ('l' == op)
+			result = (result < operand + ZBX_DOUBLE_EPSILON);
+		else if ('g' == op)
+			result = (result > operand - ZBX_DOUBLE_EPSILON);
+		else
+			result = (result >= operand + ZBX_DOUBLE_EPSILON);
+	}
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate "=" and "<>"                                             *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term3()
+{
+	char	op;
+	double	result, operand;
+
+	if (ZBX_INFINITY == (result = evaluate_term4()))
+		return ZBX_INFINITY;
+
+	while (1)
+	{
+		if ('=' == *ptr)
+		{
+			op = *ptr++;
+		}
+		else if ('<' == ptr[0] && '>' == ptr[1])
+		{
+			op = '#';
+			ptr += 2;
+		}
+		else
+			break;
+
+		if (ZBX_INFINITY == (operand = evaluate_term4()))
+			return ZBX_INFINITY;
+
+		if ('=' == op)
+			result = (SUCCEED == zbx_double_compare(result, operand));
+		else
+			result = (SUCCEED != zbx_double_compare(result, operand));
+	}
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate "and"                                                    *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term2()
+{
+	double	result, operand;
+
+	if (ZBX_INFINITY == (result = evaluate_term3()))
+		return ZBX_INFINITY;
+
+	while ('a' == ptr[0] && 'n' == ptr[1] && 'd' == ptr[2] && SUCCEED == is_operator_delimiter(ptr[3]))
+	{
+		ptr += 3;
+
+		if (ZBX_INFINITY == (operand = evaluate_term3()))
+			return ZBX_INFINITY;
+
+		result = (SUCCEED != zbx_double_compare(result, 0) && SUCCEED != zbx_double_compare(operand, 0));
+	}
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate "or"                                                     *
+ *                                                                            *
+ ******************************************************************************/
+static double	evaluate_term1()
+{
+	double	result, operand;
+
+	level++;
+
+	if (32 < level)
+	{
+		zbx_strlcpy(buffer, "Cannot evaluate expression: nesting level is too deep.", max_buffer_len);
+		return ZBX_INFINITY;
+	}
+
+	if (ZBX_INFINITY == (result = evaluate_term2()))
+		return ZBX_INFINITY;
+
+	while ('o' == ptr[0] && 'r' == ptr[1] && SUCCEED == is_operator_delimiter(ptr[2]))
+	{
+		ptr += 2;
+
+		if (ZBX_INFINITY == (operand = evaluate_term2()))
+			return ZBX_INFINITY;
+
+		result = (SUCCEED != zbx_double_compare(result, 0) || SUCCEED != zbx_double_compare(operand, 0));
+	}
+
+	level--;
+
+	return result;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Purpose: evaluate an expression like "(26.416>10) or (0=1)"                *
+ *                                                                            *
+ ******************************************************************************/
+int	evaluate(double *value, const char *expression, char *error, int max_error_len)
+{
+	const char	*__function_name = "evaluate";
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() expression:'%s'", __function_name, expression);
+
+	ptr = expression;
+	level = 0;
+
+	buffer = error;
+	max_buffer_len = max_error_len;
+
+	*value = evaluate_term1();
+
+	if (ZBX_INFINITY != *value && '\0' != *ptr)
+	{
+		zbx_snprintf(error, max_error_len, "Cannot evaluate expression: unexpected token at \"%s\".", ptr);
+		*value = ZBX_INFINITY;
+	}
+
+	if (ZBX_INFINITY == *value)
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "End of %s() error:'%s'", __function_name, error);
+		return FAIL;
+	}
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() value:" ZBX_FS_DBL, __function_name, *value);
+
+	return SUCCEED;
+}
diff --git a/src/libs/zbxalgo/hashset.c b/src/libs/zbxalgo/hashset.c
index 4a871086b87..522d0d8aa5b 100644
--- a/src/libs/zbxalgo/hashset.c
+++ b/src/libs/zbxalgo/hashset.c
@@ -310,7 +310,7 @@ void	zbx_hashset_iter_remove(zbx_hashset_iter_t *iter)
 	if (ITER_START == iter->slot || ITER_FINISH == iter->slot || NULL == iter->entry)
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "removing a hashset entry through a bad iterator");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (iter->hashset->slots[iter->slot] == iter->entry)
diff --git a/src/libs/zbxalgo/vectorimpl.h b/src/libs/zbxalgo/vectorimpl.h
index b7f260ec9ce..0c23e377716 100644
--- a/src/libs/zbxalgo/vectorimpl.h
+++ b/src/libs/zbxalgo/vectorimpl.h
@@ -93,7 +93,7 @@ void	zbx_vector_ ## __id ## _remove_noorder(zbx_vector_ ## __id ## _t *vector, i
 	if (!(0 <= index && index < vector->values_num))							\
 	{													\
 		zabbix_log(LOG_LEVEL_CRIT, "removing a non-existent element at index %d", index);		\
-		exit(FAIL);											\
+		exit(EXIT_FAILURE);										\
 	}													\
 														\
 	vector->values[index] = vector->values[--vector->values_num];						\
@@ -104,7 +104,7 @@ void	zbx_vector_ ## __id ## _remove(zbx_vector_ ## __id ## _t *vector, int index
 	if (!(0 <= index && index < vector->values_num))							\
 	{													\
 		zabbix_log(LOG_LEVEL_CRIT, "removing a non-existent element at index %d", index);		\
-		exit(FAIL);											\
+		exit(EXIT_FAILURE);										\
 	}													\
 														\
 	vector->values_num--;											\
diff --git a/src/libs/zbxcommon/alias.c b/src/libs/zbxcommon/alias.c
index 2905f540237..1d382486006 100644
--- a/src/libs/zbxcommon/alias.c
+++ b/src/libs/zbxcommon/alias.c
@@ -61,7 +61,7 @@ void	add_alias(const char *name, const char *value)
 		if (0 == strcmp(alias->name, name))
 		{
 			zabbix_log(LOG_LEVEL_CRIT, "failed to add Alias \"%s\": duplicate name", name);
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 	}
 }
diff --git a/src/libs/zbxcommon/file.c b/src/libs/zbxcommon/file.c
index cef9dc01c3c..745f71ef85c 100644
--- a/src/libs/zbxcommon/file.c
+++ b/src/libs/zbxcommon/file.c
@@ -20,35 +20,6 @@
 #include "common.h"
 
 #if defined(_WINDOWS)
-int	__zbx_stat(const char *path, zbx_stat_t *buf)
-{
-	int	ret, fd;
-	wchar_t	*wpath;
-
-	wpath = zbx_utf8_to_unicode(path);
-
-	if (-1 == (ret = _wstat64(wpath, buf)))
-		goto out;
-
-	if (0 != buf->st_size)
-		goto out;
-
-	/* In the case of symlinks _wstat64 returns zero file size.   */
-	/* Try to work around it by opening the file and using fstat. */
-
-	ret = -1;
-
-	if (-1 != (fd = _wopen(wpath, O_RDONLY)))
-	{
-		ret = _fstat64(fd, buf);
-		_close(fd);
-	}
-out:
-	zbx_free(wpath);
-
-	return ret;
-}
-
 int	__zbx_open(const char *pathname, int flags)
 {
 	int	ret;
diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c
index b1ace02e6aa..a6b30aede33 100644
--- a/src/libs/zbxcommon/misc.c
+++ b/src/libs/zbxcommon/misc.c
@@ -22,8 +22,39 @@
 #include "setproctitle.h"
 
 #ifdef _WINDOWS
+
 char	ZABBIX_SERVICE_NAME[ZBX_SERVICE_NAME_LEN] = APPLICATION_NAME;
 char	ZABBIX_EVENT_SOURCE[ZBX_SERVICE_NAME_LEN] = APPLICATION_NAME;
+
+int	__zbx_stat(const char *path, zbx_stat_t *buf)
+{
+	int	ret, fd;
+	wchar_t	*wpath;
+
+	wpath = zbx_utf8_to_unicode(path);
+
+	if (-1 == (ret = _wstat64(wpath, buf)))
+		goto out;
+
+	if (0 != S_ISDIR(buf->st_mode) || 0 != buf->st_size)
+		goto out;
+
+	/* In the case of symlinks _wstat64 returns zero file size.   */
+	/* Try to work around it by opening the file and using fstat. */
+
+	ret = -1;
+
+	if (-1 != (fd = _wopen(wpath, O_RDONLY)))
+	{
+		ret = _fstat64(fd, buf);
+		_close(fd);
+	}
+out:
+	zbx_free(wpath);
+
+	return ret;
+}
+
 #endif
 
 /******************************************************************************
@@ -223,7 +254,7 @@ void    *zbx_calloc2(const char *filename, int line, void *old, size_t nmemb, si
 	zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] zbx_calloc: out of memory. Requested " ZBX_FS_SIZE_T " bytes.",
 			filename, line, (zbx_fs_size_t)size);
 
-	exit(FAIL);
+	exit(EXIT_FAILURE);
 }
 
 /******************************************************************************
@@ -262,7 +293,7 @@ void    *zbx_malloc2(const char *filename, int line, void *old, size_t size)
 	zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] zbx_malloc: out of memory. Requested " ZBX_FS_SIZE_T " bytes.",
 			filename, line, (zbx_fs_size_t)size);
 
-	exit(FAIL);
+	exit(EXIT_FAILURE);
 }
 
 /******************************************************************************
@@ -294,7 +325,7 @@ void    *zbx_realloc2(const char *filename, int line, void *old, size_t size)
 	zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] zbx_realloc: out of memory. Requested " ZBX_FS_SIZE_T " bytes.",
 			filename, line, (zbx_fs_size_t)size);
 
-	exit(FAIL);
+	exit(EXIT_FAILURE);
 }
 
 char    *zbx_strdup2(const char *filename, int line, char *old, const char *str)
@@ -313,7 +344,7 @@ char    *zbx_strdup2(const char *filename, int line, char *old, const char *str)
 	zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] zbx_strdup: out of memory. Requested " ZBX_FS_SIZE_T " bytes.",
 			filename, line, (zbx_fs_size_t)(strlen(str) + 1));
 
-	exit(FAIL);
+	exit(EXIT_FAILURE);
 }
 
 /******************************************************************************
@@ -845,67 +876,67 @@ int	is_ip(const char *ip)
 
 /******************************************************************************
  *                                                                            *
- * Function: expand_ipv6                                                      *
+ * Function: ip6_str2dig                                                      *
  *                                                                            *
- * Purpose: convert short ipv6 addresses to expanded type                     *
+ * Purpose: convert short ipv6 addresses to the digital type                  *
  *                                                                            *
- * Parameters: ip - IPv6 IPs [12fc::2]                                        *
- *             buf - result value [12fc:0000:0000:0000:0000:0000:0000:0002]   *
+ * Parameters: ip     - [IN] IPv6 IP address [12fc::2]                        *
+ *             groups - [OUT] 8 groups of 16 bit each                         *
+ *                      2001:0db8:0000:0000:0000:ff00:0042:8329               *
  *                                                                            *
  * Return value: FAIL - invalid IP address, SUCCEED - conversion OK           *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
-int	expand_ipv6(const char *ip, char *str, size_t str_len)
+int	ip6_str2dig(const char *ip, unsigned short *groups)
 {
-	unsigned int	i[8];	/* x:x:x:x:x:x:x:x */
-	char		buf[5], *ptr;
-	int		c, dc, pos = 0, len;
-	size_t		ip_len, j;
+	const char	*ptr;
+	char		buf[5];
+	int		c = 0, dc, pos = 0;
+	size_t		ip_len, j, len;
 
-	c = 0;	/* colons count */
-	for (ptr = strchr(ip, ':'); ptr != NULL; ptr = strchr(ptr + 1, ':'))
+	for (ptr = strchr(ip, ':'); NULL != ptr; ptr = strchr(ptr + 1, ':'))
 		c++;
 
 	if (2 > c || c > 7)
 		return FAIL;
 
 	ip_len = strlen(ip);
-	if ((ip[0] == ':' && ip[1] != ':') || (ip[ip_len - 1] == ':' && ip[ip_len - 2] != ':'))
+
+	if ((':' == ip[0] && ':' != ip[1]) || (':' == ip[ip_len - 1] && ':' != ip[ip_len - 2]))
 		return FAIL;
 
-	memset(i, 0x00, sizeof(i));
+	memset(groups, 0, sizeof(unsigned short) * 8);
 
-	dc  = 0; /* double colon flag */
+	dc = 0;	/* double colon flag */
 	len = 0;
+
 	for (j = 0; j < ip_len; j++)
 	{
 		if (0 != isxdigit(ip[j]))
 		{
 			if (len > 3)
 				return FAIL;
-			buf[len ++] = ip[j];
+			buf[len++] = ip[j];
 		}
-		else if (ip[j] != ':')
+		else if (':' != ip[j])
 			return FAIL;
 
-		if (ip[j] == ':' || ip[j + 1] == '\0')
+		if (':' == ip[j] || '\0' == ip[j + 1])
 		{
-			if (len)
+			if (0 != len)
 			{
-				buf[len] = 0x00;
-				sscanf(buf, "%x", &i[pos]);
-				pos ++;
+				buf[len] = '\0';
+				sscanf(buf, "%hx", &groups[pos]);
+				pos++;
 				len = 0;
 			}
 
-			if (ip[j + 1] == ':')
+			if (':' == ip[j + 1])
 			{
-				if (dc == 0)
+				if (0 == dc)
 				{
 					dc = 1;
-					pos = ( 8 - c ) + pos + (j == 0 ? 1 : 0);
+					pos += (8 - c) + (0 == j);
 				}
 				else
 					return FAIL;
@@ -913,39 +944,31 @@ int	expand_ipv6(const char *ip, char *str, size_t str_len)
 		}
 	}
 
-	zbx_snprintf(str, str_len, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", i[0], i[1], i[2], i[3], i[4], i[5], i[6], i[7]);
-
 	return SUCCEED;
 }
 
 #if defined(HAVE_IPV6)
 /******************************************************************************
  *                                                                            *
- * Function: collapse_ipv6                                                    *
+ * Function: ip6_dig2str                                                      *
  *                                                                            *
- * Purpose: convert array to IPv6 collapsed type                              *
+ * Purpose: convert ipv6 addresses to a string                                *
  *                                                                            *
- * Parameters: ip - [IN] full IPv6 address [12fc:0:0:0:0:0:0:2]               *
- *                  [OUT] short IPv6 address [12fc::0]                        *
+ * Parameters: groups - [IN] 8 groups of 16 bit each                          *
+ *             ip     - [OUT] short IPv6 address [12fc::0]                    *
  *             ip_len - [IN] ip buffer len                                    *
  *                                                                            *
  * Return value: pointer to result buffer                                     *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
-char	*collapse_ipv6(char *str, size_t str_len)
+void	ip6_dig2str(unsigned short *groups, char *ip, size_t ip_len)
 {
 	size_t		offset = 0;
 	int		i, c = 0, m = 0, idx = -1, idx2 = -1;
-	unsigned int	j[8];
-
-	if (8 != sscanf(str, "%x:%x:%x:%x:%x:%x:%x:%x", &j[0], &j[1], &j[2], &j[3], &j[4], &j[5], &j[6], &j[7]))
-		return str;
 
 	for (i = 0; i <= 8; i++)
 	{
-		if (i < 8 && j[i] == 0)
+		if (i < 8 && groups[i] == 0)
 		{
 			if (idx2 == -1)
 				idx2 = i;
@@ -965,23 +988,21 @@ char	*collapse_ipv6(char *str, size_t str_len)
 
 	for (i = 0; i < 8; i++)
 	{
-		if (j[i] != 0 || idx == -1 || i < idx)
+		if (groups[i] != 0 || idx == -1 || i < idx)
 		{
-			offset += zbx_snprintf(str + offset, str_len - offset, "%x", j[i]);
+			offset += zbx_snprintf(ip + offset, ip_len - offset, "%hx", groups[i]);
 			if (i > idx)
 				idx = -1;
 			if (i < 7)
-				offset += zbx_snprintf(str + offset, str_len - offset, ":");
+				offset += zbx_snprintf(ip + offset, ip_len - offset, ":");
 		}
 		else if (idx == i)
 		{
-			offset += zbx_snprintf(str + offset, str_len - offset, ":");
+			offset += zbx_snprintf(ip + offset, ip_len - offset, ":");
 			if (idx == 0)
-				offset += zbx_snprintf(str + offset, str_len - offset, ":");
+				offset += zbx_snprintf(ip + offset, ip_len - offset, ":");
 		}
 	}
-
-	return str;
 }
 
 /******************************************************************************
@@ -990,196 +1011,246 @@ char	*collapse_ipv6(char *str, size_t str_len)
  *                                                                            *
  * Purpose: check if ip matches range of ip addresses                         *
  *                                                                            *
- * Parameters: list -  IPs [12fc::2-55,::45]                                  *
+ * Parameters: list - [IN] comma-separated list of ip ranges                  *
+ *                    12fc::2-55,::45,12fc::ff00/120                          *
+ *             ip   - [IN] IPv6 ip address [12fc::2]                          *
  *                                                                            *
  * Return value: FAIL - out of range, SUCCEED - within the range              *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  ******************************************************************************/
-static int	ip6_in_list(char *list, char *ip)
+static int	ip6_in_list(char *list, const char *ip)
 {
-	char	*start, *comma = NULL, *dash = NULL, buffer[MAX_STRING_LEN];
-	int	i[8], j[9], ret = FAIL;
+	unsigned short	i[8], j[9], mask;
+	char		*start, *comma = NULL, *slash = NULL, *dash = NULL;
+	int		ret = FAIL;
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In ip6_in_list(list:%s,ip:%s)", list, ip);
+	if (FAIL == ip6_str2dig(ip, i))
+		return FAIL;
 
-	if (FAIL == expand_ipv6(ip, buffer, sizeof(buffer)))
+	for (start = list; '\0' != *start;)
 	{
-		goto out;
-	}
+		if (NULL != (comma = strchr(start, ',')))
+			*comma = '\0';
 
-	if (sscanf(buffer, "%x:%x:%x:%x:%x:%x:%x:%x", &i[0], &i[1], &i[2], &i[3], &i[4], &i[5], &i[6], &i[7]) != 8)
-	{
-		goto out;
-	}
+		if (NULL != (dash = strchr(start, '-')))
+			*dash = '\0';
+		else if (NULL != (slash = strchr(start, '/')))
+			*slash = '\0';
 
-	for (start = list; start[0] != '\0';)
-	{
+		if (FAIL == ip6_str2dig(start, j))
+			goto next;
 
-		if (NULL != (comma = strchr(start, ',')))
+		if (i[0] != j[0] || i[1] != j[1] || i[2] != j[2] || i[3] != j[3] ||
+				i[4] != j[4] || i[5] != j[5] || i[6] != j[6])
 		{
-			comma[0] = '\0';
+			goto next;
 		}
 
-		if (NULL != (dash = strchr(start, '-')))
+		if (NULL != dash)
 		{
-			dash[0] = '\0';
-			if (sscanf(dash + 1, "%x", &j[8]) != 1)
-			{
+			if (1 != sscanf(dash + 1, "%hx", &j[8]))
 				goto next;
-			}
 		}
-
-		if (FAIL == expand_ipv6(start, buffer, sizeof(buffer)))
+		else if (NULL != slash)
 		{
-			goto next;
-		}
+			if (1 != sscanf(slash + 1, "%hu", &j[8]) || 112 > j[8] || j[8] > 128)
+				goto next;
 
-		if (sscanf(buffer, "%x:%x:%x:%x:%x:%x:%x:%x", &j[0], &j[1], &j[2], &j[3], &j[4], &j[5], &j[6], &j[7]) != 8)
-		{
-			goto next;
+			mask = 0xffff << (128 - j[8]);
+			j[8] = j[7] | ~mask;
+			j[7] = j[7] & mask;
 		}
-
-		if (dash == NULL)
-		{
+		else
 			j[8] = j[7];
-		}
 
-		if (i[0] == j[0] && i[1] == j[1] && i[2] == j[2] && i[3] == j[3] &&
-			i[4] == j[4] && i[5] == j[5] && i[6] == j[6] &&
-			i[7] >= j[7] && i[7] <= j[8])
+		if (i[7] >= j[7] && i[7] <= j[8])
 		{
 			ret = SUCCEED;
 			break;
 		}
 next:
-		if (dash != NULL)
+		if (NULL != dash)
 		{
-			dash[0] = '-';
+			*dash = '-';
 			dash = NULL;
 		}
+		else if (NULL != slash)
+		{
+			*slash = '/';
+			slash = NULL;
+		}
 
 		if (comma != NULL)
 		{
-			comma[0] = ',';
+			*comma = ',';
 			start = comma + 1;
 			comma = NULL;
 		}
 		else
-		{
 			break;
-		}
 	}
-out:
+
 	if (dash != NULL)
-	{
-		dash[0] = '-';
-	}
+		*dash = '-';
+	else if (slash != NULL)
+		*slash = '/';
 
 	if (comma != NULL)
-	{
-		comma[0] = ',';
-	}
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of ip6_in_list():%s",
-			zbx_result_string(ret));
+		*comma = ',';
 
 	return ret;
 }
-#endif /*HAVE_IPV6*/
+#endif	/* HAVE_IPV6 */
 /******************************************************************************
  *                                                                            *
- * Function: ip_in_list                                                       *
+ * Function: ip4_str2dig                                                      *
+ *                                                                            *
+ * Purpose: convert short ipv4 addresses to the digital type                  *
+ *                                                                            *
+ * Parameters: ip     - [IN] IPv4 IP address [192.168.0.1]                    *
+ *             ip_dig - [OUT] 4-byte unsigned integer                         *
+ *                                                                            *
+ * Return value: FAIL - invalid IP address, SUCCEED - conversion OK           *
+ *                                                                            *
+ ******************************************************************************/
+int	ip4_str2dig(const char *ip, unsigned int *ip_dig)
+{
+	unsigned short  i[4];
+
+	if (4 != sscanf(ip, "%hu.%hu.%hu.%hu", &i[0], &i[1], &i[2], &i[3]))
+		return FAIL;
+
+	if (255 < i[0] || 255 < i[1] || 255 < i[2] || 255 < i[3])
+		return FAIL;
+
+	*ip_dig = (i[0] << 24) + (i[1] << 16) + (i[2] << 8) + i[3];
+
+	return SUCCEED;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: ip4_in_list                                                      *
  *                                                                            *
  * Purpose: check if ip matches range of ip addresses                         *
  *                                                                            *
- * Parameters: list -  IPs [192.168.1.1-244,192.168.1.250]                    *
+ * Parameters: list - [IN] comma-separated list of ip ranges                  *
+ *                    192.168.0.1-64,192.168.0.128,10.10.0.0/24               *
+ *             ip   - [IN] IPv4 ip address [192.168.0.1]                      *
  *                                                                            *
  * Return value: FAIL - out of range, SUCCEED - within the range              *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  ******************************************************************************/
-int	ip_in_list(char *list, char *ip)
+static int	ip4_in_list(char *list, const char *ip)
 {
-	int	i[4], j[5];
-	int	ret = FAIL;
-	char	*start = NULL, *comma = NULL, *dash = NULL;
-
-	zabbix_log( LOG_LEVEL_DEBUG, "In ip_in_list(list:%s,ip:%s)", list, ip);
+	unsigned short	i;
+	unsigned int	mask, ip_dig[2], first, last;
+	char		*start = NULL, *comma = NULL, *slash = NULL, *dash = NULL;
+	int		ret = FAIL;
 
-	if (sscanf(ip, "%d.%d.%d.%d", &i[0], &i[1], &i[2], &i[3]) != 4)
-	{
-#if defined(HAVE_IPV6)
-		ret = ip6_in_list(list, ip);
-#endif /*HAVE_IPV6*/
-		goto out;
-	}
+	if (SUCCEED != ip4_str2dig(ip, &ip_dig[0]))
+		return FAIL;
 
-	for (start = list; start[0] != '\0';)
+	for (start = list; '\0' != *start;)
 	{
 		if (NULL != (comma = strchr(start, ',')))
-		{
-			comma[0] = '\0';
-		}
+			*comma = '\0';
 
 		if (NULL != (dash = strchr(start, '-')))
+			*dash = '\0';
+		else if (NULL != (slash = strchr(start, '/')))
+			*slash = '\0';
+
+		if (SUCCEED != ip4_str2dig(start, &ip_dig[1]))
+			goto next;
+
+		if (NULL != dash)
 		{
-			dash[0] = '\0';
-			if (sscanf(dash + 1, "%d", &j[4]) != 1)
-			{
+			if (1 != sscanf(dash + 1, "%hu", &i) || 255 < i)
 				goto next;
-			}
-		}
 
-		if (sscanf(start, "%d.%d.%d.%d", &j[0], &j[1], &j[2], &j[3]) != 4)
-		{
-			goto next;
+			first = ip_dig[1];
+			last = (ip_dig[1] & 0xffffff00) + i;
 		}
+		else if (NULL != slash)
+		{
+			if (1 != sscanf(slash + 1, "%hu", &i) || 16 > i || i > 30)
+				goto next;
 
-		if (dash == NULL)
+			mask = 0xffffffff << (32 - i);
+			first = (ip_dig[1] & mask) + 1;
+			last = (ip_dig[1] | ~mask) - 1;
+		}
+		else
 		{
-			j[4] = j[3];
+			first = ip_dig[1];
+			last = ip_dig[1];
 		}
 
-		if (i[0] == j[0] && i[1] == j[1] && i[2] == j[2] && i[3] >= j[3] && i[3] <= j[4])
+		if (first <= ip_dig[0] && ip_dig[0] <= last)
 		{
 			ret = SUCCEED;
 			break;
 		}
 next:
-		if (dash != NULL)
+		if (NULL != dash)
 		{
-			dash[0] = '-';
+			*dash = '-';
 			dash = NULL;
 		}
+		else if (NULL != slash)
+		{
+			*slash = '/';
+			slash = NULL;
+		}
 
-		if (comma != NULL)
+		if (NULL != comma)
 		{
-			comma[0] = ',';
+			*comma = ',';
 			start = comma + 1;
 			comma = NULL;
 		}
 		else
-		{
 			break;
-		}
 	}
 
-out:
-	if (dash != NULL)
-	{
-		dash[0] = '-';
-	}
+	if (NULL != dash)
+		*dash = '-';
+	else if (NULL != slash)
+		*slash = '/';
 
-	if (comma != NULL)
-	{
-		comma[0] = ',';
-	}
+	if (NULL != comma)
+		*comma = ',';
+
+	return ret;
+}
+/******************************************************************************
+ *                                                                            *
+ * Function: ip_in_list                                                       *
+ *                                                                            *
+ * Purpose: check if ip matches range of ip addresses                         *
+ *                                                                            *
+ * Parameters: ip   - [IN] ip address                                         *
+ *             list - [IN] comma-separated list of ip ranges                  *
+ *                    192.168.0.1-64,192.168.0.128,10.10.0.0/24,12fc:21       *
+ *                                                                            *
+ * Return value: FAIL - out of range, SUCCEED - within the range              *
+ *                                                                            *
+ ******************************************************************************/
+int	ip_in_list(char *list, const char *ip)
+{
+	const char	*__function_name = "ip_in_list";
+
+	int		ret = FAIL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() list:'%s' ip:'%s'", __function_name, list, ip);
 
-	zabbix_log(LOG_LEVEL_DEBUG, "End of ip_in_list():%s",
-			zbx_result_string(ret));
+	ret = ip4_in_list(list, ip);
+#if defined(HAVE_IPV6)
+	if (SUCCEED != ret)
+		ret = ip6_in_list(list, ip);
+#endif
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
 	return ret;
 }
@@ -1248,6 +1319,11 @@ int	int_in_list(char *list, int value)
 	return ret;
 }
 
+int	zbx_double_compare(double a, double b)
+{
+	return fabs(a - b) < ZBX_DOUBLE_EPSILON ? SUCCEED : FAIL;
+}
+
 /******************************************************************************
  *                                                                            *
  * Function: is_double_suffix                                                 *
@@ -1537,9 +1613,9 @@ int	is_uint_n_range(const char *str, size_t n, void *value, size_t size, zbx_uin
 		/* of 'value' buffer while on big endian architecture it will be stored starting from the last */
 		/* bytes. We handle it by storing the offset in the most significant byte of short value and   */
 		/* then use the first byte as source offset.                                                   */
-		unsigned short value_offset = (unsigned short)((sizeof(zbx_uint64_t) - size) << 8);
+		unsigned short	value_offset = (unsigned short)((sizeof(zbx_uint64_t) - size) << 8);
 
-		memcpy(value, (unsigned char*)&value_uint64 + *((unsigned char*)&value_offset), size);
+		memcpy(value, (unsigned char *)&value_uint64 + *((unsigned char *)&value_offset), size);
 	}
 
 	return SUCCEED;
@@ -1941,6 +2017,33 @@ void	uint64_array_remove_both(zbx_uint64_t *values, int *num, zbx_uint64_t *rm_v
 	}
 }
 
+zbx_uint64_t	suffix2factor(char c)
+{
+	switch (c)
+	{
+		case 'K':
+			return ZBX_KIBIBYTE;
+		case 'M':
+			return ZBX_MEBIBYTE;
+		case 'G':
+			return ZBX_GIBIBYTE;
+		case 'T':
+			return ZBX_TEBIBYTE;
+		case 's':
+			return 1;
+		case 'm':
+			return SEC_PER_MIN;
+		case 'h':
+			return SEC_PER_HOUR;
+		case 'd':
+			return SEC_PER_DAY;
+		case 'w':
+			return SEC_PER_WEEK;
+		default:
+			return 1;
+	}
+}
+
 /******************************************************************************
  *                                                                            *
  * Function: str2uint64                                                       *
@@ -1970,36 +2073,8 @@ int	str2uint64(const char *str, const char *suffixes, zbx_uint64_t *value)
 
 	if (NULL != strchr(suffixes, *p))
 	{
-		switch (*p)
-		{
-			case 'K':
-				factor = ZBX_KIBIBYTE;
-				break;
-			case 'M':
-				factor = ZBX_MEBIBYTE;
-				break;
-			case 'G':
-				factor = ZBX_GIBIBYTE;
-				break;
-			case 'T':
-				factor = ZBX_TEBIBYTE;
-				break;
-			case 's':
-				factor = 1;
-				break;
-			case 'm':
-				factor = SEC_PER_MIN;
-				break;
-			case 'h':
-				factor = SEC_PER_HOUR;
-				break;
-			case 'd':
-				factor = SEC_PER_DAY;
-				break;
-			case 'w':
-				factor = SEC_PER_WEEK;
-				break;
-		}
+		factor = suffix2factor(*p);
+
 		sz--;
 	}
 
@@ -2028,41 +2103,10 @@ int	str2uint64(const char *str, const char *suffixes, zbx_uint64_t *value)
 double	str2double(const char *str)
 {
 	size_t	sz;
-	double	factor = 1;
 
 	sz = strlen(str) - 1;
 
-	switch (str[sz])
-	{
-		case 'K':
-			factor = ZBX_KIBIBYTE;
-			break;
-		case 'M':
-			factor = ZBX_MEBIBYTE;
-			break;
-		case 'G':
-			factor = ZBX_GIBIBYTE;
-			break;
-		case 'T':
-			factor = ZBX_TEBIBYTE;
-			break;
-		case 's':
-			break;
-		case 'm':
-			factor = SEC_PER_MIN;
-			break;
-		case 'h':
-			factor = SEC_PER_HOUR;
-			break;
-		case 'd':
-			factor = SEC_PER_DAY;
-			break;
-		case 'w':
-			factor = SEC_PER_WEEK;
-			break;
-	}
-
-	return atof(str) * factor;
+	return atof(str) * suffix2factor(str[sz]);
 }
 
 /******************************************************************************
diff --git a/src/libs/zbxcommon/setproctitle.c b/src/libs/zbxcommon/setproctitle.c
index 47e5ebfbe7f..f6826198bb5 100644
--- a/src/libs/zbxcommon/setproctitle.c
+++ b/src/libs/zbxcommon/setproctitle.c
@@ -196,7 +196,7 @@ void	setproctitle_set_status(const char *status)
 	{
 		size_t	msg_size;
 
-		msg_size = MIN(zbx_strlcpy(ps_buf, status, ps_buf_size), ps_buf_size);
+		msg_size = zbx_strlcpy(ps_buf, status, ps_buf_size);
 
 		if (prev_msg_size > msg_size)
 			memset(ps_buf + msg_size + 1, '\0', ps_buf_size - msg_size - 1);
@@ -223,7 +223,7 @@ void	setproctitle_set_status(const char *status)
 			ps_buf_size -= start_pos + 2;	/* space after "argv[copy_first]: " for status message */
 
 			memset(ps_buf, '\0', ps_buf_size);
-			prev_msg_size = MIN(zbx_strlcpy(ps_buf, status, ps_buf_size), ps_buf_size);
+			prev_msg_size = zbx_strlcpy(ps_buf, status, ps_buf_size);
 
 			initialized = 1;
 		}
diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c
index 0134d0d9309..95f2fe1f7c5 100644
--- a/src/libs/zbxcommon/str.c
+++ b/src/libs/zbxcommon/str.c
@@ -486,210 +486,48 @@ void	zbx_remove_chars(register char *str, const char *charlist)
 
 /******************************************************************************
  *                                                                            *
- * Function: compress_signs                                                   *
- *                                                                            *
- * Purpose: convert all repeating pluses and minuses                          *
- *                                                                            *
- * Parameters: c - string to convert                                          *
- *                                                                            *
- * Return value: string without minuses                                       *
- *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
- * Comments: -3*--8+5-7*-4+++5 -> N3*8+5+N7*N4+5                              *
- *                                                                            *
- ******************************************************************************/
-void	compress_signs(char *str)
-{
-	int	i, j, len, loop = 1;
-	char	cur, next, prev;
-
-	/* compress '--' '+-' '++' '-+' */
-	while (1 == loop)
-	{
-		loop = 0;
-
-		for (i = 0; '\0' != str[i]; i++)
-		{
-			cur = str[i];
-			next = str[i + 1];
-
-			if (('-' == cur && '-' == next) || ('+' == cur && '+' == next))
-			{
-				str[i] = '+';
-				for (j = i + 1; '\0' != str[j]; j++)
-					str[j] = str[j + 1];
-				loop = 1;
-			}
-
-			if (('-' == cur && '+' == next) || ('+' == cur && '-' == next))
-			{
-				str[i] = '-';
-				for (j = i + 1; '\0' != str[j]; j++)
-					str[j] = str[j + 1];
-				loop = 1;
-			}
-		}
-	}
-
-	/* remove '-', '+' where needed, convert -123 to +N123 */
-	for (i = 0; '\0' != str[i]; i++)
-	{
-		cur = str[i];
-
-		if ('+' == cur)
-		{
-			/* plus is the first sign in the expression */
-			if (0 == i)
-			{
-				for (j = i; '\0' != str[j]; j++)
-					str[j] = str[j + 1];
-			}
-			else
-			{
-				prev = str[i - 1];
-
-				if (0 == isdigit(prev) && '.' != prev)
-				{
-					for (j = i; '\0' != str[j]; j++)
-						str[j] = str[j + 1];
-				}
-			}
-		}
-		else if ('-' == cur)
-		{
-			/* minus is the first sign in the expression */
-			if (0 == i)
-			{
-				str[i] = 'N';
-			}
-			else
-			{
-				prev = str[i - 1];
-
-				if (0 == isdigit(prev) && '.' != prev)
-				{
-					str[i] = 'N';
-				}
-				else
-				{
-					len = (int)strlen(str);
-
-					for (j = len; j > i; j--)
-						str[j] = str[j - 1];
-
-					str[i] = '+';
-					str[i + 1] = 'N';
-					str[len + 1] = '\0';
-					i++;
-				}
-			}
-		}
-	}
-}
-
-/*
- * Function: strlcpy, strlcat
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/******************************************************************************
- *                                                                            *
  * Function: zbx_strlcpy                                                      *
  *                                                                            *
- * Purpose: replacement of insecure strncpy, same as OpenBSD's strlcpy        *
+ * Purpose: Copy src to string dst of size siz. At most siz - 1 characters    *
+ *          will be copied. Always null terminates (unless siz == 0).         *
  *                                                                            *
- * Copy src to string dst of size siz.  At most siz-1 characters              *
- * will be copied.  Always NUL terminates (unless siz == 0).                  *
- * Returns strlen(src); if retval >= siz, truncation occurred.                *
- *                                                                            *
- * Author: Todd C. Miller <Todd.Miller@courtesan.com>                         *
+ * Return value : the number of characters copied (excluding the null byte)   *
  *                                                                            *
  ******************************************************************************/
 size_t	zbx_strlcpy(char *dst, const char *src, size_t siz)
 {
-	char		*d = dst;
 	const char	*s = src;
-	size_t		n = siz;
 
-	/* copy as many bytes as will fit */
-	if (0 != n)
+	if (0 != siz)
 	{
-		while (0 != --n)
-		{
-			if ('\0' == (*d++ = *s++))
-				break;
-		}
-	}
+		while (0 != --siz && '\0' != *s)
+			*dst++ = *s++;
 
-	/* not enough room in dst, add NUL and traverse rest of src */
-	if (0 == n)
-	{
-		if (0 != siz)
-			*d = '\0';	/* NUL-terminate dst */
-		while ('\0' != *s++)
-			;
+		*dst = '\0';
 	}
 
-	return s - src - 1;	/* count does not include NUL */
+	return s - src;	/* count does not include null */
 }
 
 /******************************************************************************
  *                                                                            *
  * Function: zbx_strlcat                                                      *
  *                                                                            *
- * Purpose: replacement of insecure strncat, same as OpenBSD's strlcat        *
- *                                                                            *
- * Appends src to string dst of size siz (unlike strncat, size is the         *
- * full size of dst, not space left).  At most siz-1 characters               *
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).        *
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).                       *
- * If retval >= siz, truncation occurred.                                     *
- *                                                                            *
- * Author: Todd C. Miller <Todd.Miller@courtesan.com>                         *
+ * Purpose: Appends src to string dst of size siz (unlike strncat, size is    *
+ *          the full size of dst, not space left). At most siz - 1 characters *
+ *          will be copied. Always null terminates (unless                    *
+ *          siz <= strlen(dst)).                                              *
  *                                                                            *
  ******************************************************************************/
-size_t	zbx_strlcat(char *dst, const char *src, size_t siz)
+void	zbx_strlcat(char *dst, const char *src, size_t siz)
 {
-	char		*d = dst;
-	const char	*s = src;
-	size_t		n = siz;
-	size_t		dlen;
-
-	/* find the end of dst and adjust bytes left but don't go past end */
-	while (0 != n-- && '\0' != *d)
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (0 == n)
-		return dlen + strlen(s);
-
-	while ('\0' != *s)
+	while ('\0' != *dst)
 	{
-		if (1 != n)
-		{
-			*d++ = *s;
-			n--;
-		}
-		s++;
+		dst++;
+		siz--;
 	}
 
-	*d = '\0';
-
-	return dlen + (s - src);	/* count does not include NUL */
+	zbx_strlcpy(dst, src, siz);
 }
 
 /******************************************************************************
@@ -834,6 +672,7 @@ char	*__zbx_zbx_strdcatf(char *dest, const char *f, ...)
  * Purpose: check a byte stream for a valid hostname                          *
  *                                                                            *
  * Parameters: hostname - pointer to the first char of hostname               *
+ *             error - pointer to the error message (can be NULL)             *
  *                                                                            *
  * Return value: return SUCCEED if hostname is valid                          *
  *               or FAIL if hostname contains invalid chars, is empty         *
@@ -842,18 +681,35 @@ char	*__zbx_zbx_strdcatf(char *dest, const char *f, ...)
  * Author: Alexander Vladishev                                                *
  *                                                                            *
  ******************************************************************************/
-int	zbx_check_hostname(const char *hostname)
+int	zbx_check_hostname(const char *hostname, char **error)
 {
 	int	len = 0;
 
 	while ('\0' != hostname[len])
 	{
-		if (FAIL == is_hostname_char(hostname[len++]))
+		if (FAIL == is_hostname_char(hostname[len]))
+		{
+			if (NULL != error)
+				*error = zbx_dsprintf(NULL, "name contains invalid character '%c'", hostname[len]);
 			return FAIL;
+		}
+
+		len++;
 	}
 
-	if (0 == len || MAX_ZBX_HOSTNAME_LEN < len)
+	if (0 == len)
+	{
+		if (NULL != error)
+			*error = zbx_strdup(NULL, "name is empty");
 		return FAIL;
+	}
+
+	if (MAX_ZBX_HOSTNAME_LEN < len)
+	{
+		if (NULL != error)
+			*error = zbx_dsprintf(NULL, "name is too long (max %d characters)", MAX_ZBX_HOSTNAME_LEN);
+		return FAIL;
+	}
 
 	return SUCCEED;
 }
@@ -1890,101 +1746,6 @@ void	remove_param(char *p, int num)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_string                                                       *
- *                                                                            *
- * Purpose: get current string from the quoted or unquoted string list,       *
- *          delimited by blanks                                               *
- *                                                                            *
- * Parameters:                                                                *
- *      p       - [IN] parameter list, delimited by blanks (' ' or '\t')      *
- *      buf     - [OUT] output buffer                                         *
- *      bufsize - [IN] output buffer size                                     *
- *                                                                            *
- * Return value: pointer to the next string                                   *
- *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
- * Comments: delimeter for parameters is ','                                  *
- *                                                                            *
- ******************************************************************************/
-const char	*get_string(const char *p, char *buf, size_t bufsize)
-{
-/* 0 - init, 1 - inside quoted param, 2 - inside unquoted param */
-	int	state;
-	size_t	buf_i = 0;
-
-	bufsize--;	/* '\0' */
-
-	for (state = 0; '\0' != *p; p++)
-	{
-		switch (state) {
-		/* Init state */
-		case 0:
-			if (' ' == *p || '\t' == *p)
-				/* Skip of leading spaces */;
-			else if ('"' == *p)
-				state = 1;
-			else
-			{
-				state = 2;
-				p--;
-			}
-			break;
-		/* Quoted */
-		case 1:
-			if ('"' == *p)
-			{
-				if (' ' != p[1] && '\t' != p[1] && '\0' != p[1])
-					return NULL;	/* incorrect syntax */
-
-				while (' ' == p[1] || '\t' == p[1])
-					p++;
-
-				buf[buf_i] = '\0';
-				return ++p;
-			}
-			else if ('\\' == *p && ('"' == p[1] || '\\' == p[1]))
-			{
-				p++;
-				if (buf_i < bufsize)
-					buf[buf_i++] = *p;
-			}
-			else if ('\\' == *p && 'n' == p[1])
-			{
-				p++;
-				if (buf_i < bufsize)
-					buf[buf_i++] = '\n';
-			}
-			else if (buf_i < bufsize)
-				buf[buf_i++] = *p;
-			break;
-		/* Unquoted */
-		case 2:
-			if (' ' == *p || '\t' == *p)
-			{
-				while (' ' == *p || '\t' == *p)
-					p++;
-
-				buf[buf_i] = '\0';
-				return p;
-			}
-			else if (buf_i < bufsize)
-				buf[buf_i++] = *p;
-			break;
-		}
-	}
-
-	/* missing terminating '"' character */
-	if (state == 1)
-		return NULL;
-
-	buf[buf_i] = '\0';
-
-	return p;
-}
-
-/******************************************************************************
- *                                                                            *
  * Function: zbx_num2hex                                                      *
  *                                                                            *
  * Purpose: convert parameter c (0-15) to hexadecimal value ('0'-'f')         *
@@ -2780,13 +2541,13 @@ static int	get_codepage(const char *encoding, unsigned int *codepage)
 }
 
 /* convert from selected code page to unicode */
-static LPTSTR	zbx_to_unicode(unsigned int codepage, LPCSTR cp_string)
+static wchar_t	*zbx_to_unicode(unsigned int codepage, const char *cp_string)
 {
-	LPTSTR	wide_string = NULL;
+	wchar_t	*wide_string = NULL;
 	int	wide_size;
 
 	wide_size = MultiByteToWideChar(codepage, 0, cp_string, -1, NULL, 0);
-	wide_string = (LPTSTR)zbx_malloc(wide_string, (size_t)wide_size * sizeof(TCHAR));
+	wide_string = (wchar_t *)zbx_malloc(wide_string, (size_t)wide_size * sizeof(wchar_t));
 
 	/* convert from cp_string to wide_string */
 	MultiByteToWideChar(codepage, 0, cp_string, -1, wide_string, wide_size);
@@ -2795,18 +2556,18 @@ static LPTSTR	zbx_to_unicode(unsigned int codepage, LPCSTR cp_string)
 }
 
 /* convert from Windows ANSI code page to unicode */
-LPTSTR	zbx_acp_to_unicode(LPCSTR acp_string)
+wchar_t	*zbx_acp_to_unicode(const char *acp_string)
 {
 	return zbx_to_unicode(CP_ACP, acp_string);
 }
 
 /* convert from Windows OEM code page to unicode */
-LPTSTR	zbx_oemcp_to_unicode(LPCSTR oemcp_string)
+wchar_t	*zbx_oemcp_to_unicode(const char *oemcp_string)
 {
 	return zbx_to_unicode(CP_OEMCP, oemcp_string);
 }
 
-int	zbx_acp_to_unicode_static(LPCSTR acp_string, LPTSTR wide_string, int wide_size)
+int	zbx_acp_to_unicode_static(const char *acp_string, wchar_t *wide_string, int wide_size)
 {
 	/* convert from acp_string to wide_string */
 	if (0 == MultiByteToWideChar(CP_ACP, 0, acp_string, -1, wide_string, wide_size))
@@ -2816,19 +2577,19 @@ int	zbx_acp_to_unicode_static(LPCSTR acp_string, LPTSTR wide_string, int wide_si
 }
 
 /* convert from UTF-8 to unicode */
-LPTSTR	zbx_utf8_to_unicode(LPCSTR utf8_string)
+wchar_t	*zbx_utf8_to_unicode(const char *utf8_string)
 {
 	return zbx_to_unicode(CP_UTF8, utf8_string);
 }
 
 /* convert from unicode to utf8 */
-LPSTR	zbx_unicode_to_utf8(LPCTSTR wide_string)
+char	*zbx_unicode_to_utf8(const wchar_t *wide_string)
 {
-	LPSTR	utf8_string = NULL;
+	char	*utf8_string = NULL;
 	int	utf8_size;
 
 	utf8_size = WideCharToMultiByte(CP_UTF8, 0, wide_string, -1, NULL, 0, NULL, NULL);
-	utf8_string = (LPSTR)zbx_malloc(utf8_string, (size_t)utf8_size);
+	utf8_string = (char *)zbx_malloc(utf8_string, (size_t)utf8_size);
 
 	/* convert from wide_string to utf8_string */
 	WideCharToMultiByte(CP_UTF8, 0, wide_string, -1, utf8_string, utf8_size, NULL, NULL);
@@ -2837,7 +2598,7 @@ LPSTR	zbx_unicode_to_utf8(LPCTSTR wide_string)
 }
 
 /* convert from unicode to utf8 */
-LPSTR	zbx_unicode_to_utf8_static(LPCTSTR wide_string, LPSTR utf8_string, int utf8_size)
+char	*zbx_unicode_to_utf8_static(const wchar_t *wide_string, char *utf8_string, int utf8_size)
 {
 	/* convert from wide_string to utf8_string */
 	if (0 == WideCharToMultiByte(CP_UTF8, 0, wide_string, -1, utf8_string, utf8_size, NULL, NULL))
@@ -2864,7 +2625,7 @@ void	zbx_strupper(char *str)
 char	*convert_to_utf8(char *in, size_t in_size, const char *encoding)
 {
 #define STATIC_SIZE	1024
-	wchar_t	wide_string_static[STATIC_SIZE], *wide_string = NULL;
+	wchar_t		wide_string_static[STATIC_SIZE], *wide_string = NULL;
 	int		wide_size;
 	char		*utf8_string = NULL;
 	int		utf8_size;
@@ -2885,7 +2646,7 @@ char	*convert_to_utf8(char *in, size_t in_size, const char *encoding)
 	{
 		wide_size = MultiByteToWideChar(codepage, 0, in, (int)in_size, NULL, 0);
 		if (wide_size > STATIC_SIZE)
-			wide_string = (LPTSTR)zbx_malloc(wide_string, (size_t)wide_size * sizeof(TCHAR));
+			wide_string = (wchar_t *)zbx_malloc(wide_string, (size_t)wide_size * sizeof(wchar_t));
 		else
 			wide_string = wide_string_static;
 
@@ -2899,7 +2660,7 @@ char	*convert_to_utf8(char *in, size_t in_size, const char *encoding)
 	}
 
 	utf8_size = WideCharToMultiByte(CP_UTF8, 0, wide_string, wide_size, NULL, 0, NULL, NULL);
-	utf8_string = (LPSTR)zbx_malloc(utf8_string, (size_t)utf8_size + 1/* '\0' */);
+	utf8_string = (char *)zbx_malloc(utf8_string, (size_t)utf8_size + 1/* '\0' */);
 
 	/* convert from wide_string to utf8_string */
 	WideCharToMultiByte(CP_UTF8, 0, wide_string, wide_size, utf8_string, utf8_size, NULL, NULL);
diff --git a/src/libs/zbxcommon/zbxgetopt.c b/src/libs/zbxcommon/zbxgetopt.c
index 35ffde5cab0..55ba7e558d5 100644
--- a/src/libs/zbxcommon/zbxgetopt.c
+++ b/src/libs/zbxcommon/zbxgetopt.c
@@ -221,7 +221,7 @@ static void exchange (char **argv)
    argument, it follows the zbx_option name in the same ARGV-element, separated
    from the zbx_option name by a `=', or else the in next ARGV-element.
    When `getopt' finds a long-named zbx_option, it returns 0 if that zbx_option's
-   `flag' field is nonzero, the value of the zbx_option's `val' field
+   `flag' field is non-zero, the value of the zbx_option's `val' field
    if the `flag' field is zero.
 
    LONGOPTS is a vector of `struct zbx_option' terminated by an
@@ -231,7 +231,7 @@ static void exchange (char **argv)
    It is only valid when a long-named zbx_option has been found by the most
    recent call.
 
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+   If LONG_ONLY is non-zero, '-' as well as '--' can introduce
    long-named options.  */
 
 static int zbx_getopt_internal (int argc, char **argv, const char *optstring,
@@ -373,7 +373,7 @@ static int zbx_getopt_internal (int argc, char **argv, const char *optstring,
       int needexact = 0;
 
 #if ON
-      /* allow `--zbx_option#value' because you cannout assign a '='
+      /* allow `--zbx_option#value' because you cannot assign a '='
          to an environment variable under DOS command.com */
       while (*s && *s != '=' && * s != '#')
         s++;
diff --git a/src/libs/zbxcomms/comms.c b/src/libs/zbxcomms/comms.c
index 4ccc2c6632e..4daa6429865 100644
--- a/src/libs/zbxcomms/comms.c
+++ b/src/libs/zbxcomms/comms.c
@@ -51,7 +51,7 @@
 
 static char	zbx_tcp_strerror_message[ZBX_TCP_MAX_STRERROR];
 
-const char	*zbx_tcp_strerror()
+const char	*zbx_tcp_strerror(void)
 {
 	zbx_tcp_strerror_message[ZBX_TCP_MAX_STRERROR - 1] = '\0';	/* force terminate string */
 	return (&zbx_tcp_strerror_message[0]);
@@ -182,6 +182,8 @@ static void	zbx_tcp_clean(zbx_sock_t *s)
 	assert(s);
 
 	memset(s, 0, sizeof(zbx_sock_t));
+
+	s->buf_type = ZBX_BUF_TYPE_STAT;
 }
 
 /******************************************************************************
@@ -423,9 +425,9 @@ int	zbx_tcp_connect(zbx_sock_t *s, const char *source_ip, const char *ip, unsign
 #define ZBX_TCP_HEADER			ZBX_TCP_HEADER_DATA ZBX_TCP_HEADER_VERSION
 #define ZBX_TCP_HEADER_LEN		5
 
-int	zbx_tcp_send_ext(zbx_sock_t *s, const char *data, unsigned char flags, int timeout)
+int	zbx_tcp_send_ext(zbx_sock_t *s, const char *data, size_t len, unsigned char flags, int timeout)
 {
-	zbx_uint64_t	len64;
+	zbx_uint64_t	len64_le;
 	ssize_t		i = 0, written = 0;
 	int		ret = SUCCEED;
 
@@ -444,11 +446,10 @@ int	zbx_tcp_send_ext(zbx_sock_t *s, const char *data, unsigned char flags, int t
 			goto cleanup;
 		}
 
-		len64 = (zbx_uint64_t)strlen(data);
-		len64 = zbx_htole_uint64(len64);
+		len64_le = zbx_htole_uint64((zbx_uint64_t)len);
 
 		/* write data length */
-		if (ZBX_TCP_ERROR == ZBX_TCP_WRITE(s->socket, (char *)&len64, sizeof(len64)))
+		if (ZBX_TCP_ERROR == ZBX_TCP_WRITE(s->socket, (char *)&len64_le, sizeof(len64_le)))
 		{
 			zbx_set_tcp_strerror("ZBX_TCP_WRITE() failed: %s", strerror_from_system(zbx_sock_last_error()));
 			ret = FAIL;
@@ -456,9 +457,9 @@ int	zbx_tcp_send_ext(zbx_sock_t *s, const char *data, unsigned char flags, int t
 		}
 	}
 
-	while (written < (ssize_t)strlen(data))
+	while (written < (ssize_t)len)
 	{
-		if (ZBX_TCP_ERROR == (i = ZBX_TCP_WRITE(s->socket, data + written, (int)(strlen(data) - written))))
+		if (ZBX_TCP_ERROR == (i = ZBX_TCP_WRITE(s->socket, data + written, (int)(len - written))))
 		{
 			zbx_set_tcp_strerror("ZBX_TCP_WRITE() failed: %s", strerror_from_system(zbx_sock_last_error()));
 			ret = FAIL;
@@ -898,7 +899,170 @@ void	zbx_tcp_unaccept(zbx_sock_t *s)
  ******************************************************************************/
 void	zbx_tcp_free(zbx_sock_t *s)
 {
-	zbx_free(s->buf_dyn);
+	if (ZBX_BUF_TYPE_DYN == s->buf_type)
+		zbx_free(s->buffer);
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_sock_find_line                                               *
+ *                                                                            *
+ * Purpose: finds the next line in socket data buffer                         *
+ *                                                                            *
+ * Parameters: s - [IN] the socket                                            *
+ *                                                                            *
+ * Return value: A pointer to the next line or NULL if the socket data buffer *
+ *               contains no more lines.                                      *
+ *                                                                            *
+ ******************************************************************************/
+static const char	*zbx_sock_find_line(zbx_sock_t *s)
+{
+	char	*ptr, *line = NULL;
+
+	if (NULL == s->next_line)
+		return NULL;
+
+	/* check if the buffer contains the next line */
+	if ((size_t)(s->next_line - s->buffer) <= s->read_bytes && NULL != (ptr = strchr(s->next_line, '\n')))
+	{
+		line = s->next_line;
+		s->next_line = ptr + 1;
+
+		if (ptr > line && '\r' == *(ptr - 1))
+			ptr--;
+
+		*ptr = '\0';
+	}
+
+	return line;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_tcp_recv_line                                                *
+ *                                                                            *
+ * Purpose: reads next line from a socket                                     *
+ *                                                                            *
+ * Parameters: s - [IN] the socket                                            *
+ *                                                                            *
+ * Return value: a pointer to the line in socket buffer or NULL if there are  *
+ *               no more lines (socket was closed or an error occurred)       *
+ *                                                                            *
+ * Comments: Lines larger than 64KB are truncated.                            *
+ *                                                                            *
+ ******************************************************************************/
+const char	*zbx_tcp_recv_line(zbx_sock_t *s)
+{
+#define	ZBX_TCP_MAX_LINE_LENTH	(64 * ZBX_KIBIBYTE)
+
+	char		buffer[ZBX_STAT_BUF_LEN], *ptr = NULL;
+	const char	*line;
+	ssize_t		nbytes;
+	size_t		alloc = 0, offset = 0, line_length, left;
+
+	/* check if the buffer already contains the next line */
+	if (NULL != (line = zbx_sock_find_line(s)))
+		return line;
+
+	ZBX_TCP_START();
+
+	/* Find the size of leftover data from the last read line operation and copy */
+	/* the leftover data to the static buffer and reset the dynamic buffer.      */
+	/* Because we are reading data in ZBX_STAT_BUF_LEN chunks the leftover       */
+	/* data will always fit the static buffer.                                   */
+	if (NULL != s->next_line)
+	{
+		left = s->read_bytes - (s->next_line - s->buffer);
+		memmove(s->buf_stat, s->next_line, left);
+	}
+	else
+		left = 0;
+
+	s->read_bytes = left;
+	s->next_line = s->buf_stat;
+
+	zbx_tcp_free(s);
+	s->buf_type = ZBX_BUF_TYPE_STAT;
+	s->buffer = s->buf_stat;
+
+	/* read more data into static buffer */
+	if (ZBX_TCP_ERROR == (nbytes = ZBX_TCP_READ(s->socket, s->buf_stat + left, ZBX_STAT_BUF_LEN - left - 1)))
+		goto out;
+
+	s->buf_stat[left + nbytes] = '\0';
+
+	if (0 == nbytes)
+	{
+		/* Socket was closed before newline was found. If we have data in buffer  */
+		/* return it with success. Otherwise return failure.                      */
+		line = 0 != s->read_bytes ? s->next_line : NULL;
+		s->next_line += s->read_bytes;
+
+		goto out;
+	}
+
+	s->read_bytes += nbytes;
+
+	/* check if the static buffer now contains the next line */
+	if (NULL != (line = zbx_sock_find_line(s)))
+		goto out;
+
+	/* copy the static buffer data into dynamic buffer */
+	s->buf_type = ZBX_BUF_TYPE_DYN;
+	s->buffer = NULL;
+	zbx_strncpy_alloc(&s->buffer, &alloc, &offset, s->buf_stat, s->read_bytes);
+	line_length = s->read_bytes;
+
+	/* Read data into dynamic buffer until newline has been found.       */
+	/* Lines larger than ZBX_TCP_MAX_LINE_LENTH bytes will be truncated. */
+	do
+	{
+		if (ZBX_TCP_ERROR == (nbytes = ZBX_TCP_READ(s->socket, buffer, ZBX_STAT_BUF_LEN - 1)))
+			goto out;
+
+		if (0 == nbytes)
+		{
+			/* socket was closed before newline was found, just return the data we have */
+			line = 0 != s->read_bytes ? s->buffer : NULL;
+			s->next_line = s->buffer + s->read_bytes;
+
+			goto out;
+		}
+
+		buffer[nbytes] = '\0';
+		ptr = strchr(buffer, '\n');
+
+		if (s->read_bytes + nbytes < ZBX_TCP_MAX_LINE_LENTH && s->read_bytes == line_length)
+		{
+			zbx_strncpy_alloc(&s->buffer, &alloc, &offset, buffer, nbytes);
+			s->read_bytes += nbytes;
+		}
+		else
+		{
+			if (0 != (left = MIN(ZBX_TCP_MAX_LINE_LENTH - s->read_bytes, ptr - buffer)))
+			{
+				/* fill the string to the defined limit */
+				zbx_strncpy_alloc(&s->buffer, &alloc, &offset, buffer, left);
+				s->read_bytes += left;
+			}
+
+			/* if the line exceeds the defined limit then truncate it by skipping data until the newline */
+			if (NULL != ptr)
+			{
+				zbx_strncpy_alloc(&s->buffer, &alloc, &offset, ptr, nbytes - (ptr - buffer));
+				s->read_bytes += nbytes - (ptr - buffer);
+			}
+		}
+
+		line_length += nbytes;
+
+	}
+	while (NULL == ptr);
+
+	s->next_line = s->buffer;
+	line = zbx_sock_find_line(s);
+out:
+	return line;
 }
 
 /******************************************************************************
@@ -913,7 +1077,7 @@ void	zbx_tcp_free(zbx_sock_t *s)
  * Author: Eugene Grigorjev                                                   *
  *                                                                            *
  ******************************************************************************/
-ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, char **data, unsigned char flags, int timeout)
+ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, unsigned char flags, int timeout)
 {
 #define ZBX_BUF_LEN	(ZBX_STAT_BUF_LEN * 8)
 	ssize_t		nbytes, left, total_bytes;
@@ -925,13 +1089,13 @@ ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, char **data, unsigned char flags, int ti
 	if (0 != timeout)
 		zbx_tcp_timeout_set(s, timeout);
 
-	zbx_free(s->buf_dyn);
+	zbx_tcp_free(s);
 
 	total_bytes = 0;
 	read_bytes = 0;
-	s->buf_type = ZBX_BUF_TYPE_STAT;
 
-	*data = s->buf_stat;
+	s->buf_type = ZBX_BUF_TYPE_STAT;
+	s->buffer = s->buf_stat;
 
 	left = ZBX_TCP_HEADER_LEN;
 
@@ -1025,9 +1189,9 @@ ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, char **data, unsigned char flags, int ti
 	{
 		allocated = ZBX_BUF_LEN;
 		s->buf_type = ZBX_BUF_TYPE_DYN;
-		s->buf_dyn = zbx_malloc(s->buf_dyn, allocated);
+		s->buffer = zbx_malloc(NULL, allocated);
 
-		memcpy(s->buf_dyn, s->buf_stat, sizeof(s->buf_stat));
+		memcpy(s->buffer, s->buf_stat, sizeof(s->buf_stat));
 
 		offset = read_bytes;
 
@@ -1035,7 +1199,7 @@ ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, char **data, unsigned char flags, int ti
 		while (read_bytes < expected_len &&
 				ZBX_TCP_ERROR != (nbytes = ZBX_TCP_READ(s->socket, s->buf_stat, sizeof(s->buf_stat))))
 		{
-			zbx_strncpy_alloc(&s->buf_dyn, &allocated, &offset, s->buf_stat, nbytes);
+			zbx_strncpy_alloc(&s->buffer, &allocated, &offset, s->buf_stat, nbytes);
 			read_bytes += nbytes;
 
 			if (0 != (flags & ZBX_TCP_READ_UNTIL_CLOSE))
@@ -1048,10 +1212,10 @@ ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, char **data, unsigned char flags, int ti
 				if ((size_t)nbytes < sizeof(s->buf_stat) - 1)	/* should we stop reading? */
 				{
 					/* XML protocol? */
-					if (0 == strncmp(s->buf_dyn, "<req>", sizeof("<req>") - 1))
+					if (0 == strncmp(s->buffer, "<req>", sizeof("<req>") - 1))
 					{
 						/* closing tag received in the last 10 bytes? */
-						if (NULL != strstr(s->buf_dyn + read_bytes - 10, "</req>"))
+						if (NULL != strstr(s->buffer + read_bytes - 10, "</req>"))
 							break;
 					}
 					else
@@ -1059,8 +1223,6 @@ ssize_t	zbx_tcp_recv_ext(zbx_sock_t *s, char **data, unsigned char flags, int ti
 				}
 			}
 		}
-
-		*data = s->buf_dyn;
 	}
 out:
 	if (ZBX_TCP_ERROR == nbytes)
@@ -1073,17 +1235,20 @@ cleanup:
 		zbx_tcp_timeout_cleanup(s);
 
 	if (FAIL != total_bytes)
+	{
 		total_bytes += read_bytes;
+		s->read_bytes = read_bytes;
+	}
 
 	return total_bytes;
 }
 
 char	*get_ip_by_socket(zbx_sock_t *s)
 {
-	ZBX_SOCKADDR	sa;
-	ZBX_SOCKLEN_T	sz = sizeof(sa);
-	static char	host[64];
-	char		*error_message = NULL;
+	ZBX_SOCKADDR			sa;
+	ZBX_SOCKLEN_T			sz = sizeof(sa);
+	ZBX_THREAD_LOCAL static char	host[64];
+	char				*error_message = NULL;
 
 	if (ZBX_TCP_ERROR == getpeername(s->socket, (struct sockaddr*)&sa, &sz))
 	{
diff --git a/src/libs/zbxcomms/telnet.c b/src/libs/zbxcomms/telnet.c
index 74fa96c6ad3..90ec8383cf2 100644
--- a/src/libs/zbxcomms/telnet.c
+++ b/src/libs/zbxcomms/telnet.c
@@ -70,7 +70,6 @@ static ssize_t	telnet_socket_read(ZBX_SOCKET socket_fd, void *buf, size_t count)
 		error = zbx_sock_last_error();	/* zabbix_log() resets the error code */
 		zabbix_log(LOG_LEVEL_DEBUG, "%s() rc:%d errno:%d error:[%s]",
 				__function_name, rc, error, strerror_from_system(error));
-
 #ifdef _WINDOWS
 		if (WSAEWOULDBLOCK == error)
 #else
@@ -111,7 +110,6 @@ static ssize_t	telnet_socket_write(ZBX_SOCKET socket_fd, const void *buf, size_t
 		error = zbx_sock_last_error();	/* zabbix_log() resets the error code */
 		zabbix_log(LOG_LEVEL_DEBUG, "%s() rc:%d errno:%d error:[%s]",
 				__function_name, rc, error, strerror_from_system(error));
-
 #ifdef _WINDOWS
 		if (WSAEWOULDBLOCK == error)
 #else
@@ -361,7 +359,7 @@ int	telnet_login(ZBX_SOCKET socket_fd, const char *username, const char *passwor
 
 	if (ZBX_TCP_ERROR == rc)
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "No login prompt"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "No login prompt."));
 		goto fail;
 	}
 
@@ -381,7 +379,7 @@ int	telnet_login(ZBX_SOCKET socket_fd, const char *username, const char *passwor
 
 	if (ZBX_TCP_ERROR == rc)
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "No password prompt"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "No password prompt."));
 		goto fail;
 	}
 
@@ -404,7 +402,7 @@ int	telnet_login(ZBX_SOCKET socket_fd, const char *username, const char *passwor
 
 	if (ZBX_TCP_ERROR == rc)
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Login failed"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Login failed."));
 		goto fail;
 	}
 
@@ -453,7 +451,8 @@ int	telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT *resu
 
 	if (ZBX_TCP_ERROR == rc)
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "No prompt: %s", zbx_tcp_strerror()));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot find prompt after command execution: %s",
+				strerror_from_system(zbx_sock_last_error())));
 		goto fail;
 	}
 
@@ -467,6 +466,7 @@ int	telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT *resu
 	for (i = 0; i < offset_lf; i++)
 	{
 		if ('\n' == command_lf[i])
+		{
 			if (SUCCEED != telnet_rm_echo(buf, &offset, "$ ", 2) &&
 				SUCCEED != telnet_rm_echo(buf, &offset, "# ", 2) &&
 				SUCCEED != telnet_rm_echo(buf, &offset, "> ", 2) &&
@@ -474,6 +474,7 @@ int	telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT *resu
 			{
 				break;
 			}
+		}
 	}
 
 	telnet_rm_echo(buf, &offset, "\n", 1);
diff --git a/src/libs/zbxcommshigh/comms.c b/src/libs/zbxcommshigh/comms.c
index 87a1cfd3f67..3e9ff0f7ab5 100644
--- a/src/libs/zbxcommshigh/comms.c
+++ b/src/libs/zbxcommshigh/comms.c
@@ -62,7 +62,7 @@ int	zbx_send_response_ext(zbx_sock_t *sock, int result, const char *info, int pr
 
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() '%s'", __function_name, json.buffer);
 
-	if (FAIL == (ret = zbx_tcp_send_ext(sock, json.buffer, protocol, timeout)))
+	if (FAIL == (ret = zbx_tcp_send_ext(sock, json.buffer, strlen(json.buffer), protocol, timeout)))
 	{
 		zabbix_log(LOG_LEVEL_DEBUG, "Error sending result back: %s", zbx_tcp_strerror());
 		ret = NETWORK_ERROR;
@@ -118,13 +118,13 @@ int	zbx_recv_response(zbx_sock_t *sock, char **info, int timeout, char **error)
 	const char		*__function_name = "zbx_recv_response";
 
 	struct zbx_json_parse	jp;
-	char			value[16], *answer, *info_buf = NULL;
+	char			value[16], *info_buf = NULL;
 	size_t			info_buf_alloc = 0;
 	int			ret = SUCCEED, invalid_format = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
-	if (SUCCEED != (ret = zbx_tcp_recv_to(sock, &answer, timeout)))
+	if (SUCCEED != (ret = zbx_tcp_recv_to(sock, timeout)))
 	{
 		/* since we have successfully sent data earlier, we assume the other */
 		/* side is just too busy processing our data if there is no response */
@@ -134,17 +134,17 @@ int	zbx_recv_response(zbx_sock_t *sock, char **info, int timeout, char **error)
 		goto out;
 	}
 
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() '%s'", __function_name, answer);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() '%s'", __function_name, sock->buffer);
 
 	/* deal with empty string here because zbx_json_open() does not produce an error message in this case */
-	if ('\0' == *answer)
+	if ('\0' == *sock->buffer)
 	{
 		*error = zbx_dsprintf(*error, "invalid response format: empty string received");
 		invalid_format = 1;
 		goto out;
 	}
 
-	if (SUCCEED != (ret = zbx_json_open(answer, &jp)))
+	if (SUCCEED != (ret = zbx_json_open(sock->buffer, &jp)))
 	{
 		*error = zbx_dsprintf(*error, "invalid response format: not a valid JSON: %s", zbx_json_strerror());
 		invalid_format = 1;
diff --git a/src/libs/zbxconf/cfg.c b/src/libs/zbxconf/cfg.c
index b5f7788bddc..ae048e67ff6 100644
--- a/src/libs/zbxconf/cfg.c
+++ b/src/libs/zbxconf/cfg.c
@@ -32,56 +32,195 @@ static int	__parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int leve
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_cfg_object                                                 *
+ * Function: match_glob                                                       *
  *                                                                            *
- * Purpose: parse "Include=..." line in configuration file                    *
+ * Purpose: see whether a file (e.g., "parameter.conf")                       *
+ *          matches a pattern (e.g., "p*.conf")                               *
  *                                                                            *
- * Parameters: cfg_file - full name of config file                            *
- *             cfg      - pointer to configuration parameter structure        *
- *             level    - a level of included file                            *
- *             strict   - treat unknown parameters as error                   *
- *                                                                            *
- * Return value: SUCCEED - parsed successfully                                *
- *               FAIL - error processing object                               *
+ * Return value: SUCCEED - file matches a pattern                             *
+ *               FAIL - otherwise                                             *
  *                                                                            *
  ******************************************************************************/
-static int	parse_cfg_object(const char *cfg_file, struct cfg_line *cfg, int level, int strict)
+static int	match_glob(const char *file, const char *pattern)
 {
+	const char	*f, *g, *p, *q;
+
+	f = file;
+	p = pattern;
+
+	while (1)
+	{
+		/* corner case */
+
+		if ('\0' == *p)
+			return '\0' == *f ? SUCCEED : FAIL;
+
+		/* find a set of literal characters */
+
+		while ('*' == *p)
+			p++;
+
+		for (q = p; '\0' != *q && '*' != *q; q++)
+			;
+
+		/* if literal characters are at the beginning... */
+
+		if (pattern == p)
+		{
 #ifdef _WINDOWS
-	const char		*__function_name = "parse_cfg_object";
+			if (0 != zbx_strncasecmp(f, p, q - p))
+#else
+			if (0 != strncmp(f, p, q - p))
+#endif
+				return FAIL;
 
-	int			ret = FAIL;
-	WIN32_FIND_DATAW	find_file_data;
-	HANDLE			h_find;
-	char 			*path = NULL, *file_name;
-	wchar_t			*wpath;
-	struct _stat		sb;
+			f += q - p;
+			p = q;
+
+			continue;
+		}
+
+		/* if literal characters are at the end... */
+
+		if ('\0' == *q)
+		{
+			for (g = f; '\0' != *g; g++)
+				;
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+			if (g - f < q - p)
+				return FAIL;
+#ifdef _WINDOWS
+			return 0 == strcasecmp(g - (q - p), p) ? SUCCEED : FAIL;
+#else
+			return 0 == strcmp(g - (q - p), p) ? SUCCEED : FAIL;
+#endif
+		}
 
-	path = zbx_strdup(path, cfg_file);
-	zbx_rtrim(path, "\\");
+		/* if literal characters are in the middle... */
 
-	wpath = zbx_utf8_to_unicode(path);
+		while (1)
+		{
+			if ('\0' == *f)
+				return FAIL;
+#ifdef _WINDOWS
+			if (0 == zbx_strncasecmp(f, p, q - p))
+#else
+			if (0 == strncmp(f, p, q - p))
+#endif
+			{
+				f += q - p;
+				p = q;
 
-	if (0 != _wstat(wpath, &sb))
+				break;
+			}
+
+			f++;
+		}
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: parse_glob                                                       *
+ *                                                                            *
+ * Purpose: parse a glob like "/usr/local/etc/zabbix_agentd.conf.d/p*.conf"   *
+ *          into "/usr/local/etc/zabbix_agentd.conf.d" and "p*.conf" parts    *
+ *                                                                            *
+ * Parameters: glob    - [IN] glob as specified in Include directive          *
+ *             path    - [OUT] parsed path, either directory or file          *
+ *             pattern - [OUT] parsed pattern, if path is directory           *
+ *                                                                            *
+ * Return value: SUCCEED - glob is valid and was parsed successfully          *
+ *               FAIL - otherwise                                             *
+ *                                                                            *
+ ******************************************************************************/
+static int	parse_glob(const char *glob, char **path, char **pattern)
+{
+	const char	*p;
+
+	if (NULL == (p = strchr(glob, '*')))
 	{
-		zbx_error("%s: %s\n", path, zbx_strerror(errno));
-		goto out;
+		*path = zbx_strdup(NULL, glob);
+		*pattern = NULL;
+
+		goto trim;
 	}
-	zbx_free(wpath);
 
-	if (0 == S_ISDIR(sb.st_mode))
+	if (NULL != strchr(p + 1, PATH_SEPARATOR))
 	{
-		ret = __parse_cfg_file(path, cfg, level, ZBX_CFG_FILE_REQUIRED, strict);
-		goto out;
+		zbx_error("%s: glob pattern should be the last component of the path\n", glob);
+		return FAIL;
 	}
 
-	path = zbx_dsprintf(path, "%s\\*", cfg_file);
-	wpath = zbx_utf8_to_unicode(path);
+	do
+	{
+		if (glob == p)
+		{
+			zbx_error("%s: path should be absolute\n", glob);
+			return FAIL;
+		}
 
-	if (INVALID_HANDLE_VALUE == (h_find = FindFirstFileW(wpath, &find_file_data)))
-		goto out;
+		p--;
+	}
+	while (PATH_SEPARATOR != *p);
+
+	*path = zbx_strdup(NULL, glob);
+	(*path)[p - glob] = '\0';
+
+	*pattern = zbx_strdup(NULL, p + 1);
+trim:
+#ifdef _WINDOWS
+	if (0 != zbx_rtrim(*path, "\\") && NULL == *pattern)
+		*pattern = zbx_strdup(NULL, "*");			/* make sure path is a directory */
+
+	if (':' == (*path)[1] && '\0' == (*path)[2] && '\\' == glob[2])	/* retain backslash for "C:\" */
+	{
+		(*path)[2] = '\\';
+		(*path)[3] = '\0';
+	}
+#else
+	if (0 != zbx_rtrim(*path, "/") && NULL == *pattern)
+		*pattern = zbx_strdup(NULL, "*");			/* make sure path is a directory */
+
+	if ('\0' == (*path)[0] && '/' == glob[0])			/* retain forward slash for "/" */
+	{
+		(*path)[0] = '/';
+		(*path)[1] = '\0';
+	}
+#endif
+	return SUCCEED;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: parse_cfg_dir                                                    *
+ *                                                                            *
+ * Purpose: parse directory with configuration files                          *
+ *                                                                            *
+ * Parameters: path    - full path to directory                               *
+ *             pattern - pattern that files in the directory should match     *
+ *             cfg     - pointer to configuration parameter structure         *
+ *             level   - a level of included file                             *
+ *             strict  - treat unknown parameters as error                    *
+ *                                                                            *
+ * Return value: SUCCEED - parsed successfully                                *
+ *               FAIL - error processing directory                            *
+ *                                                                            *
+ ******************************************************************************/
+#ifdef _WINDOWS
+static int	parse_cfg_dir(const char *path, const char *pattern, struct cfg_line *cfg, int level, int strict)
+{
+	WIN32_FIND_DATAW	find_file_data;
+	HANDLE			h_find;
+	char 			*find_path = NULL, *file = NULL, *file_name;
+	wchar_t			*wfind_path = NULL;
+	int			ret = FAIL;
+
+	find_path = zbx_dsprintf(find_path, "%s\\*", path);
+	wfind_path = zbx_utf8_to_unicode(find_path);
+
+	if (INVALID_HANDLE_VALUE == (h_find = FindFirstFileW(wfind_path, &find_file_data)))
+		goto clean;
 
 	while (0 != FindNextFileW(h_find, &find_file_data))
 	{
@@ -90,68 +229,121 @@ static int	parse_cfg_object(const char *cfg_file, struct cfg_line *cfg, int leve
 
 		file_name = zbx_unicode_to_utf8(find_file_data.cFileName);
 
-		path = zbx_dsprintf(path, "%s\\%s", cfg_file, file_name);
+		if (NULL != pattern && SUCCEED != match_glob(file_name, pattern))
+		{
+			zbx_free(file_name);
+			continue;
+		}
+
+		file = zbx_dsprintf(file, "%s\\%s", path, file_name);
 
 		zbx_free(file_name);
 
-		if (FAIL == __parse_cfg_file(path, cfg, level, ZBX_CFG_FILE_REQUIRED, strict))
-			goto out;
+		if (SUCCEED != __parse_cfg_file(file, cfg, level, ZBX_CFG_FILE_REQUIRED, strict))
+			goto close;
 	}
 
 	ret = SUCCEED;
-out:
+close:
+	zbx_free(file);
 	FindClose(h_find);
-	zbx_free(wpath);
-	zbx_free(path);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
+clean:
+	zbx_free(wfind_path);
+	zbx_free(find_path);
 
 	return ret;
+}
 #else
+static int	parse_cfg_dir(const char *path, const char *pattern, struct cfg_line *cfg, int level, int strict)
+{
 	DIR		*dir;
-	zbx_stat_t	sb;
 	struct dirent	*d;
-	char		*incl_file = NULL;
-	int		result = SUCCEED;
-
-	if (-1 == zbx_stat(cfg_file, &sb))
-	{
-		zbx_error("%s: %s\n", cfg_file, zbx_strerror(errno));
-		return FAIL;
-	}
-
-	if (!S_ISDIR(sb.st_mode))
-		return __parse_cfg_file(cfg_file, cfg, level, ZBX_CFG_FILE_REQUIRED, strict);
+	zbx_stat_t	sb;
+	char		*file = NULL;
+	int		ret = FAIL;
 
-	if (NULL == (dir = opendir(cfg_file)))
+	if (NULL == (dir = opendir(path)))
 	{
-		zbx_error("%s: %s\n", cfg_file, zbx_strerror(errno));
-		return FAIL;
+		zbx_error("%s: %s\n", path, zbx_strerror(errno));
+		goto out;
 	}
 
 	while (NULL != (d = readdir(dir)))
 	{
-		incl_file = zbx_dsprintf(incl_file, "%s/%s", cfg_file, d->d_name);
+		file = zbx_dsprintf(file, "%s/%s", path, d->d_name);
 
-		if (-1 == zbx_stat(incl_file, &sb) || !S_ISREG(sb.st_mode))
+		if (0 != zbx_stat(file, &sb) || 0 == S_ISREG(sb.st_mode))
 			continue;
 
-		if (FAIL == __parse_cfg_file(incl_file, cfg, level, ZBX_CFG_FILE_REQUIRED, strict))
-		{
-			result = FAIL;
-			break;
-		}
+		if (NULL != pattern && SUCCEED != match_glob(d->d_name, pattern))
+			continue;
+
+		if (SUCCEED != __parse_cfg_file(file, cfg, level, ZBX_CFG_FILE_REQUIRED, strict))
+			goto close;
 	}
-	zbx_free(incl_file);
 
-	if (-1 == closedir(dir))
+	ret = SUCCEED;
+close:
+	if (0 != closedir(dir))
 	{
-		zbx_error("%s: %s\n", cfg_file, zbx_strerror(errno));
-		return FAIL;
+		zbx_error("%s: %s\n", path, zbx_strerror(errno));
+		ret = FAIL;
 	}
 
-	return result;
+	zbx_free(file);
+out:
+	return ret;
+}
 #endif
+
+/******************************************************************************
+ *                                                                            *
+ * Function: parse_cfg_object                                                 *
+ *                                                                            *
+ * Purpose: parse "Include=..." line in configuration file                    *
+ *                                                                            *
+ * Parameters: cfg_file - full name of config file                            *
+ *             cfg      - pointer to configuration parameter structure        *
+ *             level    - a level of included file                            *
+ *             strict   - treat unknown parameters as error                   *
+ *                                                                            *
+ * Return value: SUCCEED - parsed successfully                                *
+ *               FAIL - error processing object                               *
+ *                                                                            *
+ ******************************************************************************/
+static int	parse_cfg_object(const char *cfg_file, struct cfg_line *cfg, int level, int strict)
+{
+	int		ret = FAIL;
+	char		*path = NULL, *pattern = NULL;
+	zbx_stat_t	sb;
+
+	if (SUCCEED != parse_glob(cfg_file, &path, &pattern))
+		goto clean;
+
+	if (0 != zbx_stat(path, &sb))
+	{
+		zbx_error("%s: %s\n", path, zbx_strerror(errno));
+		goto clean;
+	}
+
+	if (0 == S_ISDIR(sb.st_mode))
+	{
+		if (NULL == pattern)
+		{
+			ret = __parse_cfg_file(path, cfg, level, ZBX_CFG_FILE_REQUIRED, strict);
+			goto clean;
+		}
+
+		zbx_error("%s: base path is not a directory\n", cfg_file);
+		goto clean;
+	}
+
+	ret = parse_cfg_dir(path, pattern, cfg, level, strict);
+clean:
+	zbx_free(pattern);
+	zbx_free(path);
+
+	return ret;
 }
 
 /******************************************************************************
@@ -171,8 +363,6 @@ out:
  *                                                                            *
  * Author: Alexei Vladishev, Eugene Grigorjev                                 *
  *                                                                            *
- * Comments:                                                                  *
- *                                                                            *
  ******************************************************************************/
 static int	__parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int level, int optional, int strict)
 {
diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c
index 825bccb0ede..8832376d1c1 100644
--- a/src/libs/zbxdb/db.c
+++ b/src/libs/zbxdb/db.c
@@ -42,7 +42,7 @@ static zbx_oracle_db_handle_t	oracle;
 /* 64-bit integer binding is supported only starting with Oracle 11.2 */
 /* so for compatibility reasons we must convert 64-bit values to      */
 /* Oracle numbers before binding.                                     */
-static OCINumber	*oci_ids = NULL;
+static OCINumber	**oci_ids = NULL;
 static int		oci_ids_alloc = 0;
 static int		oci_ids_num = 0;
 
@@ -53,7 +53,7 @@ static int			ZBX_PG_SVERSION = 0;
 char				ZBX_PG_ESCAPE_BACKSLASH = 1;
 #elif defined(HAVE_SQLITE3)
 static sqlite3			*conn = NULL;
-static PHP_MUTEX		sqlite_access;
+static ZBX_MUTEX		sqlite_access;
 #endif
 
 #if defined(HAVE_ORACLE)
@@ -216,6 +216,7 @@ int	zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d
 	char		*connect = NULL;
 	sword		err = OCI_SUCCESS;
 #elif defined(HAVE_POSTGRESQL)
+	int		rc;
 	char		*cport = NULL;
 	DB_RESULT	result;
 	DB_ROW		row;
@@ -411,6 +412,19 @@ int	zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d
 		goto out;
 	}
 
+	if (NULL != dbschema && '\0' != *dbschema)
+	{
+		char	*dbschema_esc;
+
+		dbschema_esc = zbx_db_dyn_escape_string(dbschema);
+		if (ZBX_DB_DOWN == (rc = zbx_db_execute("set schema '%s'", dbschema_esc)) || ZBX_DB_FAIL == rc)
+			ret = rc;
+		zbx_free(dbschema_esc);
+	}
+
+	if (ZBX_DB_FAIL == ret || ZBX_DB_DOWN == ret)
+		goto out;
+
 	result = zbx_db_select("%s", "select oid from pg_type where typname='bytea'");
 
 	if ((DB_RESULT)ZBX_DB_DOWN == result || NULL == result)
@@ -501,18 +515,18 @@ out:
 }
 
 #if defined(HAVE_SQLITE3)
-void	zbx_create_sqlite3_mutex(const char *dbname)
+void	zbx_create_sqlite3_mutex(void)
 {
-	if (PHP_MUTEX_OK != php_sem_get(&sqlite_access, dbname))
+	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&sqlite_access, ZBX_MUTEX_SQLITE3))
 	{
 		zbx_error("cannot create mutex for SQLite3");
 		exit(EXIT_FAILURE);
 	}
 }
 
-void	zbx_remove_sqlite3_mutex()
+void	zbx_remove_sqlite3_mutex(void)
 {
-	php_sem_remove(&sqlite_access);
+	zbx_mutex_destroy(&sqlite_access);
 }
 #endif	/* HAVE_SQLITE3 */
 
@@ -532,17 +546,17 @@ void	zbx_db_init(const char *dbname, const char *const db_schema)
 			exit(EXIT_FAILURE);
 		}
 
-		zbx_create_sqlite3_mutex(dbname);
+		zbx_create_sqlite3_mutex();
 
 		zbx_db_execute("%s", db_schema);
 		zbx_db_close();
 	}
 	else
-		zbx_create_sqlite3_mutex(dbname);
+		zbx_create_sqlite3_mutex();
 #endif	/* HAVE_SQLITE3 */
 }
 
-void	zbx_db_close()
+void	zbx_db_close(void)
 {
 #if defined(HAVE_IBM_DB2)
 	if (ibm_db2.hdbc)
@@ -616,7 +630,7 @@ void	zbx_db_close()
  * Comments: do nothing if DB does not support transactions                   *
  *                                                                            *
  ******************************************************************************/
-int	zbx_db_begin()
+int	zbx_db_begin(void)
 {
 	int	rc = ZBX_DB_OK;
 
@@ -640,11 +654,7 @@ int	zbx_db_begin()
 #elif defined(HAVE_MYSQL) || defined(HAVE_POSTGRESQL)
 	rc = zbx_db_execute("%s", "begin;");
 #elif defined(HAVE_SQLITE3)
-	if (PHP_MUTEX_OK != php_sem_acquire(&sqlite_access))
-	{
-		zabbix_log(LOG_LEVEL_CRIT, "ERROR: cannot create lock on SQLite3 database");
-		assert(0);
-	}
+	zbx_mutex_lock(&sqlite_access);
 	rc = zbx_db_execute("%s", "begin;");
 #endif
 
@@ -663,7 +673,7 @@ int	zbx_db_begin()
  * Comments: do nothing if DB does not support transactions                   *
  *                                                                            *
  ******************************************************************************/
-int	zbx_db_commit()
+int	zbx_db_commit(void)
 {
 	int	rc = ZBX_DB_OK;
 
@@ -697,7 +707,7 @@ int	zbx_db_commit()
 	OCITransCommit(oracle.svchp, oracle.errhp, OCI_DEFAULT);
 #elif defined(HAVE_SQLITE3)
 	rc = zbx_db_execute("%s", "commit;");
-	php_sem_release(&sqlite_access);
+	zbx_mutex_unlock(&sqlite_access);
 #endif
 
 	if (ZBX_DB_DOWN != rc)	/* ZBX_DB_FAIL or ZBX_DB_OK or number of changes */
@@ -715,7 +725,7 @@ int	zbx_db_commit()
  * Comments: do nothing if DB does not support transactions                   *
  *                                                                            *
  ******************************************************************************/
-int	zbx_db_rollback()
+int	zbx_db_rollback(void)
 {
 	int	rc = ZBX_DB_OK, last_txn_error;
 
@@ -748,7 +758,7 @@ int	zbx_db_rollback()
 	OCITransRollback(oracle.svchp, oracle.errhp, OCI_DEFAULT);
 #elif defined(HAVE_SQLITE3)
 	rc = zbx_db_execute("%s", "rollback;");
-	php_sem_release(&sqlite_access);
+	zbx_mutex_unlock(&sqlite_access);
 #endif
 
 	if (ZBX_DB_DOWN != rc)	/* ZBX_DB_FAIL or ZBX_DB_OK or number of changes */
@@ -759,12 +769,12 @@ int	zbx_db_rollback()
 	return rc;
 }
 
-int	zbx_db_txn_level()
+int	zbx_db_txn_level(void)
 {
 	return txn_level;
 }
 
-int	zbx_db_txn_error()
+int	zbx_db_txn_error(void)
 {
 	return txn_error;
 }
@@ -772,8 +782,6 @@ int	zbx_db_txn_error()
 #ifdef HAVE_ORACLE
 static sword	zbx_oracle_statement_prepare(const char *sql)
 {
-	oci_ids_num = 0;
-
 	return OCIStmtPrepare(oracle.stmthp, oracle.errhp, (text *)sql, (ub4)strlen((char *)sql), (ub4)OCI_NTV_SYNTAX,
 			(ub4)OCI_DEFAULT);
 }
@@ -798,6 +806,8 @@ static sword	zbx_oracle_statement_execute(ub4 *nrows)
 		err = OCIAttrGet((void *)oracle.stmthp, OCI_HTYPE_STMT, nrows, (ub4 *)0, OCI_ATTR_ROW_COUNT, oracle.errhp);
 	}
 
+	oci_ids_num = 0;
+
 	return err;
 }
 #endif
@@ -817,6 +827,8 @@ int	zbx_db_statement_prepare(const char *sql)
 		return ZBX_DB_FAIL;
 	}
 
+	oci_ids_num = 0;
+
 	zabbix_log(LOG_LEVEL_DEBUG, "query [txnlev:%d] [%s]", txn_level, sql);
 
 	if (OCI_SUCCESS != (err = zbx_oracle_statement_prepare(sql)))
@@ -834,7 +846,7 @@ int	zbx_db_statement_prepare(const char *sql)
 int	zbx_db_bind_parameter(int position, void *buffer, unsigned char type)
 {
 	sword	err;
-	int	ret = ZBX_DB_OK;
+	int	ret = ZBX_DB_OK, old_alloc, i;
 
 	if (1 == txn_error)
 	{
@@ -854,14 +866,18 @@ int	zbx_db_bind_parameter(int position, void *buffer, unsigned char type)
 		case ZBX_TYPE_UINT:
 			if (oci_ids_num >= oci_ids_alloc)
 			{
+				old_alloc = oci_ids_alloc;
 				oci_ids_alloc = (0 == oci_ids_alloc ? 8 : oci_ids_alloc * 1.5);
-				oci_ids = zbx_realloc(oci_ids, oci_ids_alloc * sizeof(OCINumber));
+				oci_ids = zbx_realloc(oci_ids, oci_ids_alloc * sizeof(OCINumber *));
+
+				for (i = old_alloc; i < oci_ids_alloc; i++)
+					oci_ids[i] = zbx_malloc(NULL, sizeof(OCINumber));
 			}
 
 			if (OCI_SUCCESS == (err = OCINumberFromInt(oracle.errhp, buffer, sizeof(zbx_uint64_t),
-					OCI_NUMBER_UNSIGNED, &oci_ids[oci_ids_num])))
+					OCI_NUMBER_UNSIGNED, oci_ids[oci_ids_num])))
 			{
-				err = zbx_oracle_bind_parameter((ub4)position, &oci_ids[oci_ids_num++],
+				err = zbx_oracle_bind_parameter((ub4)position, oci_ids[oci_ids_num++],
 						(sb4)sizeof(OCINumber), SQLT_VNU);
 			}
 			break;
@@ -1082,11 +1098,8 @@ int	zbx_db_vexecute(const char *fmt, va_list args)
 
 	PQclear(result);
 #elif defined(HAVE_SQLITE3)
-	if (0 == txn_level && PHP_MUTEX_OK != php_sem_acquire(&sqlite_access))
-	{
-		zabbix_log(LOG_LEVEL_CRIT, "ERROR: cannot create lock on SQLite3 database");
-		exit(EXIT_FAILURE);
-	}
+	if (0 == txn_level)
+		zbx_mutex_lock(&sqlite_access);
 
 lbl_exec:
 	if (SQLITE_OK != (err = sqlite3_exec(conn, sql, NULL, 0, &error)))
@@ -1117,7 +1130,7 @@ lbl_exec:
 		ret = sqlite3_changes(conn);
 
 	if (0 == txn_level)
-		php_sem_release(&sqlite_access);
+		zbx_mutex_unlock(&sqlite_access);
 #endif	/* HAVE_SQLITE3 */
 
 	if (0 != CONFIG_LOG_SLOW_QUERIES)
@@ -1420,11 +1433,8 @@ error:
 	else	/* init rownum */
 		result->row_num = PQntuples(result->pg_result);
 #elif defined(HAVE_SQLITE3)
-	if (0 == txn_level && PHP_MUTEX_OK != php_sem_acquire(&sqlite_access))
-	{
-		zabbix_log(LOG_LEVEL_CRIT, "ERROR: cannot create lock on SQLite3 database");
-		exit(EXIT_FAILURE);
-	}
+	if (0 == txn_level)
+		zbx_mutex_lock(&sqlite_access);
 
 	result = zbx_malloc(NULL, sizeof(ZBX_SQ_DB_RESULT));
 	result->curow = 0;
@@ -1455,7 +1465,7 @@ lbl_get_table:
 	}
 
 	if (0 == txn_level)
-		php_sem_release(&sqlite_access);
+		zbx_mutex_unlock(&sqlite_access);
 #endif	/* HAVE_SQLITE3 */
 
 	if (0 != CONFIG_LOG_SLOW_QUERIES)
@@ -1929,8 +1939,6 @@ static size_t	zbx_db_get_escape_string_len(const char *src)
 
 	for (s = src; NULL != s && '\0' != *s; s++)
 	{
-		if ('\r' == *s)
-			continue;
 #if defined(HAVE_MYSQL)
 		if ('\'' == *s || '\\' == *s)
 #elif defined(HAVE_POSTGRESQL)
@@ -1971,9 +1979,6 @@ static void	zbx_db_escape_string(const char *src, char *dst, size_t len)
 
 	for (s = src, d = dst; NULL != s && '\0' != *s && 0 < len; s++)
 	{
-		if ('\r' == *s)
-			continue;
-
 #if defined(HAVE_MYSQL)
 		if ('\'' == *s || '\\' == *s)
 #elif defined(HAVE_POSTGRESQL)
@@ -2035,9 +2040,6 @@ char	*zbx_db_dyn_escape_string_len(const char *src, size_t max_src_len)
 
 	for (s = src; NULL != s && '\0' != *s && 0 < max_src_len; s++)
 	{
-		if ('\r' == *s)
-			continue;
-
 		/* only UTF-8 characters should reduce a variable max_src_len */
 		if (0x80 != (0xc0 & *s) && 0 == --max_src_len)
 			break;
diff --git a/src/libs/zbxdbcache/dbcache.c b/src/libs/zbxdbcache/dbcache.c
index 7fb33285c0e..08cf5c79fcc 100644
--- a/src/libs/zbxdbcache/dbcache.c
+++ b/src/libs/zbxdbcache/dbcache.c
@@ -439,8 +439,9 @@ static void	DCflush_trends(ZBX_DC_TREND *trends, int *trends_num, int update_cac
 				trend->num += num;
 
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-						"update trends set num=%d,value_min=" ZBX_FS_DBL ",value_avg=" ZBX_FS_DBL
-						",value_max=" ZBX_FS_DBL " where itemid=" ZBX_FS_UI64 " and clock=%d;\n",
+						"update trends set num=%d,value_min=" ZBX_FS_DBL ",value_avg="
+						ZBX_FS_DBL ",value_max=" ZBX_FS_DBL " where itemid=" ZBX_FS_UI64
+						" and clock=%d;\n",
 						trend->num,
 						trend->value_min.dbl,
 						trend->value_avg.dbl,
@@ -469,8 +470,9 @@ static void	DCflush_trends(ZBX_DC_TREND *trends, int *trends_num, int update_cac
 				trend->num += num;
 
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-						"update trends_uint set num=%d,value_min=" ZBX_FS_UI64 ",value_avg=" ZBX_FS_UI64
-						",value_max=" ZBX_FS_UI64 " where itemid=" ZBX_FS_UI64 " and clock=%d;\n",
+						"update trends_uint set num=%d,value_min=" ZBX_FS_UI64 ",value_avg="
+						ZBX_FS_UI64 ",value_max=" ZBX_FS_UI64 " where itemid=" ZBX_FS_UI64
+						" and clock=%d;\n",
 						trend->num,
 						trend->value_min.ui64,
 						avg.lo,
@@ -646,7 +648,7 @@ static void	DCadd_trend(ZBX_DC_HISTORY *history, ZBX_DC_TREND **trends, int *tre
  *                                                                            *
  * Function: DCmass_update_trends                                             *
  *                                                                            *
- * Parameters: history - array of history data                                *
+ * Parameters: history     - array of history data                            *
  *             history_num - number of history structures                     *
  *                                                                            *
  * Author: Alexander Vladishev                                                *
@@ -732,7 +734,7 @@ static void	DCsync_trends()
  *                                                                            *
  * Purpose: re-calculate and update values of triggers related to the items   *
  *                                                                            *
- * Parameters: history - array of history data                                *
+ * Parameters: history     - array of history data                            *
  *             history_num - number of history structures                     *
  *                                                                            *
  * Author: Alexei Vladishev, Alexander Vladishev                              *
@@ -1064,6 +1066,13 @@ notsupported:
 			value_esc = DBdyn_escape_string_len(h->value_orig.err, ITEM_ERROR_LEN);
 			zbx_snprintf_alloc(&sql, &sql_alloc, sql_offset, "%serror='%s'", sql_start, value_esc);
 			sql_start = sql_continue;
+
+			if (ITEM_STATE_NOTSUPPORTED == item->db_state)
+			{
+				zabbix_log(LOG_LEVEL_WARNING, "error reason for \"%s:%s\" changed: %s", item->host.host,
+						item->key_orig, h->value_orig.err);
+			}
+
 			zbx_free(value_esc);
 
 			update_cache = 1;
@@ -1078,7 +1087,8 @@ notsupported:
 	{
 		if (ITEM_STATE_NOTSUPPORTED == item->db_state)
 		{
-			zabbix_log(LOG_LEVEL_WARNING, "item \"%s\" became supported", item->host.host, item->key_orig);
+			zabbix_log(LOG_LEVEL_WARNING, "item \"%s:%s\" became supported",
+					item->host.host, item->key_orig);
 
 			/* we know it's EVENT_OBJECT_ITEM because LLDRULE that becomes */
 			/* supported is handled in lld_process_discovery_rule()        */
@@ -1172,7 +1182,7 @@ static void	DCinventory_value_free(zbx_inventory_value_t *inventory_value)
  *                                                                            *
  * Purpose: update items info after new value is received                     *
  *                                                                            *
- * Parameters: history - array of history data                                *
+ * Parameters: history     - array of history data                            *
  *             history_num - number of history structures                     *
  *                                                                            *
  * Author: Alexei Vladishev, Eugene Grigorjev, Alexander Vladishev            *
@@ -1217,6 +1227,12 @@ static void	DCmass_update_items(ZBX_DC_HISTORY *history, int history_num)
 		if (SUCCEED != errcodes[i])
 			continue;
 
+		if (ITEM_STATUS_ACTIVE != items[i].status)
+			continue;
+
+		if (HOST_STATUS_MONITORED != items[i].host.status)
+			continue;
+
 		for (j = 0; j < history_num; j++)
 		{
 			if (items[i].itemid == history[j].itemid)
@@ -1285,7 +1301,7 @@ static void	DCmass_update_items(ZBX_DC_HISTORY *history, int history_num)
  *                                                                            *
  * Purpose: update items info after new value is received                     *
  *                                                                            *
- * Parameters: history - array of history data                                *
+ * Parameters: history     - array of history data                            *
  *             history_num - number of history structures                     *
  *                                                                            *
  * Author: Alexei Vladishev, Eugene Grigorjev, Alexander Vladishev            *
@@ -1511,7 +1527,7 @@ static void	dc_add_history_log(ZBX_DC_HISTORY *history, int history_num, int hlo
  *                                                                            *
  * Purpose: inserting new history data after new value is received            *
  *                                                                            *
- * Parameters: history - array of history data                                *
+ * Parameters: history     - array of history data                            *
  *             history_num - number of history structures                     *
  *                                                                            *
  * Author: Alexander Vladishev                                                *
@@ -1725,7 +1741,7 @@ static void	dc_add_proxy_history_notsupported(ZBX_DC_HISTORY *history, int histo
  *                                                                            *
  * Purpose: inserting new history data after new value is received            *
  *                                                                            *
- * Parameters: history - array of history data                                *
+ * Parameters: history     - array of history data                            *
  *             history_num - number of history structures                     *
  *                                                                            *
  * Author: Alexander Vladishev                                                *
@@ -2239,7 +2255,7 @@ retry:
 		if (text_len > CONFIG_TEXT_CACHE_SIZE)
 		{
 			zabbix_log(LOG_LEVEL_ERR, "insufficient shared memory for text cache");
-			exit(-1);
+			exit(EXIT_FAILURE);
 		}
 
 		free_len = CONFIG_TEXT_CACHE_SIZE - (cache->last_text - cache->text);
@@ -2797,13 +2813,13 @@ static void	init_trend_cache()
 	if (-1 == (trend_shm_key = zbx_ftok(CONFIG_FILE, ZBX_IPC_TREND_ID)))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "cannot create IPC key for trend cache");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&trends_lock, ZBX_MUTEX_TRENDS))
 	{
 		zbx_error("cannot create mutex for trend cache");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	sz = zbx_mem_required_size(1, "trend cache", "TrendCacheSize");
@@ -2850,19 +2866,19 @@ void	init_database_cache()
 			-1 == (history_text_shm_key = zbx_ftok(CONFIG_FILE, ZBX_IPC_HISTORY_TEXT_ID)))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "cannot create IPC keys for history cache");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&cache_lock, ZBX_MUTEX_CACHE))
 	{
 		zbx_error("cannot create mutex for history cache");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&cache_ids_lock, ZBX_MUTEX_CACHE_IDS))
 	{
 		zbx_error("cannot create mutex for IDs cache");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	itemids_alloc = CONFIG_HISTSYNCER_FORKS * ZBX_SYNC_MAX;
@@ -3023,7 +3039,7 @@ zbx_uint64_t	DCget_nextid(const char *table_name, int num)
 	if (i == ZBX_IDS_SIZE)
 	{
 		zabbix_log(LOG_LEVEL_ERR, "insufficient shared memory for ids");
-		exit(-1);
+		exit(EXIT_FAILURE);
 	}
 
 	zbx_strlcpy(id->table_name, table_name, sizeof(id->table_name));
diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c
index 8494ff51858..433a60129f2 100644
--- a/src/libs/zbxdbcache/dbconfig.c
+++ b/src/libs/zbxdbcache/dbconfig.c
@@ -51,18 +51,20 @@ typedef struct
 	const char	*expression;
 	const char	*error;
 	int		lastchange;
+	unsigned char	topoindex;
 	unsigned char	priority;
 	unsigned char	type;
 	unsigned char	value;
 	unsigned char	state;
 	unsigned char	locked;
+	unsigned char	status;
 }
 ZBX_DC_TRIGGER;
 
 typedef struct zbx_dc_trigger_deplist_s
 {
 	zbx_uint64_t				triggerid;
-	const ZBX_DC_TRIGGER			*trigger;
+	ZBX_DC_TRIGGER				*trigger;
 	const struct zbx_dc_trigger_deplist_s	**dependencies;
 }
 ZBX_DC_TRIGGER_DEPLIST;
@@ -86,6 +88,7 @@ typedef struct
 	zbx_uint64_t	valuemapid;
 	const char	*key;
 	const char	*port;
+	const char	*units;
 	const char	*db_error;
 	ZBX_DC_TRIGGER	**triggers;
 	int		delay;
@@ -103,6 +106,7 @@ typedef struct
 	unsigned char	inventory_link;
 	unsigned char	location;
 	unsigned char	flags;
+	unsigned char	status;
 }
 ZBX_DC_ITEM;
 
@@ -259,12 +263,10 @@ ZBX_DC_HOST_INVENTORY;
 
 typedef struct
 {
-	zbx_uint64_t	proxy_hostid;
 	const char	*host;
 	ZBX_DC_HOST	*host_ptr;
-	unsigned char	status;
 }
-ZBX_DC_HOST_PH;
+ZBX_DC_HOST_H;
 
 typedef struct
 {
@@ -331,9 +333,10 @@ typedef struct
 	const char	*ip;
 	const char	*dns;
 	const char	*port;
-	unsigned char	useip;
 	unsigned char	type;
 	unsigned char	main;
+	unsigned char	useip;
+	unsigned char	bulk;
 	unsigned char	max_snmp_succeed;
 	unsigned char	min_snmp_fail;
 }
@@ -411,7 +414,7 @@ typedef struct
 	zbx_hashset_t		trigdeps;
 	zbx_vector_ptr_t	*time_triggers;
 	zbx_hashset_t		hosts;
-	zbx_hashset_t		hosts_ph;		/* proxy_hostid, host */
+	zbx_hashset_t		hosts_h;		/* host */
 	zbx_hashset_t		proxies;
 	zbx_hashset_t		host_inventories;
 	zbx_hashset_t		ipmihosts;
@@ -441,16 +444,85 @@ extern int		CONFIG_TIMER_FORKS;
 
 ZBX_MEM_FUNC_IMPL(__config, config_mem);
 
-static unsigned char	poller_by_item(zbx_uint64_t itemid, zbx_uint64_t proxy_hostid,
-		unsigned char item_type, const char *key, unsigned char flags)
+/******************************************************************************
+ *                                                                            *
+ * Function: is_item_processed_by_server                                      *
+ *                                                                            *
+ * Parameters: type - [IN] item type [ITEM_TYPE_* flag]                       *
+ *             key  - [IN] item key                                           *
+ *                                                                            *
+ * Return value: SUCCEED when an item should be processed by server           *
+ *               FAIL otherwise                                               *
+ *                                                                            *
+ * Comments: list of the items, always processed by server                    *
+ *           ,------------------+--------------------------------------,      *
+ *           | type             | key                                  |      *
+ *           +------------------+--------------------------------------+      *
+ *           | Zabbix internal  | zabbix[host,,maintenance]            |      *
+ *           | Zabbix internal  | zabbix[proxy,<proxyname>,lastaccess] |      *
+ *           | Zabbix aggregate | *                                    |      *
+ *           | Calculated       | *                                    |      *
+ *           '------------------+--------------------------------------'      *
+ *                                                                            *
+ ******************************************************************************/
+int	is_item_processed_by_server(unsigned char type, const char *key)
 {
-	if (0 != proxy_hostid && (ITEM_TYPE_AGGREGATE != item_type &&
-				ITEM_TYPE_CALCULATED != item_type))
+	int	ret = FAIL;
+
+	switch (type)
 	{
-		return ZBX_NO_POLLER;
+		case ITEM_TYPE_AGGREGATE:
+		case ITEM_TYPE_CALCULATED:
+			ret = SUCCEED;
+			break;
+
+		case ITEM_TYPE_INTERNAL:
+			if (0 == strncmp(key, "zabbix[", 7))
+			{
+				AGENT_REQUEST	request;
+				char		*arg1, *arg2, *arg3;
+
+				init_request(&request);
+
+				if (SUCCEED != parse_item_key(key, &request) || 3 != request.nparam)
+					goto clean;
+
+				arg1 = get_rparam(&request, 0);
+
+				if (0 == strcmp(arg1, "host"))
+				{
+					arg2 = get_rparam(&request, 1);
+					arg3 = get_rparam(&request, 2);
+
+					if (0 != strcmp(arg3, "maintenance") || '\0' != *arg2)
+						goto clean;
+				}
+				else if (0 == strcmp(arg1, "proxy"))
+				{
+					arg3 = get_rparam(&request, 2);
+
+					if (0 != strcmp(arg3, "lastaccess"))
+						goto clean;
+				}
+				else
+					goto clean;
+
+				ret = SUCCEED;
+clean:
+				free_request(&request);
+			}
+			break;
 	}
 
-	switch (item_type)
+	return ret;
+}
+
+static unsigned char	poller_by_item(zbx_uint64_t proxy_hostid, unsigned char type, const char *key)
+{
+	if (0 != proxy_hostid && SUCCEED != is_item_processed_by_server(type, key))
+		return ZBX_NO_POLLER;
+
+	switch (type)
 	{
 		case ITEM_TYPE_SIMPLE:
 			if (SUCCEED == cmp_key_id(key, SERVER_ICMPPING_KEY) ||
@@ -494,12 +566,40 @@ static unsigned char	poller_by_item(zbx_uint64_t itemid, zbx_uint64_t proxy_host
 
 /******************************************************************************
  *                                                                            *
+ * Function: is_counted_in_item_queue                                         *
+ *                                                                            *
+ * Purpose: determine whether the given item type is counted in item queue    *
+ *                                                                            *
+ * Return value: SUCCEED if item is counted in the queue, FAIL otherwise      *
+ *                                                                            *
+ ******************************************************************************/
+static int	is_counted_in_item_queue(unsigned char type, const char *key)
+{
+	switch (type)
+	{
+		case ITEM_TYPE_ZABBIX_ACTIVE:
+			if (0 == strncmp(key, "log[", 4) ||
+					0 == strncmp(key, "logrt[", 6) ||
+					0 == strncmp(key, "eventlog[", 9))
+			{
+				return FAIL;
+			}
+			break;
+		case ITEM_TYPE_TRAPPER:
+		case ITEM_TYPE_HTTPTEST:
+		case ITEM_TYPE_SNMPTRAP:
+			return FAIL;
+	}
+
+	return SUCCEED;
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: get_item_nextcheck_seed                                          *
  *                                                                            *
  * Purpose: get the seed value to be used for item nextcheck calculations     *
  *                                                                            *
- * Parameters: item - [IN] the item                                           *
- *                                                                            *
  * Return value: the seed for nextcheck calculations                          *
  *                                                                            *
  * Comments: The seed value is used to spread multiple item nextchecks over   *
@@ -508,40 +608,58 @@ static unsigned char	poller_by_item(zbx_uint64_t itemid, zbx_uint64_t proxy_host
  *           same nextcheck values.                                           *
  *                                                                            *
  ******************************************************************************/
-static zbx_uint64_t	get_item_nextcheck_seed(const ZBX_DC_ITEM *item)
+static zbx_uint64_t	get_item_nextcheck_seed(zbx_uint64_t itemid, zbx_uint64_t interfaceid, unsigned char type,
+		const char *key)
 {
-	if (ITEM_TYPE_JMX == item->type || SUCCEED == is_snmp_type(item->type))
-		return item->interfaceid;
+	if (ITEM_TYPE_JMX == type)
+		return interfaceid;
 
-	if (ITEM_TYPE_SIMPLE == item->type)
+	if (SUCCEED == is_snmp_type(type))
 	{
-		if (SUCCEED == cmp_key_id(item->key, SERVER_ICMPPING_KEY) ||
-				SUCCEED == cmp_key_id(item->key, SERVER_ICMPPINGSEC_KEY) ||
-				SUCCEED == cmp_key_id(item->key, SERVER_ICMPPINGLOSS_KEY))
+		ZBX_DC_INTERFACE	*interface;
+
+		if (NULL == (interface = zbx_hashset_search(&config->interfaces, &interfaceid)) ||
+				SNMP_BULK_ENABLED != interface->bulk)
 		{
-			return item->interfaceid;
+			return itemid;
 		}
+
+		return interfaceid;
 	}
 
-	return item->itemid;
+	if (ITEM_TYPE_SIMPLE == type)
+	{
+		if (SUCCEED == cmp_key_id(key, SERVER_ICMPPING_KEY) ||
+				SUCCEED == cmp_key_id(key, SERVER_ICMPPINGSEC_KEY) ||
+				SUCCEED == cmp_key_id(key, SERVER_ICMPPINGLOSS_KEY))
+		{
+			return interfaceid;
+		}
+	}
+
+	return itemid;
 }
 
 static int	DCget_reachable_nextcheck(const ZBX_DC_ITEM *item, int now)
 {
-	int	nextcheck;
+	int		nextcheck;
+	zbx_uint64_t	seed;
+
+	seed = get_item_nextcheck_seed(item->itemid, item->interfaceid, item->type, item->key);
 
 	if (ITEM_STATE_NOTSUPPORTED == item->state)
 	{
-		nextcheck = calculate_item_nextcheck(get_item_nextcheck_seed(item), item->type,
-				config->config->refresh_unsupported, NULL, now);
+		nextcheck = calculate_item_nextcheck(seed, item->type, config->config->refresh_unsupported, NULL, now);
 	}
 	else
 	{
 		const ZBX_DC_FLEXITEM	*flexitem;
+		const char		*delay_flex;
 
 		flexitem = zbx_hashset_search(&config->flexitems, &item->itemid);
-		nextcheck = calculate_item_nextcheck(get_item_nextcheck_seed(item), item->type,
-				item->delay, NULL != flexitem ? flexitem->delay_flex : NULL, now);
+		delay_flex = (NULL != flexitem ? flexitem->delay_flex : NULL);
+
+		nextcheck = calculate_item_nextcheck(seed, item->type, item->delay, delay_flex, now);
 	}
 
 	return nextcheck;
@@ -663,18 +781,16 @@ static ZBX_DC_ITEM	*DCfind_item(zbx_uint64_t hostid, const char *key)
 		return item_hk->item_ptr;
 }
 
-static ZBX_DC_HOST	*DCfind_host(zbx_uint64_t proxy_hostid, const char *host)
+static ZBX_DC_HOST	*DCfind_host(const char *host)
 {
-	ZBX_DC_HOST_PH	*host_ph, host_ph_local;
+	ZBX_DC_HOST_H	*host_h, host_h_local;
 
-	host_ph_local.proxy_hostid = proxy_hostid;
-	host_ph_local.status = HOST_STATUS_MONITORED;
-	host_ph_local.host = host;
+	host_h_local.host = host;
 
-	if (NULL == (host_ph = zbx_hashset_search(&config->hosts_ph, &host_ph_local)))
+	if (NULL == (host_h = zbx_hashset_search(&config->hosts_h, &host_h_local)))
 		return NULL;
 	else
-		return host_ph->host_ptr;
+		return host_h->host_ptr;
 }
 
 static int	DCstrpool_replace(int found, const char **curr, const char *new)
@@ -745,7 +861,7 @@ static void	DCupdate_proxy_queue(ZBX_DC_PROXY *proxy)
 #define DEFAULT_REFRESH_UNSUPPORTED	600
 static char	*default_severity_names[] = {"Not classified", "Information", "Warning", "Average", "High", "Disaster"};
 
-static int	DCsync_config(DB_RESULT result)
+static int	DCsync_config(DB_RESULT result, int *refresh_unsupported_changed)
 {
 	const char	*__function_name = "DCsync_config";
 	DB_ROW		row;
@@ -753,6 +869,8 @@ static int	DCsync_config(DB_RESULT result)
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
+	*refresh_unsupported_changed = 0;
+
 	if (NULL == config->config)
 	{
 		found = 0;
@@ -768,6 +886,8 @@ static int	DCsync_config(DB_RESULT result)
 		{
 			/* load default config data */
 
+			*refresh_unsupported_changed = 1;
+
 			config->config->refresh_unsupported = DEFAULT_REFRESH_UNSUPPORTED;
 			config->config->discovery_groupid = 0;
 
@@ -801,9 +921,16 @@ static int	DCsync_config(DB_RESULT result)
 	}
 	else
 	{
+		int	refresh_unsupported;
+
 		/* store the config data */
 
-		config->config->refresh_unsupported = atoi(row[0]);
+		refresh_unsupported = atoi(row[0]);
+
+		if (0 == found || config->config->refresh_unsupported != refresh_unsupported)
+			*refresh_unsupported_changed = 1;
+
+		config->config->refresh_unsupported = refresh_unsupported;
 		ZBX_STR2UINT64(config->config->discovery_groupid, row[1]);
 		config->config->snmptrap_logging = (unsigned char)atoi(row[2]);
 
@@ -851,12 +978,773 @@ static int	DCsync_config(DB_RESULT result)
 	return SUCCEED;
 }
 
-static void	DCsync_items(DB_RESULT result)
+static void	DCsync_hosts(DB_RESULT result)
+{
+	const char		*__function_name = "DCsync_hosts";
+
+	DB_ROW			row;
+
+	ZBX_DC_HOST		*host;
+	ZBX_DC_IPMIHOST		*ipmihost;
+	ZBX_DC_PROXY		*proxy;
+	ZBX_DC_HOST_H		*host_h, host_h_local;
+
+	int			found;
+	int			update_index;
+	zbx_uint64_t		hostid, proxy_hostid;
+	zbx_vector_uint64_t	ids;
+	zbx_hashset_iter_t	iter;
+	unsigned char		status;
+	time_t			now;
+	signed char		ipmi_authtype;
+	unsigned char		ipmi_privilege;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+
+	zbx_vector_uint64_create(&ids);
+	zbx_vector_uint64_reserve(&ids, config->hosts.num_data + 32);
+
+	now = time(NULL);
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		ZBX_STR2UINT64(hostid, row[0]);
+		ZBX_DBROW2UINT64(proxy_hostid, row[1]);
+		ZBX_STR2UCHAR(status, row[22]);
+
+		/* array of selected hosts */
+		zbx_vector_uint64_append(&ids, hostid);
+
+		host = DCfind_id(&config->hosts, hostid, sizeof(ZBX_DC_HOST), &found);
+
+		/* see whether we should and can update hosts_h index at this point */
+
+		update_index = 0;
+
+		if ((HOST_STATUS_MONITORED == status || HOST_STATUS_NOT_MONITORED == status) &&
+				(0 == found || 0 != strcmp(host->host, row[2])))
+		{
+			if (1 == found)
+			{
+				host_h_local.host = host->host;
+				host_h = zbx_hashset_search(&config->hosts_h, &host_h_local);
+
+				if (NULL != host_h && host == host_h->host_ptr)	/* see ZBX-4045 for NULL check */
+				{
+					zbx_strpool_release(host_h->host);
+					zbx_hashset_remove(&config->hosts_h, &host_h_local);
+				}
+			}
+
+			host_h_local.host = row[2];
+			host_h = zbx_hashset_search(&config->hosts_h, &host_h_local);
+
+			if (NULL != host_h)
+				host_h->host_ptr = host;
+			else
+				update_index = 1;
+		}
+
+		/* store new information in host structure */
+
+		host->proxy_hostid = proxy_hostid;
+		DCstrpool_replace(found, &host->host, row[2]);
+		DCstrpool_replace(found, &host->name, row[23]);
+
+		if (0 == found)
+		{
+			host->maintenance_status = (unsigned char)atoi(row[7]);
+			host->maintenance_type = (unsigned char)atoi(row[8]);
+			host->maintenance_from = atoi(row[9]);
+			host->data_expected_from = now;
+
+			host->errors_from = atoi(row[10]);
+			host->available = (unsigned char)atoi(row[11]);
+			host->disable_until = atoi(row[12]);
+			host->snmp_errors_from = atoi(row[13]);
+			host->snmp_available = (unsigned char)atoi(row[14]);
+			host->snmp_disable_until = atoi(row[15]);
+			host->ipmi_errors_from = atoi(row[16]);
+			host->ipmi_available = (unsigned char)atoi(row[17]);
+			host->ipmi_disable_until = atoi(row[18]);
+			host->jmx_errors_from = atoi(row[19]);
+			host->jmx_available = (unsigned char)atoi(row[20]);
+			host->jmx_disable_until = atoi(row[21]);
+		}
+		else
+		{
+			if (HOST_STATUS_MONITORED == status && HOST_STATUS_MONITORED != host->status)
+				host->data_expected_from = now;
+		}
+
+		host->status = status;
+
+		/* update hosts_h index using new data, if not done already */
+
+		if (1 == update_index)
+		{
+			host_h_local.host = zbx_strpool_acquire(host->host);
+			host_h_local.host_ptr = host;
+			zbx_hashset_insert(&config->hosts_h, &host_h_local, sizeof(ZBX_DC_HOST_H));
+		}
+
+		/* IPMI hosts */
+
+		ipmi_authtype = (signed char)atoi(row[3]);
+		ipmi_privilege = (unsigned char)atoi(row[4]);
+
+		if (0 != ipmi_authtype || 2 != ipmi_privilege || '\0' != *row[5] || '\0' != *row[6])	/* useipmi */
+		{
+			ipmihost = DCfind_id(&config->ipmihosts, hostid, sizeof(ZBX_DC_IPMIHOST), &found);
+
+			ipmihost->ipmi_authtype = ipmi_authtype;
+			ipmihost->ipmi_privilege = ipmi_privilege;
+			DCstrpool_replace(found, &ipmihost->ipmi_username, row[5]);
+			DCstrpool_replace(found, &ipmihost->ipmi_password, row[6]);
+		}
+		else if (NULL != (ipmihost = zbx_hashset_search(&config->ipmihosts, &hostid)))
+		{
+			/* remove IPMI connection parameters for hosts without IPMI */
+
+			zbx_strpool_release(ipmihost->ipmi_username);
+			zbx_strpool_release(ipmihost->ipmi_password);
+
+			zbx_hashset_remove(&config->ipmihosts, &hostid);
+		}
+
+		/* passive proxies */
+
+		if (HOST_STATUS_PROXY_PASSIVE == host->status)
+		{
+			proxy = DCfind_id(&config->proxies, hostid, sizeof(ZBX_DC_PROXY), &found);
+
+			if (0 == found)
+			{
+				proxy->proxy_config_nextcheck = (int)calculate_proxy_nextcheck(
+						hostid, CONFIG_PROXYCONFIG_FREQUENCY, now);
+				proxy->proxy_data_nextcheck = (int)calculate_proxy_nextcheck(
+						hostid, CONFIG_PROXYDATA_FREQUENCY, now);
+				proxy->location = ZBX_LOC_NOWHERE;
+
+				DCupdate_proxy_queue(proxy);
+			}
+		}
+		else if (NULL != (proxy = zbx_hashset_search(&config->proxies, &hostid)))
+		{
+			if (ZBX_LOC_QUEUE == proxy->location)
+			{
+				zbx_binary_heap_remove_direct(&config->pqueue, proxy->hostid);
+				proxy->location = ZBX_LOC_NOWHERE;
+			}
+
+			zbx_hashset_remove(&config->proxies, &hostid);
+		}
+	}
+
+	/* remove deleted hosts from buffer */
+
+	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+
+	zbx_hashset_iter_reset(&config->hosts, &iter);
+
+	while (NULL != (host = zbx_hashset_iter_next(&iter)))
+	{
+		hostid = host->hostid;
+
+		if (FAIL != zbx_vector_uint64_bsearch(&ids, hostid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
+			continue;
+
+		/* IPMI hosts */
+
+		if (NULL != (ipmihost = zbx_hashset_search(&config->ipmihosts, &hostid)))
+		{
+			zbx_strpool_release(ipmihost->ipmi_username);
+			zbx_strpool_release(ipmihost->ipmi_password);
+
+			zbx_hashset_remove(&config->ipmihosts, &hostid);
+		}
+
+		/* passive proxies */
+
+		if (NULL != (proxy = zbx_hashset_search(&config->proxies, &hostid)))
+		{
+			if (ZBX_LOC_QUEUE == proxy->location)
+			{
+				zbx_binary_heap_remove_direct(&config->pqueue, proxy->hostid);
+				proxy->location = ZBX_LOC_NOWHERE;
+			}
+
+			zbx_hashset_remove(&config->proxies, &hostid);
+		}
+
+		/* hosts */
+
+		if (HOST_STATUS_MONITORED == host->status || HOST_STATUS_NOT_MONITORED == host->status)
+		{
+			host_h_local.host = host->host;
+			host_h = zbx_hashset_search(&config->hosts_h, &host_h_local);
+
+			if (NULL != host_h && host == host_h->host_ptr)	/* see ZBX-4045 for NULL check */
+			{
+				zbx_strpool_release(host_h->host);
+				zbx_hashset_remove(&config->hosts_h, &host_h_local);
+			}
+		}
+
+		zbx_strpool_release(host->host);
+		zbx_strpool_release(host->name);
+
+		zbx_hashset_iter_remove(&iter);
+	}
+
+	zbx_vector_uint64_destroy(&ids);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+}
+
+static void	DCsync_host_inventory(DB_RESULT result)
+{
+	const char		*__function_name = "DCsync_host_inventory";
+
+	DB_ROW			row;
+
+	ZBX_DC_HOST_INVENTORY	*host_inventory;
+
+	int			found;
+	zbx_uint64_t		hostid;
+	zbx_vector_uint64_t	ids;
+	zbx_hashset_iter_t	iter;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+
+	zbx_vector_uint64_create(&ids);
+	zbx_vector_uint64_reserve(&ids, config->host_inventories.num_data + 32);
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		ZBX_STR2UINT64(hostid, row[0]);
+
+		/* array of selected hosts */
+		zbx_vector_uint64_append(&ids, hostid);
+
+		host_inventory = DCfind_id(&config->host_inventories, hostid, sizeof(ZBX_DC_HOST_INVENTORY), &found);
+
+		/* store new information in host_inventory structure */
+
+		ZBX_STR2UCHAR(host_inventory->inventory_mode, row[1]);
+	}
+
+	/* remove deleted or disabled hosts from buffer */
+
+	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+
+	zbx_hashset_iter_reset(&config->host_inventories, &iter);
+
+	while (NULL != (host_inventory = zbx_hashset_iter_next(&iter)))
+	{
+		hostid = host_inventory->hostid;
+
+		if (FAIL != zbx_vector_uint64_bsearch(&ids, hostid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
+			continue;
+
+		/* host_inventories */
+
+		zbx_hashset_iter_remove(&iter);
+	}
+
+	zbx_vector_uint64_destroy(&ids);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+}
+
+static void	DCsync_htmpls(DB_RESULT result)
+{
+	const char		*__function_name = "DCsync_htmpls";
+
+	DB_ROW			row;
+
+	ZBX_DC_HTMPL		*htmpl = NULL;
+
+	int			found;
+	zbx_uint64_t		_hostid = 0, hostid, templateid;
+	zbx_vector_uint64_t	ids;
+	zbx_hashset_iter_t	iter;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+
+	zbx_vector_uint64_create(&ids);
+	zbx_vector_uint64_reserve(&ids, config->htmpls.num_data + 32);
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		ZBX_STR2UINT64(hostid, row[0]);
+		ZBX_STR2UINT64(templateid, row[1]);
+
+		if (_hostid != hostid || 0 == _hostid)
+		{
+			_hostid = hostid;
+
+			/* array of selected hosts */
+			zbx_vector_uint64_append(&ids, hostid);
+
+			htmpl = DCfind_id(&config->htmpls, hostid, sizeof(ZBX_DC_HTMPL), &found);
+
+			if (0 == found)
+			{
+				zbx_vector_uint64_create_ext(&htmpl->templateids,
+						__config_mem_malloc_func,
+						__config_mem_realloc_func,
+						__config_mem_free_func);
+			}
+			else
+				zbx_vector_uint64_clear(&htmpl->templateids);
+		}
+
+		zbx_vector_uint64_append(&htmpl->templateids, templateid);
+	}
+
+	/* remove deleted hosts from buffer */
+
+	zbx_hashset_iter_reset(&config->htmpls, &iter);
+
+	while (NULL != (htmpl = zbx_hashset_iter_next(&iter)))
+	{
+		if (FAIL != zbx_vector_uint64_bsearch(&ids, htmpl->hostid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
+			continue;
+
+		zbx_vector_uint64_destroy(&htmpl->templateids);
+
+		zbx_hashset_iter_remove(&iter);
+	}
+
+	zbx_vector_uint64_destroy(&ids);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+}
+
+static void	DCsync_gmacros(DB_RESULT result)
+{
+	const char		*__function_name = "DCsync_gmacros";
+
+	DB_ROW			row;
+
+	ZBX_DC_GMACRO		*gmacro;
+	ZBX_DC_GMACRO_M		*gmacro_m, gmacro_m_local;
+
+	int			found, update_index;
+	zbx_uint64_t		globalmacroid;
+	zbx_vector_uint64_t	ids;
+	zbx_hashset_iter_t	iter;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+
+	zbx_vector_uint64_create(&ids);
+	zbx_vector_uint64_reserve(&ids, config->gmacros.num_data + 32);
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		ZBX_STR2UINT64(globalmacroid, row[0]);
+
+		/* array of selected globalmacros */
+		zbx_vector_uint64_append(&ids, globalmacroid);
+
+		gmacro = DCfind_id(&config->gmacros, globalmacroid, sizeof(ZBX_DC_GMACRO), &found);
+
+		/* see whether we should and can update gmacros_m index at this point */
+
+		update_index = 0;
+
+		if (0 == found || 0 != strcmp(gmacro->macro, row[1]))
+		{
+			if (1 == found)
+			{
+				gmacro_m_local.macro = gmacro->macro;
+				gmacro_m = zbx_hashset_search(&config->gmacros_m, &gmacro_m_local);
+
+				if (NULL != gmacro_m && gmacro == gmacro_m->gmacro_ptr)	/* see ZBX-4045 for NULL check */
+				{
+					zbx_strpool_release(gmacro_m->macro);
+					zbx_hashset_remove(&config->gmacros_m, &gmacro_m_local);
+				}
+			}
+
+			gmacro_m_local.macro = row[1];
+			gmacro_m = zbx_hashset_search(&config->gmacros_m, &gmacro_m_local);
+
+			if (NULL != gmacro_m)
+				gmacro_m->gmacro_ptr = gmacro;
+			else
+				update_index = 1;
+		}
+
+		/* store new information in macro structure */
+
+		DCstrpool_replace(found, &gmacro->macro, row[1]);
+		DCstrpool_replace(found, &gmacro->value, row[2]);
+
+		/* update gmacros_m index using new data, if not done already */
+
+		if (1 == update_index)
+		{
+			gmacro_m_local.macro = zbx_strpool_acquire(gmacro->macro);
+			gmacro_m_local.gmacro_ptr = gmacro;
+			zbx_hashset_insert(&config->gmacros_m, &gmacro_m_local, sizeof(ZBX_DC_GMACRO_M));
+		}
+	}
+
+	/* remove deleted globalmacros from buffer */
+
+	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+
+	zbx_hashset_iter_reset(&config->gmacros, &iter);
+
+	while (NULL != (gmacro = zbx_hashset_iter_next(&iter)))
+	{
+		if (FAIL != zbx_vector_uint64_bsearch(&ids, gmacro->globalmacroid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
+			continue;
+
+		gmacro_m_local.macro = gmacro->macro;
+		gmacro_m = zbx_hashset_search(&config->gmacros_m, &gmacro_m_local);
+
+		if (NULL != gmacro_m && gmacro == gmacro_m->gmacro_ptr)	/* see ZBX-4045 for NULL check */
+		{
+			zbx_strpool_release(gmacro_m->macro);
+			zbx_hashset_remove(&config->gmacros_m, &gmacro_m_local);
+		}
+
+		zbx_strpool_release(gmacro->macro);
+		zbx_strpool_release(gmacro->value);
+
+		zbx_hashset_iter_remove(&iter);
+	}
+
+	zbx_vector_uint64_destroy(&ids);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+}
+
+static void	DCsync_hmacros(DB_RESULT result)
+{
+	const char		*__function_name = "DCsync_hmacros";
+
+	DB_ROW			row;
+
+	ZBX_DC_HMACRO		*hmacro;
+	ZBX_DC_HMACRO_HM	*hmacro_hm, hmacro_hm_local;
+
+	int			found, update_index;
+	zbx_uint64_t		hostmacroid, hostid;
+	zbx_vector_uint64_t	ids;
+	zbx_hashset_iter_t	iter;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+
+	zbx_vector_uint64_create(&ids);
+	zbx_vector_uint64_reserve(&ids, config->hmacros.num_data + 32);
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		ZBX_STR2UINT64(hostmacroid, row[0]);
+		ZBX_STR2UINT64(hostid, row[1]);
+
+		/* array of selected hostmacros */
+		zbx_vector_uint64_append(&ids, hostmacroid);
+
+		hmacro = DCfind_id(&config->hmacros, hostmacroid, sizeof(ZBX_DC_HMACRO), &found);
+
+		/* see whether we should and can update hmacros_hm index at this point */
+
+		update_index = 0;
+
+		if (0 == found || hmacro->hostid != hostid || 0 != strcmp(hmacro->macro, row[2]))
+		{
+			if (1 == found)
+			{
+				hmacro_hm_local.hostid = hmacro->hostid;
+				hmacro_hm_local.macro = hmacro->macro;
+				hmacro_hm = zbx_hashset_search(&config->hmacros_hm, &hmacro_hm_local);
+
+				if (hmacro == hmacro_hm->hmacro_ptr)
+				{
+					zbx_strpool_release(hmacro_hm->macro);
+					zbx_hashset_remove(&config->hmacros_hm, &hmacro_hm_local);
+				}
+			}
+
+			hmacro_hm_local.hostid = hostid;
+			hmacro_hm_local.macro = row[2];
+			hmacro_hm = zbx_hashset_search(&config->hmacros_hm, &hmacro_hm_local);
+
+			if (NULL != hmacro_hm)
+				hmacro_hm->hmacro_ptr = hmacro;
+			else
+				update_index = 1;
+		}
+
+		/* store new information in macro structure */
+
+		hmacro->hostid = hostid;
+		DCstrpool_replace(found, &hmacro->macro, row[2]);
+		DCstrpool_replace(found, &hmacro->value, row[3]);
+
+		/* update hmacros_hm index using new data, if not done already */
+
+		if (1 == update_index)
+		{
+			hmacro_hm_local.hostid = hmacro->hostid;
+			hmacro_hm_local.macro = zbx_strpool_acquire(hmacro->macro);
+			hmacro_hm_local.hmacro_ptr = hmacro;
+			zbx_hashset_insert(&config->hmacros_hm, &hmacro_hm_local, sizeof(ZBX_DC_HMACRO_HM));
+		}
+	}
+
+	/* remove deleted hostmacros from buffer */
+
+	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+
+	zbx_hashset_iter_reset(&config->hmacros, &iter);
+
+	while (NULL != (hmacro = zbx_hashset_iter_next(&iter)))
+	{
+		if (FAIL != zbx_vector_uint64_bsearch(&ids, hmacro->hostmacroid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
+			continue;
+
+		hmacro_hm_local.hostid = hmacro->hostid;
+		hmacro_hm_local.macro = hmacro->macro;
+		hmacro_hm = zbx_hashset_search(&config->hmacros_hm, &hmacro_hm_local);
+
+		if (hmacro == hmacro_hm->hmacro_ptr)
+		{
+			zbx_strpool_release(hmacro_hm->macro);
+			zbx_hashset_remove(&config->hmacros_hm, &hmacro_hm_local);
+		}
+
+		zbx_strpool_release(hmacro->macro);
+		zbx_strpool_release(hmacro->value);
+
+		zbx_hashset_iter_remove(&iter);
+	}
+
+	zbx_vector_uint64_destroy(&ids);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+}
+
+static void	DCsync_interfaces(DB_RESULT result)
+{
+	const char		*__function_name = "DCsync_interfaces";
+
+	DB_ROW			row;
+
+	ZBX_DC_INTERFACE	*interface;
+	ZBX_DC_INTERFACE_HT	*interface_ht, interface_ht_local;
+	ZBX_DC_INTERFACE_ADDR	*interface_snmpaddr, interface_snmpaddr_local;
+
+	int			found, update_index;
+	zbx_uint64_t		interfaceid, hostid;
+	unsigned char		type, main_, useip;
+	unsigned char		bulk, reset_snmp_stats;
+	zbx_vector_uint64_t	ids;
+	zbx_hashset_iter_t	iter;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+
+	/* clear interface_snmpaddrs list */
+
+	zbx_hashset_iter_reset(&config->interface_snmpaddrs, &iter);
+
+	while (NULL != (interface_snmpaddr = zbx_hashset_iter_next(&iter)))
+	{
+		zbx_strpool_release(interface_snmpaddr->addr);
+		zbx_vector_uint64_destroy(&interface_snmpaddr->interfaceids);
+		zbx_hashset_iter_remove(&iter);
+	}
+
+	zbx_vector_uint64_create(&ids);
+	zbx_vector_uint64_reserve(&ids, config->interfaces.num_data + 32);
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		ZBX_STR2UINT64(interfaceid, row[0]);
+		ZBX_STR2UINT64(hostid, row[1]);
+		ZBX_STR2UCHAR(type, row[2]);
+		ZBX_STR2UCHAR(main_, row[3]);
+		ZBX_STR2UCHAR(useip, row[4]);
+		ZBX_STR2UCHAR(bulk, row[8]);
+
+		/* array of selected interfaces */
+		zbx_vector_uint64_append(&ids, interfaceid);
+
+		interface = DCfind_id(&config->interfaces, interfaceid, sizeof(ZBX_DC_INTERFACE), &found);
+
+		/* see whether we should and can update interfaces_ht index at this point */
+
+		update_index = 0;
+
+		if (0 == found || interface->hostid != hostid || interface->type != type || interface->main != main_)
+		{
+			if (1 == found && 1 == interface->main)
+			{
+				interface_ht_local.hostid = interface->hostid;
+				interface_ht_local.type = interface->type;
+				interface_ht = zbx_hashset_search(&config->interfaces_ht, &interface_ht_local);
+
+				if (NULL != interface_ht && interface == interface_ht->interface_ptr)
+				{
+					/* see ZBX-4045 for NULL check in the conditional */
+					zbx_hashset_remove(&config->interfaces_ht, &interface_ht_local);
+				}
+			}
+
+			if (1 == main_)
+			{
+				interface_ht_local.hostid = hostid;
+				interface_ht_local.type = type;
+				interface_ht = zbx_hashset_search(&config->interfaces_ht, &interface_ht_local);
+
+				if (NULL != interface_ht)
+					interface_ht->interface_ptr = interface;
+				else
+					update_index = 1;
+			}
+		}
+
+		/* store new information in interface structure */
+
+		reset_snmp_stats = (0 == found || interface->hostid != hostid || interface->type != type ||
+				interface->useip != useip || interface->bulk != bulk);
+
+		interface->hostid = hostid;
+		interface->type = type;
+		interface->main = main_;
+		interface->useip = useip;
+		interface->bulk = bulk;
+		reset_snmp_stats |= (SUCCEED == DCstrpool_replace(found, &interface->ip, row[5]));
+		reset_snmp_stats |= (SUCCEED == DCstrpool_replace(found, &interface->dns, row[6]));
+		reset_snmp_stats |= (SUCCEED == DCstrpool_replace(found, &interface->port, row[7]));
+
+		/* update interfaces_ht index using new data, if not done already */
+
+		if (1 == update_index)
+		{
+			interface_ht_local.hostid = interface->hostid;
+			interface_ht_local.type = interface->type;
+			interface_ht_local.interface_ptr = interface;
+			zbx_hashset_insert(&config->interfaces_ht, &interface_ht_local, sizeof(ZBX_DC_INTERFACE_HT));
+		}
+
+		/* update interface_snmpaddrs for SNMP traps or reset bulk request statistics */
+
+		if (INTERFACE_TYPE_SNMP == interface->type)
+		{
+			interface_snmpaddr_local.addr = (0 != interface->useip ? interface->ip : interface->dns);
+
+			if ('\0' != *interface_snmpaddr_local.addr)
+			{
+				if (NULL == (interface_snmpaddr = zbx_hashset_search(&config->interface_snmpaddrs,
+						&interface_snmpaddr_local)))
+				{
+					zbx_strpool_acquire(interface_snmpaddr_local.addr);
+
+					interface_snmpaddr = zbx_hashset_insert(&config->interface_snmpaddrs,
+							&interface_snmpaddr_local, sizeof(ZBX_DC_INTERFACE_ADDR));
+					zbx_vector_uint64_create_ext(&interface_snmpaddr->interfaceids,
+							__config_mem_malloc_func,
+							__config_mem_realloc_func,
+							__config_mem_free_func);
+				}
+
+				zbx_vector_uint64_append(&interface_snmpaddr->interfaceids, interfaceid);
+			}
+
+			if (1 == reset_snmp_stats)
+			{
+				interface->max_snmp_succeed = 0;
+				interface->min_snmp_fail = MAX_SNMP_ITEMS + 1;
+			}
+		}
+	}
+
+	/* remove deleted interfaces from buffer and resolve macros for ip and dns fields */
+
+	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+
+	zbx_hashset_iter_reset(&config->interfaces, &iter);
+
+	while (NULL != (interface = zbx_hashset_iter_next(&iter)))
+	{
+		if (FAIL == zbx_vector_uint64_bsearch(&ids, interface->interfaceid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
+		{
+			/* remove from buffer */
+
+			if (1 == interface->main)
+			{
+				interface_ht_local.hostid = interface->hostid;
+				interface_ht_local.type = interface->type;
+				interface_ht = zbx_hashset_search(&config->interfaces_ht, &interface_ht_local);
+
+				if (NULL != interface_ht && interface == interface_ht->interface_ptr)
+				{
+					/* see ZBX-4045 for NULL check in the conditional */
+					zbx_hashset_remove(&config->interfaces_ht, &interface_ht_local);
+				}
+			}
+
+			zbx_strpool_release(interface->ip);
+			zbx_strpool_release(interface->dns);
+			zbx_strpool_release(interface->port);
+
+			zbx_hashset_iter_remove(&iter);
+		}
+		else if (1 != interface->main || INTERFACE_TYPE_AGENT != interface->type)
+		{
+			/* macros are not supported for the main agent interface, resolve for other interfaces */
+
+			int	macros;
+			char	*addr;
+			DC_HOST	host;
+
+			macros = STR_CONTAINS_MACROS(interface->ip) ? 0x01 : 0;
+			macros |= STR_CONTAINS_MACROS(interface->dns) ? 0x02 : 0;
+
+			if (0 != macros)
+			{
+				DCget_host_by_hostid(&host, interface->hostid);
+
+				if (0 != (macros & 0x01))
+				{
+					addr = zbx_strdup(NULL, interface->ip);
+					substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, &host, NULL, &addr,
+							MACRO_TYPE_INTERFACE_ADDR, NULL, 0);
+					DCstrpool_replace(1, &interface->ip, addr);
+					zbx_free(addr);
+				}
+
+				if (0 != (macros & 0x02))
+				{
+					addr = zbx_strdup(NULL, interface->dns);
+					substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, &host, NULL, &addr,
+							MACRO_TYPE_INTERFACE_ADDR, NULL, 0);
+					DCstrpool_replace(1, &interface->dns, addr);
+					zbx_free(addr);
+				}
+			}
+		}
+	}
+
+	zbx_vector_uint64_destroy(&ids);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+}
+
+static void	DCsync_items(DB_RESULT result, int refresh_unsupported_changed)
 {
 	const char		*__function_name = "DCsync_items";
 
 	DB_ROW			row;
 
+	ZBX_DC_HOST		*host;
+
 	ZBX_DC_ITEM		*item;
 	ZBX_DC_NUMITEM		*numitem;
 	ZBX_DC_SNMPITEM		*snmpitem;
@@ -875,10 +1763,9 @@ static void	DCsync_items(DB_RESULT result)
 	ZBX_DC_DELTAITEM	*deltaitem;
 
 	time_t			now;
-	unsigned char		old_poller_type;
-	int			delay, found;
-	int			update_index, old_nextcheck;
-	zbx_uint64_t		itemid, hostid, proxy_hostid;
+	unsigned char		old_poller_type, status, type;
+	int			old_nextcheck, delay, delay_flex_changed, key_changed, found, update_index;
+	zbx_uint64_t		itemid, hostid;
 	zbx_vector_uint64_t	ids;
 	zbx_hashset_iter_t	iter;
 
@@ -902,8 +1789,11 @@ static void	DCsync_items(DB_RESULT result)
 	{
 		ZBX_STR2UINT64(itemid, row[0]);
 		ZBX_STR2UINT64(hostid, row[1]);
-		ZBX_DBROW2UINT64(proxy_hostid, row[2]);
-		delay = atoi(row[15]);
+		ZBX_STR2UCHAR(status, row[2]);
+		ZBX_STR2UCHAR(type, row[3]);
+
+		if (NULL == (host = zbx_hashset_search(&config->hosts, &hostid)))
+			continue;
 
 		/* array of selected items */
 		zbx_vector_uint64_append(&ids, itemid);
@@ -942,9 +1832,7 @@ static void	DCsync_items(DB_RESULT result)
 		/* store new information in item structure */
 
 		item->hostid = hostid;
-		item->type = (unsigned char)atoi(row[3]);
 		item->data_type = (unsigned char)atoi(row[4]);
-		DCstrpool_replace(found, &item->key, row[6]);
 		DCstrpool_replace(found, &item->port, row[9]);
 		item->flags = (unsigned char)atoi(row[26]);
 		ZBX_DBROW2UINT64(item->interfaceid, row[27]);
@@ -960,9 +1848,12 @@ static void	DCsync_items(DB_RESULT result)
 		else
 			item->value_type = (unsigned char)atoi(row[5]);
 
+		key_changed = (SUCCEED == DCstrpool_replace(found, &item->key, row[6]));
+
 		if (0 == found)
 		{
 			item->triggers = NULL;
+			item->nextcheck = 0;
 			item->lastclock = 0;
 			item->state = (unsigned char)atoi(row[20]);
 			item->db_state = item->state;
@@ -970,24 +1861,35 @@ static void	DCsync_items(DB_RESULT result)
 			item->mtime = atoi(row[32]);
 			DCstrpool_replace(found, &item->db_error, row[41]);
 			item->data_expected_from = now;
-
 			item->location = ZBX_LOC_NOWHERE;
-			item->poller_type = ZBX_NO_POLLER;
+			old_poller_type = ZBX_NO_POLLER;
 		}
-		else if (NULL != item->triggers && NULL == item->triggers[0])
+		else
 		{
-			/* free the memory if no triggers were found during last sync */
+			if (ITEM_STATUS_ACTIVE == status && ITEM_STATUS_ACTIVE != item->status)
+				item->data_expected_from = now;
 
-			config->items.mem_free_func(item->triggers);
-			item->triggers = NULL;
-		}
-		else if (NULL != item->triggers)
-		{
-			/* we can reuse the same memory if the trigger list has not changed */
+			old_poller_type = item->poller_type;
 
-			item->triggers[0] = NULL;
+			if (NULL != item->triggers)
+			{
+				if (NULL == item->triggers[0])
+				{
+					/* free the memory if no triggers were found during last sync */
+					config->items.mem_free_func(item->triggers);
+					item->triggers = NULL;
+				}
+				else
+				{
+					/* we can reuse the same memory if the trigger list has not changed */
+					item->triggers[0] = NULL;
+				}
+			}
 		}
 
+		item->status = status;
+		old_nextcheck = item->nextcheck;
+
 		/* update items_hk index using new data, if not done already */
 
 		if (1 == update_index)
@@ -998,44 +1900,69 @@ static void	DCsync_items(DB_RESULT result)
 			zbx_hashset_insert(&config->items_hk, &item_hk_local, sizeof(ZBX_DC_ITEM_HK));
 		}
 
-		old_poller_type = item->poller_type;
-		item->poller_type = poller_by_item(itemid, proxy_hostid, item->type, item->key, item->flags);
+		/* update item nextcheck and process items with flexible intervals */
 
-		if (ZBX_POLLER_TYPE_UNREACHABLE == old_poller_type &&
-				(ZBX_POLLER_TYPE_NORMAL == item->poller_type ||
-				ZBX_POLLER_TYPE_IPMI == item->poller_type ||
-				ZBX_POLLER_TYPE_JAVA == item->poller_type))
+		delay = atoi(row[15]);
+
+		if ('\0' != *row[16])
 		{
-			item->poller_type = ZBX_POLLER_TYPE_UNREACHABLE;
+			int	found;
+
+			flexitem = DCfind_id(&config->flexitems, itemid, sizeof(ZBX_DC_FLEXITEM), &found);
+
+			delay_flex_changed = (SUCCEED == DCstrpool_replace(found, &flexitem->delay_flex, row[16]));
 		}
+		else if (NULL != (flexitem = zbx_hashset_search(&config->flexitems, &itemid)))
+		{
+			/* remove delay_flex parameter for non-flexible item */
 
-		if (0 == found)
+			zbx_strpool_release(flexitem->delay_flex);
+			zbx_hashset_remove(&config->flexitems, &itemid);
+
+			delay_flex_changed = 1;
+		}
+		else
+			delay_flex_changed = 0;
+
+		if (ITEM_STATUS_ACTIVE == item->status && HOST_STATUS_MONITORED == host->status)
 		{
-			old_nextcheck = 0;
+			item->poller_type = poller_by_item(host->proxy_hostid, type, item->key);
 
-			if (ITEM_STATE_NOTSUPPORTED == item->state)
+			if (ZBX_POLLER_TYPE_UNREACHABLE == old_poller_type &&
+					(ZBX_POLLER_TYPE_NORMAL == item->poller_type ||
+					ZBX_POLLER_TYPE_IPMI == item->poller_type ||
+					ZBX_POLLER_TYPE_JAVA == item->poller_type))
 			{
-				item->nextcheck = calculate_item_nextcheck(get_item_nextcheck_seed(item),
-						item->type, config->config->refresh_unsupported, NULL, now);
+				item->poller_type = ZBX_POLLER_TYPE_UNREACHABLE;
 			}
-			else
+
+			if (SUCCEED == is_counted_in_item_queue(type, item->key) &&
+					(0 == item->nextcheck || 0 != key_changed || item->type != type ||
+					(ITEM_STATE_NOTSUPPORTED == item->state && 1 == refresh_unsupported_changed) ||
+					(ITEM_STATE_NORMAL == item->state &&
+					(item->delay != delay || 0 != delay_flex_changed))))
 			{
-				item->nextcheck = calculate_item_nextcheck(get_item_nextcheck_seed(item),
-						item->type, delay, row[16], now);
+				zbx_uint64_t	seed;
+
+				seed = get_item_nextcheck_seed(item->itemid, item->interfaceid, type, item->key);
+
+				if (ITEM_STATE_NOTSUPPORTED == item->state)
+				{
+					item->nextcheck = calculate_item_nextcheck(seed, type,
+							config->config->refresh_unsupported, NULL, now);
+				}
+				else
+					item->nextcheck = calculate_item_nextcheck(seed, type, delay, row[16], now);
 			}
 		}
 		else
 		{
-			old_nextcheck = item->nextcheck;
-
-			if (ITEM_STATE_NORMAL == item->state && delay != item->delay)
-			{
-				item->nextcheck = calculate_item_nextcheck(get_item_nextcheck_seed(item),
-						item->type, delay, row[16], now);
-			}
+			item->poller_type = ZBX_NO_POLLER;
+			item->nextcheck = 0;
 		}
 
 		item->delay = delay;
+		item->type = type;
 
 		/* numeric items */
 
@@ -1116,33 +2043,6 @@ static void	DCsync_items(DB_RESULT result)
 			zbx_hashset_remove(&config->ipmiitems, &itemid);
 		}
 
-		/* items with flexible intervals */
-
-		if ('\0' != *row[16])
-		{
-			flexitem = DCfind_id(&config->flexitems, itemid, sizeof(ZBX_DC_FLEXITEM), &found);
-
-			if (SUCCEED == DCstrpool_replace(found, &flexitem->delay_flex, row[16]) &&
-					ITEM_STATE_NOTSUPPORTED != item->state)
-			{
-				item->nextcheck = calculate_item_nextcheck(get_item_nextcheck_seed(item), item->type,
-						item->delay, flexitem->delay_flex, now);
-			}
-		}
-		else if (NULL != (flexitem = zbx_hashset_search(&config->flexitems, &itemid)))
-		{
-			/* remove delay_flex parameter for non-flexible item and update nextcheck */
-
-			zbx_strpool_release(flexitem->delay_flex);
-			zbx_hashset_remove(&config->flexitems, &itemid);
-
-			if (ITEM_STATE_NOTSUPPORTED != item->state)
-			{
-				item->nextcheck = calculate_item_nextcheck(get_item_nextcheck_seed(item), item->type,
-						item->delay, NULL, now);
-			}
-		}
-
 		/* trapper items */
 
 		if (ITEM_TYPE_TRAPPER == item->type && '\0' != *row[17])
@@ -1251,7 +2151,7 @@ static void	DCsync_items(DB_RESULT result)
 		}
 		else if (NULL != (simpleitem = zbx_hashset_search(&config->simpleitems, &itemid)))
 		{
-			/* remove Simple item parameters */
+			/* remove simple item parameters */
 
 			zbx_strpool_release(simpleitem->username);
 			zbx_strpool_release(simpleitem->password);
@@ -1280,7 +2180,7 @@ static void	DCsync_items(DB_RESULT result)
 
 		/* SNMP trap items for current server/proxy */
 
-		if (ITEM_TYPE_SNMPTRAP == item->type && 0 == proxy_hostid)
+		if (ITEM_TYPE_SNMPTRAP == item->type && 0 == host->proxy_hostid)
 		{
 			interface_snmpitem = DCfind_id(&config->interface_snmpitems,
 					item->interfaceid, sizeof(ZBX_DC_INTERFACE_ITEM), &found);
@@ -1315,7 +2215,7 @@ static void	DCsync_items(DB_RESULT result)
 		DCupdate_item_queue(item, old_poller_type, old_nextcheck);
 	}
 
-	/* remove deleted or disabled items from buffer */
+	/* remove deleted items from buffer */
 
 	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
 
@@ -1530,18 +2430,23 @@ static void	DCsync_triggers(DB_RESULT trig_result)
 
 		DCstrpool_replace(found, &trigger->description, row[1]);
 		DCstrpool_replace(found, &trigger->expression, row[2]);
-		DCstrpool_replace(found, &trigger->error, row[3]);
-		trigger->priority = (unsigned char)atoi(row[4]);
-		trigger->type = (unsigned char)atoi(row[5]);
-		trigger->value = (unsigned char)atoi(row[6]);
-		trigger->state = (unsigned char)atoi(row[7]);
-		trigger->lastchange = atoi(row[8]);
+		ZBX_STR2UCHAR(trigger->priority, row[4]);
+		ZBX_STR2UCHAR(trigger->type, row[5]);
+		ZBX_STR2UCHAR(trigger->status, row[9]);
 
 		if (0 == found)
+		{
+			DCstrpool_replace(found, &trigger->error, row[3]);
+			ZBX_STR2UCHAR(trigger->value, row[6]);
+			ZBX_STR2UCHAR(trigger->state, row[7]);
+			trigger->lastchange = atoi(row[8]);
 			trigger->locked = 0;
+		}
+
+		trigger->topoindex = 1;
 	}
 
-	/* remove deleted or disabled triggers from buffer */
+	/* remove deleted triggers from buffer */
 
 	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
 
@@ -1564,6 +2469,8 @@ static void	DCsync_triggers(DB_RESULT trig_result)
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
+static void	DCconfig_sort_triggers_topologically();
+
 static void	DCsync_trigdeps(DB_RESULT tdep_result)
 {
 	const char		*__function_name = "DCsync_trigdeps";
@@ -1678,6 +2585,8 @@ static void	DCsync_trigdeps(DB_RESULT tdep_result)
 	zbx_vector_uint64_destroy(&ids_down);
 	zbx_vector_uint64_destroy(&ids_up);
 
+	DCconfig_sort_triggers_topologically();
+
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
@@ -1786,7 +2695,7 @@ static void	DCsync_functions(DB_RESULT result)
 
 	zbx_vector_ptr_pair_destroy(&itemtrigs);
 
-	/* remove deleted or disabled functions from buffer */
+	/* remove deleted functions from buffer */
 
 	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
 
@@ -1808,765 +2717,6 @@ static void	DCsync_functions(DB_RESULT result)
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
-static void	DCsync_hosts(DB_RESULT result)
-{
-	const char		*__function_name = "DCsync_hosts";
-
-	DB_ROW			row;
-
-	ZBX_DC_HOST		*host;
-	ZBX_DC_IPMIHOST		*ipmihost;
-	ZBX_DC_PROXY		*proxy;
-
-	ZBX_DC_HOST_PH		*host_ph, host_ph_local;
-
-	int			found;
-	int			update_index;
-	zbx_uint64_t		hostid, proxy_hostid;
-	zbx_vector_uint64_t	ids;
-	zbx_hashset_iter_t	iter;
-	unsigned char		status;
-	time_t			now;
-	signed char		ipmi_authtype;
-	unsigned char		ipmi_privilege;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
-
-	zbx_vector_uint64_create(&ids);
-	zbx_vector_uint64_reserve(&ids, config->hosts.num_data + 32);
-
-	now = time(NULL);
-
-	while (NULL != (row = DBfetch(result)))
-	{
-		ZBX_STR2UINT64(hostid, row[0]);
-		ZBX_DBROW2UINT64(proxy_hostid, row[1]);
-		status = (unsigned char)atoi(row[22]);
-
-		/* array of selected hosts */
-		zbx_vector_uint64_append(&ids, hostid);
-
-		host = DCfind_id(&config->hosts, hostid, sizeof(ZBX_DC_HOST), &found);
-
-		/* see whether we should and can update hosts_ph index at this point */
-
-		update_index = 0;
-
-		if (0 == found || host->proxy_hostid != proxy_hostid || host->status != status ||
-				0 != strcmp(host->host, row[2]))
-		{
-			if (1 == found)
-			{
-				host_ph_local.proxy_hostid = host->proxy_hostid;
-				host_ph_local.status = host->status;
-				host_ph_local.host = host->host;
-				host_ph = zbx_hashset_search(&config->hosts_ph, &host_ph_local);
-
-				if (NULL != host_ph && host == host_ph->host_ptr)	/* see ZBX-4045 for NULL check */
-				{
-					zbx_strpool_release(host_ph->host);
-					zbx_hashset_remove(&config->hosts_ph, &host_ph_local);
-				}
-			}
-
-			host_ph_local.proxy_hostid = proxy_hostid;
-			host_ph_local.status = status;
-			host_ph_local.host = row[2];
-			host_ph = zbx_hashset_search(&config->hosts_ph, &host_ph_local);
-
-			if (NULL != host_ph)
-				host_ph->host_ptr = host;
-			else
-				update_index = 1;
-		}
-
-		/* store new information in host structure */
-
-		host->proxy_hostid = proxy_hostid;
-		DCstrpool_replace(found, &host->host, row[2]);
-		DCstrpool_replace(found, &host->name, row[23]);
-		host->status = status;
-
-		if (0 == found)
-		{
-			host->maintenance_status = (unsigned char)atoi(row[7]);
-			host->maintenance_type = (unsigned char)atoi(row[8]);
-			host->maintenance_from = atoi(row[9]);
-			host->data_expected_from = 0;
-
-			host->errors_from = atoi(row[10]);
-			host->available = (unsigned char)atoi(row[11]);
-			host->disable_until = atoi(row[12]);
-			host->snmp_errors_from = atoi(row[13]);
-			host->snmp_available = (unsigned char)atoi(row[14]);
-			host->snmp_disable_until = atoi(row[15]);
-			host->ipmi_errors_from = atoi(row[16]);
-			host->ipmi_available = (unsigned char)atoi(row[17]);
-			host->ipmi_disable_until = atoi(row[18]);
-			host->jmx_errors_from = atoi(row[19]);
-			host->jmx_available = (unsigned char)atoi(row[20]);
-			host->jmx_disable_until = atoi(row[21]);
-		}
-
-		/* update hosts_ph index using new data, if not done already */
-
-		if (1 == update_index)
-		{
-			host_ph_local.proxy_hostid = host->proxy_hostid;
-			host_ph_local.status = host->status;
-			host_ph_local.host = zbx_strpool_acquire(host->host);
-			host_ph_local.host_ptr = host;
-			zbx_hashset_insert(&config->hosts_ph, &host_ph_local, sizeof(ZBX_DC_HOST_PH));
-		}
-
-		/* IPMI hosts */
-
-		ipmi_authtype = (signed char)atoi(row[3]);
-		ipmi_privilege = (unsigned char)atoi(row[4]);
-
-		if (0 != ipmi_authtype || 2 != ipmi_privilege || '\0' != *row[5] || '\0' != *row[6])	/* useipmi */
-		{
-			ipmihost = DCfind_id(&config->ipmihosts, hostid, sizeof(ZBX_DC_IPMIHOST), &found);
-
-			ipmihost->ipmi_authtype = ipmi_authtype;
-			ipmihost->ipmi_privilege = ipmi_privilege;
-			DCstrpool_replace(found, &ipmihost->ipmi_username, row[5]);
-			DCstrpool_replace(found, &ipmihost->ipmi_password, row[6]);
-		}
-		else if (NULL != (ipmihost = zbx_hashset_search(&config->ipmihosts, &hostid)))
-		{
-			/* remove IPMI connection parameters for hosts without IPMI */
-
-			zbx_strpool_release(ipmihost->ipmi_username);
-			zbx_strpool_release(ipmihost->ipmi_password);
-
-			zbx_hashset_remove(&config->ipmihosts, &hostid);
-		}
-
-		/* passive proxies */
-
-		if (HOST_STATUS_PROXY_PASSIVE == host->status)
-		{
-			proxy = DCfind_id(&config->proxies, hostid, sizeof(ZBX_DC_PROXY), &found);
-
-			if (0 == found)
-			{
-				proxy->proxy_config_nextcheck = (int)calculate_proxy_nextcheck(
-						hostid, CONFIG_PROXYCONFIG_FREQUENCY, now);
-				proxy->proxy_data_nextcheck = (int)calculate_proxy_nextcheck(
-						hostid, CONFIG_PROXYDATA_FREQUENCY, now);
-				proxy->location = ZBX_LOC_NOWHERE;
-
-				DCupdate_proxy_queue(proxy);
-			}
-		}
-		else if (NULL != (proxy = zbx_hashset_search(&config->proxies, &hostid)))
-		{
-			if (ZBX_LOC_QUEUE == proxy->location)
-			{
-				zbx_binary_heap_remove_direct(&config->pqueue, proxy->hostid);
-				proxy->location = ZBX_LOC_NOWHERE;
-			}
-
-			zbx_hashset_remove(&config->proxies, &hostid);
-		}
-	}
-
-	/* remove deleted or disabled hosts from buffer */
-
-	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-
-	zbx_hashset_iter_reset(&config->hosts, &iter);
-
-	while (NULL != (host = zbx_hashset_iter_next(&iter)))
-	{
-		hostid = host->hostid;
-
-		if (FAIL != zbx_vector_uint64_bsearch(&ids, hostid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
-			continue;
-
-		/* IPMI hosts */
-
-		if (NULL != (ipmihost = zbx_hashset_search(&config->ipmihosts, &hostid)))
-		{
-			zbx_strpool_release(ipmihost->ipmi_username);
-			zbx_strpool_release(ipmihost->ipmi_password);
-
-			zbx_hashset_remove(&config->ipmihosts, &hostid);
-		}
-
-		/* passive proxies */
-
-		if (NULL != (proxy = zbx_hashset_search(&config->proxies, &hostid)))
-		{
-			if (ZBX_LOC_QUEUE == proxy->location)
-			{
-				zbx_binary_heap_remove_direct(&config->pqueue, proxy->hostid);
-				proxy->location = ZBX_LOC_NOWHERE;
-			}
-
-			zbx_hashset_remove(&config->proxies, &hostid);
-		}
-
-		/* hosts */
-
-		host_ph_local.proxy_hostid = host->proxy_hostid;
-		host_ph_local.status = host->status;
-		host_ph_local.host = host->host;
-		host_ph = zbx_hashset_search(&config->hosts_ph, &host_ph_local);
-
-		if (NULL != host_ph && host == host_ph->host_ptr)	/* see ZBX-4045 for NULL check */
-		{
-			zbx_strpool_release(host_ph->host);
-			zbx_hashset_remove(&config->hosts_ph, &host_ph_local);
-		}
-
-		zbx_strpool_release(host->host);
-		zbx_strpool_release(host->name);
-
-		zbx_hashset_iter_remove(&iter);
-	}
-
-	zbx_vector_uint64_destroy(&ids);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
-}
-
-static void	DCsync_host_inventory(DB_RESULT result)
-{
-	const char		*__function_name = "DCsync_host_inventory";
-
-	DB_ROW			row;
-
-	ZBX_DC_HOST_INVENTORY	*host_inventory;
-
-	int			found;
-	zbx_uint64_t		hostid;
-	zbx_vector_uint64_t	ids;
-	zbx_hashset_iter_t	iter;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
-
-	zbx_vector_uint64_create(&ids);
-	zbx_vector_uint64_reserve(&ids, config->host_inventories.num_data + 32);
-
-	while (NULL != (row = DBfetch(result)))
-	{
-		ZBX_STR2UINT64(hostid, row[0]);
-
-		/* array of selected hosts */
-		zbx_vector_uint64_append(&ids, hostid);
-
-		host_inventory = DCfind_id(&config->host_inventories, hostid, sizeof(ZBX_DC_HOST_INVENTORY), &found);
-
-		/* store new information in host_inventory structure */
-
-		ZBX_STR2UCHAR(host_inventory->inventory_mode, row[1]);
-	}
-
-	/* remove deleted or disabled hosts from buffer */
-
-	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-
-	zbx_hashset_iter_reset(&config->host_inventories, &iter);
-
-	while (NULL != (host_inventory = zbx_hashset_iter_next(&iter)))
-	{
-		hostid = host_inventory->hostid;
-
-		if (FAIL != zbx_vector_uint64_bsearch(&ids, hostid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
-			continue;
-
-		/* host_inventories */
-
-		zbx_hashset_iter_remove(&iter);
-	}
-
-	zbx_vector_uint64_destroy(&ids);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
-}
-
-static void	DCsync_htmpls(DB_RESULT result)
-{
-	const char		*__function_name = "DCsync_htmpls";
-
-	DB_ROW			row;
-
-	ZBX_DC_HTMPL		*htmpl = NULL;
-
-	int			found;
-	zbx_uint64_t		_hostid = 0, hostid, templateid;
-	zbx_vector_uint64_t	ids;
-	zbx_hashset_iter_t	iter;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
-
-	zbx_vector_uint64_create(&ids);
-	zbx_vector_uint64_reserve(&ids, config->htmpls.num_data + 32);
-
-	while (NULL != (row = DBfetch(result)))
-	{
-		ZBX_STR2UINT64(hostid, row[0]);
-		ZBX_STR2UINT64(templateid, row[1]);
-
-		if (_hostid != hostid || 0 == _hostid)
-		{
-			_hostid = hostid;
-
-			/* array of selected hosts */
-			zbx_vector_uint64_append(&ids, hostid);
-
-			htmpl = DCfind_id(&config->htmpls, hostid, sizeof(ZBX_DC_HTMPL), &found);
-
-			if (0 == found)
-			{
-				zbx_vector_uint64_create_ext(&htmpl->templateids,
-						__config_mem_malloc_func,
-						__config_mem_realloc_func,
-						__config_mem_free_func);
-			}
-			else
-				zbx_vector_uint64_clear(&htmpl->templateids);
-		}
-
-		zbx_vector_uint64_append(&htmpl->templateids, templateid);
-	}
-
-	/* remove deleted hosts from buffer */
-
-	zbx_hashset_iter_reset(&config->htmpls, &iter);
-
-	while (NULL != (htmpl = zbx_hashset_iter_next(&iter)))
-	{
-		if (FAIL != zbx_vector_uint64_bsearch(&ids, htmpl->hostid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
-			continue;
-
-		zbx_vector_uint64_destroy(&htmpl->templateids);
-
-		zbx_hashset_iter_remove(&iter);
-	}
-
-	zbx_vector_uint64_destroy(&ids);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
-}
-
-static void	DCsync_gmacros(DB_RESULT result)
-{
-	const char		*__function_name = "DCsync_gmacros";
-
-	DB_ROW			row;
-
-	ZBX_DC_GMACRO		*gmacro;
-	ZBX_DC_GMACRO_M		*gmacro_m, gmacro_m_local;
-
-	int			found, update_index;
-	zbx_uint64_t		globalmacroid;
-	zbx_vector_uint64_t	ids;
-	zbx_hashset_iter_t	iter;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
-
-	zbx_vector_uint64_create(&ids);
-	zbx_vector_uint64_reserve(&ids, config->gmacros.num_data + 32);
-
-	while (NULL != (row = DBfetch(result)))
-	{
-		ZBX_STR2UINT64(globalmacroid, row[0]);
-
-		/* array of selected globalmacros */
-		zbx_vector_uint64_append(&ids, globalmacroid);
-
-		gmacro = DCfind_id(&config->gmacros, globalmacroid, sizeof(ZBX_DC_GMACRO), &found);
-
-		/* see whether we should and can update gmacros_m index at this point */
-
-		update_index = 0;
-
-		if (0 == found || 0 != strcmp(gmacro->macro, row[1]))
-		{
-			if (1 == found)
-			{
-				gmacro_m_local.macro = gmacro->macro;
-				gmacro_m = zbx_hashset_search(&config->gmacros_m, &gmacro_m_local);
-
-				if (NULL != gmacro_m && gmacro == gmacro_m->gmacro_ptr)	/* see ZBX-4045 for NULL check */
-				{
-					zbx_strpool_release(gmacro_m->macro);
-					zbx_hashset_remove(&config->gmacros_m, &gmacro_m_local);
-				}
-			}
-
-			gmacro_m_local.macro = row[1];
-			gmacro_m = zbx_hashset_search(&config->gmacros_m, &gmacro_m_local);
-
-			if (NULL != gmacro_m)
-				gmacro_m->gmacro_ptr = gmacro;
-			else
-				update_index = 1;
-		}
-
-		/* store new information in macro structure */
-
-		DCstrpool_replace(found, &gmacro->macro, row[1]);
-		DCstrpool_replace(found, &gmacro->value, row[2]);
-
-		/* update gmacros_m index using new data, if not done already */
-
-		if (1 == update_index)
-		{
-			gmacro_m_local.macro = zbx_strpool_acquire(gmacro->macro);
-			gmacro_m_local.gmacro_ptr = gmacro;
-			zbx_hashset_insert(&config->gmacros_m, &gmacro_m_local, sizeof(ZBX_DC_GMACRO_M));
-		}
-	}
-
-	/* remove deleted globalmacros from buffer */
-
-	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-
-	zbx_hashset_iter_reset(&config->gmacros, &iter);
-
-	while (NULL != (gmacro = zbx_hashset_iter_next(&iter)))
-	{
-		if (FAIL != zbx_vector_uint64_bsearch(&ids, gmacro->globalmacroid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
-			continue;
-
-		gmacro_m_local.macro = gmacro->macro;
-		gmacro_m = zbx_hashset_search(&config->gmacros_m, &gmacro_m_local);
-
-		if (NULL != gmacro_m && gmacro == gmacro_m->gmacro_ptr)	/* see ZBX-4045 for NULL check */
-		{
-			zbx_strpool_release(gmacro_m->macro);
-			zbx_hashset_remove(&config->gmacros_m, &gmacro_m_local);
-		}
-
-		zbx_strpool_release(gmacro->macro);
-		zbx_strpool_release(gmacro->value);
-
-		zbx_hashset_iter_remove(&iter);
-	}
-
-	zbx_vector_uint64_destroy(&ids);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
-}
-
-static void	DCsync_hmacros(DB_RESULT result)
-{
-	const char		*__function_name = "DCsync_hmacros";
-
-	DB_ROW			row;
-
-	ZBX_DC_HMACRO		*hmacro;
-	ZBX_DC_HMACRO_HM	*hmacro_hm, hmacro_hm_local;
-
-	int			found, update_index;
-	zbx_uint64_t		hostmacroid, hostid;
-	zbx_vector_uint64_t	ids;
-	zbx_hashset_iter_t	iter;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
-
-	zbx_vector_uint64_create(&ids);
-	zbx_vector_uint64_reserve(&ids, config->hmacros.num_data + 32);
-
-	while (NULL != (row = DBfetch(result)))
-	{
-		ZBX_STR2UINT64(hostmacroid, row[0]);
-		ZBX_STR2UINT64(hostid, row[1]);
-
-		/* array of selected hostmacros */
-		zbx_vector_uint64_append(&ids, hostmacroid);
-
-		hmacro = DCfind_id(&config->hmacros, hostmacroid, sizeof(ZBX_DC_HMACRO), &found);
-
-		/* see whether we should and can update hmacros_hm index at this point */
-
-		update_index = 0;
-
-		if (0 == found || hmacro->hostid != hostid || 0 != strcmp(hmacro->macro, row[2]))
-		{
-			if (1 == found)
-			{
-				hmacro_hm_local.hostid = hmacro->hostid;
-				hmacro_hm_local.macro = hmacro->macro;
-				hmacro_hm = zbx_hashset_search(&config->hmacros_hm, &hmacro_hm_local);
-
-				if (hmacro == hmacro_hm->hmacro_ptr)
-				{
-					zbx_strpool_release(hmacro_hm->macro);
-					zbx_hashset_remove(&config->hmacros_hm, &hmacro_hm_local);
-				}
-			}
-
-			hmacro_hm_local.hostid = hostid;
-			hmacro_hm_local.macro = row[2];
-			hmacro_hm = zbx_hashset_search(&config->hmacros_hm, &hmacro_hm_local);
-
-			if (NULL != hmacro_hm)
-				hmacro_hm->hmacro_ptr = hmacro;
-			else
-				update_index = 1;
-		}
-
-		/* store new information in macro structure */
-
-		hmacro->hostid = hostid;
-		DCstrpool_replace(found, &hmacro->macro, row[2]);
-		DCstrpool_replace(found, &hmacro->value, row[3]);
-
-		/* update hmacros_hm index using new data, if not done already */
-
-		if (1 == update_index)
-		{
-			hmacro_hm_local.hostid = hmacro->hostid;
-			hmacro_hm_local.macro = zbx_strpool_acquire(hmacro->macro);
-			hmacro_hm_local.hmacro_ptr = hmacro;
-			zbx_hashset_insert(&config->hmacros_hm, &hmacro_hm_local, sizeof(ZBX_DC_HMACRO_HM));
-		}
-	}
-
-	/* remove deleted hostmacros from buffer */
-
-	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-
-	zbx_hashset_iter_reset(&config->hmacros, &iter);
-
-	while (NULL != (hmacro = zbx_hashset_iter_next(&iter)))
-	{
-		if (FAIL != zbx_vector_uint64_bsearch(&ids, hmacro->hostmacroid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
-			continue;
-
-		hmacro_hm_local.hostid = hmacro->hostid;
-		hmacro_hm_local.macro = hmacro->macro;
-		hmacro_hm = zbx_hashset_search(&config->hmacros_hm, &hmacro_hm_local);
-
-		if (hmacro == hmacro_hm->hmacro_ptr)
-		{
-			zbx_strpool_release(hmacro_hm->macro);
-			zbx_hashset_remove(&config->hmacros_hm, &hmacro_hm_local);
-		}
-
-		zbx_strpool_release(hmacro->macro);
-		zbx_strpool_release(hmacro->value);
-
-		zbx_hashset_iter_remove(&iter);
-	}
-
-	zbx_vector_uint64_destroy(&ids);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
-}
-
-static void	DCsync_interfaces(DB_RESULT result)
-{
-	const char		*__function_name = "DCsync_interfaces";
-
-	DB_ROW			row;
-
-	ZBX_DC_INTERFACE	*interface;
-	ZBX_DC_INTERFACE_HT	*interface_ht, interface_ht_local;
-	ZBX_DC_INTERFACE_ADDR	*interface_snmpaddr, interface_snmpaddr_local;
-
-	int			found, update_index;
-	zbx_uint64_t		interfaceid, hostid;
-	unsigned char		type, main_, useip;
-	unsigned char		reset_snmp_stats;
-	zbx_vector_uint64_t	ids;
-	zbx_hashset_iter_t	iter;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
-
-	/* clear interface_snmpaddrs list */
-
-	zbx_hashset_iter_reset(&config->interface_snmpaddrs, &iter);
-
-	while (NULL != (interface_snmpaddr = zbx_hashset_iter_next(&iter)))
-	{
-		zbx_strpool_release(interface_snmpaddr->addr);
-		zbx_vector_uint64_destroy(&interface_snmpaddr->interfaceids);
-		zbx_hashset_iter_remove(&iter);
-	}
-
-	zbx_vector_uint64_create(&ids);
-	zbx_vector_uint64_reserve(&ids, config->interfaces.num_data + 32);
-
-	while (NULL != (row = DBfetch(result)))
-	{
-		ZBX_STR2UINT64(interfaceid, row[0]);
-		ZBX_STR2UINT64(hostid, row[1]);
-		type = (unsigned char)atoi(row[2]);
-		main_ = (unsigned char)atoi(row[3]);
-		useip = (unsigned char)atoi(row[4]);
-
-		/* array of selected interfaces */
-		zbx_vector_uint64_append(&ids, interfaceid);
-
-		interface = DCfind_id(&config->interfaces, interfaceid, sizeof(ZBX_DC_INTERFACE), &found);
-
-		/* see whether we should and can update interfaces_ht index at this point */
-
-		update_index = 0;
-
-		if (0 == found || interface->hostid != hostid || interface->type != type || interface->main != main_)
-		{
-			if (1 == found && 1 == interface->main)
-			{
-				interface_ht_local.hostid = interface->hostid;
-				interface_ht_local.type = interface->type;
-				interface_ht = zbx_hashset_search(&config->interfaces_ht, &interface_ht_local);
-
-				if (NULL != interface_ht && interface == interface_ht->interface_ptr)
-				{
-					/* see ZBX-4045 for NULL check in the conditional */
-					zbx_hashset_remove(&config->interfaces_ht, &interface_ht_local);
-				}
-			}
-
-			if (1 == main_)
-			{
-				interface_ht_local.hostid = hostid;
-				interface_ht_local.type = type;
-				interface_ht = zbx_hashset_search(&config->interfaces_ht, &interface_ht_local);
-
-				if (NULL != interface_ht)
-					interface_ht->interface_ptr = interface;
-				else
-					update_index = 1;
-			}
-		}
-
-		/* store new information in interface structure */
-
-		if (0 == found || interface->hostid != hostid || interface->type != type || interface->useip != useip)
-			reset_snmp_stats = 1;
-		else
-			reset_snmp_stats = 0;
-
-		interface->hostid = hostid;
-		interface->type = type;
-		interface->main = main_;
-		interface->useip = useip;
-		reset_snmp_stats |= (SUCCEED == DCstrpool_replace(found, &interface->ip, row[5]));
-		reset_snmp_stats |= (SUCCEED == DCstrpool_replace(found, &interface->dns, row[6]));
-		reset_snmp_stats |= (SUCCEED == DCstrpool_replace(found, &interface->port, row[7]));
-
-		/* update interfaces_ht index using new data, if not done already */
-
-		if (1 == update_index)
-		{
-			interface_ht_local.hostid = interface->hostid;
-			interface_ht_local.type = interface->type;
-			interface_ht_local.interface_ptr = interface;
-			zbx_hashset_insert(&config->interfaces_ht, &interface_ht_local, sizeof(ZBX_DC_INTERFACE_HT));
-		}
-
-		/* update interface_snmpaddrs for SNMP traps or reset bulk request statistics */
-
-		if (INTERFACE_TYPE_SNMP == interface->type)
-		{
-			interface_snmpaddr_local.addr = (0 != interface->useip ? interface->ip : interface->dns);
-
-			if ('\0' != *interface_snmpaddr_local.addr)
-			{
-				if (NULL == (interface_snmpaddr = zbx_hashset_search(&config->interface_snmpaddrs,
-						&interface_snmpaddr_local)))
-				{
-					zbx_strpool_acquire(interface_snmpaddr_local.addr);
-
-					interface_snmpaddr = zbx_hashset_insert(&config->interface_snmpaddrs,
-							&interface_snmpaddr_local, sizeof(ZBX_DC_INTERFACE_ADDR));
-					zbx_vector_uint64_create_ext(&interface_snmpaddr->interfaceids,
-							__config_mem_malloc_func,
-							__config_mem_realloc_func,
-							__config_mem_free_func);
-				}
-
-				zbx_vector_uint64_append(&interface_snmpaddr->interfaceids, interfaceid);
-			}
-
-			if (1 == reset_snmp_stats)
-			{
-				interface->max_snmp_succeed = 0;
-				interface->min_snmp_fail = MAX_SNMP_ITEMS + 1;
-			}
-		}
-	}
-
-	/* remove deleted interfaces from buffer and resolve macros for ip and dns fields */
-
-	zbx_vector_uint64_sort(&ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-
-	zbx_hashset_iter_reset(&config->interfaces, &iter);
-
-	while (NULL != (interface = zbx_hashset_iter_next(&iter)))
-	{
-		if (FAIL == zbx_vector_uint64_bsearch(&ids, interface->interfaceid, ZBX_DEFAULT_UINT64_COMPARE_FUNC))
-		{
-			/* remove from buffer */
-
-			if (1 == interface->main)
-			{
-				interface_ht_local.hostid = interface->hostid;
-				interface_ht_local.type = interface->type;
-				interface_ht = zbx_hashset_search(&config->interfaces_ht, &interface_ht_local);
-
-				if (NULL != interface_ht && interface == interface_ht->interface_ptr)
-				{
-					/* see ZBX-4045 for NULL check in the conditional */
-					zbx_hashset_remove(&config->interfaces_ht, &interface_ht_local);
-				}
-			}
-
-			zbx_strpool_release(interface->ip);
-			zbx_strpool_release(interface->dns);
-			zbx_strpool_release(interface->port);
-
-			zbx_hashset_iter_remove(&iter);
-		}
-		else if (1 != interface->main || INTERFACE_TYPE_AGENT != interface->type)
-		{
-			/* macros are not supported for the main agent interface, resolve for other interfaces */
-
-			int	macros;
-			char	*addr;
-			DC_HOST	host;
-
-			macros = STR_CONTAINS_MACROS(interface->ip) ? 0x01 : 0;
-			macros |= STR_CONTAINS_MACROS(interface->dns) ? 0x02 : 0;
-
-			if (0 != macros)
-			{
-				DCget_host_by_hostid(&host, interface->hostid);
-
-				if (0 != (macros & 0x01))
-				{
-					addr = zbx_strdup(NULL, interface->ip);
-					substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, &host, NULL, &addr,
-							MACRO_TYPE_INTERFACE_ADDR, NULL, 0);
-					DCstrpool_replace(1, &interface->ip, addr);
-					zbx_free(addr);
-				}
-
-				if (0 != (macros & 0x02))
-				{
-					addr = zbx_strdup(NULL, interface->dns);
-					substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, &host, NULL, &addr,
-							MACRO_TYPE_INTERFACE_ADDR, NULL, 0);
-					DCstrpool_replace(1, &interface->dns, addr);
-					zbx_free(addr);
-				}
-			}
-		}
-	}
-
-	zbx_vector_uint64_destroy(&ids);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
-}
-
 /******************************************************************************
  *                                                                            *
  * Function: DCsync_expressions                                               *
@@ -2691,107 +2841,33 @@ void	DCsync_configuration(void)
 {
 	const char		*__function_name = "DCsync_configuration";
 
-	DB_RESULT		item_result = NULL;
-	DB_RESULT		trig_result = NULL;
-	DB_RESULT		tdep_result = NULL;
-	DB_RESULT		func_result = NULL;
-	DB_RESULT		hi_result = NULL;
+	DB_RESULT		conf_result = NULL;
 	DB_RESULT		host_result = NULL;
+	DB_RESULT		hi_result = NULL;
 	DB_RESULT		htmpl_result = NULL;
 	DB_RESULT		gmacro_result = NULL;
 	DB_RESULT		hmacro_result = NULL;
 	DB_RESULT		if_result = NULL;
-	DB_RESULT		conf_result = NULL;
+	DB_RESULT		item_result = NULL;
+	DB_RESULT		trig_result = NULL;
+	DB_RESULT		tdep_result = NULL;
+	DB_RESULT		func_result = NULL;
 	DB_RESULT		expr_result = NULL;
 
-	int			i;
-	double			sec, csec, isec, tsec, dsec, fsec, hsec, hisec, htsec, gmsec, hmsec, ifsec, expr_sec,
-				csec2, isec2, tsec2, dsec2, fsec2, hsec2, hisec2, htsec2, gmsec2, hmsec2, ifsec2,
-				expr_sec2, total2;
+	int			i, refresh_unsupported_changed;
+	double			sec, csec, hsec, hisec, htsec, gmsec, hmsec, ifsec, isec, tsec, dsec, fsec, expr_sec,
+				csec2, hsec2, hisec2, htsec2, gmsec2, hmsec2, ifsec2, isec2, tsec2, dsec2, fsec2,
+				expr_sec2, total, total2;
 	const zbx_strpool_t	*strpool;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	sec = zbx_time();
-
 	if (NULL == (conf_result = DCsync_config_select()))
 		goto out;
 	csec = zbx_time() - sec;
 
 	sec = zbx_time();
-	if (NULL == (item_result = DBselect(
-			"select i.itemid,i.hostid,h.proxy_hostid,i.type,i.data_type,i.value_type,i.key_,"
-				"i.snmp_community,i.snmp_oid,i.port,i.snmpv3_securityname,i.snmpv3_securitylevel,"
-				"i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.ipmi_sensor,i.delay,i.delay_flex,"
-				"i.trapper_hosts,i.logtimefmt,i.params,i.state,i.authtype,i.username,i.password,"
-				"i.publickey,i.privatekey,i.flags,i.interfaceid,i.snmpv3_authprotocol,"
-				"i.snmpv3_privprotocol,i.snmpv3_contextname,i.lastlogsize,i.mtime,i.delta,i.multiplier,"
-				"i.formula,i.history,i.trends,i.inventory_link,i.valuemapid,i.units,i.error"
-			" from items i,hosts h"
-			" where i.hostid=h.hostid"
-				" and h.status=%d"
-				" and i.status=%d"
-				" and i.flags<>%d",
-			HOST_STATUS_MONITORED,
-			ITEM_STATUS_ACTIVE,
-			ZBX_FLAG_DISCOVERY_PROTOTYPE)))
-	{
-		goto out;
-	}
-	isec = zbx_time() - sec;
-
-	sec = zbx_time();
-	if (NULL == (trig_result = DBselect(
-			"select distinct t.triggerid,t.description,t.expression,t.error,"
-				"t.priority,t.type,t.value,t.state,t.lastchange"
-			" from hosts h,items i,functions f,triggers t"
-			" where h.hostid=i.hostid"
-				" and i.itemid=f.itemid"
-				" and f.triggerid=t.triggerid"
-				" and h.status=%d"
-				" and i.status=%d"
-				" and t.status=%d"
-				" and t.flags<>%d",
-			HOST_STATUS_MONITORED,
-			ITEM_STATUS_ACTIVE,
-			TRIGGER_STATUS_ENABLED,
-			ZBX_FLAG_DISCOVERY_PROTOTYPE)))
-	{
-		goto out;
-	}
-	tsec = zbx_time() - sec;
-
-	sec = zbx_time();
-	if (NULL == (tdep_result = DBselect(
-			"select d.triggerid_down,d.triggerid_up"
-			" from trigger_depends d"
-			" order by d.triggerid_down")))
-	{
-		goto out;
-	}
-	dsec = zbx_time() - sec;
-
-	sec = zbx_time();
-	if (NULL == (func_result = DBselect(
-			"select i.itemid,f.functionid,f.function,f.parameter,t.triggerid"
-			" from hosts h,items i,functions f,triggers t"
-			" where h.hostid=i.hostid"
-				" and i.itemid=f.itemid"
-				" and f.triggerid=t.triggerid"
-				" and h.status=%d"
-				" and i.status=%d"
-				" and t.status=%d"
-				" and t.flags<>%d",
-			HOST_STATUS_MONITORED,
-			ITEM_STATUS_ACTIVE,
-			TRIGGER_STATUS_ENABLED,
-			ZBX_FLAG_DISCOVERY_PROTOTYPE)))
-	{
-		goto out;
-	}
-	fsec = zbx_time() - sec;
-
-	sec = zbx_time();
 	if (NULL == (host_result = DBselect(
 			"select hostid,proxy_hostid,host,ipmi_authtype,ipmi_privilege,ipmi_username,"
 				"ipmi_password,maintenance_status,maintenance_type,maintenance_from,"
@@ -2800,9 +2876,10 @@ void	DCsync_configuration(void)
 				"ipmi_disable_until,jmx_errors_from,jmx_available,jmx_disable_until,"
 				"status,name"
 			" from hosts"
-			" where status in (%d,%d,%d)"
+			" where status in (%d,%d,%d,%d)"
 				" and flags<>%d",
-			HOST_STATUS_MONITORED, HOST_STATUS_PROXY_ACTIVE, HOST_STATUS_PROXY_PASSIVE,
+			HOST_STATUS_MONITORED, HOST_STATUS_NOT_MONITORED,
+			HOST_STATUS_PROXY_ACTIVE, HOST_STATUS_PROXY_PASSIVE,
 			ZBX_FLAG_DISCOVERY_PROTOTYPE)))
 	{
 		goto out;
@@ -2848,7 +2925,7 @@ void	DCsync_configuration(void)
 
 	sec = zbx_time();
 	if (NULL == (if_result = DBselect(
-			"select interfaceid,hostid,type,main,useip,ip,dns,port"
+			"select interfaceid,hostid,type,main,useip,ip,dns,port,bulk"
 			" from interface")))
 	{
 		goto out;
@@ -2856,36 +2933,83 @@ void	DCsync_configuration(void)
 	ifsec = zbx_time() - sec;
 
 	sec = zbx_time();
-	if (NULL == (expr_result = DBselect(
-			"select r.name,e.expressionid,e.expression,e.expression_type,e.exp_delimiter,e.case_sensitive"
-			" from regexps r,expressions e"
-			" where r.regexpid=e.regexpid")))
+	if (NULL == (item_result = DBselect(
+			"select i.itemid,i.hostid,i.status,i.type,i.data_type,i.value_type,i.key_,"
+				"i.snmp_community,i.snmp_oid,i.port,i.snmpv3_securityname,i.snmpv3_securitylevel,"
+				"i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.ipmi_sensor,i.delay,i.delay_flex,"
+				"i.trapper_hosts,i.logtimefmt,i.params,i.state,i.authtype,i.username,i.password,"
+				"i.publickey,i.privatekey,i.flags,i.interfaceid,i.snmpv3_authprotocol,"
+				"i.snmpv3_privprotocol,i.snmpv3_contextname,i.lastlogsize,i.mtime,i.delta,i.multiplier,"
+				"i.formula,i.history,i.trends,i.inventory_link,i.valuemapid,i.units,i.error"
+			" from items i,hosts h"
+			" where i.hostid=h.hostid"
+				" and h.status in (%d,%d)"
+				" and i.flags<>%d",
+			HOST_STATUS_MONITORED, HOST_STATUS_NOT_MONITORED,
+			ZBX_FLAG_DISCOVERY_PROTOTYPE)))
 	{
 		goto out;
 	}
-	expr_sec = zbx_time() - sec;
-
-	START_SYNC;
+	isec = zbx_time() - sec;
 
 	sec = zbx_time();
-	DCsync_config(conf_result);
-	csec2 = zbx_time() - sec;
+	if (NULL == (trig_result = DBselect(
+			"select distinct t.triggerid,t.description,t.expression,t.error,"
+				"t.priority,t.type,t.value,t.state,t.lastchange,t.status"
+			" from hosts h,items i,functions f,triggers t"
+			" where h.hostid=i.hostid"
+				" and i.itemid=f.itemid"
+				" and f.triggerid=t.triggerid"
+				" and h.status in (%d,%d)"
+				" and t.flags<>%d",
+			HOST_STATUS_MONITORED, HOST_STATUS_NOT_MONITORED,
+			ZBX_FLAG_DISCOVERY_PROTOTYPE)))
+	{
+		goto out;
+	}
+	tsec = zbx_time() - sec;
 
 	sec = zbx_time();
-	DCsync_items(item_result);
-	isec2 = zbx_time() - sec;
+	if (NULL == (tdep_result = DBselect(
+			"select d.triggerid_down,d.triggerid_up"
+			" from trigger_depends d"
+			" order by d.triggerid_down")))
+	{
+		goto out;
+	}
+	dsec = zbx_time() - sec;
 
 	sec = zbx_time();
-	DCsync_triggers(trig_result);
-	tsec2 = zbx_time() - sec;
+	if (NULL == (func_result = DBselect(
+			"select i.itemid,f.functionid,f.function,f.parameter,t.triggerid"
+			" from hosts h,items i,functions f,triggers t"
+			" where h.hostid=i.hostid"
+				" and i.itemid=f.itemid"
+				" and f.triggerid=t.triggerid"
+				" and h.status in (%d,%d)"
+				" and t.flags<>%d",
+			HOST_STATUS_MONITORED, HOST_STATUS_NOT_MONITORED,
+			ZBX_FLAG_DISCOVERY_PROTOTYPE)))
+	{
+		goto out;
+	}
+	fsec = zbx_time() - sec;
 
 	sec = zbx_time();
-	DCsync_trigdeps(tdep_result);
-	dsec2 = zbx_time() - sec;
+	if (NULL == (expr_result = DBselect(
+			"select r.name,e.expressionid,e.expression,e.expression_type,e.exp_delimiter,e.case_sensitive"
+			" from regexps r,expressions e"
+			" where r.regexpid=e.regexpid")))
+	{
+		goto out;
+	}
+	expr_sec = zbx_time() - sec;
+
+	START_SYNC;
 
 	sec = zbx_time();
-	DCsync_functions(func_result);
-	fsec2 = zbx_time() - sec;
+	DCsync_config(conf_result, &refresh_unsupported_changed);
+	csec2 = zbx_time() - sec;
 
 	sec = zbx_time();
 	DCsync_hosts(host_result);
@@ -2908,26 +3032,37 @@ void	DCsync_configuration(void)
 	hmsec2 = zbx_time() - sec;
 
 	sec = zbx_time();
-	DCsync_interfaces(if_result);	/* resolves macros for interface_snmpaddrs, must be after DCsync_hmacros() */
+	/* resolves macros for interface_snmpaddrs, must be after DCsync_hmacros() */
+	DCsync_interfaces(if_result);
 	ifsec2 = zbx_time() - sec;
 
 	sec = zbx_time();
+	/* relies on hosts and interfaces, must be after DCsync_{hosts,interfaces}() */
+	DCsync_items(item_result, refresh_unsupported_changed);
+	isec2 = zbx_time() - sec;
+
+	sec = zbx_time();
+	DCsync_triggers(trig_result);
+	tsec2 = zbx_time() - sec;
+
+	sec = zbx_time();
+	DCsync_trigdeps(tdep_result);
+	dsec2 = zbx_time() - sec;
+
+	sec = zbx_time();
+	DCsync_functions(func_result);
+	fsec2 = zbx_time() - sec;
+
+	sec = zbx_time();
 	DCsync_expressions(expr_result);
 	expr_sec2 = zbx_time() - sec;
 
 	strpool = zbx_strpool_info();
 
-	total2 = csec2 + isec2 + tsec2 + dsec2 + fsec2 + hsec2 + hisec2 + htsec2 + gmsec2 + hmsec2 + ifsec2 + expr_sec2;
+	total = csec + hsec + hisec + htsec + gmsec + hmsec + ifsec + isec + tsec + dsec + fsec + expr_sec;
+	total2 = csec2 + hsec2 + hisec2 + htsec2 + gmsec2 + hmsec2 + ifsec2 + isec2 + tsec2 + dsec2 + fsec2 + expr_sec2;
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() config     : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
 			csec, csec2);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() items      : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
-			isec, isec2);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() triggers   : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
-			tsec, tsec2);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() trigdeps   : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
-			dsec, dsec2);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() functions  : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
-			fsec, fsec2);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() hosts      : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
 			hsec, hsec2);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() host_invent: sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
@@ -2940,13 +3075,47 @@ void	DCsync_configuration(void)
 			hmsec, hmsec2);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() interfaces : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
 			ifsec, ifsec2);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() items      : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
+			isec, isec2);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() triggers   : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
+			tsec, tsec2);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() trigdeps   : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
+			dsec, dsec2);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() functions  : sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
+			fsec, fsec2);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() expressions: sql:" ZBX_FS_DBL " sync:" ZBX_FS_DBL " sec.", __function_name,
 			expr_sec, expr_sec2);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() total sql  : " ZBX_FS_DBL " sec.", __function_name, total);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() total sync : " ZBX_FS_DBL " sec.", __function_name, total2);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() total      : " ZBX_FS_DBL " sec.", __function_name,
-			csec + isec + tsec + dsec + fsec + hsec + hisec + htsec + gmsec + hmsec + ifsec + expr_sec +
-			total2);
 
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() proxies    : %d (%d slots)", __function_name,
+			config->proxies.num_data, config->proxies.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() hosts      : %d (%d slots)", __function_name,
+			config->hosts.num_data, config->hosts.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() hosts_h    : %d (%d slots)", __function_name,
+			config->hosts_h.num_data, config->hosts_h.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() ipmihosts  : %d (%d slots)", __function_name,
+			config->ipmihosts.num_data, config->ipmihosts.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() host_invent: %d (%d slots)", __function_name,
+			config->host_inventories.num_data, config->host_inventories.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() htmpls     : %d (%d slots)", __function_name,
+			config->htmpls.num_data, config->htmpls.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() gmacros    : %d (%d slots)", __function_name,
+			config->gmacros.num_data, config->gmacros.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() gmacros_m  : %d (%d slots)", __function_name,
+			config->gmacros_m.num_data, config->gmacros_m.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() hmacros    : %d (%d slots)", __function_name,
+			config->hmacros.num_data, config->hmacros.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() hmacros_hm : %d (%d slots)", __function_name,
+			config->hmacros_hm.num_data, config->hmacros_hm.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() interfaces : %d (%d slots)", __function_name,
+			config->interfaces.num_data, config->interfaces.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() interfac_ht: %d (%d slots)", __function_name,
+			config->interfaces_ht.num_data, config->interfaces_ht.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() if_snmpitms: %d (%d slots)", __function_name,
+			config->interface_snmpitems.num_data, config->interface_snmpitems.num_slots);
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() if_snmpaddr: %d (%d slots)", __function_name,
+			config->interface_snmpaddrs.num_data, config->interface_snmpaddrs.num_slots);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() items      : %d (%d slots)", __function_name,
 			config->items.num_data, config->items.num_slots);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() items_hk   : %d (%d slots)", __function_name,
@@ -2975,7 +3144,7 @@ void	DCsync_configuration(void)
 			config->jmxitems.num_data, config->jmxitems.num_slots);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() calcitems  : %d (%d slots)", __function_name,
 			config->calcitems.num_data, config->calcitems.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() deltaitems  : %d (%d slots)", __function_name,
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() deltaitems : %d (%d slots)", __function_name,
 			config->deltaitems.num_data, config->deltaitems.num_slots);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() functions  : %d (%d slots)", __function_name,
 			config->functions.num_data, config->functions.num_slots);
@@ -2988,32 +3157,6 @@ void	DCsync_configuration(void)
 		zabbix_log(LOG_LEVEL_DEBUG, "%s() t_trigs[%d] : %d (%d allocated)", __function_name,
 				i, config->time_triggers[i].values_num, config->time_triggers[i].values_alloc);
 	}
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() hosts      : %d (%d slots)", __function_name,
-			config->hosts.num_data, config->hosts.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() hosts_ph   : %d (%d slots)", __function_name,
-			config->hosts_ph.num_data, config->hosts_ph.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() proxies    : %d (%d slots)", __function_name,
-			config->proxies.num_data, config->proxies.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() ipmihosts  : %d (%d slots)", __function_name,
-			config->ipmihosts.num_data, config->ipmihosts.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() htmpls     : %d (%d slots)", __function_name,
-			config->htmpls.num_data, config->htmpls.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() gmacros    : %d (%d slots)", __function_name,
-			config->gmacros.num_data, config->gmacros.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() gmacros_m  : %d (%d slots)", __function_name,
-			config->gmacros_m.num_data, config->gmacros_m.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() hmacros    : %d (%d slots)", __function_name,
-			config->hmacros.num_data, config->hmacros.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() hmacros_hm : %d (%d slots)", __function_name,
-			config->hmacros_hm.num_data, config->hmacros_hm.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() interfaces : %d (%d slots)", __function_name,
-			config->interfaces.num_data, config->interfaces.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() interfac_ht: %d (%d slots)", __function_name,
-			config->interfaces_ht.num_data, config->interfaces_ht.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() if_snmpitms: %d (%d slots)", __function_name,
-			config->interface_snmpitems.num_data, config->interface_snmpitems.num_slots);
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() if_snmpaddr: %d (%d slots)", __function_name,
-			config->interface_snmpaddrs.num_data, config->interface_snmpaddrs.num_slots);
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() expressions: %d (%d slots)", __function_name,
 			config->expressions.num_data, config->expressions.num_slots);
 
@@ -3041,16 +3184,16 @@ void	DCsync_configuration(void)
 	FINISH_SYNC;
 out:
 	DBfree_result(conf_result);
-	DBfree_result(item_result);
-	DBfree_result(trig_result);
-	DBfree_result(tdep_result);
-	DBfree_result(func_result);
-	DBfree_result(hi_result);
 	DBfree_result(host_result);
+	DBfree_result(hi_result);
 	DBfree_result(htmpl_result);
 	DBfree_result(gmacro_result);
 	DBfree_result(hmacro_result);
 	DBfree_result(if_result);
+	DBfree_result(item_result);
+	DBfree_result(trig_result);
+	DBfree_result(tdep_result);
+	DBfree_result(func_result);
 	DBfree_result(expr_result);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
@@ -3092,28 +3235,19 @@ static int	__config_item_hk_compare(const void *d1, const void *d2)
 	return item_hk_1->key == item_hk_2->key ? 0 : strcmp(item_hk_1->key, item_hk_2->key);
 }
 
-static zbx_hash_t	__config_host_ph_hash(const void *data)
+static zbx_hash_t	__config_host_h_hash(const void *data)
 {
-	const ZBX_DC_HOST_PH	*host_ph = (const ZBX_DC_HOST_PH *)data;
-
-	zbx_hash_t		hash;
+	const ZBX_DC_HOST_H	*host_h = (const ZBX_DC_HOST_H *)data;
 
-	hash = ZBX_DEFAULT_UINT64_HASH_FUNC(&host_ph->proxy_hostid);
-	hash = ZBX_DEFAULT_STRING_HASH_ALGO((char *)&host_ph->status, 1, hash);
-	hash = ZBX_DEFAULT_STRING_HASH_ALGO(host_ph->host, strlen(host_ph->host), hash);
-
-	return hash;
+	return ZBX_DEFAULT_STRING_HASH_ALGO(host_h->host, strlen(host_h->host), ZBX_DEFAULT_HASH_SEED);
 }
 
-static int	__config_host_ph_compare(const void *d1, const void *d2)
+static int	__config_host_h_compare(const void *d1, const void *d2)
 {
-	const ZBX_DC_HOST_PH	*host_ph_1 = (const ZBX_DC_HOST_PH *)d1;
-	const ZBX_DC_HOST_PH	*host_ph_2 = (const ZBX_DC_HOST_PH *)d2;
-
-	ZBX_RETURN_IF_NOT_EQUAL(host_ph_1->proxy_hostid, host_ph_2->proxy_hostid);
-	ZBX_RETURN_IF_NOT_EQUAL(host_ph_1->status, host_ph_2->status);
+	const ZBX_DC_HOST_H	*host_h_1 = (const ZBX_DC_HOST_H *)d1;
+	const ZBX_DC_HOST_H	*host_h_2 = (const ZBX_DC_HOST_H *)d2;
 
-	return host_ph_1->host == host_ph_2->host ? 0 : strcmp(host_ph_1->host, host_ph_2->host);
+	return host_h_1->host == host_h_2->host ? 0 : strcmp(host_h_1->host, host_h_2->host);
 }
 
 static zbx_hash_t	__config_gmacro_m_hash(const void *data)
@@ -3350,13 +3484,13 @@ void	init_configuration_cache()
 	if (-1 == (shm_key = zbx_ftok(CONFIG_FILE, ZBX_IPC_CONFIG_ID)))
 	{
 		zbx_error("Can't create IPC key for configuration cache");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&config_lock, ZBX_MUTEX_CONFIG))
 	{
 		zbx_error("Unable to create mutex for configuration cache");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	zbx_mem_create(&config_mem, shm_key, ZBX_NO_MUTEX, config_size, "configuration cache", "CacheSize", 0);
@@ -3406,7 +3540,7 @@ void	init_configuration_cache()
 	CREATE_HASHSET(config->expressions);
 
 	CREATE_HASHSET_EXT(config->items_hk, __config_item_hk_hash, __config_item_hk_compare);
-	CREATE_HASHSET_EXT(config->hosts_ph, __config_host_ph_hash, __config_host_ph_compare);
+	CREATE_HASHSET_EXT(config->hosts_h, __config_host_h_hash, __config_host_h_compare);
 	CREATE_HASHSET_EXT(config->gmacros_m, __config_gmacro_m_hash, __config_gmacro_m_compare);
 	CREATE_HASHSET_EXT(config->hmacros_hm, __config_hmacro_hm_hash, __config_hmacro_hm_compare);
 	CREATE_HASHSET_EXT(config->interfaces_ht, __config_interface_ht_hash, __config_interface_ht_compare);
@@ -3516,6 +3650,7 @@ void	DCload_config()
 	const char	*__function_name = "DCload_config";
 
 	DB_RESULT	result;
+	int		refresh_unsupported_changed;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
@@ -3523,7 +3658,7 @@ void	DCload_config()
 
 	LOCK_CACHE;
 
-	DCsync_config(result);
+	DCsync_config(result, &refresh_unsupported_changed);
 
 	UNLOCK_CACHE;
 
@@ -3532,6 +3667,39 @@ void	DCload_config()
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
+/******************************************************************************
+ *                                                                            *
+ * Function: in_maintenance_without_data_collection                           *
+ *                                                                            *
+ * Parameters: maintenance_status - [IN] maintenance status                   *
+ *                                       HOST_MAINTENANCE_STATUS_* flag       *
+ *             maintenance_type   - [IN] maintenance type                     *
+ *                                       MAINTENANCE_TYPE_* flag              *
+ *             type               - [IN] item type                            *
+ *                                       ITEM_TYPE_* flag                     *
+ *                                                                            *
+ * Return value: SUCCEED if host in maintenance without data collection       *
+ *               FAIL otherwise                                               *
+ *                                                                            *
+ ******************************************************************************/
+#define DCin_maintenance_without_data_collection(dc_host, dc_item)			\
+		in_maintenance_without_data_collection(dc_host->maintenance_status,	\
+				dc_host->maintenance_type, dc_item->type)
+int	in_maintenance_without_data_collection(unsigned char maintenance_status, unsigned char maintenance_type,
+		unsigned char type)
+{
+	if (HOST_MAINTENANCE_STATUS_ON != maintenance_status)
+		return FAIL;
+
+	if (MAINTENANCE_TYPE_NODATA != maintenance_type)
+		return FAIL;
+
+	if (ITEM_TYPE_INTERNAL == type)
+		return FAIL;
+
+	return SUCCEED;
+}
+
 static void	DCget_host(DC_HOST *dst_host, const ZBX_DC_HOST *src_host)
 {
 	const ZBX_DC_IPMIHOST		*ipmihost;
@@ -3556,6 +3724,7 @@ static void	DCget_host(DC_HOST *dst_host, const ZBX_DC_HOST *src_host)
 	dst_host->jmx_errors_from = src_host->jmx_errors_from;
 	dst_host->jmx_available = src_host->jmx_available;
 	dst_host->jmx_disable_until = src_host->jmx_disable_until;
+	dst_host->status = src_host->status;
 
 	if (NULL != (ipmihost = zbx_hashset_search(&config->ipmihosts, &src_host->hostid)))
 	{
@@ -3669,6 +3838,7 @@ static void	DCget_item(DC_ITEM *dst_item, const ZBX_DC_ITEM *src_item)
 	dst_item->history = src_item->history;
 	dst_item->inventory_link = src_item->inventory_link;
 	dst_item->valuemapid = src_item->valuemapid;
+	dst_item->status = src_item->status;
 
 	dst_item->db_state = src_item->db_state;
 	dst_item->db_error = zbx_strdup(NULL, src_item->db_error);
@@ -3907,6 +4077,8 @@ static void	DCget_trigger(DC_TRIGGER *dst_trigger, const ZBX_DC_TRIGGER *src_tri
 	dst_trigger->state = src_trigger->state;
 	dst_trigger->new_value = TRIGGER_VALUE_UNKNOWN;
 	dst_trigger->lastchange = src_trigger->lastchange;
+	dst_trigger->topoindex = src_trigger->topoindex;
+	dst_trigger->status = src_trigger->status;
 }
 
 static void	DCclean_trigger(DC_TRIGGER *trigger)
@@ -3921,19 +4093,17 @@ static void	DCclean_trigger(DC_TRIGGER *trigger)
  *                                                                            *
  * Function: DCconfig_get_items_by_keys                                       *
  *                                                                            *
- * Purpose: Locate item in configuration cache                                *
+ * Purpose: locate item in configuration cache by host and key                *
  *                                                                            *
- * Parameters: item         - [OUT] pointer to DC_ITEM structure              *
- *             proxy_hostid - [IN] proxy host ID                              *
- *             keys         - [IN] list of item keys                          *
- *                                                                            *
- * Return value: SUCCEED if record located and FAIL otherwise                 *
+ * Parameters: items    - [OUT] pointer to array of DC_ITEM structures        *
+ *             keys     - [IN] list of item keys with host names              *
+ *             errcodes - [OUT] SUCCEED if record located and FAIL otherwise  *
+ *             num      - [IN] number of elements in items, keys, errcodes    *
  *                                                                            *
  * Author: Alexander Vladishev, Aleksandrs Saveljevs                          *
  *                                                                            *
  ******************************************************************************/
-void	DCconfig_get_items_by_keys(DC_ITEM *items, zbx_uint64_t proxy_hostid,
-		zbx_host_key_t *keys, int *errcodes, size_t num)
+void	DCconfig_get_items_by_keys(DC_ITEM *items, zbx_host_key_t *keys, int *errcodes, size_t num)
 {
 	size_t			i;
 	const ZBX_DC_ITEM	*dc_item;
@@ -3943,7 +4113,7 @@ void	DCconfig_get_items_by_keys(DC_ITEM *items, zbx_uint64_t proxy_hostid,
 
 	for (i = 0; i < num; i++)
 	{
-		if (NULL == (dc_host = DCfind_host(proxy_hostid, keys[i].host)) ||
+		if (NULL == (dc_host = DCfind_host(keys[i].host)) ||
 				NULL == (dc_item = DCfind_item(dc_host->hostid, keys[i].key)))
 		{
 			errcodes[i] = FAIL;
@@ -3972,7 +4142,7 @@ void	DCconfig_get_items_by_keys(DC_ITEM *items, zbx_uint64_t proxy_hostid,
  * Author: Alexander Vladishev, Aleksandrs Saveljevs                          *
  *                                                                            *
  ******************************************************************************/
-void	DCconfig_get_items_by_itemids(DC_ITEM *items, zbx_uint64_t *itemids, int *errcodes, size_t num)
+void	DCconfig_get_items_by_itemids(DC_ITEM *items, const zbx_uint64_t *itemids, int *errcodes, size_t num)
 {
 	size_t			i;
 	const ZBX_DC_ITEM	*dc_item;
@@ -3997,6 +4167,29 @@ void	DCconfig_get_items_by_itemids(DC_ITEM *items, zbx_uint64_t *itemids, int *e
 	UNLOCK_CACHE;
 }
 
+void	DCconfig_get_triggers_by_triggerids(DC_TRIGGER *triggers, const zbx_uint64_t *triggerids, int *errcode,
+		size_t num)
+{
+	size_t		i;
+	ZBX_DC_TRIGGER	*dc_trigger;
+
+	LOCK_CACHE;
+
+	for (i = 0; i < num; i++)
+	{
+		if (NULL == (dc_trigger = zbx_hashset_search(&config->triggers, &triggerids[i])))
+		{
+			errcode[i] = FAIL;
+			continue;
+		}
+
+		DCget_trigger(&triggers[i], dc_trigger);
+		errcode[i] = SUCCEED;
+	}
+
+	UNLOCK_CACHE;
+}
+
 /******************************************************************************
  *                                                                            *
  * Function: DCconfig_set_item_db_state                                       *
@@ -4075,6 +4268,19 @@ void	DCconfig_clean_functions(DC_FUNCTION *functions, int *errcodes, size_t num)
 	}
 }
 
+void	DCconfig_clean_triggers(DC_TRIGGER *triggers, int *errcodes, size_t num)
+{
+	size_t	i;
+
+	for (i = 0; i < num; i++)
+	{
+		if (SUCCEED != errcodes[i])
+			continue;
+
+		DCclean_trigger(&triggers[i]);
+	}
+}
+
 /******************************************************************************
  *                                                                            *
  * Function: DCconfig_lock_triggers_by_itemids                                *
@@ -4129,6 +4335,9 @@ void	DCconfig_lock_triggers_by_itemids(zbx_uint64_t *itemids, int itemids_num, z
 
 		for (j = 0; NULL != (dc_trigger = dc_item->triggers[j]); j++)
 		{
+			if (TRIGGER_STATUS_ENABLED != dc_trigger->status)
+				continue;
+
 			if (1 == dc_trigger->locked)
 			{
 				itemids[i] = 0;
@@ -4138,6 +4347,9 @@ void	DCconfig_lock_triggers_by_itemids(zbx_uint64_t *itemids, int itemids_num, z
 
 		for (j = 0; NULL != (dc_trigger = dc_item->triggers[j]); j++)
 		{
+			if (TRIGGER_STATUS_ENABLED != dc_trigger->status)
+				continue;
+
 			dc_trigger->locked = 1;
 			zbx_vector_uint64_append(triggerids, dc_trigger->triggerid);
 		}
@@ -4176,7 +4388,7 @@ void	DCconfig_unlock_triggers(const zbx_vector_uint64_t *triggerids)
  *                                                                            *
  * Function: DCconfig_get_triggers_by_itemids                                 *
  *                                                                            *
- * Purpose: get triggers for specified items                                  *
+ * Purpose: get enabled triggers for specified items                          *
  *                                                                            *
  * Author: Aleksandrs Saveljevs                                               *
  *                                                                            *
@@ -4198,6 +4410,9 @@ void	DCconfig_get_triggers_by_itemids(zbx_hashset_t *trigger_info, zbx_vector_pt
 
 		for (j = 0; NULL != (dc_trigger = dc_item->triggers[j]); j++)
 		{
+			if (TRIGGER_STATUS_ENABLED != dc_trigger->status)
+				continue;
+
 			trigger = DCfind_id(trigger_info, dc_trigger->triggerid, sizeof(DC_TRIGGER), &found);
 
 			if (0 == found)
@@ -4302,39 +4517,40 @@ void	DCconfig_get_time_based_triggers(DC_TRIGGER **trigger_info, zbx_vector_ptr_
 	{
 		dc_trigger = (ZBX_DC_TRIGGER *)config->time_triggers[process_num - 1].values[i];
 
-		if (1 == dc_trigger->locked)
+		if (TRIGGER_STATUS_ENABLED != dc_trigger->status || 1 == dc_trigger->locked)
 			continue;
 
 		found = 0;
 
 		for (p = dc_trigger->expression; '\0' != *p; p++)
 		{
-			if ('{' == *p)
+			if ('{' != *p)
+				continue;
+
+			for (q = p + 1; '}' != *q && '\0' != *q; q++)
 			{
-				for (q = p + 1; '}' != *q && '\0' != *q; q++)
-				{
-					if ('0' > *q || '9' < *q)
-						break;
-				}
+				if ('0' > *q || '9' < *q)
+					break;
+			}
 
-				if ('}' == *q)
-				{
-					sscanf(p + 1, ZBX_FS_UI64, &functionid);
-
-					if (NULL != (dc_function = zbx_hashset_search(&config->functions, &functionid)) &&
-							SUCCEED == is_time_function(dc_function->function) &&
-							NULL != (dc_item = zbx_hashset_search(&config->items, &dc_function->itemid)) &&
-							NULL != (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)) &&
-							!(HOST_MAINTENANCE_STATUS_ON == dc_host->maintenance_status &&
-							MAINTENANCE_TYPE_NODATA == dc_host->maintenance_type))
-					{
-						found = 1;
-						break;
-					}
-
-					p = q;
-				}
+			if ('}' != *q)
+				continue;
+
+			sscanf(p + 1, ZBX_FS_UI64, &functionid);
+
+			if (NULL != (dc_function = zbx_hashset_search(&config->functions, &functionid)) &&
+					SUCCEED == is_time_function(dc_function->function) &&
+					NULL != (dc_item = zbx_hashset_search(&config->items, &dc_function->itemid)) &&
+					ITEM_STATUS_ACTIVE == dc_item->status &&
+					NULL != (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)) &&
+					HOST_STATUS_MONITORED == dc_host->status &&
+					SUCCEED != DCin_maintenance_without_data_collection(dc_host, dc_item))
+			{
+				found = 1;
+				break;
 			}
+
+			p = q;
 		}
 
 		if (1 == found)
@@ -4354,8 +4570,6 @@ void	DCconfig_get_time_based_triggers(DC_TRIGGER **trigger_info, zbx_vector_ptr_
 	}
 
 	UNLOCK_CACHE;
-
-	zbx_vector_ptr_sort(trigger_order, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC);
 }
 
 void	DCfree_triggers(zbx_vector_ptr_t *triggers)
@@ -4374,7 +4588,8 @@ void	DCconfig_update_interface_snmp_stats(zbx_uint64_t interfaceid, int max_snmp
 
 	LOCK_CACHE;
 
-	if (NULL != (dc_interface = zbx_hashset_search(&config->interfaces, &interfaceid)))
+	if (NULL != (dc_interface = zbx_hashset_search(&config->interfaces, &interfaceid)) &&
+			SNMP_BULK_ENABLED == dc_interface->bulk)
 	{
 		if (dc_interface->max_snmp_succeed < max_snmp_succeed)
 			dc_interface->max_snmp_succeed = (unsigned char)max_snmp_succeed;
@@ -4386,55 +4601,47 @@ void	DCconfig_update_interface_snmp_stats(zbx_uint64_t interfaceid, int max_snmp
 	UNLOCK_CACHE;
 }
 
-static int	DCconfig_get_interface_snmp_stats_nolock(zbx_uint64_t interfaceid, int *max_snmp_succeed,
-		int *min_snmp_fail)
+static int	DCconfig_get_suggested_snmp_vars_nolock(zbx_uint64_t interfaceid, int *bulk)
 {
-	int			ret = FAIL;
+	/* The general strategy is to multiply request size by 3/2 in order to approach the limit faster. */
+	/* However, once we are over the limit, we change the strategy to increasing the value by 1. This */
+	/* is deemed better than going backwards from the error because less timeouts are going to occur. */
+
+	int			num;
 	ZBX_DC_INTERFACE	*dc_interface;
 
-	if (NULL != (dc_interface = zbx_hashset_search(&config->interfaces, &interfaceid)))
-	{
-		*max_snmp_succeed = dc_interface->max_snmp_succeed;
-		*min_snmp_fail = dc_interface->min_snmp_fail;
+	dc_interface = zbx_hashset_search(&config->interfaces, &interfaceid);
 
-		ret = SUCCEED;
-	}
+	if (NULL != bulk)
+		*bulk = (NULL == dc_interface ? SNMP_BULK_DISABLED : dc_interface->bulk);
 
-	return ret;
+	if (NULL == dc_interface || SNMP_BULK_ENABLED != dc_interface->bulk)
+		return 1;
+
+	if (1 >= dc_interface->max_snmp_succeed || MAX_SNMP_ITEMS + 1 != dc_interface->min_snmp_fail)
+		num = dc_interface->max_snmp_succeed + 1;
+	else
+		num = dc_interface->max_snmp_succeed * 3 / 2;
+
+	if (num < dc_interface->min_snmp_fail)
+		return num;
+
+	return dc_interface->min_snmp_fail - 1;
 }
 
-int	DCconfig_get_interface_snmp_stats(zbx_uint64_t interfaceid, int *max_snmp_succeed, int *min_snmp_fail)
+int	DCconfig_get_suggested_snmp_vars(zbx_uint64_t interfaceid, int *bulk)
 {
 	int	ret;
 
 	LOCK_CACHE;
 
-	ret = DCconfig_get_interface_snmp_stats_nolock(interfaceid, max_snmp_succeed, min_snmp_fail);
+	ret = DCconfig_get_suggested_snmp_vars_nolock(interfaceid, bulk);
 
 	UNLOCK_CACHE;
 
 	return ret;
 }
 
-int	DCconfig_get_suggested_snmp_vars(int max_snmp_succeed, int min_snmp_fail)
-{
-	int	num;
-
-	/* The general strategy is to multiply request size by 3/2 in order to approach the limit faster. */
-	/* However, once we are over the limit, we change the strategy to increasing the value by 1. This */
-	/* is deemed better than going backwards from the error because less timeouts are going to occur. */
-
-	if (1 >= max_snmp_succeed || MAX_SNMP_ITEMS + 1 != min_snmp_fail)
-		num = max_snmp_succeed + 1;
-	else
-		num = max_snmp_succeed * 3 / 2;
-
-	if (num < min_snmp_fail)
-		return num;
-
-	return min_snmp_fail - 1;
-}
-
 /******************************************************************************
  *                                                                            *
  * Function: DCconfig_get_interface_by_type                                   *
@@ -4603,8 +4810,10 @@ int	DCconfig_get_poller_items(unsigned char poller_type, DC_ITEM *items)
 		if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)))
 			continue;
 
-		if (HOST_MAINTENANCE_STATUS_ON == dc_host->maintenance_status &&
-				MAINTENANCE_TYPE_NODATA == dc_host->maintenance_type)
+		if (HOST_STATUS_MONITORED != dc_host->status)
+			continue;
+
+		if (SUCCEED == DCin_maintenance_without_data_collection(dc_host, dc_item))
 		{
 			old_nextcheck = dc_item->nextcheck;
 			dc_item->nextcheck = DCget_reachable_nextcheck(dc_item, now);
@@ -4618,8 +4827,8 @@ int	DCconfig_get_poller_items(unsigned char poller_type, DC_ITEM *items)
 			if (ZBX_POLLER_TYPE_UNREACHABLE == poller_type)
 			{
 				old_poller_type = dc_item->poller_type;
-				dc_item->poller_type = poller_by_item(dc_item->itemid, dc_host->proxy_hostid,
-						dc_item->type, dc_item->key, dc_item->flags);
+				dc_item->poller_type = poller_by_item(dc_host->proxy_hostid, dc_item->type,
+						dc_item->key);
 
 				old_nextcheck = dc_item->nextcheck;
 				dc_item->nextcheck = DCget_reachable_nextcheck(dc_item, now);
@@ -4672,13 +4881,7 @@ int	DCconfig_get_poller_items(unsigned char poller_type, DC_ITEM *items)
 			if (ZBX_SNMP_OID_TYPE_NORMAL == snmpitem->snmp_oid_type ||
 					ZBX_SNMP_OID_TYPE_DYNAMIC == snmpitem->snmp_oid_type)
 			{
-				int	max_snmp_succeed, min_snmp_fail;
-
-				if (SUCCEED == DCconfig_get_interface_snmp_stats_nolock(dc_item->interfaceid,
-						&max_snmp_succeed, &min_snmp_fail))
-				{
-					max_items = DCconfig_get_suggested_snmp_vars(max_snmp_succeed, min_snmp_fail);
-				}
+				max_items = DCconfig_get_suggested_snmp_vars_nolock(dc_item->interfaceid, NULL);
 			}
 		}
 	}
@@ -4763,11 +4966,8 @@ size_t	DCconfig_get_snmp_items_by_interfaceid(zbx_uint64_t interfaceid, DC_ITEM
 	if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_interface->hostid)))
 		goto unlock;
 
-	if (HOST_MAINTENANCE_STATUS_ON == dc_host->maintenance_status &&
-			MAINTENANCE_TYPE_NODATA == dc_host->maintenance_type)
-	{
+	if (HOST_STATUS_MONITORED != dc_host->status)
 		goto unlock;
-	}
 
 	if (NULL == (dc_interface_snmpitem = zbx_hashset_search(&config->interface_snmpitems, &interfaceid)))
 		goto unlock;
@@ -4779,6 +4979,12 @@ size_t	DCconfig_get_snmp_items_by_interfaceid(zbx_uint64_t interfaceid, DC_ITEM
 		if (NULL == (dc_item = zbx_hashset_search(&config->items, &dc_interface_snmpitem->itemids.values[i])))
 			continue;
 
+		if (ITEM_STATUS_ACTIVE != dc_item->status)
+			continue;
+
+		if (SUCCEED == DCin_maintenance_without_data_collection(dc_host, dc_item))
+			continue;
+
 		if (0 == config->config->refresh_unsupported && ITEM_STATE_NOTSUPPORTED == dc_item->state)
 			continue;
 
@@ -4889,6 +5095,7 @@ static void	DCrequeue_reachable_item(ZBX_DC_ITEM *dc_item, int lastclock)
 	unsigned char	old_poller_type;
 	int		old_nextcheck;
 
+	old_nextcheck = dc_item->nextcheck;
 	dc_item->nextcheck = DCget_reachable_nextcheck(dc_item, lastclock);
 
 	if (ZBX_NO_POLLER == dc_item->poller_type)
@@ -4898,7 +5105,6 @@ static void	DCrequeue_reachable_item(ZBX_DC_ITEM *dc_item, int lastclock)
 		dc_item->location = ZBX_LOC_NOWHERE;
 
 	old_poller_type = dc_item->poller_type;
-	old_nextcheck = dc_item->nextcheck;
 
 	if (ZBX_POLLER_TYPE_UNREACHABLE == dc_item->poller_type)
 	{
@@ -4907,8 +5113,10 @@ static void	DCrequeue_reachable_item(ZBX_DC_ITEM *dc_item, int lastclock)
 		if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)))
 			return;
 
-		dc_item->poller_type = poller_by_item(dc_item->itemid, dc_host->proxy_hostid,
-				dc_item->type, dc_item->key, dc_item->flags);
+		if (HOST_STATUS_MONITORED != dc_host->status)
+			return;
+
+		dc_item->poller_type = poller_by_item(dc_host->proxy_hostid, dc_item->type, dc_item->key);
 	}
 
 	DCupdate_item_queue(dc_item, old_poller_type, old_nextcheck);
@@ -4923,6 +5131,10 @@ static void	DCrequeue_unreachable_item(ZBX_DC_ITEM *dc_item)
 	if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)))
 		return;
 
+	if (HOST_STATUS_MONITORED != dc_host->status)
+		return;
+
+	old_nextcheck = dc_item->nextcheck;
 	dc_item->nextcheck = DCget_unreachable_nextcheck(dc_item, dc_host);
 
 	if (ZBX_NO_POLLER == dc_item->poller_type)
@@ -4932,12 +5144,13 @@ static void	DCrequeue_unreachable_item(ZBX_DC_ITEM *dc_item)
 		dc_item->location = ZBX_LOC_NOWHERE;
 
 	old_poller_type = dc_item->poller_type;
-	old_nextcheck = dc_item->nextcheck;
 
 	if (ZBX_POLLER_TYPE_NORMAL == dc_item->poller_type ||
 			ZBX_POLLER_TYPE_IPMI == dc_item->poller_type ||
 			ZBX_POLLER_TYPE_JAVA == dc_item->poller_type)
+	{
 		dc_item->poller_type = ZBX_POLLER_TYPE_UNREACHABLE;
+	}
 
 	DCupdate_item_queue(dc_item, old_poller_type, old_nextcheck);
 }
@@ -4958,6 +5171,9 @@ void	DCrequeue_items(zbx_uint64_t *itemids, unsigned char *states, int *lastcloc
 		if (NULL == (dc_item = zbx_hashset_search(&config->items, &itemids[i])))
 			continue;
 
+		if (ITEM_STATUS_ACTIVE != dc_item->status || 0 == dc_item->nextcheck)
+			continue;
+
 		dc_item->state = states[i];
 		dc_item->lastclock = lastclocks[i];
 		if (NULL != lastlogsizes)
@@ -4965,6 +5181,9 @@ void	DCrequeue_items(zbx_uint64_t *itemids, unsigned char *states, int *lastcloc
 		if (NULL != mtimes)
 			dc_item->mtime = mtimes[i];
 
+		if (SUCCEED != is_counted_in_item_queue(dc_item->type, dc_item->key))
+			continue;
+
 		switch (errcodes[i])
 		{
 			case SUCCEED:
@@ -5111,21 +5330,24 @@ int	DChost_activate(zbx_host_availability_t *in, zbx_host_availability_t *out)
 
 	LOCK_CACHE;
 
-	if (NULL != (dc_host = zbx_hashset_search(&config->hosts, &in->hostid)))
-	{
-		DChost_get_availability(dc_host, in->type, in);
+	if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &in->hostid)))
+		goto unlock;
 
-		out->hostid = in->hostid;
-		out->type = in->type;
-		out->errors_from = 0;
-		out->available = HOST_AVAILABLE_TRUE;
-		out->disable_until = 0;
+	if (HOST_STATUS_MONITORED != dc_host->status)
+		goto unlock;
 
-		DChost_set_availability(dc_host, out);
+	DChost_get_availability(dc_host, in->type, in);
 
-		ret = SUCCEED;
-	}
+	out->hostid = in->hostid;
+	out->type = in->type;
+	out->errors_from = 0;
+	out->available = HOST_AVAILABLE_TRUE;
+	out->disable_until = 0;
 
+	DChost_set_availability(dc_host, out);
+
+	ret = SUCCEED;
+unlock:
 	UNLOCK_CACHE;
 out:
 	return ret;
@@ -5159,44 +5381,47 @@ int	DChost_deactivate(const zbx_timespec_t *ts, zbx_host_availability_t *in, zbx
 
 	LOCK_CACHE;
 
-	if (NULL != (dc_host = zbx_hashset_search(&config->hosts, &in->hostid)))
-	{
-		DChost_get_availability(dc_host, in->type, in);
-		*out = *in;
+	if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &in->hostid)))
+		goto unlock;
 
-		if (0 == out->errors_from)
-		{
-			/* first error, schedule next unreachable check */
-			out->errors_from = ts->sec;
-			out->disable_until = ts->sec + CONFIG_UNREACHABLE_DELAY;
-		}
-		else
+	if (HOST_STATUS_MONITORED != dc_host->status)
+		goto unlock;
+
+	DChost_get_availability(dc_host, in->type, in);
+	*out = *in;
+
+	if (0 == out->errors_from)
+	{
+		/* first error, schedule next unreachable check */
+		out->errors_from = ts->sec;
+		out->disable_until = ts->sec + CONFIG_UNREACHABLE_DELAY;
+	}
+	else
+	{
+		/* Check if other pollers haven't already attempted deactivating host. */
+		/* In that case should wait the initial unreachable delay before       */
+		/* trying to make it unavailable.                                      */
+		if (CONFIG_UNREACHABLE_DELAY <= ts->sec - out->errors_from)
 		{
-			/* Check if other pollers haven't already attempted deactivating host. */
-			/* In that case should wait the initial unreachable delay before       */
-			/* trying to make it unavailable.                                      */
-			if (CONFIG_UNREACHABLE_DELAY <= ts->sec - out->errors_from)
+			/* repeating error */
+			if (CONFIG_UNREACHABLE_PERIOD > ts->sec - out->errors_from)
 			{
-				/* repeating error */
-				if (CONFIG_UNREACHABLE_PERIOD > ts->sec - out->errors_from)
-				{
-					/* leave host available, schedule next unreachable check */
-					out->disable_until = ts->sec + CONFIG_UNREACHABLE_DELAY;
-				}
-				else
-				{
-					/* make host unavailable, schedule next unavailable check */
-					out->disable_until = ts->sec + CONFIG_UNAVAILABLE_DELAY;
-					out->available = HOST_AVAILABLE_FALSE;
-				}
+				/* leave host available, schedule next unreachable check */
+				out->disable_until = ts->sec + CONFIG_UNREACHABLE_DELAY;
+			}
+			else
+			{
+				/* make host unavailable, schedule next unavailable check */
+				out->disable_until = ts->sec + CONFIG_UNAVAILABLE_DELAY;
+				out->available = HOST_AVAILABLE_FALSE;
 			}
 		}
-
-		DChost_set_availability(dc_host, out);
-
-		ret = SUCCEED;
 	}
 
+	DChost_set_availability(dc_host, out);
+
+	ret = SUCCEED;
+unlock:
 	UNLOCK_CACHE;
 out:
 	return ret;
@@ -5226,6 +5451,9 @@ void	DChost_update_availability(const zbx_host_availability_t *availability, int
 		if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &availability[i].hostid)))
 			continue;
 
+		if (HOST_STATUS_MONITORED != dc_host->status)
+			continue;
+
 		DChost_set_availability(dc_host, &availability[i]);
 	}
 
@@ -5245,7 +5473,7 @@ static int	DCconfig_check_trigger_dependencies_rec(const ZBX_DC_TRIGGER_DEPLIST
 
 	if (32 < level)
 	{
-		zabbix_log(LOG_LEVEL_CRIT, "recursive trigger dependency detected (triggerid:" ZBX_FS_UI64 ")",
+		zabbix_log(LOG_LEVEL_CRIT, "recursive trigger dependency is too deep (triggerid:" ZBX_FS_UI64 ")",
 				trigdep->triggerid);
 		return SUCCEED;
 	}
@@ -5273,7 +5501,7 @@ static int	DCconfig_check_trigger_dependencies_rec(const ZBX_DC_TRIGGER_DEPLIST
  *                                                                            *
  * Function: DCconfig_check_trigger_dependencies                              *
  *                                                                            *
- * Purpose: check whether any of trigger dependencies have value TRUE         *
+ * Purpose: check whether any of trigger dependencies have value PROBLEM      *
  *                                                                            *
  * Return value: SUCCEED - trigger can change its value                       *
  *               FAIL - otherwise                                             *
@@ -5298,6 +5526,86 @@ int	DCconfig_check_trigger_dependencies(zbx_uint64_t triggerid)
 
 /******************************************************************************
  *                                                                            *
+ * Comments: helper function for DCconfig_sort_triggers_topologically()       *
+ *                                                                            *
+ ******************************************************************************/
+static unsigned char	DCconfig_sort_triggers_topologically_rec(const ZBX_DC_TRIGGER_DEPLIST *trigdep, int level)
+{
+	int				i;
+	unsigned char			topoindex = 2, next_topoindex;
+	ZBX_DC_TRIGGER			*trigger;
+	const ZBX_DC_TRIGGER		*next_trigger;
+	const ZBX_DC_TRIGGER_DEPLIST	*next_trigdep;
+
+	if (32 < level)
+	{
+		zabbix_log(LOG_LEVEL_CRIT, "recursive trigger dependency is too deep (triggerid:" ZBX_FS_UI64 ")",
+				trigdep->triggerid);
+		goto exit;
+	}
+
+	trigger = trigdep->trigger;
+
+	if (NULL != trigger && 0 == trigger->topoindex)
+	{
+		zabbix_log(LOG_LEVEL_CRIT, "trigger dependencies contain a cycle (triggerid:" ZBX_FS_UI64 ")",
+				trigdep->triggerid);
+		goto exit;
+	}
+
+	if (NULL != trigger)
+		trigger->topoindex = 0;
+
+	for (i = 0; NULL != (next_trigdep = trigdep->dependencies[i]); i++)
+	{
+		if (NULL != (next_trigger = next_trigdep->trigger) && 1 < (next_topoindex = next_trigger->topoindex))
+			goto next;
+
+		if (NULL == next_trigdep->dependencies)
+			continue;
+
+		next_topoindex = DCconfig_sort_triggers_topologically_rec(next_trigdep, level + 1);
+next:
+		if (topoindex < next_topoindex + 1)
+			topoindex = next_topoindex + 1;
+	}
+
+	if (NULL != trigger)
+		trigger->topoindex = topoindex;
+exit:
+	return topoindex;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: DCconfig_sort_triggers_topologically                             *
+ *                                                                            *
+ * Purpose: assign each trigger an index based on trigger dependency topology *
+ *                                                                            *
+ * Author: Aleksandrs Saveljevs                                               *
+ *                                                                            *
+ ******************************************************************************/
+static void	DCconfig_sort_triggers_topologically()
+{
+	zbx_hashset_iter_t		iter;
+	ZBX_DC_TRIGGER			*trigger;
+	const ZBX_DC_TRIGGER_DEPLIST	*trigdep;
+
+	zbx_hashset_iter_reset(&config->trigdeps, &iter);
+
+	while (NULL != (trigdep = zbx_hashset_iter_next(&iter)))
+	{
+		trigger = trigdep->trigger;
+
+		if ((NULL != trigger && 1 < trigger->topoindex) || NULL == trigdep->dependencies)
+			continue;
+
+		DCconfig_sort_triggers_topologically_rec(trigdep, 0);
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: DCconfig_set_trigger_value                                       *
  *                                                                            *
  * Purpose: set trigger value, value flags, and error                         *
@@ -5348,6 +5656,9 @@ void	DCconfig_set_maintenance(const zbx_uint64_t *hostids, int hostids_num, int
 		if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &hostids[i])))
 			continue;
 
+		if (HOST_STATUS_MONITORED != dc_host->status)
+			continue;
+
 		if (dc_host->maintenance_status != maintenance_status)
 			dc_host->maintenance_from = maintenance_from;
 
@@ -5751,7 +6062,7 @@ void	DCfree_item_queue(zbx_vector_ptr_t *queue)
 	int	i;
 
 	for (i = 0; i < queue->values_num; i++)
-		free(queue->values[i]);
+		zbx_free(queue->values[i]);
 }
 
 /******************************************************************************
@@ -5772,7 +6083,7 @@ void	DCfree_item_queue(zbx_vector_ptr_t *queue)
 int	DCget_item_queue(zbx_vector_ptr_t *queue, int from, int to)
 {
 	zbx_hashset_iter_t	iter;
-	ZBX_DC_ITEM		*item;
+	const ZBX_DC_ITEM	*dc_item;
 	int			now, nitems = 0;
 	zbx_queue_item_t	*queue_item;
 
@@ -5782,69 +6093,57 @@ int	DCget_item_queue(zbx_vector_ptr_t *queue, int from, int to)
 
 	zbx_hashset_iter_reset(&config->items, &iter);
 
-	while (NULL != (item = zbx_hashset_iter_next(&iter)))
+	while (NULL != (dc_item = zbx_hashset_iter_next(&iter)))
 	{
-		ZBX_DC_HOST	*host;
+		const ZBX_DC_HOST	*dc_host;
 
-		if (NULL == (host = zbx_hashset_search(&config->hosts, &item->hostid)))
+		if (ITEM_STATUS_ACTIVE != dc_item->status)
 			continue;
 
-		if (HOST_MAINTENANCE_STATUS_ON == host->maintenance_status &&
-				MAINTENANCE_TYPE_NODATA == host->maintenance_type)
-		{
+		if (SUCCEED != is_counted_in_item_queue(dc_item->type, dc_item->key))
+			continue;
+
+		if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)))
 			continue;
-		}
 
-		switch (item->type)
+		if (HOST_STATUS_MONITORED != dc_host->status)
+			continue;
+
+		if (SUCCEED == DCin_maintenance_without_data_collection(dc_host, dc_item))
+			continue;
+
+		switch (dc_item->type)
 		{
-			case ITEM_TYPE_ZABBIX_ACTIVE:
-				if (0 == strncmp(item->key, "log[", 4) ||
-						0 == strncmp(item->key, "logrt[", 6) ||
-						0 == strncmp(item->key, "eventlog[", 9))
-				{
-					continue;
-				}
-			case ITEM_TYPE_SSH:
-			case ITEM_TYPE_TELNET:
-			case ITEM_TYPE_SIMPLE:
-			case ITEM_TYPE_INTERNAL:
-			case ITEM_TYPE_DB_MONITOR:
-			case ITEM_TYPE_AGGREGATE:
-			case ITEM_TYPE_EXTERNAL:
-			case ITEM_TYPE_CALCULATED:
-				break;
 			case ITEM_TYPE_ZABBIX:
-				if (0 != host->errors_from)
+				if (HOST_AVAILABLE_TRUE != dc_host->available)
 					continue;
 				break;
 			case ITEM_TYPE_SNMPv1:
 			case ITEM_TYPE_SNMPv2c:
 			case ITEM_TYPE_SNMPv3:
-				if (0 != host->snmp_errors_from)
+				if (HOST_AVAILABLE_TRUE != dc_host->snmp_available)
 					continue;
 				break;
 			case ITEM_TYPE_IPMI:
-				if (0 != host->ipmi_errors_from)
+				if (HOST_AVAILABLE_TRUE != dc_host->ipmi_available)
 					continue;
 				break;
 			case ITEM_TYPE_JMX:
-				if (0 != host->jmx_errors_from)
+				if (HOST_AVAILABLE_TRUE != dc_host->jmx_available)
 					continue;
 				break;
-			default:
-				continue;
 		}
 
-		if ((-1 != from && from > now - item->nextcheck) || (-1 != to && now - item->nextcheck >= to))
+		if ((-1 != from && from > now - dc_item->nextcheck) || (-1 != to && now - dc_item->nextcheck >= to))
 			continue;
 
 		if (NULL != queue)
 		{
 			queue_item = zbx_malloc(NULL, sizeof(zbx_queue_item_t));
-			queue_item->itemid = item->itemid;
-			queue_item->type = item->type;
-			queue_item->nextcheck = item->nextcheck;
-			queue_item->proxy_hostid = host->proxy_hostid;
+			queue_item->itemid = dc_item->itemid;
+			queue_item->type = dc_item->type;
+			queue_item->nextcheck = dc_item->nextcheck;
+			queue_item->proxy_hostid = dc_host->proxy_hostid;
 
 			zbx_vector_ptr_append(queue, queue_item);
 		}
@@ -5869,16 +6168,29 @@ int	DCget_item_count()
 {
 	int			count = 0;
 	zbx_hashset_iter_t	iter;
-	ZBX_DC_ITEM		*item;
+	const ZBX_DC_ITEM	*dc_item;
 
 	LOCK_CACHE;
 
 	zbx_hashset_iter_reset(&config->items, &iter);
 
-	while (NULL != (item = zbx_hashset_iter_next(&iter)))
+	while (NULL != (dc_item = zbx_hashset_iter_next(&iter)))
 	{
-		if (ZBX_FLAG_DISCOVERY_NORMAL == item->flags || ZBX_FLAG_DISCOVERY_CREATED == item->flags)
-			count++;
+		const ZBX_DC_HOST	*dc_host;
+
+		if (ITEM_STATUS_ACTIVE != dc_item->status)
+			continue;
+
+		if (ZBX_FLAG_DISCOVERY_NORMAL != dc_item->flags && ZBX_FLAG_DISCOVERY_CREATED != dc_item->flags)
+			continue;
+
+		if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)))
+			continue;
+
+		if (HOST_STATUS_MONITORED != dc_host->status)
+			continue;
+
+		count++;
 	}
 
 	UNLOCK_CACHE;
@@ -5899,19 +6211,29 @@ int	DCget_item_unsupported_count()
 {
 	int			count = 0;
 	zbx_hashset_iter_t	iter;
-	ZBX_DC_ITEM		*item;
+	const ZBX_DC_ITEM	*dc_item;
 
 	LOCK_CACHE;
 
 	zbx_hashset_iter_reset(&config->items, &iter);
 
-	while (NULL != (item = zbx_hashset_iter_next(&iter)))
+	while (NULL != (dc_item = zbx_hashset_iter_next(&iter)))
 	{
-		if (ZBX_FLAG_DISCOVERY_NORMAL != item->flags && ZBX_FLAG_DISCOVERY_CREATED != item->flags)
+		const ZBX_DC_HOST	*dc_host;
+
+		if (ITEM_STATUS_ACTIVE != dc_item->status || ITEM_STATE_NOTSUPPORTED != dc_item->state)
+			continue;
+
+		if (ZBX_FLAG_DISCOVERY_NORMAL != dc_item->flags && ZBX_FLAG_DISCOVERY_CREATED != dc_item->flags)
 			continue;
 
-		if (ITEM_STATE_NOTSUPPORTED == item->state)
-			count++;
+		if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)))
+			continue;
+
+		if (HOST_STATUS_MONITORED != dc_host->status)
+			continue;
+
+		count++;
 	}
 
 	UNLOCK_CACHE;
@@ -5923,14 +6245,66 @@ int	DCget_item_unsupported_count()
  *                                                                            *
  * Function: DCget_trigger_count                                              *
  *                                                                            *
- * Purpose: return the number of triggers                                     *
+ * Purpose: return the number of active triggers                              *
  *                                                                            *
- * Return value: the number of triggers                                       *
+ * Return value: the number of active triggers                                *
  *                                                                            *
  ******************************************************************************/
 int	DCget_trigger_count()
 {
-	return config->triggers.num_data;
+	zbx_hashset_iter_t	iter;
+	zbx_uint64_t		functionid;
+	const ZBX_DC_ITEM	*dc_item;
+	const ZBX_DC_FUNCTION	*dc_function;
+	const ZBX_DC_TRIGGER	*dc_trigger;
+	const ZBX_DC_HOST	*dc_host;
+	const char		*p, *q;
+	int			count = 0;
+
+	LOCK_CACHE;
+
+	zbx_hashset_iter_reset(&config->triggers, &iter);
+
+	while (NULL != (dc_trigger = zbx_hashset_iter_next(&iter)))
+	{
+		if (TRIGGER_STATUS_ENABLED != dc_trigger->status)
+			continue;
+
+		for (p = dc_trigger->expression; '\0' != *p; p++)
+		{
+			if ('{' != *p)
+				continue;
+
+			for (q = p + 1; '}' != *q && '\0' != *q; q++)
+			{
+				if ('0' > *q || '9' < *q)
+					break;
+			}
+
+			if ('}' != *q)
+				continue;
+
+			sscanf(p + 1, ZBX_FS_UI64, &functionid);
+
+			if (NULL == (dc_function = zbx_hashset_search(&config->functions, &functionid)) ||
+					NULL == (dc_item = zbx_hashset_search(&config->items, &dc_function->itemid)) ||
+					ITEM_STATUS_ACTIVE != dc_item->status ||
+					NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)) ||
+					HOST_STATUS_MONITORED != dc_host->status)
+			{
+				goto next;
+			}
+
+			p = q;
+		}
+
+		count++;
+next:;
+	}
+
+	UNLOCK_CACHE;
+
+	return count;
 }
 
 /******************************************************************************
@@ -5946,15 +6320,15 @@ int	DCget_host_count()
 {
 	int			nhosts = 0;
 	zbx_hashset_iter_t	iter;
-	ZBX_DC_HOST		*host;
+	const ZBX_DC_HOST	*dc_host;
 
 	LOCK_CACHE;
 
 	zbx_hashset_iter_reset(&config->hosts, &iter);
 
-	while (NULL != (host = zbx_hashset_iter_next(&iter)))
+	while (NULL != (dc_host = zbx_hashset_iter_next(&iter)))
 	{
-		if (HOST_STATUS_MONITORED == host->status)
+		if (HOST_STATUS_MONITORED == dc_host->status)
 			nhosts++;
 	}
 
@@ -5976,16 +6350,26 @@ double	DCget_required_performance()
 {
 	double			nvps = 0;
 	zbx_hashset_iter_t	iter;
-	ZBX_DC_ITEM		*item;
+	const ZBX_DC_ITEM	*dc_item;
 
 	LOCK_CACHE;
 
 	zbx_hashset_iter_reset(&config->items, &iter);
 
-	while (NULL != (item = zbx_hashset_iter_next(&iter)))
+	while (NULL != (dc_item = zbx_hashset_iter_next(&iter)))
 	{
-		if (0 != item->delay)
-			nvps += 1.0 / item->delay;
+		const ZBX_DC_HOST	*dc_host;
+
+		if (ITEM_STATUS_ACTIVE != dc_item->status || 0 == dc_item->delay)
+			continue;
+
+		if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)))
+			continue;
+
+		if (HOST_STATUS_MONITORED != dc_host->status)
+			continue;
+
+		nvps += 1.0 / dc_item->delay;
 	}
 
 	UNLOCK_CACHE;
@@ -5999,31 +6383,31 @@ double	DCget_required_performance()
  *                                                                            *
  * Purpose: get hosts with items associated with a set of functions           *
  *                                                                            *
- * Parameters: hosts       - [OUT] a vector of host identifiers               *
+ * Parameters: hostids     - [OUT] a vector of host identifiers               *
  *             functionids - [IN] a vector containing source function ids     *
  *                                                                            *
  ******************************************************************************/
-void	DCget_functions_hostids(zbx_vector_uint64_t *hosts, const zbx_vector_uint64_t *functionids)
+void	DCget_functions_hostids(zbx_vector_uint64_t *hostids, const zbx_vector_uint64_t *functionids)
 {
-	ZBX_DC_FUNCTION		*function;
-	ZBX_DC_ITEM		*item;
+	ZBX_DC_FUNCTION		*dc_function;
+	ZBX_DC_ITEM		*dc_item;
 	int			i;
 
 	LOCK_CACHE;
 
 	for (i = 0; i < functionids->values_num; i++)
 	{
-		if (NULL == (function = zbx_hashset_search(&config->functions, &functionids->values[i])))
+		if (NULL == (dc_function = zbx_hashset_search(&config->functions, &functionids->values[i])))
 			continue;
 
-		if (NULL != (item = zbx_hashset_search(&config->items, &function->itemid)))
-			zbx_vector_uint64_append(hosts, item->hostid);
+		if (NULL != (dc_item = zbx_hashset_search(&config->items, &dc_function->itemid)))
+			zbx_vector_uint64_append(hostids, dc_item->hostid);
 	}
 
 	UNLOCK_CACHE;
 
-	zbx_vector_uint64_sort(hosts, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-	zbx_vector_uint64_uniq(hosts, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+	zbx_vector_uint64_sort(hostids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+	zbx_vector_uint64_uniq(hostids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
 }
 
 /******************************************************************************
@@ -6109,19 +6493,28 @@ void	DCget_expressions_by_name(zbx_vector_ptr_t *expressions, const char *name)
  ******************************************************************************/
 int	DCget_data_expected_from(zbx_uint64_t itemid, int *seconds)
 {
-	ZBX_DC_ITEM	*item;
-	ZBX_DC_HOST	*host;
+	ZBX_DC_ITEM	*dc_item;
+	ZBX_DC_HOST	*dc_host;
 	int		ret = FAIL;
 
 	LOCK_CACHE;
 
-	if (NULL != (item = zbx_hashset_search(&config->items, &itemid)) &&
-			NULL != (host = zbx_hashset_search(&config->hosts, &item->hostid)))
-	{
-		*seconds = MAX(item->data_expected_from, host->data_expected_from);
-		ret = SUCCEED;
-	}
+	if (NULL == (dc_item = zbx_hashset_search(&config->items, &itemid)))
+		goto unlock;
+
+	if (ITEM_STATUS_ACTIVE != dc_item->status)
+		goto unlock;
+
+	if (NULL == (dc_host = zbx_hashset_search(&config->hosts, &dc_item->hostid)))
+		goto unlock;
 
+	if (HOST_STATUS_MONITORED != dc_host->status)
+		goto unlock;
+
+	*seconds = MAX(dc_item->data_expected_from, dc_host->data_expected_from);
+
+	ret = SUCCEED;
+unlock:
 	UNLOCK_CACHE;
 
 	return ret;
diff --git a/src/libs/zbxdbcache/valuecache.c b/src/libs/zbxdbcache/valuecache.c
index fa3f13ea707..df20e8e91c2 100644
--- a/src/libs/zbxdbcache/valuecache.c
+++ b/src/libs/zbxdbcache/valuecache.c
@@ -101,10 +101,22 @@ zbx_vc_chunk_t;
 #define ZBX_VC_MAX_CHUNK_RECORDS	((64 * ZBX_KIBIBYTE - sizeof(zbx_vc_chunk_t)) / \
 		sizeof(zbx_history_record_t) + 1)
 
-/* the item state flags */
+/* the item operational state flags */
 #define ZBX_ITEM_STATE_CLEAN_PENDING	1
 #define ZBX_ITEM_STATE_REMOVE_PENDING	2
 
+
+/*                                                    */
+/* the item status flags                              */
+/*                                                    */
+/* indicates that all values from database are cached */
+#define ZBX_ITEM_STATUS_CACHED_ALL	1
+
+/* indicates that the first (earliest) second might   */
+/* not be fully cached and should be reloaded from    */
+/* database if more data are being requested          */
+#define ZBX_ITEM_STATUS_RELOAD_FIRST	2
+
 /* the value cache item data */
 typedef struct
 {
@@ -114,11 +126,11 @@ typedef struct
 	/* the item value type */
 	unsigned char	value_type;
 
-	/* the item state flags */
+	/* the item operational state flags (ZBX_ITEM_STATE_*)        */
 	unsigned char	state;
 
-	/* the flag indicating that all data from DB are cached       */
-	unsigned char	cached_all;
+	/* the item status flags (ZBX_ITEM_STATUS_*)                  */
+	unsigned char	status;
 
 	/* The total number of item values in cache.                  */
 	/* Used to evaluate if the item must be dropped from cache    */
@@ -202,11 +214,10 @@ static zbx_vc_cache_t	*vc_cache = NULL;
 static void	vc_history_record_copy(zbx_history_record_t *dst, const zbx_history_record_t *src, int value_type);
 static int	vc_history_record_compare_asc_func(const zbx_history_record_t *d1, const zbx_history_record_t *d2);
 static int	vc_history_record_compare_desc_func(const zbx_history_record_t *d1, const zbx_history_record_t *d2);
+static void	vc_history_record_vector_clean(zbx_vector_history_record_t *vector, int value_type);
 
 static size_t	vch_item_free_cache(zbx_vc_item_t *item);
 static size_t	vch_item_free_chunk(zbx_vc_item_t *item, zbx_vc_chunk_t *chunk);
-static int	vch_init(zbx_vc_item_t *item, zbx_vector_history_record_t *values, int seconds, int count,
-		int timestamp, const zbx_timespec_t *ts);
 static int	vch_item_add_values_at_tail(zbx_vc_item_t *item, const zbx_history_record_t *values, int values_num);
 static void	vch_item_clean_cache(zbx_vc_item_t *item);
 
@@ -249,7 +260,7 @@ static void	row2value_ui64(history_value_t *value, DB_ROW row)
 	ZBX_STR2UINT64(value->ui64, row[0]);
 }
 
-/* timestmap, logeventid, severity, source, value */
+/* timestamp, logeventid, severity, source, value */
 static void	row2value_log(history_value_t *value, DB_ROW row)
 {
 	value->log = zbx_malloc(NULL, sizeof(zbx_log_value_t));
@@ -327,8 +338,6 @@ static int	vc_db_read_values_by_time(zbx_uint64_t itemid, int value_type, zbx_ve
 	zbx_vc_history_table_t	*table = &vc_history_tables[value_type];
 	int			ret = FAIL;
 
-	vc_try_unlock();
-
 	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
 			"select clock,ns,%s"
 			" from %s"
@@ -357,8 +366,6 @@ static int	vc_db_read_values_by_time(zbx_uint64_t itemid, int value_type, zbx_ve
 
 	ret = SUCCEED;
 out:
-	vc_try_lock();
-
 	return ret;
 }
 
@@ -368,14 +375,10 @@ out:
  *                                                                                  *
  * Purpose: reads item history data from database                                   *
  *                                                                                  *
- * Parameters:  itemid          - [IN] the itemid                                   *
- *              value_type      - [IN] the value type (see ITEM_VALUE_TYPE_* defs)  *
- *              count           - [IN] the number of values to read                 *
- *              read_timestamp  - [IN] the value timestamp to start reading with    *
- *              count_timestamp - [IN] the value timestamp to start counting with   *
- *              direct          - [IN] 1 - data is read from DB to directly         *
- *                                         return it to user                        *
- *                                     0 - data is read from DB to store in cache   *
+ * Parameters:  itemid        - [IN] the itemid                                     *
+ *              value_type    - [IN] the value type (see ITEM_VALUE_TYPE_* defs)    *
+ *              count         - [IN] the number of values to read                   *
+ *              end_timestamp - [IN] the value timestamp to start reading with      *
  *                                                                                  *
  * Return value: SUCCEED - the history data were read successfully                  *
  *               FAIL - otherwise                                                   *
@@ -384,10 +387,6 @@ out:
  *           plus all values in range:                                              *
  *             count_timestamp < <value timestamp> <= read_timestamp                *
  *                                                                                  *
- *           When <direct> is set to 0 this function reads <count> values before    *
- *           <timeshift> plus all values with timestamp seconds matching <count>th  *
- *           value timestamp.                                                       *
- *                                                                                  *
  *           To speed up the reading time with huge data loads, data is read by     *
  *           smaller time segments (hours, day, week, month) and the next (larger)  *
  *           time segment is read only if the requested number of values (<count>)  *
@@ -395,21 +394,19 @@ out:
  *                                                                                  *
  ************************************************************************************/
 static int	vc_db_read_values_by_count(zbx_uint64_t itemid, int value_type, zbx_vector_history_record_t *values,
-		int count, int read_timestamp, const zbx_timespec_t *count_ts, int direct)
+		int count, int end_timestamp)
 {
 	char			*sql = NULL;
-	size_t	 		sql_alloc = 0, sql_offset = 0;
-	int			last_timestamp = 0, clock_to, clock_from, step = 0, ret = FAIL;
+	size_t	 		sql_alloc = 0, sql_offset;
+	int			clock_to, clock_from, step = 0, ret = FAIL;
 	DB_RESULT		result;
 	DB_ROW			row;
 	zbx_vc_history_table_t	*table = &vc_history_tables[value_type];
 	const int		periods[] = {SEC_PER_HOUR, SEC_PER_DAY, SEC_PER_WEEK, SEC_PER_MONTH, 0, -1};
 
-	vc_try_unlock();
-
-	clock_to = read_timestamp;
+	clock_to = end_timestamp;
 
-	while (-1 != periods[step] && values->values_num < count)
+	while (-1 != periods[step] && 0 < count)
 	{
 		clock_from = clock_to - periods[step];
 
@@ -426,10 +423,7 @@ static int	vc_db_read_values_by_count(zbx_uint64_t itemid, int value_type, zbx_v
 
 		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, " order by clock desc,ns desc");
 
-		if (1 == direct)
-			result = DBselectN(sql, count);
-		else
-			result = DBselect("%s", sql);
+		result = DBselectN(sql, count);
 
 		if (NULL == result)
 			goto out;
@@ -439,20 +433,12 @@ static int	vc_db_read_values_by_count(zbx_uint64_t itemid, int value_type, zbx_v
 			zbx_history_record_t	value;
 
 			value.timestamp.sec = atoi(row[0]);
-
-			if (values->values_num >= count && value.timestamp.sec != last_timestamp)
-				break;
-
 			value.timestamp.ns = atoi(row[1]);
 			table->rtov(&value.value, row + 2);
 
 			zbx_vector_history_record_append_ptr(values, &value);
 
-			if (0 < zbx_timespec_compare(&value.timestamp, count_ts))
-				count++;
-
-			if (1 != direct)
-				last_timestamp = value.timestamp.sec;
+			count--;
 		}
 		DBfree_result(result);
 
@@ -464,8 +450,6 @@ static int	vc_db_read_values_by_count(zbx_uint64_t itemid, int value_type, zbx_v
 out:
 	zbx_free(sql);
 
-	vc_try_lock();
-
 	return ret;
 }
 
@@ -488,60 +472,37 @@ out:
 static int	vc_db_read_value(zbx_uint64_t itemid, int value_type, const zbx_timespec_t *ts,
 		zbx_history_record_t *value)
 {
-	char				*sql = NULL;
-	size_t				sql_alloc = 0, sql_offset = 0;
 	int				ret = FAIL, i;
-	DB_RESULT			result;
-	DB_ROW				row;
-	zbx_vc_history_table_t		*table = &vc_history_tables[value_type];
 	zbx_vector_history_record_t	values;
 
-	vc_try_unlock();
-
-	/* first try to find a value matching the target timestamp */
-	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-			"select clock,ns,%s"
-			" from %s"
-			" where itemid=" ZBX_FS_UI64
-				" and clock=%d and ns=%d",
-			table->fields, table->name, itemid, ts->sec, ts->ns);
-
-	result = DBselect("%s", sql);
+	zbx_history_record_vector_create(&values);
 
-	zbx_free(sql);
+	/* first try to find value in the requested second */
+	vc_db_read_values_by_time(itemid, value_type, &values, 1, ts->sec);
+	zbx_vector_history_record_sort(&values, (zbx_compare_func_t)vc_history_record_compare_desc_func);
 
-	if (NULL != (row = DBfetch(result)))
+	if (0 == values.values_num || 0 > zbx_timespec_compare(ts, &values.values[values.values_num - 1].timestamp))
 	{
-		value->timestamp.sec = atoi(row[0]);
-		value->timestamp.ns = atoi(row[1]);
-		table->rtov(&value->value, row + 2);
-		ret = SUCCEED;
-	}
-	else
-	{
-		/* if failed to find a value matching target timestamp - */
-		/* find the older value closest to the timestamp         */
+		/* if the requested second does not contain matching values, */
+		/* get the first older value outside the requested second    */
+		vc_history_record_vector_clean(&values, value_type);
 
-		zbx_history_record_vector_create(&values);
-		vc_db_read_values_by_count(itemid, value_type, &values, 1, ts->sec, ts, 0);
+		vc_db_read_values_by_count(itemid, value_type, &values, 1, ts->sec - 1);
 		zbx_vector_history_record_sort(&values, (zbx_compare_func_t)vc_history_record_compare_desc_func);
+	}
 
-		for (i = 0; i < values.values_num; i++)
+	for (i = 0; i < values.values_num; i++)
+	{
+		if (0 <= zbx_timespec_compare(ts, &values.values[i].timestamp))
 		{
-			if ((values.values[i].timestamp.sec == ts->sec && values.values[i].timestamp.ns <= ts->ns) ||
-					values.values[i].timestamp.sec < ts->sec)
-			{
-				vc_history_record_copy(value, &values.values[0], value_type);
-				ret = SUCCEED;
-			}
-		}
+			vc_history_record_copy(value, &values.values[i], value_type);
+			ret = SUCCEED;
 
-		zbx_history_record_vector_destroy(&values, value_type);
+			break;
+		}
 	}
 
-	DBfree_result(result);
-
-	vc_try_lock();
+	zbx_history_record_vector_destroy(&values, value_type);
 
 	return ret;
 }
@@ -682,6 +643,36 @@ static zbx_log_value_t	*vc_history_logdup(const zbx_log_value_t *log)
 
 /******************************************************************************
  *                                                                            *
+ * Function: vc_history_record_vector_clean                                   *
+ *                                                                            *
+ * Purpose: reelases resources allocated to store history values              *
+ *                                                                            *
+ * Parameters: vector      - [IN] the value vector                            *
+ *             value_type  - [IN] the type of vector values                   *
+ *                                                                            *
+ ******************************************************************************/
+static void	vc_history_record_vector_clean(zbx_vector_history_record_t *vector, int value_type)
+{
+	int	i;
+
+	switch (value_type)
+	{
+		case ITEM_VALUE_TYPE_STR:
+		case ITEM_VALUE_TYPE_TEXT:
+			for (i = 0; i < vector->values_num; i++)
+				zbx_free(vector->values[i].value.str);
+
+			break;
+		case ITEM_VALUE_TYPE_LOG:
+			for (i = 0; i < vector->values_num; i++)
+				vc_history_logfree(vector->values[i].value.log);
+	}
+
+	vector->values_num = 0;
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: vc_update_statistics                                             *
  *                                                                            *
  * Purpose: updates cache and item statistics                                 *
@@ -1167,71 +1158,6 @@ static void	vc_item_release(zbx_vc_item_t *item)
 	}
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: vc_add_item                                                      *
- *                                                                            *
- * Purpose: adds a new item to the cache with the requested history data      *
- *                                                                            *
- * Parameters: itemid     - [IN] the item id                                  *
- *             value_type - [IN] the item value type                          *
- *             seconds    - [IN] the time period to retrieve data for         *
- *             count      - [IN] the number of history values to retrieve     *
- *             timestamp  - [IN] the period end timestamp                     *
- *             ts         - [IN] the value timestamp                          *
- *             values     - [OUT] the cached values                           *
- *                                                                            *
- * Return value:  the prepared item or NULL if item could not be added        *
- *                (not enough memory to store item data)                      *
- *                                                                            *
- ******************************************************************************/
-static zbx_vc_item_t	*vc_add_item(zbx_uint64_t itemid, int value_type, int seconds, int count,
-		int timestamp, const zbx_timespec_t *ts, zbx_vector_history_record_t *values)
-{
-	int		ret = FAIL, now;
-	zbx_vc_item_t	*item = NULL;
-
-	now = ZBX_VC_TIME();
-
-	/* read the item values from database */
-	if (NULL != ts)
-	{
-		ret = vc_db_read_values_by_count(itemid, value_type, values, 1, now, ts, 0);
-	}
-	else if (0 == count)
-	{
-		ret = vc_db_read_values_by_time(itemid, value_type, values, now - timestamp + seconds, now);
-	}
-	else
-	{
-		zbx_timespec_t	ts = {timestamp, VC_MAX_NANOSECONDS};
-
-		ret = vc_db_read_values_by_count(itemid, value_type, values, count, now, &ts, 0);
-	}
-
-	if (SUCCEED == ret)
-	{
-		zbx_vector_history_record_sort(values, (zbx_compare_func_t)vc_history_record_compare_asc_func);
-
-		/* check if during data retrieval from DB the item was not already added to cache */
-		if (NULL == (item = zbx_hashset_search(&vc_cache->items, &itemid)))
-		{
-			zbx_vc_item_t   new_item = {itemid, value_type};
-
-			if (NULL == (item = zbx_hashset_insert(&vc_cache->items, &new_item, sizeof(zbx_vc_item_t))))
-				goto out;
-
-			vc_item_addref(item);
-
-			vch_init(item, values, seconds, count, timestamp, ts);
-		}
-		else
-			vch_item_add_values_at_tail(item, values->values, values->values_num);
-	}
-out:
-	return item;
-}
-
 /******************************************************************************************************************
  *                                                                                                                *
  * History storage API                                                                                            *
@@ -1472,49 +1398,6 @@ static int	vch_item_get_last_value(const zbx_vc_item_t *item, int end_timestamp,
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_get_last_value_by_timespec                              *
- *                                                                            *
- * Purpose: gets the chunk and index of the last value with a timestamp less  *
- *          or equal to the specified timestamp                               *
- *                                                                            *
- * Parameters:  item          - [IN] the item                                 *
- *              timestamp     - [IN] the target timestamp                     *
- *              pchunk        - [OUT] the chunk containing the target value   *
- *              pindex        - [OUT] the index of the target value           *
- *                                                                            *
- * Return value: SUCCEED - the last value was found successfully              *
- *               FAIL - all values in cache have timestamps greater than the  *
- *                      target (timeshift) timestamp.                         *
- *                                                                            *
- * Comments: This function is similar to vch_item_get_last_value() with       *
- *           increased resolution to nanoseconds.                             *
- *                                                                            *
- ******************************************************************************/
-static int	vch_item_get_last_value_by_timespec(const zbx_vc_item_t *item, const zbx_timespec_t *timestamp,
-		zbx_vc_chunk_t **pchunk, int *pindex)
-{
-	int	ret = FAIL;
-
-	if (SUCCEED == vch_item_get_last_value(item, timestamp->sec, pchunk, pindex))
-	{
-		while (0 < zbx_timespec_compare(&(*pchunk)->slots[*pindex].timestamp, timestamp))
-		{
-			if (--(*pindex) < (*pchunk)->first_value)
-			{
-				if (NULL == (*pchunk = (*pchunk)->prev))
-					goto out;
-
-				*pindex = (*pchunk)->last_value;
-			}
-		}
-		ret = SUCCEED;
-	}
-out:
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
  * Function: vch_item_copy_value                                              *
  *                                                                            *
  * Purpose: copies value in the specified item's chunk slot                   *
@@ -1687,6 +1570,8 @@ static void	vch_item_remove_chunk(zbx_vc_item_t *item, zbx_vc_chunk_t *chunk)
  ******************************************************************************/
 static void	vch_item_clean_cache(zbx_vc_item_t *item)
 {
+	zbx_vc_chunk_t	*next;
+
 	if (0 != item->range)
 	{
 		zbx_vc_chunk_t	*tail = item->tail;
@@ -1696,9 +1581,13 @@ static void	vch_item_clean_cache(zbx_vc_item_t *item)
 		timestamp = ZBX_VC_TIME() - item->range;
 
 		/* try to remove chunks with all history values older than maximum request range */
-		while (NULL != chunk && chunk->slots[chunk->last_value].timestamp.sec < timestamp)
+		while (NULL != chunk && chunk->slots[chunk->last_value].timestamp.sec < timestamp &&
+				chunk->slots[chunk->last_value].timestamp.sec !=
+						item->head->slots[item->head->last_value].timestamp.sec)
 		{
-			zbx_vc_chunk_t	*next = chunk->next;
+			/* don't remove the head chunk */
+			if (NULL == (next = chunk->next))
+				break;
 
 			/* Values with the same timestamps (seconds resolution) always should be either   */
 			/* kept in cache or removed together. There should not be a case when one of them */
@@ -1708,8 +1597,7 @@ static void	vch_item_clean_cache(zbx_vc_item_t *item)
 			/* In this case increase the first value index of the next chunk until the first  */
 			/* value timestamp is greater.                                                    */
 
-			if (NULL != next && next->slots[next->first_value].timestamp.sec !=
-					next->slots[next->last_value].timestamp.sec)
+			if (next->slots[next->first_value].timestamp.sec != next->slots[next->last_value].timestamp.sec)
 			{
 				while (next->slots[next->first_value].timestamp.sec ==
 						chunk->slots[chunk->last_value].timestamp.sec)
@@ -1724,14 +1612,54 @@ static void	vch_item_clean_cache(zbx_vc_item_t *item)
 			chunk = next;
 		}
 
-		/* reset the cached_all flag if data was removed from cache */
+		/* reset the status flags if data was removed from cache */
 		if (tail != item->tail)
-			item->cached_all = 0;
+			item->status = 0;
 	}
 }
 
 /******************************************************************************
  *                                                                            *
+ * Function: vch_item_drop_first_second                                       *
+ *                                                                            *
+ * Purpose: drops the data of first (earliest) second from the cache          *
+ *                                                                            *
+ * Parameters:  item   - [IN] the item to add history data to                 *
+ *                                                                            *
+ * Return value: the number of dropped values                                 *
+ *                                                                            *
+ * Comments: When the cache are updated with count() based request,           *
+ *           there are no guarantees that the whole first second is cached.   *
+ *           In this case reload first flag is set and when upon the next     *
+ *           update the first second data is reloaded from database.          *
+ *                                                                            *
+ ******************************************************************************/
+static int	vch_item_drop_first_second(zbx_vc_item_t *item)
+{
+	int	first_second, count = 0;
+
+	if (NULL == item->tail)
+		return 0;
+
+	first_second = item->tail->slots[item->tail->first_value].timestamp.sec;
+
+	while (NULL != item->tail && first_second == item->tail->slots[item->tail->first_value].timestamp.sec)
+	{
+		vc_item_free_values(item, item->tail->slots, item->tail->first_value, item->tail->first_value);
+		item->tail->first_value++;
+		count++;
+
+		if (item->tail->first_value > item->tail->last_value)
+			vch_item_remove_chunk(item, item->tail);
+	}
+
+	item->status = 0;
+
+	return count;
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: vch_item_add_value_at_head                                       *
  *                                                                            *
  * Purpose: adds one item history value at the end of current item's history  *
@@ -1758,9 +1686,10 @@ static int	vch_item_add_value_at_head(zbx_vc_item_t *item, const zbx_history_rec
 		if (0 < vc_history_record_compare_asc_func(&item->tail->slots[item->tail->first_value], value))
 		{
 			/* If the added value has the same or older timestamp as the first value in cache */
-			/* we can't add it to keep cache consistency. In this case reset the cached_all   */
+			/* we can't add it to keep cache consistency. In this case reset the cached all   */
 			/* flag and return success.                                                       */
-			item->cached_all = 0;
+			if (ZBX_ITEM_STATUS_CACHED_ALL == item->status)
+				item->status = 0;
 
 			ret = SUCCEED;
 			goto out;
@@ -1910,7 +1839,7 @@ out:
  *             timestamp - [IN] the requested period end timestamp            *
  *                                                                            *
  * Return value:  >=0    - the number of values read from database            *
- *                FAIL   - an error occured while trying to cache values      *
+ *                FAIL   - an error occurred while trying to cache values     *
  *                                                                            *
  * Comments: This function checks if the requested value range is cached and  *
  *           updates cache from database if necessary.                        *
@@ -1926,32 +1855,53 @@ static int	vch_item_cache_values_by_time(zbx_vc_item_t *item, int seconds, int t
 	/* find if the cache should be updated to cover the required range */
 	if (NULL == item->tail)
 	{
-		update_seconds = now - timestamp + seconds;
+		update_seconds = now - start;
 		update_end = now;
 	}
 	else if (start < now - item->range)
 	{
-		/* We need to get item values before the first cached value, but not including it.    */
-		/* As vc_item_read_values_by_time() function returns data including the end timestamp */
-		/* decrement the first timestamp by 1.                                                */
-		update_end = item->tail->slots[item->tail->first_value].timestamp.sec - 1;
+		/* We need to get item values before the first cached value, but not including it     */
+		/* unless reload first flag is set (in which case we need to include the first cached */
+		/* value).                                                                            */
+		update_end = item->tail->slots[item->tail->first_value].timestamp.sec;
+
+		if (ZBX_ITEM_STATUS_RELOAD_FIRST != item->status)
+			update_end--;
+
 		update_seconds = update_end - start;
 	}
 
 	/* update cache if necessary */
-	if (0 < update_seconds && 0 == item->cached_all)
+	if (0 < update_seconds && ZBX_ITEM_STATUS_CACHED_ALL != item->status)
 	{
 		zbx_vector_history_record_t	records;
 
+		if (ZBX_ITEM_STATUS_RELOAD_FIRST == item->status)
+			vch_item_drop_first_second(item);
+
 		zbx_vector_history_record_create(&records);
 
-		if (SUCCEED == (ret = vc_db_read_values_by_time(item->itemid, item->value_type, &records,
-				update_seconds, update_end)) && 0 < records.values_num)
+		vc_try_unlock();
+
+		ret = vc_db_read_values_by_time(item->itemid, item->value_type, &records, update_seconds, update_end);
+
+		vc_try_lock();
+
+		if (SUCCEED == ret)
 		{
-			zbx_vector_history_record_sort(&records,
-					(zbx_compare_func_t)vc_history_record_compare_asc_func);
-			if (SUCCEED == (ret = vch_item_add_values_at_tail(item, records.values, records.values_num)))
-				ret = records.values_num;
+			if (0 < records.values_num)
+			{
+				zbx_vector_history_record_sort(&records,
+						(zbx_compare_func_t)vc_history_record_compare_asc_func);
+
+				ret = vch_item_add_values_at_tail(item, records.values, records.values_num);
+
+				if (SUCCEED == ret)
+					ret = records.values_num;
+			}
+			/* when updating cache with time based request we can always reset status flags */
+			/* flag even if the requested period contains no data                           */
+			item->status = 0;
 		}
 		zbx_history_record_vector_destroy(&records, item->value_type);
 	}
@@ -1970,13 +1920,13 @@ static int	vch_item_cache_values_by_time(zbx_vc_item_t *item, int seconds, int t
  *             timestamp - [IN] the target timestamp                          *
  *                                                                            *
  * Return value:  >=0    - the number of values read from database            *
- *                FAIL   - an error occured while trying to cache values      *
+ *                FAIL   - an error occurred while trying to cache values     *
  *                                                                            *
  * Comments: This function checks if the requested number of values is cached *
  *           and updates cache from database if necessary.                    *
  *                                                                            *
  ******************************************************************************/
-static int	vch_item_cache_values_by_count(zbx_vc_item_t *item, int count, const zbx_timespec_t *timestamp)
+static int	vch_item_cache_values_by_count(zbx_vc_item_t *item, int count, int timestamp)
 {
 	int	ret = SUCCEED, cache_records = 0, update_end;
 
@@ -1986,7 +1936,7 @@ static int	vch_item_cache_values_by_count(zbx_vc_item_t *item, int count, const
 		zbx_vc_chunk_t	*chunk;
 		int		index;
 
-		if (SUCCEED == vch_item_get_last_value_by_timespec(item, timestamp, &chunk, &index))
+		if (SUCCEED == vch_item_get_last_value(item, timestamp, &chunk, &index))
 		{
 			cache_records = index - chunk->first_value + 1;
 
@@ -1994,28 +1944,141 @@ static int	vch_item_cache_values_by_count(zbx_vc_item_t *item, int count, const
 				cache_records += chunk->last_value - chunk->first_value + 1;
 		}
 
-		/* We need to get item values before the first cached value, but not including it.     */
-		/* As vc_item_read_values_by_count() function returns data including the end timestamp */
-		/* decrement the first timestamp by 1.                                                 */
-		update_end = item->tail->slots[item->tail->first_value].timestamp.sec - 1;
+		/* We need to get item values before the first cached value, but not including it     */
+		/* unless reload first flag is set (in which case we need to include the first cached */
+		/* value).                                                                            */
+		update_end = item->tail->slots[item->tail->first_value].timestamp.sec;
+
+		if (ZBX_ITEM_STATUS_RELOAD_FIRST != item->status)
+			update_end--;
 	}
 	else
 		update_end = ZBX_VC_TIME();
 
 	/* update cache if necessary */
-	if (0 == item->cached_all && cache_records < count)
+	if (ZBX_ITEM_STATUS_CACHED_ALL != item->status && cache_records < count)
 	{
 		zbx_vector_history_record_t	records;
 
+		if (ZBX_ITEM_STATUS_RELOAD_FIRST == item->status)
+			cache_records -= vch_item_drop_first_second(item);
+
 		zbx_vector_history_record_create(&records);
 
-		if (SUCCEED == (ret = vc_db_read_values_by_count(item->itemid, item->value_type,
-				&records, count - cache_records, update_end, timestamp, 0)) && 0 < records.values_num)
+		vc_try_unlock();
+
+		ret = vc_db_read_values_by_count(item->itemid, item->value_type, &records, count - cache_records,
+				timestamp < update_end ? timestamp : update_end);
+
+		if (SUCCEED == ret && update_end > timestamp)
+		{
+			ret = vc_db_read_values_by_time(item->itemid, item->value_type, &records,
+					update_end - timestamp, update_end);
+		}
+
+		vc_try_lock();
+
+		if (SUCCEED == ret && 0 < records.values_num)
 		{
 			zbx_vector_history_record_sort(&records,
 					(zbx_compare_func_t)vc_history_record_compare_asc_func);
+
 			if (SUCCEED == (ret = vch_item_add_values_at_tail(item, records.values, records.values_num)))
+			{
 				ret = records.values_num;
+				item->status = ZBX_ITEM_STATUS_RELOAD_FIRST;
+			}
+		}
+
+		zbx_history_record_vector_destroy(&records, item->value_type);
+	}
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: vch_item_cache_value                                             *
+ *                                                                            *
+ * Purpose: cache item history data for the specified timestamp               *
+ *                                                                            *
+ * Parameters: item      - [IN] the item                                      *
+ *             ts        - [IN] the timestamp                                 *
+ *                                                                            *
+ * Return value:  >=0    - the number of values read from database            *
+ *                FAIL   - an error occurred while trying to cache values     *
+ *                                                                            *
+ * Comments: This function checks if the requested value range is cached and  *
+ *           updates cache from database if necessary.                        *
+ *                                                                            *
+ ******************************************************************************/
+static int	vch_item_cache_value(zbx_vc_item_t *item, const zbx_timespec_t *ts)
+{
+	int	ret = SUCCEED, update_seconds = 0, update_end, now, reload_first = 0;
+	int	start = ts->sec - 1;
+
+	now = ZBX_VC_TIME();
+
+	/* find if the cache should be updated to cover the required range */
+	if (NULL == item->tail)
+	{
+		update_seconds = now - start;
+		update_end = now;
+	}
+	else
+	{
+		/* We need to get item values before the first cached value, but not including it     */
+		/* unless reload_first flag is set (in which case we need to include the first cached */
+		/* value).                                                                            */
+		update_end = item->tail->slots[item->tail->first_value].timestamp.sec;
+
+		if (ZBX_ITEM_STATUS_RELOAD_FIRST != item->status)
+			update_end--;
+
+		update_seconds = update_end - start;
+	}
+
+	/* update cache if necessary */
+	if (0 < update_seconds && ZBX_ITEM_STATUS_CACHED_ALL != item->status)
+	{
+		zbx_vector_history_record_t	records;
+
+		if (ZBX_ITEM_STATUS_RELOAD_FIRST == item->status)
+			vch_item_drop_first_second(item);
+
+		zbx_vector_history_record_create(&records);
+
+		vc_try_unlock();
+
+		/* first try to find the requested value in target second interval */
+		ret = vc_db_read_values_by_time(item->itemid, item->value_type, &records, update_seconds, update_end);
+
+		zbx_vector_history_record_sort(&records, (zbx_compare_func_t)vc_history_record_compare_asc_func);
+
+		/* the target second does not contain the required value, read first value before it */
+		if (0 == records.values_num || 0 > zbx_timespec_compare(ts, &records.values[0].timestamp))
+		{
+			ret = vc_db_read_values_by_count(item->itemid, item->value_type, &records, 1, ts->sec - 1);
+			reload_first = 1;
+		}
+
+		vc_try_lock();
+
+		if (SUCCEED == ret)
+		{
+			if (0 < records.values_num)
+			{
+				zbx_vector_history_record_sort(&records,
+						(zbx_compare_func_t)vc_history_record_compare_asc_func);
+
+				ret = vch_item_add_values_at_tail(item, records.values, records.values_num);
+
+				if (SUCCEED == ret)
+					ret = records.values_num;
+
+				if (1 == reload_first)
+					item->status = ZBX_ITEM_STATUS_RELOAD_FIRST;
+			}
 		}
 		zbx_history_record_vector_destroy(&records, item->value_type);
 	}
@@ -2023,6 +2086,7 @@ static int	vch_item_cache_values_by_count(zbx_vc_item_t *item, int count, const
 	return ret;
 }
 
+
 /******************************************************************************
  *                                                                            *
  * Function: vch_item_get_values_by_time                                      *
@@ -2051,7 +2115,7 @@ static int	vch_item_get_values_by_time(zbx_vc_item_t *item, zbx_vector_history_r
 	/* Check if maximum request range is not set and all data are cached.  */
 	/* Because that indicates there was a count based request with unknown */
 	/* range which might be greater than the current request range.        */
-	if (0 != item->range || 0 == item->cached_all)
+	if (0 != item->range || ZBX_ITEM_STATUS_CACHED_ALL != item->status)
 	{
 		if (item->range <= seconds + now - timestamp)
 		{
@@ -2147,7 +2211,7 @@ out:
 	{
 		/* not enough data in db to fulfill the request */
 		item->range = 0;
-		item->cached_all = 1;
+		item->status = ZBX_ITEM_STATUS_CACHED_ALL;
 	}
 
 	return ret;
@@ -2203,9 +2267,7 @@ static int	vch_item_get_value_range(zbx_vc_item_t *item, zbx_vector_history_reco
 	}
 	else
 	{
-		zbx_timespec_t	ts = {timestamp, VC_MAX_NANOSECONDS};
-
-		if (FAIL == (ret = vch_item_cache_values_by_count(item, count, &ts)))
+		if (FAIL == (ret = vch_item_cache_values_by_count(item, count, timestamp)))
 			goto out;
 
 		records_read = ret;
@@ -2255,8 +2317,7 @@ static int	vch_item_get_value(zbx_vc_item_t *item, const zbx_timespec_t *ts, zbx
 
 	if (NULL == item->tail || 0 < zbx_timespec_compare(&item->tail->slots[item->tail->first_value].timestamp, ts))
 	{
-		/* the requested value is not in cache, request cache update */
-		if (FAIL == vch_item_cache_values_by_count(item, 1, ts))
+		if (FAIL == vch_item_cache_value(item, ts))
 			goto out;
 
 		misses++;
@@ -2266,12 +2327,23 @@ static int	vch_item_get_value(zbx_vc_item_t *item, const zbx_timespec_t *ts, zbx
 
 	ret = SUCCEED;
 
-	if (FAIL == vch_item_get_last_value_by_timespec(item, ts, &chunk, &index))
+	if (FAIL == vch_item_get_last_value(item, ts->sec, &chunk, &index))
 	{
 		/* even after cache update the requested value is not there */
 		goto out;
 	}
 
+	/* find the value by checking nanoseconds too */
+	while (0 < zbx_timespec_compare(&chunk->slots[index].timestamp, ts))
+	{
+		if (--index < chunk->first_value)
+		{
+			if (NULL == (chunk = chunk->prev))
+				goto out;
+
+			index = chunk->last_value;
+		}
+	}
 	vc_update_statistics(item, hits, misses);
 
 	vc_history_record_copy(value, &chunk->slots[index], item->value_type);
@@ -2287,74 +2359,7 @@ static int	vch_item_get_value(zbx_vc_item_t *item, const zbx_timespec_t *ts, zbx
 	*found = 1;
 out:
 	if (0 == *found)
-		item->cached_all = 1;
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: vch_init                                                         *
- *                                                                            *
- * Purpose: initializes cache item with historical data                       *
- *                                                                            *
- * Parameters: item       - [IN] the item                                     *
- *             values     - [IN] the initial history data                     *
- *             seconds    - [IN] the request time period                      *
- *             count      - [IN] the number of values to get                  *
- *             timestamp  - [IN] the request period end timestamp             *
- *             ts         - [IN] the value timestamp for single request, can  *
- *                               be NULL                                      *
- *                                                                            *
- * Return value: SUCCEED - item initialized successfully                      *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- ******************************************************************************/
-static int	vch_init(zbx_vc_item_t *item, zbx_vector_history_record_t *values, int seconds, int count,
-		int timestamp, const zbx_timespec_t *ts)
-{
-	int	ret, now;
-
-	if (0 < values->values_num)
-	{
-		if (NULL != ts)
-		{
-			/* check if the init value vector contains the requested value */
-			if (0 < zbx_timespec_compare(&values->values->timestamp, ts))
-				item->cached_all = 1;
-		}
-		else if (0 != count)
-		{
-			int	i;
-
-			/* check if the init value vector contains the requested number of values before timestamp */
-			for (i = 0; i < values->values_num && 0 < count; i++)
-			{
-				if (values->values[i].timestamp.sec > timestamp)
-					break;
-
-				count--;
-			}
-			if (0 < count)
-				item->cached_all = 1;
-		}
-
-		now = ZBX_VC_TIME();
-
-		if (0 != seconds)
-		{
-			item->range = now - timestamp + seconds;
-		}
-		else
-		{
-			/* don't set the range if all data was cached by the initial request */
-			if (0 == item->cached_all)
-				item->range = now - values->values->timestamp.sec;
-		}
-	}
-
-	if (SUCCEED == (ret = vch_item_add_values_at_tail(item, values->values, values->values_num)))
-		vc_update_statistics(item, 0, values->values_num);
+		item->status = ZBX_ITEM_STATUS_CACHED_ALL;
 
 	return ret;
 }
@@ -2498,7 +2503,7 @@ void	zbx_vc_destroy(void)
  *                                                                            *
  * Parameters: itemid     - [IN] the item id                                  *
  *             value_type - [IN] the value type (see ITEM_VALUE_TYPE_* defs)  *
- *             timestamp  - [IN] the value timestmap                          *
+ *             timestamp  - [IN] the value timestamp                          *
  *             value      - [IN] the value to add                             *
  *                                                                            *
  * Return value:  SUCCEED - the item value was added successfully             *
@@ -2595,52 +2600,15 @@ int	zbx_vc_get_value_range(zbx_uint64_t itemid, int value_type, zbx_vector_histo
 
 	if (NULL == (item = zbx_hashset_search(&vc_cache->items, &itemid)))
 	{
-		int	i, start = 0;
-
-		if (1 == vc_cache->low_memory)
-			goto out;
-
-		item = vc_add_item(itemid, value_type, seconds, count, timestamp, NULL, values);
-
-		/* The values vector contains cache data sorted in ascending order, which  */
-		/* might be larger than requested number of values for timeshift and count */
-		/* based requests. To convert it in the expected format the following must */
-		/* be done:                                                                */
-		/*    1) sort it in descending order                                       */
-		/*    2) remove values outside (newer) timeshift range                     */
-		/*    3) remove values outside (older) count request range                 */
-
-		/* sort it in descending order */
-		zbx_vector_history_record_sort(values, (zbx_compare_func_t)vc_history_record_compare_desc_func);
-
-		/* release resources of values beyond request period end timestamp */
-		while (start < values->values_num && values->values[start].timestamp.sec > timestamp)
+		if (0 == vc_cache->low_memory)
 		{
-			zbx_history_record_clear(&values->values[start], value_type);
-			start++;
-		}
-
-		/* Count based requests might have returned more values than requested to */
-		/* ensure cache continuity. Cut the overhead.                             */
-		if (0 != count && values->values_num > count + start)
-		{
-			for (i = count + start; i < values->values_num; i++)
-				zbx_history_record_clear(&values->values[i], value_type);
-
-			values->values_num = count + start;
-		}
+			zbx_vc_item_t   new_item = {itemid, value_type};
 
-		/* shift the vector downwards if necessary */
-		if (0 != start)
-		{
-			memmove(values->values, &values->values[start],
-					(values->values_num - start) * sizeof(zbx_history_record_t));
-			values->values_num -= start;
+			if (NULL == (item = zbx_hashset_insert(&vc_cache->items, &new_item, sizeof(zbx_vc_item_t))))
+				goto out;
 		}
-
-		ret = SUCCEED;
-
-		goto finish;
+		else
+			goto out;
 	}
 
 	vc_item_addref(item);
@@ -2657,16 +2625,14 @@ out:
 
 		cache_used = 0;
 
+		vc_try_unlock();
+
 		if (0 == count)
-		{
 			ret = vc_db_read_values_by_time(itemid, value_type, values, seconds, timestamp);
-		}
 		else
-		{
-			zbx_timespec_t	ts = {timestamp, VC_MAX_NANOSECONDS};
+			ret = vc_db_read_values_by_count(itemid, value_type, values, count, timestamp);
 
-			ret = vc_db_read_values_by_count(itemid, value_type, values, count, timestamp, &ts, 1);
-		}
+		vc_try_lock();
 
 		if (SUCCEED == ret)
 		{
@@ -2674,7 +2640,7 @@ out:
 			vc_update_statistics(NULL, 0, values->values_num);
 		}
 	}
-finish:
+
 	if (NULL != item)
 		vc_item_release(item);
 
@@ -2729,33 +2695,15 @@ int	zbx_vc_get_value(zbx_uint64_t itemid, int value_type, const zbx_timespec_t *
 
 	if (NULL == (item = zbx_hashset_search(&vc_cache->items, &itemid)))
 	{
-		zbx_vector_history_record_t	values;
-		int				i;
-
-		if (1 == vc_cache->low_memory)
-			goto out;
-
-		zbx_vector_history_record_create(&values);
-
-		item = vc_add_item(itemid, value_type, 0, 0, 0, ts, &values);
-
-		/* the values vector contains cache data sorted in ascending order - */
-		/* find the target value inside this vector                          */
-
-		for (i = values.values_num - 1; i >= 0; i--)
+		if (0 == vc_cache->low_memory)
 		{
-			if (0 >= zbx_timespec_compare(&values.values[i].timestamp, ts))
-			{
-				vc_history_record_copy(value, &values.values[i], value_type);
-				*found = 1;
-				break;
-			}
-		}
-		zbx_history_record_vector_destroy(&values, value_type);
-
-		ret = SUCCEED;
+			zbx_vc_item_t   new_item = {itemid, value_type};
 
-		goto finish;
+			if (NULL == (item = zbx_hashset_insert(&vc_cache->items, &new_item, sizeof(zbx_vc_item_t))))
+				goto out;
+		}
+		else
+			goto out;
 	}
 
 	vc_item_addref(item);
@@ -2772,13 +2720,19 @@ out:
 
 		cache_used = 0;
 
-		if (SUCCEED == (ret = vc_db_read_value(itemid, value_type, ts, value)))
+		vc_try_unlock();
+
+		ret = vc_db_read_value(itemid, value_type, ts, value);
+
+		vc_try_lock();
+
+		if (SUCCEED == ret)
 		{
 			vc_update_statistics(NULL, 0, 1);
 			*found = 1;
 		}
 	}
-finish:
+
 	if (NULL != item)
 		vc_item_release(item);
 
@@ -2804,11 +2758,11 @@ finish:
  ******************************************************************************/
 int	zbx_vc_get_statistics(zbx_vc_stats_t *stats)
 {
-	vc_try_lock();
-
 	if (NULL == vc_cache)
 		return FAIL;
 
+	vc_try_lock();
+
 	stats->hits = vc_cache->hits;
 	stats->misses = vc_cache->misses;
 	stats->low_memory = vc_cache->low_memory;
@@ -2835,22 +2789,9 @@ int	zbx_vc_get_statistics(zbx_vc_stats_t *stats)
  ******************************************************************************/
 void	zbx_history_record_vector_destroy(zbx_vector_history_record_t *vector, int value_type)
 {
-	int	i;
-
 	if (NULL != vector->values)
 	{
-		switch (value_type)
-		{
-			case ITEM_VALUE_TYPE_STR:
-			case ITEM_VALUE_TYPE_TEXT:
-				for (i = 0; i < vector->values_num; i++)
-					zbx_free(vector->values[i].value.str);
-
-				break;
-			case ITEM_VALUE_TYPE_LOG:
-				for (i = 0; i < vector->values_num; i++)
-					vc_history_logfree(vector->values[i].value.log);
-		}
+		vc_history_record_vector_clean(vector, value_type);
 		zbx_vector_history_record_destroy(vector);
 	}
 }
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c
index 042e0ef3058..5501b45c397 100644
--- a/src/libs/zbxdbhigh/db.c
+++ b/src/libs/zbxdbhigh/db.c
@@ -37,7 +37,7 @@ extern int	txn_error;
 
 static int	connection_failure;
 
-void	DBclose()
+void	DBclose(void)
 {
 	zbx_db_close();
 }
@@ -72,7 +72,7 @@ int	DBconnect(int flag)
 		if (ZBX_DB_FAIL == err || ZBX_DB_CONNECT_EXIT == flag)
 		{
 			zabbix_log(LOG_LEVEL_CRIT, "Cannot connect to the database. Exiting...");
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 		zabbix_log(LOG_LEVEL_WARNING, "database is down: reconnecting in %d seconds", ZBX_DB_WAIT_DOWN);
@@ -98,7 +98,7 @@ int	DBconnect(int flag)
  * Author: Alexander Vladishev                                                *
  *                                                                            *
  ******************************************************************************/
-void	DBinit()
+void	DBinit(void)
 {
 	zbx_db_init(CONFIG_DBNAME, db_schema);
 }
@@ -437,7 +437,7 @@ DB_RESULT	DBselectN(const char *query, int n)
  * Comments: do not process if there are dependencies with value PROBLEM      *
  *                                                                            *
  ******************************************************************************/
-static int	process_trigger(char **sql, size_t *sql_alloc, size_t *sql_offset, const DC_TRIGGER *trigger)
+int	process_trigger(char **sql, size_t *sql_alloc, size_t *sql_offset, const struct _DC_TRIGGER *trigger)
 {
 	const char	*__function_name = "process_trigger";
 
@@ -472,23 +472,25 @@ static int	process_trigger(char **sql, size_t *sql_alloc, size_t *sql_offset, co
 	/*              |                                                                                 */
 	/*  ------------+------------------------------------------------------                           */
 	/*              |                                                                                 */
-	/*  OK          |   no           T            T+E         -                                       */
+	/*  OK          |   no           T+I          T+E         I                                       */
 	/*              |                                                                                 */
-	/*  OK(?)       |   T            T(e)         T+E         -                                       */
+	/*  OK(?)       |   T+I          T(e)         T+E+I       -                                       */
 	/*              |                                                                                 */
-	/*  PROBLEM     |   T+E          -            T(m)+E(m)   T                                       */
+	/*  PROBLEM     |   T+E          I            T(m)+E(m)   T+I                                     */
 	/*              |                                                                                 */
-	/*  PROBLEM(?)  |   T+E          -            T+E(m)      T(e)                                    */
+	/*  PROBLEM(?)  |   T+E+I        -            T+E(m)+I    T(e)                                    */
 	/*              |                                                                                 */
 	/*                                                                                                */
 	/* Legend:                                                                                        */
 	/*                                                                                                */
+	/*  ?   - unknown state                                                                           */
 	/*  -   - should never happen                                                                     */
 	/*  no  - do nothing                                                                              */
 	/*  T   - update a trigger                                                                        */
 	/*  E   - generate an event                                                                       */
 	/*  (m) - if it is a "multiple PROBLEM events" trigger                                            */
 	/*  (e) - if an error message has changed                                                         */
+	/*  I   - generate an internal event                                                              */
 	/*                                                                                                */
 	/**************************************************************************************************/
 
@@ -564,33 +566,86 @@ static int	process_trigger(char **sql, size_t *sql_alloc, size_t *sql_offset, co
 	return ret;
 }
 
+/******************************************************************************
+ *                                                                            *
+ * Comments: helper function for process_triggers()                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	zbx_trigger_topoindex_compare(const void *d1, const void *d2)
+{
+	const zbx_ptr_pair_t	*p1 = (const zbx_ptr_pair_t *)d1;
+	const zbx_ptr_pair_t	*p2 = (const zbx_ptr_pair_t *)d2;
+
+	const DC_TRIGGER	*t1 = (const DC_TRIGGER *)p1->first;
+	const DC_TRIGGER	*t2 = (const DC_TRIGGER *)p2->first;
+
+	ZBX_RETURN_IF_NOT_EQUAL(t1->topoindex, t2->topoindex);
+
+	return 0;
+}
+
 void	process_triggers(zbx_vector_ptr_t *triggers)
 {
-	const char	*__function_name = "process_triggers";
+	const char		*__function_name = "process_triggers";
 
-	char		*sql = NULL;
-	size_t		sql_alloc = 16 * ZBX_KIBIBYTE, sql_offset = 0;
-	int		i;
-	DC_TRIGGER	*trigger;
+	int			i, count = 0;
+	char			*sql = NULL;
+	size_t			sql_alloc, sql_offset;
+	zbx_vector_ptr_pair_t	trigger_sqls;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() values_num:%d", __function_name, triggers->values_num);
 
 	if (0 == triggers->values_num)
 		goto out;
 
+	zbx_vector_ptr_pair_create(&trigger_sqls);
+	zbx_vector_ptr_pair_reserve(&trigger_sqls, triggers->values_num);
+
+	for (i = 0; i < triggers->values_num; i++)
+	{
+		zbx_ptr_pair_t	trigger_sql;
+
+		trigger_sql.first = triggers->values[i];
+		trigger_sql.second = NULL;
+
+		zbx_vector_ptr_pair_append(&trigger_sqls, trigger_sql);
+	}
+
+	zbx_vector_ptr_pair_sort(&trigger_sqls, zbx_trigger_topoindex_compare);
+
+	for (i = 0; i < trigger_sqls.values_num; i++)
+	{
+		zbx_ptr_pair_t	*trigger_sql = &trigger_sqls.values[i];
+		DC_TRIGGER	*trigger = (DC_TRIGGER *)trigger_sql->first;
+
+		sql_alloc = 0;
+		sql_offset = 0;
+
+		count += (SUCCEED == process_trigger((char **)&trigger_sql->second, &sql_alloc, &sql_offset, trigger));
+	}
+
+	if (0 == count)
+		goto clean;
+
+	zbx_vector_ptr_pair_sort(&trigger_sqls, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC);
+
+	sql_alloc = 16 * ZBX_KIBIBYTE;
+	sql_offset = 0;
+
 	sql = zbx_malloc(sql, sql_alloc);
 
 	DBbegin_multiple_update(&sql, &sql_alloc, &sql_offset);
 
-	for (i = 0; i < triggers->values_num; i++)
+	for (i = 0; i < trigger_sqls.values_num; i++)
 	{
-		trigger = (DC_TRIGGER *)triggers->values[i];
+		if (NULL == trigger_sqls.values[i].second)
+			continue;
 
-		if (SUCCEED == process_trigger(&sql, &sql_alloc, &sql_offset, trigger))
-		{
-			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, ";\n");
-			DBexecute_overflowed_sql(&sql, &sql_alloc, &sql_offset);
-		}
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, trigger_sqls.values[i].second);
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, ";\n");
+		DBexecute_overflowed_sql(&sql, &sql_alloc, &sql_offset);
+
+		zbx_free(trigger_sqls.values[i].second);
 	}
 
 	DBend_multiple_update(&sql, &sql_alloc, &sql_offset);
@@ -599,6 +654,8 @@ void	process_triggers(zbx_vector_ptr_t *triggers)
 		DBexecute("%s", sql);
 
 	zbx_free(sql);
+clean:
+	zbx_vector_ptr_pair_destroy(&trigger_sqls);
 out:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
@@ -740,7 +797,7 @@ int	DBget_proxy_lastaccess(const char *hostname, int *lastaccess, char **error)
 		ret = SUCCEED;
 	}
 	else
-		*error = zbx_dsprintf(*error, "proxy \"%s\" does not exist", hostname);
+		*error = zbx_dsprintf(*error, "Proxy \"%s\" does not exist.", hostname);
 	DBfree_result(result);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
@@ -883,7 +940,7 @@ static zbx_uint64_t	DBget_nextid(const char *tablename, int num)
 					zabbix_log(LOG_LEVEL_CRIT, "maximum number of id's exceeded"
 							" [table:%s, field:%s, id:" ZBX_FS_UI64 "]",
 							table->table, table->recid, ret1);
-					exit(FAIL);
+					exit(EXIT_FAILURE);
 				}
 			}
 			DBfree_result(result);
@@ -956,8 +1013,8 @@ zbx_uint64_t	DBget_maxid_num(const char *tablename, int num)
  *                                                                            *
  * Function: DBadd_condition_alloc                                            *
  *                                                                            *
- * Purpose: takes an initial part of SQL query and appends a generated        *
- *          WHERE condition. The WHERE condidion is generated from the given  *
+ * Purpose: Takes an initial part of SQL query and appends a generated        *
+ *          WHERE condition. The WHERE condition is generated from the given  *
  *          list of values as a mix of <fieldname> BETWEEN <id1> AND <idN>"   *
  *          and "<fieldname> IN (<id1>,<id2>,...,<idN>)" elements.            *
  *                                                                            *
@@ -967,7 +1024,7 @@ zbx_uint64_t	DBget_maxid_num(const char *tablename, int num)
  *             fieldname  - [IN] field name to be used in SQL WHERE condition *
  *             values     - [IN] array of numerical values sorted in          *
  *                               ascending order to be included in WHERE      *
- *             num        - [IN] number of elemnts in 'values' array          *
+ *             num        - [IN] number of elements in 'values' array         *
  *                                                                            *
  ******************************************************************************/
 void	DBadd_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, const char *fieldname,
@@ -1081,6 +1138,82 @@ void	DBadd_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, co
 
 	if (MAX_EXPRESSIONS < in_num || 1 < between_num || (0 < in_num && 0 < between_num))
 		zbx_chrcpy_alloc(sql, sql_alloc, sql_offset, ')');
+
+#undef MAX_EXPRESSIONS
+#undef MIN_NUM_BETWEEN
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: DBadd_str_condition_alloc                                        *
+ *                                                                            *
+ * Purpose: This function is similar to DBadd_condition_alloc(), except it is *
+ *          designed for generating WHERE conditions for strings. Hence, this *
+ *          function is simpler, because only IN condition is possible.       *
+ *                                                                            *
+ * Parameters: sql        - [IN/OUT] buffer for SQL query construction        *
+ *             sql_alloc  - [IN/OUT] size of the 'sql' buffer                 *
+ *             sql_offset - [IN/OUT] current position in the 'sql' buffer     *
+ *             fieldname  - [IN] field name to be used in SQL WHERE condition *
+ *             values     - [IN] array of string values                       *
+ *             num        - [IN] number of elements in 'values' array         *
+ *                                                                            *
+ ******************************************************************************/
+void	DBadd_str_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, const char *fieldname,
+		const char **values, const int num)
+{
+#define MAX_EXPRESSIONS	950
+
+	int	i, cnt = 0;
+	char	*value_esc;
+
+	if (0 == num)
+		return;
+
+	zbx_chrcpy_alloc(sql, sql_alloc, sql_offset, ' ');
+
+	if (1 == num)
+	{
+		value_esc = DBdyn_escape_string(values[0]);
+		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%s='%s'", fieldname, value_esc);
+		zbx_free(value_esc);
+
+		return;
+	}
+
+	if (MAX_EXPRESSIONS < num)
+		zbx_chrcpy_alloc(sql, sql_alloc, sql_offset, '(');
+
+	zbx_strcpy_alloc(sql, sql_alloc, sql_offset, fieldname);
+	zbx_strcpy_alloc(sql, sql_alloc, sql_offset, " in (");
+
+	for (i = 0; i < num; i++)
+	{
+		if (MAX_EXPRESSIONS == cnt)
+		{
+			cnt = 0;
+			(*sql_offset)--;
+			zbx_strcpy_alloc(sql, sql_alloc, sql_offset, ") or ");
+			zbx_strcpy_alloc(sql, sql_alloc, sql_offset, fieldname);
+			zbx_strcpy_alloc(sql, sql_alloc, sql_offset, " in (");
+		}
+
+		value_esc = DBdyn_escape_string(values[i]);
+		zbx_chrcpy_alloc(sql, sql_alloc, sql_offset, '\'');
+		zbx_strcpy_alloc(sql, sql_alloc, sql_offset, value_esc);
+		zbx_strcpy_alloc(sql, sql_alloc, sql_offset, "',");
+		zbx_free(value_esc);
+
+		cnt++;
+	}
+
+	(*sql_offset)--;
+	zbx_chrcpy_alloc(sql, sql_alloc, sql_offset, ')');
+
+	if (MAX_EXPRESSIONS < num)
+		zbx_chrcpy_alloc(sql, sql_alloc, sql_offset, ')');
+
+#undef MAX_EXPRESSIONS
 }
 
 static char	buf_string[640];
@@ -1148,22 +1281,6 @@ const char	*zbx_host_key_string(zbx_uint64_t itemid)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_host_key_string_by_item                                      *
- *                                                                            *
- * Return value: <host>:<key>                                                 *
- *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
- ******************************************************************************/
-const char	*zbx_host_key_string_by_item(DB_ITEM *item)
-{
-	zbx_snprintf(buf_string, sizeof(buf_string), "%s:%s", item->host_name, item->key);
-
-	return buf_string;
-}
-
-/******************************************************************************
- *                                                                            *
  * Function: zbx_user_string                                                  *
  *                                                                            *
  * Return value: "Name Surname (Alias)" or "unknown" if user not found        *
@@ -1598,6 +1715,9 @@ int	DBtxn_ongoing()
 int	DBtable_exists(const char *table_name)
 {
 	char		*table_name_esc;
+#ifdef HAVE_POSTGRESQL
+	char		*table_schema_esc;
+#endif
 	DB_RESULT	result;
 	int		ret;
 
@@ -1621,12 +1741,18 @@ int	DBtable_exists(const char *table_name)
 				" and lower(tname)='%s'",
 			table_name_esc);
 #elif defined(HAVE_POSTGRESQL)
+	table_schema_esc = DBdyn_escape_string(NULL == CONFIG_DBSCHEMA || '\0' == *CONFIG_DBSCHEMA ?
+			"public" : CONFIG_DBSCHEMA);
+
 	result = DBselect(
 			"select 1"
 			" from information_schema.tables"
 			" where table_name='%s'"
-				" and table_schema='public'",
-			table_name_esc);
+				" and table_schema='%s'",
+			table_name_esc, table_schema_esc);
+
+	zbx_free(table_schema_esc);
+
 #elif defined(HAVE_SQLITE3)
 	result = DBselect(
 			"select 1"
@@ -1658,7 +1784,7 @@ int	DBfield_exists(const char *table_name, const char *field_name)
 	char		*table_name_esc, *field_name_esc;
 	int		ret;
 #elif defined(HAVE_POSTGRESQL)
-	char		*table_name_esc, *field_name_esc;
+	char		*table_name_esc, *field_name_esc, *table_schema_esc;
 	int		ret;
 #elif defined(HAVE_SQLITE3)
 	char		*table_name_esc;
@@ -1713,6 +1839,8 @@ int	DBfield_exists(const char *table_name, const char *field_name)
 
 	DBfree_result(result);
 #elif defined(HAVE_POSTGRESQL)
+	table_schema_esc = DBdyn_escape_string(NULL == CONFIG_DBSCHEMA || '\0' == *CONFIG_DBSCHEMA ?
+			"public" : CONFIG_DBSCHEMA);
 	table_name_esc = DBdyn_escape_string(table_name);
 	field_name_esc = DBdyn_escape_string(field_name);
 
@@ -1720,11 +1848,13 @@ int	DBfield_exists(const char *table_name, const char *field_name)
 			"select 1"
 			" from information_schema.columns"
 			" where table_name='%s'"
-				" and column_name='%s'",
-			table_name_esc, field_name_esc);
+				" and column_name='%s'"
+				" and table_schema='%s'",
+			table_name_esc, field_name_esc, table_schema_esc);
 
 	zbx_free(field_name_esc);
 	zbx_free(table_name_esc);
+	zbx_free(table_schema_esc);
 
 	ret = (NULL == DBfetch(result) ? FAIL : SUCCEED);
 
@@ -2040,17 +2170,31 @@ void	zbx_db_insert_add_values_dyn(zbx_db_insert_t *self, const zbx_db_value_t **
 	{
 		ZBX_FIELD		*field = self->fields.values[i];
 		const zbx_db_value_t	*value = values[i];
-
+#ifdef HAVE_ORACLE
+		size_t			str_alloc = 0, str_offset = 0;
+#endif
 		switch (field->type)
 		{
+			case ZBX_TYPE_LONGTEXT:
+				if (0 == field->length)
+				{
+#ifdef HAVE_ORACLE
+					row[i].str = zbx_strdup(NULL, value->str);
+#else
+					row[i].str = DBdyn_escape_string(value->str);
+#endif
+					break;
+				}
+				/* break; is not missing here */
 			case ZBX_TYPE_CHAR:
 			case ZBX_TYPE_TEXT:
 			case ZBX_TYPE_SHORTTEXT:
-			case ZBX_TYPE_LONGTEXT:
 #ifdef HAVE_ORACLE
-				row[i].str = zbx_strdup(NULL, value->str);
+				row[i].str = NULL;
+				zbx_strncpy_alloc(&row[i].str, &str_alloc, &str_offset, value->str,
+						zbx_strlen_utf8_n(value->str, field->length));
 #else
-				row[i].str = DBdyn_escape_string(value->str);
+				row[i].str = DBdyn_escape_string_len(value->str, field->length);
 #endif
 				break;
 			default:
@@ -2372,7 +2516,7 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_insert_execute                                            *
+ * Function: zbx_db_insert_autoincrement                                      *
  *                                                                            *
  * Purpose: executes the prepared database bulk insert operation              *
  *                                                                            *
@@ -2398,6 +2542,6 @@ void	zbx_db_insert_autoincrement(zbx_db_insert_t *self, const char *field_name)
 	}
 
 	THIS_SHOULD_NEVER_HAPPEN;
-	exit(FAIL);
+	exit(EXIT_FAILURE);
 }
 
diff --git a/src/libs/zbxdbhigh/discovery.c b/src/libs/zbxdbhigh/discovery.c
index 99e862a7c1a..f0d000f40bb 100644
--- a/src/libs/zbxdbhigh/discovery.c
+++ b/src/libs/zbxdbhigh/discovery.c
@@ -72,8 +72,6 @@ static DB_RESULT	discovery_get_dhost_by_ip(zbx_uint64_t druleid, const char *ip)
  *                                                                            *
  * Parameters: host ip address                                                *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static void	discovery_separate_host(DB_DRULE *drule, DB_DHOST *dhost, const char *ip)
 {
@@ -131,8 +129,6 @@ static void	discovery_separate_host(DB_DRULE *drule, DB_DHOST *dhost, const char
  *                                                                            *
  * Parameters: host ip address                                                *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  ******************************************************************************/
 static void	discovery_register_host(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST *dhost,
 		const char *ip, int status, const char *value)
@@ -204,8 +200,6 @@ static void	discovery_register_host(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST
  *                                                                            *
  * Parameters: host ip address                                                *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  ******************************************************************************/
 static void	discovery_register_service(DB_DRULE *drule, DB_DCHECK *dcheck,
 		DB_DHOST *dhost, DB_DSERVICE *dservice, const char *ip, const char *dns,
@@ -247,6 +241,7 @@ static void	discovery_register_service(DB_DRULE *drule, DB_DCHECK *dcheck,
 
 			dservice->dserviceid = DBget_maxid("dservices");
 			dservice->status = DOBJECT_STATUS_DOWN;
+			dservice->value = zbx_strdup(dservice->value, "");
 
 			dns_esc = DBdyn_escape_string_len(dns, INTERFACE_DNS_LEN);
 
@@ -267,7 +262,7 @@ static void	discovery_register_service(DB_DRULE *drule, DB_DCHECK *dcheck,
 		dservice->status = atoi(row[2]);
 		dservice->lastup = atoi(row[3]);
 		dservice->lastdown = atoi(row[4]);
-		strscpy(dservice->value, row[5]);
+		dservice->value = zbx_strdup(dservice->value, row[5]);
 
 		if (dhostid != dhost->dhostid)
 		{
@@ -307,17 +302,16 @@ static void	discovery_register_service(DB_DRULE *drule, DB_DCHECK *dcheck,
  *                                                                            *
  * Purpose: update discovered service details                                 *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  ******************************************************************************/
-static void	discovery_update_dservice(DB_DSERVICE *service)
+static void	discovery_update_dservice(zbx_uint64_t dserviceid, int status, int lastup, int lastdown,
+		const char *value)
 {
 	char	*value_esc;
 
-	value_esc = DBdyn_escape_string_len(service->value, DSERVICE_VALUE_LEN);
+	value_esc = DBdyn_escape_string_len(value, DSERVICE_VALUE_LEN);
 
 	DBexecute("update dservices set status=%d,lastup=%d,lastdown=%d,value='%s' where dserviceid=" ZBX_FS_UI64,
-			service->status, service->lastup, service->lastdown, value_esc, service->dserviceid);
+			status, lastup, lastdown, value_esc, dserviceid);
 
 	zbx_free(value_esc);
 }
@@ -327,17 +321,15 @@ static void	discovery_update_dservice(DB_DSERVICE *service)
  * Function: discovery_update_dservice_value                                  *
  *                                                                            *
  * Purpose: update discovered service details                                 *
- * Author: Alexei Vladishev                                                   *
  *                                                                            *
  ******************************************************************************/
-static void	discovery_update_dservice_value(DB_DSERVICE *service)
+static void	discovery_update_dservice_value(zbx_uint64_t dserviceid, const char *value)
 {
 	char	*value_esc;
 
-	value_esc = DBdyn_escape_string_len(service->value, DSERVICE_VALUE_LEN);
+	value_esc = DBdyn_escape_string_len(value, DSERVICE_VALUE_LEN);
 
-	DBexecute("update dservices set value='%s' where dserviceid=" ZBX_FS_UI64,
-			value_esc, service->dserviceid);
+	DBexecute("update dservices set value='%s' where dserviceid=" ZBX_FS_UI64, value_esc, dserviceid);
 
 	zbx_free(value_esc);
 }
@@ -348,13 +340,15 @@ static void	discovery_update_dservice_value(DB_DSERVICE *service)
  *                                                                            *
  * Purpose: process and update the new service status                         *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
-static void	discovery_update_service_status(DB_DSERVICE *dservice, int status, const char *value, int now)
+static void	discovery_update_service_status(const DB_DSERVICE *dservice, int status, const char *value, int now)
 {
+	const char	*__function_name = "discovery_update_service_status";
+
 	zbx_timespec_t	ts;
 
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+
 	ts.sec = now;
 	ts.ns = 0;
 
@@ -362,30 +356,20 @@ static void	discovery_update_service_status(DB_DSERVICE *dservice, int status, c
 	{
 		if (DOBJECT_STATUS_DOWN == dservice->status || 0 == dservice->lastup)
 		{
-			dservice->status = status;
-			dservice->lastdown = 0;
-			dservice->lastup = now;
-
-			zbx_strlcpy(dservice->value, value, sizeof(dservice->value));
-			discovery_update_dservice(dservice);
+			discovery_update_dservice(dservice->dserviceid, status, now, 0, value);
 			add_event(0, EVENT_SOURCE_DISCOVERY, EVENT_OBJECT_DSERVICE, dservice->dserviceid, &ts,
 					DOBJECT_STATUS_DISCOVER, NULL, NULL, 0, 0);
 		}
 		else if (0 != strcmp(dservice->value, value))
 		{
-			zbx_strlcpy(dservice->value, value, sizeof(dservice->value));
-			discovery_update_dservice_value(dservice);
+			discovery_update_dservice_value(dservice->dserviceid, value);
 		}
 	}
 	else	/* DOBJECT_STATUS_DOWN */
 	{
 		if (DOBJECT_STATUS_UP == dservice->status || 0 == dservice->lastdown)
 		{
-			dservice->status = status;
-			dservice->lastdown = now;
-			dservice->lastup = 0;
-
-			discovery_update_dservice(dservice);
+			discovery_update_dservice(dservice->dserviceid, status, 0, now, dservice->value);
 			add_event(0, EVENT_SOURCE_DISCOVERY, EVENT_OBJECT_DSERVICE, dservice->dserviceid, &ts,
 					DOBJECT_STATUS_LOST, NULL, NULL, 0, 0);
 		}
@@ -394,6 +378,8 @@ static void	discovery_update_service_status(DB_DSERVICE *dservice, int status, c
 			NULL, NULL, 0, 0);
 
 	process_events();
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
 /******************************************************************************
@@ -402,8 +388,6 @@ static void	discovery_update_service_status(DB_DSERVICE *dservice, int status, c
  *                                                                            *
  * Purpose: update discovered host details                                    *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  ******************************************************************************/
 static void	discovery_update_dhost(DB_DHOST *dhost)
 {
@@ -417,8 +401,6 @@ static void	discovery_update_dhost(DB_DHOST *dhost)
  *                                                                            *
  * Purpose: update new host status                                            *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static void	discovery_update_host_status(DB_DHOST *dhost, int status, int now)
 {
@@ -467,8 +449,6 @@ static void	discovery_update_host_status(DB_DHOST *dhost, int status, int now)
  *                                                                            *
  * Parameters: host - host info                                               *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 void	discovery_update_host(DB_DHOST *dhost, const char *ip, int status, int now)
 {
@@ -490,18 +470,16 @@ void	discovery_update_host(DB_DHOST *dhost, const char *ip, int status, int now)
  *                                                                            *
  * Parameters: service - service info                                         *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  ******************************************************************************/
-void	discovery_update_service(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST *dhost,
-		const char *ip, const char *dns, int port, int status, const char *value, int now)
+void	discovery_update_service(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST *dhost, const char *ip, const char *dns,
+		int port, int status, const char *value, int now)
 {
 	const char	*__function_name = "discovery_update_service";
 
 	DB_DSERVICE	dservice;
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() ip:'%s' port:%d status:%d",
-			__function_name, ip, port, status);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() ip:'%s' dns:'%s' port:%d status:%d value:'%s'",
+			__function_name, ip, dns, port, status, value);
 
 	memset(&dservice, 0, sizeof(dservice));
 
@@ -517,5 +495,7 @@ void	discovery_update_service(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST *dhos
 	if (0 != dservice.dserviceid)
 		discovery_update_service_status(&dservice, status, value, now);
 
+	zbx_free(dservice.value);
+
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c
index 0499af19785..d238f2d1a98 100644
--- a/src/libs/zbxdbhigh/host.c
+++ b/src/libs/zbxdbhigh/host.c
@@ -857,7 +857,7 @@ static void	DBdelete_action_conditions(int conditiontype, zbx_uint64_t elementid
  * Parameters: triggerids - [IN] trigger identificators from database         *
  *                                                                            *
  ******************************************************************************/
-void	DBdelete_triggers(zbx_vector_uint64_t *triggerids)
+static void	DBdelete_triggers(zbx_vector_uint64_t *triggerids)
 {
 	char		*sql = NULL;
 	size_t		sql_alloc = 256, sql_offset;
@@ -894,15 +894,6 @@ void	DBdelete_triggers(zbx_vector_uint64_t *triggerids)
 	sql_offset = 0;
 	DBbegin_multiple_update(&sql, &sql_alloc, &sql_offset);
 
-	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-			"delete from events"
-			" where source=%d"
-				" and object=%d"
-				" and",
-			EVENT_SOURCE_TRIGGERS, EVENT_OBJECT_TRIGGER);
-	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "objectid", triggerids->values, triggerids->values_num);
-	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, ";\n");
-
 	/* delete from profiles */
 	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
 			"delete from profiles"
diff --git a/src/libs/zbxdbhigh/itservices.c b/src/libs/zbxdbhigh/itservices.c
index a0f0dbe0e70..4ab07ac83c1 100644
--- a/src/libs/zbxdbhigh/itservices.c
+++ b/src/libs/zbxdbhigh/itservices.c
@@ -35,7 +35,7 @@ typedef struct
 	zbx_uint64_t	sourceid;
 	/* the new status */
 	int		status;
-	/* timestmap */
+	/* timestamp */
 	int		clock;
 }
 zbx_status_update_t;
@@ -624,7 +624,7 @@ static int	its_flush_updates(zbx_vector_ptr_t *updates)
 {
 	const char		*__function_name = "its_flush_updates";
 
-	int			j, i, ret = FAIL;
+	int			i, j, k, ret = FAIL;
 	zbx_status_update_t	*update;
 	zbx_itservices_t	itservices;
 	zbx_vector_ptr_t	alarms;
@@ -661,39 +661,33 @@ static int	its_flush_updates(zbx_vector_ptr_t *updates)
 	zbx_vector_ptr_create(&alarms);
 
 	/* apply status updates */
-	for (j = 0; j < updates->values_num; j++)
+	for (i = 0; i < updates->values_num; i++)
 	{
-		update = updates->values[j];
+		update = updates->values[i];
+
+		if (NULL == (index = zbx_hashset_search(&itservices.index, update)))
+			continue;
 
-		if (NULL != (index = zbx_hashset_search(&itservices.index, update)))
+		/* change the status of services based on the update */
+		for (j = 0; j < index->itservices.values_num; j++)
 		{
-			/* change the status of services based on the update */
-			for (i = 0; i < index->itservices.values_num; i++)
-			{
-				zbx_itservice_t	*itservice = (zbx_itservice_t*)index->itservices.values[i];
+			zbx_itservice_t	*itservice = (zbx_itservice_t *)index->itservices.values[j];
 
-				if (SERVICE_ALGORITHM_NONE == itservice->algorithm ||
-						itservice->status == update->status)
-				{
-					continue;
-				}
+			if (SERVICE_ALGORITHM_NONE == itservice->algorithm || itservice->status == update->status)
+				continue;
 
-				its_updates_append(&alarms, itservice->serviceid, update->status, update->clock);
-				itservice->status = update->status;
-			}
+			its_updates_append(&alarms, itservice->serviceid, update->status, update->clock);
+			itservice->status = update->status;
+		}
 
-			/* recalculate status of the parent services */
-			for (i = 0; i < index->itservices.values_num; i++)
-			{
-				zbx_itservice_t	*itservice = (zbx_itservice_t*)index->itservices.values[i];
-
-				/* update parent services */
-				for (i = 0; i < itservice->parents.values_num; i++)
-				{
-					its_itservice_update_status(itservice->parents.values[i], update->clock,
-							&alarms);
-				}
-			}
+		/* recalculate status of the parent services */
+		for (j = 0; j < index->itservices.values_num; j++)
+		{
+			zbx_itservice_t	*itservice = (zbx_itservice_t *)index->itservices.values[j];
+
+			/* update parent services */
+			for (k = 0; k < itservice->parents.values_num; k++)
+				its_itservice_update_status(itservice->parents.values[k], update->clock, &alarms);
 		}
 	}
 
@@ -819,7 +813,7 @@ void	zbx_create_itservices_lock()
 	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&itservices_lock, ZBX_MUTEX_ITSERVICES))
 	{
 		zbx_error("cannot create mutex for IT services");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 }
 
diff --git a/src/libs/zbxdbhigh/lld.c b/src/libs/zbxdbhigh/lld.c
index 62f0de3e201..1374f1ac113 100644
--- a/src/libs/zbxdbhigh/lld.c
+++ b/src/libs/zbxdbhigh/lld.c
@@ -75,8 +75,8 @@ static void	lld_condition_free(lld_condition_t *condition)
  ******************************************************************************/
 static int	lld_condition_compare_by_macro(const void *item1, const void *item2)
 {
-	lld_condition_t	*condition1 = *(lld_condition_t**)item1;
-	lld_condition_t	*condition2 = *(lld_condition_t**)item2;
+	lld_condition_t	*condition1 = *(lld_condition_t **)item1;
+	lld_condition_t	*condition2 = *(lld_condition_t **)item2;
 
 	return strcmp(condition1->macro, condition2->macro);
 }
@@ -121,20 +121,10 @@ static void	lld_filter_clean(lld_filter_t *filter)
  *                                                                            *
  * Parameters: filter     - [IN] the lld filter                               *
  *             lld_ruleid - [IN] the lld rule id                              *
- *             evaltype   - [IN] the evaluation type, see                     *
- *                               CONDITION_EVAL_TYPE_* macros                 *
- *             formula    - [IN] the lld filter formula                       *
  *             error      - [OUT] the error description                       *
  *                                                                            *
- * Return value: SUCCEED - the filter was loaded successfully                 *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- * Comments: In the case of failure the error description is allocated by     *
- *           this function and must be freed by the caller.                   *
- *                                                                            *
  ******************************************************************************/
-static int	lld_filter_load(lld_filter_t *filter, zbx_uint64_t lld_ruleid, int evaltype,
-		const char *formula, char **error)
+static int	lld_filter_load(lld_filter_t *filter, zbx_uint64_t lld_ruleid, char **error)
 {
 	DB_RESULT	result;
 	DB_ROW		row;
@@ -180,17 +170,9 @@ static int	lld_filter_load(lld_filter_t *filter, zbx_uint64_t lld_ruleid, int ev
 	}
 	DBfree_result(result);
 
-	if (CONDITION_EVAL_TYPE_AND_OR == evaltype)
+	if (CONDITION_EVAL_TYPE_AND_OR == filter->evaltype)
 		zbx_vector_ptr_sort(&filter->conditions, lld_condition_compare_by_macro);
 
-	if (CONDITION_EVAL_TYPE_EXPRESSION == evaltype &&
-			FAIL == translate_expression(formula, &filter->expression, error))
-	{
-		goto out;
-	}
-
-	filter->evaltype = evaltype;
-
 	ret = SUCCEED;
 out:
 	DCconfig_clean_items(&item, &errcode, 1);
@@ -344,16 +326,15 @@ static int	filter_evaluate_or(lld_filter_t *filter, struct zbx_json_parse *jp_ro
  * Purpose: check if the lld data passes filter evaluation by custom          *
  *          expression                                                        *
  *                                                                            *
- * Parameters: filter     - [IN] the lld filter                               *
- *             jp_row     - [IN] the lld data row                             *
+ * Parameters: filter - [IN] the lld filter                                   *
+ *             jp_row - [IN] the lld data row                                 *
  *                                                                            *
  * Return value: SUCCEED - the lld data passed filter evaluation              *
  *               FAIL    - otherwise                                          *
  *                                                                            *
  * Comments: 1) replace {item_condition} references with action condition     *
  *              evaluation results (1 or 0)                                   *
- *           2) pack the resulting expression by removing spaces              *
- *           3) call evaluate() to calculate the final result                 *
+ *           2) call evaluate() to calculate the final result                 *
  *                                                                            *
  ******************************************************************************/
 static int	filter_evaluate_expression(lld_filter_t *filter, struct zbx_json_parse *jp_row)
@@ -361,7 +342,7 @@ static int	filter_evaluate_expression(lld_filter_t *filter, struct zbx_json_pars
 	const char	*__function_name = "filter_evaluate_expression";
 
 	int		i, ret = FAIL, id_len;
-	char		*expression, id[32], *src, *dst, error[256];
+	char		*expression, id[ZBX_MAX_UINT64_LEN + 2], *p, error[256];
 	double		result;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() expression:%s", __function_name, filter->expression);
@@ -381,29 +362,19 @@ static int	filter_evaluate_expression(lld_filter_t *filter, struct zbx_json_pars
 
 		zbx_snprintf(id, sizeof(id), "{" ZBX_FS_UI64 "}", condition->id);
 
-		src = expression;
+		id_len = strlen(id);
+		p = expression;
 
-		while (NULL != (src = strstr(src, id)))
+		while (NULL != (p = strstr(p, id)))
 		{
-			id_len = strlen(id);
-
-			*src = SUCCEED == ret ? '1' : '0';
-			memset(src + 1, ' ', id_len - 1);
-			src += id_len;
+			*p = (SUCCEED == ret ? '1' : '0');
+			memset(p + 1, ' ', id_len - 1);
+			p += id_len;
 		}
 	}
 
-	src = dst = expression;
-
-	do
-	{
-		if (' ' != *src)
-			*dst++ = *src;
-	}
-	while ('\0' != *src++);
-
 	if (SUCCEED == evaluate(&result, expression, error, sizeof(error)))
-		ret = (0 == result) ? FAIL : SUCCEED;
+		ret = (SUCCEED != zbx_double_compare(result, 0) ? SUCCEED : FAIL);
 
 	zbx_free(expression);
 
@@ -438,6 +409,7 @@ static int	filter_evaluate(lld_filter_t *filter, struct zbx_json_parse *jp_row)
 		case CONDITION_EVAL_TYPE_EXPRESSION:
 			return filter_evaluate_expression(filter, jp_row);
 	}
+
 	return FAIL;
 }
 
@@ -523,14 +495,13 @@ void	lld_process_discovery_rule(zbx_uint64_t lld_ruleid, char *value, zbx_timesp
 	DB_RESULT		result;
 	DB_ROW			row;
 	zbx_uint64_t		hostid = 0;
-	char			*discovery_key = NULL, *formula = NULL, *error = NULL, *db_error = NULL, *error_esc;
+	char			*discovery_key = NULL, *error = NULL, *db_error = NULL, *error_esc;
 	unsigned char		state = 0;
 	unsigned short		lifetime;
 	zbx_vector_ptr_t	lld_rows;
 	char			*sql = NULL;
 	size_t			sql_alloc = 128, sql_offset = 0;
 	const char		*sql_start = "update items set ", *sql_continue = ",";
-	int			evaltype;
 	lld_filter_t		filter;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() itemid:" ZBX_FS_UI64, __function_name, lld_ruleid);
@@ -554,8 +525,8 @@ void	lld_process_discovery_rule(zbx_uint64_t lld_ruleid, char *value, zbx_timesp
 		ZBX_STR2UINT64(hostid, row[0]);
 		discovery_key = zbx_strdup(discovery_key, row[1]);
 		state = (unsigned char)atoi(row[2]);
-		evaltype = atoi(row[3]);
-		formula = zbx_strdup(formula, row[4]);
+		filter.evaltype = atoi(row[3]);
+		filter.expression = zbx_strdup(NULL, row[4]);
 		db_error = zbx_strdup(db_error, row[5]);
 
 		lifetime_str = zbx_strdup(NULL, row[6]);
@@ -577,7 +548,7 @@ void	lld_process_discovery_rule(zbx_uint64_t lld_ruleid, char *value, zbx_timesp
 	if (0 == hostid)
 		goto clean;
 
-	if (SUCCEED != lld_filter_load(&filter, lld_ruleid, evaltype, formula, &error))
+	if (SUCCEED != lld_filter_load(&filter, lld_ruleid, &error))
 		goto error;
 
 	if (SUCCEED != lld_rows_get(value, &filter, &lld_rows, &error))
@@ -626,7 +597,6 @@ error:
 clean:
 	zbx_free(error);
 	zbx_free(db_error);
-	zbx_free(formula);
 	zbx_free(discovery_key);
 	zbx_free(sql);
 
diff --git a/src/libs/zbxdbhigh/lld_graph.c b/src/libs/zbxdbhigh/lld_graph.c
index eba0bfa2f64..44aedce2756 100644
--- a/src/libs/zbxdbhigh/lld_graph.c
+++ b/src/libs/zbxdbhigh/lld_graph.c
@@ -732,7 +732,7 @@ static void	lld_validate_graph_field(zbx_lld_graph_t *graph, char **field, char
 	if (0 == (graph->flags & ZBX_FLAG_LLD_GRAPH_DISCOVERED))
 		return;
 
-	/* only new graphs or graphs with a new data will be validated */
+	/* only new graphs or graphs with changed data will be validated */
 	if (0 != graph->graphid && 0 == (graph->flags & flag))
 		return;
 
@@ -767,17 +767,15 @@ static void	lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c
 {
 	const char		*__function_name = "lld_graphs_validate";
 
-	char			*names = NULL, *name_esc;
-	size_t			names_alloc = 256, names_offset = 0;
 	int			i, j;
 	zbx_lld_graph_t		*graph, *graph_b;
 	zbx_vector_uint64_t	graphids;
+	zbx_vector_str_t	names;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	zbx_vector_uint64_create(&graphids);
-
-	names = zbx_malloc(names, names_alloc);	/* list of graph names */
+	zbx_vector_str_create(&names);		/* list of graph names */
 
 	/* checking a validity of the fields */
 
@@ -797,7 +795,7 @@ static void	lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c
 		if (0 == (graph->flags & ZBX_FLAG_LLD_GRAPH_DISCOVERED))
 			continue;
 
-		/* only new graphs or graphs with a new name will be validated */
+		/* only new graphs or graphs with changed name will be validated */
 		if (0 != graph->graphid && 0 == (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_NAME))
 			continue;
 
@@ -822,6 +820,7 @@ static void	lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c
 			}
 			else
 				graph->flags &= ~ZBX_FLAG_LLD_GRAPH_DISCOVERED;
+
 			break;
 		}
 	}
@@ -843,18 +842,10 @@ static void	lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c
 				continue;
 		}
 
-		name_esc = DBdyn_escape_string(graph->name);
-
-		if (0 != names_offset)
-			zbx_chrcpy_alloc(&names, &names_alloc, &names_offset, ',');
-		zbx_chrcpy_alloc(&names, &names_alloc, &names_offset, '\'');
-		zbx_strcpy_alloc(&names, &names_alloc, &names_offset, name_esc);
-		zbx_chrcpy_alloc(&names, &names_alloc, &names_offset, '\'');
-
-		zbx_free(name_esc);
+		zbx_vector_str_append(&names, graph->name);
 	}
 
-	if (0 != names_offset)
+	if (0 != names.values_num)
 	{
 		DB_RESULT	result;
 		DB_ROW		row;
@@ -869,8 +860,11 @@ static void	lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c
 				" where g.graphid=gi.graphid"
 					" and gi.itemid=i.itemid"
 					" and i.hostid=" ZBX_FS_UI64
-					" and g.name in (%s)",
-				hostid, names);
+					" and",
+				hostid);
+		DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "g.name",
+				(const char **)names.values, names.values_num);
+
 		if (0 != graphids.values_num)
 		{
 			zbx_vector_uint64_sort(&graphids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
@@ -913,8 +907,7 @@ static void	lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c
 		zbx_free(sql);
 	}
 
-	zbx_free(names);
-
+	zbx_vector_str_destroy(&names);
 	zbx_vector_uint64_destroy(&graphids);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
diff --git a/src/libs/zbxdbhigh/lld_host.c b/src/libs/zbxdbhigh/lld_host.c
index fa630d05914..7f51a4f6f98 100644
--- a/src/libs/zbxdbhigh/lld_host.c
+++ b/src/libs/zbxdbhigh/lld_host.c
@@ -50,18 +50,18 @@ typedef struct
 	unsigned char	type;
 	unsigned char	type_orig;
 	unsigned char	useip;
-#define ZBX_FLAG_LLD_INTERFACE_UPDATE_TYPE	0x01	/* interface.type field should be updated  */
-#define ZBX_FLAG_LLD_INTERFACE_UPDATE_MAIN	0x02	/* interface.main field should be updated */
-#define ZBX_FLAG_LLD_INTERFACE_UPDATE_USEIP	0x04	/* interface.useip field should be updated */
-#define ZBX_FLAG_LLD_INTERFACE_UPDATE_IP	0x08	/* interface.ip field should be updated */
-#define ZBX_FLAG_LLD_INTERFACE_UPDATE_DNS	0x10	/* interface.dns field should be updated */
-#define ZBX_FLAG_LLD_INTERFACE_UPDATE_PORT	0x20	/* interface.port field should be updated */
+#define ZBX_FLAG_LLD_INTERFACE_UPDATE_TYPE	__UINT64_C(0x00000001)	/* interface.type field should be updated  */
+#define ZBX_FLAG_LLD_INTERFACE_UPDATE_MAIN	__UINT64_C(0x00000002)	/* interface.main field should be updated */
+#define ZBX_FLAG_LLD_INTERFACE_UPDATE_USEIP	__UINT64_C(0x00000004)	/* interface.useip field should be updated */
+#define ZBX_FLAG_LLD_INTERFACE_UPDATE_IP	__UINT64_C(0x00000008)	/* interface.ip field should be updated */
+#define ZBX_FLAG_LLD_INTERFACE_UPDATE_DNS	__UINT64_C(0x00000010)	/* interface.dns field should be updated */
+#define ZBX_FLAG_LLD_INTERFACE_UPDATE_PORT	__UINT64_C(0x00000020)	/* interface.port field should be updated */
 #define ZBX_FLAG_LLD_INTERFACE_UPDATE								\
 		(ZBX_FLAG_LLD_INTERFACE_UPDATE_TYPE | ZBX_FLAG_LLD_INTERFACE_UPDATE_MAIN |	\
 		ZBX_FLAG_LLD_INTERFACE_UPDATE_USEIP | ZBX_FLAG_LLD_INTERFACE_UPDATE_IP |	\
 		ZBX_FLAG_LLD_INTERFACE_UPDATE_DNS | ZBX_FLAG_LLD_INTERFACE_UPDATE_PORT)
-#define ZBX_FLAG_LLD_INTERFACE_REMOVE		0x40	/* interfaces which should be deleted */
-	unsigned char	flags;
+#define ZBX_FLAG_LLD_INTERFACE_REMOVE		__UINT64_C(0x00000040)	/* interfaces which should be deleted */
+	zbx_uint64_t	flags;
 }
 zbx_lld_interface_t;
 
@@ -88,20 +88,20 @@ typedef struct
 	char			*name_orig;
 	int			lastcheck;
 	int			ts_delete;
-#define ZBX_FLAG_LLD_HOST_DISCOVERED		0x01	/* hosts which should be updated or added */
-#define ZBX_FLAG_LLD_HOST_UPDATE_HOST		0x02	/* hosts.host and host_discovery.host fields should be updated */
-#define ZBX_FLAG_LLD_HOST_UPDATE_NAME		0x04	/* hosts.name field should be updated */
-#define ZBX_FLAG_LLD_HOST_UPDATE_PROXY		0x08	/* hosts.proxy_hostid field should be updated */
-#define ZBX_FLAG_LLD_HOST_UPDATE_IPMI_AUTH	0x10	/* hosts.ipmi_authtype field should be updated */
-#define ZBX_FLAG_LLD_HOST_UPDATE_IPMI_PRIV	0x20	/* hosts.ipmi_privilege field should be updated */
-#define ZBX_FLAG_LLD_HOST_UPDATE_IPMI_USER	0x40	/* hosts.ipmi_username field should be updated */
-#define ZBX_FLAG_LLD_HOST_UPDATE_IPMI_PASS	0x80	/* hosts.ipmi_password field should be updated */
+#define ZBX_FLAG_LLD_HOST_DISCOVERED		__UINT64_C(0x00000001)	/* hosts which should be updated or added */
+#define ZBX_FLAG_LLD_HOST_UPDATE_HOST		__UINT64_C(0x00000002)	/* hosts.host and host_discovery.host fields should be updated */
+#define ZBX_FLAG_LLD_HOST_UPDATE_NAME		__UINT64_C(0x00000004)	/* hosts.name field should be updated */
+#define ZBX_FLAG_LLD_HOST_UPDATE_PROXY		__UINT64_C(0x00000008)	/* hosts.proxy_hostid field should be updated */
+#define ZBX_FLAG_LLD_HOST_UPDATE_IPMI_AUTH	__UINT64_C(0x00000010)	/* hosts.ipmi_authtype field should be updated */
+#define ZBX_FLAG_LLD_HOST_UPDATE_IPMI_PRIV	__UINT64_C(0x00000020)	/* hosts.ipmi_privilege field should be updated */
+#define ZBX_FLAG_LLD_HOST_UPDATE_IPMI_USER	__UINT64_C(0x00000040)	/* hosts.ipmi_username field should be updated */
+#define ZBX_FLAG_LLD_HOST_UPDATE_IPMI_PASS	__UINT64_C(0x00000080)	/* hosts.ipmi_password field should be updated */
 #define ZBX_FLAG_LLD_HOST_UPDATE								\
 		(ZBX_FLAG_LLD_HOST_UPDATE_HOST | ZBX_FLAG_LLD_HOST_UPDATE_NAME |		\
 		ZBX_FLAG_LLD_HOST_UPDATE_PROXY | ZBX_FLAG_LLD_HOST_UPDATE_IPMI_AUTH |		\
 		ZBX_FLAG_LLD_HOST_UPDATE_IPMI_PRIV | ZBX_FLAG_LLD_HOST_UPDATE_IPMI_USER |	\
 		ZBX_FLAG_LLD_HOST_UPDATE_IPMI_PASS)
-	unsigned char		flags;
+	zbx_uint64_t		flags;
 	char			inventory_mode;
 }
 zbx_lld_host_t;
@@ -146,10 +146,10 @@ typedef struct
 	char			*name_orig;
 	int			lastcheck;
 	int			ts_delete;
-#define ZBX_FLAG_LLD_GROUP_DISCOVERED		0x01	/* groups which should be updated or added */
-#define ZBX_FLAG_LLD_GROUP_UPDATE_NAME		0x02	/* groups.name field should be updated */
+#define ZBX_FLAG_LLD_GROUP_DISCOVERED		__UINT64_C(0x00000001)	/* groups which should be updated or added */
+#define ZBX_FLAG_LLD_GROUP_UPDATE_NAME		__UINT64_C(0x00000002)	/* groups.name field should be updated */
 #define ZBX_FLAG_LLD_GROUP_UPDATE		ZBX_FLAG_LLD_GROUP_UPDATE_NAME
-	unsigned char		flags;
+	zbx_uint64_t		flags;
 }
 zbx_lld_group_t;
 
@@ -256,48 +256,46 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 {
 	const char		*__function_name = "lld_hosts_validate";
 
-	char			*tnames = NULL, *vnames = NULL, *host_esc, *name_esc;
-	size_t			tnames_alloc = 256, tnames_offset = 0,
-				vnames_alloc = 256, vnames_offset = 0;
 	DB_RESULT		result;
 	DB_ROW			row;
 	int			i, j;
 	zbx_lld_host_t		*host, *host_b;
 	zbx_vector_uint64_t	hostids;
+	zbx_vector_str_t	tnames, vnames;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	zbx_vector_uint64_create(&hostids);
-
-	tnames = zbx_malloc(tnames, tnames_alloc);	/* list of technical host names */
-	vnames = zbx_malloc(vnames, vnames_alloc);	/* list of visible host names */
+	zbx_vector_str_create(&tnames);		/* list of technical host names */
+	zbx_vector_str_create(&vnames);		/* list of visible host names */
 
 	/* checking a host name validity */
 	for (i = 0; i < hosts->values_num; i++)
 	{
+		char	*ch_error;
+
 		host = (zbx_lld_host_t *)hosts->values[i];
 
 		if (0 == (host->flags & ZBX_FLAG_LLD_HOST_DISCOVERED))
 			continue;
 
-		/* only new hosts or hosts with a new host name will be validated */
+		/* only new hosts or hosts with changed host name will be validated */
 		if (0 != host->hostid && 0 == (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_HOST))
 			continue;
 
 		/* host name is valid? */
-		if (SUCCEED == zbx_check_hostname(host->host))
+		if (SUCCEED == zbx_check_hostname(host->host, &ch_error))
 			continue;
 
-		*error = zbx_strdcatf(*error, "Cannot %s host: invalid host name \"%s\".\n",
-				(0 != host->hostid ? "update" : "create"), host->host);
+		*error = zbx_strdcatf(*error, "Cannot %s host \"%s\": %s.\n",
+				(0 != host->hostid ? "update" : "create"), host->host, ch_error);
+
+		zbx_free(ch_error);
 
 		if (0 != host->hostid)
 		{
-			/* return an original host name and drop the correspond flag */
-			zbx_free(host->host);
-			host->host = host->host_orig;
-			host->host_orig = NULL;
-			host->flags &= ~ZBX_FLAG_LLD_HOST_UPDATE_HOST;
+			lld_field_str_rollback(&host->host, &host->host_orig, &host->flags,
+					ZBX_FLAG_LLD_HOST_UPDATE_HOST);
 		}
 		else
 			host->flags &= ~ZBX_FLAG_LLD_HOST_DISCOVERED;
@@ -311,7 +309,7 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 		if (0 == (host->flags & ZBX_FLAG_LLD_HOST_DISCOVERED))
 			continue;
 
-		/* only new hosts or hosts with a new visible host name will be validated */
+		/* only new hosts or hosts with changed visible name will be validated */
 		if (0 != host->hostid && 0 == (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_NAME))
 			continue;
 
@@ -328,11 +326,8 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 
 		if (0 != host->hostid)
 		{
-			/* return an original visible host name and drop the correspond flag */
-			zbx_free(host->name);
-			host->name = host->name_orig;
-			host->name_orig = NULL;
-			host->flags &= ~ZBX_FLAG_LLD_HOST_UPDATE_NAME;
+			lld_field_str_rollback(&host->name, &host->name_orig, &host->flags,
+					ZBX_FLAG_LLD_HOST_UPDATE_NAME);
 		}
 		else
 			host->flags &= ~ZBX_FLAG_LLD_HOST_DISCOVERED;
@@ -346,7 +341,7 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 		if (0 == (host->flags & ZBX_FLAG_LLD_HOST_DISCOVERED))
 			continue;
 
-		/* only new hosts or hosts with a new host name will be validated */
+		/* only new hosts or hosts with changed host name will be validated */
 		if (0 != host->hostid && 0 == (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_HOST))
 			continue;
 
@@ -361,16 +356,13 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 				continue;
 
 			*error = zbx_strdcatf(*error, "Cannot %s host:"
-						" host with the same name \"%s\" already exists.\n",
-						(0 != host->hostid ? "update" : "create"), host->host);
+					" host with the same name \"%s\" already exists.\n",
+					(0 != host->hostid ? "update" : "create"), host->host);
 
 			if (0 != host->hostid)
 			{
-				/* return an original host name and drop the correspond flag */
-				zbx_free(host->host);
-				host->host = host->host_orig;
-				host->host_orig = NULL;
-				host->flags &= ~ZBX_FLAG_LLD_HOST_UPDATE_HOST;
+				lld_field_str_rollback(&host->host, &host->host_orig, &host->flags,
+						ZBX_FLAG_LLD_HOST_UPDATE_HOST);
 			}
 			else
 				host->flags &= ~ZBX_FLAG_LLD_HOST_DISCOVERED;
@@ -385,7 +377,7 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 		if (0 == (host->flags & ZBX_FLAG_LLD_HOST_DISCOVERED))
 			continue;
 
-		/* only new hosts or hosts with a new visible host name will be validated */
+		/* only new hosts or hosts with changed visible name will be validated */
 		if (0 != host->hostid && 0 == (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_NAME))
 			continue;
 
@@ -405,11 +397,8 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 
 			if (0 != host->hostid)
 			{
-				/* return an original visible host name and drop the correspond flag */
-				zbx_free(host->name);
-				host->name = host->name_orig;
-				host->name_orig = NULL;
-				host->flags &= ~ZBX_FLAG_LLD_HOST_UPDATE_NAME;
+				lld_field_str_rollback(&host->name, &host->name_orig, &host->flags,
+						ZBX_FLAG_LLD_HOST_UPDATE_NAME);
 			}
 			else
 				host->flags &= ~ZBX_FLAG_LLD_HOST_DISCOVERED;
@@ -429,33 +418,13 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 			zbx_vector_uint64_append(&hostids, host->hostid);
 
 		if (0 == host->hostid || 0 != (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_HOST))
-		{
-			host_esc = DBdyn_escape_string(host->host);
-
-			if (0 != tnames_offset)
-				zbx_chrcpy_alloc(&tnames, &tnames_alloc, &tnames_offset, ',');
-			zbx_chrcpy_alloc(&tnames, &tnames_alloc, &tnames_offset, '\'');
-			zbx_strcpy_alloc(&tnames, &tnames_alloc, &tnames_offset, host_esc);
-			zbx_chrcpy_alloc(&tnames, &tnames_alloc, &tnames_offset, '\'');
-
-			zbx_free(host_esc);
-		}
+			zbx_vector_str_append(&tnames, host->host);
 
 		if (0 == host->hostid || 0 != (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_NAME))
-		{
-			name_esc = DBdyn_escape_string(host->name);
-
-			if (0 != vnames_offset)
-				zbx_chrcpy_alloc(&vnames, &vnames_alloc, &vnames_offset, ',');
-			zbx_chrcpy_alloc(&vnames, &vnames_alloc, &vnames_offset, '\'');
-			zbx_strcpy_alloc(&vnames, &vnames_alloc, &vnames_offset, name_esc);
-			zbx_chrcpy_alloc(&vnames, &vnames_alloc, &vnames_offset, '\'');
-
-			zbx_free(name_esc);
-		}
+			zbx_vector_str_append(&vnames, host->name);
 	}
 
-	if (0 != tnames_offset || 0 != vnames_offset)
+	if (0 != tnames.values_num || 0 != vnames.values_num)
 	{
 		char	*sql = NULL;
 		size_t	sql_alloc = 0, sql_offset = 0;
@@ -465,19 +434,31 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 				" from hosts"
 				" where status in (%d,%d,%d)"
 					" and flags<>%d"
-					" and ",
+					" and",
 				HOST_STATUS_MONITORED, HOST_STATUS_NOT_MONITORED, HOST_STATUS_TEMPLATE,
 				ZBX_FLAG_DISCOVERY_PROTOTYPE);
-		if (0 != tnames_offset && 0 != vnames_offset)
-			zbx_chrcpy_alloc(&sql, &sql_alloc, &sql_offset, '(');
-		if (0 != tnames_offset)
-			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "host in (%s)", tnames);
-		if (0 != tnames_offset && 0 != vnames_offset)
-			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, " or ");
-		if (0 != vnames_offset)
-			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "name in (%s)", vnames);
-		if (0 != tnames_offset && 0 != vnames_offset)
+
+		if (0 != tnames.values_num && 0 != vnames.values_num)
+			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, " (");
+
+		if (0 != tnames.values_num)
+		{
+			DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "host",
+					(const char **)tnames.values, tnames.values_num);
+		}
+
+		if (0 != tnames.values_num && 0 != vnames.values_num)
+			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, " or");
+
+		if (0 != vnames.values_num)
+		{
+			DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "name",
+					(const char **)vnames.values, vnames.values_num);
+		}
+
+		if (0 != tnames.values_num && 0 != vnames.values_num)
 			zbx_chrcpy_alloc(&sql, &sql_alloc, &sql_offset, ')');
+
 		if (0 != hostids.values_num)
 		{
 			zbx_vector_uint64_sort(&hostids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
@@ -505,11 +486,8 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 
 					if (0 != host->hostid)
 					{
-						/* return an original host name and drop the correspond flag */
-						zbx_free(host->host);
-						host->host = host->host_orig;
-						host->host_orig = NULL;
-						host->flags &= ~ZBX_FLAG_LLD_HOST_UPDATE_HOST;
+						lld_field_str_rollback(&host->host, &host->host_orig, &host->flags,
+								ZBX_FLAG_LLD_HOST_UPDATE_HOST);
 					}
 					else
 						host->flags &= ~ZBX_FLAG_LLD_HOST_DISCOVERED;
@@ -523,11 +501,8 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 
 					if (0 != host->hostid)
 					{
-						/* return an original visible host name and drop the correspond flag */
-						zbx_free(host->name);
-						host->name = host->name_orig;
-						host->name_orig = NULL;
-						host->flags &= ~ZBX_FLAG_LLD_HOST_UPDATE_NAME;
+						lld_field_str_rollback(&host->name, &host->name_orig, &host->flags,
+								ZBX_FLAG_LLD_HOST_UPDATE_NAME);
 					}
 					else
 						host->flags &= ~ZBX_FLAG_LLD_HOST_DISCOVERED;
@@ -539,9 +514,8 @@ void	lld_hosts_validate(zbx_vector_ptr_t *hosts, char **error)
 		zbx_free(sql);
 	}
 
-	zbx_free(vnames);
-	zbx_free(tnames);
-
+	zbx_vector_str_destroy(&vnames);
+	zbx_vector_str_destroy(&tnames);
 	zbx_vector_uint64_destroy(&hostids);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
@@ -1013,19 +987,17 @@ void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 {
 	const char		*__function_name = "lld_groups_validate";
 
-	char			*names = NULL, *name_esc;
-	size_t			names_alloc = 256, names_offset = 0;
 	DB_RESULT		result;
 	DB_ROW			row;
 	int			i, j;
 	zbx_lld_group_t		*group, *group_b;
 	zbx_vector_uint64_t	groupids;
+	zbx_vector_str_t	names;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	zbx_vector_uint64_create(&groupids);
-
-	names = zbx_malloc(names, names_alloc);	/* list of group names */
+	zbx_vector_str_create(&names);		/* list of group names */
 
 	/* checking a group name validity */
 	for (i = 0; i < groups->values_num; i++)
@@ -1035,7 +1007,7 @@ void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 		if (0 == (group->flags & ZBX_FLAG_LLD_GROUP_DISCOVERED))
 			continue;
 
-		/* only new groups or groups with a new group name will be validated */
+		/* only new groups or groups with changed group name will be validated */
 		if (0 != group->groupid && 0 == (group->flags & ZBX_FLAG_LLD_GROUP_UPDATE_NAME))
 			continue;
 
@@ -1052,11 +1024,8 @@ void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 
 		if (0 != group->groupid)
 		{
-			/* return an original group name and drop the correspond flag */
-			zbx_free(group->name);
-			group->name = group->name_orig;
-			group->name_orig = NULL;
-			group->flags &= ~ZBX_FLAG_LLD_GROUP_UPDATE_NAME;
+			lld_field_str_rollback(&group->name, &group->name_orig, &group->flags,
+					ZBX_FLAG_LLD_GROUP_UPDATE_NAME);
 		}
 		else
 			group->flags &= ~ZBX_FLAG_LLD_GROUP_DISCOVERED;
@@ -1070,7 +1039,7 @@ void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 		if (0 == (group->flags & ZBX_FLAG_LLD_GROUP_DISCOVERED))
 			continue;
 
-		/* only new groups or groups with a new group name will be validated */
+		/* only new groups or groups with changed group name will be validated */
 		if (0 != group->groupid && 0 == (group->flags & ZBX_FLAG_LLD_GROUP_UPDATE_NAME))
 			continue;
 
@@ -1090,11 +1059,8 @@ void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 
 			if (0 != group->groupid)
 			{
-				/* return an original group name and drop the correspond flag */
-				zbx_free(group->name);
-				group->name = group->name_orig;
-				group->name_orig = NULL;
-				group->flags &= ~ZBX_FLAG_LLD_GROUP_UPDATE_NAME;
+				lld_field_str_rollback(&group->name, &group->name_orig, &group->flags,
+						ZBX_FLAG_LLD_GROUP_UPDATE_NAME);
 			}
 			else
 				group->flags &= ~ZBX_FLAG_LLD_GROUP_DISCOVERED;
@@ -1114,25 +1080,18 @@ void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 			zbx_vector_uint64_append(&groupids, group->groupid);
 
 		if (0 == group->groupid || 0 != (group->flags & ZBX_FLAG_LLD_GROUP_UPDATE_NAME))
-		{
-			name_esc = DBdyn_escape_string(group->name);
-
-			if (0 != names_offset)
-				zbx_chrcpy_alloc(&names, &names_alloc, &names_offset, ',');
-			zbx_chrcpy_alloc(&names, &names_alloc, &names_offset, '\'');
-			zbx_strcpy_alloc(&names, &names_alloc, &names_offset, name_esc);
-			zbx_chrcpy_alloc(&names, &names_alloc, &names_offset, '\'');
-
-			zbx_free(name_esc);
-		}
+			zbx_vector_str_append(&names, group->name);
 	}
 
-	if (0 != names_offset)
+	if (0 != names.values_num)
 	{
 		char	*sql = NULL;
 		size_t	sql_alloc = 0, sql_offset = 0;
 
-		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "select name from groups where name in (%s)", names);
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "select name from groups where");
+		DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "name",
+				(const char **)names.values, names.values_num);
+
 		if (0 != groupids.values_num)
 		{
 			zbx_vector_uint64_sort(&groupids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
@@ -1160,11 +1119,8 @@ void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 
 					if (0 != group->groupid)
 					{
-						/* return an original group name and drop the correspond flag */
-						zbx_free(group->name);
-						group->name = group->name_orig;
-						group->name_orig = NULL;
-						group->flags &= ~ZBX_FLAG_LLD_GROUP_UPDATE_NAME;
+						lld_field_str_rollback(&group->name, &group->name_orig, &group->flags,
+								ZBX_FLAG_LLD_GROUP_UPDATE_NAME);
 					}
 					else
 						group->flags &= ~ZBX_FLAG_LLD_GROUP_DISCOVERED;
@@ -1176,8 +1132,7 @@ void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 		zbx_free(sql);
 	}
 
-	zbx_free(names);
-
+	zbx_vector_str_destroy(&names);
 	zbx_vector_uint64_destroy(&groupids);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
diff --git a/src/libs/zbxdbhigh/lld_item.c b/src/libs/zbxdbhigh/lld_item.c
index 3ca72ec186f..15619fc42d0 100644
--- a/src/libs/zbxdbhigh/lld_item.c
+++ b/src/libs/zbxdbhigh/lld_item.c
@@ -337,7 +337,7 @@ static void	lld_validate_item_field(zbx_lld_item_t *item, char **field, char **f
 	if (0 == (item->flags & ZBX_FLAG_LLD_ITEM_DISCOVERED))
 		return;
 
-	/* only new items or items with a new data will be validated */
+	/* only new items or items with changed data will be validated */
 	if (0 != item->itemid && 0 == (item->flags & flag))
 		return;
 
@@ -372,19 +372,17 @@ static void	lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, cha
 {
 	const char		*__function_name = "lld_items_validate";
 
-	char			*keys = NULL, *key_esc;
-	size_t			keys_alloc = 256, keys_offset = 0;
 	DB_RESULT		result;
 	DB_ROW			row;
 	int			i, j;
 	zbx_lld_item_t		*item, *item_b;
 	zbx_vector_uint64_t	itemids;
+	zbx_vector_str_t	keys;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	zbx_vector_uint64_create(&itemids);
-
-	keys = zbx_malloc(keys, keys_alloc);	/* list of item keys */
+	zbx_vector_str_create(&keys);		/* list of item keys */
 
 	/* check an item name validity */
 	for (i = 0; i < items->values_num; i++)
@@ -411,7 +409,7 @@ static void	lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, cha
 		if (0 == (item->flags & ZBX_FLAG_LLD_ITEM_DISCOVERED))
 			continue;
 
-		/* only new items or items with a new key will be validated */
+		/* only new items or items with changed key will be validated */
 		if (0 != item->itemid && 0 == (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_KEY))
 			continue;
 
@@ -436,6 +434,7 @@ static void	lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, cha
 			}
 			else
 				item->flags &= ~ZBX_FLAG_LLD_ITEM_DISCOVERED;
+
 			break;
 		}
 	}
@@ -455,18 +454,10 @@ static void	lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, cha
 		if (0 != item->itemid && 0 == (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_KEY))
 			continue;
 
-		key_esc = DBdyn_escape_string(item->key);
-
-		if (0 != keys_offset)
-			zbx_chrcpy_alloc(&keys, &keys_alloc, &keys_offset, ',');
-		zbx_chrcpy_alloc(&keys, &keys_alloc, &keys_offset, '\'');
-		zbx_strcpy_alloc(&keys, &keys_alloc, &keys_offset, key_esc);
-		zbx_chrcpy_alloc(&keys, &keys_alloc, &keys_offset, '\'');
-
-		zbx_free(key_esc);
+		zbx_vector_str_append(&keys, item->key);
 	}
 
-	if (0 != keys_offset)
+	if (0 != keys.values_num)
 	{
 		char	*sql = NULL;
 		size_t	sql_alloc = 256, sql_offset = 0;
@@ -477,8 +468,11 @@ static void	lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, cha
 				"select key_"
 				" from items"
 				" where hostid=" ZBX_FS_UI64
-					" and key_ in (%s)",
-				hostid, keys);
+					" and",
+				hostid);
+		DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "key_",
+				(const char **)keys.values, keys.values_num);
+
 		if (0 != itemids.values_num)
 		{
 			zbx_vector_uint64_sort(&itemids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
@@ -521,8 +515,7 @@ static void	lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, cha
 		zbx_free(sql);
 	}
 
-	zbx_free(keys);
-
+	zbx_vector_str_destroy(&keys);
 	zbx_vector_uint64_destroy(&itemids);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
diff --git a/src/libs/zbxdbhigh/lld_trigger.c b/src/libs/zbxdbhigh/lld_trigger.c
index 47b93886eed..5a733e04e43 100644
--- a/src/libs/zbxdbhigh/lld_trigger.c
+++ b/src/libs/zbxdbhigh/lld_trigger.c
@@ -53,7 +53,6 @@ typedef struct
 {
 	zbx_uint64_t	functionid;
 	zbx_uint64_t	index;
-	zbx_uint64_t	index_orig;
 	zbx_uint64_t	itemid;
 	zbx_uint64_t	itemid_orig;
 	char		*function;
@@ -231,7 +230,6 @@ static void	lld_functions_get(zbx_uint64_t parent_triggerid, zbx_vector_ptr_t *f
 			function = zbx_malloc(NULL, sizeof(zbx_lld_function_t));
 
 			function->index = 0;
-			function->index_orig = 0;
 			ZBX_STR2UINT64(function->functionid, row[0]);
 			ZBX_STR2UINT64(triggerid, row[1]);
 			ZBX_STR2UINT64(function->itemid, row[2]);
@@ -497,13 +495,87 @@ static char	*lld_expression_expand(const char *expression, zbx_vector_ptr_t *fun
 	return buffer;
 }
 
+static void	lld_function_make(zbx_lld_function_t *function_proto, zbx_vector_ptr_t *functions, zbx_uint64_t itemid)
+{
+	int			i;
+	zbx_lld_function_t	*function;
+
+	for (i = 0; i < functions->values_num; i++)
+	{
+		function = (zbx_lld_function_t *)functions->values[i];
+
+		if (0 != (function->flags & ZBX_FLAG_LLD_FUNCTION_DISCOVERED))
+			continue;
+
+		if (function->index == function_proto->index)
+			break;
+	}
+
+	if (i == functions->values_num)
+	{
+		function = zbx_malloc(NULL, sizeof(zbx_lld_function_t));
+
+		function->index = function_proto->index;
+		function->functionid = 0;
+		function->itemid = itemid;
+		function->itemid_orig = 0;
+		function->function = zbx_strdup(NULL, function_proto->function);
+		function->function_orig = NULL;
+		function->parameter = zbx_strdup(NULL, function_proto->parameter);
+		function->parameter_orig = NULL;
+		function->flags = ZBX_FLAG_LLD_FUNCTION_DISCOVERED;
+
+		zbx_vector_ptr_append(functions, function);
+	}
+	else
+	{
+		if (function->itemid != itemid)
+		{
+			function->itemid_orig = function->itemid;
+			function->itemid = itemid;
+			function->flags |= ZBX_FLAG_LLD_FUNCTION_UPDATE_ITEMID;
+		}
+
+		if (0 != strcmp(function->function, function_proto->function))
+		{
+			function->function_orig = function->function;
+			function->function = zbx_strdup(NULL, function_proto->function);
+			function->flags |= ZBX_FLAG_LLD_FUNCTION_UPDATE_FUNCTION;
+		}
+
+		if (0 != strcmp(function->parameter, function_proto->parameter))
+		{
+			function->parameter_orig = function->parameter;
+			function->parameter = zbx_strdup(NULL, function_proto->parameter);
+			function->flags |= ZBX_FLAG_LLD_FUNCTION_UPDATE_PARAMETER;
+		}
+
+		function->flags |= ZBX_FLAG_LLD_FUNCTION_DISCOVERED;
+	}
+}
+
+static void	lld_functions_delete(zbx_vector_ptr_t *functions)
+{
+	int	i;
+
+	for (i = 0; i < functions->values_num; i++)
+	{
+		zbx_lld_function_t	*function = (zbx_lld_function_t *)functions->values[i];
+
+		if (0 != (function->flags & ZBX_FLAG_LLD_FUNCTION_DISCOVERED))
+			continue;
+
+		function->flags |= ZBX_FLAG_LLD_FUNCTION_DELETE;
+	}
+}
+
 static int	lld_functions_make(zbx_vector_ptr_t *functions_proto, zbx_vector_ptr_t *functions,
 		zbx_vector_ptr_t *items, zbx_vector_ptr_t *item_links)
 {
 	const char		*__function_name = "lld_functions_make";
 
 	int			i, index, ret = FAIL;
-	zbx_lld_function_t	*function_proto, *function;
+	zbx_lld_function_t	*function_proto;
 	zbx_lld_item_t		*item_proto;
 	zbx_lld_item_link_t	*item_link;
 	zbx_uint64_t		itemid;
@@ -536,61 +608,10 @@ static int	lld_functions_make(zbx_vector_ptr_t *functions_proto, zbx_vector_ptr_
 		else
 			itemid = item_proto->itemid;
 
-		if (i == functions->values_num)
-		{
-			function = zbx_malloc(NULL, sizeof(zbx_lld_function_t));
-
-			function->index = function_proto->index;
-			function->index_orig = 0;
-			function->functionid = 0;
-			function->itemid = itemid;
-			function->itemid_orig = 0;
-			function->function = zbx_strdup(NULL, function_proto->function);
-			function->function_orig = NULL;
-			function->parameter = zbx_strdup(NULL, function_proto->parameter);
-			function->parameter_orig = NULL;
-			function->flags = ZBX_FLAG_LLD_FUNCTION_DISCOVERED;
-
-			zbx_vector_ptr_append(functions, function);
-		}
-		else
-		{
-			function = (zbx_lld_function_t *)functions->values[i];
-
-			function->index_orig = function->index;
-			function->index = function_proto->index;
-
-			if (function->itemid != itemid)
-			{
-				function->itemid_orig = function->itemid;
-				function->itemid = itemid;
-				function->flags |= ZBX_FLAG_LLD_FUNCTION_UPDATE_ITEMID;
-			}
-
-			if (0 != strcmp(function->function, function_proto->function))
-			{
-				function->function_orig = function->function;
-				function->function = zbx_strdup(NULL, function_proto->function);
-				function->flags |= ZBX_FLAG_LLD_FUNCTION_UPDATE_FUNCTION;
-			}
-
-			if (0 != strcmp(function->parameter, function_proto->parameter))
-			{
-				function->parameter_orig = function->parameter;
-				function->parameter = zbx_strdup(NULL, function_proto->parameter);
-				function->flags |= ZBX_FLAG_LLD_FUNCTION_UPDATE_PARAMETER;
-			}
-
-			function->flags |= ZBX_FLAG_LLD_FUNCTION_DISCOVERED;
-		}
+		lld_function_make(function_proto, functions, itemid);
 	}
 
-	for (; i < functions->values_num; i++)
-	{
-		function = (zbx_lld_function_t *)functions->values[i];
-
-		function->flags |= ZBX_FLAG_LLD_FUNCTION_DELETE;
-	}
+	lld_functions_delete(functions);
 
 	ret = SUCCEED;
 out:
@@ -727,7 +748,7 @@ static void	lld_validate_trigger_field(zbx_lld_trigger_t *trigger, char **field,
 	if (0 == (trigger->flags & ZBX_FLAG_LLD_TRIGGER_DISCOVERED))
 		return;
 
-	/* only new triggers or triggers with a new data will be validated */
+	/* only new triggers or triggers with changed data will be validated */
 	if (0 != trigger->triggerid && 0 == (trigger->flags & flag))
 		return;
 
@@ -878,8 +899,8 @@ static void	lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger
 
 	if (0 != descriptions.values_num)
 	{
-		char			*sql = NULL, *condition = NULL, *description_esc;
-		size_t			sql_alloc = 256, sql_offset = 0, condition_alloc = 256, condition_offset = 0;
+		char			*sql = NULL;
+		size_t			sql_alloc = 256, sql_offset = 0;
 		DB_RESULT		result;
 		DB_ROW			row;
 		zbx_vector_ptr_t	db_triggers;
@@ -890,21 +911,6 @@ static void	lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger
 		zbx_vector_str_sort(&descriptions, ZBX_DEFAULT_STR_COMPARE_FUNC);
 		zbx_vector_str_uniq(&descriptions, ZBX_DEFAULT_STR_COMPARE_FUNC);
 
-		condition = zbx_malloc(condition, condition_alloc);	/* list of trigger descriptions */
-
-		for (i = 0; i < descriptions.values_num; i++)
-		{
-			description_esc = DBdyn_escape_string(descriptions.values[i]);
-
-			if (0 != condition_offset)
-				zbx_chrcpy_alloc(&condition, &condition_alloc, &condition_offset, ',');
-			zbx_chrcpy_alloc(&condition, &condition_alloc, &condition_offset, '\'');
-			zbx_strcpy_alloc(&condition, &condition_alloc, &condition_offset, description_esc);
-			zbx_chrcpy_alloc(&condition, &condition_alloc, &condition_offset, '\'');
-
-			zbx_free(description_esc);
-		}
-
 		sql = zbx_malloc(sql, sql_alloc);
 
 		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
@@ -913,8 +919,11 @@ static void	lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger
 				" where t.triggerid=f.triggerid"
 					" and f.itemid=i.itemid"
 					" and i.hostid=" ZBX_FS_UI64
-					" and t.description in (%s)",
-				hostid, condition);
+					" and",
+				hostid);
+		DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.description",
+				(const char **)descriptions.values, descriptions.values_num);
+
 		if (0 != triggerids.values_num)
 		{
 			zbx_vector_uint64_sort(&triggerids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
@@ -981,8 +990,6 @@ static void	lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger
 
 						if (0 != function->functionid)
 						{
-							function->index = function->index_orig;
-
 							lld_field_uint64_rollback(&function->itemid,
 									&function->itemid_orig,
 									&function->flags,
@@ -1015,7 +1022,6 @@ static void	lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger
 		zbx_vector_ptr_destroy(&db_triggers);
 
 		zbx_free(sql);
-		zbx_free(condition);
 	}
 
 	zbx_vector_str_destroy(&descriptions);
diff --git a/src/libs/zbxdbhigh/odbc.c b/src/libs/zbxdbhigh/odbc.c
index fe2d7e5a0bb..3bd3d15848c 100644
--- a/src/libs/zbxdbhigh/odbc.c
+++ b/src/libs/zbxdbhigh/odbc.c
@@ -36,7 +36,7 @@ const char	*get_last_odbc_strerror(void)
 #	define set_last_odbc_strerror(fmt, ...) __zbx_set_last_odbc_strerror(ZBX_CONST_STRING(fmt), ##__VA_ARGS__)
 #else
 #	define set_last_odbc_strerror __zbx_set_last_odbc_strerror
-#endif /* HAVE___VA_ARGS__ */
+#endif
 static void	__zbx_set_last_odbc_strerror(const char *fmt, ...)
 {
 	va_list	args;
@@ -48,7 +48,7 @@ static void	__zbx_set_last_odbc_strerror(const char *fmt, ...)
 	va_end(args);
 }
 
-#define clean_odbc_strerror() zbx_last_odbc_strerror[0]='\0'
+#define clean_odbc_strerror()	zbx_last_odbc_strerror[0] = '\0'
 
 static void	odbc_free_row_data(ZBX_ODBC_DBH *pdbh)
 {
diff --git a/src/libs/zbxdbhigh/proxy.c b/src/libs/zbxdbhigh/proxy.c
index 4f1ce0bbd7d..605b5fbc1c3 100644
--- a/src/libs/zbxdbhigh/proxy.c
+++ b/src/libs/zbxdbhigh/proxy.c
@@ -98,8 +98,6 @@ static zbx_history_table_t areg = {
  *                FAIL    - an error occurred (e.g. an unknown proxy or the   *
  *                          proxy is configured in passive mode               *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 int	get_active_proxy_id(struct zbx_json_parse *jp, zbx_uint64_t *hostid, char *host, char **error)
 {
@@ -110,9 +108,12 @@ int	get_active_proxy_id(struct zbx_json_parse *jp, zbx_uint64_t *hostid, char *h
 
 	if (SUCCEED == zbx_json_value_by_name(jp, ZBX_PROTO_TAG_HOST, host, HOST_HOST_LEN_MAX))
 	{
-		if (FAIL == zbx_check_hostname(host))
+		char	*ch_error;
+
+		if (FAIL == zbx_check_hostname(host, &ch_error))
 		{
-			*error = zbx_dsprintf(*error, "invalid proxy name \"%s\"", host);
+			*error = zbx_dsprintf(*error, "invalid proxy name \"%s\": %s", host, ch_error);
+			zbx_free(ch_error);
 			return ret;
 		}
 
@@ -160,8 +161,6 @@ int	get_active_proxy_id(struct zbx_json_parse *jp, zbx_uint64_t *hostid, char *h
  *                                                                            *
  * Function: update_proxy_lastaccess                                          *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 void	update_proxy_lastaccess(const zbx_uint64_t hostid)
 {
@@ -174,22 +173,25 @@ void	update_proxy_lastaccess(const zbx_uint64_t hostid)
  *                                                                            *
  * Purpose: prepare proxy configuration data                                  *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static int	get_proxyconfig_table(zbx_uint64_t proxy_hostid, struct zbx_json *j, const ZBX_TABLE *table,
 		zbx_vector_uint64_t *hosts, zbx_vector_uint64_t *httptests)
 {
-	const char	*__function_name = "get_proxyconfig_table";
-	char		*sql = NULL;
-	size_t		sql_alloc = 4 * ZBX_KIBIBYTE, sql_offset = 0;
-	int		f, fld, ret = SUCCEED;
-	DB_RESULT	result;
-	DB_ROW		row;
+	const char		*__function_name = "get_proxyconfig_table";
+
+	char			*sql = NULL;
+	size_t			sql_alloc = 4 * ZBX_KIBIBYTE, sql_offset = 0;
+	int			f, fld, fld_type = -1, fld_key = -1, ret = SUCCEED;
+	DB_RESULT		result;
+	DB_ROW			row;
+	static const ZBX_TABLE	*table_items = NULL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() proxy_hostid:" ZBX_FS_UI64 " table:'%s'",
 			__function_name, proxy_hostid, table->table);
 
+	if (NULL == table_items)
+		table_items = DBget_table("items");
+
 	zbx_json_addobject(j, table->table);
 	zbx_json_addarray(j, "fields");
 
@@ -199,14 +201,31 @@ static int	get_proxyconfig_table(zbx_uint64_t proxy_hostid, struct zbx_json *j,
 
 	zbx_json_addstring(j, NULL, table->recid, ZBX_JSON_TYPE_STRING);
 
-	for (f = 0; 0 != table->fields[f].name; f++)
+	for (f = 0, fld = 1; 0 != table->fields[f].name; f++)
 	{
 		if (0 == (table->fields[f].flags & ZBX_PROXY))
 			continue;
 
-		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, ",t.%s", table->fields[f].name);
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, ",t.");
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, table->fields[f].name);
 
 		zbx_json_addstring(j, NULL, table->fields[f].name, ZBX_JSON_TYPE_STRING);
+
+		if (table == table_items)
+		{
+			if (0 == strcmp(table->fields[f].name, "type"))
+				fld_type = fld;
+			else if (0 == strcmp(table->fields[f].name, "key_"))
+				fld_key = fld;
+
+			fld++;
+		}
+	}
+
+	if (table == table_items && (-1 == fld_type || -1 == fld_key))
+	{
+		THIS_SHOULD_NEVER_HAPPEN;
+		exit(EXIT_FAILURE);
 	}
 
 	zbx_json_close(j);	/* fields */
@@ -215,13 +234,7 @@ static int	get_proxyconfig_table(zbx_uint64_t proxy_hostid, struct zbx_json *j,
 
 	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " from %s t", table->table);
 
-	if (SUCCEED == str_in_list("globalmacro,regexps,expressions,config", table->table, ','))
-	{
-		char	field_name[ZBX_FIELDNAME_LEN + 3];
-
-		zbx_snprintf(field_name, sizeof(field_name), "t.%s", table->recid);
-	}
-	else if (SUCCEED == str_in_list("hosts,interface,hosts_templates,hostmacro", table->table, ','))
+	if (SUCCEED == str_in_list("hosts,interface,hosts_templates,hostmacro", table->table, ','))
 	{
 		if (0 == hosts->values_num)
 			goto skip_data;
@@ -229,7 +242,7 @@ static int	get_proxyconfig_table(zbx_uint64_t proxy_hostid, struct zbx_json *j,
 		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, " where");
 		DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.hostid", hosts->values, hosts->values_num);
 	}
-	else if (0 == strcmp(table->table, "items"))
+	else if (table == table_items)
 	{
 		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
 				",hosts r where t.hostid=r.hostid"
@@ -276,14 +289,15 @@ static int	get_proxyconfig_table(zbx_uint64_t proxy_hostid, struct zbx_json *j,
 		if (0 == httptests->values_num)
 			goto skip_data;
 
-		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
 				",httpstep r where t.httpstepid=r.httpstepid"
 					" and");
 		DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "r.httptestid",
 				httptests->values, httptests->values_num);
 	}
 
-	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " order by t.%s", table->recid);
+	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, " order by t.");
+	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, table->recid);
 
 	if (NULL == (result = DBselect("%s", sql)))
 	{
@@ -293,6 +307,16 @@ static int	get_proxyconfig_table(zbx_uint64_t proxy_hostid, struct zbx_json *j,
 
 	while (NULL != (row = DBfetch(result)))
 	{
+		if (table == table_items)
+		{
+			unsigned char	type;
+
+			ZBX_STR2UCHAR(type, row[fld_type]);
+
+			if (SUCCEED == is_item_processed_by_server(type, row[fld_key]))
+				continue;
+		}
+
 		fld = 0;
 		zbx_json_addarray(j, NULL);
 		zbx_json_addstring(j, NULL, row[fld++], ZBX_JSON_TYPE_INT);
@@ -422,8 +446,6 @@ static void	get_proxy_monitored_httptests(zbx_uint64_t proxy_hostid, zbx_vector_
  *                                                                            *
  * Purpose: prepare proxy configuration data                                  *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 int	get_proxyconfig_data(zbx_uint64_t proxy_hostid, struct zbx_json *j, char **error)
 {
@@ -662,8 +684,6 @@ static int	compare_nth_field(const ZBX_FIELD **fields, const char *rec_data, int
  * Return value: SUCCEED - processed successfully                             *
  *               FAIL - an error occurred                                     *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_parse *jp_obj,
 		zbx_vector_uint64_t *del, char **error)
@@ -674,13 +694,14 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 				move_out = 0, move_field_nr = 0;
 	const ZBX_FIELD		*fields[ZBX_MAX_FIELDS];
 	struct zbx_json_parse	jp_data, jp_row;
-	char			buf[MAX_STRING_LEN], *esc;
+	char			*buf = NULL, *esc;
 	const char		*p, *pf;
 	zbx_uint64_t		recid, *p_recid = NULL;
 	zbx_vector_uint64_t	ins, moves;
 	char			*sql = NULL, *recs = NULL;
 	size_t			sql_alloc = 4 * ZBX_KIBIBYTE, sql_offset,
-				recs_alloc = 20 * ZBX_KIBIBYTE, recs_offset = 0;
+				recs_alloc = 20 * ZBX_KIBIBYTE, recs_offset = 0,
+				buf_alloc = 0;
 	DB_RESULT		result;
 	DB_ROW			row;
 	zbx_hashset_t           h_id_offsets, h_del;
@@ -733,7 +754,7 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 
 	p = NULL;
 	/* iterate column names (lines 4-6 in T1) */
-	while (NULL != (p = zbx_json_next_value(&jp_data, p, buf, sizeof(buf), NULL)))
+	while (NULL != (p = zbx_json_next_value_dyn(&jp_data, p, &buf, &buf_alloc, NULL)))
 	{
 		if (NULL == (fields[fields_count++] = DBget_field(table, buf)))
 		{
@@ -795,7 +816,12 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 	DBfree_result(result);
 
 	/* these tables have unique indices, need special preparation to avoid conflicts during inserts/updates */
-	if (0 == strcmp("hosts_templates", table->table))
+	if (0 == strcmp("globalmacro", table->table))
+	{
+		move_out = 1;
+		move_field_nr = find_field_by_name(fields, fields_count, "macro");
+	}
+	else if (0 == strcmp("hosts_templates", table->table))
 	{
 		move_out = 1;
 		move_field_nr = find_field_by_name(fields, fields_count, "templateid");
@@ -810,6 +836,16 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 		move_out = 1;
 		move_field_nr = find_field_by_name(fields, fields_count, "key_");
 	}
+	else if (0 == strcmp("drules", table->table))
+	{
+		move_out = 1;
+		move_field_nr = find_field_by_name(fields, fields_count, "name");
+	}
+	else if (0 == strcmp("regexps", table->table))
+	{
+		move_out = 1;
+		move_field_nr = find_field_by_name(fields, fields_count, "name");
+	}
 	else if (0 == strcmp("httptest", table->table))
 	{
 		move_out = 1;
@@ -826,7 +862,7 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 	while (NULL != (p = zbx_json_next(&jp_data, p)))
 	{
 		if (FAIL == zbx_json_brackets_open(p, &jp_row) ||
-				NULL == (pf = zbx_json_next_value(&jp_row, NULL, buf, sizeof(buf), NULL)))
+				NULL == (pf = zbx_json_next_value_dyn(&jp_row, NULL, &buf, &buf_alloc, NULL)))
 		{
 			*error = zbx_strdup(*error, zbx_json_strerror());
 			goto clean2;
@@ -855,7 +891,7 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 
 				/* find the field requiring special preprocessing in JSON record */
 				f = 1;
-				while (NULL != (pf = zbx_json_next_value(&jp_row, pf, buf, sizeof(buf), &is_null)))
+				while (NULL != (pf = zbx_json_next_value_dyn(&jp_row, pf, &buf, &buf_alloc, &is_null)))
 				{
 					/* parse values for the entry (lines 10-12 in T1) */
 
@@ -926,8 +962,9 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 			zbx_vector_uint64_clear(del);
 		}
 
-		/* special preprocessing for 'hostmacro', 'items' and 'httptest' tables to eliminate conflicts */
-		/* in the 'hostid,macro', 'hostid,key_' and 'hostid,name' unique indices */
+		/* special preprocessing for 'globalmacro', 'hostmacro', 'items', 'drules', 'regexps' and 'httptest' */
+		/* tables to eliminate conflicts */
+		/* in the 'macro', 'hostid,macro', 'hostid,key_', 'name', 'name' and 'hostid,name' unique indices */
 		if (1 < moves.values_num)
 		{
 			sql_offset = 0;
@@ -966,7 +1003,7 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 		size_t	tmp_offset = sql_offset, last_pos = 0;
 
 		zbx_json_brackets_open(p, &jp_row);
-		pf = zbx_json_next_value(&jp_row, NULL, buf, sizeof(buf), NULL);
+		pf = zbx_json_next_value_dyn(&jp_row, NULL, &buf, &buf_alloc, NULL);
 
 		/* check whether we need to insert a new entry or update an existing one */
 		ZBX_STR2UINT64(recid, buf);
@@ -984,7 +1021,8 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 			zbx_vector_ptr_append(&values, value);
 
 			/* add the rest of fields */
-			for (f = 1; NULL != (pf = zbx_json_next_value(&jp_row, pf, buf, sizeof(buf), &is_null)); f++)
+			for (f = 1; NULL != (pf = zbx_json_next_value_dyn(&jp_row, pf, &buf, &buf_alloc, &is_null));
+					f++)
 			{
 				if (f == fields_count)
 				{
@@ -1076,7 +1114,8 @@ static int	process_proxyconfig_table(const ZBX_TABLE *table, struct zbx_json_par
 
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "update %s set ", table->table);
 
-			for (f = 1; NULL != (pf = zbx_json_next_value(&jp_row, pf, buf, sizeof(buf), &is_null)); f++)
+			for (f = 1; NULL != (pf = zbx_json_next_value_dyn(&jp_row, pf, &buf, &buf_alloc, &is_null));
+					f++)
 			{
 				int	field_differ = 1;
 
@@ -1175,6 +1214,8 @@ clean2:
 	zbx_free(sql);
 	zbx_free(recs);
 out:
+	zbx_free(buf);
+
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
 	return ret;
@@ -1186,8 +1227,6 @@ out:
  *                                                                            *
  * Purpose: update configuration                                              *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 void	process_proxyconfig(struct zbx_json_parse *jp_data)
 {
@@ -1305,8 +1344,6 @@ void	process_proxyconfig(struct zbx_json_parse *jp_data)
  * Return value:  SUCCEED - processed successfully                            *
  *                FAIL - an error occurred                                    *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 #define CHECK_ARRAY_SIZE(array, alloc, num)				\
 	if (num == alloc)						\
@@ -1466,8 +1503,6 @@ int	get_host_availability_data(struct zbx_json *j)
  *                                                                            *
  * Purpose: update proxy hosts availability                                   *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 void	process_host_availability(struct zbx_json_parse *jp)
 {
@@ -1642,8 +1677,6 @@ out:
  *                                                                            *
  * Function: proxy_get_lastid                                                 *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static void	proxy_get_lastid(const char *table_name, const char *lastidfield, zbx_uint64_t *lastid)
 {
@@ -1669,8 +1702,6 @@ static void	proxy_get_lastid(const char *table_name, const char *lastidfield, zb
  *                                                                            *
  * Function: proxy_set_lastid                                                 *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static void	proxy_set_lastid(const char *table_name, const char *lastidfield, const zbx_uint64_t lastid)
 {
@@ -1720,8 +1751,6 @@ void	proxy_set_areg_lastid(const zbx_uint64_t lastid)
  *                                                                            *
  * Purpose: Get history data from the database.                               *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static int	proxy_get_history_data_simple(struct zbx_json *j, const zbx_history_table_t *ht, zbx_uint64_t *lastid)
 {
@@ -1757,13 +1786,14 @@ try_again:
 		if (1 < *lastid - id)
 		{
 			/* At least one record is missing. It can happen if some DB syncer process has */
-			/* started but yet committed a transaction or a rollback occurred in a DB syncer. */
+			/* started but not yet committed a transaction or a rollback occurred in a DB syncer. */
 			if (0 < retries--)
 			{
 				DBfree_result(result);
-				zabbix_log(LOG_LEVEL_DEBUG, "%s() " ZBX_FS_UI64 " record(s) missing. Waiting %f sec,"
-						" retrying.", __function_name, *lastid - id - 1,
-						(double)t_sleep.tv_sec + (double)t_sleep.tv_nsec / 1.0e9);
+				zabbix_log(LOG_LEVEL_DEBUG, "%s() " ZBX_FS_UI64 " record(s) missing."
+						" Waiting " ZBX_FS_DBL " sec, retrying.",
+						__function_name, *lastid - id - 1,
+						t_sleep.tv_sec + t_sleep.tv_nsec / 1e9);
 				nanosleep(&t_sleep, &t_rem);
 				goto try_again;
 			}
@@ -1805,8 +1835,6 @@ try_again:
  * Purpose: Get history data from the database. Get items configuration from  *
  *          cache to speed things up.                                         *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static int	proxy_get_history_data(struct zbx_json *j, zbx_uint64_t *lastid)
 {
@@ -1865,13 +1893,14 @@ try_again:
 		if (1 < *lastid - id)
 		{
 			/* At least one record is missing. It can happen if some DB syncer process has */
-			/* started but yet committed a transaction or a rollback occurred in a DB syncer. */
+			/* started but not yet committed a transaction or a rollback occurred in a DB syncer. */
 			if (0 < retries--)
 			{
 				DBfree_result(result);
-				zabbix_log(LOG_LEVEL_DEBUG, "%s() " ZBX_FS_UI64 " record(s) missing. Waiting %f sec,"
-						" retrying.", __function_name, *lastid - id - 1,
-						(double)t_sleep.tv_sec + (double)t_sleep.tv_nsec / 1.0e9);
+				zabbix_log(LOG_LEVEL_DEBUG, "%s() " ZBX_FS_UI64 " record(s) missing."
+						" Waiting " ZBX_FS_DBL " sec, retrying.",
+						__function_name, *lastid - id - 1,
+						t_sleep.tv_sec + t_sleep.tv_nsec / 1e9);
 				nanosleep(&t_sleep, &t_rem);
 				goto try_again;
 			}
@@ -1922,7 +1951,7 @@ try_again:
 	}
 	DBfree_result(result);
 
-	dc_items = zbx_malloc(NULL, (sizeof(DC_ITEM) + sizeof(errcodes)) * data_num);
+	dc_items = zbx_malloc(NULL, (sizeof(DC_ITEM) + sizeof(int)) * data_num);
 	errcodes = (int *)(dc_items + data_num);
 
 	DCconfig_get_items_by_itemids(dc_items, itemids, errcodes, data_num);
@@ -1932,6 +1961,12 @@ try_again:
 		if (SUCCEED != errcodes[i])
 			continue;
 
+		if (ITEM_STATUS_ACTIVE != dc_items[i].status)
+			continue;
+
+		if (HOST_STATUS_MONITORED != dc_items[i].host.status)
+			continue;
+
 		zbx_json_addobject(j, NULL);
 
 		zbx_json_addstring(j, ZBX_PROTO_TAG_HOST, dc_items[i].host.host, ZBX_JSON_TYPE_STRING);
@@ -2064,8 +2099,6 @@ void	calc_timestamp(const char *line, int *timestamp, const char *format)
  *             values_num   - [IN] number of elements in array                *
  *             processed    - [OUT] number of processed elements              *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 void	process_mass_data(zbx_sock_t *sock, zbx_uint64_t proxy_hostid,
 		AGENT_VALUE *values, size_t values_num, int *processed)
@@ -2098,15 +2131,24 @@ void	process_mass_data(zbx_sock_t *sock, zbx_uint64_t proxy_hostid,
 		keys[i].key = values[i].key;
 	}
 
-	DCconfig_get_items_by_keys(items, proxy_hostid, keys, errcodes, values_num);
+	DCconfig_get_items_by_keys(items, keys, errcodes, values_num);
 
 	for (i = 0; i < values_num; i++)
 	{
 		if (SUCCEED != errcodes[i])
 			continue;
 
-		if (HOST_MAINTENANCE_STATUS_ON == items[i].host.maintenance_status &&
-				MAINTENANCE_TYPE_NODATA == items[i].host.maintenance_type &&
+		if (proxy_hostid != items[i].host.proxy_hostid)
+			continue;
+
+		if (ITEM_STATUS_ACTIVE != items[i].status)
+			continue;
+
+		if (HOST_STATUS_MONITORED != items[i].host.status)
+			continue;
+
+		if (SUCCEED == in_maintenance_without_data_collection(items[i].host.maintenance_status,
+				items[i].host.maintenance_type, items[i].type) &&
 				items[i].host.maintenance_from <= values[i].ts.sec)
 			continue;
 
@@ -2241,8 +2283,6 @@ static void	clean_agent_values(AGENT_VALUE *values, size_t values_num)
  * Return value:  SUCCEED - processed successfully                            *
  *                FAIL - an error occurred                                    *
  *                                                                            *
- * Author: Alexander Vladishev, Alexei Vladishev                              *
- *                                                                            *
  ******************************************************************************/
 int	process_hist_data(zbx_sock_t *sock, struct zbx_json_parse *jp,
 		const zbx_uint64_t proxy_hostid, char *info, int max_info_size)
@@ -2392,8 +2432,6 @@ int	process_hist_data(zbx_sock_t *sock, struct zbx_json_parse *jp,
  *                                                                            *
  * Purpose: update discovery data, received from proxy                        *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 void	process_dhis_data(struct zbx_json_parse *jp)
 {
@@ -2408,8 +2446,9 @@ void	process_dhis_data(struct zbx_json_parse *jp)
 	int			port, status, ret;
 	const char		*p = NULL;
 	char			last_ip[INTERFACE_IP_LEN_MAX], ip[INTERFACE_IP_LEN_MAX], key_[ITEM_KEY_LEN * 4 + 1],
-				tmp[MAX_STRING_LEN], value[DSERVICE_VALUE_LEN_MAX], dns[INTERFACE_DNS_LEN_MAX];
+				tmp[MAX_STRING_LEN], *value = NULL, dns[INTERFACE_DNS_LEN_MAX];
 	time_t			now, hosttime, itemtime;
+	size_t			value_alloc = 128;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
@@ -2426,6 +2465,8 @@ void	process_dhis_data(struct zbx_json_parse *jp)
 	memset(&drule, 0, sizeof(drule));
 	*last_ip = '\0';
 
+	value = zbx_malloc(value, value_alloc);
+
 	while (NULL != (p = zbx_json_next(&jp_data, p)))
 	{
 		if (FAIL == (ret = zbx_json_brackets_open(p, &jp_row)))
@@ -2465,7 +2506,7 @@ void	process_dhis_data(struct zbx_json_parse *jp)
 			port = atoi(tmp);
 
 		zbx_json_value_by_name(&jp_row, ZBX_PROTO_TAG_KEY, key_, sizeof(key_));
-		zbx_json_value_by_name(&jp_row, ZBX_PROTO_TAG_VALUE, value, sizeof(value));
+		zbx_json_value_by_name_dyn(&jp_row, ZBX_PROTO_TAG_VALUE, &value, &value_alloc);
 		zbx_json_value_by_name(&jp_row, ZBX_PROTO_TAG_DNS, dns, sizeof(dns));
 
 		if (SUCCEED == zbx_json_value_by_name(&jp_row, ZBX_PROTO_TAG_STATUS, tmp, sizeof(tmp)))
@@ -2511,6 +2552,8 @@ void	process_dhis_data(struct zbx_json_parse *jp)
 json_parse_error:
 		zabbix_log(LOG_LEVEL_WARNING, "invalid discovery data: %s", zbx_json_strerror());
 	}
+
+	zbx_free(value);
 exit:
 	if (SUCCEED != ret)
 		zabbix_log(LOG_LEVEL_WARNING, "invalid discovery data: %s", zbx_json_strerror());
@@ -2524,8 +2567,6 @@ exit:
  *                                                                            *
  * Purpose: update auto-registration data, received from proxy                *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 void	process_areg_data(struct zbx_json_parse *jp, zbx_uint64_t proxy_hostid)
 {
diff --git a/src/libs/zbxdbupgrade/dbupgrade.c b/src/libs/zbxdbupgrade/dbupgrade.c
index 1a82f8f9e35..6b6fac2637e 100644
--- a/src/libs/zbxdbupgrade/dbupgrade.c
+++ b/src/libs/zbxdbupgrade/dbupgrade.c
@@ -660,14 +660,13 @@ int	DBcheck_version(void)
 {
 	const char		*__function_name = "DBcheck_version";
 	const char		*dbversion_table_name = "dbversion";
-	int			db_mandatory, db_optional, required, ret = FAIL, i, total = 0;
+	int			db_mandatory, db_optional, required, ret = FAIL, i;
 	zbx_db_version_t	*dbversion;
 	zbx_dbpatch_t		*patches;
 
 #ifndef HAVE_SQLITE3
-	int			current = 0, completed, last_completed = -1;
+	int			total = 0, current = 0, completed, last_completed = -1, optional_num = 0;
 #endif
-
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	required = ZBX_FIRST_DB_VERSION;
@@ -707,22 +706,29 @@ int	DBcheck_version(void)
 				" Current database version (mandatory/optional): UNKNOWN."
 				" Required mandatory version: %08d.",
 				ZBX_DAEMON_TYPE_SERVER == daemon_type ? "server" : "proxy", required);
+		zabbix_log(LOG_LEVEL_CRIT, "Zabbix does not support SQLite3 database upgrade.");
+
 		goto out;
 #endif
 	}
 
 	DBget_version(&db_mandatory, &db_optional);
 
+#ifndef HAVE_SQLITE3
 	for (dbversion = dbversions; NULL != (patches = dbversion->patches); dbversion++)
 	{
 		for (i = 0; 0 != patches[i].version; i++)
 		{
+			if (0 != patches[i].mandatory)
+				optional_num = 0;
+			else
+				optional_num++;
+
 			if (db_optional < patches[i].version)
 				total++;
 		}
 	}
 
-#ifndef HAVE_SQLITE3
 	if (required < db_mandatory)
 #else
 	if (required != db_mandatory)
@@ -733,6 +739,10 @@ int	DBcheck_version(void)
 				" Required mandatory version: %08d.",
 				ZBX_DAEMON_TYPE_SERVER == daemon_type ? "server" : "proxy",
 				db_mandatory, db_optional, required);
+#ifdef HAVE_SQLITE3
+		if (required > db_mandatory)
+			zabbix_log(LOG_LEVEL_CRIT, "Zabbix does not support SQLite3 database upgrade.");
+#endif
 		goto out;
 	}
 
@@ -746,6 +756,9 @@ int	DBcheck_version(void)
 	if (0 == total)
 		goto out;
 
+	if (0 != optional_num)
+		zabbix_log(LOG_LEVEL_INFORMATION, "optional patches were found");
+
 	zabbix_log(LOG_LEVEL_WARNING, "starting automatic database upgrade");
 
 	for (dbversion = dbversions; NULL != dbversion->patches; dbversion++)
diff --git a/src/libs/zbxdbupgrade/dbupgrade_2030.c b/src/libs/zbxdbupgrade/dbupgrade_2030.c
index ac4483264cc..9aaae2bf7f1 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_2030.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_2030.c
@@ -870,6 +870,349 @@ static int	DBpatch_2030091(void)
 
 	return DBcreate_index("valuemaps", "valuemaps_1", "name", 1);
 }
+
+static int	DBpatch_2030092(void)
+{
+	const ZBX_FIELD field = {"timeout", "15", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBset_default("httpstep", &field);
+}
+
+static int	DBpatch_2030093(void)
+{
+	const ZBX_FIELD	field = {"error", "", NULL, NULL, 2048, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+	return DBmodify_field_type("items", &field);
+}
+
+static int	DBpatch_2030094(void)
+{
+	DB_RESULT	result;
+	DB_ROW		row;
+	int		ret = SUCCEED;
+	char		*p, *expr = NULL, *expr_esc;
+	size_t		expr_alloc = 0, expr_offset;
+
+	result = DBselect("select triggerid,expression from triggers");
+
+	while (SUCCEED == ret && NULL != (row = DBfetch(result)))
+	{
+		expr_offset = 0;
+
+		for (p = row[1]; '\0' != *p; p++)
+		{
+			if (NULL == strchr("#&|", *p))
+			{
+				if (' ' != *p || (0 != expr_offset && ' ' != expr[expr_offset - 1]))
+					zbx_chrcpy_alloc(&expr, &expr_alloc, &expr_offset, *p);
+
+				continue;
+			}
+
+			if (('&' == *p || '|' == *p) && 0 != expr_offset && ' ' != expr[expr_offset - 1])
+				zbx_chrcpy_alloc(&expr, &expr_alloc, &expr_offset, ' ');
+
+			switch (*p)
+			{
+				case '#':
+					zbx_strcpy_alloc(&expr, &expr_alloc, &expr_offset, "<>");
+					break;
+				case '&':
+					zbx_strcpy_alloc(&expr, &expr_alloc, &expr_offset, "and");
+					break;
+				case '|':
+					zbx_strcpy_alloc(&expr, &expr_alloc, &expr_offset, "or");
+					break;
+			}
+
+			if (('&' == *p || '|' == *p) && ' ' != *(p + 1))
+				zbx_chrcpy_alloc(&expr, &expr_alloc, &expr_offset, ' ');
+		}
+
+		if (2048 < expr_offset && 2048 /* TRIGGER_EXPRESSION_LEN */ < zbx_strlen_utf8(expr))
+		{
+			zabbix_log(LOG_LEVEL_WARNING, "cannot convert trigger expression \"%s\":"
+					" resulting expression is too long", row[1]);
+		}
+		else if (0 != strcmp(row[1], expr))
+		{
+			expr_esc = DBdyn_escape_string(expr);
+
+			if (ZBX_DB_OK > DBexecute("update triggers set expression='%s' where triggerid=%s",
+					expr_esc, row[0]))
+			{
+				ret = FAIL;
+			}
+
+			zbx_free(expr_esc);
+		}
+	}
+	DBfree_result(result);
+
+	zbx_free(expr);
+
+	return ret;
+}
+
+static int	DBpatch_2030095(void)
+{
+	DB_RESULT	result;
+	DB_ROW		row;
+	int		ret = SUCCEED;
+	char		*p, *q, *params = NULL, *params_esc;
+	size_t		params_alloc = 0, params_offset;
+
+	result = DBselect("select itemid,params from items where type=%d", 15 /* ITEM_TYPE_CALCULATED */);
+
+	while (SUCCEED == ret && NULL != (row = DBfetch(result)))
+	{
+		params_offset = 0;
+
+		for (p = row[1]; '\0' != *p; p++)
+		{
+			if (NULL != strchr(ZBX_WHITESPACE, *p))
+			{
+				if (' ' != *p || (0 != params_offset &&
+						NULL == strchr(ZBX_WHITESPACE, params[params_offset - 1])))
+				{
+					zbx_chrcpy_alloc(&params, &params_alloc, &params_offset, *p);
+				}
+
+				continue;
+			}
+
+			if (NULL != strchr("#&|", *p))
+			{
+				if (('&' == *p || '|' == *p) && 0 != params_offset &&
+						NULL == strchr(ZBX_WHITESPACE, params[params_offset - 1]))
+				{
+					zbx_chrcpy_alloc(&params, &params_alloc, &params_offset, ' ');
+				}
+
+				switch (*p)
+				{
+					case '#':
+						zbx_strcpy_alloc(&params, &params_alloc, &params_offset, "<>");
+						break;
+					case '&':
+						zbx_strcpy_alloc(&params, &params_alloc, &params_offset, "and");
+						break;
+					case '|':
+						zbx_strcpy_alloc(&params, &params_alloc, &params_offset, "or");
+						break;
+				}
+
+				if (('&' == *p || '|' == *p) && NULL == strchr(ZBX_WHITESPACE, *(p + 1)))
+					zbx_chrcpy_alloc(&params, &params_alloc, &params_offset, ' ');
+
+				continue;
+			}
+
+			q = p;
+
+			if (SUCCEED == parse_function(&q, NULL, NULL))
+			{
+				zbx_strncpy_alloc(&params, &params_alloc, &params_offset, p, q - p);
+				p = q - 1;
+				continue;
+			}
+
+			zbx_chrcpy_alloc(&params, &params_alloc, &params_offset, *p);
+		}
+
+#if defined(HAVE_IBM_DB2) || defined(HAVE_ORACLE)
+		if (2048 < params_offset && 2048 /* ITEM_PARAM_LEN */ < zbx_strlen_utf8(params))
+#else
+		if (65535 < params_offset && 65535 /* ITEM_PARAM_LEN */ < zbx_strlen_utf8(params))
+#endif
+		{
+			zabbix_log(LOG_LEVEL_WARNING, "cannot convert calculated item expression \"%s\":"
+					" resulting expression is too long", row[1]);
+		}
+		else if (0 != strcmp(row[1], params))
+		{
+			params_esc = DBdyn_escape_string(params);
+
+			if (ZBX_DB_OK > DBexecute("update items set params='%s' where itemid=%s", params_esc, row[0]))
+				ret = FAIL;
+
+			zbx_free(params_esc);
+		}
+	}
+	DBfree_result(result);
+
+	zbx_free(params);
+
+	return ret;
+}
+
+static int	DBpatch_2030096(void)
+{
+	const ZBX_FIELD	field = {"ssl_cert_file", "", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httptest", &field);
+}
+
+static int	DBpatch_2030097(void)
+{
+	const ZBX_FIELD	field = {"ssl_key_file", "", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httptest", &field);
+}
+
+static int	DBpatch_2030098(void)
+{
+	const ZBX_FIELD	field = {"ssl_key_password", "", NULL, NULL, 64, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httptest", &field);
+}
+
+static int	DBpatch_2030099(void)
+{
+	const ZBX_FIELD	field = {"verify_peer", "0", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httptest", &field);
+}
+
+static int	DBpatch_2030100(void)
+{
+	const ZBX_FIELD	field = {"verify_host", "0", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httptest", &field);
+}
+
+static int	DBpatch_2030101(void)
+{
+	const ZBX_FIELD	field = {"headers", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httptest", &field);
+}
+
+static int	DBpatch_2030102(void)
+{
+	const ZBX_FIELD field = {"url", "", NULL, NULL, 2048, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+	return DBmodify_field_type("httpstep", &field);
+}
+
+static int	DBpatch_2030103(void)
+{
+	const ZBX_FIELD	field = {"follow_redirects", "1", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httpstep", &field);
+}
+
+static int	DBpatch_2030104(void)
+{
+	const ZBX_FIELD	field = {"retrieve_mode", "0", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httpstep", &field);
+}
+
+static int	DBpatch_2030105(void)
+{
+	const ZBX_FIELD	field = {"headers", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0};
+
+	return DBadd_field("httpstep", &field);
+}
+
+static int	DBpatch_2030106(void)
+{
+	const ZBX_FIELD field = {"colspan", "1", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBset_default("screens_items", &field);
+}
+
+static int	DBpatch_2030107(void)
+{
+	const ZBX_FIELD field = {"rowspan", "1", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBset_default("screens_items", &field);
+}
+
+static int	DBpatch_2030108(void)
+{
+	if (ZBX_DB_OK <= DBexecute("update screens_items set colspan=1 where colspan=0"))
+		return SUCCEED;
+
+	return FAIL;
+}
+
+static int	DBpatch_2030109(void)
+{
+	if (ZBX_DB_OK <= DBexecute("update screens_items set rowspan=1 where rowspan=0"))
+		return SUCCEED;
+
+	return FAIL;
+}
+
+static int	DBpatch_2030110(void)
+{
+	if (ZBX_DB_OK > DBexecute("delete from profiles where idx='web.view.application'"))
+		return FAIL;
+
+	return SUCCEED;
+}
+
+static int	DBpatch_2030111(void)
+{
+	const ZBX_FIELD	field = {"bulk", "1", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBadd_field("interface", &field);
+}
+
+static int	DBpatch_2030112(void)
+{
+	const ZBX_FIELD	field = {"formula", "", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+	return DBadd_field("actions", &field);
+}
+
+static int	DBpatch_2030113(void)
+{
+	if (ZBX_DB_OK > DBexecute("delete from profiles where idx in ('web.latest.php.sort', 'web.httpmon.php.sort')"))
+		return FAIL;
+
+	return SUCCEED;
+}
+
+static int	DBpatch_2030114(void)
+{
+	if (ZBX_DB_OK > DBexecute("delete from profiles where idx='web.httpconf.php.sort' and value_str='h.hostid'"))
+		return FAIL;
+
+	return SUCCEED;
+}
+
+static int	DBpatch_2030115(void)
+{
+	if (ZBX_DB_OK > DBexecute("delete from profiles where idx='web.hostinventories.php.sort ' and value_str='hostid'"))
+		return FAIL;
+
+	return SUCCEED;
+}
+
+static int	DBpatch_2030116(void)
+{
+	const ZBX_FIELD	field = {"host", "", NULL, NULL, 128, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+	return DBmodify_field_type("hosts", &field);
+}
+
+static int	DBpatch_2030117(void)
+{
+	const ZBX_FIELD	field = {"name", "", NULL, NULL, 128, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+	return DBmodify_field_type("hosts", &field);
+}
+
+static int	DBpatch_2030118(void)
+{
+	const ZBX_FIELD	field = {"max_columns", "3", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+	return DBadd_field("screens_items", &field);
+}
+
 #endif
 
 DBPATCH_START(2030)
@@ -967,5 +1310,32 @@ DBPATCH_ADD(2030088, 0, 1)
 DBPATCH_ADD(2030089, 0, 1)
 DBPATCH_ADD(2030090, 0, 1)
 DBPATCH_ADD(2030091, 0, 1)
+DBPATCH_ADD(2030092, 0, 1)
+DBPATCH_ADD(2030093, 0, 1)
+DBPATCH_ADD(2030094, 0, 1)
+DBPATCH_ADD(2030095, 0, 1)
+DBPATCH_ADD(2030096, 0, 1)
+DBPATCH_ADD(2030097, 0, 1)
+DBPATCH_ADD(2030098, 0, 1)
+DBPATCH_ADD(2030099, 0, 1)
+DBPATCH_ADD(2030100, 0, 1)
+DBPATCH_ADD(2030101, 0, 1)
+DBPATCH_ADD(2030102, 0, 1)
+DBPATCH_ADD(2030103, 0, 1)
+DBPATCH_ADD(2030104, 0, 1)
+DBPATCH_ADD(2030105, 0, 1)
+DBPATCH_ADD(2030106, 0, 1)
+DBPATCH_ADD(2030107, 0, 1)
+DBPATCH_ADD(2030108, 0, 1)
+DBPATCH_ADD(2030109, 0, 1)
+DBPATCH_ADD(2030110, 0, 0)
+DBPATCH_ADD(2030111, 0, 1)
+DBPATCH_ADD(2030112, 0, 1)
+DBPATCH_ADD(2030113, 0, 0)
+DBPATCH_ADD(2030114, 0, 0)
+DBPATCH_ADD(2030115, 0, 0)
+DBPATCH_ADD(2030116, 0, 1)
+DBPATCH_ADD(2030117, 0, 1)
+DBPATCH_ADD(2030118, 0, 1)
 
 DBPATCH_END()
diff --git a/src/libs/zbxexec/execute.c b/src/libs/zbxexec/execute.c
index 5b58084dd16..dff4729976d 100644
--- a/src/libs/zbxexec/execute.c
+++ b/src/libs/zbxexec/execute.c
@@ -162,6 +162,7 @@ static int	zbx_popen(pid_t *pid, const char *command)
 	/* child process */
 	close(fd[0]);
 	dup2(fd[1], STDOUT_FILENO);
+	dup2(fd[1], STDERR_FILENO);
 	close(fd[1]);
 
 	/* set the child as the process group leader, otherwise orphans may be left after timeout */
@@ -169,7 +170,7 @@ static int	zbx_popen(pid_t *pid, const char *command)
 	{
 		zabbix_log(LOG_LEVEL_ERR, "%s(): failed to create a process group: %s",
 				__function_name, zbx_strerror(errno));
-		exit(0);
+		exit(EXIT_SUCCESS);
 	}
 
 	zabbix_log(LOG_LEVEL_DEBUG, "%s(): executing script", __function_name);
@@ -178,7 +179,7 @@ static int	zbx_popen(pid_t *pid, const char *command)
 
 	/* execl() returns only when an error occurs */
 	zabbix_log(LOG_LEVEL_WARNING, "execl() failed for [%s]: %s", command, zbx_strerror(errno));
-	exit(0);
+	exit(EXIT_SUCCESS);
 }
 
 /******************************************************************************
@@ -261,19 +262,19 @@ exit:
  ******************************************************************************/
 int	zbx_execute(const char *command, char **buffer, char *error, size_t max_error_len, int timeout)
 {
-	size_t					buf_size = PIPE_BUFFER_SIZE, offset = 0;
-	int					ret = FAIL;
+	size_t			buf_size = PIPE_BUFFER_SIZE, offset = 0;
+	int			ret = FAIL;
 #ifdef _WINDOWS
-	STARTUPINFO				si;
-	PROCESS_INFORMATION			pi;
-	SECURITY_ATTRIBUTES			sa;
-	HANDLE					job = NULL, hWrite = NULL, hRead = NULL;
-	char					*cmd = NULL;
-	LPTSTR					wcmd = NULL;
-	struct _timeb				start_time, current_time;
+	STARTUPINFO		si;
+	PROCESS_INFORMATION	pi;
+	SECURITY_ATTRIBUTES	sa;
+	HANDLE			job = NULL, hWrite = NULL, hRead = NULL;
+	char			*cmd = NULL;
+	wchar_t			*wcmd = NULL;
+	struct _timeb		start_time, current_time;
 #else
-	pid_t					pid;
-	int					fd;
+	pid_t			pid;
+	int			fd;
 #endif
 
 	*error = '\0';
@@ -436,7 +437,7 @@ close:
 #endif	/* _WINDOWS */
 
 	if (TIMEOUT_ERROR == ret)
-		zbx_strlcpy(error, "timeout while executing a shell script", max_error_len);
+		zbx_strlcpy(error, "Timeout while executing a shell script.", max_error_len);
 	else if ('\0' != *error)
 		zabbix_log(LOG_LEVEL_WARNING, "%s", error);
 
@@ -466,7 +467,7 @@ int	zbx_execute_nowait(const char *command)
 	char			*full_command;
 	STARTUPINFO		si;
 	PROCESS_INFORMATION	pi;
-	LPTSTR			wcommand;
+	wchar_t			*wcommand;
 
 	full_command = zbx_dsprintf(NULL, "cmd /C \"%s\"", command);
 	wcommand = zbx_utf8_to_unicode(full_command);
@@ -551,6 +552,6 @@ int	zbx_execute_nowait(const char *command)
 	}
 
 	/* always exit, parent has already returned */
-	exit(0);
+	exit(EXIT_SUCCESS);
 #endif
 }
diff --git a/src/libs/zbxjson/json.c b/src/libs/zbxjson/json.c
index 6215e97db2e..c8422cde6a6 100644
--- a/src/libs/zbxjson/json.c
+++ b/src/libs/zbxjson/json.c
@@ -38,18 +38,17 @@ static char	zbx_json_strerror_message[ZBX_JSON_MAX_STRERROR];
 
 const char	*zbx_json_strerror(void)
 {
-	zbx_json_strerror_message[ZBX_JSON_MAX_STRERROR - 1] = '\0'; /* force terminate string */
-	return (&zbx_json_strerror_message[0]);
+	return zbx_json_strerror_message;
 }
 
 #ifdef HAVE___VA_ARGS__
 #	define zbx_set_json_strerror(fmt, ...) __zbx_zbx_set_json_strerror(ZBX_CONST_STRING(fmt), ##__VA_ARGS__)
 #else
 #	define zbx_set_json_strerror __zbx_zbx_set_json_strerror
-#endif /* HAVE___VA_ARGS__ */
+#endif
 static void	__zbx_zbx_set_json_strerror(const char *fmt, ...)
 {
-	va_list args;
+	va_list	args;
 
 	va_start(args, fmt);
 
@@ -553,166 +552,158 @@ const char	*zbx_json_next(const struct zbx_json_parse *jp, const char *p)
 	return NULL;
 }
 
-static size_t	zbx_json_string_size(const char *p)
-{
-	int	state = 0;	/* 0 - init; 1 - inside string */
-	size_t	sz = 0;
-
-	if ('"' != *p)
-		return (size_t)(-1);
-
-	while ('\0' != *p)	/* this should never happen */
-	{
-		if (*p == '"')
-		{
-			if (state == 1)
-				return sz;
-			state = 1;
-		}
-		else if (state == 1)
-		{
-			if (*p == '\\' && 'u' == *++p)
-				p += 4;
-			sz++;
-		}
-		p++;
-	}
-
-	return (size_t)(-1);
-}
-
-static const char	*zbx_json_decodestring(const char *p, char *string, size_t len)
+static const char	*zbx_json_decodenull(const char *p)
 {
-	int	state = 0; /* 0 - init; 1 - inside string */
-	char	*o = string;
-	u_char	c;
-
-	if ('"' != *p)
-		return NULL;
-
-	while ('\0' != *p)	/* this should never happen */
-	{
-		if (*p == '"')
-		{
-			if (state == 1)
-			{
-				*o = '\0';
-				return ++p;
-			}
-			state = 1;
-		}
-		else if (state == 1 && (size_t)(o - string) < len - 1/*'\0'*/)
-		{
-			if (*p == '\\')
-			{
-				switch (*++p)
-				{
-					case 'b':
-						*o++ = '\b';
-						break;
-					case 'f':
-						*o++ = '\f';
-						break;
-					case 'n':
-						*o++ = '\n';
-						break;
-					case 'r':
-						*o++ = '\r';
-						break;
-					case 't':
-						*o++ = '\t';
-						break;
-					case 'u':
-						p += 3; /* "u00" */
-						c = zbx_hex2num(*p++) << 4;
-						c += zbx_hex2num(*p);
-						*o++ = (char)c;
-						break;
-					default:
-						*o++ = *p;
-				}
-			}
-			else
-				*o++ = *p;
-		}
-
-		p++;
-	}
+	if ('n' == p[0] && 'u' == p[1] && 'l' == p[2] && 'l' == p[3])
+		return p + 4;
 
 	return NULL;
 }
 
-static size_t	zbx_json_int_size(const char *p)
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_json_decode_character                                        *
+ *                                                                            *
+ * Purpose: decodes escape character                                          *
+ *                                                                            *
+ * Parameters: p - [IN/OUT] a pointer to the next character in string         *
+ *                                                                            *
+ * Return value: 0 - invalid escape character                                 *
+ *               !0 - the escaped character                                   *
+ *                                                                            *
+ ******************************************************************************/
+static char	zbx_json_decode_character(const char **p)
 {
-	size_t	sz = 0;
+	char	out;
 
-	while (*p != '\0')	/* this should never happen */
+	switch (*(++*p))
 	{
-		if ((*p < '0' || *p > '9') && *p != '-')
-			return sz;
-		else
-			sz++;
-		p++;
+		case '"':
+			out = '"';
+			break;
+		case '\\':
+			out = '\\';
+			break;
+		case '/':
+			out = '/';
+			break;
+		case 'b':
+			out = '\b';
+			break;
+		case 'f':
+			out = '\f';
+			break;
+		case 'n':
+			out = '\n';
+			break;
+		case 'r':
+			out = '\r';
+			break;
+		case 't':
+			out = '\t';
+			break;
+		case 'u':
+			*p += 3; /* "u00" */
+			out = zbx_hex2num(**p) << 4;
+			out += zbx_hex2num(*(++*p));
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+			return '\0';
 	}
 
-	return (size_t)(-1);
+	++*p;
+
+	return out;
 }
 
-static const char	*zbx_json_decodeint(const char *p, char *string, size_t len)
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_json_copy_string                                             *
+ *                                                                            *
+ * Purpose: copies json name/string value by omitting leading/trailing " and  *
+ *          converting escape sequences                                       *
+ *                                                                            *
+ * Parameters: p     - [IN] a pointer to the next character in string         *
+ *             out   - [OUT] the output buffer                                *
+ *             size  - [IN] the output buffer size                            *
+ *                                                                            *
+ * Return value: A pointer to the next character in input string or NULL if   *
+ *               string copying failed.                                       *
+ *                                                                            *
+ ******************************************************************************/
+static const char	*zbx_json_copy_string(const char *p, char *out, size_t size)
 {
-	char	*o = string;
+	char	*start = out;
+
+	p++;
 
-	while ('\0' != *p)	/* this should never happen */
+	while ('\0' != *p && out - start < size - 1)
 	{
-		if ((*p < '0' || *p > '9') && *p != '-')
-		{
-			*o = '\0';
-			return p;
-		}
-		else if ((size_t)(o - string) < len - 1/*'\0'*/)
+		switch (*p)
 		{
-			*o++ = *p;
+			case '\\':
+				if ('\0' != (*out = zbx_json_decode_character(&p)))
+					out++;
+				break;
+			case '"':
+				*out = '\0';
+				return ++p;
+			default:
+				*out++ = *p++;
 		}
-
-		p++;
 	}
 
 	return NULL;
 }
 
-static const char	*zbx_json_decodenull(const char *p)
-{
-	if ('n' == p[0] && 'u' == p[1] && 'l' == p[2] && 'l' == p[3])
-		return p + 4;
-
-	return NULL;
-}
-
-static size_t	zbx_json_value_size(const char *p, zbx_json_type_t jt)
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_json_copy_value                                              *
+ *                                                                            *
+ * Purpose: copies json value                                                 *
+ *                                                                            *
+ * Parameters: p     - [IN] a pointer to the next character in string         *
+ *             len   - [IN] the value length                                  *
+ *             out   - [OUT] the output buffer                                *
+ *             size  - [IN] the output buffer size                            *
+ *                                                                            *
+ * Return value: A pointer to the next character in input string or NULL if   *
+ *               string copying failed.                                       *
+ *                                                                            *
+ * Comments: String values are converted (leading/trailing " dropped and      *
+ *           escape sequences translated) while other values are simply       *
+ *           copied.                                                          *
+ *                                                                            *
+ ******************************************************************************/
+static const char	*zbx_json_copy_value(const char *p, size_t len, char *out, size_t size)
 {
-	switch (jt)
+	if (ZBX_JSON_TYPE_STRING == __zbx_json_type(p))
 	{
-		case ZBX_JSON_TYPE_STRING:
-			return zbx_json_string_size(p);
-		case ZBX_JSON_TYPE_INT:
-			return zbx_json_int_size(p);
-		default:
-			return (size_t)(-1);
+		if (NULL == zbx_json_copy_string(p, out, size))
+			return NULL;
 	}
+	else
+		zbx_strlcpy(out, p, MIN(size, len + 1));
+
+	return p + len;
 }
 
-static const char	*zbx_json_decodevalue(const char *p, char *string, size_t len, int *is_null)
+static const char	*zbx_json_decodevalue(const char *p, char *string, size_t size, int *is_null)
 {
+	size_t	len;
+
 	switch (__zbx_json_type(p))
 	{
 		case ZBX_JSON_TYPE_STRING:
-			if (NULL != is_null)
-				*is_null = 0;
-			return zbx_json_decodestring(p, string, len);
 		case ZBX_JSON_TYPE_INT:
 			if (NULL != is_null)
 				*is_null = 0;
-			return zbx_json_decodeint(p, string, len);
+
+			if (0 == (len = json_parse_value(p, NULL)))
+				return NULL;
+
+			return zbx_json_copy_value(p, len, string, size);
 		case ZBX_JSON_TYPE_NULL:
 			if (NULL != is_null)
 				*is_null = 1;
@@ -723,28 +714,40 @@ static const char	*zbx_json_decodevalue(const char *p, char *string, size_t len,
 	}
 }
 
-static const char	*zbx_json_decodevalue_dyn(const char *p, char **string, size_t *string_alloc)
+static const char	*zbx_json_decodevalue_dyn(const char *p, char **string, size_t *string_alloc, int *is_null)
 {
-	zbx_json_type_t	jt;
-	size_t		sz;
-
-	jt = __zbx_json_type(p);
-
-	if ((size_t)(-1) == (sz = zbx_json_value_size(p, jt)))
-		return NULL;
+	size_t	len;
 
-	if (*string_alloc <= sz)
-	{
-		*string_alloc = sz + 1;
-		*string = zbx_realloc(*string, *string_alloc);
-	}
-
-	switch (jt)
+	switch (__zbx_json_type(p))
 	{
 		case ZBX_JSON_TYPE_STRING:
-			return zbx_json_decodestring(p, *string, *string_alloc);
 		case ZBX_JSON_TYPE_INT:
-			return zbx_json_decodeint(p, *string, *string_alloc);
+			if (NULL != is_null)
+				*is_null = 0;
+
+			if (0 == (len = json_parse_value(p, NULL)))
+				return NULL;
+
+			if (*string_alloc <= len)
+			{
+				*string_alloc = len + 1;
+				*string = zbx_realloc(*string, *string_alloc);
+			}
+
+			return zbx_json_copy_value(p, len, *string, *string_alloc);
+		case ZBX_JSON_TYPE_NULL:
+			if (NULL != is_null)
+				*is_null = 1;
+
+			if (*string_alloc < 1)
+			{
+				*string_alloc = 1;
+				*string = zbx_realloc(*string, *string_alloc);
+			}
+
+			**string = '\0';
+
+			return zbx_json_decodenull(p);
 		default:
 			return NULL;
 	}
@@ -758,7 +761,7 @@ const char	*zbx_json_pair_next(const struct zbx_json_parse *jp, const char *p, c
 	if (ZBX_JSON_TYPE_STRING != __zbx_json_type(p))
 		return NULL;
 
-	if (NULL == (p = zbx_json_decodestring(p, name, len)))
+	if (NULL == (p = zbx_json_copy_string(p, name, len)))
 		return NULL;
 
 	SKIP_WHITESPACE(p);
@@ -815,6 +818,20 @@ const char	*zbx_json_next_value(const struct zbx_json_parse *jp, const char *p,
 
 /******************************************************************************
  *                                                                            *
+ * Function: zbx_json_next_value_dyn                                          *
+ *                                                                            *
+ ******************************************************************************/
+const char	*zbx_json_next_value_dyn(const struct zbx_json_parse *jp, const char *p, char **string,
+		size_t *string_alloc, int *is_null)
+{
+	if (NULL == (p = zbx_json_next(jp, p)))
+		return NULL;
+
+	return zbx_json_decodevalue_dyn(p, string, string_alloc, is_null);
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: zbx_json_value_by_name                                           *
  *                                                                            *
  * Purpose: return value by pair name                                         *
@@ -855,7 +872,7 @@ int	zbx_json_value_by_name_dyn(const struct zbx_json_parse *jp, const char *name
 	if (NULL == (p = zbx_json_pair_by_name(jp, name)))
 		return FAIL;
 
-	if (NULL == zbx_json_decodevalue_dyn(p, string, string_alloc))
+	if (NULL == zbx_json_decodevalue_dyn(p, string, string_alloc, NULL))
 		return FAIL;
 
 	return SUCCEED;
@@ -943,4 +960,3 @@ int	zbx_json_count(const struct zbx_json_parse *jp)
 
 	return num;
 }
-
diff --git a/src/libs/zbxjson/json_parser.c b/src/libs/zbxjson/json_parser.c
index 05533bd6761..92997d357b7 100644
--- a/src/libs/zbxjson/json_parser.c
+++ b/src/libs/zbxjson/json_parser.c
@@ -24,7 +24,6 @@
 
 #include "log.h"
 
-static int	json_parse_value(const char *start, char **error);
 static int	json_parse_object(const char *start, char **error);
 
 /******************************************************************************
@@ -43,18 +42,14 @@ static int	json_parse_object(const char *start, char **error);
  * Author: Andris Zeila                                                       *
  *                                                                            *
  ******************************************************************************/
-static int	json_error(const char *message, const char* json_buffer, char** error)
+static int	json_error(const char *message, const char *json_buffer, char **error)
 {
-	size_t	size = 1024, offset = 0;
-
 	if (NULL != error)
 	{
-		*error = zbx_malloc(*error, size);
-
 		if (NULL != json_buffer)
-			zbx_snprintf_alloc(error, &size, &offset, "%s at: '%s'", message, json_buffer);
+			*error = zbx_dsprintf(*error, "%s at: '%s'", message, json_buffer);
 		else
-			zbx_snprintf_alloc(error, &size, &offset, "%s", message);
+			*error = zbx_strdup(*error, message);
 	}
 
 	return 0;
@@ -69,7 +64,7 @@ static int	json_error(const char *message, const char* json_buffer, char** error
  * Parameters: start - [IN] the JSON data without leading whitespace          *
  *             error - [OUT] the parsing error message (can be NULL)          *
  *                                                                            *
- * Return value: the number of characters parsed. On error 0 is returned and  *
+ * Return value: The number of characters parsed. On error 0 is returned and  *
  *               error parameter (if not NULL) contains allocated error       *
  *               message.                                                     *
  *                                                                            *
@@ -131,7 +126,7 @@ static int	json_parse_string(const char *start, char **error)
  * Parameters: start - [IN] the JSON data without leading whitespace          *
  *             error - [OUT] the parsing error message (can be NULL)          *
  *                                                                            *
- * Return value: the number of characters parsed. On error 0 is returned and  *
+ * Return value: The number of characters parsed. On error 0 is returned and  *
  *               error parameter (if not NULL) contains allocated error       *
  *               message.                                                     *
  *                                                                            *
@@ -180,7 +175,7 @@ static int	json_parse_array(const char *start, char **error)
  * Parameters: start - [IN] the JSON data without leading whitespace          *
  *             error - [OUT] the parsing error message (can be NULL)          *
  *                                                                            *
- * Return value: the number of characters parsed. On error 0 is returned and  *
+ * Return value: The number of characters parsed. On error 0 is returned and  *
  *               error parameter (if not NULL) contains allocated error       *
  *               message.                                                     *
  *                                                                            *
@@ -256,7 +251,7 @@ static int	json_parse_number(const char *start, char **error)
  *             text  - [IN] the literal value to parse                        *
  *             error - [OUT] the parsing error message (can be NULL)          *
  *                                                                            *
- * Return value: the number of characters parsed. On error 0 is returned and  *
+ * Return value: The number of characters parsed. On error 0 is returned and  *
  *               error parameter (if not NULL) contains allocated error       *
  *               message.                                                     *
  *                                                                            *
@@ -287,21 +282,20 @@ static int	json_parse_literal(const char *start, const char *text, char **error)
  *                                                                            *
  * Purpose: Parses JSON object value                                          *
  *                                                                            *
- * Parameters: start - [IN/OUT] the JSON data; returns the reference the real *
- *                     data (without spaces)                                  *
+ * Parameters: start - [IN] the JSON data                                     *
  *             error - [OUT] the parsing error message (can be NULL)          *
  *                                                                            *
- * Return value: the number of characters parsed. On error 0 is returned and  *
+ * Return value: The number of characters parsed. On error 0 is returned and  *
  *               error parameter (if not NULL) contains allocated error       *
  *               message.                                                     *
  *                                                                            *
  * Author: Andris Zeila                                                       *
  *                                                                            *
  ******************************************************************************/
-static int	json_parse_value(const char *start, char **error)
+int	json_parse_value(const char *start, char **error)
 {
 	const char	*ptr = start;
-	int		len = 0;
+	int		len;
 
 	SKIP_WHITESPACE(ptr);
 
@@ -360,11 +354,10 @@ static int	json_parse_value(const char *start, char **error)
  *                                                                            *
  * Purpose: Parses JSON object                                                *
  *                                                                            *
- * Parameters: start - [IN/OUT] the JSON data; returns the reference the real *
- *                     data (without spaces)                                  *
+ * Parameters: start - [IN] the JSON data                                     *
  *             error - [OUT] the parsing error message (can be NULL)          *
  *                                                                            *
- * Return value: the number of characters parsed. On error 0 is returned and  *
+ * Return value: The number of characters parsed. On error 0 is returned and  *
  *               error parameter (if not NULL) contains allocated error       *
  *               message.                                                     *
  *                                                                            *
@@ -428,19 +421,18 @@ static int	json_parse_object(const char *start, char **error)
 	return ptr - start + 1;
 }
 
-
 /******************************************************************************
  *                                                                            *
  * Function: zbx_json_validate                                                *
  *                                                                            *
  * Purpose: Validates JSON object                                             *
  *                                                                            *
- * Parameters: start  - [IN]  the string to validate                          *
- *             error  - [OUT] the parse error message. If the error value is  *
- *                            set it must be freed by caller after it has     *
- *                            been used (can be NULL).                        *
+ * Parameters: start - [IN]  the string to validate                           *
+ *             error - [OUT] the parse error message. If the error value is   *
+ *                           set it must be freed by caller after it has      *
+ *                           been used (can be NULL).                         *
  *                                                                            *
- * Return value: the number of characters parsed. On error 0 is returned and  *
+ * Return value: The number of characters parsed. On error 0 is returned and  *
  *               error parameter (if not NULL) contains allocated error       *
  *               message.                                                     *
  *                                                                            *
@@ -462,4 +454,3 @@ int	zbx_json_validate(const char *start, char **error)
 
 	return len;
 }
-
diff --git a/src/libs/zbxjson/json_parser.h b/src/libs/zbxjson/json_parser.h
index 8abdfc651a9..0b7ea9a44c5 100644
--- a/src/libs/zbxjson/json_parser.h
+++ b/src/libs/zbxjson/json_parser.h
@@ -25,4 +25,6 @@
 
 int	zbx_json_validate(const char *start, char **error);
 
+int	json_parse_value(const char *start, char **error);
+
 #endif
diff --git a/src/libs/zbxlog/log.c b/src/libs/zbxlog/log.c
index 06772e52333..e0332da0717 100644
--- a/src/libs/zbxlog/log.c
+++ b/src/libs/zbxlog/log.c
@@ -113,7 +113,7 @@ void	redirect_std(const char *filename)
 	else
 	{
 		zbx_error("cannot open [%s]: %s", filename, zbx_strerror(errno));
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 }
 #endif	/* not _WINDOWS */
@@ -122,7 +122,7 @@ int zabbix_open_log(int type, int level, const char *filename)
 {
 	FILE	*log_file = NULL;
 #ifdef _WINDOWS
-	LPTSTR	wevent_source;
+	wchar_t	*wevent_source;
 #endif
 
 	log_level = level;
@@ -147,19 +147,19 @@ int zabbix_open_log(int type, int level, const char *filename)
 		if (MAX_STRING_LEN <= strlen(filename))
 		{
 			zbx_error("too long path for logfile");
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 		if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&log_file_access, ZBX_MUTEX_LOG))
 		{
 			zbx_error("unable to create mutex for log file");
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 		if (NULL == (log_file = fopen(filename, "a+")))
 		{
 			zbx_error("unable to open log file [%s]: %s", filename, zbx_strerror(errno));
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 		log_type = LOG_TYPE_FILE;
@@ -391,7 +391,7 @@ void __zbx_zabbix_log(int level, const char *fmt, ...)
 				break;
 		}
 
-		zbx_wsnprintf(thread_id, sizeof(thread_id) / sizeof(wchar_t), TEXT("[%li]: "), zbx_get_thread_id());
+		StringCchPrintf(thread_id, ARRSIZE(thread_id), TEXT("[%li]: "), zbx_get_thread_id());
 		strings[0] = thread_id;
 		strings[1] = zbx_utf8_to_unicode(message);
 
@@ -467,7 +467,7 @@ void __zbx_zabbix_log(int level, const char *fmt, ...)
  * Comments: replace strerror to print also the error number                  *
  *                                                                            *
  ******************************************************************************/
-char *zbx_strerror(int errnum)
+char	*zbx_strerror(int errnum)
 {
 	/* !!! Attention: static !!! Not thread-safe for Win32 */
 	static char	utf8_string[ZBX_MESSAGE_BUF_SIZE];
@@ -477,18 +477,18 @@ char *zbx_strerror(int errnum)
 	return utf8_string;
 }
 
-char *strerror_from_system(unsigned long error)
+char	*strerror_from_system(unsigned long error)
 {
 #ifdef _WINDOWS
 	size_t		offset = 0;
-	TCHAR		wide_string[ZBX_MESSAGE_BUF_SIZE];
+	wchar_t		wide_string[ZBX_MESSAGE_BUF_SIZE];
 	/* !!! Attention: static !!! Not thread-safe for Win32 */
 	static char	utf8_string[ZBX_MESSAGE_BUF_SIZE];
 
 	offset += zbx_snprintf(utf8_string, sizeof(utf8_string), "[0x%08lX] ", error);
 
 	if (0 == FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error,
-			MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), wide_string, sizeof(wide_string), NULL))
+			MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), wide_string, ZBX_MESSAGE_BUF_SIZE, NULL))
 	{
 		zbx_snprintf(utf8_string + offset, sizeof(utf8_string) - offset,
 				"unable to find message text [0x%08lX]", GetLastError());
@@ -507,10 +507,10 @@ char *strerror_from_system(unsigned long error)
 }
 
 #ifdef _WINDOWS
-char	*strerror_from_module(unsigned long error, LPCTSTR module)
+char	*strerror_from_module(unsigned long error, const wchar_t *module)
 {
 	size_t		offset = 0;
-	TCHAR		wide_string[ZBX_MESSAGE_BUF_SIZE];
+	wchar_t		wide_string[ZBX_MESSAGE_BUF_SIZE];
 	char		*strings[2];
 	HMODULE		hmodule;
 	/* !!! Attention: static !!! not thread-safe for Win32 */
diff --git a/src/libs/zbxmedia/email.c b/src/libs/zbxmedia/email.c
index 759f68f1dc0..687c42b0d35 100644
--- a/src/libs/zbxmedia/email.c
+++ b/src/libs/zbxmedia/email.c
@@ -103,32 +103,17 @@ static void	str_base64_encode_rfc2047(const char *src, char **p_base64)
  * Comments: reads until '\n'                                                 *
  *                                                                            *
  ******************************************************************************/
-static ssize_t	smtp_readln(int fd, char *buf, int buf_len)
+static int	smtp_readln(zbx_sock_t *s, const char **buf)
 {
-	ssize_t	nbytes, read_bytes;
-
-	buf_len--;	/* '\0' */
-
-	do
-	{
-		read_bytes = 0;
-
-		do
-		{
-			if (-1 == (nbytes = read(fd, &buf[read_bytes], 1)))
-				return nbytes;			/* error */
-
-			read_bytes += nbytes;
-		}
-		while (nbytes > 0 &&				/* end of file (socket closed) */
-				read_bytes < buf_len &&		/* end of buffer */
-				buf[read_bytes - 1] != '\n' );	/* new line */
-
-		buf[read_bytes] = '\0';
-	}
-	while (read_bytes >= 4 && isdigit(buf[0]) && isdigit(buf[1]) && isdigit(buf[2]) && buf[3] == '-');
-
-	return read_bytes;
+	while (NULL != (*buf = zbx_tcp_recv_line(s)) &&
+			4 <= strlen(*buf) &&
+			0 != isdigit((*buf)[0]) &&
+			0 != isdigit((*buf)[1]) &&
+			0 != isdigit((*buf)[2]) &&
+			'-' == (*buf)[3])
+		;
+
+	return NULL == *buf ? FAIL : SUCCEED;
 }
 
 /********************************************************************************
@@ -282,6 +267,7 @@ int	send_email(const char *smtp_server, const char *smtp_helo, const char *smtp_
 	const char	*OK_250 = "250";
 	const char	*OK_251 = "251";
 	const char	*OK_354 = "354";
+	const char	*response;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() smtp_server:'%s'", __function_name, smtp_server);
 
@@ -291,19 +277,20 @@ int	send_email(const char *smtp_server, const char *smtp_helo, const char *smtp_
 
 	if (FAIL == zbx_tcp_connect(&s, CONFIG_SOURCE_IP, smtp_server, ZBX_DEFAULT_SMTP_PORT, 0))
 	{
-		zbx_snprintf(error, max_error_len, "cannot connect to SMTP server [%s]: %s",
+		zbx_snprintf(error, max_error_len, "cannot connect to SMTP server \"%s\": %s",
 				smtp_server, zbx_tcp_strerror());
 		goto close;
 	}
-	if (-1 == smtp_readln(s.socket, cmd, sizeof(cmd)))
+
+	if (FAIL == smtp_readln(&s, &response))
 	{
 		zbx_snprintf(error, max_error_len, "error receiving initial string from SMTP server: %s",
 				zbx_strerror(errno));
 		goto out;
 	}
-	if (0 != strncmp(cmd, OK_220, strlen(OK_220)))
+	if (0 != strncmp(response, OK_220, strlen(OK_220)))
 	{
-		zbx_snprintf(error, max_error_len, "no welcome message 220* from SMTP server [%s]", cmd);
+		zbx_snprintf(error, max_error_len, "no welcome message 220* from SMTP server \"%s\"", response);
 		goto out;
 	}
 
@@ -318,15 +305,15 @@ int	send_email(const char *smtp_server, const char *smtp_helo, const char *smtp_
 					zbx_strerror(errno));
 			goto out;
 		}
-		if (-1 == smtp_readln(s.socket, cmd, sizeof(cmd)))
+		if (FAIL == smtp_readln(&s, &response))
 		{
 			zbx_snprintf(error, max_error_len, "error receiving answer on HELO request: %s",
 					zbx_strerror(errno));
 			goto out;
 		}
-		if (0 != strncmp(cmd, OK_250, strlen(OK_250)))
+		if (0 != strncmp(response, OK_250, strlen(OK_250)))
 		{
-			zbx_snprintf(error, max_error_len, "wrong answer on HELO [%s]", cmd);
+			zbx_snprintf(error, max_error_len, "wrong answer on HELO \"%s\"", response);
 			goto out;
 		}
 	}
@@ -343,14 +330,14 @@ int	send_email(const char *smtp_server, const char *smtp_helo, const char *smtp_
 		zbx_snprintf(error, max_error_len, "error sending MAIL FROM to mailserver: %s", zbx_strerror(errno));
 		goto out;
 	}
-	if (-1 == smtp_readln(s.socket, cmd, sizeof(cmd)))
+	if (FAIL == smtp_readln(&s, &response))
 	{
 		zbx_snprintf(error, max_error_len, "error receiving answer on MAIL FROM request: %s", zbx_strerror(errno));
 		goto out;
 	}
-	if (0 != strncmp(cmd, OK_250, strlen(OK_250)))
+	if (0 != strncmp(response, OK_250, strlen(OK_250)))
 	{
-		zbx_snprintf(error, max_error_len, "wrong answer on MAIL FROM [%s]", cmd);
+		zbx_snprintf(error, max_error_len, "wrong answer on MAIL FROM \"%s\"", response);
 		goto out;
 	}
 
@@ -366,15 +353,15 @@ int	send_email(const char *smtp_server, const char *smtp_helo, const char *smtp_
 		zbx_snprintf(error, max_error_len, "error sending RCPT TO to mailserver: %s", zbx_strerror(errno));
 		goto out;
 	}
-	if (-1 == smtp_readln(s.socket, cmd, sizeof(cmd)))
+	if (FAIL == smtp_readln(&s, &response))
 	{
 		zbx_snprintf(error, max_error_len, "error receiving answer on RCPT TO request: %s", zbx_strerror(errno));
 		goto out;
 	}
 	/* May return 251 as well: User not local; will forward to <forward-path>. See RFC825. */
-	if (0 != strncmp(cmd, OK_250, strlen(OK_250)) && 0 != strncmp(cmd, OK_251, strlen(OK_251)))
+	if (0 != strncmp(response, OK_250, strlen(OK_250)) && 0 != strncmp(response, OK_251, strlen(OK_251)))
 	{
-		zbx_snprintf(error, max_error_len, "wrong answer on RCPT TO [%s]", cmd);
+		zbx_snprintf(error, max_error_len, "wrong answer on RCPT TO \"%s\"", response);
 		goto out;
 	}
 
@@ -386,14 +373,14 @@ int	send_email(const char *smtp_server, const char *smtp_helo, const char *smtp_
 		zbx_snprintf(error, max_error_len, "error sending DATA to mailserver: %s", zbx_strerror(errno));
 		goto out;
 	}
-	if (-1 == smtp_readln(s.socket, cmd, sizeof(cmd)))
+	if (FAIL == smtp_readln(&s, &response))
 	{
 		zbx_snprintf(error, max_error_len, "error receiving answer on DATA request: %s", zbx_strerror(errno));
 		goto out;
 	}
-	if (0 != strncmp(cmd, OK_354, strlen(OK_354)))
+	if (0 != strncmp(response, OK_354, strlen(OK_354)))
 	{
-		zbx_snprintf(error, max_error_len, "wrong answer on DATA [%s]", cmd);
+		zbx_snprintf(error, max_error_len, "wrong answer on DATA \"%s\"", response);
 		goto out;
 	}
 
@@ -461,7 +448,8 @@ int	send_email(const char *smtp_server, const char *smtp_helo, const char *smtp_
 
 	if (-1 == err)
 	{
-		zbx_snprintf(error, max_error_len, "error sending headers and mail body to mailserver: %s", zbx_strerror(errno));
+		zbx_snprintf(error, max_error_len, "error sending headers and mail body to mailserver: %s",
+				zbx_strerror(errno));
 		goto out;
 	}
 
@@ -473,14 +461,14 @@ int	send_email(const char *smtp_server, const char *smtp_helo, const char *smtp_
 		zbx_snprintf(error, max_error_len, "error sending . to mailserver: %s", zbx_strerror(errno));
 		goto out;
 	}
-	if (-1 == smtp_readln(s.socket, cmd, sizeof(cmd)))
+	if (FAIL == smtp_readln(&s, &response))
 	{
 		zbx_snprintf(error, max_error_len, "error receiving answer on . request: %s", zbx_strerror(errno));
 		goto out;
 	}
-	if (0 != strncmp(cmd, OK_250, strlen(OK_250)))
+	if (0 != strncmp(response, OK_250, strlen(OK_250)))
 	{
-		zbx_snprintf(error, max_error_len, "wrong answer on end of data [%s]", cmd);
+		zbx_snprintf(error, max_error_len, "wrong answer on end of data \"%s\"", response);
 		goto out;
 	}
 
diff --git a/src/libs/zbxmemory/memalloc.c b/src/libs/zbxmemory/memalloc.c
index ecdb42453de..bdcb999accf 100644
--- a/src/libs/zbxmemory/memalloc.c
+++ b/src/libs/zbxmemory/memalloc.c
@@ -458,7 +458,7 @@ static void	*__mem_realloc(zbx_mem_info_t *info, void *old, zbx_uint64_t size)
 		if (NULL == (new_chunk = __mem_malloc(info, size)))
 		{
 			THIS_SHOULD_NEVER_HAPPEN;
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 		memcpy((char *)new_chunk + MEM_SIZE_FIELD, tmp, chunk_size);
@@ -560,26 +560,26 @@ void	zbx_mem_create(zbx_mem_info_t **info, key_t shm_key, int lock_name, zbx_uin
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "failed assumption about pointer size (" ZBX_FS_SIZE_T " not in {4, 8})",
 				(zbx_fs_size_t)ZBX_PTR_SIZE);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (!(MEM_MIN_SIZE <= size && size <= MEM_MAX_SIZE))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "requested size " ZBX_FS_SIZE_T " not within bounds [" ZBX_FS_UI64
 				" <= size <= " ZBX_FS_UI64 "]", (zbx_fs_size_t)size, MEM_MIN_SIZE, MEM_MAX_SIZE);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (-1 == (shm_id = zbx_shmget(shm_key, size)))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "cannot allocate shared memory for %s", descr);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if ((void *)(-1) == (base = shmat(shm_id, NULL, 0)))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "cannot attach shared memory for %s: %s", descr, zbx_strerror(errno));
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	/* allocate zbx_mem_info_t structure, its buckets, and description inside shared memory */
@@ -617,7 +617,7 @@ void	zbx_mem_create(zbx_mem_info_t **info, key_t shm_key, int lock_name, zbx_uin
 		if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&((*info)->mem_lock), lock_name))
 		{
 			zabbix_log(LOG_LEVEL_CRIT, "cannot create mutex for %s", descr);
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 	}
 	else
@@ -675,14 +675,14 @@ void	*__zbx_mem_malloc(const char *file, int line, zbx_mem_info_t *info, const v
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] %s(): allocating already allocated memory",
 				file, line, __function_name);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (0 == size || size > MEM_MAX_SIZE)
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] %s(): asking for a bad number of bytes (" ZBX_FS_SIZE_T
 				")", file, line, __function_name, (zbx_fs_size_t)size);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	LOCK_INFO;
@@ -700,7 +700,7 @@ void	*__zbx_mem_malloc(const char *file, int line, zbx_mem_info_t *info, const v
 				file, line, __function_name, (zbx_fs_size_t)size);
 		zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] %s(): please increase %s configuration parameter",
 				file, line, __function_name, info->mem_param);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	return (void *)((char *)chunk + MEM_SIZE_FIELD);
@@ -716,7 +716,7 @@ void	*__zbx_mem_realloc(const char *file, int line, zbx_mem_info_t *info, void *
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] %s(): asking for a bad number of bytes (" ZBX_FS_SIZE_T
 				")", file, line, __function_name, (zbx_fs_size_t)size);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	LOCK_INFO;
@@ -737,7 +737,7 @@ void	*__zbx_mem_realloc(const char *file, int line, zbx_mem_info_t *info, void *
 				file, line, __function_name, (zbx_fs_size_t)size);
 		zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] %s(): please increase %s configuration parameter",
 				file, line, __function_name, info->mem_param);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	return (void *)((char *)chunk + MEM_SIZE_FIELD);
@@ -751,7 +751,7 @@ void	__zbx_mem_free(const char *file, int line, zbx_mem_info_t *info, void *ptr)
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "[file:%s,line:%d] %s(): freeing a NULL pointer",
 				file, line, __function_name);
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	LOCK_INFO;
diff --git a/src/libs/zbxmemory/strpool.c b/src/libs/zbxmemory/strpool.c
index 8cabed8d4ca..3cf2d06e40f 100644
--- a/src/libs/zbxmemory/strpool.c
+++ b/src/libs/zbxmemory/strpool.c
@@ -65,7 +65,7 @@ void	zbx_strpool_create(size_t size)
 	if (-1 == (shm_key = zbx_ftok(CONFIG_FILE, ZBX_IPC_STRPOOL_ID)))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "cannot create IPC key for string pool");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	zbx_mem_create(&strpool.mem_info, shm_key, ZBX_NO_MUTEX, size, "string pool", "CacheSize", 0);
diff --git a/src/libs/zbxmodules/modules.c b/src/libs/zbxmodules/modules.c
index a2be5af1779..a25e46a7ed7 100644
--- a/src/libs/zbxmodules/modules.c
+++ b/src/libs/zbxmodules/modules.c
@@ -152,7 +152,7 @@ int	load_modules(const char *path, char **file_names, int timeout, int verbose)
 			goto fail;
 		}
 
-		/* the function is optional, zabbix will load the module ieven if it is missing */
+		/* the function is optional, zabbix will load the module even if it is missing */
 		*(void **)(&func_timeout) = dlsym(lib, ZBX_MODULE_FUNC_ITEM_TIMEOUT);
 		if (NULL == func_timeout)
 		{
diff --git a/src/libs/zbxnix/daemon.c b/src/libs/zbxnix/daemon.c
index b348cef720a..5b81feae02b 100644
--- a/src/libs/zbxnix/daemon.c
+++ b/src/libs/zbxnix/daemon.c
@@ -297,54 +297,54 @@ int	daemon_start(int allow_root, const char *user)
 		{
 			zbx_error("user %s does not exist", user);
 			zbx_error("cannot run as root!");
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 		if (0 == pwd->pw_uid)
 		{
 			zbx_error("User=%s contradicts AllowRoot=0", user);
 			zbx_error("cannot run as root!");
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 		if (-1 == setgid(pwd->pw_gid))
 		{
 			zbx_error("cannot setgid to %s: %s", user, zbx_strerror(errno));
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 #ifdef HAVE_FUNCTION_INITGROUPS
 		if (-1 == initgroups(user, pwd->pw_gid))
 		{
 			zbx_error("cannot initgroups to %s: %s", user, zbx_strerror(errno));
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 #endif
 
 		if (-1 == setuid(pwd->pw_uid))
 		{
 			zbx_error("cannot setuid to %s: %s", user, zbx_strerror(errno));
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 
 #ifdef HAVE_FUNCTION_SETEUID
 		if (-1 == setegid(pwd->pw_gid) || -1 == seteuid(pwd->pw_uid))
 		{
 			zbx_error("cannot setegid or seteuid to %s: %s", user, zbx_strerror(errno));
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 #endif
 	}
 
 	if (0 != (pid = zbx_fork()))
-		exit(0);
+		exit(EXIT_SUCCESS);
 
 	setsid();
 
 	signal(SIGHUP, SIG_IGN);
 
 	if (0 != (pid = zbx_fork()))
-		exit(0);
+		exit(EXIT_SUCCESS);
 
 	if (-1 == chdir("/"))	/* this is to eliminate warning: ignoring return value of chdir */
 		assert(0);
@@ -354,7 +354,7 @@ int	daemon_start(int allow_root, const char *user)
 	redirect_std(CONFIG_LOG_FILE);
 
 	if (FAIL == create_pid_file(CONFIG_PID_FILE))
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 
 	atexit(daemon_stop);
 
diff --git a/src/libs/zbxnix/sighandler.c b/src/libs/zbxnix/sighandler.c
index 89e9a9c04a9..646c727ca27 100644
--- a/src/libs/zbxnix/sighandler.c
+++ b/src/libs/zbxnix/sighandler.c
@@ -43,7 +43,7 @@ static void	fatal_signal_handler(int sig, siginfo_t *siginfo, void *context)
 			SIG_CHECKED_FIELD(siginfo, si_code),
 			SIG_CHECKED_FIELD_TYPE(siginfo, si_addr, void *));
 	print_fatal_info(sig, siginfo, context);
-	exit(FAIL);
+	exit(EXIT_FAILURE);
 }
 
 /******************************************************************************
@@ -79,7 +79,7 @@ static void	terminate_signal_handler(int sig, siginfo_t *siginfo, void *context)
 				SIG_CHECKED_FIELD(siginfo, si_pid),
 				SIG_CHECKED_FIELD_UINT(siginfo, si_uid),
 				SIG_CHECKED_FIELD(siginfo, si_code));
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 	else
 	{
@@ -113,7 +113,7 @@ static void	child_signal_handler(int sig, siginfo_t *siginfo, void *context)
 	SIG_CHECK_PARAMS(sig, siginfo, context);
 
 	if (!SIG_PARENT_PROCESS)
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 
 	if (0 == sig_exiting)
 	{
diff --git a/src/libs/zbxregexp/gnuregex.c b/src/libs/zbxregexp/gnuregex.c
index f9e54decaee..2a19de8462d 100644
--- a/src/libs/zbxregexp/gnuregex.c
+++ b/src/libs/zbxregexp/gnuregex.c
@@ -78,7 +78,7 @@
 
 /* Define the syntax stuff for \<, \>, etc.  */
 
-/* This must be nonzero for the wordchar and notwordchar pattern
+/* This must be non-zero for the wordchar and notwordchar pattern
    commands in re_match_2.  */
 #ifndef Sword
 #define Sword 1
@@ -461,7 +461,7 @@ extract_number_and_incr (destination, source)
 #endif /* DEBUG */
 
 /* If DEBUG is defined, Regex prints many voluminous messages about what
-   it is doing (if the variable `debug' is nonzero).  If linked with the
+   it is doing (if the variable `debug' is non-zero).  If linked with the
    main program in `iregex.c', you can enter patterns and strings
    interactively.  And if linked with the main program in `main.c' and
    the other test files, you can run the already-written tests.  */
@@ -1324,7 +1324,7 @@ regex_compile (pattern, size, syntax, bufp)
                 GET_BUFFER_SPACE (3);
 
                 /* We know we are not at the first character of the pattern,
-                   because laststart was nonzero.  And we've already
+                   because laststart was non-zero.  And we've already
                    incremented `p', by the way, to be the character after
                    the `*'.  Do we have to do something analogous here
                    for null bytes, because of RE_DOT_NOT_NULL?  */
@@ -3241,7 +3241,7 @@ re_match (bufp, string, size, pos, regs)
    and SIZE2, respectively).  We start matching at POS, and stop
    matching at STOP.
 
-   If REGS is non-null and the `no_sub' field of BUFP is nonzero, we
+   If REGS is non-null and the `no_sub' field of BUFP is non-zero, we
    store offsets for the substring each group matched in REGS.  See the
    documentation for exactly how many groups we fill.
 
@@ -4677,7 +4677,7 @@ common_op_match_null_string_p (p, end, reg_info)
 
 
 /* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN
-   bytes; nonzero otherwise.  */
+   bytes; non-zero otherwise.  */
 
 static int
 bcmp_translate (s1, s2, len, translate)
@@ -4821,7 +4821,7 @@ re_exec (s)
      routine will report only success or failure, and nothing about the
      registers.
 
-   It returns 0 if it succeeds, nonzero if it doesn't.  (See regex.h for
+   It returns 0 if it succeeds, non-zero if it doesn't.  (See regex.h for
    the return codes and their meanings.)  */
 
 int
diff --git a/src/libs/zbxregexp/zbxregexp.c b/src/libs/zbxregexp/zbxregexp.c
index 4964c45f3c0..bd8c84630dd 100644
--- a/src/libs/zbxregexp/zbxregexp.c
+++ b/src/libs/zbxregexp/zbxregexp.c
@@ -26,11 +26,12 @@
 
 static char	*zbx_regexp(const char *string, const char *pattern, int *len, int flags)
 {
-	char		*c = NULL;
-	static char	*old_pattern = NULL;
-	static int	old_flags;
-	static regex_t	re;
-	regmatch_t	match;
+	ZBX_THREAD_LOCAL static char	*old_pattern = NULL;
+	ZBX_THREAD_LOCAL static int	old_flags;
+	ZBX_THREAD_LOCAL static regex_t	re;
+
+	char				*c = NULL;
+	regmatch_t			match;
 
 	if (NULL != len)
 		*len = 0;
@@ -55,6 +56,11 @@ compile:
 	}
 	else
 	{
+#ifdef _WINDOWS
+		/* the Windows gnuregex implementation does not correctly clean up */
+		/* allocated memory after regcomp() failure                        */
+		regfree(&re);
+#endif
 		zbx_free(old_pattern);
 		goto out;
 	}
@@ -192,11 +198,12 @@ out:
  *********************************************************************************/
 static char	*regexp_sub(const char *string, const char *pattern, const char *output_template, int flags)
 {
-	static regex_t	re;
-	regmatch_t	match[10];	/* up to 10 capture groups in regexp */
-	char		*ptr = NULL;
-	static char	*old_pattern = NULL;
-	static int	old_flags;
+	ZBX_THREAD_LOCAL static char	*old_pattern = NULL;
+	ZBX_THREAD_LOCAL static int	old_flags;
+	ZBX_THREAD_LOCAL static regex_t	re;
+
+	regmatch_t			match[10];	/* up to 10 capture groups in regexp */
+	char				*ptr = NULL;
 
 	if (NULL == string)
 		return NULL;
@@ -221,6 +228,11 @@ compile:
 	}
 	else
 	{
+#ifdef _WINDOWS
+		/* the Windows gnuregex implementation does not correctly clean up */
+		/* allocated memory after regcomp() failure                        */
+		regfree(&re);
+#endif
 		zbx_free(old_pattern);
 		return NULL;
 	}
diff --git a/src/libs/zbxself/selfmon.c b/src/libs/zbxself/selfmon.c
index d0d85c26eaa..ae396a6e601 100644
--- a/src/libs/zbxself/selfmon.c
+++ b/src/libs/zbxself/selfmon.c
@@ -273,26 +273,26 @@ void	init_selfmon_collector(void)
 	if (-1 == (shm_key = zbx_ftok(CONFIG_FILE, ZBX_IPC_SELFMON_ID)))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "cannot create IPC key for a self-monitoring collector");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&sm_lock, ZBX_MUTEX_SELFMON))
 	{
 		zbx_error("unable to create mutex for a self-monitoring collector");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if (-1 == (shm_id = zbx_shmget(shm_key, sz_total)))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "cannot allocate shared memory for a self-monitoring collector");
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	if ((void *)(-1) == (p = shmat(shm_id, NULL, 0)))
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "cannot attach shared memory for a self-monitoring collector: %s",
 				zbx_strerror(errno));
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 
 	collector = (zbx_selfmon_collector_t *)p; p += sz;
diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c
index 9dd6ddd8b7f..43760a834ea 100644
--- a/src/libs/zbxserver/evalfunc.c
+++ b/src/libs/zbxserver/evalfunc.c
@@ -25,11 +25,6 @@
 #include "evalfunc.h"
 #include "zbxregexp.h"
 
-int	cmp_double(double a, double b)
-{
-	return fabs(a - b) < TRIGGER_EPSILON ? SUCCEED : FAIL;
-}
-
 static int	__get_function_parameter_uint31(zbx_uint64_t hostid, const char *parameters, int Nparam,
 		int *value, int *flag, int defaults_on_empty, int def_value, int def_flag)
 {
@@ -154,19 +149,20 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_LOGEVENTID(char *value, DB_ITEM *item, const char *function, const char *parameters,
+static int	evaluate_LOGEVENTID(char *value, DC_ITEM *item, const char *function, const char *parameters,
 		time_t now)
 {
-	const char			*__function_name = "evaluate_LOGEVENTID";
-	char				*arg1 = NULL;
-	int				ret = FAIL;
-	zbx_vector_ptr_t		regexps;
-	zbx_vector_history_record_t	values;
+	const char		*__function_name = "evaluate_LOGEVENTID";
+
+	char			*arg1 = NULL;
+	int			found, ret = FAIL;
+	zbx_vector_ptr_t	regexps;
+	zbx_history_record_t	vc_value;
+	zbx_timespec_t		ts = {now, 999999999};
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	zbx_vector_ptr_create(&regexps);
-	zbx_history_record_vector_create(&values);
 
 	if (ITEM_VALUE_TYPE_LOG != item->value_type)
 		goto out;
@@ -174,25 +170,22 @@ static int	evaluate_LOGEVENTID(char *value, DB_ITEM *item, const char *function,
 	if (1 < num_param(parameters))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_str(item->hostid, parameters, 1, &arg1))
+	if (SUCCEED != get_function_parameter_str(item->host.hostid, parameters, 1, &arg1))
 		goto out;
 
 	if ('@' == *arg1)
 		DCget_expressions_by_name(&regexps, arg1 + 1);
 
-	if (SUCCEED == zbx_vc_get_value_range(item->itemid, item->value_type, &values, 0, 1, now) &&
-			0 < values.values_num)
+	if (SUCCEED == zbx_vc_get_value(item->itemid, item->value_type, &ts, &vc_value, &found) && 1 == found)
 	{
-		char	*logeventid = NULL;
-		size_t	size = 0, offset = 0;
+		char	logeventid[16];
 
-		zbx_snprintf_alloc(&logeventid, &size, &offset, "%d", values.values[0].value.log->logeventid);
+		zbx_snprintf(logeventid, sizeof(logeventid), "%d", vc_value.value.log->logeventid);
 		if (SUCCEED == regexp_match_ex(&regexps, logeventid, arg1, ZBX_CASE_SENSITIVE))
 			zbx_strlcpy(value, "1", MAX_BUFFER_LEN);
 		else
 			zbx_strlcpy(value, "0", MAX_BUFFER_LEN);
-
-		zbx_free(logeventid);
+		zbx_history_record_clear(&vc_value, item->value_type);
 
 		ret = SUCCEED;
 	}
@@ -204,8 +197,6 @@ out:
 	zbx_regexp_clean_expressions(&regexps);
 	zbx_vector_ptr_destroy(&regexps);
 
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
 	return ret;
@@ -224,16 +215,16 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_LOGSOURCE(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_LOGSOURCE(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
-	const char			*__function_name = "evaluate_LOGSOURCE";
-	char				*arg1 = NULL;
-	int				ret = FAIL;
-	zbx_vector_history_record_t	values;
+	const char		*__function_name = "evaluate_LOGSOURCE";
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+	char			*arg1 = NULL;
+	int			found, ret = FAIL;
+	zbx_history_record_t	vc_value;
+	zbx_timespec_t		ts = {now, 999999999};
 
-	zbx_history_record_vector_create(&values);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	if (ITEM_VALUE_TYPE_LOG != item->value_type)
 		goto out;
@@ -241,16 +232,16 @@ static int	evaluate_LOGSOURCE(char *value, DB_ITEM *item, const char *function,
 	if (1 < num_param(parameters))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_str(item->hostid, parameters, 1, &arg1))
+	if (SUCCEED != get_function_parameter_str(item->host.hostid, parameters, 1, &arg1))
 		goto out;
 
-	if (SUCCEED == zbx_vc_get_value_range(item->itemid, item->value_type, &values, 0, 1, now) &&
-			0 < values.values_num)
+	if (SUCCEED == zbx_vc_get_value(item->itemid, item->value_type, &ts, &vc_value, &found) && 1 == found)
 	{
-		if (0 == strcmp(values.values[0].value.log->source, arg1))
+		if (0 == strcmp(NULL == vc_value.value.log->source ? "" : vc_value.value.log->source, arg1))
 			zbx_strlcpy(value, "1", MAX_BUFFER_LEN);
 		else
 			zbx_strlcpy(value, "0", MAX_BUFFER_LEN);
+		zbx_history_record_clear(&vc_value, item->value_type);
 
 		ret = SUCCEED;
 	}
@@ -259,8 +250,6 @@ static int	evaluate_LOGSOURCE(char *value, DB_ITEM *item, const char *function,
 
 	zbx_free(arg1);
 out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
 	return ret;
@@ -279,31 +268,30 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_LOGSEVERITY(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_LOGSEVERITY(char *value, DC_ITEM *item, const char *function, const char *parameters,
+		time_t now)
 {
-	const char			*__function_name = "evaluate_LOGSEVERITY";
-	int				ret = FAIL;
-	zbx_vector_history_record_t	values;
+	const char		*__function_name = "evaluate_LOGSEVERITY";
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+	int			found, ret = FAIL;
+	zbx_history_record_t	vc_value;
+	zbx_timespec_t		ts = {now, 999999999};
 
-	zbx_history_record_vector_create(&values);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	if (ITEM_VALUE_TYPE_LOG != item->value_type)
 		goto out;
 
-	if (SUCCEED == zbx_vc_get_value_range(item->itemid, item->value_type, &values, 0, 1, now) &&
-			0 < values.values_num)
+	if (SUCCEED == zbx_vc_get_value(item->itemid, item->value_type, &ts, &vc_value, &found) && 1 == found)
 	{
-		zbx_snprintf(value, MAX_BUFFER_LEN, "%d", values.values[0].value.log->severity);
+		zbx_snprintf(value, MAX_BUFFER_LEN, "%d", vc_value.value.log->severity);
+		zbx_history_record_clear(&vc_value, item->value_type);
 
 		ret = SUCCEED;
 	}
 	else
 		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGSEVERITY is empty");
 out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
 	return ret;
@@ -380,33 +368,33 @@ static int	evaluate_COUNT_one(unsigned char value_type, int op, history_value_t
 			switch (op)
 			{
 				case OP_EQ:
-					if (value->dbl > arg2_double - TRIGGER_EPSILON &&
-							value->dbl < arg2_double + TRIGGER_EPSILON)
+					if (value->dbl > arg2_double - ZBX_DOUBLE_EPSILON &&
+							value->dbl < arg2_double + ZBX_DOUBLE_EPSILON)
 					{
 						return SUCCEED;
 					}
 					break;
 				case OP_NE:
-					if (!(value->dbl > arg2_double - TRIGGER_EPSILON &&
-							value->dbl < arg2_double + TRIGGER_EPSILON))
+					if (!(value->dbl > arg2_double - ZBX_DOUBLE_EPSILON &&
+							value->dbl < arg2_double + ZBX_DOUBLE_EPSILON))
 					{
 						return SUCCEED;
 					}
 					break;
 				case OP_GT:
-					if (value->dbl >= arg2_double + TRIGGER_EPSILON)
+					if (value->dbl >= arg2_double + ZBX_DOUBLE_EPSILON)
 						return SUCCEED;
 					break;
 				case OP_GE:
-					if (value->dbl > arg2_double - TRIGGER_EPSILON)
+					if (value->dbl > arg2_double - ZBX_DOUBLE_EPSILON)
 						return SUCCEED;
 					break;
 				case OP_LT:
-					if (value->dbl <= arg2_double - TRIGGER_EPSILON)
+					if (value->dbl <= arg2_double - ZBX_DOUBLE_EPSILON)
 						return SUCCEED;
 					break;
 				case OP_LE:
-					if (value->dbl < arg2_double + TRIGGER_EPSILON)
+					if (value->dbl < arg2_double + ZBX_DOUBLE_EPSILON)
 						return SUCCEED;
 					break;
 			}
@@ -473,7 +461,7 @@ static int	evaluate_COUNT_one(unsigned char value_type, int op, history_value_t
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_COUNT(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_COUNT(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_COUNT";
 	int				arg1, flag, op, numeric_search, nparams, count = 0, i, ret = FAIL;
@@ -490,17 +478,17 @@ static int	evaluate_COUNT(char *value, DB_ITEM *item, const char *function, cons
 	if (4 < (nparams = num_param(parameters)))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_uint31(item->hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
+	if (SUCCEED != get_function_parameter_uint31(item->host.hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
 		goto out;
 
-	if (2 <= nparams && SUCCEED != get_function_parameter_str(item->hostid, parameters, 2, &arg2))
+	if (2 <= nparams && SUCCEED != get_function_parameter_str(item->host.hostid, parameters, 2, &arg2))
 		goto out;
 
 	if (3 <= nparams)
 	{
 		int	fail = 2;
 
-		if (SUCCEED != get_function_parameter_str(item->hostid, parameters, 3, &arg3))
+		if (SUCCEED != get_function_parameter_str(item->host.hostid, parameters, 3, &arg3))
 			goto out;
 
 		if ('\0' == *arg3)
@@ -553,7 +541,7 @@ static int	evaluate_COUNT(char *value, DB_ITEM *item, const char *function, cons
 	{
 		int	time_shift, time_shift_flag;
 
-		if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 4, &time_shift,
+		if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 4, &time_shift,
 				&time_shift_flag, 0, ZBX_FLAG_SEC) || ZBX_FLAG_SEC != time_shift_flag)
 		{
 			goto out;
@@ -618,7 +606,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_SUM(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_SUM(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_SUM";
 	int				nparams, arg1, flag, i, ret = FAIL, seconds = 0, nvalues = 0;
@@ -634,14 +622,14 @@ static int	evaluate_SUM(char *value, DB_ITEM *item, const char *function, const
 	if (2 < (nparams = num_param(parameters)))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_uint31(item->hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
+	if (SUCCEED != get_function_parameter_uint31(item->host.hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
 		goto out;
 
 	if (2 == nparams)
 	{
 		int	time_shift, time_shift_flag;
 
-		if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 2, &time_shift,
+		if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 2, &time_shift,
 				&time_shift_flag, 0, ZBX_FLAG_SEC) || ZBX_FLAG_SEC != time_shift_flag)
 		{
 			goto out;
@@ -699,7 +687,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_AVG(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_AVG(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_AVG";
 	int				nparams, arg1, flag, ret = FAIL, i, seconds = 0, nvalues = 0;
@@ -715,14 +703,14 @@ static int	evaluate_AVG(char *value, DB_ITEM *item, const char *function, const
 	if (2 < (nparams = num_param(parameters)))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_uint31(item->hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
+	if (SUCCEED != get_function_parameter_uint31(item->host.hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
 		goto out;
 
 	if (2 == nparams)
 	{
 		int	time_shift, time_shift_flag;
 
-		if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 2, &time_shift,
+		if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 2, &time_shift,
 				&time_shift_flag, 0, ZBX_FLAG_SEC) || ZBX_FLAG_SEC != time_shift_flag)
 		{
 			goto out;
@@ -781,7 +769,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_LAST(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_LAST(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_LAST";
 	int				arg1, flag, ret = FAIL;
@@ -789,7 +777,7 @@ static int	evaluate_LAST(char *value, DB_ITEM *item, const char *function, const
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
-	if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 1, &arg1, &flag,
+	if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 1, &arg1, &flag,
 			1, ZBX_FLAG_VALUES))
 	{
 		goto out;
@@ -805,7 +793,7 @@ static int	evaluate_LAST(char *value, DB_ITEM *item, const char *function, const
 	{
 		int	time_shift, time_shift_flag;
 
-		if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 2, &time_shift,
+		if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 2, &time_shift,
 				&time_shift_flag, 0, ZBX_FLAG_SEC) || ZBX_FLAG_SEC != time_shift_flag)
 		{
 			goto out;
@@ -846,7 +834,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_MIN(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_MIN(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_MIN";
 	int				nparams, arg1, flag, i, ret = FAIL, seconds = 0, nvalues = 0;
@@ -862,14 +850,14 @@ static int	evaluate_MIN(char *value, DB_ITEM *item, const char *function, const
 	if (2 < (nparams = num_param(parameters)))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_uint31(item->hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
+	if (SUCCEED != get_function_parameter_uint31(item->host.hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
 		goto out;
 
 	if (2 == nparams)
 	{
 		int	time_shift, time_shift_flag;
 
-		if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 2, &time_shift,
+		if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 2, &time_shift,
 				&time_shift_flag, 0, ZBX_FLAG_SEC) || ZBX_FLAG_SEC != time_shift_flag)
 		{
 			goto out;
@@ -933,7 +921,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_MAX(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_MAX(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_MAX";
 	int				nparams, arg1, flag, ret = FAIL, i, seconds = 0, nvalues = 0;
@@ -949,14 +937,14 @@ static int	evaluate_MAX(char *value, DB_ITEM *item, const char *function, const
 	if (2 < (nparams = num_param(parameters)))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_uint31(item->hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
+	if (SUCCEED != get_function_parameter_uint31(item->host.hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
 		goto out;
 
 	if (2 == nparams)
 	{
 		int	time_shift, time_shift_flag;
 
-		if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 2, &time_shift,
+		if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 2, &time_shift,
 				&time_shift_flag, 0, ZBX_FLAG_SEC) || ZBX_FLAG_SEC != time_shift_flag)
 		{
 			goto out;
@@ -1020,7 +1008,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_DELTA(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_DELTA(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_DELTA";
 	int				nparams, arg1, flag, ret = FAIL, i, seconds = 0, nvalues = 0;
@@ -1036,14 +1024,14 @@ static int	evaluate_DELTA(char *value, DB_ITEM *item, const char *function, cons
 	if (2 < (nparams = num_param(parameters)))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_uint31(item->hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
+	if (SUCCEED != get_function_parameter_uint31(item->host.hostid, parameters, 1, &arg1, &flag) || 0 == arg1)
 		goto out;
 
 	if (2 == nparams)
 	{
 		int	time_shift, time_shift_flag;
 
-		if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 2, &time_shift,
+		if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 2, &time_shift,
 				&time_shift_flag, 0, ZBX_FLAG_SEC) || ZBX_FLAG_SEC != time_shift_flag)
 		{
 			goto out;
@@ -1119,7 +1107,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_NODATA(char *value, DB_ITEM *item, const char *function, const char *parameters)
+static int	evaluate_NODATA(char *value, DC_ITEM *item, const char *function, const char *parameters, char **error)
 {
 	const char			*__function_name = "evaluate_NODATA";
 	int				arg1, flag, now, ret = FAIL;
@@ -1130,10 +1118,18 @@ static int	evaluate_NODATA(char *value, DB_ITEM *item, const char *function, con
 	zbx_history_record_vector_create(&values);
 
 	if (1 < num_param(parameters))
+	{
+		if (NULL != error)
+			*error = zbx_strdup(*error, "too many parameters");
 		goto out;
+	}
 
-	if (SUCCEED != get_function_parameter_uint31(item->hostid, parameters, 1, &arg1, &flag))
+	if (SUCCEED != get_function_parameter_uint31(item->host.hostid, parameters, 1, &arg1, &flag))
+	{
+		if (NULL != error)
+			*error = zbx_strdup(*error, "invalid first parameter");
 		goto out;
+	}
 
 	if (ZBX_FLAG_SEC != flag)
 		goto out;
@@ -1149,8 +1145,25 @@ static int	evaluate_NODATA(char *value, DB_ITEM *item, const char *function, con
 	{
 		int	seconds;
 
-		if (SUCCEED != DCget_data_expected_from(item->itemid, &seconds) || seconds + arg1 > now)
+		if (SUCCEED != DCget_data_expected_from(item->itemid, &seconds))
+		{
+			if (NULL != error)
+			{
+				*error = zbx_strdup(*error, "item does not exist, is disabled"
+						" or belongs to a disabled host");
+			}
 			goto out;
+		}
+
+		if (seconds + arg1 > now)
+		{
+			if (NULL != error)
+			{
+				*error = zbx_strdup(*error, "item does not have enough data"
+						" after server start or item creation");
+			}
+			goto out;
+		}
 
 		zbx_strlcpy(value, "1", MAX_BUFFER_LEN);
 	}
@@ -1177,7 +1190,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_ABSCHANGE(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_ABSCHANGE(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_ABSCHANGE";
 	int				ret = FAIL;
@@ -1249,7 +1262,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_CHANGE(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_CHANGE(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_CHANGE";
 	int				ret = FAIL;
@@ -1318,7 +1331,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_DIFF(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_DIFF(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_DIFF";
 	int				ret = FAIL;
@@ -1335,12 +1348,11 @@ static int	evaluate_DIFF(char *value, DB_ITEM *item, const char *function, const
 	switch (item->value_type)
 	{
 		case ITEM_VALUE_TYPE_FLOAT:
-			if (SUCCEED == cmp_double(values.values[0].value.dbl, values.values[1].value.dbl))
+			if (SUCCEED == zbx_double_compare(values.values[0].value.dbl, values.values[1].value.dbl))
 				zbx_strlcpy(value, "0", MAX_BUFFER_LEN);
 			else
 				zbx_strlcpy(value, "1", MAX_BUFFER_LEN);
 			break;
-			break;
 		case ITEM_VALUE_TYPE_UINT64:
 			if (values.values[0].value.ui64 == values.values[1].value.ui64)
 				zbx_strlcpy(value, "0", MAX_BUFFER_LEN);
@@ -1353,7 +1365,6 @@ static int	evaluate_DIFF(char *value, DB_ITEM *item, const char *function, const
 			else
 				zbx_strlcpy(value, "1", MAX_BUFFER_LEN);
 			break;
-
 		case ITEM_VALUE_TYPE_STR:
 		case ITEM_VALUE_TYPE_TEXT:
 			if (0 == strcmp(values.values[0].value.str, values.values[1].value.str))
@@ -1409,7 +1420,7 @@ static int	evaluate_STR_one(int func, zbx_vector_ptr_t *regexps, const char *val
 	return FAIL;
 }
 
-static int	evaluate_STR(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_STR(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char			*__function_name = "evaluate_STR";
 	char				*arg1 = NULL;
@@ -1440,12 +1451,12 @@ static int	evaluate_STR(char *value, DB_ITEM *item, const char *function, const
 	if (2 < (nparams = num_param(parameters)))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_str(item->hostid, parameters, 1, &arg1))
+	if (SUCCEED != get_function_parameter_str(item->host.hostid, parameters, 1, &arg1))
 		goto out;
 
 	if (2 == nparams)
 	{
-		if (SUCCEED != get_function_parameter_uint31_default(item->hostid, parameters, 2, &arg2, &flag,
+		if (SUCCEED != get_function_parameter_uint31_default(item->host.hostid, parameters, 2, &arg2, &flag,
 				1, ZBX_FLAG_VALUES) || 0 == arg2)
 		{
 			goto out;
@@ -1531,7 +1542,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_STRLEN(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_STRLEN(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char	*__function_name = "evaluate_STRLEN";
 	int		ret = FAIL;
@@ -1566,17 +1577,16 @@ clean:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_FUZZYTIME(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_FUZZYTIME(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
-	const char			*__function_name = "evaluate_FUZZYTIME";
-	int				arg1, flag, ret = FAIL;
-	zbx_vector_history_record_t	values;
-	history_value_t			*lastvalue;
-	zbx_uint64_t			fuzlow, fuzhig;
+	const char		*__function_name = "evaluate_FUZZYTIME";
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+	int			arg1, flag, found, ret = FAIL;
+	zbx_history_record_t	vc_value;
+	zbx_uint64_t		fuzlow, fuzhig;
+	zbx_timespec_t		ts = {now, 999999999};
 
-	zbx_history_record_vector_create(&values);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
 		goto out;
@@ -1584,41 +1594,38 @@ static int	evaluate_FUZZYTIME(char *value, DB_ITEM *item, const char *function,
 	if (1 < num_param(parameters))
 		goto out;
 
-	if (SUCCEED != get_function_parameter_uint31(item->hostid, parameters, 1, &arg1, &flag))
+	if (SUCCEED != get_function_parameter_uint31(item->host.hostid, parameters, 1, &arg1, &flag))
 		goto out;
 
 	if (ZBX_FLAG_SEC != flag || now <= arg1)
 		goto out;
 
-	if (SUCCEED != zbx_vc_get_value_range(item->itemid, item->value_type, &values, 0, 1, now) ||
-			1 > values.values_num)
-	{
+	if (SUCCEED != zbx_vc_get_value(item->itemid, item->value_type, &ts, &vc_value, &found) || 1 != found)
 		goto out;
-	}
 
 	fuzlow = (int)(now - arg1);
 	fuzhig = (int)(now + arg1);
 
-	lastvalue = &values.values[0].value;
-
 	if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
 	{
-		if (lastvalue->ui64 >= fuzlow && lastvalue->ui64 <= fuzhig)
+		if (vc_value.value.ui64 >= fuzlow && vc_value.value.ui64 <= fuzhig)
 			zbx_strlcpy(value, "1", MAX_BUFFER_LEN);
 		else
 			zbx_strlcpy(value, "0", MAX_BUFFER_LEN);
 	}
 	else
 	{
-		if (lastvalue->dbl >= fuzlow && lastvalue->dbl <= fuzhig)
+		if (vc_value.value.dbl >= fuzlow && vc_value.value.dbl <= fuzhig)
 			zbx_strlcpy(value, "1", MAX_BUFFER_LEN);
 		else
 			zbx_strlcpy(value, "0", MAX_BUFFER_LEN);
 	}
 
+	zbx_history_record_clear(&vc_value, item->value_type);
+
 	ret = SUCCEED;
 out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
 	return ret;
 }
@@ -1644,7 +1651,7 @@ out:
  *               FAIL - failed to evaluate function                           *
  *                                                                            *
  ******************************************************************************/
-static int	evaluate_BAND(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now)
+static int	evaluate_BAND(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now)
 {
 	const char	*__function_name = "evaluate_BAND";
 	char		*last_parameters = NULL;
@@ -1659,7 +1666,7 @@ static int	evaluate_BAND(char *value, DB_ITEM *item, const char *function, const
 	if (3 < (nparams = num_param(parameters)))
 		goto clean;
 
-	if (SUCCEED != get_function_parameter_uint64(item->hostid, parameters, 2, &mask, &mask_flag) ||
+	if (SUCCEED != get_function_parameter_uint64(item->host.hostid, parameters, 2, &mask, &mask_flag) ||
 			ZBX_FLAG_SEC != mask_flag)
 	{
 		goto clean;
@@ -1697,15 +1704,16 @@ clean:
  *               FAIL - evaluation failed                                     *
  *                                                                            *
  ******************************************************************************/
-int	evaluate_function(char *value, DB_ITEM *item, const char *function, const char *parameter, time_t now)
+int	evaluate_function(char *value, DC_ITEM *item, const char *function, const char *parameter, time_t now,
+		char **error)
 {
 	const char	*__function_name = "evaluate_function";
 
 	int		ret;
 	struct tm	*tm = NULL;
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() function:'%s.%s(%s)'", __function_name,
-			zbx_host_key_string_by_item(item), function, parameter);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() function:'%s:%s.%s(%s)'", __function_name,
+			item->host.host, item->key_orig, function, parameter);
 
 	*value = '\0';
 
@@ -1743,7 +1751,7 @@ int	evaluate_function(char *value, DB_ITEM *item, const char *function, const ch
 	}
 	else if (0 == strcmp(function, "nodata"))
 	{
-		ret = evaluate_NODATA(value, item, function, parameter);
+		ret = evaluate_NODATA(value, item, function, parameter, error);
 	}
 	else if (0 == strcmp(function, "date"))
 	{
@@ -1816,7 +1824,7 @@ int	evaluate_function(char *value, DB_ITEM *item, const char *function, const ch
 	}
 	else
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "unsupported function:%s", function);
+		*error = zbx_strdup(*error, "function is not supported");
 		ret = FAIL;
 	}
 
@@ -2021,7 +2029,7 @@ static void	add_value_suffix_normal(char *value, size_t max_len, const char *uni
 		value_double /= base * base * base * base;
 	}
 
-	if (SUCCEED != cmp_double((int)(value_double + 0.5), value_double))
+	if (SUCCEED != zbx_double_compare((int)(value_double + 0.5), value_double))
 	{
 		zbx_snprintf(tmp, sizeof(tmp), ZBX_FS_DBL_EXT(2), value_double);
 		del_zeroes(tmp);
@@ -2193,39 +2201,24 @@ int	evaluate_macro_function(char *value, const char *host, const char *key, cons
 {
 	const char	*__function_name = "evaluate_macro_function";
 
-	DB_ITEM		item;
-	DB_RESULT	result;
-	DB_ROW		row;
-	char		*host_esc, *key_esc;
-	int		ret;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() function:'%s:%s.%s(%s)'",
-			__function_name, host, key, function, parameter);
+	zbx_host_key_t	host_key = {host, key};
+	DC_ITEM		item;
+	char		*error = NULL;
+	int		ret = FAIL, errcode;
 
-	host_esc = DBdyn_escape_string(host);
-	key_esc = DBdyn_escape_string(key);
-
-	result = DBselect(
-			"select %s"
-			" where h.host='%s'"
-				" and h.hostid=i.hostid"
-				" and i.key_='%s'",
-			ZBX_SQL_ITEM_SELECT, host_esc, key_esc);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() function:'%s:%s.%s(%s)'", __function_name, host, key, function, parameter);
 
-	zbx_free(host_esc);
-	zbx_free(key_esc);
+	DCconfig_get_items_by_keys(&item, &host_key, &errcode, 1);
 
-	if (NULL == (row = DBfetch(result)))
+	if (SUCCEED != errcode)
 	{
-		DBfree_result(result);
-		zabbix_log(LOG_LEVEL_WARNING, "Function [%s:%s.%s(%s)] not found. Query returned empty result",
+		zabbix_log(LOG_LEVEL_DEBUG,
+				"cannot evaluate function \"%s:%s.%s(%s)\": item does not exist",
 				host, key, function, parameter);
-		return FAIL;
+		goto out;
 	}
 
-	DBget_item_from_db(&item, row);
-
-	if (SUCCEED == (ret = evaluate_function(value, &item, function, parameter, time(NULL))))
+	if (SUCCEED == (ret = evaluate_function(value, &item, function, parameter, time(NULL), &error)))
 	{
 		if (SUCCEED == str_in_list("last,prev", function, ','))
 		{
@@ -2245,10 +2238,11 @@ int	evaluate_macro_function(char *value, const char *host, const char *key, cons
 		}
 	}
 
-	DBfree_result(result); /* cannot call DBfree_result until evaluate_FUNC */
+	zbx_free(error);
+out:
+	DCconfig_clean_items(&item, &errcode, 1);
 
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s value:'%s'", __function_name,
-			zbx_result_string(ret), value);
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s value:'%s'", __function_name, zbx_result_string(ret), value);
 
 	return ret;
 }
diff --git a/src/libs/zbxserver/evalfunc.h b/src/libs/zbxserver/evalfunc.h
index 5e122d5572d..2fc3fc26e6a 100644
--- a/src/libs/zbxserver/evalfunc.h
+++ b/src/libs/zbxserver/evalfunc.h
@@ -26,8 +26,6 @@
 #define ZBX_FLAG_SEC	0
 #define ZBX_FLAG_VALUES	1
 
-int	cmp_double(double a, double b);
-
 int	evaluate_macro_function(char *value, const char *host, const char *key,
 		const char *function, const char *parameter);
 
diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c
index 233ab37e5b7..f847dc8b9c1 100644
--- a/src/libs/zbxserver/expression.c
+++ b/src/libs/zbxserver/expression.c
@@ -124,7 +124,7 @@ static int	get_N_functionid(const char *expression, int N_functionid, zbx_uint64
  *             functionids  - [OUT] the resulting vector of function ids      *
  *                                                                            *
  ******************************************************************************/
-static void	get_functionids(zbx_vector_uint64_t *functionids, const char *expression)
+void	get_functionids(zbx_vector_uint64_t *functionids, const char *expression)
 {
 	const char	*start = expression;
 	zbx_uint64_t	functionid;
@@ -178,193 +178,6 @@ static int	get_N_itemid(const char *expression, int N_functionid, zbx_uint64_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_simple                                                  *
- *                                                                            *
- * Purpose: evaluate simple expression                                        *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result - value of the      *
- *                         expression                                         *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
- * Comments: format: <double> or <double> <operator> <double>                 *
- *                                                                            *
- *           It is recursive function!                                        *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_simple(double *result, char *expression, char *error, int maxerrlen)
-{
-	double	value1, value2;
-	char	*p, c;
-
-	zbx_lrtrim(expression, " ");
-
-	/* compress repeating - and + and add prefix N to negative numbers */
-	compress_signs(expression);
-
-	/* we should process negative prefix, i.e. N123 == -123 */
-	if ('N' == *expression && SUCCEED == is_double_suffix(expression + 1))
-	{
-		/* str2double supports suffixes */
-		*result = -str2double(expression + 1);
-		return SUCCEED;
-	}
-	else if ('N' != *expression && SUCCEED == is_double_suffix(expression))
-	{
-		/* str2double supports suffixes */
-		*result = str2double(expression);
-		return SUCCEED;
-	}
-
-	/* operators with lowest priority come first */
-	/* HIGHEST / * - + < > # = & | LOWEST */
-	if (NULL != (p = strchr(expression, '|')) || NULL != (p = strchr(expression, '&')) ||
-			NULL != (p = strchr(expression, '=')) || NULL != (p = strchr(expression, '#')) ||
-			NULL != (p = strchr(expression, '>')) || NULL != (p = strchr(expression, '<')) ||
-			NULL != (p = strchr(expression, '+')) || NULL != (p = strrchr(expression, '-')) ||
-			NULL != (p = strchr(expression, '*')) || NULL != (p = strrchr(expression, '/')))
-	{
-		c = *p;
-		*p = '\0';
-
-		if (SUCCEED != evaluate_simple(&value1, expression, error, maxerrlen) ||
-				SUCCEED != evaluate_simple(&value2, p + 1, error, maxerrlen))
-		{
-			*p = c;
-			return FAIL;
-		}
-
-		*p = c;
-	}
-	else
-	{
-		zbx_snprintf(error, maxerrlen, "Format error or unsupported operator. Exp: [%s]", expression);
-		return FAIL;
-	}
-
-	switch (c)
-	{
-		case '|':
-			*result = (SUCCEED != cmp_double(value1, 0) || SUCCEED != cmp_double(value2, 0));
-			break;
-		case '&':
-			*result = (SUCCEED != cmp_double(value1, 0) && SUCCEED != cmp_double(value2, 0));
-			break;
-		case '=':
-			*result = (SUCCEED == cmp_double(value1, value2));
-			break;
-		case '#':
-			*result = (SUCCEED != cmp_double(value1, value2));
-			break;
-		case '>':
-			*result = (value1 >= value2 + TRIGGER_EPSILON);
-			break;
-		case '<':
-			*result = (value1 <= value2 - TRIGGER_EPSILON);
-			break;
-		case '+':
-			*result = value1 + value2;
-			break;
-		case '-':
-			*result = value1 - value2;
-			break;
-		case '*':
-			*result = value1 * value2;
-			break;
-		case '/':
-			if (SUCCEED == cmp_double(value2, 0))
-			{
-				zbx_snprintf(error, maxerrlen, "Division by zero. Cannot evaluate expression [%s]", expression);
-				return FAIL;
-			}
-
-			*result = value1 / value2;
-			break;
-	}
-
-	return SUCCEED;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate                                                         *
- *                                                                            *
- * Purpose: evaluate simplified expression                                    *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result - value of the      *
- *                         expression                                         *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
- * Comments: example: ({15}>10)|({123}=1)                                     *
- *                                                                            *
- ******************************************************************************/
-int	evaluate(double *value, char *expression, char *error, int maxerrlen)
-{
-	const char	*__function_name = "evaluate";
-	char		*res = NULL, simple[MAX_STRING_LEN], tmp[MAX_STRING_LEN],
-			value_str[MAX_STRING_LEN], c;
-	int		i, l, r;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() expression:'%s'", __function_name, expression);
-
-	strscpy(tmp, expression);
-
-	while (NULL != strchr(tmp, ')'))
-	{
-		l = -1;
-		r = strchr(tmp, ')') - tmp;
-
-		for (i = r; i >= 0; i--)
-		{
-			if ('(' == tmp[i])
-			{
-				l = i;
-				break;
-			}
-		}
-
-		if (-1 == l)
-		{
-			zbx_snprintf(error, maxerrlen, "Cannot find left bracket [(]. Expression:[%s]", tmp);
-			return FAIL;
-		}
-
-		for (i = l + 1; i < r; i++)
-			simple[i - l - 1] = tmp[i];
-
-		simple[r - l - 1] = '\0';
-
-		if (SUCCEED != evaluate_simple(value, simple, error, maxerrlen))
-			return FAIL;
-
-		c = tmp[l];
-		tmp[l] = '\0';
-		res = zbx_strdcat(res, tmp);
-		tmp[l] = c;
-
-		zbx_snprintf(value_str, sizeof(value_str), ZBX_FS_DBL, *value);
-		res = zbx_strdcat(res, value_str);
-		res = zbx_strdcat(res, tmp + r + 1);
-
-		zbx_remove_spaces(res);
-		strscpy(tmp, res);
-
-		zbx_free(res);
-	}
-
-	if (SUCCEED != evaluate_simple(value, tmp, error, maxerrlen))
-		return FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() value:" ZBX_FS_DBL, __function_name, *value);
-
-	return SUCCEED;
-}
-
-/******************************************************************************
- *                                                                            *
  * Function: extract_numbers                                                  *
  *                                                                            *
  * Purpose: Extract from string numbers with prefixes (A-Z)                   *
@@ -1516,27 +1329,29 @@ static int	DBitem_lastvalue(const char *expression, char **lastvalue, int N_func
 
 	if (NULL != (row = DBfetch(result)))
 	{
-		unsigned char			value_type;
-		zbx_uint64_t			valuemapid;
-		zbx_vector_history_record_t	values;
+		unsigned char		value_type;
+		zbx_uint64_t		valuemapid;
+		zbx_history_record_t	vc_value;
+		zbx_timespec_t		ts;
+		int			found;
 
-		zbx_history_record_vector_create(&values);
+		ts.sec = time(NULL);
+		ts.ns = 999999999;
 
 		value_type = (unsigned char)atoi(row[0]);
 		ZBX_DBROW2UINT64(valuemapid, row[1]);
 
-		if (SUCCEED == zbx_vc_get_value_range(itemid, value_type, &values, 0, 1, time(NULL)) &&
-				0 < values.values_num)
+		if (SUCCEED == zbx_vc_get_value(itemid, value_type, &ts, &vc_value, &found) && 1 == found)
 		{
 			char	tmp[MAX_STRING_LEN];
 
-			zbx_vc_history_value2str(tmp, sizeof(tmp), &values.values[0].value, value_type);
+			zbx_vc_history_value2str(tmp, sizeof(tmp), &vc_value.value, value_type);
+			zbx_history_record_clear(&vc_value, value_type);
 			zbx_format_value(tmp, sizeof(tmp), valuemapid, row[2], value_type);
 			*lastvalue = zbx_strdup(*lastvalue, tmp);
 
 			ret = SUCCEED;
 		}
-		zbx_history_record_vector_destroy(&values, value_type);
 	}
 	DBfree_result(result);
 out:
@@ -1551,15 +1366,9 @@ out:
  *                                                                            *
  * Purpose: retrieve item value by trigger expression and number of function  *
  *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
  *               otherwise FAIL                                               *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
- * Comments:                                                                  *
- *                                                                            *
  ******************************************************************************/
 static int	DBitem_value(const char *expression, char **value, int N_functionid, int clock, int ns)
 {
@@ -3753,87 +3562,96 @@ static void	zbx_evaluate_item_functions(zbx_vector_ptr_t *ifuncs)
 {
 	const char	*__function_name = "zbx_evaluate_item_functions";
 
-	DB_RESULT	result;
-	DB_ROW		row;
-	DB_ITEM		item;
-	char		*sql = NULL, value[MAX_BUFFER_LEN];
-	size_t		sql_alloc = 2 * ZBX_KIBIBYTE, sql_offset = 0;
-	int		i;
+	DC_ITEM		*items = NULL;
+	char		value[MAX_BUFFER_LEN], *error = NULL;
+	int		i, k;
 	zbx_ifunc_t	*ifunc = NULL;
 	zbx_func_t	*func;
 	zbx_uint64_t	*itemids = NULL;
-	unsigned char	host_status, item_status;
+	int		*errcodes = NULL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() ifuncs_num:%d", __function_name, ifuncs->values_num);
 
-	sql = zbx_malloc(sql, sql_alloc);
 	itemids = zbx_malloc(itemids, ifuncs->values_num * sizeof(zbx_uint64_t));
 
 	for (i = 0; i < ifuncs->values_num; i++)
 		itemids[i] = ((zbx_ifunc_t *)ifuncs->values[i])->itemid;
 
-	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-			"select %s,h.status,i.status"
-			" from %s"
-			" where i.hostid=h.hostid"
-				" and",
-			ZBX_SQL_ITEM_FIELDS, ZBX_SQL_ITEM_TABLES);
-	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "i.itemid", itemids, ifuncs->values_num);
-
-	zbx_free(itemids);
+	items = zbx_malloc(items, sizeof(DC_ITEM) * ifuncs->values_num);
+	errcodes = zbx_malloc(errcodes, sizeof(int) * ifuncs->values_num);
 
-	result = DBselect("%s", sql);
+	DCconfig_get_items_by_itemids(items, itemids, errcodes, ifuncs->values_num);
 
-	zbx_free(sql);
+	zbx_free(itemids);
 
-	while (NULL != (row = DBfetch(result)))
+	for (i = 0; i < ifuncs->values_num; i++)
 	{
-		DBget_item_from_db(&item, row);
-
-		host_status = (unsigned char)atoi(row[ZBX_SQL_ITEM_FIELDS_NUM]);
-		item_status = (unsigned char)atoi(row[ZBX_SQL_ITEM_FIELDS_NUM + 1]);
-
-		if (FAIL == (i = zbx_vector_ptr_bsearch(ifuncs, &item.itemid, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC)))
-		{
-			THIS_SHOULD_NEVER_HAPPEN;
-			continue;
-		}
-
 		ifunc = (zbx_ifunc_t *)ifuncs->values[i];
 
-		for (i = 0; i < ifunc->functions.values_num; i++)
+		for (k = 0; k < ifunc->functions.values_num; k++)
 		{
-			func = (zbx_func_t *)ifunc->functions.values[i];
+			func = (zbx_func_t *)ifunc->functions.values[k];
 
-			if (ITEM_STATUS_DISABLED == item_status)
+			if (SUCCEED != errcodes[i])
 			{
-				func->error = zbx_dsprintf(func->error, "Item disabled for function: {%s:%s.%s(%s)}",
-						item.host_name, item.key, func->function, func->parameter);
+				func->error = zbx_dsprintf(func->error, "Cannot evaluate function \"%s(%s)\":"
+						" item does not exist.",
+						func->function, func->parameter);
+				continue;
 			}
-			else if (ITEM_STATE_NOTSUPPORTED == item.state)
+
+			if (ITEM_STATUS_ACTIVE != items[i].status)
 			{
-				func->error = zbx_dsprintf(func->error, "Item not supported for function: {%s:%s.%s(%s)}",
-						item.host_name, item.key, func->function, func->parameter);
+				func->error = zbx_dsprintf(func->error, "Cannot evaluate function \"%s:%s.%s(%s)\":"
+						" item is disabled.",
+						items[i].host.host, items[i].key_orig, func->function, func->parameter);
+				continue;
 			}
-			else if (HOST_STATUS_NOT_MONITORED == host_status)
+
+			if (HOST_STATUS_MONITORED != items[i].host.status)
 			{
-				func->error = zbx_dsprintf(func->error, "Host disabled for function: {%s:%s.%s(%s)}",
-						item.host_name, item.key, func->function, func->parameter);
+				func->error = zbx_dsprintf(func->error, "Cannot evaluate function \"%s:%s.%s(%s)\":"
+						" item belongs to a disabled host.",
+						items[i].host.host, items[i].key_orig, func->function, func->parameter);
+				continue;
 			}
 
-			if (NULL != func->error)
+			if (ITEM_STATE_NOTSUPPORTED == items[i].state)
+			{
+				func->error = zbx_dsprintf(func->error, "Cannot evaluate function \"%s:%s.%s(%s)\":"
+						" item is not supported.",
+						items[i].host.host, items[i].key_orig, func->function, func->parameter);
 				continue;
+			}
 
-			if (SUCCEED != evaluate_function(value, &item, func->function, func->parameter, func->timespec.sec))
+			if (SUCCEED != evaluate_function(value, &items[i], func->function, func->parameter,
+					func->timespec.sec, &error))
 			{
-				func->error = zbx_dsprintf(func->error, "Evaluation failed for function: {%s:%s.%s(%s)}",
-						item.host_name, item.key, func->function, func->parameter);
+				if (NULL != error)
+				{
+					func->error = zbx_dsprintf(func->error,
+							"Cannot evaluate function \"%s:%s.%s(%s)\": %s.",
+							items[i].host.host, items[i].key_orig, func->function,
+							func->parameter, error);
+					zbx_free(error);
+				}
+				else
+				{
+					func->error = zbx_dsprintf(func->error,
+							"Cannot evaluate function \"%s:%s.%s(%s)\".",
+							items[i].host.host, items[i].key_orig,
+							func->function, func->parameter);
+				}
 			}
 			else
 				func->value = zbx_strdup(func->value, value);
 		}
 	}
-	DBfree_result(result);
+
+	DCconfig_clean_items(items, errcodes, ifuncs->values_num);
+
+	zbx_free(errcodes);
+	zbx_free(items);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
@@ -3980,7 +3798,7 @@ static void	zbx_free_item_functions(zbx_vector_ptr_t *ifuncs)
  *                                                                            *
  * Author: Alexei Vladishev, Alexander Vladishev, Aleksandrs Saveljevs        *
  *                                                                            *
- * Comments: example: "({15}>10)|({123}=0)" => "(6.456>10)|(0=0)"             *
+ * Comments: example: "({15}>10) or ({123}=1)" => "(26.416>10) or (0=1)"      *
  *                                                                            *
  ******************************************************************************/
 static void	substitute_functions(zbx_vector_ptr_t *triggers)
@@ -4055,8 +3873,6 @@ void	evaluate_expressions(zbx_vector_ptr_t *triggers)
 		/* when evaluating trigger expression                                                 */
 		event.trigger.expression = tr->expression_orig;
 
-		zbx_remove_whitespace(tr->expression);
-
 		if (SUCCEED != substitute_simple_macros(NULL, &event, NULL, NULL, NULL, NULL, NULL,
 				&tr->expression, MACRO_TYPE_TRIGGER_EXPRESSION, err, sizeof(err)))
 		{
@@ -4079,7 +3895,7 @@ void	evaluate_expressions(zbx_vector_ptr_t *triggers)
 			tr->new_error = zbx_strdup(tr->new_error, err);
 			tr->new_value = TRIGGER_VALUE_UNKNOWN;
 		}
-		else if (SUCCEED == cmp_double(expr_result, 0))
+		else if (SUCCEED == zbx_double_compare(expr_result, 0))
 		{
 			tr->new_value = TRIGGER_VALUE_OK;
 		}
@@ -4367,195 +4183,3 @@ int	substitute_key_macros(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, s
 
 	return ret;
 }
-
-#define ZBX_OPCODE_AND		'&'
-#define ZBX_OPCODE_OR		'|'
-#define ZBX_OPCODE_OPEN		'('
-#define ZBX_OPCODE_CLOSE	')'
-
-#define ZBX_OPCODE_CLASS_NONE		0
-#define ZBX_OPCODE_CLASS_OP_BINARY	1
-#define ZBX_OPCODE_CLASS_VALUE		2
-
-/******************************************************************************
- *                                                                            *
- * Function: expression_get_token                                             *
- *                                                                            *
- * Purpose: return the first token from an expression                         *
- *                                                                            *
- * Parameters: expression  - [IN] the source expression                       *
- *             start       - [OUT] a pointer to the token start (the first    *
- *                                 token character)                           *
- *             end         - [OUT] a pointer to the token end (the next after *
- *                                 last token character)                      *
- *                                                                            *
- * Comments: A token is either a sequence of alphanumeric and '_', '{', '}'   *
- *           characters or any other non whitespace character.                *
- *                                                                            *
- ******************************************************************************/
-static void	expression_get_token(const char *expression, char const **start, char const **end)
-{
-	const char	*pstart = expression, *pend;
-	int		token_class;
-
-	/* strip leading whitespace */
-	while (' ' == *pstart)
-		pstart++;
-
-	pend = pstart;
-
-	if ('\0' == *pend)
-		goto out;
-
-	/* get the token class */
-	if ('{' == *pend)
-		token_class = ZBX_OPCODE_CLASS_VALUE;
-	else if (0 != islower(*pend))
-		token_class = ZBX_OPCODE_CLASS_OP_BINARY;
-	else
-		token_class = ZBX_OPCODE_CLASS_NONE;
-
-	pend++;
-
-	/* find the next token */
-	while('\0' != *pend)
-	{
-		switch (token_class)
-		{
-			case ZBX_OPCODE_CLASS_NONE:
-				goto out;
-			case ZBX_OPCODE_CLASS_VALUE:
-				if ('}' == *pend)
-				{
-					pend++;
-					goto out;
-				}
-				if (0 == isdigit(*pend))
-					goto out;
-				break;
-			case ZBX_OPCODE_CLASS_OP_BINARY:
-				if (0 == islower(*pend))
-					goto out;
-		}
-		pend++;
-	}
-out:
-	*start = pstart;
-	*end = pend;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: translate_expression                                             *
- *                                                                            *
- * Purpose: translate logical expression containing AND/OR operators into     *
- *          internal format with &/| operators and remove whitespace.         *
- *                                                                            *
- * Parameters: expression  - [IN] the source expression                       *
- *             out         - [OUT] the resulting expression                   *
- *             error       - [OUT] a short error description                  *
- *                                                                            *
- * Return value: SUCCEED - the expression was translated successfully         *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- * Comments: This function allocates memory for output expression which must  *
- *           be freed by the caller.                                          *
- *           In the case of failure the error description is allocated by     *
- *           this function and must be freed by the caller.                   *
- *                                                                            *
- ******************************************************************************/
-int	translate_expression(const char *expression, char **out, char **error)
-{
-	const char	*__function_name = "translate_expression";
-
-	const char	*start, *end = expression;
-	int		level = 0, last_op = 0, ret = FAIL;
-	size_t		token_len, out_offset = 0, out_alloc = 0;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
-
-	while ('\0' != *end)
-	{
-		expression_get_token(end, &start, &end);
-
-		token_len = end - start;
-
-		if (3 == token_len && 0 == strncmp(start, "and", token_len))
-		{
-			/* check if the previous op was a logical value */
-			if (ZBX_OPCODE_CLASS_VALUE != last_op)
-				goto out;
-
-			zbx_chrcpy_alloc(out, &out_alloc, &out_offset, ZBX_OPCODE_AND);
-			last_op = ZBX_OPCODE_CLASS_OP_BINARY;
-		}
-		else if (2 == token_len && 0 == strncmp(start, "or", token_len))
-		{
-			/* check if the previous op was a logical value */
-			if (ZBX_OPCODE_CLASS_VALUE != last_op)
-				goto out;
-
-			zbx_chrcpy_alloc(out, &out_alloc, &out_offset, ZBX_OPCODE_OR);
-			last_op = ZBX_OPCODE_CLASS_OP_BINARY;
-		}
-		else if (1 == token_len && '(' == *start)
-		{
-			/* check if the previous op was a logical value */
-			if (ZBX_OPCODE_CLASS_VALUE == last_op)
-				goto out;
-
-			level++;
-
-			zbx_chrcpy_alloc(out, &out_alloc, &out_offset, ZBX_OPCODE_OPEN);
-			last_op = ZBX_OPCODE_CLASS_NONE;
-		}
-		else if (1 == token_len && ')' == *start)
-		{
-			/* check if the previous op was a logical value */
-			if (ZBX_OPCODE_CLASS_VALUE != last_op)
-				goto out;
-
-			/* check for matching parentheses */
-			if (0 >= level)
-				goto out;
-
-			level--;
-
-			zbx_chrcpy_alloc(out, &out_alloc, &out_offset, ZBX_OPCODE_CLOSE);
-			last_op = ZBX_OPCODE_CLASS_VALUE;
-		}
-		else if (2 < token_len && '{' == *start && '}' == start[token_len - 1])
-		{
-			/* check if the previous op was a logical value */
-			if (ZBX_OPCODE_CLASS_VALUE == last_op)
-				goto out;
-
-			zbx_strncpy_alloc(out, &out_alloc, &out_offset, start, token_len);
-			last_op = ZBX_OPCODE_CLASS_VALUE;
-		}
-		else
-		{
-			if (start != end)
-				goto out;
-		}
-	}
-
-	/* check for matching parentheses */
-	if (0 != level)
-		goto out;
-
-	zbx_strncpy_alloc(out, &out_alloc, &out_offset, "", 0);
-
-	ret = SUCCEED;
-out:
-	if (SUCCEED != ret)
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "invalid expression '%s': error at position " ZBX_FS_SIZE_T,
-				expression, (zbx_fs_size_t)(start - expression));
-		*error = zbx_strdup(*error, "Invalid formula expression.");
-	}
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
-
-	return ret;
-}
diff --git a/src/libs/zbxsys/mutexs.c b/src/libs/zbxsys/mutexs.c
index 98860af2377..e8f0340713d 100644
--- a/src/libs/zbxsys/mutexs.c
+++ b/src/libs/zbxsys/mutexs.c
@@ -118,7 +118,7 @@ lbl_create:
 			{
 				zbx_error("cannot recreate Zabbix semaphores for IPC key 0x%lx Semaphore ID %ld: %s",
 						sem_key, ZBX_SEM_LIST_ID, zbx_strerror(errno));
-				exit(FAIL);
+				exit(EXIT_FAILURE);
 			}
 
 			/* semaphore is successfully removed */
@@ -128,7 +128,7 @@ lbl_create:
 			{
 				zbx_error("cannot recreate Zabbix semaphores for IPC key 0x%lx: too many attempts",
 						sem_key);
-				exit(FAIL);
+				exit(EXIT_FAILURE);
 			}
 
 			if ((ZBX_MAX_ATTEMPTS / 2) < attempts)
@@ -196,7 +196,7 @@ void	__zbx_mutex_lock(const char *filename, int line, ZBX_MUTEX *mutex)
 	{
 		zbx_error("[file:'%s',line:%d] lock failed: %s",
 				filename, line, strerror_from_system(GetLastError()));
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 #else
 	sem_lock.sem_num = *mutex;
@@ -208,7 +208,7 @@ void	__zbx_mutex_lock(const char *filename, int line, ZBX_MUTEX *mutex)
 		if (EINTR != errno)
 		{
 			zbx_error("[file:'%s',line:%d] lock failed: %s", filename, line, zbx_strerror(errno));
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 	}
 #endif
@@ -239,7 +239,7 @@ void	__zbx_mutex_unlock(const char *filename, int line, ZBX_MUTEX *mutex)
 	{
 		zbx_error("[file:'%s',line:%d] unlock failed: %s",
 				filename, line, strerror_from_system(GetLastError()));
-		exit(FAIL);
+		exit(EXIT_FAILURE);
 	}
 #else
 	sem_unlock.sem_num = *mutex;
@@ -251,7 +251,7 @@ void	__zbx_mutex_unlock(const char *filename, int line, ZBX_MUTEX *mutex)
 		if (EINTR != errno)
 		{
 			zbx_error("[file:'%s',line:%d] unlock failed: %s", filename, line, zbx_strerror(errno));
-			exit(FAIL);
+			exit(EXIT_FAILURE);
 		}
 	}
 #endif
@@ -290,244 +290,3 @@ int	zbx_mutex_destroy(ZBX_MUTEX *mutex)
 
 	return ZBX_MUTEX_OK;
 }
-
-#if defined(HAVE_SQLITE3)
-
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This part of source file is subject to version 3.01 of the           |
-   | PHP license, that is bundled with this package in the file LICENSE,  |
-   | and is available through the world-wide-web at the following url:    |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Tom May <tom@go2net.com>                                    |
-   |          Gavin Sherry <gavin@linuxworld.com.au>                      |
-   +----------------------------------------------------------------------+
- */
-
-/* Semaphore functions using System V semaphores.  Each semaphore
- * actually consists of three semaphores allocated as a unit under the
- * same key.  Semaphore 0 (SYSVSEM_SEM) is the actual semaphore, it is
- * initialized to max_acquire and decremented as processes acquire it.
- * The value of semaphore 1 (SYSVSEM_USAGE) is a count of the number
- * of processes using the semaphore.  After calling semget(), if a
- * process finds that the usage count is 1, it will set the value of
- * SYSVSEM_SEM to max_acquire.  This allows max_acquire to be set and
- * track the PHP code without having a global init routine or external
- * semaphore init code.  Except see the bug regarding a race condition
- * php_sysvsem_get().  Semaphore 2 (SYSVSEM_SETVAL) serializes the
- * calls to GETVAL SYSVSEM_USAGE and SETVAL SYSVSEM_SEM.  It can be
- * acquired only when it is zero.
- */
-
-#define SYSVSEM_SEM	0
-#define SYSVSEM_USAGE	1
-#define SYSVSEM_SETVAL	2
-
-int	php_sem_get(PHP_MUTEX *sem_ptr, const char *path_name)
-{
-	const char	*__function_name = "php_sem_get";
-	int		max_acquire = 1, count, semid;
-	key_t		sem_key;
-	struct sembuf	sop[3];
-
-	assert(sem_ptr);
-	assert(path_name);
-
-	sem_ptr->semid = -1;
-	sem_ptr->count = 0;
-
-	if (-1 == (sem_key = ftok(path_name, (int)'z')))
-	{
-		zbx_error("%s(): cannot create IPC key for path '%s': %s",
-				__function_name, path_name, zbx_strerror(errno));
-		return PHP_MUTEX_ERROR;
-	}
-
-	/* Get/create the semaphore.  Note that we rely on the semaphores
-	 * being zeroed when they are created.  Despite the fact that
-	 * the(?)  Linux semget() man page says they are not initialized,
-	 * the kernel versions 2.0.x and 2.1.z do in fact zero them.
-	 */
-
-	if (-1 == (semid = semget(sem_key, 3, 0660 | IPC_CREAT)))
-	{
-		zbx_error("%s(): failed for key 0x%lx: %s", __function_name, sem_key, zbx_strerror(errno));
-		return PHP_MUTEX_ERROR;
-	}
-
-	/* Find out how many processes are using this semaphore.  Note
-	 * that on Linux (at least) there is a race condition here because
-	 * semaphore undo on process exit is not atomic, so we could
-	 * acquire SYSVSEM_SETVAL before a crashed process has decremented
-	 * SYSVSEM_USAGE in which case count will be greater than it
-	 * should be and we won't set max_acquire.  Fortunately this
-	 * doesn't actually matter in practice.
-	 */
-
-	/* Wait for sem 1 to be zero . . . */
-
-	sop[0].sem_num = SYSVSEM_SETVAL;
-	sop[0].sem_op = 0;
-	sop[0].sem_flg = 0;
-
-	/* . . . and increment it so it becomes non-zero . . . */
-
-	sop[1].sem_num = SYSVSEM_SETVAL;
-	sop[1].sem_op = 1;
-	sop[1].sem_flg = SEM_UNDO;
-
-	/* . . . and increment the usage count. */
-
-	sop[2].sem_num = SYSVSEM_USAGE;
-	sop[2].sem_op = 1;
-	sop[2].sem_flg = SEM_UNDO;
-
-	while (-1 == semop(semid, sop, 3))
-	{
-		if (EINTR != errno)
-		{
-			zbx_error("%s(): failed acquiring SYSVSEM_SETVAL for key 0x%lx: %s",
-					__function_name, sem_key, zbx_strerror(errno));
-			break;
-		}
-	}
-
-	/* Get the usage count. */
-	if (-1 == (count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL)))
-		zbx_error("%s(): failed for key 0x%lx: %s", __function_name, sem_key, zbx_strerror(errno));
-
-	/* If we are the only user, then take this opportunity to set the max. */
-
-	if (1 == count)
-	{
-		/* This is correct for Linux which has union semun. */
-		union semun	semarg;
-
-		semarg.val = max_acquire;
-		if (-1 == semctl(semid, SYSVSEM_SEM, SETVAL, semarg))
-			zbx_error("%s(): failed for key 0x%lx: %s", __function_name, sem_key, zbx_strerror(errno));
-	}
-
-	/* Set semaphore 1 back to zero. */
-
-	sop[0].sem_num = SYSVSEM_SETVAL;
-	sop[0].sem_op = -1;
-	sop[0].sem_flg = SEM_UNDO;
-
-	while (-1 == semop(semid, sop, 1))
-	{
-		if (EINTR != errno)
-		{
-			zbx_error("%s(): failed releasing SYSVSEM_SETVAL for key 0x%lx: %s",
-					__function_name, sem_key, zbx_strerror(errno));
-			break;
-		}
-	}
-
-	sem_ptr->semid = semid;
-
-	return PHP_MUTEX_OK;
-}
-
-static int	php_sysvsem_semop(PHP_MUTEX *sem_ptr, int acquire)
-{
-	struct sembuf sop;
-
-	assert(sem_ptr);
-
-	if (-1 == sem_ptr->semid)
-		return PHP_MUTEX_OK;
-
-	if (0 == acquire && 0 == sem_ptr->count)
-	{
-		zbx_error("SysV semaphore (id %d) is not currently acquired", sem_ptr->semid);
-		return PHP_MUTEX_ERROR;
-	}
-
-	sop.sem_num = SYSVSEM_SEM;
-	sop.sem_op = (acquire ? -1 : 1);
-	sop.sem_flg = SEM_UNDO;
-
-	while (-1 == semop(sem_ptr->semid, &sop, 1))
-	{
-		if (EINTR != errno)
-		{
-			zbx_error("php_sysvsem_semop(): failed to %s semaphore (id %d): %s",
-					(acquire ? "acquire" : "release"), sem_ptr->semid, zbx_strerror(errno));
-			return PHP_MUTEX_ERROR;
-		}
-	}
-
-	sem_ptr->count -= (acquire ? -1 : 1);
-
-	return PHP_MUTEX_OK;
-}
-
-int	php_sem_acquire(PHP_MUTEX *sem_ptr)
-{
-	return php_sysvsem_semop(sem_ptr, 1);
-}
-
-int	php_sem_release(PHP_MUTEX *sem_ptr)
-{
-	return php_sysvsem_semop(sem_ptr, 0);
-}
-
-int	php_sem_remove(PHP_MUTEX *sem_ptr)
-{
-	const char	*__function_name = "php_sem_remove";
-	union semun	un;
-	struct semid_ds	buf;
-	struct sembuf	sop[2];
-	int		opcnt = 1;
-
-	assert(sem_ptr);
-
-	if (-1 == sem_ptr->semid)
-		return PHP_MUTEX_OK;
-
-	/* Decrement the usage count. */
-
-	sop[0].sem_num = SYSVSEM_USAGE;
-	sop[0].sem_op = -1;
-	sop[0].sem_flg = SEM_UNDO;
-
-	if (sem_ptr->count)
-	{
-		sop[1].sem_num = SYSVSEM_SEM;
-		sop[1].sem_op = sem_ptr->count;
-		sop[1].sem_flg = SEM_UNDO;
-
-		opcnt++;
-	}
-
-	if (-1 == semop(sem_ptr->semid, sop, opcnt))
-	{
-		zbx_error("%s(): failed for (id %d): %s", __function_name, sem_ptr->semid, zbx_strerror(errno));
-		return PHP_MUTEX_ERROR;
-	}
-
-	un.buf = &buf;
-	if (-1 == semctl(sem_ptr->semid, 0, IPC_STAT, un))
-	{
-		zbx_error("%s(): SysV semaphore (id %d) does not (any longer) exist", __function_name, sem_ptr->semid);
-		return PHP_MUTEX_ERROR;
-	}
-
-	if (-1 == semctl(sem_ptr->semid, 0, IPC_RMID, un))
-		return PHP_MUTEX_ERROR;
-
-	sem_ptr->semid = -1;
-
-	return PHP_MUTEX_OK;
-}
-
-#endif	/* HAVE_SQLITE3 */
diff --git a/src/libs/zbxsys/symbols.c b/src/libs/zbxsys/symbols.c
index dddc351c0f0..3f81884fd7b 100644
--- a/src/libs/zbxsys/symbols.c
+++ b/src/libs/zbxsys/symbols.c
@@ -26,8 +26,9 @@ DWORD	(__stdcall *zbx_GetGuiResources)(HANDLE, DWORD) = NULL;
 BOOL	(__stdcall *zbx_GetProcessIoCounters)(HANDLE, PIO_COUNTERS) = NULL;
 BOOL	(__stdcall *zbx_GetPerformanceInfo)(PPERFORMANCE_INFORMATION, DWORD) = NULL;
 BOOL	(__stdcall *zbx_GlobalMemoryStatusEx)(LPMEMORYSTATUSEX) = NULL;
+BOOL	(__stdcall *zbx_GetFileInformationByHandleEx)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, LPVOID, DWORD) = NULL;
 
-static FARPROC	GetProcAddressAndLog(HMODULE hModule, LPCSTR procName)
+static FARPROC	GetProcAddressAndLog(HMODULE hModule, const char *procName)
 {
 	FARPROC	ptr;
 
@@ -50,6 +51,8 @@ void	import_symbols()
 	{
 		zbx_GetProcessIoCounters = (BOOL (__stdcall *)(HANDLE, PIO_COUNTERS))GetProcAddressAndLog(hModule, "GetProcessIoCounters");
 		zbx_GlobalMemoryStatusEx = (BOOL (__stdcall *)(LPMEMORYSTATUSEX))GetProcAddressAndLog(hModule, "GlobalMemoryStatusEx");
+		zbx_GetFileInformationByHandleEx = (BOOL (__stdcall *)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, LPVOID,
+				DWORD))GetProcAddressAndLog(hModule, "GetFileInformationByHandleEx");
 	}
 	else
 		zabbix_log(LOG_LEVEL_DEBUG, "unable to get handle to KERNEL32.DLL");
diff --git a/src/libs/zbxsys/threads.c b/src/libs/zbxsys/threads.c
index d0ee368da24..0aeba7da9b1 100644
--- a/src/libs/zbxsys/threads.c
+++ b/src/libs/zbxsys/threads.c
@@ -104,7 +104,7 @@ ZBX_THREAD_HANDLE	zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), zbx_thread
 
 		/* The zbx_thread_exit must be called from the handler. */
 		/* And in normal case the program will never reach this point. */
-		zbx_thread_exit(0);
+		zbx_thread_exit(EXIT_SUCCESS);
 		/* program will never reach this point */
 	}
 	else if (-1 == thread)
diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index cc21ba4f040..17e6e8aaa4a 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -48,9 +48,8 @@ libzbxagentsysinfo_a_CFLAGS = \
 	-DWITH_HOSTNAME_METRIC
 
 libzbxagentsysinfo_a_SOURCES = \
-	sysinfo.c \
-	@ARCH@/@ARCH@.c specsysinfo.h \
-	@ARCH@/hostname.c
+	specsysinfo.h \
+	sysinfo.c
 
 # SERVER version of sysinfo library
 libzbxserversysinfo_a_CFLAGS = \
@@ -67,5 +66,4 @@ libzbxproxysysinfo_a_CFLAGS = \
 	-DWITH_HOSTNAME_METRIC
 
 libzbxproxysysinfo_a_SOURCES = \
-	sysinfo.c \
-	@ARCH@/hostname.c
+	sysinfo.c
diff --git a/src/libs/zbxsysinfo/agent/agent.c b/src/libs/zbxsysinfo/agent/agent.c
index dbc37dd6ff8..52aa6cb5786 100644
--- a/src/libs/zbxsysinfo/agent/agent.c
+++ b/src/libs/zbxsysinfo/agent/agent.c
@@ -37,9 +37,12 @@ ZBX_METRIC	parameters_agent[] =
 
 static int	AGENT_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	/* zabbix_agent standalone does not support the Hostname in the configuration file */
 	if (NULL == CONFIG_HOSTNAME)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Hostname parameter is not supported"
+					" in the zabbix_agent configuration file."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, CONFIG_HOSTNAME));
 
diff --git a/src/libs/zbxsysinfo/aix/Makefile.am b/src/libs/zbxsysinfo/aix/Makefile.am
index 1f6f8c56ecd..6f355a7b8ec 100644
--- a/src/libs/zbxsysinfo/aix/Makefile.am
+++ b/src/libs/zbxsysinfo/aix/Makefile.am
@@ -1,10 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
 libspecsysinfo_a_SOURCES = \
+	aix.c \
 	cpu.c \
 	diskio.c \
 	diskspace.c \
@@ -18,3 +19,5 @@ libspecsysinfo_a_SOURCES = \
 	uptime.c \
 	vmstats.c
 
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/aix/aix.c b/src/libs/zbxsysinfo/aix/aix.c
index 112fad1cfd4..1fd314a1bcb 100644
--- a/src/libs/zbxsysinfo/aix/aix.c
+++ b/src/libs/zbxsysinfo/aix/aix.c
@@ -27,6 +27,9 @@ ZBX_METRIC	parameters_specific[] =
 	{"vfs.fs.inode",	CF_HAVEPARAMS,	VFS_FS_INODE,		"/,free"},
 	{"vfs.fs.discovery",	0,		VFS_FS_DISCOVERY,	NULL},
 
+	{"vfs.dev.read",	CF_HAVEPARAMS,	VFS_DEV_READ,		"hdisk0,operations"},
+	{"vfs.dev.write",	CF_HAVEPARAMS,	VFS_DEV_WRITE,		"hdisk0,operations"},
+
 	{"net.if.in",		CF_HAVEPARAMS,	NET_IF_IN,		"lo0,bytes"},
 	{"net.if.out",		CF_HAVEPARAMS,	NET_IF_OUT,		"lo0,bytes"},
 	{"net.if.total",	CF_HAVEPARAMS,	NET_IF_TOTAL,		"lo0,bytes"},
@@ -43,6 +46,7 @@ ZBX_METRIC	parameters_specific[] =
 	{"system.cpu.util",	CF_HAVEPARAMS,	SYSTEM_CPU_UTIL,	"all,user,avg1"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
 	{"system.cpu.num",	CF_HAVEPARAMS,	SYSTEM_CPU_NUM,		"online"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.uname",	0,		SYSTEM_UNAME,		NULL},
 
diff --git a/src/libs/zbxsysinfo/aix/cpu.c b/src/libs/zbxsysinfo/aix/cpu.c
index e1e7d48a9cd..ee606775aba 100644
--- a/src/libs/zbxsysinfo/aix/cpu.c
+++ b/src/libs/zbxsysinfo/aix/cpu.c
@@ -20,6 +20,47 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "stats.h"
+#include "log.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
+
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
 
 int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -28,21 +69,31 @@ int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	perfstat_cpu_total_t	ps_cpu_total;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	/* only "online" (default) for parameter "type" is supported */
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "online"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == perfstat_cpu_total(NULL, &ps_cpu_total, sizeof(ps_cpu_total), 1))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, ps_cpu_total.ncpus);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
@@ -53,14 +104,20 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	cpu_num, state, mode;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		cpu_num = 0;
 	else if (SUCCEED != is_uint31_1(tmp, &cpu_num))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 	else
 		cpu_num++;
 
@@ -75,7 +132,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "iowait"))
 		state = ZBX_CPU_STATE_IOWAIT;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 2);
 
@@ -86,9 +146,20 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	return get_cpustat(result, cpu_num, state, mode);
+	if (SYSINFO_RET_FAIL == get_cpustat(result, cpu_num, state, mode))
+	{
+		if (!ISSET_MSG(result))
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain CPU information."));
+
+		return SYSINFO_RET_FAIL;
+	}
+
+	return SYSINFO_RET_OK;
 }
 
 int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
@@ -103,14 +174,20 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double			value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		per_cpu = 0;
 	else if (0 != strcmp(tmp, "percpu"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -121,17 +198,26 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == perfstat_cpu_total(NULL, &ps_cpu_total, sizeof(ps_cpu_total), 1))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	value = (double)ps_cpu_total.loadavg[mode] / (1 << SBITS);
 
 	if (1 == per_cpu)
 	{
 		if (0 >= ps_cpu_total.ncpus)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 			return SYSINFO_RET_FAIL;
+		}
 		value /= ps_cpu_total.ncpus;
 	}
 
@@ -139,6 +225,7 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
@@ -149,12 +236,16 @@ int     SYSTEM_CPU_SWITCHES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	perfstat_cpu_total_t	ps_cpu_total;
 
 	if (-1 == perfstat_cpu_total(NULL, &ps_cpu_total, sizeof(ps_cpu_total), 1))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)ps_cpu_total.pswitch);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
@@ -165,12 +256,16 @@ int     SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	perfstat_cpu_total_t	ps_cpu_total;
 
 	if (-1 == perfstat_cpu_total(NULL, &ps_cpu_total, sizeof(ps_cpu_total), 1))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)ps_cpu_total.devintrs);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/aix/diskio.c b/src/libs/zbxsysinfo/aix/diskio.c
index 88dc2841dcc..f9da7c476b9 100644
--- a/src/libs/zbxsysinfo/aix/diskio.c
+++ b/src/libs/zbxsysinfo/aix/diskio.c
@@ -19,8 +19,199 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
+
+#define ZBX_DEV_PFX	"/dev/"
+
+typedef struct
+{
+	zbx_uint64_t	nread;
+	zbx_uint64_t	nwritten;
+	zbx_uint64_t	reads;
+	zbx_uint64_t	writes;
+}
+zbx_perfstat_t;
 
 int	get_diskstat(const char *devname, zbx_uint64_t *dstat)
 {
 	return FAIL;
 }
+
+static int	get_perfstat_io(const char *devname, zbx_perfstat_t *zp, char **error)
+{
+#if defined(HAVE_LIBPERFSTAT)
+	int	err;
+
+	if ('\0' != *devname)
+	{
+		perfstat_id_t	name;
+		perfstat_disk_t	data;
+
+		strscpy(name.name, devname);
+
+		if (0 < (err = perfstat_disk(&name, &data, sizeof(data), 1)))
+		{
+			zp->nread = data.rblks * data.bsize;
+			zp->nwritten = data.wblks * data.bsize;
+			zp->reads = data.xrate;
+			zp->writes = data.xfers - data.xrate;
+
+			return SYSINFO_RET_OK;
+		}
+	}
+	else
+	{
+		perfstat_disk_total_t	data;
+
+		if (0 < (err = perfstat_disk_total(NULL, &data, sizeof(data), 1)))
+		{
+			zp->nread = data.rblks * 512;
+			zp->nwritten = data.wblks * 512;
+			zp->reads = data.xrate;
+			zp->writes = data.xfers - data.xrate;
+
+			return SYSINFO_RET_OK;
+		}
+	}
+
+	if (0 == err)
+		*error = zbx_strdup(NULL, "Cannot obtain system information.");
+	else
+		*error = zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno));
+
+	return SYSINFO_RET_FAIL;
+#else
+	*error = zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
+	return SYSINFO_RET_FAIL;
+#endif
+}
+
+static int	VFS_DEV_READ_BYTES(const char *devname, AGENT_RESULT *result)
+{
+	zbx_perfstat_t	zp;
+	char		*error;
+
+	if (SYSINFO_RET_OK != get_perfstat_io(devname, &zp, &error))
+	{
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
+	}
+
+	SET_UI64_RESULT(result, zp.nread);
+
+	return SYSINFO_RET_OK;
+}
+
+static int	VFS_DEV_READ_OPERATIONS(const char *devname, AGENT_RESULT *result)
+{
+	zbx_perfstat_t	zp;
+	char		*error;
+
+	if (SYSINFO_RET_OK != get_perfstat_io(devname, &zp, &error))
+	{
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
+	}
+
+	SET_UI64_RESULT(result, zp.reads);
+
+	return SYSINFO_RET_OK;
+}
+
+static int	VFS_DEV_WRITE_BYTES(const char *devname, AGENT_RESULT *result)
+{
+	zbx_perfstat_t	zp;
+	char		*error;
+
+	if (SYSINFO_RET_OK != get_perfstat_io(devname, &zp, &error))
+	{
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
+	}
+
+	SET_UI64_RESULT(result, zp.nwritten);
+
+	return SYSINFO_RET_OK;
+}
+
+static int	VFS_DEV_WRITE_OPERATIONS(const char *devname, AGENT_RESULT *result)
+{
+	zbx_perfstat_t	zp;
+	char		*error;
+
+	if (SYSINFO_RET_OK != get_perfstat_io(devname, &zp, &error))
+	{
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
+	}
+
+	SET_UI64_RESULT(result, zp.writes);
+
+	return SYSINFO_RET_OK;
+}
+
+int	VFS_DEV_READ(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	const char	*devname, *type;
+	int		ret;
+
+	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	devname = get_rparam(request, 0);
+
+	if (NULL == devname || 0 == strcmp("all", devname))
+		devname = "";
+	else if (0 == strncmp(ZBX_DEV_PFX, devname, sizeof(ZBX_DEV_PFX) - 1))
+		devname += sizeof(ZBX_DEV_PFX) - 1;
+
+	type = get_rparam(request, 1);
+
+	if (NULL == type || '\0' == *type || 0 == strcmp(type, "operations"))
+		ret = VFS_DEV_READ_OPERATIONS(devname, result);
+	else if (0 == strcmp(type, "bytes"))
+		ret = VFS_DEV_READ_BYTES(devname, result);
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	return ret;
+}
+
+int	VFS_DEV_WRITE(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	const char	*devname, *type;
+	int		ret;
+
+	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	devname = get_rparam(request, 0);
+
+	if (NULL == devname || 0 == strcmp("all", devname))
+		devname = "";
+	else if (0 == strncmp(ZBX_DEV_PFX, devname, sizeof(ZBX_DEV_PFX) - 1))
+		devname += sizeof(ZBX_DEV_PFX) - 1;
+
+	type = get_rparam(request, 1);
+
+	if (NULL == type || '\0' == *type || 0 == strcmp(type, "operations"))
+		ret = VFS_DEV_WRITE_OPERATIONS(devname, result);
+	else if (0 == strcmp(type, "bytes"))
+		ret = VFS_DEV_WRITE_BYTES(devname, result);
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	return ret;
+}
diff --git a/src/libs/zbxsysinfo/aix/diskspace.c b/src/libs/zbxsysinfo/aix/diskspace.c
index 149b6df8727..1f84ef37392 100644
--- a/src/libs/zbxsysinfo/aix/diskspace.c
+++ b/src/libs/zbxsysinfo/aix/diskspace.c
@@ -20,31 +20,44 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *free,
-		zbx_uint64_t *used, double *pfree, double *pused)
+		zbx_uint64_t *used, double *pfree, double *pused, char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
-#	define ZBX_STATFS	statvfs
+#	ifdef HAVE_SYS_STATVFS64
+#		define ZBX_STATFS	statvfs64
+#	else
+#		define ZBX_STATFS	statvfs
+#	endif
 #	define ZBX_BSIZE	f_frsize
 #else
-#	define ZBX_STATFS	statfs
+#	ifdef HAVE_SYS_STATFS64
+#		define ZBX_STATFS	statfs64
+#	else
+#		define ZBX_STATFS	statfs
+#	endif
 #	define ZBX_BSIZE	f_bsize
 #endif
 	struct ZBX_STATFS	s;
 
-	assert(fs);
-
 	if (0 != ZBX_STATFS(fs, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
-	if (total)
+	if (NULL != total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
-	if (free)
+
+	if (NULL != free)
 		*free = (zbx_uint64_t)s.f_bavail * s.ZBX_BSIZE;
-	if (used)
+
+	if (NULL != used)
 		*used = (zbx_uint64_t)(s.f_blocks - s.f_bfree) * s.ZBX_BSIZE;
-	if (pfree)
+
+	if (NULL != pfree)
 	{
 		if (0 != s.f_blocks - s.f_bfree + s.f_bavail)
 			*pfree = (double)(100.0 * s.f_bavail) /
@@ -52,7 +65,8 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 		else
 			*pfree = 0;
 	}
-	if (pused)
+
+	if (NULL != pused)
 	{
 		if (0 != s.f_blocks - s.f_bfree + s.f_bavail)
 			*pused = 100.0 - (double)(100.0 * s.f_bavail) /
@@ -66,10 +80,14 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 
 static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -78,10 +96,14 @@ static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -90,10 +112,14 @@ static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -103,10 +129,14 @@ static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -115,10 +145,14 @@ static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -131,13 +165,19 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == fsname || '\0' == *fsname)
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))
 		ret = VFS_FS_TOTAL(fsname, result);
@@ -150,7 +190,10 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		ret = VFS_FS_PUSED(fsname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
@@ -171,25 +214,31 @@ static const char	*zbx_get_vfs_name_by_type(int type)
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	int		rc, sz, i, ret = SYSINFO_RET_FAIL;
-	struct vmount	*vm = NULL;
+	struct vmount	*vms = NULL, *vm;
 	struct zbx_json	j;
 
 	/* check how many bytes to allocate for the mounted filesystems */
 	if (-1 == (rc = mntctl(MCTL_QUERY, sizeof(sz), (char *)&sz)))
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
 
-	vm = zbx_malloc(vm, (size_t)sz);
+	vms = zbx_malloc(vms, (size_t)sz);
 
 	/* get the list of mounted filesystems */
 	/* return code is number of filesystems returned */
-	if (-1 == (rc = mntctl(MCTL_QUERY, sz, (char *)vm)))
+	if (-1 == (rc = mntctl(MCTL_QUERY, sz, (char *)vms)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		goto error;
+	}
 
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	for (i = 0; i < rc; i++)
+	for (i = 0, vm = vms; i < rc; i++)
 	{
 		zbx_json_addobject(&j, NULL);
 		zbx_json_addstring(&j, "{#FSNAME}", (char *)vm + vm->vmt_data[VMT_STUB].vmt_off, ZBX_JSON_TYPE_STRING);
@@ -208,7 +257,7 @@ int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	ret = SYSINFO_RET_OK;
 error:
-	zbx_free(vm);
+	zbx_free(vms);
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/aix/hostname.c b/src/libs/zbxsysinfo/aix/hostname.c
index c0ccec5fc00..804b9a90050 100644
--- a/src/libs/zbxsysinfo/aix/hostname.c
+++ b/src/libs/zbxsysinfo/aix/hostname.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -32,7 +33,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
 
diff --git a/src/libs/zbxsysinfo/aix/inodes.c b/src/libs/zbxsysinfo/aix/inodes.c
index a505199ad9b..a2b9814993d 100644
--- a/src/libs/zbxsysinfo/aix/inodes.c
+++ b/src/libs/zbxsysinfo/aix/inodes.c
@@ -19,14 +19,23 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 #ifdef HAVE_SYS_STATVFS_H
-#	define ZBX_STATFS	statvfs
+#	ifdef HAVE_SYS_STATVFS64
+#		define ZBX_STATFS	statvfs64
+#	else
+#		define ZBX_STATFS	statvfs
+#	endif
 #	define ZBX_FFREE	f_favail
 #else
-#	define ZBX_STATFS	statfs
+#	ifdef HAVE_SYS_STATFS64
+#		define ZBX_STATFS	statfs64
+#	else
+#		define ZBX_STATFS	statfs
+#	endif
 #	define ZBX_FFREE	f_ffree
 #endif
 	char			*fsname, *mode;
@@ -34,13 +43,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 		SET_UI64_RESULT(result, s.f_files);
@@ -57,7 +79,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -68,10 +93,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/aix/memory.c b/src/libs/zbxsysinfo/aix/memory.c
index 276d5fa1b30..c674c873159 100644
--- a/src/libs/zbxsysinfo/aix/memory.c
+++ b/src/libs/zbxsysinfo/aix/memory.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_LIBPERFSTAT
 
@@ -26,10 +27,14 @@ static perfstat_memory_total_t	m;
 
 #define ZBX_PERFSTAT_PAGE_SHIFT	12	/* 4 KB */
 
-#define ZBX_PERFSTAT_MEMORY_TOTAL()					\
-									\
-	if (-1 == perfstat_memory_total(NULL, &m, sizeof(m), 1))	\
-		return SYSINFO_RET_FAIL
+#define ZBX_PERFSTAT_MEMORY_TOTAL()									\
+													\
+	if (-1 == perfstat_memory_total(NULL, &m, sizeof(m), 1))					\
+	{												\
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s",	\
+				zbx_strerror(errno)));							\
+		return SYSINFO_RET_FAIL;								\
+	}
 
 static int	VM_MEMORY_TOTAL(AGENT_RESULT *result)
 {
@@ -72,7 +77,10 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 	ZBX_PERFSTAT_MEMORY_TOTAL();
 
 	if (0 == m.real_total)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, m.real_inuse / (double)m.real_total * 100);
 
@@ -93,7 +101,10 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	ZBX_PERFSTAT_MEMORY_TOTAL();
 
 	if (0 == m.real_total)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, m.real_free / (double)m.real_total * 100);
 
@@ -113,13 +124,15 @@ static int	VM_MEMORY_CACHED(AGENT_RESULT *result)
 
 int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int	ret = SYSINFO_RET_FAIL;
-
 #ifdef HAVE_LIBPERFSTAT
+	int	ret;
 	char	*mode;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
@@ -140,7 +153,14 @@ int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "cached"))
 		ret = VM_MEMORY_CACHED(result);
 	else
-		ret = SYSINFO_RET_FAIL;
-#endif
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
 	return ret;
+#else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
+	return SYSINFO_RET_FAIL;
+#endif
 }
diff --git a/src/libs/zbxsysinfo/aix/net.c b/src/libs/zbxsysinfo/aix/net.c
index 170d3750b1c..df0c93f90e4 100644
--- a/src/libs/zbxsysinfo/aix/net.c
+++ b/src/libs/zbxsysinfo/aix/net.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 typedef struct
 {
@@ -33,21 +34,25 @@ typedef struct
 }
 net_stat_t;
 
-static int	get_net_stat(const char *if_name, net_stat_t *ns)
+static int	get_net_stat(const char *if_name, net_stat_t *ns, char **error)
 {
 #if defined(HAVE_LIBPERFSTAT)
 	perfstat_id_t		ps_id;
 	perfstat_netinterface_t	ps_netif;
-#endif
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		*error = zbx_strdup(NULL, "Network interface name cannot be empty.");
 		return SYSINFO_RET_FAIL;
+	}
 
-#if defined(HAVE_LIBPERFSTAT)
 	strscpy(ps_id.name, if_name);
 
 	if (-1 == perfstat_netinterface(&ps_id, &ps_netif, sizeof(ps_netif), 1))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	ns->ibytes = (zbx_uint64_t)ps_netif.ibytes;
 	ns->ipackets = (zbx_uint64_t)ps_netif.ipackets;
@@ -61,114 +66,138 @@ static int	get_net_stat(const char *if_name, net_stat_t *ns)
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
 
 int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	net_stat_t	ns;
-	int		ret = SYSINFO_RET_OK;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK == get_net_stat(if_name, &ns))
+	if (SYSINFO_RET_FAIL == get_net_stat(if_name, &ns, &error))
 	{
-		if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
-			SET_UI64_RESULT(result, ns.ibytes);
-		else if (0 == strcmp(mode, "packets"))
-			SET_UI64_RESULT(result, ns.ipackets);
-		else if (0 == strcmp(mode, "errors"))
-			SET_UI64_RESULT(result, ns.ierr);
-		else
-			ret = SYSINFO_RET_FAIL;
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
 	}
+
+	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
+		SET_UI64_RESULT(result, ns.ibytes);
+	else if (0 == strcmp(mode, "packets"))
+		SET_UI64_RESULT(result, ns.ipackets);
+	else if (0 == strcmp(mode, "errors"))
+		SET_UI64_RESULT(result, ns.ierr);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	net_stat_t	ns;
-	int		ret = SYSINFO_RET_OK;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK == get_net_stat(if_name, &ns))
+	if (SYSINFO_RET_FAIL == get_net_stat(if_name, &ns, &error))
 	{
-		if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
-			SET_UI64_RESULT(result, ns.obytes);
-		else if (0 == strcmp(mode, "packets"))
-			SET_UI64_RESULT(result, ns.opackets);
-		else if (0 == strcmp(mode, "errors"))
-			SET_UI64_RESULT(result, ns.oerr);
-		else
-			ret = SYSINFO_RET_FAIL;
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
 	}
+
+	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
+		SET_UI64_RESULT(result, ns.obytes);
+	else if (0 == strcmp(mode, "packets"))
+		SET_UI64_RESULT(result, ns.opackets);
+	else if (0 == strcmp(mode, "errors"))
+		SET_UI64_RESULT(result, ns.oerr);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	net_stat_t	ns;
-	int		ret = SYSINFO_RET_OK;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK == get_net_stat(if_name, &ns))
+	if (SYSINFO_RET_FAIL == get_net_stat(if_name, &ns, &error))
 	{
-		if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
-			SET_UI64_RESULT(result, ns.ibytes + ns.obytes);
-		else if (0 == strcmp(mode, "packets"))
-			SET_UI64_RESULT(result, ns.ipackets + ns.opackets);
-		else if (0 == strcmp(mode, "errors"))
-			SET_UI64_RESULT(result, ns.ierr + ns.oerr);
-		else
-			ret = SYSINFO_RET_FAIL;
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
 	}
+
+	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
+		SET_UI64_RESULT(result, ns.ibytes + ns.obytes);
+	else if (0 == strcmp(mode, "packets"))
+		SET_UI64_RESULT(result, ns.ipackets + ns.opackets);
+	else if (0 == strcmp(mode, "errors"))
+		SET_UI64_RESULT(result, ns.ierr + ns.oerr);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name;
+	char		*if_name, *error;
 	net_stat_t	ns;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 
-	if (SYSINFO_RET_OK == get_net_stat(if_name, &ns))
+	if (SYSINFO_RET_FAIL == get_net_stat(if_name, &ns, &error))
 	{
-		SET_UI64_RESULT(result, ns.colls);
-		return SYSINFO_RET_OK;
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
 	}
 
-	return SYSINFO_RET_FAIL;
+	SET_UI64_RESULT(result, ns.colls);
+
+	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
@@ -181,7 +210,10 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	/* check how many perfstat_netinterface_t structures are available */
 	if (-1 == (rc = perfstat_netinterface(NULL, NULL, sizeof(perfstat_netinterface_t), 0)))
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
 
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
@@ -221,6 +253,7 @@ end:
 
 	return ret;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/aix/proc.c b/src/libs/zbxsysinfo/aix/proc.c
index d9635e6ff4f..e326bceb6c9 100644
--- a/src/libs/zbxsysinfo/aix/proc.c
+++ b/src/libs/zbxsysinfo/aix/proc.c
@@ -74,15 +74,21 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	zbx_uint64_t		memsize = 0, proccount = 0, value;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain user information."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -98,7 +104,10 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
@@ -149,15 +158,21 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	zbx_uint64_t		proccount = 0;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain user information."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -173,7 +188,10 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "zomb"))
 		zbx_proc_stat = ZBX_PROC_STAT_ZOMB;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
diff --git a/src/libs/zbxsysinfo/aix/software.c b/src/libs/zbxsysinfo/aix/software.c
index 4dea0e6d6fd..fa4c702ab88 100644
--- a/src/libs/zbxsysinfo/aix/software.c
+++ b/src/libs/zbxsysinfo/aix/software.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
diff --git a/src/libs/zbxsysinfo/aix/swap.c b/src/libs/zbxsysinfo/aix/swap.c
index f5e7a873882..108f42522ae 100644
--- a/src/libs/zbxsysinfo/aix/swap.c
+++ b/src/libs/zbxsysinfo/aix/swap.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 #define ZBX_PERFSTAT_PAGE_SHIFT	12	/* 4 KB */
 
@@ -29,16 +30,25 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char			*swapdev, *mode;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	if(1 != perfstat_memory_total(NULL, &mem, sizeof(perfstat_memory_total_t), 1))
+	if (1 != perfstat_memory_total(NULL, &mem, sizeof(perfstat_memory_total_t), 1))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "free"))
 		SET_UI64_RESULT(result, mem.pgsp_free << ZBX_PERFSTAT_PAGE_SHIFT);
@@ -51,9 +61,14 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		SET_DBL_RESULT(result, mem.pgsp_total ? 100.0 - 100.0 * (mem.pgsp_free / (double)mem.pgsp_total) : 0.0);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
-#endif
+#else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
 	return SYSINFO_RET_FAIL;
+#endif
 }
diff --git a/src/libs/zbxsysinfo/aix/system.c b/src/libs/zbxsysinfo/aix/system.c
index ac58d08dcd9..849bd967c32 100644
--- a/src/libs/zbxsysinfo/aix/system.c
+++ b/src/libs/zbxsysinfo/aix/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine));
diff --git a/src/libs/zbxsysinfo/aix/uptime.c b/src/libs/zbxsysinfo/aix/uptime.c
index ea69845aa57..02bab2b763c 100644
--- a/src/libs/zbxsysinfo/aix/uptime.c
+++ b/src/libs/zbxsysinfo/aix/uptime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 static long	hertz = 0;
 
@@ -27,22 +28,37 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 #if defined(HAVE_LIBPERFSTAT)
 	perfstat_cpu_total_t	ps_cpu_total;
 
-	if (0 == hertz)
+	if (0 >= hertz)
 	{
 		hertz = sysconf(_SC_CLK_TCK);
 
-		/* make sure we do not divide by 0 */
-		assert(hertz);
+		if (-1 == hertz)
+		{
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain clock-tick increment: %s",
+					zbx_strerror(errno)));
+			return SYSINFO_RET_FAIL;
+		}
+
+		if (0 == hertz)	/* make sure we do not divide by 0 */
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate uptime because clock-tick increment"
+					" is zero."));
+			return SYSINFO_RET_FAIL;
+		}
 	}
 
 	/* AIX 6.1 */
 	if (-1 == perfstat_cpu_total(NULL, &ps_cpu_total, sizeof(ps_cpu_total), 1))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)((double)ps_cpu_total.lbolt / hertz));
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for Perfstat API."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/aix/vmstats.c b/src/libs/zbxsysinfo/aix/vmstats.c
index e4e5bdb269f..0d4b55e4e8b 100644
--- a/src/libs/zbxsysinfo/aix/vmstats.c
+++ b/src/libs/zbxsysinfo/aix/vmstats.c
@@ -30,7 +30,7 @@ int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	if (!VMSTAT_COLLECTOR_STARTED(collector))
 	{
-		SET_MSG_RESULT(result, strdup("Collector is not started!"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -47,27 +47,47 @@ int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result)
 		}
 
 		if (0 == collector->vmstat.data_available)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "No data available in collector."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	section = get_rparam(request, 0);
 	type = get_rparam(request, 1);
 
 	if (NULL == section)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (0 == strcmp(section, "ent"))
 	{
-		if (1 == request->nparam && collector->vmstat.shared_enabled)
-			SET_DBL_RESULT(result, collector->vmstat.ent);
-		else
+		if (1 != request->nparam && 0 != collector->vmstat.shared_enabled)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid number of parameters."));
+			return SYSINFO_RET_FAIL;
+		}
+		else if (0 == collector->vmstat.shared_enabled)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "No data available in collector."));
 			return SYSINFO_RET_FAIL;
+		}
+		else
+			SET_DBL_RESULT(result, collector->vmstat.ent);
 	}
 	else if (NULL == type)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (0 == strcmp(section, "kthr"))
 	{
@@ -76,7 +96,10 @@ int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result)
 		else if (0 == strcmp(type, "b"))
 			SET_DBL_RESULT(result, collector->vmstat.kthr_b);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(section, "page"))
 	{
@@ -93,7 +116,10 @@ int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result)
 		else if (0 == strcmp(type, "sr"))
 			SET_DBL_RESULT(result, collector->vmstat.sr);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(section, "faults"))
 	{
@@ -104,7 +130,10 @@ int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result)
 		else if (0 == strcmp(type, "cs"))
 			SET_DBL_RESULT(result, collector->vmstat.cs);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(section, "cpu"))
 	{
@@ -125,7 +154,10 @@ int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result)
 		else if (0 == strcmp(type, "app") && collector->vmstat.shared_enabled && collector->vmstat.pool_util_authority)
 			SET_DBL_RESULT(result, collector->vmstat.cpu_app);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(section, "disk"))
 	{
@@ -134,7 +166,10 @@ int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result)
 		else if (0 == strcmp(type, "tps"))
 			SET_DBL_RESULT(result, collector->vmstat.disk_tps);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(section, "memory"))
 	{
@@ -143,10 +178,16 @@ int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result)
 		else if (0 == strcmp(type, "fre"))
 			SET_UI64_RESULT(result, collector->vmstat.mem_fre);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/common.c
index 6d8119d29af..302632d1296 100644
--- a/src/libs/zbxsysinfo/common/common.c
+++ b/src/libs/zbxsysinfo/common/common.c
@@ -77,7 +77,7 @@ ZBX_METRIC	parameters_common[] =
 
 static int	ONLY_ACTIVE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	SET_MSG_RESULT(result, zbx_strdup(NULL, "Accessible only as active check!"));
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Accessible only as active check."));
 
 	return SYSINFO_RET_FAIL;
 }
@@ -88,7 +88,10 @@ int	EXECUTE_USER_PARAMETER(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char	*command;
 
 	if (1 != request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	command = get_rparam(request, 0);
 
@@ -126,7 +129,10 @@ int	EXECUTE_STR(const char *command, AGENT_RESULT *result)
 			command, strlen(cmd_result), cmd_result);
 
 	if ('\0' == *cmd_result)	/* we got whitespace only */
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid result. Non-empty output is expected."));
 		goto lbl_exit;
+	}
 
 	SET_TEXT_RESULT(result, zbx_strdup(NULL, cmd_result));
 
@@ -145,6 +151,7 @@ int	EXECUTE_DBL(const char *command, AGENT_RESULT *result)
 	if (NULL == GET_DBL_RESULT(result))
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "Remote command [%s] result is not double", command);
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid result. Double is expected."));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -161,6 +168,7 @@ int	EXECUTE_INT(const char *command, AGENT_RESULT *result)
 	if (NULL == GET_UI64_RESULT(result))
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "Remote command [%s] result is not unsigned integer", command);
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid result. Unsigned integer is expected."));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -174,13 +182,19 @@ static int	SYSTEM_RUN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char	*command, *flag;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	command = get_rparam(request, 0);
 	flag = get_rparam(request, 1);
 
 	if (NULL == command || '\0' == *command)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (1 == CONFIG_LOG_REMOTE_COMMANDS)
 		zabbix_log(LOG_LEVEL_WARNING, "Executing command '%s'", command);
@@ -188,9 +202,22 @@ static int	SYSTEM_RUN(AGENT_REQUEST *request, AGENT_RESULT *result)
 		zabbix_log(LOG_LEVEL_DEBUG, "Executing command '%s'", command);
 
 	if (NULL == flag || '\0' == *flag || 0 == strcmp(flag, "wait"))	/* default parameter */
+	{
 		return EXECUTE_STR(command, result);
-	else if (0 != strcmp(flag, "nowait") || SUCCEED != zbx_execute_nowait(command))
+	}
+	else if (0 == strcmp(flag, "nowait"))
+	{
+		if (SUCCEED != zbx_execute_nowait(command))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot execute command."));
+			return SYSINFO_RET_FAIL;
+		}
+	}
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, 1);
 
diff --git a/src/libs/zbxsysinfo/common/file.c b/src/libs/zbxsysinfo/common/file.c
index a6ac7aa4c23..83a3c13098a 100644
--- a/src/libs/zbxsysinfo/common/file.c
+++ b/src/libs/zbxsysinfo/common/file.c
@@ -22,6 +22,7 @@
 #include "md5.h"
 #include "file.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 #define ZBX_MAX_DB_FILE_SIZE	64 * ZBX_KIBIBYTE	/* files larger than 64 KB cannot be stored in the database */
 
@@ -34,12 +35,24 @@ int	VFS_FILE_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		ret = SYSINFO_RET_FAIL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		goto err;
+	}
 
 	filename = get_rparam(request, 0);
 
-	if (NULL == filename || '\0' == *filename || 0 != zbx_stat(filename, &buf))
+	if (NULL == filename || '\0' == *filename)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		goto err;
+	}
+
+	if (0 != zbx_stat(filename, &buf))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain file information: %s", zbx_strerror(errno)));
 		goto err;
+	}
 
 	SET_UI64_RESULT(result, buf.st_size);
 
@@ -55,13 +68,25 @@ int	VFS_FILE_TIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		ret = SYSINFO_RET_FAIL;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		goto err;
+	}
 
 	filename = get_rparam(request, 0);
 	type = get_rparam(request, 1);
 
-	if (NULL == filename || '\0' == *filename || 0 != zbx_stat(filename, &buf))
+	if (NULL == filename || '\0' == *filename)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		goto err;
+	}
+
+	if (0 != zbx_stat(filename, &buf))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain file information: %s", zbx_strerror(errno)));
 		goto err;
+	}
 
 	if (NULL == type || '\0' == *type || 0 == strcmp(type, "modify"))	/* default parameter */
 		SET_UI64_RESULT(result, buf.st_mtime);
@@ -70,7 +95,10 @@ int	VFS_FILE_TIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(type, "change"))
 		SET_UI64_RESULT(result, buf.st_ctime);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		goto err;
+	}
 
 	ret = SYSINFO_RET_OK;
 err:
@@ -84,12 +112,18 @@ int	VFS_FILE_EXISTS(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		ret = SYSINFO_RET_FAIL, file_exists = -1;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		goto err;
+	}
 
 	filename = get_rparam(request, 0);
 
 	if (NULL == filename || '\0' == *filename)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		goto err;
+	}
 
 	if (0 == zbx_stat(filename, &buf))
 		file_exists = S_ISREG(buf.st_mode) ? 1 : 0;
@@ -117,7 +151,10 @@ int	VFS_FILE_CONTENTS(AGENT_REQUEST *request, AGENT_RESULT *result)
 	ts = zbx_time();
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		goto err;
+	}
 
 	filename = get_rparam(request, 0);
 	tmp = get_rparam(request, 1);
@@ -127,27 +164,54 @@ int	VFS_FILE_CONTENTS(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else
 		strscpy(encoding, tmp);
 
-	if (NULL == filename || '\0' == *filename || 0 != zbx_stat(filename, &stat_buf))
+	if (NULL == filename || '\0' == *filename)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		goto err;
+	}
+
+	if (0 != zbx_stat(filename, &stat_buf))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain file information: %s", zbx_strerror(errno)));
+		goto err;
+	}
 
 	if (CONFIG_TIMEOUT < zbx_time() - ts)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 		goto err;
+	}
 
 	if (ZBX_MAX_DB_FILE_SIZE < stat_buf.st_size)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "File is too large for this check."));
 		goto err;
+	}
 
 	if (-1 == (f = zbx_open(filename, O_RDONLY)))
 		goto err;
 
 	if (CONFIG_TIMEOUT < zbx_time() - ts)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 		goto err;
+	}
 
 	flen = 0;
 
 	while (0 < (nbytes = zbx_read(f, read_buf, sizeof(read_buf), encoding)))
 	{
-		if (CONFIG_TIMEOUT < zbx_time() - ts || ZBX_MAX_DB_FILE_SIZE < (flen += nbytes))
+		if (CONFIG_TIMEOUT < zbx_time() - ts)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 			goto err;
+		}
+
+		if (ZBX_MAX_DB_FILE_SIZE < (flen += nbytes))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "File is too large for this check."));
+			goto err;
+		}
 
 		utf8 = convert_to_utf8(read_buf, nbytes, encoding);
 		zbx_strcpy_alloc(&contents, &contents_alloc, &contents_offset, utf8);
@@ -156,6 +220,7 @@ int	VFS_FILE_CONTENTS(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	if (-1 == nbytes)	/* error occurred */
 	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot read from file."));
 		zbx_free(contents);
 		goto err;
 	}
@@ -190,7 +255,10 @@ int	VFS_FILE_REGEXP(AGENT_REQUEST *request, AGENT_RESULT *result)
 	ts = zbx_time();
 
 	if (6 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		goto err;
+	}
 
 	filename = get_rparam(request, 0);
 	regexp = get_rparam(request, 1);
@@ -200,10 +268,16 @@ int	VFS_FILE_REGEXP(AGENT_REQUEST *request, AGENT_RESULT *result)
 	output = get_rparam(request, 5);
 
 	if (NULL == filename || '\0' == *filename)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		goto err;
+	}
 
 	if (NULL == regexp || '\0' == *regexp)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		goto err;
+	}
 
 	if (NULL == tmp)
 		*encoding = '\0';
@@ -213,37 +287,55 @@ int	VFS_FILE_REGEXP(AGENT_REQUEST *request, AGENT_RESULT *result)
 	if (NULL == start_line_str || '\0' == *start_line_str)
 		start_line = 0;
 	else if (FAIL == is_uint32(start_line_str, &start_line))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid fourth parameter."));
 		goto err;
+	}
 
 	if (NULL == end_line_str || '\0' == *end_line_str)
 		end_line = 0xffffffff;
 	else if (FAIL == is_uint32(end_line_str, &end_line))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid fifth parameter."));
 		goto err;
+	}
 
 	if (start_line > end_line)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Start line parameter must not exceed end line."));
 		goto err;
+	}
 
 	if (-1 == (f = zbx_open(filename, O_RDONLY)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open file: %s", zbx_strerror(errno)));
 		goto err;
+	}
 
 	if (CONFIG_TIMEOUT < zbx_time() - ts)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 		goto err;
+	}
 
 	while (0 < (nbytes = zbx_read(f, buf, sizeof(buf), encoding)))
 	{
 		if (CONFIG_TIMEOUT < zbx_time() - ts)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 			goto err;
+		}
 
 		if (++current_line < start_line)
 			continue;
 
 		utf8 = convert_to_utf8(buf, nbytes, encoding);
+		zbx_rtrim(utf8, "\r\n");
 		ptr = zbx_regexp_sub(utf8, regexp, output);
 		zbx_free(utf8);
 
 		if (NULL != ptr)
 		{
-			zbx_rtrim(ptr, "\r\n ");
 			SET_STR_RESULT(result, ptr);
 			break;
 		}
@@ -257,7 +349,10 @@ int	VFS_FILE_REGEXP(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 
 	if (-1 == nbytes)	/* error occurred */
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot read from file."));
 		goto err;
+	}
 
 	if (0 == nbytes)	/* EOF */
 		SET_STR_RESULT(result, zbx_strdup(NULL, ""));
@@ -281,7 +376,10 @@ int	VFS_FILE_REGMATCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	ts = zbx_time();
 
 	if (5 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		goto err;
+	}
 
 	filename = get_rparam(request, 0);
 	regexp = get_rparam(request, 1);
@@ -290,10 +388,16 @@ int	VFS_FILE_REGMATCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	end_line_str = get_rparam(request, 4);
 
 	if (NULL == filename || '\0' == *filename)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		goto err;
+	}
 
 	if (NULL == regexp || '\0' == *regexp)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		goto err;
+	}
 
 	if (NULL == tmp)
 		*encoding = '\0';
@@ -303,33 +407,52 @@ int	VFS_FILE_REGMATCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	if (NULL == start_line_str || '\0' == *start_line_str)
 		start_line = 0;
 	else if (FAIL == is_uint32(start_line_str, &start_line))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid fourth parameter."));
 		goto err;
+	}
 
 	if (NULL == end_line_str || '\0' == *end_line_str)
 		end_line = 0xffffffff;
 	else if (FAIL == is_uint32(end_line_str, &end_line))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid fifth parameter."));
 		goto err;
+	}
 
 	if (start_line > end_line)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Start line must not exceed end line."));
 		goto err;
+	}
 
 	if (-1 == (f = zbx_open(filename, O_RDONLY)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open file: %s", zbx_strerror(errno)));
 		goto err;
+	}
 
 	if (CONFIG_TIMEOUT < zbx_time() - ts)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 		goto err;
+	}
 
 	res = 0;
 
 	while (0 == res && 0 < (nbytes = zbx_read(f, buf, sizeof(buf), encoding)))
 	{
 		if (CONFIG_TIMEOUT < zbx_time() - ts)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 			goto err;
+		}
 
 		if (++current_line < start_line)
 			continue;
 
 		utf8 = convert_to_utf8(buf, nbytes, encoding);
+		zbx_rtrim(utf8, "\r\n");
 		if (NULL != zbx_regexp_match(utf8, regexp, &len))
 			res = 1;
 		zbx_free(utf8);
@@ -339,7 +462,10 @@ int	VFS_FILE_REGMATCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 
 	if (-1 == nbytes)	/* error occurred */
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot read from file."));
 		goto err;
+	}
 
 	SET_UI64_RESULT(result, res);
 
@@ -365,25 +491,40 @@ int	VFS_FILE_MD5SUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	ts = zbx_time();
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		goto err;
+	}
 
 	filename = get_rparam(request, 0);
 
 	if (NULL == filename || '\0' == *filename)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		goto err;
+	}
 
 	if (-1 == (f = zbx_open(filename, O_RDONLY)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open file: %s", zbx_strerror(errno)));
 		goto err;
+	}
 
 	if (CONFIG_TIMEOUT < zbx_time() - ts)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 		goto err;
+	}
 
 	md5_init(&state);
 
 	while (0 < (nbytes = (int)read(f, buf, sizeof(buf))))
 	{
 		if (CONFIG_TIMEOUT < zbx_time() - ts)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 			goto err;
+		}
 
 		md5_append(&state, (const md5_byte_t *)buf, nbytes);
 	}
@@ -391,7 +532,10 @@ int	VFS_FILE_MD5SUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	md5_finish(&state, hash);
 
 	if (0 > nbytes)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot read from file."));
 		goto err;
+	}
 
 	/* convert MD5 hash to text form */
 
@@ -486,25 +630,40 @@ int	VFS_FILE_CKSUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	ts = zbx_time();
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		goto err;
+	}
 
 	filename = get_rparam(request, 0);
 
 	if (NULL == filename || '\0' == *filename)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		goto err;
+	}
 
 	if (-1 == (f = zbx_open(filename, O_RDONLY)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open file: %s", zbx_strerror(errno)));
 		goto err;
+	}
 
 	if (CONFIG_TIMEOUT < zbx_time() - ts)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 		goto err;
+	}
 
 	crc = flen = 0;
 
 	while (0 < (nr = (int)read(f, buf, sizeof(buf))))
 	{
 		if (CONFIG_TIMEOUT < zbx_time() - ts)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Timeout while processing item."));
 			goto err;
+		}
 
 		flen += nr;
 
@@ -513,7 +672,10 @@ int	VFS_FILE_CKSUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 
 	if (0 > nr)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot read from file."));
 		goto err;
+	}
 
 	/* include the length of the file */
 	for (; 0 != flen; flen >>= 8)
diff --git a/src/libs/zbxsysinfo/common/http.c b/src/libs/zbxsysinfo/common/http.c
index 7b473838f08..aa7bd91970d 100644
--- a/src/libs/zbxsysinfo/common/http.c
+++ b/src/libs/zbxsysinfo/common/http.c
@@ -32,7 +32,6 @@
 static int	get_http_page(const char *host, const char *path, unsigned short port, char *buffer, size_t max_buffer_len)
 {
 	int		ret;
-	char		*recv_buffer;
 	char		request[MAX_STRING_LEN];
 	zbx_sock_t	s;
 
@@ -47,10 +46,10 @@ static int	get_http_page(const char *host, const char *path, unsigned short port
 
 		if (SUCCEED == (ret = zbx_tcp_send_raw(&s, request)))
 		{
-			if (SUCCEED == (ret = SUCCEED_OR_FAIL(zbx_tcp_recv_ext(&s, &recv_buffer, ZBX_TCP_READ_UNTIL_CLOSE, 0))))
+			if (SUCCEED == (ret = SUCCEED_OR_FAIL(zbx_tcp_recv_ext(&s, ZBX_TCP_READ_UNTIL_CLOSE, 0))))
 			{
 				if (NULL != buffer)
-					zbx_strlcpy(buffer, recv_buffer, max_buffer_len);
+					zbx_strlcpy(buffer, s.buffer, max_buffer_len);
 			}
 		}
 
@@ -72,14 +71,20 @@ int	WEB_PAGE_GET(AGENT_REQUEST *request, AGENT_RESULT *result)
 	unsigned short	port_number;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	hostname = get_rparam(request, 0);
 	path_str = get_rparam(request, 1);
 	port_str = get_rparam(request, 2);
 
 	if (NULL == hostname || '\0' == *hostname)
-                return SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == path_str)
 		*path = '\0';
@@ -89,7 +94,10 @@ int	WEB_PAGE_GET(AGENT_REQUEST *request, AGENT_RESULT *result)
 	if (NULL == port_str || '\0' == *port_str)
 		port_number = ZBX_DEFAULT_HTTP_PORT;
 	else if (FAIL == is_ushort(port_str, &port_number))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (SYSINFO_RET_OK == get_http_page(hostname, path, port_number, buffer, sizeof(buffer)))
 	{
@@ -109,14 +117,20 @@ int	WEB_PAGE_PERF(AGENT_REQUEST *request, AGENT_RESULT *result)
 	unsigned short	port_number;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	hostname = get_rparam(request, 0);
 	path_str = get_rparam(request, 1);
 	port_str = get_rparam(request, 2);
 
 	if (NULL == hostname || '\0' == *hostname)
-                return SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == path_str || '\0' == *path_str)
 		*path = '\0';
@@ -126,7 +140,10 @@ int	WEB_PAGE_PERF(AGENT_REQUEST *request, AGENT_RESULT *result)
 	if (NULL == port_str || '\0' == *port_str)
 		port_number = ZBX_DEFAULT_HTTP_PORT;
 	else if (FAIL == is_ushort(port_str, &port_number))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	start_time = zbx_time();
 
@@ -141,13 +158,22 @@ int	WEB_PAGE_PERF(AGENT_REQUEST *request, AGENT_RESULT *result)
 int	WEB_PAGE_REGEXP(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char		*hostname, *path_str, *port_str, *regexp, *length_str, path[MAX_STRING_LEN],
-			*buffer = NULL, *ptr = NULL;
+			*buffer = NULL, *ptr = NULL, *str, *newline;
 	int		length;
 	const char	*output;
 	unsigned short	port_number;
 
 	if (6 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (4 > request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid number of parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	hostname = get_rparam(request, 0);
 	path_str = get_rparam(request, 1);
@@ -156,35 +182,60 @@ int	WEB_PAGE_REGEXP(AGENT_REQUEST *request, AGENT_RESULT *result)
 	length_str = get_rparam(request, 4);
 	output = get_rparam(request, 5);
 
-	if (NULL == hostname || '\0' == *hostname)
-                return SYSINFO_RET_FAIL;
+	if ('\0' == *hostname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	if (NULL == path_str || '\0' == *path_str)
+	if ('\0' == *path_str)
 		*path = '\0';
 	else
 		strscpy(path, path_str);
 
-	if (NULL == port_str || '\0' == *port_str)
+	if ('\0' == *port_str)
 		port_number = ZBX_DEFAULT_HTTP_PORT;
 	else if (FAIL == is_ushort(port_str, &port_number))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
-
-	if (NULL == regexp)
-                return SYSINFO_RET_FAIL;
-
-	/* by default return the matched part of web page */
-	if (NULL == output || '\0' == *output)
-		output = "\\0";
+	}
 
 	if (NULL == length_str || '\0' == *length_str)
 		length = MAX_BUFFER_LEN - 1;
 	else if (FAIL == is_uint31_1(length_str, &length))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid fifth parameter."));
 		return SYSINFO_RET_FAIL;
+	}
+
+	/* by default return the matched part of web page */
+	if (NULL == output || '\0' == *output)
+		output = "\\0";
 
 	buffer = zbx_malloc(buffer, ZBX_MAX_WEBPAGE_SIZE);
 
 	if (SYSINFO_RET_OK == get_http_page(hostname, path, port_number, buffer, ZBX_MAX_WEBPAGE_SIZE))
-		ptr = zbx_regexp_sub(buffer, regexp, output);
+	{
+		for (str = buffer; ;)
+		{
+			if (NULL != (newline = strchr(str, '\n')))
+			{
+				if (str != newline && '\r' == newline[-1])
+					newline[-1] = '\0';
+				else
+					*newline = '\0';
+			}
+
+			if (NULL != (ptr = zbx_regexp_sub(str, regexp, output)))
+				break;
+
+			if (NULL != newline)
+				str = newline + 1;
+			else
+				break;
+		}
+	}
 
 	if (NULL != ptr)
 		SET_STR_RESULT(result, ptr);
diff --git a/src/libs/zbxsysinfo/common/net.c b/src/libs/zbxsysinfo/common/net.c
index 1b49238f7df..1a1b2ca4bd4 100644
--- a/src/libs/zbxsysinfo/common/net.c
+++ b/src/libs/zbxsysinfo/common/net.c
@@ -31,50 +31,51 @@
 #	pragma comment(lib, "Dnsapi.lib") /* add the library for DnsQuery function */
 #endif
 
-/*
- * 0 - NOT OK
- * 1 - OK
- * */
 int	tcp_expect(const char *host, unsigned short port, int timeout, const char *request,
-		const char *expect, const char *sendtoclose, int *value_int)
+		int (*validate_func)(const char *), const char *sendtoclose, int *value_int)
 {
 	zbx_sock_t	s;
-	char		*buf;
-	int		net, val = SUCCEED;
+	const char	*buf;
+	int		net, val = ZBX_TCP_EXPECT_OK;
 
 	*value_int = 0;
 
-	if (SUCCEED == (net = zbx_tcp_connect(&s, CONFIG_SOURCE_IP, host, port, timeout)))
+	if (SUCCEED != (net = zbx_tcp_connect(&s, CONFIG_SOURCE_IP, host, port, timeout)))
+		goto out;
+
+	if (NULL != request)
+		net = zbx_tcp_send_raw(&s, request);
+
+	if (NULL != validate_func && SUCCEED == net)
 	{
-		if (NULL != request)
-			net = zbx_tcp_send_raw(&s, request);
+		val = ZBX_TCP_EXPECT_FAIL;
 
-		if (NULL != expect && SUCCEED == net)
+		while (NULL != (buf = zbx_tcp_recv_line(&s)))
 		{
-			if (SUCCEED == (net = zbx_tcp_recv(&s, &buf)))
+			val = validate_func(buf);
+
+			if (ZBX_TCP_EXPECT_OK == val)
+				break;
+
+			if (ZBX_TCP_EXPECT_FAIL == val)
 			{
-				if (0 != strncmp(buf, expect, strlen(expect)))
-				{
-					val = FAIL;
-				}
+				zabbix_log(LOG_LEVEL_DEBUG, "TCP expect content error, received [%s]", buf);
+				break;
 			}
 		}
+	}
 
-		if (NULL != sendtoclose && SUCCEED == net && SUCCEED == val)
-			zbx_tcp_send_raw(&s, sendtoclose);
+	if (NULL != sendtoclose && SUCCEED == net && ZBX_TCP_EXPECT_OK == val)
+		zbx_tcp_send_raw(&s, sendtoclose);
 
-		if (SUCCEED == net && SUCCEED == val)
-			*value_int = 1;
+	if (SUCCEED == net && ZBX_TCP_EXPECT_OK == val)
+		*value_int = 1;
 
-		zbx_tcp_close(&s);
-	}
-
-	if (FAIL == net)
+	zbx_tcp_close(&s);
+out:
+	if (SUCCEED != net)
 		zabbix_log(LOG_LEVEL_DEBUG, "TCP expect network error: %s", zbx_tcp_strerror());
 
-	if (FAIL == val)
-		zabbix_log(LOG_LEVEL_DEBUG, "TCP expect content error: expected [%s] received [%s]", expect, buf);
-
 	return SYSINFO_RET_OK;
 }
 
@@ -85,7 +86,10 @@ int	NET_TCP_PORT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char		*ip_str, ip[64], *port_str;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	ip_str = get_rparam(request, 0);
 	port_str = get_rparam(request, 1);
@@ -96,7 +100,10 @@ int	NET_TCP_PORT(AGENT_REQUEST *request, AGENT_RESULT *result)
 		strscpy(ip, ip_str);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (SYSINFO_RET_OK == (ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, NULL, NULL, &value_int)))
 		SET_UI64_RESULT(result, value_int);
@@ -108,7 +115,7 @@ int	NET_TCP_PORT(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 static const char	*decode_type(int q_type)
 {
-	static char	buf[16];
+	ZBX_THREAD_LOCAL static char	buf[16];
 
 	switch (q_type)
 	{
@@ -215,7 +222,7 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 
 #ifdef _WINDOWS
 	PDNS_RECORD	pQueryResults, pDnsRecord;
-	LPTSTR		wzone;
+	wchar_t		*wzone;
 	char		tmp2[MAX_STRING_LEN], tmp[MAX_STRING_LEN];
 #else
 	char		*name;
@@ -249,7 +256,10 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 	*buffer = '\0';
 
 	if (5 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	ip = get_rparam(request, 0);
 	zone_str = get_rparam(request, 1);
@@ -275,7 +285,10 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 		}
 
 		if (NULL == qt[i].name)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 
 	param = get_rparam(request, 3);
@@ -283,14 +296,20 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 	if (NULL == param || '\0' == *param)
 		retrans = 1;
 	else if (SUCCEED != is_uint31(param, &retrans) || 0 == retrans)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid fourth parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	param = get_rparam(request, 4);
 
 	if (NULL == param || '\0' == *param)
 		retry = 2;
 	else if (SUCCEED != is_uint31(param, &retry) || 0 == retry)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid fifth parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 #ifdef _WINDOWS
 	wzone = zbx_utf8_to_unicode(zone);
@@ -305,7 +324,10 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 	}
 
 	if (DNS_RCODE_NOERROR != res)
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot perform DNS query: [%d]", res));
 		return SYSINFO_RET_FAIL;
+	}
 
 	pDnsRecord = pQueryResults;
 
@@ -423,15 +445,24 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 	}
 #else	/* not _WINDOWS */
 	if (-1 == res_init())	/* initialize always, settings might have changed */
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot initialize DNS subsystem: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == (res = res_mkquery(QUERY, zone, C_IN, type, NULL, 0, NULL, buf, sizeof(buf))))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot create DNS query: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL != ip && '\0' != *ip)
 	{
 		if (0 == inet_aton(ip, &inaddr))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid IP address."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		memcpy(&saved_ns, &(_res.nsaddr_list[0]), sizeof(struct sockaddr_in));
 		saved_nscount = _res.nscount;
@@ -468,7 +499,10 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 	}
 
 	if (NOERROR != hp->rcode || 0 == ntohs(hp->ancount) || -1 == res)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot perform DNS query."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	msg_end = answer.buffer + res;
 
@@ -484,7 +518,10 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 	for (; 0 < num_answers && msg_ptr < msg_end; num_answers--)
 	{
 		if (NULL == (name = get_name(answer.buffer, msg_end, &msg_ptr)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, "%-20s", name);
 
@@ -520,7 +557,10 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 			case T_MR:
 			case T_PTR:
 				if (NULL == (name = get_name(answer.buffer, msg_end, &msg_ptr)))
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 					return SYSINFO_RET_FAIL;
+				}
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %s", name);
 				break;
 			case T_MX:
@@ -528,17 +568,26 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %d", value);
 
 				if (NULL == (name = get_name(answer.buffer, msg_end, &msg_ptr)))	/* exchange */
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 					return SYSINFO_RET_FAIL;
+				}
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %s", name);
 
 				break;
 			case T_SOA:
 				if (NULL == (name = get_name(answer.buffer, msg_end, &msg_ptr)))	/* source host */
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 					return SYSINFO_RET_FAIL;
+				}
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %s", name);
 
 				if (NULL == (name = get_name(answer.buffer, msg_end, &msg_ptr)))	/* administrator */
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 					return SYSINFO_RET_FAIL;
+				}
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %s", name);
 
 				GETLONG(value, msg_ptr);	/* serial number */
@@ -563,7 +612,10 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 				break;
 			case T_WKS:
 				if (INT32SZ + 1 > q_len)
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 					return SYSINFO_RET_FAIL;
+				}
 
 				p = msg_ptr + q_len;
 
@@ -626,11 +678,17 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 				break;
 			case T_MINFO:
 				if (NULL == (name = get_name(answer.buffer, msg_end, &msg_ptr)))	/* mailbox responsible for mailing lists */
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 					return SYSINFO_RET_FAIL;
+				}
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %s", name);
 
 				if (NULL == (name = get_name(answer.buffer, msg_end, &msg_ptr)))	/* mailbox for error messages */
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 					return SYSINFO_RET_FAIL;
+				}
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %s", name);
 
 				break;
@@ -658,7 +716,10 @@ static int	dns_query(AGENT_REQUEST *request, AGENT_RESULT *result, int short_ans
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %d", value);
 
 				if (NULL == (name = get_name(answer.buffer, msg_end, &msg_ptr)))	/* target */
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot decode DNS response."));
 					return SYSINFO_RET_FAIL;
+				}
 				offset += zbx_snprintf(buffer + offset, sizeof(buffer) - offset, " %s", name);
 
 				break;
diff --git a/src/libs/zbxsysinfo/common/net.h b/src/libs/zbxsysinfo/common/net.h
index b33af0b345c..0f3b3b05b1d 100644
--- a/src/libs/zbxsysinfo/common/net.h
+++ b/src/libs/zbxsysinfo/common/net.h
@@ -88,8 +88,13 @@
 
 extern char	*CONFIG_SOURCE_IP;
 
+#define ZBX_TCP_EXPECT_FAIL	-1
+#define ZBX_TCP_EXPECT_OK	0
+#define ZBX_TCP_EXPECT_IGNORE	1
+
 int	tcp_expect(const char *host, unsigned short port, int timeout, const char *request,
-		const char *expect, const char *sendtoclose, int *value_int);
+		int(*validate_func)(const char *), const char *sendtoclose, int *value_int);
+
 int	NET_DNS(AGENT_REQUEST *request, AGENT_RESULT *result);
 int	NET_DNS_RECORD(AGENT_REQUEST *request, AGENT_RESULT *result);
 int	NET_TCP_PORT(AGENT_REQUEST *request, AGENT_RESULT *result);
diff --git a/src/libs/zbxsysinfo/common/system.c b/src/libs/zbxsysinfo/common/system.c
index 2bda7aaa2c5..b3dbb91d86a 100644
--- a/src/libs/zbxsysinfo/common/system.c
+++ b/src/libs/zbxsysinfo/common/system.c
@@ -19,7 +19,6 @@
 
 #include "common.h"
 #include "sysinfo.h"
-#include "log.h"
 
 #ifdef _WINDOWS
 #	include "perfmon.h"
@@ -39,9 +38,11 @@ int	SYSTEM_LOCALTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct timeval	tv;
 	struct timezone	tz;
 #endif
-
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	type = get_rparam(request, 0);
 
@@ -87,7 +88,10 @@ int	SYSTEM_LOCALTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 		SET_STR_RESULT(result, strdup(buf));
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/freebsd/Makefile.am b/src/libs/zbxsysinfo/freebsd/Makefile.am
index 4313b1d7d6a..0ca5b576f55 100644
--- a/src/libs/zbxsysinfo/freebsd/Makefile.am
+++ b/src/libs/zbxsysinfo/freebsd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -9,6 +9,7 @@ libspecsysinfo_a_SOURCES = \
 	cpu.c \
 	diskio.c \
 	diskspace.c \
+	freebsd.c \
 	inodes.c \
 	kernel.c \
 	memory.c \
@@ -18,3 +19,6 @@ libspecsysinfo_a_SOURCES = \
 	swap.c \
 	system.c \
 	uptime.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/freebsd/boottime.c b/src/libs/zbxsysinfo/freebsd/boottime.c
index 94bc9d80fd7..0deacfe5b68 100644
--- a/src/libs/zbxsysinfo/freebsd/boottime.c
+++ b/src/libs/zbxsysinfo/freebsd/boottime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -33,12 +34,17 @@ int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(struct timeval);
 
 	if (-1 == sysctl(mib, 2, &boottime, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, boottime.tv_sec);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.boottime\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
-#endif /* HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME */
+#endif
 }
diff --git a/src/libs/zbxsysinfo/freebsd/cpu.c b/src/libs/zbxsysinfo/freebsd/cpu.c
index e107d6d5cf1..0d5713fec7a 100644
--- a/src/libs/zbxsysinfo/freebsd/cpu.c
+++ b/src/libs/zbxsysinfo/freebsd/cpu.c
@@ -20,6 +20,47 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "stats.h"
+#include "log.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
+
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
 
 static int	get_cpu_num(int online)
 {
@@ -46,17 +87,26 @@ int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	online = 0, ncpu;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "online"))
 		online = 1;
 	else if (0 != strcmp(tmp, "max"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == (ncpu = get_cpu_num(online)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, ncpu);
 
@@ -69,14 +119,20 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	cpu_num, state, mode;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		cpu_num = 0;
 	else if (SUCCEED != is_uint31_1(tmp, &cpu_num))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 	else
 		cpu_num++;
 
@@ -93,7 +149,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "interrupt"))
 		state = ZBX_CPU_STATE_INTERRUPT;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 2);
 
@@ -104,7 +163,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return get_cpustat(result, cpu_num, state, mode);
 }
@@ -116,14 +178,20 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double	load[ZBX_AVG_COUNT], value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		per_cpu = 0;
 	else if (0 != strcmp(tmp, "percpu"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -134,17 +202,26 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (mode >= getloadavg(load, 3))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain load average: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	value = load[mode];
 
 	if (1 == per_cpu)
 	{
 		if (0 >= (cpu_num = get_cpu_num(1)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 			return SYSINFO_RET_FAIL;
+		}
 		value /= cpu_num;
 	}
 
@@ -161,7 +238,11 @@ int     SYSTEM_CPU_SWITCHES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(v_swtch);
 
 	if (0 != sysctlbyname("vm.stats.sys.v_swtch", &v_swtch, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain \"vm.stats.sys.v_swtch\" system parameter: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, v_swtch);
 
@@ -176,7 +257,11 @@ int     SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(v_intr);
 
 	if (0 != sysctlbyname("vm.stats.sys.v_intr", &v_intr, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain \"vm.stats.sys.v_intr\" system parameter: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, v_intr);
 
diff --git a/src/libs/zbxsysinfo/freebsd/diskio.c b/src/libs/zbxsysinfo/freebsd/diskio.c
index d71980abd92..6795f6b1040 100644
--- a/src/libs/zbxsysinfo/freebsd/diskio.c
+++ b/src/libs/zbxsysinfo/freebsd/diskio.c
@@ -102,7 +102,10 @@ static int	vfs_dev_rw(AGENT_REQUEST *request, AGENT_RESULT *result, int rw)
 	char		*pd;			/* pointer to device name without '/dev/' prefix, e.g. 'da0' */
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
@@ -131,15 +134,24 @@ static int	vfs_dev_rw(AGENT_REQUEST *request, AGENT_RESULT *result, int rw)
 	else if (0 == strcmp(tmp, "operations"))
 		type = ZBX_DSTAT_TYPE_OPER;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (type == ZBX_DSTAT_TYPE_BYTE || type == ZBX_DSTAT_TYPE_OPER)
 	{
-		if (request->nparam > 2)
+		if (2 < request->nparam)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid number of parameters."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		if (FAIL == get_diskstat(pd, dstats))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain disk information."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		if (ZBX_DSTAT_TYPE_BYTE == type)
 			SET_UI64_RESULT(result, dstats[(ZBX_DEV_READ == rw ? ZBX_DSTAT_R_BYTE : ZBX_DSTAT_W_BYTE)]);
@@ -158,7 +170,10 @@ static int	vfs_dev_rw(AGENT_REQUEST *request, AGENT_RESULT *result, int rw)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == collector)
 	{
@@ -167,17 +182,24 @@ static int	vfs_dev_rw(AGENT_REQUEST *request, AGENT_RESULT *result, int rw)
 		/* the collectors are not available and keys "vfs.dev.read", "vfs.dev.write" with some parameters */
 		/* (e.g. sps, ops) are not supported. */
 
-		SET_MSG_RESULT(result, strdup("This parameter is available only in daemon mode when collectors are started."));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "This item is available only in daemon mode when collectors are"
+				" started."));
 		return SYSINFO_RET_FAIL;
 	}
 
 	if (NULL == (device = collector_diskdevice_get(pd)))
 	{
 		if (FAIL == get_diskstat(pd, dstats))	/* validate device name */
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain disk information."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		if (NULL == (device = collector_diskdevice_add(pd)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot add disk device to agent collector."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 
 	if (ZBX_DSTAT_TYPE_BPS == type)	/* default parameter */
diff --git a/src/libs/zbxsysinfo/freebsd/diskspace.c b/src/libs/zbxsysinfo/freebsd/diskspace.c
index b12749a288f..efad7d12383 100644
--- a/src/libs/zbxsysinfo/freebsd/diskspace.c
+++ b/src/libs/zbxsysinfo/freebsd/diskspace.c
@@ -20,9 +20,10 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *free,
-		zbx_uint64_t *used, double *pfree, double *pused)
+		zbx_uint64_t *used, double *pfree, double *pused, char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
 #	define ZBX_STATFS	statvfs
@@ -33,10 +34,11 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 #endif
 	struct ZBX_STATFS	s;
 
-	assert(fs);
-
 	if (0 != ZBX_STATFS(fs, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
@@ -66,10 +68,14 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 
 static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -78,10 +84,14 @@ static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -90,10 +100,14 @@ static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -103,10 +117,14 @@ static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -115,10 +133,14 @@ static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -131,13 +153,19 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* default parameter */
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))
@@ -151,32 +179,36 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		ret = VFS_FS_PUSED(fsname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	return ret;;
+	return ret;
 }
 
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		i, rc, ret = SYSINFO_RET_FAIL;
+	int		i, rc;
 	struct statfs	*mntbuf;
 	struct zbx_json	j;
 
+	if (0 == (rc = getmntinfo(&mntbuf, MNT_WAIT)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (0 != (rc = getmntinfo(&mntbuf, MNT_WAIT)))
+	for (i = 0; i < rc; i++)
 	{
-		for (i = 0; i < rc; i++)
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#FSNAME}", mntbuf[i].f_mntonname, ZBX_JSON_TYPE_STRING);
-			zbx_json_addstring(&j, "{#FSTYPE}", mntbuf[i].f_fstypename, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-		}
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#FSNAME}", mntbuf[i].f_mntonname, ZBX_JSON_TYPE_STRING);
+		zbx_json_addstring(&j, "{#FSTYPE}", mntbuf[i].f_fstypename, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
 	zbx_json_close(&j);
@@ -185,5 +217,5 @@ int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/freebsd/freebsd.c b/src/libs/zbxsysinfo/freebsd/freebsd.c
index 8218656d592..80dfc49b65f 100644
--- a/src/libs/zbxsysinfo/freebsd/freebsd.c
+++ b/src/libs/zbxsysinfo/freebsd/freebsd.c
@@ -52,6 +52,7 @@ ZBX_METRIC	parameters_specific[] =
 	{"system.cpu.util",	CF_HAVEPARAMS,	SYSTEM_CPU_UTIL,	"all,user,avg1"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
 	{"system.cpu.num",	CF_HAVEPARAMS,	SYSTEM_CPU_NUM,		"online"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.uname",	0,		SYSTEM_UNAME,		NULL},
 
diff --git a/src/libs/zbxsysinfo/freebsd/hostname.c b/src/libs/zbxsysinfo/freebsd/hostname.c
index c0ccec5fc00..804b9a90050 100644
--- a/src/libs/zbxsysinfo/freebsd/hostname.c
+++ b/src/libs/zbxsysinfo/freebsd/hostname.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -32,7 +33,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
 
diff --git a/src/libs/zbxsysinfo/freebsd/inodes.c b/src/libs/zbxsysinfo/freebsd/inodes.c
index f6d50fa6615..049a12bd011 100644
--- a/src/libs/zbxsysinfo/freebsd/inodes.c
+++ b/src/libs/zbxsysinfo/freebsd/inodes.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -34,13 +35,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 	{
@@ -63,7 +77,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -74,10 +91,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/freebsd/kernel.c b/src/libs/zbxsysinfo/freebsd/kernel.c
index d1c65f499e1..966de3b8886 100644
--- a/src/libs/zbxsysinfo/freebsd/kernel.c
+++ b/src/libs/zbxsysinfo/freebsd/kernel.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -33,12 +34,17 @@ int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(maxfiles);
 
 	if (0 != sysctl(mib, 2, &maxfiles, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, maxfiles);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.maxfiles\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
@@ -56,12 +62,17 @@ int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(maxproc);
 
 	if (0 != sysctl(mib, 2, &maxproc, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, maxproc);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.maxproc\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/freebsd/memory.c b/src/libs/zbxsysinfo/freebsd/memory.c
index c73e8bb48f8..f76347bd1b5 100644
--- a/src/libs/zbxsysinfo/freebsd/memory.c
+++ b/src/libs/zbxsysinfo/freebsd/memory.c
@@ -19,14 +19,19 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 static u_int	pagesize = 0;
 
-#define ZBX_SYSCTLBYNAME(name, value)				\
-								\
-	len = sizeof(value);					\
-	if (0 != sysctlbyname(name, &value, &len, NULL, 0))	\
-		return SYSINFO_RET_FAIL
+#define ZBX_SYSCTLBYNAME(name, value)									\
+													\
+	len = sizeof(value);										\
+	if (0 != sysctlbyname(name, &value, &len, NULL, 0))						\
+	{												\
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain \"%s\" system parameter: %s",	\
+				name, zbx_strerror(errno)));						\
+		return SYSINFO_RET_FAIL;								\
+	}
 
 static int	VM_MEMORY_TOTAL(AGENT_RESULT *result)
 {
@@ -126,7 +131,10 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 	ZBX_SYSCTLBYNAME("vm.stats.vm.v_page_count", totalpages);
 
 	if (0 == totalpages)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, (activepages + wiredpages + cachedpages) / (double)totalpages * 100);
 
@@ -159,7 +167,10 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	ZBX_SYSCTLBYNAME("vm.stats.vm.v_page_count", totalpages);
 
 	if (0 == totalpages)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, (inactivepages + cachedpages + freepages) / (double)totalpages * 100);
 
@@ -185,7 +196,10 @@ static int	VM_MEMORY_SHARED(AGENT_RESULT *result)
 	int		mib[] = {CTL_VM, VM_METER};
 
 	if (0 != sysctl(mib, 2, &vm, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)(vm.t_vmshr + vm.t_rmshr) * pagesize);
 
@@ -198,7 +212,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (0 == pagesize)
 	{
@@ -234,7 +251,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "shared"))
 		VM_MEMORY_SHARED(result);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		ret = SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/freebsd/net.c b/src/libs/zbxsysinfo/freebsd/net.c
index 666bd177831..baf190809f3 100644
--- a/src/libs/zbxsysinfo/freebsd/net.c
+++ b/src/libs/zbxsysinfo/freebsd/net.c
@@ -21,16 +21,20 @@
 #include "sysinfo.h"
 #include "../common/common.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static struct ifmibdata	ifmd;
 
-static int	get_ifmib_general(const char *if_name)
+static int	get_ifmib_general(const char *if_name, char **error)
 {
 	int	mib[6], ifcount;
 	size_t	len;
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		*error = zbx_strdup(NULL, "Network interface name cannot be empty.");
 		return FAIL;
+	}
 
 	mib[0] = CTL_NET;
 	mib[1] = PF_LINK;
@@ -41,7 +45,10 @@ static int	get_ifmib_general(const char *if_name)
 	len = sizeof(ifcount);
 
 	if (-1 == sysctl(mib, 5, &ifcount, &len, NULL, 0))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno));
 		return FAIL;
+	}
 
 	mib[3] = IFMIB_IFDATA;
 	mib[5] = IFDATA_GENERAL;
@@ -62,21 +69,29 @@ static int	get_ifmib_general(const char *if_name)
 			return SUCCEED;
 	}
 
+	*error = zbx_strdup(NULL, "Cannot find information for this network interface.");
+
 	return FAIL;
 }
 
 int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*if_name, *mode;
+	char	*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (FAIL == get_ifmib_general(if_name))
+	if (FAIL == get_ifmib_general(if_name,&error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_ibytes);
@@ -87,23 +102,32 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_iqdrops);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*if_name, *mode;
+	char	*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (FAIL == get_ifmib_general(if_name))
+	if (FAIL == get_ifmib_general(if_name, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_obytes);
@@ -112,23 +136,32 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "errors"))
 		SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_oerrors);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*if_name, *mode;
+	char	*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (FAIL == get_ifmib_general(if_name))
+	if (FAIL == get_ifmib_general(if_name, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, (zbx_uint64_t)ifmd.ifmd_data.ifi_ibytes + ifmd.ifmd_data.ifi_obytes);
@@ -137,7 +170,10 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "errors"))
 		SET_UI64_RESULT(result, (zbx_uint64_t)ifmd.ifmd_data.ifi_ierrors + ifmd.ifmd_data.ifi_oerrors);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -149,12 +185,18 @@ int     NET_TCP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		res;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	zbx_snprintf(command, sizeof(command), "netstat -an | grep '^tcp.*\\.%hu[^.].*LISTEN' | wc -l", port);
 
@@ -174,12 +216,18 @@ int     NET_UDP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		res;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	zbx_snprintf(command, sizeof(command), "netstat -an | grep '^udp.*\\.%hu[^.].*\\*\\.\\*' | wc -l", port);
 
@@ -194,15 +242,21 @@ int     NET_UDP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 int     NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*if_name;
+	char	*if_name, *error;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 
-	if (FAIL == get_ifmib_general(if_name))
+	if (FAIL == get_ifmib_general(if_name, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_collisions);
 
@@ -211,27 +265,25 @@ int     NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int			ret = SYSINFO_RET_FAIL, i;
+	int			i;
 	struct zbx_json		j;
 	struct if_nameindex	*interfaces;
 
+	if (NULL == (interfaces = if_nameindex()))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (NULL != (interfaces = if_nameindex()))
+	for (i = 0; 0 != interfaces[i].if_index; i++)
 	{
-		i = 0;
-
-		while (0 != interfaces[i].if_index)
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#IFNAME}", interfaces[i].if_name, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-			i++;
-		}
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#IFNAME}", interfaces[i].if_name, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
 	zbx_json_close(&j);
@@ -240,5 +292,5 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/freebsd/proc.c b/src/libs/zbxsysinfo/freebsd/proc.c
index 6733b43bdcb..dafd364bbdc 100644
--- a/src/libs/zbxsysinfo/freebsd/proc.c
+++ b/src/libs/zbxsysinfo/freebsd/proc.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 #if(__FreeBSD_version > 500000)
 #	define ZBX_COMMLEN	COMMLEN
@@ -57,7 +58,8 @@ retry:
 	sz = (size_t)args_alloc;
 	if (-1 == sysctl(mib, 4, args, &sz, NULL, 0))
 	{
-		if (errno == ENOMEM) {
+		if (errno == ENOMEM)
+		{
 			args_alloc *= 2;
 			args = zbx_realloc(args, args_alloc);
 			goto retry;
@@ -98,15 +100,28 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct passwd		*usrinfo;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -122,7 +137,10 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
@@ -149,12 +167,18 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	sz = 0;
 	if (0 != sysctl(mib, mibs, NULL, &sz, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain necessary buffer size from system: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proc = (struct kinfo_proc *)zbx_malloc(proc, sz);
 	if (0 != sysctl(mib, mibs, proc, &sz, NULL, 0))
 	{
 		zbx_free(proc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain process information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -226,15 +250,28 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct passwd		*usrinfo;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -250,7 +287,10 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "zomb"))
 		zbx_proc_stat = ZBX_PROC_STAT_ZOMB;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
@@ -275,12 +315,18 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	sz = 0;
 	if (0 != sysctl(mib, mibs, NULL, &sz, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain necessary buffer size from system: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proc = (struct kinfo_proc *)zbx_malloc(proc, sz);
 	if (0 != sysctl(mib, mibs, proc, &sz, NULL, 0))
 	{
 		zbx_free(proc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain process information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
 
diff --git a/src/libs/zbxsysinfo/freebsd/software.c b/src/libs/zbxsysinfo/freebsd/software.c
index 4dea0e6d6fd..fa4c702ab88 100644
--- a/src/libs/zbxsysinfo/freebsd/software.c
+++ b/src/libs/zbxsysinfo/freebsd/software.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
diff --git a/src/libs/zbxsysinfo/freebsd/swap.c b/src/libs/zbxsysinfo/freebsd/swap.c
index db5aba02b5e..883ca444555 100644
--- a/src/libs/zbxsysinfo/freebsd/swap.c
+++ b/src/libs/zbxsysinfo/freebsd/swap.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -33,14 +34,21 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	zbx_uint64_t	total = 0, used = 0;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	sz = ARRSIZE(mib);
 	if (-1 == sysctlnametomib("vm.swap_info", mib, &sz))
-		return FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain \"vm.swap_info\" system parameter: %s",
+				zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
 
 	mib_sz = sz + 1;
 	mib_dev = &(mib[sz]);
@@ -70,10 +78,14 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		SET_DBL_RESULT(result, total ? ((double)used * 100.0 / (double)total) : 0.0);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"xswdev\" structure."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/freebsd/system.c b/src/libs/zbxsysinfo/freebsd/system.c
index ac58d08dcd9..849bd967c32 100644
--- a/src/libs/zbxsysinfo/freebsd/system.c
+++ b/src/libs/zbxsysinfo/freebsd/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine));
diff --git a/src/libs/zbxsysinfo/freebsd/uptime.c b/src/libs/zbxsysinfo/freebsd/uptime.c
index 7ec6b486d6c..0db7da844e4 100644
--- a/src/libs/zbxsysinfo/freebsd/uptime.c
+++ b/src/libs/zbxsysinfo/freebsd/uptime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -31,7 +32,10 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 		return SYSINFO_RET_OK;
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 #elif defined(HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME)
 	int		mib[2], now;
 	size_t		len;
@@ -43,54 +47,18 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(uptime);
 
 	if (0 != sysctl(mib, 2, &uptime, &len, NULL, 0))
-		return SYSINFO_RET_FAIL;
-
-	now = time(NULL);
-
-	SET_UI64_RESULT(result, now - uptime.tv_sec);
-
-	return SYSINFO_RET_OK;
-#elif defined(HAVE_KSTAT_H)	/* Solaris */
-	kstat_ctl_t   *kc;
-	kstat_t       *kp;
-	kstat_named_t *kn;
-
-	long          hz;
-	long          secs;
-
-	/* open kstat */
-	kc = kstat_open();
-	if (0 == kc)
-		return SYSINFO_RET_FAIL;
-
-	/* read uptime counter */
-	kp = kstat_lookup(kc, "unix", 0, "system_misc");
-	if (0 == kp)
-	{
-		kstat_close(kc);
-		return SYSINFO_RET_FAIL;
-	}
-
-	if (-1 == kstat_read(kc, kp, 0))
 	{
-		kstat_close(kc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
-	kn = (kstat_named_t*)kstat_data_lookup(kp, "clk_intr");
-
-	hz = sysconf(_SC_CLK_TCK);
-
-	/* make sure we do not divide by 0 */
-	assert(hz);
 
-	secs = get_kstat_numeric_value(kn) / hz;
+	now = time(NULL);
 
-	/* close kstat */
-	kstat_close(kc);
+	SET_UI64_RESULT(result, now - uptime.tv_sec);
 
-	SET_UI64_RESULT(result, secs);
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for uptime information."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/hpux/Makefile.am b/src/libs/zbxsysinfo/hpux/Makefile.am
index 285d60bffca..7078a4e7157 100644
--- a/src/libs/zbxsysinfo/hpux/Makefile.am
+++ b/src/libs/zbxsysinfo/hpux/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -8,9 +8,13 @@ libspecsysinfo_a_SOURCES = \
 	cpu.c \
 	diskio.c \
 	diskspace.c \
+	hpux.c \
 	inodes.c \
 	memory.c \
 	net.c \
 	proc.c \
 	software.c \
 	system.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/hpux/cpu.c b/src/libs/zbxsysinfo/hpux/cpu.c
index e55fef0fc81..2a1ff2f3e82 100644
--- a/src/libs/zbxsysinfo/hpux/cpu.c
+++ b/src/libs/zbxsysinfo/hpux/cpu.c
@@ -20,21 +20,73 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "stats.h"
+#include "log.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
+
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
 
 int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char			tmp[16];
+	char			*type;
 	struct pst_dynamic	dyn;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
+
+	type = get_rparam(request, 0);
 
 	/* only "online" (default) for parameter "type" is supported */
-	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "online"))
+	if (NULL != type && '\0' != *type && 0 != strcmp(type, "online"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == pstat_getdynamic(&dyn, sizeof(dyn), 1, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, dyn.psd_proc_cnt);
 
@@ -47,14 +99,20 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	cpu_num, state, mode;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		cpu_num = 0;
 	else if (SUCCEED != is_uint31_1(tmp, &cpu_num))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 	else
 		cpu_num++;
 
@@ -69,7 +127,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "idle"))
 		state = ZBX_CPU_STATE_IDLE;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 2);
 
@@ -80,7 +141,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return get_cpustat(result, cpu_num, state, mode);
 }
@@ -93,17 +157,26 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int			per_cpu = 1;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		per_cpu = 0;
 	else if (0 != strcmp(tmp, "percpu"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == pstat_getdynamic(&dyn, sizeof(dyn), 1, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -114,12 +187,18 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		value = dyn.psd_avg_15_min;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (1 == per_cpu)
 	{
 		if (0 >= dyn.psd_proc_cnt)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 			return SYSINFO_RET_FAIL;
+		}
 		value /= dyn.psd_proc_cnt;
 	}
 
diff --git a/src/libs/zbxsysinfo/hpux/diskspace.c b/src/libs/zbxsysinfo/hpux/diskspace.c
index 21dc4fc518c..7d52ca65e59 100644
--- a/src/libs/zbxsysinfo/hpux/diskspace.c
+++ b/src/libs/zbxsysinfo/hpux/diskspace.c
@@ -20,9 +20,10 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *free,
-		zbx_uint64_t *used, double *pfree, double *pused)
+		zbx_uint64_t *used, double *pfree, double *pused, char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
 #	define ZBX_STATFS	statvfs
@@ -33,10 +34,11 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 #endif
 	struct ZBX_STATFS	s;
 
-	assert(fs);
-
 	if (0 != ZBX_STATFS(fs, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
@@ -66,10 +68,14 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 
 static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -78,10 +84,14 @@ static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -90,10 +100,14 @@ static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -103,10 +117,14 @@ static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -115,10 +133,14 @@ static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -131,13 +153,19 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))
 		ret = VFS_FS_TOTAL(fsname, result);
@@ -150,44 +178,47 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		ret = VFS_FS_PUSED(fsname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	return SYSINFO_RET_FAIL;
+	return ret;
 }
 
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		ret = SYSINFO_RET_FAIL;
 	struct mntent	*mt;
 	FILE		*f;
 	struct zbx_json	j;
 
+	/* opening the mounted filesystems file */
+	if (NULL == (f = setmntent(MNT_MNTTAB, "r")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	/* opening the mounted filesystems file */
-	if (NULL != (f = setmntent(MNT_MNTTAB, "r")))
+	/* fill mnttab structure from file */
+	while (NULL != (mt = getmntent(f)))
 	{
-		/* fill mnttab structure from file */
-		while (NULL != (mt = getmntent(f)))
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#FSNAME}", mt->mnt_dir, ZBX_JSON_TYPE_STRING);
-			zbx_json_addstring(&j, "{#FSTYPE}", mt->mnt_type, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-		}
-
-		endmntent(f);
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#FSNAME}", mt->mnt_dir, ZBX_JSON_TYPE_STRING);
+		zbx_json_addstring(&j, "{#FSTYPE}", mt->mnt_type, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
+	endmntent(f);
+
 	zbx_json_close(&j);
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, j.buffer));
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/hpux/hostname.c b/src/libs/zbxsysinfo/hpux/hostname.c
index c0ccec5fc00..371c4499aa0 100644
--- a/src/libs/zbxsysinfo/hpux/hostname.c
+++ b/src/libs/zbxsysinfo/hpux/hostname.c
@@ -18,10 +18,7 @@
 **/
 
 #include "sysinfo.h"
-
-#ifdef HAVE_SYS_UTSNAME_H
-#	include <sys/utsname.h>
-#endif
+#include "log.h"
 
 ZBX_METRIC	parameter_hostname =
 /*	KEY			FLAG		FUNCTION		TEST PARAMETERS */
@@ -29,12 +26,25 @@ ZBX_METRIC	parameter_hostname =
 
 int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	struct utsname	name;
+	char	*hostname;
+	long 	hostbufsize = 0;
+
+#ifdef _SC_HOST_NAME_MAX
+	hostbufsize = sysconf(_SC_HOST_NAME_MAX) + 1;
+#endif
+	if (0 == hostbufsize)
+		hostbufsize = 256;
+
+	hostname = zbx_malloc(NULL, hostbufsize);
 
-	if (-1 == uname(&name))
+	if (0 != gethostname(hostname, hostbufsize))
+	{
+		zbx_free(hostname);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
-	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
+	SET_STR_RESULT(result, hostname);
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/hpux/hpux.c b/src/libs/zbxsysinfo/hpux/hpux.c
index 888935a75fa..baf05d0938d 100644
--- a/src/libs/zbxsysinfo/hpux/hpux.c
+++ b/src/libs/zbxsysinfo/hpux/hpux.c
@@ -39,6 +39,7 @@ ZBX_METRIC	parameters_specific[] =
 	{"system.cpu.util",	CF_HAVEPARAMS,	SYSTEM_CPU_UTIL,	"all,user,avg1"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
 	{"system.cpu.num",	CF_HAVEPARAMS,	SYSTEM_CPU_NUM,		"online"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.uname",	0,		SYSTEM_UNAME,		NULL},
 	{"system.sw.arch",	0,		SYSTEM_SW_ARCH,		NULL},
diff --git a/src/libs/zbxsysinfo/hpux/inodes.c b/src/libs/zbxsysinfo/hpux/inodes.c
index f6d50fa6615..049a12bd011 100644
--- a/src/libs/zbxsysinfo/hpux/inodes.c
+++ b/src/libs/zbxsysinfo/hpux/inodes.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -34,13 +35,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 	{
@@ -63,7 +77,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -74,10 +91,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/hpux/memory.c b/src/libs/zbxsysinfo/hpux/memory.c
index 755a342b736..805c804a325 100644
--- a/src/libs/zbxsysinfo/hpux/memory.c
+++ b/src/libs/zbxsysinfo/hpux/memory.c
@@ -19,21 +19,28 @@
 
 #include "common.h"
 #include "sysinfo.h"
-
-#ifdef HAVE_SYS_PSTAT_H
+#include "log.h"
 
 struct pst_static	pst;
 struct pst_dynamic	pdy;
 
-#define ZBX_PSTAT_GETSTATIC()					\
-								\
-	if (-1 == pstat_getstatic(&pst, sizeof(pst), 1, 0))	\
-		return SYSINFO_RET_FAIL
-
-#define ZBX_PSTAT_GETDYNAMIC()					\
-								\
-	if (-1 == pstat_getdynamic(&pdy, sizeof(pdy), 1, 0))	\
-		return SYSINFO_RET_FAIL
+#define ZBX_PSTAT_GETSTATIC()											\
+														\
+	if (-1 == pstat_getstatic(&pst, sizeof(pst), 1, 0))							\
+	{													\
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain static system information: %s",	\
+				zbx_strerror(errno)));								\
+		return SYSINFO_RET_FAIL;									\
+	}
+
+#define ZBX_PSTAT_GETDYNAMIC()											\
+														\
+	if (-1 == pstat_getdynamic(&pdy, sizeof(pdy), 1, 0))							\
+	{													\
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain dynamic system information: %s",	\
+				zbx_strerror(errno)));								\
+		return SYSINFO_RET_FAIL;									\
+	}
 
 static int	VM_MEMORY_TOTAL(AGENT_RESULT *result)
 {
@@ -80,7 +87,10 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 	ZBX_PSTAT_GETDYNAMIC();
 
 	if (0 == pst.physical_memory)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, (pst.physical_memory - pdy.psd_free) / (double)pst.physical_memory * 100);
 
@@ -103,23 +113,26 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	ZBX_PSTAT_GETDYNAMIC();
 
 	if (0 == pst.physical_memory)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, pdy.psd_free / (double)pst.physical_memory * 100);
 
 	return SYSINFO_RET_OK;
 }
 
-#endif
-
 int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	int	ret = SYSINFO_RET_FAIL;
-#ifdef HAVE_SYS_PSTAT_H
 	char	*mode;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
@@ -138,7 +151,10 @@ int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pavailable"))
 		ret = VM_MEMORY_PAVAILABLE(result);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		ret = SYSINFO_RET_FAIL;
-#endif
+	}
+
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/hpux/net.c b/src/libs/zbxsysinfo/hpux/net.c
index 6d6d05ab71b..1eb3b974390 100644
--- a/src/libs/zbxsysinfo/hpux/net.c
+++ b/src/libs/zbxsysinfo/hpux/net.c
@@ -49,7 +49,7 @@ static struct strbuf	ctlbuf =
 
 #define ZBX_IF_SEP	','
 
-void	add_if_name(char **if_list, size_t *if_list_alloc, size_t *if_list_offset, const char *name)
+static void	add_if_name(char **if_list, size_t *if_list_alloc, size_t *if_list_offset, const char *name)
 {
 	if (FAIL == str_in_list(*if_list, name, ZBX_IF_SEP))
 	{
@@ -60,7 +60,7 @@ void	add_if_name(char **if_list, size_t *if_list_alloc, size_t *if_list_offset,
 	}
 }
 
-int	get_if_names(char **if_list, size_t *if_list_alloc, size_t *if_list_offset)
+static int	get_if_names(char **if_list, size_t *if_list_alloc, size_t *if_list_offset)
 {
 	int			s, ifreq_size, numifs, i, family = AF_INET;
 	struct sockaddr		*from;
@@ -148,6 +148,7 @@ end:
 #endif
 	return SUCCEED;
 }
+
 #endif	/* HPUX_VERSION < 1131 */
 
 int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
@@ -162,16 +163,20 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct zbx_json		j;
 	char			*if_name;
 
-	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
-
-	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
-
 #if HPUX_VERSION < 1131
 	if_list = zbx_malloc(if_list, if_list_alloc);
 	*if_list = '\0';
 
 	if (FAIL == get_if_names(&if_list, &if_list_alloc, &if_list_offset))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain network interface information."));
+		zbx_free(if_list);
 		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
+
+	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
 	if_name = if_list;
 
@@ -188,7 +193,6 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 		zbx_json_addstring(&j, "{#IFNAME}", if_name, ZBX_JSON_TYPE_STRING);
 		zbx_json_close(&j);
 #if HPUX_VERSION < 1131
-
 		if (NULL != if_name_end)
 		{
 			*if_name_end = ZBX_IF_SEP;
@@ -294,6 +298,7 @@ static int	dlpi_get_stats(int fd, Ext_mib_t *mib)
 	stat_msg = *(dl_get_statistics_ack_t *)buf_ctl;
 
 	memcpy(mib, (Ext_mib_t *)(buf_ctl + stat_msg.dl_stat_offset), sizeof(Ext_mib_t));
+
 	return SUCCEED;
 }
 
@@ -360,9 +365,11 @@ static int get_ppa(int fd, const char *if_name, int *ppa)
 				break;
 			}
 		}
+
 		zbx_free(buf);
 		zbx_free(ppa_data_buf);
 	}
+
 	return ret;
 }
 
@@ -398,13 +405,19 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	Ext_mib_t	mib;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (FAIL == get_net_stat(&mib, if_name))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain network interface information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
 		SET_UI64_RESULT(result, mib.mib_if.ifInOctets);
@@ -415,7 +428,10 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, mib.mib_if.ifInDiscards);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -426,13 +442,19 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	Ext_mib_t	mib;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (FAIL == get_net_stat(&mib, if_name))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain network interface information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
 		SET_UI64_RESULT(result, mib.mib_if.ifOutOctets);
@@ -443,7 +465,10 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, mib.mib_if.ifOutDiscards);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -454,13 +479,19 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	Ext_mib_t	mib;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (FAIL == get_net_stat(&mib, if_name))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain network interface information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
 	{
@@ -480,7 +511,10 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 		SET_UI64_RESULT(result, mib.mib_if.ifInDiscards + mib.mib_if.ifOutDiscards);
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/hpux/proc.c b/src/libs/zbxsysinfo/hpux/proc.c
index 65bb6562ed7..e3574e06512 100644
--- a/src/libs/zbxsysinfo/hpux/proc.c
+++ b/src/libs/zbxsysinfo/hpux/proc.c
@@ -28,6 +28,7 @@
 #include "sysinfo.h"
 #include <sys/pstat.h>
 #include "zbxregexp.h"
+#include "log.h"
 
 static int	check_procstate(struct pst_status pst, int zbx_proc_stat)
 {
@@ -58,7 +59,10 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct pst_status	pst[ZBX_BURST];
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	if (NULL != procname && '\0' == *procname)
@@ -67,8 +71,18 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	param = get_rparam(request, 1);
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -83,7 +97,10 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "zomb"))
 		zbx_proc_stat = ZBX_PROC_STAT_ZOMB;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 	if (NULL != proccomm && '\0' == *proccomm)
@@ -115,7 +132,10 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 
 	if (-1 == count)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain process information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, proccount);
 
diff --git a/src/libs/zbxsysinfo/hpux/software.c b/src/libs/zbxsysinfo/hpux/software.c
index 4dea0e6d6fd..fa4c702ab88 100644
--- a/src/libs/zbxsysinfo/hpux/software.c
+++ b/src/libs/zbxsysinfo/hpux/software.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
diff --git a/src/libs/zbxsysinfo/hpux/system.c b/src/libs/zbxsysinfo/hpux/system.c
index 4ce6f4af91c..02beedb3509 100644
--- a/src/libs/zbxsysinfo/hpux/system.c
+++ b/src/libs/zbxsysinfo/hpux/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine, name.idnumber));
diff --git a/src/libs/zbxsysinfo/linux/Makefile.am b/src/libs/zbxsysinfo/linux/Makefile.am
index 066a75f9796..21979933fa8 100644
--- a/src/libs/zbxsysinfo/linux/Makefile.am
+++ b/src/libs/zbxsysinfo/linux/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -12,6 +12,7 @@ libspecsysinfo_a_SOURCES = \
 	hardware.c hardware.h \
 	inodes.c \
 	kernel.c \
+	linux.c \
 	memory.c \
 	net.c \
 	proc.c \
@@ -20,3 +21,6 @@ libspecsysinfo_a_SOURCES = \
 	system.c \
 	swap.c \
 	uptime.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/linux/boottime.c b/src/libs/zbxsysinfo/linux/boottime.c
index 5581175fd23..4a2b2bdb4de 100644
--- a/src/libs/zbxsysinfo/linux/boottime.c
+++ b/src/libs/zbxsysinfo/linux/boottime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -28,7 +29,10 @@ int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	unsigned long	value;
 
 	if (NULL == (f = fopen("/proc/stat", "r")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc/stat: %s", zbx_strerror(errno)));
 		return ret;
+	}
 
 	/* find boot time entry "btime [boot time]" */
 	while (NULL != fgets(buf, MAX_STRING_LEN, f))
@@ -42,8 +46,10 @@ int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 			break;
 		}
 	}
-
 	zbx_fclose(f);
 
+	if (SYSINFO_RET_FAIL == ret)
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot find a line with \"btime\" in /proc/stat."));
+
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c
index be90bb51fd9..5abeb9d7c4b 100644
--- a/src/libs/zbxsysinfo/linux/cpu.c
+++ b/src/libs/zbxsysinfo/linux/cpu.c
@@ -20,6 +20,47 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "stats.h"
+#include "log.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
+
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
 
 int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -28,7 +69,10 @@ int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	long	ncpu;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	type = get_rparam(request, 0);
 
@@ -37,10 +81,16 @@ int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(type, "max"))
 		name = _SC_NPROCESSORS_CONF;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == (ncpu = sysconf(name)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain number of CPUs: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, ncpu);
 
@@ -53,14 +103,22 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	cpu_num, state, mode;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
+	{
 		cpu_num = 0;
+	}
 	else if (SUCCEED != is_uint31_1(tmp, &cpu_num))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 	else
 		cpu_num++;
 
@@ -83,7 +141,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "steal"))
 		state = ZBX_CPU_STATE_STEAL;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 2);
 
@@ -94,7 +155,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return get_cpustat(result, cpu_num, state, mode);
 }
@@ -106,14 +170,22 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double	load[ZBX_AVG_COUNT], value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
+	{
 		per_cpu = 0;
+	}
 	else if (0 != strcmp(tmp, "percpu"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -124,17 +196,27 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (mode >= getloadavg(load, 3))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain load average."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	value = load[mode];
 
 	if (1 == per_cpu)
 	{
 		if (0 >= (cpu_num = sysconf(_SC_NPROCESSORS_ONLN)))
+		{
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain number of CPUs: %s",
+				zbx_strerror(errno)));
 			return SYSINFO_RET_FAIL;
+		}
 		value /= cpu_num;
 	}
 
@@ -151,7 +233,10 @@ int     SYSTEM_CPU_SWITCHES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	FILE		*f;
 
 	if (NULL == (f = fopen("/proc/stat", "r")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc/stat: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (NULL != fgets(line, sizeof(line), f))
 	{
@@ -167,6 +252,9 @@ int     SYSTEM_CPU_SWITCHES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 	zbx_fclose(f);
 
+	if (SYSINFO_RET_FAIL == ret)
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot find a line with \"ctxt\" in /proc/stat."));
+
 	return ret;
 }
 
@@ -178,7 +266,10 @@ int     SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	FILE		*f;
 
 	if (NULL == (f = fopen("/proc/stat", "r")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc/stat: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (NULL != fgets(line, sizeof(line), f))
 	{
@@ -194,5 +285,8 @@ int     SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 	zbx_fclose(f);
 
+	if (SYSINFO_RET_FAIL == ret)
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot find a line with \"intr\" in /proc/stat."));
+
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/linux/diskio.c b/src/libs/zbxsysinfo/linux/diskio.c
index 1eaf3b4770b..f13b941e530 100644
--- a/src/libs/zbxsysinfo/linux/diskio.c
+++ b/src/libs/zbxsysinfo/linux/diskio.c
@@ -92,11 +92,12 @@ int	get_diskstat(const char *devname, zbx_uint64_t *dstat)
 	}
 
 	if (NULL == (f = fopen(INFO_FILE_NAME, "r")))
-		return ret;
+		return FAIL;
 
 	while (NULL != fgets(tmp, sizeof(tmp), f))
 	{
 		PARSE(tmp);
+
 		if (NULL != devname && '\0' != *devname && 0 != strcmp(devname, "all"))
 		{
 			if (0 != strcmp(name, devname))
@@ -174,8 +175,11 @@ static int	vfs_dev_rw(AGENT_REQUEST *request, AGENT_RESULT *result, int rw)
 	int				type, mode;
 	zbx_uint64_t			dstats[ZBX_DSTAT_MAX];
 
-	if (3 < request->nparam)	/* too many parameters? */
+	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	devname = get_rparam(request, 0);
 	tmp = get_rparam(request, 1);
@@ -189,15 +193,25 @@ static int	vfs_dev_rw(AGENT_REQUEST *request, AGENT_RESULT *result, int rw)
 	else if (0 == strcmp(tmp, "operations"))
 		type = ZBX_DSTAT_TYPE_OPER;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (type == ZBX_DSTAT_TYPE_SECT || type == ZBX_DSTAT_TYPE_OPER)
 	{
 		if (request->nparam > 2)
+		{
+			/* Mode is supported only if type is in: operations, sectors. */
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid number of parameters."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		if (SUCCEED != get_diskstat(devname, dstats))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain disk information."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		if (ZBX_DSTAT_TYPE_SECT == type)
 			SET_UI64_RESULT(result, dstats[(ZBX_DEV_READ == rw ? ZBX_DSTAT_R_SECT : ZBX_DSTAT_W_SECT)]);
@@ -216,7 +230,10 @@ static int	vfs_dev_rw(AGENT_REQUEST *request, AGENT_RESULT *result, int rw)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == collector)
 	{
@@ -225,22 +242,34 @@ static int	vfs_dev_rw(AGENT_REQUEST *request, AGENT_RESULT *result, int rw)
 		/* the collectors are not available and keys "vfs.dev.read", "vfs.dev.write" with some parameters */
 		/* (e.g. sps, ops) are not supported. */
 
-		SET_MSG_RESULT(result, strdup("This parameter is available only in daemon mode when collectors are started."));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "This item is available only in daemon mode when collectors are"
+				" started."));
 		return SYSINFO_RET_FAIL;
 	}
 
 	if (NULL == devname || '\0' == *devname || 0 == strcmp(devname, "all"))
+	{
 		*kernel_devname = '\0';
+	}
 	else if (SUCCEED != get_kernel_devname(devname, kernel_devname, sizeof(kernel_devname)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain device name used internally by the kernel."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == (device = collector_diskdevice_get(kernel_devname)))
 	{
 		if (SUCCEED != get_diskstat(kernel_devname, dstats))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain disk information."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		if (NULL == (device = collector_diskdevice_add(kernel_devname)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot add disk device to agent collector."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 
 	if (ZBX_DSTAT_TYPE_SPS == type)
diff --git a/src/libs/zbxsysinfo/linux/diskspace.c b/src/libs/zbxsysinfo/linux/diskspace.c
index 464652afa28..3613581528d 100644
--- a/src/libs/zbxsysinfo/linux/diskspace.c
+++ b/src/libs/zbxsysinfo/linux/diskspace.c
@@ -20,9 +20,10 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fsname, zbx_uint64_t *total, zbx_uint64_t *free,
-		zbx_uint64_t *used, double *pfree, double *pused)
+		zbx_uint64_t *used, double *pfree, double *pused, char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
 #	define ZBX_STATFS	statvfs
@@ -33,8 +34,17 @@ static int	get_fs_size_stat(const char *fsname, zbx_uint64_t *total, zbx_uint64_
 #endif
 	struct ZBX_STATFS	s;
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		*error = zbx_strdup(NULL, "Filesystem name cannot be empty.");
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
@@ -64,18 +74,24 @@ static int	get_fs_size_stat(const char *fsname, zbx_uint64_t *total, zbx_uint64_
 
 int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*fsname, *mode;
+	char		*fsname, *mode, *error;
 	zbx_uint64_t	total, free, used;
 	double		pfree, pused;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fsname, &total, &free, &used, &pfree, &pused))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fsname, &total, &free, &used, &pfree, &pused, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 		SET_UI64_RESULT(result, total);
@@ -88,59 +104,62 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		SET_DBL_RESULT(result, pused);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		ret = SYSINFO_RET_FAIL;
 	char		line[MAX_STRING_LEN], *p, *mpoint, *mtype;
 	FILE		*f;
 	struct zbx_json	j;
 
+	if (NULL == (f = fopen("/proc/mounts", "r")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc/mounts: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (NULL != (f = fopen("/proc/mounts", "r")))
+	while (NULL != fgets(line, sizeof(line), f))
 	{
-		while (NULL != fgets(line, sizeof(line), f))
-		{
-			if (NULL == (p = strchr(line, ' ')))
-				continue;
-
-			mpoint = ++p;
-
-			if (NULL == (p = strchr(mpoint, ' ')))
-				continue;
+		if (NULL == (p = strchr(line, ' ')))
+			continue;
 
-			*p = '\0';
+		mpoint = ++p;
 
-			mtype = ++p;
+		if (NULL == (p = strchr(mpoint, ' ')))
+			continue;
 
-			if (NULL == (p = strchr(mtype, ' ')))
-				continue;
+		*p = '\0';
 
-			*p = '\0';
+		mtype = ++p;
 
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#FSNAME}", mpoint, ZBX_JSON_TYPE_STRING);
-			zbx_json_addstring(&j, "{#FSTYPE}", mtype, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-		}
+		if (NULL == (p = strchr(mtype, ' ')))
+			continue;
 
-		zbx_fclose(f);
+		*p = '\0';
 
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#FSNAME}", mpoint, ZBX_JSON_TYPE_STRING);
+		zbx_json_addstring(&j, "{#FSTYPE}", mtype, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
+	zbx_fclose(f);
+
 	zbx_json_close(&j);
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, j.buffer));
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/linux/hardware.c b/src/libs/zbxsysinfo/linux/hardware.c
index fe88014c8d4..378e1fbd02e 100644
--- a/src/libs/zbxsysinfo/linux/hardware.c
+++ b/src/libs/zbxsysinfo/linux/hardware.c
@@ -23,6 +23,7 @@
 #include "zbxalgo.h"
 #include "hardware.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 /******************************************************************************
  *                                                                            *
@@ -203,7 +204,10 @@ int	SYSTEM_HW_CHASSIS(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (1 < request->nparam)
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
@@ -217,9 +221,19 @@ int	SYSTEM_HW_CHASSIS(AGENT_REQUEST *request, AGENT_RESULT *result)
 		ret = get_dmi_info(buf, sizeof(buf), DMI_GET_MODEL);
 	else if (0 == strcmp(mode, "serial"))
 		ret = get_dmi_info(buf, sizeof(buf), DMI_GET_SERIAL);
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	if (SYSINFO_RET_OK == ret)
-		SET_STR_RESULT(result, zbx_strdup(NULL, buf + 1));	/* buf has a leading space */
+	if (SYSINFO_RET_FAIL == ret)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain hardware information."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	SET_STR_RESULT(result, zbx_strdup(NULL, buf + 1));	/* buf has a leading space */
 
 	return ret;
 }
@@ -283,14 +297,20 @@ int     SYSTEM_HW_CPU(AGENT_REQUEST *request, AGENT_RESULT *result)
 	FILE		*f;
 
 	if (2 < request->nparam)
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	param = get_rparam(request, 0);
 
 	if (NULL == param || '\0' == *param || 0 == strcmp(param, "all"))
 		cpu = HW_CPU_ALL_CPUS;	/* show all CPUs by default */
 	else if (FAIL == is_uint31(param, (uint32_t*)&cpu))
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	param = get_rparam(request, 1);
 
@@ -305,10 +325,16 @@ int     SYSTEM_HW_CPU(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "curfreq"))
 		filter = HW_CPU_SHOW_CURFREQ;
 	else
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == (f = fopen(HW_CPU_INFO_FILE, "r")))
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open " HW_CPU_INFO_FILE ": %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
 
 	*buffer = '\0';
 
@@ -360,14 +386,17 @@ int     SYSTEM_HW_CPU(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_fclose(f);
 
-	if (SYSINFO_RET_OK == ret)
+	if (SYSINFO_RET_FAIL == ret)
 	{
-		if (-1 != cur_cpu && (HW_CPU_ALL_CPUS == cpu || cpu == cur_cpu))	/* print info about the last cpu */
-			offset += print_freq(buffer + offset, sizeof(buffer) - offset, filter, cpu, maxfreq, curfreq);
-
-		SET_TEXT_RESULT(result, zbx_strdup(NULL, buffer + 1));	/* buf has a leading space or '\n' */
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain CPU information."));
+		return SYSINFO_RET_FAIL;
 	}
 
+	if (-1 != cur_cpu && (HW_CPU_ALL_CPUS == cpu || cpu == cur_cpu))	/* print info about the last cpu */
+		offset += print_freq(buffer + offset, sizeof(buffer) - offset, filter, cpu, maxfreq, curfreq);
+
+	SET_TEXT_RESULT(result, zbx_strdup(NULL, buffer + 1));	/* buf has a leading space or '\n' */
+
 	return ret;
 }
 
@@ -376,7 +405,10 @@ int	SYSTEM_HW_DEVICES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char	*type;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	type = get_rparam(request, 0);
 
@@ -384,21 +416,27 @@ int	SYSTEM_HW_DEVICES(AGENT_REQUEST *request, AGENT_RESULT *result)
 		return EXECUTE_STR("lspci", result);	/* list PCI devices by default */
 	else if (0 == strcmp(type, "usb"))
 		return EXECUTE_STR("lsusb", result);
-
-	return SYSINFO_RET_FAIL;
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 }
 
 int     SYSTEM_HW_MACADDR(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	size_t			offset;
-	int			ret = SYSINFO_RET_FAIL, s, i, show_names;
+	int			s, i, show_names;
 	char			*format, *p, *regex, address[MAX_STRING_LEN], buffer[MAX_STRING_LEN];
 	struct ifreq		*ifr;
 	struct ifconf		ifc;
 	zbx_vector_str_t	addresses;
 
 	if (2 < request->nparam)
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	regex = get_rparam(request, 0);
 	format = get_rparam(request, 1);
@@ -408,19 +446,28 @@ int     SYSTEM_HW_MACADDR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(format, "short"))
 		show_names = 0;
 	else
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == (s = socket(AF_INET, SOCK_DGRAM, 0)))
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot create socket: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
 
 	/* get the interface list */
 	ifc.ifc_len = sizeof(buffer);
 	ifc.ifc_buf = buffer;
 	if (-1 == ioctl(s, SIOCGIFCONF, &ifc))
-		goto close;
+	{
+		close(s);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot set socket parameters: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
 	ifr = ifc.ifc_req;
 
-	ret = SYSINFO_RET_OK;
 	zbx_vector_str_create(&addresses);
 	zbx_vector_str_reserve(&addresses, 8);
 
@@ -474,12 +521,9 @@ int     SYSTEM_HW_MACADDR(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	buffer[offset] = '\0';
 
-	if (SYSINFO_RET_OK == ret)
-		SET_STR_RESULT(result, zbx_strdup(NULL, buffer));
+	SET_STR_RESULT(result, zbx_strdup(NULL, buffer));
 
 	zbx_vector_str_destroy(&addresses);
-close:
-	close(s);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/linux/hostname.c b/src/libs/zbxsysinfo/linux/hostname.c
index c0ccec5fc00..804b9a90050 100644
--- a/src/libs/zbxsysinfo/linux/hostname.c
+++ b/src/libs/zbxsysinfo/linux/hostname.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -32,7 +33,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
 
diff --git a/src/libs/zbxsysinfo/linux/inodes.c b/src/libs/zbxsysinfo/linux/inodes.c
index f6d50fa6615..0a1f936496e 100644
--- a/src/libs/zbxsysinfo/linux/inodes.c
+++ b/src/libs/zbxsysinfo/linux/inodes.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -34,13 +35,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+			zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 	{
@@ -63,7 +77,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -74,10 +91,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/linux/kernel.c b/src/libs/zbxsysinfo/linux/kernel.c
index 26bb8b7ebe4..b5b6f832cdb 100644
--- a/src/libs/zbxsysinfo/linux/kernel.c
+++ b/src/libs/zbxsysinfo/linux/kernel.c
@@ -41,28 +41,28 @@ static int	read_uint64_from_procfs(const char *path, zbx_uint64_t *value)
 
 int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		ret = SYSINFO_RET_FAIL;
 	zbx_uint64_t	value;
 
-	if (SYSINFO_RET_OK == read_uint64_from_procfs("/proc/sys/fs/file-max", &value))
+	if (SYSINFO_RET_FAIL == read_uint64_from_procfs("/proc/sys/fs/file-max", &value))
 	{
-		SET_UI64_RESULT(result, value);
-		ret = SYSINFO_RET_OK;
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain data from /proc/sys/fs/file-max."));
+		return SYSINFO_RET_FAIL;
 	}
 
-	return ret;
+	SET_UI64_RESULT(result, value);
+	return SYSINFO_RET_OK;
 }
 
 int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		ret = SYSINFO_RET_FAIL;
 	zbx_uint64_t	value;
 
-	if (SYSINFO_RET_OK == read_uint64_from_procfs("/proc/sys/kernel/pid_max", &value))
+	if (SYSINFO_RET_FAIL == read_uint64_from_procfs("/proc/sys/kernel/pid_max", &value))
 	{
-		SET_UI64_RESULT(result, value);
-		ret = SYSINFO_RET_OK;
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain data from /proc/sys/kernel/pid_max."));
+		return SYSINFO_RET_FAIL;
 	}
 
-	return ret;
+	SET_UI64_RESULT(result, value);
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/linux/linux.c b/src/libs/zbxsysinfo/linux/linux.c
index b939292361b..3933f384d10 100644
--- a/src/libs/zbxsysinfo/linux/linux.c
+++ b/src/libs/zbxsysinfo/linux/linux.c
@@ -52,6 +52,7 @@ ZBX_METRIC	parameters_specific[] =
 	{"system.cpu.util",	CF_HAVEPARAMS,	SYSTEM_CPU_UTIL,	"all,user,avg1"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
 	{"system.cpu.num",	CF_HAVEPARAMS,	SYSTEM_CPU_NUM,		"online"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.uname",	0,		SYSTEM_UNAME,		NULL},
 
diff --git a/src/libs/zbxsysinfo/linux/memory.c b/src/libs/zbxsysinfo/linux/memory.c
index 9897f031fdf..539473ba2f9 100644
--- a/src/libs/zbxsysinfo/linux/memory.c
+++ b/src/libs/zbxsysinfo/linux/memory.c
@@ -19,13 +19,17 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 static int	VM_MEMORY_TOTAL(AGENT_RESULT *result)
 {
 	struct sysinfo	info;
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)info.totalram * info.mem_unit);
 
@@ -37,7 +41,10 @@ static int	VM_MEMORY_FREE(AGENT_RESULT *result)
 	struct sysinfo	info;
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)info.freeram * info.mem_unit);
 
@@ -49,7 +56,10 @@ static int	VM_MEMORY_BUFFERS(AGENT_RESULT *result)
 	struct sysinfo	info;
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)info.bufferram * info.mem_unit);
 
@@ -63,7 +73,10 @@ static int	VM_MEMORY_CACHED(AGENT_RESULT *result)
 	zbx_uint64_t	res = 0;
 
 	if (NULL == (f = fopen("/proc/meminfo", "r")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc/meminfo: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (NULL != fgets(c, sizeof(c), f))
 	{
@@ -98,7 +111,10 @@ static int	VM_MEMORY_USED(AGENT_RESULT *result)
 	struct sysinfo	info;
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)(info.totalram - info.freeram) * info.mem_unit);
 
@@ -109,8 +125,17 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 {
 	struct sysinfo	info;
 
-	if (0 != sysinfo(&info) || 0 == info.totalram)
+	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 == info.totalram)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, (info.totalram - info.freeram) / (double)info.totalram * 100);
 
@@ -121,20 +146,26 @@ static int	VM_MEMORY_AVAILABLE(AGENT_RESULT *result)
 {
 	struct sysinfo	info;
 	AGENT_RESULT	result_tmp;
+	int		ret = SYSINFO_RET_FAIL;
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	init_result(&result_tmp);
 
-	if (SYSINFO_RET_OK != VM_MEMORY_CACHED(&result_tmp))
-		return SYSINFO_RET_FAIL;
+	ret = VM_MEMORY_CACHED(&result_tmp);
 
-	SET_UI64_RESULT(result, (zbx_uint64_t)(info.freeram + info.bufferram) * info.mem_unit + result_tmp.ui64);
+	if (SYSINFO_RET_OK == ret)
+		SET_UI64_RESULT(result, (zbx_uint64_t)(info.freeram + info.bufferram) * info.mem_unit + result_tmp.ui64);
+	else
+		SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg));
 
 	free_result(&result_tmp);
 
-	return SYSINFO_RET_OK;
+	return ret;
 }
 
 static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
@@ -142,26 +173,39 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	struct sysinfo	info;
 	AGENT_RESULT	result_tmp;
 	zbx_uint64_t	available, total;
+	int		ret = SYSINFO_RET_FAIL;
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	init_result(&result_tmp);
 
-	if (SYSINFO_RET_OK != VM_MEMORY_CACHED(&result_tmp))
-		return SYSINFO_RET_FAIL;
+	ret = VM_MEMORY_CACHED(&result_tmp);
+
+	if (SYSINFO_RET_FAIL == ret)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg));
+		goto clean;
+	}
 
 	available = (zbx_uint64_t)(info.freeram + info.bufferram) * info.mem_unit + result_tmp.ui64;
 	total = (zbx_uint64_t)info.totalram * info.mem_unit;
 
 	if (0 == total)
-		return SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
+		ret = SYSINFO_RET_FAIL;
+		goto clean;
+	}
 
 	SET_DBL_RESULT(result, available / (double)total * 100);
-
+clean:
 	free_result(&result_tmp);
 
-	return SYSINFO_RET_OK;
+	return ret;
 }
 
 static int	VM_MEMORY_SHARED(AGENT_RESULT *result)
@@ -170,12 +214,16 @@ static int	VM_MEMORY_SHARED(AGENT_RESULT *result)
 	struct sysinfo	info;
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, (zbx_uint64_t)info.sharedram * info.mem_unit);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Supported for Linux 2.4 only."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
@@ -186,7 +234,10 @@ int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
@@ -209,7 +260,10 @@ int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "shared"))
 		ret = VM_MEMORY_SHARED(result);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		ret = SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/linux/net.c b/src/libs/zbxsysinfo/linux/net.c
index c30f66d03f8..432f6933069 100644
--- a/src/libs/zbxsysinfo/linux/net.c
+++ b/src/libs/zbxsysinfo/linux/net.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 typedef struct
 {
@@ -35,54 +36,63 @@ typedef struct
 }
 net_stat_t;
 
-static int	get_net_stat(const char *if_name, net_stat_t *result)
+static int	get_net_stat(const char *if_name, net_stat_t *result, char **error)
 {
 	int	ret = SYSINFO_RET_FAIL;
 	char	line[MAX_STRING_LEN], name[MAX_STRING_LEN], *p;
 	FILE	*f;
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		*error = zbx_strdup(NULL, "Network interface name cannot be empty.");
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (NULL == (f = fopen("/proc/net/dev", "r")))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot open /proc/net/dev: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
-	if (NULL != (f = fopen("/proc/net/dev", "r")))
+	while (NULL != fgets(line, sizeof(line), f))
 	{
-		while (NULL != fgets(line, sizeof(line), f))
+		if (NULL == (p = strstr(line, ":")))
+			continue;
+
+		*p = '\t';
+
+		if (10 == sscanf(line, "%s\t" ZBX_FS_UI64 "\t" ZBX_FS_UI64 "\t"
+				ZBX_FS_UI64 "\t" ZBX_FS_UI64 "\t%*s\t%*s\t%*s\t%*s\t"
+				ZBX_FS_UI64 "\t" ZBX_FS_UI64 "\t" ZBX_FS_UI64 "\t"
+				ZBX_FS_UI64 "\t%*s\t" ZBX_FS_UI64 "\t%*s\t%*s\n",
+				name,
+				&result->ibytes,	/* bytes */
+				&result->ipackets,	/* packets */
+				&result->ierr,		/* errs */
+				&result->idrop,		/* drop */
+				&result->obytes,	/* bytes */
+				&result->opackets,	/* packets */
+				&result->oerr,		/* errs */
+				&result->odrop,		/* drop */
+				&result->colls))	/* icolls */
 		{
-			if (NULL == (p = strstr(line, ":")))
-				continue;
-
-			*p = '\t';
-
-			if (10 == sscanf(line, "%s\t" ZBX_FS_UI64 "\t" ZBX_FS_UI64 "\t"
-					ZBX_FS_UI64 "\t" ZBX_FS_UI64 "\t%*s\t%*s\t%*s\t%*s\t"
-					ZBX_FS_UI64 "\t" ZBX_FS_UI64 "\t" ZBX_FS_UI64 "\t"
-					ZBX_FS_UI64 "\t%*s\t" ZBX_FS_UI64 "\t%*s\t%*s\n",
-					name,
-					&(result->ibytes),	/* bytes */
-					&(result->ipackets),	/* packets */
-					&(result->ierr),	/* errs */
-					&(result->idrop),	/* drop */
-					&(result->obytes),	/* bytes */
-					&(result->opackets),	/* packets */
-					&(result->oerr),	/* errs */
-					&(result->odrop),	/* drop */
-					&(result->colls)))	/* icolls */
+			if (0 == strcmp(name, if_name))
 			{
-				if (0 == strcmp(name, if_name))
-				{
-					ret = SYSINFO_RET_OK;
-					break;
-				}
+				ret = SYSINFO_RET_OK;
+				break;
 			}
 		}
-
-		zbx_fclose(f);
 	}
 
-	if (ret != SYSINFO_RET_OK)
-		memset(result, 0, sizeof(net_stat_t));
+	zbx_fclose(f);
 
-	return ret;
+	if (SYSINFO_RET_FAIL == ret)
+	{
+		*error = zbx_strdup(NULL, "Cannot find information for this network interface in /proc/net/dev.");
+		return SYSINFO_RET_FAIL;
+	}
+
+	return SYSINFO_RET_OK;
 }
 
 /******************************************************************************
@@ -106,37 +116,52 @@ static int	get_net_stat(const char *if_name, net_stat_t *result)
  ******************************************************************************/
 static int	proc_read_file(const char *filename, char **buffer, int *buffer_alloc)
 {
-	int	n, fd;
+	int	n, fd, ret = -1;
+	size_t	offset = 0;
 
 	if (-1 == (fd = open(filename, O_RDONLY)))
 		return -1;
 
-	while (*buffer_alloc == (n = read(fd, *buffer, *buffer_alloc)))
+	while (0 != (n = read(fd, *buffer + offset, *buffer_alloc - offset)))
 	{
-		*buffer_alloc *= 2;
-		*buffer = zbx_realloc(*buffer, *buffer_alloc);
+		if (-1 == n)
+			goto out;
 
-		lseek(fd, 0, SEEK_SET);
+		offset += n;
+
+		if (offset == *buffer_alloc)
+		{
+			*buffer_alloc *= 2;
+			*buffer = zbx_realloc(*buffer, *buffer_alloc);
+		}
 	}
 
+	ret = offset;
+out:
 	close(fd);
 
-	return n;
+	return ret;
 }
 
 int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	net_stat_t	ns;
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_net_stat(if_name, &ns))
+	if (SYSINFO_RET_OK != get_net_stat(if_name, &ns, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ns.ibytes);
@@ -147,7 +172,10 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, ns.idrop);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -155,16 +183,22 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	net_stat_t	ns;
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_net_stat(if_name, &ns))
+	if (SYSINFO_RET_OK != get_net_stat(if_name, &ns, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ns.obytes);
@@ -175,7 +209,10 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, ns.odrop);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -183,16 +220,22 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	net_stat_t	ns;
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_net_stat(if_name, &ns))
+	if (SYSINFO_RET_OK != get_net_stat(if_name, &ns, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ns.ibytes + ns.obytes);
@@ -203,7 +246,10 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, ns.idrop + ns.odrop);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -211,15 +257,21 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	net_stat_t	ns;
-	char		*if_name;
+	char		*if_name, *error;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 
-	if (SYSINFO_RET_OK != get_net_stat(if_name, &ns))
+	if (SYSINFO_RET_OK != get_net_stat(if_name, &ns, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, ns.colls);
 
@@ -228,45 +280,45 @@ int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		ret = SYSINFO_RET_FAIL;
 	char		line[MAX_STRING_LEN], *p;
 	FILE		*f;
 	struct zbx_json	j;
 
+	if (NULL == (f = fopen("/proc/net/dev", "r")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc/net/dev: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (NULL != (f = fopen("/proc/net/dev", "r")))
+	while (NULL != fgets(line, sizeof(line), f))
 	{
-		while (NULL != fgets(line, sizeof(line), f))
-		{
-			if (NULL == (p = strstr(line, ":")))
-				continue;
+		if (NULL == (p = strstr(line, ":")))
+			continue;
 
-			*p = '\0';
+		*p = '\0';
 
-			/* trim left spaces */
-			for (p = line; ' ' == *p && '\0' != *p; p++)
-				;
+		/* trim left spaces */
+		for (p = line; ' ' == *p && '\0' != *p; p++)
+			;
 
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#IFNAME}", p, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-		}
-
-		zbx_fclose(f);
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#IFNAME}", p, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
+	zbx_fclose(f);
+
 	zbx_json_close(&j);
 
 	SET_STR_RESULT(result, strdup(j.buffer));
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
 
 int	NET_TCP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
@@ -277,12 +329,18 @@ int	NET_TCP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		ret = SYSINFO_RET_FAIL, n, buffer_alloc = 64 * ZBX_KIBIBYTE;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	buffer = zbx_malloc(NULL, buffer_alloc);
 
@@ -329,12 +387,18 @@ int	NET_UDP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		ret = SYSINFO_RET_FAIL, n, buffer_alloc = 64 * ZBX_KIBIBYTE;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	buffer = zbx_malloc(NULL, buffer_alloc);
 
diff --git a/src/libs/zbxsysinfo/linux/proc.c b/src/libs/zbxsysinfo/linux/proc.c
index e13e95d2af3..cf793692b30 100644
--- a/src/libs/zbxsysinfo/linux/proc.c
+++ b/src/libs/zbxsysinfo/linux/proc.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 static int	get_cmdline(FILE *f_cmd, char **line, size_t *line_offset)
 {
@@ -207,15 +208,28 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double		memsize = 0;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -231,21 +245,25 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
 	if (NULL == (dir = opendir("/proc")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (NULL != (entries = readdir(dir)))
 	{
 		zbx_fclose(f_cmd);
 		zbx_fclose(f_stat);
 
-		/* Self is a symbolic link. It leads to incorrect results for proc_cnt[zabbix_agentd]. */
-		/* Better approach: check if /proc/x/ is symbolic link. */
-		if (0 == strncmp(entries->d_name, "self", MAX_STRING_LEN))
+		if (0 == strcmp(entries->d_name, "self"))
 			continue;
 
 		zbx_snprintf(tmp, sizeof(tmp), "/proc/%s/cmdline", entries->d_name);
@@ -313,9 +331,7 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	closedir(dir);
 
 	if (ZBX_DO_AVG == do_task)
-	{
 		SET_DBL_RESULT(result, proccount == 0 ? 0 : memsize / proccount);
-	}
 	else
 		SET_UI64_RESULT(result, memsize);
 
@@ -333,15 +349,28 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	zbx_uint64_t	proccount = 0;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -357,21 +386,25 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "zomb"))
 		zbx_proc_stat = ZBX_PROC_STAT_ZOMB;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
 	if (NULL == (dir = opendir("/proc")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (NULL != (entries = readdir(dir)))
 	{
 		zbx_fclose(f_cmd);
 		zbx_fclose(f_stat);
 
-		/* Self is a symbolic link. It leads to incorrect results for proc_cnt[zabbix_agentd] */
-		/* Better approach: check if /proc/x/ is symbolic link */
-		if (0 == strncmp(entries->d_name, "self", MAX_STRING_LEN))
+		if (0 == strcmp(entries->d_name, "self"))
 			continue;
 
 		zbx_snprintf(tmp, sizeof(tmp), "/proc/%s/cmdline", entries->d_name);
diff --git a/src/libs/zbxsysinfo/linux/sensors.c b/src/libs/zbxsysinfo/linux/sensors.c
index 2c8d6dd3aed..e3a61d535ad 100644
--- a/src/libs/zbxsysinfo/linux/sensors.c
+++ b/src/libs/zbxsysinfo/linux/sensors.c
@@ -51,10 +51,9 @@ static void	count_sensor(int do_task, const char *filename, double *aggr, int *c
 #else
 	if (1 == sscanf(line, "%lf", &value))
 	{
-		if(NULL == strstr(filename, "fan"))
+		if (NULL == strstr(filename, "fan"))
 			value = value / 1000;
 #endif
-
 		(*cnt)++;
 
 		switch (do_task)
@@ -110,7 +109,7 @@ static char	*sysfs_read_attr(const char *device)
 	return zbx_strdup(NULL, buf);
 }
 
-int	get_device_info(const char *dev_path, const char *dev_name, char *device_info)
+static int	get_device_info(const char *dev_path, const char *dev_name, char *device_info)
 {
 	char		bus_path[MAX_STRING_LEN], linkpath[MAX_STRING_LEN], subsys_path[MAX_STRING_LEN];
 	char		*subsys, *prefix, *bus_attr = NULL;
@@ -244,8 +243,8 @@ out:
 static void	get_device_sensors(int do_task, const char *device, const char *name, double *aggr, int *cnt)
 {
 	char	sensorname[MAX_STRING_LEN];
-#if defined(KERNEL_2_4)
 
+#if defined(KERNEL_2_4)
 	if (ZBX_DO_ONE == do_task)
 	{
 		zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s", DEVICE_DIR, device, name);
@@ -325,9 +324,7 @@ static void	get_device_sensors(int do_task, const char *device, const char *name
 				err = SUCCEED;
 			}
 			else
-			{
 				err = get_device_info(devicepath, device_p, device_info);
-			}
 		}
 
 		if (SUCCEED == err && 0 == strcmp(device_info, device))
@@ -372,17 +369,26 @@ int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double	aggr = 0;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	device = get_rparam(request, 0);
 	name = get_rparam(request, 1);
 	function = get_rparam(request, 2);
 
 	if (NULL == device || '\0' == *device)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == name || '\0' == *name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == function || '\0' == *function)
 		do_task = ZBX_DO_ONE;
@@ -393,18 +399,27 @@ int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(function, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	if (ZBX_DO_ONE != do_task && 0 != isdigit(name[strlen(name)-1]))
+	if (ZBX_DO_ONE != do_task && 0 != isdigit(name[strlen(name) - 1]))
 		do_task = ZBX_DO_ONE;
 
-	if (ZBX_DO_ONE != do_task && 0 == isalpha(name[strlen(name)-1]))
+	if (ZBX_DO_ONE != do_task && 0 == isalpha(name[strlen(name) - 1]))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Generic sensor name must be specified for selected mode."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	get_device_sensors(do_task, device, name, &aggr, &cnt);
 
 	if (0 == cnt)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain sensor information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (ZBX_DO_AVG == do_task)
 		SET_DBL_RESULT(result, aggr / cnt);
diff --git a/src/libs/zbxsysinfo/linux/software.c b/src/libs/zbxsysinfo/linux/software.c
index 11d588bfb54..b6a0c77d2fb 100644
--- a/src/libs/zbxsysinfo/linux/software.c
+++ b/src/libs/zbxsysinfo/linux/software.c
@@ -23,6 +23,7 @@
 #include "cfg.h"
 #include "software.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -33,7 +34,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
@@ -47,19 +51,45 @@ int     SYSTEM_SW_OS(AGENT_REQUEST *request, AGENT_RESULT *result)
 	FILE	*f = NULL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return ret;
+	}
 
 	type = get_rparam(request, 0);
 
 	if (NULL == type || '\0' == *type || 0 == strcmp(type, "full"))
-		f = fopen(SW_OS_FULL, "r");
+	{
+		if (NULL == (f = fopen(SW_OS_FULL, "r")))
+		{
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open " SW_OS_FULL ": %s",
+					zbx_strerror(errno)));
+			return ret;
+		}
+	}
 	else if (0 == strcmp(type, "short"))
-		f = fopen(SW_OS_SHORT, "r");
+	{
+		if (NULL == (f = fopen(SW_OS_SHORT, "r")))
+		{
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open " SW_OS_SHORT ": %s",
+					zbx_strerror(errno)));
+			return ret;
+		}
+	}
 	else if (0 == strcmp(type, "name"))
-		f = fopen(SW_OS_NAME, "r");
-
-	if (NULL == f)
+	{
+		if (NULL == (f = fopen(SW_OS_NAME, "r")))
+		{
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open " SW_OS_NAME ": %s",
+					zbx_strerror(errno)));
+			return ret;
+		}
+	}
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return ret;
+	}
 
 	if (NULL != fgets(line, sizeof(line), f))
 	{
@@ -67,6 +97,9 @@ int     SYSTEM_SW_OS(AGENT_REQUEST *request, AGENT_RESULT *result)
 		zbx_rtrim(line, ZBX_WHITESPACE);
 		SET_STR_RESULT(result, zbx_strdup(NULL, line));
 	}
+	else
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot read from file."));
+
 	zbx_fclose(f);
 
 	return ret;
@@ -131,7 +164,10 @@ int     SYSTEM_SW_PACKAGES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	ZBX_PACKAGE_MANAGER	*mng;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return ret;
+	}
 
 	regex = get_rparam(request, 0);
 	manager = get_rparam(request, 1);
@@ -145,7 +181,10 @@ int     SYSTEM_SW_PACKAGES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "short"))
 		show_pm = 0;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return ret;
+	}
 
 	*buffer = '\0';
 	zbx_vector_str_create(&packages);
@@ -216,6 +255,8 @@ next:
 
 	if (SYSINFO_RET_OK == ret)
 		SET_TEXT_RESULT(result, zbx_strdup(NULL, buffer));
+	else
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain package information."));
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/linux/swap.c b/src/libs/zbxsysinfo/linux/swap.c
index 60014635915..f7db0554063 100644
--- a/src/libs/zbxsysinfo/linux/swap.c
+++ b/src/libs/zbxsysinfo/linux/swap.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -26,16 +27,25 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char		*swapdev, *mode;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))	/* default parameter */
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "free"))
 		SET_UI64_RESULT(result, info.freeswap * (zbx_uint64_t)info.mem_unit);
@@ -48,7 +58,10 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		SET_DBL_RESULT(result, info.totalswap ? 100.0 - 100.0 * (info.freeswap / (double)info.totalswap) : 0.0);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -242,18 +255,27 @@ int	SYSTEM_SWAP_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	swap_stat_t	ss;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (SYSINFO_RET_OK != get_swap_stat(swapdev, &ss))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain swap information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "pages"))
 	{
 		if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		SET_UI64_RESULT(result, ss.rpag);
 	}
@@ -262,7 +284,10 @@ int	SYSTEM_SWAP_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "count"))
 		SET_UI64_RESULT(result, ss.rio);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -273,18 +298,27 @@ int	SYSTEM_SWAP_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	swap_stat_t	ss;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (SYSINFO_RET_OK != get_swap_stat(swapdev, &ss))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain swap information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "pages"))
 	{
 		if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		SET_UI64_RESULT(result, ss.wpag);
 	}
@@ -293,7 +327,10 @@ int	SYSTEM_SWAP_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "count"))
 		SET_UI64_RESULT(result, ss.wio);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/linux/system.c b/src/libs/zbxsysinfo/linux/system.c
index ac58d08dcd9..849bd967c32 100644
--- a/src/libs/zbxsysinfo/linux/system.c
+++ b/src/libs/zbxsysinfo/linux/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine));
diff --git a/src/libs/zbxsysinfo/linux/uptime.c b/src/libs/zbxsysinfo/linux/uptime.c
index b7e94d3688e..4e8683081d5 100644
--- a/src/libs/zbxsysinfo/linux/uptime.c
+++ b/src/libs/zbxsysinfo/linux/uptime.c
@@ -19,13 +19,17 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	struct sysinfo	info;
 
 	if (0 != sysinfo(&info))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, info.uptime);
 
diff --git a/src/libs/zbxsysinfo/netbsd/Makefile.am b/src/libs/zbxsysinfo/netbsd/Makefile.am
index f4ce6867c8c..0c22333a0e9 100644
--- a/src/libs/zbxsysinfo/netbsd/Makefile.am
+++ b/src/libs/zbxsysinfo/netbsd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -13,7 +13,11 @@ libspecsysinfo_a_SOURCES = \
 	kernel.c \
 	memory.c \
 	net.c \
+	netbsd.c \
 	proc.c \
 	software.c \
 	system.c \
 	uptime.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/netbsd/boottime.c b/src/libs/zbxsysinfo/netbsd/boottime.c
index 94bc9d80fd7..0deacfe5b68 100644
--- a/src/libs/zbxsysinfo/netbsd/boottime.c
+++ b/src/libs/zbxsysinfo/netbsd/boottime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -33,12 +34,17 @@ int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(struct timeval);
 
 	if (-1 == sysctl(mib, 2, &boottime, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, boottime.tv_sec);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.boottime\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
-#endif /* HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME */
+#endif
 }
diff --git a/src/libs/zbxsysinfo/netbsd/cpu.c b/src/libs/zbxsysinfo/netbsd/cpu.c
index b0110cf03bb..63648d7eaf2 100644
--- a/src/libs/zbxsysinfo/netbsd/cpu.c
+++ b/src/libs/zbxsysinfo/netbsd/cpu.c
@@ -20,6 +20,9 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "stats.h"
+#include "log.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
 
 static int	get_cpu_num()
 {
@@ -38,22 +41,69 @@ static int	get_cpu_num()
 #endif
 }
 
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
+
 int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*tmp;
 	int	cpu_num;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	/* only "online" (default) for parameter "type" is supported */
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "online"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == (cpu_num = get_cpu_num()))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, cpu_num);
 
@@ -66,14 +116,20 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	cpu_num, state, mode;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		cpu_num = 0;
 	else if (SUCCEED != is_uint31_1(tmp, &cpu_num))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 	else
 		cpu_num++;
 
@@ -88,7 +144,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "idle"))
 		state = ZBX_CPU_STATE_IDLE;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 2);
 
@@ -99,7 +158,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return get_cpustat(result, cpu_num, state, mode);
 }
@@ -111,14 +173,20 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double	load[ZBX_AVG_COUNT], value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		per_cpu = 0;
 	else if (0 != strcmp(tmp, "percpu"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -129,17 +197,26 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (mode >= getloadavg(load, 3))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain load average: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	value = load[mode];
 
 	if (1 == per_cpu)
 	{
 		if (0 >= (cpu_num = get_cpu_num()))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 			return SYSINFO_RET_FAIL;
+		}
 		value /= cpu_num;
 	}
 
@@ -157,7 +234,10 @@ int     SYSTEM_CPU_SWITCHES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(struct uvmexp_sysctl);
 
 	if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, v.swtch);
 
@@ -173,7 +253,10 @@ int     SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(struct uvmexp_sysctl);
 
 	if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, v.intrs);
 
diff --git a/src/libs/zbxsysinfo/netbsd/diskspace.c b/src/libs/zbxsysinfo/netbsd/diskspace.c
index d59b797acac..f79eea03d89 100644
--- a/src/libs/zbxsysinfo/netbsd/diskspace.c
+++ b/src/libs/zbxsysinfo/netbsd/diskspace.c
@@ -20,9 +20,10 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *free,
-		zbx_uint64_t *used, double *pfree, double *pused)
+		zbx_uint64_t *used, double *pfree, double *pused, char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
 #	define ZBX_STATFS	statvfs
@@ -34,7 +35,10 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 	struct ZBX_STATFS	s;
 
 	if (0 != ZBX_STATFS(fs, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
@@ -64,10 +68,14 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 
 static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -76,10 +84,14 @@ static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -88,10 +100,14 @@ static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -101,10 +117,14 @@ static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -113,10 +133,14 @@ static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -129,13 +153,19 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))
 		ret = VFS_FS_TOTAL(fsname, result);
@@ -148,32 +178,36 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		ret = VFS_FS_PUSED(fsname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_FAIL;
 }
 
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		i, rc, ret = SYSINFO_RET_FAIL;
+	int		i, rc;
 	struct statvfs	*mntbuf;
 	struct zbx_json	j;
 
+	if (0 == (rc = getmntinfo(&mntbuf, MNT_WAIT)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (0 != (rc = getmntinfo(&mntbuf, MNT_WAIT)))
+	for (i = 0; i < rc; i++)
 	{
-		for (i = 0; i < rc; i++)
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#FSNAME}", mntbuf[i].f_mntonname, ZBX_JSON_TYPE_STRING);
-			zbx_json_addstring(&j, "{#FSTYPE}", mntbuf[i].f_fstypename, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-		}
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#FSNAME}", mntbuf[i].f_mntonname, ZBX_JSON_TYPE_STRING);
+		zbx_json_addstring(&j, "{#FSTYPE}", mntbuf[i].f_fstypename, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
 	zbx_json_close(&j);
@@ -182,5 +216,5 @@ int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/netbsd/hostname.c b/src/libs/zbxsysinfo/netbsd/hostname.c
index c0ccec5fc00..804b9a90050 100644
--- a/src/libs/zbxsysinfo/netbsd/hostname.c
+++ b/src/libs/zbxsysinfo/netbsd/hostname.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -32,7 +33,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
 
diff --git a/src/libs/zbxsysinfo/netbsd/inodes.c b/src/libs/zbxsysinfo/netbsd/inodes.c
index f6d50fa6615..049a12bd011 100644
--- a/src/libs/zbxsysinfo/netbsd/inodes.c
+++ b/src/libs/zbxsysinfo/netbsd/inodes.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -34,13 +35,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 	{
@@ -63,7 +77,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -74,10 +91,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/netbsd/kernel.c b/src/libs/zbxsysinfo/netbsd/kernel.c
index d1c65f499e1..966de3b8886 100644
--- a/src/libs/zbxsysinfo/netbsd/kernel.c
+++ b/src/libs/zbxsysinfo/netbsd/kernel.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -33,12 +34,17 @@ int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(maxfiles);
 
 	if (0 != sysctl(mib, 2, &maxfiles, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, maxfiles);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.maxfiles\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
@@ -56,12 +62,17 @@ int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(maxproc);
 
 	if (0 != sysctl(mib, 2, &maxproc, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, maxproc);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.maxproc\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/netbsd/memory.c b/src/libs/zbxsysinfo/netbsd/memory.c
index fe728447646..b1a348e9667 100644
--- a/src/libs/zbxsysinfo/netbsd/memory.c
+++ b/src/libs/zbxsysinfo/netbsd/memory.c
@@ -19,16 +19,21 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 static int			mib[] = {CTL_VM, VM_UVMEXP2};
 static size_t			len;
 static struct uvmexp_sysctl	uvm;
 
-#define ZBX_SYSCTL(value)				\
-							\
-	len = sizeof(value);				\
-	if (0 != sysctl(mib, 2, &value, &len, NULL, 0))	\
-		return SYSINFO_RET_FAIL
+#define ZBX_SYSCTL(value)										\
+													\
+	len = sizeof(value);										\
+	if (0 != sysctl(mib, 2, &value, &len, NULL, 0))							\
+	{												\
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s",	\
+				zbx_strerror(errno)));							\
+		return SYSINFO_RET_FAIL;								\
+	}
 
 static int	VM_MEMORY_TOTAL(AGENT_RESULT *result)
 {
@@ -116,7 +121,10 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 	ZBX_SYSCTL(uvm);
 
 	if (0 == uvm.npages)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, (uvm.npages - uvm.free) / (double)uvm.npages * 100);
 
@@ -143,7 +151,10 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	ZBX_SYSCTL(uvm);
 
 	if (0 == uvm.npages)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	available = uvm.inactive + uvm.execpages + uvm.filepages + uvm.free;
 
@@ -190,7 +201,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
@@ -225,7 +239,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "shared"))
 		ret = VM_MEMORY_SHARED(result);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		ret = SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/netbsd/net.c b/src/libs/zbxsysinfo/netbsd/net.c
index f92f1cdab3b..ee0f84ce2ca 100644
--- a/src/libs/zbxsysinfo/netbsd/net.c
+++ b/src/libs/zbxsysinfo/netbsd/net.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static struct nlist kernel_symbols[] =
 {
@@ -34,7 +35,7 @@ static int	get_ifdata(const char *if_name,
 		zbx_uint64_t *ibytes, zbx_uint64_t *ipackets, zbx_uint64_t *ierrors, zbx_uint64_t *idropped,
 		zbx_uint64_t *obytes, zbx_uint64_t *opackets, zbx_uint64_t *oerrors,
 		zbx_uint64_t *tbytes, zbx_uint64_t *tpackets, zbx_uint64_t *terrors,
-		zbx_uint64_t *icollisions)
+		zbx_uint64_t *icollisions, char **error)
 {
 	struct ifnet_head	head;
 	struct ifnet		*ifp;
@@ -45,89 +46,102 @@ static int	get_ifdata(const char *if_name,
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (NULL == if_name || '\0' == *if_name)
-		return SYSINFO_RET_FAIL;
+	{
+		*error = zbx_strdup(NULL, "Network interface name cannot be empty.");
+		return FAIL;
+	}
 
-	if (NULL != (kp = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL))) /* requires root privileges */
+	if (NULL == (kp = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL))) /* requires root privileges */
 	{
-		if (N_UNDF == kernel_symbols[IFNET_ID].n_type)
-			if (0 != kvm_nlist(kp, &kernel_symbols[0]))
-				kernel_symbols[IFNET_ID].n_type = N_UNDF;
+		*error = zbx_strdup(NULL, "Cannot obtain a descriptor to access kernel virtual memory.");
+		return FAIL;
+	}
 
-		if (N_UNDF != kernel_symbols[IFNET_ID].n_type)
-		{
-			len = sizeof(struct ifnet_head);
+	if (N_UNDF == kernel_symbols[IFNET_ID].n_type)
+		if (0 != kvm_nlist(kp, &kernel_symbols[0]))
+			kernel_symbols[IFNET_ID].n_type = N_UNDF;
+
+	if (N_UNDF != kernel_symbols[IFNET_ID].n_type)
+	{
+		len = sizeof(struct ifnet_head);
 
-			if (kvm_read(kp, kernel_symbols[IFNET_ID].n_value, &head, len) >= len)
+		if (kvm_read(kp, kernel_symbols[IFNET_ID].n_value, &head, len) >= len)
+		{
+			len = sizeof(struct ifnet);
+
+			/* if_ibytes;		total number of octets received */
+			/* if_ipackets;		packets received on interface */
+			/* if_ierrors;		input errors on interface */
+			/* if_iqdrops;		dropped on input, this interface */
+			/* if_obytes;		total number of octets sent */
+			/* if_opackets;		packets sent on interface */
+			/* if_oerrors;		output errors on interface */
+			/* if_collisions;	collisions on csma interfaces */
+
+			if (ibytes)
+				*ibytes = 0;
+			if (ipackets)
+				*ipackets = 0;
+			if (ierrors)
+				*ierrors = 0;
+			if (idropped)
+				*idropped = 0;
+			if (obytes)
+				*obytes = 0;
+			if (opackets)
+				*opackets = 0;
+			if (oerrors)
+				*oerrors = 0;
+			if (tbytes)
+				*tbytes = 0;
+			if (tpackets)
+				*tpackets = 0;
+			if (terrors)
+				*terrors = 0;
+			if (icollisions)
+				*icollisions = 0;
+
+			for (ifp = head.tqh_first; ifp; ifp = v.if_list.tqe_next)
 			{
-				len = sizeof(struct ifnet);
-
-				/* if_ibytes;		total number of octets received */
-				/* if_ipackets;		packets received on interface */
-				/* if_ierrors;		input errors on interface */
-				/* if_iqdrops;		dropped on input, this interface */
-				/* if_obytes;		total number of octets sent */
-				/* if_opackets;		packets sent on interface */
-				/* if_oerrors;		output errors on interface */
-				/* if_collisions;	collisions on csma interfaces */
-
-				if (ibytes)
-					*ibytes = 0;
-				if (ipackets)
-					*ipackets = 0;
-				if (ierrors)
-					*ierrors = 0;
-				if (idropped)
-					*idropped = 0;
-				if (obytes)
-					*obytes = 0;
-				if (opackets)
-					*opackets = 0;
-				if (oerrors)
-					*oerrors = 0;
-				if (tbytes)
-					*tbytes = 0;
-				if (tpackets)
-					*tpackets = 0;
-				if (terrors)
-					*terrors = 0;
-				if (icollisions)
-					*icollisions = 0;
-
-				for (ifp = head.tqh_first; ifp; ifp = v.if_list.tqe_next)
+				if (kvm_read(kp, (u_long)ifp, &v, len) < len)
+					break;
+
+				if (0 == strcmp(if_name, v.if_xname))
 				{
-					if (kvm_read(kp, (u_long)ifp, &v, len) < len)
-						break;
-
-					if (0 == strcmp(if_name, v.if_xname))
-					{
-						if (ibytes)
-							*ibytes += v.if_ibytes;
-						if (ipackets)
-							*ipackets += v.if_ipackets;
-						if (ierrors)
-							*ierrors += v.if_ierrors;
-						if (idropped)
-							*idropped += v.if_iqdrops;
-						if (obytes)
-							*obytes += v.if_obytes;
-						if (opackets)
-							*opackets += v.if_opackets;
-						if (oerrors)
-							*oerrors += v.if_oerrors;
-						if (tbytes)
-							*tbytes += v.if_ibytes + v.if_obytes;
-						if (tpackets)
-							*tpackets += v.if_ipackets + v.if_opackets;
-						if (terrors)
-							*terrors += v.if_ierrors + v.if_oerrors;
-						if (icollisions)
-							*icollisions += v.if_collisions;
-						ret = SYSINFO_RET_OK;
-					}
+					if (ibytes)
+						*ibytes += v.if_ibytes;
+					if (ipackets)
+						*ipackets += v.if_ipackets;
+					if (ierrors)
+						*ierrors += v.if_ierrors;
+					if (idropped)
+						*idropped += v.if_iqdrops;
+					if (obytes)
+						*obytes += v.if_obytes;
+					if (opackets)
+						*opackets += v.if_opackets;
+					if (oerrors)
+						*oerrors += v.if_oerrors;
+					if (tbytes)
+						*tbytes += v.if_ibytes + v.if_obytes;
+					if (tpackets)
+						*tpackets += v.if_ipackets + v.if_opackets;
+					if (terrors)
+						*terrors += v.if_ierrors + v.if_oerrors;
+					if (icollisions)
+						*icollisions += v.if_collisions;
+					ret = SYSINFO_RET_OK;
 				}
 			}
 		}
-		kvm_close(kp);
+	}
+
+	kvm_close(kp);
+
+	if (SYSINFO_RET_FAIL == ret)
+	{
+		*error = zbx_strdup(NULL, "Cannot find information for this network interface.");
+		return SYSINFO_RET_FAIL;
 	}
 
 	return ret;
@@ -135,17 +149,24 @@ static int	get_ifdata(const char *if_name,
 
 int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	zbx_uint64_t	ibytes, ipackets, ierrors, idropped;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_ifdata(if_name, &ibytes, &ipackets, &ierrors, &idropped, NULL, NULL, NULL, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_ifdata(if_name, &ibytes, &ipackets, &ierrors, &idropped, NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ibytes);
@@ -156,24 +177,34 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, idropped);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	zbx_uint64_t	obytes, opackets, oerrors;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, &obytes, &opackets, &oerrors, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, &obytes, &opackets, &oerrors, NULL, NULL,
+			NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, obytes);
@@ -182,24 +213,34 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "errors"))
 		SET_UI64_RESULT(result, oerrors);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	zbx_uint64_t	tbytes, tpackets, terrors;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &tbytes, &tpackets, &terrors, NULL))
+	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &tbytes, &tpackets,
+			&terrors, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, tbytes);
@@ -208,23 +249,33 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "errors"))
 		SET_UI64_RESULT(result, terrors);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name;
+	char		*if_name, *error;
 	zbx_uint64_t	icollisions;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 
-	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &icollisions))
+	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+			NULL, &icollisions, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, icollisions);
 
@@ -233,27 +284,25 @@ int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int			ret = SYSINFO_RET_FAIL, i;
+	int			i;
 	struct zbx_json		j;
 	struct if_nameindex	*interfaces;
 
+	if (NULL == (interfaces = if_nameindex()))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (NULL != (interfaces = if_nameindex()))
+	for (i = 0; 0 != interfaces[i].if_index; i++)
 	{
-		i = 0;
-
-		while (0 != interfaces[i].if_index)
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#IFNAME}", interfaces[i].if_name, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-			i++;
-		}
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#IFNAME}", interfaces[i].if_name, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
 	zbx_json_close(&j);
@@ -262,5 +311,5 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/netbsd/proc.c b/src/libs/zbxsysinfo/netbsd/proc.c
index 67a5756c92b..60fa978ebd7 100644
--- a/src/libs/zbxsysinfo/netbsd/proc.c
+++ b/src/libs/zbxsysinfo/netbsd/proc.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 #include <sys/sysctl.h>
 
@@ -78,15 +79,28 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct passwd		*usrinfo;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -102,14 +116,20 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
 	pagesize = getpagesize();
 
 	if (NULL == kd && NULL == (kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain a descriptor to access kernel virtual memory."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL != usrinfo)
 	{
@@ -123,7 +143,10 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 
 	if (NULL == (proc = kvm_getproc2(kd, op, arg, sizeof(struct kinfo_proc2), &count)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain process information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	for (pproc = proc, i = 0; i < count; pproc++, i++)
 	{
@@ -188,15 +211,28 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct passwd		*usrinfo;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -212,12 +248,18 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "zomb"))
 		zbx_proc_stat = ZBX_PROC_STAT_ZOMB;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
 	if (NULL == kd && NULL == (kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain a descriptor to access kernel virtual memory."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL != usrinfo)
 	{
@@ -231,7 +273,10 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 
 	if (NULL == (proc = kvm_getproc2(kd, op, arg, sizeof(struct kinfo_proc2), &count)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain process information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	for (pproc = proc, i = 0; i < count; pproc++, i++)
 	{
diff --git a/src/libs/zbxsysinfo/netbsd/software.c b/src/libs/zbxsysinfo/netbsd/software.c
index 4dea0e6d6fd..fa4c702ab88 100644
--- a/src/libs/zbxsysinfo/netbsd/software.c
+++ b/src/libs/zbxsysinfo/netbsd/software.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
diff --git a/src/libs/zbxsysinfo/netbsd/system.c b/src/libs/zbxsysinfo/netbsd/system.c
index ac58d08dcd9..849bd967c32 100644
--- a/src/libs/zbxsysinfo/netbsd/system.c
+++ b/src/libs/zbxsysinfo/netbsd/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine));
diff --git a/src/libs/zbxsysinfo/netbsd/uptime.c b/src/libs/zbxsysinfo/netbsd/uptime.c
index ba81d341a3d..0db7da844e4 100644
--- a/src/libs/zbxsysinfo/netbsd/uptime.c
+++ b/src/libs/zbxsysinfo/netbsd/uptime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -31,7 +32,10 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 		return SYSINFO_RET_OK;
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 #elif defined(HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME)
 	int		mib[2], now;
 	size_t		len;
@@ -43,55 +47,18 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(uptime);
 
 	if (0 != sysctl(mib, 2, &uptime, &len, NULL, 0))
-		return SYSINFO_RET_FAIL;
-
-	now = time(NULL);
-
-	SET_UI64_RESULT(result, now - uptime.tv_sec);
-
-	return SYSINFO_RET_OK;
-
-#elif defined(HAVE_KSTAT_H)	/* Solaris */
-	kstat_ctl_t   *kc;
-	kstat_t       *kp;
-	kstat_named_t *kn;
-
-	long          hz;
-	long          secs;
-
-	/* open kstat */
-	kc = kstat_open();
-	if (0 == kc)
-		return SYSINFO_RET_FAIL;
-
-	/* read uptime counter */
-	kp = kstat_lookup(kc, "unix", 0, "system_misc");
-	if (0 == kp)
 	{
-		kstat_close(kc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
 
-	if (-1 == kstat_read(kc, kp, 0))
-	{
-		kstat_close(kc);
-		return SYSINFO_RET_FAIL;
-	}
-	kn = (kstat_named_t*)kstat_data_lookup(kp, "clk_intr");
-
-	hz = sysconf(_SC_CLK_TCK);
-
-	/* make sure we do not divide by 0 */
-	assert(hz);
-
-	secs = get_kstat_numeric_value(kn) / hz;
+	now = time(NULL);
 
-	/* close kstat */
-	kstat_close(kc);
+	SET_UI64_RESULT(result, now - uptime.tv_sec);
 
-	SET_UI64_RESULT(result, secs);
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for uptime information."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/openbsd/Makefile.am b/src/libs/zbxsysinfo/openbsd/Makefile.am
index 8791c2e7fec..714ee3fa44d 100644
--- a/src/libs/zbxsysinfo/openbsd/Makefile.am
+++ b/src/libs/zbxsysinfo/openbsd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -13,9 +13,13 @@ libspecsysinfo_a_SOURCES = \
 	kernel.c \
 	memory.c \
 	net.c \
+	openbsd.c \
 	proc.c \
 	sensors.c \
 	software.c \
 	swap.c \
 	system.c \
 	uptime.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/openbsd/boottime.c b/src/libs/zbxsysinfo/openbsd/boottime.c
index 94bc9d80fd7..0deacfe5b68 100644
--- a/src/libs/zbxsysinfo/openbsd/boottime.c
+++ b/src/libs/zbxsysinfo/openbsd/boottime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -33,12 +34,17 @@ int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(struct timeval);
 
 	if (-1 == sysctl(mib, 2, &boottime, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, boottime.tv_sec);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.boottime\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
-#endif /* HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME */
+#endif
 }
diff --git a/src/libs/zbxsysinfo/openbsd/cpu.c b/src/libs/zbxsysinfo/openbsd/cpu.c
index 3e19d4f8ae3..fcf5b5e2cc2 100644
--- a/src/libs/zbxsysinfo/openbsd/cpu.c
+++ b/src/libs/zbxsysinfo/openbsd/cpu.c
@@ -20,6 +20,47 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "stats.h"
+#include "log.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
+
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
 
 static int	get_cpu_num()
 {
@@ -44,16 +85,25 @@ int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	cpu_num;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	/* only "online" (default) for parameter "type" is supported */
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "online"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == (cpu_num = get_cpu_num()))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, cpu_num);
 
@@ -66,14 +116,20 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	cpu_num, state, mode;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		cpu_num = 0;
 	else if (SUCCEED != is_uint31_1(tmp, &cpu_num))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 	else
 		cpu_num++;
 
@@ -90,7 +146,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "interrupt"))
 		state = ZBX_CPU_STATE_INTERRUPT;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 2);
 
@@ -101,7 +160,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return get_cpustat(result, cpu_num, state, mode);
 }
@@ -113,14 +175,20 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double	load[ZBX_AVG_COUNT], value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		per_cpu = 0;
 	else if (0 != strcmp(tmp, "percpu"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -131,17 +199,26 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (mode >= getloadavg(load, 3))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain load average: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	value = load[mode];
 
 	if (1 == per_cpu)
 	{
 		if (0 >= (cpu_num = get_cpu_num()))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 			return SYSINFO_RET_FAIL;
+		}
 		value /= cpu_num;
 	}
 
@@ -159,7 +236,10 @@ int     SYSTEM_CPU_SWITCHES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(struct uvmexp);
 
 	if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, v.swtch);
 
@@ -175,7 +255,10 @@ int     SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(struct uvmexp);
 
 	if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, v.intrs);
 
diff --git a/src/libs/zbxsysinfo/openbsd/diskio.c b/src/libs/zbxsysinfo/openbsd/diskio.c
index 04bbe505321..43bcc94b01d 100644
--- a/src/libs/zbxsysinfo/openbsd/diskio.c
+++ b/src/libs/zbxsysinfo/openbsd/diskio.c
@@ -19,18 +19,19 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	get_diskstat(const char *devname, zbx_uint64_t *dstat)
 {
 	return FAIL;
 }
 
-static int	get_disk_stats(const char *devname, zbx_uint64_t *rbytes, zbx_uint64_t *wbytes, zbx_uint64_t *roper, zbx_uint64_t *woper)
+static int	get_disk_stats(const char *devname, zbx_uint64_t *rbytes, zbx_uint64_t *wbytes, zbx_uint64_t *roper,
+		zbx_uint64_t *woper, char **error)
 {
-	int			ret = SYSINFO_RET_FAIL, mib[2], drive_count;
+	int			ret = SYSINFO_RET_FAIL, mib[2], i, drive_count;
 	size_t			len;
 	struct diskstats	*stats;
-	int			i;
 
 	mib[0] = CTL_HW;
 	mib[1] = HW_DISKCOUNT;
@@ -38,46 +39,59 @@ static int	get_disk_stats(const char *devname, zbx_uint64_t *rbytes, zbx_uint64_
 	len = sizeof(drive_count);
 
 	if (0 != sysctl(mib, 2, &drive_count, &len, NULL, 0))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain number of disks: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
-	len = (drive_count * sizeof(struct diskstats));
+	len = drive_count * sizeof(struct diskstats);
 
-	if (NULL == (stats = zbx_calloc(NULL, drive_count, len)))
-		return SYSINFO_RET_FAIL;
+	stats = zbx_calloc(NULL, drive_count, len);
 
 	mib[0] = CTL_HW;
 	mib[1] = HW_DISKSTATS;
 
-	if (rbytes)
+	if (NULL != rbytes)
 		*rbytes = 0;
-	if (wbytes)
+	if (NULL != wbytes)
 		*wbytes = 0;
-	if (roper)
+	if (NULL != roper)
 		*roper = 0;
-	if (woper)
+	if (NULL != woper)
 		*woper = 0;
 
-	if (0 == sysctl(mib, 2, stats, &len, NULL, 0))
+	if (0 != sysctl(mib, 2, stats, &len, NULL, 0))
 	{
-		for (i = 0; i < drive_count; i++)
-		{
-			if (NULL == devname || '\0' == *devname || 0 == strcmp(devname, "all") ||
+		zbx_free(stats);
+		*error = zbx_dsprintf(NULL, "Cannot obtain disk information: %s", zbx_strerror(errno));
+		return SYSINFO_RET_FAIL;
+	}
+
+	for (i = 0; i < drive_count; i++)
+	{
+		if (NULL == devname || '\0' == *devname || 0 == strcmp(devname, "all") ||
 				0 == strcmp(devname, stats[i].ds_name))
-			{
-				if (rbytes)
-					*rbytes += stats[i].ds_rbytes;
-				if (wbytes)
-					*wbytes += stats[i].ds_wbytes;
-				if (roper)
-					*roper += stats[i].ds_rxfer;
-				if (woper)
-					*woper += stats[i].ds_wxfer;
-				ret = SYSINFO_RET_OK;
-			}
+		{
+			if (NULL != rbytes)
+				*rbytes += stats[i].ds_rbytes;
+			if (NULL != wbytes)
+				*wbytes += stats[i].ds_wbytes;
+			if (NULL != roper)
+				*roper += stats[i].ds_rxfer;
+			if (NULL != woper)
+				*woper += stats[i].ds_wxfer;
+
+			ret = SYSINFO_RET_OK;
 		}
 	}
 
-	free(stats);
+	zbx_free(stats);
+
+	if (SYSINFO_RET_FAIL == ret)
+	{
+		*error = zbx_strdup(NULL, "Cannot find information for this disk device.");
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
@@ -85,9 +99,13 @@ static int	get_disk_stats(const char *devname, zbx_uint64_t *rbytes, zbx_uint64_
 static int	VFS_DEV_READ_BYTES(const char *devname, AGENT_RESULT *result)
 {
 	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_disk_stats(devname, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_disk_stats(devname, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -97,9 +115,13 @@ static int	VFS_DEV_READ_BYTES(const char *devname, AGENT_RESULT *result)
 static int	VFS_DEV_READ_OPERATIONS(const char *devname, AGENT_RESULT *result)
 {
 	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_disk_stats(devname, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_disk_stats(devname, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -109,9 +131,13 @@ static int	VFS_DEV_READ_OPERATIONS(const char *devname, AGENT_RESULT *result)
 static int	VFS_DEV_WRITE_BYTES(const char *devname, AGENT_RESULT *result)
 {
 	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_disk_stats(devname, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_disk_stats(devname, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -121,53 +147,69 @@ static int	VFS_DEV_WRITE_BYTES(const char *devname, AGENT_RESULT *result)
 static int	VFS_DEV_WRITE_OPERATIONS(const char *devname, AGENT_RESULT *result)
 {
 	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_disk_stats(devname, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_disk_stats(devname, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
 	return SYSINFO_RET_OK;
 }
 
-int	VFS_DEV_WRITE(AGENT_REQUEST *request, AGENT_RESULT *result)
+int	VFS_DEV_READ(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*devname, *mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	devname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "operations"))
-		ret = VFS_DEV_WRITE_OPERATIONS(devname, result);
+		ret = VFS_DEV_READ_OPERATIONS(devname, result);
 	else if (0 == strcmp(mode, "bytes"))
-		ret = VFS_DEV_WRITE_BYTES(devname, result);
+		ret = VFS_DEV_READ_BYTES(devname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
 
-int	VFS_DEV_READ(AGENT_REQUEST *request, AGENT_RESULT *result)
+int	VFS_DEV_WRITE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*devname, *mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	devname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "operations"))
-		ret = VFS_DEV_READ_OPERATIONS(devname, result);
+		ret = VFS_DEV_WRITE_OPERATIONS(devname, result);
 	else if (0 == strcmp(mode, "bytes"))
-		ret = VFS_DEV_READ_BYTES(devname, result);
+		ret = VFS_DEV_WRITE_BYTES(devname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/openbsd/diskspace.c b/src/libs/zbxsysinfo/openbsd/diskspace.c
index bf7706449c3..790a8b62a95 100644
--- a/src/libs/zbxsysinfo/openbsd/diskspace.c
+++ b/src/libs/zbxsysinfo/openbsd/diskspace.c
@@ -20,9 +20,10 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *free,
-		zbx_uint64_t *used, double *pfree, double *pused)
+		zbx_uint64_t *used, double *pfree, double *pused, char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
 #	define ZBX_STATFS	statvfs
@@ -34,7 +35,10 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 	struct ZBX_STATFS	s;
 
 	if (0 != ZBX_STATFS(fs, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
@@ -64,10 +68,14 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 
 static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -76,10 +84,14 @@ static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -88,10 +100,14 @@ static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -101,10 +117,14 @@ static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -113,10 +133,14 @@ static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -129,13 +153,19 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))
 		ret = VFS_FS_TOTAL(fsname, result);
@@ -148,32 +178,36 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		ret = VFS_FS_PUSED(fsname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
 
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		i, rc, ret = SYSINFO_RET_FAIL;
+	int		i, rc;
 	struct statfs	*mntbuf;
 	struct zbx_json	j;
 
+	if (0 == (rc = getmntinfo(&mntbuf, MNT_WAIT)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (0 != (rc = getmntinfo(&mntbuf, MNT_WAIT)))
+	for (i = 0; i < rc; i++)
 	{
-		for (i = 0; i < rc; i++)
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#FSNAME}", mntbuf[i].f_mntonname, ZBX_JSON_TYPE_STRING);
-			zbx_json_addstring(&j, "{#FSTYPE}", mntbuf[i].f_fstypename, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-		}
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#FSNAME}", mntbuf[i].f_mntonname, ZBX_JSON_TYPE_STRING);
+		zbx_json_addstring(&j, "{#FSTYPE}", mntbuf[i].f_fstypename, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
 	zbx_json_close(&j);
@@ -182,5 +216,5 @@ int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/openbsd/hostname.c b/src/libs/zbxsysinfo/openbsd/hostname.c
index c0ccec5fc00..804b9a90050 100644
--- a/src/libs/zbxsysinfo/openbsd/hostname.c
+++ b/src/libs/zbxsysinfo/openbsd/hostname.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -32,7 +33,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
 
diff --git a/src/libs/zbxsysinfo/openbsd/inodes.c b/src/libs/zbxsysinfo/openbsd/inodes.c
index f6d50fa6615..049a12bd011 100644
--- a/src/libs/zbxsysinfo/openbsd/inodes.c
+++ b/src/libs/zbxsysinfo/openbsd/inodes.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -34,13 +35,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 	{
@@ -63,7 +77,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -74,10 +91,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/openbsd/kernel.c b/src/libs/zbxsysinfo/openbsd/kernel.c
index d1c65f499e1..df7b3007941 100644
--- a/src/libs/zbxsysinfo/openbsd/kernel.c
+++ b/src/libs/zbxsysinfo/openbsd/kernel.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -33,12 +34,17 @@ int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(maxfiles);
 
 	if (0 != sysctl(mib, 2, &maxfiles, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, maxfiles);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.maxfiles\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
@@ -56,12 +62,16 @@ int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(maxproc);
 
 	if (0 != sysctl(mib, 2, &maxproc, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, maxproc);
 
 	return SYSINFO_RET_OK;
 #else
-	return SYSINFO_RET_FAIL;
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.maxproc\" system"
+			" parameter."));
 #endif
 }
diff --git a/src/libs/zbxsysinfo/openbsd/memory.c b/src/libs/zbxsysinfo/openbsd/memory.c
index b3a1958ca76..f4d71763d58 100644
--- a/src/libs/zbxsysinfo/openbsd/memory.c
+++ b/src/libs/zbxsysinfo/openbsd/memory.c
@@ -19,16 +19,21 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 static int		mib[] = {CTL_VM, VM_UVMEXP};
 static size_t		len;
 static struct uvmexp	uvm;
 
-#define ZBX_SYSCTL(value)				\
-							\
-	len = sizeof(value);				\
-	if (0 != sysctl(mib, 2, &value, &len, NULL, 0))	\
-		return SYSINFO_RET_FAIL
+#define ZBX_SYSCTL(value)										\
+													\
+	len = sizeof(value);										\
+	if (0 != sysctl(mib, 2, &value, &len, NULL, 0))							\
+	{												\
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s",	\
+				zbx_strerror(errno)));							\
+		return SYSINFO_RET_FAIL;								\
+	}
 
 static int	VM_MEMORY_TOTAL(AGENT_RESULT *result)
 {
@@ -89,7 +94,10 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 	ZBX_SYSCTL(uvm);
 
 	if (0 == uvm.npages)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, (zbx_uint64_t)(uvm.active + uvm.wired) / (double)uvm.npages * 100);
 
@@ -110,7 +118,10 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	ZBX_SYSCTL(uvm);
 
 	if (0 == uvm.npages)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, (zbx_uint64_t)(uvm.inactive + uvm.free + uvm.vnodepages + uvm.vtextpages) / (double)uvm.npages * 100);
 
@@ -155,7 +166,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int 	ret = SYSINFO_RET_FAIL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
@@ -184,7 +198,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "shared"))
 		ret = VM_MEMORY_SHARED(result);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		ret = SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/openbsd/net.c b/src/libs/zbxsysinfo/openbsd/net.c
index 52beaeb726d..4618f669ea4 100644
--- a/src/libs/zbxsysinfo/openbsd/net.c
+++ b/src/libs/zbxsysinfo/openbsd/net.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 #include <sys/sockio.h>
 
@@ -36,7 +37,7 @@ static int	get_ifdata(const char *if_name,
 		zbx_uint64_t *ibytes, zbx_uint64_t *ipackets, zbx_uint64_t *ierrors, zbx_uint64_t *idropped,
 		zbx_uint64_t *obytes, zbx_uint64_t *opackets, zbx_uint64_t *oerrors,
 		zbx_uint64_t *tbytes, zbx_uint64_t *tpackets, zbx_uint64_t *terrors,
-		zbx_uint64_t *icollisions)
+		zbx_uint64_t *icollisions, char **error)
 {
 	struct ifnet_head	head;
 	struct ifnet		*ifp;
@@ -46,7 +47,10 @@ static int	get_ifdata(const char *if_name,
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		*error = zbx_strdup(NULL, "Network interface name cannot be empty.");
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* if(i)_ibytes;	total number of octets received */
 	/* if(i)_ipackets;	packets received on interface */
@@ -125,12 +129,16 @@ static int	get_ifdata(const char *if_name,
 							*terrors += v.if_ierrors + v.if_oerrors;
 						if (icollisions)
 							*icollisions += v.if_collisions;
+
 						ret = SYSINFO_RET_OK;
 					}
 				}
 			}
 		}
 		kvm_close(kp);
+
+		if (SYSINFO_RET_FAIL == ret)
+			*error = zbx_strdup(NULL, "Cannot find information for this network interface.");
 	}
 	else
 	{
@@ -141,13 +149,19 @@ static int	get_ifdata(const char *if_name,
 		struct if_data	v;
 
 		if ((if_s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+		{
+			*error = zbx_dsprintf(NULL, "Cannot create socket: %s", zbx_strerror(errno));
 			goto clean;
+		}
 
 		zbx_strlcpy(ifr.ifr_name, if_name, IFNAMSIZ - 1);
 		ifr.ifr_data = (caddr_t)&v;
 
 		if (ioctl(if_s, SIOCGIFDATA, &ifr) < 0)
+		{
+			*error = zbx_dsprintf(NULL, "Cannot set socket parameters: %s", zbx_strerror(errno));
 			goto clean;
+		}
 
 		if (ibytes)
 			*ibytes += v.ifi_ibytes;
@@ -183,17 +197,24 @@ clean:
 
 int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	zbx_uint64_t	ibytes, ipackets, ierrors, idropped;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_ifdata(if_name, &ibytes, &ipackets, &ierrors, &idropped, NULL, NULL, NULL, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_ifdata(if_name, &ibytes, &ipackets, &ierrors, &idropped, NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ibytes);
@@ -204,24 +225,34 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, idropped);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	zbx_uint64_t	obytes, opackets, oerrors;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, &obytes, &opackets, &oerrors, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, &obytes, &opackets, &oerrors, NULL, NULL,
+			NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, obytes);
@@ -230,24 +261,34 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "errors"))
 		SET_UI64_RESULT(result, oerrors);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name, *mode;
+	char		*if_name, *mode, *error;
 	zbx_uint64_t	tbytes, tpackets, terrors;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &tbytes, &tpackets, &terrors, NULL))
+	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &tbytes, &tpackets,
+			&terrors, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, tbytes);
@@ -256,23 +297,33 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "errors"))
 		SET_UI64_RESULT(result, terrors);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*if_name;
+	char		*if_name, *error;
 	zbx_uint64_t	icollisions;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 
-	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &icollisions))
+	if (SYSINFO_RET_OK != get_ifdata(if_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+			NULL, &icollisions, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, icollisions);
 
@@ -281,27 +332,25 @@ int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int			ret = SYSINFO_RET_FAIL, i;
+	int			i;
 	struct zbx_json		j;
 	struct if_nameindex	*interfaces;
 
+	if (NULL == (interfaces = if_nameindex()))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (NULL != (interfaces = if_nameindex()))
+	for (i = 0; 0 != interfaces[i].if_index; i++)
 	{
-		i = 0;
-
-		while (0 != interfaces[i].if_index)
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#IFNAME}", interfaces[i].if_name, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-			i++;
-		}
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#IFNAME}", interfaces[i].if_name, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
 	zbx_json_close(&j);
@@ -310,5 +359,5 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/openbsd/openbsd.c b/src/libs/zbxsysinfo/openbsd/openbsd.c
index a2a0eca0f88..6694f88085a 100644
--- a/src/libs/zbxsysinfo/openbsd/openbsd.c
+++ b/src/libs/zbxsysinfo/openbsd/openbsd.c
@@ -49,6 +49,7 @@ ZBX_METRIC	parameters_specific[] =
 	{"system.cpu.util",	CF_HAVEPARAMS,	SYSTEM_CPU_UTIL,	"all,idle"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
 	{"system.cpu.num",	CF_HAVEPARAMS,	SYSTEM_CPU_NUM,		"online"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.uname",	0,		SYSTEM_UNAME,		NULL},
 
diff --git a/src/libs/zbxsysinfo/openbsd/proc.c b/src/libs/zbxsysinfo/openbsd/proc.c
index 71a654b8dbd..b9650ab6de0 100644
--- a/src/libs/zbxsysinfo/openbsd/proc.c
+++ b/src/libs/zbxsysinfo/openbsd/proc.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 #include <sys/sysctl.h>
 
@@ -134,15 +135,28 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	argc;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -158,7 +172,10 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
@@ -183,13 +200,19 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	sz = 0;
 	if (0 != sysctl(mib, 6, NULL, &sz, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain necessary buffer size from system: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proc = (struct kinfo_proc2 *)zbx_malloc(proc, sz);
 	mib[5] = (int)(sz / sizeof(struct kinfo_proc2));
 	if (0 != sysctl(mib, 6, proc, &sz, NULL, 0))
 	{
 		zbx_free(proc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain process information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -199,18 +222,23 @@ int     PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	sz = 0;
 	if (0 != sysctl(mib, 4, NULL, &sz, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain necessary buffer size from system: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proc = (struct kinfo_proc *)zbx_malloc(proc, sz);
 	if (0 != sysctl(mib, 4, proc, &sz, NULL, 0))
 	{
 		zbx_free(proc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain process information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
 
 	count = sz / sizeof(struct kinfo_proc);
 #endif
-
 	for (i = 0; i < count; i++)
 	{
 		proc_ok = 0;
@@ -288,15 +316,28 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	argc;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -312,7 +353,10 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "zomb"))
 		zbx_proc_stat = ZBX_PROC_STAT_ZOMB;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
@@ -335,13 +379,19 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	sz = 0;
 	if (0 != sysctl(mib, 6, NULL, &sz, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain necessary buffer size from system: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proc = (struct kinfo_proc2 *)zbx_malloc(proc, sz);
 	mib[5] = (int)(sz / sizeof(struct kinfo_proc2));
 	if (0 != sysctl(mib, 6, proc, &sz, NULL, 0))
 	{
 		zbx_free(proc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain process information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -351,12 +401,18 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	sz = 0;
 	if (0 != sysctl(mib, 4, NULL, &sz, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain necessary buffer size from system: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proc = (struct kinfo_proc *)zbx_malloc(proc, sz);
 	if (0 != sysctl(mib, 4, proc, &sz, NULL, 0))
 	{
 		zbx_free(proc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain process information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
 
diff --git a/src/libs/zbxsysinfo/openbsd/sensors.c b/src/libs/zbxsysinfo/openbsd/sensors.c
index 420cdac5715..35101721f52 100644
--- a/src/libs/zbxsysinfo/openbsd/sensors.c
+++ b/src/libs/zbxsysinfo/openbsd/sensors.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 #include <sys/sensors.h>
 
@@ -131,14 +132,26 @@ int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double	aggr = 0;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	device = get_rparam(request, 0);
 	name = get_rparam(request, 1);
 	function = get_rparam(request, 2);
 
-	if (NULL == device || NULL == name)
+	if (NULL == device || '\0' == *device)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (NULL == name || '\0' == *name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == function || '\0' == *function)
 		do_task = ZBX_DO_ONE;
@@ -149,7 +162,10 @@ int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(function, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mib[0] = CTL_HW;
 	mib[1] = HW_SENSORS;
@@ -168,6 +184,8 @@ int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result)
 			if (errno == ENOENT)
 				break;
 
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s",
+					zbx_strerror(errno)));
 			return SYSINFO_RET_FAIL;
 		}
 
@@ -175,12 +193,18 @@ int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result)
 				(ZBX_DO_ONE != do_task && NULL != zbx_regexp_match(sensordev.xname, device, NULL)))
 		{
 			if (SUCCEED != get_device_sensors(do_task, mib, &sensordev, name, &aggr, &cnt))
+			{
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain sensor information."));
 				return SYSINFO_RET_FAIL;
+			}
 		}
 	}
 
 	if (0 == cnt)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain sensor information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (ZBX_DO_AVG == do_task)
 		SET_DBL_RESULT(result, aggr / cnt);
@@ -194,6 +218,7 @@ int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"sensordev\" structure."));
 	return SYSINFO_RET_FAIL;
 }
 
diff --git a/src/libs/zbxsysinfo/openbsd/software.c b/src/libs/zbxsysinfo/openbsd/software.c
index 4dea0e6d6fd..fa4c702ab88 100644
--- a/src/libs/zbxsysinfo/openbsd/software.c
+++ b/src/libs/zbxsysinfo/openbsd/software.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
diff --git a/src/libs/zbxsysinfo/openbsd/swap.c b/src/libs/zbxsysinfo/openbsd/swap.c
index 94c861112bb..dedca757b66 100644
--- a/src/libs/zbxsysinfo/openbsd/swap.c
+++ b/src/libs/zbxsysinfo/openbsd/swap.c
@@ -19,8 +19,10 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
-static int	get_swap_size(zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *used, double *pfree, double *pused)
+static int	get_swap_size(zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *used, double *pfree, double *pused,
+		char **error)
 {
 	int		mib[2];
 	size_t		len;
@@ -32,7 +34,10 @@ static int	get_swap_size(zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *
 	len = sizeof(v);
 
 	if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* int pagesize;	size of a page (PAGE_SIZE): must be power of 2 */
 	/* int swpages;		number of PAGE_SIZE'ed swap pages */
@@ -55,9 +60,13 @@ static int	get_swap_size(zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *
 static int	SYSTEM_SWAP_TOTAL(AGENT_RESULT *result)
 {
 	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_swap_size(&value, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_swap_size(&value, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -67,9 +76,13 @@ static int	SYSTEM_SWAP_TOTAL(AGENT_RESULT *result)
 static int	SYSTEM_SWAP_FREE(AGENT_RESULT *result)
 {
 	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_swap_size(NULL, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_swap_size(NULL, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -79,9 +92,13 @@ static int	SYSTEM_SWAP_FREE(AGENT_RESULT *result)
 static int	SYSTEM_SWAP_USED(AGENT_RESULT *result)
 {
 	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -91,9 +108,13 @@ static int	SYSTEM_SWAP_USED(AGENT_RESULT *result)
 static int	SYSTEM_SWAP_PFREE(AGENT_RESULT *result)
 {
 	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -103,9 +124,13 @@ static int	SYSTEM_SWAP_PFREE(AGENT_RESULT *result)
 static int	SYSTEM_SWAP_PUSED(AGENT_RESULT *result)
 {
 	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -115,17 +140,23 @@ static int	SYSTEM_SWAP_PUSED(AGENT_RESULT *result)
 int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*swapdev, *mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	/* default parameter */
 	if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* default parameter */
 	if (NULL == mode || *mode == '\0' || 0 == strcmp(mode, "free"))
@@ -139,12 +170,16 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		ret = SYSTEM_SWAP_PUSED(result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
 
-static int	get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t *ocount, zbx_uint64_t *opages)
+static int	get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t *ocount, zbx_uint64_t *opages,
+		char **error)
 {
 	int		mib[2];
 	size_t		len;
@@ -156,7 +191,10 @@ static int	get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t
 	len = sizeof(v);
 
 	if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* int swapins;		swapins */
 	/* int swapouts;	swapouts */
@@ -170,7 +208,10 @@ static int	get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t
 		*ocount = (zbx_uint64_t)v.swapouts;
 #else
 	if (NULL != icount || NULL != ocount)
+	{
+		*error = zbx_dsprintf(NULL, "Not supported by the system starting from OpenBSD 5.4.");
 		return SYSINFO_RET_FAIL;
+	}
 #endif
 	if (NULL != ipages)
 		*ipages = (zbx_uint64_t)v.pgswapin;
@@ -182,68 +223,91 @@ static int	get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t
 
 int	SYSTEM_SWAP_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*swapdev, *mode;
-	zbx_uint64_t	value = 0;
+	int		ret;
+	char		*swapdev, *mode, *error;
+	zbx_uint64_t	value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	/* the only supported parameter */
 	if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* default parameter */
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "count"))
 	{
-		if (SYSINFO_RET_OK != get_swap_io(&value, NULL, NULL, NULL))
-			return SYSINFO_RET_FAIL;
+		ret = get_swap_io(&value, NULL, NULL, NULL, &error);
 	}
 	else if (0 == strcmp(mode, "pages"))
 	{
-		if (SYSINFO_RET_OK != get_swap_io(NULL, &value, NULL, NULL))
-			return SYSINFO_RET_FAIL;
+		ret = get_swap_io(NULL, &value, NULL, NULL, &error);
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	SET_UI64_RESULT(result, value);
+	if (SYSINFO_RET_OK == ret)
+		SET_UI64_RESULT(result, value);
+	else
+		SET_MSG_RESULT(result, error);
 
-	return SYSINFO_RET_OK;
+	return ret;
 }
 
 int	SYSTEM_SWAP_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char		*swapdev, *mode;
-	zbx_uint64_t	value = 0;
+	int		ret;
+	char		*swapdev, *mode, *error;
+	zbx_uint64_t	value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	/* the only supported parameter */
 	if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* default parameter */
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "count"))
 	{
-		if (SYSINFO_RET_OK != get_swap_io(NULL, NULL, &value, NULL))
-			return SYSINFO_RET_FAIL;
+		ret = get_swap_io(NULL, NULL, &value, NULL, &error);
 	}
 	else if (0 == strcmp(mode, "pages"))
 	{
-		if (SYSINFO_RET_OK != get_swap_io(NULL, NULL, NULL, &value))
-			return SYSINFO_RET_FAIL;
+		ret = get_swap_io(NULL, NULL, NULL, &value, &error);
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	SET_UI64_RESULT(result, value);
+	if (SYSINFO_RET_OK == ret)
+		SET_UI64_RESULT(result, value);
+	else
+		SET_MSG_RESULT(result, error);
 
-	return SYSINFO_RET_OK;
+
+	return ret;
 }
diff --git a/src/libs/zbxsysinfo/openbsd/system.c b/src/libs/zbxsysinfo/openbsd/system.c
index ac58d08dcd9..849bd967c32 100644
--- a/src/libs/zbxsysinfo/openbsd/system.c
+++ b/src/libs/zbxsysinfo/openbsd/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine));
diff --git a/src/libs/zbxsysinfo/openbsd/uptime.c b/src/libs/zbxsysinfo/openbsd/uptime.c
index 0d119b355ae..37db95030b5 100644
--- a/src/libs/zbxsysinfo/openbsd/uptime.c
+++ b/src/libs/zbxsysinfo/openbsd/uptime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -33,7 +34,10 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(struct timeval);
 
 	if (0 != sysctl(mib, 2, &uptime, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	now = time(NULL);
 
@@ -41,6 +45,7 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for uptime information."));
 	return SYSINFO_RET_FAIL;
-#endif /* HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME */
+#endif
 }
diff --git a/src/libs/zbxsysinfo/osf/Makefile.am b/src/libs/zbxsysinfo/osf/Makefile.am
index 280ebb68a85..fd2793b511e 100644
--- a/src/libs/zbxsysinfo/osf/Makefile.am
+++ b/src/libs/zbxsysinfo/osf/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -11,8 +11,12 @@ libspecsysinfo_a_SOURCES = \
 	inodes.c \
 	kernel.c \
 	memory.c \
+	osf.c \
 	proc.c \
 	software.c \
 	swap.c \
 	system.c \
 	uptime.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/osf/cpu.c b/src/libs/zbxsysinfo/osf/cpu.c
index 845b60c37b1..d9b9db46526 100644
--- a/src/libs/zbxsysinfo/osf/cpu.c
+++ b/src/libs/zbxsysinfo/osf/cpu.c
@@ -20,6 +20,46 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "../common/common.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
+
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
 
 int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -27,19 +67,28 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	/* only "all" (default) for parameter "cpu" is supported */
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 2);
 
 	/* only "avg1" (default) for parameter "mode" is supported */
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "avg1"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -52,7 +101,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "idle"))
 		ret = EXECUTE_DBL("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF))}'", result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
@@ -63,13 +115,19 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	/* only "all" (default) for parameter "cpu" is supported */
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -80,7 +138,10 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		ret = EXECUTE_DBL(cmd, "uptime | awk '{printf(\"%s\", $(NF-2))}' | sed 's/[ ,]//g'", result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/osf/diskspace.c b/src/libs/zbxsysinfo/osf/diskspace.c
index a61484c875c..ae2834c1f83 100644
--- a/src/libs/zbxsysinfo/osf/diskspace.c
+++ b/src/libs/zbxsysinfo/osf/diskspace.c
@@ -19,9 +19,10 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *free,
-		zbx_uint64_t *used, double *pfree, double *pused)
+		zbx_uint64_t *used, double *pfree, double *pused, char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
 #	define ZBX_STATFS	statvfs
@@ -32,10 +33,11 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 #endif
 	struct ZBX_STATFS	s;
 
-	assert(fs);
-
 	if (0 != ZBX_STATFS(fs, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
@@ -65,10 +67,14 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 
 static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -77,10 +83,14 @@ static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -89,23 +99,30 @@ static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
 	return SYSINFO_RET_OK;
-
 }
 
 static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -114,10 +131,14 @@ static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -130,13 +151,19 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_nparam(request, 0);
 	mode = get_nparam(request, 1);
 
 	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))
 		ret = VFS_FS_TOTAL(fsname, result);
@@ -149,7 +176,10 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		ret = VFS_FS_PUSED(fsname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/osf/hostname.c b/src/libs/zbxsysinfo/osf/hostname.c
index c0ccec5fc00..804b9a90050 100644
--- a/src/libs/zbxsysinfo/osf/hostname.c
+++ b/src/libs/zbxsysinfo/osf/hostname.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -32,7 +33,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
 
diff --git a/src/libs/zbxsysinfo/osf/inodes.c b/src/libs/zbxsysinfo/osf/inodes.c
index f6d50fa6615..049a12bd011 100644
--- a/src/libs/zbxsysinfo/osf/inodes.c
+++ b/src/libs/zbxsysinfo/osf/inodes.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -34,13 +35,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 	{
@@ -63,7 +77,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -74,10 +91,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/osf/kernel.c b/src/libs/zbxsysinfo/osf/kernel.c
index 6f38943882c..6186d0a1fa0 100644
--- a/src/libs/zbxsysinfo/osf/kernel.c
+++ b/src/libs/zbxsysinfo/osf/kernel.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -32,12 +33,17 @@ int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(maxfiles);
 
 	if (0 != sysctl(mib, 2, &maxfiles, (size_t *)&len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
      	SET_UI64_RESULT(result, maxfiles);
 
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.maxfiles\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
@@ -54,11 +60,16 @@ int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(maxproc);
 
 	if (0 != sysctl(mib, 2, &maxproc, (size_t *)&len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
      	SET_UI64_RESULT(result, maxproc);
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for \"kern.maxproc\" system"
+			" parameter."));
 	return SYSINFO_RET_FAIL;
 #endif
 }
diff --git a/src/libs/zbxsysinfo/osf/memory.c b/src/libs/zbxsysinfo/osf/memory.c
index 2aa1cf0ea6c..6252c5cf41a 100644
--- a/src/libs/zbxsysinfo/osf/memory.c
+++ b/src/libs/zbxsysinfo/osf/memory.c
@@ -40,12 +40,18 @@ static int	VM_MEMORY_USED(AGENT_RESULT *result)
 	init_result(&result_tmp);
 
 	if (SYSINFO_RET_OK != VM_MEMORY_FREE(&result_tmp))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg));
 		goto clean;
+	}
 
 	free = result_tmp.ui64;
 
 	if (SYSINFO_RET_OK != VM_MEMORY_TOTAL(&result_tmp))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg));
 		goto clean;
+	}
 
 	total = result_tmp.ui64;
 
@@ -67,17 +73,26 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 	init_result(&result_tmp);
 
 	if (SYSINFO_RET_OK != VM_MEMORY_FREE(&result_tmp))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg));
 		goto clean;
+	}
 
 	free = result_tmp.ui64;
 
 	if (SYSINFO_RET_OK != VM_MEMORY_TOTAL(&result_tmp))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg));
 		goto clean;
+	}
 
 	total = result_tmp.ui64;
 
 	if (0 == total)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		goto clean;
+	}
 
 	SET_UI64_RESULT(result, (total - free) / (double)total * 100);
 
@@ -102,17 +117,26 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	init_result(&result_tmp);
 
 	if (SYSINFO_RET_OK != VM_MEMORY_FREE(&result_tmp))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg));
 		goto clean;
+	}
 
 	free = result_tmp.ui64;
 
 	if (SYSINFO_RET_OK != VM_MEMORY_TOTAL(&result_tmp))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg));
 		goto clean;
+	}
 
 	total = result_tmp.ui64;
 
 	if (0 == total)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		goto clean;
+	}
 
 	SET_UI64_RESULT(result, free / (double)total * 100);
 
@@ -129,7 +153,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
@@ -146,7 +173,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pavailable"))
 		ret = VM_MEMORY_PAVAILABLE(result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/osf/osf.c b/src/libs/zbxsysinfo/osf/osf.c
index c3879aa7a32..fa9509abac8 100644
--- a/src/libs/zbxsysinfo/osf/osf.c
+++ b/src/libs/zbxsysinfo/osf/osf.c
@@ -36,6 +36,7 @@ ZBX_METRIC	parameters_specific[] =
 
 	{"system.cpu.util",	CF_HAVEPARAMS,	SYSTEM_CPU_UTIL,	"all,user,avg1"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.uname",	0,		SYSTEM_UNAME,		NULL},
 
diff --git a/src/libs/zbxsysinfo/osf/proc.c b/src/libs/zbxsysinfo/osf/proc.c
index 9409c2443d5..93bdab7c26d 100644
--- a/src/libs/zbxsysinfo/osf/proc.c
+++ b/src/libs/zbxsysinfo/osf/proc.c
@@ -20,6 +20,7 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -41,15 +42,21 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	pid_t	curr_pid = getpid();
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain user information."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -65,12 +72,18 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
 	if (NULL == (dir = opendir("/proc")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (NULL != (entries = readdir(dir)))
 	{
@@ -86,7 +99,7 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 			if (-1 == ioctl(proc, PIOCPSINFO, &psinfo))
 				goto lbl_skip_procces;
 
-			/* Self process information. It leads to incorrect results for proc_cnt[zabbix_agentd] */
+			/* Self process information. It leads to incorrect results for proc.mem[zabbix_agentd]. */
 			if (psinfo.pr_pid == curr_pid)
 				goto lbl_skip_procces;
 
@@ -104,21 +117,21 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 			proccount++;
 
-			if (0 > memsize) /* First inicialization */
+			if (0 > memsize) /* first initialization */
 			{
-				memsize = (double) (psinfo.pr_rssize * pgsize);
+				memsize = (double)(psinfo.pr_rssize * pgsize);
 			}
 			else
 			{
 				if (ZBX_DO_MAX == do_task)
-					memsize = MAX(memsize, (double) (psinfo.pr_rssize * pgsize));
+					memsize = MAX(memsize, (double)(psinfo.pr_rssize * pgsize));
 				else if (ZBX_DO_MIN == do_task)
-					memsize = MIN(memsize, (double) (psinfo.pr_rssize * pgsize));
+					memsize = MIN(memsize, (double)(psinfo.pr_rssize * pgsize));
 				else	/* SUM */
-					memsize +=  (double) (psinfo.pr_rssize * pgsize);
+					memsize += (double)(psinfo.pr_rssize * pgsize);
 			}
 lbl_skip_procces:
-			if (proc)
+			if (-1 != proc)
 				close(proc);
 		}
 	}
@@ -132,7 +145,7 @@ lbl_skip_procces:
 	}
 
 	if (ZBX_DO_AVG == do_task)
-		SET_DBL_RESULT(result, proccount == 0 ? 0 : ((double)memsize/(double)proccount));
+		SET_DBL_RESULT(result, 0 == proccount ? 0 : memsize / (double)proccount);
 	else
 		SET_UI64_RESULT(result, memsize);
 
@@ -157,15 +170,21 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	pid_t	curr_pid = getpid();
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain user information."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -180,13 +199,21 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 		zbx_proc_stat = PR_SSLEEP;
 	else if (0 == strcmp(param, "zomb"))
 		zbx_proc_stat = PR_SZOMB;
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
 	if (NULL == (dir = opendir("/proc")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
-	while(NULL != (entries=readdir(dir)))
+	while (NULL != (entries = readdir(dir)))
 	{
 		strscpy(filename, "/proc/");
 		zbx_strlcat(filename, entries->d_name,MAX_STRING_LEN);
@@ -197,10 +224,10 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 			if (-1 == proc)
 				goto lbl_skip_procces;
 
-			if (-1 == ioctl(proc,PIOCPSINFO,&psinfo))
+			if (-1 == ioctl(proc, PIOCPSINFO, &psinfo))
 				goto lbl_skip_procces;
 
-			/* Self process information. It leads to incorrect results for proc_cnt[zabbix_agentd] */
+			/* Self process information. It leads to incorrect results for proc.num[zabbix_agentd]. */
 			if (psinfo.pr_pid == curr_pid)
 				goto lbl_skip_procces;
 
@@ -222,7 +249,7 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 			proccount++;
 lbl_skip_procces:
-			if (proc)
+			if (-1 != proc)
 				close(proc);
 		}
 	}
diff --git a/src/libs/zbxsysinfo/osf/software.c b/src/libs/zbxsysinfo/osf/software.c
index 4dea0e6d6fd..fa4c702ab88 100644
--- a/src/libs/zbxsysinfo/osf/software.c
+++ b/src/libs/zbxsysinfo/osf/software.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
diff --git a/src/libs/zbxsysinfo/osf/system.c b/src/libs/zbxsysinfo/osf/system.c
index ac58d08dcd9..849bd967c32 100644
--- a/src/libs/zbxsysinfo/osf/system.c
+++ b/src/libs/zbxsysinfo/osf/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine));
diff --git a/src/libs/zbxsysinfo/osf/uptime.c b/src/libs/zbxsysinfo/osf/uptime.c
index 1f03bfd142b..6637787f717 100644
--- a/src/libs/zbxsysinfo/osf/uptime.c
+++ b/src/libs/zbxsysinfo/osf/uptime.c
@@ -19,10 +19,11 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-#ifdef HAVE_SYSINFO_UPTIME
+#if defined(HAVE_SYSINFO_UPTIME)
 	struct sysinfo info;
 
 	if (0 == sysinfo(&info))
@@ -31,9 +32,11 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 		return SYSINFO_RET_OK;
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
-#else
-#ifdef HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME
+	}
+#elif defined(HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME)
 	struct timeval	uptime;
 	int		mib[2], len, now;
 
@@ -43,57 +46,18 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	len = sizeof(uptime);
 
 	if (0 != sysctl(mib, 2, &uptime, (size_t *)&len, NULL, 0))
-		return SYSINFO_RET_FAIL;
-
-	now = time(NULL);
-
-	SET_UI64_RESULT(result, now-uptime.tv_sec);
-	return SYSINFO_RET_OK;
-#else
-/* Solaris */
-#ifdef HAVE_KSTAT_H
-	kstat_ctl_t   *kc;
-	kstat_t       *kp;
-	kstat_named_t *kn;
-
-	long          hz;
-	long          secs;
-
-	/* open kstat */
-	kc = kstat_open();
-	if (0 == kc)
-		return SYSINFO_RET_FAIL;
-
-	/* read uptime counter */
-	kp = kstat_lookup(kc, "unix", 0, "system_misc");
-	if (0 == kp)
-	{
-		kstat_close(kc);
-		return SYSINFO_RET_FAIL;
-	}
-
-	if (-1 == kstat_read(kc, kp, 0))
 	{
-		kstat_close(kc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
 	}
 
-	hz = sysconf(_SC_CLK_TCK);
-
-	/* make sure we do not divide by 0 */
-	assert(hz);
-
-	kn = (kstat_named_t*)kstat_data_lookup(kp, "clk_intr");
-	secs = get_kstat_numeric_value(kn) / hz;
+	now = time(NULL);
 
-	/* close kstat */
-	kstat_close(kc);
+	SET_UI64_RESULT(result, now-uptime.tv_sec);
 
-	SET_UI64_RESULT(result, secs);
 	return SYSINFO_RET_OK;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for uptime information."));
 	return SYSINFO_RET_FAIL;
 #endif
-#endif
-#endif
 }
diff --git a/src/libs/zbxsysinfo/osx/Makefile.am b/src/libs/zbxsysinfo/osx/Makefile.am
index d57dc7b719b..1a149beeeaa 100644
--- a/src/libs/zbxsysinfo/osx/Makefile.am
+++ b/src/libs/zbxsysinfo/osx/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -13,6 +13,10 @@ libspecsysinfo_a_SOURCES = \
 	kernel.c \
 	memory.c \
 	net.c \
+	osx.c \
 	software.c \
 	system.c \
 	uptime.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/osx/boottime.c b/src/libs/zbxsysinfo/osx/boottime.c
index 7f4577e62a8..7406085a853 100644
--- a/src/libs/zbxsysinfo/osx/boottime.c
+++ b/src/libs/zbxsysinfo/osx/boottime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -27,7 +28,10 @@ int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	size_t		len = sizeof(boottime);
 
 	if (0 != sysctl(mib, 2, &boottime, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, boottime.tv_sec);
 
diff --git a/src/libs/zbxsysinfo/osx/cpu.c b/src/libs/zbxsysinfo/osx/cpu.c
index 3606340d002..d37444615d4 100644
--- a/src/libs/zbxsysinfo/osx/cpu.c
+++ b/src/libs/zbxsysinfo/osx/cpu.c
@@ -20,6 +20,9 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "stats.h"
+#include "log.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
 
 static int	get_cpu_num(int online)
 {
@@ -35,23 +38,70 @@ static int	get_cpu_num(int online)
 	return cpu_num;
 }
 
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
+
 int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*tmp;
 	int	cpu_num, online = 0;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "online"))
 		online = 1;
 	else if (0 != strcmp(tmp, "max"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == (cpu_num = get_cpu_num(online)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, cpu_num);
 
@@ -65,14 +115,20 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	double	load[ZBX_AVG_COUNT], value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		per_cpu = 0;
 	else if (0 != strcmp(tmp, "percpu"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -83,17 +139,26 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (mode >= getloadavg(load, 3))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain load average: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	value = load[mode];
 
 	if (1 == per_cpu)
 	{
 		if (0 >= (cpu_num = get_cpu_num(1)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 			return SYSINFO_RET_FAIL;
+		}
 		value /= cpu_num;
 	}
 
diff --git a/src/libs/zbxsysinfo/osx/diskspace.c b/src/libs/zbxsysinfo/osx/diskspace.c
index 13c756acd18..02a23ed3148 100644
--- a/src/libs/zbxsysinfo/osx/diskspace.c
+++ b/src/libs/zbxsysinfo/osx/diskspace.c
@@ -20,10 +20,12 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total,
 		zbx_uint64_t *used, double *pused,
-		zbx_uint64_t *free, double *pfree)
+		zbx_uint64_t *free, double *pfree,
+		char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
 #	define ZBX_STATFS	statvfs
@@ -35,7 +37,10 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total,
 	struct ZBX_STATFS	s;
 
 	if (0 != ZBX_STATFS(fs, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL != total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
@@ -68,9 +73,13 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total,
 static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 {
 	zbx_uint64_t	total;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &total, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &total, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, total);
 
@@ -81,9 +90,13 @@ static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 {
 	zbx_uint64_t	used;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &used, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &used, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, used);
 
@@ -93,9 +106,13 @@ static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 {
 	double	pused;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &pused, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &pused, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, pused);
 
@@ -105,9 +122,13 @@ static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 {
 	zbx_uint64_t	free;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &free, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &free, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, free);
 
@@ -117,9 +138,13 @@ static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 {
 	double	pfree;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &pfree))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &pfree, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, pfree);
 
@@ -129,16 +154,22 @@ static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*fsname, *mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))
 		ret = VFS_FS_TOTAL(fsname, result);
@@ -151,32 +182,36 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pfree"))
 		ret = VFS_FS_PFREE(fsname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
 
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		i, rc, ret = SYSINFO_RET_FAIL;
+	int		i, rc;
 	struct statfs	*mntbuf;
 	struct zbx_json	j;
 
+	if (0 == (rc = getmntinfo(&mntbuf, MNT_WAIT)))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	if (0 != (rc = getmntinfo(&mntbuf, MNT_WAIT)))
+	for (i = 0; i < rc; i++)
 	{
-		for (i = 0; i < rc; i++)
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#FSNAME}", mntbuf[i].f_mntonname, ZBX_JSON_TYPE_STRING);
-			zbx_json_addstring(&j, "{#FSTYPE}", mntbuf[i].f_fstypename, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-		}
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#FSNAME}", mntbuf[i].f_mntonname, ZBX_JSON_TYPE_STRING);
+		zbx_json_addstring(&j, "{#FSTYPE}", mntbuf[i].f_fstypename, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
 	zbx_json_close(&j);
@@ -185,5 +220,5 @@ int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/osx/hostname.c b/src/libs/zbxsysinfo/osx/hostname.c
index c0ccec5fc00..804b9a90050 100644
--- a/src/libs/zbxsysinfo/osx/hostname.c
+++ b/src/libs/zbxsysinfo/osx/hostname.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -32,7 +33,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
 
diff --git a/src/libs/zbxsysinfo/osx/inodes.c b/src/libs/zbxsysinfo/osx/inodes.c
index f6d50fa6615..049a12bd011 100644
--- a/src/libs/zbxsysinfo/osx/inodes.c
+++ b/src/libs/zbxsysinfo/osx/inodes.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -34,13 +35,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 	{
@@ -63,7 +77,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -74,10 +91,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/osx/kernel.c b/src/libs/zbxsysinfo/osx/kernel.c
index 306812e0378..5994a7101d7 100644
--- a/src/libs/zbxsysinfo/osx/kernel.c
+++ b/src/libs/zbxsysinfo/osx/kernel.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -26,7 +27,10 @@ int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	size_t	len = sizeof(maxfiles);
 
 	if (0 != sysctl(mib, 2, &maxfiles, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, maxfiles);
 
@@ -39,7 +43,10 @@ int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result)
 	size_t	len = sizeof(maxproc);
 
 	if (0 != sysctl(mib, 2, &maxproc, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, maxproc);
 
diff --git a/src/libs/zbxsysinfo/osx/memory.c b/src/libs/zbxsysinfo/osx/memory.c
index f0435e2d8ea..c27da56141b 100644
--- a/src/libs/zbxsysinfo/osx/memory.c
+++ b/src/libs/zbxsysinfo/osx/memory.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 static vm_size_t	pagesize = 0;
 
@@ -29,7 +30,10 @@ static mach_msg_type_number_t	count;
 														\
 	count = HOST_VM_INFO_COUNT;										\
 	if (KERN_SUCCESS != host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)&value, &count))	\
-		return SYSINFO_RET_FAIL
+	{													\
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain host statistics."));			\
+		return SYSINFO_RET_FAIL;									\
+	}
 
 static int		mib[] = {CTL_HW, HW_MEMSIZE};
 static size_t		len;
@@ -39,7 +43,11 @@ static zbx_uint64_t	memsize;
 														\
 	len = sizeof(value);											\
 	if (0 != sysctl(mib, 2, &value, &len, NULL, 0))								\
-		return SYSINFO_RET_FAIL
+	{													\
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s",		\
+				zbx_strerror(errno)));								\
+		return SYSINFO_RET_FAIL;									\
+	}
 
 static int	VM_MEMORY_TOTAL(AGENT_RESULT *result)
 {
@@ -102,7 +110,10 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 	ZBX_SYSCTL(memsize);
 
 	if (0 == memsize)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	ZBX_HOST_STATISTICS(vm);
 
@@ -129,7 +140,10 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	ZBX_SYSCTL(memsize);
 
 	if (0 == memsize)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	ZBX_HOST_STATISTICS(vm);
 
@@ -146,12 +160,18 @@ int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret = SYSINFO_RET_FAIL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (0 == pagesize)
 	{
 		if (KERN_SUCCESS != host_page_size(mach_host_self(), &pagesize))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain host page size."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 
 	mode = get_rparam(request, 0);
@@ -174,6 +194,11 @@ int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		ret = VM_MEMORY_AVAILABLE(result);
 	else if (0 == strcmp(mode, "pavailable"))
 		ret = VM_MEMORY_PAVAILABLE(result);
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/osx/net.c b/src/libs/zbxsysinfo/osx/net.c
index 4bd5d8be24f..aea81533e77 100644
--- a/src/libs/zbxsysinfo/osx/net.c
+++ b/src/libs/zbxsysinfo/osx/net.c
@@ -20,16 +20,20 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "../common/common.h"
+#include "log.h"
 
 static struct ifmibdata	ifmd;
 
-static int	get_ifmib_general(const char *if_name)
+static int	get_ifmib_general(const char *if_name, char **error)
 {
 	int	mib[6], ifcount;
 	size_t	len;
 
 	if (NULL == if_name || '\0'== *if_name)
+	{
+		*error = zbx_strdup(NULL, "Network interface name cannot be empty.");
 		return SYSINFO_RET_FAIL;
+	}
 
 	mib[0] = CTL_NET;
 	mib[1] = PF_LINK;
@@ -40,7 +44,10 @@ static int	get_ifmib_general(const char *if_name)
 	len = sizeof(ifcount);
 
 	if (-1 == sysctl(mib, 5, &ifcount, &len, NULL, 0))
-		return FAIL;
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain number of network interfaces: %s", zbx_strerror(errno));
+		return SYSINFO_RET_FAIL;
+	}
 
 	mib[3] = IFMIB_IFDATA;
 	mib[5] = IFDATA_GENERAL;
@@ -54,28 +61,38 @@ static int	get_ifmib_general(const char *if_name)
 			if (ENOENT == errno)
 				continue;
 
-			break;
+			*error = zbx_dsprintf(NULL, "Cannot obtain network interface information: %s",
+					zbx_strerror(errno));
+			return SYSINFO_RET_FAIL;
 		}
 
 		if (0 == strcmp(ifmd.ifmd_name, if_name))
-			return SUCCEED;
+			return SYSINFO_RET_OK;
 	}
 
-	return FAIL;
+	*error = zbx_strdup(NULL, "Cannot find information for this network interface.");
+
+	return SYSINFO_RET_FAIL;
 }
 
 int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*if_name, *mode;
+	char	*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (FAIL == get_ifmib_general(if_name))
+	if (SYSINFO_RET_FAIL == get_ifmib_general(if_name, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_ibytes);
@@ -86,23 +103,32 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_iqdrops);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*if_name, *mode;
+	char	*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (FAIL == get_ifmib_general(if_name))
+	if (SYSINFO_RET_FAIL == get_ifmib_general(if_name, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_obytes);
@@ -111,23 +137,32 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "errors"))
 		SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_oerrors);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*if_name, *mode;
+	char	*if_name, *mode, *error;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (FAIL == get_ifmib_general(if_name))
+	if (SYSINFO_RET_FAIL == get_ifmib_general(if_name, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, (zbx_uint64_t)ifmd.ifmd_data.ifi_ibytes + ifmd.ifmd_data.ifi_obytes);
@@ -136,7 +171,10 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "errors"))
 		SET_UI64_RESULT(result, (zbx_uint64_t)ifmd.ifmd_data.ifi_ierrors + ifmd.ifmd_data.ifi_oerrors);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -145,63 +183,81 @@ int     NET_TCP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char		*port_str, command[64];
 	unsigned short	port;
-	int		res;
+	int		ret;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	zbx_snprintf(command, sizeof(command), "netstat -an | grep '^tcp.*\\.%hu[^.].*LISTEN' | wc -l", port);
 
-	if (SYSINFO_RET_FAIL == (res = EXECUTE_INT(command, result)))
-		return res;
+	if (SYSINFO_RET_FAIL == (ret = EXECUTE_INT(command, result)))
+		return ret;
 
 	if (1 < result->ui64)
 		result->ui64 = 1;
 
-	return res;
+	return ret;
 }
 
 int     NET_UDP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char		*port_str, command[64];
 	unsigned short	port;
-	int		res;
+	int		ret;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	zbx_snprintf(command, sizeof(command), "netstat -an | grep '^udp.*\\.%hu[^.].*\\*\\.\\*' | wc -l", port);
 
-	if (SYSINFO_RET_FAIL == (res = EXECUTE_INT(command, result)))
-		return res;
+	if (SYSINFO_RET_FAIL == (ret = EXECUTE_INT(command, result)))
+		return ret;
 
 	if (1 < result->ui64)
 		result->ui64 = 1;
 
-	return res;
+	return ret;
 }
 
 int     NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*if_name;
+	char	*if_name, *error;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 
-	if (FAIL == get_ifmib_general(if_name))
+	if (SYSINFO_RET_FAIL == get_ifmib_general(if_name, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, ifmd.ifmd_data.ifi_collisions);
 
diff --git a/src/libs/zbxsysinfo/osx/osx.c b/src/libs/zbxsysinfo/osx/osx.c
index 313824796dc..4150a08f609 100644
--- a/src/libs/zbxsysinfo/osx/osx.c
+++ b/src/libs/zbxsysinfo/osx/osx.c
@@ -42,6 +42,7 @@ ZBX_METRIC	parameters_specific[] =
 
 	{"system.cpu.num",	CF_HAVEPARAMS,	SYSTEM_CPU_NUM,		"online"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.uname",	0,		SYSTEM_UNAME,		NULL},
 
diff --git a/src/libs/zbxsysinfo/osx/software.c b/src/libs/zbxsysinfo/osx/software.c
index 4dea0e6d6fd..fa4c702ab88 100644
--- a/src/libs/zbxsysinfo/osx/software.c
+++ b/src/libs/zbxsysinfo/osx/software.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
diff --git a/src/libs/zbxsysinfo/osx/system.c b/src/libs/zbxsysinfo/osx/system.c
index ac58d08dcd9..849bd967c32 100644
--- a/src/libs/zbxsysinfo/osx/system.c
+++ b/src/libs/zbxsysinfo/osx/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine));
diff --git a/src/libs/zbxsysinfo/osx/uptime.c b/src/libs/zbxsysinfo/osx/uptime.c
index f117cb0abe9..8498eb73a6c 100644
--- a/src/libs/zbxsysinfo/osx/uptime.c
+++ b/src/libs/zbxsysinfo/osx/uptime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -27,7 +28,10 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	size_t		len = sizeof(boottime);
 
 	if (0 != sysctl(mib, 2, &boottime, &len, NULL, 0))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, time(NULL) - boottime.tv_sec);
 
diff --git a/src/libs/zbxsysinfo/simple/ntp.c b/src/libs/zbxsysinfo/simple/ntp.c
index ee98b31255e..f034c63bf57 100644
--- a/src/libs/zbxsysinfo/simple/ntp.c
+++ b/src/libs/zbxsysinfo/simple/ntp.c
@@ -182,7 +182,7 @@ int	check_ntp(char *host, unsigned short port, int timeout, int *value_int)
 {
 	zbx_sock_t	s;
 	int		ret;
-	char		*buf = NULL, packet[NTP_PACKET_MIN];
+	char		packet[NTP_PACKET_MIN];
 	ntp_data	data;
 
 	*value_int = 0;
@@ -195,9 +195,9 @@ int	check_ntp(char *host, unsigned short port, int timeout, int *value_int)
 
 		if (SUCCEED == (ret = zbx_tcp_send_raw(&s, packet)))
 		{
-			if (SUCCEED == (ret = zbx_tcp_recv(&s, &buf)))
+			if (SUCCEED == (ret = zbx_tcp_recv(&s)))
 			{
-				unpack_ntp(&data, (unsigned char *)buf, (int)strlen(buf));
+				unpack_ntp(&data, (unsigned char *)s.buffer, (int)strlen(s.buffer));
 				*value_int = (0 < data.receive ? (int)(data.receive - ZBX_JAN_1970_IN_SEC) : 0);
 			}
 		}
diff --git a/src/libs/zbxsysinfo/simple/simple.c b/src/libs/zbxsysinfo/simple/simple.c
index 9a095a26de8..2bda3087114 100644
--- a/src/libs/zbxsysinfo/simple/simple.c
+++ b/src/libs/zbxsysinfo/simple/simple.c
@@ -97,29 +97,59 @@ lbl_ret:
 }
 #endif	/* HAVE_LDAP */
 
+/******************************************************************************
+ *                                                                            *
+ * Function: find_ssh_ident_string                                            *
+ *                                                                            *
+ * Purpose: parse recv_buf for ssh identification string as per               *
+ *          RFC 4253, section 4.2                                             *
+ *                                                                            *
+ * Parameters: recv_buf     - [IN] buffer to parse                            *
+ *             remote_major - [OUT] memory pointer where protocol major is    *
+ *                                  to be written to                          *
+ *             remote_minor - [OUT] memory pointer where protocol minor is    *
+ *                                  to be written to                          *
+ *                                                                            *
+ * Returns: SUCCEED - if a string matching the specification is found         *
+ *          FAIL - otherwise                                                  *
+ *                                                                            *
+ ******************************************************************************/
+static int	find_ssh_ident_string(const char *recv_buf, int *remote_major, int *remote_minor)
+{
+	const char	*r, *l = recv_buf;
+
+	while (NULL != (r = strchr(l, '\n')))
+	{
+		if (2 == sscanf(l, "SSH-%d.%d-%*s", remote_major, remote_minor))
+			return SUCCEED;
+
+		l = r + 1;
+	}
+
+	return FAIL;
+}
+
 static int	check_ssh(const char *host, unsigned short port, int timeout, int *value_int)
 {
 	int		ret;
 	zbx_sock_t	s;
-	char		send_buf[MAX_STRING_LEN], *recv_buf, *ssh_server, *ssh_proto;
+	char		send_buf[MAX_STRING_LEN];
+	int		remote_major, remote_minor;
 
 	*value_int = 0;
 
 	if (SUCCEED == (ret = zbx_tcp_connect(&s, CONFIG_SOURCE_IP, host, port, timeout)))
 	{
-		if (SUCCEED == (ret = zbx_tcp_recv(&s, &recv_buf)))
+		if (SUCCEED == (ret = zbx_tcp_recv(&s)))
 		{
-			if (0 == strncmp(recv_buf, "SSH", 3))
+			if (SUCCEED == find_ssh_ident_string(s.buffer, &remote_major, &remote_minor))
 			{
-				ssh_server = ssh_proto = recv_buf + 4;
-				ssh_server += strspn(ssh_proto, "0123456789-. ");
-				ssh_server[-1] = '\0';
-
-				zbx_snprintf(send_buf, sizeof(send_buf), "SSH-%s-%s\n", ssh_proto, "zabbix_agent");
+				zbx_snprintf(send_buf, sizeof(send_buf), "SSH-%d.%d-zabbix_agent\r\n",
+						remote_major, remote_minor);
 				*value_int = 1;
 			}
 			else
-				zbx_snprintf(send_buf, sizeof(send_buf), "0\n");
+				strscpy(send_buf, "0\n");
 
 			ret = zbx_tcp_send_raw(&s, send_buf);
 		}
@@ -211,6 +241,47 @@ static int	check_telnet(const char *host, unsigned short port, int timeout, int
 	return SYSINFO_RET_OK;
 }
 
+/* validation functions for service checks */
+static int	validate_smtp(const char *line)
+{
+	if (0 == strncmp(line, "220", 3))
+	{
+		if ('-' == line[3])
+			return ZBX_TCP_EXPECT_IGNORE;
+
+		if ('\0' == line[3] || ' ' == line[3])
+			return ZBX_TCP_EXPECT_OK;
+	}
+
+	return ZBX_TCP_EXPECT_FAIL;
+}
+
+static int	validate_ftp(const char *line)
+{
+	if (0 == strncmp(line, "220 ", 4))
+		return ZBX_TCP_EXPECT_OK;
+
+	return ZBX_TCP_EXPECT_IGNORE;
+}
+
+static int	validate_pop(const char *line)
+{
+	return 0 == strncmp(line, "+OK", 3) ? ZBX_TCP_EXPECT_OK : ZBX_TCP_EXPECT_FAIL;
+}
+
+static int	validate_nntp(const char *line)
+{
+	if (0 == strncmp(line, "200", 3) || 0 == strncmp(line, "201", 3))
+		return ZBX_TCP_EXPECT_OK;
+
+	return ZBX_TCP_EXPECT_FAIL;
+}
+
+static int	validate_imap(const char *line)
+{
+	return 0 == strncmp(line, "* OK", 4) ? ZBX_TCP_EXPECT_OK : ZBX_TCP_EXPECT_FAIL;
+}
+
 int	check_service(AGENT_REQUEST *request, const char *default_addr, AGENT_RESULT *result, int perf)
 {
 	unsigned short	port = 0;
@@ -221,14 +292,20 @@ int	check_service(AGENT_REQUEST *request, const char *default_addr, AGENT_RESULT
 	check_time = zbx_time();
 
 	if (3 < request->nparam)
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	service = get_rparam(request, 0);
 	ip_str = get_rparam(request, 1);
 	port_str = get_rparam(request, 2);
 
 	if (NULL == service || '\0' == *service)
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == ip_str || '\0' == *ip_str)
 		strscpy(ip, default_addr);
@@ -237,8 +314,8 @@ int	check_service(AGENT_REQUEST *request, const char *default_addr, AGENT_RESULT
 
 	if (NULL != port_str && SUCCEED != is_ushort(port_str, &port))
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Invalid \"port\" parameter"));
-		return ret;
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
+		return SYSINFO_RET_FAIL;
 	}
 
 	if (0 == strcmp(service, "ssh"))
@@ -265,13 +342,13 @@ int	check_service(AGENT_REQUEST *request, const char *default_addr, AGENT_RESULT
 	{
 		if (NULL == port_str || '\0' == *port_str)
 			port = ZBX_DEFAULT_SMTP_PORT;
-		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, "220", "QUIT\r\n", &value_int);
+		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, validate_smtp, "QUIT\r\n", &value_int);
 	}
 	else if (0 == strcmp(service, "ftp"))
 	{
 		if (NULL == port_str || '\0' == *port_str)
 			port = ZBX_DEFAULT_FTP_PORT;
-		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, "220", "QUIT\n", &value_int);
+		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, validate_ftp, "QUIT\r\n", &value_int);
 	}
 	else if (0 == strcmp(service, "http"))
 	{
@@ -283,26 +360,26 @@ int	check_service(AGENT_REQUEST *request, const char *default_addr, AGENT_RESULT
 	{
 		if (NULL == port_str || '\0' == *port_str)
 			port = ZBX_DEFAULT_POP_PORT;
-		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, "+OK", "QUIT\n", &value_int);
+		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, validate_pop, "QUIT\r\n", &value_int);
 	}
 	else if (0 == strcmp(service, "nntp"))
 	{
 		if (NULL == port_str || '\0' == *port_str)
 			port = ZBX_DEFAULT_NNTP_PORT;
-		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, "200", "QUIT\n", &value_int);
+		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, validate_nntp, "QUIT\r\n", &value_int);
 	}
 	else if (0 == strcmp(service, "imap"))
 	{
 		if (NULL == port_str || '\0' == *port_str)
 			port = ZBX_DEFAULT_IMAP_PORT;
-		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, "* OK", "a1 LOGOUT\n", &value_int);
+		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, validate_imap, "a1 LOGOUT\r\n", &value_int);
 	}
 	else if (0 == strcmp(service, "tcp"))
 	{
 		if (NULL == port_str || '\0' == *port_str)
 		{
-			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Required \"port\" parameter missing"));
-			return ret;
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
+			return SYSINFO_RET_FAIL;
 		}
 		ret = tcp_expect(ip, port, CONFIG_TIMEOUT, NULL, NULL, NULL, &value_int);
 	}
diff --git a/src/libs/zbxsysinfo/solaris/Makefile.am b/src/libs/zbxsysinfo/solaris/Makefile.am
index 4313b1d7d6a..2c392a38675 100644
--- a/src/libs/zbxsysinfo/solaris/Makefile.am
+++ b/src/libs/zbxsysinfo/solaris/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -15,6 +15,10 @@ libspecsysinfo_a_SOURCES = \
 	net.c \
 	proc.c \
 	software.c \
+	solaris.c \
 	swap.c \
 	system.c \
 	uptime.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/solaris/boottime.c b/src/libs/zbxsysinfo/solaris/boottime.c
index 69b26a7d677..e7ff1e68a50 100644
--- a/src/libs/zbxsysinfo/solaris/boottime.c
+++ b/src/libs/zbxsysinfo/solaris/boottime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -28,19 +29,36 @@ int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		ret = SYSINFO_RET_FAIL;
 
 	if (NULL == (kc = kstat_open()))
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (NULL == (kp = kstat_lookup(kc, "unix", 0, "system_misc")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot look up in kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		goto clean;
+	}
 
-	if (NULL != (kp = kstat_lookup(kc, "unix", 0, "system_misc")))
+	if (-1 == kstat_read(kc, kp, 0))
 	{
-		if (-1 != kstat_read(kc, kp, 0))
-		{
-			if (NULL != (kn = (kstat_named_t*)kstat_data_lookup(kp, "boot_time")))
-			{
-				SET_UI64_RESULT(result, get_kstat_numeric_value(kn));
-				ret = SYSINFO_RET_OK;
-			}
-		}
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot read from kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		goto clean;
 	}
+
+	if (NULL == (kn = (kstat_named_t *)kstat_data_lookup(kp, "boot_time")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot look up data in kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		goto clean;
+	}
+
+	SET_UI64_RESULT(result, get_kstat_numeric_value(kn));
+	ret = SYSINFO_RET_OK;
+clean:
 	kstat_close(kc);
 
 	return ret;
diff --git a/src/libs/zbxsysinfo/solaris/cpu.c b/src/libs/zbxsysinfo/solaris/cpu.c
index 620a5b473ee..7903635e82a 100644
--- a/src/libs/zbxsysinfo/solaris/cpu.c
+++ b/src/libs/zbxsysinfo/solaris/cpu.c
@@ -20,6 +20,47 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "stats.h"
+#include "log.h"
+#include "zbxalgo.h"
+#include "zbxjson.h"
+
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (SYSINFO_RET_OK == cpus.values[i] ?
+				"online" : "offline"), ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
 
 int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -28,7 +69,10 @@ int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	long	ncpu;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
@@ -37,10 +81,16 @@ int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "max"))
 		name = _SC_NPROCESSORS_CONF;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (-1 == (ncpu = sysconf(name)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, ncpu);
 
@@ -53,14 +103,20 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	cpu_num, state, mode;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		cpu_num = 0;
 	else if (SUCCEED != is_uint31_1(tmp, &cpu_num))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 	else
 		cpu_num++;
 
@@ -75,7 +131,10 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "idle"))
 		state = ZBX_CPU_STATE_IDLE;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 2);
 
@@ -86,13 +145,16 @@ int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return get_cpustat(result, cpu_num, state, mode);
 }
 
 #ifdef HAVE_KSTAT_H
-static int	get_kstat_system_misc(char *key, int *value)
+static int	get_kstat_system_misc(char *key, int *value, char **error)
 {
 	kstat_ctl_t	*kc;
 	kstat_t		*ksp;
@@ -100,16 +162,29 @@ static int	get_kstat_system_misc(char *key, int *value)
 	int		ret = FAIL;
 
 	if (NULL == (kc = kstat_open()))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot open kernel statistics facility: %s", zbx_strerror(errno));
 		return ret;
+	}
 
 	if (NULL == (ksp = kstat_lookup(kc, "unix", 0, "system_misc")))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot look up in kernel statistics facility: %s", zbx_strerror(errno));
 		goto close;
+	}
 
 	if (-1 == kstat_read(kc, ksp, NULL))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot read from kernel statistics facility: %s", zbx_strerror(errno));
 		goto close;
+	}
 
 	if (NULL == (kn = (kstat_named_t *)kstat_data_lookup(ksp, key)))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot look up data in kernel statistics facility: %s",
+				zbx_strerror(errno));
 		goto close;
+	}
 
 	*value = get_kstat_numeric_value(kn);
 
@@ -130,19 +205,24 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	mode;
 	double	load[ZBX_AVG_COUNT];
 #elif defined(HAVE_KSTAT_H)
-	char	*key;
+	char	*key, *error;
 	int	load;
 #endif
-
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		per_cpu = 0;
 	else if (0 != strcmp(tmp, "percpu"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 #if defined(HAVE_GETLOADAVG)
 	tmp = get_rparam(request, 1);
@@ -154,10 +234,16 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		mode = ZBX_AVG15;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (mode >= getloadavg(load, 3))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain load average: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	value = load[mode];
 #elif defined(HAVE_KSTAT_H)
@@ -170,19 +256,29 @@ int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "avg15"))
 		key = "avenrun_15min";
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	if (FAIL == get_kstat_system_misc(key, &load))
+	if (FAIL == get_kstat_system_misc(key, &load, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	value = (double)load / FSCALE;
 #else
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Agent was compiled without support for CPU load information."));
 	return SYSINFO_RET_FAIL;
 #endif
 	if (1 == per_cpu)
 	{
 		if (0 >= (cpu_num = sysconf(_SC_NPROCESSORS_ONLN)))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
 			return SYSINFO_RET_FAIL;
+		}
 		value /= cpu_num;
 	}
 
@@ -199,27 +295,34 @@ int	SYSTEM_CPU_SWITCHES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		cpu_count = 0;
 	double		swt_count = 0.0;
 
-	if (NULL != (kc = kstat_open()))
+	if (NULL == (kc = kstat_open()))
 	{
-		k = kc->kc_chain;
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
 
-		while (NULL != k)
+	k = kc->kc_chain;
+
+	while (NULL != k)
+	{
+		if (0 == strncmp(k->ks_name, "cpu_stat", 8) && -1 != kstat_read(kc, k, NULL))
 		{
-			if (0 == strncmp(k->ks_name, "cpu_stat", 8) && -1 != kstat_read(kc, k, NULL))
-			{
-				cpu = (cpu_stat_t *)k->ks_data;
-				swt_count += (double)cpu->cpu_sysinfo.pswitch;
-				cpu_count += 1;
-			}
-
-			k = k->ks_next;
+			cpu = (cpu_stat_t *)k->ks_data;
+			swt_count += (double)cpu->cpu_sysinfo.pswitch;
+			cpu_count += 1;
 		}
 
-		kstat_close(kc);
+		k = k->ks_next;
 	}
 
+	kstat_close(kc);
+
 	if (0 == cpu_count)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot find CPU information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, swt_count);
 
@@ -234,27 +337,34 @@ int	SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		cpu_count = 0;
 	double		intr_count = 0.0;
 
-	if (NULL != (kc = kstat_open()))
+	if (NULL == (kc = kstat_open()))
 	{
-		k = kc->kc_chain;
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
 
-		while (NULL != k)
+	k = kc->kc_chain;
+
+	while (NULL != k)
+	{
+		if (0 == strncmp(k->ks_name, "cpu_stat", 8) && -1 != kstat_read(kc, k, NULL))
 		{
-			if (0 == strncmp(k->ks_name, "cpu_stat", 8) && -1 != kstat_read(kc, k, NULL))
-			{
-				cpu = (cpu_stat_t *)k->ks_data;
-				intr_count += (double)cpu->cpu_sysinfo.intr;
-				cpu_count += 1;
-			}
-
-			k = k->ks_next;
+			cpu = (cpu_stat_t *)k->ks_data;
+			intr_count += (double)cpu->cpu_sysinfo.intr;
+			cpu_count += 1;
 		}
 
-		kstat_close(kc);
+		k = k->ks_next;
 	}
 
+	kstat_close(kc);
+
 	if (0 == cpu_count)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot find CPU information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, intr_count);
 
diff --git a/src/libs/zbxsysinfo/solaris/diskio.c b/src/libs/zbxsysinfo/solaris/diskio.c
index 738a371e70f..e7d55ccafa9 100644
--- a/src/libs/zbxsysinfo/solaris/diskio.c
+++ b/src/libs/zbxsysinfo/solaris/diskio.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 typedef struct
 {
@@ -26,42 +27,54 @@ typedef struct
 	zbx_uint64_t	nwritten;
 	zbx_uint64_t	reads;
 	zbx_uint64_t	writes;
-} zbx_kstat_t;
-
-static zbx_kstat_t zbx_kstat;
+}
+zbx_kstat_t;
 
 int	get_diskstat(const char *devname, zbx_uint64_t *dstat)
 {
 	return FAIL;
 }
 
-static int	get_kstat_io(const char *name, zbx_kstat_t *zk)
+static int	get_kstat_io(const char *name, zbx_kstat_t *zk, char **error)
 {
-	int		result = SYSINFO_RET_FAIL;
+	int		ret = SYSINFO_RET_FAIL;
 	kstat_ctl_t	*kc;
 	kstat_t		*kt;
 	kstat_io_t	kio;
 
-	if (0 == (kc = kstat_open()))
-		return result;
+	if (NULL == (kc = kstat_open()))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot open kernel statistics facility: %s", zbx_strerror(errno));
+		return ret;
+	}
 
 	if ('\0' != *name)
 	{
-		if (0 == (kt = kstat_lookup(kc, NULL, -1, (char *)name)))
+		if (NULL == (kt = kstat_lookup(kc, NULL, -1, (char *)name)))
+		{
+			*error = zbx_dsprintf(NULL, "Cannot look up in kernel statistics facility: %s",
+					zbx_strerror(errno));
 			goto clean;
+		}
 
 		if (KSTAT_TYPE_IO != kt->ks_type)
+		{
+			*error = zbx_strdup(NULL, "Information looked up in kernel statistics facility"
+					" is of the wrong type.");
 			goto clean;
+		}
 
-		if (-1 != kstat_read(kc, kt, &kio))
+		if (-1 == kstat_read(kc, kt, &kio))
 		{
-			zk->nread = kio.nread;
-			zk->nwritten = kio.nwritten;
-			zk->reads = kio.reads;
-			zk->writes = kio.writes;
-
-			result = SYSINFO_RET_OK;
+			*error = zbx_dsprintf(NULL, "Cannot read from kernel statistics facility: %s",
+					zbx_strerror(errno));
+			goto clean;
 		}
+
+		zk->nread = kio.nread;
+		zk->nwritten = kio.nwritten;
+		zk->reads = kio.reads;
+		zk->writes = kio.writes;
 	}
 	else
 	{
@@ -71,7 +84,12 @@ static int	get_kstat_io(const char *name, zbx_kstat_t *zk)
 		{
 			if (KSTAT_TYPE_IO == kt->ks_type && 0 == strcmp("disk", kt->ks_class))
 			{
-				kstat_read(kc, kt, &kio);
+				if (-1 == kstat_read(kc, kt, &kio))
+				{
+					*error = zbx_dsprintf(NULL, "Cannot read from kernel statistics facility: %s",
+							zbx_strerror(errno));
+					goto clean;
+				}
 
 				zk->nread += kio.nread;
 				zk->nwritten += kio.nwritten;
@@ -79,77 +97,99 @@ static int	get_kstat_io(const char *name, zbx_kstat_t *zk)
 				zk->writes += kio.writes;
 			}
 		}
-
-		result = SYSINFO_RET_OK;
 	}
+
+	ret = SYSINFO_RET_OK;
 clean:
 	kstat_close(kc);
 
-	return result;
+	return ret;
 }
 
 static int	VFS_DEV_READ_BYTES(const char *devname, AGENT_RESULT *result)
 {
-	int	ret;
+	zbx_kstat_t	zk;
+	char		*error;
 
-	if (SYSINFO_RET_OK == (ret = get_kstat_io(devname, &zbx_kstat)))
-		SET_UI64_RESULT(result, zbx_kstat.nread);
+	if (SYSINFO_RET_OK != get_kstat_io(devname, &zk, &error))
+	{
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
+	}
 
-	return ret;
+	SET_UI64_RESULT(result, zk.nread);
+
+	return SYSINFO_RET_OK;
 }
 
 static int	VFS_DEV_READ_OPERATIONS(const char *devname, AGENT_RESULT *result)
 {
-	int	ret;
+	zbx_kstat_t	zk;
+	char		*error;
 
-	if (SYSINFO_RET_OK == (ret = get_kstat_io(devname, &zbx_kstat)))
-		SET_UI64_RESULT(result, zbx_kstat.reads);
+	if (SYSINFO_RET_OK != get_kstat_io(devname, &zk, &error))
+	{
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
+	}
 
-	return ret;
+	SET_UI64_RESULT(result, zk.reads);
+
+	return SYSINFO_RET_OK;
 }
 
 static int	VFS_DEV_WRITE_BYTES(const char *devname, AGENT_RESULT *result)
 {
-	int	ret;
+	zbx_kstat_t	zk;
+	char		*error;
 
-	if (SYSINFO_RET_OK == (ret = get_kstat_io(devname, &zbx_kstat)))
-		SET_UI64_RESULT(result, zbx_kstat.nwritten);
+	if (SYSINFO_RET_OK != get_kstat_io(devname, &zk, &error))
+	{
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
+	}
 
-	return ret;
+	SET_UI64_RESULT(result, zk.nwritten);
+
+	return SYSINFO_RET_OK;
 }
 
 static int	VFS_DEV_WRITE_OPERATIONS(const char *devname, AGENT_RESULT *result)
 {
-	int	ret;
+	zbx_kstat_t	zk;
+	char		*error;
 
-	if (SYSINFO_RET_OK == (ret = get_kstat_io(devname, &zbx_kstat)))
-		SET_UI64_RESULT(result, zbx_kstat.writes);
+	if (SYSINFO_RET_OK != get_kstat_io(devname, &zk, &error))
+	{
+		SET_MSG_RESULT(result, error);
+		return SYSINFO_RET_FAIL;
+	}
 
-	return ret;
+	SET_UI64_RESULT(result, zk.writes);
+
+	return SYSINFO_RET_OK;
 }
 
 static int	process_mode_function(AGENT_REQUEST *request, AGENT_RESULT *result, const MODE_FUNCTION *fl)
 {
-	char	devname[MAX_STRING_LEN], mode[16];
-	char	*devname_str, *mode_str;
-	int	i;
+	const char	*devname, *mode;
+	int		i;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	devname_str = get_rparam(request, 0);
+	devname = get_rparam(request, 0);
 
-	if (NULL == devname_str || 0 == strcmp("all", devname_str))
-		*devname = '\0';
-	else
-		strscpy(devname, devname_str);
+	if (NULL == devname || 0 == strcmp("all", devname))
+		devname = "";
 
-	mode_str = get_rparam(request, 1);
+	mode = get_rparam(request, 1);
 
-	if (NULL == mode_str || '\0' == *mode_str)
-		strscpy(mode, "bytes");
-	else
-		strscpy(mode, mode_str);
+	if (NULL == mode || '\0' == *mode)
+		mode = "bytes";
 
 	for (i = 0; NULL != fl[i].mode; i++)
 	{
@@ -157,27 +197,29 @@ static int	process_mode_function(AGENT_REQUEST *request, AGENT_RESULT *result, c
 			return (fl[i].function)(devname, result);
 	}
 
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+
 	return SYSINFO_RET_FAIL;
 }
 
-int	VFS_DEV_WRITE(AGENT_REQUEST *request, AGENT_RESULT *result)
+int	VFS_DEV_READ(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	const MODE_FUNCTION	fl[] =
 	{
-		{"bytes", 	VFS_DEV_WRITE_BYTES},
-		{"operations", 	VFS_DEV_WRITE_OPERATIONS},
+		{"bytes",	VFS_DEV_READ_BYTES},
+		{"operations",	VFS_DEV_READ_OPERATIONS},
 		{NULL,		NULL}
 	};
 
 	return process_mode_function(request, result, fl);
 }
 
-int	VFS_DEV_READ(AGENT_REQUEST *request, AGENT_RESULT *result)
+int	VFS_DEV_WRITE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	const MODE_FUNCTION	fl[] =
 	{
-		{"bytes",	VFS_DEV_READ_BYTES},
-		{"operations",	VFS_DEV_READ_OPERATIONS},
+		{"bytes", 	VFS_DEV_WRITE_BYTES},
+		{"operations", 	VFS_DEV_WRITE_OPERATIONS},
 		{NULL,		NULL}
 	};
 
diff --git a/src/libs/zbxsysinfo/solaris/diskspace.c b/src/libs/zbxsysinfo/solaris/diskspace.c
index 7752cda1043..57f754ab3ad 100644
--- a/src/libs/zbxsysinfo/solaris/diskspace.c
+++ b/src/libs/zbxsysinfo/solaris/diskspace.c
@@ -20,9 +20,10 @@
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxjson.h"
+#include "log.h"
 
 static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *free,
-		zbx_uint64_t *used, double *pfree, double *pused)
+		zbx_uint64_t *used, double *pfree, double *pused, char **error)
 {
 #ifdef HAVE_SYS_STATVFS_H
 #	ifdef HAVE_SYS_STATVFS64
@@ -37,10 +38,11 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 #endif
 	struct ZBX_STATFS	s;
 
-	assert(fs);
-
 	if (0 != ZBX_STATFS(fs, &s))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s", zbx_strerror(errno));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (total)
 		*total = (zbx_uint64_t)s.f_blocks * s.ZBX_BSIZE;
@@ -70,10 +72,14 @@ static int	get_fs_size_stat(const char *fs, zbx_uint64_t *total, zbx_uint64_t *f
 
 static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, &value, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -82,10 +88,14 @@ static int	VFS_FS_USED(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, &value, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -94,10 +104,14 @@ static int	VFS_FS_FREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 {
-	zbx_uint64_t	value = 0;
+	zbx_uint64_t	value;
+	char		*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, &value, NULL, NULL, NULL, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, value);
 
@@ -107,10 +121,14 @@ static int	VFS_FS_TOTAL(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, &value, NULL, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -119,10 +137,14 @@ static int	VFS_FS_PFREE(const char *fs, AGENT_RESULT *result)
 
 static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 {
-	double	value = 0;
+	double	value;
+	char	*error;
 
-	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value))
+	if (SYSINFO_RET_OK != get_fs_size_stat(fs, NULL, NULL, NULL, NULL, &value, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, value);
 
@@ -132,16 +154,22 @@ static int	VFS_FS_PUSED(const char *fs, AGENT_RESULT *result)
 int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*fsname, *mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))
 		ret = VFS_FS_TOTAL(fsname, result);
@@ -154,44 +182,47 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pused"))
 		ret = VFS_FS_PUSED(fsname, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
 
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		ret = SYSINFO_RET_FAIL;
 	struct mnttab	mt;
 	FILE		*f;
 	struct zbx_json	j;
 
+	/* opening the mounted filesystems file */
+	if (NULL == (f = fopen("/etc/mnttab", "r")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /etc/mnttab: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	/* opening the mounted filesystems file */
-	if (NULL != (f = fopen("/etc/mnttab", "r")))
+	/* fill mnttab structure from file */
+	while (-1 != getmntent(f, &mt))
 	{
-		/* fill mnttab structure from file */
-		while (-1 != getmntent(f, &mt))
-		{
-			zbx_json_addobject(&j, NULL);
-			zbx_json_addstring(&j, "{#FSNAME}", mt.mnt_mountp, ZBX_JSON_TYPE_STRING);
-			zbx_json_addstring(&j, "{#FSTYPE}", mt.mnt_fstype, ZBX_JSON_TYPE_STRING);
-			zbx_json_close(&j);
-		}
-
-		zbx_fclose(f);
-
-		ret = SYSINFO_RET_OK;
+		zbx_json_addobject(&j, NULL);
+		zbx_json_addstring(&j, "{#FSNAME}", mt.mnt_mountp, ZBX_JSON_TYPE_STRING);
+		zbx_json_addstring(&j, "{#FSTYPE}", mt.mnt_fstype, ZBX_JSON_TYPE_STRING);
+		zbx_json_close(&j);
 	}
 
+	zbx_fclose(f);
+
 	zbx_json_close(&j);
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, j.buffer));
 
 	zbx_json_free(&j);
 
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/solaris/hostname.c b/src/libs/zbxsysinfo/solaris/hostname.c
index c0ccec5fc00..804b9a90050 100644
--- a/src/libs/zbxsysinfo/solaris/hostname.c
+++ b/src/libs/zbxsysinfo/solaris/hostname.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -32,7 +33,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.nodename));
 
diff --git a/src/libs/zbxsysinfo/solaris/inodes.c b/src/libs/zbxsysinfo/solaris/inodes.c
index f6d50fa6615..049a12bd011 100644
--- a/src/libs/zbxsysinfo/solaris/inodes.c
+++ b/src/libs/zbxsysinfo/solaris/inodes.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -34,13 +35,26 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct ZBX_STATFS	s;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	fsname = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
-	if (NULL == fsname || '\0' == *fsname || 0 != ZBX_STATFS(fsname, &s))
+	if (NULL == fsname || '\0' == *fsname)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (0 != ZBX_STATFS(fsname, &s))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain filesystem information: %s",
+				zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total"))	/* default parameter */
 	{
@@ -63,7 +77,10 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else if (0 == strcmp(mode, "pused"))
 	{
@@ -74,10 +91,16 @@ int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		if (0 != total)
 			SET_DBL_RESULT(result, 100.0 - (double)(100.0 * s.ZBX_FFREE) / total);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/solaris/kernel.c b/src/libs/zbxsysinfo/solaris/kernel.c
index eca914aa21a..dcd235846ab 100644
--- a/src/libs/zbxsysinfo/solaris/kernel.c
+++ b/src/libs/zbxsysinfo/solaris/kernel.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -27,21 +28,41 @@ int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result)
 	kstat_t		*kt;
 	struct var	*v;
 
-	if (NULL != (kc = kstat_open()))
+	if (NULL == (kc = kstat_open()))
 	{
-		if (NULL != (kt = kstat_lookup(kc, "unix", 0, "var")))
-		{
-			if (KSTAT_TYPE_RAW == kt->ks_type && -1 != kstat_read(kc, kt, NULL))
-			{
-				v = (struct var *)kt->ks_data;
-
-				/* int	v_proc;	    Max processes system wide */
-				SET_UI64_RESULT(result, v->v_proc);
-				ret = SYSINFO_RET_OK;
-			}
-		}
-		kstat_close(kc);
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
 	}
 
+	if (NULL == (kt = kstat_lookup(kc, "unix", 0, "var")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot look up in kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		goto clean;
+	}
+
+	if (KSTAT_TYPE_RAW != kt->ks_type)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Information looked up in kernel statistics facility"
+				" is of the wrong type."));
+		goto clean;
+	}
+
+	if (-1 == kstat_read(kc, kt, NULL))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot read from kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		goto clean;
+	}
+
+	v = (struct var *)kt->ks_data;
+
+	/* int	v_proc;	    Max processes system wide */
+	SET_UI64_RESULT(result, v->v_proc);
+	ret = SYSINFO_RET_OK;
+clean:
+	kstat_close(kc);
+
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/solaris/memory.c b/src/libs/zbxsysinfo/solaris/memory.c
index adc0fe0bdfa..ad32c13dd13 100644
--- a/src/libs/zbxsysinfo/solaris/memory.c
+++ b/src/libs/zbxsysinfo/solaris/memory.c
@@ -50,7 +50,10 @@ static int	VM_MEMORY_PUSED(AGENT_RESULT *result)
 	zbx_uint64_t	used, total;
 
 	if (0 == (total = sysconf(_SC_PHYS_PAGES)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	used = total - sysconf(_SC_AVPHYS_PAGES);
 
@@ -71,7 +74,10 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 	zbx_uint64_t	total;
 
 	if (0 == (total = sysconf(_SC_PHYS_PAGES)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, sysconf(_SC_AVPHYS_PAGES) / (double)total * 100);
 
@@ -81,10 +87,13 @@ static int	VM_MEMORY_PAVAILABLE(AGENT_RESULT *result)
 int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
@@ -101,7 +110,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "pavailable"))
 		ret = VM_MEMORY_PAVAILABLE(result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/solaris/net.c b/src/libs/zbxsysinfo/solaris/net.c
index c35cc2102c4..c8ba64ee676 100644
--- a/src/libs/zbxsysinfo/solaris/net.c
+++ b/src/libs/zbxsysinfo/solaris/net.c
@@ -21,41 +21,65 @@
 #include "sysinfo.h"
 #include "zbxjson.h"
 #include "../common/common.h"
+#include "log.h"
 
-static int	get_kstat_named_field(const char *name, const char *field, kstat_named_t *returned_data)
+static int	get_kstat_named_field(const char *name, const char *field, kstat_named_t *returned_data, char **error)
 {
 	int		ret = FAIL;
 	kstat_ctl_t	*kc;
 	kstat_t		*kp;
 	kstat_named_t	*kn;
 
-	if (NULL != (kc = kstat_open()))
+	if (NULL == (kc = kstat_open()))
 	{
-		if (NULL != (kp = kstat_lookup(kc, NULL, -1, (char *)name)) && -1 != kstat_read(kc, kp, 0))
-		{
-			if (NULL != (kn = (kstat_named_t *)kstat_data_lookup(kp, (char *)field)))
-			{
-				*returned_data = *kn;
-				ret = SUCCEED;
-			}
-		}
-		kstat_close(kc);
+		*error = zbx_dsprintf(*error, "Cannot open kernel statistics facility: %s", zbx_strerror(errno));
+		return FAIL;
 	}
 
+	if (NULL == (kp = kstat_lookup(kc, NULL, -1, (char *)name)))
+	{
+		*error = zbx_dsprintf(*error, "Cannot look up in kernel statistics facility: %s", zbx_strerror(errno));
+		goto clean;
+	}
+
+	if (-1 == kstat_read(kc, kp, 0))
+	{
+		*error = zbx_dsprintf(*error, "Cannot read from kernel statistics facility: %s", zbx_strerror(errno));
+		goto clean;
+	}
+
+	if (NULL == (kn = (kstat_named_t *)kstat_data_lookup(kp, (char *)field)))
+	{
+		*error = zbx_dsprintf(*error, "Cannot look up data in kernel statistics facility: %s",
+				zbx_strerror(errno));
+		goto clean;
+	}
+
+	*returned_data = *kn;
+	ret = SUCCEED;
+clean:
+	kstat_close(kc);
+
 	return ret;
 }
 
 static int	NET_IF_IN_BYTES(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	kn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "rbytes64", &kn) ||
-			SUCCEED == get_kstat_named_field(if_name, "rbytes", &kn))
+	if (SUCCEED == get_kstat_named_field(if_name, "rbytes64", &kn, &error) ||
+			SUCCEED == get_kstat_named_field(if_name, "rbytes", &kn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&kn));
 	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_free(error);
 
 	return SYSINFO_RET_OK;
 }
@@ -63,14 +87,20 @@ static int	NET_IF_IN_BYTES(const char *if_name, AGENT_RESULT *result)
 static int	NET_IF_IN_PACKETS(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	kn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "ipackets64", &kn) ||
-			SUCCEED == get_kstat_named_field(if_name, "ipackets", &kn))
+	if (SUCCEED == get_kstat_named_field(if_name, "ipackets64", &kn, &error) ||
+			SUCCEED == get_kstat_named_field(if_name, "ipackets", &kn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&kn));
 	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_free(error);
 
 	return SYSINFO_RET_OK;
 }
@@ -78,11 +108,17 @@ static int	NET_IF_IN_PACKETS(const char *if_name, AGENT_RESULT *result)
 static int	NET_IF_IN_ERRORS(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	kn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "ierrors", &kn))
+	if (SUCCEED == get_kstat_named_field(if_name, "ierrors", &kn, &error))
+	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&kn));
+	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -90,14 +126,20 @@ static int	NET_IF_IN_ERRORS(const char *if_name, AGENT_RESULT *result)
 static int	NET_IF_OUT_BYTES(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	kn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "obytes64", &kn) ||
-			SUCCEED == get_kstat_named_field(if_name, "obytes", &kn))
+	if (SUCCEED == get_kstat_named_field(if_name, "obytes64", &kn, &error) ||
+			SUCCEED == get_kstat_named_field(if_name, "obytes", &kn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&kn));
 	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_free(error);
 
 	return SYSINFO_RET_OK;
 }
@@ -105,14 +147,20 @@ static int	NET_IF_OUT_BYTES(const char *if_name, AGENT_RESULT *result)
 static int	NET_IF_OUT_PACKETS(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	kn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "opackets64", &kn) ||
-			SUCCEED == get_kstat_named_field(if_name, "opackets", &kn))
+	if (SUCCEED == get_kstat_named_field(if_name, "opackets64", &kn, &error) ||
+			SUCCEED == get_kstat_named_field(if_name, "opackets", &kn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&kn));
 	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_free(error);
 
 	return SYSINFO_RET_OK;
 }
@@ -120,11 +168,17 @@ static int	NET_IF_OUT_PACKETS(const char *if_name, AGENT_RESULT *result)
 static int	NET_IF_OUT_ERRORS(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	kn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "oerrors", &kn))
+	if (SUCCEED == get_kstat_named_field(if_name, "oerrors", &kn, &error))
+	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&kn));
+	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -132,19 +186,25 @@ static int	NET_IF_OUT_ERRORS(const char *if_name, AGENT_RESULT *result)
 static int	NET_IF_TOTAL_BYTES(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	ikn, okn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "rbytes64", &ikn) &&
-			SUCCEED == get_kstat_named_field(if_name, "obytes64", &okn))
+	if (SUCCEED == get_kstat_named_field(if_name, "rbytes64", &ikn, &error) &&
+			SUCCEED == get_kstat_named_field(if_name, "obytes64", &okn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&ikn) + get_kstat_numeric_value(&okn));
 	}
-	else if (SUCCEED == get_kstat_named_field(if_name, "rbytes", &ikn) &&
-			SUCCEED == get_kstat_named_field(if_name, "obytes", &okn))
+	else if (SUCCEED == get_kstat_named_field(if_name, "rbytes", &ikn, &error) &&
+			SUCCEED == get_kstat_named_field(if_name, "obytes", &okn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&ikn) + get_kstat_numeric_value(&okn));
 	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_free(error);
 
 	return SYSINFO_RET_OK;
 }
@@ -152,19 +212,25 @@ static int	NET_IF_TOTAL_BYTES(const char *if_name, AGENT_RESULT *result)
 static int	NET_IF_TOTAL_PACKETS(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	ikn, okn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "ipackets64", &ikn) &&
-			SUCCEED == get_kstat_named_field(if_name, "opackets64", &okn))
+	if (SUCCEED == get_kstat_named_field(if_name, "ipackets64", &ikn, &error) &&
+			SUCCEED == get_kstat_named_field(if_name, "opackets64", &okn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&ikn) + get_kstat_numeric_value(&okn));
 	}
-	else if (SUCCEED == get_kstat_named_field(if_name, "ipackets", &ikn) &&
-			SUCCEED == get_kstat_named_field(if_name, "opackets", &okn))
+	else if (SUCCEED == get_kstat_named_field(if_name, "ipackets", &ikn, &error) &&
+			SUCCEED == get_kstat_named_field(if_name, "opackets", &okn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&ikn) + get_kstat_numeric_value(&okn));
 	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_free(error);
 
 	return SYSINFO_RET_OK;
 }
@@ -172,14 +238,18 @@ static int	NET_IF_TOTAL_PACKETS(const char *if_name, AGENT_RESULT *result)
 static int	NET_IF_TOTAL_ERRORS(const char *if_name, AGENT_RESULT *result)
 {
 	kstat_named_t	ikn, okn;
+	char		*error = NULL;
 
-	if (SUCCEED == get_kstat_named_field(if_name, "ierrors", &ikn) &&
-			SUCCEED == get_kstat_named_field(if_name, "oerrors", &okn))
+	if (SUCCEED == get_kstat_named_field(if_name, "ierrors", &ikn, &error) &&
+			SUCCEED == get_kstat_named_field(if_name, "oerrors", &okn, &error))
 	{
 		SET_UI64_RESULT(result, get_kstat_numeric_value(&ikn) + get_kstat_numeric_value(&okn));
 	}
 	else
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -187,20 +257,29 @@ static int	NET_IF_TOTAL_ERRORS(const char *if_name, AGENT_RESULT *result)
 int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	kstat_named_t	kn;
-	char		*if_name;
+	char		*if_name, *error = NULL;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	if (SUCCEED == get_kstat_named_field(if_name, "collisions", &kn))
-		SET_UI64_RESULT(result, get_kstat_numeric_value(&kn));
-	else
+	if (SUCCEED != get_kstat_named_field(if_name, "collisions", &kn, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
+
+	SET_UI64_RESULT(result, get_kstat_numeric_value(&kn));
 
 	return SYSINFO_RET_OK;
 }
@@ -212,12 +291,18 @@ int	NET_TCP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		res;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	zbx_snprintf(command, sizeof(command), "netstat -an -P tcp | grep '\\.%hu[^.].*LISTEN' | wc -l", port);
 
@@ -237,12 +322,18 @@ int	NET_UDP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		res;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	zbx_snprintf(command, sizeof(command), "netstat -an -P udp | grep '\\.%hu[^.].*Idle' | wc -l", port);
 
@@ -258,25 +349,34 @@ int	NET_UDP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*if_name, *mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))
 		ret = NET_IF_IN_BYTES(if_name, result);
-	else if (0 ==strcmp(mode, "packets"))
+	else if (0 == strcmp(mode, "packets"))
 		ret = NET_IF_IN_PACKETS(if_name, result);
-	else if (0 ==strcmp(mode, "errors"))
+	else if (0 == strcmp(mode, "errors"))
 		ret = NET_IF_IN_ERRORS(if_name, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
@@ -284,25 +384,34 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*if_name, *mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 ==strcmp(mode, "bytes"))
 		ret = NET_IF_OUT_BYTES(if_name, result);
-	else if (0 ==strcmp(mode, "packets"))
+	else if (0 == strcmp(mode, "packets"))
 		ret = NET_IF_OUT_PACKETS(if_name, result);
-	else if (0 ==strcmp(mode, "errors"))
+	else if (0 == strcmp(mode, "errors"))
 		ret = NET_IF_OUT_ERRORS(if_name, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
@@ -310,25 +419,34 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*if_name, *mode;
-	int	ret = SYSINFO_RET_FAIL;
+	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 ==strcmp(mode, "bytes"))
 		ret = NET_IF_TOTAL_BYTES(if_name, result);
-	else if (0 ==strcmp(mode, "packets"))
+	else if (0 == strcmp(mode, "packets"))
 		ret = NET_IF_TOTAL_PACKETS(if_name, result);
-	else if (0 ==strcmp(mode, "errors"))
+	else if (0 == strcmp(mode, "errors"))
 		ret = NET_IF_TOTAL_ERRORS(if_name, result);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
@@ -339,11 +457,17 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct zbx_json		j;
 	int			i;
 
+	if (NULL == (ni = if_nameindex()))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
 	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
 
 	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
 
-	for (ni = if_nameindex(), i = 0; 0 != ni[i].if_index; i++)
+	for (i = 0; 0 != ni[i].if_index; i++)
 	{
 		zbx_json_addobject(&j, NULL);
 		zbx_json_addstring(&j, "{#IFNAME}", ni[i].if_name, ZBX_JSON_TYPE_STRING);
diff --git a/src/libs/zbxsysinfo/solaris/proc.c b/src/libs/zbxsysinfo/solaris/proc.c
index 56deb29bd81..13bd9ee4066 100644
--- a/src/libs/zbxsysinfo/solaris/proc.c
+++ b/src/libs/zbxsysinfo/solaris/proc.c
@@ -17,9 +17,11 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+#include <procfs.h>
 #include "common.h"
 #include "sysinfo.h"
 #include "zbxregexp.h"
+#include "log.h"
 
 static int	check_procstate(psinfo_t *psinfo, int zbx_proc_stat)
 {
@@ -54,15 +56,28 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	zbx_uint64_t	proccount = 0;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -78,12 +93,18 @@ int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "min"))
 		do_task = ZBX_DO_MIN;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
 	if (NULL == (dir = opendir("/proc")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (NULL != (entries = readdir(dir)))
 	{
@@ -154,15 +175,28 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	zbx_uint64_t	proccount = 0;
 
 	if (4 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procname = get_rparam(request, 0);
 	param = get_rparam(request, 1);
 
 	if (NULL != param && '\0' != *param)
 	{
-		if (NULL == (usrinfo = getpwnam(param)))	/* incorrect user name */
+		errno = 0;
+
+		if (NULL == (usrinfo = getpwnam(param)))
+		{
+			if (0 == errno)
+				SET_MSG_RESULT(result, zbx_strdup(NULL, "Specified user does not exist."));
+			else
+				SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain user information: %s",
+						zbx_strerror(errno)));
+
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 		usrinfo = NULL;
@@ -178,12 +212,18 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(param, "zomb"))
 		zbx_proc_stat = ZBX_PROC_STAT_ZOMB;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proccomm = get_rparam(request, 3);
 
 	if (NULL == (dir = opendir("/proc")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open /proc: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (NULL != (entries = readdir(dir)))
 	{
diff --git a/src/libs/zbxsysinfo/solaris/software.c b/src/libs/zbxsysinfo/solaris/software.c
index 4dea0e6d6fd..fa4c702ab88 100644
--- a/src/libs/zbxsysinfo/solaris/software.c
+++ b/src/libs/zbxsysinfo/solaris/software.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #       include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_strdup(NULL, name.machine));
 
diff --git a/src/libs/zbxsysinfo/solaris/solaris.c b/src/libs/zbxsysinfo/solaris/solaris.c
index 5cb8c0dcb0f..4de15ae4f0f 100644
--- a/src/libs/zbxsysinfo/solaris/solaris.c
+++ b/src/libs/zbxsysinfo/solaris/solaris.c
@@ -51,6 +51,7 @@ ZBX_METRIC	parameters_specific[] =
 	{"system.cpu.util",	CF_HAVEPARAMS,	SYSTEM_CPU_UTIL,	"all,idle"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
 	{"system.cpu.num",	CF_HAVEPARAMS,	SYSTEM_CPU_NUM,		"online"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.uname",	0,		SYSTEM_UNAME,		NULL},
 
diff --git a/src/libs/zbxsysinfo/solaris/swap.c b/src/libs/zbxsysinfo/solaris/swap.c
index f1c119fe11d..fe972225488 100644
--- a/src/libs/zbxsysinfo/solaris/swap.c
+++ b/src/libs/zbxsysinfo/solaris/swap.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 /******************************************************************************
  *                                                                            *
@@ -32,16 +33,19 @@
  * Comments: we try to imitate "swap -l".                                     *
  *                                                                            *
  ******************************************************************************/
-static int	get_swapinfo(zbx_uint64_t *total, zbx_uint64_t *free1)
+static int	get_swapinfo(zbx_uint64_t *total, zbx_uint64_t *free1, char **error)
 {
-	int			i, cnt, cnt2, page_size, ret = SUCCEED;
+	int			i, cnt, cnt2, page_size, ret = FAIL;
 	struct swaptable	*swt = NULL;
 	struct swapent		*ste;
 	static char		path[256];
 
 	/* get total number of swap entries */
 	if (-1 == (cnt = swapctl(SC_GETNSWP, 0)))
+	{
+		*error = zbx_dsprintf(NULL, "Cannot obtain number of swap entries: %s", zbx_strerror(errno));
 		return FAIL;
+	}
 
 	if (0 == cnt)
 	{
@@ -63,9 +67,15 @@ static int	get_swapinfo(zbx_uint64_t *total, zbx_uint64_t *free1)
 	}
 
 	/* grab all swap info */
-	if (-1 == (cnt2 = swapctl(SC_LIST, swt)) || cnt != cnt2)
+	if (-1 == (cnt2 = swapctl(SC_LIST, swt)))
 	{
-		ret = FAIL;
+		*error = zbx_dsprintf(NULL, "Cannot obtain a list of swap entries: %s", zbx_strerror(errno));
+		goto finish;
+	}
+
+	if (cnt != cnt2)
+	{
+		*error = zbx_strdup(NULL, "Obtained an unexpected number of swap entries.");
 		goto finish;
 	}
 
@@ -89,6 +99,8 @@ static int	get_swapinfo(zbx_uint64_t *total, zbx_uint64_t *free1)
 	/* fill in the results */
 	*total *= page_size;
 	*free1 *= page_size;
+
+	ret = SUCCEED;
 finish:
 	zbx_free(swt);
 
@@ -98,9 +110,13 @@ finish:
 static int	SYSTEM_SWAP_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	zbx_uint64_t	total, free1;
+	char		*error;
 
-	if (SUCCEED != get_swapinfo(&total, &free1))
+	if (SUCCEED != get_swapinfo(&total, &free1, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, total);
 
@@ -110,9 +126,13 @@ static int	SYSTEM_SWAP_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 static int	SYSTEM_SWAP_USED(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	zbx_uint64_t	total, free1;
+	char		*error;
 
-	if (SUCCEED != get_swapinfo(&total, &free1))
+	if (SUCCEED != get_swapinfo(&total, &free1, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, total - free1);
 
@@ -122,9 +142,13 @@ static int	SYSTEM_SWAP_USED(AGENT_REQUEST *request, AGENT_RESULT *result)
 static int	SYSTEM_SWAP_FREE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	zbx_uint64_t	total, free1;
+	char		*error;
 
-	if (SUCCEED != get_swapinfo(&total, &free1))
+	if (SUCCEED != get_swapinfo(&total, &free1, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, free1);
 
@@ -134,12 +158,19 @@ static int	SYSTEM_SWAP_FREE(AGENT_REQUEST *request, AGENT_RESULT *result)
 static int	SYSTEM_SWAP_PUSED(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	zbx_uint64_t	total, free1;
+	char		*error;
 
-	if (SUCCEED != get_swapinfo(&total, &free1))
+	if (SUCCEED != get_swapinfo(&total, &free1, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (0 == total)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, 100.0 * (double)(total - free1) / (double)total);
 
@@ -149,12 +180,19 @@ static int	SYSTEM_SWAP_PUSED(AGENT_REQUEST *request, AGENT_RESULT *result)
 static int	SYSTEM_SWAP_PFREE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	zbx_uint64_t	total, free1;
+	char		*error;
 
-	if (SUCCEED != get_swapinfo(&total, &free1))
+	if (SUCCEED != get_swapinfo(&total, &free1, &error))
+	{
+		SET_MSG_RESULT(result, error);
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (0 == total)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot calculate percentage because total is zero."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_DBL_RESULT(result, 100.0 * (double)free1 / (double)total);
 
@@ -167,12 +205,18 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int	ret;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "all"))	/* default parameter */
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
@@ -187,123 +231,158 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "pused"))
 		ret = SYSTEM_SWAP_PUSED(request, result);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return ret;
 }
 
-static int	get_swap_io(zbx_uint64_t *swapin, zbx_uint64_t *pgswapin, zbx_uint64_t *swapout, zbx_uint64_t *pgswapout)
+static int	get_swap_io(zbx_uint64_t *swapin, zbx_uint64_t *pgswapin, zbx_uint64_t *swapout,
+		zbx_uint64_t *pgswapout, char **error)
 {
 	kstat_ctl_t	*kc;
 	kstat_t		*k;
 	cpu_stat_t	*cpu;
 	int		cpu_count = 0;
 
-	if (NULL != (kc = kstat_open()))
+	if (NULL == (kc = kstat_open()))
 	{
-		k = kc->kc_chain;
+		*error = zbx_dsprintf(NULL, "Cannot open kernel statistics facility: %s", zbx_strerror(errno));
+		return SYSINFO_RET_FAIL;
+	}
 
-		while (NULL != k)
+	for (k = kc->kc_chain; NULL != k; k = k->ks_next)
+	{
+		if (0 == strncmp(k->ks_name, "cpu_stat", 8))
 		{
-			if (0 == strncmp(k->ks_name, "cpu_stat", 8) && -1 != kstat_read(kc, k, NULL))
+			if (-1 == kstat_read(kc, k, NULL))
 			{
-				cpu = (cpu_stat_t *)k->ks_data;
-
-				if (NULL != swapin)
-				{
-					/* uint_t   swapin;	*/ /* swapins */
-					*swapin += cpu->cpu_vminfo.swapin;
-				}
-
-				if (NULL != pgswapin)
-				{
-					/* uint_t   pgswapin;	*/ /* pages swapped in */
-					*pgswapin += cpu->cpu_vminfo.pgswapin;
-				}
-
-				if (NULL != swapout)
-				{
-					/* uint_t   swapout;	*/ /* swapout */
-					*swapout += cpu->cpu_vminfo.swapout;
-				}
-
-				if (NULL != pgswapout)
-				{
-					/* uint_t   pgswapout;	*/ /* pages swapped out */
-					*pgswapout += cpu->cpu_vminfo.pgswapout;
-				}
-
-				cpu_count++;
+				*error = zbx_dsprintf(NULL, "Cannot read from kernel statistics facility: %s",
+						zbx_strerror(errno));
+				goto clean;
 			}
 
-			k = k->ks_next;
-		}
+			cpu = (cpu_stat_t *)k->ks_data;
 
-		kstat_close(kc);
+			if (NULL != swapin)
+			{
+				/* uint_t   swapin;	*/ /* swapins */
+				*swapin += cpu->cpu_vminfo.swapin;
+			}
+
+			if (NULL != pgswapin)
+			{
+				/* uint_t   pgswapin;	*/ /* pages swapped in */
+				*pgswapin += cpu->cpu_vminfo.pgswapin;
+			}
+
+			if (NULL != swapout)
+			{
+				/* uint_t   swapout;	*/ /* swapout */
+				*swapout += cpu->cpu_vminfo.swapout;
+			}
+
+			if (NULL != pgswapout)
+			{
+				/* uint_t   pgswapout;	*/ /* pages swapped out */
+				*pgswapout += cpu->cpu_vminfo.pgswapout;
+			}
+
+			cpu_count++;
+		}
 	}
 
 	if (0 == cpu_count)
+	{
+		kstat_close(kc);
+
+		*error = zbx_strdup(NULL, "Cannot find swap information.");
 		return SYSINFO_RET_FAIL;
+	}
+clean:
+	kstat_close(kc);
 
 	return SYSINFO_RET_OK;
 }
 
 int	SYSTEM_SWAP_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		ret = SYSINFO_RET_FAIL;
-	char		*tmp;
-	zbx_uint64_t	value = 0;
+	int		ret;
+	char		*tmp, *error;
+	zbx_uint64_t	value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "count"))
-		ret = get_swap_io(&value, NULL, NULL, NULL);
+		ret = get_swap_io(&value, NULL, NULL, NULL, &error);
 	else if (0 == strcmp(tmp, "pages"))
-		ret = get_swap_io(NULL, &value, NULL, NULL);
+		ret = get_swap_io(NULL, &value, NULL, NULL, &error);
 	else
-		ret =  SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	if (ret != SYSINFO_RET_OK)
-		return ret;
+	if (SYSINFO_RET_OK == ret)
+		SET_UI64_RESULT(result, value);
+	else
+		SET_MSG_RESULT(result, error);
 
-	SET_UI64_RESULT(result, value);
-	return ret;
+	return SYSINFO_RET_OK;
 }
 
 int	SYSTEM_SWAP_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	int		ret = SYSINFO_RET_FAIL;
-	char		*tmp;
-	zbx_uint64_t	value = 0;
+	int		ret;
+	char		*tmp, *error;
+	zbx_uint64_t	value;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	tmp = get_rparam(request, 1);
 
 	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "count"))
-		ret = get_swap_io(NULL, NULL, &value, NULL);
+		ret = get_swap_io(NULL, NULL, &value, NULL, &error);
 	else if (0 == strcmp(tmp, "pages"))
-		ret = get_swap_io(NULL, NULL, NULL, &value);
+		ret = get_swap_io(NULL, NULL, NULL, &value, &error);
 	else
-		ret = SYSINFO_RET_FAIL;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
-	if (ret != SYSINFO_RET_OK)
-		return ret;
+	if (SYSINFO_RET_OK == ret)
+		SET_UI64_RESULT(result, value);
+	else
+		SET_MSG_RESULT(result, error);
 
-	SET_UI64_RESULT(result, value);
-	return ret;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/solaris/system.c b/src/libs/zbxsysinfo/solaris/system.c
index ac58d08dcd9..849bd967c32 100644
--- a/src/libs/zbxsysinfo/solaris/system.c
+++ b/src/libs/zbxsysinfo/solaris/system.c
@@ -18,6 +18,7 @@
 **/
 
 #include "sysinfo.h"
+#include "log.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
 #	include <sys/utsname.h>
@@ -28,7 +29,10 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	struct utsname	name;
 
 	if (-1 == uname(&name))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno)));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_STR_RESULT(result, zbx_dsprintf(NULL, "%s %s %s %s %s", name.sysname, name.nodename, name.release,
 			name.version, name.machine));
diff --git a/src/libs/zbxsysinfo/solaris/uptime.c b/src/libs/zbxsysinfo/solaris/uptime.c
index 5b37be439fc..250e1d00f95 100644
--- a/src/libs/zbxsysinfo/solaris/uptime.c
+++ b/src/libs/zbxsysinfo/solaris/uptime.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "sysinfo.h"
+#include "log.h"
 
 int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
@@ -29,20 +30,38 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		ret = SYSINFO_RET_FAIL;
 
 	if (NULL == (kc = kstat_open()))
-		return ret;
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot open kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		return SYSINFO_RET_FAIL;
+	}
+
+	if (NULL == (kp = kstat_lookup(kc, "unix", 0, "system_misc")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot look up in kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		goto clean;
+	}
 
-	if (NULL != (kp = kstat_lookup(kc, "unix", 0, "system_misc")))
+	if (-1 == kstat_read(kc, kp, 0))
 	{
-		if (-1 != kstat_read(kc, kp, 0))
-		{
-			if (NULL != (kn = (kstat_named_t*)kstat_data_lookup(kp, "boot_time")))
-			{
-				time(&now);
-				SET_UI64_RESULT(result, now - get_kstat_numeric_value(kn));
-				ret = SYSINFO_RET_OK;
-			}
-		}
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot read from kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		goto clean;
 	}
+
+	if (NULL == (kn = (kstat_named_t *)kstat_data_lookup(kp, "boot_time")))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot look up data in kernel statistics facility: %s",
+				zbx_strerror(errno)));
+		goto clean;
+	}
+
+	time(&now);
+
+	SET_UI64_RESULT(result, now - get_kstat_numeric_value(kn));
+	ret = SYSINFO_RET_OK;
+clean:
 	kstat_close(kc);
 
 	return ret;
diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c
index 7d7d66e6b21..3195bdf8a95 100644
--- a/src/libs/zbxsysinfo/sysinfo.c
+++ b/src/libs/zbxsysinfo/sysinfo.c
@@ -287,7 +287,7 @@ void	free_request(AGENT_REQUEST *request)
  * Return value: request - structure filled with data from item key           *
  *                                                                            *
  ******************************************************************************/
-int	parse_item_key(char *itemkey, AGENT_REQUEST *request)
+int	parse_item_key(const char *itemkey, AGENT_REQUEST *request)
 {
 	int	i;
 	char	key[MAX_STRING_LEN], params[MAX_STRING_LEN];
@@ -376,29 +376,37 @@ void	test_parameter(const char *key)
 	AGENT_RESULT	result;
 	int		n;
 
-	init_result(&result);
-
-	process(key, 0, &result);
-
 	n = printf("%s", key);
 
 	if (0 < n && ZBX_COL_WIDTH > n)
 		printf("%-*s", ZBX_COL_WIDTH - n, " ");
 
-	if (ISSET_UI64(&result))
-		printf(" [u|" ZBX_FS_UI64 "]", result.ui64);
+	init_result(&result);
 
-	if (ISSET_DBL(&result))
-		printf(" [d|" ZBX_FS_DBL "]", result.dbl);
+	if (SUCCEED == process(key, 0, &result))
+	{
+		if (ISSET_UI64(&result))
+			printf(" [u|" ZBX_FS_UI64 "]", result.ui64);
+
+		if (ISSET_DBL(&result))
+			printf(" [d|" ZBX_FS_DBL "]", result.dbl);
 
-	if (ISSET_STR(&result))
-		printf(" [s|%s]", result.str);
+		if (ISSET_STR(&result))
+			printf(" [s|%s]", result.str);
 
-	if (ISSET_TEXT(&result))
-		printf(" [t|%s]", result.text);
+		if (ISSET_TEXT(&result))
+			printf(" [t|%s]", result.text);
 
-	if (ISSET_MSG(&result))
-		printf(" [m|%s]", result.msg);
+		if (ISSET_MSG(&result))
+			printf(" [m|%s]", result.msg);
+	}
+	else
+	{
+		if (ISSET_MSG(&result))
+			printf(" [m|" ZBX_NOTSUPPORTED "] [%s]", result.msg);
+		else
+			printf(" [m|" ZBX_NOTSUPPORTED "]");
+	}
 
 	free_result(&result);
 
@@ -529,6 +537,21 @@ static int	replace_param(const char *cmd, const char *param, char *out, int outl
 	return ret;
 }
 
+/******************************************************************************
+ *                                                                            *
+ * Function: process                                                          *
+ *                                                                            *
+ * Purpose: execute agent check                                               *
+ *                                                                            *
+ * Parameters: in_command - item key                                          *
+ *             flags - PROCESS_LOCAL_COMMAND, allow execution of system.run   *
+ *                     PROCESS_MODULE_COMMAND, execute item from a module     *
+ *                                                                            *
+ * Return value: SUCCEED - successful execution                               *
+ *               NOTSUPPORTED - item key is not supported or other error      *
+ *               result - contains item value or error message                *
+ *                                                                            *
+ ******************************************************************************/
 int	process(const char *in_command, unsigned flags, AGENT_RESULT *result)
 {
 	int		rc, ret = NOTSUPPORTED;
@@ -547,12 +570,16 @@ int	process(const char *in_command, unsigned flags, AGENT_RESULT *result)
 	alias_expand(in_command, tmp, sizeof(tmp));
 
 	if (ZBX_COMMAND_ERROR == (rc = parse_command(tmp, key, sizeof(key), parameters, sizeof(parameters))))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid item key format."));
 		goto notsupported;
+	}
 
 	/* system.run is not allowed by default except for getting hostname for daemons */
 	if (1 != CONFIG_ENABLE_REMOTE_COMMANDS && 0 == (flags & PROCESS_LOCAL_COMMAND) &&
 			0 == strcmp(key, "system.run"))
 	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Remote commands are not enabled."));
 		goto notsupported;
 	}
 
@@ -564,7 +591,10 @@ int	process(const char *in_command, unsigned flags, AGENT_RESULT *result)
 
 	/* item key not found */
 	if (NULL == command->key)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Unsupported item key."));
 		goto notsupported;
+	}
 
 	/* expected item from a module */
 	if (0 != (flags & PROCESS_MODULE_COMMAND) && 0 == (command->flags & CF_MODULE))
@@ -572,7 +602,10 @@ int	process(const char *in_command, unsigned flags, AGENT_RESULT *result)
 
 	/* command does not accept parameters but was called with parameters */
 	if (0 == (command->flags & CF_HAVEPARAMS) && ZBX_COMMAND_WITH_PARAMS == rc)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Item does not allow parameters."));
 		goto notsupported;
+	}
 
 	*error = '\0';
 
@@ -590,7 +623,10 @@ int	process(const char *in_command, unsigned flags, AGENT_RESULT *result)
 					request.params[0], MAX_STRING_LEN, error, sizeof(error)))
 			{
 				if ('\0' != *error)
+				{
+					SET_MSG_RESULT(result, zbx_strdup(NULL, error));
 					zabbix_log(LOG_LEVEL_WARNING, "item [%s] error: %s", in_command, error);
+				}
 				goto notsupported;
 			}
 		}
@@ -600,7 +636,10 @@ int	process(const char *in_command, unsigned flags, AGENT_RESULT *result)
 	else
 	{
 		if (SUCCEED != parse_item_key(tmp, &request))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid item parameter format."));
 			goto notsupported;
+		}
 	}
 
 	if (SYSINFO_RET_OK != command->function(&request, result))
@@ -615,9 +654,6 @@ int	process(const char *in_command, unsigned flags, AGENT_RESULT *result)
 notsupported:
 	free_request(&request);
 
-	if (NOTSUPPORTED == ret)
-		SET_MSG_RESULT(result, zbx_strdup(NULL, ZBX_NOTSUPPORTED));
-
 	return ret;
 }
 
diff --git a/src/libs/zbxsysinfo/unknown/Makefile.am b/src/libs/zbxsysinfo/unknown/Makefile.am
index 700ee88fcf0..d5ce722da1a 100644
--- a/src/libs/zbxsysinfo/unknown/Makefile.am
+++ b/src/libs/zbxsysinfo/unknown/Makefile.am
@@ -1,7 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libspecsysinfo.a
+noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a
 
 libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
-libspecsysinfo_a_SOURCES = diskio.c
+libspecsysinfo_a_SOURCES = \
+	diskio.c \
+	unknown.c
+
+libspechostnamesysinfo_a_SOURCES = \
+	hostname.c
diff --git a/src/libs/zbxsysinfo/unknown/hostname.c b/src/libs/zbxsysinfo/unknown/hostname.c
index 1fba69e2eae..2025342690a 100644
--- a/src/libs/zbxsysinfo/unknown/hostname.c
+++ b/src/libs/zbxsysinfo/unknown/hostname.c
@@ -25,5 +25,6 @@ ZBX_METRIC	parameter_hostname =
 
 int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
+	SET_MSG_RESULT(result, zbx_strdup(NULL, "Not supported because the system is unknown."));
 	return SYSINFO_RET_FAIL;
 }
diff --git a/src/libs/zbxsysinfo/win32/cpu.c b/src/libs/zbxsysinfo/win32/cpu.c
index 37c508af86b..0b73a96bfbf 100644
--- a/src/libs/zbxsysinfo/win32/cpu.c
+++ b/src/libs/zbxsysinfo/win32/cpu.c
@@ -21,6 +21,7 @@
 #include "sysinfo.h"
 #include "stats.h"
 #include "perfstat.h"
+#include "zbxjson.h"
 
 static int	get_cpu_num()
 {
@@ -31,18 +32,62 @@ static int	get_cpu_num()
 	return (int)sysInfo.dwNumberOfProcessors;
 }
 
+int	SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
+{
+	int			i;
+	zbx_vector_uint64_t	cpus;
+	struct zbx_json		json;
+
+	zbx_vector_uint64_create(&cpus);
+
+	if (SUCCEED != get_cpu_statuses(&cpus))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector in not started."));
+		zbx_vector_uint64_destroy(&cpus);
+		return SYSINFO_RET_FAIL;
+	}
+
+	zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+	zbx_json_addarray(&json, ZBX_PROTO_TAG_DATA);
+
+	for (i = 0; i < cpus.values_num; i++)
+	{
+		zbx_json_addobject(&json, NULL);
+
+		zbx_json_adduint64(&json, "{#CPU.NUMBER}", i);
+		zbx_json_addstring(&json, "{#CPU.STATUS}", (PERF_COUNTER_ACTIVE == cpus.values[i]) ?
+				"online" :
+				(PERF_COUNTER_INITIALIZED == cpus.values[i]) ? "unknown" : "offline",
+				ZBX_JSON_TYPE_STRING);
+
+		zbx_json_close(&json);
+	}
+
+	zbx_json_close(&json);
+	SET_STR_RESULT(result, zbx_strdup(result->str, json.buffer));
+
+	zbx_json_free(&json);
+	zbx_vector_uint64_destroy(&cpus);
+
+	return SYSINFO_RET_OK;
+}
+
 int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char	*tmp;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
-
-	tmp = get_rparam(request, 0);
+	}
 
 	/* only "online" (default) for parameter "type" is supported */
-	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "online"))
+	if (NULL != (tmp = get_rparam(request, 0)) && '\0' != *tmp && 0 != strcmp(tmp, "online"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	SET_UI64_RESULT(result, get_cpu_num());
 
@@ -51,97 +96,131 @@ int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*tmp;
-	int	cpu_num;
+	char	*tmp, *error = NULL;
+	int	cpu_num, ret = FAIL;
 	double	value;
 
-	if (!CPU_COLLECTOR_STARTED(collector))
+	if (0 == CPU_COLLECTOR_STARTED(collector))
 	{
-		SET_MSG_RESULT(result, strdup("Collector is not started!"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
 		return SYSINFO_RET_FAIL;
 	}
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	tmp = get_rparam(request, 0);
-
-	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
+	if (NULL == (tmp = get_rparam(request, 0)) || '\0' == *tmp || 0 == strcmp(tmp, "all"))
 		cpu_num = 0;
 	else if (SUCCEED != is_uint_range(tmp, &cpu_num, 0, collector->cpus.count - 1))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 	else
 		cpu_num++;
 
-	tmp = get_rparam(request, 1);
-
 	/* only "system" (default) for parameter "type" is supported */
-	if (NULL != tmp && '\0' != *tmp && 0 != strcmp(tmp, "system"))
-		return SYSINFO_RET_FAIL;
-
-	if (PERF_COUNTER_ACTIVE != collector->cpus.cpu_counter[cpu_num]->status)
+	if (NULL != (tmp = get_rparam(request, 1)) && '\0' != *tmp && 0 != strcmp(tmp, "system"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	tmp = get_rparam(request, 2);
-
-	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "avg1"))
-		value = compute_average_value(collector->cpus.cpu_counter[cpu_num], 1 * SEC_PER_MIN);
+	if (NULL == (tmp = get_rparam(request, 2)) || '\0' == *tmp || 0 == strcmp(tmp, "avg1"))
+	{
+		ret = get_perf_counter_value(collector->cpus.cpu_counter[cpu_num], 1 * SEC_PER_MIN, &value, &error);
+	}
 	else if (0 == strcmp(tmp, "avg5"))
-		value = compute_average_value(collector->cpus.cpu_counter[cpu_num], 5 * SEC_PER_MIN);
+	{
+		ret = get_perf_counter_value(collector->cpus.cpu_counter[cpu_num], 5 * SEC_PER_MIN, &value, &error);
+	}
 	else if (0 == strcmp(tmp, "avg15"))
-		value = compute_average_value(collector->cpus.cpu_counter[cpu_num], USE_DEFAULT_INTERVAL);
+	{
+		ret = get_perf_counter_value(collector->cpus.cpu_counter[cpu_num], 15 * SEC_PER_MIN, &value, &error);
+	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	SET_DBL_RESULT(result, value);
+	if (SUCCEED == ret)
+	{
+		SET_DBL_RESULT(result, value);
+		return SYSINFO_RET_OK;
+	}
 
-	return SYSINFO_RET_OK;
+	SET_MSG_RESULT(result, NULL != error ? error :
+			zbx_strdup(NULL, "Cannot obtain performance information from collector."));
+
+	return SYSINFO_RET_FAIL;
 }
 
 int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	char	*tmp;
+	char	*tmp, *error = NULL;
 	double	value;
-	int	per_cpu = 1, cpu_num;
+	int	cpu_num, ret = FAIL;
 
-	if (!CPU_COLLECTOR_STARTED(collector))
+	if (0 == CPU_COLLECTOR_STARTED(collector))
 	{
-		SET_MSG_RESULT(result, strdup("Collector is not started!"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
 		return SYSINFO_RET_FAIL;
 	}
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	tmp = get_rparam(request, 0);
-
-	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "all"))
-		per_cpu = 0;
-	else if (0 != strcmp(tmp, "percpu"))
-		return SYSINFO_RET_FAIL;
-
-	if (PERF_COUNTER_ACTIVE != collector->cpus.queue_counter->status)
+	if (NULL == (tmp = get_rparam(request, 0)) || '\0' == *tmp || 0 == strcmp(tmp, "all"))
+	{
+		cpu_num = 1;
+	}
+	else if (0 == strcmp(tmp, "percpu"))
+	{
+		if (0 >= (cpu_num = get_cpu_num()))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain number of CPUs."));
+			return SYSINFO_RET_FAIL;
+		}
+	}
+	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	tmp = get_rparam(request, 1);
-
-	if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "avg1"))
-		value = compute_average_value(collector->cpus.queue_counter, 1 * SEC_PER_MIN);
+	if (NULL == (tmp = get_rparam(request, 1)) || '\0' == *tmp || 0 == strcmp(tmp, "avg1"))
+	{
+		ret = get_perf_counter_value(collector->cpus.queue_counter, 1 * SEC_PER_MIN, &value, &error);
+	}
 	else if (0 == strcmp(tmp, "avg5"))
-		value = compute_average_value(collector->cpus.queue_counter, 5 * SEC_PER_MIN);
+	{
+		ret = get_perf_counter_value(collector->cpus.queue_counter, 5 * SEC_PER_MIN, &value, &error);
+	}
 	else if (0 == strcmp(tmp, "avg15"))
-		value = compute_average_value(collector->cpus.queue_counter, USE_DEFAULT_INTERVAL);
+	{
+		ret = get_perf_counter_value(collector->cpus.queue_counter, 15 * SEC_PER_MIN, &value, &error);
+	}
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	if (1 == per_cpu)
+	if (SUCCEED == ret)
 	{
-		if (0 >= (cpu_num = get_cpu_num()))
-			return SYSINFO_RET_FAIL;
-		value /= cpu_num;
+		SET_DBL_RESULT(result, value / cpu_num);
+		return SYSINFO_RET_OK;
 	}
 
-	SET_DBL_RESULT(result, value);
+	SET_MSG_RESULT(result, NULL != error ? error :
+			zbx_strdup(NULL, "Cannot obtain performance information from collector."));
 
-	return SYSINFO_RET_OK;
+	return SYSINFO_RET_FAIL;
 }
diff --git a/src/libs/zbxsysinfo/win32/diskspace.c b/src/libs/zbxsysinfo/win32/diskspace.c
index 0118e6817d2..8f6bef81898 100644
--- a/src/libs/zbxsysinfo/win32/diskspace.c
+++ b/src/libs/zbxsysinfo/win32/diskspace.c
@@ -24,22 +24,29 @@
 int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	char		*path, *mode;
-	LPTSTR		wpath;
+	wchar_t 	*wpath;
 	ULARGE_INTEGER	freeBytes, totalBytes;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	path = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == path || '\0' == *path)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	wpath = zbx_utf8_to_unicode(path);
 	if (0 == GetDiskFreeSpaceEx(wpath, &freeBytes, &totalBytes, NULL))
 	{
 		zbx_free(wpath);
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain filesystem information."));
 		return SYSINFO_RET_FAIL;
 	}
 	zbx_free(wpath);
@@ -56,15 +63,18 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		SET_DBL_RESULT(result, (double)((__int64)totalBytes.QuadPart - (__int64)freeBytes.QuadPart) * 100. /
 				(double)(__int64)totalBytes.QuadPart);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
 
 int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
-	TCHAR		fsName[MAX_PATH + 1];
-	LPTSTR		buffer = NULL, p;
+	wchar_t		fsName[MAX_PATH + 1];
+	wchar_t 	*buffer = NULL, *p;
 	char		*utf8;
 	DWORD		dwSize;
 	size_t		sz;
@@ -73,15 +83,19 @@ int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 	/* Make an initial call to GetLogicalDriveStrings to
 	   get the necessary size into the dwSize variable */
 	if (0 == (dwSize = GetLogicalDriveStrings(0, buffer)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain necessary buffer size from system."));
 		return SYSINFO_RET_FAIL;
+	}
 
-	buffer = (LPTSTR)zbx_malloc(buffer, (dwSize + 1) * sizeof(TCHAR));
+	buffer = (wchar_t *)zbx_malloc(buffer, (dwSize + 1) * sizeof(wchar_t));
 
 	/* Make a second call to GetLogicalDriveStrings to get
 	   the actual data we require */
 	if (0 == (dwSize = GetLogicalDriveStrings(dwSize, buffer)))
 	{
 		zbx_free(buffer);
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain a list of filesystems."));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -102,7 +116,7 @@ int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 		zbx_json_addstring(&j, "{#FSNAME}", utf8, ZBX_JSON_TYPE_STRING);
 		zbx_free(utf8);
 
-		if (TRUE == GetVolumeInformation(p, NULL, 0, NULL, NULL, NULL, fsName, sizeof(fsName) / sizeof(TCHAR)))
+		if (TRUE == GetVolumeInformation(p, NULL, 0, NULL, NULL, NULL, fsName, ARRSIZE(fsName)))
 		{
 			utf8 = zbx_unicode_to_utf8(fsName);
 			zbx_json_addstring(&j, "{#FSTYPE}", utf8, ZBX_JSON_TYPE_STRING);
@@ -118,7 +132,7 @@ int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	zbx_json_close(&j);
 
-	SET_STR_RESULT(result, strdup(j.buffer));
+	SET_STR_RESULT(result, zbx_strdup(NULL, j.buffer));
 
 	zbx_json_free(&j);
 
diff --git a/src/libs/zbxsysinfo/win32/hostname.c b/src/libs/zbxsysinfo/win32/hostname.c
index 70fa078cf04..5d538b50069 100644
--- a/src/libs/zbxsysinfo/win32/hostname.c
+++ b/src/libs/zbxsysinfo/win32/hostname.c
@@ -27,13 +27,16 @@ ZBX_METRIC	parameter_hostname =
 int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	DWORD	dwSize = 256;
-	TCHAR	computerName[256];
+	wchar_t	computerName[256];
 	char	*type, buffer[256];
-	int	netbios, ret;
+	int	netbios, rc;
 	WSADATA sockInfo;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	type = get_rparam(request, 0);
 
@@ -42,7 +45,10 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(type, "host"))
 		netbios = 0;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (1 == netbios)
 	{
@@ -50,22 +56,34 @@ int	SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 		/* characters. MAX_COMPUTERNAME_LENGTH is usually less than 32, but it varies among systems, so we  */
 		/* cannot use the constant in a precompiled Windows agent, which is expected to work on any system. */
 		if (0 == GetComputerName(computerName, &dwSize))
+		{
 			zabbix_log(LOG_LEVEL_ERR, "GetComputerName() failed: %s", strerror_from_system(GetLastError()));
-		else
-			SET_STR_RESULT(result, zbx_unicode_to_utf8(computerName));
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain computer name: %s",
+					strerror_from_system(GetLastError())));
+			return SYSINFO_RET_FAIL;
+		}
+
+		SET_STR_RESULT(result, zbx_unicode_to_utf8(computerName));
 	}
 	else
 	{
-		if (0 != (ret = WSAStartup(MAKEWORD(2, 2), &sockInfo)))
-			zabbix_log(LOG_LEVEL_ERR, "WSAStartup() failed: %s", strerror_from_system(ret));
+		if (0 != (rc = WSAStartup(MAKEWORD(2, 2), &sockInfo)))
+		{
+			zabbix_log(LOG_LEVEL_ERR, "WSAStartup() failed: %s", strerror_from_system(rc));
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot initialize Winsock DLL: %s",
+					strerror_from_system(rc)));
+			return SYSINFO_RET_FAIL;
+		}
 		else if (SUCCEED != gethostname(buffer, sizeof(buffer)))
+		{
 			zabbix_log(LOG_LEVEL_ERR, "gethostname() failed: %s", strerror_from_system(WSAGetLastError()));
-		else
-			SET_STR_RESULT(result, zbx_strdup(NULL, buffer));
-	}
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain host name: %s",
+					strerror_from_system(WSAGetLastError())));
+			return SYSINFO_RET_FAIL;
+		}
 
-	if (ISSET_STR(result))
-		return SYSINFO_RET_OK;
+		SET_STR_RESULT(result, zbx_strdup(NULL, buffer));
+	}
 
-	return SYSINFO_RET_FAIL;
+	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/win32/memory.c b/src/libs/zbxsysinfo/win32/memory.c
index 66205002724..8c10af290dc 100644
--- a/src/libs/zbxsysinfo/win32/memory.c
+++ b/src/libs/zbxsysinfo/win32/memory.c
@@ -29,14 +29,20 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char			*mode;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	mode = get_rparam(request, 0);
 
 	if (NULL != mode && 0 == strcmp(mode, "cached"))
 	{
 		if (NULL == zbx_GetPerformanceInfo)
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain system information."));
 			return SYSINFO_RET_FAIL;
+		}
 
 		zbx_GetPerformanceInfo(&pfi, sizeof(PERFORMANCE_INFORMATION));
 
@@ -64,7 +70,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		else if (0 == strcmp(mode, "pavailable") && 0 != ms_ex.ullTotalPhys)
 			SET_DBL_RESULT(result, ms_ex.ullAvailPhys / (double)ms_ex.ullTotalPhys * 100);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 	else
 	{
@@ -83,7 +92,10 @@ int     VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 		else if (0 == strcmp(mode, "pavailable") && 0 != ms.dwTotalPhys)
 			SET_DBL_RESULT(result, ms.dwAvailPhys / (double)ms.dwTotalPhys * 100);
 		else
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 			return SYSINFO_RET_FAIL;
+		}
 	}
 
 	return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/win32/net.c b/src/libs/zbxsysinfo/win32/net.c
index 6e1bd37303e..4eb5ffd20eb 100644
--- a/src/libs/zbxsysinfo/win32/net.c
+++ b/src/libs/zbxsysinfo/win32/net.c
@@ -25,19 +25,19 @@
 /*
  * returns interface description encoded in UTF-8 format
  */
-static LPSTR	get_if_description(MIB_IFROW *pIfRow)
+static char	*get_if_description(MIB_IFROW *pIfRow)
 {
-	static LPTSTR	(*mb_to_unicode)(LPCSTR) = NULL;
-	LPTSTR		wdescr;
-	LPSTR		utf8_descr;
+	static wchar_t *(*mb_to_unicode)(const char *) = NULL;
+	wchar_t 	*wdescr;
+	char		*utf8_descr;
 
 	if (NULL == mb_to_unicode)
 	{
-		OSVERSIONINFO	version_info = {sizeof(OSVERSIONINFO)};
+		const OSVERSIONINFOEX	*vi;
 
 		/* starting with Windows Vista (Windows Server 2008) the interface description */
 		/* is encoded in OEM codepage while earlier versions used ANSI codepage */
-		if (TRUE == GetVersionEx(&version_info) && 6 <= version_info.dwMajorVersion)
+		if (NULL != (vi = zbx_win_getversion()) && 6 <= vi->dwMajorVersion)
 			mb_to_unicode = zbx_oemcp_to_unicode;
 		else
 			mb_to_unicode = zbx_acp_to_unicode;
@@ -99,7 +99,7 @@ static int	get_if_stats(const char *if_name, MIB_IFROW *pIfRow)
 
 	for (i = 0; i < pIfTable->dwNumEntries; i++)
 	{
-		LPSTR	utf8_descr;
+		char	*utf8_descr;
 
 		pIfRow->dwIndex = pIfTable->table[i].dwIndex;
 		if (NO_ERROR != (dwRetVal = GetIfEntry(pIfRow)))
@@ -147,16 +147,25 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	MIB_IFROW	pIfRow;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (FAIL == get_if_stats(if_name, &pIfRow))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain network interface information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, pIfRow.dwInOctets);
@@ -167,7 +176,10 @@ int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, pIfRow.dwInDiscards + pIfRow.dwInUnknownProtos);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -178,16 +190,25 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	MIB_IFROW	pIfRow;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (FAIL == get_if_stats(if_name, &pIfRow))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain network interface information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, pIfRow.dwOutOctets);
@@ -198,7 +219,10 @@ int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "dropped"))
 		SET_UI64_RESULT(result, pIfRow.dwOutDiscards);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -209,16 +233,25 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 	MIB_IFROW	pIfRow;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if_name = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	if (NULL == if_name || '\0' == *if_name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (FAIL == get_if_stats(if_name, &pIfRow))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain network interface information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "bytes"))	/* default parameter */
 		SET_UI64_RESULT(result, pIfRow.dwInOctets + pIfRow.dwOutOctets);
@@ -231,7 +264,10 @@ int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result)
 		SET_UI64_RESULT(result, pIfRow.dwInDiscards + pIfRow.dwInUnknownProtos +
 				pIfRow.dwOutDiscards);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
@@ -244,11 +280,7 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 	MIB_IFTABLE	*pIfTable = NULL;
 	MIB_IFROW	pIfRow;
 	struct zbx_json	j;
-	LPSTR		utf8_descr;
-
-	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
-
-	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
+	char 		*utf8_descr;
 
 	/* Allocate memory for our pointers. */
 	dwSize = sizeof(MIB_IFTABLE);
@@ -264,9 +296,15 @@ int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
 	if (NO_ERROR != (dwRetVal = GetIfTable(pIfTable, &dwSize, 0)))
 	{
 		zabbix_log(LOG_LEVEL_DEBUG, "GetIfTable failed with error: %s", strerror_from_system(dwRetVal));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s",
+				strerror_from_system(dwRetVal)));
 		goto clean;
 	}
 
+	zbx_json_init(&j, ZBX_JSON_STAT_BUF_LEN);
+
+	zbx_json_addarray(&j, ZBX_PROTO_TAG_DATA);
+
 	for (i = 0; i < pIfTable->dwNumEntries; i++)
 	{
 		pIfRow.dwIndex = pIfTable->table[i].dwIndex;
@@ -352,6 +390,8 @@ int	NET_IF_LIST(AGENT_REQUEST *request, AGENT_RESULT *result)
 	if (NO_ERROR != (dwRetVal = GetIpAddrTable(pIPAddrTable, &dwSize, 0)))
 	{
 		zabbix_log(LOG_LEVEL_DEBUG, "GetIpAddrTable failed with error: %s", strerror_from_system(dwRetVal));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain IP address information: %s",
+				strerror_from_system(dwRetVal)));
 		goto clean;
 	}
 
@@ -369,6 +409,8 @@ int	NET_IF_LIST(AGENT_REQUEST *request, AGENT_RESULT *result)
 	if (NO_ERROR != (dwRetVal = GetIfTable(pIfTable, &dwSize, 0)))
 	{
 		zabbix_log(LOG_LEVEL_DEBUG, "GetIfTable failed with error: %s", strerror_from_system(dwRetVal));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain network interface information: %s",
+				strerror_from_system(dwRetVal)));
 		goto clean;
 	}
 
@@ -378,7 +420,7 @@ int	NET_IF_LIST(AGENT_REQUEST *request, AGENT_RESULT *result)
 	{
 		for (i = 0; i < (int)pIfTable->dwNumEntries; i++)
 		{
-			LPSTR	utf8_descr;
+			char	*utf8_descr;
 
 			pIfRow.dwIndex = pIfTable->table[i].dwIndex;
 			if (NO_ERROR != (dwRetVal = GetIfEntry(&pIfRow)))
@@ -431,12 +473,18 @@ int	NET_TCP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char		*port_str;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	port_str = get_rparam(request, 0);
 
 	if (NULL == port_str || SUCCEED != is_ushort(port_str, &port))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	dwSize = sizeof(MIB_TCPTABLE);
 	pTcpTable = (MIB_TCPTABLE *)zbx_malloc(pTcpTable, dwSize);
@@ -464,6 +512,8 @@ int	NET_TCP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else
 	{
 		zabbix_log(LOG_LEVEL_DEBUG, "GetTcpTable failed with error: %s", strerror_from_system(dwRetVal));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot obtain system information: %s",
+				strerror_from_system(dwRetVal)));
 		goto clean;
 	}
 
diff --git a/src/libs/zbxsysinfo/win32/pdhmon.c b/src/libs/zbxsysinfo/win32/pdhmon.c
index 2370cfab95e..cbabe5e4e2b 100644
--- a/src/libs/zbxsysinfo/win32/pdhmon.c
+++ b/src/libs/zbxsysinfo/win32/pdhmon.c
@@ -26,52 +26,35 @@
 int	USER_PERF_COUNTER(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	const char		*__function_name = "USER_PERF_COUNTER";
-	PERF_COUNTER_DATA	*perfs = NULL;
 	int			ret = SYSINFO_RET_FAIL;
+	char			*counter, *error = NULL;
 	double			value;
-	char			*counter;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	if (1 != request->nparam)
-		return SYSINFO_RET_FAIL;
-
-	counter = get_rparam(request, 0);
-
-	if (NULL == counter || '\0' == *counter)
-		return SYSINFO_RET_FAIL;
-
-	if (SUCCEED != perf_collector_started())
 	{
-		zabbix_log(LOG_LEVEL_DEBUG, "Collector is not started!");
-		return ret;
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid number of parameters."));
+		goto out;
 	}
 
-	for (perfs = ppsd.pPerfCounterList; NULL != perfs; perfs = perfs->next)
+	if (NULL == (counter = get_rparam(request, 0)) || '\0' == *counter)
 	{
-		if (NULL != perfs->name && 0 == strcmp(perfs->name, counter))
-		{
-			if (PERF_COUNTER_ACTIVE == perfs->status)
-			{
-				SET_DBL_RESULT(result, compute_average_value(perfs, USE_DEFAULT_INTERVAL));
-				ret = SYSINFO_RET_OK;
-			}
-
-			break;
-		}
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		goto out;
 	}
 
-	if (SYSINFO_RET_OK != ret && NULL != perfs)
+	if (SUCCEED != get_perf_counter_value_by_name(counter, &value, &error))
 	{
-		if (ERROR_SUCCESS == calculate_counter_value(__function_name, perfs->counterpath, &value))
-		{
-			perfs->status = PERF_COUNTER_INITIALIZED;
-			SET_DBL_RESULT(result, value);
-			ret = SYSINFO_RET_OK;
-		}
+		SET_MSG_RESULT(result, error != NULL ? error :
+				zbx_strdup(NULL, "Cannot obtain performance information from collector."));
+		goto out;
 	}
 
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+	SET_DBL_RESULT(result, value);
+	ret = SYSINFO_RET_OK;
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
 	return ret;
 }
@@ -79,68 +62,61 @@ int	USER_PERF_COUNTER(AGENT_REQUEST *request, AGENT_RESULT *result)
 int	PERF_COUNTER(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	const char		*__function_name = "PERF_COUNTER";
-	char			counterpath[PDH_MAX_COUNTER_PATH], *tmp;
+	char			counterpath[PDH_MAX_COUNTER_PATH], *tmp, *error = NULL;
 	int			interval, ret = SYSINFO_RET_FAIL;
 	double			value;
-	PERF_COUNTER_DATA	*perfs = NULL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	if (2 < request->nparam)
-		goto clean;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
+		goto out;
+	}
 
 	tmp = get_rparam(request, 0);
 
 	if (NULL == tmp || '\0' == *tmp)
-		goto clean;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
+		goto out;
+	}
 
 	strscpy(counterpath, tmp);
 
-	tmp = get_rparam(request, 1);
-
-	if (NULL == tmp || '\0' == *tmp)
+	if (NULL == (tmp = get_rparam(request, 1)) || '\0' == *tmp)
+	{
 		interval = 1;
+	}
 	else if (FAIL == is_uint31(tmp, &interval))
-		goto clean;
-
-	if (FAIL == check_counter_path(counterpath))
-		goto clean;
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+		goto out;
+	}
 
-	if (1 < interval)
+	if (1 > interval || MAX_COLLECTOR_PERIOD < interval)
 	{
-		if (SUCCEED != perf_collector_started())
-		{
-			zabbix_log(LOG_LEVEL_DEBUG, "Collector is not started!");
-			goto clean;
-		}
-
-		for (perfs = ppsd.pPerfCounterList; NULL != perfs; perfs = perfs->next)
-		{
-			if (0 == strcmp(perfs->counterpath, counterpath) && perfs->interval == interval)
-			{
-				if (PERF_COUNTER_ACTIVE != perfs->status)
-					break;
-
-				SET_DBL_RESULT(result, compute_average_value(perfs, USE_DEFAULT_INTERVAL));
-				ret = SYSINFO_RET_OK;
-				goto clean;
-			}
-		}
-
-		if (NULL == perfs && NULL == (perfs = add_perf_counter(NULL, counterpath, interval)))
-			goto clean;
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Interval out of range."));
+		goto out;
 	}
 
-	if (ERROR_SUCCESS == calculate_counter_value(__function_name, counterpath, &value))
+	if (FAIL == check_counter_path(counterpath))
 	{
-		if (NULL != perfs)
-			perfs->status = PERF_COUNTER_INITIALIZED;
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid performance counter path."));
+		goto out;
+	}
 
-		SET_DBL_RESULT(result, value);
-		ret = SYSINFO_RET_OK;
+	if (SUCCEED != get_perf_counter_value_by_path(counterpath, interval, &value, &error))
+	{
+		SET_MSG_RESULT(result, error != NULL ? error :
+				zbx_strdup(NULL, "Cannot obtain performance information from collector."));
+		goto out;
 	}
-clean:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+
+	ret = SYSINFO_RET_OK;
+	SET_DBL_RESULT(result, value);
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/win32/proc.c b/src/libs/zbxsysinfo/win32/proc.c
index a265731ec43..f8484f74017 100644
--- a/src/libs/zbxsysinfo/win32/proc.c
+++ b/src/libs/zbxsysinfo/win32/proc.c
@@ -23,23 +23,20 @@
 #include "symbols.h"
 #include "log.h"
 
-#define MAX_PROCESSES		4096
-/*#define MAX_MODULES		512*/
-#define MAX_NAME		256
+#define MAX_PROCESSES	4096
+#define MAX_NAME	256
 
 /* function 'zbx_get_processname' require 'baseName' with size 'MAX_NAME' */
 static int	zbx_get_processname(HANDLE hProcess, char *baseName)
 {
 	HMODULE	hMod;
 	DWORD	dwSize;
-	TCHAR	name[MAX_NAME];
-/*			if (0 != EnumProcessModules(hProcess, modList, sizeof(HMODULE) * MAX_MODULES, &dwSize))
-				if (0 != GetModuleBaseName(hProcess,modList[0],baseName,sizeof(baseName)))*/
+	wchar_t	name[MAX_NAME];
 
 	if (0 == EnumProcessModules(hProcess, &hMod, sizeof(hMod), &dwSize))
 		return FAIL;
 
-	if (0 == GetModuleBaseName(hProcess, hMod, name, sizeof(name)))
+	if (0 == GetModuleBaseName(hProcess, hMod, name, MAX_NAME))
 		return FAIL;
 
 	zbx_unicode_to_utf8_static(name, baseName, MAX_NAME);
@@ -53,7 +50,7 @@ static int	zbx_get_process_username(HANDLE hProcess, char *userName)
 	HANDLE		tok;
 	TOKEN_USER	*ptu = NULL;
 	DWORD		sz = 0, nlen, dlen;
-	TCHAR		name[MAX_NAME], dom[MAX_NAME];
+	wchar_t		name[MAX_NAME], dom[MAX_NAME];
 	int		iUse, res = FAIL;
 
 	assert(userName);
@@ -107,13 +104,19 @@ int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
 		uname[MAX_NAME];
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	procName = get_rparam(request, 0);
 	userName = get_rparam(request, 1);
 
 	if (0 == EnumProcesses(procList, sizeof(DWORD) * MAX_PROCESSES, &dwSize))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain system information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	max_proc_cnt = dwSize / sizeof(DWORD);
 	proccount = 0;
@@ -309,14 +312,20 @@ int	PROC_INFO(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int		i, proc_cnt, counter, attr_id, type_id, ret = SYSINFO_RET_OK;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	proc_name = get_rparam(request, 0);
 	attr = get_rparam(request, 1);
 	type = get_rparam(request, 2);
 
 	if (NULL == proc_name || '\0' == *proc_name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* Get attribute code from string */
 	if (NULL == attr || '\0' == *attr)
@@ -331,7 +340,10 @@ int	PROC_INFO(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 
 	if (NULL == attrList[attr_id])     /* Unsupported attribute */
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* Get type code from string */
 	if (NULL == type || '\0' == *type)
@@ -345,12 +357,19 @@ int	PROC_INFO(AGENT_REQUEST *request, AGENT_RESULT *result)
 			;
 	}
 
-	if (NULL == typeList[type_id])
-		return SYSINFO_RET_FAIL;     /* Unsupported type */
+	if (NULL == typeList[type_id])	/* Unsupported type */
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	procList = (DWORD *)malloc(MAX_PROCESSES * sizeof(DWORD));
 
-	EnumProcesses(procList, sizeof(DWORD) * MAX_PROCESSES, &dwSize);
+	if (0 == EnumProcesses(procList, sizeof(DWORD) * MAX_PROCESSES, &dwSize))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain system information."));
+		return SYSINFO_RET_FAIL;
+	}
 
 	proc_cnt = dwSize / sizeof(DWORD);
 	counter = 0;
@@ -372,6 +391,8 @@ int	PROC_INFO(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	if (SYSINFO_RET_OK == ret)
 		SET_DBL_RESULT(result, value);
+	else
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain process information."));
 
 	return ret;
 }
diff --git a/src/libs/zbxsysinfo/win32/services.c b/src/libs/zbxsysinfo/win32/services.c
index 278dcde3fe6..8628037ecb2 100644
--- a/src/libs/zbxsysinfo/win32/services.c
+++ b/src/libs/zbxsysinfo/win32/services.c
@@ -25,22 +25,31 @@ int	SERVICE_STATE(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	SC_HANDLE	mgr, service;
 	char		*name;
-	LPTSTR		wname;
-	TCHAR		service_name[MAX_STRING_LEN];
+	wchar_t		*wname;
+	wchar_t		service_name[MAX_STRING_LEN];
 	DWORD		max_len_name = MAX_STRING_LEN;
 	int		i, ret = SYSINFO_RET_FAIL;
 	SERVICE_STATUS	status;
 
 	if (1 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	name = get_rparam(request, 0);
 
 	if (NULL == name || '\0' == *name)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == (mgr = OpenSCManager(NULL, NULL, GENERIC_READ)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain system information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	wname = zbx_utf8_to_unicode(name);
 
@@ -184,7 +193,10 @@ int	SERVICES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	DWORD				sz = 0, szn, i, services, resume_handle = 0;
 
 	if (3 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	type = get_rparam(request, 0);
 	state = get_rparam(request, 1);
@@ -199,7 +211,10 @@ int	SERVICES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(type, "disabled"))
 		start_type = ZBX_SRV_STARTTYPE_DISABLED;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == state || '\0' == *state || 0 == strcmp(state, "all"))	/* default parameter */
 		service_state = ZBX_SRV_STATE_ALL;
@@ -220,13 +235,19 @@ int	SERVICES(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(state, "paused"))
 		service_state = ZBX_SRV_STATE_PAUSED;
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL == (h_mgr = OpenSCManager(NULL, NULL, GENERIC_READ)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain system information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	while (0 != (ret = EnumServicesStatusEx(h_mgr, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL,
-			(LPBYTE)ssp, sz, &szn, &services, &resume_handle, NULL)) || ERROR_MORE_DATA == GetLastError())
+			(unsigned char *)ssp, sz, &szn, &services, &resume_handle, NULL)) || ERROR_MORE_DATA == GetLastError())
 	{
 		for (i = 0; i < services; i++)
 		{
diff --git a/src/libs/zbxsysinfo/win32/software.c b/src/libs/zbxsysinfo/win32/software.c
index 98c9d8e2d78..ce77886510a 100644
--- a/src/libs/zbxsysinfo/win32/software.c
+++ b/src/libs/zbxsysinfo/win32/software.c
@@ -46,6 +46,7 @@ int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result)
 			arch = "Intel Itanium-based";
 			break;
 		default:
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Unknown processor architecture."));
 			return SYSINFO_RET_FAIL;
 	}
 
diff --git a/src/libs/zbxsysinfo/win32/swap.c b/src/libs/zbxsysinfo/win32/swap.c
index 5336537e163..0d6926b138d 100644
--- a/src/libs/zbxsysinfo/win32/swap.c
+++ b/src/libs/zbxsysinfo/win32/swap.c
@@ -29,14 +29,20 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char		*swapdev, *mode;
 
 	if (2 < request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	swapdev = get_rparam(request, 0);
 	mode = get_rparam(request, 1);
 
 	/* only 'all' parameter supported */
 	if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/***************************************************************************
 	 *                                                                         *
@@ -105,7 +111,10 @@ int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 	else if (0 == strcmp(mode, "used"))
 		SET_UI64_RESULT(result, real_swap_total - real_swap_avail);
 	else
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	return SYSINFO_RET_OK;
 }
diff --git a/src/libs/zbxsysinfo/win32/system.c b/src/libs/zbxsysinfo/win32/system.c
index dbac07c9990..3a9a6ac038e 100644
--- a/src/libs/zbxsysinfo/win32/system.c
+++ b/src/libs/zbxsysinfo/win32/system.c
@@ -22,7 +22,7 @@
 #include "perfmon.h"
 #pragma comment(lib, "user32.lib")
 
-static void	get_50_version(char **os, size_t *os_alloc, size_t *os_offset, OSVERSIONINFOEX *vi)
+static void	get_50_version(char **os, size_t *os_alloc, size_t *os_offset, const OSVERSIONINFOEX *vi)
 {
 	zbx_strcpy_alloc(os, os_alloc, os_offset, " Microsoft Windows 2000");
 
@@ -40,7 +40,7 @@ static void	get_50_version(char **os, size_t *os_alloc, size_t *os_offset, OSVER
 
 }
 
-static void	get_51_version(char **os, size_t *os_alloc, size_t *os_offset, OSVERSIONINFOEX *vi)
+static void	get_51_version(char **os, size_t *os_alloc, size_t *os_offset, const OSVERSIONINFOEX *vi)
 {
 	zbx_strcpy_alloc(os, os_alloc, os_offset, " Microsoft Windows XP");
 
@@ -56,7 +56,8 @@ static void	get_51_version(char **os, size_t *os_alloc, size_t *os_offset, OSVER
 		zbx_strcpy_alloc(os, os_alloc, os_offset, " Professional");
 }
 
-static void	get_52_version(char **os, size_t *os_alloc, size_t *os_offset, OSVERSIONINFOEX *vi, SYSTEM_INFO *si)
+static void	get_52_version(char **os, size_t *os_alloc, size_t *os_offset, const OSVERSIONINFOEX *vi,
+		const SYSTEM_INFO *si)
 {
 	zbx_strcpy_alloc(os, os_alloc, os_offset, " Microsoft Windows");
 
@@ -84,7 +85,8 @@ static void	get_52_version(char **os, size_t *os_alloc, size_t *os_offset, OSVER
 	}
 }
 
-static void	get_6x_version(char **os, size_t *os_alloc, size_t *os_offset, OSVERSIONINFOEX *vi, SYSTEM_INFO *si)
+static void	get_6x_version(char **os, size_t *os_alloc, size_t *os_offset, const OSVERSIONINFOEX *vi,
+		const SYSTEM_INFO *si)
 {
 	typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
 
@@ -106,6 +108,9 @@ static void	get_6x_version(char **os, size_t *os_alloc, size_t *os_offset, OSVER
 			case 2:
 				zbx_strcpy_alloc(os, os_alloc, os_offset, " 8");
 				break;
+			case 3:
+				zbx_strcpy_alloc(os, os_alloc, os_offset, " 8.1");
+				break;
 		}
 	}
 	else
@@ -121,6 +126,9 @@ static void	get_6x_version(char **os, size_t *os_alloc, size_t *os_offset, OSVER
 			case 2:
 				zbx_strcpy_alloc(os, os_alloc, os_offset, " Server 2012");
 				break;
+			case 3:
+				zbx_strcpy_alloc(os, os_alloc, os_offset, " Server 2012 R2");
+				break;
 		}
 	}
 
@@ -186,7 +194,7 @@ static void	get_6x_version(char **os, size_t *os_alloc, size_t *os_offset, OSVER
 	}
 }
 
-static void	get_cpu_type(char **os, size_t *os_alloc, size_t *os_offset, SYSTEM_INFO *si)
+static void	get_cpu_type(char **os, size_t *os_alloc, size_t *os_offset, const SYSTEM_INFO *si)
 {
 	switch (si->wProcessorArchitecture)
 	{
@@ -202,17 +210,146 @@ static void	get_cpu_type(char **os, size_t *os_alloc, size_t *os_offset, SYSTEM_
 	}
 }
 
+/******************************************************************************
+ *                                                                            *
+ * Function: read_registry_value                                              *
+ *                                                                            *
+ * Purpose: read value from Windows registry                                  *
+ *                                                                            *
+ ******************************************************************************/
+static wchar_t	*read_registry_value(HKEY hKey, LPCTSTR name)
+{
+	DWORD	szData;
+	wchar_t	*value = NULL;
+
+	if (ERROR_SUCCESS == RegQueryValueEx(hKey, name, NULL, NULL, NULL, &szData))
+	{
+		value = zbx_malloc(NULL, szData);
+		if (ERROR_SUCCESS != RegQueryValueEx(hKey, name, NULL, NULL, (LPBYTE)value, &szData))
+			zbx_free(value);
+	}
+
+	return value;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_win_getversion                                               *
+ *                                                                            *
+ * Purpose: get Windows version information                                   *
+ *                                                                            *
+ ******************************************************************************/
+const OSVERSIONINFOEX		*zbx_win_getversion()
+{
+#	define ZBX_REGKEY_VERSION		"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"
+#	define ZBX_REGVALUE_CURRENTVERSION	"CurrentVersion"
+#	define ZBX_REGVALUE_CURRENTBUILDNUMBER	"CurrentBuildNumber"
+#	define ZBX_REGVALUE_CSDVERSION		"CSDVersion"
+
+#	define ZBX_REGKEY_PRODUCT		"System\\CurrentControlSet\\Control\\ProductOptions"
+#	define ZBX_REGVALUE_PRODUCTTYPE		"ProductType"
+
+	static OSVERSIONINFOEX	vi = {sizeof(OSVERSIONINFOEX)};
+
+	OSVERSIONINFOEX		*pvi = NULL;
+	HKEY			h_key_registry = NULL;
+	wchar_t			*key_value = NULL, *ptr;
+
+	if (0 != vi.dwMajorVersion)
+		return &vi;
+
+	if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT(ZBX_REGKEY_VERSION), 0, KEY_READ, &h_key_registry))
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "failed to open registry key '%s'", ZBX_REGKEY_VERSION);
+		goto out;
+	}
+
+	if (NULL == (key_value = read_registry_value(h_key_registry, TEXT(ZBX_REGVALUE_CURRENTVERSION))))
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "failed to read registry value '%s'", ZBX_REGVALUE_CURRENTVERSION);
+		goto out;
+	}
+
+	if (NULL != (ptr = wcschr(key_value, TEXT('.'))))
+	{
+		*ptr++ = L'\0';
+		vi.dwMinorVersion = _wtoi(ptr);
+	}
+
+	vi.dwMajorVersion = _wtoi(key_value);
+
+	zbx_free(key_value);
+
+	if (6 > vi.dwMajorVersion || 2 > vi.dwMinorVersion)
+	{
+		GetVersionEx((OSVERSIONINFO *)&vi);
+	}
+	else
+	{
+		if (NULL != (key_value = read_registry_value(h_key_registry, TEXT(ZBX_REGVALUE_CSDVERSION))))
+		{
+			wcscpy_s(vi.szCSDVersion, sizeof(vi.szCSDVersion) / sizeof(*vi.szCSDVersion), key_value);
+
+			zbx_free(key_value);
+		}
+
+		if (NULL == (key_value = read_registry_value(h_key_registry, TEXT(ZBX_REGVALUE_CURRENTBUILDNUMBER))))
+		{
+			zabbix_log(LOG_LEVEL_DEBUG, "failed to read registry value '%s'",
+					ZBX_REGVALUE_CURRENTBUILDNUMBER);
+			goto out;
+		}
+
+		vi.dwBuildNumber = _wtoi(key_value);
+		zbx_free(key_value);
+
+		RegCloseKey(h_key_registry);
+		h_key_registry = NULL;
+
+		if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT(ZBX_REGKEY_PRODUCT), 0, KEY_READ,
+				&h_key_registry))
+		{
+			zabbix_log(LOG_LEVEL_DEBUG, "failed to open registry key '%s'", ZBX_REGKEY_PRODUCT);
+			goto out;
+		}
+
+		if (NULL == (key_value = read_registry_value(h_key_registry, TEXT(ZBX_REGVALUE_PRODUCTTYPE))))
+		{
+			zabbix_log(LOG_LEVEL_DEBUG, "failed to read registry value '%s'", ZBX_REGVALUE_PRODUCTTYPE);
+			goto out;
+		}
+
+		if (0 == wcscmp(key_value, L"WinNT"))
+			vi.wProductType = 1;
+		else if (0 == wcscmp(key_value, L"LenmanNT"))
+			vi.wProductType = 2;
+		else if (0 == wcscmp(key_value, L"ServerNT"))
+			vi.wProductType = 3;
+
+		zbx_free(key_value);
+
+		vi.dwPlatformId = VER_PLATFORM_WIN32_NT;
+	}
+
+	pvi = &vi;
+out:
+	if (NULL != h_key_registry)
+		RegCloseKey(h_key_registry);
+
+	return pvi;
+}
+
 int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 {
 	typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
 
-	DWORD		dwSize = 256;
-	TCHAR		computer_name[256];
-	SYSTEM_INFO	si;
-	OSVERSIONINFOEX	vi;
-	char		*os = NULL, *utf8;
-	size_t		os_alloc = 256, os_offset = 0;
-	PGNSI		pGNSI;
+	DWORD			dwSize = 256;
+	wchar_t			computer_name[256];
+	SYSTEM_INFO		si;
+	const OSVERSIONINFOEX	*vi;
+	char			*os = NULL, *utf8;
+	size_t			os_alloc = 256, os_offset = 0;
+	PGNSI			pGNSI;
 
 	/* Buffer size is chosen large enough to contain any DNS name, not just MAX_COMPUTERNAME_LENGTH + 1 */
 	/* characters. MAX_COMPUTERNAME_LENGTH is usually less than 32, but it varies among systems, so we  */
@@ -221,11 +358,12 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 		*computer_name = '\0';
 
 	memset(&si, 0, sizeof(si));
-	memset(&vi, 0, sizeof(vi));
 
-	vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-	if (TRUE != GetVersionEx((OSVERSIONINFO *)&vi))
+	if (NULL == (vi = zbx_win_getversion()))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain system information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (NULL != (pGNSI = (PGNSI)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetNativeSystemInfo")))
 		pGNSI(&si);
@@ -244,35 +382,35 @@ int	SYSTEM_UNAME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	}
 
 	zbx_snprintf_alloc(&os, &os_alloc, &os_offset, " %d.%d.%d",
-			vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber);
+			vi->dwMajorVersion, vi->dwMinorVersion, vi->dwBuildNumber);
 
-	if (VER_PLATFORM_WIN32_NT == vi.dwPlatformId)
+	if (VER_PLATFORM_WIN32_NT == vi->dwPlatformId)
 	{
-		switch (vi.dwMajorVersion)
+		switch (vi->dwMajorVersion)
 		{
 			case 5:
-				switch (vi.dwMinorVersion)
+				switch (vi->dwMinorVersion)
 				{
 					case 0:
-						get_50_version(&os, &os_alloc, &os_offset, &vi);
+						get_50_version(&os, &os_alloc, &os_offset, vi);
 						break;
 					case 1:
-						get_51_version(&os, &os_alloc, &os_offset, &vi);
+						get_51_version(&os, &os_alloc, &os_offset, vi);
 						break;
 					case 2:
-						get_52_version(&os, &os_alloc, &os_offset, &vi, &si);
+						get_52_version(&os, &os_alloc, &os_offset, vi, &si);
 						break;
 				}
 				break;
 			case 6:
-				get_6x_version(&os, &os_alloc, &os_offset, &vi, &si);
+				get_6x_version(&os, &os_alloc, &os_offset, vi, &si);
 				break;
 		}
 	}
 
-	if ('\0' != *vi.szCSDVersion)
+	if ('\0' != *vi->szCSDVersion)
 	{
-		utf8 = zbx_unicode_to_utf8(vi.szCSDVersion);
+		utf8 = zbx_unicode_to_utf8(vi->szCSDVersion);
 		zbx_snprintf_alloc(&os, &os_alloc, &os_offset, " %s", utf8);
 		zbx_free(utf8);
 	}
diff --git a/src/libs/zbxsysinfo/win32/uptime.c b/src/libs/zbxsysinfo/win32/uptime.c
index c936768a8c0..d772e236ac0 100644
--- a/src/libs/zbxsysinfo/win32/uptime.c
+++ b/src/libs/zbxsysinfo/win32/uptime.c
@@ -39,11 +39,17 @@ int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result)
 	zbx_free(request_tmp.params);
 
 	if (SYSINFO_RET_FAIL == ret)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain system information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	/* result must be integer to correctly interpret it in frontend (uptime) */
 	if (!GET_UI64_RESULT(result))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid result. Unsigned integer is expected."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	UNSET_RESULT_EXCLUDING(result, AR_UINT64);
 
diff --git a/src/libs/zbxsysinfo/win32/win32.c b/src/libs/zbxsysinfo/win32/win32.c
index ff7a69e836c..6cac56d7e34 100644
--- a/src/libs/zbxsysinfo/win32/win32.c
+++ b/src/libs/zbxsysinfo/win32/win32.c
@@ -43,6 +43,7 @@ ZBX_METRIC	parameters_specific[] =
 	{"system.cpu.util",	CF_HAVEPARAMS,	SYSTEM_CPU_UTIL,	"all,system,avg1"},
 	{"system.cpu.load",	CF_HAVEPARAMS,	SYSTEM_CPU_LOAD,	"all,avg1"},
 	{"system.cpu.num",	CF_HAVEPARAMS,	SYSTEM_CPU_NUM,		"online"},
+	{"system.cpu.discovery",0,		SYSTEM_CPU_DISCOVERY,	NULL},
 
 	{"system.sw.arch",	0,		SYSTEM_SW_ARCH,		NULL},
 
diff --git a/src/libs/zbxsysinfo/win32/wmi.cpp b/src/libs/zbxsysinfo/win32/wmi.cpp
index 191ef73833c..f683c18e9d0 100644
--- a/src/libs/zbxsysinfo/win32/wmi.cpp
+++ b/src/libs/zbxsysinfo/win32/wmi.cpp
@@ -35,8 +35,6 @@ static int	com_initialized = 0;
 
 extern "C" int	zbx_co_initialize()
 {
-	static int	initialized = 0;
-
 	if (0 == com_initialized)
 	{
 		HRESULT	hres;
@@ -86,10 +84,16 @@ extern "C" int	WMI_GET(AGENT_REQUEST *request, AGENT_RESULT *result)
 	int			ret = SYSINFO_RET_FAIL;
 
 	if (2 != request->nparam)
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid number of parameters."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (SUCCEED != zbx_co_initialize())
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot initialize COM library."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	wmi_namespace = get_rparam(request, 0);
 	wmi_query = get_rparam(request, 1);
@@ -227,5 +231,9 @@ out:
 	if (0 != pLoc)
 		pLoc->Release();
 
+
+	if (SYSINFO_RET_FAIL == ret)
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain WMI information."));
+
 	return ret;
-};
+}
diff --git a/src/libs/zbxwin32/perfmon.c b/src/libs/zbxwin32/perfmon.c
index 584f93395e5..742423cdce8 100644
--- a/src/libs/zbxwin32/perfmon.c
+++ b/src/libs/zbxwin32/perfmon.c
@@ -22,15 +22,15 @@
 #include "perfmon.h"
 #include "log.h"
 
-static PERF_COUNTER_ID	*PerfCounterList = NULL;
+ZBX_THREAD_LOCAL static PERF_COUNTER_ID	*PerfCounterList = NULL;
 
 PDH_STATUS	zbx_PdhMakeCounterPath(const char *function, PDH_COUNTER_PATH_ELEMENTS *cpe, char *counterpath)
 {
 	DWORD		dwSize = PDH_MAX_COUNTER_PATH;
-	LPTSTR		wcounterPath = NULL;
+	wchar_t		*wcounterPath = NULL;
 	PDH_STATUS	pdh_status;
 
-	wcounterPath = zbx_realloc(wcounterPath, dwSize * sizeof(TCHAR));
+	wcounterPath = zbx_malloc(wcounterPath, sizeof(wchar_t) * PDH_MAX_COUNTER_PATH);
 
 	if (ERROR_SUCCESS != (pdh_status = PdhMakeCounterPath(cpe, wcounterPath, &dwSize, 0)))
 	{
@@ -67,7 +67,7 @@ PDH_STATUS	zbx_PdhAddCounter(const char *function, PERF_COUNTER_DATA *counter, P
 		const char *counterpath, PDH_HCOUNTER *handle)
 {
 	PDH_STATUS	pdh_status = ERROR_SUCCESS;
-	LPTSTR		wcounterPath;
+	wchar_t		*wcounterPath;
 
 	wcounterPath = zbx_utf8_to_unicode(counterpath);
 
@@ -169,14 +169,16 @@ PDH_STATUS	calculate_counter_value(const char *function, const char *counterpath
 		zbx_sleep(1);
 
 		if (ERROR_SUCCESS == (pdh_status = zbx_PdhCollectQueryData(function, counterpath, query)) &&
-				ERROR_SUCCESS == (pdh_status = zbx_PdhGetRawCounterValue(function, counterpath, handle, &rawData2)))
+				ERROR_SUCCESS == (pdh_status = zbx_PdhGetRawCounterValue(function, counterpath,
+				handle, &rawData2)))
 		{
 			pdh_status = PdhCalculateCounterFromRawValue(handle, PDH_FMT_DOUBLE | PDH_FMT_NOCAP100,
 					&rawData2, &rawData, &counterValue);
 		}
 	}
 
-	if (ERROR_SUCCESS != pdh_status || (PDH_CSTATUS_VALID_DATA != counterValue.CStatus && PDH_CSTATUS_NEW_DATA != counterValue.CStatus))
+	if (ERROR_SUCCESS != pdh_status || (PDH_CSTATUS_VALID_DATA != counterValue.CStatus &&
+			PDH_CSTATUS_NEW_DATA != counterValue.CStatus))
 	{
 		if (ERROR_SUCCESS == pdh_status)
 			pdh_status = counterValue.CStatus;
@@ -196,7 +198,7 @@ close_query:
 	return pdh_status;
 }
 
-LPTSTR	get_counter_name(DWORD pdhIndex)
+wchar_t	*get_counter_name(DWORD pdhIndex)
 {
 	const char	*__function_name = "get_counter_name";
 	PERF_COUNTER_ID	*counterName;
@@ -246,7 +248,7 @@ int	check_counter_path(char *counterPath)
 	PDH_STATUS			status;
 	int				is_numeric, ret = FAIL;
 	DWORD				dwSize = 0;
-	LPTSTR				wcounterPath;
+	wchar_t				*wcounterPath;
 
 	wcounterPath = zbx_utf8_to_unicode(counterPath);
 
diff --git a/src/libs/zbxwin32/service.c b/src/libs/zbxwin32/service.c
index 049a75c05b5..30da13f231a 100644
--- a/src/libs/zbxwin32/service.c
+++ b/src/libs/zbxwin32/service.c
@@ -84,9 +84,9 @@ static VOID WINAPI	ServiceCtrlHandler(DWORD ctrlCode)
 	SetServiceStatus(serviceHandle, &serviceStatus);
 }
 
-static VOID WINAPI	ServiceEntry(DWORD argc, LPTSTR *argv)
+static VOID WINAPI	ServiceEntry(DWORD argc, wchar_t **argv)
 {
-	LPTSTR	wservice_name;
+	wchar_t	*wservice_name;
 
 	wservice_name = zbx_utf8_to_unicode(ZABBIX_SERVICE_NAME);
 	serviceHandle = RegisterServiceCtrlHandler(wservice_name, ServiceCtrlHandler);
@@ -148,7 +148,7 @@ static int	svc_OpenSCManager(SC_HANDLE *mgr)
 
 static int	svc_OpenService(SC_HANDLE mgr, SC_HANDLE *service, DWORD desired_access)
 {
-	LPTSTR	wservice_name;
+	wchar_t	*wservice_name;
 	int	ret = SUCCEED;
 
 	wservice_name = zbx_utf8_to_unicode(ZABBIX_SERVICE_NAME);
@@ -165,49 +165,49 @@ static int	svc_OpenService(SC_HANDLE mgr, SC_HANDLE *service, DWORD desired_acce
 	return ret;
 }
 
-static void	svc_get_fullpath(const char *path, LPTSTR fullpath, size_t max_fullpath)
+static void	svc_get_fullpath(const char *path, wchar_t *fullpath, size_t max_fullpath)
 {
-	LPTSTR	wpath;
+	wchar_t	*wpath;
 
 	wpath = zbx_acp_to_unicode(path);
-	zbx_fullpath(fullpath, wpath, max_fullpath);
+	_wfullpath(fullpath, wpath, max_fullpath);
 	zbx_free(wpath);
 }
 
-static void	svc_get_command_line(const char *path, int multiple_agents, LPTSTR cmdLine, size_t max_cmdLine)
+static void	svc_get_command_line(const char *path, int multiple_agents, wchar_t *cmdLine, size_t max_cmdLine)
 {
-	TCHAR	path1[MAX_PATH], path2[MAX_PATH];
+	wchar_t	path1[MAX_PATH], path2[MAX_PATH];
 
 	svc_get_fullpath(path, path2, MAX_PATH);
 
-	if (NULL == zbx_strstr(path2, TEXT(".exe")))
-		zbx_wsnprintf(path1, MAX_PATH, TEXT("%s.exe"), path2);
+	if (NULL == wcsstr(path2, TEXT(".exe")))
+		StringCchPrintf(path1, MAX_PATH, TEXT("%s.exe"), path2);
 	else
-		zbx_wsnprintf(path1, MAX_PATH, path2);
+		StringCchPrintf(path1, MAX_PATH, path2);
 
 	if (NULL != CONFIG_FILE)
 	{
 		svc_get_fullpath(CONFIG_FILE, path2, MAX_PATH);
-		zbx_wsnprintf(cmdLine, max_cmdLine, TEXT("\"%s\" %s--config \"%s\""),
+		StringCchPrintf(cmdLine, max_cmdLine, TEXT("\"%s\" %s--config \"%s\""),
 				path1,
 				(0 == multiple_agents) ? TEXT("") : TEXT("--multiple-agents "),
 				path2);
 	}
 	else
-		zbx_wsnprintf(cmdLine, max_cmdLine, TEXT("\"%s\""), path1);
+		StringCchPrintf(cmdLine, max_cmdLine, TEXT("\"%s\""), path1);
 }
 
 static int	svc_install_event_source(const char *path)
 {
 	HKEY	hKey;
 	DWORD	dwTypes = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
-	TCHAR	execName[MAX_PATH];
-	TCHAR	regkey[256], *wevent_source;
+	wchar_t	execName[MAX_PATH];
+	wchar_t	regkey[256], *wevent_source;
 
 	svc_get_fullpath(path, execName, MAX_PATH);
 
 	wevent_source = zbx_utf8_to_unicode(ZABBIX_EVENT_SOURCE);
-	zbx_wsnprintf(regkey, sizeof(regkey)/sizeof(TCHAR), EVENTLOG_REG_PATH TEXT("System\\%s"), wevent_source);
+	StringCchPrintf(regkey, ARRSIZE(regkey), EVENTLOG_REG_PATH TEXT("System\\%s"), wevent_source);
 	zbx_free(wevent_source);
 
 	if (ERROR_SUCCESS != RegCreateKeyEx(HKEY_LOCAL_MACHINE, regkey, 0, NULL, REG_OPTION_NON_VOLATILE,
@@ -219,7 +219,7 @@ static int	svc_install_event_source(const char *path)
 
 	RegSetValueEx(hKey, TEXT("TypesSupported"), 0, REG_DWORD, (BYTE *)&dwTypes, sizeof(DWORD));
 	RegSetValueEx(hKey, TEXT("EventMessageFile"), 0, REG_EXPAND_SZ, (BYTE *)execName,
-			(DWORD)(zbx_strlen(execName) + 1) * sizeof(TCHAR));
+			(DWORD)(wcslen(execName) + 1) * sizeof(wchar_t));
 	RegCloseKey(hKey);
 
 	zbx_error("event source [%s] installed successfully", ZABBIX_EVENT_SOURCE);
@@ -229,19 +229,17 @@ static int	svc_install_event_source(const char *path)
 
 int	ZabbixCreateService(const char *path, int multiple_agents)
 {
-#define MAX_CMD_LEN	(MAX_PATH * 2)
-
 	SC_HANDLE		mgr, service;
 	SERVICE_DESCRIPTION	sd;
-	TCHAR			cmdLine[MAX_CMD_LEN];
-	LPTSTR			wservice_name;
+	wchar_t			cmdLine[MAX_PATH];
+	wchar_t			*wservice_name;
 	DWORD			code;
 	int			ret = FAIL;
 
 	if (FAIL == svc_OpenSCManager(&mgr))
 		return ret;
 
-	svc_get_command_line(path, multiple_agents, cmdLine, MAX_CMD_LEN);
+	svc_get_command_line(path, multiple_agents, cmdLine, MAX_PATH);
 
 	wservice_name = zbx_utf8_to_unicode(ZABBIX_SERVICE_NAME);
 
@@ -281,12 +279,12 @@ int	ZabbixCreateService(const char *path, int multiple_agents)
 
 static int	svc_RemoveEventSource()
 {
-	TCHAR	regkey[256];
-	LPTSTR	wevent_source;
+	wchar_t	regkey[256];
+	wchar_t	*wevent_source;
 	int	ret = FAIL;
 
 	wevent_source = zbx_utf8_to_unicode(ZABBIX_EVENT_SOURCE);
-	zbx_wsnprintf(regkey, sizeof(regkey)/sizeof(TCHAR), EVENTLOG_REG_PATH TEXT("System\\%s"), wevent_source);
+	StringCchPrintf(regkey, ARRSIZE(regkey), EVENTLOG_REG_PATH TEXT("System\\%s"), wevent_source);
 	zbx_free(wevent_source);
 
 	if (ERROR_SUCCESS == RegDeleteKey(HKEY_LOCAL_MACHINE, regkey))
diff --git a/src/modules/dummy/Makefile b/src/modules/dummy/Makefile
index 666f2e7c808..21c642fd49b 100644
--- a/src/modules/dummy/Makefile
+++ b/src/modules/dummy/Makefile
@@ -1,2 +1,2 @@
 dummy: dummy.c
-	gcc -shared -o dummy.so dummy.c -I../../../include
+	gcc -fPIC -shared -o dummy.so dummy.c -I../../../include
diff --git a/src/modules/dummy/dummy.c b/src/modules/dummy/dummy.c
index 248eca3163e..1170271f701 100644
--- a/src/modules/dummy/dummy.c
+++ b/src/modules/dummy/dummy.c
@@ -93,7 +93,7 @@ int	zbx_module_dummy_echo(AGENT_REQUEST *request, AGENT_RESULT *result)
 	if (1 != request->nparam)
 	{
 		/* set optional error message */
-		SET_MSG_RESULT(result, strdup("Invalid number of parameters"));
+		SET_MSG_RESULT(result, strdup("Invalid number of parameters."));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -133,10 +133,10 @@ int	zbx_module_dummy_random(AGENT_REQUEST *request, AGENT_RESULT *result)
 	char	*param1, *param2;
 	int	from, to;
 
-	if (request->nparam != 2)
+	if (2 != request->nparam)
 	{
 		/* set optional error message */
-		SET_MSG_RESULT(result, strdup("Invalid number of parameters"));
+		SET_MSG_RESULT(result, strdup("Invalid number of parameters."));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -149,7 +149,7 @@ int	zbx_module_dummy_random(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 	if (from > to)
 	{
-		SET_MSG_RESULT(result, strdup("Incorrect range given"));
+		SET_MSG_RESULT(result, strdup("Invalid range specified."));
 		return SYSINFO_RET_FAIL;
 	}
 
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am
index c2f459e8d47..ad0643f1168 100644
--- a/src/zabbix_agent/Makefile.am
+++ b/src/zabbix_agent/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = \
 agents_ldadd = \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxagentsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libspecsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libspechostnamesysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/agent/libagentsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c
index e0688f293aa..e48d3b1feb5 100644
--- a/src/zabbix_agent/active.c
+++ b/src/zabbix_agent/active.c
@@ -44,15 +44,9 @@ extern int		server_num, process_num;
 #	include "daemon.h"
 #endif
 
-#ifdef _WINDOWS
-__declspec(thread) static ZBX_ACTIVE_METRIC	*active_metrics = NULL;
-__declspec(thread) static ZBX_ACTIVE_BUFFER	buffer;
-__declspec(thread) static zbx_vector_ptr_t	regexps;
-#else
-static ZBX_ACTIVE_METRIC	*active_metrics = NULL;
-static ZBX_ACTIVE_BUFFER	buffer;
-static zbx_vector_ptr_t		regexps;
-#endif
+ZBX_THREAD_LOCAL static ZBX_ACTIVE_METRIC	*active_metrics = NULL;
+ZBX_THREAD_LOCAL static ZBX_ACTIVE_BUFFER	buffer;
+ZBX_THREAD_LOCAL static zbx_vector_ptr_t	regexps;
 
 #ifdef _WINDOWS
 LONG WINAPI	DelayLoadDllExceptionFilter(PEXCEPTION_POINTERS excpointers)
@@ -125,7 +119,7 @@ static void	disable_all_metrics(void)
 #ifdef _WINDOWS
 static void	free_active_metrics(void)
 {
-	int	i;
+	int	i, j;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In free_active_metrics()");
 
@@ -133,6 +127,11 @@ static void	free_active_metrics(void)
 	{
 		zbx_free(active_metrics[i].key);
 		zbx_free(active_metrics[i].key_orig);
+
+		for (j = 0; j < active_metrics[i].logfiles_num; j++)
+			zbx_free(active_metrics[i].logfiles[j].filename);
+
+		zbx_free(active_metrics[i].logfiles);
 	}
 
 	zbx_free(active_metrics);
@@ -178,11 +177,21 @@ static void	add_check(const char *key, const char *key_orig, int refresh, zbx_ui
 
 		if (0 != strcmp(active_metrics[i].key, key))
 		{
+			int	j;
+
 			zbx_free(active_metrics[i].key);
-			active_metrics[i].key = strdup(key);
+			active_metrics[i].key = zbx_strdup(NULL, key);
 			active_metrics[i].lastlogsize = lastlogsize;
 			active_metrics[i].mtime = mtime;
 			active_metrics[i].big_rec = 0;
+			active_metrics[i].use_ino = 0;
+			active_metrics[i].error_count = 0;
+
+			for (j = 0; j < active_metrics[i].logfiles_num; j++)
+				zbx_free(active_metrics[i].logfiles[j].filename);
+
+			zbx_free(active_metrics[i].logfiles);
+			active_metrics[i].logfiles_num = 0;
 		}
 
 		/* replace metric */
@@ -207,6 +216,10 @@ static void	add_check(const char *key, const char *key_orig, int refresh, zbx_ui
 	/* can skip existing log[] and eventlog[] data */
 	active_metrics[i].skip_old_data = active_metrics[i].lastlogsize ? 0 : 1;
 	active_metrics[i].big_rec = 0;
+	active_metrics[i].use_ino = 0;
+	active_metrics[i].error_count = 0;
+	active_metrics[i].logfiles_num = 0;
+	active_metrics[i].logfiles = NULL;
 
 	/* move to the last metric */
 	i++;
@@ -401,11 +414,11 @@ json_error:
 static int	refresh_active_checks(const char *host, unsigned short port)
 {
 	const char	*__function_name = "refresh_active_checks";
-	zbx_sock_t	s;
-	char		*buf;
-	int		ret;
-	struct zbx_json	json;
-	static int	last_ret = SUCCEED;
+
+	ZBX_THREAD_LOCAL static int	last_ret = SUCCEED;
+	zbx_sock_t			s;
+	int				ret;
+	struct zbx_json			json;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() host:'%s' port:%hu", __function_name, host, port);
 
@@ -482,16 +495,16 @@ static int	refresh_active_checks(const char *host, unsigned short port)
 		{
 			zabbix_log(LOG_LEVEL_DEBUG, "before read");
 
-			if (SUCCEED == (ret = SUCCEED_OR_FAIL(zbx_tcp_recv_ext(&s, &buf, ZBX_TCP_READ_UNTIL_CLOSE, 0))))
+			if (SUCCEED == (ret = SUCCEED_OR_FAIL(zbx_tcp_recv_ext(&s, ZBX_TCP_READ_UNTIL_CLOSE, 0))))
 			{
-				zabbix_log(LOG_LEVEL_DEBUG, "got [%s]", buf);
+				zabbix_log(LOG_LEVEL_DEBUG, "got [%s]", s.buffer);
 
 				if (SUCCEED != last_ret)
 				{
 					zabbix_log(LOG_LEVEL_WARNING, "active check configuration update from [%s:%hu]"
 							" is working again", host, port);
 				}
-				parse_list_of_checks(buf, host, port);
+				parse_list_of_checks(s.buffer, host, port);
 			}
 		}
 
@@ -580,7 +593,6 @@ static int	send_buffer(const char *host, unsigned short port)
 	struct zbx_json 		json;
 	ZBX_ACTIVE_BUFFER_ELEMENT	*el;
 	zbx_sock_t			s;
-	char				*buf = NULL;
 	int				ret = SUCCEED, i, now;
 	zbx_timespec_t			ts;
 	const char			*err_send_step = "";
@@ -613,6 +625,8 @@ static int	send_buffer(const char *host, unsigned short port)
 		zbx_json_addstring(&json, ZBX_PROTO_TAG_HOST, el->host, ZBX_JSON_TYPE_STRING);
 		zbx_json_addstring(&json, ZBX_PROTO_TAG_KEY, el->key, ZBX_JSON_TYPE_STRING);
 		zbx_json_addstring(&json, ZBX_PROTO_TAG_VALUE, el->value, ZBX_JSON_TYPE_STRING);
+		if (ITEM_STATE_NOTSUPPORTED == el->state)
+			zbx_json_adduint64(&json, ZBX_PROTO_TAG_STATE, ITEM_STATE_NOTSUPPORTED);
 		if (0 != el->lastlogsize)
 			zbx_json_adduint64(&json, ZBX_PROTO_TAG_LOGLASTSIZE, el->lastlogsize);
 		if (el->mtime)
@@ -643,11 +657,11 @@ static int	send_buffer(const char *host, unsigned short port)
 
 		if (SUCCEED == (ret = zbx_tcp_send(&s, json.buffer)))
 		{
-			if (SUCCEED == zbx_tcp_recv(&s, &buf))
+			if (SUCCEED == zbx_tcp_recv(&s))
 			{
-				zabbix_log(LOG_LEVEL_DEBUG, "JSON back [%s]", buf);
+				zabbix_log(LOG_LEVEL_DEBUG, "JSON back [%s]", s.buffer);
 
-				if (NULL == buf || SUCCEED != check_response(buf))
+				if (NULL == s.buffer || SUCCEED != check_response(s.buffer))
 					zabbix_log(LOG_LEVEL_DEBUG, "NOT OK");
 				else
 					zabbix_log(LOG_LEVEL_DEBUG, "OK");
@@ -713,7 +727,9 @@ ret:
  *             port        - port of Zabbix server                            *
  *             host        - name of host in Zabbix database                  *
  *             key         - name of metric                                   *
- *             value       - key value                                        *
+ *             value       - key value or error message why an item became    *
+ *                           NOTSUPPORTED                                     *
+ *             state       - ITEM_STATE_NORMAL or ITEM_STATE_NOTSUPPORTED     *
  *             lastlogsize - size of read logfile                             *
  *             mtime       - time of last file modification                   *
  *             timestamp   - timestamp of read value                          *
@@ -744,6 +760,7 @@ static int	process_value(
 		const char	*host,
 		const char	*key,
 		const char	*value,
+		unsigned char	state,
 		zbx_uint64_t	*lastlogsize,
 		int		*mtime,
 		unsigned long	*timestamp,
@@ -815,6 +832,7 @@ static int	process_value(
 	el->host = zbx_strdup(NULL, host);
 	el->key = zbx_strdup(NULL, key);
 	el->value = zbx_strdup(NULL, value);
+	el->state = state;
 
 	if (NULL != source)
 		el->source = strdup(source);
@@ -845,7 +863,7 @@ out:
 static void	process_active_checks(char *server, unsigned short port)
 {
 	const char	*__function_name = "process_active_checks";
-	int		i, s_count, p_count;
+	int		i, s_count, p_count, is_logrt;
 	char		**pvalue;
 	int		now, send_err = SUCCEED, ret;
 	char		params[MAX_STRING_LEN], filename[MAX_STRING_LEN];
@@ -873,7 +891,7 @@ static void	process_active_checks(char *server, unsigned short port)
 
 	AGENT_RESULT	result;
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s('%s',%hu)", __function_name, server, port);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() server:'%s' port:%hu)", __function_name, server, port);
 
 	init_result(&result);
 
@@ -887,24 +905,45 @@ static void	process_active_checks(char *server, unsigned short port)
 		if (ITEM_STATE_NORMAL != active_metrics[i].state)
 			continue;
 
-		/* special processing for log files without rotation */
-		if (0 == strncmp(active_metrics[i].key, "log[", 4))
+		if (0 == strncmp(active_metrics[i].key, "log[", 4))		/* log files without rotation */
+			is_logrt = 0;
+		else if (0 == strncmp(active_metrics[i].key, "logrt[", 6))	/* log files with rotation */
+			is_logrt = 1;
+		else
+			is_logrt = -1;
+
+		if (-1 != is_logrt)
 		{
+			int		err, rc;
+			const char	*err_msg = NULL;
+			char		*err_msg_dyn = NULL;
+
 			ret = FAIL;
 
 			do
 			{
-				if (ZBX_COMMAND_WITH_PARAMS != parse_command(active_metrics[i].key, NULL, 0,
-						params, sizeof(params)))
+				if (ZBX_COMMAND_WITH_PARAMS != (rc = parse_command(active_metrics[i].key, NULL, 0,
+						params, sizeof(params))))
 				{
+					if (ZBX_COMMAND_ERROR == rc)
+						err_msg = "Invalid item key format.";
+					else if (ZBX_COMMAND_WITHOUT_PARAMS == rc)
+						err_msg = "Invalid number of parameters.";
+
 					break;
 				}
 
 				if (6 < num_param(params))
+				{
+					err_msg = "Too many parameters.";
 					break;
+				}
 
 				if (0 != get_param(params, 1, filename, sizeof(filename)))
+				{
+					err_msg = "Invalid first parameter.";
 					break;
+				}
 
 				if (0 != get_param(params, 2, pattern, sizeof(pattern)))
 					*pattern = '\0';
@@ -916,10 +955,15 @@ static void	process_active_checks(char *server, unsigned short port)
 
 				if (0 != get_param(params, 4, maxlines_persec_str, sizeof(maxlines_persec_str)) ||
 						'\0' == *maxlines_persec_str)
+				{
 					maxlines_persec = CONFIG_MAX_LINES_PER_SECOND;
+				}
 				else if (MIN_VALUE_LINES > (maxlines_persec = atoi(maxlines_persec_str)) ||
 						MAX_VALUE_LINES < maxlines_persec)
+				{
+					err_msg = "Invalid fourth parameter.";
 					break;
+				}
 
 				if (0 != get_param(params, 5, tmp, sizeof(tmp)))
 					*tmp = '\0';
@@ -927,7 +971,10 @@ static void	process_active_checks(char *server, unsigned short port)
 				if ('\0' == *tmp || 0 == strcmp(tmp, "all"))
 					active_metrics[i].skip_old_data = 0;
 				else if (0 != strcmp(tmp, "skip"))
+				{
+					err_msg = "Invalid fifth parameter.";
 					break;
+				}
 
 				if (0 != get_param(params, 6, output_template, sizeof(output_template)))
 					*output_template = '\0';
@@ -938,92 +985,53 @@ static void	process_active_checks(char *server, unsigned short port)
 				/* do not flood local system if file grows too fast */
 				p_count = 4 * maxlines_persec * active_metrics[i].refresh;
 
-				ret = process_log(filename, &active_metrics[i].lastlogsize, NULL,
-						&active_metrics[i].skip_old_data, &active_metrics[i].big_rec, encoding,
+				err = active_metrics[i].error_count;
+
+				ret = process_logrt(is_logrt, filename, &active_metrics[i].lastlogsize,
+						&active_metrics[i].mtime, &active_metrics[i].skip_old_data,
+						&active_metrics[i].big_rec, &active_metrics[i].use_ino,
+						&active_metrics[i].error_count, &err_msg_dyn,
+						&active_metrics[i].logfiles, &active_metrics[i].logfiles_num, encoding,
 						&regexps, pattern, output_template, &p_count, &s_count, process_value,
 						server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig);
-			}
-			while (0);
-
-			if (FAIL == ret)
-			{
-				active_metrics[i].state = ITEM_STATE_NOTSUPPORTED;
-				zabbix_log(LOG_LEVEL_WARNING, "active check \"%s\" is not supported",
-						active_metrics[i].key);
-
-				process_value(server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig,
-						ZBX_NOTSUPPORTED, &active_metrics[i].lastlogsize, NULL, NULL, NULL,
-						NULL, NULL, 0);
-			}
-		}
-		/* special processing for log files with rotation */
-		else if (0 == strncmp(active_metrics[i].key, "logrt[", 6))
-		{
-			ret = FAIL;
 
-			do
-			{
-				if (ZBX_COMMAND_WITH_PARAMS != parse_command(active_metrics[i].key, NULL, 0,
-						params, sizeof(params)))
+				/* reset errors if things have improved */
+				if (0 < active_metrics[i].error_count && SUCCEED == ret
+						&& active_metrics[i].error_count == err)
 				{
-					break;
+					active_metrics[i].error_count = 0;
 				}
 
-				if (6 < num_param(params))
-					break;
-
-				if (0 != get_param(params, 1, filename, sizeof(filename)))
-					break;
-
-				if (0 != get_param(params, 2, pattern, sizeof(pattern)))
-					*pattern = '\0';
-
-				if (0 != get_param(params, 3, encoding, sizeof(encoding)))
-					*encoding = '\0';
-
-				zbx_strupper(encoding);
-
-				if (0 != get_param(params, 4, maxlines_persec_str, sizeof(maxlines_persec_str)) ||
-						'\0' == *maxlines_persec_str)
-					maxlines_persec = CONFIG_MAX_LINES_PER_SECOND;
-				else if (MIN_VALUE_LINES > (maxlines_persec = atoi(maxlines_persec_str)) ||
-						MAX_VALUE_LINES < maxlines_persec)
-					break;
-
-				if (0 != get_param(params, 5, tmp, sizeof(tmp)))
-					*tmp = '\0';
-
-				if ('\0' == *tmp || 0 == strcmp(tmp, "all"))
-					active_metrics[i].skip_old_data = 0;
-				else if (0 != strcmp(tmp, "skip"))
-					break;
-
-				if (0 != get_param(params, 6, output_template, sizeof(output_template)))
-					*output_template = '\0';
-
-				/* do not flood Zabbix server if files grow too fast */
-				s_count = maxlines_persec * active_metrics[i].refresh;
-
-				/* do not flood local system if files grow too fast */
-				p_count = 4 * maxlines_persec * active_metrics[i].refresh;
-
-				ret = process_logrt(filename, &active_metrics[i].lastlogsize, &active_metrics[i].mtime,
-						&active_metrics[i].skip_old_data, &active_metrics[i].big_rec, encoding,
-						&regexps, pattern, output_template, &p_count, &s_count, process_value,
-						server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig);
+				/* too many errors, time to go NOTSUPPORTED */
+				if (2 < active_metrics[i].error_count)
+					ret = FAIL;
 			}
 			while (0);
 
 			if (FAIL == ret)
 			{
+				const char	*p;
+
+				if (NULL != err_msg)
+					p = err_msg;
+				else if (NULL != err_msg_dyn)
+					p = err_msg_dyn;
+				else
+					p = ZBX_NOTSUPPORTED;
+
+				active_metrics[i].error_count = 0;
 				active_metrics[i].state = ITEM_STATE_NOTSUPPORTED;
-				zabbix_log(LOG_LEVEL_WARNING, "active check \"%s\" is not supported",
-						active_metrics[i].key);
 
-				process_value(server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig,
-						ZBX_NOTSUPPORTED, &active_metrics[i].lastlogsize,
-						&active_metrics[i].mtime, NULL, NULL, NULL, NULL, 0);
+				zabbix_log(LOG_LEVEL_WARNING, "active check \"%s\" is not supported: %s",
+						active_metrics[i].key, p);
+
+				process_value(server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig, p,
+						ITEM_STATE_NOTSUPPORTED, &active_metrics[i].lastlogsize,
+						(1 == is_logrt) ? &active_metrics[i].mtime : NULL, NULL, NULL, NULL,
+						NULL, 0);
 			}
+
+			zbx_free(err_msg_dyn);
 		}
 		/* special processing for eventlog */
 		else if (0 == strncmp(active_metrics[i].key, "eventlog[", 9))
@@ -1159,8 +1167,9 @@ static void	process_active_checks(char *server, unsigned short port)
 										key_logeventid, ZBX_CASE_SENSITIVE))
 							{
 								send_err = process_value(server, port, CONFIG_HOSTNAME,
-										active_metrics[i].key_orig, value, &lastlogsize,
-										NULL, &timestamp, provider, &severity, &logeventid, 1);
+										active_metrics[i].key_orig, value, ITEM_STATE_NORMAL,
+										&lastlogsize, NULL, &timestamp, provider, &severity,
+										&logeventid, 1);
 								s_count++;
 							}
 							p_count++;
@@ -1176,6 +1185,8 @@ static void	process_active_checks(char *server, unsigned short port)
 								/* buffer is full, stop processing active checks*/
 								/* till the buffer is cleared */
 								lastlogsize = active_metrics[i].lastlogsize;
+								finalize_eventlog6(&eventlog6_render_context,
+										&eventlog6_query);
 								goto ret;
 							}
 
@@ -1249,8 +1260,9 @@ static void	process_active_checks(char *server, unsigned short port)
 										key_logeventid, ZBX_CASE_SENSITIVE))
 						{
 							send_err = process_value(server, port, CONFIG_HOSTNAME,
-									active_metrics[i].key_orig, value, &lastlogsize,
-									NULL, &timestamp, source, &severity, &logeventid, 1);
+									active_metrics[i].key_orig, value, ITEM_STATE_NORMAL,
+									&lastlogsize, NULL, &timestamp, source, &severity,
+									&logeventid, 1);
 							s_count++;
 						}
 						p_count++;
@@ -1281,38 +1293,47 @@ static void	process_active_checks(char *server, unsigned short port)
 			}
 			while (0); /* simple try realization */
 #endif	/* _WINDOWS */
-
 			if (FAIL == ret)
 			{
 				active_metrics[i].state = ITEM_STATE_NOTSUPPORTED;
+
 				zabbix_log(LOG_LEVEL_WARNING, "active check \"%s\" is not supported",
 						active_metrics[i].key);
 
 				process_value(server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig,
-						ZBX_NOTSUPPORTED, &active_metrics[i].lastlogsize, NULL, NULL, NULL,
-						NULL, NULL, 0);
+						ZBX_NOTSUPPORTED, ITEM_STATE_NOTSUPPORTED,
+						&active_metrics[i].lastlogsize, NULL, NULL,
+						NULL, NULL, NULL, 0);
 			}
 		}
 		else
 		{
-			process(active_metrics[i].key, 0, &result);
+			if (SUCCEED == process(active_metrics[i].key, 0, &result))
+			{
+				if (NULL != (pvalue = GET_TEXT_RESULT(&result)))
+				{
+					zabbix_log(LOG_LEVEL_DEBUG, "for key [%s] received value [%s]",
+							active_metrics[i].key, *pvalue);
 
-			if (NULL == (pvalue = GET_TEXT_RESULT(&result)))
+					process_value(server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig,
+							*pvalue, ITEM_STATE_NORMAL,
+							NULL, NULL, NULL,
+							NULL, NULL, NULL, 0);
+				}
+			}
+			else
+			{
 				pvalue = GET_MSG_RESULT(&result);
 
-			if (NULL != pvalue)
-			{
-				zabbix_log(LOG_LEVEL_DEBUG, "for key [%s] received value [%s]", active_metrics[i].key,
-						*pvalue);
-				process_value(server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig, *pvalue, NULL,
-						NULL, NULL, NULL, NULL, NULL, 0);
+				active_metrics[i].state = ITEM_STATE_NOTSUPPORTED;
 
-				if (0 == strcmp(*pvalue, ZBX_NOTSUPPORTED))
-				{
-					active_metrics[i].state = ITEM_STATE_NOTSUPPORTED;
-					zabbix_log(LOG_LEVEL_WARNING, "active check \"%s\" is not supported",
-							active_metrics[i].key);
-				}
+				zabbix_log(LOG_LEVEL_WARNING, "active check \"%s\" is not supported",
+						active_metrics[i].key);
+
+				process_value(server, port, CONFIG_HOSTNAME, active_metrics[i].key_orig,
+						*pvalue, ITEM_STATE_NOTSUPPORTED,
+						NULL, NULL, NULL,
+						NULL, NULL, NULL, 0);
 			}
 
 			free_result(&result);
@@ -1395,7 +1416,7 @@ ZBX_THREAD_ENTRY(active_checks_thread, args)
 
 	ZBX_DO_EXIT();
 
-	zbx_thread_exit(0);
+	zbx_thread_exit(EXIT_SUCCESS);
 #endif
 }
 
diff --git a/src/zabbix_agent/active.h b/src/zabbix_agent/active.h
index ef41954ea82..09aeb5409cd 100644
--- a/src/zabbix_agent/active.h
+++ b/src/zabbix_agent/active.h
@@ -67,15 +67,22 @@ extern int	CONFIG_LISTEN_PORT;
 
 typedef struct
 {
-	char		*key, *key_orig;
-	zbx_uint64_t	lastlogsize;
-	int		refresh;
-	int		nextcheck;
+	char			*key, *key_orig;
+	zbx_uint64_t		lastlogsize;
+	int			refresh;
+	int			nextcheck;
 /* must be long for fseek() */
-	int		mtime;
-	unsigned char	skip_old_data;	/* for processing [event]log metrics */
-	unsigned char	state;
-	int		big_rec;	/* for reading logfiles: 0 - normal record, 1 - long unfinished record */
+	int			mtime;
+	unsigned char		skip_old_data;	/* for processing [event]log metrics */
+	unsigned char		state;
+	int			big_rec;	/* for logfile reading: 0 - normal record, 1 - long unfinished record */
+	int			use_ino;	/* 0 - do not use inodes (on FAT, FAT32) */
+						/* 1 - use inodes (up to 64-bit) (various UNIX file systems, NTFS) */
+						/* 2 - use 128-bit FileID (currently only on ReFS) to identify files */
+						/* on a file system */
+	int			error_count;	/* number of file reading errors in consecutive checks */
+	int			logfiles_num;
+	struct st_logfile	*logfiles;	/* for handling of logfile rotation for logrt[] items */
 }
 ZBX_ACTIVE_METRIC;
 
@@ -91,6 +98,7 @@ typedef struct
 	char		*host;
 	char		*key;
 	char		*value;
+	unsigned char	state;
 	zbx_uint64_t	lastlogsize;
 	int		timestamp;
 	char		*source;
diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c
index 2f6699e8c1e..b346e790cf6 100644
--- a/src/zabbix_agent/cpustat.c
+++ b/src/zabbix_agent/cpustat.c
@@ -30,6 +30,9 @@
 #	define LOCK_CPUSTATS	zbx_mutex_lock(&cpustats_lock)
 #	define UNLOCK_CPUSTATS	zbx_mutex_unlock(&cpustats_lock)
 static ZBX_MUTEX	cpustats_lock;
+#else
+#	define LOCK_CPUSTATS
+#	define UNLOCK_CPUSTATS
 #endif
 
 #ifdef HAVE_KSTAT_H
@@ -114,8 +117,8 @@ int	init_cpu_collector(ZBX_CPUS_STAT_DATA *pcpus)
 	const char			*__function_name = "init_cpu_collector";
 	int				cpu_num, ret = FAIL;
 #ifdef _WINDOWS
-	TCHAR				cpu[8];
-	char				counterPath[PDH_MAX_COUNTER_PATH];
+	wchar_t				cpu[8];
+	char				counterPath[PDH_MAX_COUNTER_PATH], *error = NULL;
 	PDH_COUNTER_PATH_ELEMENTS	cpe;
 #endif
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
@@ -131,15 +134,18 @@ int	init_cpu_collector(ZBX_CPUS_STAT_DATA *pcpus)
 	for (cpu_num = 0; cpu_num <= pcpus->count; cpu_num++)
 	{
 		if (0 == cpu_num)
-			zbx_wsnprintf(cpu, sizeof(cpu) / sizeof(TCHAR), TEXT("_Total"));
+			StringCchPrintf(cpu, ARRSIZE(cpu), TEXT("_Total"));
 		else
-			_itow_s(cpu_num - 1, cpu, sizeof(cpu) / sizeof(TCHAR), 10);
+			_itow_s(cpu_num - 1, cpu, ARRSIZE(cpu), 10);
 
 		if (ERROR_SUCCESS != zbx_PdhMakeCounterPath(__function_name, &cpe, counterPath))
 			goto clean;
 
-		if (NULL == (pcpus->cpu_counter[cpu_num] = add_perf_counter(NULL, counterPath, MAX_CPU_HISTORY)))
+		if (NULL == (pcpus->cpu_counter[cpu_num] = add_perf_counter(NULL, counterPath, MAX_COLLECTOR_PERIOD,
+				&error)))
+		{
 			goto clean;
+		}
 	}
 
 	cpe.szObjectName = get_counter_name(PCI_SYSTEM);
@@ -149,11 +155,17 @@ int	init_cpu_collector(ZBX_CPUS_STAT_DATA *pcpus)
 	if (ERROR_SUCCESS != zbx_PdhMakeCounterPath(__function_name, &cpe, counterPath))
 		goto clean;
 
-	if (NULL == (pcpus->queue_counter = add_perf_counter(NULL, counterPath, MAX_CPU_HISTORY)))
+	if (NULL == (pcpus->queue_counter = add_perf_counter(NULL, counterPath, MAX_COLLECTOR_PERIOD, &error)))
 		goto clean;
 
 	ret = SUCCEED;
 clean:
+	if (NULL != error)
+	{
+		zabbix_log(LOG_LEVEL_WARNING, "cannot add performance counter \"%s\": %s", counterPath, error);
+		zbx_free(error);
+	}
+
 #else	/* not _WINDOWS */
 	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&cpustats_lock, ZBX_MUTEX_CPUSTATS))
 	{
@@ -430,7 +442,8 @@ static void	update_cpustats(ZBX_CPUS_STAT_DATA *pcpus)
 			counter[ZBX_CPU_STATE_USER] = (zbx_uint64_t)*(cp_times + (cpu_num - 1) * CPUSTATES + CP_USER);
 			counter[ZBX_CPU_STATE_NICE] = (zbx_uint64_t)*(cp_times + (cpu_num - 1) * CPUSTATES + CP_NICE);
 			counter[ZBX_CPU_STATE_SYSTEM] = (zbx_uint64_t)*(cp_times + (cpu_num - 1) * CPUSTATES + CP_SYS);
-			counter[ZBX_CPU_STATE_INTERRUPT] = (zbx_uint64_t)*(cp_times + (cpu_num - 1) * CPUSTATES + CP_INTR);
+			counter[ZBX_CPU_STATE_INTERRUPT] = (zbx_uint64_t)*(cp_times + (cpu_num - 1) * CPUSTATES +
+					CP_INTR);
 			counter[ZBX_CPU_STATE_IDLE] = (zbx_uint64_t)*(cp_times + (cpu_num - 1) * CPUSTATES + CP_IDLE);
 
 			update_cpu_counters(&pcpus->cpu[cpu_num], counter);
@@ -630,14 +643,17 @@ int	get_cpustat(AGENT_RESULT *result, int cpu_num, int state, int mode)
 			return SYSINFO_RET_FAIL;
 	}
 
-	if (!CPU_COLLECTOR_STARTED(collector))
+	if (0 == CPU_COLLECTOR_STARTED(collector))
 	{
-		SET_MSG_RESULT(result, strdup("Collector is not started!"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Collector is not started."));
 		return SYSINFO_RET_FAIL;
 	}
 
 	if (NULL == (cpu = get_cpustat_by_num(&collector->cpus, cpu_num)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain CPU information."));
 		return SYSINFO_RET_FAIL;
+	}
 
 	if (0 == cpu->h_count)
 	{
@@ -653,6 +669,7 @@ int	get_cpustat(AGENT_RESULT *result, int cpu_num, int state, int mode)
 	if (SYSINFO_RET_FAIL == cpu->h_status[idx_curr])
 	{
 		UNLOCK_CPUSTATS;
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Cannot obtain CPU information."));
 		return SYSINFO_RET_FAIL;
 	}
 
@@ -682,5 +699,37 @@ int	get_cpustat(AGENT_RESULT *result, int cpu_num, int state, int mode)
 
 	return SYSINFO_RET_OK;
 }
-
 #endif	/* not _WINDOWS */
+
+int	get_cpu_statuses(zbx_vector_uint64_t *vector)
+{
+	int				i;
+#ifndef _WINDOWS
+	int				index;
+	ZBX_SINGLE_CPU_STAT_DATA	*cpu;
+#endif
+	ZBX_CPUS_STAT_DATA		*pcpus;
+
+	if (!CPU_COLLECTOR_STARTED(collector) || NULL == (pcpus = &collector->cpus))
+		return FAIL;
+
+	LOCK_CPUSTATS;
+
+	for (i = 0; i < pcpus->count; i++)
+	{
+#ifndef _WINDOWS
+		cpu = get_cpustat_by_num(pcpus, i + 1);
+
+		if (MAX_COLLECTOR_HISTORY <= (index = cpu->h_first + cpu->h_count - 1))
+			index -= MAX_COLLECTOR_HISTORY;
+
+		zbx_vector_uint64_append(vector, cpu->h_status[index]);
+#else
+		zbx_vector_uint64_append(vector, pcpus->cpu_counter[i + 1]->status);
+#endif
+	}
+
+	UNLOCK_CPUSTATS;
+
+	return SUCCEED;
+}
diff --git a/src/zabbix_agent/cpustat.h b/src/zabbix_agent/cpustat.h
index 67ea4aba852..0b51408a1af 100644
--- a/src/zabbix_agent/cpustat.h
+++ b/src/zabbix_agent/cpustat.h
@@ -21,12 +21,11 @@
 #define ZABBIX_CPUSTAT_H
 
 #include "sysinfo.h"
+#include "zbxalgo.h"
 
 #ifdef _WINDOWS
 #	include "perfmon.h"
 
-#define MAX_CPU_HISTORY	(15 * SEC_PER_MIN)
-
 typedef struct
 {
 	PERF_COUNTER_DATA	**cpu_counter;
@@ -72,4 +71,6 @@ void	collect_cpustat(ZBX_CPUS_STAT_DATA *pcpus);
 int	get_cpustat(AGENT_RESULT *result, int cpu_num, int state, int mode);
 #endif /* not _WINDOWS */
 
+int	get_cpu_statuses(zbx_vector_uint64_t *vector);
+
 #endif
diff --git a/src/zabbix_agent/eventlog.c b/src/zabbix_agent/eventlog.c
index 90998db6a0e..e5f184c3f02 100644
--- a/src/zabbix_agent/eventlog.c
+++ b/src/zabbix_agent/eventlog.c
@@ -23,7 +23,7 @@
 
 #define	DEFAULT_EVENT_CONTENT_SIZE 256
 
-static	LPCWSTR RENDER_ITEMS[] = {
+static const wchar_t	*RENDER_ITEMS[] = {
 	L"/Event/System/Provider/@Name",
 	L"/Event/System/Provider/@EventSourceName",
 	L"/Event/System/EventRecordID",
@@ -34,7 +34,7 @@ static	LPCWSTR RENDER_ITEMS[] = {
 	L"Event/EventData/Data"
 };
 
-#define	RENDER_ITEMS_COUNT (sizeof(RENDER_ITEMS) / sizeof(LPCWSTR))
+#define	RENDER_ITEMS_COUNT (sizeof(RENDER_ITEMS) / sizeof(const wchar_t *))
 
 #define	VAR_PROVIDER_NAME(p) (p[0].StringVal)
 #define	VAR_SOURCE_NAME(p) (p[1].StringVal)
@@ -47,11 +47,11 @@ static	LPCWSTR RENDER_ITEMS[] = {
 #define	EVENTLOG_REG_PATH TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog\\")
 
 /* open event logger and return number of records */
-static int	zbx_open_eventlog(LPCTSTR wsource, HANDLE *eventlog_handle, zbx_uint64_t *pNumRecords,
+static int	zbx_open_eventlog(const wchar_t *wsource, HANDLE *eventlog_handle, zbx_uint64_t *pNumRecords,
 		zbx_uint64_t *pLatestRecord)
 {
 	const char	*__function_name = "zbx_open_eventlog";
-	TCHAR		reg_path[MAX_PATH];
+	wchar_t		reg_path[MAX_PATH];
 	HKEY		hk = NULL;
 	int		ret = FAIL;
 
@@ -62,7 +62,7 @@ static int	zbx_open_eventlog(LPCTSTR wsource, HANDLE *eventlog_handle, zbx_uint6
 	*pLatestRecord = 0;
 
 	/* Get path to eventlog */
-	zbx_wsnprintf(reg_path, MAX_PATH, EVENTLOG_REG_PATH TEXT("%s"), wsource);
+	StringCchPrintf(reg_path, MAX_PATH, EVENTLOG_REG_PATH TEXT("%s"), wsource);
 
 	if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, reg_path, 0, KEY_READ, &hk))
 		goto out;
@@ -109,15 +109,15 @@ static int	zbx_close_eventlog(HANDLE eventlog_handle)
  *             pParamMessageFile - [OUT] the parameter message file           *
  *                                                                            *
  ******************************************************************************/
-static void	zbx_get_message_files(LPCTSTR szLogName, LPCTSTR szSourceName, LPTSTR *pEventMessageFile,
-		LPTSTR *pParamMessageFile)
+static void	zbx_get_message_files(const wchar_t *szLogName, const wchar_t *szSourceName, wchar_t **pEventMessageFile,
+		wchar_t **pParamMessageFile)
 {
-	TCHAR	buf[MAX_PATH];
+	wchar_t	buf[MAX_PATH];
 	HKEY	hKey = NULL;
 	DWORD	szData;
 
 	/* Get path to message dll */
-	zbx_wsnprintf(buf, MAX_PATH, EVENTLOG_REG_PATH TEXT("%s\\%s"), szLogName, szSourceName);
+	StringCchPrintf(buf, MAX_PATH, EVENTLOG_REG_PATH TEXT("%s\\%s"), szLogName, szSourceName);
 
 	if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, buf, 0, KEY_READ, &hKey))
 		return;
@@ -126,7 +126,7 @@ static void	zbx_get_message_files(LPCTSTR szLogName, LPCTSTR szSourceName, LPTST
 	{
 		*pEventMessageFile = zbx_malloc(*pEventMessageFile, szData);
 		if (ERROR_SUCCESS != RegQueryValueEx(hKey, TEXT("EventMessageFile"), NULL, NULL,
-				(LPBYTE)*pEventMessageFile, &szData))
+				(unsigned char *)*pEventMessageFile, &szData))
 		{
 			zbx_free(*pEventMessageFile);
 		}
@@ -136,7 +136,7 @@ static void	zbx_get_message_files(LPCTSTR szLogName, LPCTSTR szSourceName, LPTST
 	{
 		*pParamMessageFile = zbx_malloc(*pParamMessageFile, szData);
 		if (ERROR_SUCCESS != RegQueryValueEx(hKey, TEXT("ParameterMessageFile"), NULL, NULL,
-				(LPBYTE)*pParamMessageFile, &szData))
+				(unsigned char *)*pParamMessageFile, &szData))
 		{
 			zbx_free(*pParamMessageFile);
 		}
@@ -157,14 +157,30 @@ static void	zbx_get_message_files(LPCTSTR szLogName, LPCTSTR szSourceName, LPTST
  * Return value: Handle to the loaded library or NULL otherwise               *
  *                                                                            *
  ******************************************************************************/
-static HINSTANCE	zbx_load_message_file(LPCTSTR szFileName)
+static HINSTANCE	zbx_load_message_file(const wchar_t *szFileName)
 {
-	TCHAR	MsgDll[MAX_PATH];
+	wchar_t		*dll_name = NULL;
+	long int	sz, len = 0;
+	HINSTANCE	res = NULL;
 
-	if (NULL == szFileName || 0 == ExpandEnvironmentStrings(szFileName, MsgDll, MAX_PATH))
+	if (NULL == szFileName)
 		return NULL;
 
-	return LoadLibraryEx(MsgDll, NULL, LOAD_LIBRARY_AS_DATAFILE);
+	do
+	{
+		if (0 != (sz = len))
+			dll_name = zbx_realloc(dll_name, sz * sizeof(wchar_t));
+
+		len = ExpandEnvironmentStrings(szFileName, dll_name, sz);
+	}
+	while (0 != len && sz < len);
+
+	if (0 != len)
+		res = LoadLibraryEx(dll_name, NULL, LOAD_LIBRARY_AS_DATAFILE);
+
+	zbx_free(dll_name);
+
+	return res;
 }
 
 /******************************************************************************
@@ -183,14 +199,14 @@ static HINSTANCE	zbx_load_message_file(LPCTSTR szFileName)
  *           must be freed by the caller later.                               *
  *                                                                            *
  ******************************************************************************/
-static char	*zbx_format_message(HINSTANCE hLib, DWORD dwMessageId, LPTSTR *pInsertStrings)
+static char	*zbx_format_message(HINSTANCE hLib, DWORD dwMessageId, wchar_t **pInsertStrings)
 {
-	LPTSTR	pMsgBuf = NULL;
+	wchar_t *pMsgBuf = NULL;
 	char	*message;
 
 	if (0 == FormatMessage(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ALLOCATE_BUFFER |
 			FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_MAX_WIDTH_MASK,
-			hLib, dwMessageId, MAKELANGID(LANG_NEUTRAL, SUBLANG_ENGLISH_US), (LPTSTR)&pMsgBuf, 0,
+			hLib, dwMessageId, MAKELANGID(LANG_NEUTRAL, SUBLANG_ENGLISH_US), (wchar_t *)&pMsgBuf, 0,
 			(va_list *)pInsertStrings))
 	{
 		return NULL;
@@ -244,8 +260,10 @@ static void	zbx_translate_message_params(char **message, HINSTANCE hLib)
 	}
 }
 
+#define MAX_INSERT_STRS 100
+
 /* get Nth error from event log. 1 is the first. */
-static int	zbx_get_eventlog_message(LPCTSTR wsource, HANDLE eventlog_handle, long which, char **out_source,
+static int	zbx_get_eventlog_message(const wchar_t *wsource, HANDLE eventlog_handle, long which, char **out_source,
 		char **out_message, unsigned short *out_severity, unsigned long *out_timestamp,
 		unsigned long *out_eventid)
 {
@@ -253,8 +271,8 @@ static int	zbx_get_eventlog_message(LPCTSTR wsource, HANDLE eventlog_handle, lon
 	int		buffer_size = 512;
 	EVENTLOGRECORD	*pELR = NULL;
 	DWORD		dwRead, dwNeeded, dwErr;
-	LPTSTR		pEventMessageFile = NULL, pParamMessageFile = NULL, pFile = NULL, pNextFile = NULL, pCh,
-			*pInsertStrings = NULL;
+	wchar_t 	*pEventMessageFile = NULL, *pParamMessageFile = NULL, *pFile = NULL, *pNextFile = NULL, *pCh,
+			*aInsertStrings[MAX_INSERT_STRS];
 	HINSTANCE	hLib = NULL, hParamLib = NULL;
 	long		i, err = 0;
 	int		ret = FAIL;
@@ -266,6 +284,7 @@ static int	zbx_get_eventlog_message(LPCTSTR wsource, HANDLE eventlog_handle, lon
 	*out_severity	= 0;
 	*out_timestamp	= 0;
 	*out_eventid	= 0;
+	memset(aInsertStrings, 0, sizeof(aInsertStrings));
 
 	pELR = (EVENTLOGRECORD *)zbx_malloc((void *)pELR, buffer_size);
 
@@ -285,22 +304,20 @@ static int	zbx_get_eventlog_message(LPCTSTR wsource, HANDLE eventlog_handle, lon
 	*out_severity	= pELR->EventType;			/* return event type */
 	*out_timestamp	= pELR->TimeGenerated;			/* return timestamp */
 	*out_eventid	= pELR->EventID & 0xffff;
-	*out_source	= zbx_unicode_to_utf8((LPTSTR)(pELR + 1));	/* copy source name */
+	*out_source	= zbx_unicode_to_utf8((wchar_t *)(pELR + 1));	/* copy source name */
 
 	/* get message file names */
-	zbx_get_message_files(wsource, (LPTSTR)(pELR + 1), &pEventMessageFile, &pParamMessageFile);
+	zbx_get_message_files(wsource, (wchar_t *)(pELR + 1), &pEventMessageFile, &pParamMessageFile);
 
 	/* prepare insert string array */
 	if (0 < pELR->NumStrings)
 	{
-		pInsertStrings = zbx_malloc(NULL, sizeof(LPWSTR) * pELR->NumStrings);
+		pCh = (wchar_t *)((unsigned char *)pELR + pELR->StringOffset);
 
-		pCh = (LPWSTR)((LPBYTE)pELR + pELR->StringOffset);
-
-		for (i = 0; i < pELR->NumStrings; i++)
+		for (i = 0; i < pELR->NumStrings && i < MAX_INSERT_STRS; i++)
 		{
-			pInsertStrings[i] = pCh;
-			pCh += zbx_strlen(pCh) + 1;
+			aInsertStrings[i] = pCh;
+			pCh += wcslen(pCh) + 1;
 		}
 	}
 
@@ -308,7 +325,7 @@ static int	zbx_get_eventlog_message(LPCTSTR wsource, HANDLE eventlog_handle, lon
 
 	for (pFile = pEventMessageFile; NULL != pFile && err != SUCCEED; pFile = pNextFile)
 	{
-		if (NULL != (pNextFile = zbx_strchr(pFile, ';')))
+		if (NULL != (pNextFile = wcschr(pFile, TEXT(';'))))
 		{
 			*pNextFile = '\0';
 			pNextFile++;
@@ -316,7 +333,7 @@ static int	zbx_get_eventlog_message(LPCTSTR wsource, HANDLE eventlog_handle, lon
 
 		if (NULL != (hLib = zbx_load_message_file(pFile)))
 		{
-			if (NULL != (*out_message = zbx_format_message(hLib, pELR->EventID, pInsertStrings)))
+			if (NULL != (*out_message = zbx_format_message(hLib, pELR->EventID, aInsertStrings)))
 			{
 				err = SUCCEED;
 
@@ -331,8 +348,6 @@ static int	zbx_get_eventlog_message(LPCTSTR wsource, HANDLE eventlog_handle, lon
 		}
 	}
 
-	zbx_free(pInsertStrings);
-
 	zbx_free(pEventMessageFile);
 	zbx_free(pParamMessageFile);
 
@@ -349,9 +364,9 @@ static int	zbx_get_eventlog_message(LPCTSTR wsource, HANDLE eventlog_handle, lon
 
 			*out_message = zbx_strdcat(*out_message, " The following information is part of the event: ");
 
-			for (i = 0, pCh = (LPWSTR)((LPBYTE)pELR + pELR->StringOffset);
+			for (i = 0, pCh = (wchar_t *)((unsigned char *)pELR + pELR->StringOffset);
 					i < pELR->NumStrings;
-					i++, pCh += zbx_strlen(pCh) + 1)
+					i++, pCh += wcslen(pCh) + 1)
 			{
 				if (0 < i)
 					*out_message = zbx_strdcat(*out_message, "; ");
@@ -378,9 +393,8 @@ int	process_eventlog(const char *source, zbx_uint64_t *lastlogsize, unsigned lon
 {
 	const char	*__function_name = "process_eventlog";
 	int		ret = FAIL;
-	static HMODULE	hmod_wevtapi = NULL;
 	HANDLE		eventlog_handle;
-	LPTSTR		wsource;
+	wchar_t 	*wsource;
 	zbx_uint64_t	FirstID, LastID;
 	register long	i;
 
@@ -441,7 +455,7 @@ int	process_eventlog(const char *source, zbx_uint64_t *lastlogsize, unsigned lon
 }
 
 /* open eventlog using API 6 and return the number of records */
-static int zbx_open_eventlog6(LPCWSTR wsource, zbx_uint64_t *lastlogsize, EVT_HANDLE *render_context,
+static int zbx_open_eventlog6(const wchar_t *wsource, zbx_uint64_t *lastlogsize, EVT_HANDLE *render_context,
 		zbx_uint64_t *FirstID, zbx_uint64_t *LastID)
 {
 	const char	*__function_name = "zbx_open_eventlog6";
@@ -455,7 +469,7 @@ static int zbx_open_eventlog6(LPCWSTR wsource, zbx_uint64_t *lastlogsize, EVT_HA
 	DWORD		size = DEFAULT_EVENT_CONTENT_SIZE;
 	DWORD		bookmarkedCount = 0;
 	zbx_uint64_t	numIDs = 0;
-	LPSTR		tmp_str = NULL;
+	char		*tmp_str = NULL;
 	int		ret = FAIL;
 
 	*FirstID = 0;
@@ -567,12 +581,12 @@ finish:
 }
 
 /* get handles of eventlog */
-static int	zbx_get_handle_eventlog6(LPCWSTR wsource, zbx_uint64_t *lastlogsize, EVT_HANDLE *query)
+static int	zbx_get_handle_eventlog6(const wchar_t *wsource, zbx_uint64_t *lastlogsize, EVT_HANDLE *query)
 {
 	const char	*__function_name = "zbx_get_handle_eventlog6";
-	LPWSTR		event_query = NULL;
+	wchar_t		*event_query = NULL;
 	DWORD		status = 0;
-	LPSTR		tmp_str = NULL;
+	char		*tmp_str = NULL;
 	int		ret = FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s(), previous lastlogsize:" ZBX_FS_UI64, __function_name, *lastlogsize);
@@ -606,7 +620,7 @@ int	initialize_eventlog6(const char *source, zbx_uint64_t *lastlogsize, zbx_uint
 		zbx_uint64_t *LastID, EVT_HANDLE *render_context, EVT_HANDLE *query)
 {
 	const char	*__function_name = "initialize_eventlog6";
-	LPWSTR		wsource = NULL;
+	wchar_t		*wsource = NULL;
 	int		ret = FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() source:'%s' previous lastlogsize:%ld",
@@ -642,14 +656,14 @@ finish:
 }
 
 /* expand the string message from a specific event handler */
-static LPSTR expand_message6(LPCWSTR pname, EVT_HANDLE event)
+static char *expand_message6(const wchar_t *pname, EVT_HANDLE event)
 {
 	const char	*__function_name = "expand_message6";
-	LPWSTR		pmessage = NULL;
+	wchar_t		*pmessage = NULL;
 	EVT_HANDLE	provider = NULL;
 	DWORD		require = 0;
-	LPSTR		out_message = NULL;
-	LPSTR		tmp_pname = NULL;
+	char		*out_message = NULL;
+	char		*tmp_pname = NULL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
@@ -691,15 +705,15 @@ finish:
 }
 
 /* obtain a particular message from a desired eventlog */
-static int	zbx_get_eventlog_message6(LPCWSTR wsource, zbx_uint64_t *which, unsigned short *out_severity,
+static int	zbx_get_eventlog_message6(const wchar_t *wsource, zbx_uint64_t *which, unsigned short *out_severity,
 		unsigned long *out_timestamp, char **out_provider, char **out_source, char **out_message,
 		unsigned long *out_eventid, EVT_HANDLE *render_context, EVT_HANDLE *query, zbx_uint64_t *keywords)
 {
 	const char		*__function_name = "zbx_get_eventlog_message6";
 	EVT_HANDLE		event_bookmark = NULL;
 	EVT_VARIANT*		renderedContent = NULL;
-	LPCWSTR			pprovider = NULL;
-	LPSTR			tmp_str = NULL;
+	const wchar_t		*pprovider = NULL;
+	char			*tmp_str = NULL;
 	DWORD			size = DEFAULT_EVENT_CONTENT_SIZE;
 	DWORD			bookmarkedCount = 0;
 	DWORD			require = 0;
@@ -803,7 +817,7 @@ int	process_eventlog6(const char *source, zbx_uint64_t *lastlogsize, unsigned lo
 	const char	*__function_name = "process_eventlog6";
 	zbx_uint64_t	i = 0;
 	zbx_uint64_t	reading_startpoint = 0;
-	LPWSTR		wsource = NULL;
+	wchar_t		*wsource = NULL;
 	int		ret = FAIL;
 
 	*out_timestamp	= 0;
diff --git a/src/zabbix_agent/eventlog.h b/src/zabbix_agent/eventlog.h
index 674e875f2d5..1990907009d 100644
--- a/src/zabbix_agent/eventlog.h
+++ b/src/zabbix_agent/eventlog.h
@@ -45,8 +45,8 @@ typedef struct _EVT_VARIANT
 		ULONGLONG	FileTimeVal;
 		SYSTEMTIME	*SysTimeVal;
 		GUID		*GuidVal;
-		LPCWSTR		StringVal;
-		LPCSTR		AnsiStringVal;
+		const wchar_t	*StringVal;
+		const char	*AnsiStringVal;
 		PBYTE		BinaryVal;
 		PSID		SidVal;
 		size_t		SizeTVal;
@@ -66,15 +66,15 @@ typedef struct _EVT_VARIANT
 		FILETIME	*FileTimeArr;
 		SYSTEMTIME	*SysTimeArr;
 		GUID		*GuidArr;
-		LPWSTR		*StringArr;
-		LPSTR		*AnsiStringArr;
+		wchar_t		**StringArr;
+		char		**AnsiStringArr;
 		PSID		*SidArr;
 		size_t		*SizeTArr;
 
 		/* internal fields */
 		EVT_HANDLE	EvtHandleVal;
-		LPCWSTR		XmlVal;
-		LPCWSTR		*XmlValArr;
+		const wchar_t	*XmlVal;
+		const wchar_t	**XmlValArr;
 	};
 
 	DWORD	Count;   /* number of elements (not length) in bytes */
@@ -185,10 +185,10 @@ int			initialize_eventlog6(const char *source, zbx_uint64_t *lastlogsize, zbx_ui
 			zbx_uint64_t *LastID, EVT_HANDLE *render_context, EVT_HANDLE *query);
 int			finalize_eventlog6(EVT_HANDLE *render_context, EVT_HANDLE *query);
 
-EVT_HANDLE WINAPI	EvtOpenLog(EVT_HANDLE Session, LPCWSTR Path, DWORD Flags);
-EVT_HANDLE WINAPI	EvtCreateRenderContext(DWORD ValuePathsCount, LPCWSTR* ValuePaths, DWORD Flags);
-EVT_HANDLE WINAPI	EvtQuery(EVT_HANDLE Session, LPCWSTR Path, LPCWSTR Query, DWORD Flags);
-EVT_HANDLE WINAPI	EvtOpenPublisherMetadata(EVT_HANDLE Session, LPCWSTR PublisherId, LPCWSTR LogFilePath,
+EVT_HANDLE WINAPI	EvtOpenLog(EVT_HANDLE Session, const wchar_t *Path, DWORD Flags);
+EVT_HANDLE WINAPI	EvtCreateRenderContext(DWORD ValuePathsCount, const wchar_t **ValuePaths, DWORD Flags);
+EVT_HANDLE WINAPI	EvtQuery(EVT_HANDLE Session, const wchar_t *Path, const wchar_t *Query, DWORD Flags);
+EVT_HANDLE WINAPI	EvtOpenPublisherMetadata(EVT_HANDLE Session, const wchar_t *PublisherId, const wchar_t *LogFilePath,
 			LCID Locale, DWORD Flags);
 BOOL WINAPI		EvtGetLogInfo( EVT_HANDLE Log, EVT_LOG_PROPERTY_ID PropertyId, DWORD PropertyValueBufferSize,
 			PEVT_VARIANT PropertyValueBuffer,	__out PDWORD PropertyValueBufferUsed);
@@ -200,6 +200,6 @@ BOOL WINAPI		EvtNext(EVT_HANDLE ResultSet, DWORD EventsSize, PEVT_HANDLE Events,
 BOOL WINAPI		EvtClose(EVT_HANDLE Object);
 BOOL WINAPI		EvtFormatMessage(EVT_HANDLE PublisherMetadata, EVT_HANDLE Event, DWORD MessageId,
 			DWORD ValueCount, PEVT_VARIANT Values, DWORD Flags, DWORD BufferSize,
-			__out_ecount_part_opt(BufferSize, *BufferUsed) LPWSTR Buffer, __out PDWORD BufferUsed);
+			__out_ecount_part_opt(BufferSize, *BufferUsed) wchar_t *Buffer, __out PDWORD BufferUsed);
 #endif	/* ZABBIX_EVENTLOG_H */
 
diff --git a/src/zabbix_agent/listener.c b/src/zabbix_agent/listener.c
index 4d0e7dc70a3..5c3faac947b 100644
--- a/src/zabbix_agent/listener.c
+++ b/src/zabbix_agent/listener.c
@@ -40,26 +40,47 @@ extern int		server_num, process_num;
 static void	process_listener(zbx_sock_t *s)
 {
 	AGENT_RESULT	result;
-	char		*command;
 	char		**value = NULL;
 	int		ret;
 
-	if (SUCCEED == (ret = zbx_tcp_recv_to(s, &command, CONFIG_TIMEOUT)))
+	if (SUCCEED == (ret = zbx_tcp_recv_to(s, CONFIG_TIMEOUT)))
 	{
-		zbx_rtrim(command, "\r\n");
+		zbx_rtrim(s->buffer, "\r\n");
 
-		zabbix_log(LOG_LEVEL_DEBUG, "Requested [%s]", command);
+		zabbix_log(LOG_LEVEL_DEBUG, "Requested [%s]", s->buffer);
 
 		init_result(&result);
-		process(command, 0, &result);
 
-		if (NULL == (value = GET_TEXT_RESULT(&result)))
+		if (SUCCEED == process(s->buffer, 0, &result))
+		{
+			if (NULL != (value = GET_TEXT_RESULT(&result)))
+			{
+				zabbix_log(LOG_LEVEL_DEBUG, "Sending back [%s]", *value);
+				ret = zbx_tcp_send_to(s, *value, CONFIG_TIMEOUT);
+			}
+		}
+		else
+		{
 			value = GET_MSG_RESULT(&result);
 
-		if (NULL != value)
-		{
-			zabbix_log(LOG_LEVEL_DEBUG, "Sending back [%s]", *value);
-			ret = zbx_tcp_send_to(s, *value, CONFIG_TIMEOUT);
+			if (NULL != value)
+			{
+				static char	*buffer = NULL;
+				static size_t	buffer_alloc = 256;
+				size_t		buffer_offset = 0;
+
+				if (NULL == buffer)
+					buffer = zbx_malloc(buffer, buffer_alloc);
+
+				zbx_strncpy_alloc(&buffer, &buffer_alloc, &buffer_offset,
+						ZBX_NOTSUPPORTED, sizeof(ZBX_NOTSUPPORTED) - 1);
+				buffer_offset++;
+				zbx_strcpy_alloc(&buffer, &buffer_alloc, &buffer_offset, *value);
+
+				ret = zbx_tcp_send_bytes_to(s, buffer, buffer_offset, CONFIG_TIMEOUT);
+			}
+			else
+				ret = zbx_tcp_send_to(s, ZBX_NOTSUPPORTED, CONFIG_TIMEOUT);
 		}
 
 		free_result(&result);
@@ -122,6 +143,6 @@ ZBX_THREAD_ENTRY(listener_thread, args)
 #ifdef _WINDOWS
 	ZBX_DO_EXIT();
 
-	zbx_thread_exit(0);
+	zbx_thread_exit(EXIT_SUCCESS);
 #endif
 }
diff --git a/src/zabbix_agent/logfiles.c b/src/zabbix_agent/logfiles.c
index 69f0d4b2921..15735a82d43 100644
--- a/src/zabbix_agent/logfiles.c
+++ b/src/zabbix_agent/logfiles.c
@@ -23,8 +23,15 @@
 
 #if defined(_WINDOWS)
 #	include "gnuregex.h"
+#	include "symbols.h"
 #endif /* _WINDOWS */
 
+#define MAX_LEN_MD5	512	/* maximum size of the initial part of the file to calculate MD5 sum for */
+
+#define ZBX_SAME_FILE_ERROR	-1
+#define ZBX_SAME_FILE_NO	0
+#define ZBX_SAME_FILE_YES	1
+
 /******************************************************************************
  *                                                                            *
  * Function: split_string                                                     *
@@ -67,7 +74,7 @@ static int	split_string(const char *str, const char *del, char **part1, char **p
 		goto out;
 	}
 
-	part1_length = del - str + 1;
+	part1_length = (size_t)(del - str + 1);
 	part2_length = str_length - part1_length;
 
 	*part1 = zbx_malloc(*part1, part1_length + 1);
@@ -88,9 +95,13 @@ out:
  *                                                                            *
  * Function: split_filename                                                   *
  *                                                                            *
- * Purpose: separates filename to directory and to file format (regexp)       *
+ * Purpose: separates filename to directory and to file name pattern (regexp) *
  *                                                                            *
- * Parameters: filename - first parameter of log[] item                       *
+ * Parameters: filename  - [IN] first parameter of logrt[] item               *
+ *             directory - [IN/OUT] directory part of the 'filename'          *
+ *             format    - [IN/OUT] file name pattern part                    *
+ *             err_msg   - [IN/OUT] error message why an item became          *
+ *                         NOTSUPPORTED                                       *
  *                                                                            *
  * Return value: SUCCEED - on successful splitting                            *
  *               FAIL - on unable to split sensibly                           *
@@ -102,7 +113,7 @@ out:
  *           is freed.                                                        *
  *                                                                            *
  ******************************************************************************/
-static int	split_filename(const char *filename, char **directory, char **format)
+static int	split_filename(const char *filename, char **directory, char **format, char **err_msg)
 {
 	const char	*__function_name = "split_filename";
 	const char	*separator = NULL;
@@ -111,15 +122,11 @@ static int	split_filename(const char *filename, char **directory, char **format)
 #ifdef _WINDOWS
 	size_t		sz;
 #endif
-
-	assert(NULL != directory && '\0' == *directory);
-	assert(NULL != format && '\0' == *format);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() filename:'%s'", __function_name, filename ? filename : "NULL");
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() filename:'%s'", __function_name, ZBX_NULL2STR(filename));
 
 	if (NULL == filename || '\0' == *filename)
 	{
-		zabbix_log(LOG_LEVEL_DEBUG, "cannot split empty path");
+		*err_msg = zbx_strdup(*err_msg, "Cannot split empty path.");
 		goto out;
 	}
 
@@ -136,7 +143,7 @@ static int	split_filename(const char *filename, char **directory, char **format)
 		/* separator must be relative delimiter of the original filename */
 		if (FAIL == split_string(filename, separator, directory, format))
 		{
-			zabbix_log(LOG_LEVEL_DEBUG, "cannot split '%s'", filename);
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot split path by \"%c\".", PATH_SEPARATOR);
 			goto out;
 		}
 
@@ -145,7 +152,7 @@ static int	split_filename(const char *filename, char **directory, char **format)
 		/* Windows world verification */
 		if (sz + 1 > MAX_PATH)
 		{
-			zabbix_log(LOG_LEVEL_DEBUG, "cannot proceed: directory path is too long");
+			*err_msg = zbx_strdup(*err_msg, "Directory path is too long.");
 			zbx_free(*directory);
 			zbx_free(*format);
 			goto out;
@@ -173,23 +180,26 @@ static int	split_filename(const char *filename, char **directory, char **format)
 	}
 
 	if (separator < filename)
+	{
+		*err_msg = zbx_strdup(*err_msg, "Non-existing disk or directory.");
 		goto out;
-
+	}
 #else	/* not _WINDOWS */
-	if (NULL == (separator = strrchr(filename, (int)PATH_SEPARATOR)))
+	if (NULL == (separator = strrchr(filename, PATH_SEPARATOR)))
 	{
-		zabbix_log(LOG_LEVEL_DEBUG, "filename '%s' does not contain any path separator '%c'", filename, PATH_SEPARATOR);
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot find separator \"%c\" in path.", PATH_SEPARATOR);
 		goto out;
 	}
+
 	if (SUCCEED != split_string(filename, separator, directory, format))
 	{
-		zabbix_log(LOG_LEVEL_DEBUG, "cannot split filename '%s' by '%c'", filename, PATH_SEPARATOR);
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot split path by \"%c\".", PATH_SEPARATOR);
 		goto out;
 	}
 
 	if (-1 == zbx_stat(*directory, &buf))
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "cannot find directory '%s' on the file system", *directory);
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot obtain directory information: %s", zbx_strerror(errno));
 		zbx_free(*directory);
 		zbx_free(*format);
 		goto out;
@@ -197,7 +207,7 @@ static int	split_filename(const char *filename, char **directory, char **format)
 
 	if (0 == S_ISDIR(buf.st_mode))
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "cannot proceed: directory '%s' is a file", *directory);
+		*err_msg = zbx_dsprintf(*err_msg, "Base path \"%s\" is not a directory.", *directory);
 		zbx_free(*directory);
 		zbx_free(*format);
 		goto out;
@@ -212,44 +222,769 @@ out:
 	return ret;
 }
 
-struct st_logfile
+/******************************************************************************
+ *                                                                            *
+ * Function: file_start_md5                                                   *
+ *                                                                            *
+ * Purpose: calculate the MD5 sum of the first block of the file              *
+ *                                                                            *
+ * Parameters:                                                                *
+ *     f        - [IN] file descriptor                                        *
+ *     length   - [IN] length of the block in bytes. Maximum is 512 bytes.    *
+ *     md5buf   - [OUT] output buffer, MD5_DIGEST_SIZE-bytes long, where the  *
+ *                calculated MD5 sum is placed                                *
+ *     filename - [IN] file name, used in error logging                       *
+ *     err_msg  - [IN/OUT] error message why an item became NOTSUPPORTED      *
+ *                                                                            *
+ * Return value: SUCCEED or FAIL                                              *
+ *                                                                            *
+ ******************************************************************************/
+static int	file_start_md5(int f, int length, md5_byte_t *md5buf, const char *filename, char **err_msg)
 {
-	char	*filename;
-	int	mtime;
-};
+	md5_state_t	state;
+	char		buf[MAX_LEN_MD5];
+	int		rc;
+
+	if (MAX_LEN_MD5 < length)
+	{
+		*err_msg = zbx_dsprintf(*err_msg, "Length %d exceeds maximum MD5 fragment length of %d.", length,
+				MAX_LEN_MD5);
+		return FAIL;
+	}
+
+	if ((zbx_offset_t)-1 == zbx_lseek(f, 0, SEEK_SET))
+	{
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot set position to 0 for file \"%s\": %s", filename,
+				zbx_strerror(errno));
+		return FAIL;
+	}
+
+	if (length != (rc = (int)read(f, buf, (size_t)length)))
+	{
+		if (-1 == rc)
+		{
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot read %d bytes from file \"%s\": %s", length, filename,
+					zbx_strerror(errno));
+		}
+		else
+		{
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot read %d bytes from file \"%s\". Read %d bytes only.",
+					length, filename, rc);
+		}
+
+		return FAIL;
+	}
 
+	md5_init(&state);
+	md5_append(&state, (const md5_byte_t *)buf, length);
+	md5_finish(&state, md5buf);
+
+	return SUCCEED;
+}
+
+#ifdef _WINDOWS
 /******************************************************************************
  *                                                                            *
- * Function: free_logfiles                                                    *
+ * Function: file_id                                                          *
  *                                                                            *
- * Purpose: releases memory allocated for logfiles                            *
+ * Purpose: get Microsoft Windows file device ID, 64-bit FileIndex or         *
+ *          128-bit FileId                                                    *
  *                                                                            *
- * Parameters: logfiles - pointer to the list of logfiles                     *
- *             logfiles_alloc - number of logfiles memory was allocated for   *
- *             logfiles_num - number of already inserted logfiles             *
+ * Parameters:                                                                *
+ *     f        - [IN] file descriptor                                        *
+ *     use_ino  - [IN] how to use file IDs                                    *
+ *     dev      - [OUT] device ID                                             *
+ *     ino_lo   - [OUT] 64-bit nFileIndex or lower 64-bits of FileId          *
+ *     ino_hi   - [OUT] higher 64-bits of FileId                              *
+ *     filename - [IN] file name, used in error logging                       *
+ *     err_msg  - [IN/OUT] error message why an item became NOTSUPPORTED      *
  *                                                                            *
- * Return value: none                                                         *
+ * Return value: SUCCEED or FAIL                                              *
  *                                                                            *
- * Author: Dmitry Borovikov                                                   *
+ ******************************************************************************/
+static int	file_id(int f, int use_ino, zbx_uint64_t *dev, zbx_uint64_t *ino_lo, zbx_uint64_t *ino_hi,
+		const char *filename, char **err_msg)
+{
+	int				ret = FAIL;
+	intptr_t			h;	/* file HANDLE */
+	BY_HANDLE_FILE_INFORMATION	hfi;
+	FILE_ID_INFO			fid;
+
+	if (-1 == (h = _get_osfhandle(f)))
+	{
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot obtain handle from descriptor of file \"%s\": %s",
+				filename, zbx_strerror(errno));
+		return ret;
+	}
+
+	if (1 == use_ino || 0 == use_ino)
+	{
+		/* Although nFileIndexHigh and nFileIndexLow cannot be reliably used to identify files when */
+		/* use_ino = 0 (e.g. on FAT32, exFAT), we copy indexes to have at least correct debug logs. */
+		if (0 != GetFileInformationByHandle((HANDLE)h, &hfi))
+		{
+			*dev = hfi.dwVolumeSerialNumber;
+			*ino_lo = (zbx_uint64_t)hfi.nFileIndexHigh << 32 | (zbx_uint64_t)hfi.nFileIndexLow;
+			*ino_hi = 0;
+		}
+		else
+		{
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot obtain information for file \"%s\": %s",
+					filename, strerror_from_system(GetLastError()));
+			return ret;
+		}
+	}
+	else if (2 == use_ino)
+	{
+		if (NULL != zbx_GetFileInformationByHandleEx)
+		{
+			if (0 != zbx_GetFileInformationByHandleEx((HANDLE)h, FileIdInfo, &fid, sizeof(fid)))
+			{
+				*dev = fid.VolumeSerialNumber;
+				*ino_lo = fid.FileId.LowPart;
+				*ino_hi = fid.FileId.HighPart;
+			}
+			else
+			{
+				*err_msg = zbx_dsprintf(*err_msg, "Cannot obtain extended information for file"
+						" \"%s\": %s", filename, strerror_from_system(GetLastError()));
+				return ret;
+			}
+		}
+	}
+	else
+	{
+		THIS_SHOULD_NEVER_HAPPEN;
+		return ret;
+	}
+
+	ret = SUCCEED;
+
+	return ret;
+}
+
+/******************************************************************************
  *                                                                            *
- * Comments: none                                                             *
+ * Function: set_use_ino_by_fs_type                                           *
+ *                                                                            *
+ * Purpose: find file system type and set 'use_ino' parameter                 *
+ *                                                                            *
+ * Parameters:                                                                *
+ *     path     - [IN] directory or file name                                 *
+ *     use_ino  - [IN] how to use file IDs                                    *
+ *     err_msg  - [IN/OUT] error message why an item became NOTSUPPORTED      *
+ *                                                                            *
+ * Return value: SUCCEED or FAIL                                              *
  *                                                                            *
  ******************************************************************************/
-static void free_logfiles(struct st_logfile **logfiles, int *logfiles_alloc, int *logfiles_num)
+static int	set_use_ino_by_fs_type(const char *path, int *use_ino, char **err_msg)
 {
-	const char	*__function_name = "free_logfiles";
-	int		i;
+	char	*utf8;
+	wchar_t	*path_uni, mount_point[MAX_PATH + 1], fs_type[MAX_PATH + 1];
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() logfiles_num:%d", __function_name, *logfiles_num);
+	path_uni = zbx_utf8_to_unicode(path);
 
-	for (i = 0; i < *logfiles_num; i++)
-		zbx_free((*logfiles)[i].filename);
+	/* get volume mount point */
+	if (0 == GetVolumePathName(path_uni, mount_point,
+			sizeof(mount_point) / sizeof(wchar_t)))
+	{
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot obtain volume mount point for file \"%s\": %s", path,
+				strerror_from_system(GetLastError()));
+		zbx_free(path_uni);
+		return FAIL;
+	}
 
-	zbx_free(*logfiles);
-	*logfiles_alloc = 0;
-	*logfiles_num = 0;
+	zbx_free(path_uni);
 
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+	/* Which file system type this directory resides on ? */
+	if (0 == GetVolumeInformation(mount_point, NULL, 0, NULL, NULL, NULL, fs_type,
+			sizeof(fs_type) / sizeof(wchar_t)))
+	{
+		utf8 = zbx_unicode_to_utf8(mount_point);
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot obtain volume information for directory \"%s\": %s", utf8,
+				strerror_from_system(GetLastError()));
+		zbx_free(utf8);
+		return FAIL;
+	}
+
+	utf8 = zbx_unicode_to_utf8(fs_type);
+
+	if (0 == strcmp(utf8, "NTFS"))
+		*use_ino = 1;			/* 64-bit FileIndex */
+	else if (0 == strcmp(utf8, "ReFS"))
+		*use_ino = 2;			/* 128-bit FileId */
+	else
+		*use_ino = 0;			/* cannot use inodes to identify files (e.g. FAT32) */
+
+	zabbix_log(LOG_LEVEL_DEBUG, "log files reside on '%s' file system", utf8);
+	zbx_free(utf8);
+
+	return SUCCEED;
+}
+#endif
+
+/******************************************************************************
+ *                                                                            *
+ * Function: print_logfile_list                                               *
+ *                                                                            *
+ * Purpose: write logfile list into log for debugging                         *
+ *                                                                            *
+ * Parameters:                                                                *
+ *     logfiles     - [IN] array of logfiles                                  *
+ *     logfiles_num - [IN] number of elements in the array                    *
+ *                                                                            *
+ ******************************************************************************/
+static void	print_logfile_list(struct st_logfile *logfiles, int logfiles_num)
+{
+	int	i;
+
+	for (i = 0; i < logfiles_num; i++)
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "   nr:%d filename:'%s' mtime:%d size:" ZBX_FS_UI64 " processed_size:"
+				ZBX_FS_UI64 " seq:%d incomplete:%d dev:" ZBX_FS_UI64 " ino_hi:" ZBX_FS_UI64 " ino_lo:"
+				ZBX_FS_UI64
+				" md5size:%d md5buf:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+				i, logfiles[i].filename, logfiles[i].mtime, logfiles[i].size,
+				logfiles[i].processed_size, logfiles[i].seq, logfiles[i].incomplete, logfiles[i].dev,
+				logfiles[i].ino_hi, logfiles[i].ino_lo, logfiles[i].md5size, logfiles[i].md5buf[0],
+				logfiles[i].md5buf[1], logfiles[i].md5buf[2], logfiles[i].md5buf[3],
+				logfiles[i].md5buf[4], logfiles[i].md5buf[5], logfiles[i].md5buf[6],
+				logfiles[i].md5buf[7], logfiles[i].md5buf[8], logfiles[i].md5buf[9],
+				logfiles[i].md5buf[10], logfiles[i].md5buf[11], logfiles[i].md5buf[12],
+				logfiles[i].md5buf[13], logfiles[i].md5buf[14], logfiles[i].md5buf[15]);
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: is_same_file                                                     *
+ *                                                                            *
+ * Purpose: find out wheter a file from the old list and a file from the new  *
+ *          list could be the same file                                       *
+ *                                                                            *
+ * Parameters:                                                                *
+ *          old     - [IN] file from the old list                             *
+ *          new     - [IN] file from the new list                             *
+ *          use_ino - [IN] 0 - do not use inodes in comparison,               *
+ *                         1 - use up to 64-bit inodes in comparison,         *
+ *                         2 - use 128-bit inodes in comparison.              *
+ *          err_msg - [IN/OUT] error message why an item became               *
+ *                    NOTSUPPORTED                                            *
+ *                                                                            *
+ * Return value: ZBX_SAME_FILE_NO - it is not the same file,                  *
+ *               ZBX_SAME_FILE_YES - it could be the same file,               *
+ *               ZBX_SAME_FILE_ERROR - error.                                 *
+ *                                                                            *
+ * Comments: In some cases we can say that it IS NOT the same file.           *
+ *           We can never say that it IS the same file and it has not been    *
+ *           truncated and replaced with a similar one.                       *
+ *                                                                            *
+ ******************************************************************************/
+static int	is_same_file(const struct st_logfile *old, const struct st_logfile *new, int use_ino, char **err_msg)
+{
+	int	ret = ZBX_SAME_FILE_NO;
+
+	if (1 == use_ino || 2 == use_ino)
+	{
+		if (old->ino_lo != new->ino_lo || old->dev != new->dev)
+		{
+			/* File's inode and device id cannot differ. */
+			goto out;
+		}
+	}
+
+	if (2 == use_ino && old->ino_hi != new->ino_hi)
+	{
+		/* File's inode (older 64-bits) cannot differ. */
+		goto out;
+	}
+
+	if (old->mtime > new->mtime)
+	{
+		/* File's mtime cannot decrease unless manipulated. */
+		goto out;
+	}
+
+	if (old->size > new->size)
+	{
+		/* File's size cannot decrease. Truncating or replacing a file with a smaller one */
+		/* counts as 2 different files. */
+		goto out;
+	}
+
+	if (old->size == new->size && old->mtime < new->mtime)
+	{
+		/* File's mtime cannot increase without changing size unless manipulated. */
+		goto out;
+	}
+
+	if (-1 == old->md5size || -1 == new->md5size)
+	{
+		/* Cannot compare MD5 sums. Assume two different files - reporting twice is better than skipping. */
+		goto out;
+	}
+
+	if (old->md5size > new->md5size)
+	{
+		/* File's initial block size from which MD5 sum is calculated cannot decrease. */
+		goto out;
+	}
+
+	if (old->md5size == new->md5size)
+	{
+		if (0 != memcmp(old->md5buf, new->md5buf, sizeof(new->md5buf)))
+		{
+			/* MD5 sums differ */
+			goto out;
+		}
+	}
+	else
+	{
+		if (0 < old->md5size)
+		{
+			/* MD5 for the old file has been calculated from a smaller block than for the new file */
+
+			int		f;
+			md5_byte_t	md5tmp[MD5_DIGEST_SIZE];
+
+			if (-1 == (f = zbx_open(new->filename, O_RDONLY)))
+			{
+				*err_msg = zbx_dsprintf(*err_msg, "Cannot open file \"%s\": %s", new->filename,
+						zbx_strerror(errno));
+				ret = ZBX_SAME_FILE_ERROR;
+				goto out;
+			}
+
+			if (SUCCEED == file_start_md5(f, old->md5size, md5tmp, new->filename, err_msg))
+			{
+				ret = (0 == memcmp(old->md5buf, &md5tmp, sizeof(md5tmp))) ? ZBX_SAME_FILE_YES :
+						ZBX_SAME_FILE_NO;
+			}
+			else
+				ret = ZBX_SAME_FILE_ERROR;
+
+			if (0 != close(f))
+			{
+				if (ZBX_SAME_FILE_ERROR != ret)
+				{
+					*err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s", new->filename,
+							zbx_strerror(errno));
+					ret = ZBX_SAME_FILE_ERROR;
+				}
+			}
+
+			goto out;
+		}
+	}
+
+	ret = ZBX_SAME_FILE_YES;
+out:
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: setup_old2new                                                    *
+ *                                                                            *
+ * Purpose: fill an array of possible mappings from the old log files to the  *
+ *          new log files.                                                    *
+ *                                                                            *
+ * Parameters:                                                                *
+ *          old2new - [IN] two dimensional array of possible mappings         *
+ *          old     - [IN] old file list                                      *
+ *          num_old - [IN] number of elements in the old file list            *
+ *          new     - [IN] new file list                                      *
+ *          num_new - [IN] number of elements in the new file list            *
+ *          use_ino - [IN] how to use inodes in is_same_file()                *
+ *          err_msg - [IN/OUT] error message why an item became NOTSUPPORTED  *
+ *                                                                            *
+ * Return value: SUCCEED or FAIL                                              *
+ *                                                                            *
+ * Comments:                                                                  *
+ *    The array is filled with '0' and '1' which mean:                        *
+ *       old2new[i][j] = '0' - the i-th old file IS NOT the j-th new file     *
+ *       old2new[i][j] = '1' - the i-th old file COULD BE the j-th new file   *
+ *                                                                            *
+ ******************************************************************************/
+static int	setup_old2new(char *old2new, const struct st_logfile *old, int num_old,
+		const struct st_logfile *new, int num_new, int use_ino, char **err_msg)
+{
+	int	i, j, rc;
+	char	*p = old2new;
+
+	for (i = 0; i < num_old; i++)
+	{
+		for (j = 0; j < num_new; j++)
+		{
+			rc = is_same_file(old + i, new + j, use_ino, err_msg);
+
+			if (ZBX_SAME_FILE_NO == rc)
+				p[j] = '0';
+			else if (ZBX_SAME_FILE_YES == rc)
+				p[j] = '1';
+			else if (ZBX_SAME_FILE_ERROR == rc)
+				return FAIL;
+
+			if (SUCCEED == zabbix_check_log_level(LOG_LEVEL_DEBUG))
+			{
+				zabbix_log(LOG_LEVEL_DEBUG, "setup_old2new: is_same_file(%s, %s) = %c",
+						old[i].filename, new[j].filename, p[j]);
+			}
+		}
+
+		p += (size_t)num_new;
+	}
+
+	return SUCCEED;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: cross_out                                                        *
+ *                                                                            *
+ * Purpose: fill the given row and column with '0' except the element at the  *
+ *          cross point and protected columns and protected rows              *
+ *                                                                            *
+ * Parameters:                                                                *
+ *          arr    - [IN] two dimensional array                               *
+ *          n_rows - [IN] number of rows in the array                         *
+ *          n_cols - [IN] number of columns in the array                      *
+ *          row    - [IN] number of cross point row                           *
+ *          col    - [IN] number of cross point column                        *
+ *          p_rows - [IN] vector with 'n_rows' elements.                      *
+ *                        Value '1' means protected row.                      *
+ *          p_cols - [IN] vector with 'n_cols' elements.                      *
+ *                        Value '1' means protected column.                   *
+ *                                                                            *
+ * Example:                                                                   *
+ *     Given array                                                            *
+ *                                                                            *
+ *         1 1 1 1                                                            *
+ *         1 1 1 1                                                            *
+ *         1 1 1 1                                                            *
+ *                                                                            *
+ *     and row = 1, col = 2 and no protected rows and columns                 *
+ *     the array is modified as                                               *
+ *                                                                            *
+ *         1 1 0 1                                                            *
+ *         0 0 1 0                                                            *
+ *         1 1 0 1                                                            *
+ *                                                                            *
+ ******************************************************************************/
+static void	cross_out(char *arr, int n_rows, int n_cols, int row, int col, char *p_rows, char *p_cols)
+{
+	int	i;
+	char	*p;
+
+	p = arr + row * n_cols;		/* point to the first element of the 'row' */
+
+	for (i = 0; i < n_cols; i++)	/* process row */
+	{
+		if ('1' != p_cols[i] && col != i)
+			p[i] = '0';
+	}
+
+	p = arr + col;			/* point to the top element of the 'col' */
+
+	for (i = 0; i < n_rows; i++)	/* process column */
+	{
+		if ('1' != p_rows[i] && row != i)
+			p[i * n_cols] = '0';
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: is_uniq_row                                                      *
+ *                                                                            *
+ * Purpose: check if there is only one element '1' in the given row           *
+ *                                                                            *
+ * Parameters:                                                                *
+ *          arr    - [IN] two dimensional array                               *
+ *          n_cols - [IN] number of columns in the array                      *
+ *          row    - [IN] number of row to search                             *
+ *                                                                            *
+ * Return value: number of column where the '1' element was found or          *
+ *               -1 if there are zero or multiple '1' elements in the row     *
+ *                                                                            *
+ ******************************************************************************/
+static int	is_uniq_row(const char *arr, int n_cols, int row)
+{
+	int		i, ones = 0, ret = -1;
+	const char	*p;
+
+	p = arr + row * n_cols;			/* point to the first element of the 'row' */
+
+	for (i = 0; i < n_cols; i++)
+	{
+		if ('1' == *p++)
+		{
+			if (2 == ++ones)
+			{
+				ret = -1;	/* non-unique mapping in the row */
+				break;
+			}
+
+			ret = i;
+		}
+	}
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: is_uniq_col                                                      *
+ *                                                                            *
+ * Purpose: check if there is only one element '1' in the given column        *
+ *                                                                            *
+ * Parameters:                                                                *
+ *          arr    - [IN] two dimensional array                               *
+ *          n_rows - [IN] number of rows in the array                         *
+ *          n_cols - [IN] number of columns in the array                      *
+ *          col    - [IN] number of column to search                          *
+ *                                                                            *
+ * Return value: number of row where the '1' element was found or             *
+ *               -1 if there are zero or multiple '1' elements in the column  *
+ *                                                                            *
+ ******************************************************************************/
+static int	is_uniq_col(const char *arr, int n_rows, int n_cols, int col)
+{
+	int		i, ones = 0, ret = -1;
+	const char	*p;
+
+	p = arr + col;				/* point to the top element of the 'col' */
+
+	for (i = 0; i < n_rows; i++)
+	{
+		if ('1' == *p)
+		{
+			if (2 == ++ones)
+			{
+				ret = -1;	/* non-unique mapping in the column */
+				break;
+			}
+
+			ret = i;
+		}
+
+		p += n_cols;
+	}
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: resolve_old2new                                                  *
+ *                                                                            *
+ * Purpose: resolve non-unique mappings                                       *
+ *                                                                            *
+ * Parameters:                                                                *
+ *          old2new - [IN] two dimensional array of possible mappings         *
+ *          num_old - [IN] number of elements in the old file list            *
+ *          num_new - [IN] number of elements in the new file list            *
+ *                                                                            *
+ ******************************************************************************/
+static void	resolve_old2new(char *old2new, int num_old, int num_new)
+{
+	int	i, j, ones;
+	char	*p, *protected_rows = NULL, *protected_cols = NULL;
+
+	/* Is there 1:1 mapping in both directions between files in the old and the new list ? */
+	/* In this case every row and column has not more than one element '1'. */
+	/* This is expected on UNIX (using inode numbers) and MS Windows (using FileID on NTFS, ReFS) */
+
+	p = old2new;
+
+	for (i = 0; i < num_old; i++)		/* loop over rows (old files) */
+	{
+		ones = 0;
+
+		for (j = 0; j < num_new; j++)	/* loop over columns (new files) */
+		{
+			if ('1' == *p++)
+			{
+				if (2 == ++ones)
+					goto non_unique;
+			}
+		}
+	}
+
+	for (i = 0; i < num_new; i++)		/* loop over columns */
+	{
+		p = old2new + i;
+		ones = 0;
+
+		for (j = 0; j < num_old; j++)	/* loop over rows */
+		{
+			if ('1' == *p)
+			{
+				if (2 == ++ones)
+					goto non_unique;
+			}
+			p += num_new;
+		}
+	}
+
+	return;
+non_unique:
+	/* This is expected on MS Windows using FAT32 and other file systems where inodes or file indexes */
+	/* are either not preserved if a file is renamed or are not applicable. */
+
+	zabbix_log(LOG_LEVEL_DEBUG, "resolve_old2new(): non-unique mapping");
+
+	/* protect unique mappings from further modifications */
+
+	protected_rows = zbx_calloc(protected_rows, (size_t)num_old, sizeof(char));
+	protected_cols = zbx_calloc(protected_cols, (size_t)num_new, sizeof(char));
+
+	for (i = 0; i < num_old; i++)
+	{
+		int	c;
+
+		if (-1 != (c = is_uniq_row(old2new, num_new, i)) && -1 != is_uniq_col(old2new, num_old, num_new, c))
+		{
+			protected_rows[i] = '1';
+			protected_cols[c] = '1';
+		}
+	}
+
+	/* resolve the remaining non-unique mappings - turn them into unique ones */
+
+	if (num_old <= num_new)				/* square or wide array */
+	{
+		/****************************************************************************************************
+		 *                                                                                                  *
+		 * Example for a wide array:                                                                        *
+		 *                                                                                                  *
+		 *            D.log C.log B.log A.log                                                               *
+		 *           ------------------------                                                               *
+		 *    3.log | <1>    1     1     1                                                                  *
+		 *    2.log |  1    <1>    1     1                                                                  *
+		 *    1.log |  1     1    <1>    1                                                                  *
+		 *                                                                                                  *
+		 * There are 3 files in the old log file list and 4 files in the new log file list.                 *
+		 * The mapping is totally non-unique: the old log file '3.log' could have become the new 'D.log' or *
+		 * 'C.log', or 'B.log', or 'A.log' - we don't know for sure.                                        *
+		 * We make an assumption that a reasonable solution will be to proceed as if '3.log' was renamed to *
+		 * 'D.log', '2.log' - to 'C.log' and '1.log' - to 'B.log'.                                          *
+		 * We modify the array according to this assumption:                                                *
+		 *                                                                                                  *
+		 *            D.log C.log B.log A.log                                                               *
+		 *           ------------------------                                                               *
+		 *    3.log | <1>    0     0     0                                                                  *
+		 *    2.log |  0    <1>    0     0                                                                  *
+		 *    1.log |  0     0    <1>    0                                                                  *
+		 *                                                                                                  *
+		 * Now the mapping is unique. The file 'A.log' is counted as a new file to be analyzed from the     *
+		 * start.                                                                                           *
+		 *                                                                                                  *
+		 ****************************************************************************************************/
+
+		for (i = 0; i < num_old; i++)		/* loop over rows from top-left corner */
+		{
+			if ('1' == protected_rows[i])
+				continue;
+
+			p = old2new + i * num_new;	/* the first element of the current row */
+
+			for (j = 0; j < num_new; j++)
+			{
+				if ('1' == p[j] && '1' != protected_cols[j])
+				{
+					cross_out(old2new, num_old, num_new, i, j, protected_rows, protected_cols);
+					break;
+				}
+			}
+		}
+	}
+	else	/* tall array */
+	{
+		/****************************************************************************************************
+		 *                                                                                                  *
+		 * Example for a tall array:                                                                        *
+		 *                                                                                                  *
+		 *            D.log C.log B.log A.log                                                               *
+		 *           ------------------------                                                               *
+		 *    6.log |  1     1     1     1                                                                  *
+		 *    5.log |  1     1     1     1                                                                  *
+		 *    4.log | <1>    1     1     1                                                                  *
+		 *    3.log |  1    <1>    1     1                                                                  *
+		 *    2.log |  1     1    <1>    1                                                                  *
+		 *    1.log |  1     1     1    <1>                                                                 *
+		 *                                                                                                  *
+		 * There are 6 files in the old log file list and 4 files in the new log file list.                 *
+		 * The mapping is totally non-unique: the old log file '6.log' could have become the new 'D.log' or *
+		 * 'C.log', or 'B.log', or 'A.log' - we don't know for sure.                                        *
+		 * We make an assumption that a reasonable solution will be to proceed as if '1.log' was renamed to *
+		 * 'A.log', '2.log' - to 'B.log', '3.log' - to 'C.log', '4.log' - to 'D.log'.                       *
+		 * We modify the array according to this assumption:                                                *
+		 *                                                                                                  *
+		 *            D.log C.log B.log A.log                                                               *
+		 *           ------------------------                                                               *
+		 *    6.log |  0     0     0     0                                                                  *
+		 *    5.log |  0     0     0     0                                                                  *
+		 *    4.log | <1>    0     0     0                                                                  *
+		 *    3.log |  0    <1>    0     0                                                                  *
+		 *    2.log |  0     0    <1>    0                                                                  *
+		 *    1.log |  0     0     0    <1>                                                                 *
+		 *                                                                                                  *
+		 * Now the mapping is unique. Files '6.log' and '5.log' are counted as not present in the new file. *
+		 *                                                                                                  *
+		 ****************************************************************************************************/
+
+		for (i = num_old - 1; i >= 0; i--)	/* loop over rows from bottom-right corner */
+		{
+			if ('1' == protected_rows[i])
+				continue;
+
+			p = old2new + i * num_new;	/* the first element of the current row */
+
+			for (j = num_new - 1; j >= 0; j--)
+			{
+				if ('1' == p[j] && '1' != protected_cols[j])
+				{
+					cross_out(old2new, num_old, num_new, i, j, protected_rows, protected_cols);
+					break;
+				}
+			}
+		}
+	}
+
+	zbx_free(protected_cols);
+	zbx_free(protected_rows);
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: find_old2new                                                     *
+ *                                                                            *
+ * Purpose: find a mapping from old to new file                               *
+ *                                                                            *
+ * Parameters:                                                                *
+ *          old2new - [IN] two dimensional array of possible mappings         *
+ *          num_new - [IN] number of elements in the new file list            *
+ *          i_old   - [IN] index of the old file                              *
+ *                                                                            *
+ * Return value: index of the new file or                                     *
+ *               -1 if no mapping was found                                   *
+ *                                                                            *
+ ******************************************************************************/
+static int	find_old2new(char *old2new, int num_new, int i_old)
+{
+	int	i;
+	char	*p;
+
+	p = old2new + i_old * num_new;
+
+	for (i = 0; i < num_new; i++)		/* loop over columns (new files) on i_old-th row */
+	{
+		if ('1' == *p++)
+			return i;
+	}
+
+	return -1;
 }
 
 /******************************************************************************
@@ -261,34 +996,28 @@ static void free_logfiles(struct st_logfile **logfiles, int *logfiles_alloc, int
  * Parameters: logfiles - pointer to the list of logfiles                     *
  *             logfiles_alloc - number of logfiles memory was allocated for   *
  *             logfiles_num - number of already inserted logfiles             *
- *             filename - name of a logfile (without a path)                  *
- *             mtime - modification time of a logfile                         *
+ *             filename - name of a logfile (with full path)                  *
+ *             st - structure returned by stat()                              *
  *                                                                            *
  * Return value: none                                                         *
  *                                                                            *
  * Author: Dmitry Borovikov                                                   *
  *                                                                            *
- * Comments: Must change sorting order to decrease a number of memory moves!  *
- *           Do not forget to change process_log() accordingly!               *
- *                                                                            *
  ******************************************************************************/
-static void add_logfile(struct st_logfile **logfiles, int *logfiles_alloc, int *logfiles_num, const char *filename, int mtime)
+static void	add_logfile(struct st_logfile **logfiles, int *logfiles_alloc, int *logfiles_num, const char *filename,
+		zbx_stat_t *st)
 {
 	const char	*__function_name = "add_logfile";
 	int		i = 0, cmp = 0;
 
-	assert(NULL != logfiles);
-	assert(NULL != logfiles_alloc);
-	assert(NULL != logfiles_num);
-	assert(0 <= *logfiles_num);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() filename:'%s' mtime:%d", __function_name, filename, mtime);
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() filename:'%s' mtime:%d size:" ZBX_FS_UI64, __function_name, filename,
+			(int)st->st_mtime, (zbx_uint64_t)st->st_size);
 
 	/* must be done in any case */
 	if (*logfiles_alloc == *logfiles_num)
 	{
 		*logfiles_alloc += 64;
-		*logfiles = zbx_realloc(*logfiles, *logfiles_alloc * sizeof(struct st_logfile));
+		*logfiles = zbx_realloc(*logfiles, (size_t)*logfiles_alloc * sizeof(struct st_logfile));
 
 		zabbix_log(LOG_LEVEL_DEBUG, "%s() logfiles:%p logfiles_alloc:%d",
 				__function_name, *logfiles, *logfiles_alloc);
@@ -312,10 +1041,10 @@ static void add_logfile(struct st_logfile **logfiles, int *logfiles_alloc, int *
 
 	for (; i < *logfiles_num; i++)
 	{
-		if (mtime > (*logfiles)[i].mtime)
+		if (st->st_mtime > (*logfiles)[i].mtime)
 			continue;	/* (1) sort by ascending mtime */
 
-		if (mtime == (*logfiles)[i].mtime)
+		if (st->st_mtime == (*logfiles)[i].mtime)
 		{
 			if (0 > (cmp = strcmp(filename, (*logfiles)[i].filename)))
 				continue;	/* (2) sort by descending name */
@@ -323,7 +1052,8 @@ static void add_logfile(struct st_logfile **logfiles, int *logfiles_alloc, int *
 			if (0 == cmp)
 			{
 				/* the file already exists, quite impossible branch */
-				zabbix_log(LOG_LEVEL_DEBUG, "%s() file '%s' already added", __function_name, filename);
+				zabbix_log(LOG_LEVEL_WARNING, "%s() file '%s' already added", __function_name,
+						filename);
 				goto out;
 			}
 
@@ -334,15 +1064,26 @@ static void add_logfile(struct st_logfile **logfiles, int *logfiles_alloc, int *
 		break;
 	}
 
-	if (!(0 == i && 0 == *logfiles_num) && !(0 < *logfiles_num && *logfiles_num == i))
+	if (*logfiles_num > i)
 	{
-		/* do not move if there are no logfiles or we are appending the logfile */
+		/* free a gap for inserting the new element */
 		memmove((void *)&(*logfiles)[i + 1], (const void *)&(*logfiles)[i],
-				(size_t)((*logfiles_num - i) * sizeof(struct st_logfile)));
+				(size_t)(*logfiles_num - i) * sizeof(struct st_logfile));
 	}
 
-	(*logfiles)[i].filename = strdup(filename);
-	(*logfiles)[i].mtime = mtime;
+	(*logfiles)[i].filename = zbx_strdup(NULL, filename);
+	(*logfiles)[i].mtime = st->st_mtime;
+	(*logfiles)[i].md5size = -1;
+	(*logfiles)[i].seq = 0;
+	(*logfiles)[i].incomplete = 0;
+#ifndef _WINDOWS
+	(*logfiles)[i].dev = (zbx_uint64_t)st->st_dev;
+	(*logfiles)[i].ino_lo = (zbx_uint64_t)st->st_ino;
+	(*logfiles)[i].ino_hi = 0;
+#endif
+	(*logfiles)[i].size = (zbx_uint64_t)st->st_size;
+	(*logfiles)[i].processed_size = 0;
+
 	++(*logfiles_num);
 out:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
@@ -350,244 +1091,593 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_logrt                                                    *
+ * Function: destroy_logfile_list                                             *
  *                                                                            *
- * Purpose: Find new records in logfiles with rotation                        *
+ * Purpose: release resources allocated to a logfile list                     *
  *                                                                            *
  * Parameters:                                                                *
- *     filename        - [IN] logfile name (regular expression with a path)   *
- *     lastlogsize     - [IN/OUT] offset from the beginning of the file       *
- *     mtime           - [IN/OUT] last modification time of the file          *
- *     skip_old_data   - [IN/OUT] start from the beginning of the file or     *
- *                       jump to the end                                      *
- *     big_rec         - [IN/OUT] state variable to remember whether a long   *
- *                       record is being processed                            *
- *     encoding        - [IN] text string describing encoding.                *
- *                         The following encodings are recognized:            *
- *                           "UNICODE"                                        *
- *                           "UNICODEBIG"                                     *
- *                           "UNICODEFFFE"                                    *
- *                           "UNICODELITTLE"                                  *
- *                           "UTF-16"   "UTF16"                               *
- *                           "UTF-16BE" "UTF16BE"                             *
- *                           "UTF-16LE" "UTF16LE"                             *
- *                           "UTF-32"   "UTF32"                               *
- *                           "UTF-32BE" "UTF32BE"                             *
- *                           "UTF-32LE" "UTF32LE".                            *
- *                           "" (empty string) means a single-byte character  *
- *                           set (e.g. ASCII).                                *
- *     regexps         - [IN] array of regexps                                *
- *     pattern         - [IN] pattern to match                                *
- *     output_template - [IN] output formatting template                      *
- *     p_count         - [IN/OUT] limit of records to be processed            *
- *     s_count         - [IN/OUT] limit of records to be sent to server       *
- *     process_value   - [IN] pointer to function process_value()             *
- *     server          - [IN] server to send data to                          *
- *     port            - [IN] port to send data to                            *
- *     hostname        - [IN] hostname the data comes from                    *
- *     key             - [IN] item key the data belongs to                    *
+ *     logfiles       - [IN/OUT] pointer to the list of logfiles              *
+ *     logfiles_alloc - [IN/OUT] number of logfiles memory was allocated for  *
+ *     logfiles_num   - [IN/OUT] number of already inserted logfiles          *
  *                                                                            *
- * Return value: returns SUCCEED on successful reading,                       *
- *               FAIL on other cases                                          *
+ ******************************************************************************/
+static void	destroy_logfile_list(struct st_logfile **logfiles, int *logfiles_alloc, int *logfiles_num)
+{
+	int	i;
+
+	for (i = 0; i < *logfiles_num; i++)
+		zbx_free((*logfiles)[i].filename);
+
+	*logfiles_num = 0;
+	*logfiles_alloc = 0;
+	zbx_free(*logfiles);
+}
+
+/******************************************************************************
  *                                                                            *
- * Author: Dmitry Borovikov (logrotation)                                     *
+ * Function: pick_logfile                                                     *
+ *                                                                            *
+ * Purpose: checks if the specified file meets requirements and adds it to    *
+ *          the logfile list                                                  *
+ *                                                                            *
+ * Parameters:                                                                *
+ *     directory      - [IN] directory where the logfiles reside              *
+ *     filename       - [IN] name of the logfile (without path)               *
+ *     mtime          - [IN] selection criterion "logfile modification time"  *
+ *                      The logfile will be selected if modified not before   *
+ *                      'mtime'.                                              *
+ *     re             - [IN] selection criterion "regexp describing filename  *
+ *                      pattern"                                              *
+ *     logfiles       - [IN/OUT] pointer to the list of logfiles              *
+ *     logfiles_alloc - [IN/OUT] number of logfiles memory was allocated for  *
+ *     logfiles_num   - [IN/OUT] number of already inserted logfiles          *
+ *                                                                            *
+ * Comments: This is a helper function for pick_logfiles()                    *
  *                                                                            *
  ******************************************************************************/
-int	process_logrt(char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned char *skip_old_data,
-		int *big_rec, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
-		const char *output_template, int *p_count, int *s_count, zbx_process_value_func_t process_value,
-		const char *server, unsigned short port, const char *hostname, const char *key)
+static void	pick_logfile(const char *directory, const char *filename, int mtime, const regex_t *re,
+		struct st_logfile **logfiles, int *logfiles_alloc, int *logfiles_num)
+{
+	char		*logfile_candidate = NULL;
+	zbx_stat_t	file_buf;
+
+	logfile_candidate = zbx_dsprintf(logfile_candidate, "%s%s", directory, filename);
+
+	if (0 == zbx_stat(logfile_candidate, &file_buf))
+	{
+		if (S_ISREG(file_buf.st_mode) &&
+				mtime <= file_buf.st_mtime &&
+				0 == regexec(re, filename, (size_t)0, NULL, 0))
+		{
+			add_logfile(logfiles, logfiles_alloc, logfiles_num, logfile_candidate, &file_buf);
+		}
+	}
+	else
+		zabbix_log(LOG_LEVEL_DEBUG, "cannot process entry '%s'", logfile_candidate);
+
+	zbx_free(logfile_candidate);
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: pick_logfiles                                                    *
+ *                                                                            *
+ * Purpose: find logfiles in a directory and put them into a list             *
+ *                                                                            *
+ * Parameters:                                                                *
+ *     directory      - [IN] directory where the logfiles reside              *
+ *     mtime          - [IN] selection criterion "logfile modification time"  *
+ *                      The logfile will be selected if modified not before   *
+ *                      'mtime'.                                              *
+ *     re             - [IN] selection criterion "regexp describing filename  *
+ *                      pattern"                                              *
+ *     use_ino        - [OUT] how to use inodes in is_same_file()             *
+ *     logfiles       - [IN/OUT] pointer to the list of logfiles              *
+ *     logfiles_alloc - [IN/OUT] number of logfiles memory was allocated for  *
+ *     logfiles_num   - [IN/OUT] number of already inserted logfiles          *
+ *     err_msg        - [IN/OUT] error message why an item became             *
+ *                      NOTSUPPORTED                                          *
+ *                                                                            *
+ * Return value: SUCCEED or FAIL                                              *
+ *                                                                            *
+ * Comments: This is a helper function for make_logfile_list()                *
+ *                                                                            *
+ ******************************************************************************/
+static int	pick_logfiles(const char *directory, int mtime, const regex_t *re, int *use_ino,
+		struct st_logfile **logfiles, int *logfiles_alloc, int *logfiles_num, char **err_msg)
 {
-	const char		*__function_name = "process_logrt";
-	int			i = 0, ret = FAIL, logfiles_num = 0, logfiles_alloc = 0, j = 0, reg_error;
-	char			err_buf[MAX_STRING_LEN], *directory = NULL, *format = NULL, *logfile_candidate = NULL;
-	zbx_stat_t		file_buf;
-	struct st_logfile	*logfiles = NULL;
 #ifdef _WINDOWS
+	int			ret = FAIL;
 	char			*find_path = NULL, *file_name_utf8;
-	wchar_t			*find_wpath;
+	wchar_t			*find_wpath = NULL;
 	intptr_t		find_handle;
 	struct _wfinddata_t	find_data;
+
+	/* "open" Windows directory */
+	find_path = zbx_dsprintf(find_path, "%s*", directory);
+	find_wpath = zbx_utf8_to_unicode(find_path);
+
+	if (-1 == (find_handle = _wfindfirst(find_wpath, &find_data)))
+	{
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot open directory \"%s\" for reading: %s", directory,
+				zbx_strerror(errno));
+		zbx_free(find_wpath);
+		zbx_free(find_path);
+		return FAIL;
+	}
+
+	if (SUCCEED != set_use_ino_by_fs_type(find_path, use_ino, err_msg))
+		goto clean;
+
+	do
+	{
+		file_name_utf8 = zbx_unicode_to_utf8(find_data.name);
+		pick_logfile(directory, file_name_utf8, mtime, re, logfiles, logfiles_alloc, logfiles_num);
+		zbx_free(file_name_utf8);
+	}
+	while (0 == _wfindnext(find_handle, &find_data));
+
+	ret = SUCCEED;
+clean:
+	if (-1 == _findclose(find_handle))
+	{
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot close directory \"%s\": %s", directory, zbx_strerror(errno));
+		ret = FAIL;
+	}
+
+	zbx_free(find_wpath);
+	zbx_free(find_path);
+
+	return ret;
 #else
-	DIR			*dir = NULL;
-	struct dirent		*d_ent = NULL;
-#endif
-	regex_t			re;
-	time_t			now;
+	DIR		*dir = NULL;
+	struct dirent	*d_ent = NULL;
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() filename:'%s' lastlogsize:" ZBX_FS_UI64 " mtime:%d",
-			__function_name, filename, *lastlogsize, *mtime);
+	if (NULL == (dir = opendir(directory)))
+	{
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot open directory \"%s\" for reading: %s", directory,
+				zbx_strerror(errno));
+		return FAIL;
+	}
+
+	/* on UNIX file systems we always assume that inodes can be used to identify files */
+	*use_ino = 1;
 
-	/* splitting filename */
-	if (SUCCEED != split_filename(filename, &directory, &format))
+	while (NULL != (d_ent = readdir(dir)))
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "filename '%s' does not contain a valid directory and/or format",
-				filename);
-		goto out;
+		pick_logfile(directory, d_ent->d_name, mtime, re, logfiles, logfiles_alloc, logfiles_num);
 	}
 
-	if (0 != (reg_error = regcomp(&re, format, REG_EXTENDED | REG_NEWLINE | REG_NOSUB)))
+	if (-1 == closedir(dir))
 	{
-		regerror(reg_error, &re, err_buf, sizeof(err_buf));
-		zabbix_log(LOG_LEVEL_WARNING, "Cannot compile a regexp describing filename pattern '%s' for a logrt[] "
-				"item. Error: %s", format, err_buf);
-		goto out;
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot close directory \"%s\": %s", directory, zbx_strerror(errno));
+		return FAIL;
 	}
 
-	/* Minimize data loss if the system clock has been set back in time. */
-	/* Setting the clock ahead of time is harmless in our case. */
-	if ((time_t)-1 != (now = time(NULL)))
+	return SUCCEED;
+#endif
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: make_logfile_list                                                *
+ *                                                                            *
+ * Purpose: select log files to be analyzed and make a list, set 'use_ino'    *
+ *          parameter                                                         *
+ *                                                                            *
+ * Parameters:                                                                *
+ *     is_logrt       - [IN] Item type: 0 - log[], 1 - logrt[]                *
+ *     filename       - [IN] logfile name (regular expression with a path)    *
+ *     mtime          - [IN] last modification time of the file               *
+ *     logfiles       - [IN/OUT] pointer to the list of logfiles              *
+ *     logfiles_alloc - [IN/OUT] number of logfiles memory was allocated for  *
+ *     logfiles_num   - [IN/OUT] number of already inserted logfiles          *
+ *     use_ino        - [IN/OUT] how to use inode numbers                     *
+ *     err_msg        - [IN/OUT] error message why an item became             *
+ *                      NOTSUPPORTED                                          *
+ *                                                                            *
+ * Return value: SUCCEED or FAIL                                              *
+ *                                                                            *
+ ******************************************************************************/
+static int	make_logfile_list(int is_logrt, const char *filename, const int *mtime, struct st_logfile **logfiles,
+		int *logfiles_alloc, int *logfiles_num, int *use_ino, char **err_msg)
+{
+	int		ret = SUCCEED, i;
+	zbx_stat_t	file_buf;
+
+	if (0 == is_logrt)	/* log[] item */
 	{
-		if (now < *mtime)
+		if (0 != zbx_stat(filename, &file_buf))
 		{
-			int	old_mtime;
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot obtain information for file \"%s\": %s", filename,
+					zbx_strerror(errno));
+			ret = FAIL;
+			goto clean;
+		}
+
+		if (!S_ISREG(file_buf.st_mode))
+		{
+			*err_msg = zbx_dsprintf(*err_msg, "\"%s\" is not a regular file.", filename);
+			ret = FAIL;
+			goto clean;
+		}
 
-			old_mtime = *mtime;
-			*mtime = (int)now;
-			zabbix_log(LOG_LEVEL_WARNING, "System clock has been set back in time. Setting agent mtime %d "
-					"seconds back.", (int)(old_mtime - now));
+		add_logfile(logfiles, logfiles_alloc, logfiles_num, filename, &file_buf);
+#ifdef _WINDOWS
+		if (SUCCEED != set_use_ino_by_fs_type(filename, use_ino, err_msg))
+		{
+			ret = FAIL;
+			goto clean;
 		}
+#else
+		/* on UNIX file systems we always assume that inodes can be used to identify files */
+		*use_ino = 1;
+#endif
 	}
-	else
+	else	/* logrt[] item */
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "cannot get system time");
-		regfree(&re);
-		goto out;
-	}
+		char	*directory = NULL, *format = NULL;
+		int	reg_error;
+		regex_t	re;
+
+		/* split a filename into directory and file mask (regular expression) parts */
+		if (SUCCEED != split_filename(filename, &directory, &format, err_msg))
+		{
+			ret = FAIL;
+			goto clean;
+		}
+
+		if (0 != (reg_error = regcomp(&re, format, REG_EXTENDED | REG_NEWLINE | REG_NOSUB)))
+		{
+			char	err_buf[MAX_STRING_LEN];
 
+			regerror(reg_error, &re, err_buf, sizeof(err_buf));
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot compile a regular expression describing filename"
+					" pattern: %s", err_buf);
+			ret = FAIL;
 #ifdef _WINDOWS
-	/* try to "open" Windows directory */
-	find_path = zbx_dsprintf(find_path, "%s*", directory);
-	find_wpath = zbx_utf8_to_unicode(find_path);
-	zbx_free(find_path);
+			/* the Windows gnuregex implementation does not correctly clean up */
+			/* allocated memory after regcomp() failure                        */
+			regfree(&re);
+#endif
+			goto clean1;
+		}
 
-	if (-1 == (find_handle = _wfindfirst(find_wpath, &find_data)))
-	{
-		zabbix_log(LOG_LEVEL_WARNING, "cannot open directory \"%s\" for reading: %s", directory,
-				zbx_strerror(errno));
+		if (SUCCEED != pick_logfiles(directory, *mtime, &re, use_ino, logfiles, logfiles_alloc, logfiles_num,
+				err_msg))
+		{
+			ret = FAIL;
+			goto clean2;
+		}
+
+		if (0 == *logfiles_num)
+		{
+			/* Do not make a logrt[] item NOTSUPPORTED if there are no matching log files or they are not */
+			/* accessible (can happen during a rotation), just log the problem. */
+			zabbix_log(LOG_LEVEL_WARNING, "there are no files matching '%s' in '%s'", format, directory);
+		}
+clean2:
 		regfree(&re);
+clean1:
 		zbx_free(directory);
 		zbx_free(format);
-		zbx_free(find_wpath);
-		goto out;
+
+		if (FAIL == ret)
+			goto clean;
 	}
-	zbx_free(find_wpath);
 
-	do
+	/* Fill in MD5 sums and file indexes in the logfile list. */
+	/* These operations require opening of file, therefore we group them together. */
+	for (i = 0; i < *logfiles_num; i++)
 	{
-		file_name_utf8 = zbx_unicode_to_utf8(find_data.name);
-		logfile_candidate = zbx_dsprintf(logfile_candidate, "%s%s", directory, file_name_utf8);
+		int			f;
+		struct st_logfile	*p;
+
+		p = *logfiles + i;
 
-		if (0 == zbx_stat(logfile_candidate, &file_buf))
+		if (-1 == (f = zbx_open(p->filename, O_RDONLY)))
 		{
-			if (S_ISREG(file_buf.st_mode) &&
-					*mtime <= file_buf.st_mtime &&
-					0 == regexec(&re, file_name_utf8, (size_t)0, NULL, 0))
-			{
-				zabbix_log(LOG_LEVEL_DEBUG, "adding file '%s' to logfiles", logfile_candidate);
-				add_logfile(&logfiles, &logfiles_alloc, &logfiles_num, file_name_utf8,
-						(int)file_buf.st_mtime);
-			}
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot open file \"%s\": %s", p->filename,
+					zbx_strerror(errno));
+			ret = FAIL;
+			break;
 		}
-		else
-			zabbix_log(LOG_LEVEL_DEBUG, "cannot process entry '%s'", logfile_candidate);
 
-		zbx_free(logfile_candidate);
-		zbx_free(file_name_utf8);
+		p->md5size = (zbx_uint64_t)MAX_LEN_MD5 > p->size ? (int)p->size : MAX_LEN_MD5;
 
+		if (SUCCEED != file_start_md5(f, p->md5size, p->md5buf, p->filename, err_msg))
+		{
+			ret = FAIL;
+			goto clean3;
+		}
+#ifdef _WINDOWS
+		if (SUCCEED != file_id(f, *use_ino, &p->dev, &p->ino_lo, &p->ino_hi, p->filename, err_msg))
+			ret = FAIL;
+#endif	/*_WINDOWS*/
+clean3:
+		if (0 != close(f))
+		{
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s", p->filename,
+					zbx_strerror(errno));
+			ret = FAIL;
+			break;
+		}
 	}
-	while (0 == _wfindnext(find_handle, &find_data));
+clean:
+	if (FAIL == ret && NULL != *logfiles)
+		destroy_logfile_list(logfiles, logfiles_alloc, logfiles_num);
 
-#else	/* not _WINDOWS */
-	if (NULL == (dir = opendir(directory)))
+	return	ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: process_logrt                                                    *
+ *                                                                            *
+ * Purpose: Find new records in logfiles                                      *
+ *                                                                            *
+ * Parameters:                                                                *
+ *     is_logrt         - [IN] Item type: 0 - log[], 1 - logrt[]              *
+ *     filename         - [IN] logfile name (regular expression with a path)  *
+ *     lastlogsize      - [IN/OUT] offset from the beginning of the file      *
+ *     mtime            - [IN/OUT] last modification time of the file         *
+ *     skip_old_data    - [IN/OUT] start from the beginning of the file or    *
+ *                        jump to the end                                     *
+ *     big_rec          - [IN/OUT] state variable to remember whether a long  *
+ *                        record is being processed                           *
+ *     use_ino          - [IN/OUT] how to use inode numbers                   *
+ *     error_count      - [IN/OUT] number of errors (for limiting retries)    *
+ *     err_msg          - [IN/OUT] error message why an item became           *
+ *                        NOTSUPPORTED                                        *
+ *     logfiles_old     - [IN/OUT] array of logfiles from the last check      *
+ *     logfiles_num_old - [IN/OUT] number of elements in "logfiles_old"       *
+ *     encoding         - [IN] text string describing encoding.               *
+ *                          The following encodings are recognized:           *
+ *                            "UNICODE"                                       *
+ *                            "UNICODEBIG"                                    *
+ *                            "UNICODEFFFE"                                   *
+ *                            "UNICODELITTLE"                                 *
+ *                            "UTF-16"   "UTF16"                              *
+ *                            "UTF-16BE" "UTF16BE"                            *
+ *                            "UTF-16LE" "UTF16LE"                            *
+ *                            "UTF-32"   "UTF32"                              *
+ *                            "UTF-32BE" "UTF32BE"                            *
+ *                            "UTF-32LE" "UTF32LE".                           *
+ *                          "" (empty string) means a single-byte character   *
+ *                             set.                                           *
+ *     regexps          - [IN] array of regexps                               *
+ *     pattern          - [IN] pattern to match                               *
+ *     output_template  - [IN] output formatting template                     *
+ *     p_count          - [IN/OUT] limit of records to be processed           *
+ *     s_count          - [IN/OUT] limit of records to be sent to server      *
+ *     process_value    - [IN] pointer to function process_value()            *
+ *     server           - [IN] server to send data to                         *
+ *     port             - [IN] port to send data to                           *
+ *     hostname         - [IN] hostname the data comes from                   *
+ *     key              - [IN] item key the data belongs to                   *
+ *                                                                            *
+ * Return value: returns SUCCEED on successful reading,                       *
+ *               FAIL on other cases                                          *
+ *                                                                            *
+ * Author: Dmitry Borovikov (logrotation)                                     *
+ *                                                                            *
+ ******************************************************************************/
+int	process_logrt(int is_logrt, char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned char *skip_old_data,
+		int *big_rec, int *use_ino, int *error_count, char **err_msg, struct st_logfile **logfiles_old,
+		int *logfiles_num_old, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
+		const char *output_template, int *p_count, int *s_count, zbx_process_value_func_t process_value,
+		const char *server, unsigned short port, const char *hostname, const char *key)
+{
+	const char		*__function_name = "process_logrt";
+	int			i, j, start_idx, ret = FAIL, logfiles_num = 0, logfiles_alloc = 0, seq = 1,
+				max_old_seq = 0, old_last, from_first_file = 1;
+	char			*old2new = NULL;
+	struct st_logfile	*logfiles = NULL;
+	time_t			now;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() is_logrt:%d filename:'%s' lastlogsize:" ZBX_FS_UI64 " mtime:%d "
+			"error_count:%d", __function_name, is_logrt, filename, *lastlogsize, *mtime, *error_count);
+
+	/* Minimize data loss if the system clock has been set back in time. */
+	/* Setting the clock ahead of time is harmless in our case. */
+	if (*mtime > (now = time(NULL)))
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "cannot open directory '%s' for reading: %s", directory, zbx_strerror(errno));
-		regfree(&re);
-		zbx_free(directory);
-		zbx_free(format);
+		int	old_mtime;
+
+		old_mtime = *mtime;
+		*mtime = (int)now;
+
+		zabbix_log(LOG_LEVEL_WARNING, "System clock has been set back in time. Setting agent mtime %d "
+				"seconds back.", (int)(old_mtime - now));
+	}
+
+	if (SUCCEED != make_logfile_list(is_logrt, filename, mtime, &logfiles, &logfiles_alloc, &logfiles_num, use_ino,
+			err_msg))
+	{
+		/* an error occurred or a file was not accessible for a log[] item */
+		(*error_count)++;
+		ret = SUCCEED;
 		goto out;
 	}
 
-	while (NULL != (d_ent = readdir(dir)))
+	if (0 == logfiles_num)
 	{
-		logfile_candidate = zbx_dsprintf(logfile_candidate, "%s%s", directory, d_ent->d_name);
+		/* there were no files for a logrt[] item to analyze */
+		ret = SUCCEED;
+		goto out;
+	}
+
+	start_idx = (1 == *skip_old_data ? logfiles_num - 1 : 0);
 
-		if (0 == zbx_stat(logfile_candidate, &file_buf))
+	/* mark files to be skipped as processed (in case of 'skip_old_data' was set) */
+	for (i = 0; i < start_idx; i++)
+	{
+		logfiles[i].processed_size = logfiles[i].size;
+		logfiles[i].seq = seq++;
+	}
+
+	if (0 < *logfiles_num_old && 0 < logfiles_num)
+	{
+		/* set up a mapping array from old files to new files */
+		old2new = zbx_malloc(old2new, (size_t)logfiles_num * (size_t)(*logfiles_num_old) * sizeof(char));
+
+		if (SUCCEED != setup_old2new(old2new, *logfiles_old, *logfiles_num_old, logfiles, logfiles_num,
+				*use_ino, err_msg))
 		{
-			if (S_ISREG(file_buf.st_mode) &&
-					*mtime <= file_buf.st_mtime &&
-					0 == regexec(&re, d_ent->d_name, (size_t)0, NULL, 0))
+			destroy_logfile_list(&logfiles, &logfiles_alloc, &logfiles_num);
+			zbx_free(old2new);
+			(*error_count)++;
+			ret = SUCCEED;
+			goto out;
+		}
+
+		if (1 < *logfiles_num_old || 1 < logfiles_num)
+			resolve_old2new(old2new, *logfiles_num_old, logfiles_num);
+
+		/* Transfer data about fully and partially processed files from the old file list to the new list. */
+		for (i = 0; i < *logfiles_num_old; i++)
+		{
+			if (0 < (*logfiles_old)[i].processed_size && 0 == (*logfiles_old)[i].incomplete &&
+					-1 != (j = find_old2new(old2new, logfiles_num, i)))
+			{
+				if ((*logfiles_old)[i].size == (*logfiles_old)[i].processed_size
+						&& (*logfiles_old)[i].size == logfiles[j].size)
+				{
+					/* the file was fully processed during the previous check and must be ignored */
+					/* during this check */
+					logfiles[j].processed_size = logfiles[j].size;
+					logfiles[j].seq = seq++;
+				}
+				else
+				{
+					/* the file was not fully processed during the previous check or has grown */
+					logfiles[j].processed_size = (*logfiles_old)[i].processed_size;
+				}
+			}
+			else if (1 == (*logfiles_old)[i].incomplete &&
+					-1 != (j = find_old2new(old2new, logfiles_num, i)))
+			{
+				if ((*logfiles_old)[i].size < logfiles[j].size)
+				{
+					/* The file was not fully processed because of incomplete last record */
+					/* but it has grown. Try to process it further. */
+					logfiles[j].incomplete = 0;
+				}
+				else
+					logfiles[j].incomplete = 1;
+
+				logfiles[j].processed_size = (*logfiles_old)[i].processed_size;
+			}
+
+			/* find the last file processed (fully or partially) in the previous check */
+			if (max_old_seq < (*logfiles_old)[i].seq)
 			{
-				zabbix_log(LOG_LEVEL_DEBUG, "adding file '%s' to logfiles", logfile_candidate);
-				add_logfile(&logfiles, &logfiles_alloc, &logfiles_num, d_ent->d_name,
-						(int)file_buf.st_mtime);
+				max_old_seq = (*logfiles_old)[i].seq;
+				old_last = i;
 			}
 		}
-		else
-			zabbix_log(LOG_LEVEL_DEBUG, "cannot process entry '%s'", logfile_candidate);
 
-		zbx_free(logfile_candidate);
+		/* find the first file to continue from in the new file list */
+		if (0 < max_old_seq && -1 == (start_idx = find_old2new(old2new, logfiles_num, old_last)))
+		{
+			/* Cannot find the successor of the last processed file from the previous check. */
+			/* 'lastlogsize' does not apply in this case. */
+			*lastlogsize = 0;
+			start_idx = 0;
+		}
 	}
-#endif	/*_WINDOWS*/
-
-	regfree(&re);
 
-	i = (1 == *skip_old_data && 0 < logfiles_num) ? logfiles_num - 1 : 0;
+	zbx_free(old2new);
 
-	/* escaping those with the same mtime, taking the latest one (without exceptions!) */
-	for (j = i + 1; j < logfiles_num; j++)
+	if (SUCCEED == zabbix_check_log_level(LOG_LEVEL_DEBUG))
 	{
-		if (logfiles[j].mtime == logfiles[i].mtime)
-			i = j;	/* moving to the newer one */
+		zabbix_log(LOG_LEVEL_DEBUG, "process_logrt() old file list:");
+		if (NULL != *logfiles_old)
+			print_logfile_list(*logfiles_old, *logfiles_num_old);
 		else
-			break;	/* all next mtimes are bigger */
+			zabbix_log(LOG_LEVEL_DEBUG, "   file list empty");
+
+		zabbix_log(LOG_LEVEL_DEBUG, "process_logrt() new file list: (mtime:%d lastlogsize:" ZBX_FS_UI64
+				" start_idx:%d)", *mtime, *lastlogsize, start_idx);
+		if (NULL != logfiles)
+			print_logfile_list(logfiles, logfiles_num);
+		else
+			zabbix_log(LOG_LEVEL_DEBUG, "   file list empty");
 	}
 
-	/* processing matched logfiles starting from the older one to the newer one */
-	for (; i < logfiles_num; i++)
+	/* forget the old logfile list */
+	if (NULL != *logfiles_old)
 	{
-		logfile_candidate = zbx_dsprintf(logfile_candidate, "%s%s", directory, logfiles[i].filename);
+		for (i = 0; i < *logfiles_num_old; i++)
+			zbx_free((*logfiles_old)[i].filename);
 
-		if (SUCCEED != (ret = process_log(logfile_candidate, lastlogsize, mtime, skip_old_data, big_rec,
-				encoding, regexps, pattern, output_template, p_count, s_count, process_value, server,
-				port, hostname, key)) || 0 >= *p_count || 0 >= *s_count)
+		*logfiles_num_old = 0;
+		zbx_free(*logfiles_old);
+	}
+
+	/* enter the loop with index of the first file to be processed, later continue the loop from the start */
+	i = start_idx;
+
+	/* from now assume success - it could be that there is nothing to do */
+	ret = SUCCEED;
+
+	while (i < logfiles_num)
+	{
+		if (0 == logfiles[i].incomplete && (logfiles[i].size != logfiles[i].processed_size ||
+				0 == logfiles[i].seq))
 		{
-			/* Do not make a logrt[] item NOTSUPPORTED if one of selected files is not accessible */
-			/* (can happen during a rotation). Maybe during the next check all will be well. */
-			ret = SUCCEED;
-			break;
+			if (start_idx != i)
+				*lastlogsize = logfiles[i].processed_size;
+
+			ret = process_log(logfiles[i].filename, lastlogsize, (1 == is_logrt) ? mtime : NULL,
+					skip_old_data, big_rec, &logfiles[i].incomplete, err_msg, encoding, regexps,
+					pattern, output_template, p_count, s_count, process_value, server, port,
+					hostname, key);
+
+			/* process_log() advances 'lastlogsize' only on success therefore */
+			/* we do not check for errors here */
+			logfiles[i].processed_size = *lastlogsize;
+
+			/* Mark file as processed (at least partially). In case if process_log() failed we will stop */
+			/* the current checking. In the next check the file will be marked in the list of old files */
+			/* and we will know where we left off. */
+			logfiles[i].seq = seq++;
+
+			if (SUCCEED != ret)
+			{
+				(*error_count)++;
+				ret = SUCCEED;
+				break;
+			}
+
+			if (0 >= *p_count || 0 >= *s_count)
+			{
+				ret = SUCCEED;
+				break;
+			}
 		}
 
-		if (i != logfiles_num - 1)
+		if (0 != from_first_file)
 		{
-			zbx_free(logfile_candidate);
-			*lastlogsize = 0;
-		}
-	}
+			/* We have processed the file where we left off in the previous check. */
+			from_first_file = 0;
 
-	if (0 == logfiles_num)
-	{
-		zabbix_log(LOG_LEVEL_WARNING, "there are no files matching '%s' in '%s'", format, directory);
+			/* Now proceed from the beginning of the new file list to process the remaining files. */
+			i = 0;
+			continue;
+		}
 
-		/* do not make a logrt[] item NOTSUPPORTED if there are no matching files in the directory */
-		ret = SUCCEED;
+		i++;
 	}
 
-	free_logfiles(&logfiles, &logfiles_alloc, &logfiles_num);
+	/* remember the current logfile list */
+	*logfiles_num_old = logfiles_num;
 
-#ifdef _WINDOWS
-	if (0 != find_handle && -1 == _findclose(find_handle))
-		zabbix_log(LOG_LEVEL_WARNING, "cannot close the find directory handle: %s", zbx_strerror(errno));
-#else
-	if (NULL != dir && -1 == closedir(dir))
-		zabbix_log(LOG_LEVEL_WARNING, "cannot close directory '%s': %s", directory, zbx_strerror(errno));
-#endif
-
-	zbx_free(logfile_candidate);
-	zbx_free(directory);
-	zbx_free(format);
+	if (0 < logfiles_num)
+		*logfiles_old = logfiles;
 out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s error_count:%d", __function_name, zbx_result_string(ret),
+			*error_count);
 
 	return ret;
 }
@@ -651,19 +1741,20 @@ static char	*buf_find_newline(char *p, char **p_next, const char *p_end, const c
 	}
 }
 
-static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec, const char *encoding,
-		zbx_vector_ptr_t *regexps, const char *pattern, const char *output_template, int *p_count, int *s_count,
-		zbx_process_value_func_t process_value, const char *server, unsigned short port, const char *hostname,
-		const char *key)
+static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec, int *incomplete, char **err_msg,
+		const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern, const char *output_template,
+		int *p_count, int *s_count, zbx_process_value_func_t process_value, const char *server,
+		unsigned short port, const char *hostname, const char *key)
 {
-	int		ret, nbytes;
-	const char	*cr, *lf, *p_end;
-	char		*p_start, *p, *p_nl, *p_next, *item_value = NULL;
-	size_t		szbyte;
-	zbx_offset_t	offset;
-	static char	*buf = NULL;
-	int		send_err;
-	zbx_uint64_t	lastlogsize1;
+	ZBX_THREAD_LOCAL static char	*buf = NULL;
+
+	int				ret, nbytes;
+	const char			*cr, *lf, *p_end;
+	char				*p_start, *p, *p_nl, *p_next, *item_value = NULL;
+	size_t				szbyte;
+	zbx_offset_t			offset;
+	int				send_err;
+	zbx_uint64_t			lastlogsize1;
 
 #define BUF_SIZE	(256 * ZBX_KIBIBYTE)	/* The longest encodings use 4-bytes for every character. To send */
 						/* up to 64 k characters to the Zabbix server a 256 kB buffer might */
@@ -687,6 +1778,7 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 		if ((zbx_offset_t)-1 == (offset = zbx_lseek(fd, 0, SEEK_CUR)))
 		{
 			*big_rec = 0;
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot set position to 0 in file: %s", zbx_strerror(errno));
 			ret = FAIL;
 			goto out;
 		}
@@ -697,6 +1789,7 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 		{
 			/* error on read */
 			*big_rec = 0;
+			*err_msg = zbx_dsprintf(*err_msg, "Cannot read from file: %s", zbx_strerror(errno));
 			ret = FAIL;
 			goto out;
 		}
@@ -714,6 +1807,9 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 
 		if (NULL == (p_nl = buf_find_newline(p, &p_next, p_end, cr, lf, szbyte)))
 		{
+			if (p_end > p)
+				*incomplete = 1;
+
 			if (BUF_SIZE > nbytes)
 			{
 				/* Buffer is not full (no more data available) and there is no "newline" in it. */
@@ -746,7 +1842,7 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 					zabbix_log(LOG_LEVEL_WARNING, "Logfile contains a large record: \"%.64s\""
 							" (showing only the first 64 characters). Only the first 64 kB"
 							" will be analyzed, the rest will be ignored while Zabbix agent"
-							" is running", value);
+							" is running.", value);
 
 					lastlogsize1 = (size_t)offset + (size_t)nbytes;
 					send_err = SUCCEED;
@@ -754,7 +1850,7 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 					if (SUCCEED == regexp_sub_ex(regexps, value, pattern, ZBX_CASE_SENSITIVE,
 							output_template, &item_value))
 					{
-						send_err = process_value(server, port, hostname, key, item_value,
+						send_err = process_value(server, port, hostname, key, item_value, ITEM_STATE_NORMAL,
 								&lastlogsize1, mtime, NULL, NULL, NULL, NULL, 1);
 
 						zbx_free(item_value);
@@ -777,7 +1873,6 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 				{
 					/* It is a middle part of a long record. Ignore it. We have already */
 					/* checked the first part against the regexp. */
-
 					*lastlogsize = (size_t)offset + (size_t)nbytes;
 				}
 			}
@@ -786,6 +1881,7 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 		{
 			/* the "newline" was found, so there is at least one complete record */
 			/* (or trailing part of a large record) in the buffer */
+			*incomplete = 0;
 
 			for (;;)
 			{
@@ -813,7 +1909,7 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 					if (SUCCEED == regexp_sub_ex(regexps, value, pattern, ZBX_CASE_SENSITIVE,
 							output_template, &item_value))
 					{
-						send_err = process_value(server, port, hostname, key, item_value,
+						send_err = process_value(server, port, hostname, key, item_value, ITEM_STATE_NORMAL,
 								&lastlogsize1, mtime, NULL, NULL, NULL, NULL, 1);
 
 						zbx_free(item_value);
@@ -844,14 +1940,21 @@ static int	zbx_read2(int fd, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec
 				{
 					/* There are no complete records in the buffer. */
 					/* Try to read more data from this position if available. */
+					if (p_end > p)
+						*incomplete = 1;
+
 					if ((zbx_offset_t)-1 == zbx_lseek(fd, *lastlogsize, SEEK_SET))
 					{
+						*err_msg = zbx_dsprintf(*err_msg, "Cannot set position to " ZBX_FS_UI64
+								" in file: %s", *lastlogsize, zbx_strerror(errno));
 						ret = FAIL;
 						goto out;
 					}
 					else
 						break;
 				}
+				else
+					*incomplete = 0;
 			}
 		}
 	}
@@ -876,6 +1979,11 @@ out:
  *                       jump to the end                                      *
  *     big_rec         - [IN/OUT] state variable to remember whether a long   *
  *                       record is being processed                            *
+ *     incomplete      - [OUT] 0 - the last record ended with a newline,      *
+ *                       1 - there was no newline at the end of the last      *
+ *                       record.                                              *
+ *     err_msg         - [IN/OUT] error message why an item became            *
+ *                       NOTSUPPORTED                                         *
  *     encoding        - [IN] text string describing encoding.                *
  *                         The following encodings are recognized:            *
  *                           "UNICODE"                                        *
@@ -911,9 +2019,9 @@ out:
  *                                                                            *
  ******************************************************************************/
 int	process_log(char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned char *skip_old_data, int *big_rec,
-		const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern, const char *output_template,
-		int *p_count, int *s_count, zbx_process_value_func_t process_value, const char *server,
-		unsigned short port, const char *hostname, const char *key)
+		int *incomplete, char **err_msg, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
+		const char *output_template, int *p_count, int *s_count, zbx_process_value_func_t process_value,
+		const char *server, unsigned short port, const char *hostname, const char *key)
 {
 	const char	*__function_name = "process_log";
 
@@ -926,10 +2034,14 @@ int	process_log(char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned
 
 	if (0 != zbx_stat(filename, &buf))
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "cannot stat '%s': %s", filename, zbx_strerror(errno));
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot obtain information for file \"%s\": %s", filename,
+				zbx_strerror(errno));
 		goto out;
 	}
 
+	if (NULL != mtime)
+		*mtime = (int)buf.st_mtime;
+
 	if ((zbx_uint64_t)buf.st_size == *lastlogsize)
 	{
 		/* The file size has not changed. Nothing to do. Here we do not deal with a case of changing */
@@ -940,7 +2052,7 @@ int	process_log(char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned
 
 	if (-1 == (f = zbx_open(filename, O_RDONLY)))
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "cannot open '%s': %s", filename, zbx_strerror(errno));
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot open file \"%s\": %s", filename, zbx_strerror(errno));
 		goto out;
 	}
 
@@ -961,20 +2073,20 @@ int	process_log(char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned
 		*lastlogsize = l_size;
 		*skip_old_data = 0;
 
-		if (NULL != mtime)
-			*mtime = (int)buf.st_mtime;
-
-		ret = zbx_read2(f, lastlogsize, mtime, big_rec, encoding, regexps, pattern, output_template, p_count,
-				s_count, process_value, server, port, hostname, key);
+		ret = zbx_read2(f, lastlogsize, mtime, big_rec, incomplete, err_msg, encoding, regexps, pattern,
+				output_template, p_count, s_count, process_value, server, port, hostname, key);
 	}
 	else
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "cannot set position to " ZBX_FS_UI64 " for '%s': %s",
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot set position to " ZBX_FS_UI64 " in file \"%s\": %s",
 				l_size, filename, zbx_strerror(errno));
 	}
 
 	if (0 != close(f))
-		zabbix_log(LOG_LEVEL_WARNING, "cannot close file '%s': %s", filename, zbx_strerror(errno));
+	{
+		*err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s", filename, zbx_strerror(errno));
+		ret = FAIL;
+	}
 out:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() filename:'%s' lastlogsize:" ZBX_FS_UI64 " mtime: %d ret:%s",
 			__function_name, filename, *lastlogsize, NULL != mtime ? *mtime : 0, zbx_result_string(ret));
diff --git a/src/zabbix_agent/logfiles.h b/src/zabbix_agent/logfiles.h
index b28dec98fdb..b7a5b878bff 100644
--- a/src/zabbix_agent/logfiles.h
+++ b/src/zabbix_agent/logfiles.h
@@ -21,14 +21,32 @@
 #define ZABBIX_LOGFILES_H
 
 #include "zbxregexp.h"
+#include "md5.h"
+
+struct	st_logfile
+{
+	char		*filename;
+	int		mtime;		/* st_mtime from stat() */
+	int		md5size;	/* size of the initial part for which the md5 sum is calculated */
+	int		seq;		/* number in processing order */
+	int		incomplete;	/* 0 - the last record ends with a newline, 1 - the last record contains */
+					/* no newline at the end */
+	zbx_uint64_t	dev;		/* ID of device containing file */
+	zbx_uint64_t	ino_lo;		/* UNIX: inode number. Microsoft Windows: nFileIndexLow or FileId.LowPart */
+	zbx_uint64_t	ino_hi;		/* Microsoft Windows: nFileIndexHigh or FileId.HighPart */
+	zbx_uint64_t	size;		/* st_size from stat() */
+	zbx_uint64_t	processed_size;	/* how far the Zabbix agent has analyzed the file */
+	md5_byte_t	md5buf[MD5_DIGEST_SIZE];	/* md5 sum of the initial part of the file */
+};
 
 int	process_log(char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned char *skip_old_data, int *big_rec,
-		const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern, const char *output_template,
-		int *p_count, int *s_count, zbx_process_value_func_t process_value, const char *server,
-		unsigned short port, const char *hostname, const char *key);
+		int *incomplete, char **err_msg, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
+		const char *output_template, int *p_count, int *s_count, zbx_process_value_func_t process_value,
+		const char *server, unsigned short port, const char *hostname, const char *key);
 
-int	process_logrt(char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned char *skip_old_data,
-		int *big_rec, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
+int	process_logrt(int is_logrt, char *filename, zbx_uint64_t *lastlogsize, int *mtime, unsigned char *skip_old_data,
+		int *big_rec, int *use_ino, int *error_count, char **err_msg, struct st_logfile **logfiles_old,
+		int *logfiles_num_old, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
 		const char *output_template, int *p_count, int *s_count, zbx_process_value_func_t process_value,
 		const char *server, unsigned short port, const char *hostname, const char *key);
 
diff --git a/src/zabbix_agent/perfstat.c b/src/zabbix_agent/perfstat.c
index 30a228a105d..c49aadd1b6c 100644
--- a/src/zabbix_agent/perfstat.c
+++ b/src/zabbix_agent/perfstat.c
@@ -23,10 +23,14 @@
 #include "alias.h"
 #include "log.h"
 #include "mutexs.h"
+#include "sysinfo.h"
 
-ZBX_PERF_STAT_DATA	ppsd;
+static ZBX_PERF_STAT_DATA	ppsd;
 static ZBX_MUTEX	perfstat_access = ZBX_MUTEX_NULL;
 
+#define LOCK_PERFCOUNTERS	if (ZBX_MUTEX_NULL != perfstat_access) zbx_mutex_lock(&perfstat_access)
+#define UNLOCK_PERFCOUNTERS	if (ZBX_MUTEX_NULL != perfstat_access) zbx_mutex_unlock(&perfstat_access)
+
 /******************************************************************************
  *                                                                            *
  * Comments: counter failed or disappeared, dismiss all previous values       *
@@ -49,28 +53,21 @@ static void	deactivate_perf_counter(PERF_COUNTER_DATA *counter)
  *           added, a pointer to that counter is returned, NULL otherwise     *
  *                                                                            *
  ******************************************************************************/
-PERF_COUNTER_DATA	*add_perf_counter(const char *name, const char *counterpath, int interval)
+PERF_COUNTER_DATA	*add_perf_counter(const char *name, const char *counterpath, int interval, char **error)
 {
 	const char		*__function_name = "add_perf_counter";
-	PERF_COUNTER_DATA	*cptr;
-	char			*alias_name;
+	PERF_COUNTER_DATA	*cptr = NULL;
 	PDH_STATUS		pdh_status;
-	int			result = FAIL;
-
-	assert(counterpath);
+	int			added = FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() counter:'%s' interval:%d", __function_name, counterpath, interval);
 
-	if (SUCCEED != perf_collector_started())
-	{
-		zabbix_log(LOG_LEVEL_WARNING, "PerfCounter '%s' FAILED: collector is not started!", counterpath);
-		return NULL;
-	}
+	LOCK_PERFCOUNTERS;
 
-	if (1 > interval || 900 < interval)
+	if (SUCCEED != perf_collector_started())
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "PerfCounter '%s' FAILED: interval value out of range", counterpath);
-		return NULL;
+		*error = zbx_strdup(*error, "Performance collector is not started.");
+		goto out;
 	}
 
 	for (cptr = ppsd.pPerfCounterList; ; cptr = cptr->next)
@@ -83,28 +80,26 @@ PERF_COUNTER_DATA	*add_perf_counter(const char *name, const char *counterpath, i
 			/* initialize the counter */
 			memset(cptr, 0, sizeof(PERF_COUNTER_DATA));
 			if (NULL != name)
-				cptr->name = strdup(name);
-			cptr->counterpath = strdup(counterpath);
+				cptr->name = zbx_strdup(NULL, name);
+			cptr->counterpath = zbx_strdup(NULL, counterpath);
 			cptr->interval = interval;
 			cptr->value_current = -1;
 			cptr->value_array = (double *)zbx_malloc(cptr->value_array, sizeof(double) * interval);
 
 			/* add the counter to the query */
-			pdh_status = zbx_PdhAddCounter(__function_name, cptr, ppsd.pdh_query, counterpath, &cptr->handle);
+			pdh_status = zbx_PdhAddCounter(__function_name, cptr, ppsd.pdh_query, counterpath,
+					&cptr->handle);
 
-			zbx_mutex_lock(&perfstat_access);
 			cptr->next = ppsd.pPerfCounterList;
 			ppsd.pPerfCounterList = cptr;
-			zbx_mutex_unlock(&perfstat_access);
 
 			if (ERROR_SUCCESS != pdh_status && PDH_CSTATUS_NO_INSTANCE != pdh_status)
 			{
-				zabbix_log(LOG_LEVEL_WARNING, "cannot add performance counter \"%s\": invalid format",
-						counterpath);
+				*error = zbx_dsprintf(*error, "Invalid performance counter format.");
 				cptr = NULL;	/* indicate a failure */
 			}
 
-			result = SUCCEED;
+			added = SUCCEED;
 			break;
 		}
 
@@ -115,22 +110,62 @@ PERF_COUNTER_DATA	*add_perf_counter(const char *name, const char *counterpath, i
 			break;
 	}
 
-	if (FAIL == result)
+	if (FAIL == added)
 	{
 		zabbix_log(LOG_LEVEL_DEBUG, "%s() counter '%s' already exists", __function_name, counterpath);
 	}
 	else if (NULL != name)
 	{
+		char	*alias_name;
+
 		alias_name = zbx_dsprintf(NULL, "__UserPerfCounter[%s]", name);
 		add_alias(name, alias_name);
 		zbx_free(alias_name);
 	}
+out:
+	UNLOCK_PERFCOUNTERS;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s(): %s", __function_name, NULL == cptr ? "FAIL" : "SUCCEED");
 
 	return cptr;
 }
 
 /******************************************************************************
  *                                                                            *
+ * Function: extend_perf_counter_interval                                     *
+ *                                                                            *
+ * Purpose: extends the performance counter buffer to store the new data      *
+ *          interval                                                          *
+ *                                                                            *
+ * Parameters: result    - [IN] the performance counter                       *
+ *             interval  - [IN] the new data collection interval in seconds   *
+ *                                                                            *
+ ******************************************************************************/
+static void	extend_perf_counter_interval(PERF_COUNTER_DATA *counter, int interval)
+{
+	if (interval <= counter->interval)
+		return;
+
+	counter->value_array = (double *)zbx_realloc(counter->value_array, sizeof(double) * interval);
+
+	/* move the data to the end to keep the ring buffer intact */
+	if (counter->value_current < counter->value_count)
+	{
+		int	i;
+		double	*src, *dst;
+
+		src = &counter->value_array[counter->interval - 1];
+		dst = &counter->value_array[interval - 1];
+
+		for (i = 0; i < counter->value_count - counter->value_current; i++)
+			*dst-- = *src--;
+	}
+
+	counter->interval = interval;
+}
+
+/******************************************************************************
+ *                                                                            *
  * Comments: counter is removed from the collector and                        *
  *           the memory is freed - do not use it again                        *
  *                                                                            *
@@ -139,10 +174,10 @@ void	remove_perf_counter(PERF_COUNTER_DATA *counter)
 {
 	PERF_COUNTER_DATA	*cptr;
 
-	if (NULL == counter || NULL == ppsd.pPerfCounterList)
-		return;
+	LOCK_PERFCOUNTERS;
 
-	zbx_mutex_lock(&perfstat_access);
+	if (NULL == counter || NULL == ppsd.pPerfCounterList)
+		goto out;
 
 	if (counter == ppsd.pPerfCounterList)
 	{
@@ -160,20 +195,21 @@ void	remove_perf_counter(PERF_COUNTER_DATA *counter)
 		}
 	}
 
-	zbx_mutex_unlock(&perfstat_access);
-
 	PdhRemoveCounter(counter->handle);
 	zbx_free(counter->name);
 	zbx_free(counter->counterpath);
 	zbx_free(counter->value_array);
 	zbx_free(counter);
+out:
+	UNLOCK_PERFCOUNTERS;
+
 }
 
 static void	free_perf_counter_list()
 {
 	PERF_COUNTER_DATA	*cptr;
 
-	zbx_mutex_lock(&perfstat_access);
+	LOCK_PERFCOUNTERS;
 
 	while (NULL != ppsd.pPerfCounterList)
 	{
@@ -186,7 +222,7 @@ static void	free_perf_counter_list()
 		zbx_free(cptr);
 	}
 
-	zbx_mutex_unlock(&perfstat_access);
+	UNLOCK_PERFCOUNTERS;
 }
 
 /******************************************************************************
@@ -203,7 +239,7 @@ double	compute_average_value(PERF_COUNTER_DATA *counter, int interval)
 	if (PERF_COUNTER_ACTIVE != counter->status || interval > counter->interval)
 		return 0;
 
-	if (USE_DEFAULT_INTERVAL == interval)
+	if (counter->interval == interval)
 		return counter->sum / (double)counter->value_count;
 
 	/* compute the average manually for custom intervals */
@@ -282,13 +318,15 @@ void	collect_perfstat()
 	time_t			now;
 	PDH_FMT_COUNTERVALUE	value;
 
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+
+	LOCK_PERFCOUNTERS;
+
 	if (SUCCEED != perf_collector_started())
-		return;
+		goto out;
 
 	if (NULL == ppsd.pPerfCounterList)	/* no counters */
-		return;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
+		goto out;
 
 	now = time(NULL);
 
@@ -334,25 +372,12 @@ void	collect_perfstat()
 			continue;
 		}
 
-		if (PERF_COUNTER_INITIALIZED < cptr->status)
-		{
-			zabbix_log(LOG_LEVEL_DEBUG, "%s() counterpath:'%s' old first:%I64d second:%I64d",
-					__function_name, cptr->counterpath,
-					cptr->rawValues[(cptr->olderRawValue + 1) & 1].FirstValue,
-					cptr->rawValues[(cptr->olderRawValue + 1) & 1].SecondValue);
-
-			zabbix_log(LOG_LEVEL_DEBUG, "%s() counterpath:'%s' new first:%I64d second:%I64d",
-					__function_name, cptr->counterpath,
-					cptr->rawValues[cptr->olderRawValue].FirstValue,
-					cptr->rawValues[cptr->olderRawValue].SecondValue);
-		}
-
 		cptr->olderRawValue = (cptr->olderRawValue + 1) & 1;
 
 		pdh_status = PdhCalculateCounterFromRawValue(cptr->handle, PDH_FMT_DOUBLE | PDH_FMT_NOCAP100,
 				&cptr->rawValues[(cptr->olderRawValue + 1) & 1],
-				(PERF_COUNTER_INITIALIZED < cptr->status ? &cptr->rawValues[cptr->olderRawValue] : NULL),
-				&value);
+				(PERF_COUNTER_INITIALIZED < cptr->status ?
+						&cptr->rawValues[cptr->olderRawValue] : NULL), &value);
 
 		if (ERROR_SUCCESS == pdh_status && PDH_CSTATUS_VALID_DATA != value.CStatus &&
 				PDH_CSTATUS_NEW_DATA != value.CStatus)
@@ -393,13 +418,13 @@ void	collect_perfstat()
 
 		if (ERROR_SUCCESS == pdh_status)
 		{
-			zabbix_log(LOG_LEVEL_DEBUG, "%s() '%s' calculated value:" ZBX_FS_DBL, __function_name,
-					cptr->counterpath, value.doubleValue);
-
 			cptr->status = PERF_COUNTER_ACTIVE;
-			cptr->value_current = (cptr->value_current + 1) % cptr->interval;
+			cptr->value_current = (cptr->value_current + 1) % cptr->interval
+
+			/* remove the oldest value, value_count will not increase */;
 			if (cptr->value_count == cptr->interval)
-				cptr->sum -= cptr->value_array[cptr->value_current];	/* remove the oldest value, value_count will not increase */
+				cptr->sum -= cptr->value_array[cptr->value_current];
+
 			cptr->value_array[cptr->value_current] = value.doubleValue;
 			cptr->sum += cptr->value_array[cptr->value_current];
 			if (cptr->value_count < cptr->interval)
@@ -414,5 +439,202 @@ void	collect_perfstat()
 		}
 	}
 out:
+	UNLOCK_PERFCOUNTERS;
+
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
+
+/******************************************************************************
+ *                                                                            *
+ * Function: get_perf_counter_value_by_name                                   *
+ *                                                                            *
+ * Purpose: gets average named performance counter value                      *
+ *                                                                            *
+ * Parameters: name  - [IN] the performance counter name                      *
+ *             value - [OUT] the calculated value                             *
+ *             error - [OUT] the error message                                *
+ *                                                                            *
+ * Returns:  SUCCEED - the value was retrieved successfully                   *
+ *           FAIL    - otherwise                                              *
+ *                                                                            *
+ * Comments: The value is retrieved from collector (if it has been requested  *
+ *           before) or directly from Windows performance counters if         *
+ *           possible.                                                        *
+ *                                                                            *
+ ******************************************************************************/
+int	get_perf_counter_value_by_name(const char *name, double *value, char **error)
+{
+	const char		*__function_name = "get_perf_counter_value_by_name";
+	int			ret = FAIL;
+	PERF_COUNTER_DATA	*perfs = NULL;
+	char			*counterpath = NULL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() name:%s", __function_name, name);
+
+	LOCK_PERFCOUNTERS;
+
+	if (SUCCEED != perf_collector_started())
+	{
+		*error = zbx_strdup(*error, "Performance collector is not started.");
+		goto out;
+	}
+
+	for (perfs = ppsd.pPerfCounterList; NULL != perfs; perfs = perfs->next)
+	{
+		if (NULL != perfs->name && 0 == strcmp(perfs->name, name))
+		{
+			if (PERF_COUNTER_ACTIVE != perfs->status)
+				break;
+
+			/* the counter data is already being collected, return it */
+			*value = compute_average_value(perfs, perfs->interval);
+			ret = SUCCEED;
+			goto out;
+		}
+	}
+
+	/* we can retrieve named counter data only if it has been registered before */
+	if (NULL == perfs)
+	{
+		*error = zbx_dsprintf(*error, "Unknown performance counter name: %s.", name);
+		goto out;
+	}
+
+	counterpath = zbx_strdup(counterpath, perfs->counterpath);
+out:
+	UNLOCK_PERFCOUNTERS;
+
+	if (NULL != counterpath)
+	{
+		/* request counter value directly from Windows performance counters */
+		if (ERROR_SUCCESS == calculate_counter_value(__function_name, counterpath, value))
+			ret = SUCCEED;
+
+		zbx_free(counterpath);
+	}
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: get_perf_counter_value_by_path                                   *
+ *                                                                            *
+ * Purpose: gets average performance counter value                            *
+ *                                                                            *
+ * Parameters: counterpath - [IN] the performance counter path                *
+ *             interval    - [IN] the data collection interval in seconds     *
+ *             value       - [OUT] the calculated value                       *
+ *             error       - [OUT] the error message                          *
+ *                                                                            *
+ * Returns:  SUCCEED - the value was retrieved successfully                   *
+ *           FAIL    - otherwise                                              *
+ *                                                                            *
+ * Comments: The value is retrieved from collector (if it has been requested  *
+ *           before) or directly from Windows performance counters if         *
+ *           possible.                                                        *
+ *                                                                            *
+ ******************************************************************************/
+int	get_perf_counter_value_by_path(const char *counterpath, int interval, double *value, char **error)
+{
+	const char		*__function_name = "get_perf_counter_value_by_path";
+	int			ret = FAIL;
+	PERF_COUNTER_DATA	*perfs = NULL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() path:%s interval:%d", __function_name, counterpath, interval);
+
+	LOCK_PERFCOUNTERS;
+
+	if (SUCCEED != perf_collector_started())
+	{
+		*error = zbx_strdup(*error, "Performance collector is not started.");
+		goto out;
+	}
+
+	for (perfs = ppsd.pPerfCounterList; NULL != perfs; perfs = perfs->next)
+	{
+		if (0 == strcmp(perfs->counterpath, counterpath))
+		{
+			if (perfs->interval < interval)
+				extend_perf_counter_interval(perfs, interval);
+
+			if (PERF_COUNTER_ACTIVE != perfs->status)
+				break;
+
+			/* the counter data is already being collected, return it */
+			*value = compute_average_value(perfs, interval);
+			ret = SUCCEED;
+			goto out;
+		}
+	}
+
+	/* if the requested counter is not already being monitored - start monitoring */
+	if (NULL == perfs)
+		perfs = add_perf_counter(NULL, counterpath, interval, error);
+out:
+	UNLOCK_PERFCOUNTERS;
+
+	if (SUCCEED != ret && NULL != perfs)
+	{
+		/* request counter value directly from Windows performance counters */
+		if (ERROR_SUCCESS == calculate_counter_value(__function_name, counterpath, value))
+			ret = SUCCEED;
+	}
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: get_perf_counter_value                                           *
+ *                                                                            *
+ * Purpose: gets average value of the specified performance counter interval  *
+ *                                                                            *
+ * Parameters: counter  - [IN] the performance counter                        *
+ *             interval - [IN] the data collection interval in seconds        *
+ *             value    - [OUT] the calculated value                          *
+ *             error    - [OUT] the error message                             *
+ *                                                                            *
+ * Returns:  SUCCEED - the value was retrieved successfully                   *
+ *           FAIL    - otherwise                                              *
+ *                                                                            *
+ ******************************************************************************/
+int	get_perf_counter_value(PERF_COUNTER_DATA *counter, int interval, double *value, char **error)
+{
+	const char	*__function_name = "get_perf_counter_value";
+	int		ret = FAIL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() path:%s interval:%d", __function_name, counter->counterpath, interval);
+
+	LOCK_PERFCOUNTERS;
+
+	if (SUCCEED != perf_collector_started())
+	{
+		*error = zbx_strdup(*error, "Performance collector is not started.");
+		goto out;
+	}
+
+	if (PERF_COUNTER_ACTIVE != counter->status)
+	{
+		*error = zbx_strdup(*error, "Performance counter is not ready.");
+		goto out;
+	}
+
+	*value = compute_average_value(counter, interval);
+	ret = SUCCEED;
+out:
+	UNLOCK_PERFCOUNTERS;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
+
+	return ret;
+}
+
+
+
+
+
diff --git a/src/zabbix_agent/perfstat.h b/src/zabbix_agent/perfstat.h
index 1e6f5c90112..0c898cdc4ef 100644
--- a/src/zabbix_agent/perfstat.h
+++ b/src/zabbix_agent/perfstat.h
@@ -27,7 +27,6 @@
 #include "perfmon.h"
 
 #define UNSUPPORTED_REFRESH_PERIOD		600
-#define USE_DEFAULT_INTERVAL			0
 
 typedef struct
 {
@@ -39,7 +38,7 @@ ZBX_PERF_STAT_DATA;
 
 extern ZBX_PERF_STAT_DATA	ppsd;
 
-PERF_COUNTER_DATA	*add_perf_counter(const char *name, const char *counterpath, int interval);
+PERF_COUNTER_DATA	*add_perf_counter(const char *name, const char *counterpath, int interval, char **error);
 void			remove_perf_counter(PERF_COUNTER_DATA *counter);
 
 double	compute_average_value(PERF_COUNTER_DATA *counter, int interval);
@@ -49,4 +48,8 @@ void	free_perf_collector();
 int	perf_collector_started();
 void	collect_perfstat();
 
+int	get_perf_counter_value_by_name(const char *name, double *value, char **error);
+int	get_perf_counter_value_by_path(const char *counterpath, int interval, double *value, char **error);
+int	get_perf_counter_value(PERF_COUNTER_DATA *counter, int interval, double *value, char **error);
+
 #endif
diff --git a/src/zabbix_agent/stats.c b/src/zabbix_agent/stats.c
index e0c53b829c5..67579517988 100644
--- a/src/zabbix_agent/stats.c
+++ b/src/zabbix_agent/stats.c
@@ -452,11 +452,11 @@ ZBX_THREAD_ENTRY(collector_thread, args)
 	}
 
 #ifdef _WINDOWS
-	if (CPU_COLLECTOR_STARTED(collector))
+	if (0 != CPU_COLLECTOR_STARTED(collector))
 		free_cpu_collector(&(collector->cpus));
 
 	ZBX_DO_EXIT();
 
-	zbx_thread_exit(0);
+	zbx_thread_exit(EXIT_SUCCESS);
 #endif
 }
diff --git a/src/zabbix_agent/zabbix_agent.c b/src/zabbix_agent/zabbix_agent.c
index 8848ec94fd3..9e55fad5db4 100644
--- a/src/zabbix_agent/zabbix_agent.c
+++ b/src/zabbix_agent/zabbix_agent.c
@@ -137,7 +137,7 @@ int	main(int argc, char **argv)
 	zbx_sock_t	s_out;
 
 	int		ret;
-	char		**value, *command;
+	char		**value;
 
 	AGENT_RESULT	result;
 
@@ -153,14 +153,14 @@ int	main(int argc, char **argv)
 				break;
 			case 'h':
 				help();
-				exit(FAIL);
+				exit(EXIT_SUCCESS);
 				break;
 			case 'V':
 				version();
 #ifdef _AIX
 				tl_version();
 #endif
-				exit(FAIL);
+				exit(EXIT_SUCCESS);
 				break;
 			case 'p':
 				if (task == ZBX_TASK_START)
@@ -175,7 +175,7 @@ int	main(int argc, char **argv)
 				break;
 			default:
 				usage();
-				exit(FAIL);
+				exit(EXIT_FAILURE);
 				break;
 		}
 	}
@@ -239,15 +239,15 @@ int	main(int argc, char **argv)
 
 	if (SUCCEED == (ret = zbx_tcp_check_security(&s_in, CONFIG_HOSTS_ALLOWED, 0)))
 	{
-		if (SUCCEED == (ret = zbx_tcp_recv(&s_in, &command)))
+		if (SUCCEED == (ret = zbx_tcp_recv(&s_in)))
 		{
-			zbx_rtrim(command, "\r\n");
+			zbx_rtrim(s_in.buffer, "\r\n");
 
-			zabbix_log(LOG_LEVEL_DEBUG, "requested [%s]", command);
+			zabbix_log(LOG_LEVEL_DEBUG, "requested [%s]", s_in.buffer);
 
 			init_result(&result);
 
-			process(command, 0, &result);
+			process(s_in.buffer, 0, &result);
 
 			if (NULL == (value = GET_TEXT_RESULT(&result)))
 				value = GET_MSG_RESULT(&result);
@@ -283,5 +283,5 @@ void	zbx_on_exit()
 	free_metrics();
 	alias_list_free();
 
-	exit(SUCCEED);
+	exit(EXIT_SUCCESS);
 }
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index 7725acb7ce2..84d7ba07894 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -280,14 +280,14 @@ static void	parse_commandline(int argc, char **argv, ZBX_TASK_EX *t)
 				break;
 			case 'h':
 				help();
-				exit(EXIT_FAILURE);
+				exit(EXIT_SUCCESS);
 				break;
 			case 'V':
 				version();
 #ifdef _AIX
 				tl_version();
 #endif
-				exit(EXIT_FAILURE);
+				exit(EXIT_SUCCESS);
 				break;
 			case 'p':
 				if (ZBX_TASK_START == t->task)
@@ -395,15 +395,19 @@ static void	set_defaults(void)
  ******************************************************************************/
 static void	zbx_validate_config(void)
 {
+	char	*ch_error;
+
 	if (NULL == CONFIG_HOSTNAME)
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "\"Hostname\" configuration parameter is not defined");
 		exit(EXIT_FAILURE);
 	}
 
-	if (FAIL == zbx_check_hostname(CONFIG_HOSTNAME))
+	if (FAIL == zbx_check_hostname(CONFIG_HOSTNAME, &ch_error))
 	{
-		zabbix_log(LOG_LEVEL_CRIT, "invalid \"Hostname\" configuration parameter: '%s'", CONFIG_HOSTNAME);
+		zabbix_log(LOG_LEVEL_CRIT, "invalid \"Hostname\" configuration parameter: '%s': %s", CONFIG_HOSTNAME,
+				ch_error);
+		zbx_free(ch_error);
 		exit(EXIT_FAILURE);
 	}
 
@@ -858,7 +862,7 @@ void	zbx_on_exit(void)
 	setproctitle_free_env();
 #endif
 
-	exit(SUCCEED);
+	exit(EXIT_SUCCESS);
 }
 
 #if defined(HAVE_SIGQUEUE)
@@ -923,7 +927,7 @@ int	main(int argc, char **argv)
 
 			ret = zbx_exec_service_task(argv[0], &t);
 			free_metrics();
-			exit(ret);
+			exit(SUCCEED == ret ? EXIT_SUCCESS : EXIT_FAILURE);
 			break;
 #endif
 		case ZBX_TASK_TEST_METRIC:
@@ -957,7 +961,7 @@ int	main(int argc, char **argv)
 #endif
 			free_metrics();
 			alias_list_free();
-			exit(SUCCEED);
+			exit(EXIT_SUCCESS);
 			break;
 		default:
 			zbx_load_config(ZBX_CFG_FILE_REQUIRED);
@@ -968,5 +972,5 @@ int	main(int argc, char **argv)
 
 	START_MAIN_ZABBIX_ENTRY(CONFIG_ALLOW_ROOT, CONFIG_USER);
 
-	exit(SUCCEED);
+	exit(EXIT_SUCCESS);
 }
diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c
index 54319c4bde5..33375da6a13 100644
--- a/src/zabbix_agent/zbxconf.c
+++ b/src/zabbix_agent/zbxconf.c
@@ -158,41 +158,69 @@ void	load_user_parameters(char **lines)
 void	load_perf_counters(const char **lines)
 {
 	char		name[MAX_STRING_LEN], counterpath[PDH_MAX_COUNTER_PATH], interval[8];
-	const char	**pline, *msg;
+	const char	**pline;
+	char		*error = NULL;
 	LPTSTR		wcounterPath;
-
-#define ZBX_PC_FAIL(_msg) {msg = _msg; goto pc_fail;}
+	int		period;
 
 	for (pline = lines; NULL != *pline; pline++)
 	{
 		if (3 < num_param(*pline))
-			ZBX_PC_FAIL("required parameter missing");
+		{
+			error = zbx_strdup(error, "Required parameter missing.");
+			goto pc_fail;
+		}
 
 		if (0 != get_param(*pline, 1, name, sizeof(name)))
-			ZBX_PC_FAIL("cannot parse key");
+		{
+			error = zbx_strdup(error, "Cannot parse key.");
+			goto pc_fail;
+		}
 
 		if (0 != get_param(*pline, 2, counterpath, sizeof(counterpath)))
-			ZBX_PC_FAIL("cannot parse counter path");
+		{
+			error = zbx_strdup(error, "Cannot parse counter path.");
+			goto pc_fail;
+		}
 
 		if (0 != get_param(*pline, 3, interval, sizeof(interval)))
-			ZBX_PC_FAIL("cannot parse interval");
+		{
+			error = zbx_strdup(error, "Cannot parse interval.");
+			goto pc_fail;
+		}
 
 		wcounterPath = zbx_acp_to_unicode(counterpath);
 		zbx_unicode_to_utf8_static(wcounterPath, counterpath, PDH_MAX_COUNTER_PATH);
 		zbx_free(wcounterPath);
 
 		if (FAIL == check_counter_path(counterpath))
-			ZBX_PC_FAIL("invalid counter path");
+		{
+			error = zbx_strdup(error, "Invalid counter path.");
+			goto pc_fail;
+		}
+
+		period = atoi(interval);
 
-		if (NULL == add_perf_counter(name, counterpath, atoi(interval)))
-			ZBX_PC_FAIL("cannot add counter");
+		if (1 > period || MAX_COLLECTOR_PERIOD < period)
+		{
+			error = zbx_strdup(NULL, "Interval out of range.");
+			goto pc_fail;
+		}
+
+		if (NULL == add_perf_counter(name, counterpath, period, &error))
+		{
+			if (NULL == error)
+				error = zbx_strdup(error, "Failed to add new performance counter.");
+			goto pc_fail;
+		}
 
 		continue;
 pc_fail:
-		zabbix_log(LOG_LEVEL_CRIT, "PerfCounter '%s' FAILED: %s", *pline, msg);
-		exit(FAIL);
+		zabbix_log(LOG_LEVEL_CRIT, "cannot add performance counter \"%s\": %s", *pline, error);
+		zbx_free(error);
+
+		exit(EXIT_FAILURE);
 	}
-#undef ZBX_PC_FAIL
 }
 #endif	/* _WINDOWS */
 
diff --git a/src/zabbix_get/zabbix_get.c b/src/zabbix_get/zabbix_get.c
index a2502861b41..821b00cc6a8 100644
--- a/src/zabbix_get/zabbix_get.c
+++ b/src/zabbix_get/zabbix_get.c
@@ -76,8 +76,6 @@ static char     shortopts[] = "s:p:k:I:hV";
  *                                                                            *
  * Return value:                                                              *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  * Comments:                                                                  *
  *                                                                            *
  ******************************************************************************/
@@ -86,7 +84,7 @@ static void	get_signal_handler(int sig)
 	if (SIGALRM == sig)
 		zbx_error("Timeout while executing operation");
 
-	exit(FAIL);
+	exit(EXIT_FAILURE);
 }
 
 #endif /* not WINDOWS */
@@ -95,29 +93,18 @@ static void	get_signal_handler(int sig)
  *                                                                            *
  * Function: get_value                                                        *
  *                                                                            *
- * Purpose: connect to Zabbix agent and receive value for given key           *
- *                                                                            *
- * Parameters: host   - server name or IP address                             *
- *             port   - port number                                           *
- *             key    - item's key                                            *
+ * Purpose: connect to Zabbix agent, receive and print value                  *
  *                                                                            *
- * Return value: SUCCEED - ok, FAIL - otherwise                               *
- *             value  - retrieved value                                       *
- *                                                                            *
- * Author: Eugene Grigorjev                                                   *
- *                                                                            *
- * Comments:                                                                  *
+ * Parameters: host - server name or IP address                               *
+ *             port - port number                                             *
+ *             key  - item's key                                              *
  *                                                                            *
  ******************************************************************************/
-static int	get_value(const char *source_ip, const char *host, unsigned short port, const char *key, char **value)
+static void	get_value(const char *source_ip, const char *host, unsigned short port, const char *key)
 {
 	zbx_sock_t	s;
 	int		ret;
-	char		*buf, request[1024];
-
-	assert(value);
-
-	*value = NULL;
+	char		request[1024];
 
 	if (SUCCEED == (ret = zbx_tcp_connect(&s, source_ip, host, port, GET_SENDER_TIMEOUT)))
 	{
@@ -125,10 +112,18 @@ static int	get_value(const char *source_ip, const char *host, unsigned short por
 
 		if (SUCCEED == (ret = zbx_tcp_send(&s, request)))
 		{
-			if (SUCCEED == (ret = SUCCEED_OR_FAIL(zbx_tcp_recv_ext(&s, &buf, ZBX_TCP_READ_UNTIL_CLOSE, 0))))
+			if (SUCCEED == (ret = SUCCEED_OR_FAIL(zbx_tcp_recv_ext(&s, ZBX_TCP_READ_UNTIL_CLOSE, 0))))
 			{
-				zbx_rtrim(buf, "\r\n");
-				*value = strdup(buf);
+				if (0 == strcmp(s.buffer, ZBX_NOTSUPPORTED) && sizeof(ZBX_NOTSUPPORTED) < s.read_bytes)
+				{
+					zbx_rtrim(s.buffer + sizeof(ZBX_NOTSUPPORTED), "\r\n");
+					printf("%s: %s\n", s.buffer, s.buffer + sizeof(ZBX_NOTSUPPORTED));
+				}
+				else
+				{
+					zbx_rtrim(s.buffer, "\r\n");
+					printf("%s\n", s.buffer);
+				}
 			}
 		}
 
@@ -137,8 +132,6 @@ static int	get_value(const char *source_ip, const char *host, unsigned short por
 
 	if (FAIL == ret)
 		zbx_error("Get value error: %s", zbx_tcp_strerror());
-
-	return ret;
 }
 
 /******************************************************************************
@@ -151,8 +144,6 @@ static int	get_value(const char *source_ip, const char *host, unsigned short por
  *                                                                            *
  * Return value:                                                              *
  *                                                                            *
- * Author: Eugene Grigorjev                                                   *
- *                                                                            *
  * Comments:                                                                  *
  *                                                                            *
  ******************************************************************************/
@@ -160,7 +151,7 @@ int	main(int argc, char **argv)
 {
 	unsigned short	port = ZBX_DEFAULT_AGENT_PORT;
 	int		ret = SUCCEED;
-	char		*value = NULL, *host = NULL, *key = NULL, *source_ip = NULL, ch;
+	char		*host = NULL, *key = NULL, *source_ip = NULL, ch;
 
 	progname = get_program_name(argv[0]);
 
@@ -183,15 +174,15 @@ int	main(int argc, char **argv)
 				break;
 			case 'h':
 				help();
-				exit(-1);
+				exit(EXIT_SUCCESS);
 				break;
 			case 'V':
 				version();
-				exit(-1);
+				exit(EXIT_SUCCESS);
 				break;
 			default:
 				usage();
-				exit(-1);
+				exit(EXIT_FAILURE);
 				break;
 		}
 	}
@@ -204,20 +195,13 @@ int	main(int argc, char **argv)
 
 	if (SUCCEED == ret)
 	{
-
 #if !defined(_WINDOWS)
 		signal(SIGINT,  get_signal_handler);
 		signal(SIGTERM, get_signal_handler);
 		signal(SIGQUIT, get_signal_handler);
 		signal(SIGALRM, get_signal_handler);
 #endif
-
-		ret = get_value(source_ip, host, port, key, &value);
-
-		if (SUCCEED == ret)
-			printf("%s\n", value);
-
-		zbx_free(value);
+		get_value(source_ip, host, port, key);
 	}
 
 	zbx_free(host);
diff --git a/src/zabbix_java/Makefile.am b/src/zabbix_java/Makefile.am
index bf37c4d16c0..b497165798f 100644
--- a/src/zabbix_java/Makefile.am
+++ b/src/zabbix_java/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = \
 	startup.sh
 
 ZJG = bin/zabbix-java-gateway-$(VERSION).jar
-LIB = lib/org-json-2010-12-28.jar:lib/logback-core-0.9.27.jar:lib/logback-classic-0.9.27.jar:lib/slf4j-api-1.6.1.jar
+LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-0.9.27.jar:lib/logback-classic-0.9.27.jar:lib/slf4j-api-1.6.1.jar
 JUNIT = tests/junit-4.8.2.jar
 
 ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
diff --git a/src/zabbix_java/lib/README b/src/zabbix_java/lib/README
new file mode 100644
index 00000000000..34af961c798
--- /dev/null
+++ b/src/zabbix_java/lib/README
@@ -0,0 +1,24 @@
+In order to upgrade the Android JSON library, follow the procedure below:
+
+### get the repository
+
+$ git clone https://android.googlesource.com/platform/libcore android-libcore
+$ cd android-libcore
+
+### choose the tag you wish to upgrade to (android-4.3_r3.1 in the example below)
+
+$ git tag | less
+$ git checkout android-4.3_r3.1
+
+### compile the library using JDK 1.6 so that it runs on older versions of Java and package it
+
+$ cd json/src/main/java
+$ javac org/json/*.java
+$ jar cf android-json-4.3_r3.1.jar org/json/*.class
+$ mv android-json-4.3_r3.1.jar ${zabbix}/src/zabbix_java/lib
+
+### clean up
+
+$ rm org/json/*.class
+$ cd ../../../..
+$ git checkout master
diff --git a/src/zabbix_java/lib/android-json-4.3_r3.1.jar b/src/zabbix_java/lib/android-json-4.3_r3.1.jar
new file mode 100644
index 00000000000..40a2ede913a
--- /dev/null
+++ b/src/zabbix_java/lib/android-json-4.3_r3.1.jar
diff --git a/src/zabbix_java/lib/org-json-2010-12-28.jar b/src/zabbix_java/lib/org-json-2010-12-28.jar
deleted file mode 100644
index c7466d3443f..00000000000
--- a/src/zabbix_java/lib/org-json-2010-12-28.jar
+++ /dev/null
diff --git a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
index 3f3f8220336..a8329336f48 100644
--- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
+++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
@@ -22,9 +22,9 @@ package com.zabbix.gateway;
 class GeneralInformation
 {
 	public static final String APPLICATION_NAME = "Zabbix Java Gateway";
-	public static final String REVISION_DATE = "12 November 2013";
+	public static final String REVISION_DATE = "5 August 2014";
 	public static final String REVISION = "{ZABBIX_REVISION}";
-	public static final String VERSION = "2.3.0";
+	public static final String VERSION = "2.3.4";
 
 	public static void printVersion()
 	{
diff --git a/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java b/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java
index d03e13f7dbe..e193a35b39f 100644
--- a/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java
+++ b/src/zabbix_java/src/com/zabbix/gateway/JMXItemChecker.java
@@ -124,16 +124,13 @@ class JMXItemChecker extends ItemChecker
 			String attributeName = item.getArgument(2);
 			String realAttributeName;
 			String fieldNames = "";
-			int sep;
 
-			//
 			// Attribute name and composite data field names are separated by dots. On the other hand the
 			// name may contain a dot too. In this case user needs to escape it with a backslash. Also the
 			// backslash symbols in the name must be escaped. So a real separator is unescaped dot and
 			// separatorIndex() is used to locate it.
-			//
 
-			sep = HelperFunctionChest.separatorIndex(attributeName);
+			int sep = HelperFunctionChest.separatorIndex(attributeName);
 
 			if (-1 != sep)
 			{
diff --git a/src/zabbix_java/src/com/zabbix/gateway/SocketProcessor.java b/src/zabbix_java/src/com/zabbix/gateway/SocketProcessor.java
index 634cafb9919..9bee2b6252c 100644
--- a/src/zabbix_java/src/com/zabbix/gateway/SocketProcessor.java
+++ b/src/zabbix_java/src/com/zabbix/gateway/SocketProcessor.java
@@ -76,8 +76,8 @@ class SocketProcessor implements Runnable
 			{
 				JSONObject response = new JSONObject();
 				response.put(ItemChecker.JSON_TAG_RESPONSE, ItemChecker.JSON_RESPONSE_FAILED);
-				response.put(ItemChecker.JSON_TAG_ERROR, JSONObject.quote(e1.getMessage()).toString());
-				
+				response.put(ItemChecker.JSON_TAG_ERROR, e1.getMessage());
+
 				speaker.sendResponse(response.toString());
 			}
 			catch (Exception e2)
diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am
index fef8c49df3d..2af09bdfc94 100644
--- a/src/zabbix_proxy/Makefile.am
+++ b/src/zabbix_proxy/Makefile.am
@@ -29,9 +29,9 @@ zabbix_proxy_LDADD = \
 	$(top_srcdir)/src/zabbix_server/selfmon/libzbxselfmon.a \
 	$(top_srcdir)/src/zabbix_server/vmware/libzbxvmware.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxproxysysinfo.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libspecsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libspechostnamesysinfo.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
 	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
diff --git a/src/zabbix_proxy/datasender/datasender.c b/src/zabbix_proxy/datasender/datasender.c
index 8e0d2291af2..01ba4bfba08 100644
--- a/src/zabbix_proxy/datasender/datasender.c
+++ b/src/zabbix_proxy/datasender/datasender.c
@@ -96,6 +96,7 @@ static void	history_sender(struct zbx_json *j, int *records, const char *tag,
 
 	zbx_sock_t	sock;
 	zbx_uint64_t	lastid;
+	int		ret = SUCCEED;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
@@ -117,13 +118,7 @@ static void	history_sender(struct zbx_json *j, int *records, const char *tag,
 
 		zbx_json_adduint64(j, ZBX_PROTO_TAG_CLOCK, (int)time(NULL));
 
-		if (SUCCEED == put_data_to_server(&sock, j, &error))
-		{
-			DBbegin();
-			f_set_lastid(lastid);
-			DBcommit();
-		}
-		else
+		if (SUCCEED != (ret = put_data_to_server(&sock, j, &error)))
 		{
 			*records = 0;
 			zabbix_log(LOG_LEVEL_WARNING, "sending data to server failed: %s", error);
@@ -133,6 +128,13 @@ static void	history_sender(struct zbx_json *j, int *records, const char *tag,
 		disconnect_server(&sock);
 	}
 
+	if (SUCCEED == ret && 0 != lastid)
+	{
+		DBbegin();
+		f_set_lastid(lastid);
+		DBcommit();
+	}
+
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
diff --git a/src/zabbix_proxy/housekeeper/housekeeper.c b/src/zabbix_proxy/housekeeper/housekeeper.c
index 863602dd863..af1644d3e8e 100644
--- a/src/zabbix_proxy/housekeeper/housekeeper.c
+++ b/src/zabbix_proxy/housekeeper/housekeeper.c
@@ -125,7 +125,7 @@ rollback:
  * Comments:                                                                  *
  *                                                                            *
  ******************************************************************************/
-static int housekeeping_history(int now)
+static int	housekeeping_history(int now)
 {
         int	records = 0;
 
@@ -150,6 +150,11 @@ ZBX_THREAD_ENTRY(housekeeper_thread, args)
 	zabbix_log(LOG_LEVEL_INFORMATION, "server #%d started [%s #%d]",
 			server_num, get_process_type_string(process_type), process_num);
 
+	zbx_setproctitle("%s [startup idle for %d minutes]", get_process_type_string(process_type),
+			HOUSEKEEPER_STARTUP_DELAY);
+
+	zbx_sleep_loop(HOUSEKEEPER_STARTUP_DELAY * SEC_PER_MIN);
+
 	for (;;)
 	{
 		start = time(NULL);
@@ -168,7 +173,8 @@ ZBX_THREAD_ENTRY(housekeeper_thread, args)
 
 		DBclose();
 
-		sleeptime = CONFIG_HOUSEKEEPING_FREQUENCY * SEC_PER_HOUR - (time(NULL) - start);
+		if (0 > (sleeptime = CONFIG_HOUSEKEEPING_FREQUENCY * SEC_PER_HOUR - (time(NULL) - start)))
+			sleeptime = 0;
 
 		zabbix_log(LOG_LEVEL_WARNING, "%s [deleted %d records in " ZBX_FS_DBL " sec, idle %d sec]",
 				get_process_type_string(process_type), records, sec, sleeptime);
diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c
index 5b32942a482..779f2709294 100644
--- a/src/zabbix_proxy/proxy.c
+++ b/src/zabbix_proxy/proxy.c
@@ -202,6 +202,13 @@ char	**CONFIG_LOAD_MODULE		= NULL;
 
 char	*CONFIG_USER			= NULL;
 
+/* web monitoring */
+#ifdef HAVE_LIBCURL
+char	*CONFIG_SSL_CA_LOCATION		= NULL;
+char	*CONFIG_SSL_CERT_LOCATION	= NULL;
+char	*CONFIG_SSL_KEY_LOCATION	= NULL;
+#endif
+
 int	get_process_info_by_thread(int server_num, unsigned char *process_type, int *process_num)
 {
 	int	server_count = 0;
@@ -357,18 +364,22 @@ static void	zbx_set_defaults()
 
 	if (NULL == CONFIG_FPING_LOCATION)
 		CONFIG_FPING_LOCATION = zbx_strdup(CONFIG_FPING_LOCATION, "/usr/sbin/fping");
-
 #ifdef HAVE_IPV6
 	if (NULL == CONFIG_FPING6_LOCATION)
 		CONFIG_FPING6_LOCATION = zbx_strdup(CONFIG_FPING6_LOCATION, "/usr/sbin/fping6");
 #endif
-
 	if (NULL == CONFIG_EXTERNALSCRIPTS)
 		CONFIG_EXTERNALSCRIPTS = zbx_strdup(CONFIG_EXTERNALSCRIPTS, DATADIR "/zabbix/externalscripts");
 
 	if (NULL == CONFIG_LOAD_MODULE_PATH)
 		CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, LIBDIR "/modules");
+#ifdef HAVE_LIBCURL
+	if (NULL == CONFIG_SSL_CERT_LOCATION)
+		CONFIG_SSL_CERT_LOCATION = zbx_strdup(CONFIG_SSL_CERT_LOCATION, DATADIR "/zabbix/ssl/certs");
 
+	if (NULL == CONFIG_SSL_KEY_LOCATION)
+		CONFIG_SSL_KEY_LOCATION = zbx_strdup(CONFIG_SSL_KEY_LOCATION, DATADIR "/zabbix/ssl/keys");
+#endif
 	if (ZBX_PROXYMODE_ACTIVE != CONFIG_PROXYMODE || 0 == CONFIG_HEARTBEAT_FREQUENCY)
 		CONFIG_HEARTBEAT_FORKS = 0;
 
@@ -390,15 +401,27 @@ static void	zbx_set_defaults()
  ******************************************************************************/
 static void	zbx_validate_config(void)
 {
+	char	*ch_error;
+
 	if (NULL == CONFIG_HOSTNAME)
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "\"Hostname\" configuration parameter is not defined");
 		exit(EXIT_FAILURE);
 	}
 
-	if (FAIL == zbx_check_hostname(CONFIG_HOSTNAME))
+	if (FAIL == zbx_check_hostname(CONFIG_HOSTNAME, &ch_error))
+	{
+		zabbix_log(LOG_LEVEL_CRIT, "invalid \"Hostname\" configuration parameter '%s': %s", CONFIG_HOSTNAME,
+				ch_error);
+		zbx_free(ch_error);
+		exit(EXIT_FAILURE);
+	}
+
+	if (0 == CONFIG_UNREACHABLE_POLLER_FORKS && 0 != CONFIG_POLLER_FORKS + CONFIG_IPMIPOLLER_FORKS +
+			CONFIG_JAVAPOLLER_FORKS)
 	{
-		zabbix_log(LOG_LEVEL_CRIT, "invalid \"Hostname\" configuration parameter: '%s'", CONFIG_HOSTNAME);
+		zabbix_log(LOG_LEVEL_CRIT, "\"StartPollersUnreachable\" configuration parameter must not be 0"
+				" if regular, IPMI or Java pollers are started");
 		exit(EXIT_FAILURE);
 	}
 
@@ -568,6 +591,14 @@ static void	zbx_load_config()
 			PARM_OPT,	0,			1},
 		{"User",			&CONFIG_USER,				TYPE_STRING,
 			PARM_OPT,	0,			0},
+#ifdef HAVE_LIBCURL
+		{"SSLCALocation",		&CONFIG_SSL_CA_LOCATION,		TYPE_STRING,
+			PARM_OPT,	0,			0},
+		{"SSLCertLocation",		&CONFIG_SSL_CERT_LOCATION,		TYPE_STRING,
+			PARM_OPT,	0,			0},
+		{"SSLKeyLocation",		&CONFIG_SSL_KEY_LOCATION,		TYPE_STRING,
+			PARM_OPT,	0,			0},
+#endif
 		{NULL}
 	};
 
@@ -668,15 +699,15 @@ int	main(int argc, char **argv)
 				break;
 			case 'h':
 				help();
-				exit(-1);
+				exit(EXIT_SUCCESS);
 				break;
 			case 'V':
 				version();
-				exit(-1);
+				exit(EXIT_SUCCESS);
 				break;
 			default:
 				usage();
-				exit(-1);
+				exit(EXIT_FAILURE);
 				break;
 		}
 	}
@@ -799,7 +830,7 @@ int	MAIN_ZABBIX_ENTRY()
 		if (FAIL == zbx_tcp_listen(&listen_sock, CONFIG_LISTEN_IP, (unsigned short)CONFIG_LISTEN_PORT))
 		{
 			zabbix_log(LOG_LEVEL_CRIT, "listener failed: %s", zbx_tcp_strerror());
-			exit(1);
+			exit(EXIT_FAILURE);
 		}
 	}
 
@@ -956,5 +987,5 @@ void	zbx_on_exit()
 	setproctitle_free_env();
 #endif
 
-	exit(SUCCEED);
+	exit(EXIT_SUCCESS);
 }
diff --git a/src/zabbix_proxy/proxyconfig/proxyconfig.c b/src/zabbix_proxy/proxyconfig/proxyconfig.c
index ddbf21d5f09..3c864789d30 100644
--- a/src/zabbix_proxy/proxyconfig/proxyconfig.c
+++ b/src/zabbix_proxy/proxyconfig/proxyconfig.c
@@ -52,7 +52,6 @@ static void	process_configuration_sync(size_t *data_size)
 	const char	*__function_name = "process_configuration_sync";
 
 	zbx_sock_t	sock;
-	char		*data;
 	struct		zbx_json_parse jp;
 	char		value[16];
 
@@ -63,16 +62,16 @@ static void	process_configuration_sync(size_t *data_size)
 
 	connect_to_server(&sock, 600, CONFIG_PROXYCONFIG_RETRY); /* retry till have a connection */
 
-	if (SUCCEED != get_data_from_server(&sock, ZBX_PROTO_VALUE_PROXY_CONFIG, &data))
+	if (SUCCEED != get_data_from_server(&sock, ZBX_PROTO_VALUE_PROXY_CONFIG))
 		goto out;
 
-	if ('\0' == *data)
+	if ('\0' == *sock.buffer)
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "cannot obtain configuration data from server: empty string received");
 		goto out;
 	}
 
-	if (SUCCEED != zbx_json_open(data, &jp))
+	if (SUCCEED != zbx_json_open(sock.buffer, &jp))
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "cannot obtain configuration data from server: %s", zbx_json_strerror());
 		goto out;
diff --git a/src/zabbix_proxy/servercomms.c b/src/zabbix_proxy/servercomms.c
index df2db46e4f4..6ae7f629845 100644
--- a/src/zabbix_proxy/servercomms.c
+++ b/src/zabbix_proxy/servercomms.c
@@ -75,16 +75,16 @@ static int	send_data_to_server(zbx_sock_t *sock, const char *data)
 	return res;
 }
 
-static int	recv_data_from_server(zbx_sock_t *sock, char **data)
+static int	recv_data_from_server(zbx_sock_t *sock)
 {
 	int	res;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In recv_data_from_server()");
 
-	if (FAIL == (res = zbx_tcp_recv(sock, data)))
+	if (FAIL == (res = zbx_tcp_recv(sock)))
 		zabbix_log(LOG_LEVEL_ERR, "Error while receiving answer from server [%s]", zbx_tcp_strerror());
 	else
-		zabbix_log(LOG_LEVEL_DEBUG, "Received [%s] from server", *data);
+		zabbix_log(LOG_LEVEL_DEBUG, "Received [%s] from server", sock->buffer);
 
 	return res;
 }
@@ -110,7 +110,7 @@ void	disconnect_server(zbx_sock_t *sock)
  * Comments:                                                                  *
  *                                                                            *
  ******************************************************************************/
-int	get_data_from_server(zbx_sock_t *sock, const char *request, char **data)
+int	get_data_from_server(zbx_sock_t *sock, const char *request)
 {
 	const char	*__function_name = "get_data_from_server";
 
@@ -126,7 +126,7 @@ int	get_data_from_server(zbx_sock_t *sock, const char *request, char **data)
 	if (FAIL == send_data_to_server(sock, j.buffer))
 		goto exit;
 
-	if (FAIL == recv_data_from_server(sock, data))
+	if (FAIL == recv_data_from_server(sock))
 		goto exit;
 
 	ret = SUCCEED;
diff --git a/src/zabbix_proxy/servercomms.h b/src/zabbix_proxy/servercomms.h
index 3fb45a65570..68a76bb73c2 100644
--- a/src/zabbix_proxy/servercomms.h
+++ b/src/zabbix_proxy/servercomms.h
@@ -30,7 +30,7 @@ extern char	*CONFIG_HOSTNAME;
 int	connect_to_server(zbx_sock_t *sock, int timeout, int retry_interval);
 void	disconnect_server(zbx_sock_t *sock);
 
-int	get_data_from_server(zbx_sock_t *sock, const char *request, char **data);
+int	get_data_from_server(zbx_sock_t *sock, const char *request);
 int	put_data_to_server(zbx_sock_t *sock, struct zbx_json *j, char **error);
 
 #endif
diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c
index 3f4c1615daf..112e8f0c682 100644
--- a/src/zabbix_sender/zabbix_sender.c
+++ b/src/zabbix_sender/zabbix_sender.c
@@ -148,6 +148,106 @@ static int	update_exit_status(int old_status, int new_status)
 
 /******************************************************************************
  *                                                                            *
+ * Function: get_string                                                       *
+ *                                                                            *
+ * Purpose: get current string from the quoted or unquoted string list,       *
+ *          delimited by blanks                                               *
+ *                                                                            *
+ * Parameters:                                                                *
+ *      p       - [IN] parameter list, delimited by blanks (' ' or '\t')      *
+ *      buf     - [OUT] output buffer                                         *
+ *      bufsize - [IN] output buffer size                                     *
+ *                                                                            *
+ * Return value: pointer to the next string                                   *
+ *                                                                            *
+ ******************************************************************************/
+static const char	*get_string(const char *p, char *buf, size_t bufsize)
+{
+/* 0 - init, 1 - inside quoted param, 2 - inside unquoted param */
+	int	state;
+	size_t	buf_i = 0;
+
+	bufsize--;	/* '\0' */
+
+	for (state = 0; '\0' != *p; p++)
+	{
+		switch (state)
+		{
+			/* init state */
+			case 0:
+				if (' ' == *p || '\t' == *p)
+				{
+					/* skipping the leading spaces */;
+				}
+				else if ('"' == *p)
+				{
+					state = 1;
+				}
+				else
+				{
+					state = 2;
+					p--;
+				}
+				break;
+			/* quoted */
+			case 1:
+				if ('"' == *p)
+				{
+					if (' ' != p[1] && '\t' != p[1] && '\0' != p[1])
+						return NULL;	/* incorrect syntax */
+
+					while (' ' == p[1] || '\t' == p[1])
+						p++;
+
+					buf[buf_i] = '\0';
+					return ++p;
+				}
+				else if ('\\' == *p && ('"' == p[1] || '\\' == p[1]))
+				{
+					p++;
+					if (buf_i < bufsize)
+						buf[buf_i++] = *p;
+				}
+				else if ('\\' == *p && 'n' == p[1])
+				{
+					p++;
+					if (buf_i < bufsize)
+						buf[buf_i++] = '\n';
+				}
+				else if (buf_i < bufsize)
+				{
+					buf[buf_i++] = *p;
+				}
+				break;
+			/* unquoted */
+			case 2:
+				if (' ' == *p || '\t' == *p)
+				{
+					while (' ' == *p || '\t' == *p)
+						p++;
+
+					buf[buf_i] = '\0';
+					return p;
+				}
+				else if (buf_i < bufsize)
+				{
+					buf[buf_i++] = *p;
+				}
+				break;
+		}
+	}
+
+	/* missing terminating '"' character */
+	if (1 == state)
+		return NULL;
+
+	buf[buf_i] = '\0';
+
+	return p;
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: check_response                                                   *
  *                                                                            *
  * Purpose: Check whether JSON response is SUCCEED                            *
@@ -197,7 +297,6 @@ static	ZBX_THREAD_ENTRY(send_value, args)
 {
 	ZBX_THREAD_SENDVAL_ARGS	*sentdval_args;
 	zbx_sock_t		sock;
-	char			*answer = NULL;
 	int			tcp_ret, ret = FAIL;
 
 	assert(args);
@@ -216,11 +315,11 @@ static	ZBX_THREAD_ENTRY(send_value, args)
 	{
 		if (SUCCEED == (tcp_ret = zbx_tcp_send(&sock, sentdval_args->json.buffer)))
 		{
-			if (SUCCEED == (tcp_ret = zbx_tcp_recv(&sock, &answer)))
+			if (SUCCEED == (tcp_ret = zbx_tcp_recv(&sock)))
 			{
-				zabbix_log(LOG_LEVEL_DEBUG, "answer [%s]", answer);
-				if (NULL == answer || FAIL == (ret = check_response(answer)))
-					zabbix_log(LOG_LEVEL_WARNING, "incorrect answer from server [%s]", answer);
+				zabbix_log(LOG_LEVEL_DEBUG, "answer [%s]", sock.buffer);
+				if (NULL == sock.buffer || FAIL == (ret = check_response(sock.buffer)))
+					zabbix_log(LOG_LEVEL_WARNING, "incorrect answer from server [%s]", sock.buffer);
 			}
 		}
 
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index 99f76dea68b..f23d4256591 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -45,7 +45,6 @@ zabbix_server_LDADD = \
 	selfmon/libzbxselfmon.a \
 	vmware/libzbxvmware.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
-	$(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libspecsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c
index 412d363eb0b..851f82477e4 100644
--- a/src/zabbix_server/actions.c
+++ b/src/zabbix_server/actions.c
@@ -1289,18 +1289,24 @@ int	check_action_condition(const DB_EVENT *event, DB_CONDITION *condition)
  * Author: Alexei Vladishev                                                   *
  *                                                                            *
  ******************************************************************************/
-static int	check_action_conditions(const DB_EVENT *event, zbx_uint64_t actionid, unsigned char evaltype)
+static int	check_action_conditions(const DB_EVENT *event, zbx_uint64_t actionid, unsigned char evaltype,
+		const char *formula)
 {
 	const char	*__function_name = "check_action_conditions";
 
 	DB_RESULT	result;
 	DB_ROW		row;
 	DB_CONDITION	condition;
-	int		cond, exit = 0, ret = SUCCEED;	/* SUCCEED required for CONDITION_EVAL_TYPE_AND_OR */
+	int		condition_result, ret = SUCCEED, id_len;
 	unsigned char	old_type = 0xff;
+	char		*expression = NULL, tmp[ZBX_MAX_UINT64_LEN + 2], *ptr, error[256];
+	double		eval_result;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() actionid:" ZBX_FS_UI64, __function_name, actionid);
 
+	if (evaltype == CONDITION_EVAL_TYPE_EXPRESSION)
+		expression = zbx_strdup(expression, formula);
+
 	result = DBselect(
 			"select conditionid,conditiontype,operator,value"
 			" from conditions"
@@ -1308,7 +1314,7 @@ static int	check_action_conditions(const DB_EVENT *event, zbx_uint64_t actionid,
 			" order by conditiontype",
 			actionid);
 
-	while (NULL != (row = DBfetch(result)) && 0 == exit)
+	while (NULL != (row = DBfetch(result)))
 	{
 		ZBX_STR2UINT64(condition.conditionid, row[0]);
 		condition.actionid = actionid;
@@ -1316,54 +1322,68 @@ static int	check_action_conditions(const DB_EVENT *event, zbx_uint64_t actionid,
 		condition.operator = (unsigned char)atoi(row[2]);
 		condition.value = row[3];
 
+		condition_result = check_action_condition(event, &condition);
+
 		switch (evaltype)
 		{
 			case CONDITION_EVAL_TYPE_AND_OR:
-				if (old_type == condition.conditiontype)	/* OR conditions */
+				if (old_type == condition.conditiontype)
 				{
-					if (SUCCEED == check_action_condition(event, &condition))
+					if (SUCCEED == condition_result)
 						ret = SUCCEED;
 				}
-				else						/* AND conditions */
+				else
 				{
-					if (FAIL == ret)	/* break if PREVIOUS AND condition is FALSE */
-						exit = 1;
-					else if (FAIL == check_action_condition(event, &condition))
-						ret = FAIL;
-				}
+					if (FAIL == ret)
+						goto clean;
 
-				old_type = condition.conditiontype;
+					ret = condition_result;
+					old_type = condition.conditiontype;
+				}
 
 				break;
 			case CONDITION_EVAL_TYPE_AND:
-				cond = check_action_condition(event, &condition);
-
-				if (FAIL == cond)	/* break if any AND condition is FALSE */
+				if (FAIL == condition_result)	/* break if any AND condition is FALSE */
 				{
 					ret = FAIL;
-					exit = 1;
+					goto clean;
 				}
-				else
-					ret = SUCCEED;
 
 				break;
 			case CONDITION_EVAL_TYPE_OR:
-				cond = check_action_condition(event, &condition);
-
-				if (SUCCEED == cond)	/* break if any OR condition is TRUE */
+				if (SUCCEED == condition_result)	/* break if any OR condition is TRUE */
 				{
 					ret = SUCCEED;
-					exit = 1;
+					goto clean;
+				}
+				ret = FAIL;
+
+				break;
+			case CONDITION_EVAL_TYPE_EXPRESSION:
+				zbx_snprintf(tmp, sizeof(tmp), "{" ZBX_FS_UI64 "}", condition.conditionid);
+				id_len = strlen(tmp);
+
+				for (ptr = expression; NULL != (ptr = strstr(ptr, tmp)); ptr += id_len)
+				{
+					*ptr = (SUCCEED == condition_result ? '1' : '0');
+					memset(ptr + 1, ' ', id_len - 1);
 				}
-				else
-					ret = FAIL;
 
 				break;
 			default:
 				ret = FAIL;
-				exit = 1;
+				goto clean;
 		}
 	}
+
+	if (evaltype == CONDITION_EVAL_TYPE_EXPRESSION)
+	{
+		if (SUCCEED == evaluate(&eval_result, expression, error, sizeof(error)))
+			ret = (SUCCEED != zbx_double_compare(eval_result, 0) ? SUCCEED : FAIL);
+
+		zbx_free(expression);
+	}
+clean:
 	DBfree_result(result);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
@@ -1553,7 +1573,7 @@ void	process_actions(const DB_EVENT *events, size_t events_num)
 	{
 		event = &events[i];
 
-		result = DBselect("select actionid,evaltype"
+		result = DBselect("select actionid,evaltype,formula"
 				" from actions"
 				" where status=%d"
 					" and eventsource=%d",
@@ -1562,9 +1582,9 @@ void	process_actions(const DB_EVENT *events, size_t events_num)
 		while (NULL != (row = DBfetch(result)))
 		{
 			ZBX_STR2UINT64(actionid, row[0]);
-			evaltype = (unsigned char)atoi(row[1]);
+			ZBX_STR2UCHAR(evaltype, row[1]);
 
-			if (SUCCEED == check_action_conditions(event, actionid, evaltype))
+			if (SUCCEED == check_action_conditions(event, actionid, evaltype, row[2]))
 			{
 				escalation_add_values(&db_insert, escalations_num++, actionid, event, 0);
 
diff --git a/src/zabbix_server/discoverer/discoverer.c b/src/zabbix_server/discoverer/discoverer.c
index ecddea49ce6..d2e9dbe5f00 100644
--- a/src/zabbix_server/discoverer/discoverer.c
+++ b/src/zabbix_server/discoverer/discoverer.c
@@ -45,8 +45,6 @@ extern int		server_num, process_num;
  *                                                                            *
  * Parameters: service - service info                                         *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static void	proxy_update_service(DB_DRULE *drule, DB_DCHECK *dcheck, const char *ip,
 		const char *dns, int port, int status, const char *value, int now)
@@ -77,8 +75,6 @@ static void	proxy_update_service(DB_DRULE *drule, DB_DCHECK *dcheck, const char
  *                                                                            *
  * Parameters: service - service info                                         *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static void	proxy_update_host(DB_DRULE *drule, const char *ip, const char *dns, int status, int now)
 {
@@ -103,10 +99,8 @@ static void	proxy_update_host(DB_DRULE *drule, const char *ip, const char *dns,
  *                                                                            *
  * Parameters: service type, ip address, port number                          *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  ******************************************************************************/
-static int	discover_service(DB_DCHECK *dcheck, char *ip, int port, char *value)
+static int	discover_service(DB_DCHECK *dcheck, char *ip, int port, char **value, size_t *value_alloc)
 {
 	const char	*__function_name = "discover_service";
 	int		ret = SUCCEED;
@@ -115,11 +109,13 @@ static int	discover_service(DB_DCHECK *dcheck, char *ip, int port, char *value)
 	AGENT_RESULT 	result;
 	DC_ITEM		item;
 	ZBX_FPING_HOST	host;
+	size_t		value_offset = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	init_result(&result);
-	*value = '\0';
+
+	**value = '\0';
 
 	switch (dcheck->type)
 	{
@@ -228,7 +224,7 @@ static int	discover_service(DB_DCHECK *dcheck, char *ip, int port, char *value)
 				if (SVC_AGENT == dcheck->type)
 				{
 					if (SUCCEED == get_value_agent(&item, &result) && NULL != GET_STR_RESULT(&result))
-						zbx_strlcpy(value, result.str, DSERVICE_VALUE_LEN_MAX);
+						zbx_strcpy_alloc(value, value_alloc, &value_offset, result.str);
 					else
 						ret = FAIL;
 				}
@@ -267,7 +263,7 @@ static int	discover_service(DB_DCHECK *dcheck, char *ip, int port, char *value)
 					}
 
 					if (SUCCEED == get_value_snmp(&item, &result) && NULL != GET_STR_RESULT(&result))
-						zbx_strlcpy(value, result.str, DSERVICE_VALUE_LEN_MAX);
+						zbx_strcpy_alloc(value, value_alloc, &value_offset, result.str);
 					else
 						ret = FAIL;
 
@@ -322,46 +318,42 @@ static int	discover_service(DB_DCHECK *dcheck, char *ip, int port, char *value)
  *                                                                            *
  * Parameters: service - service info                                         *
  *                                                                            *
- * Author: Eugene Grigorjev                                                   *
- *                                                                            *
  ******************************************************************************/
-static void	process_check(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST *dhost,
-		int *host_status, char *ip, const char *dns, int now)
+static void	process_check(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST *dhost, int *host_status, char *ip,
+		const char *dns, int now)
 {
 	const char	*__function_name = "process_check";
 	int		port, first, last;
-	char		*curr_range, *next_range, *last_port;
+	char		*start, *comma, *last_port;
 	int		status;
-	char		value[DSERVICE_VALUE_LEN_MAX];
+	char		*value = NULL;
+	size_t		value_alloc = 128;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
-	for (curr_range = dcheck->ports; curr_range; curr_range = next_range)
+	value = zbx_malloc(value, value_alloc);
+
+	for (start = dcheck->ports; '\0' != *start;)
 	{
-		if (NULL != (next_range = strchr(curr_range, ',')))
-			*next_range = '\0';
+		if (NULL != (comma = strchr(start, ',')))
+			*comma = '\0';
 
-		if (NULL != (last_port = strchr(curr_range, '-')))
+		if (NULL != (last_port = strchr(start, '-')))
 		{
 			*last_port = '\0';
-			first = atoi(curr_range);
+			first = atoi(start);
 			last = atoi(last_port + 1);
 			*last_port = '-';
 		}
 		else
-			first = last = atoi(curr_range);
-
-		if (NULL != next_range)
-		{
-			*next_range = ',';
-			next_range++;
-		}
+			first = last = atoi(start);
 
 		for (port = first; port <= last; port++)
 		{
 			zabbix_log(LOG_LEVEL_DEBUG, "%s() port:%d", __function_name, port);
 
-			status = (SUCCEED == discover_service(dcheck, ip, port, value)) ? DOBJECT_STATUS_UP : DOBJECT_STATUS_DOWN;
+			status = (SUCCEED == discover_service(dcheck, ip, port, &value, &value_alloc) ?
+					DOBJECT_STATUS_UP : DOBJECT_STATUS_DOWN);
 
 			/* update host status */
 			if (-1 == *host_status || DOBJECT_STATUS_UP == status)
@@ -376,8 +368,18 @@ static void	process_check(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST *dhost,
 
 			DBcommit();
 		}
+
+		if (NULL != comma)
+		{
+			*comma = ',';
+			start = comma + 1;
+		}
+		else
+			break;
 	}
 
+	zbx_free(value);
+
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
@@ -385,8 +387,6 @@ static void	process_check(DB_DRULE *drule, DB_DCHECK *dcheck, DB_DHOST *dhost,
  *                                                                            *
  * Function: process_checks                                                   *
  *                                                                            *
- * Author: Alexander Vladishev                                                *
- *                                                                            *
  ******************************************************************************/
 static void	process_checks(DB_DRULE *drule, DB_DHOST *dhost, int *host_status,
 		char *ip, const char *dns, int unique, int now)
@@ -443,176 +443,124 @@ static void	process_checks(DB_DRULE *drule, DB_DHOST *dhost, int *host_status,
  *                                                                            *
  * Purpose: process single discovery rule                                     *
  *                                                                            *
- * Author: Eugene Grigorjev                                                   *
- *                                                                            *
  ******************************************************************************/
 static void	process_rule(DB_DRULE *drule)
 {
 	const char	*__function_name = "process_rule";
+
 	DB_DHOST	dhost;
 	int		host_status, now;
-	unsigned int	j[9], i, first, last, mask, network, broadcast;
-	char		ip[INTERFACE_IP_LEN_MAX], *curr_range, *next_range,
-			*dash, *slash, dns[INTERFACE_DNS_LEN_MAX];
+	unsigned short	j[9];
+	unsigned int	i, first, last, ip_dig;
+	char		ip[INTERFACE_IP_LEN_MAX], *start, *comma, *dash, *slash, dns[INTERFACE_DNS_LEN_MAX];
+	int		invalid_range;
+#ifdef HAVE_IPV6
 	int		ipv6;
+#endif
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() rule:'%s' range:'%s'", __function_name,
 			drule->name, drule->iprange);
 
-	for (curr_range = drule->iprange; curr_range; curr_range = next_range)
+	for (start = drule->iprange; '\0' != *start;)
 	{
-		if (NULL != (next_range = strchr(curr_range, ',')))
-			*next_range = '\0';
+		invalid_range = 0;
 
-		zabbix_log(LOG_LEVEL_DEBUG, "%s() '%s'", __function_name, curr_range);
+		if (NULL != (comma = strchr(start, ',')))
+			*comma = '\0';
 
-		if (NULL != (dash = strchr(curr_range, '-')))
-			*dash = '\0';
+		zabbix_log(LOG_LEVEL_DEBUG, "%s() range:'%s'", __function_name, start);
 
-		if (NULL != (slash = strchr(curr_range, '/')))
+		if (NULL != (dash = strchr(start, '-')))
+			*dash = '\0';
+		else if (NULL != (slash = strchr(start, '/')))
 			*slash = '\0';
 
-		first = last = 0;
-
-		if (SUCCEED == expand_ipv6(curr_range, ip, sizeof(ip)))
+		if (SUCCEED == ip6_str2dig(start, j))
 		{
-			ipv6 = 1;
 #ifdef HAVE_IPV6
-			if (8 == sscanf(ip, "%x:%x:%x:%x:%x:%x:%x:%x", &j[0], &j[1], &j[2], &j[3], &j[4], &j[5], &j[6], &j[7]))
-			{
-				first = (j[6] << 16) + j[7];
+			ipv6 = 1;
 
-				if (NULL != dash)
+			if (NULL != dash)
+			{
+				if (1 != sscanf(dash + 1, "%hx", &j[8]))
 				{
-					if (1 == sscanf(dash + 1, "%x", &j[8]))
-						last = (j[6] << 16) + j[8];
+					invalid_range = 1;
+					goto next;
 				}
-				else if (NULL != slash)
+
+				first = j[7];
+				last = j[8];
+			}
+			else if (NULL != slash)
+			{
+				unsigned short	mask;
+
+				if (1 != sscanf(slash + 1, "%hu", &j[8]) || 112 > j[8] || j[8] > 128)
 				{
-					if (1 == sscanf(slash + 1, "%d", &j[8]) && j[8] >= 112 && j[8] <= 128)
-					{
-						j[8] -= 96;
-
-						mask = (32 == j[8]) ? 0xffffffff : ~(0xffffffff >> j[8]);
-						network = first & mask;
-						broadcast = network + ~mask;
-						first = network + 1;
-
-						zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv6 CIDR:%u", __function_name, j[8] + 96);
-						zbx_snprintf(ip, sizeof(ip), "%x:%x:%x:%x:%x:%x:%x:%x",
-								0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
-								(mask & 0xffff0000) >> 16, (mask & 0x0000ffff));
-						zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv6 Netmask:'%s'",
-								__function_name, collapse_ipv6(ip, sizeof(ip)));
-						zbx_snprintf(ip, sizeof(ip), "%x:%x:%x:%x:%x:%x:%x:%x",
-								j[0], j[1], j[2], j[3], j[4], j[5],
-								(network & 0xffff0000) >> 16, (network & 0x0000ffff));
-						zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv6 Network:'%s'",
-								__function_name, collapse_ipv6(ip, sizeof(ip)));
-						zbx_snprintf(ip, sizeof(ip), "%x:%x:%x:%x:%x:%x:%x:%x",
-								j[0], j[1], j[2], j[3], j[4], j[5],
-								(broadcast & 0xffff0000) >> 16, (broadcast & 0x0000ffff));
-						zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv6 Broadcast:'%s'",
-								__function_name, collapse_ipv6(ip, sizeof(ip)));
-
-						if (j[8] <= 30)
-							last = broadcast - 1;
-					}
+					invalid_range = 1;
+					goto next;
 				}
-				else
-					last = first;
-
-				zbx_snprintf(ip, sizeof(ip), "%x:%x:%x:%x:%x:%x:%x:%x",
-						j[0], j[1], j[2], j[3], j[4], j[5],
-						(first & 0xffff0000) >> 16, (first & 0x0000ffff));
-				zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv6 From:'%s'",
-						__function_name, collapse_ipv6(ip, sizeof(ip)));
-				zbx_snprintf(ip, sizeof(ip), "%x:%x:%x:%x:%x:%x:%x:%x",
-						j[0], j[1], j[2], j[3], j[4], j[5],
-						(last & 0xffff0000) >> 16, (last & 0x0000ffff));
-				zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv6 To:'%s'",
-						__function_name, collapse_ipv6(ip, sizeof(ip)));
+
+				mask = 0xffff << (128 - j[8]);
+				first = j[7] & mask;
+				last = 0xffff & (j[7] | ~mask);
+			}
+			else
+			{
+				first = j[7];
+				last = j[7];
 			}
+#else
+			invalid_range = 2;
+			goto next;
 #endif
 		}
-		else
+		else if (SUCCEED == ip4_str2dig(start, &ip_dig))
 		{
+#ifdef HAVE_IPV6
 			ipv6 = 0;
-			if (4 == sscanf(curr_range, "%u.%u.%u.%u", &j[0], &j[1], &j[2], &j[3]) &&
-					j[0] <= 255 && j[1] <= 255 && j[2] <= 255 && j[3] <= 255)
+#endif
+			if (NULL != dash)
 			{
-				first = (j[0] << 24) + (j[1] << 16) + (j[2] << 8) + j[3];
-
-				if (NULL != dash)
+				if (1 != sscanf(dash + 1, "%hu", &j[4]) || 255 < j[4])
 				{
-					if (1 == sscanf(dash + 1, "%u", &j[4]) && j[4] <= 255)
-						last = (j[0] << 24) + (j[1] << 16) + (j[2] << 8) + j[4];
+					invalid_range = 1;
+					goto next;
 				}
-				else if (NULL != slash)
+
+				first = ip_dig;
+				last = (ip_dig & 0xffffff00) + j[4];
+			}
+			else if (NULL != slash)
+			{
+				unsigned int	mask;
+
+				if (1 != sscanf(slash + 1, "%hu", &j[4]) || 16 > j[4] || j[4] > 30)
 				{
-					if (1 == sscanf(slash + 1, "%u", &j[4]) && j[4] >= 16 && j[4] <= 32)
-					{
-						mask = (32 == j[4]) ? 0xffffffff : ~(0xffffffff >> j[4]);
-						network = first & mask;
-						broadcast = network + ~mask;
-						first = network + 1;
-
-						zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv4 CIDR:%u", __function_name, j[4]);
-						zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv4 Netmask:'%u.%u.%u.%u'", __function_name,
-								(mask & 0xff000000) >> 24, (mask & 0x00ff0000) >> 16,
-								(mask & 0x0000ff00) >> 8, (mask & 0x000000ff));
-						zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv4 Network:'%u.%u.%u.%u'", __function_name,
-								(network & 0xff000000) >> 24, (network & 0x00ff0000) >> 16,
-								(network & 0x0000ff00) >> 8, (network & 0x000000ff));
-						zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv4 Broadcast:'%u.%u.%u.%u'", __function_name,
-								(broadcast & 0xff000000) >> 24, (broadcast & 0x00ff0000) >> 16,
-								(broadcast & 0x0000ff00) >> 8, (broadcast & 0x000000ff));
-
-						if (j[4] <= 30)
-							last = broadcast - 1;
-					}
+					invalid_range = 1;
+					goto next;
 				}
-				else
-					last = first;
 
-				zabbix_log(LOG_LEVEL_DEBUG, "%s() IPv4 Range:'%u.%u.%u.%u' - '%u.%u.%u.%u'", __function_name,
-						(first & 0xff000000) >> 24, (first & 0x00ff0000) >> 16,
-						(first & 0x0000ff00) >> 8, (first & 0x000000ff),
-						(last & 0xff000000) >> 24, (last & 0x00ff0000) >> 16,
-						(last & 0x0000ff00) >> 8, (last & 0x000000ff));
+				mask = 0xffffffff << (32 - j[4]);
+				first = (ip_dig & mask) + 1;
+				last = (ip_dig | ~mask) - 1;
+			}
+			else
+			{
+				first = ip_dig;
+				last = ip_dig;
 			}
 		}
-
-		if (NULL != dash)
+		else
 		{
-			*dash = '-';
-			dash = NULL;
+			invalid_range = 1;
+			goto next;
 		}
 
-		if (NULL != slash)
+		if (first > last)
 		{
-			*slash = '/';
-			slash = NULL;
-		}
-
-		if (NULL != next_range)
-		{
-			*next_range = ',';
-			next_range ++;
-		}
-#ifndef HAVE_IPV6
-		if (1 == ipv6)
-		{
-			zabbix_log(LOG_LEVEL_WARNING, "discovery rule \"%s\": encountered IP range \"%s\","
-					" but IPv6 support not compiled in", drule->name, curr_range);
-			continue;
-		}
-#endif
-		if (0 == first || 0 == last || first > last)
-		{
-			zabbix_log(LOG_LEVEL_WARNING, "discovery rule \"%s\": wrong format of IP range \"%s\"",
-					drule->name, curr_range);
-			continue;
+			invalid_range = 1;
+			goto next;
 		}
 
 		for (i = first; i <= last; i++)
@@ -621,29 +569,23 @@ static void	process_rule(DB_DRULE *drule)
 			host_status = -1;
 
 			now = time(NULL);
-
 #ifdef HAVE_IPV6
 			switch (ipv6)
 			{
 				case 0:
 #endif
 					zbx_snprintf(ip, sizeof(ip), "%u.%u.%u.%u",
-							(i & 0xff000000) >> 24,
-							(i & 0x00ff0000) >> 16,
-							(i & 0x0000ff00) >> 8,
-							(i & 0x000000ff));
+							(i & 0xff000000) >> 24, (i & 0x00ff0000) >> 16,
+							(i & 0x0000ff00) >> 8, i & 0x000000ff);
 #ifdef HAVE_IPV6
 					break;
 				case 1:
-					zbx_snprintf(ip, sizeof(ip), "%x:%x:%x:%x:%x:%x:%x:%x",
-							j[0], j[1], j[2], j[3], j[4], j[5],
-							(i & 0xffff0000) >> 16, (i & 0x0000ffff));
-					collapse_ipv6(ip, sizeof(ip));
+					j[7] = i;
+					ip6_dig2str(j, ip, sizeof(ip));
 					break;
 			}
 #endif
-
-			zabbix_log(LOG_LEVEL_DEBUG, "%s() IP:'%s'", __function_name, ip);
+			zabbix_log(LOG_LEVEL_DEBUG, "%s() ip:'%s'", __function_name, ip);
 
 			alarm(CONFIG_TIMEOUT);
 			zbx_gethost_by_ip(ip, dns, sizeof(dns));
@@ -661,7 +603,33 @@ static void	process_rule(DB_DRULE *drule)
 				proxy_update_host(drule, ip, dns, host_status, now);
 
 			DBcommit();
+
+		}
+next:
+		if (NULL != dash)
+			*dash = '-';
+		else if (NULL != slash)
+			*slash = '/';
+
+		switch (invalid_range)
+		{
+			case 1:
+				zabbix_log(LOG_LEVEL_WARNING, "discovery rule \"%s\": wrong format of IP range \"%s\"",
+						drule->name, start);
+				break;
+			case 2:
+				zabbix_log(LOG_LEVEL_WARNING, "discovery rule \"%s\": encountered IP range \"%s\","
+						" but IPv6 support not compiled in", drule->name, start);
+				break;
+		}
+
+		if (NULL != comma)
+		{
+			*comma = ',';
+			start = comma + 1;
 		}
+		else
+			break;
 	}
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
@@ -860,8 +828,6 @@ static int	get_minnextcheck(int now)
  *                                                                            *
  * Purpose: periodically try to find new hosts and services                   *
  *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
  * Comments: executes once per 30 seconds (hardcoded)                         *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c
index 75975885b27..e36a167d5ff 100644
--- a/src/zabbix_server/escalator/escalator.c
+++ b/src/zabbix_server/escalator/escalator.c
@@ -619,6 +619,8 @@ static void	add_message_alert(DB_ESCALATION *escalation, DB_EVENT *event, DB_EVE
 				MEDIA_STATUS_ACTIVE, userid, mediatypeid);
 	}
 
+	mediatypeid = 0;
+
 	while (NULL != (row = DBfetch(result)))
 	{
 		ZBX_STR2UINT64(mediatypeid, row[0]);
@@ -664,10 +666,11 @@ static void	add_message_alert(DB_ESCALATION *escalation, DB_EVENT *event, DB_EVE
 
 	DBfree_result(result);
 
-	if (0 == medias_num)
+	if (0 == mediatypeid)
 	{
-		zbx_snprintf(error, sizeof(error), "No media defined for user \"%s\"",
-				zbx_user_string(userid));
+		medias_num++;
+
+		zbx_snprintf(error, sizeof(error), "No media defined for user \"%s\"", zbx_user_string(userid));
 
 		zbx_db_insert_prepare(&db_insert, "alerts", "alertid", "actionid", "eventid", "userid", "clock",
 				"subject", "message", "status", "retries", "error", "esc_step", "alerttype", NULL);
@@ -677,9 +680,12 @@ static void	add_message_alert(DB_ESCALATION *escalation, DB_EVENT *event, DB_EVE
 				escalation->esc_step, (int)ALERT_TYPE_MESSAGE);
 	}
 
-	zbx_db_insert_autoincrement(&db_insert, "alertid");
-	zbx_db_insert_execute(&db_insert);
-	zbx_db_insert_clean(&db_insert);
+	if (0 != medias_num)
+	{
+		zbx_db_insert_autoincrement(&db_insert, "alertid");
+		zbx_db_insert_execute(&db_insert);
+		zbx_db_insert_clean(&db_insert);
+	}
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
@@ -690,7 +696,7 @@ static void	add_message_alert(DB_ESCALATION *escalation, DB_EVENT *event, DB_EVE
  *                                                                            *
  * Purpose:                                                                   *
  *                                                                            *
- * Parameters: event - event to check                                         *
+ * Parameters: event    - event to check                                      *
  *             actionid - action ID for matching                              *
  *                                                                            *
  * Return value: SUCCEED - matches, FAIL - otherwise                          *
@@ -892,7 +898,8 @@ static void	execute_operations(DB_ESCALATION *escalation, DB_EVENT *event, DB_AC
 
 	if (0 == action->esc_period)
 	{
-		escalation->status = (action->recovery_msg == 1) ? ESCALATION_STATUS_SLEEP : ESCALATION_STATUS_COMPLETED;
+		escalation->status = (1 == action->recovery_msg) ? ESCALATION_STATUS_SLEEP :
+				ESCALATION_STATUS_COMPLETED;
 	}
 	else
 	{
@@ -916,7 +923,10 @@ static void	execute_operations(DB_ESCALATION *escalation, DB_EVENT *event, DB_AC
 			escalation->nextcheck = time(NULL) + next_esc_period;
 		}
 		else
-			escalation->status = (action->recovery_msg == 1) ? ESCALATION_STATUS_SLEEP : ESCALATION_STATUS_COMPLETED;
+		{
+			escalation->status = (1 == action->recovery_msg) ? ESCALATION_STATUS_SLEEP :
+					ESCALATION_STATUS_COMPLETED;
+		}
 	}
 
 	/* schedule nextcheck for sleeping escalations */
@@ -1100,6 +1110,98 @@ static void	free_event_info(DB_EVENT *event)
 
 /******************************************************************************
  *                                                                            *
+ * Function: check_escalation_trigger                                         *
+ *                                                                            *
+ * Purpose: check whether the escalation trigger and related items, hosts are *
+ *          not deleted or disabled.                                          *
+ *                                                                            *
+ * Parameters: triggerid - [IN] the id of trigger to check                    *
+ *             source    - [IN] the esclation event source                    *
+ *             error     - [OUT] message in case escalation is cancelled      *
+ *                                                                            *
+ ******************************************************************************/
+static void	check_escalation_trigger(zbx_uint64_t triggerid, unsigned char source, char **error)
+{
+	DC_TRIGGER		trigger;
+	int			i, errcode, *errcodes = NULL;
+	zbx_vector_uint64_t	functionids, itemids;
+	DC_ITEM			*items = NULL;
+	DC_FUNCTION		*functions = NULL;
+
+	/* trigger disabled or deleted? */
+	DCconfig_get_triggers_by_triggerids(&trigger, &triggerid, &errcode, 1);
+
+	if (SUCCEED != errcode)
+	{
+		*error = zbx_dsprintf(*error, "trigger id:" ZBX_FS_UI64 " deleted.", triggerid);
+		goto out;
+	}
+	else if (TRIGGER_STATUS_DISABLED == trigger.status)
+	{
+		*error = zbx_dsprintf(*error, "trigger \"%s\" disabled.", trigger.description);
+		goto out;
+	}
+
+	if (EVENT_SOURCE_TRIGGERS != source)
+		goto out;
+
+	/* check items and hosts referenced by trigger expression */
+	zbx_vector_uint64_create(&functionids);
+	zbx_vector_uint64_create(&itemids);
+
+	get_functionids(&functionids, trigger.expression_orig);
+
+	functions = zbx_malloc(functions, sizeof(DC_FUNCTION) * functionids.values_num);
+	errcodes = zbx_malloc(errcodes, sizeof(int) * functionids.values_num);
+
+	DCconfig_get_functions_by_functionids(functions, functionids.values, errcodes, functionids.values_num);
+
+	for (i = 0; i < functionids.values_num; i++)
+	{
+		if (SUCCEED == errcodes[i])
+			zbx_vector_uint64_append(&itemids, functions[i].itemid);
+	}
+
+	DCconfig_clean_functions(functions, errcodes, functionids.values_num);
+	zbx_free(functions);
+
+	zbx_vector_uint64_sort(&itemids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+	zbx_vector_uint64_uniq(&itemids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+
+	items = zbx_malloc(items, sizeof(DC_ITEM) * itemids.values_num);
+	errcodes = zbx_realloc(errcodes, sizeof(int) * itemids.values_num);
+
+	DCconfig_get_items_by_itemids(items, itemids.values, errcodes, itemids.values_num);
+
+	for (i = 0; i < itemids.values_num; i++)
+	{
+		if (SUCCEED != errcodes[i])
+			continue;
+
+		if (ITEM_STATUS_DISABLED == items[i].status)
+		{
+			*error = zbx_dsprintf(*error, "item \"%s\" disabled.", items[i].key_orig);
+			break;
+		}
+		if (HOST_STATUS_NOT_MONITORED == items[i].host.status)
+		{
+			*error = zbx_dsprintf(*error, "host \"%s\" disabled.", items[i].host.host);
+			break;
+		}
+	}
+
+	DCconfig_clean_items(items, errcodes, itemids.values_num);
+	zbx_free(items);
+	zbx_free(errcodes);
+
+	zbx_vector_uint64_destroy(&itemids);
+	zbx_vector_uint64_destroy(&functionids);
+out:
+	DCconfig_clean_triggers(&trigger, &errcode, 1);
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: check_escalation                                                 *
  *                                                                            *
  * Purpose: check whether the escalation is still relevant (items, triggers,  *
@@ -1109,8 +1211,6 @@ static void	free_event_info(DB_EVENT *event)
  *             action     - [OUT] action data (optional)                      *
  *             error      - [OUT] message in case escalation is cancelled     *
  *                                                                            *
- * Author: Aleksandrs Saveljevs                                               *
- *                                                                            *
  * Comments: If 'action' is not NULL, it gathers information about it. If     *
  *           information could not be gathered, its 'actionid' is set to 0.   *
  *                                                                            *
@@ -1121,6 +1221,8 @@ static void	check_escalation(const DB_ESCALATION *escalation, DB_ACTION *action,
 	DB_RESULT	result;
 	DB_ROW		row;
 	unsigned char	source = 0xff, object = 0xff;
+	DC_ITEM		item;
+	int		errcode;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() escalationid:" ZBX_FS_UI64 " status:%s",
 			__function_name, escalation->escalationid, zbx_escalation_status_string(escalation->status));
@@ -1132,101 +1234,36 @@ static void	check_escalation(const DB_ESCALATION *escalation, DB_ACTION *action,
 		object = (unsigned char)atoi(row[1]);
 	}
 	else
-		*error = zbx_dsprintf(*error, "event [" ZBX_FS_UI64 "] deleted.", escalation->eventid);
-	DBfree_result(result);
-
-	if (NULL == *error && EVENT_OBJECT_TRIGGER == object)
 	{
-		/* trigger disabled or deleted? */
-
-		result = DBselect("select description,status from triggers where triggerid=" ZBX_FS_UI64,
-				escalation->triggerid);
-
-		if (NULL == (row = DBfetch(result)))
-		{
-			*error = zbx_dsprintf(*error, "trigger [" ZBX_FS_UI64 "] deleted.", escalation->triggerid);
-		}
-		else if (TRIGGER_STATUS_DISABLED == atoi(row[1]))
-		{
-			*error = zbx_dsprintf(*error, "trigger '%s' disabled.", row[0]);
-		}
-		DBfree_result(result);
+		*error = zbx_dsprintf(*error, "event id:" ZBX_FS_UI64 " deleted.", escalation->eventid);
 	}
 
-	if (EVENT_SOURCE_TRIGGERS == source)
-	{
-		if (NULL == *error && EVENT_OBJECT_TRIGGER == object)
-		{
-			/* item disabled? */
-
-			result = DBselect(
-					"select i.name"
-					" from items i,functions f,triggers t"
-					" where i.itemid=f.itemid"
-						" and f.triggerid=t.triggerid"
-						" and t.triggerid=" ZBX_FS_UI64
-						" and i.status=%d",
-					escalation->triggerid, ITEM_STATUS_DISABLED);
-
-			if (NULL != (row = DBfetch(result)))
-				*error = zbx_dsprintf(*error, "item '%s' disabled.", row[0]);
-			DBfree_result(result);
-		}
-
-		if (NULL == *error && EVENT_OBJECT_TRIGGER == object)
-		{
-			/* host disabled? */
+	DBfree_result(result);
 
-			result = DBselect(
-					"select h.host"
-					" from hosts h,items i,functions f,triggers t"
-					" where h.hostid=i.hostid"
-						" and i.itemid=f.itemid"
-						" and f.triggerid=t.triggerid"
-						" and t.triggerid=" ZBX_FS_UI64
-						" and h.status=%d",
-					escalation->triggerid, HOST_STATUS_NOT_MONITORED);
+	if (NULL == *error && EVENT_OBJECT_TRIGGER == object)
+		check_escalation_trigger(escalation->triggerid, source, error);
 
-			if (NULL != (row = DBfetch(result)))
-				*error = zbx_dsprintf(*error, "host '%s' disabled.", row[0]);
-			DBfree_result(result);
-		}
-	}
-	else if (EVENT_SOURCE_INTERNAL == source)
+	if (NULL == *error && EVENT_SOURCE_INTERNAL == source)
 	{
-		if (NULL == *error && (EVENT_OBJECT_ITEM == object || EVENT_OBJECT_LLDRULE == object))
+		if (EVENT_OBJECT_ITEM == object || EVENT_OBJECT_LLDRULE == object)
 		{
 			/* item disabled or deleted? */
+			DCconfig_get_items_by_itemids(&item, &escalation->itemid, &errcode, 1);
 
-			result = DBselect("select name,status from items where itemid=" ZBX_FS_UI64,
-					escalation->itemid);
-
-			if (NULL == (row = DBfetch(result)))
+			if (SUCCEED != errcode)
 			{
-				*error = zbx_dsprintf(*error, "item [" ZBX_FS_UI64 "] deleted.", escalation->itemid);
+				*error = zbx_dsprintf(*error, "item id:" ZBX_FS_UI64 " deleted.", escalation->itemid);
 			}
-			else if (ITEM_STATUS_DISABLED == atoi(row[1]))
+			else if (ITEM_STATUS_DISABLED == item.status)
 			{
-				*error = zbx_dsprintf(*error, "item '%s' disabled.", row[0]);
+				*error = zbx_dsprintf(*error, "item \"%s\" disabled.", item.key_orig);
+			}
+			else if (HOST_STATUS_NOT_MONITORED == item.host.status)
+			{
+				*error = zbx_dsprintf(*error, "host \"%s\" disabled.", item.host.host);
 			}
-			DBfree_result(result);
-		}
-
-		if (NULL == *error && (EVENT_OBJECT_ITEM == object || EVENT_OBJECT_LLDRULE == object))
-		{
-			/* host disabled? */
-
-			result = DBselect(
-					"select h.host"
-					" from hosts h,items i"
-					" where h.hostid=i.hostid"
-						" and i.itemid=" ZBX_FS_UI64
-						" and h.status=%d",
-					escalation->itemid, HOST_STATUS_NOT_MONITORED);
 
-			if (NULL != (row = DBfetch(result)))
-				*error = zbx_dsprintf(*error, "host '%s' disabled.", row[0]);
-			DBfree_result(result);
+			DCconfig_clean_items(&item, &errcode, 1);
 		}
 	}
 
@@ -1277,11 +1314,11 @@ static void	check_escalation(const DB_ESCALATION *escalation, DB_ACTION *action,
 		if (NULL != action)
 			action->actionid = 0;
 
-		*error = zbx_dsprintf(*error, "action [" ZBX_FS_UI64 "] deleted", escalation->actionid);
+		*error = zbx_dsprintf(*error, "action id:" ZBX_FS_UI64 " deleted", escalation->actionid);
 	}
 	DBfree_result(result);
 
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() error:'%s'", __function_name, ZBX_NULL2STR(*error));
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() error: %s", __function_name, ZBX_NULL2STR(*error));
 }
 
 static void	execute_escalation(DB_ESCALATION *escalation)
@@ -1580,8 +1617,9 @@ ZBX_THREAD_ENTRY(escalator_thread, args)
 		{
 			if (0 == sleeptime)
 			{
-				zbx_setproctitle("%s [processed %d escalations in " ZBX_FS_DBL " sec, processing escalations]",
-						get_process_type_string(process_type), escalations_count, total_sec);
+				zbx_setproctitle("%s [processed %d escalations in " ZBX_FS_DBL
+						" sec, processing escalations]", get_process_type_string(process_type),
+						escalations_count, total_sec);
 			}
 			else
 			{
diff --git a/src/zabbix_server/events.c b/src/zabbix_server/events.c
index 1c364fde5d9..d4653f6f603 100644
--- a/src/zabbix_server/events.c
+++ b/src/zabbix_server/events.c
@@ -143,6 +143,7 @@ static void	clean_events()
 int	process_events(void)
 {
 	const char	*__function_name = "process_events";
+	int		ret = (int)events_num;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() events_num:" ZBX_FS_SIZE_T, __function_name, (zbx_fs_size_t)events_num);
 
@@ -159,5 +160,5 @@ int	process_events(void)
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 
-	return (int)events_num;		/* performance metric */
+	return ret;		/* performance metric */
 }
diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c
index 7c947483659..d052fb4089a 100644
--- a/src/zabbix_server/housekeeper/housekeeper.c
+++ b/src/zabbix_server/housekeeper/housekeeper.c
@@ -184,7 +184,7 @@ static int	hk_item_update_cache_compare(const void *d1, const void *d2)
  * Purpose: add item to the delete queue if necessary                         *
  *                                                                            *
  * Parameters: rule        - [IN/OUT] the history housekeeping rule           *
- *             now         - [IN] the current timestmap                       *
+ *             now         - [IN] the current timestamp                       *
  *             item_record - [IN/OUT] the record from item cache containing   *
  *                           item to process and its oldest record timestamp  *
  *             history     - [IN] a number of days the history data for       *
@@ -223,7 +223,7 @@ static void	hk_history_delete_queue_append(zbx_hk_history_rule_t *rule, int now,
  * Purpose: prepares history housekeeping rule                                *
  *                                                                            *
  * Parameters: rule        - [IN/OUT] the history housekeeping rule           *
- *             now         - [IN] the current timestmap                       *
+ *             now         - [IN] the current timestamp                       *
  *                                                                            *
  * Author: Andris Zeila                                                       *
  *                                                                            *
@@ -790,6 +790,11 @@ ZBX_THREAD_ENTRY(housekeeper_thread, args)
 	zabbix_log(LOG_LEVEL_INFORMATION, "server #%d started [%s #%d]",
 			server_num, get_process_type_string(process_type), process_num);
 
+	zbx_setproctitle("%s [startup idle for %d minutes]", get_process_type_string(process_type),
+			HOUSEKEEPER_STARTUP_DELAY);
+
+	zbx_sleep_loop(HOUSEKEEPER_STARTUP_DELAY * SEC_PER_MIN);
+
 	for (;;)
 	{
 		zabbix_log(LOG_LEVEL_WARNING, "executing housekeeper");
diff --git a/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c
index c9ea77652d4..f27b47ed88f 100644
--- a/src/zabbix_server/httppoller/httptest.c
+++ b/src/zabbix_server/httppoller/httptest.c
@@ -50,6 +50,13 @@ extern int	CONFIG_HTTPPOLLER_FORKS;
 
 #ifdef HAVE_LIBCURL
 
+extern char	*CONFIG_SSL_CA_LOCATION;
+extern char	*CONFIG_SSL_CERT_LOCATION;
+extern char	*CONFIG_SSL_KEY_LOCATION;
+
+#define ZBX_RETRIEVE_MODE_CONTENT	0
+#define ZBX_RETRIEVE_MODE_HEADERS	1
+
 static zbx_httppage_t	page;
 
 static size_t	WRITEFUNCTION2(void *ptr, size_t size, size_t nmemb, void *userdata)
@@ -153,6 +160,12 @@ static void	process_test_data(zbx_uint64_t httptestid, int lastfailedstep, doubl
 		if (SUCCEED != errcodes[i])
 			continue;
 
+		if (ITEM_STATUS_ACTIVE != items[i].status)
+			continue;
+
+		if (HOST_STATUS_MONITORED != items[i].host.status)
+			continue;
+
 		if (HOST_MAINTENANCE_STATUS_ON == items[i].host.maintenance_status &&
 				MAINTENANCE_TYPE_NODATA == items[i].host.maintenance_type)
 		{
@@ -235,6 +248,12 @@ static void	process_step_data(zbx_uint64_t httpstepid, zbx_httpstat_t *stat, zbx
 		if (SUCCEED != errcodes[i])
 			continue;
 
+		if (ITEM_STATUS_ACTIVE != items[i].status)
+			continue;
+
+		if (HOST_STATUS_MONITORED != items[i].host.status)
+			continue;
+
 		if (HOST_MAINTENANCE_STATUS_ON == items[i].host.maintenance_status &&
 				MAINTENANCE_TYPE_NODATA == items[i].host.maintenance_type)
 		{
@@ -272,6 +291,44 @@ static void	process_step_data(zbx_uint64_t httpstepid, zbx_httpstat_t *stat, zbx
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
+#ifdef HAVE_LIBCURL
+static void	add_headers(char *headers, struct curl_slist **headers_slist)
+{
+	char      *p_begin;
+
+	p_begin = headers;
+
+	while ('\0' != *p_begin)
+	{
+		char    c, *p_end, *line;
+
+		while ('\r' == *p_begin || '\n' == *p_begin)
+			p_begin++;
+
+		p_end = p_begin;
+
+		while ('\0' != *p_end && '\r' != *p_end && '\n' != *p_end)
+			p_end++;
+
+		if (p_begin == p_end)
+			break;
+
+		if ('\0' != (c = *p_end))
+			*p_end = '\0';
+		line = zbx_strdup(NULL, p_begin);
+		if ('\0' != c)
+			*p_end = c;
+
+		zbx_lrtrim(line, " \t");
+		if ('\0' != *line)
+			*headers_slist = curl_slist_append(*headers_slist, line);
+		zbx_free(line);
+
+		p_begin = p_end;
+	}
+}
+#endif
+
 /******************************************************************************
  *                                                                            *
  * Function: process_httptest                                                 *
@@ -302,7 +359,8 @@ static void	process_httptest(DC_HOST *host, zbx_httptest_t *httptest)
 	int		speed_download_num = 0;
 #ifdef HAVE_LIBCURL
 	int		err;
-	char		auth[HTTPTEST_HTTP_USER_LEN_MAX + HTTPTEST_HTTP_PASSWORD_LEN_MAX];
+	char		*auth = NULL;
+	size_t		auth_alloc = 0, auth_offset;
 	CURL            *easyhandle = NULL;
 #endif
 
@@ -312,7 +370,8 @@ static void	process_httptest(DC_HOST *host, zbx_httptest_t *httptest)
 	lastfailedstep = 0;
 
 	result = DBselect(
-			"select httpstepid,no,name,url,timeout,posts,required,status_codes,variables"
+			"select httpstepid,no,name,url,timeout,posts,required,status_codes,variables,follow_redirects,"
+				"retrieve_mode,headers"
 			" from httpstep"
 			" where httptestid=" ZBX_FS_UI64
 			" order by no",
@@ -328,18 +387,66 @@ static void	process_httptest(DC_HOST *host, zbx_httptest_t *httptest)
 	if (CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_PROXY, httptest->httptest.http_proxy)) ||
 			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, "")) ||
 			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_USERAGENT, httptest->httptest.agent)) ||
-			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_FOLLOWLOCATION, 1L)) ||
 			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_WRITEFUNCTION, WRITEFUNCTION2)) ||
 			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_HEADERFUNCTION, HEADERFUNCTION2)) ||
-			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_SSL_VERIFYPEER, 0L)) ||
-			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_SSL_VERIFYHOST, 0L)))
+			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_SSL_VERIFYPEER,
+					0 == httptest->httptest.verify_peer ? 0L : 1L)) ||
+			CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_SSL_VERIFYHOST,
+					0 == httptest->httptest.verify_host ? 0L : 2L)))
 	{
 		err_str = zbx_strdup(err_str, curl_easy_strerror(err));
 		goto clean;
 	}
 
+	if (NULL != CONFIG_SSL_CA_LOCATION)
+	{
+		if (CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_CAPATH, CONFIG_SSL_CA_LOCATION)))
+		{
+			err_str = zbx_strdup(err_str, curl_easy_strerror(err));
+			goto clean;
+		}
+	}
+
+	if ('\0' != *httptest->httptest.ssl_cert_file)
+	{
+		char	*file_name;
+
+		file_name = zbx_dsprintf(NULL, "%s/%s", CONFIG_SSL_CERT_LOCATION, httptest->httptest.ssl_cert_file);
+		zabbix_log(LOG_LEVEL_DEBUG, "using SSL certificate file: '%s'", file_name);
+
+		err = curl_easy_setopt(easyhandle, CURLOPT_SSLCERT, file_name);
+		zbx_free(file_name);
+
+		if (CURLE_OK != err || CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_SSLCERTTYPE, "PEM")))
+		{
+			err_str = zbx_strdup(err_str, curl_easy_strerror(err));
+			goto clean;
+		}
+	}
+
+	if ('\0' != *httptest->httptest.ssl_key_file)
+	{
+		char	*file_name;
+
+		file_name = zbx_dsprintf(NULL, "%s/%s", CONFIG_SSL_KEY_LOCATION, httptest->httptest.ssl_key_file);
+		zabbix_log(LOG_LEVEL_DEBUG, "using SSL private key file: '%s'", file_name);
+
+		err = curl_easy_setopt(easyhandle, CURLOPT_SSLKEY, file_name);
+		zbx_free(file_name);
+
+		if (CURLE_OK != err || CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_SSLKEYTYPE, "PEM")) ||
+				CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_KEYPASSWD,
+						httptest->httptest.ssl_key_password)))
+		{
+			err_str = zbx_strdup(err_str, curl_easy_strerror(err));
+			goto clean;
+		}
+	}
+
 	while (NULL != (row = DBfetch(result)))
 	{
+		struct curl_slist	*headers_slist = NULL;
+
 		/* NOTE: do not break or return from this block! */
 		/*       process_step_data() call is required! */
 
@@ -367,6 +474,12 @@ static void	process_httptest(DC_HOST *host, zbx_httptest_t *httptest)
 				&httpstep.status_codes, MACRO_TYPE_COMMON, NULL, 0);
 
 		httpstep.variables = row[8];
+		httpstep.follow_redirects = atoi(row[9]);
+		httpstep.retrieve_mode = atoi(row[10]);
+
+		httpstep.headers = zbx_strdup(NULL, row[11]);
+		substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, host, NULL,
+				&httpstep.headers, MACRO_TYPE_HTTPTEST_FIELD, NULL, 0);
 
 		memset(&stat, 0, sizeof(stat));
 
@@ -390,6 +503,44 @@ static void	process_httptest(DC_HOST *host, zbx_httptest_t *httptest)
 			goto httpstep_error;
 		}
 
+		if (CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_FOLLOWLOCATION,
+				0 == httpstep.follow_redirects ? 0L : 1L)))
+		{
+			err_str = zbx_strdup(err_str, curl_easy_strerror(err));
+			goto httpstep_error;
+		}
+
+		if (0 != httpstep.follow_redirects)
+		{
+			if (CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_MAXREDIRS, ZBX_CURLOPT_MAXREDIRS)))
+			{
+				err_str = zbx_strdup(err_str, curl_easy_strerror(err));
+				goto httpstep_error;
+			}
+		}
+
+		http_substitute_variables(httptest, &httpstep.headers);
+
+		/* headers defined in a step overwrite headers defined in scenario */
+		if ('\0' != *httpstep.headers)
+			add_headers(httpstep.headers, &headers_slist);
+		else if ('\0' != *httptest->httptest.headers)
+			add_headers(httptest->httptest.headers, &headers_slist);
+
+		if (CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_HTTPHEADER, headers_slist)))
+		{
+			err_str = zbx_strdup(err_str, curl_easy_strerror(err));
+			goto httpstep_error;
+		}
+
+		/* enable/disable fetching the body */
+		if (CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_NOBODY,
+				ZBX_RETRIEVE_MODE_HEADERS == httpstep.retrieve_mode ? 1L : 0L)))
+		{
+			err_str = zbx_strdup(err_str, curl_easy_strerror(err));
+			goto httpstep_error;
+		}
+
 		if (HTTPTEST_AUTH_NONE != httptest->httptest.authentication)
 		{
 			long	curlauth = 0;
@@ -411,7 +562,8 @@ static void	process_httptest(DC_HOST *host, zbx_httptest_t *httptest)
 					break;
 			}
 
-			zbx_snprintf(auth, sizeof(auth), "%s:%s", httptest->httptest.http_user,
+			auth_offset = 0;
+			zbx_snprintf_alloc(&auth, &auth_alloc, &auth_offset, "%s:%s", httptest->httptest.http_user,
 					httptest->httptest.http_password);
 
 			if (CURLE_OK != (err = curl_easy_setopt(easyhandle, CURLOPT_HTTPAUTH, curlauth)) ||
@@ -439,12 +591,12 @@ static void	process_httptest(DC_HOST *host, zbx_httptest_t *httptest)
 			if (CURLE_OK == (err = curl_easy_perform(easyhandle)))
 				break;
 		}
-		while (0 != --httptest->httptest.retries);
+		while (0 < --httptest->httptest.retries);
+
+		curl_slist_free_all(headers_slist);	/* must be called after curl_easy_perform() */
 
 		if (CURLE_OK == err)
 		{
-			char	*var_err_str = NULL;
-
 			zabbix_log(LOG_LEVEL_TRACE, "%s() page.data from %s:'%s'", __function_name, httpstep.url, page.data);
 
 			/* first get the data that is needed even if step fails */
@@ -476,47 +628,53 @@ static void	process_httptest(DC_HOST *host, zbx_httptest_t *httptest)
 				speed_download_num++;
 			}
 
-			/* required pattern */
-			if (NULL == err_str && '\0' != *httpstep.required && NULL == zbx_regexp_match(page.data,
-					httpstep.required, NULL))
+			if (ZBX_RETRIEVE_MODE_CONTENT == httpstep.retrieve_mode)
 			{
-				err_str = zbx_dsprintf(err_str, "required pattern \"%s\" was not found on %s",
-						httpstep.required, httpstep.url);
-			}
-
-			/* variables defined in scenario */
-			if (NULL == err_str && FAIL == http_process_variables(httptest, httptest->httptest.variables,
-					page.data, &var_err_str))
-			{
-				char	*variables;
-
-				variables = string_replace(httptest->httptest.variables, "\r\n", " ");
-				err_str = zbx_dsprintf(err_str, "error in scenario variables \"%s\": %s",
-						variables, var_err_str);
-
-				zbx_free(variables);
-			}
-
-			/* variables defined in a step */
-			if (NULL == err_str && FAIL == http_process_variables(httptest, httpstep.variables, page.data,
-					&var_err_str))
-			{
-				char	*variables;
-
-				variables = string_replace(httpstep.variables, "\r\n", " ");
-				err_str = zbx_dsprintf(err_str, "error in step variables \"%s\": %s",
-						variables, var_err_str);
-
-				zbx_free(variables);
+				char	*var_err_str = NULL;
+
+				/* required pattern */
+				if (NULL == err_str && '\0' != *httpstep.required && NULL == zbx_regexp_match(page.data,
+						httpstep.required, NULL))
+				{
+					err_str = zbx_dsprintf(err_str, "required pattern \"%s\" was not found on %s",
+							httpstep.required, httpstep.url);
+				}
+
+				/* variables defined in scenario */
+				if (NULL == err_str && FAIL == http_process_variables(httptest,
+						httptest->httptest.variables, page.data, &var_err_str))
+				{
+					char	*variables;
+
+					variables = string_replace(httptest->httptest.variables, "\r\n", " ");
+					err_str = zbx_dsprintf(err_str, "error in scenario variables \"%s\": %s",
+							variables, var_err_str);
+
+					zbx_free(variables);
+				}
+
+				/* variables defined in a step */
+				if (NULL == err_str && FAIL == http_process_variables(httptest, httpstep.variables,
+						page.data, &var_err_str))
+				{
+					char	*variables;
+
+					variables = string_replace(httpstep.variables, "\r\n", " ");
+					err_str = zbx_dsprintf(err_str, "error in step variables \"%s\": %s",
+							variables, var_err_str);
+
+					zbx_free(variables);
+				}
+
+				zbx_free(var_err_str);
 			}
-
-			zbx_free(var_err_str);
 		}
 		else
 			err_str = zbx_strdup(err_str, curl_easy_strerror(err));
 
 		zbx_free(page.data);
 httpstep_error:
+		zbx_free(httpstep.headers);
 		zbx_free(httpstep.status_codes);
 		zbx_free(httpstep.required);
 		zbx_free(httpstep.posts);
@@ -531,6 +689,8 @@ httpstep_error:
 			break;
 		}
 	}
+
+	zbx_free(auth);
 clean:
 	curl_easy_cleanup(easyhandle);
 #else
@@ -589,7 +749,7 @@ clean:
  *                                                                            *
  * Parameters: now - current timestamp                                        *
  *                                                                            *
- * Return value:                                                              *
+ * Return value: number of processed httptests                                *
  *                                                                            *
  * Author: Alexei Vladishev                                                   *
  *                                                                            *
@@ -612,8 +772,9 @@ int	process_httptests(int httppoller_num, int now)
 	zbx_vector_ptr_pair_create(&httptest.macros);
 
 	result = DBselect(
-			"select h.hostid,h.host,h.name,t.httptestid,t.name,t.variables,t.agent,"
-				"t.authentication,t.http_user,t.http_password,t.http_proxy,t.retries"
+			"select h.hostid,h.host,h.name,t.httptestid,t.name,t.variables,t.headers,t.agent,"
+				"t.authentication,t.http_user,t.http_password,t.http_proxy,t.retries,t.ssl_cert_file,"
+				"t.ssl_key_file,t.ssl_key_password,t.verify_peer,t.verify_host"
 			" from httptest t,hosts h"
 			" where t.hostid=h.hostid"
 				" and t.nextcheck<=%d"
@@ -641,32 +802,54 @@ int	process_httptests(int httppoller_num, int now)
 		substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, &host, NULL,
 				&httptest.httptest.variables, MACRO_TYPE_HTTPTEST_FIELD, NULL, 0);
 
-		httptest.httptest.agent = zbx_strdup(NULL, row[6]);
+		httptest.httptest.headers = zbx_strdup(NULL, row[6]);
+		substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, &host, NULL,
+				&httptest.httptest.headers, MACRO_TYPE_HTTPTEST_FIELD, NULL, 0);
+
+		httptest.httptest.agent = zbx_strdup(NULL, row[7]);
 		substitute_simple_macros(NULL, NULL, NULL, NULL, &host.hostid, NULL, NULL,
 				&httptest.httptest.agent, MACRO_TYPE_COMMON, NULL, 0);
 
-		if (HTTPTEST_AUTH_NONE != (httptest.httptest.authentication = atoi(row[7])))
+		if (HTTPTEST_AUTH_NONE != (httptest.httptest.authentication = atoi(row[8])))
 		{
-			httptest.httptest.http_user = zbx_strdup(NULL, row[8]);
+			httptest.httptest.http_user = zbx_strdup(NULL, row[9]);
 			substitute_simple_macros(NULL, NULL, NULL, NULL, &host.hostid, NULL, NULL,
 					&httptest.httptest.http_user, MACRO_TYPE_COMMON, NULL, 0);
 
-			httptest.httptest.http_password = zbx_strdup(NULL, row[9]);
+			httptest.httptest.http_password = zbx_strdup(NULL, row[10]);
 			substitute_simple_macros(NULL, NULL, NULL, NULL, &host.hostid, NULL, NULL,
 					&httptest.httptest.http_password, MACRO_TYPE_COMMON, NULL, 0);
 		}
 
-		httptest.httptest.http_proxy = zbx_strdup(NULL, row[10]);
+		httptest.httptest.http_proxy = zbx_strdup(NULL, row[11]);
 		substitute_simple_macros(NULL, NULL, NULL, NULL, &host.hostid, NULL, NULL,
 				&httptest.httptest.http_proxy, MACRO_TYPE_COMMON, NULL, 0);
 
-		httptest.httptest.retries = atoi(row[11]);
+		httptest.httptest.retries = atoi(row[12]);
+
+		httptest.httptest.ssl_cert_file = zbx_strdup(NULL, row[13]);
+		substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, &host, NULL,
+				&httptest.httptest.ssl_cert_file, MACRO_TYPE_HTTPTEST_FIELD, NULL, 0);
+
+		httptest.httptest.ssl_key_file = zbx_strdup(NULL, row[14]);
+		substitute_simple_macros(NULL, NULL, NULL, NULL, NULL, &host, NULL,
+				&httptest.httptest.ssl_key_file, MACRO_TYPE_HTTPTEST_FIELD, NULL, 0);
+
+		httptest.httptest.ssl_key_password = zbx_strdup(NULL, row[15]);
+		substitute_simple_macros(NULL, NULL, NULL, NULL, &host.hostid, NULL, NULL,
+				&httptest.httptest.ssl_key_password, MACRO_TYPE_COMMON, NULL, 0);
+
+		httptest.httptest.verify_peer = atoi(row[16]);
+		httptest.httptest.verify_host = atoi(row[17]);
 
-		/* add httptest varriables to the current test macro cache */
+		/* add httptest variables to the current test macro cache */
 		http_process_variables(&httptest, httptest.httptest.variables, NULL, NULL);
 
 		process_httptest(&host, &httptest);
 
+		zbx_free(httptest.httptest.ssl_key_password);
+		zbx_free(httptest.httptest.ssl_key_file);
+		zbx_free(httptest.httptest.ssl_cert_file);
 		zbx_free(httptest.httptest.http_proxy);
 		if (HTTPTEST_AUTH_NONE != httptest.httptest.authentication)
 		{
@@ -674,6 +857,7 @@ int	process_httptests(int httppoller_num, int now)
 			zbx_free(httptest.httptest.http_user);
 		}
 		zbx_free(httptest.httptest.agent);
+		zbx_free(httptest.httptest.headers);
 		zbx_free(httptest.httptest.variables);
 
 		/* clear the macro cache used in this http test */
diff --git a/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c
index 7326b1ae489..31ca2661378 100644
--- a/src/zabbix_server/pinger/pinger.c
+++ b/src/zabbix_server/pinger/pinger.c
@@ -71,6 +71,12 @@ static void	process_value(zbx_uint64_t itemid, zbx_uint64_t *value_ui64, double
 	if (SUCCEED != errcode)
 		goto clean;
 
+	if (ITEM_STATUS_ACTIVE != item.status)
+		goto clean;
+
+	if (HOST_STATUS_MONITORED != item.host.status)
+		goto clean;
+
 	if (NOTSUPPORTED == ping_result)
 	{
 		item.state = ITEM_STATE_NOTSUPPORTED;
diff --git a/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c
index 966718a4c7a..0af6cb56919 100644
--- a/src/zabbix_server/poller/checks_agent.c
+++ b/src/zabbix_server/poller/checks_agent.c
@@ -47,7 +47,7 @@ int	get_value_agent(DC_ITEM *item, AGENT_RESULT *result)
 {
 	const char	*__function_name = "get_value_agent";
 	zbx_sock_t	s;
-	char		*buf, buffer[MAX_STRING_LEN];
+	char		buffer[MAX_STRING_LEN];
 	int		ret = SUCCEED;
 	ssize_t		received_len;
 
@@ -61,23 +61,28 @@ int	get_value_agent(DC_ITEM *item, AGENT_RESULT *result)
 
 		/* send requests using old protocol */
 		if (SUCCEED == (ret = zbx_tcp_send_raw(&s, buffer)))
-			ret = SUCCEED_OR_FAIL(received_len = zbx_tcp_recv_ext(&s, &buf, ZBX_TCP_READ_UNTIL_CLOSE, 0));
+			ret = SUCCEED_OR_FAIL(received_len = zbx_tcp_recv_ext(&s, ZBX_TCP_READ_UNTIL_CLOSE, 0));
 	}
 
 	if (SUCCEED == ret)
 	{
-		zbx_rtrim(buf, " \r\n");
-		zbx_ltrim(buf, " ");
+		zbx_rtrim(s.buffer, " \r\n");
+		zbx_ltrim(s.buffer, " ");
 
-		zabbix_log(LOG_LEVEL_DEBUG, "get value from agent result: '%s'", buf);
+		zabbix_log(LOG_LEVEL_DEBUG, "get value from agent result: '%s'", s.buffer);
 
-		if (0 == strcmp(buf, ZBX_NOTSUPPORTED))
+		if (0 == strcmp(s.buffer, ZBX_NOTSUPPORTED))
 		{
-			zbx_snprintf(buffer, sizeof(buffer), "Not supported by Zabbix Agent");
+			/* 'ZBX_NOTSUPPORTED\0<error message>' */
+			if (sizeof(ZBX_NOTSUPPORTED) < s.read_bytes)
+				zbx_snprintf(buffer, sizeof(buffer), "%s", s.buffer + sizeof(ZBX_NOTSUPPORTED));
+			else
+				zbx_snprintf(buffer, sizeof(buffer), "Not supported by Zabbix Agent");
+
 			SET_MSG_RESULT(result, strdup(buffer));
 			ret = NOTSUPPORTED;
 		}
-		else if (0 == strcmp(buf, ZBX_ERROR))
+		else if (0 == strcmp(s.buffer, ZBX_ERROR))
 		{
 			zbx_snprintf(buffer, sizeof(buffer), "Zabbix Agent non-critical error");
 			SET_MSG_RESULT(result, strdup(buffer));
@@ -91,7 +96,7 @@ int	get_value_agent(DC_ITEM *item, AGENT_RESULT *result)
 			SET_MSG_RESULT(result, strdup(buffer));
 			ret = NETWORK_ERROR;
 		}
-		else if (SUCCEED != set_result_type(result, item->value_type, item->data_type, buf))
+		else if (SUCCEED != set_result_type(result, item->value_type, item->data_type, s.buffer))
 			ret = NOTSUPPORTED;
 	}
 	else
diff --git a/src/zabbix_server/poller/checks_aggregate.c b/src/zabbix_server/poller/checks_aggregate.c
index 1b7e656058a..1603d89b9e9 100644
--- a/src/zabbix_server/poller/checks_aggregate.c
+++ b/src/zabbix_server/poller/checks_aggregate.c
@@ -367,7 +367,7 @@ static int	evaluate_aggregate(DC_ITEM *item, AGENT_RESULT *res, int grp_func, co
 	{
 		if (FAIL == is_uint_suffix(param, &seconds))
 		{
-			SET_MSG_RESULT(res, zbx_strdup(NULL, "Invalid fourth parameter"));
+			SET_MSG_RESULT(res, zbx_strdup(NULL, "Invalid fourth parameter."));
 			goto clean2;
 		}
 		count = 0;
@@ -378,6 +378,12 @@ static int	evaluate_aggregate(DC_ITEM *item, AGENT_RESULT *res, int grp_func, co
 		if (SUCCEED != errcodes[i])
 			continue;
 
+		if (ITEM_STATUS_ACTIVE != items[i].status)
+			continue;
+
+		if (HOST_STATUS_MONITORED != items[i].host.status)
+			continue;
+
 		if (ITEM_VALUE_TYPE_FLOAT != items[i].value_type && ITEM_VALUE_TYPE_UINT64 != items[i].value_type)
 			continue;
 
@@ -480,7 +486,7 @@ int	get_value_aggregate(DC_ITEM *item, AGENT_RESULT *result)
 
 	if (4 != num_param(params))
 	{
-		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid number of parameters"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid number of parameters."));
 		return NOTSUPPORTED;
 	}
 
@@ -507,7 +513,7 @@ int	get_value_aggregate(DC_ITEM *item, AGENT_RESULT *result)
 		item_func = ZBX_VALUE_FUNC_LAST;
 	else
 	{
-		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 		return NOTSUPPORTED;
 	}
 
diff --git a/src/zabbix_server/poller/checks_calculated.c b/src/zabbix_server/poller/checks_calculated.c
index 748cfc8c63b..666e4af9d0c 100644
--- a/src/zabbix_server/poller/checks_calculated.c
+++ b/src/zabbix_server/poller/checks_calculated.c
@@ -23,13 +23,12 @@
 
 typedef struct
 {
-	int		functionid;
-	char		*host;
-	char		*key;
-	char		*func;
-	char		*params;
-	char		*value;
-	unsigned char	found;
+	int	functionid;
+	char	*host;
+	char	*key;
+	char	*func;
+	char	*params;
+	char	*value;
 }
 function_t;
 
@@ -37,7 +36,8 @@ typedef struct
 {
 	char		*exp;
 	function_t	*functions;
-	int		functions_alloc, functions_num;
+	int		functions_alloc;
+	int		functions_num;
 }
 expression_t;
 
@@ -80,7 +80,6 @@ static int	calcitem_add_function(expression_t *exp, char *func, char *params)
 	f->func = func;
 	f->params = params;
 	f->value = NULL;
-	f->found = 0;
 
 	return f->functionid;
 }
@@ -89,7 +88,7 @@ static int	calcitem_parse_expression(DC_ITEM *dc_item, expression_t *exp, char *
 {
 	const char	*__function_name = "calcitem_parse_expression";
 	char		*e, *f, *func = NULL, *params = NULL;
-	size_t		exp_alloc = 128, exp_offset = 0;
+	size_t		exp_alloc = 128, exp_offset = 0, len;
 	int		functionid, ret;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() expression:'%s'", __function_name, dc_item->params);
@@ -101,15 +100,25 @@ static int	calcitem_parse_expression(DC_ITEM *dc_item, expression_t *exp, char *
 
 	for (e = dc_item->params; '\0' != *e; e++)
 	{
-		if (NULL != strchr(" \t\r\n", *e))
+		if (SUCCEED != is_function_char(*e))
+		{
+			zbx_chrcpy_alloc(&exp->exp, &exp_alloc, &exp_offset, *e);
+			continue;
+		}
+
+		if ((0 == strncmp("and", e, len = 3) || 0 == strncmp("not", e, 3) || 0 == strncmp("or", e, len = 2)) &&
+				NULL != strchr("()" ZBX_WHITESPACE, e[len]))
+		{
+			zbx_strncpy_alloc(&exp->exp, &exp_alloc, &exp_offset, e, len);
+			e += len - 1;
 			continue;
+		}
 
 		f = e;
-		if (FAIL == parse_function(&e, &func, &params))
+		if (SUCCEED != parse_function(&e, &func, &params))
 		{
 			e = f;
 			zbx_chrcpy_alloc(&exp->exp, &exp_alloc, &exp_offset, *f);
-
 			continue;
 		}
 		else
@@ -141,20 +150,22 @@ static int	calcitem_evaluate_expression(DC_ITEM *dc_item, expression_t *exp, cha
 {
 	const char	*__function_name = "calcitem_evaluate_expression";
 	function_t	*f = NULL;
-	char		*sql = NULL, *host_esc, *key_esc,
-			*buf, replace[16];
-	size_t		sql_alloc = ZBX_KIBIBYTE, sql_offset = 0;
+	char		*buf, replace[16], *errstr = NULL;
 	int		i, ret = SUCCEED;
 	time_t		now;
-	DB_RESULT	db_result;
-	DB_ROW		db_row;
-	DB_ITEM		item;
+	zbx_host_key_t	*keys = NULL;
+	DC_ITEM		*items = NULL;
+	int		*errcodes = NULL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	if (0 == exp->functions_num)
 		return ret;
 
+	keys = zbx_malloc(keys, sizeof(zbx_host_key_t) * exp->functions_num);
+	items = zbx_malloc(items, sizeof(DC_ITEM) * exp->functions_num);
+	errcodes = zbx_malloc(errcodes, sizeof(int) * exp->functions_num);
+
 	for (i = 0; i < exp->functions_num; i++)
 	{
 		f = &exp->functions[i];
@@ -164,7 +175,7 @@ static int	calcitem_evaluate_expression(DC_ITEM *dc_item, expression_t *exp, cha
 		if (SUCCEED != parse_host_key(buf, &f->host, &f->key))
 		{
 			zbx_snprintf(error, max_error_len,
-					"Invalid first parameter in function [%s(%s)]",
+					"Invalid first parameter in function [%s(%s)].",
 					f->func, f->params);
 			ret = NOTSUPPORTED;
 		}
@@ -172,114 +183,101 @@ static int	calcitem_evaluate_expression(DC_ITEM *dc_item, expression_t *exp, cha
 		zbx_free(buf);
 
 		if (SUCCEED != ret)
-			break;
+			goto out;
 
 		if (NULL == f->host)
 			f->host = strdup(dc_item->host.host);
 
+		keys[i].host = f->host;
+		keys[i].key = f->key;
+
 		remove_param(f->params, 1);
 
 		zabbix_log(LOG_LEVEL_DEBUG, "%s() function:'%s:%s.%s(%s)'",
 				__function_name, f->host, f->key, f->func, f->params);
 	}
 
-	if (SUCCEED != ret)
-		return ret;
+	DCconfig_get_items_by_keys(items, keys, errcodes, exp->functions_num);
 
 	now = time(NULL);
-	sql = zbx_malloc(sql, sql_alloc);
-
-	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-			"select %s"
-			" where h.hostid=i.hostid"
-				" and h.status=%d"
-				" and i.status=%d"
-				" and i.state=%d"
-				" and (",
-			ZBX_SQL_ITEM_SELECT,
-			HOST_STATUS_MONITORED,
-			ITEM_STATUS_ACTIVE,
-			ITEM_STATE_NORMAL);
 
 	for (i = 0; i < exp->functions_num; i++)
 	{
 		f = &exp->functions[i];
 
-		if (i != 0)
-			zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, " or ");
-
-		host_esc = DBdyn_escape_string(f->host);
-		key_esc = DBdyn_escape_string(f->key);
-
-		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "(h.host='%s' and i.key_='%s')", host_esc, key_esc);
-
-		zbx_free(key_esc);
-		zbx_free(host_esc);
-	}
-
-	zbx_chrcpy_alloc(&sql, &sql_alloc, &sql_offset, ')');
-
-	db_result = DBselect("%s", sql);
-
-	zbx_free(sql);
-
-	while (NULL != (db_row = DBfetch(db_result)))
-	{
-		DBget_item_from_db(&item, db_row);
+		if (SUCCEED != errcodes[i])
+		{
+			zbx_snprintf(error, max_error_len,
+					"Cannot evaluate function \"%s(%s)\":"
+					" item \"%s:%s\" does not exist.",
+					f->func, f->params, f->host, f->key);
+			ret = NOTSUPPORTED;
+			break;
+		}
 
-		for (i = 0; i < exp->functions_num; i++)
+		if (ITEM_STATUS_ACTIVE != items[i].status)
 		{
-			f = &exp->functions[i];
+			zbx_snprintf(error, max_error_len,
+					"Cannot evaluate function \"%s(%s)\":"
+					" item \"%s:%s\" is disabled.",
+					f->func, f->params, f->host, f->key);
+			ret = NOTSUPPORTED;
+			break;
+		}
 
-			if (0 != strcmp(f->key, item.key))
-				continue;
+		if (HOST_STATUS_MONITORED != items[i].host.status)
+		{
+			zbx_snprintf(error, max_error_len,
+					"Cannot evaluate function \"%s(%s)\":"
+					" item \"%s:%s\" belongs to a disabled host.",
+					f->func, f->params, f->host, f->key);
+			ret = NOTSUPPORTED;
+			break;
+		}
 
-			if (0 != strcmp(f->host, item.host_name))
-				continue;
+		if (ITEM_STATE_NOTSUPPORTED == items[i].state)
+		{
+			zbx_snprintf(error, max_error_len,
+					"Cannot evaluate function \"%s(%s)\": item \"%s:%s\" not supported.",
+					f->func, f->params, f->host, f->key);
+			ret = NOTSUPPORTED;
+			break;
+		}
 
-			f->found = 1;
-			f->value = zbx_malloc(f->value, MAX_BUFFER_LEN);
+		f->value = zbx_malloc(f->value, MAX_BUFFER_LEN);
 
-			if (SUCCEED != evaluate_function(f->value, &item, f->func, f->params, now))
+		if (SUCCEED != evaluate_function(f->value, &items[i], f->func, f->params, now, &errstr))
+		{
+			if (NULL != errstr)
 			{
-				zbx_snprintf(error, max_error_len, "Cannot evaluate function [%s(%s)]",
-						f->func, f->params);
-
-				ret = NOTSUPPORTED;
-				break;
+				zbx_snprintf(error, max_error_len, "Cannot evaluate function \"%s(%s)\": %s.",
+						f->func, f->params, errstr);
+				zbx_free(errstr);
 			}
 			else
-				f->value = zbx_realloc(f->value, strlen(f->value) + 1);
-		}
-
-		if (SUCCEED != ret)
-			break;
-	}
-	DBfree_result(db_result);
-
-	if (SUCCEED != ret)
-		return ret;
-
-	for (i = 0; i < exp->functions_num; i ++)
-	{
-		f = &exp->functions[i];
+			{
+				zbx_snprintf(error, max_error_len, "Cannot evaluate function \"%s(%s)\".",
+						f->func, f->params);
+			}
 
-		if (0 == f->found)
-		{
-			zbx_snprintf(error, max_error_len,
-				"Cannot evaluate function [%s(%s)]"
-					": item [%s:%s] not found",
-					f->func, f->params, f->host, f->key);
 			ret = NOTSUPPORTED;
 			break;
 		}
 
+		f->value = zbx_realloc(f->value, strlen(f->value) + 1);
+
 		zbx_snprintf(replace, sizeof(replace), "{%d}", f->functionid);
 		buf = string_replace(exp->exp, replace, f->value);
 		zbx_free(exp->exp);
 		exp->exp = buf;
 	}
 
+	DCconfig_clean_items(items, errcodes, exp->functions_num);
+out:
+	zbx_free(errcodes);
+	zbx_free(items);
+	zbx_free(keys);
+
 	return ret;
 }
 
@@ -319,11 +317,9 @@ int	get_value_calculated(DC_ITEM *dc_item, AGENT_RESULT *result)
 
 	if (ITEM_VALUE_TYPE_UINT64 == dc_item->value_type && 0 > value)
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL,
-				"Received value [" ZBX_FS_DBL "] is not suitable"
-				" for value type [%s] and data type [%s]",
-				value, zbx_item_value_type_string(dc_item->value_type),
-				zbx_item_data_type_string(dc_item->data_type)));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Received value [" ZBX_FS_DBL "]"
+				" is not suitable for value type [%s].",
+				value, zbx_item_value_type_string(dc_item->value_type)));
 		ret = NOTSUPPORTED;
 		goto clean;
 	}
diff --git a/src/zabbix_server/poller/checks_db.c b/src/zabbix_server/poller/checks_db.c
index e06e252aae7..fed03a7b283 100644
--- a/src/zabbix_server/poller/checks_db.c
+++ b/src/zabbix_server/poller/checks_db.c
@@ -52,13 +52,13 @@ int	get_value_db(DC_ITEM *item, AGENT_RESULT *result)
 
 	if (SUCCEED != parse_item_key(item->key, &request))
 	{
-		SET_MSG_RESULT(result, zbx_strdup(NULL, "Key is badly formatted."));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid item parameter format."));
 		goto out;
 	}
 
 	if (0 != strcmp(request.key, "db.odbc.select"))
 	{
-		SET_MSG_RESULT(result, zbx_strdup(NULL, "Item key is not supported."));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Unsupported item key for this item type."));
 		goto out;
 	}
 
diff --git a/src/zabbix_server/poller/checks_external.c b/src/zabbix_server/poller/checks_external.c
index a3d1faffb5f..5ac85eeb335 100644
--- a/src/zabbix_server/poller/checks_external.c
+++ b/src/zabbix_server/poller/checks_external.c
@@ -52,7 +52,7 @@ int	get_value_external(DC_ITEM *item, AGENT_RESULT *result)
 
 	if (ZBX_COMMAND_ERROR == (rc = parse_command(item->key, key, sizeof(key), params, sizeof(params))))
 	{
-		SET_MSG_RESULT(result, zbx_strdup(NULL, "Key is badly formatted"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid item key format."));
 		goto notsupported;
 	}
 
@@ -72,7 +72,7 @@ int	get_value_external(DC_ITEM *item, AGENT_RESULT *result)
 
 		if (0 == (n = num_param(params)))
 		{
-			SET_MSG_RESULT(result, zbx_strdup(NULL, "Key is badly formatted"));
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid item parameter format."));
 			goto notsupported;
 		}
 
diff --git a/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c
index b6f8ceae790..9ea9e8bcd3f 100644
--- a/src/zabbix_server/poller/checks_internal.c
+++ b/src/zabbix_server/poller/checks_internal.c
@@ -57,10 +57,13 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 	if (ZBX_COMMAND_WITH_PARAMS != parse_command(item->key, NULL, 0, params, sizeof(params)))
 		goto notsupported;
 
-	if (0 != get_param(params, 1, tmp, sizeof(tmp)))
+	if (0 == (nparams = num_param(params)))
+	{
+		error = zbx_strdup(error, "Invalid number of parameters.");
 		goto notsupported;
+	}
 
-	nparams = num_param(params);
+	get_param(params, 1, tmp, sizeof(tmp));
 
 	if (0 == strcmp(tmp, "triggers"))			/* zabbix["triggers"] */
 	{
@@ -68,28 +71,40 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			goto notsupported;
 
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, DCget_trigger_count());
 	}
 	else if (0 == strcmp(tmp, "items"))			/* zabbix["items"] */
 	{
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, DCget_item_count());
 	}
 	else if (0 == strcmp(tmp, "items_unsupported"))		/* zabbix["items_unsupported"] */
 	{
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, DCget_item_unsupported_count());
 	}
 	else if (0 == strcmp(tmp, "hosts"))			/* zabbix["hosts"] */
 	{
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, DCget_host_count());
 	}
@@ -103,7 +118,10 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			goto notsupported;
 
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, DBget_row_count(tmp));
 	}
@@ -114,7 +132,10 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			goto notsupported;
 
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, DBget_row_count(tmp));
 	}
@@ -124,37 +145,35 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 
 		if (3 < nparams)
 		{
-			error = zbx_strdup(error, "Invalid number of parameters");
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
 		}
 
 		if (2 <= nparams)
 		{
-			if (0 != get_param(params, 2, tmp, sizeof(tmp)))
-				goto notsupported;
+			get_param(params, 2, tmp, sizeof(tmp));
 
 			if ('\0' != *tmp && FAIL == is_uint_suffix(tmp, &from))
 			{
-				error = zbx_strdup(error, "Invalid second parameter");
+				error = zbx_strdup(error, "Invalid second parameter.");
 				goto notsupported;
 			}
 		}
 
-		if (3 <= nparams)
+		if (3 == nparams)
 		{
-			if (0 != get_param(params, 3, tmp, sizeof(tmp)))
-				goto notsupported;
+			get_param(params, 3, tmp, sizeof(tmp));
 
 			if ('\0' != *tmp && FAIL == is_uint_suffix(tmp, &to))
 			{
-				error = zbx_strdup(error, "Invalid third parameter");
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
 			}
 		}
 
 		if ((unsigned int)-1 != to && from > to)
 		{
-			error = zbx_strdup(error, "Parameters represent an invalid interval");
+			error = zbx_strdup(error, "Parameters represent an invalid interval.");
 			goto notsupported;
 		}
 
@@ -163,63 +182,108 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 	else if (0 == strcmp(tmp, "requiredperformance"))	/* zabbix["requiredperformance"] */
 	{
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_DBL_RESULT(result, DCget_required_performance());
 	}
 	else if (0 == strcmp(tmp, "uptime"))			/* zabbix["uptime"] */
 	{
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, time(NULL) - CONFIG_SERVER_STARTUP_TIME);
 	}
 	else if (0 == strcmp(tmp, "boottime"))			/* zabbix["boottime"] */
 	{
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, CONFIG_SERVER_STARTUP_TIME);
 	}
-	else if (0 == strcmp(tmp, "host"))			/* zabbix["host",<type>,"available"] */
+	else if (0 == strcmp(tmp, "host"))			/* zabbix["host",*] */
 	{
 		if (3 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
-		if (0 != get_param(params, 3, tmp, sizeof(tmp)) || 0 != strcmp(tmp, "available"))
-			goto notsupported;
+		get_param(params, 3, tmp, sizeof(tmp));
 
-		if (0 != get_param(params, 2, tmp, sizeof(tmp)))
-			goto notsupported;
+		if (0 == strcmp(tmp, "available"))		/* zabbix["host",<host>,"available"] */
+		{
+			get_param(params, 2, tmp, sizeof(tmp));
+
+			if (0 == strcmp(tmp, "agent"))
+				SET_UI64_RESULT(result, item->host.available);
+			else if (0 == strcmp(tmp, "snmp"))
+				SET_UI64_RESULT(result, item->host.snmp_available);
+			else if (0 == strcmp(tmp, "ipmi"))
+				SET_UI64_RESULT(result, item->host.ipmi_available);
+			else if (0 == strcmp(tmp, "jmx"))
+				SET_UI64_RESULT(result, item->host.jmx_available);
+			else
+			{
+				error = zbx_strdup(error, "Invalid second parameter.");
+				goto notsupported;
+			}
 
-		if (0 == strcmp(tmp, "agent"))
-			SET_UI64_RESULT(result, item->host.available);
-		else if (0 == strcmp(tmp, "snmp"))
-			SET_UI64_RESULT(result, item->host.snmp_available);
-		else if (0 == strcmp(tmp, "ipmi"))
-			SET_UI64_RESULT(result, item->host.ipmi_available);
-		else if (0 == strcmp(tmp, "jmx"))
-			SET_UI64_RESULT(result, item->host.jmx_available);
+			result->ui64 = 2 - result->ui64;
+		}
+		else if (0 == strcmp(tmp, "maintenance"))	/* zabbix["host",,"maintenance"] */
+		{
+			/* this item always processed by server */
+
+			get_param(params, 2, tmp, sizeof(tmp));
+
+			if ('\0' != *tmp)
+			{
+				error = zbx_strdup(error, "Invalid second parameter.");
+				goto notsupported;
+			}
+
+			if (HOST_MAINTENANCE_STATUS_ON == item->host.maintenance_status)
+				SET_UI64_RESULT(result, item->host.maintenance_type + 1);
+			else
+				SET_UI64_RESULT(result, 0);
+		}
 		else
+		{
+			error = zbx_strdup(error, "Invalid third parameter.");
 			goto notsupported;
+		}
 
-		result->ui64 = 2 - result->ui64;
 	}
 	else if (0 == strcmp(tmp, "proxy"))			/* zabbix["proxy",<hostname>,"lastaccess"] */
 	{
 		int	lastaccess;
 
-		if (0 == (daemon_type & ZBX_DAEMON_TYPE_SERVER))
-			goto notsupported;
+		/* this item always processed by server */
 
 		if (3 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
-		if (0 != get_param(params, 2, tmp1, sizeof(tmp1)))
-			goto notsupported;
+		get_param(params, 3, tmp, sizeof(tmp));
 
-		if (0 != get_param(params, 3, tmp, sizeof(tmp)) || 0 != strcmp(tmp, "lastaccess"))
+		if (0 != strcmp(tmp, "lastaccess"))
+		{
+			error = zbx_strdup(error, "Invalid third parameter.");
 			goto notsupported;
+		}
+
+		get_param(params, 2, tmp1, sizeof(tmp1));
 
 		if (FAIL == DBget_proxy_lastaccess(tmp1, &lastaccess, &error))
 			goto notsupported;
@@ -243,17 +307,13 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 		int		process_forks;
 		double		value;
 
-		if (4 < nparams)
+		if (2 > nparams || nparams > 4)
 		{
-			error = zbx_strdup(error, "Invalid number of parameters");
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
 		}
 
-		if (0 != get_param(params, 2, tmp, sizeof(tmp)))
-		{
-			error = zbx_strdup(error, "Required second parameter missing");
-			goto notsupported;
-		}
+		get_param(params, 2, tmp, sizeof(tmp));
 
 		for (process_type = 0; process_type < ZBX_PROCESS_TYPE_COUNT; process_type++)
 			if (0 == strcmp(tmp, get_process_type_string(process_type)))
@@ -278,7 +338,7 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 
 		if (ZBX_PROCESS_TYPE_COUNT == process_type)
 		{
-			error = zbx_strdup(error, "Invalid second parameter");
+			error = zbx_strdup(error, "Invalid second parameter.");
 			goto notsupported;
 		}
 
@@ -289,9 +349,9 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 
 		if (0 == strcmp(tmp, "count"))
 		{
-			if (3 < nparams)
+			if (4 == nparams)
 			{
-				error = zbx_strdup(error, "Invalid number of parameters");
+				error = zbx_strdup(error, "Invalid number of parameters.");
 				goto notsupported;
 			}
 
@@ -312,19 +372,19 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 				aggr_func = ZBX_AGGR_FUNC_ONE;
 			else
 			{
-				error = zbx_strdup(error, "Invalid third parameter");
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
 			}
 
 			if (0 == process_forks)
 			{
-				error = zbx_dsprintf(error, "No \"%s\" processes started",
+				error = zbx_dsprintf(error, "No \"%s\" processes started.",
 						get_process_type_string(process_type));
 				goto notsupported;
 			}
 			else if (process_num > process_forks)
 			{
-				error = zbx_dsprintf(error, "\"%s\" #%d is not started",
+				error = zbx_dsprintf(error, "\"%s\" #%d is not started.",
 						get_process_type_string(process_type), process_num);
 				goto notsupported;
 			}
@@ -338,7 +398,7 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 				state = ZBX_PROCESS_STATE_IDLE;
 			else
 			{
-				error = zbx_strdup(error, "Invalid fourth parameter");
+				error = zbx_strdup(error, "Invalid fourth parameter.");
 				goto notsupported;
 			}
 
@@ -349,11 +409,13 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 	}
 	else if (0 == strcmp(tmp, "wcache"))			/* zabbix[wcache,<cache>,<mode>] */
 	{
-		if (3 < nparams)
+		if (2 > nparams || nparams > 3)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
-		if (0 != get_param(params, 2, tmp, sizeof(tmp)))
-			goto notsupported;
+		get_param(params, 2, tmp, sizeof(tmp));
 
 		if (0 != get_param(params, 3, tmp1, sizeof(tmp1)))
 			*tmp1 = '\0';
@@ -375,7 +437,10 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			else if (0 == strcmp(tmp1, "not supported"))
 				SET_UI64_RESULT(result, *(zbx_uint64_t *)DCget_stats(ZBX_STATS_NOTSUPPORTED_COUNTER));
 			else
+			{
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
+			}
 		}
 		else if (0 == strcmp(tmp, "history"))
 		{
@@ -388,12 +453,18 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			else if (0 == strcmp(tmp1, "free"))
 				SET_UI64_RESULT(result, *(zbx_uint64_t *)DCget_stats(ZBX_STATS_HISTORY_FREE));
 			else
+			{
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
+			}
 		}
 		else if (0 == strcmp(tmp, "trend"))
 		{
 			if (0 == (daemon_type & ZBX_DAEMON_TYPE_SERVER))
+			{
+				error = zbx_strdup(error, "Invalid second parameter.");
 				goto notsupported;
+			}
 
 			if ('\0' == *tmp1 || 0 == strcmp(tmp1, "pfree"))
 				SET_DBL_RESULT(result, *(double *)DCget_stats(ZBX_STATS_TREND_PFREE));
@@ -404,7 +475,10 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			else if (0 == strcmp(tmp1, "free"))
 				SET_UI64_RESULT(result, *(zbx_uint64_t *)DCget_stats(ZBX_STATS_TREND_FREE));
 			else
+			{
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
+			}
 		}
 		else if (0 == strcmp(tmp, "text"))
 		{
@@ -417,18 +491,26 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			else if (0 == strcmp(tmp1, "free"))
 				SET_UI64_RESULT(result, *(zbx_uint64_t *)DCget_stats(ZBX_STATS_TEXT_FREE));
 			else
+			{
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
+			}
 		}
 		else
+		{
+			error = zbx_strdup(error, "Invalid second parameter.");
 			goto notsupported;
+		}
 	}
 	else if (0 == strcmp(tmp, "rcache"))			/* zabbix[rcache,<cache>,<mode>] */
 	{
-		if (3 < nparams)
+		if (2 > nparams || nparams > 3)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
-		if (0 != get_param(params, 2, tmp, sizeof(tmp)))
-			goto notsupported;
+		get_param(params, 2, tmp, sizeof(tmp));
 
 		if (0 != get_param(params, 3, tmp1, sizeof(tmp1)))
 			*tmp1 = '\0';
@@ -444,10 +526,16 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			else if (0 == strcmp(tmp1, "free"))
 				SET_UI64_RESULT(result, *(zbx_uint64_t *)DCconfig_get_stats(ZBX_CONFSTATS_BUFFER_FREE));
 			else
+			{
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
+			}
 		}
 		else
+		{
+			error = zbx_strdup(error, "Invalid second parameter.");
 			goto notsupported;
+		}
 	}
 	else if (0 == strcmp(tmp, "vcache"))
 	{
@@ -458,15 +546,17 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 
 		if (FAIL == zbx_vc_get_statistics(&stats))
 		{
-			error = zbx_strdup(error, "Value cache is disabled");
+			error = zbx_strdup(error, "Value cache is disabled.");
 			goto notsupported;
 		}
 
-		if (3 < nparams)
+		if (2 > nparams || nparams > 3)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
-		if (0 != get_param(params, 2, tmp, sizeof(tmp)))
-			goto notsupported;
+		get_param(params, 2, tmp, sizeof(tmp));
 
 		if (0 != get_param(params, 3, tmp1, sizeof(tmp1)))
 			*tmp1 = '\0';
@@ -485,7 +575,10 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 				SET_DBL_RESULT(result, (double)(stats.total_size - stats.free_size) /
 						stats.total_size * 100);
 			else
+			{
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
+			}
 		}
 		else if (0 == strcmp(tmp, "cache"))
 		{
@@ -496,10 +589,16 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			else if (0 == strcmp(tmp1, "misses"))
 				SET_UI64_RESULT(result, stats.misses);
 			else
+			{
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
+			}
 		}
 		else
+		{
+			error = zbx_strdup(error, "Invalid second parameter.");
 			goto notsupported;
+		}
 	}
 	else if (0 == strcmp(tmp, "proxy_history"))
 	{
@@ -507,7 +606,10 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 			goto notsupported;
 
 		if (1 != nparams)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
 		SET_UI64_RESULT(result, proxy_get_history_count());
 	}
@@ -517,16 +619,18 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 
 		if (FAIL == zbx_vmware_get_statistics(&stats))
 		{
-			error = zbx_dsprintf(error, "No \"%s\" processes started",
+			error = zbx_dsprintf(error, "No \"%s\" processes started.",
 					get_process_type_string(ZBX_PROCESS_TYPE_VMWARE));
 			goto notsupported;
 		}
 
-		if (3 < nparams)
+		if (2 > nparams || nparams > 3)
+		{
+			error = zbx_strdup(error, "Invalid number of parameters.");
 			goto notsupported;
+		}
 
-		if (0 != get_param(params, 2, tmp, sizeof(tmp)))
-			goto notsupported;
+		get_param(params, 2, tmp, sizeof(tmp));
 
 		if (0 != get_param(params, 3, tmp1, sizeof(tmp1)))
 			*tmp1 = '\0';
@@ -555,20 +659,29 @@ int	get_value_internal(DC_ITEM *item, AGENT_RESULT *result)
 				SET_DBL_RESULT(result, (double)stats.memory_used / stats.memory_total * 100);
 			}
 			else
+			{
+				error = zbx_strdup(error, "Invalid third parameter.");
 				goto notsupported;
+			}
 		}
 		else
+		{
+			error = zbx_strdup(error, "Invalid second parameter.");
 			goto notsupported;
+		}
 	}
 	else
+	{
+		error = zbx_strdup(error, "Invalid first parameter.");
 		goto notsupported;
+	}
 
 	return SUCCEED;
 notsupported:
 	if (!ISSET_MSG(result))
 	{
 		if (NULL == error)
-			error = zbx_strdup(error, "Internal check is not supported");
+			error = zbx_strdup(error, "Internal check is not supported.");
 
 		SET_MSG_RESULT(result, error);
 	}
diff --git a/src/zabbix_server/poller/checks_ipmi.c b/src/zabbix_server/poller/checks_ipmi.c
index ac66e2d0031..d3073797411 100644
--- a/src/zabbix_server/poller/checks_ipmi.c
+++ b/src/zabbix_server/poller/checks_ipmi.c
@@ -447,7 +447,13 @@ static void	got_thresh_reading(ipmi_sensor_t *sensor, int err, enum ipmi_value_p
 
 		h->err = zbx_dsprintf(h->err, "error 0x%x while reading threshold sensor", err);
 		h->ret = NETWORK_ERROR;
-		h->done = 1;
+		goto out;
+	}
+
+	if (0 == ipmi_is_sensor_scanning_enabled(states) || 0 != ipmi_is_initial_update_in_progress(states))
+	{
+		h->err = zbx_strdup(h->err, "sensor data is not available");
+		h->ret = NOTSUPPORTED;
 		goto out;
 	}
 
@@ -456,9 +462,8 @@ static void	got_thresh_reading(ipmi_sensor_t *sensor, int err, enum ipmi_value_p
 	if (NULL == s)
 	{
 		THIS_SHOULD_NEVER_HAPPEN;
-		h->err = zbx_dsprintf(h->err, "fatal error");
+		h->err = zbx_strdup(h->err, "fatal error");
 		h->ret = NOTSUPPORTED;
-		h->done = 1;
 		goto out;
 	}
 
@@ -466,7 +471,7 @@ static void	got_thresh_reading(ipmi_sensor_t *sensor, int err, enum ipmi_value_p
 	{
 		case IPMI_NO_VALUES_PRESENT:
 		case IPMI_RAW_VALUE_PRESENT:
-			h->err = zbx_dsprintf(h->err, "no value present for threshold sensor");
+			h->err = zbx_strdup(h->err, "no value present for threshold sensor");
 			h->ret = NOTSUPPORTED;
 			break;
 		case IPMI_BOTH_VALUES_PRESENT:
@@ -502,8 +507,9 @@ static void	got_thresh_reading(ipmi_sensor_t *sensor, int err, enum ipmi_value_p
 					mod_use, modifier, rate);
 			break;
 	}
-	h->done = 1;
 out:
+	h->done = 1;
+
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(h->ret));
 }
 
@@ -512,7 +518,6 @@ static void	got_discrete_states(ipmi_sensor_t *sensor, int err, ipmi_states_t *s
 {
 	const char		*__function_name = "got_discrete_states";
 	char			id_str[2 * IPMI_SENSOR_ID_SZ + 1];
-
 	int			id, i, val, ret, is_state_set;
 	ipmi_entity_t		*ent;
 	zbx_ipmi_host_t		*h = cb_data;
@@ -520,6 +525,13 @@ static void	got_discrete_states(ipmi_sensor_t *sensor, int err, ipmi_states_t *s
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
+	if (0 == ipmi_is_sensor_scanning_enabled(states) || 0 != ipmi_is_initial_update_in_progress(states))
+	{
+		h->err = zbx_strdup(h->err, "sensor data is not available");
+		h->ret = NOTSUPPORTED;
+		goto out;
+	}
+
 	s = get_ipmi_sensor(h, sensor);
 
 	if (NULL == s)
@@ -572,7 +584,6 @@ static void	read_ipmi_sensor(zbx_ipmi_host_t *h, zbx_ipmi_sensor_t *s)
 {
 	const char	*__function_name = "read_ipmi_sensor";
 	char		id_str[2 * IPMI_SENSOR_ID_SZ + 1];
-
 	int		ret;
 	const char	*s_reading_type_string;
 	struct timeval	tv;
@@ -681,7 +692,7 @@ static void	got_control_reading(ipmi_control_t *control, int err, int *val, void
 	if (NULL == c)
 	{
 		THIS_SHOULD_NEVER_HAPPEN;
-		h->err = zbx_dsprintf(h->err, "fatal error");
+		h->err = zbx_strdup(h->err, "fatal error");
 		h->ret = NOTSUPPORTED;
 		goto out;
 	}
@@ -689,7 +700,7 @@ static void	got_control_reading(ipmi_control_t *control, int err, int *val, void
 	if (c->num_values == 0)
 	{
 		THIS_SHOULD_NEVER_HAPPEN;
-		h->err = zbx_dsprintf(h->err, "no value present for control");
+		h->err = zbx_strdup(h->err, "no value present for control");
 		h->ret = NOTSUPPORTED;
 		goto out;
 	}
@@ -735,7 +746,7 @@ static void	got_control_setting(ipmi_control_t *control, int err, void *cb_data)
 	if (NULL == c)
 	{
 		THIS_SHOULD_NEVER_HAPPEN;
-		h->err = zbx_dsprintf(h->err, "fatal error");
+		h->err = zbx_strdup(h->err, "fatal error");
 		h->ret = NOTSUPPORTED;
 		h->done = 1;
 		return;
@@ -758,7 +769,7 @@ static void	read_ipmi_control(zbx_ipmi_host_t *h, zbx_ipmi_control_t *c)
 
 	if (0 == ipmi_control_is_readable(c->control))
 	{
-		h->err = zbx_dsprintf(h->err, "control is not readable");
+		h->err = zbx_strdup(h->err, "control is not readable");
 		h->ret = NOTSUPPORTED;
 		goto out;
 	}
@@ -795,7 +806,7 @@ static void	set_ipmi_control(zbx_ipmi_host_t *h, zbx_ipmi_control_t *c, int valu
 	if (c->num_values == 0)
 	{
 		THIS_SHOULD_NEVER_HAPPEN;
-		h->err = zbx_dsprintf(h->err, "no value present for control");
+		h->err = zbx_strdup(h->err, "no value present for control");
 		h->ret = NOTSUPPORTED;
 		h->done = 1;
 		goto out;
@@ -803,7 +814,7 @@ static void	set_ipmi_control(zbx_ipmi_host_t *h, zbx_ipmi_control_t *c, int valu
 
 	if (0 == ipmi_control_is_settable(c->control))
 	{
-		h->err = zbx_dsprintf(h->err, "control is not settable");
+		h->err = zbx_strdup(h->err, "control is not settable");
 		h->ret = NOTSUPPORTED;
 		goto out;
 	}
@@ -1235,10 +1246,13 @@ int	parse_ipmi_command(const char *command, char *c_name, int *val, char *error,
 		*val = 1;
 	else if (0 == strcasecmp(p, "off"))
 		*val = 0;
-	else if (SUCCEED == is_uint31(p, (uint32_t*)val))
-		ret = SUCCEED;
-	else
+	else if (SUCCEED != is_uint31(p, (uint32_t *)val))
+	{
 		zbx_snprintf(error, max_error_len, "IPMI command value is not supported [%s]", p);
+		goto fail;
+	}
+
+	ret = SUCCEED;
 fail:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
diff --git a/src/zabbix_server/poller/checks_java.c b/src/zabbix_server/poller/checks_java.c
index dde3dac312c..91fdc3173e8 100644
--- a/src/zabbix_server/poller/checks_java.c
+++ b/src/zabbix_server/poller/checks_java.c
@@ -134,7 +134,6 @@ void	get_values_java(unsigned char request, const DC_ITEM *items, AGENT_RESULT *
 	zbx_sock_t	s;
 	struct zbx_json	json;
 	char		error[MAX_STRING_LEN];
-	char		*buffer = NULL;
 	int		i, j, err = SUCCEED;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() host:'%s' addr:'%s' num:%d",
@@ -209,11 +208,11 @@ void	get_values_java(unsigned char request, const DC_ITEM *items, AGENT_RESULT *
 
 		if (SUCCEED == (err = zbx_tcp_send(&s, json.buffer)))
 		{
-			if (SUCCEED == (err = zbx_tcp_recv(&s, &buffer)))
+			if (SUCCEED == (err = zbx_tcp_recv(&s)))
 			{
-				zabbix_log(LOG_LEVEL_DEBUG, "JSON back [%s]", buffer);
+				zabbix_log(LOG_LEVEL_DEBUG, "JSON back [%s]", s.buffer);
 
-				err = parse_response(items, results, errcodes, num, buffer, error, sizeof(error));
+				err = parse_response(items, results, errcodes, num, s.buffer, error, sizeof(error));
 			}
 		}
 
diff --git a/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c
index d184aee8dc2..daa8e46836a 100644
--- a/src/zabbix_server/poller/checks_simple.c
+++ b/src/zabbix_server/poller/checks_simple.c
@@ -26,7 +26,6 @@ typedef int	(*vmfunc_t)(AGENT_REQUEST *, const char *, const char *, AGENT_RESUL
 
 #define ZBX_VMWARE_PREFIX	"vmware."
 
-
 typedef struct
 {
 	const char	*key;
@@ -35,9 +34,9 @@ typedef struct
 zbx_vmcheck_t;
 
 #if defined(HAVE_LIBXML2) && defined(HAVE_LIBCURL)
-# define VMCHECK_FUNC(func)	func
+#	define VMCHECK_FUNC(func)	func
 #else
-# define VMCHECK_FUNC(func)	NULL
+#	define VMCHECK_FUNC(func)	NULL
 #endif
 
 static zbx_vmcheck_t	vmchecks[] =
@@ -169,7 +168,7 @@ int	get_value_simple(DC_ITEM *item, AGENT_RESULT *result)
 				ret = SUCCEED;
 		}
 		else
-			SET_MSG_RESULT(result, zbx_strdup(NULL, "Support for VMware checks was not compiled in"));
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Support for VMware checks was not compiled in."));
 	}
 	else
 	{
@@ -179,7 +178,7 @@ int	get_value_simple(DC_ITEM *item, AGENT_RESULT *result)
 	}
 
 	if (NOTSUPPORTED == ret && !ISSET_MSG(result))
-		SET_MSG_RESULT(result, zbx_strdup(NULL, "Simple check is not supported"));
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Simple check is not supported."));
 
 	free_request(&request);
 
diff --git a/src/zabbix_server/poller/checks_simple_vmware.c b/src/zabbix_server/poller/checks_simple_vmware.c
index de5714c1948..2297ae3b7d2 100644
--- a/src/zabbix_server/poller/checks_simple_vmware.c
+++ b/src/zabbix_server/poller/checks_simple_vmware.c
@@ -166,7 +166,7 @@ static zbx_vmware_cluster_t	*cluster_get_by_name(zbx_vector_ptr_t *clusters, con
 
 	for (i = 0; i < clusters->values_num; i++)
 	{
-		zbx_vmware_cluster_t	*cluster = (zbx_vmware_cluster_t *)clusters->values[i];
+		cluster = (zbx_vmware_cluster_t *)clusters->values[i];
 
 		if (0 == strcmp(cluster->name, name))
 			goto out;
@@ -352,7 +352,7 @@ out:
  *             ret       - [OUT] the operation result code                    *
  *                                                                            *
  * Return value: The vmware service object or NULL if the service was not     *
- *               found, did not have data or any error occured. In the last   *
+ *               found, did not have data or any error occurred. In the last  *
  *               case the error message will be stored in agent result.       *
  *                                                                            *
  * Comments: There are three possible cases:                                  *
@@ -390,8 +390,8 @@ static zbx_vmware_service_t	*get_vmware_service(const char *url, const char *use
 		SET_MSG_RESULT(result, zbx_strdup(NULL, NULL != service->data->error ? service->data->error :
 				"Unknown VMware service error"));
 
-		zabbix_log(LOG_LEVEL_DEBUG, "failed to query VMware service at %s: %s",
-				(NULL == service->data->error ? "unknown error" : service->data->error));
+		zabbix_log(LOG_LEVEL_DEBUG, "failed to query VMware service: %s",
+				NULL != service->data->error ? service->data->error : "unknown error");
 
 		*ret = SYSINFO_RET_FAIL;
 		service = NULL;
@@ -691,7 +691,7 @@ int	check_vcenter_cluster_status(AGENT_REQUEST *request, const char *username, c
 	else if (0 == strcmp(status, "red"))
 		SET_UI64_RESULT(result, 3);
 	else
-		ret =  SYSINFO_RET_FAIL;
+		ret = SYSINFO_RET_FAIL;
 
 	zbx_free(status);
 unlock:
@@ -928,7 +928,7 @@ int	check_vcenter_hv_discovery(AGENT_REQUEST *request, const char *username, con
 		zbx_json_addstring(&json_data, "{#HV.ID}", hv->id, ZBX_JSON_TYPE_STRING);
 		zbx_json_addstring(&json_data, "{#HV.NAME}", name, ZBX_JSON_TYPE_STRING);
 		zbx_json_addstring(&json_data, "{#CLUSTER.NAME}",
-				(NULL != cluster ? cluster->name : ""), ZBX_JSON_TYPE_STRING);
+				NULL != cluster ? cluster->name : "", ZBX_JSON_TYPE_STRING);
 		zbx_json_close(&json_data);
 
 		zbx_free(name);
@@ -1661,7 +1661,7 @@ int	check_vcenter_vm_discovery(AGENT_REQUEST *request, const char *username, con
 			zbx_json_addstring(&json_data, "{#VM.NAME}", vm_name, ZBX_JSON_TYPE_STRING);
 			zbx_json_addstring(&json_data, "{#HV.NAME}", hv_name, ZBX_JSON_TYPE_STRING);
 			zbx_json_addstring(&json_data, "{#CLUSTER.NAME}",
-					(NULL != cluster ? cluster->name : ""), ZBX_JSON_TYPE_STRING);
+					NULL != cluster ? cluster->name : "", ZBX_JSON_TYPE_STRING);
 			zbx_json_close(&json_data);
 
 			zbx_free(hv_name);
@@ -1965,6 +1965,9 @@ int	check_vcenter_vm_net_if_discovery(AGENT_REQUEST *request, const char *userna
 
 		zbx_json_addobject(&json_data, NULL);
 		zbx_json_addstring(&json_data, "{#IFNAME}", dev->instance, ZBX_JSON_TYPE_STRING);
+		if (NULL != dev->label)
+			zbx_json_addstring(&json_data, "{#IFDESC}", dev->label, ZBX_JSON_TYPE_STRING);
+
 		zbx_json_close(&json_data);
 	}
 
@@ -2229,6 +2232,8 @@ int	check_vcenter_vm_vfs_dev_discovery(AGENT_REQUEST *request, const char *usern
 
 		zbx_json_addobject(&json_data, NULL);
 		zbx_json_addstring(&json_data, "{#DISKNAME}", dev->instance, ZBX_JSON_TYPE_STRING);
+		if (NULL != dev->label)
+			zbx_json_addstring(&json_data, "{#DISKDESC}", dev->label, ZBX_JSON_TYPE_STRING);
 		zbx_json_close(&json_data);
 	}
 
@@ -2521,7 +2526,7 @@ int	check_vcenter_vm_vfs_fs_size(AGENT_REQUEST *request, const char *username, c
 	else if (0 == strcmp(mode, "used"))
 		SET_UI64_RESULT(result, value_total - value_free);
 	else if (0 == strcmp(mode, "pfree"))
-		SET_DBL_RESULT(result, (0 != value_total ? (double)(100.0 * value_free) / value_total : 0));
+		SET_DBL_RESULT(result, 0 != value_total ? (double)(100.0 * value_free) / value_total : 0);
 	else if (0 == strcmp(mode, "pused"))
 		SET_DBL_RESULT(result, 100.0 - (0 != value_total ? (double)(100.0 * value_free) / value_total : 0));
 	else
diff --git a/src/zabbix_server/poller/checks_snmp.c b/src/zabbix_server/poller/checks_snmp.c
index eadf0a080cb..5b406e80065 100644
--- a/src/zabbix_server/poller/checks_snmp.c
+++ b/src/zabbix_server/poller/checks_snmp.c
@@ -479,7 +479,7 @@ static struct snmp_session	*zbx_snmp_open_session(const DC_ITEM *item, char *err
 	{
 		SOCK_CLEANUP;
 
-		zbx_strlcpy(error, "Cannot open snmp session", max_error_len);
+		zbx_strlcpy(error, "Cannot open SNMP session", max_error_len);
 	}
 end:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
@@ -597,11 +597,15 @@ static int	zbx_snmp_set_result(const struct variable_list *var, unsigned char va
 	else if (ASN_INTEGER == var->type)
 #endif
 	{
-		/* negative integer values are converted to double */
-		if (0 > *var->val.integer)
-			SET_DBL_RESULT(result, (double)*var->val.integer);
+		if (ITEM_VALUE_TYPE_UINT64 == value_type && 0 > *var->val.integer)
+		{
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Received value [%d]"
+					" is not suitable for value type [%s].",
+					*var->val.integer, zbx_item_value_type_string(value_type)));
+			ret = NOTSUPPORTED;
+		}
 		else
-			SET_UI64_RESULT(result, (zbx_uint64_t)*var->val.integer);
+			SET_DBL_RESULT(result, *var->val.integer);
 	}
 #ifdef OPAQUE_SPECIAL_TYPES
 	else if (ASN_FLOAT == var->type)
@@ -632,17 +636,135 @@ static int	zbx_snmp_set_result(const struct variable_list *var, unsigned char va
 	return ret;
 }
 
+#define ZBX_OID_INDEX_STRING	0
+#define ZBX_OID_INDEX_NUMERIC	1
+
+static int	zbx_snmp_print_oid(char *buffer, size_t buffer_len, const oid *objid, size_t objid_len, int format)
+{
+	if (SNMPERR_SUCCESS != netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_BREAKDOWN_OIDS,
+			format))
+	{
+		zabbix_log(LOG_LEVEL_WARNING, "cannot set \"dontBreakdownOids\" option to %d for Net-SNMP", format);
+		return -1;
+	}
+
+	return snprint_objid(buffer, buffer_len, objid, objid_len);
+}
+
+static int	zbx_snmp_choose_index(char *buffer, size_t buffer_len, const oid *objid, size_t objid_len,
+		size_t root_string_len, size_t root_numeric_len)
+{
+	const char	*__function_name = "zbx_snmp_choose_index";
+
+	oid	parsed_oid[MAX_OID_LEN];
+	size_t	parsed_oid_len = MAX_OID_LEN;
+	char	printed_oid[MAX_STRING_LEN];
+
+	/**************************************************************************************************************/
+	/*                                                                                                            */
+	/* When we are providing a value for {#SNMPINDEX}, we would like to provide a pretty value. This is only a    */
+	/* concern for OIDs with string indices. For instance, suppose we are walking the following OID:              */
+	/*                                                                                                            */
+	/*   SNMP-VIEW-BASED-ACM-MIB::vacmGroupName                                                                   */
+	/*                                                                                                            */
+	/* Suppose also that we are currently looking at this OID:                                                    */
+	/*                                                                                                            */
+	/*   SNMP-VIEW-BASED-ACM-MIB::vacmGroupName.3."authOnlyUser"                                                  */
+	/*                                                                                                            */
+	/* Then, we would like to provide {#SNMPINDEX} with this value:                                               */
+	/*                                                                                                            */
+	/*   3."authOnlyUser"                                                                                         */
+	/*                                                                                                            */
+	/* An alternative approach would be to provide {#SNMPINDEX} with numeric value. While it is equivalent to the */
+	/* string representation above, the string representation is more readable and thus more useful to users:     */
+	/*                                                                                                            */
+	/*   3.12.97.117.116.104.79.110.108.121.85.115.101.114                                                        */
+	/*                                                                                                            */
+	/* Here, 12 is the length of "authOnlyUser" and the rest is the string encoding using ASCII characters.       */
+	/*                                                                                                            */
+	/* There are two problems with always providing {#SNMPINDEX} that has an index representation as a string.    */
+	/*                                                                                                            */
+	/* The first problem is indices of type InetAddress. The Net-SNMP library has code for pretty-printing IP     */
+	/* addresses, but no way to parse them back. As an example, consider the following OID:                       */
+	/*                                                                                                            */
+	/*   .1.3.6.1.2.1.4.34.1.4.1.4.192.168.3.255                                                                  */
+	/*                                                                                                            */
+	/* Its pretty representation is like this:                                                                    */
+	/*                                                                                                            */
+	/*   IP-MIB::ipAddressType.ipv4."192.168.3.255"                                                               */
+	/*                                                                                                            */
+	/* However, when trying to parse it, it turns into this OID:                                                  */
+	/*                                                                                                            */
+	/*   .1.3.6.1.2.1.4.34.1.4.1.13.49.57.50.46.49.54.56.46.51.46.50.53.53                                        */
+	/*                                                                                                            */
+	/* Apparently, this is different than the original.                                                           */
+	/*                                                                                                            */
+	/* The second problem is indices of type OCTET STRING, which might contain unprintable characters:            */
+	/*                                                                                                            */
+	/*   1.3.6.1.2.1.17.4.3.1.1.0.0.240.122.113.21                                                                */
+	/*                                                                                                            */
+	/* Its pretty representation is like this (note the single quotes which stand for a fixed-length string):     */
+	/*                                                                                                            */
+	/*   BRIDGE-MIB::dot1dTpFdbAddress.'...zq.'                                                                   */
+	/*                                                                                                            */
+	/* Here, '...zq.' stands for 0.0.240.122.113.21, where only 'z' (122) and 'q' (113) are printable.            */
+	/*                                                                                                            */
+	/* Apparently, this cannot be turned back into the numeric representation.                                    */
+	/*                                                                                                            */
+	/* So what we try to do is first print it pretty. If there is no string-looking index, return it as output.   */
+	/* If there is such an index, we check that it can be parsed and that the result is the same as the original. */
+	/*                                                                                                            */
+	/**************************************************************************************************************/
+
+	if (-1 == zbx_snmp_print_oid(printed_oid, sizeof(printed_oid), objid, objid_len, ZBX_OID_INDEX_STRING))
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "%s(): cannot print OID with string indices", __function_name);
+		goto numeric;
+	}
+
+	if (NULL == strchr(printed_oid, '"') && NULL == strchr(printed_oid, '\''))
+	{
+		zbx_strlcpy(buffer, printed_oid + root_string_len + 1, buffer_len);
+		return SUCCEED;
+	}
+
+	if (NULL == snmp_parse_oid(printed_oid, parsed_oid, &parsed_oid_len))
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "%s(): cannot parse OID '%s'", __function_name, printed_oid);
+		goto numeric;
+	}
+
+	if (parsed_oid_len == objid_len && 0 == memcmp(parsed_oid, objid, parsed_oid_len * sizeof(oid)))
+	{
+		zbx_strlcpy(buffer, printed_oid + root_string_len + 1, buffer_len);
+		return SUCCEED;
+	}
+numeric:
+	if (-1 == zbx_snmp_print_oid(printed_oid, sizeof(printed_oid), objid, objid_len, ZBX_OID_INDEX_NUMERIC))
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "%s(): cannot print OID with numeric indices", __function_name);
+		return FAIL;
+	}
+
+	zbx_strlcpy(buffer, printed_oid + root_numeric_len + 1, buffer_len);
+	return SUCCEED;
+}
+
 /******************************************************************************
  *                                                                            *
  * Function: zbx_snmp_walk                                                    *
  *                                                                            *
  * Purpose: retrieve information by walking an OID tree                       *
  *                                                                            *
- * Parameters: ss    - [IN] SNMP session handle                               *
- *             item  - [IN] configuration of Zabbix item                      *
- *             OID   - [IN] OID of table with values of interest              *
- *             mode  - [IN] mode to operate in                                *
- *             value - [OUT] result structure                                 *
+ * Parameters: ss          - [IN] SNMP session handle                         *
+ *             item        - [IN] configuration of Zabbix item                *
+ *             OID         - [IN] OID of table with values of interest        *
+ *             mode        - [IN] mode to operate in                          *
+ *             result      - [OUT] result structure                           *
+ *             max_succeed - [OUT] value of "max_repetitions" that succeeded  *
+ *             min_fail    - [OUT] value of "max_repetitions" that failed     *
+ *             max_vars    - [IN] suggested value of "max_repetitions"        *
+ *             bulk        - [IN] whether GetBulkRequest-PDU should be used   *
  *                                                                            *
  * Return value: NOTSUPPORTED - OID does not exist, any other critical error  *
  *               NETWORK_ERROR - recoverable network error                    *
@@ -667,22 +789,24 @@ static int	zbx_snmp_set_result(const struct variable_list *var, unsigned char va
 #define ZBX_SNMP_WALK_MODE_DISCOVERY	1
 
 static int	zbx_snmp_walk(struct snmp_session *ss, const DC_ITEM *item, const char *OID, unsigned char mode,
-		AGENT_RESULT *result, int *max_succeed, int *min_fail, int max_vars)
+		AGENT_RESULT *result, int *max_succeed, int *min_fail, int max_vars, int bulk)
 {
 	const char		*__function_name = "zbx_snmp_walk";
 
 	struct snmp_pdu		*pdu, *response;
 	oid			anOID[MAX_OID_LEN], rootOID[MAX_OID_LEN];
-	size_t			anOID_len = MAX_OID_LEN, rootOID_len = MAX_OID_LEN, OID_len;
+	size_t			anOID_len = MAX_OID_LEN, rootOID_len = MAX_OID_LEN, root_string_len, root_numeric_len;
 	char			snmp_oid[MAX_STRING_LEN], error[MAX_STRING_LEN];
 	struct variable_list	*var;
-	int			bulk, status, level, running, num_vars, ret = SUCCEED;
+	int			status, level, running, num_vars, ret = SUCCEED;
 	struct zbx_json		j;
 	AGENT_RESULT		snmp_result;
 
-	bulk = (ITEM_TYPE_SNMPv1 == item->type ? 0 : 1);	/* GetBulkRequest-PDU available since SNMPv2 */
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() type:%d oid:'%s' mode:%d bulk:%d", __function_name, (int)item->type, OID,
+			(int)mode, bulk);
 
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() oid:'%s' bulk:%d mode:%d", __function_name, OID, bulk, (int)mode);
+	if (ITEM_TYPE_SNMPv1 == item->type)	/* GetBulkRequest-PDU available since SNMPv2 */
+		bulk = SNMP_BULK_DISABLED;
 
 	/* create OID from string */
 	if (NULL == snmp_parse_oid(OID, rootOID, &rootOID_len))
@@ -692,14 +816,25 @@ static int	zbx_snmp_walk(struct snmp_session *ss, const DC_ITEM *item, const cha
 		goto out;
 	}
 
-	if (-1 == snprint_objid(snmp_oid, sizeof(snmp_oid), rootOID, rootOID_len))
+	if (-1 == zbx_snmp_print_oid(snmp_oid, sizeof(snmp_oid), rootOID, rootOID_len, ZBX_OID_INDEX_STRING))
+	{
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "zbx_snmp_print_oid():"
+				" cannot print OID \"%s\" with string indices.", OID));
+		ret = CONFIG_ERROR;
+		goto out;
+	}
+
+	root_string_len = strlen(snmp_oid);
+
+	if (-1 == zbx_snmp_print_oid(snmp_oid, sizeof(snmp_oid), rootOID, rootOID_len, ZBX_OID_INDEX_NUMERIC))
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "snprint_objid(): buffer is not large enough: \"%s\".", OID));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "zbx_snmp_print_oid():"
+				" cannot print OID \"%s\" with numeric indices.", OID));
 		ret = CONFIG_ERROR;
 		goto out;
 	}
 
-	OID_len = strlen(snmp_oid);
+	root_numeric_len = strlen(snmp_oid);
 
 	/* copy rootOID to anOID */
 	memcpy(anOID, rootOID, rootOID_len * sizeof(oid));
@@ -721,7 +856,8 @@ static int	zbx_snmp_walk(struct snmp_session *ss, const DC_ITEM *item, const cha
 
 	while (1 == running)
 	{
-		if (NULL == (pdu = snmp_pdu_create(0 == bulk ? SNMP_MSG_GETNEXT : SNMP_MSG_GETBULK)))	/* create PDU */
+		/* create PDU */
+		if (NULL == (pdu = snmp_pdu_create(SNMP_BULK_ENABLED == bulk ? SNMP_MSG_GETBULK : SNMP_MSG_GETNEXT)))
 		{
 			SET_MSG_RESULT(result, zbx_strdup(NULL, "snmp_pdu_create(): cannot create PDU object."));
 			ret = CONFIG_ERROR;
@@ -736,7 +872,7 @@ static int	zbx_snmp_walk(struct snmp_session *ss, const DC_ITEM *item, const cha
 			break;
 		}
 
-		if (1 == bulk)
+		if (SNMP_BULK_ENABLED == bulk)
 		{
 			pdu->non_repeaters = 0;
 			pdu->max_repetitions = max_vars;
@@ -801,11 +937,12 @@ static int	zbx_snmp_walk(struct snmp_session *ss, const DC_ITEM *item, const cha
 					break;
 				}
 
-				if (-1 == snprint_objid(snmp_oid, sizeof(snmp_oid), var->name, var->name_length))
+				if (SUCCEED != zbx_snmp_choose_index(snmp_oid, sizeof(snmp_oid), var->name,
+						var->name_length, root_string_len, root_numeric_len))
 				{
-					SET_MSG_RESULT(result, zbx_dsprintf(NULL,
-							"snprint_objid(): buffer is not large enough:"
-							" OID: \"%s\" snmp_oid: \"%s\".", OID, snmp_oid));
+					SET_MSG_RESULT(result, zbx_dsprintf(NULL, "zbx_snmp_choose_index():"
+							" cannot choose appropriate index while walking for"
+							" OID \"%s\".", OID));
 					ret = NOTSUPPORTED;
 					running = 0;
 					break;
@@ -818,14 +955,12 @@ static int	zbx_snmp_walk(struct snmp_session *ss, const DC_ITEM *item, const cha
 				{
 					if (ZBX_SNMP_WALK_MODE_CACHE == mode)
 					{
-						cache_put_snmp_index(item, (char *)OID, snmp_result.str,
-								&snmp_oid[OID_len + 1]);
+						cache_put_snmp_index(item, (char *)OID, snmp_result.str, snmp_oid);
 					}
 					else
 					{
 						zbx_json_addobject(&j, NULL);
-						zbx_json_addstring(&j, "{#SNMPINDEX}", &snmp_oid[OID_len + 1],
-								ZBX_JSON_TYPE_STRING);
+						zbx_json_addstring(&j, "{#SNMPINDEX}", snmp_oid, ZBX_JSON_TYPE_STRING);
 						zbx_json_addstring(&j, "{#SNMPVALUE}", snmp_result.str,
 								ZBX_JSON_TYPE_STRING);
 						zbx_json_close(&j);
@@ -837,7 +972,7 @@ static int	zbx_snmp_walk(struct snmp_session *ss, const DC_ITEM *item, const cha
 
 					msg = GET_MSG_RESULT(&snmp_result);
 
-					zabbix_log(LOG_LEVEL_DEBUG, "cannot get OID '%s' string value: %s",
+					zabbix_log(LOG_LEVEL_DEBUG, "cannot get index '%s' string value: %s",
 							snmp_oid, NULL != msg && NULL != *msg ? *msg : "(null)");
 				}
 
@@ -1135,7 +1270,8 @@ static void	zbx_snmp_translate(char *oid_translated, const char *oid, size_t max
 }
 
 static int	zbx_snmp_process_discovery(struct snmp_session *ss, const DC_ITEM *items, AGENT_RESULT *results,
-		int *errcodes, int num, char *error, int max_error_len, int *max_succeed, int *min_fail, int max_vars)
+		int *errcodes, int num, char *error, int max_error_len, int *max_succeed, int *min_fail, int max_vars,
+		int bulk)
 {
 	const char	*__function_name = "zbx_snmp_process_discovery";
 
@@ -1151,7 +1287,7 @@ static int	zbx_snmp_process_discovery(struct snmp_session *ss, const DC_ITEM *it
 		case 0:
 			zbx_snmp_translate(oid_translated, items[0].snmp_oid, sizeof(oid_translated));
 			errcodes[0] = zbx_snmp_walk(ss, &items[0], oid_translated, ZBX_SNMP_WALK_MODE_DISCOVERY,
-					&results[0], max_succeed, min_fail, max_vars);
+					&results[0], max_succeed, min_fail, max_vars, bulk);
 			break;
 		default:
 			SET_MSG_RESULT(&results[0], zbx_dsprintf(NULL, "OID \"%s\" contains unsupported parameters.",
@@ -1168,7 +1304,7 @@ static int	zbx_snmp_process_discovery(struct snmp_session *ss, const DC_ITEM *it
 }
 
 static int	zbx_snmp_process_dynamic(struct snmp_session *ss, const DC_ITEM *items, AGENT_RESULT *results,
-		int *errcodes, int num, char *error, int max_error_len, int *max_succeed, int *min_fail)
+		int *errcodes, int num, char *error, int max_error_len, int *max_succeed, int *min_fail, int bulk)
 {
 	const char	*__function_name = "zbx_snmp_process_dynamic";
 
@@ -1301,7 +1437,7 @@ static int	zbx_snmp_process_dynamic(struct snmp_session *ss, const DC_ITEM *item
 			init_result(&result);
 
 			errcode = zbx_snmp_walk(ss, &items[j], oids_translated[j], ZBX_SNMP_WALK_MODE_CACHE, &result,
-					max_succeed, min_fail, num);
+					max_succeed, min_fail, num, bulk);
 
 			if (NETWORK_ERROR == errcode)
 			{
@@ -1425,7 +1561,8 @@ void	get_values_snmp(const DC_ITEM *items, AGENT_RESULT *results, int *errcodes,
 
 	struct snmp_session	*ss;
 	char			error[MAX_STRING_LEN];
-	int			i, j, err = SUCCEED, max_succeed = 0, min_fail = MAX_SNMP_ITEMS + 1;
+	int			i, j, err = SUCCEED, max_succeed = 0, min_fail = MAX_SNMP_ITEMS + 1,
+				bulk = SNMP_BULK_ENABLED;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() host:'%s' addr:'%s' num:%d",
 			__function_name, items[0].host.host, items[0].interface.addr, num);
@@ -1449,21 +1586,17 @@ void	get_values_snmp(const DC_ITEM *items, AGENT_RESULT *results, int *errcodes,
 	{
 		int	max_vars;
 
-		if (SUCCEED == DCconfig_get_interface_snmp_stats(items[j].interface.interfaceid,
-				&max_succeed, &min_fail))
-		{
-			max_vars = DCconfig_get_suggested_snmp_vars(max_succeed, min_fail);
-		}
-		else
-			max_vars = 1;
+		max_vars = DCconfig_get_suggested_snmp_vars(items[j].interface.interfaceid, &bulk);
 
 		err = zbx_snmp_process_discovery(ss, items + j, results + j, errcodes + j, num - j, error, sizeof(error),
-				&max_succeed, &min_fail, max_vars);
+				&max_succeed, &min_fail, max_vars, bulk);
 	}
 	else if (NULL != strchr(items[j].snmp_oid, '['))
 	{
+		(void)DCconfig_get_suggested_snmp_vars(items[j].interface.interfaceid, &bulk);
+
 		err = zbx_snmp_process_dynamic(ss, items + j, results + j, errcodes + j, num - j, error, sizeof(error),
-				&max_succeed, &min_fail);
+				&max_succeed, &min_fail, bulk);
 	}
 	else
 	{
@@ -1486,7 +1619,7 @@ exit:
 			errcodes[i] = err;
 		}
 	}
-	else if (0 != max_succeed || MAX_SNMP_ITEMS + 1 != min_fail)
+	else if (SNMP_BULK_ENABLED == bulk && (0 != max_succeed || MAX_SNMP_ITEMS + 1 != min_fail))
 	{
 		DCconfig_update_interface_snmp_stats(items[j].interface.interfaceid, max_succeed, min_fail);
 	}
diff --git a/src/zabbix_server/poller/checks_ssh.c b/src/zabbix_server/poller/checks_ssh.c
index 803dad79a80..7371be5f1ae 100644
--- a/src/zabbix_server/poller/checks_ssh.c
+++ b/src/zabbix_server/poller/checks_ssh.c
@@ -91,8 +91,7 @@ static int	ssh_run(DC_ITEM *item, AGENT_RESULT *result, const char *encoding)
 
 	if (FAIL == zbx_tcp_connect(&s, CONFIG_SOURCE_IP, item->interface.addr, item->interface.port, 0))
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot connect to SSH server: %s",
-				zbx_tcp_strerror()));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot connect to SSH server: %s", zbx_tcp_strerror()));
 		goto close;
 	}
 
@@ -342,13 +341,22 @@ int	get_value_ssh(DC_ITEM *item, AGENT_RESULT *result)
 		port[8], encoding[32];
 
 	if (ZBX_COMMAND_ERROR == parse_command(item->key, cmd, sizeof(cmd), params, sizeof(params)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid item key format."));
 		return NOTSUPPORTED;
+	}
 
 	if (0 != strcmp(SSH_RUN_KEY, cmd))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Unsupported item key for this item type."));
 		return NOTSUPPORTED;
+	}
 
-	if (num_param(params) > 4)
+	if (4 < num_param(params))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return NOTSUPPORTED;
+	}
 
 	if (0 != get_param(params, 2, dns, sizeof(dns)))
 		*dns = '\0';
@@ -368,7 +376,10 @@ int	get_value_ssh(DC_ITEM *item, AGENT_RESULT *result)
 	if ('\0' != *port)
 	{
 		if (FAIL == is_ushort(port, &item->interface.port))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 			return NOTSUPPORTED;
+		}
 	}
 	else
 		item->interface.port = ZBX_DEFAULT_SSH_PORT;
diff --git a/src/zabbix_server/poller/checks_telnet.c b/src/zabbix_server/poller/checks_telnet.c
index bdb94af881e..3f8921a812b 100644
--- a/src/zabbix_server/poller/checks_telnet.c
+++ b/src/zabbix_server/poller/checks_telnet.c
@@ -38,7 +38,7 @@ static int	telnet_run(DC_ITEM *item, AGENT_RESULT *result, const char *encoding)
 
 	if (FAIL == zbx_tcp_connect(&s, CONFIG_SOURCE_IP, item->interface.addr, item->interface.port, 0))
 	{
-		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "cannot connect to TELNET server: %s", zbx_tcp_strerror()));
+		SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Cannot connect to TELNET server: %s", zbx_tcp_strerror()));
 		goto close;
 	}
 
@@ -66,13 +66,22 @@ int	get_value_telnet(DC_ITEM *item, AGENT_RESULT *result)
 	char	cmd[MAX_STRING_LEN], params[MAX_STRING_LEN], dns[INTERFACE_DNS_LEN_MAX], port[8], encoding[32];
 
 	if (ZBX_COMMAND_ERROR == parse_command(item->key, cmd, sizeof(cmd), params, sizeof(params)))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid item key format."));
 		return NOTSUPPORTED;
+	}
 
 	if (0 != strcmp(TELNET_RUN_KEY, cmd))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Unsupported item key for this item type."));
 		return NOTSUPPORTED;
+	}
 
 	if (4 < num_param(params))
+	{
+		SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
 		return NOTSUPPORTED;
+	}
 
 	if (0 != get_param(params, 2, dns, sizeof(dns)))
 		*dns = '\0';
@@ -92,7 +101,10 @@ int	get_value_telnet(DC_ITEM *item, AGENT_RESULT *result)
 	if ('\0' != *port)
 	{
 		if (FAIL == is_ushort(port, &item->interface.port))
+		{
+			SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid third parameter."));
 			return NOTSUPPORTED;
+		}
 	}
 	else
 		item->interface.port = ZBX_DEFAULT_TELNET_PORT;
diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c
index fc8483f0658..cd333f0b8e0 100644
--- a/src/zabbix_server/poller/poller.c
+++ b/src/zabbix_server/poller/poller.c
@@ -48,18 +48,16 @@ extern int		server_num, process_num;
 
 static void	update_triggers_status_to_unknown(zbx_uint64_t hostid, zbx_item_type_t type, zbx_timespec_t *ts, char *reason)
 {
-	const char		*__function_name = "update_triggers_status_to_unknown";
-	DB_RESULT		result;
-	DB_ROW			row;
-	char			failed_type_buf[8];
-	zbx_vector_ptr_t	triggers;
-	DC_TRIGGER		*trigger;
-	int			i;
+	const char	*__function_name = "update_triggers_status_to_unknown";
+	DB_RESULT	result;
+	DB_ROW		row;
+	char		failed_type_buf[8];
+	char		*sql = NULL;
+	size_t		sql_alloc = 0, sql_offset = 0;
+	DC_TRIGGER	trigger;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() hostid:" ZBX_FS_UI64, __function_name, hostid);
 
-	zbx_vector_ptr_create(&triggers);
-
 	/* determine failed item type */
 	switch (type)
 	{
@@ -156,40 +154,35 @@ static void	update_triggers_status_to_unknown(zbx_uint64_t hostid, zbx_item_type
 
 	while (NULL != (row = DBfetch(result)))
 	{
-		trigger = zbx_malloc(NULL, sizeof(DC_TRIGGER));
-		ZBX_STR2UINT64(trigger->triggerid, row[0]);
-		trigger->description = zbx_strdup(NULL, row[1]);
-		trigger->expression_orig = zbx_strdup(NULL, row[2]);
-		trigger->priority = (unsigned char)atoi(row[3]);
-		trigger->type = (unsigned char)atoi(row[4]);
-		trigger->value = atoi(row[5]);
-		trigger->state = atoi(row[6]);
-		trigger->error = zbx_strdup(NULL, row[7]);
-		trigger->lastchange = atoi(row[8]);
-		trigger->new_value = TRIGGER_VALUE_UNKNOWN;
-		trigger->new_error = reason;
-		trigger->timespec = *ts;
-
-		zbx_vector_ptr_append(&triggers, trigger);
+		ZBX_STR2UINT64(trigger.triggerid, row[0]);
+		trigger.description = row[1];
+		trigger.expression_orig = row[2];
+		ZBX_STR2UCHAR(trigger.priority, row[3]);
+		ZBX_STR2UCHAR(trigger.type, row[4]);
+		trigger.value = atoi(row[5]);
+		trigger.state = atoi(row[6]);
+		trigger.error = row[7];
+		trigger.lastchange = atoi(row[8]);
+		trigger.new_value = TRIGGER_VALUE_UNKNOWN;
+		trigger.new_error = reason;
+		trigger.timespec = *ts;
+
+		sql_offset = 0;
+
+		if (SUCCEED == process_trigger(&sql, &sql_alloc, &sql_offset, &trigger))
+		{
+			DBbegin();
+			DBexecute("%s", sql);
+			DBcommit();
+		}
 	}
-	DBfree_result(result);
-
-	zbx_vector_ptr_sort(&triggers, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC);
 
-	process_triggers(&triggers);
+	zbx_free(sql);
+	DBfree_result(result);
 
+	DBbegin();
 	process_events();
-
-	for (i = 0; i < triggers.values_num; i++)
-	{
-		trigger = (DC_TRIGGER *)triggers.values[i];
-
-		zbx_free(trigger->error);
-		zbx_free(trigger->expression_orig);
-		zbx_free(trigger->description);
-		zbx_free(trigger);
-	}
-	zbx_vector_ptr_destroy(&triggers);
+	DBcommit();
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
diff --git a/src/zabbix_server/proxypoller/proxypoller.c b/src/zabbix_server/proxypoller/proxypoller.c
index 109db095a0c..a72ca96ab39 100644
--- a/src/zabbix_server/proxypoller/proxypoller.c
+++ b/src/zabbix_server/proxypoller/proxypoller.c
@@ -71,18 +71,17 @@ static int	send_data_to_proxy(DC_PROXY *proxy, zbx_sock_t *sock, const char *dat
 	return ret;
 }
 
-static int	recv_data_from_proxy(DC_PROXY *proxy, zbx_sock_t *sock, char **data)
+static int	recv_data_from_proxy(DC_PROXY *proxy, zbx_sock_t *sock)
 {
 	const char	*__function_name = "recv_data_from_proxy";
 	int		ret;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
-	if (FAIL == (ret = zbx_tcp_recv(sock, data)))
-		zabbix_log(LOG_LEVEL_ERR, "cannot obtain data from proxy \"%s\": %s",
-				proxy->host, zbx_tcp_strerror());
+	if (FAIL == (ret = zbx_tcp_recv(sock)))
+		zabbix_log(LOG_LEVEL_ERR, "cannot obtain data from proxy \"%s\": %s", proxy->host, zbx_tcp_strerror());
 	else
-		zabbix_log(LOG_LEVEL_DEBUG, "obtained data from proxy \"%s\": %s", proxy->host, *data);
+		zabbix_log(LOG_LEVEL_DEBUG, "obtained data from proxy \"%s\": %s", proxy->host, sock->buffer);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __function_name, zbx_result_string(ret));
 
@@ -121,7 +120,6 @@ static int	get_data_from_proxy(DC_PROXY *proxy, const char *request, char **data
 	const char	*__function_name = "get_data_from_proxy";
 	zbx_sock_t	s;
 	struct zbx_json	j;
-	char		*answer = NULL;
 	int		ret = FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() request:'%s'", __function_name, request);
@@ -133,9 +131,9 @@ static int	get_data_from_proxy(DC_PROXY *proxy, const char *request, char **data
 	if (SUCCEED == (ret = connect_to_proxy(proxy, &s, CONFIG_TRAPPER_TIMEOUT)))
 	{
 		if (SUCCEED == (ret = send_data_to_proxy(proxy, &s, j.buffer)))
-			if (SUCCEED == (ret = recv_data_from_proxy(proxy, &s, &answer)))
+			if (SUCCEED == (ret = recv_data_from_proxy(proxy, &s)))
 				if (SUCCEED == (ret = zbx_send_response(&s, SUCCEED, NULL, 0)))
-					*data = zbx_strdup(*data, answer);
+					*data = zbx_strdup(*data, s.buffer);
 
 		disconnect_proxy(&s);
 	}
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index 84b423f7880..003118e422f 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -197,6 +197,13 @@ char	**CONFIG_LOAD_MODULE		= NULL;
 
 char	*CONFIG_USER			= NULL;
 
+/* web monitoring */
+#ifdef HAVE_LIBCURL
+char	*CONFIG_SSL_CA_LOCATION		= NULL;
+char	*CONFIG_SSL_CERT_LOCATION	= NULL;
+char	*CONFIG_SSL_KEY_LOCATION	= NULL;
+#endif
+
 int	get_process_info_by_thread(int server_num, unsigned char *process_type, int *process_num)
 {
 	int	server_count = 0;
@@ -342,14 +349,19 @@ static void	zbx_set_defaults()
 
 	if (NULL == CONFIG_FPING_LOCATION)
 		CONFIG_FPING_LOCATION = zbx_strdup(CONFIG_FPING_LOCATION, "/usr/sbin/fping");
-
 #ifdef HAVE_IPV6
 	if (NULL == CONFIG_FPING6_LOCATION)
 		CONFIG_FPING6_LOCATION = zbx_strdup(CONFIG_FPING6_LOCATION, "/usr/sbin/fping6");
 #endif
-
 	if (NULL == CONFIG_EXTERNALSCRIPTS)
 		CONFIG_EXTERNALSCRIPTS = zbx_strdup(CONFIG_EXTERNALSCRIPTS, DATADIR "/zabbix/externalscripts");
+#ifdef HAVE_LIBCURL
+	if (NULL == CONFIG_SSL_CERT_LOCATION)
+		CONFIG_SSL_CERT_LOCATION = zbx_strdup(CONFIG_SSL_CERT_LOCATION, DATADIR "/zabbix/ssl/certs");
+
+	if (NULL == CONFIG_SSL_KEY_LOCATION)
+		CONFIG_SSL_KEY_LOCATION = zbx_strdup(CONFIG_SSL_KEY_LOCATION, DATADIR "/zabbix/ssl/keys");
+#endif
 
 #ifdef HAVE_SQLITE3
 	CONFIG_MAX_HOUSEKEEPER_DELETE = 0;
@@ -367,6 +379,14 @@ static void	zbx_set_defaults()
  ******************************************************************************/
 static void	zbx_validate_config(void)
 {
+	if (0 == CONFIG_UNREACHABLE_POLLER_FORKS && 0 != CONFIG_POLLER_FORKS + CONFIG_IPMIPOLLER_FORKS +
+			CONFIG_JAVAPOLLER_FORKS)
+	{
+		zabbix_log(LOG_LEVEL_CRIT, "\"StartPollersUnreachable\" configuration parameter must not be 0"
+				" if regular, IPMI or Java pollers are started");
+		exit(EXIT_FAILURE);
+	}
+
 	if ((NULL == CONFIG_JAVA_GATEWAY || '\0' == *CONFIG_JAVA_GATEWAY) && CONFIG_JAVAPOLLER_FORKS > 0)
 	{
 		zabbix_log(LOG_LEVEL_CRIT, "\"JavaGateway\" configuration parameter is not specified or empty");
@@ -536,6 +556,14 @@ static void	zbx_load_config()
 			PARM_OPT,	0,			1},
 		{"User",			&CONFIG_USER,				TYPE_STRING,
 			PARM_OPT,	0,			0},
+#ifdef HAVE_LIBCURL
+		{"SSLCALocation",		&CONFIG_SSL_CA_LOCATION,		TYPE_STRING,
+			PARM_OPT,	0,			0},
+		{"SSLCertLocation",		&CONFIG_SSL_CERT_LOCATION,		TYPE_STRING,
+			PARM_OPT,	0,			0},
+		{"SSLKeyLocation",		&CONFIG_SSL_KEY_LOCATION,		TYPE_STRING,
+			PARM_OPT,	0,			0},
+#endif
 		{NULL}
 	};
 
@@ -637,15 +665,15 @@ int	main(int argc, char **argv)
 				break;
 			case 'h':
 				help();
-				exit(-1);
+				exit(EXIT_SUCCESS);
 				break;
 			case 'V':
 				version();
-				exit(-1);
+				exit(EXIT_SUCCESS);
 				break;
 			default:
 				usage();
-				exit(-1);
+				exit(EXIT_FAILURE);
 				break;
 		}
 	}
@@ -760,7 +788,7 @@ int	MAIN_ZABBIX_ENTRY()
 	zbx_create_itservices_lock();
 
 #ifdef	HAVE_SQLITE3
-	zbx_create_sqlite3_mutex(CONFIG_DBNAME);
+	zbx_create_sqlite3_mutex();
 #endif
 
 	if (SUCCEED != DBcheck_version())
@@ -966,5 +994,5 @@ void	zbx_on_exit()
 	setproctitle_free_env();
 #endif
 
-	exit(SUCCEED);
+	exit(EXIT_SUCCESS);
 }
diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c
index 7375398c211..3cca3d24b38 100644
--- a/src/zabbix_server/timer/timer.c
+++ b/src/zabbix_server/timer/timer.c
@@ -382,7 +382,7 @@ out:
  * Parameters: hostid - host identifier from database                         *
  *             maintenance_from, maintenance_to - maintenance period bounds   *
  *                                                                            *
- * Return value:                                                              *
+ * Return value: ret - number of hosts that went in and out of maintenance    *
  *                                                                            *
  * Author: Alexander Vladishev                                                *
  *                                                                            *
@@ -438,7 +438,7 @@ static void	generate_events(zbx_uint64_t hostid, int maintenance_from, int maint
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
-static void	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, int now)
+static int	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, int now)
 {
 	typedef struct
 	{
@@ -457,6 +457,7 @@ static void	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, i
 	char		*sql = NULL;
 	size_t		sql_alloc = ZBX_KIBIBYTE, sql_offset;
 	maintenance_t	*maintenances = NULL, *m;
+	int		ret = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
@@ -474,8 +475,9 @@ static void	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, i
 				hm[i].host_maintenance_type != hm[i].maintenance_type ||
 				0 == hm[i].host_maintenance_from)
 		{
-			zabbix_log(LOG_LEVEL_WARNING, "putting host [%s] into maintenance (with%s data collection)",
-					hm[i].host, MAINTENANCE_TYPE_NORMAL == hm[i].maintenance_type ? "" : "out");
+			zabbix_log(LOG_LEVEL_DEBUG, "putting host '%s' into maintenance (%s)",
+					hm[i].host, MAINTENANCE_TYPE_NORMAL == hm[i].maintenance_type ?
+					"with data collection" : "without data collection");
 
 			sql_offset = 0;
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
@@ -500,6 +502,8 @@ static void	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, i
 
 			DCconfig_set_maintenance(&hm[i].hostid, 1, HOST_MAINTENANCE_STATUS_ON,
 					hm[i].maintenance_type, hm[i].maintenance_from);
+
+			ret++;
 		}
 
 		uint64_array_add(&ids, &ids_alloc, &ids_num, hm[i].hostid, 4);
@@ -526,7 +530,7 @@ static void	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, i
 
 	while (NULL != (row = DBfetch(result)))
 	{
-		zabbix_log(LOG_LEVEL_WARNING, "taking host [%s] out of maintenance", row[1]);
+		zabbix_log(LOG_LEVEL_DEBUG, "taking host '%s' out of maintenance", row[1]);
 
 		ZBX_STR2UINT64(hostid, row[0]);
 
@@ -548,10 +552,11 @@ static void	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, i
 			"update hosts"
 			" set maintenanceid=null,"
 				"maintenance_status=%d,"
-				"maintenance_type=0,"
+				"maintenance_type=%d,"
 				"maintenance_from=0"
 			" where",
-			HOST_MAINTENANCE_STATUS_OFF);
+			HOST_MAINTENANCE_STATUS_OFF,
+			MAINTENANCE_TYPE_NORMAL);
 
 	if (NULL != ids && 0 != ids_num)
 	{
@@ -559,6 +564,8 @@ static void	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, i
 		DBexecute("%s", sql);
 
 		DCconfig_set_maintenance(ids, ids_num, HOST_MAINTENANCE_STATUS_OFF, 0, 0);
+
+		ret += ids_num;
 	}
 
 	DBcommit();
@@ -576,6 +583,8 @@ static void	update_maintenance_hosts(zbx_host_maintenance_t *hm, int hm_count, i
 	}
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
+
+	return ret;
 }
 
 /******************************************************************************
@@ -619,7 +628,7 @@ static int	process_maintenance(void)
 					db_period, db_maintenance_type;
 	static zbx_host_maintenance_t	*hm = NULL;
 	static int			hm_alloc = 4;
-	int				hm_count = 0, res;
+	int				hm_count = 0, ret;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
@@ -760,19 +769,19 @@ static int	process_maintenance(void)
 		if (maintenance_from < db_active_since)
 			maintenance_from = db_active_since;
 
-		process_maintenance_hosts(&hm, &hm_alloc, &hm_count, maintenance_from, db_maintenanceid, db_maintenance_type);
+		process_maintenance_hosts(&hm, &hm_alloc, &hm_count, maintenance_from, db_maintenanceid,
+				db_maintenance_type);
 	}
 	DBfree_result(result);
 
-	update_maintenance_hosts(hm, hm_count, (int)now);
-
-	res = hm_count;
+	ret = update_maintenance_hosts(hm, hm_count, (int)now);
 
 	while (0 != hm_count--)
 		zbx_free(hm[hm_count].host);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
-	return res;
+
+	return ret;
 }
 
 /******************************************************************************
@@ -836,7 +845,7 @@ ZBX_THREAD_ENTRY(timer_thread, args)
 				else
 				{
 					zbx_setproctitle("%s #1 [processed %d triggers, %d events in " ZBX_FS_DBL
-							" sec, %d maint.periods in " ZBX_FS_DBL " sec, processing time "
+							" sec, %d maintenances in " ZBX_FS_DBL " sec, processing time "
 							"functions]",
 							get_process_type_string(process_type),
 							triggers_count, events_count, total_sec, hm_count,
@@ -855,7 +864,7 @@ ZBX_THREAD_ENTRY(timer_thread, args)
 				else
 				{
 					zbx_setproctitle("%s #1 [processed %d triggers, %d events in " ZBX_FS_DBL
-							" sec, %d maint.periods in " ZBX_FS_DBL " sec, idle %d sec]",
+							" sec, %d maintenances in " ZBX_FS_DBL " sec, idle %d sec]",
 							get_process_type_string(process_type),
 							triggers_count, events_count, total_sec, hm_count,
 							total_sec_maint, sleeptime);
@@ -889,7 +898,7 @@ ZBX_THREAD_ENTRY(timer_thread, args)
 			else
 			{
 				zbx_setproctitle("%s #1 [processed %d triggers, %d events in " ZBX_FS_DBL
-						" sec, %d maint.periods in " ZBX_FS_DBL " sec, processing time "
+						" sec, %d maintenances in " ZBX_FS_DBL " sec, processing time "
 						"functions]",
 						get_process_type_string(process_type),
 						old_triggers_count, old_events_count, old_total_sec, old_hm_count,
@@ -914,7 +923,7 @@ ZBX_THREAD_ENTRY(timer_thread, args)
 		if (0 == nextcheck % SEC_PER_MIN || nextcheck + SEC_PER_MIN - (nextcheck % SEC_PER_MIN) <= time(NULL))
 		{
 			zbx_setproctitle("%s #1 [processed %d triggers, %d events in " ZBX_FS_DBL
-					" sec, %d maint.periods in " ZBX_FS_DBL " sec, processing maintenance periods]",
+					" sec, %d maintenances in " ZBX_FS_DBL " sec, processing maintenance periods]",
 					get_process_type_string(process_type),
 					triggers_count, events_count, total_sec, old_hm_count,
 					old_total_sec_maint);
diff --git a/src/zabbix_server/trapper/active.c b/src/zabbix_server/trapper/active.c
index b5fc0acf207..10787b7ede6 100644
--- a/src/zabbix_server/trapper/active.c
+++ b/src/zabbix_server/trapper/active.c
@@ -49,16 +49,17 @@ static int	get_hostid_by_host(const char *host, const char *ip, unsigned short p
 {
 	const char	*__function_name = "get_hostid_by_host";
 
-	char		*host_esc, dns[INTERFACE_DNS_LEN_MAX];
+	char		*host_esc, dns[INTERFACE_DNS_LEN_MAX], *ch_error;
 	DB_RESULT	result;
 	DB_ROW		row;
 	int		ret = FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() host:'%s'", __function_name, host);
 
-	if (FAIL == zbx_check_hostname(host))
+	if (FAIL == zbx_check_hostname(host, &ch_error))
 	{
-		zbx_snprintf(error, MAX_STRING_LEN, "invalid host name [%s]", host);
+		zbx_snprintf(error, MAX_STRING_LEN, "invalid host name [%s]: %s", host, ch_error);
+		zbx_free(ch_error);
 		goto out;
 	}
 
@@ -210,6 +211,12 @@ int	send_list_of_active_checks(zbx_sock_t *sock, char *request)
 				continue;
 			}
 
+			if (ITEM_STATUS_ACTIVE != dc_items[i].status)
+				continue;
+
+			if (HOST_STATUS_MONITORED != dc_items[i].host.status)
+				continue;
+
 			if (ITEM_STATE_NOTSUPPORTED == dc_items[i].state)
 			{
 				if (0 == refresh_unsupported || dc_items[i].lastclock + refresh_unsupported > now)
@@ -367,6 +374,12 @@ int	send_list_of_active_checks_json(zbx_sock_t *sock, struct zbx_json_parse *jp)
 				continue;
 			}
 
+			if (ITEM_STATUS_ACTIVE != dc_items[i].status)
+				continue;
+
+			if (HOST_STATUS_MONITORED != dc_items[i].host.status)
+				continue;
+
 			if (ITEM_STATE_NOTSUPPORTED == dc_items[i].state)
 			{
 				if (0 == refresh_unsupported || dc_items[i].lastclock + refresh_unsupported > now)
@@ -449,7 +462,7 @@ int	send_list_of_active_checks_json(zbx_sock_t *sock, struct zbx_json_parse *jp)
 			zbx_json_addstring(&json, "expression", regexp->expression, ZBX_JSON_TYPE_STRING);
 
 			zbx_snprintf(buffer, sizeof(buffer), "%d", regexp->expression_type);
-			zbx_json_addstring(&json, "expression_type",buffer, ZBX_JSON_TYPE_INT);
+			zbx_json_addstring(&json, "expression_type", buffer, ZBX_JSON_TYPE_INT);
 
 			zbx_snprintf(buffer, sizeof(buffer), "%c", regexp->exp_delimiter);
 			zbx_json_addstring(&json, "exp_delimiter", buffer, ZBX_JSON_TYPE_STRING);
diff --git a/src/zabbix_server/trapper/nodecommand.c b/src/zabbix_server/trapper/nodecommand.c
index 7c72875692f..5f18f22dd59 100644
--- a/src/zabbix_server/trapper/nodecommand.c
+++ b/src/zabbix_server/trapper/nodecommand.c
@@ -41,8 +41,6 @@ static int	execute_script(zbx_uint64_t scriptid, zbx_uint64_t hostid, char **res
 	char		error[MAX_STRING_LEN];
 	int		ret = FAIL, rc;
 	DC_HOST		host;
-	DB_RESULT	db_result;
-	DB_ROW		db_row;
 	zbx_script_t	script;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() scriptid:" ZBX_FS_UI64 " hostid:" ZBX_FS_UI64,
@@ -52,23 +50,6 @@ static int	execute_script(zbx_uint64_t scriptid, zbx_uint64_t hostid, char **res
 
 	if (SUCCEED != (rc = DCget_host_by_hostid(&host, hostid)))
 	{
-		/* let's try to get a host from a database (the host can be disabled) */
-		db_result = DBselect("select host,name from hosts where hostid=" ZBX_FS_UI64, hostid);
-
-		if (NULL != (db_row = DBfetch(db_result)))
-		{
-			memset(&host, 0, sizeof(host));
-			host.hostid = hostid;
-			strscpy(host.host, db_row[0]);
-			strscpy(host.name, db_row[1]);
-
-			rc = SUCCEED;
-		}
-		DBfree_result(db_result);
-	}
-
-	if (SUCCEED != rc)
-	{
 		zbx_snprintf(error, sizeof(error), "Unknown Host ID [" ZBX_FS_UI64 "].", hostid);
 		goto fail;
 	}
@@ -94,7 +75,7 @@ fail:
  *                                                                            *
  * Function: node_process_command                                             *
  *                                                                            *
- * Purpose: process command received from a master node or php                *
+ * Purpose: process command received from the frontend                        *
  *                                                                            *
  * Return value:  SUCCEED - processed successfully                            *
  *                FAIL - an error occurred                                    *
diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c
index 63b6c055e10..f518f274fb5 100644
--- a/src/zabbix_server/trapper/trapper.c
+++ b/src/zabbix_server/trapper/trapper.c
@@ -636,12 +636,10 @@ static int	process_trap(zbx_sock_t	*sock, char *s)
 
 static void	process_trapper_child(zbx_sock_t *sock)
 {
-	char	*data;
-
-	if (SUCCEED != zbx_tcp_recv_to(sock, &data, CONFIG_TRAPPER_TIMEOUT))
+	if (SUCCEED != zbx_tcp_recv_to(sock, CONFIG_TRAPPER_TIMEOUT))
 		return;
 
-	process_trap(sock, data);
+	process_trap(sock, sock->buffer);
 }
 
 ZBX_THREAD_ENTRY(trapper_thread, args)
diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c
index e17c09c52f3..31018898c33 100644
--- a/src/zabbix_server/vmware/vmware.c
+++ b/src/zabbix_server/vmware/vmware.c
@@ -116,8 +116,8 @@ zbx_perfcounter_mapping_t;
 			"<SOAP-ENV:Header/>"						\
 			"<ns1:Body>"
 
-#define ZBX_POST_VSPHERE_FOOTER								\
-			"</ns1:Body>"							\
+#define ZBX_POST_VSPHERE_FOOTER		\
+			"</ns1:Body>"	\
 		"</SOAP-ENV:Envelope>"
 
 typedef struct
@@ -206,6 +206,9 @@ static void	vmware_dev_shared_free(zbx_vmware_dev_t *dev)
 	if (NULL != dev->instance)
 		__vm_mem_free_func(dev->instance);
 
+	if (NULL != dev->label)
+		__vm_mem_free_func(dev->label);
+
 	__vm_mem_free_func(dev);
 }
 
@@ -411,6 +414,7 @@ static zbx_vmware_dev_t	*vmware_dev_shared_dup(const zbx_vmware_dev_t *src)
 	dev = __vm_mem_malloc_func(NULL, sizeof(zbx_vmware_dev_t));
 	dev->type = src->type;
 	dev->instance = vmware_shared_strdup(src->instance);
+	dev->label = vmware_shared_strdup(src->label);
 
 	return dev;
 }
@@ -543,6 +547,7 @@ static void	vmware_datastore_free(zbx_vmware_datastore_t *datastore)
 static void	vmware_dev_free(zbx_vmware_dev_t *dev)
 {
 	zbx_free(dev->instance);
+	zbx_free(dev->label);
 	zbx_free(dev);
 }
 
@@ -775,11 +780,11 @@ out:
 static	int	vmware_service_get_contents(zbx_vmware_service_t *service, CURL *easyhandle, char **contents,
 		char **error)
 {
-#	define ZBX_POST_VMWARE_CONTENTS 						\
-		ZBX_POST_VSPHERE_HEADER							\
-		"<ns0:RetrieveServiceContent>"						\
+#	define ZBX_POST_VMWARE_CONTENTS 							\
+		ZBX_POST_VSPHERE_HEADER								\
+		"<ns0:RetrieveServiceContent>"							\
 			"<ns0:_this type=\"ServiceInstance\">ServiceInstance</ns0:_this>"	\
-		"</ns0:RetrieveServiceContent>"						\
+		"</ns0:RetrieveServiceContent>"							\
 		ZBX_POST_VSPHERE_FOOTER
 
 	const char	*__function_name = "vmware_service_get_contents";
@@ -863,7 +868,7 @@ static int	vmware_service_get_perfcounter_refreshrate(const zbx_vmware_service_t
 		ZBX_POST_VSPHERE_HEADER						\
 		"<ns0:QueryPerfProviderSummary>"				\
 			"<ns0:_this type=\"PerformanceManager\">%s</ns0:_this>"	\
-			"<ns0:entity type=\"%s\">%s</ns0:entity>"	\
+			"<ns0:entity type=\"%s\">%s</ns0:entity>"		\
 		"</ns0:QueryPerfProviderSummary>"				\
 		ZBX_POST_VSPHERE_FOOTER
 
@@ -1226,12 +1231,11 @@ out:
 static int	vmware_service_vm_get_stats(const zbx_vmware_service_t *service, CURL *easyhandle, zbx_vmware_vm_t *vm,
 		char **error)
 {
-	const char		*__function_name = "vmware_service_get_vm_stats";
+	const char	*__function_name = "vmware_service_get_vm_stats";
 
-	int			i, err, o, ret = FAIL, refresh_rate;
-	char			*tmp = NULL;
-	size_t			tmp_alloc = 0, tmp_offset = 0;
-	zbx_vmware_dev_t	*dev;
+	int		err, o, ret = FAIL, refresh_rate;
+	char		*tmp = NULL;
+	size_t		tmp_alloc = 0, tmp_offset = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
@@ -1250,25 +1254,11 @@ static int	vmware_service_vm_get_stats(const zbx_vmware_service_t *service, CURL
 			vm->id);
 	zbx_strcpy_alloc(&tmp, &tmp_alloc, &tmp_offset, "<ns0:maxSample>1</ns0:maxSample>");
 
-	/* first add networking devices which are already populated in device list */
-	for (i = 0; i < vm->devs.values_num; i++)
-	{
-		dev = (zbx_vmware_dev_t *)vm->devs.values[i];
-
-		switch (dev->type)
-		{
-			case ZBX_VMWARE_DEV_TYPE_NIC:
-				vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, dev->instance,
-						service->counters.nic_packets_rx);
-				vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, dev->instance,
-						service->counters.nic_packets_tx);
-				vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, dev->instance,
-						service->counters.nic_received);
-				vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, dev->instance,
-						service->counters.nic_transmitted);
-				break;
-		}
-	}
+	/* add network interface performance counters */
+	vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, "*", service->counters.nic_packets_rx);
+	vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, "*", service->counters.nic_packets_tx);
+	vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, "*", service->counters.nic_received);
+	vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, "*", service->counters.nic_transmitted);
 
 	/* then add all virtual disk devices */
 	vmware_add_perfcounter_metric(&tmp, &tmp_alloc, &tmp_offset, "*", service->counters.disk_read);
@@ -1363,6 +1353,8 @@ static void	wmware_vm_get_nic_devices(zbx_vmware_vm_t *vm)
 		dev = zbx_malloc(NULL, sizeof(zbx_vmware_dev_t));
 		dev->type =  ZBX_VMWARE_DEV_TYPE_NIC;
 		dev->instance = zbx_strdup(NULL, key);
+		dev->label = zbx_xml_read_node_value(doc, nodeset->nodeTab[i],
+				"*[local-name()='deviceInfo']/*[local-name()='label']");
 
 		zbx_vector_ptr_append(&vm->devs, dev);
 		nics++;
@@ -1377,43 +1369,42 @@ clean:
 	xmlFreeDoc(doc);
 	xmlCleanupParser();
 out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%d", __function_name, nics);
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() found:%d", __function_name, nics);
 }
 
 /******************************************************************************
  *                                                                            *
- * Function: wmware_vm_get_devices_by_counterid                               *
+ * Function: wmware_vm_get_disk_devices                                       *
  *                                                                            *
- * Purpose: gets devices from virtual machine stats filtered by the specified *
- *          performance counter id                                            *
+ * Purpose: gets virtual machine virtual disk devices                         *
  *                                                                            *
- * Parameters: vm        - [IN] the virtual machine                           *
- *             counterid - [IN] the performance counter id                    *
+ * Parameters: vm     - [IN] the virtual machine                              *
  *                                                                            *
  ******************************************************************************/
-static void	wmware_vm_get_devices_by_counterid(zbx_vmware_vm_t *vm, zbx_uint64_t counterid)
+static void	wmware_vm_get_disk_devices(zbx_vmware_vm_t *vm)
 {
-	const char	*__function_name = "wmware_vm_get_devices_by_counterid";
+	const char	*__function_name = "wmware_vm_get_disk_devices";
 
 	xmlDoc		*doc;
 	xmlXPathContext	*xpathCtx;
 	xmlXPathObject	*xpathObj;
 	xmlNodeSetPtr	nodeset;
+	int		i, disks = 0;
 	char		*xpath = NULL;
-	int		i, nics = 0;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
-	if (NULL == (doc = xmlReadMemory(vm->stats, strlen(vm->stats), "noname.xml", NULL, 0)))
+	if (NULL == (doc = xmlReadMemory(vm->details, strlen(vm->details), "noname.xml", NULL, 0)))
 		goto out;
 
 	xpathCtx = xmlXPathNewContext(doc);
 
-	xpath = zbx_dsprintf(xpath, "//*[local-name()='value']/*[local-name()='id']"
-			"[*[local-name()='counterId']/text()='" ZBX_FS_UI64 "']", counterid);
-
-	if (NULL == (xpathObj = xmlXPathEvalExpression((xmlChar *)xpath, xpathCtx)))
+	/* select all hardware devices of VirtualDisk type */
+	if (NULL == (xpathObj = xmlXPathEvalExpression((xmlChar *)"//*[local-name()='hardware']/"
+			"*[local-name()='device'][string(@*[local-name()='type'])='VirtualDisk']", xpathCtx)))
+	{
 		goto clean;
+	}
 
 	if (xmlXPathNodeSetIsEmpty(xpathObj->nodesetval))
 		goto clean;
@@ -1422,35 +1413,86 @@ static void	wmware_vm_get_devices_by_counterid(zbx_vmware_vm_t *vm, zbx_uint64_t
 
 	for (i = 0; i < nodeset->nodeNr; i++)
 	{
-		char			*instance;
 		zbx_vmware_dev_t	*dev;
+		char			*unitNumber = NULL, *controllerKey = NULL, *busNumber = NULL,
+					*scsiCtlrUnitNumber = NULL;
+		xmlXPathObject		*xpathObjController = NULL;
 
-		if (NULL == (instance = zbx_xml_read_node_value(doc, nodeset->nodeTab[i],
-				"*[local-name()='instance']")))
+		do
 		{
-			continue;
-		}
+			if (NULL == (unitNumber = zbx_xml_read_node_value(doc, nodeset->nodeTab[i],
+					"*[local-name()='unitNumber']")))
+			{
+				break;
+			}
 
-		dev = zbx_malloc(NULL, sizeof(zbx_vmware_dev_t));
-		dev->type =  ZBX_VMWARE_DEV_TYPE_DISK;
-		dev->instance = zbx_strdup(NULL, instance);
+			if (NULL == (controllerKey = zbx_xml_read_node_value(doc, nodeset->nodeTab[i],
+					"*[local-name()='controllerKey']")))
+			{
+				break;
+			}
 
-		zbx_vector_ptr_append(&vm->devs, dev);
-		nics++;
+			/* find the controller (parent) device */
+			xpath = zbx_dsprintf(xpath, "//*[local-name()='hardware']/*[local-name()='device']"
+					"[*[local-name()='key']/text()='%s']", controllerKey);
+
+			if (NULL == (xpathObjController = xmlXPathEvalExpression((xmlChar *)xpath, xpathCtx)))
+				break;
+
+			if (xmlXPathNodeSetIsEmpty(xpathObjController->nodesetval))
+				break;
+
+			if (NULL == (busNumber = zbx_xml_read_node_value(doc,
+					xpathObjController->nodesetval->nodeTab[0], "*[local-name()='busNumber']")))
+			{
+				break;
+			}
+
+			/* scsiCtlrUnitNumber property is simply used to determine controller type. */
+			/* For IDE controllers it is not set.                                       */
+			scsiCtlrUnitNumber = zbx_xml_read_node_value(doc, xpathObjController->nodesetval->nodeTab[0],
+				"*[local-name()='scsiCtlrUnitNumber']");
+
+			dev = zbx_malloc(NULL, sizeof(zbx_vmware_dev_t));
+			dev->type =  ZBX_VMWARE_DEV_TYPE_DISK;
+
+			/* the virtual disk instance has format <controller type><busNumber>:<unitNumber> */
+			/* where controller type is either ide or scsi depending on the controller type   */
+			dev->instance = zbx_dsprintf(NULL, "%s%s:%s", (NULL == scsiCtlrUnitNumber ? "ide" : "scsi"),
+					busNumber, unitNumber);
+
+			dev->label = zbx_xml_read_node_value(doc, nodeset->nodeTab[i],
+					"*[local-name()='deviceInfo']/*[local-name()='label']");
+
+			zbx_vector_ptr_append(&vm->devs, dev);
+
+			disks++;
+
+		} while (0);
+
+		if (NULL != xpathObjController)
+			xmlXPathFreeObject(xpathObjController);
+
+		zbx_free(scsiCtlrUnitNumber);
+		zbx_free(busNumber);
+		zbx_free(unitNumber);
+		zbx_free(controllerKey);
 
-		zbx_free(instance);
 	}
+
 clean:
+	zbx_free(xpath);
+
 	if (NULL != xpathObj)
 		xmlXPathFreeObject(xpathObj);
 
-	zbx_free(xpath);
-
 	xmlXPathFreeContext(xpathCtx);
 	xmlFreeDoc(doc);
 	xmlCleanupParser();
+
 out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%d", __function_name, nics);
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() found:%d", __function_name, disks);
+
 }
 
 /******************************************************************************
@@ -1572,12 +1614,11 @@ static zbx_vmware_vm_t	*vmware_service_create_vm(const zbx_vmware_service_t *ser
 	vm->id = zbx_strdup(NULL, id);
 
 	wmware_vm_get_nic_devices(vm);
+	wmware_vm_get_disk_devices(vm);
 
 	if (SUCCEED != vmware_service_vm_get_stats(service, easyhandle, vm, error))
 		goto out;
 
-	wmware_vm_get_devices_by_counterid(vm, service->counters.disk_read);
-
 	ret = SUCCEED;
 out:
 	if (SUCCEED != ret)
@@ -1696,23 +1737,23 @@ static int	vmware_service_get_hv_data(const zbx_vmware_service_t *service, CURL
 		char **data, char **error)
 {
 #	define ZBX_POST_hv_DETAILS 							\
-		ZBX_POST_VSPHERE_HEADER								\
-		"<ns0:RetrieveProperties>"							\
-			"<ns0:_this type=\"PropertyCollector\">%s</ns0:_this>"	\
-			"<ns0:specSet>"								\
-				"<ns0:propSet>"							\
-					"<ns0:type>HostSystem</ns0:type>"			\
-					"<ns0:pathSet>name</ns0:pathSet>"			\
-					"<ns0:pathSet>vm</ns0:pathSet>"				\
-					"<ns0:pathSet>summary</ns0:pathSet>"			\
-					"<ns0:pathSet>parent</ns0:pathSet>"			\
-					"<ns0:pathSet>datastore</ns0:pathSet>"			\
-				"</ns0:propSet>"						\
-				"<ns0:objectSet>"						\
-					"<ns0:obj type=\"HostSystem\">%s</ns0:obj>"		\
-				"</ns0:objectSet>"						\
-			"</ns0:specSet>"							\
-		"</ns0:RetrieveProperties>"							\
+		ZBX_POST_VSPHERE_HEADER							\
+		"<ns0:RetrieveProperties>"						\
+			"<ns0:_this type=\"PropertyCollector\">%s</ns0:_this>"		\
+			"<ns0:specSet>"							\
+				"<ns0:propSet>"						\
+					"<ns0:type>HostSystem</ns0:type>"		\
+					"<ns0:pathSet>name</ns0:pathSet>"		\
+					"<ns0:pathSet>vm</ns0:pathSet>"			\
+					"<ns0:pathSet>summary</ns0:pathSet>"		\
+					"<ns0:pathSet>parent</ns0:pathSet>"		\
+					"<ns0:pathSet>datastore</ns0:pathSet>"		\
+				"</ns0:propSet>"					\
+				"<ns0:objectSet>"					\
+					"<ns0:obj type=\"HostSystem\">%s</ns0:obj>"	\
+				"</ns0:objectSet>"					\
+			"</ns0:specSet>"						\
+		"</ns0:RetrieveProperties>"						\
 		ZBX_POST_VSPHERE_FOOTER
 
 	const char	*__function_name = "vmware_service_get_hv_data";
@@ -1853,7 +1894,7 @@ out:
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
  *             easyhandle   - [IN] the CURL handle                            *
- *             hosts        - [OUT] list of host ids                          *
+ *             hvs          - [OUT] list of vmware hypervisor ids             *
  *             error        - [OUT] the error message in the case of failure  *
  *                                                                            *
  * Return value: SUCCEED - the operation has completed successfully           *
@@ -1982,34 +2023,79 @@ static int	vmware_service_get_hv_list(const zbx_vmware_service_t *service, CURL
 		"</ns0:RetrievePropertiesEx>"							\
 		ZBX_POST_VSPHERE_FOOTER
 
+#	define ZBX_POST_VCENTER_HV_LIST_CONTINUE								\
+		ZBX_POST_VSPHERE_HEADER										\
+		"<ns0:ContinueRetrievePropertiesEx xsi:type=\"ns0:ContinueRetrievePropertiesExRequestType\">"	\
+			"<ns0:_this type=\"PropertyCollector\">propertyCollector</ns0:_this>"			\
+			"<ns0:token>%s</ns0:token>"								\
+		"</ns0:ContinueRetrievePropertiesEx>"								\
+		ZBX_POST_VSPHERE_FOOTER
+
+#	define ZBX_XPATH_RETRIEVE_PROPERTIES_TOKEN			\
+		"/*[local-name()='Envelope']/*[local-name()='Body']"	\
+		"/*[local-name()='RetrievePropertiesExResponse']"	\
+		"/*[local-name()='returnval']/*[local-name()='token']"
+
+#	define ZBX_XPATH_CONTINUE_RETRIEVE_PROPERTIES_TOKEN			\
+		"/*[local-name()='Envelope']/*[local-name()='Body']"		\
+		"/*[local-name()='ContinueRetrievePropertiesExResponse']"	\
+		"/*[local-name()='returnval']/*[local-name()='token']"
+
 	const char	*__function_name = "vmware_service_get_hv_list";
 
 	int		err, opt, ret = FAIL;
+	char		tmp[MAX_STRING_LEN];
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __function_name);
 
 	if (ZBX_VMWARE_SERVICE_VCENTER == service->type)
 	{
+		char	*token, *token_xpath = NULL;
+
 		if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_POSTFIELDS, ZBX_POST_VCENTER_HV_LIST)))
 		{
 			*error = zbx_dsprintf(*error, "Cannot set cURL option [%d]: %s", opt, curl_easy_strerror(err));
 			goto out;
 		}
 
-		page.offset = 0;
-
-		if (CURLE_OK != (err = curl_easy_perform(easyhandle)))
+		while (1)
 		{
-			*error = zbx_strdup(*error, curl_easy_strerror(err));
-			goto out;
-		}
+			page.offset = 0;
 
-		zabbix_log(LOG_LEVEL_TRACE, "%s() SOAP response: %s", __function_name, page.data);
+			if (CURLE_OK != (err = curl_easy_perform(easyhandle)))
+			{
+				*error = zbx_strdup(*error, curl_easy_strerror(err));
+				goto out;
+			}
 
-		if (NULL != (*error = zbx_xml_read_value(page.data, ZBX_XPATH_LN1("faultstring"))))
-			goto out;
+			zabbix_log(LOG_LEVEL_TRACE, "%s() SOAP response: %s", __function_name, page.data);
+
+			if (NULL != (*error = zbx_xml_read_value(page.data, ZBX_XPATH_LN1("faultstring"))))
+				goto out;
+
+			zbx_xml_read_values(page.data, "//*[@type='HostSystem']", hvs);
 
-		zbx_xml_read_values(page.data, "//*[@type='HostSystem']", hvs);
+			if (NULL == token_xpath)
+				token_xpath = ZBX_XPATH_RETRIEVE_PROPERTIES_TOKEN;
+			else
+				token_xpath = ZBX_XPATH_CONTINUE_RETRIEVE_PROPERTIES_TOKEN;
+
+			if (NULL == (token = zbx_xml_read_value(page.data, token_xpath)))
+				break;
+
+			zabbix_log(LOG_LEVEL_DEBUG, "%s() continue retrieving properties with token: '%s'",
+					__function_name, token);
+
+			zbx_snprintf(tmp, sizeof(tmp), ZBX_POST_VCENTER_HV_LIST_CONTINUE, token);
+			zbx_free(token);
+
+			if (CURLE_OK != (err = curl_easy_setopt(easyhandle, opt = CURLOPT_POSTFIELDS, tmp)))
+			{
+				*error = zbx_dsprintf(*error, "Cannot set cURL option [%d]: %s", opt,
+						curl_easy_strerror(err));
+				goto out;
+			}
+		}
 	}
 	else
 	{
@@ -2018,7 +2104,7 @@ static int	vmware_service_get_hv_list(const zbx_vmware_service_t *service, CURL
 
 	ret = SUCCEED;
 out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s [%d]", __function_name, zbx_result_string(ret), hvs->values_num);
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s found:%d", __function_name, zbx_result_string(ret), hvs->values_num);
 
 	return ret;
 }
@@ -2481,7 +2567,7 @@ out:
 	zbx_vector_str_clean(&ids);
 	zbx_vector_str_destroy(&ids);
 
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s [%d]", __function_name, zbx_result_string(ret),
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s found:%d", __function_name, zbx_result_string(ret),
 			clusters->values_num);
 
 	return ret;
diff --git a/src/zabbix_server/vmware/vmware.h b/src/zabbix_server/vmware/vmware.h
index ff89c534bfc..3ff3cf1b247 100644
--- a/src/zabbix_server/vmware/vmware.h
+++ b/src/zabbix_server/vmware/vmware.h
@@ -59,6 +59,7 @@ typedef struct
 #define ZBX_VMWARE_DEV_TYPE_DISK	2
 	int			type;
 	char			*instance;
+	char			*label;
 }
 zbx_vmware_dev_t;
 
diff --git a/upgrades/dbpatches/1.1/1.1beta9_to_1.1beta10/mysql/patch.sql b/upgrades/dbpatches/1.1/1.1beta9_to_1.1beta10/mysql/patch.sql
index 6134cbe9fe6..edd678f6b80 100644
--- a/upgrades/dbpatches/1.1/1.1beta9_to_1.1beta10/mysql/patch.sql
+++ b/upgrades/dbpatches/1.1/1.1beta9_to_1.1beta10/mysql/patch.sql
@@ -61,7 +61,7 @@ CREATE TABLE help_items (
 insert into help_items values (3,'icmpping','Checks if server accessible by ICMP ping	0 - ICMP ping fails 1 - ICMP ping successful	One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.');
 insert into help_items values (3,'icmppingsec','Return ICMP ping response time	Number of seconds Example: 0.02');
 insert into help_items values (3,'ftp&lt;,port&gt;','Checks if FTP server is running and accepting connections	0 - FTP server is down 1 - FTP server is running');
-insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down 1 - HTTP server is running');
+insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections	0 - HTTP server is down 1 - HTTP server is running');
 insert into help_items values (3,'imap&lt;,port&gt;','Checks if IMAP server is running and accepting connections	0 - IMAP server is down 1 - IMAP server is running');
 insert into help_items values (3,'nntp&lt;,port&gt;','Checks if NNTP server is running and accepting connections	0 - NNTP server is down 1 - NNTP server is running');
 insert into help_items values (3,'pop&lt;,port&gt;','Checks if POP server is running and accepting connections	0 - POP server is down 1 - POP server is running');
@@ -69,7 +69,7 @@ insert into help_items values (3,'smtp&lt;,port&gt;','Checks if SMTP server is r
 insert into help_items values (3,'ssh&lt;,port&gt;','Checks if SSH server is running and accepting connections	0 - SSH server is down 1 - SSH server is running');
 insert into help_items values (3,'tcp,port','Checks if TCP service is running and accepting connections on port	0 - the serivce on the por t is down 1 - the service is running');
 insert into help_items values (3,'ftp_perf&lt;,port&gt;','Checks if FTP server is running and accepting connections	0 - FTP server is down Otherwise, number of milliseconds spent connecting to FTP server');
-insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down Otherwise, number of milliseconds spent connecting to HTTP server');
+insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections	0 - HTTP server is down Otherwise, number of milliseconds spent connecting to HTTP server');
 insert into help_items values (3,'imap_perf&lt;,port&gt;','Checks if IMAP server is running and accepting connections	0 - IMAP server is down Otherwise, number of milliseconds spent connecting to IMAP server');
 insert into help_items values (3,'nntp_perf&lt;,port&gt;','Checks if NNTP server is running and accepting connections	0 - NNTP server is down Otherwise, number of milliseconds spent connecting to NNTP server');
 insert into help_items values (3,'pop_perf&lt;,port&gt;','Checks if POP server is running and accepting connections	0 - POP server is down Otherwise, number of milliseconds spent connecting to POP server');
diff --git a/upgrades/dbpatches/1.1/1.1beta9_to_1.1beta10/postgresql/patch.sql b/upgrades/dbpatches/1.1/1.1beta9_to_1.1beta10/postgresql/patch.sql
index 2e795ba8aab..403bff7824f 100644
--- a/upgrades/dbpatches/1.1/1.1beta9_to_1.1beta10/postgresql/patch.sql
+++ b/upgrades/dbpatches/1.1/1.1beta9_to_1.1beta10/postgresql/patch.sql
@@ -61,7 +61,7 @@ CREATE TABLE help_items (
 insert into help_items values (3,'icmpping','Checks if server accessible by ICMP ping	0 - ICMP ping fails 1 - ICMP ping successful	One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.');
 insert into help_items values (3,'icmppingsec','Return ICMP ping response time	Number of seconds Example: 0.02');
 insert into help_items values (3,'ftp&lt;,port&gt;','Checks if FTP server is running and accepting connections	0 - FTP server is down 1 - FTP server is running');
-insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down 1 - HTTP server is running');
+insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections	0 - HTTP server is down 1 - HTTP server is running');
 insert into help_items values (3,'imap&lt;,port&gt;','Checks if IMAP server is running and accepting connections	0 - IMAP server is down 1 - IMAP server is running');
 insert into help_items values (3,'nntp&lt;,port&gt;','Checks if NNTP server is running and accepting connections	0 - NNTP server is down 1 - NNTP server is running');
 insert into help_items values (3,'pop&lt;,port&gt;','Checks if POP server is running and accepting connections	0 - POP server is down 1 - POP server is running');
@@ -69,7 +69,7 @@ insert into help_items values (3,'smtp&lt;,port&gt;','Checks if SMTP server is r
 insert into help_items values (3,'ssh&lt;,port&gt;','Checks if SSH server is running and accepting connections	0 - SSH server is down 1 - SSH server is running');
 insert into help_items values (3,'tcp,port','Checks if TCP service is running and accepting connections on port	0 - the serivce on the por t is down 1 - the service is running');
 insert into help_items values (3,'ftp_perf&lt;,port&gt;','Checks if FTP server is running and accepting connections	0 - FTP server is down Otherwise, number of milliseconds spent connecting to FTP server');
-insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down Otherwise, number of milliseconds spent connecting to HTTP server');
+insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections	0 - HTTP server is down Otherwise, number of milliseconds spent connecting to HTTP server');
 insert into help_items values (3,'imap_perf&lt;,port&gt;','Checks if IMAP server is running and accepting connections	0 - IMAP server is down Otherwise, number of milliseconds spent connecting to IMAP server');
 insert into help_items values (3,'nntp_perf&lt;,port&gt;','Checks if NNTP server is running and accepting connections	0 - NNTP server is down Otherwise, number of milliseconds spent connecting to NNTP server');
 insert into help_items values (3,'pop_perf&lt;,port&gt;','Checks if POP server is running and accepting connections	0 - POP server is down Otherwise, number of milliseconds spent connecting to POP server');
diff --git a/upgrades/dbpatches/1.8/mysql/patch/help_items.sql b/upgrades/dbpatches/1.8/mysql/patch/help_items.sql
index f928e8404c1..801adaa5d83 100644
--- a/upgrades/dbpatches/1.8/mysql/patch/help_items.sql
+++ b/upgrades/dbpatches/1.8/mysql/patch/help_items.sql
@@ -11,7 +11,7 @@ insert into help_items values (3,'icmpping[&lt;ip&gt;,&lt;count&gt;,&lt;interval
 insert into help_items values (3,'icmppingloss[&lt;ip&gt;,&lt;count&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Returns percentage of lost ICMP ping packets.');
 insert into help_items values (3,'icmppingsec[&lt;ip&gt;,&lt;count&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;,&lt;type&gt;]','Returns ICMP ping response time in seconds. Example: 0.02');
 insert into help_items values (3,'ftp&lt;,port&gt;','Checks if FTP server is running and accepting connections. 0 - FTP server is down. 1 - FTP server is running.');
-insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections. 0 - HTTP server is down. 1 - HTTP server is running.');
+insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections. 0 - HTTP server is down. 1 - HTTP server is running.');
 insert into help_items values (3,'imap&lt;,port&gt;','Checks if IMAP server is running and accepting connections. 0 - IMAP server is down. 1 - IMAP server is running.');
 insert into help_items values (3,'ldap&lt;,port&gt;','Checks if LDAP server is running and accepting connections. 0 - LDAP server is down. 1 - LDAP server is running.');
 insert into help_items values (3,'nntp&lt;,port&gt;','Checks if NNTP server is running and accepting connections. 0 - NNTP server is down. 1 - NNTP server is running.');
@@ -21,7 +21,7 @@ insert into help_items values (3,'smtp&lt;,port&gt;','Checks if SMTP server is r
 insert into help_items values (3,'ssh&lt;,port&gt;','Checks if SSH server is running and accepting connections. 0 - SSH server is down. 1 - SSH server is running.');
 insert into help_items values (3,'tcp,port','Checks if TCP service is running and accepting connections on port. 0 - the service on the port is down. 1 - the service is running.');
 insert into help_items values (3,'ftp_perf&lt;,port&gt;','Checks if FTP server is running and accepting connections. 0 - FTP server is down. Otherwise, number of seconds spent connecting to FTP server.');
-insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections. 0 - HTTP server is down. Otherwise, number of seconds spent connecting to HTTP server.');
+insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections. 0 - HTTP server is down. Otherwise, number of seconds spent connecting to HTTP server.');
 insert into help_items values (3,'imap_perf&lt;,port&gt;','Checks if IMAP server is running and accepting connections. 0 - IMAP server is down. Otherwise, number of seconds spent connecting to IMAP server.');
 insert into help_items values (3,'ldap_perf&lt;,port&gt;','Checks if LDAP server is running and accepting connections. 0 - LDAP server is down. Otherwise, number of seconds spent connecting to LDAP server.');
 insert into help_items values (3,'nntp_perf&lt;,port&gt;','Checks if NNTP server is running and accepting connections. 0 - NNTP server is down. Otherwise, number of seconds spent connecting to NNTP server.');
@@ -96,9 +96,9 @@ insert into help_items values(0,'vfs.file.time[file &lt;,mode&gt;]','File time i
 insert into help_items values(0,'vfs.fs.inode[fs &lt;,mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 insert into help_items values(0,'vfs.fs.size[fs &lt;,mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 insert into help_items values(0,'vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-insert into help_items values(0,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-insert into help_items values(0,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-insert into help_items values(0,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+insert into help_items values(0,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+insert into help_items values(0,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+insert into help_items values(0,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 insert into help_items values(0,'perf_counter[counter, interval]','Value of any performance counter, where "counter" parameter is the counter path and "interval" parameter is a number of last seconds, for which the agent returns an average value.');
 insert into help_items values(0,'service_state[service]','State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service');
 insert into help_items values(0,'proc_info[&lt;process&gt;,&lt;attribute&gt;,&lt;type&gt;]','Different information about specific process(es)');
@@ -148,9 +148,9 @@ insert into help_items values(7,'vfs.file.time[file&lt;, mode&gt;]','File time i
 insert into help_items values(7,'vfs.fs.inode[fs &lt;,mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 insert into help_items values(7,'vfs.fs.size[fs &lt;,mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 insert into help_items values(7,'vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-insert into help_items values(7,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-insert into help_items values(7,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-insert into help_items values(7,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+insert into help_items values(7,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+insert into help_items values(7,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+insert into help_items values(7,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 insert into help_items values(7,'perf_counter[counter]','Value of any performance counter, where parameter is the counter path.');
 insert into help_items values(7,'service_state[service]','State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service');
 insert into help_items values(7,'proc_info[&lt;process&gt;,&lt;attribute&gt;,&lt;type&gt;]','Different information about specific process(es)');
diff --git a/upgrades/dbpatches/1.8/oracle/patch/help_items.sql b/upgrades/dbpatches/1.8/oracle/patch/help_items.sql
index 84181d69bec..d8ed49c0bd1 100644
--- a/upgrades/dbpatches/1.8/oracle/patch/help_items.sql
+++ b/upgrades/dbpatches/1.8/oracle/patch/help_items.sql
@@ -11,7 +11,7 @@ insert into help_items values (3,'icmpping[&lt;ip&gt;,&lt;count&gt;,&lt;interval
 insert into help_items values (3,'icmppingloss[&lt;ip&gt;,&lt;count&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Returns percentage of lost ICMP ping packets.');
 insert into help_items values (3,'icmppingsec[&lt;ip&gt;,&lt;count&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;,&lt;type&gt;]','Returns ICMP ping response time in seconds. Example: 0.02');
 insert into help_items values (3,'ftp&lt;,port&gt;','Checks if FTP server is running and accepting connections. 0 - FTP server is down. 1 - FTP server is running.');
-insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections. 0 - HTTP server is down. 1 - HTTP server is running.');
+insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections. 0 - HTTP server is down. 1 - HTTP server is running.');
 insert into help_items values (3,'imap&lt;,port&gt;','Checks if IMAP server is running and accepting connections. 0 - IMAP server is down. 1 - IMAP server is running.');
 insert into help_items values (3,'ldap&lt;,port&gt;','Checks if LDAP server is running and accepting connections. 0 - LDAP server is down. 1 - LDAP server is running.');
 insert into help_items values (3,'nntp&lt;,port&gt;','Checks if NNTP server is running and accepting connections. 0 - NNTP server is down. 1 - NNTP server is running.');
@@ -21,7 +21,7 @@ insert into help_items values (3,'smtp&lt;,port&gt;','Checks if SMTP server is r
 insert into help_items values (3,'ssh&lt;,port&gt;','Checks if SSH server is running and accepting connections. 0 - SSH server is down. 1 - SSH server is running.');
 insert into help_items values (3,'tcp,port','Checks if TCP service is running and accepting connections on port. 0 - the service on the port is down. 1 - the service is running.');
 insert into help_items values (3,'ftp_perf&lt;,port&gt;','Checks if FTP server is running and accepting connections. 0 - FTP server is down. Otherwise, number of seconds spent connecting to FTP server.');
-insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections. 0 - HTTP server is down. Otherwise, number of seconds spent connecting to HTTP server.');
+insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections. 0 - HTTP server is down. Otherwise, number of seconds spent connecting to HTTP server.');
 insert into help_items values (3,'imap_perf&lt;,port&gt;','Checks if IMAP server is running and accepting connections. 0 - IMAP server is down. Otherwise, number of seconds spent connecting to IMAP server.');
 insert into help_items values (3,'ldap_perf&lt;,port&gt;','Checks if LDAP server is running and accepting connections. 0 - LDAP server is down. Otherwise, number of seconds spent connecting to LDAP server.');
 insert into help_items values (3,'nntp_perf&lt;,port&gt;','Checks if NNTP server is running and accepting connections. 0 - NNTP server is down. Otherwise, number of seconds spent connecting to NNTP server.');
@@ -96,9 +96,9 @@ insert into help_items values(0,'vfs.file.time[file &lt;,mode&gt;]','File time i
 insert into help_items values(0,'vfs.fs.inode[fs &lt;,mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 insert into help_items values(0,'vfs.fs.size[fs &lt;,mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 insert into help_items values(0,'vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-insert into help_items values(0,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-insert into help_items values(0,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-insert into help_items values(0,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+insert into help_items values(0,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+insert into help_items values(0,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+insert into help_items values(0,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 insert into help_items values(0,'perf_counter[counter, interval]','Value of any performance counter, where "counter" parameter is the counter path and "interval" parameter is a number of last seconds, for which the agent returns an average value.');
 insert into help_items values(0,'service_state[service]','State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service');
 insert into help_items values(0,'proc_info[&lt;process&gt;,&lt;attribute&gt;,&lt;type&gt;]','Different information about specific process(es)');
@@ -148,9 +148,9 @@ insert into help_items values(7,'vfs.file.time[file&lt;, mode&gt;]','File time i
 insert into help_items values(7,'vfs.fs.inode[fs &lt;,mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 insert into help_items values(7,'vfs.fs.size[fs &lt;,mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 insert into help_items values(7,'vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-insert into help_items values(7,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-insert into help_items values(7,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-insert into help_items values(7,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+insert into help_items values(7,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+insert into help_items values(7,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+insert into help_items values(7,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 insert into help_items values(7,'perf_counter[counter]','Value of any performance counter, where parameter is the counter path.');
 insert into help_items values(7,'service_state[service]','State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service');
 insert into help_items values(7,'proc_info[&lt;process&gt;,&lt;attribute&gt;,&lt;type&gt;]','Different information about specific process(es)');
diff --git a/upgrades/dbpatches/1.8/postgresql/patch/help_items.sql b/upgrades/dbpatches/1.8/postgresql/patch/help_items.sql
index 19898dcbb38..635c2f6ef9a 100644
--- a/upgrades/dbpatches/1.8/postgresql/patch/help_items.sql
+++ b/upgrades/dbpatches/1.8/postgresql/patch/help_items.sql
@@ -11,7 +11,7 @@ insert into help_items values (3,'icmpping[&lt;ip&gt;,&lt;count&gt;,&lt;interval
 insert into help_items values (3,'icmppingloss[&lt;ip&gt;,&lt;count&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Returns percentage of lost ICMP ping packets.');
 insert into help_items values (3,'icmppingsec[&lt;ip&gt;,&lt;count&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;,&lt;type&gt;]','Returns ICMP ping response time in seconds. Example: 0.02');
 insert into help_items values (3,'ftp&lt;,port&gt;','Checks if FTP server is running and accepting connections. 0 - FTP server is down. 1 - FTP server is running.');
-insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections. 0 - HTTP server is down. 1 - HTTP server is running.');
+insert into help_items values (3,'http&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections. 0 - HTTP server is down. 1 - HTTP server is running.');
 insert into help_items values (3,'imap&lt;,port&gt;','Checks if IMAP server is running and accepting connections. 0 - IMAP server is down. 1 - IMAP server is running.');
 insert into help_items values (3,'ldap&lt;,port&gt;','Checks if LDAP server is running and accepting connections. 0 - LDAP server is down. 1 - LDAP server is running.');
 insert into help_items values (3,'nntp&lt;,port&gt;','Checks if NNTP server is running and accepting connections. 0 - NNTP server is down. 1 - NNTP server is running.');
@@ -21,7 +21,7 @@ insert into help_items values (3,'smtp&lt;,port&gt;','Checks if SMTP server is r
 insert into help_items values (3,'ssh&lt;,port&gt;','Checks if SSH server is running and accepting connections. 0 - SSH server is down. 1 - SSH server is running.');
 insert into help_items values (3,'tcp,port','Checks if TCP service is running and accepting connections on port. 0 - the service on the port is down. 1 - the service is running.');
 insert into help_items values (3,'ftp_perf&lt;,port&gt;','Checks if FTP server is running and accepting connections. 0 - FTP server is down. Otherwise, number of seconds spent connecting to FTP server.');
-insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (WEB) server is running and accepting connections. 0 - HTTP server is down. Otherwise, number of seconds spent connecting to HTTP server.');
+insert into help_items values (3,'http_perf&lt;,port&gt;','Checks if HTTP (web) server is running and accepting connections. 0 - HTTP server is down. Otherwise, number of seconds spent connecting to HTTP server.');
 insert into help_items values (3,'imap_perf&lt;,port&gt;','Checks if IMAP server is running and accepting connections. 0 - IMAP server is down. Otherwise, number of seconds spent connecting to IMAP server.');
 insert into help_items values (3,'ldap_perf&lt;,port&gt;','Checks if LDAP server is running and accepting connections. 0 - LDAP server is down. Otherwise, number of seconds spent connecting to LDAP server.');
 insert into help_items values (3,'nntp_perf&lt;,port&gt;','Checks if NNTP server is running and accepting connections. 0 - NNTP server is down. Otherwise, number of seconds spent connecting to NNTP server.');
@@ -96,9 +96,9 @@ insert into help_items values(0,'vfs.file.time[file &lt;,mode&gt;]','File time i
 insert into help_items values(0,'vfs.fs.inode[fs &lt;,mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 insert into help_items values(0,'vfs.fs.size[fs &lt;,mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 insert into help_items values(0,'vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-insert into help_items values(0,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-insert into help_items values(0,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-insert into help_items values(0,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+insert into help_items values(0,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+insert into help_items values(0,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+insert into help_items values(0,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 insert into help_items values(0,'perf_counter[counter, interval]','Value of any performance counter, where "counter" parameter is the counter path and "interval" parameter is a number of last seconds, for which the agent returns an average value.');
 insert into help_items values(0,'service_state[service]','State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service');
 insert into help_items values(0,'proc_info[&lt;process&gt;,&lt;attribute&gt;,&lt;type&gt;]','Different information about specific process(es)');
@@ -148,9 +148,9 @@ insert into help_items values(7,'vfs.file.time[file&lt;, mode&gt;]','File time i
 insert into help_items values(7,'vfs.fs.inode[fs &lt;,mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 insert into help_items values(7,'vfs.fs.size[fs &lt;,mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 insert into help_items values(7,'vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-insert into help_items values(7,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-insert into help_items values(7,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-insert into help_items values(7,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+insert into help_items values(7,'web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+insert into help_items values(7,'web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+insert into help_items values(7,'web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 insert into help_items values(7,'perf_counter[counter]','Value of any performance counter, where parameter is the counter path.');
 insert into help_items values(7,'service_state[service]','State of service. 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service');
 insert into help_items values(7,'proc_info[&lt;process&gt;,&lt;attribute&gt;,&lt;type&gt;]','Different information about specific process(es)');
diff --git a/upgrades/dbpatches/2.0/ibm_db2/patch/help_items.sql b/upgrades/dbpatches/2.0/ibm_db2/patch/help_items.sql
index 08c6f9965f4..5098522cad7 100644
--- a/upgrades/dbpatches/2.0/ibm_db2/patch/help_items.sql
+++ b/upgrades/dbpatches/2.0/ibm_db2/patch/help_items.sql
@@ -121,11 +121,11 @@ INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.fs.size[fs,&
 /
 INSERT INTO help_items (itemtype,key_,description) values ('0','vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.')
 /
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /')
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /')
 /
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /')
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /')
 /
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /')
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /')
 /
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmppingloss[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Returns percentage of lost ICMP ping packets.')
 /
@@ -295,11 +295,11 @@ INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.fs.size[fs,&
 /
 INSERT INTO help_items (itemtype,key_,description) values ('7','vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.')
 /
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /')
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /')
 /
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /')
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /')
 /
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /')
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /')
 /
 INSERT INTO help_items (itemtype,key_,description) values ('8','grpfunc[&lt;group&gt;,&lt;key&gt;,&lt;func&gt;,&lt;param&gt;]','Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual.')
 /
diff --git a/upgrades/dbpatches/2.0/mysql/patch/help_items.sql b/upgrades/dbpatches/2.0/mysql/patch/help_items.sql
index 2317d327aed..024650f9e1b 100644
--- a/upgrades/dbpatches/2.0/mysql/patch/help_items.sql
+++ b/upgrades/dbpatches/2.0/mysql/patch/help_items.sql
@@ -63,9 +63,9 @@ INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.file.time[fi
 INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.fs.inode[fs,&lt;mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.fs.size[fs,&lt;mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 INSERT INTO help_items (itemtype,key_,description) values ('0','vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmppingloss[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Returns percentage of lost ICMP ping packets.');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmppingsec[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;,&lt;mode&gt;]','Returns ICMP ping response time in seconds. Example: 0.02');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmpping[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.');
@@ -150,9 +150,9 @@ INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.file.time[fi
 INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.fs.inode[fs,&lt;mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.fs.size[fs,&lt;mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 INSERT INTO help_items (itemtype,key_,description) values ('7','vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 INSERT INTO help_items (itemtype,key_,description) values ('8','grpfunc[&lt;group&gt;,&lt;key&gt;,&lt;func&gt;,&lt;param&gt;]','Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual.');
 INSERT INTO help_items (itemtype,key_,description) values ('17','snmptrap.fallback','Catches all SNMP traps from a corresponding address that were not catched by any of the snmptrap[] items for that interface.');
 INSERT INTO help_items (itemtype,key_,description) values ('17','snmptrap[&lt;regex&gt;]','Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string.');
diff --git a/upgrades/dbpatches/2.0/oracle/patch/help_items.sql b/upgrades/dbpatches/2.0/oracle/patch/help_items.sql
index 9a9c3012963..25f023df2b6 100644
--- a/upgrades/dbpatches/2.0/oracle/patch/help_items.sql
+++ b/upgrades/dbpatches/2.0/oracle/patch/help_items.sql
@@ -65,9 +65,9 @@ INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.file.time[fi
 INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.fs.inode[fs,&lt;mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.fs.size[fs,&lt;mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 INSERT INTO help_items (itemtype,key_,description) values ('0','vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmppingloss[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Returns percentage of lost ICMP ping packets.');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmppingsec[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;,&lt;mode&gt;]','Returns ICMP ping response time in seconds. Example: 0.02');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmpping[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.');
@@ -152,9 +152,9 @@ INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.file.time[fi
 INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.fs.inode[fs,&lt;mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.fs.size[fs,&lt;mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 INSERT INTO help_items (itemtype,key_,description) values ('7','vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 INSERT INTO help_items (itemtype,key_,description) values ('8','grpfunc[&lt;group&gt;,&lt;key&gt;,&lt;func&gt;,&lt;param&gt;]','Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual.');
 INSERT INTO help_items (itemtype,key_,description) values ('17','snmptrap.fallback','Catches all SNMP traps from a corresponding address that were not catched by any of the snmptrap[] items for that interface.');
 INSERT INTO help_items (itemtype,key_,description) values ('17','snmptrap[&lt;regex&gt;]','Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string.');
diff --git a/upgrades/dbpatches/2.0/postgresql/patch/help_items.sql b/upgrades/dbpatches/2.0/postgresql/patch/help_items.sql
index 9d692801031..8eecadfe0a2 100644
--- a/upgrades/dbpatches/2.0/postgresql/patch/help_items.sql
+++ b/upgrades/dbpatches/2.0/postgresql/patch/help_items.sql
@@ -63,9 +63,9 @@ INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.file.time[fi
 INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.fs.inode[fs,&lt;mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 INSERT INTO help_items (itemtype,key_,description) values ('0','vfs.fs.size[fs,&lt;mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 INSERT INTO help_items (itemtype,key_,description) values ('0','vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('0','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmppingloss[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Returns percentage of lost ICMP ping packets.');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmppingsec[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;,&lt;mode&gt;]','Returns ICMP ping response time in seconds. Example: 0.02');
 INSERT INTO help_items (itemtype,key_,description) values ('3','icmpping[&lt;target&gt;,&lt;packets&gt;,&lt;interval&gt;,&lt;size&gt;,&lt;timeout&gt;]','Checks if server is accessible by ICMP ping. 0 - ICMP ping fails. 1 - ICMP ping successful. One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.');
@@ -150,9 +150,9 @@ INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.file.time[fi
 INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.fs.inode[fs,&lt;mode&gt;]','Number of inodes for a given volume. If mode is missing total is used.');
 INSERT INTO help_items (itemtype,key_,description) values ('7','vfs.fs.size[fs,&lt;mode&gt;]','Calculate disk space for a given volume. Disk space in KB. If mode is missing total is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
 INSERT INTO help_items (itemtype,key_,description) values ('7','vm.memory.size[&lt;mode&gt;]','Amount of memory size in bytes. If mode is missing total is used.');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full WEB page. Default path is /');
-INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurence of regexp in WEB page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.get[host,&lt;path&gt;,&lt;port&gt;]','Get content of web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.perf[host,&lt;path&gt;,&lt;port&gt;]','Get timing of loading full web page. Default path is /');
+INSERT INTO help_items (itemtype,key_,description) values ('7','web.page.regexp[host,&lt;path&gt;,&lt;port&gt;,&lt;regexp&gt;,&lt;length&gt;]','Get first occurrence of regexp in web page. Default path is /');
 INSERT INTO help_items (itemtype,key_,description) values ('8','grpfunc[&lt;group&gt;,&lt;key&gt;,&lt;func&gt;,&lt;param&gt;]','Aggregate checks do not require any agent running on a host being monitored. Zabbix server collects aggregate information by doing direct database queries. See Zabbix Manual.');
 INSERT INTO help_items (itemtype,key_,description) values ('17','snmptrap.fallback','Catches all SNMP traps from a corresponding address that were not catched by any of the snmptrap[] items for that interface.');
 INSERT INTO help_items (itemtype,key_,description) values ('17','snmptrap[&lt;regex&gt;]','Catches all SNMP traps from a corresponding address that match regex. Default regex is an empty string.');